diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/__ct__19J2DTevSwapModeTableFv.s b/asm/JSystem/J2DGraph/J2DMatBlock/__ct__19J2DTevSwapModeTableFv.s index 65b581542b7..83b04db90a1 100644 --- a/asm/JSystem/J2DGraph/J2DMatBlock/__ct__19J2DTevSwapModeTableFv.s +++ b/asm/JSystem/J2DGraph/J2DMatBlock/__ct__19J2DTevSwapModeTableFv.s @@ -1,4 +1,4 @@ lbl_802F1934: -/* 802F1934 88 02 C7 AC */ lbz r0, struct_804561AC+0x0(r2) +/* 802F1934 88 02 C7 AC */ lbz r0, data_804561AC(r2) /* 802F1938 98 03 00 00 */ stb r0, 0(r3) /* 802F193C 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/initialize__10J2DPEBlockFv.s b/asm/JSystem/J2DGraph/J2DMatBlock/initialize__10J2DPEBlockFv.s index 0e9ee7da8a8..565d4ec1718 100644 --- a/asm/JSystem/J2DGraph/J2DMatBlock/initialize__10J2DPEBlockFv.s +++ b/asm/JSystem/J2DGraph/J2DMatBlock/initialize__10J2DPEBlockFv.s @@ -1,5 +1,5 @@ lbl_802F17FC: -/* 802F17FC A0 02 C7 AE */ lhz r0, struct_804561AC+0x2(r2) +/* 802F17FC A0 02 C7 AE */ lhz r0, j2dDefaultAlphaCmp(r2) /* 802F1800 B0 03 00 00 */ sth r0, 0(r3) /* 802F1804 38 00 00 00 */ li r0, 0 /* 802F1808 98 03 00 02 */ stb r0, 2(r3) diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/setFontNo__12J2DTevBlock1FUs.s b/asm/JSystem/J2DGraph/J2DMatBlock/setFontNo__12J2DTevBlock1FUs.s deleted file mode 100644 index a303cc65959..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/setFontNo__12J2DTevBlock1FUs.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_802F27D4: -/* 802F27D4 B0 83 00 06 */ sth r4, 6(r3) -/* 802F27D8 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/setFontNo__12J2DTevBlock2FUs.s b/asm/JSystem/J2DGraph/J2DMatBlock/setFontNo__12J2DTevBlock2FUs.s deleted file mode 100644 index de7a40e1d4c..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/setFontNo__12J2DTevBlock2FUs.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_802F2530: -/* 802F2530 B0 83 00 08 */ sth r4, 8(r3) -/* 802F2534 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/setFontNo__12J2DTevBlock4FUs.s b/asm/JSystem/J2DGraph/J2DMatBlock/setFontNo__12J2DTevBlock4FUs.s deleted file mode 100644 index 398650fb2c5..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/setFontNo__12J2DTevBlock4FUs.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_802F228C: -/* 802F228C B0 83 00 0C */ sth r4, 0xc(r3) -/* 802F2290 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/setFontNo__12J2DTevBlock8FUs.s b/asm/JSystem/J2DGraph/J2DMatBlock/setFontNo__12J2DTevBlock8FUs.s deleted file mode 100644 index cb0bbcc6b2c..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/setFontNo__12J2DTevBlock8FUs.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_802F1FEC: -/* 802F1FEC B0 83 00 14 */ sth r4, 0x14(r3) -/* 802F1FF0 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/setFontNo__13J2DTevBlock16FUs.s b/asm/JSystem/J2DGraph/J2DMatBlock/setFontNo__13J2DTevBlock16FUs.s deleted file mode 100644 index d52c785c09c..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/setFontNo__13J2DTevBlock16FUs.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_802F1D4C: -/* 802F1D4C B0 83 00 14 */ sth r4, 0x14(r3) -/* 802F1D50 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/setIndTexStageNum__15J2DIndBlockFullFUc.s b/asm/JSystem/J2DGraph/J2DMatBlock/setIndTexStageNum__15J2DIndBlockFullFUc.s deleted file mode 100644 index 854bafbaaf1..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/setIndTexStageNum__15J2DIndBlockFullFUc.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_802F1BA0: -/* 802F1BA0 98 83 00 04 */ stb r4, 4(r3) -/* 802F1BA4 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/setTevStageNum__12J2DTevBlock2FUc.s b/asm/JSystem/J2DGraph/J2DMatBlock/setTevStageNum__12J2DTevBlock2FUc.s deleted file mode 100644 index 6287deb888c..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/setTevStageNum__12J2DTevBlock2FUc.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_802F2628: -/* 802F2628 98 83 00 32 */ stb r4, 0x32(r3) -/* 802F262C 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/setTevStageNum__12J2DTevBlock4FUc.s b/asm/JSystem/J2DGraph/J2DMatBlock/setTevStageNum__12J2DTevBlock4FUc.s deleted file mode 100644 index 7f56cffed7f..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/setTevStageNum__12J2DTevBlock4FUc.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_802F2384: -/* 802F2384 98 83 00 3E */ stb r4, 0x3e(r3) -/* 802F2388 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/setTevStageNum__12J2DTevBlock8FUc.s b/asm/JSystem/J2DGraph/J2DMatBlock/setTevStageNum__12J2DTevBlock8FUc.s deleted file mode 100644 index f9a6e24c2bc..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/setTevStageNum__12J2DTevBlock8FUc.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_802F20E4: -/* 802F20E4 98 83 00 56 */ stb r4, 0x56(r3) -/* 802F20E8 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/setTevStageNum__13J2DTevBlock16FUc.s b/asm/JSystem/J2DGraph/J2DMatBlock/setTevStageNum__13J2DTevBlock16FUc.s deleted file mode 100644 index 7daf80e9afc..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/setTevStageNum__13J2DTevBlock16FUc.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_802F1E44: -/* 802F1E44 98 83 00 76 */ stb r4, 0x76(r3) -/* 802F1E48 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMaterial/__ct__11J2DMaterialFv.s b/asm/JSystem/J2DGraph/J2DMaterial/__ct__11J2DMaterialFv.s index 199fde045df..d60936723e3 100644 --- a/asm/JSystem/J2DGraph/J2DMaterial/__ct__11J2DMaterialFv.s +++ b/asm/JSystem/J2DGraph/J2DMaterial/__ct__11J2DMaterialFv.s @@ -38,7 +38,7 @@ lbl_802EA1AC: /* 802EA23C 48 07 7B 25 */ bl __construct_array /* 802EA240 38 7F 00 28 */ addi r3, r31, 0x28 /* 802EA244 48 00 12 CD */ bl initialize__14J2DTexGenBlockFv -/* 802EA248 A0 02 C7 AE */ lhz r0, struct_804561AC+0x2(r2) +/* 802EA248 A0 02 C7 AE */ lhz r0, j2dDefaultAlphaCmp(r2) /* 802EA24C B0 1F 00 78 */ sth r0, 0x78(r31) /* 802EA250 38 00 00 00 */ li r0, 0 /* 802EA254 98 1F 00 7A */ stb r0, 0x7a(r31) diff --git a/asm/JSystem/J2DGraph/J2DMaterialFactory/newAlphaComp__18J2DMaterialFactoryCFi.s b/asm/JSystem/J2DGraph/J2DMaterialFactory/newAlphaComp__18J2DMaterialFactoryCFi.s index 77cad7b5666..df769cabaa8 100644 --- a/asm/JSystem/J2DGraph/J2DMaterialFactory/newAlphaComp__18J2DMaterialFactoryCFi.s +++ b/asm/JSystem/J2DGraph/J2DMaterialFactory/newAlphaComp__18J2DMaterialFactoryCFi.s @@ -25,7 +25,7 @@ lbl_802F3FE0: /* 802F403C 98 03 00 03 */ stb r0, 3(r3) /* 802F4040 4E 80 00 20 */ blr lbl_802F4044: -/* 802F4044 A0 02 C7 AE */ lhz r0, struct_804561AC+0x2(r2) +/* 802F4044 A0 02 C7 AE */ lhz r0, j2dDefaultAlphaCmp(r2) /* 802F4048 B0 03 00 00 */ sth r0, 0(r3) /* 802F404C 38 00 00 00 */ li r0, 0 /* 802F4050 98 03 00 02 */ stb r0, 2(r3) diff --git a/asm/JSystem/J2DGraph/J2DPane/setAnimation__7J2DPaneFP15J2DAnmTransform.s b/asm/JSystem/J2DGraph/J2DPane/setAnimation__7J2DPaneFP15J2DAnmTransform.s deleted file mode 100644 index a96fb5e0b8f..00000000000 --- a/asm/JSystem/J2DGraph/J2DPane/setAnimation__7J2DPaneFP15J2DAnmTransform.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_802F7FC4: -/* 802F7FC4 90 83 00 F8 */ stw r4, 0xf8(r3) -/* 802F7FC8 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DPictureEx/setAnimation__12J2DPictureExFP20J2DAnmVisibilityFull.s b/asm/JSystem/J2DGraph/J2DPictureEx/setAnimation__12J2DPictureExFP20J2DAnmVisibilityFull.s deleted file mode 100644 index f719557cbd9..00000000000 --- a/asm/JSystem/J2DGraph/J2DPictureEx/setAnimation__12J2DPictureExFP20J2DAnmVisibilityFull.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80306B74: -/* 80306B74 90 83 01 94 */ stw r4, 0x194(r3) -/* 80306B78 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DTextBoxEx/setAnimation__12J2DTextBoxExFP20J2DAnmVisibilityFull.s b/asm/JSystem/J2DGraph/J2DTextBoxEx/setAnimation__12J2DTextBoxExFP20J2DAnmVisibilityFull.s deleted file mode 100644 index 7babdc198cb..00000000000 --- a/asm/JSystem/J2DGraph/J2DTextBoxEx/setAnimation__12J2DTextBoxExFP20J2DAnmVisibilityFull.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80308964: -/* 80308964 90 83 01 44 */ stw r4, 0x144(r3) -/* 80308968 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DWindowEx/setAnimation__11J2DWindowExFP20J2DAnmVisibilityFull.s b/asm/JSystem/J2DGraph/J2DWindowEx/setAnimation__11J2DWindowExFP20J2DAnmVisibilityFull.s deleted file mode 100644 index d239535b7f7..00000000000 --- a/asm/JSystem/J2DGraph/J2DWindowEx/setAnimation__11J2DWindowExFP20J2DAnmVisibilityFull.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80303274: -/* 80303274 90 83 01 74 */ stw r4, 0x174(r3) -/* 80303278 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/setColorChanNum__20J3DColorBlockLightOnFUc.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/setColorChanNum__20J3DColorBlockLightOnFUc.s deleted file mode 100644 index b157afa0c03..00000000000 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/setColorChanNum__20J3DColorBlockLightOnFUc.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80322F70: -/* 80322F70 98 83 00 14 */ stb r4, 0x14(r3) -/* 80322F74 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/setColorChanNum__21J3DColorBlockLightOffFUc.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/setColorChanNum__21J3DColorBlockLightOffFUc.s deleted file mode 100644 index 8a2f9e5e924..00000000000 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/setColorChanNum__21J3DColorBlockLightOffFUc.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_803231D0: -/* 803231D0 98 83 00 0C */ stb r4, 0xc(r3) -/* 803231D4 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/setColorChanOffset__20J3DColorBlockLightOnFUl.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/setColorChanOffset__20J3DColorBlockLightOnFUl.s deleted file mode 100644 index 8d9e7a03cdf..00000000000 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/setColorChanOffset__20J3DColorBlockLightOnFUl.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80323010: -/* 80323010 90 83 00 48 */ stw r4, 0x48(r3) -/* 80323014 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/setColorChanOffset__21J3DColorBlockLightOffFUl.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/setColorChanOffset__21J3DColorBlockLightOffFUl.s deleted file mode 100644 index 938569a2de7..00000000000 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/setColorChanOffset__21J3DColorBlockLightOffFUl.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80323250: -/* 80323250 90 83 00 1C */ stw r4, 0x1c(r3) -/* 80323254 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/setCullMode__20J3DColorBlockLightOnFUc.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/setCullMode__20J3DColorBlockLightOnFUc.s deleted file mode 100644 index c63f8a1a20e..00000000000 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/setCullMode__20J3DColorBlockLightOnFUc.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80322FDC: -/* 80322FDC 98 83 00 40 */ stb r4, 0x40(r3) -/* 80322FE0 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/setCullMode__21J3DColorBlockLightOffFUc.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/setCullMode__21J3DColorBlockLightOffFUc.s deleted file mode 100644 index 3d9fdf22ea8..00000000000 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/setCullMode__21J3DColorBlockLightOffFUc.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_8032321C: -/* 8032321C 98 83 00 16 */ stb r4, 0x16(r3) -/* 80323220 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/setDither__14J3DPEBlockFullFUc.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/setDither__14J3DPEBlockFullFUc.s deleted file mode 100644 index 568677ba23e..00000000000 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/setDither__14J3DPEBlockFullFUc.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80321A44: -/* 80321A44 98 83 00 3B */ stb r4, 0x3b(r3) -/* 80321A48 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/setDither__16J3DPEBlockFogOffFUc.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/setDither__16J3DPEBlockFogOffFUc.s deleted file mode 100644 index f6e28759d20..00000000000 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/setDither__16J3DPEBlockFogOffFUc.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80321BA8: -/* 80321BA8 98 83 00 0F */ stb r4, 0xf(r3) -/* 80321BAC 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/setFogOffset__14J3DPEBlockFullFUl.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/setFogOffset__14J3DPEBlockFullFUl.s deleted file mode 100644 index fb603485fc8..00000000000 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/setFogOffset__14J3DPEBlockFullFUl.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80321A68: -/* 80321A68 90 83 00 3C */ stw r4, 0x3c(r3) -/* 80321A6C 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/setIndTexStageNum__15J3DIndBlockFullFUc.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/setIndTexStageNum__15J3DIndBlockFullFUc.s deleted file mode 100644 index 2d6d45c6ceb..00000000000 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/setIndTexStageNum__15J3DIndBlockFullFUc.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_8032339C: -/* 8032339C 98 83 00 04 */ stb r4, 4(r3) -/* 803233A0 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/setMatColorOffset__20J3DColorBlockLightOnFUl.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/setMatColorOffset__20J3DColorBlockLightOnFUl.s deleted file mode 100644 index 9810ec55ed1..00000000000 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/setMatColorOffset__20J3DColorBlockLightOnFUl.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80323008: -/* 80323008 90 83 00 44 */ stw r4, 0x44(r3) -/* 8032300C 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/setMatColorOffset__21J3DColorBlockLightOffFUl.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/setMatColorOffset__21J3DColorBlockLightOffFUl.s deleted file mode 100644 index 096f7257327..00000000000 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/setMatColorOffset__21J3DColorBlockLightOffFUl.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80323248: -/* 80323248 90 83 00 18 */ stw r4, 0x18(r3) -/* 8032324C 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/setTevRegOffset__12J3DTevBlock2FUl.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/setTevRegOffset__12J3DTevBlock2FUl.s deleted file mode 100644 index a679e81faef..00000000000 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/setTevRegOffset__12J3DTevBlock2FUl.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_8032270C: -/* 8032270C 90 83 00 68 */ stw r4, 0x68(r3) -/* 80322710 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/setTevRegOffset__12J3DTevBlock4FUl.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/setTevRegOffset__12J3DTevBlock4FUl.s deleted file mode 100644 index 5589c9b2de4..00000000000 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/setTevRegOffset__12J3DTevBlock4FUl.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80322348: -/* 80322348 90 83 00 90 */ stw r4, 0x90(r3) -/* 8032234C 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/setTevRegOffset__13J3DTevBlock16FUl.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/setTevRegOffset__13J3DTevBlock16FUl.s deleted file mode 100644 index c111f1ea910..00000000000 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/setTevRegOffset__13J3DTevBlock16FUl.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80321F7C: -/* 80321F7C 90 83 01 70 */ stw r4, 0x170(r3) -/* 80321F80 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/setTevRegOffset__18J3DTevBlockPatchedFUl.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/setTevRegOffset__18J3DTevBlockPatchedFUl.s deleted file mode 100644 index 8a0af1409a4..00000000000 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/setTevRegOffset__18J3DTevBlockPatchedFUl.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80322C08: -/* 80322C08 90 83 00 D4 */ stw r4, 0xd4(r3) -/* 80322C0C 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/setTevStageNum__12J3DTevBlock2FUc.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/setTevStageNum__12J3DTevBlock2FUc.s deleted file mode 100644 index 08173594d2e..00000000000 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/setTevStageNum__12J3DTevBlock2FUc.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80322578: -/* 80322578 98 83 00 34 */ stb r4, 0x34(r3) -/* 8032257C 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/setTevStageNum__12J3DTevBlock4FUc.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/setTevStageNum__12J3DTevBlock4FUc.s deleted file mode 100644 index 951db050582..00000000000 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/setTevStageNum__12J3DTevBlock4FUc.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_803221B4: -/* 803221B4 98 83 00 20 */ stb r4, 0x20(r3) -/* 803221B8 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/setTevStageNum__13J3DTevBlock16FUc.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/setTevStageNum__13J3DTevBlock16FUc.s deleted file mode 100644 index e49ec826e86..00000000000 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/setTevStageNum__13J3DTevBlock16FUc.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80321DE8: -/* 80321DE8 98 83 00 58 */ stb r4, 0x58(r3) -/* 80321DEC 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/setTevStageNum__18J3DTevBlockPatchedFUc.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/setTevStageNum__18J3DTevBlockPatchedFUc.s deleted file mode 100644 index b1b39bd4d28..00000000000 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/setTevStageNum__18J3DTevBlockPatchedFUc.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_803229A4: -/* 803229A4 98 83 00 D0 */ stb r4, 0xd0(r3) -/* 803229A8 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/setTexGenNum__21J3DTexGenBlockPatchedFUl.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/setTexGenNum__21J3DTexGenBlockPatchedFUl.s deleted file mode 100644 index 74ab90d8fa3..00000000000 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/setTexGenNum__21J3DTexGenBlockPatchedFUl.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80322D34: -/* 80322D34 90 83 00 04 */ stw r4, 4(r3) -/* 80322D38 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/setTexMtxOffset__21J3DTexGenBlockPatchedFUl.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/setTexMtxOffset__21J3DTexGenBlockPatchedFUl.s deleted file mode 100644 index 50dd47a4ad0..00000000000 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/setTexMtxOffset__21J3DTexGenBlockPatchedFUl.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80322DA0: -/* 80322DA0 90 83 00 58 */ stw r4, 0x58(r3) -/* 80322DA4 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/setTexNoOffset__11J3DTevBlockFUl.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/setTexNoOffset__11J3DTevBlockFUl.s deleted file mode 100644 index 853a7b0b218..00000000000 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/setTexNoOffset__11J3DTevBlockFUl.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80321FE0: -/* 80321FE0 90 83 00 04 */ stw r4, 4(r3) -/* 80321FE4 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/setZCompLoc__14J3DPEBlockFullFUc.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/setZCompLoc__14J3DPEBlockFullFUc.s deleted file mode 100644 index 7eeb56ae6bf..00000000000 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/setZCompLoc__14J3DPEBlockFullFUc.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80321A28: -/* 80321A28 98 83 00 3A */ stb r4, 0x3a(r3) -/* 80321A2C 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/setZCompLoc__16J3DPEBlockFogOffFUc.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/setZCompLoc__16J3DPEBlockFogOffFUc.s deleted file mode 100644 index 429b88a8496..00000000000 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/setZCompLoc__16J3DPEBlockFogOffFUc.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80321B8C: -/* 80321B8C 98 83 00 0E */ stb r4, 0xe(r3) -/* 80321B90 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphBase/J3DMaterial/createPEBlock__11J3DMaterialFUlUl.s b/asm/JSystem/J3DGraphBase/J3DMaterial/createPEBlock__11J3DMaterialFUlUl.s index 48d044540a2..0c951e490e5 100644 --- a/asm/JSystem/J3DGraphBase/J3DMaterial/createPEBlock__11J3DMaterialFUlUl.s +++ b/asm/JSystem/J3DGraphBase/J3DMaterial/createPEBlock__11J3DMaterialFUlUl.s @@ -65,7 +65,7 @@ lbl_80316018: /* 80316050 3C 80 80 3A */ lis r4, j3dDefaultFogInfo@ha /* 0x803A1FBC@ha */ /* 80316054 38 84 1F BC */ addi r4, r4, j3dDefaultFogInfo@l /* 0x803A1FBC@l */ /* 80316058 48 00 F7 A9 */ bl __as__10J3DFogInfoFRC10J3DFogInfo -/* 8031605C A0 02 C9 FA */ lhz r0, struct_804563F8+0x2(r2) +/* 8031605C A0 02 C9 FA */ lhz r0, j3dDefaultAlphaCmpID(r2) /* 80316060 B0 1F 00 30 */ sth r0, 0x30(r31) /* 80316064 38 00 00 00 */ li r0, 0 /* 80316068 98 1F 00 32 */ stb r0, 0x32(r31) @@ -91,7 +91,7 @@ lbl_8031608C: /* 803160B4 3C 80 80 3D */ lis r4, __vt__16J3DPEBlockFogOff@ha /* 0x803CE06C@ha */ /* 803160B8 38 04 E0 6C */ addi r0, r4, __vt__16J3DPEBlockFogOff@l /* 0x803CE06C@l */ /* 803160BC 90 1F 00 00 */ stw r0, 0(r31) -/* 803160C0 A0 02 C9 FA */ lhz r0, struct_804563F8+0x2(r2) +/* 803160C0 A0 02 C9 FA */ lhz r0, j3dDefaultAlphaCmpID(r2) /* 803160C4 B0 1F 00 04 */ sth r0, 4(r31) /* 803160C8 38 00 00 00 */ li r0, 0 /* 803160CC 98 1F 00 06 */ stb r0, 6(r31) diff --git a/asm/JSystem/J3DGraphBase/J3DTransform/__MTGQR7__FUl.s b/asm/JSystem/J3DGraphBase/J3DTransform/__MTGQR7__FUl.s deleted file mode 100644 index c50e89a4ab1..00000000000 --- a/asm/JSystem/J3DGraphBase/J3DTransform/__MTGQR7__FUl.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80311630: -/* 80311630 7C 77 E3 A6 */ mtspr 0x397, r3 -/* 80311634 4E 80 00 20 */ blr diff --git a/asm/JSystem/JAudio2/JAISeMgr/setAudience__8JAISeMgrFP11JAIAudience.s b/asm/JSystem/JAudio2/JAISeMgr/setAudience__8JAISeMgrFP11JAIAudience.s deleted file mode 100644 index 94952b5d524..00000000000 --- a/asm/JSystem/JAudio2/JAISeMgr/setAudience__8JAISeMgrFP11JAIAudience.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_802A03D8: -/* 802A03D8 90 83 00 08 */ stw r4, 8(r3) -/* 802A03DC 4E 80 00 20 */ blr diff --git a/asm/JSystem/JAudio2/JASAiCtrl/getSubFrameCounter__9JASDriverFv.s b/asm/JSystem/JAudio2/JASAiCtrl/getSubFrameCounter__9JASDriverFv.s deleted file mode 100644 index 6459b4437be..00000000000 --- a/asm/JSystem/JAudio2/JASAiCtrl/getSubFrameCounter__9JASDriverFv.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_8029CCD4: -/* 8029CCD4 80 6D 8D 44 */ lwz r3, sSubFrameCounter__9JASDriver(r13) -/* 8029CCD8 4E 80 00 20 */ blr diff --git a/asm/JSystem/JAudio2/JASAiCtrl/getSubFrames__9JASDriverFv.s b/asm/JSystem/JAudio2/JASAiCtrl/getSubFrames__9JASDriverFv.s deleted file mode 100644 index 405c7145f3a..00000000000 --- a/asm/JSystem/JAudio2/JASAiCtrl/getSubFrames__9JASDriverFv.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_8029C9F0: -/* 8029C9F0 80 6D 82 34 */ lwz r3, sSubFrames__9JASDriver(r13) -/* 8029C9F4 4E 80 00 20 */ blr diff --git a/asm/JSystem/JAudio2/JASDSPInterface/setDistFilter__Q26JASDsp8TChannelFs.s b/asm/JSystem/JAudio2/JASDSPInterface/setDistFilter__Q26JASDsp8TChannelFs.s deleted file mode 100644 index 38abaf87744..00000000000 --- a/asm/JSystem/JAudio2/JASDSPInterface/setDistFilter__Q26JASDsp8TChannelFs.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_8029E094: -/* 8029E094 B0 83 01 50 */ sth r4, 0x150(r3) -/* 8029E098 4E 80 00 20 */ blr diff --git a/asm/JSystem/JAudio2/JASDriverIF/getChannelLevel_dsp__9JASDriverFv.s b/asm/JSystem/JAudio2/JASDriverIF/getChannelLevel_dsp__9JASDriverFv.s deleted file mode 100644 index af79a3f321a..00000000000 --- a/asm/JSystem/JAudio2/JASDriverIF/getChannelLevel_dsp__9JASDriverFv.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_8029E150: -/* 8029E150 A0 6D 82 40 */ lhz r3, MAX_MIXERLEVEL__9JASDriver(r13) -/* 8029E154 4E 80 00 20 */ blr diff --git a/asm/JSystem/JAudio2/JASDriverIF/getOutputMode__9JASDriverFv.s b/asm/JSystem/JAudio2/JASDriverIF/getOutputMode__9JASDriverFv.s deleted file mode 100644 index d365af77566..00000000000 --- a/asm/JSystem/JAudio2/JASDriverIF/getOutputMode__9JASDriverFv.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_8029E180: -/* 8029E180 80 6D 82 44 */ lwz r3, JAS_SYSTEM_OUTPUT_MODE__9JASDriver(r13) -/* 8029E184 4E 80 00 20 */ blr diff --git a/asm/JSystem/JAudio2/JASDrumSet/setRelease__Q210JASDrumSet5TPercFUl.s b/asm/JSystem/JAudio2/JASDrumSet/setRelease__Q210JASDrumSet5TPercFUl.s deleted file mode 100644 index 43186a645bf..00000000000 --- a/asm/JSystem/JAudio2/JASDrumSet/setRelease__Q210JASDrumSet5TPercFUl.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_802984E4: -/* 802984E4 B0 83 00 0C */ sth r4, 0xc(r3) -/* 802984E8 4E 80 00 20 */ blr diff --git a/asm/JSystem/JAudio2/JASDvdThread/getThreadPointer__6JASDvdFv.s b/asm/JSystem/JAudio2/JASDvdThread/getThreadPointer__6JASDvdFv.s deleted file mode 100644 index 1a27ccf929b..00000000000 --- a/asm/JSystem/JAudio2/JASDvdThread/getThreadPointer__6JASDvdFv.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_8028FEFC: -/* 8028FEFC 80 6D 8C 88 */ lwz r3, sThread__6JASDvd(r13) -/* 8028FF00 4E 80 00 20 */ blr diff --git a/asm/JSystem/JAudio2/JASHeapCtrl/getCommandHeap__9JASKernelFv.s b/asm/JSystem/JAudio2/JASHeapCtrl/getCommandHeap__9JASKernelFv.s deleted file mode 100644 index 150e710a52b..00000000000 --- a/asm/JSystem/JAudio2/JASHeapCtrl/getCommandHeap__9JASKernelFv.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80290AC8: -/* 80290AC8 80 6D 8C 9C */ lwz r3, sCommandHeap__9JASKernel(r13) -/* 80290ACC 4E 80 00 20 */ blr diff --git a/asm/JSystem/JAudio2/JASHeapCtrl/getSystemHeap__9JASKernelFv.s b/asm/JSystem/JAudio2/JASHeapCtrl/getSystemHeap__9JASKernelFv.s deleted file mode 100644 index a593e49031c..00000000000 --- a/asm/JSystem/JAudio2/JASHeapCtrl/getSystemHeap__9JASKernelFv.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80290AC0: -/* 80290AC0 80 6D 8C 98 */ lwz r3, sSystemHeap__9JASKernel(r13) -/* 80290AC4 4E 80 00 20 */ blr diff --git a/asm/JSystem/JAudio2/JAUSeqDataBlockMgr/setSeqDataArchive__23JAUDynamicSeqDataBlocksFP10JKRArchive.s b/asm/JSystem/JAudio2/JAUSeqDataBlockMgr/setSeqDataArchive__23JAUDynamicSeqDataBlocksFP10JKRArchive.s deleted file mode 100644 index 42a9b999593..00000000000 --- a/asm/JSystem/JAudio2/JAUSeqDataBlockMgr/setSeqDataArchive__23JAUDynamicSeqDataBlocksFP10JKRArchive.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_802A6AA0: -/* 802A6AA0 90 83 00 24 */ stw r4, 0x24(r3) -/* 802A6AA4 4E 80 00 20 */ blr diff --git a/asm/JSystem/JKernel/JKRDvdRipper/isErrorRetry__12JKRDvdRipperFv.s b/asm/JSystem/JKernel/JKRDvdRipper/isErrorRetry__12JKRDvdRipperFv.s deleted file mode 100644 index 0eb82a89e0e..00000000000 --- a/asm/JSystem/JKernel/JKRDvdRipper/isErrorRetry__12JKRDvdRipperFv.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_802DA7D4: -/* 802DA7D4 88 6D 83 48 */ lbz r3, data_804508C8(r13) -/* 802DA7D8 4E 80 00 20 */ blr diff --git a/asm/JSystem/JMath/random/__ct__Q25JMath13TRandom_fast_FUl.s b/asm/JSystem/JMath/random/__ct__Q25JMath13TRandom_fast_FUl.s deleted file mode 100644 index 0516fd88273..00000000000 --- a/asm/JSystem/JMath/random/__ct__Q25JMath13TRandom_fast_FUl.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80339AE4: -/* 80339AE4 90 83 00 00 */ stw r4, 0(r3) -/* 80339AE8 4E 80 00 20 */ blr diff --git a/asm/JSystem/JParticle/JPAChildShape/__ct__13JPAChildShapeFPCUc.s b/asm/JSystem/JParticle/JPAChildShape/__ct__13JPAChildShapeFPCUc.s deleted file mode 100644 index 761929461a8..00000000000 --- a/asm/JSystem/JParticle/JPAChildShape/__ct__13JPAChildShapeFPCUc.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_8027B038: -/* 8027B038 90 83 00 00 */ stw r4, 0(r3) -/* 8027B03C 4E 80 00 20 */ blr diff --git a/asm/JSystem/JParticle/JPAExTexShape/__ct__13JPAExTexShapeFPCUc.s b/asm/JSystem/JParticle/JPAExTexShape/__ct__13JPAExTexShapeFPCUc.s deleted file mode 100644 index 16a5789b2d0..00000000000 --- a/asm/JSystem/JParticle/JPAExTexShape/__ct__13JPAExTexShapeFPCUc.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_8027B13C: -/* 8027B13C 90 83 00 00 */ stw r4, 0(r3) -/* 8027B140 4E 80 00 20 */ blr diff --git a/asm/JSystem/JUtility/JUTConsole/JUTGetReportConsole.s b/asm/JSystem/JUtility/JUTConsole/JUTGetReportConsole.s deleted file mode 100644 index 8fc7cefb18e..00000000000 --- a/asm/JSystem/JUtility/JUTConsole/JUTGetReportConsole.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_802E8528: -/* 802E8528 80 6D 8F F4 */ lwz r3, sReportConsole(r13) -/* 802E852C 4E 80 00 20 */ blr diff --git a/asm/JSystem/JUtility/JUTConsole/JUTGetWarningConsole.s b/asm/JSystem/JUtility/JUTConsole/JUTGetWarningConsole.s deleted file mode 100644 index 3c59a635eba..00000000000 --- a/asm/JSystem/JUtility/JUTConsole/JUTGetWarningConsole.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_802E8538: -/* 802E8538 80 6D 8F F8 */ lwz r3, sWarningConsole(r13) -/* 802E853C 4E 80 00 20 */ blr diff --git a/asm/SSystem/SComponent/c_bg_s_shdw_draw/SetCallback__13cBgS_ShdwDrawFPFP13cBgS_ShdwDrawP10cBgD_Vtx_tiiiP8cM3dGPla_i.s b/asm/SSystem/SComponent/c_bg_s_shdw_draw/SetCallback__13cBgS_ShdwDrawFPFP13cBgS_ShdwDrawP10cBgD_Vtx_tiiiP8cM3dGPla_i.s deleted file mode 100644 index d83d6da9a0d..00000000000 --- a/asm/SSystem/SComponent/c_bg_s_shdw_draw/SetCallback__13cBgS_ShdwDrawFPFP13cBgS_ShdwDrawP10cBgD_Vtx_tiiiP8cM3dGPla_i.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_8026806C: -/* 8026806C 90 83 00 30 */ stw r4, 0x30(r3) -/* 80268070 4E 80 00 20 */ blr diff --git a/asm/TRK_MINNOW_DOLPHIN/ppc/Export/targsupp/TRKAccessFile.s b/asm/TRK_MINNOW_DOLPHIN/ppc/Export/targsupp/TRKAccessFile.s deleted file mode 100644 index 141522089f2..00000000000 --- a/asm/TRK_MINNOW_DOLPHIN/ppc/Export/targsupp/TRKAccessFile.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_803711D0: -/* 803711D0 0F E0 00 00 */ twi 31, r0, 0x0 -/* 803711D4 4E 80 00 20 */ blr diff --git a/asm/TRK_MINNOW_DOLPHIN/ppc/Export/targsupp/TRKCloseFile.s b/asm/TRK_MINNOW_DOLPHIN/ppc/Export/targsupp/TRKCloseFile.s deleted file mode 100644 index 6819bcad95b..00000000000 --- a/asm/TRK_MINNOW_DOLPHIN/ppc/Export/targsupp/TRKCloseFile.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_803711E0: -/* 803711E0 0F E0 00 00 */ twi 31, r0, 0x0 -/* 803711E4 4E 80 00 20 */ blr diff --git a/asm/TRK_MINNOW_DOLPHIN/ppc/Export/targsupp/TRKOpenFile.s b/asm/TRK_MINNOW_DOLPHIN/ppc/Export/targsupp/TRKOpenFile.s deleted file mode 100644 index fa1efb31db8..00000000000 --- a/asm/TRK_MINNOW_DOLPHIN/ppc/Export/targsupp/TRKOpenFile.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_803711D8: -/* 803711D8 0F E0 00 00 */ twi 31, r0, 0x0 -/* 803711DC 4E 80 00 20 */ blr diff --git a/asm/TRK_MINNOW_DOLPHIN/ppc/Export/targsupp/TRKPositionFile.s b/asm/TRK_MINNOW_DOLPHIN/ppc/Export/targsupp/TRKPositionFile.s deleted file mode 100644 index a051d9d841e..00000000000 --- a/asm/TRK_MINNOW_DOLPHIN/ppc/Export/targsupp/TRKPositionFile.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_803711E8: -/* 803711E8 0F E0 00 00 */ twi 31, r0, 0x0 -/* 803711EC 4E 80 00 20 */ blr diff --git a/asm/TRK_MINNOW_DOLPHIN/ppc/Generic/targimpl/__TRK_get_MSR.s b/asm/TRK_MINNOW_DOLPHIN/ppc/Generic/targimpl/__TRK_get_MSR.s deleted file mode 100644 index 08aa71cfc40..00000000000 --- a/asm/TRK_MINNOW_DOLPHIN/ppc/Generic/targimpl/__TRK_get_MSR.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_8036F638: -/* 8036F638 7C 60 00 A6 */ mfmsr r3 -/* 8036F63C 4E 80 00 20 */ blr diff --git a/asm/TRK_MINNOW_DOLPHIN/ppc/Generic/targimpl/__TRK_set_MSR.s b/asm/TRK_MINNOW_DOLPHIN/ppc/Generic/targimpl/__TRK_set_MSR.s deleted file mode 100644 index be63c3bf777..00000000000 --- a/asm/TRK_MINNOW_DOLPHIN/ppc/Generic/targimpl/__TRK_set_MSR.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_8036F640: -/* 8036F640 7C 60 01 24 */ mtmsr r3 -/* 8036F644 4E 80 00 20 */ blr diff --git a/asm/Z2AudioLib/Z2EnvSeMgr/setSnowPower__10Z2EnvSeMgrFSc.s b/asm/Z2AudioLib/Z2EnvSeMgr/setSnowPower__10Z2EnvSeMgrFSc.s deleted file mode 100644 index 60d35e6f0f9..00000000000 --- a/asm/Z2AudioLib/Z2EnvSeMgr/setSnowPower__10Z2EnvSeMgrFSc.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_802C7FB4: -/* 802C7FB4 98 83 01 41 */ stb r4, 0x141(r3) -/* 802C7FB8 4E 80 00 20 */ blr diff --git a/asm/Z2AudioLib/Z2LinkMgr/setKanteraState__14Z2CreatureLinkFUc.s b/asm/Z2AudioLib/Z2LinkMgr/setKanteraState__14Z2CreatureLinkFUc.s deleted file mode 100644 index 11441dbcbab..00000000000 --- a/asm/Z2AudioLib/Z2LinkMgr/setKanteraState__14Z2CreatureLinkFUc.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_802C3778: -/* 802C3778 98 83 00 C5 */ stb r4, 0xc5(r3) -/* 802C377C 4E 80 00 20 */ blr diff --git a/asm/Z2AudioLib/Z2LinkMgr/setLinkHp__14Z2CreatureLinkFll.s b/asm/Z2AudioLib/Z2LinkMgr/setLinkHp__14Z2CreatureLinkFll.s deleted file mode 100644 index 13535f318dc..00000000000 --- a/asm/Z2AudioLib/Z2LinkMgr/setLinkHp__14Z2CreatureLinkFll.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_802C3220: -/* 802C3220 98 83 00 C3 */ stb r4, 0xc3(r3) -/* 802C3224 4E 80 00 20 */ blr diff --git a/asm/Z2AudioLib/Z2LinkMgr/setLinkRiding__14Z2CreatureRideFb.s b/asm/Z2AudioLib/Z2LinkMgr/setLinkRiding__14Z2CreatureRideFb.s deleted file mode 100644 index d4048e132b4..00000000000 --- a/asm/Z2AudioLib/Z2LinkMgr/setLinkRiding__14Z2CreatureRideFb.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_802C522C: -/* 802C522C 98 83 00 98 */ stb r4, 0x98(r3) -/* 802C5230 4E 80 00 20 */ blr diff --git a/asm/Z2AudioLib/Z2LinkMgr/setSinkDepth__14Z2CreatureLinkFSc.s b/asm/Z2AudioLib/Z2LinkMgr/setSinkDepth__14Z2CreatureLinkFSc.s deleted file mode 100644 index c20c7dbc537..00000000000 --- a/asm/Z2AudioLib/Z2LinkMgr/setSinkDepth__14Z2CreatureLinkFSc.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_802C3A64: -/* 802C3A64 98 83 00 CA */ stb r4, 0xca(r3) -/* 802C3A68 4E 80 00 20 */ blr diff --git a/asm/Z2AudioLib/Z2SceneMgr/__ct__10JAISoundIDFUl.s b/asm/Z2AudioLib/Z2SceneMgr/__ct__10JAISoundIDFUl.s deleted file mode 100644 index 93a181d2407..00000000000 --- a/asm/Z2AudioLib/Z2SceneMgr/__ct__10JAISoundIDFUl.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_802B9B60: -/* 802B9B60 90 83 00 00 */ stw r4, 0(r3) -/* 802B9B64 4E 80 00 20 */ blr diff --git a/asm/Z2AudioLib/Z2SoundHandles/initHandlesPool__14Z2SoundHandlesFUc.s b/asm/Z2AudioLib/Z2SoundHandles/initHandlesPool__14Z2SoundHandlesFUc.s deleted file mode 100644 index 8bfa98302f1..00000000000 --- a/asm/Z2AudioLib/Z2SoundHandles/initHandlesPool__14Z2SoundHandlesFUc.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_802AB118: -/* 802AB118 98 83 00 0C */ stb r4, 0xc(r3) -/* 802AB11C 4E 80 00 20 */ blr diff --git a/asm/Z2AudioLib/Z2StatusMgr/setEventBit__11Z2StatusMgrFPv.s b/asm/Z2AudioLib/Z2StatusMgr/setEventBit__11Z2StatusMgrFPv.s deleted file mode 100644 index ce892046b9e..00000000000 --- a/asm/Z2AudioLib/Z2StatusMgr/setEventBit__11Z2StatusMgrFPv.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_802B6758: -/* 802B6758 90 83 00 08 */ stw r4, 8(r3) -/* 802B675C 4E 80 00 20 */ blr diff --git a/asm/Z2AudioLib/Z2WolfHowlMgr/calcPitchMod__13Z2WolfHowlMgrFff.s b/asm/Z2AudioLib/Z2WolfHowlMgr/calcPitchMod__13Z2WolfHowlMgrFff.s index 853947b51c3..f7cb9a3a452 100644 --- a/asm/Z2AudioLib/Z2WolfHowlMgr/calcPitchMod__13Z2WolfHowlMgrFff.s +++ b/asm/Z2AudioLib/Z2WolfHowlMgr/calcPitchMod__13Z2WolfHowlMgrFff.s @@ -39,7 +39,7 @@ lbl_802CACD4: /* 802CAD68 48 00 01 48 */ b lbl_802CAEB0 lbl_802CAD6C: /* 802CAD6C 80 7F 00 88 */ lwz r3, 0x88(r31) -/* 802CAD70 88 0D 83 0E */ lbz r0, struct_8045088C+0x2(r13) +/* 802CAD70 88 0D 83 0E */ lbz r0, data_8045088E(r13) /* 802CAD74 7C 03 00 40 */ cmplw r3, r0 /* 802CAD78 40 80 00 10 */ bge lbl_802CAD88 /* 802CAD7C C0 02 C4 60 */ lfs f0, lit_3485(r2) diff --git a/asm/Z2AudioLib/Z2WolfHowlMgr/calcVolumeMod__13Z2WolfHowlMgrFf.s b/asm/Z2AudioLib/Z2WolfHowlMgr/calcVolumeMod__13Z2WolfHowlMgrFf.s index 0f635589690..5ba869df6a1 100644 --- a/asm/Z2AudioLib/Z2WolfHowlMgr/calcVolumeMod__13Z2WolfHowlMgrFf.s +++ b/asm/Z2AudioLib/Z2WolfHowlMgr/calcVolumeMod__13Z2WolfHowlMgrFf.s @@ -8,7 +8,7 @@ lbl_802CABEC: /* 802CAC04 28 04 00 00 */ cmplwi r4, 0 /* 802CAC08 41 82 00 94 */ beq lbl_802CAC9C /* 802CAC0C 80 7F 00 88 */ lwz r3, 0x88(r31) -/* 802CAC10 88 0D 83 0E */ lbz r0, struct_8045088C+0x2(r13) +/* 802CAC10 88 0D 83 0E */ lbz r0, data_8045088E(r13) /* 802CAC14 7C 03 00 40 */ cmplw r3, r0 /* 802CAC18 40 80 00 18 */ bge lbl_802CAC30 /* 802CAC1C 38 64 00 48 */ addi r3, r4, 0x48 diff --git a/asm/Z2AudioLib/Z2WolfHowlMgr/checkLine__13Z2WolfHowlMgrFv.s b/asm/Z2AudioLib/Z2WolfHowlMgr/checkLine__13Z2WolfHowlMgrFv.s index 820f4262333..5ac8a26d8d3 100644 --- a/asm/Z2AudioLib/Z2WolfHowlMgr/checkLine__13Z2WolfHowlMgrFv.s +++ b/asm/Z2AudioLib/Z2WolfHowlMgr/checkLine__13Z2WolfHowlMgrFv.s @@ -66,7 +66,7 @@ lbl_802CB45C: /* 802CB468 57 A0 06 3E */ clrlwi r0, r29, 0x18 /* 802CB46C 7C 00 18 40 */ cmplw r0, r3 /* 802CB470 41 80 FF CC */ blt lbl_802CB43C -/* 802CB474 88 6D 83 0E */ lbz r3, struct_8045088C+0x2(r13) +/* 802CB474 88 6D 83 0E */ lbz r3, data_8045088E(r13) /* 802CB478 80 1F 00 88 */ lwz r0, 0x88(r31) /* 802CB47C 7C 03 00 50 */ subf r0, r3, r0 /* 802CB480 7C 00 F0 40 */ cmplw r0, r30 @@ -123,7 +123,7 @@ lbl_802CB528: /* 802CB53C 98 1F 00 BC */ stb r0, 0xbc(r31) /* 802CB540 48 00 00 F4 */ b lbl_802CB634 lbl_802CB544: -/* 802CB544 88 0D 83 0E */ lbz r0, struct_8045088C+0x2(r13) +/* 802CB544 88 0D 83 0E */ lbz r0, data_8045088E(r13) /* 802CB548 7C 04 00 40 */ cmplw r4, r0 /* 802CB54C 41 80 00 E8 */ blt lbl_802CB634 /* 802CB550 7F A0 20 50 */ subf r29, r0, r4 diff --git a/asm/Z2AudioLib/Z2WolfHowlMgr/startWolfHowlSound__13Z2WolfHowlMgrFffbf.s b/asm/Z2AudioLib/Z2WolfHowlMgr/startWolfHowlSound__13Z2WolfHowlMgrFffbf.s index a8faab889da..8fc66936ee2 100644 --- a/asm/Z2AudioLib/Z2WolfHowlMgr/startWolfHowlSound__13Z2WolfHowlMgrFffbf.s +++ b/asm/Z2AudioLib/Z2WolfHowlMgr/startWolfHowlSound__13Z2WolfHowlMgrFffbf.s @@ -74,7 +74,7 @@ lbl_802CAFD4: /* 802CAFD4 57 C0 06 3F */ clrlwi. r0, r30, 0x18 /* 802CAFD8 41 82 00 6C */ beq lbl_802CB044 /* 802CAFDC 80 7F 00 88 */ lwz r3, 0x88(r31) -/* 802CAFE0 88 0D 83 0E */ lbz r0, struct_8045088C+0x2(r13) +/* 802CAFE0 88 0D 83 0E */ lbz r0, data_8045088E(r13) /* 802CAFE4 7C 03 00 40 */ cmplw r3, r0 /* 802CAFE8 40 81 00 24 */ ble lbl_802CB00C /* 802CAFEC 3C 60 00 01 */ lis r3, 0x0001 /* 0x00010035@ha */ @@ -103,7 +103,7 @@ lbl_802CB034: /* 802CB040 48 00 00 98 */ b lbl_802CB0D8 lbl_802CB044: /* 802CB044 80 7F 00 88 */ lwz r3, 0x88(r31) -/* 802CB048 88 0D 83 0E */ lbz r0, struct_8045088C+0x2(r13) +/* 802CB048 88 0D 83 0E */ lbz r0, data_8045088E(r13) /* 802CB04C 7C 03 00 40 */ cmplw r3, r0 /* 802CB050 40 81 00 80 */ ble lbl_802CB0D0 /* 802CB054 88 1F 00 8C */ lbz r0, 0x8c(r31) diff --git a/asm/d/a/d_a_alink/setLinkState__14Z2CreatureLinkFUc.s b/asm/d/a/d_a_alink/setLinkState__14Z2CreatureLinkFUc.s deleted file mode 100644 index 9e760a9db6c..00000000000 --- a/asm/d/a/d_a_alink/setLinkState__14Z2CreatureLinkFUc.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80141988: -/* 80141988 98 83 00 C0 */ stb r4, 0xc0(r3) -/* 8014198C 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_npc/entry__18daNpcF_ActorMngr_cFUi.s b/asm/d/a/d_a_npc/entry__18daNpcF_ActorMngr_cFUi.s deleted file mode 100644 index 98c06fe4e5c..00000000000 --- a/asm/d/a/d_a_npc/entry__18daNpcF_ActorMngr_cFUi.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_801506D8: -/* 801506D8 90 83 00 00 */ stw r4, 0(r3) -/* 801506DC 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_npc/setIdx__16daBaseNpc_path_cFUs.s b/asm/d/a/d_a_npc/setIdx__16daBaseNpc_path_cFUs.s deleted file mode 100644 index 73a4874da46..00000000000 --- a/asm/d/a/d_a_npc/setIdx__16daBaseNpc_path_cFUs.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_8014DB0C: -/* 8014DB0C B0 83 0A 10 */ sth r4, 0xa10(r3) -/* 8014DB10 4E 80 00 20 */ blr diff --git a/asm/d/bg/d_bg_plc/setBase__6dBgPlcFPv.s b/asm/d/bg/d_bg_plc/setBase__6dBgPlcFPv.s deleted file mode 100644 index 24dc397f75e..00000000000 --- a/asm/d/bg/d_bg_plc/setBase__6dBgPlcFPv.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_800740BC: -/* 800740BC 90 83 00 00 */ stw r4, 0(r3) -/* 800740C0 4E 80 00 20 */ blr diff --git a/asm/d/bg/d_bg_s/SetOldShapeAngleY__9dBgW_BaseFs.s b/asm/d/bg/d_bg_s/SetOldShapeAngleY__9dBgW_BaseFs.s deleted file mode 100644 index 40d6e6038b2..00000000000 --- a/asm/d/bg/d_bg_s/SetOldShapeAngleY__9dBgW_BaseFs.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80074AB4: -/* 80074AB4 B0 83 00 0C */ sth r4, 0xc(r3) -/* 80074AB8 4E 80 00 20 */ blr diff --git a/asm/d/com/d_com_inf_game/setNowVibration__14dComIfG_play_cFUc.s b/asm/d/com/d_com_inf_game/setNowVibration__14dComIfG_play_cFUc.s deleted file mode 100644 index 405dd38ea01..00000000000 --- a/asm/d/com/d_com_inf_game/setNowVibration__14dComIfG_play_cFUc.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_8002B3A8: -/* 8002B3A8 98 83 4F 5A */ stb r4, 0x4f5a(r3) -/* 8002B3AC 4E 80 00 20 */ blr diff --git a/asm/d/com/d_com_inf_game/setTimerLimitTimeMs__14dComIfG_play_cFi.s b/asm/d/com/d_com_inf_game/setTimerLimitTimeMs__14dComIfG_play_cFi.s deleted file mode 100644 index 9bf9fecbf44..00000000000 --- a/asm/d/com/d_com_inf_game/setTimerLimitTimeMs__14dComIfG_play_cFi.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_8002CBA4: -/* 8002CBA4 90 83 50 00 */ stw r4, 0x5000(r3) -/* 8002CBA8 4E 80 00 20 */ blr diff --git a/asm/d/com/d_com_inf_game/setTimerMode__14dComIfG_play_cFi.s b/asm/d/com/d_com_inf_game/setTimerMode__14dComIfG_play_cFi.s deleted file mode 100644 index b23c84cb4ba..00000000000 --- a/asm/d/com/d_com_inf_game/setTimerMode__14dComIfG_play_cFi.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_8002CBB4: -/* 8002CBB4 90 83 50 04 */ stw r4, 0x5004(r3) -/* 8002CBB8 4E 80 00 20 */ blr diff --git a/asm/d/com/d_com_inf_game/setTimerNowTimeMs__14dComIfG_play_cFi.s b/asm/d/com/d_com_inf_game/setTimerNowTimeMs__14dComIfG_play_cFi.s deleted file mode 100644 index 07a844ce728..00000000000 --- a/asm/d/com/d_com_inf_game/setTimerNowTimeMs__14dComIfG_play_cFi.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_8002CB94: -/* 8002CB94 90 83 4F FC */ stw r4, 0x4ffc(r3) -/* 8002CB98 4E 80 00 20 */ blr diff --git a/asm/d/com/d_com_inf_game/setTimerPtr__14dComIfG_play_cFP8dTimer_c.s b/asm/d/com/d_com_inf_game/setTimerPtr__14dComIfG_play_cFP8dTimer_c.s deleted file mode 100644 index 005abe153c4..00000000000 --- a/asm/d/com/d_com_inf_game/setTimerPtr__14dComIfG_play_cFP8dTimer_c.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_8002CBD4: -/* 8002CBD4 90 83 4F F8 */ stw r4, 0x4ff8(r3) -/* 8002CBD8 4E 80 00 20 */ blr diff --git a/asm/d/com/d_com_inf_game/setTimerType__14dComIfG_play_cFUc.s b/asm/d/com/d_com_inf_game/setTimerType__14dComIfG_play_cFUc.s deleted file mode 100644 index 404bdb10b36..00000000000 --- a/asm/d/com/d_com_inf_game/setTimerType__14dComIfG_play_cFUc.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_8002CBC4: -/* 8002CBC4 98 83 50 08 */ stb r4, 0x5008(r3) -/* 8002CBC8 4E 80 00 20 */ blr diff --git a/asm/d/d_camera/Arg0__11dCamParam_cFUc.s b/asm/d/d_camera/Arg0__11dCamParam_cFUc.s deleted file mode 100644 index f9d32168de1..00000000000 --- a/asm/d/d_camera/Arg0__11dCamParam_cFUc.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80182C74: -/* 80182C74 98 83 00 01 */ stb r4, 1(r3) -/* 80182C78 4E 80 00 20 */ blr diff --git a/asm/d/d_camera/Arg1__11dCamParam_cFUc.s b/asm/d/d_camera/Arg1__11dCamParam_cFUc.s deleted file mode 100644 index 7f30b2abc85..00000000000 --- a/asm/d/d_camera/Arg1__11dCamParam_cFUc.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80182C6C: -/* 80182C6C 98 83 00 02 */ stb r4, 2(r3) -/* 80182C70 4E 80 00 20 */ blr diff --git a/asm/d/d_camera/Fovy__11dCamParam_cFUc.s b/asm/d/d_camera/Fovy__11dCamParam_cFUc.s deleted file mode 100644 index 3d2d3ca97ff..00000000000 --- a/asm/d/d_camera/Fovy__11dCamParam_cFUc.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80182C7C: -/* 80182C7C 98 83 00 00 */ stb r4, 0(r3) -/* 80182C80 4E 80 00 20 */ blr diff --git a/asm/d/d_camera/SetBlureActor__9dCamera_cFP10fopAc_ac_c.s b/asm/d/d_camera/SetBlureActor__9dCamera_cFP10fopAc_ac_c.s deleted file mode 100644 index 7bad06bbb03..00000000000 --- a/asm/d/d_camera/SetBlureActor__9dCamera_cFP10fopAc_ac_c.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80181278: -/* 80181278 90 83 07 10 */ stw r4, 0x710(r3) -/* 8018127C 4E 80 00 20 */ blr diff --git a/asm/d/d_camera/getMidnaActor__9daPy_py_cFv.s b/asm/d/d_camera/getMidnaActor__9daPy_py_cFv.s deleted file mode 100644 index 7106d918e5b..00000000000 --- a/asm/d/d_camera/getMidnaActor__9daPy_py_cFv.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80182ABC: -/* 80182ABC 80 6D 8A 98 */ lwz r3, m_midnaActor__9daPy_py_c(r13) -/* 80182AC0 4E 80 00 20 */ blr diff --git a/asm/d/d_camera/keepLock__12dAttention_cFi.s b/asm/d/d_camera/keepLock__12dAttention_cFi.s deleted file mode 100644 index 58fedfc93e3..00000000000 --- a/asm/d/d_camera/keepLock__12dAttention_cFi.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80182AD0: -/* 80182AD0 90 83 04 C4 */ stw r4, 0x4c4(r3) -/* 80182AD4 4E 80 00 20 */ blr diff --git a/asm/d/d_stage/setArrow__15dStage_roomDt_cFP17stage_arrow_class.s b/asm/d/d_stage/setArrow__15dStage_roomDt_cFP17stage_arrow_class.s deleted file mode 100644 index bf46f3c7f6e..00000000000 --- a/asm/d/d_stage/setArrow__15dStage_roomDt_cFP17stage_arrow_class.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80027534: -/* 80027534 90 83 00 38 */ stw r4, 0x38(r3) -/* 80027538 4E 80 00 20 */ blr diff --git a/asm/d/d_stage/setArrow__16dStage_stageDt_cFP17stage_arrow_class.s b/asm/d/d_stage/setArrow__16dStage_stageDt_cFP17stage_arrow_class.s deleted file mode 100644 index 20d21d94fed..00000000000 --- a/asm/d/d_stage/setArrow__16dStage_stageDt_cFP17stage_arrow_class.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80027E20: -/* 80027E20 90 83 00 0C */ stw r4, 0xc(r3) -/* 80027E24 4E 80 00 20 */ blr diff --git a/asm/d/d_stage/setCamera__15dStage_roomDt_cFP18stage_camera_class.s b/asm/d/d_stage/setCamera__15dStage_roomDt_cFP18stage_camera_class.s deleted file mode 100644 index 10a6f81f277..00000000000 --- a/asm/d/d_stage/setCamera__15dStage_roomDt_cFP18stage_camera_class.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80027524: -/* 80027524 90 83 00 34 */ stw r4, 0x34(r3) -/* 80027528 4E 80 00 20 */ blr diff --git a/asm/d/d_stage/setCamera__16dStage_stageDt_cFP18stage_camera_class.s b/asm/d/d_stage/setCamera__16dStage_stageDt_cFP18stage_camera_class.s deleted file mode 100644 index 4380906c923..00000000000 --- a/asm/d/d_stage/setCamera__16dStage_stageDt_cFP18stage_camera_class.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80027E10: -/* 80027E10 90 83 00 08 */ stw r4, 8(r3) -/* 80027E14 4E 80 00 20 */ blr diff --git a/asm/d/d_stage/setDMap__16dStage_stageDt_cFP13dStage_DMap_c.s b/asm/d/d_stage/setDMap__16dStage_stageDt_cFP13dStage_DMap_c.s deleted file mode 100644 index f3424889d39..00000000000 --- a/asm/d/d_stage/setDMap__16dStage_stageDt_cFP13dStage_DMap_c.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80028208: -/* 80028208 90 83 00 94 */ stw r4, 0x94(r3) -/* 8002820C 4E 80 00 20 */ blr diff --git a/asm/d/d_stage/setDoor__15dStage_roomDt_cFP16stage_tgsc_class.s b/asm/d/d_stage/setDoor__15dStage_roomDt_cFP16stage_tgsc_class.s deleted file mode 100644 index 1da3b184705..00000000000 --- a/asm/d/d_stage/setDoor__15dStage_roomDt_cFP16stage_tgsc_class.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80027D30: -/* 80027D30 90 83 00 58 */ stw r4, 0x58(r3) -/* 80027D34 4E 80 00 20 */ blr diff --git a/asm/d/d_stage/setDoor__16dStage_stageDt_cFP16stage_tgsc_class.s b/asm/d/d_stage/setDoor__16dStage_stageDt_cFP16stage_tgsc_class.s deleted file mode 100644 index 6adea329840..00000000000 --- a/asm/d/d_stage/setDoor__16dStage_stageDt_cFP16stage_tgsc_class.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80028228: -/* 80028228 90 83 00 9C */ stw r4, 0x9c(r3) -/* 8002822C 4E 80 00 20 */ blr diff --git a/asm/d/d_stage/setDrTg__15dStage_roomDt_cFP16stage_tgsc_class.s b/asm/d/d_stage/setDrTg__15dStage_roomDt_cFP16stage_tgsc_class.s deleted file mode 100644 index 4646e119339..00000000000 --- a/asm/d/d_stage/setDrTg__15dStage_roomDt_cFP16stage_tgsc_class.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80027D20: -/* 80027D20 90 83 00 54 */ stw r4, 0x54(r3) -/* 80027D24 4E 80 00 20 */ blr diff --git a/asm/d/d_stage/setDrTg__16dStage_stageDt_cFP16stage_tgsc_class.s b/asm/d/d_stage/setDrTg__16dStage_stageDt_cFP16stage_tgsc_class.s deleted file mode 100644 index cc4c01c1b9a..00000000000 --- a/asm/d/d_stage/setDrTg__16dStage_stageDt_cFP16stage_tgsc_class.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80028218: -/* 80028218 90 83 00 98 */ stw r4, 0x98(r3) -/* 8002821C 4E 80 00 20 */ blr diff --git a/asm/d/d_stage/setElst__16dStage_stageDt_cFP13dStage_Elst_c.s b/asm/d/d_stage/setElst__16dStage_stageDt_cFP13dStage_Elst_c.s deleted file mode 100644 index 0537d1c6415..00000000000 --- a/asm/d/d_stage/setElst__16dStage_stageDt_cFP13dStage_Elst_c.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80028244: -/* 80028244 90 83 00 A0 */ stw r4, 0xa0(r3) -/* 80028248 4E 80 00 20 */ blr diff --git a/asm/d/d_stage/setEnvrInfo__16dStage_stageDt_cFP21stage_envr_info_class.s b/asm/d/d_stage/setEnvrInfo__16dStage_stageDt_cFP21stage_envr_info_class.s deleted file mode 100644 index f1eabf4f3ad..00000000000 --- a/asm/d/d_stage/setEnvrInfo__16dStage_stageDt_cFP21stage_envr_info_class.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80027E88: -/* 80027E88 90 83 00 28 */ stw r4, 0x28(r3) -/* 80027E8C 4E 80 00 20 */ blr diff --git a/asm/d/d_stage/setEnvrNumInfo__16dStage_stageDt_cFi.s b/asm/d/d_stage/setEnvrNumInfo__16dStage_stageDt_cFi.s deleted file mode 100644 index 7b878453b75..00000000000 --- a/asm/d/d_stage/setEnvrNumInfo__16dStage_stageDt_cFi.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80027EE8: -/* 80027EE8 90 83 00 44 */ stw r4, 0x44(r3) -/* 80027EEC 4E 80 00 20 */ blr diff --git a/asm/d/d_stage/setFileList2Info__15dStage_roomDt_cFP21dStage_FileList2_dt_c.s b/asm/d/d_stage/setFileList2Info__15dStage_roomDt_cFP21dStage_FileList2_dt_c.s deleted file mode 100644 index 4abd2593fc9..00000000000 --- a/asm/d/d_stage/setFileList2Info__15dStage_roomDt_cFP21dStage_FileList2_dt_c.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80027B0C: -/* 80027B0C 90 83 00 20 */ stw r4, 0x20(r3) -/* 80027B10 4E 80 00 20 */ blr diff --git a/asm/d/d_stage/setFileListInfo__15dStage_roomDt_cFP20dStage_FileList_dt_c.s b/asm/d/d_stage/setFileListInfo__15dStage_roomDt_cFP20dStage_FileList_dt_c.s deleted file mode 100644 index 37dc01a0d2b..00000000000 --- a/asm/d/d_stage/setFileListInfo__15dStage_roomDt_cFP20dStage_FileList_dt_c.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80027B1C: -/* 80027B1C 90 83 00 24 */ stw r4, 0x24(r3) -/* 80027B20 4E 80 00 20 */ blr diff --git a/asm/d/d_stage/setFloorInfo__15dStage_roomDt_cFP18dStage_FloorInfo_c.s b/asm/d/d_stage/setFloorInfo__15dStage_roomDt_cFP18dStage_FloorInfo_c.s deleted file mode 100644 index ee08668a5f2..00000000000 --- a/asm/d/d_stage/setFloorInfo__15dStage_roomDt_cFP18dStage_FloorInfo_c.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80027B24: -/* 80027B24 90 83 00 5C */ stw r4, 0x5c(r3) -/* 80027B28 4E 80 00 20 */ blr diff --git a/asm/d/d_stage/setFloorInfo__16dStage_stageDt_cFP18dStage_FloorInfo_c.s b/asm/d/d_stage/setFloorInfo__16dStage_stageDt_cFP18dStage_FloorInfo_c.s deleted file mode 100644 index 8f03d159e85..00000000000 --- a/asm/d/d_stage/setFloorInfo__16dStage_stageDt_cFP18dStage_FloorInfo_c.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80028148: -/* 80028148 90 83 00 7C */ stw r4, 0x7c(r3) -/* 8002814C 4E 80 00 20 */ blr diff --git a/asm/d/d_stage/setLbnk__15dStage_roomDt_cFP13dStage_Lbnk_c.s b/asm/d/d_stage/setLbnk__15dStage_roomDt_cFP13dStage_Lbnk_c.s deleted file mode 100644 index 5212ac0f5ce..00000000000 --- a/asm/d/d_stage/setLbnk__15dStage_roomDt_cFP13dStage_Lbnk_c.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80027CF4: -/* 80027CF4 90 83 00 4C */ stw r4, 0x4c(r3) -/* 80027CF8 4E 80 00 20 */ blr diff --git a/asm/d/d_stage/setLightVecInfoNum__15dStage_roomDt_cFi.s b/asm/d/d_stage/setLightVecInfoNum__15dStage_roomDt_cFi.s deleted file mode 100644 index b2fd061f17a..00000000000 --- a/asm/d/d_stage/setLightVecInfoNum__15dStage_roomDt_cFi.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_8002796C: -/* 8002796C 90 83 00 0C */ stw r4, 0xc(r3) -/* 80027970 4E 80 00 20 */ blr diff --git a/asm/d/d_stage/setLightVecInfo__15dStage_roomDt_cFP30stage_pure_lightvec_info_class.s b/asm/d/d_stage/setLightVecInfo__15dStage_roomDt_cFP30stage_pure_lightvec_info_class.s deleted file mode 100644 index 4dcea75c629..00000000000 --- a/asm/d/d_stage/setLightVecInfo__15dStage_roomDt_cFP30stage_pure_lightvec_info_class.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_8002795C: -/* 8002795C 90 83 00 08 */ stw r4, 8(r3) -/* 80027960 4E 80 00 20 */ blr diff --git a/asm/d/d_stage/setMapEventInfo__15dStage_roomDt_cFP21dStage_MapEventInfo_c.s b/asm/d/d_stage/setMapEventInfo__15dStage_roomDt_cFP21dStage_MapEventInfo_c.s deleted file mode 100644 index 0b372eb89e5..00000000000 --- a/asm/d/d_stage/setMapEventInfo__15dStage_roomDt_cFP21dStage_MapEventInfo_c.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80027AFC: -/* 80027AFC 90 83 00 3C */ stw r4, 0x3c(r3) -/* 80027B00 4E 80 00 20 */ blr diff --git a/asm/d/d_stage/setMapEventInfo__16dStage_stageDt_cFP21dStage_MapEventInfo_c.s b/asm/d/d_stage/setMapEventInfo__16dStage_stageDt_cFP21dStage_MapEventInfo_c.s deleted file mode 100644 index 701adecdc6c..00000000000 --- a/asm/d/d_stage/setMapEventInfo__16dStage_stageDt_cFP21dStage_MapEventInfo_c.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80028068: -/* 80028068 90 83 00 38 */ stw r4, 0x38(r3) -/* 8002806C 4E 80 00 20 */ blr diff --git a/asm/d/d_stage/setMapInfoBase__15dStage_roomDt_cFP26stage_map_info_dummy_class.s b/asm/d/d_stage/setMapInfoBase__15dStage_roomDt_cFP26stage_map_info_dummy_class.s deleted file mode 100644 index c6ea08ef939..00000000000 --- a/asm/d/d_stage/setMapInfoBase__15dStage_roomDt_cFP26stage_map_info_dummy_class.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_800275D4: -/* 800275D4 90 83 00 14 */ stw r4, 0x14(r3) -/* 800275D8 4E 80 00 20 */ blr diff --git a/asm/d/d_stage/setMapInfoBase__16dStage_stageDt_cFP26stage_map_info_dummy_class.s b/asm/d/d_stage/setMapInfoBase__16dStage_stageDt_cFP26stage_map_info_dummy_class.s deleted file mode 100644 index 6ec9f007157..00000000000 --- a/asm/d/d_stage/setMapInfoBase__16dStage_stageDt_cFP26stage_map_info_dummy_class.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80027E60: -/* 80027E60 90 83 00 1C */ stw r4, 0x1c(r3) -/* 80027E64 4E 80 00 20 */ blr diff --git a/asm/d/d_stage/setMapInfo__15dStage_roomDt_cFP20stage_map_info_class.s b/asm/d/d_stage/setMapInfo__15dStage_roomDt_cFP20stage_map_info_class.s deleted file mode 100644 index 431c9122233..00000000000 --- a/asm/d/d_stage/setMapInfo__15dStage_roomDt_cFP20stage_map_info_class.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_800275C4: -/* 800275C4 90 83 00 10 */ stw r4, 0x10(r3) -/* 800275C8 4E 80 00 20 */ blr diff --git a/asm/d/d_stage/setMapInfo__16dStage_stageDt_cFP20stage_map_info_class.s b/asm/d/d_stage/setMapInfo__16dStage_stageDt_cFP20stage_map_info_class.s deleted file mode 100644 index 20a1d724202..00000000000 --- a/asm/d/d_stage/setMapInfo__16dStage_stageDt_cFP20stage_map_info_class.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80027E50: -/* 80027E50 90 83 00 18 */ stw r4, 0x18(r3) -/* 80027E54 4E 80 00 20 */ blr diff --git a/asm/d/d_stage/setMemoryConfig__16dStage_stageDt_cFP21dStage_MemoryConfig_c.s b/asm/d/d_stage/setMemoryConfig__16dStage_stageDt_cFP21dStage_MemoryConfig_c.s deleted file mode 100644 index 3c645bfe0c3..00000000000 --- a/asm/d/d_stage/setMemoryConfig__16dStage_stageDt_cFP21dStage_MemoryConfig_c.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80028158: -/* 80028158 90 83 00 80 */ stw r4, 0x80(r3) -/* 8002815C 4E 80 00 20 */ blr diff --git a/asm/d/d_stage/setMemoryMap__16dStage_stageDt_cFP18dStage_MemoryMap_c.s b/asm/d/d_stage/setMemoryMap__16dStage_stageDt_cFP18dStage_MemoryMap_c.s deleted file mode 100644 index eb61e9acf17..00000000000 --- a/asm/d/d_stage/setMemoryMap__16dStage_stageDt_cFP18dStage_MemoryMap_c.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80028168: -/* 80028168 90 83 00 84 */ stw r4, 0x84(r3) -/* 8002816C 4E 80 00 20 */ blr diff --git a/asm/d/d_stage/setMulti__16dStage_stageDt_cFP14dStage_Multi_c.s b/asm/d/d_stage/setMulti__16dStage_stageDt_cFP14dStage_Multi_c.s deleted file mode 100644 index 58d60f4c23c..00000000000 --- a/asm/d/d_stage/setMulti__16dStage_stageDt_cFP14dStage_Multi_c.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80028178: -/* 80028178 90 83 00 88 */ stw r4, 0x88(r3) -/* 8002817C 4E 80 00 20 */ blr diff --git a/asm/d/d_stage/setPaletteInfo__16dStage_stageDt_cFP24stage_palette_info_class.s b/asm/d/d_stage/setPaletteInfo__16dStage_stageDt_cFP24stage_palette_info_class.s deleted file mode 100644 index 9dd94c4e4f1..00000000000 --- a/asm/d/d_stage/setPaletteInfo__16dStage_stageDt_cFP24stage_palette_info_class.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80027E68: -/* 80027E68 90 83 00 20 */ stw r4, 0x20(r3) -/* 80027E6C 4E 80 00 20 */ blr diff --git a/asm/d/d_stage/setPaletteNumInfo__16dStage_stageDt_cFi.s b/asm/d/d_stage/setPaletteNumInfo__16dStage_stageDt_cFi.s deleted file mode 100644 index 6e09d70d085..00000000000 --- a/asm/d/d_stage/setPaletteNumInfo__16dStage_stageDt_cFi.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80027EC8: -/* 80027EC8 90 83 00 3C */ stw r4, 0x3c(r3) -/* 80027ECC 4E 80 00 20 */ blr diff --git a/asm/d/d_stage/setPath2Info__15dStage_roomDt_cFP14dStage_dPath_c.s b/asm/d/d_stage/setPath2Info__15dStage_roomDt_cFP14dStage_dPath_c.s deleted file mode 100644 index 92397343d81..00000000000 --- a/asm/d/d_stage/setPath2Info__15dStage_roomDt_cFP14dStage_dPath_c.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80027ACC: -/* 80027ACC 90 83 00 30 */ stw r4, 0x30(r3) -/* 80027AD0 4E 80 00 20 */ blr diff --git a/asm/d/d_stage/setPath2Info__16dStage_stageDt_cFP14dStage_dPath_c.s b/asm/d/d_stage/setPath2Info__16dStage_stageDt_cFP14dStage_dPath_c.s deleted file mode 100644 index f1b53d30546..00000000000 --- a/asm/d/d_stage/setPath2Info__16dStage_stageDt_cFP14dStage_dPath_c.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80028038: -/* 80028038 90 83 00 70 */ stw r4, 0x70(r3) -/* 8002803C 4E 80 00 20 */ blr diff --git a/asm/d/d_stage/setPathInfo__16dStage_stageDt_cFP14dStage_dPath_c.s b/asm/d/d_stage/setPathInfo__16dStage_stageDt_cFP14dStage_dPath_c.s deleted file mode 100644 index b8791b21ae6..00000000000 --- a/asm/d/d_stage/setPathInfo__16dStage_stageDt_cFP14dStage_dPath_c.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80028018: -/* 80028018 90 83 00 68 */ stw r4, 0x68(r3) -/* 8002801C 4E 80 00 20 */ blr diff --git a/asm/d/d_stage/setPlayerNum__15dStage_roomDt_cFUs.s b/asm/d/d_stage/setPlayerNum__15dStage_roomDt_cFUs.s deleted file mode 100644 index ef48411a395..00000000000 --- a/asm/d/d_stage/setPlayerNum__15dStage_roomDt_cFUs.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_8002754C: -/* 8002754C B0 83 00 60 */ sth r4, 0x60(r3) -/* 80027550 4E 80 00 20 */ blr diff --git a/asm/d/d_stage/setPlayerNum__16dStage_stageDt_cFUs.s b/asm/d/d_stage/setPlayerNum__16dStage_stageDt_cFUs.s deleted file mode 100644 index 3f8d5fae799..00000000000 --- a/asm/d/d_stage/setPlayerNum__16dStage_stageDt_cFUs.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80027E38: -/* 80027E38 B0 83 00 54 */ sth r4, 0x54(r3) -/* 80027E3C 4E 80 00 20 */ blr diff --git a/asm/d/d_stage/setPlayer__15dStage_roomDt_cFP17stage_actor_class.s b/asm/d/d_stage/setPlayer__15dStage_roomDt_cFP17stage_actor_class.s deleted file mode 100644 index bc74e33f3c4..00000000000 --- a/asm/d/d_stage/setPlayer__15dStage_roomDt_cFP17stage_actor_class.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80027544: -/* 80027544 90 83 00 28 */ stw r4, 0x28(r3) -/* 80027548 4E 80 00 20 */ blr diff --git a/asm/d/d_stage/setPlayer__16dStage_stageDt_cFP17stage_actor_class.s b/asm/d/d_stage/setPlayer__16dStage_stageDt_cFP17stage_actor_class.s deleted file mode 100644 index 4ea5fd27b12..00000000000 --- a/asm/d/d_stage/setPlayer__16dStage_stageDt_cFP17stage_actor_class.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80027E30: -/* 80027E30 90 83 00 10 */ stw r4, 0x10(r3) -/* 80027E34 4E 80 00 20 */ blr diff --git a/asm/d/d_stage/setPlightInfo__16dStage_stageDt_cFP23stage_plight_info_class.s b/asm/d/d_stage/setPlightInfo__16dStage_stageDt_cFP23stage_plight_info_class.s deleted file mode 100644 index 59f73c8057b..00000000000 --- a/asm/d/d_stage/setPlightInfo__16dStage_stageDt_cFP23stage_plight_info_class.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80027EB8: -/* 80027EB8 90 83 00 34 */ stw r4, 0x34(r3) -/* 80027EBC 4E 80 00 20 */ blr diff --git a/asm/d/d_stage/setPlightNumInfo__16dStage_stageDt_cFi.s b/asm/d/d_stage/setPlightNumInfo__16dStage_stageDt_cFi.s deleted file mode 100644 index 6dffbcfa899..00000000000 --- a/asm/d/d_stage/setPlightNumInfo__16dStage_stageDt_cFi.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80027FE8: -/* 80027FE8 90 83 00 50 */ stw r4, 0x50(r3) -/* 80027FEC 4E 80 00 20 */ blr diff --git a/asm/d/d_stage/setPnt2Info__15dStage_roomDt_cFP13dStage_dPnt_c.s b/asm/d/d_stage/setPnt2Info__15dStage_roomDt_cFP13dStage_dPnt_c.s deleted file mode 100644 index c0df5d23989..00000000000 --- a/asm/d/d_stage/setPnt2Info__15dStage_roomDt_cFP13dStage_dPnt_c.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80027ABC: -/* 80027ABC 90 83 00 2C */ stw r4, 0x2c(r3) -/* 80027AC0 4E 80 00 20 */ blr diff --git a/asm/d/d_stage/setPnt2Info__16dStage_stageDt_cFP13dStage_dPnt_c.s b/asm/d/d_stage/setPnt2Info__16dStage_stageDt_cFP13dStage_dPnt_c.s deleted file mode 100644 index 7c0a136c79c..00000000000 --- a/asm/d/d_stage/setPnt2Info__16dStage_stageDt_cFP13dStage_dPnt_c.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80028028: -/* 80028028 90 83 00 6C */ stw r4, 0x6c(r3) -/* 8002802C 4E 80 00 20 */ blr diff --git a/asm/d/d_stage/setPntInfo__16dStage_stageDt_cFP13dStage_dPnt_c.s b/asm/d/d_stage/setPntInfo__16dStage_stageDt_cFP13dStage_dPnt_c.s deleted file mode 100644 index 9cc15843449..00000000000 --- a/asm/d/d_stage/setPntInfo__16dStage_stageDt_cFP13dStage_dPnt_c.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80028008: -/* 80028008 90 83 00 64 */ stw r4, 0x64(r3) -/* 8002800C 4E 80 00 20 */ blr diff --git a/asm/d/d_stage/setPselectInfo__16dStage_stageDt_cFP24stage_pselect_info_class.s b/asm/d/d_stage/setPselectInfo__16dStage_stageDt_cFP24stage_pselect_info_class.s deleted file mode 100644 index c05c2a465ef..00000000000 --- a/asm/d/d_stage/setPselectInfo__16dStage_stageDt_cFP24stage_pselect_info_class.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80027E78: -/* 80027E78 90 83 00 24 */ stw r4, 0x24(r3) -/* 80027E7C 4E 80 00 20 */ blr diff --git a/asm/d/d_stage/setPselectNumInfo__16dStage_stageDt_cFi.s b/asm/d/d_stage/setPselectNumInfo__16dStage_stageDt_cFi.s deleted file mode 100644 index 5f4077317ba..00000000000 --- a/asm/d/d_stage/setPselectNumInfo__16dStage_stageDt_cFi.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80027ED8: -/* 80027ED8 90 83 00 40 */ stw r4, 0x40(r3) -/* 80027EDC 4E 80 00 20 */ blr diff --git a/asm/d/d_stage/setRoom__16dStage_stageDt_cFP14roomRead_class.s b/asm/d/d_stage/setRoom__16dStage_stageDt_cFP14roomRead_class.s deleted file mode 100644 index 2053a58e6f5..00000000000 --- a/asm/d/d_stage/setRoom__16dStage_stageDt_cFP14roomRead_class.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80027E48: -/* 80027E48 90 83 00 14 */ stw r4, 0x14(r3) -/* 80027E4C 4E 80 00 20 */ blr diff --git a/asm/d/d_stage/setSclsInfo__15dStage_roomDt_cFP27stage_scls_info_dummy_class.s b/asm/d/d_stage/setSclsInfo__15dStage_roomDt_cFP27stage_scls_info_dummy_class.s deleted file mode 100644 index 9c585f2c9b4..00000000000 --- a/asm/d/d_stage/setSclsInfo__15dStage_roomDt_cFP27stage_scls_info_dummy_class.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_800279E4: -/* 800279E4 90 83 00 48 */ stw r4, 0x48(r3) -/* 800279E8 4E 80 00 20 */ blr diff --git a/asm/d/d_stage/setSclsInfo__16dStage_stageDt_cFP27stage_scls_info_dummy_class.s b/asm/d/d_stage/setSclsInfo__16dStage_stageDt_cFP27stage_scls_info_dummy_class.s deleted file mode 100644 index 6f109e88dbd..00000000000 --- a/asm/d/d_stage/setSclsInfo__16dStage_stageDt_cFP27stage_scls_info_dummy_class.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80028000: -/* 80028000 90 83 00 60 */ stw r4, 0x60(r3) -/* 80028004 4E 80 00 20 */ blr diff --git a/asm/d/d_stage/setSoundInfCL__15dStage_roomDt_cFP18dStage_SoundInfo_c.s b/asm/d/d_stage/setSoundInfCL__15dStage_roomDt_cFP18dStage_SoundInfo_c.s deleted file mode 100644 index 72b8dea985c..00000000000 --- a/asm/d/d_stage/setSoundInfCL__15dStage_roomDt_cFP18dStage_SoundInfo_c.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80027AEC: -/* 80027AEC 90 83 00 44 */ stw r4, 0x44(r3) -/* 80027AF0 4E 80 00 20 */ blr diff --git a/asm/d/d_stage/setSoundInfCL__16dStage_stageDt_cFP18dStage_SoundInfo_c.s b/asm/d/d_stage/setSoundInfCL__16dStage_stageDt_cFP18dStage_SoundInfo_c.s deleted file mode 100644 index 1245a4a0344..00000000000 --- a/asm/d/d_stage/setSoundInfCL__16dStage_stageDt_cFP18dStage_SoundInfo_c.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80028058: -/* 80028058 90 83 00 78 */ stw r4, 0x78(r3) -/* 8002805C 4E 80 00 20 */ blr diff --git a/asm/d/d_stage/setSoundInf__15dStage_roomDt_cFP18dStage_SoundInfo_c.s b/asm/d/d_stage/setSoundInf__15dStage_roomDt_cFP18dStage_SoundInfo_c.s deleted file mode 100644 index a68da976137..00000000000 --- a/asm/d/d_stage/setSoundInf__15dStage_roomDt_cFP18dStage_SoundInfo_c.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80027ADC: -/* 80027ADC 90 83 00 40 */ stw r4, 0x40(r3) -/* 80027AE0 4E 80 00 20 */ blr diff --git a/asm/d/d_stage/setSoundInf__16dStage_stageDt_cFP18dStage_SoundInfo_c.s b/asm/d/d_stage/setSoundInf__16dStage_stageDt_cFP18dStage_SoundInfo_c.s deleted file mode 100644 index bcb04c365cf..00000000000 --- a/asm/d/d_stage/setSoundInf__16dStage_stageDt_cFP18dStage_SoundInfo_c.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80028048: -/* 80028048 90 83 00 74 */ stw r4, 0x74(r3) -/* 8002804C 4E 80 00 20 */ blr diff --git a/asm/d/d_stage/setStagInfo__16dStage_stageDt_cFP21stage_stag_info_class.s b/asm/d/d_stage/setStagInfo__16dStage_stageDt_cFP21stage_stag_info_class.s deleted file mode 100644 index 5726d1076bd..00000000000 --- a/asm/d/d_stage/setStagInfo__16dStage_stageDt_cFP21stage_stag_info_class.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80027FF8: -/* 80027FF8 90 83 00 5C */ stw r4, 0x5c(r3) -/* 80027FFC 4E 80 00 20 */ blr diff --git a/asm/d/d_stage/setTresure__15dStage_roomDt_cFP19stage_tresure_class.s b/asm/d/d_stage/setTresure__15dStage_roomDt_cFP19stage_tresure_class.s deleted file mode 100644 index 89b48aee2de..00000000000 --- a/asm/d/d_stage/setTresure__15dStage_roomDt_cFP19stage_tresure_class.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80027D04: -/* 80027D04 90 83 00 50 */ stw r4, 0x50(r3) -/* 80027D08 4E 80 00 20 */ blr diff --git a/asm/d/d_stage/setTresure__16dStage_stageDt_cFP19stage_tresure_class.s b/asm/d/d_stage/setTresure__16dStage_stageDt_cFP19stage_tresure_class.s deleted file mode 100644 index bcfab6b29a1..00000000000 --- a/asm/d/d_stage/setTresure__16dStage_stageDt_cFP19stage_tresure_class.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_800281F8: -/* 800281F8 90 83 00 90 */ stw r4, 0x90(r3) -/* 800281FC 4E 80 00 20 */ blr diff --git a/asm/d/d_stage/setVrboxInfo__15dStage_roomDt_cFP22stage_vrbox_info_class.s b/asm/d/d_stage/setVrboxInfo__15dStage_roomDt_cFP22stage_vrbox_info_class.s deleted file mode 100644 index a3cc42bdfdd..00000000000 --- a/asm/d/d_stage/setVrboxInfo__15dStage_roomDt_cFP22stage_vrbox_info_class.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80027714: -/* 80027714 90 83 00 18 */ stw r4, 0x18(r3) -/* 80027718 4E 80 00 20 */ blr diff --git a/asm/d/d_stage/setVrboxInfo__16dStage_stageDt_cFP22stage_vrbox_info_class.s b/asm/d/d_stage/setVrboxInfo__16dStage_stageDt_cFP22stage_vrbox_info_class.s deleted file mode 100644 index 938fdc55160..00000000000 --- a/asm/d/d_stage/setVrboxInfo__16dStage_stageDt_cFP22stage_vrbox_info_class.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80027E98: -/* 80027E98 90 83 00 2C */ stw r4, 0x2c(r3) -/* 80027E9C 4E 80 00 20 */ blr diff --git a/asm/d/d_stage/setVrboxNumInfo__15dStage_roomDt_cFi.s b/asm/d/d_stage/setVrboxNumInfo__15dStage_roomDt_cFi.s deleted file mode 100644 index d67bfbfd737..00000000000 --- a/asm/d/d_stage/setVrboxNumInfo__15dStage_roomDt_cFi.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_800278D4: -/* 800278D4 90 83 00 64 */ stw r4, 0x64(r3) -/* 800278D8 4E 80 00 20 */ blr diff --git a/asm/d/d_stage/setVrboxNumInfo__16dStage_stageDt_cFi.s b/asm/d/d_stage/setVrboxNumInfo__16dStage_stageDt_cFi.s deleted file mode 100644 index b6fe6fa5496..00000000000 --- a/asm/d/d_stage/setVrboxNumInfo__16dStage_stageDt_cFi.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80027EF8: -/* 80027EF8 90 83 00 48 */ stw r4, 0x48(r3) -/* 80027EFC 4E 80 00 20 */ blr diff --git a/asm/d/d_stage/setVrboxcolInfo__15dStage_roomDt_cFP25stage_vrboxcol_info_class.s b/asm/d/d_stage/setVrboxcolInfo__15dStage_roomDt_cFP25stage_vrboxcol_info_class.s deleted file mode 100644 index fba1aec8e03..00000000000 --- a/asm/d/d_stage/setVrboxcolInfo__15dStage_roomDt_cFP25stage_vrboxcol_info_class.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80027724: -/* 80027724 90 83 00 1C */ stw r4, 0x1c(r3) -/* 80027728 4E 80 00 20 */ blr diff --git a/asm/d/d_stage/setVrboxcolInfo__16dStage_stageDt_cFP25stage_vrboxcol_info_class.s b/asm/d/d_stage/setVrboxcolInfo__16dStage_stageDt_cFP25stage_vrboxcol_info_class.s deleted file mode 100644 index f0a1c3ee1cd..00000000000 --- a/asm/d/d_stage/setVrboxcolInfo__16dStage_stageDt_cFP25stage_vrboxcol_info_class.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80027EA8: -/* 80027EA8 90 83 00 30 */ stw r4, 0x30(r3) -/* 80027EAC 4E 80 00 20 */ blr diff --git a/asm/d/d_stage/setVrboxcolNumInfo__15dStage_roomDt_cFi.s b/asm/d/d_stage/setVrboxcolNumInfo__15dStage_roomDt_cFi.s deleted file mode 100644 index 049224eef01..00000000000 --- a/asm/d/d_stage/setVrboxcolNumInfo__15dStage_roomDt_cFi.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_800278E4: -/* 800278E4 90 83 00 68 */ stw r4, 0x68(r3) -/* 800278E8 4E 80 00 20 */ blr diff --git a/asm/d/d_stage/setVrboxcolNumInfo__16dStage_stageDt_cFi.s b/asm/d/d_stage/setVrboxcolNumInfo__16dStage_stageDt_cFi.s deleted file mode 100644 index 63b8c4f5989..00000000000 --- a/asm/d/d_stage/setVrboxcolNumInfo__16dStage_stageDt_cFi.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80027F08: -/* 80027F08 90 83 00 4C */ stw r4, 0x4c(r3) -/* 80027F0C 4E 80 00 20 */ blr diff --git a/asm/d/event/d_event/setGtItm__14dEvt_control_cFUc.s b/asm/d/event/d_event/setGtItm__14dEvt_control_cFUc.s deleted file mode 100644 index fa2f835ca6d..00000000000 --- a/asm/d/event/d_event/setGtItm__14dEvt_control_cFUc.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80043724: -/* 80043724 98 83 00 EF */ stb r4, 0xef(r3) -/* 80043728 4E 80 00 20 */ blr diff --git a/asm/d/event/d_event/setPtI_Id__14dEvt_control_cFUi.s b/asm/d/event/d_event/setPtI_Id__14dEvt_control_cFUi.s deleted file mode 100644 index e332f75c72a..00000000000 --- a/asm/d/event/d_event/setPtI_Id__14dEvt_control_cFUi.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_800436EC: -/* 800436EC 90 83 00 D0 */ stw r4, 0xd0(r3) -/* 800436F0 4E 80 00 20 */ blr diff --git a/asm/d/map/d_map_path_dmap/isExistMapPathData__8dMpath_cFv.s b/asm/d/map/d_map_path_dmap/isExistMapPathData__8dMpath_cFv.s deleted file mode 100644 index b440f15adcc..00000000000 --- a/asm/d/map/d_map_path_dmap/isExistMapPathData__8dMpath_cFv.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_8003F758: -/* 8003F758 88 6D 89 08 */ lbz r3, data_80450E88(r13) -/* 8003F75C 4E 80 00 20 */ blr diff --git a/asm/d/map/d_map_path_dmap/remove__8dMpath_cFv.s b/asm/d/map/d_map_path_dmap/remove__8dMpath_cFv.s index 0c52fd20282..98146ce379c 100644 --- a/asm/d/map/d_map_path_dmap/remove__8dMpath_cFv.s +++ b/asm/d/map/d_map_path_dmap/remove__8dMpath_cFv.s @@ -3,7 +3,7 @@ lbl_8003FC70: /* 8003FC74 7C 08 02 A6 */ mflr r0 /* 8003FC78 90 01 00 14 */ stw r0, 0x14(r1) /* 8003FC7C 38 00 00 01 */ li r0, 1 -/* 8003FC80 98 0D 80 B6 */ stb r0, struct_80450634+0x2(r13) +/* 8003FC80 98 0D 80 B6 */ stb r0, data_80450636(r13) /* 8003FC84 3C 60 80 42 */ lis r3, m_texObjAgg__8dMpath_n@ha /* 0x80424684@ha */ /* 8003FC88 38 63 46 84 */ addi r3, r3, m_texObjAgg__8dMpath_n@l /* 0x80424684@l */ /* 8003FC8C 4B FF CC 69 */ bl remove__Q28dMpath_n18dTexObjAggregate_cFv diff --git a/asm/d/map/d_map_path_dmap/reset__8dMpath_cFv.s b/asm/d/map/d_map_path_dmap/reset__8dMpath_cFv.s index 177cf9f50af..c78ea2e9d2b 100644 --- a/asm/d/map/d_map_path_dmap/reset__8dMpath_cFv.s +++ b/asm/d/map/d_map_path_dmap/reset__8dMpath_cFv.s @@ -2,7 +2,7 @@ lbl_8003FBD0: /* 8003FBD0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8003FBD4 7C 08 02 A6 */ mflr r0 /* 8003FBD8 90 01 00 14 */ stw r0, 0x14(r1) -/* 8003FBDC 88 0D 80 B6 */ lbz r0, struct_80450634+0x2(r13) +/* 8003FBDC 88 0D 80 B6 */ lbz r0, data_80450636(r13) /* 8003FBE0 28 00 00 00 */ cmplwi r0, 0 /* 8003FBE4 41 82 00 7C */ beq lbl_8003FC60 /* 8003FBE8 38 C0 00 00 */ li r6, 0 @@ -34,7 +34,7 @@ lbl_8003FC00: /* 8003FC48 38 00 FF 80 */ li r0, -128 /* 8003FC4C 98 0D 80 B5 */ stb r0, struct_80450634+0x1(r13) /* 8003FC50 38 00 00 00 */ li r0, 0 -/* 8003FC54 98 0D 80 B6 */ stb r0, struct_80450634+0x2(r13) +/* 8003FC54 98 0D 80 B6 */ stb r0, data_80450636(r13) /* 8003FC58 98 0D 89 08 */ stb r0, data_80450E88(r13) /* 8003FC5C 4B FF FA B9 */ bl reset__10dMapInfo_cFv lbl_8003FC60: diff --git a/asm/d/meter/d_meter_map/setMapAlpha__11dMeterMap_cFUc.s b/asm/d/meter/d_meter_map/setMapAlpha__11dMeterMap_cFUc.s deleted file mode 100644 index bf7a380b94a..00000000000 --- a/asm/d/meter/d_meter_map/setMapAlpha__11dMeterMap_cFUc.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_8020D8F8: -/* 8020D8F8 98 83 00 2C */ stb r4, 0x2c(r3) -/* 8020D8FC 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_object/dMsgObject_getGroupID__Fv.s b/asm/d/msg/d_msg_object/dMsgObject_getGroupID__Fv.s deleted file mode 100644 index e3c1547e5a4..00000000000 --- a/asm/d/msg/d_msg_object/dMsgObject_getGroupID__Fv.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80232A3C: -/* 80232A3C A8 6D 8B 48 */ lha r3, s_groupID(r13) -/* 80232A40 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_object/setSelectWordFlagLocal__12dMsgObject_cFUc.s b/asm/d/msg/d_msg_object/setSelectWordFlagLocal__12dMsgObject_cFUc.s deleted file mode 100644 index a3dea85c3a5..00000000000 --- a/asm/d/msg/d_msg_object/setSelectWordFlagLocal__12dMsgObject_cFUc.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_802378CC: -/* 802378CC 98 83 04 C6 */ stb r4, 0x4c6(r3) -/* 802378D0 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_object/setTalkActorLocal__12dMsgObject_cFP10fopAc_ac_c.s b/asm/d/msg/d_msg_object/setTalkActorLocal__12dMsgObject_cFP10fopAc_ac_c.s deleted file mode 100644 index a2113fa8f6d..00000000000 --- a/asm/d/msg/d_msg_object/setTalkActorLocal__12dMsgObject_cFP10fopAc_ac_c.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80237F10: -/* 80237F10 90 83 01 38 */ stw r4, 0x138(r3) -/* 80237F14 4E 80 00 20 */ blr diff --git a/asm/d/save/d_save/setSound__19dSv_player_config_cFUc.s b/asm/d/save/d_save/setSound__19dSv_player_config_cFUc.s deleted file mode 100644 index b20372f3fde..00000000000 --- a/asm/d/save/d_save/setSound__19dSv_player_config_cFUc.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_8003468C: -/* 8003468C 98 83 00 01 */ stb r4, 1(r3) -/* 80034690 4E 80 00 20 */ blr diff --git a/asm/d/save/d_save/setVibration__19dSv_player_config_cFUc.s b/asm/d/save/d_save/setVibration__19dSv_player_config_cFUc.s deleted file mode 100644 index 8b03c2032f9..00000000000 --- a/asm/d/save/d_save/setVibration__19dSv_player_config_cFUc.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_8003469C: -/* 8003469C 98 83 00 03 */ stb r4, 3(r3) -/* 800346A0 4E 80 00 20 */ blr diff --git a/asm/dolphin/ar/ar/ARGetSize.s b/asm/dolphin/ar/ar/ARGetSize.s deleted file mode 100644 index d6a763a8feb..00000000000 --- a/asm/dolphin/ar/ar/ARGetSize.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_803507F0: -/* 803507F0 80 6D 93 3C */ lwz r3, __AR_Size(r13) -/* 803507F4 4E 80 00 20 */ blr diff --git a/asm/dolphin/base/PPCArch/PPCMfhid0.s b/asm/dolphin/base/PPCArch/PPCMfhid0.s deleted file mode 100644 index f32e896257a..00000000000 --- a/asm/dolphin/base/PPCArch/PPCMfhid0.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80339CD0: -/* 80339CD0 7C 70 FA A6 */ mfspr r3, 0x3f0 -/* 80339CD4 4E 80 00 20 */ blr diff --git a/asm/dolphin/base/PPCArch/PPCMfhid2.s b/asm/dolphin/base/PPCArch/PPCMfhid2.s deleted file mode 100644 index 06751f4d274..00000000000 --- a/asm/dolphin/base/PPCArch/PPCMfhid2.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80339D8C: -/* 80339D8C 7C 78 E2 A6 */ mfspr r3, 0x398 -/* 80339D90 4E 80 00 20 */ blr diff --git a/asm/dolphin/base/PPCArch/PPCMfl2cr.s b/asm/dolphin/base/PPCArch/PPCMfl2cr.s deleted file mode 100644 index 0cba719369e..00000000000 --- a/asm/dolphin/base/PPCArch/PPCMfl2cr.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80339CE0: -/* 80339CE0 7C 79 FA A6 */ mfspr r3, 0x3f9 -/* 80339CE4 4E 80 00 20 */ blr diff --git a/asm/dolphin/base/PPCArch/PPCMfmsr.s b/asm/dolphin/base/PPCArch/PPCMfmsr.s deleted file mode 100644 index 412a1f5f0c3..00000000000 --- a/asm/dolphin/base/PPCArch/PPCMfmsr.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80339CC0: -/* 80339CC0 7C 60 00 A6 */ mfmsr r3 -/* 80339CC4 4E 80 00 20 */ blr diff --git a/asm/dolphin/base/PPCArch/PPCMtdec.s b/asm/dolphin/base/PPCArch/PPCMtdec.s deleted file mode 100644 index c1a68717585..00000000000 --- a/asm/dolphin/base/PPCArch/PPCMtdec.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80339CF0: -/* 80339CF0 7C 76 03 A6 */ mtspr 0x16, r3 -/* 80339CF4 4E 80 00 20 */ blr diff --git a/asm/dolphin/base/PPCArch/PPCMthid0.s b/asm/dolphin/base/PPCArch/PPCMthid0.s deleted file mode 100644 index 076d1b938bc..00000000000 --- a/asm/dolphin/base/PPCArch/PPCMthid0.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80339CD8: -/* 80339CD8 7C 70 FB A6 */ mtspr 0x3f0, r3 -/* 80339CDC 4E 80 00 20 */ blr diff --git a/asm/dolphin/base/PPCArch/PPCMthid2.s b/asm/dolphin/base/PPCArch/PPCMthid2.s deleted file mode 100644 index 425b6e12c67..00000000000 --- a/asm/dolphin/base/PPCArch/PPCMthid2.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80339D94: -/* 80339D94 7C 78 E3 A6 */ mtspr 0x398, r3 -/* 80339D98 4E 80 00 20 */ blr diff --git a/asm/dolphin/base/PPCArch/PPCMtl2cr.s b/asm/dolphin/base/PPCArch/PPCMtl2cr.s deleted file mode 100644 index 171f16f0645..00000000000 --- a/asm/dolphin/base/PPCArch/PPCMtl2cr.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80339CE8: -/* 80339CE8 7C 79 FB A6 */ mtspr 0x3f9, r3 -/* 80339CEC 4E 80 00 20 */ blr diff --git a/asm/dolphin/base/PPCArch/PPCMtmmcr0.s b/asm/dolphin/base/PPCArch/PPCMtmmcr0.s deleted file mode 100644 index 58619401f7e..00000000000 --- a/asm/dolphin/base/PPCArch/PPCMtmmcr0.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80339D14: -/* 80339D14 7C 78 EB A6 */ mtspr 0x3b8, r3 -/* 80339D18 4E 80 00 20 */ blr diff --git a/asm/dolphin/base/PPCArch/PPCMtmmcr1.s b/asm/dolphin/base/PPCArch/PPCMtmmcr1.s deleted file mode 100644 index f2068b2cbdc..00000000000 --- a/asm/dolphin/base/PPCArch/PPCMtmmcr1.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80339D1C: -/* 80339D1C 7C 7C EB A6 */ mtspr 0x3bc, r3 -/* 80339D20 4E 80 00 20 */ blr diff --git a/asm/dolphin/base/PPCArch/PPCMtmsr.s b/asm/dolphin/base/PPCArch/PPCMtmsr.s deleted file mode 100644 index 86064bc8e7b..00000000000 --- a/asm/dolphin/base/PPCArch/PPCMtmsr.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80339CC8: -/* 80339CC8 7C 60 01 24 */ mtmsr r3 -/* 80339CCC 4E 80 00 20 */ blr diff --git a/asm/dolphin/base/PPCArch/PPCMtpmc1.s b/asm/dolphin/base/PPCArch/PPCMtpmc1.s deleted file mode 100644 index 04a682b05ff..00000000000 --- a/asm/dolphin/base/PPCArch/PPCMtpmc1.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80339D24: -/* 80339D24 7C 79 EB A6 */ mtspr 0x3b9, r3 -/* 80339D28 4E 80 00 20 */ blr diff --git a/asm/dolphin/base/PPCArch/PPCMtpmc2.s b/asm/dolphin/base/PPCArch/PPCMtpmc2.s deleted file mode 100644 index 86f0314537c..00000000000 --- a/asm/dolphin/base/PPCArch/PPCMtpmc2.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80339D2C: -/* 80339D2C 7C 7A EB A6 */ mtspr 0x3ba, r3 -/* 80339D30 4E 80 00 20 */ blr diff --git a/asm/dolphin/base/PPCArch/PPCMtpmc3.s b/asm/dolphin/base/PPCArch/PPCMtpmc3.s deleted file mode 100644 index e0a43b69a0b..00000000000 --- a/asm/dolphin/base/PPCArch/PPCMtpmc3.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80339D34: -/* 80339D34 7C 7D EB A6 */ mtspr 0x3bd, r3 -/* 80339D38 4E 80 00 20 */ blr diff --git a/asm/dolphin/base/PPCArch/PPCMtpmc4.s b/asm/dolphin/base/PPCArch/PPCMtpmc4.s deleted file mode 100644 index b453ed8206c..00000000000 --- a/asm/dolphin/base/PPCArch/PPCMtpmc4.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80339D3C: -/* 80339D3C 7C 7E EB A6 */ mtspr 0x3be, r3 -/* 80339D40 4E 80 00 20 */ blr diff --git a/asm/dolphin/base/PPCArch/PPCMtwpar.s b/asm/dolphin/base/PPCArch/PPCMtwpar.s deleted file mode 100644 index 6e454af2f78..00000000000 --- a/asm/dolphin/base/PPCArch/PPCMtwpar.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80339D9C: -/* 80339D9C 7C 79 E3 A6 */ mtspr 0x399, r3 -/* 80339DA0 4E 80 00 20 */ blr diff --git a/asm/dolphin/base/PPCArch/PPCSetFpNonIEEEMode.s b/asm/dolphin/base/PPCArch/PPCSetFpNonIEEEMode.s deleted file mode 100644 index 36db593fe9f..00000000000 --- a/asm/dolphin/base/PPCArch/PPCSetFpNonIEEEMode.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80339DCC: -/* 80339DCC FF A0 00 4C */ mtfsb1 0x1d -/* 80339DD0 4E 80 00 20 */ blr diff --git a/asm/dolphin/base/PPCArch/PPCSync.s b/asm/dolphin/base/PPCArch/PPCSync.s deleted file mode 100644 index 54436398a4d..00000000000 --- a/asm/dolphin/base/PPCArch/PPCSync.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80339CF8: -/* 80339CF8 44 00 00 02 */ sc -/* 80339CFC 4E 80 00 20 */ blr diff --git a/asm/dolphin/gx/GXFifo/GXGetCPUFifo.s b/asm/dolphin/gx/GXFifo/GXGetCPUFifo.s deleted file mode 100644 index c53c911b00f..00000000000 --- a/asm/dolphin/gx/GXFifo/GXGetCPUFifo.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_8035AEA8: -/* 8035AEA8 80 6D 93 C8 */ lwz r3, CPUFifo(r13) -/* 8035AEAC 4E 80 00 20 */ blr diff --git a/asm/dolphin/gx/GXFifo/GXGetCurrentGXThread.s b/asm/dolphin/gx/GXFifo/GXGetCurrentGXThread.s deleted file mode 100644 index ffb94e5253d..00000000000 --- a/asm/dolphin/gx/GXFifo/GXGetCurrentGXThread.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_8035AEA0: -/* 8035AEA0 80 6D 93 D0 */ lwz r3, __GXCurrentThread(r13) -/* 8035AEA4 4E 80 00 20 */ blr diff --git a/asm/dolphin/gx/GXFifo/GXGetGPFifo.s b/asm/dolphin/gx/GXFifo/GXGetGPFifo.s deleted file mode 100644 index dad124fd3de..00000000000 --- a/asm/dolphin/gx/GXFifo/GXGetGPFifo.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_8035AEB0: -/* 8035AEB0 80 6D 93 CC */ lwz r3, GPFifo(r13) -/* 8035AEB4 4E 80 00 20 */ blr diff --git a/asm/dolphin/os/OSArena/OSGetArenaHi.s b/asm/dolphin/os/OSArena/OSGetArenaHi.s deleted file mode 100644 index c41524c81cd..00000000000 --- a/asm/dolphin/os/OSArena/OSGetArenaHi.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_8033B28C: -/* 8033B28C 80 6D 90 D0 */ lwz r3, __OSArenaHi(r13) -/* 8033B290 4E 80 00 20 */ blr diff --git a/asm/dolphin/os/OSArena/OSGetArenaLo.s b/asm/dolphin/os/OSArena/OSGetArenaLo.s deleted file mode 100644 index 690f1c4f19f..00000000000 --- a/asm/dolphin/os/OSArena/OSGetArenaLo.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_8033B294: -/* 8033B294 80 6D 84 18 */ lwz r3, __OSArenaLo(r13) -/* 8033B298 4E 80 00 20 */ blr diff --git a/asm/dolphin/os/OSTime/OSGetTick.s b/asm/dolphin/os/OSTime/OSGetTick.s deleted file mode 100644 index 80bf9098ca5..00000000000 --- a/asm/dolphin/os/OSTime/OSGetTick.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80342714: -/* 80342714 7C 6C 42 E6 */ mftb r3, 0x10c -/* 80342718 4E 80 00 20 */ blr diff --git a/asm/dolphin/vi/vi/VIGetCurrentFrameBuffer.s b/asm/dolphin/vi/vi/VIGetCurrentFrameBuffer.s deleted file mode 100644 index e8212203dfb..00000000000 --- a/asm/dolphin/vi/vi/VIGetCurrentFrameBuffer.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_8034D838: -/* 8034D838 80 6D 92 B4 */ lwz r3, CurrBufAddr(r13) -/* 8034D83C 4E 80 00 20 */ blr diff --git a/asm/dolphin/vi/vi/VIGetNextFrameBuffer.s b/asm/dolphin/vi/vi/VIGetNextFrameBuffer.s deleted file mode 100644 index 6be69849231..00000000000 --- a/asm/dolphin/vi/vi/VIGetNextFrameBuffer.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_8034D830: -/* 8034D830 80 6D 92 B0 */ lwz r3, NextBufAddr(r13) -/* 8034D834 4E 80 00 20 */ blr diff --git a/asm/dolphin/vi/vi/VIGetRetraceCount.s b/asm/dolphin/vi/vi/VIGetRetraceCount.s deleted file mode 100644 index 849d6272039..00000000000 --- a/asm/dolphin/vi/vi/VIGetRetraceCount.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_8034D8BC: -/* 8034D8BC 80 6D 92 64 */ lwz r3, retraceCount(r13) -/* 8034D8C0 4E 80 00 20 */ blr diff --git a/asm/f_op/f_op_msg_mng/setAlpha__7J2DPaneFUc.s b/asm/f_op/f_op_msg_mng/setAlpha__7J2DPaneFUc.s deleted file mode 100644 index d9007a02144..00000000000 --- a/asm/f_op/f_op_msg_mng/setAlpha__7J2DPaneFUc.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80020158: -/* 80020158 98 83 00 B2 */ stb r4, 0xb2(r3) -/* 8002015C 4E 80 00 20 */ blr diff --git a/asm/init/__get_debug_bba.s b/asm/init/__get_debug_bba.s deleted file mode 100644 index 71213585f86..00000000000 --- a/asm/init/__get_debug_bba.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_8000314C: -/* 8000314C 88 6D 91 50 */ lbz r3, data_804516D0(r13) -/* 80003150 4E 80 00 20 */ blr diff --git a/asm/m_Do/m_Do_Reset/getResetData__6mDoRstFv.s b/asm/m_Do/m_Do_Reset/getResetData__6mDoRstFv.s deleted file mode 100644 index a3145946e62..00000000000 --- a/asm/m_Do/m_Do_Reset/getResetData__6mDoRstFv.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_800157F4: -/* 800157F4 80 6D 86 F8 */ lwz r3, mResetData__6mDoRst(r13) -/* 800157F8 4E 80 00 20 */ blr diff --git a/asm/m_Do/m_Do_ext/__ct__19J3DTevSwapModeTableFv.s b/asm/m_Do/m_Do_ext/__ct__19J3DTevSwapModeTableFv.s index 290106071fd..e303267f173 100644 --- a/asm/m_Do/m_Do_ext/__ct__19J3DTevSwapModeTableFv.s +++ b/asm/m_Do/m_Do_ext/__ct__19J3DTevSwapModeTableFv.s @@ -1,4 +1,4 @@ lbl_8000E134: -/* 8000E134 88 02 C9 F8 */ lbz r0, struct_804563F8+0x0(r2) +/* 8000E134 88 02 C9 F8 */ lbz r0, data_804563F8(r2) /* 8000E138 98 03 00 00 */ stb r0, 0(r3) /* 8000E13C 4E 80 00 20 */ blr diff --git a/asm/m_Do/m_Do_ext/func_8000D8E4.s b/asm/m_Do/m_Do_ext/func_8000D8E4.s deleted file mode 100644 index 5f2b3b7d929..00000000000 --- a/asm/m_Do/m_Do_ext/func_8000D8E4.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_8000D8E4: -/* 8000D8E4 90 83 00 04 */ stw r4, 4(r3) -/* 8000D8E8 4E 80 00 20 */ blr diff --git a/asm/m_Do/m_Do_ext/mDoExt_getArchiveHeapPtr__Fv.s b/asm/m_Do/m_Do_ext/mDoExt_getArchiveHeapPtr__Fv.s deleted file mode 100644 index c7e08bdb1ac..00000000000 --- a/asm/m_Do/m_Do_ext/mDoExt_getArchiveHeapPtr__Fv.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_8000EDF4: -/* 8000EDF4 80 6D 86 B4 */ lwz r3, archiveHeap(r13) -/* 8000EDF8 4E 80 00 20 */ blr diff --git a/asm/m_Do/m_Do_ext/mDoExt_getArchiveHeap__Fv.s b/asm/m_Do/m_Do_ext/mDoExt_getArchiveHeap__Fv.s deleted file mode 100644 index 595904f8d52..00000000000 --- a/asm/m_Do/m_Do_ext/mDoExt_getArchiveHeap__Fv.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_8000EDEC: -/* 8000EDEC 80 6D 86 B4 */ lwz r3, archiveHeap(r13) -/* 8000EDF0 4E 80 00 20 */ blr diff --git a/asm/m_Do/m_Do_ext/mDoExt_getAssertHeap__Fv.s b/asm/m_Do/m_Do_ext/mDoExt_getAssertHeap__Fv.s deleted file mode 100644 index 55be85bb6c0..00000000000 --- a/asm/m_Do/m_Do_ext/mDoExt_getAssertHeap__Fv.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_8000ECE4: -/* 8000ECE4 80 6D 86 A0 */ lwz r3, AssertHeap(r13) -/* 8000ECE8 4E 80 00 20 */ blr diff --git a/asm/m_Do/m_Do_ext/mDoExt_getCommandHeap__Fv.s b/asm/m_Do/m_Do_ext/mDoExt_getCommandHeap__Fv.s deleted file mode 100644 index 395ff002c92..00000000000 --- a/asm/m_Do/m_Do_ext/mDoExt_getCommandHeap__Fv.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_8000EDB0: -/* 8000EDB0 80 6D 86 B0 */ lwz r3, commandHeap(r13) -/* 8000EDB4 4E 80 00 20 */ blr diff --git a/asm/m_Do/m_Do_ext/mDoExt_getCurrentHeap__Fv.s b/asm/m_Do/m_Do_ext/mDoExt_getCurrentHeap__Fv.s deleted file mode 100644 index e2d00efc07e..00000000000 --- a/asm/m_Do/m_Do_ext/mDoExt_getCurrentHeap__Fv.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_8000F1EC: -/* 8000F1EC 80 6D 8D F4 */ lwz r3, sCurrentHeap__7JKRHeap(r13) -/* 8000F1F0 4E 80 00 20 */ blr diff --git a/asm/m_Do/m_Do_ext/mDoExt_getDbPrintHeap__Fv.s b/asm/m_Do/m_Do_ext/mDoExt_getDbPrintHeap__Fv.s deleted file mode 100644 index 916c6278900..00000000000 --- a/asm/m_Do/m_Do_ext/mDoExt_getDbPrintHeap__Fv.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_8000ED14: -/* 8000ED14 80 6D 86 A4 */ lwz r3, DbPrintHeap(r13) -/* 8000ED18 4E 80 00 20 */ blr diff --git a/asm/m_Do/m_Do_ext/mDoExt_getGameHeap__Fv.s b/asm/m_Do/m_Do_ext/mDoExt_getGameHeap__Fv.s deleted file mode 100644 index 32dc37d42e3..00000000000 --- a/asm/m_Do/m_Do_ext/mDoExt_getGameHeap__Fv.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_8000ED50: -/* 8000ED50 80 6D 86 A8 */ lwz r3, gameHeap(r13) -/* 8000ED54 4E 80 00 20 */ blr diff --git a/asm/m_Do/m_Do_ext/mDoExt_getHostIOHeap__Fv.s b/asm/m_Do/m_Do_ext/mDoExt_getHostIOHeap__Fv.s deleted file mode 100644 index 5f1256cf817..00000000000 --- a/asm/m_Do/m_Do_ext/mDoExt_getHostIOHeap__Fv.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_8000EE38: -/* 8000EE38 80 6D 86 BC */ lwz r3, HostIOHeap(r13) -/* 8000EE3C 4E 80 00 20 */ blr diff --git a/asm/m_Do/m_Do_ext/mDoExt_getJ2dHeap__Fv.s b/asm/m_Do/m_Do_ext/mDoExt_getJ2dHeap__Fv.s deleted file mode 100644 index b1ce011f21c..00000000000 --- a/asm/m_Do/m_Do_ext/mDoExt_getJ2dHeap__Fv.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_8000EE30: -/* 8000EE30 80 6D 86 B8 */ lwz r3, j2dHeap(r13) -/* 8000EE34 4E 80 00 20 */ blr diff --git a/asm/m_Do/m_Do_ext/mDoExt_getZeldaHeap__Fv.s b/asm/m_Do/m_Do_ext/mDoExt_getZeldaHeap__Fv.s deleted file mode 100644 index f1cfd107c74..00000000000 --- a/asm/m_Do/m_Do_ext/mDoExt_getZeldaHeap__Fv.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_8000ED80: -/* 8000ED80 80 6D 86 AC */ lwz r3, zeldaHeap(r13) -/* 8000ED84 4E 80 00 20 */ blr diff --git a/asm/m_Do/m_Do_ext/setAnmTransform__17J3DMtxCalcAnmBaseFP15J3DAnmTransform.s b/asm/m_Do/m_Do_ext/setAnmTransform__17J3DMtxCalcAnmBaseFP15J3DAnmTransform.s deleted file mode 100644 index 5f451d52ee7..00000000000 --- a/asm/m_Do/m_Do_ext/setAnmTransform__17J3DMtxCalcAnmBaseFP15J3DAnmTransform.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80014FC0: -/* 80014FC0 90 83 00 04 */ stw r4, 4(r3) -/* 80014FC4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/b/d_a_b_bq/d_a_b_bq/__ct__10JAISoundIDFUl.s b/asm/rel/d/a/b/d_a_b_bq/d_a_b_bq/__ct__10JAISoundIDFUl.s deleted file mode 100644 index 8e876306cbf..00000000000 --- a/asm/rel/d/a/b/d_a_b_bq/d_a_b_bq/__ct__10JAISoundIDFUl.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_805BA26C: -/* 805BA26C 90 83 00 00 */ stw r4, 0(r3) -/* 805BA270 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/b/d_a_b_ob/d_a_b_ob/__ct__10JAISoundIDFUl.s b/asm/rel/d/a/b/d_a_b_ob/d_a_b_ob/__ct__10JAISoundIDFUl.s deleted file mode 100644 index 2ffb9172b68..00000000000 --- a/asm/rel/d/a/b/d_a_b_ob/d_a_b_ob/__ct__10JAISoundIDFUl.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_8061AC04: -/* 8061AC04 90 83 00 00 */ stw r4, 0(r3) -/* 8061AC08 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_cow/d_a_cow/action_enter__7daCow_cFv.s b/asm/rel/d/a/d_a_cow/d_a_cow/action_enter__7daCow_cFv.s index 62b4d5f3788..bc876acac59 100644 --- a/asm/rel/d/a/d_a_cow/d_a_cow/action_enter__7daCow_cFv.s +++ b/asm/rel/d/a/d_a_cow/d_a_cow/action_enter__7daCow_cFv.s @@ -106,8 +106,8 @@ lbl_8065C870: /* 8065C884 D0 01 00 50 */ stfs f0, 0x50(r1) /* 8065C888 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ /* 8065C88C 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 8065C890 3C 80 80 66 */ lis r4, struct_80662FB8+0x0@ha /* 0x80662FB8@ha */ -/* 8065C894 A8 04 2F B8 */ lha r0, struct_80662FB8+0x0@l(r4) /* 0x80662FB8@l */ +/* 8065C890 3C 80 80 66 */ lis r4, data_80662FB8@ha /* 0x80662FB8@ha */ +/* 8065C894 A8 04 2F B8 */ lha r0, data_80662FB8@l(r4) /* 0x80662FB8@l */ /* 8065C898 7C 00 00 D0 */ neg r0, r0 /* 8065C89C 7C 04 07 34 */ extsh r4, r0 /* 8065C8A0 4B 9A FB 3D */ bl mDoMtx_YrotS__FPA4_fs @@ -208,8 +208,8 @@ lbl_8065C9F8: /* 8065C9F8 7F A3 EB 78 */ mr r3, r29 /* 8065C9FC 38 80 00 00 */ li r4, 0 /* 8065CA00 4B FF BB CD */ bl calcRunAnime__7daCow_cFi -/* 8065CA04 3C 60 80 66 */ lis r3, struct_80662FB8+0x0@ha /* 0x80662FB8@ha */ -/* 8065CA08 A8 03 2F B8 */ lha r0, struct_80662FB8+0x0@l(r3) /* 0x80662FB8@l */ +/* 8065CA04 3C 60 80 66 */ lis r3, data_80662FB8@ha /* 0x80662FB8@ha */ +/* 8065CA08 A8 03 2F B8 */ lha r0, data_80662FB8@l(r3) /* 0x80662FB8@l */ /* 8065CA0C B0 1D 0C 72 */ sth r0, 0xc72(r29) /* 8065CA10 38 7D 04 DE */ addi r3, r29, 0x4de /* 8065CA14 A8 9D 0C 72 */ lha r4, 0xc72(r29) @@ -259,8 +259,8 @@ lbl_8065CA5C: /* 8065CAC0 D3 C1 00 50 */ stfs f30, 0x50(r1) /* 8065CAC4 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ /* 8065CAC8 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 8065CACC 3C 80 80 66 */ lis r4, struct_80662FB8+0x0@ha /* 0x80662FB8@ha */ -/* 8065CAD0 38 84 2F B8 */ addi r4, r4, struct_80662FB8+0x0@l /* 0x80662FB8@l */ +/* 8065CACC 3C 80 80 66 */ lis r4, data_80662FB8@ha /* 0x80662FB8@ha */ +/* 8065CAD0 38 84 2F B8 */ addi r4, r4, data_80662FB8@l /* 0x80662FB8@l */ /* 8065CAD4 A8 84 00 00 */ lha r4, 0(r4) /* 8065CAD8 4B 9A F9 05 */ bl mDoMtx_YrotS__FPA4_fs /* 8065CADC 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ diff --git a/asm/rel/d/a/d_a_cow/d_a_cow/checkCowInOwn__7daCow_cFi.s b/asm/rel/d/a/d_a_cow/d_a_cow/checkCowInOwn__7daCow_cFi.s index 3a3010a3997..1e38b729908 100644 --- a/asm/rel/d/a/d_a_cow/d_a_cow/checkCowInOwn__7daCow_cFi.s +++ b/asm/rel/d/a/d_a_cow/d_a_cow/checkCowInOwn__7daCow_cFi.s @@ -25,8 +25,8 @@ lbl_8065BB64: /* 8065BB8C D0 01 00 28 */ stfs f0, 0x28(r1) /* 8065BB90 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ /* 8065BB94 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 8065BB98 3C 80 80 66 */ lis r4, struct_80662FB8+0x0@ha /* 0x80662FB8@ha */ -/* 8065BB9C A8 04 2F B8 */ lha r0, struct_80662FB8+0x0@l(r4) /* 0x80662FB8@l */ +/* 8065BB98 3C 80 80 66 */ lis r4, data_80662FB8@ha /* 0x80662FB8@ha */ +/* 8065BB9C A8 04 2F B8 */ lha r0, data_80662FB8@l(r4) /* 0x80662FB8@l */ /* 8065BBA0 7C 00 00 D0 */ neg r0, r0 /* 8065BBA4 7C 04 07 34 */ extsh r4, r0 /* 8065BBA8 4B 9B 08 35 */ bl mDoMtx_YrotS__FPA4_fs @@ -47,8 +47,8 @@ lbl_8065BB64: /* 8065BBE4 C0 03 2E 70 */ lfs f0, lit_5517@l(r3) /* 0x80662E70@l */ /* 8065BBE8 FC 01 00 40 */ fcmpo cr0, f1, f0 /* 8065BBEC 40 80 00 60 */ bge lbl_8065BC4C -/* 8065BBF0 3C 60 80 66 */ lis r3, struct_80662FB8+0x0@ha /* 0x80662FB8@ha */ -/* 8065BBF4 38 63 2F B8 */ addi r3, r3, struct_80662FB8+0x0@l /* 0x80662FB8@l */ +/* 8065BBF0 3C 60 80 66 */ lis r3, data_80662FB8@ha /* 0x80662FB8@ha */ +/* 8065BBF4 38 63 2F B8 */ addi r3, r3, data_80662FB8@l /* 0x80662FB8@l */ /* 8065BBF8 A8 63 00 00 */ lha r3, 0(r3) /* 8065BBFC A8 9E 0C 34 */ lha r4, 0xc34(r30) /* 8065BC00 4B C1 52 25 */ bl cLib_distanceAngleS__Fss diff --git a/asm/rel/d/a/d_a_cow/d_a_cow/checkCowIn__7daCow_cFff.s b/asm/rel/d/a/d_a_cow/d_a_cow/checkCowIn__7daCow_cFff.s index ab342457c8b..fb99131ae49 100644 --- a/asm/rel/d/a/d_a_cow/d_a_cow/checkCowIn__7daCow_cFff.s +++ b/asm/rel/d/a/d_a_cow/d_a_cow/checkCowIn__7daCow_cFff.s @@ -24,8 +24,8 @@ lbl_8065BA68: /* 8065BA84 FC 1F F0 40 */ fcmpo cr0, f31, f30 /* 8065BA88 40 80 00 4C */ bge lbl_8065BAD4 /* 8065BA8C 7C 65 07 34 */ extsh r5, r3 -/* 8065BA90 3C 80 80 66 */ lis r4, struct_80662FB8+0x0@ha /* 0x80662FB8@ha */ -/* 8065BA94 38 84 2F B8 */ addi r4, r4, struct_80662FB8+0x0@l /* 0x80662FB8@l */ +/* 8065BA90 3C 80 80 66 */ lis r4, data_80662FB8@ha /* 0x80662FB8@ha */ +/* 8065BA94 38 84 2F B8 */ addi r4, r4, data_80662FB8@l /* 0x80662FB8@l */ /* 8065BA98 A8 84 00 00 */ lha r4, 0(r4) /* 8065BA9C 38 04 20 00 */ addi r0, r4, 0x2000 /* 8065BAA0 7C 05 00 00 */ cmpw r5, r0 @@ -44,8 +44,8 @@ lbl_8065BACC: /* 8065BAD0 48 00 00 48 */ b lbl_8065BB18 lbl_8065BAD4: /* 8065BAD4 7C 65 07 34 */ extsh r5, r3 -/* 8065BAD8 3C 80 80 66 */ lis r4, struct_80662FB8+0x0@ha /* 0x80662FB8@ha */ -/* 8065BADC 38 84 2F B8 */ addi r4, r4, struct_80662FB8+0x0@l /* 0x80662FB8@l */ +/* 8065BAD8 3C 80 80 66 */ lis r4, data_80662FB8@ha /* 0x80662FB8@ha */ +/* 8065BADC 38 84 2F B8 */ addi r4, r4, data_80662FB8@l /* 0x80662FB8@l */ /* 8065BAE0 A8 84 00 00 */ lha r4, 0(r4) /* 8065BAE4 38 04 2A AA */ addi r0, r4, 0x2aaa /* 8065BAE8 7C 05 00 00 */ cmpw r5, r0 diff --git a/asm/rel/d/a/d_a_cow/d_a_cow/checkOutOfGate__7daCow_cF4cXyz.s b/asm/rel/d/a/d_a_cow/d_a_cow/checkOutOfGate__7daCow_cF4cXyz.s index 08ae65f2705..49c962997d7 100644 --- a/asm/rel/d/a/d_a_cow/d_a_cow/checkOutOfGate__7daCow_cF4cXyz.s +++ b/asm/rel/d/a/d_a_cow/d_a_cow/checkOutOfGate__7daCow_cF4cXyz.s @@ -23,8 +23,8 @@ lbl_8065B788: /* 8065B7B0 D0 01 00 28 */ stfs f0, 0x28(r1) /* 8065B7B4 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ /* 8065B7B8 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 8065B7BC 3C 80 80 66 */ lis r4, struct_80662FB8+0x2@ha /* 0x80662FBA@ha */ -/* 8065B7C0 38 84 2F BA */ addi r4, r4, struct_80662FB8+0x2@l /* 0x80662FBA@l */ +/* 8065B7BC 3C 80 80 66 */ lis r4, data_80662FBA@ha /* 0x80662FBA@ha */ +/* 8065B7C0 38 84 2F BA */ addi r4, r4, data_80662FBA@l /* 0x80662FBA@l */ /* 8065B7C4 A8 84 00 00 */ lha r4, 0(r4) /* 8065B7C8 4B 9B 0C 15 */ bl mDoMtx_YrotS__FPA4_fs /* 8065B7CC 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ @@ -60,8 +60,8 @@ lbl_8065B818: /* 8065B840 D0 01 00 28 */ stfs f0, 0x28(r1) /* 8065B844 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ /* 8065B848 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 8065B84C 3C 80 80 66 */ lis r4, struct_80662FB8+0x0@ha /* 0x80662FB8@ha */ -/* 8065B850 A8 04 2F B8 */ lha r0, struct_80662FB8+0x0@l(r4) /* 0x80662FB8@l */ +/* 8065B84C 3C 80 80 66 */ lis r4, data_80662FB8@ha /* 0x80662FB8@ha */ +/* 8065B850 A8 04 2F B8 */ lha r0, data_80662FB8@l(r4) /* 0x80662FB8@l */ /* 8065B854 7C 00 00 D0 */ neg r0, r0 /* 8065B858 7C 04 07 34 */ extsh r4, r0 /* 8065B85C 4B 9B 0B 81 */ bl mDoMtx_YrotS__FPA4_fs diff --git a/asm/rel/d/a/e/d_a_e_po/d_a_e_po/__ct__10JAISoundIDFUl.s b/asm/rel/d/a/e/d_a_e_po/d_a_e_po/__ct__10JAISoundIDFUl.s deleted file mode 100644 index bc92f36a7c3..00000000000 --- a/asm/rel/d/a/e/d_a_e_po/d_a_e_po/__ct__10JAISoundIDFUl.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_807573C0: -/* 807573C0 90 83 00 00 */ stw r4, 0(r3) -/* 807573C4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/e/d_a_e_po/d_a_e_po/action__FP10e_po_class.s b/asm/rel/d/a/e/d_a_e_po/d_a_e_po/action__FP10e_po_class.s index f40b9bed5a8..606cbc9e1ca 100644 --- a/asm/rel/d/a/e/d_a_e_po/d_a_e_po/action__FP10e_po_class.s +++ b/asm/rel/d/a/e/d_a_e_po/d_a_e_po/action__FP10e_po_class.s @@ -75,8 +75,8 @@ lbl_80754BCC: /* 80754BF0 2C 00 00 04 */ cmpwi r0, 4 /* 80754BF4 41 82 00 2C */ beq lbl_80754C20 /* 80754BF8 7F 83 E3 78 */ mr r3, r28 -/* 80754BFC 3C 80 80 75 */ lis r4, struct_80757AD4+0x6@ha /* 0x80757ADA@ha */ -/* 80754C00 38 84 7A DA */ addi r4, r4, struct_80757AD4+0x6@l /* 0x80757ADA@l */ +/* 80754BFC 3C 80 80 75 */ lis r4, mAttackNo@ha /* 0x80757ADA@ha */ +/* 80754C00 38 84 7A DA */ addi r4, r4, mAttackNo@l /* 0x80757ADA@l */ /* 80754C04 A8 84 00 00 */ lha r4, 0(r4) /* 80754C08 4B FF 79 E5 */ bl mArg0Check__FP10e_po_classs /* 80754C0C 2C 03 00 00 */ cmpwi r3, 0 @@ -99,8 +99,8 @@ lbl_80754C28: /* 80754C48 2C 03 00 02 */ cmpwi r3, 2 /* 80754C4C 40 82 00 70 */ bne lbl_80754CBC /* 80754C50 7F 83 E3 78 */ mr r3, r28 -/* 80754C54 3C 80 80 75 */ lis r4, struct_80757AD4+0x6@ha /* 0x80757ADA@ha */ -/* 80754C58 38 84 7A DA */ addi r4, r4, struct_80757AD4+0x6@l /* 0x80757ADA@l */ +/* 80754C54 3C 80 80 75 */ lis r4, mAttackNo@ha /* 0x80757ADA@ha */ +/* 80754C58 38 84 7A DA */ addi r4, r4, mAttackNo@l /* 0x80757ADA@l */ /* 80754C5C A8 84 00 00 */ lha r4, 0(r4) /* 80754C60 4B FF 79 8D */ bl mArg0Check__FP10e_po_classs /* 80754C64 2C 03 00 00 */ cmpwi r3, 0 diff --git a/asm/rel/d/a/e/d_a_e_po/d_a_e_po/daE_PO_Draw__FP10e_po_class.s b/asm/rel/d/a/e/d_a_e_po/d_a_e_po/daE_PO_Draw__FP10e_po_class.s index 992f3ec7bc7..09e34670a21 100644 --- a/asm/rel/d/a/e/d_a_e_po/d_a_e_po/daE_PO_Draw__FP10e_po_class.s +++ b/asm/rel/d/a/e/d_a_e_po/d_a_e_po/daE_PO_Draw__FP10e_po_class.s @@ -202,8 +202,8 @@ lbl_8074CB14: /* 8074CB54 2C 03 00 02 */ cmpwi r3, 2 /* 8074CB58 40 82 00 20 */ bne lbl_8074CB78 /* 8074CB5C 7F A3 EB 78 */ mr r3, r29 -/* 8074CB60 3C 80 80 75 */ lis r4, struct_80757AD4+0x6@ha /* 0x80757ADA@ha */ -/* 8074CB64 38 84 7A DA */ addi r4, r4, struct_80757AD4+0x6@l /* 0x80757ADA@l */ +/* 8074CB60 3C 80 80 75 */ lis r4, mAttackNo@ha /* 0x80757ADA@ha */ +/* 8074CB64 38 84 7A DA */ addi r4, r4, mAttackNo@l /* 0x80757ADA@l */ /* 8074CB68 A8 84 00 00 */ lha r4, 0(r4) /* 8074CB6C 4B FF FA 81 */ bl mArg0Check__FP10e_po_classs /* 8074CB70 2C 03 00 00 */ cmpwi r3, 0 diff --git a/asm/rel/d/a/e/d_a_e_po/d_a_e_po/e_po_attack__FP10e_po_class.s b/asm/rel/d/a/e/d_a_e_po/d_a_e_po/e_po_attack__FP10e_po_class.s index 71580a208e6..f27bb54c8f5 100644 --- a/asm/rel/d/a/e/d_a_e_po/d_a_e_po/e_po_attack__FP10e_po_class.s +++ b/asm/rel/d/a/e/d_a_e_po/d_a_e_po/e_po_attack__FP10e_po_class.s @@ -220,8 +220,8 @@ lbl_8074DF60: /* 8074DF68 4B FF E6 85 */ bl mArg0Check__FP10e_po_classs /* 8074DF6C 2C 03 00 02 */ cmpwi r3, 2 /* 8074DF70 40 82 00 28 */ bne lbl_8074DF98 -/* 8074DF74 3C 60 80 75 */ lis r3, struct_80757AD4+0x6@ha /* 0x80757ADA@ha */ -/* 8074DF78 A8 03 7A DA */ lha r0, struct_80757AD4+0x6@l(r3) /* 0x80757ADA@l */ +/* 8074DF74 3C 60 80 75 */ lis r3, mAttackNo@ha /* 0x80757ADA@ha */ +/* 8074DF78 A8 03 7A DA */ lha r0, mAttackNo@l(r3) /* 0x80757ADA@l */ /* 8074DF7C 2C 00 00 00 */ cmpwi r0, 0 /* 8074DF80 40 82 00 18 */ bne lbl_8074DF98 /* 8074DF84 38 00 00 01 */ li r0, 1 diff --git a/asm/rel/d/a/e/d_a_e_po/d_a_e_po/e_po_damage__FP10e_po_class.s b/asm/rel/d/a/e/d_a_e_po/d_a_e_po/e_po_damage__FP10e_po_class.s index eb7d47332f2..8752312d535 100644 --- a/asm/rel/d/a/e/d_a_e_po/d_a_e_po/e_po_damage__FP10e_po_class.s +++ b/asm/rel/d/a/e/d_a_e_po/d_a_e_po/e_po_damage__FP10e_po_class.s @@ -22,8 +22,8 @@ lbl_8074E530: /* 8074E538 2C 03 00 02 */ cmpwi r3, 2 /* 8074E53C 40 82 00 38 */ bne lbl_8074E574 /* 8074E540 38 00 00 00 */ li r0, 0 -/* 8074E544 3C 60 80 75 */ lis r3, struct_80757AD4+0x6@ha /* 0x80757ADA@ha */ -/* 8074E548 B0 03 7A DA */ sth r0, struct_80757AD4+0x6@l(r3) /* 0x80757ADA@l */ +/* 8074E544 3C 60 80 75 */ lis r3, mAttackNo@ha /* 0x80757ADA@ha */ +/* 8074E548 B0 03 7A DA */ sth r0, mAttackNo@l(r3) /* 0x80757ADA@l */ /* 8074E54C 88 9E 05 BF */ lbz r4, 0x5bf(r30) /* 8074E550 28 04 00 FF */ cmplwi r4, 0xff /* 8074E554 41 82 00 18 */ beq lbl_8074E56C @@ -90,8 +90,8 @@ lbl_8074E60C: /* 8074E634 D8 01 00 08 */ stfd f0, 8(r1) /* 8074E638 80 01 00 0C */ lwz r0, 0xc(r1) /* 8074E63C 54 00 06 3E */ clrlwi r0, r0, 0x18 -/* 8074E640 3C 60 80 75 */ lis r3, struct_80757AD4+0x6@ha /* 0x80757ADA@ha */ -/* 8074E644 B4 03 7A DA */ sthu r0, struct_80757AD4+0x6@l(r3) /* 0x80757ADA@l */ +/* 8074E640 3C 60 80 75 */ lis r3, mAttackNo@ha /* 0x80757ADA@ha */ +/* 8074E644 B4 03 7A DA */ sthu r0, mAttackNo@l(r3) /* 0x80757ADA@l */ /* 8074E648 2C 00 00 06 */ cmpwi r0, 6 /* 8074E64C 40 81 00 0C */ ble lbl_8074E658 /* 8074E650 38 00 00 03 */ li r0, 3 diff --git a/asm/rel/d/a/e/d_a_e_po/d_a_e_po/e_po_limbering__FP10e_po_class.s b/asm/rel/d/a/e/d_a_e_po/d_a_e_po/e_po_limbering__FP10e_po_class.s index 79b82e24d9d..813eccffb3e 100644 --- a/asm/rel/d/a/e/d_a_e_po/d_a_e_po/e_po_limbering__FP10e_po_class.s +++ b/asm/rel/d/a/e/d_a_e_po/d_a_e_po/e_po_limbering__FP10e_po_class.s @@ -476,8 +476,8 @@ lbl_807509D4: /* 80750A1C D8 01 00 68 */ stfd f0, 0x68(r1) /* 80750A20 80 01 00 6C */ lwz r0, 0x6c(r1) /* 80750A24 54 00 06 3E */ clrlwi r0, r0, 0x18 -/* 80750A28 3C 60 80 75 */ lis r3, struct_80757AD4+0x6@ha /* 0x80757ADA@ha */ -/* 80750A2C B4 03 7A DA */ sthu r0, struct_80757AD4+0x6@l(r3) /* 0x80757ADA@l */ +/* 80750A28 3C 60 80 75 */ lis r3, mAttackNo@ha /* 0x80757ADA@ha */ +/* 80750A2C B4 03 7A DA */ sthu r0, mAttackNo@l(r3) /* 0x80757ADA@l */ /* 80750A30 2C 00 00 06 */ cmpwi r0, 6 /* 80750A34 40 81 00 0C */ ble lbl_80750A40 /* 80750A38 38 00 00 03 */ li r0, 3 diff --git a/asm/rel/d/a/e/d_a_e_po/d_a_e_po/e_po_wolfbite__FP10e_po_class.s b/asm/rel/d/a/e/d_a_e_po/d_a_e_po/e_po_wolfbite__FP10e_po_class.s index 677df20ec32..285aab8413b 100644 --- a/asm/rel/d/a/e/d_a_e_po/d_a_e_po/e_po_wolfbite__FP10e_po_class.s +++ b/asm/rel/d/a/e/d_a_e_po/d_a_e_po/e_po_wolfbite__FP10e_po_class.s @@ -31,8 +31,8 @@ lbl_8074E6F8: /* 8074E700 2C 03 00 02 */ cmpwi r3, 2 /* 8074E704 40 82 00 18 */ bne lbl_8074E71C /* 8074E708 38 00 00 00 */ li r0, 0 -/* 8074E70C 3C 60 80 75 */ lis r3, struct_80757AD4+0x6@ha /* 0x80757ADA@ha */ -/* 8074E710 B0 03 7A DA */ sth r0, struct_80757AD4+0x6@l(r3) /* 0x80757ADA@l */ +/* 8074E70C 3C 60 80 75 */ lis r3, mAttackNo@ha /* 0x80757ADA@ha */ +/* 8074E710 B0 03 7A DA */ sth r0, mAttackNo@l(r3) /* 0x80757ADA@l */ /* 8074E714 38 00 00 03 */ li r0, 3 /* 8074E718 98 1E 05 BC */ stb r0, 0x5bc(r30) lbl_8074E71C: @@ -245,8 +245,8 @@ lbl_8074E9F8: /* 8074EA20 D8 01 00 10 */ stfd f0, 0x10(r1) /* 8074EA24 80 01 00 14 */ lwz r0, 0x14(r1) /* 8074EA28 54 00 06 3E */ clrlwi r0, r0, 0x18 -/* 8074EA2C 3C 60 80 75 */ lis r3, struct_80757AD4+0x6@ha /* 0x80757ADA@ha */ -/* 8074EA30 B4 03 7A DA */ sthu r0, struct_80757AD4+0x6@l(r3) /* 0x80757ADA@l */ +/* 8074EA2C 3C 60 80 75 */ lis r3, mAttackNo@ha /* 0x80757ADA@ha */ +/* 8074EA30 B4 03 7A DA */ sthu r0, mAttackNo@l(r3) /* 0x80757ADA@l */ /* 8074EA34 2C 00 00 06 */ cmpwi r0, 6 /* 8074EA38 40 81 00 0C */ ble lbl_8074EA44 /* 8074EA3C 38 00 00 03 */ li r0, 3 diff --git a/asm/rel/d/a/e/d_a_e_po/d_a_e_po/fopAcM_SetGroup__FP10fopAc_ac_cUc.s b/asm/rel/d/a/e/d_a_e_po/d_a_e_po/fopAcM_SetGroup__FP10fopAc_ac_cUc.s deleted file mode 100644 index 216cc95d5fb..00000000000 --- a/asm/rel/d/a/e/d_a_e_po/d_a_e_po/fopAcM_SetGroup__FP10fopAc_ac_cUc.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80754AC0: -/* 80754AC0 98 83 04 96 */ stb r4, 0x496(r3) -/* 80754AC4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/e/d_a_e_pz/d_a_e_pz/changeDemoMoveAngle__9daPy_py_cFs.s b/asm/rel/d/a/e/d_a_e_pz/d_a_e_pz/changeDemoMoveAngle__9daPy_py_cFs.s deleted file mode 100644 index 396d3e52e35..00000000000 --- a/asm/rel/d/a/e/d_a_e_pz/d_a_e_pz/changeDemoMoveAngle__9daPy_py_cFs.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80761144: -/* 80761144 B0 83 06 06 */ sth r4, 0x606(r3) -/* 80761148 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/e/d_a_e_wb/d_a_e_wb/__ct__10JAISoundIDFUl.s b/asm/rel/d/a/e/d_a_e_wb/d_a_e_wb/__ct__10JAISoundIDFUl.s deleted file mode 100644 index 9aa84dfbe2b..00000000000 --- a/asm/rel/d/a/e/d_a_e_wb/d_a_e_wb/__ct__10JAISoundIDFUl.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_807E27D0: -/* 807E27D0 90 83 00 00 */ stw r4, 0(r3) -/* 807E27D4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/e/d_a_e_wb/d_a_e_wb/changeDemoParam2__9daPy_py_cFs.s b/asm/rel/d/a/e/d_a_e_wb/d_a_e_wb/changeDemoParam2__9daPy_py_cFs.s deleted file mode 100644 index dc102f51c79..00000000000 --- a/asm/rel/d/a/e/d_a_e_wb/d_a_e_wb/changeDemoParam2__9daPy_py_cFs.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_807E2348: -/* 807E2348 B0 83 06 0A */ sth r4, 0x60a(r3) -/* 807E234C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/npc/d_a_npc_ks/d_a_npc_ks/__ct__10JAISoundIDFUl.s b/asm/rel/d/a/npc/d_a_npc_ks/d_a_npc_ks/__ct__10JAISoundIDFUl.s deleted file mode 100644 index 5b388f1c8bc..00000000000 --- a/asm/rel/d/a/npc/d_a_npc_ks/d_a_npc_ks/__ct__10JAISoundIDFUl.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80A5DE4C: -/* 80A5DE4C 90 83 00 00 */ stw r4, 0(r3) -/* 80A5DE50 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/npc/d_a_npc_ks/d_a_npc_ks/changeDemoMode__9daMidna_cFUl.s b/asm/rel/d/a/npc/d_a_npc_ks/d_a_npc_ks/changeDemoMode__9daMidna_cFUl.s deleted file mode 100644 index d805f2f419b..00000000000 --- a/asm/rel/d/a/npc/d_a_npc_ks/d_a_npc_ks/changeDemoMode__9daMidna_cFUl.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80A5DDC0: -/* 80A5DDC0 90 83 08 C0 */ stw r4, 0x8c0(r3) -/* 80A5DDC4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/npc/d_a_npc_ks/d_a_npc_ks/changeDemoParam0__9daPy_py_cFi.s b/asm/rel/d/a/npc/d_a_npc_ks/d_a_npc_ks/changeDemoParam0__9daPy_py_cFi.s deleted file mode 100644 index 72df1832cc4..00000000000 --- a/asm/rel/d/a/npc/d_a_npc_ks/d_a_npc_ks/changeDemoParam0__9daPy_py_cFi.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80A5DCD0: -/* 80A5DCD0 90 83 06 0C */ stw r4, 0x60c(r3) -/* 80A5DCD4 4E 80 00 20 */ blr diff --git a/include/SSystem/SComponent/c_bg_s_gnd_chk.h b/include/SSystem/SComponent/c_bg_s_gnd_chk.h index 009ce54f0e1..61531fd6b2d 100644 --- a/include/SSystem/SComponent/c_bg_s_gnd_chk.h +++ b/include/SSystem/SComponent/c_bg_s_gnd_chk.h @@ -1,9 +1,9 @@ #ifndef C_BG_S_GND_CHK_H #define C_BG_S_GND_CHK_H -#include "dolphin/types.h" #include "SSystem/SComponent/c_bg_s_chk.h" #include "SSystem/SComponent/c_xyz.h" +#include "dolphin/types.h" class cBgS_GndChk : public cBgS_Chk { private: diff --git a/include/SSystem/SComponent/c_bg_s_lin_chk.h b/include/SSystem/SComponent/c_bg_s_lin_chk.h index e75008e92d7..8462b1c88d2 100644 --- a/include/SSystem/SComponent/c_bg_s_lin_chk.h +++ b/include/SSystem/SComponent/c_bg_s_lin_chk.h @@ -1,8 +1,8 @@ #ifndef C_BG_S_LIN_CHK_H #define C_BG_S_LIN_CHK_H -#include "dolphin/types.h" #include "SSystem/SComponent/c_xyz.h" +#include "dolphin/types.h" class cBgS_LinChk { public: diff --git a/include/SSystem/SComponent/c_bg_s_shdw_draw.h b/include/SSystem/SComponent/c_bg_s_shdw_draw.h index ddbafac5d3e..21177adf6d8 100644 --- a/include/SSystem/SComponent/c_bg_s_shdw_draw.h +++ b/include/SSystem/SComponent/c_bg_s_shdw_draw.h @@ -1,9 +1,9 @@ #ifndef C_BG_S_SHDW_DRAW_H #define C_BG_S_SHDW_DRAW_H -#include "dolphin/types.h" #include "SSystem/SComponent/c_m3d_g_pla.h" #include "SSystem/SComponent/c_xyz.h" +#include "dolphin/types.h" struct cBgD_Vtx_t; diff --git a/include/SSystem/SComponent/c_lib.h b/include/SSystem/SComponent/c_lib.h index e8cafc04be4..10a330ff1b4 100644 --- a/include/SSystem/SComponent/c_lib.h +++ b/include/SSystem/SComponent/c_lib.h @@ -48,5 +48,4 @@ void MtxPosition(cXyz*, cXyz*); void MtxPush(void); Mtx* MtxPull(void); - #endif \ No newline at end of file diff --git a/include/Z2AudioLib/Z2AudioArcLoader.h b/include/Z2AudioLib/Z2AudioArcLoader.h index 17506b38ef2..34da9e0a75b 100644 --- a/include/Z2AudioLib/Z2AudioArcLoader.h +++ b/include/Z2AudioLib/Z2AudioArcLoader.h @@ -1,8 +1,8 @@ #ifndef Z2AUDIOARCLOADER_H #define Z2AUDIOARCLOADER_H -#include "dolphin/types.h" #include "JSystem/JAudio2/JAUAudioArcLoader.h" +#include "dolphin/types.h" class Z2AudioArcLoader { Z2AudioArcLoader(JAUSection*); diff --git a/include/dol2asm.h b/include/dol2asm.h index ee13380d15c..928a022448f 100644 --- a/include/dol2asm.h +++ b/include/dol2asm.h @@ -22,6 +22,7 @@ #define SECTION_DTORS15 __declspec(section ".dtors$15") #define COMPILER_STRIP_GATE(NAME, VALUE) SECTION_DEAD void* const cg_##NAME = (void*)(VALUE) #define ALIGN_DECL(ALIGNMENT) __attribute__((aligned(ALIGNMENT))) +#define REGISTER_CTORS(ADDR, FUNCTION) SECTION_CTORS void* const _ctors_##ADDR = (void*)(FUNCTION); #else #define SECTION_INIT #define SECTION_RODATA @@ -42,6 +43,7 @@ #define SECTION_DTORS15 #define COMPILER_STRIP_GATE(...) #define ALIGN_DECL(...) +#define REGISTER_CTORS(...) // vscode doesn't like asm and nofralloc very much #define asm diff --git a/include/f_op/f_op_actor.h b/include/f_op/f_op_actor.h index 6ac18895454..cac2f918dd1 100644 --- a/include/f_op/f_op_actor.h +++ b/include/f_op/f_op_actor.h @@ -35,7 +35,7 @@ public: /* 80018C8C */ ~fopAc_ac_c(); static u8 stopStatus[4]; - + const cXyz& getPosition() const { return mPosition; } const csXyz& getAngle() const { return mAngle; } }; // Size: unknown diff --git a/include/f_op/f_op_actor_mng.h b/include/f_op/f_op_actor_mng.h index 147bce9abe3..794eb7e59d7 100644 --- a/include/f_op/f_op_actor_mng.h +++ b/include/f_op/f_op_actor_mng.h @@ -5,13 +5,13 @@ #include "SSystem/SComponent/c_m3d_g_pla.h" #include "SSystem/SComponent/c_sxyz.h" #include "SSystem/SComponent/c_xyz.h" +#include "dolphin/types.h" #include "f_op/f_op_actor.h" #include "f_pc/f_pc_executor.h" #include "f_pc/f_pc_fstcreate_req.h" #include "f_pc/f_pc_manager.h" #include "f_pc/f_pc_searcher.h" #include "f_pc/f_pc_stdcreate_req.h" -#include "dolphin/types.h" struct fopAcM_prm_class { /* 0x00 */ u32 unk_0x00; diff --git a/libs/JSystem/J2DGraph/J2DAnimation.cpp b/libs/JSystem/J2DGraph/J2DAnimation.cpp index 7ea99a9ae25..887497e5e25 100644 --- a/libs/JSystem/J2DGraph/J2DAnimation.cpp +++ b/libs/JSystem/J2DGraph/J2DAnimation.cpp @@ -147,8 +147,8 @@ extern "C" void getVisibility__20J2DAnmVisibilityFullCFUsPUc(); extern "C" void getTevColorReg__15J2DAnmTevRegKeyCFUsP11_GXColorS10(); extern "C" void getTevKonstReg__15J2DAnmTevRegKeyCFUsP8_GXColor(); extern "C" void searchUpdateMaterialID__15J2DAnmTevRegKeyFP9J2DScreen(); -extern "C" void func_8030C77C(f32, J3DAnmKeyTableBase*, s16*); -extern "C" void func_8030C9B0(f32, J3DAnmKeyTableBase*, f32*); +extern "C" void func_8030C77C(void* _this, f32, J3DAnmKeyTableBase*, s16*); +extern "C" void func_8030C9B0(void* _this, f32, J3DAnmKeyTableBase*, f32*); extern "C" void __ct__Q216J2DAnmTexPattern27J2DAnmTexPatternTIMGPointerFv(); extern "C" void __dt__Q216J2DAnmTexPattern27J2DAnmTexPatternTIMGPointerFv(); extern "C" void __dt__16J2DAnmTexPatternFv(); @@ -419,7 +419,8 @@ SECTION_SDATA2 static f64 lit_2379 = 4503601774854144.0 /* cast s32 to float */; #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_8030C77C(f32 param_0, J3DAnmKeyTableBase* param_1, s16* param_2) { +extern "C" asm void func_8030C77C(void* _this, f32 param_0, J3DAnmKeyTableBase* param_1, + s16* param_2) { nofralloc #include "asm/JSystem/J2DGraph/J2DAnimation/func_8030C77C.s" } @@ -430,7 +431,8 @@ extern "C" asm void func_8030C77C(f32 param_0, J3DAnmKeyTableBase* param_1, s16* #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_8030C9B0(f32 param_0, J3DAnmKeyTableBase* param_1, f32* param_2) { +extern "C" asm void func_8030C9B0(void* _this, f32 param_0, J3DAnmKeyTableBase* param_1, + f32* param_2) { nofralloc #include "asm/JSystem/J2DGraph/J2DAnimation/func_8030C9B0.s" } diff --git a/libs/JSystem/J2DGraph/J2DAnmLoader.cpp b/libs/JSystem/J2DGraph/J2DAnmLoader.cpp index 38bda2e0423..c62697b5707 100644 --- a/libs/JSystem/J2DGraph/J2DAnmLoader.cpp +++ b/libs/JSystem/J2DGraph/J2DAnmLoader.cpp @@ -73,12 +73,12 @@ struct J2DAnmLoader { /* 8030A410 */ ~J2DAnmLoader(); }; -struct J2DAnmColorKey {}; - struct J2DAnmBase { /* 800569B0 */ void searchUpdateMaterialID(J2DScreen*); }; +struct J2DAnmColorKey {}; + struct J2DAnmKeyLoader_v15 { /* 80309290 */ J2DAnmKeyLoader_v15(); /* 803092AC */ ~J2DAnmKeyLoader_v15(); @@ -158,19 +158,19 @@ setAnmVtxColor__20J2DAnmFullLoader_v15FP18J2DAnmVtxColorFullPC22J3DAnmVtxColorFu extern "C" void __dt__14J2DAnmVtxColorFv(); extern "C" void __dt__20J2DAnmVisibilityFullFv(); extern "C" void __dt__12J2DAnmLoaderFv(); -extern "C" void func_8030A458(void const*, void const*); -extern "C" void func_8030A470(void const*, void const*); -extern "C" void func_8030A488(void const*, void const*); -extern "C" void func_8030A4A0(void const*, void const*); -extern "C" void func_8030A4B8(void const*, void const*); -extern "C" void func_8030A4D0(void const*, void const*); -extern "C" void func_8030A4E8(void const*, void const*); -extern "C" void func_8030A500(void const*, void const*); -extern "C" void func_8030A518(void const*, void const*); -extern "C" void func_8030A530(void const*, void const*); -extern "C" void func_8030A548(void const*, void const*); -extern "C" void func_8030A560(void const*, void const*); -extern "C" void func_8030A578(void const*, void const*); +extern "C" void func_8030A458(void* _this, void const*, void const*); +extern "C" void func_8030A470(void* _this, void const*, void const*); +extern "C" void func_8030A488(void* _this, void const*, void const*); +extern "C" void func_8030A4A0(void* _this, void const*, void const*); +extern "C" void func_8030A4B8(void* _this, void const*, void const*); +extern "C" void func_8030A4D0(void* _this, void const*, void const*); +extern "C" void func_8030A4E8(void* _this, void const*, void const*); +extern "C" void func_8030A500(void* _this, void const*, void const*); +extern "C" void func_8030A518(void* _this, void const*, void const*); +extern "C" void func_8030A530(void* _this, void const*, void const*); +extern "C" void func_8030A548(void* _this, void const*, void const*); +extern "C" void func_8030A560(void* _this, void const*, void const*); +extern "C" void func_8030A578(void* _this, void const*, void const*); // // External References: @@ -181,8 +181,8 @@ extern "C" void* __nw__FUl(); extern "C" void __dl__FPv(); extern "C" void __ct__10JUTNameTabFv(); extern "C" void setResource__10JUTNameTabFPC7ResNTAB(); -extern "C" void func_802F4260(void const*, void const*); -extern "C" void func_802F42C0(void const*, void const*); +extern "C" void func_802F4260(void* _this, void const*, void const*); +extern "C" void func_802F42C0(void* _this, void const*, void const*); extern "C" void getColor__14J2DAnmVtxColorCFUcUsP8_GXColor(); extern "C" void _savegpr_26(); extern "C" void _savegpr_27(); @@ -611,7 +611,7 @@ asm J2DAnmLoader::~J2DAnmLoader() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_8030A458(void const* param_0, void const* param_1) { +extern "C" asm void func_8030A458(void* _this, void const* param_0, void const* param_1) { nofralloc #include "asm/JSystem/J2DGraph/J2DAnmLoader/func_8030A458.s" } @@ -622,7 +622,7 @@ extern "C" asm void func_8030A458(void const* param_0, void const* param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_8030A470(void const* param_0, void const* param_1) { +extern "C" asm void func_8030A470(void* _this, void const* param_0, void const* param_1) { nofralloc #include "asm/JSystem/J2DGraph/J2DAnmLoader/func_8030A470.s" } @@ -633,7 +633,7 @@ extern "C" asm void func_8030A470(void const* param_0, void const* param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_8030A488(void const* param_0, void const* param_1) { +extern "C" asm void func_8030A488(void* _this, void const* param_0, void const* param_1) { nofralloc #include "asm/JSystem/J2DGraph/J2DAnmLoader/func_8030A488.s" } @@ -644,7 +644,7 @@ extern "C" asm void func_8030A488(void const* param_0, void const* param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_8030A4A0(void const* param_0, void const* param_1) { +extern "C" asm void func_8030A4A0(void* _this, void const* param_0, void const* param_1) { nofralloc #include "asm/JSystem/J2DGraph/J2DAnmLoader/func_8030A4A0.s" } @@ -655,7 +655,7 @@ extern "C" asm void func_8030A4A0(void const* param_0, void const* param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_8030A4B8(void const* param_0, void const* param_1) { +extern "C" asm void func_8030A4B8(void* _this, void const* param_0, void const* param_1) { nofralloc #include "asm/JSystem/J2DGraph/J2DAnmLoader/func_8030A4B8.s" } @@ -666,7 +666,7 @@ extern "C" asm void func_8030A4B8(void const* param_0, void const* param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_8030A4D0(void const* param_0, void const* param_1) { +extern "C" asm void func_8030A4D0(void* _this, void const* param_0, void const* param_1) { nofralloc #include "asm/JSystem/J2DGraph/J2DAnmLoader/func_8030A4D0.s" } @@ -677,7 +677,7 @@ extern "C" asm void func_8030A4D0(void const* param_0, void const* param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_8030A4E8(void const* param_0, void const* param_1) { +extern "C" asm void func_8030A4E8(void* _this, void const* param_0, void const* param_1) { nofralloc #include "asm/JSystem/J2DGraph/J2DAnmLoader/func_8030A4E8.s" } @@ -688,7 +688,7 @@ extern "C" asm void func_8030A4E8(void const* param_0, void const* param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_8030A500(void const* param_0, void const* param_1) { +extern "C" asm void func_8030A500(void* _this, void const* param_0, void const* param_1) { nofralloc #include "asm/JSystem/J2DGraph/J2DAnmLoader/func_8030A500.s" } @@ -698,7 +698,7 @@ extern "C" asm void func_8030A500(void const* param_0, void const* param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_8030A518(void const* param_0, void const* param_1) { +extern "C" asm void func_8030A518(void* _this, void const* param_0, void const* param_1) { nofralloc #include "asm/JSystem/J2DGraph/J2DAnmLoader/func_8030A518.s" } @@ -709,7 +709,7 @@ extern "C" asm void func_8030A518(void const* param_0, void const* param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_8030A530(void const* param_0, void const* param_1) { +extern "C" asm void func_8030A530(void* _this, void const* param_0, void const* param_1) { nofralloc #include "asm/JSystem/J2DGraph/J2DAnmLoader/func_8030A530.s" } @@ -720,7 +720,7 @@ extern "C" asm void func_8030A530(void const* param_0, void const* param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_8030A548(void const* param_0, void const* param_1) { +extern "C" asm void func_8030A548(void* _this, void const* param_0, void const* param_1) { nofralloc #include "asm/JSystem/J2DGraph/J2DAnmLoader/func_8030A548.s" } @@ -731,7 +731,7 @@ extern "C" asm void func_8030A548(void const* param_0, void const* param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_8030A560(void const* param_0, void const* param_1) { +extern "C" asm void func_8030A560(void* _this, void const* param_0, void const* param_1) { nofralloc #include "asm/JSystem/J2DGraph/J2DAnmLoader/func_8030A560.s" } @@ -742,7 +742,7 @@ extern "C" asm void func_8030A560(void const* param_0, void const* param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_8030A578(void const* param_0, void const* param_1) { +extern "C" asm void func_8030A578(void* _this, void const* param_0, void const* param_1) { nofralloc #include "asm/JSystem/J2DGraph/J2DAnmLoader/func_8030A578.s" } diff --git a/libs/JSystem/J2DGraph/J2DMatBlock.cpp b/libs/JSystem/J2DGraph/J2DMatBlock.cpp index 8f52d5d1939..2b2cc00b48c 100644 --- a/libs/JSystem/J2DGraph/J2DMatBlock.cpp +++ b/libs/JSystem/J2DGraph/J2DMatBlock.cpp @@ -77,15 +77,15 @@ struct J2DTevOrder { /* 802F1B70 */ J2DTevOrder(); }; -struct J2DGXColorS10 { - /* 802F1B90 */ J2DGXColorS10(); -}; - struct J2DIndTevStage { /* 802EA044 */ void load(u8); /* 802F18A0 */ J2DIndTevStage(); }; +struct J2DGXColorS10 { + /* 802F1B90 */ J2DGXColorS10(); +}; + struct J2DTevBlock8 { /* 802EED64 */ J2DTevBlock8(); /* 802EEE8C */ ~J2DTevBlock8(); @@ -793,7 +793,8 @@ extern "C" extern u32 j2dDefaultTevSwapModeTable; extern "C" extern u32 j2dDefaultBlendInfo; extern "C" extern u8 data_804561A4[4]; extern "C" extern u32 j2dDefaultColorChanInfo; -extern "C" extern u8 struct_804561AC[4]; +extern "C" extern u16 data_804561AC; +extern "C" extern u16 j2dDefaultAlphaCmp; // // Declarations: @@ -814,7 +815,7 @@ asm void J2DColorBlock::initialize() { SECTION_RODATA static u8 const lit_1463[16] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x03, }; -COMPILER_STRIP_GATE(803A1C00, &lit_1463); +COMPILER_STRIP_GATE(0x803A1C00, &lit_1463); /* 802EB424-802EB510 2E5D64 00EC+00 0/0 1/1 0/0 .text setGX__13J2DColorBlockFv */ #pragma push @@ -2116,15 +2117,10 @@ asm void J2DIndBlockFull::getType() { } #pragma pop -/* 802F1BA0-802F1BA8 2EC4E0 0008+00 1/0 0/0 0/0 .text setIndTexStageNum__15J2DIndBlockFullFUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DIndBlockFull::setIndTexStageNum(u8 param_0) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/setIndTexStageNum__15J2DIndBlockFullFUc.s" +/* 802F1BA0-802F1BA8 -00001 0008+00 0/0 0/0 0/0 .text setIndTexStageNum__15J2DIndBlockFullFUc */ +void J2DIndBlockFull::setIndTexStageNum(u8 param_0) { + *(u8*)(((u8*)this) + 4) /* this->field_0x4 */ = (u8)(param_0); } -#pragma pop /* 802F1BA8-802F1BB0 2EC4E8 0008+00 1/0 0/0 0/0 .text getIndTexStageNum__15J2DIndBlockFullCFv */ #pragma push @@ -2245,15 +2241,10 @@ asm void J2DTevBlock16::getTexNo(u32 param_0) const { } #pragma pop -/* 802F1D4C-802F1D54 2EC68C 0008+00 1/0 0/0 0/0 .text setFontNo__13J2DTevBlock16FUs */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DTevBlock16::setFontNo(u16 param_0) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/setFontNo__13J2DTevBlock16FUs.s" +/* 802F1D4C-802F1D54 -00001 0008+00 0/0 0/0 0/0 .text setFontNo__13J2DTevBlock16FUs */ +void J2DTevBlock16::setFontNo(u16 param_0) { + *(u16*)(((u8*)this) + 20) /* this->field_0x14 */ = (u16)(param_0); } -#pragma pop /* 802F1D54-802F1D5C 2EC694 0008+00 1/0 0/0 0/0 .text getFontNo__13J2DTevBlock16CFv */ #pragma push @@ -2370,16 +2361,11 @@ asm void J2DTevBlock16::getTevKAlphaSel(u32 param_0) { } #pragma pop -/* 802F1E44-802F1E4C 2EC784 0008+00 1/0 0/0 0/0 .text setTevStageNum__13J2DTevBlock16FUc +/* 802F1E44-802F1E4C -00001 0008+00 0/0 0/0 0/0 .text setTevStageNum__13J2DTevBlock16FUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DTevBlock16::setTevStageNum(u8 param_0) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/setTevStageNum__13J2DTevBlock16FUc.s" +void J2DTevBlock16::setTevStageNum(u8 param_0) { + *(u8*)(((u8*)this) + 118) /* this->field_0x76 */ = (u8)(param_0); } -#pragma pop /* 802F1E4C-802F1E54 2EC78C 0008+00 1/0 0/0 0/0 .text getTevStageNum__13J2DTevBlock16CFv */ @@ -2564,15 +2550,10 @@ asm void J2DTevBlock8::getTexNo(u32 param_0) const { } #pragma pop -/* 802F1FEC-802F1FF4 2EC92C 0008+00 1/0 0/0 0/0 .text setFontNo__12J2DTevBlock8FUs */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DTevBlock8::setFontNo(u16 param_0) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/setFontNo__12J2DTevBlock8FUs.s" +/* 802F1FEC-802F1FF4 -00001 0008+00 0/0 0/0 0/0 .text setFontNo__12J2DTevBlock8FUs */ +void J2DTevBlock8::setFontNo(u16 param_0) { + *(u16*)(((u8*)this) + 20) /* this->field_0x14 */ = (u16)(param_0); } -#pragma pop /* 802F1FF4-802F1FFC 2EC934 0008+00 1/0 0/0 0/0 .text getFontNo__12J2DTevBlock8CFv */ #pragma push @@ -2689,16 +2670,11 @@ asm void J2DTevBlock8::getTevKAlphaSel(u32 param_0) { } #pragma pop -/* 802F20E4-802F20EC 2ECA24 0008+00 1/0 0/0 0/0 .text setTevStageNum__12J2DTevBlock8FUc +/* 802F20E4-802F20EC -00001 0008+00 0/0 0/0 0/0 .text setTevStageNum__12J2DTevBlock8FUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DTevBlock8::setTevStageNum(u8 param_0) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/setTevStageNum__12J2DTevBlock8FUc.s" +void J2DTevBlock8::setTevStageNum(u8 param_0) { + *(u8*)(((u8*)this) + 86) /* this->field_0x56 */ = (u8)(param_0); } -#pragma pop /* 802F20EC-802F20F4 2ECA2C 0008+00 1/0 0/0 0/0 .text getTevStageNum__12J2DTevBlock8CFv */ @@ -2883,15 +2859,10 @@ asm void J2DTevBlock4::getTexNo(u32 param_0) const { } #pragma pop -/* 802F228C-802F2294 2ECBCC 0008+00 1/0 0/0 0/0 .text setFontNo__12J2DTevBlock4FUs */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DTevBlock4::setFontNo(u16 param_0) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/setFontNo__12J2DTevBlock4FUs.s" +/* 802F228C-802F2294 -00001 0008+00 0/0 0/0 0/0 .text setFontNo__12J2DTevBlock4FUs */ +void J2DTevBlock4::setFontNo(u16 param_0) { + *(u16*)(((u8*)this) + 12) /* this->field_0xc */ = (u16)(param_0); } -#pragma pop /* 802F2294-802F229C 2ECBD4 0008+00 1/0 0/0 0/0 .text getFontNo__12J2DTevBlock4CFv */ #pragma push @@ -3008,16 +2979,11 @@ asm void J2DTevBlock4::getTevKAlphaSel(u32 param_0) { } #pragma pop -/* 802F2384-802F238C 2ECCC4 0008+00 1/0 0/0 0/0 .text setTevStageNum__12J2DTevBlock4FUc +/* 802F2384-802F238C -00001 0008+00 0/0 0/0 0/0 .text setTevStageNum__12J2DTevBlock4FUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DTevBlock4::setTevStageNum(u8 param_0) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/setTevStageNum__12J2DTevBlock4FUc.s" +void J2DTevBlock4::setTevStageNum(u8 param_0) { + *(u8*)(((u8*)this) + 62) /* this->field_0x3e */ = (u8)(param_0); } -#pragma pop /* 802F238C-802F2394 2ECCCC 0008+00 1/0 0/0 0/0 .text getTevStageNum__12J2DTevBlock4CFv */ @@ -3202,15 +3168,10 @@ asm void J2DTevBlock2::getTexNo(u32 param_0) const { } #pragma pop -/* 802F2530-802F2538 2ECE70 0008+00 1/0 0/0 0/0 .text setFontNo__12J2DTevBlock2FUs */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DTevBlock2::setFontNo(u16 param_0) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/setFontNo__12J2DTevBlock2FUs.s" +/* 802F2530-802F2538 -00001 0008+00 0/0 0/0 0/0 .text setFontNo__12J2DTevBlock2FUs */ +void J2DTevBlock2::setFontNo(u16 param_0) { + *(u16*)(((u8*)this) + 8) /* this->field_0x8 */ = (u16)(param_0); } -#pragma pop /* 802F2538-802F2540 2ECE78 0008+00 1/0 0/0 0/0 .text getFontNo__12J2DTevBlock2CFv */ #pragma push @@ -3327,16 +3288,11 @@ asm void J2DTevBlock2::getTevKAlphaSel(u32 param_0) { } #pragma pop -/* 802F2628-802F2630 2ECF68 0008+00 1/0 0/0 0/0 .text setTevStageNum__12J2DTevBlock2FUc +/* 802F2628-802F2630 -00001 0008+00 0/0 0/0 0/0 .text setTevStageNum__12J2DTevBlock2FUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DTevBlock2::setTevStageNum(u8 param_0) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/setTevStageNum__12J2DTevBlock2FUc.s" +void J2DTevBlock2::setTevStageNum(u8 param_0) { + *(u8*)(((u8*)this) + 50) /* this->field_0x32 */ = (u8)(param_0); } -#pragma pop /* 802F2630-802F2638 2ECF70 0008+00 1/0 0/0 0/0 .text getTevStageNum__12J2DTevBlock2CFv */ @@ -3521,15 +3477,10 @@ asm void J2DTevBlock1::getTexNo(u32 param_0) const { } #pragma pop -/* 802F27D4-802F27DC 2ED114 0008+00 1/0 0/0 0/0 .text setFontNo__12J2DTevBlock1FUs */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DTevBlock1::setFontNo(u16 param_0) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/setFontNo__12J2DTevBlock1FUs.s" +/* 802F27D4-802F27DC -00001 0008+00 0/0 0/0 0/0 .text setFontNo__12J2DTevBlock1FUs */ +void J2DTevBlock1::setFontNo(u16 param_0) { + *(u16*)(((u8*)this) + 6) /* this->field_0x6 */ = (u16)(param_0); } -#pragma pop /* 802F27DC-802F27E4 2ED11C 0008+00 1/0 0/0 0/0 .text getFontNo__12J2DTevBlock1CFv */ #pragma push diff --git a/libs/JSystem/J2DGraph/J2DMaterial.cpp b/libs/JSystem/J2DGraph/J2DMaterial.cpp index 1256fcbeb22..2ea0b7aa3db 100644 --- a/libs/JSystem/J2DGraph/J2DMaterial.cpp +++ b/libs/JSystem/J2DGraph/J2DMaterial.cpp @@ -82,12 +82,10 @@ struct J2DPEBlock { /* 802F1840 */ void setGX(); }; -struct J2DAnmTextureSRTKey { - /* 8030B9F0 */ void calcTransform(f32, u16, J3DTextureSRTInfo*) const; -}; - -struct J2DAnmColor { - /* 802EB390 */ void getColor(u16, _GXColor*) const; +struct J2DAnmTexPattern { + /* 8030BEE8 */ void getTexNo(u16, u16*) const; + /* 8030BF9C */ void getResTIMG(u16) const; + /* 8030BFF0 */ void getPalette(u16) const; }; struct J2DAnmTevRegKey { @@ -95,10 +93,12 @@ struct J2DAnmTevRegKey { /* 8030C3B4 */ void getTevKonstReg(u16, _GXColor*) const; }; -struct J2DAnmTexPattern { - /* 8030BEE8 */ void getTexNo(u16, u16*) const; - /* 8030BF9C */ void getResTIMG(u16) const; - /* 8030BFF0 */ void getPalette(u16) const; +struct J2DAnmTextureSRTKey { + /* 8030B9F0 */ void calcTransform(f32, u16, J3DTextureSRTInfo*) const; +}; + +struct J2DAnmColor { + /* 802EB390 */ void getColor(u16, _GXColor*) const; }; struct J2DMaterial { @@ -250,7 +250,7 @@ extern "C" extern u16 j2dDefaultIndTexOrderNull[1 + 1 /* padding */]; extern "C" extern u8 j2dDefaultIndTexCoordScaleInfo[2 + 2 /* padding */]; extern "C" extern u32 j2dDefaultBlendInfo; extern "C" extern u32 j2dDefaultColorChanInfo; -extern "C" extern u8 struct_804561AC[4]; +extern "C" extern u16 j2dDefaultAlphaCmp; // // Declarations: diff --git a/libs/JSystem/J2DGraph/J2DMaterialFactory.cpp b/libs/JSystem/J2DGraph/J2DMaterialFactory.cpp index 595cd2f6fb0..550a4951a6d 100644 --- a/libs/JSystem/J2DGraph/J2DMaterialFactory.cpp +++ b/libs/JSystem/J2DGraph/J2DMaterialFactory.cpp @@ -38,13 +38,13 @@ struct J2DResReference { /* 8030CF44 */ void getName(u16) const; }; -struct J2DMaterialBlock {}; - struct J2DMaterial { /* 802EA410 */ void createTevBlock(int, bool); /* 802EA5C4 */ void createIndBlock(int, bool); }; +struct J2DMaterialBlock {}; + struct J2DMaterialFactory { /* 802F2AD0 */ J2DMaterialFactory(J2DMaterialBlock const&); /* 802F2C94 */ void countStages(int) const; @@ -111,22 +111,22 @@ extern "C" void newAlphaComp__18J2DMaterialFactoryCFi(); extern "C" void newBlend__18J2DMaterialFactoryCFi(); extern "C" void newDither__18J2DMaterialFactoryCFi(); extern "C" void __ct__11J2DTevStageFRC15J2DTevStageInfo(); -extern "C" void func_802F4170(void const*, void const*); -extern "C" void func_802F4188(void const*, void const*); -extern "C" void func_802F41A0(void const*, void const*); -extern "C" void func_802F41B8(void const*, void const*); -extern "C" void func_802F41D0(void const*, void const*); -extern "C" void func_802F41E8(void const*, void const*); -extern "C" void func_802F4200(void const*, void const*); -extern "C" void func_802F4218(void const*, void const*); -extern "C" void func_802F4230(void const*, void const*); -extern "C" void func_802F4248(void const*, void const*); -extern "C" void func_802F4260(void const*, void const*); -extern "C" void func_802F4278(void const*, void const*); -extern "C" void func_802F4290(void const*, void const*); -extern "C" void func_802F42A8(void const*, void const*); -extern "C" void func_802F42C0(void const*, void const*); -extern "C" void func_802F42D8(void const*, void const*); +extern "C" void func_802F4170(void* _this, void const*, void const*); +extern "C" void func_802F4188(void* _this, void const*, void const*); +extern "C" void func_802F41A0(void* _this, void const*, void const*); +extern "C" void func_802F41B8(void* _this, void const*, void const*); +extern "C" void func_802F41D0(void* _this, void const*, void const*); +extern "C" void func_802F41E8(void* _this, void const*, void const*); +extern "C" void func_802F4200(void* _this, void const*, void const*); +extern "C" void func_802F4218(void* _this, void const*, void const*); +extern "C" void func_802F4230(void* _this, void const*, void const*); +extern "C" void func_802F4248(void* _this, void const*, void const*); +extern "C" void func_802F4260(void* _this, void const*, void const*); +extern "C" void func_802F4278(void* _this, void const*, void const*); +extern "C" void func_802F4290(void* _this, void const*, void const*); +extern "C" void func_802F42A8(void* _this, void const*, void const*); +extern "C" void func_802F42C0(void* _this, void const*, void const*); +extern "C" void func_802F42D8(void* _this, void const*, void const*); // // External References: @@ -158,7 +158,7 @@ extern "C" extern u8 j2dDefaultTevSwapMode[4]; extern "C" extern u32 j2dDefaultTevSwapModeTable; extern "C" extern u32 j2dDefaultBlendInfo; extern "C" extern u32 j2dDefaultColorChanInfo; -extern "C" extern u8 struct_804561AC[4]; +extern "C" extern u16 j2dDefaultAlphaCmp; // // Declarations: @@ -467,7 +467,7 @@ asm J2DTevStage::J2DTevStage(J2DTevStageInfo const& param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_802F4170(void const* param_0, void const* param_1) { +extern "C" asm void func_802F4170(void* _this, void const* param_0, void const* param_1) { nofralloc #include "asm/JSystem/J2DGraph/J2DMaterialFactory/func_802F4170.s" } @@ -478,7 +478,7 @@ extern "C" asm void func_802F4170(void const* param_0, void const* param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_802F4188(void const* param_0, void const* param_1) { +extern "C" asm void func_802F4188(void* _this, void const* param_0, void const* param_1) { nofralloc #include "asm/JSystem/J2DGraph/J2DMaterialFactory/func_802F4188.s" } @@ -489,7 +489,7 @@ extern "C" asm void func_802F4188(void const* param_0, void const* param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_802F41A0(void const* param_0, void const* param_1) { +extern "C" asm void func_802F41A0(void* _this, void const* param_0, void const* param_1) { nofralloc #include "asm/JSystem/J2DGraph/J2DMaterialFactory/func_802F41A0.s" } @@ -500,7 +500,7 @@ extern "C" asm void func_802F41A0(void const* param_0, void const* param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_802F41B8(void const* param_0, void const* param_1) { +extern "C" asm void func_802F41B8(void* _this, void const* param_0, void const* param_1) { nofralloc #include "asm/JSystem/J2DGraph/J2DMaterialFactory/func_802F41B8.s" } @@ -511,7 +511,7 @@ extern "C" asm void func_802F41B8(void const* param_0, void const* param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_802F41D0(void const* param_0, void const* param_1) { +extern "C" asm void func_802F41D0(void* _this, void const* param_0, void const* param_1) { nofralloc #include "asm/JSystem/J2DGraph/J2DMaterialFactory/func_802F41D0.s" } @@ -522,7 +522,7 @@ extern "C" asm void func_802F41D0(void const* param_0, void const* param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_802F41E8(void const* param_0, void const* param_1) { +extern "C" asm void func_802F41E8(void* _this, void const* param_0, void const* param_1) { nofralloc #include "asm/JSystem/J2DGraph/J2DMaterialFactory/func_802F41E8.s" } @@ -533,7 +533,7 @@ extern "C" asm void func_802F41E8(void const* param_0, void const* param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_802F4200(void const* param_0, void const* param_1) { +extern "C" asm void func_802F4200(void* _this, void const* param_0, void const* param_1) { nofralloc #include "asm/JSystem/J2DGraph/J2DMaterialFactory/func_802F4200.s" } @@ -544,7 +544,7 @@ extern "C" asm void func_802F4200(void const* param_0, void const* param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_802F4218(void const* param_0, void const* param_1) { +extern "C" asm void func_802F4218(void* _this, void const* param_0, void const* param_1) { nofralloc #include "asm/JSystem/J2DGraph/J2DMaterialFactory/func_802F4218.s" } @@ -555,7 +555,7 @@ extern "C" asm void func_802F4218(void const* param_0, void const* param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_802F4230(void const* param_0, void const* param_1) { +extern "C" asm void func_802F4230(void* _this, void const* param_0, void const* param_1) { nofralloc #include "asm/JSystem/J2DGraph/J2DMaterialFactory/func_802F4230.s" } @@ -566,7 +566,7 @@ extern "C" asm void func_802F4230(void const* param_0, void const* param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_802F4248(void const* param_0, void const* param_1) { +extern "C" asm void func_802F4248(void* _this, void const* param_0, void const* param_1) { nofralloc #include "asm/JSystem/J2DGraph/J2DMaterialFactory/func_802F4248.s" } @@ -576,7 +576,7 @@ extern "C" asm void func_802F4248(void const* param_0, void const* param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_802F4260(void const* param_0, void const* param_1) { +extern "C" asm void func_802F4260(void* _this, void const* param_0, void const* param_1) { nofralloc #include "asm/JSystem/J2DGraph/J2DMaterialFactory/func_802F4260.s" } @@ -586,7 +586,7 @@ extern "C" asm void func_802F4260(void const* param_0, void const* param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_802F4278(void const* param_0, void const* param_1) { +extern "C" asm void func_802F4278(void* _this, void const* param_0, void const* param_1) { nofralloc #include "asm/JSystem/J2DGraph/J2DMaterialFactory/func_802F4278.s" } @@ -597,7 +597,7 @@ extern "C" asm void func_802F4278(void const* param_0, void const* param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_802F4290(void const* param_0, void const* param_1) { +extern "C" asm void func_802F4290(void* _this, void const* param_0, void const* param_1) { nofralloc #include "asm/JSystem/J2DGraph/J2DMaterialFactory/func_802F4290.s" } @@ -608,7 +608,7 @@ extern "C" asm void func_802F4290(void const* param_0, void const* param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_802F42A8(void const* param_0, void const* param_1) { +extern "C" asm void func_802F42A8(void* _this, void const* param_0, void const* param_1) { nofralloc #include "asm/JSystem/J2DGraph/J2DMaterialFactory/func_802F42A8.s" } @@ -618,7 +618,7 @@ extern "C" asm void func_802F42A8(void const* param_0, void const* param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_802F42C0(void const* param_0, void const* param_1) { +extern "C" asm void func_802F42C0(void* _this, void const* param_0, void const* param_1) { nofralloc #include "asm/JSystem/J2DGraph/J2DMaterialFactory/func_802F42C0.s" } @@ -629,7 +629,7 @@ extern "C" asm void func_802F42C0(void const* param_0, void const* param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_802F42D8(void const* param_0, void const* param_1) { +extern "C" asm void func_802F42D8(void* _this, void const* param_0, void const* param_1) { nofralloc #include "asm/JSystem/J2DGraph/J2DMaterialFactory/func_802F42D8.s" } diff --git a/libs/JSystem/J2DGraph/J2DPane.cpp b/libs/JSystem/J2DGraph/J2DPane.cpp index 1345dd6b3d2..418be8b670b 100644 --- a/libs/JSystem/J2DGraph/J2DPane.cpp +++ b/libs/JSystem/J2DGraph/J2DPane.cpp @@ -60,31 +60,30 @@ struct J2DScreen { struct J2DRotateAxis {}; -struct J2DAnmTevRegKey {}; - -struct J2DAnmTransform {}; - -struct J2DGrafContext { - /* 802E8E20 */ void setScissor(); - /* 802E90C0 */ void scissor(JGeometry::TBox2 const&); -}; - -struct J2DAnmVtxColor {}; - -struct J2DAnmTextureSRTKey {}; - -struct J2DAnmColor {}; - -struct J2DBasePosition {}; - struct J2DAnmVisibilityFull {}; struct J2DAnmBase {}; struct J2DAnmTexPattern {}; +struct J2DAnmColor {}; + +struct J2DAnmTevRegKey {}; + +struct J2DGrafContext { + /* 802E8E20 */ void setScissor(); + /* 802E90C0 */ void scissor(JGeometry::TBox2 const&); +}; + +struct J2DBasePosition {}; + +struct J2DAnmTextureSRTKey {}; + +struct J2DAnmVtxColor {}; + +struct J2DAnmTransform {}; + struct J2DPane { - /* 80020158 */ void setAlpha(u8); /* 80053BC0 */ void calcMtx(); /* 80053C00 */ void makeMatrix(f32, f32); /* 802F7540 */ void makeMatrix(f32, f32, f32, f32); @@ -745,15 +744,10 @@ asm void J2DPane::setAnimation(J2DAnmBase* param_0) { } #pragma pop -/* 802F7FC4-802F7FCC 2F2904 0008+00 1/0 7/4 0/0 .text setAnimation__7J2DPaneFP15J2DAnmTransform */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DPane::setAnimation(J2DAnmTransform* param_0) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DPane/setAnimation__7J2DPaneFP15J2DAnmTransform.s" +/* 802F7FC4-802F7FCC -00001 0008+00 0/0 0/0 0/0 .text setAnimation__7J2DPaneFP15J2DAnmTransform */ +void J2DPane::setAnimation(J2DAnmTransform* param_0) { + *(u32*)(((u8*)this) + 248) /* this->field_0xf8 */ = (u32)(param_0); } -#pragma pop /* 802F7FCC-802F8004 2F290C 0038+00 0/0 57/57 0/0 .text animationTransform__7J2DPaneFv */ #pragma push @@ -915,5 +909,5 @@ asm void __sinit_J2DPane_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_802F847C = (void*)__sinit_J2DPane_cpp; +REGISTER_CTORS(0x802F847C, __sinit_J2DPane_cpp); #pragma pop diff --git a/libs/JSystem/J2DGraph/J2DPicture.cpp b/libs/JSystem/J2DGraph/J2DPicture.cpp index 7162e7f3cc5..0d4d12982ad 100644 --- a/libs/JSystem/J2DGraph/J2DPicture.cpp +++ b/libs/JSystem/J2DGraph/J2DPicture.cpp @@ -65,7 +65,7 @@ struct JGeometry { struct TVec2 {}; /* TVec2 */ struct TVec2__template0 { - /* 802FF204 */ void func_802FF204(); + /* 802FF204 */ void func_802FF204(void* _this); }; }; @@ -75,26 +75,23 @@ struct J2DScreen { struct J2DMirror {}; -struct J2DBinding {}; - -struct J2DAnmColor {}; - -struct J2DAnmTevRegKey {}; +struct J2DAnmTexPattern {}; struct J2DAnmVisibilityFull {}; struct J2DAnmBase {}; +struct J2DAnmColor {}; + +struct J2DAnmTevRegKey {}; + +struct J2DAnmTextureSRTKey {}; + struct J2DAnmTransform {}; struct J2DAnmVtxColor {}; -struct J2DAnmTextureSRTKey {}; - -struct J2DAnmTexPattern {}; - struct J2DPane { - /* 80020158 */ void setAlpha(u8); /* 80053BC0 */ void calcMtx(); /* 80053C00 */ void makeMatrix(f32, f32); /* 802F7540 */ void makeMatrix(f32, f32, f32, f32); @@ -102,7 +99,6 @@ struct J2DPane { /* 8025601C */ void setAnimation(J2DAnmVisibilityFull*); /* 80256020 */ void setAnimation(J2DAnmTexPattern*); /* 8018BF28 */ void setAnimation(J2DAnmTextureSRTKey*); - /* 802F7FC4 */ void setAnimation(J2DAnmTransform*); /* 80126350 */ void setAnimation(J2DAnmTevRegKey*); /* 80126354 */ void setAnimation(J2DAnmColor*); /* 802F7EF4 */ void setAnimation(J2DAnmBase*); @@ -136,6 +132,8 @@ struct J2DPane { struct J2DMaterial {}; +struct J2DBinding {}; + struct J2DPicture { /* 800202CC */ void setBlendRatio(f32, f32); /* 802FF208 */ void append(JUTTexture*, f32); @@ -252,7 +250,7 @@ extern "C" void func_802FED84(); extern "C" void isUsed__10J2DPictureFPC7ResTIMG(); extern "C" void getUsableTlut__10J2DPictureFUc(); extern "C" void getTlutID__10J2DPictureFPC7ResTIMGUc(); -extern "C" void func_802FF204(); +extern "C" void func_802FF204(void* _this); extern "C" void append__10J2DPictureFP10JUTTexturef(); extern "C" void append__10J2DPictureFPC7ResTIMGP10JUTPalettef(); extern "C" void load__10J2DPictureFUc(); @@ -916,7 +914,7 @@ asm void J2DPicture::getTlutID(ResTIMG const* param_0, u8 param_1) { #pragma pop /* 802FF204-802FF208 2F9B44 0004+00 5/5 1/1 0/0 .text __ct__Q29JGeometry8TVec2Fv */ -extern "C" void func_802FF204() { +extern "C" void func_802FF204(void* _this) { /* empty function */ } diff --git a/libs/JSystem/J2DGraph/J2DPictureEx.cpp b/libs/JSystem/J2DGraph/J2DPictureEx.cpp index b97ba1700e4..cdfa7e34fa5 100644 --- a/libs/JSystem/J2DGraph/J2DPictureEx.cpp +++ b/libs/JSystem/J2DGraph/J2DPictureEx.cpp @@ -55,7 +55,7 @@ struct JGeometry { struct TVec2 {}; /* TVec2 */ struct TVec2__template0 { - /* 802FF204 */ void func_802FF204(); + /* 802FF204 */ void func_802FF204(void* _this); }; }; @@ -71,13 +71,7 @@ struct J2DScreen { /* 802F9640 */ void getNameResource(char const*); }; -struct J2DAnmTevRegKey {}; - -struct J2DAnmTransform {}; - -struct J2DAnmVtxColor {}; - -struct J2DAnmTextureSRTKey {}; +struct J2DAnmTexPattern {}; struct J2DAnmVisibilityFull { /* 8030C048 */ void getVisibility(u16, u8*) const; @@ -85,6 +79,14 @@ struct J2DAnmVisibilityFull { struct J2DAnmBase {}; +struct J2DAnmTevRegKey {}; + +struct J2DAnmTextureSRTKey {}; + +struct J2DAnmVtxColor {}; + +struct J2DAnmTransform {}; + struct J2DPane { /* 80053BC0 */ void calcMtx(); /* 80053C00 */ void makeMatrix(f32, f32); @@ -110,8 +112,6 @@ struct J2DPane { /* 802F8474 */ void update(); }; -struct J2DAnmTexPattern {}; - struct J2DAnmColor {}; struct J2DMaterial { @@ -336,7 +336,7 @@ extern "C" void __ct__10J2DPictureFv(); extern "C" void __dt__10J2DPictureFv(); extern "C" void drawSelf__10J2DPictureFff(); extern "C" void getTlutID__10J2DPictureFPC7ResTIMGUc(); -extern "C" void func_802FF204(); +extern "C" void func_802FF204(void* _this); extern "C" s32 getTypeID__10J2DPictureCFv(); extern "C" void getVisibility__20J2DAnmVisibilityFullCFUsPUc(); extern "C" void PSMTXIdentity(); @@ -768,7 +768,7 @@ SECTION_RODATA static u8 const lit_2555[32] = { 0x0F, 0x08, 0x0A, 0x0F, 0x0F, 0x08, 0x0A, 0x0F, 0x0F, 0x08, 0x0E, 0x0F, 0x0F, 0x08, 0x0E, 0x00, 0x0F, 0x0A, 0x00, 0x0F, 0x02, 0x04, 0x08, 0x0F, 0x02, 0x04, 0x08, 0x0F, 0x02, 0x04, 0x00, 0x0F, }; -COMPILER_STRIP_GATE(803A1D50, &lit_2555); +COMPILER_STRIP_GATE(0x803A1D50, &lit_2555); /* 80305688-80305928 2FFFC8 02A0+00 1/1 0/0 0/0 .text * setStage__12J2DPictureExFP11J2DTevStageQ212J2DPictureEx10stage_enum */ @@ -1076,16 +1076,11 @@ asm void J2DPictureEx::setAnimation(J2DAnmTevRegKey* param_0) { } #pragma pop -/* 80306B74-80306B7C 3014B4 0008+00 1/0 0/0 0/0 .text +/* 80306B74-80306B7C -00001 0008+00 0/0 0/0 0/0 .text * setAnimation__12J2DPictureExFP20J2DAnmVisibilityFull */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DPictureEx::setAnimation(J2DAnmVisibilityFull* param_0) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DPictureEx/setAnimation__12J2DPictureExFP20J2DAnmVisibilityFull.s" +void J2DPictureEx::setAnimation(J2DAnmVisibilityFull* param_0) { + *(u32*)(((u8*)this) + 404) /* this->field_0x194 */ = (u32)(param_0); } -#pragma pop /* 80306B7C-80306C70 3014BC 00F4+00 1/0 0/0 0/0 .text * setAnimation__12J2DPictureExFP14J2DAnmVtxColor */ @@ -1283,7 +1278,7 @@ SECTION_RODATA static u8 const lit_2556[32] = { 0x07, 0x04, 0x05, 0x07, 0x05, 0x07, 0x07, 0x07, 0x07, 0x04, 0x06, 0x07, 0x07, 0x04, 0x06, 0x00, 0x07, 0x05, 0x00, 0x07, 0x01, 0x02, 0x04, 0x07, 0x07, 0x07, 0x07, 0x02, 0x01, 0x02, 0x00, 0x07, }; -COMPILER_STRIP_GATE(803A1D70, &lit_2556); +COMPILER_STRIP_GATE(0x803A1D70, &lit_2556); #pragma pop /* 803A1D90-803A1DB8 02E3F0 0028+00 0/0 0/0 0/0 .rodata @2557 */ @@ -1294,5 +1289,5 @@ SECTION_RODATA static u8 const lit_2557[40] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(803A1D90, &lit_2557); +COMPILER_STRIP_GATE(0x803A1D90, &lit_2557); #pragma pop diff --git a/libs/JSystem/J2DGraph/J2DScreen.cpp b/libs/JSystem/J2DGraph/J2DScreen.cpp index bb02b93edb4..84132bea691 100644 --- a/libs/JSystem/J2DGraph/J2DScreen.cpp +++ b/libs/JSystem/J2DGraph/J2DScreen.cpp @@ -56,14 +56,13 @@ struct J2DAnmVisibilityFull {}; struct J2DAnmBase {}; -struct J2DAnmTransform {}; - struct J2DGrafContext {}; +struct J2DAnmTransform {}; + struct J2DAnmVtxColor {}; struct J2DPane { - /* 80020158 */ void setAlpha(u8); /* 80053C00 */ void makeMatrix(f32, f32); /* 802F7540 */ void makeMatrix(f32, f32, f32, f32); /* 802F5F9C */ J2DPane(J2DPane*, JSURandomInputStream*, u8); @@ -91,13 +90,13 @@ struct J2DPane { /* 802F8478 */ void drawSelf(f32, f32); }; -struct J2DAnmTextureSRTKey {}; - -struct J2DAnmColor {}; +struct J2DAnmTexPattern {}; struct J2DAnmTevRegKey {}; -struct J2DAnmTexPattern {}; +struct J2DAnmTextureSRTKey {}; + +struct J2DAnmColor {}; struct J2DMaterial { /* 802EA1AC */ J2DMaterial(); diff --git a/libs/JSystem/J2DGraph/J2DTevs.cpp b/libs/JSystem/J2DGraph/J2DTevs.cpp index f5a5e3f8916..a2a3f820119 100644 --- a/libs/JSystem/J2DGraph/J2DTevs.cpp +++ b/libs/JSystem/J2DGraph/J2DTevs.cpp @@ -102,7 +102,8 @@ extern "C" extern u32 j2dDefaultTevSwapModeTable; extern "C" extern u32 j2dDefaultBlendInfo; extern "C" extern u8 data_804561A4[4]; extern "C" extern u32 j2dDefaultColorChanInfo; -extern "C" extern u8 struct_804561AC[4]; +extern "C" extern u16 data_804561AC; +extern "C" extern u16 j2dDefaultAlphaCmp; // // External References: @@ -321,7 +322,7 @@ SECTION_RODATA extern u8 const j2dDefaultTexCoordInfo[32] = { 0x01, 0x04, 0x3C, 0x00, 0x01, 0x05, 0x3C, 0x00, 0x01, 0x06, 0x3C, 0x00, 0x01, 0x07, 0x3C, 0x00, 0x01, 0x08, 0x3C, 0x00, 0x01, 0x09, 0x3C, 0x00, 0x01, 0x0A, 0x3C, 0x00, 0x01, 0x0B, 0x3C, 0x00, }; -COMPILER_STRIP_GATE(803A1B80, &j2dDefaultTexCoordInfo); +COMPILER_STRIP_GATE(0x803A1B80, &j2dDefaultTexCoordInfo); /* 803A1BA0-803A1BC4 02E200 0024+00 0/0 3/3 0/0 .rodata j2dDefaultTexMtxInfo */ SECTION_RODATA extern u8 const j2dDefaultTexMtxInfo[36] = { @@ -329,27 +330,27 @@ SECTION_RODATA extern u8 const j2dDefaultTexMtxInfo[36] = { 0x00, 0x00, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(803A1BA0, &j2dDefaultTexMtxInfo); +COMPILER_STRIP_GATE(0x803A1BA0, &j2dDefaultTexMtxInfo); /* 803A1BC4-803A1BE0 02E224 001C+00 0/0 3/3 0/0 .rodata j2dDefaultIndTexMtxInfo */ SECTION_RODATA extern u8 const j2dDefaultIndTexMtxInfo[28] = { 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(803A1BC4, &j2dDefaultIndTexMtxInfo); +COMPILER_STRIP_GATE(0x803A1BC4, &j2dDefaultIndTexMtxInfo); /* 803A1BE0-803A1BF4 02E240 0014+00 0/0 1/1 0/0 .rodata j2dDefaultTevStageInfo */ SECTION_RODATA extern u8 const j2dDefaultTevStageInfo[20] = { 0x04, 0x0A, 0x0F, 0x0F, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x05, 0x07, 0x07, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, }; -COMPILER_STRIP_GATE(803A1BE0, &j2dDefaultTevStageInfo); +COMPILER_STRIP_GATE(0x803A1BE0, &j2dDefaultTevStageInfo); /* 803A1BF4-803A1C00 02E254 000C+00 0/0 7/7 0/0 .rodata j2dDefaultIndTevStageInfo */ SECTION_RODATA extern u8 const j2dDefaultIndTevStageInfo[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(803A1BF4, &j2dDefaultIndTevStageInfo); +COMPILER_STRIP_GATE(0x803A1BF4, &j2dDefaultIndTevStageInfo); /* 8045617C-80456180 00477C 0004+00 0/0 1/1 0/0 .sdata2 j2dDefaultColInfo */ SECTION_SDATA2 extern u32 j2dDefaultColInfo = 0xFFFFFFFF; @@ -406,13 +407,8 @@ SECTION_SDATA2 extern u8 data_804561A4[4] = { /* 804561A8-804561AC 0047A8 0004+00 0/0 3/3 0/0 .sdata2 j2dDefaultColorChanInfo */ SECTION_SDATA2 extern u32 j2dDefaultColorChanInfo = 0x00030000; -/* 804561AC-804561B0 -00001 0004+00 0/0 4/4 0/0 .sdata2 None */ -SECTION_SDATA2 extern u8 struct_804561AC[4]; -SECTION_SDATA2 u8 struct_804561AC[4] = { - /* 804561AC 0002+00 data_804561AC None */ - 0x1B, - 0x00, - /* 804561AE 0002+00 data_804561AE j2dDefaultAlphaCmp */ - 0x00, - 0xE7, -}; +/* 804561AC-804561AE 0047AC 0002+00 0/0 1/1 0/0 .sdata2 None */ +SECTION_SDATA2 extern u16 data_804561AC = 0x1B00; + +/* 804561AE-804561B0 0047AE 0002+00 0/0 3/3 0/0 .sdata2 j2dDefaultAlphaCmp */ +SECTION_SDATA2 extern u16 j2dDefaultAlphaCmp = 0x00E7; diff --git a/libs/JSystem/J2DGraph/J2DTextBox.cpp b/libs/JSystem/J2DGraph/J2DTextBox.cpp index 976bfce1068..26c004387e7 100644 --- a/libs/JSystem/J2DGraph/J2DTextBox.cpp +++ b/libs/JSystem/J2DGraph/J2DTextBox.cpp @@ -53,24 +53,23 @@ struct J2DTextBoxVBinding {}; struct J2DTextBoxHBinding {}; -struct J2DAnmColor {}; - -struct J2DAnmTevRegKey {}; +struct J2DAnmTexPattern {}; struct J2DAnmVisibilityFull {}; struct J2DAnmBase {}; +struct J2DAnmColor {}; + +struct J2DAnmTevRegKey {}; + +struct J2DAnmTextureSRTKey {}; + struct J2DAnmTransform {}; struct J2DAnmVtxColor {}; -struct J2DAnmTextureSRTKey {}; - -struct J2DAnmTexPattern {}; - struct J2DPane { - /* 80020158 */ void setAlpha(u8); /* 80053BC0 */ void calcMtx(); /* 80053C00 */ void makeMatrix(f32, f32); /* 802F7540 */ void makeMatrix(f32, f32, f32, f32); @@ -78,7 +77,6 @@ struct J2DPane { /* 8025601C */ void setAnimation(J2DAnmVisibilityFull*); /* 80256020 */ void setAnimation(J2DAnmTexPattern*); /* 8018BF28 */ void setAnimation(J2DAnmTextureSRTKey*); - /* 802F7FC4 */ void setAnimation(J2DAnmTransform*); /* 80126350 */ void setAnimation(J2DAnmTevRegKey*); /* 80126354 */ void setAnimation(J2DAnmColor*); /* 802F7EF4 */ void setAnimation(J2DAnmBase*); @@ -424,6 +422,13 @@ asm void J2DTextBox::setFont(JUTFont* param_0) { } #pragma pop +/* ############################################################################################## */ +/* 803A1C58-803A1C58 02E2B8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_803A1C58 = "%s"; +#pragma pop + /* 803002E8-80300490 2FAC28 01A8+00 1/0 0/0 0/0 .text draw__10J2DTextBoxFff */ #pragma push #pragma optimization_level 0 @@ -554,12 +559,13 @@ void J2DTextBox::rewriteAlpha() { /* empty function */ } -/* 803A1C58-803A1C60 02E2B8 0004+04 1/1 0/0 0/0 .rodata @stringBase0 */ +/* ############################################################################################## */ +/* 803A1C5B-803A1C60 02E2BB 0001+04 0/0 0/0 0/0 .rodata None */ #pragma push #pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_803A1C58 = "%s"; SECTION_DEAD static char const* const stringBase_803A1C5B = ""; /* @stringBase0 padding */ SECTION_DEAD static char const* const pad_803A1C5C = "\0\0\0"; #pragma pop + +/* 803A1C58-803A1C58 02E2B8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/libs/JSystem/J2DGraph/J2DTextBoxEx.cpp b/libs/JSystem/J2DGraph/J2DTextBoxEx.cpp index e5ce8cbfc3a..71c721fc2a2 100644 --- a/libs/JSystem/J2DGraph/J2DTextBoxEx.cpp +++ b/libs/JSystem/J2DGraph/J2DTextBoxEx.cpp @@ -38,15 +38,7 @@ struct J2DTextBoxVBinding {}; struct J2DTextBoxHBinding {}; -struct J2DAnmTevRegKey {}; - -struct J2DAnmTransform {}; - -struct J2DTevStage {}; - -struct J2DAnmVtxColor {}; - -struct J2DAnmTextureSRTKey {}; +struct J2DAnmTexPattern {}; struct J2DAnmVisibilityFull { /* 8030C048 */ void getVisibility(u16, u8*) const; @@ -54,6 +46,14 @@ struct J2DAnmVisibilityFull { struct J2DAnmBase {}; +struct J2DAnmTevRegKey {}; + +struct J2DAnmTextureSRTKey {}; + +struct J2DAnmVtxColor {}; + +struct J2DAnmTransform {}; + struct J2DPane { /* 80053BC0 */ void calcMtx(); /* 80053C00 */ void makeMatrix(f32, f32); @@ -77,7 +77,7 @@ struct J2DPane { /* 802F8474 */ void update(); }; -struct J2DAnmTexPattern {}; +struct J2DTevStage {}; struct J2DAnmColor {}; @@ -359,6 +359,15 @@ asm void J2DTextBoxEx::drawSelf(f32 param_0, f32 param_1, f32 (*param_2)[3][4]) } #pragma pop +/* ############################################################################################## */ +/* 803A1DF0-803A1DF0 02E450 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_803A1DF0 = "%s"; +/* @stringBase0 padding */ +SECTION_DEAD static char const* const pad_803A1DF3 = "\0\0\0\0"; +#pragma pop + /* 803078AC-80307AF0 3021EC 0244+00 1/0 0/0 0/0 .text draw__12J2DTextBoxExFff */ #pragma push #pragma optimization_level 0 @@ -426,7 +435,7 @@ asm void J2DTextBoxEx::setTevStage(bool param_0) { SECTION_RODATA static u8 const lit_1953[12] = { 0x0F, 0x08, 0x0A, 0x0F, 0x02, 0x04, 0x08, 0x0F, 0x0F, 0x0A, 0x00, 0x0F, }; -COMPILER_STRIP_GATE(803A1DB8, &lit_1953); +COMPILER_STRIP_GATE(0x803A1DB8, &lit_1953); /* 803A1DC4-803A1DD0 02E424 000C+00 0/1 0/0 0/0 .rodata @1954 */ #pragma push @@ -434,7 +443,7 @@ COMPILER_STRIP_GATE(803A1DB8, &lit_1953); SECTION_RODATA static u8 const lit_1954[12] = { 0x07, 0x04, 0x05, 0x07, 0x01, 0x02, 0x04, 0x07, 0x07, 0x05, 0x00, 0x07, }; -COMPILER_STRIP_GATE(803A1DC4, &lit_1954); +COMPILER_STRIP_GATE(0x803A1DC4, &lit_1954); #pragma pop /* 803A1DD0-803A1DE0 02E430 000F+01 0/1 0/0 0/0 .rodata @1955 */ @@ -459,7 +468,7 @@ SECTION_RODATA static u8 const lit_1955[15 + 1 /* padding */] = { /* padding */ 0x00, }; -COMPILER_STRIP_GATE(803A1DD0, &lit_1955); +COMPILER_STRIP_GATE(0x803A1DD0, &lit_1955); #pragma pop /* 803A1DE0-803A1DF0 02E440 000F+01 0/1 0/0 0/0 .rodata @1956 */ @@ -484,7 +493,7 @@ SECTION_RODATA static u8 const lit_1956[15 + 1 /* padding */] = { /* padding */ 0x00, }; -COMPILER_STRIP_GATE(803A1DE0, &lit_1956); +COMPILER_STRIP_GATE(0x803A1DE0, &lit_1956); #pragma pop /* 80307F94-8030823C 3028D4 02A8+00 1/1 0/0 0/0 .text @@ -658,16 +667,11 @@ asm void J2DTextBoxEx::setAnimation(J2DAnmTevRegKey* param_0) { } #pragma pop -/* 80308964-8030896C 3032A4 0008+00 1/0 0/0 0/0 .text +/* 80308964-8030896C -00001 0008+00 0/0 0/0 0/0 .text * setAnimation__12J2DTextBoxExFP20J2DAnmVisibilityFull */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DTextBoxEx::setAnimation(J2DAnmVisibilityFull* param_0) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DTextBoxEx/setAnimation__12J2DTextBoxExFP20J2DAnmVisibilityFull.s" +void J2DTextBoxEx::setAnimation(J2DAnmVisibilityFull* param_0) { + *(u32*)(((u8*)this) + 324) /* this->field_0x144 */ = (u32)(param_0); } -#pragma pop /* 8030896C-803089EC 3032AC 0080+00 1/0 0/0 0/0 .text * animationPane__12J2DTextBoxExFPC15J2DAnmTransform */ @@ -718,11 +722,4 @@ asm void J2DTextBoxEx::setAnimation(J2DAnmBase* param_0) { } #pragma pop -/* 803A1DF0-803A1DF8 02E450 0003+05 1/1 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_803A1DF0 = "%s"; -/* @stringBase0 padding */ -SECTION_DEAD static char const* const pad_803A1DF3 = "\0\0\0\0"; -#pragma pop +/* 803A1DF0-803A1DF0 02E450 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/libs/JSystem/J2DGraph/J2DWindow.cpp b/libs/JSystem/J2DGraph/J2DWindow.cpp index ef5d119eaec..764f37b7671 100644 --- a/libs/JSystem/J2DGraph/J2DWindow.cpp +++ b/libs/JSystem/J2DGraph/J2DWindow.cpp @@ -57,24 +57,23 @@ struct JGeometry { struct TBox2__template0 {}; }; -struct J2DAnmColor {}; - -struct J2DAnmTevRegKey {}; +struct J2DAnmTexPattern {}; struct J2DAnmVisibilityFull {}; struct J2DAnmBase {}; +struct J2DAnmColor {}; + +struct J2DAnmTevRegKey {}; + +struct J2DAnmTextureSRTKey {}; + struct J2DAnmTransform {}; struct J2DAnmVtxColor {}; -struct J2DAnmTextureSRTKey {}; - -struct J2DAnmTexPattern {}; - struct J2DPane { - /* 80020158 */ void setAlpha(u8); /* 80053BC0 */ void calcMtx(); /* 80053C00 */ void makeMatrix(f32, f32); /* 802F7540 */ void makeMatrix(f32, f32, f32, f32); @@ -82,7 +81,6 @@ struct J2DPane { /* 8025601C */ void setAnimation(J2DAnmVisibilityFull*); /* 80256020 */ void setAnimation(J2DAnmTexPattern*); /* 8018BF28 */ void setAnimation(J2DAnmTextureSRTKey*); - /* 802F7FC4 */ void setAnimation(J2DAnmTransform*); /* 80126350 */ void setAnimation(J2DAnmTevRegKey*); /* 80126354 */ void setAnimation(J2DAnmColor*); /* 802F7EF4 */ void setAnimation(J2DAnmBase*); @@ -361,13 +359,13 @@ asm J2DWindow::J2DWindow(J2DPane* param_0, JSURandomInputStream* param_1, JKRArc SECTION_RODATA static u8 const lit_1831[16] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(803A1C10, &lit_1831); +COMPILER_STRIP_GATE(0x803A1C10, &lit_1831); /* 803A1C20-803A1C30 02E280 0010+00 1/1 0/0 0/0 .rodata @1849 */ SECTION_RODATA static u8 const lit_1849[16] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(803A1C20, &lit_1849); +COMPILER_STRIP_GATE(0x803A1C20, &lit_1849); /* 80456240-80456248 004840 0008+00 7/7 0/0 0/0 .sdata2 @1971 */ SECTION_SDATA2 static f64 lit_1971 = 4503601774854144.0 /* cast s32 to float */; @@ -578,7 +576,7 @@ asm void J2DWindow::setTevMode(JUTTexture* param_0, JUtility::TColor param_1, SECTION_RODATA static u8 const lit_3028[16] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(803A1C30, &lit_3028); +COMPILER_STRIP_GATE(0x803A1C30, &lit_3028); /* 802FBE60-802FBEDC 2F67A0 007C+00 1/0 0/0 0/0 .text getFrameTexture__9J2DWindowCFUcUc */ @@ -620,7 +618,7 @@ SECTION_RODATA static u8 const lit_3037[20 + 4 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(803A1C40, &lit_3037); +COMPILER_STRIP_GATE(0x803A1C40, &lit_3037); /* 802FBEDC-802FBF98 2F681C 00BC+00 1/0 0/0 0/0 .text isUsed__9J2DWindowFPC7ResTIMG */ #pragma push diff --git a/libs/JSystem/J2DGraph/J2DWindowEx.cpp b/libs/JSystem/J2DGraph/J2DWindowEx.cpp index c71e16e4078..7439f7eb7d3 100644 --- a/libs/JSystem/J2DGraph/J2DWindowEx.cpp +++ b/libs/JSystem/J2DGraph/J2DWindowEx.cpp @@ -41,24 +41,26 @@ struct JGeometry { struct TBox2__template0 {}; }; -struct J2DAnmTevRegKey {}; - -struct J2DAnmTransform {}; - -struct J2DTevStage {}; - -struct J2DAnmVtxColor { - /* 8030363C */ void getColor(u8, u16, _GXColor*) const; -}; - -struct J2DAnmTextureSRTKey {}; +struct J2DAnmTexPattern {}; struct J2DAnmVisibilityFull { /* 8030C048 */ void getVisibility(u16, u8*) const; }; +struct J2DAnmColor {}; + struct J2DAnmBase {}; +struct J2DAnmTevRegKey {}; + +struct J2DAnmTextureSRTKey {}; + +struct J2DAnmVtxColor { + /* 8030363C */ void getColor(u8, u16, _GXColor*) const; +}; + +struct J2DAnmTransform {}; + struct J2DPane { /* 80053BC0 */ void calcMtx(); /* 80053C00 */ void makeMatrix(f32, f32); @@ -85,9 +87,15 @@ struct J2DPane { /* 802F8474 */ void update(); }; -struct J2DAnmTexPattern {}; +struct J2DTevStage {}; -struct J2DAnmColor {}; +struct J2DMaterial { + /* 802EA38C */ void setGX(); + /* 802EAB0C */ void setAnimation(J2DAnmTevRegKey*); + /* 802EAA2C */ void setAnimation(J2DAnmTexPattern*); + /* 802EA94C */ void setAnimation(J2DAnmTextureSRTKey*); + /* 802EA89C */ void setAnimation(J2DAnmColor*); +}; struct J2DWindow { struct TMaterial {}; @@ -99,14 +107,6 @@ struct J2DWindow { /* 802FBF98 */ s32 getTypeID() const; }; -struct J2DMaterial { - /* 802EA38C */ void setGX(); - /* 802EAB0C */ void setAnimation(J2DAnmTevRegKey*); - /* 802EAA2C */ void setAnimation(J2DAnmTexPattern*); - /* 802EA94C */ void setAnimation(J2DAnmTextureSRTKey*); - /* 802EA89C */ void setAnimation(J2DAnmColor*); -}; - struct J2DWindowEx { struct stage_enum {}; @@ -280,7 +280,7 @@ extern "C" void _restgpr_29(); SECTION_RODATA static u8 const lit_1508[16] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(803A1C60, &lit_1508); +COMPILER_STRIP_GATE(0x803A1C60, &lit_1508); /* 803CD3E8-803CD4B8 02A508 00CC+04 2/2 0/0 0/0 .data __vt__11J2DWindowEx */ SECTION_DATA extern void* __vt__11J2DWindowEx[51 + 1 /* padding */] = { @@ -686,16 +686,11 @@ asm void J2DWindowEx::isNeedSetAnm(u8 param_0) { } #pragma pop -/* 80303274-8030327C 2FDBB4 0008+00 1/0 0/0 0/0 .text +/* 80303274-8030327C -00001 0008+00 0/0 0/0 0/0 .text * setAnimation__11J2DWindowExFP20J2DAnmVisibilityFull */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DWindowEx::setAnimation(J2DAnmVisibilityFull* param_0) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DWindowEx/setAnimation__11J2DWindowExFP20J2DAnmVisibilityFull.s" +void J2DWindowEx::setAnimation(J2DAnmVisibilityFull* param_0) { + *(u32*)(((u8*)this) + 372) /* this->field_0x174 */ = (u32)(param_0); } -#pragma pop /* 8030327C-80303370 2FDBBC 00F4+00 1/0 0/0 0/0 .text * setAnimation__11J2DWindowExFP14J2DAnmVtxColor */ @@ -715,7 +710,7 @@ asm void J2DWindowEx::setAnimation(J2DAnmVtxColor* param_0) { SECTION_RODATA static u8 const lit_1557[16] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(803A1C70, &lit_1557); +COMPILER_STRIP_GATE(0x803A1C70, &lit_1557); #pragma pop /* 803A1C80-803A1C90 02E2E0 0010+00 0/0 0/0 0/0 .rodata @1566 */ @@ -724,7 +719,7 @@ COMPILER_STRIP_GATE(803A1C70, &lit_1557); SECTION_RODATA static u8 const lit_1566[16] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(803A1C80, &lit_1566); +COMPILER_STRIP_GATE(0x803A1C80, &lit_1566); #pragma pop /* 803A1C90-803A1CA0 02E2F0 0010+00 0/0 0/0 0/0 .rodata @1575 */ @@ -733,7 +728,7 @@ COMPILER_STRIP_GATE(803A1C80, &lit_1566); SECTION_RODATA static u8 const lit_1575[16] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(803A1C90, &lit_1575); +COMPILER_STRIP_GATE(0x803A1C90, &lit_1575); #pragma pop /* 803A1CA0-803A1CB0 02E300 0010+00 0/0 0/0 0/0 .rodata @1581 */ @@ -742,7 +737,7 @@ COMPILER_STRIP_GATE(803A1C90, &lit_1575); SECTION_RODATA static u8 const lit_1581[16] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(803A1CA0, &lit_1581); +COMPILER_STRIP_GATE(0x803A1CA0, &lit_1581); #pragma pop /* 803A1CB0-803A1CC0 02E310 0010+00 0/0 0/0 0/0 .rodata @1587 */ @@ -751,7 +746,7 @@ COMPILER_STRIP_GATE(803A1CA0, &lit_1581); SECTION_RODATA static u8 const lit_1587[16] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(803A1CB0, &lit_1587); +COMPILER_STRIP_GATE(0x803A1CB0, &lit_1587); #pragma pop /* 803A1CC0-803A1CD0 02E320 0010+00 0/0 0/0 0/0 .rodata @1596 */ @@ -760,7 +755,7 @@ COMPILER_STRIP_GATE(803A1CB0, &lit_1587); SECTION_RODATA static u8 const lit_1596[16] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(803A1CC0, &lit_1596); +COMPILER_STRIP_GATE(0x803A1CC0, &lit_1596); #pragma pop /* 803A1CD0-803A1CE0 02E330 0010+00 0/0 0/0 0/0 .rodata @1605 */ @@ -769,7 +764,7 @@ COMPILER_STRIP_GATE(803A1CC0, &lit_1596); SECTION_RODATA static u8 const lit_1605[16] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(803A1CD0, &lit_1605); +COMPILER_STRIP_GATE(0x803A1CD0, &lit_1605); #pragma pop /* 803A1CE0-803A1CF0 02E340 0010+00 0/0 0/0 0/0 .rodata @1612 */ @@ -778,7 +773,7 @@ COMPILER_STRIP_GATE(803A1CD0, &lit_1605); SECTION_RODATA static u8 const lit_1612[16] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(803A1CE0, &lit_1612); +COMPILER_STRIP_GATE(0x803A1CE0, &lit_1612); #pragma pop /* 803A1CF0-803A1D08 02E350 0018+00 0/0 0/0 0/0 .rodata @2530 */ @@ -788,7 +783,7 @@ SECTION_RODATA static u8 const lit_2530[24] = { 0x0F, 0x08, 0x0A, 0x0F, 0x0F, 0x08, 0x0A, 0x0F, 0x0F, 0x0A, 0x00, 0x0F, 0x02, 0x04, 0x08, 0x0F, 0x02, 0x04, 0x08, 0x0F, 0x0F, 0x0F, 0x0F, 0x0A, }; -COMPILER_STRIP_GATE(803A1CF0, &lit_2530); +COMPILER_STRIP_GATE(0x803A1CF0, &lit_2530); #pragma pop /* 803A1D08-803A1D20 02E368 0018+00 0/0 0/0 0/0 .rodata @2531 */ @@ -798,7 +793,7 @@ SECTION_RODATA static u8 const lit_2531[24] = { 0x07, 0x04, 0x05, 0x07, 0x05, 0x07, 0x07, 0x07, 0x07, 0x05, 0x00, 0x07, 0x01, 0x02, 0x04, 0x07, 0x07, 0x07, 0x07, 0x02, 0x07, 0x07, 0x07, 0x05, }; -COMPILER_STRIP_GATE(803A1D08, &lit_2531); +COMPILER_STRIP_GATE(0x803A1D08, &lit_2531); #pragma pop /* 803A1D20-803A1D40 02E380 001E+02 0/0 0/0 0/0 .rodata @2532 */ @@ -839,14 +834,14 @@ SECTION_RODATA static u8 const lit_2532[30 + 2 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(803A1D20, &lit_2532); +COMPILER_STRIP_GATE(0x803A1D20, &lit_2532); #pragma pop /* 803A1D40-803A1D50 02E3A0 0010+00 1/1 0/0 0/0 .rodata @3089 */ SECTION_RODATA static u8 const lit_3089[16] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(803A1D40, &lit_3089); +COMPILER_STRIP_GATE(0x803A1D40, &lit_3089); /* 80303370-80303510 2FDCB0 01A0+00 1/0 0/0 0/0 .text * animationPane__11J2DWindowExFPC15J2DAnmTransform */ diff --git a/libs/JSystem/J3DGraphAnimator/J3DAnimation.cpp b/libs/JSystem/J3DGraphAnimator/J3DAnimation.cpp index ea713251e39..71820d3d834 100644 --- a/libs/JSystem/J3DGraphAnimator/J3DAnimation.cpp +++ b/libs/JSystem/J3DGraphAnimator/J3DAnimation.cpp @@ -183,8 +183,8 @@ extern "C" void getTevColorReg__15J3DAnmTevRegKeyCFUsP11_GXColorS10(); extern "C" void getTevKonstReg__15J3DAnmTevRegKeyCFUsP8_GXColor(); extern "C" void searchUpdateMaterialID__15J3DAnmTevRegKeyFP16J3DMaterialTable(); extern "C" void searchUpdateMaterialID__15J3DAnmTevRegKeyFP12J3DModelData(); -extern "C" void func_8032B8A0(f32, J3DAnmKeyTableBase*, s16*); -extern "C" void func_8032BAD4(f32, J3DAnmKeyTableBase*, f32*); +extern "C" void func_8032B8A0(void* _this, f32, J3DAnmKeyTableBase*, s16*); +extern "C" void func_8032BAD4(void* _this, f32, J3DAnmKeyTableBase*, f32*); extern "C" void __dt__14J3DAnmVtxColorFv(); extern "C" void __dt__11J3DAnmColorFv(); extern "C" void __dt__16J3DAnmTexPatternFv(); @@ -753,7 +753,8 @@ asm void J3DAnmTevRegKey::searchUpdateMaterialID(J3DModelData* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_8032B8A0(f32 param_0, J3DAnmKeyTableBase* param_1, s16* param_2) { +extern "C" asm void func_8032B8A0(void* _this, f32 param_0, J3DAnmKeyTableBase* param_1, + s16* param_2) { nofralloc #include "asm/JSystem/J3DGraphAnimator/J3DAnimation/func_8032B8A0.s" } @@ -764,7 +765,8 @@ extern "C" asm void func_8032B8A0(f32 param_0, J3DAnmKeyTableBase* param_1, s16* #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_8032BAD4(f32 param_0, J3DAnmKeyTableBase* param_1, f32* param_2) { +extern "C" asm void func_8032BAD4(void* _this, f32 param_0, J3DAnmKeyTableBase* param_1, + f32* param_2) { nofralloc #include "asm/JSystem/J3DGraphAnimator/J3DAnimation/func_8032BAD4.s" } diff --git a/libs/JSystem/J3DGraphAnimator/J3DCluster.cpp b/libs/JSystem/J3DGraphAnimator/J3DCluster.cpp index 311e649ae5e..54badd41524 100644 --- a/libs/JSystem/J3DGraphAnimator/J3DCluster.cpp +++ b/libs/JSystem/J3DGraphAnimator/J3DCluster.cpp @@ -19,6 +19,10 @@ struct J3DVertexBuffer {}; struct J3DModel {}; +struct J3DCluster {}; + +struct J3DClusterKey {}; + struct J3DAnmCluster {}; struct J3DDeformData { @@ -29,10 +33,6 @@ struct J3DDeformData { /* 8032E364 */ void setAnm(J3DAnmCluster*); }; -struct J3DClusterKey {}; - -struct J3DCluster {}; - struct J3DDeformer { /* 8032E39C */ J3DDeformer(J3DDeformData*); /* 8032EAB4 */ void deform(J3DVertexBuffer*, u16, f32*); diff --git a/libs/JSystem/J3DGraphAnimator/J3DJoint.cpp b/libs/JSystem/J3DGraphAnimator/J3DJoint.cpp index 1f93769c935..3deb5a1b6f4 100644 --- a/libs/JSystem/J3DGraphAnimator/J3DJoint.cpp +++ b/libs/JSystem/J3DGraphAnimator/J3DJoint.cpp @@ -108,7 +108,7 @@ extern "C" u8 entryNum__13J3DDrawBuffer[4 + 4 /* padding */]; SECTION_RODATA static u8 const lit_882[12] = { 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, }; -COMPILER_STRIP_GATE(803A2068, &lit_882); +COMPILER_STRIP_GATE(0x803A2068, &lit_882); /* 8032EC28-8032ECAC 329568 0084+00 0/0 1/1 0/0 .text * init__25J3DMtxCalcJ3DSysInitBasicFRC3VecRA3_A4_Cf */ @@ -126,7 +126,7 @@ asm void J3DMtxCalcJ3DSysInitBasic::init(Vec const& param_0, f32 const (¶m_1 SECTION_RODATA static u8 const lit_893[12] = { 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, }; -COMPILER_STRIP_GATE(803A2074, &lit_893); +COMPILER_STRIP_GATE(0x803A2074, &lit_893); /* 8032ECAC-8032ED30 3295EC 0084+00 0/0 2/2 2/2 .text * init__24J3DMtxCalcJ3DSysInitMayaFRC3VecRA3_A4_Cf */ @@ -198,13 +198,13 @@ asm void J3DJoint::appendChild(J3DJoint* param_0) { SECTION_RODATA static u8 const lit_1257[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(803A2080, &lit_1257); +COMPILER_STRIP_GATE(0x803A2080, &lit_1257); /* 803A208C-803A2098 02E6EC 000C+00 1/1 0/0 0/0 .rodata @1259 */ SECTION_RODATA static u8 const lit_1259[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(803A208C, &lit_1259); +COMPILER_STRIP_GATE(0x803A208C, &lit_1259); /* 804564A4-804564A8 004AA4 0004+00 1/1 0/0 0/0 .sdata2 @1220 */ SECTION_SDATA2 static u8 lit_1220[4] = { diff --git a/libs/JSystem/J3DGraphAnimator/J3DMaterialAnm.cpp b/libs/JSystem/J3DGraphAnimator/J3DMaterialAnm.cpp index 932fa4d198b..d8808a65ad6 100644 --- a/libs/JSystem/J3DGraphAnimator/J3DMaterialAnm.cpp +++ b/libs/JSystem/J3DGraphAnimator/J3DMaterialAnm.cpp @@ -25,10 +25,10 @@ struct J3DTevKColorAnm {}; struct J3DTevColorAnm {}; -struct J3DMatColorAnm {}; - struct J3DMaterial {}; +struct J3DMatColorAnm {}; + struct J3DMaterialAnm { /* 800A4820 */ ~J3DMaterialAnm(); /* 8032C320 */ void initialize(); diff --git a/libs/JSystem/J3DGraphAnimator/J3DMaterialAttach.cpp b/libs/JSystem/J3DGraphAnimator/J3DMaterialAttach.cpp index 61829936218..c72d556cfd2 100644 --- a/libs/JSystem/J3DGraphAnimator/J3DMaterialAttach.cpp +++ b/libs/JSystem/J3DGraphAnimator/J3DMaterialAttach.cpp @@ -23,13 +23,13 @@ struct J3DTevKColorAnm {}; struct J3DTevColorAnm {}; -struct J3DAnmColor {}; +struct J3DAnmTextureSRTKey {}; struct J3DAnmTexPattern {}; struct J3DAnmTevRegKey {}; -struct J3DAnmTextureSRTKey {}; +struct J3DAnmColor {}; struct J3DMaterialTable { /* 8032F5A8 */ void clear(); diff --git a/libs/JSystem/J3DGraphAnimator/J3DModel.cpp b/libs/JSystem/J3DGraphAnimator/J3DModel.cpp index 8cc33ec883e..42ea6a7b138 100644 --- a/libs/JSystem/J3DGraphAnimator/J3DModel.cpp +++ b/libs/JSystem/J3DGraphAnimator/J3DModel.cpp @@ -14,11 +14,6 @@ struct Vec {}; struct J3DModel; -struct J3DDeformData { - /* 8032E230 */ void offAllFlag(u32); - /* 8032E274 */ void deform(J3DModel*); -}; - struct J3DModelData { /* 803260F8 */ void syncJ3DSysFlags() const; }; @@ -31,6 +26,11 @@ struct J3DSkinDeform { /* 8032DFDC */ void deform(J3DModel*); }; +struct J3DDeformData { + /* 8032E230 */ void offAllFlag(u32); + /* 8032E274 */ void deform(J3DModel*); +}; + struct J3DModel { /* 80327100 */ void initialize(); /* 80327184 */ void entryModelData(J3DModelData*, u32, u32); diff --git a/libs/JSystem/J3DGraphAnimator/J3DSkinDeform.cpp b/libs/JSystem/J3DGraphAnimator/J3DSkinDeform.cpp index 05b4414d6ee..e9ccbea0db0 100644 --- a/libs/JSystem/J3DGraphAnimator/J3DSkinDeform.cpp +++ b/libs/JSystem/J3DGraphAnimator/J3DSkinDeform.cpp @@ -27,10 +27,10 @@ struct J3DSkinNList { /* 8032C8E4 */ void calcSkin_VtxNrmF32(f32 (*)[4], void*, void*); }; -struct J3DModelData {}; - struct J3DMtxBuffer {}; +struct J3DModelData {}; + struct J3DSkinDeform { /* 8032C96C */ J3DSkinDeform(); /* 8032C9B0 */ void initSkinInfo(J3DModelData*); @@ -228,7 +228,17 @@ asm void J3DSkinDeform::initSkinInfo(J3DModelData* param_0) { SECTION_RODATA static u8 const lit_1142[16] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, }; -COMPILER_STRIP_GATE(803A2008, &lit_1142); +COMPILER_STRIP_GATE(0x803A2008, &lit_1142); + +/* 803A2028-803A2028 02E688 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_803A2028 = + " Invlid Data : CPU Pipeline process GX_INDEX16 D" + "ata Only\n"; +/* @stringBase0 padding */ +SECTION_DEAD static char const* const pad_803A2062 = "\0\0\0\0\0"; +#pragma pop /* 80439218-80439A20 065F38 0800+08 1/1 0/0 0/0 .bss sWorkArea_MtxReg__13J3DSkinDeform */ @@ -250,7 +260,7 @@ asm void J3DSkinDeform::initMtxIndexArray(J3DModelData* param_0) { SECTION_RODATA static u8 const lit_1270[16] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, }; -COMPILER_STRIP_GATE(803A2018, &lit_1270); +COMPILER_STRIP_GATE(0x803A2018, &lit_1270); /* 8032D378-8032D5C4 327CB8 024C+00 0/0 1/1 0/0 .text * changeFastSkinDL__13J3DSkinDeformFP12J3DModelData */ @@ -416,13 +426,4 @@ asm J3DSkinDeform::~J3DSkinDeform() { } #pragma pop -/* 803A2028-803A2068 02E688 003A+06 1/1 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_803A2028 = - " Invlid Data : CPU Pipeline process GX_INDEX16 D" - "ata Only\n"; -/* @stringBase0 padding */ -SECTION_DEAD static char const* const pad_803A2062 = "\0\0\0\0\0"; -#pragma pop +/* 803A2028-803A2028 02E688 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/libs/JSystem/J3DGraphBase/J3DDrawBuffer.cpp b/libs/JSystem/J3DGraphBase/J3DDrawBuffer.cpp index b13153e86fb..e6077324eb8 100644 --- a/libs/JSystem/J3DGraphBase/J3DDrawBuffer.cpp +++ b/libs/JSystem/J3DGraphBase/J3DDrawBuffer.cpp @@ -349,7 +349,7 @@ asm void __sinit_J3DDrawBuffer_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_803255F0 = (void*)__sinit_J3DDrawBuffer_cpp; +REGISTER_CTORS(0x803255F0, __sinit_J3DDrawBuffer_cpp); #pragma pop /* ############################################################################################## */ diff --git a/libs/JSystem/J3DGraphBase/J3DMatBlock.cpp b/libs/JSystem/J3DGraphBase/J3DMatBlock.cpp index 016ca133ed6..dc7a9a07fa2 100644 --- a/libs/JSystem/J3DGraphBase/J3DMatBlock.cpp +++ b/libs/JSystem/J3DGraphBase/J3DMatBlock.cpp @@ -45,8 +45,6 @@ struct J3DTexMtx { /* 80323C0C */ void calcPostTexMtx(f32 const (*)[4]); }; -struct J3DTexCoord {}; - struct J3DNBTScale {}; struct J3DTexGenBlock { @@ -55,6 +53,8 @@ struct J3DTexGenBlock { /* 80317424 */ void setNBTScale(J3DNBTScale const*); }; +struct J3DTexCoord {}; + struct J3DTexGenBlockPatched { /* 80317180 */ ~J3DTexGenBlockPatched(); /* 80317644 */ void initialize(); @@ -115,10 +115,10 @@ struct J3DTevStage {}; struct J3DTevOrder {}; -struct J3DIndTevStage {}; - struct J3DGXColorS10 {}; +struct J3DIndTevStage {}; + struct J3DGXColor {}; struct J3DTevBlock { @@ -454,10 +454,10 @@ struct J3DPEBlockOpa { struct J3DBlend {}; -struct J3DAlphaComp {}; - struct J3DFog {}; +struct J3DAlphaComp {}; + struct J3DPEBlock { /* 8000DBCC */ void patch(); /* 8000DF3C */ bool getZCompLoc() const; @@ -2486,6 +2486,15 @@ asm void J3DColorBlockLightOn::reset(J3DColorBlock* param_0) { } #pragma pop +/* ############################################################################################## */ +/* 803A1EA8-803A1EA8 02E508 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_803A1EA8 = "Error : TexMtx[%d] is Null.\n"; +/* @stringBase0 padding */ +SECTION_DEAD static char const* const pad_803A1EC5 = "\0\0"; +#pragma pop + /* 80320084-803201A0 31A9C4 011C+00 1/0 0/0 0/0 .text * reset__21J3DTexGenBlockPatchedFP14J3DTexGenBlock */ #pragma push @@ -2878,15 +2887,10 @@ asm void J3DPEBlockFull::getZMode() { } #pragma pop -/* 80321A28-80321A30 31C368 0008+00 1/0 0/0 0/0 .text setZCompLoc__14J3DPEBlockFullFUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J3DPEBlockFull::setZCompLoc(u8 param_0) { - nofralloc -#include "asm/JSystem/J3DGraphBase/J3DMatBlock/setZCompLoc__14J3DPEBlockFullFUc.s" +/* 80321A28-80321A30 -00001 0008+00 0/0 0/0 0/0 .text setZCompLoc__14J3DPEBlockFullFUc */ +void J3DPEBlockFull::setZCompLoc(u8 param_0) { + *(u8*)(((u8*)this) + 58) /* this->field_0x3a */ = (u8)(param_0); } -#pragma pop /* 80321A30-80321A3C 31C370 000C+00 1/0 0/0 0/0 .text setZCompLoc__14J3DPEBlockFullFPCUc */ @@ -2909,15 +2913,10 @@ asm void J3DPEBlockFull::getZCompLoc() const { } #pragma pop -/* 80321A44-80321A4C 31C384 0008+00 1/0 0/0 0/0 .text setDither__14J3DPEBlockFullFUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J3DPEBlockFull::setDither(u8 param_0) { - nofralloc -#include "asm/JSystem/J3DGraphBase/J3DMatBlock/setDither__14J3DPEBlockFullFUc.s" +/* 80321A44-80321A4C -00001 0008+00 0/0 0/0 0/0 .text setDither__14J3DPEBlockFullFUc */ +void J3DPEBlockFull::setDither(u8 param_0) { + *(u8*)(((u8*)this) + 59) /* this->field_0x3b */ = (u8)(param_0); } -#pragma pop /* 80321A4C-80321A58 31C38C 000C+00 1/0 0/0 0/0 .text setDither__14J3DPEBlockFullFPCUc */ #pragma push @@ -2950,16 +2949,11 @@ asm void J3DPEBlockFull::getFogOffset() const { } #pragma pop -/* 80321A68-80321A70 31C3A8 0008+00 1/0 0/0 0/0 .text setFogOffset__14J3DPEBlockFullFUl +/* 80321A68-80321A70 -00001 0008+00 0/0 0/0 0/0 .text setFogOffset__14J3DPEBlockFullFUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J3DPEBlockFull::setFogOffset(u32 param_0) { - nofralloc -#include "asm/JSystem/J3DGraphBase/J3DMatBlock/setFogOffset__14J3DPEBlockFullFUl.s" +void J3DPEBlockFull::setFogOffset(u32 param_0) { + *(u32*)(((u8*)this) + 60) /* this->field_0x3c */ = (u32)(param_0); } -#pragma pop /* ############################################################################################## */ /* 803CDFF0-803CE06C 02B110 007C+00 1/1 1/1 0/0 .data __vt__14J3DPEBlockFull */ @@ -3120,16 +3114,11 @@ asm void J3DPEBlockFogOff::getZMode() { } #pragma pop -/* 80321B8C-80321B94 31C4CC 0008+00 1/0 0/0 0/0 .text setZCompLoc__16J3DPEBlockFogOffFUc +/* 80321B8C-80321B94 -00001 0008+00 0/0 0/0 0/0 .text setZCompLoc__16J3DPEBlockFogOffFUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J3DPEBlockFogOff::setZCompLoc(u8 param_0) { - nofralloc -#include "asm/JSystem/J3DGraphBase/J3DMatBlock/setZCompLoc__16J3DPEBlockFogOffFUc.s" +void J3DPEBlockFogOff::setZCompLoc(u8 param_0) { + *(u8*)(((u8*)this) + 14) /* this->field_0xe */ = (u8)(param_0); } -#pragma pop /* 80321B94-80321BA0 31C4D4 000C+00 1/0 0/0 0/0 .text setZCompLoc__16J3DPEBlockFogOffFPCUc */ #pragma push @@ -3152,15 +3141,10 @@ asm void J3DPEBlockFogOff::getZCompLoc() const { } #pragma pop -/* 80321BA8-80321BB0 31C4E8 0008+00 1/0 0/0 0/0 .text setDither__16J3DPEBlockFogOffFUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J3DPEBlockFogOff::setDither(u8 param_0) { - nofralloc -#include "asm/JSystem/J3DGraphBase/J3DMatBlock/setDither__16J3DPEBlockFogOffFUc.s" +/* 80321BA8-80321BB0 -00001 0008+00 0/0 0/0 0/0 .text setDither__16J3DPEBlockFogOffFUc */ +void J3DPEBlockFogOff::setDither(u8 param_0) { + *(u8*)(((u8*)this) + 15) /* this->field_0xf */ = (u8)(param_0); } -#pragma pop /* 80321BB0-80321BBC 31C4F0 000C+00 1/0 0/0 0/0 .text setDither__16J3DPEBlockFogOffFPCUc */ @@ -3437,16 +3421,11 @@ asm void J3DTevBlock16::getTevKAlphaSel(u32 param_0) { } #pragma pop -/* 80321DE8-80321DF0 31C728 0008+00 1/0 0/0 0/0 .text setTevStageNum__13J3DTevBlock16FUc +/* 80321DE8-80321DF0 -00001 0008+00 0/0 0/0 0/0 .text setTevStageNum__13J3DTevBlock16FUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J3DTevBlock16::setTevStageNum(u8 param_0) { - nofralloc -#include "asm/JSystem/J3DGraphBase/J3DMatBlock/setTevStageNum__13J3DTevBlock16FUc.s" +void J3DTevBlock16::setTevStageNum(u8 param_0) { + *(u8*)(((u8*)this) + 88) /* this->field_0x58 */ = (u8)(param_0); } -#pragma pop /* 80321DF0-80321DFC 31C730 000C+00 1/0 0/0 0/0 .text setTevStageNum__13J3DTevBlock16FPCUc */ #pragma push @@ -3610,16 +3589,11 @@ asm void J3DTevBlock16::getTevRegOffset() const { } #pragma pop -/* 80321F7C-80321F84 31C8BC 0008+00 1/0 0/0 0/0 .text setTevRegOffset__13J3DTevBlock16FUl +/* 80321F7C-80321F84 -00001 0008+00 0/0 0/0 0/0 .text setTevRegOffset__13J3DTevBlock16FUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J3DTevBlock16::setTevRegOffset(u32 param_0) { - nofralloc -#include "asm/JSystem/J3DGraphBase/J3DMatBlock/setTevRegOffset__13J3DTevBlock16FUl.s" +void J3DTevBlock16::setTevRegOffset(u32 param_0) { + *(u32*)(((u8*)this) + 368) /* this->field_0x170 */ = (u32)(param_0); } -#pragma pop /* ############################################################################################## */ /* 803CE0E8-803CE1C4 02B208 00DC+00 1/1 1/1 0/0 .data __vt__13J3DTevBlock16 */ @@ -4287,15 +4261,10 @@ asm J3DTevBlock16::~J3DTevBlock16() { } #pragma pop -/* 80321FE0-80321FE8 31C920 0008+00 6/0 1/0 0/0 .text setTexNoOffset__11J3DTevBlockFUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J3DTevBlock::setTexNoOffset(u32 param_0) { - nofralloc -#include "asm/JSystem/J3DGraphBase/J3DMatBlock/setTexNoOffset__11J3DTevBlockFUl.s" +/* 80321FE0-80321FE8 -00001 0008+00 0/0 0/0 0/0 .text setTexNoOffset__11J3DTevBlockFUl */ +void J3DTevBlock::setTexNoOffset(u32 param_0) { + *(u32*)(((u8*)this) + 4) /* this->field_0x4 */ = (u32)(param_0); } -#pragma pop /* 80321FE8-80321FEC 31C928 0004+00 1/0 0/0 0/0 .text ptrToIndex__12J3DTevBlock4Fv */ void J3DTevBlock4::ptrToIndex() { @@ -4510,16 +4479,11 @@ asm void J3DTevBlock4::getTevKAlphaSel(u32 param_0) { } #pragma pop -/* 803221B4-803221BC 31CAF4 0008+00 1/0 0/0 0/0 .text setTevStageNum__12J3DTevBlock4FUc +/* 803221B4-803221BC -00001 0008+00 0/0 0/0 0/0 .text setTevStageNum__12J3DTevBlock4FUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J3DTevBlock4::setTevStageNum(u8 param_0) { - nofralloc -#include "asm/JSystem/J3DGraphBase/J3DMatBlock/setTevStageNum__12J3DTevBlock4FUc.s" +void J3DTevBlock4::setTevStageNum(u8 param_0) { + *(u8*)(((u8*)this) + 32) /* this->field_0x20 */ = (u8)(param_0); } -#pragma pop /* 803221BC-803221C8 31CAFC 000C+00 1/0 0/0 0/0 .text setTevStageNum__12J3DTevBlock4FPCUc */ @@ -4684,16 +4648,11 @@ asm void J3DTevBlock4::getTevRegOffset() const { } #pragma pop -/* 80322348-80322350 31CC88 0008+00 1/0 0/0 0/0 .text setTevRegOffset__12J3DTevBlock4FUl +/* 80322348-80322350 -00001 0008+00 0/0 0/0 0/0 .text setTevRegOffset__12J3DTevBlock4FUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J3DTevBlock4::setTevRegOffset(u32 param_0) { - nofralloc -#include "asm/JSystem/J3DGraphBase/J3DMatBlock/setTevRegOffset__12J3DTevBlock4FUl.s" +void J3DTevBlock4::setTevRegOffset(u32 param_0) { + *(u32*)(((u8*)this) + 144) /* this->field_0x90 */ = (u32)(param_0); } -#pragma pop /* 80322350-803223AC 31CC90 005C+00 1/0 0/0 0/0 .text __dt__12J3DTevBlock4Fv */ #pragma push @@ -4918,16 +4877,11 @@ asm void J3DTevBlock2::getTevKAlphaSel(u32 param_0) { } #pragma pop -/* 80322578-80322580 31CEB8 0008+00 1/0 0/0 0/0 .text setTevStageNum__12J3DTevBlock2FUc +/* 80322578-80322580 -00001 0008+00 0/0 0/0 0/0 .text setTevStageNum__12J3DTevBlock2FUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J3DTevBlock2::setTevStageNum(u8 param_0) { - nofralloc -#include "asm/JSystem/J3DGraphBase/J3DMatBlock/setTevStageNum__12J3DTevBlock2FUc.s" +void J3DTevBlock2::setTevStageNum(u8 param_0) { + *(u8*)(((u8*)this) + 52) /* this->field_0x34 */ = (u8)(param_0); } -#pragma pop /* 80322580-8032258C 31CEC0 000C+00 1/0 0/0 0/0 .text setTevStageNum__12J3DTevBlock2FPCUc */ @@ -5092,16 +5046,11 @@ asm void J3DTevBlock2::getTevRegOffset() const { } #pragma pop -/* 8032270C-80322714 31D04C 0008+00 1/0 0/0 0/0 .text setTevRegOffset__12J3DTevBlock2FUl +/* 8032270C-80322714 -00001 0008+00 0/0 0/0 0/0 .text setTevRegOffset__12J3DTevBlock2FUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J3DTevBlock2::setTevRegOffset(u32 param_0) { - nofralloc -#include "asm/JSystem/J3DGraphBase/J3DMatBlock/setTevRegOffset__12J3DTevBlock2FUl.s" +void J3DTevBlock2::setTevRegOffset(u32 param_0) { + *(u32*)(((u8*)this) + 104) /* this->field_0x68 */ = (u32)(param_0); } -#pragma pop /* 80322714-80322770 31D054 005C+00 1/0 0/0 0/0 .text __dt__12J3DTevBlock2Fv */ #pragma push @@ -5370,15 +5319,10 @@ asm void J3DTevBlockPatched::getType() { } #pragma pop -/* 803229A4-803229AC 31D2E4 0008+00 1/0 0/0 0/0 .text setTevStageNum__18J3DTevBlockPatchedFUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J3DTevBlockPatched::setTevStageNum(u8 param_0) { - nofralloc -#include "asm/JSystem/J3DGraphBase/J3DMatBlock/setTevStageNum__18J3DTevBlockPatchedFUc.s" +/* 803229A4-803229AC -00001 0008+00 0/0 0/0 0/0 .text setTevStageNum__18J3DTevBlockPatchedFUc */ +void J3DTevBlockPatched::setTevStageNum(u8 param_0) { + *(u8*)(((u8*)this) + 208) /* this->field_0xd0 */ = (u8)(param_0); } -#pragma pop /* 803229AC-803229B8 31D2EC 000C+00 1/0 0/0 0/0 .text setTevStageNum__18J3DTevBlockPatchedFPCUc */ #pragma push @@ -5644,15 +5588,10 @@ asm void J3DTevBlockPatched::getTevRegOffset() const { } #pragma pop -/* 80322C08-80322C10 31D548 0008+00 1/0 0/0 0/0 .text setTevRegOffset__18J3DTevBlockPatchedFUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J3DTevBlockPatched::setTevRegOffset(u32 param_0) { - nofralloc -#include "asm/JSystem/J3DGraphBase/J3DMatBlock/setTevRegOffset__18J3DTevBlockPatchedFUl.s" +/* 80322C08-80322C10 -00001 0008+00 0/0 0/0 0/0 .text setTevRegOffset__18J3DTevBlockPatchedFUl */ +void J3DTevBlockPatched::setTevRegOffset(u32 param_0) { + *(u32*)(((u8*)this) + 212) /* this->field_0xd4 */ = (u32)(param_0); } -#pragma pop /* 80322C10-80322C6C 31D550 005C+00 1/0 0/0 0/0 .text __dt__18J3DTevBlockPatchedFv */ #pragma push @@ -5716,15 +5655,10 @@ asm J3DTexGenBlockBasic::~J3DTexGenBlockBasic() { } #pragma pop -/* 80322D34-80322D3C 31D674 0008+00 3/0 0/0 0/0 .text setTexGenNum__21J3DTexGenBlockPatchedFUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J3DTexGenBlockPatched::setTexGenNum(u32 param_0) { - nofralloc -#include "asm/JSystem/J3DGraphBase/J3DMatBlock/setTexGenNum__21J3DTexGenBlockPatchedFUl.s" +/* 80322D34-80322D3C -00001 0008+00 0/0 0/0 0/0 .text setTexGenNum__21J3DTexGenBlockPatchedFUl */ +void J3DTexGenBlockPatched::setTexGenNum(u32 param_0) { + *(u32*)(((u8*)this) + 4) /* this->field_0x4 */ = (u32)(param_0); } -#pragma pop /* 80322D3C-80322D48 31D67C 000C+00 3/0 0/0 0/0 .text setTexGenNum__21J3DTexGenBlockPatchedFPCUl */ @@ -5800,16 +5734,11 @@ asm void J3DTexGenBlockPatched::getTexMtxOffset() const { } #pragma pop -/* 80322DA0-80322DA8 31D6E0 0008+00 3/0 0/0 0/0 .text setTexMtxOffset__21J3DTexGenBlockPatchedFUl +/* 80322DA0-80322DA8 -00001 0008+00 0/0 0/0 0/0 .text setTexMtxOffset__21J3DTexGenBlockPatchedFUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J3DTexGenBlockPatched::setTexMtxOffset(u32 param_0) { - nofralloc -#include "asm/JSystem/J3DGraphBase/J3DMatBlock/setTexMtxOffset__21J3DTexGenBlockPatchedFUl.s" +void J3DTexGenBlockPatched::setTexMtxOffset(u32 param_0) { + *(u32*)(((u8*)this) + 88) /* this->field_0x58 */ = (u32)(param_0); } -#pragma pop /* 80322DA8-80322DB4 31D6E8 000C+00 1/0 0/0 0/0 .text getType__15J3DTexGenBlock4Fv */ #pragma push @@ -5965,16 +5894,11 @@ asm void J3DColorBlockLightOn::setColorChanNum(u8 const* param_0) { } #pragma pop -/* 80322F70-80322F78 31D8B0 0008+00 1/0 0/0 0/0 .text setColorChanNum__20J3DColorBlockLightOnFUc +/* 80322F70-80322F78 -00001 0008+00 0/0 0/0 0/0 .text setColorChanNum__20J3DColorBlockLightOnFUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J3DColorBlockLightOn::setColorChanNum(u8 param_0) { - nofralloc -#include "asm/JSystem/J3DGraphBase/J3DMatBlock/setColorChanNum__20J3DColorBlockLightOnFUc.s" +void J3DColorBlockLightOn::setColorChanNum(u8 param_0) { + *(u8*)(((u8*)this) + 20) /* this->field_0x14 */ = (u8)(param_0); } -#pragma pop /* 80322F78-80322F80 31D8B8 0008+00 1/0 0/0 0/0 .text getColorChanNum__20J3DColorBlockLightOnCFv */ @@ -6041,15 +5965,10 @@ asm void J3DColorBlockLightOn::getLight(u32 param_0) { } #pragma pop -/* 80322FDC-80322FE4 31D91C 0008+00 1/0 0/0 0/0 .text setCullMode__20J3DColorBlockLightOnFUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J3DColorBlockLightOn::setCullMode(u8 param_0) { - nofralloc -#include "asm/JSystem/J3DGraphBase/J3DMatBlock/setCullMode__20J3DColorBlockLightOnFUc.s" +/* 80322FDC-80322FE4 -00001 0008+00 0/0 0/0 0/0 .text setCullMode__20J3DColorBlockLightOnFUc */ +void J3DColorBlockLightOn::setCullMode(u8 param_0) { + *(u8*)(((u8*)this) + 64) /* this->field_0x40 */ = (u8)(param_0); } -#pragma pop /* 80322FE4-80322FF0 31D924 000C+00 1/0 0/0 0/0 .text setCullMode__20J3DColorBlockLightOnFPCUc */ #pragma push @@ -6093,27 +6012,17 @@ asm void J3DColorBlockLightOn::getColorChanOffset() const { } #pragma pop -/* 80323008-80323010 31D948 0008+00 1/0 0/0 0/0 .text setMatColorOffset__20J3DColorBlockLightOnFUl +/* 80323008-80323010 -00001 0008+00 0/0 0/0 0/0 .text setMatColorOffset__20J3DColorBlockLightOnFUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J3DColorBlockLightOn::setMatColorOffset(u32 param_0) { - nofralloc -#include "asm/JSystem/J3DGraphBase/J3DMatBlock/setMatColorOffset__20J3DColorBlockLightOnFUl.s" +void J3DColorBlockLightOn::setMatColorOffset(u32 param_0) { + *(u32*)(((u8*)this) + 68) /* this->field_0x44 */ = (u32)(param_0); } -#pragma pop -/* 80323010-80323018 31D950 0008+00 1/0 0/0 0/0 .text +/* 80323010-80323018 -00001 0008+00 0/0 0/0 0/0 .text * setColorChanOffset__20J3DColorBlockLightOnFUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J3DColorBlockLightOn::setColorChanOffset(u32 param_0) { - nofralloc -#include "asm/JSystem/J3DGraphBase/J3DMatBlock/setColorChanOffset__20J3DColorBlockLightOnFUl.s" +void J3DColorBlockLightOn::setColorChanOffset(u32 param_0) { + *(u32*)(((u8*)this) + 72) /* this->field_0x48 */ = (u32)(param_0); } -#pragma pop /* 80323018-80323074 31D958 005C+00 1/0 0/0 0/0 .text __dt__20J3DColorBlockLightOnFv */ #pragma push @@ -6264,16 +6173,11 @@ asm void J3DColorBlockLightOff::setColorChanNum(u8 const* param_0) { } #pragma pop -/* 803231D0-803231D8 31DB10 0008+00 2/0 0/0 0/0 .text setColorChanNum__21J3DColorBlockLightOffFUc +/* 803231D0-803231D8 -00001 0008+00 0/0 0/0 0/0 .text setColorChanNum__21J3DColorBlockLightOffFUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J3DColorBlockLightOff::setColorChanNum(u8 param_0) { - nofralloc -#include "asm/JSystem/J3DGraphBase/J3DMatBlock/setColorChanNum__21J3DColorBlockLightOffFUc.s" +void J3DColorBlockLightOff::setColorChanNum(u8 param_0) { + *(u8*)(((u8*)this) + 12) /* this->field_0xc */ = (u8)(param_0); } -#pragma pop /* 803231D8-803231E0 31DB18 0008+00 2/0 0/0 0/0 .text getColorChanNum__21J3DColorBlockLightOffCFv */ @@ -6318,15 +6222,10 @@ asm void J3DColorBlockLightOff::getColorChan(u32 param_0) { } #pragma pop -/* 8032321C-80323224 31DB5C 0008+00 2/0 0/0 0/0 .text setCullMode__21J3DColorBlockLightOffFUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J3DColorBlockLightOff::setCullMode(u8 param_0) { - nofralloc -#include "asm/JSystem/J3DGraphBase/J3DMatBlock/setCullMode__21J3DColorBlockLightOffFUc.s" +/* 8032321C-80323224 -00001 0008+00 0/0 0/0 0/0 .text setCullMode__21J3DColorBlockLightOffFUc */ +void J3DColorBlockLightOff::setCullMode(u8 param_0) { + *(u8*)(((u8*)this) + 22) /* this->field_0x16 */ = (u8)(param_0); } -#pragma pop /* 80323224-80323230 31DB64 000C+00 2/0 0/0 0/0 .text setCullMode__21J3DColorBlockLightOffFPCUc */ #pragma push @@ -6370,27 +6269,17 @@ asm void J3DColorBlockLightOff::getColorChanOffset() const { } #pragma pop -/* 80323248-80323250 31DB88 0008+00 2/0 0/0 0/0 .text +/* 80323248-80323250 -00001 0008+00 0/0 0/0 0/0 .text * setMatColorOffset__21J3DColorBlockLightOffFUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J3DColorBlockLightOff::setMatColorOffset(u32 param_0) { - nofralloc -#include "asm/JSystem/J3DGraphBase/J3DMatBlock/setMatColorOffset__21J3DColorBlockLightOffFUl.s" +void J3DColorBlockLightOff::setMatColorOffset(u32 param_0) { + *(u32*)(((u8*)this) + 24) /* this->field_0x18 */ = (u32)(param_0); } -#pragma pop -/* 80323250-80323258 31DB90 0008+00 2/0 0/0 0/0 .text +/* 80323250-80323258 -00001 0008+00 0/0 0/0 0/0 .text * setColorChanOffset__21J3DColorBlockLightOffFUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J3DColorBlockLightOff::setColorChanOffset(u32 param_0) { - nofralloc -#include "asm/JSystem/J3DGraphBase/J3DMatBlock/setColorChanOffset__21J3DColorBlockLightOffFUl.s" +void J3DColorBlockLightOff::setColorChanOffset(u32 param_0) { + *(u32*)(((u8*)this) + 28) /* this->field_0x1c */ = (u32)(param_0); } -#pragma pop /* 80323258-80323264 31DB98 000C+00 1/0 0/0 0/0 .text getType__13J3DPEBlockXluFv */ #pragma push @@ -6462,15 +6351,10 @@ asm void J3DIndBlockFull::getType() { } #pragma pop -/* 8032339C-803233A4 31DCDC 0008+00 1/0 0/0 0/0 .text setIndTexStageNum__15J3DIndBlockFullFUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J3DIndBlockFull::setIndTexStageNum(u8 param_0) { - nofralloc -#include "asm/JSystem/J3DGraphBase/J3DMatBlock/setIndTexStageNum__15J3DIndBlockFullFUc.s" +/* 8032339C-803233A4 -00001 0008+00 0/0 0/0 0/0 .text setIndTexStageNum__15J3DIndBlockFullFUc */ +void J3DIndBlockFull::setIndTexStageNum(u8 param_0) { + *(u8*)(((u8*)this) + 4) /* this->field_0x4 */ = (u8)(param_0); } -#pragma pop /* 803233A4-803233AC 31DCE4 0008+00 1/0 0/0 0/0 .text getIndTexStageNum__15J3DIndBlockFullCFv */ #pragma push @@ -6656,14 +6540,7 @@ asm void __sinit_J3DMatBlock_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_8032356C = (void*)__sinit_J3DMatBlock_cpp; +REGISTER_CTORS(0x8032356C, __sinit_J3DMatBlock_cpp); #pragma pop -/* 803A1EA8-803A1EC8 02E508 001D+03 3/3 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_803A1EA8 = "Error : TexMtx[%d] is Null.\n"; -/* @stringBase0 padding */ -SECTION_DEAD static char const* const pad_803A1EC5 = "\0\0"; -#pragma pop +/* 803A1EA8-803A1EA8 02E508 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/libs/JSystem/J3DGraphBase/J3DMaterial.cpp b/libs/JSystem/J3DGraphBase/J3DMaterial.cpp index 12e49683152..2c5c12fdee0 100644 --- a/libs/JSystem/J3DGraphBase/J3DMaterial.cpp +++ b/libs/JSystem/J3DGraphBase/J3DMaterial.cpp @@ -30,12 +30,12 @@ struct J3DTexGenBlock4 { /* 80317674 */ void initialize(); }; +struct J3DNBTScale {}; + struct J3DTexCoord { /* 8000E464 */ J3DTexCoord(); }; -struct J3DNBTScale {}; - struct J3DTexGenBlock { /* 8000DFD8 */ bool getTexMtx(u32); /* 8000DFE0 */ bool getTexCoord(u32); @@ -107,11 +107,11 @@ struct J3DPEBlockFogOff { /* 80317B34 */ void initialize(); }; -struct J3DBlend {}; +struct J3DFog {}; struct J3DAlphaComp {}; -struct J3DFog {}; +struct J3DBlend {}; struct J3DPEBlock { /* 8000DBCC */ void patch(); @@ -542,7 +542,7 @@ extern "C" extern void* __vt__21J3DColorBlockLightOff[36 + 1 /* padding */]; extern "C" extern u8 j3dSys[284]; extern "C" extern u8 __GDCurrentDL[4]; extern "C" extern u32 j3dDefaultBlendInfo; -extern "C" extern u8 struct_804563F8[4]; +extern "C" extern u16 j3dDefaultAlphaCmpID; extern "C" extern u16 j3dDefaultZModeID[1 + 1 /* padding */]; // diff --git a/libs/JSystem/J3DGraphBase/J3DShape.cpp b/libs/JSystem/J3DGraphBase/J3DShape.cpp index 097cb3e09b6..080755d0deb 100644 --- a/libs/JSystem/J3DGraphBase/J3DShape.cpp +++ b/libs/JSystem/J3DGraphBase/J3DShape.cpp @@ -140,7 +140,7 @@ asm void J3DShape::initialize() { SECTION_RODATA static u8 const lit_697[16] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, }; -COMPILER_STRIP_GATE(803A1E98, &lit_697); +COMPILER_STRIP_GATE(0x803A1E98, &lit_697); /* 80314BB8-80314CBC 30F4F8 0104+00 0/0 1/1 0/0 .text addTexMtxIndexInDL__8J3DShapeF7_GXAttrUl */ #pragma push diff --git a/libs/JSystem/J3DGraphBase/J3DShapeMtx.cpp b/libs/JSystem/J3DGraphBase/J3DShapeMtx.cpp index 274e7df5864..47b8e79b023 100644 --- a/libs/JSystem/J3DGraphBase/J3DShapeMtx.cpp +++ b/libs/JSystem/J3DGraphBase/J3DShapeMtx.cpp @@ -938,5 +938,5 @@ asm void __sinit_J3DShapeMtx_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_803147EC = (void*)__sinit_J3DShapeMtx_cpp; +REGISTER_CTORS(0x803147EC, __sinit_J3DShapeMtx_cpp); #pragma pop diff --git a/libs/JSystem/J3DGraphBase/J3DSys.cpp b/libs/JSystem/J3DGraphBase/J3DSys.cpp index a3e31405141..ff49232f945 100644 --- a/libs/JSystem/J3DGraphBase/J3DSys.cpp +++ b/libs/JSystem/J3DGraphBase/J3DSys.cpp @@ -182,13 +182,13 @@ asm void J3DSys::loadNrmMtxIndx(int param_0, u16 param_1) const { SECTION_RODATA static u8 const lit_695[16] = { 0x00, 0x00, 0x80, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(803A1DF8, &lit_695); +COMPILER_STRIP_GATE(0x803A1DF8, &lit_695); /* 803A1E08-803A1E18 02E468 0010+00 1/1 0/0 0/0 .rodata @696 */ SECTION_RODATA static u8 const lit_696[16] = { 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(803A1E08, &lit_696); +COMPILER_STRIP_GATE(0x803A1E08, &lit_696); /* 8030FF0C-803100BC 30A84C 01B0+00 1/1 0/0 0/0 .text setTexCacheRegion__6J3DSysF15_GXTexCacheSize */ @@ -207,7 +207,7 @@ SECTION_RODATA static u8 const lit_737[24] = { 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(803A1E18, &lit_737); +COMPILER_STRIP_GATE(0x803A1E18, &lit_737); /* 803CD8A0-803CD8B0 02A9C0 0010+00 1/1 0/0 0/0 .data NullTexData */ SECTION_DATA static u8 NullTexData[16] = { @@ -361,7 +361,7 @@ asm void __sinit_J3DSys_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80310ED0 = (void*)__sinit_J3DSys_cpp; +REGISTER_CTORS(0x80310ED0, __sinit_J3DSys_cpp); #pragma pop /* ############################################################################################## */ diff --git a/libs/JSystem/J3DGraphBase/J3DTevs.cpp b/libs/JSystem/J3DGraphBase/J3DTevs.cpp index e8b74eebd8d..8326cfdbdc6 100644 --- a/libs/JSystem/J3DGraphBase/J3DTevs.cpp +++ b/libs/JSystem/J3DGraphBase/J3DTevs.cpp @@ -96,7 +96,8 @@ extern "C" extern u8 j3dDefaultTevSwapMode[4]; extern "C" extern u32 j3dDefaultTevSwapModeTable; extern "C" extern u32 j3dDefaultBlendInfo; extern "C" extern u8 j3dDefaultColorChanInfo[8]; -extern "C" extern u8 struct_804563F8[4]; +extern "C" extern u16 data_804563F8; +extern "C" extern u16 j3dDefaultAlphaCmpID; extern "C" extern u16 j3dDefaultZModeID[1 + 1 /* padding */]; // @@ -326,14 +327,14 @@ SECTION_RODATA extern u8 const j3dDefaultLightInfo[52] = { 0xFF, 0xFF, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(803A1EC8, &j3dDefaultLightInfo); +COMPILER_STRIP_GATE(0x803A1EC8, &j3dDefaultLightInfo); /* 803A1EFC-803A1F1C 02E55C 0020+00 0/0 5/5 0/0 .rodata j3dDefaultTexCoordInfo */ SECTION_RODATA extern u8 const j3dDefaultTexCoordInfo[32] = { 0x01, 0x04, 0x3C, 0x00, 0x01, 0x05, 0x3C, 0x00, 0x01, 0x06, 0x3C, 0x00, 0x01, 0x07, 0x3C, 0x00, 0x01, 0x08, 0x3C, 0x00, 0x01, 0x09, 0x3C, 0x00, 0x01, 0x0A, 0x3C, 0x00, 0x01, 0x0B, 0x3C, 0x00, }; -COMPILER_STRIP_GATE(803A1EFC, &j3dDefaultTexCoordInfo); +COMPILER_STRIP_GATE(0x803A1EFC, &j3dDefaultTexCoordInfo); /* 803A1F1C-803A1F80 02E57C 0064+00 0/0 1/1 0/0 .rodata j3dDefaultTexMtxInfo */ SECTION_RODATA extern u8 const j3dDefaultTexMtxInfo[100] = { @@ -345,27 +346,27 @@ SECTION_RODATA extern u8 const j3dDefaultTexMtxInfo[100] = { 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, }; -COMPILER_STRIP_GATE(803A1F1C, &j3dDefaultTexMtxInfo); +COMPILER_STRIP_GATE(0x803A1F1C, &j3dDefaultTexMtxInfo); /* 803A1F80-803A1F9C 02E5E0 001C+00 0/0 2/2 0/0 .rodata j3dDefaultIndTexMtxInfo */ SECTION_RODATA extern u8 const j3dDefaultIndTexMtxInfo[28] = { 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(803A1F80, &j3dDefaultIndTexMtxInfo); +COMPILER_STRIP_GATE(0x803A1F80, &j3dDefaultIndTexMtxInfo); /* 803A1F9C-803A1FB0 02E5FC 0014+00 0/0 1/1 0/0 .rodata j3dDefaultTevStageInfo */ SECTION_RODATA extern u8 const j3dDefaultTevStageInfo[20] = { 0x04, 0x0A, 0x0F, 0x0F, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x05, 0x07, 0x07, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, }; -COMPILER_STRIP_GATE(803A1F9C, &j3dDefaultTevStageInfo); +COMPILER_STRIP_GATE(0x803A1F9C, &j3dDefaultTevStageInfo); /* 803A1FB0-803A1FBC 02E610 000C+00 0/0 2/2 0/0 .rodata j3dDefaultIndTevStageInfo */ SECTION_RODATA extern u8 const j3dDefaultIndTevStageInfo[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(803A1FB0, &j3dDefaultIndTevStageInfo); +COMPILER_STRIP_GATE(0x803A1FB0, &j3dDefaultIndTevStageInfo); /* 803A1FBC-803A1FE8 02E61C 002C+00 0/0 3/3 0/0 .rodata j3dDefaultFogInfo */ SECTION_RODATA extern u8 const j3dDefaultFogInfo[44] = { @@ -373,13 +374,13 @@ SECTION_RODATA extern u8 const j3dDefaultFogInfo[44] = { 0xCD, 0x46, 0x1C, 0x40, 0x00, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(803A1FBC, &j3dDefaultFogInfo); +COMPILER_STRIP_GATE(0x803A1FBC, &j3dDefaultFogInfo); /* 803A1FE8-803A1FF8 02E648 0010+00 0/0 3/3 0/0 .rodata j3dDefaultNBTScaleInfo */ SECTION_RODATA extern u8 const j3dDefaultNBTScaleInfo[16] = { 0x00, 0x00, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, }; -COMPILER_STRIP_GATE(803A1FE8, &j3dDefaultNBTScaleInfo); +COMPILER_STRIP_GATE(0x803A1FE8, &j3dDefaultNBTScaleInfo); /* 803A1FF8-803A2008 02E658 000B+05 1/1 0/0 0/0 .rodata @1197 */ SECTION_RODATA static u8 const lit_1197[11 + 5 /* padding */] = { @@ -401,7 +402,7 @@ SECTION_RODATA static u8 const lit_1197[11 + 5 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(803A1FF8, &lit_1197); +COMPILER_STRIP_GATE(0x803A1FF8, &lit_1197); /* 80434C98-80436A60 0619B8 1DC7+01 1/1 0/0 0/0 .bss j3dTexCoordTable */ static u8 j3dTexCoordTable[7623 + 1 /* padding */]; @@ -553,16 +554,11 @@ SECTION_SDATA2 extern u8 j3dDefaultColorChanInfo[8] = { 0x00, 0x00, 0x00, 0x02, 0x02, 0x00, 0xFF, 0xFF, }; -/* 804563F8-804563FC -00001 0004+00 0/0 2/2 0/0 .sdata2 None */ -SECTION_SDATA2 extern u8 struct_804563F8[4]; -SECTION_SDATA2 u8 struct_804563F8[4] = { - /* 804563F8 0002+00 data_804563F8 None */ - 0x1B, - 0x00, - /* 804563FA 0002+00 data_804563FA j3dDefaultAlphaCmpID */ - 0x00, - 0xE7, -}; +/* 804563F8-804563FA 0049F8 0002+00 0/0 1/1 0/0 .sdata2 None */ +SECTION_SDATA2 extern u16 data_804563F8 = 0x1B00; + +/* 804563FA-804563FC 0049FA 0002+00 0/0 1/1 0/0 .sdata2 j3dDefaultAlphaCmpID */ +SECTION_SDATA2 extern u16 j3dDefaultAlphaCmpID = 0x00E7; /* 804563FC-80456400 0049FC 0002+02 0/0 3/3 0/0 .sdata2 j3dDefaultZModeID */ SECTION_SDATA2 extern u16 j3dDefaultZModeID[1 + 1 /* padding */] = { diff --git a/libs/JSystem/J3DGraphBase/J3DTransform.cpp b/libs/JSystem/J3DGraphBase/J3DTransform.cpp index 10e5bf574a6..d00a650ccfa 100644 --- a/libs/JSystem/J3DGraphBase/J3DTransform.cpp +++ b/libs/JSystem/J3DGraphBase/J3DTransform.cpp @@ -25,7 +25,7 @@ struct J3DTextureSRTInfo {}; // Forward References: // -extern "C" static void __MTGQR7__FUl(); +extern "C" void __MTGQR7__FUl(); extern "C" void J3DGQRSetup7__FUlUlUlUl(); extern "C" void J3DCalcBBoardMtx__FPA4_f(); extern "C" void J3DCalcYBBoardMtx__FPA4_f(); @@ -53,15 +53,14 @@ extern "C" u8 sincosTable___5JMath[65536]; // Declarations: // -/* 80311630-80311638 30BF70 0008+00 1/1 0/0 0/0 .text __MTGQR7__FUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void __MTGQR7(u32 param_0) { - nofralloc -#include "asm/JSystem/J3DGraphBase/J3DTransform/__MTGQR7__FUl.s" +/* 80311630-80311638 -00001 0008+00 0/0 0/0 0/0 .text __MTGQR7__FUl */ +asm void __MTGQR7(u32 param_0) { + // clang-format off + nofralloc + mtspr 0x397, r3 + blr + // clang-format on } -#pragma pop /* 80311638-80311670 30BF78 0038+00 0/0 2/2 0/0 .text J3DGQRSetup7__FUlUlUlUl */ #pragma push @@ -98,13 +97,13 @@ SECTION_RODATA extern u8 const j3dDefaultTransformInfo[32] = { 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(803A1E30, &j3dDefaultTransformInfo); +COMPILER_STRIP_GATE(0x803A1E30, &j3dDefaultTransformInfo); /* 803A1E50-803A1E5C 02E4B0 000C+00 0/0 1/1 0/0 .rodata j3dDefaultScale */ SECTION_RODATA extern u8 const j3dDefaultScale[12] = { 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, }; -COMPILER_STRIP_GATE(803A1E50, &j3dDefaultScale); +COMPILER_STRIP_GATE(0x803A1E50, &j3dDefaultScale); /* 803A1E5C-803A1E8C 02E4BC 0030+00 0/0 8/8 7/7 .rodata j3dDefaultMtx */ SECTION_RODATA extern u8 const j3dDefaultMtx[48] = { @@ -112,13 +111,13 @@ SECTION_RODATA extern u8 const j3dDefaultMtx[48] = { 0x00, 0x00, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(803A1E5C, &j3dDefaultMtx); +COMPILER_STRIP_GATE(0x803A1E5C, &j3dDefaultMtx); /* 803A1E8C-803A1E98 02E4EC 000C+00 1/1 0/0 0/0 .rodata @443 */ SECTION_RODATA static u8 const lit_443[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(803A1E8C, &lit_443); +COMPILER_STRIP_GATE(0x803A1E8C, &lit_443); /* 80311760-8031189C 30C0A0 013C+00 0/0 2/2 0/0 .text J3DCalcYBBoardMtx__FPA4_f */ #pragma push diff --git a/libs/JSystem/J3DGraphLoader/J3DAnmLoader.cpp b/libs/JSystem/J3DGraphLoader/J3DAnmLoader.cpp index 49fdf5df8ce..7f1cbb4bd0c 100644 --- a/libs/JSystem/J3DGraphLoader/J3DAnmLoader.cpp +++ b/libs/JSystem/J3DGraphLoader/J3DAnmLoader.cpp @@ -81,12 +81,12 @@ struct J3DAnmLoader { struct J3DAnmClusterKey {}; -struct J3DAnmColorKeyData {}; - struct J3DAnmColorKey { /* 8032AB00 */ J3DAnmColorKey(); }; +struct J3DAnmColorKeyData {}; + struct J3DAnmClusterKeyData {}; struct J3DAnmKeyLoader_v15 { @@ -108,16 +108,16 @@ struct J3DAnmKeyLoader_v15 { /* 80339634 */ void setAnmVtxColor(J3DAnmVtxColorKey*, J3DAnmVtxColorKeyData const*); }; +struct J3DAnmClusterFullData {}; + +struct J3DAnmClusterFull {}; + struct J3DAnmColorFull { /* 8032A93C */ J3DAnmColorFull(); }; -struct J3DAnmClusterFullData {}; - struct J3DAnmColorFullData {}; -struct J3DAnmClusterFull {}; - struct J3DAnmFullLoader_v15 { /* 80338468 */ J3DAnmFullLoader_v15(); /* 80338484 */ ~J3DAnmFullLoader_v15(); @@ -186,8 +186,8 @@ setAnmVtxColor__19J3DAnmKeyLoader_v15FP17J3DAnmVtxColorKeyPC21J3DAnmVtxColorKeyD extern "C" void __dt__20J3DAnmVisibilityFullFv(); extern "C" s32 getKind__20J3DAnmVisibilityFullCFv(); extern "C" void __dt__12J3DAnmLoaderFv(); -extern "C" void func_80339848(void const*, void const*); -extern "C" void func_80339860(void const*, void const*); +extern "C" void func_80339848(void* _this, void const*, void const*); +extern "C" void func_80339860(void* _this, void const*, void const*); extern "C" extern char const* const J3DAnmLoader__stringBase0; // @@ -198,21 +198,21 @@ extern "C" void OSReport(); extern "C" void* __nw__FUl(); extern "C" void __dl__FPv(); extern "C" void setResource__10JUTNameTabFPC7ResNTAB(); -extern "C" void func_802F4260(void const*, void const*); -extern "C" void func_802F42C0(void const*, void const*); -extern "C" void func_8030A458(void const*, void const*); -extern "C" void func_8030A470(void const*, void const*); -extern "C" void func_8030A488(void const*, void const*); -extern "C" void func_8030A4A0(void const*, void const*); -extern "C" void func_8030A4B8(void const*, void const*); -extern "C" void func_8030A4D0(void const*, void const*); -extern "C" void func_8030A4E8(void const*, void const*); -extern "C" void func_8030A500(void const*, void const*); -extern "C" void func_8030A518(void const*, void const*); -extern "C" void func_8030A530(void const*, void const*); -extern "C" void func_8030A548(void const*, void const*); -extern "C" void func_8030A560(void const*, void const*); -extern "C" void func_8030A578(void const*, void const*); +extern "C" void func_802F4260(void* _this, void const*, void const*); +extern "C" void func_802F42C0(void* _this, void const*, void const*); +extern "C" void func_8030A458(void* _this, void const*, void const*); +extern "C" void func_8030A470(void* _this, void const*, void const*); +extern "C" void func_8030A488(void* _this, void const*, void const*); +extern "C" void func_8030A4A0(void* _this, void const*, void const*); +extern "C" void func_8030A4B8(void* _this, void const*, void const*); +extern "C" void func_8030A4D0(void* _this, void const*, void const*); +extern "C" void func_8030A4E8(void* _this, void const*, void const*); +extern "C" void func_8030A500(void* _this, void const*, void const*); +extern "C" void func_8030A518(void* _this, void const*, void const*); +extern "C" void func_8030A530(void* _this, void const*, void const*); +extern "C" void func_8030A548(void* _this, void const*, void const*); +extern "C" void func_8030A560(void* _this, void const*, void const*); +extern "C" void func_8030A578(void* _this, void const*, void const*); extern "C" void __ct__15J3DAnmTransformFsPfPsPf(); extern "C" void __ct__19J3DAnmTextureSRTKeyFv(); extern "C" void __ct__18J3DAnmVtxColorFullFv(); @@ -240,6 +240,13 @@ extern "C" extern void* __vt__19J3DAnmTransformFull[5 + 1 /* padding */]; // /* ############################################################################################## */ +/* 803A2130-803A2130 02E790 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_803A2130 = + "J3DAnmLoader: this is not a J3D Binary.\n"; +#pragma pop + /* 803CF238-803CF24C 02C358 0014+00 2/2 0/0 0/0 .data __vt__19J3DAnmKeyLoader_v15 */ SECTION_DATA extern void* __vt__19J3DAnmKeyLoader_v15[5] = { (void*)NULL /* RTTI */, @@ -342,6 +349,15 @@ asm J3DAnmKeyLoader_v15::~J3DAnmKeyLoader_v15() { } #pragma pop +/* ############################################################################################## */ +/* 803A2130-803A2130 02E790 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_803A2159 = "Unknown data block\n"; +/* @stringBase0 padding */ +SECTION_DEAD static char const* const pad_803A216D = "\0\0"; +#pragma pop + /* 80338558-803386A0 332E98 0148+00 2/1 0/0 0/0 .text load__20J3DAnmFullLoader_v15FPCv */ #pragma push #pragma optimization_level 0 @@ -691,7 +707,7 @@ asm J3DAnmLoader::~J3DAnmLoader() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80339848(void const* param_0, void const* param_1) { +extern "C" asm void func_80339848(void* _this, void const* param_0, void const* param_1) { nofralloc #include "asm/JSystem/J3DGraphLoader/J3DAnmLoader/func_80339848.s" } @@ -702,19 +718,10 @@ extern "C" asm void func_80339848(void const* param_0, void const* param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80339860(void const* param_0, void const* param_1) { +extern "C" asm void func_80339860(void* _this, void const* param_0, void const* param_1) { nofralloc #include "asm/JSystem/J3DGraphLoader/J3DAnmLoader/func_80339860.s" } #pragma pop -/* 803A2130-803A2170 02E790 003D+03 6/6 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_803A2130 = - "J3DAnmLoader: this is not a J3D Binary.\n"; -SECTION_DEAD static char const* const stringBase_803A2159 = "Unknown data block\n"; -/* @stringBase0 padding */ -SECTION_DEAD static char const* const pad_803A216D = "\0\0"; -#pragma pop +/* 803A2130-803A2130 02E790 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/libs/JSystem/J3DGraphLoader/J3DClusterLoader.cpp b/libs/JSystem/J3DGraphLoader/J3DClusterLoader.cpp index 7efebd14097..b0d7bb9be2d 100644 --- a/libs/JSystem/J3DGraphLoader/J3DClusterLoader.cpp +++ b/libs/JSystem/J3DGraphLoader/J3DClusterLoader.cpp @@ -52,9 +52,9 @@ extern "C" void __dt__20J3DClusterLoader_v15Fv(); extern "C" void load__20J3DClusterLoader_v15FPCv(); extern "C" void readCluster__20J3DClusterLoader_v15FPC15J3DClusterBlock(); extern "C" void __dt__16J3DClusterLoaderFv(); -extern "C" void func_80334644(void const*, void const*); -extern "C" void func_8033465C(void const*, void const*); -extern "C" void func_80334674(void const*, void const*); +extern "C" void func_80334644(void* _this, void const*, void const*); +extern "C" void func_8033465C(void* _this, void const*, void const*); +extern "C" void func_80334674(void* _this, void const*, void const*); extern "C" extern char const* const J3DClusterLoader__stringBase0; // @@ -68,9 +68,9 @@ extern "C" void* __nwa__FUl(); extern "C" void* __nwa__FUli(); extern "C" void __dl__FPv(); extern "C" void __ct__10JUTNameTabFPC7ResNTAB(); -extern "C" void func_802F42C0(void const*, void const*); -extern "C" void func_8030A530(void const*, void const*); -extern "C" void func_8030A560(void const*, void const*); +extern "C" void func_802F42C0(void* _this, void const*, void const*); +extern "C" void func_8030A530(void* _this, void const*, void const*); +extern "C" void func_8030A560(void* _this, void const*, void const*); extern "C" void __ct__13J3DDeformDataFv(); extern "C" void __ct__11J3DDeformerFP13J3DDeformData(); extern "C" void DCStoreRange(); @@ -130,6 +130,15 @@ asm J3DClusterLoader_v15::~J3DClusterLoader_v15() { } #pragma pop +/* ############################################################################################## */ +/* 803A2098-803A2098 02E6F8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_803A2098 = "Unknown data block\n"; +/* @stringBase0 padding */ +SECTION_DEAD static char const* const pad_803A20AC = "\0\0\0"; +#pragma pop + /* 80334244-803342F8 32EB84 00B4+00 2/1 0/0 0/0 .text load__20J3DClusterLoader_v15FPCv */ #pragma push #pragma optimization_level 0 @@ -166,7 +175,7 @@ asm J3DClusterLoader::~J3DClusterLoader() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80334644(void const* param_0, void const* param_1) { +extern "C" asm void func_80334644(void* _this, void const* param_0, void const* param_1) { nofralloc #include "asm/JSystem/J3DGraphLoader/J3DClusterLoader/func_80334644.s" } @@ -177,7 +186,7 @@ extern "C" asm void func_80334644(void const* param_0, void const* param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_8033465C(void const* param_0, void const* param_1) { +extern "C" asm void func_8033465C(void* _this, void const* param_0, void const* param_1) { nofralloc #include "asm/JSystem/J3DGraphLoader/J3DClusterLoader/func_8033465C.s" } @@ -188,17 +197,10 @@ extern "C" asm void func_8033465C(void const* param_0, void const* param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80334674(void const* param_0, void const* param_1) { +extern "C" asm void func_80334674(void* _this, void const* param_0, void const* param_1) { nofralloc #include "asm/JSystem/J3DGraphLoader/J3DClusterLoader/func_80334674.s" } #pragma pop -/* 803A2098-803A20B0 02E6F8 0014+04 1/1 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_803A2098 = "Unknown data block\n"; -/* @stringBase0 padding */ -SECTION_DEAD static char const* const pad_803A20AC = "\0\0\0"; -#pragma pop +/* 803A2098-803A2098 02E6F8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/libs/JSystem/J3DGraphLoader/J3DJointFactory.cpp b/libs/JSystem/J3DGraphLoader/J3DJointFactory.cpp index c2dc851fde6..5960abff0d1 100644 --- a/libs/JSystem/J3DGraphLoader/J3DJointFactory.cpp +++ b/libs/JSystem/J3DGraphLoader/J3DJointFactory.cpp @@ -28,7 +28,7 @@ struct J3DJoint { extern "C" void __ct__15J3DJointFactoryFRC13J3DJointBlock(); extern "C" void create__15J3DJointFactoryFi(); -extern "C" void func_80337338(void const*, u32); +extern "C" void func_80337338(void* _this, void const*, u32); // // External References: @@ -36,7 +36,7 @@ extern "C" void func_80337338(void const*, u32); extern "C" void* __nw__FUl(); extern "C" void __ct__8J3DJointFv(); -extern "C" void func_8033677C(void const*, u32); +extern "C" void func_8033677C(void* _this, void const*, u32); // // Declarations: @@ -67,7 +67,7 @@ asm void J3DJointFactory::create(int param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80337338(void const* param_0, u32 param_1) { +extern "C" asm void func_80337338(void* _this, void const* param_0, u32 param_1) { nofralloc #include "asm/JSystem/J3DGraphLoader/J3DJointFactory/func_80337338.s" } diff --git a/libs/JSystem/J3DGraphLoader/J3DMaterialFactory.cpp b/libs/JSystem/J3DGraphLoader/J3DMaterialFactory.cpp index 03d69fd9d13..38a042e2395 100644 --- a/libs/JSystem/J3DGraphLoader/J3DMaterialFactory.cpp +++ b/libs/JSystem/J3DGraphLoader/J3DMaterialFactory.cpp @@ -37,12 +37,12 @@ struct J3DTexGenBlockNull { /* 80332AD0 */ ~J3DTexGenBlockNull(); }; +struct J3DNBTScale {}; + struct J3DTexCoord { /* 8000E464 */ J3DTexCoord(); }; -struct J3DNBTScale {}; - struct J3DTexGenBlock { /* 8000DFD8 */ bool getTexMtx(u32); /* 8000DFE0 */ bool getTexCoord(u32); @@ -79,14 +79,14 @@ struct J3DTevBlockPatched { /* 803176E0 */ void initialize(); }; -struct J3DIndTevStage { - /* 8000E14C */ J3DIndTevStage(); -}; - struct J3DGXColorS10 { /* 8000E460 */ J3DGXColorS10(); }; +struct J3DIndTevStage { + /* 8000E14C */ J3DIndTevStage(); +}; + struct J3DGXColor { /* 8000E538 */ J3DGXColor(); }; @@ -133,7 +133,6 @@ struct J3DTevBlock { /* 80321940 */ void diffTevStage(); /* 80321944 */ void diffTexCoordScale(); /* 80321948 */ void diffTexNo(); - /* 80321FE0 */ void setTexNoOffset(u32); /* 80322958 */ void setTevSwapModeInfo(u32, J3DTevSwapModeInfo); /* 8032295C */ void setTevSwapModeInfo(u32, J3DTevSwapModeInfo const*); /* 80322964 */ bool getTevRegOffset() const; @@ -162,11 +161,11 @@ struct J3DPEBlockNull { /* 803329B0 */ ~J3DPEBlockNull(); }; -struct J3DBlend {}; +struct J3DFog {}; struct J3DAlphaComp {}; -struct J3DFog {}; +struct J3DBlend {}; struct J3DPEBlock { /* 8000DBCC */ void patch(); @@ -197,10 +196,6 @@ struct J3DPEBlock { /* 80317394 */ void setFogOffset(u32); }; -struct J3DMaterialDLBlock {}; - -struct J3DMaterialBlock {}; - struct J3DMaterial { /* 803157A0 */ void createColorBlock(u32); /* 803159A0 */ void createTexGenBlock(u32); @@ -216,6 +211,10 @@ struct J3DMaterial { /* 80332B94 */ ~J3DMaterial(); }; +struct J3DMaterialBlock {}; + +struct J3DMaterialDLBlock {}; + struct J3DMaterialFactory { struct MaterialType {}; @@ -391,25 +390,25 @@ extern "C" void __dt__18J3DTexGenBlockNullFv(); extern "C" void getType__17J3DColorBlockNullFv(); extern "C" void __dt__17J3DColorBlockNullFv(); extern "C" void __dt__11J3DMaterialFv(); -extern "C" void func_80332BDC(void const*, void const*); -extern "C" void func_80332BF4(void const*, void const*); -extern "C" void func_80332C0C(void const*, void const*); -extern "C" void func_80332C24(void const*, void const*); -extern "C" void func_80332C3C(void const*, void const*); -extern "C" void func_80332C54(void const*, void const*); -extern "C" void func_80332C6C(void const*, void const*); -extern "C" void func_80332C84(void const*, void const*); -extern "C" void func_80332C9C(void const*, void const*); -extern "C" void func_80332CB4(void const*, void const*); -extern "C" void func_80332CCC(void const*, void const*); -extern "C" void func_80332CE4(void const*, void const*); -extern "C" void func_80332CFC(void const*, void const*); -extern "C" void func_80332D14(void const*, void const*); -extern "C" void func_80332D2C(void const*, void const*); -extern "C" void func_80332D44(void const*, void const*); -extern "C" void func_80332D5C(void const*, void const*); -extern "C" void func_80332D74(void const*, void const*); -extern "C" void func_80332D8C(void const*, void const*); +extern "C" void func_80332BDC(void* _this, void const*, void const*); +extern "C" void func_80332BF4(void* _this, void const*, void const*); +extern "C" void func_80332C0C(void* _this, void const*, void const*); +extern "C" void func_80332C24(void* _this, void const*, void const*); +extern "C" void func_80332C3C(void* _this, void const*, void const*); +extern "C" void func_80332C54(void* _this, void const*, void const*); +extern "C" void func_80332C6C(void* _this, void const*, void const*); +extern "C" void func_80332C84(void* _this, void const*, void const*); +extern "C" void func_80332C9C(void* _this, void const*, void const*); +extern "C" void func_80332CB4(void* _this, void const*, void const*); +extern "C" void func_80332CCC(void* _this, void const*, void const*); +extern "C" void func_80332CE4(void* _this, void const*, void const*); +extern "C" void func_80332CFC(void* _this, void const*, void const*); +extern "C" void func_80332D14(void* _this, void const*, void const*); +extern "C" void func_80332D2C(void* _this, void const*, void const*); +extern "C" void func_80332D44(void* _this, void const*, void const*); +extern "C" void func_80332D5C(void* _this, void const*, void const*); +extern "C" void func_80332D74(void* _this, void const*, void const*); +extern "C" void func_80332D8C(void* _this, void const*, void const*); // // External References: @@ -475,11 +474,11 @@ extern "C" void setLight__13J3DColorBlockFUlP11J3DLightObj(); extern "C" void setAmbColor__13J3DColorBlockFUlPC10J3DGXColor(); extern "C" void* __nw__FUl(); extern "C" void __dl__FPv(); -extern "C" void func_802F41E8(void const*, void const*); -extern "C" void func_802F4260(void const*, void const*); -extern "C" void func_802F4278(void const*, void const*); -extern "C" void func_802F4290(void const*, void const*); -extern "C" void func_802F42C0(void const*, void const*); +extern "C" void func_802F41E8(void* _this, void const*, void const*); +extern "C" void func_802F4260(void* _this, void const*, void const*); +extern "C" void func_802F4278(void* _this, void const*, void const*); +extern "C" void func_802F4290(void* _this, void const*, void const*); +extern "C" void func_802F42C0(void* _this, void const*, void const*); extern "C" void setSingleDisplayList__17J3DDisplayListObjFPvUl(); extern "C" void createColorBlock__11J3DMaterialFUl(); extern "C" void createTexGenBlock__11J3DMaterialFUl(); @@ -1412,7 +1411,7 @@ asm J3DMaterial::~J3DMaterial() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80332BDC(void const* param_0, void const* param_1) { +extern "C" asm void func_80332BDC(void* _this, void const* param_0, void const* param_1) { nofralloc #include "asm/JSystem/J3DGraphLoader/J3DMaterialFactory/func_80332BDC.s" } @@ -1423,7 +1422,7 @@ extern "C" asm void func_80332BDC(void const* param_0, void const* param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80332BF4(void const* param_0, void const* param_1) { +extern "C" asm void func_80332BF4(void* _this, void const* param_0, void const* param_1) { nofralloc #include "asm/JSystem/J3DGraphLoader/J3DMaterialFactory/func_80332BF4.s" } @@ -1434,7 +1433,7 @@ extern "C" asm void func_80332BF4(void const* param_0, void const* param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80332C0C(void const* param_0, void const* param_1) { +extern "C" asm void func_80332C0C(void* _this, void const* param_0, void const* param_1) { nofralloc #include "asm/JSystem/J3DGraphLoader/J3DMaterialFactory/func_80332C0C.s" } @@ -1445,7 +1444,7 @@ extern "C" asm void func_80332C0C(void const* param_0, void const* param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80332C24(void const* param_0, void const* param_1) { +extern "C" asm void func_80332C24(void* _this, void const* param_0, void const* param_1) { nofralloc #include "asm/JSystem/J3DGraphLoader/J3DMaterialFactory/func_80332C24.s" } @@ -1456,7 +1455,7 @@ extern "C" asm void func_80332C24(void const* param_0, void const* param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80332C3C(void const* param_0, void const* param_1) { +extern "C" asm void func_80332C3C(void* _this, void const* param_0, void const* param_1) { nofralloc #include "asm/JSystem/J3DGraphLoader/J3DMaterialFactory/func_80332C3C.s" } @@ -1467,7 +1466,7 @@ extern "C" asm void func_80332C3C(void const* param_0, void const* param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80332C54(void const* param_0, void const* param_1) { +extern "C" asm void func_80332C54(void* _this, void const* param_0, void const* param_1) { nofralloc #include "asm/JSystem/J3DGraphLoader/J3DMaterialFactory/func_80332C54.s" } @@ -1478,7 +1477,7 @@ extern "C" asm void func_80332C54(void const* param_0, void const* param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80332C6C(void const* param_0, void const* param_1) { +extern "C" asm void func_80332C6C(void* _this, void const* param_0, void const* param_1) { nofralloc #include "asm/JSystem/J3DGraphLoader/J3DMaterialFactory/func_80332C6C.s" } @@ -1489,7 +1488,7 @@ extern "C" asm void func_80332C6C(void const* param_0, void const* param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80332C84(void const* param_0, void const* param_1) { +extern "C" asm void func_80332C84(void* _this, void const* param_0, void const* param_1) { nofralloc #include "asm/JSystem/J3DGraphLoader/J3DMaterialFactory/func_80332C84.s" } @@ -1500,7 +1499,7 @@ extern "C" asm void func_80332C84(void const* param_0, void const* param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80332C9C(void const* param_0, void const* param_1) { +extern "C" asm void func_80332C9C(void* _this, void const* param_0, void const* param_1) { nofralloc #include "asm/JSystem/J3DGraphLoader/J3DMaterialFactory/func_80332C9C.s" } @@ -1511,7 +1510,7 @@ extern "C" asm void func_80332C9C(void const* param_0, void const* param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80332CB4(void const* param_0, void const* param_1) { +extern "C" asm void func_80332CB4(void* _this, void const* param_0, void const* param_1) { nofralloc #include "asm/JSystem/J3DGraphLoader/J3DMaterialFactory/func_80332CB4.s" } @@ -1522,7 +1521,7 @@ extern "C" asm void func_80332CB4(void const* param_0, void const* param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80332CCC(void const* param_0, void const* param_1) { +extern "C" asm void func_80332CCC(void* _this, void const* param_0, void const* param_1) { nofralloc #include "asm/JSystem/J3DGraphLoader/J3DMaterialFactory/func_80332CCC.s" } @@ -1533,7 +1532,7 @@ extern "C" asm void func_80332CCC(void const* param_0, void const* param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80332CE4(void const* param_0, void const* param_1) { +extern "C" asm void func_80332CE4(void* _this, void const* param_0, void const* param_1) { nofralloc #include "asm/JSystem/J3DGraphLoader/J3DMaterialFactory/func_80332CE4.s" } @@ -1544,7 +1543,7 @@ extern "C" asm void func_80332CE4(void const* param_0, void const* param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80332CFC(void const* param_0, void const* param_1) { +extern "C" asm void func_80332CFC(void* _this, void const* param_0, void const* param_1) { nofralloc #include "asm/JSystem/J3DGraphLoader/J3DMaterialFactory/func_80332CFC.s" } @@ -1555,7 +1554,7 @@ extern "C" asm void func_80332CFC(void const* param_0, void const* param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80332D14(void const* param_0, void const* param_1) { +extern "C" asm void func_80332D14(void* _this, void const* param_0, void const* param_1) { nofralloc #include "asm/JSystem/J3DGraphLoader/J3DMaterialFactory/func_80332D14.s" } @@ -1566,7 +1565,7 @@ extern "C" asm void func_80332D14(void const* param_0, void const* param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80332D2C(void const* param_0, void const* param_1) { +extern "C" asm void func_80332D2C(void* _this, void const* param_0, void const* param_1) { nofralloc #include "asm/JSystem/J3DGraphLoader/J3DMaterialFactory/func_80332D2C.s" } @@ -1577,7 +1576,7 @@ extern "C" asm void func_80332D2C(void const* param_0, void const* param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80332D44(void const* param_0, void const* param_1) { +extern "C" asm void func_80332D44(void* _this, void const* param_0, void const* param_1) { nofralloc #include "asm/JSystem/J3DGraphLoader/J3DMaterialFactory/func_80332D44.s" } @@ -1588,7 +1587,7 @@ extern "C" asm void func_80332D44(void const* param_0, void const* param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80332D5C(void const* param_0, void const* param_1) { +extern "C" asm void func_80332D5C(void* _this, void const* param_0, void const* param_1) { nofralloc #include "asm/JSystem/J3DGraphLoader/J3DMaterialFactory/func_80332D5C.s" } @@ -1599,7 +1598,7 @@ extern "C" asm void func_80332D5C(void const* param_0, void const* param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80332D74(void const* param_0, void const* param_1) { +extern "C" asm void func_80332D74(void* _this, void const* param_0, void const* param_1) { nofralloc #include "asm/JSystem/J3DGraphLoader/J3DMaterialFactory/func_80332D74.s" } @@ -1610,7 +1609,7 @@ extern "C" asm void func_80332D74(void const* param_0, void const* param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80332D8C(void const* param_0, void const* param_1) { +extern "C" asm void func_80332D8C(void* _this, void const* param_0, void const* param_1) { nofralloc #include "asm/JSystem/J3DGraphLoader/J3DMaterialFactory/func_80332D8C.s" } diff --git a/libs/JSystem/J3DGraphLoader/J3DMaterialFactory_v21.cpp b/libs/JSystem/J3DGraphLoader/J3DMaterialFactory_v21.cpp index 8eea17083a7..b94a6fcfa2a 100644 --- a/libs/JSystem/J3DGraphLoader/J3DMaterialFactory_v21.cpp +++ b/libs/JSystem/J3DGraphLoader/J3DMaterialFactory_v21.cpp @@ -96,7 +96,7 @@ extern "C" void newZMode__22J3DMaterialFactory_v21CFi(); extern "C" void newZCompLoc__22J3DMaterialFactory_v21CFi(); extern "C" void newDither__22J3DMaterialFactory_v21CFi(); extern "C" void newNBTScale__22J3DMaterialFactory_v21CFi(); -extern "C" void func_80334118(void const*, void const*); +extern "C" void func_80334118(void* _this, void const*, void const*); // // External References: @@ -105,11 +105,11 @@ extern "C" void func_80334118(void const*, void const*); extern "C" void __ct__11J3DTevStageFv(); extern "C" void __ct__11J3DTevStageFRC15J3DTevStageInfo(); extern "C" void* __nw__FUl(); -extern "C" void func_802F41E8(void const*, void const*); -extern "C" void func_802F4260(void const*, void const*); -extern "C" void func_802F4278(void const*, void const*); -extern "C" void func_802F4290(void const*, void const*); -extern "C" void func_802F42C0(void const*, void const*); +extern "C" void func_802F41E8(void* _this, void const*, void const*); +extern "C" void func_802F4260(void* _this, void const*, void const*); +extern "C" void func_802F4278(void* _this, void const*, void const*); +extern "C" void func_802F4290(void* _this, void const*, void const*); +extern "C" void func_802F42C0(void* _this, void const*, void const*); extern "C" void createColorBlock__11J3DMaterialFUl(); extern "C" void createTexGenBlock__11J3DMaterialFUl(); extern "C" void createTevBlock__11J3DMaterialFi(); @@ -118,19 +118,19 @@ extern "C" void createPEBlock__11J3DMaterialFUlUl(); extern "C" void initialize__11J3DMaterialFv(); extern "C" void __as__13J3DTexMtxInfoFRC13J3DTexMtxInfo(); extern "C" void __as__10J3DFogInfoFRC10J3DFogInfo(); -extern "C" void func_80332C24(void const*, void const*); -extern "C" void func_80332C3C(void const*, void const*); -extern "C" void func_80332C54(void const*, void const*); -extern "C" void func_80332C6C(void const*, void const*); -extern "C" void func_80332C84(void const*, void const*); -extern "C" void func_80332C9C(void const*, void const*); -extern "C" void func_80332CB4(void const*, void const*); -extern "C" void func_80332CCC(void const*, void const*); -extern "C" void func_80332CE4(void const*, void const*); -extern "C" void func_80332CFC(void const*, void const*); -extern "C" void func_80332D14(void const*, void const*); -extern "C" void func_80332D2C(void const*, void const*); -extern "C" void func_80332D5C(void const*, void const*); +extern "C" void func_80332C24(void* _this, void const*, void const*); +extern "C" void func_80332C3C(void* _this, void const*, void const*); +extern "C" void func_80332C54(void* _this, void const*, void const*); +extern "C" void func_80332C6C(void* _this, void const*, void const*); +extern "C" void func_80332C84(void* _this, void const*, void const*); +extern "C" void func_80332C9C(void* _this, void const*, void const*); +extern "C" void func_80332CB4(void* _this, void const*, void const*); +extern "C" void func_80332CCC(void* _this, void const*, void const*); +extern "C" void func_80332CE4(void* _this, void const*, void const*); +extern "C" void func_80332CFC(void* _this, void const*, void const*); +extern "C" void func_80332D14(void* _this, void const*, void const*); +extern "C" void func_80332D2C(void* _this, void const*, void const*); +extern "C" void func_80332D5C(void* _this, void const*, void const*); extern "C" void _savegpr_19(); extern "C" void _savegpr_29(); extern "C" void _restgpr_19(); @@ -438,7 +438,7 @@ asm void J3DMaterialFactory_v21::newNBTScale(int param_0) const { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80334118(void const* param_0, void const* param_1) { +extern "C" asm void func_80334118(void* _this, void const* param_0, void const* param_1) { nofralloc #include "asm/JSystem/J3DGraphLoader/J3DMaterialFactory_v21/func_80334118.s" } diff --git a/libs/JSystem/J3DGraphLoader/J3DModelLoader.cpp b/libs/JSystem/J3DGraphLoader/J3DModelLoader.cpp index a225195168a..91937fdd9f0 100644 --- a/libs/JSystem/J3DGraphLoader/J3DModelLoader.cpp +++ b/libs/JSystem/J3DGraphLoader/J3DModelLoader.cpp @@ -67,16 +67,16 @@ template struct J3DMtxCalcNoAnm {}; /* J3DMtxCalcNoAnm */ struct J3DMtxCalcNoAnm__template1 { - /* 803364B8 */ void func_803364B8(); - /* 80336524 */ void func_80336524(Vec const&, f32 const (&)[3][4]); - /* 8033656C */ void func_8033656C(); + /* 803364B8 */ void func_803364B8(void* _this); + /* 80336524 */ void func_80336524(void* _this, Vec const&, f32 const (&)[3][4]); + /* 8033656C */ void func_8033656C(void* _this); }; /* J3DMtxCalcNoAnm */ struct J3DMtxCalcNoAnm__template2 { - /* 80336594 */ void func_80336594(); - /* 80336600 */ void func_80336600(Vec const&, f32 const (&)[3][4]); - /* 80336628 */ void func_80336628(); + /* 80336594 */ void func_80336594(void* _this); + /* 80336600 */ void func_80336600(void* _this, Vec const&, f32 const (&)[3][4]); + /* 80336628 */ void func_80336628(void* _this); }; struct J3DMtxCalcJ3DSysInitBasic { @@ -126,16 +126,16 @@ struct J3DModelLoaderDataBase { /* 803346BC */ void load(void const*, u32); }; +struct J3DDrawBlock {}; + struct J3DMaterialDLBlock {}; +struct J3DJointBlock {}; + struct J3DEnvelopeBlock {}; struct J3DModelInfoBlock {}; -struct J3DJointBlock {}; - -struct J3DDrawBlock {}; - struct J3DModelLoader { /* 8033468C */ J3DModelLoader(); /* 803347E0 */ void load(void const*, u32); @@ -249,21 +249,21 @@ extern "C" void readMaterialTable_v21__14J3DModelLoaderFPC20J3DMaterialBlock_v21 extern "C" void readMaterialTable__14J3DModelLoaderFPC16J3DMaterialBlockUl(); extern "C" bool calcSizeMaterial__14J3DModelLoaderFPC16J3DMaterialBlockUl(); extern "C" bool calcSizeMaterialTable__14J3DModelLoaderFPC16J3DMaterialBlockUl(); -extern "C" void func_803364B8(); -extern "C" void func_80336524(Vec const&, f32 const (&)[3][4]); -extern "C" void func_8033656C(); -extern "C" void func_80336594(); -extern "C" void func_80336600(Vec const&, f32 const (&)[3][4]); -extern "C" void func_80336628(); +extern "C" void func_803364B8(void* _this); +extern "C" void func_80336524(void* _this, Vec const&, f32 const (&)[3][4]); +extern "C" void func_8033656C(void* _this); +extern "C" void func_80336594(void* _this); +extern "C" void func_80336600(void* _this, Vec const&, f32 const (&)[3][4]); +extern "C" void func_80336628(void* _this); extern "C" void __ct__11J3DMaterialFv(); extern "C" void __dt__10J3DTextureFv(); -extern "C" void func_803366EC(void const*, void const*); -extern "C" void func_80336704(void const*, void const*); -extern "C" void func_8033671C(void const*, void const*); -extern "C" void func_80336734(void const*, void const*); -extern "C" void func_8033674C(void const*, void const*); -extern "C" void func_80336764(void const*, u32); -extern "C" void func_8033677C(void const*, u32); +extern "C" void func_803366EC(void* _this, void const*, void const*); +extern "C" void func_80336704(void* _this, void const*, void const*); +extern "C" void func_8033671C(void* _this, void const*, void const*); +extern "C" void func_80336734(void* _this, void const*, void const*); +extern "C" void func_8033674C(void* _this, void const*, void const*); +extern "C" void func_80336764(void* _this, void const*, u32); +extern "C" void func_8033677C(void* _this, void const*, u32); extern "C" extern char const* const J3DModelLoader__stringBase0; // @@ -283,10 +283,10 @@ extern "C" void* __nwa__FUl(); extern "C" void* __nwa__FUli(); extern "C" void __dl__FPv(); extern "C" void __ct__10JUTNameTabFPC7ResNTAB(); -extern "C" void func_802F4260(void const*, void const*); -extern "C" void func_802F42C0(void const*, void const*); -extern "C" void func_8030A530(void const*, void const*); -extern "C" void func_8030A560(void const*, void const*); +extern "C" void func_802F4260(void* _this, void const*, void const*); +extern "C" void func_802F42C0(void* _this, void const*, void const*); +extern "C" void func_8030A530(void* _this, void const*, void const*); +extern "C" void func_8030A560(void* _this, void const*, void const*); extern "C" void initialize__11J3DMaterialFv(); extern "C" void initShapeNodes__13J3DShapeTableFP14J3DDrawMtxDataP13J3DVertexData(); extern "C" void sortVcdVatCmd__13J3DShapeTableFv(); @@ -470,6 +470,13 @@ asm void J3DModelLoaderDataBase::load(void const* param_0, u32 param_1) { } #pragma pop +/* ############################################################################################## */ +/* 803A20B0-803A20B0 02E710 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_803A20B0 = "Unknown data block\n"; +#pragma pop + /* 803347E0-80334ABC 32F120 02DC+00 4/1 0/0 0/0 .text load__14J3DModelLoaderFPCvUl */ #pragma push #pragma optimization_level 0 @@ -501,6 +508,13 @@ asm void J3DModelLoader::loadBinaryDisplayList(void const* param_0, u32 param_1) } #pragma pop +/* ############################################################################################## */ +/* 803A20B0-803A20B0 02E710 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_803A20C4 = "WRONG SHAPE MATRIX TYPE (__FILE__)\n"; +#pragma pop + /* 80334EE0-80335048 32F820 0168+00 3/0 0/0 0/0 .text setupBBoardInfo__14J3DModelLoaderFv */ #pragma push @@ -759,7 +773,7 @@ bool J3DModelLoader::calcSizeMaterialTable(J3DMaterialBlock const* param_0, u32 #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_803364B8() { +extern "C" asm void func_803364B8(void* _this) { nofralloc #include "asm/JSystem/J3DGraphLoader/J3DModelLoader/func_803364B8.s" } @@ -771,7 +785,7 @@ extern "C" asm void func_803364B8() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80336524(Vec const& param_0, f32 const (¶m_1)[3][4]) { +extern "C" asm void func_80336524(void* _this, Vec const& param_0, f32 const (¶m_1)[3][4]) { nofralloc #include "asm/JSystem/J3DGraphLoader/J3DModelLoader/func_80336524.s" } @@ -782,7 +796,7 @@ extern "C" asm void func_80336524(Vec const& param_0, f32 const (¶m_1)[3][4] #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_8033656C() { +extern "C" asm void func_8033656C(void* _this) { nofralloc #include "asm/JSystem/J3DGraphLoader/J3DModelLoader/func_8033656C.s" } @@ -793,7 +807,7 @@ extern "C" asm void func_8033656C() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80336594() { +extern "C" asm void func_80336594(void* _this) { nofralloc #include "asm/JSystem/J3DGraphLoader/J3DModelLoader/func_80336594.s" } @@ -805,7 +819,7 @@ extern "C" asm void func_80336594() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80336600(Vec const& param_0, f32 const (¶m_1)[3][4]) { +extern "C" asm void func_80336600(void* _this, Vec const& param_0, f32 const (¶m_1)[3][4]) { nofralloc #include "asm/JSystem/J3DGraphLoader/J3DModelLoader/func_80336600.s" } @@ -816,7 +830,7 @@ extern "C" asm void func_80336600(Vec const& param_0, f32 const (¶m_1)[3][4] #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80336628() { +extern "C" asm void func_80336628(void* _this) { nofralloc #include "asm/JSystem/J3DGraphLoader/J3DModelLoader/func_80336628.s" } @@ -846,7 +860,7 @@ asm J3DTexture::~J3DTexture() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_803366EC(void const* param_0, void const* param_1) { +extern "C" asm void func_803366EC(void* _this, void const* param_0, void const* param_1) { nofralloc #include "asm/JSystem/J3DGraphLoader/J3DModelLoader/func_803366EC.s" } @@ -856,7 +870,7 @@ extern "C" asm void func_803366EC(void const* param_0, void const* param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80336704(void const* param_0, void const* param_1) { +extern "C" asm void func_80336704(void* _this, void const* param_0, void const* param_1) { nofralloc #include "asm/JSystem/J3DGraphLoader/J3DModelLoader/func_80336704.s" } @@ -867,7 +881,7 @@ extern "C" asm void func_80336704(void const* param_0, void const* param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_8033671C(void const* param_0, void const* param_1) { +extern "C" asm void func_8033671C(void* _this, void const* param_0, void const* param_1) { nofralloc #include "asm/JSystem/J3DGraphLoader/J3DModelLoader/func_8033671C.s" } @@ -878,7 +892,7 @@ extern "C" asm void func_8033671C(void const* param_0, void const* param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80336734(void const* param_0, void const* param_1) { +extern "C" asm void func_80336734(void* _this, void const* param_0, void const* param_1) { nofralloc #include "asm/JSystem/J3DGraphLoader/J3DModelLoader/func_80336734.s" } @@ -889,7 +903,7 @@ extern "C" asm void func_80336734(void const* param_0, void const* param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_8033674C(void const* param_0, void const* param_1) { +extern "C" asm void func_8033674C(void* _this, void const* param_0, void const* param_1) { nofralloc #include "asm/JSystem/J3DGraphLoader/J3DModelLoader/func_8033674C.s" } @@ -900,7 +914,7 @@ extern "C" asm void func_8033674C(void const* param_0, void const* param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80336764(void const* param_0, u32 param_1) { +extern "C" asm void func_80336764(void* _this, void const* param_0, u32 param_1) { nofralloc #include "asm/JSystem/J3DGraphLoader/J3DModelLoader/func_80336764.s" } @@ -911,16 +925,10 @@ extern "C" asm void func_80336764(void const* param_0, u32 param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_8033677C(void const* param_0, u32 param_1) { +extern "C" asm void func_8033677C(void* _this, void const* param_0, u32 param_1) { nofralloc #include "asm/JSystem/J3DGraphLoader/J3DModelLoader/func_8033677C.s" } #pragma pop -/* 803A20B0-803A20E8 02E710 0038+00 4/4 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_803A20B0 = "Unknown data block\n"; -SECTION_DEAD static char const* const stringBase_803A20C4 = "WRONG SHAPE MATRIX TYPE (__FILE__)\n"; -#pragma pop +/* 803A20B0-803A20B0 02E710 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/libs/JSystem/J3DGraphLoader/J3DModelLoaderCalcSize.cpp b/libs/JSystem/J3DGraphLoader/J3DModelLoaderCalcSize.cpp index b835dfcc028..d7d99e6dd3b 100644 --- a/libs/JSystem/J3DGraphLoader/J3DModelLoaderCalcSize.cpp +++ b/libs/JSystem/J3DGraphLoader/J3DModelLoaderCalcSize.cpp @@ -28,16 +28,16 @@ struct J3DModelLoader_v26 { /* 80336F60 */ void calcSizeMaterialTable(J3DMaterialBlock const*, u32); }; +struct J3DDrawBlock {}; + struct J3DMaterialDLBlock {}; +struct J3DJointBlock {}; + struct J3DEnvelopeBlock {}; struct J3DModelInfoBlock {}; -struct J3DJointBlock {}; - -struct J3DDrawBlock {}; - struct J3DModelLoader { /* 80336794 */ void countMaterialNum(void const*); /* 803367D4 */ void calcLoadSize(void const*, u32); @@ -96,7 +96,7 @@ extern "C" void __ct__18J3DMaterialFactoryFRC18J3DMaterialDLBlock(); extern "C" void countUniqueMaterials__18J3DMaterialFactoryFv(); extern "C" void calcSize__18J3DMaterialFactoryCFP11J3DMaterialQ218J3DMaterialFactory12MaterialTypeiUl(); -extern "C" void func_8033674C(void const*, void const*); +extern "C" void func_8033674C(void* _this, void const*, void const*); extern "C" void __ct__15J3DShapeFactoryFRC13J3DShapeBlock(); extern "C" void calcSize__15J3DShapeFactoryFiUl(); extern "C" void calcSizeVcdVatCmdBuffer__15J3DShapeFactoryFUl(); @@ -123,6 +123,15 @@ asm void J3DModelLoader::countMaterialNum(void const* param_0) { } #pragma pop +/* ############################################################################################## */ +/* 803A20E8-803A20E8 02E748 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_803A20E8 = "Unknown data block\n"; +/* @stringBase0 padding */ +SECTION_DEAD static char const* const pad_803A20FC = "\0\0\0"; +#pragma pop + /* 803367D4-803369A0 331114 01CC+00 0/0 3/0 0/0 .text calcLoadSize__14J3DModelLoaderFPCvUl */ #pragma push #pragma optimization_level 0 @@ -276,11 +285,4 @@ asm void J3DModelLoader::calcSizeMaterialDL(J3DMaterialDLBlock const* param_0, u } #pragma pop -/* 803A20E8-803A2100 02E748 0014+04 3/3 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_803A20E8 = "Unknown data block\n"; -/* @stringBase0 padding */ -SECTION_DEAD static char const* const pad_803A20FC = "\0\0\0"; -#pragma pop +/* 803A20E8-803A20E8 02E748 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/libs/JSystem/J3DGraphLoader/J3DShapeFactory.cpp b/libs/JSystem/J3DGraphLoader/J3DShapeFactory.cpp index 7493367bfb1..1f872b32289 100644 --- a/libs/JSystem/J3DGraphLoader/J3DShapeFactory.cpp +++ b/libs/JSystem/J3DGraphLoader/J3DShapeFactory.cpp @@ -46,10 +46,10 @@ extern "C" void allocVcdVatCmdBuffer__15J3DShapeFactoryFUl(); extern "C" void calcSize__15J3DShapeFactoryFiUl(); extern "C" void calcSizeVcdVatCmdBuffer__15J3DShapeFactoryFUl(); extern "C" void calcSizeShapeMtx__15J3DShapeFactoryCFUlii(); -extern "C" void func_80337AE0(void const*, u32); -extern "C" void func_80337AF8(void const*, u32); -extern "C" void func_80337B10(void const*, u32); -extern "C" void func_80337B28(void const*, u32); +extern "C" void func_80337AE0(void* _this, void const*, u32); +extern "C" void func_80337AF8(void* _this, void const*, u32); +extern "C" void func_80337B10(void* _this, void const*, u32); +extern "C" void func_80337B28(void* _this, void const*, u32); extern "C" extern char const* const J3DShapeFactory__stringBase0; // @@ -62,8 +62,8 @@ extern "C" void* __nwa__FUl(); extern "C" void* __nwa__FUli(); extern "C" void __ct__12J3DShapeDrawFPCUcUl(); extern "C" void initialize__8J3DShapeFv(); -extern "C" void func_80336764(void const*, u32); -extern "C" void func_8033677C(void const*, u32); +extern "C" void func_80336764(void* _this, void const*, u32); +extern "C" void func_8033677C(void* _this, void const*, u32); extern "C" void _savegpr_26(); extern "C" void _savegpr_29(); extern "C" void _restgpr_26(); @@ -101,6 +101,16 @@ asm void J3DShapeFactory::create(int param_0, u32 param_1, _GXVtxDescList* param } #pragma pop +/* ############################################################################################## */ +/* 803A2100-803A2100 02E760 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_803A2100 = + "WRONG SHAPE MATRIX TYPE (J3DModelInit.cpp)\n"; +/* @stringBase0 padding */ +SECTION_DEAD static char const* const pad_803A212C = "\0\0\0"; +#pragma pop + /* 803375BC-8033784C 331EFC 0290+00 1/1 0/0 0/0 .text newShapeMtx__15J3DShapeFactoryCFUlii */ #pragma push #pragma optimization_level 0 @@ -169,7 +179,7 @@ asm void J3DShapeFactory::calcSizeShapeMtx(u32 param_0, int param_1, int param_2 #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80337AE0(void const* param_0, u32 param_1) { +extern "C" asm void func_80337AE0(void* _this, void const* param_0, u32 param_1) { nofralloc #include "asm/JSystem/J3DGraphLoader/J3DShapeFactory/func_80337AE0.s" } @@ -180,7 +190,7 @@ extern "C" asm void func_80337AE0(void const* param_0, u32 param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80337AF8(void const* param_0, u32 param_1) { +extern "C" asm void func_80337AF8(void* _this, void const* param_0, u32 param_1) { nofralloc #include "asm/JSystem/J3DGraphLoader/J3DShapeFactory/func_80337AF8.s" } @@ -191,7 +201,7 @@ extern "C" asm void func_80337AF8(void const* param_0, u32 param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80337B10(void const* param_0, u32 param_1) { +extern "C" asm void func_80337B10(void* _this, void const* param_0, u32 param_1) { nofralloc #include "asm/JSystem/J3DGraphLoader/J3DShapeFactory/func_80337B10.s" } @@ -202,18 +212,10 @@ extern "C" asm void func_80337B10(void const* param_0, u32 param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80337B28(void const* param_0, u32 param_1) { +extern "C" asm void func_80337B28(void* _this, void const* param_0, u32 param_1) { nofralloc #include "asm/JSystem/J3DGraphLoader/J3DShapeFactory/func_80337B28.s" } #pragma pop -/* 803A2100-803A2130 02E760 002C+04 2/2 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_803A2100 = - "WRONG SHAPE MATRIX TYPE (J3DModelInit.cpp)\n"; -/* @stringBase0 padding */ -SECTION_DEAD static char const* const pad_803A212C = "\0\0\0"; -#pragma pop +/* 803A2100-803A2100 02E760 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/libs/JSystem/J3DU/J3DUClipper.cpp b/libs/JSystem/J3DU/J3DUClipper.cpp index d30d2ef5d52..4ccdad38e92 100644 --- a/libs/JSystem/J3DU/J3DUClipper.cpp +++ b/libs/JSystem/J3DU/J3DUClipper.cpp @@ -67,7 +67,7 @@ asm void J3DUClipper::init() { SECTION_RODATA static u8 const lit_898[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8039A948, &lit_898); +COMPILER_STRIP_GATE(0x8039A948, &lit_898); /* 8039A954-8039A960 026FB4 000C+00 0/1 0/0 0/0 .rodata @899 */ #pragma push @@ -75,7 +75,7 @@ COMPILER_STRIP_GATE(8039A948, &lit_898); SECTION_RODATA static u8 const lit_899[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8039A954, &lit_899); +COMPILER_STRIP_GATE(0x8039A954, &lit_899); #pragma pop /* 8039A960-8039A96C 026FC0 000C+00 0/1 0/0 0/0 .rodata @900 */ @@ -84,7 +84,7 @@ COMPILER_STRIP_GATE(8039A954, &lit_899); SECTION_RODATA static u8 const lit_900[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8039A960, &lit_900); +COMPILER_STRIP_GATE(0x8039A960, &lit_900); #pragma pop /* 8039A96C-8039A978 026FCC 000C+00 0/1 0/0 0/0 .rodata @901 */ @@ -93,7 +93,7 @@ COMPILER_STRIP_GATE(8039A960, &lit_900); SECTION_RODATA static u8 const lit_901[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8039A96C, &lit_901); +COMPILER_STRIP_GATE(0x8039A96C, &lit_901); #pragma pop /* 8039A978-8039A984 026FD8 000C+00 0/1 0/0 0/0 .rodata @902 */ @@ -102,7 +102,7 @@ COMPILER_STRIP_GATE(8039A96C, &lit_901); SECTION_RODATA static u8 const lit_902[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8039A978, &lit_902); +COMPILER_STRIP_GATE(0x8039A978, &lit_902); #pragma pop /* 80455280-80455284 003880 0004+00 1/1 0/0 0/0 .sdata2 @913 */ @@ -149,14 +149,31 @@ asm void J3DUClipper::clip(f32 const (*param_0)[4], Vec* param_1, Vec* param_2) } #pragma pop -/* 8039A984-8039A9F0 026FE4 0065+07 0/0 0/0 0/0 .rodata @stringBase0 */ +/* ############################################################################################## */ +/* 8039A984-8039A99D 026FE4 0019+00 0/0 0/0 0/0 .rodata None */ #pragma push #pragma force_active on -#pragma section ".dead" SECTION_DEAD static char const* const stringBase_8039A984 = " J3DUClipper::mFovy = %f"; +#pragma pop + +/* 8039A99D-8039A9B8 026FFD 001B+00 0/0 0/0 0/0 .rodata None */ +#pragma push +#pragma force_active on SECTION_DEAD static char const* const stringBase_8039A99D = " J3DUClipper::mAspect = %f"; +#pragma pop + +/* 8039A9B8-8039A9D1 027018 0019+00 0/0 0/0 0/0 .rodata None */ +#pragma push +#pragma force_active on SECTION_DEAD static char const* const stringBase_8039A9B8 = " J3DUClipper::mNear = %f"; +#pragma pop + +/* 8039A9D1-8039A9F0 027031 0018+07 0/0 0/0 0/0 .rodata None */ +#pragma push +#pragma force_active on SECTION_DEAD static char const* const stringBase_8039A9D1 = " J3DUClipper::mFar = %f"; /* @stringBase0 padding */ SECTION_DEAD static char const* const pad_8039A9E9 = "\0\0\0\0\0\0"; #pragma pop + +/* 8039A984-8039A984 026FE4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/libs/JSystem/JAudio2/JAISeMgr.cpp b/libs/JSystem/JAudio2/JAISeMgr.cpp index 35fb33ed6e5..9cfda1d7dc6 100644 --- a/libs/JSystem/JAudio2/JAISeMgr.cpp +++ b/libs/JSystem/JAudio2/JAISeMgr.cpp @@ -40,7 +40,7 @@ template struct JASMemPool {}; /* JASMemPool */ struct JASMemPool__template0 { - /* 8029FC34 */ void func_8029FC34(); + /* 8029FC34 */ void func_8029FC34(void* _this); }; struct JASGenericMemPool { @@ -77,10 +77,10 @@ struct JAISeqDataRegion {}; struct JAISeqDataMgr {}; -struct JAIAudience {}; - struct JAISeCategoryArrangement {}; +struct JAIAudience {}; + struct JAISeMgr { /* 802A0074 */ JAISeMgr(bool); /* 802A0168 */ void isUsingSeqData(JAISeqDataRegion const&); @@ -131,7 +131,7 @@ extern "C" void isUsingSeqData__16JAISeCategoryMgrFRC16JAISeqDataRegion(); extern "C" void releaseSeqData__16JAISeCategoryMgrFRC16JAISeqDataRegion(); extern "C" void JAISeMgr_calc___16JAISeCategoryMgrFv(); extern "C" void JAISeMgr_freeDeadSe___16JAISeCategoryMgrFv(); -extern "C" void func_8029FC34(); +extern "C" void func_8029FC34(void* _this); extern "C" void JAISeMgr_acceptsNewSe___16JAISeCategoryMgrCFUl(); extern "C" void sortByPriority___16JAISeCategoryMgrFv(); extern "C" void stop__16JAISeCategoryMgrFUl(); @@ -260,7 +260,7 @@ asm void JAISeCategoryMgr::JAISeMgr_freeDeadSe_() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_8029FC34() { +extern "C" asm void func_8029FC34(void* _this) { nofralloc #include "asm/JSystem/JAudio2/JAISeMgr/func_8029FC34.s" } @@ -443,15 +443,10 @@ asm void JAISeMgr::initParams() { } #pragma pop -/* 802A03D8-802A03E0 29AD18 0008+00 0/0 1/1 0/0 .text setAudience__8JAISeMgrFP11JAIAudience */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void JAISeMgr::setAudience(JAIAudience* param_0) { - nofralloc -#include "asm/JSystem/JAudio2/JAISeMgr/setAudience__8JAISeMgrFP11JAIAudience.s" +/* 802A03D8-802A03E0 -00001 0008+00 0/0 0/0 0/0 .text setAudience__8JAISeMgrFP11JAIAudience */ +void JAISeMgr::setAudience(JAIAudience* param_0) { + *(u32*)(((u8*)this) + 8) /* this->field_0x8 */ = (u32)(param_0); } -#pragma pop /* 802A03E0-802A0434 29AD20 0054+00 0/0 1/1 0/0 .text setSeqDataMgr__8JAISeMgrFP13JAISeqDataMgr */ #pragma push @@ -503,6 +498,15 @@ asm void JAISeMgr::mixOut() { } #pragma pop +/* ############################################################################################## */ +/* 8039B8F8-8039B8F8 027F58 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8039B8F8 = "cannot new Se %08x."; +/* @stringBase0 padding */ +SECTION_DEAD static char const* const pad_8039B90C = "\0\0\0"; +#pragma pop + /* 802A0768-802A08D0 29B0A8 0168+00 0/0 1/1 0/0 .text * startSound__8JAISeMgrF10JAISoundIDP14JAISoundHandlePCQ29JGeometry8TVec3 */ #pragma push @@ -555,11 +559,4 @@ asm JAISeCategoryMgr::JAISeCategoryMgr() { } #pragma pop -/* 8039B8F8-8039B910 027F58 0014+04 1/1 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_8039B8F8 = "cannot new Se %08x."; -/* @stringBase0 padding */ -SECTION_DEAD static char const* const pad_8039B90C = "\0\0\0"; -#pragma pop +/* 8039B8F8-8039B8F8 027F58 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/libs/JSystem/JAudio2/JAISeq.cpp b/libs/JSystem/JAudio2/JAISeq.cpp index 5f43b88ceff..207358d2c79 100644 --- a/libs/JSystem/JAudio2/JAISeq.cpp +++ b/libs/JSystem/JAudio2/JAISeq.cpp @@ -42,14 +42,14 @@ template struct JASMemPool_MultiThreaded {}; /* JASMemPool_MultiThreaded */ struct JASMemPool_MultiThreaded__template0 { - /* 802932E0 */ void func_802932E0(); + /* 802932E0 */ void func_802932E0(void* _this); }; template struct JASMemPool {}; /* JASMemPool */ struct JASMemPool__template1 { - /* 802A1268 */ void func_802A1268(); + /* 802A1268 */ void func_802A1268(void* _this); }; struct JASGenericMemPool { @@ -130,7 +130,7 @@ extern "C" void prepare_getSeqData___6JAISeqFv(); extern "C" void prepare___6JAISeqFRC14JASSoundParams16JAISoundActivity(); extern "C" void JAISeqMgr_calc___6JAISeqFv(); extern "C" void die___6JAISeqFv(); -extern "C" void func_802A1268(); +extern "C" void func_802A1268(void* _this); extern "C" void JAISound_tryDie___6JAISeqFv(); extern "C" void mixOut___6JAISeqFRC14JASSoundParams16JAISoundActivity(); extern "C" void JAISeqMgr_mixOut___6JAISeqFRC14JASSoundParams16JAISoundActivity(); @@ -161,7 +161,7 @@ extern "C" void connectChild__8JASTrackFUlP8JASTrack(); extern "C" void mute__8JASTrackFb(); extern "C" void pause__8JASTrackFb(); extern "C" void setTempoRate__8JASTrackFf(); -extern "C" void func_802932E0(); +extern "C" void func_802932E0(void* _this); extern "C" void mixOutAll__14JAISoundParamsFRC14JASSoundParamsP14JASSoundParamsf(); extern "C" void __ct__8JAISoundFv(); extern "C" void func_802A2328(); @@ -368,7 +368,7 @@ asm void JAISeq::die_() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_802A1268() { +extern "C" asm void func_802A1268(void* _this) { nofralloc #include "asm/JSystem/JAudio2/JAISeq/func_802A1268.s" } diff --git a/libs/JSystem/JAudio2/JAISeqMgr.cpp b/libs/JSystem/JAudio2/JAISeqMgr.cpp index f01b30ce1f6..4e63cf6df11 100644 --- a/libs/JSystem/JAudio2/JAISeqMgr.cpp +++ b/libs/JSystem/JAudio2/JAISeqMgr.cpp @@ -39,7 +39,7 @@ template struct JASMemPool {}; /* JASMemPool */ struct JASMemPool__template2 { - /* 802A1AF4 */ void func_802A1AF4(); + /* 802A1AF4 */ void func_802A1AF4(void* _this); }; struct JASGenericMemPool { @@ -66,9 +66,9 @@ struct JAISound { /* 802A24DC */ void stop(u32); }; +struct JAISeqMgr; struct JAIAudience {}; -struct JAISeqMgr; struct JAISeq { /* 802A0A8C */ JAISeq(JAISeqMgr*, JAISoundStrategyMgr*); /* 802A0B64 */ void JAISeqMgr_startID_(JAISoundID, JGeometry::TVec3 const*, JAIAudience*, @@ -107,7 +107,7 @@ extern "C" void isUsingSeqData__9JAISeqMgrFRC16JAISeqDataRegion(); extern "C" void releaseSeqData__9JAISeqMgrFRC16JAISeqDataRegion(); extern "C" void __ct__9JAISeqMgrFb(); extern "C" void freeDeadSeq___9JAISeqMgrFv(); -extern "C" void func_802A1AF4(); +extern "C" void func_802A1AF4(void* _this); extern "C" void func_802A1B48(); extern "C" void calc__9JAISeqMgrFv(); extern "C" void stop__9JAISeqMgrFv(); @@ -241,7 +241,7 @@ asm void JAISeqMgr::freeDeadSeq_() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_802A1AF4() { +extern "C" asm void func_802A1AF4(void* _this) { nofralloc #include "asm/JSystem/JAudio2/JAISeqMgr/func_802A1AF4.s" } diff --git a/libs/JSystem/JAudio2/JAISound.cpp b/libs/JSystem/JAudio2/JAISound.cpp index e4d41a9ed9a..f73fa7ae474 100644 --- a/libs/JSystem/JAudio2/JAISound.cpp +++ b/libs/JSystem/JAudio2/JAISound.cpp @@ -289,6 +289,17 @@ asm void JAISound::die_JAISound_() { } #pragma pop +/* ############################################################################################## */ +/* 8039B910-8039B910 027F70 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8039B910 = + "It cost %d steps to prepare Sound(ID:%08x, Addre" + "ss%08x).\n"; +/* @stringBase0 padding */ +SECTION_DEAD static char const* const pad_8039B94A = "\0\0\0\0\0"; +#pragma pop + /* 802A266C-802A26B8 29CFAC 004C+00 0/0 3/3 0/0 .text increasePrepareCount_JAISound___8JAISoundFv */ #pragma push @@ -328,13 +339,4 @@ asm void JAISound::initTrack_JAISound_(JASTrack* param_0) { } #pragma pop -/* 8039B910-8039B950 027F70 003A+06 1/1 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_8039B910 = - "It cost %d steps to prepare Sound(ID:%08x, Addre" - "ss%08x).\n"; -/* @stringBase0 padding */ -SECTION_DEAD static char const* const pad_8039B94A = "\0\0\0\0\0"; -#pragma pop +/* 8039B910-8039B910 027F70 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/libs/JSystem/JAudio2/JAISoundStarter.cpp b/libs/JSystem/JAudio2/JAISoundStarter.cpp index 59ddaa1e4fe..aa110d6d20a 100644 --- a/libs/JSystem/JAudio2/JAISoundStarter.cpp +++ b/libs/JSystem/JAudio2/JAISoundStarter.cpp @@ -18,10 +18,10 @@ struct JGeometry { struct TVec3__template0 {}; }; -struct JAISoundHandle {}; - struct JAISoundID {}; +struct JAISoundHandle {}; + struct JAISoundStarter { /* 802A2F6C */ JAISoundStarter(bool); /* 802A2F88 */ ~JAISoundStarter(); diff --git a/libs/JSystem/JAudio2/JAIStream.cpp b/libs/JSystem/JAudio2/JAIStream.cpp index 1c8cdbcc9e7..9319b66b1dc 100644 --- a/libs/JSystem/JAudio2/JAIStream.cpp +++ b/libs/JSystem/JAudio2/JAIStream.cpp @@ -28,7 +28,7 @@ template struct JASMemPool {}; /* JASMemPool */ struct JASMemPool__template1 { - /* 802A1268 */ void func_802A1268(); + /* 802A1268 */ void func_802A1268(void* _this); }; struct JASGenericMemPool { @@ -49,16 +49,16 @@ struct JASAramStream { struct JAIStreamMgr {}; -struct JAIAudience {}; +struct JAISoundActivity {}; template struct JAISoundStrategyMgr {}; /* JAISoundStrategyMgr */ struct JAISoundStrategyMgr__template2 {}; -struct JAISoundID {}; +struct JAIAudience {}; -struct JAISoundActivity {}; +struct JAISoundID {}; struct JAIStream { /* 802A3104 */ JAIStream(JAIStreamMgr*, JAISoundStrategyMgr*); @@ -135,7 +135,7 @@ extern "C" void start__13JASAramStreamFv(); extern "C" void stop__13JASAramStreamFUs(); extern "C" void pause__13JASAramStreamFb(); extern "C" void cancel__13JASAramStreamFv(); -extern "C" void func_802A1268(); +extern "C" void func_802A1268(void* _this); extern "C" void mixOutAll__14JAISoundParamsFRC14JASSoundParamsP14JASSoundParamsf(); extern "C" void __ct__8JAISoundFv(); extern "C" void func_802A2328(); diff --git a/libs/JSystem/JAudio2/JAIStreamMgr.cpp b/libs/JSystem/JAudio2/JAIStreamMgr.cpp index 770ea3466ab..fd2aead70b1 100644 --- a/libs/JSystem/JAudio2/JAIStreamMgr.cpp +++ b/libs/JSystem/JAudio2/JAIStreamMgr.cpp @@ -34,7 +34,7 @@ template struct JASMemPool {}; /* JASMemPool */ struct JASMemPool__template3 { - /* 802A3E68 */ void func_802A3E68(); + /* 802A3E68 */ void func_802A3E68(void* _this); }; struct JASGenericMemPool { @@ -44,10 +44,10 @@ struct JASGenericMemPool { /* 80290994 */ void free(void*, u32); }; -struct JAISoundHandle {}; - struct JAISoundID {}; +struct JAISoundHandle {}; + struct JAIStreamMgr { /* 802A3B68 */ JAIStreamMgr(bool); /* 802A3C3C */ void startSound(JAISoundID, JAISoundHandle*, JGeometry::TVec3 const*); @@ -60,14 +60,14 @@ struct JAIStreamMgr { /* 802A4174 */ void newStream_(); }; -struct JAIAudience {}; +struct JAISoundActivity {}; template struct JAISoundStrategyMgr {}; /* JAISoundStrategyMgr */ struct JAISoundStrategyMgr__template2 {}; -struct JAISoundActivity {}; +struct JAIAudience {}; struct JAIStream { /* 802A3104 */ JAIStream(JAIStreamMgr*, JAISoundStrategyMgr*); @@ -90,7 +90,7 @@ struct JAISound { extern "C" void __ct__12JAIStreamMgrFb(); extern "C" void func_802A3C3C(); extern "C" void freeDeadStream___12JAIStreamMgrFv(); -extern "C" void func_802A3E68(); +extern "C" void func_802A3E68(void* _this); extern "C" void calc__12JAIStreamMgrFv(); extern "C" void stop__12JAIStreamMgrFv(); extern "C" void stop__12JAIStreamMgrFUl(); @@ -197,7 +197,7 @@ asm void JAIStreamMgr::freeDeadStream_() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_802A3E68() { +extern "C" asm void func_802A3E68(void* _this) { nofralloc #include "asm/JSystem/JAudio2/JAIStreamMgr/func_802A3E68.s" } diff --git a/libs/JSystem/JAudio2/JASAiCtrl.cpp b/libs/JSystem/JAudio2/JASAiCtrl.cpp index 6bd817948d5..9fcf28bebd2 100644 --- a/libs/JSystem/JAudio2/JASAiCtrl.cpp +++ b/libs/JSystem/JAudio2/JASAiCtrl.cpp @@ -48,14 +48,14 @@ struct JASDriver { /* 8029C900 */ void finishDSPFrame(); /* 8029C9DC */ void registerMixCallback(s16* (*)(s32), JASMixMode); /* 8029C9E8 */ void getDacRate(); - /* 8029C9F0 */ void getSubFrames(); + /* 8029C9F0 */ u32 getSubFrames(); /* 8029C9F8 */ void getDacSize(); /* 8029CA04 */ void getFrameSamples(); /* 8029CA10 */ void mixMonoTrack(s16*, u32, s16* (*)(s32)); /* 8029CAC0 */ void mixMonoTrackWide(s16*, u32, s16* (*)(s32)); /* 8029CB70 */ void mixExtraTrack(s16*, u32, s16* (*)(s32)); /* 8029CC50 */ void mixInterleaveTrack(s16*, u32, s16* (*)(s32)); - /* 8029CCD4 */ void getSubFrameCounter(); + /* 8029CCD4 */ u32 getSubFrameCounter(); /* 8029E2A8 */ void subframeCallback(); /* 8029E2D0 */ void DSPSyncCallback(); @@ -92,7 +92,7 @@ struct JASCalc { template void clamp(/* ... */); /* 8028F69C */ /* JASCalc::clamp */ - void func_8028F69C(s32); + void func_8028F69C(void* _this, s32); }; struct JASAudioThread { @@ -113,14 +113,14 @@ extern "C" void readDspBuffer__9JASDriverFPsUl(); extern "C" void finishDSPFrame__9JASDriverFv(); extern "C" void registerMixCallback__9JASDriverFPFl_Ps10JASMixMode(); extern "C" void getDacRate__9JASDriverFv(); -extern "C" void getSubFrames__9JASDriverFv(); +extern "C" u32 getSubFrames__9JASDriverFv(); extern "C" void getDacSize__9JASDriverFv(); extern "C" void getFrameSamples__9JASDriverFv(); extern "C" void mixMonoTrack__9JASDriverFPsUlPFl_Ps(); extern "C" void mixMonoTrackWide__9JASDriverFPsUlPFl_Ps(); extern "C" void mixExtraTrack__9JASDriverFPsUlPFl_Ps(); extern "C" void mixInterleaveTrack__9JASDriverFPsUlPFl_Ps(); -extern "C" void getSubFrameCounter__9JASDriverFv(); +extern "C" u32 getSubFrameCounter__9JASDriverFv(); extern "C" void* const sMixFuncs__9JASDriver[4]; extern "C" extern char const* const JASAiCtrl__stringBase0; extern "C" u8 sDmaDacBuffer__9JASDriver[12 + 4 /* padding */]; @@ -144,7 +144,7 @@ extern "C" u8 sSubFrameCounter__9JASDriver[4]; extern "C" void imixcopy__7JASCalcFPCsPCsPsUl(); extern "C" void bzero__7JASCalcFPvUl(); -extern "C" void func_8028F69C(s32); +extern "C" void func_8028F69C(void* _this, s32); extern "C" void start__8JASProbeFlPCc(); extern "C" void stop__8JASProbeFl(); extern "C" void JASReport__FPCce(); @@ -224,7 +224,7 @@ u8 JASDriver::sOutputRate[4]; #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void JASDriver::initAI(void (*)(void)) { +asm void JASDriver::initAI(void (*param_0)(void)) { nofralloc #include "asm/JSystem/JAudio2/JASAiCtrl/initAI__9JASDriverFPFv_v.s" } @@ -257,7 +257,7 @@ SECTION_SDATA u32 JASDriver::sMixMode = 0x00000002; /* 804507B0-804507B4 000230 0004+00 2/2 0/0 0/0 .sdata sDacRate__9JASDriver */ SECTION_SDATA f32 JASDriver::sDacRate = 32028.5f; -/* 804507B4-804507B8 000234 0004+00 4/4 0/0 0/0 .sdata sSubFrames__9JASDriver */ +/* 804507B4-804507B8 000234 0004+00 4/3 0/0 0/0 .sdata sSubFrames__9JASDriver */ SECTION_SDATA u32 JASDriver::sSubFrames = 0x00000007; /* 80455720-80455724 003D20 0004+00 1/1 0/0 0/0 .sdata2 @233 */ @@ -287,9 +287,9 @@ SECTION_RODATA void* const JASDriver::sMixFuncs[4] = { (void*)mixExtraTrack__9JASDriverFPsUlPFl_Ps, (void*)mixInterleaveTrack__9JASDriverFPsUlPFl_Ps, }; -COMPILER_STRIP_GATE(8039B2E0, &JASDriver::sMixFuncs); +COMPILER_STRIP_GATE(0x8039B2E0, &JASDriver::sMixFuncs); -/* 804512C4-804512C8 0007C4 0004+00 2/2 0/0 0/0 .sbss sSubFrameCounter__9JASDriver */ +/* 804512C4-804512C8 0007C4 0004+00 2/1 0/0 0/0 .sbss sSubFrameCounter__9JASDriver */ u8 JASDriver::sSubFrameCounter[4]; /* 804512C8-804512CC 0007C8 0004+00 1/1 0/0 0/0 .sbss dacp$239 */ @@ -309,6 +309,13 @@ asm void JASDriver::updateDac() { #pragma pop /* ############################################################################################## */ +/* 8039B2F0-8039B2F0 027950 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8039B2F0 = "SFR-UPDATE"; +SECTION_DEAD static char const* const stringBase_8039B2FB = "kill DSP channel"; +#pragma pop + /* 803C78B8-803C78E0 0249D8 0028+00 1/1 0/0 0/0 .data history$267 */ SECTION_DATA static u8 history[40] = { 0x00, 0x0F, 0x42, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -355,6 +362,13 @@ asm void JASDriver::readDspBuffer(s16* param_0, u32 param_1) { } #pragma pop +/* ############################################################################################## */ +/* 8039B2F0-8039B2F0 027950 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8039B30C = "DSP-MAIN"; +#pragma pop + /* 8029C900-8029C9DC 297240 00DC+00 1/1 1/1 0/0 .text finishDSPFrame__9JASDriverFv */ #pragma push #pragma optimization_level 0 @@ -370,7 +384,7 @@ asm void JASDriver::finishDSPFrame() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void JASDriver::registerMixCallback(s16* (*)(s32), JASMixMode param_1) { +asm void JASDriver::registerMixCallback(s16* (*param_0)(s32), JASMixMode param_1) { nofralloc #include "asm/JSystem/JAudio2/JASAiCtrl/registerMixCallback__9JASDriverFPFl_Ps10JASMixMode.s" } @@ -386,15 +400,10 @@ asm void JASDriver::getDacRate() { } #pragma pop -/* 8029C9F0-8029C9F8 297330 0008+00 2/2 2/2 0/0 .text getSubFrames__9JASDriverFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void JASDriver::getSubFrames() { - nofralloc -#include "asm/JSystem/JAudio2/JASAiCtrl/getSubFrames__9JASDriverFv.s" +/* 8029C9F0-8029C9F8 -00001 0008+00 0/0 0/0 0/0 .text getSubFrames__9JASDriverFv */ +u32 JASDriver::getSubFrames() { + return *(u32*)(&JASDriver::sSubFrames); } -#pragma pop /* 8029C9F8-8029CA04 297338 000C+00 2/2 0/0 0/0 .text getDacSize__9JASDriverFv */ #pragma push @@ -416,32 +425,54 @@ asm void JASDriver::getFrameSamples() { } #pragma pop +/* ############################################################################################## */ +/* 8039B2F0-8039B2F0 027950 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8039B315 = "MONO-MIX"; +#pragma pop + /* 8029CA10-8029CAC0 297350 00B0+00 1/0 0/0 0/0 .text mixMonoTrack__9JASDriverFPsUlPFl_Ps */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void JASDriver::mixMonoTrack(s16* param_0, u32 param_1, s16* (*)(s32)) { +asm void JASDriver::mixMonoTrack(s16* param_0, u32 param_1, s16* (*param_2)(s32)) { nofralloc #include "asm/JSystem/JAudio2/JASAiCtrl/mixMonoTrack__9JASDriverFPsUlPFl_Ps.s" } #pragma pop +/* ############################################################################################## */ +/* 8039B2F0-8039B2F0 027950 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8039B31E = "MONO(W)-MIX"; +#pragma pop + /* 8029CAC0-8029CB70 297400 00B0+00 1/0 0/0 0/0 .text mixMonoTrackWide__9JASDriverFPsUlPFl_Ps */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void JASDriver::mixMonoTrackWide(s16* param_0, u32 param_1, s16* (*)(s32)) { +asm void JASDriver::mixMonoTrackWide(s16* param_0, u32 param_1, s16* (*param_2)(s32)) { nofralloc #include "asm/JSystem/JAudio2/JASAiCtrl/mixMonoTrackWide__9JASDriverFPsUlPFl_Ps.s" } #pragma pop +/* ############################################################################################## */ +/* 8039B2F0-8039B2F0 027950 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8039B32A = "DSPMIX"; +SECTION_DEAD static char const* const stringBase_8039B331 = "MIXING"; +#pragma pop + /* 8029CB70-8029CC50 2974B0 00E0+00 1/0 0/0 0/0 .text mixExtraTrack__9JASDriverFPsUlPFl_Ps */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void JASDriver::mixExtraTrack(s16* param_0, u32 param_1, s16* (*)(s32)) { +asm void JASDriver::mixExtraTrack(s16* param_0, u32 param_1, s16* (*param_2)(s32)) { nofralloc #include "asm/JSystem/JAudio2/JASAiCtrl/mixExtraTrack__9JASDriverFPsUlPFl_Ps.s" } @@ -451,31 +482,15 @@ asm void JASDriver::mixExtraTrack(s16* param_0, u32 param_1, s16* (*)(s32)) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void JASDriver::mixInterleaveTrack(s16* param_0, u32 param_1, s16* (*)(s32)) { +asm void JASDriver::mixInterleaveTrack(s16* param_0, u32 param_1, s16* (*param_2)(s32)) { nofralloc #include "asm/JSystem/JAudio2/JASAiCtrl/mixInterleaveTrack__9JASDriverFPsUlPFl_Ps.s" } #pragma pop -/* 8029CCD4-8029CCDC 297614 0008+00 0/0 1/1 0/0 .text getSubFrameCounter__9JASDriverFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void JASDriver::getSubFrameCounter() { - nofralloc -#include "asm/JSystem/JAudio2/JASAiCtrl/getSubFrameCounter__9JASDriverFv.s" +/* 8029CCD4-8029CCDC -00001 0008+00 0/0 0/0 0/0 .text getSubFrameCounter__9JASDriverFv */ +u32 JASDriver::getSubFrameCounter() { + return *(u32*)(&JASDriver::sSubFrameCounter); } -#pragma pop -/* 8039B2F0-8039B338 027950 0048+00 5/5 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_8039B2F0 = "SFR-UPDATE"; -SECTION_DEAD static char const* const stringBase_8039B2FB = "kill DSP channel"; -SECTION_DEAD static char const* const stringBase_8039B30C = "DSP-MAIN"; -SECTION_DEAD static char const* const stringBase_8039B315 = "MONO-MIX"; -SECTION_DEAD static char const* const stringBase_8039B31E = "MONO(W)-MIX"; -SECTION_DEAD static char const* const stringBase_8039B32A = "DSPMIX"; -SECTION_DEAD static char const* const stringBase_8039B331 = "MIXING"; -#pragma pop +/* 8039B2F0-8039B2F0 027950 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/libs/JSystem/JAudio2/JASAramStream.cpp b/libs/JSystem/JAudio2/JASAramStream.cpp index ce0174600e4..9063bc5221b 100644 --- a/libs/JSystem/JAudio2/JASAramStream.cpp +++ b/libs/JSystem/JAudio2/JASAramStream.cpp @@ -32,7 +32,7 @@ template struct JASMemPool_MultiThreaded {}; /* JASMemPool_MultiThreaded */ struct JASMemPool_MultiThreaded__template2 { - /* 802978DC */ void func_802978DC(); + /* 802978DC */ void func_802978DC(void* _this); }; struct JASGenericMemPool { @@ -41,10 +41,6 @@ struct JASGenericMemPool { /* 80290948 */ void alloc(u32); }; -struct JASDvd { - /* 8028FEFC */ void getThreadPointer(); -}; - struct JASDsp { struct TChannel {}; }; @@ -121,7 +117,7 @@ extern "C" void updateChannel__13JASAramStreamFUlP10JASChannelPQ26JASDsp8TChanne extern "C" void channelProc__13JASAramStreamFv(); extern "C" void channelStart__13JASAramStreamFv(); extern "C" void channelStop__13JASAramStreamFUs(); -extern "C" void func_802978DC(); +extern "C" void func_802978DC(void* _this); extern "C" u8 sLoadThread__13JASAramStream[4]; extern "C" u8 sReadBuffer__13JASAramStream[4]; extern "C" u8 sBlockSize__13JASAramStream[4]; @@ -233,7 +229,7 @@ asm JASAramStream::JASAramStream() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void JASAramStream::init(u32 param_0, u32 param_1, void (*)(u32, JASAramStream*, void*), +asm void JASAramStream::init(u32 param_0, u32 param_1, void (*param_2)(u32, JASAramStream*, void*), void* param_3) { nofralloc #include "asm/JSystem/JAudio2/JASAramStream/init__13JASAramStreamFUlUlPFUlP13JASAramStreamPv_vPv.s" @@ -460,7 +456,7 @@ asm void JASAramStream::channelProc() { SECTION_RODATA static u8 const OSC_RELEASE_TABLE[12] = { 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x0F, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8039B168, &OSC_RELEASE_TABLE); +COMPILER_STRIP_GATE(0x8039B168, &OSC_RELEASE_TABLE); /* 8039B174-8039B190 -00001 0018+04 1/1 0/0 0/0 .rodata OSC_ENV */ SECTION_RODATA static void* const OSC_ENV[6 + 1 /* padding */] = { @@ -473,7 +469,7 @@ SECTION_RODATA static void* const OSC_ENV[6 + 1 /* padding */] = { /* padding */ NULL, }; -COMPILER_STRIP_GATE(8039B174, &OSC_ENV); +COMPILER_STRIP_GATE(0x8039B174, &OSC_ENV); /* 80431B28-80431B34 05E848 000C+00 1/1 0/0 0/0 .bss @792 */ static u8 lit_792[12]; @@ -521,7 +517,7 @@ asm void JASAramStream::channelStop(u16 param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_802978DC() { +extern "C" asm void func_802978DC(void* _this) { nofralloc #include "asm/JSystem/JAudio2/JASAramStream/func_802978DC.s" } diff --git a/libs/JSystem/JAudio2/JASAudioThread.cpp b/libs/JSystem/JAudio2/JASAudioThread.cpp index aae5e88baff..0667bfb0cc1 100644 --- a/libs/JSystem/JAudio2/JASAudioThread.cpp +++ b/libs/JSystem/JAudio2/JASAudioThread.cpp @@ -30,7 +30,7 @@ template struct JASMemPool_MultiThreaded {}; /* JASMemPool_MultiThreaded */ struct JASMemPool_MultiThreaded__template2 { - /* 802978DC */ void func_802978DC(); + /* 802978DC */ void func_802978DC(void* _this); }; struct JASGenericMemPool { @@ -92,7 +92,7 @@ extern "C" void __ct__17JASGenericMemPoolFv(); extern "C" void newMemPool__17JASGenericMemPoolFUli(); extern "C" void start__8JASProbeFlPCc(); extern "C" void stop__8JASProbeFl(); -extern "C" void func_802978DC(); +extern "C" void func_802978DC(void* _this); extern "C" void initAI__9JASDriverFPFv_v(); extern "C" void startDMA__9JASDriverFv(); extern "C" void stopDMA__9JASDriverFv(); @@ -171,6 +171,12 @@ asm void JASAudioThread::stop() { #pragma pop /* ############################################################################################## */ +/* 8039B338-8039B338 027998 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8039B338 = "SFR_DSP"; +#pragma pop + /* 80431C68-80431C78 05E988 000C+04 1/1 0/0 0/0 .bss @205 */ static u8 lit_205[12 + 4 /* padding */]; @@ -187,6 +193,15 @@ asm void JASAudioThread::run() { } #pragma pop +/* ############################################################################################## */ +/* 8039B338-8039B338 027998 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8039B340 = "UPDATE-DAC"; +/* @stringBase0 padding */ +SECTION_DEAD static char const* const pad_8039B34B = "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"; +#pragma pop + /* 8029CF68-8029CFBC 2978A8 0054+00 1/1 0/0 0/0 .text DMACallback__14JASAudioThreadFv */ #pragma push #pragma optimization_level 0 @@ -217,12 +232,4 @@ asm JASAudioThread::~JASAudioThread() { } #pragma pop -/* 8039B338-8039B360 027998 0013+15 2/2 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_8039B338 = "SFR_DSP"; -SECTION_DEAD static char const* const stringBase_8039B340 = "UPDATE-DAC"; -/* @stringBase0 padding */ -SECTION_DEAD static char const* const pad_8039B34B = "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"; -#pragma pop +/* 8039B338-8039B338 027998 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/libs/JSystem/JAudio2/JASBNKParser.cpp b/libs/JSystem/JAudio2/JASBNKParser.cpp index b1852a6a471..279f40ff1c3 100644 --- a/libs/JSystem/JAudio2/JASBNKParser.cpp +++ b/libs/JSystem/JAudio2/JASBNKParser.cpp @@ -25,7 +25,7 @@ template struct JASMemPool_MultiThreaded {}; /* JASMemPool_MultiThreaded */ struct JASMemPool_MultiThreaded__template2 { - /* 802978DC */ void func_802978DC(); + /* 802978DC */ void func_802978DC(void* _this); }; struct JASInst {}; @@ -37,7 +37,6 @@ struct JASGenericMemPool { struct JASDrumSet { struct TPerc { /* 802984C4 */ TPerc(); - /* 802984E4 */ void setRelease(u32); }; /* 802982EC */ JASDrumSet(); @@ -98,13 +97,13 @@ extern "C" void createBasicBank__Q212JASBNKParser4Ver0FPCvP7JKRHeap(); extern "C" void findOscPtr__Q212JASBNKParser4Ver0FP12JASBasicBankPCQ312JASBNKParser4Ver07THeaderPCQ312JASBNKParser4Ver04TOsc(); extern "C" void getOscTableEndPtr__Q212JASBNKParser4Ver0FPCQ213JASOscillator5Point(); -extern "C" void func_80299FA0(void const*, u32); -extern "C" void func_80299FB8(void const*, u32); -extern "C" void func_80299FD0(void const*, u32); -extern "C" void func_80299FE8(void const*, u32); -extern "C" void func_8029A000(void const*, u32); -extern "C" void func_8029A018(void const*, u32); -extern "C" void func_8029A030(void const*, u32); +extern "C" void func_80299FA0(void* _this, void const*, u32); +extern "C" void func_80299FB8(void* _this, void const*, u32); +extern "C" void func_80299FD0(void* _this, void const*, u32); +extern "C" void func_80299FE8(void* _this, void const*, u32); +extern "C" void func_8029A000(void* _this, void const*, u32); +extern "C" void func_8029A018(void* _this, void const*, u32); +extern "C" void func_8029A030(void* _this, void const*, u32); extern "C" void __sinit_JASBNKParser_cpp(); extern "C" u8 sUsedHeapSize__12JASBNKParser[4]; @@ -114,7 +113,7 @@ extern "C" u8 sUsedHeapSize__12JASBNKParser[4]; extern "C" void bcopy__7JASCalcFPCvPvUl(); extern "C" void __ct__17JASGenericMemPoolFv(); -extern "C" void func_802978DC(); +extern "C" void func_802978DC(void* _this); extern "C" void __ct__12JASBasicBankFv(); extern "C" void newInstTable__12JASBasicBankFUcP7JKRHeap(); extern "C" void setInst__12JASBasicBankFiP7JASInst(); @@ -267,7 +266,7 @@ asm void JASBNKParser::Ver0::getOscTableEndPtr(JASOscillator::Point const* param #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80299FA0(void const* param_0, u32 param_1) { +extern "C" asm void func_80299FA0(void* _this, void const* param_0, u32 param_1) { nofralloc #include "asm/JSystem/JAudio2/JASBNKParser/func_80299FA0.s" } @@ -278,7 +277,7 @@ extern "C" asm void func_80299FA0(void const* param_0, u32 param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80299FB8(void const* param_0, u32 param_1) { +extern "C" asm void func_80299FB8(void* _this, void const* param_0, u32 param_1) { nofralloc #include "asm/JSystem/JAudio2/JASBNKParser/func_80299FB8.s" } @@ -289,7 +288,7 @@ extern "C" asm void func_80299FB8(void const* param_0, u32 param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80299FD0(void const* param_0, u32 param_1) { +extern "C" asm void func_80299FD0(void* _this, void const* param_0, u32 param_1) { nofralloc #include "asm/JSystem/JAudio2/JASBNKParser/func_80299FD0.s" } @@ -300,7 +299,7 @@ extern "C" asm void func_80299FD0(void const* param_0, u32 param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80299FE8(void const* param_0, u32 param_1) { +extern "C" asm void func_80299FE8(void* _this, void const* param_0, u32 param_1) { nofralloc #include "asm/JSystem/JAudio2/JASBNKParser/func_80299FE8.s" } @@ -311,7 +310,7 @@ extern "C" asm void func_80299FE8(void const* param_0, u32 param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_8029A000(void const* param_0, u32 param_1) { +extern "C" asm void func_8029A000(void* _this, void const* param_0, u32 param_1) { nofralloc #include "asm/JSystem/JAudio2/JASBNKParser/func_8029A000.s" } @@ -322,7 +321,7 @@ extern "C" asm void func_8029A000(void const* param_0, u32 param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_8029A018(void const* param_0, u32 param_1) { +extern "C" asm void func_8029A018(void* _this, void const* param_0, u32 param_1) { nofralloc #include "asm/JSystem/JAudio2/JASBNKParser/func_8029A018.s" } @@ -333,7 +332,7 @@ extern "C" asm void func_8029A018(void const* param_0, u32 param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_8029A030(void const* param_0, u32 param_1) { +extern "C" asm void func_8029A030(void* _this, void const* param_0, u32 param_1) { nofralloc #include "asm/JSystem/JAudio2/JASBNKParser/func_8029A030.s" } @@ -362,5 +361,5 @@ asm void __sinit_JASBNKParser_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_8029A048 = (void*)__sinit_JASBNKParser_cpp; +REGISTER_CTORS(0x8029A048, __sinit_JASBNKParser_cpp); #pragma pop diff --git a/libs/JSystem/JAudio2/JASBank.cpp b/libs/JSystem/JAudio2/JASBank.cpp index d449f9dab2c..7cbaa66d22b 100644 --- a/libs/JSystem/JAudio2/JASBank.cpp +++ b/libs/JSystem/JAudio2/JASBank.cpp @@ -19,7 +19,7 @@ template struct JASMemPool_MultiThreaded {}; /* JASMemPool_MultiThreaded */ struct JASMemPool_MultiThreaded__template2 { - /* 802978DC */ void func_802978DC(); + /* 802978DC */ void func_802978DC(void* _this); }; struct JASGenericMemPool { @@ -61,7 +61,7 @@ extern "C" void noteOnOsc__7JASBankFiUcUcUsPFUlP10JASChannelPQ26JASDsp8TChannelP extern "C" void __ct__17JASGenericMemPoolFv(); extern "C" void alloc__17JASGenericMemPoolFUl(); -extern "C" void func_802978DC(); +extern "C" void func_802978DC(void* _this); extern "C" void __ct__10JASChannelFPFUlP10JASChannelPQ26JASDsp8TChannelPv_vPv(); extern "C" void play__10JASChannelFv(); extern "C" void setOscInit__10JASChannelFUlPCQ213JASOscillator4Data(); @@ -104,7 +104,8 @@ SECTION_SDATA2 static f32 lit_250 = 0.5f; #pragma optimization_level 0 #pragma optimizewithasm off asm void JASBank::noteOn(JASBank const* param_0, int param_1, u8 param_2, u8 param_3, u16 param_4, - void (*)(u32, JASChannel*, JASDsp::TChannel*, void*), void* param_6) { + void (*param_5)(u32, JASChannel*, JASDsp::TChannel*, void*), + void* param_6) { nofralloc #include "asm/JSystem/JAudio2/JASBank/noteOn__7JASBankFPC7JASBankiUcUcUsPFUlP10JASChannelPQ26JASDsp8TChannelPv_vPv.s" } @@ -115,7 +116,7 @@ asm void JASBank::noteOn(JASBank const* param_0, int param_1, u8 param_2, u8 par SECTION_RODATA static u8 const OSC_RELEASE_TABLE[12] = { 0x00, 0x01, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x0F, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8039B190, &OSC_RELEASE_TABLE); +COMPILER_STRIP_GATE(0x8039B190, &OSC_RELEASE_TABLE); /* 8039B19C-8039B1B8 -00001 0018+04 1/1 0/0 0/0 .rodata OSC_ENV$261 */ SECTION_RODATA static void* const OSC_ENV[6 + 1 /* padding */] = { @@ -128,7 +129,7 @@ SECTION_RODATA static void* const OSC_ENV[6 + 1 /* padding */] = { /* padding */ NULL, }; -COMPILER_STRIP_GATE(8039B19C, &OSC_ENV); +COMPILER_STRIP_GATE(0x8039B19C, &OSC_ENV); /* 8045563C-80455640 003C3C 0004+00 1/1 0/0 0/0 .sdata2 @290 */ SECTION_SDATA2 static f32 lit_290 = 16736.015625f; @@ -139,7 +140,8 @@ SECTION_SDATA2 static f32 lit_290 = 16736.015625f; #pragma optimization_level 0 #pragma optimizewithasm off asm void JASBank::noteOnOsc(int param_0, u8 param_1, u8 param_2, u16 param_3, - void (*)(u32, JASChannel*, JASDsp::TChannel*, void*), void* param_5) { + void (*param_4)(u32, JASChannel*, JASDsp::TChannel*, void*), + void* param_5) { nofralloc #include "asm/JSystem/JAudio2/JASBank/noteOnOsc__7JASBankFiUcUcUsPFUlP10JASChannelPQ26JASDsp8TChannelPv_vPv.s" } diff --git a/libs/JSystem/JAudio2/JASCalc.cpp b/libs/JSystem/JAudio2/JASCalc.cpp index a51055fb2b5..e8bee7cc50e 100644 --- a/libs/JSystem/JAudio2/JASCalc.cpp +++ b/libs/JSystem/JAudio2/JASCalc.cpp @@ -21,7 +21,7 @@ struct JASCalc { template void clamp(/* ... */); /* 8028F69C */ /* JASCalc::clamp */ - void func_8028F69C(s32); + void func_8028F69C(void* _this, s32); static u8 const CUTOFF_TO_IIR_TABLE[1024]; }; @@ -36,7 +36,7 @@ extern "C" void bcopy__7JASCalcFPCvPvUl(); extern "C" void bzerofast__7JASCalcFPvUl(); extern "C" void bzero__7JASCalcFPvUl(); extern "C" void pow2__7JASCalcFf(); -extern "C" void func_8028F69C(s32); +extern "C" void func_8028F69C(void* _this, s32); extern "C" u8 const CUTOFF_TO_IIR_TABLE__7JASCalc[1024]; // @@ -168,14 +168,14 @@ SECTION_RODATA u8 const JASCalc::CUTOFF_TO_IIR_TABLE[1024] = { 0x7A, 0xBD, 0x00, 0x7A, 0x03, 0x49, 0x01, 0x6C, 0x7C, 0x7A, 0x00, 0x52, 0x02, 0x33, 0x00, 0xF4, 0x7E, 0x3B, 0x00, 0x29, 0x01, 0x1B, 0x00, 0x7A, 0x7F, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8039ABB8, &JASCalc::CUTOFF_TO_IIR_TABLE); +COMPILER_STRIP_GATE(0x8039ABB8, &JASCalc::CUTOFF_TO_IIR_TABLE); /* 8039AFB8-8039AFD0 027618 0018+00 1/1 0/0 0/0 .rodata __two_to_x$982 */ SECTION_RODATA static f32 const __two_to_x[6] = { 0.6931471824645996f, 0.240226611495018f, 0.055502913892269135f, 0.009625022299587727f, 0.0013131053419783711f, 0.0001830080582294613f, }; -COMPILER_STRIP_GATE(8039AFB8, &__two_to_x); +COMPILER_STRIP_GATE(0x8039AFB8, &__two_to_x); /* 80455558-80455560 003B58 0004+04 1/1 0/0 0/0 .sdata2 @847 */ SECTION_SDATA2 static f32 lit_847[1 + 1 /* padding */] = { @@ -229,7 +229,7 @@ asm void JASCalc::pow2(f32 param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_8028F69C(s32 param_0) { +extern "C" asm void func_8028F69C(void* _this, s32 param_0) { nofralloc #include "asm/JSystem/JAudio2/JASCalc/func_8028F69C.s" } diff --git a/libs/JSystem/JAudio2/JASCallback.cpp b/libs/JSystem/JAudio2/JASCallback.cpp index 2c31574bce1..5e02d36dddd 100644 --- a/libs/JSystem/JAudio2/JASCallback.cpp +++ b/libs/JSystem/JAudio2/JASCallback.cpp @@ -47,7 +47,7 @@ extern "C" void _restgpr_29(); #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void JASCallbackMgr::regist(s32 (*)(void*), void* param_1) { +asm void JASCallbackMgr::regist(s32 (*param_0)(void*), void* param_1) { nofralloc #include "asm/JSystem/JAudio2/JASCallback/regist__14JASCallbackMgrFPFPv_lPv.s" } @@ -58,7 +58,7 @@ asm void JASCallbackMgr::regist(s32 (*)(void*), void* param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void JASCallbackMgr::reject(s32 (*)(void*), void* param_1) { +asm void JASCallbackMgr::reject(s32 (*param_0)(void*), void* param_1) { nofralloc #include "asm/JSystem/JAudio2/JASCallback/reject__14JASCallbackMgrFPFPv_lPv.s" } diff --git a/libs/JSystem/JAudio2/JASChannel.cpp b/libs/JSystem/JAudio2/JASChannel.cpp index 6ee509145f0..5a97f86df53 100644 --- a/libs/JSystem/JAudio2/JASChannel.cpp +++ b/libs/JSystem/JAudio2/JASChannel.cpp @@ -36,7 +36,7 @@ template struct JASMemPool_MultiThreaded {}; /* JASMemPool_MultiThreaded */ struct JASMemPool_MultiThreaded__template2 { - /* 802978DC */ void func_802978DC(); + /* 802978DC */ void func_802978DC(void* _this); }; struct JASLfo { @@ -67,8 +67,6 @@ struct JASDsp { struct JASDriver { /* 8029C9E8 */ void getDacRate(); - /* 8029E150 */ void getChannelLevel_dsp(); - /* 8029E180 */ void getOutputMode(); }; struct JASDSPChannel { @@ -154,7 +152,7 @@ extern "C" u8 sBankDisposeListSize__10JASChannel[4 + 4 /* padding */]; extern "C" void pow2__7JASCalcFf(); extern "C" void __ct__17JASGenericMemPoolFv(); extern "C" void free__17JASGenericMemPoolFPvUl(); -extern "C" void func_802978DC(); +extern "C" void func_802978DC(void* _this); extern "C" void __ct__6JASLfoFv(); extern "C" void getValue__6JASLfoCFv(); extern "C" void incCounter__6JASLfoFf(); @@ -228,7 +226,8 @@ SECTION_SDATA2 static f32 lit_546[1 + 1 /* padding */] = { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm JASChannel::JASChannel(void (*)(u32, JASChannel*, JASDsp::TChannel*, void*), void* param_1) { +asm JASChannel::JASChannel(void (*param_0)(u32, JASChannel*, JASDsp::TChannel*, void*), + void* param_1) { nofralloc #include "asm/JSystem/JAudio2/JASChannel/__ct__10JASChannelFPFUlP10JASChannelPQ26JASDsp8TChannelPv_vPv.s" } diff --git a/libs/JSystem/JAudio2/JASCmdStack.cpp b/libs/JSystem/JAudio2/JASCmdStack.cpp index 4c88815d6d3..992d3c6d276 100644 --- a/libs/JSystem/JAudio2/JASCmdStack.cpp +++ b/libs/JSystem/JAudio2/JASCmdStack.cpp @@ -122,7 +122,7 @@ asm void __sinit_JASCmdStack_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_8029116C = (void*)__sinit_JASCmdStack_cpp; +REGISTER_CTORS(0x8029116C, __sinit_JASCmdStack_cpp); #pragma pop /* 802911D0-80291228 28BB10 0058+00 1/1 0/0 0/0 .text __dt__Q210JASPortCmd9TPortHeadFv */ diff --git a/libs/JSystem/JAudio2/JASDSPChannel.cpp b/libs/JSystem/JAudio2/JASDSPChannel.cpp index 434a6204dc5..fab19395538 100644 --- a/libs/JSystem/JAudio2/JASDSPChannel.cpp +++ b/libs/JSystem/JAudio2/JASDSPChannel.cpp @@ -149,7 +149,8 @@ asm void JASDSPChannel::initAll() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void JASDSPChannel::alloc(u8 param_0, s32 (*)(u32, JASDsp::TChannel*, void*), void* param_2) { +asm void JASDSPChannel::alloc(u8 param_0, s32 (*param_1)(u32, JASDsp::TChannel*, void*), + void* param_2) { nofralloc #include "asm/JSystem/JAudio2/JASDSPChannel/alloc__13JASDSPChannelFUcPFUlPQ26JASDsp8TChannelPv_lPv.s" } @@ -160,7 +161,7 @@ asm void JASDSPChannel::alloc(u8 param_0, s32 (*)(u32, JASDsp::TChannel*, void*) #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void JASDSPChannel::allocForce(u8 param_0, s32 (*)(u32, JASDsp::TChannel*, void*), +asm void JASDSPChannel::allocForce(u8 param_0, s32 (*param_1)(u32, JASDsp::TChannel*, void*), void* param_2) { nofralloc #include "asm/JSystem/JAudio2/JASDSPChannel/allocForce__13JASDSPChannelFUcPFUlPQ26JASDsp8TChannelPv_lPv.s" diff --git a/libs/JSystem/JAudio2/JASDSPInterface.cpp b/libs/JSystem/JAudio2/JASDSPInterface.cpp index aa6322fad1b..c1fca5bc4fc 100644 --- a/libs/JSystem/JAudio2/JASDSPInterface.cpp +++ b/libs/JSystem/JAudio2/JASDSPInterface.cpp @@ -163,7 +163,7 @@ static u8 struct_804512F4[4]; #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void JASDsp::boot(void (*)(void*)) { +asm void JASDsp::boot(void (*param_0)(void*)) { nofralloc #include "asm/JSystem/JAudio2/JASDSPInterface/boot__6JASDspFPFPv_v.s" } @@ -271,7 +271,7 @@ SECTION_RODATA u8 const JASDsp::DSPADPCM_FILTER[64] = { 0x10, 0x68, 0xF7, 0x38, 0x12, 0xC0, 0xF7, 0x04, 0x14, 0x00, 0xF4, 0x00, 0x08, 0x00, 0xF8, 0x00, 0x04, 0x00, 0xFC, 0x00, 0xFC, 0x00, 0x04, 0x00, 0xFC, 0x00, 0x00, 0x00, 0xF8, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8039B360, &JASDsp::DSPADPCM_FILTER); +COMPILER_STRIP_GATE(0x8039B360, &JASDsp::DSPADPCM_FILTER); /* 8039B3A0-8039B8A0 -00001 0500+00 1/1 0/0 0/0 .rodata DSPRES_FILTER__6JASDsp */ SECTION_RODATA void* const JASDsp::DSPRES_FILTER[320] = { @@ -596,7 +596,7 @@ SECTION_RODATA void* const JASDsp::DSPRES_FILTER[320] = { (void*)0x7FD87FE9, (void*)0x7FF57FFD, }; -COMPILER_STRIP_GATE(8039B3A0, &JASDsp::DSPRES_FILTER); +COMPILER_STRIP_GATE(0x8039B3A0, &JASDsp::DSPRES_FILTER); /* 8029DAC8-8029DB78 298408 00B0+00 0/0 1/1 0/0 .text initBuffer__6JASDspFv */ #pragma push @@ -891,16 +891,11 @@ asm void JASDsp::TChannel::setFIR8FilterParam(s16* param_0) { } #pragma pop -/* 8029E094-8029E09C 2989D4 0008+00 0/0 1/1 0/0 .text setDistFilter__Q26JASDsp8TChannelFs +/* 8029E094-8029E09C -00001 0008+00 0/0 0/0 0/0 .text setDistFilter__Q26JASDsp8TChannelFs */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void JASDsp::TChannel::setDistFilter(s16 param_0) { - nofralloc -#include "asm/JSystem/JAudio2/JASDSPInterface/setDistFilter__Q26JASDsp8TChannelFs.s" +void JASDsp::TChannel::setDistFilter(s16 param_0) { + *(u16*)(((u8*)this) + 336) /* this->field_0x150 */ = (u16)(param_0); } -#pragma pop /* ############################################################################################## */ /* 8039B8A0-8039B8B8 027F00 0018+00 1/1 0/0 0/0 .rodata connect_table$463 */ @@ -908,7 +903,7 @@ SECTION_RODATA static u8 const connect_table[24] = { 0x00, 0x00, 0x0D, 0x00, 0x0D, 0x60, 0x0D, 0xC0, 0x0E, 0x20, 0x0E, 0x80, 0x0E, 0xE0, 0x0C, 0xA0, 0x0F, 0x40, 0x0F, 0xA0, 0x0B, 0x00, 0x09, 0xA0, }; -COMPILER_STRIP_GATE(8039B8A0, &connect_table); +COMPILER_STRIP_GATE(0x8039B8A0, &connect_table); /* 8029E09C-8029E0BC 2989DC 0020+00 0/0 1/1 0/0 .text setBusConnect__Q26JASDsp8TChannelFUcUc */ #pragma push diff --git a/libs/JSystem/JAudio2/JASDriverIF.cpp b/libs/JSystem/JAudio2/JASDriverIF.cpp index 5cec2cefc88..1697821fb15 100644 --- a/libs/JSystem/JAudio2/JASDriverIF.cpp +++ b/libs/JSystem/JAudio2/JASDriverIF.cpp @@ -17,12 +17,11 @@ struct JASDsp { }; struct JASDriver { - /* 8029CCD4 */ void getSubFrameCounter(); /* 8029E130 */ void setDSPLevel(f32); - /* 8029E150 */ void getChannelLevel_dsp(); + /* 8029E150 */ u16 getChannelLevel_dsp(); /* 8029E158 */ void getDSPLevel(); /* 8029E178 */ void setOutputMode(u32); - /* 8029E180 */ void getOutputMode(); + /* 8029E180 */ u32 getOutputMode(); /* 8029E188 */ void waitSubFrame(); /* 8029E1C4 */ void rejectCallback(s32 (*)(void*), void*); /* 8029E240 */ void registerDspSyncCallback(s32 (*)(void*), void*); @@ -53,10 +52,10 @@ struct JASCallbackMgr { // extern "C" void setDSPLevel__9JASDriverFf(); -extern "C" void getChannelLevel_dsp__9JASDriverFv(); +extern "C" u16 getChannelLevel_dsp__9JASDriverFv(); extern "C" void getDSPLevel__9JASDriverFv(); extern "C" void setOutputMode__9JASDriverFUl(); -extern "C" void getOutputMode__9JASDriverFv(); +extern "C" u32 getOutputMode__9JASDriverFv(); extern "C" void waitSubFrame__9JASDriverFv(); extern "C" void rejectCallback__9JASDriverFPFPv_lPv(); extern "C" void registerDspSyncCallback__9JASDriverFPFPv_lPv(); @@ -102,23 +101,18 @@ asm void JASDriver::setDSPLevel(f32 param_0) { #pragma pop /* ############################################################################################## */ -/* 804507C0-804507C4 000240 0002+02 1/1 0/0 0/0 .sdata MAX_MIXERLEVEL__9JASDriver */ +/* 804507C0-804507C4 000240 0002+02 1/0 0/0 0/0 .sdata MAX_MIXERLEVEL__9JASDriver */ SECTION_SDATA u16 JASDriver::MAX_MIXERLEVEL[1 + 1 /* padding */] = { 0x2EE0, /* padding */ 0x0000, }; -/* 8029E150-8029E158 298A90 0008+00 0/0 2/2 0/0 .text getChannelLevel_dsp__9JASDriverFv +/* 8029E150-8029E158 -00001 0008+00 0/0 0/0 0/0 .text getChannelLevel_dsp__9JASDriverFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void JASDriver::getChannelLevel_dsp() { - nofralloc -#include "asm/JSystem/JAudio2/JASDriverIF/getChannelLevel_dsp__9JASDriverFv.s" +u16 JASDriver::getChannelLevel_dsp() { + return *(u16*)(&JASDriver::MAX_MIXERLEVEL); } -#pragma pop /* 8029E158-8029E178 298A98 0020+00 0/0 3/3 0/0 .text getDSPLevel__9JASDriverFv */ #pragma push @@ -131,7 +125,7 @@ asm void JASDriver::getDSPLevel() { #pragma pop /* ############################################################################################## */ -/* 804507C4-804507C8 000244 0004+00 2/2 0/0 0/0 .sdata JAS_SYSTEM_OUTPUT_MODE__9JASDriver +/* 804507C4-804507C8 000244 0004+00 2/1 0/0 0/0 .sdata JAS_SYSTEM_OUTPUT_MODE__9JASDriver */ SECTION_SDATA u32 JASDriver::JAS_SYSTEM_OUTPUT_MODE = 0x00000001; @@ -145,15 +139,10 @@ asm void JASDriver::setOutputMode(u32 param_0) { } #pragma pop -/* 8029E180-8029E188 298AC0 0008+00 0/0 4/4 1/1 .text getOutputMode__9JASDriverFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void JASDriver::getOutputMode() { - nofralloc -#include "asm/JSystem/JAudio2/JASDriverIF/getOutputMode__9JASDriverFv.s" +/* 8029E180-8029E188 -00001 0008+00 0/0 0/0 0/0 .text getOutputMode__9JASDriverFv */ +u32 JASDriver::getOutputMode() { + return *(u32*)(&JASDriver::JAS_SYSTEM_OUTPUT_MODE); } -#pragma pop /* 8029E188-8029E1C4 298AC8 003C+00 0/0 1/1 0/0 .text waitSubFrame__9JASDriverFv */ #pragma push @@ -180,7 +169,7 @@ u8 JASDriver::sUpdateDacCallback[256 + 8 /* padding */]; #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void JASDriver::rejectCallback(s32 (*)(void*), void* param_1) { +asm void JASDriver::rejectCallback(s32 (*param_0)(void*), void* param_1) { nofralloc #include "asm/JSystem/JAudio2/JASDriverIF/rejectCallback__9JASDriverFPFPv_lPv.s" } @@ -191,7 +180,7 @@ asm void JASDriver::rejectCallback(s32 (*)(void*), void* param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void JASDriver::registerDspSyncCallback(s32 (*)(void*), void* param_1) { +asm void JASDriver::registerDspSyncCallback(s32 (*param_0)(void*), void* param_1) { nofralloc #include "asm/JSystem/JAudio2/JASDriverIF/registerDspSyncCallback__9JASDriverFPFPv_lPv.s" } @@ -202,7 +191,7 @@ asm void JASDriver::registerDspSyncCallback(s32 (*)(void*), void* param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void JASDriver::registerSubFrameCallback(s32 (*)(void*), void* param_1) { +asm void JASDriver::registerSubFrameCallback(s32 (*param_0)(void*), void* param_1) { nofralloc #include "asm/JSystem/JAudio2/JASDriverIF/registerSubFrameCallback__9JASDriverFPFPv_lPv.s" } @@ -250,7 +239,7 @@ asm void __sinit_JASDriverIF_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_8029E320 = (void*)__sinit_JASDriverIF_cpp; +REGISTER_CTORS(0x8029E320, __sinit_JASDriverIF_cpp); #pragma pop /* 8029E3A0-8029E3B0 298CE0 0010+00 1/1 0/0 0/0 .text __ct__Q214JASCallbackMgr9TCallbackFv */ diff --git a/libs/JSystem/JAudio2/JASDrumSet.cpp b/libs/JSystem/JAudio2/JASDrumSet.cpp index 9d6b281cbb2..bdda811a6f6 100644 --- a/libs/JSystem/JAudio2/JASDrumSet.cpp +++ b/libs/JSystem/JAudio2/JASDrumSet.cpp @@ -161,16 +161,11 @@ asm JASDrumSet::TPerc::TPerc() { } #pragma pop -/* 802984E4-802984EC 292E24 0008+00 0/0 2/2 0/0 .text setRelease__Q210JASDrumSet5TPercFUl +/* 802984E4-802984EC -00001 0008+00 0/0 0/0 0/0 .text setRelease__Q210JASDrumSet5TPercFUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void JASDrumSet::TPerc::setRelease(u32 param_0) { - nofralloc -#include "asm/JSystem/JAudio2/JASDrumSet/setRelease__Q210JASDrumSet5TPercFUl.s" +void JASDrumSet::TPerc::setRelease(u32 param_0) { + *(u16*)(((u8*)this) + 12) /* this->field_0xc */ = (u16)(param_0); } -#pragma pop /* 802984EC-802984F8 292E2C 000C+00 1/0 0/0 0/0 .text getType__10JASDrumSetCFv */ #pragma push diff --git a/libs/JSystem/JAudio2/JASDvdThread.cpp b/libs/JSystem/JAudio2/JASDvdThread.cpp index aa27e363cd8..d7a53806787 100644 --- a/libs/JSystem/JAudio2/JASDvdThread.cpp +++ b/libs/JSystem/JAudio2/JASDvdThread.cpp @@ -21,7 +21,7 @@ struct JASTaskThread { }; struct JASDvd { - /* 8028FEFC */ void getThreadPointer(); + /* 8028FEFC */ u32 getThreadPointer(); /* 8028FF04 */ void createThread(s32, int, u32); static u8 sThread[4 + 4 /* padding */]; @@ -31,7 +31,7 @@ struct JASDvd { // Forward References: // -extern "C" void getThreadPointer__6JASDvdFv(); +extern "C" u32 getThreadPointer__6JASDvdFv(); extern "C" void createThread__6JASDvdFliUl(); extern "C" u8 sThread__6JASDvd[4 + 4 /* padding */]; @@ -53,18 +53,13 @@ extern "C" u8 sCurrentHeap__7JKRHeap[4]; // /* ############################################################################################## */ -/* 80451208-80451210 000708 0004+04 2/2 0/0 0/0 .sbss sThread__6JASDvd */ +/* 80451208-80451210 000708 0004+04 2/1 0/0 0/0 .sbss sThread__6JASDvd */ u8 JASDvd::sThread[4 + 4 /* padding */]; -/* 8028FEFC-8028FF04 28A83C 0008+00 0/0 6/6 0/0 .text getThreadPointer__6JASDvdFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void JASDvd::getThreadPointer() { - nofralloc -#include "asm/JSystem/JAudio2/JASDvdThread/getThreadPointer__6JASDvdFv.s" +/* 8028FEFC-8028FF04 -00001 0008+00 0/0 0/0 0/0 .text getThreadPointer__6JASDvdFv */ +u32 JASDvd::getThreadPointer() { + return *(u32*)(&JASDvd::sThread); } -#pragma pop /* 8028FF04-8028FFA8 28A844 00A4+00 0/0 1/1 0/0 .text createThread__6JASDvdFliUl */ #pragma push diff --git a/libs/JSystem/JAudio2/JASHeapCtrl.cpp b/libs/JSystem/JAudio2/JASHeapCtrl.cpp index 40b5c6a2afd..edbd64f1481 100644 --- a/libs/JSystem/JAudio2/JASHeapCtrl.cpp +++ b/libs/JSystem/JAudio2/JASHeapCtrl.cpp @@ -35,8 +35,8 @@ struct JKRExpHeap { struct JASKernel { /* 802909B8 */ void setupRootHeap(JKRSolidHeap*, u32); - /* 80290AC0 */ void getSystemHeap(); - /* 80290AC8 */ void getCommandHeap(); + /* 80290AC0 */ u32 getSystemHeap(); + /* 80290AC8 */ u32 getCommandHeap(); /* 80290AD0 */ void setupAramHeap(u32, u32); /* 80290B08 */ void getAramHeap(); @@ -90,8 +90,8 @@ extern "C" void newMemPool__17JASGenericMemPoolFUli(); extern "C" void alloc__17JASGenericMemPoolFUl(); extern "C" void free__17JASGenericMemPoolFPvUl(); extern "C" void setupRootHeap__9JASKernelFP12JKRSolidHeapUl(); -extern "C" void getSystemHeap__9JASKernelFv(); -extern "C" void getCommandHeap__9JASKernelFv(); +extern "C" u32 getSystemHeap__9JASKernelFv(); +extern "C" u32 getCommandHeap__9JASKernelFv(); extern "C" void setupAramHeap__9JASKernelFUlUl(); extern "C" void getAramHeap__9JASKernelFv(); extern "C" void __sinit_JASHeapCtrl_cpp(); @@ -287,10 +287,10 @@ asm void JASGenericMemPool::free(void* param_0, u32 param_1) { /* 80451214-80451218 000714 0004+00 1/1 0/0 0/0 .sbss sAramBase__9JASKernel */ u8 JASKernel::sAramBase[4]; -/* 80451218-8045121C 000718 0004+00 2/2 0/0 0/0 .sbss sSystemHeap__9JASKernel */ +/* 80451218-8045121C 000718 0004+00 2/1 0/0 0/0 .sbss sSystemHeap__9JASKernel */ u8 JASKernel::sSystemHeap[4]; -/* 8045121C-80451220 00071C 0004+00 2/2 0/0 0/0 .sbss sCommandHeap__9JASKernel */ +/* 8045121C-80451220 00071C 0004+00 2/1 0/0 0/0 .sbss sCommandHeap__9JASKernel */ u8 JASKernel::sCommandHeap[4]; /* 802909B8-80290AC0 28B2F8 0108+00 0/0 1/1 0/0 .text setupRootHeap__9JASKernelFP12JKRSolidHeapUl @@ -304,25 +304,15 @@ asm void JASKernel::setupRootHeap(JKRSolidHeap* param_0, u32 param_1) { } #pragma pop -/* 80290AC0-80290AC8 28B400 0008+00 1/1 3/3 0/0 .text getSystemHeap__9JASKernelFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void JASKernel::getSystemHeap() { - nofralloc -#include "asm/JSystem/JAudio2/JASHeapCtrl/getSystemHeap__9JASKernelFv.s" +/* 80290AC0-80290AC8 -00001 0008+00 0/0 0/0 0/0 .text getSystemHeap__9JASKernelFv */ +u32 JASKernel::getSystemHeap() { + return *(u32*)(&JASKernel::sSystemHeap); } -#pragma pop -/* 80290AC8-80290AD0 28B408 0008+00 0/0 6/6 0/0 .text getCommandHeap__9JASKernelFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void JASKernel::getCommandHeap() { - nofralloc -#include "asm/JSystem/JAudio2/JASHeapCtrl/getCommandHeap__9JASKernelFv.s" +/* 80290AC8-80290AD0 -00001 0008+00 0/0 0/0 0/0 .text getCommandHeap__9JASKernelFv */ +u32 JASKernel::getCommandHeap() { + return *(u32*)(&JASKernel::sCommandHeap); } -#pragma pop /* ############################################################################################## */ /* 804315D0-804315DC 05E2F0 000C+00 1/1 0/0 0/0 .bss @313 */ @@ -363,7 +353,7 @@ asm void __sinit_JASHeapCtrl_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80290B14 = (void*)__sinit_JASHeapCtrl_cpp; +REGISTER_CTORS(0x80290B14, __sinit_JASHeapCtrl_cpp); #pragma pop /* 80290B54-80290BCC 28B494 0078+00 1/1 3/3 0/0 .text __dt__7JASHeapFv */ diff --git a/libs/JSystem/JAudio2/JASLfo.cpp b/libs/JSystem/JAudio2/JASLfo.cpp index a85205b626a..7d4efa96055 100644 --- a/libs/JSystem/JAudio2/JASLfo.cpp +++ b/libs/JSystem/JAudio2/JASLfo.cpp @@ -128,5 +128,5 @@ asm void __sinit_JASLfo_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_8029BE6C = (void*)__sinit_JASLfo_cpp; +REGISTER_CTORS(0x8029BE6C, __sinit_JASLfo_cpp); #pragma pop diff --git a/libs/JSystem/JAudio2/JASOscillator.cpp b/libs/JSystem/JAudio2/JASOscillator.cpp index 213995d041f..9d2f224a1c4 100644 --- a/libs/JSystem/JAudio2/JASOscillator.cpp +++ b/libs/JSystem/JAudio2/JASOscillator.cpp @@ -148,7 +148,7 @@ SECTION_RODATA u8 const JASOscillator::sCurveTableLinear[68] = { 0x00, 0x00, 0x3E, 0xA0, 0x00, 0x00, 0x3E, 0x80, 0x00, 0x00, 0x3E, 0x40, 0x00, 0x00, 0x3E, 0x00, 0x00, 0x00, 0x3D, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8039B1D0, &JASOscillator::sCurveTableLinear); +COMPILER_STRIP_GATE(0x8039B1D0, &JASOscillator::sCurveTableLinear); /* 8039B214-8039B258 027874 0044+00 1/0 0/0 0/0 .rodata sCurveTableSampleCell__13JASOscillator */ SECTION_RODATA u8 const JASOscillator::sCurveTableSampleCell[68] = { @@ -158,7 +158,7 @@ SECTION_RODATA u8 const JASOscillator::sCurveTableSampleCell[68] = { 0x81, 0xE4, 0x3D, 0x32, 0xC1, 0x6E, 0x3C, 0xFC, 0x81, 0xFC, 0x3C, 0xC2, 0x41, 0x8E, 0x3C, 0x7A, 0x02, 0x25, 0x3C, 0x16, 0x01, 0x29, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8039B214, &JASOscillator::sCurveTableSampleCell); +COMPILER_STRIP_GATE(0x8039B214, &JASOscillator::sCurveTableSampleCell); /* 8039B258-8039B29C 0278B8 0044+00 1/0 0/0 0/0 .rodata sCurveTableSqRoot__13JASOscillator */ @@ -169,7 +169,7 @@ SECTION_RODATA u8 const JASOscillator::sCurveTableSqRoot[68] = { 0x00, 0x00, 0x3D, 0xC7, 0xFF, 0xF9, 0x3D, 0x80, 0x00, 0x00, 0x3D, 0x0F, 0xFF, 0xF3, 0x3C, 0x80, 0x00, 0x00, 0x3B, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8039B258, &JASOscillator::sCurveTableSqRoot); +COMPILER_STRIP_GATE(0x8039B258, &JASOscillator::sCurveTableSqRoot); /* 8039B29C-8039B2E0 0278FC 0044+00 1/0 0/0 0/0 .rodata sCurveTableSquare__13JASOscillator */ @@ -180,7 +180,7 @@ SECTION_RODATA u8 const JASOscillator::sCurveTableSquare[68] = { 0xC4, 0x69, 0x3F, 0x0F, 0x1B, 0xBD, 0x3F, 0x00, 0x00, 0x00, 0x3E, 0xDD, 0xB3, 0xE1, 0x3E, 0xB5, 0x04, 0xE6, 0x3E, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8039B29C, &JASOscillator::sCurveTableSquare); +COMPILER_STRIP_GATE(0x8039B29C, &JASOscillator::sCurveTableSquare); /* 803C78A8-803C78B8 -00001 0010+00 1/1 0/0 0/0 .data table_list$151 */ SECTION_DATA static void* table_list[4] = { diff --git a/libs/JSystem/JAudio2/JASResArcLoader.cpp b/libs/JSystem/JAudio2/JASResArcLoader.cpp index 5efaf88cbbc..1197c9f5b6d 100644 --- a/libs/JSystem/JAudio2/JASResArcLoader.cpp +++ b/libs/JSystem/JAudio2/JASResArcLoader.cpp @@ -28,10 +28,6 @@ struct JASResArcLoader { /* 80290D18 */ void loadResourceAsync(JKRArchive*, u16, u8*, u32, void (*)(u32, u32), u32); }; -struct JASDvd { - /* 8028FEFC */ void getThreadPointer(); -}; - // // Forward References: // @@ -97,7 +93,7 @@ asm void JASResArcLoader::loadResourceCallback(void* param_0) { #pragma optimization_level 0 #pragma optimizewithasm off asm void JASResArcLoader::loadResourceAsync(JKRArchive* param_0, u16 param_1, u8* param_2, - u32 param_3, void (*)(u32, u32), u32 param_5) { + u32 param_3, void (*param_4)(u32, u32), u32 param_5) { nofralloc #include "asm/JSystem/JAudio2/JASResArcLoader/loadResourceAsync__15JASResArcLoaderFP10JKRArchiveUsPUcUlPFUlUl_vUl.s" } diff --git a/libs/JSystem/JAudio2/JASSeqCtrl.cpp b/libs/JSystem/JAudio2/JASSeqCtrl.cpp index 3ca8fe7cf06..b8ed73edb3d 100644 --- a/libs/JSystem/JAudio2/JASSeqCtrl.cpp +++ b/libs/JSystem/JAudio2/JASSeqCtrl.cpp @@ -208,7 +208,7 @@ asm void __sinit_JASSeqCtrl_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80293C6C = (void*)__sinit_JASSeqCtrl_cpp; +REGISTER_CTORS(0x80293C6C, __sinit_JASSeqCtrl_cpp); #pragma pop /* 80293CAC-80293CF4 28E5EC 0048+00 1/1 1/0 0/0 .text __dt__12JASSeqParserFv */ diff --git a/libs/JSystem/JAudio2/JASSeqParser.cpp b/libs/JSystem/JAudio2/JASSeqParser.cpp index 5ef6b2c8245..ba54011cd2f 100644 --- a/libs/JSystem/JAudio2/JASSeqParser.cpp +++ b/libs/JSystem/JAudio2/JASSeqParser.cpp @@ -11,12 +11,6 @@ // Types: // -struct JMath { - struct TRandom_fast_ { - /* 80339AE4 */ TRandom_fast_(u32); - }; -}; - struct JASTrackPort { /* 8029360C */ void checkImport(u32) const; /* 80293628 */ void checkExport(u32) const; @@ -1980,6 +1974,31 @@ asm void JASSeqParser::cmdRegTblLoad(JASTrack* param_0, u32* param_1) { } #pragma pop +/* ############################################################################################## */ +/* 8039B018-8039B018 027678 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8039B018 = + "--------------- JASTrack (%8x) dump ------------" + "----"; +SECTION_DEAD static char const* const stringBase_8039B04D = " Base: 0x%08x Cur: 0x%08x(0x%06x)"; +SECTION_DEAD static char const* const stringBase_8039B06F = ""; +SECTION_DEAD static char const* const stringBase_8039B070 = + " REG_A: 0x%04x REG_B: 0x%04x REG_S: 0x%04x"; +SECTION_DEAD static char const* const stringBase_8039B09B = + " REG_X: 0x%04x REG_Y: 0x%04x REG_F: 0x%04x"; +SECTION_DEAD static char const* const stringBase_8039B0C6 = + " PORT 0-3: 0x%04x 0x%04x 0x%04x 0x%04x"; +SECTION_DEAD static char const* const stringBase_8039B0ED = + " PORT 4-7: 0x%04x 0x%04x 0x%04x 0x%04x"; +SECTION_DEAD static char const* const stringBase_8039B114 = + " PORT 8-B: 0x%04x 0x%04x 0x%04x 0x%04x"; +SECTION_DEAD static char const* const stringBase_8039B13B = + " PORT C-F: 0x%04x 0x%04x 0x%04x 0x%04x"; +/* @stringBase0 padding */ +SECTION_DEAD static char const* const pad_8039B162 = "\0\0\0\0\0"; +#pragma pop + /* 80295088-8029526C 28F9C8 01E4+00 1/0 0/0 0/0 .text cmdDump__12JASSeqParserFP8JASTrackPUl */ #pragma push #pragma optimization_level 0 @@ -2038,7 +2057,7 @@ asm void JASSeqParser::execNoteOff(JASTrack* param_0, u32 param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void JASSeqParser::execCommand(JASTrack* param_0, s32 (JASSeqParser::*)(JASTrack*, u32*), +asm void JASSeqParser::execCommand(JASTrack* param_0, s32 (JASSeqParser::*param_1)(JASTrack*, u32*), u32 param_2, u32* param_3) { nofralloc #include "asm/JSystem/JAudio2/JASSeqParser/execCommand__12JASSeqParserFP8JASTrackM12JASSeqParserFPCvPvP8JASTrackPUl_lUlPUl.s" @@ -2109,7 +2128,7 @@ asm void __sinit_JASSeqParser_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80295950 = (void*)__sinit_JASSeqParser_cpp; +REGISTER_CTORS(0x80295950, __sinit_JASSeqParser_cpp); #pragma pop /* ############################################################################################## */ @@ -2125,27 +2144,4 @@ SECTION_DATA extern void* __vt__12JASSeqParser[8] = { (void*)execCommand__12JASSeqParserFP8JASTrackM12JASSeqParserFPCvPvP8JASTrackPUl_lUlPUl, }; -/* 8039B018-8039B168 027678 014A+06 1/1 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_8039B018 = - "--------------- JASTrack (%8x) dump ------------" - "----"; -SECTION_DEAD static char const* const stringBase_8039B04D = " Base: 0x%08x Cur: 0x%08x(0x%06x)"; -SECTION_DEAD static char const* const stringBase_8039B06F = ""; -SECTION_DEAD static char const* const stringBase_8039B070 = - " REG_A: 0x%04x REG_B: 0x%04x REG_S: 0x%04x"; -SECTION_DEAD static char const* const stringBase_8039B09B = - " REG_X: 0x%04x REG_Y: 0x%04x REG_F: 0x%04x"; -SECTION_DEAD static char const* const stringBase_8039B0C6 = - " PORT 0-3: 0x%04x 0x%04x 0x%04x 0x%04x"; -SECTION_DEAD static char const* const stringBase_8039B0ED = - " PORT 4-7: 0x%04x 0x%04x 0x%04x 0x%04x"; -SECTION_DEAD static char const* const stringBase_8039B114 = - " PORT 8-B: 0x%04x 0x%04x 0x%04x 0x%04x"; -SECTION_DEAD static char const* const stringBase_8039B13B = - " PORT C-F: 0x%04x 0x%04x 0x%04x 0x%04x"; -/* @stringBase0 padding */ -SECTION_DEAD static char const* const pad_8039B162 = "\0\0\0\0\0"; -#pragma pop +/* 8039B018-8039B018 027678 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/libs/JSystem/JAudio2/JASTaskThread.cpp b/libs/JSystem/JAudio2/JASTaskThread.cpp index 85d3a1123ff..92f70b70726 100644 --- a/libs/JSystem/JAudio2/JASTaskThread.cpp +++ b/libs/JSystem/JAudio2/JASTaskThread.cpp @@ -31,11 +31,6 @@ struct JASTaskThread { /* 8028FE88 */ void pause(bool); }; -struct JASKernel { - /* 80290AC0 */ void getSystemHeap(); - /* 80290AC8 */ void getCommandHeap(); -}; - struct JASCalc { /* 8028F354 */ void bcopy(void const*, void*, u32); }; @@ -120,7 +115,7 @@ asm JASTaskThread::~JASTaskThread() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void JASTaskThread::allocCallStack(void (*)(void*), void const* param_1, u32 param_2) { +asm void JASTaskThread::allocCallStack(void (*param_0)(void*), void const* param_1, u32 param_2) { nofralloc #include "asm/JSystem/JAudio2/JASTaskThread/allocCallStack__13JASTaskThreadFPFPv_vPCvUl.s" } @@ -130,7 +125,7 @@ asm void JASTaskThread::allocCallStack(void (*)(void*), void const* param_1, u32 #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void JASTaskThread::allocCallStack(void (*)(void*), void* param_1) { +asm void JASTaskThread::allocCallStack(void (*param_0)(void*), void* param_1) { nofralloc #include "asm/JSystem/JAudio2/JASTaskThread/allocCallStack__13JASTaskThreadFPFPv_vPv.s" } @@ -140,7 +135,7 @@ asm void JASTaskThread::allocCallStack(void (*)(void*), void* param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void JASTaskThread::sendCmdMsg(void (*)(void*), void const* param_1, u32 param_2) { +asm void JASTaskThread::sendCmdMsg(void (*param_0)(void*), void const* param_1, u32 param_2) { nofralloc #include "asm/JSystem/JAudio2/JASTaskThread/sendCmdMsg__13JASTaskThreadFPFPv_vPCvUl.s" } @@ -150,7 +145,7 @@ asm void JASTaskThread::sendCmdMsg(void (*)(void*), void const* param_1, u32 par #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void JASTaskThread::sendCmdMsg(void (*)(void*), void* param_1) { +asm void JASTaskThread::sendCmdMsg(void (*param_0)(void*), void* param_1) { nofralloc #include "asm/JSystem/JAudio2/JASTaskThread/sendCmdMsg__13JASTaskThreadFPFPv_vPv.s" } diff --git a/libs/JSystem/JAudio2/JASTrack.cpp b/libs/JSystem/JAudio2/JASTrack.cpp index 7d3b54348e0..6211c790006 100644 --- a/libs/JSystem/JAudio2/JASTrack.cpp +++ b/libs/JSystem/JAudio2/JASTrack.cpp @@ -32,6 +32,16 @@ struct JASTrackPort { /* 802935E8 */ void writeExport(u32, u16); }; +struct JASDsp { + struct TChannel { + /* 8029E00C */ void setFilterMode(u16); + /* 8029E044 */ void setIIRFilterParam(s16*); + /* 8029E06C */ void setFIR8FilterParam(s16*); + }; + + static u32 FILTER_MODE_IIR; +}; + struct JASOscillator { struct Point {}; @@ -48,17 +58,6 @@ struct JASChannel { struct JASSoundParams {}; -struct JASDsp { - struct TChannel { - /* 8029E00C */ void setFilterMode(u16); - /* 8029E044 */ void setIIRFilterParam(s16*); - /* 8029E06C */ void setFIR8FilterParam(s16*); - /* 8029E094 */ void setDistFilter(s16); - }; - - static u32 FILTER_MODE_IIR; -}; - struct JASTrack { struct TChannelMgr { /* 802930DC */ TChannelMgr(JASTrack*); @@ -158,12 +157,12 @@ template struct JASMemPool_MultiThreaded {}; /* JASMemPool_MultiThreaded */ struct JASMemPool_MultiThreaded__template0 { - /* 802932E0 */ void func_802932E0(); + /* 802932E0 */ void func_802932E0(void* _this); }; /* JASMemPool_MultiThreaded */ struct JASMemPool_MultiThreaded__template1 { - /* 80293334 */ void func_80293334(); + /* 80293334 */ void func_80293334(void* _this); }; struct JASGenericMemPool { @@ -175,7 +174,6 @@ struct JASGenericMemPool { struct JASDriver { /* 8029C9E8 */ void getDacRate(); - /* 8029C9F0 */ void getSubFrames(); /* 8029E274 */ void registerSubFrameCallback(s32 (*)(void*), void*); }; @@ -187,7 +185,7 @@ template struct JASBankTable {}; /* JASBankTable<256> */ struct JASBankTable__template0 { - /* 80293528 */ void func_80293528(u32) /* const */; + /* 80293528 */ void func_80293528(void* _this, u32) /* const */; }; struct JASBank { @@ -260,12 +258,12 @@ extern "C" void releaseAll__Q28JASTrack11TChannelMgrFv(); extern "C" void noteOff__Q28JASTrack11TChannelMgrFUlUs(); extern "C" void setPauseFlag__Q28JASTrack11TChannelMgrFb(); extern "C" void __ct__Q28JASTrack10MoveParam_Fv(); -extern "C" void func_802932E0(); -extern "C" void func_80293334(); +extern "C" void func_802932E0(void* _this); +extern "C" void func_80293334(void* _this); extern "C" void __sinit_JASTrack_cpp(); extern "C" void __dt__Q28JASTrack5TListFv(); extern "C" void __dt__19JASDefaultBankTableFv(); -extern "C" void func_80293528(u32); +extern "C" void func_80293528(void* _this, u32); extern "C" u8 const sAdsTable__8JASTrack[24]; extern "C" u8 const sEnvOsc__8JASTrack[24]; extern "C" u8 const sPitchEnvOsc__8JASTrack[24]; @@ -414,14 +412,14 @@ SECTION_RODATA u8 const JASTrack::sAdsTable[24] = { 0x00, 0x00, 0x00, 0x00, 0x7F, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x7F, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0E, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8039AFD0, &JASTrack::sAdsTable); +COMPILER_STRIP_GATE(0x8039AFD0, &JASTrack::sAdsTable); /* 8039AFE8-8039B000 027648 0018+00 1/2 0/0 0/0 .rodata sEnvOsc__8JASTrack */ SECTION_RODATA u8 const JASTrack::sEnvOsc[24] = { 0x00, 0x00, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8039AFE8, &JASTrack::sEnvOsc); +COMPILER_STRIP_GATE(0x8039AFE8, &JASTrack::sEnvOsc); /* 8039B000-8039B018 027660 0018+00 0/1 0/0 0/0 .rodata sPitchEnvOsc__8JASTrack */ #pragma push @@ -430,7 +428,7 @@ SECTION_RODATA u8 const JASTrack::sPitchEnvOsc[24] = { 0x00, 0x00, 0x00, 0x01, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8039B000, &JASTrack::sPitchEnvOsc); +COMPILER_STRIP_GATE(0x8039B000, &JASTrack::sPitchEnvOsc); #pragma pop /* 804555A4-804555A8 003BA4 0004+00 9/9 0/0 0/0 .sdata2 @679 */ @@ -1065,7 +1063,7 @@ asm JASTrack::MoveParam_::MoveParam_() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_802932E0() { +extern "C" asm void func_802932E0(void* _this) { nofralloc #include "asm/JSystem/JAudio2/JASTrack/func_802932E0.s" } @@ -1076,7 +1074,7 @@ extern "C" asm void func_802932E0() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80293334() { +extern "C" asm void func_80293334(void* _this) { nofralloc #include "asm/JSystem/JAudio2/JASTrack/func_80293334.s" } @@ -1118,7 +1116,7 @@ asm void __sinit_JASTrack_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80293388 = (void*)__sinit_JASTrack_cpp; +REGISTER_CTORS(0x80293388, __sinit_JASTrack_cpp); #pragma pop /* 8029345C-802934B4 28DD9C 0058+00 1/1 0/0 0/0 .text __dt__Q28JASTrack5TListFv */ @@ -1145,7 +1143,7 @@ asm JASDefaultBankTable::~JASDefaultBankTable() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80293528(u32 param_0) /* const */ { +extern "C" asm void func_80293528(void* _this, u32 param_0) /* const */ { nofralloc #include "asm/JSystem/JAudio2/JASTrack/func_80293528.s" } diff --git a/libs/JSystem/JAudio2/JASVoiceBank.cpp b/libs/JSystem/JAudio2/JASVoiceBank.cpp index f55b040a6ed..a4643ea4414 100644 --- a/libs/JSystem/JAudio2/JASVoiceBank.cpp +++ b/libs/JSystem/JAudio2/JASVoiceBank.cpp @@ -49,7 +49,7 @@ SECTION_RODATA u8 const JASVoiceBank::sOscData[24] = { 0x00, 0x00, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8039B1B8, &JASVoiceBank::sOscData); +COMPILER_STRIP_GATE(0x8039B1B8, &JASVoiceBank::sOscData); /* 80451268-80451270 000768 0004+04 1/1 0/0 0/0 .sbss sOscTable__12JASVoiceBank */ u8 JASVoiceBank::sOscTable[4 + 4 /* padding */]; diff --git a/libs/JSystem/JAudio2/JASWSParser.cpp b/libs/JSystem/JAudio2/JASWSParser.cpp index 5a5f37d39c0..d04668fcd38 100644 --- a/libs/JSystem/JAudio2/JASWSParser.cpp +++ b/libs/JSystem/JAudio2/JASWSParser.cpp @@ -58,13 +58,13 @@ extern "C" void getGroupCount__11JASWSParserFPCv(); extern "C" void createWaveBank__11JASWSParserFPCvP7JKRHeap(); extern "C" void createBasicWaveBank__11JASWSParserFPCvP7JKRHeap(); extern "C" void createSimpleWaveBank__11JASWSParserFPCvP7JKRHeap(); -extern "C" void func_80299490(void const*, u32); -extern "C" void func_802994A8(void const*, u32); -extern "C" void func_802994C0(void const*, u32); -extern "C" void func_802994D8(void const*, u32); -extern "C" void func_802994F0(void const*, u32); -extern "C" void func_80299508(void const*, u32); -extern "C" void func_80299520(void const*, u32); +extern "C" void func_80299490(void* _this, void const*, u32); +extern "C" void func_802994A8(void* _this, void const*, u32); +extern "C" void func_802994C0(void* _this, void const*, u32); +extern "C" void func_802994D8(void* _this, void const*, u32); +extern "C" void func_802994F0(void* _this, void const*, u32); +extern "C" void func_80299508(void* _this, void const*, u32); +extern "C" void func_80299520(void* _this, void const*, u32); extern "C" u8 sUsedHeapSize__11JASWSParser[4 + 4 /* padding */]; // @@ -147,7 +147,7 @@ asm void JASWSParser::createSimpleWaveBank(void const* param_0, JKRHeap* param_1 #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80299490(void const* param_0, u32 param_1) { +extern "C" asm void func_80299490(void* _this, void const* param_0, u32 param_1) { nofralloc #include "asm/JSystem/JAudio2/JASWSParser/func_80299490.s" } @@ -158,7 +158,7 @@ extern "C" asm void func_80299490(void const* param_0, u32 param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_802994A8(void const* param_0, u32 param_1) { +extern "C" asm void func_802994A8(void* _this, void const* param_0, u32 param_1) { nofralloc #include "asm/JSystem/JAudio2/JASWSParser/func_802994A8.s" } @@ -169,7 +169,7 @@ extern "C" asm void func_802994A8(void const* param_0, u32 param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_802994C0(void const* param_0, u32 param_1) { +extern "C" asm void func_802994C0(void* _this, void const* param_0, u32 param_1) { nofralloc #include "asm/JSystem/JAudio2/JASWSParser/func_802994C0.s" } @@ -180,7 +180,7 @@ extern "C" asm void func_802994C0(void const* param_0, u32 param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_802994D8(void const* param_0, u32 param_1) { +extern "C" asm void func_802994D8(void* _this, void const* param_0, u32 param_1) { nofralloc #include "asm/JSystem/JAudio2/JASWSParser/func_802994D8.s" } @@ -191,7 +191,7 @@ extern "C" asm void func_802994D8(void const* param_0, u32 param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_802994F0(void const* param_0, u32 param_1) { +extern "C" asm void func_802994F0(void* _this, void const* param_0, u32 param_1) { nofralloc #include "asm/JSystem/JAudio2/JASWSParser/func_802994F0.s" } @@ -202,7 +202,7 @@ extern "C" asm void func_802994F0(void const* param_0, u32 param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80299508(void const* param_0, u32 param_1) { +extern "C" asm void func_80299508(void* _this, void const* param_0, u32 param_1) { nofralloc #include "asm/JSystem/JAudio2/JASWSParser/func_80299508.s" } @@ -213,7 +213,7 @@ extern "C" asm void func_80299508(void const* param_0, u32 param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80299520(void const* param_0, u32 param_1) { +extern "C" asm void func_80299520(void* _this, void const* param_0, u32 param_1) { nofralloc #include "asm/JSystem/JAudio2/JASWSParser/func_80299520.s" } diff --git a/libs/JSystem/JAudio2/JASWaveArcLoader.cpp b/libs/JSystem/JAudio2/JASWaveArcLoader.cpp index 3eca957f564..135315119ea 100644 --- a/libs/JSystem/JAudio2/JASWaveArcLoader.cpp +++ b/libs/JSystem/JAudio2/JASWaveArcLoader.cpp @@ -70,14 +70,9 @@ struct JASTaskThread { }; struct JASKernel { - /* 80290AC0 */ void getSystemHeap(); /* 80290B08 */ void getAramHeap(); }; -struct JASDvd { - /* 8028FEFC */ void getThreadPointer(); -}; - // // Forward References: // diff --git a/libs/JSystem/JAudio2/JAUInitializer.cpp b/libs/JSystem/JAudio2/JAUInitializer.cpp index e10b2d7bda2..1b9dc4bca18 100644 --- a/libs/JSystem/JAudio2/JAUInitializer.cpp +++ b/libs/JSystem/JAudio2/JAUInitializer.cpp @@ -47,34 +47,34 @@ template struct JASMemPool_MultiThreaded {}; /* JASMemPool_MultiThreaded */ struct JASMemPool_MultiThreaded__template0 { - /* 802932E0 */ void func_802932E0(); + /* 802932E0 */ void func_802932E0(void* _this); }; /* JASMemPool_MultiThreaded */ struct JASMemPool_MultiThreaded__template1 { - /* 80293334 */ void func_80293334(); + /* 80293334 */ void func_80293334(void* _this); }; template struct JASMemPool {}; /* JASMemPool */ struct JASMemPool__template0 { - /* 8029FC34 */ void func_8029FC34(); + /* 8029FC34 */ void func_8029FC34(void* _this); }; /* JASMemPool */ struct JASMemPool__template1 { - /* 802A1268 */ void func_802A1268(); + /* 802A1268 */ void func_802A1268(void* _this); }; /* JASMemPool */ struct JASMemPool__template2 { - /* 802A1AF4 */ void func_802A1AF4(); + /* 802A1AF4 */ void func_802A1AF4(void* _this); }; /* JASMemPool */ struct JASMemPool__template3 { - /* 802A3E68 */ void func_802A3E68(); + /* 802A3E68 */ void func_802A3E68(void* _this); }; struct JASKernel { @@ -88,7 +88,6 @@ struct JASGenericMemPool { }; struct JASDvd { - /* 8028FEFC */ void getThreadPointer(); /* 8028FF04 */ void createThread(s32, int, u32); }; @@ -124,17 +123,17 @@ extern "C" void __ct__17JASGenericMemPoolFv(); extern "C" void newMemPool__17JASGenericMemPoolFUli(); extern "C" void setupRootHeap__9JASKernelFP12JKRSolidHeapUl(); extern "C" void setupAramHeap__9JASKernelFUlUl(); -extern "C" void func_802932E0(); -extern "C" void func_80293334(); +extern "C" void func_802932E0(void* _this); +extern "C" void func_80293334(void* _this); extern "C" void initSystem__13JASAramStreamFUlUl(); extern "C" void setCurrentDir__16JASWaveArcLoaderFPCc(); extern "C" void create__14JASAudioThreadFl(); extern "C" void setDSPLevel__9JASDriverFf(); extern "C" void setOutputMode__9JASDriverFUl(); -extern "C" void func_8029FC34(); -extern "C" void func_802A1268(); -extern "C" void func_802A1AF4(); -extern "C" void func_802A3E68(); +extern "C" void func_8029FC34(void* _this); +extern "C" void func_802A1268(void* _this); +extern "C" void func_802A1AF4(void* _this); +extern "C" void func_802A3E68(void* _this); extern "C" void getFreeSize__7JKRHeapFv(); extern "C" void enter__15JKRThreadSwitchFP9JKRThreadi(); extern "C" void OSDisableInterrupts(); diff --git a/libs/JSystem/JAudio2/JAUSectionHeap.cpp b/libs/JSystem/JAudio2/JAUSectionHeap.cpp index bda8767bead..35b3359a0d3 100644 --- a/libs/JSystem/JAudio2/JAUSectionHeap.cpp +++ b/libs/JSystem/JAudio2/JAUSectionHeap.cpp @@ -16,10 +16,10 @@ template struct __bitset_base {}; /* __bitset_base<8> */ struct __bitset_base__template0 { - /* 802A65D4 */ void func_802A65D4(u32, bool); - /* 802A6614 */ void func_802A6614(u32); - /* 802A6634 */ void func_802A6634(u32) /* const */; - /* 802A665C */ void func_802A665C(); + /* 802A65D4 */ void func_802A65D4(void* _this, u32, bool); + /* 802A6614 */ void func_802A6614(void* _this, u32); + /* 802A6634 */ void func_802A6634(void* _this, u32) /* const */; + /* 802A665C */ void func_802A665C(void* _this); }; }; // namespace std @@ -84,12 +84,12 @@ struct JAUSeqCollection { /* 802A66AC */ void init(void const*); }; -struct JAISoundID {}; - struct JAISeqDataUser {}; struct JAISeqData {}; +struct JAISoundID {}; + struct JAUSectionHeap { struct TSectionHeapData { /* 802A5DF4 */ TSectionHeapData(); @@ -136,7 +136,6 @@ struct JAUSection { struct JAUDynamicSeqDataBlocks { /* 802A6A58 */ JAUDynamicSeqDataBlocks(); - /* 802A6AA0 */ void setSeqDataArchive(JKRArchive*); /* 802A6AA8 */ void getSeqData(JAISoundID, JAISeqDataUser*, JAISeqData*, bool); /* 802A6B8C */ void appendDynamicSeqDataBlock(JAUSeqDataBlock*); /* 802A6C18 */ void loadDynamicSeq(JAISoundID, bool, JAISeqDataUser*); @@ -217,10 +216,10 @@ extern "C" void __dt__14JAUSectionHeapFv(); extern "C" static void func_802A6440(); extern "C" void __dt__10JAUSectionFv(); extern "C" void func_802A6574(); -extern "C" void func_802A65D4(u32, bool); -extern "C" void func_802A6614(u32); -extern "C" void func_802A6634(u32); -extern "C" void func_802A665C(); +extern "C" void func_802A65D4(void* _this, u32, bool); +extern "C" void func_802A6614(void* _this, u32); +extern "C" void func_802A6634(void* _this, u32); +extern "C" void func_802A665C(void* _this); extern "C" static void func_802A6680(); extern "C" static void func_802A6688(); extern "C" static void func_802A6690(); @@ -313,6 +312,13 @@ asm JAUSection::TSectionData::TSectionData() { } #pragma pop +/* ############################################################################################## */ +/* 8039B950-8039B950 027FB0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8039B950 = "index out of range of bitset::reset"; +#pragma pop + /* 802A4F68-802A4FE4 29F8A8 007C+00 1/1 0/0 0/0 .text * resetRegisteredBankTables__Q210JAUSection12TSectionDataFv */ #pragma push @@ -502,6 +508,16 @@ asm void JAUSection::newCopy(void const* param_0, u32 param_1, s32 param_2) { } #pragma pop +/* ############################################################################################## */ +/* 8039B950-8039B950 027FB0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8039B974 = "index out of range of bitset::test"; +SECTION_DEAD static char const* const stringBase_8039B997 = "index out of range of bitset::set"; +/* @stringBase0 padding */ +SECTION_DEAD static char const* const pad_8039B9B9 = "\0\0\0\0\0\0"; +#pragma pop + /* 802A5854-802A5948 2A0194 00F4+00 0/0 1/1 0/0 .text newWaveBank__10JAUSectionFUlPCv */ #pragma push #pragma optimization_level 0 @@ -732,7 +748,7 @@ asm void func_802A6574() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_802A65D4(u32 param_0, bool param_1) { +extern "C" asm void func_802A65D4(void* _this, u32 param_0, bool param_1) { nofralloc #include "asm/JSystem/JAudio2/JAUSectionHeap/func_802A65D4.s" } @@ -743,7 +759,7 @@ extern "C" asm void func_802A65D4(u32 param_0, bool param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_802A6614(u32 param_0) { +extern "C" asm void func_802A6614(void* _this, u32 param_0) { nofralloc #include "asm/JSystem/JAudio2/JAUSectionHeap/func_802A6614.s" } @@ -754,7 +770,7 @@ extern "C" asm void func_802A6614(u32 param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_802A6634(u32 param_0) /* const */ { +extern "C" asm void func_802A6634(void* _this, u32 param_0) /* const */ { nofralloc #include "asm/JSystem/JAudio2/JAUSectionHeap/func_802A6634.s" } @@ -778,7 +794,7 @@ SECTION_SDATA static u8 lit_2588[4 + 4 /* padding */] = { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_802A665C() { +extern "C" asm void func_802A665C(void* _this) { nofralloc #include "asm/JSystem/JAudio2/JAUSectionHeap/func_802A665C.s" } @@ -826,13 +842,4 @@ static asm void func_802A6698() { } #pragma pop -/* 8039B950-8039B9C0 027FB0 0069+07 6/6 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_8039B950 = "index out of range of bitset::reset"; -SECTION_DEAD static char const* const stringBase_8039B974 = "index out of range of bitset::test"; -SECTION_DEAD static char const* const stringBase_8039B997 = "index out of range of bitset::set"; -/* @stringBase0 padding */ -SECTION_DEAD static char const* const pad_8039B9B9 = "\0\0\0\0\0\0"; -#pragma pop +/* 8039B950-8039B950 027FB0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/libs/JSystem/JAudio2/JAUSeqCollection.cpp b/libs/JSystem/JAudio2/JAUSeqCollection.cpp index b424e8c35b9..69c7996c99d 100644 --- a/libs/JSystem/JAudio2/JAUSeqCollection.cpp +++ b/libs/JSystem/JAudio2/JAUSeqCollection.cpp @@ -11,10 +11,10 @@ // Types: // -struct JAISoundID {}; - struct JAISeqDataUser {}; +struct JAISoundID {}; + struct JAISeqData {}; struct JAUSeqDataMgr_SeqCollection { diff --git a/libs/JSystem/JAudio2/JAUSeqDataBlockMgr.cpp b/libs/JSystem/JAudio2/JAUSeqDataBlockMgr.cpp index badbc54953c..e4bc9afa10a 100644 --- a/libs/JSystem/JAudio2/JAUSeqDataBlockMgr.cpp +++ b/libs/JSystem/JAudio2/JAUSeqDataBlockMgr.cpp @@ -181,16 +181,11 @@ asm JAUDynamicSeqDataBlocks::JAUDynamicSeqDataBlocks() { } #pragma pop -/* 802A6AA0-802A6AA8 2A13E0 0008+00 0/0 2/2 0/0 .text +/* 802A6AA0-802A6AA8 -00001 0008+00 0/0 0/0 0/0 .text * setSeqDataArchive__23JAUDynamicSeqDataBlocksFP10JKRArchive */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void JAUDynamicSeqDataBlocks::setSeqDataArchive(JKRArchive* param_0) { - nofralloc -#include "asm/JSystem/JAudio2/JAUSeqDataBlockMgr/setSeqDataArchive__23JAUDynamicSeqDataBlocksFP10JKRArchive.s" +void JAUDynamicSeqDataBlocks::setSeqDataArchive(JKRArchive* param_0) { + *(u32*)(((u8*)this) + 36) /* this->field_0x24 */ = (u32)(param_0); } -#pragma pop /* 802A6AA8-802A6B8C 2A13E8 00E4+00 0/0 1/1 0/0 .text * getSeqData__23JAUDynamicSeqDataBlocksF10JAISoundIDP14JAISeqDataUserP10JAISeqDatab */ diff --git a/libs/JSystem/JAudio2/dsptask.cpp b/libs/JSystem/JAudio2/dsptask.cpp index ab389a4fab3..219c57a5c2c 100644 --- a/libs/JSystem/JAudio2/dsptask.cpp +++ b/libs/JSystem/JAudio2/dsptask.cpp @@ -569,7 +569,7 @@ static u8 AUDIO_YIELD_BUFFER[8192]; #pragma optimization_level 0 #pragma optimizewithasm off #pragma function_align 32 -asm void DspBoot(void (*)(void*)) { +asm void DspBoot(void (*param_0)(void*)) { nofralloc #include "asm/JSystem/JAudio2/dsptask/DspBoot__FPFPv_v.s" } @@ -580,7 +580,7 @@ asm void DspBoot(void (*)(void*)) { #pragma optimization_level 0 #pragma optimizewithasm off #pragma function_align 32 -asm void DSPSendCommands2(u32* param_0, u32 param_1, void (*)(u16)) { +asm void DSPSendCommands2(u32* param_0, u32 param_1, void (*param_2)(u16)) { nofralloc #include "asm/JSystem/JAudio2/dsptask/DSPSendCommands2__FPUlUlPFUs_v.s" } @@ -613,7 +613,7 @@ static u8 taskwritep[4]; #pragma optimization_level 0 #pragma optimizewithasm off #pragma function_align 32 -static asm void DspStartWork(u32 param_0, void (*)(u16)) { +static asm void DspStartWork(u32 param_0, void (*param_1)(u16)) { nofralloc #include "asm/JSystem/JAudio2/dsptask/DspStartWork__FUlPFUs_v.s" } diff --git a/libs/JSystem/JAudio2/osdsp.cpp b/libs/JSystem/JAudio2/osdsp.cpp index 4f1c8d7e594..8b76ebf922c 100644 --- a/libs/JSystem/JAudio2/osdsp.cpp +++ b/libs/JSystem/JAudio2/osdsp.cpp @@ -68,7 +68,7 @@ SECTION_RODATA static u8 const lit_81[26 + 2 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(8039B8B8, &lit_81); +COMPILER_STRIP_GATE(0x8039B8B8, &lit_81); /* 8029EA00-8029EA84 299340 0084+00 0/0 1/1 0/0 .text DSPAddTask */ #pragma push @@ -122,7 +122,7 @@ SECTION_RODATA static u8 const lit_88[31 + 5 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(8039B8D4, &lit_88); +COMPILER_STRIP_GATE(0x8039B8D4, &lit_88); /* 8029EAA0-8029EB1C 2993E0 007C+00 0/0 1/1 0/0 .text DSPAddPriorTask__FP15STRUCT_DSP_TASK */ #pragma push diff --git a/libs/JSystem/JFramework/JFWDisplay.cpp b/libs/JSystem/JFramework/JFWDisplay.cpp index a71b860f21a..773f42b682d 100644 --- a/libs/JSystem/JFramework/JFWDisplay.cpp +++ b/libs/JSystem/JFramework/JFWDisplay.cpp @@ -93,7 +93,7 @@ template struct JSUList {}; /* JSUList */ struct JSUList__template0 { - /* 80273724 */ void func_80273724(); + /* 80273724 */ void func_80273724(void* _this); }; struct JFWDisplay { @@ -163,7 +163,7 @@ extern "C" static void JFWDrawDoneAlarm__Fv(); extern "C" static void JFWGXAbortAlarmHandler__FP7OSAlarmP9OSContext(); extern "C" static void diagnoseGpHang__Fv(); extern "C" void __sinit_JFWDisplay_cpp(); -extern "C" void func_80273724(); +extern "C" void func_80273724(void* _this); extern "C" extern char const* const JFWDisplay__stringBase0; extern "C" u8 sList__8JFWAlarm[12]; extern "C" u8 sManager__10JFWDisplay[4]; @@ -721,6 +721,20 @@ static asm void JFWGXAbortAlarmHandler(OSAlarm* param_0, OSContext* param_1) { } #pragma pop +/* ############################################################################################## */ +/* 8039A878-8039A878 026ED8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8039A878 = "GP status %d%d%d%d%d%d --> "; +SECTION_DEAD static char const* const stringBase_8039A894 = "GP hang due to XF stall bug.\n"; +SECTION_DEAD static char const* const stringBase_8039A8B2 = + "GP hang due to unterminated primitive.\n"; +SECTION_DEAD static char const* const stringBase_8039A8DA = "GP hang due to illegal instruction.\n"; +SECTION_DEAD static char const* const stringBase_8039A8FF = + "GP appears to be not hung (waiting for input).\n"; +SECTION_DEAD static char const* const stringBase_8039A92F = "GP is in unknown state.\n"; +#pragma pop + /* 802734FC-802736DC 26DE3C 01E0+00 1/1 0/0 0/0 .text diagnoseGpHang__Fv */ #pragma push #pragma optimization_level 0 @@ -743,29 +757,17 @@ asm void __sinit_JFWDisplay_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_802736DC = (void*)__sinit_JFWDisplay_cpp; +REGISTER_CTORS(0x802736DC, __sinit_JFWDisplay_cpp); #pragma pop /* 80273724-80273778 26E064 0054+00 1/1 0/0 0/0 .text __dt__18JSUList<8JFWAlarm>Fv */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80273724() { +extern "C" asm void func_80273724(void* _this) { nofralloc #include "asm/JSystem/JFramework/JFWDisplay/func_80273724.s" } #pragma pop -/* 8039A878-8039A948 026ED8 00D0+00 1/1 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_8039A878 = "GP status %d%d%d%d%d%d --> "; -SECTION_DEAD static char const* const stringBase_8039A894 = "GP hang due to XF stall bug.\n"; -SECTION_DEAD static char const* const stringBase_8039A8B2 = - "GP hang due to unterminated primitive.\n"; -SECTION_DEAD static char const* const stringBase_8039A8DA = "GP hang due to illegal instruction.\n"; -SECTION_DEAD static char const* const stringBase_8039A8FF = - "GP appears to be not hung (waiting for input).\n"; -SECTION_DEAD static char const* const stringBase_8039A92F = "GP is in unknown state.\n"; -#pragma pop +/* 8039A878-8039A878 026ED8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/libs/JSystem/JGadget/std-vector.cpp b/libs/JSystem/JGadget/std-vector.cpp index 111e8a3ee03..e8094cce034 100644 --- a/libs/JSystem/JGadget/std-vector.cpp +++ b/libs/JSystem/JGadget/std-vector.cpp @@ -32,9 +32,9 @@ template struct TVector {}; /* TVector> */ struct TVector__template0 { - /* 802DD130 */ void func_802DD130(void**, void* const&); - /* 802DCE1C */ void func_802DCE1C(void**, u32, void* const&); - /* 802DCE8C */ void func_802DCE8C(void**, u32); + /* 802DD130 */ void func_802DD130(void* _this, void**, void* const&); + /* 802DCE1C */ void func_802DCE1C(void* _this, void**, u32, void* const&); + /* 802DCE8C */ void func_802DCE8C(void* _this, void**, u32); }; }; // namespace JGadget @@ -48,9 +48,9 @@ extern "C" void func_802DCCD0(); extern "C" void __dt__Q27JGadget20TVector_pointer_voidFv(); extern "C" void insert__Q27JGadget20TVector_pointer_voidFPPvRCPv(); extern "C" void erase__Q27JGadget20TVector_pointer_voidFPPvPPv(); -extern "C" void func_802DCE1C(void**, u32, void* const&); -extern "C" void func_802DCE8C(void**, u32); -extern "C" void func_802DD130(void**, void* const&); +extern "C" void func_802DCE1C(void* _this, void**, u32, void* const&); +extern "C" void func_802DCE8C(void* _this, void**, u32); +extern "C" void func_802DD130(void* _this, void**, void* const&); // // External References: @@ -125,7 +125,7 @@ asm void JGadget::TVector_pointer_void::erase(void** param_0, void** param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_802DCE1C(void** param_0, u32 param_1, void* const& param_2) { +extern "C" asm void func_802DCE1C(void* _this, void** param_0, u32 param_1, void* const& param_2) { nofralloc #include "asm/JSystem/JGadget/std-vector/func_802DCE1C.s" } @@ -136,7 +136,7 @@ extern "C" asm void func_802DCE1C(void** param_0, u32 param_1, void* const& para #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_802DCE8C(void** param_0, u32 param_1) { +extern "C" asm void func_802DCE8C(void* _this, void** param_0, u32 param_1) { nofralloc #include "asm/JSystem/JGadget/std-vector/func_802DCE8C.s" } @@ -147,7 +147,7 @@ extern "C" asm void func_802DCE8C(void** param_0, u32 param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_802DD130(void** param_0, void* const& param_1) { +extern "C" asm void func_802DD130(void* _this, void** param_0, void* const& param_1) { nofralloc #include "asm/JSystem/JGadget/std-vector/func_802DD130.s" } diff --git a/libs/JSystem/JKernel/JKRAram.cpp b/libs/JSystem/JKernel/JKRAram.cpp index 8015323ef75..242a92c2ae9 100644 --- a/libs/JSystem/JKernel/JKRAram.cpp +++ b/libs/JSystem/JKernel/JKRAram.cpp @@ -24,7 +24,7 @@ template struct JSUList {}; /* JSUList */ struct JSUList__template5 { - /* 802D2DF0 */ void func_802D2DF0(); + /* 802D2DF0 */ void func_802D2DF0(void* _this); }; struct JKRThread { @@ -53,10 +53,10 @@ struct JKRAramStream { /* 802D3B48 */ void create(s32); }; -struct JKRAramBlock {}; - struct JKRAMCommand {}; +struct JKRAramBlock {}; + struct JKRAramPiece { /* 802D3838 */ void orderSync(int, u32, u32, u32, JKRAramBlock*); /* 802D38CC */ void startDMA(JKRAMCommand*); @@ -103,7 +103,7 @@ extern "C" static void decompSZS_subroutine__FPUcPUc(); extern "C" static void firstSrcData__Fv(); extern "C" static void nextSrcData__FPUc(); extern "C" void __sinit_JKRAram_cpp(); -extern "C" void func_802D2DF0(); +extern "C" void func_802D2DF0(void* _this); extern "C" extern char const* const JKRAram__stringBase0; extern "C" u8 sMessageBuffer__7JKRAram[16]; extern "C" u8 sMessageQueue__7JKRAram[32]; @@ -231,6 +231,15 @@ asm void JKRAram::run() { } #pragma pop +/* ############################################################################################## */ +/* 8039D078-8039D078 0296D8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8039D078 = "JKRAram.cpp"; +SECTION_DEAD static char const* const stringBase_8039D084 = "%s"; +SECTION_DEAD static char const* const stringBase_8039D087 = ":::address not 32Byte aligned."; +#pragma pop + /* 802D2248-802D22DC 2CCB88 0094+00 2/2 0/0 0/0 .text * checkOkAddress__7JKRAramFPUcUlP12JKRAramBlockUl */ #pragma push @@ -393,7 +402,7 @@ asm void __sinit_JKRAram_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_802D2DAC = (void*)__sinit_JKRAram_cpp; +REGISTER_CTORS(0x802D2DAC, __sinit_JKRAram_cpp); #pragma pop /* 802D2DF0-802D2E44 2CD730 0054+00 1/1 1/1 0/0 .text __dt__23JSUList<12JKRAMCommand>Fv @@ -401,20 +410,19 @@ SECTION_CTORS void* const _ctors_802D2DAC = (void*)__sinit_JKRAram_cpp; #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_802D2DF0() { +extern "C" asm void func_802D2DF0(void* _this) { nofralloc #include "asm/JSystem/JKernel/JKRAram/func_802D2DF0.s" } #pragma pop -/* 8039D078-8039D0B8 0296D8 003C+04 1/1 0/0 0/0 .rodata @stringBase0 */ +/* ############################################################################################## */ +/* 8039D0A6-8039D0B8 029706 000E+04 0/0 0/0 0/0 .rodata None */ #pragma push #pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_8039D078 = "JKRAram.cpp"; -SECTION_DEAD static char const* const stringBase_8039D084 = "%s"; -SECTION_DEAD static char const* const stringBase_8039D087 = ":::address not 32Byte aligned."; SECTION_DEAD static char const* const stringBase_8039D0A6 = "bad aramSync\n"; /* @stringBase0 padding */ SECTION_DEAD static char const* const pad_8039D0B4 = "\0\0\0"; #pragma pop + +/* 8039D078-8039D078 0296D8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/libs/JSystem/JKernel/JKRAramArchive.cpp b/libs/JSystem/JKernel/JKRAramArchive.cpp index 5c8c034f8d3..bb9b580702c 100644 --- a/libs/JSystem/JKernel/JKRAramArchive.cpp +++ b/libs/JSystem/JKernel/JKRAramArchive.cpp @@ -301,6 +301,15 @@ asm void JKRAramArchive::getAramAddress(char const* param_0) { } #pragma pop +/* ############################################################################################## */ +/* 8039D188-8039D188 0297E8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8039D188 = "JKRAramArchive.cpp"; +SECTION_DEAD static char const* const stringBase_8039D19B = "%s"; +SECTION_DEAD static char const* const stringBase_8039D19E = "??? bad sequence\n"; +#pragma pop + /* 802D7858-802D7914 2D2198 00BC+00 1/1 1/1 0/0 .text * fetchResource_subroutine__14JKRAramArchiveFUlUlPUcUli */ #pragma push @@ -345,11 +354,4 @@ asm JKRFile::~JKRFile() { } #pragma pop -/* 8039D188-8039D1B0 0297E8 0028+00 2/2 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_8039D188 = "JKRAramArchive.cpp"; -SECTION_DEAD static char const* const stringBase_8039D19B = "%s"; -SECTION_DEAD static char const* const stringBase_8039D19E = "??? bad sequence\n"; -#pragma pop +/* 8039D188-8039D188 0297E8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/libs/JSystem/JKernel/JKRAramHeap.cpp b/libs/JSystem/JKernel/JKRAramHeap.cpp index 3270dd56b9e..7c6e7b05247 100644 --- a/libs/JSystem/JKernel/JKRAramHeap.cpp +++ b/libs/JSystem/JKernel/JKRAramHeap.cpp @@ -23,7 +23,7 @@ template struct JSUList {}; /* JSUList */ struct JSUList__template6 { - /* 802D32B0 */ void func_802D32B0(); + /* 802D32B0 */ void func_802D32B0(void* _this); }; struct JKRHeap { @@ -69,7 +69,7 @@ extern "C" void getFreeSize__11JKRAramHeapFv(); extern "C" void getTotalFreeSize__11JKRAramHeapFv(); extern "C" void dump__11JKRAramHeapFv(); extern "C" void __sinit_JKRAramHeap_cpp(); -extern "C" void func_802D32B0(); +extern "C" void func_802D32B0(void* _this); extern "C" u8 sAramList__11JKRAramHeap[12]; // @@ -208,7 +208,7 @@ asm void __sinit_JKRAramHeap_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_802D326C = (void*)__sinit_JKRAramHeap_cpp; +REGISTER_CTORS(0x802D326C, __sinit_JKRAramHeap_cpp); #pragma pop /* 802D32B0-802D3304 2CDBF0 0054+00 1/1 0/0 0/0 .text __dt__23JSUList<12JKRAramBlock>Fv @@ -216,7 +216,7 @@ SECTION_CTORS void* const _ctors_802D326C = (void*)__sinit_JKRAramHeap_cpp; #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_802D32B0() { +extern "C" asm void func_802D32B0(void* _this) { nofralloc #include "asm/JSystem/JKernel/JKRAramHeap/func_802D32B0.s" } diff --git a/libs/JSystem/JKernel/JKRAramPiece.cpp b/libs/JSystem/JKernel/JKRAramPiece.cpp index 71d0bbd9b06..65b8d894453 100644 --- a/libs/JSystem/JKernel/JKRAramPiece.cpp +++ b/libs/JSystem/JKernel/JKRAramPiece.cpp @@ -30,7 +30,7 @@ template struct JSUList {}; /* JSUList */ struct JSUList__template5 { - /* 802D2DF0 */ void func_802D2DF0(); + /* 802D2DF0 */ void func_802D2DF0(void* _this); }; struct JKRHeap { @@ -45,13 +45,13 @@ struct JKRDecomp { /* 802DB8D0 */ void sendCommand(JKRDecompCommand*); }; -struct JKRAramBlock {}; - struct JKRAMCommand { /* 802D39EC */ JKRAMCommand(); /* 802D3A5C */ ~JKRAMCommand(); }; +struct JKRAramBlock {}; + struct JKRAramPiece { /* 802D3574 */ void prepareCommand(int, u32, u32, u32, JKRAramBlock*, void (*)(u32)); /* 802D35F4 */ void sendCommand(JKRAMCommand*); @@ -95,7 +95,7 @@ extern "C" void OSReport(); extern "C" void free__7JKRHeapFPvP7JKRHeap(); extern "C" void* __nw__FUlP7JKRHeapi(); extern "C" void __dl__FPv(); -extern "C" void func_802D2DF0(); +extern "C" void func_802D2DF0(void* _this); extern "C" void sendCommand__9JKRDecompFP16JKRDecompCommand(); extern "C" void __ct__10JSUPtrLinkFPv(); extern "C" void __dt__10JSUPtrLinkFv(); @@ -131,7 +131,7 @@ extern "C" u8 sSystemHeap__7JKRHeap[4]; #pragma optimization_level 0 #pragma optimizewithasm off asm void JKRAramPiece::prepareCommand(int param_0, u32 param_1, u32 param_2, u32 param_3, - JKRAramBlock* param_4, void (*)(u32)) { + JKRAramBlock* param_4, void (*param_5)(u32)) { nofralloc #include "asm/JSystem/JKernel/JKRAramPiece/prepareCommand__12JKRAramPieceFiUlUlUlP12JKRAramBlockPFUl_v.s" } @@ -149,6 +149,18 @@ asm void JKRAramPiece::sendCommand(JKRAMCommand* param_0) { #pragma pop /* ############################################################################################## */ +/* 8039D0B8-8039D0B8 029718 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8039D0B8 = "direction = %x\n"; +SECTION_DEAD static char const* const stringBase_8039D0C8 = "source = %x\n"; +SECTION_DEAD static char const* const stringBase_8039D0D5 = "destination = %x\n"; +SECTION_DEAD static char const* const stringBase_8039D0E7 = "length = %x\n"; +SECTION_DEAD static char const* const stringBase_8039D0F4 = "JKRAramPiece.cpp"; +SECTION_DEAD static char const* const stringBase_8039D105 = "%s"; +SECTION_DEAD static char const* const stringBase_8039D108 = "illegal address. abort."; +#pragma pop + /* 80434318-80434324 061038 000C+00 1/1 0/0 0/0 .bss @492 */ static u8 lit_492[12]; @@ -164,7 +176,7 @@ u8 JKRAramPiece::mMutex[24]; #pragma optimization_level 0 #pragma optimizewithasm off asm void JKRAramPiece::orderAsync(int param_0, u32 param_1, u32 param_2, u32 param_3, - JKRAramBlock* param_4, void (*)(u32)) { + JKRAramBlock* param_4, void (*param_5)(u32)) { nofralloc #include "asm/JSystem/JKernel/JKRAramPiece/orderAsync__12JKRAramPieceFiUlUlUlP12JKRAramBlockPFUl_v.s" } @@ -244,18 +256,7 @@ asm void __sinit_JKRAramPiece_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_802D3B04 = (void*)__sinit_JKRAramPiece_cpp; +REGISTER_CTORS(0x802D3B04, __sinit_JKRAramPiece_cpp); #pragma pop -/* 8039D0B8-8039D120 029718 0068+00 1/1 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_8039D0B8 = "direction = %x\n"; -SECTION_DEAD static char const* const stringBase_8039D0C8 = "source = %x\n"; -SECTION_DEAD static char const* const stringBase_8039D0D5 = "destination = %x\n"; -SECTION_DEAD static char const* const stringBase_8039D0E7 = "length = %x\n"; -SECTION_DEAD static char const* const stringBase_8039D0F4 = "JKRAramPiece.cpp"; -SECTION_DEAD static char const* const stringBase_8039D105 = "%s"; -SECTION_DEAD static char const* const stringBase_8039D108 = "illegal address. abort."; -#pragma pop +/* 8039D0B8-8039D0B8 029718 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/libs/JSystem/JKernel/JKRAramStream.cpp b/libs/JSystem/JKernel/JKRAramStream.cpp index 57a76a8ee66..f87b8cbec1d 100644 --- a/libs/JSystem/JKernel/JKRAramStream.cpp +++ b/libs/JSystem/JKernel/JKRAramStream.cpp @@ -194,6 +194,17 @@ bool JKRAramStream::readFromAram() { return true; } +/* ############################################################################################## */ +/* 8039D120-8039D120 029780 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8039D120 = "JKRAramStream.cpp"; +SECTION_DEAD static char const* const stringBase_8039D132 = "%s"; +SECTION_DEAD static char const* const stringBase_8039D135 = ":::Cannot alloc memory\n"; +/* @stringBase0 padding */ +SECTION_DEAD static char const* const pad_8039D14D = "\0\0"; +#pragma pop + /* 802D3CE0-802D3ED0 2CE620 01F0+00 1/1 0/0 0/0 .text * writeToAram__13JKRAramStreamFP20JKRAramStreamCommand */ #pragma push @@ -269,13 +280,4 @@ asm void JSURandomInputStream::getAvailable() const { } #pragma pop -/* 8039D120-8039D150 029780 002D+03 1/1 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_8039D120 = "JKRAramStream.cpp"; -SECTION_DEAD static char const* const stringBase_8039D132 = "%s"; -SECTION_DEAD static char const* const stringBase_8039D135 = ":::Cannot alloc memory\n"; -/* @stringBase0 padding */ -SECTION_DEAD static char const* const pad_8039D14D = "\0\0"; -#pragma pop +/* 8039D120-8039D120 029780 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/libs/JSystem/JKernel/JKRCompArchive.cpp b/libs/JSystem/JKernel/JKRCompArchive.cpp index 58c32d193d2..3eee7883f45 100644 --- a/libs/JSystem/JKernel/JKRCompArchive.cpp +++ b/libs/JSystem/JKernel/JKRCompArchive.cpp @@ -262,6 +262,15 @@ asm void JKRCompArchive::fetchResource(JKRArchive::SDIFileEntry* param_0, u32* p } #pragma pop +/* ############################################################################################## */ +/* 8039D220-8039D220 029880 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8039D220 = "JKRCompArchive.cpp"; +SECTION_DEAD static char const* const stringBase_8039D233 = "%s"; +SECTION_DEAD static char const* const stringBase_8039D236 = "illegal archive."; +#pragma pop + /* 802D90C0-802D9260 2D3A00 01A0+00 1/0 0/0 0/0 .text * fetchResource__14JKRCompArchiveFPvUlPQ210JKRArchive12SDIFileEntryPUl */ #pragma push @@ -295,6 +304,15 @@ asm void JKRCompArchive::removeResource(void* param_0) { } #pragma pop +/* ############################################################################################## */ +/* 8039D220-8039D220 029880 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8039D247 = "illegal resource."; +/* @stringBase0 padding */ +SECTION_DEAD static char const* const pad_8039D259 = "\0\0\0\0\0\0"; +#pragma pop + /* 802D9360-802D9518 2D3CA0 01B8+00 1/0 0/0 0/0 .text getExpandedResSize__14JKRCompArchiveCFPCv */ #pragma push #pragma optimization_level 0 @@ -305,14 +323,4 @@ asm void JKRCompArchive::getExpandedResSize(void const* param_0) const { } #pragma pop -/* 8039D220-8039D260 029880 0039+07 2/2 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_8039D220 = "JKRCompArchive.cpp"; -SECTION_DEAD static char const* const stringBase_8039D233 = "%s"; -SECTION_DEAD static char const* const stringBase_8039D236 = "illegal archive."; -SECTION_DEAD static char const* const stringBase_8039D247 = "illegal resource."; -/* @stringBase0 padding */ -SECTION_DEAD static char const* const pad_8039D259 = "\0\0\0\0\0\0"; -#pragma pop +/* 8039D220-8039D220 029880 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/libs/JSystem/JKernel/JKRDecomp.cpp b/libs/JSystem/JKernel/JKRDecomp.cpp index 1ff6d6ed397..31c6a77b4ef 100644 --- a/libs/JSystem/JKernel/JKRDecomp.cpp +++ b/libs/JSystem/JKernel/JKRDecomp.cpp @@ -168,7 +168,7 @@ asm void JKRDecomp::run() { #pragma optimization_level 0 #pragma optimizewithasm off asm void JKRDecomp::prepareCommand(u8* param_0, u8* param_1, u32 param_2, u32 param_3, - void (*)(u32)) { + void (*param_4)(u32)) { nofralloc #include "asm/JSystem/JKernel/JKRDecomp/prepareCommand__9JKRDecompFPUcPUcUlUlPFUl_v.s" } @@ -189,7 +189,8 @@ asm void JKRDecomp::sendCommand(JKRDecompCommand* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void JKRDecomp::orderAsync(u8* param_0, u8* param_1, u32 param_2, u32 param_3, void (*)(u32)) { +asm void JKRDecomp::orderAsync(u8* param_0, u8* param_1, u32 param_2, u32 param_3, + void (*param_4)(u32)) { nofralloc #include "asm/JSystem/JKernel/JKRDecomp/orderAsync__9JKRDecompFPUcPUcUlUlPFUl_v.s" } diff --git a/libs/JSystem/JKernel/JKRDvdAramRipper.cpp b/libs/JSystem/JKernel/JKRDvdAramRipper.cpp index 81f1fecdec0..c6d302630b0 100644 --- a/libs/JSystem/JKernel/JKRDvdAramRipper.cpp +++ b/libs/JSystem/JKernel/JKRDvdAramRipper.cpp @@ -27,7 +27,7 @@ template struct JSUList {}; /* JSUList */ struct JSUList__template10 { - /* 802DB62C */ void func_802DB62C(); + /* 802DB62C */ void func_802DB62C(void* _this); }; struct JSUInputStream { @@ -119,7 +119,7 @@ extern "C" static void firstSrcData__Fv(); extern "C" static void nextSrcData__FPUc(); extern "C" static void dmaBufferFlush__FUl(); extern "C" void __sinit_JKRDvdAramRipper_cpp(); -extern "C" void func_802DB62C(); +extern "C" void func_802DB62C(void* _this); extern "C" u8 sDvdAramAsyncList__16JKRDvdAramRipper[12]; extern "C" u32 sSZSBufferSize__16JKRDvdAramRipper; @@ -207,8 +207,8 @@ asm void JKRDvdAramRipper::loadToAram(JKRDvdFile* param_0, u32 param_1, JKRExpan #pragma optimization_level 0 #pragma optimizewithasm off asm void JKRDvdAramRipper::loadToAram_Async(JKRDvdFile* param_0, u32 param_1, - JKRExpandSwitch param_2, void (*)(u32), u32 param_4, - u32 param_5, u32* param_6) { + JKRExpandSwitch param_2, void (*param_3)(u32), + u32 param_4, u32 param_5, u32* param_6) { nofralloc #include "asm/JSystem/JKernel/JKRDvdAramRipper/func_802DA9C0.s" } @@ -402,7 +402,7 @@ asm void __sinit_JKRDvdAramRipper_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_802DB5E8 = (void*)__sinit_JKRDvdAramRipper_cpp; +REGISTER_CTORS(0x802DB5E8, __sinit_JKRDvdAramRipper_cpp); #pragma pop /* 802DB62C-802DB680 2D5F6C 0054+00 1/1 0/0 0/0 .text __dt__23JSUList<12JKRADCommand>Fv @@ -410,7 +410,7 @@ SECTION_CTORS void* const _ctors_802DB5E8 = (void*)__sinit_JKRDvdAramRipper_cpp; #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_802DB62C() { +extern "C" asm void func_802DB62C(void* _this) { nofralloc #include "asm/JSystem/JKernel/JKRDvdAramRipper/func_802DB62C.s" } diff --git a/libs/JSystem/JKernel/JKRDvdArchive.cpp b/libs/JSystem/JKernel/JKRDvdArchive.cpp index b60e7654e0e..71d50e95851 100644 --- a/libs/JSystem/JKernel/JKRDvdArchive.cpp +++ b/libs/JSystem/JKernel/JKRDvdArchive.cpp @@ -234,6 +234,16 @@ asm void JKRDvdArchive::fetchResource(void* param_0, u32 param_1, JKRArchive::SD } #pragma pop +/* ############################################################################################## */ +/* 8039D1B0-8039D1B0 029810 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8039D1B0 = "JKRDvdArchive.cpp"; +SECTION_DEAD static char const* const stringBase_8039D1C2 = "%s"; +SECTION_DEAD static char const* const stringBase_8039D1C5 = "Sorry, not applied for SZP archive.\n"; +SECTION_DEAD static char const* const stringBase_8039D1EA = "??? bad sequence\n"; +#pragma pop + /* 802D826C-802D8474 2D2BAC 0208+00 1/1 1/1 0/0 .text * fetchResource_subroutine__13JKRDvdArchiveFlUlUlPUcUlii */ #pragma push @@ -246,6 +256,15 @@ asm void JKRDvdArchive::fetchResource_subroutine(s32 param_0, u32 param_1, u32 p } #pragma pop +/* ############################################################################################## */ +/* 8039D1B0-8039D1B0 029810 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8039D1FC = "Sorry, not applied SZP archive.\n"; +/* @stringBase0 padding */ +SECTION_DEAD static char const* const pad_8039D21D = "\0\0"; +#pragma pop + /* 802D8474-802D8698 2D2DB4 0224+00 1/1 1/1 0/0 .text * fetchResource_subroutine__13JKRDvdArchiveFlUlUlP7JKRHeapiiPPUc */ #pragma push @@ -269,15 +288,4 @@ asm void JKRDvdArchive::getExpandedResSize(void const* param_0) const { } #pragma pop -/* 8039D1B0-8039D220 029810 006D+03 2/2 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_8039D1B0 = "JKRDvdArchive.cpp"; -SECTION_DEAD static char const* const stringBase_8039D1C2 = "%s"; -SECTION_DEAD static char const* const stringBase_8039D1C5 = "Sorry, not applied for SZP archive.\n"; -SECTION_DEAD static char const* const stringBase_8039D1EA = "??? bad sequence\n"; -SECTION_DEAD static char const* const stringBase_8039D1FC = "Sorry, not applied SZP archive.\n"; -/* @stringBase0 padding */ -SECTION_DEAD static char const* const pad_8039D21D = "\0\0"; -#pragma pop +/* 8039D1B0-8039D1B0 029810 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/libs/JSystem/JKernel/JKRDvdFile.cpp b/libs/JSystem/JKernel/JKRDvdFile.cpp index 03a3e4f5d94..71138e6a35c 100644 --- a/libs/JSystem/JKernel/JKRDvdFile.cpp +++ b/libs/JSystem/JKernel/JKRDvdFile.cpp @@ -31,7 +31,7 @@ template struct JSUList {}; /* JSUList */ struct JSUList__template8 { - /* 802D9B44 */ void func_802D9B44(); + /* 802D9B44 */ void func_802D9B44(void* _this); }; struct DVDFileInfo {}; @@ -77,7 +77,7 @@ extern "C" void sync__10JKRDvdFileFv(); extern "C" void doneProcess__10JKRDvdFileFlP11DVDFileInfo(); extern "C" void getFileSize__10JKRDvdFileCFv(); extern "C" void __sinit_JKRDvdFile_cpp(); -extern "C" void func_802D9B44(); +extern "C" void func_802D9B44(void* _this); extern "C" extern char const* const JKRDvdFile__stringBase0; extern "C" u8 sDvdList__10JKRDvdFile[12]; @@ -211,6 +211,17 @@ asm void JKRDvdFile::open(s32 param_0) { } #pragma pop +/* ############################################################################################## */ +/* 8039D260-8039D260 0298C0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8039D260 = "JKRDvdFile.cpp"; +SECTION_DEAD static char const* const stringBase_8039D26F = "%s"; +SECTION_DEAD static char const* const stringBase_8039D272 = "cannot close DVD file\n"; +/* @stringBase0 padding */ +SECTION_DEAD static char const* const pad_8039D289 = "\0\0\0\0\0\0"; +#pragma pop + /* 802D9938-802D99B4 2D4278 007C+00 1/0 0/0 0/0 .text close__10JKRDvdFileFv */ #pragma push #pragma optimization_level 0 @@ -278,26 +289,17 @@ asm void __sinit_JKRDvdFile_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_802D9B00 = (void*)__sinit_JKRDvdFile_cpp; +REGISTER_CTORS(0x802D9B00, __sinit_JKRDvdFile_cpp); #pragma pop /* 802D9B44-802D9B98 2D4484 0054+00 1/1 0/0 0/0 .text __dt__21JSUList<10JKRDvdFile>Fv */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_802D9B44() { +extern "C" asm void func_802D9B44(void* _this) { nofralloc #include "asm/JSystem/JKernel/JKRDvdFile/func_802D9B44.s" } #pragma pop -/* 8039D260-8039D290 0298C0 0029+07 1/1 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_8039D260 = "JKRDvdFile.cpp"; -SECTION_DEAD static char const* const stringBase_8039D26F = "%s"; -SECTION_DEAD static char const* const stringBase_8039D272 = "cannot close DVD file\n"; -/* @stringBase0 padding */ -SECTION_DEAD static char const* const pad_8039D289 = "\0\0\0\0\0\0"; -#pragma pop +/* 8039D260-8039D260 0298C0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/libs/JSystem/JKernel/JKRDvdRipper.cpp b/libs/JSystem/JKernel/JKRDvdRipper.cpp index 018c0bced28..74ba55add5e 100644 --- a/libs/JSystem/JKernel/JKRDvdRipper.cpp +++ b/libs/JSystem/JKernel/JKRDvdRipper.cpp @@ -24,7 +24,7 @@ template struct JSUList {}; /* JSUList */ struct JSUList__template9 { - /* 802DA820 */ void func_802DA820(); + /* 802DA820 */ void func_802DA820(void* _this); }; struct JKRHeap { @@ -53,7 +53,7 @@ struct JKRDvdRipper { JKRDvdRipper::EAllocDirection, u32, int*, u32*); /* 802D9B98 */ void loadToMainRAM(char const*, u8*, JKRExpandSwitch, u32, JKRHeap*, JKRDvdRipper::EAllocDirection, u32, int*, u32*); - /* 802DA7D4 */ void isErrorRetry(); + /* 802DA7D4 */ u8 isErrorRetry(); static u8 sDvdAsyncList[12]; static u32 sSZSBufferSize; @@ -78,9 +78,9 @@ extern "C" static void JKRDecompressFromDVD__FP10JKRDvdFilePvUlUlUlUlPUl(); extern "C" static void decompSZS_subroutine__FPUcPUc(); extern "C" static void firstSrcData__Fv(); extern "C" static void nextSrcData__FPUc(); -extern "C" void isErrorRetry__12JKRDvdRipperFv(); +extern "C" u8 isErrorRetry__12JKRDvdRipperFv(); extern "C" void __sinit_JKRDvdRipper_cpp(); -extern "C" void func_802DA820(); +extern "C" void func_802DA820(void* _this); extern "C" extern char const* const JKRDvdRipper__stringBase0; extern "C" u8 sDvdAsyncList__12JKRDvdRipper[12]; extern "C" u32 sSZSBufferSize__12JKRDvdRipper; @@ -159,7 +159,18 @@ asm void JKRDvdRipper::loadToMainRAM(s32 param_0, u8* param_1, JKRExpandSwitch p #pragma pop /* ############################################################################################## */ -/* 804508C8-804508CC 000348 0004+00 3/3 0/0 0/0 .sdata None */ +/* 8039D290-8039D290 0298F0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8039D290 = "JKRDvdRipper.cpp"; +SECTION_DEAD static char const* const stringBase_8039D2A1 = "%s"; +SECTION_DEAD static char const* const stringBase_8039D2A4 = "Sorry, not applied for SZP archive."; +SECTION_DEAD static char const* const stringBase_8039D2C8 = "Not support SZP with offset read"; +/* @stringBase0 padding */ +SECTION_DEAD static char const* const pad_8039D2E9 = "\0\0\0\0\0\0"; +#pragma pop + +/* 804508C8-804508CC 000348 0004+00 3/2 0/0 0/0 .sdata None */ SECTION_SDATA static u32 data_804508C8 = 0x01000000; /* 802D9D10-802DA1E4 2D4650 04D4+00 2/2 0/0 0/0 .text @@ -277,15 +288,10 @@ static asm void nextSrcData(u8* param_0) { } #pragma pop -/* 802DA7D4-802DA7DC 2D5114 0008+00 1/1 0/0 0/0 .text isErrorRetry__12JKRDvdRipperFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void JKRDvdRipper::isErrorRetry() { - nofralloc -#include "asm/JSystem/JKernel/JKRDvdRipper/isErrorRetry__12JKRDvdRipperFv.s" +/* 802DA7D4-802DA7DC -00001 0008+00 0/0 0/0 0/0 .text isErrorRetry__12JKRDvdRipperFv */ +u8 JKRDvdRipper::isErrorRetry() { + return *(u8*)(&data_804508C8); } -#pragma pop /* 802DA7DC-802DA820 2D511C 0044+00 0/0 1/0 0/0 .text __sinit_JKRDvdRipper_cpp */ #pragma push @@ -299,7 +305,7 @@ asm void __sinit_JKRDvdRipper_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_802DA7DC = (void*)__sinit_JKRDvdRipper_cpp; +REGISTER_CTORS(0x802DA7DC, __sinit_JKRDvdRipper_cpp); #pragma pop /* 802DA820-802DA874 2D5160 0054+00 1/1 0/0 0/0 .text __dt__23JSUList<12JKRDMCommand>Fv @@ -307,20 +313,10 @@ SECTION_CTORS void* const _ctors_802DA7DC = (void*)__sinit_JKRDvdRipper_cpp; #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_802DA820() { +extern "C" asm void func_802DA820(void* _this) { nofralloc #include "asm/JSystem/JKernel/JKRDvdRipper/func_802DA820.s" } #pragma pop -/* 8039D290-8039D2F0 0298F0 0059+07 1/1 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_8039D290 = "JKRDvdRipper.cpp"; -SECTION_DEAD static char const* const stringBase_8039D2A1 = "%s"; -SECTION_DEAD static char const* const stringBase_8039D2A4 = "Sorry, not applied for SZP archive."; -SECTION_DEAD static char const* const stringBase_8039D2C8 = "Not support SZP with offset read"; -/* @stringBase0 padding */ -SECTION_DEAD static char const* const pad_8039D2E9 = "\0\0\0\0\0\0"; -#pragma pop +/* 8039D290-8039D290 0298F0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/libs/JSystem/JKernel/JKRExpHeap.cpp b/libs/JSystem/JKernel/JKRExpHeap.cpp index 4f98896c4f2..a6a1fdfc9e6 100644 --- a/libs/JSystem/JKernel/JKRExpHeap.cpp +++ b/libs/JSystem/JKernel/JKRExpHeap.cpp @@ -265,6 +265,13 @@ asm JKRExpHeap::~JKRExpHeap() { } #pragma pop +/* ############################################################################################## */ +/* 8039CAF0-8039CAF0 029150 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8039CAF0 = ":::cannot alloc memory (0x%x byte).\n"; +#pragma pop + /* 802CF128-802CF234 2C9A68 010C+00 1/0 0/0 0/0 .text do_alloc__10JKRExpHeapFUli */ #pragma push #pragma optimization_level 0 @@ -450,6 +457,15 @@ asm void JKRExpHeap::getTotalUsedSize() const { } #pragma pop +/* ############################################################################################## */ +/* 8039CAF0-8039CAF0 029150 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8039CB15 = "JKRExpHeap.cpp"; +SECTION_DEAD static char const* const stringBase_8039CB24 = "%s"; +SECTION_DEAD static char const* const stringBase_8039CB27 = "bad appendUsedList\n"; +#pragma pop + /* 802CFDCC-802CFE68 2CA70C 009C+00 4/4 0/0 0/0 .text * appendUsedList__10JKRExpHeapFPQ210JKRExpHeap9CMemBlock */ #pragma push @@ -507,6 +523,14 @@ asm void JKRExpHeap::recycleFreeBlock(JKRExpHeap::CMemBlock* param_0) { } #pragma pop +/* ############################################################################################## */ +/* 8039CAF0-8039CAF0 029150 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8039CB3B = ":::Heap may be broken. (block = %x)"; +SECTION_DEAD static char const* const stringBase_8039CB5F = "Bad Block\n"; +#pragma pop + /* 802D00B4-802D0190 2CA9F4 00DC+00 1/1 0/0 0/0 .text * joinTwoBlocks__10JKRExpHeapFPQ210JKRExpHeap9CMemBlock */ #pragma push @@ -518,6 +542,25 @@ asm void JKRExpHeap::joinTwoBlocks(JKRExpHeap::CMemBlock* param_0) { } #pragma pop +/* ############################################################################################## */ +/* 8039CAF0-8039CAF0 029150 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8039CB6A = + ":::addr %08x: bad heap signature. (%c%c)\n"; +SECTION_DEAD static char const* const stringBase_8039CB94 = + ":::addr %08x: bad next pointer (%08x)\nabort\n"; +SECTION_DEAD static char const* const stringBase_8039CBC1 = + ":::addr %08x: bad previous pointer (%08x)\n"; +SECTION_DEAD static char const* const stringBase_8039CBEC = + ":::addr %08x: bad used list(REV) (%08x)\n"; +SECTION_DEAD static char const* const stringBase_8039CC15 = ":::addr %08x: bad block size (%08x)\n"; +SECTION_DEAD static char const* const stringBase_8039CC3A = + ":::bad total memory block size (%08X, %08X)\n"; +SECTION_DEAD static char const* const stringBase_8039CC67 = + ":::there is some error in this heap!\n"; +#pragma pop + /* 802D0190-802D03B8 2CAAD0 0228+00 1/0 0/0 0/0 .text check__10JKRExpHeapFv */ #pragma push #pragma optimization_level 0 @@ -529,6 +572,26 @@ asm void JKRExpHeap::check() { #pragma pop /* ############################################################################################## */ +/* 8039CAF0-8039CAF0 029150 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8039CC8D = + " attr address: size gid aln prev_ptr nex" + "t_ptr\n"; +SECTION_DEAD static char const* const stringBase_8039CCC4 = "(Used Blocks)\n"; +SECTION_DEAD static char const* const stringBase_8039CCD3 = " NONE\n"; +SECTION_DEAD static char const* const stringBase_8039CCDA = + "xxxxx %08x: -------- --- --- (-------- -------" + "-)\nabort\n"; +SECTION_DEAD static char const* const stringBase_8039CD14 = "%s %08x: %08x %3d %3d (%08x %08x)\n"; +SECTION_DEAD static char const* const stringBase_8039CD39 = " temp"; +SECTION_DEAD static char const* const stringBase_8039CD3F = "alloc"; +SECTION_DEAD static char const* const stringBase_8039CD45 = "(Free Blocks)\n"; +SECTION_DEAD static char const* const stringBase_8039CD54 = " free"; +SECTION_DEAD static char const* const stringBase_8039CD5A = + "%d / %d bytes (%6.2f%%) used (U:%d F:%d)\n"; +#pragma pop + /* 80455F98-80455FA0 004598 0004+04 2/2 0/0 0/0 .sdata2 @1121 */ SECTION_SDATA2 static f32 lit_1121[1 + 1 /* padding */] = { 100.0f, @@ -660,52 +723,60 @@ asm void JKRExpHeap::do_getCurrentGroupId() { } #pragma pop -/* 8039CAF0-8039CE50 029150 0360+00 6/6 0/0 0/0 .rodata @stringBase0 */ +/* ############################################################################################## */ +/* 8039CD84-8039CDA0 0293E4 001C+00 0/0 0/0 0/0 .rodata None */ #pragma push #pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_8039CAF0 = ":::cannot alloc memory (0x%x byte).\n"; -SECTION_DEAD static char const* const stringBase_8039CB15 = "JKRExpHeap.cpp"; -SECTION_DEAD static char const* const stringBase_8039CB24 = "%s"; -SECTION_DEAD static char const* const stringBase_8039CB27 = "bad appendUsedList\n"; -SECTION_DEAD static char const* const stringBase_8039CB3B = ":::Heap may be broken. (block = %x)"; -SECTION_DEAD static char const* const stringBase_8039CB5F = "Bad Block\n"; -SECTION_DEAD static char const* const stringBase_8039CB6A = - ":::addr %08x: bad heap signature. (%c%c)\n"; -SECTION_DEAD static char const* const stringBase_8039CB94 = - ":::addr %08x: bad next pointer (%08x)\nabort\n"; -SECTION_DEAD static char const* const stringBase_8039CBC1 = - ":::addr %08x: bad previous pointer (%08x)\n"; -SECTION_DEAD static char const* const stringBase_8039CBEC = - ":::addr %08x: bad used list(REV) (%08x)\n"; -SECTION_DEAD static char const* const stringBase_8039CC15 = ":::addr %08x: bad block size (%08x)\n"; -SECTION_DEAD static char const* const stringBase_8039CC3A = - ":::bad total memory block size (%08X, %08X)\n"; -SECTION_DEAD static char const* const stringBase_8039CC67 = - ":::there is some error in this heap!\n"; -SECTION_DEAD static char const* const stringBase_8039CC8D = - " attr address: size gid aln prev_ptr nex" - "t_ptr\n"; -SECTION_DEAD static char const* const stringBase_8039CCC4 = "(Used Blocks)\n"; -SECTION_DEAD static char const* const stringBase_8039CCD3 = " NONE\n"; -SECTION_DEAD static char const* const stringBase_8039CCDA = - "xxxxx %08x: -------- --- --- (-------- -------" - "-)\nabort\n"; -SECTION_DEAD static char const* const stringBase_8039CD14 = "%s %08x: %08x %3d %3d (%08x %08x)\n"; -SECTION_DEAD static char const* const stringBase_8039CD39 = " temp"; -SECTION_DEAD static char const* const stringBase_8039CD3F = "alloc"; -SECTION_DEAD static char const* const stringBase_8039CD45 = "(Free Blocks)\n"; -SECTION_DEAD static char const* const stringBase_8039CD54 = " free"; -SECTION_DEAD static char const* const stringBase_8039CD5A = - "%d / %d bytes (%6.2f%%) used (U:%d F:%d)\n"; SECTION_DEAD static char const* const stringBase_8039CD84 = "+---------------JKRExpHeap\n"; +#pragma pop + +/* 8039CDA0-8039CDD0 029400 0030+00 0/0 0/0 0/0 .rodata None */ +#pragma push +#pragma force_active on SECTION_DEAD static char const* const stringBase_8039CDA0 = "| Align Group size ( prev , next )\n"; +#pragma pop + +/* 8039CDD0-8039CDE2 029430 0012+00 0/0 0/0 0/0 .rodata None */ +#pragma push +#pragma force_active on SECTION_DEAD static char const* const stringBase_8039CDD0 = "| ---- FreeFirst\n"; +#pragma pop + +/* 8039CDE2-8039CDEB 029442 0009+00 0/0 0/0 0/0 .rodata None */ +#pragma push +#pragma force_active on SECTION_DEAD static char const* const stringBase_8039CDE2 = "| %08x "; +#pragma pop + +/* 8039CDEB-8039CE07 02944B 001C+00 0/0 0/0 0/0 .rodata None */ +#pragma push +#pragma force_active on SECTION_DEAD static char const* const stringBase_8039CDEB = "%2x %3d %6x (%08x %08x)\n"; +#pragma pop + +/* 8039CE07-8039CE18 029467 0011+00 0/0 0/0 0/0 .rodata None */ +#pragma push +#pragma force_active on SECTION_DEAD static char const* const stringBase_8039CE07 = "| ---- FreeLast\n"; +#pragma pop + +/* 8039CE18-8039CE2A 029478 0012+00 0/0 0/0 0/0 .rodata None */ +#pragma push +#pragma force_active on SECTION_DEAD static char const* const stringBase_8039CE18 = "| ---- UsedFirst\n"; +#pragma pop + +/* 8039CE2A-8039CE3B 02948A 0011+00 0/0 0/0 0/0 .rodata None */ +#pragma push +#pragma force_active on SECTION_DEAD static char const* const stringBase_8039CE2A = "| ---- UsedLast\n"; +#pragma pop + +/* 8039CE3B-8039CE50 02949B 0015+00 0/0 0/0 0/0 .rodata None */ +#pragma push +#pragma force_active on SECTION_DEAD static char const* const stringBase_8039CE3B = "+---------------End\n"; #pragma pop + +/* 8039CAF0-8039CAF0 029150 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/libs/JSystem/JKernel/JKRFileCache.cpp b/libs/JSystem/JKernel/JKRFileCache.cpp index f038e777fae..c0886b99362 100644 --- a/libs/JSystem/JKernel/JKRFileCache.cpp +++ b/libs/JSystem/JKernel/JKRFileCache.cpp @@ -179,6 +179,15 @@ asm void JKRFileCache::mount(char const* param_0, JKRHeap* param_1, char const* #pragma pop /* ############################################################################################## */ +/* 8039D158-8039D158 0297B8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8039D158 = "/"; +SECTION_DEAD static char const* const stringBase_8039D15A = "dvd"; +/* @stringBase0 padding */ +SECTION_DEAD static char const* const pad_8039D15E = "\0"; +#pragma pop + /* 803CC238-803CC288 029358 004C+04 2/2 0/0 0/0 .data __vt__12JKRFileCache */ SECTION_DATA extern void* __vt__12JKRFileCache[19 + 1 /* padding */] = { (void*)NULL /* RTTI */, @@ -447,12 +456,4 @@ asm void JKRFileCache::readNameResource(void* param_0, u32 param_1, u32 param_2, } #pragma pop -/* 8039D158-8039D160 0297B8 0006+02 3/3 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_8039D158 = "/"; -SECTION_DEAD static char const* const stringBase_8039D15A = "dvd"; -/* @stringBase0 padding */ -SECTION_DEAD static char const* const pad_8039D15E = "\0"; -#pragma pop +/* 8039D158-8039D158 0297B8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/libs/JSystem/JKernel/JKRFileLoader.cpp b/libs/JSystem/JKernel/JKRFileLoader.cpp index 118e44446d4..2f6ca4a8945 100644 --- a/libs/JSystem/JKernel/JKRFileLoader.cpp +++ b/libs/JSystem/JKernel/JKRFileLoader.cpp @@ -25,7 +25,7 @@ template struct JSUList {}; /* JSUList */ struct JSUList__template7 { - /* 802D45E4 */ void func_802D45E4(); + /* 802D45E4 */ void func_802D45E4(void* _this); }; struct JKRFileLoader { @@ -62,7 +62,7 @@ extern "C" void detachResource__13JKRFileLoaderFPvP13JKRFileLoader(); extern "C" void findVolume__13JKRFileLoaderFPPCc(); extern "C" void fetchVolumeName__13JKRFileLoaderFPclPCc(); extern "C" void __sinit_JKRFileLoader_cpp(); -extern "C" void func_802D45E4(); +extern "C" void func_802D45E4(void* _this); extern "C" extern char const* const JKRFileLoader__stringBase0; extern "C" u8 sVolumeList__13JKRFileLoader[12]; extern "C" u8 sCurrentVolume__13JKRFileLoader[4 + 4 /* padding */]; @@ -207,6 +207,14 @@ asm void JKRFileLoader::findVolume(char const** param_0) { #pragma pop /* ############################################################################################## */ +/* 8039D150-8039D150 0297B0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8039D150 = "/"; +/* @stringBase0 padding */ +SECTION_DEAD static char const* const pad_8039D152 = "\0\0\0\0\0"; +#pragma pop + /* 804508C0-804508C8 000340 0002+06 1/1 0/0 0/0 .sdata rootPath$2498 */ SECTION_SDATA static u8 rootPath[2 + 6 /* padding */] = { 0x2F, @@ -242,7 +250,7 @@ asm void __sinit_JKRFileLoader_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_802D45A0 = (void*)__sinit_JKRFileLoader_cpp; +REGISTER_CTORS(0x802D45A0, __sinit_JKRFileLoader_cpp); #pragma pop /* 802D45E4-802D4638 2CEF24 0054+00 1/1 0/0 0/0 .text __dt__24JSUList<13JKRFileLoader>Fv @@ -250,17 +258,10 @@ SECTION_CTORS void* const _ctors_802D45A0 = (void*)__sinit_JKRFileLoader_cpp; #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_802D45E4() { +extern "C" asm void func_802D45E4(void* _this) { nofralloc #include "asm/JSystem/JKernel/JKRFileLoader/func_802D45E4.s" } #pragma pop -/* 8039D150-8039D158 0297B0 0002+06 1/1 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_8039D150 = "/"; -/* @stringBase0 padding */ -SECTION_DEAD static char const* const pad_8039D152 = "\0\0\0\0\0"; -#pragma pop +/* 8039D150-8039D150 0297B0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/libs/JSystem/JKernel/JKRHeap.cpp b/libs/JSystem/JKernel/JKRHeap.cpp index 8f4d692c2e2..6d7ed2cff9b 100644 --- a/libs/JSystem/JKernel/JKRHeap.cpp +++ b/libs/JSystem/JKernel/JKRHeap.cpp @@ -214,7 +214,7 @@ SECTION_DATA extern void* __vt__7JKRHeap[24] = { /* 80451370-80451374 000870 0004+00 3/3 44/44 0/0 .sbss sSystemHeap__7JKRHeap */ u8 JKRHeap::sSystemHeap[4]; -/* 80451374-80451378 000874 0004+00 4/4 23/23 0/0 .sbss sCurrentHeap__7JKRHeap */ +/* 80451374-80451378 000874 0004+00 4/4 23/22 0/0 .sbss sCurrentHeap__7JKRHeap */ u8 JKRHeap::sCurrentHeap[4]; /* 80451378-8045137C 000878 0004+00 3/3 10/10 0/0 .sbss sRootHeap__7JKRHeap */ @@ -544,6 +544,17 @@ asm void JKRHeap::copyMemory(void* param_0, void* param_1, u32 param_2) { } #pragma pop +/* ############################################################################################## */ +/* 8039CAD8-8039CAD8 029138 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8039CAD8 = "JKRHeap.cpp"; +SECTION_DEAD static char const* const stringBase_8039CAE4 = "%s"; +SECTION_DEAD static char const* const stringBase_8039CAE7 = "abort\n"; +/* @stringBase0 padding */ +SECTION_DEAD static char const* const pad_8039CAEE = "\0"; +#pragma pop + /* 802CEB40-802CEB78 2C9480 0038+00 2/2 0/0 0/0 .text JKRDefaultMemoryErrorRoutine__FPvUli */ #pragma push #pragma optimization_level 0 @@ -569,7 +580,7 @@ asm void JKRHeap::setErrorFlag(bool param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void JKRHeap::setErrorHandler(void (*)(void*, u32, int)) { +asm void JKRHeap::setErrorHandler(void (*param_0)(void*, u32, int)) { nofralloc #include "asm/JSystem/JKernel/JKRHeap/setErrorHandler__7JKRHeapFPFPvUli_v.s" } @@ -698,13 +709,4 @@ bool JKRHeap::do_getCurrentGroupId() { return false; } -/* 8039CAD8-8039CAF0 029138 0016+02 1/1 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_8039CAD8 = "JKRHeap.cpp"; -SECTION_DEAD static char const* const stringBase_8039CAE4 = "%s"; -SECTION_DEAD static char const* const stringBase_8039CAE7 = "abort\n"; -/* @stringBase0 padding */ -SECTION_DEAD static char const* const pad_8039CAEE = "\0"; -#pragma pop +/* 8039CAD8-8039CAD8 029138 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/libs/JSystem/JKernel/JKRMemArchive.cpp b/libs/JSystem/JKernel/JKRMemArchive.cpp index f6e562f5b7a..cee0eae32a2 100644 --- a/libs/JSystem/JKernel/JKRMemArchive.cpp +++ b/libs/JSystem/JKernel/JKRMemArchive.cpp @@ -265,6 +265,17 @@ asm void JKRMemArchive::removeResource(void* param_0) { } #pragma pop +/* ############################################################################################## */ +/* 8039D160-8039D160 0297C0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8039D160 = "JKRMemArchive.cpp"; +SECTION_DEAD static char const* const stringBase_8039D172 = "%s"; +SECTION_DEAD static char const* const stringBase_8039D175 = "??? bad sequence\n"; +/* @stringBase0 padding */ +SECTION_DEAD static char const* const pad_8039D187 = ""; +#pragma pop + /* 802D6F5C-802D7030 2D189C 00D4+00 1/1 1/1 0/0 .text * fetchResource_subroutine__13JKRMemArchiveFPUcUlPUcUli */ #pragma push @@ -287,13 +298,4 @@ asm void JKRMemArchive::getExpandedResSize(void const* param_0) const { } #pragma pop -/* 8039D160-8039D188 0297C0 0027+01 1/1 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_8039D160 = "JKRMemArchive.cpp"; -SECTION_DEAD static char const* const stringBase_8039D172 = "%s"; -SECTION_DEAD static char const* const stringBase_8039D175 = "??? bad sequence\n"; -/* @stringBase0 padding */ -SECTION_DEAD static char const* const pad_8039D187 = ""; -#pragma pop +/* 8039D160-8039D160 0297C0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/libs/JSystem/JKernel/JKRSolidHeap.cpp b/libs/JSystem/JKernel/JKRSolidHeap.cpp index 744d8e21e57..75ca1c29710 100644 --- a/libs/JSystem/JKernel/JKRSolidHeap.cpp +++ b/libs/JSystem/JKernel/JKRSolidHeap.cpp @@ -213,6 +213,14 @@ asm void JKRSolidHeap::do_alloc(u32 param_0, int param_1) { } #pragma pop +/* ############################################################################################## */ +/* 8039CE50-8039CE50 0294B0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8039CE50 = + "allocFromHead: cannot alloc memory (0x%x byte).\n"; +#pragma pop + /* 802D0D58-802D0E20 2CB698 00C8+00 1/1 0/0 0/0 .text allocFromHead__12JKRSolidHeapFUli */ #pragma push @@ -224,6 +232,14 @@ asm void JKRSolidHeap::allocFromHead(u32 param_0, int param_1) { } #pragma pop +/* ############################################################################################## */ +/* 8039CE50-8039CE50 0294B0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8039CE81 = + "allocFromTail: cannot alloc memory (0x%x byte).\n"; +#pragma pop + /* 802D0E20-802D0EE4 2CB760 00C4+00 1/1 0/0 0/0 .text allocFromTail__12JKRSolidHeapFUli */ #pragma push @@ -235,6 +251,14 @@ asm void JKRSolidHeap::allocFromTail(u32 param_0, int param_1) { } #pragma pop +/* ############################################################################################## */ +/* 8039CE50-8039CE50 0294B0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8039CEB2 = + "free: cannot free memory block (%08x)\n"; +#pragma pop + /* 802D0EE4-802D0F14 2CB824 0030+00 1/0 0/0 0/0 .text do_free__12JKRSolidHeapFPv */ #pragma push #pragma optimization_level 0 @@ -271,6 +295,14 @@ void JKRSolidHeap::do_fillFreeArea() { /* empty function */ } +/* ############################################################################################## */ +/* 8039CE50-8039CE50 0294B0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8039CED9 = + "resize: cannot resize memory block (%08x: %d)\n"; +#pragma pop + /* 802D1004-802D1038 2CB944 0034+00 1/0 0/0 0/0 .text do_resize__12JKRSolidHeapFPvUl */ #pragma push #pragma optimization_level 0 @@ -281,6 +313,14 @@ asm void JKRSolidHeap::do_resize(void* param_0, u32 param_1) { } #pragma pop +/* ############################################################################################## */ +/* 8039CE50-8039CE50 0294B0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8039CF08 = + "getSize: cannot get memory block size (%08x)\n"; +#pragma pop + /* 802D1038-802D106C 2CB978 0034+00 1/0 0/0 0/0 .text do_getSize__12JKRSolidHeapFPv */ #pragma push #pragma optimization_level 0 @@ -291,6 +331,14 @@ asm void JKRSolidHeap::do_getSize(void* param_0) { } #pragma pop +/* ############################################################################################## */ +/* 8039CE50-8039CE50 0294B0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8039CF36 = + "check: bad total memory block size (%08X, %08X)\n"; +#pragma pop + /* 802D106C-802D10FC 2CB9AC 0090+00 1/0 0/0 0/0 .text check__12JKRSolidHeapFv */ #pragma push #pragma optimization_level 0 @@ -302,6 +350,16 @@ asm void JKRSolidHeap::check() { #pragma pop /* ############################################################################################## */ +/* 8039CE50-8039CE50 0294B0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8039CF67 = "head %08x: %08x\n"; +SECTION_DEAD static char const* const stringBase_8039CF78 = "tail %08x: %08x\n"; +SECTION_DEAD static char const* const stringBase_8039CF89 = "%d / %d bytes (%6.2f%%) used\n"; +/* @stringBase0 padding */ +SECTION_DEAD static char const* const pad_8039CFA7 = ""; +#pragma pop + /* 80455FA8-80455FB0 0045A8 0004+04 1/1 0/0 0/0 .sdata2 @693 */ SECTION_SDATA2 static f32 lit_693[1 + 1 /* padding */] = { 100.0f, @@ -388,25 +446,4 @@ asm void JKRSolidHeap::do_getTotalFreeSize() { } #pragma pop -/* 8039CE50-8039CFA8 0294B0 0157+01 7/7 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_8039CE50 = - "allocFromHead: cannot alloc memory (0x%x byte).\n"; -SECTION_DEAD static char const* const stringBase_8039CE81 = - "allocFromTail: cannot alloc memory (0x%x byte).\n"; -SECTION_DEAD static char const* const stringBase_8039CEB2 = - "free: cannot free memory block (%08x)\n"; -SECTION_DEAD static char const* const stringBase_8039CED9 = - "resize: cannot resize memory block (%08x: %d)\n"; -SECTION_DEAD static char const* const stringBase_8039CF08 = - "getSize: cannot get memory block size (%08x)\n"; -SECTION_DEAD static char const* const stringBase_8039CF36 = - "check: bad total memory block size (%08X, %08X)\n"; -SECTION_DEAD static char const* const stringBase_8039CF67 = "head %08x: %08x\n"; -SECTION_DEAD static char const* const stringBase_8039CF78 = "tail %08x: %08x\n"; -SECTION_DEAD static char const* const stringBase_8039CF89 = "%d / %d bytes (%6.2f%%) used\n"; -/* @stringBase0 padding */ -SECTION_DEAD static char const* const pad_8039CFA7 = ""; -#pragma pop +/* 8039CE50-8039CE50 0294B0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/libs/JSystem/JKernel/JKRThread.cpp b/libs/JSystem/JKernel/JKRThread.cpp index a0058ac2731..277bd90d7a7 100644 --- a/libs/JSystem/JKernel/JKRThread.cpp +++ b/libs/JSystem/JKernel/JKRThread.cpp @@ -36,12 +36,12 @@ template struct JSUList {}; /* JSUList */ struct JSUList__template3 { - /* 802D1EFC */ void func_802D1EFC(); + /* 802D1EFC */ void func_802D1EFC(void* _this); }; /* JSUList */ struct JSUList__template4 { - /* 802D1F50 */ void func_802D1F50(); + /* 802D1F50 */ void func_802D1F50(void* _this); }; struct JKRHeap { @@ -119,8 +119,8 @@ extern "C" bool run__9JKRThreadFv(); extern "C" void draw__15JKRThreadSwitchFP14JKRThreadName_(); extern "C" void __dt__15JKRThreadSwitchFv(); extern "C" void __sinit_JKRThread_cpp(); -extern "C" void func_802D1EFC(); -extern "C" void func_802D1F50(); +extern "C" void func_802D1EFC(void* _this); +extern "C" void func_802D1F50(void* _this); extern "C" extern char const* const JKRThread__stringBase0; extern "C" u8 sThreadList__9JKRThread[12]; extern "C" u8 sTaskList__7JKRTask[12]; @@ -338,6 +338,17 @@ asm void JKRThreadSwitch::enter(JKRThread* param_0, int param_1) { #pragma pop /* ############################################################################################## */ +/* 8039CFA8-8039CFA8 029608 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8039CFA8 = "on"; +SECTION_DEAD static char const* const stringBase_8039CFAB = "off"; +SECTION_DEAD static char const* const stringBase_8039CFAF = + "JKRThread:%x OSThread:%x Load:ID:%d (%s)\n"; +SECTION_DEAD static char const* const stringBase_8039CFDC = + "JKRThreadSwitch: currentHeap destroyed.\n"; +#pragma pop + /* 804513C0-804513C4 0008C0 0004+00 1/1 0/0 0/0 .sbss mUserPreCallback__15JKRThreadSwitch */ u8 JKRThreadSwitch::mUserPreCallback[4]; @@ -357,6 +368,18 @@ asm void JKRThreadSwitch::callback(OSThread* param_0, OSThread* param_1) { #pragma pop /* ############################################################################################## */ +/* 8039CFA8-8039CFA8 029608 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8039D005 = " total: switch:%3d time:%d(%df)\n"; +SECTION_DEAD static char const* const stringBase_8039D027 = + " -------------------------------------\n"; +SECTION_DEAD static char const* const stringBase_8039D04F = "%d"; +SECTION_DEAD static char const* const stringBase_8039D052 = " [%10s] switch:%5d cost:%2d.%d%%\n"; +/* @stringBase0 padding */ +SECTION_DEAD static char const* const pad_8039D075 = "\0\0"; +#pragma pop + /* 80455FC0-80455FC4 0045C0 0004+00 1/1 0/0 0/0 .sdata2 @934 */ SECTION_SDATA2 static f32 lit_934 = 100.0f; @@ -427,14 +450,14 @@ asm void __sinit_JKRThread_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_802D1E94 = (void*)__sinit_JKRThread_cpp; +REGISTER_CTORS(0x802D1E94, __sinit_JKRThread_cpp); #pragma pop /* 802D1EFC-802D1F50 2CC83C 0054+00 1/1 0/0 0/0 .text __dt__17JSUList<7JKRTask>Fv */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_802D1EFC() { +extern "C" asm void func_802D1EFC(void* _this) { nofralloc #include "asm/JSystem/JKernel/JKRThread/func_802D1EFC.s" } @@ -444,7 +467,7 @@ extern "C" asm void func_802D1EFC() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_802D1F50() { +extern "C" asm void func_802D1F50(void* _this) { nofralloc #include "asm/JSystem/JKernel/JKRThread/func_802D1F50.s" } @@ -457,21 +480,4 @@ extern "C" asm void func_802D1F50() { u8 JKRTask::sEndMesgQueue[32]; #pragma pop -/* 8039CFA8-8039D078 029608 00CD+03 2/2 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_8039CFA8 = "on"; -SECTION_DEAD static char const* const stringBase_8039CFAB = "off"; -SECTION_DEAD static char const* const stringBase_8039CFAF = - "JKRThread:%x OSThread:%x Load:ID:%d (%s)\n"; -SECTION_DEAD static char const* const stringBase_8039CFDC = - "JKRThreadSwitch: currentHeap destroyed.\n"; -SECTION_DEAD static char const* const stringBase_8039D005 = " total: switch:%3d time:%d(%df)\n"; -SECTION_DEAD static char const* const stringBase_8039D027 = - " -------------------------------------\n"; -SECTION_DEAD static char const* const stringBase_8039D04F = "%d"; -SECTION_DEAD static char const* const stringBase_8039D052 = " [%10s] switch:%5d cost:%2d.%d%%\n"; -/* @stringBase0 padding */ -SECTION_DEAD static char const* const pad_8039D075 = "\0\0"; -#pragma pop +/* 8039CFA8-8039CFA8 029608 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/libs/JSystem/JMath/JMATrigonometric.cpp b/libs/JSystem/JMath/JMATrigonometric.cpp index 21a14d9c781..e1e7f6b9e1d 100644 --- a/libs/JSystem/JMath/JMATrigonometric.cpp +++ b/libs/JSystem/JMath/JMATrigonometric.cpp @@ -16,7 +16,7 @@ template struct pair {}; /* pair */ struct pair__template0 { - /* 80339CB0 */ void func_80339CB0(); + /* 80339CB0 */ void func_80339CB0(void* _this); }; }; // namespace std @@ -32,7 +32,7 @@ struct JMath { // extern "C" void __sinit_JMATrigonometric_cpp(); -extern "C" void func_80339CB0(); +extern "C" void func_80339CB0(void* _this); extern "C" u8 sincosTable___5JMath[65536]; extern "C" f32 atanTable___5JMath[1032]; extern "C" f32 asinAcosTable___5JMath[1032]; @@ -101,14 +101,14 @@ asm void __sinit_JMATrigonometric_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80339AEC = (void*)__sinit_JMATrigonometric_cpp; +REGISTER_CTORS(0x80339AEC, __sinit_JMATrigonometric_cpp); #pragma pop /* 80339CB0-80339CC0 3345F0 0010+00 1/1 0/0 0/0 .text __ct__Q23std9pairFv */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80339CB0() { +extern "C" asm void func_80339CB0(void* _this) { nofralloc #include "asm/JSystem/JMath/JMATrigonometric/func_80339CB0.s" } diff --git a/libs/JSystem/JMath/random.cpp b/libs/JSystem/JMath/random.cpp index 86e0855285a..60200c617c4 100644 --- a/libs/JSystem/JMath/random.cpp +++ b/libs/JSystem/JMath/random.cpp @@ -31,12 +31,7 @@ extern "C" void __ct__Q25JMath13TRandom_fast_FUl(); // Declarations: // -/* 80339AE4-80339AEC 334424 0008+00 0/0 3/3 0/0 .text __ct__Q25JMath13TRandom_fast_FUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm JMath::TRandom_fast_::TRandom_fast_(u32 param_0) { - nofralloc -#include "asm/JSystem/JMath/random/__ct__Q25JMath13TRandom_fast_FUl.s" +/* 80339AE4-80339AEC -00001 0008+00 0/0 0/0 0/0 .text __ct__Q25JMath13TRandom_fast_FUl */ +JMath::TRandom_fast_::TRandom_fast_(u32 param_0) { + *(u32*)this = (u32)(param_0); } -#pragma pop diff --git a/libs/JSystem/JMessage/processor.cpp b/libs/JSystem/JMessage/processor.cpp index 196563b3359..2d3615db088 100644 --- a/libs/JSystem/JMessage/processor.cpp +++ b/libs/JSystem/JMessage/processor.cpp @@ -378,7 +378,7 @@ asm void JMessage::TProcessor::toMessageCode_messageID(u32 param_0, u32 param_1, #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void JMessage::TProcessor::on_select_begin(char const* (*)(JMessage::TProcessor*), +asm void JMessage::TProcessor::on_select_begin(char const* (*param_0)(JMessage::TProcessor*), void const* param_1, char const* param_2, u32 param_3) { nofralloc @@ -588,9 +588,8 @@ asm void JMessage::TSequenceProcessor::on_isReady() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void -JMessage::TSequenceProcessor::on_jump_register(void const* (*)(JMessage::TSequenceProcessor const*), - u32 param_1) { +asm void JMessage::TSequenceProcessor::on_jump_register( + void const* (*param_0)(JMessage::TSequenceProcessor const*), u32 param_1) { nofralloc #include "asm/JSystem/JMessage/processor/func_802A85D0.s" } @@ -625,7 +624,8 @@ asm void JMessage::TSequenceProcessor::on_jump(void const* param_0, char const* #pragma optimization_level 0 #pragma optimizewithasm off asm void JMessage::TSequenceProcessor::on_branch_register( - void const* (*)(JMessage::TSequenceProcessor const*, u32), void const* param_1, u32 param_2) { + void const* (*param_0)(JMessage::TSequenceProcessor const*, u32), void const* param_1, + u32 param_2) { nofralloc #include "asm/JSystem/JMessage/processor/func_802A8690.s" } diff --git a/libs/JSystem/JMessage/resource.cpp b/libs/JSystem/JMessage/resource.cpp index 1813d4afc72..949c589b83d 100644 --- a/libs/JSystem/JMessage/resource.cpp +++ b/libs/JSystem/JMessage/resource.cpp @@ -15,7 +15,7 @@ namespace std { template void lower_bound(/* ... */); /* 802A94D4 */ /* std::lower_bound */ -void func_802A94D4(u32 const*, u32 const*, u32 const&); +void func_802A94D4(void* _this, u32 const*, u32 const*, u32 const&); }; // namespace std struct JMessage { @@ -96,7 +96,7 @@ extern "C" void parseHeader_next__Q28JMessage6TParseFPPCvPUlUl(); extern "C" void parseBlock_next__Q28JMessage6TParseFPPCvPUlUl(); extern "C" void parseCharacter_1Byte__Q28JMessage6localeFPPCc(); extern "C" void parseCharacter_2Byte__Q28JMessage6localeFPPCc(); -extern "C" void func_802A94D4(u32 const*, u32 const*, u32 const&); +extern "C" void func_802A94D4(void* _this, u32 const*, u32 const*, u32 const&); extern "C" void* sapfnParseCharacter___Q28JMessage18TResourceContainer[5]; // @@ -326,7 +326,8 @@ asm void JMessage::locale::parseCharacter_2Byte(char const** param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_802A94D4(u32 const* param_0, u32 const* param_1, u32 const& param_2) { +extern "C" asm void func_802A94D4(void* _this, u32 const* param_0, u32 const* param_1, + u32 const& param_2) { nofralloc #include "asm/JSystem/JMessage/resource/func_802A94D4.s" } diff --git a/libs/JSystem/JParticle/JPAChildShape.cpp b/libs/JSystem/JParticle/JPAChildShape.cpp index 9f729b1ac00..24a34f1f3cd 100644 --- a/libs/JSystem/JParticle/JPAChildShape.cpp +++ b/libs/JSystem/JParticle/JPAChildShape.cpp @@ -78,12 +78,7 @@ asm void JPACalcChildScaleOut(JPAEmitterWorkData* param_0, JPABaseParticle* para } #pragma pop -/* 8027B038-8027B040 275978 0008+00 0/0 1/1 0/0 .text __ct__13JPAChildShapeFPCUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm JPAChildShape::JPAChildShape(u8 const* param_0) { - nofralloc -#include "asm/JSystem/JParticle/JPAChildShape/__ct__13JPAChildShapeFPCUc.s" +/* 8027B038-8027B040 -00001 0008+00 0/0 0/0 0/0 .text __ct__13JPAChildShapeFPCUc */ +JPAChildShape::JPAChildShape(u8 const* param_0) { + *(u32*)this = (u32)(param_0); } -#pragma pop diff --git a/libs/JSystem/JParticle/JPAEmitterManager.cpp b/libs/JSystem/JParticle/JPAEmitterManager.cpp index fb5edff064c..e0b03f8e661 100644 --- a/libs/JSystem/JParticle/JPAEmitterManager.cpp +++ b/libs/JSystem/JParticle/JPAEmitterManager.cpp @@ -28,8 +28,8 @@ template struct JSUList {}; /* JSUList */ struct JSUList__template1 { - /* 8027E51C */ void func_8027E51C(); - /* 8027E598 */ void func_8027E598(); + /* 8027E51C */ void func_8027E51C(void* _this); + /* 8027E598 */ void func_8027E598(void* _this); }; struct JPAResourceManager { @@ -38,9 +38,6 @@ struct JPAResourceManager { struct JPAEmitterWorkData {}; -struct JPAResource; -struct JPAParticleCallBack {}; - struct JGeometry { template struct TVec3 {}; @@ -48,10 +45,12 @@ struct JGeometry { struct TVec3__template0 {}; }; -struct JPAEmitterCallBack {}; +struct JPAParticleCallBack {}; struct JPADrawInfo {}; +struct JPAEmitterCallBack {}; + struct JKRHeap {}; struct JPABaseEmitter; @@ -69,6 +68,7 @@ struct JPAEmitterManager { /* 8027E3F4 */ void calcYBBCam(); }; +struct JPAResource; struct JPABaseEmitter { /* 8027E5EC */ ~JPABaseEmitter(); /* 8027E64C */ JPABaseEmitter(); @@ -85,8 +85,8 @@ template struct JPANode {}; /* JPANode */ struct JPANode__template0 { - /* 8027E54C */ void func_8027E54C(); - /* 8027E588 */ void func_8027E588(); + /* 8027E54C */ void func_8027E54C(void* _this); + /* 8027E588 */ void func_8027E588(void* _this); }; // @@ -103,10 +103,10 @@ extern "C" void forceDeleteEmitter__17JPAEmitterManagerFP14JPABaseEmitter(); extern "C" void entryResourceManager__17JPAEmitterManagerFP18JPAResourceManagerUc(); extern "C" void clearResourceManager__17JPAEmitterManagerFUc(); extern "C" void calcYBBCam__17JPAEmitterManagerFv(); -extern "C" void func_8027E51C(); -extern "C" void func_8027E54C(); -extern "C" void func_8027E588(); -extern "C" void func_8027E598(); +extern "C" void func_8027E51C(void* _this); +extern "C" void func_8027E54C(void* _this); +extern "C" void func_8027E588(void* _this); +extern "C" void func_8027E598(void* _this); extern "C" void __dt__14JPABaseEmitterFv(); extern "C" void __ct__14JPABaseEmitterFv(); @@ -300,7 +300,7 @@ asm void JPAEmitterManager::calcYBBCam() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_8027E51C() { +extern "C" asm void func_8027E51C(void* _this) { nofralloc #include "asm/JSystem/JParticle/JPAEmitterManager/func_8027E51C.s" } @@ -310,7 +310,7 @@ extern "C" asm void func_8027E51C() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_8027E54C() { +extern "C" asm void func_8027E54C(void* _this) { nofralloc #include "asm/JSystem/JParticle/JPAEmitterManager/func_8027E54C.s" } @@ -320,7 +320,7 @@ extern "C" asm void func_8027E54C() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_8027E588() { +extern "C" asm void func_8027E588(void* _this) { nofralloc #include "asm/JSystem/JParticle/JPAEmitterManager/func_8027E588.s" } @@ -331,7 +331,7 @@ extern "C" asm void func_8027E588() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_8027E598() { +extern "C" asm void func_8027E598(void* _this) { nofralloc #include "asm/JSystem/JParticle/JPAEmitterManager/func_8027E598.s" } diff --git a/libs/JSystem/JParticle/JPAExTexShape.cpp b/libs/JSystem/JParticle/JPAExTexShape.cpp index 1cda9f293be..ad877ecd5dd 100644 --- a/libs/JSystem/JParticle/JPAExTexShape.cpp +++ b/libs/JSystem/JParticle/JPAExTexShape.cpp @@ -51,12 +51,7 @@ asm void JPALoadExTex(JPAEmitterWorkData* param_0) { } #pragma pop -/* 8027B13C-8027B144 275A7C 0008+00 0/0 1/1 0/0 .text __ct__13JPAExTexShapeFPCUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm JPAExTexShape::JPAExTexShape(u8 const* param_0) { - nofralloc -#include "asm/JSystem/JParticle/JPAExTexShape/__ct__13JPAExTexShapeFPCUc.s" +/* 8027B13C-8027B144 -00001 0008+00 0/0 0/0 0/0 .text __ct__13JPAExTexShapeFPCUc */ +JPAExTexShape::JPAExTexShape(u8 const* param_0) { + *(u32*)this = (u32)(param_0); } -#pragma pop diff --git a/libs/JSystem/JParticle/JPAFieldBlock.cpp b/libs/JSystem/JParticle/JPAFieldBlock.cpp index 869c0bc5154..a024a0ac1fe 100644 --- a/libs/JSystem/JParticle/JPAFieldBlock.cpp +++ b/libs/JSystem/JParticle/JPAFieldBlock.cpp @@ -13,8 +13,6 @@ struct JPAEmitterWorkData {}; -struct JPABaseParticle {}; - struct JKRHeap {}; struct JPAFieldBlock { @@ -22,6 +20,8 @@ struct JPAFieldBlock { /* 8027D0C0 */ void init(JKRHeap*); }; +struct JPABaseParticle {}; + struct JPAFieldVortex { /* 8027C56C */ void prepare(JPAEmitterWorkData*, JPAFieldBlock*); /* 8027C674 */ void calc(JPAEmitterWorkData*, JPAFieldBlock*, JPABaseParticle*); diff --git a/libs/JSystem/JParticle/JPAResource.cpp b/libs/JSystem/JParticle/JPAResource.cpp index df320d3ec11..6b8f092feca 100644 --- a/libs/JSystem/JParticle/JPAResource.cpp +++ b/libs/JSystem/JParticle/JPAResource.cpp @@ -19,9 +19,8 @@ struct JUTTexture { struct JPAEmitterWorkData {}; -struct JPABaseEmitter { - /* 8027EDD4 */ void processTillStartFrame(); - /* 8027EE14 */ void processTermination(); +struct JKRHeap { + /* 802CE474 */ void alloc(u32, int, JKRHeap*); }; struct JPABaseParticle { @@ -29,8 +28,9 @@ struct JPABaseParticle { /* 80280260 */ void calc_c(JPAEmitterWorkData*); }; -struct JKRHeap { - /* 802CE474 */ void alloc(u32, int, JKRHeap*); +struct JPABaseEmitter { + /* 8027EDD4 */ void processTillStartFrame(); + /* 8027EE14 */ void processTermination(); }; struct JPAResource { diff --git a/libs/JSystem/JParticle/JPAResourceLoader.cpp b/libs/JSystem/JParticle/JPAResourceLoader.cpp index 307a0af2666..32ba52850cb 100644 --- a/libs/JSystem/JParticle/JPAResourceLoader.cpp +++ b/libs/JSystem/JParticle/JPAResourceLoader.cpp @@ -44,18 +44,10 @@ struct JPAExtraShape { /* 8027AD88 */ JPAExtraShape(u8 const*); }; -struct JPAExTexShape { - /* 8027B13C */ JPAExTexShape(u8 const*); -}; - struct JPADynamicsBlock { /* 8027BB18 */ JPADynamicsBlock(u8 const*); }; -struct JPAChildShape { - /* 8027B038 */ JPAChildShape(u8 const*); -}; - struct JPABaseShape { /* 8027A6DC */ JPABaseShape(u8 const*, JKRHeap*); }; diff --git a/libs/JSystem/JParticle/JPAResourceManager.cpp b/libs/JSystem/JParticle/JPAResourceManager.cpp index e33178e4488..5c34c3b78cc 100644 --- a/libs/JSystem/JParticle/JPAResourceManager.cpp +++ b/libs/JSystem/JParticle/JPAResourceManager.cpp @@ -19,10 +19,10 @@ struct JUTTexture { struct JPATexture {}; -struct JPAResource {}; - struct JKRHeap {}; +struct JPAResource {}; + struct JPAResourceManager { /* 80273E10 */ JPAResourceManager(void const*, JKRHeap*); /* 80273E68 */ void getResource(u16) const; diff --git a/libs/JSystem/JStage/JSGSystem.cpp b/libs/JSystem/JStage/JSGSystem.cpp index 372be35dbe0..62ae7a01f11 100644 --- a/libs/JSystem/JStage/JSGSystem.cpp +++ b/libs/JSystem/JStage/JSGSystem.cpp @@ -12,8 +12,6 @@ // struct JStage { - struct TEObject {}; - struct TObject { /* 80280DD4 */ ~TObject(); /* 80280E1C */ bool JSGGetName() const; @@ -29,6 +27,8 @@ struct JStage { /* 80280E54 */ void JSGGetNodeTransformation(u32, f32 (*)[4]) const; }; + struct TEObject {}; + struct TSystem { /* 80280E90 */ ~TSystem(); /* 80280EF0 */ bool JSGFGetType() const; diff --git a/libs/JSystem/JStudio/JStudio/ctb.cpp b/libs/JSystem/JStudio/JStudio/ctb.cpp index 81ed778f6f0..58e64703735 100644 --- a/libs/JSystem/JStudio/JStudio/ctb.cpp +++ b/libs/JSystem/JStudio/JStudio/ctb.cpp @@ -97,8 +97,8 @@ template void find_if(/* ... */); /* 802815B4 */ /* std::find_if::iterator, JStudio::object::TPRObject_ID_equal> */ -void func_802815B4(JGadget::TLinkList__template0::iterator, JGadget::TLinkList__template0::iterator, - JStudio::object::TPRObject_ID_equal); +void func_802815B4(void* _this, JGadget::TLinkList__template0::iterator, + JGadget::TLinkList__template0::iterator, JStudio::object::TPRObject_ID_equal); }; // namespace std // @@ -124,7 +124,7 @@ extern "C" void __dt__Q37JStudio3ctb6TParseFv(); extern "C" void parseHeader_next__Q37JStudio3ctb6TParseFPPCvPUlUl(); extern "C" void parseBlock_next__Q37JStudio3ctb6TParseFPPCvPUlUl(); extern "C" void __dt__Q37JStudio3ctb14TObject_TxyzRyFv(); -extern "C" void func_802815B4(JGadget::TLinkList__template0::iterator, +extern "C" void func_802815B4(void* _this, JGadget::TLinkList__template0::iterator, JGadget::TLinkList__template0::iterator, JStudio::object::TPRObject_ID_equal); @@ -401,7 +401,7 @@ asm JStudio::ctb::TObject_TxyzRy::~TObject_TxyzRy() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_802815B4(JGadget::TLinkList__template0::iterator param_0, +extern "C" asm void func_802815B4(void* _this, JGadget::TLinkList__template0::iterator param_0, JGadget::TLinkList__template0::iterator param_1, JStudio::object::TPRObject_ID_equal param_2) { nofralloc diff --git a/libs/JSystem/JStudio/JStudio/functionvalue.cpp b/libs/JSystem/JStudio/JStudio/functionvalue.cpp index dbc5e2cc8fa..ab2f91144f8 100644 --- a/libs/JSystem/JStudio/JStudio/functionvalue.cpp +++ b/libs/JSystem/JStudio/JStudio/functionvalue.cpp @@ -179,28 +179,30 @@ template void upper_bound(/* ... */); /* 80283EB8 */ /* std::upper_bound> */ -void func_80283EB8(JStudio::TFunctionValue_hermite::TIterator_data_, +void func_80283EB8(void* _this, JStudio::TFunctionValue_hermite::TIterator_data_, JStudio::TFunctionValue_hermite::TIterator_data_, f64 const&, std::less); /* 80283E24 */ /* std::upper_bound> */ -void func_80283E24(JStudio::TFunctionValue_list_parameter::TIterator_data_, +void func_80283E24(void* _this, JStudio::TFunctionValue_list_parameter::TIterator_data_, JStudio::TFunctionValue_list_parameter::TIterator_data_, f64 const&, std::less); }; // namespace std namespace JGadget { -/* 80283858 */ void func_80283858(JStudio::TFunctionValue_hermite::TIterator_data_, +/* 80283858 */ void func_80283858(void* _this, JStudio::TFunctionValue_hermite::TIterator_data_, JStudio::TFunctionValue_hermite::TIterator_data_, JStudio::TFunctionValue_hermite::TIterator_data_, f64 const&); -/* 802835DC */ void func_802835DC(JStudio::TFunctionValue_list_parameter::TIterator_data_, +/* 802835DC */ void func_802835DC(void* _this, + JStudio::TFunctionValue_list_parameter::TIterator_data_, JStudio::TFunctionValue_list_parameter::TIterator_data_, JStudio::TFunctionValue_list_parameter::TIterator_data_, f64 const&); -/* 80283634 */ void func_80283634(JStudio::TFunctionValue_list_parameter::TIterator_data_, +/* 80283634 */ void func_80283634(void* _this, + JStudio::TFunctionValue_list_parameter::TIterator_data_, JStudio::TFunctionValue_list_parameter::TIterator_data_, JStudio::TFunctionValue_list_parameter::TIterator_data_, f64 const&, std::less); -/* 802838C8 */ void func_802838C8(JStudio::TFunctionValue_hermite::TIterator_data_, +/* 802838C8 */ void func_802838C8(void* _this, JStudio::TFunctionValue_hermite::TIterator_data_, JStudio::TFunctionValue_hermite::TIterator_data_, JStudio::TFunctionValue_hermite::TIterator_data_, f64 const&, std::less); @@ -287,17 +289,17 @@ extern "C" void getValue__Q27JStudio22TFunctionValue_hermiteFd(); extern "C" void extrapolateParameter_raw__Q27JStudio13functionvalueFdd(); extern "C" void extrapolateParameter_repeat__Q27JStudio13functionvalueFdd(); extern "C" void extrapolateParameter_clamp__Q27JStudio13functionvalueFdd(); -extern "C" void func_802835DC(JStudio::TFunctionValue_list_parameter::TIterator_data_, +extern "C" void func_802835DC(void* _this, JStudio::TFunctionValue_list_parameter::TIterator_data_, JStudio::TFunctionValue_list_parameter::TIterator_data_, JStudio::TFunctionValue_list_parameter::TIterator_data_, f64 const&); -extern "C" void func_80283634(JStudio::TFunctionValue_list_parameter::TIterator_data_, +extern "C" void func_80283634(void* _this, JStudio::TFunctionValue_list_parameter::TIterator_data_, JStudio::TFunctionValue_list_parameter::TIterator_data_, JStudio::TFunctionValue_list_parameter::TIterator_data_, f64 const&, std::less); -extern "C" void func_80283858(JStudio::TFunctionValue_hermite::TIterator_data_, +extern "C" void func_80283858(void* _this, JStudio::TFunctionValue_hermite::TIterator_data_, JStudio::TFunctionValue_hermite::TIterator_data_, JStudio::TFunctionValue_hermite::TIterator_data_, f64 const&); -extern "C" void func_802838C8(JStudio::TFunctionValue_hermite::TIterator_data_, +extern "C" void func_802838C8(void* _this, JStudio::TFunctionValue_hermite::TIterator_data_, JStudio::TFunctionValue_hermite::TIterator_data_, JStudio::TFunctionValue_hermite::TIterator_data_, f64 const&, std::less); @@ -307,10 +309,10 @@ extern "C" void __dt__Q27JStudio19TFunctionValue_listFv(); extern "C" void __dt__Q27JStudio25TFunctionValue_transitionFv(); extern "C" void __dt__Q27JStudio23TFunctionValue_constantFv(); extern "C" void __dt__Q27JStudio24TFunctionValue_compositeFv(); -extern "C" void func_80283E24(JStudio::TFunctionValue_list_parameter::TIterator_data_, +extern "C" void func_80283E24(void* _this, JStudio::TFunctionValue_list_parameter::TIterator_data_, JStudio::TFunctionValue_list_parameter::TIterator_data_, f64 const&, std::less); -extern "C" void func_80283EB8(JStudio::TFunctionValue_hermite::TIterator_data_, +extern "C" void func_80283EB8(void* _this, JStudio::TFunctionValue_hermite::TIterator_data_, JStudio::TFunctionValue_hermite::TIterator_data_, f64 const&, std::less); @@ -345,7 +347,7 @@ SECTION_RODATA static void* const data_8039A9F0[4] = { (void*)extrapolateParameter_turn__Q27JStudio13functionvalueFdd, (void*)extrapolateParameter_clamp__Q27JStudio13functionvalueFdd, }; -COMPILER_STRIP_GATE(8039A9F0, &data_8039A9F0); +COMPILER_STRIP_GATE(0x8039A9F0, &data_8039A9F0); /* 80281648-80281690 27BF88 0048+00 3/3 1/1 0/0 .text * toFunction_outside__Q27JStudio14TFunctionValueFi */ @@ -1243,7 +1245,8 @@ asm void JStudio::functionvalue::extrapolateParameter_clamp(f64 param_0, f64 par #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_802835DC(JStudio::TFunctionValue_list_parameter::TIterator_data_ param_0, +extern "C" asm void func_802835DC(void* _this, + JStudio::TFunctionValue_list_parameter::TIterator_data_ param_0, JStudio::TFunctionValue_list_parameter::TIterator_data_ param_1, JStudio::TFunctionValue_list_parameter::TIterator_data_ param_2, f64 const& param_3) { @@ -1258,7 +1261,8 @@ extern "C" asm void func_802835DC(JStudio::TFunctionValue_list_parameter::TItera #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80283634(JStudio::TFunctionValue_list_parameter::TIterator_data_ param_0, +extern "C" asm void func_80283634(void* _this, + JStudio::TFunctionValue_list_parameter::TIterator_data_ param_0, JStudio::TFunctionValue_list_parameter::TIterator_data_ param_1, JStudio::TFunctionValue_list_parameter::TIterator_data_ param_2, f64 const& param_3, std::less param_4) { @@ -1273,7 +1277,8 @@ extern "C" asm void func_80283634(JStudio::TFunctionValue_list_parameter::TItera #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80283858(JStudio::TFunctionValue_hermite::TIterator_data_ param_0, +extern "C" asm void func_80283858(void* _this, + JStudio::TFunctionValue_hermite::TIterator_data_ param_0, JStudio::TFunctionValue_hermite::TIterator_data_ param_1, JStudio::TFunctionValue_hermite::TIterator_data_ param_2, f64 const& param_3) { @@ -1288,7 +1293,8 @@ extern "C" asm void func_80283858(JStudio::TFunctionValue_hermite::TIterator_dat #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_802838C8(JStudio::TFunctionValue_hermite::TIterator_data_ param_0, +extern "C" asm void func_802838C8(void* _this, + JStudio::TFunctionValue_hermite::TIterator_data_ param_0, JStudio::TFunctionValue_hermite::TIterator_data_ param_1, JStudio::TFunctionValue_hermite::TIterator_data_ param_2, f64 const& param_3, std::less param_4) { @@ -1368,7 +1374,8 @@ asm JStudio::TFunctionValue_composite::~TFunctionValue_composite() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80283E24(JStudio::TFunctionValue_list_parameter::TIterator_data_ param_0, +extern "C" asm void func_80283E24(void* _this, + JStudio::TFunctionValue_list_parameter::TIterator_data_ param_0, JStudio::TFunctionValue_list_parameter::TIterator_data_ param_1, f64 const& param_2, std::less param_3) { nofralloc @@ -1382,7 +1389,8 @@ extern "C" asm void func_80283E24(JStudio::TFunctionValue_list_parameter::TItera #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80283EB8(JStudio::TFunctionValue_hermite::TIterator_data_ param_0, +extern "C" asm void func_80283EB8(void* _this, + JStudio::TFunctionValue_hermite::TIterator_data_ param_0, JStudio::TFunctionValue_hermite::TIterator_data_ param_1, f64 const& param_2, std::less param_3) { nofralloc diff --git a/libs/JSystem/JStudio/JStudio/fvb.cpp b/libs/JSystem/JStudio/JStudio/fvb.cpp index 430789bd319..e32f5ea21a8 100644 --- a/libs/JSystem/JStudio/JStudio/fvb.cpp +++ b/libs/JSystem/JStudio/JStudio/fvb.cpp @@ -204,8 +204,8 @@ template void find_if(/* ... */); /* 80285018 */ /* std::find_if::iterator, JStudio::object::TPRObject_ID_equal> */ -void func_80285018(JGadget::TLinkList__template1::iterator, JGadget::TLinkList__template1::iterator, - JStudio::object::TPRObject_ID_equal); +void func_80285018(void* _this, JGadget::TLinkList__template1::iterator, + JGadget::TLinkList__template1::iterator, JStudio::object::TPRObject_ID_equal); }; // namespace std // @@ -262,7 +262,7 @@ extern "C" void __dt__Q37JStudio3fvb12TObject_listFv(); extern "C" void __dt__Q37JStudio3fvb18TObject_transitionFv(); extern "C" void __dt__Q37JStudio3fvb16TObject_constantFv(); extern "C" void __dt__Q37JStudio3fvb17TObject_compositeFv(); -extern "C" void func_80285018(JGadget::TLinkList__template1::iterator, +extern "C" void func_80285018(void* _this, JGadget::TLinkList__template1::iterator, JGadget::TLinkList__template1::iterator, JStudio::object::TPRObject_ID_equal); @@ -591,7 +591,7 @@ SECTION_RODATA static void* const data_8039AA00[16] = { (void*)func_80282094, (void*)func_80284210, (void*)func_80282118, (void*)func_8028421C, (void*)func_80282200, (void*)func_80284228, (void*)func_80282284, (void*)func_80284234, }; -COMPILER_STRIP_GATE(8039AA00, &data_8039AA00); +COMPILER_STRIP_GATE(0x8039AA00, &data_8039AA00); /* 80284240-80284254 27EB80 0014+00 1/1 0/0 0/0 .text * getCompositeOperation___Q37JStudio3fvb17@unnamed@fvb_cpp@FQ47JStudio3fvb4data11TEComposite */ @@ -981,7 +981,7 @@ asm JStudio::fvb::TObject_composite::~TObject_composite() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80285018(JGadget::TLinkList__template1::iterator param_0, +extern "C" asm void func_80285018(void* _this, JGadget::TLinkList__template1::iterator param_0, JGadget::TLinkList__template1::iterator param_1, JStudio::object::TPRObject_ID_equal param_2) { nofralloc diff --git a/libs/JSystem/JStudio/JStudio/jstudio-control.cpp b/libs/JSystem/JStudio/JStudio/jstudio-control.cpp index 409061b38bb..211873d7836 100644 --- a/libs/JSystem/JStudio/JStudio/jstudio-control.cpp +++ b/libs/JSystem/JStudio/JStudio/jstudio-control.cpp @@ -210,7 +210,7 @@ extern "C" u8 ga8cSignature__Q27JStudio4data[8]; SECTION_RODATA static u8 const lit_745[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8039AA40, &lit_745); +COMPILER_STRIP_GATE(0x8039AA40, &lit_745); /* 803C4AC0-803C4AE0 021BE0 0020+00 2/2 0/0 0/0 .data __vt__Q27JStudio6TParse */ SECTION_DATA extern void* __vt__Q27JStudio6TParse[8] = { @@ -310,7 +310,7 @@ asm void JStudio::TControl::transformOnGet_setOrigin_TxyzRy(Vec const& param_0, SECTION_RODATA static u8 const lit_838[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8039AA4C, &lit_838); +COMPILER_STRIP_GATE(0x8039AA4C, &lit_838); /* 80285368-8028543C 27FCA8 00D4+00 1/1 0/0 0/0 .text * transform_setOrigin_ctb__Q27JStudio8TControlFRCQ37JStudio3ctb7TObject */ @@ -419,7 +419,7 @@ SECTION_RODATA static u8 const lit_1138[12 + 4 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(8039AA58, &lit_1138); +COMPILER_STRIP_GATE(0x8039AA58, &lit_1138); /* 80285708-802857E4 280048 00DC+00 1/0 0/0 0/0 .text * parseHeader__Q27JStudio6TParseFRCQ47JStudio3stb4data14TParse_THeaderUl */ diff --git a/libs/JSystem/JStudio/JStudio/jstudio-object.cpp b/libs/JSystem/JStudio/JStudio/jstudio-object.cpp index 6df1a397148..b8b71f4d628 100644 --- a/libs/JSystem/JStudio/JStudio/jstudio-object.cpp +++ b/libs/JSystem/JStudio/JStudio/jstudio-object.cpp @@ -16,12 +16,12 @@ struct _GXColor {}; struct Vec {}; namespace JStudio { +struct TControl {}; + struct data { struct TEOperationData {}; }; -struct TControl {}; - struct TAdaptor { struct TSetVariableValue_immediate {}; @@ -1927,7 +1927,7 @@ asm JStudio::TObject_actor::TObject_actor(JStudio::stb::data::TParse_TBlock_obje SECTION_RODATA u8 const JStudio::TAdaptor_actor::sauVariableValue_3_TRANSLATION_XYZ[12] = { 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x05, }; -COMPILER_STRIP_GATE(8039AA68, &JStudio::TAdaptor_actor::sauVariableValue_3_TRANSLATION_XYZ); +COMPILER_STRIP_GATE(0x8039AA68, &JStudio::TAdaptor_actor::sauVariableValue_3_TRANSLATION_XYZ); /* 80431010-8043101C 05DD30 000C+00 3/3 0/0 0/0 .bss @744 */ static u8 lit_744[12]; @@ -1991,28 +1991,28 @@ asm JStudio::TObject_ambientLight::TObject_ambientLight( SECTION_RODATA u8 const JStudio::TAdaptor_actor::sauVariableValue_3_ROTATION_XYZ[12] = { 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x08, }; -COMPILER_STRIP_GATE(8039AA74, &JStudio::TAdaptor_actor::sauVariableValue_3_ROTATION_XYZ); +COMPILER_STRIP_GATE(0x8039AA74, &JStudio::TAdaptor_actor::sauVariableValue_3_ROTATION_XYZ); /* 8039AA80-8039AA8C 0270E0 000C+00 0/0 2/2 0/0 .rodata * sauVariableValue_3_SCALING_XYZ__Q27JStudio14TAdaptor_actor */ SECTION_RODATA u8 const JStudio::TAdaptor_actor::sauVariableValue_3_SCALING_XYZ[12] = { 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x0B, }; -COMPILER_STRIP_GATE(8039AA80, &JStudio::TAdaptor_actor::sauVariableValue_3_SCALING_XYZ); +COMPILER_STRIP_GATE(0x8039AA80, &JStudio::TAdaptor_actor::sauVariableValue_3_SCALING_XYZ); /* 8039AA8C-8039AA98 0270EC 000C+00 1/1 0/0 0/0 .rodata * sauVariableValue_3_COLOR_RGB__Q27JStudio21TAdaptor_ambientLight */ SECTION_RODATA u8 const JStudio::TAdaptor_ambientLight::sauVariableValue_3_COLOR_RGB[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, }; -COMPILER_STRIP_GATE(8039AA8C, &JStudio::TAdaptor_ambientLight::sauVariableValue_3_COLOR_RGB); +COMPILER_STRIP_GATE(0x8039AA8C, &JStudio::TAdaptor_ambientLight::sauVariableValue_3_COLOR_RGB); /* 8039AA98-8039AAA8 0270F8 0010+00 1/1 2/2 0/0 .rodata * sauVariableValue_4_COLOR_RGBA__Q27JStudio21TAdaptor_ambientLight */ SECTION_RODATA u8 const JStudio::TAdaptor_ambientLight::sauVariableValue_4_COLOR_RGBA[16] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x03, }; -COMPILER_STRIP_GATE(8039AA98, &JStudio::TAdaptor_ambientLight::sauVariableValue_4_COLOR_RGBA); +COMPILER_STRIP_GATE(0x8039AA98, &JStudio::TAdaptor_ambientLight::sauVariableValue_4_COLOR_RGBA); /* 80286D38-80286E1C 281678 00E4+00 1/0 0/0 0/0 .text * do_paragraph__Q27JStudio20TObject_ambientLightFUlPCvUl */ @@ -2056,14 +2056,14 @@ asm JStudio::TObject_camera::TObject_camera(JStudio::stb::data::TParse_TBlock_ob SECTION_RODATA u8 const JStudio::TAdaptor_camera::sauVariableValue_3_POSITION_XYZ[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, }; -COMPILER_STRIP_GATE(8039AAA8, &JStudio::TAdaptor_camera::sauVariableValue_3_POSITION_XYZ); +COMPILER_STRIP_GATE(0x8039AAA8, &JStudio::TAdaptor_camera::sauVariableValue_3_POSITION_XYZ); /* 8039AAB4-8039AAC0 027114 000C+00 1/1 2/2 0/0 .rodata * sauVariableValue_3_TARGET_POSITION_XYZ__Q27JStudio15TAdaptor_camera */ SECTION_RODATA u8 const JStudio::TAdaptor_camera::sauVariableValue_3_TARGET_POSITION_XYZ[12] = { 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x05, }; -COMPILER_STRIP_GATE(8039AAB4, &JStudio::TAdaptor_camera::sauVariableValue_3_TARGET_POSITION_XYZ); +COMPILER_STRIP_GATE(0x8039AAB4, &JStudio::TAdaptor_camera::sauVariableValue_3_TARGET_POSITION_XYZ); /* 80431048-80431054 05DD68 000C+00 0/1 0/0 0/0 .bss @750 */ #pragma push @@ -2131,14 +2131,14 @@ asm JStudio::TObject_fog::TObject_fog(JStudio::stb::data::TParse_TBlock_object c SECTION_RODATA u8 const JStudio::TAdaptor_fog::sauVariableValue_3_COLOR_RGB[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, }; -COMPILER_STRIP_GATE(8039AAC0, &JStudio::TAdaptor_fog::sauVariableValue_3_COLOR_RGB); +COMPILER_STRIP_GATE(0x8039AAC0, &JStudio::TAdaptor_fog::sauVariableValue_3_COLOR_RGB); /* 8039AACC-8039AADC 02712C 0010+00 1/1 2/2 0/0 .rodata * sauVariableValue_4_COLOR_RGBA__Q27JStudio12TAdaptor_fog */ SECTION_RODATA u8 const JStudio::TAdaptor_fog::sauVariableValue_4_COLOR_RGBA[16] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x03, }; -COMPILER_STRIP_GATE(8039AACC, &JStudio::TAdaptor_fog::sauVariableValue_4_COLOR_RGBA); +COMPILER_STRIP_GATE(0x8039AACC, &JStudio::TAdaptor_fog::sauVariableValue_4_COLOR_RGBA); /* 804554B8-804554C0 003AB8 0008+00 1/1 0/0 0/0 .sdata2 * sauVariableValue_2_RANGE_BEGIN_END__Q27JStudio12TAdaptor_fog */ @@ -2309,7 +2309,7 @@ asm JStudio::TObject_sound::TObject_sound(JStudio::stb::data::TParse_TBlock_obje SECTION_RODATA u8 const JStudio::TAdaptor_light::sauVariableValue_3_COLOR_RGB[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, }; -COMPILER_STRIP_GATE(8039AADC, &JStudio::TAdaptor_light::sauVariableValue_3_COLOR_RGB); +COMPILER_STRIP_GATE(0x8039AADC, &JStudio::TAdaptor_light::sauVariableValue_3_COLOR_RGB); #pragma pop /* 8039AAE8-8039AAF8 027148 0010+00 0/0 2/2 0/0 .rodata @@ -2317,42 +2317,42 @@ COMPILER_STRIP_GATE(8039AADC, &JStudio::TAdaptor_light::sauVariableValue_3_COLOR SECTION_RODATA u8 const JStudio::TAdaptor_light::sauVariableValue_4_COLOR_RGBA[16] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x03, }; -COMPILER_STRIP_GATE(8039AAE8, &JStudio::TAdaptor_light::sauVariableValue_4_COLOR_RGBA); +COMPILER_STRIP_GATE(0x8039AAE8, &JStudio::TAdaptor_light::sauVariableValue_4_COLOR_RGBA); /* 8039AAF8-8039AB04 027158 000C+00 0/0 2/2 0/0 .rodata * sauVariableValue_3_POSITION_XYZ__Q27JStudio14TAdaptor_light */ SECTION_RODATA u8 const JStudio::TAdaptor_light::sauVariableValue_3_POSITION_XYZ[12] = { 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x06, }; -COMPILER_STRIP_GATE(8039AAF8, &JStudio::TAdaptor_light::sauVariableValue_3_POSITION_XYZ); +COMPILER_STRIP_GATE(0x8039AAF8, &JStudio::TAdaptor_light::sauVariableValue_3_POSITION_XYZ); /* 8039AB04-8039AB10 027164 000C+00 0/0 2/2 0/0 .rodata * sauVariableValue_3_TARGET_POSITION_XYZ__Q27JStudio14TAdaptor_light */ SECTION_RODATA u8 const JStudio::TAdaptor_light::sauVariableValue_3_TARGET_POSITION_XYZ[12] = { 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x09, }; -COMPILER_STRIP_GATE(8039AB04, &JStudio::TAdaptor_light::sauVariableValue_3_TARGET_POSITION_XYZ); +COMPILER_STRIP_GATE(0x8039AB04, &JStudio::TAdaptor_light::sauVariableValue_3_TARGET_POSITION_XYZ); /* 8039AB10-8039AB1C 027170 000C+00 0/0 1/1 0/0 .rodata * sauVariableValue_3_TRANSLATION_XYZ__Q27JStudio17TAdaptor_particle */ SECTION_RODATA u8 const JStudio::TAdaptor_particle::sauVariableValue_3_TRANSLATION_XYZ[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, }; -COMPILER_STRIP_GATE(8039AB10, &JStudio::TAdaptor_particle::sauVariableValue_3_TRANSLATION_XYZ); +COMPILER_STRIP_GATE(0x8039AB10, &JStudio::TAdaptor_particle::sauVariableValue_3_TRANSLATION_XYZ); /* 8039AB1C-8039AB28 02717C 000C+00 0/0 1/1 0/0 .rodata * sauVariableValue_3_ROTATION_XYZ__Q27JStudio17TAdaptor_particle */ SECTION_RODATA u8 const JStudio::TAdaptor_particle::sauVariableValue_3_ROTATION_XYZ[12] = { 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x05, }; -COMPILER_STRIP_GATE(8039AB1C, &JStudio::TAdaptor_particle::sauVariableValue_3_ROTATION_XYZ); +COMPILER_STRIP_GATE(0x8039AB1C, &JStudio::TAdaptor_particle::sauVariableValue_3_ROTATION_XYZ); /* 8039AB28-8039AB34 027188 000C+00 0/0 1/1 0/0 .rodata * sauVariableValue_3_SCALING_XYZ__Q27JStudio17TAdaptor_particle */ SECTION_RODATA u8 const JStudio::TAdaptor_particle::sauVariableValue_3_SCALING_XYZ[12] = { 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x08, }; -COMPILER_STRIP_GATE(8039AB28, &JStudio::TAdaptor_particle::sauVariableValue_3_SCALING_XYZ); +COMPILER_STRIP_GATE(0x8039AB28, &JStudio::TAdaptor_particle::sauVariableValue_3_SCALING_XYZ); /* 8039AB34-8039AB40 027194 000C+00 0/0 0/0 0/0 .rodata * sauVariableValue_3_COLOR_RGB__Q27JStudio17TAdaptor_particle */ @@ -2361,7 +2361,7 @@ COMPILER_STRIP_GATE(8039AB28, &JStudio::TAdaptor_particle::sauVariableValue_3_SC SECTION_RODATA u8 const JStudio::TAdaptor_particle::sauVariableValue_3_COLOR_RGB[12] = { 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x0B, }; -COMPILER_STRIP_GATE(8039AB34, &JStudio::TAdaptor_particle::sauVariableValue_3_COLOR_RGB); +COMPILER_STRIP_GATE(0x8039AB34, &JStudio::TAdaptor_particle::sauVariableValue_3_COLOR_RGB); #pragma pop /* 8039AB40-8039AB50 0271A0 0010+00 0/0 1/1 0/0 .rodata @@ -2369,7 +2369,7 @@ COMPILER_STRIP_GATE(8039AB34, &JStudio::TAdaptor_particle::sauVariableValue_3_CO SECTION_RODATA u8 const JStudio::TAdaptor_particle::sauVariableValue_4_COLOR_RGBA[16] = { 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x0B, 0x00, 0x00, 0x00, 0x0C, }; -COMPILER_STRIP_GATE(8039AB40, &JStudio::TAdaptor_particle::sauVariableValue_4_COLOR_RGBA); +COMPILER_STRIP_GATE(0x8039AB40, &JStudio::TAdaptor_particle::sauVariableValue_4_COLOR_RGBA); /* 8039AB50-8039AB5C 0271B0 000C+00 0/0 0/0 0/0 .rodata * sauVariableValue_3_COLOR1_RGB__Q27JStudio17TAdaptor_particle */ @@ -2378,7 +2378,7 @@ COMPILER_STRIP_GATE(8039AB40, &JStudio::TAdaptor_particle::sauVariableValue_4_CO SECTION_RODATA u8 const JStudio::TAdaptor_particle::sauVariableValue_3_COLOR1_RGB[12] = { 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x0B, }; -COMPILER_STRIP_GATE(8039AB50, &JStudio::TAdaptor_particle::sauVariableValue_3_COLOR1_RGB); +COMPILER_STRIP_GATE(0x8039AB50, &JStudio::TAdaptor_particle::sauVariableValue_3_COLOR1_RGB); #pragma pop /* 8039AB5C-8039AB6C 0271BC 0010+00 0/0 0/0 0/0 .rodata @@ -2388,7 +2388,7 @@ COMPILER_STRIP_GATE(8039AB50, &JStudio::TAdaptor_particle::sauVariableValue_3_CO SECTION_RODATA u8 const JStudio::TAdaptor_particle::sauVariableValue_4_COLOR1_RGBA[16] = { 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x0B, 0x00, 0x00, 0x00, 0x0C, }; -COMPILER_STRIP_GATE(8039AB5C, &JStudio::TAdaptor_particle::sauVariableValue_4_COLOR1_RGBA); +COMPILER_STRIP_GATE(0x8039AB5C, &JStudio::TAdaptor_particle::sauVariableValue_4_COLOR1_RGBA); #pragma pop /* 8039AB6C-8039AB78 0271CC 000C+00 1/1 1/1 0/0 .rodata @@ -2396,7 +2396,7 @@ COMPILER_STRIP_GATE(8039AB5C, &JStudio::TAdaptor_particle::sauVariableValue_4_CO SECTION_RODATA u8 const JStudio::TAdaptor_sound::sauVariableValue_3_POSITION_XYZ[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, }; -COMPILER_STRIP_GATE(8039AB6C, &JStudio::TAdaptor_sound::sauVariableValue_3_POSITION_XYZ); +COMPILER_STRIP_GATE(0x8039AB6C, &JStudio::TAdaptor_sound::sauVariableValue_3_POSITION_XYZ); /* 80287BD8-80287F04 282518 032C+00 2/0 0/0 0/0 .text * do_paragraph__Q27JStudio13TObject_soundFUlPCvUl */ @@ -2667,7 +2667,7 @@ asm void func_80288204() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80288204 = (void*)func_80288204; +REGISTER_CTORS(0x80288204, func_80288204); #pragma pop /* 802885DC-8028863C 282F1C 0060+00 2/1 0/0 0/0 .text @@ -2799,6 +2799,14 @@ asm void func_8028892C() { #pragma pop /* ############################################################################################## */ +/* 8039AB78-8039AB88 0271D8 000A+06 0/0 0/0 0/0 .rodata None */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8039AB78 = "(unnamed)"; +/* @stringBase0 padding */ +SECTION_DEAD static char const* const pad_8039AB82 = "\0\0\0\0\0"; +#pragma pop + /* 804511F8-80451200 0006F8 0008+00 0/0 1/1 0/0 .sbss None */ extern u8 data_804511F8[8]; u8 data_804511F8[8]; @@ -2807,11 +2815,4 @@ u8 data_804511F8[8]; extern u8 data_80451200[8]; u8 data_80451200[8]; -/* 8039AB78-8039AB88 0271D8 000A+06 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_8039AB78 = "(unnamed)"; -/* @stringBase0 padding */ -SECTION_DEAD static char const* const pad_8039AB82 = "\0\0\0\0\0"; -#pragma pop +/* 8039AB78-8039AB78 0271D8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/libs/JSystem/JStudio/JStudio/stb-data.cpp b/libs/JSystem/JStudio/JStudio/stb-data.cpp index 7fd337bb4a6..d2085fb9927 100644 --- a/libs/JSystem/JStudio/JStudio/stb-data.cpp +++ b/libs/JSystem/JStudio/JStudio/stb-data.cpp @@ -44,7 +44,7 @@ SECTION_RODATA u8 const JStudio::stb::data::gauDataSize_TEParagraph_data[32] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x40, }; -COMPILER_STRIP_GATE(8039AB88, &JStudio::stb::data::gauDataSize_TEParagraph_data); +COMPILER_STRIP_GATE(0x8039AB88, &JStudio::stb::data::gauDataSize_TEParagraph_data); /* 804554D8-804554E0 003AD8 0004+04 0/0 1/1 0/0 .sdata2 ga4cSignature__Q37JStudio3stb4data */ diff --git a/libs/JSystem/JStudio/JStudio/stb.cpp b/libs/JSystem/JStudio/JStudio/stb.cpp index d5eb25c0cd1..b0fcc4c7c9b 100644 --- a/libs/JSystem/JStudio/JStudio/stb.cpp +++ b/libs/JSystem/JStudio/JStudio/stb.cpp @@ -129,8 +129,8 @@ template void find_if(/* ... */); /* 80289928 */ /* std::find_if::iterator, JStudio::object::TPRObject_ID_equal> */ -void func_80289928(JGadget::TLinkList__template2::iterator, JGadget::TLinkList__template2::iterator, - JStudio::object::TPRObject_ID_equal); +void func_80289928(void* _this, JGadget::TLinkList__template2::iterator, + JGadget::TLinkList__template2::iterator, JStudio::object::TPRObject_ID_equal); }; // namespace std // @@ -172,7 +172,7 @@ extern "C" bool parseHeader__Q37JStudio3stb6TParseFRCQ47JStudio3stb4data14TParse extern "C" void parseBlock_block__Q37JStudio3stb6TParseFRCQ47JStudio3stb4data13TParse_TBlockUl(); extern "C" void parseBlock_object__Q37JStudio3stb6TParseFRCQ47JStudio3stb4data20TParse_TBlock_objectUl(); -extern "C" void func_80289928(JGadget::TLinkList__template2::iterator, +extern "C" void func_80289928(void* _this, JGadget::TLinkList__template2::iterator, JGadget::TLinkList__template2::iterator, JStudio::object::TPRObject_ID_equal); extern "C" u32 gu32Mask_TSequence_value_signExpansion__Q37JStudio3stb4data[1 + 1 /* padding */]; @@ -611,7 +611,7 @@ JStudio::stb::TParse::parseBlock_object(JStudio::stb::data::TParse_TBlock_object #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80289928(JGadget::TLinkList__template2::iterator param_0, +extern "C" asm void func_80289928(void* _this, JGadget::TLinkList__template2::iterator param_0, JGadget::TLinkList__template2::iterator param_1, JStudio::object::TPRObject_ID_equal param_2) { nofralloc diff --git a/libs/JSystem/JStudio/JStudio_JAudio2/object-sound.cpp b/libs/JSystem/JStudio/JStudio_JAudio2/object-sound.cpp index 71f4a79a054..3557ff8f3e4 100644 --- a/libs/JSystem/JStudio/JStudio_JAudio2/object-sound.cpp +++ b/libs/JSystem/JStudio/JStudio_JAudio2/object-sound.cpp @@ -111,12 +111,12 @@ struct JAISoundStatus_ { /* 802A2244 */ void unlockIfLocked(); }; +struct JAISoundID {}; + struct JAISoundHandle { /* 802A2184 */ void releaseSound(); }; -struct JAISoundID {}; - struct JAISoundStarter { /* 802A2FEC */ void startLevelSound(JAISoundID, JAISoundHandle*, JGeometry::TVec3 const*); }; @@ -656,5 +656,5 @@ asm void func_8028E0F4() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_8028E0F4 = (void*)func_8028E0F4; +REGISTER_CTORS(0x8028E0F4, func_8028E0F4); #pragma pop diff --git a/libs/JSystem/JStudio/JStudio_JParticle/control.cpp b/libs/JSystem/JStudio/JStudio_JParticle/control.cpp index c57815bce00..64d21c7fb10 100644 --- a/libs/JSystem/JStudio/JStudio_JParticle/control.cpp +++ b/libs/JSystem/JStudio/JStudio_JParticle/control.cpp @@ -55,6 +55,8 @@ struct JStudio_JParticle { struct JPAParticleCallBack {}; +struct JPAEmitterCallBack {}; + struct JGeometry { template struct TVec3 {}; @@ -62,8 +64,6 @@ struct JGeometry { struct TVec3__template0 {}; }; -struct JPAEmitterCallBack {}; - struct JPAEmitterManager { /* 8027DEBC */ void createSimpleEmitterID(JGeometry::TVec3 const&, u16, u8, u8, JPAEmitterCallBack*, JPAParticleCallBack*); @@ -161,7 +161,7 @@ SECTION_RODATA static u8 const lit_1172[12 + 4 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(8039ABA8, &lit_1172); +COMPILER_STRIP_GATE(0x8039ABA8, &lit_1172); /* 8028E474-8028E4E4 288DB4 0070+00 1/0 0/0 0/0 .text * emitter_create__Q217JStudio_JParticle13TCreateObjectFUl */ diff --git a/libs/JSystem/JStudio/JStudio_JParticle/object-particle.cpp b/libs/JSystem/JStudio/JStudio_JParticle/object-particle.cpp index 44c887f1910..c054f69ea96 100644 --- a/libs/JSystem/JStudio/JStudio_JParticle/object-particle.cpp +++ b/libs/JSystem/JStudio/JStudio_JParticle/object-particle.cpp @@ -15,6 +15,10 @@ struct _GXColor {}; struct Vec {}; +struct JStage { + struct TObject {}; +}; + namespace JStudio { struct data { struct TEOperationData {}; @@ -50,10 +54,6 @@ struct TVariableValue { }; // namespace JStudio -struct JStage { - struct TObject {}; -}; - struct JStudio_JStage { /* 8028A1F8 */ void transform_toGlobalFromLocal( f32 (*)[4], JStudio::TControl::TTransform_translation_rotation_scaling const&, diff --git a/libs/JSystem/JStudio/JStudio_JStage/control.cpp b/libs/JSystem/JStudio/JStudio_JStage/control.cpp index 56536622338..f6396849c3f 100644 --- a/libs/JSystem/JStudio/JStudio_JStage/control.cpp +++ b/libs/JSystem/JStudio/JStudio_JStage/control.cpp @@ -11,20 +11,6 @@ // Types: // -struct JStage { - struct TSystem {}; - - struct TActor {}; - - struct TAmbientLight {}; - - struct TCamera {}; - - struct TFog {}; - - struct TLight {}; -}; - namespace JStudio { struct TObject {}; @@ -76,6 +62,20 @@ struct TObject_light { }; // namespace JStudio +struct JStage { + struct TSystem {}; + + struct TActor {}; + + struct TAmbientLight {}; + + struct TCamera {}; + + struct TFog {}; + + struct TLight {}; +}; + struct JStudio_JStage { struct TCreateObject { /* 80289B00 */ ~TCreateObject(); diff --git a/libs/JSystem/JStudio/JStudio_JStage/object-actor.cpp b/libs/JSystem/JStudio/JStudio_JStage/object-actor.cpp index 3018a7f3533..e66006efd9e 100644 --- a/libs/JSystem/JStudio/JStudio_JStage/object-actor.cpp +++ b/libs/JSystem/JStudio/JStudio_JStage/object-actor.cpp @@ -13,6 +13,14 @@ struct Vec {}; +struct JStage { + struct TSystem {}; + + struct TActor {}; + + struct TObject {}; +}; + namespace JStudio { struct data { struct TEOperationData {}; @@ -56,14 +64,6 @@ struct TAdaptor_actor { }; // namespace JStudio -struct JStage { - struct TSystem {}; - - struct TActor {}; - - struct TObject {}; -}; - struct JStudio_JStage { struct TAdaptor_actor { struct TVVOutput_ANIMATION_FRAME_ { @@ -111,8 +111,8 @@ struct JStudio_JStage { struct TVariableValueOutput_object_ {}; /* TVariableValueOutput_object_ */ struct TVariableValueOutput_object___template0 { - /* 8028B580 */ void func_8028B580(); - /* 8028B5E0 */ void func_8028B5E0(f32, JStudio::TAdaptor*) /* const */; + /* 8028B580 */ void func_8028B580(void* _this); + /* 8028B5E0 */ void func_8028B5E0(void* _this, f32, JStudio::TAdaptor*) /* const */; }; struct TAdaptor_object_ { @@ -173,8 +173,8 @@ __cl__Q314JStudio_JStage14TAdaptor_actor26TVVOutput_ANIMATION_FRAME_CFfPQ27JStud extern "C" void __dt__Q314JStudio_JStage14TAdaptor_actor26TVVOutput_ANIMATION_FRAME_Fv(); extern "C" void func_8028B198(); extern "C" void __ct__Q27JStudio14TVariableValueFv(); -extern "C" void func_8028B580(); -extern "C" void func_8028B5E0(f32, JStudio::TAdaptor*); +extern "C" void func_8028B580(void* _this); +extern "C" void func_8028B5E0(void* _this, f32, JStudio::TAdaptor*); extern "C" u8 saoVVOutput___Q214JStudio_JStage14TAdaptor_actor[64]; extern "C" u8 saoVVOutput_ANIMATION_FRAME___Q214JStudio_JStage14TAdaptor_actor[144 + 4 /* padding */]; @@ -650,7 +650,7 @@ JStudio_JStage::TAdaptor_actor::adaptor_do_RELATION_ENABLE(JStudio::data::TEOper #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void JStudio_JStage::TAdaptor_actor::setJSG_ID_(void (JStage::TActor::*)(u32), +asm void JStudio_JStage::TAdaptor_actor::setJSG_ID_(void (JStage::TActor::*param_0)(u32), JStudio::data::TEOperationData param_1, void const* param_2, u32 param_3) { nofralloc @@ -740,7 +740,7 @@ asm void func_8028B198() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_8028B198 = (void*)func_8028B198; +REGISTER_CTORS(0x8028B198, func_8028B198); #pragma pop /* 8028B568-8028B580 285EA8 0018+00 1/1 6/6 0/0 .text __ct__Q27JStudio14TVariableValueFv @@ -760,7 +760,7 @@ asm JStudio::TVariableValue::TVariableValue() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_8028B580() { +extern "C" asm void func_8028B580(void* _this) { nofralloc #include "asm/JSystem/JStudio/JStudio_JStage/object-actor/func_8028B580.s" } @@ -772,7 +772,8 @@ extern "C" asm void func_8028B580() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_8028B5E0(f32 param_0, JStudio::TAdaptor* param_1) /* const */ { +extern "C" asm void func_8028B5E0(void* _this, f32 param_0, + JStudio::TAdaptor* param_1) /* const */ { nofralloc #include "asm/JSystem/JStudio/JStudio_JStage/object-actor/func_8028B5E0.s" } diff --git a/libs/JSystem/JStudio/JStudio_JStage/object-camera.cpp b/libs/JSystem/JStudio/JStudio_JStage/object-camera.cpp index e1ea67641b3..aef4e09a482 100644 --- a/libs/JSystem/JStudio/JStudio_JStage/object-camera.cpp +++ b/libs/JSystem/JStudio/JStudio_JStage/object-camera.cpp @@ -13,14 +13,6 @@ struct Vec {}; -struct JStage { - struct TSystem {}; - - struct TCamera {}; - - struct TObject {}; -}; - namespace JStudio { struct data { struct TEOperationData {}; @@ -55,6 +47,14 @@ struct TAdaptor_camera { }; // namespace JStudio +struct JStage { + struct TSystem {}; + + struct TCamera {}; + + struct TObject {}; +}; + struct JStudio_JStage { struct TAdaptor_camera { /* 8028B8A0 */ TAdaptor_camera(JStage::TSystem const*, JStage::TCamera*); @@ -89,8 +89,8 @@ struct JStudio_JStage { struct TVariableValueOutput_object_ {}; /* TVariableValueOutput_object_ */ struct TVariableValueOutput_object___template1 { - /* 8028C4E4 */ void func_8028C4E4(); - /* 8028C544 */ void func_8028C544(f32, JStudio::TAdaptor*) /* const */; + /* 8028C4E4 */ void func_8028C4E4(void* _this); + /* 8028C544 */ void func_8028C544(void* _this, f32, JStudio::TAdaptor*) /* const */; }; struct TAdaptor_object_ { @@ -137,8 +137,8 @@ extern "C" void getJSG_position___Q214JStudio_JStage15TAdaptor_cameraFPCQ27JStud extern "C" void setJSG_targetPosition___Q214JStudio_JStage15TAdaptor_cameraFPCQ27JStudio8TControl(); extern "C" void getJSG_targetPosition___Q214JStudio_JStage15TAdaptor_cameraFPCQ27JStudio8TControl(); extern "C" void func_8028C180(); -extern "C" void func_8028C4E4(); -extern "C" void func_8028C544(f32, JStudio::TAdaptor*); +extern "C" void func_8028C4E4(void* _this); +extern "C" void func_8028C544(void* _this, f32, JStudio::TAdaptor*); extern "C" u8 saoVVOutput___Q214JStudio_JStage15TAdaptor_camera[160 + 4 /* padding */]; // @@ -561,7 +561,7 @@ asm void func_8028C180() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_8028C180 = (void*)func_8028C180; +REGISTER_CTORS(0x8028C180, func_8028C180); #pragma pop /* 8028C4E4-8028C544 286E24 0060+00 2/1 0/0 0/0 .text @@ -570,7 +570,7 @@ SECTION_CTORS void* const _ctors_8028C180 = (void*)func_8028C180; #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_8028C4E4() { +extern "C" asm void func_8028C4E4(void* _this) { nofralloc #include "asm/JSystem/JStudio/JStudio_JStage/object-camera/func_8028C4E4.s" } @@ -582,7 +582,8 @@ extern "C" asm void func_8028C4E4() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_8028C544(f32 param_0, JStudio::TAdaptor* param_1) /* const */ { +extern "C" asm void func_8028C544(void* _this, f32 param_0, + JStudio::TAdaptor* param_1) /* const */ { nofralloc #include "asm/JSystem/JStudio/JStudio_JStage/object-camera/func_8028C544.s" } diff --git a/libs/JSystem/JStudio/JStudio_JStage/object-fog.cpp b/libs/JSystem/JStudio/JStudio_JStage/object-fog.cpp index 395503ea0d5..509df2b4f70 100644 --- a/libs/JSystem/JStudio/JStudio_JStage/object-fog.cpp +++ b/libs/JSystem/JStudio/JStudio_JStage/object-fog.cpp @@ -61,8 +61,8 @@ struct JStudio_JStage { struct TVariableValueOutput_object_ {}; /* TVariableValueOutput_object_ */ struct TVariableValueOutput_object___template2 { - /* 8028CAC0 */ void func_8028CAC0(); - /* 8028CB20 */ void func_8028CB20(f32, JStudio::TAdaptor*) /* const */; + /* 8028CAC0 */ void func_8028CAC0(void* _this); + /* 8028CB20 */ void func_8028CB20(void* _this, f32, JStudio::TAdaptor*) /* const */; }; struct TAdaptor_object_ { @@ -82,8 +82,8 @@ extern "C" void adaptor_do_end__Q214JStudio_JStage12TAdaptor_fogFv(); extern "C" void adaptor_do_update__Q214JStudio_JStage12TAdaptor_fogFUl(); extern "C" void adaptor_do_data__Q214JStudio_JStage12TAdaptor_fogFPCvUlPCvUl(); extern "C" void func_8028C8A4(); -extern "C" void func_8028CAC0(); -extern "C" void func_8028CB20(f32, JStudio::TAdaptor*); +extern "C" void func_8028CAC0(void* _this); +extern "C" void func_8028CB20(void* _this, f32, JStudio::TAdaptor*); extern "C" u8 saoVVOutput___Q214JStudio_JStage12TAdaptor_fog[96 + 4 /* padding */]; // @@ -293,7 +293,7 @@ asm void func_8028C8A4() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_8028C8A4 = (void*)func_8028C8A4; +REGISTER_CTORS(0x8028C8A4, func_8028C8A4); #pragma pop /* 8028CAC0-8028CB20 287400 0060+00 2/1 0/0 0/0 .text @@ -302,7 +302,7 @@ SECTION_CTORS void* const _ctors_8028C8A4 = (void*)func_8028C8A4; #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_8028CAC0() { +extern "C" asm void func_8028CAC0(void* _this) { nofralloc #include "asm/JSystem/JStudio/JStudio_JStage/object-fog/func_8028CAC0.s" } @@ -314,7 +314,8 @@ extern "C" asm void func_8028CAC0() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_8028CB20(f32 param_0, JStudio::TAdaptor* param_1) /* const */ { +extern "C" asm void func_8028CB20(void* _this, f32 param_0, + JStudio::TAdaptor* param_1) /* const */ { nofralloc #include "asm/JSystem/JStudio/JStudio_JStage/object-fog/func_8028CB20.s" } diff --git a/libs/JSystem/JStudio/JStudio_JStage/object-light.cpp b/libs/JSystem/JStudio/JStudio_JStage/object-light.cpp index 448fabda6b4..6fa34ee8701 100644 --- a/libs/JSystem/JStudio/JStudio_JStage/object-light.cpp +++ b/libs/JSystem/JStudio/JStudio_JStage/object-light.cpp @@ -371,5 +371,5 @@ asm void func_8028D2B8() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_8028D2B8 = (void*)func_8028D2B8; +REGISTER_CTORS(0x8028D2B8, func_8028D2B8); #pragma pop diff --git a/libs/JSystem/JStudio/JStudio_JStage/object.cpp b/libs/JSystem/JStudio/JStudio_JStage/object.cpp index 68a4faee669..df2d54a052b 100644 --- a/libs/JSystem/JStudio/JStudio_JStage/object.cpp +++ b/libs/JSystem/JStudio/JStudio_JStage/object.cpp @@ -13,6 +13,10 @@ struct Vec {}; +struct JStage { + struct TObject {}; +}; + namespace JStudio { struct TControl { struct TTransform_translation_rotation_scaling {}; @@ -30,10 +34,6 @@ struct math { }; // namespace JStudio -struct JStage { - struct TObject {}; -}; - struct JStudio_JStage { struct TAdaptor_object_ { /* 8028A470 */ void adaptor_object_data_(void const*, u32, void const*, u32); diff --git a/libs/JSystem/JUtility/JUTCacheFont.cpp b/libs/JSystem/JUtility/JUTCacheFont.cpp index 22fb6e63b6e..a511fd6fef3 100644 --- a/libs/JSystem/JUtility/JUTCacheFont.cpp +++ b/libs/JSystem/JUtility/JUTCacheFont.cpp @@ -240,6 +240,13 @@ asm void JUTCacheFont::initialize_state() { } #pragma pop +/* ############################################################################################## */ +/* 8039D2F0-8039D2F0 029950 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8039D2F0 = "JUTCacheFont: Unknown data block\n"; +#pragma pop + /* 802DD35C-802DD4EC 2D7C9C 0190+00 1/1 0/0 0/0 .text * getMemorySize__12JUTCacheFontFPC7ResFONTPUsPUlPUsPUlPUsPUlPUl */ #pragma push @@ -297,6 +304,16 @@ asm void JUTCacheFont::allocArray(JKRHeap* param_0) { } #pragma pop +/* ############################################################################################## */ +/* 8039D2F0-8039D2F0 029950 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8039D312 = "JUTCacheFont.cpp"; +SECTION_DEAD static char const* const stringBase_8039D323 = "%s"; +SECTION_DEAD static char const* const stringBase_8039D326 = "trouble occurred in JKRMainRamToAram."; +SECTION_DEAD static char const* const stringBase_8039D34C = "Unknown data block\n"; +#pragma pop + /* 802DD8EC-802DDB0C 2D822C 0220+00 1/0 0/0 0/0 .text setBlock__12JUTCacheFontFv */ #pragma push #pragma optimization_level 0 @@ -462,13 +479,4 @@ asm void JUTResFont::getHeight() const { } #pragma pop -/* 8039D2F0-8039D360 029950 0070+00 2/2 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_8039D2F0 = "JUTCacheFont: Unknown data block\n"; -SECTION_DEAD static char const* const stringBase_8039D312 = "JUTCacheFont.cpp"; -SECTION_DEAD static char const* const stringBase_8039D323 = "%s"; -SECTION_DEAD static char const* const stringBase_8039D326 = "trouble occurred in JKRMainRamToAram."; -SECTION_DEAD static char const* const stringBase_8039D34C = "Unknown data block\n"; -#pragma pop +/* 8039D2F0-8039D2F0 029950 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/libs/JSystem/JUtility/JUTConsole.cpp b/libs/JSystem/JUtility/JUTConsole.cpp index a85f652d426..eb9aa06bb12 100644 --- a/libs/JSystem/JUtility/JUTConsole.cpp +++ b/libs/JSystem/JUtility/JUTConsole.cpp @@ -118,9 +118,9 @@ extern "C" void draw__17JUTConsoleManagerCFv(); extern "C" void drawDirect__17JUTConsoleManagerCFb(); extern "C" void setDirectConsole__17JUTConsoleManagerFP10JUTConsole(); extern "C" void JUTSetReportConsole(); -extern "C" static void JUTGetReportConsole(); +extern "C" u32 JUTGetReportConsole(); extern "C" void JUTSetWarningConsole(); -extern "C" static void JUTGetWarningConsole(); +extern "C" u32 JUTGetWarningConsole(); extern "C" static void JUTReportConsole_f_va(); extern "C" void JUTReportConsole_f(); extern "C" void JUTReportConsole(); @@ -337,6 +337,14 @@ asm void JUTConsole_print_f_va_() { } #pragma pop +/* ############################################################################################## */ +/* 8039D9A8-8039D9A8 02A008 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8039D9A8 = "[%03d] %s\n"; +SECTION_DEAD static char const* const stringBase_8039D9B3 = "%s\n"; +#pragma pop + /* 802E7F7C-802E80A8 2E28BC 012C+00 0/0 2/2 0/0 .text dumpToTerminal__10JUTConsoleFUi */ #pragma push #pragma optimization_level 0 @@ -453,7 +461,7 @@ asm void JUTConsoleManager::setDirectConsole(JUTConsole* param_0) { #pragma pop /* ############################################################################################## */ -/* 80451574-80451578 000A74 0004+00 2/2 0/0 0/0 .sbss sReportConsole */ +/* 80451574-80451578 000A74 0004+00 2/1 0/0 0/0 .sbss sReportConsole */ static u8 sReportConsole[4]; /* 802E8520-802E8528 2E2E60 0008+00 1/1 1/1 0/0 .text JUTSetReportConsole */ @@ -466,18 +474,13 @@ asm void JUTSetReportConsole() { } #pragma pop -/* 802E8528-802E8530 2E2E68 0008+00 2/2 0/0 0/0 .text JUTGetReportConsole */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void JUTGetReportConsole() { - nofralloc -#include "asm/JSystem/JUtility/JUTConsole/JUTGetReportConsole.s" +/* 802E8528-802E8530 -00001 0008+00 0/0 0/0 0/0 .text JUTGetReportConsole */ +u32 JUTGetReportConsole() { + return *(u32*)(&sReportConsole); } -#pragma pop /* ############################################################################################## */ -/* 80451578-80451580 000A78 0004+04 2/2 0/0 0/0 .sbss sWarningConsole */ +/* 80451578-80451580 000A78 0004+04 2/1 0/0 0/0 .sbss sWarningConsole */ static u8 sWarningConsole[4 + 4 /* padding */]; /* 802E8530-802E8538 2E2E70 0008+00 1/1 1/1 0/0 .text JUTSetWarningConsole */ @@ -490,15 +493,10 @@ asm void JUTSetWarningConsole() { } #pragma pop -/* 802E8538-802E8540 2E2E78 0008+00 1/1 0/0 0/0 .text JUTGetWarningConsole */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void JUTGetWarningConsole() { - nofralloc -#include "asm/JSystem/JUtility/JUTConsole/JUTGetWarningConsole.s" +/* 802E8538-802E8540 -00001 0008+00 0/0 0/0 0/0 .text JUTGetWarningConsole */ +u32 JUTGetWarningConsole() { + return *(u32*)(&sWarningConsole); } -#pragma pop /* 802E8540-802E85C8 2E2E80 0088+00 2/2 0/0 0/0 .text JUTReportConsole_f_va */ #pragma push @@ -520,6 +518,19 @@ asm void JUTReportConsole_f() { } #pragma pop +/* ############################################################################################## */ +/* 8039D9A8-8039D9A8 02A008 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8039D9B7 = + "\n:::dump of console[%x]----------------\n"; +SECTION_DEAD static char const* const stringBase_8039D9E0 = + ":::dump of console[%x] END------------\n"; +SECTION_DEAD static char const* const stringBase_8039DA08 = "%s"; +/* @stringBase0 padding */ +SECTION_DEAD static char const* const pad_8039DA0B = "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"; +#pragma pop + /* 802E8648-802E867C 2E2F88 0034+00 0/0 6/6 0/0 .text JUTReportConsole */ #pragma push #pragma optimization_level 0 @@ -550,17 +561,4 @@ asm void JUTWarningConsole() { } #pragma pop -/* 8039D9A8-8039DA20 02A008 0063+15 3/3 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_8039D9A8 = "[%03d] %s\n"; -SECTION_DEAD static char const* const stringBase_8039D9B3 = "%s\n"; -SECTION_DEAD static char const* const stringBase_8039D9B7 = - "\n:::dump of console[%x]----------------\n"; -SECTION_DEAD static char const* const stringBase_8039D9E0 = - ":::dump of console[%x] END------------\n"; -SECTION_DEAD static char const* const stringBase_8039DA08 = "%s"; -/* @stringBase0 padding */ -SECTION_DEAD static char const* const pad_8039DA0B = "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"; -#pragma pop +/* 8039D9A8-8039D9A8 02A008 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/libs/JSystem/JUtility/JUTDirectPrint.cpp b/libs/JSystem/JUtility/JUTDirectPrint.cpp index 3540c8bf80b..5b007623ccf 100644 --- a/libs/JSystem/JUtility/JUTDirectPrint.cpp +++ b/libs/JSystem/JUtility/JUTDirectPrint.cpp @@ -345,6 +345,15 @@ asm void JUTDirectPrint::printSub(u16 param_0, u16 param_1, char const* param_2, } #pragma pop +/* ############################################################################################## */ +/* 8039D9A0-8039D9A0 02A000 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8039D9A0 = "%s"; +/* @stringBase0 padding */ +SECTION_DEAD static char const* const pad_8039D9A3 = "\0\0\0\0"; +#pragma pop + /* 802E46D8-802E4708 2DF018 0030+00 0/0 2/2 0/0 .text drawString__14JUTDirectPrintFUsUsPc */ #pragma push @@ -421,11 +430,4 @@ asm void JUTDirectPrint::setCharColor(u8 param_0, u8 param_1, u8 param_2) { } #pragma pop -/* 8039D9A0-8039D9A8 02A000 0003+05 1/1 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_8039D9A0 = "%s"; -/* @stringBase0 padding */ -SECTION_DEAD static char const* const pad_8039D9A3 = "\0\0\0\0"; -#pragma pop +/* 8039D9A0-8039D9A0 02A000 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/libs/JSystem/JUtility/JUTException.cpp b/libs/JSystem/JUtility/JUTException.cpp index 167c6e71440..6ba5f2fb0b1 100644 --- a/libs/JSystem/JUtility/JUTException.cpp +++ b/libs/JSystem/JUtility/JUTException.cpp @@ -122,7 +122,7 @@ template struct JSUList {}; /* JSUList */ struct JSUList__template13 { - /* 802E4194 */ void func_802E4194(); + /* 802E4194 */ void func_802E4194(void* _this); }; struct JKRThread { @@ -170,7 +170,7 @@ extern "C" void createConsole__12JUTExceptionFPvUl(); extern "C" void __ct__13JUTExternalFBFP16_GXRenderModeObj8_GXGammaPvUl(); extern "C" void __dt__12JUTExceptionFv(); extern "C" void __sinit_JUTException_cpp(); -extern "C" void func_802E4194(); +extern "C" void func_802E4194(void* _this); extern "C" extern char const* const JUTException__stringBase0; extern "C" u8 sMessageQueue__12JUTException[32]; extern "C" void* sCpuExpName__12JUTException[17]; @@ -278,6 +278,27 @@ extern "C" u8 sManager__17JUTConsoleManager[4]; // /* ############################################################################################## */ +/* 8039D490-8039D490 029AF0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8039D490 = "SYSTEM RESET"; +SECTION_DEAD static char const* const stringBase_8039D49D = "MACHINE CHECK"; +SECTION_DEAD static char const* const stringBase_8039D4AB = "DSI"; +SECTION_DEAD static char const* const stringBase_8039D4AF = "ISI"; +SECTION_DEAD static char const* const stringBase_8039D4B3 = "EXTERNAL INTERRUPT"; +SECTION_DEAD static char const* const stringBase_8039D4C6 = "ALIGNMENT"; +SECTION_DEAD static char const* const stringBase_8039D4D0 = "PROGRAM"; +SECTION_DEAD static char const* const stringBase_8039D4D8 = "FLOATING POINT"; +SECTION_DEAD static char const* const stringBase_8039D4E7 = "DECREMENTER"; +SECTION_DEAD static char const* const stringBase_8039D4F3 = "SYSTEM CALL"; +SECTION_DEAD static char const* const stringBase_8039D4FF = "TRACE"; +SECTION_DEAD static char const* const stringBase_8039D505 = "PERFORMACE MONITOR"; +SECTION_DEAD static char const* const stringBase_8039D518 = "BREAK POINT"; +SECTION_DEAD static char const* const stringBase_8039D524 = "SYSTEM INTERRUPT"; +SECTION_DEAD static char const* const stringBase_8039D535 = "THERMAL INTERRUPT"; +SECTION_DEAD static char const* const stringBase_8039D547 = "PROTECTION"; +#pragma pop + /* 803CC620-803CC640 029740 0020+00 3/3 0/0 0/0 .data sMessageQueue__12JUTException */ SECTION_DATA u8 JUTException::sMessageQueue[32] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -407,6 +428,12 @@ asm void JUTException::errorHandler(u16 param_0, OSContext* param_1, u32 param_2 #pragma pop /* ############################################################################################## */ +/* 8039D490-8039D490 029AF0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8039D552 = "%s in \"%s\" on line %d\n"; +#pragma pop + /* 8043458C-80434598 0612AC 000C+00 1/1 0/0 0/0 .bss @2182 */ static u8 lit_2182[12]; @@ -451,6 +478,16 @@ asm void JUTException::setFPException(u32 param_0) { #pragma pop /* ############################################################################################## */ +/* 8039D490-8039D490 029AF0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8039D569 = "F%02d: Nan "; +SECTION_DEAD static char const* const stringBase_8039D57A = "F%02d:+Inf "; +SECTION_DEAD static char const* const stringBase_8039D58A = "F%02d:-Inf "; +SECTION_DEAD static char const* const stringBase_8039D59A = "F%02d: 0.0 "; +SECTION_DEAD static char const* const stringBase_8039D5AB = "F%02d:%+.3E"; +#pragma pop + /* 80456050-80456054 004650 0004+00 1/1 0/0 0/0 .sdata2 @2293 */ SECTION_SDATA2 static u8 lit_2293[4] = { 0x00, @@ -469,6 +506,16 @@ asm void JUTException::showFloatSub(int param_0, f32 param_1) { } #pragma pop +/* ############################################################################################## */ +/* 8039D490-8039D490 029AF0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8039D5B7 = + "-------------------------------- FPR\n"; +SECTION_DEAD static char const* const stringBase_8039D5DD = " "; +SECTION_DEAD static char const* const stringBase_8039D5DF = "\n"; +#pragma pop + /* 802E2454-802E2578 2DCD94 0124+00 1/1 0/0 0/0 .text showFloat__12JUTExceptionFP9OSContext */ #pragma push #pragma optimization_level 0 @@ -501,6 +548,17 @@ static asm void search_name_part(u8* param_0, u8* param_1, int param_2) { } #pragma pop +/* ############################################################################################## */ +/* 8039D490-8039D490 029AF0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8039D5E1 = + "-------------------------------- TRACE\n"; +SECTION_DEAD static char const* const stringBase_8039D609 = "Address: BackChain LR save\n"; +SECTION_DEAD static char const* const stringBase_8039D629 = "Suppress trace.\n"; +SECTION_DEAD static char const* const stringBase_8039D63A = "%08X: %08X %08X\n"; +#pragma pop + /* 802E26B0-802E27B0 2DCFF0 0100+00 1/1 0/0 0/0 .text showStack__12JUTExceptionFP9OSContext */ #pragma push #pragma optimization_level 0 @@ -511,6 +569,30 @@ asm void JUTException::showStack(OSContext* param_0) { } #pragma pop +/* ############################################################################################## */ +/* 8039D490-8039D490 029AF0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8039D64F = "CONTEXT:%08XH (%s EXCEPTION)\n"; +SECTION_DEAD static char const* const stringBase_8039D66E = "CONTEXT:%08XH\n"; +SECTION_DEAD static char const* const stringBase_8039D67D = " FPE: Invalid operation\n"; +SECTION_DEAD static char const* const stringBase_8039D696 = " SNaN\n"; +SECTION_DEAD static char const* const stringBase_8039D69D = " Infinity - Infinity\n"; +SECTION_DEAD static char const* const stringBase_8039D6B3 = " Infinity / Infinity\n"; +SECTION_DEAD static char const* const stringBase_8039D6C9 = " 0 / 0\n"; +SECTION_DEAD static char const* const stringBase_8039D6D1 = " Infinity * 0\n"; +SECTION_DEAD static char const* const stringBase_8039D6E0 = " Invalid compare\n"; +SECTION_DEAD static char const* const stringBase_8039D6F2 = " Software request\n"; +SECTION_DEAD static char const* const stringBase_8039D705 = " Invalid square root\n"; +SECTION_DEAD static char const* const stringBase_8039D71B = " Invalid integer convert\n"; +SECTION_DEAD static char const* const stringBase_8039D735 = " FPE: Overflow\n"; +SECTION_DEAD static char const* const stringBase_8039D745 = " FPE: Underflow\n"; +SECTION_DEAD static char const* const stringBase_8039D756 = " FPE: Zero division\n"; +SECTION_DEAD static char const* const stringBase_8039D76B = " FPE: Inexact result\n"; +SECTION_DEAD static char const* const stringBase_8039D781 = "SRR0: %08XH SRR1:%08XH\n"; +SECTION_DEAD static char const* const stringBase_8039D79D = "DSISR: %08XH DAR: %08XH\n"; +#pragma pop + /* 802E27B0-802E2A84 2DD0F0 02D4+00 1/1 0/0 0/0 .text * showMainInfo__12JUTExceptionFUsP9OSContextUlUl */ #pragma push @@ -522,6 +604,17 @@ asm void JUTException::showMainInfo(u16 param_0, OSContext* param_1, u32 param_2 } #pragma pop +/* ############################################################################################## */ +/* 8039D490-8039D490 029AF0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8039D7B9 = + "-------------------------------- GPR\n"; +SECTION_DEAD static char const* const stringBase_8039D7DF = + "R%02d:%08XH R%02d:%08XH R%02d:%08XH\n"; +SECTION_DEAD static char const* const stringBase_8039D806 = "R%02d:%08XH R%02d:%08XH\n"; +#pragma pop + /* 802E2A84-802E2B44 2DD3C4 00C0+00 1/1 0/0 0/0 .text showGPR__12JUTExceptionFP9OSContext */ #pragma push @@ -533,6 +626,14 @@ asm void JUTException::showGPR(OSContext* param_0) { } #pragma pop +/* ############################################################################################## */ +/* 8039D490-8039D490 029AF0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8039D820 = ""; +SECTION_DEAD static char const* const stringBase_8039D821 = "%s %s:%x section:%d\n"; +#pragma pop + /* 802E2B44-802E2CA0 2DD484 015C+00 3/3 0/0 0/0 .text showMapInfo_subroutine__12JUTExceptionFUlb */ #pragma push @@ -544,6 +645,18 @@ asm void JUTException::showMapInfo_subroutine(u32 param_0, bool param_1) { } #pragma pop +/* ############################################################################################## */ +/* 8039D490-8039D490 029AF0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8039D836 = + "-------------------------------- GPRMAP\n"; +SECTION_DEAD static char const* const stringBase_8039D85F = "R%02d: %08XH"; +SECTION_DEAD static char const* const stringBase_8039D86C = " no information\n"; +SECTION_DEAD static char const* const stringBase_8039D87E = + " no register which seem to address.\n"; +#pragma pop + /* 802E2CA0-802E2DAC 2DD5E0 010C+00 1/1 0/0 0/0 .text showGPRMap__12JUTExceptionFP9OSContext */ #pragma push #pragma optimization_level 0 @@ -554,6 +667,15 @@ asm void JUTException::showGPRMap(OSContext* param_0) { } #pragma pop +/* ############################################################################################## */ +/* 8039D490-8039D490 029AF0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8039D8A4 = + "-------------------------------- SRR0MAP\n"; +SECTION_DEAD static char const* const stringBase_8039D8CE = "SRR0: %08XH"; +#pragma pop + /* 802E2DAC-802E2E70 2DD6EC 00C4+00 1/1 0/0 0/0 .text showSRR0Map__12JUTExceptionFP9OSContext */ #pragma push #pragma optimization_level 0 @@ -564,6 +686,13 @@ asm void JUTException::showSRR0Map(OSContext* param_0) { } #pragma pop +/* ############################################################################################## */ +/* 8039D490-8039D490 029AF0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8039D8DA = " MSR:%08XH\t FPSCR:%08XH\n"; +#pragma pop + /* 802E2E70-802E2F18 2DD7B0 00A8+00 1/1 0/0 0/0 .text * printDebugInfo__12JUTExceptionFQ212JUTException9EInfoPageUsP9OSContextUlUl */ #pragma push @@ -596,6 +725,18 @@ asm void JUTException::readPad(u32* param_0, u32* param_1) { } #pragma pop +/* ############################################################################################## */ +/* 8039D490-8039D490 029AF0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8039D8F3 = + "******** EXCEPTION OCCURRED! ********\nFrameMemor" + "y:%XH\n"; +SECTION_DEAD static char const* const stringBase_8039D92A = + "******** USER HALT ********\nFrameMemory:%XH\n"; +SECTION_DEAD static char const* const stringBase_8039D957 = "--------------------------------\n"; +#pragma pop + /* 802E34C0-802E3980 2DDE00 04C0+00 1/1 0/0 0/0 .text * printContext__12JUTExceptionFUsP9OSContextUlUl */ #pragma push @@ -632,7 +773,7 @@ asm void JUTException::createFB() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void JUTException::setPreUserCallback(void (*)(u16, OSContext*, u32, u32)) { +asm void JUTException::setPreUserCallback(void (*param_0)(u16, OSContext*, u32, u32)) { nofralloc #include "asm/JSystem/JUtility/JUTException/setPreUserCallback__12JUTExceptionFPFUsP9OSContextUlUl_v.s" } @@ -643,7 +784,7 @@ asm void JUTException::setPreUserCallback(void (*)(u16, OSContext*, u32, u32)) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void JUTException::setPostUserCallback(void (*)(u16, OSContext*, u32, u32)) { +asm void JUTException::setPostUserCallback(void (*param_0)(u16, OSContext*, u32, u32)) { nofralloc #include "asm/JSystem/JUtility/JUTException/setPostUserCallback__12JUTExceptionFPFUsP9OSContextUlUl_v.s" } @@ -660,6 +801,13 @@ asm void JUTException::appendMapFile(char const* param_0) { } #pragma pop +/* ############################################################################################## */ +/* 8039D490-8039D490 029AF0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8039D979 = ".map"; +#pragma pop + /* 802E3BA0-802E3C90 2DE4E0 00F0+00 1/1 0/0 0/0 .text * queryMapAddress__12JUTExceptionFPcUllPUlPUlPcUlbb */ #pragma push @@ -673,6 +821,15 @@ asm void JUTException::queryMapAddress(char* param_0, u32 param_1, s32 param_2, } #pragma pop +/* ############################################################################################## */ +/* 8039D490-8039D490 029AF0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8039D97E = " [%08X]: .%s [%08X: %XH]\n %s\n"; +/* @stringBase0 padding */ +SECTION_DEAD static char const* const pad_8039D99E = "\0"; +#pragma pop + /* 802E3C90-802E3FEC 2DE5D0 035C+00 1/1 0/0 0/0 .text * queryMapAddress_single__12JUTExceptionFPcUllPUlPUlPcUlbb */ #pragma push @@ -742,7 +899,7 @@ asm void __sinit_JUTException_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_802E414C = (void*)__sinit_JUTException_cpp; +REGISTER_CTORS(0x802E414C, __sinit_JUTException_cpp); #pragma pop /* 802E4194-802E41E8 2DEAD4 0054+00 1/1 0/0 0/0 .text @@ -750,7 +907,7 @@ SECTION_CTORS void* const _ctors_802E414C = (void*)__sinit_JUTException_cpp; #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_802E4194() { +extern "C" asm void func_802E4194(void* _this) { nofralloc #include "asm/JSystem/JUtility/JUTException/func_802E4194.s" } @@ -762,84 +919,4 @@ SECTION_SDATA extern u8 data_804508F8[8] = { 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -/* 8039D490-8039D9A0 029AF0 050E+02 14/13 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_8039D490 = "SYSTEM RESET"; -SECTION_DEAD static char const* const stringBase_8039D49D = "MACHINE CHECK"; -SECTION_DEAD static char const* const stringBase_8039D4AB = "DSI"; -SECTION_DEAD static char const* const stringBase_8039D4AF = "ISI"; -SECTION_DEAD static char const* const stringBase_8039D4B3 = "EXTERNAL INTERRUPT"; -SECTION_DEAD static char const* const stringBase_8039D4C6 = "ALIGNMENT"; -SECTION_DEAD static char const* const stringBase_8039D4D0 = "PROGRAM"; -SECTION_DEAD static char const* const stringBase_8039D4D8 = "FLOATING POINT"; -SECTION_DEAD static char const* const stringBase_8039D4E7 = "DECREMENTER"; -SECTION_DEAD static char const* const stringBase_8039D4F3 = "SYSTEM CALL"; -SECTION_DEAD static char const* const stringBase_8039D4FF = "TRACE"; -SECTION_DEAD static char const* const stringBase_8039D505 = "PERFORMACE MONITOR"; -SECTION_DEAD static char const* const stringBase_8039D518 = "BREAK POINT"; -SECTION_DEAD static char const* const stringBase_8039D524 = "SYSTEM INTERRUPT"; -SECTION_DEAD static char const* const stringBase_8039D535 = "THERMAL INTERRUPT"; -SECTION_DEAD static char const* const stringBase_8039D547 = "PROTECTION"; -SECTION_DEAD static char const* const stringBase_8039D552 = "%s in \"%s\" on line %d\n"; -SECTION_DEAD static char const* const stringBase_8039D569 = "F%02d: Nan "; -SECTION_DEAD static char const* const stringBase_8039D57A = "F%02d:+Inf "; -SECTION_DEAD static char const* const stringBase_8039D58A = "F%02d:-Inf "; -SECTION_DEAD static char const* const stringBase_8039D59A = "F%02d: 0.0 "; -SECTION_DEAD static char const* const stringBase_8039D5AB = "F%02d:%+.3E"; -SECTION_DEAD static char const* const stringBase_8039D5B7 = - "-------------------------------- FPR\n"; -SECTION_DEAD static char const* const stringBase_8039D5DD = " "; -SECTION_DEAD static char const* const stringBase_8039D5DF = "\n"; -SECTION_DEAD static char const* const stringBase_8039D5E1 = - "-------------------------------- TRACE\n"; -SECTION_DEAD static char const* const stringBase_8039D609 = "Address: BackChain LR save\n"; -SECTION_DEAD static char const* const stringBase_8039D629 = "Suppress trace.\n"; -SECTION_DEAD static char const* const stringBase_8039D63A = "%08X: %08X %08X\n"; -SECTION_DEAD static char const* const stringBase_8039D64F = "CONTEXT:%08XH (%s EXCEPTION)\n"; -SECTION_DEAD static char const* const stringBase_8039D66E = "CONTEXT:%08XH\n"; -SECTION_DEAD static char const* const stringBase_8039D67D = " FPE: Invalid operation\n"; -SECTION_DEAD static char const* const stringBase_8039D696 = " SNaN\n"; -SECTION_DEAD static char const* const stringBase_8039D69D = " Infinity - Infinity\n"; -SECTION_DEAD static char const* const stringBase_8039D6B3 = " Infinity / Infinity\n"; -SECTION_DEAD static char const* const stringBase_8039D6C9 = " 0 / 0\n"; -SECTION_DEAD static char const* const stringBase_8039D6D1 = " Infinity * 0\n"; -SECTION_DEAD static char const* const stringBase_8039D6E0 = " Invalid compare\n"; -SECTION_DEAD static char const* const stringBase_8039D6F2 = " Software request\n"; -SECTION_DEAD static char const* const stringBase_8039D705 = " Invalid square root\n"; -SECTION_DEAD static char const* const stringBase_8039D71B = " Invalid integer convert\n"; -SECTION_DEAD static char const* const stringBase_8039D735 = " FPE: Overflow\n"; -SECTION_DEAD static char const* const stringBase_8039D745 = " FPE: Underflow\n"; -SECTION_DEAD static char const* const stringBase_8039D756 = " FPE: Zero division\n"; -SECTION_DEAD static char const* const stringBase_8039D76B = " FPE: Inexact result\n"; -SECTION_DEAD static char const* const stringBase_8039D781 = "SRR0: %08XH SRR1:%08XH\n"; -SECTION_DEAD static char const* const stringBase_8039D79D = "DSISR: %08XH DAR: %08XH\n"; -SECTION_DEAD static char const* const stringBase_8039D7B9 = - "-------------------------------- GPR\n"; -SECTION_DEAD static char const* const stringBase_8039D7DF = - "R%02d:%08XH R%02d:%08XH R%02d:%08XH\n"; -SECTION_DEAD static char const* const stringBase_8039D806 = "R%02d:%08XH R%02d:%08XH\n"; -SECTION_DEAD static char const* const stringBase_8039D820 = ""; -SECTION_DEAD static char const* const stringBase_8039D821 = "%s %s:%x section:%d\n"; -SECTION_DEAD static char const* const stringBase_8039D836 = - "-------------------------------- GPRMAP\n"; -SECTION_DEAD static char const* const stringBase_8039D85F = "R%02d: %08XH"; -SECTION_DEAD static char const* const stringBase_8039D86C = " no information\n"; -SECTION_DEAD static char const* const stringBase_8039D87E = - " no register which seem to address.\n"; -SECTION_DEAD static char const* const stringBase_8039D8A4 = - "-------------------------------- SRR0MAP\n"; -SECTION_DEAD static char const* const stringBase_8039D8CE = "SRR0: %08XH"; -SECTION_DEAD static char const* const stringBase_8039D8DA = " MSR:%08XH\t FPSCR:%08XH\n"; -SECTION_DEAD static char const* const stringBase_8039D8F3 = - "******** EXCEPTION OCCURRED! ********\nFrameMemor" - "y:%XH\n"; -SECTION_DEAD static char const* const stringBase_8039D92A = - "******** USER HALT ********\nFrameMemory:%XH\n"; -SECTION_DEAD static char const* const stringBase_8039D957 = "--------------------------------\n"; -SECTION_DEAD static char const* const stringBase_8039D979 = ".map"; -SECTION_DEAD static char const* const stringBase_8039D97E = " [%08X]: .%s [%08X: %XH]\n %s\n"; -/* @stringBase0 padding */ -SECTION_DEAD static char const* const pad_8039D99E = "\0"; -#pragma pop +/* 8039D490-8039D490 029AF0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/libs/JSystem/JUtility/JUTFontData_Ascfont_fix12.cpp b/libs/JSystem/JUtility/JUTFontData_Ascfont_fix12.cpp index 02a61982512..5968732e538 100644 --- a/libs/JSystem/JUtility/JUTFontData_Ascfont_fix12.cpp +++ b/libs/JSystem/JUtility/JUTFontData_Ascfont_fix12.cpp @@ -1071,4 +1071,4 @@ SECTION_RODATA extern u8 const JUTResFONT_Ascfont_fix12[16736] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8039DA20, &JUTResFONT_Ascfont_fix12); +COMPILER_STRIP_GATE(0x8039DA20, &JUTResFONT_Ascfont_fix12); diff --git a/libs/JSystem/JUtility/JUTGamePad.cpp b/libs/JSystem/JUtility/JUTGamePad.cpp index 018e4cb995f..9c3ad14637c 100644 --- a/libs/JSystem/JUtility/JUTGamePad.cpp +++ b/libs/JSystem/JUtility/JUTGamePad.cpp @@ -29,10 +29,10 @@ struct JUTGamePad { /* 802E1CD8 */ CButton(); }; - struct EWhichStick {}; - struct EStickMode {}; + struct EWhichStick {}; + struct CStick { /* 802E121C */ void clear(); /* 802E1238 */ void update(s8, s8, JUTGamePad::EStickMode, JUTGamePad::EWhichStick, u32); @@ -115,12 +115,12 @@ template struct JSUList {}; /* JSUList */ struct JSUList__template11 { - /* 802E1C54 */ void func_802E1C54(); + /* 802E1C54 */ void func_802E1C54(void* _this); }; /* JSUList */ struct JSUList__template12 { - /* 802E1D08 */ void func_802E1D08(); + /* 802E1D08 */ void func_802E1D08(void* _this); }; struct JKRDisposer { @@ -165,10 +165,10 @@ extern "C" void setRepeat__Q210JUTGamePad7CButtonFUlUlUl(); extern "C" void recalibrate__10JUTGamePadFUl(); extern "C" void checkCallback__19JUTGamePadLongPressFiUl(); extern "C" void __sinit_JUTGamePad_cpp(); -extern "C" void func_802E1C54(); +extern "C" void func_802E1C54(void* _this); extern "C" void __ct__Q210JUTGamePad6CStickFv(); extern "C" void __ct__Q210JUTGamePad7CButtonFv(); -extern "C" void func_802E1D08(); +extern "C" void func_802E1D08(void* _this); extern "C" u8 sChannelMask__Q210JUTGamePad7CRumble[16]; extern "C" u8 mPadList__10JUTGamePad[12]; extern "C" u8 mPadStatus__10JUTGamePad[48]; @@ -730,14 +730,14 @@ asm void __sinit_JUTGamePad_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_802E1B60 = (void*)__sinit_JUTGamePad_cpp; +REGISTER_CTORS(0x802E1B60, __sinit_JUTGamePad_cpp); #pragma pop /* 802E1C54-802E1CA8 2DC594 0054+00 1/1 0/0 0/0 .text __dt__30JSUList<19JUTGamePadLongPress>Fv */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_802E1C54() { +extern "C" asm void func_802E1C54(void* _this) { nofralloc #include "asm/JSystem/JUtility/JUTGamePad/func_802E1C54.s" } @@ -767,7 +767,7 @@ asm JUTGamePad::CButton::CButton() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_802E1D08() { +extern "C" asm void func_802E1D08(void* _this) { nofralloc #include "asm/JSystem/JUtility/JUTGamePad/func_802E1D08.s" } diff --git a/libs/JSystem/JUtility/JUTPalette.cpp b/libs/JSystem/JUtility/JUTPalette.cpp index 403949829be..4cb8693f04e 100644 --- a/libs/JSystem/JUtility/JUTPalette.cpp +++ b/libs/JSystem/JUtility/JUTPalette.cpp @@ -48,6 +48,16 @@ extern "C" void _restgpr_29(); // Declarations: // +/* ############################################################################################## */ +/* 8039D360-8039D360 0299C0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8039D360 = "JUTPalette.cpp"; +SECTION_DEAD static char const* const stringBase_8039D36F = "JUTTexture: TLUT is NULL\n"; +/* @stringBase0 padding */ +SECTION_DEAD static char const* const pad_8039D389 = "\0\0\0\0\0\0"; +#pragma pop + /* 802DE890-802DE91C 2D91D0 008C+00 0/0 8/8 0/0 .text storeTLUT__10JUTPaletteF7_GXTlutP7ResTLUT */ #pragma push #pragma optimization_level 0 @@ -80,12 +90,4 @@ asm void JUTPalette::load() { } #pragma pop -/* 8039D360-8039D390 0299C0 0029+07 1/1 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_8039D360 = "JUTPalette.cpp"; -SECTION_DEAD static char const* const stringBase_8039D36F = "JUTTexture: TLUT is NULL\n"; -/* @stringBase0 padding */ -SECTION_DEAD static char const* const pad_8039D389 = "\0\0\0\0\0\0"; -#pragma pop +/* 8039D360-8039D360 0299C0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/libs/JSystem/JUtility/JUTResFont.cpp b/libs/JSystem/JUtility/JUTResFont.cpp index 137c3c281ec..d662c334178 100644 --- a/libs/JSystem/JUtility/JUTResFont.cpp +++ b/libs/JSystem/JUtility/JUTResFont.cpp @@ -19,8 +19,6 @@ struct JUtility { struct TColor {}; }; -struct JKRHeap {}; - struct JUTFont { struct TWidth {}; @@ -31,6 +29,8 @@ struct JUTFont { /* 802E0118 */ void isLeadByte_ShiftJIS(int); }; +struct JKRHeap {}; + struct JUTResFont { /* 802DDFD8 */ void getResFont() const; /* 802DDFE0 */ void getFontType() const; @@ -241,6 +241,13 @@ asm void JUTResFont::protected_initiate(ResFONT const* param_0, JKRHeap* param_1 } #pragma pop +/* ############################################################################################## */ +/* 8039D45C-8039D45C 029ABC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8039D45C = "JUTResFont: Unknown data block\n"; +#pragma pop + /* 802DF248-802DF344 2D9B88 00FC+00 1/1 0/0 0/0 .text countBlock__10JUTResFontFv */ #pragma push #pragma optimization_level 0 @@ -258,7 +265,13 @@ SECTION_RODATA void* const JUTResFont::saoAboutEncoding_[3] = { (void*)isLeadByte_2Byte__7JUTFontFi, (void*)isLeadByte_ShiftJIS__7JUTFontFi, }; -COMPILER_STRIP_GATE(8039D390, &JUTResFont::saoAboutEncoding_); +COMPILER_STRIP_GATE(0x8039D390, &JUTResFont::saoAboutEncoding_); + +/* 8039D45C-8039D45C 029ABC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8039D47C = "Unknown data block\n"; +#pragma pop /* 802DF344-802DF48C 2D9C84 0148+00 1/0 0/0 0/0 .text setBlock__10JUTResFontFv */ #pragma push @@ -566,7 +579,7 @@ SECTION_RODATA static u8 const halftofull[190 + 2 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(8039D39C, &halftofull); +COMPILER_STRIP_GATE(0x8039D39C, &halftofull); /* 802DFDD8-802DFF60 2DA718 0188+00 2/2 0/0 0/0 .text getFontCode__10JUTResFontCFi */ #pragma push @@ -618,10 +631,4 @@ asm void JUTFont::isLeadByte_ShiftJIS(int param_0) { } #pragma pop -/* 8039D45C-8039D490 029ABC 0034+00 2/2 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_8039D45C = "JUTResFont: Unknown data block\n"; -SECTION_DEAD static char const* const stringBase_8039D47C = "Unknown data block\n"; -#pragma pop +/* 8039D45C-8039D45C 029ABC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/alloc.cpp b/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/alloc.cpp index 78f472e0794..f38ae99f3a1 100644 --- a/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/alloc.cpp +++ b/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/alloc.cpp @@ -60,7 +60,7 @@ SECTION_RODATA static u8 const fix_pool_sizes[24] = { 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x24, 0x00, 0x00, 0x00, 0x34, 0x00, 0x00, 0x00, 0x44, }; -COMPILER_STRIP_GATE(803A2220, &fix_pool_sizes); +COMPILER_STRIP_GATE(0x803A2220, &fix_pool_sizes); /* 80362C20-80362D78 35D560 0158+00 1/1 0/0 0/0 .text deallocate_from_fixed_pools */ #pragma push diff --git a/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/printf.cpp b/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/printf.cpp index 4ffd6e1a900..5494a4dc33a 100644 --- a/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/printf.cpp +++ b/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/printf.cpp @@ -134,6 +134,12 @@ asm void __FileWrite() { #pragma pop /* ############################################################################################## */ +/* 803A2318-803A2318 02E978 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_803A2318 = ""; +#pragma pop + /* 80450AD8-80450AE0 000558 0002+06 1/1 0/0 0/0 .sdata @wstringBase0 */ SECTION_SDATA static u8 data_80450AD8[2 + 6 /* padding */] = { 0x00, @@ -158,6 +164,21 @@ asm void __pformatter() { #pragma pop /* ############################################################################################## */ +/* 803A2318-803A2318 02E978 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_803A2319 = "-INF"; +SECTION_DEAD static char const* const stringBase_803A231E = "-inf"; +SECTION_DEAD static char const* const stringBase_803A2323 = "INF"; +SECTION_DEAD static char const* const stringBase_803A2327 = "inf"; +SECTION_DEAD static char const* const stringBase_803A232B = "-NAN"; +SECTION_DEAD static char const* const stringBase_803A2330 = "-nan"; +SECTION_DEAD static char const* const stringBase_803A2335 = "NAN"; +SECTION_DEAD static char const* const stringBase_803A2339 = "nan"; +/* @stringBase0 padding */ +SECTION_DEAD static char const* const pad_803A233D = "\0\0"; +#pragma pop + /* 80456670-80456678 004C70 0008+00 1/1 0/0 0/0 .sdata2 @1089 */ SECTION_SDATA2 static u8 lit_1089[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -323,19 +344,4 @@ static asm void parse_format() { } #pragma pop -/* 803A2318-803A2340 02E978 0025+03 3/3 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_803A2318 = ""; -SECTION_DEAD static char const* const stringBase_803A2319 = "-INF"; -SECTION_DEAD static char const* const stringBase_803A231E = "-inf"; -SECTION_DEAD static char const* const stringBase_803A2323 = "INF"; -SECTION_DEAD static char const* const stringBase_803A2327 = "inf"; -SECTION_DEAD static char const* const stringBase_803A232B = "-NAN"; -SECTION_DEAD static char const* const stringBase_803A2330 = "-nan"; -SECTION_DEAD static char const* const stringBase_803A2335 = "NAN"; -SECTION_DEAD static char const* const stringBase_803A2339 = "nan"; -/* @stringBase0 padding */ -SECTION_DEAD static char const* const pad_803A233D = "\0\0"; -#pragma pop +/* 803A2318-803A2318 02E978 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/libs/MSL_C.PPCEABI.bare.H/MSL_Common_Embedded/Src/ansi_fp.cpp b/libs/MSL_C.PPCEABI.bare.H/MSL_Common_Embedded/Src/ansi_fp.cpp index 77947213b99..a53026b27c9 100644 --- a/libs/MSL_C.PPCEABI.bare.H/MSL_Common_Embedded/Src/ansi_fp.cpp +++ b/libs/MSL_C.PPCEABI.bare.H/MSL_Common_Embedded/Src/ansi_fp.cpp @@ -59,6 +59,37 @@ asm void __num2dec_internal() { #pragma pop /* ############################################################################################## */ +/* 803A2238-803A2238 02E898 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_803A2238 = "179769313486231580793729011405303420"; +SECTION_DEAD static char const* const stringBase_803A225D = + "542101086242752217003726400434970855712890625"; +SECTION_DEAD static char const* const stringBase_803A228B = + "11102230246251565404236316680908203125"; +SECTION_DEAD static char const* const stringBase_803A22B2 = "23283064365386962890625"; +SECTION_DEAD static char const* const stringBase_803A22CA = "152587890625"; +SECTION_DEAD static char const* const stringBase_803A22D7 = "390625"; +SECTION_DEAD static char const* const stringBase_803A22DE = "78125"; +SECTION_DEAD static char const* const stringBase_803A22E4 = "15625"; +SECTION_DEAD static char const* const stringBase_803A22EA = "3125"; +SECTION_DEAD static char const* const stringBase_803A22EF = "625"; +SECTION_DEAD static char const* const stringBase_803A22F3 = "125"; +SECTION_DEAD static char const* const stringBase_803A22F7 = "25"; +SECTION_DEAD static char const* const stringBase_803A22FA = "5"; +SECTION_DEAD static char const* const stringBase_803A22FC = "1"; +SECTION_DEAD static char const* const stringBase_803A22FE = "2"; +SECTION_DEAD static char const* const stringBase_803A2300 = "4"; +SECTION_DEAD static char const* const stringBase_803A2302 = "8"; +SECTION_DEAD static char const* const stringBase_803A2304 = "16"; +SECTION_DEAD static char const* const stringBase_803A2307 = "32"; +SECTION_DEAD static char const* const stringBase_803A230A = "64"; +SECTION_DEAD static char const* const stringBase_803A230D = "128"; +SECTION_DEAD static char const* const stringBase_803A2311 = "256"; +/* @stringBase0 padding */ +SECTION_DEAD static char const* const pad_803A2315 = "\0\0"; +#pragma pop + /* 803D2AF0-803D2C18 -00001 0124+04 1/1 0/0 0/0 .data @1710 */ SECTION_DATA static void* lit_1710[73 + 1 /* padding */] = { (void*)(((char*)__two_exp) + 0x40), @@ -158,34 +189,4 @@ asm void __timesdec() { } #pragma pop -/* 803A2238-803A2318 02E898 00DD+03 1/1 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_803A2238 = "179769313486231580793729011405303420"; -SECTION_DEAD static char const* const stringBase_803A225D = - "542101086242752217003726400434970855712890625"; -SECTION_DEAD static char const* const stringBase_803A228B = - "11102230246251565404236316680908203125"; -SECTION_DEAD static char const* const stringBase_803A22B2 = "23283064365386962890625"; -SECTION_DEAD static char const* const stringBase_803A22CA = "152587890625"; -SECTION_DEAD static char const* const stringBase_803A22D7 = "390625"; -SECTION_DEAD static char const* const stringBase_803A22DE = "78125"; -SECTION_DEAD static char const* const stringBase_803A22E4 = "15625"; -SECTION_DEAD static char const* const stringBase_803A22EA = "3125"; -SECTION_DEAD static char const* const stringBase_803A22EF = "625"; -SECTION_DEAD static char const* const stringBase_803A22F3 = "125"; -SECTION_DEAD static char const* const stringBase_803A22F7 = "25"; -SECTION_DEAD static char const* const stringBase_803A22FA = "5"; -SECTION_DEAD static char const* const stringBase_803A22FC = "1"; -SECTION_DEAD static char const* const stringBase_803A22FE = "2"; -SECTION_DEAD static char const* const stringBase_803A2300 = "4"; -SECTION_DEAD static char const* const stringBase_803A2302 = "8"; -SECTION_DEAD static char const* const stringBase_803A2304 = "16"; -SECTION_DEAD static char const* const stringBase_803A2307 = "32"; -SECTION_DEAD static char const* const stringBase_803A230A = "64"; -SECTION_DEAD static char const* const stringBase_803A230D = "128"; -SECTION_DEAD static char const* const stringBase_803A2311 = "256"; -/* @stringBase0 padding */ -SECTION_DEAD static char const* const pad_803A2315 = "\0\0"; -#pragma pop +/* 803A2238-803A2238 02E898 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_exp.cpp b/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_exp.cpp index ce5f85a39af..8d2d406741d 100644 --- a/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_exp.cpp +++ b/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_exp.cpp @@ -26,7 +26,7 @@ extern "C" void __ieee754_exp(); SECTION_RODATA static u8 const halF[16] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xBF, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(803A2340, &halF); +COMPILER_STRIP_GATE(0x803A2340, &halF); /* 803A2350-803A2360 02E9B0 0010+00 0/1 0/0 0/0 .rodata ln2HI */ #pragma push @@ -34,7 +34,7 @@ COMPILER_STRIP_GATE(803A2340, &halF); SECTION_RODATA static u8 const ln2HI[16] = { 0x3F, 0xE6, 0x2E, 0x42, 0xFE, 0xE0, 0x00, 0x00, 0xBF, 0xE6, 0x2E, 0x42, 0xFE, 0xE0, 0x00, 0x00, }; -COMPILER_STRIP_GATE(803A2350, &ln2HI); +COMPILER_STRIP_GATE(0x803A2350, &ln2HI); #pragma pop /* 803A2360-803A2370 02E9C0 0010+00 0/1 0/0 0/0 .rodata ln2LO */ @@ -43,7 +43,7 @@ COMPILER_STRIP_GATE(803A2350, &ln2HI); SECTION_RODATA static u8 const ln2LO[16] = { 0x3D, 0xEA, 0x39, 0xEF, 0x35, 0x79, 0x3C, 0x76, 0xBD, 0xEA, 0x39, 0xEF, 0x35, 0x79, 0x3C, 0x76, }; -COMPILER_STRIP_GATE(803A2360, &ln2LO); +COMPILER_STRIP_GATE(0x803A2360, &ln2LO); #pragma pop /* 804567E0-804567E8 004DE0 0008+00 1/1 0/0 0/0 .sdata2 @115 */ diff --git a/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_fmod.cpp b/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_fmod.cpp index 41cfeec9891..1b74d42b5c7 100644 --- a/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_fmod.cpp +++ b/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_fmod.cpp @@ -26,7 +26,7 @@ extern "C" void __ieee754_fmod(); SECTION_RODATA static u8 const Zero[16] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(803A2370, &Zero); +COMPILER_STRIP_GATE(0x803A2370, &Zero); /* 80369B9C-80369ED8 3644DC 033C+00 0/0 1/1 0/0 .text __ieee754_fmod */ #pragma push diff --git a/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_pow.cpp b/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_pow.cpp index bebea7f6d47..31528583cf1 100644 --- a/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_pow.cpp +++ b/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_pow.cpp @@ -31,7 +31,7 @@ extern "C" extern u8 errno[4 + 4 /* padding */]; SECTION_RODATA static u8 const bp[16] = { 0x3F, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3F, 0xF8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(803A2380, &bp); +COMPILER_STRIP_GATE(0x803A2380, &bp); /* 803A2390-803A23A0 02E9F0 0010+00 0/1 0/0 0/0 .rodata dp_h */ #pragma push @@ -39,7 +39,7 @@ COMPILER_STRIP_GATE(803A2380, &bp); SECTION_RODATA static u8 const dp_h[16] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3F, 0xE2, 0xB8, 0x03, 0x40, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(803A2390, &dp_h); +COMPILER_STRIP_GATE(0x803A2390, &dp_h); #pragma pop /* 803A23A0-803A23B0 02EA00 0010+00 0/1 0/0 0/0 .rodata dp_l */ @@ -48,7 +48,7 @@ COMPILER_STRIP_GATE(803A2390, &dp_h); SECTION_RODATA static u8 const dp_l[16] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3E, 0x4C, 0xFD, 0xEB, 0x43, 0xCF, 0xD0, 0x06, }; -COMPILER_STRIP_GATE(803A23A0, &dp_l); +COMPILER_STRIP_GATE(0x803A23A0, &dp_l); #pragma pop /* 80456858-80456860 004E58 0008+00 1/1 0/0 0/0 .sdata2 @336 */ diff --git a/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_rem_pio2.cpp b/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_rem_pio2.cpp index 95ef7241541..8589524abed 100644 --- a/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_rem_pio2.cpp +++ b/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_rem_pio2.cpp @@ -44,7 +44,7 @@ SECTION_RODATA static u8 const two_over_pi[264] = { 0x00, 0x4D, 0x73, 0x27, 0x00, 0x31, 0x06, 0x06, 0x00, 0x15, 0x56, 0xCA, 0x00, 0x73, 0xA8, 0xC9, 0x00, 0x60, 0xE2, 0x7B, 0x00, 0xC0, 0x8C, 0x6B, }; -COMPILER_STRIP_GATE(803A23B0, &two_over_pi); +COMPILER_STRIP_GATE(0x803A23B0, &two_over_pi); /* 803A24B8-803A2538 02EB18 0080+00 1/1 0/0 0/0 .rodata npio2_hw */ SECTION_RODATA static u8 const npio2_hw[128] = { @@ -57,7 +57,7 @@ SECTION_RODATA static u8 const npio2_hw[128] = { 0x40, 0x43, 0xA2, 0x8C, 0x40, 0x44, 0x6B, 0x9C, 0x40, 0x45, 0x34, 0xAC, 0x40, 0x45, 0xFD, 0xBB, 0x40, 0x46, 0xC6, 0xCB, 0x40, 0x47, 0x8F, 0xDB, 0x40, 0x48, 0x58, 0xEB, 0x40, 0x49, 0x21, 0xFB, }; -COMPILER_STRIP_GATE(803A24B8, &npio2_hw); +COMPILER_STRIP_GATE(0x803A24B8, &npio2_hw); /* 80456968-80456970 004F68 0008+00 1/1 0/0 0/0 .sdata2 @145 */ SECTION_SDATA2 static u8 lit_145[8] = { diff --git a/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/k_rem_pio2.cpp b/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/k_rem_pio2.cpp index 4b5f13d51d7..b649cf87817 100644 --- a/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/k_rem_pio2.cpp +++ b/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/k_rem_pio2.cpp @@ -31,7 +31,7 @@ extern "C" void ldexp(); SECTION_RODATA static u8 const init_jk[16] = { 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x06, }; -COMPILER_STRIP_GATE(803A2538, &init_jk); +COMPILER_STRIP_GATE(0x803A2538, &init_jk); /* 803A2548-803A2588 02EBA8 0040+00 1/1 0/0 0/0 .rodata PIo2 */ SECTION_RODATA static u8 const PIo2[64] = { @@ -40,7 +40,7 @@ SECTION_RODATA static u8 const PIo2[64] = { 0x39, 0xF0, 0x1B, 0x83, 0x80, 0x00, 0x00, 0x00, 0x38, 0x7A, 0x25, 0x20, 0x40, 0x00, 0x00, 0x00, 0x36, 0xE3, 0x82, 0x22, 0x80, 0x00, 0x00, 0x00, 0x35, 0x69, 0xF3, 0x1D, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(803A2548, &PIo2); +COMPILER_STRIP_GATE(0x803A2548, &PIo2); /* 80456A08-80456A10 005008 0008+00 1/1 0/0 0/0 .sdata2 @436 */ SECTION_SDATA2 static u8 lit_436[8] = { diff --git a/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/k_tan.cpp b/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/k_tan.cpp index 443b474023f..ea40a790ca2 100644 --- a/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/k_tan.cpp +++ b/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/k_tan.cpp @@ -32,7 +32,7 @@ SECTION_RODATA static u8 const T[104] = { 0x88, 0xA0, 0x37, 0x92, 0xA6, 0x3F, 0x12, 0xB8, 0x0F, 0x32, 0xF0, 0xA7, 0xE9, 0xBE, 0xF3, 0x75, 0xCB, 0xDB, 0x60, 0x53, 0x73, 0x3E, 0xFB, 0x2A, 0x70, 0x74, 0xBF, 0x7A, 0xD4, }; -COMPILER_STRIP_GATE(803A2588, &T); +COMPILER_STRIP_GATE(0x803A2588, &T); /* 80456A80-80456A88 005080 0008+00 1/1 0/0 0/0 .sdata2 @94 */ SECTION_SDATA2 static f64 lit_94 = 1.0; diff --git a/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_atan.cpp b/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_atan.cpp index cd0c6c59ccb..553bf2d2c13 100644 --- a/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_atan.cpp +++ b/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_atan.cpp @@ -27,7 +27,7 @@ SECTION_RODATA static u8 const atanhi[32] = { 0x3F, 0xDD, 0xAC, 0x67, 0x05, 0x61, 0xBB, 0x4F, 0x3F, 0xE9, 0x21, 0xFB, 0x54, 0x44, 0x2D, 0x18, 0x3F, 0xEF, 0x73, 0x0B, 0xD2, 0x81, 0xF6, 0x9B, 0x3F, 0xF9, 0x21, 0xFB, 0x54, 0x44, 0x2D, 0x18, }; -COMPILER_STRIP_GATE(803A25F0, &atanhi); +COMPILER_STRIP_GATE(0x803A25F0, &atanhi); /* 803A2610-803A2630 02EC70 0020+00 0/1 0/0 0/0 .rodata atanlo */ #pragma push @@ -36,7 +36,7 @@ SECTION_RODATA static u8 const atanlo[32] = { 0x3C, 0x7A, 0x2B, 0x7F, 0x22, 0x2F, 0x65, 0xE2, 0x3C, 0x81, 0xA6, 0x26, 0x33, 0x14, 0x5C, 0x07, 0x3C, 0x70, 0x07, 0x88, 0x7A, 0xF0, 0xCB, 0xBD, 0x3C, 0x91, 0xA6, 0x26, 0x33, 0x14, 0x5C, 0x07, }; -COMPILER_STRIP_GATE(803A2610, &atanlo); +COMPILER_STRIP_GATE(0x803A2610, &atanlo); #pragma pop /* 803A2630-803A2688 02EC90 0058+00 0/1 0/0 0/0 .rodata aT */ @@ -50,7 +50,7 @@ SECTION_RODATA static u8 const aT[88] = { 0x52, 0xDE, 0xFD, 0x9A, 0x3F, 0xA9, 0x7B, 0x4B, 0x24, 0x76, 0x0D, 0xEB, 0xBF, 0xA2, 0xB4, 0x44, 0x2C, 0x6A, 0x6C, 0x2F, 0x3F, 0x90, 0xAD, 0x3A, 0xE3, 0x22, 0xDA, 0x11, }; -COMPILER_STRIP_GATE(803A2630, &aT); +COMPILER_STRIP_GATE(0x803A2630, &aT); #pragma pop /* 80456AB8-80456AC0 0050B8 0008+00 1/1 0/0 0/0 .sdata2 @115 */ diff --git a/libs/Runtime.PPCEABI.H/GCN_mem_alloc.cpp b/libs/Runtime.PPCEABI.H/GCN_mem_alloc.cpp index 77bead17af2..02c0c4d2f6e 100644 --- a/libs/Runtime.PPCEABI.H/GCN_mem_alloc.cpp +++ b/libs/Runtime.PPCEABI.H/GCN_mem_alloc.cpp @@ -92,7 +92,7 @@ SECTION_RODATA static u8 const lit_55[54 + 2 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(803A21A8, &lit_55); +COMPILER_STRIP_GATE(0x803A21A8, &lit_55); /* 803A21E0-803A2220 02E840 0039+07 1/1 0/0 0/0 .rodata @56 */ SECTION_RODATA static u8 const lit_56[57 + 7 /* padding */] = { @@ -162,7 +162,7 @@ SECTION_RODATA static u8 const lit_56[57 + 7 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(803A21E0, &lit_56); +COMPILER_STRIP_GATE(0x803A21E0, &lit_56); /* 80362914-803629CC 35D254 00B8+00 0/0 1/1 0/0 .text __sys_free */ #pragma push diff --git a/libs/Runtime.PPCEABI.H/ptmf.cpp b/libs/Runtime.PPCEABI.H/ptmf.cpp index cca12243c31..56f8a6becfe 100644 --- a/libs/Runtime.PPCEABI.H/ptmf.cpp +++ b/libs/Runtime.PPCEABI.H/ptmf.cpp @@ -75,4 +75,4 @@ SECTION_RODATA extern u8 const __ptmf_null[12 + 4 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(803A2180, &__ptmf_null); +COMPILER_STRIP_GATE(0x803A2180, &__ptmf_null); diff --git a/libs/Runtime.PPCEABI.H/runtime.cpp b/libs/Runtime.PPCEABI.H/runtime.cpp index 16fc92860a7..ef699dd9060 100644 --- a/libs/Runtime.PPCEABI.H/runtime.cpp +++ b/libs/Runtime.PPCEABI.H/runtime.cpp @@ -80,7 +80,7 @@ SECTION_RODATA static u8 const __constants[24] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(803A2190, &__constants); +COMPILER_STRIP_GATE(0x803A2190, &__constants); /* 803620AC-80362108 35C9EC 005C+00 0/0 42/42 89/89 .text __cvt_fp2unsigned */ #pragma push diff --git a/libs/SSystem/SComponent/c_bg_s_lin_chk.cpp b/libs/SSystem/SComponent/c_bg_s_lin_chk.cpp index bd4047c13e7..2fe4074e6fa 100644 --- a/libs/SSystem/SComponent/c_bg_s_lin_chk.cpp +++ b/libs/SSystem/SComponent/c_bg_s_lin_chk.cpp @@ -4,10 +4,10 @@ // #include "SSystem/SComponent/c_bg_s_lin_chk.h" -#include "dol2asm.h" -#include "dolphin/types.h" #include "SSystem/SComponent/c_bg_s_chk.h" #include "SSystem/SComponent/c_bg_s_poly_info.h" +#include "dol2asm.h" +#include "dolphin/types.h" // // Forward References: diff --git a/libs/SSystem/SComponent/c_bg_s_shdw_draw.cpp b/libs/SSystem/SComponent/c_bg_s_shdw_draw.cpp index dde40125cfb..df54be66d0b 100644 --- a/libs/SSystem/SComponent/c_bg_s_shdw_draw.cpp +++ b/libs/SSystem/SComponent/c_bg_s_shdw_draw.cpp @@ -4,11 +4,11 @@ // #include "SSystem/SComponent/c_bg_s_shdw_draw.h" +#include "SSystem/SComponent/c_m3d_g_aab.h" +#include "SSystem/SComponent/c_m3d_g_pla.h" +#include "SSystem/SComponent/c_xyz.h" #include "dol2asm.h" #include "dolphin/types.h" -#include "SSystem/SComponent/c_xyz.h" -#include "SSystem/SComponent/c_m3d_g_pla.h" -#include "SSystem/SComponent/c_m3d_g_aab.h" // // Forward References: @@ -74,14 +74,9 @@ asm void cBgS_ShdwDraw::Set(cXyz& param_0, cXyz& param_1) { } #pragma pop -/* 8026806C-80268074 2629AC 0008+00 0/0 1/1 0/0 .text +/* 8026806C-80268074 -00001 0008+00 0/0 0/0 0/0 .text * SetCallback__13cBgS_ShdwDrawFPFP13cBgS_ShdwDrawP10cBgD_Vtx_tiiiP8cM3dGPla_i */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void cBgS_ShdwDraw::SetCallback(int (*)(cBgS_ShdwDraw*, cBgD_Vtx_t*, int, int, int, - cM3dGPla*)) { - nofralloc -#include "asm/SSystem/SComponent/c_bg_s_shdw_draw/SetCallback__13cBgS_ShdwDrawFPFP13cBgS_ShdwDrawP10cBgD_Vtx_tiiiP8cM3dGPla_i.s" +void cBgS_ShdwDraw::SetCallback(int (*param_0)(cBgS_ShdwDraw*, cBgD_Vtx_t*, int, int, int, + cM3dGPla*)) { + *(u32*)(((u8*)this) + 48) /* this->field_0x30 */ = (u32)(param_0); } -#pragma pop diff --git a/libs/SSystem/SComponent/c_cc_d.cpp b/libs/SSystem/SComponent/c_cc_d.cpp index 84e4ca57d92..57591073322 100644 --- a/libs/SSystem/SComponent/c_cc_d.cpp +++ b/libs/SSystem/SComponent/c_cc_d.cpp @@ -43,10 +43,6 @@ struct cM3dGAab { /* 8026EE68 */ void PlusR(f32); }; -struct cCcD_AabAttr {}; - -struct cCcD_PntAttr {}; - struct cCcD_ShapeAttr { struct Shape {}; @@ -60,9 +56,13 @@ struct cCcD_ShapeAttr { static f32 m_virtual_center[3]; }; -struct cCcD_CpsAttr; struct cCcD_TriAttr; struct cCcD_SphAttr; +struct cCcD_PntAttr {}; + +struct cCcD_AabAttr {}; + +struct cCcD_CpsAttr; struct cCcD_CylAttr { /* 80084CC0 */ void GetCoCP() const; /* 80037A4C */ void GetCoCP(); @@ -86,6 +86,26 @@ struct cCcD_CylAttr { /* 802644B8 */ void getShapeAccess(cCcD_ShapeAttr::Shape*) const; }; +struct cCcD_CpsAttr { + /* 80263DC0 */ void CrossAtTg(cCcD_SphAttr const&, cXyz*) const; + /* 80263E04 */ void CrossAtTg(cCcD_TriAttr const&, cXyz*) const; + /* 80084FE4 */ void CrossAtTg(cCcD_ShapeAttr const&, cXyz*) const; + /* 80084FDC */ bool CrossAtTg(cCcD_PntAttr const&, cXyz*) const; + /* 80084FD4 */ bool CrossAtTg(cCcD_AabAttr const&, cXyz*) const; + /* 80263D38 */ void CrossAtTg(cCcD_CpsAttr const&, cXyz*) const; + /* 80263D7C */ void CrossAtTg(cCcD_CylAttr const&, cXyz*) const; + /* 80263F24 */ void CrossCo(cCcD_CylAttr const&, f32*) const; + /* 80085024 */ bool CrossCo(cCcD_TriAttr const&, f32*) const; + /* 8008502C */ bool CrossCo(cCcD_PntAttr const&, f32*) const; + /* 8008501C */ bool CrossCo(cCcD_AabAttr const&, f32*) const; + /* 80263ED4 */ void CrossCo(cCcD_CpsAttr const&, f32*) const; + /* 80263F74 */ void CrossCo(cCcD_SphAttr const&, f32*) const; + /* 80085034 */ void CrossCo(cCcD_ShapeAttr const&, f32*) const; + /* 80085450 */ ~cCcD_CpsAttr(); + /* 80263FC4 */ void CalcAabBox(); + /* 80264014 */ void GetNVec(cXyz const&, cXyz*) const; +}; + struct cCcD_SphAttr { /* 80084B44 */ void GetCoCP() const; /* 80037A54 */ void GetCoCP(); @@ -109,26 +129,6 @@ struct cCcD_SphAttr { /* 80264808 */ void getShapeAccess(cCcD_ShapeAttr::Shape*) const; }; -struct cCcD_CpsAttr { - /* 80263DC0 */ void CrossAtTg(cCcD_SphAttr const&, cXyz*) const; - /* 80263E04 */ void CrossAtTg(cCcD_TriAttr const&, cXyz*) const; - /* 80084FE4 */ void CrossAtTg(cCcD_ShapeAttr const&, cXyz*) const; - /* 80084FDC */ bool CrossAtTg(cCcD_PntAttr const&, cXyz*) const; - /* 80084FD4 */ bool CrossAtTg(cCcD_AabAttr const&, cXyz*) const; - /* 80263D38 */ void CrossAtTg(cCcD_CpsAttr const&, cXyz*) const; - /* 80263D7C */ void CrossAtTg(cCcD_CylAttr const&, cXyz*) const; - /* 80263F24 */ void CrossCo(cCcD_CylAttr const&, f32*) const; - /* 80085024 */ bool CrossCo(cCcD_TriAttr const&, f32*) const; - /* 8008502C */ bool CrossCo(cCcD_PntAttr const&, f32*) const; - /* 8008501C */ bool CrossCo(cCcD_AabAttr const&, f32*) const; - /* 80263ED4 */ void CrossCo(cCcD_CpsAttr const&, f32*) const; - /* 80263F74 */ void CrossCo(cCcD_SphAttr const&, f32*) const; - /* 80085034 */ void CrossCo(cCcD_ShapeAttr const&, f32*) const; - /* 80085450 */ ~cCcD_CpsAttr(); - /* 80263FC4 */ void CalcAabBox(); - /* 80264014 */ void GetNVec(cXyz const&, cXyz*) const; -}; - struct cCcD_TriAttr { /* 80084E44 */ bool CrossAtTg(cCcD_AabAttr const&, cXyz*) const; /* 80263A88 */ void CrossAtTg(cCcD_CpsAttr const&, cXyz*) const; @@ -436,7 +436,7 @@ SECTION_RODATA static u8 const l_base[128] = { 0x01, 0xFF, 0xFF, 0xFF, 0x03, 0xFF, 0xFF, 0xFF, 0x07, 0xFF, 0xFF, 0xFF, 0x0F, 0xFF, 0xFF, 0xFF, 0x1F, 0xFF, 0xFF, 0xFF, 0x3F, 0xFF, 0xFF, 0xFF, 0x7F, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, }; -COMPILER_STRIP_GATE(8039A7E8, &l_base); +COMPILER_STRIP_GATE(0x8039A7E8, &l_base); /* 802634D4-802636A0 25DE14 01CC+00 0/0 2/2 0/0 .text * CalcDivideInfo__15cCcD_DivideAreaFP15cCcD_DivideInfoRC8cM3dGAabUl */ @@ -1303,7 +1303,7 @@ asm void __sinit_c_cc_d_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_802649F8 = (void*)__sinit_c_cc_d_cpp; +REGISTER_CTORS(0x802649F8, __sinit_c_cc_d_cpp); #pragma pop /* 80264A4C-80264A54 25F38C 0008+00 1/0 0/0 0/0 .text @32@__dt__12cCcD_TriAttrFv */ diff --git a/libs/SSystem/SComponent/c_cc_s.cpp b/libs/SSystem/SComponent/c_cc_s.cpp index a22692fdbd5..1c164cacc80 100644 --- a/libs/SSystem/SComponent/c_cc_s.cpp +++ b/libs/SSystem/SComponent/c_cc_s.cpp @@ -21,6 +21,14 @@ struct cM3dGAab { /* 8026EE24 */ void CalcCenter(cXyz*) const; }; +struct cCcD_GStts {}; + +struct cCcD_GObjInf {}; + +struct cCcD_Obj { + /* 80263A48 */ void GetAc(); +}; + struct cCcD_Stts { /* 80263934 */ void PlusCcMove(f32, f32, f32); /* 8026395C */ void ClrCcMove(); @@ -28,14 +36,6 @@ struct cCcD_Stts { /* 80263984 */ void GetWeightF() const; }; -struct cCcD_GStts {}; - -struct cCcD_Obj { - /* 80263A48 */ void GetAc(); -}; - -struct cCcD_GObjInf {}; - struct cCcS { /* 80030BDC */ ~cCcS(); /* 80264A6C */ cCcS(); diff --git a/libs/SSystem/SComponent/c_lib.cpp b/libs/SSystem/SComponent/c_lib.cpp index a3aaacdc0ee..21aec1cc0fa 100644 --- a/libs/SSystem/SComponent/c_lib.cpp +++ b/libs/SSystem/SComponent/c_lib.cpp @@ -4,13 +4,13 @@ // #include "SSystem/SComponent/c_lib.h" +#include "JSystem/JMath/JMath.h" +#include "SSystem/SComponent/c_math.h" +#include "SSystem/SComponent/c_xyz.h" #include "dol2asm.h" #include "dolphin/types.h" -#include "JSystem/JMath/JMath.h" -#include "SSystem/SComponent/c_xyz.h" -#include "SSystem/SComponent/c_math.h" -#include "msl_c/string.h" #include "msl_c/math.h" +#include "msl_c/string.h" // // Forward References: @@ -132,8 +132,7 @@ SECTION_SDATA2 static f32 lit_2382[1 + 1 /* padding */] = { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm f32 cLib_addCalcPos(cXyz* param_0, cXyz const& param_1, f32 param_2, f32 param_3, - f32 param_4) { +asm f32 cLib_addCalcPos(cXyz* param_0, cXyz const& param_1, f32 param_2, f32 param_3, f32 param_4) { nofralloc #include "asm/SSystem/SComponent/c_lib/cLib_addCalcPos__FP4cXyzRC4cXyzfff.s" } @@ -144,7 +143,7 @@ asm f32 cLib_addCalcPos(cXyz* param_0, cXyz const& param_1, f32 param_2, f32 par #pragma optimization_level 0 #pragma optimizewithasm off asm f32 cLib_addCalcPosXZ(cXyz* param_0, cXyz const& param_1, f32 param_2, f32 param_3, - f32 param_4) { + f32 param_4) { nofralloc #include "asm/SSystem/SComponent/c_lib/cLib_addCalcPosXZ__FP4cXyzRC4cXyzfff.s" } @@ -269,7 +268,6 @@ s16 cLib_targetAngleX(cXyz const* param_0, cXyz const* param_1) { cXyz diff = *param_1 - *param_0; f32 f1 = sqrtf(diff.getMagXZ()); return cM_atan2s(diff.GetY(), f1); - } #else #pragma push @@ -303,7 +301,7 @@ s32 cLib_distanceAngleS(s16 x, s16 y) { static Mtx mtx[10]; /* 80450768-80450770 -00001 0004+04 6/6 2/2 695/695 .sdata calc_mtx */ -Mtx *calc_mtx = mtx; +Mtx* calc_mtx = mtx; /* 80270E4C-80270E5C 26B78C 0010+00 0/0 1/1 0/0 .text MtxInit__Fv */ void MtxInit() { diff --git a/libs/SSystem/SComponent/c_m3d.cpp b/libs/SSystem/SComponent/c_m3d.cpp index 37aa5f82d6a..5e60d92988a 100644 --- a/libs/SSystem/SComponent/c_m3d.cpp +++ b/libs/SSystem/SComponent/c_m3d.cpp @@ -4,17 +4,17 @@ // #include "SSystem/SComponent/c_m3d.h" +#include "SSystem/SComponent/c_m3d_g_aab.h" +#include "SSystem/SComponent/c_m3d_g_cps.h" +#include "SSystem/SComponent/c_m3d_g_cyl.h" +#include "SSystem/SComponent/c_m3d_g_lin.h" +#include "SSystem/SComponent/c_m3d_g_pla.h" +#include "SSystem/SComponent/c_m3d_g_sph.h" +#include "SSystem/SComponent/c_m3d_g_tri.h" +#include "SSystem/SComponent/c_math.h" +#include "SSystem/SComponent/c_xyz.h" #include "dol2asm.h" #include "dolphin/types.h" -#include "SSystem/SComponent/c_xyz.h" -#include "SSystem/SComponent/c_m3d_g_tri.h" -#include "SSystem/SComponent/c_m3d_g_pla.h" -#include "SSystem/SComponent/c_m3d_g_lin.h" -#include "SSystem/SComponent/c_m3d_g_cyl.h" -#include "SSystem/SComponent/c_m3d_g_cps.h" -#include "SSystem/SComponent/c_m3d_g_aab.h" -#include "SSystem/SComponent/c_m3d_g_sph.h" -#include "SSystem/SComponent/c_math.h" #include "msl_c/math.h" // @@ -222,7 +222,7 @@ bool cM3d_Len3dSqPntAndSegLine(const cM3dGLin* pLine, const Vec* pVec, Vec* pOut f32 cM3d_SignedLenPlaAndPos(const cM3dGPla* pPlane, const Vec* pPosition) { f32 mag = PSVECMag(&pPlane->GetNP()); if (cM3d_IsZero(mag)) { - return /* 0.0 */ FLOAT_LABEL(lit_2256) ; + return /* 0.0 */ FLOAT_LABEL(lit_2256); } else { return (pPlane->mD + PSVECDotProduct(&pPlane->GetNP(), pPosition)) / mag; } @@ -407,7 +407,7 @@ int cM3d_Check_LinLin(const cM3dGLin* pLinA, const cM3dGLin* pLinB, f32* pFloatA #pragma optimization_level 0 #pragma optimizewithasm off static asm int cM3d_Check_LinLin(cM3dGLin const* param_0, cM3dGLin const* param_1, f32* param_2, - f32* param_3) { + f32* param_3) { nofralloc #include "asm/SSystem/SComponent/c_m3d/cM3d_Check_LinLin__FPC8cM3dGLinPC8cM3dGLinPfPf.s" } @@ -416,8 +416,8 @@ static asm int cM3d_Check_LinLin(cM3dGLin const* param_0, cM3dGLin const* param_ /* 80268ED4-80268F34 263814 0060+00 2/2 0/0 0/0 .text * cM3d_CrossInfLineVsInfPlane_proc__FffPC3VecPC3VecP3Vec */ -static bool cM3d_CrossInfLineVsInfPlane_proc(f32 pFloatA, f32 pFloatB, const Vec* pVecA, const Vec* pVecB, - Vec* pVecOut) { +static bool cM3d_CrossInfLineVsInfPlane_proc(f32 pFloatA, f32 pFloatB, const Vec* pVecA, + const Vec* pVecB, Vec* pVecOut) { if (cM3d_IsZero(pFloatA - pFloatB)) { *pVecOut = *pVecB; return false; @@ -440,7 +440,8 @@ bool cM3d_Cross_LinPla(const cM3dGLin* pLine, const cM3dGPla* pPlane, Vec* pVecO *pVecOut = pLine->GetEndP(); return false; } else { - if (startVal >= /* 0.0 */ FLOAT_LABEL(lit_2256) && endVal <= /* 0.0 */ FLOAT_LABEL(lit_2256)) { + if (startVal >= /* 0.0 */ FLOAT_LABEL(lit_2256) && + endVal <= /* 0.0 */ FLOAT_LABEL(lit_2256)) { // if (startVal >= 0 && endVal <= 0) { if (pBoolA) { return cM3d_CrossInfLineVsInfPlane_proc(startVal, endVal, &pLine->GetStartP(), @@ -844,7 +845,7 @@ SECTION_SDATA2 static f32 lit_3740 = 4.0f; #pragma optimization_level 0 #pragma optimizewithasm off asm int cM3d_Cross_LinSph_CrossPos(cM3dGSph const& param_0, cM3dGLin const& param_1, Vec* param_2, - Vec* param_3) { + Vec* param_3) { nofralloc #include "asm/SSystem/SComponent/c_m3d/cM3d_Cross_LinSph_CrossPos__FRC8cM3dGSphRC8cM3dGLinP3VecP3Vec.s" } @@ -991,7 +992,7 @@ asm bool cM3d_Cross_CylTri(cM3dGCyl const* param_0, cM3dGTri const* param_1, Vec #pragma optimization_level 0 #pragma optimizewithasm off asm int cM3d_Cross_CylLin(cM3dGCyl const* param_0, cM3dGLin const* param_1, Vec* param_2, - Vec* param_3) { + Vec* param_3) { nofralloc #include "asm/SSystem/SComponent/c_m3d/cM3d_Cross_CylLin__FPC8cM3dGCylPC8cM3dGLinP3VecP3Vec.s" } @@ -1000,7 +1001,7 @@ asm int cM3d_Cross_CylLin(cM3dGCyl const* param_0, cM3dGLin const* param_1, Vec* /* 8026D044-8026D0B0 267984 006C+00 1/1 0/0 0/0 .text * cM3d_Cross_CylPntPnt__FPC8cM3dGCylPC3VecPC3VecP3VecP3Vec */ static int cM3d_Cross_CylPntPnt(const cM3dGCyl* pCylinder, const Vec* pVecStart, const Vec* pVecEnd, - Vec* pVecOutA, Vec* pVecOutB) { + Vec* pVecOutA, Vec* pVecOutB) { cM3dGLin lin; lin.SetStartEnd(*pVecStart, *pVecEnd); return cM3d_Cross_CylLin(pCylinder, &lin, pVecOutA, pVecOutB); @@ -1121,7 +1122,8 @@ void cM3d_PlaneCrossLineProcWork(f32 f1, f32 f2, f32 f3, f32 f4, f32 f5, f32 f6, /* 8026E6F0-8026E8A0 269030 01B0+00 2/2 0/0 0/0 .text * cM3d_2PlaneCrossLine__FRC8cM3dGPlaRC8cM3dGPlaP8cM3dGLin */ -static int cM3d_2PlaneCrossLine(const cM3dGPla& pPlaneA, const cM3dGPla& pPlaneB, cM3dGLin* pLinOut) { +static int cM3d_2PlaneCrossLine(const cM3dGPla& pPlaneA, const cM3dGPla& pPlaneB, + cM3dGLin* pLinOut) { Vec tmp; PSVECCrossProduct(&pPlaneA.GetNP(), &pPlaneB.GetNP(), &tmp); if (cM3d_IsZero(tmp.x) && cM3d_IsZero(tmp.y) && cM3d_IsZero(tmp.z)) { @@ -1235,4 +1237,4 @@ void cM3d_CrawVec(const Vec& pVecA, const Vec& pVecB, Vec* pVecOut) { Vec tmp; PSVECScale(&pVecA, &tmp, fabsf(pVecB.x * pVecA.x + pVecB.y * pVecA.y + pVecB.z * pVecA.z)); PSVECAdd(&tmp, &pVecB, pVecOut); -} \ No newline at end of file +} diff --git a/libs/TRK_MINNOW_DOLPHIN/GCN/EXI2_DDH_GCN/main.cpp b/libs/TRK_MINNOW_DOLPHIN/GCN/EXI2_DDH_GCN/main.cpp index 83d9a842feb..32ef6ffef95 100644 --- a/libs/TRK_MINNOW_DOLPHIN/GCN/EXI2_DDH_GCN/main.cpp +++ b/libs/TRK_MINNOW_DOLPHIN/GCN/EXI2_DDH_GCN/main.cpp @@ -96,7 +96,7 @@ SECTION_RODATA static u8 const lit_318[20] = { 0x63, 0x63, 0x20, 0x6E, 0x6F, 0x74, 0x20, 0x69, 0x6E, 0x69, 0x74, 0x69, 0x61, 0x6C, 0x69, 0x7A, 0x65, 0x64, 0x0A, 0x00, }; -COMPILER_STRIP_GATE(803A2D10, &lit_318); +COMPILER_STRIP_GATE(0x803A2D10, &lit_318); /* 803A2D24-803A2D50 02F384 0029+03 0/1 0/0 0/0 .rodata @319 */ #pragma push @@ -148,7 +148,7 @@ SECTION_RODATA static u8 const lit_319[41 + 3 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(803A2D24, &lit_319); +COMPILER_STRIP_GATE(0x803A2D24, &lit_319); #pragma pop /* 803A2D50-803A2D6C 02F3B0 001C+00 0/1 0/0 0/0 .rodata @320 */ @@ -158,7 +158,7 @@ SECTION_RODATA static u8 const lit_320[28] = { 0x63, 0x63, 0x5F, 0x77, 0x72, 0x69, 0x74, 0x65, 0x20, 0x73, 0x65, 0x6E, 0x64, 0x69, 0x6E, 0x67, 0x20, 0x25, 0x6C, 0x64, 0x20, 0x62, 0x79, 0x74, 0x65, 0x73, 0x0A, 0x00, }; -COMPILER_STRIP_GATE(803A2D50, &lit_320); +COMPILER_STRIP_GATE(0x803A2D50, &lit_320); #pragma pop /* 804519C0-804519C8 000EC0 0004+04 3/3 0/0 0/0 .sbss gIsInitialized */ @@ -219,7 +219,7 @@ SECTION_RODATA static u8 const lit_342[37 + 3 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(803A2D6C, &lit_342); +COMPILER_STRIP_GATE(0x803A2D6C, &lit_342); /* 803A2D94-803A2DC4 02F3F4 002D+03 1/1 0/0 0/0 .rodata @343 */ SECTION_RODATA static u8 const lit_343[45 + 3 /* padding */] = { @@ -273,7 +273,7 @@ SECTION_RODATA static u8 const lit_343[45 + 3 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(803A2D94, &lit_343); +COMPILER_STRIP_GATE(0x803A2D94, &lit_343); /* 803724F8-803725E4 36CE38 00EC+00 0/0 1/1 0/0 .text ddh_cc_read */ #pragma push @@ -330,14 +330,14 @@ SECTION_RODATA static u8 const lit_349[19 + 1 /* padding */] = { /* padding */ 0x00, }; -COMPILER_STRIP_GATE(803A2DC4, &lit_349); +COMPILER_STRIP_GATE(0x803A2DC4, &lit_349); /* 803A2DD8-803A2DF0 02F438 0018+00 1/1 0/0 0/0 .rodata @350 */ SECTION_RODATA static u8 const lit_350[24] = { 0x44, 0x4F, 0x4E, 0x45, 0x20, 0x43, 0x41, 0x4C, 0x4C, 0x49, 0x4E, 0x47, 0x20, 0x45, 0x58, 0x49, 0x32, 0x5F, 0x49, 0x6E, 0x69, 0x74, 0x0A, 0x00, }; -COMPILER_STRIP_GATE(803A2DD8, &lit_350); +COMPILER_STRIP_GATE(0x803A2DD8, &lit_350); /* 80372618-803726A0 36CF58 0088+00 0/0 1/1 0/0 .text ddh_cc_initialize */ #pragma push diff --git a/libs/TRK_MINNOW_DOLPHIN/GCN/EXI2_GDEV_GCN/main.cpp b/libs/TRK_MINNOW_DOLPHIN/GCN/EXI2_GDEV_GCN/main.cpp index 675439cbc84..d962b4cce6e 100644 --- a/libs/TRK_MINNOW_DOLPHIN/GCN/EXI2_GDEV_GCN/main.cpp +++ b/libs/TRK_MINNOW_DOLPHIN/GCN/EXI2_GDEV_GCN/main.cpp @@ -96,7 +96,7 @@ SECTION_RODATA static u8 const lit_318[20] = { 0x63, 0x63, 0x20, 0x6E, 0x6F, 0x74, 0x20, 0x69, 0x6E, 0x69, 0x74, 0x69, 0x61, 0x6C, 0x69, 0x7A, 0x65, 0x64, 0x0A, 0x00, }; -COMPILER_STRIP_GATE(803A2DF0, &lit_318); +COMPILER_STRIP_GATE(0x803A2DF0, &lit_318); /* 803A2E04-803A2E30 02F464 0029+03 0/1 0/0 0/0 .rodata @319 */ #pragma push @@ -148,7 +148,7 @@ SECTION_RODATA static u8 const lit_319[41 + 3 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(803A2E04, &lit_319); +COMPILER_STRIP_GATE(0x803A2E04, &lit_319); #pragma pop /* 803A2E30-803A2E4C 02F490 001C+00 0/1 0/0 0/0 .rodata @320 */ @@ -158,7 +158,7 @@ SECTION_RODATA static u8 const lit_320[28] = { 0x63, 0x63, 0x5F, 0x77, 0x72, 0x69, 0x74, 0x65, 0x20, 0x73, 0x65, 0x6E, 0x64, 0x69, 0x6E, 0x67, 0x20, 0x25, 0x6C, 0x64, 0x20, 0x62, 0x79, 0x74, 0x65, 0x73, 0x0A, 0x00, }; -COMPILER_STRIP_GATE(803A2E30, &lit_320); +COMPILER_STRIP_GATE(0x803A2E30, &lit_320); #pragma pop /* 804519C8-804519D0 000EC8 0004+04 3/3 0/0 0/0 .sbss gIsInitialized */ @@ -219,7 +219,7 @@ SECTION_RODATA static u8 const lit_341[37 + 3 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(803A2E4C, &lit_341); +COMPILER_STRIP_GATE(0x803A2E4C, &lit_341); /* 803A2E74-803A2EA4 02F4D4 002D+03 1/1 0/0 0/0 .rodata @342 */ SECTION_RODATA static u8 const lit_342[45 + 3 /* padding */] = { @@ -273,7 +273,7 @@ SECTION_RODATA static u8 const lit_342[45 + 3 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(803A2E74, &lit_342); +COMPILER_STRIP_GATE(0x803A2E74, &lit_342); /* 80372AA4-80372B98 36D3E4 00F4+00 0/0 1/1 0/0 .text gdev_cc_read */ #pragma push @@ -330,14 +330,14 @@ SECTION_RODATA static u8 const lit_348[19 + 1 /* padding */] = { /* padding */ 0x00, }; -COMPILER_STRIP_GATE(803A2EA4, &lit_348); +COMPILER_STRIP_GATE(0x803A2EA4, &lit_348); /* 803A2EB8-803A2ED0 02F518 0018+00 1/1 0/0 0/0 .rodata @349 */ SECTION_RODATA static u8 const lit_349[24] = { 0x44, 0x4F, 0x4E, 0x45, 0x20, 0x43, 0x41, 0x4C, 0x4C, 0x49, 0x4E, 0x47, 0x20, 0x45, 0x58, 0x49, 0x32, 0x5F, 0x49, 0x6E, 0x69, 0x74, 0x0A, 0x00, }; -COMPILER_STRIP_GATE(803A2EB8, &lit_349); +COMPILER_STRIP_GATE(0x803A2EB8, &lit_349); /* 80372BCC-80372C54 36D50C 0088+00 0/0 1/1 0/0 .text gdev_cc_initialize */ #pragma push diff --git a/libs/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/dispatch.cpp b/libs/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/dispatch.cpp index e43a0ad8da1..e5408392f70 100644 --- a/libs/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/dispatch.cpp +++ b/libs/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/dispatch.cpp @@ -72,7 +72,7 @@ SECTION_RODATA static u8 const lit_126[25 + 3 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(803A2890, &lit_126); +COMPILER_STRIP_GATE(0x803A2890, &lit_126); /* 803A28AC-803A28D0 02EF0C 001D+07 1/1 0/0 0/0 .rodata @127 */ SECTION_RODATA static u8 const lit_127[29 + 7 /* padding */] = { @@ -114,7 +114,7 @@ SECTION_RODATA static u8 const lit_127[29 + 7 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(803A28AC, &lit_127); +COMPILER_STRIP_GATE(0x803A28AC, &lit_127); /* 803D3190-803D3200 -00001 006C+04 1/1 0/0 0/0 .data @128 */ SECTION_DATA static void* lit_128[27 + 1 /* padding */] = { diff --git a/libs/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/main_TRK.cpp b/libs/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/main_TRK.cpp index 14899a776ae..a0ef2082ab7 100644 --- a/libs/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/main_TRK.cpp +++ b/libs/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/main_TRK.cpp @@ -48,7 +48,7 @@ SECTION_RODATA static u8 const lit_80[11 + 5 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(803A2BF8, &lit_80); +COMPILER_STRIP_GATE(0x803A2BF8, &lit_80); /* 8044F818-8044F820 07C538 0004+04 1/1 0/0 0/0 .bss TRK_mainError */ SECTION_BSS static u8 TRK_mainError[4 + 4 /* padding */]; diff --git a/libs/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/msg.cpp b/libs/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/msg.cpp index 8e01affda93..c9f077189ab 100644 --- a/libs/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/msg.cpp +++ b/libs/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/msg.cpp @@ -69,7 +69,7 @@ SECTION_RODATA static u8 const lit_98[37 + 3 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(803A26B8, &lit_98); +COMPILER_STRIP_GATE(0x803A26B8, &lit_98); /* 8036CFD8-8036D01C 367918 0044+00 0/0 6/6 0/0 .text TRKMessageSend */ #pragma push diff --git a/libs/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/msgbuf.cpp b/libs/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/msgbuf.cpp index d324ede192f..ec176bd4bf9 100644 --- a/libs/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/msgbuf.cpp +++ b/libs/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/msgbuf.cpp @@ -203,7 +203,7 @@ SECTION_RODATA static u8 const lit_618[29 + 3 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(803A26E0, &lit_618); +COMPILER_STRIP_GATE(0x803A26E0, &lit_618); /* 8036D71C-8036D7E4 36805C 00C8+00 0/0 6/6 0/0 .text TRKGetFreeBuffer */ #pragma push diff --git a/libs/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/msghndlr.cpp b/libs/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/msghndlr.cpp index 021b67bdf4c..f0b55bf1fee 100644 --- a/libs/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/msghndlr.cpp +++ b/libs/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/msghndlr.cpp @@ -102,7 +102,7 @@ SECTION_RODATA static u8 const lit_321[31 + 1 /* padding */] = { /* padding */ 0x00, }; -COMPILER_STRIP_GATE(803A28D0, &lit_321); +COMPILER_STRIP_GATE(0x803A28D0, &lit_321); /* 803A28F0-803A28F8 02EF50 0008+00 0/1 0/0 0/0 .rodata @322 */ #pragma push @@ -110,7 +110,7 @@ COMPILER_STRIP_GATE(803A28D0, &lit_321); SECTION_RODATA static u8 const lit_322[8] = { 0x45, 0x6E, 0x61, 0x62, 0x6C, 0x65, 0x0A, 0x00, }; -COMPILER_STRIP_GATE(803A28F0, &lit_322); +COMPILER_STRIP_GATE(0x803A28F0, &lit_322); #pragma pop /* 803A28F8-803A2904 02EF58 0009+03 0/1 0/0 0/0 .rodata @323 */ @@ -131,7 +131,7 @@ SECTION_RODATA static u8 const lit_323[9 + 3 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(803A28F8, &lit_323); +COMPILER_STRIP_GATE(0x803A28F8, &lit_323); #pragma pop /* 8036DD14-8036DDBC 368654 00A8+00 0/0 1/1 0/0 .text TRKDoSetOption */ @@ -169,7 +169,7 @@ asm void TRKDoStep() { SECTION_RODATA static u8 const lit_370[12] = { 0x44, 0x6F, 0x43, 0x6F, 0x6E, 0x74, 0x69, 0x6E, 0x75, 0x65, 0x0A, 0x00, }; -COMPILER_STRIP_GATE(803A2904, &lit_370); +COMPILER_STRIP_GATE(0x803A2904, &lit_370); /* 8036E084-8036E134 3689C4 00B0+00 0/0 1/1 0/0 .text TRKDoContinue */ #pragma push @@ -220,7 +220,7 @@ SECTION_RODATA static u8 const lit_402[31 + 1 /* padding */] = { /* padding */ 0x00, }; -COMPILER_STRIP_GATE(803A2910, &lit_402); +COMPILER_STRIP_GATE(0x803A2910, &lit_402); #pragma pop /* 803A2930-803A2950 02EF90 001F+01 1/4 0/0 0/0 .rodata @403 */ @@ -259,7 +259,7 @@ SECTION_RODATA static u8 const lit_403[31 + 1 /* padding */] = { /* padding */ 0x00, }; -COMPILER_STRIP_GATE(803A2930, &lit_403); +COMPILER_STRIP_GATE(0x803A2930, &lit_403); /* 803A2950-803A2968 02EFB0 0017+01 1/4 0/0 0/0 .rodata @404 */ SECTION_RODATA static u8 const lit_404[23 + 1 /* padding */] = { @@ -289,7 +289,7 @@ SECTION_RODATA static u8 const lit_404[23 + 1 /* padding */] = { /* padding */ 0x00, }; -COMPILER_STRIP_GATE(803A2950, &lit_404); +COMPILER_STRIP_GATE(0x803A2950, &lit_404); /* 8036E134-8036E3C4 368A74 0290+00 0/0 1/1 0/0 .text TRKDoWriteRegisters */ #pragma push @@ -310,7 +310,7 @@ SECTION_RODATA static u8 const lit_462[40] = { 0x73, 0x20, 0x3A, 0x20, 0x42, 0x75, 0x66, 0x66, 0x65, 0x72, 0x20, 0x6C, 0x65, 0x6E, 0x67, 0x74, 0x68, 0x20, 0x30, 0x78, 0x25, 0x30, 0x38, 0x78, 0x0A, 0x00, }; -COMPILER_STRIP_GATE(803A2968, &lit_462); +COMPILER_STRIP_GATE(0x803A2968, &lit_462); #pragma pop /* 803A2990-803A29C8 02EFF0 0036+02 0/1 0/0 0/0 .rodata @463 */ @@ -375,7 +375,7 @@ SECTION_RODATA static u8 const lit_463[54 + 2 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(803A2990, &lit_463); +COMPILER_STRIP_GATE(0x803A2990, &lit_463); #pragma pop /* 803A29C8-803A29F0 02F028 0028+00 0/1 0/0 0/0 .rodata @464 */ @@ -386,7 +386,7 @@ SECTION_RODATA static u8 const lit_464[40] = { 0x73, 0x20, 0x3A, 0x20, 0x45, 0x72, 0x72, 0x6F, 0x72, 0x20, 0x46, 0x50, 0x20, 0x72, 0x65, 0x67, 0x73, 0x20, 0x30, 0x78, 0x25, 0x30, 0x38, 0x78, 0x0A, 0x00, }; -COMPILER_STRIP_GATE(803A29C8, &lit_464); +COMPILER_STRIP_GATE(0x803A29C8, &lit_464); #pragma pop /* 803A29F0-803A2A20 02F050 002F+01 0/1 0/0 0/0 .rodata @465 */ @@ -443,7 +443,7 @@ SECTION_RODATA static u8 const lit_465[47 + 1 /* padding */] = { /* padding */ 0x00, }; -COMPILER_STRIP_GATE(803A29F0, &lit_465); +COMPILER_STRIP_GATE(0x803A29F0, &lit_465); #pragma pop /* 803A2A20-803A2A50 02F080 002F+01 0/1 0/0 0/0 .rodata @466 */ @@ -500,7 +500,7 @@ SECTION_RODATA static u8 const lit_466[47 + 1 /* padding */] = { /* padding */ 0x00, }; -COMPILER_STRIP_GATE(803A2A20, &lit_466); +COMPILER_STRIP_GATE(0x803A2A20, &lit_466); #pragma pop /* 8036E3C4-8036E6A4 368D04 02E0+00 0/0 1/1 0/0 .text TRKDoReadRegisters */ @@ -568,7 +568,7 @@ SECTION_RODATA static u8 const lit_498[45 + 3 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(803A2A50, &lit_498); +COMPILER_STRIP_GATE(0x803A2A50, &lit_498); #pragma pop /* 803D3200-803D321C -00001 001C+00 1/1 0/0 0/0 .data @499 */ @@ -598,7 +598,7 @@ SECTION_RODATA static u8 const lit_535[44] = { 0x30, 0x32, 0x78, 0x29, 0x20, 0x3A, 0x20, 0x30, 0x78, 0x25, 0x30, 0x38, 0x78, 0x20, 0x30, 0x78, 0x25, 0x30, 0x38, 0x78, 0x20, 0x30, 0x78, 0x25, 0x30, 0x38, 0x78, 0x0A, 0x00, }; -COMPILER_STRIP_GATE(803A2A80, &lit_535); +COMPILER_STRIP_GATE(0x803A2A80, &lit_535); #pragma pop /* 803D321C-803D3238 -00001 001C+00 1/1 0/0 0/0 .data @536 */ @@ -706,7 +706,7 @@ SECTION_RODATA static u8 const lit_573[6 + 2 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(803A2AAC, &lit_573); +COMPILER_STRIP_GATE(0x803A2AAC, &lit_573); /* 803A2AB4-803A2AB8 02F114 0002+02 1/1 0/0 0/0 .rodata @574 */ SECTION_RODATA static u16 const lit_574[1 + 1 /* padding */] = { @@ -714,7 +714,7 @@ SECTION_RODATA static u16 const lit_574[1 + 1 /* padding */] = { /* padding */ 0x0000, }; -COMPILER_STRIP_GATE(803A2AB4, &lit_574); +COMPILER_STRIP_GATE(0x803A2AB4, &lit_574); /* 8036ECDC-8036ED84 36961C 00A8+00 0/0 1/1 0/0 .text OutputData */ #pragma push diff --git a/libs/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/nubinit.cpp b/libs/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/nubinit.cpp index 7c0f59be48c..14981865cb0 100644 --- a/libs/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/nubinit.cpp +++ b/libs/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/nubinit.cpp @@ -70,7 +70,7 @@ SECTION_RODATA static u8 const lit_133[27 + 1 /* padding */] = { /* padding */ 0x00, }; -COMPILER_STRIP_GATE(803A2688, &lit_133); +COMPILER_STRIP_GATE(0x803A2688, &lit_133); /* 8036CE40-8036CE68 367780 0028+00 0/0 1/1 0/0 .text TRKNubWelcome */ #pragma push @@ -117,7 +117,7 @@ SECTION_RODATA static u8 const lit_154[16 + 4 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(803A26A4, &lit_154); +COMPILER_STRIP_GATE(0x803A26A4, &lit_154); /* 8044D8B8-8044D8C0 07A5D8 0004+04 1/1 4/4 0/0 .bss gTRKBigEndian */ SECTION_BSS extern u8 gTRKBigEndian[4 + 4 /* padding */]; diff --git a/libs/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/serpoll.cpp b/libs/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/serpoll.cpp index b3aa8754df0..f661ad44ec1 100644 --- a/libs/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/serpoll.cpp +++ b/libs/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/serpoll.cpp @@ -83,7 +83,7 @@ SECTION_RODATA static u8 const lit_121[34 + 2 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(803A2700, &lit_121); +COMPILER_STRIP_GATE(0x803A2700, &lit_121); /* 803A2724-803A2748 02ED84 0022+02 0/1 0/0 0/0 .rodata @122 */ #pragma push @@ -127,7 +127,7 @@ SECTION_RODATA static u8 const lit_122[34 + 2 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(803A2724, &lit_122); +COMPILER_STRIP_GATE(0x803A2724, &lit_122); #pragma pop /* 803A2748-803A276C 02EDA8 0022+02 0/1 0/0 0/0 .rodata @123 */ @@ -172,7 +172,7 @@ SECTION_RODATA static u8 const lit_123[34 + 2 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(803A2748, &lit_123); +COMPILER_STRIP_GATE(0x803A2748, &lit_123); #pragma pop /* 803A276C-803A278C 02EDCC 0020+00 0/1 0/0 0/0 .rodata @124 */ @@ -182,7 +182,7 @@ SECTION_RODATA static u8 const lit_124[32] = { 0x54, 0x52, 0x4B, 0x5F, 0x43, 0x4D, 0x44, 0x5F, 0x43, 0x6F, 0x6E, 0x6E, 0x65, 0x63, 0x74, 0x20, 0x09, 0x20, 0x20, 0x20, 0x20, 0x25, 0x6C, 0x64, 0x20, 0x62, 0x79, 0x74, 0x65, 0x73, 0x0A, 0x00, }; -COMPILER_STRIP_GATE(803A276C, &lit_124); +COMPILER_STRIP_GATE(0x803A276C, &lit_124); #pragma pop /* 803A278C-803A27AC 02EDEC 0020+00 0/1 0/0 0/0 .rodata @125 */ @@ -192,7 +192,7 @@ SECTION_RODATA static u8 const lit_125[32] = { 0x54, 0x52, 0x4B, 0x5F, 0x43, 0x4D, 0x44, 0x5F, 0x52, 0x65, 0x70, 0x6C, 0x79, 0x41, 0x63, 0x6B, 0x09, 0x20, 0x20, 0x20, 0x20, 0x25, 0x6C, 0x64, 0x20, 0x62, 0x79, 0x74, 0x65, 0x73, 0x0A, 0x00, }; -COMPILER_STRIP_GATE(803A278C, &lit_125); +COMPILER_STRIP_GATE(0x803A278C, &lit_125); #pragma pop /* 803A27AC-803A27D0 02EE0C 0021+03 0/1 0/0 0/0 .rodata @126 */ @@ -237,7 +237,7 @@ SECTION_RODATA static u8 const lit_126[33 + 3 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(803A27AC, &lit_126); +COMPILER_STRIP_GATE(0x803A27AC, &lit_126); #pragma pop /* 8044F270-8044F288 07BF90 0014+04 3/3 0/0 0/0 .bss gTRKFramingState */ @@ -282,7 +282,7 @@ SECTION_RODATA static u8 const lit_146[36] = { 0x74, 0x20, 0x3A, 0x20, 0x46, 0x72, 0x65, 0x65, 0x42, 0x75, 0x66, 0x66, 0x65, 0x72, 0x20, 0x69, 0x73, 0x20, 0x20, 0x25, 0x6C, 0x64, 0x0A, 0x00, }; -COMPILER_STRIP_GATE(803A27D0, &lit_146); +COMPILER_STRIP_GATE(0x803A27D0, &lit_146); #pragma pop /* 803A27F4-803A2810 02EE54 001B+01 0/1 0/0 0/0 .rodata @147 */ @@ -319,7 +319,7 @@ SECTION_RODATA static u8 const lit_147[27 + 1 /* padding */] = { /* padding */ 0x00, }; -COMPILER_STRIP_GATE(803A27F4, &lit_147); +COMPILER_STRIP_GATE(0x803A27F4, &lit_147); #pragma pop /* 803A2810-803A2844 02EE70 0031+03 0/1 0/0 0/0 .rodata @148 */ @@ -380,7 +380,7 @@ SECTION_RODATA static u8 const lit_148[49 + 3 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(803A2810, &lit_148); +COMPILER_STRIP_GATE(0x803A2810, &lit_148); #pragma pop /* 803A2844-803A286C 02EEA4 0028+00 0/1 0/0 0/0 .rodata @149 */ @@ -391,7 +391,7 @@ SECTION_RODATA static u8 const lit_149[40] = { 0x3A, 0x20, 0x49, 0x6E, 0x76, 0x61, 0x6C, 0x69, 0x64, 0x20, 0x73, 0x69, 0x7A, 0x65, 0x20, 0x6F, 0x66, 0x20, 0x70, 0x61, 0x63, 0x6B, 0x65, 0x74, 0x0A, 0x00, }; -COMPILER_STRIP_GATE(803A2844, &lit_149); +COMPILER_STRIP_GATE(0x803A2844, &lit_149); #pragma pop /* 803A286C-803A2890 02EECC 001D+07 0/1 0/0 0/0 .rodata @150 */ @@ -436,7 +436,7 @@ SECTION_RODATA static u8 const lit_150[29 + 7 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(803A286C, &lit_150); +COMPILER_STRIP_GATE(0x803A286C, &lit_150); #pragma pop /* 8036D9D4-8036DB10 368314 013C+00 1/1 1/1 0/0 .text TRKTestForPacket */ diff --git a/libs/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/support.cpp b/libs/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/support.cpp index b2506057e99..e4eb9f644b8 100644 --- a/libs/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/support.cpp +++ b/libs/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/support.cpp @@ -98,7 +98,7 @@ SECTION_RODATA static u8 const lit_274[21 + 3 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(803A2AB8, &lit_274); +COMPILER_STRIP_GATE(0x803A2AB8, &lit_274); /* 803A2AD0-803A2AF8 02F130 0028+00 0/1 0/0 0/0 .rodata @275 */ #pragma push @@ -108,7 +108,7 @@ SECTION_RODATA static u8 const lit_275[40] = { 0x30, 0x78, 0x25, 0x30, 0x32, 0x78, 0x20, 0x68, 0x64, 0x72, 0x2D, 0x3E, 0x63, 0x6D, 0x64, 0x49, 0x44, 0x20, 0x30, 0x78, 0x25, 0x30, 0x32, 0x78, 0x0A, 0x00, }; -COMPILER_STRIP_GATE(803A2AD0, &lit_275); +COMPILER_STRIP_GATE(0x803A2AD0, &lit_275); #pragma pop /* 803A2AF8-803A2B0C 02F158 0014+00 0/1 0/0 0/0 .rodata @276 */ @@ -118,7 +118,7 @@ SECTION_RODATA static u8 const lit_276[20] = { 0x6D, 0x73, 0x67, 0x5F, 0x65, 0x72, 0x72, 0x6F, 0x72, 0x20, 0x3A, 0x20, 0x30, 0x78, 0x25, 0x30, 0x32, 0x78, 0x0A, 0x00, }; -COMPILER_STRIP_GATE(803A2AF8, &lit_276); +COMPILER_STRIP_GATE(0x803A2AF8, &lit_276); #pragma pop /* 803A2B0C-803A2B60 02F16C 0051+03 0/1 0/0 0/0 .rodata @277 */ @@ -211,7 +211,7 @@ SECTION_RODATA static u8 const lit_277[81 + 3 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(803A2B0C, &lit_277); +COMPILER_STRIP_GATE(0x803A2B0C, &lit_277); #pragma pop /* 8036F098-8036F278 3699D8 01E0+00 4/4 1/1 0/0 .text TRKRequestSend */ diff --git a/libs/TRK_MINNOW_DOLPHIN/Os/dolphin/dolphin_trk_glue.cpp b/libs/TRK_MINNOW_DOLPHIN/Os/dolphin/dolphin_trk_glue.cpp index 1bbb148c09e..bcc7fb4ff66 100644 --- a/libs/TRK_MINNOW_DOLPHIN/Os/dolphin/dolphin_trk_glue.cpp +++ b/libs/TRK_MINNOW_DOLPHIN/Os/dolphin/dolphin_trk_glue.cpp @@ -96,7 +96,7 @@ SECTION_RODATA static u8 const EndofProgramInstruction[4] = { 0x4E, 0x44, }; -COMPILER_STRIP_GATE(803A2C08, &EndofProgramInstruction); +COMPILER_STRIP_GATE(0x803A2C08, &EndofProgramInstruction); /* 80371C80-80371CD8 36C5C0 0058+00 0/0 1/1 0/0 .text InitializeProgramEndTrap */ #pragma push @@ -111,7 +111,7 @@ asm void InitializeProgramEndTrap() { /* ############################################################################################## */ /* 803A2C0C-803A2C10 02F26C 0004+00 1/1 0/0 0/0 .rodata @165 */ SECTION_RODATA static u32 const lit_165 = 0x25730A00; -COMPILER_STRIP_GATE(803A2C0C, &lit_165); +COMPILER_STRIP_GATE(0x803A2C0C, &lit_165); /* 80371CD8-80371D08 36C618 0030+00 0/0 1/1 0/0 .text TRK_board_display */ #pragma push @@ -236,7 +236,7 @@ SECTION_RODATA static u8 const lit_215[21 + 3 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(803A2C10, &lit_215); +COMPILER_STRIP_GATE(0x803A2C10, &lit_215); #pragma pop /* 803A2C28-803A2C40 02F288 0017+01 0/1 0/0 0/0 .rodata @216 */ @@ -269,7 +269,7 @@ SECTION_RODATA static u8 const lit_216[23 + 1 /* padding */] = { /* padding */ 0x00, }; -COMPILER_STRIP_GATE(803A2C28, &lit_216); +COMPILER_STRIP_GATE(0x803A2C28, &lit_216); #pragma pop /* 803A2C40-803A2C64 02F2A0 0021+03 0/1 0/0 0/0 .rodata @217 */ @@ -314,7 +314,7 @@ SECTION_RODATA static u8 const lit_217[33 + 3 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(803A2C40, &lit_217); +COMPILER_STRIP_GATE(0x803A2C40, &lit_217); #pragma pop /* 803A2C64-803A2C88 02F2C4 0024+00 0/1 0/0 0/0 .rodata @218 */ @@ -325,7 +325,7 @@ SECTION_RODATA static u8 const lit_218[36] = { 0x65, 0x74, 0x20, 0x74, 0x6F, 0x20, 0x41, 0x4D, 0x43, 0x20, 0x44, 0x44, 0x48, 0x20, 0x68, 0x61, 0x72, 0x64, 0x77, 0x61, 0x72, 0x65, 0x0A, 0x00, }; -COMPILER_STRIP_GATE(803A2C64, &lit_218); +COMPILER_STRIP_GATE(0x803A2C64, &lit_218); #pragma pop /* 803A2C88-803A2CB4 02F2E8 002B+01 0/1 0/0 0/0 .rodata @219 */ @@ -378,7 +378,7 @@ SECTION_RODATA static u8 const lit_219[43 + 1 /* padding */] = { /* padding */ 0x00, }; -COMPILER_STRIP_GATE(803A2C88, &lit_219); +COMPILER_STRIP_GATE(0x803A2C88, &lit_219); #pragma pop /* 803A2CB4-803A2CE4 02F314 002F+01 0/1 0/0 0/0 .rodata @220 */ @@ -435,7 +435,7 @@ SECTION_RODATA static u8 const lit_220[47 + 1 /* padding */] = { /* padding */ 0x00, }; -COMPILER_STRIP_GATE(803A2CB4, &lit_220); +COMPILER_STRIP_GATE(0x803A2CB4, &lit_220); #pragma pop /* 803A2CE4-803A2D10 02F344 0028+04 0/1 0/0 0/0 .rodata @221 */ @@ -488,7 +488,7 @@ SECTION_RODATA static u8 const lit_221[40 + 4 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(803A2CE4, &lit_221); +COMPILER_STRIP_GATE(0x803A2CE4, &lit_221); #pragma pop /* 80371EA8-80372114 36C7E8 026C+00 0/0 2/2 0/0 .text InitMetroTRKCommTable */ diff --git a/libs/TRK_MINNOW_DOLPHIN/ppc/Export/targsupp.cpp b/libs/TRK_MINNOW_DOLPHIN/ppc/Export/targsupp.cpp index b2d4b01ff85..7d068f57ab4 100644 --- a/libs/TRK_MINNOW_DOLPHIN/ppc/Export/targsupp.cpp +++ b/libs/TRK_MINNOW_DOLPHIN/ppc/Export/targsupp.cpp @@ -24,43 +24,41 @@ extern "C" void TRKPositionFile(); // Declarations: // -/* 803711D0-803711D8 36BB10 0008+00 0/0 2/2 0/0 .text TRKAccessFile */ +/* 803711D0-803711D8 -00001 0008+00 0/0 0/0 0/0 .text TRKAccessFile */ #pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off #pragma function_align 16 asm void TRKAccessFile() { - nofralloc -#include "asm/TRK_MINNOW_DOLPHIN/ppc/Export/targsupp/TRKAccessFile.s" + // clang-format off + nofralloc + twi 31, r0, 0x0 + blr + // clang-format on } #pragma pop -/* 803711D8-803711E0 36BB18 0008+00 0/0 0/0 0/0 .text TRKOpenFile */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off +/* 803711D8-803711E0 -00001 0008+00 0/0 0/0 0/0 .text TRKOpenFile */ asm void TRKOpenFile() { - nofralloc -#include "asm/TRK_MINNOW_DOLPHIN/ppc/Export/targsupp/TRKOpenFile.s" + // clang-format off + nofralloc + twi 31, r0, 0x0 + blr + // clang-format on } -#pragma pop -/* 803711E0-803711E8 36BB20 0008+00 0/0 0/0 0/0 .text TRKCloseFile */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off +/* 803711E0-803711E8 -00001 0008+00 0/0 0/0 0/0 .text TRKCloseFile */ asm void TRKCloseFile() { - nofralloc -#include "asm/TRK_MINNOW_DOLPHIN/ppc/Export/targsupp/TRKCloseFile.s" + // clang-format off + nofralloc + twi 31, r0, 0x0 + blr + // clang-format on } -#pragma pop -/* 803711E8-803711F0 36BB28 0008+00 0/0 0/0 0/0 .text TRKPositionFile */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off +/* 803711E8-803711F0 -00001 0008+00 0/0 0/0 0/0 .text TRKPositionFile */ asm void TRKPositionFile() { - nofralloc -#include "asm/TRK_MINNOW_DOLPHIN/ppc/Export/targsupp/TRKPositionFile.s" + // clang-format off + nofralloc + twi 31, r0, 0x0 + blr + // clang-format on } -#pragma pop diff --git a/libs/TRK_MINNOW_DOLPHIN/ppc/Generic/targimpl.cpp b/libs/TRK_MINNOW_DOLPHIN/ppc/Generic/targimpl.cpp index 69bd12162b8..4bce50be5b2 100644 --- a/libs/TRK_MINNOW_DOLPHIN/ppc/Generic/targimpl.cpp +++ b/libs/TRK_MINNOW_DOLPHIN/ppc/Generic/targimpl.cpp @@ -71,25 +71,23 @@ extern "C" void MWTRACE(); // Declarations: // -/* 8036F638-8036F640 369F78 0008+00 2/2 1/1 0/0 .text __TRK_get_MSR */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off +/* 8036F638-8036F640 -00001 0008+00 0/0 0/0 0/0 .text __TRK_get_MSR */ asm void __TRK_get_MSR() { - nofralloc -#include "asm/TRK_MINNOW_DOLPHIN/ppc/Generic/targimpl/__TRK_get_MSR.s" + // clang-format off + nofralloc + mfmsr r3 + blr + // clang-format on } -#pragma pop -/* 8036F640-8036F648 369F80 0008+00 1/1 0/0 0/0 .text __TRK_set_MSR */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off +/* 8036F640-8036F648 -00001 0008+00 0/0 0/0 0/0 .text __TRK_set_MSR */ asm void __TRK_set_MSR() { - nofralloc -#include "asm/TRK_MINNOW_DOLPHIN/ppc/Generic/targimpl/__TRK_set_MSR.s" + // clang-format off + nofralloc + mtmsr r3 + blr + // clang-format on } -#pragma pop /* 8036F648-8036F684 369F88 003C+00 1/1 0/0 0/0 .text TRK_ppc_memcpy */ #pragma push @@ -274,7 +272,7 @@ asm void TRKTargetGetPC() { SECTION_RODATA static u8 const gTRKMemMap[16] = { 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(803A2B60, &gTRKMemMap); +COMPILER_STRIP_GATE(0x803A2B60, &gTRKMemMap); /* 803A2B70-803A2B98 02F1D0 0028+00 2/2 0/0 0/0 .rodata @276 */ SECTION_RODATA static u8 const lit_276[40] = { @@ -282,7 +280,7 @@ SECTION_RODATA static u8 const lit_276[40] = { 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(803A2B70, &lit_276); +COMPILER_STRIP_GATE(0x803A2B70, &lit_276); /* 803A2B98-803A2BC0 02F1F8 0028+00 1/1 0/0 0/0 .rodata @283 */ SECTION_RODATA static u8 const lit_283[40] = { @@ -290,7 +288,7 @@ SECTION_RODATA static u8 const lit_283[40] = { 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(803A2B98, &lit_283); +COMPILER_STRIP_GATE(0x803A2B98, &lit_283); /* 803A2BC0-803A2BE8 02F220 0028+00 1/1 0/0 0/0 .rodata @290 */ SECTION_RODATA static u8 const lit_290[40] = { @@ -298,13 +296,13 @@ SECTION_RODATA static u8 const lit_290[40] = { 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(803A2BC0, &lit_290); +COMPILER_STRIP_GATE(0x803A2BC0, &lit_290); /* 803A2BE8-803A2BF8 02F248 0010+00 3/3 0/0 0/0 .rodata @422 */ SECTION_RODATA static u8 const lit_422[16] = { 0x54, 0x61, 0x72, 0x67, 0x65, 0x74, 0x44, 0x6F, 0x53, 0x74, 0x65, 0x70, 0x28, 0x29, 0x0A, 0x00, }; -COMPILER_STRIP_GATE(803A2BE8, &lit_422); +COMPILER_STRIP_GATE(0x803A2BE8, &lit_422); /* 803D3254-803D3268 030374 0014+00 3/3 0/0 0/0 .data gTRKStepStatus */ SECTION_DATA static u8 gTRKStepStatus[20] = { diff --git a/libs/Z2AudioLib/Z2Audience.cpp b/libs/Z2AudioLib/Z2Audience.cpp index 425048ffe5e..54b66fe6e01 100644 --- a/libs/Z2AudioLib/Z2Audience.cpp +++ b/libs/Z2AudioLib/Z2Audience.cpp @@ -88,14 +88,14 @@ struct Z2Audience3DSetting { /* 802BC6F8 */ void updateDolbyDist(f32, f32); }; -struct Z2AudibleChannel { - /* 802BBE74 */ Z2AudibleChannel(); -}; - struct JAIAudible { /* 8029EFAC */ ~JAIAudible(); }; +struct Z2AudibleChannel { + /* 802BBE74 */ Z2AudibleChannel(); +}; + struct Z2Audience { /* 802BD130 */ Z2Audience(); /* 802BD1FC */ ~Z2Audience(); @@ -135,7 +135,7 @@ template struct JASMemPool {}; /* JASMemPool */ struct JASMemPool__template5 { - /* 802BD288 */ void func_802BD288(); + /* 802BD288 */ void func_802BD288(void* _this); }; struct JASGenericMemPool { @@ -184,7 +184,7 @@ extern "C" void calcMicPriority__9Z2SpotMicFf(); extern "C" void calcMicVolume__9Z2SpotMicFfif(); extern "C" void __ct__10Z2AudienceFv(); extern "C" void __dt__10Z2AudienceFv(); -extern "C" void func_802BD288(); +extern "C" void func_802BD288(void* _this); extern "C" void setAudioCamera__10Z2AudienceFPA4_fR3VecR3Vecffbib(); extern "C" void func_802BD338(); extern "C" void deleteAudible__10Z2AudienceFP10JAIAudible(); @@ -582,7 +582,7 @@ SECTION_RODATA static u8 const lit_1193[12 + 4 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(8039C220, &lit_1193); +COMPILER_STRIP_GATE(0x8039C220, &lit_1193); /* 80455B08-80455B0C 004108 0004+00 1/1 0/0 0/0 .sdata2 @1267 */ SECTION_SDATA2 static f32 lit_1267 = -22.755556106567383f; @@ -758,7 +758,7 @@ asm Z2Audience::~Z2Audience() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_802BD288() { +extern "C" asm void func_802BD288(void* _this) { nofralloc #include "asm/Z2AudioLib/Z2Audience/func_802BD288.s" } @@ -986,7 +986,7 @@ asm void __sinit_Z2Audience_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_802BDEDC = (void*)__sinit_Z2Audience_cpp; +REGISTER_CTORS(0x802BDEDC, __sinit_Z2Audience_cpp); #pragma pop /* ############################################################################################## */ diff --git a/libs/Z2AudioLib/Z2AudioMgr.cpp b/libs/Z2AudioLib/Z2AudioMgr.cpp index 2ca4d220431..783abd142c4 100644 --- a/libs/Z2AudioLib/Z2AudioMgr.cpp +++ b/libs/Z2AudioLib/Z2AudioMgr.cpp @@ -70,14 +70,6 @@ struct Z2FxLineMgr { /* 802BA7DC */ Z2FxLineMgr(); }; -struct JAISoundHandle {}; - -struct JKRSolidHeap {}; - -struct JKRArchive {}; - -struct JAISoundID {}; - struct JGeometry { template struct TVec3 {}; @@ -85,6 +77,14 @@ struct JGeometry { struct TVec3__template0 {}; }; +struct JKRSolidHeap {}; + +struct JAISoundID {}; + +struct JKRArchive {}; + +struct JAISoundHandle {}; + struct Z2AudioMgr { /* 802CD248 */ Z2AudioMgr(); /* 802CD34C */ void init(JKRSolidHeap*, u32, void*, JKRArchive*); @@ -127,16 +127,16 @@ template struct JAUStreamStaticAramMgr_ {}; /* JAUStreamStaticAramMgr_<1> */ struct JAUStreamStaticAramMgr___template0 { - /* 802CDB68 */ void func_802CDB68(); - /* 802CDC08 */ void func_802CDC08(u32); - /* 802CDCEC */ void func_802CDCEC(u32*); + /* 802CDB68 */ void func_802CDB68(void* _this); + /* 802CDC08 */ void func_802CDC08(void* _this, u32); + /* 802CDCEC */ void func_802CDCEC(void* _this, u32*); }; template struct JAUStreamAramMgrBase_ {}; /* JAUStreamAramMgrBase_<1> */ struct JAUStreamAramMgrBase___template0 { - /* 802CD7F8 */ void func_802CD7F8(); + /* 802CD7F8 */ void func_802CD7F8(void* _this); }; struct JAUSectionHeap { @@ -166,12 +166,12 @@ template struct JASMemPool {}; /* JASMemPool */ struct JASMemPool__template4 { - /* 802AB200 */ void func_802AB200(); + /* 802AB200 */ void func_802AB200(void* _this); }; /* JASMemPool */ struct JASMemPool__template5 { - /* 802BD288 */ void func_802BD288(); + /* 802BD288 */ void func_802BD288(void* _this); }; struct JASKernel { @@ -191,7 +191,6 @@ struct JASGenericMemPool { }; struct JASDriver { - /* 8029C9F0 */ void getSubFrames(); /* 8029E178 */ void setOutputMode(u32); }; @@ -222,11 +221,8 @@ struct JAISeqDataMgr {}; struct JAISeCategoryArrangement {}; -struct JAIAudience {}; - struct JAISeMgr { /* 802A0268 */ void setCategoryArrangement(JAISeCategoryArrangement const&); - /* 802A03D8 */ void setAudience(JAIAudience*); /* 802A03E0 */ void setSeqDataMgr(JAISeqDataMgr*); /* 802A08D0 */ void getNumActiveSe() const; }; @@ -237,7 +233,7 @@ struct JAISeMgr { extern "C" void __ct__10Z2AudioMgrFv(); extern "C" void init__10Z2AudioMgrFP12JKRSolidHeapUlPvP10JKRArchive(); -extern "C" void func_802CD7F8(); +extern "C" void func_802CD7F8(void* _this); extern "C" void setOutputMode__10Z2AudioMgrFUl(); extern "C" void zeldaGFrameWork__10Z2AudioMgrFv(); extern "C" void gframeProcess__10Z2AudioMgrFv(); @@ -245,9 +241,9 @@ extern "C" void resetProcess__10Z2AudioMgrFUlb(); extern "C" void resetRecover__10Z2AudioMgrFv(); extern "C" void hasReset__10Z2AudioMgrCFv(); extern "C" void func_802CDB1C(); -extern "C" void func_802CDB68(); -extern "C" void func_802CDC08(u32); -extern "C" void func_802CDCEC(u32*); +extern "C" void func_802CDB68(void* _this); +extern "C" void func_802CDC08(void* _this, u32); +extern "C" void func_802CDCEC(void* _this, u32*); extern "C" extern char const* const Z2AudioMgr__stringBase0; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; @@ -293,7 +289,7 @@ extern "C" void framework__10Z2SoundMgrFv(); extern "C" void stopSync__10Z2SoundMgrFv(); extern "C" void initParams__10Z2SoundMgrFv(); extern "C" void __ct__14Z2SoundStarterFb(); -extern "C" void func_802AB200(); +extern "C" void func_802AB200(void* _this); extern "C" void __ct__7Z2SeMgrFv(); extern "C" void initSe__7Z2SeMgrFv(); extern "C" void processSeFramework__7Z2SeMgrFv(); @@ -307,7 +303,7 @@ extern "C" void __ct__10Z2SceneMgrFv(); extern "C" void framework__10Z2SceneMgrFv(); extern "C" void __ct__11Z2FxLineMgrFv(); extern "C" void __ct__10Z2AudienceFv(); -extern "C" void func_802BD288(); +extern "C" void func_802BD288(void* _this); extern "C" void __ct__13Z2SoundObjMgrFv(); extern "C" void __ct__12Z2SpeechMgr2Fv(); extern "C" void framework__12Z2SpeechMgr2Fv(); @@ -378,6 +374,13 @@ asm Z2AudioMgr::Z2AudioMgr() { #pragma pop /* ############################################################################################## */ +/* 8039CA58-8039CA58 0290B8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8039CA58 = "Audiores/Waves/"; +SECTION_DEAD static char const* const stringBase_8039CA68 = "index out of range of bitset::reset"; +#pragma pop + /* 803CBF44-803CBF58 029064 0014+00 2/2 0/0 0/0 .data __vt__26JAUStreamStaticAramMgr_<1> */ SECTION_DATA extern void* data_803CBF44[5] = { @@ -424,7 +427,7 @@ asm void Z2AudioMgr::init(JKRSolidHeap* param_0, u32 param_1, void* param_2, JKR #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_802CD7F8() { +extern "C" asm void func_802CD7F8(void* _this) { nofralloc #include "asm/Z2AudioLib/Z2AudioMgr/func_802CD7F8.s" } @@ -514,42 +517,48 @@ asm void Z2AudioMgr::startSound(JAISoundID param_0, JAISoundHandle* param_1, #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_802CDB68() { +extern "C" asm void func_802CDB68(void* _this) { nofralloc #include "asm/Z2AudioLib/Z2AudioMgr/func_802CDB68.s" } #pragma pop +/* ############################################################################################## */ +/* 8039CA58-8039CA58 0290B8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8039CA8C = "index out of range of bitset::test"; +#pragma pop + /* 802CDC08-802CDCEC 2C8548 00E4+00 1/0 0/0 0/0 .text * deleteStreamAram__26JAUStreamStaticAramMgr_<1>FUl */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_802CDC08(u32 param_0) { +extern "C" asm void func_802CDC08(void* _this, u32 param_0) { nofralloc #include "asm/Z2AudioLib/Z2AudioMgr/func_802CDC08.s" } #pragma pop +/* ############################################################################################## */ +/* 8039CA58-8039CA58 0290B8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8039CAAF = "index out of range of bitset::set"; +/* @stringBase0 padding */ +SECTION_DEAD static char const* const pad_8039CAD1 = "\0\0\0\0\0\0"; +#pragma pop + /* 802CDCEC-802CDDC8 2C862C 00DC+00 1/0 0/0 0/0 .text * newStreamAram__26JAUStreamStaticAramMgr_<1>FPUl */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_802CDCEC(u32* param_0) { +extern "C" asm void func_802CDCEC(void* _this, u32* param_0) { nofralloc #include "asm/Z2AudioLib/Z2AudioMgr/func_802CDCEC.s" } #pragma pop -/* 8039CA58-8039CAD8 0290B8 0079+07 3/3 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_8039CA58 = "Audiores/Waves/"; -SECTION_DEAD static char const* const stringBase_8039CA68 = "index out of range of bitset::reset"; -SECTION_DEAD static char const* const stringBase_8039CA8C = "index out of range of bitset::test"; -SECTION_DEAD static char const* const stringBase_8039CAAF = "index out of range of bitset::set"; -/* @stringBase0 padding */ -SECTION_DEAD static char const* const pad_8039CAD1 = "\0\0\0\0\0\0"; -#pragma pop +/* 8039CA58-8039CA58 0290B8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/libs/Z2AudioLib/Z2Calc.cpp b/libs/Z2AudioLib/Z2Calc.cpp index 583740ec1a3..1f4a81ee500 100644 --- a/libs/Z2AudioLib/Z2Calc.cpp +++ b/libs/Z2AudioLib/Z2Calc.cpp @@ -49,7 +49,7 @@ extern "C" void pow(); #pragma optimization_level 0 #pragma optimizewithasm off asm f32 Z2Calc::linearTransform(f32 param_0, f32 param_1, f32 param_2, f32 param_3, f32 param_4, - bool param_5) { + bool param_5) { nofralloc #include "asm/Z2AudioLib/Z2Calc/linearTransform__6Z2CalcFfffffb.s" } @@ -79,7 +79,7 @@ SECTION_SDATA2 static f32 lit_381 = 1.0f; #pragma optimization_level 0 #pragma optimizewithasm off asm f32 Z2Calc::getParamByExp(f32 param_0, f32 param_1, f32 param_2, f32 param_3, f32 param_4, - f32 param_5, Z2Calc::CurveSign param_6) { + f32 param_5, Z2Calc::CurveSign param_6) { nofralloc #include "asm/Z2AudioLib/Z2Calc/getParamByExp__6Z2CalcFffffffQ26Z2Calc9CurveSign.s" } diff --git a/libs/Z2AudioLib/Z2Creature.cpp b/libs/Z2AudioLib/Z2Creature.cpp index 0f7196ba952..00de66e33e1 100644 --- a/libs/Z2AudioLib/Z2Creature.cpp +++ b/libs/Z2AudioLib/Z2Creature.cpp @@ -27,10 +27,10 @@ struct JSULink {}; /* JSULink */ struct JSULink__template2 {}; -struct Vec {}; - struct JAISoundID {}; +struct Vec {}; + struct Z2CreatureEnemy { /* 802C0F64 */ Z2CreatureEnemy(); /* 802C0FC4 */ void deleteObject(); @@ -1470,5 +1470,5 @@ asm void __sinit_Z2Creature_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_802C3040 = (void*)__sinit_Z2Creature_cpp; +REGISTER_CTORS(0x802C3040, __sinit_Z2Creature_cpp); #pragma pop diff --git a/libs/Z2AudioLib/Z2EnvSeMgr.cpp b/libs/Z2AudioLib/Z2EnvSeMgr.cpp index 40922e7bccf..97532c04564 100644 --- a/libs/Z2AudioLib/Z2EnvSeMgr.cpp +++ b/libs/Z2AudioLib/Z2EnvSeMgr.cpp @@ -40,10 +40,10 @@ struct Z2SoundMgr { /* 802AA270 */ void setIIR(JAISound*, s16 const*); }; -struct Vec {}; - struct JAISoundID {}; +struct Vec {}; + struct Z2SeMgr { /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); }; @@ -376,7 +376,7 @@ SECTION_RODATA static u8 const cNullVec__6Z2Calc[12 + 4 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(8039C250, &cNullVec__6Z2Calc); +COMPILER_STRIP_GATE(0x8039C250, &cNullVec__6Z2Calc); /* 80455D60-80455D64 004360 0004+00 10/10 0/0 0/0 .sdata2 @3574 */ SECTION_SDATA2 static f32 lit_3574 = 0.5f; @@ -808,15 +808,10 @@ asm void Z2EnvSeMgr::startFarThunderSe(Vec* param_0, s8 param_1) { } #pragma pop -/* 802C7FB4-802C7FBC 2C28F4 0008+00 0/0 0/0 3/3 .text setSnowPower__10Z2EnvSeMgrFSc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void Z2EnvSeMgr::setSnowPower(s8 param_0) { - nofralloc -#include "asm/Z2AudioLib/Z2EnvSeMgr/setSnowPower__10Z2EnvSeMgrFSc.s" +/* 802C7FB4-802C7FBC -00001 0008+00 0/0 0/0 0/0 .text setSnowPower__10Z2EnvSeMgrFSc */ +void Z2EnvSeMgr::setSnowPower(s8 param_0) { + *(u8*)(((u8*)this) + 321) /* this->field_0x141 */ = (u8)(param_0); } -#pragma pop /* 802C7FBC-802C7FC8 2C28FC 000C+00 0/0 1/1 1/1 .text initStrongWindSe__10Z2EnvSeMgrFv */ #pragma push diff --git a/libs/Z2AudioLib/Z2FxLineMgr.cpp b/libs/Z2AudioLib/Z2FxLineMgr.cpp index 595981c31f4..117dedad141 100644 --- a/libs/Z2AudioLib/Z2FxLineMgr.cpp +++ b/libs/Z2AudioLib/Z2FxLineMgr.cpp @@ -11,6 +11,10 @@ // Types: // +struct JKRHeap { + /* 802CE500 */ void free(void*, JKRHeap*); +}; + struct JKRArchive { /* 802D5D38 */ void getResource(u16); /* 802D610C */ void countResource() const; @@ -18,10 +22,6 @@ struct JKRArchive { struct Z2FxLineConfig {}; -struct JKRHeap { - /* 802CE500 */ void free(void*, JKRHeap*); -}; - struct Z2FxLineMgr { /* 802BA7DC */ Z2FxLineMgr(); /* 802BA7FC */ void initDataArc(JKRArchive*, JKRHeap*); diff --git a/libs/Z2AudioLib/Z2LinkMgr.cpp b/libs/Z2AudioLib/Z2LinkMgr.cpp index 9a54c459f55..b50ed208c25 100644 --- a/libs/Z2AudioLib/Z2LinkMgr.cpp +++ b/libs/Z2AudioLib/Z2LinkMgr.cpp @@ -19,10 +19,6 @@ struct dSv_event_c { /* 800349BC */ void isEventBit(u16) const; }; -struct JAISoundHandle {}; - -struct JAISoundID {}; - struct JGeometry { template struct TVec3 {}; @@ -30,6 +26,10 @@ struct JGeometry { struct TVec3__template0 {}; }; +struct JAISoundID {}; + +struct JAISoundHandle {}; + struct Z2SoundStarter { /* 802AAB94 */ Z2SoundStarter(bool); /* 802AAC3C */ void startSound(JAISoundID, JAISoundHandle*, JGeometry::TVec3 const*, u32, @@ -314,15 +314,10 @@ void Z2CreatureLink::setLinkGroupInfo(u8 param_0) { /* empty function */ } -/* 802C3220-802C3228 2BDB60 0008+00 0/0 1/1 0/0 .text setLinkHp__14Z2CreatureLinkFll */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void Z2CreatureLink::setLinkHp(s32 param_0, s32 param_1) { - nofralloc -#include "asm/Z2AudioLib/Z2LinkMgr/setLinkHp__14Z2CreatureLinkFll.s" +/* 802C3220-802C3228 -00001 0008+00 0/0 0/0 0/0 .text setLinkHp__14Z2CreatureLinkFll */ +void Z2CreatureLink::setLinkHp(s32 param_0, s32 param_1) { + *(u8*)(((u8*)this) + 195) /* this->field_0xc3 */ = (u8)(param_0); } -#pragma pop /* 802C3228-802C328C 2BDB68 0064+00 0/0 1/1 0/0 .text setLinkSwordType__14Z2CreatureLinkFll */ #pragma push @@ -498,15 +493,10 @@ asm void Z2CreatureLink::deleteKantera() { } #pragma pop -/* 802C3778-802C3780 2BE0B8 0008+00 0/0 5/5 0/0 .text setKanteraState__14Z2CreatureLinkFUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void Z2CreatureLink::setKanteraState(u8 param_0) { - nofralloc -#include "asm/Z2AudioLib/Z2LinkMgr/setKanteraState__14Z2CreatureLinkFUc.s" +/* 802C3778-802C3780 -00001 0008+00 0/0 0/0 0/0 .text setKanteraState__14Z2CreatureLinkFUc */ +void Z2CreatureLink::setKanteraState(u8 param_0) { + *(u8*)(((u8*)this) + 197) /* this->field_0xc5 */ = (u8)(param_0); } -#pragma pop /* ############################################################################################## */ /* 80455C98-80455C9C 004298 0004+00 9/9 0/0 0/0 .sdata2 @3721 */ @@ -543,16 +533,11 @@ asm void Z2CreatureLink::framework(u32 param_0, s8 param_1) { } #pragma pop -/* 802C3A64-802C3A6C 2BE3A4 0008+00 0/0 1/1 0/0 .text setSinkDepth__14Z2CreatureLinkFSc +/* 802C3A64-802C3A6C -00001 0008+00 0/0 0/0 0/0 .text setSinkDepth__14Z2CreatureLinkFSc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void Z2CreatureLink::setSinkDepth(s8 param_0) { - nofralloc -#include "asm/Z2AudioLib/Z2LinkMgr/setSinkDepth__14Z2CreatureLinkFSc.s" +void Z2CreatureLink::setSinkDepth(s8 param_0) { + *(u8*)(((u8*)this) + 202) /* this->field_0xca */ = (u8)(param_0); } -#pragma pop /* ############################################################################################## */ /* 80455CC0-80455CC4 0042C0 0004+00 1/1 0/0 0/0 .sdata2 @3743 */ @@ -820,16 +805,11 @@ asm void Z2CreatureRide::init(Vec* param_0, Vec* param_1, u8 param_2, u8 param_3 } #pragma pop -/* 802C522C-802C5234 2BFB6C 0008+00 0/0 2/2 1/1 .text setLinkRiding__14Z2CreatureRideFb +/* 802C522C-802C5234 -00001 0008+00 0/0 0/0 0/0 .text setLinkRiding__14Z2CreatureRideFb */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void Z2CreatureRide::setLinkRiding(bool param_0) { - nofralloc -#include "asm/Z2AudioLib/Z2LinkMgr/setLinkRiding__14Z2CreatureRideFb.s" +void Z2CreatureRide::setLinkRiding(bool param_0) { + *(u8*)(((u8*)this) + 152) /* this->field_0x98 */ = (u8)(param_0); } -#pragma pop /* 802C5234-802C5284 2BFB74 0050+00 1/1 0/0 0/0 .text __ct__18Z2RideSoundStarterFP14Z2CreatureRide */ diff --git a/libs/Z2AudioLib/Z2SceneMgr.cpp b/libs/Z2AudioLib/Z2SceneMgr.cpp index 45d707080be..465129fecee 100644 --- a/libs/Z2AudioLib/Z2SceneMgr.cpp +++ b/libs/Z2AudioLib/Z2SceneMgr.cpp @@ -112,7 +112,7 @@ template struct JSUList {}; /* JSUList */ struct JSUList__template2 { - /* 802B9994 */ void func_802B9994() /* const */; + /* 802B9994 */ void func_802B9994(void* _this) /* const */; }; struct JAUSoundTable { @@ -154,7 +154,7 @@ extern "C" void __ct__10JAISoundIDFRC10JAISoundID(); extern "C" void setFieldBgmPlay__8Z2SeqMgrFb(); extern "C" void isActive__12JAIStreamMgrCFv(); extern "C" void getID__8JAISoundCFv(); -extern "C" void func_802B9994(); +extern "C" void func_802B9994(void* _this); extern "C" static void dComIfGs_getStartPoint__Fv(); extern "C" void unMuteSceneBgm__8Z2SeqMgrFUl(); extern "C" void muteSceneBgm__8Z2SeqMgrFUlf(); @@ -317,6 +317,95 @@ asm void Z2SceneMgr::setFadeInStart(u8 param_0) { #pragma pop /* ############################################################################################## */ +/* 8039BFA8-8039BFA8 028608 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8039BFA8 = "F_SP00"; +SECTION_DEAD static char const* const stringBase_8039BFAF = "F_SP103"; +SECTION_DEAD static char const* const stringBase_8039BFB7 = "R_SP01"; +SECTION_DEAD static char const* const stringBase_8039BFBE = "F_SP104"; +SECTION_DEAD static char const* const stringBase_8039BFC6 = "R_SP107"; +SECTION_DEAD static char const* const stringBase_8039BFCE = "F_SP108"; +SECTION_DEAD static char const* const stringBase_8039BFD6 = "R_SP108"; +SECTION_DEAD static char const* const stringBase_8039BFDE = "F_SP117"; +SECTION_DEAD static char const* const stringBase_8039BFE6 = "F_SP109"; +SECTION_DEAD static char const* const stringBase_8039BFEE = "R_SP109"; +SECTION_DEAD static char const* const stringBase_8039BFF6 = "R_SP209"; +SECTION_DEAD static char const* const stringBase_8039BFFE = "F_SP110"; +SECTION_DEAD static char const* const stringBase_8039C006 = "R_SP110"; +SECTION_DEAD static char const* const stringBase_8039C00E = "F_SP111"; +SECTION_DEAD static char const* const stringBase_8039C016 = "F_SP128"; +SECTION_DEAD static char const* const stringBase_8039C01E = "R_SP128"; +SECTION_DEAD static char const* const stringBase_8039C026 = "F_SP115"; +SECTION_DEAD static char const* const stringBase_8039C02E = "F_SP112"; +SECTION_DEAD static char const* const stringBase_8039C036 = "F_SP126"; +SECTION_DEAD static char const* const stringBase_8039C03E = "F_SP127"; +SECTION_DEAD static char const* const stringBase_8039C046 = "R_SP127"; +SECTION_DEAD static char const* const stringBase_8039C04E = "F_SP113"; +SECTION_DEAD static char const* const stringBase_8039C056 = "F_SP116"; +SECTION_DEAD static char const* const stringBase_8039C05E = "R_SP116"; +SECTION_DEAD static char const* const stringBase_8039C066 = "R_SP160"; +SECTION_DEAD static char const* const stringBase_8039C06E = "R_SP161"; +SECTION_DEAD static char const* const stringBase_8039C076 = "F_SP114"; +SECTION_DEAD static char const* const stringBase_8039C07E = "F_SP118"; +SECTION_DEAD static char const* const stringBase_8039C086 = "F_SP124"; +SECTION_DEAD static char const* const stringBase_8039C08E = "F_SP125"; +SECTION_DEAD static char const* const stringBase_8039C096 = "F_SP121"; +SECTION_DEAD static char const* const stringBase_8039C09E = "F_SP122"; +SECTION_DEAD static char const* const stringBase_8039C0A6 = "F_SP123"; +SECTION_DEAD static char const* const stringBase_8039C0AE = "F_SP200"; +SECTION_DEAD static char const* const stringBase_8039C0B6 = "F_SP102"; +SECTION_DEAD static char const* const stringBase_8039C0BE = ""; +SECTION_DEAD static char const* const stringBase_8039C0BF = "R_SP300"; +SECTION_DEAD static char const* const stringBase_8039C0C7 = "R_SP301"; +SECTION_DEAD static char const* const stringBase_8039C0CF = "T_ENEMY"; +SECTION_DEAD static char const* const stringBase_8039C0D7 = "D_MN54"; +SECTION_DEAD static char const* const stringBase_8039C0DE = "D_MN05"; +SECTION_DEAD static char const* const stringBase_8039C0E5 = "D_MN05B"; +SECTION_DEAD static char const* const stringBase_8039C0ED = "D_MN05A"; +SECTION_DEAD static char const* const stringBase_8039C0F5 = "D_MN04"; +SECTION_DEAD static char const* const stringBase_8039C0FC = "D_MN04B"; +SECTION_DEAD static char const* const stringBase_8039C104 = "D_MN04A"; +SECTION_DEAD static char const* const stringBase_8039C10C = "D_MN01"; +SECTION_DEAD static char const* const stringBase_8039C113 = "D_MN01B"; +SECTION_DEAD static char const* const stringBase_8039C11B = "D_MN01A"; +SECTION_DEAD static char const* const stringBase_8039C123 = "D_MN10"; +SECTION_DEAD static char const* const stringBase_8039C12A = "D_MN10B"; +SECTION_DEAD static char const* const stringBase_8039C132 = "D_MN10A"; +SECTION_DEAD static char const* const stringBase_8039C13A = "D_MN11"; +SECTION_DEAD static char const* const stringBase_8039C141 = "D_MN11B"; +SECTION_DEAD static char const* const stringBase_8039C149 = "D_MN11A"; +SECTION_DEAD static char const* const stringBase_8039C151 = "D_MN06"; +SECTION_DEAD static char const* const stringBase_8039C158 = "D_MN06B"; +SECTION_DEAD static char const* const stringBase_8039C160 = "D_MN06A"; +SECTION_DEAD static char const* const stringBase_8039C168 = "D_MN07"; +SECTION_DEAD static char const* const stringBase_8039C16F = "D_MN07B"; +SECTION_DEAD static char const* const stringBase_8039C177 = "D_MN07A"; +SECTION_DEAD static char const* const stringBase_8039C17F = "D_MN08"; +SECTION_DEAD static char const* const stringBase_8039C186 = "D_MN08B"; +SECTION_DEAD static char const* const stringBase_8039C18E = "D_MN08C"; +SECTION_DEAD static char const* const stringBase_8039C196 = "D_MN08A"; +SECTION_DEAD static char const* const stringBase_8039C19E = "D_MN08D"; +SECTION_DEAD static char const* const stringBase_8039C1A6 = "D_MN09"; +SECTION_DEAD static char const* const stringBase_8039C1AD = "D_MN09A"; +SECTION_DEAD static char const* const stringBase_8039C1B5 = "D_MN09B"; +SECTION_DEAD static char const* const stringBase_8039C1BD = "D_MN09C"; +SECTION_DEAD static char const* const stringBase_8039C1C5 = "D_SB00"; +SECTION_DEAD static char const* const stringBase_8039C1CC = "D_SB01"; +SECTION_DEAD static char const* const stringBase_8039C1D3 = "D_SB02"; +SECTION_DEAD static char const* const stringBase_8039C1DA = "D_SB03"; +SECTION_DEAD static char const* const stringBase_8039C1E1 = "D_SB04"; +SECTION_DEAD static char const* const stringBase_8039C1E8 = "D_SB05"; +SECTION_DEAD static char const* const stringBase_8039C1EF = "D_SB06"; +SECTION_DEAD static char const* const stringBase_8039C1F6 = "D_SB07"; +SECTION_DEAD static char const* const stringBase_8039C1FD = "D_SB08"; +SECTION_DEAD static char const* const stringBase_8039C204 = "D_SB09"; +SECTION_DEAD static char const* const stringBase_8039C20B = "D_SB10"; +SECTION_DEAD static char const* const stringBase_8039C212 = "force_end"; +/* @stringBase0 padding */ +SECTION_DEAD static char const* const pad_8039C21C = "\0\0\0"; +#pragma pop + /* 803CA5C0-803CA704 -00001 0144+00 1/1 0/0 0/0 .data sSpotName */ SECTION_DATA static void* sSpotName[81] = { (void*)&Z2SceneMgr__stringBase0, @@ -682,7 +771,7 @@ asm void JAISound::getID() const { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_802B9994() /* const */ { +extern "C" asm void func_802B9994(void* _this) /* const */ { nofralloc #include "asm/Z2AudioLib/Z2SceneMgr/func_802B9994.s" } @@ -769,15 +858,10 @@ asm void Z2SeqMgr::setWindStoneVol(f32 param_0, u32 param_1) { } #pragma pop -/* 802B9B60-802B9B68 2B44A0 0008+00 1/1 0/0 0/0 .text __ct__10JAISoundIDFUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm JAISoundID::JAISoundID(u32 param_0) { - nofralloc -#include "asm/Z2AudioLib/Z2SceneMgr/__ct__10JAISoundIDFUl.s" +/* 802B9B60-802B9B68 -00001 0008+00 0/0 0/0 0/0 .text __ct__10JAISoundIDFUl */ +JAISoundID::JAISoundID(u32 param_0) { + *(u32*)this = (u32)(param_0); } -#pragma pop /* 802B9B68-802B9C50 2B44A8 00E8+00 1/1 0/0 0/0 .text * sceneChange__10Z2SceneMgrF10JAISoundIDUcUcUcUcUcb */ @@ -1023,92 +1107,4 @@ asm void Z2SceneMgr::loadBgmWave(u32 param_0) { } #pragma pop -/* 8039BFA8-8039C220 028608 0274+04 2/1 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_8039BFA8 = "F_SP00"; -SECTION_DEAD static char const* const stringBase_8039BFAF = "F_SP103"; -SECTION_DEAD static char const* const stringBase_8039BFB7 = "R_SP01"; -SECTION_DEAD static char const* const stringBase_8039BFBE = "F_SP104"; -SECTION_DEAD static char const* const stringBase_8039BFC6 = "R_SP107"; -SECTION_DEAD static char const* const stringBase_8039BFCE = "F_SP108"; -SECTION_DEAD static char const* const stringBase_8039BFD6 = "R_SP108"; -SECTION_DEAD static char const* const stringBase_8039BFDE = "F_SP117"; -SECTION_DEAD static char const* const stringBase_8039BFE6 = "F_SP109"; -SECTION_DEAD static char const* const stringBase_8039BFEE = "R_SP109"; -SECTION_DEAD static char const* const stringBase_8039BFF6 = "R_SP209"; -SECTION_DEAD static char const* const stringBase_8039BFFE = "F_SP110"; -SECTION_DEAD static char const* const stringBase_8039C006 = "R_SP110"; -SECTION_DEAD static char const* const stringBase_8039C00E = "F_SP111"; -SECTION_DEAD static char const* const stringBase_8039C016 = "F_SP128"; -SECTION_DEAD static char const* const stringBase_8039C01E = "R_SP128"; -SECTION_DEAD static char const* const stringBase_8039C026 = "F_SP115"; -SECTION_DEAD static char const* const stringBase_8039C02E = "F_SP112"; -SECTION_DEAD static char const* const stringBase_8039C036 = "F_SP126"; -SECTION_DEAD static char const* const stringBase_8039C03E = "F_SP127"; -SECTION_DEAD static char const* const stringBase_8039C046 = "R_SP127"; -SECTION_DEAD static char const* const stringBase_8039C04E = "F_SP113"; -SECTION_DEAD static char const* const stringBase_8039C056 = "F_SP116"; -SECTION_DEAD static char const* const stringBase_8039C05E = "R_SP116"; -SECTION_DEAD static char const* const stringBase_8039C066 = "R_SP160"; -SECTION_DEAD static char const* const stringBase_8039C06E = "R_SP161"; -SECTION_DEAD static char const* const stringBase_8039C076 = "F_SP114"; -SECTION_DEAD static char const* const stringBase_8039C07E = "F_SP118"; -SECTION_DEAD static char const* const stringBase_8039C086 = "F_SP124"; -SECTION_DEAD static char const* const stringBase_8039C08E = "F_SP125"; -SECTION_DEAD static char const* const stringBase_8039C096 = "F_SP121"; -SECTION_DEAD static char const* const stringBase_8039C09E = "F_SP122"; -SECTION_DEAD static char const* const stringBase_8039C0A6 = "F_SP123"; -SECTION_DEAD static char const* const stringBase_8039C0AE = "F_SP200"; -SECTION_DEAD static char const* const stringBase_8039C0B6 = "F_SP102"; -SECTION_DEAD static char const* const stringBase_8039C0BE = ""; -SECTION_DEAD static char const* const stringBase_8039C0BF = "R_SP300"; -SECTION_DEAD static char const* const stringBase_8039C0C7 = "R_SP301"; -SECTION_DEAD static char const* const stringBase_8039C0CF = "T_ENEMY"; -SECTION_DEAD static char const* const stringBase_8039C0D7 = "D_MN54"; -SECTION_DEAD static char const* const stringBase_8039C0DE = "D_MN05"; -SECTION_DEAD static char const* const stringBase_8039C0E5 = "D_MN05B"; -SECTION_DEAD static char const* const stringBase_8039C0ED = "D_MN05A"; -SECTION_DEAD static char const* const stringBase_8039C0F5 = "D_MN04"; -SECTION_DEAD static char const* const stringBase_8039C0FC = "D_MN04B"; -SECTION_DEAD static char const* const stringBase_8039C104 = "D_MN04A"; -SECTION_DEAD static char const* const stringBase_8039C10C = "D_MN01"; -SECTION_DEAD static char const* const stringBase_8039C113 = "D_MN01B"; -SECTION_DEAD static char const* const stringBase_8039C11B = "D_MN01A"; -SECTION_DEAD static char const* const stringBase_8039C123 = "D_MN10"; -SECTION_DEAD static char const* const stringBase_8039C12A = "D_MN10B"; -SECTION_DEAD static char const* const stringBase_8039C132 = "D_MN10A"; -SECTION_DEAD static char const* const stringBase_8039C13A = "D_MN11"; -SECTION_DEAD static char const* const stringBase_8039C141 = "D_MN11B"; -SECTION_DEAD static char const* const stringBase_8039C149 = "D_MN11A"; -SECTION_DEAD static char const* const stringBase_8039C151 = "D_MN06"; -SECTION_DEAD static char const* const stringBase_8039C158 = "D_MN06B"; -SECTION_DEAD static char const* const stringBase_8039C160 = "D_MN06A"; -SECTION_DEAD static char const* const stringBase_8039C168 = "D_MN07"; -SECTION_DEAD static char const* const stringBase_8039C16F = "D_MN07B"; -SECTION_DEAD static char const* const stringBase_8039C177 = "D_MN07A"; -SECTION_DEAD static char const* const stringBase_8039C17F = "D_MN08"; -SECTION_DEAD static char const* const stringBase_8039C186 = "D_MN08B"; -SECTION_DEAD static char const* const stringBase_8039C18E = "D_MN08C"; -SECTION_DEAD static char const* const stringBase_8039C196 = "D_MN08A"; -SECTION_DEAD static char const* const stringBase_8039C19E = "D_MN08D"; -SECTION_DEAD static char const* const stringBase_8039C1A6 = "D_MN09"; -SECTION_DEAD static char const* const stringBase_8039C1AD = "D_MN09A"; -SECTION_DEAD static char const* const stringBase_8039C1B5 = "D_MN09B"; -SECTION_DEAD static char const* const stringBase_8039C1BD = "D_MN09C"; -SECTION_DEAD static char const* const stringBase_8039C1C5 = "D_SB00"; -SECTION_DEAD static char const* const stringBase_8039C1CC = "D_SB01"; -SECTION_DEAD static char const* const stringBase_8039C1D3 = "D_SB02"; -SECTION_DEAD static char const* const stringBase_8039C1DA = "D_SB03"; -SECTION_DEAD static char const* const stringBase_8039C1E1 = "D_SB04"; -SECTION_DEAD static char const* const stringBase_8039C1E8 = "D_SB05"; -SECTION_DEAD static char const* const stringBase_8039C1EF = "D_SB06"; -SECTION_DEAD static char const* const stringBase_8039C1F6 = "D_SB07"; -SECTION_DEAD static char const* const stringBase_8039C1FD = "D_SB08"; -SECTION_DEAD static char const* const stringBase_8039C204 = "D_SB09"; -SECTION_DEAD static char const* const stringBase_8039C20B = "D_SB10"; -SECTION_DEAD static char const* const stringBase_8039C212 = "force_end"; -/* @stringBase0 padding */ -SECTION_DEAD static char const* const pad_8039C21C = "\0\0\0"; -#pragma pop +/* 8039BFA8-8039BFA8 028608 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/libs/Z2AudioLib/Z2SeMgr.cpp b/libs/Z2AudioLib/Z2SeMgr.cpp index d54d0f9fe87..97f7cd87a93 100644 --- a/libs/Z2AudioLib/Z2SeMgr.cpp +++ b/libs/Z2AudioLib/Z2SeMgr.cpp @@ -651,7 +651,7 @@ asm void Z2SeMgr::menuInSe() { SECTION_RODATA static u8 const lit_5054[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC2, 0x48, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8039B9F0, &lit_5054); +COMPILER_STRIP_GATE(0x8039B9F0, &lit_5054); /* 80455990-80455994 003F90 0004+00 1/1 0/0 0/0 .sdata2 @5085 */ SECTION_SDATA2 static f32 lit_5085 = 4.0f; @@ -671,7 +671,7 @@ asm void Z2SeMgr::setLevObjSE(u32 param_0, Vec* param_1, s8 param_2) { SECTION_RODATA static u8 const lit_5100[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC2, 0x48, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8039B9FC, &lit_5100); +COMPILER_STRIP_GATE(0x8039B9FC, &lit_5100); /* 80455994-80455998 003F94 0004+00 1/1 0/0 0/0 .sdata2 @5134 */ SECTION_SDATA2 static f32 lit_5134 = 3.0f; diff --git a/libs/Z2AudioLib/Z2SeqMgr.cpp b/libs/Z2AudioLib/Z2SeqMgr.cpp index d3371452944..f4617a0ecaa 100644 --- a/libs/Z2AudioLib/Z2SeqMgr.cpp +++ b/libs/Z2AudioLib/Z2SeqMgr.cpp @@ -294,6 +294,93 @@ asm void Z2SeqMgr::bgmStop(u32 param_0, s32 param_1) { #pragma pop /* ############################################################################################## */ +/* 8039BA08-8039BA08 028068 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8039BA08 = "F_SP00"; +SECTION_DEAD static char const* const stringBase_8039BA0F = "F_SP103"; +SECTION_DEAD static char const* const stringBase_8039BA17 = "R_SP01"; +SECTION_DEAD static char const* const stringBase_8039BA1E = "F_SP104"; +SECTION_DEAD static char const* const stringBase_8039BA26 = "R_SP107"; +SECTION_DEAD static char const* const stringBase_8039BA2E = "F_SP108"; +SECTION_DEAD static char const* const stringBase_8039BA36 = "R_SP108"; +SECTION_DEAD static char const* const stringBase_8039BA3E = "F_SP117"; +SECTION_DEAD static char const* const stringBase_8039BA46 = "F_SP109"; +SECTION_DEAD static char const* const stringBase_8039BA4E = "R_SP109"; +SECTION_DEAD static char const* const stringBase_8039BA56 = "R_SP209"; +SECTION_DEAD static char const* const stringBase_8039BA5E = "F_SP110"; +SECTION_DEAD static char const* const stringBase_8039BA66 = "R_SP110"; +SECTION_DEAD static char const* const stringBase_8039BA6E = "F_SP111"; +SECTION_DEAD static char const* const stringBase_8039BA76 = "F_SP128"; +SECTION_DEAD static char const* const stringBase_8039BA7E = "R_SP128"; +SECTION_DEAD static char const* const stringBase_8039BA86 = "F_SP115"; +SECTION_DEAD static char const* const stringBase_8039BA8E = "F_SP112"; +SECTION_DEAD static char const* const stringBase_8039BA96 = "F_SP126"; +SECTION_DEAD static char const* const stringBase_8039BA9E = "F_SP127"; +SECTION_DEAD static char const* const stringBase_8039BAA6 = "R_SP127"; +SECTION_DEAD static char const* const stringBase_8039BAAE = "F_SP113"; +SECTION_DEAD static char const* const stringBase_8039BAB6 = "F_SP116"; +SECTION_DEAD static char const* const stringBase_8039BABE = "R_SP116"; +SECTION_DEAD static char const* const stringBase_8039BAC6 = "R_SP160"; +SECTION_DEAD static char const* const stringBase_8039BACE = "R_SP161"; +SECTION_DEAD static char const* const stringBase_8039BAD6 = "F_SP114"; +SECTION_DEAD static char const* const stringBase_8039BADE = "F_SP118"; +SECTION_DEAD static char const* const stringBase_8039BAE6 = "F_SP124"; +SECTION_DEAD static char const* const stringBase_8039BAEE = "F_SP125"; +SECTION_DEAD static char const* const stringBase_8039BAF6 = "F_SP121"; +SECTION_DEAD static char const* const stringBase_8039BAFE = "F_SP122"; +SECTION_DEAD static char const* const stringBase_8039BB06 = "F_SP123"; +SECTION_DEAD static char const* const stringBase_8039BB0E = "F_SP200"; +SECTION_DEAD static char const* const stringBase_8039BB16 = "F_SP102"; +SECTION_DEAD static char const* const stringBase_8039BB1E = ""; +SECTION_DEAD static char const* const stringBase_8039BB1F = "R_SP300"; +SECTION_DEAD static char const* const stringBase_8039BB27 = "R_SP301"; +SECTION_DEAD static char const* const stringBase_8039BB2F = "T_ENEMY"; +SECTION_DEAD static char const* const stringBase_8039BB37 = "D_MN54"; +SECTION_DEAD static char const* const stringBase_8039BB3E = "D_MN05"; +SECTION_DEAD static char const* const stringBase_8039BB45 = "D_MN05B"; +SECTION_DEAD static char const* const stringBase_8039BB4D = "D_MN05A"; +SECTION_DEAD static char const* const stringBase_8039BB55 = "D_MN04"; +SECTION_DEAD static char const* const stringBase_8039BB5C = "D_MN04B"; +SECTION_DEAD static char const* const stringBase_8039BB64 = "D_MN04A"; +SECTION_DEAD static char const* const stringBase_8039BB6C = "D_MN01"; +SECTION_DEAD static char const* const stringBase_8039BB73 = "D_MN01B"; +SECTION_DEAD static char const* const stringBase_8039BB7B = "D_MN01A"; +SECTION_DEAD static char const* const stringBase_8039BB83 = "D_MN10"; +SECTION_DEAD static char const* const stringBase_8039BB8A = "D_MN10B"; +SECTION_DEAD static char const* const stringBase_8039BB92 = "D_MN10A"; +SECTION_DEAD static char const* const stringBase_8039BB9A = "D_MN11"; +SECTION_DEAD static char const* const stringBase_8039BBA1 = "D_MN11B"; +SECTION_DEAD static char const* const stringBase_8039BBA9 = "D_MN11A"; +SECTION_DEAD static char const* const stringBase_8039BBB1 = "D_MN06"; +SECTION_DEAD static char const* const stringBase_8039BBB8 = "D_MN06B"; +SECTION_DEAD static char const* const stringBase_8039BBC0 = "D_MN06A"; +SECTION_DEAD static char const* const stringBase_8039BBC8 = "D_MN07"; +SECTION_DEAD static char const* const stringBase_8039BBCF = "D_MN07B"; +SECTION_DEAD static char const* const stringBase_8039BBD7 = "D_MN07A"; +SECTION_DEAD static char const* const stringBase_8039BBDF = "D_MN08"; +SECTION_DEAD static char const* const stringBase_8039BBE6 = "D_MN08B"; +SECTION_DEAD static char const* const stringBase_8039BBEE = "D_MN08C"; +SECTION_DEAD static char const* const stringBase_8039BBF6 = "D_MN08A"; +SECTION_DEAD static char const* const stringBase_8039BBFE = "D_MN08D"; +SECTION_DEAD static char const* const stringBase_8039BC06 = "D_MN09"; +SECTION_DEAD static char const* const stringBase_8039BC0D = "D_MN09A"; +SECTION_DEAD static char const* const stringBase_8039BC15 = "D_MN09B"; +SECTION_DEAD static char const* const stringBase_8039BC1D = "D_MN09C"; +SECTION_DEAD static char const* const stringBase_8039BC25 = "D_SB00"; +SECTION_DEAD static char const* const stringBase_8039BC2C = "D_SB01"; +SECTION_DEAD static char const* const stringBase_8039BC33 = "D_SB02"; +SECTION_DEAD static char const* const stringBase_8039BC3A = "D_SB03"; +SECTION_DEAD static char const* const stringBase_8039BC41 = "D_SB04"; +SECTION_DEAD static char const* const stringBase_8039BC48 = "D_SB05"; +SECTION_DEAD static char const* const stringBase_8039BC4F = "D_SB06"; +SECTION_DEAD static char const* const stringBase_8039BC56 = "D_SB07"; +SECTION_DEAD static char const* const stringBase_8039BC5D = "D_SB08"; +SECTION_DEAD static char const* const stringBase_8039BC64 = "D_SB09"; +SECTION_DEAD static char const* const stringBase_8039BC6B = "D_SB10"; +SECTION_DEAD static char const* const stringBase_8039BC72 = "force_start"; +#pragma pop + /* 803C9DF8-803CA08C -00001 0294+00 1/1 0/0 0/0 .data @3900 */ SECTION_DATA static void* lit_3900[165] = { (void*)(((char*)subBgmStart__8Z2SeqMgrFUl) + 0x14C), @@ -474,6 +561,12 @@ asm void Z2SeqMgr::subBgmStart(u32 param_0) { #pragma pop /* ############################################################################################## */ +/* 8039BA08-8039BA08 028068 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8039BC7E = "force_end"; +#pragma pop + /* 803CA08C-803CA308 -00001 027C+00 1/1 0/0 0/0 .data @3988 */ SECTION_DATA static void* lit_3988[159] = { (void*)(((char*)subBgmStop__8Z2SeqMgrFv) + 0x58), @@ -1295,91 +1388,4 @@ asm void Z2SeqMgr::taktModeMuteOff() { } #pragma pop -/* 8039BA08-8039BC88 028068 0280+00 4/4 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_8039BA08 = "F_SP00"; -SECTION_DEAD static char const* const stringBase_8039BA0F = "F_SP103"; -SECTION_DEAD static char const* const stringBase_8039BA17 = "R_SP01"; -SECTION_DEAD static char const* const stringBase_8039BA1E = "F_SP104"; -SECTION_DEAD static char const* const stringBase_8039BA26 = "R_SP107"; -SECTION_DEAD static char const* const stringBase_8039BA2E = "F_SP108"; -SECTION_DEAD static char const* const stringBase_8039BA36 = "R_SP108"; -SECTION_DEAD static char const* const stringBase_8039BA3E = "F_SP117"; -SECTION_DEAD static char const* const stringBase_8039BA46 = "F_SP109"; -SECTION_DEAD static char const* const stringBase_8039BA4E = "R_SP109"; -SECTION_DEAD static char const* const stringBase_8039BA56 = "R_SP209"; -SECTION_DEAD static char const* const stringBase_8039BA5E = "F_SP110"; -SECTION_DEAD static char const* const stringBase_8039BA66 = "R_SP110"; -SECTION_DEAD static char const* const stringBase_8039BA6E = "F_SP111"; -SECTION_DEAD static char const* const stringBase_8039BA76 = "F_SP128"; -SECTION_DEAD static char const* const stringBase_8039BA7E = "R_SP128"; -SECTION_DEAD static char const* const stringBase_8039BA86 = "F_SP115"; -SECTION_DEAD static char const* const stringBase_8039BA8E = "F_SP112"; -SECTION_DEAD static char const* const stringBase_8039BA96 = "F_SP126"; -SECTION_DEAD static char const* const stringBase_8039BA9E = "F_SP127"; -SECTION_DEAD static char const* const stringBase_8039BAA6 = "R_SP127"; -SECTION_DEAD static char const* const stringBase_8039BAAE = "F_SP113"; -SECTION_DEAD static char const* const stringBase_8039BAB6 = "F_SP116"; -SECTION_DEAD static char const* const stringBase_8039BABE = "R_SP116"; -SECTION_DEAD static char const* const stringBase_8039BAC6 = "R_SP160"; -SECTION_DEAD static char const* const stringBase_8039BACE = "R_SP161"; -SECTION_DEAD static char const* const stringBase_8039BAD6 = "F_SP114"; -SECTION_DEAD static char const* const stringBase_8039BADE = "F_SP118"; -SECTION_DEAD static char const* const stringBase_8039BAE6 = "F_SP124"; -SECTION_DEAD static char const* const stringBase_8039BAEE = "F_SP125"; -SECTION_DEAD static char const* const stringBase_8039BAF6 = "F_SP121"; -SECTION_DEAD static char const* const stringBase_8039BAFE = "F_SP122"; -SECTION_DEAD static char const* const stringBase_8039BB06 = "F_SP123"; -SECTION_DEAD static char const* const stringBase_8039BB0E = "F_SP200"; -SECTION_DEAD static char const* const stringBase_8039BB16 = "F_SP102"; -SECTION_DEAD static char const* const stringBase_8039BB1E = ""; -SECTION_DEAD static char const* const stringBase_8039BB1F = "R_SP300"; -SECTION_DEAD static char const* const stringBase_8039BB27 = "R_SP301"; -SECTION_DEAD static char const* const stringBase_8039BB2F = "T_ENEMY"; -SECTION_DEAD static char const* const stringBase_8039BB37 = "D_MN54"; -SECTION_DEAD static char const* const stringBase_8039BB3E = "D_MN05"; -SECTION_DEAD static char const* const stringBase_8039BB45 = "D_MN05B"; -SECTION_DEAD static char const* const stringBase_8039BB4D = "D_MN05A"; -SECTION_DEAD static char const* const stringBase_8039BB55 = "D_MN04"; -SECTION_DEAD static char const* const stringBase_8039BB5C = "D_MN04B"; -SECTION_DEAD static char const* const stringBase_8039BB64 = "D_MN04A"; -SECTION_DEAD static char const* const stringBase_8039BB6C = "D_MN01"; -SECTION_DEAD static char const* const stringBase_8039BB73 = "D_MN01B"; -SECTION_DEAD static char const* const stringBase_8039BB7B = "D_MN01A"; -SECTION_DEAD static char const* const stringBase_8039BB83 = "D_MN10"; -SECTION_DEAD static char const* const stringBase_8039BB8A = "D_MN10B"; -SECTION_DEAD static char const* const stringBase_8039BB92 = "D_MN10A"; -SECTION_DEAD static char const* const stringBase_8039BB9A = "D_MN11"; -SECTION_DEAD static char const* const stringBase_8039BBA1 = "D_MN11B"; -SECTION_DEAD static char const* const stringBase_8039BBA9 = "D_MN11A"; -SECTION_DEAD static char const* const stringBase_8039BBB1 = "D_MN06"; -SECTION_DEAD static char const* const stringBase_8039BBB8 = "D_MN06B"; -SECTION_DEAD static char const* const stringBase_8039BBC0 = "D_MN06A"; -SECTION_DEAD static char const* const stringBase_8039BBC8 = "D_MN07"; -SECTION_DEAD static char const* const stringBase_8039BBCF = "D_MN07B"; -SECTION_DEAD static char const* const stringBase_8039BBD7 = "D_MN07A"; -SECTION_DEAD static char const* const stringBase_8039BBDF = "D_MN08"; -SECTION_DEAD static char const* const stringBase_8039BBE6 = "D_MN08B"; -SECTION_DEAD static char const* const stringBase_8039BBEE = "D_MN08C"; -SECTION_DEAD static char const* const stringBase_8039BBF6 = "D_MN08A"; -SECTION_DEAD static char const* const stringBase_8039BBFE = "D_MN08D"; -SECTION_DEAD static char const* const stringBase_8039BC06 = "D_MN09"; -SECTION_DEAD static char const* const stringBase_8039BC0D = "D_MN09A"; -SECTION_DEAD static char const* const stringBase_8039BC15 = "D_MN09B"; -SECTION_DEAD static char const* const stringBase_8039BC1D = "D_MN09C"; -SECTION_DEAD static char const* const stringBase_8039BC25 = "D_SB00"; -SECTION_DEAD static char const* const stringBase_8039BC2C = "D_SB01"; -SECTION_DEAD static char const* const stringBase_8039BC33 = "D_SB02"; -SECTION_DEAD static char const* const stringBase_8039BC3A = "D_SB03"; -SECTION_DEAD static char const* const stringBase_8039BC41 = "D_SB04"; -SECTION_DEAD static char const* const stringBase_8039BC48 = "D_SB05"; -SECTION_DEAD static char const* const stringBase_8039BC4F = "D_SB06"; -SECTION_DEAD static char const* const stringBase_8039BC56 = "D_SB07"; -SECTION_DEAD static char const* const stringBase_8039BC5D = "D_SB08"; -SECTION_DEAD static char const* const stringBase_8039BC64 = "D_SB09"; -SECTION_DEAD static char const* const stringBase_8039BC6B = "D_SB10"; -SECTION_DEAD static char const* const stringBase_8039BC72 = "force_start"; -SECTION_DEAD static char const* const stringBase_8039BC7E = "force_end"; -#pragma pop +/* 8039BA08-8039BA08 028068 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/libs/Z2AudioLib/Z2SoundHandles.cpp b/libs/Z2AudioLib/Z2SoundHandles.cpp index 0aa55237015..a2802834f42 100644 --- a/libs/Z2AudioLib/Z2SoundHandles.cpp +++ b/libs/Z2AudioLib/Z2SoundHandles.cpp @@ -50,7 +50,7 @@ template struct JASMemPool {}; /* JASMemPool */ struct JASMemPool__template4 { - /* 802AB200 */ void func_802AB200(); + /* 802AB200 */ void func_802AB200(void* _this); }; struct JASGenericMemPool { @@ -76,7 +76,7 @@ extern "C" void __ct__14Z2SoundHandlesFv(); extern "C" void __dt__14Z2SoundHandlesFv(); extern "C" void initHandlesPool__14Z2SoundHandlesFUc(); extern "C" void deleteHandlesPool__14Z2SoundHandlesFv(); -extern "C" void func_802AB200(); +extern "C" void func_802AB200(void* _this); extern "C" void getHandleSoundID__14Z2SoundHandlesF10JAISoundID(); extern "C" void getHandleUserData__14Z2SoundHandlesFUl(); extern "C" void getFreeHandle__14Z2SoundHandlesFv(); @@ -134,15 +134,10 @@ asm Z2SoundHandles::~Z2SoundHandles() { } #pragma pop -/* 802AB118-802AB120 2A5A58 0008+00 0/0 1/1 0/0 .text initHandlesPool__14Z2SoundHandlesFUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void Z2SoundHandles::initHandlesPool(u8 param_0) { - nofralloc -#include "asm/Z2AudioLib/Z2SoundHandles/initHandlesPool__14Z2SoundHandlesFUc.s" +/* 802AB118-802AB120 -00001 0008+00 0/0 0/0 0/0 .text initHandlesPool__14Z2SoundHandlesFUc */ +void Z2SoundHandles::initHandlesPool(u8 param_0) { + *(u8*)(((u8*)this) + 12) /* this->field_0xc */ = (u8)(param_0); } -#pragma pop /* ############################################################################################## */ /* 804341B8-804341C4 060ED8 000C+00 3/3 0/0 0/0 .bss @632 */ @@ -167,7 +162,7 @@ asm void Z2SoundHandles::deleteHandlesPool() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_802AB200() { +extern "C" asm void func_802AB200(void* _this) { nofralloc #include "asm/Z2AudioLib/Z2SoundHandles/func_802AB200.s" } diff --git a/libs/Z2AudioLib/Z2SoundInfo.cpp b/libs/Z2AudioLib/Z2SoundInfo.cpp index 39fe74f38d9..fb16d7b0f7c 100644 --- a/libs/Z2AudioLib/Z2SoundInfo.cpp +++ b/libs/Z2AudioLib/Z2SoundInfo.cpp @@ -11,15 +11,15 @@ // Types: // -struct JAISound {}; - struct JAISeq {}; -struct JAISoundID {}; +struct JAISound {}; + +struct JAIStream {}; struct JAISe {}; -struct JAIStream {}; +struct JAISoundID {}; struct Z2SoundInfo { /* 802BB00C */ void getBgmSeqResourceID(JAISoundID) const; diff --git a/libs/Z2AudioLib/Z2SoundMgr.cpp b/libs/Z2AudioLib/Z2SoundMgr.cpp index 4ecefbfebd3..14ece6938c8 100644 --- a/libs/Z2AudioLib/Z2SoundMgr.cpp +++ b/libs/Z2AudioLib/Z2SoundMgr.cpp @@ -15,12 +15,6 @@ struct Z2SpeechMgr2 { /* 802CC190 */ void speakOneWord(bool); }; -struct JAISound {}; - -struct JAISoundHandle {}; - -struct JAISoundID {}; - struct JGeometry { template struct TVec3 {}; @@ -28,6 +22,12 @@ struct JGeometry { struct TVec3__template0 {}; }; +struct JAISound {}; + +struct JAISoundID {}; + +struct JAISoundHandle {}; + struct Z2SoundMgr { /* 802A9E80 */ Z2SoundMgr(); /* 802A9EE8 */ void startSound(JAISoundID, JAISoundHandle*, JGeometry::TVec3 const*); @@ -274,6 +274,14 @@ asm Z2SoundMgr::Z2SoundMgr() { #pragma pop /* ############################################################################################## */ +/* 8039B9D0-8039B9D0 028030 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8039B9D0 = "Unknown Sound-Type id :%08x\n"; +/* @stringBase0 padding */ +SECTION_DEAD static char const* const pad_8039B9ED = "\0\0"; +#pragma pop + /* 80455840-80455844 003E40 0004+00 1/1 0/0 0/0 .sdata2 @3904 */ SECTION_SDATA2 static f32 lit_3904 = 3.0f / 10.0f; @@ -326,7 +334,7 @@ asm void Z2SoundMgr::setIIR(JAISound* param_0, s16 const* param_1) { SECTION_RODATA static u8 const cResetFilterTable[16] = { 0x7F, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8039B9C0, &cResetFilterTable); +COMPILER_STRIP_GATE(0x8039B9C0, &cResetFilterTable); /* 802AA33C-802AA430 2A4C7C 00F4+00 1/1 0/0 0/0 .text setFilterOff__10Z2SoundMgrFP8JAISound */ #pragma push @@ -449,11 +457,4 @@ asm void Z2SoundMgr::isPlayingSoundID(JAISoundID param_0) { } #pragma pop -/* 8039B9D0-8039B9F0 028030 001D+03 1/1 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_8039B9D0 = "Unknown Sound-Type id :%08x\n"; -/* @stringBase0 padding */ -SECTION_DEAD static char const* const pad_8039B9ED = "\0\0"; -#pragma pop +/* 8039B9D0-8039B9D0 028030 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/libs/Z2AudioLib/Z2SoundObjMgr.cpp b/libs/Z2AudioLib/Z2SoundObjMgr.cpp index 8248d7878e0..65f0bf27f20 100644 --- a/libs/Z2AudioLib/Z2SoundObjMgr.cpp +++ b/libs/Z2AudioLib/Z2SoundObjMgr.cpp @@ -146,7 +146,7 @@ SECTION_RODATA static u8 const lit_3380[12 + 4 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(8039C240, &lit_3380); +COMPILER_STRIP_GATE(0x8039C240, &lit_3380); /* 803CAD70-803CB170 027E90 0400+00 3/3 0/0 0/0 .data mEnemyInfo */ SECTION_DATA static u8 mEnemyInfo[1024] = { @@ -432,5 +432,5 @@ asm void __sinit_Z2SoundObjMgr_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_802C01EC = (void*)__sinit_Z2SoundObjMgr_cpp; +REGISTER_CTORS(0x802C01EC, __sinit_Z2SoundObjMgr_cpp); #pragma pop diff --git a/libs/Z2AudioLib/Z2SoundObject.cpp b/libs/Z2AudioLib/Z2SoundObject.cpp index be926d5585f..389826d66f5 100644 --- a/libs/Z2AudioLib/Z2SoundObject.cpp +++ b/libs/Z2AudioLib/Z2SoundObject.cpp @@ -19,10 +19,10 @@ struct Z2SoundStarter { /* 802AAEDC */ void setPortData(JAISoundHandle*, u32, u16, s8); }; -struct Vec {}; - struct JAISoundID {}; +struct Vec {}; + struct Z2SoundObjSimple { /* 802BE844 */ Z2SoundObjSimple(); /* 802BE880 */ void init(Vec*, u8); @@ -81,7 +81,6 @@ struct Z2SoundInfo { struct Z2SoundHandles { /* 802AB07C */ Z2SoundHandles(); /* 802AB0B4 */ ~Z2SoundHandles(); - /* 802AB118 */ void initHandlesPool(u8); /* 802AB120 */ void deleteHandlesPool(); /* 802AB254 */ void getHandleSoundID(JAISoundID); /* 802AB2A0 */ void getHandleUserData(u32); @@ -417,7 +416,7 @@ SECTION_RODATA static u8 const cNullVec__6Z2Calc[12 + 4 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(8039C230, &cNullVec__6Z2Calc); +COMPILER_STRIP_GATE(0x8039C230, &cNullVec__6Z2Calc); /* 802BE5A0-802BE5FC 2B8EE0 005C+00 1/1 0/0 0/0 .text __ct__21Z2DopplerSoundObjBaseFv */ #pragma push diff --git a/libs/Z2AudioLib/Z2SoundStarter.cpp b/libs/Z2AudioLib/Z2SoundStarter.cpp index 82e63bb6ef0..e449e19b819 100644 --- a/libs/Z2AudioLib/Z2SoundStarter.cpp +++ b/libs/Z2AudioLib/Z2SoundStarter.cpp @@ -11,10 +11,6 @@ // Types: // -struct JAISoundHandle {}; - -struct JAISoundID {}; - struct JGeometry { template struct TVec3 {}; @@ -22,6 +18,10 @@ struct JGeometry { struct TVec3__template0 {}; }; +struct JAISoundID {}; + +struct JAISoundHandle {}; + struct Z2SoundStarter { /* 802AAB94 */ Z2SoundStarter(bool); /* 802AAC3C */ void startSound(JAISoundID, JAISoundHandle*, JGeometry::TVec3 const*, u32, diff --git a/libs/Z2AudioLib/Z2SpeechMgr2.cpp b/libs/Z2AudioLib/Z2SpeechMgr2.cpp index d22fe8d8f33..575d33a1693 100644 --- a/libs/Z2AudioLib/Z2SpeechMgr2.cpp +++ b/libs/Z2AudioLib/Z2SpeechMgr2.cpp @@ -11,12 +11,6 @@ // Types: // -struct JAISoundHandle { - /* 802A2184 */ void releaseSound(); -}; - -struct JAISoundID {}; - struct JGeometry { template struct TVec3 {}; @@ -24,6 +18,12 @@ struct JGeometry { struct TVec3__template0 {}; }; +struct JAISoundID {}; + +struct JAISoundHandle { + /* 802A2184 */ void releaseSound(); +}; + struct Z2SpeechStarter { /* 802CBCEC */ ~Z2SpeechStarter(); /* 802CCFB8 */ Z2SpeechStarter(); @@ -102,12 +102,6 @@ struct Z2AudioMgr { static u8 mAudioMgrPtr[4 + 4 /* padding */]; }; -struct JMath { - struct TRandom_fast_ { - /* 80339AE4 */ TRandom_fast_(u32); - }; -}; - struct JAISoundStarter { /* 802A2F88 */ ~JAISoundStarter(); }; @@ -596,7 +590,7 @@ SECTION_RODATA u8 const Z2MdnPrm::sReply[100] = { 0x5D, 0x60, 0x63, 0x63, 0x54, 0x3E, 0x38, 0x38, 0x39, 0x35, 0x41, 0x41, 0x41, 0x41, 0x56, 0x71, 0x85, 0x85, 0xA2, 0xA2, 0x52, 0x52, 0x5C, 0x5C, 0x75, }; -COMPILER_STRIP_GATE(8039C260, &Z2MdnPrm::sReply); +COMPILER_STRIP_GATE(0x8039C260, &Z2MdnPrm::sReply); /* 8039C2C4-8039C2D0 028924 000A+02 1/0 0/0 0/0 .rodata sReplyTail__8Z2MdnPrm */ SECTION_RODATA u8 const Z2MdnPrm::sReplyTail[10 + 2 /* padding */] = { @@ -614,7 +608,7 @@ SECTION_RODATA u8 const Z2MdnPrm::sReplyTail[10 + 2 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(8039C2C4, &Z2MdnPrm::sReplyTail); +COMPILER_STRIP_GATE(0x8039C2C4, &Z2MdnPrm::sReplyTail); /* 8039C2D0-8039C334 028930 0064+00 1/0 0/0 0/0 .rodata sJoke__8Z2MdnPrm */ SECTION_RODATA u8 const Z2MdnPrm::sJoke[100] = { @@ -626,7 +620,7 @@ SECTION_RODATA u8 const Z2MdnPrm::sJoke[100] = { 0x64, 0x60, 0xB1, 0x6C, 0x6D, 0x6D, 0x7E, 0x7A, 0x97, 0x97, 0x99, 0xA5, 0x89, 0x90, 0xA4, 0x45, 0x45, 0x29, 0x4C, 0x4B, 0x64, 0x64, 0x60, 0x5C, 0xB1, }; -COMPILER_STRIP_GATE(8039C2D0, &Z2MdnPrm::sJoke); +COMPILER_STRIP_GATE(0x8039C2D0, &Z2MdnPrm::sJoke); /* 8039C334-8039C340 028994 000A+02 1/0 0/0 0/0 .rodata sJokeTail__8Z2MdnPrm */ SECTION_RODATA u8 const Z2MdnPrm::sJokeTail[10 + 2 /* padding */] = { @@ -644,7 +638,7 @@ SECTION_RODATA u8 const Z2MdnPrm::sJokeTail[10 + 2 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(8039C334, &Z2MdnPrm::sJokeTail); +COMPILER_STRIP_GATE(0x8039C334, &Z2MdnPrm::sJokeTail); /* 8039C340-8039C3A4 0289A0 0064+00 1/0 0/0 0/0 .rodata sSexy__8Z2MdnPrm */ SECTION_RODATA u8 const Z2MdnPrm::sSexy[100] = { @@ -656,7 +650,7 @@ SECTION_RODATA u8 const Z2MdnPrm::sSexy[100] = { 0x76, 0x79, 0x79, 0x5C, 0x6A, 0x90, 0xAB, 0x5C, 0x7D, 0x52, 0x49, 0x54, 0x57, 0x49, 0x55, 0x79, 0x65, 0x65, 0x4A, 0x5C, 0x78, 0x78, 0x8B, 0x8D, 0x7C, }; -COMPILER_STRIP_GATE(8039C340, &Z2MdnPrm::sSexy); +COMPILER_STRIP_GATE(0x8039C340, &Z2MdnPrm::sSexy); /* 8039C3A4-8039C3B0 028A04 000A+02 1/0 0/0 0/0 .rodata sSexyTail__8Z2MdnPrm */ SECTION_RODATA u8 const Z2MdnPrm::sSexyTail[10 + 2 /* padding */] = { @@ -674,7 +668,7 @@ SECTION_RODATA u8 const Z2MdnPrm::sSexyTail[10 + 2 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(8039C3A4, &Z2MdnPrm::sSexyTail); +COMPILER_STRIP_GATE(0x8039C3A4, &Z2MdnPrm::sSexyTail); /* 8039C3B0-8039C414 028A10 0064+00 1/0 0/0 0/0 .rodata sRidicule__8Z2MdnPrm */ SECTION_RODATA u8 const Z2MdnPrm::sRidicule[100] = { @@ -686,7 +680,7 @@ SECTION_RODATA u8 const Z2MdnPrm::sRidicule[100] = { 0x79, 0x79, 0x7C, 0x7C, 0x6C, 0x6C, 0x73, 0x73, 0x6E, 0x6E, 0x36, 0x3F, 0x3C, 0x56, 0x2D, 0x2D, 0x2D, 0x2D, 0x8C, 0x8C, 0x8B, 0x8B, 0x93, 0x93, 0x6E, }; -COMPILER_STRIP_GATE(8039C3B0, &Z2MdnPrm::sRidicule); +COMPILER_STRIP_GATE(0x8039C3B0, &Z2MdnPrm::sRidicule); /* 8039C414-8039C420 028A74 000A+02 1/0 0/0 0/0 .rodata sRidiculeTail__8Z2MdnPrm */ SECTION_RODATA u8 const Z2MdnPrm::sRidiculeTail[10 + 2 /* padding */] = { @@ -704,7 +698,7 @@ SECTION_RODATA u8 const Z2MdnPrm::sRidiculeTail[10 + 2 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(8039C414, &Z2MdnPrm::sRidiculeTail); +COMPILER_STRIP_GATE(0x8039C414, &Z2MdnPrm::sRidiculeTail); /* 8039C420-8039C48C 028A80 006C+00 1/0 0/0 0/0 .rodata sBoring__8Z2MdnPrm */ SECTION_RODATA u8 const Z2MdnPrm::sBoring[108] = { @@ -716,7 +710,7 @@ SECTION_RODATA u8 const Z2MdnPrm::sBoring[108] = { 0x89, 0x5A, 0x5A, 0x63, 0x66, 0x5E, 0x5E, 0x71, 0x62, 0x55, 0x55, 0x85, 0x85, 0x5B, 0x5B, 0x5B, 0x5B, 0x5E, 0x70, 0x56, 0x56, 0x4C, 0x4C, 0x59, 0x59, 0x5B, 0x5B, 0x71, }; -COMPILER_STRIP_GATE(8039C420, &Z2MdnPrm::sBoring); +COMPILER_STRIP_GATE(0x8039C420, &Z2MdnPrm::sBoring); /* 8039C48C-8039C4EC 028AEC 005E+02 1/0 0/0 0/0 .rodata sIrritated__8Z2MdnPrm */ SECTION_RODATA u8 const Z2MdnPrm::sIrritated[94 + 2 /* padding */] = { @@ -818,7 +812,7 @@ SECTION_RODATA u8 const Z2MdnPrm::sIrritated[94 + 2 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(8039C48C, &Z2MdnPrm::sIrritated); +COMPILER_STRIP_GATE(0x8039C48C, &Z2MdnPrm::sIrritated); /* 8039C4EC-8039C4F8 028B4C 000A+02 1/0 0/0 0/0 .rodata sIrritatedTail__8Z2MdnPrm */ SECTION_RODATA u8 const Z2MdnPrm::sIrritatedTail[10 + 2 /* padding */] = { @@ -836,7 +830,7 @@ SECTION_RODATA u8 const Z2MdnPrm::sIrritatedTail[10 + 2 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(8039C4EC, &Z2MdnPrm::sIrritatedTail); +COMPILER_STRIP_GATE(0x8039C4EC, &Z2MdnPrm::sIrritatedTail); /* 8039C4F8-8039C56C 028B58 0072+02 1/0 0/0 0/0 .rodata sOrder__8Z2MdnPrm */ SECTION_RODATA u8 const Z2MdnPrm::sOrder[114 + 2 /* padding */] = { @@ -958,7 +952,7 @@ SECTION_RODATA u8 const Z2MdnPrm::sOrder[114 + 2 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(8039C4F8, &Z2MdnPrm::sOrder); +COMPILER_STRIP_GATE(0x8039C4F8, &Z2MdnPrm::sOrder); /* 8039C56C-8039C5D8 028BCC 006A+02 1/0 0/0 0/0 .rodata sResent__8Z2MdnPrm */ SECTION_RODATA u8 const Z2MdnPrm::sResent[106 + 2 /* padding */] = { @@ -1072,7 +1066,7 @@ SECTION_RODATA u8 const Z2MdnPrm::sResent[106 + 2 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(8039C56C, &Z2MdnPrm::sResent); +COMPILER_STRIP_GATE(0x8039C56C, &Z2MdnPrm::sResent); /* 8039C5D8-8039C644 028C38 006A+02 1/0 0/0 0/0 .rodata sCheerful__8Z2MdnPrm */ SECTION_RODATA u8 const Z2MdnPrm::sCheerful[106 + 2 /* padding */] = { @@ -1186,7 +1180,7 @@ SECTION_RODATA u8 const Z2MdnPrm::sCheerful[106 + 2 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(8039C5D8, &Z2MdnPrm::sCheerful); +COMPILER_STRIP_GATE(0x8039C5D8, &Z2MdnPrm::sCheerful); /* 8039C644-8039C6B0 028CA4 006A+02 1/0 0/0 0/0 .rodata sConfused__8Z2MdnPrm */ SECTION_RODATA u8 const Z2MdnPrm::sConfused[106 + 2 /* padding */] = { @@ -1300,7 +1294,7 @@ SECTION_RODATA u8 const Z2MdnPrm::sConfused[106 + 2 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(8039C644, &Z2MdnPrm::sConfused); +COMPILER_STRIP_GATE(0x8039C644, &Z2MdnPrm::sConfused); /* 8039C6B0-8039C718 028D10 0068+00 1/0 0/0 0/0 .rodata sHostility__8Z2MdnPrm */ SECTION_RODATA u8 const Z2MdnPrm::sHostility[104] = { @@ -1312,7 +1306,7 @@ SECTION_RODATA u8 const Z2MdnPrm::sHostility[104] = { 0x65, 0x6B, 0x6E, 0x6E, 0x83, 0x83, 0x96, 0x3F, 0x56, 0x56, 0x56, 0x56, 0x4F, 0x5F, 0x57, 0x62, 0x6A, 0x5F, 0x72, 0x72, 0x62, 0x62, 0x65, 0x5E, 0x69, 0x69, 0x63, 0x63, 0x7F, }; -COMPILER_STRIP_GATE(8039C6B0, &Z2MdnPrm::sHostility); +COMPILER_STRIP_GATE(0x8039C6B0, &Z2MdnPrm::sHostility); /* 8039C718-8039C784 028D78 006A+02 1/0 0/0 0/0 .rodata sTired__8Z2MdnPrm */ SECTION_RODATA u8 const Z2MdnPrm::sTired[106 + 2 /* padding */] = { @@ -1426,7 +1420,7 @@ SECTION_RODATA u8 const Z2MdnPrm::sTired[106 + 2 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(8039C718, &Z2MdnPrm::sTired); +COMPILER_STRIP_GATE(0x8039C718, &Z2MdnPrm::sTired); /* 8039C784-8039C7F0 028DE4 006A+02 1/0 0/0 0/0 .rodata sSerious__8Z2MdnPrm */ SECTION_RODATA u8 const Z2MdnPrm::sSerious[106 + 2 /* padding */] = { @@ -1540,7 +1534,7 @@ SECTION_RODATA u8 const Z2MdnPrm::sSerious[106 + 2 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(8039C784, &Z2MdnPrm::sSerious); +COMPILER_STRIP_GATE(0x8039C784, &Z2MdnPrm::sSerious); /* 8039C7F0-8039C844 028E50 0054+00 1/0 0/0 0/0 .rodata sReplyb__8Z2MdnPrm */ SECTION_RODATA u8 const Z2MdnPrm::sReplyb[84] = { @@ -1551,7 +1545,7 @@ SECTION_RODATA u8 const Z2MdnPrm::sReplyb[84] = { 0x72, 0x8A, 0x2C, 0x1F, 0x1F, 0x95, 0x95, 0x69, 0x4C, 0x59, 0x59, 0x79, 0x5B, 0x44, 0x44, 0x4F, 0x52, 0x58, 0x5A, 0x6F, 0x6E, 0x8A, 0x8E, 0x8E, 0x8E, 0x8C, 0x8C, 0x9B, }; -COMPILER_STRIP_GATE(8039C7F0, &Z2MdnPrm::sReplyb); +COMPILER_STRIP_GATE(0x8039C7F0, &Z2MdnPrm::sReplyb); /* 8039C844-8039C8A8 028EA4 0064+00 1/0 0/0 0/0 .rodata sApologize__8Z2MdnPrm */ SECTION_RODATA u8 const Z2MdnPrm::sApologize[100] = { @@ -1563,7 +1557,7 @@ SECTION_RODATA u8 const Z2MdnPrm::sApologize[100] = { 0x5B, 0x70, 0x72, 0x72, 0x72, 0x72, 0x6E, 0x76, 0x6B, 0x6B, 0x58, 0x69, 0x66, 0x66, 0x64, 0x64, 0x60, 0x61, 0x63, 0x6A, 0x62, 0x62, 0x64, 0x65, 0x71, }; -COMPILER_STRIP_GATE(8039C844, &Z2MdnPrm::sApologize); +COMPILER_STRIP_GATE(0x8039C844, &Z2MdnPrm::sApologize); /* 8039C8A8-8039C8B4 028F08 0009+03 1/0 0/0 0/0 .rodata sApologizeTail__8Z2MdnPrm */ SECTION_RODATA u8 const Z2MdnPrm::sApologizeTail[9 + 3 /* padding */] = { @@ -1581,7 +1575,7 @@ SECTION_RODATA u8 const Z2MdnPrm::sApologizeTail[9 + 3 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(8039C8A8, &Z2MdnPrm::sApologizeTail); +COMPILER_STRIP_GATE(0x8039C8A8, &Z2MdnPrm::sApologizeTail); /* 8039C8B4-8039C918 028F14 0064+00 1/0 0/0 0/0 .rodata sDeside__8Z2MdnPrm */ SECTION_RODATA u8 const Z2MdnPrm::sDeside[100] = { @@ -1593,7 +1587,7 @@ SECTION_RODATA u8 const Z2MdnPrm::sDeside[100] = { 0x62, 0x5D, 0x67, 0x5D, 0x5F, 0x62, 0x59, 0x5D, 0x55, 0x55, 0x48, 0x5F, 0x5F, 0x5F, 0x5D, 0x75, 0x6A, 0x66, 0x76, 0x69, 0x69, 0x69, 0x60, 0x60, 0x5F, }; -COMPILER_STRIP_GATE(8039C8B4, &Z2MdnPrm::sDeside); +COMPILER_STRIP_GATE(0x8039C8B4, &Z2MdnPrm::sDeside); /* 8039C918-8039C980 028F78 0068+00 1/0 0/0 0/0 .rodata sAfford__8Z2MdnPrm */ SECTION_RODATA u8 const Z2MdnPrm::sAfford[104] = { @@ -1605,13 +1599,13 @@ SECTION_RODATA u8 const Z2MdnPrm::sAfford[104] = { 0x7D, 0x6E, 0x56, 0x79, 0x79, 0x50, 0x4C, 0x50, 0x43, 0x52, 0x51, 0x66, 0x6C, 0x64, 0x63, 0x63, 0x5D, 0x69, 0x70, 0x56, 0x50, 0x4B, 0x92, 0x86, 0x8F, 0x4B, 0x4F, 0x57, 0x56, }; -COMPILER_STRIP_GATE(8039C918, &Z2MdnPrm::sAfford); +COMPILER_STRIP_GATE(0x8039C918, &Z2MdnPrm::sAfford); /* 8039C980-8039C98C 028FE0 000C+00 1/0 0/0 0/0 .rodata sAffordTail__8Z2MdnPrm */ SECTION_RODATA u8 const Z2MdnPrm::sAffordTail[12] = { 0x63, 0x8E, 0x5B, 0x59, 0x4C, 0x3A, 0x69, 0x47, 0x41, 0x59, 0x50, 0x55, }; -COMPILER_STRIP_GATE(8039C980, &Z2MdnPrm::sAffordTail); +COMPILER_STRIP_GATE(0x8039C980, &Z2MdnPrm::sAffordTail); /* 8039C98C-8039CA58 -00001 00CC+00 2/2 0/0 0/0 .rodata sPrm__8Z2MdnPrm */ SECTION_RODATA void* const Z2MdnPrm::sPrm[51] = { @@ -1633,7 +1627,7 @@ SECTION_RODATA void* const Z2MdnPrm::sPrm[51] = { (void*)&Z2MdnPrm::sDeside, (void*)&Z2MdnPrm::sDesideTail, (void*)0x32010700, (void*)&Z2MdnPrm::sAfford, (void*)&Z2MdnPrm::sAffordTail, (void*)0x34020A00, }; -COMPILER_STRIP_GATE(8039C98C, &Z2MdnPrm::sPrm); +COMPILER_STRIP_GATE(0x8039C98C, &Z2MdnPrm::sPrm); /* 80455F48-80455F50 004548 0008+00 3/3 0/0 0/0 .sdata2 @4083 */ SECTION_SDATA2 static f64 lit_4083 = 4503599627370496.0 /* cast u32 to float */; diff --git a/libs/Z2AudioLib/Z2StatusMgr.cpp b/libs/Z2AudioLib/Z2StatusMgr.cpp index 9594f2d92a5..c76705d3536 100644 --- a/libs/Z2AudioLib/Z2StatusMgr.cpp +++ b/libs/Z2AudioLib/Z2StatusMgr.cpp @@ -239,135 +239,9 @@ asm void Z2StatusMgr::isMovieDemo() { #pragma pop /* ############################################################################################## */ -/* 803CA508-803CA5C0 -00001 00B8+00 1/1 0/0 0/0 .data @3732 */ -SECTION_DATA static void* lit_3732[46] = { - (void*)(((char*)setDemoName__11Z2StatusMgrFPc) + 0x438), - (void*)(((char*)setDemoName__11Z2StatusMgrFPc) + 0x3F8), - (void*)(((char*)setDemoName__11Z2StatusMgrFPc) + 0x4E8), - (void*)(((char*)setDemoName__11Z2StatusMgrFPc) + 0x4E8), - (void*)(((char*)setDemoName__11Z2StatusMgrFPc) + 0x4E8), - (void*)(((char*)setDemoName__11Z2StatusMgrFPc) + 0x4E8), - (void*)(((char*)setDemoName__11Z2StatusMgrFPc) + 0x4E8), - (void*)(((char*)setDemoName__11Z2StatusMgrFPc) + 0x4E8), - (void*)(((char*)setDemoName__11Z2StatusMgrFPc) + 0x4E8), - (void*)(((char*)setDemoName__11Z2StatusMgrFPc) + 0x4E8), - (void*)(((char*)setDemoName__11Z2StatusMgrFPc) + 0x3C0), - (void*)(((char*)setDemoName__11Z2StatusMgrFPc) + 0x4E8), - (void*)(((char*)setDemoName__11Z2StatusMgrFPc) + 0x4E8), - (void*)(((char*)setDemoName__11Z2StatusMgrFPc) + 0x4E8), - (void*)(((char*)setDemoName__11Z2StatusMgrFPc) + 0x4E8), - (void*)(((char*)setDemoName__11Z2StatusMgrFPc) + 0x4E8), - (void*)(((char*)setDemoName__11Z2StatusMgrFPc) + 0x4E8), - (void*)(((char*)setDemoName__11Z2StatusMgrFPc) + 0x4E8), - (void*)(((char*)setDemoName__11Z2StatusMgrFPc) + 0x4E8), - (void*)(((char*)setDemoName__11Z2StatusMgrFPc) + 0x4E8), - (void*)(((char*)setDemoName__11Z2StatusMgrFPc) + 0x4E8), - (void*)(((char*)setDemoName__11Z2StatusMgrFPc) + 0x4E8), - (void*)(((char*)setDemoName__11Z2StatusMgrFPc) + 0x4E8), - (void*)(((char*)setDemoName__11Z2StatusMgrFPc) + 0x4E8), - (void*)(((char*)setDemoName__11Z2StatusMgrFPc) + 0x4E8), - (void*)(((char*)setDemoName__11Z2StatusMgrFPc) + 0x4E8), - (void*)(((char*)setDemoName__11Z2StatusMgrFPc) + 0x4E8), - (void*)(((char*)setDemoName__11Z2StatusMgrFPc) + 0x4E8), - (void*)(((char*)setDemoName__11Z2StatusMgrFPc) + 0x4E8), - (void*)(((char*)setDemoName__11Z2StatusMgrFPc) + 0x4E8), - (void*)(((char*)setDemoName__11Z2StatusMgrFPc) + 0x4E8), - (void*)(((char*)setDemoName__11Z2StatusMgrFPc) + 0x4E8), - (void*)(((char*)setDemoName__11Z2StatusMgrFPc) + 0x4E8), - (void*)(((char*)setDemoName__11Z2StatusMgrFPc) + 0x4E8), - (void*)(((char*)setDemoName__11Z2StatusMgrFPc) + 0x4E8), - (void*)(((char*)setDemoName__11Z2StatusMgrFPc) + 0x4E8), - (void*)(((char*)setDemoName__11Z2StatusMgrFPc) + 0x45C), - (void*)(((char*)setDemoName__11Z2StatusMgrFPc) + 0x4E8), - (void*)(((char*)setDemoName__11Z2StatusMgrFPc) + 0x4E8), - (void*)(((char*)setDemoName__11Z2StatusMgrFPc) + 0x480), - (void*)(((char*)setDemoName__11Z2StatusMgrFPc) + 0x4E8), - (void*)(((char*)setDemoName__11Z2StatusMgrFPc) + 0x4E8), - (void*)(((char*)setDemoName__11Z2StatusMgrFPc) + 0x4A4), - (void*)(((char*)setDemoName__11Z2StatusMgrFPc) + 0x4E8), - (void*)(((char*)setDemoName__11Z2StatusMgrFPc) + 0x4E8), - (void*)(((char*)setDemoName__11Z2StatusMgrFPc) + 0x4C8), -}; - -/* 80455A28-80455A30 004028 0008+00 1/1 0/0 0/0 .sdata2 @3731 */ -SECTION_SDATA2 static f64 lit_3731 = 4503599627370496.0 /* cast u32 to float */; - -/* 802B61E8-802B671C 2B0B28 0534+00 1/0 7/7 11/11 .text setDemoName__11Z2StatusMgrFPc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void Z2StatusMgr::setDemoName(char* param_0) { - nofralloc -#include "asm/Z2AudioLib/Z2StatusMgr/setDemoName__11Z2StatusMgrFPc.s" -} -#pragma pop - -/* 802B671C-802B6734 2B105C 0018+00 0/0 1/1 0/0 .text processTime__11Z2StatusMgrFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void Z2StatusMgr::processTime() { - nofralloc -#include "asm/Z2AudioLib/Z2StatusMgr/processTime__11Z2StatusMgrFv.s" -} -#pragma pop - -/* 802B6734-802B6758 2B1074 0024+00 0/0 5/5 0/0 .text checkDayTime__11Z2StatusMgrFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void Z2StatusMgr::checkDayTime() { - nofralloc -#include "asm/Z2AudioLib/Z2StatusMgr/checkDayTime__11Z2StatusMgrFv.s" -} -#pragma pop - -/* 802B6758-802B6760 2B1098 0008+00 0/0 1/1 0/0 .text setEventBit__11Z2StatusMgrFPv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void Z2StatusMgr::setEventBit(void* param_0) { - nofralloc -#include "asm/Z2AudioLib/Z2StatusMgr/setEventBit__11Z2StatusMgrFPv.s" -} -#pragma pop - -/* 802B6760-802B6784 2B10A0 0024+00 0/0 1/1 0/0 .text setCameraPolygonPos__11Z2StatusMgrFP3Vec */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void Z2StatusMgr::setCameraPolygonPos(Vec* param_0) { - nofralloc -#include "asm/Z2AudioLib/Z2StatusMgr/setCameraPolygonPos__11Z2StatusMgrFP3Vec.s" -} -#pragma pop - -/* 802B6784-802B6788 2B10C4 0004+00 0/0 1/1 0/0 .text setCameraGroupInfo__11Z2StatusMgrFUc */ -void Z2StatusMgr::setCameraGroupInfo(u8 param_0) { - /* empty function */ -} - -/* ############################################################################################## */ -/* 80455A30-80455A34 004030 0004+00 1/1 0/0 0/0 .sdata2 @3798 */ -SECTION_SDATA2 static f32 lit_3798 = 2000.0f; - -/* 80455A34-80455A38 004034 0004+00 1/1 0/0 0/0 .sdata2 @3799 */ -SECTION_SDATA2 static f32 lit_3799 = 1.0f / 5.0f; - -/* 802B6788-802B6840 2B10C8 00B8+00 0/0 2/2 0/0 .text setCameraInWaterDepth__11Z2StatusMgrFf */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void Z2StatusMgr::setCameraInWaterDepth(f32 param_0) { - nofralloc -#include "asm/Z2AudioLib/Z2StatusMgr/setCameraInWaterDepth__11Z2StatusMgrFf.s" -} -#pragma pop - -/* 8039BC88-8039BFA8 0282E8 0319+07 1/1 0/0 0/0 .rodata @stringBase0 */ +/* 8039BC88-8039BC88 0282E8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ #pragma push #pragma force_active on -#pragma section ".dead" SECTION_DEAD static char const* const stringBase_8039BC88 = "F_SP00"; SECTION_DEAD static char const* const stringBase_8039BC8F = "F_SP103"; SECTION_DEAD static char const* const stringBase_8039BC97 = "R_SP01"; @@ -470,3 +344,125 @@ SECTION_DEAD static char const* const stringBase_8039BF98 = "LV3R00OP"; /* @stringBase0 padding */ SECTION_DEAD static char const* const pad_8039BFA1 = "\0\0\0\0\0\0"; #pragma pop + +/* 803CA508-803CA5C0 -00001 00B8+00 1/1 0/0 0/0 .data @3732 */ +SECTION_DATA static void* lit_3732[46] = { + (void*)(((char*)setDemoName__11Z2StatusMgrFPc) + 0x438), + (void*)(((char*)setDemoName__11Z2StatusMgrFPc) + 0x3F8), + (void*)(((char*)setDemoName__11Z2StatusMgrFPc) + 0x4E8), + (void*)(((char*)setDemoName__11Z2StatusMgrFPc) + 0x4E8), + (void*)(((char*)setDemoName__11Z2StatusMgrFPc) + 0x4E8), + (void*)(((char*)setDemoName__11Z2StatusMgrFPc) + 0x4E8), + (void*)(((char*)setDemoName__11Z2StatusMgrFPc) + 0x4E8), + (void*)(((char*)setDemoName__11Z2StatusMgrFPc) + 0x4E8), + (void*)(((char*)setDemoName__11Z2StatusMgrFPc) + 0x4E8), + (void*)(((char*)setDemoName__11Z2StatusMgrFPc) + 0x4E8), + (void*)(((char*)setDemoName__11Z2StatusMgrFPc) + 0x3C0), + (void*)(((char*)setDemoName__11Z2StatusMgrFPc) + 0x4E8), + (void*)(((char*)setDemoName__11Z2StatusMgrFPc) + 0x4E8), + (void*)(((char*)setDemoName__11Z2StatusMgrFPc) + 0x4E8), + (void*)(((char*)setDemoName__11Z2StatusMgrFPc) + 0x4E8), + (void*)(((char*)setDemoName__11Z2StatusMgrFPc) + 0x4E8), + (void*)(((char*)setDemoName__11Z2StatusMgrFPc) + 0x4E8), + (void*)(((char*)setDemoName__11Z2StatusMgrFPc) + 0x4E8), + (void*)(((char*)setDemoName__11Z2StatusMgrFPc) + 0x4E8), + (void*)(((char*)setDemoName__11Z2StatusMgrFPc) + 0x4E8), + (void*)(((char*)setDemoName__11Z2StatusMgrFPc) + 0x4E8), + (void*)(((char*)setDemoName__11Z2StatusMgrFPc) + 0x4E8), + (void*)(((char*)setDemoName__11Z2StatusMgrFPc) + 0x4E8), + (void*)(((char*)setDemoName__11Z2StatusMgrFPc) + 0x4E8), + (void*)(((char*)setDemoName__11Z2StatusMgrFPc) + 0x4E8), + (void*)(((char*)setDemoName__11Z2StatusMgrFPc) + 0x4E8), + (void*)(((char*)setDemoName__11Z2StatusMgrFPc) + 0x4E8), + (void*)(((char*)setDemoName__11Z2StatusMgrFPc) + 0x4E8), + (void*)(((char*)setDemoName__11Z2StatusMgrFPc) + 0x4E8), + (void*)(((char*)setDemoName__11Z2StatusMgrFPc) + 0x4E8), + (void*)(((char*)setDemoName__11Z2StatusMgrFPc) + 0x4E8), + (void*)(((char*)setDemoName__11Z2StatusMgrFPc) + 0x4E8), + (void*)(((char*)setDemoName__11Z2StatusMgrFPc) + 0x4E8), + (void*)(((char*)setDemoName__11Z2StatusMgrFPc) + 0x4E8), + (void*)(((char*)setDemoName__11Z2StatusMgrFPc) + 0x4E8), + (void*)(((char*)setDemoName__11Z2StatusMgrFPc) + 0x4E8), + (void*)(((char*)setDemoName__11Z2StatusMgrFPc) + 0x45C), + (void*)(((char*)setDemoName__11Z2StatusMgrFPc) + 0x4E8), + (void*)(((char*)setDemoName__11Z2StatusMgrFPc) + 0x4E8), + (void*)(((char*)setDemoName__11Z2StatusMgrFPc) + 0x480), + (void*)(((char*)setDemoName__11Z2StatusMgrFPc) + 0x4E8), + (void*)(((char*)setDemoName__11Z2StatusMgrFPc) + 0x4E8), + (void*)(((char*)setDemoName__11Z2StatusMgrFPc) + 0x4A4), + (void*)(((char*)setDemoName__11Z2StatusMgrFPc) + 0x4E8), + (void*)(((char*)setDemoName__11Z2StatusMgrFPc) + 0x4E8), + (void*)(((char*)setDemoName__11Z2StatusMgrFPc) + 0x4C8), +}; + +/* 80455A28-80455A30 004028 0008+00 1/1 0/0 0/0 .sdata2 @3731 */ +SECTION_SDATA2 static f64 lit_3731 = 4503599627370496.0 /* cast u32 to float */; + +/* 802B61E8-802B671C 2B0B28 0534+00 1/0 7/7 11/11 .text setDemoName__11Z2StatusMgrFPc */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void Z2StatusMgr::setDemoName(char* param_0) { + nofralloc +#include "asm/Z2AudioLib/Z2StatusMgr/setDemoName__11Z2StatusMgrFPc.s" +} +#pragma pop + +/* 802B671C-802B6734 2B105C 0018+00 0/0 1/1 0/0 .text processTime__11Z2StatusMgrFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void Z2StatusMgr::processTime() { + nofralloc +#include "asm/Z2AudioLib/Z2StatusMgr/processTime__11Z2StatusMgrFv.s" +} +#pragma pop + +/* 802B6734-802B6758 2B1074 0024+00 0/0 5/5 0/0 .text checkDayTime__11Z2StatusMgrFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void Z2StatusMgr::checkDayTime() { + nofralloc +#include "asm/Z2AudioLib/Z2StatusMgr/checkDayTime__11Z2StatusMgrFv.s" +} +#pragma pop + +/* 802B6758-802B6760 -00001 0008+00 0/0 0/0 0/0 .text setEventBit__11Z2StatusMgrFPv */ +void Z2StatusMgr::setEventBit(void* param_0) { + *(u32*)(((u8*)this) + 8) /* this->field_0x8 */ = (u32)(param_0); +} + +/* 802B6760-802B6784 2B10A0 0024+00 0/0 1/1 0/0 .text setCameraPolygonPos__11Z2StatusMgrFP3Vec */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void Z2StatusMgr::setCameraPolygonPos(Vec* param_0) { + nofralloc +#include "asm/Z2AudioLib/Z2StatusMgr/setCameraPolygonPos__11Z2StatusMgrFP3Vec.s" +} +#pragma pop + +/* 802B6784-802B6788 2B10C4 0004+00 0/0 1/1 0/0 .text setCameraGroupInfo__11Z2StatusMgrFUc */ +void Z2StatusMgr::setCameraGroupInfo(u8 param_0) { + /* empty function */ +} + +/* ############################################################################################## */ +/* 80455A30-80455A34 004030 0004+00 1/1 0/0 0/0 .sdata2 @3798 */ +SECTION_SDATA2 static f32 lit_3798 = 2000.0f; + +/* 80455A34-80455A38 004034 0004+00 1/1 0/0 0/0 .sdata2 @3799 */ +SECTION_SDATA2 static f32 lit_3799 = 1.0f / 5.0f; + +/* 802B6788-802B6840 2B10C8 00B8+00 0/0 2/2 0/0 .text setCameraInWaterDepth__11Z2StatusMgrFf */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void Z2StatusMgr::setCameraInWaterDepth(f32 param_0) { + nofralloc +#include "asm/Z2AudioLib/Z2StatusMgr/setCameraInWaterDepth__11Z2StatusMgrFf.s" +} +#pragma pop + +/* 8039BC88-8039BC88 0282E8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/libs/Z2AudioLib/Z2WolfHowlMgr.cpp b/libs/Z2AudioLib/Z2WolfHowlMgr.cpp index 2be8f8d2702..c905513407f 100644 --- a/libs/Z2AudioLib/Z2WolfHowlMgr.cpp +++ b/libs/Z2AudioLib/Z2WolfHowlMgr.cpp @@ -11,10 +11,10 @@ // Types: // -struct Vec {}; - struct Z2WolfHowlData {}; +struct Vec {}; + struct Z2WolfHowlMgr { /* 802CAAC0 */ Z2WolfHowlMgr(); /* 802CAB8C */ void resetState(); @@ -230,17 +230,17 @@ SECTION_SDATA static f32 cPitchCenter = 1.0f; /* 80450888-8045088C 000308 0004+00 2/2 0/0 0/0 .sdata cPitchUp */ SECTION_SDATA static f32 cPitchUp = 1.1892000436782837f; -/* 8045088C-80450890 -00001 0004+00 4/4 0/0 0/0 .sdata None */ -SECTION_SDATA static u8 struct_8045088C[4] = { +/* 8045088C-8045088E -00001 0002+00 1/1 0/0 0/0 .sdata None */ +SECTION_SDATA static u8 struct_8045088C[2] = { /* 8045088C 0001+00 data_8045088C None */ 0x07, /* 8045088D 0001+00 data_8045088D None */ 0x07, - /* 8045088E 0002+00 data_8045088E None */ - 0x1E, - 0x00, }; +/* 8045088E-80450890 00030E 0002+00 4/4 0/0 0/0 .sdata None */ +SECTION_SDATA static u16 data_8045088E = 0x1E00; + /* 80450890-80450894 000310 0004+00 1/1 0/0 0/0 .sdata cR_FlatWidth */ SECTION_SDATA static f32 cR_FlatWidth = 0.9438700079917908f; @@ -539,5 +539,5 @@ asm void __sinit_Z2WolfHowlMgr_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_802CBB7C = (void*)__sinit_Z2WolfHowlMgr_cpp; +REGISTER_CTORS(0x802CBB7C, __sinit_Z2WolfHowlMgr_cpp); #pragma pop diff --git a/libs/dolphin/ar/ar.cpp b/libs/dolphin/ar/ar.cpp index 675446a76fa..a2025ad6abd 100644 --- a/libs/dolphin/ar/ar.cpp +++ b/libs/dolphin/ar/ar.cpp @@ -16,7 +16,7 @@ extern "C" void ARGetDMAStatus(); extern "C" void ARStartDMA(); extern "C" void ARAlloc(); extern "C" void ARInit(); -extern "C" void ARGetSize(); +extern "C" u32 ARGetSize(); extern "C" void __ARHandler(); extern "C" void __ARClearInterrupt(); extern "C" void __ARGetInterruptStatus(); @@ -77,7 +77,7 @@ asm void ARStartDMA() { #pragma pop /* ############################################################################################## */ -/* 804518BC-804518C0 000DBC 0004+00 2/2 0/0 0/0 .sbss __AR_Size */ +/* 804518BC-804518C0 000DBC 0004+00 2/1 0/0 0/0 .sbss __AR_Size */ static u8 __AR_Size[4]; /* 804518C0-804518C4 000DC0 0004+00 1/1 0/0 0/0 .sbss __AR_InternalSize */ @@ -203,15 +203,10 @@ asm void ARInit() { } #pragma pop -/* 803507F0-803507F8 34B130 0008+00 0/0 1/1 0/0 .text ARGetSize */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void ARGetSize() { - nofralloc -#include "asm/dolphin/ar/ar/ARGetSize.s" +/* 803507F0-803507F8 -00001 0008+00 0/0 0/0 0/0 .text ARGetSize */ +u32 ARGetSize() { + return *(u32*)(&__AR_Size); } -#pragma pop /* 803507F8-80350870 34B138 0078+00 1/1 0/0 0/0 .text __ARHandler */ #pragma push diff --git a/libs/dolphin/base/PPCArch.cpp b/libs/dolphin/base/PPCArch.cpp index 3b393dcc4af..379badcf1f8 100644 --- a/libs/dolphin/base/PPCArch.cpp +++ b/libs/dolphin/base/PPCArch.cpp @@ -14,7 +14,7 @@ extern "C" void PPCMfmsr(); extern "C" void PPCMtmsr(); extern "C" void PPCMfhid0(); -extern "C" static void PPCMthid0(); +extern "C" void PPCMthid0(); extern "C" void PPCMfl2cr(); extern "C" void PPCMtl2cr(); extern "C" void PPCMtdec(); @@ -42,85 +42,77 @@ extern "C" void PPCSetFpNonIEEEMode(); // Declarations: // -/* 80339CC0-80339CC8 334600 0008+00 0/0 5/5 0/0 .text PPCMfmsr */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off +/* 80339CC0-80339CC8 -00001 0008+00 0/0 0/0 0/0 .text PPCMfmsr */ asm void PPCMfmsr() { - nofralloc -#include "asm/dolphin/base/PPCArch/PPCMfmsr.s" + // clang-format off + nofralloc + mfmsr r3 + blr + // clang-format on } -#pragma pop -/* 80339CC8-80339CD0 334608 0008+00 0/0 4/4 0/0 .text PPCMtmsr */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off +/* 80339CC8-80339CD0 -00001 0008+00 0/0 0/0 0/0 .text PPCMtmsr */ asm void PPCMtmsr() { - nofralloc -#include "asm/dolphin/base/PPCArch/PPCMtmsr.s" + // clang-format off + nofralloc + mtmsr r3 + blr + // clang-format on } -#pragma pop -/* 80339CD0-80339CD8 334610 0008+00 1/1 1/1 0/0 .text PPCMfhid0 */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off +/* 80339CD0-80339CD8 -00001 0008+00 0/0 0/0 0/0 .text PPCMfhid0 */ asm void PPCMfhid0() { - nofralloc -#include "asm/dolphin/base/PPCArch/PPCMfhid0.s" + // clang-format off + nofralloc + mfspr r3, 0x3f0 + blr + // clang-format on } -#pragma pop -/* 80339CD8-80339CE0 334618 0008+00 1/1 0/0 0/0 .text PPCMthid0 */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void PPCMthid0() { - nofralloc -#include "asm/dolphin/base/PPCArch/PPCMthid0.s" +/* 80339CD8-80339CE0 -00001 0008+00 0/0 0/0 0/0 .text PPCMthid0 */ +asm void PPCMthid0() { + // clang-format off + nofralloc + mtspr 0x3f0, r3 + blr + // clang-format on } -#pragma pop -/* 80339CE0-80339CE8 334620 0008+00 0/0 2/2 0/0 .text PPCMfl2cr */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off +/* 80339CE0-80339CE8 -00001 0008+00 0/0 0/0 0/0 .text PPCMfl2cr */ asm void PPCMfl2cr() { - nofralloc -#include "asm/dolphin/base/PPCArch/PPCMfl2cr.s" + // clang-format off + nofralloc + mfspr r3, 0x3f9 + blr + // clang-format on } -#pragma pop -/* 80339CE8-80339CF0 334628 0008+00 0/0 2/2 0/0 .text PPCMtl2cr */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off +/* 80339CE8-80339CF0 -00001 0008+00 0/0 0/0 0/0 .text PPCMtl2cr */ asm void PPCMtl2cr() { - nofralloc -#include "asm/dolphin/base/PPCArch/PPCMtl2cr.s" + // clang-format off + nofralloc + mtspr 0x3f9, r3 + blr + // clang-format on } -#pragma pop -/* 80339CF0-80339CF8 334630 0008+00 0/0 3/3 0/0 .text PPCMtdec */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off +/* 80339CF0-80339CF8 -00001 0008+00 0/0 0/0 0/0 .text PPCMtdec */ asm void PPCMtdec() { - nofralloc -#include "asm/dolphin/base/PPCArch/PPCMtdec.s" + // clang-format off + nofralloc + mtspr 0x16, r3 + blr + // clang-format on } -#pragma pop -/* 80339CF8-80339D00 334638 0008+00 0/0 9/9 0/0 .text PPCSync */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off +/* 80339CF8-80339D00 -00001 0008+00 0/0 0/0 0/0 .text PPCSync */ asm void PPCSync() { - nofralloc -#include "asm/dolphin/base/PPCArch/PPCSync.s" + // clang-format off + nofralloc + sc + blr + // clang-format on } -#pragma pop /* 80339D00-80339D14 334640 0014+00 0/0 7/7 0/0 .text PPCHalt */ #pragma push @@ -132,65 +124,59 @@ asm void PPCHalt() { } #pragma pop -/* 80339D14-80339D1C 334654 0008+00 0/0 1/1 0/0 .text PPCMtmmcr0 */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off +/* 80339D14-80339D1C -00001 0008+00 0/0 0/0 0/0 .text PPCMtmmcr0 */ asm void PPCMtmmcr0() { - nofralloc -#include "asm/dolphin/base/PPCArch/PPCMtmmcr0.s" + // clang-format off + nofralloc + mtspr 0x3b8, r3 + blr + // clang-format on } -#pragma pop -/* 80339D1C-80339D24 33465C 0008+00 0/0 1/1 0/0 .text PPCMtmmcr1 */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off +/* 80339D1C-80339D24 -00001 0008+00 0/0 0/0 0/0 .text PPCMtmmcr1 */ asm void PPCMtmmcr1() { - nofralloc -#include "asm/dolphin/base/PPCArch/PPCMtmmcr1.s" + // clang-format off + nofralloc + mtspr 0x3bc, r3 + blr + // clang-format on } -#pragma pop -/* 80339D24-80339D2C 334664 0008+00 0/0 1/1 0/0 .text PPCMtpmc1 */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off +/* 80339D24-80339D2C -00001 0008+00 0/0 0/0 0/0 .text PPCMtpmc1 */ asm void PPCMtpmc1() { - nofralloc -#include "asm/dolphin/base/PPCArch/PPCMtpmc1.s" + // clang-format off + nofralloc + mtspr 0x3b9, r3 + blr + // clang-format on } -#pragma pop -/* 80339D2C-80339D34 33466C 0008+00 0/0 1/1 0/0 .text PPCMtpmc2 */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off +/* 80339D2C-80339D34 -00001 0008+00 0/0 0/0 0/0 .text PPCMtpmc2 */ asm void PPCMtpmc2() { - nofralloc -#include "asm/dolphin/base/PPCArch/PPCMtpmc2.s" + // clang-format off + nofralloc + mtspr 0x3ba, r3 + blr + // clang-format on } -#pragma pop -/* 80339D34-80339D3C 334674 0008+00 0/0 1/1 0/0 .text PPCMtpmc3 */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off +/* 80339D34-80339D3C -00001 0008+00 0/0 0/0 0/0 .text PPCMtpmc3 */ asm void PPCMtpmc3() { - nofralloc -#include "asm/dolphin/base/PPCArch/PPCMtpmc3.s" + // clang-format off + nofralloc + mtspr 0x3bd, r3 + blr + // clang-format on } -#pragma pop -/* 80339D3C-80339D44 33467C 0008+00 0/0 1/1 0/0 .text PPCMtpmc4 */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off +/* 80339D3C-80339D44 -00001 0008+00 0/0 0/0 0/0 .text PPCMtpmc4 */ asm void PPCMtpmc4() { - nofralloc -#include "asm/dolphin/base/PPCArch/PPCMtpmc4.s" + // clang-format off + nofralloc + mtspr 0x3be, r3 + blr + // clang-format on } -#pragma pop /* 80339D44-80339D64 334684 0020+00 0/0 2/2 0/0 .text PPCMffpscr */ #pragma push @@ -212,35 +198,32 @@ asm void PPCMtfpscr() { } #pragma pop -/* 80339D8C-80339D94 3346CC 0008+00 0/0 4/4 1/1 .text PPCMfhid2 */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off +/* 80339D8C-80339D94 -00001 0008+00 0/0 0/0 0/0 .text PPCMfhid2 */ asm void PPCMfhid2() { - nofralloc -#include "asm/dolphin/base/PPCArch/PPCMfhid2.s" + // clang-format off + nofralloc + mfspr r3, 0x398 + blr + // clang-format on } -#pragma pop -/* 80339D94-80339D9C 3346D4 0008+00 0/0 4/4 0/0 .text PPCMthid2 */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off +/* 80339D94-80339D9C -00001 0008+00 0/0 0/0 0/0 .text PPCMthid2 */ asm void PPCMthid2() { - nofralloc -#include "asm/dolphin/base/PPCArch/PPCMthid2.s" + // clang-format off + nofralloc + mtspr 0x398, r3 + blr + // clang-format on } -#pragma pop -/* 80339D9C-80339DA4 3346DC 0008+00 0/0 1/1 0/0 .text PPCMtwpar */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off +/* 80339D9C-80339DA4 -00001 0008+00 0/0 0/0 0/0 .text PPCMtwpar */ asm void PPCMtwpar() { - nofralloc -#include "asm/dolphin/base/PPCArch/PPCMtwpar.s" + // clang-format off + nofralloc + mtspr 0x399, r3 + blr + // clang-format on } -#pragma pop /* 80339DA4-80339DCC 3346E4 0028+00 0/0 1/1 0/0 .text PPCDisableSpeculation */ #pragma push @@ -252,12 +235,11 @@ asm void PPCDisableSpeculation() { } #pragma pop -/* 80339DCC-80339DD4 33470C 0008+00 0/0 1/1 0/0 .text PPCSetFpNonIEEEMode */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off +/* 80339DCC-80339DD4 -00001 0008+00 0/0 0/0 0/0 .text PPCSetFpNonIEEEMode */ asm void PPCSetFpNonIEEEMode() { - nofralloc -#include "asm/dolphin/base/PPCArch/PPCSetFpNonIEEEMode.s" + // clang-format off + nofralloc + mtfsb1 0x1d + blr + // clang-format on } -#pragma pop diff --git a/libs/dolphin/gx/GXFifo.cpp b/libs/dolphin/gx/GXFifo.cpp index 74c15b6677f..12d256dc561 100644 --- a/libs/dolphin/gx/GXFifo.cpp +++ b/libs/dolphin/gx/GXFifo.cpp @@ -31,9 +31,9 @@ extern "C" void __GXWriteFifoIntEnable(); extern "C" void __GXWriteFifoIntReset(); extern "C" void __GXCleanGPFifo(); extern "C" void GXSetCurrentGXThread(); -extern "C" void GXGetCurrentGXThread(); -extern "C" void GXGetCPUFifo(); -extern "C" void GXGetGPFifo(); +extern "C" u32 GXGetCurrentGXThread(); +extern "C" u32 GXGetCPUFifo(); +extern "C" u32 GXGetGPFifo(); // // External References: @@ -59,13 +59,13 @@ extern "C" extern void* __GXData; // /* ############################################################################################## */ -/* 80451948-8045194C 000E48 0004+00 4/4 0/0 0/0 .sbss CPUFifo */ +/* 80451948-8045194C 000E48 0004+00 4/3 0/0 0/0 .sbss CPUFifo */ static u8 CPUFifo[4]; -/* 8045194C-80451950 000E4C 0004+00 4/4 0/0 0/0 .sbss GPFifo */ +/* 8045194C-80451950 000E4C 0004+00 4/3 0/0 0/0 .sbss GPFifo */ static u8 GPFifo[4]; -/* 80451950-80451954 000E50 0004+00 4/4 0/0 0/0 .sbss __GXCurrentThread */ +/* 80451950-80451954 000E50 0004+00 4/3 0/0 0/0 .sbss __GXCurrentThread */ static u8 __GXCurrentThread[4]; /* 80451954-80451958 000E54 0004+00 3/3 0/0 0/0 .sbss None */ @@ -280,32 +280,17 @@ asm void GXSetCurrentGXThread() { } #pragma pop -/* 8035AEA0-8035AEA8 3557E0 0008+00 0/0 1/1 0/0 .text GXGetCurrentGXThread */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void GXGetCurrentGXThread() { - nofralloc -#include "asm/dolphin/gx/GXFifo/GXGetCurrentGXThread.s" +/* 8035AEA0-8035AEA8 -00001 0008+00 0/0 0/0 0/0 .text GXGetCurrentGXThread */ +u32 GXGetCurrentGXThread() { + return *(u32*)(&__GXCurrentThread); } -#pragma pop -/* 8035AEA8-8035AEB0 3557E8 0008+00 1/1 1/1 0/0 .text GXGetCPUFifo */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void GXGetCPUFifo() { - nofralloc -#include "asm/dolphin/gx/GXFifo/GXGetCPUFifo.s" +/* 8035AEA8-8035AEB0 -00001 0008+00 0/0 0/0 0/0 .text GXGetCPUFifo */ +u32 GXGetCPUFifo() { + return *(u32*)(&CPUFifo); } -#pragma pop -/* 8035AEB0-8035AEB8 3557F0 0008+00 1/1 2/2 0/0 .text GXGetGPFifo */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void GXGetGPFifo() { - nofralloc -#include "asm/dolphin/gx/GXFifo/GXGetGPFifo.s" +/* 8035AEB0-8035AEB8 -00001 0008+00 0/0 0/0 0/0 .text GXGetGPFifo */ +u32 GXGetGPFifo() { + return *(u32*)(&GPFifo); } -#pragma pop diff --git a/libs/dolphin/os/OSArena.cpp b/libs/dolphin/os/OSArena.cpp index ebaa01a2e6e..3c659d76c07 100644 --- a/libs/dolphin/os/OSArena.cpp +++ b/libs/dolphin/os/OSArena.cpp @@ -11,8 +11,8 @@ // Forward References: // -extern "C" void OSGetArenaHi(); -extern "C" void OSGetArenaLo(); +extern "C" u32 OSGetArenaHi(); +extern "C" u32 OSGetArenaLo(); extern "C" void OSSetArenaHi(); extern "C" void OSSetArenaLo(); extern "C" void OSAllocFromArenaLo(); @@ -26,36 +26,26 @@ extern "C" void OSAllocFromArenaLo(); // /* ############################################################################################## */ -/* 80451650-80451658 000B50 0004+04 2/2 0/0 0/0 .sbss __OSArenaHi */ +/* 80451650-80451658 000B50 0004+04 2/1 0/0 0/0 .sbss __OSArenaHi */ static u8 __OSArenaHi[4 + 4 /* padding */]; -/* 8033B28C-8033B294 335BCC 0008+00 0/0 7/7 0/0 .text OSGetArenaHi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void OSGetArenaHi() { - nofralloc -#include "asm/dolphin/os/OSArena/OSGetArenaHi.s" +/* 8033B28C-8033B294 -00001 0008+00 0/0 0/0 0/0 .text OSGetArenaHi */ +u32 OSGetArenaHi() { + return *(u32*)(&__OSArenaHi); } -#pragma pop /* ############################################################################################## */ -/* 80450998-804509A0 000418 0004+04 3/3 0/0 0/0 .sdata __OSArenaLo */ +/* 80450998-804509A0 000418 0004+04 3/2 0/0 0/0 .sdata __OSArenaLo */ SECTION_SDATA static u32 __OSArenaLo[1 + 1 /* padding */] = { 0xFFFFFFFF, /* padding */ 0x00000000, }; -/* 8033B294-8033B29C 335BD4 0008+00 0/0 4/4 0/0 .text OSGetArenaLo */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void OSGetArenaLo() { - nofralloc -#include "asm/dolphin/os/OSArena/OSGetArenaLo.s" +/* 8033B294-8033B29C -00001 0008+00 0/0 0/0 0/0 .text OSGetArenaLo */ +u32 OSGetArenaLo() { + return *(u32*)(&__OSArenaLo); } -#pragma pop /* 8033B29C-8033B2A4 335BDC 0008+00 0/0 5/5 0/0 .text OSSetArenaHi */ #pragma push diff --git a/libs/dolphin/os/OSThread.cpp b/libs/dolphin/os/OSThread.cpp index 3f2ecde481e..ed39bb20f3d 100644 --- a/libs/dolphin/os/OSThread.cpp +++ b/libs/dolphin/os/OSThread.cpp @@ -2522,6 +2522,6 @@ static asm void OSClearStack() { #pragma pop /* ############################################################################################## */ -/* 804516D0-804516D8 000BD0 0008+00 0/0 2/2 0/0 .sbss None */ +/* 804516D0-804516D8 000BD0 0008+00 0/0 2/1 0/0 .sbss None */ extern u8 data_804516D0[8]; u8 data_804516D0[8]; diff --git a/libs/dolphin/os/OSTime.cpp b/libs/dolphin/os/OSTime.cpp index 3ac14a09e65..9c45ff7e3b0 100644 --- a/libs/dolphin/os/OSTime.cpp +++ b/libs/dolphin/os/OSTime.cpp @@ -41,15 +41,14 @@ asm void OSGetTime() { } #pragma pop -/* 80342714-8034271C 33D054 0008+00 0/0 13/13 1/1 .text OSGetTick */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off +/* 80342714-8034271C -00001 0008+00 0/0 0/0 0/0 .text OSGetTick */ asm void OSGetTick() { - nofralloc -#include "asm/dolphin/os/OSTime/OSGetTick.s" + // clang-format off + nofralloc + mftb r3, 0x10c + blr + // clang-format on } -#pragma pop /* 8034271C-80342780 33D05C 0064+00 0/0 16/16 0/0 .text __OSGetSystemTime */ #pragma push diff --git a/libs/dolphin/pad/Padclamp.cpp b/libs/dolphin/pad/Padclamp.cpp index b4d18ada6e9..2c7f8f67033 100644 --- a/libs/dolphin/pad/Padclamp.cpp +++ b/libs/dolphin/pad/Padclamp.cpp @@ -82,7 +82,7 @@ SECTION_RODATA static u8 const ClampRegion[10 + 6 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(803A2170, &ClampRegion); +COMPILER_STRIP_GATE(0x803A2170, &ClampRegion); /* 8034E094-8034E1A8 3489D4 0114+00 0/0 1/1 0/0 .text PADClamp */ #pragma push diff --git a/libs/dolphin/vi/vi.cpp b/libs/dolphin/vi/vi.cpp index 7fc4648d6e2..94f7d82ac7d 100644 --- a/libs/dolphin/vi/vi.cpp +++ b/libs/dolphin/vi/vi.cpp @@ -23,10 +23,10 @@ extern "C" static void setVerticalRegs(); extern "C" void VIConfigure(); extern "C" void VIFlush(); extern "C" void VISetNextFrameBuffer(); -extern "C" void VIGetNextFrameBuffer(); -extern "C" void VIGetCurrentFrameBuffer(); +extern "C" u32 VIGetNextFrameBuffer(); +extern "C" u32 VIGetCurrentFrameBuffer(); extern "C" void VISetBlack(); -extern "C" void VIGetRetraceCount(); +extern "C" u32 VIGetRetraceCount(); extern "C" static void GetCurrentDisplayPosition(); extern "C" static void getCurrentFieldEvenOdd(); extern "C" void VIGetNextField(); @@ -69,7 +69,7 @@ static u8 regs[118 + 2 /* padding */]; /* 804517E0-804517E4 000CE0 0004+00 1/1 0/0 0/0 .sbss IsInitialized */ static u8 IsInitialized[4]; -/* 804517E4-804517E8 000CE4 0004+00 4/4 0/0 0/0 .sbss retraceCount */ +/* 804517E4-804517E8 000CE4 0004+00 4/3 0/0 0/0 .sbss retraceCount */ static u8 retraceCount[4]; /* 804517E8-804517EC 000CE8 0004+00 3/3 0/0 0/0 .sbss flushFlag */ @@ -119,10 +119,10 @@ static u8 CurrTiming[4]; /* 8045182C-80451830 000D2C 0004+00 3/3 0/0 0/0 .sbss CurrTvMode */ static u8 CurrTvMode[4]; -/* 80451830-80451834 000D30 0004+00 3/3 0/0 0/0 .sbss NextBufAddr */ +/* 80451830-80451834 000D30 0004+00 3/2 0/0 0/0 .sbss NextBufAddr */ static u8 NextBufAddr[4]; -/* 80451834-80451838 000D34 0004+00 2/2 0/0 0/0 .sbss CurrBufAddr */ +/* 80451834-80451838 000D34 0004+00 2/1 0/0 0/0 .sbss CurrBufAddr */ static u8 CurrBufAddr[4]; /* 8034BF6C-8034C1E0 3468AC 0274+00 1/1 0/0 0/0 .text __VIRetraceHandler */ @@ -798,25 +798,15 @@ asm void VISetNextFrameBuffer() { } #pragma pop -/* 8034D830-8034D838 348170 0008+00 0/0 1/1 0/0 .text VIGetNextFrameBuffer */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void VIGetNextFrameBuffer() { - nofralloc -#include "asm/dolphin/vi/vi/VIGetNextFrameBuffer.s" +/* 8034D830-8034D838 -00001 0008+00 0/0 0/0 0/0 .text VIGetNextFrameBuffer */ +u32 VIGetNextFrameBuffer() { + return *(u32*)(&NextBufAddr); } -#pragma pop -/* 8034D838-8034D840 348178 0008+00 0/0 1/1 0/0 .text VIGetCurrentFrameBuffer */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void VIGetCurrentFrameBuffer() { - nofralloc -#include "asm/dolphin/vi/vi/VIGetCurrentFrameBuffer.s" +/* 8034D838-8034D840 -00001 0008+00 0/0 0/0 0/0 .text VIGetCurrentFrameBuffer */ +u32 VIGetCurrentFrameBuffer() { + return *(u32*)(&CurrBufAddr); } -#pragma pop /* 8034D840-8034D8BC 348180 007C+00 0/0 7/7 0/0 .text VISetBlack */ #pragma push @@ -828,15 +818,10 @@ asm void VISetBlack() { } #pragma pop -/* 8034D8BC-8034D8C4 3481FC 0008+00 0/0 9/9 0/0 .text VIGetRetraceCount */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void VIGetRetraceCount() { - nofralloc -#include "asm/dolphin/vi/vi/VIGetRetraceCount.s" +/* 8034D8BC-8034D8C4 -00001 0008+00 0/0 0/0 0/0 .text VIGetRetraceCount */ +u32 VIGetRetraceCount() { + return *(u32*)(&retraceCount); } -#pragma pop /* 8034D8C4-8034D900 348204 003C+00 1/1 0/0 0/0 .text GetCurrentDisplayPosition */ #pragma push diff --git a/rel/d/a/b/d_a_b_bh/d_a_b_bh.cpp b/rel/d/a/b/d_a_b_bh/d_a_b_bh.cpp index 3099eb5671e..2801ed419c3 100644 --- a/rel/d/a/b/d_a_b_bh/d_a_b_bh.cpp +++ b/rel/d/a/b/d_a_b_bh/d_a_b_bh.cpp @@ -19,16 +19,16 @@ struct mDoMtx_stack_c { static u8 now[48]; }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; - struct J3DAnmTransform {}; +struct J3DModelData {}; + +struct Z2Creature {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -86,13 +86,13 @@ struct dRes_control_c { struct dPa_levelEcallBack {}; -struct _GXColor {}; - struct csXyz { /* 805B3054 */ ~csXyz(); /* 805B3090 */ csXyz(); }; +struct _GXColor {}; + struct dPa_control_c { struct level_c { /* 8004B918 */ void getEmitter(u32); @@ -364,7 +364,7 @@ extern "C" void __register_global_object(); /* ############################################################################################## */ /* 805B3140-805B3144 000000 0004+00 19/19 0/0 0/0 .rodata @3764 */ SECTION_RODATA static f32 const lit_3764 = 1.25f; -COMPILER_STRIP_GATE(805B3140, &lit_3764); +COMPILER_STRIP_GATE(0x805B3140, &lit_3764); /* 805B3234-805B3258 000000 0022+02 1/1 0/0 0/0 .data pow_xa$4538 */ SECTION_DATA static u8 pow_xa[34 + 2 /* padding */] = { @@ -542,11 +542,17 @@ SECTION_RODATA static u8 const lit_3778[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(805B3144, &lit_3778); +COMPILER_STRIP_GATE(0x805B3144, &lit_3778); /* 805B3148-805B314C 000008 0004+00 1/2 0/0 0/0 .rodata @3779 */ SECTION_RODATA static f32 const lit_3779 = -1.0f; -COMPILER_STRIP_GATE(805B3148, &lit_3779); +COMPILER_STRIP_GATE(0x805B3148, &lit_3779); + +/* 805B322C-805B322C 0000EC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_805B322C = "B_BH"; +#pragma pop /* 805AE2A4-805AE350 000124 00AC+00 10/10 0/0 0/0 .text anm_init__FP10b_bh_classifUcf */ #pragma push @@ -573,77 +579,77 @@ static asm void daB_BH_Draw(b_bh_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3946 = 100.0f; -COMPILER_STRIP_GATE(805B314C, &lit_3946); +COMPILER_STRIP_GATE(0x805B314C, &lit_3946); #pragma pop /* 805B3150-805B3154 000010 0004+00 0/10 0/0 0/0 .rodata @3947 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3947 = 50.0f; -COMPILER_STRIP_GATE(805B3150, &lit_3947); +COMPILER_STRIP_GATE(0x805B3150, &lit_3947); #pragma pop /* 805B3154-805B3158 000014 0004+00 0/2 0/0 0/0 .rodata @3948 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3948 = 350.0f; -COMPILER_STRIP_GATE(805B3154, &lit_3948); +COMPILER_STRIP_GATE(0x805B3154, &lit_3948); #pragma pop /* 805B3158-805B315C 000018 0004+00 0/4 0/0 0/0 .rodata @3949 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3949 = 250.0f; -COMPILER_STRIP_GATE(805B3158, &lit_3949); +COMPILER_STRIP_GATE(0x805B3158, &lit_3949); #pragma pop /* 805B315C-805B3160 00001C 0004+00 0/5 0/0 0/0 .rodata @3950 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3950 = 10.0f; -COMPILER_STRIP_GATE(805B315C, &lit_3950); +COMPILER_STRIP_GATE(0x805B315C, &lit_3950); #pragma pop /* 805B3160-805B3164 000020 0004+00 0/14 0/0 0/0 .rodata @3951 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3951 = 1.0f; -COMPILER_STRIP_GATE(805B3160, &lit_3951); +COMPILER_STRIP_GATE(0x805B3160, &lit_3951); #pragma pop /* 805B3164-805B3168 000024 0004+00 0/2 0/0 0/0 .rodata @3952 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3952 = 0.5f; -COMPILER_STRIP_GATE(805B3164, &lit_3952); +COMPILER_STRIP_GATE(0x805B3164, &lit_3952); #pragma pop /* 805B3168-805B316C 000028 0004+00 0/6 0/0 0/0 .rodata @3953 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3953 = 30.0f; -COMPILER_STRIP_GATE(805B3168, &lit_3953); +COMPILER_STRIP_GATE(0x805B3168, &lit_3953); #pragma pop /* 805B316C-805B3170 00002C 0004+00 0/5 0/0 0/0 .rodata @3954 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3954 = 300.0f; -COMPILER_STRIP_GATE(805B316C, &lit_3954); +COMPILER_STRIP_GATE(0x805B316C, &lit_3954); #pragma pop /* 805B3170-805B3174 000030 0004+00 0/5 0/0 0/0 .rodata @3955 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3955 = 550.0f; -COMPILER_STRIP_GATE(805B3170, &lit_3955); +COMPILER_STRIP_GATE(0x805B3170, &lit_3955); #pragma pop /* 805B3174-805B3178 000034 0004+00 0/7 0/0 0/0 .rodata @3956 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3956 = 200.0f; -COMPILER_STRIP_GATE(805B3174, &lit_3956); +COMPILER_STRIP_GATE(0x805B3174, &lit_3956); #pragma pop /* 805B3178-805B3180 000038 0008+00 0/7 0/0 0/0 .rodata @3957 */ @@ -652,7 +658,7 @@ COMPILER_STRIP_GATE(805B3174, &lit_3956); SECTION_RODATA static u8 const lit_3957[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(805B3178, &lit_3957); +COMPILER_STRIP_GATE(0x805B3178, &lit_3957); #pragma pop /* 805B3180-805B3188 000040 0008+00 0/7 0/0 0/0 .rodata @3958 */ @@ -661,7 +667,7 @@ COMPILER_STRIP_GATE(805B3178, &lit_3957); SECTION_RODATA static u8 const lit_3958[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(805B3180, &lit_3958); +COMPILER_STRIP_GATE(0x805B3180, &lit_3958); #pragma pop /* 805B3188-805B3190 000048 0008+00 0/7 0/0 0/0 .rodata @3959 */ @@ -670,63 +676,63 @@ COMPILER_STRIP_GATE(805B3180, &lit_3958); SECTION_RODATA static u8 const lit_3959[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(805B3188, &lit_3959); +COMPILER_STRIP_GATE(0x805B3188, &lit_3959); #pragma pop /* 805B3190-805B3194 000050 0004+00 0/2 0/0 0/0 .rodata @3960 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3960 = 2800.0f; -COMPILER_STRIP_GATE(805B3190, &lit_3960); +COMPILER_STRIP_GATE(0x805B3190, &lit_3960); #pragma pop /* 805B3194-805B3198 000054 0004+00 0/2 0/0 0/0 .rodata @3961 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3961 = 2.0f; -COMPILER_STRIP_GATE(805B3194, &lit_3961); +COMPILER_STRIP_GATE(0x805B3194, &lit_3961); #pragma pop /* 805B3198-805B319C 000058 0004+00 0/1 0/0 0/0 .rodata @3962 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_3962 = 0x403F5C29; -COMPILER_STRIP_GATE(805B3198, &lit_3962); +COMPILER_STRIP_GATE(0x805B3198, &lit_3962); #pragma pop /* 805B319C-805B31A0 00005C 0004+00 0/4 0/0 0/0 .rodata @3963 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3963 = 150.0f; -COMPILER_STRIP_GATE(805B319C, &lit_3963); +COMPILER_STRIP_GATE(0x805B319C, &lit_3963); #pragma pop /* 805B31A0-805B31A4 000060 0004+00 0/7 0/0 0/0 .rodata @3964 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3964 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(805B31A0, &lit_3964); +COMPILER_STRIP_GATE(0x805B31A0, &lit_3964); #pragma pop /* 805B31A4-805B31A8 000064 0004+00 0/8 0/0 0/0 .rodata @3965 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3965 = 1.0f / 20.0f; -COMPILER_STRIP_GATE(805B31A4, &lit_3965); +COMPILER_STRIP_GATE(0x805B31A4, &lit_3965); #pragma pop /* 805B31A8-805B31AC 000068 0004+00 0/2 0/0 0/0 .rodata @3966 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3966 = 400.0f; -COMPILER_STRIP_GATE(805B31A8, &lit_3966); +COMPILER_STRIP_GATE(0x805B31A8, &lit_3966); #pragma pop /* 805B31AC-805B31B0 00006C 0004+00 0/2 0/0 0/0 .rodata @3967 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3967 = -23.0f; -COMPILER_STRIP_GATE(805B31AC, &lit_3967); +COMPILER_STRIP_GATE(0x805B31AC, &lit_3967); #pragma pop /* 805B31B0-805B31B8 000070 0004+04 0/2 0/0 0/0 .rodata @3968 */ @@ -737,7 +743,7 @@ SECTION_RODATA static f32 const lit_3968[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(805B31B0, &lit_3968); +COMPILER_STRIP_GATE(0x805B31B0, &lit_3968); #pragma pop /* 805B31B8-805B31C0 000078 0008+00 0/4 0/0 0/0 .rodata @3970 */ @@ -746,7 +752,7 @@ COMPILER_STRIP_GATE(805B31B0, &lit_3968); SECTION_RODATA static u8 const lit_3970[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(805B31B8, &lit_3970); +COMPILER_STRIP_GATE(0x805B31B8, &lit_3970); #pragma pop /* 805B33B0-805B33B4 000008 0001+03 1/1 0/0 0/0 .bss @1109 */ @@ -875,49 +881,49 @@ asm cXyz::~cXyz() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4038 = 5.0f; -COMPILER_STRIP_GATE(805B31C0, &lit_4038); +COMPILER_STRIP_GATE(0x805B31C0, &lit_4038); #pragma pop /* 805B31C4-805B31C8 000084 0004+00 0/5 0/0 0/0 .rodata @4039 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4039 = 3.0f; -COMPILER_STRIP_GATE(805B31C4, &lit_4039); +COMPILER_STRIP_GATE(0x805B31C4, &lit_4039); #pragma pop /* 805B31C8-805B31CC 000088 0004+00 0/2 0/0 0/0 .rodata @4040 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4040 = -300.0f; -COMPILER_STRIP_GATE(805B31C8, &lit_4040); +COMPILER_STRIP_GATE(0x805B31C8, &lit_4040); #pragma pop /* 805B31CC-805B31D0 00008C 0004+00 0/4 0/0 0/0 .rodata @4041 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4041 = 500.0f; -COMPILER_STRIP_GATE(805B31CC, &lit_4041); +COMPILER_STRIP_GATE(0x805B31CC, &lit_4041); #pragma pop /* 805B31D0-805B31D4 000090 0004+00 0/2 0/0 0/0 .rodata @4042 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4042 = 1700.0f; -COMPILER_STRIP_GATE(805B31D0, &lit_4042); +COMPILER_STRIP_GATE(0x805B31D0, &lit_4042); #pragma pop /* 805B31D4-805B31D8 000094 0004+00 0/3 0/0 0/0 .rodata @4043 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4043 = 60.0f; -COMPILER_STRIP_GATE(805B31D4, &lit_4043); +COMPILER_STRIP_GATE(0x805B31D4, &lit_4043); #pragma pop /* 805B31D8-805B31DC 000098 0004+00 0/2 0/0 0/0 .rodata @4044 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4044 = 20.0f; -COMPILER_STRIP_GATE(805B31D8, &lit_4044); +COMPILER_STRIP_GATE(0x805B31D8, &lit_4044); #pragma pop /* 805AEB40-805AEF78 0009C0 0438+00 1/1 0/0 0/0 .text b_bh_attack_1__FP10b_bh_class */ @@ -935,7 +941,7 @@ static asm void b_bh_attack_1(b_bh_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4091 = 3.0f / 10.0f; -COMPILER_STRIP_GATE(805B31DC, &lit_4091); +COMPILER_STRIP_GATE(0x805B31DC, &lit_4091); #pragma pop /* 805AEF78-805AF1F8 000DF8 0280+00 1/1 0/0 0/0 .text b_bh_bombeat__FP10b_bh_class */ @@ -953,28 +959,28 @@ static asm void b_bh_bombeat(b_bh_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4179 = 600.0f; -COMPILER_STRIP_GATE(805B31E0, &lit_4179); +COMPILER_STRIP_GATE(0x805B31E0, &lit_4179); #pragma pop /* 805B31E4-805B31E8 0000A4 0004+00 0/3 0/0 0/0 .rodata @4180 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4180 = 700.0f; -COMPILER_STRIP_GATE(805B31E4, &lit_4180); +COMPILER_STRIP_GATE(0x805B31E4, &lit_4180); #pragma pop /* 805B31E8-805B31EC 0000A8 0004+00 0/2 0/0 0/0 .rodata @4181 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4181 = 1600.0f; -COMPILER_STRIP_GATE(805B31E8, &lit_4181); +COMPILER_STRIP_GATE(0x805B31E8, &lit_4181); #pragma pop /* 805B31EC-805B31F0 0000AC 0004+00 0/2 0/0 0/0 .rodata @4182 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4182 = 1.0f / 100.0f; -COMPILER_STRIP_GATE(805B31EC, &lit_4182); +COMPILER_STRIP_GATE(0x805B31EC, &lit_4182); #pragma pop /* 805AF1F8-805AF6E0 001078 04E8+00 1/1 0/0 0/0 .text b_bh_down__FP10b_bh_class */ @@ -992,7 +998,7 @@ static asm void b_bh_down(b_bh_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4280 = 70.0f; -COMPILER_STRIP_GATE(805B31F0, &lit_4280); +COMPILER_STRIP_GATE(0x805B31F0, &lit_4280); #pragma pop /* 805AF6E0-805AFCA8 001560 05C8+00 1/1 0/0 0/0 .text b_bh_b_wait__FP10b_bh_class */ @@ -1030,7 +1036,7 @@ static asm void b_bh_b_bombeat(b_bh_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4450 = 1000.0f; -COMPILER_STRIP_GATE(805B31F4, &lit_4450); +COMPILER_STRIP_GATE(0x805B31F4, &lit_4450); #pragma pop /* 805B0274-805B060C 0020F4 0398+00 1/1 0/0 0/0 .text b_bh_b_down__FP10b_bh_class */ @@ -1048,14 +1054,14 @@ static asm void b_bh_b_down(b_bh_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4532 = 800.0f; -COMPILER_STRIP_GATE(805B31F8, &lit_4532); +COMPILER_STRIP_GATE(0x805B31F8, &lit_4532); #pragma pop /* 805B31FC-805B3200 0000BC 0004+00 0/2 0/0 0/0 .rodata @4533 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4533 = 12000.0f; -COMPILER_STRIP_GATE(805B31FC, &lit_4533); +COMPILER_STRIP_GATE(0x805B31FC, &lit_4533); #pragma pop /* 805B060C-805B0B04 00248C 04F8+00 1/1 0/0 0/0 .text b_bh_start__FP10b_bh_class */ @@ -1073,7 +1079,7 @@ static asm void b_bh_start(b_bh_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4593 = -200.0f; -COMPILER_STRIP_GATE(805B3200, &lit_4593); +COMPILER_STRIP_GATE(0x805B3200, &lit_4593); #pragma pop /* 805B0B04-805B0D6C 002984 0268+00 1/1 0/0 0/0 .text kuki_control1__FP10b_bh_class */ @@ -1101,7 +1107,7 @@ static asm void kuki_control2(b_bh_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4670 = 17.0f; -COMPILER_STRIP_GATE(805B3204, &lit_4670); +COMPILER_STRIP_GATE(0x805B3204, &lit_4670); #pragma pop /* 805B0EE0-805B10AC 002D60 01CC+00 1/1 0/0 0/0 .text kuki_control3__FP10b_bh_class */ @@ -1139,14 +1145,14 @@ static asm void damage_check(b_bh_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5023 = -150.0f; -COMPILER_STRIP_GATE(805B3208, &lit_5023); +COMPILER_STRIP_GATE(0x805B3208, &lit_5023); #pragma pop /* 805B320C-805B3210 0000CC 0004+00 0/1 0/0 0/0 .rodata @5024 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5024 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(805B320C, &lit_5024); +COMPILER_STRIP_GATE(0x805B320C, &lit_5024); #pragma pop /* 805B15A8-805B1F4C 003428 09A4+00 1/1 0/0 0/0 .text action__FP10b_bh_class */ @@ -1174,28 +1180,28 @@ static asm void anm_se_set(b_bh_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5330 = -500.0f; -COMPILER_STRIP_GATE(805B3210, &lit_5330); +COMPILER_STRIP_GATE(0x805B3210, &lit_5330); #pragma pop /* 805B3214-805B3218 0000D4 0004+00 0/1 0/0 0/0 .rodata @5331 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5331 = 2.5f; -COMPILER_STRIP_GATE(805B3214, &lit_5331); +COMPILER_STRIP_GATE(0x805B3214, &lit_5331); #pragma pop /* 805B3218-805B321C 0000D8 0004+00 0/1 0/0 0/0 .rodata @5332 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_5332 = 0x3B03126F; -COMPILER_STRIP_GATE(805B3218, &lit_5332); +COMPILER_STRIP_GATE(0x805B3218, &lit_5332); #pragma pop /* 805B321C-805B3220 0000DC 0004+00 0/1 0/0 0/0 .rodata @5333 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5333 = -10.0f; -COMPILER_STRIP_GATE(805B321C, &lit_5333); +COMPILER_STRIP_GATE(0x805B321C, &lit_5333); #pragma pop /* 805B2110-805B2840 003F90 0730+00 2/1 0/0 0/0 .text daB_BH_Execute__FP10b_bh_class */ @@ -1228,14 +1234,14 @@ static asm void daB_BH_Delete(b_bh_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5390 = 6.0f / 5.0f; -COMPILER_STRIP_GATE(805B3220, &lit_5390); +COMPILER_STRIP_GATE(0x805B3220, &lit_5390); #pragma pop /* 805B3224-805B3228 0000E4 0004+00 0/1 0/0 0/0 .rodata @5391 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5391 = 65536.0f; -COMPILER_STRIP_GATE(805B3224, &lit_5391); +COMPILER_STRIP_GATE(0x805B3224, &lit_5391); #pragma pop /* 805B28B0-805B2AF8 004730 0248+00 1/1 0/0 0/0 .text useHeapInit__FP10fopAc_ac_c */ @@ -1253,7 +1259,7 @@ static asm void useHeapInit(fopAc_ac_c* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5513 = 65535.0f; -COMPILER_STRIP_GATE(805B3228, &lit_5513); +COMPILER_STRIP_GATE(0x805B3228, &lit_5513); #pragma pop /* 805B2AF8-805B2F54 004978 045C+00 1/0 0/0 0/0 .text daB_BH_Create__FP10fopAc_ac_c */ @@ -1338,7 +1344,7 @@ asm void __sinit_d_a_b_bh_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_805B30E0 = (void*)__sinit_d_a_b_bh_cpp; +REGISTER_CTORS(0x805B30E0, __sinit_d_a_b_bh_cpp); #pragma pop /* 805B311C-805B3124 004F9C 0008+00 1/0 0/0 0/0 .text @36@__dt__12dBgS_ObjAcchFv */ @@ -1533,9 +1539,4 @@ static u8 data_805B3478[4]; static u8 data_805B347C[4]; #pragma pop -/* 805B322C-805B3231 0000EC 0005+00 4/4 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_805B322C = "B_BH"; -#pragma pop +/* 805B322C-805B322C 0000EC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/b/d_a_b_bq/d_a_b_bq.cpp b/rel/d/a/b/d_a_b_bq/d_a_b_bq.cpp index 7cbb304f037..6835f00e7be 100644 --- a/rel/d/a/b/d_a_b_bq/d_a_b_bq.cpp +++ b/rel/d/a/b/d_a_b_bq/d_a_b_bq.cpp @@ -69,16 +69,16 @@ struct mDoExt_baseAnm { /* 8000D428 */ void play(); }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; - struct J3DAnmTransform {}; +struct J3DModelData {}; + +struct Z2Creature {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -136,13 +136,13 @@ struct dRes_control_c { struct dPa_levelEcallBack {}; -struct _GXColor {}; - struct csXyz { /* 802673F4 */ csXyz(s16, s16, s16); /* 805BA124 */ ~csXyz(); }; +struct _GXColor {}; + struct dPa_control_c { struct level_c { /* 8004B8B4 */ void forceOnEventMove(u32); @@ -554,7 +554,7 @@ extern "C" void __register_global_object(); /* ############################################################################################## */ /* 805BA588-805BA58C 000000 0004+00 18/18 0/0 0/0 .rodata @3816 */ SECTION_RODATA static f32 const lit_3816 = 1.0f; -COMPILER_STRIP_GATE(805BA588, &lit_3816); +COMPILER_STRIP_GATE(0x805BA588, &lit_3816); /* 805BA874-805BA880 000000 000C+00 2/2 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { @@ -1039,11 +1039,17 @@ SECTION_RODATA static u8 const lit_3830[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(805BA58C, &lit_3830); +COMPILER_STRIP_GATE(0x805BA58C, &lit_3830); /* 805BA590-805BA594 000008 0004+00 2/4 0/0 0/0 .rodata @3831 */ SECTION_RODATA static f32 const lit_3831 = -1.0f; -COMPILER_STRIP_GATE(805BA590, &lit_3831); +COMPILER_STRIP_GATE(0x805BA590, &lit_3831); + +/* 805BA86C-805BA86C 0002E4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_805BA86C = "B_bq"; +#pragma pop /* 805B35A0-805B364C 000120 00AC+00 6/6 0/0 0/0 .text anm_init__FP10b_bq_classifUcf */ #pragma push @@ -1070,21 +1076,21 @@ static asm void nodeCallBack(J3DJoint* param_0, int param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4002 = 255.0f; -COMPILER_STRIP_GATE(805BA594, &lit_4002); +COMPILER_STRIP_GATE(0x805BA594, &lit_4002); #pragma pop /* 805BA598-805BA59C 000010 0004+00 0/1 0/0 0/0 .rodata @4003 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4003 = 195.0f; -COMPILER_STRIP_GATE(805BA598, &lit_4003); +COMPILER_STRIP_GATE(0x805BA598, &lit_4003); #pragma pop /* 805BA59C-805BA5A0 000014 0004+00 0/1 0/0 0/0 .rodata @4004 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4004 = 225.0f; -COMPILER_STRIP_GATE(805BA59C, &lit_4004); +COMPILER_STRIP_GATE(0x805BA59C, &lit_4004); #pragma pop /* 805B37A4-805B3ABC 000324 0318+00 1/0 0/0 0/0 .text daB_BQ_Draw__FP10b_bq_class */ @@ -1112,14 +1118,14 @@ static asm void s_fw_sub0(void* param_0, void* param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4037 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(805BA5A0, &lit_4037); +COMPILER_STRIP_GATE(0x805BA5A0, &lit_4037); #pragma pop /* 805BA5A4-805BA5A8 00001C 0004+00 0/1 0/0 0/0 .rodata @4038 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4038 = 1.0f / 50.0f; -COMPILER_STRIP_GATE(805BA5A4, &lit_4038); +COMPILER_STRIP_GATE(0x805BA5A4, &lit_4038); #pragma pop /* 805B3B0C-805B3C20 00068C 0114+00 1/1 0/0 0/0 .text s_fw_sub1__FPvPv */ @@ -1145,7 +1151,7 @@ asm cXyz::~cXyz() { /* ############################################################################################## */ /* 805BA5A8-805BA5AC 000020 0004+00 1/2 0/0 0/0 .rodata @4062 */ SECTION_RODATA static f32 const lit_4062 = 20.0f; -COMPILER_STRIP_GATE(805BA5A8, &lit_4062); +COMPILER_STRIP_GATE(0x805BA5A8, &lit_4062); /* 805BAD50-805BAD54 000008 0004+00 2/2 0/0 0/0 .bss None */ static u8 data_805BAD50[4]; @@ -1192,7 +1198,7 @@ static asm void s_bi_del_sub(void* param_0, void* param_1) { /* ############################################################################################## */ /* 805BA5AC-805BA5B0 000024 0004+00 1/2 0/0 0/0 .rodata @4137 */ SECTION_RODATA static f32 const lit_4137 = 3.0f; -COMPILER_STRIP_GATE(805BA5AC, &lit_4137); +COMPILER_STRIP_GATE(0x805BA5AC, &lit_4137); /* 805B3E00-805B4048 000980 0248+00 1/1 0/0 0/0 .text damage_check__FP10b_bq_class */ #pragma push @@ -1209,14 +1215,14 @@ static asm void damage_check(b_bq_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4229 = 45.0f; -COMPILER_STRIP_GATE(805BA5B0, &lit_4229); +COMPILER_STRIP_GATE(0x805BA5B0, &lit_4229); #pragma pop /* 805BA5B4-805BA5B8 00002C 0004+00 0/1 0/0 0/0 .rodata @4230 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4230 = 180.0f; -COMPILER_STRIP_GATE(805BA5B4, &lit_4230); +COMPILER_STRIP_GATE(0x805BA5B4, &lit_4230); #pragma pop /* 805B4048-805B44D4 000BC8 048C+00 1/1 0/0 0/0 .text b_bq_stay__FP10b_bq_class */ @@ -1234,21 +1240,21 @@ static asm void b_bq_stay(b_bq_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4257 = 10.0f; -COMPILER_STRIP_GATE(805BA5B8, &lit_4257); +COMPILER_STRIP_GATE(0x805BA5B8, &lit_4257); #pragma pop /* 805BA5BC-805BA5C0 000034 0004+00 0/3 0/0 0/0 .rodata @4258 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4258 = 50.0f; -COMPILER_STRIP_GATE(805BA5BC, &lit_4258); +COMPILER_STRIP_GATE(0x805BA5BC, &lit_4258); #pragma pop /* 805BA5C0-805BA5C4 000038 0004+00 0/1 0/0 0/0 .rodata @4259 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4259 = 80.0f; -COMPILER_STRIP_GATE(805BA5C0, &lit_4259); +COMPILER_STRIP_GATE(0x805BA5C0, &lit_4259); #pragma pop /* 805B44D4-805B4614 001054 0140+00 1/1 0/0 0/0 .text b_bq_wait__FP10b_bq_class */ @@ -1266,21 +1272,21 @@ static asm void b_bq_wait(b_bq_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4426 = 113.0f; -COMPILER_STRIP_GATE(805BA5C4, &lit_4426); +COMPILER_STRIP_GATE(0x805BA5C4, &lit_4426); #pragma pop /* 805BA5C8-805BA5CC 000040 0004+00 0/3 0/0 0/0 .rodata @4427 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4427 = 300.0f; -COMPILER_STRIP_GATE(805BA5C8, &lit_4427); +COMPILER_STRIP_GATE(0x805BA5C8, &lit_4427); #pragma pop /* 805BA5CC-805BA5D0 000044 0004+00 0/2 0/0 0/0 .rodata @4428 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4428 = 5.0f; -COMPILER_STRIP_GATE(805BA5CC, &lit_4428); +COMPILER_STRIP_GATE(0x805BA5CC, &lit_4428); #pragma pop /* 805B4614-805B4D4C 001194 0738+00 2/1 0/0 0/0 .text b_bq_damage__FP10b_bq_class */ @@ -1298,56 +1304,56 @@ static asm void b_bq_damage(b_bq_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4429 = 2.0f; -COMPILER_STRIP_GATE(805BA5D0, &lit_4429); +COMPILER_STRIP_GATE(0x805BA5D0, &lit_4429); #pragma pop /* 805BA5D4-805BA5D8 00004C 0004+00 0/2 0/0 0/0 .rodata @4430 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4430 = 30.0f; -COMPILER_STRIP_GATE(805BA5D4, &lit_4430); +COMPILER_STRIP_GATE(0x805BA5D4, &lit_4430); #pragma pop /* 805BA5D8-805BA5DC 000050 0004+00 0/1 0/0 0/0 .rodata @4723 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4723 = 1200.0f; -COMPILER_STRIP_GATE(805BA5D8, &lit_4723); +COMPILER_STRIP_GATE(0x805BA5D8, &lit_4723); #pragma pop /* 805BA5DC-805BA5E0 000054 0004+00 0/1 0/0 0/0 .rodata @4724 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4724 = 2300.0f; -COMPILER_STRIP_GATE(805BA5DC, &lit_4724); +COMPILER_STRIP_GATE(0x805BA5DC, &lit_4724); #pragma pop /* 805BA5E0-805BA5E4 000058 0004+00 0/1 0/0 0/0 .rodata @4725 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4725 = 500.0f; -COMPILER_STRIP_GATE(805BA5E0, &lit_4725); +COMPILER_STRIP_GATE(0x805BA5E0, &lit_4725); #pragma pop /* 805BA5E4-805BA5E8 00005C 0004+00 0/2 0/0 0/0 .rodata @4726 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4726 = 0.5f; -COMPILER_STRIP_GATE(805BA5E4, &lit_4726); +COMPILER_STRIP_GATE(0x805BA5E4, &lit_4726); #pragma pop /* 805BA5E8-805BA5EC 000060 0004+00 0/4 0/0 0/0 .rodata @4727 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4727 = 1.0f / 20.0f; -COMPILER_STRIP_GATE(805BA5E8, &lit_4727); +COMPILER_STRIP_GATE(0x805BA5E8, &lit_4727); #pragma pop /* 805BA5EC-805BA5F0 000064 0004+00 0/2 0/0 0/0 .rodata @4728 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4728 = -20000.0f; -COMPILER_STRIP_GATE(805BA5EC, &lit_4728); +COMPILER_STRIP_GATE(0x805BA5EC, &lit_4728); #pragma pop /* 805BA5F0-805BA5F8 000068 0004+04 0/1 0/0 0/0 .rodata @4729 */ @@ -1358,7 +1364,7 @@ SECTION_RODATA static f32 const lit_4729[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(805BA5F0, &lit_4729); +COMPILER_STRIP_GATE(0x805BA5F0, &lit_4729); #pragma pop /* 805BA5F8-805BA600 000070 0008+00 0/1 0/0 0/0 .rodata @4732 */ @@ -1367,7 +1373,7 @@ COMPILER_STRIP_GATE(805BA5F0, &lit_4729); SECTION_RODATA static u8 const lit_4732[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(805BA5F8, &lit_4732); +COMPILER_STRIP_GATE(0x805BA5F8, &lit_4732); #pragma pop /* 805B4D4C-805B54E0 0018CC 0794+00 1/1 0/0 0/0 .text b_bq_attack__FP10b_bq_class */ @@ -1423,7 +1429,7 @@ static asm void cam_3d_morf(b_bq_class* param_0, f32 param_1) { /* ############################################################################################## */ /* 805BA600-805BA604 000078 0004+00 1/1 0/0 0/0 .rodata @5284 */ SECTION_RODATA static f32 const lit_5284 = -200.0f; -COMPILER_STRIP_GATE(805BA600, &lit_5284); +COMPILER_STRIP_GATE(0x805BA600, &lit_5284); /* 805B6348-805B63EC 002EC8 00A4+00 2/2 0/0 0/0 .text fish_set__FP10b_bq_class */ #pragma push @@ -1440,126 +1446,126 @@ static asm void fish_set(b_bq_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5942 = 55.0f; -COMPILER_STRIP_GATE(805BA604, &lit_5942); +COMPILER_STRIP_GATE(0x805BA604, &lit_5942); #pragma pop /* 805BA608-805BA60C 000080 0004+00 0/2 0/0 0/0 .rodata @5943 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5943 = 1000.0f; -COMPILER_STRIP_GATE(805BA608, &lit_5943); +COMPILER_STRIP_GATE(0x805BA608, &lit_5943); #pragma pop /* 805BA60C-805BA610 000084 0004+00 0/1 0/0 0/0 .rodata @5944 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5944 = 1500.0f; -COMPILER_STRIP_GATE(805BA60C, &lit_5944); +COMPILER_STRIP_GATE(0x805BA60C, &lit_5944); #pragma pop /* 805BA610-805BA614 000088 0004+00 0/1 0/0 0/0 .rodata @5945 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5945 = 400.0f; -COMPILER_STRIP_GATE(805BA610, &lit_5945); +COMPILER_STRIP_GATE(0x805BA610, &lit_5945); #pragma pop /* 805BA614-805BA618 00008C 0004+00 0/1 0/0 0/0 .rodata @5946 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5946 = 2200.0f; -COMPILER_STRIP_GATE(805BA614, &lit_5946); +COMPILER_STRIP_GATE(0x805BA614, &lit_5946); #pragma pop /* 805BA618-805BA61C 000090 0004+00 0/1 0/0 0/0 .rodata @5947 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5947 = 173.0f; -COMPILER_STRIP_GATE(805BA618, &lit_5947); +COMPILER_STRIP_GATE(0x805BA618, &lit_5947); #pragma pop /* 805BA61C-805BA620 000094 0004+00 0/1 0/0 0/0 .rodata @5948 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5948 = 1695.0f; -COMPILER_STRIP_GATE(805BA61C, &lit_5948); +COMPILER_STRIP_GATE(0x805BA61C, &lit_5948); #pragma pop /* 805BA620-805BA624 000098 0004+00 0/1 0/0 0/0 .rodata @5949 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5949 = 13.0f; -COMPILER_STRIP_GATE(805BA620, &lit_5949); +COMPILER_STRIP_GATE(0x805BA620, &lit_5949); #pragma pop /* 805BA624-805BA628 00009C 0004+00 0/1 0/0 0/0 .rodata @5950 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5950 = -100.0f; -COMPILER_STRIP_GATE(805BA624, &lit_5950); +COMPILER_STRIP_GATE(0x805BA624, &lit_5950); #pragma pop /* 805BA628-805BA62C 0000A0 0004+00 0/1 0/0 0/0 .rodata @5951 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5951 = 750.0f; -COMPILER_STRIP_GATE(805BA628, &lit_5951); +COMPILER_STRIP_GATE(0x805BA628, &lit_5951); #pragma pop /* 805BA62C-805BA630 0000A4 0004+00 0/2 0/0 0/0 .rodata @5952 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5952 = 100.0f; -COMPILER_STRIP_GATE(805BA62C, &lit_5952); +COMPILER_STRIP_GATE(0x805BA62C, &lit_5952); #pragma pop /* 805BA630-805BA634 0000A8 0004+00 0/1 0/0 0/0 .rodata @5953 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5953 = 1350.0f; -COMPILER_STRIP_GATE(805BA630, &lit_5953); +COMPILER_STRIP_GATE(0x805BA630, &lit_5953); #pragma pop /* 805BA634-805BA638 0000AC 0004+00 0/1 0/0 0/0 .rodata @5954 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5954 = 1.0f / 100.0f; -COMPILER_STRIP_GATE(805BA634, &lit_5954); +COMPILER_STRIP_GATE(0x805BA634, &lit_5954); #pragma pop /* 805BA638-805BA63C 0000B0 0004+00 0/1 0/0 0/0 .rodata @5955 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_5955 = 0x3A03126F; -COMPILER_STRIP_GATE(805BA638, &lit_5955); +COMPILER_STRIP_GATE(0x805BA638, &lit_5955); #pragma pop /* 805BA63C-805BA640 0000B4 0004+00 0/2 0/0 0/0 .rodata @5956 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5956 = 200.0f; -COMPILER_STRIP_GATE(805BA63C, &lit_5956); +COMPILER_STRIP_GATE(0x805BA63C, &lit_5956); #pragma pop /* 805BA640-805BA644 0000B8 0004+00 0/1 0/0 0/0 .rodata @5957 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5957 = 40.0f; -COMPILER_STRIP_GATE(805BA640, &lit_5957); +COMPILER_STRIP_GATE(0x805BA640, &lit_5957); #pragma pop /* 805BA644-805BA648 0000BC 0004+00 0/1 0/0 0/0 .rodata @5958 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5958 = 21.0f / 20.0f; -COMPILER_STRIP_GATE(805BA644, &lit_5958); +COMPILER_STRIP_GATE(0x805BA644, &lit_5958); #pragma pop /* 805BA648-805BA64C 0000C0 0004+00 0/2 0/0 0/0 .rodata @5959 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_5959 = 0x3BA3D70A; -COMPILER_STRIP_GATE(805BA648, &lit_5959); +COMPILER_STRIP_GATE(0x805BA648, &lit_5959); #pragma pop /* 805B63EC-805B8A04 002F6C 2618+00 2/1 0/0 0/0 .text demo_camera__FP10b_bq_class */ @@ -1597,805 +1603,805 @@ static asm void cM_scos(s16 param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5960 = 58.0f; -COMPILER_STRIP_GATE(805BA64C, &lit_5960); +COMPILER_STRIP_GATE(0x805BA64C, &lit_5960); #pragma pop /* 805BA650-805BA654 0000C8 0004+00 0/0 0/0 0/0 .rodata @5961 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5961 = 355.0f; -COMPILER_STRIP_GATE(805BA650, &lit_5961); +COMPILER_STRIP_GATE(0x805BA650, &lit_5961); #pragma pop /* 805BA654-805BA658 0000CC 0004+00 0/0 0/0 0/0 .rodata @5962 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5962 = 1800.0f; -COMPILER_STRIP_GATE(805BA654, &lit_5962); +COMPILER_STRIP_GATE(0x805BA654, &lit_5962); #pragma pop /* 805BA658-805BA65C 0000D0 0004+00 0/0 0/0 0/0 .rodata @5963 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5963 = 240.0f; -COMPILER_STRIP_GATE(805BA658, &lit_5963); +COMPILER_STRIP_GATE(0x805BA658, &lit_5963); #pragma pop /* 805BA65C-805BA660 0000D4 0004+00 0/0 0/0 0/0 .rodata @5964 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5964 = 274.0f; -COMPILER_STRIP_GATE(805BA65C, &lit_5964); +COMPILER_STRIP_GATE(0x805BA65C, &lit_5964); #pragma pop /* 805BA660-805BA664 0000D8 0004+00 0/0 0/0 0/0 .rodata @5965 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5965 = 2075.0f; -COMPILER_STRIP_GATE(805BA660, &lit_5965); +COMPILER_STRIP_GATE(0x805BA660, &lit_5965); #pragma pop /* 805BA664-805BA668 0000DC 0004+00 0/0 0/0 0/0 .rodata @5966 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5966 = 411.0f; -COMPILER_STRIP_GATE(805BA664, &lit_5966); +COMPILER_STRIP_GATE(0x805BA664, &lit_5966); #pragma pop /* 805BA668-805BA66C 0000E0 0004+00 0/0 0/0 0/0 .rodata @5967 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5967 = 1793.0f; -COMPILER_STRIP_GATE(805BA668, &lit_5967); +COMPILER_STRIP_GATE(0x805BA668, &lit_5967); #pragma pop /* 805BA66C-805BA670 0000E4 0004+00 0/0 0/0 0/0 .rodata @5968 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5968 = 1700.0f; -COMPILER_STRIP_GATE(805BA66C, &lit_5968); +COMPILER_STRIP_GATE(0x805BA66C, &lit_5968); #pragma pop /* 805BA670-805BA674 0000E8 0004+00 0/0 0/0 0/0 .rodata @5969 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_5969 = 0x391D4952; -COMPILER_STRIP_GATE(805BA670, &lit_5969); +COMPILER_STRIP_GATE(0x805BA670, &lit_5969); #pragma pop /* 805BA674-805BA678 0000EC 0004+00 0/0 0/0 0/0 .rodata @5970 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5970 = 32768.0f; -COMPILER_STRIP_GATE(805BA674, &lit_5970); +COMPILER_STRIP_GATE(0x805BA674, &lit_5970); #pragma pop /* 805BA678-805BA67C 0000F0 0004+00 0/0 0/0 0/0 .rodata @5971 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5971 = 1444.0f; -COMPILER_STRIP_GATE(805BA678, &lit_5971); +COMPILER_STRIP_GATE(0x805BA678, &lit_5971); #pragma pop /* 805BA67C-805BA680 0000F4 0004+00 0/0 0/0 0/0 .rodata @5972 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5972 = 121.0f; -COMPILER_STRIP_GATE(805BA67C, &lit_5972); +COMPILER_STRIP_GATE(0x805BA67C, &lit_5972); #pragma pop /* 805BA680-805BA684 0000F8 0004+00 0/0 0/0 0/0 .rodata @5973 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5973 = 1783.0f; -COMPILER_STRIP_GATE(805BA680, &lit_5973); +COMPILER_STRIP_GATE(0x805BA680, &lit_5973); #pragma pop /* 805BA684-805BA688 0000FC 0004+00 0/0 0/0 0/0 .rodata @5974 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5974 = 1685.0f; -COMPILER_STRIP_GATE(805BA684, &lit_5974); +COMPILER_STRIP_GATE(0x805BA684, &lit_5974); #pragma pop /* 805BA688-805BA68C 000100 0004+00 0/0 0/0 0/0 .rodata @5975 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5975 = 95.0f; -COMPILER_STRIP_GATE(805BA688, &lit_5975); +COMPILER_STRIP_GATE(0x805BA688, &lit_5975); #pragma pop /* 805BA68C-805BA690 000104 0004+00 0/0 0/0 0/0 .rodata @5976 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5976 = 2021.0f; -COMPILER_STRIP_GATE(805BA68C, &lit_5976); +COMPILER_STRIP_GATE(0x805BA68C, &lit_5976); #pragma pop /* 805BA690-805BA694 000108 0004+00 0/0 0/0 0/0 .rodata @5977 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5977 = 76.0f; -COMPILER_STRIP_GATE(805BA690, &lit_5977); +COMPILER_STRIP_GATE(0x805BA690, &lit_5977); #pragma pop /* 805BA694-805BA698 00010C 0004+00 0/0 0/0 0/0 .rodata @5978 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5978 = 204.0f; -COMPILER_STRIP_GATE(805BA694, &lit_5978); +COMPILER_STRIP_GATE(0x805BA694, &lit_5978); #pragma pop /* 805BA698-805BA69C 000110 0004+00 0/0 0/0 0/0 .rodata @5979 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5979 = 1782.0f; -COMPILER_STRIP_GATE(805BA698, &lit_5979); +COMPILER_STRIP_GATE(0x805BA698, &lit_5979); #pragma pop /* 805BA69C-805BA6A0 000114 0004+00 0/0 0/0 0/0 .rodata @5980 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5980 = -41.0f; -COMPILER_STRIP_GATE(805BA69C, &lit_5980); +COMPILER_STRIP_GATE(0x805BA69C, &lit_5980); #pragma pop /* 805BA6A0-805BA6A4 000118 0004+00 0/0 0/0 0/0 .rodata @5981 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5981 = 261.0f; -COMPILER_STRIP_GATE(805BA6A0, &lit_5981); +COMPILER_STRIP_GATE(0x805BA6A0, &lit_5981); #pragma pop /* 805BA6A4-805BA6A8 00011C 0004+00 0/0 0/0 0/0 .rodata @5982 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5982 = 2095.0f; -COMPILER_STRIP_GATE(805BA6A4, &lit_5982); +COMPILER_STRIP_GATE(0x805BA6A4, &lit_5982); #pragma pop /* 805BA6A8-805BA6AC 000120 0004+00 0/0 0/0 0/0 .rodata @5983 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5983 = 1394.0f; -COMPILER_STRIP_GATE(805BA6A8, &lit_5983); +COMPILER_STRIP_GATE(0x805BA6A8, &lit_5983); #pragma pop /* 805BA6AC-805BA6B0 000124 0004+00 0/0 0/0 0/0 .rodata @5984 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5984 = 313.0f; -COMPILER_STRIP_GATE(805BA6AC, &lit_5984); +COMPILER_STRIP_GATE(0x805BA6AC, &lit_5984); #pragma pop /* 805BA6B0-805BA6B4 000128 0004+00 0/0 0/0 0/0 .rodata @5985 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5985 = -300.0f; -COMPILER_STRIP_GATE(805BA6B0, &lit_5985); +COMPILER_STRIP_GATE(0x805BA6B0, &lit_5985); #pragma pop /* 805BA6B4-805BA6B8 00012C 0004+00 0/0 0/0 0/0 .rodata @5986 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5986 = 4.0f / 5.0f; -COMPILER_STRIP_GATE(805BA6B4, &lit_5986); +COMPILER_STRIP_GATE(0x805BA6B4, &lit_5986); #pragma pop /* 805BA6B8-805BA6BC 000130 0004+00 0/1 0/0 0/0 .rodata @5987 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5987 = 60.0f; -COMPILER_STRIP_GATE(805BA6B8, &lit_5987); +COMPILER_STRIP_GATE(0x805BA6B8, &lit_5987); #pragma pop /* 805BA6BC-805BA6C0 000134 0004+00 0/0 0/0 0/0 .rodata @5988 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5988 = 1413.0f; -COMPILER_STRIP_GATE(805BA6BC, &lit_5988); +COMPILER_STRIP_GATE(0x805BA6BC, &lit_5988); #pragma pop /* 805BA6C0-805BA6C4 000138 0004+00 0/0 0/0 0/0 .rodata @5989 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5989 = 430.0f; -COMPILER_STRIP_GATE(805BA6C0, &lit_5989); +COMPILER_STRIP_GATE(0x805BA6C0, &lit_5989); #pragma pop /* 805BA6C4-805BA6C8 00013C 0004+00 0/0 0/0 0/0 .rodata @5990 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5990 = 524.0f; -COMPILER_STRIP_GATE(805BA6C4, &lit_5990); +COMPILER_STRIP_GATE(0x805BA6C4, &lit_5990); #pragma pop /* 805BA6C8-805BA6CC 000140 0004+00 0/0 0/0 0/0 .rodata @5991 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5991 = 1440.0f; -COMPILER_STRIP_GATE(805BA6C8, &lit_5991); +COMPILER_STRIP_GATE(0x805BA6C8, &lit_5991); #pragma pop /* 805BA6CC-805BA6D0 000144 0004+00 0/0 0/0 0/0 .rodata @5992 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5992 = 278.0f; -COMPILER_STRIP_GATE(805BA6CC, &lit_5992); +COMPILER_STRIP_GATE(0x805BA6CC, &lit_5992); #pragma pop /* 805BA6D0-805BA6D4 000148 0004+00 0/0 0/0 0/0 .rodata @5993 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5993 = 1252.0f; -COMPILER_STRIP_GATE(805BA6D0, &lit_5993); +COMPILER_STRIP_GATE(0x805BA6D0, &lit_5993); #pragma pop /* 805BA6D4-805BA6D8 00014C 0004+00 0/0 0/0 0/0 .rodata @5994 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5994 = 86.0f; -COMPILER_STRIP_GATE(805BA6D4, &lit_5994); +COMPILER_STRIP_GATE(0x805BA6D4, &lit_5994); #pragma pop /* 805BA6D8-805BA6DC 000150 0004+00 0/0 0/0 0/0 .rodata @5995 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5995 = 2167.0f; -COMPILER_STRIP_GATE(805BA6D8, &lit_5995); +COMPILER_STRIP_GATE(0x805BA6D8, &lit_5995); #pragma pop /* 805BA6DC-805BA6E0 000154 0004+00 0/1 0/0 0/0 .rodata @5996 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5996 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(805BA6DC, &lit_5996); +COMPILER_STRIP_GATE(0x805BA6DC, &lit_5996); #pragma pop /* 805BA6E0-805BA6E4 000158 0004+00 0/0 0/0 0/0 .rodata @5997 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_5997 = 0x3A83126F; -COMPILER_STRIP_GATE(805BA6E0, &lit_5997); +COMPILER_STRIP_GATE(0x805BA6E0, &lit_5997); #pragma pop /* 805BA6E4-805BA6E8 00015C 0004+00 0/0 0/0 0/0 .rodata @5998 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5998 = -900.0f; -COMPILER_STRIP_GATE(805BA6E4, &lit_5998); +COMPILER_STRIP_GATE(0x805BA6E4, &lit_5998); #pragma pop /* 805BA6E8-805BA6EC 000160 0004+00 0/0 0/0 0/0 .rodata @5999 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5999 = 1471.0f; -COMPILER_STRIP_GATE(805BA6E8, &lit_5999); +COMPILER_STRIP_GATE(0x805BA6E8, &lit_5999); #pragma pop /* 805BA6EC-805BA6F0 000164 0004+00 0/0 0/0 0/0 .rodata @6000 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6000 = -35.0f; -COMPILER_STRIP_GATE(805BA6EC, &lit_6000); +COMPILER_STRIP_GATE(0x805BA6EC, &lit_6000); #pragma pop /* 805BA6F0-805BA6F4 000168 0004+00 0/0 0/0 0/0 .rodata @6001 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6001 = 15.0f; -COMPILER_STRIP_GATE(805BA6F0, &lit_6001); +COMPILER_STRIP_GATE(0x805BA6F0, &lit_6001); #pragma pop /* 805BA6F4-805BA6F8 00016C 0004+00 0/1 0/0 0/0 .rodata @6002 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6002 = 3.0f / 5.0f; -COMPILER_STRIP_GATE(805BA6F4, &lit_6002); +COMPILER_STRIP_GATE(0x805BA6F4, &lit_6002); #pragma pop /* 805BA6F8-805BA6FC 000170 0004+00 0/0 0/0 0/0 .rodata @6003 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6003 = -766.0f; -COMPILER_STRIP_GATE(805BA6F8, &lit_6003); +COMPILER_STRIP_GATE(0x805BA6F8, &lit_6003); #pragma pop /* 805BA6FC-805BA700 000174 0004+00 0/0 0/0 0/0 .rodata @6004 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6004 = 423.0f; -COMPILER_STRIP_GATE(805BA6FC, &lit_6004); +COMPILER_STRIP_GATE(0x805BA6FC, &lit_6004); #pragma pop /* 805BA700-805BA704 000178 0004+00 0/0 0/0 0/0 .rodata @6005 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6005 = 1593.0f; -COMPILER_STRIP_GATE(805BA700, &lit_6005); +COMPILER_STRIP_GATE(0x805BA700, &lit_6005); #pragma pop /* 805BA704-805BA708 00017C 0004+00 0/0 0/0 0/0 .rodata @6006 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6006 = 71.0f; -COMPILER_STRIP_GATE(805BA704, &lit_6006); +COMPILER_STRIP_GATE(0x805BA704, &lit_6006); #pragma pop /* 805BA708-805BA70C 000180 0004+00 0/0 0/0 0/0 .rodata @6007 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6007 = 114.0f; -COMPILER_STRIP_GATE(805BA708, &lit_6007); +COMPILER_STRIP_GATE(0x805BA708, &lit_6007); #pragma pop /* 805BA70C-805BA710 000184 0004+00 0/0 0/0 0/0 .rodata @6008 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6008 = 2304.0f; -COMPILER_STRIP_GATE(805BA70C, &lit_6008); +COMPILER_STRIP_GATE(0x805BA70C, &lit_6008); #pragma pop /* 805BA710-805BA714 000188 0004+00 0/0 0/0 0/0 .rodata @6009 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6009 = -2243.0f; -COMPILER_STRIP_GATE(805BA710, &lit_6009); +COMPILER_STRIP_GATE(0x805BA710, &lit_6009); #pragma pop /* 805BA714-805BA718 00018C 0004+00 0/0 0/0 0/0 .rodata @6010 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6010 = 1340.0f; -COMPILER_STRIP_GATE(805BA714, &lit_6010); +COMPILER_STRIP_GATE(0x805BA714, &lit_6010); #pragma pop /* 805BA718-805BA71C 000190 0004+00 0/0 0/0 0/0 .rodata @6011 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6011 = 977.0f; -COMPILER_STRIP_GATE(805BA718, &lit_6011); +COMPILER_STRIP_GATE(0x805BA718, &lit_6011); #pragma pop /* 805BA71C-805BA720 000194 0004+00 0/0 0/0 0/0 .rodata @6012 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6012 = -1226.0f; -COMPILER_STRIP_GATE(805BA71C, &lit_6012); +COMPILER_STRIP_GATE(0x805BA71C, &lit_6012); #pragma pop /* 805BA720-805BA724 000198 0004+00 0/0 0/0 0/0 .rodata @6013 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6013 = 980.0f; -COMPILER_STRIP_GATE(805BA720, &lit_6013); +COMPILER_STRIP_GATE(0x805BA720, &lit_6013); #pragma pop /* 805BA724-805BA728 00019C 0004+00 0/0 0/0 0/0 .rodata @6014 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6014 = 4.0f; -COMPILER_STRIP_GATE(805BA724, &lit_6014); +COMPILER_STRIP_GATE(0x805BA724, &lit_6014); #pragma pop /* 805BA728-805BA72C 0001A0 0004+00 0/0 0/0 0/0 .rodata @6015 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6015 = -560.0f; -COMPILER_STRIP_GATE(805BA728, &lit_6015); +COMPILER_STRIP_GATE(0x805BA728, &lit_6015); #pragma pop /* 805BA72C-805BA730 0001A4 0004+00 0/0 0/0 0/0 .rodata @6016 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6016 = 717.0f; -COMPILER_STRIP_GATE(805BA72C, &lit_6016); +COMPILER_STRIP_GATE(0x805BA72C, &lit_6016); #pragma pop /* 805BA730-805BA734 0001A8 0004+00 0/0 0/0 0/0 .rodata @6017 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6017 = 1948.0f; -COMPILER_STRIP_GATE(805BA730, &lit_6017); +COMPILER_STRIP_GATE(0x805BA730, &lit_6017); #pragma pop /* 805BA734-805BA738 0001AC 0004+00 0/0 0/0 0/0 .rodata @6018 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6018 = 2800.0f; -COMPILER_STRIP_GATE(805BA734, &lit_6018); +COMPILER_STRIP_GATE(0x805BA734, &lit_6018); #pragma pop /* 805BA738-805BA73C 0001B0 0004+00 0/0 0/0 0/0 .rodata @6019 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6019 = 72.0f; -COMPILER_STRIP_GATE(805BA738, &lit_6019); +COMPILER_STRIP_GATE(0x805BA738, &lit_6019); #pragma pop /* 805BA73C-805BA740 0001B4 0004+00 0/0 0/0 0/0 .rodata @6020 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6020 = 52.0f; -COMPILER_STRIP_GATE(805BA73C, &lit_6020); +COMPILER_STRIP_GATE(0x805BA73C, &lit_6020); #pragma pop /* 805BA740-805BA744 0001B8 0004+00 0/0 0/0 0/0 .rodata @6021 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6021 = 2153.0f; -COMPILER_STRIP_GATE(805BA740, &lit_6021); +COMPILER_STRIP_GATE(0x805BA740, &lit_6021); #pragma pop /* 805BA744-805BA748 0001BC 0004+00 0/0 0/0 0/0 .rodata @6022 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6022 = -150.0f; -COMPILER_STRIP_GATE(805BA744, &lit_6022); +COMPILER_STRIP_GATE(0x805BA744, &lit_6022); #pragma pop /* 805BA748-805BA74C 0001C0 0004+00 0/0 0/0 0/0 .rodata @6023 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6023 = 2288.0f; -COMPILER_STRIP_GATE(805BA748, &lit_6023); +COMPILER_STRIP_GATE(0x805BA748, &lit_6023); #pragma pop /* 805BA74C-805BA750 0001C4 0004+00 0/0 0/0 0/0 .rodata @6024 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6024 = -30.0f; -COMPILER_STRIP_GATE(805BA74C, &lit_6024); +COMPILER_STRIP_GATE(0x805BA74C, &lit_6024); #pragma pop /* 805BA750-805BA754 0001C8 0004+00 0/0 0/0 0/0 .rodata @6025 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6025 = 1938.0f; -COMPILER_STRIP_GATE(805BA750, &lit_6025); +COMPILER_STRIP_GATE(0x805BA750, &lit_6025); #pragma pop /* 805BA754-805BA758 0001CC 0004+00 0/0 0/0 0/0 .rodata @6026 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6026 = 25.0f; -COMPILER_STRIP_GATE(805BA754, &lit_6026); +COMPILER_STRIP_GATE(0x805BA754, &lit_6026); #pragma pop /* 805BA758-805BA75C 0001D0 0004+00 0/0 0/0 0/0 .rodata @6027 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6027 = 6.0f; -COMPILER_STRIP_GATE(805BA758, &lit_6027); +COMPILER_STRIP_GATE(0x805BA758, &lit_6027); #pragma pop /* 805BA75C-805BA760 0001D4 0004+00 0/0 0/0 0/0 .rodata @6028 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6028 = 3.0f / 10.0f; -COMPILER_STRIP_GATE(805BA75C, &lit_6028); +COMPILER_STRIP_GATE(0x805BA75C, &lit_6028); #pragma pop /* 805BA760-805BA764 0001D8 0004+00 0/0 0/0 0/0 .rodata @6029 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6029 = 3.0f / 100.0f; -COMPILER_STRIP_GATE(805BA760, &lit_6029); +COMPILER_STRIP_GATE(0x805BA760, &lit_6029); #pragma pop /* 805BA764-805BA768 0001DC 0004+00 0/1 0/0 0/0 .rodata @6030 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6030 = 700.0f; -COMPILER_STRIP_GATE(805BA764, &lit_6030); +COMPILER_STRIP_GATE(0x805BA764, &lit_6030); #pragma pop /* 805BA768-805BA76C 0001E0 0004+00 0/0 0/0 0/0 .rodata @6031 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6031 = 92.0f; -COMPILER_STRIP_GATE(805BA768, &lit_6031); +COMPILER_STRIP_GATE(0x805BA768, &lit_6031); #pragma pop /* 805BA76C-805BA770 0001E4 0004+00 0/0 0/0 0/0 .rodata @6032 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6032 = 2654.0f; -COMPILER_STRIP_GATE(805BA76C, &lit_6032); +COMPILER_STRIP_GATE(0x805BA76C, &lit_6032); #pragma pop /* 805BA770-805BA774 0001E8 0004+00 0/0 0/0 0/0 .rodata @6033 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6033 = 110.0f; -COMPILER_STRIP_GATE(805BA770, &lit_6033); +COMPILER_STRIP_GATE(0x805BA770, &lit_6033); #pragma pop /* 805BA774-805BA778 0001EC 0004+00 0/0 0/0 0/0 .rodata @6034 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6034 = 560.0f; -COMPILER_STRIP_GATE(805BA774, &lit_6034); +COMPILER_STRIP_GATE(0x805BA774, &lit_6034); #pragma pop /* 805BA778-805BA77C 0001F0 0004+00 0/0 0/0 0/0 .rodata @6035 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6035 = 3090.0f; -COMPILER_STRIP_GATE(805BA778, &lit_6035); +COMPILER_STRIP_GATE(0x805BA778, &lit_6035); #pragma pop /* 805BA77C-805BA780 0001F4 0004+00 0/0 0/0 0/0 .rodata @6036 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6036 = 939.0f; -COMPILER_STRIP_GATE(805BA77C, &lit_6036); +COMPILER_STRIP_GATE(0x805BA77C, &lit_6036); #pragma pop /* 805BA780-805BA784 0001F8 0004+00 0/0 0/0 0/0 .rodata @6037 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6037 = 434.0f; -COMPILER_STRIP_GATE(805BA780, &lit_6037); +COMPILER_STRIP_GATE(0x805BA780, &lit_6037); #pragma pop /* 805BA784-805BA788 0001FC 0004+00 0/0 0/0 0/0 .rodata @6038 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6038 = 2362.0f; -COMPILER_STRIP_GATE(805BA784, &lit_6038); +COMPILER_STRIP_GATE(0x805BA784, &lit_6038); #pragma pop /* 805BA788-805BA78C 000200 0004+00 0/0 0/0 0/0 .rodata @6039 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6039 = 1214.0f; -COMPILER_STRIP_GATE(805BA788, &lit_6039); +COMPILER_STRIP_GATE(0x805BA788, &lit_6039); #pragma pop /* 805BA78C-805BA790 000204 0004+00 0/1 0/0 0/0 .rodata @6040 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6040 = 350.0f; -COMPILER_STRIP_GATE(805BA78C, &lit_6040); +COMPILER_STRIP_GATE(0x805BA78C, &lit_6040); #pragma pop /* 805BA790-805BA794 000208 0004+00 0/0 0/0 0/0 .rodata @6041 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6041 = 2696.0f; -COMPILER_STRIP_GATE(805BA790, &lit_6041); +COMPILER_STRIP_GATE(0x805BA790, &lit_6041); #pragma pop /* 805BA794-805BA798 00020C 0004+00 0/0 0/0 0/0 .rodata @6042 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6042 = 111.0f; -COMPILER_STRIP_GATE(805BA794, &lit_6042); +COMPILER_STRIP_GATE(0x805BA794, &lit_6042); #pragma pop /* 805BA798-805BA79C 000210 0004+00 0/0 0/0 0/0 .rodata @6043 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6043 = 1689.0f; -COMPILER_STRIP_GATE(805BA798, &lit_6043); +COMPILER_STRIP_GATE(0x805BA798, &lit_6043); #pragma pop /* 805BA79C-805BA7A0 000214 0004+00 0/0 0/0 0/0 .rodata @6044 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6044 = 23.0f; -COMPILER_STRIP_GATE(805BA79C, &lit_6044); +COMPILER_STRIP_GATE(0x805BA79C, &lit_6044); #pragma pop /* 805BA7A0-805BA7A4 000218 0004+00 0/0 0/0 0/0 .rodata @6045 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6045 = 108.0f; -COMPILER_STRIP_GATE(805BA7A0, &lit_6045); +COMPILER_STRIP_GATE(0x805BA7A0, &lit_6045); #pragma pop /* 805BA7A4-805BA7A8 00021C 0004+00 0/0 0/0 0/0 .rodata @6046 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6046 = 2155.0f; -COMPILER_STRIP_GATE(805BA7A4, &lit_6046); +COMPILER_STRIP_GATE(0x805BA7A4, &lit_6046); #pragma pop /* 805BA7A8-805BA7AC 000220 0004+00 0/0 0/0 0/0 .rodata @6047 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_6047 = 0x399D4952; -COMPILER_STRIP_GATE(805BA7A8, &lit_6047); +COMPILER_STRIP_GATE(0x805BA7A8, &lit_6047); #pragma pop /* 805BA7AC-805BA7B0 000224 0004+00 0/0 0/0 0/0 .rodata @6048 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_6048 = 0x3BE56042; -COMPILER_STRIP_GATE(805BA7AC, &lit_6048); +COMPILER_STRIP_GATE(0x805BA7AC, &lit_6048); #pragma pop /* 805BA7B0-805BA7B4 000228 0004+00 0/0 0/0 0/0 .rodata @6049 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_6049 = 0x38FBA882; -COMPILER_STRIP_GATE(805BA7B0, &lit_6049); +COMPILER_STRIP_GATE(0x805BA7B0, &lit_6049); #pragma pop /* 805BA7B4-805BA7B8 00022C 0004+00 0/1 0/0 0/0 .rodata @6050 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6050 = 70.0f; -COMPILER_STRIP_GATE(805BA7B4, &lit_6050); +COMPILER_STRIP_GATE(0x805BA7B4, &lit_6050); #pragma pop /* 805BA7B8-805BA7BC 000230 0004+00 0/0 0/0 0/0 .rodata @6051 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6051 = 1072.0f; -COMPILER_STRIP_GATE(805BA7B8, &lit_6051); +COMPILER_STRIP_GATE(0x805BA7B8, &lit_6051); #pragma pop /* 805BA7BC-805BA7C0 000234 0004+00 0/0 0/0 0/0 .rodata @6052 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6052 = 1121.0f; -COMPILER_STRIP_GATE(805BA7BC, &lit_6052); +COMPILER_STRIP_GATE(0x805BA7BC, &lit_6052); #pragma pop /* 805BA7C0-805BA7C4 000238 0004+00 0/0 0/0 0/0 .rodata @6053 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6053 = -379.0f; -COMPILER_STRIP_GATE(805BA7C0, &lit_6053); +COMPILER_STRIP_GATE(0x805BA7C0, &lit_6053); #pragma pop /* 805BA7C4-805BA7C8 00023C 0004+00 0/0 0/0 0/0 .rodata @6054 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6054 = 1320.0f; -COMPILER_STRIP_GATE(805BA7C4, &lit_6054); +COMPILER_STRIP_GATE(0x805BA7C4, &lit_6054); #pragma pop /* 805BA7C8-805BA7CC 000240 0004+00 0/0 0/0 0/0 .rodata @6055 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6055 = 1293.0f; -COMPILER_STRIP_GATE(805BA7C8, &lit_6055); +COMPILER_STRIP_GATE(0x805BA7C8, &lit_6055); #pragma pop /* 805BA7CC-805BA7D0 000244 0004+00 0/0 0/0 0/0 .rodata @6056 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6056 = -701.0f; -COMPILER_STRIP_GATE(805BA7CC, &lit_6056); +COMPILER_STRIP_GATE(0x805BA7CC, &lit_6056); #pragma pop /* 805BA7D0-805BA7D4 000248 0004+00 0/0 0/0 0/0 .rodata @6057 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6057 = 758.0f; -COMPILER_STRIP_GATE(805BA7D0, &lit_6057); +COMPILER_STRIP_GATE(0x805BA7D0, &lit_6057); #pragma pop /* 805BA7D4-805BA7D8 00024C 0004+00 0/0 0/0 0/0 .rodata @6058 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6058 = 853.0f; -COMPILER_STRIP_GATE(805BA7D4, &lit_6058); +COMPILER_STRIP_GATE(0x805BA7D4, &lit_6058); #pragma pop /* 805BA7D8-805BA7DC 000250 0004+00 0/0 0/0 0/0 .rodata @6059 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6059 = 332.0f; -COMPILER_STRIP_GATE(805BA7D8, &lit_6059); +COMPILER_STRIP_GATE(0x805BA7D8, &lit_6059); #pragma pop /* 805BA7DC-805BA7E0 000254 0004+00 0/0 0/0 0/0 .rodata @6060 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6060 = 953.0f; -COMPILER_STRIP_GATE(805BA7DC, &lit_6060); +COMPILER_STRIP_GATE(0x805BA7DC, &lit_6060); #pragma pop /* 805BA7E0-805BA7E4 000258 0004+00 0/0 0/0 0/0 .rodata @6061 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6061 = 997.0f; -COMPILER_STRIP_GATE(805BA7E0, &lit_6061); +COMPILER_STRIP_GATE(0x805BA7E0, &lit_6061); #pragma pop /* 805BA7E4-805BA7E8 00025C 0004+00 0/0 0/0 0/0 .rodata @6062 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6062 = -36.0f; -COMPILER_STRIP_GATE(805BA7E4, &lit_6062); +COMPILER_STRIP_GATE(0x805BA7E4, &lit_6062); #pragma pop /* 805BA7E8-805BA7EC 000260 0004+00 0/0 0/0 0/0 .rodata @6063 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6063 = 3.0f / 20.0f; -COMPILER_STRIP_GATE(805BA7E8, &lit_6063); +COMPILER_STRIP_GATE(0x805BA7E8, &lit_6063); #pragma pop /* 805BA7EC-805BA7F0 000264 0004+00 0/0 0/0 0/0 .rodata @6064 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_6064 = 0x3B03126F; -COMPILER_STRIP_GATE(805BA7EC, &lit_6064); +COMPILER_STRIP_GATE(0x805BA7EC, &lit_6064); #pragma pop /* 805BA7F0-805BA7F4 000268 0004+00 0/0 0/0 0/0 .rodata @6065 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6065 = 2486.0f; -COMPILER_STRIP_GATE(805BA7F0, &lit_6065); +COMPILER_STRIP_GATE(0x805BA7F0, &lit_6065); #pragma pop /* 805BA7F4-805BA7F8 00026C 0004+00 0/0 0/0 0/0 .rodata @6066 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6066 = 118.0f; -COMPILER_STRIP_GATE(805BA7F4, &lit_6066); +COMPILER_STRIP_GATE(0x805BA7F4, &lit_6066); #pragma pop /* 805BA7F8-805BA7FC 000270 0004+00 0/0 0/0 0/0 .rodata @6067 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6067 = 2349.0f; -COMPILER_STRIP_GATE(805BA7F8, &lit_6067); +COMPILER_STRIP_GATE(0x805BA7F8, &lit_6067); #pragma pop /* 805BA7FC-805BA800 000274 0004+00 0/0 0/0 0/0 .rodata @6068 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6068 = 116.0f; -COMPILER_STRIP_GATE(805BA7FC, &lit_6068); +COMPILER_STRIP_GATE(0x805BA7FC, &lit_6068); #pragma pop /* 805BA800-805BA804 000278 0004+00 0/0 0/0 0/0 .rodata @6069 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6069 = 2766.0f; -COMPILER_STRIP_GATE(805BA800, &lit_6069); +COMPILER_STRIP_GATE(0x805BA800, &lit_6069); #pragma pop /* 805BA804-805BA808 00027C 0004+00 0/0 0/0 0/0 .rodata @6070 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6070 = 210.0f; -COMPILER_STRIP_GATE(805BA804, &lit_6070); +COMPILER_STRIP_GATE(0x805BA804, &lit_6070); #pragma pop /* 805BA808-805BA80C 000280 0004+00 0/1 0/0 0/0 .rodata @6071 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6071 = -234.0f; -COMPILER_STRIP_GATE(805BA808, &lit_6071); +COMPILER_STRIP_GATE(0x805BA808, &lit_6071); #pragma pop /* 805BA80C-805BA810 000284 0004+00 0/1 0/0 0/0 .rodata @6072 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6072 = 2191.0f; -COMPILER_STRIP_GATE(805BA80C, &lit_6072); +COMPILER_STRIP_GATE(0x805BA80C, &lit_6072); #pragma pop /* 805BA810-805BA814 000288 0004+00 0/0 0/0 0/0 .rodata @6073 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6073 = 7.5f; -COMPILER_STRIP_GATE(805BA810, &lit_6073); +COMPILER_STRIP_GATE(0x805BA810, &lit_6073); #pragma pop /* 805BA814-805BA818 00028C 0004+00 0/0 0/0 0/0 .rodata @6074 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6074 = -20.0f; -COMPILER_STRIP_GATE(805BA814, &lit_6074); +COMPILER_STRIP_GATE(0x805BA814, &lit_6074); #pragma pop /* 805BA818-805BA820 000290 0004+04 0/0 0/0 0/0 .rodata @6075 */ @@ -2406,7 +2412,7 @@ SECTION_RODATA static u32 const lit_6075[1 + 1 /* padding */] = { /* padding */ 0x00000000, }; -COMPILER_STRIP_GATE(805BA818, &lit_6075); +COMPILER_STRIP_GATE(0x805BA818, &lit_6075); #pragma pop /* 805BA820-805BA828 000298 0008+00 0/1 0/0 0/0 .rodata @6140 */ @@ -2415,7 +2421,7 @@ COMPILER_STRIP_GATE(805BA818, &lit_6075); SECTION_RODATA static u8 const lit_6140[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(805BA820, &lit_6140); +COMPILER_STRIP_GATE(0x805BA820, &lit_6140); #pragma pop /* 805BA828-805BA830 0002A0 0008+00 0/1 0/0 0/0 .rodata @6141 */ @@ -2424,7 +2430,7 @@ COMPILER_STRIP_GATE(805BA820, &lit_6140); SECTION_RODATA static u8 const lit_6141[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(805BA828, &lit_6141); +COMPILER_STRIP_GATE(0x805BA828, &lit_6141); #pragma pop /* 805BA830-805BA838 0002A8 0008+00 0/1 0/0 0/0 .rodata @6142 */ @@ -2433,84 +2439,84 @@ COMPILER_STRIP_GATE(805BA828, &lit_6141); SECTION_RODATA static u8 const lit_6142[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(805BA830, &lit_6142); +COMPILER_STRIP_GATE(0x805BA830, &lit_6142); #pragma pop /* 805BA838-805BA83C 0002B0 0004+00 0/1 0/0 0/0 .rodata @6389 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6389 = -40000.0f; -COMPILER_STRIP_GATE(805BA838, &lit_6389); +COMPILER_STRIP_GATE(0x805BA838, &lit_6389); #pragma pop /* 805BA83C-805BA840 0002B4 0004+00 0/1 0/0 0/0 .rodata @6390 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6390 = 30000.0f; -COMPILER_STRIP_GATE(805BA83C, &lit_6390); +COMPILER_STRIP_GATE(0x805BA83C, &lit_6390); #pragma pop /* 805BA840-805BA844 0002B8 0004+00 0/1 0/0 0/0 .rodata @6391 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6391 = 10000.0f; -COMPILER_STRIP_GATE(805BA840, &lit_6391); +COMPILER_STRIP_GATE(0x805BA840, &lit_6391); #pragma pop /* 805BA844-805BA848 0002BC 0004+00 0/1 0/0 0/0 .rodata @6392 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6392 = -250.0f; -COMPILER_STRIP_GATE(805BA844, &lit_6392); +COMPILER_STRIP_GATE(0x805BA844, &lit_6392); #pragma pop /* 805BA848-805BA84C 0002C0 0004+00 0/1 0/0 0/0 .rodata @6393 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6393 = 230.0f; -COMPILER_STRIP_GATE(805BA848, &lit_6393); +COMPILER_STRIP_GATE(0x805BA848, &lit_6393); #pragma pop /* 805BA84C-805BA850 0002C4 0004+00 0/1 0/0 0/0 .rodata @6394 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6394 = 250.0f; -COMPILER_STRIP_GATE(805BA84C, &lit_6394); +COMPILER_STRIP_GATE(0x805BA84C, &lit_6394); #pragma pop /* 805BA850-805BA854 0002C8 0004+00 0/1 0/0 0/0 .rodata @6395 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6395 = 20000.0f; -COMPILER_STRIP_GATE(805BA850, &lit_6395); +COMPILER_STRIP_GATE(0x805BA850, &lit_6395); #pragma pop /* 805BA854-805BA858 0002CC 0004+00 0/1 0/0 0/0 .rodata @6396 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6396 = 520.0f; -COMPILER_STRIP_GATE(805BA854, &lit_6396); +COMPILER_STRIP_GATE(0x805BA854, &lit_6396); #pragma pop /* 805BA858-805BA85C 0002D0 0004+00 0/1 0/0 0/0 .rodata @6397 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6397 = 1.0f / 80.0f; -COMPILER_STRIP_GATE(805BA858, &lit_6397); +COMPILER_STRIP_GATE(0x805BA858, &lit_6397); #pragma pop /* 805BA85C-805BA860 0002D4 0004+00 0/1 0/0 0/0 .rodata @6398 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6398 = 1.0f / 125.0f; -COMPILER_STRIP_GATE(805BA85C, &lit_6398); +COMPILER_STRIP_GATE(0x805BA85C, &lit_6398); #pragma pop /* 805BA860-805BA864 0002D8 0004+00 0/1 0/0 0/0 .rodata @6399 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_6399 = 0x3B23D70A; -COMPILER_STRIP_GATE(805BA860, &lit_6399); +COMPILER_STRIP_GATE(0x805BA860, &lit_6399); #pragma pop /* 805B8A24-805B92F0 0055A4 08CC+00 2/1 0/0 0/0 .text daB_BQ_Execute__FP10b_bq_class */ @@ -2563,14 +2569,14 @@ asm J3DFrameCtrl::~J3DFrameCtrl() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6660 = 1778.0f; -COMPILER_STRIP_GATE(805BA864, &lit_6660); +COMPILER_STRIP_GATE(0x805BA864, &lit_6660); #pragma pop /* 805BA868-805BA86C 0002E0 0004+00 0/1 0/0 0/0 .rodata @6661 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_6661 = 0x403F5C29; -COMPILER_STRIP_GATE(805BA868, &lit_6661); +COMPILER_STRIP_GATE(0x805BA868, &lit_6661); #pragma pop /* 805B969C-805B9B3C 00621C 04A0+00 1/0 0/0 0/0 .text daB_BQ_Create__FP10fopAc_ac_c */ @@ -2680,7 +2686,7 @@ asm void __sinit_d_a_b_bq_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_805BA044 = (void*)__sinit_d_a_b_bq_cpp; +REGISTER_CTORS(0x805BA044, __sinit_d_a_b_bq_cpp); #pragma pop /* 805BA080-805BA094 006C00 0014+00 1/1 0/0 0/0 .text cancelOriginalDemo__9daPy_py_cFv */ @@ -2864,15 +2870,10 @@ asm cXyz::cXyz(cXyz const& param_0) { } #pragma pop -/* 805BA26C-805BA274 006DEC 0008+00 1/1 0/0 0/0 .text __ct__10JAISoundIDFUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm JAISoundID::JAISoundID(u32 param_0) { - nofralloc -#include "asm/rel/d/a/b/d_a_b_bq/d_a_b_bq/__ct__10JAISoundIDFUl.s" +/* 805BA26C-805BA274 -00001 0008+00 0/0 0/0 0/0 .text __ct__10JAISoundIDFUl */ +JAISoundID::JAISoundID(u32 param_0) { + *(u32*)this = (u32)(param_0); } -#pragma pop /* 805BA274-805BA2E8 006DF4 0074+00 1/1 0/0 0/0 .text * dComIfGp_particle_set__FUsPC4cXyzPC5csXyzPC4cXyz */ @@ -3007,9 +3008,4 @@ asm void cXyz::operator+=(Vec const& param_0) { } #pragma pop -/* 805BA86C-805BA871 0002E4 0005+00 4/4 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_805BA86C = "B_bq"; -#pragma pop +/* 805BA86C-805BA86C 0002E4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/b/d_a_b_dr/d_a_b_dr.cpp b/rel/d/a/b/d_a_b_dr/d_a_b_dr.cpp index 71b160d3fd3..5931b551e79 100644 --- a/rel/d/a/b/d_a_b_dr/d_a_b_dr.cpp +++ b/rel/d/a/b/d_a_b_dr/d_a_b_dr.cpp @@ -47,16 +47,16 @@ struct mDoExt_baseAnm { /* 8000D428 */ void play(); }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; - struct J3DAnmTransform {}; +struct J3DModelData {}; + +struct Z2Creature {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -75,10 +75,10 @@ struct daPy_py_c { /* 8015F398 */ void checkMasterSwordEquip(); }; -struct J3DJoint {}; - struct J3DModel {}; +struct J3DJoint {}; + struct daB_DR_c { /* 805BAF80 */ void ctrlJoint(J3DJoint*, J3DModel*); /* 805BB120 */ void JointCallBack(J3DJoint*, int); @@ -473,8 +473,8 @@ extern "C" void __dt__12dBgS_AcchCirFv(); extern "C" static void daB_DR_Create__FP8daB_DR_c(); extern "C" void __dt__10cCcD_GSttsFv(); extern "C" void __dt__12daB_DR_HIO_cFv(); -extern "C" void func_805C6BDC(int*); -extern "C" void func_805C6BF8(u8*); +extern "C" void func_805C6BDC(void* _this, int*); +extern "C" void func_805C6BF8(void* _this, u8*); extern "C" void __sinit_d_a_b_dr_cpp(); extern "C" static void func_805C6C50(); extern "C" static void func_805C6C58(); @@ -681,76 +681,76 @@ extern "C" void __register_global_object(); /* ############################################################################################## */ /* 805C6C74-805C6C78 000000 0004+00 33/33 0/0 0/0 .rodata @3800 */ SECTION_RODATA static f32 const lit_3800 = 4.0f / 5.0f; -COMPILER_STRIP_GATE(805C6C74, &lit_3800); +COMPILER_STRIP_GATE(0x805C6C74, &lit_3800); /* 805C6C78-805C6C7C 000004 0004+00 0/6 0/0 0/0 .rodata @3801 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3801 = 2.0f; -COMPILER_STRIP_GATE(805C6C78, &lit_3801); +COMPILER_STRIP_GATE(0x805C6C78, &lit_3801); #pragma pop /* 805C6C7C-805C6C80 000008 0004+00 0/7 0/0 0/0 .rodata @3802 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3802 = 50.0f; -COMPILER_STRIP_GATE(805C6C7C, &lit_3802); +COMPILER_STRIP_GATE(0x805C6C7C, &lit_3802); #pragma pop /* 805C6C80-805C6C84 00000C 0004+00 0/4 0/0 0/0 .rodata @3803 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3803 = 2000.0f; -COMPILER_STRIP_GATE(805C6C80, &lit_3803); +COMPILER_STRIP_GATE(0x805C6C80, &lit_3803); #pragma pop /* 805C6C84-805C6C88 000010 0004+00 0/1 0/0 0/0 .rodata @3804 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3804 = 15.0f; -COMPILER_STRIP_GATE(805C6C84, &lit_3804); +COMPILER_STRIP_GATE(0x805C6C84, &lit_3804); #pragma pop /* 805C6C88-805C6C8C 000014 0004+00 0/2 0/0 0/0 .rodata @3805 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3805 = 25.0f; -COMPILER_STRIP_GATE(805C6C88, &lit_3805); +COMPILER_STRIP_GATE(0x805C6C88, &lit_3805); #pragma pop /* 805C6C8C-805C6C90 000018 0004+00 0/6 0/0 0/0 .rodata @3806 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3806 = 1000.0f; -COMPILER_STRIP_GATE(805C6C8C, &lit_3806); +COMPILER_STRIP_GATE(0x805C6C8C, &lit_3806); #pragma pop /* 805C6C90-805C6C94 00001C 0004+00 0/13 0/0 0/0 .rodata @3807 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3807 = 20.0f; -COMPILER_STRIP_GATE(805C6C90, &lit_3807); +COMPILER_STRIP_GATE(0x805C6C90, &lit_3807); #pragma pop /* 805C6C94-805C6C98 000020 0004+00 0/10 0/0 0/0 .rodata @3808 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3808 = 5.0f; -COMPILER_STRIP_GATE(805C6C94, &lit_3808); +COMPILER_STRIP_GATE(0x805C6C94, &lit_3808); #pragma pop /* 805C6C98-805C6C9C 000024 0004+00 0/12 0/0 0/0 .rodata @3809 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3809 = 10.0f; -COMPILER_STRIP_GATE(805C6C98, &lit_3809); +COMPILER_STRIP_GATE(0x805C6C98, &lit_3809); #pragma pop /* 805C6C9C-805C6CA0 000028 0004+00 0/1 0/0 0/0 .rodata @3810 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3810 = 1800.0f; -COMPILER_STRIP_GATE(805C6C9C, &lit_3810); +COMPILER_STRIP_GATE(0x805C6C9C, &lit_3810); #pragma pop /* 805C7248-805C7254 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ @@ -1241,7 +1241,7 @@ asm void daB_DR_c::JointCallBack(J3DJoint* param_0, int param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4010 = 6000.0f; -COMPILER_STRIP_GATE(805C6CA0, &lit_4010); +COMPILER_STRIP_GATE(0x805C6CA0, &lit_4010); #pragma pop /* 805C6CA4-805C6CA8 000030 0004+00 7/34 0/0 0/0 .rodata @4011 */ @@ -1251,11 +1251,11 @@ SECTION_RODATA static u8 const lit_4011[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(805C6CA4, &lit_4011); +COMPILER_STRIP_GATE(0x805C6CA4, &lit_4011); /* 805C6CA8-805C6CAC 000034 0004+00 2/21 0/0 0/0 .rodata @4012 */ SECTION_RODATA static f32 const lit_4012 = 1.0f; -COMPILER_STRIP_GATE(805C6CA8, &lit_4012); +COMPILER_STRIP_GATE(0x805C6CA8, &lit_4012); /* 805BB16C-805BB3E8 0003EC 027C+00 1/1 0/0 0/0 .text draw__8daB_DR_cFv */ #pragma push @@ -1280,7 +1280,13 @@ static asm void daB_DR_Draw(daB_DR_c* param_0) { /* ############################################################################################## */ /* 805C6CAC-805C6CB0 000038 0004+00 2/4 0/0 0/0 .rodata @4022 */ SECTION_RODATA static f32 const lit_4022 = -1.0f; -COMPILER_STRIP_GATE(805C6CAC, &lit_4022); +COMPILER_STRIP_GATE(0x805C6CAC, &lit_4022); + +/* 805C7240-805C7240 0005CC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_805C7240 = "B_DR"; +#pragma pop /* 805BB408-805BB4B4 000688 00AC+00 11/11 0/0 0/0 .text setBck__8daB_DR_cFiUcff */ #pragma push @@ -1305,7 +1311,7 @@ asm void daB_DR_c::setActionMode(int param_0, int param_1) { /* ############################################################################################## */ /* 805C6CB0-805C6CB4 00003C 0004+00 1/1 0/0 0/0 .rodata @4040 */ SECTION_RODATA static f32 const lit_4040 = -1000.0f; -COMPILER_STRIP_GATE(805C6CB0, &lit_4040); +COMPILER_STRIP_GATE(0x805C6CB0, &lit_4040); /* 805BB4CC-805BB540 00074C 0074+00 1/1 0/0 0/0 .text mGlider_WindPosSet__8daB_DR_cFv */ #pragma push @@ -1322,21 +1328,21 @@ asm void daB_DR_c::mGlider_WindPosSet() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4066 = -500.0f; -COMPILER_STRIP_GATE(805C6CB4, &lit_4066); +COMPILER_STRIP_GATE(0x805C6CB4, &lit_4066); #pragma pop /* 805C6CB8-805C6CBC 000044 0004+00 0/2 0/0 0/0 .rodata @4067 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4067 = 500.0f; -COMPILER_STRIP_GATE(805C6CB8, &lit_4067); +COMPILER_STRIP_GATE(0x805C6CB8, &lit_4067); #pragma pop /* 805C6CBC-805C6CC0 000048 0004+00 0/2 0/0 0/0 .rodata @4068 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4068 = 45.0f; -COMPILER_STRIP_GATE(805C6CBC, &lit_4068); +COMPILER_STRIP_GATE(0x805C6CBC, &lit_4068); #pragma pop /* 805BB540-805BB64C 0007C0 010C+00 2/2 0/0 0/0 .text mBoot_c_tranceSet__8daB_DR_cFb */ @@ -1364,7 +1370,7 @@ asm void daB_DR_c::mStatusONOFF(int param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4310 = 14.0f; -COMPILER_STRIP_GATE(805C6CC0, &lit_4310); +COMPILER_STRIP_GATE(0x805C6CC0, &lit_4310); #pragma pop /* 805BB6E8-805BBFC0 000968 08D8+00 2/1 0/0 0/0 .text setSe__8daB_DR_cFv */ @@ -1392,217 +1398,217 @@ asm void daB_DR_c::setDeathLightEffect() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4311 = 3.0f; -COMPILER_STRIP_GATE(805C6CC4, &lit_4311); +COMPILER_STRIP_GATE(0x805C6CC4, &lit_4311); #pragma pop /* 805C6CC8-805C6CCC 000054 0004+00 0/0 0/0 0/0 .rodata @4312 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4312 = 18.0f; -COMPILER_STRIP_GATE(805C6CC8, &lit_4312); +COMPILER_STRIP_GATE(0x805C6CC8, &lit_4312); #pragma pop /* 805C6CCC-805C6CD0 000058 0004+00 0/2 0/0 0/0 .rodata @4313 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4313 = 30.0f; -COMPILER_STRIP_GATE(805C6CCC, &lit_4313); +COMPILER_STRIP_GATE(0x805C6CCC, &lit_4313); #pragma pop /* 805C6CD0-805C6CD4 00005C 0004+00 0/0 0/0 0/0 .rodata @4314 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4314 = 9.0f; -COMPILER_STRIP_GATE(805C6CD0, &lit_4314); +COMPILER_STRIP_GATE(0x805C6CD0, &lit_4314); #pragma pop /* 805C6CD4-805C6CD8 000060 0004+00 0/0 0/0 0/0 .rodata @4315 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4315 = 76.0f; -COMPILER_STRIP_GATE(805C6CD4, &lit_4315); +COMPILER_STRIP_GATE(0x805C6CD4, &lit_4315); #pragma pop /* 805C6CD8-805C6CDC 000064 0004+00 0/0 0/0 0/0 .rodata @4316 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4316 = 42.0f; -COMPILER_STRIP_GATE(805C6CD8, &lit_4316); +COMPILER_STRIP_GATE(0x805C6CD8, &lit_4316); #pragma pop /* 805C6CDC-805C6CE0 000068 0004+00 0/0 0/0 0/0 .rodata @4317 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4317 = 12.0f; -COMPILER_STRIP_GATE(805C6CDC, &lit_4317); +COMPILER_STRIP_GATE(0x805C6CDC, &lit_4317); #pragma pop /* 805C6CE0-805C6CE4 00006C 0004+00 0/0 0/0 0/0 .rodata @4318 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4318 = 55.0f; -COMPILER_STRIP_GATE(805C6CE0, &lit_4318); +COMPILER_STRIP_GATE(0x805C6CE0, &lit_4318); #pragma pop /* 805C6CE4-805C6CE8 000070 0004+00 0/0 0/0 0/0 .rodata @4319 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4319 = 103.0f; -COMPILER_STRIP_GATE(805C6CE4, &lit_4319); +COMPILER_STRIP_GATE(0x805C6CE4, &lit_4319); #pragma pop /* 805C6CE8-805C6CEC 000074 0004+00 0/0 0/0 0/0 .rodata @4320 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4320 = 143.0f; -COMPILER_STRIP_GATE(805C6CE8, &lit_4320); +COMPILER_STRIP_GATE(0x805C6CE8, &lit_4320); #pragma pop /* 805C6CEC-805C6CF0 000078 0004+00 0/1 0/0 0/0 .rodata @4321 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4321 = 7.0f; -COMPILER_STRIP_GATE(805C6CEC, &lit_4321); +COMPILER_STRIP_GATE(0x805C6CEC, &lit_4321); #pragma pop /* 805C6CF0-805C6CF4 00007C 0004+00 0/5 0/0 0/0 .rodata @4322 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4322 = 40.0f; -COMPILER_STRIP_GATE(805C6CF0, &lit_4322); +COMPILER_STRIP_GATE(0x805C6CF0, &lit_4322); #pragma pop /* 805C6CF4-805C6CF8 000080 0004+00 0/1 0/0 0/0 .rodata @4323 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4323 = 75.0f; -COMPILER_STRIP_GATE(805C6CF4, &lit_4323); +COMPILER_STRIP_GATE(0x805C6CF4, &lit_4323); #pragma pop /* 805C6CF8-805C6CFC 000084 0004+00 0/0 0/0 0/0 .rodata @4324 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4324 = 177.0f; -COMPILER_STRIP_GATE(805C6CF8, &lit_4324); +COMPILER_STRIP_GATE(0x805C6CF8, &lit_4324); #pragma pop /* 805C6CFC-805C6D00 000088 0004+00 0/0 0/0 0/0 .rodata @4325 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4325 = 210.0f; -COMPILER_STRIP_GATE(805C6CFC, &lit_4325); +COMPILER_STRIP_GATE(0x805C6CFC, &lit_4325); #pragma pop /* 805C6D00-805C6D04 00008C 0004+00 0/0 0/0 0/0 .rodata @4326 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4326 = 243.0f; -COMPILER_STRIP_GATE(805C6D00, &lit_4326); +COMPILER_STRIP_GATE(0x805C6D00, &lit_4326); #pragma pop /* 805C6D04-805C6D08 000090 0004+00 0/0 0/0 0/0 .rodata @4327 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4327 = 270.0f; -COMPILER_STRIP_GATE(805C6D04, &lit_4327); +COMPILER_STRIP_GATE(0x805C6D04, &lit_4327); #pragma pop /* 805C6D08-805C6D0C 000094 0004+00 0/0 0/0 0/0 .rodata @4328 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4328 = 309.0f; -COMPILER_STRIP_GATE(805C6D08, &lit_4328); +COMPILER_STRIP_GATE(0x805C6D08, &lit_4328); #pragma pop /* 805C6D0C-805C6D10 000098 0004+00 0/0 0/0 0/0 .rodata @4329 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4329 = 53.0f; -COMPILER_STRIP_GATE(805C6D0C, &lit_4329); +COMPILER_STRIP_GATE(0x805C6D0C, &lit_4329); #pragma pop /* 805C6D10-805C6D14 00009C 0004+00 0/0 0/0 0/0 .rodata @4330 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4330 = 95.0f; -COMPILER_STRIP_GATE(805C6D10, &lit_4330); +COMPILER_STRIP_GATE(0x805C6D10, &lit_4330); #pragma pop /* 805C6D14-805C6D18 0000A0 0004+00 0/0 0/0 0/0 .rodata @4331 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4331 = 115.0f; -COMPILER_STRIP_GATE(805C6D14, &lit_4331); +COMPILER_STRIP_GATE(0x805C6D14, &lit_4331); #pragma pop /* 805C6D18-805C6D1C 0000A4 0004+00 0/0 0/0 0/0 .rodata @4332 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4332 = 72.0f; -COMPILER_STRIP_GATE(805C6D18, &lit_4332); +COMPILER_STRIP_GATE(0x805C6D18, &lit_4332); #pragma pop /* 805C6D1C-805C6D20 0000A8 0004+00 0/0 0/0 0/0 .rodata @4333 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4333 = 88.0f; -COMPILER_STRIP_GATE(805C6D1C, &lit_4333); +COMPILER_STRIP_GATE(0x805C6D1C, &lit_4333); #pragma pop /* 805C6D20-805C6D24 0000AC 0004+00 0/0 0/0 0/0 .rodata @4334 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4334 = 107.0f; -COMPILER_STRIP_GATE(805C6D20, &lit_4334); +COMPILER_STRIP_GATE(0x805C6D20, &lit_4334); #pragma pop /* 805C6D24-805C6D28 0000B0 0004+00 0/0 0/0 0/0 .rodata @4335 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4335 = 17.0f; -COMPILER_STRIP_GATE(805C6D24, &lit_4335); +COMPILER_STRIP_GATE(0x805C6D24, &lit_4335); #pragma pop /* 805C6D28-805C6D2C 0000B4 0004+00 0/0 0/0 0/0 .rodata @4336 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4336 = 6.0f; -COMPILER_STRIP_GATE(805C6D28, &lit_4336); +COMPILER_STRIP_GATE(0x805C6D28, &lit_4336); #pragma pop /* 805C6D2C-805C6D30 0000B8 0004+00 0/0 0/0 0/0 .rodata @4337 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4337 = 36.0f; -COMPILER_STRIP_GATE(805C6D2C, &lit_4337); +COMPILER_STRIP_GATE(0x805C6D2C, &lit_4337); #pragma pop /* 805C6D30-805C6D34 0000BC 0004+00 0/1 0/0 0/0 .rodata @4338 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4338 = 8.0f; -COMPILER_STRIP_GATE(805C6D30, &lit_4338); +COMPILER_STRIP_GATE(0x805C6D30, &lit_4338); #pragma pop /* 805C6D34-805C6D38 0000C0 0004+00 0/0 0/0 0/0 .rodata @4339 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4339 = 21.0f; -COMPILER_STRIP_GATE(805C6D34, &lit_4339); +COMPILER_STRIP_GATE(0x805C6D34, &lit_4339); #pragma pop /* 805C6D38-805C6D3C 0000C4 0004+00 0/0 0/0 0/0 .rodata @4340 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4340 = 26.0f; -COMPILER_STRIP_GATE(805C6D38, &lit_4340); +COMPILER_STRIP_GATE(0x805C6D38, &lit_4340); #pragma pop /* 805C6D3C-805C6D40 0000C8 0004+00 0/0 0/0 0/0 .rodata @4341 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4341 = 31.0f; -COMPILER_STRIP_GATE(805C6D3C, &lit_4341); +COMPILER_STRIP_GATE(0x805C6D3C, &lit_4341); #pragma pop /* 805C6D40-805C6FCC 0000CC 0288+04 1/1 0/0 0/0 .rodata BREAK_PARTS_DT$4370 */ @@ -2261,7 +2267,7 @@ SECTION_RODATA static u8 const BREAK_PARTS_DT[648 + 4 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(805C6D40, &BREAK_PARTS_DT); +COMPILER_STRIP_GATE(0x805C6D40, &BREAK_PARTS_DT); /* 805BC0B8-805BC248 001338 0190+00 3/3 0/0 0/0 .text chkPartCreate__8daB_DR_cFb */ #pragma push @@ -2280,7 +2286,7 @@ asm void daB_DR_c::chkPartCreate(bool param_0) { SECTION_RODATA static u8 const lit_4530[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(805C6FCC, &lit_4530); +COMPILER_STRIP_GATE(0x805C6FCC, &lit_4530); #pragma pop /* 805C78C0-805C78C4 000008 0001+03 1/1 0/0 0/0 .bss @1109 */ @@ -2476,40 +2482,40 @@ asm void daB_DR_c::mHeadAngleSet() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4617 = 34.0f; -COMPILER_STRIP_GATE(805C6FD4, &lit_4617); +COMPILER_STRIP_GATE(0x805C6FD4, &lit_4617); #pragma pop /* 805C6FD8-805C6FDC 000364 0004+00 0/2 0/0 0/0 .rodata @4794 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4794 = 4000.0f; -COMPILER_STRIP_GATE(805C6FD8, &lit_4794); +COMPILER_STRIP_GATE(0x805C6FD8, &lit_4794); #pragma pop /* 805C6FDC-805C6FE0 000368 0004+00 0/7 0/0 0/0 .rodata @4795 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4795 = -1000000000.0f; -COMPILER_STRIP_GATE(805C6FDC, &lit_4795); +COMPILER_STRIP_GATE(0x805C6FDC, &lit_4795); #pragma pop /* 805C6FE0-805C6FE4 00036C 0004+00 0/6 0/0 0/0 .rodata @4796 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4796 = 300.0f; -COMPILER_STRIP_GATE(805C6FE0, &lit_4796); +COMPILER_STRIP_GATE(0x805C6FE0, &lit_4796); #pragma pop /* 805C6FE4-805C6FE8 000370 0004+00 0/3 0/0 0/0 .rodata @4797 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4797 = 4.0f; -COMPILER_STRIP_GATE(805C6FE4, &lit_4797); +COMPILER_STRIP_GATE(0x805C6FE4, &lit_4797); #pragma pop /* 805C6FE8-805C6FEC 000374 0004+00 1/12 0/0 0/0 .rodata @4798 */ SECTION_RODATA static f32 const lit_4798 = 100.0f; -COMPILER_STRIP_GATE(805C6FE8, &lit_4798); +COMPILER_STRIP_GATE(0x805C6FE8, &lit_4798); /* 805BCD7C-805BCEA4 001FFC 0128+00 2/2 0/0 0/0 .text flapMove__8daB_DR_cFb */ #pragma push @@ -2526,14 +2532,14 @@ asm void daB_DR_c::flapMove(bool param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4847 = 7.0f / 10.0f; -COMPILER_STRIP_GATE(805C6FEC, &lit_4847); +COMPILER_STRIP_GATE(0x805C6FEC, &lit_4847); #pragma pop /* 805C6FF0-805C6FF4 00037C 0004+00 0/3 0/0 0/0 .rodata @4848 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4848 = 1500.0f; -COMPILER_STRIP_GATE(805C6FF0, &lit_4848); +COMPILER_STRIP_GATE(0x805C6FF0, &lit_4848); #pragma pop /* 805BCEA4-805BD05C 002124 01B8+00 3/3 0/0 0/0 .text revolutionMove__8daB_DR_cFv */ @@ -2561,7 +2567,7 @@ asm void daB_DR_c::mPlayerHighCheck() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4946 = 80.0f; -COMPILER_STRIP_GATE(805C6FF4, &lit_4946); +COMPILER_STRIP_GATE(0x805C6FF4, &lit_4946); #pragma pop /* 805BD15C-805BD3E4 0023DC 0288+00 3/3 0/0 0/0 .text mBgFallGroundCheck__8daB_DR_cFv */ @@ -2579,21 +2585,21 @@ asm void daB_DR_c::mBgFallGroundCheck() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5001 = 400.0f; -COMPILER_STRIP_GATE(805C6FF8, &lit_5001); +COMPILER_STRIP_GATE(0x805C6FF8, &lit_5001); #pragma pop /* 805C6FFC-805C7000 000388 0004+00 0/1 0/0 0/0 .rodata @5002 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5002 = 2.0f / 5.0f; -COMPILER_STRIP_GATE(805C6FFC, &lit_5002); +COMPILER_STRIP_GATE(0x805C6FFC, &lit_5002); #pragma pop /* 805C7000-805C7004 00038C 0004+00 0/1 0/0 0/0 .rodata @5003 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5003 = 3.0f / 10.0f; -COMPILER_STRIP_GATE(805C7000, &lit_5003); +COMPILER_STRIP_GATE(0x805C7000, &lit_5003); #pragma pop /* 805C7004-805C700C 000390 0004+04 0/1 0/0 0/0 .rodata @5004 */ @@ -2604,7 +2610,7 @@ SECTION_RODATA static f32 const lit_5004[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(805C7004, &lit_5004); +COMPILER_STRIP_GATE(0x805C7004, &lit_5004); #pragma pop /* 805C700C-805C7014 000398 0008+00 0/9 0/0 0/0 .rodata @5005 */ @@ -2613,7 +2619,7 @@ COMPILER_STRIP_GATE(805C7004, &lit_5004); SECTION_RODATA static u8 const lit_5005[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(805C700C, &lit_5005); +COMPILER_STRIP_GATE(0x805C700C, &lit_5005); #pragma pop /* 805C7014-805C701C 0003A0 0008+00 0/9 0/0 0/0 .rodata @5006 */ @@ -2622,7 +2628,7 @@ COMPILER_STRIP_GATE(805C700C, &lit_5005); SECTION_RODATA static u8 const lit_5006[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(805C7014, &lit_5006); +COMPILER_STRIP_GATE(0x805C7014, &lit_5006); #pragma pop /* 805C701C-805C7024 0003A8 0008+00 0/9 0/0 0/0 .rodata @5007 */ @@ -2631,21 +2637,21 @@ COMPILER_STRIP_GATE(805C7014, &lit_5006); SECTION_RODATA static u8 const lit_5007[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(805C701C, &lit_5007); +COMPILER_STRIP_GATE(0x805C701C, &lit_5007); #pragma pop /* 805C7024-805C7028 0003B0 0004+00 0/2 0/0 0/0 .rodata @5008 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5008 = 4096.0f; -COMPILER_STRIP_GATE(805C7024, &lit_5008); +COMPILER_STRIP_GATE(0x805C7024, &lit_5008); #pragma pop /* 805C7028-805C702C 0003B4 0004+00 0/3 0/0 0/0 .rodata @5009 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5009 = 2048.0f; -COMPILER_STRIP_GATE(805C7028, &lit_5009); +COMPILER_STRIP_GATE(0x805C7028, &lit_5009); #pragma pop /* 805BD3E4-805BD5FC 002664 0218+00 3/3 0/0 0/0 .text normalHoverMove__8daB_DR_cFv */ @@ -2683,42 +2689,42 @@ asm void daB_DR_c::executeFlyWait() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5482 = 28.0f; -COMPILER_STRIP_GATE(805C702C, &lit_5482); +COMPILER_STRIP_GATE(0x805C702C, &lit_5482); #pragma pop /* 805C7030-805C7034 0003BC 0004+00 0/2 0/0 0/0 .rodata @5483 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5483 = 150.0f; -COMPILER_STRIP_GATE(805C7030, &lit_5483); +COMPILER_STRIP_GATE(0x805C7030, &lit_5483); #pragma pop /* 805C7034-805C7038 0003C0 0004+00 0/2 0/0 0/0 .rodata @5484 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5484 = 27.0f; -COMPILER_STRIP_GATE(805C7034, &lit_5484); +COMPILER_STRIP_GATE(0x805C7034, &lit_5484); #pragma pop /* 805C7038-805C703C 0003C4 0004+00 0/2 0/0 0/0 .rodata @5485 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5485 = 1200.0f; -COMPILER_STRIP_GATE(805C7038, &lit_5485); +COMPILER_STRIP_GATE(0x805C7038, &lit_5485); #pragma pop /* 805C703C-805C7040 0003C8 0004+00 0/2 0/0 0/0 .rodata @5486 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5486 = -1500.0f; -COMPILER_STRIP_GATE(805C703C, &lit_5486); +COMPILER_STRIP_GATE(0x805C703C, &lit_5486); #pragma pop /* 805C7040-805C7044 0003CC 0004+00 0/3 0/0 0/0 .rodata @5487 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5487 = 200.0f; -COMPILER_STRIP_GATE(805C7040, &lit_5487); +COMPILER_STRIP_GATE(0x805C7040, &lit_5487); #pragma pop /* 805BDBC4-805BE9B4 002E44 0DF0+00 1/1 0/0 0/0 .text executeTailHit__8daB_DR_cFv */ @@ -2736,14 +2742,14 @@ asm void daB_DR_c::executeTailHit() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5775 = 870.0f; -COMPILER_STRIP_GATE(805C7044, &lit_5775); +COMPILER_STRIP_GATE(0x805C7044, &lit_5775); #pragma pop /* 805C7048-805C704C 0003D4 0004+00 0/1 0/0 0/0 .rodata @5776 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5776 = -13.0f; -COMPILER_STRIP_GATE(805C7048, &lit_5776); +COMPILER_STRIP_GATE(0x805C7048, &lit_5776); #pragma pop /* 805BE9B4-805BF4C8 003C34 0B14+00 1/1 0/0 0/0 .text executeWeekHit__8daB_DR_cFv */ @@ -2761,7 +2767,7 @@ asm void daB_DR_c::executeWeekHit() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5866 = 2200.0f; -COMPILER_STRIP_GATE(805C704C, &lit_5866); +COMPILER_STRIP_GATE(0x805C704C, &lit_5866); #pragma pop /* 805C7974-805C7978 0000BC 0004+00 2/2 0/0 0/0 .bss None */ @@ -2802,7 +2808,7 @@ asm void daB_DR_c::mFeintBreath() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6185 = 0.5f; -COMPILER_STRIP_GATE(805C7050, &lit_6185); +COMPILER_STRIP_GATE(0x805C7050, &lit_6185); #pragma pop /* 805BFD88-805C062C 005008 08A4+00 1/1 0/0 0/0 .text executeBreathAttack__8daB_DR_cFv */ @@ -2820,21 +2826,21 @@ asm void daB_DR_c::executeBreathAttack() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6349 = 3000.0f; -COMPILER_STRIP_GATE(805C7054, &lit_6349); +COMPILER_STRIP_GATE(0x805C7054, &lit_6349); #pragma pop /* 805C7058-805C705C 0003E4 0004+00 0/1 0/0 0/0 .rodata @6350 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6350 = -3000.0f; -COMPILER_STRIP_GATE(805C7058, &lit_6350); +COMPILER_STRIP_GATE(0x805C7058, &lit_6350); #pragma pop /* 805C705C-805C7060 0003E8 0004+00 0/1 0/0 0/0 .rodata @6351 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6351 = 1.25f; -COMPILER_STRIP_GATE(805C705C, &lit_6351); +COMPILER_STRIP_GATE(0x805C705C, &lit_6351); #pragma pop /* 805C062C-805C0CAC 0058AC 0680+00 1/1 0/0 0/0 .text executeWindAttack__8daB_DR_cFv */ @@ -2852,7 +2858,7 @@ asm void daB_DR_c::executeWindAttack() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6412 = 1300.0f; -COMPILER_STRIP_GATE(805C7060, &lit_6412); +COMPILER_STRIP_GATE(0x805C7060, &lit_6412); #pragma pop /* 805C0CAC-805C0EF8 005F2C 024C+00 1/1 0/0 0/0 .text mGliderMoveSub__8daB_DR_cFf */ @@ -2870,21 +2876,21 @@ asm void daB_DR_c::mGliderMoveSub(f32 param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6767 = 14000.0f; -COMPILER_STRIP_GATE(805C7064, &lit_6767); +COMPILER_STRIP_GATE(0x805C7064, &lit_6767); #pragma pop /* 805C7068-805C706C 0003F4 0004+00 0/1 0/0 0/0 .rodata @6768 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6768 = 9000.0f; -COMPILER_STRIP_GATE(805C7068, &lit_6768); +COMPILER_STRIP_GATE(0x805C7068, &lit_6768); #pragma pop /* 805C706C-805C7070 0003F8 0004+00 0/2 0/0 0/0 .rodata @6769 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6769 = 350.0f; -COMPILER_STRIP_GATE(805C706C, &lit_6769); +COMPILER_STRIP_GATE(0x805C706C, &lit_6769); #pragma pop /* 805C0EF8-805C1E0C 006178 0F14+00 2/1 0/0 0/0 .text executeGliderAttack__8daB_DR_cFv */ @@ -2902,70 +2908,70 @@ asm void daB_DR_c::executeGliderAttack() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6770 = 8000.0f; -COMPILER_STRIP_GATE(805C7070, &lit_6770); +COMPILER_STRIP_GATE(0x805C7070, &lit_6770); #pragma pop /* 805C7074-805C7078 000400 0004+00 0/1 0/0 0/0 .rodata @6771 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6771 = 5000.0f; -COMPILER_STRIP_GATE(805C7074, &lit_6771); +COMPILER_STRIP_GATE(0x805C7074, &lit_6771); #pragma pop /* 805C7078-805C707C 000404 0004+00 0/0 0/0 0/0 .rodata @6772 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6772 = -4000.0f; -COMPILER_STRIP_GATE(805C7078, &lit_6772); +COMPILER_STRIP_GATE(0x805C7078, &lit_6772); #pragma pop /* 805C707C-805C7080 000408 0004+00 0/0 0/0 0/0 .rodata @6773 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6773 = 1.0f / 40.0f; -COMPILER_STRIP_GATE(805C707C, &lit_6773); +COMPILER_STRIP_GATE(0x805C707C, &lit_6773); #pragma pop /* 805C7080-805C7084 00040C 0004+00 0/0 0/0 0/0 .rodata @6774 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6774 = 90.0f; -COMPILER_STRIP_GATE(805C7080, &lit_6774); +COMPILER_STRIP_GATE(0x805C7080, &lit_6774); #pragma pop /* 805C7084-805C7088 000410 0004+00 0/0 0/0 0/0 .rodata @6775 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6775 = 120.0f; -COMPILER_STRIP_GATE(805C7084, &lit_6775); +COMPILER_STRIP_GATE(0x805C7084, &lit_6775); #pragma pop /* 805C7088-805C708C 000414 0004+00 0/2 0/0 0/0 .rodata @6927 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6927 = 3100.0f; -COMPILER_STRIP_GATE(805C7088, &lit_6927); +COMPILER_STRIP_GATE(0x805C7088, &lit_6927); #pragma pop /* 805C708C-805C7090 000418 0004+00 0/1 0/0 0/0 .rodata @6928 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6928 = 5500.0f; -COMPILER_STRIP_GATE(805C708C, &lit_6928); +COMPILER_STRIP_GATE(0x805C708C, &lit_6928); #pragma pop /* 805C7090-805C7094 00041C 0004+00 0/1 0/0 0/0 .rodata @6929 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6929 = -3100.0f; -COMPILER_STRIP_GATE(805C7090, &lit_6929); +COMPILER_STRIP_GATE(0x805C7090, &lit_6929); #pragma pop /* 805C7094-805C7098 000420 0004+00 0/1 0/0 0/0 .rodata @6930 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6930 = 22.0f; -COMPILER_STRIP_GATE(805C7094, &lit_6930); +COMPILER_STRIP_GATE(0x805C7094, &lit_6930); #pragma pop /* 805C7978-805C7988 0000C0 000C+04 0/1 0/0 0/0 .bss @6782 */ @@ -3013,21 +3019,21 @@ asm void daB_DR_c::executePillarSearch() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7083 = 4500.0f; -COMPILER_STRIP_GATE(805C7098, &lit_7083); +COMPILER_STRIP_GATE(0x805C7098, &lit_7083); #pragma pop /* 805C709C-805C70A0 000428 0004+00 0/1 0/0 0/0 .rodata @7084 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7084 = 6150.0f; -COMPILER_STRIP_GATE(805C709C, &lit_7084); +COMPILER_STRIP_GATE(0x805C709C, &lit_7084); #pragma pop /* 805C70A0-805C70A4 00042C 0004+00 0/2 0/0 0/0 .rodata @7085 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7085 = -200.0f; -COMPILER_STRIP_GATE(805C70A0, &lit_7085); +COMPILER_STRIP_GATE(0x805C70A0, &lit_7085); #pragma pop /* 805C24BC-805C2BE8 00773C 072C+00 1/1 0/0 0/0 .text executePillarWait__8daB_DR_cFv */ @@ -3085,42 +3091,42 @@ asm void daB_DR_c::executeDead() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7382 = -1400.0f; -COMPILER_STRIP_GATE(805C70A4, &lit_7382); +COMPILER_STRIP_GATE(0x805C70A4, &lit_7382); #pragma pop /* 805C70A8-805C70AC 000434 0004+00 0/0 0/0 0/0 .rodata @7383 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7383 = 1100.0f; -COMPILER_STRIP_GATE(805C70A8, &lit_7383); +COMPILER_STRIP_GATE(0x805C70A8, &lit_7383); #pragma pop /* 805C70AC-805C70B0 000438 0004+00 0/0 0/0 0/0 .rodata @7384 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7384 = -850.0f; -COMPILER_STRIP_GATE(805C70AC, &lit_7384); +COMPILER_STRIP_GATE(0x805C70AC, &lit_7384); #pragma pop /* 805C70B0-805C70B4 00043C 0004+00 0/0 0/0 0/0 .rodata @7385 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7385 = 700.0f; -COMPILER_STRIP_GATE(805C70B0, &lit_7385); +COMPILER_STRIP_GATE(0x805C70B0, &lit_7385); #pragma pop /* 805C70B4-805C70B8 000440 0004+00 0/0 0/0 0/0 .rodata @7386 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7386 = -1200.0f; -COMPILER_STRIP_GATE(805C70B4, &lit_7386); +COMPILER_STRIP_GATE(0x805C70B4, &lit_7386); #pragma pop /* 805C70B8-805C70BC 000444 0004+00 0/1 0/0 0/0 .rodata @7511 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_7511 = 0x3B03126F; -COMPILER_STRIP_GATE(805C70B8, &lit_7511); +COMPILER_STRIP_GATE(0x805C70B8, &lit_7511); #pragma pop /* 805C382C-805C39D8 008AAC 01AC+00 1/1 0/0 0/0 .text executeBullet__8daB_DR_cFv */ @@ -3138,14 +3144,14 @@ asm void daB_DR_c::executeBullet() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7555 = 65536.0f; -COMPILER_STRIP_GATE(805C70BC, &lit_7555); +COMPILER_STRIP_GATE(0x805C70BC, &lit_7555); #pragma pop /* 805C70C0-805C70C4 00044C 0004+00 0/2 0/0 0/0 .rodata @7556 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7556 = -3.0f; -COMPILER_STRIP_GATE(805C70C0, &lit_7556); +COMPILER_STRIP_GATE(0x805C70C0, &lit_7556); #pragma pop /* 805C39D8-805C3CB0 008C58 02D8+00 2/1 0/0 0/0 .text executeParts__8daB_DR_cFv */ @@ -3193,35 +3199,35 @@ asm void daB_DR_c::action_parts() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7557 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(805C70C4, &lit_7557); +COMPILER_STRIP_GATE(0x805C70C4, &lit_7557); #pragma pop /* 805C70C8-805C70CC 000454 0004+00 0/0 0/0 0/0 .rodata @7558 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7558 = 16384.0f; -COMPILER_STRIP_GATE(805C70C8, &lit_7558); +COMPILER_STRIP_GATE(0x805C70C8, &lit_7558); #pragma pop /* 805C70CC-805C70D0 000458 0004+00 0/1 0/0 0/0 .rodata @7824 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7824 = 5250.0f; -COMPILER_STRIP_GATE(805C70CC, &lit_7824); +COMPILER_STRIP_GATE(0x805C70CC, &lit_7824); #pragma pop /* 805C70D0-805C70D4 00045C 0004+00 0/1 0/0 0/0 .rodata @7825 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7825 = 35.0f; -COMPILER_STRIP_GATE(805C70D0, &lit_7825); +COMPILER_STRIP_GATE(0x805C70D0, &lit_7825); #pragma pop /* 805C70D4-805C70D8 000460 0004+00 0/1 0/0 0/0 .rodata @7826 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7826 = 370.0f; -COMPILER_STRIP_GATE(805C70D4, &lit_7826); +COMPILER_STRIP_GATE(0x805C70D4, &lit_7826); #pragma pop /* 805C41A4-805C4684 009424 04E0+00 2/2 0/0 0/0 .text mtx_set__8daB_DR_cFv */ @@ -3249,56 +3255,56 @@ asm void daB_DR_c::parts_mtx_set() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8050 = 250.0f; -COMPILER_STRIP_GATE(805C70D8, &lit_8050); +COMPILER_STRIP_GATE(0x805C70D8, &lit_8050); #pragma pop /* 805C70DC-805C70E0 000468 0004+00 0/1 0/0 0/0 .rodata @8051 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8051 = 600.0f; -COMPILER_STRIP_GATE(805C70DC, &lit_8051); +COMPILER_STRIP_GATE(0x805C70DC, &lit_8051); #pragma pop /* 805C70E0-805C70E4 00046C 0004+00 0/1 0/0 0/0 .rodata @8052 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8052 = 3.0f / 5.0f; -COMPILER_STRIP_GATE(805C70E0, &lit_8052); +COMPILER_STRIP_GATE(0x805C70E0, &lit_8052); #pragma pop /* 805C70E4-805C70E8 000470 0004+00 0/1 0/0 0/0 .rodata @8053 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8053 = 1.0f / 20.0f; -COMPILER_STRIP_GATE(805C70E4, &lit_8053); +COMPILER_STRIP_GATE(0x805C70E4, &lit_8053); #pragma pop /* 805C70E8-805C70EC 000474 0004+00 0/1 0/0 0/0 .rodata @8054 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_8054 = 0x3B449BA6; -COMPILER_STRIP_GATE(805C70E8, &lit_8054); +COMPILER_STRIP_GATE(0x805C70E8, &lit_8054); #pragma pop /* 805C70EC-805C70F0 000478 0004+00 0/1 0/0 0/0 .rodata @8055 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_8055 = 0x3727C5AC; -COMPILER_STRIP_GATE(805C70EC, &lit_8055); +COMPILER_STRIP_GATE(0x805C70EC, &lit_8055); #pragma pop /* 805C70F0-805C70F4 00047C 0004+00 0/1 0/0 0/0 .rodata @8056 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8056 = 9.0f / 10.0f; -COMPILER_STRIP_GATE(805C70F0, &lit_8056); +COMPILER_STRIP_GATE(0x805C70F0, &lit_8056); #pragma pop /* 805C70F4-805C70F8 000480 0004+00 0/1 0/0 0/0 .rodata @8057 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_8057 = 0x3A83126F; -COMPILER_STRIP_GATE(805C70F4, &lit_8057); +COMPILER_STRIP_GATE(0x805C70F4, &lit_8057); #pragma pop /* 805C46E0-805C4E14 009960 0734+00 1/1 0/0 0/0 .text cc_set__8daB_DR_cFv */ @@ -3323,7 +3329,7 @@ SECTION_RODATA static u8 const DOWN_CYL_DT[120] = { 0x00, 0x00, 0x43, 0x96, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC3, 0x48, 0x00, 0x00, 0x43, 0x48, 0x00, 0x00, 0x43, 0xAF, 0x00, 0x00, }; -COMPILER_STRIP_GATE(805C70F8, &DOWN_CYL_DT); +COMPILER_STRIP_GATE(0x805C70F8, &DOWN_CYL_DT); /* 805C7170-805C7224 0004FC 00B4+00 1/1 0/0 0/0 .rodata DOWN_SPH_DT$8062 */ SECTION_RODATA static u8 const DOWN_SPH_DT[180] = { @@ -3340,7 +3346,7 @@ SECTION_RODATA static u8 const DOWN_SPH_DT[180] = { 0x00, 0x00, 0xC2, 0x48, 0x00, 0x00, 0x43, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x25, 0x43, 0x34, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC2, 0x48, 0x00, 0x00, 0x43, 0x02, 0x00, 0x00, }; -COMPILER_STRIP_GATE(805C7170, &DOWN_SPH_DT); +COMPILER_STRIP_GATE(0x805C7170, &DOWN_SPH_DT); /* 805C4E14-805C4FB4 00A094 01A0+00 1/1 0/0 0/0 .text down_cc_set__8daB_DR_cFv */ #pragma push @@ -3377,7 +3383,7 @@ asm void daB_DR_c::DemoSkipCallBack(void* param_0, int param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8254 = 111.0f; -COMPILER_STRIP_GATE(805C7224, &lit_8254); +COMPILER_STRIP_GATE(0x805C7224, &lit_8254); #pragma pop /* 805C50F0-805C5588 00A370 0498+00 1/1 0/0 0/0 .text execute__8daB_DR_cFv */ @@ -3460,42 +3466,42 @@ static asm void useHeapInit(fopAc_ac_c* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8659 = -325.0f; -COMPILER_STRIP_GATE(805C7228, &lit_8659); +COMPILER_STRIP_GATE(0x805C7228, &lit_8659); #pragma pop /* 805C722C-805C7230 0005B8 0004+00 0/1 0/0 0/0 .rodata @8660 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8660 = 215.0f; -COMPILER_STRIP_GATE(805C722C, &lit_8660); +COMPILER_STRIP_GATE(0x805C722C, &lit_8660); #pragma pop /* 805C7230-805C7234 0005BC 0004+00 0/1 0/0 0/0 .rodata @8661 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8661 = 224.0f; -COMPILER_STRIP_GATE(805C7230, &lit_8661); +COMPILER_STRIP_GATE(0x805C7230, &lit_8661); #pragma pop /* 805C7234-805C7238 0005C0 0004+00 0/1 0/0 0/0 .rodata @8662 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8662 = 762.0f; -COMPILER_STRIP_GATE(805C7234, &lit_8662); +COMPILER_STRIP_GATE(0x805C7234, &lit_8662); #pragma pop /* 805C7238-805C723C 0005C4 0004+00 0/1 0/0 0/0 .rodata @8663 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8663 = -20000.0f; -COMPILER_STRIP_GATE(805C7238, &lit_8663); +COMPILER_STRIP_GATE(0x805C7238, &lit_8663); #pragma pop /* 805C723C-805C7240 0005C8 0004+00 0/1 0/0 0/0 .rodata @8664 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8664 = 20000.0f; -COMPILER_STRIP_GATE(805C723C, &lit_8664); +COMPILER_STRIP_GATE(0x805C723C, &lit_8664); #pragma pop /* 805C5974-805C62B0 00ABF4 093C+00 1/1 0/0 0/0 .text create__8daB_DR_cFv */ @@ -3652,7 +3658,7 @@ asm daB_DR_HIO_c::~daB_DR_HIO_c() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_805C6BDC(int* param_0) { +extern "C" asm void func_805C6BDC(void* _this, int* param_0) { nofralloc #include "asm/rel/d/a/b/d_a_b_dr/d_a_b_dr/func_805C6BDC.s" } @@ -3662,7 +3668,7 @@ extern "C" asm void func_805C6BDC(int* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_805C6BF8(u8* param_0) { +extern "C" asm void func_805C6BF8(void* _this, u8* param_0) { nofralloc #include "asm/rel/d/a/b/d_a_b_dr/d_a_b_dr/func_805C6BF8.s" } @@ -3680,7 +3686,7 @@ asm void __sinit_d_a_b_dr_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_805C6C14 = (void*)__sinit_d_a_b_dr_cpp; +REGISTER_CTORS(0x805C6C14, __sinit_d_a_b_dr_cpp); #pragma pop /* 805C6C50-805C6C58 00BED0 0008+00 1/0 0/0 0/0 .text @36@__dt__12dBgS_ObjAcchFv */ @@ -3875,9 +3881,4 @@ static u8 data_805C7A38[4]; static u8 data_805C7A3C[4]; #pragma pop -/* 805C7240-805C7245 0005CC 0005+00 4/4 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_805C7240 = "B_DR"; -#pragma pop +/* 805C7240-805C7240 0005CC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/b/d_a_b_dre/d_a_b_dre.cpp b/rel/d/a/b/d_a_b_dre/d_a_b_dre.cpp index 3ecfb8311c5..8745e051312 100644 --- a/rel/d/a/b/d_a_b_dre/d_a_b_dre.cpp +++ b/rel/d/a/b/d_a_b_dre/d_a_b_dre.cpp @@ -50,16 +50,16 @@ struct mDoExt_baseAnm { /* 8000D428 */ void play(); }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; - struct J3DAnmTransform {}; +struct J3DModelData {}; + +struct Z2Creature {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -182,10 +182,10 @@ struct cBgS_PolyInfo {}; struct _GXTexObj {}; -struct Vec {}; - struct JAISoundID {}; +struct Vec {}; + struct Z2SeMgr { /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); }; @@ -363,7 +363,13 @@ extern "C" void __register_global_object(); /* ############################################################################################## */ /* 805CAD5C-805CAD60 000000 0004+00 10/10 0/0 0/0 .rodata @3844 */ SECTION_RODATA static f32 const lit_3844 = 1.0f; -COMPILER_STRIP_GATE(805CAD5C, &lit_3844); +COMPILER_STRIP_GATE(0x805CAD5C, &lit_3844); + +/* 805CAECC-805CAECC 000170 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_805CAECC = "B_DR"; +#pragma pop /* 805CAED4-805CAEFC -00001 0028+00 1/1 0/0 0/0 .data @4416 */ SECTION_DATA static void* lit_4416[10] = { @@ -516,11 +522,11 @@ SECTION_RODATA static u8 const lit_3862[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(805CAD60, &lit_3862); +COMPILER_STRIP_GATE(0x805CAD60, &lit_3862); /* 805CAD64-805CAD68 000008 0004+00 1/1 0/0 0/0 .rodata @3863 */ SECTION_RODATA static f32 const lit_3863 = -1.0f; -COMPILER_STRIP_GATE(805CAD64, &lit_3863); +COMPILER_STRIP_GATE(0x805CAD64, &lit_3863); /* 805C7DD4-805C7E88 000394 00B4+00 4/4 0/0 0/0 .text SetAnm__9daB_DRE_cFP16mDoExt_McaMorfSOiiff */ @@ -652,144 +658,144 @@ asm void daB_DRE_c::SetReleaseCam() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4209 = -1800.0f; -COMPILER_STRIP_GATE(805CAD68, &lit_4209); +COMPILER_STRIP_GATE(0x805CAD68, &lit_4209); #pragma pop /* 805CAD6C-805CAD70 000010 0004+00 0/3 0/0 0/0 .rodata @4210 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4210 = 1000.0f; -COMPILER_STRIP_GATE(805CAD6C, &lit_4210); +COMPILER_STRIP_GATE(0x805CAD6C, &lit_4210); #pragma pop /* 805CAD70-805CAD74 000014 0004+00 0/1 0/0 0/0 .rodata @4211 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4211 = 600.0f; -COMPILER_STRIP_GATE(805CAD70, &lit_4211); +COMPILER_STRIP_GATE(0x805CAD70, &lit_4211); #pragma pop /* 805CAD74-805CAD78 000018 0004+00 0/3 0/0 0/0 .rodata @4212 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4212 = 200.0f; -COMPILER_STRIP_GATE(805CAD74, &lit_4212); +COMPILER_STRIP_GATE(0x805CAD74, &lit_4212); #pragma pop /* 805CAD78-805CAD7C 00001C 0004+00 0/1 0/0 0/0 .rodata @4213 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4213 = 9.0f; -COMPILER_STRIP_GATE(805CAD78, &lit_4213); +COMPILER_STRIP_GATE(0x805CAD78, &lit_4213); #pragma pop /* 805CAD7C-805CAD80 000020 0004+00 0/1 0/0 0/0 .rodata @4214 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4214 = 300.0f; -COMPILER_STRIP_GATE(805CAD7C, &lit_4214); +COMPILER_STRIP_GATE(0x805CAD7C, &lit_4214); #pragma pop /* 805CAD80-805CAD84 000024 0004+00 0/1 0/0 0/0 .rodata @4215 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4215 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(805CAD80, &lit_4215); +COMPILER_STRIP_GATE(0x805CAD80, &lit_4215); #pragma pop /* 805CAD84-805CAD88 000028 0004+00 0/2 0/0 0/0 .rodata @4216 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4216 = 30.0f; -COMPILER_STRIP_GATE(805CAD84, &lit_4216); +COMPILER_STRIP_GATE(0x805CAD84, &lit_4216); #pragma pop /* 805CAD88-805CAD8C 00002C 0004+00 0/1 0/0 0/0 .rodata @4217 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4217 = 120.0f; -COMPILER_STRIP_GATE(805CAD88, &lit_4217); +COMPILER_STRIP_GATE(0x805CAD88, &lit_4217); #pragma pop /* 805CAD8C-805CAD90 000030 0004+00 0/1 0/0 0/0 .rodata @4218 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4218 = -700.0f; -COMPILER_STRIP_GATE(805CAD8C, &lit_4218); +COMPILER_STRIP_GATE(0x805CAD8C, &lit_4218); #pragma pop /* 805CAD90-805CAD94 000034 0004+00 0/1 0/0 0/0 .rodata @4219 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4219 = -40.0f; -COMPILER_STRIP_GATE(805CAD90, &lit_4219); +COMPILER_STRIP_GATE(0x805CAD90, &lit_4219); #pragma pop /* 805CAD94-805CAD98 000038 0004+00 0/2 0/0 0/0 .rodata @4220 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4220 = 800.0f; -COMPILER_STRIP_GATE(805CAD94, &lit_4220); +COMPILER_STRIP_GATE(0x805CAD94, &lit_4220); #pragma pop /* 805CAD98-805CAD9C 00003C 0004+00 0/2 0/0 0/0 .rodata @4221 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4221 = 5.0f; -COMPILER_STRIP_GATE(805CAD98, &lit_4221); +COMPILER_STRIP_GATE(0x805CAD98, &lit_4221); #pragma pop /* 805CAD9C-805CADA0 000040 0004+00 0/2 0/0 0/0 .rodata @4222 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4222 = 80.0f; -COMPILER_STRIP_GATE(805CAD9C, &lit_4222); +COMPILER_STRIP_GATE(0x805CAD9C, &lit_4222); #pragma pop /* 805CADA0-805CADA4 000044 0004+00 0/1 0/0 0/0 .rodata @4223 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4223 = 250.0f; -COMPILER_STRIP_GATE(805CADA0, &lit_4223); +COMPILER_STRIP_GATE(0x805CADA0, &lit_4223); #pragma pop /* 805CADA4-805CADA8 000048 0004+00 0/4 0/0 0/0 .rodata @4224 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4224 = 100.0f; -COMPILER_STRIP_GATE(805CADA4, &lit_4224); +COMPILER_STRIP_GATE(0x805CADA4, &lit_4224); #pragma pop /* 805CADA8-805CADAC 00004C 0004+00 0/2 0/0 0/0 .rodata @4225 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4225 = 130.0f; -COMPILER_STRIP_GATE(805CADA8, &lit_4225); +COMPILER_STRIP_GATE(0x805CADA8, &lit_4225); #pragma pop /* 805CADAC-805CADB0 000050 0004+00 0/1 0/0 0/0 .rodata @4226 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4226 = 1650.0f; -COMPILER_STRIP_GATE(805CADAC, &lit_4226); +COMPILER_STRIP_GATE(0x805CADAC, &lit_4226); #pragma pop /* 805CADB0-805CADB4 000054 0004+00 1/3 0/0 0/0 .rodata @4227 */ SECTION_RODATA static f32 const lit_4227 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(805CADB0, &lit_4227); +COMPILER_STRIP_GATE(0x805CADB0, &lit_4227); /* 805CADB4-805CADB8 000058 0004+00 0/1 0/0 0/0 .rodata @4228 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4228 = 2.0f; -COMPILER_STRIP_GATE(805CADB4, &lit_4228); +COMPILER_STRIP_GATE(0x805CADB4, &lit_4228); #pragma pop /* 805CADB8-805CADBC 00005C 0004+00 0/1 0/0 0/0 .rodata @4229 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4229 = 2500.0f; -COMPILER_STRIP_GATE(805CADB8, &lit_4229); +COMPILER_STRIP_GATE(0x805CADB8, &lit_4229); #pragma pop /* 805CADBC-805CADC4 000060 0008+00 0/1 0/0 0/0 .rodata @4231 */ @@ -798,7 +804,7 @@ COMPILER_STRIP_GATE(805CADB8, &lit_4229); SECTION_RODATA static u8 const lit_4231[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(805CADBC, &lit_4231); +COMPILER_STRIP_GATE(0x805CADBC, &lit_4231); #pragma pop /* 805CB040-805CB044 000008 0001+03 3/3 0/0 0/0 .bss @1109 */ @@ -957,35 +963,35 @@ asm void daB_DRE_c::CamAction2() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4309 = 150.0f; -COMPILER_STRIP_GATE(805CADC4, &lit_4309); +COMPILER_STRIP_GATE(0x805CADC4, &lit_4309); #pragma pop /* 805CADC8-805CADCC 00006C 0004+00 0/1 0/0 0/0 .rodata @4310 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4310 = 110.0f; -COMPILER_STRIP_GATE(805CADC8, &lit_4310); +COMPILER_STRIP_GATE(0x805CADC8, &lit_4310); #pragma pop /* 805CADCC-805CADD0 000070 0004+00 0/1 0/0 0/0 .rodata @4311 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4311 = 270.0f; -COMPILER_STRIP_GATE(805CADCC, &lit_4311); +COMPILER_STRIP_GATE(0x805CADCC, &lit_4311); #pragma pop /* 805CADD0-805CADD4 000074 0004+00 0/1 0/0 0/0 .rodata @4312 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4312 = 5000.0f; -COMPILER_STRIP_GATE(805CADD0, &lit_4312); +COMPILER_STRIP_GATE(0x805CADD0, &lit_4312); #pragma pop /* 805CADD4-805CADD8 000078 0004+00 0/1 0/0 0/0 .rodata @4313 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4313 = 1500.0f; -COMPILER_STRIP_GATE(805CADD4, &lit_4313); +COMPILER_STRIP_GATE(0x805CADD4, &lit_4313); #pragma pop /* 805C8BF8-805C8EDC 0011B8 02E4+00 1/1 0/0 0/0 .text DrAction2__9daB_DRE_cFv */ @@ -1043,326 +1049,326 @@ asm void daB_DRE_c::SoundChk() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4408 = 500.0f; -COMPILER_STRIP_GATE(805CADD8, &lit_4408); +COMPILER_STRIP_GATE(0x805CADD8, &lit_4408); #pragma pop /* 805CADDC-805CADE0 000080 0004+00 0/2 0/0 0/0 .rodata @4409 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4409 = 50.0f; -COMPILER_STRIP_GATE(805CADDC, &lit_4409); +COMPILER_STRIP_GATE(0x805CADDC, &lit_4409); #pragma pop /* 805CADE0-805CADE4 000084 0004+00 0/0 0/0 0/0 .rodata @4410 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4410 = -500.0f; -COMPILER_STRIP_GATE(805CADE0, &lit_4410); +COMPILER_STRIP_GATE(0x805CADE0, &lit_4410); #pragma pop /* 805CADE4-805CADE8 000088 0004+00 1/1 0/0 0/0 .rodata @4411 */ SECTION_RODATA static f32 const lit_4411 = 10.0f; -COMPILER_STRIP_GATE(805CADE4, &lit_4411); +COMPILER_STRIP_GATE(0x805CADE4, &lit_4411); /* 805CADE8-805CADEC 00008C 0004+00 0/0 0/0 0/0 .rodata @4412 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4412 = 20.0f; -COMPILER_STRIP_GATE(805CADE8, &lit_4412); +COMPILER_STRIP_GATE(0x805CADE8, &lit_4412); #pragma pop /* 805CADEC-805CADF0 000090 0004+00 0/0 0/0 0/0 .rodata @4413 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4413 = 2.0f / 5.0f; -COMPILER_STRIP_GATE(805CADEC, &lit_4413); +COMPILER_STRIP_GATE(0x805CADEC, &lit_4413); #pragma pop /* 805CADF0-805CADF4 000094 0004+00 0/0 0/0 0/0 .rodata @4414 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4414 = 1.0f / 20.0f; -COMPILER_STRIP_GATE(805CADF0, &lit_4414); +COMPILER_STRIP_GATE(0x805CADF0, &lit_4414); #pragma pop /* 805CADF4-805CADF8 000098 0004+00 0/0 0/0 0/0 .rodata @4415 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4415 = 280.0f; -COMPILER_STRIP_GATE(805CADF4, &lit_4415); +COMPILER_STRIP_GATE(0x805CADF4, &lit_4415); #pragma pop /* 805CADF8-805CADFC 00009C 0004+00 0/0 0/0 0/0 .rodata @4606 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4606 = -800.0f; -COMPILER_STRIP_GATE(805CADF8, &lit_4606); +COMPILER_STRIP_GATE(0x805CADF8, &lit_4606); #pragma pop /* 805CADFC-805CAE00 0000A0 0004+00 0/0 0/0 0/0 .rodata @4607 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4607 = 4100.0f; -COMPILER_STRIP_GATE(805CADFC, &lit_4607); +COMPILER_STRIP_GATE(0x805CADFC, &lit_4607); #pragma pop /* 805CAE00-805CAE04 0000A4 0004+00 0/0 0/0 0/0 .rodata @4608 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4608 = 40.0f; -COMPILER_STRIP_GATE(805CAE00, &lit_4608); +COMPILER_STRIP_GATE(0x805CAE00, &lit_4608); #pragma pop /* 805CAE04-805CAE08 0000A8 0004+00 0/0 0/0 0/0 .rodata @4609 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4609 = 6.0f / 5.0f; -COMPILER_STRIP_GATE(805CAE04, &lit_4609); +COMPILER_STRIP_GATE(0x805CAE04, &lit_4609); #pragma pop /* 805CAE08-805CAE0C 0000AC 0004+00 0/0 0/0 0/0 .rodata @4610 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4610 = 12000.0f; -COMPILER_STRIP_GATE(805CAE08, &lit_4610); +COMPILER_STRIP_GATE(0x805CAE08, &lit_4610); #pragma pop /* 805CAE0C-805CAE10 0000B0 0004+00 0/0 0/0 0/0 .rodata @4611 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4611 = 7000.0f; -COMPILER_STRIP_GATE(805CAE0C, &lit_4611); +COMPILER_STRIP_GATE(0x805CAE0C, &lit_4611); #pragma pop /* 805CAE10-805CAE14 0000B4 0004+00 0/0 0/0 0/0 .rodata @4612 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4612 = 6500.0f; -COMPILER_STRIP_GATE(805CAE10, &lit_4612); +COMPILER_STRIP_GATE(0x805CAE10, &lit_4612); #pragma pop /* 805CAE14-805CAE18 0000B8 0004+00 0/0 0/0 0/0 .rodata @4613 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4613 = -7000.0f; -COMPILER_STRIP_GATE(805CAE14, &lit_4613); +COMPILER_STRIP_GATE(0x805CAE14, &lit_4613); #pragma pop /* 805CAE18-805CAE1C 0000BC 0004+00 0/0 0/0 0/0 .rodata @4614 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4614 = 3000.0f; -COMPILER_STRIP_GATE(805CAE18, &lit_4614); +COMPILER_STRIP_GATE(0x805CAE18, &lit_4614); #pragma pop /* 805CAE1C-805CAE20 0000C0 0004+00 0/0 0/0 0/0 .rodata @4615 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4615 = 6.0f; -COMPILER_STRIP_GATE(805CAE1C, &lit_4615); +COMPILER_STRIP_GATE(0x805CAE1C, &lit_4615); #pragma pop /* 805CAE20-805CAE24 0000C4 0004+00 0/0 0/0 0/0 .rodata @4616 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4616 = 400.0f; -COMPILER_STRIP_GATE(805CAE20, &lit_4616); +COMPILER_STRIP_GATE(0x805CAE20, &lit_4616); #pragma pop /* 805CAE24-805CAE28 0000C8 0004+00 0/0 0/0 0/0 .rodata @4617 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4617 = -325.0f; -COMPILER_STRIP_GATE(805CAE24, &lit_4617); +COMPILER_STRIP_GATE(0x805CAE24, &lit_4617); #pragma pop /* 805CAE28-805CAE2C 0000CC 0004+00 0/0 0/0 0/0 .rodata @4618 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4618 = 215.0f; -COMPILER_STRIP_GATE(805CAE28, &lit_4618); +COMPILER_STRIP_GATE(0x805CAE28, &lit_4618); #pragma pop /* 805CAE2C-805CAE30 0000D0 0004+00 0/0 0/0 0/0 .rodata @4619 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4619 = 350.0f; -COMPILER_STRIP_GATE(805CAE2C, &lit_4619); +COMPILER_STRIP_GATE(0x805CAE2C, &lit_4619); #pragma pop /* 805CAE30-805CAE34 0000D4 0004+00 0/0 0/0 0/0 .rodata @4620 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4620 = 70.0f; -COMPILER_STRIP_GATE(805CAE30, &lit_4620); +COMPILER_STRIP_GATE(0x805CAE30, &lit_4620); #pragma pop /* 805CAE34-805CAE38 0000D8 0004+00 0/0 0/0 0/0 .rodata @4758 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4758 = 43.0f; -COMPILER_STRIP_GATE(805CAE34, &lit_4758); +COMPILER_STRIP_GATE(0x805CAE34, &lit_4758); #pragma pop /* 805CAE38-805CAE3C 0000DC 0004+00 0/0 0/0 0/0 .rodata @4759 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4759 = 91.0f; -COMPILER_STRIP_GATE(805CAE38, &lit_4759); +COMPILER_STRIP_GATE(0x805CAE38, &lit_4759); #pragma pop /* 805CAE3C-805CAE40 0000E0 0004+00 0/0 0/0 0/0 .rodata @4760 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4760 = 113.0f; -COMPILER_STRIP_GATE(805CAE3C, &lit_4760); +COMPILER_STRIP_GATE(0x805CAE3C, &lit_4760); #pragma pop /* 805CAE40-805CAE44 0000E4 0004+00 0/0 0/0 0/0 .rodata @4761 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4761 = 133.0f; -COMPILER_STRIP_GATE(805CAE40, &lit_4761); +COMPILER_STRIP_GATE(0x805CAE40, &lit_4761); #pragma pop /* 805CAE44-805CAE48 0000E8 0004+00 0/0 0/0 0/0 .rodata @4762 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4762 = 160.0f; -COMPILER_STRIP_GATE(805CAE44, &lit_4762); +COMPILER_STRIP_GATE(0x805CAE44, &lit_4762); #pragma pop /* 805CAE48-805CAE4C 0000EC 0004+00 0/0 0/0 0/0 .rodata @4763 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4763 = 186.0f; -COMPILER_STRIP_GATE(805CAE48, &lit_4763); +COMPILER_STRIP_GATE(0x805CAE48, &lit_4763); #pragma pop /* 805CAE4C-805CAE50 0000F0 0004+00 0/0 0/0 0/0 .rodata @4764 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4764 = 213.0f; -COMPILER_STRIP_GATE(805CAE4C, &lit_4764); +COMPILER_STRIP_GATE(0x805CAE4C, &lit_4764); #pragma pop /* 805CAE50-805CAE54 0000F4 0004+00 0/0 0/0 0/0 .rodata @4765 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4765 = 238.0f; -COMPILER_STRIP_GATE(805CAE50, &lit_4765); +COMPILER_STRIP_GATE(0x805CAE50, &lit_4765); #pragma pop /* 805CAE54-805CAE58 0000F8 0004+00 0/0 0/0 0/0 .rodata @4766 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4766 = 261.0f; -COMPILER_STRIP_GATE(805CAE54, &lit_4766); +COMPILER_STRIP_GATE(0x805CAE54, &lit_4766); #pragma pop /* 805CAE58-805CAE5C 0000FC 0004+00 0/0 0/0 0/0 .rodata @4767 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4767 = 7.0f; -COMPILER_STRIP_GATE(805CAE58, &lit_4767); +COMPILER_STRIP_GATE(0x805CAE58, &lit_4767); #pragma pop /* 805CAE5C-805CAE60 000100 0004+00 0/0 0/0 0/0 .rodata @4768 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4768 = 75.0f; -COMPILER_STRIP_GATE(805CAE5C, &lit_4768); +COMPILER_STRIP_GATE(0x805CAE5C, &lit_4768); #pragma pop /* 805CAE60-805CAE64 000104 0004+00 0/0 0/0 0/0 .rodata @4769 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4769 = 143.0f; -COMPILER_STRIP_GATE(805CAE60, &lit_4769); +COMPILER_STRIP_GATE(0x805CAE60, &lit_4769); #pragma pop /* 805CAE64-805CAE68 000108 0004+00 0/0 0/0 0/0 .rodata @4770 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4770 = 177.0f; -COMPILER_STRIP_GATE(805CAE64, &lit_4770); +COMPILER_STRIP_GATE(0x805CAE64, &lit_4770); #pragma pop /* 805CAE68-805CAE6C 00010C 0004+00 0/0 0/0 0/0 .rodata @4771 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4771 = 210.0f; -COMPILER_STRIP_GATE(805CAE68, &lit_4771); +COMPILER_STRIP_GATE(0x805CAE68, &lit_4771); #pragma pop /* 805CAE6C-805CAE70 000110 0004+00 0/0 0/0 0/0 .rodata @4772 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4772 = 243.0f; -COMPILER_STRIP_GATE(805CAE6C, &lit_4772); +COMPILER_STRIP_GATE(0x805CAE6C, &lit_4772); #pragma pop /* 805CAE70-805CAE74 000114 0004+00 0/0 0/0 0/0 .rodata @4773 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4773 = 309.0f; -COMPILER_STRIP_GATE(805CAE70, &lit_4773); +COMPILER_STRIP_GATE(0x805CAE70, &lit_4773); #pragma pop /* 805CAE74-805CAE78 000118 0004+00 0/0 0/0 0/0 .rodata @4774 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4774 = 268.0f; -COMPILER_STRIP_GATE(805CAE74, &lit_4774); +COMPILER_STRIP_GATE(0x805CAE74, &lit_4774); #pragma pop /* 805CAE78-805CAE7C 00011C 0004+00 0/0 0/0 0/0 .rodata @4775 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4775 = 35.0f; -COMPILER_STRIP_GATE(805CAE78, &lit_4775); +COMPILER_STRIP_GATE(0x805CAE78, &lit_4775); #pragma pop /* 805CAE7C-805CAE80 000120 0004+00 0/0 0/0 0/0 .rodata @4776 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4776 = 65.0f; -COMPILER_STRIP_GATE(805CAE7C, &lit_4776); +COMPILER_STRIP_GATE(0x805CAE7C, &lit_4776); #pragma pop /* 805CAE80-805CAE84 000124 0004+00 0/0 0/0 0/0 .rodata @4777 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4777 = 95.0f; -COMPILER_STRIP_GATE(805CAE80, &lit_4777); +COMPILER_STRIP_GATE(0x805CAE80, &lit_4777); #pragma pop /* 805CAE84-805CAE88 000128 0004+00 0/0 0/0 0/0 .rodata @4778 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4778 = 125.0f; -COMPILER_STRIP_GATE(805CAE84, &lit_4778); +COMPILER_STRIP_GATE(0x805CAE84, &lit_4778); #pragma pop /* 805CAE88-805CAE8C 00012C 0004+00 0/0 0/0 0/0 .rodata @4779 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4779 = 102.0f; -COMPILER_STRIP_GATE(805CAE88, &lit_4779); +COMPILER_STRIP_GATE(0x805CAE88, &lit_4779); #pragma pop /* 805CAE8C-805CAE90 000130 0004+00 0/0 0/0 0/0 .rodata @4780 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4780 = 157.0f; -COMPILER_STRIP_GATE(805CAE8C, &lit_4780); +COMPILER_STRIP_GATE(0x805CAE8C, &lit_4780); #pragma pop /* 805CAE90-805CAE94 000134 0004+00 0/0 0/0 0/0 .rodata @4781 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4781 = 180.0f; -COMPILER_STRIP_GATE(805CAE90, &lit_4781); +COMPILER_STRIP_GATE(0x805CAE90, &lit_4781); #pragma pop /* 805CAE94-805CAE9C 000138 0008+00 0/1 0/0 0/0 .rodata @4874 */ @@ -1371,7 +1377,7 @@ COMPILER_STRIP_GATE(805CAE90, &lit_4781); SECTION_RODATA static u8 const lit_4874[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(805CAE94, &lit_4874); +COMPILER_STRIP_GATE(0x805CAE94, &lit_4874); #pragma pop /* 805CAE9C-805CAEA4 000140 0008+00 0/1 0/0 0/0 .rodata @4875 */ @@ -1380,7 +1386,7 @@ COMPILER_STRIP_GATE(805CAE94, &lit_4874); SECTION_RODATA static u8 const lit_4875[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(805CAE9C, &lit_4875); +COMPILER_STRIP_GATE(0x805CAE9C, &lit_4875); #pragma pop /* 805CAEA4-805CAEAC 000148 0008+00 0/1 0/0 0/0 .rodata @4876 */ @@ -1389,7 +1395,7 @@ COMPILER_STRIP_GATE(805CAE9C, &lit_4875); SECTION_RODATA static u8 const lit_4876[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(805CAEA4, &lit_4876); +COMPILER_STRIP_GATE(0x805CAEA4, &lit_4876); #pragma pop /* 805CA158-805CA49C 002718 0344+00 1/1 0/0 0/0 .text Execute__9daB_DRE_cFv */ @@ -1417,14 +1423,14 @@ asm void daB_DRE_c::SpeedSet() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4942 = 7.0f / 10.0f; -COMPILER_STRIP_GATE(805CAEAC, &lit_4942); +COMPILER_STRIP_GATE(0x805CAEAC, &lit_4942); #pragma pop /* 805CAEB0-805CAEB4 000154 0004+00 0/1 0/0 0/0 .rodata @4943 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4943 = 4.0f; -COMPILER_STRIP_GATE(805CAEB0, &lit_4943); +COMPILER_STRIP_GATE(0x805CAEB0, &lit_4943); #pragma pop /* 805CB0D4-805CB0D8 00009C 0004+00 1/1 0/0 0/0 .bss None */ @@ -1453,7 +1459,7 @@ asm void daB_DRE_c::Delete() { /* ############################################################################################## */ /* 805CAEB4-805CAEB8 000158 0004+00 1/1 0/0 0/0 .rodata @5006 */ SECTION_RODATA static f32 const lit_5006 = 4.0f / 5.0f; -COMPILER_STRIP_GATE(805CAEB4, &lit_5006); +COMPILER_STRIP_GATE(0x805CAEB4, &lit_5006); /* 805CA6C0-805CA780 002C80 00C0+00 2/2 0/0 0/0 .text setBaseMtx__9daB_DRE_cFv */ #pragma push @@ -1470,7 +1476,7 @@ asm void daB_DRE_c::setBaseMtx() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5084 = 6000.0f; -COMPILER_STRIP_GATE(805CAEB8, &lit_5084); +COMPILER_STRIP_GATE(0x805CAEB8, &lit_5084); #pragma pop /* 805CA780-805CA924 002D40 01A4+00 1/0 0/0 0/0 .text daB_DRE_Draw__FP9daB_DRE_c */ @@ -1498,28 +1504,28 @@ static asm void daB_DRE_Execute(daB_DRE_c* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5227 = -40000.0f; -COMPILER_STRIP_GATE(805CAEBC, &lit_5227); +COMPILER_STRIP_GATE(0x805CAEBC, &lit_5227); #pragma pop /* 805CAEC0-805CAEC4 000164 0004+00 0/1 0/0 0/0 .rodata @5228 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5228 = 40000.0f; -COMPILER_STRIP_GATE(805CAEC0, &lit_5228); +COMPILER_STRIP_GATE(0x805CAEC0, &lit_5228); #pragma pop /* 805CAEC4-805CAEC8 000168 0004+00 0/1 0/0 0/0 .rodata @5229 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5229 = 9600.0f; -COMPILER_STRIP_GATE(805CAEC4, &lit_5229); +COMPILER_STRIP_GATE(0x805CAEC4, &lit_5229); #pragma pop /* 805CAEC8-805CAECC 00016C 0004+00 0/1 0/0 0/0 .rodata @5230 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5230 = 1800.0f; -COMPILER_STRIP_GATE(805CAEC8, &lit_5230); +COMPILER_STRIP_GATE(0x805CAEC8, &lit_5230); #pragma pop /* 805CA944-805CAC3C 002F04 02F8+00 1/1 0/0 0/0 .text create__9daB_DRE_cFv */ @@ -1559,7 +1565,7 @@ asm void __sinit_d_a_b_dre_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_805CACB4 = (void*)__sinit_d_a_b_dre_cpp; +REGISTER_CTORS(0x805CACB4, __sinit_d_a_b_dre_cpp); #pragma pop /* 805CAD1C-805CAD24 0032DC 0008+00 1/0 0/0 0/0 .text @36@__dt__12dBgS_ObjAcchFv */ @@ -1764,9 +1770,4 @@ static u8 data_805CB134[4]; static u8 data_805CB138[4]; #pragma pop -/* 805CAECC-805CAED1 000170 0005+00 4/4 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_805CAECC = "B_DR"; -#pragma pop +/* 805CAECC-805CAECC 000170 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/b/d_a_b_ds/d_a_b_ds.cpp b/rel/d/a/b/d_a_b_ds/d_a_b_ds.cpp index d7e18f243cf..d322e0e7622 100644 --- a/rel/d/a/b/d_a_b_ds/d_a_b_ds.cpp +++ b/rel/d/a/b/d_a_b_ds/d_a_b_ds.cpp @@ -64,16 +64,16 @@ struct mDoExt_baseAnm { /* 8000D428 */ void play(); }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; - struct J3DAnmTransform {}; +struct J3DModelData {}; + +struct Z2Creature {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -94,10 +94,10 @@ struct daPy_py_c { /* 805DC9DC */ void changeDemoMode(u32, int, int, s16); }; -struct J3DJoint {}; - struct J3DModel {}; +struct J3DJoint {}; + struct daB_DS_c { /* 805CB314 */ void ctrlJoint(J3DJoint*, J3DModel*); /* 805CB4A4 */ void JointCallBack(J3DJoint*, int); @@ -526,8 +526,8 @@ extern "C" void __ct__4cXyzFv(); extern "C" static void daB_DS_Create__FP8daB_DS_c(); extern "C" void __dt__10cCcD_GSttsFv(); extern "C" void __dt__12daB_DS_HIO_cFv(); -extern "C" void func_805DC8E4(int*); -extern "C" void func_805DC900(u8*); +extern "C" void func_805DC8E4(void* _this, int*); +extern "C" void func_805DC900(void* _this, u8*); extern "C" void __sinit_d_a_b_ds_cpp(); extern "C" static void func_805DC958(); extern "C" static void func_805DC960(); @@ -754,7 +754,7 @@ extern "C" void __register_global_object(); /* ############################################################################################## */ /* 805DCA54-805DCA58 000000 0004+00 45/45 0/0 0/0 .rodata @3932 */ SECTION_RODATA static f32 const lit_3932 = 100.0f; -COMPILER_STRIP_GATE(805DCA54, &lit_3932); +COMPILER_STRIP_GATE(0x805DCA54, &lit_3932); /* 805DCA58-805DCA5C 000004 0004+00 6/38 0/0 0/0 .rodata @3933 */ SECTION_RODATA static u8 const lit_3933[4] = { @@ -763,7 +763,7 @@ SECTION_RODATA static u8 const lit_3933[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(805DCA58, &lit_3933); +COMPILER_STRIP_GATE(0x805DCA58, &lit_3933); /* 805DCA5C-805DCA64 000008 0004+04 5/35 0/0 0/0 .rodata @3934 */ SECTION_RODATA static f32 const lit_3934[1 + 1 /* padding */] = { @@ -771,7 +771,7 @@ SECTION_RODATA static f32 const lit_3934[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(805DCA5C, &lit_3934); +COMPILER_STRIP_GATE(0x805DCA5C, &lit_3934); /* 805DCA64-805DCA6C 000010 0008+00 0/7 0/0 0/0 .rodata @3935 */ #pragma push @@ -779,7 +779,7 @@ COMPILER_STRIP_GATE(805DCA5C, &lit_3934); SECTION_RODATA static u8 const lit_3935[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(805DCA64, &lit_3935); +COMPILER_STRIP_GATE(0x805DCA64, &lit_3935); #pragma pop /* 805DCA6C-805DCA74 000018 0008+00 0/7 0/0 0/0 .rodata @3936 */ @@ -788,7 +788,7 @@ COMPILER_STRIP_GATE(805DCA64, &lit_3935); SECTION_RODATA static u8 const lit_3936[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(805DCA6C, &lit_3936); +COMPILER_STRIP_GATE(0x805DCA6C, &lit_3936); #pragma pop /* 805DCA74-805DCA7C 000020 0008+00 0/7 0/0 0/0 .rodata @3937 */ @@ -797,56 +797,56 @@ COMPILER_STRIP_GATE(805DCA6C, &lit_3936); SECTION_RODATA static u8 const lit_3937[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(805DCA74, &lit_3937); +COMPILER_STRIP_GATE(0x805DCA74, &lit_3937); #pragma pop /* 805DCA7C-805DCA80 000028 0004+00 0/2 0/0 0/0 .rodata @3938 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3938 = 1.0f / 100.0f; -COMPILER_STRIP_GATE(805DCA7C, &lit_3938); +COMPILER_STRIP_GATE(0x805DCA7C, &lit_3938); #pragma pop /* 805DCA80-805DCA84 00002C 0004+00 0/6 0/0 0/0 .rodata @3953 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3953 = 2000.0f; -COMPILER_STRIP_GATE(805DCA80, &lit_3953); +COMPILER_STRIP_GATE(0x805DCA80, &lit_3953); #pragma pop /* 805DCA84-805DCA88 000030 0004+00 0/1 0/0 0/0 .rodata @3954 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3954 = 3900.0f; -COMPILER_STRIP_GATE(805DCA84, &lit_3954); +COMPILER_STRIP_GATE(0x805DCA84, &lit_3954); #pragma pop /* 805DCA88-805DCA8C 000034 0004+00 0/2 0/0 0/0 .rodata @3955 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3955 = 2500.0f; -COMPILER_STRIP_GATE(805DCA88, &lit_3955); +COMPILER_STRIP_GATE(0x805DCA88, &lit_3955); #pragma pop /* 805DCA8C-805DCA90 000038 0004+00 0/2 0/0 0/0 .rodata @3956 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3956 = 2800.0f; -COMPILER_STRIP_GATE(805DCA8C, &lit_3956); +COMPILER_STRIP_GATE(0x805DCA8C, &lit_3956); #pragma pop /* 805DCA90-805DCA94 00003C 0004+00 0/4 0/0 0/0 .rodata @3957 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3957 = 700.0f; -COMPILER_STRIP_GATE(805DCA90, &lit_3957); +COMPILER_STRIP_GATE(0x805DCA90, &lit_3957); #pragma pop /* 805DCA94-805DCA98 000040 0004+00 0/4 0/0 0/0 .rodata @3958 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3958 = 5.0f; -COMPILER_STRIP_GATE(805DCA94, &lit_3958); +COMPILER_STRIP_GATE(0x805DCA94, &lit_3958); #pragma pop /* 805DD248-805DD254 000000 000C+00 4/4 0/0 0/0 .data cNullVec__6Z2Calc */ @@ -1600,35 +1600,35 @@ asm void daB_DS_c::JointCallBack(J3DJoint* param_0, int param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4267 = 120.0f; -COMPILER_STRIP_GATE(805DCA98, &lit_4267); +COMPILER_STRIP_GATE(0x805DCA98, &lit_4267); #pragma pop /* 805DCA9C-805DCAA0 000048 0004+00 0/1 0/0 0/0 .rodata @4268 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4268 = 6000.0f; -COMPILER_STRIP_GATE(805DCA9C, &lit_4268); +COMPILER_STRIP_GATE(0x805DCA9C, &lit_4268); #pragma pop /* 805DCAA0-805DCAA4 00004C 0004+00 0/6 0/0 0/0 .rodata @4269 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4269 = 255.0f; -COMPILER_STRIP_GATE(805DCAA0, &lit_4269); +COMPILER_STRIP_GATE(0x805DCAA0, &lit_4269); #pragma pop /* 805DCAA4-805DCAA8 000050 0004+00 0/5 0/0 0/0 .rodata @4270 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4270 = 1000.0f; -COMPILER_STRIP_GATE(805DCAA4, &lit_4270); +COMPILER_STRIP_GATE(0x805DCAA4, &lit_4270); #pragma pop /* 805DCAA8-805DCAAC 000054 0004+00 0/1 0/0 0/0 .rodata @4271 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4271 = 7000.0f; -COMPILER_STRIP_GATE(805DCAA8, &lit_4271); +COMPILER_STRIP_GATE(0x805DCAA8, &lit_4271); #pragma pop /* 805CB4F0-805CBAA8 0003B0 05B8+00 1/1 0/0 0/0 .text draw__8daB_DS_cFv */ @@ -1654,7 +1654,13 @@ static asm void daB_DS_Draw(daB_DS_c* param_0) { /* ############################################################################################## */ /* 805DCAAC-805DCAB0 000058 0004+00 1/6 0/0 0/0 .rodata @4285 */ SECTION_RODATA static f32 const lit_4285 = -1.0f; -COMPILER_STRIP_GATE(805DCAAC, &lit_4285); +COMPILER_STRIP_GATE(0x805DCAAC, &lit_4285); + +/* 805DD22C-805DD22C 0007D8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_805DD22C = "B_DS"; +#pragma pop /* 805CBAC8-805CBB74 000988 00AC+00 18/18 0/0 0/0 .text setBck__8daB_DS_cFiUcff */ #pragma push @@ -1679,7 +1685,7 @@ asm void daB_DS_c::setActionMode(int param_0, int param_1) { /* ############################################################################################## */ /* 805DCAB0-805DCAB4 00005C 0004+00 1/9 0/0 0/0 .rodata @4339 */ SECTION_RODATA static f32 const lit_4339 = -1000000000.0f; -COMPILER_STRIP_GATE(805DCAB0, &lit_4339); +COMPILER_STRIP_GATE(0x805DCAB0, &lit_4339); /* 805CBB80-805CBD00 000A40 0180+00 1/1 0/0 0/0 .text mSmokeSet__8daB_DS_cFv */ #pragma push @@ -1716,18 +1722,18 @@ asm void daB_DS_c::HandHitSoundSet(bool param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4465 = 800.0f; -COMPILER_STRIP_GATE(805DCAB4, &lit_4465); +COMPILER_STRIP_GATE(0x805DCAB4, &lit_4465); #pragma pop /* 805DCAB8-805DCABC 000064 0004+00 1/5 0/0 0/0 .rodata @4466 */ SECTION_RODATA static f32 const lit_4466 = 200.0f; -COMPILER_STRIP_GATE(805DCAB8, &lit_4466); +COMPILER_STRIP_GATE(0x805DCAB8, &lit_4466); /* 805DCABC-805DCAC0 000068 0004+00 0/2 0/0 0/0 .rodata @4467 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4467 = 400.0f; -COMPILER_STRIP_GATE(805DCABC, &lit_4467); +COMPILER_STRIP_GATE(0x805DCABC, &lit_4467); #pragma pop /* 805CBED0-805CC158 000D90 0288+00 1/1 0/0 0/0 .text handSPosSet__8daB_DS_cFi */ @@ -1755,21 +1761,21 @@ asm void daB_DS_c::hand_smokeSet(u8 param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4551 = 1500.0f; -COMPILER_STRIP_GATE(805DCAC0, &lit_4551); +COMPILER_STRIP_GATE(0x805DCAC0, &lit_4551); #pragma pop /* 805DCAC4-805DCAC8 000070 0004+00 0/10 0/0 0/0 .rodata @4552 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4552 = 500.0f; -COMPILER_STRIP_GATE(805DCAC4, &lit_4552); +COMPILER_STRIP_GATE(0x805DCAC4, &lit_4552); #pragma pop /* 805DCAC8-805DCACC 000074 0004+00 0/1 0/0 0/0 .rodata @4553 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4553 = 8192.0f; -COMPILER_STRIP_GATE(805DCAC8, &lit_4553); +COMPILER_STRIP_GATE(0x805DCAC8, &lit_4553); #pragma pop /* 805DDA74-805DDA78 00000C 0001+03 0/0 0/0 0/0 .bss @1107 */ @@ -1890,34 +1896,34 @@ asm void daB_DS_c::mZsMoveChk_Guard() { /* ############################################################################################## */ /* 805DCACC-805DCAD0 000078 0004+00 1/7 0/0 0/0 .rodata @4649 */ SECTION_RODATA static f32 const lit_4649 = 2.0f; -COMPILER_STRIP_GATE(805DCACC, &lit_4649); +COMPILER_STRIP_GATE(0x805DCACC, &lit_4649); /* 805DCAD0-805DCAD4 00007C 0004+00 0/6 0/0 0/0 .rodata @4650 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4650 = 7.0f / 10.0f; -COMPILER_STRIP_GATE(805DCAD0, &lit_4650); +COMPILER_STRIP_GATE(0x805DCAD0, &lit_4650); #pragma pop /* 805DCAD4-805DCAD8 000080 0004+00 0/5 0/0 0/0 .rodata @4651 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4651 = 0.5f; -COMPILER_STRIP_GATE(805DCAD4, &lit_4651); +COMPILER_STRIP_GATE(0x805DCAD4, &lit_4651); #pragma pop /* 805DCAD8-805DCADC 000084 0004+00 0/8 0/0 0/0 .rodata @4652 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4652 = 4.0f / 5.0f; -COMPILER_STRIP_GATE(805DCAD8, &lit_4652); +COMPILER_STRIP_GATE(0x805DCAD8, &lit_4652); #pragma pop /* 805DCADC-805DCAE0 000088 0004+00 0/3 0/0 0/0 .rodata @4653 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4653 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(805DCADC, &lit_4653); +COMPILER_STRIP_GATE(0x805DCADC, &lit_4653); #pragma pop /* 805CC6F4-805CC80C 0015B4 0118+00 1/1 0/0 0/0 .text mTrapScale__8daB_DS_cFv */ @@ -1945,21 +1951,21 @@ asm void daB_DS_c::mClearTrap(bool param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4895 = -1300.0f; -COMPILER_STRIP_GATE(805DCAE0, &lit_4895); +COMPILER_STRIP_GATE(0x805DCAE0, &lit_4895); #pragma pop /* 805DCAE4-805DCAE8 000090 0004+00 0/3 0/0 0/0 .rodata @4896 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4896 = 7.0f; -COMPILER_STRIP_GATE(805DCAE4, &lit_4896); +COMPILER_STRIP_GATE(0x805DCAE4, &lit_4896); #pragma pop /* 805DCAE8-805DCAEC 000094 0004+00 0/1 0/0 0/0 .rodata @4897 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4897 = 1708.0f; -COMPILER_STRIP_GATE(805DCAE8, &lit_4897); +COMPILER_STRIP_GATE(0x805DCAE8, &lit_4897); #pragma pop /* 805CC8A4-805CCEB4 001764 0610+00 3/3 0/0 0/0 .text mCreateTrap__8daB_DS_cFb */ @@ -1997,7 +2003,7 @@ asm void daB_DS_c::damage_check() { SECTION_RODATA static u8 const lit_5154[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(805DCAEC, &lit_5154); +COMPILER_STRIP_GATE(0x805DCAEC, &lit_5154); /* 805CD628-805CD844 0024E8 021C+00 1/1 0/0 0/0 .text neck_set__8daB_DS_cFv */ #pragma push @@ -2063,644 +2069,651 @@ SECTION_RODATA static u8 const KIDOU_EFF_DT[128] = { 0x8B, 0xD2, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x8B, 0xD3, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x8B, 0xD4, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x8B, 0xD5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, }; -COMPILER_STRIP_GATE(805DCAF4, &KIDOU_EFF_DT); +COMPILER_STRIP_GATE(0x805DCAF4, &KIDOU_EFF_DT); #pragma pop /* 805DCB74-805DCB78 000120 0004+00 0/2 0/0 0/0 .rodata @5880 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5880 = 1800.0f; -COMPILER_STRIP_GATE(805DCB74, &lit_5880); +COMPILER_STRIP_GATE(0x805DCB74, &lit_5880); #pragma pop /* 805DCB78-805DCB7C 000124 0004+00 0/1 0/0 0/0 .rodata @5881 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5881 = 4900.0f; -COMPILER_STRIP_GATE(805DCB78, &lit_5881); +COMPILER_STRIP_GATE(0x805DCB78, &lit_5881); #pragma pop /* 805DCB7C-805DCB80 000128 0004+00 0/1 0/0 0/0 .rodata @5882 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5882 = 342.0f; -COMPILER_STRIP_GATE(805DCB7C, &lit_5882); +COMPILER_STRIP_GATE(0x805DCB7C, &lit_5882); #pragma pop /* 805DCB80-805DCB84 00012C 0004+00 0/1 0/0 0/0 .rodata @5883 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5883 = 690.0f; -COMPILER_STRIP_GATE(805DCB80, &lit_5883); +COMPILER_STRIP_GATE(0x805DCB80, &lit_5883); #pragma pop /* 805DCB84-805DCB88 000130 0004+00 0/1 0/0 0/0 .rodata @5884 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5884 = 1753.0f; -COMPILER_STRIP_GATE(805DCB84, &lit_5884); +COMPILER_STRIP_GATE(0x805DCB84, &lit_5884); #pragma pop /* 805DCB88-805DCB8C 000134 0004+00 0/3 0/0 0/0 .rodata @5885 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5885 = -20.0f; -COMPILER_STRIP_GATE(805DCB88, &lit_5885); +COMPILER_STRIP_GATE(0x805DCB88, &lit_5885); #pragma pop /* 805DCB8C-805DCB90 000138 0004+00 0/1 0/0 0/0 .rodata @5886 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5886 = 1270.0f; -COMPILER_STRIP_GATE(805DCB8C, &lit_5886); +COMPILER_STRIP_GATE(0x805DCB8C, &lit_5886); #pragma pop /* 805DCB90-805DCB94 00013C 0004+00 0/1 0/0 0/0 .rodata @5887 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5887 = 3083.0f; -COMPILER_STRIP_GATE(805DCB90, &lit_5887); +COMPILER_STRIP_GATE(0x805DCB90, &lit_5887); #pragma pop /* 805DCB94-805DCB98 000140 0004+00 0/1 0/0 0/0 .rodata @5888 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5888 = 1910.0f; -COMPILER_STRIP_GATE(805DCB94, &lit_5888); +COMPILER_STRIP_GATE(0x805DCB94, &lit_5888); #pragma pop /* 805DCB98-805DCB9C 000144 0004+00 0/1 0/0 0/0 .rodata @5889 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5889 = 4935.0f; -COMPILER_STRIP_GATE(805DCB98, &lit_5889); +COMPILER_STRIP_GATE(0x805DCB98, &lit_5889); #pragma pop /* 805DCB9C-805DCBA0 000148 0004+00 0/1 0/0 0/0 .rodata @5890 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5890 = -5.0f; -COMPILER_STRIP_GATE(805DCB9C, &lit_5890); +COMPILER_STRIP_GATE(0x805DCB9C, &lit_5890); #pragma pop /* 805DCBA0-805DCBA4 00014C 0004+00 0/1 0/0 0/0 .rodata @5891 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5891 = 2011.0f; -COMPILER_STRIP_GATE(805DCBA0, &lit_5891); +COMPILER_STRIP_GATE(0x805DCBA0, &lit_5891); #pragma pop /* 805DCBA4-805DCBA8 000150 0004+00 0/1 0/0 0/0 .rodata @5892 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5892 = 4664.0f; -COMPILER_STRIP_GATE(805DCBA4, &lit_5892); +COMPILER_STRIP_GATE(0x805DCBA4, &lit_5892); #pragma pop /* 805DCBA8-805DCBAC 000154 0004+00 0/1 0/0 0/0 .rodata @5893 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5893 = 615.0f; -COMPILER_STRIP_GATE(805DCBA8, &lit_5893); +COMPILER_STRIP_GATE(0x805DCBA8, &lit_5893); #pragma pop /* 805DCBAC-805DCBB0 000158 0004+00 0/2 0/0 0/0 .rodata @5894 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5894 = 2410.0f; -COMPILER_STRIP_GATE(805DCBAC, &lit_5894); +COMPILER_STRIP_GATE(0x805DCBAC, &lit_5894); #pragma pop /* 805DCBB0-805DCBB4 00015C 0004+00 0/1 0/0 0/0 .rodata @5895 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5895 = 2140.0f; -COMPILER_STRIP_GATE(805DCBB0, &lit_5895); +COMPILER_STRIP_GATE(0x805DCBB0, &lit_5895); #pragma pop /* 805DCBB4-805DCBB8 000160 0004+00 0/1 0/0 0/0 .rodata @5896 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5896 = 131.0f; -COMPILER_STRIP_GATE(805DCBB4, &lit_5896); +COMPILER_STRIP_GATE(0x805DCBB4, &lit_5896); #pragma pop /* 805DCBB8-805DCBBC 000164 0004+00 0/1 0/0 0/0 .rodata @5897 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5897 = 1105.0f; -COMPILER_STRIP_GATE(805DCBB8, &lit_5897); +COMPILER_STRIP_GATE(0x805DCBB8, &lit_5897); #pragma pop /* 805DCBBC-805DCBC0 000168 0004+00 0/1 0/0 0/0 .rodata @5898 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5898 = 1092.0f; -COMPILER_STRIP_GATE(805DCBBC, &lit_5898); +COMPILER_STRIP_GATE(0x805DCBBC, &lit_5898); #pragma pop /* 805DCBC0-805DCBC4 00016C 0004+00 0/1 0/0 0/0 .rodata @5899 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5899 = -110.0f; -COMPILER_STRIP_GATE(805DCBC0, &lit_5899); +COMPILER_STRIP_GATE(0x805DCBC0, &lit_5899); #pragma pop /* 805DCBC4-805DCBC8 000170 0004+00 0/2 0/0 0/0 .rodata @5900 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5900 = 1160.0f; -COMPILER_STRIP_GATE(805DCBC4, &lit_5900); +COMPILER_STRIP_GATE(0x805DCBC4, &lit_5900); #pragma pop /* 805DCBC8-805DCBCC 000174 0004+00 0/1 0/0 0/0 .rodata @5901 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5901 = 1200.0f; -COMPILER_STRIP_GATE(805DCBC8, &lit_5901); +COMPILER_STRIP_GATE(0x805DCBC8, &lit_5901); #pragma pop /* 805DCBCC-805DCBD0 000178 0004+00 0/4 0/0 0/0 .rodata @5902 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5902 = -50.0f; -COMPILER_STRIP_GATE(805DCBCC, &lit_5902); +COMPILER_STRIP_GATE(0x805DCBCC, &lit_5902); #pragma pop /* 805DCBD0-805DCBD4 00017C 0004+00 0/1 0/0 0/0 .rodata @5903 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5903 = 1095.0f; -COMPILER_STRIP_GATE(805DCBD0, &lit_5903); +COMPILER_STRIP_GATE(0x805DCBD0, &lit_5903); #pragma pop /* 805DCBD4-805DCBD8 000180 0004+00 0/1 0/0 0/0 .rodata @5904 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5904 = 1300.0f; -COMPILER_STRIP_GATE(805DCBD4, &lit_5904); +COMPILER_STRIP_GATE(0x805DCBD4, &lit_5904); #pragma pop /* 805DCBD8-805DCBDC 000184 0004+00 0/1 0/0 0/0 .rodata @5905 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5905 = -85.0f; -COMPILER_STRIP_GATE(805DCBD8, &lit_5905); +COMPILER_STRIP_GATE(0x805DCBD8, &lit_5905); #pragma pop /* 805DCBDC-805DCBE0 000188 0004+00 0/1 0/0 0/0 .rodata @5906 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5906 = 1150.0f; -COMPILER_STRIP_GATE(805DCBDC, &lit_5906); +COMPILER_STRIP_GATE(0x805DCBDC, &lit_5906); #pragma pop /* 805DCBE0-805DCBE4 00018C 0004+00 0/2 0/0 0/0 .rodata @5907 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5907 = 1250.0f; -COMPILER_STRIP_GATE(805DCBE0, &lit_5907); +COMPILER_STRIP_GATE(0x805DCBE0, &lit_5907); #pragma pop /* 805DCBE4-805DCBE8 000190 0004+00 0/15 0/0 0/0 .rodata @5908 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5908 = 10.0f; -COMPILER_STRIP_GATE(805DCBE4, &lit_5908); +COMPILER_STRIP_GATE(0x805DCBE4, &lit_5908); #pragma pop /* 805DCBE8-805DCBEC 000194 0004+00 0/1 0/0 0/0 .rodata @5909 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5909 = 1145.0f; -COMPILER_STRIP_GATE(805DCBE8, &lit_5909); +COMPILER_STRIP_GATE(0x805DCBE8, &lit_5909); #pragma pop /* 805DCBEC-805DCBF0 000198 0004+00 0/1 0/0 0/0 .rodata @5910 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5910 = 1420.0f; -COMPILER_STRIP_GATE(805DCBEC, &lit_5910); +COMPILER_STRIP_GATE(0x805DCBEC, &lit_5910); #pragma pop /* 805DCBF0-805DCBF4 00019C 0004+00 0/1 0/0 0/0 .rodata @5911 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5911 = 1060.0f; -COMPILER_STRIP_GATE(805DCBF0, &lit_5911); +COMPILER_STRIP_GATE(0x805DCBF0, &lit_5911); #pragma pop /* 805DCBF4-805DCBF8 0001A0 0004+00 0/3 0/0 0/0 .rodata @5912 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5912 = 45.0f; -COMPILER_STRIP_GATE(805DCBF4, &lit_5912); +COMPILER_STRIP_GATE(0x805DCBF4, &lit_5912); #pragma pop /* 805DCBF8-805DCBFC 0001A4 0004+00 0/1 0/0 0/0 .rodata @5913 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5913 = 1065.0f; -COMPILER_STRIP_GATE(805DCBF8, &lit_5913); +COMPILER_STRIP_GATE(0x805DCBF8, &lit_5913); #pragma pop /* 805DCBFC-805DCC00 0001A8 0004+00 0/1 0/0 0/0 .rodata @5914 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5914 = 1475.0f; -COMPILER_STRIP_GATE(805DCBFC, &lit_5914); +COMPILER_STRIP_GATE(0x805DCBFC, &lit_5914); #pragma pop /* 805DCC00-805DCC04 0001AC 0004+00 0/1 0/0 0/0 .rodata @5915 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5915 = 235.0f; -COMPILER_STRIP_GATE(805DCC00, &lit_5915); +COMPILER_STRIP_GATE(0x805DCC00, &lit_5915); #pragma pop /* 805DCC04-805DCC08 0001B0 0004+00 0/1 0/0 0/0 .rodata @5916 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5916 = 1110.0f; -COMPILER_STRIP_GATE(805DCC04, &lit_5916); +COMPILER_STRIP_GATE(0x805DCC04, &lit_5916); #pragma pop /* 805DCC08-805DCC0C 0001B4 0004+00 0/1 0/0 0/0 .rodata @5917 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5917 = 1835.0f; -COMPILER_STRIP_GATE(805DCC08, &lit_5917); +COMPILER_STRIP_GATE(0x805DCC08, &lit_5917); #pragma pop /* 805DCC0C-805DCC10 0001B8 0004+00 0/1 0/0 0/0 .rodata @5918 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5918 = 205.0f; -COMPILER_STRIP_GATE(805DCC0C, &lit_5918); +COMPILER_STRIP_GATE(0x805DCC0C, &lit_5918); #pragma pop /* 805DCC10-805DCC14 0001BC 0004+00 0/1 0/0 0/0 .rodata @5919 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5919 = 795.0f; -COMPILER_STRIP_GATE(805DCC10, &lit_5919); +COMPILER_STRIP_GATE(0x805DCC10, &lit_5919); #pragma pop /* 805DCC14-805DCC18 0001C0 0004+00 0/2 0/0 0/0 .rodata @5920 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5920 = 1770.0f; -COMPILER_STRIP_GATE(805DCC14, &lit_5920); +COMPILER_STRIP_GATE(0x805DCC14, &lit_5920); #pragma pop /* 805DCC18-805DCC1C 0001C4 0004+00 0/1 0/0 0/0 .rodata @5921 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5921 = 905.0f; -COMPILER_STRIP_GATE(805DCC18, &lit_5921); +COMPILER_STRIP_GATE(0x805DCC18, &lit_5921); #pragma pop /* 805DCC1C-805DCC20 0001C8 0004+00 0/2 0/0 0/0 .rodata @5922 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5922 = 1480.0f; -COMPILER_STRIP_GATE(805DCC1C, &lit_5922); +COMPILER_STRIP_GATE(0x805DCC1C, &lit_5922); #pragma pop /* 805DCC20-805DCC24 0001CC 0004+00 0/2 0/0 0/0 .rodata @5923 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5923 = 650.0f; -COMPILER_STRIP_GATE(805DCC20, &lit_5923); +COMPILER_STRIP_GATE(0x805DCC20, &lit_5923); #pragma pop /* 805DCC24-805DCC28 0001D0 0004+00 0/1 0/0 0/0 .rodata @5924 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5924 = 2350.0f; -COMPILER_STRIP_GATE(805DCC24, &lit_5924); +COMPILER_STRIP_GATE(0x805DCC24, &lit_5924); #pragma pop /* 805DCC28-805DCC2C 0001D4 0004+00 0/1 0/0 0/0 .rodata @5925 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5925 = 320.0f; -COMPILER_STRIP_GATE(805DCC28, &lit_5925); +COMPILER_STRIP_GATE(0x805DCC28, &lit_5925); #pragma pop /* 805DCC2C-805DCC30 0001D8 0004+00 0/1 0/0 0/0 .rodata @5926 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5926 = 730.0f; -COMPILER_STRIP_GATE(805DCC2C, &lit_5926); +COMPILER_STRIP_GATE(0x805DCC2C, &lit_5926); #pragma pop /* 805DCC30-805DCC34 0001DC 0004+00 0/1 0/0 0/0 .rodata @5927 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5927 = -235.0f; -COMPILER_STRIP_GATE(805DCC30, &lit_5927); +COMPILER_STRIP_GATE(0x805DCC30, &lit_5927); #pragma pop /* 805DCC34-805DCC38 0001E0 0004+00 0/1 0/0 0/0 .rodata @5928 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5928 = 1345.0f; -COMPILER_STRIP_GATE(805DCC34, &lit_5928); +COMPILER_STRIP_GATE(0x805DCC34, &lit_5928); #pragma pop /* 805DCC38-805DCC3C 0001E4 0004+00 0/1 0/0 0/0 .rodata @5929 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5929 = 2090.0f; -COMPILER_STRIP_GATE(805DCC38, &lit_5929); +COMPILER_STRIP_GATE(0x805DCC38, &lit_5929); #pragma pop /* 805DCC3C-805DCC40 0001E8 0004+00 0/2 0/0 0/0 .rodata @5930 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5930 = 1980.0f; -COMPILER_STRIP_GATE(805DCC3C, &lit_5930); +COMPILER_STRIP_GATE(0x805DCC3C, &lit_5930); #pragma pop /* 805DCC40-805DCC44 0001EC 0004+00 0/1 0/0 0/0 .rodata @5931 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5931 = 5300.0f; -COMPILER_STRIP_GATE(805DCC40, &lit_5931); +COMPILER_STRIP_GATE(0x805DCC40, &lit_5931); #pragma pop /* 805DCC44-805DCC48 0001F0 0004+00 0/1 0/0 0/0 .rodata @5932 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5932 = 1934.0f; -COMPILER_STRIP_GATE(805DCC44, &lit_5932); +COMPILER_STRIP_GATE(0x805DCC44, &lit_5932); #pragma pop /* 805DCC48-805DCC4C 0001F4 0004+00 0/1 0/0 0/0 .rodata @5933 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5933 = 5036.0f; -COMPILER_STRIP_GATE(805DCC48, &lit_5933); +COMPILER_STRIP_GATE(0x805DCC48, &lit_5933); #pragma pop /* 805DCC4C-805DCC50 0001F8 0004+00 0/1 0/0 0/0 .rodata @5934 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5934 = 655.0f; -COMPILER_STRIP_GATE(805DCC4C, &lit_5934); +COMPILER_STRIP_GATE(0x805DCC4C, &lit_5934); #pragma pop /* 805DCC50-805DCC54 0001FC 0004+00 0/1 0/0 0/0 .rodata @5935 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5935 = 2810.0f; -COMPILER_STRIP_GATE(805DCC50, &lit_5935); +COMPILER_STRIP_GATE(0x805DCC50, &lit_5935); #pragma pop /* 805DCC54-805DCC58 000200 0004+00 0/1 0/0 0/0 .rodata @5936 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5936 = 2360.0f; -COMPILER_STRIP_GATE(805DCC54, &lit_5936); +COMPILER_STRIP_GATE(0x805DCC54, &lit_5936); #pragma pop /* 805DCC58-805DCC5C 000204 0004+00 0/1 0/0 0/0 .rodata @5937 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5937 = 181.0f; -COMPILER_STRIP_GATE(805DCC58, &lit_5937); +COMPILER_STRIP_GATE(0x805DCC58, &lit_5937); #pragma pop /* 805DCC5C-805DCC60 000208 0004+00 0/1 0/0 0/0 .rodata @5938 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5938 = 1190.0f; -COMPILER_STRIP_GATE(805DCC5C, &lit_5938); +COMPILER_STRIP_GATE(0x805DCC5C, &lit_5938); #pragma pop /* 805DCC60-805DCC64 00020C 0004+00 0/1 0/0 0/0 .rodata @5939 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5939 = 844.0f; -COMPILER_STRIP_GATE(805DCC60, &lit_5939); +COMPILER_STRIP_GATE(0x805DCC60, &lit_5939); #pragma pop /* 805DCC64-805DCC68 000210 0004+00 0/1 0/0 0/0 .rodata @5940 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5940 = 25.0f; -COMPILER_STRIP_GATE(805DCC64, &lit_5940); +COMPILER_STRIP_GATE(0x805DCC64, &lit_5940); #pragma pop /* 805DCC68-805DCC6C 000214 0004+00 0/1 0/0 0/0 .rodata @5941 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5941 = 1125.0f; -COMPILER_STRIP_GATE(805DCC68, &lit_5941); +COMPILER_STRIP_GATE(0x805DCC68, &lit_5941); #pragma pop /* 805DCC6C-805DCC70 000218 0004+00 0/1 0/0 0/0 .rodata @5942 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5942 = 1450.0f; -COMPILER_STRIP_GATE(805DCC6C, &lit_5942); +COMPILER_STRIP_GATE(0x805DCC6C, &lit_5942); #pragma pop /* 805DCC70-805DCC74 00021C 0004+00 0/1 0/0 0/0 .rodata @5943 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5943 = 75.0f; -COMPILER_STRIP_GATE(805DCC70, &lit_5943); +COMPILER_STRIP_GATE(0x805DCC70, &lit_5943); #pragma pop /* 805DCC74-805DCC78 000220 0004+00 0/1 0/0 0/0 .rodata @5944 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5944 = 1010.0f; -COMPILER_STRIP_GATE(805DCC74, &lit_5944); +COMPILER_STRIP_GATE(0x805DCC74, &lit_5944); #pragma pop /* 805DCC78-805DCC7C 000224 0004+00 0/1 0/0 0/0 .rodata @5945 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5945 = 1540.0f; -COMPILER_STRIP_GATE(805DCC78, &lit_5945); +COMPILER_STRIP_GATE(0x805DCC78, &lit_5945); #pragma pop /* 805DCC7C-805DCC80 000228 0004+00 0/3 0/0 0/0 .rodata @5946 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5946 = 40.0f; -COMPILER_STRIP_GATE(805DCC7C, &lit_5946); +COMPILER_STRIP_GATE(0x805DCC7C, &lit_5946); #pragma pop /* 805DCC80-805DCC84 00022C 0004+00 0/1 0/0 0/0 .rodata @5947 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5947 = 1030.0f; -COMPILER_STRIP_GATE(805DCC80, &lit_5947); +COMPILER_STRIP_GATE(0x805DCC80, &lit_5947); #pragma pop /* 805DCC84-805DCC88 000230 0004+00 0/2 0/0 0/0 .rodata @5948 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5948 = 150.0f; -COMPILER_STRIP_GATE(805DCC84, &lit_5948); +COMPILER_STRIP_GATE(0x805DCC84, &lit_5948); #pragma pop /* 805DCC88-805DCC8C 000234 0004+00 0/1 0/0 0/0 .rodata @5949 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5949 = 1115.0f; -COMPILER_STRIP_GATE(805DCC88, &lit_5949); +COMPILER_STRIP_GATE(0x805DCC88, &lit_5949); #pragma pop /* 805DCC8C-805DCC90 000238 0004+00 0/1 0/0 0/0 .rodata @5950 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5950 = 1670.0f; -COMPILER_STRIP_GATE(805DCC8C, &lit_5950); +COMPILER_STRIP_GATE(0x805DCC8C, &lit_5950); #pragma pop /* 805DCC90-805DCC94 00023C 0004+00 0/1 0/0 0/0 .rodata @5951 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5951 = 160.0f; -COMPILER_STRIP_GATE(805DCC90, &lit_5951); +COMPILER_STRIP_GATE(0x805DCC90, &lit_5951); #pragma pop /* 805DCC94-805DCC98 000240 0004+00 0/1 0/0 0/0 .rodata @5952 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5952 = 1685.0f; -COMPILER_STRIP_GATE(805DCC94, &lit_5952); +COMPILER_STRIP_GATE(0x805DCC94, &lit_5952); #pragma pop /* 805DCC98-805DCC9C 000244 0004+00 0/3 0/0 0/0 .rodata @5953 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5953 = 180.0f; -COMPILER_STRIP_GATE(805DCC98, &lit_5953); +COMPILER_STRIP_GATE(0x805DCC98, &lit_5953); #pragma pop /* 805DCC9C-805DCCA0 000248 0004+00 0/1 0/0 0/0 .rodata @5954 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5954 = 1730.0f; -COMPILER_STRIP_GATE(805DCC9C, &lit_5954); +COMPILER_STRIP_GATE(0x805DCC9C, &lit_5954); #pragma pop /* 805DCCA0-805DCCA4 00024C 0004+00 0/2 0/0 0/0 .rodata @5955 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5955 = 360.0f; -COMPILER_STRIP_GATE(805DCCA0, &lit_5955); +COMPILER_STRIP_GATE(0x805DCCA0, &lit_5955); #pragma pop /* 805DCCA4-805DCCA8 000250 0004+00 0/1 0/0 0/0 .rodata @5956 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5956 = 1220.0f; -COMPILER_STRIP_GATE(805DCCA4, &lit_5956); +COMPILER_STRIP_GATE(0x805DCCA4, &lit_5956); #pragma pop /* 805DCCA8-805DCCAC 000254 0004+00 0/1 0/0 0/0 .rodata @5957 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5957 = 2080.0f; -COMPILER_STRIP_GATE(805DCCA8, &lit_5957); +COMPILER_STRIP_GATE(0x805DCCA8, &lit_5957); #pragma pop /* 805DCCAC-805DCCB0 000258 0004+00 0/1 0/0 0/0 .rodata @5958 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5958 = 340.0f; -COMPILER_STRIP_GATE(805DCCAC, &lit_5958); +COMPILER_STRIP_GATE(0x805DCCAC, &lit_5958); #pragma pop /* 805DCCB0-805DCCB4 00025C 0004+00 0/1 0/0 0/0 .rodata @5959 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5959 = 755.0f; -COMPILER_STRIP_GATE(805DCCB0, &lit_5959); +COMPILER_STRIP_GATE(0x805DCCB0, &lit_5959); #pragma pop /* 805DCCB4-805DCCB8 000260 0004+00 0/1 0/0 0/0 .rodata @5960 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5960 = 2020.0f; -COMPILER_STRIP_GATE(805DCCB4, &lit_5960); +COMPILER_STRIP_GATE(0x805DCCB4, &lit_5960); #pragma pop /* 805DCCB8-805DCCBC 000264 0004+00 0/1 0/0 0/0 .rodata @5961 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5961 = 170.0f; -COMPILER_STRIP_GATE(805DCCB8, &lit_5961); +COMPILER_STRIP_GATE(0x805DCCB8, &lit_5961); #pragma pop /* 805DCCBC-805DCCC0 000268 0004+00 0/1 0/0 0/0 .rodata @5962 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5962 = 1710.0f; -COMPILER_STRIP_GATE(805DCCBC, &lit_5962); +COMPILER_STRIP_GATE(0x805DCCBC, &lit_5962); #pragma pop /* 805DCCC0-805DCCC4 00026C 0004+00 0/1 0/0 0/0 .rodata @5963 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5963 = 695.0f; -COMPILER_STRIP_GATE(805DCCC0, &lit_5963); +COMPILER_STRIP_GATE(0x805DCCC0, &lit_5963); #pragma pop /* 805DCCC4-805DCCC8 000270 0004+00 0/1 0/0 0/0 .rodata @5964 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5964 = 3200.0f; -COMPILER_STRIP_GATE(805DCCC4, &lit_5964); +COMPILER_STRIP_GATE(0x805DCCC4, &lit_5964); #pragma pop /* 805DCCC8-805DCCCC 000274 0004+00 0/1 0/0 0/0 .rodata @5965 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5965 = 2570.0f; -COMPILER_STRIP_GATE(805DCCC8, &lit_5965); +COMPILER_STRIP_GATE(0x805DCCC8, &lit_5965); #pragma pop /* 805DCCCC-805DCCD0 000278 0004+00 0/3 0/0 0/0 .rodata @5966 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5966 = 600.0f; -COMPILER_STRIP_GATE(805DCCCC, &lit_5966); +COMPILER_STRIP_GATE(0x805DCCCC, &lit_5966); #pragma pop /* 805DCCD0-805DCCD4 00027C 0004+00 0/1 0/0 0/0 .rodata @5967 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5967 = 710.0f; -COMPILER_STRIP_GATE(805DCCD0, &lit_5967); +COMPILER_STRIP_GATE(0x805DCCD0, &lit_5967); #pragma pop /* 805DCCD4-805DCCD8 000280 0004+00 0/1 0/0 0/0 .rodata @5968 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5968 = 125.0f; -COMPILER_STRIP_GATE(805DCCD4, &lit_5968); +COMPILER_STRIP_GATE(0x805DCCD4, &lit_5968); #pragma pop /* 805DCCD8-805DCCDC 000284 0004+00 0/2 0/0 0/0 .rodata @5969 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5969 = 3320.0f; -COMPILER_STRIP_GATE(805DCCD8, &lit_5969); +COMPILER_STRIP_GATE(0x805DCCD8, &lit_5969); #pragma pop /* 805DCCDC-805DCCE0 000288 0004+00 0/1 0/0 0/0 .rodata @5970 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5970 = 4700.0f; -COMPILER_STRIP_GATE(805DCCDC, &lit_5970); +COMPILER_STRIP_GATE(0x805DCCDC, &lit_5970); +#pragma pop + +/* 805DD22C-805DD22C 0007D8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_805DD231 = "force_start"; +SECTION_DEAD static char const* const stringBase_805DD23D = "force_end"; #pragma pop /* 805DDB0C-805DDB10 -00001 0004+00 0/1 0/0 0/0 .bss None */ @@ -3048,168 +3061,168 @@ asm void daB_DS_c::mHandBreathChk() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5971 = 3.0f / 10.0f; -COMPILER_STRIP_GATE(805DCCE0, &lit_5971); +COMPILER_STRIP_GATE(0x805DCCE0, &lit_5971); #pragma pop /* 805DCCE4-805DCCE8 000290 0004+00 0/2 0/0 0/0 .rodata @5972 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5972 = 1900.0f; -COMPILER_STRIP_GATE(805DCCE4, &lit_5972); +COMPILER_STRIP_GATE(0x805DCCE4, &lit_5972); #pragma pop /* 805DCCE8-805DCCEC 000294 0004+00 0/0 0/0 0/0 .rodata @5973 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5973 = 4727.0f; -COMPILER_STRIP_GATE(805DCCE8, &lit_5973); +COMPILER_STRIP_GATE(0x805DCCE8, &lit_5973); #pragma pop /* 805DCCEC-805DCCF0 000298 0004+00 0/0 0/0 0/0 .rodata @5974 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5974 = 1981.0f; -COMPILER_STRIP_GATE(805DCCEC, &lit_5974); +COMPILER_STRIP_GATE(0x805DCCEC, &lit_5974); #pragma pop /* 805DCCF0-805DCCF4 00029C 0004+00 0/0 0/0 0/0 .rodata @5975 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5975 = 5018.0f; -COMPILER_STRIP_GATE(805DCCF0, &lit_5975); +COMPILER_STRIP_GATE(0x805DCCF0, &lit_5975); #pragma pop /* 805DCCF4-805DCCF8 0002A0 0004+00 0/0 0/0 0/0 .rodata @5976 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5976 = 2200.0f; -COMPILER_STRIP_GATE(805DCCF4, &lit_5976); +COMPILER_STRIP_GATE(0x805DCCF4, &lit_5976); #pragma pop /* 805DCCF8-805DCCFC 0002A4 0004+00 0/0 0/0 0/0 .rodata @5977 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5977 = 780.0f; -COMPILER_STRIP_GATE(805DCCF8, &lit_5977); +COMPILER_STRIP_GATE(0x805DCCF8, &lit_5977); #pragma pop /* 805DCCFC-805DCD00 0002A8 0004+00 0/0 0/0 0/0 .rodata @5978 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5978 = -420.0f; -COMPILER_STRIP_GATE(805DCCFC, &lit_5978); +COMPILER_STRIP_GATE(0x805DCCFC, &lit_5978); #pragma pop /* 805DCD00-805DCD04 0002AC 0004+00 0/0 0/0 0/0 .rodata @5979 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5979 = 350.0f; -COMPILER_STRIP_GATE(805DCD00, &lit_5979); +COMPILER_STRIP_GATE(0x805DCD00, &lit_5979); #pragma pop /* 805DCD04-805DCD08 0002B0 0004+00 0/2 0/0 0/0 .rodata @5980 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5980 = 4.0f; -COMPILER_STRIP_GATE(805DCD04, &lit_5980); +COMPILER_STRIP_GATE(0x805DCD04, &lit_5980); #pragma pop /* 805DCD08-805DCD0C 0002B4 0004+00 0/5 0/0 0/0 .rodata @5981 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5981 = 20.0f; -COMPILER_STRIP_GATE(805DCD08, &lit_5981); +COMPILER_STRIP_GATE(0x805DCD08, &lit_5981); #pragma pop /* 805DCD0C-805DCD10 0002B8 0004+00 0/0 0/0 0/0 .rodata @5982 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5982 = 9.0f; -COMPILER_STRIP_GATE(805DCD0C, &lit_5982); +COMPILER_STRIP_GATE(0x805DCD0C, &lit_5982); #pragma pop /* 805DCD10-805DCD14 0002BC 0004+00 0/6 0/0 0/0 .rodata @5983 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5983 = 30.0f; -COMPILER_STRIP_GATE(805DCD10, &lit_5983); +COMPILER_STRIP_GATE(0x805DCD10, &lit_5983); #pragma pop /* 805DCD14-805DCD18 0002C0 0004+00 0/0 0/0 0/0 .rodata @5984 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5984 = 76.0f; -COMPILER_STRIP_GATE(805DCD14, &lit_5984); +COMPILER_STRIP_GATE(0x805DCD14, &lit_5984); #pragma pop /* 805DCD18-805DCD1C 0002C4 0004+00 0/0 0/0 0/0 .rodata @5985 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5985 = 49.0f / 10.0f; -COMPILER_STRIP_GATE(805DCD18, &lit_5985); +COMPILER_STRIP_GATE(0x805DCD18, &lit_5985); #pragma pop /* 805DCD1C-805DCD20 0002C8 0004+00 0/1 0/0 0/0 .rodata @5986 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5986 = 254.0f; -COMPILER_STRIP_GATE(805DCD1C, &lit_5986); +COMPILER_STRIP_GATE(0x805DCD1C, &lit_5986); #pragma pop /* 805DCD20-805DCD24 0002CC 0004+00 0/4 0/0 0/0 .rodata @5987 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5987 = -100.0f; -COMPILER_STRIP_GATE(805DCD20, &lit_5987); +COMPILER_STRIP_GATE(0x805DCD20, &lit_5987); #pragma pop /* 805DCD24-805DCD28 0002D0 0004+00 0/0 0/0 0/0 .rodata @5988 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5988 = 517.0f; -COMPILER_STRIP_GATE(805DCD24, &lit_5988); +COMPILER_STRIP_GATE(0x805DCD24, &lit_5988); #pragma pop /* 805DCD28-805DCD2C 0002D4 0004+00 0/0 0/0 0/0 .rodata @5989 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5989 = 518.0f; -COMPILER_STRIP_GATE(805DCD28, &lit_5989); +COMPILER_STRIP_GATE(0x805DCD28, &lit_5989); #pragma pop /* 805DCD2C-805DCD30 0002D8 0004+00 0/2 0/0 0/0 .rodata @5990 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5990 = 670.0f; -COMPILER_STRIP_GATE(805DCD2C, &lit_5990); +COMPILER_STRIP_GATE(0x805DCD2C, &lit_5990); #pragma pop /* 805DCD30-805DCD34 0002DC 0004+00 0/0 0/0 0/0 .rodata @5991 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5991 = 6.0f / 5.0f; -COMPILER_STRIP_GATE(805DCD30, &lit_5991); +COMPILER_STRIP_GATE(0x805DCD30, &lit_5991); #pragma pop /* 805DCD34-805DCD38 0002E0 0004+00 0/0 0/0 0/0 .rodata @5992 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5992 = 770.0f; -COMPILER_STRIP_GATE(805DCD34, &lit_5992); +COMPILER_STRIP_GATE(0x805DCD34, &lit_5992); #pragma pop /* 805DCD38-805DCD3C 0002E4 0004+00 0/1 0/0 0/0 .rodata @5993 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_5993 = 0x3A83126F; -COMPILER_STRIP_GATE(805DCD38, &lit_5993); +COMPILER_STRIP_GATE(0x805DCD38, &lit_5993); #pragma pop /* 805DCD3C-805DCD40 0002E8 0004+00 0/2 0/0 0/0 .rodata @6201 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6201 = 60.0f; -COMPILER_STRIP_GATE(805DCD3C, &lit_6201); +COMPILER_STRIP_GATE(0x805DCD3C, &lit_6201); #pragma pop /* 805D002C-805D0194 004EEC 0168+00 1/1 0/0 0/0 .text executeWait__8daB_DS_cFv */ @@ -3257,7 +3270,7 @@ asm void daB_DS_c::damageSet() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6296 = 300.0f; -COMPILER_STRIP_GATE(805DCD40, &lit_6296); +COMPILER_STRIP_GATE(0x805DCD40, &lit_6296); #pragma pop /* 805D03EC-805D0584 0052AC 0198+00 1/1 0/0 0/0 .text damageHitCamera__8daB_DS_cFv */ @@ -3275,21 +3288,21 @@ asm void daB_DS_c::damageHitCamera() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6344 = 50.0f; -COMPILER_STRIP_GATE(805DCD44, &lit_6344); +COMPILER_STRIP_GATE(0x805DCD44, &lit_6344); #pragma pop /* 805DCD48-805DCD4C 0002F4 0004+00 0/1 0/0 0/0 .rodata @6345 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6345 = 13.0f; -COMPILER_STRIP_GATE(805DCD48, &lit_6345); +COMPILER_STRIP_GATE(0x805DCD48, &lit_6345); #pragma pop /* 805DCD4C-805DCD50 0002F8 0004+00 0/2 0/0 0/0 .rodata @6346 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6346 = 29.0f; -COMPILER_STRIP_GATE(805DCD4C, &lit_6346); +COMPILER_STRIP_GATE(0x805DCD4C, &lit_6346); #pragma pop /* 805D0584-805D074C 005444 01C8+00 1/1 0/0 0/0 .text damageDownCheck__8daB_DS_cFv */ @@ -3314,305 +3327,305 @@ SECTION_RODATA static u8 const BROKENBORN_EFF_DT[96] = { 0x8B, 0xE3, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x8B, 0xE4, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x8B, 0xE5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x8B, 0xE6, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, }; -COMPILER_STRIP_GATE(805DCD50, &BROKENBORN_EFF_DT); +COMPILER_STRIP_GATE(0x805DCD50, &BROKENBORN_EFF_DT); #pragma pop /* 805DCDB0-805DCDB4 00035C 0004+00 0/2 0/0 0/0 .rodata @7114 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7114 = 345.0f; -COMPILER_STRIP_GATE(805DCDB0, &lit_7114); +COMPILER_STRIP_GATE(0x805DCDB0, &lit_7114); #pragma pop /* 805DCDB4-805DCDB8 000360 0004+00 0/1 0/0 0/0 .rodata @7115 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7115 = 2100.0f; -COMPILER_STRIP_GATE(805DCDB4, &lit_7115); +COMPILER_STRIP_GATE(0x805DCDB4, &lit_7115); #pragma pop /* 805DCDB8-805DCDBC 000364 0004+00 0/1 0/0 0/0 .rodata @7116 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7116 = -1575.0f; -COMPILER_STRIP_GATE(805DCDB8, &lit_7116); +COMPILER_STRIP_GATE(0x805DCDB8, &lit_7116); #pragma pop /* 805DCDBC-805DCDC0 000368 0004+00 0/2 0/0 0/0 .rodata @7117 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7117 = 1490.0f; -COMPILER_STRIP_GATE(805DCDBC, &lit_7117); +COMPILER_STRIP_GATE(0x805DCDBC, &lit_7117); #pragma pop /* 805DCDC0-805DCDC4 00036C 0004+00 0/1 0/0 0/0 .rodata @7118 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7118 = -2050.0f; -COMPILER_STRIP_GATE(805DCDC0, &lit_7118); +COMPILER_STRIP_GATE(0x805DCDC0, &lit_7118); #pragma pop /* 805DCDC4-805DCDC8 000370 0004+00 0/1 0/0 0/0 .rodata @7119 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7119 = 1465.0f; -COMPILER_STRIP_GATE(805DCDC4, &lit_7119); +COMPILER_STRIP_GATE(0x805DCDC4, &lit_7119); #pragma pop /* 805DCDC8-805DCDCC 000374 0004+00 0/1 0/0 0/0 .rodata @7120 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7120 = 1135.0f; -COMPILER_STRIP_GATE(805DCDC8, &lit_7120); +COMPILER_STRIP_GATE(0x805DCDC8, &lit_7120); #pragma pop /* 805DCDCC-805DCDD0 000378 0004+00 0/1 0/0 0/0 .rodata @7121 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7121 = -2110.0f; -COMPILER_STRIP_GATE(805DCDCC, &lit_7121); +COMPILER_STRIP_GATE(0x805DCDCC, &lit_7121); #pragma pop /* 805DCDD0-805DCDD4 00037C 0004+00 0/1 0/0 0/0 .rodata @7122 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7122 = -320.0f; -COMPILER_STRIP_GATE(805DCDD0, &lit_7122); +COMPILER_STRIP_GATE(0x805DCDD0, &lit_7122); #pragma pop /* 805DCDD4-805DCDD8 000380 0004+00 0/1 0/0 0/0 .rodata @7123 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7123 = -2355.0f; -COMPILER_STRIP_GATE(805DCDD4, &lit_7123); +COMPILER_STRIP_GATE(0x805DCDD4, &lit_7123); #pragma pop /* 805DCDD8-805DCDDC 000384 0004+00 0/1 0/0 0/0 .rodata @7124 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7124 = -1900.0f; -COMPILER_STRIP_GATE(805DCDD8, &lit_7124); +COMPILER_STRIP_GATE(0x805DCDD8, &lit_7124); #pragma pop /* 805DCDDC-805DCDE0 000388 0004+00 0/1 0/0 0/0 .rodata @7125 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7125 = -180.0f; -COMPILER_STRIP_GATE(805DCDDC, &lit_7125); +COMPILER_STRIP_GATE(0x805DCDDC, &lit_7125); #pragma pop /* 805DCDE0-805DCDE4 00038C 0004+00 0/1 0/0 0/0 .rodata @7126 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7126 = 1390.0f; -COMPILER_STRIP_GATE(805DCDE0, &lit_7126); +COMPILER_STRIP_GATE(0x805DCDE0, &lit_7126); #pragma pop /* 805DCDE4-805DCDE8 000390 0004+00 0/1 0/0 0/0 .rodata @7127 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7127 = 3080.0f; -COMPILER_STRIP_GATE(805DCDE4, &lit_7127); +COMPILER_STRIP_GATE(0x805DCDE4, &lit_7127); #pragma pop /* 805DCDE8-805DCDEC 000394 0004+00 0/1 0/0 0/0 .rodata @7128 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7128 = 1675.0f; -COMPILER_STRIP_GATE(805DCDE8, &lit_7128); +COMPILER_STRIP_GATE(0x805DCDE8, &lit_7128); #pragma pop /* 805DCDEC-805DCDF0 000398 0004+00 0/1 0/0 0/0 .rodata @7129 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7129 = 1120.0f; -COMPILER_STRIP_GATE(805DCDEC, &lit_7129); +COMPILER_STRIP_GATE(0x805DCDEC, &lit_7129); #pragma pop /* 805DCDF0-805DCDF4 00039C 0004+00 0/1 0/0 0/0 .rodata @7130 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7130 = -2310.0f; -COMPILER_STRIP_GATE(805DCDF0, &lit_7130); +COMPILER_STRIP_GATE(0x805DCDF0, &lit_7130); #pragma pop /* 805DCDF4-805DCDF8 0003A0 0004+00 0/1 0/0 0/0 .rodata @7131 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7131 = 1690.0f; -COMPILER_STRIP_GATE(805DCDF4, &lit_7131); +COMPILER_STRIP_GATE(0x805DCDF4, &lit_7131); #pragma pop /* 805DCDF8-805DCDFC 0003A4 0004+00 0/1 0/0 0/0 .rodata @7132 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7132 = 1210.0f; -COMPILER_STRIP_GATE(805DCDF8, &lit_7132); +COMPILER_STRIP_GATE(0x805DCDF8, &lit_7132); #pragma pop /* 805DCDFC-805DCE00 0003A8 0004+00 0/1 0/0 0/0 .rodata @7133 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7133 = -2315.0f; -COMPILER_STRIP_GATE(805DCDFC, &lit_7133); +COMPILER_STRIP_GATE(0x805DCDFC, &lit_7133); #pragma pop /* 805DCE00-805DCE04 0003AC 0004+00 0/3 0/0 0/0 .rodata @7134 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7134 = 1400.0f; -COMPILER_STRIP_GATE(805DCE00, &lit_7134); +COMPILER_STRIP_GATE(0x805DCE00, &lit_7134); #pragma pop /* 805DCE04-805DCE08 0003B0 0004+00 0/1 0/0 0/0 .rodata @7135 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7135 = 2215.0f; -COMPILER_STRIP_GATE(805DCE04, &lit_7135); +COMPILER_STRIP_GATE(0x805DCE04, &lit_7135); #pragma pop /* 805DCE08-805DCE0C 0003B4 0004+00 0/1 0/0 0/0 .rodata @7136 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7136 = 280.0f; -COMPILER_STRIP_GATE(805DCE08, &lit_7136); +COMPILER_STRIP_GATE(0x805DCE08, &lit_7136); #pragma pop /* 805DCE0C-805DCE10 0003B8 0004+00 1/10 0/0 0/0 .rodata @7137 */ SECTION_RODATA static f32 const lit_7137 = 3.0f; -COMPILER_STRIP_GATE(805DCE0C, &lit_7137); +COMPILER_STRIP_GATE(0x805DCE0C, &lit_7137); /* 805DCE10-805DCE14 0003BC 0004+00 0/1 0/0 0/0 .rodata @7138 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7138 = 24.0f; -COMPILER_STRIP_GATE(805DCE10, &lit_7138); +COMPILER_STRIP_GATE(0x805DCE10, &lit_7138); #pragma pop /* 805DCE14-805DCE18 0003C0 0004+00 0/1 0/0 0/0 .rodata @7139 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7139 = 12.75f; -COMPILER_STRIP_GATE(805DCE14, &lit_7139); +COMPILER_STRIP_GATE(0x805DCE14, &lit_7139); #pragma pop /* 805DCE18-805DCE1C 0003C4 0004+00 0/1 0/0 0/0 .rodata @7140 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7140 = 1100.0f; -COMPILER_STRIP_GATE(805DCE18, &lit_7140); +COMPILER_STRIP_GATE(0x805DCE18, &lit_7140); #pragma pop /* 805DCE1C-805DCE20 0003C8 0004+00 0/1 0/0 0/0 .rodata @7141 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7141 = -1500.0f; -COMPILER_STRIP_GATE(805DCE1C, &lit_7141); +COMPILER_STRIP_GATE(0x805DCE1C, &lit_7141); #pragma pop /* 805DCE20-805DCE24 0003CC 0004+00 0/1 0/0 0/0 .rodata @7142 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7142 = 1600.0f; -COMPILER_STRIP_GATE(805DCE20, &lit_7142); +COMPILER_STRIP_GATE(0x805DCE20, &lit_7142); #pragma pop /* 805DCE24-805DCE28 0003D0 0004+00 0/1 0/0 0/0 .rodata @7143 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7143 = 4200.0f; -COMPILER_STRIP_GATE(805DCE24, &lit_7143); +COMPILER_STRIP_GATE(0x805DCE24, &lit_7143); #pragma pop /* 805DCE28-805DCE2C 0003D4 0004+00 0/1 0/0 0/0 .rodata @7144 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7144 = 32768.0f; -COMPILER_STRIP_GATE(805DCE28, &lit_7144); +COMPILER_STRIP_GATE(0x805DCE28, &lit_7144); #pragma pop /* 805DCE2C-805DCE30 0003D8 0004+00 0/1 0/0 0/0 .rodata @7145 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7145 = -1000.0f; -COMPILER_STRIP_GATE(805DCE2C, &lit_7145); +COMPILER_STRIP_GATE(0x805DCE2C, &lit_7145); #pragma pop /* 805DCE30-805DCE34 0003DC 0004+00 0/1 0/0 0/0 .rodata @7146 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7146 = -1600.0f; -COMPILER_STRIP_GATE(805DCE30, &lit_7146); +COMPILER_STRIP_GATE(0x805DCE30, &lit_7146); #pragma pop /* 805DCE34-805DCE38 0003E0 0004+00 0/1 0/0 0/0 .rodata @7147 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7147 = 2315.0f; -COMPILER_STRIP_GATE(805DCE34, &lit_7147); +COMPILER_STRIP_GATE(0x805DCE34, &lit_7147); #pragma pop /* 805DCE38-805DCE3C 0003E4 0004+00 0/1 0/0 0/0 .rodata @7148 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7148 = 241.0f; -COMPILER_STRIP_GATE(805DCE38, &lit_7148); +COMPILER_STRIP_GATE(0x805DCE38, &lit_7148); #pragma pop /* 805DCE3C-805DCE40 0003E8 0004+00 0/2 0/0 0/0 .rodata @7149 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7149 = 145.0f; -COMPILER_STRIP_GATE(805DCE3C, &lit_7149); +COMPILER_STRIP_GATE(0x805DCE3C, &lit_7149); #pragma pop /* 805DCE40-805DCE44 0003EC 0004+00 0/1 0/0 0/0 .rodata @7150 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7150 = 215.0f; -COMPILER_STRIP_GATE(805DCE40, &lit_7150); +COMPILER_STRIP_GATE(0x805DCE40, &lit_7150); #pragma pop /* 805DCE44-805DCE48 0003F0 0004+00 0/1 0/0 0/0 .rodata @7151 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7151 = -1.0f / 5.0f; -COMPILER_STRIP_GATE(805DCE44, &lit_7151); +COMPILER_STRIP_GATE(0x805DCE44, &lit_7151); #pragma pop /* 805DCE48-805DCE4C 0003F4 0004+00 0/3 0/0 0/0 .rodata @7152 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7152 = -300.0f; -COMPILER_STRIP_GATE(805DCE48, &lit_7152); +COMPILER_STRIP_GATE(0x805DCE48, &lit_7152); #pragma pop /* 805DCE4C-805DCE50 0003F8 0004+00 0/1 0/0 0/0 .rodata @7153 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7153 = -1510.0f; -COMPILER_STRIP_GATE(805DCE4C, &lit_7153); +COMPILER_STRIP_GATE(0x805DCE4C, &lit_7153); #pragma pop /* 805DCE50-805DCE54 0003FC 0004+00 0/1 0/0 0/0 .rodata @7154 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7154 = -1435.0f; -COMPILER_STRIP_GATE(805DCE50, &lit_7154); +COMPILER_STRIP_GATE(0x805DCE50, &lit_7154); #pragma pop /* 805DCE54-805DCE58 000400 0004+00 0/1 0/0 0/0 .rodata @7155 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7155 = 2525.0f; -COMPILER_STRIP_GATE(805DCE54, &lit_7155); +COMPILER_STRIP_GATE(0x805DCE54, &lit_7155); #pragma pop /* 805DCE58-805DCE5C 000404 0004+00 0/2 0/0 0/0 .rodata @7156 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7156 = 1.0f / 50.0f; -COMPILER_STRIP_GATE(805DCE58, &lit_7156); +COMPILER_STRIP_GATE(0x805DCE58, &lit_7156); #pragma pop /* 805DDEA0-805DDEB0 000438 000C+04 0/1 0/0 0/0 .bss @6354 */ @@ -3722,14 +3735,14 @@ asm void daB_DS_c::breath_smokeSet() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7321 = 82.0f; -COMPILER_STRIP_GATE(805DCE5C, &lit_7321); +COMPILER_STRIP_GATE(0x805DCE5C, &lit_7321); #pragma pop /* 805DCE60-805DCE64 00040C 0004+00 0/1 0/0 0/0 .rodata @7322 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7322 = 1.0f / 25.0f; -COMPILER_STRIP_GATE(805DCE60, &lit_7322); +COMPILER_STRIP_GATE(0x805DCE60, &lit_7322); #pragma pop /* 805D226C-805D2520 00712C 02B4+00 1/1 0/0 0/0 .text executeBreathAttack__8daB_DS_cFv */ @@ -3747,14 +3760,14 @@ asm void daB_DS_c::executeBreathAttack() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7385 = 90.0f; -COMPILER_STRIP_GATE(805DCE64, &lit_7385); +COMPILER_STRIP_GATE(0x805DCE64, &lit_7385); #pragma pop /* 805DCE68-805DCE6C 000414 0004+00 0/1 0/0 0/0 .rodata @7386 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7386 = 0.25f; -COMPILER_STRIP_GATE(805DCE68, &lit_7386); +COMPILER_STRIP_GATE(0x805DCE68, &lit_7386); #pragma pop /* 805D2520-805D272C 0073E0 020C+00 1/1 0/0 0/0 .text executeHandAttack__8daB_DS_cFv */ @@ -3782,273 +3795,273 @@ asm void daB_DS_c::executeBreathSearch() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7892 = 315.0f; -COMPILER_STRIP_GATE(805DCE6C, &lit_7892); +COMPILER_STRIP_GATE(0x805DCE6C, &lit_7892); #pragma pop /* 805DCE70-805DCE74 00041C 0004+00 0/1 0/0 0/0 .rodata @7893 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7893 = 1460.0f; -COMPILER_STRIP_GATE(805DCE70, &lit_7893); +COMPILER_STRIP_GATE(0x805DCE70, &lit_7893); #pragma pop /* 805DCE74-805DCE78 000420 0004+00 0/1 0/0 0/0 .rodata @7894 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7894 = 415.0f; -COMPILER_STRIP_GATE(805DCE74, &lit_7894); +COMPILER_STRIP_GATE(0x805DCE74, &lit_7894); #pragma pop /* 805DCE78-805DCE7C 000424 0004+00 0/2 0/0 0/0 .rodata @7895 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7895 = 1880.0f; -COMPILER_STRIP_GATE(805DCE78, &lit_7895); +COMPILER_STRIP_GATE(0x805DCE78, &lit_7895); #pragma pop /* 805DCE7C-805DCE80 000428 0004+00 0/1 0/0 0/0 .rodata @7896 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7896 = 465.0f; -COMPILER_STRIP_GATE(805DCE7C, &lit_7896); +COMPILER_STRIP_GATE(0x805DCE7C, &lit_7896); #pragma pop /* 805DCE80-805DCE84 00042C 0004+00 0/1 0/0 0/0 .rodata @7897 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7897 = -255.0f; -COMPILER_STRIP_GATE(805DCE80, &lit_7897); +COMPILER_STRIP_GATE(0x805DCE80, &lit_7897); #pragma pop /* 805DCE84-805DCE88 000430 0004+00 0/1 0/0 0/0 .rodata @7898 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7898 = -1460.0f; -COMPILER_STRIP_GATE(805DCE84, &lit_7898); +COMPILER_STRIP_GATE(0x805DCE84, &lit_7898); #pragma pop /* 805DCE88-805DCE8C 000434 0004+00 0/1 0/0 0/0 .rodata @7899 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7899 = 3070.0f; -COMPILER_STRIP_GATE(805DCE88, &lit_7899); +COMPILER_STRIP_GATE(0x805DCE88, &lit_7899); #pragma pop /* 805DCE8C-805DCE90 000438 0004+00 0/1 0/0 0/0 .rodata @7900 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7900 = 3340.0f; -COMPILER_STRIP_GATE(805DCE8C, &lit_7900); +COMPILER_STRIP_GATE(0x805DCE8C, &lit_7900); #pragma pop /* 805DCE90-805DCE94 00043C 0004+00 0/1 0/0 0/0 .rodata @7901 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7901 = 1940.0f; -COMPILER_STRIP_GATE(805DCE90, &lit_7901); +COMPILER_STRIP_GATE(0x805DCE90, &lit_7901); #pragma pop /* 805DCE94-805DCE98 000440 0004+00 0/1 0/0 0/0 .rodata @7902 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7902 = 1520.0f; -COMPILER_STRIP_GATE(805DCE94, &lit_7902); +COMPILER_STRIP_GATE(0x805DCE94, &lit_7902); #pragma pop /* 805DCE98-805DCE9C 000444 0004+00 0/1 0/0 0/0 .rodata @7903 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7903 = 165.0f; -COMPILER_STRIP_GATE(805DCE98, &lit_7903); +COMPILER_STRIP_GATE(0x805DCE98, &lit_7903); #pragma pop /* 805DCE9C-805DCEA0 000448 0004+00 0/1 0/0 0/0 .rodata @7904 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7904 = 1930.0f; -COMPILER_STRIP_GATE(805DCE9C, &lit_7904); +COMPILER_STRIP_GATE(0x805DCE9C, &lit_7904); #pragma pop /* 805DCEA0-805DCEA4 00044C 0004+00 0/1 0/0 0/0 .rodata @7905 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7905 = 1515.0f; -COMPILER_STRIP_GATE(805DCEA0, &lit_7905); +COMPILER_STRIP_GATE(0x805DCEA0, &lit_7905); #pragma pop /* 805DCEA4-805DCEA8 000450 0004+00 0/1 0/0 0/0 .rodata @7906 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7906 = 2083.0f; -COMPILER_STRIP_GATE(805DCEA4, &lit_7906); +COMPILER_STRIP_GATE(0x805DCEA4, &lit_7906); #pragma pop /* 805DCEA8-805DCEAC 000454 0004+00 0/1 0/0 0/0 .rodata @7907 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7907 = 450.0f; -COMPILER_STRIP_GATE(805DCEA8, &lit_7907); +COMPILER_STRIP_GATE(0x805DCEA8, &lit_7907); #pragma pop /* 805DCEAC-805DCEB0 000458 0004+00 0/1 0/0 0/0 .rodata @7908 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7908 = 1955.0f; -COMPILER_STRIP_GATE(805DCEAC, &lit_7908); +COMPILER_STRIP_GATE(0x805DCEAC, &lit_7908); #pragma pop /* 805DCEB0-805DCEB4 00045C 0004+00 0/1 0/0 0/0 .rodata @7909 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7909 = 1815.0f; -COMPILER_STRIP_GATE(805DCEB0, &lit_7909); +COMPILER_STRIP_GATE(0x805DCEB0, &lit_7909); #pragma pop /* 805DCEB4-805DCEB8 000460 0004+00 0/1 0/0 0/0 .rodata @7910 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7910 = 2370.0f; -COMPILER_STRIP_GATE(805DCEB4, &lit_7910); +COMPILER_STRIP_GATE(0x805DCEB4, &lit_7910); #pragma pop /* 805DCEB8-805DCEBC 000464 0004+00 0/1 0/0 0/0 .rodata @7911 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7911 = 1660.0f; -COMPILER_STRIP_GATE(805DCEB8, &lit_7911); +COMPILER_STRIP_GATE(0x805DCEB8, &lit_7911); #pragma pop /* 805DCEBC-805DCEC0 000468 0004+00 0/1 0/0 0/0 .rodata @7912 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7912 = -290.0f; -COMPILER_STRIP_GATE(805DCEBC, &lit_7912); +COMPILER_STRIP_GATE(0x805DCEBC, &lit_7912); #pragma pop /* 805DCEC0-805DCEC4 00046C 0004+00 0/1 0/0 0/0 .rodata @7913 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7913 = -1560.0f; -COMPILER_STRIP_GATE(805DCEC0, &lit_7913); +COMPILER_STRIP_GATE(0x805DCEC0, &lit_7913); #pragma pop /* 805DCEC4-805DCEC8 000470 0004+00 0/1 0/0 0/0 .rodata @7914 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7914 = 3690.0f; -COMPILER_STRIP_GATE(805DCEC4, &lit_7914); +COMPILER_STRIP_GATE(0x805DCEC4, &lit_7914); #pragma pop /* 805DCEC8-805DCECC 000474 0004+00 0/1 0/0 0/0 .rodata @7915 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7915 = 3230.0f; -COMPILER_STRIP_GATE(805DCEC8, &lit_7915); +COMPILER_STRIP_GATE(0x805DCEC8, &lit_7915); #pragma pop /* 805DCECC-805DCED0 000478 0004+00 0/1 0/0 0/0 .rodata @7916 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7916 = -15.0f; -COMPILER_STRIP_GATE(805DCECC, &lit_7916); +COMPILER_STRIP_GATE(0x805DCECC, &lit_7916); #pragma pop /* 805DCED0-805DCED4 00047C 0004+00 0/1 0/0 0/0 .rodata @7917 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7917 = 2005.0f; -COMPILER_STRIP_GATE(805DCED0, &lit_7917); +COMPILER_STRIP_GATE(0x805DCED0, &lit_7917); #pragma pop /* 805DCED4-805DCED8 000480 0004+00 0/1 0/0 0/0 .rodata @7918 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7918 = 1180.0f; -COMPILER_STRIP_GATE(805DCED4, &lit_7918); +COMPILER_STRIP_GATE(0x805DCED4, &lit_7918); #pragma pop /* 805DCED8-805DCEDC 000484 0004+00 0/1 0/0 0/0 .rodata @7919 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7919 = 1840.0f; -COMPILER_STRIP_GATE(805DCED8, &lit_7919); +COMPILER_STRIP_GATE(0x805DCED8, &lit_7919); #pragma pop /* 805DCEDC-805DCEE0 000488 0004+00 0/1 0/0 0/0 .rodata @7920 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7920 = 1885.0f; -COMPILER_STRIP_GATE(805DCEDC, &lit_7920); +COMPILER_STRIP_GATE(0x805DCEDC, &lit_7920); #pragma pop /* 805DCEE0-805DCEE4 00048C 0004+00 0/1 0/0 0/0 .rodata @7921 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7921 = 2260.0f; -COMPILER_STRIP_GATE(805DCEE0, &lit_7921); +COMPILER_STRIP_GATE(0x805DCEE0, &lit_7921); #pragma pop /* 805DCEE4-805DCEE8 000490 0004+00 0/1 0/0 0/0 .rodata @7922 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7922 = 2225.0f; -COMPILER_STRIP_GATE(805DCEE4, &lit_7922); +COMPILER_STRIP_GATE(0x805DCEE4, &lit_7922); #pragma pop /* 805DCEE8-805DCEEC 000494 0004+00 0/1 0/0 0/0 .rodata @7923 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7923 = 2145.0f; -COMPILER_STRIP_GATE(805DCEE8, &lit_7923); +COMPILER_STRIP_GATE(0x805DCEE8, &lit_7923); #pragma pop /* 805DCEEC-805DCEF0 000498 0004+00 0/1 0/0 0/0 .rodata @7924 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7924 = 1635.0f; -COMPILER_STRIP_GATE(805DCEEC, &lit_7924); +COMPILER_STRIP_GATE(0x805DCEEC, &lit_7924); #pragma pop /* 805DCEF0-805DCEF4 00049C 0004+00 0/1 0/0 0/0 .rodata @7925 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7925 = -745.0f; -COMPILER_STRIP_GATE(805DCEF0, &lit_7925); +COMPILER_STRIP_GATE(0x805DCEF0, &lit_7925); #pragma pop /* 805DCEF4-805DCEF8 0004A0 0004+00 0/1 0/0 0/0 .rodata @7926 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7926 = 2050.0f; -COMPILER_STRIP_GATE(805DCEF4, &lit_7926); +COMPILER_STRIP_GATE(0x805DCEF4, &lit_7926); #pragma pop /* 805DCEF8-805DCEFC 0004A4 0004+00 0/1 0/0 0/0 .rodata @7927 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7927 = -140.0f; -COMPILER_STRIP_GATE(805DCEF8, &lit_7927); +COMPILER_STRIP_GATE(0x805DCEF8, &lit_7927); #pragma pop /* 805DCEFC-805DCF00 0004A8 0004+00 0/1 0/0 0/0 .rodata @7928 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7928 = 2400.0f; -COMPILER_STRIP_GATE(805DCEFC, &lit_7928); +COMPILER_STRIP_GATE(0x805DCEFC, &lit_7928); #pragma pop /* 805DCF00-805DCF04 0004AC 0004+00 0/1 0/0 0/0 .rodata @7929 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7929 = -500.0f; -COMPILER_STRIP_GATE(805DCF00, &lit_7929); +COMPILER_STRIP_GATE(0x805DCF00, &lit_7929); #pragma pop /* 805DCF04-805DCF08 0004B0 0004+00 0/1 0/0 0/0 .rodata @7930 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7930 = 760.0f; -COMPILER_STRIP_GATE(805DCF04, &lit_7930); +COMPILER_STRIP_GATE(0x805DCF04, &lit_7930); #pragma pop /* 805DDF98-805DDFA8 000530 000C+04 0/1 0/0 0/0 .bss @7447 */ @@ -4277,7 +4290,7 @@ asm void daB_DS_c::mBattle2MoveFSet() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7931 = 35.0f; -COMPILER_STRIP_GATE(805DCF08, &lit_7931); +COMPILER_STRIP_GATE(0x805DCF08, &lit_7931); #pragma pop /* 805D497C-805D5040 00983C 06C4+00 1/1 0/0 0/0 .text executeBattle2FMove__8daB_DS_cFv */ @@ -4305,77 +4318,77 @@ asm void daB_DS_c::executeBattle2Tired() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7932 = 644.0f; -COMPILER_STRIP_GATE(805DCF0C, &lit_7932); +COMPILER_STRIP_GATE(0x805DCF0C, &lit_7932); #pragma pop /* 805DCF10-805DCF14 0004BC 0004+00 0/0 0/0 0/0 .rodata @7933 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7933 = -1495.0f; -COMPILER_STRIP_GATE(805DCF10, &lit_7933); +COMPILER_STRIP_GATE(0x805DCF10, &lit_7933); #pragma pop /* 805DCF14-805DCF18 0004C0 0004+00 0/0 0/0 0/0 .rodata @7934 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7934 = 2194.0f; -COMPILER_STRIP_GATE(805DCF14, &lit_7934); +COMPILER_STRIP_GATE(0x805DCF14, &lit_7934); #pragma pop /* 805DCF18-805DCF1C 0004C4 0004+00 0/0 0/0 0/0 .rodata @7935 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7935 = 968.0f; -COMPILER_STRIP_GATE(805DCF18, &lit_7935); +COMPILER_STRIP_GATE(0x805DCF18, &lit_7935); #pragma pop /* 805DCF1C-805DCF20 0004C8 0004+00 0/0 0/0 0/0 .rodata @7936 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7936 = -1421.0f; -COMPILER_STRIP_GATE(805DCF1C, &lit_7936); +COMPILER_STRIP_GATE(0x805DCF1C, &lit_7936); #pragma pop /* 805DCF20-805DCF24 0004CC 0004+00 0/0 0/0 0/0 .rodata @7937 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7937 = 2169.0f; -COMPILER_STRIP_GATE(805DCF20, &lit_7937); +COMPILER_STRIP_GATE(0x805DCF20, &lit_7937); #pragma pop /* 805DCF24-805DCF28 0004D0 0004+00 0/0 0/0 0/0 .rodata @7938 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7938 = 2195.0f; -COMPILER_STRIP_GATE(805DCF24, &lit_7938); +COMPILER_STRIP_GATE(0x805DCF24, &lit_7938); #pragma pop /* 805DCF28-805DCF2C 0004D4 0004+00 0/2 0/0 0/0 .rodata @8976 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8976 = 1.5f; -COMPILER_STRIP_GATE(805DCF28, &lit_8976); +COMPILER_STRIP_GATE(0x805DCF28, &lit_8976); #pragma pop /* 805DCF2C-805DCF30 0004D8 0004+00 0/2 0/0 0/0 .rodata @8977 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8977 = 4000.0f; -COMPILER_STRIP_GATE(805DCF2C, &lit_8977); +COMPILER_STRIP_GATE(0x805DCF2C, &lit_8977); #pragma pop /* 805DCF30-805DCF34 0004DC 0004+00 0/1 0/0 0/0 .rodata @8978 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8978 = -3.0f; -COMPILER_STRIP_GATE(805DCF30, &lit_8978); +COMPILER_STRIP_GATE(0x805DCF30, &lit_8978); #pragma pop /* 805DCF34-805DCF38 0004E0 0004+00 0/1 0/0 0/0 .rodata @8979 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8979 = 140.0f; -COMPILER_STRIP_GATE(805DCF34, &lit_8979); +COMPILER_STRIP_GATE(0x805DCF34, &lit_8979); #pragma pop /* 805D52D4-805D60BC 00A194 0DE8+00 1/1 0/0 0/0 .text executeBattle2Damage__8daB_DS_cFv @@ -4394,28 +4407,28 @@ asm void daB_DS_c::executeBattle2Damage() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9079 = -200.0f; -COMPILER_STRIP_GATE(805DCF38, &lit_9079); +COMPILER_STRIP_GATE(0x805DCF38, &lit_9079); #pragma pop /* 805DCF3C-805DCF40 0004E8 0004+00 0/1 0/0 0/0 .rodata @9080 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9080 = 8000.0f; -COMPILER_STRIP_GATE(805DCF3C, &lit_9080); +COMPILER_STRIP_GATE(0x805DCF3C, &lit_9080); #pragma pop /* 805DCF40-805DCF44 0004EC 0004+00 0/5 0/0 0/0 .rodata @9081 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9081 = 80.0f; -COMPILER_STRIP_GATE(805DCF40, &lit_9081); +COMPILER_STRIP_GATE(0x805DCF40, &lit_9081); #pragma pop /* 805DCF44-805DCF48 0004F0 0004+00 0/1 0/0 0/0 .rodata @9082 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9082 = 17.0f; -COMPILER_STRIP_GATE(805DCF44, &lit_9082); +COMPILER_STRIP_GATE(0x805DCF44, &lit_9082); #pragma pop /* 805D60BC-805D6534 00AF7C 0478+00 1/1 0/0 0/0 .text mDeadMove__8daB_DS_cFv */ @@ -4433,91 +4446,91 @@ asm void daB_DS_c::mDeadMove() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9560 = 70.0f; -COMPILER_STRIP_GATE(805DCF48, &lit_9560); +COMPILER_STRIP_GATE(0x805DCF48, &lit_9560); #pragma pop /* 805DCF4C-805DCF50 0004F8 0004+00 0/1 0/0 0/0 .rodata @9561 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9561 = 1890.0f; -COMPILER_STRIP_GATE(805DCF4C, &lit_9561); +COMPILER_STRIP_GATE(0x805DCF4C, &lit_9561); #pragma pop /* 805DCF50-805DCF54 0004FC 0004+00 0/1 0/0 0/0 .rodata @9562 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9562 = -1190.0f; -COMPILER_STRIP_GATE(805DCF50, &lit_9562); +COMPILER_STRIP_GATE(0x805DCF50, &lit_9562); #pragma pop /* 805DCF54-805DCF58 000500 0004+00 0/1 0/0 0/0 .rodata @9563 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9563 = -90.0f; -COMPILER_STRIP_GATE(805DCF54, &lit_9563); +COMPILER_STRIP_GATE(0x805DCF54, &lit_9563); #pragma pop /* 805DCF58-805DCF5C 000504 0004+00 0/1 0/0 0/0 .rodata @9564 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9564 = -2200.0f; -COMPILER_STRIP_GATE(805DCF58, &lit_9564); +COMPILER_STRIP_GATE(0x805DCF58, &lit_9564); #pragma pop /* 805DCF5C-805DCF60 000508 0004+00 0/1 0/0 0/0 .rodata @9565 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9565 = 105.0f; -COMPILER_STRIP_GATE(805DCF5C, &lit_9565); +COMPILER_STRIP_GATE(0x805DCF5C, &lit_9565); #pragma pop /* 805DCF60-805DCF64 00050C 0004+00 0/1 0/0 0/0 .rodata @9566 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9566 = -945.0f; -COMPILER_STRIP_GATE(805DCF60, &lit_9566); +COMPILER_STRIP_GATE(0x805DCF60, &lit_9566); #pragma pop /* 805DCF64-805DCF68 000510 0004+00 0/1 0/0 0/0 .rodata @9567 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9567 = 110.0f; -COMPILER_STRIP_GATE(805DCF64, &lit_9567); +COMPILER_STRIP_GATE(0x805DCF64, &lit_9567); #pragma pop /* 805DCF68-805DCF6C 000514 0004+00 0/1 0/0 0/0 .rodata @9568 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9568 = -885.0f; -COMPILER_STRIP_GATE(805DCF68, &lit_9568); +COMPILER_STRIP_GATE(0x805DCF68, &lit_9568); #pragma pop /* 805DCF6C-805DCF70 000518 0004+00 0/1 0/0 0/0 .rodata @9569 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9569 = 1700.0f; -COMPILER_STRIP_GATE(805DCF6C, &lit_9569); +COMPILER_STRIP_GATE(0x805DCF6C, &lit_9569); #pragma pop /* 805DCF70-805DCF74 00051C 0004+00 0/1 0/0 0/0 .rodata @9570 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9570 = 3400.0f; -COMPILER_STRIP_GATE(805DCF70, &lit_9570); +COMPILER_STRIP_GATE(0x805DCF70, &lit_9570); #pragma pop /* 805DCF74-805DCF78 000520 0004+00 0/1 0/0 0/0 .rodata @9571 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9571 = 3600.0f; -COMPILER_STRIP_GATE(805DCF74, &lit_9571); +COMPILER_STRIP_GATE(0x805DCF74, &lit_9571); #pragma pop /* 805DCF78-805DCF7C 000524 0004+00 0/2 0/0 0/0 .rodata @9572 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9572 = 3000.0f; -COMPILER_STRIP_GATE(805DCF78, &lit_9572); +COMPILER_STRIP_GATE(0x805DCF78, &lit_9572); #pragma pop /* 805DE13C-805DE14C 0006D4 000C+04 0/1 0/0 0/0 .bss @9091 */ @@ -4571,133 +4584,133 @@ asm void daB_DS_c::executeBattle2Dead() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9573 = -900.0f; -COMPILER_STRIP_GATE(805DCF7C, &lit_9573); +COMPILER_STRIP_GATE(0x805DCF7C, &lit_9573); #pragma pop /* 805DCF80-805DCF84 00052C 0004+00 0/0 0/0 0/0 .rodata @9574 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9574 = -1140.0f; -COMPILER_STRIP_GATE(805DCF80, &lit_9574); +COMPILER_STRIP_GATE(0x805DCF80, &lit_9574); #pragma pop /* 805DCF84-805DCF88 000530 0004+00 0/0 0/0 0/0 .rodata @9575 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9575 = 68.0f; -COMPILER_STRIP_GATE(805DCF84, &lit_9575); +COMPILER_STRIP_GATE(0x805DCF84, &lit_9575); #pragma pop /* 805DCF88-805DCF8C 000534 0004+00 0/0 0/0 0/0 .rodata @9576 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9576 = 1850.0f; -COMPILER_STRIP_GATE(805DCF88, &lit_9576); +COMPILER_STRIP_GATE(0x805DCF88, &lit_9576); #pragma pop /* 805DCF8C-805DCF90 000538 0004+00 0/0 0/0 0/0 .rodata @9577 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9577 = 85.0f; -COMPILER_STRIP_GATE(805DCF8C, &lit_9577); +COMPILER_STRIP_GATE(0x805DCF8C, &lit_9577); #pragma pop /* 805DCF90-805DCF94 00053C 0004+00 0/0 0/0 0/0 .rodata @9578 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9578 = -280.0f; -COMPILER_STRIP_GATE(805DCF90, &lit_9578); +COMPILER_STRIP_GATE(0x805DCF90, &lit_9578); #pragma pop /* 805DCF94-805DCF98 000540 0004+00 0/0 0/0 0/0 .rodata @9579 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9579 = 1950.0f; -COMPILER_STRIP_GATE(805DCF94, &lit_9579); +COMPILER_STRIP_GATE(0x805DCF94, &lit_9579); #pragma pop /* 805DCF98-805DCF9C 000544 0004+00 0/0 0/0 0/0 .rodata @9580 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9580 = -4150.0f; -COMPILER_STRIP_GATE(805DCF98, &lit_9580); +COMPILER_STRIP_GATE(0x805DCF98, &lit_9580); #pragma pop /* 805DCF9C-805DCFA0 000548 0004+00 0/0 0/0 0/0 .rodata @9581 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9581 = -340.0f; -COMPILER_STRIP_GATE(805DCF9C, &lit_9581); +COMPILER_STRIP_GATE(0x805DCF9C, &lit_9581); #pragma pop /* 805DCFA0-805DCFA4 00054C 0004+00 0/0 0/0 0/0 .rodata @9582 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9582 = 2075.0f; -COMPILER_STRIP_GATE(805DCFA0, &lit_9582); +COMPILER_STRIP_GATE(0x805DCFA0, &lit_9582); #pragma pop /* 805DCFA4-805DCFA8 000550 0004+00 0/0 0/0 0/0 .rodata @9583 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9583 = -4505.0f; -COMPILER_STRIP_GATE(805DCFA4, &lit_9583); +COMPILER_STRIP_GATE(0x805DCFA4, &lit_9583); #pragma pop /* 805DCFA8-805DCFAC 000554 0004+00 0/0 0/0 0/0 .rodata @9584 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9584 = 56.0f; -COMPILER_STRIP_GATE(805DCFA8, &lit_9584); +COMPILER_STRIP_GATE(0x805DCFA8, &lit_9584); #pragma pop /* 805DCFAC-805DCFB0 000558 0004+00 0/0 0/0 0/0 .rodata @9585 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9585 = 410.0f; -COMPILER_STRIP_GATE(805DCFAC, &lit_9585); +COMPILER_STRIP_GATE(0x805DCFAC, &lit_9585); #pragma pop /* 805DCFB0-805DCFB4 00055C 0004+00 0/0 0/0 0/0 .rodata @9586 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9586 = -3835.0f; -COMPILER_STRIP_GATE(805DCFB0, &lit_9586); +COMPILER_STRIP_GATE(0x805DCFB0, &lit_9586); #pragma pop /* 805DCFB4-805DCFB8 000560 0004+00 0/0 0/0 0/0 .rodata @9587 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9587 = 535.0f; -COMPILER_STRIP_GATE(805DCFB4, &lit_9587); +COMPILER_STRIP_GATE(0x805DCFB4, &lit_9587); #pragma pop /* 805DCFB8-805DCFBC 000564 0004+00 0/0 0/0 0/0 .rodata @9588 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9588 = 1725.0f; -COMPILER_STRIP_GATE(805DCFB8, &lit_9588); +COMPILER_STRIP_GATE(0x805DCFB8, &lit_9588); #pragma pop /* 805DCFBC-805DCFC0 000568 0004+00 0/0 0/0 0/0 .rodata @9589 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9589 = -3515.0f; -COMPILER_STRIP_GATE(805DCFBC, &lit_9589); +COMPILER_STRIP_GATE(0x805DCFBC, &lit_9589); #pragma pop /* 805DCFC0-805DCFC4 00056C 0004+00 0/0 0/0 0/0 .rodata @9590 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9590 = 59.0f; -COMPILER_STRIP_GATE(805DCFC0, &lit_9590); +COMPILER_STRIP_GATE(0x805DCFC0, &lit_9590); #pragma pop /* 805DCFC4-805DCFC8 000570 0004+00 0/1 0/0 0/0 .rodata @9720 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9720 = 240.0f; -COMPILER_STRIP_GATE(805DCFC4, &lit_9720); +COMPILER_STRIP_GATE(0x805DCFC4, &lit_9720); #pragma pop /* 805D7C10-805D8078 00CAD0 0468+00 1/1 0/0 0/0 .text executeBullet__8daB_DS_cFv */ @@ -4742,126 +4755,126 @@ asm void daB_DS_c::mSoundSE_Set() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9967 = 39.0f; -COMPILER_STRIP_GATE(805DCFC8, &lit_9967); +COMPILER_STRIP_GATE(0x805DCFC8, &lit_9967); #pragma pop /* 805DCFCC-805DCFD0 000578 0004+00 0/0 0/0 0/0 .rodata @9968 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9968 = 28.0f; -COMPILER_STRIP_GATE(805DCFCC, &lit_9968); +COMPILER_STRIP_GATE(0x805DCFCC, &lit_9968); #pragma pop /* 805DCFD0-805DCFD4 00057C 0004+00 0/0 0/0 0/0 .rodata @9969 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9969 = 51.0f; -COMPILER_STRIP_GATE(805DCFD0, &lit_9969); +COMPILER_STRIP_GATE(0x805DCFD0, &lit_9969); #pragma pop /* 805DCFD4-805DCFD8 000580 0004+00 0/0 0/0 0/0 .rodata @9970 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9970 = 42.0f; -COMPILER_STRIP_GATE(805DCFD4, &lit_9970); +COMPILER_STRIP_GATE(0x805DCFD4, &lit_9970); #pragma pop /* 805DCFD8-805DCFDC 000584 0004+00 0/0 0/0 0/0 .rodata @9971 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9971 = 32.0f; -COMPILER_STRIP_GATE(805DCFD8, &lit_9971); +COMPILER_STRIP_GATE(0x805DCFD8, &lit_9971); #pragma pop /* 805DCFDC-805DCFE0 000588 0004+00 0/0 0/0 0/0 .rodata @9972 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9972 = 97.0f; -COMPILER_STRIP_GATE(805DCFDC, &lit_9972); +COMPILER_STRIP_GATE(0x805DCFDC, &lit_9972); #pragma pop /* 805DCFE0-805DCFE4 00058C 0004+00 0/0 0/0 0/0 .rodata @9973 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9973 = 83.0f; -COMPILER_STRIP_GATE(805DCFE0, &lit_9973); +COMPILER_STRIP_GATE(0x805DCFE0, &lit_9973); #pragma pop /* 805DCFE4-805DCFE8 000590 0004+00 0/0 0/0 0/0 .rodata @9974 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9974 = 54.0f; -COMPILER_STRIP_GATE(805DCFE4, &lit_9974); +COMPILER_STRIP_GATE(0x805DCFE4, &lit_9974); #pragma pop /* 805DCFE8-805DCFEC 000594 0004+00 0/0 0/0 0/0 .rodata @9975 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9975 = 92.0f; -COMPILER_STRIP_GATE(805DCFE8, &lit_9975); +COMPILER_STRIP_GATE(0x805DCFE8, &lit_9975); #pragma pop /* 805DCFEC-805DCFF0 000598 0004+00 0/0 0/0 0/0 .rodata @9976 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9976 = 114.0f; -COMPILER_STRIP_GATE(805DCFEC, &lit_9976); +COMPILER_STRIP_GATE(0x805DCFEC, &lit_9976); #pragma pop /* 805DCFF0-805DCFF4 00059C 0004+00 0/0 0/0 0/0 .rodata @9977 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9977 = 272.0f; -COMPILER_STRIP_GATE(805DCFF0, &lit_9977); +COMPILER_STRIP_GATE(0x805DCFF0, &lit_9977); #pragma pop /* 805DCFF4-805DCFF8 0005A0 0004+00 0/0 0/0 0/0 .rodata @9978 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9978 = 314.0f; -COMPILER_STRIP_GATE(805DCFF4, &lit_9978); +COMPILER_STRIP_GATE(0x805DCFF4, &lit_9978); #pragma pop /* 805DCFF8-805DCFFC 0005A4 0004+00 0/0 0/0 0/0 .rodata @9979 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9979 = 184.0f; -COMPILER_STRIP_GATE(805DCFF8, &lit_9979); +COMPILER_STRIP_GATE(0x805DCFF8, &lit_9979); #pragma pop /* 805DCFFC-805DD000 0005A8 0004+00 0/0 0/0 0/0 .rodata @9980 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9980 = 6.0f; -COMPILER_STRIP_GATE(805DCFFC, &lit_9980); +COMPILER_STRIP_GATE(0x805DCFFC, &lit_9980); #pragma pop /* 805DD000-805DD004 0005AC 0004+00 0/0 0/0 0/0 .rodata @9981 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9981 = 33.0f; -COMPILER_STRIP_GATE(805DD000, &lit_9981); +COMPILER_STRIP_GATE(0x805DD000, &lit_9981); #pragma pop /* 805DD004-805DD008 0005B0 0004+00 0/0 0/0 0/0 .rodata @9982 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9982 = 124.0f; -COMPILER_STRIP_GATE(805DD004, &lit_9982); +COMPILER_STRIP_GATE(0x805DD004, &lit_9982); #pragma pop /* 805DD008-805DD00C 0005B4 0004+00 0/0 0/0 0/0 .rodata @9983 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9983 = 119.0f; -COMPILER_STRIP_GATE(805DD008, &lit_9983); +COMPILER_STRIP_GATE(0x805DD008, &lit_9983); #pragma pop /* 805DD00C-805DD010 0005B8 0004+00 0/0 0/0 0/0 .rodata @9984 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9984 = 236.0f; -COMPILER_STRIP_GATE(805DD00C, &lit_9984); +COMPILER_STRIP_GATE(0x805DD00C, &lit_9984); #pragma pop /* 805DD010-805DD040 0005BC 0030+00 0/1 0/0 0/0 .rodata SEBONE_EFF_DT$9989 */ @@ -4872,7 +4885,7 @@ SECTION_RODATA static u8 const SEBONE_EFF_DT[48] = { 0x8B, 0xF1, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x8B, 0xF2, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x8B, 0xF3, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x8B, 0xF4, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, }; -COMPILER_STRIP_GATE(805DD010, &SEBONE_EFF_DT); +COMPILER_STRIP_GATE(0x805DD010, &SEBONE_EFF_DT); #pragma pop /* 805D8D04-805D91A4 00DBC4 04A0+00 2/1 0/0 0/0 .text action__8daB_DS_cFv */ @@ -4890,42 +4903,42 @@ asm void daB_DS_c::action() { #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_10107 = 0x3F7F7CEE; -COMPILER_STRIP_GATE(805DD040, &lit_10107); +COMPILER_STRIP_GATE(0x805DD040, &lit_10107); #pragma pop /* 805DD044-805DD048 0005F0 0004+00 0/0 0/0 0/0 .rodata @10108 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10108 = -60.0f; -COMPILER_STRIP_GATE(805DD044, &lit_10108); +COMPILER_STRIP_GATE(0x805DD044, &lit_10108); #pragma pop /* 805DD048-805DD04C 0005F4 0004+00 0/1 0/0 0/0 .rodata @10202 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10202 = 594.0f; -COMPILER_STRIP_GATE(805DD048, &lit_10202); +COMPILER_STRIP_GATE(0x805DD048, &lit_10202); #pragma pop /* 805DD04C-805DD050 0005F8 0004+00 0/1 0/0 0/0 .rodata @10203 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10203 = -196.0f; -COMPILER_STRIP_GATE(805DD04C, &lit_10203); +COMPILER_STRIP_GATE(0x805DD04C, &lit_10203); #pragma pop /* 805DD050-805DD054 0005FC 0004+00 0/1 0/0 0/0 .rodata @10204 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10204 = 584.0f; -COMPILER_STRIP_GATE(805DD050, &lit_10204); +COMPILER_STRIP_GATE(0x805DD050, &lit_10204); #pragma pop /* 805DD054-805DD058 000600 0004+00 0/1 0/0 0/0 .rodata @10205 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10205 = -136.0f; -COMPILER_STRIP_GATE(805DD054, &lit_10205); +COMPILER_STRIP_GATE(0x805DD054, &lit_10205); #pragma pop /* 805D91A4-805D951C 00E064 0378+00 1/1 0/0 0/0 .text mtx_set__8daB_DS_cFv */ @@ -4943,42 +4956,42 @@ asm void daB_DS_c::mtx_set() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10356 = 380.0f; -COMPILER_STRIP_GATE(805DD058, &lit_10356); +COMPILER_STRIP_GATE(0x805DD058, &lit_10356); #pragma pop /* 805DD05C-805DD060 000608 0004+00 0/1 0/0 0/0 .rodata @10357 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10357 = -70.0f; -COMPILER_STRIP_GATE(805DD05C, &lit_10357); +COMPILER_STRIP_GATE(0x805DD05C, &lit_10357); #pragma pop /* 805DD060-805DD064 00060C 0004+00 0/2 0/0 0/0 .rodata @10358 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10358 = 640.0f; -COMPILER_STRIP_GATE(805DD060, &lit_10358); +COMPILER_STRIP_GATE(0x805DD060, &lit_10358); #pragma pop /* 805DD064-805DD068 000610 0004+00 0/1 0/0 0/0 .rodata @10359 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10359 = 660.0f; -COMPILER_STRIP_GATE(805DD064, &lit_10359); +COMPILER_STRIP_GATE(0x805DD064, &lit_10359); #pragma pop /* 805DD068-805DD06C 000614 0004+00 0/1 0/0 0/0 .rodata @10360 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10360 = -230.0f; -COMPILER_STRIP_GATE(805DD068, &lit_10360); +COMPILER_STRIP_GATE(0x805DD068, &lit_10360); #pragma pop /* 805DD06C-805DD070 000618 0004+00 0/1 0/0 0/0 .rodata @10361 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10361 = 440.0f; -COMPILER_STRIP_GATE(805DD06C, &lit_10361); +COMPILER_STRIP_GATE(0x805DD06C, &lit_10361); #pragma pop /* 805DE1B4-805DE1C4 00074C 000C+04 0/1 0/0 0/0 .bss @10210 */ @@ -5054,7 +5067,7 @@ SECTION_RODATA static u8 const ETC_CC_DT[360] = { 0x43, 0x48, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1D, 0xC3, 0x16, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x43, 0x48, 0x00, 0x00, }; -COMPILER_STRIP_GATE(805DD070, &ETC_CC_DT); +COMPILER_STRIP_GATE(0x805DD070, &ETC_CC_DT); /* 805D9A40-805D9B74 00E900 0134+00 1/1 0/0 0/0 .text cc_etc_set__8daB_DS_cFv */ #pragma push @@ -5103,14 +5116,14 @@ asm void daB_DS_c::mBattle2_damage_check() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10787 = 590.0f; -COMPILER_STRIP_GATE(805DD1D8, &lit_10787); +COMPILER_STRIP_GATE(0x805DD1D8, &lit_10787); #pragma pop /* 805DD1DC-805DD1E0 000788 0004+00 0/1 0/0 0/0 .rodata @10788 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10788 = 175.0f; -COMPILER_STRIP_GATE(805DD1DC, &lit_10788); +COMPILER_STRIP_GATE(0x805DD1DC, &lit_10788); #pragma pop /* 805DA584-805DA9A4 00F444 0420+00 1/1 0/0 0/0 .text mBattle2_mtx_set__8daB_DS_cFv */ @@ -5130,7 +5143,7 @@ SECTION_RODATA static u8 const B2_ETC_CC_DT[40] = { 0x00, 0x00, 0x43, 0xCD, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC3, 0x91, 0x00, 0x00, 0x43, 0xC8, 0x00, 0x00, 0xC3, 0x96, 0x00, 0x00, 0x42, 0xC8, 0x00, 0x00, }; -COMPILER_STRIP_GATE(805DD1E0, &B2_ETC_CC_DT); +COMPILER_STRIP_GATE(0x805DD1E0, &B2_ETC_CC_DT); /* 805DA9A4-805DAA98 00F864 00F4+00 1/1 0/0 0/0 .text mBattle2_cc_etc_set__8daB_DS_cFv */ #pragma push @@ -5147,14 +5160,14 @@ asm void daB_DS_c::mBattle2_cc_etc_set() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10940 = -400.0f; -COMPILER_STRIP_GATE(805DD208, &lit_10940); +COMPILER_STRIP_GATE(0x805DD208, &lit_10940); #pragma pop /* 805DD20C-805DD210 0007B8 0004+00 0/1 0/0 0/0 .rodata @10941 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10941 = 130.0f; -COMPILER_STRIP_GATE(805DD20C, &lit_10941); +COMPILER_STRIP_GATE(0x805DD20C, &lit_10941); #pragma pop /* 805DE230-805DE240 0007C8 000C+04 0/1 0/0 0/0 .bss @10829 */ @@ -5283,49 +5296,49 @@ static asm void useHeapInit(fopAc_ac_c* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_11601 = 1775.0f; -COMPILER_STRIP_GATE(805DD210, &lit_11601); +COMPILER_STRIP_GATE(0x805DD210, &lit_11601); #pragma pop /* 805DD214-805DD218 0007C0 0004+00 0/1 0/0 0/0 .rodata @11602 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_11602 = -4132.0f; -COMPILER_STRIP_GATE(805DD214, &lit_11602); +COMPILER_STRIP_GATE(0x805DD214, &lit_11602); #pragma pop /* 805DD218-805DD21C 0007C4 0004+00 0/1 0/0 0/0 .rodata @11603 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_11603 = -40000.0f; -COMPILER_STRIP_GATE(805DD218, &lit_11603); +COMPILER_STRIP_GATE(0x805DD218, &lit_11603); #pragma pop /* 805DD21C-805DD220 0007C8 0004+00 0/1 0/0 0/0 .rodata @11604 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_11604 = 40000.0f; -COMPILER_STRIP_GATE(805DD21C, &lit_11604); +COMPILER_STRIP_GATE(0x805DD21C, &lit_11604); #pragma pop /* 805DD220-805DD224 0007CC 0004+00 0/1 0/0 0/0 .rodata @11605 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_11605 = 379.0f; -COMPILER_STRIP_GATE(805DD220, &lit_11605); +COMPILER_STRIP_GATE(0x805DD220, &lit_11605); #pragma pop /* 805DD224-805DD228 0007D0 0004+00 0/1 0/0 0/0 .rodata @11606 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_11606 = -1375.0f; -COMPILER_STRIP_GATE(805DD224, &lit_11606); +COMPILER_STRIP_GATE(0x805DD224, &lit_11606); #pragma pop /* 805DD228-805DD22C 0007D4 0004+00 0/1 0/0 0/0 .rodata @11607 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_11607 = -1040.0f; -COMPILER_STRIP_GATE(805DD228, &lit_11607); +COMPILER_STRIP_GATE(0x805DD228, &lit_11607); #pragma pop /* 805DB974-805DC1E8 010834 0874+00 1/1 0/0 0/0 .text create__8daB_DS_cFv */ @@ -5467,7 +5480,7 @@ asm daB_DS_HIO_c::~daB_DS_HIO_c() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_805DC8E4(int* param_0) { +extern "C" asm void func_805DC8E4(void* _this, int* param_0) { nofralloc #include "asm/rel/d/a/b/d_a_b_ds/d_a_b_ds/func_805DC8E4.s" } @@ -5477,7 +5490,7 @@ extern "C" asm void func_805DC8E4(int* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_805DC900(u8* param_0) { +extern "C" asm void func_805DC900(void* _this, u8* param_0) { nofralloc #include "asm/rel/d/a/b/d_a_b_ds/d_a_b_ds/func_805DC900.s" } @@ -5495,7 +5508,7 @@ asm void __sinit_d_a_b_ds_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_805DC91C = (void*)__sinit_d_a_b_ds_cpp; +REGISTER_CTORS(0x805DC91C, __sinit_d_a_b_ds_cpp); #pragma pop /* 805DC958-805DC960 011818 0008+00 1/0 0/0 0/0 .text @36@__dt__12dBgS_ObjAcchFv */ @@ -5761,11 +5774,4 @@ static u8 data_805DE308[4]; static u8 data_805DE30C[4]; #pragma pop -/* 805DD22C-805DD247 0007D8 001B+00 7/7 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_805DD22C = "B_DS"; -SECTION_DEAD static char const* const stringBase_805DD231 = "force_start"; -SECTION_DEAD static char const* const stringBase_805DD23D = "force_end"; -#pragma pop +/* 805DD22C-805DD22C 0007D8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/b/d_a_b_gg/d_a_b_gg.cpp b/rel/d/a/b/d_a_b_gg/d_a_b_gg.cpp index 891087d08d9..82cc9600213 100644 --- a/rel/d/a/b/d_a_b_gg/d_a_b_gg.cpp +++ b/rel/d/a/b/d_a_b_gg/d_a_b_gg.cpp @@ -36,16 +36,16 @@ struct mDoGph_gInf_c { /* 80008078 */ void onBlure(); }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; - struct J3DAnmTransform {}; +struct J3DModelData {}; + +struct Z2Creature {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -70,10 +70,10 @@ struct daPy_py_c { static u8 m_midnaActor[4]; }; -struct J3DJoint {}; - struct J3DModel {}; +struct J3DJoint {}; + struct daB_GG_c { /* 805DE464 */ void CreateHeap(); /* 805DE650 */ void initCc(); @@ -656,7 +656,7 @@ extern "C" void __register_global_object(); /* ############################################################################################## */ /* 805ED060-805ED064 000000 0004+00 45/45 0/0 0/0 .rodata @3911 */ SECTION_RODATA static f32 const lit_3911 = 100.0f; -COMPILER_STRIP_GATE(805ED060, &lit_3911); +COMPILER_STRIP_GATE(0x805ED060, &lit_3911); /* 805ED064-805ED068 000004 0004+00 8/44 0/0 0/0 .rodata @3912 */ SECTION_RODATA static u8 const lit_3912[4] = { @@ -665,7 +665,7 @@ SECTION_RODATA static u8 const lit_3912[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(805ED064, &lit_3912); +COMPILER_STRIP_GATE(0x805ED064, &lit_3912); /* 805ED068-805ED070 000008 0004+04 1/21 0/0 0/0 .rodata @3913 */ SECTION_RODATA static f32 const lit_3913[1 + 1 /* padding */] = { @@ -673,7 +673,7 @@ SECTION_RODATA static f32 const lit_3913[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(805ED068, &lit_3913); +COMPILER_STRIP_GATE(0x805ED068, &lit_3913); /* 805ED070-805ED078 000010 0008+00 0/13 0/0 0/0 .rodata @3914 */ #pragma push @@ -681,7 +681,7 @@ COMPILER_STRIP_GATE(805ED068, &lit_3913); SECTION_RODATA static u8 const lit_3914[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(805ED070, &lit_3914); +COMPILER_STRIP_GATE(0x805ED070, &lit_3914); #pragma pop /* 805ED078-805ED080 000018 0008+00 0/13 0/0 0/0 .rodata @3915 */ @@ -690,7 +690,7 @@ COMPILER_STRIP_GATE(805ED070, &lit_3914); SECTION_RODATA static u8 const lit_3915[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(805ED078, &lit_3915); +COMPILER_STRIP_GATE(0x805ED078, &lit_3915); #pragma pop /* 805ED080-805ED088 000020 0008+00 0/13 0/0 0/0 .rodata @3916 */ @@ -699,33 +699,33 @@ COMPILER_STRIP_GATE(805ED078, &lit_3915); SECTION_RODATA static u8 const lit_3916[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(805ED080, &lit_3916); +COMPILER_STRIP_GATE(0x805ED080, &lit_3916); #pragma pop /* 805ED088-805ED08C 000028 0004+00 0/2 0/0 0/0 .rodata @3917 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3917 = 1.0f / 100.0f; -COMPILER_STRIP_GATE(805ED088, &lit_3917); +COMPILER_STRIP_GATE(0x805ED088, &lit_3917); #pragma pop /* 805ED08C-805ED090 00002C 0004+00 0/4 0/0 0/0 .rodata @3932 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3932 = 4.0f / 5.0f; -COMPILER_STRIP_GATE(805ED08C, &lit_3932); +COMPILER_STRIP_GATE(0x805ED08C, &lit_3932); #pragma pop /* 805ED090-805ED094 000030 0004+00 0/4 0/0 0/0 .rodata @3933 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3933 = 3.0f; -COMPILER_STRIP_GATE(805ED090, &lit_3933); +COMPILER_STRIP_GATE(0x805ED090, &lit_3933); #pragma pop /* 805ED094-805ED098 000034 0004+00 1/8 0/0 0/0 .rodata @3934 */ SECTION_RODATA static f32 const lit_3934 = 0.5f; -COMPILER_STRIP_GATE(805ED094, &lit_3934); +COMPILER_STRIP_GATE(0x805ED094, &lit_3934); /* 805ED3F0-805ED3FC 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { @@ -1012,6 +1012,13 @@ asm daB_GG_HIO_c::daB_GG_HIO_c() { } #pragma pop +/* ############################################################################################## */ +/* 805ED3D4-805ED3D4 000374 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_805ED3D4 = "B_gg"; +#pragma pop + /* 805DE464-805DE630 000144 01CC+00 1/1 0/0 0/0 .text CreateHeap__8daB_GG_cFv */ #pragma push #pragma optimization_level 0 @@ -1043,7 +1050,7 @@ SECTION_RODATA static u8 const ccCylSrc[68] = { 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x43, 0x02, 0x00, 0x00, 0x43, 0x48, 0x00, 0x00, }; -COMPILER_STRIP_GATE(805ED098, &ccCylSrc); +COMPILER_STRIP_GATE(0x805ED098, &ccCylSrc); #pragma pop /* 805ED0DC-805ED120 00007C 0044+00 0/1 0/0 0/0 .rodata ccHookSrc$3980 */ @@ -1056,7 +1063,7 @@ SECTION_RODATA static u8 const ccHookSrc[68] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x43, 0x02, 0x00, 0x00, 0x43, 0x48, 0x00, 0x00, }; -COMPILER_STRIP_GATE(805ED0DC, &ccHookSrc); +COMPILER_STRIP_GATE(0x805ED0DC, &ccHookSrc); #pragma pop /* 805ED120-805ED160 0000C0 0040+00 0/1 0/0 0/0 .rodata ccShieldSphSrc$3981 */ @@ -1068,7 +1075,7 @@ SECTION_RODATA static u8 const ccShieldSphSrc[64] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0x48, 0x00, 0x00, }; -COMPILER_STRIP_GATE(805ED120, &ccShieldSphSrc); +COMPILER_STRIP_GATE(0x805ED120, &ccShieldSphSrc); #pragma pop /* 805ED160-805ED1A0 000100 0040+00 0/1 0/0 0/0 .rodata ccSphSrc$3982 */ @@ -1080,7 +1087,7 @@ SECTION_RODATA static u8 const ccSphSrc[64] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0x48, 0x00, 0x00, }; -COMPILER_STRIP_GATE(805ED160, &ccSphSrc); +COMPILER_STRIP_GATE(0x805ED160, &ccSphSrc); #pragma pop /* 805DE650-805DE7A4 000330 0154+00 1/1 0/0 0/0 .text initCc__8daB_GG_cFv */ @@ -1102,14 +1109,14 @@ SECTION_RODATA static f32 const lit_4064[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(805ED1A0, &lit_4064); +COMPILER_STRIP_GATE(0x805ED1A0, &lit_4064); #pragma pop /* 805ED1A8-805ED1B0 000148 0008+00 3/10 0/0 0/0 .rodata @4066 */ SECTION_RODATA static u8 const lit_4066[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(805ED1A8, &lit_4066); +COMPILER_STRIP_GATE(0x805ED1A8, &lit_4066); /* 805ED6C0-805ED6C4 000008 0001+03 14/14 0/0 0/0 .bss @1109 */ static u8 lit_1109[1 + 3 /* padding */]; @@ -1225,7 +1232,7 @@ asm void daB_GG_c::setCcCylinder() { /* ############################################################################################## */ /* 805ED1B0-805ED1B4 000150 0004+00 1/5 0/0 0/0 .rodata @4089 */ SECTION_RODATA static f32 const lit_4089 = 150.0f; -COMPILER_STRIP_GATE(805ED1B0, &lit_4089); +COMPILER_STRIP_GATE(0x805ED1B0, &lit_4089); /* 805DE9B8-805DEAD0 000698 0118+00 1/1 0/0 0/0 .text G_setCcCylinder__8daB_GG_cFv */ #pragma push @@ -1240,7 +1247,7 @@ asm void daB_GG_c::G_setCcCylinder() { /* ############################################################################################## */ /* 805ED1B4-805ED1B8 000154 0004+00 2/6 0/0 0/0 .rodata @4100 */ SECTION_RODATA static f32 const lit_4100 = 10000.0f; -COMPILER_STRIP_GATE(805ED1B4, &lit_4100); +COMPILER_STRIP_GATE(0x805ED1B4, &lit_4100); /* 805DEAD0-805DEB44 0007B0 0074+00 1/1 0/0 0/0 .text MoveCo__8daB_GG_cFv */ #pragma push @@ -1255,11 +1262,11 @@ asm void daB_GG_c::MoveCo() { /* ############################################################################################## */ /* 805ED1B8-805ED1BC 000158 0004+00 1/1 0/0 0/0 .rodata @4147 */ SECTION_RODATA static f32 const lit_4147 = 3.0f / 10.0f; -COMPILER_STRIP_GATE(805ED1B8, &lit_4147); +COMPILER_STRIP_GATE(0x805ED1B8, &lit_4147); /* 805ED1BC-805ED1C0 00015C 0004+00 1/1 0/0 0/0 .rodata @4148 */ SECTION_RODATA static f32 const lit_4148 = 7.0f / 10.0f; -COMPILER_STRIP_GATE(805ED1BC, &lit_4148); +COMPILER_STRIP_GATE(0x805ED1BC, &lit_4148); /* 805DEB44-805DED0C 000824 01C8+00 1/1 0/0 0/0 .text ctrlJoint__8daB_GG_cFP8J3DJointP8J3DModel */ #pragma push @@ -1305,7 +1312,7 @@ static asm void HeadJointCallBack(J3DJoint* param_0, int param_1) { /* ############################################################################################## */ /* 805ED1C0-805ED1C4 000160 0004+00 1/5 0/0 0/0 .rodata @4220 */ SECTION_RODATA static f32 const lit_4220 = -1.0f; -COMPILER_STRIP_GATE(805ED1C0, &lit_4220); +COMPILER_STRIP_GATE(0x805ED1C0, &lit_4220); /* 805DEF64-805DF010 000C44 00AC+00 15/15 0/0 0/0 .text SetAnm__8daB_GG_cFiiff */ #pragma push @@ -1320,7 +1327,7 @@ asm void daB_GG_c::SetAnm(int param_0, int param_1, f32 param_2, f32 param_3) { /* ############################################################################################## */ /* 805ED1C4-805ED1C8 000164 0004+00 1/4 0/0 0/0 .rodata @4250 */ SECTION_RODATA static f32 const lit_4250 = 30.0f; -COMPILER_STRIP_GATE(805ED1C4, &lit_4250); +COMPILER_STRIP_GATE(0x805ED1C4, &lit_4250); /* 805DF010-805DF0B8 000CF0 00A8+00 1/1 0/0 0/0 .text way_bg_check2__FP8daB_GG_c4cXyz4cXyz */ #pragma push @@ -1337,12 +1344,12 @@ static asm void way_bg_check2(daB_GG_c* param_0, cXyz param_1, cXyz param_2) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4251 = 300.0f; -COMPILER_STRIP_GATE(805ED1C8, &lit_4251); +COMPILER_STRIP_GATE(0x805ED1C8, &lit_4251); #pragma pop /* 805ED1CC-805ED1D0 00016C 0004+00 1/2 0/0 0/0 .rodata @4291 */ SECTION_RODATA static f32 const lit_4291 = 700.0f; -COMPILER_STRIP_GATE(805ED1CC, &lit_4291); +COMPILER_STRIP_GATE(0x805ED1CC, &lit_4291); /* 805DF0B8-805DF178 000D98 00C0+00 1/1 0/0 0/0 .text roofchk__FP8daB_GG_c */ #pragma push @@ -1369,14 +1376,14 @@ static asm void other_bg_check(daB_GG_c* param_0, fopAc_ac_c* param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4320 = 800.0f; -COMPILER_STRIP_GATE(805ED1D0, &lit_4320); +COMPILER_STRIP_GATE(0x805ED1D0, &lit_4320); #pragma pop /* 805ED1D4-805ED1D8 000174 0004+00 0/4 0/0 0/0 .rodata @4530 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4530 = 2.0f; -COMPILER_STRIP_GATE(805ED1D4, &lit_4530); +COMPILER_STRIP_GATE(0x805ED1D4, &lit_4530); #pragma pop /* 805DF250-805DF9F4 000F30 07A4+00 1/1 0/0 0/0 .text Hanekaeri__FP8daB_GG_c4cXyz4cXyzf @@ -1435,28 +1442,28 @@ asm void daB_GG_c::GetAction(u8 param_0, u8 param_1, u8 param_2) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4585 = 200.0f; -COMPILER_STRIP_GATE(805ED1D8, &lit_4585); +COMPILER_STRIP_GATE(0x805ED1D8, &lit_4585); #pragma pop /* 805ED1DC-805ED1E0 00017C 0004+00 0/2 0/0 0/0 .rodata @4586 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4586 = 5930.0f; -COMPILER_STRIP_GATE(805ED1DC, &lit_4586); +COMPILER_STRIP_GATE(0x805ED1DC, &lit_4586); #pragma pop /* 805ED1E0-805ED1E4 000180 0004+00 0/2 0/0 0/0 .rodata @4587 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4587 = 3157.0f; -COMPILER_STRIP_GATE(805ED1E0, &lit_4587); +COMPILER_STRIP_GATE(0x805ED1E0, &lit_4587); #pragma pop /* 805ED1E4-805ED1E8 000184 0004+00 0/2 0/0 0/0 .rodata @4588 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4588 = 6993.0f; -COMPILER_STRIP_GATE(805ED1E4, &lit_4588); +COMPILER_STRIP_GATE(0x805ED1E4, &lit_4588); #pragma pop /* 805ED728-805ED72C 000070 0004+00 4/7 0/0 0/0 .bss s_dis__22@unnamed@d_a_b_gg_cpp@ */ @@ -1554,21 +1561,21 @@ asm void daB_GG_c::SetReleaseCam() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5006 = -300.0f; -COMPILER_STRIP_GATE(805ED1E8, &lit_5006); +COMPILER_STRIP_GATE(0x805ED1E8, &lit_5006); #pragma pop /* 805ED1EC-805ED1F0 00018C 0004+00 0/5 0/0 0/0 .rodata @5007 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5007 = 1000.0f; -COMPILER_STRIP_GATE(805ED1EC, &lit_5007); +COMPILER_STRIP_GATE(0x805ED1EC, &lit_5007); #pragma pop /* 805ED1F0-805ED1F4 000190 0004+00 0/1 0/0 0/0 .rodata @5008 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5008 = 550.0f; -COMPILER_STRIP_GATE(805ED1F0, &lit_5008); +COMPILER_STRIP_GATE(0x805ED1F0, &lit_5008); #pragma pop /* 805E029C-805E0F2C 001F7C 0C90+00 2/1 0/0 0/0 .text St_CamAction__8daB_GG_cFv */ @@ -1586,256 +1593,256 @@ asm void daB_GG_c::St_CamAction() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5009 = 180.0f; -COMPILER_STRIP_GATE(805ED1F4, &lit_5009); +COMPILER_STRIP_GATE(0x805ED1F4, &lit_5009); #pragma pop /* 805ED1F8-805ED1FC 000198 0004+00 0/1 0/0 0/0 .rodata @5010 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5010 = 120.0f; -COMPILER_STRIP_GATE(805ED1F8, &lit_5010); +COMPILER_STRIP_GATE(0x805ED1F8, &lit_5010); #pragma pop /* 805ED1FC-805ED200 00019C 0004+00 0/0 0/0 0/0 .rodata @5011 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5011 = 6.0f / 5.0f; -COMPILER_STRIP_GATE(805ED1FC, &lit_5011); +COMPILER_STRIP_GATE(0x805ED1FC, &lit_5011); #pragma pop /* 805ED200-805ED204 0001A0 0004+00 0/3 0/0 0/0 .rodata @5012 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5012 = 60.0f; -COMPILER_STRIP_GATE(805ED200, &lit_5012); +COMPILER_STRIP_GATE(0x805ED200, &lit_5012); #pragma pop /* 805ED204-805ED208 0001A4 0004+00 0/2 0/0 0/0 .rodata @5013 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5013 = 40.0f; -COMPILER_STRIP_GATE(805ED204, &lit_5013); +COMPILER_STRIP_GATE(0x805ED204, &lit_5013); #pragma pop /* 805ED208-805ED20C 0001A8 0004+00 0/0 0/0 0/0 .rodata @5014 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5014 = 3.0f / 20.0f; -COMPILER_STRIP_GATE(805ED208, &lit_5014); +COMPILER_STRIP_GATE(0x805ED208, &lit_5014); #pragma pop /* 805ED20C-805ED210 0001AC 0004+00 0/0 0/0 0/0 .rodata @5015 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5015 = -60.0f; -COMPILER_STRIP_GATE(805ED20C, &lit_5015); +COMPILER_STRIP_GATE(0x805ED20C, &lit_5015); #pragma pop /* 805ED210-805ED214 0001B0 0004+00 0/0 0/0 0/0 .rodata @5016 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5016 = -110.0f; -COMPILER_STRIP_GATE(805ED210, &lit_5016); +COMPILER_STRIP_GATE(0x805ED210, &lit_5016); #pragma pop /* 805ED214-805ED218 0001B4 0004+00 0/0 0/0 0/0 .rodata @5017 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5017 = 3.0f / 5.0f; -COMPILER_STRIP_GATE(805ED214, &lit_5017); +COMPILER_STRIP_GATE(0x805ED214, &lit_5017); #pragma pop /* 805ED218-805ED21C 0001B8 0004+00 2/4 0/0 0/0 .rodata @5018 */ SECTION_RODATA static f32 const lit_5018 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(805ED218, &lit_5018); +COMPILER_STRIP_GATE(0x805ED218, &lit_5018); /* 805ED21C-805ED220 0001BC 0004+00 0/0 0/0 0/0 .rodata @5019 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5019 = 110.0f; -COMPILER_STRIP_GATE(805ED21C, &lit_5019); +COMPILER_STRIP_GATE(0x805ED21C, &lit_5019); #pragma pop /* 805ED220-805ED224 0001C0 0004+00 0/0 0/0 0/0 .rodata @5020 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5020 = -90.0f; -COMPILER_STRIP_GATE(805ED220, &lit_5020); +COMPILER_STRIP_GATE(0x805ED220, &lit_5020); #pragma pop /* 805ED224-805ED228 0001C4 0004+00 0/0 0/0 0/0 .rodata @5021 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5021 = -25.0f; -COMPILER_STRIP_GATE(805ED224, &lit_5021); +COMPILER_STRIP_GATE(0x805ED224, &lit_5021); #pragma pop /* 805ED228-805ED22C 0001C8 0004+00 0/1 0/0 0/0 .rodata @5022 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5022 = -20.0f; -COMPILER_STRIP_GATE(805ED228, &lit_5022); +COMPILER_STRIP_GATE(0x805ED228, &lit_5022); #pragma pop /* 805ED22C-805ED230 0001CC 0004+00 0/1 0/0 0/0 .rodata @5023 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5023 = -30.0f; -COMPILER_STRIP_GATE(805ED22C, &lit_5023); +COMPILER_STRIP_GATE(0x805ED22C, &lit_5023); #pragma pop /* 805ED230-805ED234 0001D0 0004+00 0/1 0/0 0/0 .rodata @5024 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5024 = -10.0f; -COMPILER_STRIP_GATE(805ED230, &lit_5024); +COMPILER_STRIP_GATE(0x805ED230, &lit_5024); #pragma pop /* 805ED234-805ED238 0001D4 0004+00 0/0 0/0 0/0 .rodata @5025 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5025 = 25.0f; -COMPILER_STRIP_GATE(805ED234, &lit_5025); +COMPILER_STRIP_GATE(0x805ED234, &lit_5025); #pragma pop /* 805ED238-805ED23C 0001D8 0004+00 0/1 0/0 0/0 .rodata @5026 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5026 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(805ED238, &lit_5026); +COMPILER_STRIP_GATE(0x805ED238, &lit_5026); #pragma pop /* 805ED23C-805ED240 0001DC 0004+00 0/5 0/0 0/0 .rodata @5027 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5027 = 400.0f; -COMPILER_STRIP_GATE(805ED23C, &lit_5027); +COMPILER_STRIP_GATE(0x805ED23C, &lit_5027); #pragma pop /* 805ED240-805ED244 0001E0 0004+00 0/2 0/0 0/0 .rodata @5028 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5028 = 80.0f; -COMPILER_STRIP_GATE(805ED240, &lit_5028); +COMPILER_STRIP_GATE(0x805ED240, &lit_5028); #pragma pop /* 805ED244-805ED248 0001E4 0004+00 0/0 0/0 0/0 .rodata @5029 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5029 = -50.0f; -COMPILER_STRIP_GATE(805ED244, &lit_5029); +COMPILER_STRIP_GATE(0x805ED244, &lit_5029); #pragma pop /* 805ED248-805ED24C 0001E8 0004+00 0/1 0/0 0/0 .rodata @5030 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5030 = 250.0f; -COMPILER_STRIP_GATE(805ED248, &lit_5030); +COMPILER_STRIP_GATE(0x805ED248, &lit_5030); #pragma pop /* 805ED24C-805ED250 0001EC 0004+00 0/1 0/0 0/0 .rodata @5031 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5031 = -200.0f; -COMPILER_STRIP_GATE(805ED24C, &lit_5031); +COMPILER_STRIP_GATE(0x805ED24C, &lit_5031); #pragma pop /* 805ED250-805ED254 0001F0 0004+00 0/1 0/0 0/0 .rodata @5032 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5032 = 52.0f; -COMPILER_STRIP_GATE(805ED250, &lit_5032); +COMPILER_STRIP_GATE(0x805ED250, &lit_5032); #pragma pop /* 805ED254-805ED258 0001F4 0004+00 0/0 0/0 0/0 .rodata @5033 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5033 = -120.0f; -COMPILER_STRIP_GATE(805ED254, &lit_5033); +COMPILER_STRIP_GATE(0x805ED254, &lit_5033); #pragma pop /* 805ED258-805ED25C 0001F8 0004+00 0/0 0/0 0/0 .rodata @5034 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5034 = 3.5f; -COMPILER_STRIP_GATE(805ED258, &lit_5034); +COMPILER_STRIP_GATE(0x805ED258, &lit_5034); #pragma pop /* 805ED25C-805ED260 0001FC 0004+00 0/0 0/0 0/0 .rodata @5035 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5035 = -80.0f; -COMPILER_STRIP_GATE(805ED25C, &lit_5035); +COMPILER_STRIP_GATE(0x805ED25C, &lit_5035); #pragma pop /* 805ED260-805ED264 000200 0004+00 0/0 0/0 0/0 .rodata @5036 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5036 = 340.0f; -COMPILER_STRIP_GATE(805ED260, &lit_5036); +COMPILER_STRIP_GATE(0x805ED260, &lit_5036); #pragma pop /* 805ED264-805ED268 000204 0004+00 0/1 0/0 0/0 .rodata @5245 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5245 = -400.0f; -COMPILER_STRIP_GATE(805ED264, &lit_5245); +COMPILER_STRIP_GATE(0x805ED264, &lit_5245); #pragma pop /* 805ED268-805ED26C 000208 0004+00 0/1 0/0 0/0 .rodata @5246 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5246 = -250.0f; -COMPILER_STRIP_GATE(805ED268, &lit_5246); +COMPILER_STRIP_GATE(0x805ED268, &lit_5246); #pragma pop /* 805ED26C-805ED270 00020C 0004+00 0/18 0/0 0/0 .rodata @5247 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5247 = 5.0f; -COMPILER_STRIP_GATE(805ED26C, &lit_5247); +COMPILER_STRIP_GATE(0x805ED26C, &lit_5247); #pragma pop /* 805ED270-805ED274 000210 0004+00 0/3 0/0 0/0 .rodata @5248 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5248 = 600.0f; -COMPILER_STRIP_GATE(805ED270, &lit_5248); +COMPILER_STRIP_GATE(0x805ED270, &lit_5248); #pragma pop /* 805ED274-805ED278 000214 0004+00 0/1 0/0 0/0 .rodata @5249 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5249 = -150.0f; -COMPILER_STRIP_GATE(805ED274, &lit_5249); +COMPILER_STRIP_GATE(0x805ED274, &lit_5249); #pragma pop /* 805ED278-805ED27C 000218 0004+00 0/2 0/0 0/0 .rodata @5250 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5250 = -500.0f; -COMPILER_STRIP_GATE(805ED278, &lit_5250); +COMPILER_STRIP_GATE(0x805ED278, &lit_5250); #pragma pop /* 805ED27C-805ED280 00021C 0004+00 0/5 0/0 0/0 .rodata @5251 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5251 = 500.0f; -COMPILER_STRIP_GATE(805ED27C, &lit_5251); +COMPILER_STRIP_GATE(0x805ED27C, &lit_5251); #pragma pop /* 805ED280-805ED284 000220 0004+00 0/3 0/0 0/0 .rodata @5252 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5252 = -5.0f; -COMPILER_STRIP_GATE(805ED280, &lit_5252); +COMPILER_STRIP_GATE(0x805ED280, &lit_5252); #pragma pop /* 805ED284-805ED288 000224 0004+00 0/1 0/0 0/0 .rodata @5253 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5253 = 33.0f; -COMPILER_STRIP_GATE(805ED284, &lit_5253); +COMPILER_STRIP_GATE(0x805ED284, &lit_5253); #pragma pop /* 805E0F2C-805E18E8 002C0C 09BC+00 1/1 0/0 0/0 .text St_DemoAction__8daB_GG_cFv */ @@ -1853,21 +1860,21 @@ asm void daB_GG_c::St_DemoAction() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5315 = 217.0f; -COMPILER_STRIP_GATE(805ED288, &lit_5315); +COMPILER_STRIP_GATE(0x805ED288, &lit_5315); #pragma pop /* 805ED28C-805ED290 00022C 0004+00 0/5 0/0 0/0 .rodata @5316 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5316 = -57.0f; -COMPILER_STRIP_GATE(805ED28C, &lit_5316); +COMPILER_STRIP_GATE(0x805ED28C, &lit_5316); #pragma pop /* 805ED290-805ED294 000230 0004+00 0/2 0/0 0/0 .rodata @5317 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5317 = 2.0f / 5.0f; -COMPILER_STRIP_GATE(805ED290, &lit_5317); +COMPILER_STRIP_GATE(0x805ED290, &lit_5317); #pragma pop /* 805ED734-805ED740 00007C 000C+00 0/1 0/0 0/0 .bss @3935 */ @@ -1947,18 +1954,18 @@ asm void daB_GG_c::Md_CamAction() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5506 = 18.0f; -COMPILER_STRIP_GATE(805ED294, &lit_5506); +COMPILER_STRIP_GATE(0x805ED294, &lit_5506); #pragma pop /* 805ED298-805ED29C 000238 0004+00 1/2 0/0 0/0 .rodata @5507 */ SECTION_RODATA static f32 const lit_5507 = 90.0f; -COMPILER_STRIP_GATE(805ED298, &lit_5507); +COMPILER_STRIP_GATE(0x805ED298, &lit_5507); /* 805ED29C-805ED2A0 00023C 0004+00 0/3 0/0 0/0 .rodata @5508 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5508 = -21.0f / 5.0f; -COMPILER_STRIP_GATE(805ED29C, &lit_5508); +COMPILER_STRIP_GATE(0x805ED29C, &lit_5508); #pragma pop /* 805E1C28-805E23E8 003908 07C0+00 2/2 0/0 0/0 .text Md_DemoAction__8daB_GG_cFv */ @@ -1976,21 +1983,21 @@ asm void daB_GG_c::Md_DemoAction() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5639 = -7853.0f; -COMPILER_STRIP_GATE(805ED2A0, &lit_5639); +COMPILER_STRIP_GATE(0x805ED2A0, &lit_5639); #pragma pop /* 805ED2A4-805ED2A8 000244 0004+00 0/1 0/0 0/0 .rodata @5640 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5640 = 10535.0f; -COMPILER_STRIP_GATE(805ED2A4, &lit_5640); +COMPILER_STRIP_GATE(0x805ED2A4, &lit_5640); #pragma pop /* 805ED2A8-805ED2AC 000248 0004+00 0/2 0/0 0/0 .rodata @5641 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5641 = 8619.0f; -COMPILER_STRIP_GATE(805ED2A8, &lit_5641); +COMPILER_STRIP_GATE(0x805ED2A8, &lit_5641); #pragma pop /* 805E23E8-805E2974 0040C8 058C+00 2/1 0/0 0/0 .text Gn_CamAction__8daB_GG_cFv */ @@ -2008,116 +2015,116 @@ asm void daB_GG_c::Gn_CamAction() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5642 = 4000.0f; -COMPILER_STRIP_GATE(805ED2AC, &lit_5642); +COMPILER_STRIP_GATE(0x805ED2AC, &lit_5642); #pragma pop /* 805ED2B0-805ED2B4 000250 0004+00 0/0 0/0 0/0 .rodata @5643 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5643 = -4000.0f; -COMPILER_STRIP_GATE(805ED2B0, &lit_5643); +COMPILER_STRIP_GATE(0x805ED2B0, &lit_5643); #pragma pop /* 805ED2B4-805ED2B8 000254 0004+00 0/0 0/0 0/0 .rodata @5644 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5644 = 6469.0f; -COMPILER_STRIP_GATE(805ED2B4, &lit_5644); +COMPILER_STRIP_GATE(0x805ED2B4, &lit_5644); #pragma pop /* 805ED2B8-805ED2BC 000258 0004+00 0/0 0/0 0/0 .rodata @5645 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5645 = 6465.0f; -COMPILER_STRIP_GATE(805ED2B8, &lit_5645); +COMPILER_STRIP_GATE(0x805ED2B8, &lit_5645); #pragma pop /* 805ED2BC-805ED2C0 00025C 0004+00 0/0 0/0 0/0 .rodata @5646 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5646 = 6133.0f; -COMPILER_STRIP_GATE(805ED2BC, &lit_5646); +COMPILER_STRIP_GATE(0x805ED2BC, &lit_5646); #pragma pop /* 805ED2C0-805ED2C4 000260 0004+00 0/1 0/0 0/0 .rodata @5647 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5647 = -100.0f; -COMPILER_STRIP_GATE(805ED2C0, &lit_5647); +COMPILER_STRIP_GATE(0x805ED2C0, &lit_5647); #pragma pop /* 805ED2C4-805ED2C8 000264 0004+00 0/0 0/0 0/0 .rodata @5648 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5648 = 1146.0f; -COMPILER_STRIP_GATE(805ED2C4, &lit_5648); +COMPILER_STRIP_GATE(0x805ED2C4, &lit_5648); #pragma pop /* 805ED2C8-805ED2CC 000268 0004+00 0/0 0/0 0/0 .rodata @5649 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5649 = 4907.0f; -COMPILER_STRIP_GATE(805ED2C8, &lit_5649); +COMPILER_STRIP_GATE(0x805ED2C8, &lit_5649); #pragma pop /* 805ED2CC-805ED2D0 00026C 0004+00 0/0 0/0 0/0 .rodata @5650 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5650 = 7269.0f; -COMPILER_STRIP_GATE(805ED2CC, &lit_5650); +COMPILER_STRIP_GATE(0x805ED2CC, &lit_5650); #pragma pop /* 805ED2D0-805ED2D4 000270 0004+00 0/9 0/0 0/0 .rodata @5651 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5651 = 10.0f; -COMPILER_STRIP_GATE(805ED2D0, &lit_5651); +COMPILER_STRIP_GATE(0x805ED2D0, &lit_5651); #pragma pop /* 805ED2D4-805ED2D8 000274 0004+00 0/1 0/0 0/0 .rodata @5779 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5779 = 170.0f; -COMPILER_STRIP_GATE(805ED2D4, &lit_5779); +COMPILER_STRIP_GATE(0x805ED2D4, &lit_5779); #pragma pop /* 805ED2D8-805ED2DC 000278 0004+00 0/1 0/0 0/0 .rodata @5780 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5780 = 140.0f; -COMPILER_STRIP_GATE(805ED2D8, &lit_5780); +COMPILER_STRIP_GATE(0x805ED2D8, &lit_5780); #pragma pop /* 805ED2DC-805ED2E0 00027C 0004+00 0/2 0/0 0/0 .rodata @5781 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5781 = 9.0f / 10.0f; -COMPILER_STRIP_GATE(805ED2DC, &lit_5781); +COMPILER_STRIP_GATE(0x805ED2DC, &lit_5781); #pragma pop /* 805ED2E0-805ED2E4 000280 0004+00 0/1 0/0 0/0 .rodata @5782 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5782 = 1400.0f; -COMPILER_STRIP_GATE(805ED2E0, &lit_5782); +COMPILER_STRIP_GATE(0x805ED2E0, &lit_5782); #pragma pop /* 805ED2E4-805ED2E8 000284 0004+00 0/1 0/0 0/0 .rodata @5783 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5783 = 900.0f; -COMPILER_STRIP_GATE(805ED2E4, &lit_5783); +COMPILER_STRIP_GATE(0x805ED2E4, &lit_5783); #pragma pop /* 805ED2E8-805ED2EC 000288 0004+00 1/5 0/0 0/0 .rodata @5784 */ SECTION_RODATA static f32 const lit_5784 = 15.0f; -COMPILER_STRIP_GATE(805ED2E8, &lit_5784); +COMPILER_STRIP_GATE(0x805ED2E8, &lit_5784); /* 805ED2EC-805ED2F0 00028C 0004+00 0/2 0/0 0/0 .rodata @5785 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5785 = -2.0f; -COMPILER_STRIP_GATE(805ED2EC, &lit_5785); +COMPILER_STRIP_GATE(0x805ED2EC, &lit_5785); #pragma pop /* 805E2974-805E2F44 004654 05D0+00 1/1 0/0 0/0 .text Gn_DemoAction__8daB_GG_cFv */ @@ -2155,25 +2162,25 @@ asm void daB_GG_c::F_WaitAction() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5883 = 1500.0f; -COMPILER_STRIP_GATE(805ED2F0, &lit_5883); +COMPILER_STRIP_GATE(0x805ED2F0, &lit_5883); #pragma pop /* 805ED2F4-805ED2F8 000294 0004+00 1/6 0/0 0/0 .rodata @5884 */ SECTION_RODATA static f32 const lit_5884 = 20.0f; -COMPILER_STRIP_GATE(805ED2F4, &lit_5884); +COMPILER_STRIP_GATE(0x805ED2F4, &lit_5884); /* 805ED2F8-805ED2FC 000298 0004+00 0/2 0/0 0/0 .rodata @5885 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5885 = 9.0f / 5.0f; -COMPILER_STRIP_GATE(805ED2F8, &lit_5885); +COMPILER_STRIP_GATE(0x805ED2F8, &lit_5885); #pragma pop /* 805ED2FC-805ED300 00029C 0004+00 0/1 0/0 0/0 .rodata @5886 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5886 = 7.0f / 5.0f; -COMPILER_STRIP_GATE(805ED2FC, &lit_5886); +COMPILER_STRIP_GATE(0x805ED2FC, &lit_5886); #pragma pop /* 805E31E4-805E3448 004EC4 0264+00 2/2 0/0 0/0 .text F_FookChk__8daB_GG_cFv */ @@ -2189,41 +2196,47 @@ asm void daB_GG_c::F_FookChk() { /* ############################################################################################## */ /* 805ED300-805ED304 0002A0 0004+00 1/2 0/0 0/0 .rodata @6106 */ SECTION_RODATA static f32 const lit_6106 = 5000.0f; -COMPILER_STRIP_GATE(805ED300, &lit_6106); +COMPILER_STRIP_GATE(0x805ED300, &lit_6106); /* 805ED304-805ED308 0002A4 0004+00 0/1 0/0 0/0 .rodata @6107 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6107 = 1550.0f; -COMPILER_STRIP_GATE(805ED304, &lit_6107); +COMPILER_STRIP_GATE(0x805ED304, &lit_6107); #pragma pop /* 805ED308-805ED30C 0002A8 0004+00 0/3 0/0 0/0 .rodata @6108 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6108 = 8.0f; -COMPILER_STRIP_GATE(805ED308, &lit_6108); +COMPILER_STRIP_GATE(0x805ED308, &lit_6108); #pragma pop /* 805ED30C-805ED310 0002AC 0004+00 0/1 0/0 0/0 .rodata @6109 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6109 = -3.0f; -COMPILER_STRIP_GATE(805ED30C, &lit_6109); +COMPILER_STRIP_GATE(0x805ED30C, &lit_6109); #pragma pop /* 805ED310-805ED314 0002B0 0004+00 0/4 0/0 0/0 .rodata @6110 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6110 = 1200.0f; -COMPILER_STRIP_GATE(805ED310, &lit_6110); +COMPILER_STRIP_GATE(0x805ED310, &lit_6110); #pragma pop /* 805ED314-805ED318 0002B4 0004+00 0/2 0/0 0/0 .rodata @6111 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6111 = -1200.0f; -COMPILER_STRIP_GATE(805ED314, &lit_6111); +COMPILER_STRIP_GATE(0x805ED314, &lit_6111); +#pragma pop + +/* 805ED3D4-805ED3D4 000374 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_805ED3D9 = "D_MN07"; #pragma pop /* 805E3448-805E3CAC 005128 0864+00 1/1 0/0 0/0 .text F_MoveAction__8daB_GG_cFv */ @@ -2241,7 +2254,7 @@ asm void daB_GG_c::F_MoveAction() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6174 = 2350.0f; -COMPILER_STRIP_GATE(805ED318, &lit_6174); +COMPILER_STRIP_GATE(0x805ED318, &lit_6174); #pragma pop /* 805E3CAC-805E3F0C 00598C 0260+00 1/1 0/0 0/0 .text F_LV7_W_MoveAction__8daB_GG_cFv */ @@ -2259,7 +2272,7 @@ asm void daB_GG_c::F_LV7_W_MoveAction() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6430 = 70.0f; -COMPILER_STRIP_GATE(805ED31C, &lit_6430); +COMPILER_STRIP_GATE(0x805ED31C, &lit_6430); #pragma pop /* 805E3F0C-805E4914 005BEC 0A08+00 1/1 0/0 0/0 .text F_AttackAction__8daB_GG_cFv */ @@ -2287,26 +2300,26 @@ asm void daB_GG_c::F_DamageAction() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6626 = -40.0f; -COMPILER_STRIP_GATE(805ED320, &lit_6626); +COMPILER_STRIP_GATE(0x805ED320, &lit_6626); #pragma pop /* 805ED324-805ED328 0002C4 0004+00 0/2 0/0 0/0 .rodata @6627 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6627 = -9.0f; -COMPILER_STRIP_GATE(805ED324, &lit_6627); +COMPILER_STRIP_GATE(0x805ED324, &lit_6627); #pragma pop /* 805ED328-805ED32C 0002C8 0004+00 0/1 0/0 0/0 .rodata @6628 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6628 = 13.0f; -COMPILER_STRIP_GATE(805ED328, &lit_6628); +COMPILER_STRIP_GATE(0x805ED328, &lit_6628); #pragma pop /* 805ED32C-805ED330 0002CC 0004+00 1/3 0/0 0/0 .rodata @6653 */ SECTION_RODATA static f32 const lit_6653 = 3000.0f; -COMPILER_STRIP_GATE(805ED32C, &lit_6653); +COMPILER_STRIP_GATE(0x805ED32C, &lit_6653); /* 805E5190-805E5220 006E70 0090+00 1/1 0/0 0/0 .text AttentionChk__8daB_GG_cFv */ #pragma push @@ -2354,7 +2367,7 @@ asm void daB_GG_c::F_A_TargetMove(cXyz param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6924 = 29.0f / 10.0f; -COMPILER_STRIP_GATE(805ED330, &lit_6924); +COMPILER_STRIP_GATE(0x805ED330, &lit_6924); #pragma pop /* 805E5808-805E5D0C 0074E8 0504+00 1/1 0/0 0/0 .text F_A_MoveAction__8daB_GG_cFv */ @@ -2412,7 +2425,7 @@ asm void daB_GG_c::CutChk() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7247 = 4.0f; -COMPILER_STRIP_GATE(805ED334, &lit_7247); +COMPILER_STRIP_GATE(0x805ED334, &lit_7247); #pragma pop /* 805E6174-805E6AB0 007E54 093C+00 1/1 0/0 0/0 .text G_MoveAction__8daB_GG_cFv */ @@ -2430,7 +2443,7 @@ asm void daB_GG_c::G_MoveAction() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7347 = 1.5f; -COMPILER_STRIP_GATE(805ED338, &lit_7347); +COMPILER_STRIP_GATE(0x805ED338, &lit_7347); #pragma pop /* 805E6AB0-805E6E30 008790 0380+00 2/2 0/0 0/0 .text FallChk__8daB_GG_cFv */ @@ -2448,14 +2461,14 @@ asm void daB_GG_c::FallChk() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7534 = 37.0f; -COMPILER_STRIP_GATE(805ED33C, &lit_7534); +COMPILER_STRIP_GATE(0x805ED33C, &lit_7534); #pragma pop /* 805ED340-805ED344 0002E0 0004+00 0/1 0/0 0/0 .rodata @7535 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7535 = 11.0f; -COMPILER_STRIP_GATE(805ED340, &lit_7535); +COMPILER_STRIP_GATE(0x805ED340, &lit_7535); #pragma pop /* 805E6E30-805E73A8 008B10 0578+00 1/1 0/0 0/0 .text G_AttackAction__8daB_GG_cFv */ @@ -2493,14 +2506,14 @@ asm void daB_GG_c::G_DeathAction() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7819 = -8.0f; -COMPILER_STRIP_GATE(805ED344, &lit_7819); +COMPILER_STRIP_GATE(0x805ED344, &lit_7819); #pragma pop /* 805ED348-805ED34C 0002E8 0004+00 0/1 0/0 0/0 .rodata @7984 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_7984 = 0x3A83126F; -COMPILER_STRIP_GATE(805ED348, &lit_7984); +COMPILER_STRIP_GATE(0x805ED348, &lit_7984); #pragma pop /* 805E7F50-805E82A8 009C30 0358+00 1/1 0/0 0/0 .text G_DeathAction1__8daB_GG_cFv */ @@ -2528,28 +2541,28 @@ asm cM3dGPla::~cM3dGPla() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8242 = 176.0f; -COMPILER_STRIP_GATE(805ED34C, &lit_8242); +COMPILER_STRIP_GATE(0x805ED34C, &lit_8242); #pragma pop /* 805ED350-805ED354 0002F0 0004+00 0/2 0/0 0/0 .rodata @8243 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8243 = -7.0f; -COMPILER_STRIP_GATE(805ED350, &lit_8243); +COMPILER_STRIP_GATE(0x805ED350, &lit_8243); #pragma pop /* 805ED354-805ED358 0002F4 0004+00 0/2 0/0 0/0 .rodata @8244 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8244 = -3.0f / 5.0f; -COMPILER_STRIP_GATE(805ED354, &lit_8244); +COMPILER_STRIP_GATE(0x805ED354, &lit_8244); #pragma pop /* 805ED358-805ED35C 0002F8 0004+00 0/1 0/0 0/0 .rodata @8245 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8245 = 350.0f; -COMPILER_STRIP_GATE(805ED358, &lit_8245); +COMPILER_STRIP_GATE(0x805ED358, &lit_8245); #pragma pop /* 805E82F0-805E8D48 009FD0 0A58+00 1/1 0/0 0/0 .text DeathCam__8daB_GG_cFv */ @@ -2607,14 +2620,14 @@ asm void daB_GG_c::Action() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8519 = 2.5f; -COMPILER_STRIP_GATE(805ED35C, &lit_8519); +COMPILER_STRIP_GATE(0x805ED35C, &lit_8519); #pragma pop /* 805ED360-805ED364 000300 0004+00 0/1 0/0 0/0 .rodata @8520 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8520 = -0.5f; -COMPILER_STRIP_GATE(805ED360, &lit_8520); +COMPILER_STRIP_GATE(0x805ED360, &lit_8520); #pragma pop /* 805E9418-805E9A28 00B0F8 0610+00 1/1 0/0 0/0 .text HeadAction__8daB_GG_cFv */ @@ -2642,7 +2655,7 @@ asm void daB_GG_c::SetHeadAngle() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8732 = 7.0f; -COMPILER_STRIP_GATE(805ED364, &lit_8732); +COMPILER_STRIP_GATE(0x805ED364, &lit_8732); #pragma pop /* 805E9B48-805EA344 00B828 07FC+00 2/1 0/0 0/0 .text SoundChk__8daB_GG_cFv */ @@ -2740,84 +2753,84 @@ asm void daB_GG_c::Guard() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8733 = 16.0f; -COMPILER_STRIP_GATE(805ED368, &lit_8733); +COMPILER_STRIP_GATE(0x805ED368, &lit_8733); #pragma pop /* 805ED36C-805ED370 00030C 0004+00 0/0 0/0 0/0 .rodata @8734 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8734 = 6.0f; -COMPILER_STRIP_GATE(805ED36C, &lit_8734); +COMPILER_STRIP_GATE(0x805ED36C, &lit_8734); #pragma pop /* 805ED370-805ED374 000310 0004+00 0/0 0/0 0/0 .rodata @8735 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8735 = 27.0f; -COMPILER_STRIP_GATE(805ED370, &lit_8735); +COMPILER_STRIP_GATE(0x805ED370, &lit_8735); #pragma pop /* 805ED374-805ED378 000314 0004+00 0/0 0/0 0/0 .rodata @8736 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8736 = 26.0f; -COMPILER_STRIP_GATE(805ED374, &lit_8736); +COMPILER_STRIP_GATE(0x805ED374, &lit_8736); #pragma pop /* 805ED378-805ED37C 000318 0004+00 0/0 0/0 0/0 .rodata @8737 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8737 = 29.0f; -COMPILER_STRIP_GATE(805ED378, &lit_8737); +COMPILER_STRIP_GATE(0x805ED378, &lit_8737); #pragma pop /* 805ED37C-805ED380 00031C 0004+00 0/0 0/0 0/0 .rodata @8738 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8738 = 190.0f; -COMPILER_STRIP_GATE(805ED37C, &lit_8738); +COMPILER_STRIP_GATE(0x805ED37C, &lit_8738); #pragma pop /* 805ED380-805ED384 000320 0004+00 0/0 0/0 0/0 .rodata @8739 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8739 = 226.0f; -COMPILER_STRIP_GATE(805ED380, &lit_8739); +COMPILER_STRIP_GATE(0x805ED380, &lit_8739); #pragma pop /* 805ED384-805ED388 000324 0004+00 0/0 0/0 0/0 .rodata @8740 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8740 = 23.0f; -COMPILER_STRIP_GATE(805ED384, &lit_8740); +COMPILER_STRIP_GATE(0x805ED384, &lit_8740); #pragma pop /* 805ED388-805ED38C 000328 0004+00 0/0 0/0 0/0 .rodata @8741 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8741 = 22.0f; -COMPILER_STRIP_GATE(805ED388, &lit_8741); +COMPILER_STRIP_GATE(0x805ED388, &lit_8741); #pragma pop /* 805ED38C-805ED390 00032C 0004+00 0/0 0/0 0/0 .rodata @8742 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8742 = 42.0f; -COMPILER_STRIP_GATE(805ED38C, &lit_8742); +COMPILER_STRIP_GATE(0x805ED38C, &lit_8742); #pragma pop /* 805ED390-805ED394 000330 0004+00 0/1 0/0 0/0 .rodata @9281 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9281 = -255.0f; -COMPILER_STRIP_GATE(805ED390, &lit_9281); +COMPILER_STRIP_GATE(0x805ED390, &lit_9281); #pragma pop /* 805ED394-805ED398 000334 0004+00 0/1 0/0 0/0 .rodata @9282 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9282 = 32.0f; -COMPILER_STRIP_GATE(805ED394, &lit_9282); +COMPILER_STRIP_GATE(0x805ED394, &lit_9282); #pragma pop /* 805EB5E0-805EB8A8 00D2C0 02C8+00 1/1 0/0 0/0 .text Draw__8daB_GG_cFv */ @@ -2940,21 +2953,28 @@ static asm void daB_GG_Delete(daB_GG_c* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9660 = -700.0f; -COMPILER_STRIP_GATE(805ED398, &lit_9660); +COMPILER_STRIP_GATE(0x805ED398, &lit_9660); #pragma pop /* 805ED39C-805ED3A0 00033C 0004+00 0/1 0/0 0/0 .rodata @9661 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9661 = -60535.0f; -COMPILER_STRIP_GATE(805ED39C, &lit_9661); +COMPILER_STRIP_GATE(0x805ED39C, &lit_9661); #pragma pop /* 805ED3A0-805ED3A4 000340 0004+00 0/1 0/0 0/0 .rodata @9662 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9662 = -1000000000.0f; -COMPILER_STRIP_GATE(805ED3A0, &lit_9662); +COMPILER_STRIP_GATE(0x805ED3A0, &lit_9662); +#pragma pop + +/* 805ED3D4-805ED3D4 000374 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_805ED3E0 = "D_MN07B"; +SECTION_DEAD static char const* const stringBase_805ED3E8 = "B_GG"; #pragma pop /* 805EBBE4-805EC424 00D8C4 0840+00 1/1 0/0 0/0 .text Create__8daB_GG_cFv */ @@ -3092,84 +3112,84 @@ asm daB_GG_HIO_c::~daB_GG_HIO_c() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9929 = 1275.0f; -COMPILER_STRIP_GATE(805ED3A4, &lit_9929); +COMPILER_STRIP_GATE(0x805ED3A4, &lit_9929); #pragma pop /* 805ED3A8-805ED3AC 000348 0004+00 0/1 0/0 0/0 .rodata @9930 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9930 = 5714.0f; -COMPILER_STRIP_GATE(805ED3A8, &lit_9930); +COMPILER_STRIP_GATE(0x805ED3A8, &lit_9930); #pragma pop /* 805ED3AC-805ED3B0 00034C 0004+00 0/1 0/0 0/0 .rodata @9931 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9931 = 218.0f; -COMPILER_STRIP_GATE(805ED3AC, &lit_9931); +COMPILER_STRIP_GATE(0x805ED3AC, &lit_9931); #pragma pop /* 805ED3B0-805ED3B4 000350 0004+00 0/1 0/0 0/0 .rodata @9932 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9932 = 950.0f; -COMPILER_STRIP_GATE(805ED3B0, &lit_9932); +COMPILER_STRIP_GATE(0x805ED3B0, &lit_9932); #pragma pop /* 805ED3B4-805ED3B8 000354 0004+00 0/1 0/0 0/0 .rodata @9933 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9933 = -4937.0f; -COMPILER_STRIP_GATE(805ED3B4, &lit_9933); +COMPILER_STRIP_GATE(0x805ED3B4, &lit_9933); #pragma pop /* 805ED3B8-805ED3BC 000358 0004+00 0/1 0/0 0/0 .rodata @9934 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9934 = -5560.0f; -COMPILER_STRIP_GATE(805ED3B8, &lit_9934); +COMPILER_STRIP_GATE(0x805ED3B8, &lit_9934); #pragma pop /* 805ED3BC-805ED3C0 00035C 0004+00 0/1 0/0 0/0 .rodata @9935 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9935 = 222.0f; -COMPILER_STRIP_GATE(805ED3BC, &lit_9935); +COMPILER_STRIP_GATE(0x805ED3BC, &lit_9935); #pragma pop /* 805ED3C0-805ED3C4 000360 0004+00 0/1 0/0 0/0 .rodata @9936 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9936 = 1185.0f; -COMPILER_STRIP_GATE(805ED3C0, &lit_9936); +COMPILER_STRIP_GATE(0x805ED3C0, &lit_9936); #pragma pop /* 805ED3C4-805ED3C8 000364 0004+00 0/1 0/0 0/0 .rodata @9937 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9937 = 152.0f; -COMPILER_STRIP_GATE(805ED3C4, &lit_9937); +COMPILER_STRIP_GATE(0x805ED3C4, &lit_9937); #pragma pop /* 805ED3C8-805ED3CC 000368 0004+00 0/1 0/0 0/0 .rodata @9938 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9938 = -121.0f; -COMPILER_STRIP_GATE(805ED3C8, &lit_9938); +COMPILER_STRIP_GATE(0x805ED3C8, &lit_9938); #pragma pop /* 805ED3CC-805ED3D0 00036C 0004+00 0/1 0/0 0/0 .rodata @9939 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9939 = -1190.0f; -COMPILER_STRIP_GATE(805ED3CC, &lit_9939); +COMPILER_STRIP_GATE(0x805ED3CC, &lit_9939); #pragma pop /* 805ED3D0-805ED3D4 000370 0004+00 0/1 0/0 0/0 .rodata @9940 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9940 = -1080.0f; -COMPILER_STRIP_GATE(805ED3D0, &lit_9940); +COMPILER_STRIP_GATE(0x805ED3D0, &lit_9940); #pragma pop /* 805ECA0C-805ECBEC 00E6EC 01E0+00 0/0 1/0 0/0 .text __sinit_d_a_b_gg_cpp */ @@ -3184,7 +3204,7 @@ asm void __sinit_d_a_b_gg_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_805ECA0C = (void*)__sinit_d_a_b_gg_cpp; +REGISTER_CTORS(0x805ECA0C, __sinit_d_a_b_gg_cpp); #pragma pop /* 805ECBEC-805ECBF4 00E8CC 0008+00 1/0 0/0 0/0 .text @36@__dt__12dBgS_ObjAcchFv */ @@ -3401,12 +3421,4 @@ static u8 data_805ED83C[4]; static u8 data_805ED840[4]; #pragma pop -/* 805ED3D4-805ED3ED 000374 0019+00 7/7 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_805ED3D4 = "B_gg"; -SECTION_DEAD static char const* const stringBase_805ED3D9 = "D_MN07"; -SECTION_DEAD static char const* const stringBase_805ED3E0 = "D_MN07B"; -SECTION_DEAD static char const* const stringBase_805ED3E8 = "B_GG"; -#pragma pop +/* 805ED3D4-805ED3D4 000374 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/b/d_a_b_gm/d_a_b_gm.cpp b/rel/d/a/b/d_a_b_gm/d_a_b_gm.cpp index 60e92f2a96b..1bbb0d29202 100644 --- a/rel/d/a/b/d_a_b_gm/d_a_b_gm.cpp +++ b/rel/d/a/b/d_a_b_gm/d_a_b_gm.cpp @@ -46,16 +46,16 @@ struct mDoExt_baseAnm { /* 8000D428 */ void play(); }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; - struct J3DAnmTransform {}; +struct J3DModelData {}; + +struct Z2Creature {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -114,12 +114,12 @@ struct dRes_control_c { struct dPa_levelEcallBack {}; -struct _GXColor {}; - struct csXyz { /* 802673F4 */ csXyz(s16, s16, s16); }; +struct _GXColor {}; + struct dPa_control_c { /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, @@ -529,43 +529,43 @@ extern "C" void __register_global_object(); /* ############################################################################################## */ /* 805F4188-805F418C 000000 0004+00 18/18 0/0 0/0 .rodata @3774 */ SECTION_RODATA static f32 const lit_3774 = 1.0f; -COMPILER_STRIP_GATE(805F4188, &lit_3774); +COMPILER_STRIP_GATE(0x805F4188, &lit_3774); /* 805F418C-805F4190 000004 0004+00 0/1 0/0 0/0 .rodata @3775 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3775 = 1.5f; -COMPILER_STRIP_GATE(805F418C, &lit_3775); +COMPILER_STRIP_GATE(0x805F418C, &lit_3775); #pragma pop /* 805F4190-805F4194 000008 0004+00 0/1 0/0 0/0 .rodata @3776 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3776 = 35.0f; -COMPILER_STRIP_GATE(805F4190, &lit_3776); +COMPILER_STRIP_GATE(0x805F4190, &lit_3776); #pragma pop /* 805F4194-805F4198 00000C 0004+00 1/4 0/0 0/0 .rodata @3777 */ SECTION_RODATA static f32 const lit_3777 = 15.0f; -COMPILER_STRIP_GATE(805F4194, &lit_3777); +COMPILER_STRIP_GATE(0x805F4194, &lit_3777); /* 805F4198-805F419C 000010 0004+00 0/1 0/0 0/0 .rodata @3778 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3778 = 1300.0f; -COMPILER_STRIP_GATE(805F4198, &lit_3778); +COMPILER_STRIP_GATE(0x805F4198, &lit_3778); #pragma pop /* 805F419C-805F41A0 000014 0004+00 0/1 0/0 0/0 .rodata @3779 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3779 = 3.0f / 10.0f; -COMPILER_STRIP_GATE(805F419C, &lit_3779); +COMPILER_STRIP_GATE(0x805F419C, &lit_3779); #pragma pop /* 805F41A0-805F41A4 000018 0004+00 1/4 0/0 0/0 .rodata @3780 */ SECTION_RODATA static f32 const lit_3780 = -1.0f; -COMPILER_STRIP_GATE(805F41A0, &lit_3780); +COMPILER_STRIP_GATE(0x805F41A0, &lit_3780); /* 805F4390-805F439C 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { @@ -892,7 +892,13 @@ SECTION_RODATA static u8 const lit_3794[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(805F41A4, &lit_3794); +COMPILER_STRIP_GATE(0x805F41A4, &lit_3794); + +/* 805F4388-805F4388 000200 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_805F4388 = "B_gm"; +#pragma pop /* 805ED9FC-805EDAA8 00019C 00AC+00 6/6 0/0 0/0 .text anm_init__FP10b_gm_classifUcf */ #pragma push @@ -919,21 +925,21 @@ static asm void nodeCallBack(J3DJoint* param_0, int param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3987 = 400.0f; -COMPILER_STRIP_GATE(805F41A8, &lit_3987); +COMPILER_STRIP_GATE(0x805F41A8, &lit_3987); #pragma pop /* 805F41AC-805F41B0 000024 0004+00 0/1 0/0 0/0 .rodata @3988 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3988 = 3000.0f; -COMPILER_STRIP_GATE(805F41AC, &lit_3988); +COMPILER_STRIP_GATE(0x805F41AC, &lit_3988); #pragma pop /* 805F41B0-805F41B4 000028 0004+00 0/3 0/0 0/0 .rodata @3989 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3989 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(805F41B0, &lit_3989); +COMPILER_STRIP_GATE(0x805F41B0, &lit_3989); #pragma pop /* 805F4790-805F4794 000008 0001+03 1/1 0/0 0/0 .bss @1109 */ @@ -1080,13 +1086,13 @@ static asm void damage_check(b_gm_class* param_0) { /* ############################################################################################## */ /* 805F41B4-805F41B8 00002C 0004+00 1/3 0/0 0/0 .rodata @4154 */ SECTION_RODATA static f32 const lit_4154 = 180.0f; -COMPILER_STRIP_GATE(805F41B4, &lit_4154); +COMPILER_STRIP_GATE(0x805F41B4, &lit_4154); /* 805F41B8-805F41BC 000030 0004+00 0/1 0/0 0/0 .rodata @4155 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4155 = 600.0f; -COMPILER_STRIP_GATE(805F41B8, &lit_4155); +COMPILER_STRIP_GATE(0x805F41B8, &lit_4155); #pragma pop /* 805EE438-805EE5D8 000BD8 01A0+00 1/1 0/0 0/0 .text bg_check__FP10b_gm_class */ @@ -1158,21 +1164,21 @@ static asm void s_ko_move(void* param_0, void* param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4214 = 20.0f; -COMPILER_STRIP_GATE(805F41BC, &lit_4214); +COMPILER_STRIP_GATE(0x805F41BC, &lit_4214); #pragma pop /* 805F41C0-805F41C4 000038 0004+00 0/4 0/0 0/0 .rodata @4215 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4215 = 100.0f; -COMPILER_STRIP_GATE(805F41C0, &lit_4215); +COMPILER_STRIP_GATE(0x805F41C0, &lit_4215); #pragma pop /* 805F41C4-805F41C8 00003C 0004+00 0/4 0/0 0/0 .rodata @4216 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4216 = 4.0f; -COMPILER_STRIP_GATE(805F41C4, &lit_4216); +COMPILER_STRIP_GATE(0x805F41C4, &lit_4216); #pragma pop /* 805EE7B0-805EE888 000F50 00D8+00 1/1 0/0 0/0 .text b_gm_wait__FP10b_gm_class */ @@ -1190,42 +1196,42 @@ static asm void b_gm_wait(b_gm_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4341 = 10.0f; -COMPILER_STRIP_GATE(805F41C8, &lit_4341); +COMPILER_STRIP_GATE(0x805F41C8, &lit_4341); #pragma pop /* 805F41CC-805F41D0 000044 0004+00 0/1 0/0 0/0 .rodata @4342 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4342 = 17.0f / 10.0f; -COMPILER_STRIP_GATE(805F41CC, &lit_4342); +COMPILER_STRIP_GATE(0x805F41CC, &lit_4342); #pragma pop /* 805F41D0-805F41D4 000048 0004+00 0/1 0/0 0/0 .rodata @4343 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4343 = -16384.0f; -COMPILER_STRIP_GATE(805F41D0, &lit_4343); +COMPILER_STRIP_GATE(0x805F41D0, &lit_4343); #pragma pop /* 805F41D4-805F41D8 00004C 0004+00 0/2 0/0 0/0 .rodata @4344 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4344 = -32768.0f; -COMPILER_STRIP_GATE(805F41D4, &lit_4344); +COMPILER_STRIP_GATE(0x805F41D4, &lit_4344); #pragma pop /* 805F41D8-805F41DC 000050 0004+00 0/1 0/0 0/0 .rodata @4345 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4345 = -49152.0f; -COMPILER_STRIP_GATE(805F41D8, &lit_4345); +COMPILER_STRIP_GATE(0x805F41D8, &lit_4345); #pragma pop /* 805F41DC-805F41E0 000054 0004+00 0/1 0/0 0/0 .rodata @4346 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4346 = -65536.0f; -COMPILER_STRIP_GATE(805F41DC, &lit_4346); +COMPILER_STRIP_GATE(0x805F41DC, &lit_4346); #pragma pop /* 805F41E0-805F41E8 000058 0004+04 0/0 0/0 0/0 .rodata @4347 */ @@ -1236,7 +1242,7 @@ SECTION_RODATA static f32 const lit_4347[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(805F41E0, &lit_4347); +COMPILER_STRIP_GATE(0x805F41E0, &lit_4347); #pragma pop /* 805F41E8-805F41F0 000060 0008+00 0/2 0/0 0/0 .rodata @4348 */ @@ -1245,7 +1251,7 @@ COMPILER_STRIP_GATE(805F41E0, &lit_4347); SECTION_RODATA static u8 const lit_4348[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(805F41E8, &lit_4348); +COMPILER_STRIP_GATE(0x805F41E8, &lit_4348); #pragma pop /* 805F41F0-805F41F8 000068 0008+00 0/2 0/0 0/0 .rodata @4349 */ @@ -1254,7 +1260,7 @@ COMPILER_STRIP_GATE(805F41E8, &lit_4348); SECTION_RODATA static u8 const lit_4349[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(805F41F0, &lit_4349); +COMPILER_STRIP_GATE(0x805F41F0, &lit_4349); #pragma pop /* 805F41F8-805F4200 000070 0008+00 0/2 0/0 0/0 .rodata @4350 */ @@ -1263,21 +1269,21 @@ COMPILER_STRIP_GATE(805F41F0, &lit_4349); SECTION_RODATA static u8 const lit_4350[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(805F41F8, &lit_4350); +COMPILER_STRIP_GATE(0x805F41F8, &lit_4350); #pragma pop /* 805F4200-805F4204 000078 0004+00 0/3 0/0 0/0 .rodata @4351 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4351 = 200.0f; -COMPILER_STRIP_GATE(805F4200, &lit_4351); +COMPILER_STRIP_GATE(0x805F4200, &lit_4351); #pragma pop /* 805F4204-805F4208 00007C 0004+00 0/3 0/0 0/0 .rodata @4352 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4352 = 0.5f; -COMPILER_STRIP_GATE(805F4204, &lit_4352); +COMPILER_STRIP_GATE(0x805F4204, &lit_4352); #pragma pop /* 805F482C-805F4838 0000A4 000C+00 0/1 0/0 0/0 .bss @4218 */ @@ -1322,21 +1328,21 @@ static asm void b_gm_move(b_gm_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4353 = 0x403F5C29; -COMPILER_STRIP_GATE(805F4208, &lit_4353); +COMPILER_STRIP_GATE(0x805F4208, &lit_4353); #pragma pop /* 805F420C-805F4210 000084 0004+00 0/2 0/0 0/0 .rodata @4390 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4390 = 2.0f; -COMPILER_STRIP_GATE(805F420C, &lit_4390); +COMPILER_STRIP_GATE(0x805F420C, &lit_4390); #pragma pop /* 805F4210-805F4214 000088 0004+00 0/3 0/0 0/0 .rodata @4391 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4391 = 5.0f; -COMPILER_STRIP_GATE(805F4210, &lit_4391); +COMPILER_STRIP_GATE(0x805F4210, &lit_4391); #pragma pop /* 805EEE50-805EF010 0015F0 01C0+00 1/1 0/0 0/0 .text b_gm_beam__FP10b_gm_class */ @@ -1364,14 +1370,14 @@ static asm void b_gm_kogoma(b_gm_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4540 = 3.0f; -COMPILER_STRIP_GATE(805F4214, &lit_4540); +COMPILER_STRIP_GATE(0x805F4214, &lit_4540); #pragma pop /* 805F4218-805F421C 000090 0004+00 0/1 0/0 0/0 .rodata @4541 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4541 = -100.0f; -COMPILER_STRIP_GATE(805F4218, &lit_4541); +COMPILER_STRIP_GATE(0x805F4218, &lit_4541); #pragma pop /* 805EF504-805EF630 001CA4 012C+00 1/1 0/0 0/0 .text b_gm_damage__FP10b_gm_class */ @@ -1389,7 +1395,7 @@ static asm void b_gm_damage(b_gm_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4615 = 1200.0f; -COMPILER_STRIP_GATE(805F421C, &lit_4615); +COMPILER_STRIP_GATE(0x805F421C, &lit_4615); #pragma pop /* 805EF630-805EF9BC 001DD0 038C+00 2/1 0/0 0/0 .text b_gm_drop__FP10b_gm_class */ @@ -1417,42 +1423,42 @@ static asm void action(b_gm_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4616 = -400.0f; -COMPILER_STRIP_GATE(805F4220, &lit_4616); +COMPILER_STRIP_GATE(0x805F4220, &lit_4616); #pragma pop /* 805F4224-805F4228 00009C 0004+00 0/1 0/0 0/0 .rodata @4617 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4617 = 160.0f; -COMPILER_STRIP_GATE(805F4224, &lit_4617); +COMPILER_STRIP_GATE(0x805F4224, &lit_4617); #pragma pop /* 805F4228-805F422C 0000A0 0004+00 0/0 0/0 0/0 .rodata @4618 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4618 = -30.0f; -COMPILER_STRIP_GATE(805F4228, &lit_4618); +COMPILER_STRIP_GATE(0x805F4228, &lit_4618); #pragma pop /* 805F422C-805F4230 0000A4 0004+00 0/2 0/0 0/0 .rodata @4703 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4703 = 20000.0f; -COMPILER_STRIP_GATE(805F422C, &lit_4703); +COMPILER_STRIP_GATE(0x805F422C, &lit_4703); #pragma pop /* 805F4230-805F4234 0000A8 0004+00 0/2 0/0 0/0 .rodata @4704 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4704 = 1000.0f; -COMPILER_STRIP_GATE(805F4230, &lit_4704); +COMPILER_STRIP_GATE(0x805F4230, &lit_4704); #pragma pop /* 805F4234-805F4238 0000AC 0004+00 0/2 0/0 0/0 .rodata @4705 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4705 = 50.0f; -COMPILER_STRIP_GATE(805F4234, &lit_4705); +COMPILER_STRIP_GATE(0x805F4234, &lit_4705); #pragma pop /* 805EFB28-805EFDD4 0022C8 02AC+00 1/1 0/0 0/0 .text foot_IK__FP10b_gm_classP9b_gm_foot @@ -1509,77 +1515,77 @@ static asm void foot_IK_main(b_gm_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4910 = 6.0f; -COMPILER_STRIP_GATE(805F4238, &lit_4910); +COMPILER_STRIP_GATE(0x805F4238, &lit_4910); #pragma pop /* 805F423C-805F4240 0000B4 0004+00 0/1 0/0 0/0 .rodata @4911 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4911 = 8.0f; -COMPILER_STRIP_GATE(805F423C, &lit_4911); +COMPILER_STRIP_GATE(0x805F423C, &lit_4911); #pragma pop /* 805F4240-805F4244 0000B8 0004+00 0/1 0/0 0/0 .rodata @4912 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4912 = 11.0f; -COMPILER_STRIP_GATE(805F4240, &lit_4912); +COMPILER_STRIP_GATE(0x805F4240, &lit_4912); #pragma pop /* 805F4244-805F4248 0000BC 0004+00 0/1 0/0 0/0 .rodata @4913 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4913 = 14.0f; -COMPILER_STRIP_GATE(805F4244, &lit_4913); +COMPILER_STRIP_GATE(0x805F4244, &lit_4913); #pragma pop /* 805F4248-805F424C 0000C0 0004+00 0/1 0/0 0/0 .rodata @4914 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4914 = 18.0f; -COMPILER_STRIP_GATE(805F4248, &lit_4914); +COMPILER_STRIP_GATE(0x805F4248, &lit_4914); #pragma pop /* 805F424C-805F4250 0000C4 0004+00 0/1 0/0 0/0 .rodata @4915 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4915 = 19.0f; -COMPILER_STRIP_GATE(805F424C, &lit_4915); +COMPILER_STRIP_GATE(0x805F424C, &lit_4915); #pragma pop /* 805F4250-805F4254 0000C8 0004+00 0/1 0/0 0/0 .rodata @4916 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4916 = 21.0f; -COMPILER_STRIP_GATE(805F4250, &lit_4916); +COMPILER_STRIP_GATE(0x805F4250, &lit_4916); #pragma pop /* 805F4254-805F4258 0000CC 0004+00 0/1 0/0 0/0 .rodata @4917 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4917 = 23.0f; -COMPILER_STRIP_GATE(805F4254, &lit_4917); +COMPILER_STRIP_GATE(0x805F4254, &lit_4917); #pragma pop /* 805F4258-805F425C 0000D0 0004+00 0/1 0/0 0/0 .rodata @4918 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4918 = 25.0f; -COMPILER_STRIP_GATE(805F4258, &lit_4918); +COMPILER_STRIP_GATE(0x805F4258, &lit_4918); #pragma pop /* 805F425C-805F4260 0000D4 0004+00 0/1 0/0 0/0 .rodata @4919 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4919 = 26.0f; -COMPILER_STRIP_GATE(805F425C, &lit_4919); +COMPILER_STRIP_GATE(0x805F425C, &lit_4919); #pragma pop /* 805F4260-805F4264 0000D8 0004+00 0/1 0/0 0/0 .rodata @4920 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4920 = 29.0f; -COMPILER_STRIP_GATE(805F4260, &lit_4920); +COMPILER_STRIP_GATE(0x805F4260, &lit_4920); #pragma pop /* 805EFF50-805F053C 0026F0 05EC+00 1/1 0/0 0/0 .text anm_se_set__FP10b_gm_class */ @@ -1617,126 +1623,126 @@ static asm void cam_spd_set(b_gm_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5466 = 55.0f; -COMPILER_STRIP_GATE(805F4264, &lit_5466); +COMPILER_STRIP_GATE(0x805F4264, &lit_5466); #pragma pop /* 805F4268-805F426C 0000E0 0004+00 0/1 0/0 0/0 .rodata @5467 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5467 = 2418.0f; -COMPILER_STRIP_GATE(805F4268, &lit_5467); +COMPILER_STRIP_GATE(0x805F4268, &lit_5467); #pragma pop /* 805F426C-805F4270 0000E4 0004+00 0/1 0/0 0/0 .rodata @5468 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5468 = 130.0f; -COMPILER_STRIP_GATE(805F426C, &lit_5468); +COMPILER_STRIP_GATE(0x805F426C, &lit_5468); #pragma pop /* 805F4270-805F4274 0000E8 0004+00 0/1 0/0 0/0 .rodata @5469 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5469 = 1883.0f; -COMPILER_STRIP_GATE(805F4270, &lit_5469); +COMPILER_STRIP_GATE(0x805F4270, &lit_5469); #pragma pop /* 805F4274-805F4278 0000EC 0004+00 0/1 0/0 0/0 .rodata @5470 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5470 = 197.0f; -COMPILER_STRIP_GATE(805F4274, &lit_5470); +COMPILER_STRIP_GATE(0x805F4274, &lit_5470); #pragma pop /* 805F4278-805F427C 0000F0 0004+00 0/1 0/0 0/0 .rodata @5471 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5471 = 2680.0f; -COMPILER_STRIP_GATE(805F4278, &lit_5471); +COMPILER_STRIP_GATE(0x805F4278, &lit_5471); #pragma pop /* 805F427C-805F4280 0000F4 0004+00 0/1 0/0 0/0 .rodata @5472 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5472 = 1.0f / 20.0f; -COMPILER_STRIP_GATE(805F427C, &lit_5472); +COMPILER_STRIP_GATE(0x805F427C, &lit_5472); #pragma pop /* 805F4280-805F4284 0000F8 0004+00 0/1 0/0 0/0 .rodata @5473 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5473 = 1.0f / 25.0f; -COMPILER_STRIP_GATE(805F4280, &lit_5473); +COMPILER_STRIP_GATE(0x805F4280, &lit_5473); #pragma pop /* 805F4284-805F4288 0000FC 0004+00 0/1 0/0 0/0 .rodata @5474 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5474 = -781.0f; -COMPILER_STRIP_GATE(805F4284, &lit_5474); +COMPILER_STRIP_GATE(0x805F4284, &lit_5474); #pragma pop /* 805F4288-805F428C 000100 0004+00 0/1 0/0 0/0 .rodata @5475 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5475 = -601.0f; -COMPILER_STRIP_GATE(805F4288, &lit_5475); +COMPILER_STRIP_GATE(0x805F4288, &lit_5475); #pragma pop /* 805F428C-805F4290 000104 0004+00 0/1 0/0 0/0 .rodata @5476 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5476 = -1267.0f; -COMPILER_STRIP_GATE(805F428C, &lit_5476); +COMPILER_STRIP_GATE(0x805F428C, &lit_5476); #pragma pop /* 805F4290-805F4294 000108 0004+00 0/1 0/0 0/0 .rodata @5477 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5477 = -1208.0f; -COMPILER_STRIP_GATE(805F4290, &lit_5477); +COMPILER_STRIP_GATE(0x805F4290, &lit_5477); #pragma pop /* 805F4294-805F4298 00010C 0004+00 0/1 0/0 0/0 .rodata @5478 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5478 = -1090.0f; -COMPILER_STRIP_GATE(805F4294, &lit_5478); +COMPILER_STRIP_GATE(0x805F4294, &lit_5478); #pragma pop /* 805F4298-805F429C 000110 0004+00 0/1 0/0 0/0 .rodata @5479 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5479 = 227.0f; -COMPILER_STRIP_GATE(805F4298, &lit_5479); +COMPILER_STRIP_GATE(0x805F4298, &lit_5479); #pragma pop /* 805F429C-805F42A0 000114 0004+00 0/1 0/0 0/0 .rodata @5480 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5480 = -1070.0f; -COMPILER_STRIP_GATE(805F429C, &lit_5480); +COMPILER_STRIP_GATE(0x805F429C, &lit_5480); #pragma pop /* 805F42A0-805F42A4 000118 0004+00 0/1 0/0 0/0 .rodata @5481 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5481 = -688.0f; -COMPILER_STRIP_GATE(805F42A0, &lit_5481); +COMPILER_STRIP_GATE(0x805F42A0, &lit_5481); #pragma pop /* 805F42A4-805F42A8 00011C 0004+00 0/1 0/0 0/0 .rodata @5482 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5482 = 155.0f; -COMPILER_STRIP_GATE(805F42A4, &lit_5482); +COMPILER_STRIP_GATE(0x805F42A4, &lit_5482); #pragma pop /* 805F42A8-805F42AC 000120 0004+00 0/1 0/0 0/0 .rodata @5483 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5483 = -680.0f; -COMPILER_STRIP_GATE(805F42A8, &lit_5483); +COMPILER_STRIP_GATE(0x805F42A8, &lit_5483); #pragma pop /* 805F06C0-805F1F58 002E60 1898+00 2/1 0/0 0/0 .text demo_camera__FP10b_gm_class */ @@ -1754,245 +1760,245 @@ static asm void demo_camera(b_gm_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5484 = 317.0f; -COMPILER_STRIP_GATE(805F42AC, &lit_5484); +COMPILER_STRIP_GATE(0x805F42AC, &lit_5484); #pragma pop /* 805F42B0-805F42B4 000128 0004+00 0/0 0/0 0/0 .rodata @5485 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5485 = 4.0f / 5.0f; -COMPILER_STRIP_GATE(805F42B0, &lit_5485); +COMPILER_STRIP_GATE(0x805F42B0, &lit_5485); #pragma pop /* 805F42B4-805F42B8 00012C 0004+00 0/0 0/0 0/0 .rodata @5486 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5486 = -973.0f; -COMPILER_STRIP_GATE(805F42B4, &lit_5486); +COMPILER_STRIP_GATE(0x805F42B4, &lit_5486); #pragma pop /* 805F42B8-805F42BC 000130 0004+00 0/0 0/0 0/0 .rodata @5487 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5487 = 192.0f; -COMPILER_STRIP_GATE(805F42B8, &lit_5487); +COMPILER_STRIP_GATE(0x805F42B8, &lit_5487); #pragma pop /* 805F42BC-805F42C0 000134 0004+00 0/0 0/0 0/0 .rodata @5488 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5488 = -991.0f; -COMPILER_STRIP_GATE(805F42BC, &lit_5488); +COMPILER_STRIP_GATE(0x805F42BC, &lit_5488); #pragma pop /* 805F42C0-805F42C4 000138 0004+00 0/0 0/0 0/0 .rodata @5489 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5489 = -1368.0f; -COMPILER_STRIP_GATE(805F42C0, &lit_5489); +COMPILER_STRIP_GATE(0x805F42C0, &lit_5489); #pragma pop /* 805F42C4-805F42C8 00013C 0004+00 0/0 0/0 0/0 .rodata @5490 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5490 = 158.0f; -COMPILER_STRIP_GATE(805F42C4, &lit_5490); +COMPILER_STRIP_GATE(0x805F42C4, &lit_5490); #pragma pop /* 805F42C8-805F42CC 000140 0004+00 0/0 0/0 0/0 .rodata @5491 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5491 = -1397.0f; -COMPILER_STRIP_GATE(805F42C8, &lit_5491); +COMPILER_STRIP_GATE(0x805F42C8, &lit_5491); #pragma pop /* 805F42CC-805F42D0 000144 0004+00 0/0 0/0 0/0 .rodata @5492 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5492 = 780.0f; -COMPILER_STRIP_GATE(805F42CC, &lit_5492); +COMPILER_STRIP_GATE(0x805F42CC, &lit_5492); #pragma pop /* 805F42D0-805F42D4 000148 0004+00 0/1 0/0 0/0 .rodata @5493 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5493 = 40.0f; -COMPILER_STRIP_GATE(805F42D0, &lit_5493); +COMPILER_STRIP_GATE(0x805F42D0, &lit_5493); #pragma pop /* 805F42D4-805F42D8 00014C 0004+00 0/0 0/0 0/0 .rodata @5494 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5494 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(805F42D4, &lit_5494); +COMPILER_STRIP_GATE(0x805F42D4, &lit_5494); #pragma pop /* 805F42D8-805F42DC 000150 0004+00 0/0 0/0 0/0 .rodata @5495 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5495 = 1.0f / 50.0f; -COMPILER_STRIP_GATE(805F42D8, &lit_5495); +COMPILER_STRIP_GATE(0x805F42D8, &lit_5495); #pragma pop /* 805F42DC-805F42E0 000154 0004+00 0/0 0/0 0/0 .rodata @5496 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5496 = 900.0f; -COMPILER_STRIP_GATE(805F42DC, &lit_5496); +COMPILER_STRIP_GATE(0x805F42DC, &lit_5496); #pragma pop /* 805F42E0-805F42E4 000158 0004+00 0/0 0/0 0/0 .rodata @5497 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5497 = -1500.0f; -COMPILER_STRIP_GATE(805F42E0, &lit_5497); +COMPILER_STRIP_GATE(0x805F42E0, &lit_5497); #pragma pop /* 805F42E4-805F42E8 00015C 0004+00 0/0 0/0 0/0 .rodata @5498 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5498 = -900.0f; -COMPILER_STRIP_GATE(805F42E4, &lit_5498); +COMPILER_STRIP_GATE(0x805F42E4, &lit_5498); #pragma pop /* 805F42E8-805F42EC 000160 0004+00 0/0 0/0 0/0 .rodata @5499 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5499 = 12.0f; -COMPILER_STRIP_GATE(805F42E8, &lit_5499); +COMPILER_STRIP_GATE(0x805F42E8, &lit_5499); #pragma pop /* 805F42EC-805F42F0 000164 0004+00 0/0 0/0 0/0 .rodata @5500 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5500 = 30.0f; -COMPILER_STRIP_GATE(805F42EC, &lit_5500); +COMPILER_STRIP_GATE(0x805F42EC, &lit_5500); #pragma pop /* 805F42F0-805F42F4 000168 0004+00 0/1 0/0 0/0 .rodata @5501 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5501 = 300.0f; -COMPILER_STRIP_GATE(805F42F0, &lit_5501); +COMPILER_STRIP_GATE(0x805F42F0, &lit_5501); #pragma pop /* 805F42F4-805F42F8 00016C 0004+00 0/0 0/0 0/0 .rodata @5502 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5502 = 350.0f; -COMPILER_STRIP_GATE(805F42F4, &lit_5502); +COMPILER_STRIP_GATE(0x805F42F4, &lit_5502); #pragma pop /* 805F42F8-805F42FC 000170 0004+00 0/0 0/0 0/0 .rodata @5503 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5503 = 1800.0f; -COMPILER_STRIP_GATE(805F42F8, &lit_5503); +COMPILER_STRIP_GATE(0x805F42F8, &lit_5503); #pragma pop /* 805F42FC-805F4300 000174 0004+00 0/0 0/0 0/0 .rodata @5504 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5504 = 1100.0f; -COMPILER_STRIP_GATE(805F42FC, &lit_5504); +COMPILER_STRIP_GATE(0x805F42FC, &lit_5504); #pragma pop /* 805F4300-805F4304 000178 0004+00 0/0 0/0 0/0 .rodata @5505 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5505 = -1000.0f; -COMPILER_STRIP_GATE(805F4300, &lit_5505); +COMPILER_STRIP_GATE(0x805F4300, &lit_5505); #pragma pop /* 805F4304-805F4308 00017C 0004+00 0/0 0/0 0/0 .rodata @5506 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5506 = 230.0f; -COMPILER_STRIP_GATE(805F4304, &lit_5506); +COMPILER_STRIP_GATE(0x805F4304, &lit_5506); #pragma pop /* 805F4308-805F430C 000180 0004+00 0/0 0/0 0/0 .rodata @5507 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5507 = 93.0f; -COMPILER_STRIP_GATE(805F4308, &lit_5507); +COMPILER_STRIP_GATE(0x805F4308, &lit_5507); #pragma pop /* 805F430C-805F4310 000184 0004+00 0/0 0/0 0/0 .rodata @5508 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5508 = 65.0f; -COMPILER_STRIP_GATE(805F430C, &lit_5508); +COMPILER_STRIP_GATE(0x805F430C, &lit_5508); #pragma pop /* 805F4310-805F4314 000188 0004+00 0/0 0/0 0/0 .rodata @5509 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5509 = 90.0f; -COMPILER_STRIP_GATE(805F4310, &lit_5509); +COMPILER_STRIP_GATE(0x805F4310, &lit_5509); #pragma pop /* 805F4314-805F4318 00018C 0004+00 0/0 0/0 0/0 .rodata @5510 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5510 = 110.0f; -COMPILER_STRIP_GATE(805F4314, &lit_5510); +COMPILER_STRIP_GATE(0x805F4314, &lit_5510); #pragma pop /* 805F4318-805F431C 000190 0004+00 0/0 0/0 0/0 .rodata @5511 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5511 = 140.0f; -COMPILER_STRIP_GATE(805F4318, &lit_5511); +COMPILER_STRIP_GATE(0x805F4318, &lit_5511); #pragma pop /* 805F431C-805F4320 000194 0004+00 0/0 0/0 0/0 .rodata @5512 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5512 = 65536.0f; -COMPILER_STRIP_GATE(805F431C, &lit_5512); +COMPILER_STRIP_GATE(0x805F431C, &lit_5512); #pragma pop /* 805F4320-805F4324 000198 0004+00 0/0 0/0 0/0 .rodata @5513 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5513 = 45.0f; -COMPILER_STRIP_GATE(805F4320, &lit_5513); +COMPILER_STRIP_GATE(0x805F4320, &lit_5513); #pragma pop /* 805F4324-805F4328 00019C 0004+00 0/0 0/0 0/0 .rodata @5514 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_5514 = 0x3A83126F; -COMPILER_STRIP_GATE(805F4324, &lit_5514); +COMPILER_STRIP_GATE(0x805F4324, &lit_5514); #pragma pop /* 805F4328-805F432C 0001A0 0004+00 0/1 0/0 0/0 .rodata @5515 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5515 = 60.0f; -COMPILER_STRIP_GATE(805F4328, &lit_5515); +COMPILER_STRIP_GATE(0x805F4328, &lit_5515); #pragma pop /* 805F432C-805F4330 0001A4 0004+00 0/0 0/0 0/0 .rodata @5516 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5516 = 7.0f / 10.0f; -COMPILER_STRIP_GATE(805F432C, &lit_5516); +COMPILER_STRIP_GATE(0x805F432C, &lit_5516); #pragma pop /* 805F4330-805F4334 0001A8 0004+00 0/0 0/0 0/0 .rodata @5517 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5517 = -250.0f; -COMPILER_STRIP_GATE(805F4330, &lit_5517); +COMPILER_STRIP_GATE(0x805F4330, &lit_5517); #pragma pop /* 805F4334-805F4338 0001AC 0004+00 0/1 0/0 0/0 .rodata @5518 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5518 = 120.0f; -COMPILER_STRIP_GATE(805F4334, &lit_5518); +COMPILER_STRIP_GATE(0x805F4334, &lit_5518); #pragma pop /* 805F4338-805F4340 0001B0 0008+00 0/1 0/0 0/0 .rodata @5522 */ @@ -2001,84 +2007,84 @@ COMPILER_STRIP_GATE(805F4334, &lit_5518); SECTION_RODATA static u8 const lit_5522[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(805F4338, &lit_5522); +COMPILER_STRIP_GATE(0x805F4338, &lit_5522); #pragma pop /* 805F4340-805F4344 0001B8 0004+00 0/1 0/0 0/0 .rodata @6079 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6079 = 500.0f; -COMPILER_STRIP_GATE(805F4340, &lit_6079); +COMPILER_STRIP_GATE(0x805F4340, &lit_6079); #pragma pop /* 805F4344-805F4348 0001BC 0004+00 0/1 0/0 0/0 .rodata @6080 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6080 = -20.0f; -COMPILER_STRIP_GATE(805F4344, &lit_6080); +COMPILER_STRIP_GATE(0x805F4344, &lit_6080); #pragma pop /* 805F4348-805F434C 0001C0 0004+00 0/1 0/0 0/0 .rodata @6081 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6081 = 70.0f; -COMPILER_STRIP_GATE(805F4348, &lit_6081); +COMPILER_STRIP_GATE(0x805F4348, &lit_6081); #pragma pop /* 805F434C-805F4350 0001C4 0004+00 0/1 0/0 0/0 .rodata @6082 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6082 = 170.0f; -COMPILER_STRIP_GATE(805F434C, &lit_6082); +COMPILER_STRIP_GATE(0x805F434C, &lit_6082); #pragma pop /* 805F4350-805F4354 0001C8 0004+00 0/1 0/0 0/0 .rodata @6083 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6083 = 190.0f; -COMPILER_STRIP_GATE(805F4350, &lit_6083); +COMPILER_STRIP_GATE(0x805F4350, &lit_6083); #pragma pop /* 805F4354-805F4358 0001CC 0004+00 0/1 0/0 0/0 .rodata @6084 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6084 = 150.0f; -COMPILER_STRIP_GATE(805F4354, &lit_6084); +COMPILER_STRIP_GATE(0x805F4354, &lit_6084); #pragma pop /* 805F4358-805F435C 0001D0 0004+00 0/1 0/0 0/0 .rodata @6085 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6085 = -20000.0f; -COMPILER_STRIP_GATE(805F4358, &lit_6085); +COMPILER_STRIP_GATE(0x805F4358, &lit_6085); #pragma pop /* 805F435C-805F4360 0001D4 0004+00 0/1 0/0 0/0 .rodata @6086 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6086 = 80.0f; -COMPILER_STRIP_GATE(805F435C, &lit_6086); +COMPILER_STRIP_GATE(0x805F435C, &lit_6086); #pragma pop /* 805F4360-805F4364 0001D8 0004+00 0/1 0/0 0/0 .rodata @6087 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6087 = 6000.0f; -COMPILER_STRIP_GATE(805F4360, &lit_6087); +COMPILER_STRIP_GATE(0x805F4360, &lit_6087); #pragma pop /* 805F4364-805F4368 0001DC 0004+00 0/1 0/0 0/0 .rodata @6088 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6088 = 2400.0f; -COMPILER_STRIP_GATE(805F4364, &lit_6088); +COMPILER_STRIP_GATE(0x805F4364, &lit_6088); #pragma pop /* 805F4368-805F436C 0001E0 0004+00 0/1 0/0 0/0 .rodata @6089 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_6089 = 0x3C54FDF4; -COMPILER_STRIP_GATE(805F4368, &lit_6089); +COMPILER_STRIP_GATE(0x805F4368, &lit_6089); #pragma pop /* 805F1F58-805F30A0 0046F8 1148+00 2/1 0/0 0/0 .text daB_GM_Execute__FP10b_gm_class */ @@ -2109,7 +2115,7 @@ static asm void daB_GM_Delete(b_gm_class* param_0) { /* ############################################################################################## */ /* 805F436C-805F4370 0001E4 0004+00 1/1 0/0 0/0 .rodata @6249 */ SECTION_RODATA static f32 const lit_6249 = 3.0f / 5.0f; -COMPILER_STRIP_GATE(805F436C, &lit_6249); +COMPILER_STRIP_GATE(0x805F436C, &lit_6249); /* 805F3118-805F3560 0058B8 0448+00 1/1 0/0 0/0 .text useHeapInit__FP10fopAc_ac_c */ #pragma push @@ -2136,14 +2142,14 @@ asm J3DFrameCtrl::~J3DFrameCtrl() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6363 = 31.0f; -COMPILER_STRIP_GATE(805F4370, &lit_6363); +COMPILER_STRIP_GATE(0x805F4370, &lit_6363); #pragma pop /* 805F4374-805F4378 0001EC 0004+00 0/1 0/0 0/0 .rodata @6364 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6364 = 2520.0f; -COMPILER_STRIP_GATE(805F4374, &lit_6364); +COMPILER_STRIP_GATE(0x805F4374, &lit_6364); #pragma pop /* 805F35A8-805F38E4 005D48 033C+00 1/0 0/0 0/0 .text daB_GM_Create__FP10fopAc_ac_c */ @@ -2276,28 +2282,28 @@ asm daB_GM_HIO_c::~daB_GM_HIO_c() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6595 = -1350.0f; -COMPILER_STRIP_GATE(805F4378, &lit_6595); +COMPILER_STRIP_GATE(0x805F4378, &lit_6595); #pragma pop /* 805F437C-805F4380 0001F4 0004+00 0/1 0/0 0/0 .rodata @6596 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6596 = 1350.0f; -COMPILER_STRIP_GATE(805F437C, &lit_6596); +COMPILER_STRIP_GATE(0x805F437C, &lit_6596); #pragma pop /* 805F4380-805F4384 0001F8 0004+00 0/1 0/0 0/0 .rodata @6597 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6597 = 260.0f; -COMPILER_STRIP_GATE(805F4380, &lit_6597); +COMPILER_STRIP_GATE(0x805F4380, &lit_6597); #pragma pop /* 805F4384-805F4388 0001FC 0004+00 0/1 0/0 0/0 .rodata @6598 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6598 = 280.0f; -COMPILER_STRIP_GATE(805F4384, &lit_6598); +COMPILER_STRIP_GATE(0x805F4384, &lit_6598); #pragma pop /* 805F3EAC-805F40C0 00664C 0214+00 0/0 1/0 0/0 .text __sinit_d_a_b_gm_cpp */ @@ -2312,7 +2318,7 @@ asm void __sinit_d_a_b_gm_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_805F3EAC = (void*)__sinit_d_a_b_gm_cpp; +REGISTER_CTORS(0x805F3EAC, __sinit_d_a_b_gm_cpp); #pragma pop /* 805F40C0-805F40C8 006860 0008+00 1/0 0/0 0/0 .text @36@__dt__12dBgS_ObjAcchFv */ @@ -2539,9 +2545,4 @@ static u8 data_805F4948[4]; static u8 data_805F494C[4]; #pragma pop -/* 805F4388-805F438D 000200 0005+00 4/4 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_805F4388 = "B_gm"; -#pragma pop +/* 805F4388-805F4388 000200 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/b/d_a_b_gnd/d_a_b_gnd.cpp b/rel/d/a/b/d_a_b_gnd/d_a_b_gnd.cpp index 4d21842d58e..a44d5a56fd1 100644 --- a/rel/d/a/b/d_a_b_gnd/d_a_b_gnd.cpp +++ b/rel/d/a/b/d_a_b_gnd/d_a_b_gnd.cpp @@ -60,16 +60,16 @@ struct mDoExt_baseAnm { /* 8000D428 */ void play(); }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; - struct J3DAnmTransform {}; +struct J3DModelData {}; + +struct Z2Creature {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -96,10 +96,10 @@ struct mDoExt_3DlineMatSortPacket { /* 80014738 */ void setMat(mDoExt_3DlineMat_c*); }; -struct dKy_tevstr_c {}; - struct ResTIMG {}; +struct dKy_tevstr_c {}; + struct mDoExt_3DlineMat1_c { /* 80013360 */ void init(u16, u16, ResTIMG*, int); /* 80013FB0 */ void update(int, _GXColor&, dKy_tevstr_c*); @@ -747,34 +747,34 @@ extern "C" void __register_global_object(); /* ############################################################################################## */ /* 80602664-80602668 000000 0004+00 32/32 0/0 0/0 .rodata @3815 */ SECTION_RODATA static f32 const lit_3815 = 1.0f; -COMPILER_STRIP_GATE(80602664, &lit_3815); +COMPILER_STRIP_GATE(0x80602664, &lit_3815); /* 80602668-8060266C 000004 0004+00 0/1 0/0 0/0 .rodata @3816 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3816 = 57.0f; -COMPILER_STRIP_GATE(80602668, &lit_3816); +COMPILER_STRIP_GATE(0x80602668, &lit_3816); #pragma pop /* 8060266C-80602670 000008 0004+00 0/1 0/0 0/0 .rodata @3817 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3817 = 65.0f; -COMPILER_STRIP_GATE(8060266C, &lit_3817); +COMPILER_STRIP_GATE(0x8060266C, &lit_3817); #pragma pop /* 80602670-80602674 00000C 0004+00 0/1 0/0 0/0 .rodata @3818 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3818 = 76.0f; -COMPILER_STRIP_GATE(80602670, &lit_3818); +COMPILER_STRIP_GATE(0x80602670, &lit_3818); #pragma pop /* 80602674-80602678 000010 0004+00 0/3 0/0 0/0 .rodata @3819 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3819 = 40.0f; -COMPILER_STRIP_GATE(80602674, &lit_3819); +COMPILER_STRIP_GATE(0x80602674, &lit_3819); #pragma pop /* 806029D0-806029DC 000000 000C+00 2/2 0/0 0/0 .data cNullVec__6Z2Calc */ @@ -1287,11 +1287,17 @@ SECTION_RODATA static u8 const lit_3835[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80602678, &lit_3835); +COMPILER_STRIP_GATE(0x80602678, &lit_3835); /* 8060267C-80602680 000018 0004+00 2/5 0/0 0/0 .rodata @3836 */ SECTION_RODATA static f32 const lit_3836 = -1.0f; -COMPILER_STRIP_GATE(8060267C, &lit_3836); +COMPILER_STRIP_GATE(0x8060267C, &lit_3836); + +/* 806029AC-806029AC 000348 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_806029AC = "B_gnd"; +#pragma pop /* 805F4A94-805F4B48 000134 00B4+00 15/15 0/0 0/0 .text anm_init__FP11b_gnd_classifUcf */ #pragma push @@ -1303,6 +1309,13 @@ static asm void anm_init(b_gnd_class* param_0, int param_1, f32 param_2, u8 para } #pragma pop +/* ############################################################################################## */ +/* 806029AC-806029AC 000348 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_806029B2 = "B_hg"; +#pragma pop + /* 805F4B48-805F4C00 0001E8 00B8+00 7/7 0/0 0/0 .text h_anm_init__FP11b_gnd_classifUcf */ #pragma push #pragma optimization_level 0 @@ -1317,13 +1330,13 @@ static asm void h_anm_init(b_gnd_class* param_0, int param_1, f32 param_2, u8 pa /* ############################################################################################## */ /* 80602680-80602684 00001C 0004+00 1/1 0/0 0/0 .rodata @3902 */ SECTION_RODATA static f32 const lit_3902 = 0.75f; -COMPILER_STRIP_GATE(80602680, &lit_3902); +COMPILER_STRIP_GATE(0x80602680, &lit_3902); /* 80602684-8060268C 000020 0008+00 2/4 0/0 0/0 .rodata @3904 */ SECTION_RODATA static u8 const lit_3904[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80602684, &lit_3904); +COMPILER_STRIP_GATE(0x80602684, &lit_3904); /* 805F4C00-805F4DCC 0002A0 01CC+00 1/1 0/0 0/0 .text nodeCallBack__FP8J3DJointi */ #pragma push @@ -1350,14 +1363,14 @@ static asm void h_nodeCallBack(J3DJoint* param_0, int param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4102 = 100.0f; -COMPILER_STRIP_GATE(8060268C, &lit_4102); +COMPILER_STRIP_GATE(0x8060268C, &lit_4102); #pragma pop /* 80602690-80602694 00002C 0004+00 0/3 0/0 0/0 .rodata @4103 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4103 = 3000.0f; -COMPILER_STRIP_GATE(80602690, &lit_4103); +COMPILER_STRIP_GATE(0x80602690, &lit_4103); #pragma pop /* 805F4F38-805F53A4 0005D8 046C+00 1/0 0/0 0/0 .text daB_GND_Draw__FP11b_gnd_class */ @@ -1387,7 +1400,7 @@ asm cXyz::~cXyz() { SECTION_RODATA static u8 const lit_4154[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80602694, &lit_4154); +COMPILER_STRIP_GATE(0x80602694, &lit_4154); #pragma pop /* 8060269C-806026A4 000038 0008+00 0/3 0/0 0/0 .rodata @4155 */ @@ -1396,7 +1409,7 @@ COMPILER_STRIP_GATE(80602694, &lit_4154); SECTION_RODATA static u8 const lit_4155[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8060269C, &lit_4155); +COMPILER_STRIP_GATE(0x8060269C, &lit_4155); #pragma pop /* 806026A4-806026AC 000040 0008+00 0/3 0/0 0/0 .rodata @4156 */ @@ -1405,14 +1418,14 @@ COMPILER_STRIP_GATE(8060269C, &lit_4155); SECTION_RODATA static u8 const lit_4156[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(806026A4, &lit_4156); +COMPILER_STRIP_GATE(0x806026A4, &lit_4156); #pragma pop /* 806026AC-806026B0 000048 0004+00 0/4 0/0 0/0 .rodata @4157 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4157 = 1000.0f; -COMPILER_STRIP_GATE(806026AC, &lit_4157); +COMPILER_STRIP_GATE(0x806026AC, &lit_4157); #pragma pop /* 805F53E0-805F5574 000A80 0194+00 1/1 0/0 0/0 .text shot_s_sub__FPvPv */ @@ -1430,70 +1443,70 @@ static asm void shot_s_sub(void* param_0, void* param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4312 = -5000.0f; -COMPILER_STRIP_GATE(806026B0, &lit_4312); +COMPILER_STRIP_GATE(0x806026B0, &lit_4312); #pragma pop /* 806026B4-806026B8 000050 0004+00 0/2 0/0 0/0 .rodata @4313 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4313 = 6000.0f; -COMPILER_STRIP_GATE(806026B4, &lit_4313); +COMPILER_STRIP_GATE(0x806026B4, &lit_4313); #pragma pop /* 806026B8-806026BC 000054 0004+00 0/6 0/0 0/0 .rodata @4314 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4314 = 200.0f; -COMPILER_STRIP_GATE(806026B8, &lit_4314); +COMPILER_STRIP_GATE(0x806026B8, &lit_4314); #pragma pop /* 806026BC-806026C0 000058 0004+00 0/2 0/0 0/0 .rodata @4315 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4315 = 2000.0f; -COMPILER_STRIP_GATE(806026BC, &lit_4315); +COMPILER_STRIP_GATE(0x806026BC, &lit_4315); #pragma pop /* 806026C0-806026C4 00005C 0004+00 0/2 0/0 0/0 .rodata @4316 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4316 = 250.0f; -COMPILER_STRIP_GATE(806026C0, &lit_4316); +COMPILER_STRIP_GATE(0x806026C0, &lit_4316); #pragma pop /* 806026C4-806026C8 000060 0004+00 0/4 0/0 0/0 .rodata @4317 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4317 = 500.0f; -COMPILER_STRIP_GATE(806026C4, &lit_4317); +COMPILER_STRIP_GATE(0x806026C4, &lit_4317); #pragma pop /* 806026C8-806026CC 000064 0004+00 0/1 0/0 0/0 .rodata @4318 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4318 = -10000.0f; -COMPILER_STRIP_GATE(806026C8, &lit_4318); +COMPILER_STRIP_GATE(0x806026C8, &lit_4318); #pragma pop /* 806026CC-806026D0 000068 0004+00 0/1 0/0 0/0 .rodata @4319 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4319 = 700.0f; -COMPILER_STRIP_GATE(806026CC, &lit_4319); +COMPILER_STRIP_GATE(0x806026CC, &lit_4319); #pragma pop /* 806026D0-806026D4 00006C 0004+00 0/1 0/0 0/0 .rodata @4320 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4320 = -700.0f; -COMPILER_STRIP_GATE(806026D0, &lit_4320); +COMPILER_STRIP_GATE(0x806026D0, &lit_4320); #pragma pop /* 806026D4-806026D8 000070 0004+00 0/1 0/0 0/0 .rodata @4321 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4321 = 2500.0f; -COMPILER_STRIP_GATE(806026D4, &lit_4321); +COMPILER_STRIP_GATE(0x806026D4, &lit_4321); #pragma pop /* 80602F68-80602F6C 000008 0001+03 3/3 0/0 0/0 .bss @1109 */ @@ -1624,28 +1637,28 @@ static asm void gake_check(b_gnd_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4436 = 10.0f; -COMPILER_STRIP_GATE(806026D8, &lit_4436); +COMPILER_STRIP_GATE(0x806026D8, &lit_4436); #pragma pop /* 806026DC-806026E0 000078 0004+00 0/4 0/0 0/0 .rodata @4437 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4437 = 150.0f; -COMPILER_STRIP_GATE(806026DC, &lit_4437); +COMPILER_STRIP_GATE(0x806026DC, &lit_4437); #pragma pop /* 806026E0-806026E4 00007C 0004+00 0/1 0/0 0/0 .rodata @4438 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4438 = 900.0f; -COMPILER_STRIP_GATE(806026E0, &lit_4438); +COMPILER_STRIP_GATE(0x806026E0, &lit_4438); #pragma pop /* 806026E4-806026E8 000080 0004+00 0/1 0/0 0/0 .rodata @4439 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4439 = 350.0f; -COMPILER_STRIP_GATE(806026E4, &lit_4439); +COMPILER_STRIP_GATE(0x806026E4, &lit_4439); #pragma pop /* 805F5BE8-805F5EF4 001288 030C+00 1/1 0/0 0/0 .text saku_jump_check__FP11b_gnd_class */ @@ -1671,7 +1684,7 @@ asm cM3dGPla::~cM3dGPla() { /* ############################################################################################## */ /* 806026E8-806026EC 000084 0004+00 2/13 0/0 0/0 .rodata @4460 */ SECTION_RODATA static f32 const lit_4460 = 2.0f; -COMPILER_STRIP_GATE(806026E8, &lit_4460); +COMPILER_STRIP_GATE(0x806026E8, &lit_4460); /* 805F5F3C-805F6068 0015DC 012C+00 1/1 0/0 0/0 .text b_gnd_h_wait__FP11b_gnd_class */ #pragma push @@ -1688,28 +1701,28 @@ static asm void b_gnd_h_wait(b_gnd_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4503 = 0.5f; -COMPILER_STRIP_GATE(806026EC, &lit_4503); +COMPILER_STRIP_GATE(0x806026EC, &lit_4503); #pragma pop /* 806026F0-806026F4 00008C 0004+00 0/11 0/0 0/0 .rodata @4504 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4504 = 3.0f; -COMPILER_STRIP_GATE(806026F0, &lit_4504); +COMPILER_STRIP_GATE(0x806026F0, &lit_4504); #pragma pop /* 806026F4-806026F8 000090 0004+00 0/1 0/0 0/0 .rodata @4505 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4505 = 4000.0f; -COMPILER_STRIP_GATE(806026F4, &lit_4505); +COMPILER_STRIP_GATE(0x806026F4, &lit_4505); #pragma pop /* 806026F8-806026FC 000094 0004+00 0/1 0/0 0/0 .rodata @4506 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4506 = 7500.0f; -COMPILER_STRIP_GATE(806026F8, &lit_4506); +COMPILER_STRIP_GATE(0x806026F8, &lit_4506); #pragma pop /* 805F6068-805F6290 001708 0228+00 1/1 0/0 0/0 .text b_gnd_h_wait2__FP11b_gnd_class */ @@ -1727,21 +1740,21 @@ static asm void b_gnd_h_wait2(b_gnd_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4960 = 30.0f; -COMPILER_STRIP_GATE(806026FC, &lit_4960); +COMPILER_STRIP_GATE(0x806026FC, &lit_4960); #pragma pop /* 80602700-80602704 00009C 0004+00 0/6 0/0 0/0 .rodata @4961 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4961 = 5.0f; -COMPILER_STRIP_GATE(80602700, &lit_4961); +COMPILER_STRIP_GATE(0x80602700, &lit_4961); #pragma pop /* 80602704-80602708 0000A0 0004+00 0/2 0/0 0/0 .rodata @4962 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4962 = 5000.0f; -COMPILER_STRIP_GATE(80602704, &lit_4962); +COMPILER_STRIP_GATE(0x80602704, &lit_4962); #pragma pop /* 80602FEC-80602FF8 00008C 000C+00 0/1 0/0 0/0 .bss @4509 */ @@ -1768,116 +1781,116 @@ static asm void b_gnd_h_run_a(b_gnd_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4963 = 15.0f; -COMPILER_STRIP_GATE(80602708, &lit_4963); +COMPILER_STRIP_GATE(0x80602708, &lit_4963); #pragma pop /* 8060270C-80602710 0000A8 0004+00 0/2 0/0 0/0 .rodata @4964 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4964 = 800.0f; -COMPILER_STRIP_GATE(8060270C, &lit_4964); +COMPILER_STRIP_GATE(0x8060270C, &lit_4964); #pragma pop /* 80602710-80602714 0000AC 0004+00 0/0 0/0 0/0 .rodata @4965 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4965 = 7000.0f; -COMPILER_STRIP_GATE(80602710, &lit_4965); +COMPILER_STRIP_GATE(0x80602710, &lit_4965); #pragma pop /* 80602714-80602718 0000B0 0004+00 0/2 0/0 0/0 .rodata @4966 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4966 = 300.0f; -COMPILER_STRIP_GATE(80602714, &lit_4966); +COMPILER_STRIP_GATE(0x80602714, &lit_4966); #pragma pop /* 80602718-8060271C 0000B4 0004+00 0/2 0/0 0/0 .rodata @4967 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4967 = 600.0f; -COMPILER_STRIP_GATE(80602718, &lit_4967); +COMPILER_STRIP_GATE(0x80602718, &lit_4967); #pragma pop /* 8060271C-80602720 0000B8 0004+00 0/3 0/0 0/0 .rodata @4968 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4968 = 6.0f / 5.0f; -COMPILER_STRIP_GATE(8060271C, &lit_4968); +COMPILER_STRIP_GATE(0x8060271C, &lit_4968); #pragma pop /* 80602720-80602724 0000BC 0004+00 1/5 0/0 0/0 .rodata @4969 */ SECTION_RODATA static f32 const lit_4969 = 2.5f; -COMPILER_STRIP_GATE(80602720, &lit_4969); +COMPILER_STRIP_GATE(0x80602720, &lit_4969); /* 80602724-80602728 0000C0 0004+00 0/2 0/0 0/0 .rodata @4970 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4970 = 13.0f / 10.0f; -COMPILER_STRIP_GATE(80602724, &lit_4970); +COMPILER_STRIP_GATE(0x80602724, &lit_4970); #pragma pop /* 80602728-8060272C 0000C4 0004+00 0/4 0/0 0/0 .rodata @4971 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4971 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(80602728, &lit_4971); +COMPILER_STRIP_GATE(0x80602728, &lit_4971); #pragma pop /* 8060272C-80602730 0000C8 0004+00 0/1 0/0 0/0 .rodata @4972 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4972 = 12000.0f; -COMPILER_STRIP_GATE(8060272C, &lit_4972); +COMPILER_STRIP_GATE(0x8060272C, &lit_4972); #pragma pop /* 80602730-80602734 0000CC 0004+00 0/0 0/0 0/0 .rodata @4973 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4973 = -2989.0f; -COMPILER_STRIP_GATE(80602730, &lit_4973); +COMPILER_STRIP_GATE(0x80602730, &lit_4973); #pragma pop /* 80602734-80602738 0000D0 0004+00 0/0 0/0 0/0 .rodata @4974 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4974 = 1364.0f; -COMPILER_STRIP_GATE(80602734, &lit_4974); +COMPILER_STRIP_GATE(0x80602734, &lit_4974); #pragma pop /* 80602738-8060273C 0000D4 0004+00 0/3 0/0 0/0 .rodata @5101 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5101 = 400.0f; -COMPILER_STRIP_GATE(80602738, &lit_5101); +COMPILER_STRIP_GATE(0x80602738, &lit_5101); #pragma pop /* 8060273C-80602740 0000D8 0004+00 0/1 0/0 0/0 .rodata @5102 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5102 = 1700.0f; -COMPILER_STRIP_GATE(8060273C, &lit_5102); +COMPILER_STRIP_GATE(0x8060273C, &lit_5102); #pragma pop /* 80602740-80602744 0000DC 0004+00 0/1 0/0 0/0 .rodata @5103 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5103 = 550.0f; -COMPILER_STRIP_GATE(80602740, &lit_5103); +COMPILER_STRIP_GATE(0x80602740, &lit_5103); #pragma pop /* 80602744-80602748 0000E0 0004+00 0/2 0/0 0/0 .rodata @5104 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5104 = -200.0f; -COMPILER_STRIP_GATE(80602744, &lit_5104); +COMPILER_STRIP_GATE(0x80602744, &lit_5104); #pragma pop /* 80602748-8060274C 0000E4 0004+00 0/1 0/0 0/0 .rodata @5105 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5105 = 7.0f / 5.0f; -COMPILER_STRIP_GATE(80602748, &lit_5105); +COMPILER_STRIP_GATE(0x80602748, &lit_5105); #pragma pop /* 805F6FA4-805F74F4 002644 0550+00 1/1 0/0 0/0 .text b_gnd_h_run_p__FP11b_gnd_class */ @@ -1895,14 +1908,14 @@ static asm void b_gnd_h_run_p(b_gnd_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5137 = 55.0f; -COMPILER_STRIP_GATE(8060274C, &lit_5137); +COMPILER_STRIP_GATE(0x8060274C, &lit_5137); #pragma pop /* 80602750-80602754 0000EC 0004+00 0/3 0/0 0/0 .rodata @5138 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5138 = 1.5f; -COMPILER_STRIP_GATE(80602750, &lit_5138); +COMPILER_STRIP_GATE(0x80602750, &lit_5138); #pragma pop /* 805F74F4-805F76C4 002B94 01D0+00 1/1 0/0 0/0 .text b_gnd_h_jump__FP11b_gnd_class */ @@ -1920,42 +1933,42 @@ static asm void b_gnd_h_jump(b_gnd_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5206 = 50.0f; -COMPILER_STRIP_GATE(80602754, &lit_5206); +COMPILER_STRIP_GATE(0x80602754, &lit_5206); #pragma pop /* 80602758-8060275C 0000F4 0004+00 0/1 0/0 0/0 .rodata @5207 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5207 = 12.0f / 5.0f; -COMPILER_STRIP_GATE(80602758, &lit_5207); +COMPILER_STRIP_GATE(0x80602758, &lit_5207); #pragma pop /* 8060275C-80602760 0000F8 0004+00 0/1 0/0 0/0 .rodata @5208 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5208 = 701.0f; -COMPILER_STRIP_GATE(8060275C, &lit_5208); +COMPILER_STRIP_GATE(0x8060275C, &lit_5208); #pragma pop /* 80602760-80602764 0000FC 0004+00 0/1 0/0 0/0 .rodata @5209 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5209 = -5920.0f; -COMPILER_STRIP_GATE(80602760, &lit_5209); +COMPILER_STRIP_GATE(0x80602760, &lit_5209); #pragma pop /* 80602764-80602768 000100 0004+00 0/3 0/0 0/0 .rodata @5210 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5210 = 4.0f; -COMPILER_STRIP_GATE(80602764, &lit_5210); +COMPILER_STRIP_GATE(0x80602764, &lit_5210); #pragma pop /* 80602768-8060276C 000104 0004+00 0/2 0/0 0/0 .rodata @5211 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5211 = 14.0f; -COMPILER_STRIP_GATE(80602768, &lit_5211); +COMPILER_STRIP_GATE(0x80602768, &lit_5211); #pragma pop /* 805F76C4-805F7A10 002D64 034C+00 1/1 0/0 0/0 .text b_gnd_h_end__FP11b_gnd_class */ @@ -1973,14 +1986,14 @@ static asm void b_gnd_h_end(b_gnd_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5305 = 43.0f / 10.0f; -COMPILER_STRIP_GATE(8060276C, &lit_5305); +COMPILER_STRIP_GATE(0x8060276C, &lit_5305); #pragma pop /* 80602770-80602774 00010C 0004+00 0/2 0/0 0/0 .rodata @5306 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5306 = 3.0f / 10.0f; -COMPILER_STRIP_GATE(80602770, &lit_5306); +COMPILER_STRIP_GATE(0x80602770, &lit_5306); #pragma pop /* 805F7A10-805F7E88 0030B0 0478+00 2/1 0/0 0/0 .text b_gnd_g_wait__FP11b_gnd_class */ @@ -2008,63 +2021,63 @@ static asm void b_gnd_g_attack(b_gnd_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5307 = 650.0f; -COMPILER_STRIP_GATE(80602774, &lit_5307); +COMPILER_STRIP_GATE(0x80602774, &lit_5307); #pragma pop /* 80602778-8060277C 000114 0004+00 0/0 0/0 0/0 .rodata @5536 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5536 = 3.0f / 5.0f; -COMPILER_STRIP_GATE(80602778, &lit_5536); +COMPILER_STRIP_GATE(0x80602778, &lit_5536); #pragma pop /* 8060277C-80602780 000118 0004+00 0/0 0/0 0/0 .rodata @5537 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5537 = 7.0f / 10.0f; -COMPILER_STRIP_GATE(8060277C, &lit_5537); +COMPILER_STRIP_GATE(0x8060277C, &lit_5537); #pragma pop /* 80602780-80602784 00011C 0004+00 0/0 0/0 0/0 .rodata @5538 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_5538 = 0x40551EB8; -COMPILER_STRIP_GATE(80602780, &lit_5538); +COMPILER_STRIP_GATE(0x80602780, &lit_5538); #pragma pop /* 80602784-80602788 000120 0004+00 0/0 0/0 0/0 .rodata @5539 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5539 = 450.0f; -COMPILER_STRIP_GATE(80602784, &lit_5539); +COMPILER_STRIP_GATE(0x80602784, &lit_5539); #pragma pop /* 80602788-8060278C 000124 0004+00 0/1 0/0 0/0 .rodata @5540 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5540 = 60.0f; -COMPILER_STRIP_GATE(80602788, &lit_5540); +COMPILER_STRIP_GATE(0x80602788, &lit_5540); #pragma pop /* 8060278C-80602790 000128 0004+00 0/4 0/0 0/0 .rodata @5541 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5541 = 20.0f; -COMPILER_STRIP_GATE(8060278C, &lit_5541); +COMPILER_STRIP_GATE(0x8060278C, &lit_5541); #pragma pop /* 80602790-80602794 00012C 0004+00 0/1 0/0 0/0 .rodata @5634 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5634 = 7.0f / 20.0f; -COMPILER_STRIP_GATE(80602790, &lit_5634); +COMPILER_STRIP_GATE(0x80602790, &lit_5634); #pragma pop /* 80602794-80602798 000130 0004+00 0/3 0/0 0/0 .rodata @5635 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5635 = 25.0f; -COMPILER_STRIP_GATE(80602794, &lit_5635); +COMPILER_STRIP_GATE(0x80602794, &lit_5635); #pragma pop /* 805F878C-805F8C20 003E2C 0494+00 1/1 0/0 0/0 .text b_gnd_g_defence__FP11b_gnd_class */ @@ -2082,7 +2095,7 @@ static asm void b_gnd_g_defence(b_gnd_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5702 = 70.0f; -COMPILER_STRIP_GATE(80602798, &lit_5702); +COMPILER_STRIP_GATE(0x80602798, &lit_5702); #pragma pop /* 805F8C20-805F8F88 0042C0 0368+00 1/1 0/0 0/0 .text b_gnd_g_jump__FP11b_gnd_class */ @@ -2100,7 +2113,7 @@ static asm void b_gnd_g_jump(b_gnd_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5751 = 6.0f; -COMPILER_STRIP_GATE(8060279C, &lit_5751); +COMPILER_STRIP_GATE(0x8060279C, &lit_5751); #pragma pop /* 805F8F88-805F9220 004628 0298+00 1/1 0/0 0/0 .text b_gnd_g_side__FP11b_gnd_class */ @@ -2138,14 +2151,14 @@ static asm void b_gnd_g_damage(b_gnd_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5894 = 35.0f; -COMPILER_STRIP_GATE(806027A0, &lit_5894); +COMPILER_STRIP_GATE(0x806027A0, &lit_5894); #pragma pop /* 806027A4-806027A8 000140 0004+00 0/1 0/0 0/0 .rodata @5895 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5895 = 9.0f; -COMPILER_STRIP_GATE(806027A4, &lit_5895); +COMPILER_STRIP_GATE(0x806027A4, &lit_5895); #pragma pop /* 805F94A8-805F98A0 004B48 03F8+00 1/1 0/0 0/0 .text b_gnd_g_down__FP11b_gnd_class */ @@ -2253,28 +2266,28 @@ static asm void ball_bg_check(b_gnd_class* param_0, int param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6508 = 380.0f; -COMPILER_STRIP_GATE(806027A8, &lit_6508); +COMPILER_STRIP_GATE(0x806027A8, &lit_6508); #pragma pop /* 806027AC-806027B0 000148 0004+00 0/0 0/0 0/0 .rodata @6509 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6509 = -450.0f; -COMPILER_STRIP_GATE(806027AC, &lit_6509); +COMPILER_STRIP_GATE(0x806027AC, &lit_6509); #pragma pop /* 806027B0-806027B4 00014C 0004+00 0/2 0/0 0/0 .rodata @6510 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6510 = 7.0f; -COMPILER_STRIP_GATE(806027B0, &lit_6510); +COMPILER_STRIP_GATE(0x806027B0, &lit_6510); #pragma pop /* 806027B4-806027B8 000150 0004+00 0/1 0/0 0/0 .rodata @6631 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6631 = 2.0f / 5.0f; -COMPILER_STRIP_GATE(806027B4, &lit_6631); +COMPILER_STRIP_GATE(0x806027B4, &lit_6631); #pragma pop /* 805FB0F0-805FB414 006790 0324+00 1/1 0/0 0/0 .text himo_control1__FP11b_gnd_classP4cXyziSc */ @@ -2317,6 +2330,14 @@ static asm void cam_spd_set(b_gnd_class* param_0) { } #pragma pop +/* ############################################################################################## */ +/* 806029AC-806029AC 000348 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_806029B7 = "force_start"; +SECTION_DEAD static char const* const stringBase_806029C3 = "force_end"; +#pragma pop + /* 805FB7A4-805FDAE0 006E44 233C+00 2/1 0/0 0/0 .text demo_camera__FP11b_gnd_class */ #pragma push #pragma optimization_level 0 @@ -2332,721 +2353,721 @@ static asm void demo_camera(b_gnd_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7202 = -500.0f; -COMPILER_STRIP_GATE(806027B8, &lit_7202); +COMPILER_STRIP_GATE(0x806027B8, &lit_7202); #pragma pop /* 806027BC-806027C0 000158 0004+00 0/0 0/0 0/0 .rodata @7203 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7203 = -300.0f; -COMPILER_STRIP_GATE(806027BC, &lit_7203); +COMPILER_STRIP_GATE(0x806027BC, &lit_7203); #pragma pop /* 806027C0-806027C4 00015C 0004+00 0/0 0/0 0/0 .rodata @7204 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7204 = -1000.0f; -COMPILER_STRIP_GATE(806027C0, &lit_7204); +COMPILER_STRIP_GATE(0x806027C0, &lit_7204); #pragma pop /* 806027C4-806027C8 000160 0004+00 0/0 0/0 0/0 .rodata @7205 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7205 = 1100.0f; -COMPILER_STRIP_GATE(806027C4, &lit_7205); +COMPILER_STRIP_GATE(0x806027C4, &lit_7205); #pragma pop /* 806027C8-806027CC 000164 0004+00 0/0 0/0 0/0 .rodata @7206 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7206 = -2000.0f; -COMPILER_STRIP_GATE(806027C8, &lit_7206); +COMPILER_STRIP_GATE(0x806027C8, &lit_7206); #pragma pop /* 806027CC-806027D0 000168 0004+00 0/1 0/0 0/0 .rodata @7207 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7207 = -400.0f; -COMPILER_STRIP_GATE(806027CC, &lit_7207); +COMPILER_STRIP_GATE(0x806027CC, &lit_7207); #pragma pop /* 806027D0-806027D4 00016C 0004+00 0/0 0/0 0/0 .rodata @7208 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7208 = 1318.0f; -COMPILER_STRIP_GATE(806027D0, &lit_7208); +COMPILER_STRIP_GATE(0x806027D0, &lit_7208); #pragma pop /* 806027D4-806027D8 000170 0004+00 0/0 0/0 0/0 .rodata @7209 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7209 = -1355.0f; -COMPILER_STRIP_GATE(806027D4, &lit_7209); +COMPILER_STRIP_GATE(0x806027D4, &lit_7209); #pragma pop /* 806027D8-806027DC 000174 0004+00 0/0 0/0 0/0 .rodata @7210 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7210 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(806027D8, &lit_7210); +COMPILER_STRIP_GATE(0x806027D8, &lit_7210); #pragma pop /* 806027DC-806027E0 000178 0004+00 0/0 0/0 0/0 .rodata @7211 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7211 = -1500.0f; -COMPILER_STRIP_GATE(806027DC, &lit_7211); +COMPILER_STRIP_GATE(0x806027DC, &lit_7211); #pragma pop /* 806027E0-806027E4 00017C 0004+00 0/0 0/0 0/0 .rodata @7212 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7212 = -4000.0f; -COMPILER_STRIP_GATE(806027E0, &lit_7212); +COMPILER_STRIP_GATE(0x806027E0, &lit_7212); #pragma pop /* 806027E4-806027E8 000180 0004+00 0/0 0/0 0/0 .rodata @7213 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7213 = -286.0f; -COMPILER_STRIP_GATE(806027E4, &lit_7213); +COMPILER_STRIP_GATE(0x806027E4, &lit_7213); #pragma pop /* 806027E8-806027EC 000184 0004+00 0/0 0/0 0/0 .rodata @7214 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7214 = -1780.0f; -COMPILER_STRIP_GATE(806027E8, &lit_7214); +COMPILER_STRIP_GATE(0x806027E8, &lit_7214); #pragma pop /* 806027EC-806027F0 000188 0004+00 0/0 0/0 0/0 .rodata @7215 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7215 = 389.0f; -COMPILER_STRIP_GATE(806027EC, &lit_7215); +COMPILER_STRIP_GATE(0x806027EC, &lit_7215); #pragma pop /* 806027F0-806027F4 00018C 0004+00 0/0 0/0 0/0 .rodata @7216 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7216 = 1326.0f; -COMPILER_STRIP_GATE(806027F0, &lit_7216); +COMPILER_STRIP_GATE(0x806027F0, &lit_7216); #pragma pop /* 806027F4-806027F8 000190 0004+00 0/0 0/0 0/0 .rodata @7217 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7217 = -2356.0f; -COMPILER_STRIP_GATE(806027F4, &lit_7217); +COMPILER_STRIP_GATE(0x806027F4, &lit_7217); #pragma pop /* 806027F8-806027FC 000194 0004+00 0/0 0/0 0/0 .rodata @7218 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7218 = 3.0f / 100.0f; -COMPILER_STRIP_GATE(806027F8, &lit_7218); +COMPILER_STRIP_GATE(0x806027F8, &lit_7218); #pragma pop /* 806027FC-80602800 000198 0004+00 0/0 0/0 0/0 .rodata @7219 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7219 = 79.0f; -COMPILER_STRIP_GATE(806027FC, &lit_7219); +COMPILER_STRIP_GATE(0x806027FC, &lit_7219); #pragma pop /* 80602800-80602804 00019C 0004+00 0/0 0/0 0/0 .rodata @7220 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7220 = 1305.0f; -COMPILER_STRIP_GATE(80602800, &lit_7220); +COMPILER_STRIP_GATE(0x80602800, &lit_7220); #pragma pop /* 80602804-80602808 0001A0 0004+00 0/0 0/0 0/0 .rodata @7221 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7221 = -1029.0f; -COMPILER_STRIP_GATE(80602804, &lit_7221); +COMPILER_STRIP_GATE(0x80602804, &lit_7221); #pragma pop /* 80602808-8060280C 0001A4 0004+00 0/1 0/0 0/0 .rodata @7222 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7222 = 86.0f; -COMPILER_STRIP_GATE(80602808, &lit_7222); +COMPILER_STRIP_GATE(0x80602808, &lit_7222); #pragma pop /* 8060280C-80602810 0001A8 0004+00 0/0 0/0 0/0 .rodata @7223 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7223 = 1321.0f; -COMPILER_STRIP_GATE(8060280C, &lit_7223); +COMPILER_STRIP_GATE(0x8060280C, &lit_7223); #pragma pop /* 80602810-80602814 0001AC 0004+00 0/0 0/0 0/0 .rodata @7224 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7224 = -1277.0f; -COMPILER_STRIP_GATE(80602810, &lit_7224); +COMPILER_STRIP_GATE(0x80602810, &lit_7224); #pragma pop /* 80602814-80602818 0001B0 0004+00 0/1 0/0 0/0 .rodata @7225 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7225 = -50.0f; -COMPILER_STRIP_GATE(80602814, &lit_7225); +COMPILER_STRIP_GATE(0x80602814, &lit_7225); #pragma pop /* 80602818-8060281C 0001B4 0004+00 0/0 0/0 0/0 .rodata @7226 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7226 = 11.0f / 20.0f; -COMPILER_STRIP_GATE(80602818, &lit_7226); +COMPILER_STRIP_GATE(0x80602818, &lit_7226); #pragma pop /* 8060281C-80602820 0001B8 0004+00 0/1 0/0 0/0 .rodata @7227 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7227 = 80.0f; -COMPILER_STRIP_GATE(8060281C, &lit_7227); +COMPILER_STRIP_GATE(0x8060281C, &lit_7227); #pragma pop /* 80602820-80602824 0001BC 0004+00 0/0 0/0 0/0 .rodata @7228 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7228 = 280.0f; -COMPILER_STRIP_GATE(80602820, &lit_7228); +COMPILER_STRIP_GATE(0x80602820, &lit_7228); #pragma pop /* 80602824-80602828 0001C0 0004+00 0/0 0/0 0/0 .rodata @7229 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7229 = 212.0f; -COMPILER_STRIP_GATE(80602824, &lit_7229); +COMPILER_STRIP_GATE(0x80602824, &lit_7229); #pragma pop /* 80602828-8060282C 0001C4 0004+00 0/0 0/0 0/0 .rodata @7230 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7230 = 340.0f; -COMPILER_STRIP_GATE(80602828, &lit_7230); +COMPILER_STRIP_GATE(0x80602828, &lit_7230); #pragma pop /* 8060282C-80602830 0001C8 0004+00 0/0 0/0 0/0 .rodata @7231 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7231 = 180.0f; -COMPILER_STRIP_GATE(8060282C, &lit_7231); +COMPILER_STRIP_GATE(0x8060282C, &lit_7231); #pragma pop /* 80602830-80602834 0001CC 0004+00 0/0 0/0 0/0 .rodata @7232 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7232 = 260.0f; -COMPILER_STRIP_GATE(80602830, &lit_7232); +COMPILER_STRIP_GATE(0x80602830, &lit_7232); #pragma pop /* 80602834-80602838 0001D0 0004+00 0/1 0/0 0/0 .rodata @7233 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7233 = 9.0f / 10.0f; -COMPILER_STRIP_GATE(80602834, &lit_7233); +COMPILER_STRIP_GATE(0x80602834, &lit_7233); #pragma pop /* 80602838-8060283C 0001D4 0004+00 0/0 0/0 0/0 .rodata @7234 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7234 = 792.0f; -COMPILER_STRIP_GATE(80602838, &lit_7234); +COMPILER_STRIP_GATE(0x80602838, &lit_7234); #pragma pop /* 8060283C-80602840 0001D8 0004+00 0/0 0/0 0/0 .rodata @7235 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7235 = 1595.0f; -COMPILER_STRIP_GATE(8060283C, &lit_7235); +COMPILER_STRIP_GATE(0x8060283C, &lit_7235); #pragma pop /* 80602840-80602844 0001DC 0004+00 0/0 0/0 0/0 .rodata @7236 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7236 = 1160.0f; -COMPILER_STRIP_GATE(80602840, &lit_7236); +COMPILER_STRIP_GATE(0x80602840, &lit_7236); #pragma pop /* 80602844-80602848 0001E0 0004+00 0/0 0/0 0/0 .rodata @7237 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7237 = 938.0f; -COMPILER_STRIP_GATE(80602844, &lit_7237); +COMPILER_STRIP_GATE(0x80602844, &lit_7237); #pragma pop /* 80602848-8060284C 0001E4 0004+00 0/0 0/0 0/0 .rodata @7238 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7238 = 1675.0f; -COMPILER_STRIP_GATE(80602848, &lit_7238); +COMPILER_STRIP_GATE(0x80602848, &lit_7238); #pragma pop /* 8060284C-80602850 0001E8 0004+00 0/0 0/0 0/0 .rodata @7239 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7239 = 1337.0f; -COMPILER_STRIP_GATE(8060284C, &lit_7239); +COMPILER_STRIP_GATE(0x8060284C, &lit_7239); #pragma pop /* 80602850-80602854 0001EC 0004+00 0/1 0/0 0/0 .rodata @7240 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7240 = 12.0f; -COMPILER_STRIP_GATE(80602850, &lit_7240); +COMPILER_STRIP_GATE(0x80602850, &lit_7240); #pragma pop /* 80602854-80602858 0001F0 0004+00 0/0 0/0 0/0 .rodata @7241 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7241 = -81.0f; -COMPILER_STRIP_GATE(80602854, &lit_7241); +COMPILER_STRIP_GATE(0x80602854, &lit_7241); #pragma pop /* 80602858-8060285C 0001F4 0004+00 0/0 0/0 0/0 .rodata @7242 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7242 = 1391.0f; -COMPILER_STRIP_GATE(80602858, &lit_7242); +COMPILER_STRIP_GATE(0x80602858, &lit_7242); #pragma pop /* 8060285C-80602860 0001F8 0004+00 0/0 0/0 0/0 .rodata @7243 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7243 = -2144.0f; -COMPILER_STRIP_GATE(8060285C, &lit_7243); +COMPILER_STRIP_GATE(0x8060285C, &lit_7243); #pragma pop /* 80602860-80602864 0001FC 0004+00 0/0 0/0 0/0 .rodata @7244 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7244 = 37.0f; -COMPILER_STRIP_GATE(80602860, &lit_7244); +COMPILER_STRIP_GATE(0x80602860, &lit_7244); #pragma pop /* 80602864-80602868 000200 0004+00 0/0 0/0 0/0 .rodata @7245 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7245 = 1366.0f; -COMPILER_STRIP_GATE(80602864, &lit_7245); +COMPILER_STRIP_GATE(0x80602864, &lit_7245); #pragma pop /* 80602868-8060286C 000204 0004+00 0/0 0/0 0/0 .rodata @7246 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7246 = -1865.0f; -COMPILER_STRIP_GATE(80602868, &lit_7246); +COMPILER_STRIP_GATE(0x80602868, &lit_7246); #pragma pop /* 8060286C-80602870 000208 0004+00 0/0 0/0 0/0 .rodata @7247 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7247 = 1352.0f; -COMPILER_STRIP_GATE(8060286C, &lit_7247); +COMPILER_STRIP_GATE(0x8060286C, &lit_7247); #pragma pop /* 80602870-80602874 00020C 0004+00 0/0 0/0 0/0 .rodata @7248 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7248 = -1866.0f; -COMPILER_STRIP_GATE(80602870, &lit_7248); +COMPILER_STRIP_GATE(0x80602870, &lit_7248); #pragma pop /* 80602874-80602878 000210 0004+00 0/0 0/0 0/0 .rodata @7249 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7249 = 129.0f; -COMPILER_STRIP_GATE(80602874, &lit_7249); +COMPILER_STRIP_GATE(0x80602874, &lit_7249); #pragma pop /* 80602878-8060287C 000214 0004+00 0/0 0/0 0/0 .rodata @7250 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7250 = 1358.0f; -COMPILER_STRIP_GATE(80602878, &lit_7250); +COMPILER_STRIP_GATE(0x80602878, &lit_7250); #pragma pop /* 8060287C-80602880 000218 0004+00 0/0 0/0 0/0 .rodata @7251 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7251 = -2165.0f; -COMPILER_STRIP_GATE(8060287C, &lit_7251); +COMPILER_STRIP_GATE(0x8060287C, &lit_7251); #pragma pop /* 80602880-80602884 00021C 0004+00 0/0 0/0 0/0 .rodata @7252 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7252 = 7.0f / 100.0f; -COMPILER_STRIP_GATE(80602880, &lit_7252); +COMPILER_STRIP_GATE(0x80602880, &lit_7252); #pragma pop /* 80602884-80602888 000220 0004+00 0/0 0/0 0/0 .rodata @7253 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_7253 = 0x3B03126F; -COMPILER_STRIP_GATE(80602884, &lit_7253); +COMPILER_STRIP_GATE(0x80602884, &lit_7253); #pragma pop /* 80602888-8060288C 000224 0004+00 0/0 0/0 0/0 .rodata @7254 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7254 = 101.0f; -COMPILER_STRIP_GATE(80602888, &lit_7254); +COMPILER_STRIP_GATE(0x80602888, &lit_7254); #pragma pop /* 8060288C-80602890 000228 0004+00 0/0 0/0 0/0 .rodata @7255 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7255 = 1206.0f; -COMPILER_STRIP_GATE(8060288C, &lit_7255); +COMPILER_STRIP_GATE(0x8060288C, &lit_7255); #pragma pop /* 80602890-80602894 00022C 0004+00 0/0 0/0 0/0 .rodata @7256 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7256 = -582.0f; -COMPILER_STRIP_GATE(80602890, &lit_7256); +COMPILER_STRIP_GATE(0x80602890, &lit_7256); #pragma pop /* 80602894-80602898 000230 0004+00 0/0 0/0 0/0 .rodata @7257 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7257 = 154.0f; -COMPILER_STRIP_GATE(80602894, &lit_7257); +COMPILER_STRIP_GATE(0x80602894, &lit_7257); #pragma pop /* 80602898-8060289C 000234 0004+00 0/0 0/0 0/0 .rodata @7258 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7258 = 1199.0f; -COMPILER_STRIP_GATE(80602898, &lit_7258); +COMPILER_STRIP_GATE(0x80602898, &lit_7258); #pragma pop /* 8060289C-806028A0 000238 0004+00 0/0 0/0 0/0 .rodata @7259 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7259 = -819.0f; -COMPILER_STRIP_GATE(8060289C, &lit_7259); +COMPILER_STRIP_GATE(0x8060289C, &lit_7259); #pragma pop /* 806028A0-806028A4 00023C 0004+00 0/0 0/0 0/0 .rodata @7260 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7260 = 135.0f; -COMPILER_STRIP_GATE(806028A0, &lit_7260); +COMPILER_STRIP_GATE(0x806028A0, &lit_7260); #pragma pop /* 806028A4-806028A8 000240 0004+00 0/1 0/0 0/0 .rodata @7261 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7261 = 1.0f / 50.0f; -COMPILER_STRIP_GATE(806028A4, &lit_7261); +COMPILER_STRIP_GATE(0x806028A4, &lit_7261); #pragma pop /* 806028A8-806028AC 000244 0004+00 0/0 0/0 0/0 .rodata @7262 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_7262 = 0xC247999A; -COMPILER_STRIP_GATE(806028A8, &lit_7262); +COMPILER_STRIP_GATE(0x806028A8, &lit_7262); #pragma pop /* 806028AC-806028B0 000248 0004+00 0/0 0/0 0/0 .rodata @7263 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7263 = 48.0f; -COMPILER_STRIP_GATE(806028AC, &lit_7263); +COMPILER_STRIP_GATE(0x806028AC, &lit_7263); #pragma pop /* 806028B0-806028B4 00024C 0004+00 0/0 0/0 0/0 .rodata @7264 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7264 = -2.0f / 5.0f; -COMPILER_STRIP_GATE(806028B0, &lit_7264); +COMPILER_STRIP_GATE(0x806028B0, &lit_7264); #pragma pop /* 806028B4-806028B8 000250 0004+00 0/0 0/0 0/0 .rodata @7265 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7265 = 3.0f / 20.0f; -COMPILER_STRIP_GATE(806028B4, &lit_7265); +COMPILER_STRIP_GATE(0x806028B4, &lit_7265); #pragma pop /* 806028B8-806028BC 000254 0004+00 0/0 0/0 0/0 .rodata @7266 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7266 = 1400.0f; -COMPILER_STRIP_GATE(806028B8, &lit_7266); +COMPILER_STRIP_GATE(0x806028B8, &lit_7266); #pragma pop /* 806028BC-806028C0 000258 0004+00 0/0 0/0 0/0 .rodata @7267 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_7267 = 0x425ECCCD; -COMPILER_STRIP_GATE(806028BC, &lit_7267); +COMPILER_STRIP_GATE(0x806028BC, &lit_7267); #pragma pop /* 806028C0-806028C4 00025C 0004+00 0/0 0/0 0/0 .rodata @7268 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7268 = 1146.0f; -COMPILER_STRIP_GATE(806028C0, &lit_7268); +COMPILER_STRIP_GATE(0x806028C0, &lit_7268); #pragma pop /* 806028C4-806028C8 000260 0004+00 0/0 0/0 0/0 .rodata @7269 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7269 = -151.0f; -COMPILER_STRIP_GATE(806028C4, &lit_7269); +COMPILER_STRIP_GATE(0x806028C4, &lit_7269); #pragma pop /* 806028C8-806028CC 000264 0004+00 0/0 0/0 0/0 .rodata @7270 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7270 = -131.0f; -COMPILER_STRIP_GATE(806028C8, &lit_7270); +COMPILER_STRIP_GATE(0x806028C8, &lit_7270); #pragma pop /* 806028CC-806028D0 000268 0004+00 0/0 0/0 0/0 .rodata @7271 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7271 = -156.0f; -COMPILER_STRIP_GATE(806028CC, &lit_7271); +COMPILER_STRIP_GATE(0x806028CC, &lit_7271); #pragma pop /* 806028D0-806028D4 00026C 0004+00 0/1 0/0 0/0 .rodata @7272 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7272 = 90.0f; -COMPILER_STRIP_GATE(806028D0, &lit_7272); +COMPILER_STRIP_GATE(0x806028D0, &lit_7272); #pragma pop /* 806028D4-806028D8 000270 0004+00 0/0 0/0 0/0 .rodata @7273 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7273 = 1250.0f; -COMPILER_STRIP_GATE(806028D4, &lit_7273); +COMPILER_STRIP_GATE(0x806028D4, &lit_7273); #pragma pop /* 806028D8-806028DC 000274 0004+00 0/0 0/0 0/0 .rodata @7274 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7274 = -57.0f; -COMPILER_STRIP_GATE(806028D8, &lit_7274); +COMPILER_STRIP_GATE(0x806028D8, &lit_7274); #pragma pop /* 806028DC-806028E0 000278 0004+00 0/0 0/0 0/0 .rodata @7275 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7275 = -80.0f; -COMPILER_STRIP_GATE(806028DC, &lit_7275); +COMPILER_STRIP_GATE(0x806028DC, &lit_7275); #pragma pop /* 806028E0-806028E4 00027C 0004+00 0/0 0/0 0/0 .rodata @7276 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7276 = 1188.0f; -COMPILER_STRIP_GATE(806028E0, &lit_7276); +COMPILER_STRIP_GATE(0x806028E0, &lit_7276); #pragma pop /* 806028E4-806028E8 000280 0004+00 0/0 0/0 0/0 .rodata @7277 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7277 = -106.0f; -COMPILER_STRIP_GATE(806028E4, &lit_7277); +COMPILER_STRIP_GATE(0x806028E4, &lit_7277); #pragma pop /* 806028E8-806028EC 000284 0004+00 0/0 0/0 0/0 .rodata @7278 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7278 = 1430.0f; -COMPILER_STRIP_GATE(806028E8, &lit_7278); +COMPILER_STRIP_GATE(0x806028E8, &lit_7278); #pragma pop /* 806028EC-806028F0 000288 0004+00 0/0 0/0 0/0 .rodata @7279 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7279 = 1603.0f; -COMPILER_STRIP_GATE(806028EC, &lit_7279); +COMPILER_STRIP_GATE(0x806028EC, &lit_7279); #pragma pop /* 806028F0-806028F4 00028C 0004+00 0/0 0/0 0/0 .rodata @7280 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7280 = -2033.0f; -COMPILER_STRIP_GATE(806028F0, &lit_7280); +COMPILER_STRIP_GATE(0x806028F0, &lit_7280); #pragma pop /* 806028F4-806028F8 000290 0004+00 0/0 0/0 0/0 .rodata @7281 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7281 = -70.0f; -COMPILER_STRIP_GATE(806028F4, &lit_7281); +COMPILER_STRIP_GATE(0x806028F4, &lit_7281); #pragma pop /* 806028F8-806028FC 000294 0004+00 0/0 0/0 0/0 .rodata @7282 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7282 = 1564.0f; -COMPILER_STRIP_GATE(806028F8, &lit_7282); +COMPILER_STRIP_GATE(0x806028F8, &lit_7282); #pragma pop /* 806028FC-80602900 000298 0004+00 0/0 0/0 0/0 .rodata @7283 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7283 = -1884.0f; -COMPILER_STRIP_GATE(806028FC, &lit_7283); +COMPILER_STRIP_GATE(0x806028FC, &lit_7283); #pragma pop /* 80602900-80602904 00029C 0004+00 0/1 0/0 0/0 .rodata @7284 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7284 = -5.0f; -COMPILER_STRIP_GATE(80602900, &lit_7284); +COMPILER_STRIP_GATE(0x80602900, &lit_7284); #pragma pop /* 80602904-80602908 0002A0 0004+00 0/1 0/0 0/0 .rodata @7285 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7285 = 1.0f / 20.0f; -COMPILER_STRIP_GATE(80602904, &lit_7285); +COMPILER_STRIP_GATE(0x80602904, &lit_7285); #pragma pop /* 80602908-8060290C 0002A4 0004+00 0/0 0/0 0/0 .rodata @7286 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7286 = 1.0f / 100.0f; -COMPILER_STRIP_GATE(80602908, &lit_7286); +COMPILER_STRIP_GATE(0x80602908, &lit_7286); #pragma pop /* 8060290C-80602910 0002A8 0004+00 0/0 0/0 0/0 .rodata @7287 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7287 = -600.0f; -COMPILER_STRIP_GATE(8060290C, &lit_7287); +COMPILER_STRIP_GATE(0x8060290C, &lit_7287); #pragma pop /* 80602910-80602914 0002AC 0004+00 0/0 0/0 0/0 .rodata @7288 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7288 = -250.0f; -COMPILER_STRIP_GATE(80602910, &lit_7288); +COMPILER_STRIP_GATE(0x80602910, &lit_7288); #pragma pop /* 80602914-80602918 0002B0 0004+00 0/1 0/0 0/0 .rodata @7289 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7289 = 120.0f; -COMPILER_STRIP_GATE(80602914, &lit_7289); +COMPILER_STRIP_GATE(0x80602914, &lit_7289); #pragma pop /* 80602918-8060291C 0002B4 0004+00 0/1 0/0 0/0 .rodata @7743 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7743 = 21.0f; -COMPILER_STRIP_GATE(80602918, &lit_7743); +COMPILER_STRIP_GATE(0x80602918, &lit_7743); #pragma pop /* 8060291C-80602920 0002B8 0004+00 0/1 0/0 0/0 .rodata @7744 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7744 = 26.0f; -COMPILER_STRIP_GATE(8060291C, &lit_7744); +COMPILER_STRIP_GATE(0x8060291C, &lit_7744); #pragma pop /* 80602920-80602924 0002BC 0004+00 0/2 0/0 0/0 .rodata @7745 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7745 = 17.0f; -COMPILER_STRIP_GATE(80602920, &lit_7745); +COMPILER_STRIP_GATE(0x80602920, &lit_7745); #pragma pop /* 80602924-80602928 0002C0 0004+00 0/1 0/0 0/0 .rodata @7746 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7746 = 16.5f; -COMPILER_STRIP_GATE(80602924, &lit_7746); +COMPILER_STRIP_GATE(0x80602924, &lit_7746); #pragma pop /* 80602928-8060292C 0002C4 0004+00 0/1 0/0 0/0 .rodata @7747 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7747 = 9.5f; -COMPILER_STRIP_GATE(80602928, &lit_7747); +COMPILER_STRIP_GATE(0x80602928, &lit_7747); #pragma pop /* 8060292C-80602930 0002C8 0004+00 0/1 0/0 0/0 .rodata @7748 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7748 = 13.0f; -COMPILER_STRIP_GATE(8060292C, &lit_7748); +COMPILER_STRIP_GATE(0x8060292C, &lit_7748); #pragma pop /* 80602930-80602934 0002CC 0004+00 0/1 0/0 0/0 .rodata @7749 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7749 = 19.0f; -COMPILER_STRIP_GATE(80602930, &lit_7749); +COMPILER_STRIP_GATE(0x80602930, &lit_7749); #pragma pop /* 80602934-80602938 0002D0 0004+00 0/1 0/0 0/0 .rodata @7750 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7750 = 8.0f; -COMPILER_STRIP_GATE(80602934, &lit_7750); +COMPILER_STRIP_GATE(0x80602934, &lit_7750); #pragma pop /* 80602938-8060293C 0002D4 0004+00 0/1 0/0 0/0 .rodata @7751 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7751 = 11.0f; -COMPILER_STRIP_GATE(80602938, &lit_7751); +COMPILER_STRIP_GATE(0x80602938, &lit_7751); #pragma pop /* 8060293C-80602940 0002D8 0004+00 0/1 0/0 0/0 .rodata @7752 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7752 = 28.0f; -COMPILER_STRIP_GATE(8060293C, &lit_7752); +COMPILER_STRIP_GATE(0x8060293C, &lit_7752); #pragma pop /* 80602940-80602944 0002DC 0004+00 0/1 0/0 0/0 .rodata @7753 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7753 = 31.0f; -COMPILER_STRIP_GATE(80602940, &lit_7753); +COMPILER_STRIP_GATE(0x80602940, &lit_7753); #pragma pop /* 80602944-80602948 0002E0 0004+00 0/1 0/0 0/0 .rodata @7754 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7754 = 32.0f; -COMPILER_STRIP_GATE(80602944, &lit_7754); +COMPILER_STRIP_GATE(0x80602944, &lit_7754); #pragma pop /* 80602948-8060294C 0002E4 0004+00 0/1 0/0 0/0 .rodata @7755 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7755 = 18.0f; -COMPILER_STRIP_GATE(80602948, &lit_7755); +COMPILER_STRIP_GATE(0x80602948, &lit_7755); #pragma pop /* 8060294C-80602950 0002E8 0004+00 0/1 0/0 0/0 .rodata @7756 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7756 = 24.0f; -COMPILER_STRIP_GATE(8060294C, &lit_7756); +COMPILER_STRIP_GATE(0x8060294C, &lit_7756); #pragma pop /* 80602950-80602954 0002EC 0004+00 0/1 0/0 0/0 .rodata @7757 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7757 = 27.0f; -COMPILER_STRIP_GATE(80602950, &lit_7757); +COMPILER_STRIP_GATE(0x80602950, &lit_7757); #pragma pop /* 805FDAE0-805FEC58 009180 1178+00 1/1 0/0 0/0 .text anm_se_set__FP11b_gnd_class */ @@ -3064,140 +3085,140 @@ static asm void anm_se_set(b_gnd_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8733 = -20.0f; -COMPILER_STRIP_GATE(80602954, &lit_8733); +COMPILER_STRIP_GATE(0x80602954, &lit_8733); #pragma pop /* 80602958-8060295C 0002F4 0004+00 0/1 0/0 0/0 .rodata @8734 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8734 = -100.0f; -COMPILER_STRIP_GATE(80602958, &lit_8734); +COMPILER_STRIP_GATE(0x80602958, &lit_8734); #pragma pop /* 8060295C-80602960 0002F8 0004+00 0/1 0/0 0/0 .rodata @8735 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8735 = 7.5f; -COMPILER_STRIP_GATE(8060295C, &lit_8735); +COMPILER_STRIP_GATE(0x8060295C, &lit_8735); #pragma pop /* 80602960-80602964 0002FC 0004+00 0/1 0/0 0/0 .rodata @8736 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8736 = -1000000000.0f; -COMPILER_STRIP_GATE(80602960, &lit_8736); +COMPILER_STRIP_GATE(0x80602960, &lit_8736); #pragma pop /* 80602964-80602968 000300 0004+00 0/1 0/0 0/0 .rodata @8737 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8737 = -30.0f; -COMPILER_STRIP_GATE(80602964, &lit_8737); +COMPILER_STRIP_GATE(0x80602964, &lit_8737); #pragma pop /* 80602968-8060296C 000304 0004+00 0/1 0/0 0/0 .rodata @8738 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8738 = -1200.0f; -COMPILER_STRIP_GATE(80602968, &lit_8738); +COMPILER_STRIP_GATE(0x80602968, &lit_8738); #pragma pop /* 8060296C-80602970 000308 0004+00 0/1 0/0 0/0 .rodata @8739 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_8739 = 0x42A39EB8; -COMPILER_STRIP_GATE(8060296C, &lit_8739); +COMPILER_STRIP_GATE(0x8060296C, &lit_8739); #pragma pop /* 80602970-80602974 00030C 0004+00 0/1 0/0 0/0 .rodata @8740 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8740 = 127.0f / 50.0f; -COMPILER_STRIP_GATE(80602970, &lit_8740); +COMPILER_STRIP_GATE(0x80602970, &lit_8740); #pragma pop /* 80602974-80602978 000310 0004+00 0/1 0/0 0/0 .rodata @8741 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8741 = 29.0f / 10.0f; -COMPILER_STRIP_GATE(80602974, &lit_8741); +COMPILER_STRIP_GATE(0x80602974, &lit_8741); #pragma pop /* 80602978-8060297C 000314 0004+00 0/1 0/0 0/0 .rodata @8742 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8742 = -130.0f; -COMPILER_STRIP_GATE(80602978, &lit_8742); +COMPILER_STRIP_GATE(0x80602978, &lit_8742); #pragma pop /* 8060297C-80602980 000318 0004+00 0/1 0/0 0/0 .rodata @8743 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8743 = 130.0f; -COMPILER_STRIP_GATE(8060297C, &lit_8743); +COMPILER_STRIP_GATE(0x8060297C, &lit_8743); #pragma pop /* 80602980-80602984 00031C 0004+00 0/1 0/0 0/0 .rodata @8744 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8744 = 20000.0f; -COMPILER_STRIP_GATE(80602980, &lit_8744); +COMPILER_STRIP_GATE(0x80602980, &lit_8744); #pragma pop /* 80602984-80602988 000320 0004+00 0/1 0/0 0/0 .rodata @8745 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8745 = 13000.0f; -COMPILER_STRIP_GATE(80602984, &lit_8745); +COMPILER_STRIP_GATE(0x80602984, &lit_8745); #pragma pop /* 80602988-8060298C 000324 0004+00 0/1 0/0 0/0 .rodata @8746 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8746 = -20000.0f; -COMPILER_STRIP_GATE(80602988, &lit_8746); +COMPILER_STRIP_GATE(0x80602988, &lit_8746); #pragma pop /* 8060298C-80602990 000328 0004+00 0/1 0/0 0/0 .rodata @8747 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8747 = 100000.0f; -COMPILER_STRIP_GATE(8060298C, &lit_8747); +COMPILER_STRIP_GATE(0x8060298C, &lit_8747); #pragma pop /* 80602990-80602994 00032C 0004+00 0/1 0/0 0/0 .rodata @8748 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8748 = -13456.0f; -COMPILER_STRIP_GATE(80602990, &lit_8748); +COMPILER_STRIP_GATE(0x80602990, &lit_8748); #pragma pop /* 80602994-80602998 000330 0004+00 0/1 0/0 0/0 .rodata @8749 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8749 = -17.0f; -COMPILER_STRIP_GATE(80602994, &lit_8749); +COMPILER_STRIP_GATE(0x80602994, &lit_8749); #pragma pop /* 80602998-8060299C 000334 0004+00 0/1 0/0 0/0 .rodata @8750 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8750 = 0.25f; -COMPILER_STRIP_GATE(80602998, &lit_8750); +COMPILER_STRIP_GATE(0x80602998, &lit_8750); #pragma pop /* 8060299C-806029A0 000338 0004+00 0/1 0/0 0/0 .rodata @8751 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8751 = 1500.0f; -COMPILER_STRIP_GATE(8060299C, &lit_8751); +COMPILER_STRIP_GATE(0x8060299C, &lit_8751); #pragma pop /* 806029A0-806029A4 00033C 0004+00 0/1 0/0 0/0 .rodata @8752 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8752 = -15.0f; -COMPILER_STRIP_GATE(806029A0, &lit_8752); +COMPILER_STRIP_GATE(0x806029A0, &lit_8752); #pragma pop /* 805FEC58-806009F8 00A2F8 1DA0+00 2/1 0/0 0/0 .text daB_GND_Execute__FP11b_gnd_class */ @@ -3265,7 +3286,7 @@ static asm void daB_GND_Delete(b_gnd_class* param_0) { SECTION_RODATA static u8 const blur_model[8] = { 0x00, 0x00, 0x00, 0x66, 0x00, 0x00, 0x00, 0x65, }; -COMPILER_STRIP_GATE(806029A4, &blur_model); +COMPILER_STRIP_GATE(0x806029A4, &blur_model); #pragma pop /* 80600B14-80601468 00C1B4 0954+00 1/1 0/0 0/0 .text useHeapInit__FP10fopAc_ac_c */ @@ -3475,7 +3496,7 @@ asm void __sinit_d_a_b_gnd_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80602278 = (void*)__sinit_d_a_b_gnd_cpp; +REGISTER_CTORS(0x80602278, __sinit_d_a_b_gnd_cpp); #pragma pop /* 806022F0-80602328 00D990 0038+00 1/1 0/0 0/0 .text __arraydtor$4508 */ @@ -3896,12 +3917,4 @@ static u8 data_806030B8[4]; static u8 data_806030BC[4]; #pragma pop -/* 806029AC-806029CD 000348 0021+00 6/6 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_806029AC = "B_gnd"; -SECTION_DEAD static char const* const stringBase_806029B2 = "B_hg"; -SECTION_DEAD static char const* const stringBase_806029B7 = "force_start"; -SECTION_DEAD static char const* const stringBase_806029C3 = "force_end"; -#pragma pop +/* 806029AC-806029AC 000348 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/b/d_a_b_go/d_a_b_go.cpp b/rel/d/a/b/d_a_b_go/d_a_b_go.cpp index 23f92cfce0c..02eaed213dc 100644 --- a/rel/d/a/b/d_a_b_go/d_a_b_go.cpp +++ b/rel/d/a/b/d_a_b_go/d_a_b_go.cpp @@ -19,16 +19,16 @@ struct mDoMtx_stack_c { static u8 now[48]; }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; - struct J3DAnmTransform {}; +struct J3DModelData {}; + +struct Z2Creature {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -85,12 +85,12 @@ struct dBgS_AcchCir { /* 80075F58 */ void SetWall(f32, f32); }; -struct dBgS {}; - struct csXyz { /* 802673F4 */ csXyz(s16, s16, s16); }; +struct dBgS {}; + struct dBgS_Acch { /* 80075F94 */ ~dBgS_Acch(); /* 800760A0 */ dBgS_Acch(); @@ -227,20 +227,20 @@ extern "C" void __register_global_object(); /* ############################################################################################## */ /* 80604044-80604048 000000 0004+00 6/6 0/0 0/0 .rodata @3646 */ SECTION_RODATA static f32 const lit_3646 = 1.5f; -COMPILER_STRIP_GATE(80604044, &lit_3646); +COMPILER_STRIP_GATE(0x80604044, &lit_3646); /* 80604048-8060404C 000004 0004+00 0/1 0/0 0/0 .rodata @3647 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3647 = 15.0f; -COMPILER_STRIP_GATE(80604048, &lit_3647); +COMPILER_STRIP_GATE(0x80604048, &lit_3647); #pragma pop /* 8060404C-80604050 000008 0004+00 0/3 0/0 0/0 .rodata @3648 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3648 = 300.0f; -COMPILER_STRIP_GATE(8060404C, &lit_3648); +COMPILER_STRIP_GATE(0x8060404C, &lit_3648); #pragma pop /* 80604094-806040B4 -00001 0020+00 1/0 0/0 0/0 .data l_daB_GO_Method */ @@ -344,11 +344,17 @@ SECTION_RODATA static u8 const lit_3673[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80604050, &lit_3673); +COMPILER_STRIP_GATE(0x80604050, &lit_3673); /* 80604054-80604058 000010 0004+00 1/1 0/0 0/0 .rodata @3674 */ SECTION_RODATA static f32 const lit_3674 = -1.0f; -COMPILER_STRIP_GATE(80604054, &lit_3674); +COMPILER_STRIP_GATE(0x80604054, &lit_3674); + +/* 8060408C-8060408C 000048 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8060408C = "B_go"; +#pragma pop /* 80603270-8060331C 0001B0 00AC+00 3/3 0/0 0/0 .text anm_init__FP10b_go_classifUcf */ #pragma push @@ -370,25 +376,25 @@ static void damage_check(b_go_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3702 = 10.0f; -COMPILER_STRIP_GATE(80604058, &lit_3702); +COMPILER_STRIP_GATE(0x80604058, &lit_3702); #pragma pop /* 8060405C-80604060 000018 0004+00 1/4 0/0 0/0 .rodata @3703 */ SECTION_RODATA static f32 const lit_3703 = 1.0f; -COMPILER_STRIP_GATE(8060405C, &lit_3703); +COMPILER_STRIP_GATE(0x8060405C, &lit_3703); /* 80604060-80604064 00001C 0004+00 0/3 0/0 0/0 .rodata @3704 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3704 = 100.0f; -COMPILER_STRIP_GATE(80604060, &lit_3704); +COMPILER_STRIP_GATE(0x80604060, &lit_3704); #pragma pop /* 80604064-80604068 000020 0004+00 0/2 0/0 0/0 .rodata @3705 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3705 = 60.0f; -COMPILER_STRIP_GATE(80604064, &lit_3705); +COMPILER_STRIP_GATE(0x80604064, &lit_3705); #pragma pop /* 80603320-806033F0 000260 00D0+00 1/1 0/0 0/0 .text h_wait__FP10b_go_class */ @@ -406,7 +412,7 @@ static asm void h_wait(b_go_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3719 = 150.0f; -COMPILER_STRIP_GATE(80604068, &lit_3719); +COMPILER_STRIP_GATE(0x80604068, &lit_3719); #pragma pop /* 806033F0-80603508 000330 0118+00 1/1 0/0 0/0 .text h_walk__FP10b_go_class */ @@ -434,14 +440,14 @@ static asm void h_attack(b_go_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3784 = 1000.0f; -COMPILER_STRIP_GATE(8060406C, &lit_3784); +COMPILER_STRIP_GATE(0x8060406C, &lit_3784); #pragma pop /* 80604070-80604074 00002C 0004+00 0/1 0/0 0/0 .rodata @3785 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3785 = 200.0f; -COMPILER_STRIP_GATE(80604070, &lit_3785); +COMPILER_STRIP_GATE(0x80604070, &lit_3785); #pragma pop /* 80603638-806037E8 000578 01B0+00 1/1 0/0 0/0 .text action__FP10b_go_class */ @@ -494,42 +500,42 @@ static asm void useHeapInit(fopAc_ac_c* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3924 = -500.0f; -COMPILER_STRIP_GATE(80604074, &lit_3924); +COMPILER_STRIP_GATE(0x80604074, &lit_3924); #pragma pop /* 80604078-8060407C 000034 0004+00 0/1 0/0 0/0 .rodata @3925 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3925 = -2000.0f; -COMPILER_STRIP_GATE(80604078, &lit_3925); +COMPILER_STRIP_GATE(0x80604078, &lit_3925); #pragma pop /* 8060407C-80604080 000038 0004+00 0/1 0/0 0/0 .rodata @3926 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3926 = 500.0f; -COMPILER_STRIP_GATE(8060407C, &lit_3926); +COMPILER_STRIP_GATE(0x8060407C, &lit_3926); #pragma pop /* 80604080-80604084 00003C 0004+00 0/1 0/0 0/0 .rodata @3927 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3927 = 2000.0f; -COMPILER_STRIP_GATE(80604080, &lit_3927); +COMPILER_STRIP_GATE(0x80604080, &lit_3927); #pragma pop /* 80604084-80604088 000040 0004+00 0/1 0/0 0/0 .rodata @3928 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3928 = -7.0f; -COMPILER_STRIP_GATE(80604084, &lit_3928); +COMPILER_STRIP_GATE(0x80604084, &lit_3928); #pragma pop /* 80604088-8060408C 000044 0004+00 0/1 0/0 0/0 .rodata @3929 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3929 = 65536.0f; -COMPILER_STRIP_GATE(80604088, &lit_3929); +COMPILER_STRIP_GATE(0x80604088, &lit_3929); #pragma pop /* 80603A54-80603CA0 000994 024C+00 1/0 0/0 0/0 .text daB_GO_Create__FP10fopAc_ac_c */ @@ -614,7 +620,7 @@ asm void __sinit_d_a_b_go_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80603FE4 = (void*)__sinit_d_a_b_go_cpp; +REGISTER_CTORS(0x80603FE4, __sinit_d_a_b_go_cpp); #pragma pop /* 80604020-80604028 000F60 0008+00 1/0 0/0 0/0 .text @36@__dt__12dBgS_ObjAcchFv */ @@ -637,9 +643,4 @@ static asm void func_80604028() { } #pragma pop -/* 8060408C-80604091 000048 0005+00 4/4 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_8060408C = "B_go"; -#pragma pop +/* 8060408C-8060408C 000048 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/b/d_a_b_gos/d_a_b_gos.cpp b/rel/d/a/b/d_a_b_gos/d_a_b_gos.cpp index 3e168dce880..701231c059b 100644 --- a/rel/d/a/b/d_a_b_gos/d_a_b_gos.cpp +++ b/rel/d/a/b/d_a_b_gos/d_a_b_gos.cpp @@ -20,16 +20,16 @@ struct mDoMtx_stack_c { static u8 now[48]; }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; - struct J3DAnmTransform {}; +struct J3DModelData {}; + +struct Z2Creature {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -105,10 +105,10 @@ struct dBgS_AcchCir { /* 80075F58 */ void SetWall(f32, f32); }; -struct dBgS {}; - struct csXyz {}; +struct dBgS {}; + struct dBgS_Acch { /* 80075F94 */ ~dBgS_Acch(); /* 800760A0 */ dBgS_Acch(); @@ -269,11 +269,11 @@ extern "C" void __register_global_object(); /* ############################################################################################## */ /* 806053C8-806053CC 000000 0004+00 9/9 0/0 0/0 .rodata @3646 */ SECTION_RODATA static f32 const lit_3646 = 1.0f; -COMPILER_STRIP_GATE(806053C8, &lit_3646); +COMPILER_STRIP_GATE(0x806053C8, &lit_3646); /* 806053CC-806053D0 000004 0004+00 1/2 0/0 0/0 .rodata @3647 */ SECTION_RODATA static f32 const lit_3647 = 10.0f; -COMPILER_STRIP_GATE(806053CC, &lit_3647); +COMPILER_STRIP_GATE(0x806053CC, &lit_3647); /* 8060541C-80605514 000000 00F8+00 1/1 0/0 0/0 .data j_info */ SECTION_DATA static u8 j_info[248] = { @@ -382,14 +382,14 @@ asm daB_GOS_HIO_c::daB_GOS_HIO_c() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3674 = 50.0f; -COMPILER_STRIP_GATE(806053D0, &lit_3674); +COMPILER_STRIP_GATE(0x806053D0, &lit_3674); #pragma pop /* 806053D4-806053D8 00000C 0004+00 0/1 0/0 0/0 .rodata @3675 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3675 = 800.0f; -COMPILER_STRIP_GATE(806053D4, &lit_3675); +COMPILER_STRIP_GATE(0x806053D4, &lit_3675); #pragma pop /* 806053D8-806053DC 000010 0004+00 2/7 0/0 0/0 .rodata @3676 */ @@ -399,7 +399,7 @@ SECTION_RODATA static u8 const lit_3676[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(806053D8, &lit_3676); +COMPILER_STRIP_GATE(0x806053D8, &lit_3676); /* 8060429C-80604370 00011C 00D4+00 1/0 0/0 0/0 .text daB_GOS_Draw__FP11b_gos_class */ #pragma push @@ -414,7 +414,13 @@ static asm void daB_GOS_Draw(b_gos_class* param_0) { /* ############################################################################################## */ /* 806053DC-806053E0 000014 0004+00 1/1 0/0 0/0 .rodata @3684 */ SECTION_RODATA static f32 const lit_3684 = -1.0f; -COMPILER_STRIP_GATE(806053DC, &lit_3684); +COMPILER_STRIP_GATE(0x806053DC, &lit_3684); + +/* 80605414-80605414 00004C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80605414 = "B_gos"; +#pragma pop /* 80604370-8060441C 0001F0 00AC+00 3/3 0/0 0/0 .text anm_init__FP11b_gos_classifUcf */ #pragma push @@ -436,14 +442,14 @@ static void damage_check(b_gos_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3699 = 5.0f; -COMPILER_STRIP_GATE(806053E0, &lit_3699); +COMPILER_STRIP_GATE(0x806053E0, &lit_3699); #pragma pop /* 806053E4-806053E8 00001C 0004+00 0/2 0/0 0/0 .rodata @3700 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3700 = 30.0f; -COMPILER_STRIP_GATE(806053E4, &lit_3700); +COMPILER_STRIP_GATE(0x806053E4, &lit_3700); #pragma pop /* 80604420-806044D8 0002A0 00B8+00 1/1 0/0 0/0 .text wait__FP11b_gos_class */ @@ -459,13 +465,13 @@ static asm void wait(b_gos_class* param_0) { /* ############################################################################################## */ /* 806053E8-806053EC 000020 0004+00 1/3 0/0 0/0 .rodata @3711 */ SECTION_RODATA static f32 const lit_3711 = 60.0f; -COMPILER_STRIP_GATE(806053E8, &lit_3711); +COMPILER_STRIP_GATE(0x806053E8, &lit_3711); /* 806053EC-806053F0 000024 0004+00 0/2 0/0 0/0 .rodata @3712 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3712 = 65536.0f; -COMPILER_STRIP_GATE(806053EC, &lit_3712); +COMPILER_STRIP_GATE(0x806053EC, &lit_3712); #pragma pop /* 80605608-8060560C 000008 0004+00 3/3 0/0 0/0 .bss boss */ @@ -495,7 +501,7 @@ static asm void walk(b_gos_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3727 = 20.0f; -COMPILER_STRIP_GATE(806053F0, &lit_3727); +COMPILER_STRIP_GATE(0x806053F0, &lit_3727); #pragma pop /* 806045E4-806046E0 000464 00FC+00 1/1 0/0 0/0 .text ball__FP11b_gos_class */ @@ -513,7 +519,7 @@ static asm void ball(b_gos_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3774 = 200.0f; -COMPILER_STRIP_GATE(806053F4, &lit_3774); +COMPILER_STRIP_GATE(0x806053F4, &lit_3774); #pragma pop /* 806046E0-806048E0 000560 0200+00 1/1 0/0 0/0 .text stick__FP11b_gos_class */ @@ -531,35 +537,35 @@ static asm void stick(b_gos_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3827 = 0.5f; -COMPILER_STRIP_GATE(806053F8, &lit_3827); +COMPILER_STRIP_GATE(0x806053F8, &lit_3827); #pragma pop /* 806053FC-80605400 000034 0004+00 0/1 0/0 0/0 .rodata @3828 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3828 = -60.0f; -COMPILER_STRIP_GATE(806053FC, &lit_3828); +COMPILER_STRIP_GATE(0x806053FC, &lit_3828); #pragma pop /* 80605400-80605404 000038 0004+00 0/1 0/0 0/0 .rodata @3829 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3829 = 2.0f; -COMPILER_STRIP_GATE(80605400, &lit_3829); +COMPILER_STRIP_GATE(0x80605400, &lit_3829); #pragma pop /* 80605404-80605408 00003C 0004+00 0/1 0/0 0/0 .rodata @3830 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3830 = -30.0f; -COMPILER_STRIP_GATE(80605404, &lit_3830); +COMPILER_STRIP_GATE(0x80605404, &lit_3830); #pragma pop /* 80605408-8060540C 000040 0004+00 0/1 0/0 0/0 .rodata @3831 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3831 = 2.5f; -COMPILER_STRIP_GATE(80605408, &lit_3831); +COMPILER_STRIP_GATE(0x80605408, &lit_3831); #pragma pop /* 806048E0-80604B7C 000760 029C+00 1/1 0/0 0/0 .text action__FP11b_gos_class */ @@ -613,14 +619,14 @@ static asm void useHeapInit(fopAc_ac_c* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3953 = -200.0f; -COMPILER_STRIP_GATE(8060540C, &lit_3953); +COMPILER_STRIP_GATE(0x8060540C, &lit_3953); #pragma pop /* 80605410-80605414 000048 0004+00 0/1 0/0 0/0 .rodata @3954 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3954 = -7.0f; -COMPILER_STRIP_GATE(80605410, &lit_3954); +COMPILER_STRIP_GATE(0x80605410, &lit_3954); #pragma pop /* 80604E5C-80605024 000CDC 01C8+00 1/0 0/0 0/0 .text daB_GOS_Create__FP10fopAc_ac_c */ @@ -705,7 +711,7 @@ asm void __sinit_d_a_b_gos_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80605368 = (void*)__sinit_d_a_b_gos_cpp; +REGISTER_CTORS(0x80605368, __sinit_d_a_b_gos_cpp); #pragma pop /* 806053A4-806053AC 001224 0008+00 1/0 0/0 0/0 .text @36@__dt__12dBgS_ObjAcchFv */ @@ -728,9 +734,4 @@ static asm void func_806053AC() { } #pragma pop -/* 80605414-8060541A 00004C 0006+00 4/4 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80605414 = "B_gos"; -#pragma pop +/* 80605414-80605414 00004C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/b/d_a_b_mgn/d_a_b_mgn.cpp b/rel/d/a/b/d_a_b_mgn/d_a_b_mgn.cpp index 303771112cf..39ea41b561a 100644 --- a/rel/d/a/b/d_a_b_mgn/d_a_b_mgn.cpp +++ b/rel/d/a/b/d_a_b_mgn/d_a_b_mgn.cpp @@ -41,10 +41,10 @@ struct mDoGph_gInf_c { /* 80008078 */ void onBlure(); }; -struct J3DAnmTevRegKey {}; - struct J3DAnmTextureSRTKey {}; +struct J3DAnmTevRegKey {}; + struct J3DMaterialTable { /* 8032F7B4 */ void removeTexMtxAnimator(J3DAnmTextureSRTKey*); /* 8032F880 */ void removeTevRegAnimator(J3DAnmTevRegKey*); @@ -64,16 +64,16 @@ struct mDoExt_baseAnm { /* 8000D428 */ void play(); }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; - struct J3DAnmTransform {}; +struct J3DModelData {}; + +struct Z2Creature {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -100,10 +100,10 @@ struct daObjBHASHI_c { /* 80577500 */ void Obj_Damage(cXyz); }; -struct J3DJoint {}; - struct J3DModel {}; +struct J3DJoint {}; + struct daB_MGN_c { /* 8060577C */ void ctrlJoint(J3DJoint*, J3DModel*); /* 8060584C */ void JointCallBack(J3DJoint*, int); @@ -668,7 +668,7 @@ extern "C" void __register_global_object(); /* ############################################################################################## */ /* 8060FDE0-8060FDE4 000000 0004+00 30/30 0/0 0/0 .rodata @3928 */ SECTION_RODATA static f32 const lit_3928 = 100.0f; -COMPILER_STRIP_GATE(8060FDE0, &lit_3928); +COMPILER_STRIP_GATE(0x8060FDE0, &lit_3928); /* 8060FDE4-8060FDE8 000004 0004+00 3/26 0/0 0/0 .rodata @3929 */ SECTION_RODATA static u8 const lit_3929[4] = { @@ -677,7 +677,7 @@ SECTION_RODATA static u8 const lit_3929[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(8060FDE4, &lit_3929); +COMPILER_STRIP_GATE(0x8060FDE4, &lit_3929); /* 8060FDE8-8060FDF0 000008 0004+04 5/24 0/0 0/0 .rodata @3930 */ SECTION_RODATA static f32 const lit_3930[1 + 1 /* padding */] = { @@ -685,7 +685,7 @@ SECTION_RODATA static f32 const lit_3930[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(8060FDE8, &lit_3930); +COMPILER_STRIP_GATE(0x8060FDE8, &lit_3930); /* 8060FDF0-8060FDF8 000010 0008+00 0/7 0/0 0/0 .rodata @3931 */ #pragma push @@ -693,7 +693,7 @@ COMPILER_STRIP_GATE(8060FDE8, &lit_3930); SECTION_RODATA static u8 const lit_3931[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8060FDF0, &lit_3931); +COMPILER_STRIP_GATE(0x8060FDF0, &lit_3931); #pragma pop /* 8060FDF8-8060FE00 000018 0008+00 0/7 0/0 0/0 .rodata @3932 */ @@ -702,7 +702,7 @@ COMPILER_STRIP_GATE(8060FDF0, &lit_3931); SECTION_RODATA static u8 const lit_3932[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8060FDF8, &lit_3932); +COMPILER_STRIP_GATE(0x8060FDF8, &lit_3932); #pragma pop /* 8060FE00-8060FE08 000020 0008+00 0/7 0/0 0/0 .rodata @3933 */ @@ -711,35 +711,35 @@ COMPILER_STRIP_GATE(8060FDF8, &lit_3932); SECTION_RODATA static u8 const lit_3933[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8060FE00, &lit_3933); +COMPILER_STRIP_GATE(0x8060FE00, &lit_3933); #pragma pop /* 8060FE08-8060FE0C 000028 0004+00 0/1 0/0 0/0 .rodata @3934 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3934 = 1.0f / 100.0f; -COMPILER_STRIP_GATE(8060FE08, &lit_3934); +COMPILER_STRIP_GATE(0x8060FE08, &lit_3934); #pragma pop /* 8060FE0C-8060FE10 00002C 0004+00 0/1 0/0 0/0 .rodata @3949 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3949 = 6.0f / 5.0f; -COMPILER_STRIP_GATE(8060FE0C, &lit_3949); +COMPILER_STRIP_GATE(0x8060FE0C, &lit_3949); #pragma pop /* 8060FE10-8060FE14 000030 0004+00 0/3 0/0 0/0 .rodata @3950 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3950 = 50.0f; -COMPILER_STRIP_GATE(8060FE10, &lit_3950); +COMPILER_STRIP_GATE(0x8060FE10, &lit_3950); #pragma pop /* 8060FE14-8060FE18 000034 0004+00 0/3 0/0 0/0 .rodata @3951 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3951 = 70.0f; -COMPILER_STRIP_GATE(8060FE14, &lit_3951); +COMPILER_STRIP_GATE(0x8060FE14, &lit_3951); #pragma pop /* 80610094-806100A0 000000 000C+00 2/2 0/0 0/0 .data cNullVec__6Z2Calc */ @@ -1116,21 +1116,21 @@ asm void daB_MGN_c::JointCallBack(J3DJoint* param_0, int param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4108 = 4000.0f; -COMPILER_STRIP_GATE(8060FE18, &lit_4108); +COMPILER_STRIP_GATE(0x8060FE18, &lit_4108); #pragma pop /* 8060FE1C-8060FE20 00003C 0004+00 0/8 0/0 0/0 .rodata @4109 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4109 = -1000000000.0f; -COMPILER_STRIP_GATE(8060FE1C, &lit_4109); +COMPILER_STRIP_GATE(0x8060FE1C, &lit_4109); #pragma pop /* 8060FE20-8060FE24 000040 0004+00 0/2 0/0 0/0 .rodata @4110 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4110 = 3000.0f; -COMPILER_STRIP_GATE(8060FE20, &lit_4110); +COMPILER_STRIP_GATE(0x8060FE20, &lit_4110); #pragma pop /* 80610440-80610444 000008 0004+00 2/2 0/0 0/0 .bss None */ @@ -1165,7 +1165,7 @@ static asm void daB_MGN_Draw(daB_MGN_c* param_0) { /* ############################################################################################## */ /* 8060FE24-8060FE28 000044 0004+00 1/3 0/0 0/0 .rodata @4141 */ SECTION_RODATA static f32 const lit_4141 = 1500.0f; -COMPILER_STRIP_GATE(8060FE24, &lit_4141); +COMPILER_STRIP_GATE(0x8060FE24, &lit_4141); /* 80605CAC-80605D78 00066C 00CC+00 1/1 0/0 0/0 .text s_obj_sub__FPvPv */ #pragma push @@ -1180,7 +1180,7 @@ static asm void s_obj_sub(void* param_0, void* param_1) { /* ############################################################################################## */ /* 8060FE28-8060FE2C 000048 0004+00 1/16 0/0 0/0 .rodata @4206 */ SECTION_RODATA static f32 const lit_4206 = 3.0f; -COMPILER_STRIP_GATE(8060FE28, &lit_4206); +COMPILER_STRIP_GATE(0x8060FE28, &lit_4206); /* 80605D78-8060601C 000738 02A4+00 2/2 0/0 0/0 .text setDashSmokeEffect__9daB_MGN_cFv */ #pragma push @@ -1197,28 +1197,28 @@ asm void daB_MGN_c::setDashSmokeEffect() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4269 = 40.0f; -COMPILER_STRIP_GATE(8060FE2C, &lit_4269); +COMPILER_STRIP_GATE(0x8060FE2C, &lit_4269); #pragma pop /* 8060FE30-8060FE34 000050 0004+00 0/1 0/0 0/0 .rodata @4270 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4270 = 37.0f; -COMPILER_STRIP_GATE(8060FE30, &lit_4270); +COMPILER_STRIP_GATE(0x8060FE30, &lit_4270); #pragma pop /* 8060FE34-8060FE38 000054 0004+00 0/1 0/0 0/0 .rodata @4271 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4271 = 35.0f; -COMPILER_STRIP_GATE(8060FE34, &lit_4271); +COMPILER_STRIP_GATE(0x8060FE34, &lit_4271); #pragma pop /* 8060FE38-8060FE3C 000058 0004+00 0/1 0/0 0/0 .rodata @4272 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4272 = 36.0f; -COMPILER_STRIP_GATE(8060FE38, &lit_4272); +COMPILER_STRIP_GATE(0x8060FE38, &lit_4272); #pragma pop /* 8060601C-806062C0 0009DC 02A4+00 2/2 0/0 0/0 .text setBackJumpEffect__9daB_MGN_cFv */ @@ -1247,14 +1247,14 @@ asm void daB_MGN_c::setSlideSmokeEffect() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4368 = 150.0f; -COMPILER_STRIP_GATE(8060FE3C, &lit_4368); +COMPILER_STRIP_GATE(0x8060FE3C, &lit_4368); #pragma pop /* 8060FE40-8060FE44 000060 0004+00 0/8 0/0 0/0 .rodata @4369 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4369 = 10.0f; -COMPILER_STRIP_GATE(8060FE40, &lit_4369); +COMPILER_STRIP_GATE(0x8060FE40, &lit_4369); #pragma pop /* 80606424-806065D4 000DE4 01B0+00 3/3 0/0 0/0 .text setBodySlideEffect__9daB_MGN_cFv */ @@ -1272,7 +1272,7 @@ asm void daB_MGN_c::setBodySlideEffect() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4414 = 15.0f; -COMPILER_STRIP_GATE(8060FE44, &lit_4414); +COMPILER_STRIP_GATE(0x8060FE44, &lit_4414); #pragma pop /* 806065D4-80606754 000F94 0180+00 1/1 0/0 0/0 .text setOpeningEffect__9daB_MGN_cFv */ @@ -1329,7 +1329,7 @@ asm void daB_MGN_c::setHeadHitEffect() { /* ############################################################################################## */ /* 8060FE48-8060FE4C 000068 0004+00 1/5 0/0 0/0 .rodata @4626 */ SECTION_RODATA static f32 const lit_4626 = 200.0f; -COMPILER_STRIP_GATE(8060FE48, &lit_4626); +COMPILER_STRIP_GATE(0x8060FE48, &lit_4626); /* 80606C6C-80606D60 00162C 00F4+00 2/2 0/0 0/0 .text setHideSmokeEffect__9daB_MGN_cFP4cXyzUc */ #pragma push @@ -1346,14 +1346,20 @@ asm void daB_MGN_c::setHideSmokeEffect(cXyz* param_0, u8 param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4760 = 7.0f; -COMPILER_STRIP_GATE(8060FE4C, &lit_4760); +COMPILER_STRIP_GATE(0x8060FE4C, &lit_4760); #pragma pop /* 8060FE50-8060FE54 000070 0004+00 0/6 0/0 0/0 .rodata @4761 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4761 = 2.0f; -COMPILER_STRIP_GATE(8060FE50, &lit_4761); +COMPILER_STRIP_GATE(0x8060FE50, &lit_4761); +#pragma pop + +/* 80610084-80610084 0002A4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80610084 = "B_mgne"; #pragma pop /* 80606D60-806071C4 001720 0464+00 2/1 0/0 0/0 .text calcHideSmokeEffect__9daB_MGN_cFv @@ -1381,13 +1387,13 @@ asm void daB_MGN_c::drawHideSmokeEffect() { /* ############################################################################################## */ /* 8060FE54-8060FE58 000074 0004+00 1/1 0/0 0/0 .rodata @4762 */ SECTION_RODATA static f32 const lit_4762 = -1.0f; -COMPILER_STRIP_GATE(8060FE54, &lit_4762); +COMPILER_STRIP_GATE(0x8060FE54, &lit_4762); /* 8060FE58-8060FE5C 000078 0004+00 0/2 0/0 0/0 .rodata @4853 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4853 = 3.0f / 10.0f; -COMPILER_STRIP_GATE(8060FE58, &lit_4853); +COMPILER_STRIP_GATE(0x8060FE58, &lit_4853); #pragma pop /* 8060729C-80607498 001C5C 01FC+00 5/5 0/0 0/0 .text setBloodEffect__9daB_MGN_cFv */ @@ -1405,74 +1411,74 @@ asm void daB_MGN_c::setBloodEffect() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4926 = -150.0f; -COMPILER_STRIP_GATE(8060FE5C, &lit_4926); +COMPILER_STRIP_GATE(0x8060FE5C, &lit_4926); #pragma pop /* 8060FE60-8060FE64 000080 0004+00 2/3 0/0 0/0 .rodata @4927 */ SECTION_RODATA static f32 const lit_4927 = 0.5f; -COMPILER_STRIP_GATE(8060FE60, &lit_4927); +COMPILER_STRIP_GATE(0x8060FE60, &lit_4927); /* 8060FE64-8060FE68 000084 0004+00 0/1 0/0 0/0 .rodata @4928 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4928 = 255.0f; -COMPILER_STRIP_GATE(8060FE64, &lit_4928); +COMPILER_STRIP_GATE(0x8060FE64, &lit_4928); #pragma pop /* 8060FE68-8060FE6C 000088 0004+00 0/1 0/0 0/0 .rodata @4929 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4929 = -60.0f; -COMPILER_STRIP_GATE(8060FE68, &lit_4929); +COMPILER_STRIP_GATE(0x8060FE68, &lit_4929); #pragma pop /* 8060FE6C-8060FE70 00008C 0004+00 0/1 0/0 0/0 .rodata @4930 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4930 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(8060FE6C, &lit_4930); +COMPILER_STRIP_GATE(0x8060FE6C, &lit_4930); #pragma pop /* 8060FE70-8060FE74 000090 0004+00 0/1 0/0 0/0 .rodata @4931 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4931 = 3.0f / 5.0f; -COMPILER_STRIP_GATE(8060FE70, &lit_4931); +COMPILER_STRIP_GATE(0x8060FE70, &lit_4931); #pragma pop /* 8060FE74-8060FE78 000094 0004+00 0/2 0/0 0/0 .rodata @4932 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4932 = 11.0f / 10.0f; -COMPILER_STRIP_GATE(8060FE74, &lit_4932); +COMPILER_STRIP_GATE(0x8060FE74, &lit_4932); #pragma pop /* 8060FE78-8060FE7C 000098 0004+00 0/2 0/0 0/0 .rodata @4933 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4933 = 7.0f / 10.0f; -COMPILER_STRIP_GATE(8060FE78, &lit_4933); +COMPILER_STRIP_GATE(0x8060FE78, &lit_4933); #pragma pop /* 8060FE7C-8060FE80 00009C 0004+00 0/1 0/0 0/0 .rodata @4934 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4934 = 101.0f / 100.0f; -COMPILER_STRIP_GATE(8060FE7C, &lit_4934); +COMPILER_STRIP_GATE(0x8060FE7C, &lit_4934); #pragma pop /* 8060FE80-8060FE84 0000A0 0004+00 0/3 0/0 0/0 .rodata @4935 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4935 = 20.0f; -COMPILER_STRIP_GATE(8060FE80, &lit_4935); +COMPILER_STRIP_GATE(0x8060FE80, &lit_4935); #pragma pop /* 8060FE84-8060FE88 0000A4 0004+00 0/1 0/0 0/0 .rodata @4936 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4936 = 17.0f; -COMPILER_STRIP_GATE(8060FE84, &lit_4936); +COMPILER_STRIP_GATE(0x8060FE84, &lit_4936); #pragma pop /* 80607498-8060778C 001E58 02F4+00 1/1 0/0 0/0 .text calcBloodMove__9daB_MGN_cFv */ @@ -1488,7 +1494,7 @@ asm void daB_MGN_c::calcBloodMove() { /* ############################################################################################## */ /* 8060FE88-8060FE8C 0000A8 0004+00 1/1 0/0 0/0 .rodata @4977 */ SECTION_RODATA static f32 const lit_4977 = 1200.0f; -COMPILER_STRIP_GATE(8060FE88, &lit_4977); +COMPILER_STRIP_GATE(0x8060FE88, &lit_4977); /* 8060778C-806078DC 00214C 0150+00 2/2 0/0 0/0 .text checkDownBeforeBG__9daB_MGN_cFv */ #pragma push @@ -1510,6 +1516,13 @@ asm cM3dGPla::~cM3dGPla() { } #pragma pop +/* ############################################################################################## */ +/* 80610084-80610084 0002A4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8061008B = "B_mgn"; +#pragma pop + /* 80607924-806079CC 0022E4 00A8+00 11/11 0/0 0/0 .text setBck__9daB_MGN_cFiUcff */ #pragma push #pragma optimization_level 0 @@ -1543,7 +1556,7 @@ asm void daB_MGN_c::setActionMode(int param_0, int param_1) { /* ############################################################################################## */ /* 8060FE8C-8060FE90 0000AC 0004+00 1/2 0/0 0/0 .rodata @5032 */ SECTION_RODATA static f32 const lit_5032 = 7.0f / 5.0f; -COMPILER_STRIP_GATE(8060FE8C, &lit_5032); +COMPILER_STRIP_GATE(0x8060FE8C, &lit_5032); /* 80607A80-80607B50 002440 00D0+00 2/2 0/0 0/0 .text setExitMode__9daB_MGN_cFi */ #pragma push @@ -1653,70 +1666,70 @@ SECTION_RODATA static u8 const lit_5170[24] = { 0xC2, 0xA0, 0x00, 0x00, 0xC2, 0x48, 0x00, 0x00, 0xC2, 0x48, 0x00, 0x00, 0xC2, 0x48, 0x00, 0x00, 0xC2, 0x48, 0x00, 0x00, 0xC2, 0x48, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8060FE90, &lit_5170); +COMPILER_STRIP_GATE(0x8060FE90, &lit_5170); #pragma pop /* 8060FEA8-8060FEAC 0000C8 0004+00 0/1 0/0 0/0 .rodata @5331 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5331 = 280.0f; -COMPILER_STRIP_GATE(8060FEA8, &lit_5331); +COMPILER_STRIP_GATE(0x8060FEA8, &lit_5331); #pragma pop /* 8060FEAC-8060FEB0 0000CC 0004+00 0/4 0/0 0/0 .rodata @5332 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5332 = -200.0f; -COMPILER_STRIP_GATE(8060FEAC, &lit_5332); +COMPILER_STRIP_GATE(0x8060FEAC, &lit_5332); #pragma pop /* 8060FEB0-8060FEB4 0000D0 0004+00 0/1 0/0 0/0 .rodata @5333 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5333 = -130.0f; -COMPILER_STRIP_GATE(8060FEB0, &lit_5333); +COMPILER_STRIP_GATE(0x8060FEB0, &lit_5333); #pragma pop /* 8060FEB4-8060FEB8 0000D4 0004+00 0/1 0/0 0/0 .rodata @5334 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5334 = -10.0f; -COMPILER_STRIP_GATE(8060FEB4, &lit_5334); +COMPILER_STRIP_GATE(0x8060FEB4, &lit_5334); #pragma pop /* 8060FEB8-8060FEBC 0000D8 0004+00 0/2 0/0 0/0 .rodata @5335 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5335 = 180.0f; -COMPILER_STRIP_GATE(8060FEB8, &lit_5335); +COMPILER_STRIP_GATE(0x8060FEB8, &lit_5335); #pragma pop /* 8060FEBC-8060FEC0 0000DC 0004+00 0/1 0/0 0/0 .rodata @5336 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5336 = -170.0f; -COMPILER_STRIP_GATE(8060FEBC, &lit_5336); +COMPILER_STRIP_GATE(0x8060FEBC, &lit_5336); #pragma pop /* 8060FEC0-8060FEC4 0000E0 0004+00 0/1 0/0 0/0 .rodata @5337 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5337 = -120.0f; -COMPILER_STRIP_GATE(8060FEC0, &lit_5337); +COMPILER_STRIP_GATE(0x8060FEC0, &lit_5337); #pragma pop /* 8060FEC4-8060FEC8 0000E4 0004+00 0/1 0/0 0/0 .rodata @5338 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5338 = -160.0f; -COMPILER_STRIP_GATE(8060FEC4, &lit_5338); +COMPILER_STRIP_GATE(0x8060FEC4, &lit_5338); #pragma pop /* 8060FEC8-8060FECC 0000E8 0004+00 0/5 0/0 0/0 .rodata @5339 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5339 = 1000.0f; -COMPILER_STRIP_GATE(8060FEC8, &lit_5339); +COMPILER_STRIP_GATE(0x8060FEC8, &lit_5339); #pragma pop /* 80607D7C-8060819C 00273C 0420+00 1/1 0/0 0/0 .text getNearHitPos__9daB_MGN_cFP4cXyz */ @@ -1754,21 +1767,21 @@ asm void daB_MGN_c::calcJointAngle(s16 param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5697 = -600.0f; -COMPILER_STRIP_GATE(8060FECC, &lit_5697); +COMPILER_STRIP_GATE(0x8060FECC, &lit_5697); #pragma pop /* 8060FED0-8060FED4 0000F0 0004+00 0/2 0/0 0/0 .rodata @5698 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5698 = 2000.0f; -COMPILER_STRIP_GATE(8060FED0, &lit_5698); +COMPILER_STRIP_GATE(0x8060FED0, &lit_5698); #pragma pop /* 8060FED4-8060FED8 0000F4 0004+00 0/2 0/0 0/0 .rodata @5699 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5699 = 1.0f / 20.0f; -COMPILER_STRIP_GATE(8060FED4, &lit_5699); +COMPILER_STRIP_GATE(0x8060FED4, &lit_5699); #pragma pop /* 806087A8-80608EF8 003168 0750+00 2/1 0/0 0/0 .text executeCircle__9daB_MGN_cFv */ @@ -1786,70 +1799,70 @@ asm void daB_MGN_c::executeCircle() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5700 = 1.5f; -COMPILER_STRIP_GATE(8060FED8, &lit_5700); +COMPILER_STRIP_GATE(0x8060FED8, &lit_5700); #pragma pop /* 8060FEDC-8060FEE0 0000FC 0004+00 0/3 0/0 0/0 .rodata @5701 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5701 = 30.0f; -COMPILER_STRIP_GATE(8060FEDC, &lit_5701); +COMPILER_STRIP_GATE(0x8060FEDC, &lit_5701); #pragma pop /* 8060FEE0-8060FEE4 000100 0004+00 0/1 0/0 0/0 .rodata @6075 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6075 = -800.0f; -COMPILER_STRIP_GATE(8060FEE0, &lit_6075); +COMPILER_STRIP_GATE(0x8060FEE0, &lit_6075); #pragma pop /* 8060FEE4-8060FEE8 000104 0004+00 0/1 0/0 0/0 .rodata @6076 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6076 = 4096.0f; -COMPILER_STRIP_GATE(8060FEE4, &lit_6076); +COMPILER_STRIP_GATE(0x8060FEE4, &lit_6076); #pragma pop /* 8060FEE8-8060FEEC 000108 0004+00 0/1 0/0 0/0 .rodata @6077 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6077 = 6.0f; -COMPILER_STRIP_GATE(8060FEE8, &lit_6077); +COMPILER_STRIP_GATE(0x8060FEE8, &lit_6077); #pragma pop /* 8060FEEC-8060FEF0 00010C 0004+00 0/1 0/0 0/0 .rodata @6078 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6078 = 4.0f; -COMPILER_STRIP_GATE(8060FEEC, &lit_6078); +COMPILER_STRIP_GATE(0x8060FEEC, &lit_6078); #pragma pop /* 8060FEF0-8060FEF4 000110 0004+00 0/1 0/0 0/0 .rodata @6079 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6079 = 2500.0f; -COMPILER_STRIP_GATE(8060FEF0, &lit_6079); +COMPILER_STRIP_GATE(0x8060FEF0, &lit_6079); #pragma pop /* 8060FEF4-8060FEF8 000114 0004+00 0/0 0/0 0/0 .rodata @6080 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6080 = -5.0f; -COMPILER_STRIP_GATE(8060FEF4, &lit_6080); +COMPILER_STRIP_GATE(0x8060FEF4, &lit_6080); #pragma pop /* 8060FEF8-8060FEFC 000118 0004+00 0/0 0/0 0/0 .rodata @6081 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6081 = 1600.0f; -COMPILER_STRIP_GATE(8060FEF8, &lit_6081); +COMPILER_STRIP_GATE(0x8060FEF8, &lit_6081); #pragma pop /* 8060FEFC-8060FF00 00011C 0004+00 0/2 0/0 0/0 .rodata @6082 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6082 = 300.0f; -COMPILER_STRIP_GATE(8060FEFC, &lit_6082); +COMPILER_STRIP_GATE(0x8060FEFC, &lit_6082); #pragma pop /* 8060FF00-8060FF08 000120 0008+00 0/1 0/0 0/0 .rodata @6085 */ @@ -1858,7 +1871,7 @@ COMPILER_STRIP_GATE(8060FEFC, &lit_6082); SECTION_RODATA static u8 const lit_6085[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8060FF00, &lit_6085); +COMPILER_STRIP_GATE(0x8060FF00, &lit_6085); #pragma pop /* 80608EF8-80609D70 0038B8 0E78+00 2/1 0/0 0/0 .text executeDash__9daB_MGN_cFv */ @@ -1876,7 +1889,7 @@ asm void daB_MGN_c::executeDash() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6258 = 787.0f; -COMPILER_STRIP_GATE(8060FF08, &lit_6258); +COMPILER_STRIP_GATE(0x8060FF08, &lit_6258); #pragma pop /* 80609D70-8060A670 004730 0900+00 2/1 0/0 0/0 .text executeThrown__9daB_MGN_cFv */ @@ -1904,35 +1917,35 @@ asm void daB_MGN_c::setDownEnd() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6259 = 5.0f; -COMPILER_STRIP_GATE(8060FF0C, &lit_6259); +COMPILER_STRIP_GATE(0x8060FF0C, &lit_6259); #pragma pop /* 8060FF10-8060FF14 000130 0004+00 0/0 0/0 0/0 .rodata @6260 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6260 = 16.0f; -COMPILER_STRIP_GATE(8060FF10, &lit_6260); +COMPILER_STRIP_GATE(0x8060FF10, &lit_6260); #pragma pop /* 8060FF14-8060FF18 000134 0004+00 0/1 0/0 0/0 .rodata @6261 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6261 = 26.0f; -COMPILER_STRIP_GATE(8060FF14, &lit_6261); +COMPILER_STRIP_GATE(0x8060FF14, &lit_6261); #pragma pop /* 8060FF18-8060FF1C 000138 0004+00 0/1 0/0 0/0 .rodata @6420 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6420 = 13.0f; -COMPILER_STRIP_GATE(8060FF18, &lit_6420); +COMPILER_STRIP_GATE(0x8060FF18, &lit_6420); #pragma pop /* 8060FF1C-8060FF20 00013C 0004+00 0/1 0/0 0/0 .rodata @6421 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6421 = 19.0f; -COMPILER_STRIP_GATE(8060FF1C, &lit_6421); +COMPILER_STRIP_GATE(0x8060FF1C, &lit_6421); #pragma pop /* 8060A72C-8060ACB8 0050EC 058C+00 2/1 0/0 0/0 .text executeDown__9daB_MGN_cFv */ @@ -1950,14 +1963,14 @@ asm void daB_MGN_c::executeDown() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6422 = 42.0f; -COMPILER_STRIP_GATE(8060FF20, &lit_6422); +COMPILER_STRIP_GATE(0x8060FF20, &lit_6422); #pragma pop /* 8060FF24-8060FF28 000144 0004+00 0/1 0/0 0/0 .rodata @6502 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6502 = 46.0f; -COMPILER_STRIP_GATE(8060FF24, &lit_6502); +COMPILER_STRIP_GATE(0x8060FF24, &lit_6502); #pragma pop /* 8060ACB8-8060B028 005678 0370+00 1/1 0/0 0/0 .text executeDownDamage__9daB_MGN_cFv */ @@ -1996,42 +2009,42 @@ asm void daB_MGN_c::executeWarp() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6830 = 60.0f; -COMPILER_STRIP_GATE(8060FF28, &lit_6830); +COMPILER_STRIP_GATE(0x8060FF28, &lit_6830); #pragma pop /* 8060FF2C-8060FF30 00014C 0004+00 0/1 0/0 0/0 .rodata @6831 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6831 = -3000.0f; -COMPILER_STRIP_GATE(8060FF2C, &lit_6831); +COMPILER_STRIP_GATE(0x8060FF2C, &lit_6831); #pragma pop /* 8060FF30-8060FF34 000150 0004+00 0/1 0/0 0/0 .rodata @6832 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6832 = 2100.0f; -COMPILER_STRIP_GATE(8060FF30, &lit_6832); +COMPILER_STRIP_GATE(0x8060FF30, &lit_6832); #pragma pop /* 8060FF34-8060FF38 000154 0004+00 0/1 0/0 0/0 .rodata @6833 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6833 = -3300.0f; -COMPILER_STRIP_GATE(8060FF34, &lit_6833); +COMPILER_STRIP_GATE(0x8060FF34, &lit_6833); #pragma pop /* 8060FF38-8060FF3C 000158 0004+00 0/1 0/0 0/0 .rodata @6834 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6834 = 1.0f / 50.0f; -COMPILER_STRIP_GATE(8060FF38, &lit_6834); +COMPILER_STRIP_GATE(0x8060FF38, &lit_6834); #pragma pop /* 8060FF3C-8060FF40 00015C 0004+00 0/1 0/0 0/0 .rodata @6835 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6835 = -3.0f; -COMPILER_STRIP_GATE(8060FF3C, &lit_6835); +COMPILER_STRIP_GATE(0x8060FF3C, &lit_6835); #pragma pop /* 8060B544-8060BE6C 005F04 0928+00 2/1 0/0 0/0 .text executeFall__9daB_MGN_cFv */ @@ -2049,56 +2062,56 @@ asm void daB_MGN_c::executeFall() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6836 = 12.0f; -COMPILER_STRIP_GATE(8060FF40, &lit_6836); +COMPILER_STRIP_GATE(0x8060FF40, &lit_6836); #pragma pop /* 8060FF44-8060FF48 000164 0004+00 0/0 0/0 0/0 .rodata @6837 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6837 = 43.0f; -COMPILER_STRIP_GATE(8060FF44, &lit_6837); +COMPILER_STRIP_GATE(0x8060FF44, &lit_6837); #pragma pop /* 8060FF48-8060FF4C 000168 0004+00 0/0 0/0 0/0 .rodata @6838 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6838 = 34.0f; -COMPILER_STRIP_GATE(8060FF48, &lit_6838); +COMPILER_STRIP_GATE(0x8060FF48, &lit_6838); #pragma pop /* 8060FF4C-8060FF50 00016C 0004+00 0/1 0/0 0/0 .rodata @6881 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6881 = 90.0f; -COMPILER_STRIP_GATE(8060FF4C, &lit_6881); +COMPILER_STRIP_GATE(0x8060FF4C, &lit_6881); #pragma pop /* 8060FF50-8060FF54 000170 0004+00 0/1 0/0 0/0 .rodata @6882 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6882 = -180.0f; -COMPILER_STRIP_GATE(8060FF50, &lit_6882); +COMPILER_STRIP_GATE(0x8060FF50, &lit_6882); #pragma pop /* 8060FF54-8060FF58 000174 0004+00 0/1 0/0 0/0 .rodata @6883 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6883 = -2090.0f; -COMPILER_STRIP_GATE(8060FF54, &lit_6883); +COMPILER_STRIP_GATE(0x8060FF54, &lit_6883); #pragma pop /* 8060FF58-8060FF5C 000178 0004+00 0/2 0/0 0/0 .rodata @6884 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6884 = -300.0f; -COMPILER_STRIP_GATE(8060FF58, &lit_6884); +COMPILER_STRIP_GATE(0x8060FF58, &lit_6884); #pragma pop /* 8060FF5C-8060FF60 00017C 0004+00 0/1 0/0 0/0 .rodata @6885 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6885 = -3090.0f; -COMPILER_STRIP_GATE(8060FF5C, &lit_6885); +COMPILER_STRIP_GATE(0x8060FF5C, &lit_6885); #pragma pop /* 8060BE6C-8060C034 00682C 01C8+00 1/1 0/0 0/0 .text demo_skip__9daB_MGN_cFi */ @@ -2126,70 +2139,70 @@ asm void daB_MGN_c::DemoSkipCallBack(void* param_0, int param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7349 = -7.0f; -COMPILER_STRIP_GATE(8060FF60, &lit_7349); +COMPILER_STRIP_GATE(0x8060FF60, &lit_7349); #pragma pop /* 8060FF64-8060FF68 000184 0004+00 0/1 0/0 0/0 .rodata @7350 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7350 = -1045.0f; -COMPILER_STRIP_GATE(8060FF64, &lit_7350); +COMPILER_STRIP_GATE(0x8060FF64, &lit_7350); #pragma pop /* 8060FF68-8060FF6C 000188 0004+00 0/1 0/0 0/0 .rodata @7351 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7351 = -2190.0f; -COMPILER_STRIP_GATE(8060FF68, &lit_7351); +COMPILER_STRIP_GATE(0x8060FF68, &lit_7351); #pragma pop /* 8060FF6C-8060FF70 00018C 0004+00 0/1 0/0 0/0 .rodata @7352 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7352 = 220.0f; -COMPILER_STRIP_GATE(8060FF6C, &lit_7352); +COMPILER_STRIP_GATE(0x8060FF6C, &lit_7352); #pragma pop /* 8060FF70-8060FF74 000190 0004+00 0/1 0/0 0/0 .rodata @7353 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7353 = -1390.0f; -COMPILER_STRIP_GATE(8060FF70, &lit_7353); +COMPILER_STRIP_GATE(0x8060FF70, &lit_7353); #pragma pop /* 8060FF74-8060FF78 000194 0004+00 0/1 0/0 0/0 .rodata @7354 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7354 = -1312.0f; -COMPILER_STRIP_GATE(8060FF74, &lit_7354); +COMPILER_STRIP_GATE(0x8060FF74, &lit_7354); #pragma pop /* 8060FF78-8060FF7C 000198 0004+00 0/1 0/0 0/0 .rodata @7355 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7355 = 227.0f; -COMPILER_STRIP_GATE(8060FF78, &lit_7355); +COMPILER_STRIP_GATE(0x8060FF78, &lit_7355); #pragma pop /* 8060FF7C-8060FF80 00019C 0004+00 0/1 0/0 0/0 .rodata @7356 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7356 = -114.0f; -COMPILER_STRIP_GATE(8060FF7C, &lit_7356); +COMPILER_STRIP_GATE(0x8060FF7C, &lit_7356); #pragma pop /* 8060FF80-8060FF84 0001A0 0004+00 0/1 0/0 0/0 .rodata @7357 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7357 = 2690.0f; -COMPILER_STRIP_GATE(8060FF80, &lit_7357); +COMPILER_STRIP_GATE(0x8060FF80, &lit_7357); #pragma pop /* 8060FF84-8060FF88 0001A4 0004+00 0/1 0/0 0/0 .rodata @7358 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7358 = 170.0f; -COMPILER_STRIP_GATE(8060FF84, &lit_7358); +COMPILER_STRIP_GATE(0x8060FF84, &lit_7358); #pragma pop /* 8060C068-8060D078 006A28 1010+00 2/1 0/0 0/0 .text executeOpening__9daB_MGN_cFv */ @@ -2207,189 +2220,189 @@ asm void daB_MGN_c::executeOpening() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7359 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(8060FF88, &lit_7359); +COMPILER_STRIP_GATE(0x8060FF88, &lit_7359); #pragma pop /* 8060FF8C-8060FF90 0001AC 0004+00 0/0 0/0 0/0 .rodata @7360 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7360 = 1100.0f; -COMPILER_STRIP_GATE(8060FF8C, &lit_7360); +COMPILER_STRIP_GATE(0x8060FF8C, &lit_7360); #pragma pop /* 8060FF90-8060FF94 0001B0 0004+00 0/0 0/0 0/0 .rodata @7361 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7361 = 175.0f; -COMPILER_STRIP_GATE(8060FF90, &lit_7361); +COMPILER_STRIP_GATE(0x8060FF90, &lit_7361); #pragma pop /* 8060FF94-8060FF98 0001B4 0004+00 0/0 0/0 0/0 .rodata @7362 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7362 = 275.0f; -COMPILER_STRIP_GATE(8060FF94, &lit_7362); +COMPILER_STRIP_GATE(0x8060FF94, &lit_7362); #pragma pop /* 8060FF98-8060FF9C 0001B8 0004+00 0/0 0/0 0/0 .rodata @7363 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7363 = 8.0f; -COMPILER_STRIP_GATE(8060FF98, &lit_7363); +COMPILER_STRIP_GATE(0x8060FF98, &lit_7363); #pragma pop /* 8060FF9C-8060FFA0 0001BC 0004+00 0/0 0/0 0/0 .rodata @7364 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7364 = 4.0f / 5.0f; -COMPILER_STRIP_GATE(8060FF9C, &lit_7364); +COMPILER_STRIP_GATE(0x8060FF9C, &lit_7364); #pragma pop /* 8060FFA0-8060FFA4 0001C0 0004+00 0/0 0/0 0/0 .rodata @7365 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7365 = 305.0f; -COMPILER_STRIP_GATE(8060FFA0, &lit_7365); +COMPILER_STRIP_GATE(0x8060FFA0, &lit_7365); #pragma pop /* 8060FFA4-8060FFA8 0001C4 0004+00 0/0 0/0 0/0 .rodata @7366 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7366 = 290.0f; -COMPILER_STRIP_GATE(8060FFA4, &lit_7366); +COMPILER_STRIP_GATE(0x8060FFA4, &lit_7366); #pragma pop /* 8060FFA8-8060FFAC 0001C8 0004+00 0/0 0/0 0/0 .rodata @7367 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7367 = 365.0f; -COMPILER_STRIP_GATE(8060FFA8, &lit_7367); +COMPILER_STRIP_GATE(0x8060FFA8, &lit_7367); #pragma pop /* 8060FFAC-8060FFB0 0001CC 0004+00 0/0 0/0 0/0 .rodata @7368 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7368 = 360.0f; -COMPILER_STRIP_GATE(8060FFAC, &lit_7368); +COMPILER_STRIP_GATE(0x8060FFAC, &lit_7368); #pragma pop /* 8060FFB0-8060FFB4 0001D0 0004+00 0/0 0/0 0/0 .rodata @7369 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7369 = 420.0f; -COMPILER_STRIP_GATE(8060FFB0, &lit_7369); +COMPILER_STRIP_GATE(0x8060FFB0, &lit_7369); #pragma pop /* 8060FFB4-8060FFB8 0001D4 0004+00 0/0 0/0 0/0 .rodata @7370 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7370 = 450.0f; -COMPILER_STRIP_GATE(8060FFB4, &lit_7370); +COMPILER_STRIP_GATE(0x8060FFB4, &lit_7370); #pragma pop /* 8060FFB8-8060FFBC 0001D8 0004+00 0/0 0/0 0/0 .rodata @7371 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7371 = -250.0f; -COMPILER_STRIP_GATE(8060FFB8, &lit_7371); +COMPILER_STRIP_GATE(0x8060FFB8, &lit_7371); #pragma pop /* 8060FFBC-8060FFC0 0001DC 0004+00 0/0 0/0 0/0 .rodata @7372 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7372 = -2540.0f; -COMPILER_STRIP_GATE(8060FFBC, &lit_7372); +COMPILER_STRIP_GATE(0x8060FFBC, &lit_7372); #pragma pop /* 8060FFC0-8060FFC4 0001E0 0004+00 0/0 0/0 0/0 .rodata @7373 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7373 = 25.0f; -COMPILER_STRIP_GATE(8060FFC0, &lit_7373); +COMPILER_STRIP_GATE(0x8060FFC0, &lit_7373); #pragma pop /* 8060FFC4-8060FFC8 0001E4 0004+00 0/0 0/0 0/0 .rodata @7374 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7374 = -2590.0f; -COMPILER_STRIP_GATE(8060FFC4, &lit_7374); +COMPILER_STRIP_GATE(0x8060FFC4, &lit_7374); #pragma pop /* 8060FFC8-8060FFCC 0001E8 0004+00 0/0 0/0 0/0 .rodata @7375 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7375 = -2690.0f; -COMPILER_STRIP_GATE(8060FFC8, &lit_7375); +COMPILER_STRIP_GATE(0x8060FFC8, &lit_7375); #pragma pop /* 8060FFCC-8060FFD0 0001EC 0004+00 0/1 0/0 0/0 .rodata @7614 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7614 = -2500.0f; -COMPILER_STRIP_GATE(8060FFCC, &lit_7614); +COMPILER_STRIP_GATE(0x8060FFCC, &lit_7614); #pragma pop /* 8060FFD0-8060FFD4 0001F0 0004+00 0/1 0/0 0/0 .rodata @7615 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7615 = -500.0f; -COMPILER_STRIP_GATE(8060FFD0, &lit_7615); +COMPILER_STRIP_GATE(0x8060FFD0, &lit_7615); #pragma pop /* 8060FFD4-8060FFD8 0001F4 0004+00 0/1 0/0 0/0 .rodata @7616 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7616 = 68.0f; -COMPILER_STRIP_GATE(8060FFD4, &lit_7616); +COMPILER_STRIP_GATE(0x8060FFD4, &lit_7616); #pragma pop /* 8060FFD8-8060FFDC 0001F8 0004+00 0/1 0/0 0/0 .rodata @7617 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7617 = 230.0f; -COMPILER_STRIP_GATE(8060FFD8, &lit_7617); +COMPILER_STRIP_GATE(0x8060FFD8, &lit_7617); #pragma pop /* 8060FFDC-8060FFE0 0001FC 0004+00 0/1 0/0 0/0 .rodata @7618 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7618 = 500.0f; -COMPILER_STRIP_GATE(8060FFDC, &lit_7618); +COMPILER_STRIP_GATE(0x8060FFDC, &lit_7618); #pragma pop /* 8060FFE0-8060FFE4 000200 0004+00 0/1 0/0 0/0 .rodata @7619 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7619 = 303.0f; -COMPILER_STRIP_GATE(8060FFE0, &lit_7619); +COMPILER_STRIP_GATE(0x8060FFE0, &lit_7619); #pragma pop /* 8060FFE4-8060FFE8 000204 0004+00 0/1 0/0 0/0 .rodata @7620 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7620 = 333.0f; -COMPILER_STRIP_GATE(8060FFE4, &lit_7620); +COMPILER_STRIP_GATE(0x8060FFE4, &lit_7620); #pragma pop /* 8060FFE8-8060FFEC 000208 0004+00 0/1 0/0 0/0 .rodata @7621 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7621 = 350.0f; -COMPILER_STRIP_GATE(8060FFE8, &lit_7621); +COMPILER_STRIP_GATE(0x8060FFE8, &lit_7621); #pragma pop /* 8060FFEC-8060FFF0 00020C 0004+00 0/1 0/0 0/0 .rodata @7622 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7622 = 320.0f; -COMPILER_STRIP_GATE(8060FFEC, &lit_7622); +COMPILER_STRIP_GATE(0x8060FFEC, &lit_7622); #pragma pop /* 8060FFF0-8060FFF4 000210 0004+00 0/1 0/0 0/0 .rodata @7623 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7623 = 1280.0f; -COMPILER_STRIP_GATE(8060FFF0, &lit_7623); +COMPILER_STRIP_GATE(0x8060FFF0, &lit_7623); #pragma pop /* 8060D078-8060D880 007A38 0808+00 1/1 0/0 0/0 .text executeDeath__9daB_MGN_cFv */ @@ -2407,7 +2420,7 @@ asm void daB_MGN_c::executeDeath() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7686 = 80.0f; -COMPILER_STRIP_GATE(8060FFF4, &lit_7686); +COMPILER_STRIP_GATE(0x8060FFF4, &lit_7686); #pragma pop /* 8060D880-8060DAC0 008240 0240+00 1/1 0/0 0/0 .text executeJump__9daB_MGN_cFv */ @@ -2455,7 +2468,7 @@ asm void daB_MGN_c::mtx_set() { #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_7853 = 0x3BA3D70A; -COMPILER_STRIP_GATE(8060FFF8, &lit_7853); +COMPILER_STRIP_GATE(0x8060FFF8, &lit_7853); #pragma pop /* 8060FFFC-80610038 00021C 003C+00 0/1 0/0 0/0 .rodata cc_set_radius$7874 */ @@ -2467,7 +2480,7 @@ SECTION_RODATA static u8 const cc_set_radius[60] = { 0x00, 0x00, 0x42, 0x8C, 0x00, 0x00, 0x42, 0x8C, 0x00, 0x00, 0x42, 0x8C, 0x00, 0x00, 0x42, 0x8C, 0x00, 0x00, 0x42, 0x70, 0x00, 0x00, 0x42, 0x48, 0x00, 0x00, 0x43, 0x16, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8060FFFC, &cc_set_radius); +COMPILER_STRIP_GATE(0x8060FFFC, &cc_set_radius); #pragma pop /* 80610038-80610074 000258 003C+00 0/1 0/0 0/0 .rodata cc_set_jnt$7875 */ @@ -2479,21 +2492,21 @@ SECTION_RODATA static u8 const cc_set_jnt[60] = { 0x00, 0x43, 0x00, 0x00, 0x00, 0x45, 0x00, 0x00, 0x00, 0x47, 0x00, 0x00, 0x00, 0x49, 0x00, 0x00, 0x00, 0x4A, 0x00, 0x00, 0x00, 0x4B, 0x00, 0x00, 0x00, 0x4B, 0x00, 0x00, 0x00, 0x1B, }; -COMPILER_STRIP_GATE(80610038, &cc_set_jnt); +COMPILER_STRIP_GATE(0x80610038, &cc_set_jnt); #pragma pop /* 80610074-80610078 000294 0004+00 0/1 0/0 0/0 .rodata @8057 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8057 = 400.0f; -COMPILER_STRIP_GATE(80610074, &lit_8057); +COMPILER_STRIP_GATE(0x80610074, &lit_8057); #pragma pop /* 80610078-8061007C 000298 0004+00 0/1 0/0 0/0 .rodata @8058 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8058 = -100.0f; -COMPILER_STRIP_GATE(80610078, &lit_8058); +COMPILER_STRIP_GATE(0x80610078, &lit_8058); #pragma pop /* 8060E1D0-8060E820 008B90 0650+00 1/1 0/0 0/0 .text cc_set__9daB_MGN_cFv */ @@ -2586,14 +2599,14 @@ static asm void useHeapInit(fopAc_ac_c* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8446 = -1000.0f; -COMPILER_STRIP_GATE(8061007C, &lit_8446); +COMPILER_STRIP_GATE(0x8061007C, &lit_8446); #pragma pop /* 80610080-80610084 0002A0 0004+00 0/1 0/0 0/0 .rodata @8447 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8447 = 600.0f; -COMPILER_STRIP_GATE(80610080, &lit_8447); +COMPILER_STRIP_GATE(0x80610080, &lit_8447); #pragma pop /* 8060F0D0-8060F548 009A90 0478+00 1/1 0/0 0/0 .text create__9daB_MGN_cFv */ @@ -2723,7 +2736,7 @@ asm void __sinit_d_a_b_mgn_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_8060F918 = (void*)__sinit_d_a_b_mgn_cpp; +REGISTER_CTORS(0x8060F918, __sinit_d_a_b_mgn_cpp); #pragma pop /* 8060F954-8060F95C 00A314 0008+00 1/0 0/0 0/0 .text @36@__dt__12dBgS_ObjAcchFv */ @@ -2778,10 +2791,4 @@ asm void daPy_py_c::checkNowWolf() { } #pragma pop -/* 80610084-80610091 0002A4 000D+00 14/14 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80610084 = "B_mgne"; -SECTION_DEAD static char const* const stringBase_8061008B = "B_mgn"; -#pragma pop +/* 80610084-80610084 0002A4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/b/d_a_b_ob/d_a_b_ob.cpp b/rel/d/a/b/d_a_b_ob/d_a_b_ob.cpp index 82e01946ab9..9c99d063704 100644 --- a/rel/d/a/b/d_a_b_ob/d_a_b_ob.cpp +++ b/rel/d/a/b/d_a_b_ob/d_a_b_ob.cpp @@ -86,18 +86,18 @@ struct mDoExt_baseAnm { /* 8000D428 */ void play(); }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; +struct J3DAnmTransform {}; + +struct J3DModelData {}; + struct Z2Creature { /* 802C06F4 */ void stopAnime(); }; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -162,8 +162,6 @@ struct dRes_control_c { struct dPa_levelEcallBack {}; -struct _GXColor {}; - struct csXyz { /* 8061AAB8 */ csXyz(csXyz const&); /* 8061A650 */ csXyz(); @@ -172,6 +170,8 @@ struct csXyz { /* 8061A990 */ void operator=(csXyz const&); }; +struct _GXColor {}; + struct dPa_control_c { struct level_c { /* 8004B918 */ void getEmitter(u32); @@ -648,20 +648,20 @@ extern "C" void __register_global_object(); /* ############################################################################################## */ /* 8061AD84-8061AD88 000000 0004+00 23/23 0/0 0/0 .rodata @3772 */ SECTION_RODATA static f32 const lit_3772 = 1.0f; -COMPILER_STRIP_GATE(8061AD84, &lit_3772); +COMPILER_STRIP_GATE(0x8061AD84, &lit_3772); /* 8061AD88-8061AD8C 000004 0004+00 0/2 0/0 0/0 .rodata @3773 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3773 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(8061AD88, &lit_3773); +COMPILER_STRIP_GATE(0x8061AD88, &lit_3773); #pragma pop /* 8061AD8C-8061AD90 000008 0004+00 0/5 0/0 0/0 .rodata @3774 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3774 = 3.0f; -COMPILER_STRIP_GATE(8061AD8C, &lit_3774); +COMPILER_STRIP_GATE(0x8061AD8C, &lit_3774); #pragma pop /* 8061B0A4-8061B0B0 000000 000C+00 2/2 0/0 0/0 .data cNullVec__6Z2Calc */ @@ -1009,7 +1009,7 @@ SECTION_RODATA static u8 const lit_3788[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(8061AD90, &lit_3788); +COMPILER_STRIP_GATE(0x8061AD90, &lit_3788); /* 8061AD94-8061AD9C 000010 0004+04 2/5 0/0 0/0 .rodata @3789 */ SECTION_RODATA static f32 const lit_3789[1 + 1 /* padding */] = { @@ -1017,7 +1017,13 @@ SECTION_RODATA static f32 const lit_3789[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(8061AD94, &lit_3789); +COMPILER_STRIP_GATE(0x8061AD94, &lit_3789); + +/* 8061B09C-8061B09C 000318 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8061B09C = "B_oh"; +#pragma pop /* 806105BC-8061066C 00013C 00B0+00 8/8 0/0 0/0 .text anm_init__FP10b_ob_classifUcf */ #pragma push @@ -1198,7 +1204,7 @@ static asm void FinCCallBack(J3DJoint* param_0, int param_1) { SECTION_RODATA static u8 const lit_4017[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8061AD9C, &lit_4017); +COMPILER_STRIP_GATE(0x8061AD9C, &lit_4017); /* 80610D24-80610E2C 0008A4 0108+00 1/1 0/0 0/0 .text sui_nodeCallBack__FP8J3DJointi */ #pragma push @@ -1227,7 +1233,7 @@ static asm void dark(J3DModelData* param_0, s16 param_1) { SECTION_RODATA static u8 const lit_4266[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8061ADA4, &lit_4266); +COMPILER_STRIP_GATE(0x8061ADA4, &lit_4266); #pragma pop /* 8061ADAC-8061ADB4 000028 0008+00 0/7 0/0 0/0 .rodata @4267 */ @@ -1236,7 +1242,7 @@ COMPILER_STRIP_GATE(8061ADA4, &lit_4266); SECTION_RODATA static u8 const lit_4267[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8061ADAC, &lit_4267); +COMPILER_STRIP_GATE(0x8061ADAC, &lit_4267); #pragma pop /* 8061ADB4-8061ADBC 000030 0008+00 0/7 0/0 0/0 .rodata @4268 */ @@ -1245,28 +1251,28 @@ COMPILER_STRIP_GATE(8061ADAC, &lit_4267); SECTION_RODATA static u8 const lit_4268[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8061ADB4, &lit_4268); +COMPILER_STRIP_GATE(0x8061ADB4, &lit_4268); #pragma pop /* 8061ADBC-8061ADC0 000038 0004+00 0/3 0/0 0/0 .rodata @4269 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4269 = 500.0f; -COMPILER_STRIP_GATE(8061ADBC, &lit_4269); +COMPILER_STRIP_GATE(0x8061ADBC, &lit_4269); #pragma pop /* 8061ADC0-8061ADC4 00003C 0004+00 0/6 0/0 0/0 .rodata @4270 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4270 = 100.0f; -COMPILER_STRIP_GATE(8061ADC0, &lit_4270); +COMPILER_STRIP_GATE(0x8061ADC0, &lit_4270); #pragma pop /* 8061ADC4-8061ADC8 000040 0004+00 0/2 0/0 0/0 .rodata @4271 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4271 = 1300.0f; -COMPILER_STRIP_GATE(8061ADC4, &lit_4271); +COMPILER_STRIP_GATE(0x8061ADC4, &lit_4271); #pragma pop /* 80610EE4-80611408 000A64 0524+00 1/0 0/0 0/0 .text daB_OB_Draw__FP10b_ob_class */ @@ -1294,35 +1300,35 @@ asm cXyz::~cXyz() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4372 = 200.0f; -COMPILER_STRIP_GATE(8061ADC8, &lit_4372); +COMPILER_STRIP_GATE(0x8061ADC8, &lit_4372); #pragma pop /* 8061ADCC-8061ADD0 000048 0004+00 0/1 0/0 0/0 .rodata @4373 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4373 = 1600.0f; -COMPILER_STRIP_GATE(8061ADCC, &lit_4373); +COMPILER_STRIP_GATE(0x8061ADCC, &lit_4373); #pragma pop /* 8061ADD0-8061ADD4 00004C 0004+00 0/3 0/0 0/0 .rodata @4374 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4374 = 2.0f; -COMPILER_STRIP_GATE(8061ADD0, &lit_4374); +COMPILER_STRIP_GATE(0x8061ADD0, &lit_4374); #pragma pop /* 8061ADD4-8061ADD8 000050 0004+00 0/7 0/0 0/0 .rodata @4375 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4375 = 0.5f; -COMPILER_STRIP_GATE(8061ADD4, &lit_4375); +COMPILER_STRIP_GATE(0x8061ADD4, &lit_4375); #pragma pop /* 8061ADD8-8061ADDC 000054 0004+00 0/2 0/0 0/0 .rodata @4376 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4376 = 1.5f; -COMPILER_STRIP_GATE(8061ADD8, &lit_4376); +COMPILER_STRIP_GATE(0x8061ADD8, &lit_4376); #pragma pop /* 80611444-80611824 000FC4 03E0+00 1/1 0/0 0/0 .text core_start__FP10b_ob_class */ @@ -1340,21 +1346,21 @@ static asm void core_start(b_ob_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4479 = 7.0f; -COMPILER_STRIP_GATE(8061ADDC, &lit_4479); +COMPILER_STRIP_GATE(0x8061ADDC, &lit_4479); #pragma pop /* 8061ADE0-8061ADE4 00005C 0004+00 0/6 0/0 0/0 .rodata @4480 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4480 = 10.0f; -COMPILER_STRIP_GATE(8061ADE0, &lit_4480); +COMPILER_STRIP_GATE(0x8061ADE0, &lit_4480); #pragma pop /* 8061ADE4-8061ADE8 000060 0004+00 0/2 0/0 0/0 .rodata @4481 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4481 = -200.0f; -COMPILER_STRIP_GATE(8061ADE4, &lit_4481); +COMPILER_STRIP_GATE(0x8061ADE4, &lit_4481); #pragma pop /* 80611824-80611C20 0013A4 03FC+00 1/1 0/0 0/0 .text core_hand_move__FP10b_ob_class */ @@ -1406,21 +1412,21 @@ static asm void s_kaisoudel_sub(void* param_0, void* param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4544 = 5.0f; -COMPILER_STRIP_GATE(8061ADE8, &lit_4544); +COMPILER_STRIP_GATE(0x8061ADE8, &lit_4544); #pragma pop /* 8061ADEC-8061ADF0 000068 0004+00 0/4 0/0 0/0 .rodata @4545 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4545 = 350.0f; -COMPILER_STRIP_GATE(8061ADEC, &lit_4545); +COMPILER_STRIP_GATE(0x8061ADEC, &lit_4545); #pragma pop /* 8061ADF0-8061ADF4 00006C 0004+00 0/2 0/0 0/0 .rodata @4546 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4546 = 65536.0f; -COMPILER_STRIP_GATE(8061ADF0, &lit_4546); +COMPILER_STRIP_GATE(0x8061ADF0, &lit_4546); #pragma pop /* 80611D10-80611EF8 001890 01E8+00 1/1 0/0 0/0 .text bombfishset__FP10b_ob_class */ @@ -1458,35 +1464,35 @@ static asm void core_hook(b_ob_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4682 = 20.0f; -COMPILER_STRIP_GATE(8061ADF4, &lit_4682); +COMPILER_STRIP_GATE(0x8061ADF4, &lit_4682); #pragma pop /* 8061ADF8-8061ADFC 000074 0004+00 0/3 0/0 0/0 .rodata @4683 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4683 = 6.0f; -COMPILER_STRIP_GATE(8061ADF8, &lit_4683); +COMPILER_STRIP_GATE(0x8061ADF8, &lit_4683); #pragma pop /* 8061ADFC-8061AE00 000078 0004+00 0/5 0/0 0/0 .rodata @4684 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4684 = 50.0f; -COMPILER_STRIP_GATE(8061ADFC, &lit_4684); +COMPILER_STRIP_GATE(0x8061ADFC, &lit_4684); #pragma pop /* 8061AE00-8061AE04 00007C 0004+00 0/1 0/0 0/0 .rodata @4685 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4685 = 7000.0f; -COMPILER_STRIP_GATE(8061AE00, &lit_4685); +COMPILER_STRIP_GATE(0x8061AE00, &lit_4685); #pragma pop /* 8061AE04-8061AE08 000080 0004+00 0/3 0/0 0/0 .rodata @4686 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4686 = 10000.0f; -COMPILER_STRIP_GATE(8061AE04, &lit_4686); +COMPILER_STRIP_GATE(0x8061AE04, &lit_4686); #pragma pop /* 80611FAC-80612484 001B2C 04D8+00 1/1 0/0 0/0 .text core_chance__FP10b_ob_class */ @@ -1504,14 +1510,14 @@ static asm void core_chance(b_ob_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4776 = -1000.0f; -COMPILER_STRIP_GATE(8061AE08, &lit_4776); +COMPILER_STRIP_GATE(0x8061AE08, &lit_4776); #pragma pop /* 8061AE0C-8061AE10 000088 0004+00 0/1 0/0 0/0 .rodata @4777 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4777 = 900.0f; -COMPILER_STRIP_GATE(8061AE0C, &lit_4777); +COMPILER_STRIP_GATE(0x8061AE0C, &lit_4777); #pragma pop /* 80612484-8061285C 002004 03D8+00 1/1 0/0 0/0 .text core_end__FP10b_ob_class */ @@ -1529,14 +1535,14 @@ static asm void core_end(b_ob_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4875 = 300.0f; -COMPILER_STRIP_GATE(8061AE10, &lit_4875); +COMPILER_STRIP_GATE(0x8061AE10, &lit_4875); #pragma pop /* 8061AE14-8061AE18 000090 0004+00 0/1 0/0 0/0 .rodata @4876 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4876 = 800.0f; -COMPILER_STRIP_GATE(8061AE14, &lit_4876); +COMPILER_STRIP_GATE(0x8061AE14, &lit_4876); #pragma pop /* 8061285C-80612CC8 0023DC 046C+00 1/1 0/0 0/0 .text core_action__FP10b_ob_class */ @@ -1554,7 +1560,7 @@ static asm void core_action(b_ob_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4912 = 30.0f; -COMPILER_STRIP_GATE(8061AE18, &lit_4912); +COMPILER_STRIP_GATE(0x8061AE18, &lit_4912); #pragma pop /* 80612CC8-80612ED4 002848 020C+00 1/1 0/0 0/0 .text core_damage_check__FP10b_ob_class @@ -1594,70 +1600,70 @@ static asm void pl_check(b_ob_class* param_0, f32 param_1, s16 param_2) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5274 = 150.0f; -COMPILER_STRIP_GATE(8061AE1C, &lit_5274); +COMPILER_STRIP_GATE(0x8061AE1C, &lit_5274); #pragma pop /* 8061AE20-8061AE24 00009C 0004+00 0/2 0/0 0/0 .rodata @5275 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5275 = 2000.0f; -COMPILER_STRIP_GATE(8061AE20, &lit_5275); +COMPILER_STRIP_GATE(0x8061AE20, &lit_5275); #pragma pop /* 8061AE24-8061AE28 0000A0 0004+00 0/1 0/0 0/0 .rodata @5276 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5276 = 3500.0f; -COMPILER_STRIP_GATE(8061AE24, &lit_5276); +COMPILER_STRIP_GATE(0x8061AE24, &lit_5276); #pragma pop /* 8061AE28-8061AE2C 0000A4 0004+00 0/3 0/0 0/0 .rodata @5277 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5277 = 1000.0f; -COMPILER_STRIP_GATE(8061AE28, &lit_5277); +COMPILER_STRIP_GATE(0x8061AE28, &lit_5277); #pragma pop /* 8061AE2C-8061AE30 0000A8 0004+00 0/1 0/0 0/0 .rodata @5278 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5278 = 1200.0f; -COMPILER_STRIP_GATE(8061AE2C, &lit_5278); +COMPILER_STRIP_GATE(0x8061AE2C, &lit_5278); #pragma pop /* 8061AE30-8061AE34 0000AC 0004+00 0/1 0/0 0/0 .rodata @5279 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5279 = 5000.0f; -COMPILER_STRIP_GATE(8061AE30, &lit_5279); +COMPILER_STRIP_GATE(0x8061AE30, &lit_5279); #pragma pop /* 8061AE34-8061AE38 0000B0 0004+00 0/2 0/0 0/0 .rodata @5280 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5280 = 3000.0f; -COMPILER_STRIP_GATE(8061AE34, &lit_5280); +COMPILER_STRIP_GATE(0x8061AE34, &lit_5280); #pragma pop /* 8061AE38-8061AE3C 0000B4 0004+00 0/2 0/0 0/0 .rodata @5281 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5281 = 7.0f / 10.0f; -COMPILER_STRIP_GATE(8061AE38, &lit_5281); +COMPILER_STRIP_GATE(0x8061AE38, &lit_5281); #pragma pop /* 8061AE3C-8061AE40 0000B8 0004+00 0/3 0/0 0/0 .rodata @5282 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5282 = 1.0f / 20.0f; -COMPILER_STRIP_GATE(8061AE3C, &lit_5282); +COMPILER_STRIP_GATE(0x8061AE3C, &lit_5282); #pragma pop /* 8061AE40-8061AE44 0000BC 0004+00 0/2 0/0 0/0 .rodata @5283 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5283 = 40.0f; -COMPILER_STRIP_GATE(8061AE40, &lit_5283); +COMPILER_STRIP_GATE(0x8061AE40, &lit_5283); #pragma pop /* 8061B540-8061B550 000088 000C+04 0/1 0/0 0/0 .bss @5008 */ @@ -1705,7 +1711,7 @@ static asm void fish_normal(b_ob_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5383 = 29.0f; -COMPILER_STRIP_GATE(8061AE44, &lit_5383); +COMPILER_STRIP_GATE(0x8061AE44, &lit_5383); #pragma pop /* 80613E00-80614228 003980 0428+00 1/1 0/0 0/0 .text fish_vacume__FP10b_ob_class */ @@ -1723,133 +1729,133 @@ static asm void fish_vacume(b_ob_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5478 = -16000.0f; -COMPILER_STRIP_GATE(8061AE48, &lit_5478); +COMPILER_STRIP_GATE(0x8061AE48, &lit_5478); #pragma pop /* 8061AE4C-8061AE50 0000C8 0004+00 0/1 0/0 0/0 .rodata @5479 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5479 = 6500.0f; -COMPILER_STRIP_GATE(8061AE4C, &lit_5479); +COMPILER_STRIP_GATE(0x8061AE4C, &lit_5479); #pragma pop /* 8061AE50-8061AE54 0000CC 0004+00 0/1 0/0 0/0 .rodata @5480 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5480 = -19000.0f; -COMPILER_STRIP_GATE(8061AE50, &lit_5480); +COMPILER_STRIP_GATE(0x8061AE50, &lit_5480); #pragma pop /* 8061AE54-8061AE58 0000D0 0004+00 0/1 0/0 0/0 .rodata @5481 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5481 = -6500.0f; -COMPILER_STRIP_GATE(8061AE54, &lit_5481); +COMPILER_STRIP_GATE(0x8061AE54, &lit_5481); #pragma pop /* 8061AE58-8061AE5C 0000D4 0004+00 0/1 0/0 0/0 .rodata @5482 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5482 = -6000.0f; -COMPILER_STRIP_GATE(8061AE58, &lit_5482); +COMPILER_STRIP_GATE(0x8061AE58, &lit_5482); #pragma pop /* 8061AE5C-8061AE60 0000D8 0004+00 0/1 0/0 0/0 .rodata @5483 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5483 = -22000.0f; -COMPILER_STRIP_GATE(8061AE5C, &lit_5483); +COMPILER_STRIP_GATE(0x8061AE5C, &lit_5483); #pragma pop /* 8061AE60-8061AE64 0000DC 0004+00 0/1 0/0 0/0 .rodata @5484 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5484 = -1325.0f; -COMPILER_STRIP_GATE(8061AE60, &lit_5484); +COMPILER_STRIP_GATE(0x8061AE60, &lit_5484); #pragma pop /* 8061AE64-8061AE68 0000E0 0004+00 0/1 0/0 0/0 .rodata @5485 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5485 = -24000.0f; -COMPILER_STRIP_GATE(8061AE64, &lit_5485); +COMPILER_STRIP_GATE(0x8061AE64, &lit_5485); #pragma pop /* 8061AE68-8061AE6C 0000E4 0004+00 0/1 0/0 0/0 .rodata @5486 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5486 = 9178.0f; -COMPILER_STRIP_GATE(8061AE68, &lit_5486); +COMPILER_STRIP_GATE(0x8061AE68, &lit_5486); #pragma pop /* 8061AE6C-8061AE70 0000E8 0004+00 0/1 0/0 0/0 .rodata @5487 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5487 = -23550.0f; -COMPILER_STRIP_GATE(8061AE6C, &lit_5487); +COMPILER_STRIP_GATE(0x8061AE6C, &lit_5487); #pragma pop /* 8061AE70-8061AE74 0000EC 0004+00 0/1 0/0 0/0 .rodata @5488 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5488 = 10200.0f; -COMPILER_STRIP_GATE(8061AE70, &lit_5488); +COMPILER_STRIP_GATE(0x8061AE70, &lit_5488); #pragma pop /* 8061AE74-8061AE78 0000F0 0004+00 0/1 0/0 0/0 .rodata @5489 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5489 = 2130.0f; -COMPILER_STRIP_GATE(8061AE74, &lit_5489); +COMPILER_STRIP_GATE(0x8061AE74, &lit_5489); #pragma pop /* 8061AE78-8061AE7C 0000F4 0004+00 0/1 0/0 0/0 .rodata @5490 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5490 = -23071.0f; -COMPILER_STRIP_GATE(8061AE78, &lit_5490); +COMPILER_STRIP_GATE(0x8061AE78, &lit_5490); #pragma pop /* 8061AE7C-8061AE80 0000F8 0004+00 0/1 0/0 0/0 .rodata @5491 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5491 = 7383.0f; -COMPILER_STRIP_GATE(8061AE7C, &lit_5491); +COMPILER_STRIP_GATE(0x8061AE7C, &lit_5491); #pragma pop /* 8061AE80-8061AE84 0000FC 0004+00 0/1 0/0 0/0 .rodata @5492 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5492 = -23580.0f; -COMPILER_STRIP_GATE(8061AE80, &lit_5492); +COMPILER_STRIP_GATE(0x8061AE80, &lit_5492); #pragma pop /* 8061AE84-8061AE88 000100 0004+00 0/1 0/0 0/0 .rodata @5493 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5493 = 10300.0f; -COMPILER_STRIP_GATE(8061AE84, &lit_5493); +COMPILER_STRIP_GATE(0x8061AE84, &lit_5493); #pragma pop /* 8061AE88-8061AE8C 000104 0004+00 0/2 0/0 0/0 .rodata @5494 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5494 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(8061AE88, &lit_5494); +COMPILER_STRIP_GATE(0x8061AE88, &lit_5494); #pragma pop /* 8061AE8C-8061AE90 000108 0004+00 0/1 0/0 0/0 .rodata @5495 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5495 = 8628.0f; -COMPILER_STRIP_GATE(8061AE8C, &lit_5495); +COMPILER_STRIP_GATE(0x8061AE8C, &lit_5495); #pragma pop /* 8061AE90-8061AE94 00010C 0004+00 0/1 0/0 0/0 .rodata @5496 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5496 = 12000.0f; -COMPILER_STRIP_GATE(8061AE90, &lit_5496); +COMPILER_STRIP_GATE(0x8061AE90, &lit_5496); #pragma pop /* 80614228-806147D4 003DA8 05AC+00 1/1 0/0 0/0 .text fish_end__FP10b_ob_class */ @@ -1867,56 +1873,56 @@ static asm void fish_end(b_ob_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5572 = -40.0f; -COMPILER_STRIP_GATE(8061AE94, &lit_5572); +COMPILER_STRIP_GATE(0x8061AE94, &lit_5572); #pragma pop /* 8061AE98-8061AE9C 000114 0004+00 0/1 0/0 0/0 .rodata @5573 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5573 = -5.0f; -COMPILER_STRIP_GATE(8061AE98, &lit_5573); +COMPILER_STRIP_GATE(0x8061AE98, &lit_5573); #pragma pop /* 8061AE9C-8061AEA0 000118 0004+00 0/1 0/0 0/0 .rodata @5574 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5574 = -20.0f; -COMPILER_STRIP_GATE(8061AE9C, &lit_5574); +COMPILER_STRIP_GATE(0x8061AE9C, &lit_5574); #pragma pop /* 8061AEA0-8061AEA4 00011C 0004+00 0/2 0/0 0/0 .rodata @5575 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5575 = 3.0f / 5.0f; -COMPILER_STRIP_GATE(8061AEA0, &lit_5575); +COMPILER_STRIP_GATE(0x8061AEA0, &lit_5575); #pragma pop /* 8061AEA4-8061AEA8 000120 0004+00 0/1 0/0 0/0 .rodata @5576 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5576 = -10.0f; -COMPILER_STRIP_GATE(8061AEA4, &lit_5576); +COMPILER_STRIP_GATE(0x8061AEA4, &lit_5576); #pragma pop /* 8061AEA8-8061AEAC 000124 0004+00 0/2 0/0 0/0 .rodata @5577 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5577 = 250.0f; -COMPILER_STRIP_GATE(8061AEA8, &lit_5577); +COMPILER_STRIP_GATE(0x8061AEA8, &lit_5577); #pragma pop /* 8061AEAC-8061AEB0 000128 0004+00 0/1 0/0 0/0 .rodata @5578 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5578 = 2.0f / 5.0f; -COMPILER_STRIP_GATE(8061AEAC, &lit_5578); +COMPILER_STRIP_GATE(0x8061AEAC, &lit_5578); #pragma pop /* 8061AEB0-8061AEB4 00012C 0004+00 0/2 0/0 0/0 .rodata @5579 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5579 = 450.0f; -COMPILER_STRIP_GATE(8061AEB0, &lit_5579); +COMPILER_STRIP_GATE(0x8061AEB0, &lit_5579); #pragma pop /* 806147D4-80614B70 004354 039C+00 1/1 0/0 0/0 .text dmcalc__FP10b_ob_class */ @@ -1934,133 +1940,133 @@ static asm void dmcalc(b_ob_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5876 = 15.0f; -COMPILER_STRIP_GATE(8061AEB4, &lit_5876); +COMPILER_STRIP_GATE(0x8061AEB4, &lit_5876); #pragma pop /* 8061AEB8-8061AEBC 000134 0004+00 0/1 0/0 0/0 .rodata @5877 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5877 = 7.5f; -COMPILER_STRIP_GATE(8061AEB8, &lit_5877); +COMPILER_STRIP_GATE(0x8061AEB8, &lit_5877); #pragma pop /* 8061AEBC-8061AEC0 000138 0004+00 0/1 0/0 0/0 .rodata @5878 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5878 = 170.0f; -COMPILER_STRIP_GATE(8061AEBC, &lit_5878); +COMPILER_STRIP_GATE(0x8061AEBC, &lit_5878); #pragma pop /* 8061AEC0-8061AEC4 00013C 0004+00 0/1 0/0 0/0 .rodata @5879 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5879 = 4000.0f; -COMPILER_STRIP_GATE(8061AEC0, &lit_5879); +COMPILER_STRIP_GATE(0x8061AEC0, &lit_5879); #pragma pop /* 8061AEC4-8061AEC8 000140 0004+00 0/1 0/0 0/0 .rodata @5880 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5880 = 600.0f; -COMPILER_STRIP_GATE(8061AEC4, &lit_5880); +COMPILER_STRIP_GATE(0x8061AEC4, &lit_5880); #pragma pop /* 8061AEC8-8061AECC 000144 0004+00 0/1 0/0 0/0 .rodata @5881 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_5881 = 0x43FF0001; -COMPILER_STRIP_GATE(8061AEC8, &lit_5881); +COMPILER_STRIP_GATE(0x8061AEC8, &lit_5881); #pragma pop /* 8061AECC-8061AED0 000148 0004+00 0/1 0/0 0/0 .rodata @5882 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_5882 = 0xC3C30001; -COMPILER_STRIP_GATE(8061AECC, &lit_5882); +COMPILER_STRIP_GATE(0x8061AECC, &lit_5882); #pragma pop /* 8061AED0-8061AED4 00014C 0004+00 0/1 0/0 0/0 .rodata @5883 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_5883 = 0xC3FA0001; -COMPILER_STRIP_GATE(8061AED0, &lit_5883); +COMPILER_STRIP_GATE(0x8061AED0, &lit_5883); #pragma pop /* 8061AED4-8061AED8 000150 0004+00 0/1 0/0 0/0 .rodata @5884 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_5884 = 0xC3910001; -COMPILER_STRIP_GATE(8061AED4, &lit_5884); +COMPILER_STRIP_GATE(0x8061AED4, &lit_5884); #pragma pop /* 8061AED8-8061AEDC 000154 0004+00 0/1 0/0 0/0 .rodata @5885 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5885 = -360.0f; -COMPILER_STRIP_GATE(8061AED8, &lit_5885); +COMPILER_STRIP_GATE(0x8061AED8, &lit_5885); #pragma pop /* 8061AEDC-8061AEE0 000158 0004+00 0/1 0/0 0/0 .rodata @5886 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_5886 = 0xC3F00001; -COMPILER_STRIP_GATE(8061AEDC, &lit_5886); +COMPILER_STRIP_GATE(0x8061AEDC, &lit_5886); #pragma pop /* 8061AEE0-8061AEE4 00015C 0004+00 0/1 0/0 0/0 .rodata @5887 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_5887 = 0xC2F00001; -COMPILER_STRIP_GATE(8061AEE0, &lit_5887); +COMPILER_STRIP_GATE(0x8061AEE0, &lit_5887); #pragma pop /* 8061AEE4-8061AEE8 000160 0004+00 0/1 0/0 0/0 .rodata @5888 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5888 = 700.0f; -COMPILER_STRIP_GATE(8061AEE4, &lit_5888); +COMPILER_STRIP_GATE(0x8061AEE4, &lit_5888); #pragma pop /* 8061AEE8-8061AEEC 000164 0004+00 0/1 0/0 0/0 .rodata @5889 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5889 = 400.0f; -COMPILER_STRIP_GATE(8061AEE8, &lit_5889); +COMPILER_STRIP_GATE(0x8061AEE8, &lit_5889); #pragma pop /* 8061AEEC-8061AEF0 000168 0004+00 0/1 0/0 0/0 .rodata @5890 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5890 = 360.0f; -COMPILER_STRIP_GATE(8061AEEC, &lit_5890); +COMPILER_STRIP_GATE(0x8061AEEC, &lit_5890); #pragma pop /* 8061AEF0-8061AEF4 00016C 0004+00 0/1 0/0 0/0 .rodata @5891 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5891 = 390.0f; -COMPILER_STRIP_GATE(8061AEF0, &lit_5891); +COMPILER_STRIP_GATE(0x8061AEF0, &lit_5891); #pragma pop /* 8061AEF4-8061AEF8 000170 0004+00 0/1 0/0 0/0 .rodata @5892 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5892 = 411.0f; -COMPILER_STRIP_GATE(8061AEF4, &lit_5892); +COMPILER_STRIP_GATE(0x8061AEF4, &lit_5892); #pragma pop /* 8061AEF8-8061AEFC 000174 0004+00 0/2 0/0 0/0 .rodata @5893 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5893 = 9.5f; -COMPILER_STRIP_GATE(8061AEF8, &lit_5893); +COMPILER_STRIP_GATE(0x8061AEF8, &lit_5893); #pragma pop /* 8061AEFC-8061AF00 000178 0004+00 0/1 0/0 0/0 .rodata @5894 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5894 = 80.0f; -COMPILER_STRIP_GATE(8061AEFC, &lit_5894); +COMPILER_STRIP_GATE(0x8061AEFC, &lit_5894); #pragma pop /* 80614B70-806158E0 0046F0 0D70+00 1/1 0/0 0/0 .text fish_move__FP10b_ob_class */ @@ -2098,42 +2104,42 @@ static asm void s_hasidel_sub(void* param_0, void* param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6720 = 55.0f; -COMPILER_STRIP_GATE(8061AF00, &lit_6720); +COMPILER_STRIP_GATE(0x8061AF00, &lit_6720); #pragma pop /* 8061AF04-8061AF08 000180 0004+00 0/1 0/0 0/0 .rodata @6721 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6721 = 1500.0f; -COMPILER_STRIP_GATE(8061AF04, &lit_6721); +COMPILER_STRIP_GATE(0x8061AF04, &lit_6721); #pragma pop /* 8061AF08-8061AF0C 000184 0004+00 0/1 0/0 0/0 .rodata @6722 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6722 = 3.0f / 10.0f; -COMPILER_STRIP_GATE(8061AF08, &lit_6722); +COMPILER_STRIP_GATE(0x8061AF08, &lit_6722); #pragma pop /* 8061AF0C-8061AF10 000188 0004+00 0/1 0/0 0/0 .rodata @6723 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6723 = 1050.0f; -COMPILER_STRIP_GATE(8061AF0C, &lit_6723); +COMPILER_STRIP_GATE(0x8061AF0C, &lit_6723); #pragma pop /* 8061AF10-8061AF14 00018C 0004+00 0/1 0/0 0/0 .rodata @6724 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6724 = -100.0f; -COMPILER_STRIP_GATE(8061AF10, &lit_6724); +COMPILER_STRIP_GATE(0x8061AF10, &lit_6724); #pragma pop /* 8061AF14-8061AF18 000190 0004+00 0/1 0/0 0/0 .rodata @6725 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6725 = -80.0f; -COMPILER_STRIP_GATE(8061AF14, &lit_6725); +COMPILER_STRIP_GATE(0x8061AF14, &lit_6725); #pragma pop /* 80615A10-80618540 005590 2B30+00 2/1 0/0 0/0 .text demo_camera__FP10b_ob_class */ @@ -2215,651 +2221,651 @@ static asm void cM_ssin(s16 param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6726 = 153.0f; -COMPILER_STRIP_GATE(8061AF18, &lit_6726); +COMPILER_STRIP_GATE(0x8061AF18, &lit_6726); #pragma pop /* 8061AF1C-8061AF20 000198 0004+00 0/0 0/0 0/0 .rodata @6727 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6727 = -500.0f; -COMPILER_STRIP_GATE(8061AF1C, &lit_6727); +COMPILER_STRIP_GATE(0x8061AF1C, &lit_6727); #pragma pop /* 8061AF20-8061AF24 00019C 0004+00 0/0 0/0 0/0 .rodata @6728 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6728 = -371.0f; -COMPILER_STRIP_GATE(8061AF20, &lit_6728); +COMPILER_STRIP_GATE(0x8061AF20, &lit_6728); #pragma pop /* 8061AF24-8061AF28 0001A0 0004+00 0/0 0/0 0/0 .rodata @6729 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6729 = -23869.0f; -COMPILER_STRIP_GATE(8061AF24, &lit_6729); +COMPILER_STRIP_GATE(0x8061AF24, &lit_6729); #pragma pop /* 8061AF28-8061AF2C 0001A4 0004+00 0/0 0/0 0/0 .rodata @6730 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6730 = -1247.0f; -COMPILER_STRIP_GATE(8061AF28, &lit_6730); +COMPILER_STRIP_GATE(0x8061AF28, &lit_6730); #pragma pop /* 8061AF2C-8061AF30 0001A8 0004+00 0/0 0/0 0/0 .rodata @6731 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6731 = -473.0f; -COMPILER_STRIP_GATE(8061AF2C, &lit_6731); +COMPILER_STRIP_GATE(0x8061AF2C, &lit_6731); #pragma pop /* 8061AF30-8061AF34 0001AC 0004+00 0/0 0/0 0/0 .rodata @6732 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6732 = -1581.0f; -COMPILER_STRIP_GATE(8061AF30, &lit_6732); +COMPILER_STRIP_GATE(0x8061AF30, &lit_6732); #pragma pop /* 8061AF34-8061AF38 0001B0 0004+00 0/0 0/0 0/0 .rodata @6733 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6733 = -204.0f; -COMPILER_STRIP_GATE(8061AF34, &lit_6733); +COMPILER_STRIP_GATE(0x8061AF34, &lit_6733); #pragma pop /* 8061AF38-8061AF3C 0001B4 0004+00 0/0 0/0 0/0 .rodata @6734 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6734 = -1307.0f; -COMPILER_STRIP_GATE(8061AF38, &lit_6734); +COMPILER_STRIP_GATE(0x8061AF38, &lit_6734); #pragma pop /* 8061AF3C-8061AF40 0001B8 0004+00 0/0 0/0 0/0 .rodata @6735 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6735 = -23169.0f; -COMPILER_STRIP_GATE(8061AF3C, &lit_6735); +COMPILER_STRIP_GATE(0x8061AF3C, &lit_6735); #pragma pop /* 8061AF40-8061AF44 0001BC 0004+00 0/0 0/0 0/0 .rodata @6736 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6736 = 1.0f / 50.0f; -COMPILER_STRIP_GATE(8061AF40, &lit_6736); +COMPILER_STRIP_GATE(0x8061AF40, &lit_6736); #pragma pop /* 8061AF44-8061AF48 0001C0 0004+00 0/0 0/0 0/0 .rodata @6737 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6737 = -2000.0f; -COMPILER_STRIP_GATE(8061AF44, &lit_6737); +COMPILER_STRIP_GATE(0x8061AF44, &lit_6737); #pragma pop /* 8061AF48-8061AF4C 0001C4 0004+00 0/0 0/0 0/0 .rodata @6738 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6738 = 7180.0f; -COMPILER_STRIP_GATE(8061AF48, &lit_6738); +COMPILER_STRIP_GATE(0x8061AF48, &lit_6738); #pragma pop /* 8061AF4C-8061AF50 0001C8 0004+00 0/0 0/0 0/0 .rodata @6739 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6739 = -16100.0f; -COMPILER_STRIP_GATE(8061AF4C, &lit_6739); +COMPILER_STRIP_GATE(0x8061AF4C, &lit_6739); #pragma pop /* 8061AF50-8061AF54 0001CC 0004+00 0/0 0/0 0/0 .rodata @6740 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6740 = -16500.0f; -COMPILER_STRIP_GATE(8061AF50, &lit_6740); +COMPILER_STRIP_GATE(0x8061AF50, &lit_6740); #pragma pop /* 8061AF54-8061AF58 0001D0 0004+00 0/0 0/0 0/0 .rodata @6741 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6741 = -1236.0f; -COMPILER_STRIP_GATE(8061AF54, &lit_6741); +COMPILER_STRIP_GATE(0x8061AF54, &lit_6741); #pragma pop /* 8061AF58-8061AF5C 0001D4 0004+00 0/0 0/0 0/0 .rodata @6742 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6742 = -23800.0f; -COMPILER_STRIP_GATE(8061AF58, &lit_6742); +COMPILER_STRIP_GATE(0x8061AF58, &lit_6742); #pragma pop /* 8061AF5C-8061AF60 0001D8 0004+00 0/0 0/0 0/0 .rodata @6743 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6743 = -3470.0f; -COMPILER_STRIP_GATE(8061AF5C, &lit_6743); +COMPILER_STRIP_GATE(0x8061AF5C, &lit_6743); #pragma pop /* 8061AF60-8061AF64 0001DC 0004+00 0/0 0/0 0/0 .rodata @6744 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6744 = -1705.0f; -COMPILER_STRIP_GATE(8061AF60, &lit_6744); +COMPILER_STRIP_GATE(0x8061AF60, &lit_6744); #pragma pop /* 8061AF64-8061AF68 0001E0 0004+00 0/0 0/0 0/0 .rodata @6745 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6745 = -23870.0f; -COMPILER_STRIP_GATE(8061AF64, &lit_6745); +COMPILER_STRIP_GATE(0x8061AF64, &lit_6745); #pragma pop /* 8061AF68-8061AF6C 0001E4 0004+00 0/0 0/0 0/0 .rodata @6746 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6746 = -762.0f; -COMPILER_STRIP_GATE(8061AF68, &lit_6746); +COMPILER_STRIP_GATE(0x8061AF68, &lit_6746); #pragma pop /* 8061AF6C-8061AF70 0001E8 0004+00 0/0 0/0 0/0 .rodata @6747 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6747 = -1193.0f; -COMPILER_STRIP_GATE(8061AF6C, &lit_6747); +COMPILER_STRIP_GATE(0x8061AF6C, &lit_6747); #pragma pop /* 8061AF70-8061AF74 0001EC 0004+00 0/0 0/0 0/0 .rodata @6748 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6748 = -770.0f; -COMPILER_STRIP_GATE(8061AF70, &lit_6748); +COMPILER_STRIP_GATE(0x8061AF70, &lit_6748); #pragma pop /* 8061AF74-8061AF78 0001F0 0004+00 0/0 0/0 0/0 .rodata @6749 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6749 = -24093.0f; -COMPILER_STRIP_GATE(8061AF74, &lit_6749); +COMPILER_STRIP_GATE(0x8061AF74, &lit_6749); #pragma pop /* 8061AF78-8061AF7C 0001F4 0004+00 0/0 0/0 0/0 .rodata @6750 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6750 = 160.0f; -COMPILER_STRIP_GATE(8061AF78, &lit_6750); +COMPILER_STRIP_GATE(0x8061AF78, &lit_6750); #pragma pop /* 8061AF7C-8061AF80 0001F8 0004+00 0/0 0/0 0/0 .rodata @6751 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6751 = -447.0f; -COMPILER_STRIP_GATE(8061AF7C, &lit_6751); +COMPILER_STRIP_GATE(0x8061AF7C, &lit_6751); #pragma pop /* 8061AF80-8061AF84 0001FC 0004+00 0/0 0/0 0/0 .rodata @6752 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6752 = -22850.0f; -COMPILER_STRIP_GATE(8061AF80, &lit_6752); +COMPILER_STRIP_GATE(0x8061AF80, &lit_6752); #pragma pop /* 8061AF84-8061AF88 000200 0004+00 0/0 0/0 0/0 .rodata @6753 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6753 = -718.0f; -COMPILER_STRIP_GATE(8061AF84, &lit_6753); +COMPILER_STRIP_GATE(0x8061AF84, &lit_6753); #pragma pop /* 8061AF88-8061AF8C 000204 0004+00 0/0 0/0 0/0 .rodata @6754 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6754 = 1.0f / 25.0f; -COMPILER_STRIP_GATE(8061AF88, &lit_6754); +COMPILER_STRIP_GATE(0x8061AF88, &lit_6754); #pragma pop /* 8061AF8C-8061AF90 000208 0004+00 0/0 0/0 0/0 .rodata @6755 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_6755 = 0x3A03126F; -COMPILER_STRIP_GATE(8061AF8C, &lit_6755); +COMPILER_STRIP_GATE(0x8061AF8C, &lit_6755); #pragma pop /* 8061AF90-8061AF94 00020C 0004+00 0/0 0/0 0/0 .rodata @6756 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6756 = -17000.0f; -COMPILER_STRIP_GATE(8061AF90, &lit_6756); +COMPILER_STRIP_GATE(0x8061AF90, &lit_6756); #pragma pop /* 8061AF94-8061AF98 000210 0004+00 0/0 0/0 0/0 .rodata @6757 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6757 = 4716.0f; -COMPILER_STRIP_GATE(8061AF94, &lit_6757); +COMPILER_STRIP_GATE(0x8061AF94, &lit_6757); #pragma pop /* 8061AF98-8061AF9C 000214 0004+00 0/0 0/0 0/0 .rodata @6758 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6758 = -22925.0f; -COMPILER_STRIP_GATE(8061AF98, &lit_6758); +COMPILER_STRIP_GATE(0x8061AF98, &lit_6758); #pragma pop /* 8061AF9C-8061AFA0 000218 0004+00 0/0 0/0 0/0 .rodata @6759 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6759 = 1873.0f; -COMPILER_STRIP_GATE(8061AF9C, &lit_6759); +COMPILER_STRIP_GATE(0x8061AF9C, &lit_6759); #pragma pop /* 8061AFA0-8061AFA4 00021C 0004+00 0/0 0/0 0/0 .rodata @6760 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6760 = 4264.0f; -COMPILER_STRIP_GATE(8061AFA0, &lit_6760); +COMPILER_STRIP_GATE(0x8061AFA0, &lit_6760); #pragma pop /* 8061AFA4-8061AFA8 000220 0004+00 0/0 0/0 0/0 .rodata @6761 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6761 = -25096.0f; -COMPILER_STRIP_GATE(8061AFA4, &lit_6761); +COMPILER_STRIP_GATE(0x8061AFA4, &lit_6761); #pragma pop /* 8061AFA8-8061AFAC 000224 0004+00 0/0 0/0 0/0 .rodata @6762 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6762 = 12114.0f; -COMPILER_STRIP_GATE(8061AFA8, &lit_6762); +COMPILER_STRIP_GATE(0x8061AFA8, &lit_6762); #pragma pop /* 8061AFAC-8061AFB0 000228 0004+00 0/0 0/0 0/0 .rodata @6763 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6763 = -1377.0f; -COMPILER_STRIP_GATE(8061AFAC, &lit_6763); +COMPILER_STRIP_GATE(0x8061AFAC, &lit_6763); #pragma pop /* 8061AFB0-8061AFB4 00022C 0004+00 0/0 0/0 0/0 .rodata @6764 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6764 = -22866.0f; -COMPILER_STRIP_GATE(8061AFB0, &lit_6764); +COMPILER_STRIP_GATE(0x8061AFB0, &lit_6764); #pragma pop /* 8061AFB4-8061AFB8 000230 0004+00 0/0 0/0 0/0 .rodata @6765 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6765 = 9105.0f; -COMPILER_STRIP_GATE(8061AFB4, &lit_6765); +COMPILER_STRIP_GATE(0x8061AFB4, &lit_6765); #pragma pop /* 8061AFB8-8061AFBC 000234 0004+00 0/0 0/0 0/0 .rodata @6766 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6766 = -560.0f; -COMPILER_STRIP_GATE(8061AFB8, &lit_6766); +COMPILER_STRIP_GATE(0x8061AFB8, &lit_6766); #pragma pop /* 8061AFBC-8061AFC0 000238 0004+00 0/0 0/0 0/0 .rodata @6767 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6767 = -16612.0f; -COMPILER_STRIP_GATE(8061AFBC, &lit_6767); +COMPILER_STRIP_GATE(0x8061AFBC, &lit_6767); #pragma pop /* 8061AFC0-8061AFC4 00023C 0004+00 0/0 0/0 0/0 .rodata @6768 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6768 = -836.0f; -COMPILER_STRIP_GATE(8061AFC0, &lit_6768); +COMPILER_STRIP_GATE(0x8061AFC0, &lit_6768); #pragma pop /* 8061AFC4-8061AFC8 000240 0004+00 0/0 0/0 0/0 .rodata @6769 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6769 = -600.0f; -COMPILER_STRIP_GATE(8061AFC4, &lit_6769); +COMPILER_STRIP_GATE(0x8061AFC4, &lit_6769); #pragma pop /* 8061AFC8-8061AFCC 000244 0004+00 0/0 0/0 0/0 .rodata @6770 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6770 = -16245.0f; -COMPILER_STRIP_GATE(8061AFC8, &lit_6770); +COMPILER_STRIP_GATE(0x8061AFC8, &lit_6770); #pragma pop /* 8061AFCC-8061AFD0 000248 0004+00 0/0 0/0 0/0 .rodata @6771 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6771 = -1331.0f; -COMPILER_STRIP_GATE(8061AFCC, &lit_6771); +COMPILER_STRIP_GATE(0x8061AFCC, &lit_6771); #pragma pop /* 8061AFD0-8061AFD4 00024C 0004+00 0/0 0/0 0/0 .rodata @6772 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6772 = -6378.0f; -COMPILER_STRIP_GATE(8061AFD0, &lit_6772); +COMPILER_STRIP_GATE(0x8061AFD0, &lit_6772); #pragma pop /* 8061AFD4-8061AFD8 000250 0004+00 0/0 0/0 0/0 .rodata @6773 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6773 = -21886.0f; -COMPILER_STRIP_GATE(8061AFD4, &lit_6773); +COMPILER_STRIP_GATE(0x8061AFD4, &lit_6773); #pragma pop /* 8061AFD8-8061AFDC 000254 0004+00 0/0 0/0 0/0 .rodata @6774 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6774 = 7150.0f; -COMPILER_STRIP_GATE(8061AFD8, &lit_6774); +COMPILER_STRIP_GATE(0x8061AFD8, &lit_6774); #pragma pop /* 8061AFDC-8061AFE0 000258 0004+00 0/0 0/0 0/0 .rodata @6775 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6775 = -6961.0f; -COMPILER_STRIP_GATE(8061AFDC, &lit_6775); +COMPILER_STRIP_GATE(0x8061AFDC, &lit_6775); #pragma pop /* 8061AFE0-8061AFE4 00025C 0004+00 0/0 0/0 0/0 .rodata @6776 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6776 = -21727.0f; -COMPILER_STRIP_GATE(8061AFE0, &lit_6776); +COMPILER_STRIP_GATE(0x8061AFE0, &lit_6776); #pragma pop /* 8061AFE4-8061AFE8 000260 0004+00 0/0 0/0 0/0 .rodata @6777 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6777 = 7278.0f; -COMPILER_STRIP_GATE(8061AFE4, &lit_6777); +COMPILER_STRIP_GATE(0x8061AFE4, &lit_6777); #pragma pop /* 8061AFE8-8061AFEC 000264 0004+00 0/0 0/0 0/0 .rodata @6778 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6778 = -1225.0f; -COMPILER_STRIP_GATE(8061AFE8, &lit_6778); +COMPILER_STRIP_GATE(0x8061AFE8, &lit_6778); #pragma pop /* 8061AFEC-8061AFF0 000268 0004+00 0/0 0/0 0/0 .rodata @6779 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6779 = 8678.0f; -COMPILER_STRIP_GATE(8061AFEC, &lit_6779); +COMPILER_STRIP_GATE(0x8061AFEC, &lit_6779); #pragma pop /* 8061AFF0-8061AFF4 00026C 0004+00 0/0 0/0 0/0 .rodata @6780 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_6780 = 0x3B03126F; -COMPILER_STRIP_GATE(8061AFF0, &lit_6780); +COMPILER_STRIP_GATE(0x8061AFF0, &lit_6780); #pragma pop /* 8061AFF4-8061AFF8 000270 0004+00 0/0 0/0 0/0 .rodata @6781 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_6781 = 0x38D1B717; -COMPILER_STRIP_GATE(8061AFF4, &lit_6781); +COMPILER_STRIP_GATE(0x8061AFF4, &lit_6781); #pragma pop /* 8061AFF8-8061AFFC 000274 0004+00 0/0 0/0 0/0 .rodata @6782 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6782 = -1031.0f; -COMPILER_STRIP_GATE(8061AFF8, &lit_6782); +COMPILER_STRIP_GATE(0x8061AFF8, &lit_6782); #pragma pop /* 8061AFFC-8061B000 000278 0004+00 0/0 0/0 0/0 .rodata @6783 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6783 = -23787.0f; -COMPILER_STRIP_GATE(8061AFFC, &lit_6783); +COMPILER_STRIP_GATE(0x8061AFFC, &lit_6783); #pragma pop /* 8061B000-8061B004 00027C 0004+00 0/0 0/0 0/0 .rodata @6784 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6784 = 8845.0f; -COMPILER_STRIP_GATE(8061B000, &lit_6784); +COMPILER_STRIP_GATE(0x8061B000, &lit_6784); #pragma pop /* 8061B004-8061B008 000280 0004+00 0/0 0/0 0/0 .rodata @6785 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6785 = -1629.0f; -COMPILER_STRIP_GATE(8061B004, &lit_6785); +COMPILER_STRIP_GATE(0x8061B004, &lit_6785); #pragma pop /* 8061B008-8061B00C 000284 0004+00 0/0 0/0 0/0 .rodata @6786 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6786 = -23891.0f; -COMPILER_STRIP_GATE(8061B008, &lit_6786); +COMPILER_STRIP_GATE(0x8061B008, &lit_6786); #pragma pop /* 8061B00C-8061B010 000288 0004+00 0/0 0/0 0/0 .rodata @6787 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6787 = 8958.0f; -COMPILER_STRIP_GATE(8061B00C, &lit_6787); +COMPILER_STRIP_GATE(0x8061B00C, &lit_6787); #pragma pop /* 8061B010-8061B014 00028C 0004+00 0/0 0/0 0/0 .rodata @6788 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6788 = 0.25f; -COMPILER_STRIP_GATE(8061B010, &lit_6788); +COMPILER_STRIP_GATE(0x8061B010, &lit_6788); #pragma pop /* 8061B014-8061B018 000290 0004+00 0/0 0/0 0/0 .rodata @6789 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6789 = -2785.0f; -COMPILER_STRIP_GATE(8061B014, &lit_6789); +COMPILER_STRIP_GATE(0x8061B014, &lit_6789); #pragma pop /* 8061B018-8061B01C 000294 0004+00 0/0 0/0 0/0 .rodata @6790 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6790 = -22626.0f; -COMPILER_STRIP_GATE(8061B018, &lit_6790); +COMPILER_STRIP_GATE(0x8061B018, &lit_6790); #pragma pop /* 8061B01C-8061B020 000298 0004+00 0/0 0/0 0/0 .rodata @6791 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6791 = 7614.0f; -COMPILER_STRIP_GATE(8061B01C, &lit_6791); +COMPILER_STRIP_GATE(0x8061B01C, &lit_6791); #pragma pop /* 8061B020-8061B024 00029C 0004+00 0/0 0/0 0/0 .rodata @6792 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6792 = -3295.0f; -COMPILER_STRIP_GATE(8061B020, &lit_6792); +COMPILER_STRIP_GATE(0x8061B020, &lit_6792); #pragma pop /* 8061B024-8061B028 0002A0 0004+00 0/0 0/0 0/0 .rodata @6793 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6793 = -22459.0f; -COMPILER_STRIP_GATE(8061B024, &lit_6793); +COMPILER_STRIP_GATE(0x8061B024, &lit_6793); #pragma pop /* 8061B028-8061B02C 0002A4 0004+00 0/0 0/0 0/0 .rodata @6794 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6794 = 7307.0f; -COMPILER_STRIP_GATE(8061B028, &lit_6794); +COMPILER_STRIP_GATE(0x8061B028, &lit_6794); #pragma pop /* 8061B02C-8061B030 0002A8 0004+00 0/0 0/0 0/0 .rodata @6795 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6795 = -2933.0f; -COMPILER_STRIP_GATE(8061B02C, &lit_6795); +COMPILER_STRIP_GATE(0x8061B02C, &lit_6795); #pragma pop /* 8061B030-8061B034 0002AC 0004+00 0/0 0/0 0/0 .rodata @6796 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6796 = 6829.0f; -COMPILER_STRIP_GATE(8061B030, &lit_6796); +COMPILER_STRIP_GATE(0x8061B030, &lit_6796); #pragma pop /* 8061B034-8061B038 0002B0 0004+00 0/0 0/0 0/0 .rodata @6797 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6797 = -4820.0f; -COMPILER_STRIP_GATE(8061B034, &lit_6797); +COMPILER_STRIP_GATE(0x8061B034, &lit_6797); #pragma pop /* 8061B038-8061B03C 0002B4 0004+00 0/0 0/0 0/0 .rodata @6798 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6798 = -18600.0f; -COMPILER_STRIP_GATE(8061B038, &lit_6798); +COMPILER_STRIP_GATE(0x8061B038, &lit_6798); #pragma pop /* 8061B03C-8061B040 0002B8 0004+00 0/0 0/0 0/0 .rodata @6799 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6799 = -510.0f; -COMPILER_STRIP_GATE(8061B03C, &lit_6799); +COMPILER_STRIP_GATE(0x8061B03C, &lit_6799); #pragma pop /* 8061B040-8061B044 0002BC 0004+00 0/0 0/0 0/0 .rodata @6800 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6800 = -2630.0f; -COMPILER_STRIP_GATE(8061B040, &lit_6800); +COMPILER_STRIP_GATE(0x8061B040, &lit_6800); #pragma pop /* 8061B044-8061B048 0002C0 0004+00 0/0 0/0 0/0 .rodata @6801 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6801 = -21620.0f; -COMPILER_STRIP_GATE(8061B044, &lit_6801); +COMPILER_STRIP_GATE(0x8061B044, &lit_6801); #pragma pop /* 8061B048-8061B04C 0002C4 0004+00 0/0 0/0 0/0 .rodata @6802 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6802 = 4900.0f; -COMPILER_STRIP_GATE(8061B048, &lit_6802); +COMPILER_STRIP_GATE(0x8061B048, &lit_6802); #pragma pop /* 8061B04C-8061B050 0002C8 0004+00 0/0 0/0 0/0 .rodata @6803 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6803 = 45.0f; -COMPILER_STRIP_GATE(8061B04C, &lit_6803); +COMPILER_STRIP_GATE(0x8061B04C, &lit_6803); #pragma pop /* 8061B050-8061B054 0002CC 0004+00 0/0 0/0 0/0 .rodata @6804 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6804 = 210.0f; -COMPILER_STRIP_GATE(8061B050, &lit_6804); +COMPILER_STRIP_GATE(0x8061B050, &lit_6804); #pragma pop /* 8061B054-8061B058 0002D0 0004+00 0/1 0/0 0/0 .rodata @6805 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6805 = -1520.0f; -COMPILER_STRIP_GATE(8061B054, &lit_6805); +COMPILER_STRIP_GATE(0x8061B054, &lit_6805); #pragma pop /* 8061B058-8061B05C 0002D4 0004+00 0/1 0/0 0/0 .rodata @6806 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6806 = -23960.0f; -COMPILER_STRIP_GATE(8061B058, &lit_6806); +COMPILER_STRIP_GATE(0x8061B058, &lit_6806); #pragma pop /* 8061B05C-8061B060 0002D8 0004+00 0/1 0/0 0/0 .rodata @6807 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6807 = 7100.0f; -COMPILER_STRIP_GATE(8061B05C, &lit_6807); +COMPILER_STRIP_GATE(0x8061B05C, &lit_6807); #pragma pop /* 8061B060-8061B064 0002DC 0004+00 0/0 0/0 0/0 .rodata @6808 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6808 = 120.0f; -COMPILER_STRIP_GATE(8061B060, &lit_6808); +COMPILER_STRIP_GATE(0x8061B060, &lit_6808); #pragma pop /* 8061B064-8061B068 0002E0 0004+00 0/0 0/0 0/0 .rodata @6809 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6809 = 1700.0f; -COMPILER_STRIP_GATE(8061B064, &lit_6809); +COMPILER_STRIP_GATE(0x8061B064, &lit_6809); #pragma pop /* 8061B068-8061B06C 0002E4 0004+00 0/0 0/0 0/0 .rodata @6810 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6810 = -250.0f; -COMPILER_STRIP_GATE(8061B068, &lit_6810); +COMPILER_STRIP_GATE(0x8061B068, &lit_6810); #pragma pop /* 8061B06C-8061B070 0002E8 0004+00 0/0 0/0 0/0 .rodata @6811 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6811 = 25.0f; -COMPILER_STRIP_GATE(8061B06C, &lit_6811); +COMPILER_STRIP_GATE(0x8061B06C, &lit_6811); #pragma pop /* 8061B070-8061B074 0002EC 0004+00 0/1 0/0 0/0 .rodata @7342 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7342 = -11000.0f; -COMPILER_STRIP_GATE(8061B070, &lit_7342); +COMPILER_STRIP_GATE(0x8061B070, &lit_7342); #pragma pop /* 8061B074-8061B078 0002F0 0004+00 0/1 0/0 0/0 .rodata @7343 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7343 = -20500.0f; -COMPILER_STRIP_GATE(8061B074, &lit_7343); +COMPILER_STRIP_GATE(0x8061B074, &lit_7343); #pragma pop /* 8061B078-8061B07C 0002F4 0004+00 0/1 0/0 0/0 .rodata @7344 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7344 = 9.0f / 10.0f; -COMPILER_STRIP_GATE(8061B078, &lit_7344); +COMPILER_STRIP_GATE(0x8061B078, &lit_7344); #pragma pop /* 8061B07C-8061B080 0002F8 0004+00 0/1 0/0 0/0 .rodata @7345 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7345 = 11.0f / 10.0f; -COMPILER_STRIP_GATE(8061B07C, &lit_7345); +COMPILER_STRIP_GATE(0x8061B07C, &lit_7345); #pragma pop /* 8061B080-8061B084 0002FC 0004+00 0/1 0/0 0/0 .rodata @7346 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7346 = 22222.0f; -COMPILER_STRIP_GATE(8061B080, &lit_7346); +COMPILER_STRIP_GATE(0x8061B080, &lit_7346); #pragma pop /* 8061B084-8061B088 000300 0004+00 0/1 0/0 0/0 .rodata @7347 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7347 = 750.0f; -COMPILER_STRIP_GATE(8061B084, &lit_7347); +COMPILER_STRIP_GATE(0x8061B084, &lit_7347); #pragma pop /* 8061B088-8061B08C 000304 0004+00 0/1 0/0 0/0 .rodata @7348 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7348 = 410.0f; -COMPILER_STRIP_GATE(8061B088, &lit_7348); +COMPILER_STRIP_GATE(0x8061B088, &lit_7348); #pragma pop /* 80618650-806193B4 0081D0 0D64+00 2/1 0/0 0/0 .text daB_OB_Execute__FP10b_ob_class */ @@ -2912,28 +2918,28 @@ asm J3DFrameCtrl::~J3DFrameCtrl() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7867 = -916.0f; -COMPILER_STRIP_GATE(8061B08C, &lit_7867); +COMPILER_STRIP_GATE(0x8061B08C, &lit_7867); #pragma pop /* 8061B090-8061B094 00030C 0004+00 0/1 0/0 0/0 .rodata @7868 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7868 = -23954.0f; -COMPILER_STRIP_GATE(8061B090, &lit_7868); +COMPILER_STRIP_GATE(0x8061B090, &lit_7868); #pragma pop /* 8061B094-8061B098 000310 0004+00 0/1 0/0 0/0 .rodata @7869 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7869 = 8916.0f; -COMPILER_STRIP_GATE(8061B094, &lit_7869); +COMPILER_STRIP_GATE(0x8061B094, &lit_7869); #pragma pop /* 8061B098-8061B09C 000314 0004+00 0/1 0/0 0/0 .rodata @7870 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7870 = 950.0f; -COMPILER_STRIP_GATE(8061B098, &lit_7870); +COMPILER_STRIP_GATE(0x8061B098, &lit_7870); #pragma pop /* 80619C5C-8061A0C0 0097DC 0464+00 1/0 0/0 0/0 .text daB_OB_Create__FP10fopAc_ac_c */ @@ -3088,7 +3094,7 @@ asm void __sinit_d_a_b_ob_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_8061A850 = (void*)__sinit_d_a_b_ob_cpp; +REGISTER_CTORS(0x8061A850, __sinit_d_a_b_ob_cpp); #pragma pop /* 8061A88C-8061A894 00A40C 0008+00 1/0 0/0 0/0 .text @36@__dt__12dBgS_ObjAcchFv */ @@ -3384,15 +3390,10 @@ asm void cXyz::set(f32 param_0, f32 param_1, f32 param_2) { } #pragma pop -/* 8061AC04-8061AC0C 00A784 0008+00 1/1 0/0 0/0 .text __ct__10JAISoundIDFUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm JAISoundID::JAISoundID(u32 param_0) { - nofralloc -#include "asm/rel/d/a/b/d_a_b_ob/d_a_b_ob/__ct__10JAISoundIDFUl.s" +/* 8061AC04-8061AC0C -00001 0008+00 0/0 0/0 0/0 .text __ct__10JAISoundIDFUl */ +JAISoundID::JAISoundID(u32 param_0) { + *(u32*)this = (u32)(param_0); } -#pragma pop /* 8061AC0C-8061AD20 00A78C 0114+00 1/1 0/0 0/0 .text abs__4cXyzCFv */ #pragma push @@ -3630,9 +3631,4 @@ static u8 data_8061B638[4]; static u8 data_8061B63C[4]; #pragma pop -/* 8061B09C-8061B0A1 000318 0005+00 4/4 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_8061B09C = "B_oh"; -#pragma pop +/* 8061B09C-8061B09C 000318 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/b/d_a_b_oh/d_a_b_oh.cpp b/rel/d/a/b/d_a_b_oh/d_a_b_oh.cpp index 0f67aa0b526..bef7468b46b 100644 --- a/rel/d/a/b/d_a_b_oh/d_a_b_oh.cpp +++ b/rel/d/a/b/d_a_b_oh/d_a_b_oh.cpp @@ -57,10 +57,10 @@ struct mDoExt_McaMorfCallBack1_c {}; struct Vec {}; -struct J3DModelData {}; - struct J3DAnmTransform {}; +struct J3DModelData {}; + struct mDoExt_McaMorf { /* 8000FC4C */ mDoExt_McaMorf(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, int, @@ -97,13 +97,13 @@ struct dRes_control_c { struct dPa_levelEcallBack {}; -struct _GXColor {}; - struct csXyz { /* 8061D8FC */ ~csXyz(); /* 8061D938 */ csXyz(); }; +struct _GXColor {}; + struct dPa_control_c { /* 8004C218 */ void setHitMark(u16, fopAc_ac_c*, cXyz const*, csXyz const*, cXyz const*, u32); /* 8004D4CC */ void set(u32, u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, @@ -329,11 +329,11 @@ extern "C" void __register_global_object(); /* ############################################################################################## */ /* 8061D9D4-8061D9D8 000000 0004+00 12/12 0/0 0/0 .rodata @3650 */ SECTION_RODATA static f32 const lit_3650 = 1.0f; -COMPILER_STRIP_GATE(8061D9D4, &lit_3650); +COMPILER_STRIP_GATE(0x8061D9D4, &lit_3650); /* 8061D9D8-8061D9DC 000004 0004+00 1/2 0/0 0/0 .rodata @3651 */ SECTION_RODATA static f32 const lit_3651 = 70.0f; -COMPILER_STRIP_GATE(8061D9D8, &lit_3651); +COMPILER_STRIP_GATE(0x8061D9D8, &lit_3651); /* 8061DA7C-8061DAAC -00001 0030+00 1/1 0/0 0/0 .data @4166 */ SECTION_DATA static void* lit_4166[12] = { @@ -422,7 +422,7 @@ asm daB_OH_HIO_c::daB_OH_HIO_c() { /* ############################################################################################## */ /* 8061D9DC-8061D9E0 000008 0004+00 1/2 0/0 0/0 .rodata @3692 */ SECTION_RODATA static f32 const lit_3692 = -100.0f; -COMPILER_STRIP_GATE(8061D9DC, &lit_3692); +COMPILER_STRIP_GATE(0x8061D9DC, &lit_3692); /* 8061B75C-8061B8B0 00011C 0154+00 1/1 0/0 0/0 .text nodeCallBack__FP8J3DJointi */ #pragma push @@ -449,42 +449,42 @@ static asm void daB_OH_Draw(b_oh_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3781 = -1500.0f; -COMPILER_STRIP_GATE(8061D9E0, &lit_3781); +COMPILER_STRIP_GATE(0x8061D9E0, &lit_3781); #pragma pop /* 8061D9E4-8061D9E8 000010 0004+00 0/1 0/0 0/0 .rodata @3782 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3782 = 3.0f / 10.0f; -COMPILER_STRIP_GATE(8061D9E4, &lit_3782); +COMPILER_STRIP_GATE(0x8061D9E4, &lit_3782); #pragma pop /* 8061D9E8-8061D9EC 000014 0004+00 0/3 0/0 0/0 .rodata @3783 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3783 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(8061D9E8, &lit_3783); +COMPILER_STRIP_GATE(0x8061D9E8, &lit_3783); #pragma pop /* 8061D9EC-8061D9F0 000018 0004+00 0/2 0/0 0/0 .rodata @3784 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3784 = 30.0f; -COMPILER_STRIP_GATE(8061D9EC, &lit_3784); +COMPILER_STRIP_GATE(0x8061D9EC, &lit_3784); #pragma pop /* 8061D9F0-8061D9F4 00001C 0004+00 0/2 0/0 0/0 .rodata @3785 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_3785 = 0x3BA3D70A; -COMPILER_STRIP_GATE(8061D9F0, &lit_3785); +COMPILER_STRIP_GATE(0x8061D9F0, &lit_3785); #pragma pop /* 8061D9F4-8061D9F8 000020 0004+00 0/1 0/0 0/0 .rodata @3786 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3786 = 1.0f / 20.0f; -COMPILER_STRIP_GATE(8061D9F4, &lit_3786); +COMPILER_STRIP_GATE(0x8061D9F4, &lit_3786); #pragma pop /* 8061DB78-8061DB7C 000008 0001+03 2/2 0/0 0/0 .bss @1109 */ @@ -613,21 +613,21 @@ asm cXyz::~cXyz() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3805 = 60.0f; -COMPILER_STRIP_GATE(8061D9F8, &lit_3805); +COMPILER_STRIP_GATE(0x8061D9F8, &lit_3805); #pragma pop /* 8061D9FC-8061DA00 000028 0004+00 0/1 0/0 0/0 .rodata @3806 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3806 = -23000.0f; -COMPILER_STRIP_GATE(8061D9FC, &lit_3806); +COMPILER_STRIP_GATE(0x8061D9FC, &lit_3806); #pragma pop /* 8061DA00-8061DA04 00002C 0004+00 0/1 0/0 0/0 .rodata @3807 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3807 = 1300.0f; -COMPILER_STRIP_GATE(8061DA00, &lit_3807); +COMPILER_STRIP_GATE(0x8061DA00, &lit_3807); #pragma pop /* 8061BB54-8061BC6C 000514 0118+00 1/1 0/0 0/0 .text wait__FP10b_oh_class */ @@ -650,98 +650,98 @@ SECTION_RODATA static u8 const lit_3870[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(8061DA04, &lit_3870); +COMPILER_STRIP_GATE(0x8061DA04, &lit_3870); #pragma pop /* 8061DA08-8061DA0C 000034 0004+00 0/1 0/0 0/0 .rodata @3871 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3871 = -3.0f / 25.0f; -COMPILER_STRIP_GATE(8061DA08, &lit_3871); +COMPILER_STRIP_GATE(0x8061DA08, &lit_3871); #pragma pop /* 8061DA0C-8061DA10 000038 0004+00 0/1 0/0 0/0 .rodata @3872 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3872 = 4.0f / 5.0f; -COMPILER_STRIP_GATE(8061DA0C, &lit_3872); +COMPILER_STRIP_GATE(0x8061DA0C, &lit_3872); #pragma pop /* 8061DA10-8061DA14 00003C 0004+00 0/1 0/0 0/0 .rodata @3873 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3873 = 1.0f / 50.0f; -COMPILER_STRIP_GATE(8061DA10, &lit_3873); +COMPILER_STRIP_GATE(0x8061DA10, &lit_3873); #pragma pop /* 8061DA14-8061DA18 000040 0004+00 0/2 0/0 0/0 .rodata @3874 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3874 = 200.0f; -COMPILER_STRIP_GATE(8061DA14, &lit_3874); +COMPILER_STRIP_GATE(0x8061DA14, &lit_3874); #pragma pop /* 8061DA18-8061DA1C 000044 0004+00 0/2 0/0 0/0 .rodata @3875 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3875 = 0.5f; -COMPILER_STRIP_GATE(8061DA18, &lit_3875); +COMPILER_STRIP_GATE(0x8061DA18, &lit_3875); #pragma pop /* 8061DA1C-8061DA20 000048 0004+00 0/2 0/0 0/0 .rodata @3876 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3876 = 50.0f; -COMPILER_STRIP_GATE(8061DA1C, &lit_3876); +COMPILER_STRIP_GATE(0x8061DA1C, &lit_3876); #pragma pop /* 8061DA20-8061DA24 00004C 0004+00 0/1 0/0 0/0 .rodata @3877 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3877 = -24000.0f; -COMPILER_STRIP_GATE(8061DA20, &lit_3877); +COMPILER_STRIP_GATE(0x8061DA20, &lit_3877); #pragma pop /* 8061DA24-8061DA28 000050 0004+00 0/2 0/0 0/0 .rodata @3878 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3878 = 1000.0f; -COMPILER_STRIP_GATE(8061DA24, &lit_3878); +COMPILER_STRIP_GATE(0x8061DA24, &lit_3878); #pragma pop /* 8061DA28-8061DA2C 000054 0004+00 0/1 0/0 0/0 .rodata @3879 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3879 = 3700.0f; -COMPILER_STRIP_GATE(8061DA28, &lit_3879); +COMPILER_STRIP_GATE(0x8061DA28, &lit_3879); #pragma pop /* 8061DA2C-8061DA30 000058 0004+00 0/1 0/0 0/0 .rodata @3880 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3880 = 11700.0f; -COMPILER_STRIP_GATE(8061DA2C, &lit_3880); +COMPILER_STRIP_GATE(0x8061DA2C, &lit_3880); #pragma pop /* 8061DA30-8061DA34 00005C 0004+00 0/1 0/0 0/0 .rodata @3881 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3881 = 2.0f; -COMPILER_STRIP_GATE(8061DA30, &lit_3881); +COMPILER_STRIP_GATE(0x8061DA30, &lit_3881); #pragma pop /* 8061DA34-8061DA38 000060 0004+00 0/1 0/0 0/0 .rodata @3882 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3882 = 4000.0f; -COMPILER_STRIP_GATE(8061DA34, &lit_3882); +COMPILER_STRIP_GATE(0x8061DA34, &lit_3882); #pragma pop /* 8061DA38-8061DA3C 000064 0004+00 0/2 0/0 0/0 .rodata @3883 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3883 = 400.0f; -COMPILER_STRIP_GATE(8061DA38, &lit_3883); +COMPILER_STRIP_GATE(0x8061DA38, &lit_3883); #pragma pop /* 8061BC6C-8061C070 00062C 0404+00 1/1 0/0 0/0 .text attack__FP10b_oh_class */ @@ -759,7 +759,7 @@ static asm void attack(b_oh_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3911 = 500.0f; -COMPILER_STRIP_GATE(8061DA3C, &lit_3911); +COMPILER_STRIP_GATE(0x8061DA3C, &lit_3911); #pragma pop /* 8061C070-8061C1F8 000A30 0188+00 1/1 0/0 0/0 .text caught__FP10b_oh_class */ @@ -777,7 +777,7 @@ static asm void caught(b_oh_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3921 = 150.0f; -COMPILER_STRIP_GATE(8061DA40, &lit_3921); +COMPILER_STRIP_GATE(0x8061DA40, &lit_3921); #pragma pop /* 8061C1F8-8061C298 000BB8 00A0+00 1/1 0/0 0/0 .text end__FP10b_oh_class */ @@ -815,42 +815,42 @@ static asm void action(b_oh_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4160 = 80.0f; -COMPILER_STRIP_GATE(8061DA44, &lit_4160); +COMPILER_STRIP_GATE(0x8061DA44, &lit_4160); #pragma pop /* 8061DA48-8061DA4C 000074 0004+00 0/0 0/0 0/0 .rodata @4161 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4161 = 1500.0f; -COMPILER_STRIP_GATE(8061DA48, &lit_4161); +COMPILER_STRIP_GATE(0x8061DA48, &lit_4161); #pragma pop /* 8061DA4C-8061DA50 000078 0004+00 0/0 0/0 0/0 .rodata @4162 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4162 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(8061DA4C, &lit_4162); +COMPILER_STRIP_GATE(0x8061DA4C, &lit_4162); #pragma pop /* 8061DA50-8061DA54 00007C 0004+00 0/1 0/0 0/0 .rodata @4163 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4163 = 100.0f; -COMPILER_STRIP_GATE(8061DA50, &lit_4163); +COMPILER_STRIP_GATE(0x8061DA50, &lit_4163); #pragma pop /* 8061DA54-8061DA58 000080 0004+00 0/1 0/0 0/0 .rodata @4164 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4164 = 2000.0f; -COMPILER_STRIP_GATE(8061DA54, &lit_4164); +COMPILER_STRIP_GATE(0x8061DA54, &lit_4164); #pragma pop /* 8061DA58-8061DA5C 000084 0004+00 0/0 0/0 0/0 .rodata @4165 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4165 = 1.0f / 100.0f; -COMPILER_STRIP_GATE(8061DA58, &lit_4165); +COMPILER_STRIP_GATE(0x8061DA58, &lit_4165); #pragma pop /* 8061DA5C-8061DA64 000088 0008+00 0/0 0/0 0/0 .rodata @4168 */ @@ -859,14 +859,14 @@ COMPILER_STRIP_GATE(8061DA58, &lit_4165); SECTION_RODATA static u8 const lit_4168[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8061DA5C, &lit_4168); +COMPILER_STRIP_GATE(0x8061DA5C, &lit_4168); #pragma pop /* 8061DA64-8061DA68 000090 0004+00 0/1 0/0 0/0 .rodata @4216 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4216 = -1.0f; -COMPILER_STRIP_GATE(8061DA64, &lit_4216); +COMPILER_STRIP_GATE(0x8061DA64, &lit_4216); #pragma pop /* 8061CB4C-8061CD98 00150C 024C+00 1/1 0/0 0/0 .text damage_check__FP10b_oh_class */ @@ -884,7 +884,7 @@ static asm void damage_check(b_oh_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4297 = 20000.0f; -COMPILER_STRIP_GATE(8061DA68, &lit_4297); +COMPILER_STRIP_GATE(0x8061DA68, &lit_4297); #pragma pop /* 8061CD98-8061D05C 001758 02C4+00 2/1 0/0 0/0 .text daB_OH_Execute__FP10b_oh_class */ @@ -902,6 +902,13 @@ static bool daB_OH_IsDelete(b_oh_class* param_0) { return true; } +/* ############################################################################################## */ +/* 8061DA74-8061DA74 0000A0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8061DA74 = "B_oh"; +#pragma pop + /* 8061D064-8061D0B8 001A24 0054+00 1/0 0/0 0/0 .text daB_OH_Delete__FP10b_oh_class */ #pragma push #pragma optimization_level 0 @@ -917,7 +924,7 @@ static asm void daB_OH_Delete(b_oh_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4438 = 39.0f; -COMPILER_STRIP_GATE(8061DA6C, &lit_4438); +COMPILER_STRIP_GATE(0x8061DA6C, &lit_4438); #pragma pop /* 8061D0B8-8061D39C 001A78 02E4+00 1/1 0/0 0/0 .text useHeapInit__FP10fopAc_ac_c */ @@ -945,7 +952,7 @@ asm J3DFrameCtrl::~J3DFrameCtrl() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4519 = 65536.0f; -COMPILER_STRIP_GATE(8061DA70, &lit_4519); +COMPILER_STRIP_GATE(0x8061DA70, &lit_4519); #pragma pop /* 8061DBD8-8061DBDC 000068 0004+00 0/1 0/0 0/0 .bss Cinit */ @@ -1046,7 +1053,7 @@ asm void __sinit_d_a_b_oh_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_8061D984 = (void*)__sinit_d_a_b_oh_cpp; +REGISTER_CTORS(0x8061D984, __sinit_d_a_b_oh_cpp); #pragma pop /* ############################################################################################## */ @@ -1221,9 +1228,4 @@ static u8 data_8061DC38[4]; static u8 data_8061DC3C[4]; #pragma pop -/* 8061DA74-8061DA79 0000A0 0005+00 3/3 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_8061DA74 = "B_oh"; -#pragma pop +/* 8061DA74-8061DA74 0000A0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/b/d_a_b_oh2/d_a_b_oh2.cpp b/rel/d/a/b/d_a_b_oh2/d_a_b_oh2.cpp index c6c53164188..187ea030527 100644 --- a/rel/d/a/b/d_a_b_oh2/d_a_b_oh2.cpp +++ b/rel/d/a/b/d_a_b_oh2/d_a_b_oh2.cpp @@ -52,16 +52,16 @@ struct mDoExt_baseAnm { /* 8000D428 */ void play(); }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; - struct J3DAnmTransform {}; +struct J3DModelData {}; + +struct Z2Creature {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -199,7 +199,7 @@ extern "C" extern void* calc_mtx[1 + 1 /* padding */]; /* ############################################################################################## */ /* 8061EA38-8061EA3C 000000 0004+00 5/5 0/0 0/0 .rodata @3678 */ SECTION_RODATA static f32 const lit_3678 = 1.0f; -COMPILER_STRIP_GATE(8061EA38, &lit_3678); +COMPILER_STRIP_GATE(0x8061EA38, &lit_3678); /* 8061DCB8-8061DDB0 000078 00F8+00 1/1 0/0 0/0 .text nodeCallBack__FP8J3DJointi */ #pragma push @@ -231,56 +231,56 @@ SECTION_RODATA static u8 const lit_3792[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(8061EA3C, &lit_3792); +COMPILER_STRIP_GATE(0x8061EA3C, &lit_3792); #pragma pop /* 8061EA40-8061EA44 000008 0004+00 0/1 0/0 0/0 .rodata @3793 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3793 = 200.0f; -COMPILER_STRIP_GATE(8061EA40, &lit_3793); +COMPILER_STRIP_GATE(0x8061EA40, &lit_3793); #pragma pop /* 8061EA44-8061EA48 00000C 0004+00 0/1 0/0 0/0 .rodata @3794 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3794 = 100.0f; -COMPILER_STRIP_GATE(8061EA44, &lit_3794); +COMPILER_STRIP_GATE(0x8061EA44, &lit_3794); #pragma pop /* 8061EA48-8061EA4C 000010 0004+00 0/1 0/0 0/0 .rodata @3795 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3795 = 123.0f; -COMPILER_STRIP_GATE(8061EA48, &lit_3795); +COMPILER_STRIP_GATE(0x8061EA48, &lit_3795); #pragma pop /* 8061EA4C-8061EA50 000014 0004+00 0/2 0/0 0/0 .rodata @3796 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3796 = -50000.0f; -COMPILER_STRIP_GATE(8061EA4C, &lit_3796); +COMPILER_STRIP_GATE(0x8061EA4C, &lit_3796); #pragma pop /* 8061EA50-8061EA54 000018 0004+00 0/1 0/0 0/0 .rodata @3797 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3797 = -20.0f; -COMPILER_STRIP_GATE(8061EA50, &lit_3797); +COMPILER_STRIP_GATE(0x8061EA50, &lit_3797); #pragma pop /* 8061EA54-8061EA58 00001C 0004+00 0/1 0/0 0/0 .rodata @3798 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3798 = 17.0f / 20.0f; -COMPILER_STRIP_GATE(8061EA54, &lit_3798); +COMPILER_STRIP_GATE(0x8061EA54, &lit_3798); #pragma pop /* 8061EA58-8061EA5C 000020 0004+00 0/1 0/0 0/0 .rodata @3799 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3799 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(8061EA58, &lit_3799); +COMPILER_STRIP_GATE(0x8061EA58, &lit_3799); #pragma pop /* 8061EAE8-8061EAEC 000000 0004+00 3/3 0/0 0/0 .bss boss */ @@ -311,7 +311,7 @@ asm cXyz::~cXyz() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3875 = 650.0f; -COMPILER_STRIP_GATE(8061EA5C, &lit_3875); +COMPILER_STRIP_GATE(0x8061EA5C, &lit_3875); #pragma pop /* 8061EA60-8061EA68 000028 0004+04 0/1 0/0 0/0 .rodata @3876 */ @@ -322,7 +322,7 @@ SECTION_RODATA static f32 const lit_3876[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(8061EA60, &lit_3876); +COMPILER_STRIP_GATE(0x8061EA60, &lit_3876); #pragma pop /* 8061EA68-8061EA70 000030 0008+00 0/1 0/0 0/0 .rodata @3878 */ @@ -331,7 +331,7 @@ COMPILER_STRIP_GATE(8061EA60, &lit_3876); SECTION_RODATA static u8 const lit_3878[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8061EA68, &lit_3878); +COMPILER_STRIP_GATE(0x8061EA68, &lit_3878); #pragma pop /* 8061E1D8-8061E410 000598 0238+00 1/1 0/0 0/0 .text action__FP11b_oh2_class */ @@ -360,6 +360,13 @@ static bool daB_OH2_IsDelete(b_oh2_class* param_0) { return true; } +/* ############################################################################################## */ +/* 8061EA84-8061EA84 00004C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8061EA84 = "B_oh"; +#pragma pop + /* 8061E4F0-8061E540 0008B0 0050+00 1/0 0/0 0/0 .text daB_OH2_Delete__FP11b_oh2_class */ #pragma push #pragma optimization_level 0 @@ -375,14 +382,14 @@ static asm void daB_OH2_Delete(b_oh2_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4048 = 39.0f; -COMPILER_STRIP_GATE(8061EA70, &lit_4048); +COMPILER_STRIP_GATE(0x8061EA70, &lit_4048); #pragma pop /* 8061EA74-8061EA78 00003C 0004+00 0/1 0/0 0/0 .rodata @4049 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4049 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(8061EA74, &lit_4049); +COMPILER_STRIP_GATE(0x8061EA74, &lit_4049); #pragma pop /* 8061EA8C-8061EAAC -00001 0020+00 1/0 0/0 0/0 .data l_daB_OH2_Method */ @@ -439,21 +446,21 @@ asm J3DFrameCtrl::~J3DFrameCtrl() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4105 = 65536.0f; -COMPILER_STRIP_GATE(8061EA78, &lit_4105); +COMPILER_STRIP_GATE(0x8061EA78, &lit_4105); #pragma pop /* 8061EA7C-8061EA80 000044 0004+00 0/1 0/0 0/0 .rodata @4106 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4106 = 50.0f; -COMPILER_STRIP_GATE(8061EA7C, &lit_4106); +COMPILER_STRIP_GATE(0x8061EA7C, &lit_4106); #pragma pop /* 8061EA80-8061EA84 000048 0004+00 0/1 0/0 0/0 .rodata @4107 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4107 = 5.0f; -COMPILER_STRIP_GATE(8061EA80, &lit_4107); +COMPILER_STRIP_GATE(0x8061EA80, &lit_4107); #pragma pop /* 8061E868-8061E9EC 000C28 0184+00 1/0 0/0 0/0 .text daB_OH2_Create__FP10fopAc_ac_c */ @@ -486,9 +493,4 @@ cXyz::cXyz() { /* empty function */ } -/* 8061EA84-8061EA89 00004C 0005+00 3/3 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_8061EA84 = "B_oh"; -#pragma pop +/* 8061EA84-8061EA84 00004C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/b/d_a_b_tn/d_a_b_tn.cpp b/rel/d/a/b/d_a_b_tn/d_a_b_tn.cpp index a518f66fdde..d42a01c8d8f 100644 --- a/rel/d/a/b/d_a_b_tn/d_a_b_tn.cpp +++ b/rel/d/a/b/d_a_b_tn/d_a_b_tn.cpp @@ -46,16 +46,16 @@ struct mDoExt_brkAnm { /* 8000D7A8 */ void entry(J3DMaterialTable*, f32); }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; - struct J3DAnmTransform {}; +struct J3DModelData {}; + +struct Z2Creature {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -79,6 +79,8 @@ struct daPy_py_c { static u8 m_midnaActor[4]; }; +struct J3DModel {}; + struct J3DJoint {}; struct dCcD_SrcSph {}; @@ -90,8 +92,6 @@ struct dCcD_Sph { /* 8062D678 */ dCcD_Sph(); }; -struct J3DModel {}; - struct daB_TN_c { /* 8061EC58 */ void ctrlJoint(J3DJoint*, J3DModel*); /* 8061ED10 */ void JointCallBack(J3DJoint*, int); @@ -685,7 +685,7 @@ extern "C" void __register_global_object(); /* ############################################################################################## */ /* 8062E634-8062E638 000000 0004+00 36/36 0/0 0/0 .rodata @3920 */ SECTION_RODATA static f32 const lit_3920 = 100.0f; -COMPILER_STRIP_GATE(8062E634, &lit_3920); +COMPILER_STRIP_GATE(0x8062E634, &lit_3920); /* 8062E638-8062E63C 000004 0004+00 4/33 0/0 0/0 .rodata @3921 */ SECTION_RODATA static u8 const lit_3921[4] = { @@ -694,7 +694,7 @@ SECTION_RODATA static u8 const lit_3921[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(8062E638, &lit_3921); +COMPILER_STRIP_GATE(0x8062E638, &lit_3921); /* 8062E63C-8062E644 000008 0004+04 5/27 0/0 0/0 .rodata @3922 */ SECTION_RODATA static f32 const lit_3922[1 + 1 /* padding */] = { @@ -702,7 +702,7 @@ SECTION_RODATA static f32 const lit_3922[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(8062E63C, &lit_3922); +COMPILER_STRIP_GATE(0x8062E63C, &lit_3922); /* 8062E644-8062E64C 000010 0008+00 0/4 0/0 0/0 .rodata @3923 */ #pragma push @@ -710,7 +710,7 @@ COMPILER_STRIP_GATE(8062E63C, &lit_3922); SECTION_RODATA static u8 const lit_3923[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8062E644, &lit_3923); +COMPILER_STRIP_GATE(0x8062E644, &lit_3923); #pragma pop /* 8062E64C-8062E654 000018 0008+00 0/4 0/0 0/0 .rodata @3924 */ @@ -719,7 +719,7 @@ COMPILER_STRIP_GATE(8062E644, &lit_3923); SECTION_RODATA static u8 const lit_3924[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8062E64C, &lit_3924); +COMPILER_STRIP_GATE(0x8062E64C, &lit_3924); #pragma pop /* 8062E654-8062E65C 000020 0008+00 0/4 0/0 0/0 .rodata @3925 */ @@ -728,70 +728,70 @@ COMPILER_STRIP_GATE(8062E64C, &lit_3924); SECTION_RODATA static u8 const lit_3925[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8062E654, &lit_3925); +COMPILER_STRIP_GATE(0x8062E654, &lit_3925); #pragma pop /* 8062E65C-8062E660 000028 0004+00 0/1 0/0 0/0 .rodata @3926 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3926 = 1.0f / 100.0f; -COMPILER_STRIP_GATE(8062E65C, &lit_3926); +COMPILER_STRIP_GATE(0x8062E65C, &lit_3926); #pragma pop /* 8062E660-8062E664 00002C 0004+00 0/1 0/0 0/0 .rodata @3941 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3941 = 13.0f / 10.0f; -COMPILER_STRIP_GATE(8062E660, &lit_3941); +COMPILER_STRIP_GATE(0x8062E660, &lit_3941); #pragma pop /* 8062E664-8062E668 000030 0004+00 0/5 0/0 0/0 .rodata @3942 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3942 = 40.0f; -COMPILER_STRIP_GATE(8062E664, &lit_3942); +COMPILER_STRIP_GATE(0x8062E664, &lit_3942); #pragma pop /* 8062E668-8062E66C 000034 0004+00 0/2 0/0 0/0 .rodata @3943 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3943 = 150.0f; -COMPILER_STRIP_GATE(8062E668, &lit_3943); +COMPILER_STRIP_GATE(0x8062E668, &lit_3943); #pragma pop /* 8062E66C-8062E670 000038 0004+00 0/6 0/0 0/0 .rodata @3944 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3944 = 250.0f; -COMPILER_STRIP_GATE(8062E66C, &lit_3944); +COMPILER_STRIP_GATE(0x8062E66C, &lit_3944); #pragma pop /* 8062E670-8062E674 00003C 0004+00 0/1 0/0 0/0 .rodata @3945 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3945 = 210.0f; -COMPILER_STRIP_GATE(8062E670, &lit_3945); +COMPILER_STRIP_GATE(0x8062E670, &lit_3945); #pragma pop /* 8062E674-8062E678 000040 0004+00 0/7 0/0 0/0 .rodata @3946 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3946 = 350.0f; -COMPILER_STRIP_GATE(8062E674, &lit_3946); +COMPILER_STRIP_GATE(0x8062E674, &lit_3946); #pragma pop /* 8062E678-8062E67C 000044 0004+00 0/1 0/0 0/0 .rodata @3947 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3947 = 120.0f; -COMPILER_STRIP_GATE(8062E678, &lit_3947); +COMPILER_STRIP_GATE(0x8062E678, &lit_3947); #pragma pop /* 8062E67C-8062E680 000048 0004+00 0/1 0/0 0/0 .rodata @3948 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3948 = 360.0f; -COMPILER_STRIP_GATE(8062E67C, &lit_3948); +COMPILER_STRIP_GATE(0x8062E67C, &lit_3948); #pragma pop /* 8062E904-8062E910 000000 000C+00 3/3 0/0 0/0 .data cNullVec__6Z2Calc */ @@ -1320,7 +1320,7 @@ asm void daB_TN_c::calcWaistAngle() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4175 = 1000.0f; -COMPILER_STRIP_GATE(8062E680, &lit_4175); +COMPILER_STRIP_GATE(0x8062E680, &lit_4175); #pragma pop /* 8062EFE0-8062EFE4 000008 0001+03 2/2 0/0 0/0 .bss @1109 */ @@ -1479,67 +1479,67 @@ asm void daB_TN_c::setPartLandEffect(int param_0, int param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4365 = 10.0f; -COMPILER_STRIP_GATE(8062E684, &lit_4365); +COMPILER_STRIP_GATE(0x8062E684, &lit_4365); #pragma pop /* 8062E688-8062E68C 000054 0004+00 0/9 0/0 0/0 .rodata @4366 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4366 = 5.0f; -COMPILER_STRIP_GATE(8062E688, &lit_4366); +COMPILER_STRIP_GATE(0x8062E688, &lit_4366); #pragma pop /* 8062E68C-8062E690 000058 0004+00 0/7 0/0 0/0 .rodata @4367 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4367 = 35.0f; -COMPILER_STRIP_GATE(8062E68C, &lit_4367); +COMPILER_STRIP_GATE(0x8062E68C, &lit_4367); #pragma pop /* 8062E690-8062E694 00005C 0004+00 0/5 0/0 0/0 .rodata @4368 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4368 = 7.0f; -COMPILER_STRIP_GATE(8062E690, &lit_4368); +COMPILER_STRIP_GATE(0x8062E690, &lit_4368); #pragma pop /* 8062E694-8062E698 000060 0004+00 0/4 0/0 0/0 .rodata @4369 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4369 = 55.0f; -COMPILER_STRIP_GATE(8062E694, &lit_4369); +COMPILER_STRIP_GATE(0x8062E694, &lit_4369); #pragma pop /* 8062E698-8062E69C 000064 0004+00 0/4 0/0 0/0 .rodata @4370 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4370 = -70.0f; -COMPILER_STRIP_GATE(8062E698, &lit_4370); +COMPILER_STRIP_GATE(0x8062E698, &lit_4370); #pragma pop /* 8062E69C-8062E6A0 000068 0004+00 1/7 0/0 0/0 .rodata @4371 */ SECTION_RODATA static f32 const lit_4371 = -1.0f; -COMPILER_STRIP_GATE(8062E69C, &lit_4371); +COMPILER_STRIP_GATE(0x8062E69C, &lit_4371); /* 8062E6A0-8062E6A4 00006C 0004+00 0/1 0/0 0/0 .rodata @4372 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4372 = 32768.0f; -COMPILER_STRIP_GATE(8062E6A0, &lit_4372); +COMPILER_STRIP_GATE(0x8062E6A0, &lit_4372); #pragma pop /* 8062E6A4-8062E6A8 000070 0004+00 0/2 0/0 0/0 .rodata @4373 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4373 = 2.0f; -COMPILER_STRIP_GATE(8062E6A4, &lit_4373); +COMPILER_STRIP_GATE(0x8062E6A4, &lit_4373); #pragma pop /* 8062E6A8-8062E6AC 000074 0004+00 0/3 0/0 0/0 .rodata @4374 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4374 = 18.0f; -COMPILER_STRIP_GATE(8062E6A8, &lit_4374); +COMPILER_STRIP_GATE(0x8062E6A8, &lit_4374); #pragma pop /* 8062E6AC-8062E6B4 000078 0004+04 1/7 0/0 0/0 .rodata @4375 */ @@ -1548,13 +1548,13 @@ SECTION_RODATA static f32 const lit_4375[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(8062E6AC, &lit_4375); +COMPILER_STRIP_GATE(0x8062E6AC, &lit_4375); /* 8062E6B4-8062E6BC 000080 0008+00 1/4 0/0 0/0 .rodata @4377 */ SECTION_RODATA static u8 const lit_4377[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8062E6B4, &lit_4377); +COMPILER_STRIP_GATE(0x8062E6B4, &lit_4377); /* 8062F05C-8062F068 000084 000C+00 0/1 0/0 0/0 .bss @3949 */ #pragma push @@ -1770,35 +1770,35 @@ asm void daB_TN_c::calcShieldMove() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4475 = 70.0f; -COMPILER_STRIP_GATE(8062E6BC, &lit_4475); +COMPILER_STRIP_GATE(0x8062E6BC, &lit_4475); #pragma pop /* 8062E6C0-8062E6C4 00008C 0004+00 0/8 0/0 0/0 .rodata @4476 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4476 = 200.0f; -COMPILER_STRIP_GATE(8062E6C0, &lit_4476); +COMPILER_STRIP_GATE(0x8062E6C0, &lit_4476); #pragma pop /* 8062E6C4-8062E6C8 000090 0004+00 0/2 0/0 0/0 .rodata @4477 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4477 = 80.0f; -COMPILER_STRIP_GATE(8062E6C4, &lit_4477); +COMPILER_STRIP_GATE(0x8062E6C4, &lit_4477); #pragma pop /* 8062E6C8-8062E6CC 000094 0004+00 0/4 0/0 0/0 .rodata @4478 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4478 = 3.0f / 10.0f; -COMPILER_STRIP_GATE(8062E6C8, &lit_4478); +COMPILER_STRIP_GATE(0x8062E6C8, &lit_4478); #pragma pop /* 8062E6CC-8062E6D0 000098 0004+00 0/3 0/0 0/0 .rodata @4479 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4479 = 25.0f; -COMPILER_STRIP_GATE(8062E6CC, &lit_4479); +COMPILER_STRIP_GATE(0x8062E6CC, &lit_4479); #pragma pop /* 8061F9F4-8061FD7C 000EF4 0388+00 1/1 0/0 0/0 .text calcSwordMoveA__8daB_TN_cFv */ @@ -1824,13 +1824,13 @@ asm void daB_TN_c::calcSwordMoveB() { /* ############################################################################################## */ /* 8062E6D0-8062E6D4 00009C 0004+00 2/10 0/0 0/0 .rodata @4655 */ SECTION_RODATA static f32 const lit_4655 = 0.5f; -COMPILER_STRIP_GATE(8062E6D0, &lit_4655); +COMPILER_STRIP_GATE(0x8062E6D0, &lit_4655); /* 8062E6D4-8062E6D8 0000A0 0004+00 0/1 0/0 0/0 .rodata @4656 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4656 = 4096.0f; -COMPILER_STRIP_GATE(8062E6D4, &lit_4656); +COMPILER_STRIP_GATE(0x8062E6D4, &lit_4656); #pragma pop /* 8061FFE0-8062070C 0014E0 072C+00 2/1 0/0 0/0 .text calcOtherPartMove__8daB_TN_cFi */ @@ -1853,6 +1853,13 @@ asm void daB_TN_c::calcPartMove() { } #pragma pop +/* ############################################################################################## */ +/* 8062E8E8-8062E8E8 0002B4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8062E8E8 = "B_tn"; +#pragma pop + /* 806208C8-8062096C 001DC8 00A4+00 18/18 0/0 0/0 .text setBck__8daB_TN_cFiUcff */ #pragma push #pragma optimization_level 0 @@ -1918,16 +1925,16 @@ asm void daB_TN_c::setBodyShield() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4657 = 16384.0f; -COMPILER_STRIP_GATE(8062E6D8, &lit_4657); +COMPILER_STRIP_GATE(0x8062E6D8, &lit_4657); #pragma pop /* 8062E6DC-8062E6E0 0000A8 0004+00 1/4 0/0 0/0 .rodata @4658 */ SECTION_RODATA static f32 const lit_4658 = 50.0f; -COMPILER_STRIP_GATE(8062E6DC, &lit_4658); +COMPILER_STRIP_GATE(0x8062E6DC, &lit_4658); /* 8062E6E0-8062E6E4 0000AC 0004+00 1/7 0/0 0/0 .rodata @4957 */ SECTION_RODATA static f32 const lit_4957 = 30.0f; -COMPILER_STRIP_GATE(8062E6E0, &lit_4957); +COMPILER_STRIP_GATE(0x8062E6E0, &lit_4957); /* 8062F2FC-8062F300 000324 0004+00 2/3 0/0 0/0 .bss m_attack_tn */ static u8 m_attack_tn[4]; @@ -2041,21 +2048,21 @@ asm cM3dGAab::~cM3dGAab() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5981 = 1700.0f; -COMPILER_STRIP_GATE(8062E6E4, &lit_5981); +COMPILER_STRIP_GATE(0x8062E6E4, &lit_5981); #pragma pop /* 8062E6E8-8062E6EC 0000B4 0004+00 0/1 0/0 0/0 .rodata @5982 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5982 = 1600.0f; -COMPILER_STRIP_GATE(8062E6E8, &lit_5982); +COMPILER_STRIP_GATE(0x8062E6E8, &lit_5982); #pragma pop /* 8062E6EC-8062E6F0 0000B8 0004+00 0/2 0/0 0/0 .rodata @5983 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5983 = 1500.0f; -COMPILER_STRIP_GATE(8062E6EC, &lit_5983); +COMPILER_STRIP_GATE(0x8062E6EC, &lit_5983); #pragma pop /* 806227D0-80622B60 003CD0 0390+00 4/4 0/0 0/0 .text checkMoveArea__8daB_TN_cFv */ @@ -2103,14 +2110,14 @@ asm void daB_TN_c::setArmorBreakEffect(int param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6119 = 300.0f; -COMPILER_STRIP_GATE(8062E6F0, &lit_6119); +COMPILER_STRIP_GATE(0x8062E6F0, &lit_6119); #pragma pop /* 8062E6F4-8062E6F8 0000C0 0004+00 0/4 0/0 0/0 .rodata @6120 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6120 = 700.0f; -COMPILER_STRIP_GATE(8062E6F4, &lit_6120); +COMPILER_STRIP_GATE(0x8062E6F4, &lit_6120); #pragma pop /* 80622DF4-80622F64 0042F4 0170+00 1/1 0/0 0/0 .text s_obj_sub__FPvPv */ @@ -2128,56 +2135,56 @@ static asm void s_obj_sub(void* param_0, void* param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6163 = -180.0f; -COMPILER_STRIP_GATE(8062E6F8, &lit_6163); +COMPILER_STRIP_GATE(0x8062E6F8, &lit_6163); #pragma pop /* 8062E6FC-8062E700 0000C8 0004+00 0/3 0/0 0/0 .rodata @6164 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6164 = -200.0f; -COMPILER_STRIP_GATE(8062E6FC, &lit_6164); +COMPILER_STRIP_GATE(0x8062E6FC, &lit_6164); #pragma pop /* 8062E700-8062E704 0000CC 0004+00 0/1 0/0 0/0 .rodata @6165 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6165 = -239.0f; -COMPILER_STRIP_GATE(8062E700, &lit_6165); +COMPILER_STRIP_GATE(0x8062E700, &lit_6165); #pragma pop /* 8062E704-8062E708 0000D0 0004+00 0/1 0/0 0/0 .rodata @6166 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6166 = 1874.0f; -COMPILER_STRIP_GATE(8062E704, &lit_6166); +COMPILER_STRIP_GATE(0x8062E704, &lit_6166); #pragma pop /* 8062E708-8062E70C 0000D4 0004+00 0/1 0/0 0/0 .rodata @6167 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6167 = -202.0f; -COMPILER_STRIP_GATE(8062E708, &lit_6167); +COMPILER_STRIP_GATE(0x8062E708, &lit_6167); #pragma pop /* 8062E70C-8062E710 0000D8 0004+00 0/1 0/0 0/0 .rodata @6168 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6168 = 2251.0f; -COMPILER_STRIP_GATE(8062E70C, &lit_6168); +COMPILER_STRIP_GATE(0x8062E70C, &lit_6168); #pragma pop /* 8062E710-8062E714 0000DC 0004+00 0/4 0/0 0/0 .rodata @6169 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6169 = -350.0f; -COMPILER_STRIP_GATE(8062E710, &lit_6169); +COMPILER_STRIP_GATE(0x8062E710, &lit_6169); #pragma pop /* 8062E714-8062E718 0000E0 0004+00 0/2 0/0 0/0 .rodata @6170 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6170 = 2200.0f; -COMPILER_STRIP_GATE(8062E714, &lit_6170); +COMPILER_STRIP_GATE(0x8062E714, &lit_6170); #pragma pop /* 80622F64-8062318C 004464 0228+00 1/1 0/0 0/0 .text demo_skip__8daB_TN_cFi */ @@ -2215,137 +2222,137 @@ asm void daB_TN_c::executeRoomDemo() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6386 = 1850.0f; -COMPILER_STRIP_GATE(8062E718, &lit_6386); +COMPILER_STRIP_GATE(0x8062E718, &lit_6386); #pragma pop /* 8062E71C-8062E720 0000E8 0004+00 0/2 0/0 0/0 .rodata @6387 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6387 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(8062E71C, &lit_6387); +COMPILER_STRIP_GATE(0x8062E71C, &lit_6387); #pragma pop /* 8062E720-8062E724 0000EC 0004+00 0/0 0/0 0/0 .rodata @6388 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6388 = 1923.0f; -COMPILER_STRIP_GATE(8062E720, &lit_6388); +COMPILER_STRIP_GATE(0x8062E720, &lit_6388); #pragma pop /* 8062E724-8062E728 0000F0 0004+00 0/0 0/0 0/0 .rodata @6389 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6389 = 2173.0f; -COMPILER_STRIP_GATE(8062E724, &lit_6389); +COMPILER_STRIP_GATE(0x8062E724, &lit_6389); #pragma pop /* 8062E728-8062E72C 0000F4 0004+00 1/2 0/0 0/0 .rodata @6390 */ SECTION_RODATA static f32 const lit_6390 = 500.0f; -COMPILER_STRIP_GATE(8062E728, &lit_6390); +COMPILER_STRIP_GATE(0x8062E728, &lit_6390); /* 8062E72C-8062E730 0000F8 0004+00 0/2 0/0 0/0 .rodata @6391 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6391 = 400.0f; -COMPILER_STRIP_GATE(8062E72C, &lit_6391); +COMPILER_STRIP_GATE(0x8062E72C, &lit_6391); #pragma pop /* 8062E730-8062E734 0000FC 0004+00 0/0 0/0 0/0 .rodata @6392 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6392 = -170.0f; -COMPILER_STRIP_GATE(8062E730, &lit_6392); +COMPILER_STRIP_GATE(0x8062E730, &lit_6392); #pragma pop /* 8062E734-8062E738 000100 0004+00 0/0 0/0 0/0 .rodata @6393 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6393 = 1900.0f; -COMPILER_STRIP_GATE(8062E734, &lit_6393); +COMPILER_STRIP_GATE(0x8062E734, &lit_6393); #pragma pop /* 8062E738-8062E73C 000104 0004+00 0/1 0/0 0/0 .rodata @6394 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6394 = -250.0f; -COMPILER_STRIP_GATE(8062E738, &lit_6394); +COMPILER_STRIP_GATE(0x8062E738, &lit_6394); #pragma pop /* 8062E73C-8062E740 000108 0004+00 0/0 0/0 0/0 .rodata @6395 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6395 = 16.0f; -COMPILER_STRIP_GATE(8062E73C, &lit_6395); +COMPILER_STRIP_GATE(0x8062E73C, &lit_6395); #pragma pop /* 8062E740-8062E744 00010C 0004+00 0/0 0/0 0/0 .rodata @6396 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6396 = 2400.0f; -COMPILER_STRIP_GATE(8062E740, &lit_6396); +COMPILER_STRIP_GATE(0x8062E740, &lit_6396); #pragma pop /* 8062E744-8062E748 000110 0004+00 0/0 0/0 0/0 .rodata @6397 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6397 = -265.0f; -COMPILER_STRIP_GATE(8062E744, &lit_6397); +COMPILER_STRIP_GATE(0x8062E744, &lit_6397); #pragma pop /* 8062E748-8062E74C 000114 0004+00 0/0 0/0 0/0 .rodata @6398 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6398 = 1200.0f; -COMPILER_STRIP_GATE(8062E748, &lit_6398); +COMPILER_STRIP_GATE(0x8062E748, &lit_6398); #pragma pop /* 8062E74C-8062E750 000118 0004+00 0/0 0/0 0/0 .rodata @6399 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6399 = 423.0f; -COMPILER_STRIP_GATE(8062E74C, &lit_6399); +COMPILER_STRIP_GATE(0x8062E74C, &lit_6399); #pragma pop /* 8062E750-8062E754 00011C 0004+00 0/0 0/0 0/0 .rodata @6400 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6400 = -1841.0f; -COMPILER_STRIP_GATE(8062E750, &lit_6400); +COMPILER_STRIP_GATE(0x8062E750, &lit_6400); #pragma pop /* 8062E754-8062E758 000120 0004+00 0/0 0/0 0/0 .rodata @6401 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6401 = 370.0f; -COMPILER_STRIP_GATE(8062E754, &lit_6401); +COMPILER_STRIP_GATE(0x8062E754, &lit_6401); #pragma pop /* 8062E758-8062E75C 000124 0004+00 0/0 0/0 0/0 .rodata @6402 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6402 = -1442.0f; -COMPILER_STRIP_GATE(8062E758, &lit_6402); +COMPILER_STRIP_GATE(0x8062E758, &lit_6402); #pragma pop /* 8062E75C-8062E760 000128 0004+00 0/15 0/0 0/0 .rodata @6790 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6790 = 3.0f; -COMPILER_STRIP_GATE(8062E75C, &lit_6790); +COMPILER_STRIP_GATE(0x8062E75C, &lit_6790); #pragma pop /* 8062E760-8062E764 00012C 0004+00 0/1 0/0 0/0 .rodata @6791 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6791 = 2250.0f; -COMPILER_STRIP_GATE(8062E760, &lit_6791); +COMPILER_STRIP_GATE(0x8062E760, &lit_6791); #pragma pop /* 8062E764-8062E768 000130 0004+00 0/1 0/0 0/0 .rodata @6792 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6792 = 1300.0f; -COMPILER_STRIP_GATE(8062E764, &lit_6792); +COMPILER_STRIP_GATE(0x8062E764, &lit_6792); #pragma pop /* 80623920-806246E8 004E20 0DC8+00 2/1 0/0 0/0 .text executeOpening__8daB_TN_cFv */ @@ -2373,163 +2380,163 @@ asm void daB_TN_c::executeWaitH() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6793 = 380.0f; -COMPILER_STRIP_GATE(8062E768, &lit_6793); +COMPILER_STRIP_GATE(0x8062E768, &lit_6793); #pragma pop /* 8062E76C-8062E770 000138 0004+00 0/0 0/0 0/0 .rodata @6794 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6794 = 220.0f; -COMPILER_STRIP_GATE(8062E76C, &lit_6794); +COMPILER_STRIP_GATE(0x8062E76C, &lit_6794); #pragma pop /* 8062E770-8062E774 00013C 0004+00 0/0 0/0 0/0 .rodata @6795 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6795 = -210.0f; -COMPILER_STRIP_GATE(8062E770, &lit_6795); +COMPILER_STRIP_GATE(0x8062E770, &lit_6795); #pragma pop /* 8062E774-8062E778 000140 0004+00 0/7 0/0 0/0 .rodata @6796 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6796 = 15.0f; -COMPILER_STRIP_GATE(8062E774, &lit_6796); +COMPILER_STRIP_GATE(0x8062E774, &lit_6796); #pragma pop /* 8062E778-8062E77C 000144 0004+00 0/2 0/0 0/0 .rodata @6797 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6797 = -400.0f; -COMPILER_STRIP_GATE(8062E778, &lit_6797); +COMPILER_STRIP_GATE(0x8062E778, &lit_6797); #pragma pop /* 8062E77C-8062E780 000148 0004+00 0/0 0/0 0/0 .rodata @6798 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6798 = 600.0f; -COMPILER_STRIP_GATE(8062E77C, &lit_6798); +COMPILER_STRIP_GATE(0x8062E77C, &lit_6798); #pragma pop /* 8062E780-8062E784 00014C 0004+00 0/6 0/0 0/0 .rodata @6799 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6799 = 20.0f; -COMPILER_STRIP_GATE(8062E780, &lit_6799); +COMPILER_STRIP_GATE(0x8062E780, &lit_6799); #pragma pop /* 8062E784-8062E788 000150 0004+00 0/0 0/0 0/0 .rodata @6800 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6800 = 111.0f; -COMPILER_STRIP_GATE(8062E784, &lit_6800); +COMPILER_STRIP_GATE(0x8062E784, &lit_6800); #pragma pop /* 8062E788-8062E78C 000154 0004+00 0/0 0/0 0/0 .rodata @6801 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6801 = 148.0f; -COMPILER_STRIP_GATE(8062E788, &lit_6801); +COMPILER_STRIP_GATE(0x8062E788, &lit_6801); #pragma pop /* 8062E78C-8062E790 000158 0004+00 0/4 0/0 0/0 .rodata @6802 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6802 = 8.0f; -COMPILER_STRIP_GATE(8062E78C, &lit_6802); +COMPILER_STRIP_GATE(0x8062E78C, &lit_6802); #pragma pop /* 8062E790-8062E794 00015C 0004+00 0/2 0/0 0/0 .rodata @6803 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6803 = 33.0f; -COMPILER_STRIP_GATE(8062E790, &lit_6803); +COMPILER_STRIP_GATE(0x8062E790, &lit_6803); #pragma pop /* 8062E794-8062E798 000160 0004+00 0/0 0/0 0/0 .rodata @6804 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6804 = 105.0f; -COMPILER_STRIP_GATE(8062E794, &lit_6804); +COMPILER_STRIP_GATE(0x8062E794, &lit_6804); #pragma pop /* 8062E798-8062E79C 000164 0004+00 0/0 0/0 0/0 .rodata @6805 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6805 = 57.0f; -COMPILER_STRIP_GATE(8062E798, &lit_6805); +COMPILER_STRIP_GATE(0x8062E798, &lit_6805); #pragma pop /* 8062E79C-8062E7A0 000168 0004+00 0/0 0/0 0/0 .rodata @6806 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6806 = 62.0f; -COMPILER_STRIP_GATE(8062E79C, &lit_6806); +COMPILER_STRIP_GATE(0x8062E79C, &lit_6806); #pragma pop /* 8062E7A0-8062E7A4 00016C 0004+00 0/0 0/0 0/0 .rodata @6807 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6807 = 98.0f; -COMPILER_STRIP_GATE(8062E7A0, &lit_6807); +COMPILER_STRIP_GATE(0x8062E7A0, &lit_6807); #pragma pop /* 8062E7A4-8062E7A8 000170 0004+00 0/0 0/0 0/0 .rodata @6808 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6808 = 58.0f; -COMPILER_STRIP_GATE(8062E7A4, &lit_6808); +COMPILER_STRIP_GATE(0x8062E7A4, &lit_6808); #pragma pop /* 8062E7A8-8062E7AC 000174 0004+00 0/0 0/0 0/0 .rodata @6809 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6809 = 126.0f; -COMPILER_STRIP_GATE(8062E7A8, &lit_6809); +COMPILER_STRIP_GATE(0x8062E7A8, &lit_6809); #pragma pop /* 8062E7AC-8062E7B0 000178 0004+00 0/0 0/0 0/0 .rodata @6810 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6810 = -225.0f; -COMPILER_STRIP_GATE(8062E7AC, &lit_6810); +COMPILER_STRIP_GATE(0x8062E7AC, &lit_6810); #pragma pop /* 8062E7B0-8062E7B4 00017C 0004+00 0/0 0/0 0/0 .rodata @6811 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6811 = -109.0f; -COMPILER_STRIP_GATE(8062E7B0, &lit_6811); +COMPILER_STRIP_GATE(0x8062E7B0, &lit_6811); #pragma pop /* 8062E7B4-8062E7B8 000180 0004+00 0/0 0/0 0/0 .rodata @6812 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6812 = 430.0f; -COMPILER_STRIP_GATE(8062E7B4, &lit_6812); +COMPILER_STRIP_GATE(0x8062E7B4, &lit_6812); #pragma pop /* 8062E7B8-8062E7BC 000184 0004+00 0/0 0/0 0/0 .rodata @6813 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6813 = 160.0f; -COMPILER_STRIP_GATE(8062E7B8, &lit_6813); +COMPILER_STRIP_GATE(0x8062E7B8, &lit_6813); #pragma pop /* 8062E7BC-8062E7C0 000188 0004+00 0/1 0/0 0/0 .rodata @6814 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6814 = -300.0f; -COMPILER_STRIP_GATE(8062E7BC, &lit_6814); +COMPILER_STRIP_GATE(0x8062E7BC, &lit_6814); #pragma pop /* 8062E7C0-8062E7C4 00018C 0004+00 1/2 0/0 0/0 .rodata @6847 */ SECTION_RODATA static f32 const lit_6847 = 17.0f; -COMPILER_STRIP_GATE(8062E7C0, &lit_6847); +COMPILER_STRIP_GATE(0x8062E7C0, &lit_6847); /* 8062E7C4-8062E7C8 000190 0004+00 1/2 0/0 0/0 .rodata @6848 */ SECTION_RODATA static f32 const lit_6848 = 36.0f; -COMPILER_STRIP_GATE(8062E7C4, &lit_6848); +COMPILER_STRIP_GATE(0x8062E7C4, &lit_6848); /* 806247D8-80624890 005CD8 00B8+00 1/1 0/0 0/0 .text setAwaitSound__8daB_TN_cFv */ #pragma push @@ -2546,35 +2553,35 @@ asm void daB_TN_c::setAwaitSound() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7021 = 800.0f; -COMPILER_STRIP_GATE(8062E7C8, &lit_7021); +COMPILER_STRIP_GATE(0x8062E7C8, &lit_7021); #pragma pop /* 8062E7CC-8062E7D0 000198 0004+00 0/1 0/0 0/0 .rodata @7022 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7022 = 43.0f / 10.0f; -COMPILER_STRIP_GATE(8062E7CC, &lit_7022); +COMPILER_STRIP_GATE(0x8062E7CC, &lit_7022); #pragma pop /* 8062E7D0-8062E7D4 00019C 0004+00 0/4 0/0 0/0 .rodata @7023 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7023 = 23.0f; -COMPILER_STRIP_GATE(8062E7D0, &lit_7023); +COMPILER_STRIP_GATE(0x8062E7D0, &lit_7023); #pragma pop /* 8062E7D4-8062E7D8 0001A0 0004+00 0/1 0/0 0/0 .rodata @7024 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7024 = 23.0f / 10.0f; -COMPILER_STRIP_GATE(8062E7D4, &lit_7024); +COMPILER_STRIP_GATE(0x8062E7D4, &lit_7024); #pragma pop /* 8062E7D8-8062E7DC 0001A4 0004+00 0/1 0/0 0/0 .rodata @7025 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7025 = 90.0f; -COMPILER_STRIP_GATE(8062E7D8, &lit_7025); +COMPILER_STRIP_GATE(0x8062E7D8, &lit_7025); #pragma pop /* 80624890-80625394 005D90 0B04+00 1/1 0/0 0/0 .text executeChaseH__8daB_TN_cFv */ @@ -2602,49 +2609,49 @@ asm void daB_TN_c::checkStartAttackH() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7243 = 72.0f; -COMPILER_STRIP_GATE(8062E7DC, &lit_7243); +COMPILER_STRIP_GATE(0x8062E7DC, &lit_7243); #pragma pop /* 8062E7E0-8062E7E4 0001AC 0004+00 0/2 0/0 0/0 .rodata @7244 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7244 = 29.0f; -COMPILER_STRIP_GATE(8062E7E0, &lit_7244); +COMPILER_STRIP_GATE(0x8062E7E0, &lit_7244); #pragma pop /* 8062E7E4-8062E7E8 0001B0 0004+00 0/3 0/0 0/0 .rodata @7245 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7245 = 11.0f; -COMPILER_STRIP_GATE(8062E7E4, &lit_7245); +COMPILER_STRIP_GATE(0x8062E7E4, &lit_7245); #pragma pop /* 8062E7E8-8062E7EC 0001B4 0004+00 0/3 0/0 0/0 .rodata @7246 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7246 = 19.0f; -COMPILER_STRIP_GATE(8062E7E8, &lit_7246); +COMPILER_STRIP_GATE(0x8062E7E8, &lit_7246); #pragma pop /* 8062E7EC-8062E7F0 0001B8 0004+00 0/3 0/0 0/0 .rodata @7247 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7247 = 22.0f; -COMPILER_STRIP_GATE(8062E7EC, &lit_7247); +COMPILER_STRIP_GATE(0x8062E7EC, &lit_7247); #pragma pop /* 8062E7F0-8062E7F4 0001BC 0004+00 0/1 0/0 0/0 .rodata @7248 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7248 = 66.0f; -COMPILER_STRIP_GATE(8062E7F0, &lit_7248); +COMPILER_STRIP_GATE(0x8062E7F0, &lit_7248); #pragma pop /* 8062E7F4-8062E7F8 0001C0 0004+00 0/5 0/0 0/0 .rodata @7249 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7249 = 26.0f; -COMPILER_STRIP_GATE(8062E7F4, &lit_7249); +COMPILER_STRIP_GATE(0x8062E7F4, &lit_7249); #pragma pop /* 806255F0-80625C74 006AF0 0684+00 1/1 0/0 0/0 .text executeAttackH__8daB_TN_cFv */ @@ -2662,21 +2669,21 @@ asm void daB_TN_c::executeAttackH() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7293 = 4.0f; -COMPILER_STRIP_GATE(8062E7F8, &lit_7293); +COMPILER_STRIP_GATE(0x8062E7F8, &lit_7293); #pragma pop /* 8062E7FC-8062E800 0001C8 0004+00 0/1 0/0 0/0 .rodata @7294 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7294 = 21.0f; -COMPILER_STRIP_GATE(8062E7FC, &lit_7294); +COMPILER_STRIP_GATE(0x8062E7FC, &lit_7294); #pragma pop /* 8062E800-8062E804 0001CC 0004+00 0/3 0/0 0/0 .rodata @7295 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7295 = 9.0f; -COMPILER_STRIP_GATE(8062E800, &lit_7295); +COMPILER_STRIP_GATE(0x8062E800, &lit_7295); #pragma pop /* 80625C74-80625E40 007174 01CC+00 1/1 0/0 0/0 .text executeAttackShieldH__8daB_TN_cFv @@ -2715,63 +2722,63 @@ asm void daB_TN_c::executeDamageH() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7807 = -179.0f; -COMPILER_STRIP_GATE(8062E804, &lit_7807); +COMPILER_STRIP_GATE(0x8062E804, &lit_7807); #pragma pop /* 8062E808-8062E80C 0001D4 0004+00 0/1 0/0 0/0 .rodata @7808 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7808 = -342.0f; -COMPILER_STRIP_GATE(8062E808, &lit_7808); +COMPILER_STRIP_GATE(0x8062E808, &lit_7808); #pragma pop /* 8062E80C-8062E810 0001D8 0004+00 0/3 0/0 0/0 .rodata @7809 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7809 = 37.0f; -COMPILER_STRIP_GATE(8062E80C, &lit_7809); +COMPILER_STRIP_GATE(0x8062E80C, &lit_7809); #pragma pop /* 8062E810-8062E814 0001DC 0004+00 0/3 0/0 0/0 .rodata @7810 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7810 = 6.0f; -COMPILER_STRIP_GATE(8062E810, &lit_7810); +COMPILER_STRIP_GATE(0x8062E810, &lit_7810); #pragma pop /* 8062E814-8062E818 0001E0 0004+00 0/1 0/0 0/0 .rodata @7811 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7811 = -330.0f; -COMPILER_STRIP_GATE(8062E814, &lit_7811); +COMPILER_STRIP_GATE(0x8062E814, &lit_7811); #pragma pop /* 8062E818-8062E81C 0001E4 0004+00 0/1 0/0 0/0 .rodata @7812 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7812 = 1250.0f; -COMPILER_STRIP_GATE(8062E818, &lit_7812); +COMPILER_STRIP_GATE(0x8062E818, &lit_7812); #pragma pop /* 8062E81C-8062E820 0001E8 0004+00 0/1 0/0 0/0 .rodata @7813 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7813 = -380.0f; -COMPILER_STRIP_GATE(8062E81C, &lit_7813); +COMPILER_STRIP_GATE(0x8062E81C, &lit_7813); #pragma pop /* 8062E820-8062E824 0001EC 0004+00 0/1 0/0 0/0 .rodata @7814 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7814 = -270.0f; -COMPILER_STRIP_GATE(8062E820, &lit_7814); +COMPILER_STRIP_GATE(0x8062E820, &lit_7814); #pragma pop /* 8062E824-8062E828 0001F0 0004+00 0/2 0/0 0/0 .rodata @7815 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7815 = -100.0f; -COMPILER_STRIP_GATE(8062E824, &lit_7815); +COMPILER_STRIP_GATE(0x8062E824, &lit_7815); #pragma pop /* 80626320-80627100 007820 0DE0+00 1/1 0/0 0/0 .text executeChangeDemo__8daB_TN_cFv */ @@ -2789,7 +2796,7 @@ asm void daB_TN_c::executeChangeDemo() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7949 = 45.0f; -COMPILER_STRIP_GATE(8062E828, &lit_7949); +COMPILER_STRIP_GATE(0x8062E828, &lit_7949); #pragma pop /* 80627100-80627790 008600 0690+00 1/1 0/0 0/0 .text executeZakoChangeDemo__8daB_TN_cFv @@ -2808,7 +2815,7 @@ asm void daB_TN_c::executeZakoChangeDemo() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8010 = 550.0f; -COMPILER_STRIP_GATE(8062E82C, &lit_8010); +COMPILER_STRIP_GATE(0x8062E82C, &lit_8010); #pragma pop /* 80627790-8062799C 008C90 020C+00 1/1 0/0 0/0 .text setWalkDir__8daB_TN_cFv */ @@ -2846,35 +2853,35 @@ asm void daB_TN_c::checkAttackAble() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8049 = 47.0f / 10.0f; -COMPILER_STRIP_GATE(8062E830, &lit_8049); +COMPILER_STRIP_GATE(0x8062E830, &lit_8049); #pragma pop /* 8062E834-8062E838 000200 0004+00 0/0 0/0 0/0 .rodata @8050 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8050 = 24.0f / 5.0f; -COMPILER_STRIP_GATE(8062E834, &lit_8050); +COMPILER_STRIP_GATE(0x8062E834, &lit_8050); #pragma pop /* 8062E838-8062E83C 000204 0004+00 0/3 0/0 0/0 .rodata @8302 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8302 = 28.0f; -COMPILER_STRIP_GATE(8062E838, &lit_8302); +COMPILER_STRIP_GATE(0x8062E838, &lit_8302); #pragma pop /* 8062E83C-8062E840 000208 0004+00 0/2 0/0 0/0 .rodata @8303 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8303 = 450.0f; -COMPILER_STRIP_GATE(8062E83C, &lit_8303); +COMPILER_STRIP_GATE(0x8062E83C, &lit_8303); #pragma pop /* 8062E840-8062E844 00020C 0004+00 0/1 0/0 0/0 .rodata @8304 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8304 = 2.0f / 5.0f; -COMPILER_STRIP_GATE(8062E840, &lit_8304); +COMPILER_STRIP_GATE(0x8062E840, &lit_8304); #pragma pop /* 80627D3C-8062868C 00923C 0950+00 1/1 0/0 0/0 .text checkNextMove__8daB_TN_cFv */ @@ -2902,56 +2909,56 @@ asm void daB_TN_c::executeChaseL() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8590 = 13.0f; -COMPILER_STRIP_GATE(8062E844, &lit_8590); +COMPILER_STRIP_GATE(0x8062E844, &lit_8590); #pragma pop /* 8062E848-8062E84C 000214 0004+00 0/1 0/0 0/0 .rodata @8591 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8591 = 27.0f; -COMPILER_STRIP_GATE(8062E848, &lit_8591); +COMPILER_STRIP_GATE(0x8062E848, &lit_8591); #pragma pop /* 8062E84C-8062E850 000218 0004+00 0/1 0/0 0/0 .rodata @8592 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8592 = -4.0f; -COMPILER_STRIP_GATE(8062E84C, &lit_8592); +COMPILER_STRIP_GATE(0x8062E84C, &lit_8592); #pragma pop /* 8062E850-8062E854 00021C 0004+00 0/1 0/0 0/0 .rodata @8823 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8823 = 14.0f; -COMPILER_STRIP_GATE(8062E850, &lit_8823); +COMPILER_STRIP_GATE(0x8062E850, &lit_8823); #pragma pop /* 8062E854-8062E858 000220 0004+00 0/1 0/0 0/0 .rodata @8824 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8824 = 52.0f; -COMPILER_STRIP_GATE(8062E854, &lit_8824); +COMPILER_STRIP_GATE(0x8062E854, &lit_8824); #pragma pop /* 8062E858-8062E85C 000224 0004+00 0/1 0/0 0/0 .rodata @8825 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8825 = 38.0f; -COMPILER_STRIP_GATE(8062E858, &lit_8825); +COMPILER_STRIP_GATE(0x8062E858, &lit_8825); #pragma pop /* 8062E85C-8062E860 000228 0004+00 0/1 0/0 0/0 .rodata @8826 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8826 = 53.0f; -COMPILER_STRIP_GATE(8062E85C, &lit_8826); +COMPILER_STRIP_GATE(0x8062E85C, &lit_8826); #pragma pop /* 8062E860-8062E864 00022C 0004+00 0/1 0/0 0/0 .rodata @8827 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8827 = 41.0f; -COMPILER_STRIP_GATE(8062E860, &lit_8827); +COMPILER_STRIP_GATE(0x8062E860, &lit_8827); #pragma pop /* 806292F8-80629D20 00A7F8 0A28+00 1/1 0/0 0/0 .text executeAttackL__8daB_TN_cFv */ @@ -2969,7 +2976,7 @@ asm void daB_TN_c::executeAttackL() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8895 = 12.0f; -COMPILER_STRIP_GATE(8062E864, &lit_8895); +COMPILER_STRIP_GATE(0x8062E864, &lit_8895); #pragma pop /* 80629D20-80629FB0 00B220 0290+00 1/1 0/0 0/0 .text executeAttackShieldL__8daB_TN_cFv @@ -2998,7 +3005,7 @@ asm void daB_TN_c::executeGuardL() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9070 = 32.0f; -COMPILER_STRIP_GATE(8062E868, &lit_9070); +COMPILER_STRIP_GATE(0x8062E868, &lit_9070); #pragma pop /* 8062A3D0-8062A71C 00B8D0 034C+00 1/1 0/0 0/0 .text executeDamageL__8daB_TN_cFv */ @@ -3026,84 +3033,84 @@ asm void daB_TN_c::executeYoroke() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9401 = -5.0f; -COMPILER_STRIP_GATE(8062E86C, &lit_9401); +COMPILER_STRIP_GATE(0x8062E86C, &lit_9401); #pragma pop /* 8062E870-8062E874 00023C 0004+00 0/1 0/0 0/0 .rodata @9402 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9402 = -217.0f; -COMPILER_STRIP_GATE(8062E870, &lit_9402); +COMPILER_STRIP_GATE(0x8062E870, &lit_9402); #pragma pop /* 8062E874-8062E878 000240 0004+00 0/1 0/0 0/0 .rodata @9403 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9403 = -61.0f; -COMPILER_STRIP_GATE(8062E874, &lit_9403); +COMPILER_STRIP_GATE(0x8062E874, &lit_9403); #pragma pop /* 8062E878-8062E87C 000244 0004+00 0/1 0/0 0/0 .rodata @9404 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9404 = 212.0f; -COMPILER_STRIP_GATE(8062E878, &lit_9404); +COMPILER_STRIP_GATE(0x8062E878, &lit_9404); #pragma pop /* 8062E87C-8062E880 000248 0004+00 0/1 0/0 0/0 .rodata @9405 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9405 = 94.0f; -COMPILER_STRIP_GATE(8062E87C, &lit_9405); +COMPILER_STRIP_GATE(0x8062E87C, &lit_9405); #pragma pop /* 8062E880-8062E884 00024C 0004+00 0/1 0/0 0/0 .rodata @9406 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9406 = 103.0f; -COMPILER_STRIP_GATE(8062E880, &lit_9406); +COMPILER_STRIP_GATE(0x8062E880, &lit_9406); #pragma pop /* 8062E884-8062E888 000250 0004+00 0/1 0/0 0/0 .rodata @9407 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9407 = 121.0f; -COMPILER_STRIP_GATE(8062E884, &lit_9407); +COMPILER_STRIP_GATE(0x8062E884, &lit_9407); #pragma pop /* 8062E888-8062E88C 000254 0004+00 0/1 0/0 0/0 .rodata @9408 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9408 = 147.0f; -COMPILER_STRIP_GATE(8062E888, &lit_9408); +COMPILER_STRIP_GATE(0x8062E888, &lit_9408); #pragma pop /* 8062E88C-8062E890 000258 0004+00 0/1 0/0 0/0 .rodata @9409 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9409 = 168.0f; -COMPILER_STRIP_GATE(8062E88C, &lit_9409); +COMPILER_STRIP_GATE(0x8062E88C, &lit_9409); #pragma pop /* 8062E890-8062E894 00025C 0004+00 0/1 0/0 0/0 .rodata @9410 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9410 = 289.0f; -COMPILER_STRIP_GATE(8062E890, &lit_9410); +COMPILER_STRIP_GATE(0x8062E890, &lit_9410); #pragma pop /* 8062E894-8062E898 000260 0004+00 0/1 0/0 0/0 .rodata @9411 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9411 = 312.0f; -COMPILER_STRIP_GATE(8062E894, &lit_9411); +COMPILER_STRIP_GATE(0x8062E894, &lit_9411); #pragma pop /* 8062E898-8062E89C 000264 0004+00 0/3 0/0 0/0 .rodata @9412 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9412 = -50.0f; -COMPILER_STRIP_GATE(8062E898, &lit_9412); +COMPILER_STRIP_GATE(0x8062E898, &lit_9412); #pragma pop /* 8062A950-8062B344 00BE50 09F4+00 1/1 0/0 0/0 .text executeEnding__8daB_TN_cFv */ @@ -3121,7 +3128,7 @@ asm void daB_TN_c::executeEnding() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9502 = 68.0f; -COMPILER_STRIP_GATE(8062E89C, &lit_9502); +COMPILER_STRIP_GATE(0x8062E89C, &lit_9502); #pragma pop /* 8062B344-8062B6A8 00C844 0364+00 1/1 0/0 0/0 .text executeZakoEnding__8daB_TN_cFv */ @@ -3149,28 +3156,28 @@ asm void daB_TN_c::action() { #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_9572 = 0x3B449BA6; -COMPILER_STRIP_GATE(8062E8A0, &lit_9572); +COMPILER_STRIP_GATE(0x8062E8A0, &lit_9572); #pragma pop /* 8062E8A4-8062E8A8 000270 0004+00 0/1 0/0 0/0 .rodata @9689 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_9689 = 0x414A6666; -COMPILER_STRIP_GATE(8062E8A4, &lit_9689); +COMPILER_STRIP_GATE(0x8062E8A4, &lit_9689); #pragma pop /* 8062E8A8-8062E8AC 000274 0004+00 0/1 0/0 0/0 .rodata @9690 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_9690 = 0x4157851F; -COMPILER_STRIP_GATE(8062E8A8, &lit_9690); +COMPILER_STRIP_GATE(0x8062E8A8, &lit_9690); #pragma pop /* 8062E8AC-8062E8B0 000278 0004+00 0/1 0/0 0/0 .rodata @9691 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_9691 = 0x41A08F5C; -COMPILER_STRIP_GATE(8062E8AC, &lit_9691); +COMPILER_STRIP_GATE(0x8062E8AC, &lit_9691); #pragma pop /* 8062BA5C-8062BDCC 00CF5C 0370+00 1/1 0/0 0/0 .text mtx_set__8daB_TN_cFv */ @@ -3188,28 +3195,28 @@ asm void daB_TN_c::mtx_set() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9919 = 65.0f; -COMPILER_STRIP_GATE(8062E8B0, &lit_9919); +COMPILER_STRIP_GATE(0x8062E8B0, &lit_9919); #pragma pop /* 8062E8B4-8062E8B8 000280 0004+00 0/2 0/0 0/0 .rodata @9920 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9920 = -20.0f; -COMPILER_STRIP_GATE(8062E8B4, &lit_9920); +COMPILER_STRIP_GATE(0x8062E8B4, &lit_9920); #pragma pop /* 8062E8B8-8062E8BC 000284 0004+00 0/1 0/0 0/0 .rodata @9921 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9921 = -6.0f; -COMPILER_STRIP_GATE(8062E8B8, &lit_9921); +COMPILER_STRIP_GATE(0x8062E8B8, &lit_9921); #pragma pop /* 8062E8BC-8062E8C0 000288 0004+00 0/1 0/0 0/0 .rodata @9922 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9922 = -10.0f; -COMPILER_STRIP_GATE(8062E8BC, &lit_9922); +COMPILER_STRIP_GATE(0x8062E8BC, &lit_9922); #pragma pop /* 8062BDCC-8062C5B4 00D2CC 07E8+00 1/1 0/0 0/0 .text cc_set__8daB_TN_cFv */ @@ -3225,7 +3232,7 @@ asm void daB_TN_c::cc_set() { /* ############################################################################################## */ /* 8062E8C0-8062E8C4 00028C 0004+00 1/1 0/0 0/0 .rodata @9978 */ SECTION_RODATA static f32 const lit_9978 = 1.5f; -COMPILER_STRIP_GATE(8062E8C0, &lit_9978); +COMPILER_STRIP_GATE(0x8062E8C0, &lit_9978); /* 8062E8C4-8062E8CC 000290 0004+04 1/1 0/0 0/0 .rodata @9979 */ SECTION_RODATA static f32 const lit_9979[1 + 1 /* padding */] = { @@ -3233,7 +3240,7 @@ SECTION_RODATA static f32 const lit_9979[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(8062E8C4, &lit_9979); +COMPILER_STRIP_GATE(0x8062E8C4, &lit_9979); /* 8062C5B4-8062C7A0 00DAB4 01EC+00 1/1 0/0 0/0 .text execute__8daB_TN_cFv */ #pragma push @@ -3280,6 +3287,14 @@ static asm void daB_TN_Delete(daB_TN_c* param_0) { } #pragma pop +/* ############################################################################################## */ +/* 8062E8E8-8062E8E8 0002B4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8062E8ED = "B_tnp"; +SECTION_DEAD static char const* const stringBase_8062E8F3 = "B_tnp2"; +#pragma pop + /* 8062C868-8062CD10 00DD68 04A8+00 1/1 0/0 0/0 .text CreateHeap__8daB_TN_cFv */ #pragma push #pragma optimization_level 0 @@ -3317,7 +3332,13 @@ static asm void useHeapInit(fopAc_ac_c* param_0) { SECTION_RODATA static u8 const lit_10331[8] = { 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8062E8CC, &lit_10331); +COMPILER_STRIP_GATE(0x8062E8CC, &lit_10331); +#pragma pop + +/* 8062E8E8-8062E8E8 0002B4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8062E8FA = "D_MN09"; #pragma pop /* 8062CD78-8062D2F0 00E278 0578+00 1/1 0/0 0/0 .text create__8daB_TN_cFv */ @@ -3455,35 +3476,35 @@ asm daB_TN_HIO_c::~daB_TN_HIO_c() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10688 = -12.0f; -COMPILER_STRIP_GATE(8062E8D4, &lit_10688); +COMPILER_STRIP_GATE(0x8062E8D4, &lit_10688); #pragma pop /* 8062E8D8-8062E8DC 0002A4 0004+00 0/1 0/0 0/0 .rodata @10689 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10689 = -17.0f; -COMPILER_STRIP_GATE(8062E8D8, &lit_10689); +COMPILER_STRIP_GATE(0x8062E8D8, &lit_10689); #pragma pop /* 8062E8DC-8062E8E0 0002A8 0004+00 0/1 0/0 0/0 .rodata @10690 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10690 = -30.0f; -COMPILER_STRIP_GATE(8062E8DC, &lit_10690); +COMPILER_STRIP_GATE(0x8062E8DC, &lit_10690); #pragma pop /* 8062E8E0-8062E8E4 0002AC 0004+00 0/1 0/0 0/0 .rodata @10691 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10691 = -40.0f; -COMPILER_STRIP_GATE(8062E8E0, &lit_10691); +COMPILER_STRIP_GATE(0x8062E8E0, &lit_10691); #pragma pop /* 8062E8E4-8062E8E8 0002B0 0004+00 0/1 0/0 0/0 .rodata @10692 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10692 = -15.0f; -COMPILER_STRIP_GATE(8062E8E4, &lit_10692); +COMPILER_STRIP_GATE(0x8062E8E4, &lit_10692); #pragma pop /* 8062D9D4-8062E16C 00EED4 0798+00 0/0 1/0 0/0 .text __sinit_d_a_b_tn_cpp */ @@ -3498,7 +3519,7 @@ asm void __sinit_d_a_b_tn_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_8062D9D4 = (void*)__sinit_d_a_b_tn_cpp; +REGISTER_CTORS(0x8062D9D4, __sinit_d_a_b_tn_cpp); #pragma pop /* 8062E16C-8062E174 00F66C 0008+00 1/0 0/0 0/0 .text @36@__dt__12dBgS_ObjAcchFv */ @@ -3735,12 +3756,4 @@ static u8 data_8062F360[4]; static u8 data_8062F364[4]; #pragma pop -/* 8062E8E8-8062E901 0002B4 0019+00 7/7 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_8062E8E8 = "B_tn"; -SECTION_DEAD static char const* const stringBase_8062E8ED = "B_tnp"; -SECTION_DEAD static char const* const stringBase_8062E8F3 = "B_tnp2"; -SECTION_DEAD static char const* const stringBase_8062E8FA = "D_MN09"; -#pragma pop +/* 8062E8E8-8062E8E8 0002B4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/b/d_a_b_yo/d_a_b_yo.cpp b/rel/d/a/b/d_a_b_yo/d_a_b_yo.cpp index 387345a0d8e..0c86eebdaf5 100644 --- a/rel/d/a/b/d_a_b_yo/d_a_b_yo.cpp +++ b/rel/d/a/b/d_a_b_yo/d_a_b_yo.cpp @@ -44,12 +44,12 @@ struct mDoGph_gInf_c { /* 80008078 */ void onBlure(); }; +struct J3DAnmTextureSRTKey {}; + struct J3DAnmTexPattern {}; struct J3DAnmTevRegKey {}; -struct J3DAnmTextureSRTKey {}; - struct J3DMaterialTable { /* 8032F6F8 */ void removeTexNoAnimator(J3DAnmTexPattern*); /* 8032F7B4 */ void removeTexMtxAnimator(J3DAnmTextureSRTKey*); @@ -75,16 +75,16 @@ struct mDoExt_baseAnm { /* 8000D428 */ void play(); }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; - struct J3DAnmTransform {}; +struct J3DModelData {}; + +struct Z2Creature {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -687,80 +687,80 @@ extern "C" void demoDelete__8daE_FZ_cFv(); /* ############################################################################################## */ /* 806397F4-806397F8 000000 0004+00 25/25 0/0 0/0 .rodata @3788 */ SECTION_RODATA static f32 const lit_3788 = 7.0f; -COMPILER_STRIP_GATE(806397F4, &lit_3788); +COMPILER_STRIP_GATE(0x806397F4, &lit_3788); /* 806397F8-806397FC 000004 0004+00 0/1 0/0 0/0 .rodata @3789 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3789 = 6.0f; -COMPILER_STRIP_GATE(806397F8, &lit_3789); +COMPILER_STRIP_GATE(0x806397F8, &lit_3789); #pragma pop /* 806397FC-80639800 000008 0004+00 0/6 0/0 0/0 .rodata @3790 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3790 = 5.0f; -COMPILER_STRIP_GATE(806397FC, &lit_3790); +COMPILER_STRIP_GATE(0x806397FC, &lit_3790); #pragma pop /* 80639800-80639804 00000C 0004+00 0/2 0/0 0/0 .rodata @3791 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3791 = 4.0f; -COMPILER_STRIP_GATE(80639800, &lit_3791); +COMPILER_STRIP_GATE(0x80639800, &lit_3791); #pragma pop /* 80639804-80639808 000010 0004+00 0/7 0/0 0/0 .rodata @3792 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3792 = 3.0f; -COMPILER_STRIP_GATE(80639804, &lit_3792); +COMPILER_STRIP_GATE(0x80639804, &lit_3792); #pragma pop /* 80639808-8063980C 000014 0004+00 0/5 0/0 0/0 .rodata @3793 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3793 = 2.0f; -COMPILER_STRIP_GATE(80639808, &lit_3793); +COMPILER_STRIP_GATE(0x80639808, &lit_3793); #pragma pop /* 8063980C-80639810 000018 0004+00 0/3 0/0 0/0 .rodata @3794 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3794 = 1.5f; -COMPILER_STRIP_GATE(8063980C, &lit_3794); +COMPILER_STRIP_GATE(0x8063980C, &lit_3794); #pragma pop /* 80639810-80639814 00001C 0004+00 7/25 0/0 0/0 .rodata @3795 */ SECTION_RODATA static f32 const lit_3795 = 1.0f; -COMPILER_STRIP_GATE(80639810, &lit_3795); +COMPILER_STRIP_GATE(0x80639810, &lit_3795); /* 80639814-80639818 000020 0004+00 0/9 0/0 0/0 .rodata @3796 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3796 = 20.0f; -COMPILER_STRIP_GATE(80639814, &lit_3796); +COMPILER_STRIP_GATE(0x80639814, &lit_3796); #pragma pop /* 80639818-8063981C 000024 0004+00 0/1 0/0 0/0 .rodata @3797 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3797 = 2.5f; -COMPILER_STRIP_GATE(80639818, &lit_3797); +COMPILER_STRIP_GATE(0x80639818, &lit_3797); #pragma pop /* 8063981C-80639820 000028 0004+00 0/2 0/0 0/0 .rodata @3798 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3798 = -100.0f; -COMPILER_STRIP_GATE(8063981C, &lit_3798); +COMPILER_STRIP_GATE(0x8063981C, &lit_3798); #pragma pop /* 80639820-80639824 00002C 0004+00 0/4 0/0 0/0 .rodata @3799 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3799 = 60.0f; -COMPILER_STRIP_GATE(80639820, &lit_3799); +COMPILER_STRIP_GATE(0x80639820, &lit_3799); #pragma pop /* 80639824-80639828 000030 0004+00 3/24 0/0 0/0 .rodata @3800 */ @@ -770,13 +770,13 @@ SECTION_RODATA static u8 const lit_3800[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80639824, &lit_3800); +COMPILER_STRIP_GATE(0x80639824, &lit_3800); /* 80639828-8063982C 000034 0004+00 0/3 0/0 0/0 .rodata @3801 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3801 = 3000.0f; -COMPILER_STRIP_GATE(80639828, &lit_3801); +COMPILER_STRIP_GATE(0x80639828, &lit_3801); #pragma pop /* 80639A60-80639A6C 000000 000C+00 4/4 0/0 0/0 .data cNullVec__6Z2Calc */ @@ -1190,21 +1190,21 @@ asm daB_YO_HIO_c::daB_YO_HIO_c() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4078 = 255.0f; -COMPILER_STRIP_GATE(8063982C, &lit_4078); +COMPILER_STRIP_GATE(0x8063982C, &lit_4078); #pragma pop /* 80639830-80639834 00003C 0004+00 0/10 0/0 0/0 .rodata @4079 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4079 = 100.0f; -COMPILER_STRIP_GATE(80639830, &lit_4079); +COMPILER_STRIP_GATE(0x80639830, &lit_4079); #pragma pop /* 80639834-80639838 000040 0004+00 0/1 0/0 0/0 .rodata @4080 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4080 = 3500.0f; -COMPILER_STRIP_GATE(80639834, &lit_4080); +COMPILER_STRIP_GATE(0x80639834, &lit_4080); #pragma pop /* 8062F51C-8062FB90 00019C 0674+00 1/1 0/0 0/0 .text draw__8daB_YO_cFv */ @@ -1252,7 +1252,13 @@ asm void daB_YO_c::onIceBreak(u16 param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4149 = -1.0f; -COMPILER_STRIP_GATE(80639838, &lit_4149); +COMPILER_STRIP_GATE(0x80639838, &lit_4149); +#pragma pop + +/* 80639A34-80639A34 000240 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80639A34 = "B_YO"; #pragma pop /* 8062FC08-8062FE0C 000888 0204+00 4/4 0/0 0/0 .text setBck__8daB_YO_cFiUcff */ @@ -1288,13 +1294,13 @@ asm void daB_YO_c::damage_check() { /* ############################################################################################## */ /* 8063983C-80639840 000048 0004+00 1/2 0/0 0/0 .rodata @4250 */ SECTION_RODATA static f32 const lit_4250 = 4000.0f; -COMPILER_STRIP_GATE(8063983C, &lit_4250); +COMPILER_STRIP_GATE(0x8063983C, &lit_4250); /* 80639840-80639844 00004C 0004+00 0/3 0/0 0/0 .rodata @4251 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4251 = 50.0f; -COMPILER_STRIP_GATE(80639840, &lit_4251); +COMPILER_STRIP_GATE(0x80639840, &lit_4251); #pragma pop /* 80639844-8063984C 000050 0008+00 0/6 0/0 0/0 .rodata @4253 */ @@ -1303,7 +1309,7 @@ COMPILER_STRIP_GATE(80639840, &lit_4251); SECTION_RODATA static u8 const lit_4253[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80639844, &lit_4253); +COMPILER_STRIP_GATE(0x80639844, &lit_4253); #pragma pop /* 806300F4-8063022C 000D74 0138+00 1/1 0/0 0/0 .text setBreakFrizad__8daB_YO_cFv */ @@ -1352,7 +1358,7 @@ asm void daB_YO_c::setWindowBreakEffect(int param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4397 = 10.0f; -COMPILER_STRIP_GATE(8063984C, &lit_4397); +COMPILER_STRIP_GATE(0x8063984C, &lit_4397); #pragma pop /* 8063040C-806305B8 00108C 01AC+00 1/1 0/0 0/0 .text setHensinEffect__8daB_YO_cFv */ @@ -1368,7 +1374,7 @@ asm void daB_YO_c::setHensinEffect() { /* ############################################################################################## */ /* 80639850-80639854 00005C 0004+00 5/6 0/0 0/0 .rodata @4432 */ SECTION_RODATA static f32 const lit_4432 = 230.0f; -COMPILER_STRIP_GATE(80639850, &lit_4432); +COMPILER_STRIP_GATE(0x80639850, &lit_4432); /* 806305B8-806306F0 001238 0138+00 2/2 0/0 0/0 .text setLandingEffect__8daB_YO_cFf */ #pragma push @@ -1587,35 +1593,35 @@ asm void daB_YO_c::doYoMessage() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5302 = 1000.0f; -COMPILER_STRIP_GATE(80639854, &lit_5302); +COMPILER_STRIP_GATE(0x80639854, &lit_5302); #pragma pop /* 80639858-8063985C 000064 0004+00 0/2 0/0 0/0 .rodata @5303 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5303 = 180.0f; -COMPILER_STRIP_GATE(80639858, &lit_5303); +COMPILER_STRIP_GATE(0x80639858, &lit_5303); #pragma pop /* 8063985C-80639860 000068 0004+00 0/4 0/0 0/0 .rodata @5304 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5304 = 250.0f; -COMPILER_STRIP_GATE(8063985C, &lit_5304); +COMPILER_STRIP_GATE(0x8063985C, &lit_5304); #pragma pop /* 80639860-80639864 00006C 0004+00 0/1 0/0 0/0 .rodata @5305 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5305 = 1450.0f; -COMPILER_STRIP_GATE(80639860, &lit_5305); +COMPILER_STRIP_GATE(0x80639860, &lit_5305); #pragma pop /* 80639864-80639868 000070 0004+00 0/3 0/0 0/0 .rodata @5306 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5306 = 68.0f; -COMPILER_STRIP_GATE(80639864, &lit_5306); +COMPILER_STRIP_GATE(0x80639864, &lit_5306); #pragma pop /* 80630F28-80632598 001BA8 1670+00 2/1 0/0 0/0 .text executeOpening__8daB_YO_cFv */ @@ -1633,340 +1639,340 @@ asm void daB_YO_c::executeOpening() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5307 = -30.0f; -COMPILER_STRIP_GATE(80639868, &lit_5307); +COMPILER_STRIP_GATE(0x80639868, &lit_5307); #pragma pop /* 8063986C-80639870 000078 0004+00 0/0 0/0 0/0 .rodata @5308 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5308 = -1550.0f; -COMPILER_STRIP_GATE(8063986C, &lit_5308); +COMPILER_STRIP_GATE(0x8063986C, &lit_5308); #pragma pop /* 80639870-80639874 00007C 0004+00 0/0 0/0 0/0 .rodata @5309 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5309 = -700.0f; -COMPILER_STRIP_GATE(80639870, &lit_5309); +COMPILER_STRIP_GATE(0x80639870, &lit_5309); #pragma pop /* 80639874-80639878 000080 0004+00 0/0 0/0 0/0 .rodata @5310 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5310 = -1250.0f; -COMPILER_STRIP_GATE(80639874, &lit_5310); +COMPILER_STRIP_GATE(0x80639874, &lit_5310); #pragma pop /* 80639878-8063987C 000084 0004+00 0/0 0/0 0/0 .rodata @5311 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5311 = 260.0f; -COMPILER_STRIP_GATE(80639878, &lit_5311); +COMPILER_STRIP_GATE(0x80639878, &lit_5311); #pragma pop /* 8063987C-80639880 000088 0004+00 0/0 0/0 0/0 .rodata @5312 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5312 = -1574.0f; -COMPILER_STRIP_GATE(8063987C, &lit_5312); +COMPILER_STRIP_GATE(0x8063987C, &lit_5312); #pragma pop /* 80639880-80639884 00008C 0004+00 0/0 0/0 0/0 .rodata @5313 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5313 = -1650.0f; -COMPILER_STRIP_GATE(80639880, &lit_5313); +COMPILER_STRIP_GATE(0x80639880, &lit_5313); #pragma pop /* 80639884-80639888 000090 0004+00 0/1 0/0 0/0 .rodata @5314 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5314 = 120.0f; -COMPILER_STRIP_GATE(80639884, &lit_5314); +COMPILER_STRIP_GATE(0x80639884, &lit_5314); #pragma pop /* 80639888-8063988C 000094 0004+00 0/0 0/0 0/0 .rodata @5315 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5315 = -2032.0f; -COMPILER_STRIP_GATE(80639888, &lit_5315); +COMPILER_STRIP_GATE(0x80639888, &lit_5315); #pragma pop /* 8063988C-80639890 000098 0004+00 0/11 0/0 0/0 .rodata @5316 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5316 = 0.5f; -COMPILER_STRIP_GATE(8063988C, &lit_5316); +COMPILER_STRIP_GATE(0x8063988C, &lit_5316); #pragma pop /* 80639890-80639894 00009C 0004+00 0/0 0/0 0/0 .rodata @5317 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5317 = 45.0f; -COMPILER_STRIP_GATE(80639890, &lit_5317); +COMPILER_STRIP_GATE(0x80639890, &lit_5317); #pragma pop /* 80639894-80639898 0000A0 0004+00 0/3 0/0 0/0 .rodata @5318 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5318 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(80639894, &lit_5318); +COMPILER_STRIP_GATE(0x80639894, &lit_5318); #pragma pop /* 80639898-8063989C 0000A4 0004+00 0/3 0/0 0/0 .rodata @5319 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5319 = 15.0f; -COMPILER_STRIP_GATE(80639898, &lit_5319); +COMPILER_STRIP_GATE(0x80639898, &lit_5319); #pragma pop /* 8063989C-806398A0 0000A8 0004+00 0/0 0/0 0/0 .rodata @5320 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5320 = 51.0f; -COMPILER_STRIP_GATE(8063989C, &lit_5320); +COMPILER_STRIP_GATE(0x8063989C, &lit_5320); #pragma pop /* 806398A0-806398A4 0000AC 0004+00 0/0 0/0 0/0 .rodata @5321 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5321 = 207.0f; -COMPILER_STRIP_GATE(806398A0, &lit_5321); +COMPILER_STRIP_GATE(0x806398A0, &lit_5321); #pragma pop /* 806398A4-806398A8 0000B0 0004+00 0/0 0/0 0/0 .rodata @5322 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5322 = -2082.0f; -COMPILER_STRIP_GATE(806398A4, &lit_5322); +COMPILER_STRIP_GATE(0x806398A4, &lit_5322); #pragma pop /* 806398A8-806398AC 0000B4 0004+00 0/0 0/0 0/0 .rodata @5323 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5323 = -1562.0f; -COMPILER_STRIP_GATE(806398A8, &lit_5323); +COMPILER_STRIP_GATE(0x806398A8, &lit_5323); #pragma pop /* 806398AC-806398B0 0000B8 0004+00 0/0 0/0 0/0 .rodata @5324 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5324 = 29.0f; -COMPILER_STRIP_GATE(806398AC, &lit_5324); +COMPILER_STRIP_GATE(0x806398AC, &lit_5324); #pragma pop /* 806398B0-806398B4 0000BC 0004+00 0/0 0/0 0/0 .rodata @5325 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5325 = 16.0f; -COMPILER_STRIP_GATE(806398B0, &lit_5325); +COMPILER_STRIP_GATE(0x806398B0, &lit_5325); #pragma pop /* 806398B4-806398B8 0000C0 0004+00 0/0 0/0 0/0 .rodata @5326 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5326 = 1339.0f; -COMPILER_STRIP_GATE(806398B4, &lit_5326); +COMPILER_STRIP_GATE(0x806398B4, &lit_5326); #pragma pop /* 806398B8-806398BC 0000C4 0004+00 0/0 0/0 0/0 .rodata @5327 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5327 = 2992.0f; -COMPILER_STRIP_GATE(806398B8, &lit_5327); +COMPILER_STRIP_GATE(0x806398B8, &lit_5327); #pragma pop /* 806398BC-806398C0 0000C8 0004+00 0/0 0/0 0/0 .rodata @5328 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5328 = 196.0f; -COMPILER_STRIP_GATE(806398BC, &lit_5328); +COMPILER_STRIP_GATE(0x806398BC, &lit_5328); #pragma pop /* 806398C0-806398C4 0000CC 0004+00 0/0 0/0 0/0 .rodata @5329 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5329 = 1172.0f; -COMPILER_STRIP_GATE(806398C0, &lit_5329); +COMPILER_STRIP_GATE(0x806398C0, &lit_5329); #pragma pop /* 806398C4-806398C8 0000D0 0004+00 0/0 0/0 0/0 .rodata @5330 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5330 = 3086.0f; -COMPILER_STRIP_GATE(806398C4, &lit_5330); +COMPILER_STRIP_GATE(0x806398C4, &lit_5330); #pragma pop /* 806398C8-806398CC 0000D4 0004+00 0/0 0/0 0/0 .rodata @5331 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5331 = 582.0f; -COMPILER_STRIP_GATE(806398C8, &lit_5331); +COMPILER_STRIP_GATE(0x806398C8, &lit_5331); #pragma pop /* 806398CC-806398D0 0000D8 0004+00 0/0 0/0 0/0 .rodata @5332 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5332 = 1046.0f; -COMPILER_STRIP_GATE(806398CC, &lit_5332); +COMPILER_STRIP_GATE(0x806398CC, &lit_5332); #pragma pop /* 806398D0-806398D4 0000DC 0004+00 0/0 0/0 0/0 .rodata @5333 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5333 = -333.0f; -COMPILER_STRIP_GATE(806398D0, &lit_5333); +COMPILER_STRIP_GATE(0x806398D0, &lit_5333); #pragma pop /* 806398D4-806398D8 0000E0 0004+00 0/0 0/0 0/0 .rodata @5334 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5334 = 1251.0f; -COMPILER_STRIP_GATE(806398D4, &lit_5334); +COMPILER_STRIP_GATE(0x806398D4, &lit_5334); #pragma pop /* 806398D8-806398DC 0000E4 0004+00 0/1 0/0 0/0 .rodata @5335 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5335 = -500.0f; -COMPILER_STRIP_GATE(806398D8, &lit_5335); +COMPILER_STRIP_GATE(0x806398D8, &lit_5335); #pragma pop /* 806398DC-806398E0 0000E8 0004+00 0/7 0/0 0/0 .rodata @5336 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5336 = 500.0f; -COMPILER_STRIP_GATE(806398DC, &lit_5336); +COMPILER_STRIP_GATE(0x806398DC, &lit_5336); #pragma pop /* 806398E0-806398E4 0000EC 0004+00 0/1 0/0 0/0 .rodata @5337 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5337 = 400.0f; -COMPILER_STRIP_GATE(806398E0, &lit_5337); +COMPILER_STRIP_GATE(0x806398E0, &lit_5337); #pragma pop /* 806398E4-806398E8 0000F0 0004+00 0/1 0/0 0/0 .rodata @5338 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5338 = -200.0f; -COMPILER_STRIP_GATE(806398E4, &lit_5338); +COMPILER_STRIP_GATE(0x806398E4, &lit_5338); #pragma pop /* 806398E8-806398EC 0000F4 0004+00 0/4 0/0 0/0 .rodata @5339 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5339 = 200.0f; -COMPILER_STRIP_GATE(806398E8, &lit_5339); +COMPILER_STRIP_GATE(0x806398E8, &lit_5339); #pragma pop /* 806398EC-806398F0 0000F8 0004+00 0/0 0/0 0/0 .rodata @5340 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5340 = -1700.0f; -COMPILER_STRIP_GATE(806398EC, &lit_5340); +COMPILER_STRIP_GATE(0x806398EC, &lit_5340); #pragma pop /* 806398F0-806398F4 0000FC 0004+00 0/4 0/0 0/0 .rodata @5341 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5341 = 300.0f; -COMPILER_STRIP_GATE(806398F0, &lit_5341); +COMPILER_STRIP_GATE(0x806398F0, &lit_5341); #pragma pop /* 806398F4-806398F8 000100 0004+00 0/2 0/0 0/0 .rodata @5342 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5342 = 1.0f / 20.0f; -COMPILER_STRIP_GATE(806398F4, &lit_5342); +COMPILER_STRIP_GATE(0x806398F4, &lit_5342); #pragma pop /* 806398F8-806398FC 000104 0004+00 1/6 0/0 0/0 .rodata @5343 */ SECTION_RODATA static f32 const lit_5343 = 30.0f; -COMPILER_STRIP_GATE(806398F8, &lit_5343); +COMPILER_STRIP_GATE(0x806398F8, &lit_5343); /* 806398FC-80639900 000108 0004+00 0/0 0/0 0/0 .rodata @5344 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5344 = 9.0f; -COMPILER_STRIP_GATE(806398FC, &lit_5344); +COMPILER_STRIP_GATE(0x806398FC, &lit_5344); #pragma pop /* 80639900-80639904 00010C 0004+00 0/0 0/0 0/0 .rodata @5345 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_5345 = 0x3D0B4396; -COMPILER_STRIP_GATE(80639900, &lit_5345); +COMPILER_STRIP_GATE(0x80639900, &lit_5345); #pragma pop /* 80639904-80639908 000110 0004+00 0/6 0/0 0/0 .rodata @5346 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5346 = 1500.0f; -COMPILER_STRIP_GATE(80639904, &lit_5346); +COMPILER_STRIP_GATE(0x80639904, &lit_5346); #pragma pop /* 80639908-8063990C 000114 0004+00 0/1 0/0 0/0 .rodata @5347 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5347 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(80639908, &lit_5347); +COMPILER_STRIP_GATE(0x80639908, &lit_5347); #pragma pop /* 8063990C-80639910 000118 0004+00 0/0 0/0 0/0 .rodata @5348 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5348 = 1.0f / 100.0f; -COMPILER_STRIP_GATE(8063990C, &lit_5348); +COMPILER_STRIP_GATE(0x8063990C, &lit_5348); #pragma pop /* 80639910-80639914 00011C 0004+00 0/0 0/0 0/0 .rodata @5349 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5349 = 4.0f / 5.0f; -COMPILER_STRIP_GATE(80639910, &lit_5349); +COMPILER_STRIP_GATE(0x80639910, &lit_5349); #pragma pop /* 80639914-80639918 000120 0004+00 0/0 0/0 0/0 .rodata @5350 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_5350 = 0x3BA3D70A; -COMPILER_STRIP_GATE(80639914, &lit_5350); +COMPILER_STRIP_GATE(0x80639914, &lit_5350); #pragma pop /* 80639918-8063991C 000124 0004+00 0/1 0/0 0/0 .rodata @5351 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5351 = 580.0f; -COMPILER_STRIP_GATE(80639918, &lit_5351); +COMPILER_STRIP_GATE(0x80639918, &lit_5351); #pragma pop /* 8063991C-80639920 000128 0004+00 0/0 0/0 0/0 .rodata @5352 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5352 = 170.0f; -COMPILER_STRIP_GATE(8063991C, &lit_5352); +COMPILER_STRIP_GATE(0x8063991C, &lit_5352); #pragma pop /* 80639920-80639924 00012C 0004+00 0/1 0/0 0/0 .rodata @5353 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5353 = 600.0f; -COMPILER_STRIP_GATE(80639920, &lit_5353); +COMPILER_STRIP_GATE(0x80639920, &lit_5353); #pragma pop /* 80639924-80639928 000130 0004+00 0/0 0/0 0/0 .rodata @5354 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5354 = 1300.0f; -COMPILER_STRIP_GATE(80639924, &lit_5354); +COMPILER_STRIP_GATE(0x80639924, &lit_5354); #pragma pop /* 80639928-8063992C 000134 0004+00 0/0 0/0 0/0 .rodata @5355 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5355 = 1050.0f; -COMPILER_STRIP_GATE(80639928, &lit_5355); +COMPILER_STRIP_GATE(0x80639928, &lit_5355); #pragma pop /* 8063992C-80639934 000138 0004+04 0/0 0/0 0/0 .rodata @5356 */ @@ -1977,7 +1983,7 @@ SECTION_RODATA static f32 const lit_5356[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(8063992C, &lit_5356); +COMPILER_STRIP_GATE(0x8063992C, &lit_5356); #pragma pop /* 80639934-8063993C 000140 0008+00 0/7 0/0 0/0 .rodata @5389 */ @@ -1986,7 +1992,7 @@ COMPILER_STRIP_GATE(8063992C, &lit_5356); SECTION_RODATA static u8 const lit_5389[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80639934, &lit_5389); +COMPILER_STRIP_GATE(0x80639934, &lit_5389); #pragma pop /* 8063993C-80639944 000148 0008+00 0/7 0/0 0/0 .rodata @5390 */ @@ -1995,7 +2001,7 @@ COMPILER_STRIP_GATE(80639934, &lit_5389); SECTION_RODATA static u8 const lit_5390[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8063993C, &lit_5390); +COMPILER_STRIP_GATE(0x8063993C, &lit_5390); #pragma pop /* 80639944-8063994C 000150 0008+00 0/7 0/0 0/0 .rodata @5391 */ @@ -2004,28 +2010,28 @@ COMPILER_STRIP_GATE(8063993C, &lit_5390); SECTION_RODATA static u8 const lit_5391[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80639944, &lit_5391); +COMPILER_STRIP_GATE(0x80639944, &lit_5391); #pragma pop /* 8063994C-80639950 000158 0004+00 0/3 0/0 0/0 .rodata @5405 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5405 = 32768.0f; -COMPILER_STRIP_GATE(8063994C, &lit_5405); +COMPILER_STRIP_GATE(0x8063994C, &lit_5405); #pragma pop /* 80639950-80639954 00015C 0004+00 0/3 0/0 0/0 .rodata @5406 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5406 = 8000.0f; -COMPILER_STRIP_GATE(80639950, &lit_5406); +COMPILER_STRIP_GATE(0x80639950, &lit_5406); #pragma pop /* 80639954-80639958 000160 0004+00 0/2 0/0 0/0 .rodata @5407 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5407 = 8.0f; -COMPILER_STRIP_GATE(80639954, &lit_5407); +COMPILER_STRIP_GATE(0x80639954, &lit_5407); #pragma pop /* 80632598-80632660 003218 00C8+00 1/1 0/0 0/0 .text reflectFreeMove__8daB_YO_cFv */ @@ -2063,21 +2069,21 @@ asm void daB_YO_c::setReflectAngle() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5637 = 140.0f; -COMPILER_STRIP_GATE(80639958, &lit_5637); +COMPILER_STRIP_GATE(0x80639958, &lit_5637); #pragma pop /* 8063995C-80639960 000168 0004+00 0/2 0/0 0/0 .rodata @5638 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5638 = 130.0f; -COMPILER_STRIP_GATE(8063995C, &lit_5638); +COMPILER_STRIP_GATE(0x8063995C, &lit_5638); #pragma pop /* 80639960-80639964 00016C 0004+00 0/4 0/0 0/0 .rodata @5639 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5639 = 1200.0f; -COMPILER_STRIP_GATE(80639960, &lit_5639); +COMPILER_STRIP_GATE(0x80639960, &lit_5639); #pragma pop /* 80639964-8063996C 000170 0004+04 0/1 0/0 0/0 .rodata @5640 */ @@ -2088,7 +2094,7 @@ SECTION_RODATA static f32 const lit_5640[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80639964, &lit_5640); +COMPILER_STRIP_GATE(0x80639964, &lit_5640); #pragma pop /* 8063996C-80639974 000178 0008+00 0/1 0/0 0/0 .rodata @5643 */ @@ -2097,7 +2103,7 @@ COMPILER_STRIP_GATE(80639964, &lit_5640); SECTION_RODATA static u8 const lit_5643[8] = { 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8063996C, &lit_5643); +COMPILER_STRIP_GATE(0x8063996C, &lit_5643); #pragma pop /* 806329CC-806331CC 00364C 0800+00 1/1 0/0 0/0 .text executeChase__8daB_YO_cFv */ @@ -2115,98 +2121,98 @@ asm void daB_YO_c::executeChase() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5883 = 700.0f; -COMPILER_STRIP_GATE(80639974, &lit_5883); +COMPILER_STRIP_GATE(0x80639974, &lit_5883); #pragma pop /* 80639978-8063997C 000184 0004+00 0/4 0/0 0/0 .rodata @5884 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5884 = 150.0f; -COMPILER_STRIP_GATE(80639978, &lit_5884); +COMPILER_STRIP_GATE(0x80639978, &lit_5884); #pragma pop /* 8063997C-80639980 000188 0004+00 0/2 0/0 0/0 .rodata @5885 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5885 = -1400.0f; -COMPILER_STRIP_GATE(8063997C, &lit_5885); +COMPILER_STRIP_GATE(0x8063997C, &lit_5885); #pragma pop /* 80639980-80639984 00018C 0004+00 0/1 0/0 0/0 .rodata @5886 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5886 = -1270.0f; -COMPILER_STRIP_GATE(80639980, &lit_5886); +COMPILER_STRIP_GATE(0x80639980, &lit_5886); #pragma pop /* 80639984-80639988 000190 0004+00 0/1 0/0 0/0 .rodata @5887 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5887 = -1200.0f; -COMPILER_STRIP_GATE(80639984, &lit_5887); +COMPILER_STRIP_GATE(0x80639984, &lit_5887); #pragma pop /* 80639988-8063998C 000194 0004+00 0/2 0/0 0/0 .rodata @5888 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5888 = 450.0f; -COMPILER_STRIP_GATE(80639988, &lit_5888); +COMPILER_STRIP_GATE(0x80639988, &lit_5888); #pragma pop /* 8063998C-80639990 000198 0004+00 0/1 0/0 0/0 .rodata @5889 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5889 = -730.0f; -COMPILER_STRIP_GATE(8063998C, &lit_5889); +COMPILER_STRIP_GATE(0x8063998C, &lit_5889); #pragma pop /* 80639990-80639994 00019C 0004+00 0/1 0/0 0/0 .rodata @5890 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5890 = 44.0f; -COMPILER_STRIP_GATE(80639990, &lit_5890); +COMPILER_STRIP_GATE(0x80639990, &lit_5890); #pragma pop /* 80639994-80639998 0001A0 0004+00 0/1 0/0 0/0 .rodata @5891 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5891 = 220.0f; -COMPILER_STRIP_GATE(80639994, &lit_5891); +COMPILER_STRIP_GATE(0x80639994, &lit_5891); #pragma pop /* 80639998-8063999C 0001A4 0004+00 0/1 0/0 0/0 .rodata @5892 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5892 = 420.0f; -COMPILER_STRIP_GATE(80639998, &lit_5892); +COMPILER_STRIP_GATE(0x80639998, &lit_5892); #pragma pop /* 8063999C-806399A0 0001A8 0004+00 0/1 0/0 0/0 .rodata @5893 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5893 = -270.0f; -COMPILER_STRIP_GATE(8063999C, &lit_5893); +COMPILER_STRIP_GATE(0x8063999C, &lit_5893); #pragma pop /* 806399A0-806399A4 0001AC 0004+00 0/3 0/0 0/0 .rodata @5894 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5894 = 350.0f; -COMPILER_STRIP_GATE(806399A0, &lit_5894); +COMPILER_STRIP_GATE(0x806399A0, &lit_5894); #pragma pop /* 806399A4-806399A8 0001B0 0004+00 0/4 0/0 0/0 .rodata @5895 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5895 = 3.0f / 10.0f; -COMPILER_STRIP_GATE(806399A4, &lit_5895); +COMPILER_STRIP_GATE(0x806399A4, &lit_5895); #pragma pop /* 806399A8-806399AC 0001B4 0004+00 0/4 0/0 0/0 .rodata @5896 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5896 = -10.0f; -COMPILER_STRIP_GATE(806399A8, &lit_5896); +COMPILER_STRIP_GATE(0x806399A8, &lit_5896); #pragma pop /* 806331CC-80633EDC 003E4C 0D10+00 1/1 0/0 0/0 .text executeSeriousDemo__8daB_YO_cFv */ @@ -2255,7 +2261,7 @@ asm void daB_YO_c::executeJump() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6087 = -5.0f; -COMPILER_STRIP_GATE(806399AC, &lit_6087); +COMPILER_STRIP_GATE(0x806399AC, &lit_6087); #pragma pop /* 80634548-8063476C 0051C8 0224+00 1/1 0/0 0/0 .text executeAttackIce__8daB_YO_cFv */ @@ -2273,14 +2279,14 @@ asm void daB_YO_c::executeAttackIce() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6224 = 750.0f; -COMPILER_STRIP_GATE(806399B0, &lit_6224); +COMPILER_STRIP_GATE(0x806399B0, &lit_6224); #pragma pop /* 806399B4-806399B8 0001C0 0004+00 0/1 0/0 0/0 .rodata @6225 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6225 = 1.0f / 50.0f; -COMPILER_STRIP_GATE(806399B4, &lit_6225); +COMPILER_STRIP_GATE(0x806399B4, &lit_6225); #pragma pop /* 8063476C-80634CEC 0053EC 0580+00 1/1 0/0 0/0 .text executeAttackYose__8daB_YO_cFv */ @@ -2296,7 +2302,7 @@ asm void daB_YO_c::executeAttackYose() { /* ############################################################################################## */ /* 806399B8-806399BC 0001C4 0004+00 1/1 0/0 0/0 .rodata @6259 */ SECTION_RODATA static f32 const lit_6259 = 35.0f; -COMPILER_STRIP_GATE(806399B8, &lit_6259); +COMPILER_STRIP_GATE(0x806399B8, &lit_6259); /* 80634CEC-80634E04 00596C 0118+00 1/1 0/0 0/0 .text checkDamageWithIceBreak__8daB_YO_cFv */ #pragma push @@ -2323,14 +2329,14 @@ asm void daB_YO_c::executeAttackBody() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6439 = 1150.0f; -COMPILER_STRIP_GATE(806399BC, &lit_6439); +COMPILER_STRIP_GATE(0x806399BC, &lit_6439); #pragma pop /* 806399C0-806399C4 0001CC 0004+00 0/1 0/0 0/0 .rodata @6440 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6440 = 160.0f; -COMPILER_STRIP_GATE(806399C0, &lit_6440); +COMPILER_STRIP_GATE(0x806399C0, &lit_6440); #pragma pop /* 806352C8-80635798 005F48 04D0+00 1/1 0/0 0/0 .text executeDemoRevival__8daB_YO_cFv */ @@ -2348,14 +2354,14 @@ asm void daB_YO_c::executeDemoRevival() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6491 = 80.0f; -COMPILER_STRIP_GATE(806399C4, &lit_6491); +COMPILER_STRIP_GATE(0x806399C4, &lit_6491); #pragma pop /* 806399C8-806399CC 0001D4 0004+00 0/1 0/0 0/0 .rodata @6492 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6492 = 900.0f; -COMPILER_STRIP_GATE(806399C8, &lit_6492); +COMPILER_STRIP_GATE(0x806399C8, &lit_6492); #pragma pop /* 80635798-80635ABC 006418 0324+00 1/1 0/0 0/0 .text executeDamage__8daB_YO_cFv */ @@ -2373,112 +2379,118 @@ asm void daB_YO_c::executeDamage() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6978 = -300.0f; -COMPILER_STRIP_GATE(806399CC, &lit_6978); +COMPILER_STRIP_GATE(0x806399CC, &lit_6978); #pragma pop /* 806399D0-806399D4 0001DC 0004+00 0/1 0/0 0/0 .rodata @6979 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6979 = -1000.0f; -COMPILER_STRIP_GATE(806399D0, &lit_6979); +COMPILER_STRIP_GATE(0x806399D0, &lit_6979); #pragma pop /* 806399D4-806399D8 0001E0 0004+00 0/1 0/0 0/0 .rodata @6980 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6980 = 800.0f; -COMPILER_STRIP_GATE(806399D4, &lit_6980); +COMPILER_STRIP_GATE(0x806399D4, &lit_6980); #pragma pop /* 806399D8-806399DC 0001E4 0004+00 0/1 0/0 0/0 .rodata @6981 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6981 = -650.0f; -COMPILER_STRIP_GATE(806399D8, &lit_6981); +COMPILER_STRIP_GATE(0x806399D8, &lit_6981); #pragma pop /* 806399DC-806399E0 0001E8 0004+00 0/1 0/0 0/0 .rodata @6982 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6982 = 1230.0f; -COMPILER_STRIP_GATE(806399DC, &lit_6982); +COMPILER_STRIP_GATE(0x806399DC, &lit_6982); #pragma pop /* 806399E0-806399E4 0001EC 0004+00 0/1 0/0 0/0 .rodata @6983 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6983 = 830.0f; -COMPILER_STRIP_GATE(806399E0, &lit_6983); +COMPILER_STRIP_GATE(0x806399E0, &lit_6983); #pragma pop /* 806399E4-806399E8 0001F0 0004+00 0/1 0/0 0/0 .rodata @6984 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6984 = -1100.0f; -COMPILER_STRIP_GATE(806399E4, &lit_6984); +COMPILER_STRIP_GATE(0x806399E4, &lit_6984); #pragma pop /* 806399E8-806399EC 0001F4 0004+00 0/1 0/0 0/0 .rodata @6985 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6985 = 18.0f; -COMPILER_STRIP_GATE(806399E8, &lit_6985); +COMPILER_STRIP_GATE(0x806399E8, &lit_6985); #pragma pop /* 806399EC-806399F0 0001F8 0004+00 0/1 0/0 0/0 .rodata @6986 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6986 = 158.0f; -COMPILER_STRIP_GATE(806399EC, &lit_6986); +COMPILER_STRIP_GATE(0x806399EC, &lit_6986); #pragma pop /* 806399F0-806399F4 0001FC 0004+00 0/1 0/0 0/0 .rodata @6987 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6987 = 17.0f / 10.0f; -COMPILER_STRIP_GATE(806399F0, &lit_6987); +COMPILER_STRIP_GATE(0x806399F0, &lit_6987); #pragma pop /* 806399F4-806399F8 000200 0004+00 0/1 0/0 0/0 .rodata @6988 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6988 = -900.0f; -COMPILER_STRIP_GATE(806399F4, &lit_6988); +COMPILER_STRIP_GATE(0x806399F4, &lit_6988); #pragma pop /* 806399F8-806399FC 000204 0004+00 0/1 0/0 0/0 .rodata @6989 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6989 = 1540.0f; -COMPILER_STRIP_GATE(806399F8, &lit_6989); +COMPILER_STRIP_GATE(0x806399F8, &lit_6989); #pragma pop /* 806399FC-80639A00 000208 0004+00 0/1 0/0 0/0 .rodata @6990 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6990 = -400.0f; -COMPILER_STRIP_GATE(806399FC, &lit_6990); +COMPILER_STRIP_GATE(0x806399FC, &lit_6990); #pragma pop /* 80639A00-80639A04 00020C 0004+00 0/1 0/0 0/0 .rodata @6991 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6991 = 540.0f; -COMPILER_STRIP_GATE(80639A00, &lit_6991); +COMPILER_STRIP_GATE(0x80639A00, &lit_6991); #pragma pop /* 80639A04-80639A08 000210 0004+00 0/2 0/0 0/0 .rodata @6992 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6992 = -550.0f; -COMPILER_STRIP_GATE(80639A04, &lit_6992); +COMPILER_STRIP_GATE(0x80639A04, &lit_6992); #pragma pop /* 80639A08-80639A0C 000214 0004+00 0/2 0/0 0/0 .rodata @6993 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6993 = -250.0f; -COMPILER_STRIP_GATE(80639A08, &lit_6993); +COMPILER_STRIP_GATE(0x80639A08, &lit_6993); +#pragma pop + +/* 80639A34-80639A34 000240 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80639A39 = "BOSSCLEAR05"; #pragma pop /* 80635ABC-80636E9C 00673C 13E0+00 1/1 0/0 0/0 .text executeDeath__8daB_YO_cFv */ @@ -2496,7 +2508,7 @@ asm void daB_YO_c::executeDeath() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7036 = 1800.0f; -COMPILER_STRIP_GATE(80639A0C, &lit_7036); +COMPILER_STRIP_GATE(0x80639A0C, &lit_7036); #pragma pop /* 80636E9C-80637048 007B1C 01AC+00 2/2 0/0 0/0 .text reviseIceCenterPos__8daB_YO_cFP4cXyz */ @@ -2514,7 +2526,7 @@ asm void daB_YO_c::reviseIceCenterPos(cXyz* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7169 = 25.0f; -COMPILER_STRIP_GATE(80639A10, &lit_7169); +COMPILER_STRIP_GATE(0x80639A10, &lit_7169); #pragma pop /* 80637048-806374BC 007CC8 0474+00 1/1 0/0 0/0 .text calcPlayerBufPos__8daB_YO_cFv */ @@ -2532,7 +2544,7 @@ asm void daB_YO_c::calcPlayerBufPos() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7260 = -55.0f; -COMPILER_STRIP_GATE(80639A14, &lit_7260); +COMPILER_STRIP_GATE(0x80639A14, &lit_7260); #pragma pop /* 806374BC-80637990 00813C 04D4+00 3/1 0/0 0/0 .text action__8daB_YO_cFv */ @@ -2550,42 +2562,42 @@ asm void daB_YO_c::action() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7261 = 27.0f / 10.0f; -COMPILER_STRIP_GATE(80639A18, &lit_7261); +COMPILER_STRIP_GATE(0x80639A18, &lit_7261); #pragma pop /* 80639A1C-80639A20 000228 0004+00 0/0 0/0 0/0 .rodata @7262 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7262 = 128.0f; -COMPILER_STRIP_GATE(80639A1C, &lit_7262); +COMPILER_STRIP_GATE(0x80639A1C, &lit_7262); #pragma pop /* 80639A20-80639A24 00022C 0004+00 0/0 0/0 0/0 .rodata @7263 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7263 = 27.0f / 5.0f; -COMPILER_STRIP_GATE(80639A20, &lit_7263); +COMPILER_STRIP_GATE(0x80639A20, &lit_7263); #pragma pop /* 80639A24-80639A28 000230 0004+00 0/0 0/0 0/0 .rodata @7264 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7264 = 1.0f / 125.0f; -COMPILER_STRIP_GATE(80639A24, &lit_7264); +COMPILER_STRIP_GATE(0x80639A24, &lit_7264); #pragma pop /* 80639A28-80639A2C 000234 0004+00 0/0 0/0 0/0 .rodata @7265 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_7265 = 0x3C75C28F; -COMPILER_STRIP_GATE(80639A28, &lit_7265); +COMPILER_STRIP_GATE(0x80639A28, &lit_7265); #pragma pop /* 80639A2C-80639A30 000238 0004+00 0/1 0/0 0/0 .rodata @7320 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7320 = -230.0f; -COMPILER_STRIP_GATE(80639A2C, &lit_7320); +COMPILER_STRIP_GATE(0x80639A2C, &lit_7320); #pragma pop /* 80637990-80637B30 008610 01A0+00 1/1 0/0 0/0 .text mtx_set__8daB_YO_cFv */ @@ -2603,7 +2615,7 @@ asm void daB_YO_c::mtx_set() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7373 = 270.0f; -COMPILER_STRIP_GATE(80639A30, &lit_7373); +COMPILER_STRIP_GATE(0x80639A30, &lit_7373); #pragma pop /* 80637B30-80637E10 0087B0 02E0+00 1/1 0/0 0/0 .text cc_set__8daB_YO_cFv */ @@ -2641,6 +2653,16 @@ static bool daB_YO_IsDelete(daB_YO_c* param_0) { return true; } +/* ############################################################################################## */ +/* 80639A34-80639A34 000240 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80639A45 = "L5_R50"; +SECTION_DEAD static char const* const stringBase_80639A4C = "ykW"; +SECTION_DEAD static char const* const stringBase_80639A50 = "ykW1"; +SECTION_DEAD static char const* const stringBase_80639A55 = "E_FZ"; +#pragma pop + /* 80637FC8-806380D8 008C48 0110+00 1/1 0/0 0/0 .text _delete__8daB_YO_cFv */ #pragma push #pragma optimization_level 0 @@ -2711,6 +2733,13 @@ static asm void useHeapInit2(fopAc_ac_c* param_0) { } #pragma pop +/* ############################################################################################## */ +/* 80639A34-80639A34 000240 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80639A5A = "B_yo"; +#pragma pop + /* 806389C0-80639214 009640 0854+00 1/1 0/0 0/0 .text create__8daB_YO_cFv */ #pragma push #pragma optimization_level 0 @@ -2861,7 +2890,7 @@ asm void __sinit_d_a_b_yo_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_8063962C = (void*)__sinit_d_a_b_yo_cpp; +REGISTER_CTORS(0x8063962C, __sinit_d_a_b_yo_cpp); #pragma pop /* 80639684-8063968C 00A304 0008+00 1/0 0/0 0/0 .text @36@__dt__12dBgS_ObjAcchFv */ @@ -3092,15 +3121,4 @@ static u8 data_8063A058[4]; static u8 data_8063A05C[4]; #pragma pop -/* 80639A34-80639A5F 000240 002B+00 7/7 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80639A34 = "B_YO"; -SECTION_DEAD static char const* const stringBase_80639A39 = "BOSSCLEAR05"; -SECTION_DEAD static char const* const stringBase_80639A45 = "L5_R50"; -SECTION_DEAD static char const* const stringBase_80639A4C = "ykW"; -SECTION_DEAD static char const* const stringBase_80639A50 = "ykW1"; -SECTION_DEAD static char const* const stringBase_80639A55 = "E_FZ"; -SECTION_DEAD static char const* const stringBase_80639A5A = "B_yo"; -#pragma pop +/* 80639A34-80639A34 000240 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/b/d_a_b_yo_ice/d_a_b_yo_ice.cpp b/rel/d/a/b/d_a_b_yo_ice/d_a_b_yo_ice.cpp index 658f5c35c31..581664fdb47 100644 --- a/rel/d/a/b/d_a_b_yo_ice/d_a_b_yo_ice.cpp +++ b/rel/d/a/b/d_a_b_yo_ice/d_a_b_yo_ice.cpp @@ -356,11 +356,11 @@ extern "C" void __register_global_object(); /* ############################################################################################## */ /* 8063DC84-8063DC88 000000 0004+00 19/19 0/0 0/0 .rodata @3776 */ SECTION_RODATA static f32 const lit_3776 = 1.0f; -COMPILER_STRIP_GATE(8063DC84, &lit_3776); +COMPILER_STRIP_GATE(0x8063DC84, &lit_3776); /* 8063DC88-8063DC8C 000004 0004+00 1/1 0/0 0/0 .rodata @3777 */ SECTION_RODATA static f32 const lit_3777 = 6.0f / 5.0f; -COMPILER_STRIP_GATE(8063DC88, &lit_3777); +COMPILER_STRIP_GATE(0x8063DC88, &lit_3777); /* 8063DDA4-8063DDB0 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { @@ -611,16 +611,16 @@ asm void daB_YOI_c::setActionMode(int param_0, int param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3858 = 100.0f; -COMPILER_STRIP_GATE(8063DC8C, &lit_3858); +COMPILER_STRIP_GATE(0x8063DC8C, &lit_3858); #pragma pop /* 8063DC90-8063DC94 00000C 0004+00 1/2 0/0 0/0 .rodata @3859 */ SECTION_RODATA static f32 const lit_3859 = 33.0f / 100.0f; -COMPILER_STRIP_GATE(8063DC90, &lit_3859); +COMPILER_STRIP_GATE(0x8063DC90, &lit_3859); /* 8063DC94-8063DC98 000010 0004+00 1/5 0/0 0/0 .rodata @3860 */ SECTION_RODATA static f32 const lit_3860 = 50.0f; -COMPILER_STRIP_GATE(8063DC94, &lit_3860); +COMPILER_STRIP_GATE(0x8063DC94, &lit_3860); /* 8063A2E4-8063A480 000284 019C+00 1/1 0/0 0/0 .text damage_check__9daB_YOI_cFv */ #pragma push @@ -713,42 +713,42 @@ SECTION_RODATA static u8 const lit_4038[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(8063DC98, &lit_4038); +COMPILER_STRIP_GATE(0x8063DC98, &lit_4038); #pragma pop /* 8063DC9C-8063DCA0 000018 0004+00 0/1 0/0 0/0 .rodata @4039 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4039 = 150.0f; -COMPILER_STRIP_GATE(8063DC9C, &lit_4039); +COMPILER_STRIP_GATE(0x8063DC9C, &lit_4039); #pragma pop /* 8063DCA0-8063DCA4 00001C 0004+00 0/2 0/0 0/0 .rodata @4040 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4040 = 10.0f; -COMPILER_STRIP_GATE(8063DCA0, &lit_4040); +COMPILER_STRIP_GATE(0x8063DCA0, &lit_4040); #pragma pop /* 8063DCA4-8063DCA8 000020 0004+00 0/6 0/0 0/0 .rodata @4041 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4041 = 0.5f; -COMPILER_STRIP_GATE(8063DCA4, &lit_4041); +COMPILER_STRIP_GATE(0x8063DCA4, &lit_4041); #pragma pop /* 8063DCA8-8063DCAC 000024 0004+00 0/3 0/0 0/0 .rodata @4042 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4042 = -10.0f; -COMPILER_STRIP_GATE(8063DCA8, &lit_4042); +COMPILER_STRIP_GATE(0x8063DCA8, &lit_4042); #pragma pop /* 8063DCAC-8063DCB0 000028 0004+00 0/4 0/0 0/0 .rodata @4043 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4043 = 5.0f; -COMPILER_STRIP_GATE(8063DCAC, &lit_4043); +COMPILER_STRIP_GATE(0x8063DCAC, &lit_4043); #pragma pop /* 8063A96C-8063ABC0 00090C 0254+00 1/1 0/0 0/0 .text executeFirst__9daB_YOI_cFv */ @@ -770,12 +770,12 @@ SECTION_RODATA static u8 const yoi_fall_timer[40] = { 0x00, 0x24, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 0x3C, 0x00, 0x00, 0x00, 0x48, 0x00, 0x00, 0x00, 0x54, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x6C, }; -COMPILER_STRIP_GATE(8063DCB0, &yoi_fall_timer); +COMPILER_STRIP_GATE(0x8063DCB0, &yoi_fall_timer); #pragma pop /* 8063DCD8-8063DCDC 000054 0004+00 1/1 0/0 0/0 .rodata @4082 */ SECTION_RODATA static f32 const lit_4082 = 3.0f / 5.0f; -COMPILER_STRIP_GATE(8063DCD8, &lit_4082); +COMPILER_STRIP_GATE(0x8063DCD8, &lit_4082); /* 8063ABC0-8063ACCC 000B60 010C+00 2/2 0/0 0/0 .text getSingleFallPos__9daB_YOI_cFv */ #pragma push @@ -792,42 +792,42 @@ asm void daB_YOI_c::getSingleFallPos() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4166 = 64.0f; -COMPILER_STRIP_GATE(8063DCDC, &lit_4166); +COMPILER_STRIP_GATE(0x8063DCDC, &lit_4166); #pragma pop /* 8063DCE0-8063DCE4 00005C 0004+00 0/3 0/0 0/0 .rodata @4167 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4167 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(8063DCE0, &lit_4167); +COMPILER_STRIP_GATE(0x8063DCE0, &lit_4167); #pragma pop /* 8063DCE4-8063DCE8 000060 0004+00 0/1 0/0 0/0 .rodata @4168 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4168 = 60.0f; -COMPILER_STRIP_GATE(8063DCE4, &lit_4168); +COMPILER_STRIP_GATE(0x8063DCE4, &lit_4168); #pragma pop /* 8063DCE8-8063DCEC 000064 0004+00 0/3 0/0 0/0 .rodata @4169 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4169 = 3584.0f; -COMPILER_STRIP_GATE(8063DCE8, &lit_4169); +COMPILER_STRIP_GATE(0x8063DCE8, &lit_4169); #pragma pop /* 8063DCEC-8063DCF0 000068 0004+00 0/3 0/0 0/0 .rodata @4170 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4170 = 256.0f; -COMPILER_STRIP_GATE(8063DCEC, &lit_4170); +COMPILER_STRIP_GATE(0x8063DCEC, &lit_4170); #pragma pop /* 8063DCF0-8063DCF4 00006C 0004+00 0/3 0/0 0/0 .rodata @4171 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4171 = -3584.0f; -COMPILER_STRIP_GATE(8063DCF0, &lit_4171); +COMPILER_STRIP_GATE(0x8063DCF0, &lit_4171); #pragma pop /* 8063ACCC-8063B238 000C6C 056C+00 2/1 0/0 0/0 .text executeRiseUp__9daB_YOI_cFv */ @@ -845,56 +845,56 @@ asm void daB_YOI_c::executeRiseUp() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4172 = 55.0f; -COMPILER_STRIP_GATE(8063DCF4, &lit_4172); +COMPILER_STRIP_GATE(0x8063DCF4, &lit_4172); #pragma pop /* 8063DCF8-8063DCFC 000074 0004+00 0/1 0/0 0/0 .rodata @4173 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4173 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(8063DCF8, &lit_4173); +COMPILER_STRIP_GATE(0x8063DCF8, &lit_4173); #pragma pop /* 8063DCFC-8063DD00 000078 0004+00 0/3 0/0 0/0 .rodata @4174 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4174 = 200.0f; -COMPILER_STRIP_GATE(8063DCFC, &lit_4174); +COMPILER_STRIP_GATE(0x8063DCFC, &lit_4174); #pragma pop /* 8063DD00-8063DD04 00007C 0004+00 0/0 0/0 0/0 .rodata @4175 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4175 = 800.0f; -COMPILER_STRIP_GATE(8063DD00, &lit_4175); +COMPILER_STRIP_GATE(0x8063DD00, &lit_4175); #pragma pop /* 8063DD04-8063DD08 000080 0004+00 0/3 0/0 0/0 .rodata @4176 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4176 = 15.0f; -COMPILER_STRIP_GATE(8063DD04, &lit_4176); +COMPILER_STRIP_GATE(0x8063DD04, &lit_4176); #pragma pop /* 8063DD08-8063DD0C 000084 0004+00 0/1 0/0 0/0 .rodata @4177 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4177 = -15.0f; -COMPILER_STRIP_GATE(8063DD08, &lit_4177); +COMPILER_STRIP_GATE(0x8063DD08, &lit_4177); #pragma pop /* 8063DD0C-8063DD10 000088 0004+00 0/1 0/0 0/0 .rodata @4178 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4178 = 13.0f / 10.0f; -COMPILER_STRIP_GATE(8063DD0C, &lit_4178); +COMPILER_STRIP_GATE(0x8063DD0C, &lit_4178); #pragma pop /* 8063DD10-8063DD14 00008C 0004+00 0/0 0/0 0/0 .rodata @4179 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4179 = 30.0f; -COMPILER_STRIP_GATE(8063DD10, &lit_4179); +COMPILER_STRIP_GATE(0x8063DD10, &lit_4179); #pragma pop /* 8063DD14-8063DD1C 000090 0008+00 0/2 0/0 0/0 .rodata @4183 */ @@ -903,21 +903,21 @@ COMPILER_STRIP_GATE(8063DD10, &lit_4179); SECTION_RODATA static u8 const lit_4183[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8063DD14, &lit_4183); +COMPILER_STRIP_GATE(0x8063DD14, &lit_4183); #pragma pop /* 8063DD1C-8063DD20 000098 0004+00 0/1 0/0 0/0 .rodata @4370 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4370 = 600.0f; -COMPILER_STRIP_GATE(8063DD1C, &lit_4370); +COMPILER_STRIP_GATE(0x8063DD1C, &lit_4370); #pragma pop /* 8063DD20-8063DD24 00009C 0004+00 0/1 0/0 0/0 .rodata @4371 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4371 = 4.0f; -COMPILER_STRIP_GATE(8063DD20, &lit_4371); +COMPILER_STRIP_GATE(0x8063DD20, &lit_4371); #pragma pop /* 8063B238-8063BB40 0011D8 0908+00 2/1 0/0 0/0 .text executeSingleFall__9daB_YOI_cFv */ @@ -935,42 +935,42 @@ asm void daB_YOI_c::executeSingleFall() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4372 = -85.0f; -COMPILER_STRIP_GATE(8063DD24, &lit_4372); +COMPILER_STRIP_GATE(0x8063DD24, &lit_4372); #pragma pop /* 8063DD28-8063DD2C 0000A4 0004+00 0/1 0/0 0/0 .rodata @4373 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4373 = 32768.0f; -COMPILER_STRIP_GATE(8063DD28, &lit_4373); +COMPILER_STRIP_GATE(0x8063DD28, &lit_4373); #pragma pop /* 8063DD2C-8063DD30 0000A8 0004+00 0/1 0/0 0/0 .rodata @4374 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4374 = 180.0f; -COMPILER_STRIP_GATE(8063DD2C, &lit_4374); +COMPILER_STRIP_GATE(0x8063DD2C, &lit_4374); #pragma pop /* 8063DD30-8063DD34 0000AC 0004+00 0/1 0/0 0/0 .rodata @4375 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4375 = 40.0f; -COMPILER_STRIP_GATE(8063DD30, &lit_4375); +COMPILER_STRIP_GATE(0x8063DD30, &lit_4375); #pragma pop /* 8063DD34-8063DD38 0000B0 0004+00 0/0 0/0 0/0 .rodata @4376 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4376 = 3.0f; -COMPILER_STRIP_GATE(8063DD34, &lit_4376); +COMPILER_STRIP_GATE(0x8063DD34, &lit_4376); #pragma pop /* 8063DD38-8063DD3C 0000B4 0004+00 0/0 0/0 0/0 .rodata @4377 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4377 = 16384.0f; -COMPILER_STRIP_GATE(8063DD38, &lit_4377); +COMPILER_STRIP_GATE(0x8063DD38, &lit_4377); #pragma pop /* 8063DD3C-8063DD44 0000B8 0008+00 0/2 0/0 0/0 .rodata @4378 */ @@ -979,7 +979,7 @@ COMPILER_STRIP_GATE(8063DD38, &lit_4377); SECTION_RODATA static u8 const lit_4378[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8063DD3C, &lit_4378); +COMPILER_STRIP_GATE(0x8063DD3C, &lit_4378); #pragma pop /* 8063DD44-8063DD4C 0000C0 0008+00 0/2 0/0 0/0 .rodata @4379 */ @@ -988,7 +988,7 @@ COMPILER_STRIP_GATE(8063DD3C, &lit_4378); SECTION_RODATA static u8 const lit_4379[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8063DD44, &lit_4379); +COMPILER_STRIP_GATE(0x8063DD44, &lit_4379); #pragma pop /* 8063DD4C-8063DD54 0000C8 0008+00 0/2 0/0 0/0 .rodata @4380 */ @@ -997,56 +997,56 @@ COMPILER_STRIP_GATE(8063DD44, &lit_4379); SECTION_RODATA static u8 const lit_4380[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8063DD4C, &lit_4380); +COMPILER_STRIP_GATE(0x8063DD4C, &lit_4380); #pragma pop /* 8063DD54-8063DD58 0000D0 0004+00 0/0 0/0 0/0 .rodata @4381 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4381 = 140.0f; -COMPILER_STRIP_GATE(8063DD54, &lit_4381); +COMPILER_STRIP_GATE(0x8063DD54, &lit_4381); #pragma pop /* 8063DD58-8063DD5C 0000D4 0004+00 0/0 0/0 0/0 .rodata @4382 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4382 = 2048.0f; -COMPILER_STRIP_GATE(8063DD58, &lit_4382); +COMPILER_STRIP_GATE(0x8063DD58, &lit_4382); #pragma pop /* 8063DD5C-8063DD60 0000D8 0004+00 0/2 0/0 0/0 .rodata @4383 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4383 = -200.0f; -COMPILER_STRIP_GATE(8063DD5C, &lit_4383); +COMPILER_STRIP_GATE(0x8063DD5C, &lit_4383); #pragma pop /* 8063DD60-8063DD64 0000DC 0004+00 0/2 0/0 0/0 .rodata @4384 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4384 = 1700.0f; -COMPILER_STRIP_GATE(8063DD60, &lit_4384); +COMPILER_STRIP_GATE(0x8063DD60, &lit_4384); #pragma pop /* 8063DD64-8063DD68 0000E0 0004+00 0/1 0/0 0/0 .rodata @4597 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4597 = 70.0f; -COMPILER_STRIP_GATE(8063DD64, &lit_4597); +COMPILER_STRIP_GATE(0x8063DD64, &lit_4597); #pragma pop /* 8063DD68-8063DD6C 0000E4 0004+00 0/1 0/0 0/0 .rodata @4598 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4598 = 1600.0f; -COMPILER_STRIP_GATE(8063DD68, &lit_4598); +COMPILER_STRIP_GATE(0x8063DD68, &lit_4598); #pragma pop /* 8063DD6C-8063DD70 0000E8 0004+00 0/1 0/0 0/0 .rodata @4599 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4599 = 75.0f; -COMPILER_STRIP_GATE(8063DD6C, &lit_4599); +COMPILER_STRIP_GATE(0x8063DD6C, &lit_4599); #pragma pop /* 8063BB40-8063C3F0 001AE0 08B0+00 1/1 0/0 0/0 .text executeYose__9daB_YOI_cFv */ @@ -1074,7 +1074,7 @@ asm void daB_YOI_c::executeYoseFall() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4728 = 1000.0f; -COMPILER_STRIP_GATE(8063DD70, &lit_4728); +COMPILER_STRIP_GATE(0x8063DD70, &lit_4728); #pragma pop /* 8063C76C-8063C900 00270C 0194+00 1/1 0/0 0/0 .text executeDemoRevival__9daB_YOI_cFv */ @@ -1092,21 +1092,21 @@ asm void daB_YOI_c::executeDemoRevival() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4784 = 80.0f; -COMPILER_STRIP_GATE(8063DD74, &lit_4784); +COMPILER_STRIP_GATE(0x8063DD74, &lit_4784); #pragma pop /* 8063DD78-8063DD7C 0000F4 0004+00 0/1 0/0 0/0 .rodata @4785 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4785 = 3.0f / 10.0f; -COMPILER_STRIP_GATE(8063DD78, &lit_4785); +COMPILER_STRIP_GATE(0x8063DD78, &lit_4785); #pragma pop /* 8063DD7C-8063DD80 0000F8 0004+00 0/1 0/0 0/0 .rodata @4786 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4786 = 1024.0f; -COMPILER_STRIP_GATE(8063DD7C, &lit_4786); +COMPILER_STRIP_GATE(0x8063DD7C, &lit_4786); #pragma pop /* 8063C900-8063CC90 0028A0 0390+00 1/1 0/0 0/0 .text executeDamage__9daB_YOI_cFv */ @@ -1134,14 +1134,14 @@ asm void daB_YOI_c::executeDeath() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4814 = 255.0f; -COMPILER_STRIP_GATE(8063DD80, &lit_4814); +COMPILER_STRIP_GATE(0x8063DD80, &lit_4814); #pragma pop /* 8063DD84-8063DD88 000100 0004+00 0/1 0/0 0/0 .rodata @4815 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4815 = 2.0f; -COMPILER_STRIP_GATE(8063DD84, &lit_4815); +COMPILER_STRIP_GATE(0x8063DD84, &lit_4815); #pragma pop /* 8063CD14-8063CD90 002CB4 007C+00 1/1 0/0 0/0 .text crack_execute__9daB_YOI_cFv */ @@ -1189,35 +1189,35 @@ asm void daB_YOI_c::mtx_set() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4953 = 350.0f; -COMPILER_STRIP_GATE(8063DD88, &lit_4953); +COMPILER_STRIP_GATE(0x8063DD88, &lit_4953); #pragma pop /* 8063DD8C-8063DD90 000108 0004+00 0/1 0/0 0/0 .rodata @4954 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4954 = 550.0f; -COMPILER_STRIP_GATE(8063DD8C, &lit_4954); +COMPILER_STRIP_GATE(0x8063DD8C, &lit_4954); #pragma pop /* 8063DD90-8063DD94 00010C 0004+00 0/1 0/0 0/0 .rodata @4955 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4955 = 160.0f; -COMPILER_STRIP_GATE(8063DD90, &lit_4955); +COMPILER_STRIP_GATE(0x8063DD90, &lit_4955); #pragma pop /* 8063DD94-8063DD98 000110 0004+00 0/1 0/0 0/0 .rodata @4956 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4956 = 120.0f; -COMPILER_STRIP_GATE(8063DD94, &lit_4956); +COMPILER_STRIP_GATE(0x8063DD94, &lit_4956); #pragma pop /* 8063DD98-8063DD9C 000114 0004+00 0/1 0/0 0/0 .rodata @4957 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4957 = 400.0f; -COMPILER_STRIP_GATE(8063DD98, &lit_4957); +COMPILER_STRIP_GATE(0x8063DD98, &lit_4957); #pragma pop /* 8063D1B0-8063D350 003150 01A0+00 1/1 0/0 0/0 .text cc_set__9daB_YOI_cFv */ @@ -1255,6 +1255,13 @@ static bool daB_YOI_IsDelete(daB_YOI_c* param_0) { return true; } +/* ############################################################################################## */ +/* 8063DD9C-8063DD9C 000118 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8063DD9C = "B_YO"; +#pragma pop + /* 8063D45C-8063D4D8 0033FC 007C+00 1/1 0/0 0/0 .text _delete__9daB_YOI_cFv */ #pragma push #pragma optimization_level 0 @@ -1387,7 +1394,7 @@ asm void __sinit_d_a_b_yo_ice_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_8063DC18 = (void*)__sinit_d_a_b_yo_ice_cpp; +REGISTER_CTORS(0x8063DC18, __sinit_d_a_b_yo_ice_cpp); #pragma pop /* 8063DC54-8063DC70 003BF4 001C+00 7/7 0/0 0/0 .text getIceCenterPos__8daB_YO_cFv */ @@ -1400,9 +1407,4 @@ asm void daB_YO_c::getIceCenterPos() { } #pragma pop -/* 8063DD9C-8063DDA1 000118 0005+00 3/3 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_8063DD9C = "B_YO"; -#pragma pop +/* 8063DD9C-8063DD9C 000118 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/b/d_a_b_zant/d_a_b_zant.cpp b/rel/d/a/b/d_a_b_zant/d_a_b_zant.cpp index d982711afc7..51e99302609 100644 --- a/rel/d/a/b/d_a_b_zant/d_a_b_zant.cpp +++ b/rel/d/a/b/d_a_b_zant/d_a_b_zant.cpp @@ -53,16 +53,16 @@ struct mDoExt_baseAnm { /* 8000D428 */ void play(); }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; - struct J3DAnmTransform {}; +struct J3DModelData {}; + +struct Z2Creature {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -749,52 +749,52 @@ extern "C" void setAppearMode__11daB_ZANTZ_cFUc(); SECTION_RODATA static u8 const lit_3757[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8064EB1C, &lit_3757); +COMPILER_STRIP_GATE(0x8064EB1C, &lit_3757); /* 8064EB28-8064EB2C 00000C 0004+00 6/38 0/0 0/0 .rodata @4169 */ SECTION_RODATA static f32 const lit_4169 = 1.0f; -COMPILER_STRIP_GATE(8064EB28, &lit_4169); +COMPILER_STRIP_GATE(0x8064EB28, &lit_4169); /* 8064EB2C-8064EB30 000010 0004+00 0/13 0/0 0/0 .rodata @4170 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4170 = 10.0f; -COMPILER_STRIP_GATE(8064EB2C, &lit_4170); +COMPILER_STRIP_GATE(0x8064EB2C, &lit_4170); #pragma pop /* 8064EB30-8064EB34 000014 0004+00 0/4 0/0 0/0 .rodata @4171 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4171 = 15.0f; -COMPILER_STRIP_GATE(8064EB30, &lit_4171); +COMPILER_STRIP_GATE(0x8064EB30, &lit_4171); #pragma pop /* 8064EB34-8064EB38 000018 0004+00 0/1 0/0 0/0 .rodata @4172 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4172 = 17.0f / 10.0f; -COMPILER_STRIP_GATE(8064EB34, &lit_4172); +COMPILER_STRIP_GATE(0x8064EB34, &lit_4172); #pragma pop /* 8064EB38-8064EB3C 00001C 0004+00 0/8 0/0 0/0 .rodata @4173 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4173 = 100.0f; -COMPILER_STRIP_GATE(8064EB38, &lit_4173); +COMPILER_STRIP_GATE(0x8064EB38, &lit_4173); #pragma pop /* 8064EB3C-8064EB40 000020 0004+00 0/1 0/0 0/0 .rodata @4174 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4174 = 40.0f; -COMPILER_STRIP_GATE(8064EB3C, &lit_4174); +COMPILER_STRIP_GATE(0x8064EB3C, &lit_4174); #pragma pop /* 8064EB40-8064EB44 000024 0004+00 0/3 0/0 0/0 .rodata @4175 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4175 = 22.0f; -COMPILER_STRIP_GATE(8064EB40, &lit_4175); +COMPILER_STRIP_GATE(0x8064EB40, &lit_4175); #pragma pop /* 8064EB44-8064EB48 000028 0004+00 3/43 0/0 0/0 .rodata @4176 */ @@ -804,39 +804,39 @@ SECTION_RODATA static u8 const lit_4176[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(8064EB44, &lit_4176); +COMPILER_STRIP_GATE(0x8064EB44, &lit_4176); /* 8064EB48-8064EB4C 00002C 0004+00 0/2 0/0 0/0 .rodata @4177 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4177 = 6.0f / 5.0f; -COMPILER_STRIP_GATE(8064EB48, &lit_4177); +COMPILER_STRIP_GATE(0x8064EB48, &lit_4177); #pragma pop /* 8064EB4C-8064EB50 000030 0004+00 0/10 0/0 0/0 .rodata @4178 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4178 = 0.5f; -COMPILER_STRIP_GATE(8064EB4C, &lit_4178); +COMPILER_STRIP_GATE(0x8064EB4C, &lit_4178); #pragma pop /* 8064EB50-8064EB54 000034 0004+00 0/5 0/0 0/0 .rodata @4179 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4179 = 200.0f; -COMPILER_STRIP_GATE(8064EB50, &lit_4179); +COMPILER_STRIP_GATE(0x8064EB50, &lit_4179); #pragma pop /* 8064EB54-8064EB58 000038 0004+00 0/4 0/0 0/0 .rodata @4180 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4180 = -100.0f; -COMPILER_STRIP_GATE(8064EB54, &lit_4180); +COMPILER_STRIP_GATE(0x8064EB54, &lit_4180); #pragma pop /* 8064EB58-8064EB5C 00003C 0004+00 1/6 0/0 0/0 .rodata @4181 */ SECTION_RODATA static f32 const lit_4181 = 2.0f; -COMPILER_STRIP_GATE(8064EB58, &lit_4181); +COMPILER_STRIP_GATE(0x8064EB58, &lit_4181); /* 8064EE8C-8064EE98 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { @@ -1422,34 +1422,34 @@ SECTION_RODATA static u8 const data_8064EB5C[24] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x06, }; -COMPILER_STRIP_GATE(8064EB5C, &data_8064EB5C); +COMPILER_STRIP_GATE(0x8064EB5C, &data_8064EB5C); /* 8064EB74-8064EB78 000058 0004+00 0/1 0/0 0/0 .rodata @4333 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4333 = 2000.0f; -COMPILER_STRIP_GATE(8064EB74, &lit_4333); +COMPILER_STRIP_GATE(0x8064EB74, &lit_4333); #pragma pop /* 8064EB78-8064EB7C 00005C 0004+00 0/23 0/0 0/0 .rodata @4334 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4334 = 3.0f; -COMPILER_STRIP_GATE(8064EB78, &lit_4334); +COMPILER_STRIP_GATE(0x8064EB78, &lit_4334); #pragma pop /* 8064EB7C-8064EB80 000060 0004+00 0/2 0/0 0/0 .rodata @4335 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4335 = 1500.0f; -COMPILER_STRIP_GATE(8064EB7C, &lit_4335); +COMPILER_STRIP_GATE(0x8064EB7C, &lit_4335); #pragma pop /* 8064EB80-8064EB84 000064 0004+00 0/4 0/0 0/0 .rodata @4336 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4336 = 800.0f; -COMPILER_STRIP_GATE(8064EB80, &lit_4336); +COMPILER_STRIP_GATE(0x8064EB80, &lit_4336); #pragma pop /* 8063E2B0-8063E568 000290 02B8+00 1/1 0/0 0/0 .text draw__10daB_ZANT_cFv */ @@ -1485,7 +1485,13 @@ static asm void daB_ZANT_Draw(daB_ZANT_c* param_0) { /* ############################################################################################## */ /* 8064EB84-8064EB88 000068 0004+00 1/2 0/0 0/0 .rodata @4348 */ SECTION_RODATA static f32 const lit_4348 = -1.0f; -COMPILER_STRIP_GATE(8064EB84, &lit_4348); +COMPILER_STRIP_GATE(0x8064EB84, &lit_4348); + +/* 8064EE60-8064EE60 000344 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8064EE60 = "B_zan"; +#pragma pop /* 8063E5C4-8063E668 0005A4 00A4+00 23/23 0/0 0/0 .text setBck__10daB_ZANT_cFiUcff */ #pragma push @@ -1552,7 +1558,7 @@ asm void daB_ZANT_c::setDamageSe(dCcD_Sph* param_0, int param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4706 = 19.0f / 10.0f; -COMPILER_STRIP_GATE(8064EB88, &lit_4706); +COMPILER_STRIP_GATE(0x8064EB88, &lit_4706); #pragma pop /* 8064EB8C-8064EB94 000070 0008+00 0/5 0/0 0/0 .rodata @4708 */ @@ -1561,7 +1567,7 @@ COMPILER_STRIP_GATE(8064EB88, &lit_4706); SECTION_RODATA static u8 const lit_4708[8] = { 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8064EB8C, &lit_4708); +COMPILER_STRIP_GATE(0x8064EB8C, &lit_4708); #pragma pop /* 8064F5B8-8064F5BC 000008 0001+03 1/1 0/0 0/0 .bss @1109 */ @@ -1772,14 +1778,14 @@ asm void daB_ZANT_c::setNextDamageMode(int param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4938 = 300.0f; -COMPILER_STRIP_GATE(8064EB94, &lit_4938); +COMPILER_STRIP_GATE(0x8064EB94, &lit_4938); #pragma pop /* 8064EB98-8064EB9C 00007C 0004+00 0/5 0/0 0/0 .rodata @4939 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4939 = 700.0f; -COMPILER_STRIP_GATE(8064EB98, &lit_4939); +COMPILER_STRIP_GATE(0x8064EB98, &lit_4939); #pragma pop /* 8063F970-8063FAB4 001950 0144+00 1/1 0/0 0/0 .text s_obj_sub__FPvPv */ @@ -1799,7 +1805,7 @@ static asm void s_obj_sub(void* param_0, void* param_1) { SECTION_RODATA static u8 const lit_5084[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8064EB9C, &lit_5084); +COMPILER_STRIP_GATE(0x8064EB9C, &lit_5084); #pragma pop /* 8064EBA4-8064EBAC 000088 0008+00 0/9 0/0 0/0 .rodata @5085 */ @@ -1808,7 +1814,7 @@ COMPILER_STRIP_GATE(8064EB9C, &lit_5084); SECTION_RODATA static u8 const lit_5085[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8064EBA4, &lit_5085); +COMPILER_STRIP_GATE(0x8064EBA4, &lit_5085); #pragma pop /* 8064EBAC-8064EBB4 000090 0008+00 0/9 0/0 0/0 .rodata @5086 */ @@ -1817,7 +1823,7 @@ COMPILER_STRIP_GATE(8064EBA4, &lit_5085); SECTION_RODATA static u8 const lit_5086[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8064EBAC, &lit_5086); +COMPILER_STRIP_GATE(0x8064EBAC, &lit_5086); #pragma pop /* 8063FAB4-8063FF6C 001A94 04B8+00 3/3 0/0 0/0 .text checkAvoidWeapon__10daB_ZANT_cFi */ @@ -1973,28 +1979,28 @@ asm void daB_ZANT_c::getMagicWaterSpeed() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5492 = 16.0f; -COMPILER_STRIP_GATE(8064EBB4, &lit_5492); +COMPILER_STRIP_GATE(0x8064EBB4, &lit_5492); #pragma pop /* 8064EBB8-8064EBBC 00009C 0004+00 0/3 0/0 0/0 .rodata @5493 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5493 = 13.0f; -COMPILER_STRIP_GATE(8064EBB8, &lit_5493); +COMPILER_STRIP_GATE(0x8064EBB8, &lit_5493); #pragma pop /* 8064EBBC-8064EBC0 0000A0 0004+00 0/2 0/0 0/0 .rodata @5494 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5494 = 9.0f; -COMPILER_STRIP_GATE(8064EBBC, &lit_5494); +COMPILER_STRIP_GATE(0x8064EBBC, &lit_5494); #pragma pop /* 8064EBC0-8064EBC4 0000A4 0004+00 0/4 0/0 0/0 .rodata @5495 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5495 = 19.0f; -COMPILER_STRIP_GATE(8064EBC0, &lit_5495); +COMPILER_STRIP_GATE(0x8064EBC0, &lit_5495); #pragma pop /* 80640674-80640C20 002654 05AC+00 1/1 0/0 0/0 .text executeSmallAttack__10daB_ZANT_cFv @@ -2013,21 +2019,21 @@ asm void daB_ZANT_c::executeSmallAttack() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5510 = 0.25f; -COMPILER_STRIP_GATE(8064EBC4, &lit_5510); +COMPILER_STRIP_GATE(0x8064EBC4, &lit_5510); #pragma pop /* 8064EBC8-8064EBCC 0000AC 0004+00 0/7 0/0 0/0 .rodata @5511 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5511 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(8064EBC8, &lit_5511); +COMPILER_STRIP_GATE(0x8064EBC8, &lit_5511); #pragma pop /* 8064EBCC-8064EBD0 0000B0 0004+00 0/2 0/0 0/0 .rodata @5512 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5512 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(8064EBCC, &lit_5512); +COMPILER_STRIP_GATE(0x8064EBCC, &lit_5512); #pragma pop /* 80640C20-80640D14 002C00 00F4+00 3/3 0/0 0/0 .text calcScale__10daB_ZANT_cFi */ @@ -2045,7 +2051,7 @@ asm void daB_ZANT_c::calcScale(int param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5606 = -1000000000.0f; -COMPILER_STRIP_GATE(8064EBD0, &lit_5606); +COMPILER_STRIP_GATE(0x8064EBD0, &lit_5606); #pragma pop /* 80640D14-80641230 002CF4 051C+00 1/1 0/0 0/0 .text executeWarp__10daB_ZANT_cFv */ @@ -2093,350 +2099,350 @@ asm void daB_ZANT_c::executeConfuse() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5990 = 160.0f; -COMPILER_STRIP_GATE(8064EBD4, &lit_5990); +COMPILER_STRIP_GATE(0x8064EBD4, &lit_5990); #pragma pop /* 8064EBD8-8064EBDC 0000BC 0004+00 0/1 0/0 0/0 .rodata @5991 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5991 = -700.0f; -COMPILER_STRIP_GATE(8064EBD8, &lit_5991); +COMPILER_STRIP_GATE(0x8064EBD8, &lit_5991); #pragma pop /* 8064EBDC-8064EBE0 0000C0 0004+00 0/1 0/0 0/0 .rodata @5992 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5992 = 220.0f; -COMPILER_STRIP_GATE(8064EBDC, &lit_5992); +COMPILER_STRIP_GATE(0x8064EBDC, &lit_5992); #pragma pop /* 8064EBE0-8064EBE4 0000C4 0004+00 0/2 0/0 0/0 .rodata @5993 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5993 = 175.0f; -COMPILER_STRIP_GATE(8064EBE0, &lit_5993); +COMPILER_STRIP_GATE(0x8064EBE0, &lit_5993); #pragma pop /* 8064EBE4-8064EBE8 0000C8 0004+00 0/1 0/0 0/0 .rodata @5994 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5994 = 270.0f; -COMPILER_STRIP_GATE(8064EBE4, &lit_5994); +COMPILER_STRIP_GATE(0x8064EBE4, &lit_5994); #pragma pop /* 8064EBE8-8064EBEC 0000CC 0004+00 0/1 0/0 0/0 .rodata @5995 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5995 = -194.0f; -COMPILER_STRIP_GATE(8064EBE8, &lit_5995); +COMPILER_STRIP_GATE(0x8064EBE8, &lit_5995); #pragma pop /* 8064EBEC-8064EBF0 0000D0 0004+00 0/7 0/0 0/0 .rodata @5996 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5996 = 30.0f; -COMPILER_STRIP_GATE(8064EBEC, &lit_5996); +COMPILER_STRIP_GATE(0x8064EBEC, &lit_5996); #pragma pop /* 8064EBF0-8064EBF4 0000D4 0004+00 0/1 0/0 0/0 .rodata @5997 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5997 = 81.0f; -COMPILER_STRIP_GATE(8064EBF0, &lit_5997); +COMPILER_STRIP_GATE(0x8064EBF0, &lit_5997); #pragma pop /* 8064EBF4-8064EBF8 0000D8 0004+00 0/1 0/0 0/0 .rodata @5998 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5998 = -187.0f; -COMPILER_STRIP_GATE(8064EBF4, &lit_5998); +COMPILER_STRIP_GATE(0x8064EBF4, &lit_5998); #pragma pop /* 8064EBF8-8064EBFC 0000DC 0004+00 0/1 0/0 0/0 .rodata @5999 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5999 = 67.0f; -COMPILER_STRIP_GATE(8064EBF8, &lit_5999); +COMPILER_STRIP_GATE(0x8064EBF8, &lit_5999); #pragma pop /* 8064EBFC-8064EC00 0000E0 0004+00 0/1 0/0 0/0 .rodata @6000 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6000 = -408.0f; -COMPILER_STRIP_GATE(8064EBFC, &lit_6000); +COMPILER_STRIP_GATE(0x8064EBFC, &lit_6000); #pragma pop /* 8064EC00-8064EC04 0000E4 0004+00 0/1 0/0 0/0 .rodata @6001 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6001 = 43.0f / 10.0f; -COMPILER_STRIP_GATE(8064EC00, &lit_6001); +COMPILER_STRIP_GATE(0x8064EC00, &lit_6001); #pragma pop /* 8064EC04-8064EC08 0000E8 0004+00 0/3 0/0 0/0 .rodata @6002 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6002 = 6.0f; -COMPILER_STRIP_GATE(8064EC04, &lit_6002); +COMPILER_STRIP_GATE(0x8064EC04, &lit_6002); #pragma pop /* 8064EC08-8064EC0C 0000EC 0004+00 0/4 0/0 0/0 .rodata @6003 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6003 = 5.0f; -COMPILER_STRIP_GATE(8064EC08, &lit_6003); +COMPILER_STRIP_GATE(0x8064EC08, &lit_6003); #pragma pop /* 8064EC0C-8064EC10 0000F0 0004+00 0/1 0/0 0/0 .rodata @6004 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6004 = 86.0f; -COMPILER_STRIP_GATE(8064EC0C, &lit_6004); +COMPILER_STRIP_GATE(0x8064EC0C, &lit_6004); #pragma pop /* 8064EC10-8064EC14 0000F4 0004+00 0/1 0/0 0/0 .rodata @6005 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6005 = -9.0f; -COMPILER_STRIP_GATE(8064EC10, &lit_6005); +COMPILER_STRIP_GATE(0x8064EC10, &lit_6005); #pragma pop /* 8064EC14-8064EC18 0000F8 0004+00 0/1 0/0 0/0 .rodata @6006 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6006 = -209.0f; -COMPILER_STRIP_GATE(8064EC14, &lit_6006); +COMPILER_STRIP_GATE(0x8064EC14, &lit_6006); #pragma pop /* 8064EC18-8064EC1C 0000FC 0004+00 0/2 0/0 0/0 .rodata @6007 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6007 = 26.0f; -COMPILER_STRIP_GATE(8064EC18, &lit_6007); +COMPILER_STRIP_GATE(0x8064EC18, &lit_6007); #pragma pop /* 8064EC1C-8064EC20 000100 0004+00 0/1 0/0 0/0 .rodata @6008 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6008 = 225.0f; -COMPILER_STRIP_GATE(8064EC1C, &lit_6008); +COMPILER_STRIP_GATE(0x8064EC1C, &lit_6008); #pragma pop /* 8064EC20-8064EC24 000104 0004+00 0/1 0/0 0/0 .rodata @6009 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6009 = -1700.0f; -COMPILER_STRIP_GATE(8064EC20, &lit_6009); +COMPILER_STRIP_GATE(0x8064EC20, &lit_6009); #pragma pop /* 8064EC24-8064EC28 000108 0004+00 0/1 0/0 0/0 .rodata @6010 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6010 = -500.0f; -COMPILER_STRIP_GATE(8064EC24, &lit_6010); +COMPILER_STRIP_GATE(0x8064EC24, &lit_6010); #pragma pop /* 8064EC28-8064EC2C 00010C 0004+00 0/2 0/0 0/0 .rodata @6011 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6011 = 70.0f; -COMPILER_STRIP_GATE(8064EC28, &lit_6011); +COMPILER_STRIP_GATE(0x8064EC28, &lit_6011); #pragma pop /* 8064EC2C-8064EC30 000110 0004+00 0/1 0/0 0/0 .rodata @6012 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6012 = -300.0f; -COMPILER_STRIP_GATE(8064EC2C, &lit_6012); +COMPILER_STRIP_GATE(0x8064EC2C, &lit_6012); #pragma pop /* 8064EC30-8064EC34 000114 0004+00 0/1 0/0 0/0 .rodata @6013 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6013 = 68.0f; -COMPILER_STRIP_GATE(8064EC30, &lit_6013); +COMPILER_STRIP_GATE(0x8064EC30, &lit_6013); #pragma pop /* 8064EC34-8064EC38 000118 0004+00 0/2 0/0 0/0 .rodata @6014 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6014 = 32.0f; -COMPILER_STRIP_GATE(8064EC34, &lit_6014); +COMPILER_STRIP_GATE(0x8064EC34, &lit_6014); #pragma pop /* 8064EC38-8064EC3C 00011C 0004+00 0/1 0/0 0/0 .rodata @6015 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6015 = 290.0f; -COMPILER_STRIP_GATE(8064EC38, &lit_6015); +COMPILER_STRIP_GATE(0x8064EC38, &lit_6015); #pragma pop /* 8064EC3C-8064EC40 000120 0004+00 0/1 0/0 0/0 .rodata @6016 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6016 = -1678.0f; -COMPILER_STRIP_GATE(8064EC3C, &lit_6016); +COMPILER_STRIP_GATE(0x8064EC3C, &lit_6016); #pragma pop /* 8064EC40-8064EC44 000124 0004+00 0/1 0/0 0/0 .rodata @6017 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6017 = 66.0f; -COMPILER_STRIP_GATE(8064EC40, &lit_6017); +COMPILER_STRIP_GATE(0x8064EC40, &lit_6017); #pragma pop /* 8064EC44-8064EC48 000128 0004+00 0/1 0/0 0/0 .rodata @6018 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6018 = 180.0f; -COMPILER_STRIP_GATE(8064EC44, &lit_6018); +COMPILER_STRIP_GATE(0x8064EC44, &lit_6018); #pragma pop /* 8064EC48-8064EC4C 00012C 0004+00 0/1 0/0 0/0 .rodata @6019 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6019 = -989.0f; -COMPILER_STRIP_GATE(8064EC48, &lit_6019); +COMPILER_STRIP_GATE(0x8064EC48, &lit_6019); #pragma pop /* 8064EC4C-8064EC50 000130 0004+00 0/1 0/0 0/0 .rodata @6020 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6020 = 60.0f; -COMPILER_STRIP_GATE(8064EC4C, &lit_6020); +COMPILER_STRIP_GATE(0x8064EC4C, &lit_6020); #pragma pop /* 8064EC50-8064EC54 000134 0004+00 0/2 0/0 0/0 .rodata @6021 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6021 = -140.0f; -COMPILER_STRIP_GATE(8064EC50, &lit_6021); +COMPILER_STRIP_GATE(0x8064EC50, &lit_6021); #pragma pop /* 8064EC54-8064EC58 000138 0004+00 0/4 0/0 0/0 .rodata @6022 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6022 = 250.0f; -COMPILER_STRIP_GATE(8064EC54, &lit_6022); +COMPILER_STRIP_GATE(0x8064EC54, &lit_6022); #pragma pop /* 8064EC58-8064EC5C 00013C 0004+00 0/2 0/0 0/0 .rodata @6023 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6023 = -800.0f; -COMPILER_STRIP_GATE(8064EC58, &lit_6023); +COMPILER_STRIP_GATE(0x8064EC58, &lit_6023); #pragma pop /* 8064EC5C-8064EC60 000140 0004+00 0/2 0/0 0/0 .rodata @6024 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6024 = 58.0f; -COMPILER_STRIP_GATE(8064EC5C, &lit_6024); +COMPILER_STRIP_GATE(0x8064EC5C, &lit_6024); #pragma pop /* 8064EC60-8064EC64 000144 0004+00 0/1 0/0 0/0 .rodata @6025 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6025 = -85.0f; -COMPILER_STRIP_GATE(8064EC60, &lit_6025); +COMPILER_STRIP_GATE(0x8064EC60, &lit_6025); #pragma pop /* 8064EC64-8064EC68 000148 0004+00 0/1 0/0 0/0 .rodata @6026 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6026 = 344.0f; -COMPILER_STRIP_GATE(8064EC64, &lit_6026); +COMPILER_STRIP_GATE(0x8064EC64, &lit_6026); #pragma pop /* 8064EC68-8064EC6C 00014C 0004+00 0/1 0/0 0/0 .rodata @6027 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6027 = 382.0f; -COMPILER_STRIP_GATE(8064EC68, &lit_6027); +COMPILER_STRIP_GATE(0x8064EC68, &lit_6027); #pragma pop /* 8064EC6C-8064EC70 000150 0004+00 0/1 0/0 0/0 .rodata @6028 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6028 = 258.0f; -COMPILER_STRIP_GATE(8064EC6C, &lit_6028); +COMPILER_STRIP_GATE(0x8064EC6C, &lit_6028); #pragma pop /* 8064EC70-8064EC74 000154 0004+00 0/1 0/0 0/0 .rodata @6029 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6029 = 672.0f; -COMPILER_STRIP_GATE(8064EC70, &lit_6029); +COMPILER_STRIP_GATE(0x8064EC70, &lit_6029); #pragma pop /* 8064EC74-8064EC78 000158 0004+00 0/1 0/0 0/0 .rodata @6030 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6030 = 1374.0f; -COMPILER_STRIP_GATE(8064EC74, &lit_6030); +COMPILER_STRIP_GATE(0x8064EC74, &lit_6030); #pragma pop /* 8064EC78-8064EC7C 00015C 0004+00 0/2 0/0 0/0 .rodata @6031 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6031 = 550.0f; -COMPILER_STRIP_GATE(8064EC78, &lit_6031); +COMPILER_STRIP_GATE(0x8064EC78, &lit_6031); #pragma pop /* 8064EC7C-8064EC80 000160 0004+00 0/1 0/0 0/0 .rodata @6032 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6032 = 9.0f / 10.0f; -COMPILER_STRIP_GATE(8064EC7C, &lit_6032); +COMPILER_STRIP_GATE(0x8064EC7C, &lit_6032); #pragma pop /* 8064EC80-8064EC84 000164 0004+00 0/1 0/0 0/0 .rodata @6033 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6033 = 922.0f; -COMPILER_STRIP_GATE(8064EC80, &lit_6033); +COMPILER_STRIP_GATE(0x8064EC80, &lit_6033); #pragma pop /* 8064EC84-8064EC88 000168 0004+00 0/3 0/0 0/0 .rodata @6034 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6034 = 3.0f / 10.0f; -COMPILER_STRIP_GATE(8064EC84, &lit_6034); +COMPILER_STRIP_GATE(0x8064EC84, &lit_6034); #pragma pop /* 8064EC88-8064EC8C 00016C 0004+00 0/1 0/0 0/0 .rodata @6035 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_6035 = 0x3BC49BA6; -COMPILER_STRIP_GATE(8064EC88, &lit_6035); +COMPILER_STRIP_GATE(0x8064EC88, &lit_6035); #pragma pop /* 8064EC8C-8064EC90 000170 0004+00 0/1 0/0 0/0 .rodata @6036 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6036 = 110.0f; -COMPILER_STRIP_GATE(8064EC8C, &lit_6036); +COMPILER_STRIP_GATE(0x8064EC8C, &lit_6036); #pragma pop /* 8064EC90-8064EC94 000174 0004+00 0/1 0/0 0/0 .rodata @6037 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6037 = 1.0f / 100.0f; -COMPILER_STRIP_GATE(8064EC90, &lit_6037); +COMPILER_STRIP_GATE(0x8064EC90, &lit_6037); #pragma pop /* 8064EC94-8064EC98 000178 0004+00 0/2 0/0 0/0 .rodata @6038 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6038 = 140.0f; -COMPILER_STRIP_GATE(8064EC94, &lit_6038); +COMPILER_STRIP_GATE(0x8064EC94, &lit_6038); #pragma pop /* 8064EC98-8064EC9C 00017C 0004+00 0/1 0/0 0/0 .rodata @6039 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6039 = 1.0f / 50.0f; -COMPILER_STRIP_GATE(8064EC98, &lit_6039); +COMPILER_STRIP_GATE(0x8064EC98, &lit_6039); #pragma pop /* 8064EC9C-8064ECA4 000180 0008+00 0/4 0/0 0/0 .rodata @6041 */ @@ -2445,7 +2451,14 @@ COMPILER_STRIP_GATE(8064EC98, &lit_6039); SECTION_RODATA static u8 const lit_6041[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8064EC9C, &lit_6041); +COMPILER_STRIP_GATE(0x8064EC9C, &lit_6041); +#pragma pop + +/* 8064EE60-8064EE60 000344 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8064EE66 = "force_start"; +SECTION_DEAD static char const* const stringBase_8064EE72 = "force_end"; #pragma pop /* 80641640-806427EC 003620 11AC+00 2/2 0/0 0/0 .text executeOpening__10daB_ZANT_cFv */ @@ -2483,91 +2496,91 @@ asm void daB_ZANT_c::executeFlyGround() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6162 = 45.0f; -COMPILER_STRIP_GATE(8064ECA4, &lit_6162); +COMPILER_STRIP_GATE(0x8064ECA4, &lit_6162); #pragma pop /* 8064ECA8-8064ECAC 00018C 0004+00 0/4 0/0 0/0 .rodata @6163 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6163 = -5.0f; -COMPILER_STRIP_GATE(8064ECA8, &lit_6163); +COMPILER_STRIP_GATE(0x8064ECA8, &lit_6163); #pragma pop /* 8064ECAC-8064ECB0 000190 0004+00 0/0 0/0 0/0 .rodata @6164 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6164 = -10.0f; -COMPILER_STRIP_GATE(8064ECAC, &lit_6164); +COMPILER_STRIP_GATE(0x8064ECAC, &lit_6164); #pragma pop /* 8064ECB0-8064ECB4 000194 0004+00 0/0 0/0 0/0 .rodata @6165 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6165 = -2.0f; -COMPILER_STRIP_GATE(8064ECB0, &lit_6165); +COMPILER_STRIP_GATE(0x8064ECB0, &lit_6165); #pragma pop /* 8064ECB4-8064ECB8 000198 0004+00 0/6 0/0 0/0 .rodata @6166 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6166 = 50.0f; -COMPILER_STRIP_GATE(8064ECB4, &lit_6166); +COMPILER_STRIP_GATE(0x8064ECB4, &lit_6166); #pragma pop /* 8064ECB8-8064ECBC 00019C 0004+00 0/0 0/0 0/0 .rodata @6167 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6167 = 4096.0f; -COMPILER_STRIP_GATE(8064ECB8, &lit_6167); +COMPILER_STRIP_GATE(0x8064ECB8, &lit_6167); #pragma pop /* 8064ECBC-8064ECC0 0001A0 0004+00 0/2 0/0 0/0 .rodata @6168 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6168 = 29.0f / 10.0f; -COMPILER_STRIP_GATE(8064ECBC, &lit_6168); +COMPILER_STRIP_GATE(0x8064ECBC, &lit_6168); #pragma pop /* 8064ECC0-8064ECC4 0001A4 0004+00 0/0 0/0 0/0 .rodata @6169 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6169 = 32768.0f; -COMPILER_STRIP_GATE(8064ECC0, &lit_6169); +COMPILER_STRIP_GATE(0x8064ECC0, &lit_6169); #pragma pop /* 8064ECC4-8064ECC8 0001A8 0004+00 0/0 0/0 0/0 .rodata @6170 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6170 = 1.5f; -COMPILER_STRIP_GATE(8064ECC4, &lit_6170); +COMPILER_STRIP_GATE(0x8064ECC4, &lit_6170); #pragma pop /* 8064ECC8-8064ECCC 0001AC 0004+00 0/2 0/0 0/0 .rodata @6171 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6171 = 18.0f; -COMPILER_STRIP_GATE(8064ECC8, &lit_6171); +COMPILER_STRIP_GATE(0x8064ECC8, &lit_6171); #pragma pop /* 8064ECCC-8064ECD0 0001B0 0004+00 0/2 0/0 0/0 .rodata @6172 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6172 = 23.0f; -COMPILER_STRIP_GATE(8064ECCC, &lit_6172); +COMPILER_STRIP_GATE(0x8064ECCC, &lit_6172); #pragma pop /* 8064ECD0-8064ECD4 0001B4 0004+00 0/1 0/0 0/0 .rodata @6282 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6282 = 900.0f; -COMPILER_STRIP_GATE(8064ECD0, &lit_6282); +COMPILER_STRIP_GATE(0x8064ECD0, &lit_6282); #pragma pop /* 8064ECD4-8064ECD8 0001B8 0004+00 0/4 0/0 0/0 .rodata @6283 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6283 = 400.0f; -COMPILER_STRIP_GATE(8064ECD4, &lit_6283); +COMPILER_STRIP_GATE(0x8064ECD4, &lit_6283); #pragma pop /* 806430E0-806432F8 0050C0 0218+00 1/1 0/0 0/0 .text checkSwimLinkNearMouth__10daB_ZANT_cFv */ @@ -2626,84 +2639,84 @@ asm void daB_ZANT_c::executeSwim() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6630 = 1000.0f; -COMPILER_STRIP_GATE(8064ECD8, &lit_6630); +COMPILER_STRIP_GATE(0x8064ECD8, &lit_6630); #pragma pop /* 8064ECDC-8064ECE0 0001C0 0004+00 0/1 0/0 0/0 .rodata @6864 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6864 = 600.0f; -COMPILER_STRIP_GATE(8064ECDC, &lit_6864); +COMPILER_STRIP_GATE(0x8064ECDC, &lit_6864); #pragma pop /* 8064ECE0-8064ECE4 0001C4 0004+00 0/1 0/0 0/0 .rodata @6865 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6865 = 1200.0f; -COMPILER_STRIP_GATE(8064ECE0, &lit_6865); +COMPILER_STRIP_GATE(0x8064ECE0, &lit_6865); #pragma pop /* 8064ECE4-8064ECE8 0001C8 0004+00 0/0 0/0 0/0 .rodata @6866 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6866 = 29.0f; -COMPILER_STRIP_GATE(8064ECE4, &lit_6866); +COMPILER_STRIP_GATE(0x8064ECE4, &lit_6866); #pragma pop /* 8064ECE8-8064ECEC 0001CC 0004+00 0/0 0/0 0/0 .rodata @6867 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6867 = 12.0f; -COMPILER_STRIP_GATE(8064ECE8, &lit_6867); +COMPILER_STRIP_GATE(0x8064ECE8, &lit_6867); #pragma pop /* 8064ECEC-8064ECF0 0001D0 0004+00 0/1 0/0 0/0 .rodata @6868 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6868 = 28.0f; -COMPILER_STRIP_GATE(8064ECEC, &lit_6868); +COMPILER_STRIP_GATE(0x8064ECEC, &lit_6868); #pragma pop /* 8064ECF0-8064ECF4 0001D4 0004+00 0/1 0/0 0/0 .rodata @7002 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7002 = 55.0f; -COMPILER_STRIP_GATE(8064ECF0, &lit_7002); +COMPILER_STRIP_GATE(0x8064ECF0, &lit_7002); #pragma pop /* 8064ECF4-8064ECF8 0001D8 0004+00 0/2 0/0 0/0 .rodata @7003 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7003 = 7.0f; -COMPILER_STRIP_GATE(8064ECF4, &lit_7003); +COMPILER_STRIP_GATE(0x8064ECF4, &lit_7003); #pragma pop /* 8064ECF8-8064ECFC 0001DC 0004+00 0/3 0/0 0/0 .rodata @7004 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7004 = 8.0f; -COMPILER_STRIP_GATE(8064ECF8, &lit_7004); +COMPILER_STRIP_GATE(0x8064ECF8, &lit_7004); #pragma pop /* 8064ECFC-8064ED00 0001E0 0004+00 0/1 0/0 0/0 .rodata @7005 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7005 = 2048.0f; -COMPILER_STRIP_GATE(8064ECFC, &lit_7005); +COMPILER_STRIP_GATE(0x8064ECFC, &lit_7005); #pragma pop /* 8064ED00-8064ED04 0001E4 0004+00 0/2 0/0 0/0 .rodata @7006 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7006 = 4.0f; -COMPILER_STRIP_GATE(8064ED00, &lit_7006); +COMPILER_STRIP_GATE(0x8064ED00, &lit_7006); #pragma pop /* 8064ED04-8064ED08 0001E8 0004+00 0/1 0/0 0/0 .rodata @7007 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7007 = 1100.0f; -COMPILER_STRIP_GATE(8064ED04, &lit_7007); +COMPILER_STRIP_GATE(0x8064ED04, &lit_7007); #pragma pop /* 80644A3C-80645014 006A1C 05D8+00 1/1 0/0 0/0 .text executeSimaJump__10daB_ZANT_cFv */ @@ -2721,7 +2734,7 @@ asm void daB_ZANT_c::executeSimaJump() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7062 = 115.0f; -COMPILER_STRIP_GATE(8064ED08, &lit_7062); +COMPILER_STRIP_GATE(0x8064ED08, &lit_7062); #pragma pop /* 80645014-8064524C 006FF4 0238+00 1/1 0/0 0/0 .text executeIceDemo__10daB_ZANT_cFv */ @@ -2739,7 +2752,7 @@ asm void daB_ZANT_c::executeIceDemo() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7419 = 130.0f; -COMPILER_STRIP_GATE(8064ED0C, &lit_7419); +COMPILER_STRIP_GATE(0x8064ED0C, &lit_7419); #pragma pop /* 8064524C-80645DA4 00722C 0B58+00 2/1 0/0 0/0 .text executeIceJump__10daB_ZANT_cFv */ @@ -2757,77 +2770,77 @@ asm void daB_ZANT_c::executeIceJump() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7420 = 20.0f; -COMPILER_STRIP_GATE(8064ED10, &lit_7420); +COMPILER_STRIP_GATE(0x8064ED10, &lit_7420); #pragma pop /* 8064ED14-8064ED18 0001F8 0004+00 0/1 0/0 0/0 .rodata @7697 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7697 = 24.0f; -COMPILER_STRIP_GATE(8064ED14, &lit_7697); +COMPILER_STRIP_GATE(0x8064ED14, &lit_7697); #pragma pop /* 8064ED18-8064ED1C 0001FC 0004+00 0/3 0/0 0/0 .rodata @7698 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7698 = 14.0f; -COMPILER_STRIP_GATE(8064ED18, &lit_7698); +COMPILER_STRIP_GATE(0x8064ED18, &lit_7698); #pragma pop /* 8064ED1C-8064ED20 000200 0004+00 0/1 0/0 0/0 .rodata @7699 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7699 = 27.0f; -COMPILER_STRIP_GATE(8064ED1C, &lit_7699); +COMPILER_STRIP_GATE(0x8064ED1C, &lit_7699); #pragma pop /* 8064ED20-8064ED24 000204 0004+00 0/2 0/0 0/0 .rodata @7700 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7700 = 17.0f; -COMPILER_STRIP_GATE(8064ED20, &lit_7700); +COMPILER_STRIP_GATE(0x8064ED20, &lit_7700); #pragma pop /* 8064ED24-8064ED28 000208 0004+00 0/1 0/0 0/0 .rodata @7701 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7701 = 31.0f; -COMPILER_STRIP_GATE(8064ED24, &lit_7701); +COMPILER_STRIP_GATE(0x8064ED24, &lit_7701); #pragma pop /* 8064ED28-8064ED2C 00020C 0004+00 0/1 0/0 0/0 .rodata @7702 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7702 = 21.0f; -COMPILER_STRIP_GATE(8064ED28, &lit_7702); +COMPILER_STRIP_GATE(0x8064ED28, &lit_7702); #pragma pop /* 8064ED2C-8064ED30 000210 0004+00 0/1 0/0 0/0 .rodata @7703 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7703 = 11.0f; -COMPILER_STRIP_GATE(8064ED2C, &lit_7703); +COMPILER_STRIP_GATE(0x8064ED2C, &lit_7703); #pragma pop /* 8064ED30-8064ED34 000214 0004+00 0/1 0/0 0/0 .rodata @7704 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7704 = 35.0f; -COMPILER_STRIP_GATE(8064ED30, &lit_7704); +COMPILER_STRIP_GATE(0x8064ED30, &lit_7704); #pragma pop /* 8064ED34-8064ED38 000218 0004+00 0/1 0/0 0/0 .rodata @7705 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7705 = -35.0f; -COMPILER_STRIP_GATE(8064ED34, &lit_7705); +COMPILER_STRIP_GATE(0x8064ED34, &lit_7705); #pragma pop /* 8064ED38-8064ED3C 00021C 0004+00 0/1 0/0 0/0 .rodata @7706 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7706 = -30.0f; -COMPILER_STRIP_GATE(8064ED38, &lit_7706); +COMPILER_STRIP_GATE(0x8064ED38, &lit_7706); #pragma pop /* 80645DA4-8064687C 007D84 0AD8+00 1/1 0/0 0/0 .text executeIceStep__10daB_ZANT_cFv */ @@ -2849,7 +2862,7 @@ SECTION_RODATA static u8 const damage_scale[44] = { 0x00, 0x40, 0x90, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x3F, 0xB3, 0x33, 0x33, 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x33, 0x33, 0x33, 0x3F, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8064ED3C, &damage_scale); +COMPILER_STRIP_GATE(0x8064ED3C, &damage_scale); #pragma pop /* 8064ED68-8064ED94 00024C 002C+00 0/1 0/0 0/0 .rodata damage_jump_speed$7712 */ @@ -2860,21 +2873,21 @@ SECTION_RODATA static u8 const damage_jump_speed[44] = { 0x00, 0x42, 0xA0, 0x00, 0x00, 0x42, 0x96, 0x00, 0x00, 0x42, 0x8C, 0x00, 0x00, 0x42, 0x82, 0x00, 0x00, 0x42, 0x70, 0x00, 0x00, 0x42, 0x5C, 0x00, 0x00, 0x42, 0x48, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8064ED68, &damage_jump_speed); +COMPILER_STRIP_GATE(0x8064ED68, &damage_jump_speed); #pragma pop /* 8064ED94-8064ED98 000278 0004+00 0/1 0/0 0/0 .rodata @7978 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7978 = 25.0f; -COMPILER_STRIP_GATE(8064ED94, &lit_7978); +COMPILER_STRIP_GATE(0x8064ED94, &lit_7978); #pragma pop /* 8064ED98-8064ED9C 00027C 0004+00 0/1 0/0 0/0 .rodata @7979 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7979 = -15.0f; -COMPILER_STRIP_GATE(8064ED98, &lit_7979); +COMPILER_STRIP_GATE(0x8064ED98, &lit_7979); #pragma pop /* 8064687C-806471CC 00885C 0950+00 2/1 0/0 0/0 .text executeIceDamage__10daB_ZANT_cFv */ @@ -2892,12 +2905,12 @@ asm void daB_ZANT_c::executeIceDamage() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7980 = 49.0f / 10.0f; -COMPILER_STRIP_GATE(8064ED9C, &lit_7980); +COMPILER_STRIP_GATE(0x8064ED9C, &lit_7980); #pragma pop /* 8064EDA0-8064EDA4 000284 0004+00 2/4 0/0 0/0 .rodata @8037 */ SECTION_RODATA static f32 const lit_8037 = 500.0f; -COMPILER_STRIP_GATE(8064EDA0, &lit_8037); +COMPILER_STRIP_GATE(0x8064EDA0, &lit_8037); /* 806471CC-806473E4 0091AC 0218+00 1/1 0/0 0/0 .text setFarPillarPos__10daB_ZANT_cFv */ #pragma push @@ -2935,7 +2948,7 @@ asm void daB_ZANT_c::setNextPillarInfo(int param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8227 = 10000.0f; -COMPILER_STRIP_GATE(8064EDA4, &lit_8227); +COMPILER_STRIP_GATE(0x8064EDA4, &lit_8227); #pragma pop /* 806474F4-80647A34 0094D4 0540+00 1/1 0/0 0/0 .text setNextPillarPos__10daB_ZANT_cFv */ @@ -2995,42 +3008,42 @@ asm void daB_ZANT_c::executeMonkeyDamage() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8452 = -170.0f; -COMPILER_STRIP_GATE(8064EDA8, &lit_8452); +COMPILER_STRIP_GATE(0x8064EDA8, &lit_8452); #pragma pop /* 8064EDAC-8064EDB0 000290 0004+00 0/0 0/0 0/0 .rodata @8453 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8453 = -175.0f; -COMPILER_STRIP_GATE(8064EDAC, &lit_8453); +COMPILER_STRIP_GATE(0x8064EDAC, &lit_8453); #pragma pop /* 8064EDB0-8064EDB4 000294 0004+00 0/2 0/0 0/0 .rodata @8683 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8683 = -200.0f; -COMPILER_STRIP_GATE(8064EDB0, &lit_8683); +COMPILER_STRIP_GATE(0x8064EDB0, &lit_8683); #pragma pop /* 8064EDB4-8064EDB8 000298 0004+00 0/1 0/0 0/0 .rodata @8684 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8684 = 8192.0f; -COMPILER_STRIP_GATE(8064EDB4, &lit_8684); +COMPILER_STRIP_GATE(0x8064EDB4, &lit_8684); #pragma pop /* 8064EDB8-8064EDBC 00029C 0004+00 0/1 0/0 0/0 .rodata @8685 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8685 = -1400.0f; -COMPILER_STRIP_GATE(8064EDB8, &lit_8685); +COMPILER_STRIP_GATE(0x8064EDB8, &lit_8685); #pragma pop /* 8064EDBC-8064EDC0 0002A0 0004+00 0/1 0/0 0/0 .rodata @8686 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8686 = 39.0f / 10.0f; -COMPILER_STRIP_GATE(8064EDBC, &lit_8686); +COMPILER_STRIP_GATE(0x8064EDBC, &lit_8686); #pragma pop /* 80648778-80648F64 00A758 07EC+00 5/5 0/0 0/0 .text setLastWarp__10daB_ZANT_cFii */ @@ -3079,112 +3092,112 @@ asm void daB_ZANT_c::executeLastTired() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8793 = 480.0f; -COMPILER_STRIP_GATE(8064EDC0, &lit_8793); +COMPILER_STRIP_GATE(0x8064EDC0, &lit_8793); #pragma pop /* 8064EDC4-8064EDC8 0002A8 0004+00 0/2 0/0 0/0 .rodata @8794 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8794 = -1000.0f; -COMPILER_STRIP_GATE(8064EDC4, &lit_8794); +COMPILER_STRIP_GATE(0x8064EDC4, &lit_8794); #pragma pop /* 8064EDC8-8064EDCC 0002AC 0004+00 0/0 0/0 0/0 .rodata @8795 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8795 = -600.0f; -COMPILER_STRIP_GATE(8064EDC8, &lit_8795); +COMPILER_STRIP_GATE(0x8064EDC8, &lit_8795); #pragma pop /* 8064EDCC-8064EDD0 0002B0 0004+00 0/0 0/0 0/0 .rodata @8796 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8796 = 90.0f; -COMPILER_STRIP_GATE(8064EDCC, &lit_8796); +COMPILER_STRIP_GATE(0x8064EDCC, &lit_8796); #pragma pop /* 8064EDD0-8064EDD4 0002B4 0004+00 0/0 0/0 0/0 .rodata @8797 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8797 = -900.0f; -COMPILER_STRIP_GATE(8064EDD0, &lit_8797); +COMPILER_STRIP_GATE(0x8064EDD0, &lit_8797); #pragma pop /* 8064EDD4-8064EDD8 0002B8 0004+00 0/0 0/0 0/0 .rodata @8798 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8798 = 97.0f; -COMPILER_STRIP_GATE(8064EDD4, &lit_8798); +COMPILER_STRIP_GATE(0x8064EDD4, &lit_8798); #pragma pop /* 8064EDD8-8064EDDC 0002BC 0004+00 0/0 0/0 0/0 .rodata @8799 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8799 = 72.0f; -COMPILER_STRIP_GATE(8064EDD8, &lit_8799); +COMPILER_STRIP_GATE(0x8064EDD8, &lit_8799); #pragma pop /* 8064EDDC-8064EDE0 0002C0 0004+00 0/0 0/0 0/0 .rodata @8800 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8800 = 103.0f; -COMPILER_STRIP_GATE(8064EDDC, &lit_8800); +COMPILER_STRIP_GATE(0x8064EDDC, &lit_8800); #pragma pop /* 8064EDE0-8064EDE4 0002C4 0004+00 0/0 0/0 0/0 .rodata @8801 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8801 = 134.0f; -COMPILER_STRIP_GATE(8064EDE0, &lit_8801); +COMPILER_STRIP_GATE(0x8064EDE0, &lit_8801); #pragma pop /* 8064EDE4-8064EDE8 0002C8 0004+00 0/0 0/0 0/0 .rodata @8802 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8802 = 128.0f; -COMPILER_STRIP_GATE(8064EDE4, &lit_8802); +COMPILER_STRIP_GATE(0x8064EDE4, &lit_8802); #pragma pop /* 8064EDE8-8064EDEC 0002CC 0004+00 0/0 0/0 0/0 .rodata @9164 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9164 = 33.0f; -COMPILER_STRIP_GATE(8064EDE8, &lit_9164); +COMPILER_STRIP_GATE(0x8064EDE8, &lit_9164); #pragma pop /* 8064EDEC-8064EDF0 0002D0 0004+00 0/0 0/0 0/0 .rodata @9165 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9165 = 512.0f; -COMPILER_STRIP_GATE(8064EDEC, &lit_9165); +COMPILER_STRIP_GATE(0x8064EDEC, &lit_9165); #pragma pop /* 8064EDF0-8064EDF4 0002D4 0004+00 0/0 0/0 0/0 .rodata @9166 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9166 = 768.0f; -COMPILER_STRIP_GATE(8064EDF0, &lit_9166); +COMPILER_STRIP_GATE(0x8064EDF0, &lit_9166); #pragma pop /* 8064EDF4-8064EDF8 0002D8 0004+00 0/0 0/0 0/0 .rodata @9167 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9167 = -45.0f; -COMPILER_STRIP_GATE(8064EDF4, &lit_9167); +COMPILER_STRIP_GATE(0x8064EDF4, &lit_9167); #pragma pop /* 8064EDF8-8064EDFC 0002DC 0004+00 0/1 0/0 0/0 .rodata @9168 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9168 = 4.0f / 5.0f; -COMPILER_STRIP_GATE(8064EDF8, &lit_9168); +COMPILER_STRIP_GATE(0x8064EDF8, &lit_9168); #pragma pop /* 8064EDFC-8064EE00 0002E0 0004+00 0/1 0/0 0/0 .rodata @9306 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9306 = 38.0f; -COMPILER_STRIP_GATE(8064EDFC, &lit_9306); +COMPILER_STRIP_GATE(0x8064EDFC, &lit_9306); #pragma pop /* 8064A688-8064AC20 00C668 0598+00 2/1 0/0 0/0 .text executeLastDamage__10daB_ZANT_cFv @@ -3213,70 +3226,76 @@ static asm void s_del_tp(void* param_0, void* param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9432 = 120.0f; -COMPILER_STRIP_GATE(8064EE00, &lit_9432); +COMPILER_STRIP_GATE(0x8064EE00, &lit_9432); #pragma pop /* 8064EE04-8064EE08 0002E8 0004+00 0/1 0/0 0/0 .rodata @9433 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9433 = -750.0f; -COMPILER_STRIP_GATE(8064EE04, &lit_9433); +COMPILER_STRIP_GATE(0x8064EE04, &lit_9433); #pragma pop /* 8064EE08-8064EE0C 0002EC 0004+00 0/1 0/0 0/0 .rodata @9434 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9434 = 80.0f; -COMPILER_STRIP_GATE(8064EE08, &lit_9434); +COMPILER_STRIP_GATE(0x8064EE08, &lit_9434); #pragma pop /* 8064EE0C-8064EE10 0002F0 0004+00 0/1 0/0 0/0 .rodata @9435 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9435 = 44.0f; -COMPILER_STRIP_GATE(8064EE0C, &lit_9435); +COMPILER_STRIP_GATE(0x8064EE0C, &lit_9435); #pragma pop /* 8064EE10-8064EE14 0002F4 0004+00 0/1 0/0 0/0 .rodata @9436 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9436 = 205.0f; -COMPILER_STRIP_GATE(8064EE10, &lit_9436); +COMPILER_STRIP_GATE(0x8064EE10, &lit_9436); #pragma pop /* 8064EE14-8064EE18 0002F8 0004+00 0/1 0/0 0/0 .rodata @9437 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9437 = 230.0f; -COMPILER_STRIP_GATE(8064EE14, &lit_9437); +COMPILER_STRIP_GATE(0x8064EE14, &lit_9437); #pragma pop /* 8064EE18-8064EE1C 0002FC 0004+00 0/1 0/0 0/0 .rodata @9438 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9438 = 150.0f; -COMPILER_STRIP_GATE(8064EE18, &lit_9438); +COMPILER_STRIP_GATE(0x8064EE18, &lit_9438); #pragma pop /* 8064EE1C-8064EE20 000300 0004+00 0/1 0/0 0/0 .rodata @9439 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9439 = 340.0f; -COMPILER_STRIP_GATE(8064EE1C, &lit_9439); +COMPILER_STRIP_GATE(0x8064EE1C, &lit_9439); #pragma pop /* 8064EE20-8064EE24 000304 0004+00 0/1 0/0 0/0 .rodata @9440 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9440 = 360.0f; -COMPILER_STRIP_GATE(8064EE20, &lit_9440); +COMPILER_STRIP_GATE(0x8064EE20, &lit_9440); #pragma pop /* 8064EE24-8064EE28 000308 0004+00 0/1 0/0 0/0 .rodata @9441 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9441 = 375.0f; -COMPILER_STRIP_GATE(8064EE24, &lit_9441); +COMPILER_STRIP_GATE(0x8064EE24, &lit_9441); +#pragma pop + +/* 8064EE60-8064EE60 000344 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8064EE7C = "D_MN08A"; #pragma pop /* 8064AC8C-8064B270 00CC6C 05E4+00 1/1 0/0 0/0 .text executeLastEndDemo__10daB_ZANT_cFv @@ -3305,56 +3324,56 @@ asm void daB_ZANT_c::calcMahojinAnime() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9560 = 87.0f; -COMPILER_STRIP_GATE(8064EE28, &lit_9560); +COMPILER_STRIP_GATE(0x8064EE28, &lit_9560); #pragma pop /* 8064EE2C-8064EE30 000310 0004+00 0/1 0/0 0/0 .rodata @9561 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9561 = -160.0f; -COMPILER_STRIP_GATE(8064EE2C, &lit_9561); +COMPILER_STRIP_GATE(0x8064EE2C, &lit_9561); #pragma pop /* 8064EE30-8064EE34 000314 0004+00 0/1 0/0 0/0 .rodata @9562 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9562 = 106.0f; -COMPILER_STRIP_GATE(8064EE30, &lit_9562); +COMPILER_STRIP_GATE(0x8064EE30, &lit_9562); #pragma pop /* 8064EE34-8064EE38 000318 0004+00 0/1 0/0 0/0 .rodata @9563 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9563 = 483.0f; -COMPILER_STRIP_GATE(8064EE34, &lit_9563); +COMPILER_STRIP_GATE(0x8064EE34, &lit_9563); #pragma pop /* 8064EE38-8064EE3C 00031C 0004+00 0/1 0/0 0/0 .rodata @9564 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9564 = 843.0f; -COMPILER_STRIP_GATE(8064EE38, &lit_9564); +COMPILER_STRIP_GATE(0x8064EE38, &lit_9564); #pragma pop /* 8064EE3C-8064EE40 000320 0004+00 0/1 0/0 0/0 .rodata @9565 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9565 = -20.0f; -COMPILER_STRIP_GATE(8064EE3C, &lit_9565); +COMPILER_STRIP_GATE(0x8064EE3C, &lit_9565); #pragma pop /* 8064EE40-8064EE44 000324 0004+00 0/1 0/0 0/0 .rodata @9566 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9566 = -40.0f; -COMPILER_STRIP_GATE(8064EE40, &lit_9566); +COMPILER_STRIP_GATE(0x8064EE40, &lit_9566); #pragma pop /* 8064EE44-8064EE48 000328 0004+00 0/1 0/0 0/0 .rodata @9567 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9567 = 11.0f / 10.0f; -COMPILER_STRIP_GATE(8064EE44, &lit_9567); +COMPILER_STRIP_GATE(0x8064EE44, &lit_9567); #pragma pop /* 8064B49C-8064B69C 00D47C 0200+00 2/2 0/0 0/0 .text calcRoomChangeCamera__10daB_ZANT_cFi */ @@ -3372,7 +3391,7 @@ asm void daB_ZANT_c::calcRoomChangeCamera(int param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9604 = -3300.0f; -COMPILER_STRIP_GATE(8064EE48, &lit_9604); +COMPILER_STRIP_GATE(0x8064EE48, &lit_9604); #pragma pop /* 8064B69C-8064B868 00D67C 01CC+00 3/3 0/0 0/0 .text initNextRoom__10daB_ZANT_cFv */ @@ -3523,6 +3542,13 @@ static asm void useHeapInit(fopAc_ac_c* param_0) { } #pragma pop +/* ############################################################################################## */ +/* 8064EE60-8064EE60 000344 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8064EE84 = "B_zant"; +#pragma pop + /* 8064E190-8064E724 010170 0594+00 1/1 0/0 0/0 .text create__10daB_ZANT_cFv */ #pragma push #pragma optimization_level 0 @@ -3625,7 +3651,7 @@ asm void __sinit_d_a_b_zant_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_8064E9DC = (void*)__sinit_d_a_b_zant_cpp; +REGISTER_CTORS(0x8064E9DC, __sinit_d_a_b_zant_cpp); #pragma pop /* 8064EAE0-8064EAE8 010AC0 0008+00 1/0 0/0 0/0 .text @20@__dt__14dBgS_ObjGndChkFv */ @@ -3683,35 +3709,35 @@ static asm void func_8064EB00() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9786 = 65.0f; -COMPILER_STRIP_GATE(8064EE4C, &lit_9786); +COMPILER_STRIP_GATE(0x8064EE4C, &lit_9786); #pragma pop /* 8064EE50-8064EE54 000334 0004+00 0/0 0/0 0/0 .rodata @9787 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9787 = -225.0f; -COMPILER_STRIP_GATE(8064EE50, &lit_9787); +COMPILER_STRIP_GATE(0x8064EE50, &lit_9787); #pragma pop /* 8064EE54-8064EE58 000338 0004+00 0/0 0/0 0/0 .rodata @9788 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9788 = 118.0f; -COMPILER_STRIP_GATE(8064EE54, &lit_9788); +COMPILER_STRIP_GATE(0x8064EE54, &lit_9788); #pragma pop /* 8064EE58-8064EE5C 00033C 0004+00 0/0 0/0 0/0 .rodata @9789 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9789 = 42.0f; -COMPILER_STRIP_GATE(8064EE58, &lit_9789); +COMPILER_STRIP_GATE(0x8064EE58, &lit_9789); #pragma pop /* 8064EE5C-8064EE60 000340 0004+00 0/0 0/0 0/0 .rodata @9868 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9868 = -4000.0f; -COMPILER_STRIP_GATE(8064EE5C, &lit_9868); +COMPILER_STRIP_GATE(0x8064EE5C, &lit_9868); #pragma pop /* 8064F694-8064F698 0000E4 0004+00 0/0 0/0 0/0 .bss @@ -3892,13 +3918,4 @@ static u8 data_8064F6F4[4]; static u8 data_8064F6F8[4]; #pragma pop -/* 8064EE60-8064EE8B 000344 002B+00 8/8 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_8064EE60 = "B_zan"; -SECTION_DEAD static char const* const stringBase_8064EE66 = "force_start"; -SECTION_DEAD static char const* const stringBase_8064EE72 = "force_end"; -SECTION_DEAD static char const* const stringBase_8064EE7C = "D_MN08A"; -SECTION_DEAD static char const* const stringBase_8064EE84 = "B_zant"; -#pragma pop +/* 8064EE60-8064EE60 000344 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/b/d_a_b_zant_magic/d_a_b_zant_magic.cpp b/rel/d/a/b/d_a_b_zant_magic/d_a_b_zant_magic.cpp index 911b2d47149..f1a723a252a 100644 --- a/rel/d/a/b/d_a_b_zant_magic/d_a_b_zant_magic.cpp +++ b/rel/d/a/b/d_a_b_zant_magic/d_a_b_zant_magic.cpp @@ -54,10 +54,10 @@ struct dScnKy_env_light_c { struct dPa_levelEcallBack {}; -struct _GXColor {}; - struct csXyz {}; +struct _GXColor {}; + struct dPa_control_c { struct level_c { /* 8004B918 */ void getEmitter(u32); @@ -158,10 +158,10 @@ struct cBgS_PolyInfo { /* 802680B0 */ ~cBgS_PolyInfo(); }; -struct Vec {}; - struct JAISoundID {}; +struct Vec {}; + struct Z2SeMgr { /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); /* 802AC50C */ void seStartLevel(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); @@ -306,20 +306,20 @@ static asm void daB_ZANTM_Draw(daB_ZANTM_c* param_0) { /* ############################################################################################## */ /* 8065049C-806504A0 000000 0004+00 5/5 0/0 0/0 .rodata @3721 */ SECTION_RODATA static f32 const lit_3721 = 0.5f; -COMPILER_STRIP_GATE(8065049C, &lit_3721); +COMPILER_STRIP_GATE(0x8065049C, &lit_3721); /* 806504A0-806504A4 000004 0004+00 0/1 0/0 0/0 .rodata @3722 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3722 = 4.0f / 5.0f; -COMPILER_STRIP_GATE(806504A0, &lit_3722); +COMPILER_STRIP_GATE(0x806504A0, &lit_3722); #pragma pop /* 806504A4-806504A8 000008 0004+00 0/3 0/0 0/0 .rodata @3723 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3723 = 1.0f; -COMPILER_STRIP_GATE(806504A4, &lit_3723); +COMPILER_STRIP_GATE(0x806504A4, &lit_3723); #pragma pop /* 806504E8-806504F4 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ @@ -397,14 +397,14 @@ asm void daB_ZANTM_c::setMagicEffect() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3753 = -1.0f; -COMPILER_STRIP_GATE(806504A8, &lit_3753); +COMPILER_STRIP_GATE(0x806504A8, &lit_3753); #pragma pop /* 806504AC-806504B0 000010 0004+00 0/1 0/0 0/0 .rodata @3754 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3754 = 25.0f; -COMPILER_STRIP_GATE(806504AC, &lit_3754); +COMPILER_STRIP_GATE(0x806504AC, &lit_3754); #pragma pop /* 806505DC-806505E4 0000F4 0008+00 1/1 0/0 0/0 .data magic_effect_id$3729 */ @@ -428,14 +428,14 @@ asm void daB_ZANTM_c::setMagicHitEffect() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3858 = 40.0f; -COMPILER_STRIP_GATE(806504B0, &lit_3858); +COMPILER_STRIP_GATE(0x806504B0, &lit_3858); #pragma pop /* 806504B4-806504B8 000018 0004+00 0/1 0/0 0/0 .rodata @3859 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3859 = 100.0f; -COMPILER_STRIP_GATE(806504B4, &lit_3859); +COMPILER_STRIP_GATE(0x806504B4, &lit_3859); #pragma pop /* 806504B8-806504BC 00001C 0004+00 0/2 0/0 0/0 .rodata @3860 */ @@ -447,21 +447,21 @@ SECTION_RODATA static u8 const lit_3860[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(806504B8, &lit_3860); +COMPILER_STRIP_GATE(0x806504B8, &lit_3860); #pragma pop /* 806504BC-806504C0 000020 0004+00 0/1 0/0 0/0 .rodata @3861 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3861 = 60.0f; -COMPILER_STRIP_GATE(806504BC, &lit_3861); +COMPILER_STRIP_GATE(0x806504BC, &lit_3861); #pragma pop /* 806504C0-806504C4 000024 0004+00 0/1 0/0 0/0 .rodata @3862 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3862 = 260.0f; -COMPILER_STRIP_GATE(806504C0, &lit_3862); +COMPILER_STRIP_GATE(0x806504C0, &lit_3862); #pragma pop /* 806504C4-806504CC 000028 0004+04 0/1 0/0 0/0 .rodata @3863 */ @@ -472,7 +472,7 @@ SECTION_RODATA static f32 const lit_3863[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(806504C4, &lit_3863); +COMPILER_STRIP_GATE(0x806504C4, &lit_3863); #pragma pop /* 806504CC-806504D4 000030 0008+00 0/1 0/0 0/0 .rodata @3865 */ @@ -481,7 +481,7 @@ COMPILER_STRIP_GATE(806504C4, &lit_3863); SECTION_RODATA static u8 const lit_3865[8] = { 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(806504CC, &lit_3865); +COMPILER_STRIP_GATE(0x806504CC, &lit_3865); #pragma pop /* 8064FA50-8064FD6C 000350 031C+00 1/1 0/0 0/0 .text executeSmall__11daB_ZANTM_cFv */ @@ -499,21 +499,21 @@ asm void daB_ZANTM_c::executeSmall() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3878 = 30.0f; -COMPILER_STRIP_GATE(806504D4, &lit_3878); +COMPILER_STRIP_GATE(0x806504D4, &lit_3878); #pragma pop /* 806504D8-806504DC 00003C 0004+00 0/2 0/0 0/0 .rodata @3879 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3879 = 20.0f; -COMPILER_STRIP_GATE(806504D8, &lit_3879); +COMPILER_STRIP_GATE(0x806504D8, &lit_3879); #pragma pop /* 806504DC-806504E0 000040 0004+00 0/1 0/0 0/0 .rodata @3880 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3880 = 50.0f; -COMPILER_STRIP_GATE(806504DC, &lit_3880); +COMPILER_STRIP_GATE(0x806504DC, &lit_3880); #pragma pop /* 8064FD6C-8064FE6C 00066C 0100+00 1/1 0/0 0/0 .text cc_set__11daB_ZANTM_cFv */ @@ -574,14 +574,14 @@ static asm void daB_ZANTM_Delete(daB_ZANTM_c* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3939 = -400.0f; -COMPILER_STRIP_GATE(806504E0, &lit_3939); +COMPILER_STRIP_GATE(0x806504E0, &lit_3939); #pragma pop /* 806504E4-806504E8 000048 0004+00 0/1 0/0 0/0 .rodata @3940 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3940 = 400.0f; -COMPILER_STRIP_GATE(806504E4, &lit_3940); +COMPILER_STRIP_GATE(0x806504E4, &lit_3940); #pragma pop /* 8064FF54-806500A8 000854 0154+00 1/1 0/0 0/0 .text create__11daB_ZANTM_cFv */ diff --git a/rel/d/a/b/d_a_b_zant_mobile/d_a_b_zant_mobile.cpp b/rel/d/a/b/d_a_b_zant_mobile/d_a_b_zant_mobile.cpp index b1fc7231654..23d720f2502 100644 --- a/rel/d/a/b/d_a_b_zant_mobile/d_a_b_zant_mobile.cpp +++ b/rel/d/a/b/d_a_b_zant_mobile/d_a_b_zant_mobile.cpp @@ -39,16 +39,16 @@ struct mDoExt_baseAnm { /* 8000D428 */ void play(); }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; - struct J3DAnmTransform {}; +struct J3DModelData {}; + +struct Z2Creature {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -210,10 +210,10 @@ struct cBgS { /* 80074618 */ void GetActorPointer(int) const; }; -struct Vec {}; - struct JAISoundID {}; +struct Vec {}; + struct Z2SeMgr { /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); /* 802AC50C */ void seStartLevel(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); @@ -381,7 +381,7 @@ extern "C" void __register_global_object(); /* ############################################################################################## */ /* 8065273C-80652740 000000 0004+00 10/10 0/0 0/0 .rodata @3649 */ SECTION_RODATA static f32 const lit_3649 = 1.0f; -COMPILER_STRIP_GATE(8065273C, &lit_3649); +COMPILER_STRIP_GATE(0x8065273C, &lit_3649); /* 806527DC-8065281C 000000 0040+00 1/1 0/0 0/0 .data * cc_zant_src__31@unnamed@d_a_b_zant_mobile_cpp@ */ @@ -508,7 +508,7 @@ static asm void daB_ZANTZ_Draw(daB_ZANTZ_c* param_0) { /* ############################################################################################## */ /* 80652740-80652744 000004 0004+00 1/4 0/0 0/0 .rodata @3688 */ SECTION_RODATA static f32 const lit_3688 = -1.0f; -COMPILER_STRIP_GATE(80652740, &lit_3688); +COMPILER_STRIP_GATE(0x80652740, &lit_3688); /* 80650854-806508E0 0001B4 008C+00 0/0 0/0 2/2 .text setSnortEffect__11daB_ZANTZ_cFi */ #pragma push @@ -525,70 +525,70 @@ asm void daB_ZANTZ_c::setSnortEffect(int param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3746 = 5.0f; -COMPILER_STRIP_GATE(80652744, &lit_3746); +COMPILER_STRIP_GATE(0x80652744, &lit_3746); #pragma pop /* 80652748-8065274C 00000C 0004+00 0/1 0/0 0/0 .rodata @3747 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3747 = 1.5f; -COMPILER_STRIP_GATE(80652748, &lit_3747); +COMPILER_STRIP_GATE(0x80652748, &lit_3747); #pragma pop /* 8065274C-80652750 000010 0004+00 0/1 0/0 0/0 .rodata @3748 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3748 = 150.0f; -COMPILER_STRIP_GATE(8065274C, &lit_3748); +COMPILER_STRIP_GATE(0x8065274C, &lit_3748); #pragma pop /* 80652750-80652754 000014 0004+00 0/1 0/0 0/0 .rodata @3749 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3749 = 800.0f; -COMPILER_STRIP_GATE(80652750, &lit_3749); +COMPILER_STRIP_GATE(0x80652750, &lit_3749); #pragma pop /* 80652754-80652758 000018 0004+00 0/1 0/0 0/0 .rodata @3750 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3750 = 1000.0f; -COMPILER_STRIP_GATE(80652754, &lit_3750); +COMPILER_STRIP_GATE(0x80652754, &lit_3750); #pragma pop /* 80652758-8065275C 00001C 0004+00 0/1 0/0 0/0 .rodata @3751 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3751 = 900.0f; -COMPILER_STRIP_GATE(80652758, &lit_3751); +COMPILER_STRIP_GATE(0x80652758, &lit_3751); #pragma pop /* 8065275C-80652760 000020 0004+00 0/2 0/0 0/0 .rodata @3752 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3752 = 300.0f; -COMPILER_STRIP_GATE(8065275C, &lit_3752); +COMPILER_STRIP_GATE(0x8065275C, &lit_3752); #pragma pop /* 80652760-80652764 000024 0004+00 0/1 0/0 0/0 .rodata @3753 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3753 = -150.0f; -COMPILER_STRIP_GATE(80652760, &lit_3753); +COMPILER_STRIP_GATE(0x80652760, &lit_3753); #pragma pop /* 80652764-80652768 000028 0004+00 0/1 0/0 0/0 .rodata @3754 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3754 = 30.0f; -COMPILER_STRIP_GATE(80652764, &lit_3754); +COMPILER_STRIP_GATE(0x80652764, &lit_3754); #pragma pop /* 80652768-8065276C 00002C 0004+00 0/3 0/0 0/0 .rodata @3755 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3755 = 10.0f; -COMPILER_STRIP_GATE(80652768, &lit_3755); +COMPILER_STRIP_GATE(0x80652768, &lit_3755); #pragma pop /* 806508E0-80650B7C 000240 029C+00 1/1 0/0 0/0 .text calcSnortEffect__11daB_ZANTZ_cFv */ @@ -609,7 +609,13 @@ SECTION_RODATA static u8 const lit_3795[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(8065276C, &lit_3795); +COMPILER_STRIP_GATE(0x8065276C, &lit_3795); + +/* 806527D0-806527D0 000094 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_806527D0 = "B_zan"; +#pragma pop /* 80650B7C-80650D0C 0004DC 0190+00 0/0 0/0 3/3 .text setMouthMode__11daB_ZANTZ_cFUc */ #pragma push @@ -626,14 +632,14 @@ asm void daB_ZANTZ_c::setMouthMode(u8 param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3899 = 2000.0f; -COMPILER_STRIP_GATE(80652770, &lit_3899); +COMPILER_STRIP_GATE(0x80652770, &lit_3899); #pragma pop /* 80652774-80652778 000038 0004+00 0/1 0/0 0/0 .rodata @3900 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3900 = 3000.0f; -COMPILER_STRIP_GATE(80652774, &lit_3900); +COMPILER_STRIP_GATE(0x80652774, &lit_3900); #pragma pop /* 80650D0C-806510C0 00066C 03B4+00 0/0 0/0 1/1 .text setAppearMode__11daB_ZANTZ_cFUc */ @@ -651,14 +657,14 @@ asm void daB_ZANTZ_c::setAppearMode(u8 param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3909 = 4000.0f; -COMPILER_STRIP_GATE(80652778, &lit_3909); +COMPILER_STRIP_GATE(0x80652778, &lit_3909); #pragma pop /* 8065277C-80652780 000040 0004+00 0/1 0/0 0/0 .rodata @3939 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3939 = -1000000000.0f; -COMPILER_STRIP_GATE(8065277C, &lit_3939); +COMPILER_STRIP_GATE(0x8065277C, &lit_3939); #pragma pop /* 806510C0-80651204 000A20 0144+00 2/2 0/0 0/0 .text getGroundPos__11daB_ZANTZ_cFv */ @@ -686,91 +692,91 @@ asm dBgS_ObjGndChk::~dBgS_ObjGndChk() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4120 = 4.0f; -COMPILER_STRIP_GATE(80652780, &lit_4120); +COMPILER_STRIP_GATE(0x80652780, &lit_4120); #pragma pop /* 80652784-80652788 000048 0004+00 0/1 0/0 0/0 .rodata @4121 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4121 = 15.0f; -COMPILER_STRIP_GATE(80652784, &lit_4121); +COMPILER_STRIP_GATE(0x80652784, &lit_4121); #pragma pop /* 80652788-8065278C 00004C 0004+00 0/1 0/0 0/0 .rodata @4122 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4122 = 40.0f; -COMPILER_STRIP_GATE(80652788, &lit_4122); +COMPILER_STRIP_GATE(0x80652788, &lit_4122); #pragma pop /* 8065278C-80652790 000050 0004+00 0/1 0/0 0/0 .rodata @4123 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4123 = 6.0f; -COMPILER_STRIP_GATE(8065278C, &lit_4123); +COMPILER_STRIP_GATE(0x8065278C, &lit_4123); #pragma pop /* 80652790-80652794 000054 0004+00 0/1 0/0 0/0 .rodata @4124 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4124 = 9.0f; -COMPILER_STRIP_GATE(80652790, &lit_4124); +COMPILER_STRIP_GATE(0x80652790, &lit_4124); #pragma pop /* 80652794-80652798 000058 0004+00 0/1 0/0 0/0 .rodata @4125 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4125 = 13.0f; -COMPILER_STRIP_GATE(80652794, &lit_4125); +COMPILER_STRIP_GATE(0x80652794, &lit_4125); #pragma pop /* 80652798-8065279C 00005C 0004+00 0/1 0/0 0/0 .rodata @4126 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4126 = 16.0f; -COMPILER_STRIP_GATE(80652798, &lit_4126); +COMPILER_STRIP_GATE(0x80652798, &lit_4126); #pragma pop /* 8065279C-806527A0 000060 0004+00 0/1 0/0 0/0 .rodata @4127 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4127 = 26.0f; -COMPILER_STRIP_GATE(8065279C, &lit_4127); +COMPILER_STRIP_GATE(0x8065279C, &lit_4127); #pragma pop /* 806527A0-806527A4 000064 0004+00 0/1 0/0 0/0 .rodata @4128 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4128 = 3500.0f; -COMPILER_STRIP_GATE(806527A0, &lit_4128); +COMPILER_STRIP_GATE(0x806527A0, &lit_4128); #pragma pop /* 806527A4-806527A8 000068 0004+00 0/1 0/0 0/0 .rodata @4129 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4129 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(806527A4, &lit_4129); +COMPILER_STRIP_GATE(0x806527A4, &lit_4129); #pragma pop /* 806527A8-806527AC 00006C 0004+00 0/1 0/0 0/0 .rodata @4130 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4130 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(806527A8, &lit_4130); +COMPILER_STRIP_GATE(0x806527A8, &lit_4130); #pragma pop /* 806527AC-806527B0 000070 0004+00 0/1 0/0 0/0 .rodata @4131 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4131 = 17.0f / 10.0f; -COMPILER_STRIP_GATE(806527AC, &lit_4131); +COMPILER_STRIP_GATE(0x806527AC, &lit_4131); #pragma pop /* 806527B0-806527B4 000074 0004+00 0/1 0/0 0/0 .rodata @4132 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4132 = 500.0f; -COMPILER_STRIP_GATE(806527B0, &lit_4132); +COMPILER_STRIP_GATE(0x806527B0, &lit_4132); #pragma pop /* 806527B4-806527BC 000078 0008+00 0/1 0/0 0/0 .rodata @4135 */ @@ -779,7 +785,7 @@ COMPILER_STRIP_GATE(806527B0, &lit_4132); SECTION_RODATA static u8 const lit_4135[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(806527B4, &lit_4135); +COMPILER_STRIP_GATE(0x806527B4, &lit_4135); #pragma pop /* 8065127C-80651B1C 000BDC 08A0+00 1/1 0/0 0/0 .text action__11daB_ZANTZ_cFv */ @@ -797,21 +803,21 @@ asm void daB_ZANTZ_c::action() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4171 = 100.0f; -COMPILER_STRIP_GATE(806527BC, &lit_4171); +COMPILER_STRIP_GATE(0x806527BC, &lit_4171); #pragma pop /* 806527C0-806527C4 000084 0004+00 0/1 0/0 0/0 .rodata @4172 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4172 = 130.0f; -COMPILER_STRIP_GATE(806527C0, &lit_4172); +COMPILER_STRIP_GATE(0x806527C0, &lit_4172); #pragma pop /* 806527C4-806527C8 000088 0004+00 0/1 0/0 0/0 .rodata @4173 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4173 = 230.0f; -COMPILER_STRIP_GATE(806527C4, &lit_4173); +COMPILER_STRIP_GATE(0x806527C4, &lit_4173); #pragma pop /* 80651B1C-80651C20 00147C 0104+00 1/1 0/0 0/0 .text cc_set__11daB_ZANTZ_cFv */ @@ -861,6 +867,13 @@ static bool daB_ZANTZ_IsDelete(daB_ZANTZ_c* param_0) { return true; } +/* ############################################################################################## */ +/* 806527D0-806527D0 000094 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_806527D6 = "B_oh"; +#pragma pop + /* 80651D1C-80651DA4 00167C 0088+00 1/1 0/0 0/0 .text _delete__11daB_ZANTZ_cFv */ #pragma push #pragma optimization_level 0 @@ -917,14 +930,14 @@ static asm void useHeapInit(fopAc_ac_c* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4373 = -400.0f; -COMPILER_STRIP_GATE(806527C8, &lit_4373); +COMPILER_STRIP_GATE(0x806527C8, &lit_4373); #pragma pop /* 806527CC-806527D0 000090 0004+00 0/1 0/0 0/0 .rodata @4374 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4374 = 400.0f; -COMPILER_STRIP_GATE(806527CC, &lit_4374); +COMPILER_STRIP_GATE(0x806527CC, &lit_4374); #pragma pop /* 80652038-806522F4 001998 02BC+00 1/1 0/0 0/0 .text create__11daB_ZANTZ_cFv */ @@ -1040,7 +1053,7 @@ asm void __sinit_d_a_b_zant_mobile_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_806526D4 = (void*)__sinit_d_a_b_zant_mobile_cpp; +REGISTER_CTORS(0x806526D4, __sinit_d_a_b_zant_mobile_cpp); #pragma pop /* 80652710-80652718 002070 0008+00 1/0 0/0 0/0 .text @20@__dt__14dBgS_ObjGndChkFv */ @@ -1073,10 +1086,4 @@ static asm void func_80652720() { } #pragma pop -/* 806527D0-806527DB 000094 000B+00 6/6 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_806527D0 = "B_zan"; -SECTION_DEAD static char const* const stringBase_806527D6 = "B_oh"; -#pragma pop +/* 806527D0-806527D0 000094 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/b/d_a_b_zant_sima/d_a_b_zant_sima.cpp b/rel/d/a/b/d_a_b_zant_sima/d_a_b_zant_sima.cpp index 1969723079c..7aa34972fbc 100644 --- a/rel/d/a/b/d_a_b_zant_sima/d_a_b_zant_sima.cpp +++ b/rel/d/a/b/d_a_b_zant_sima/d_a_b_zant_sima.cpp @@ -220,7 +220,7 @@ SECTION_RODATA static u8 const lit_3800[4 + 4 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(8065332C, &lit_3800); +COMPILER_STRIP_GATE(0x8065332C, &lit_3800); /* 80653334-8065333C 000008 0008+00 0/1 0/0 0/0 .rodata @3801 */ #pragma push @@ -228,35 +228,35 @@ COMPILER_STRIP_GATE(8065332C, &lit_3800); SECTION_RODATA static u8 const lit_3801[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80653334, &lit_3801); +COMPILER_STRIP_GATE(0x80653334, &lit_3801); #pragma pop /* 8065333C-80653340 000010 0004+00 0/2 0/0 0/0 .rodata @3802 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3802 = 150.0f; -COMPILER_STRIP_GATE(8065333C, &lit_3802); +COMPILER_STRIP_GATE(0x8065333C, &lit_3802); #pragma pop /* 80653340-80653344 000014 0004+00 0/1 0/0 0/0 .rodata @3803 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3803 = 130.0f; -COMPILER_STRIP_GATE(80653340, &lit_3803); +COMPILER_STRIP_GATE(0x80653340, &lit_3803); #pragma pop /* 80653344-80653348 000018 0004+00 0/1 0/0 0/0 .rodata @3804 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3804 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(80653344, &lit_3804); +COMPILER_STRIP_GATE(0x80653344, &lit_3804); #pragma pop /* 80653348-8065334C 00001C 0004+00 0/1 0/0 0/0 .rodata @3805 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3805 = 20.0f; -COMPILER_STRIP_GATE(80653348, &lit_3805); +COMPILER_STRIP_GATE(0x80653348, &lit_3805); #pragma pop /* 80652B28-80652DA8 0001C8 0280+00 1/1 0/0 0/0 .text action__11daB_ZANTS_cFv */ @@ -272,7 +272,7 @@ asm void daB_ZANTS_c::action() { /* ############################################################################################## */ /* 8065334C-80653350 000020 0004+00 1/1 0/0 0/0 .rodata @3831 */ SECTION_RODATA static f32 const lit_3831 = -30.0f; -COMPILER_STRIP_GATE(8065334C, &lit_3831); +COMPILER_STRIP_GATE(0x8065334C, &lit_3831); /* 80652DA8-80652E98 000448 00F0+00 1/1 0/0 0/0 .text execute__11daB_ZANTS_cFv */ #pragma push @@ -301,6 +301,13 @@ static bool daB_ZANTS_IsDelete(daB_ZANTS_c* param_0) { return true; } +/* ############################################################################################## */ +/* 80653364-80653364 000038 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80653364 = "MAGNESIMA"; +#pragma pop + /* 80652EC0-80652F18 000560 0058+00 1/1 0/0 0/0 .text _delete__11daB_ZANTS_cFv */ #pragma push #pragma optimization_level 0 @@ -325,7 +332,7 @@ static asm void daB_ZANTS_Delete(daB_ZANTS_c* param_0) { /* ############################################################################################## */ /* 80653350-80653354 000024 0004+00 1/1 0/0 0/0 .rodata @3917 */ SECTION_RODATA static f32 const lit_3917 = 1.0f; -COMPILER_STRIP_GATE(80653350, &lit_3917); +COMPILER_STRIP_GATE(0x80653350, &lit_3917); /* 80653370-80653390 -00001 0020+00 1/0 0/0 0/0 .data l_daB_ZANTS_Method */ SECTION_DATA static void* l_daB_ZANTS_Method[8] = { @@ -391,28 +398,28 @@ static asm void useHeapInit(fopAc_ac_c* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3967 = -200.0f; -COMPILER_STRIP_GATE(80653354, &lit_3967); +COMPILER_STRIP_GATE(0x80653354, &lit_3967); #pragma pop /* 80653358-8065335C 00002C 0004+00 0/1 0/0 0/0 .rodata @3968 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3968 = -500.0f; -COMPILER_STRIP_GATE(80653358, &lit_3968); +COMPILER_STRIP_GATE(0x80653358, &lit_3968); #pragma pop /* 8065335C-80653360 000030 0004+00 0/1 0/0 0/0 .rodata @3969 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3969 = 200.0f; -COMPILER_STRIP_GATE(8065335C, &lit_3969); +COMPILER_STRIP_GATE(0x8065335C, &lit_3969); #pragma pop /* 80653360-80653364 000034 0004+00 0/1 0/0 0/0 .rodata @3970 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3970 = 500.0f; -COMPILER_STRIP_GATE(80653360, &lit_3970); +COMPILER_STRIP_GATE(0x80653360, &lit_3970); #pragma pop /* 806531E8-80653304 000888 011C+00 1/1 0/0 0/0 .text create__11daB_ZANTS_cFv */ @@ -436,9 +443,4 @@ static asm void daB_ZANTS_Create(daB_ZANTS_c* param_0) { } #pragma pop -/* 80653364-8065336E 000038 000A+00 3/3 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80653364 = "MAGNESIMA"; -#pragma pop +/* 80653364-80653364 000038 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/d_a_L7demo_dr/d_a_L7demo_dr.cpp b/rel/d/a/d_a_L7demo_dr/d_a_L7demo_dr.cpp index c41b58fc8ae..343e6842809 100644 --- a/rel/d/a/d_a_L7demo_dr/d_a_L7demo_dr.cpp +++ b/rel/d/a/d_a_L7demo_dr/d_a_L7demo_dr.cpp @@ -24,16 +24,16 @@ struct mDoMtx_stack_c { static u8 now[48]; }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; - struct J3DAnmTransform {}; +struct J3DModelData {}; + +struct Z2Creature {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -198,7 +198,7 @@ extern "C" extern u8 g_env_light[4880]; #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daDr_c::setAction(void (daDr_c::*)()) { +asm void daDr_c::setAction(void (daDr_c::*param_0)()) { nofralloc #include "asm/rel/d/a/d_a_L7demo_dr/d_a_L7demo_dr/setAction__6daDr_cFM6daDr_cFPCvPv_v.s" } @@ -247,20 +247,20 @@ static asm void daDr_Draw(daDr_c* param_0) { /* ############################################################################################## */ /* 805AA454-805AA458 000000 0004+00 6/6 0/0 0/0 .rodata @3864 */ SECTION_RODATA static f32 const lit_3864 = -7200.0f; -COMPILER_STRIP_GATE(805AA454, &lit_3864); +COMPILER_STRIP_GATE(0x805AA454, &lit_3864); /* 805AA458-805AA45C 000004 0004+00 0/2 0/0 0/0 .rodata @3865 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3865 = -200.0f; -COMPILER_STRIP_GATE(805AA458, &lit_3865); +COMPILER_STRIP_GATE(0x805AA458, &lit_3865); #pragma pop /* 805AA45C-805AA460 000008 0004+00 0/3 0/0 0/0 .rodata @3866 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3866 = -12450.0f; -COMPILER_STRIP_GATE(805AA45C, &lit_3866); +COMPILER_STRIP_GATE(0x805AA45C, &lit_3866); #pragma pop /* 805AA4D0-805AA4DC -00001 000C+00 1/1 0/0 0/0 .data @3830 */ @@ -292,35 +292,35 @@ asm void daDr_c::wait() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3946 = -4383.0f; -COMPILER_STRIP_GATE(805AA460, &lit_3946); +COMPILER_STRIP_GATE(0x805AA460, &lit_3946); #pragma pop /* 805AA464-805AA468 000010 0004+00 0/1 0/0 0/0 .rodata @3947 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3947 = 285.0f; -COMPILER_STRIP_GATE(805AA464, &lit_3947); +COMPILER_STRIP_GATE(0x805AA464, &lit_3947); #pragma pop /* 805AA468-805AA46C 000014 0004+00 0/1 0/0 0/0 .rodata @3948 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3948 = -4688.0f; -COMPILER_STRIP_GATE(805AA468, &lit_3948); +COMPILER_STRIP_GATE(0x805AA468, &lit_3948); #pragma pop /* 805AA46C-805AA470 000018 0004+00 0/1 0/0 0/0 .rodata @3949 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3949 = 340.0f; -COMPILER_STRIP_GATE(805AA46C, &lit_3949); +COMPILER_STRIP_GATE(0x805AA46C, &lit_3949); #pragma pop /* 805AA470-805AA474 00001C 0004+00 0/2 0/0 0/0 .rodata @3950 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3950 = -4450.0f; -COMPILER_STRIP_GATE(805AA470, &lit_3950); +COMPILER_STRIP_GATE(0x805AA470, &lit_3950); #pragma pop /* 805AA474-805AA478 000020 0004+00 1/4 0/0 0/0 .rodata @3951 */ @@ -330,13 +330,13 @@ SECTION_RODATA static u8 const lit_3951[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(805AA474, &lit_3951); +COMPILER_STRIP_GATE(0x805AA474, &lit_3951); /* 805AA478-805AA47C 000024 0004+00 0/1 0/0 0/0 .rodata @3952 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3952 = -4100.0f; -COMPILER_STRIP_GATE(805AA478, &lit_3952); +COMPILER_STRIP_GATE(0x805AA478, &lit_3952); #pragma pop /* 805AA4E8-805AA4F4 -00001 000C+00 1/1 0/0 0/0 .data @3886 */ @@ -379,35 +379,35 @@ asm void daDr_c::pl_turn() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4123 = 1.0f; -COMPILER_STRIP_GATE(805AA47C, &lit_4123); +COMPILER_STRIP_GATE(0x805AA47C, &lit_4123); #pragma pop /* 805AA480-805AA484 00002C 0004+00 0/1 0/0 0/0 .rodata @4124 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4124 = -4600.0f; -COMPILER_STRIP_GATE(805AA480, &lit_4124); +COMPILER_STRIP_GATE(0x805AA480, &lit_4124); #pragma pop /* 805AA484-805AA488 000030 0004+00 0/1 0/0 0/0 .rodata @4125 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4125 = 80.0f; -COMPILER_STRIP_GATE(805AA484, &lit_4125); +COMPILER_STRIP_GATE(0x805AA484, &lit_4125); #pragma pop /* 805AA488-805AA48C 000034 0004+00 0/1 0/0 0/0 .rodata @4126 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4126 = 156.0f; -COMPILER_STRIP_GATE(805AA488, &lit_4126); +COMPILER_STRIP_GATE(0x805AA488, &lit_4126); #pragma pop /* 805AA48C-805AA490 000038 0004+00 0/1 0/0 0/0 .rodata @4127 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4127 = 210.0f; -COMPILER_STRIP_GATE(805AA48C, &lit_4127); +COMPILER_STRIP_GATE(0x805AA48C, &lit_4127); #pragma pop /* 805AA500-805AA50C -00001 000C+00 1/1 0/0 0/0 .data @4041 */ @@ -432,35 +432,35 @@ asm void daDr_c::bridge_destroy() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4182 = -6700.0f; -COMPILER_STRIP_GATE(805AA490, &lit_4182); +COMPILER_STRIP_GATE(0x805AA490, &lit_4182); #pragma pop /* 805AA494-805AA498 000040 0004+00 0/1 0/0 0/0 .rodata @4183 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4183 = -850.0f; -COMPILER_STRIP_GATE(805AA494, &lit_4183); +COMPILER_STRIP_GATE(0x805AA494, &lit_4183); #pragma pop /* 805AA498-805AA49C 000044 0004+00 0/1 0/0 0/0 .rodata @4184 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4184 = -20300.0f; -COMPILER_STRIP_GATE(805AA498, &lit_4184); +COMPILER_STRIP_GATE(0x805AA498, &lit_4184); #pragma pop /* 805AA49C-805AA4A0 000048 0004+00 0/1 0/0 0/0 .rodata @4185 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4185 = -900.0f; -COMPILER_STRIP_GATE(805AA49C, &lit_4185); +COMPILER_STRIP_GATE(0x805AA49C, &lit_4185); #pragma pop /* 805AA4A0-805AA4A4 00004C 0004+00 0/1 0/0 0/0 .rodata @4186 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4186 = -20700.0f; -COMPILER_STRIP_GATE(805AA4A0, &lit_4186); +COMPILER_STRIP_GATE(0x805AA4A0, &lit_4186); #pragma pop /* 805A9D10-805A9EE4 000B50 01D4+00 1/0 0/0 0/0 .text bridge_destroy2__6daDr_cFv */ @@ -476,11 +476,11 @@ asm void daDr_c::bridge_destroy2() { /* ############################################################################################## */ /* 805AA4A4-805AA4A8 000050 0004+00 1/1 0/0 0/0 .rodata @4217 */ SECTION_RODATA static f32 const lit_4217 = 115.0f; -COMPILER_STRIP_GATE(805AA4A4, &lit_4217); +COMPILER_STRIP_GATE(0x805AA4A4, &lit_4217); /* 805AA4A8-805AA4AC 000054 0004+00 1/1 0/0 0/0 .rodata @4218 */ SECTION_RODATA static f32 const lit_4218 = 147.0f; -COMPILER_STRIP_GATE(805AA4A8, &lit_4218); +COMPILER_STRIP_GATE(0x805AA4A8, &lit_4218); /* 805A9EE4-805A9FD4 000D24 00F0+00 1/1 0/0 0/0 .text execute__6daDr_cFv */ #pragma push @@ -507,6 +507,13 @@ static bool daDr_IsDelete(daDr_c* param_0) { return true; } +/* ############################################################################################## */ +/* 805AA4C8-805AA4C8 000074 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_805AA4C8 = "B_dr"; +#pragma pop + /* 805A9FFC-805AA064 000E3C 0068+00 1/1 0/0 0/0 .text _delete__6daDr_cFv */ #pragma push #pragma optimization_level 0 @@ -552,28 +559,28 @@ static asm void useHeapInit(fopAc_ac_c* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4290 = -4480.0f; -COMPILER_STRIP_GATE(805AA4AC, &lit_4290); +COMPILER_STRIP_GATE(0x805AA4AC, &lit_4290); #pragma pop /* 805AA4B0-805AA4B4 00005C 0004+00 0/1 0/0 0/0 .rodata @4291 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4291 = -3730.0f; -COMPILER_STRIP_GATE(805AA4B0, &lit_4291); +COMPILER_STRIP_GATE(0x805AA4B0, &lit_4291); #pragma pop /* 805AA4B4-805AA4B8 000060 0004+00 0/1 0/0 0/0 .rodata @4292 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4292 = -12800.0f; -COMPILER_STRIP_GATE(805AA4B4, &lit_4292); +COMPILER_STRIP_GATE(0x805AA4B4, &lit_4292); #pragma pop /* 805AA4B8-805AA4BC 000064 0004+00 0/1 0/0 0/0 .rodata @4293 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4293 = -12100.0f; -COMPILER_STRIP_GATE(805AA4B8, &lit_4293); +COMPILER_STRIP_GATE(0x805AA4B8, &lit_4293); #pragma pop /* 805AA19C-805AA224 000FDC 0088+00 1/1 0/0 0/0 .text check_start__6daDr_cFv */ @@ -591,21 +598,21 @@ asm void daDr_c::check_start() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4370 = -21133.0f; -COMPILER_STRIP_GATE(805AA4BC, &lit_4370); +COMPILER_STRIP_GATE(0x805AA4BC, &lit_4370); #pragma pop /* 805AA4C0-805AA4C4 00006C 0004+00 0/1 0/0 0/0 .rodata @4371 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4371 = 4660.0f; -COMPILER_STRIP_GATE(805AA4C0, &lit_4371); +COMPILER_STRIP_GATE(0x805AA4C0, &lit_4371); #pragma pop /* 805AA4C4-805AA4C8 000070 0004+00 0/1 0/0 0/0 .rodata @4372 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4372 = -24785.0f; -COMPILER_STRIP_GATE(805AA4C4, &lit_4372); +COMPILER_STRIP_GATE(0x805AA4C4, &lit_4372); #pragma pop /* 805AA50C-805AA518 -00001 000C+00 1/1 0/0 0/0 .data @4306 */ @@ -662,9 +669,4 @@ SECTION_DATA extern void* g_profile_DR[12] = { (void*)0x00CE0000, (void*)&l_daDr_Method, (void*)0x00040000, (void*)0x020E0000, }; -/* 805AA4C8-805AA4CD 000074 0005+00 3/3 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_805AA4C8 = "B_dr"; -#pragma pop +/* 805AA4C8-805AA4C8 000074 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/d_a_L7low_dr/d_a_L7low_dr.cpp b/rel/d/a/d_a_L7low_dr/d_a_L7low_dr.cpp index 590ba410af6..273c1db483f 100644 --- a/rel/d/a/d_a_L7low_dr/d_a_L7low_dr.cpp +++ b/rel/d/a/d_a_L7low_dr/d_a_L7low_dr.cpp @@ -24,16 +24,16 @@ struct mDoMtx_stack_c { static u8 now[48]; }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; - struct J3DAnmTransform {}; +struct J3DModelData {}; + +struct Z2Creature {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -173,7 +173,7 @@ extern "C" u8 sincosTable___5JMath[65536]; #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daL7lowDr_c::setAction(void (daL7lowDr_c::*)()) { +asm void daL7lowDr_c::setAction(void (daL7lowDr_c::*param_0)()) { nofralloc #include "asm/rel/d/a/d_a_L7low_dr/d_a_L7low_dr/setAction__11daL7lowDr_cFM11daL7lowDr_cFPCvPv_v.s" } @@ -189,6 +189,13 @@ asm void daL7lowDr_c::action() { } #pragma pop +/* ############################################################################################## */ +/* 805AAFB0-805AAFB0 00003C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_805AAFB0 = "L7lowDr"; +#pragma pop + /* 805AA748-805AA798 0001C8 0050+00 1/1 0/0 0/0 .text _delete__11daL7lowDr_cFv */ #pragma push #pragma optimization_level 0 @@ -223,32 +230,32 @@ asm void daL7lowDr_c::mtx_set() { /* ############################################################################################## */ /* 805AAF74-805AAF78 000000 0004+00 1/1 0/0 0/0 .rodata @3769 */ SECTION_RODATA static f32 const lit_3769 = 32768.0f; -COMPILER_STRIP_GATE(805AAF74, &lit_3769); +COMPILER_STRIP_GATE(0x805AAF74, &lit_3769); /* 805AAF78-805AAF7C 000004 0004+00 0/1 0/0 0/0 .rodata @3770 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3770 = 2800.0f; -COMPILER_STRIP_GATE(805AAF78, &lit_3770); +COMPILER_STRIP_GATE(0x805AAF78, &lit_3770); #pragma pop /* 805AAF7C-805AAF80 000008 0004+00 0/1 0/0 0/0 .rodata @3771 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3771 = 8000.0f; -COMPILER_STRIP_GATE(805AAF7C, &lit_3771); +COMPILER_STRIP_GATE(0x805AAF7C, &lit_3771); #pragma pop /* 805AAF80-805AAF84 00000C 0004+00 0/1 0/0 0/0 .rodata @3772 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3772 = 20.0f; -COMPILER_STRIP_GATE(805AAF80, &lit_3772); +COMPILER_STRIP_GATE(0x805AAF80, &lit_3772); #pragma pop /* 805AAF84-805AAF88 000010 0004+00 2/3 0/0 0/0 .rodata @3773 */ SECTION_RODATA static f32 const lit_3773 = 1.0f; -COMPILER_STRIP_GATE(805AAF84, &lit_3773); +COMPILER_STRIP_GATE(0x805AAF84, &lit_3773); /* 805AAF88-805AAF8C 000014 0004+00 0/1 0/0 0/0 .rodata @3774 */ #pragma push @@ -259,70 +266,70 @@ SECTION_RODATA static u8 const lit_3774[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(805AAF88, &lit_3774); +COMPILER_STRIP_GATE(0x805AAF88, &lit_3774); #pragma pop /* 805AAF8C-805AAF90 000018 0004+00 0/1 0/0 0/0 .rodata @3775 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3775 = -1.0f; -COMPILER_STRIP_GATE(805AAF8C, &lit_3775); +COMPILER_STRIP_GATE(0x805AAF8C, &lit_3775); #pragma pop /* 805AAF90-805AAF94 00001C 0004+00 0/1 0/0 0/0 .rodata @3776 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3776 = 30.0f; -COMPILER_STRIP_GATE(805AAF90, &lit_3776); +COMPILER_STRIP_GATE(0x805AAF90, &lit_3776); #pragma pop /* 805AAF94-805AAF98 000020 0004+00 0/1 0/0 0/0 .rodata @3777 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3777 = 210.0f; -COMPILER_STRIP_GATE(805AAF94, &lit_3777); +COMPILER_STRIP_GATE(0x805AAF94, &lit_3777); #pragma pop /* 805AAF98-805AAF9C 000024 0004+00 0/1 0/0 0/0 .rodata @3778 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3778 = 60.0f; -COMPILER_STRIP_GATE(805AAF98, &lit_3778); +COMPILER_STRIP_GATE(0x805AAF98, &lit_3778); #pragma pop /* 805AAF9C-805AAFA0 000028 0004+00 0/1 0/0 0/0 .rodata @3779 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3779 = 3.0f; -COMPILER_STRIP_GATE(805AAF9C, &lit_3779); +COMPILER_STRIP_GATE(0x805AAF9C, &lit_3779); #pragma pop /* 805AAFA0-805AAFA4 00002C 0004+00 0/1 0/0 0/0 .rodata @3780 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3780 = 33.0f; -COMPILER_STRIP_GATE(805AAFA0, &lit_3780); +COMPILER_STRIP_GATE(0x805AAFA0, &lit_3780); #pragma pop /* 805AAFA4-805AAFA8 000030 0004+00 0/1 0/0 0/0 .rodata @3781 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3781 = 2.0f; -COMPILER_STRIP_GATE(805AAFA4, &lit_3781); +COMPILER_STRIP_GATE(0x805AAFA4, &lit_3781); #pragma pop /* 805AAFA8-805AAFAC 000034 0004+00 0/1 0/0 0/0 .rodata @3782 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3782 = 180.0f; -COMPILER_STRIP_GATE(805AAFA8, &lit_3782); +COMPILER_STRIP_GATE(0x805AAFA8, &lit_3782); #pragma pop /* 805AAFAC-805AAFB0 000038 0004+00 0/1 0/0 0/0 .rodata @3783 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3783 = 67.0f; -COMPILER_STRIP_GATE(805AAFAC, &lit_3783); +COMPILER_STRIP_GATE(0x805AAFAC, &lit_3783); #pragma pop /* 805AA828-805AABF8 0002A8 03D0+00 1/0 0/0 0/0 .text fly__11daL7lowDr_cFv */ @@ -454,9 +461,4 @@ SECTION_DATA extern void* g_profile_L7lowDr[12] = { (void*)0x00040000, (void*)0x020E0000, }; -/* 805AAFB0-805AAFB8 00003C 0008+00 4/4 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_805AAFB0 = "L7lowDr"; -#pragma pop +/* 805AAFB0-805AAFB0 00003C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/d_a_L7op_demo_dr/d_a_L7op_demo_dr.cpp b/rel/d/a/d_a_L7op_demo_dr/d_a_L7op_demo_dr.cpp index 021a8523935..ae8fcd31e54 100644 --- a/rel/d/a/d_a_L7op_demo_dr/d_a_L7op_demo_dr.cpp +++ b/rel/d/a/d_a_L7op_demo_dr/d_a_L7op_demo_dr.cpp @@ -13,10 +13,10 @@ struct request_of_phase_process_class {}; -struct Vec {}; - struct csXyz {}; +struct Vec {}; + struct cXyz { /* 8026702C */ bool operator==(Vec const&) const; /* 805ADDD8 */ void abs(Vec const&) const; @@ -37,16 +37,16 @@ struct mDoExt_morf_c { /* 805ADDA8 */ void isStop(); }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; - struct J3DAnmTransform {}; +struct J3DModelData {}; + +struct Z2Creature {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -301,7 +301,7 @@ extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daL7ODR_c::setAction(void (daL7ODR_c::*)()) { +asm void daL7ODR_c::setAction(void (daL7ODR_c::*param_0)()) { nofralloc #include "asm/rel/d/a/d_a_L7op_demo_dr/d_a_L7op_demo_dr/setAction__9daL7ODR_cFM9daL7ODR_cFPCvPv_v.s" } @@ -322,7 +322,7 @@ asm void daL7ODR_c::action() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daL7ODR_c::setDrAction(void (daL7ODR_c::*)()) { +asm void daL7ODR_c::setDrAction(void (daL7ODR_c::*param_0)()) { nofralloc #include "asm/rel/d/a/d_a_L7op_demo_dr/d_a_L7op_demo_dr/setDrAction__9daL7ODR_cFM9daL7ODR_cFPCvPv_v.s" } @@ -351,13 +351,13 @@ asm void daL7ODR_c::mtx_set() { /* ############################################################################################## */ /* 805ADF50-805ADF54 000000 0004+00 7/7 0/0 0/0 .rodata @3850 */ SECTION_RODATA static f32 const lit_3850 = 10.0f; -COMPILER_STRIP_GATE(805ADF50, &lit_3850); +COMPILER_STRIP_GATE(0x805ADF50, &lit_3850); /* 805ADF54-805ADF58 000004 0004+00 0/1 0/0 0/0 .rodata @3851 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3851 = 6000.0f; -COMPILER_STRIP_GATE(805ADF54, &lit_3851); +COMPILER_STRIP_GATE(0x805ADF54, &lit_3851); #pragma pop /* 805ADF58-805ADF5C 000008 0004+00 2/8 0/0 0/0 .rodata @3852 */ @@ -367,11 +367,11 @@ SECTION_RODATA static u8 const lit_3852[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(805ADF58, &lit_3852); +COMPILER_STRIP_GATE(0x805ADF58, &lit_3852); /* 805ADF5C-805ADF60 00000C 0004+00 1/6 0/0 0/0 .rodata @3853 */ SECTION_RODATA static f32 const lit_3853 = 1.0f; -COMPILER_STRIP_GATE(805ADF5C, &lit_3853); +COMPILER_STRIP_GATE(0x805ADF5C, &lit_3853); /* 805AB2E8-805AB3D0 0002C8 00E8+00 1/1 0/0 0/0 .text draw__9daL7ODR_cFv */ #pragma push @@ -416,112 +416,112 @@ asm void daL7ODR_c::wait() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4115 = -790.0f; -COMPILER_STRIP_GATE(805ADF60, &lit_4115); +COMPILER_STRIP_GATE(0x805ADF60, &lit_4115); #pragma pop /* 805ADF64-805ADF68 000014 0004+00 0/1 0/0 0/0 .rodata @4116 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4116 = 3125.0f; -COMPILER_STRIP_GATE(805ADF64, &lit_4116); +COMPILER_STRIP_GATE(0x805ADF64, &lit_4116); #pragma pop /* 805ADF68-805ADF6C 000018 0004+00 0/1 0/0 0/0 .rodata @4117 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4117 = -900.0f; -COMPILER_STRIP_GATE(805ADF68, &lit_4117); +COMPILER_STRIP_GATE(0x805ADF68, &lit_4117); #pragma pop /* 805ADF6C-805ADF70 00001C 0004+00 0/1 0/0 0/0 .rodata @4118 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4118 = 500.0f; -COMPILER_STRIP_GATE(805ADF6C, &lit_4118); +COMPILER_STRIP_GATE(0x805ADF6C, &lit_4118); #pragma pop /* 805ADF70-805ADF74 000020 0004+00 0/1 0/0 0/0 .rodata @4119 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4119 = 4800.0f; -COMPILER_STRIP_GATE(805ADF70, &lit_4119); +COMPILER_STRIP_GATE(0x805ADF70, &lit_4119); #pragma pop /* 805ADF74-805ADF78 000024 0004+00 0/1 0/0 0/0 .rodata @4120 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4120 = -910.0f; -COMPILER_STRIP_GATE(805ADF74, &lit_4120); +COMPILER_STRIP_GATE(0x805ADF74, &lit_4120); #pragma pop /* 805ADF78-805ADF7C 000028 0004+00 0/1 0/0 0/0 .rodata @4121 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4121 = 520.0f; -COMPILER_STRIP_GATE(805ADF78, &lit_4121); +COMPILER_STRIP_GATE(0x805ADF78, &lit_4121); #pragma pop /* 805ADF7C-805ADF80 00002C 0004+00 0/1 0/0 0/0 .rodata @4122 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4122 = 5500.0f; -COMPILER_STRIP_GATE(805ADF7C, &lit_4122); +COMPILER_STRIP_GATE(0x805ADF7C, &lit_4122); #pragma pop /* 805ADF80-805ADF84 000030 0004+00 0/1 0/0 0/0 .rodata @4123 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4123 = 64.0f; -COMPILER_STRIP_GATE(805ADF80, &lit_4123); +COMPILER_STRIP_GATE(0x805ADF80, &lit_4123); #pragma pop /* 805ADF84-805ADF88 000034 0004+00 0/2 0/0 0/0 .rodata @4124 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4124 = 2.0f; -COMPILER_STRIP_GATE(805ADF84, &lit_4124); +COMPILER_STRIP_GATE(0x805ADF84, &lit_4124); #pragma pop /* 805ADF88-805ADF8C 000038 0004+00 0/1 0/0 0/0 .rodata @4125 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4125 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(805ADF88, &lit_4125); +COMPILER_STRIP_GATE(0x805ADF88, &lit_4125); #pragma pop /* 805ADF8C-805ADF90 00003C 0004+00 0/1 0/0 0/0 .rodata @4126 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4126 = 120.0f; -COMPILER_STRIP_GATE(805ADF8C, &lit_4126); +COMPILER_STRIP_GATE(0x805ADF8C, &lit_4126); #pragma pop /* 805ADF90-805ADF94 000040 0004+00 0/1 0/0 0/0 .rodata @4127 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4127 = 2300.0f; -COMPILER_STRIP_GATE(805ADF90, &lit_4127); +COMPILER_STRIP_GATE(0x805ADF90, &lit_4127); #pragma pop /* 805ADF94-805ADF98 000044 0004+00 0/2 0/0 0/0 .rodata @4128 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4128 = 100.0f; -COMPILER_STRIP_GATE(805ADF94, &lit_4128); +COMPILER_STRIP_GATE(0x805ADF94, &lit_4128); #pragma pop /* 805ADF98-805ADF9C 000048 0004+00 0/3 0/0 0/0 .rodata @4129 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4129 = 3000.0f; -COMPILER_STRIP_GATE(805ADF98, &lit_4129); +COMPILER_STRIP_GATE(0x805ADF98, &lit_4129); #pragma pop /* 805ADF9C-805ADFA0 00004C 0004+00 0/2 0/0 0/0 .rodata @4130 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4130 = 1400.0f; -COMPILER_STRIP_GATE(805ADF9C, &lit_4130); +COMPILER_STRIP_GATE(0x805ADF9C, &lit_4130); #pragma pop /* 805AE0C4-805AE0D0 -00001 000C+00 1/1 0/0 0/0 .data @3940 */ @@ -564,35 +564,41 @@ asm void daL7ODR_c::setZoomOutCamPos(cXyz& param_0, cXyz& param_1, f32 param_2) #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4181 = 5000.0f; -COMPILER_STRIP_GATE(805ADFA0, &lit_4181); +COMPILER_STRIP_GATE(0x805ADFA0, &lit_4181); #pragma pop /* 805ADFA4-805ADFA8 000054 0004+00 0/1 0/0 0/0 .rodata @4182 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4182 = 7000.0f; -COMPILER_STRIP_GATE(805ADFA4, &lit_4182); +COMPILER_STRIP_GATE(0x805ADFA4, &lit_4182); #pragma pop /* 805ADFA8-805ADFAC 000058 0004+00 0/2 0/0 0/0 .rodata @4183 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4183 = 3.0f; -COMPILER_STRIP_GATE(805ADFA8, &lit_4183); +COMPILER_STRIP_GATE(0x805ADFA8, &lit_4183); #pragma pop /* 805ADFAC-805ADFB0 00005C 0004+00 0/2 0/0 0/0 .rodata @4184 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4184 = -1.0f; -COMPILER_STRIP_GATE(805ADFAC, &lit_4184); +COMPILER_STRIP_GATE(0x805ADFAC, &lit_4184); #pragma pop /* 805ADFB0-805ADFB4 000060 0004+00 0/3 0/0 0/0 .rodata @4185 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4185 = 20.0f; -COMPILER_STRIP_GATE(805ADFB0, &lit_4185); +COMPILER_STRIP_GATE(0x805ADFB0, &lit_4185); +#pragma pop + +/* 805AE0AC-805AE0AC 00015C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_805AE0AC = "B_dr"; #pragma pop /* 805ABCF8-805ABE0C 000CD8 0114+00 1/0 0/0 0/0 .text dr_wait__9daL7ODR_cFv */ @@ -610,357 +616,357 @@ asm void daL7ODR_c::dr_wait() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4635 = 600.0f; -COMPILER_STRIP_GATE(805ADFB4, &lit_4635); +COMPILER_STRIP_GATE(0x805ADFB4, &lit_4635); #pragma pop /* 805ADFB8-805ADFBC 000068 0004+00 0/1 0/0 0/0 .rodata @4636 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4636 = 160.0f; -COMPILER_STRIP_GATE(805ADFB8, &lit_4636); +COMPILER_STRIP_GATE(0x805ADFB8, &lit_4636); #pragma pop /* 805ADFBC-805ADFC0 00006C 0004+00 0/1 0/0 0/0 .rodata @4637 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4637 = 400.0f; -COMPILER_STRIP_GATE(805ADFBC, &lit_4637); +COMPILER_STRIP_GATE(0x805ADFBC, &lit_4637); #pragma pop /* 805ADFC0-805ADFC4 000070 0004+00 0/1 0/0 0/0 .rodata @4638 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4638 = 60.0f; -COMPILER_STRIP_GATE(805ADFC0, &lit_4638); +COMPILER_STRIP_GATE(0x805ADFC0, &lit_4638); #pragma pop /* 805ADFC4-805ADFC8 000074 0004+00 0/1 0/0 0/0 .rodata @4639 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4639 = 8.0f; -COMPILER_STRIP_GATE(805ADFC4, &lit_4639); +COMPILER_STRIP_GATE(0x805ADFC4, &lit_4639); #pragma pop /* 805ADFC8-805ADFCC 000078 0004+00 0/1 0/0 0/0 .rodata @4640 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4640 = 1800.0f; -COMPILER_STRIP_GATE(805ADFC8, &lit_4640); +COMPILER_STRIP_GATE(0x805ADFC8, &lit_4640); #pragma pop /* 805ADFCC-805ADFD0 00007C 0004+00 0/1 0/0 0/0 .rodata @4641 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4641 = 140.0f; -COMPILER_STRIP_GATE(805ADFCC, &lit_4641); +COMPILER_STRIP_GATE(0x805ADFCC, &lit_4641); #pragma pop /* 805ADFD0-805ADFD4 000080 0004+00 0/1 0/0 0/0 .rodata @4642 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4642 = 4.0f; -COMPILER_STRIP_GATE(805ADFD0, &lit_4642); +COMPILER_STRIP_GATE(0x805ADFD0, &lit_4642); #pragma pop /* 805ADFD4-805ADFD8 000084 0004+00 0/1 0/0 0/0 .rodata @4643 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4643 = 80.0f; -COMPILER_STRIP_GATE(805ADFD4, &lit_4643); +COMPILER_STRIP_GATE(0x805ADFD4, &lit_4643); #pragma pop /* 805ADFD8-805ADFDC 000088 0004+00 0/1 0/0 0/0 .rodata @4644 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4644 = 0.5f; -COMPILER_STRIP_GATE(805ADFD8, &lit_4644); +COMPILER_STRIP_GATE(0x805ADFD8, &lit_4644); #pragma pop /* 805ADFDC-805ADFE0 00008C 0004+00 0/1 0/0 0/0 .rodata @4645 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4645 = -1400.0f; -COMPILER_STRIP_GATE(805ADFDC, &lit_4645); +COMPILER_STRIP_GATE(0x805ADFDC, &lit_4645); #pragma pop /* 805ADFE0-805ADFE4 000090 0004+00 0/1 0/0 0/0 .rodata @4646 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4646 = 33.0f; -COMPILER_STRIP_GATE(805ADFE0, &lit_4646); +COMPILER_STRIP_GATE(0x805ADFE0, &lit_4646); #pragma pop /* 805ADFE4-805ADFE8 000094 0004+00 0/1 0/0 0/0 .rodata @4647 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4647 = 2674.0f; -COMPILER_STRIP_GATE(805ADFE4, &lit_4647); +COMPILER_STRIP_GATE(0x805ADFE4, &lit_4647); #pragma pop /* 805ADFE8-805ADFEC 000098 0004+00 0/1 0/0 0/0 .rodata @4648 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4648 = 3038.0f; -COMPILER_STRIP_GATE(805ADFE8, &lit_4648); +COMPILER_STRIP_GATE(0x805ADFE8, &lit_4648); #pragma pop /* 805ADFEC-805ADFF0 00009C 0004+00 0/1 0/0 0/0 .rodata @4649 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4649 = 240.0f; -COMPILER_STRIP_GATE(805ADFEC, &lit_4649); +COMPILER_STRIP_GATE(0x805ADFEC, &lit_4649); #pragma pop /* 805ADFF0-805ADFF4 0000A0 0004+00 0/1 0/0 0/0 .rodata @4650 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4650 = 90.0f; -COMPILER_STRIP_GATE(805ADFF0, &lit_4650); +COMPILER_STRIP_GATE(0x805ADFF0, &lit_4650); #pragma pop /* 805ADFF4-805ADFF8 0000A4 0004+00 0/1 0/0 0/0 .rodata @4651 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4651 = -140.0f; -COMPILER_STRIP_GATE(805ADFF4, &lit_4651); +COMPILER_STRIP_GATE(0x805ADFF4, &lit_4651); #pragma pop /* 805ADFF8-805ADFFC 0000A8 0004+00 0/1 0/0 0/0 .rodata @4652 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4652 = 2045.0f; -COMPILER_STRIP_GATE(805ADFF8, &lit_4652); +COMPILER_STRIP_GATE(0x805ADFF8, &lit_4652); #pragma pop /* 805ADFFC-805AE000 0000AC 0004+00 0/1 0/0 0/0 .rodata @4653 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4653 = 460.0f; -COMPILER_STRIP_GATE(805ADFFC, &lit_4653); +COMPILER_STRIP_GATE(0x805ADFFC, &lit_4653); #pragma pop /* 805AE000-805AE004 0000B0 0004+00 0/1 0/0 0/0 .rodata @4654 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4654 = 2800.0f; -COMPILER_STRIP_GATE(805AE000, &lit_4654); +COMPILER_STRIP_GATE(0x805AE000, &lit_4654); #pragma pop /* 805AE004-805AE008 0000B4 0004+00 0/2 0/0 0/0 .rodata @4655 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4655 = 40.0f; -COMPILER_STRIP_GATE(805AE004, &lit_4655); +COMPILER_STRIP_GATE(0x805AE004, &lit_4655); #pragma pop /* 805AE008-805AE00C 0000B8 0004+00 0/1 0/0 0/0 .rodata @4656 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4656 = 220.0f; -COMPILER_STRIP_GATE(805AE008, &lit_4656); +COMPILER_STRIP_GATE(0x805AE008, &lit_4656); #pragma pop /* 805AE00C-805AE010 0000BC 0004+00 0/1 0/0 0/0 .rodata @4657 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4657 = 1200.0f; -COMPILER_STRIP_GATE(805AE00C, &lit_4657); +COMPILER_STRIP_GATE(0x805AE00C, &lit_4657); #pragma pop /* 805AE010-805AE014 0000C0 0004+00 0/1 0/0 0/0 .rodata @4658 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4658 = 4.5f; -COMPILER_STRIP_GATE(805AE010, &lit_4658); +COMPILER_STRIP_GATE(0x805AE010, &lit_4658); #pragma pop /* 805AE014-805AE018 0000C4 0004+00 0/1 0/0 0/0 .rodata @4659 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4659 = 85.0f; -COMPILER_STRIP_GATE(805AE014, &lit_4659); +COMPILER_STRIP_GATE(0x805AE014, &lit_4659); #pragma pop /* 805AE018-805AE01C 0000C8 0004+00 0/1 0/0 0/0 .rodata @4660 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4660 = 800.0f; -COMPILER_STRIP_GATE(805AE018, &lit_4660); +COMPILER_STRIP_GATE(0x805AE018, &lit_4660); #pragma pop /* 805AE01C-805AE020 0000CC 0004+00 0/1 0/0 0/0 .rodata @4661 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4661 = 1720.0f; -COMPILER_STRIP_GATE(805AE01C, &lit_4661); +COMPILER_STRIP_GATE(0x805AE01C, &lit_4661); #pragma pop /* 805AE020-805AE024 0000D0 0004+00 0/1 0/0 0/0 .rodata @4662 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4662 = 135.0f; -COMPILER_STRIP_GATE(805AE020, &lit_4662); +COMPILER_STRIP_GATE(0x805AE020, &lit_4662); #pragma pop /* 805AE024-805AE028 0000D4 0004+00 0/1 0/0 0/0 .rodata @4663 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4663 = -21.0f; -COMPILER_STRIP_GATE(805AE024, &lit_4663); +COMPILER_STRIP_GATE(0x805AE024, &lit_4663); #pragma pop /* 805AE028-805AE02C 0000D8 0004+00 0/1 0/0 0/0 .rodata @4664 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4664 = 128.0f; -COMPILER_STRIP_GATE(805AE028, &lit_4664); +COMPILER_STRIP_GATE(0x805AE028, &lit_4664); #pragma pop /* 805AE02C-805AE030 0000DC 0004+00 0/1 0/0 0/0 .rodata @4665 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4665 = -930.0f; -COMPILER_STRIP_GATE(805AE02C, &lit_4665); +COMPILER_STRIP_GATE(0x805AE02C, &lit_4665); #pragma pop /* 805AE030-805AE034 0000E0 0004+00 0/1 0/0 0/0 .rodata @4666 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4666 = 1000.0f; -COMPILER_STRIP_GATE(805AE030, &lit_4666); +COMPILER_STRIP_GATE(0x805AE030, &lit_4666); #pragma pop /* 805AE034-805AE038 0000E4 0004+00 0/1 0/0 0/0 .rodata @4667 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4667 = 3072.0f; -COMPILER_STRIP_GATE(805AE034, &lit_4667); +COMPILER_STRIP_GATE(0x805AE034, &lit_4667); #pragma pop /* 805AE038-805AE03C 0000E8 0004+00 0/1 0/0 0/0 .rodata @4668 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4668 = 96.0f; -COMPILER_STRIP_GATE(805AE038, &lit_4668); +COMPILER_STRIP_GATE(0x805AE038, &lit_4668); #pragma pop /* 805AE03C-805AE040 0000EC 0004+00 0/1 0/0 0/0 .rodata @4669 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4669 = 3.0f / 10.0f; -COMPILER_STRIP_GATE(805AE03C, &lit_4669); +COMPILER_STRIP_GATE(0x805AE03C, &lit_4669); #pragma pop /* 805AE040-805AE044 0000F0 0004+00 0/1 0/0 0/0 .rodata @4670 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4670 = -400.0f; -COMPILER_STRIP_GATE(805AE040, &lit_4670); +COMPILER_STRIP_GATE(0x805AE040, &lit_4670); #pragma pop /* 805AE044-805AE048 0000F4 0004+00 0/1 0/0 0/0 .rodata @4671 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4671 = 5.0f; -COMPILER_STRIP_GATE(805AE044, &lit_4671); +COMPILER_STRIP_GATE(0x805AE044, &lit_4671); #pragma pop /* 805AE048-805AE04C 0000F8 0004+00 0/1 0/0 0/0 .rodata @4672 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4672 = 35.0f; -COMPILER_STRIP_GATE(805AE048, &lit_4672); +COMPILER_STRIP_GATE(0x805AE048, &lit_4672); #pragma pop /* 805AE04C-805AE050 0000FC 0004+00 0/1 0/0 0/0 .rodata @4673 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4673 = 1700.0f; -COMPILER_STRIP_GATE(805AE04C, &lit_4673); +COMPILER_STRIP_GATE(0x805AE04C, &lit_4673); #pragma pop /* 805AE050-805AE054 000100 0004+00 0/1 0/0 0/0 .rodata @4674 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4674 = -680.0f; -COMPILER_STRIP_GATE(805AE050, &lit_4674); +COMPILER_STRIP_GATE(0x805AE050, &lit_4674); #pragma pop /* 805AE054-805AE058 000104 0004+00 0/1 0/0 0/0 .rodata @4675 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4675 = 22.0f; -COMPILER_STRIP_GATE(805AE054, &lit_4675); +COMPILER_STRIP_GATE(0x805AE054, &lit_4675); #pragma pop /* 805AE058-805AE05C 000108 0004+00 0/1 0/0 0/0 .rodata @4676 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4676 = 59.0f; -COMPILER_STRIP_GATE(805AE058, &lit_4676); +COMPILER_STRIP_GATE(0x805AE058, &lit_4676); #pragma pop /* 805AE05C-805AE060 00010C 0004+00 0/1 0/0 0/0 .rodata @4677 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4677 = 92.0f; -COMPILER_STRIP_GATE(805AE05C, &lit_4677); +COMPILER_STRIP_GATE(0x805AE05C, &lit_4677); #pragma pop /* 805AE060-805AE064 000110 0004+00 0/1 0/0 0/0 .rodata @4678 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4678 = 125.0f; -COMPILER_STRIP_GATE(805AE060, &lit_4678); +COMPILER_STRIP_GATE(0x805AE060, &lit_4678); #pragma pop /* 805AE064-805AE068 000114 0004+00 0/1 0/0 0/0 .rodata @4679 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4679 = 29.0f; -COMPILER_STRIP_GATE(805AE064, &lit_4679); +COMPILER_STRIP_GATE(0x805AE064, &lit_4679); #pragma pop /* 805AE068-805AE06C 000118 0004+00 0/1 0/0 0/0 .rodata @4680 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4680 = 132.0f; -COMPILER_STRIP_GATE(805AE068, &lit_4680); +COMPILER_STRIP_GATE(0x805AE068, &lit_4680); #pragma pop /* 805AE06C-805AE070 00011C 0004+00 0/1 0/0 0/0 .rodata @4681 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4681 = 200.0f; -COMPILER_STRIP_GATE(805AE06C, &lit_4681); +COMPILER_STRIP_GATE(0x805AE06C, &lit_4681); #pragma pop /* 805AE070-805AE074 000120 0004+00 0/1 0/0 0/0 .rodata @4682 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4682 = 7.0f; -COMPILER_STRIP_GATE(805AE070, &lit_4682); +COMPILER_STRIP_GATE(0x805AE070, &lit_4682); #pragma pop /* 805AE074-805AE078 000124 0004+00 0/1 0/0 0/0 .rodata @4683 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4683 = 37.0f; -COMPILER_STRIP_GATE(805AE074, &lit_4683); +COMPILER_STRIP_GATE(0x805AE074, &lit_4683); #pragma pop /* 805AE078-805AE07C 000128 0004+00 0/1 0/0 0/0 .rodata @4684 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4684 = 62.0f; -COMPILER_STRIP_GATE(805AE078, &lit_4684); +COMPILER_STRIP_GATE(0x805AE078, &lit_4684); #pragma pop /* 805AE07C-805AE080 00012C 0004+00 0/1 0/0 0/0 .rodata @4685 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4685 = 2200.0f; -COMPILER_STRIP_GATE(805AE07C, &lit_4685); +COMPILER_STRIP_GATE(0x805AE07C, &lit_4685); #pragma pop /* 805ABE0C-805AD7B4 000DEC 19A8+00 2/0 0/0 0/0 .text dr_fly__9daL7ODR_cFv */ @@ -1045,7 +1051,7 @@ static asm void useHeapInit(fopAc_ac_c* param_0) { SECTION_RODATA static u8 const lit_4727[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(805AE080, &lit_4727); +COMPILER_STRIP_GATE(0x805AE080, &lit_4727); #pragma pop /* 805AE088-805AE090 000138 0008+00 0/1 0/0 0/0 .rodata @4728 */ @@ -1054,7 +1060,7 @@ COMPILER_STRIP_GATE(805AE080, &lit_4727); SECTION_RODATA static u8 const lit_4728[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(805AE088, &lit_4728); +COMPILER_STRIP_GATE(0x805AE088, &lit_4728); #pragma pop /* 805AE090-805AE098 000140 0008+00 0/1 0/0 0/0 .rodata @4729 */ @@ -1063,28 +1069,28 @@ COMPILER_STRIP_GATE(805AE088, &lit_4728); SECTION_RODATA static u8 const lit_4729[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(805AE090, &lit_4729); +COMPILER_STRIP_GATE(0x805AE090, &lit_4729); #pragma pop /* 805AE098-805AE09C 000148 0004+00 0/1 0/0 0/0 .rodata @4826 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4826 = -890.0f; -COMPILER_STRIP_GATE(805AE098, &lit_4826); +COMPILER_STRIP_GATE(0x805AE098, &lit_4826); #pragma pop /* 805AE09C-805AE0A0 00014C 0004+00 0/1 0/0 0/0 .rodata @4827 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4827 = -690.0f; -COMPILER_STRIP_GATE(805AE09C, &lit_4827); +COMPILER_STRIP_GATE(0x805AE09C, &lit_4827); #pragma pop /* 805AE0A0-805AE0A4 000150 0004+00 0/1 0/0 0/0 .rodata @4828 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4828 = 3200.0f; -COMPILER_STRIP_GATE(805AE0A0, &lit_4828); +COMPILER_STRIP_GATE(0x805AE0A0, &lit_4828); #pragma pop /* 805ADA2C-805ADAC0 002A0C 0094+00 1/1 0/0 0/0 .text check_start__9daL7ODR_cFv */ @@ -1102,14 +1108,20 @@ asm void daL7ODR_c::check_start() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4888 = -20000.0f; -COMPILER_STRIP_GATE(805AE0A4, &lit_4888); +COMPILER_STRIP_GATE(0x805AE0A4, &lit_4888); #pragma pop /* 805AE0A8-805AE0AC 000158 0004+00 0/1 0/0 0/0 .rodata @4889 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4889 = 20000.0f; -COMPILER_STRIP_GATE(805AE0A8, &lit_4889); +COMPILER_STRIP_GATE(0x805AE0A8, &lit_4889); +#pragma pop + +/* 805AE0AC-805AE0AC 00015C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_805AE0B1 = "B_DR"; #pragma pop /* 805AE0DC-805AE0E8 -00001 000C+00 1/1 0/0 0/0 .data @4839 */ @@ -1283,10 +1295,4 @@ asm void cXyz::operator=(cXyz const& param_0) { } #pragma pop -/* 805AE0AC-805AE0B6 00015C 000A+00 5/5 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_805AE0AC = "B_dr"; -SECTION_DEAD static char const* const stringBase_805AE0B1 = "B_DR"; -#pragma pop +/* 805AE0AC-805AE0AC 00015C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/d_a_arrow/d_a_arrow.cpp b/rel/d/a/d_a_arrow/d_a_arrow.cpp index ae27d4a3600..0b0ef2a7e0b 100644 --- a/rel/d/a/d_a_arrow/d_a_arrow.cpp +++ b/rel/d/a/d_a_arrow/d_a_arrow.cpp @@ -357,7 +357,7 @@ extern "C" void execute__18JPAEmitterCallBackFP14JPABaseEmitter(); extern "C" void executeAfter__18JPAEmitterCallBackFP14JPABaseEmitter(); extern "C" void draw__18JPAEmitterCallBackFP14JPABaseEmitter(); extern "C" void drawAfter__18JPAEmitterCallBackFP14JPABaseEmitter(); -extern "C" void func_8049DC58(s16*); +extern "C" void func_8049DC58(void* _this, s16*); extern "C" extern char const* const d_a_arrow__stringBase0; // @@ -527,6 +527,13 @@ extern "C" void __register_global_object(); // Declarations: // +/* ############################################################################################## */ +/* 8049DE04-8049DE04 000180 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8049DE04 = "HoZelda"; +#pragma pop + /* 80499C6C-80499D6C 0000EC 0100+00 1/1 0/0 0/0 .text createHeap__9daArrow_cFv */ #pragma push #pragma optimization_level 0 @@ -553,7 +560,7 @@ static asm void daArrow_createHeap(fopAc_ac_c* param_0) { SECTION_RODATA static u8 const lit_3768[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8049DC84, &lit_3768); +COMPILER_STRIP_GATE(0x8049DC84, &lit_3768); /* 8049DC90-8049DCDC 00000C 004C+00 0/1 0/0 0/0 .rodata l_atCpsSrc */ #pragma push @@ -565,7 +572,7 @@ SECTION_RODATA static u8 const l_atCpsSrc[76] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0xA0, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8049DC90, &l_atCpsSrc); +COMPILER_STRIP_GATE(0x8049DC90, &l_atCpsSrc); #pragma pop /* 8049DCDC-8049DD1C 000058 0040+00 0/1 0/0 0/0 .rodata l_coSphSrc */ @@ -577,7 +584,7 @@ SECTION_RODATA static u8 const l_coSphSrc[64] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41, 0xC8, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8049DCDC, &l_coSphSrc); +COMPILER_STRIP_GATE(0x8049DCDC, &l_coSphSrc); #pragma pop /* 8049DD1C-8049DD24 000098 0004+04 2/12 0/0 0/0 .rodata @4130 */ @@ -592,7 +599,7 @@ SECTION_RODATA static u8 const lit_4130[4 + 4 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(8049DD1C, &lit_4130); +COMPILER_STRIP_GATE(0x8049DD1C, &lit_4130); /* 8049DD24-8049DD2C 0000A0 0008+00 0/4 0/0 0/0 .rodata @4131 */ #pragma push @@ -600,7 +607,7 @@ COMPILER_STRIP_GATE(8049DD1C, &lit_4130); SECTION_RODATA static u8 const lit_4131[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8049DD24, &lit_4131); +COMPILER_STRIP_GATE(0x8049DD24, &lit_4131); #pragma pop /* 8049DD2C-8049DD34 0000A8 0008+00 0/4 0/0 0/0 .rodata @4132 */ @@ -609,7 +616,7 @@ COMPILER_STRIP_GATE(8049DD24, &lit_4131); SECTION_RODATA static u8 const lit_4132[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8049DD2C, &lit_4132); +COMPILER_STRIP_GATE(0x8049DD2C, &lit_4132); #pragma pop /* 8049DD34-8049DD3C 0000B0 0008+00 0/4 0/0 0/0 .rodata @4133 */ @@ -618,7 +625,7 @@ COMPILER_STRIP_GATE(8049DD2C, &lit_4132); SECTION_RODATA static u8 const lit_4133[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8049DD34, &lit_4133); +COMPILER_STRIP_GATE(0x8049DD34, &lit_4133); #pragma pop /* 80499D8C-80499F9C 00020C 0210+00 1/1 0/0 0/0 .text @@ -658,7 +665,7 @@ asm void daArrow_c::decAlphaBlur() { /* ############################################################################################## */ /* 8049DD3C-8049DD40 0000B8 0004+00 4/10 0/0 0/0 .rodata @4187 */ SECTION_RODATA static f32 const lit_4187 = 1.0f; -COMPILER_STRIP_GATE(8049DD3C, &lit_4187); +COMPILER_STRIP_GATE(0x8049DD3C, &lit_4187); /* 8049A04C-8049A110 0004CC 00C4+00 5/5 0/0 0/0 .text setBlur__9daArrow_cFv */ #pragma push @@ -675,7 +682,7 @@ asm void daArrow_c::setBlur() { SECTION_RODATA static u8 const effName_4192[12] = { 0x89, 0x6F, 0x89, 0x70, 0x89, 0x71, 0x89, 0x72, 0x89, 0x73, 0x89, 0x74, }; -COMPILER_STRIP_GATE(8049DD40, &effName_4192); +COMPILER_STRIP_GATE(0x8049DD40, &effName_4192); /* 8049A110-8049A1EC 000590 00DC+00 1/1 0/0 0/0 .text setLightArrowHitMark__9daArrow_cFPC4cXyz */ #pragma push @@ -694,7 +701,7 @@ asm void daArrow_c::setLightArrowHitMark(cXyz const* param_0) { SECTION_RODATA static u8 const effName_4214[8] = { 0x89, 0x75, 0x89, 0x76, 0x89, 0x77, 0x89, 0x78, }; -COMPILER_STRIP_GATE(8049DD4C, &effName_4214); +COMPILER_STRIP_GATE(0x8049DD4C, &effName_4214); #pragma pop /* 8049DD54-8049DD60 0000D0 000C+00 0/1 0/0 0/0 .rodata localEffPos$4215 */ @@ -703,7 +710,7 @@ COMPILER_STRIP_GATE(8049DD4C, &effName_4214); SECTION_RODATA static u8 const localEffPos[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0xB4, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8049DD54, &localEffPos); +COMPILER_STRIP_GATE(0x8049DD54, &localEffPos); #pragma pop /* 8049A1EC-8049A334 00066C 0148+00 2/2 0/0 0/0 .text setLightChargeEffect__9daArrow_cFi @@ -732,14 +739,14 @@ asm cXyz::~cXyz() { #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4385 = 0x38D1B717; -COMPILER_STRIP_GATE(8049DD60, &lit_4385); +COMPILER_STRIP_GATE(0x8049DD60, &lit_4385); #pragma pop /* 8049DD64-8049DD68 0000E0 0004+00 0/2 0/0 0/0 .rodata @4386 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4386 = 80.0f; -COMPILER_STRIP_GATE(8049DD64, &lit_4386); +COMPILER_STRIP_GATE(0x8049DD64, &lit_4386); #pragma pop /* 8049A370-8049A76C 0007F0 03FC+00 2/2 0/0 0/0 .text @@ -758,21 +765,21 @@ asm void daArrow_c::setArrowWaterNextPos(cXyz* param_0, cXyz* param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4445 = 8.0f; -COMPILER_STRIP_GATE(8049DD68, &lit_4445); +COMPILER_STRIP_GATE(0x8049DD68, &lit_4445); #pragma pop /* 8049DD6C-8049DD70 0000E8 0004+00 0/1 0/0 0/0 .rodata @4446 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4446 = 5.0f; -COMPILER_STRIP_GATE(8049DD6C, &lit_4446); +COMPILER_STRIP_GATE(0x8049DD6C, &lit_4446); #pragma pop /* 8049DD70-8049DD74 0000EC 0004+00 0/2 0/0 0/0 .rodata @4447 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4447 = -300.0f; -COMPILER_STRIP_GATE(8049DD70, &lit_4447); +COMPILER_STRIP_GATE(0x8049DD70, &lit_4447); #pragma pop /* 8049A76C-8049A9CC 000BEC 0260+00 2/2 0/0 0/0 .text setArrowAt__9daArrow_cFf */ @@ -788,7 +795,7 @@ asm void daArrow_c::setArrowAt(f32 param_0) { /* ############################################################################################## */ /* 8049DD74-8049DD78 0000F0 0004+00 1/1 0/0 0/0 .rodata @4541 */ SECTION_RODATA static f32 const lit_4541 = 100.0f; -COMPILER_STRIP_GATE(8049DD74, &lit_4541); +COMPILER_STRIP_GATE(0x8049DD74, &lit_4541); /* 8049A9CC-8049AC84 000E4C 02B8+00 2/2 0/0 0/0 .text arrowShooting__9daArrow_cFv */ #pragma push @@ -835,21 +842,21 @@ asm void daArrow_c::clearNearActorData() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4576 = 21243.0f; -COMPILER_STRIP_GATE(8049DD78, &lit_4576); +COMPILER_STRIP_GATE(0x8049DD78, &lit_4576); #pragma pop /* 8049DD7C-8049DD80 0000F8 0004+00 0/2 0/0 0/0 .rodata @4577 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4577 = 4096.0f; -COMPILER_STRIP_GATE(8049DD7C, &lit_4577); +COMPILER_STRIP_GATE(0x8049DD7C, &lit_4577); #pragma pop /* 8049DD80-8049DD84 0000FC 0004+00 0/1 0/0 0/0 .rodata @4578 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4578 = 1.0f / 50.0f; -COMPILER_STRIP_GATE(8049DD80, &lit_4578); +COMPILER_STRIP_GATE(0x8049DD80, &lit_4578); #pragma pop /* 8049DD84-8049DD8C 000100 0004+04 0/1 0/0 0/0 .rodata @4579 */ @@ -860,7 +867,7 @@ SECTION_RODATA static f32 const lit_4579[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(8049DD84, &lit_4579); +COMPILER_STRIP_GATE(0x8049DD84, &lit_4579); #pragma pop /* 8049DD8C-8049DD94 000108 0008+00 0/3 0/0 0/0 .rodata @4582 */ @@ -869,7 +876,7 @@ COMPILER_STRIP_GATE(8049DD84, &lit_4579); SECTION_RODATA static u8 const lit_4582[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8049DD8C, &lit_4582); +COMPILER_STRIP_GATE(0x8049DD8C, &lit_4582); #pragma pop /* 8049AD94-8049AE64 001214 00D0+00 2/2 0/0 0/0 .text getVibAngle__9daArrow_cFv */ @@ -885,13 +892,13 @@ asm void daArrow_c::getVibAngle() { /* ############################################################################################## */ /* 8049DD94-8049DD98 000110 0004+00 1/2 0/0 0/0 .rodata @4606 */ SECTION_RODATA static f32 const lit_4606 = -95.0f; -COMPILER_STRIP_GATE(8049DD94, &lit_4606); +COMPILER_STRIP_GATE(0x8049DD94, &lit_4606); /* 8049DD98-8049DD9C 000114 0004+00 0/1 0/0 0/0 .rodata @4607 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4607 = -47.5f; -COMPILER_STRIP_GATE(8049DD98, &lit_4607); +COMPILER_STRIP_GATE(0x8049DD98, &lit_4607); #pragma pop /* 8049AE64-8049AF18 0012E4 00B4+00 4/4 0/0 0/0 .text setNormalMatrix__9daArrow_cFv */ @@ -909,28 +916,28 @@ asm void daArrow_c::setNormalMatrix() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4630 = -33.0f / 10.0f; -COMPILER_STRIP_GATE(8049DD9C, &lit_4630); +COMPILER_STRIP_GATE(0x8049DD9C, &lit_4630); #pragma pop /* 8049DDA0-8049DDA4 00011C 0004+00 0/1 0/0 0/0 .rodata @4631 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4631 = -3.0f; -COMPILER_STRIP_GATE(8049DDA0, &lit_4631); +COMPILER_STRIP_GATE(0x8049DDA0, &lit_4631); #pragma pop /* 8049DDA4-8049DDA8 000120 0004+00 0/1 0/0 0/0 .rodata @4632 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4632 = 94.0f; -COMPILER_STRIP_GATE(8049DDA4, &lit_4632); +COMPILER_STRIP_GATE(0x8049DDA4, &lit_4632); #pragma pop /* 8049DDA8-8049DDAC 000124 0004+00 0/1 0/0 0/0 .rodata @4633 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4633 = 9.0f / 10.0f; -COMPILER_STRIP_GATE(8049DDA8, &lit_4633); +COMPILER_STRIP_GATE(0x8049DDA8, &lit_4633); #pragma pop /* 8049DF60-8049DF64 000008 0001+03 1/1 0/0 0/0 .bss @1109 */ @@ -1053,14 +1060,14 @@ asm void daArrow_c::setSmokePos() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4674 = 20.0f; -COMPILER_STRIP_GATE(8049DDAC, &lit_4674); +COMPILER_STRIP_GATE(0x8049DDAC, &lit_4674); #pragma pop /* 8049DDB0-8049DDB4 00012C 0004+00 0/2 0/0 0/0 .rodata @4675 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4675 = -2.0f; -COMPILER_STRIP_GATE(8049DDB0, &lit_4675); +COMPILER_STRIP_GATE(0x8049DDB0, &lit_4675); #pragma pop /* 8049AFEC-8049B120 00146C 0134+00 3/3 0/0 0/0 .text setKeepMatrix__9daArrow_cFv */ @@ -1086,7 +1093,7 @@ asm void daArrow_c::setStopActorMatrix() { /* ############################################################################################## */ /* 8049DDB4-8049DDB8 000130 0004+00 1/1 0/0 0/0 .rodata @4749 */ SECTION_RODATA static f32 const lit_4749 = 0.25f; -COMPILER_STRIP_GATE(8049DDB4, &lit_4749); +COMPILER_STRIP_GATE(0x8049DDB4, &lit_4749); /* 8049B214-8049B370 001694 015C+00 4/4 0/0 0/0 .text setBombMoveEffect__9daArrow_cFv */ #pragma push @@ -1103,7 +1110,7 @@ asm void daArrow_c::setBombMoveEffect() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4763 = -1.0f; -COMPILER_STRIP_GATE(8049DDB8, &lit_4763); +COMPILER_STRIP_GATE(0x8049DDB8, &lit_4763); #pragma pop /* 8049B370-8049B45C 0017F0 00EC+00 2/2 0/0 0/0 .text checkReget__9daArrow_cFv */ @@ -1119,7 +1126,7 @@ asm void daArrow_c::checkReget() { /* ############################################################################################## */ /* 8049DDBC-8049DDC0 000138 0004+00 2/3 0/0 0/0 .rodata @4868 */ SECTION_RODATA static f32 const lit_4868 = 95.0f; -COMPILER_STRIP_GATE(8049DDBC, &lit_4868); +COMPILER_STRIP_GATE(0x8049DDBC, &lit_4868); /* 8049DE0C-8049DE18 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { @@ -1161,28 +1168,28 @@ asm void daArrow_c::procWait() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5356 = 3.0f / 10.0f; -COMPILER_STRIP_GATE(8049DDC0, &lit_5356); +COMPILER_STRIP_GATE(0x8049DDC0, &lit_5356); #pragma pop /* 8049DDC4-8049DDC8 000140 0004+00 0/1 0/0 0/0 .rodata @5357 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_5357 = 0x3F980000; -COMPILER_STRIP_GATE(8049DDC4, &lit_5357); +COMPILER_STRIP_GATE(0x8049DDC4, &lit_5357); #pragma pop /* 8049DDC8-8049DDCC 000144 0004+00 0/1 0/0 0/0 .rodata @5358 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5358 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(8049DDC8, &lit_5358); +COMPILER_STRIP_GATE(0x8049DDC8, &lit_5358); #pragma pop /* 8049DDCC-8049DDD0 000148 0004+00 0/1 0/0 0/0 .rodata @5359 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5359 = -5.0f; -COMPILER_STRIP_GATE(8049DDCC, &lit_5359); +COMPILER_STRIP_GATE(0x8049DDCC, &lit_5359); #pragma pop /* 8049DE38-8049DE44 -00001 000C+00 0/1 0/0 0/0 .data @4874 */ @@ -1349,21 +1356,21 @@ asm cM3dGPla::~cM3dGPla() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5385 = 8192.0f; -COMPILER_STRIP_GATE(8049DDD0, &lit_5385); +COMPILER_STRIP_GATE(0x8049DDD0, &lit_5385); #pragma pop /* 8049DDD4-8049DDD8 000150 0004+00 0/1 0/0 0/0 .rodata @5386 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5386 = 15.0f; -COMPILER_STRIP_GATE(8049DDD4, &lit_5386); +COMPILER_STRIP_GATE(0x8049DDD4, &lit_5386); #pragma pop /* 8049DDD8-8049DDDC 000154 0004+00 0/1 0/0 0/0 .rodata @5387 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5387 = 11264.0f; -COMPILER_STRIP_GATE(8049DDD8, &lit_5387); +COMPILER_STRIP_GATE(0x8049DDD8, &lit_5387); #pragma pop /* 8049C700-8049C874 002B80 0174+00 1/1 0/0 0/0 .text procReturnInit__9daArrow_cFi */ @@ -1381,21 +1388,21 @@ asm void daArrow_c::procReturnInit(int param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5458 = 2.0f; -COMPILER_STRIP_GATE(8049DDDC, &lit_5458); +COMPILER_STRIP_GATE(0x8049DDDC, &lit_5458); #pragma pop /* 8049DDE0-8049DDE4 00015C 0004+00 0/1 0/0 0/0 .rodata @5459 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5459 = 0.5f; -COMPILER_STRIP_GATE(8049DDE0, &lit_5459); +COMPILER_STRIP_GATE(0x8049DDE0, &lit_5459); #pragma pop /* 8049DDE4-8049DDE8 000160 0004+00 0/1 0/0 0/0 .rodata @5460 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5460 = 5000.0f; -COMPILER_STRIP_GATE(8049DDE4, &lit_5460); +COMPILER_STRIP_GATE(0x8049DDE4, &lit_5460); #pragma pop /* 8049C874-8049CB70 002CF4 02FC+00 1/0 0/0 0/0 .text procReturn__9daArrow_cFv */ @@ -1487,21 +1494,21 @@ static asm void daArrow_execute(daArrow_c* param_0) { SECTION_RODATA static u8 const tmpColor[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8049DDE8, &tmpColor); +COMPILER_STRIP_GATE(0x8049DDE8, &tmpColor); #pragma pop /* 8049DDF0-8049DDF4 00016C 0004+00 0/1 0/0 0/0 .rodata @5676 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_5676 = 0x40490FDB; -COMPILER_STRIP_GATE(8049DDF0, &lit_5676); +COMPILER_STRIP_GATE(0x8049DDF0, &lit_5676); #pragma pop /* 8049DDF4-8049DDF8 000170 0004+00 0/2 0/0 0/0 .rodata @5677 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5677 = 50.0f; -COMPILER_STRIP_GATE(8049DDF4, &lit_5677); +COMPILER_STRIP_GATE(0x8049DDF4, &lit_5677); #pragma pop /* 8049D0CC-8049D40C 00354C 0340+00 1/1 0/0 0/0 .text draw__9daArrow_cFv */ @@ -1540,21 +1547,21 @@ static asm void daAlink_searchHorseZelda(fopAc_ac_c* param_0, void* param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5813 = -6.0f; -COMPILER_STRIP_GATE(8049DDF8, &lit_5813); +COMPILER_STRIP_GATE(0x8049DDF8, &lit_5813); #pragma pop /* 8049DDFC-8049DE00 000178 0004+00 0/1 0/0 0/0 .rodata @5814 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5814 = 6.0f; -COMPILER_STRIP_GATE(8049DDFC, &lit_5814); +COMPILER_STRIP_GATE(0x8049DDFC, &lit_5814); #pragma pop /* 8049DE00-8049DE04 00017C 0004+00 0/1 0/0 0/0 .rodata @5815 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5815 = 110.0f; -COMPILER_STRIP_GATE(8049DE00, &lit_5815); +COMPILER_STRIP_GATE(0x8049DE00, &lit_5815); #pragma pop /* 8049D440-8049D808 0038C0 03C8+00 1/1 0/0 0/0 .text create__9daArrow_cFv */ @@ -1680,7 +1687,7 @@ void JPAEmitterCallBack::drawAfter(JPABaseEmitter* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_8049DC58(s16* param_0) { +extern "C" asm void func_8049DC58(void* _this, s16* param_0) { nofralloc #include "asm/rel/d/a/d_a_arrow/d_a_arrow/func_8049DC58.s" } @@ -1865,9 +1872,4 @@ static u8 data_8049E01C[4]; static u8 data_8049E020[4]; #pragma pop -/* 8049DE04-8049DE0C 000180 0008+00 1/1 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_8049DE04 = "HoZelda"; -#pragma pop +/* 8049DE04-8049DE04 000180 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/d_a_balloon_2D/d_a_balloon_2D.cpp b/rel/d/a/d_a_balloon_2D/d_a_balloon_2D.cpp index 7ff54d4e9ee..9872a412e50 100644 --- a/rel/d/a/d_a_balloon_2D/d_a_balloon_2D.cpp +++ b/rel/d/a/d_a_balloon_2D/d_a_balloon_2D.cpp @@ -247,7 +247,15 @@ SECTION_RODATA static u8 const lit_3896[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(806555AC, &lit_3896); +COMPILER_STRIP_GATE(0x806555AC, &lit_3896); + +/* 806555EC-806555EC 000040 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_806555EC = "Balloon2D"; +SECTION_DEAD static char const* const stringBase_806555F6 = "zelda_balloon_game.blo"; +SECTION_DEAD static char const* const stringBase_8065560D = ""; +#pragma pop /* 80655610-806556D4 000000 00C4+00 1/1 0/0 0/0 .data * aParam$localstatic3$__ct__17daBalloon2D_HIO_cFv */ @@ -418,28 +426,28 @@ asm void daBalloon2D_c::setScoreNum(int param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4064 = 1.0f; -COMPILER_STRIP_GATE(806555B0, &lit_4064); +COMPILER_STRIP_GATE(0x806555B0, &lit_4064); #pragma pop /* 806555B4-806555B8 000008 0004+00 0/2 0/0 0/0 .rodata @4065 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4065 = 2.0f / 5.0f; -COMPILER_STRIP_GATE(806555B4, &lit_4065); +COMPILER_STRIP_GATE(0x806555B4, &lit_4065); #pragma pop /* 806555B8-806555BC 00000C 0004+00 0/3 0/0 0/0 .rodata @4066 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4066 = 0.5f; -COMPILER_STRIP_GATE(806555B8, &lit_4066); +COMPILER_STRIP_GATE(0x806555B8, &lit_4066); #pragma pop /* 806555BC-806555C0 000010 0004+00 0/2 0/0 0/0 .rodata @4067 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4067 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(806555BC, &lit_4067); +COMPILER_STRIP_GATE(0x806555BC, &lit_4067); #pragma pop /* 80654440-8065464C 001060 020C+00 1/1 0/0 0/0 .text setAllAlpha__13daBalloon2D_cFv */ @@ -467,63 +475,63 @@ asm void daBalloon2D_c::setComboAlpha() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4165 = 30.0f; -COMPILER_STRIP_GATE(806555C0, &lit_4165); +COMPILER_STRIP_GATE(0x806555C0, &lit_4165); #pragma pop /* 806555C4-806555C8 000018 0004+00 0/1 0/0 0/0 .rodata @4166 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4166 = 3.0f / 10.0f; -COMPILER_STRIP_GATE(806555C4, &lit_4166); +COMPILER_STRIP_GATE(0x806555C4, &lit_4166); #pragma pop /* 806555C8-806555CC 00001C 0004+00 0/1 0/0 0/0 .rodata @4167 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4167 = 10.0f; -COMPILER_STRIP_GATE(806555C8, &lit_4167); +COMPILER_STRIP_GATE(0x806555C8, &lit_4167); #pragma pop /* 806555CC-806555D0 000020 0004+00 0/1 0/0 0/0 .rodata @4168 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4168 = 255.0f; -COMPILER_STRIP_GATE(806555CC, &lit_4168); +COMPILER_STRIP_GATE(0x806555CC, &lit_4168); #pragma pop /* 806555D0-806555D4 000024 0004+00 0/1 0/0 0/0 .rodata @4169 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4169 = 6.0f; -COMPILER_STRIP_GATE(806555D0, &lit_4169); +COMPILER_STRIP_GATE(0x806555D0, &lit_4169); #pragma pop /* 806555D4-806555D8 000028 0004+00 0/1 0/0 0/0 .rodata @4170 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4170 = 2.0f; -COMPILER_STRIP_GATE(806555D4, &lit_4170); +COMPILER_STRIP_GATE(0x806555D4, &lit_4170); #pragma pop /* 806555D8-806555DC 00002C 0004+00 0/1 0/0 0/0 .rodata @4171 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4171 = 3.0f; -COMPILER_STRIP_GATE(806555D8, &lit_4171); +COMPILER_STRIP_GATE(0x806555D8, &lit_4171); #pragma pop /* 806555DC-806555E0 000030 0004+00 0/1 0/0 0/0 .rodata @4172 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4172 = 4.0f; -COMPILER_STRIP_GATE(806555DC, &lit_4172); +COMPILER_STRIP_GATE(0x806555DC, &lit_4172); #pragma pop /* 806555E0-806555E4 000034 0004+00 0/1 0/0 0/0 .rodata @4173 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4173 = 5.0f; -COMPILER_STRIP_GATE(806555E0, &lit_4173); +COMPILER_STRIP_GATE(0x806555E0, &lit_4173); #pragma pop /* 806555E4-806555EC 000038 0008+00 0/1 0/0 0/0 .rodata @4175 */ @@ -532,7 +540,7 @@ COMPILER_STRIP_GATE(806555E0, &lit_4173); SECTION_RODATA static u8 const lit_4175[8] = { 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(806555E4, &lit_4175); +COMPILER_STRIP_GATE(0x806555E4, &lit_4175); #pragma pop /* 80654730-80654E8C 001350 075C+00 1/1 0/0 0/0 .text drawAddScore__13daBalloon2D_cFv */ @@ -728,14 +736,7 @@ asm void __sinit_d_a_balloon_2D_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80655524 = (void*)__sinit_d_a_balloon_2D_cpp; +REGISTER_CTORS(0x80655524, __sinit_d_a_balloon_2D_cpp); #pragma pop -/* 806555EC-8065560E 000040 0022+00 2/1 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_806555EC = "Balloon2D"; -SECTION_DEAD static char const* const stringBase_806555F6 = "zelda_balloon_game.blo"; -SECTION_DEAD static char const* const stringBase_8065560D = ""; -#pragma pop +/* 806555EC-806555EC 000040 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/d_a_bd/d_a_bd.cpp b/rel/d/a/d_a_bd/d_a_bd.cpp index 77924e92292..8a0265093b8 100644 --- a/rel/d/a/d_a_bd/d_a_bd.cpp +++ b/rel/d/a/d_a_bd/d_a_bd.cpp @@ -34,10 +34,10 @@ struct mDoExt_McaMorfCallBack1_c {}; struct Vec {}; -struct J3DModelData {}; - struct J3DAnmTransform {}; +struct J3DModelData {}; + struct mDoExt_McaMorf { /* 8000FC4C */ mDoExt_McaMorf(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, int, @@ -117,10 +117,10 @@ struct dBgS_AcchCir { /* 80075F58 */ void SetWall(f32, f32); }; -struct dBgS {}; - struct csXyz {}; +struct dBgS {}; + struct dBgS_Acch { /* 80075F94 */ ~dBgS_Acch(); /* 800760A0 */ dBgS_Acch(); @@ -302,27 +302,27 @@ extern "C" void __register_global_object(); /* ############################################################################################## */ /* 804D9E64-804D9E68 000000 0004+00 16/16 0/0 0/0 .rodata @3942 */ SECTION_RODATA static f32 const lit_3942 = 6.0f / 5.0f; -COMPILER_STRIP_GATE(804D9E64, &lit_3942); +COMPILER_STRIP_GATE(0x804D9E64, &lit_3942); /* 804D9E68-804D9E6C 000004 0004+00 0/6 0/0 0/0 .rodata @3943 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3943 = 20.0f; -COMPILER_STRIP_GATE(804D9E68, &lit_3943); +COMPILER_STRIP_GATE(0x804D9E68, &lit_3943); #pragma pop /* 804D9E6C-804D9E70 000008 0004+00 0/5 0/0 0/0 .rodata @3944 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3944 = 3.0f; -COMPILER_STRIP_GATE(804D9E6C, &lit_3944); +COMPILER_STRIP_GATE(0x804D9E6C, &lit_3944); #pragma pop /* 804D9E70-804D9E74 00000C 0004+00 0/4 0/0 0/0 .rodata @3945 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3945 = 300.0f; -COMPILER_STRIP_GATE(804D9E70, &lit_3945); +COMPILER_STRIP_GATE(0x804D9E70, &lit_3945); #pragma pop /* 804D9F88-804DA0C8 000000 0140+00 2/2 0/0 0/0 .data land_pos103 */ @@ -472,11 +472,17 @@ SECTION_RODATA static u8 const lit_3963[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(804D9E74, &lit_3963); +COMPILER_STRIP_GATE(0x804D9E74, &lit_3963); /* 804D9E78-804D9E7C 000014 0004+00 2/2 0/0 0/0 .rodata @3964 */ SECTION_RODATA static f32 const lit_3964 = -1.0f; -COMPILER_STRIP_GATE(804D9E78, &lit_3964); +COMPILER_STRIP_GATE(0x804D9E78, &lit_3964); + +/* 804D9F6C-804D9F6C 000108 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_804D9F6C = "Bd"; +#pragma pop /* 804D6CA4-804D6D54 000144 00B0+00 8/8 0/0 0/0 .text anm_init__FP8bd_classifUcf */ #pragma push @@ -503,14 +509,14 @@ static asm void daBd_Draw(bd_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4012 = 30.0f; -COMPILER_STRIP_GATE(804D9E7C, &lit_4012); +COMPILER_STRIP_GATE(0x804D9E7C, &lit_4012); #pragma pop /* 804D9E80-804D9E84 00001C 0004+00 0/4 0/0 0/0 .rodata @4013 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4013 = 100.0f; -COMPILER_STRIP_GATE(804D9E80, &lit_4013); +COMPILER_STRIP_GATE(0x804D9E80, &lit_4013); #pragma pop /* 804D6DD8-804D6ED4 000278 00FC+00 1/1 0/0 0/0 .text way_bg_check__FP8bd_class */ @@ -540,7 +546,7 @@ asm cXyz::~cXyz() { SECTION_RODATA static u8 const lit_4105[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(804D9E84, &lit_4105); +COMPILER_STRIP_GATE(0x804D9E84, &lit_4105); #pragma pop /* 804D9E8C-804D9E94 000028 0008+00 0/4 0/0 0/0 .rodata @4106 */ @@ -549,7 +555,7 @@ COMPILER_STRIP_GATE(804D9E84, &lit_4105); SECTION_RODATA static u8 const lit_4106[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(804D9E8C, &lit_4106); +COMPILER_STRIP_GATE(0x804D9E8C, &lit_4106); #pragma pop /* 804D9E94-804D9E9C 000030 0008+00 0/4 0/0 0/0 .rodata @4107 */ @@ -558,14 +564,14 @@ COMPILER_STRIP_GATE(804D9E8C, &lit_4106); SECTION_RODATA static u8 const lit_4107[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(804D9E94, &lit_4107); +COMPILER_STRIP_GATE(0x804D9E94, &lit_4107); #pragma pop /* 804D9E9C-804D9EA0 000038 0004+00 0/9 0/0 0/0 .rodata @4108 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4108 = 10.0f; -COMPILER_STRIP_GATE(804D9E9C, &lit_4108); +COMPILER_STRIP_GATE(0x804D9E9C, &lit_4108); #pragma pop /* 804DA320-804DA324 000008 0001+03 2/2 0/0 0/0 .bss @1109 */ @@ -684,16 +690,16 @@ static asm void s_a_sub(void* param_0, void* param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4169 = 6.0f; -COMPILER_STRIP_GATE(804D9EA0, &lit_4169); +COMPILER_STRIP_GATE(0x804D9EA0, &lit_4169); #pragma pop /* 804D9EA4-804D9EA8 000040 0004+00 1/7 0/0 0/0 .rodata @4170 */ SECTION_RODATA static f32 const lit_4170 = 2.0f; -COMPILER_STRIP_GATE(804D9EA4, &lit_4170); +COMPILER_STRIP_GATE(0x804D9EA4, &lit_4170); /* 804D9EA8-804D9EAC 000044 0004+00 2/10 0/0 0/0 .rodata @4171 */ SECTION_RODATA static f32 const lit_4171 = 1.0f; -COMPILER_STRIP_GATE(804D9EA8, &lit_4171); +COMPILER_STRIP_GATE(0x804D9EA8, &lit_4171); /* 804D9EAC-804D9EB4 000048 0004+04 0/2 0/0 0/0 .rodata @4172 */ #pragma push @@ -703,7 +709,7 @@ SECTION_RODATA static f32 const lit_4172[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(804D9EAC, &lit_4172); +COMPILER_STRIP_GATE(0x804D9EAC, &lit_4172); #pragma pop /* 804D9EB4-804D9EBC 000050 0008+00 0/2 0/0 0/0 .rodata @4174 */ @@ -712,7 +718,7 @@ COMPILER_STRIP_GATE(804D9EAC, &lit_4172); SECTION_RODATA static u8 const lit_4174[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(804D9EB4, &lit_4174); +COMPILER_STRIP_GATE(0x804D9EB4, &lit_4174); #pragma pop /* 804D7210-804D7518 0006B0 0308+00 1/1 0/0 0/0 .text pl_check__FP8bd_class */ @@ -740,28 +746,35 @@ static asm void pointBgCheck(cXyz* param_0, cXyz* param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4272 = 1000.0f; -COMPILER_STRIP_GATE(804D9EBC, &lit_4272); +COMPILER_STRIP_GATE(0x804D9EBC, &lit_4272); #pragma pop /* 804D9EC0-804D9EC4 00005C 0004+00 0/1 0/0 0/0 .rodata @4273 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4273 = 600.0f; -COMPILER_STRIP_GATE(804D9EC0, &lit_4273); +COMPILER_STRIP_GATE(0x804D9EC0, &lit_4273); #pragma pop /* 804D9EC4-804D9EC8 000060 0004+00 0/1 0/0 0/0 .rodata @4274 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4274 = 5.0f; -COMPILER_STRIP_GATE(804D9EC4, &lit_4274); +COMPILER_STRIP_GATE(0x804D9EC4, &lit_4274); #pragma pop /* 804D9EC8-804D9ECC 000064 0004+00 0/1 0/0 0/0 .rodata @4275 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4275 = 500.0f; -COMPILER_STRIP_GATE(804D9EC8, &lit_4275); +COMPILER_STRIP_GATE(0x804D9EC8, &lit_4275); +#pragma pop + +/* 804D9F6C-804D9F6C 000108 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_804D9F6F = "F_SP103"; +SECTION_DEAD static char const* const stringBase_804D9F77 = "F_SP127"; #pragma pop /* 804D75D0-804D785C 000A70 028C+00 1/1 0/0 0/0 .text land_check__FP8bd_class */ @@ -777,7 +790,7 @@ static asm void land_check(bd_class* param_0) { /* ############################################################################################## */ /* 804D9ECC-804D9ED0 000068 0004+00 1/1 0/0 0/0 .rodata @4282 */ SECTION_RODATA static f32 const lit_4282 = -10.0f; -COMPILER_STRIP_GATE(804D9ECC, &lit_4282); +COMPILER_STRIP_GATE(0x804D9ECC, &lit_4282); /* 804D785C-804D7890 000CFC 0034+00 1/1 0/0 0/0 .text drop_check__FP8bd_class */ #pragma push @@ -802,11 +815,11 @@ SECTION_RODATA static u8 const lit_4286[6 + 2 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(804D9ED0, &lit_4286); +COMPILER_STRIP_GATE(0x804D9ED0, &lit_4286); /* 804D9ED8-804D9EDC 000074 0004+00 1/2 0/0 0/0 .rodata @4288 */ SECTION_RODATA static u32 const lit_4288 = 0x403F5C29; -COMPILER_STRIP_GATE(804D9ED8, &lit_4288); +COMPILER_STRIP_GATE(0x804D9ED8, &lit_4288); /* 804D7890-804D78FC 000D30 006C+00 1/1 0/0 0/0 .text turn_set__FP8bd_class */ #pragma push @@ -823,42 +836,48 @@ static asm void turn_set(bd_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4358 = 65536.0f; -COMPILER_STRIP_GATE(804D9EDC, &lit_4358); +COMPILER_STRIP_GATE(0x804D9EDC, &lit_4358); #pragma pop /* 804D9EE0-804D9EE4 00007C 0004+00 0/4 0/0 0/0 .rodata @4359 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4359 = 200.0f; -COMPILER_STRIP_GATE(804D9EE0, &lit_4359); +COMPILER_STRIP_GATE(0x804D9EE0, &lit_4359); #pragma pop /* 804D9EE4-804D9EE8 000080 0004+00 0/1 0/0 0/0 .rodata @4360 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4360 = 60.0f; -COMPILER_STRIP_GATE(804D9EE4, &lit_4360); +COMPILER_STRIP_GATE(0x804D9EE4, &lit_4360); #pragma pop /* 804D9EE8-804D9EEC 000084 0004+00 0/4 0/0 0/0 .rodata @4361 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4361 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(804D9EE8, &lit_4361); +COMPILER_STRIP_GATE(0x804D9EE8, &lit_4361); #pragma pop /* 804D9EEC-804D9EF0 000088 0004+00 0/1 0/0 0/0 .rodata @4362 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4362 = 7.0f / 20.0f; -COMPILER_STRIP_GATE(804D9EEC, &lit_4362); +COMPILER_STRIP_GATE(0x804D9EEC, &lit_4362); #pragma pop /* 804D9EF0-804D9EF4 00008C 0004+00 0/1 0/0 0/0 .rodata @4363 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4363 = 15.0f; -COMPILER_STRIP_GATE(804D9EF0, &lit_4363); +COMPILER_STRIP_GATE(0x804D9EF0, &lit_4363); +#pragma pop + +/* 804D9F6C-804D9F6C 000108 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_804D9F7F = "R_SP127"; #pragma pop /* 804D78FC-804D7DF4 000D9C 04F8+00 1/1 0/0 0/0 .text bd_ground__FP8bd_class */ @@ -876,49 +895,49 @@ static asm void bd_ground(bd_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4452 = -2.0f; -COMPILER_STRIP_GATE(804D9EF4, &lit_4452); +COMPILER_STRIP_GATE(0x804D9EF4, &lit_4452); #pragma pop /* 804D9EF8-804D9EFC 000094 0004+00 0/1 0/0 0/0 .rodata @4453 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4453 = -450.0f; -COMPILER_STRIP_GATE(804D9EF8, &lit_4453); +COMPILER_STRIP_GATE(0x804D9EF8, &lit_4453); #pragma pop /* 804D9EFC-804D9F00 000098 0004+00 0/1 0/0 0/0 .rodata @4454 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4454 = -612.0f; -COMPILER_STRIP_GATE(804D9EFC, &lit_4454); +COMPILER_STRIP_GATE(0x804D9EFC, &lit_4454); #pragma pop /* 804D9F00-804D9F04 00009C 0004+00 0/1 0/0 0/0 .rodata @4455 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4455 = 800.0f; -COMPILER_STRIP_GATE(804D9F00, &lit_4455); +COMPILER_STRIP_GATE(0x804D9F00, &lit_4455); #pragma pop /* 804D9F04-804D9F08 0000A0 0004+00 0/1 0/0 0/0 .rodata @4456 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4456 = -3000.0f; -COMPILER_STRIP_GATE(804D9F04, &lit_4456); +COMPILER_STRIP_GATE(0x804D9F04, &lit_4456); #pragma pop /* 804D9F08-804D9F0C 0000A4 0004+00 0/1 0/0 0/0 .rodata @4457 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4457 = 32768.0f; -COMPILER_STRIP_GATE(804D9F08, &lit_4457); +COMPILER_STRIP_GATE(0x804D9F08, &lit_4457); #pragma pop /* 804D9F0C-804D9F10 0000A8 0004+00 0/1 0/0 0/0 .rodata @4458 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4458 = 10000.0f; -COMPILER_STRIP_GATE(804D9F0C, &lit_4458); +COMPILER_STRIP_GATE(0x804D9F0C, &lit_4458); #pragma pop /* 804D7DF4-804D82E4 001294 04F0+00 1/1 0/0 0/0 .text bd_fly__FP8bd_class */ @@ -936,7 +955,7 @@ static asm void bd_fly(bd_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4526 = 45.0f; -COMPILER_STRIP_GATE(804D9F10, &lit_4526); +COMPILER_STRIP_GATE(0x804D9F10, &lit_4526); #pragma pop /* 804D82E4-804D8648 001784 0364+00 1/1 0/0 0/0 .text bd_landing__FP8bd_class */ @@ -964,14 +983,14 @@ static asm void bd_landing2(bd_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4624 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(804D9F14, &lit_4624); +COMPILER_STRIP_GATE(0x804D9F14, &lit_4624); #pragma pop /* 804D9F18-804D9F1C 0000B4 0004+00 0/1 0/0 0/0 .rodata @4625 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4625 = 400.0f; -COMPILER_STRIP_GATE(804D9F18, &lit_4625); +COMPILER_STRIP_GATE(0x804D9F18, &lit_4625); #pragma pop /* 804D8798-804D8A34 001C38 029C+00 1/1 0/0 0/0 .text bd_landing3__FP8bd_class */ @@ -989,7 +1008,7 @@ static asm void bd_landing3(bd_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4659 = 0x3FFEB852; -COMPILER_STRIP_GATE(804D9F1C, &lit_4659); +COMPILER_STRIP_GATE(0x804D9F1C, &lit_4659); #pragma pop /* 804D8A34-804D8C48 001ED4 0214+00 1/1 0/0 0/0 .text bd_rope__FP8bd_class */ @@ -1027,7 +1046,7 @@ static asm void bd_drop(bd_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4758 = -7.0f; -COMPILER_STRIP_GATE(804D9F20, &lit_4758); +COMPILER_STRIP_GATE(0x804D9F20, &lit_4758); #pragma pop /* 804D8EB8-804D91F8 002358 0340+00 2/1 0/0 0/0 .text action__FP8bd_class */ @@ -1045,35 +1064,35 @@ static asm void action(bd_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4759 = -80.0f; -COMPILER_STRIP_GATE(804D9F24, &lit_4759); +COMPILER_STRIP_GATE(0x804D9F24, &lit_4759); #pragma pop /* 804D9F28-804D9F2C 0000C4 0004+00 0/0 0/0 0/0 .rodata @4760 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4760 = 1.5f; -COMPILER_STRIP_GATE(804D9F28, &lit_4760); +COMPILER_STRIP_GATE(0x804D9F28, &lit_4760); #pragma pop /* 804D9F2C-804D9F30 0000C8 0004+00 0/1 0/0 0/0 .rodata @4872 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4872 = -914.0f; -COMPILER_STRIP_GATE(804D9F2C, &lit_4872); +COMPILER_STRIP_GATE(0x804D9F2C, &lit_4872); #pragma pop /* 804D9F30-804D9F34 0000CC 0004+00 0/1 0/0 0/0 .rodata @4873 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4873 = 160.0f; -COMPILER_STRIP_GATE(804D9F30, &lit_4873); +COMPILER_STRIP_GATE(0x804D9F30, &lit_4873); #pragma pop /* 804D9F34-804D9F38 0000D0 0004+00 0/1 0/0 0/0 .rodata @4874 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4874 = 3931.0f; -COMPILER_STRIP_GATE(804D9F34, &lit_4874); +COMPILER_STRIP_GATE(0x804D9F34, &lit_4874); #pragma pop /* 804D91F8-804D959C 002698 03A4+00 2/1 0/0 0/0 .text daBd_Execute__FP8bd_class */ @@ -1126,7 +1145,7 @@ asm J3DFrameCtrl::~J3DFrameCtrl() { #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_5073 = 0x40FFF7CF; -COMPILER_STRIP_GATE(804D9F38, &lit_5073); +COMPILER_STRIP_GATE(0x804D9F38, &lit_5073); #pragma pop /* 804DA38C-804DA398 000074 000C+00 0/1 0/0 0/0 .bss @3946 */ @@ -1220,84 +1239,84 @@ asm daBd_HIO_c::~daBd_HIO_c() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5191 = 3350.0f; -COMPILER_STRIP_GATE(804D9F3C, &lit_5191); +COMPILER_STRIP_GATE(0x804D9F3C, &lit_5191); #pragma pop /* 804D9F40-804D9F44 0000DC 0004+00 0/1 0/0 0/0 .rodata @5192 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5192 = 474.0f; -COMPILER_STRIP_GATE(804D9F40, &lit_5192); +COMPILER_STRIP_GATE(0x804D9F40, &lit_5192); #pragma pop /* 804D9F44-804D9F48 0000E0 0004+00 0/1 0/0 0/0 .rodata @5193 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5193 = 1760.0f; -COMPILER_STRIP_GATE(804D9F44, &lit_5193); +COMPILER_STRIP_GATE(0x804D9F44, &lit_5193); #pragma pop /* 804D9F48-804D9F4C 0000E4 0004+00 0/1 0/0 0/0 .rodata @5194 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5194 = 553.0f; -COMPILER_STRIP_GATE(804D9F48, &lit_5194); +COMPILER_STRIP_GATE(0x804D9F48, &lit_5194); #pragma pop /* 804D9F4C-804D9F50 0000E8 0004+00 0/1 0/0 0/0 .rodata @5195 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5195 = 395.0f; -COMPILER_STRIP_GATE(804D9F4C, &lit_5195); +COMPILER_STRIP_GATE(0x804D9F4C, &lit_5195); #pragma pop /* 804D9F50-804D9F54 0000EC 0004+00 0/1 0/0 0/0 .rodata @5196 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5196 = -599.0f; -COMPILER_STRIP_GATE(804D9F50, &lit_5196); +COMPILER_STRIP_GATE(0x804D9F50, &lit_5196); #pragma pop /* 804D9F54-804D9F58 0000F0 0004+00 0/1 0/0 0/0 .rodata @5197 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5197 = -194.0f; -COMPILER_STRIP_GATE(804D9F54, &lit_5197); +COMPILER_STRIP_GATE(0x804D9F54, &lit_5197); #pragma pop /* 804D9F58-804D9F5C 0000F4 0004+00 0/1 0/0 0/0 .rodata @5198 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5198 = 594.0f; -COMPILER_STRIP_GATE(804D9F58, &lit_5198); +COMPILER_STRIP_GATE(0x804D9F58, &lit_5198); #pragma pop /* 804D9F5C-804D9F60 0000F8 0004+00 0/1 0/0 0/0 .rodata @5199 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5199 = 4832.0f; -COMPILER_STRIP_GATE(804D9F5C, &lit_5199); +COMPILER_STRIP_GATE(0x804D9F5C, &lit_5199); #pragma pop /* 804D9F60-804D9F64 0000FC 0004+00 0/1 0/0 0/0 .rodata @5200 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5200 = -3349.0f; -COMPILER_STRIP_GATE(804D9F60, &lit_5200); +COMPILER_STRIP_GATE(0x804D9F60, &lit_5200); #pragma pop /* 804D9F64-804D9F68 000100 0004+00 0/1 0/0 0/0 .rodata @5201 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5201 = 865.0f; -COMPILER_STRIP_GATE(804D9F64, &lit_5201); +COMPILER_STRIP_GATE(0x804D9F64, &lit_5201); #pragma pop /* 804D9F68-804D9F6C 000104 0004+00 0/1 0/0 0/0 .rodata @5202 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5202 = 2773.0f; -COMPILER_STRIP_GATE(804D9F68, &lit_5202); +COMPILER_STRIP_GATE(0x804D9F68, &lit_5202); #pragma pop /* 804D9D00-804D9E40 0031A0 0140+00 0/0 1/0 0/0 .text __sinit_d_a_bd_cpp */ @@ -1312,7 +1331,7 @@ asm void __sinit_d_a_bd_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_804D9D00 = (void*)__sinit_d_a_bd_cpp; +REGISTER_CTORS(0x804D9D00, __sinit_d_a_bd_cpp); #pragma pop /* 804D9E40-804D9E48 0032E0 0008+00 1/0 0/0 0/0 .text @36@__dt__12dBgS_ObjAcchFv */ @@ -1507,12 +1526,4 @@ static u8 data_804DA44C[4]; static u8 data_804DA450[4]; #pragma pop -/* 804D9F6C-804D9F87 000108 001B+00 8/8 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_804D9F6C = "Bd"; -SECTION_DEAD static char const* const stringBase_804D9F6F = "F_SP103"; -SECTION_DEAD static char const* const stringBase_804D9F77 = "F_SP127"; -SECTION_DEAD static char const* const stringBase_804D9F7F = "R_SP127"; -#pragma pop +/* 804D9F6C-804D9F6C 000108 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/d_a_bg/d_a_bg.cpp b/rel/d/a/d_a_bg/d_a_bg.cpp index dc4027e7500..13e34c48744 100644 --- a/rel/d/a/d_a_bg/d_a_bg.cpp +++ b/rel/d/a/d_a_bg/d_a_bg.cpp @@ -784,11 +784,11 @@ asm J3DMatColorAnm::J3DMatColorAnm() { SECTION_RODATA static u8 const lit_3756[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80459374, &lit_3756); +COMPILER_STRIP_GATE(0x80459374, &lit_3756); /* 80459380-80459384 00000C 0004+00 2/3 0/0 0/0 .rodata @3900 */ SECTION_RODATA static f32 const lit_3900 = 1.0f; -COMPILER_STRIP_GATE(80459380, &lit_3900); +COMPILER_STRIP_GATE(0x80459380, &lit_3900); /* 80457F34-80458040 0003B4 010C+00 1/1 0/0 0/0 .text * create__13daBg_btkAnm_cFP12J3DModelDataP19J3DAnmTextureSRTKeyi */ @@ -819,7 +819,7 @@ SECTION_RODATA static u8 const lit_3914[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80459384, &lit_3914); +COMPILER_STRIP_GATE(0x80459384, &lit_3914); /* 80458088-804580CC 000508 0044+00 1/1 0/0 0/0 .text entry__13daBg_btkAnm_cFP12J3DModelData */ #pragma push @@ -885,7 +885,19 @@ static asm void checkCreateHeap(fopAc_ac_c* param_0) { /* ############################################################################################## */ /* 80459388-8045938C 000014 0004+00 1/1 0/0 0/0 .rodata @4125 */ SECTION_RODATA static f32 const lit_4125 = -1.0f; -COMPILER_STRIP_GATE(80459388, &lit_4125); +COMPILER_STRIP_GATE(0x80459388, &lit_4125); + +/* 804593A8-804593A8 000034 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_804593A8 = "00"; +SECTION_DEAD static char const* const stringBase_804593AB = "01"; +SECTION_DEAD static char const* const stringBase_804593AE = "12"; +SECTION_DEAD static char const* const stringBase_804593B1 = "18"; +SECTION_DEAD static char const* const stringBase_804593B4 = "room.dzb"; +SECTION_DEAD static char const* const stringBase_804593BD = "room.kcl"; +SECTION_DEAD static char const* const stringBase_804593C6 = "room.plc"; +#pragma pop /* 804582B8-80458750 000738 0498+00 2/2 0/0 1/1 .text createHeap__6daBg_cFv */ #pragma push @@ -932,14 +944,14 @@ static asm void daBg_Draw(daBg_c* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4479 = 1000000.0f; -COMPILER_STRIP_GATE(8045938C, &lit_4479); +COMPILER_STRIP_GATE(0x8045938C, &lit_4479); #pragma pop /* 80459390-80459394 00001C 0004+00 0/1 0/0 0/0 .rodata @4480 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4480 = 9.0f / 10.0f; -COMPILER_STRIP_GATE(80459390, &lit_4480); +COMPILER_STRIP_GATE(0x80459390, &lit_4480); #pragma pop /* 80459394-8045939C 000020 0004+04 0/1 0/0 0/0 .rodata @4481 */ @@ -950,14 +962,29 @@ SECTION_RODATA static f32 const lit_4481[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80459394, &lit_4481); +COMPILER_STRIP_GATE(0x80459394, &lit_4481); #pragma pop /* 8045939C-804593A4 000028 0008+00 1/2 0/0 0/0 .rodata @4483 */ SECTION_RODATA static u8 const lit_4483[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8045939C, &lit_4483); +COMPILER_STRIP_GATE(0x8045939C, &lit_4483); + +/* 804593A8-804593A8 000034 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_804593CF = "MA12"; +SECTION_DEAD static char const* const stringBase_804593D4 = "MA18"; +SECTION_DEAD static char const* const stringBase_804593D9 = "MA15"; +SECTION_DEAD static char const* const stringBase_804593DE = "MA09"; +SECTION_DEAD static char const* const stringBase_804593E3 = "MA05"; +SECTION_DEAD static char const* const stringBase_804593E8 = "F_SP127"; +SECTION_DEAD static char const* const stringBase_804593F0 = "R_SP127"; +SECTION_DEAD static char const* const stringBase_804593F8 = "MA00_Enkei_Tree_Color"; +SECTION_DEAD static char const* const stringBase_8045940E = "MA00_Gake"; +SECTION_DEAD static char const* const stringBase_80459418 = "MA00_Kusa"; +#pragma pop /* 804588C4-80458F38 000D44 0674+00 1/1 0/0 0/0 .text draw__6daBg_cFv */ #pragma push @@ -972,7 +999,7 @@ asm void daBg_c::draw() { /* ############################################################################################## */ /* 804593A4-804593A8 000030 0004+00 1/1 0/0 0/0 .rodata @4524 */ SECTION_RODATA static f32 const lit_4524 = 100.0f; -COMPILER_STRIP_GATE(804593A4, &lit_4524); +COMPILER_STRIP_GATE(0x804593A4, &lit_4524); /* 80458F38-8045901C 0013B8 00E4+00 1/0 0/0 0/0 .text daBg_Execute__FP6daBg_c */ #pragma push @@ -1029,25 +1056,4 @@ asm void J3DTexNoAnm::calc(u16* param_0) const { } #pragma pop -/* 804593A8-80459422 000034 007A+00 2/2 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_804593A8 = "00"; -SECTION_DEAD static char const* const stringBase_804593AB = "01"; -SECTION_DEAD static char const* const stringBase_804593AE = "12"; -SECTION_DEAD static char const* const stringBase_804593B1 = "18"; -SECTION_DEAD static char const* const stringBase_804593B4 = "room.dzb"; -SECTION_DEAD static char const* const stringBase_804593BD = "room.kcl"; -SECTION_DEAD static char const* const stringBase_804593C6 = "room.plc"; -SECTION_DEAD static char const* const stringBase_804593CF = "MA12"; -SECTION_DEAD static char const* const stringBase_804593D4 = "MA18"; -SECTION_DEAD static char const* const stringBase_804593D9 = "MA15"; -SECTION_DEAD static char const* const stringBase_804593DE = "MA09"; -SECTION_DEAD static char const* const stringBase_804593E3 = "MA05"; -SECTION_DEAD static char const* const stringBase_804593E8 = "F_SP127"; -SECTION_DEAD static char const* const stringBase_804593F0 = "R_SP127"; -SECTION_DEAD static char const* const stringBase_804593F8 = "MA00_Enkei_Tree_Color"; -SECTION_DEAD static char const* const stringBase_8045940E = "MA00_Gake"; -SECTION_DEAD static char const* const stringBase_80459418 = "MA00_Kusa"; -#pragma pop +/* 804593A8-804593A8 000034 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/d_a_bg_obj/d_a_bg_obj.cpp b/rel/d/a/d_a_bg_obj/d_a_bg_obj.cpp index e3727289326..9938a51c087 100644 --- a/rel/d/a/d_a_bg_obj/d_a_bg_obj.cpp +++ b/rel/d/a/d_a_bg_obj/d_a_bg_obj.cpp @@ -51,15 +51,15 @@ struct daSetBgObj_c { /* 80031870 */ void getArcName(fopAc_ac_c*); }; +struct J3DModel {}; + +struct cCcD_Obj {}; + struct dBgW { /* 8007B970 */ dBgW(); /* 8007B9C0 */ void Move(); }; -struct J3DModel {}; - -struct cCcD_Obj {}; - struct daBgObj_c { struct spec_data_c { /* 804597E8 */ void initParticleBlock(u8*); @@ -155,10 +155,10 @@ struct dPa_modelEcallBack { struct dPa_levelEcallBack {}; -struct _GXColor {}; - struct csXyz {}; +struct _GXColor {}; + struct dPa_control_c { /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, @@ -482,6 +482,13 @@ extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; // /* ############################################################################################## */ +/* 8045CA20-8045CA20 000068 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8045CA20 = "model%d.bmd"; +SECTION_DEAD static char const* const stringBase_8045CA2C = "model%d_%d.bmd"; +#pragma pop + /* 8045CE00-8045CE10 000000 0010+00 1/1 0/0 0/0 .bss l_bmdName$3644 */ static u8 l_bmdName[16]; @@ -496,6 +503,13 @@ static asm void getBmdName(int param_0, int param_1) { #pragma pop /* ############################################################################################## */ +/* 8045CA20-8045CA20 000068 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8045CA3B = "model%d.btk"; +SECTION_DEAD static char const* const stringBase_8045CA47 = "model%d_%d.btk"; +#pragma pop + /* 8045CE10-8045CE20 000010 0010+00 1/1 0/0 0/0 .bss l_btkName$3652 */ static u8 l_btkName[16]; @@ -510,6 +524,13 @@ static asm void getBtkName(int param_0, int param_1) { #pragma pop /* ############################################################################################## */ +/* 8045CA20-8045CA20 000068 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8045CA56 = "model%d.brk"; +SECTION_DEAD static char const* const stringBase_8045CA62 = "model%d_%d.brk"; +#pragma pop + /* 8045CE20-8045CE30 000020 0010+00 1/1 0/0 0/0 .bss l_brkName$3660 */ static u8 l_brkName[16]; @@ -524,6 +545,12 @@ static asm void getBrkName(int param_0, int param_1) { #pragma pop /* ############################################################################################## */ +/* 8045CA20-8045CA20 000068 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8045CA71 = "model%d.dzb"; +#pragma pop + /* 8045CE30-8045CE40 000030 0010+00 1/1 0/0 0/0 .bss l_dzbName$3668 */ static u8 l_dzbName[16]; @@ -581,6 +608,14 @@ asm void daBgObj_c::spec_data_c::initFarInfoBlock(u8* param_0) { } #pragma pop +/* ############################################################################################## */ +/* 8045CA20-8045CA20 000068 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8045CA7D = "spec.dat"; +SECTION_DEAD static char const* const stringBase_8045CA86 = "データブロックタイプが不正です<%d>\n"; +#pragma pop + /* 80459904-80459B64 000324 0260+00 1/1 0/0 1/1 .text Set__Q29daBgObj_c11spec_data_cFPv */ #pragma push @@ -621,11 +656,11 @@ SECTION_RODATA static u8 const l_cyl_src[68] = { 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8045C9B8, &l_cyl_src); +COMPILER_STRIP_GATE(0x8045C9B8, &l_cyl_src); /* 8045C9FC-8045CA00 000044 0004+00 2/2 0/0 0/0 .rodata @3823 */ SECTION_RODATA static f32 const lit_3823 = 0.5f; -COMPILER_STRIP_GATE(8045C9FC, &lit_3823); +COMPILER_STRIP_GATE(0x8045C9FC, &lit_3823); /* 80459BEC-80459D0C 00060C 0120+00 1/1 0/0 0/1 .text initAtt__9daBgObj_cFv */ #pragma push @@ -676,7 +711,7 @@ SECTION_RODATA static u8 const lit_3873[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(8045CA00, &lit_3873); +COMPILER_STRIP_GATE(0x8045CA00, &lit_3873); /* 80459E04-80459F14 000824 0110+00 1/1 0/0 0/0 .text settingCullSizeBoxForCo__9daBgObj_cFi */ #pragma push @@ -693,14 +728,14 @@ asm void daBgObj_c::settingCullSizeBoxForCo(int param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3943 = 1000000000.0f; -COMPILER_STRIP_GATE(8045CA04, &lit_3943); +COMPILER_STRIP_GATE(0x8045CA04, &lit_3943); #pragma pop /* 8045CA08-8045CA0C 000050 0004+00 0/1 0/0 0/0 .rodata @3944 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3944 = -1000000000.0f; -COMPILER_STRIP_GATE(8045CA08, &lit_3944); +COMPILER_STRIP_GATE(0x8045CA08, &lit_3944); #pragma pop /* 80459F14-8045A0EC 000934 01D8+00 3/3 0/0 0/0 .text settingCullSizeBoxForCull__9daBgObj_cFi */ @@ -872,7 +907,7 @@ asm void daBgObj_c::Create() { /* ############################################################################################## */ /* 8045CA0C-8045CA10 000054 0004+00 4/8 0/0 0/0 .rodata @4076 */ SECTION_RODATA static f32 const lit_4076 = 1.0f; -COMPILER_STRIP_GATE(8045CA0C, &lit_4076); +COMPILER_STRIP_GATE(0x8045CA0C, &lit_4076); /* 8045CBFC-8045CC08 -00001 000C+00 0/1 0/0 0/0 .data @3769 */ #pragma push @@ -1239,21 +1274,28 @@ asm void daBgObj_c::set_tri_3() { #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4502 = 0xFFFFFFFF; -COMPILER_STRIP_GATE(8045CA10, &lit_4502); +COMPILER_STRIP_GATE(0x8045CA10, &lit_4502); #pragma pop /* 8045CA14-8045CA18 00005C 0004+00 0/1 0/0 0/0 .rodata @4503 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4503 = 0xFFFFFFFF; -COMPILER_STRIP_GATE(8045CA14, &lit_4503); +COMPILER_STRIP_GATE(0x8045CA14, &lit_4503); #pragma pop /* 8045CA18-8045CA1C 000060 0004+00 0/1 0/0 0/0 .rodata @4560 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4560 = 9.0f / 10.0f; -COMPILER_STRIP_GATE(8045CA18, &lit_4560); +COMPILER_STRIP_GATE(0x8045CA18, &lit_4560); +#pragma pop + +/* 8045CA20-8045CA20 000068 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8045CAAA = "Always"; +SECTION_DEAD static char const* const stringBase_8045CAB1 = "BreakWoodBox.bmd"; #pragma pop /* 8045B17C-8045B3A0 001B9C 0224+00 3/3 0/0 0/0 .text setParticle__9daBgObj_cFv */ @@ -1269,7 +1311,7 @@ asm void daBgObj_c::setParticle() { /* ############################################################################################## */ /* 8045CA1C-8045CA20 000064 0004+00 1/4 0/0 0/0 .rodata @4579 */ SECTION_RODATA static f32 const lit_4579 = -1.0f; -COMPILER_STRIP_GATE(8045CA1C, &lit_4579); +COMPILER_STRIP_GATE(0x8045CA1C, &lit_4579); /* 8045B3A0-8045B44C 001DC0 00AC+00 3/3 0/0 0/0 .text setSe__9daBgObj_cFv */ #pragma push @@ -1566,22 +1608,7 @@ asm void __sinit_d_a_bg_obj_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_8045C7F8 = (void*)__sinit_d_a_bg_obj_cpp; +REGISTER_CTORS(0x8045C7F8, __sinit_d_a_bg_obj_cpp); #pragma pop -/* 8045CA20-8045CAC2 000068 00A2+00 7/6 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_8045CA20 = "model%d.bmd"; -SECTION_DEAD static char const* const stringBase_8045CA2C = "model%d_%d.bmd"; -SECTION_DEAD static char const* const stringBase_8045CA3B = "model%d.btk"; -SECTION_DEAD static char const* const stringBase_8045CA47 = "model%d_%d.btk"; -SECTION_DEAD static char const* const stringBase_8045CA56 = "model%d.brk"; -SECTION_DEAD static char const* const stringBase_8045CA62 = "model%d_%d.brk"; -SECTION_DEAD static char const* const stringBase_8045CA71 = "model%d.dzb"; -SECTION_DEAD static char const* const stringBase_8045CA7D = "spec.dat"; -SECTION_DEAD static char const* const stringBase_8045CA86 = "データブロックタイプが不正です<%d>\n"; -SECTION_DEAD static char const* const stringBase_8045CAAA = "Always"; -SECTION_DEAD static char const* const stringBase_8045CAB1 = "BreakWoodBox.bmd"; -#pragma pop +/* 8045CA20-8045CA20 000068 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/d_a_boomerang/d_a_boomerang.cpp b/rel/d/a/d_a_boomerang/d_a_boomerang.cpp index a99d68ac1da..4819b54c460 100644 --- a/rel/d/a/d_a_boomerang/d_a_boomerang.cpp +++ b/rel/d/a/d_a_boomerang/d_a_boomerang.cpp @@ -106,6 +106,7 @@ struct daBoomerang_c { }; struct daBoomerang_HIO_c0 { + static u16 const m_lockWaitTime; static f32 const m_minCircleR; static f32 const m_middleCircleR; static f32 const m_maxCircleR; @@ -156,8 +157,6 @@ struct dPa_control_c { _GXColor const*, cXyz const*, f32); }; -struct dBgS_AcchCir {}; - struct cBgS_PolyInfo {}; struct dBgS { @@ -167,6 +166,8 @@ struct dBgS { /* 80075100 */ void GetRoomId(cBgS_PolyInfo const&); }; +struct dBgS_AcchCir {}; + struct dBgS_Acch { /* 80075F94 */ ~dBgS_Acch(); /* 800760A0 */ dBgS_Acch(); @@ -423,6 +424,7 @@ extern "C" static void func_804A2784(); extern "C" void __dt__19daBoomerang_sight_cFv(); extern "C" void __ct__4cXyzFv(); extern "C" void __dt__12J3DFrameCtrlFv(); +extern "C" u16 const m_lockWaitTime__18daBoomerang_HIO_c0; extern "C" f32 const m_minCircleR__18daBoomerang_HIO_c0; extern "C" f32 const m_middleCircleR__18daBoomerang_HIO_c0; extern "C" f32 const m_maxCircleR__18daBoomerang_HIO_c0; @@ -597,6 +599,23 @@ extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; // Declarations: // +/* ############################################################################################## */ +/* 804A2990-804A2990 000140 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_804A2990 = "zelda_v_cursor_new_yellow.blo"; +SECTION_DEAD static char const* const stringBase_804A29AE = "zelda_v_cursor_new_yellow.bpk"; +SECTION_DEAD static char const* const stringBase_804A29CC = "zelda_v_cursor_new_yellow.bck"; +SECTION_DEAD static char const* const stringBase_804A29EA = "zelda_v_cursor_new_yellow_02.brk"; +SECTION_DEAD static char const* const stringBase_804A2A0B = "zelda_v_cursor_new_yellow.brk"; +SECTION_DEAD static char const* const stringBase_804A2A29 = "zelda_v_cursor_new_red.blo"; +SECTION_DEAD static char const* const stringBase_804A2A44 = "zelda_v_cursor_new_red_02.brk"; +SECTION_DEAD static char const* const stringBase_804A2A62 = "zelda_v_cursor_new_red.brk"; +SECTION_DEAD static char const* const stringBase_804A2A7D = "zelda_v_cursor_new_orange.blo"; +SECTION_DEAD static char const* const stringBase_804A2A9B = "zelda_v_cursor_new_orange_02.brk"; +SECTION_DEAD static char const* const stringBase_804A2ABC = "zelda_v_cursor_new_orange.brk"; +#pragma pop + /* 8049E0B8-8049E36C 000078 02B4+00 1/1 0/0 0/0 .text createHeap__19daBoomerang_sight_cFv */ #pragma push @@ -613,7 +632,7 @@ asm void daBoomerang_sight_c::createHeap() { SECTION_RODATA static u8 const lit_4078[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(804A2850, &lit_4078); +COMPILER_STRIP_GATE(0x804A2850, &lit_4078); /* 804A285C-804A2868 00000C 000C+00 0/0 0/0 0/0 .rodata l_blurTop */ #pragma push @@ -621,14 +640,13 @@ COMPILER_STRIP_GATE(804A2850, &lit_4078); SECTION_RODATA static u8 const l_blurTop[12] = { 0x42, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(804A285C, &l_blurTop); +COMPILER_STRIP_GATE(0x804A285C, &l_blurTop); #pragma pop -/* 804A2868-804A287C -00001 0014+00 0/0 0/0 0/0 .rodata None */ +/* 804A2868-804A287A 000018 000C+06 0/0 0/0 0/0 .rodata l_blurRoot */ #pragma push #pragma force_active on -SECTION_RODATA static u8 const struct_804A2868[20] = { - /* 804A2868 000C+06 data_804A2868 l_blurRoot */ +SECTION_RODATA static u8 const l_blurRoot[12 + 6 /* padding */] = { 0xC2, 0x20, 0x00, @@ -648,11 +666,15 @@ SECTION_RODATA static u8 const struct_804A2868[20] = { 0x3C, 0x1E, 0x1E, - /* 804A287A 0002+00 data_804A287A m_lockWaitTime__18daBoomerang_HIO_c0 */ - 0x00, - 0x0A, }; -COMPILER_STRIP_GATE(804A2868, (((char*)&struct_804A2868) + 0x0) /* l_blurRoot */); +COMPILER_STRIP_GATE(0x804A2868, &l_blurRoot); +#pragma pop + +/* 804A287A-804A287C 00002A 0002+00 0/0 0/0 0/0 .rodata m_lockWaitTime__18daBoomerang_HIO_c0 */ +#pragma push +#pragma force_active on +SECTION_RODATA u16 const daBoomerang_HIO_c0::m_lockWaitTime = 0x000A; +COMPILER_STRIP_GATE(0x804A287A, &daBoomerang_HIO_c0::m_lockWaitTime); #pragma pop /* 804A287C-804A2880 00002C 0004+00 0/0 0/0 0/0 .rodata m_minCircleR__18daBoomerang_HIO_c0 @@ -660,14 +682,14 @@ COMPILER_STRIP_GATE(804A2868, (((char*)&struct_804A2868) + 0x0) /* l_blurRoot */ #pragma push #pragma force_active on SECTION_RODATA f32 const daBoomerang_HIO_c0::m_minCircleR = 28.0f; -COMPILER_STRIP_GATE(804A287C, &daBoomerang_HIO_c0::m_minCircleR); +COMPILER_STRIP_GATE(0x804A287C, &daBoomerang_HIO_c0::m_minCircleR); #pragma pop /* 804A2880-804A2884 000030 0004+00 0/0 0/0 0/0 .rodata m_middleCircleR__18daBoomerang_HIO_c0 */ #pragma push #pragma force_active on SECTION_RODATA f32 const daBoomerang_HIO_c0::m_middleCircleR = 35.0f; -COMPILER_STRIP_GATE(804A2880, &daBoomerang_HIO_c0::m_middleCircleR); +COMPILER_STRIP_GATE(0x804A2880, &daBoomerang_HIO_c0::m_middleCircleR); #pragma pop /* 804A2884-804A2888 000034 0004+00 0/0 0/0 0/0 .rodata m_maxCircleR__18daBoomerang_HIO_c0 @@ -675,21 +697,21 @@ COMPILER_STRIP_GATE(804A2880, &daBoomerang_HIO_c0::m_middleCircleR); #pragma push #pragma force_active on SECTION_RODATA f32 const daBoomerang_HIO_c0::m_maxCircleR = 80.0f; -COMPILER_STRIP_GATE(804A2884, &daBoomerang_HIO_c0::m_maxCircleR); +COMPILER_STRIP_GATE(0x804A2884, &daBoomerang_HIO_c0::m_maxCircleR); #pragma pop /* 804A2888-804A288C 000038 0004+00 0/0 0/0 0/0 .rodata m_scale__18daBoomerang_HIO_c0 */ #pragma push #pragma force_active on SECTION_RODATA f32 const daBoomerang_HIO_c0::m_scale = 3.0f / 5.0f; -COMPILER_STRIP_GATE(804A2888, &daBoomerang_HIO_c0::m_scale); +COMPILER_STRIP_GATE(0x804A2888, &daBoomerang_HIO_c0::m_scale); #pragma pop /* 804A288C-804A2890 00003C 0004+00 0/0 0/0 0/0 .rodata m_lockWindScale__18daBoomerang_HIO_c0 */ #pragma push #pragma force_active on SECTION_RODATA f32 const daBoomerang_HIO_c0::m_lockWindScale = 2.0f; -COMPILER_STRIP_GATE(804A288C, &daBoomerang_HIO_c0::m_lockWindScale); +COMPILER_STRIP_GATE(0x804A288C, &daBoomerang_HIO_c0::m_lockWindScale); #pragma pop /* 804A2890-804A28A4 000040 0014+00 0/1 0/0 0/0 .rodata l_lockSeFlg */ @@ -699,7 +721,7 @@ SECTION_RODATA static u8 const l_lockSeFlg[20] = { 0x00, 0x00, 0x00, 0x68, 0x00, 0x00, 0x00, 0x69, 0x00, 0x00, 0x00, 0x6A, 0x00, 0x00, 0x00, 0x6B, 0x00, 0x00, 0x00, 0x6C, }; -COMPILER_STRIP_GATE(804A2890, &l_lockSeFlg); +COMPILER_STRIP_GATE(0x804A2890, &l_lockSeFlg); #pragma pop /* 804A28A4-804A28A8 000054 0004+00 2/6 0/0 0/0 .rodata @4432 */ @@ -709,7 +731,7 @@ SECTION_RODATA static u8 const lit_4432[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(804A28A4, &lit_4432); +COMPILER_STRIP_GATE(0x804A28A4, &lit_4432); /* 8049E36C-8049EB64 00032C 07F8+00 1/1 0/0 0/0 .text initialize__19daBoomerang_sight_cFv */ @@ -727,28 +749,28 @@ asm void daBoomerang_sight_c::initialize() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4481 = 11.0f / 10.0f; -COMPILER_STRIP_GATE(804A28A8, &lit_4481); +COMPILER_STRIP_GATE(0x804A28A8, &lit_4481); #pragma pop /* 804A28AC-804A28B0 00005C 0004+00 0/2 0/0 0/0 .rodata @4482 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4482 = 50.0f; -COMPILER_STRIP_GATE(804A28AC, &lit_4482); +COMPILER_STRIP_GATE(0x804A28AC, &lit_4482); #pragma pop /* 804A28B0-804A28B4 000060 0004+00 0/1 0/0 0/0 .rodata @4483 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4483 = -29.0f; -COMPILER_STRIP_GATE(804A28B0, &lit_4483); +COMPILER_STRIP_GATE(0x804A28B0, &lit_4483); #pragma pop /* 804A28B4-804A28B8 000064 0004+00 0/2 0/0 0/0 .rodata @4484 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4484 = 21.0f; -COMPILER_STRIP_GATE(804A28B4, &lit_4484); +COMPILER_STRIP_GATE(0x804A28B4, &lit_4484); #pragma pop /* 804A28B8-804A28C0 000068 0004+04 0/1 0/0 0/0 .rodata @4485 */ @@ -759,14 +781,14 @@ SECTION_RODATA static f32 const lit_4485[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(804A28B8, &lit_4485); +COMPILER_STRIP_GATE(0x804A28B8, &lit_4485); #pragma pop /* 804A28C0-804A28C8 000070 0008+00 1/2 0/0 0/0 .rodata @4487 */ SECTION_RODATA static u8 const lit_4487[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(804A28C0, &lit_4487); +COMPILER_STRIP_GATE(0x804A28C0, &lit_4487); /* 8049EB64-8049EDA8 000B24 0244+00 1/1 0/0 0/0 .text playAnime__19daBoomerang_sight_cFii */ @@ -782,7 +804,7 @@ asm void daBoomerang_sight_c::playAnime(int param_0, int param_1) { /* ############################################################################################## */ /* 804A28C8-804A28CC 000078 0004+00 1/2 0/0 0/0 .rodata @4495 */ SECTION_RODATA static f32 const lit_4495 = 4.0f; -COMPILER_STRIP_GATE(804A28C8, &lit_4495); +COMPILER_STRIP_GATE(0x804A28C8, &lit_4495); /* 8049EDA8-8049EDE8 000D68 0040+00 2/2 0/0 0/0 .text initFrame__19daBoomerang_sight_cFi */ @@ -830,63 +852,63 @@ asm void daBoomerang_sight_c::setSight(cXyz const* param_0, int param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4643 = 80.0f; -COMPILER_STRIP_GATE(804A28CC, &lit_4643); +COMPILER_STRIP_GATE(0x804A28CC, &lit_4643); #pragma pop /* 804A28D0-804A28D4 000080 0004+00 0/1 0/0 0/0 .rodata @4644 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4644 = 35.0f; -COMPILER_STRIP_GATE(804A28D0, &lit_4644); +COMPILER_STRIP_GATE(0x804A28D0, &lit_4644); #pragma pop /* 804A28D4-804A28D8 000084 0004+00 0/1 0/0 0/0 .rodata @4645 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4645 = 3.0f / 5.0f; -COMPILER_STRIP_GATE(804A28D4, &lit_4645); +COMPILER_STRIP_GATE(0x804A28D4, &lit_4645); #pragma pop /* 804A28D8-804A28DC 000088 0004+00 0/2 0/0 0/0 .rodata @4646 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4646 = 15.0f; -COMPILER_STRIP_GATE(804A28D8, &lit_4646); +COMPILER_STRIP_GATE(0x804A28D8, &lit_4646); #pragma pop /* 804A28DC-804A28E0 00008C 0004+00 0/1 0/0 0/0 .rodata @4647 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4647 = 1.0f / 6.0f; -COMPILER_STRIP_GATE(804A28DC, &lit_4647); +COMPILER_STRIP_GATE(0x804A28DC, &lit_4647); #pragma pop /* 804A28E0-804A28E4 000090 0004+00 0/2 0/0 0/0 .rodata @4648 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4648 = 0.5f; -COMPILER_STRIP_GATE(804A28E0, &lit_4648); +COMPILER_STRIP_GATE(0x804A28E0, &lit_4648); #pragma pop /* 804A28E4-804A28E8 000094 0004+00 0/1 0/0 0/0 .rodata @4649 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4649 = 0x3B800000; -COMPILER_STRIP_GATE(804A28E4, &lit_4649); +COMPILER_STRIP_GATE(0x804A28E4, &lit_4649); #pragma pop /* 804A28E8-804A28EC 000098 0004+00 0/1 0/0 0/0 .rodata @4650 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4650 = 0x3B008081; -COMPILER_STRIP_GATE(804A28E8, &lit_4650); +COMPILER_STRIP_GATE(0x804A28E8, &lit_4650); #pragma pop /* 804A28EC-804A28F0 00009C 0004+00 0/1 0/0 0/0 .rodata @4651 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4651 = 0x40278D36; -COMPILER_STRIP_GATE(804A28EC, &lit_4651); +COMPILER_STRIP_GATE(0x804A28EC, &lit_4651); #pragma pop /* 804A28F0-804A28F8 0000A0 0004+04 0/1 0/0 0/0 .rodata @4652 */ @@ -897,7 +919,7 @@ SECTION_RODATA static u32 const lit_4652[1 + 1 /* padding */] = { /* padding */ 0x00000000, }; -COMPILER_STRIP_GATE(804A28F0, &lit_4652); +COMPILER_STRIP_GATE(0x804A28F0, &lit_4652); #pragma pop /* 804A28F8-804A2900 0000A8 0008+00 0/1 0/0 0/0 .rodata @4654 */ @@ -906,7 +928,7 @@ COMPILER_STRIP_GATE(804A28F0, &lit_4652); SECTION_RODATA static u8 const lit_4654[8] = { 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(804A28F8, &lit_4654); +COMPILER_STRIP_GATE(0x804A28F8, &lit_4654); #pragma pop /* 8049EF60-8049F280 000F20 0320+00 1/0 0/0 0/0 .text draw__19daBoomerang_sight_cFv */ @@ -1064,7 +1086,7 @@ asm void daBoomerang_c::resetLockActor() { /* ############################################################################################## */ /* 804A2900-804A2904 0000B0 0004+00 1/1 0/0 0/0 .rodata @4886 */ SECTION_RODATA static f32 const lit_4886 = -1000000000.0f; -COMPILER_STRIP_GATE(804A2900, &lit_4886); +COMPILER_STRIP_GATE(0x804A2900, &lit_4886); /* 8049F9F0-8049FAA4 0019B0 00B4+00 2/2 0/0 0/0 .text setRoomInfo__13daBoomerang_cFv */ #pragma push @@ -1081,21 +1103,21 @@ asm void daBoomerang_c::setRoomInfo() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4910 = 32.0f; -COMPILER_STRIP_GATE(804A2904, &lit_4910); +COMPILER_STRIP_GATE(0x804A2904, &lit_4910); #pragma pop /* 804A2908-804A290C 0000B8 0004+00 0/1 0/0 0/0 .rodata @4911 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4911 = -5.0f; -COMPILER_STRIP_GATE(804A2908, &lit_4911); +COMPILER_STRIP_GATE(0x804A2908, &lit_4911); #pragma pop /* 804A290C-804A2910 0000BC 0004+00 0/1 0/0 0/0 .rodata @4912 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4912 = -6.0f; -COMPILER_STRIP_GATE(804A290C, &lit_4912); +COMPILER_STRIP_GATE(0x804A290C, &lit_4912); #pragma pop /* 8049FAA4-8049FBAC 001A64 0108+00 2/2 0/0 0/0 .text setKeepMatrix__13daBoomerang_cFv */ @@ -1111,7 +1133,7 @@ asm void daBoomerang_c::setKeepMatrix() { /* ############################################################################################## */ /* 804A2910-804A2914 0000C0 0004+00 5/8 0/0 0/0 .rodata @4945 */ SECTION_RODATA static f32 const lit_4945 = 1.0f; -COMPILER_STRIP_GATE(804A2910, &lit_4945); +COMPILER_STRIP_GATE(0x804A2910, &lit_4945); /* 8049FBAC-8049FCD0 001B6C 0124+00 1/1 0/0 0/0 .text setMoveMatrix__13daBoomerang_cFv */ #pragma push @@ -1126,7 +1148,7 @@ asm void daBoomerang_c::setMoveMatrix() { /* ############################################################################################## */ /* 804A2914-804A2918 0000C4 0004+00 1/2 0/0 0/0 .rodata @4961 */ SECTION_RODATA static f32 const lit_4961 = -1.0f; -COMPILER_STRIP_GATE(804A2914, &lit_4961); +COMPILER_STRIP_GATE(0x804A2914, &lit_4961); /* 8049FCD0-8049FD6C 001C90 009C+00 1/1 0/0 0/0 .text setRotAngle__13daBoomerang_cFv */ #pragma push @@ -1151,11 +1173,11 @@ asm void daBoomerang_c::setAimPos() { /* ############################################################################################## */ /* 804A2918-804A291C 0000C8 0004+00 1/1 0/0 0/0 .rodata @5044 */ SECTION_RODATA static f32 const lit_5044 = 2500.0f; -COMPILER_STRIP_GATE(804A2918, &lit_5044); +COMPILER_STRIP_GATE(0x804A2918, &lit_5044); /* 804A291C-804A2920 0000CC 0004+00 1/2 0/0 0/0 .rodata @5045 */ SECTION_RODATA static f32 const lit_5045 = 30.0f; -COMPILER_STRIP_GATE(804A291C, &lit_5045); +COMPILER_STRIP_GATE(0x804A291C, &lit_5045); /* 8049FE6C-804A006C 001E2C 0200+00 2/2 0/0 0/0 .text checkBgHit__13daBoomerang_cFP4cXyzP4cXyz */ #pragma push @@ -1183,42 +1205,42 @@ asm void daBoomerang_c::setEffectTraceMatrix(u32* param_0, u16 param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5385 = 1.5f; -COMPILER_STRIP_GATE(804A2920, &lit_5385); +COMPILER_STRIP_GATE(0x804A2920, &lit_5385); #pragma pop /* 804A2924-804A2928 0000D4 0004+00 0/1 0/0 0/0 .rodata @5386 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5386 = 9.0f / 5.0f; -COMPILER_STRIP_GATE(804A2924, &lit_5386); +COMPILER_STRIP_GATE(0x804A2924, &lit_5386); #pragma pop /* 804A2928-804A292C 0000D8 0004+00 0/1 0/0 0/0 .rodata @5387 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5387 = 6.0f / 5.0f; -COMPILER_STRIP_GATE(804A2928, &lit_5387); +COMPILER_STRIP_GATE(0x804A2928, &lit_5387); #pragma pop /* 804A292C-804A2930 0000DC 0004+00 0/1 0/0 0/0 .rodata @5388 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5388 = 3.0f; -COMPILER_STRIP_GATE(804A292C, &lit_5388); +COMPILER_STRIP_GATE(0x804A292C, &lit_5388); #pragma pop /* 804A2930-804A2934 0000E0 0004+00 0/1 0/0 0/0 .rodata @5389 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5389 = 5.0f; -COMPILER_STRIP_GATE(804A2930, &lit_5389); +COMPILER_STRIP_GATE(0x804A2930, &lit_5389); #pragma pop /* 804A2934-804A2938 0000E4 0004+00 0/1 0/0 0/0 .rodata @5390 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5390 = 10.0f; -COMPILER_STRIP_GATE(804A2934, &lit_5390); +COMPILER_STRIP_GATE(0x804A2934, &lit_5390); #pragma pop /* 804A2938-804A2940 0000E8 0008+00 0/2 0/0 0/0 .rodata @5391 */ @@ -1227,7 +1249,7 @@ COMPILER_STRIP_GATE(804A2934, &lit_5390); SECTION_RODATA static u8 const lit_5391[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(804A2938, &lit_5391); +COMPILER_STRIP_GATE(0x804A2938, &lit_5391); #pragma pop /* 804A2940-804A2948 0000F0 0008+00 0/2 0/0 0/0 .rodata @5392 */ @@ -1236,7 +1258,7 @@ COMPILER_STRIP_GATE(804A2938, &lit_5391); SECTION_RODATA static u8 const lit_5392[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(804A2940, &lit_5392); +COMPILER_STRIP_GATE(0x804A2940, &lit_5392); #pragma pop /* 804A2948-804A2950 0000F8 0008+00 0/2 0/0 0/0 .rodata @5393 */ @@ -1245,14 +1267,14 @@ COMPILER_STRIP_GATE(804A2940, &lit_5392); SECTION_RODATA static u8 const lit_5393[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(804A2948, &lit_5393); +COMPILER_STRIP_GATE(0x804A2948, &lit_5393); #pragma pop /* 804A2950-804A2954 000100 0004+00 0/1 0/0 0/0 .rodata @5394 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5394 = 1.0f / 100.0f; -COMPILER_STRIP_GATE(804A2950, &lit_5394); +COMPILER_STRIP_GATE(0x804A2950, &lit_5394); #pragma pop /* 804A2ADC-804A2AE8 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ @@ -1589,14 +1611,14 @@ asm cM3dGPla::~cM3dGPla() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5561 = 60.0f; -COMPILER_STRIP_GATE(804A2954, &lit_5561); +COMPILER_STRIP_GATE(0x804A2954, &lit_5561); #pragma pop /* 804A2958-804A295C 000108 0004+00 0/1 0/0 0/0 .rodata @5562 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5562 = 100.0f; -COMPILER_STRIP_GATE(804A2958, &lit_5562); +COMPILER_STRIP_GATE(0x804A2958, &lit_5562); #pragma pop /* 804A0874-804A0F0C 002834 0698+00 2/0 0/0 0/0 .text procWait__13daBoomerang_cFv */ @@ -1616,56 +1638,56 @@ asm void daBoomerang_c::procWait() { SECTION_RODATA static u8 const lit_5574[12] = { 0x00, 0x00, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(804A295C, &lit_5574); +COMPILER_STRIP_GATE(0x804A295C, &lit_5574); #pragma pop /* 804A2968-804A296C 000118 0004+00 0/1 0/0 0/0 .rodata @5762 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5762 = 40.0f; -COMPILER_STRIP_GATE(804A2968, &lit_5762); +COMPILER_STRIP_GATE(0x804A2968, &lit_5762); #pragma pop /* 804A296C-804A2970 00011C 0004+00 0/1 0/0 0/0 .rodata @5763 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5763 = 2.0f; -COMPILER_STRIP_GATE(804A296C, &lit_5763); +COMPILER_STRIP_GATE(0x804A296C, &lit_5763); #pragma pop /* 804A2970-804A2974 000120 0004+00 0/1 0/0 0/0 .rodata @5764 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5764 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(804A2970, &lit_5764); +COMPILER_STRIP_GATE(0x804A2970, &lit_5764); #pragma pop /* 804A2974-804A2978 000124 0004+00 0/1 0/0 0/0 .rodata @5765 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5765 = 20.0f; -COMPILER_STRIP_GATE(804A2974, &lit_5765); +COMPILER_STRIP_GATE(0x804A2974, &lit_5765); #pragma pop /* 804A2978-804A297C 000128 0004+00 0/1 0/0 0/0 .rodata @5766 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5766 = 18.0f; -COMPILER_STRIP_GATE(804A2978, &lit_5766); +COMPILER_STRIP_GATE(0x804A2978, &lit_5766); #pragma pop /* 804A297C-804A2980 00012C 0004+00 0/1 0/0 0/0 .rodata @5767 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5767 = 1024.0f; -COMPILER_STRIP_GATE(804A297C, &lit_5767); +COMPILER_STRIP_GATE(0x804A297C, &lit_5767); #pragma pop /* 804A2980-804A2984 000130 0004+00 0/1 0/0 0/0 .rodata @5768 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5768 = 256.0f; -COMPILER_STRIP_GATE(804A2980, &lit_5768); +COMPILER_STRIP_GATE(0x804A2980, &lit_5768); #pragma pop /* 804A0F0C-804A1814 002ECC 0908+00 2/1 0/0 0/0 .text procMove__13daBoomerang_cFv */ @@ -1683,14 +1705,14 @@ asm void daBoomerang_c::procMove() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5874 = 1000000000.0f; -COMPILER_STRIP_GATE(804A2984, &lit_5874); +COMPILER_STRIP_GATE(0x804A2984, &lit_5874); #pragma pop /* 804A2988-804A298C 000138 0004+00 0/1 0/0 0/0 .rodata @5875 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5875 = 500.0f; -COMPILER_STRIP_GATE(804A2988, &lit_5875); +COMPILER_STRIP_GATE(0x804A2988, &lit_5875); #pragma pop /* 804A1814-804A1BD4 0037D4 03C0+00 1/1 0/0 0/0 .text execute__13daBoomerang_cFv */ @@ -1765,7 +1787,7 @@ static asm void daBoomerang_createHeap(fopAc_ac_c* param_0) { /* ############################################################################################## */ /* 804A298C-804A2990 00013C 0004+00 1/1 0/0 0/0 .rodata @6077 */ SECTION_RODATA static f32 const lit_6077 = 600.0f; -COMPILER_STRIP_GATE(804A298C, &lit_6077); +COMPILER_STRIP_GATE(0x804A298C, &lit_6077); /* 804A2084-804A230C 004044 0288+00 1/1 0/0 0/0 .text create__13daBoomerang_cFv */ #pragma push @@ -2117,19 +2139,4 @@ static u8 data_804A2DB0[4]; static u8 data_804A2DB4[4]; #pragma pop -/* 804A2990-804A2ADA 000140 014A+00 1/1 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_804A2990 = "zelda_v_cursor_new_yellow.blo"; -SECTION_DEAD static char const* const stringBase_804A29AE = "zelda_v_cursor_new_yellow.bpk"; -SECTION_DEAD static char const* const stringBase_804A29CC = "zelda_v_cursor_new_yellow.bck"; -SECTION_DEAD static char const* const stringBase_804A29EA = "zelda_v_cursor_new_yellow_02.brk"; -SECTION_DEAD static char const* const stringBase_804A2A0B = "zelda_v_cursor_new_yellow.brk"; -SECTION_DEAD static char const* const stringBase_804A2A29 = "zelda_v_cursor_new_red.blo"; -SECTION_DEAD static char const* const stringBase_804A2A44 = "zelda_v_cursor_new_red_02.brk"; -SECTION_DEAD static char const* const stringBase_804A2A62 = "zelda_v_cursor_new_red.brk"; -SECTION_DEAD static char const* const stringBase_804A2A7D = "zelda_v_cursor_new_orange.blo"; -SECTION_DEAD static char const* const stringBase_804A2A9B = "zelda_v_cursor_new_orange_02.brk"; -SECTION_DEAD static char const* const stringBase_804A2ABC = "zelda_v_cursor_new_orange.brk"; -#pragma pop +/* 804A2990-804A2990 000140 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/d_a_bullet/d_a_bullet.cpp b/rel/d/a/d_a_bullet/d_a_bullet.cpp index 2f8e8895923..e9526b21783 100644 --- a/rel/d/a/d_a_bullet/d_a_bullet.cpp +++ b/rel/d/a/d_a_bullet/d_a_bullet.cpp @@ -173,7 +173,7 @@ extern "C" static void daBullet_Execute__FPv(); extern "C" static void daBullet_Draw__FPv(); extern "C" static bool daBullet_IsDelete__FPv(); extern "C" void __dt__10cCcD_GSttsFv(); -extern "C" void func_80656618(int*); +extern "C" void func_80656618(void* _this, int*); extern "C" void __sinit_d_a_bullet_cpp(); extern "C" void __dt__16daBullet_Param_cFv(); extern "C" static void func_806566F0(); @@ -246,6 +246,13 @@ extern "C" void __register_global_object(); // /* ############################################################################################## */ +/* 80656774-80656774 000060 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80656774 = "Hanjo1"; +SECTION_DEAD static char const* const stringBase_8065677B = "hanjo_stone.bmd"; +#pragma pop + /* 8065678C-80656790 -00001 0004+00 1/1 0/0 0/0 .data l_resFileNameList */ SECTION_DATA static void* l_resFileNameList = (void*)&d_a_bullet__stringBase0; @@ -448,18 +455,18 @@ SECTION_RODATA u8 const daBullet_c::mCcDObjInfo[48] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x79, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80656714, &daBullet_c::mCcDObjInfo); +COMPILER_STRIP_GATE(0x80656714, &daBullet_c::mCcDObjInfo); /* 80656744-8065675C 000030 0018+00 1/2 0/0 0/0 .rodata m__16daBullet_Param_c */ SECTION_RODATA u8 const daBullet_Param_c::m[24] = { 0xC0, 0x40, 0x00, 0x00, 0x43, 0x7F, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, 0x3F, 0xC0, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, 0x07, 0x08, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80656744, &daBullet_Param_c::m); +COMPILER_STRIP_GATE(0x80656744, &daBullet_Param_c::m); /* 8065675C-80656760 000048 0004+00 1/1 0/0 0/0 .rodata @3824 */ SECTION_RODATA static f32 const lit_3824 = -1000000000.0f; -COMPILER_STRIP_GATE(8065675C, &lit_3824); +COMPILER_STRIP_GATE(0x8065675C, &lit_3824); /* 80655F10-806560FC 0006B0 01EC+00 2/2 0/0 0/0 .text Execute__10daBullet_cFv */ #pragma push @@ -527,14 +534,14 @@ asm void daBullet_c::getTypeFromParam() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3843 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(80656760, &lit_3843); +COMPILER_STRIP_GATE(0x80656760, &lit_3843); #pragma pop /* 80656764-80656768 000050 0004+00 0/0 0/0 0/0 .rodata @3844 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3844 = 0.5f; -COMPILER_STRIP_GATE(80656764, &lit_3844); +COMPILER_STRIP_GATE(0x80656764, &lit_3844); #pragma pop /* 80656768-8065676C 000054 0004+00 0/0 0/0 0/0 .rodata @3845 */ @@ -546,21 +553,21 @@ SECTION_RODATA static u8 const lit_3845[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80656768, &lit_3845); +COMPILER_STRIP_GATE(0x80656768, &lit_3845); #pragma pop /* 8065676C-80656770 000058 0004+00 0/1 0/0 0/0 .rodata @3908 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3908 = -10.0f; -COMPILER_STRIP_GATE(8065676C, &lit_3908); +COMPILER_STRIP_GATE(0x8065676C, &lit_3908); #pragma pop /* 80656770-80656774 00005C 0004+00 0/1 0/0 0/0 .rodata @3909 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3909 = 10.0f; -COMPILER_STRIP_GATE(80656770, &lit_3909); +COMPILER_STRIP_GATE(0x80656770, &lit_3909); #pragma pop /* 806561D0-80656378 000970 01A8+00 1/1 0/0 0/0 .text initialize__10daBullet_cFv */ @@ -578,7 +585,7 @@ asm void daBullet_c::initialize() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daBullet_c::setProcess(int (daBullet_c::*)(void*)) { +asm void daBullet_c::setProcess(int (daBullet_c::*param_0)(void*)) { nofralloc #include "asm/rel/d/a/d_a_bullet/d_a_bullet/setProcess__10daBullet_cFM10daBullet_cFPCvPvPv_i.s" } @@ -663,7 +670,7 @@ asm cCcD_GStts::~cCcD_GStts() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80656618(int* param_0) { +extern "C" asm void func_80656618(void* _this, int* param_0) { nofralloc #include "asm/rel/d/a/d_a_bullet/d_a_bullet/func_80656618.s" } @@ -695,7 +702,7 @@ asm void __sinit_d_a_bullet_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80656634 = (void*)__sinit_d_a_bullet_cpp; +REGISTER_CTORS(0x80656634, __sinit_d_a_bullet_cpp); #pragma pop /* 806566A8-806566F0 000E48 0048+00 2/1 0/0 0/0 .text __dt__16daBullet_Param_cFv */ @@ -728,10 +735,4 @@ static asm void func_806566F8() { } #pragma pop -/* 80656774-8065678B 000060 0017+00 2/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80656774 = "Hanjo1"; -SECTION_DEAD static char const* const stringBase_8065677B = "hanjo_stone.bmd"; -#pragma pop +/* 80656774-80656774 000060 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/d_a_canoe/d_a_canoe.cpp b/rel/d/a/d_a_canoe/d_a_canoe.cpp index add8c44d6ea..c3169838e52 100644 --- a/rel/d/a/d_a_canoe/d_a_canoe.cpp +++ b/rel/d/a/d_a_canoe/d_a_canoe.cpp @@ -522,7 +522,7 @@ static asm void daCanoe_createHeap(fopAc_ac_c* param_0) { SECTION_RODATA static u8 const lit_3766[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(804DD5DC, &lit_3766); +COMPILER_STRIP_GATE(0x804DD5DC, &lit_3766); /* 804DD5E8-804DD5F0 00000C 0006+02 0/1 0/0 0/0 .rodata l_arcName */ #pragma push @@ -538,7 +538,7 @@ SECTION_RODATA static u8 const l_arcName[6 + 2 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(804DD5E8, &l_arcName); +COMPILER_STRIP_GATE(0x804DD5E8, &l_arcName); #pragma pop /* 804DD5F0-804DD5F8 000014 0007+01 0/1 0/0 0/0 .rodata l_arcName2 */ @@ -555,7 +555,7 @@ SECTION_RODATA static u8 const l_arcName2[7 + 1 /* padding */] = { /* padding */ 0x00, }; -COMPILER_STRIP_GATE(804DD5F0, &l_arcName2); +COMPILER_STRIP_GATE(0x804DD5F0, &l_arcName2); #pragma pop /* 804DD5F8-804DD600 00001C 0008+00 0/1 0/0 0/0 .rodata l_arcName3 */ @@ -564,7 +564,7 @@ COMPILER_STRIP_GATE(804DD5F0, &l_arcName2); SECTION_RODATA static u8 const l_arcName3[8] = { 0x43, 0x61, 0x6E, 0x6F, 0x65, 0x45, 0x33, 0x00, }; -COMPILER_STRIP_GATE(804DD5F8, &l_arcName3); +COMPILER_STRIP_GATE(0x804DD5F8, &l_arcName3); #pragma pop /* 804DD600-804DD614 000024 0014+00 2/3 0/0 0/0 .rodata l_cylOffsetZ */ @@ -572,69 +572,75 @@ SECTION_RODATA static u8 const l_cylOffsetZ[20] = { 0x43, 0x48, 0x00, 0x00, 0x42, 0xDC, 0x00, 0x00, 0x41, 0xA0, 0x00, 0x00, 0xC2, 0x8C, 0x00, 0x00, 0xC3, 0x20, 0x00, 0x00, }; -COMPILER_STRIP_GATE(804DD600, &l_cylOffsetZ); +COMPILER_STRIP_GATE(0x804DD600, &l_cylOffsetZ); /* 804DD614-804DD618 000038 0004+00 0/1 0/0 0/0 .rodata @4328 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4328 = -80.0f; -COMPILER_STRIP_GATE(804DD614, &lit_4328); +COMPILER_STRIP_GATE(0x804DD614, &lit_4328); #pragma pop /* 804DD618-804DD61C 00003C 0004+00 0/1 0/0 0/0 .rodata @4329 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4329 = -40.0f; -COMPILER_STRIP_GATE(804DD618, &lit_4329); +COMPILER_STRIP_GATE(0x804DD618, &lit_4329); #pragma pop /* 804DD61C-804DD620 000040 0004+00 0/1 0/0 0/0 .rodata @4330 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4330 = -230.0f; -COMPILER_STRIP_GATE(804DD61C, &lit_4330); +COMPILER_STRIP_GATE(0x804DD61C, &lit_4330); #pragma pop /* 804DD620-804DD624 000044 0004+00 0/1 0/0 0/0 .rodata @4331 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4331 = 80.0f; -COMPILER_STRIP_GATE(804DD620, &lit_4331); +COMPILER_STRIP_GATE(0x804DD620, &lit_4331); #pragma pop /* 804DD624-804DD628 000048 0004+00 0/1 0/0 0/0 .rodata @4332 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4332 = 90.0f; -COMPILER_STRIP_GATE(804DD624, &lit_4332); +COMPILER_STRIP_GATE(0x804DD624, &lit_4332); #pragma pop /* 804DD628-804DD62C 00004C 0004+00 0/1 0/0 0/0 .rodata @4333 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4333 = 280.0f; -COMPILER_STRIP_GATE(804DD628, &lit_4333); +COMPILER_STRIP_GATE(0x804DD628, &lit_4333); #pragma pop /* 804DD62C-804DD630 000050 0004+00 0/1 0/0 0/0 .rodata @4334 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4334 = 10.0f; -COMPILER_STRIP_GATE(804DD62C, &lit_4334); +COMPILER_STRIP_GATE(0x804DD62C, &lit_4334); #pragma pop /* 804DD630-804DD634 000054 0004+00 0/2 0/0 0/0 .rodata @4335 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4335 = 60.0f; -COMPILER_STRIP_GATE(804DD630, &lit_4335); +COMPILER_STRIP_GATE(0x804DD630, &lit_4335); #pragma pop /* 804DD634-804DD638 000058 0004+00 0/3 0/0 0/0 .rodata @4336 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4336 = 40.0f; -COMPILER_STRIP_GATE(804DD634, &lit_4336); +COMPILER_STRIP_GATE(0x804DD634, &lit_4336); +#pragma pop + +/* 804DD6E8-804DD6E8 00010C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_804DD6E8 = "F_SP127"; #pragma pop /* 804DD6F0-804DD734 000000 0044+00 1/1 0/0 0/0 .data l_cylSrc */ @@ -847,7 +853,7 @@ static asm void daCanoe_Delete(daCanoe_c* param_0) { /* ############################################################################################## */ /* 804DD638-804DD63C 00005C 0004+00 1/1 0/0 0/0 .rodata @4480 */ SECTION_RODATA static f32 const lit_4480 = -1000000000.0f; -COMPILER_STRIP_GATE(804DD638, &lit_4480); +COMPILER_STRIP_GATE(0x804DD638, &lit_4480); /* 804DB008-804DB0B0 000BA8 00A8+00 1/1 0/0 0/0 .text setRoomInfo__9daCanoe_cFv */ #pragma push @@ -864,70 +870,70 @@ asm void daCanoe_c::setRoomInfo() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4626 = 5.0f; -COMPILER_STRIP_GATE(804DD63C, &lit_4626); +COMPILER_STRIP_GATE(0x804DD63C, &lit_4626); #pragma pop /* 804DD640-804DD644 000064 0004+00 0/1 0/0 0/0 .rodata @4627 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4627 = -5.0f; -COMPILER_STRIP_GATE(804DD640, &lit_4627); +COMPILER_STRIP_GATE(0x804DD640, &lit_4627); #pragma pop /* 804DD644-804DD648 000068 0004+00 0/2 0/0 0/0 .rodata @4628 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4628 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(804DD644, &lit_4628); +COMPILER_STRIP_GATE(0x804DD644, &lit_4628); #pragma pop /* 804DD648-804DD64C 00006C 0004+00 0/2 0/0 0/0 .rodata @4629 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4629 = 13.0f / 20.0f; -COMPILER_STRIP_GATE(804DD648, &lit_4629); +COMPILER_STRIP_GATE(0x804DD648, &lit_4629); #pragma pop /* 804DD64C-804DD650 000070 0004+00 0/6 0/0 0/0 .rodata @4630 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4630 = 1.0f; -COMPILER_STRIP_GATE(804DD64C, &lit_4630); +COMPILER_STRIP_GATE(0x804DD64C, &lit_4630); #pragma pop /* 804DD650-804DD654 000074 0004+00 0/3 0/0 0/0 .rodata @4631 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4631 = 0.5f; -COMPILER_STRIP_GATE(804DD650, &lit_4631); +COMPILER_STRIP_GATE(0x804DD650, &lit_4631); #pragma pop /* 804DD654-804DD658 000078 0004+00 0/1 0/0 0/0 .rodata @4632 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4632 = 0x3EA0D97C; -COMPILER_STRIP_GATE(804DD654, &lit_4632); +COMPILER_STRIP_GATE(0x804DD654, &lit_4632); #pragma pop /* 804DD658-804DD65C 00007C 0004+00 0/1 0/0 0/0 .rodata @4633 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4633 = 1.0f / 20.0f; -COMPILER_STRIP_GATE(804DD658, &lit_4633); +COMPILER_STRIP_GATE(0x804DD658, &lit_4633); #pragma pop /* 804DD65C-804DD660 000080 0004+00 0/2 0/0 0/0 .rodata @4634 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4634 = 7.0f / 5.0f; -COMPILER_STRIP_GATE(804DD65C, &lit_4634); +COMPILER_STRIP_GATE(0x804DD65C, &lit_4634); #pragma pop /* 804DD660-804DD664 000084 0004+00 0/4 0/0 0/0 .rodata @4635 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4635 = -1.0f; -COMPILER_STRIP_GATE(804DD660, &lit_4635); +COMPILER_STRIP_GATE(0x804DD660, &lit_4635); #pragma pop /* 804DD664-804DD668 000088 0004+00 0/6 0/0 0/0 .rodata @4636 */ @@ -939,49 +945,49 @@ SECTION_RODATA static u8 const lit_4636[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(804DD664, &lit_4636); +COMPILER_STRIP_GATE(0x804DD664, &lit_4636); #pragma pop /* 804DD668-804DD66C 00008C 0004+00 0/1 0/0 0/0 .rodata @4637 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4637 = 0x38D1B717; -COMPILER_STRIP_GATE(804DD668, &lit_4637); +COMPILER_STRIP_GATE(0x804DD668, &lit_4637); #pragma pop /* 804DD66C-804DD670 000090 0004+00 0/1 0/0 0/0 .rodata @4638 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4638 = -0.5f; -COMPILER_STRIP_GATE(804DD66C, &lit_4638); +COMPILER_STRIP_GATE(0x804DD66C, &lit_4638); #pragma pop /* 804DD670-804DD674 000094 0004+00 0/2 0/0 0/0 .rodata @4639 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4639 = 3.0f; -COMPILER_STRIP_GATE(804DD670, &lit_4639); +COMPILER_STRIP_GATE(0x804DD670, &lit_4639); #pragma pop /* 804DD674-804DD678 000098 0004+00 0/1 0/0 0/0 .rodata @4640 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4640 = 0x3C75C28F; -COMPILER_STRIP_GATE(804DD674, &lit_4640); +COMPILER_STRIP_GATE(0x804DD674, &lit_4640); #pragma pop /* 804DD678-804DD67C 00009C 0004+00 0/1 0/0 0/0 .rodata @4641 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4641 = 97.0f / 100.0f; -COMPILER_STRIP_GATE(804DD678, &lit_4641); +COMPILER_STRIP_GATE(0x804DD678, &lit_4641); #pragma pop /* 804DD67C-804DD680 0000A0 0004+00 0/1 0/0 0/0 .rodata @4642 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4642 = 35.0f; -COMPILER_STRIP_GATE(804DD67C, &lit_4642); +COMPILER_STRIP_GATE(0x804DD67C, &lit_4642); #pragma pop /* 804DB0B0-804DB3F4 000C50 0344+00 2/2 0/0 0/0 .text setMatrix__9daCanoe_cFv */ @@ -997,7 +1003,7 @@ asm void daCanoe_c::setMatrix() { /* ############################################################################################## */ /* 804DD680-804DD684 0000A4 0004+00 1/2 0/0 0/0 .rodata @4683 */ SECTION_RODATA static f32 const lit_4683 = 30.0f; -COMPILER_STRIP_GATE(804DD680, &lit_4683); +COMPILER_STRIP_GATE(0x804DD680, &lit_4683); /* 804DB3F4-804DB578 000F94 0184+00 1/1 0/0 0/0 .text setCollision__9daCanoe_cFv */ #pragma push @@ -1016,7 +1022,7 @@ asm void daCanoe_c::setCollision() { SECTION_RODATA static u8 const lit_4738[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(804DD684, &lit_4738); +COMPILER_STRIP_GATE(0x804DD684, &lit_4738); #pragma pop /* 804DB578-804DB754 001118 01DC+00 1/1 0/0 0/0 .text posMove__9daCanoe_cFv */ @@ -1057,7 +1063,7 @@ asm void daCanoe_c::setFrontBackPos() { SECTION_RODATA static u8 const lit_5087[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(804DD68C, &lit_5087); +COMPILER_STRIP_GATE(0x804DD68C, &lit_5087); #pragma pop /* 804DD694-804DD69C 0000B8 0008+00 0/1 0/0 0/0 .rodata @5088 */ @@ -1066,7 +1072,7 @@ COMPILER_STRIP_GATE(804DD68C, &lit_5087); SECTION_RODATA static u8 const lit_5088[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(804DD694, &lit_5088); +COMPILER_STRIP_GATE(0x804DD694, &lit_5088); #pragma pop /* 804DD69C-804DD6A4 0000C0 0008+00 0/1 0/0 0/0 .rodata @5089 */ @@ -1075,28 +1081,28 @@ COMPILER_STRIP_GATE(804DD694, &lit_5088); SECTION_RODATA static u8 const lit_5089[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(804DD69C, &lit_5089); +COMPILER_STRIP_GATE(0x804DD69C, &lit_5089); #pragma pop /* 804DD6A4-804DD6A8 0000C8 0004+00 0/1 0/0 0/0 .rodata @5090 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5090 = -50.0f; -COMPILER_STRIP_GATE(804DD6A4, &lit_5090); +COMPILER_STRIP_GATE(0x804DD6A4, &lit_5090); #pragma pop /* 804DD6A8-804DD6AC 0000CC 0004+00 0/2 0/0 0/0 .rodata @5091 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5091 = 400.0f; -COMPILER_STRIP_GATE(804DD6A8, &lit_5091); +COMPILER_STRIP_GATE(0x804DD6A8, &lit_5091); #pragma pop /* 804DD6AC-804DD6B0 0000D0 0004+00 0/1 0/0 0/0 .rodata @5092 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5092 = 3.0f / 5.0f; -COMPILER_STRIP_GATE(804DD6AC, &lit_5092); +COMPILER_STRIP_GATE(0x804DD6AC, &lit_5092); #pragma pop /* 804DB828-804DC2E8 0013C8 0AC0+00 1/1 0/0 0/0 .text frontBackBgCheck__9daCanoe_cFv */ @@ -1124,14 +1130,14 @@ asm cM3dGPla::~cM3dGPla() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5172 = 7.0f / 10.0f; -COMPILER_STRIP_GATE(804DD6B0, &lit_5172); +COMPILER_STRIP_GATE(0x804DD6B0, &lit_5172); #pragma pop /* 804DD6B4-804DD6B8 0000D8 0004+00 0/1 0/0 0/0 .rodata @5173 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5173 = 3.0f / 10.0f; -COMPILER_STRIP_GATE(804DD6B4, &lit_5173); +COMPILER_STRIP_GATE(0x804DD6B4, &lit_5173); #pragma pop /* 804DD7F8-804DD7FC 000008 0001+03 2/2 0/0 0/0 .bss @1109 */ @@ -1259,14 +1265,14 @@ SECTION_RODATA static u8 const effName[4] = { 0x8A, 0x5B, }; -COMPILER_STRIP_GATE(804DD6B8, &effName); +COMPILER_STRIP_GATE(0x804DD6B8, &effName); #pragma pop /* 804DD6BC-804DD6C0 0000E0 0004+00 0/1 0/0 0/0 .rodata @5280 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5280 = 25.0f; -COMPILER_STRIP_GATE(804DD6BC, &lit_5280); +COMPILER_STRIP_GATE(0x804DD6BC, &lit_5280); #pragma pop /* 804DC554-804DC7B4 0020F4 0260+00 1/1 0/0 0/0 .text setCanoeSliderEffect__9daCanoe_cFv @@ -1285,35 +1291,35 @@ asm void daCanoe_c::setCanoeSliderEffect() { #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_5504 = 0x3E567750; -COMPILER_STRIP_GATE(804DD6C0, &lit_5504); +COMPILER_STRIP_GATE(0x804DD6C0, &lit_5504); #pragma pop /* 804DD6C4-804DD6C8 0000E8 0004+00 0/1 0/0 0/0 .rodata @5505 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5505 = 6.0f; -COMPILER_STRIP_GATE(804DD6C4, &lit_5505); +COMPILER_STRIP_GATE(0x804DD6C4, &lit_5505); #pragma pop /* 804DD6C8-804DD6CC 0000EC 0004+00 0/1 0/0 0/0 .rodata @5506 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5506 = 1.0f / 100.0f; -COMPILER_STRIP_GATE(804DD6C8, &lit_5506); +COMPILER_STRIP_GATE(0x804DD6C8, &lit_5506); #pragma pop /* 804DD6CC-804DD6D0 0000F0 0004+00 0/1 0/0 0/0 .rodata @5507 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5507 = 2.0f; -COMPILER_STRIP_GATE(804DD6CC, &lit_5507); +COMPILER_STRIP_GATE(0x804DD6CC, &lit_5507); #pragma pop /* 804DD6D0-804DD6D4 0000F4 0004+00 0/1 0/0 0/0 .rodata @5508 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5508 = 127.0f; -COMPILER_STRIP_GATE(804DD6D0, &lit_5508); +COMPILER_STRIP_GATE(0x804DD6D0, &lit_5508); #pragma pop /* 804DD854-804DD864 000064 000C+04 0/1 0/0 0/0 .bss @5356 */ @@ -1353,35 +1359,35 @@ static asm void daCanoe_Execute(daCanoe_c* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5573 = 23.0f; -COMPILER_STRIP_GATE(804DD6D4, &lit_5573); +COMPILER_STRIP_GATE(0x804DD6D4, &lit_5573); #pragma pop /* 804DD6D8-804DD6DC 0000FC 0004+00 0/1 0/0 0/0 .rodata @5574 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5574 = 175.0f; -COMPILER_STRIP_GATE(804DD6D8, &lit_5574); +COMPILER_STRIP_GATE(0x804DD6D8, &lit_5574); #pragma pop /* 804DD6DC-804DD6E0 000100 0004+00 0/1 0/0 0/0 .rodata @5575 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5575 = 20.0f; -COMPILER_STRIP_GATE(804DD6DC, &lit_5575); +COMPILER_STRIP_GATE(0x804DD6DC, &lit_5575); #pragma pop /* 804DD6E0-804DD6E4 000104 0004+00 0/1 0/0 0/0 .rodata @5576 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5576 = 29.0f; -COMPILER_STRIP_GATE(804DD6E0, &lit_5576); +COMPILER_STRIP_GATE(0x804DD6E0, &lit_5576); #pragma pop /* 804DD6E4-804DD6E8 000108 0004+00 0/1 0/0 0/0 .rodata @5577 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5577 = 800.0f; -COMPILER_STRIP_GATE(804DD6E4, &lit_5577); +COMPILER_STRIP_GATE(0x804DD6E4, &lit_5577); #pragma pop /* 804DD35C-804DD554 002EFC 01F8+00 1/1 0/0 0/0 .text draw__9daCanoe_cFv */ @@ -1613,9 +1619,4 @@ static u8 data_804DD8D0[4]; static u8 data_804DD8D4[4]; #pragma pop -/* 804DD6E8-804DD6F0 00010C 0008+00 1/1 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_804DD6E8 = "F_SP127"; -#pragma pop +/* 804DD6E8-804DD6E8 00010C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/d_a_coach_2D/d_a_coach_2D.cpp b/rel/d/a/d_a_coach_2D/d_a_coach_2D.cpp index a2dcd92a5d5..a2d680a0412 100644 --- a/rel/d/a/d_a_coach_2D/d_a_coach_2D.cpp +++ b/rel/d/a/d_a_coach_2D/d_a_coach_2D.cpp @@ -199,6 +199,14 @@ static asm void daCoach2D_createHeap(fopAc_ac_c* param_0) { #pragma pop /* ############################################################################################## */ +/* 80657954-80657954 000030 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80657954 = "Coach2D"; +SECTION_DEAD static char const* const stringBase_8065795C = "zelda_game_image_fire_icon.blo"; +SECTION_DEAD static char const* const stringBase_8065797B = "zelda_game_image_fire_icon.brk"; +#pragma pop + /* 8065799C-806579F4 000000 0058+00 1/1 0/0 0/0 .data * aParam$localstatic3$__ct__15daCoach2D_HIO_cFv */ SECTION_DATA static u8 data_8065799C[88] = { @@ -266,7 +274,7 @@ asm void daCoach2D_c::execute() { /* ############################################################################################## */ /* 80657924-80657928 000000 0004+00 2/2 0/0 0/0 .rodata @4003 */ SECTION_RODATA static f32 const lit_4003 = 180.0f; -COMPILER_STRIP_GATE(80657924, &lit_4003); +COMPILER_STRIP_GATE(0x80657924, &lit_4003); /* 80657928-8065792C 000004 0004+00 1/2 0/0 0/0 .rodata @4004 */ SECTION_RODATA static u8 const lit_4004[4] = { @@ -275,13 +283,13 @@ SECTION_RODATA static u8 const lit_4004[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80657928, &lit_4004); +COMPILER_STRIP_GATE(0x80657928, &lit_4004); /* 8065792C-80657930 000008 0004+00 0/1 0/0 0/0 .rodata @4005 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4005 = 1.0f; -COMPILER_STRIP_GATE(8065792C, &lit_4005); +COMPILER_STRIP_GATE(0x8065792C, &lit_4005); #pragma pop /* 80657A90-80657A9C 000008 000C+00 1/1 0/0 0/0 .bss @3772 */ @@ -315,21 +323,21 @@ asm void daCoach2D_c::initiate() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4050 = 4.0f; -COMPILER_STRIP_GATE(80657930, &lit_4050); +COMPILER_STRIP_GATE(0x80657930, &lit_4050); #pragma pop /* 80657934-80657938 000010 0004+00 0/1 0/0 0/0 .rodata @4051 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4051 = 255.0f; -COMPILER_STRIP_GATE(80657934, &lit_4051); +COMPILER_STRIP_GATE(0x80657934, &lit_4051); #pragma pop /* 80657938-8065793C 000014 0004+00 0/1 0/0 0/0 .rodata @4052 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4052 = 70.0f; -COMPILER_STRIP_GATE(80657938, &lit_4052); +COMPILER_STRIP_GATE(0x80657938, &lit_4052); #pragma pop /* 8065793C-80657944 000018 0004+04 0/1 0/0 0/0 .rodata @4053 */ @@ -340,20 +348,20 @@ SECTION_RODATA static f32 const lit_4053[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(8065793C, &lit_4053); +COMPILER_STRIP_GATE(0x8065793C, &lit_4053); #pragma pop /* 80657944-8065794C 000020 0008+00 1/2 0/0 0/0 .rodata @4055 */ SECTION_RODATA static u8 const lit_4055[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80657944, &lit_4055); +COMPILER_STRIP_GATE(0x80657944, &lit_4055); /* 8065794C-80657954 000028 0008+00 1/2 0/0 0/0 .rodata @4056 */ SECTION_RODATA static u8 const lit_4056[8] = { 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8065794C, &lit_4056); +COMPILER_STRIP_GATE(0x8065794C, &lit_4056); /* 80657260-80657490 000980 0230+00 1/1 0/0 0/0 .text update__11daCoach2D_cFv */ #pragma push @@ -535,14 +543,7 @@ asm void __sinit_d_a_coach_2D_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_8065789C = (void*)__sinit_d_a_coach_2D_cpp; +REGISTER_CTORS(0x8065789C, __sinit_d_a_coach_2D_cpp); #pragma pop -/* 80657954-8065799A 000030 0046+00 2/1 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80657954 = "Coach2D"; -SECTION_DEAD static char const* const stringBase_8065795C = "zelda_game_image_fire_icon.blo"; -SECTION_DEAD static char const* const stringBase_8065797B = "zelda_game_image_fire_icon.brk"; -#pragma pop +/* 80657954-80657954 000030 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/d_a_coach_fire/d_a_coach_fire.cpp b/rel/d/a/d_a_coach_fire/d_a_coach_fire.cpp index 5d0030d8aea..eabd6d34818 100644 --- a/rel/d/a/d_a_coach_fire/d_a_coach_fire.cpp +++ b/rel/d/a/d_a_coach_fire/d_a_coach_fire.cpp @@ -36,18 +36,18 @@ struct daCoachFire_c { struct dPa_levelEcallBack {}; +struct dKy_tevstr_c {}; + +struct csXyz {}; + +struct _GXColor {}; + struct Vec {}; struct cXyz { /* 80266B34 */ void operator-(Vec const&) const; }; -struct dKy_tevstr_c {}; - -struct _GXColor {}; - -struct csXyz {}; - struct dPa_control_c { struct level_c { /* 8004B918 */ void getEmitter(u32); @@ -183,34 +183,34 @@ extern "C" void deleteFireArrowFromList__12daNpcCoach_cFUi(); SECTION_RODATA u8 const daCoachFire_c::M_attr[16] = { 0x42, 0x48, 0x00, 0x00, 0x40, 0x80, 0x00, 0x00, 0x24, 0xFF, 0x64, 0x00, 0x44, 0x2F, 0x00, 0x00, }; -COMPILER_STRIP_GATE(806583E8, &daCoachFire_c::M_attr); +COMPILER_STRIP_GATE(0x806583E8, &daCoachFire_c::M_attr); /* 806583F8-806583FC 000010 0004+00 0/1 0/0 0/0 .rodata @3812 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3812 = -100.0f; -COMPILER_STRIP_GATE(806583F8, &lit_3812); +COMPILER_STRIP_GATE(0x806583F8, &lit_3812); #pragma pop /* 806583FC-80658400 000014 0004+00 0/1 0/0 0/0 .rodata @3813 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3813 = -10.0f; -COMPILER_STRIP_GATE(806583FC, &lit_3813); +COMPILER_STRIP_GATE(0x806583FC, &lit_3813); #pragma pop /* 80658400-80658404 000018 0004+00 0/1 0/0 0/0 .rodata @3814 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3814 = 100.0f; -COMPILER_STRIP_GATE(80658400, &lit_3814); +COMPILER_STRIP_GATE(0x80658400, &lit_3814); #pragma pop /* 80658404-80658408 00001C 0004+00 0/1 0/0 0/0 .rodata @3815 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3815 = 200.0f; -COMPILER_STRIP_GATE(80658404, &lit_3815); +COMPILER_STRIP_GATE(0x80658404, &lit_3815); #pragma pop /* 80657B78-80657C48 000078 00D0+00 1/1 0/0 0/0 .text create_init__13daCoachFire_cFv */ @@ -252,7 +252,7 @@ SECTION_RODATA static u8 const data_80658408[64] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0x48, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80658408, &data_80658408); +COMPILER_STRIP_GATE(0x80658408, &data_80658408); /* 80657D2C-80657D9C 00022C 0070+00 1/1 0/0 0/0 .text initCcSphere__13daCoachFire_cFv */ #pragma push @@ -269,7 +269,7 @@ asm void daCoachFire_c::initCcSphere() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3911 = 1.0f; -COMPILER_STRIP_GATE(80658448, &lit_3911); +COMPILER_STRIP_GATE(0x80658448, &lit_3911); #pragma pop /* 8065844C-80658450 000064 0004+00 0/1 0/0 0/0 .rodata @3912 */ @@ -281,14 +281,14 @@ SECTION_RODATA static u8 const lit_3912[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(8065844C, &lit_3912); +COMPILER_STRIP_GATE(0x8065844C, &lit_3912); #pragma pop /* 80658450-80658454 000068 0004+00 0/1 0/0 0/0 .rodata @3913 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3913 = 9.0f / 10.0f; -COMPILER_STRIP_GATE(80658450, &lit_3913); +COMPILER_STRIP_GATE(0x80658450, &lit_3913); #pragma pop /* 80657D9C-80657EA0 00029C 0104+00 1/0 0/0 0/0 .text daCoachFire_Draw__FP13daCoachFire_c @@ -429,9 +429,11 @@ asm cCcD_GStts::~cCcD_GStts() { } #pragma pop -/* 80658454-8065845A 00006C 0006+00 0/0 0/0 0/0 .rodata @stringBase0 */ +/* ############################################################################################## */ +/* 80658454-8065845A 00006C 0006+00 0/0 0/0 0/0 .rodata None */ #pragma push #pragma force_active on -#pragma section ".dead" SECTION_DEAD static char const* const stringBase_80658454 = "Coach"; #pragma pop + +/* 80658454-80658454 00006C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/d_a_cow/d_a_cow.cpp b/rel/d/a/d_a_cow/d_a_cow.cpp index 7ea05eb86a0..e799c9c9a7c 100644 --- a/rel/d/a/d_a_cow/d_a_cow.cpp +++ b/rel/d/a/d_a_cow/d_a_cow.cpp @@ -44,19 +44,19 @@ struct mDoExt_baseAnm { /* 8000D428 */ void play(); }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; +struct J3DAnmTransform {}; + +struct J3DModelData {}; + struct Z2Creature { /* 802C03C8 */ Z2Creature(); /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -75,10 +75,10 @@ struct daPy_py_c { /* 80662D84 */ void checkNowWolf(); }; -struct J3DJoint {}; - struct J3DModel {}; +struct J3DJoint {}; + struct daCow_c { /* 806585CC */ void calcRunAnime(int); /* 80658730 */ void setBck(int, u8, f32, f32); @@ -448,7 +448,7 @@ extern "C" void Delete__7daCow_cFv(); extern "C" static void daCow_Delete__FPv(); extern "C" static bool daCow_IsDelete__FPv(); extern "C" void __dt__10cCcD_GSttsFv(); -extern "C" void func_80662CB0(int*); +extern "C" void func_80662CB0(void* _this, int*); extern "C" void __sinit_d_a_cow_cpp(); extern "C" static void func_80662D60(); extern "C" static void func_80662D68(); @@ -620,38 +620,38 @@ extern "C" void __register_global_object(); /* ############################################################################################## */ /* 80662DB0-80662DB4 000000 0004+00 37/37 0/0 0/0 .rodata @3987 */ SECTION_RODATA static f32 const lit_3987 = 35.0f; -COMPILER_STRIP_GATE(80662DB0, &lit_3987); +COMPILER_STRIP_GATE(0x80662DB0, &lit_3987); /* 80662DB4-80662DB8 000004 0004+00 0/6 0/0 0/0 .rodata @3988 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3988 = 5.0f; -COMPILER_STRIP_GATE(80662DB4, &lit_3988); +COMPILER_STRIP_GATE(0x80662DB4, &lit_3988); #pragma pop /* 80662DB8-80662DBC 000008 0004+00 6/31 0/0 0/0 .rodata @3989 */ SECTION_RODATA static f32 const lit_3989 = 1.0f; -COMPILER_STRIP_GATE(80662DB8, &lit_3989); +COMPILER_STRIP_GATE(0x80662DB8, &lit_3989); /* 80662DBC-80662DC0 00000C 0004+00 0/5 0/0 0/0 .rodata @3990 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3990 = 3.0f; -COMPILER_STRIP_GATE(80662DBC, &lit_3990); +COMPILER_STRIP_GATE(0x80662DBC, &lit_3990); #pragma pop /* 80662DC0-80662DC4 000010 0004+00 0/3 0/0 0/0 .rodata @3991 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3991 = 25.0f; -COMPILER_STRIP_GATE(80662DC0, &lit_3991); +COMPILER_STRIP_GATE(0x80662DC0, &lit_3991); #pragma pop /* 80662DC4-80662DC8 000014 0004+00 0/2 0/0 0/0 .rodata @3992 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3992 = 13.0f / 10.0f; -COMPILER_STRIP_GATE(80662DC4, &lit_3992); +COMPILER_STRIP_GATE(0x80662DC4, &lit_3992); #pragma pop /* 806585CC-80658730 0000EC 0164+00 6/6 0/0 0/0 .text calcRunAnime__7daCow_cFi */ @@ -672,11 +672,17 @@ SECTION_RODATA static u8 const lit_3998[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80662DC8, &lit_3998); +COMPILER_STRIP_GATE(0x80662DC8, &lit_3998); /* 80662DCC-80662DD0 00001C 0004+00 1/3 0/0 0/0 .rodata @3999 */ SECTION_RODATA static f32 const lit_3999 = -1.0f; -COMPILER_STRIP_GATE(80662DCC, &lit_3999); +COMPILER_STRIP_GATE(0x80662DCC, &lit_3999); + +/* 80662F18-80662F18 000168 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80662F18 = "Cow"; +#pragma pop /* 80658730-806587D4 000250 00A4+00 20/20 0/0 0/0 .text setBck__7daCow_cFiUcff */ #pragma push @@ -701,27 +707,27 @@ asm void daCow_c::checkBck(int param_0) { /* ############################################################################################## */ /* 80662DD0-80662DD4 000020 0004+00 1/10 0/0 0/0 .rodata @4087 */ SECTION_RODATA static f32 const lit_4087 = 10.0f; -COMPILER_STRIP_GATE(80662DD0, &lit_4087); +COMPILER_STRIP_GATE(0x80662DD0, &lit_4087); /* 80662DD4-80662DD8 000024 0004+00 0/1 0/0 0/0 .rodata @4088 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4088 = -70.0f; -COMPILER_STRIP_GATE(80662DD4, &lit_4088); +COMPILER_STRIP_GATE(0x80662DD4, &lit_4088); #pragma pop /* 80662DD8-80662DDC 000028 0004+00 0/1 0/0 0/0 .rodata @4089 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4089 = -25.0f; -COMPILER_STRIP_GATE(80662DD8, &lit_4089); +COMPILER_STRIP_GATE(0x80662DD8, &lit_4089); #pragma pop /* 80662DDC-80662DE0 00002C 0004+00 0/7 0/0 0/0 .rodata @4090 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4090 = 2.0f; -COMPILER_STRIP_GATE(80662DDC, &lit_4090); +COMPILER_STRIP_GATE(0x80662DDC, &lit_4090); #pragma pop /* 80663460-80663464 000008 0001+03 6/6 0/0 0/0 .bss @1109 */ @@ -875,6 +881,13 @@ asm cXyz::~cXyz() { } #pragma pop +/* ############################################################################################## */ +/* 80662F18-80662F18 000168 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80662F1C = "F_SP00"; +#pragma pop + /* 80658AA4-80658B10 0005C4 006C+00 5/5 0/0 0/0 .text isChaseCowGame__7daCow_cFv */ #pragma push #pragma optimization_level 0 @@ -890,28 +903,28 @@ asm void daCow_c::isChaseCowGame() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4126 = 270.0f; -COMPILER_STRIP_GATE(80662DE0, &lit_4126); +COMPILER_STRIP_GATE(0x80662DE0, &lit_4126); #pragma pop /* 80662DE4-80662DE8 000034 0004+00 0/1 0/0 0/0 .rodata @4127 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4127 = 70.0f; -COMPILER_STRIP_GATE(80662DE4, &lit_4127); +COMPILER_STRIP_GATE(0x80662DE4, &lit_4127); #pragma pop /* 80662DE8-80662DEC 000038 0004+00 0/3 0/0 0/0 .rodata @4128 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4128 = 600.0f; -COMPILER_STRIP_GATE(80662DE8, &lit_4128); +COMPILER_STRIP_GATE(0x80662DE8, &lit_4128); #pragma pop /* 80662DEC-80662DF0 00003C 0004+00 0/10 0/0 0/0 .rodata @4129 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4129 = 100.0f; -COMPILER_STRIP_GATE(80662DEC, &lit_4129); +COMPILER_STRIP_GATE(0x80662DEC, &lit_4129); #pragma pop /* 80658B10-80658C18 000630 0108+00 6/6 0/0 0/0 .text setCarryStatus__7daCow_cFv */ @@ -1005,15 +1018,12 @@ SECTION_DATA static u8 data_80662F78[64] = { }; #pragma pop -/* 80662FB8-80662FBC -00001 0004+00 4/5 0/0 0/0 .data None */ -SECTION_DATA static u8 struct_80662FB8[4] = { - /* 80662FB8 0002+00 data_80662FB8 pen_dir__21@unnamed@d_a_cow_cpp@ */ - 0xC0, - 0x00, - /* 80662FBA 0002+00 data_80662FBA gate_dir__21@unnamed@d_a_cow_cpp@ */ - 0x80, - 0x00, -}; +/* 80662FB8-80662FBA 000060 0002+00 4/5 0/0 0/0 .data pen_dir__21@unnamed@d_a_cow_cpp@ */ +SECTION_DATA static u16 data_80662FB8 = 0xC000; + +/* 80662FBA-80662FBC 000062 0002+00 1/2 0/0 0/0 .data gate_dir__21@unnamed@d_a_cow_cpp@ + */ +SECTION_DATA static u16 data_80662FBA = 0x8000; /* 80662FBC-80662FC0 000064 0004+00 0/2 0/0 0/0 .data l_CowRoomPosY__21@unnamed@d_a_cow_cpp@ */ #pragma push @@ -1067,17 +1077,17 @@ asm void daCow_c::checkThrow() { /* ############################################################################################## */ /* 80662DF0-80662DF4 000040 0004+00 2/3 0/0 0/0 .rodata @4205 */ SECTION_RODATA static f32 const lit_4205 = 7.0f / 10.0f; -COMPILER_STRIP_GATE(80662DF0, &lit_4205); +COMPILER_STRIP_GATE(0x80662DF0, &lit_4205); /* 80662DF4-80662DF8 000044 0004+00 2/2 0/0 0/0 .rodata @4206 */ SECTION_RODATA static f32 const lit_4206 = 3.0f / 10.0f; -COMPILER_STRIP_GATE(80662DF4, &lit_4206); +COMPILER_STRIP_GATE(0x80662DF4, &lit_4206); /* 80662DF8-80662E00 000048 0008+00 2/5 0/0 0/0 .rodata @4208 */ SECTION_RODATA static u8 const lit_4208[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80662DF8, &lit_4208); +COMPILER_STRIP_GATE(0x80662DF8, &lit_4208); /* 80658E98-80658F94 0009B8 00FC+00 3/3 0/0 0/0 .text setBodyAngle__7daCow_cFs */ #pragma push @@ -1103,7 +1113,7 @@ asm void daCow_c::setBodyAngle2(s16 param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daCow_c::checkProcess(void (daCow_c::*)()) { +asm void daCow_c::checkProcess(void (daCow_c::*param_0)()) { nofralloc #include "asm/rel/d/a/d_a_cow/d_a_cow/checkProcess__7daCow_cFM7daCow_cFPCvPv_v.s" } @@ -1113,7 +1123,7 @@ asm void daCow_c::checkProcess(void (daCow_c::*)()) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daCow_c::setProcess(void (daCow_c::*)(), int param_1) { +asm void daCow_c::setProcess(void (daCow_c::*param_0)(), int param_1) { nofralloc #include "asm/rel/d/a/d_a_cow/d_a_cow/setProcess__7daCow_cFM7daCow_cFPCvPv_vi.s" } @@ -1895,7 +1905,7 @@ static asm void s_near_cow(void* param_0, void* param_1) { /* ############################################################################################## */ /* 80662E00-80662E04 000050 0004+00 1/7 0/0 0/0 .rodata @4446 */ SECTION_RODATA static f32 const lit_4446 = 500.0f; -COMPILER_STRIP_GATE(80662E00, &lit_4446); +COMPILER_STRIP_GATE(0x80662E00, &lit_4446); /* 806634FC-80663500 0000A4 0002+02 4/4 0/0 0/0 .bss m_angry_cow */ static u8 m_angry_cow[2 + 2 /* padding */]; @@ -1945,19 +1955,19 @@ asm void daCow_c::checkNearCowRun() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4649 = 300.0f; -COMPILER_STRIP_GATE(80662E04, &lit_4649); +COMPILER_STRIP_GATE(0x80662E04, &lit_4649); #pragma pop /* 80662E08-80662E0C 000058 0004+00 0/6 0/0 0/0 .rodata @4650 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4650 = 12.0f; -COMPILER_STRIP_GATE(80662E08, &lit_4650); +COMPILER_STRIP_GATE(0x80662E08, &lit_4650); #pragma pop /* 80662E0C-80662E10 00005C 0004+00 1/3 0/0 0/0 .rodata @4651 */ SECTION_RODATA static f32 const lit_4651 = 9.0f / 10.0f; -COMPILER_STRIP_GATE(80662E0C, &lit_4651); +COMPILER_STRIP_GATE(0x80662E0C, &lit_4651); /* 80662E10-80662E18 000060 0004+04 0/3 0/0 0/0 .rodata @4652 */ #pragma push @@ -1967,7 +1977,7 @@ SECTION_RODATA static f32 const lit_4652[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80662E10, &lit_4652); +COMPILER_STRIP_GATE(0x80662E10, &lit_4652); #pragma pop /* 80662E18-80662E20 000068 0008+00 0/13 0/0 0/0 .rodata @4653 */ @@ -1976,7 +1986,7 @@ COMPILER_STRIP_GATE(80662E10, &lit_4652); SECTION_RODATA static u8 const lit_4653[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80662E18, &lit_4653); +COMPILER_STRIP_GATE(0x80662E18, &lit_4653); #pragma pop /* 80662E20-80662E28 000070 0008+00 0/13 0/0 0/0 .rodata @4654 */ @@ -1985,7 +1995,7 @@ COMPILER_STRIP_GATE(80662E18, &lit_4653); SECTION_RODATA static u8 const lit_4654[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80662E20, &lit_4654); +COMPILER_STRIP_GATE(0x80662E20, &lit_4654); #pragma pop /* 80662E28-80662E30 000078 0008+00 0/13 0/0 0/0 .rodata @4655 */ @@ -1994,21 +2004,21 @@ COMPILER_STRIP_GATE(80662E20, &lit_4654); SECTION_RODATA static u8 const lit_4655[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80662E28, &lit_4655); +COMPILER_STRIP_GATE(0x80662E28, &lit_4655); #pragma pop /* 80662E30-80662E34 000080 0004+00 0/4 0/0 0/0 .rodata @4656 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4656 = 2.0f / 5.0f; -COMPILER_STRIP_GATE(80662E30, &lit_4656); +COMPILER_STRIP_GATE(0x80662E30, &lit_4656); #pragma pop /* 80662E34-80662E38 000084 0004+00 0/6 0/0 0/0 .rodata @4657 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4657 = 0.5f; -COMPILER_STRIP_GATE(80662E34, &lit_4657); +COMPILER_STRIP_GATE(0x80662E34, &lit_4657); #pragma pop /* 80659ADC-8065A0E8 0015FC 060C+00 15/0 0/0 0/0 .text action_wait__7daCow_cFv */ @@ -2026,21 +2036,21 @@ asm void daCow_c::action_wait() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4786 = 40.0f; -COMPILER_STRIP_GATE(80662E38, &lit_4786); +COMPILER_STRIP_GATE(0x80662E38, &lit_4786); #pragma pop /* 80662E3C-80662E40 00008C 0004+00 0/2 0/0 0/0 .rodata @4787 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4787 = 68.0f; -COMPILER_STRIP_GATE(80662E3C, &lit_4787); +COMPILER_STRIP_GATE(0x80662E3C, &lit_4787); #pragma pop /* 80662E40-80662E44 000090 0004+00 0/1 0/0 0/0 .rodata @4788 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4788 = 98.0f; -COMPILER_STRIP_GATE(80662E40, &lit_4788); +COMPILER_STRIP_GATE(0x80662E40, &lit_4788); #pragma pop /* 8065A0E8-8065A594 001C08 04AC+00 4/0 0/0 0/0 .text action_eat__7daCow_cFv */ @@ -2076,7 +2086,7 @@ asm void daCow_c::action_shake() { /* ############################################################################################## */ /* 80662E44-80662E48 000094 0004+00 1/1 0/0 0/0 .rodata @5007 */ SECTION_RODATA static f32 const lit_5007 = 3000.0f; -COMPILER_STRIP_GATE(80662E44, &lit_5007); +COMPILER_STRIP_GATE(0x80662E44, &lit_5007); /* 8065ACC8-8065AD2C 0027E8 0064+00 4/4 0/0 0/0 .text checkNearWolf__7daCow_cFv */ #pragma push @@ -2101,7 +2111,7 @@ asm void daCow_c::checkPlayerWait() { /* ############################################################################################## */ /* 80662E48-80662E4C 000098 0004+00 2/5 0/0 0/0 .rodata @5049 */ SECTION_RODATA static f32 const lit_5049 = 1500.0f; -COMPILER_STRIP_GATE(80662E48, &lit_5049); +COMPILER_STRIP_GATE(0x80662E48, &lit_5049); /* 8065ADB0-8065AE88 0028D0 00D8+00 2/2 0/0 0/0 .text checkPlayerSurprise__7daCow_cFv */ #pragma push @@ -2138,42 +2148,42 @@ SECTION_RODATA static u8 const lit_5133[6 + 2 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80662E4C, &lit_5133); +COMPILER_STRIP_GATE(0x80662E4C, &lit_5133); #pragma pop /* 80662E54-80662E58 0000A4 0004+00 0/4 0/0 0/0 .rodata @5362 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5362 = 110.0f; -COMPILER_STRIP_GATE(80662E54, &lit_5362); +COMPILER_STRIP_GATE(0x80662E54, &lit_5362); #pragma pop /* 80662E58-80662E5C 0000A8 0004+00 0/4 0/0 0/0 .rodata @5363 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5363 = 1000.0f; -COMPILER_STRIP_GATE(80662E58, &lit_5363); +COMPILER_STRIP_GATE(0x80662E58, &lit_5363); #pragma pop /* 80662E5C-80662E60 0000AC 0004+00 0/3 0/0 0/0 .rodata @5364 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5364 = 700.0f; -COMPILER_STRIP_GATE(80662E5C, &lit_5364); +COMPILER_STRIP_GATE(0x80662E5C, &lit_5364); #pragma pop /* 80662E60-80662E64 0000B0 0004+00 0/3 0/0 0/0 .rodata @5365 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5365 = 800.0f; -COMPILER_STRIP_GATE(80662E60, &lit_5365); +COMPILER_STRIP_GATE(0x80662E60, &lit_5365); #pragma pop /* 80662E64-80662E68 0000B4 0004+00 0/1 0/0 0/0 .rodata @5366 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5366 = 560.0f; -COMPILER_STRIP_GATE(80662E64, &lit_5366); +COMPILER_STRIP_GATE(0x80662E64, &lit_5366); #pragma pop /* 8065B034-8065B760 002B54 072C+00 2/2 0/0 0/0 .text checkBeforeBg__7daCow_cFv */ @@ -2189,7 +2199,7 @@ asm void daCow_c::checkBeforeBg() { /* ############################################################################################## */ /* 80662E68-80662E6C 0000B8 0004+00 1/1 0/0 0/0 .rodata @5409 */ SECTION_RODATA static f32 const lit_5409 = 1100.0f; -COMPILER_STRIP_GATE(80662E68, &lit_5409); +COMPILER_STRIP_GATE(0x80662E68, &lit_5409); /* 8065B760-8065B8A8 003280 0148+00 6/6 0/0 0/0 .text checkOutOfGate__7daCow_cF4cXyz */ #pragma push @@ -2234,11 +2244,11 @@ asm void daCow_c::checkCowIn(f32 param_0, f32 param_1) { /* ############################################################################################## */ /* 80662E6C-80662E70 0000BC 0004+00 1/4 0/0 0/0 .rodata @5516 */ SECTION_RODATA static f32 const lit_5516 = 250.0f; -COMPILER_STRIP_GATE(80662E6C, &lit_5516); +COMPILER_STRIP_GATE(0x80662E6C, &lit_5516); /* 80662E70-80662E74 0000C0 0004+00 1/1 0/0 0/0 .rodata @5517 */ SECTION_RODATA static f32 const lit_5517 = 220.0f; -COMPILER_STRIP_GATE(80662E70, &lit_5517); +COMPILER_STRIP_GATE(0x80662E70, &lit_5517); /* 8065BB34-8065BC68 003654 0134+00 5/5 0/0 0/0 .text checkCowInOwn__7daCow_cFi */ #pragma push @@ -2253,39 +2263,39 @@ asm void daCow_c::checkCowInOwn(int param_0) { /* ############################################################################################## */ /* 80662E74-80662E78 0000C4 0004+00 1/3 0/0 0/0 .rodata @5651 */ SECTION_RODATA static f32 const lit_5651 = 20.0f; -COMPILER_STRIP_GATE(80662E74, &lit_5651); +COMPILER_STRIP_GATE(0x80662E74, &lit_5651); /* 80662E78-80662E7C 0000C8 0004+00 0/8 0/0 0/0 .rodata @5652 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5652 = 200.0f; -COMPILER_STRIP_GATE(80662E78, &lit_5652); +COMPILER_STRIP_GATE(0x80662E78, &lit_5652); #pragma pop /* 80662E7C-80662E80 0000CC 0004+00 0/7 0/0 0/0 .rodata @5653 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5653 = 30.0f; -COMPILER_STRIP_GATE(80662E7C, &lit_5653); +COMPILER_STRIP_GATE(0x80662E7C, &lit_5653); #pragma pop /* 80662E80-80662E84 0000D0 0004+00 0/4 0/0 0/0 .rodata @5654 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5654 = 4.0f; -COMPILER_STRIP_GATE(80662E80, &lit_5654); +COMPILER_STRIP_GATE(0x80662E80, &lit_5654); #pragma pop /* 80662E84-80662E88 0000D4 0004+00 0/2 0/0 0/0 .rodata @5655 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5655 = 45.0f; -COMPILER_STRIP_GATE(80662E84, &lit_5655); +COMPILER_STRIP_GATE(0x80662E84, &lit_5655); #pragma pop /* 80662E88-80662E8C 0000D8 0004+00 1/6 0/0 0/0 .rodata @5656 */ SECTION_RODATA static f32 const lit_5656 = 50.0f; -COMPILER_STRIP_GATE(80662E88, &lit_5656); +COMPILER_STRIP_GATE(0x80662E88, &lit_5656); /* 8065BC68-8065C32C 003788 06C4+00 9/0 0/0 0/0 .text action_run__7daCow_cFv */ #pragma push @@ -2302,7 +2312,7 @@ asm void daCow_c::action_run() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5714 = 2500.0f; -COMPILER_STRIP_GATE(80662E8C, &lit_5714); +COMPILER_STRIP_GATE(0x80662E8C, &lit_5714); #pragma pop /* 8065C32C-8065C508 003E4C 01DC+00 1/1 0/0 0/0 .text checkCurringPen__7daCow_cFv */ @@ -2340,21 +2350,21 @@ asm void daCow_c::setEnterCount() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5963 = 80.0f; -COMPILER_STRIP_GATE(80662E90, &lit_5963); +COMPILER_STRIP_GATE(0x80662E90, &lit_5963); #pragma pop /* 80662E94-80662E98 0000E4 0004+00 0/1 0/0 0/0 .rodata @5964 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5964 = 2000.0f; -COMPILER_STRIP_GATE(80662E94, &lit_5964); +COMPILER_STRIP_GATE(0x80662E94, &lit_5964); #pragma pop /* 80662E98-80662E9C 0000E8 0004+00 0/1 0/0 0/0 .rodata @5965 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5965 = 1.5f; -COMPILER_STRIP_GATE(80662E98, &lit_5965); +COMPILER_STRIP_GATE(0x80662E98, &lit_5965); #pragma pop /* 8065C70C-8065CFBC 00422C 08B0+00 2/0 0/0 0/0 .text action_enter__7daCow_cFv */ @@ -2432,35 +2442,35 @@ asm void daCow_c::setAngryTurn() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6253 = 75.0f; -COMPILER_STRIP_GATE(80662E9C, &lit_6253); +COMPILER_STRIP_GATE(0x80662E9C, &lit_6253); #pragma pop /* 80662EA0-80662EA4 0000F0 0004+00 0/4 0/0 0/0 .rodata @6254 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6254 = 60.0f; -COMPILER_STRIP_GATE(80662EA0, &lit_6254); +COMPILER_STRIP_GATE(0x80662EA0, &lit_6254); #pragma pop /* 80662EA4-80662EA8 0000F4 0004+00 0/2 0/0 0/0 .rodata @6255 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6255 = 15.0f; -COMPILER_STRIP_GATE(80662EA4, &lit_6255); +COMPILER_STRIP_GATE(0x80662EA4, &lit_6255); #pragma pop /* 80662EA8-80662EAC 0000F8 0004+00 0/1 0/0 0/0 .rodata @6256 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6256 = 350.0f; -COMPILER_STRIP_GATE(80662EA8, &lit_6256); +COMPILER_STRIP_GATE(0x80662EA8, &lit_6256); #pragma pop /* 80662EAC-80662EB0 0000FC 0004+00 0/1 0/0 0/0 .rodata @6257 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6257 = 1200.0f; -COMPILER_STRIP_GATE(80662EAC, &lit_6257); +COMPILER_STRIP_GATE(0x80662EAC, &lit_6257); #pragma pop /* 8065D2F0-8065DC08 004E10 0918+00 7/0 0/0 0/0 .text action_angry__7daCow_cFv */ @@ -2498,7 +2508,7 @@ asm void daCow_c::executeCrazyWait() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6502 = -200.0f; -COMPILER_STRIP_GATE(80662EB0, &lit_6502); +COMPILER_STRIP_GATE(0x80662EB0, &lit_6502); #pragma pop /* 8065DF40-8065E6BC 005A60 077C+00 1/1 0/0 0/0 .text executeCrazyDash__7daCow_cFv */ @@ -2526,7 +2536,7 @@ asm void daCow_c::initCrazyBeforeCatch(int param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6527 = -220.0f; -COMPILER_STRIP_GATE(80662EB4, &lit_6527); +COMPILER_STRIP_GATE(0x80662EB4, &lit_6527); #pragma pop /* 8065E6E8-8065E7D0 006208 00E8+00 2/2 0/0 0/0 .text executeCrazyBeforeCatch__7daCow_cFv @@ -2555,7 +2565,7 @@ asm void daCow_c::initCrazyCatch(int param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6599 = -260.0f; -COMPILER_STRIP_GATE(80662EB8, &lit_6599); +COMPILER_STRIP_GATE(0x80662EB8, &lit_6599); #pragma pop /* 8065E888-8065EAF4 0063A8 026C+00 2/2 0/0 0/0 .text executeCrazyCatch__7daCow_cFv */ @@ -2583,14 +2593,14 @@ asm void daCow_c::initCrazyThrow(int param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6706 = 34.0f; -COMPILER_STRIP_GATE(80662EBC, &lit_6706); +COMPILER_STRIP_GATE(0x80662EBC, &lit_6706); #pragma pop /* 80662EC0-80662EC4 000110 0004+00 0/4 0/0 0/0 .rodata @6707 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6707 = -4.0f; -COMPILER_STRIP_GATE(80662EC0, &lit_6707); +COMPILER_STRIP_GATE(0x80662EC0, &lit_6707); #pragma pop /* 8065EBF0-8065F088 006710 0498+00 2/2 0/0 0/0 .text executeCrazyThrow__7daCow_cFv */ @@ -2618,7 +2628,7 @@ asm void daCow_c::initCrazyAttack(int param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6765 = 7.0f; -COMPILER_STRIP_GATE(80662EC4, &lit_6765); +COMPILER_STRIP_GATE(0x80662EC4, &lit_6765); #pragma pop /* 8065F144-8065F308 006C64 01C4+00 2/2 0/0 0/0 .text executeCrazyAttack__7daCow_cFv */ @@ -2681,6 +2691,15 @@ asm void daCow_c::executeCrazyBack() { } #pragma pop +/* ############################################################################################## */ +/* 80662F18-80662F18 000168 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80662F23 = "WILDGOAT"; +SECTION_DEAD static char const* const stringBase_80662F2C = "WILDGOAT_SUCCESS"; +SECTION_DEAD static char const* const stringBase_80662F3D = "WILDGOAT_FAILURE"; +#pragma pop + /* 8065FE50-8066010C 007970 02BC+00 4/0 0/0 0/0 .text action_crazy__7daCow_cFv */ #pragma push #pragma optimization_level 0 @@ -2726,28 +2745,28 @@ asm void daCow_c::checkWolfBusters() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6980 = 11.0f; -COMPILER_STRIP_GATE(80662EC8, &lit_6980); +COMPILER_STRIP_GATE(0x80662EC8, &lit_6980); #pragma pop /* 80662ECC-80662ED0 00011C 0004+00 0/2 0/0 0/0 .rodata @7493 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7493 = 90.0f; -COMPILER_STRIP_GATE(80662ECC, &lit_7493); +COMPILER_STRIP_GATE(0x80662ECC, &lit_7493); #pragma pop /* 80662ED0-80662ED4 000120 0004+00 0/1 0/0 0/0 .rodata @7494 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7494 = 36.0f; -COMPILER_STRIP_GATE(80662ED0, &lit_7494); +COMPILER_STRIP_GATE(0x80662ED0, &lit_7494); #pragma pop /* 80662ED4-80662ED8 000124 0004+00 0/1 0/0 0/0 .rodata @7495 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7495 = 150.0f; -COMPILER_STRIP_GATE(80662ED4, &lit_7495); +COMPILER_STRIP_GATE(0x80662ED4, &lit_7495); #pragma pop /* 806608F0-806612DC 008410 09EC+00 2/0 0/0 0/0 .text action_wolf__7daCow_cFv */ @@ -2775,14 +2794,14 @@ asm void daCow_c::action_damage() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7551 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(80662ED8, &lit_7551); +COMPILER_STRIP_GATE(0x80662ED8, &lit_7551); #pragma pop /* 80662EDC-80662EE0 00012C 0004+00 0/1 0/0 0/0 .rodata @7552 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7552 = -300.0f; -COMPILER_STRIP_GATE(80662EDC, &lit_7552); +COMPILER_STRIP_GATE(0x80662EDC, &lit_7552); #pragma pop /* 806613EC-80661580 008F0C 0194+00 1/1 0/0 0/0 .text action__7daCow_cFv */ @@ -2810,7 +2829,7 @@ asm void daCow_c::setMtx() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7624 = 18.0f; -COMPILER_STRIP_GATE(80662EE0, &lit_7624); +COMPILER_STRIP_GATE(0x80662EE0, &lit_7624); #pragma pop /* 806615EC-80661720 00910C 0134+00 1/1 0/0 0/0 .text setAttnPos__7daCow_cFv */ @@ -2828,7 +2847,7 @@ asm void daCow_c::setAttnPos() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7686 = -30.0f; -COMPILER_STRIP_GATE(80662EE4, &lit_7686); +COMPILER_STRIP_GATE(0x80662EE4, &lit_7686); #pragma pop /* 80663500-80663504 0000A8 0004+00 0/0 0/0 0/0 .bss m_search_range */ @@ -2888,7 +2907,7 @@ asm void daCow_c::setCollisions() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7722 = 120.0f; -COMPILER_STRIP_GATE(80662EE8, &lit_7722); +COMPILER_STRIP_GATE(0x80662EE8, &lit_7722); #pragma pop /* 80661940-80661AD0 009460 0190+00 2/2 0/0 0/0 .text Execute__7daCow_cFv */ @@ -2947,7 +2966,7 @@ asm void daCow_c::createHeapCallBack(fopAc_ac_c* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7945 = -100.0f; -COMPILER_STRIP_GATE(80662EEC, &lit_7945); +COMPILER_STRIP_GATE(0x80662EEC, &lit_7945); #pragma pop /* 80662EF0-80662EF8 000140 0004+04 0/1 0/0 0/0 .rodata @7946 */ @@ -2958,7 +2977,7 @@ SECTION_RODATA static f32 const lit_7946[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80662EF0, &lit_7946); +COMPILER_STRIP_GATE(0x80662EF0, &lit_7946); #pragma pop /* 80662EF8-80662F00 000148 0008+00 0/1 0/0 0/0 .rodata @7948 */ @@ -2967,7 +2986,7 @@ COMPILER_STRIP_GATE(80662EF0, &lit_7946); SECTION_RODATA static u8 const lit_7948[8] = { 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80662EF8, &lit_7948); +COMPILER_STRIP_GATE(0x80662EF8, &lit_7948); #pragma pop /* 80661D44-80662228 009864 04E4+00 1/1 0/0 0/0 .text initialize__7daCow_cFv */ @@ -3095,7 +3114,13 @@ asm void daCow_c::ctrlJointCallBack(J3DJoint* param_0, int param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8223 = -20.0f; -COMPILER_STRIP_GATE(80662F00, &lit_8223); +COMPILER_STRIP_GATE(0x80662F00, &lit_8223); +#pragma pop + +/* 80662F18-80662F18 000168 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80662F4E = "MAKI_OP"; #pragma pop /* 8066296C-80662BC4 00A48C 0258+00 1/1 0/0 0/0 .text Draw__7daCow_cFv */ @@ -3157,7 +3182,7 @@ asm cCcD_GStts::~cCcD_GStts() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80662CB0(int* param_0) { +extern "C" asm void func_80662CB0(void* _this, int* param_0) { nofralloc #include "asm/rel/d/a/d_a_cow/d_a_cow/func_80662CB0.s" } @@ -3168,35 +3193,35 @@ extern "C" asm void func_80662CB0(int* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8264 = -10200.0f; -COMPILER_STRIP_GATE(80662F04, &lit_8264); +COMPILER_STRIP_GATE(0x80662F04, &lit_8264); #pragma pop /* 80662F08-80662F0C 000158 0004+00 0/1 0/0 0/0 .rodata @8265 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8265 = 15000.0f; -COMPILER_STRIP_GATE(80662F08, &lit_8265); +COMPILER_STRIP_GATE(0x80662F08, &lit_8265); #pragma pop /* 80662F0C-80662F10 00015C 0004+00 0/1 0/0 0/0 .rodata @8266 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8266 = -20246.0f; -COMPILER_STRIP_GATE(80662F0C, &lit_8266); +COMPILER_STRIP_GATE(0x80662F0C, &lit_8266); #pragma pop /* 80662F10-80662F14 000160 0004+00 0/1 0/0 0/0 .rodata @8267 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8267 = -9246.0f; -COMPILER_STRIP_GATE(80662F10, &lit_8267); +COMPILER_STRIP_GATE(0x80662F10, &lit_8267); #pragma pop /* 80662F14-80662F18 000164 0004+00 0/1 0/0 0/0 .rodata @8268 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8268 = -22763.0f; -COMPILER_STRIP_GATE(80662F14, &lit_8268); +COMPILER_STRIP_GATE(0x80662F14, &lit_8268); #pragma pop /* 80662CCC-80662D60 00A7EC 0094+00 0/0 1/0 0/0 .text __sinit_d_a_cow_cpp */ @@ -3211,7 +3236,7 @@ asm void __sinit_d_a_cow_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80662CCC = (void*)__sinit_d_a_cow_cpp; +REGISTER_CTORS(0x80662CCC, __sinit_d_a_cow_cpp); #pragma pop /* 80662D60-80662D68 00A880 0008+00 1/0 0/0 0/0 .text @36@__dt__12dBgS_ObjAcchFv */ @@ -3426,14 +3451,4 @@ static u8 data_806635B4[4]; static u8 data_806635B8[4]; #pragma pop -/* 80662F18-80662F56 000168 003E+00 9/9 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80662F18 = "Cow"; -SECTION_DEAD static char const* const stringBase_80662F1C = "F_SP00"; -SECTION_DEAD static char const* const stringBase_80662F23 = "WILDGOAT"; -SECTION_DEAD static char const* const stringBase_80662F2C = "WILDGOAT_SUCCESS"; -SECTION_DEAD static char const* const stringBase_80662F3D = "WILDGOAT_FAILURE"; -SECTION_DEAD static char const* const stringBase_80662F4E = "MAKI_OP"; -#pragma pop +/* 80662F18-80662F18 000168 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/d_a_crod/d_a_crod.cpp b/rel/d/a/d_a_crod/d_a_crod.cpp index 23441c15712..1297281f701 100644 --- a/rel/d/a/d_a_crod/d_a_crod.cpp +++ b/rel/d/a/d_a_crod/d_a_crod.cpp @@ -155,14 +155,14 @@ struct JMath { struct J3DModel {}; -struct J3DAnmTevRegKey { - /* 8032B87C */ void searchUpdateMaterialID(J3DModelData*); -}; - struct J3DAnmTextureSRTKey { /* 8032B1D4 */ void searchUpdateMaterialID(J3DModelData*); }; +struct J3DAnmTevRegKey { + /* 8032B87C */ void searchUpdateMaterialID(J3DModelData*); +}; + struct J3DMaterialTable { /* 8032FCC4 */ void entryTexMtxAnimator(J3DAnmTextureSRTKey*); /* 8032FE70 */ void entryTevRegAnimator(J3DAnmTevRegKey*); @@ -284,17 +284,17 @@ extern "C" extern u8 data_804A4218[4]; SECTION_RODATA static u8 const lit_3759[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(804A40EC, &lit_3759); +COMPILER_STRIP_GATE(0x804A40EC, &lit_3759); /* 804A40F8-804A4104 00000C 000C+00 1/2 0/0 0/0 .rodata l_localRodPos */ SECTION_RODATA static u8 const l_localRodPos[12] = { 0x42, 0xA2, 0x00, 0x00, 0xC1, 0x48, 0x00, 0x00, 0xC1, 0x40, 0x00, 0x00, }; -COMPILER_STRIP_GATE(804A40F8, &l_localRodPos); +COMPILER_STRIP_GATE(0x804A40F8, &l_localRodPos); /* 804A4104-804A4108 000018 0004+00 2/3 0/0 0/0 .rodata @4173 */ SECTION_RODATA static f32 const lit_4173 = 1.0f; -COMPILER_STRIP_GATE(804A4104, &lit_4173); +COMPILER_STRIP_GATE(0x804A4104, &lit_4173); /* 804A2E38-804A2EF8 000078 00C0+00 1/1 0/0 0/0 .text createHeap__8daCrod_cFv */ #pragma push @@ -502,14 +502,14 @@ asm void daCrod_c::setReturn() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4489 = 300.0f; -COMPILER_STRIP_GATE(804A4108, &lit_4489); +COMPILER_STRIP_GATE(0x804A4108, &lit_4489); #pragma pop /* 804A410C-804A4110 000020 0004+00 0/2 0/0 0/0 .rodata @4490 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4490 = 50.0f; -COMPILER_STRIP_GATE(804A410C, &lit_4490); +COMPILER_STRIP_GATE(0x804A410C, &lit_4490); #pragma pop /* 804A4110-804A4114 000024 0004+00 0/2 0/0 0/0 .rodata @4491 */ @@ -521,7 +521,7 @@ SECTION_RODATA static u8 const lit_4491[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(804A4110, &lit_4491); +COMPILER_STRIP_GATE(0x804A4110, &lit_4491); #pragma pop /* 804A365C-804A36D8 00089C 007C+00 2/2 0/0 0/0 .text setLightPower__8daCrod_cFv */ @@ -539,14 +539,14 @@ asm void daCrod_c::setLightPower() { #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4774 = 0x3D000000; -COMPILER_STRIP_GATE(804A4114, &lit_4774); +COMPILER_STRIP_GATE(0x804A4114, &lit_4774); #pragma pop /* 804A4118-804A411C 00002C 0004+00 0/1 0/0 0/0 .rodata @4775 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4775 = 40.0f; -COMPILER_STRIP_GATE(804A4118, &lit_4775); +COMPILER_STRIP_GATE(0x804A4118, &lit_4775); #pragma pop /* 804A411C-804A4124 000030 0004+04 0/1 0/0 0/0 .rodata @4776 */ @@ -557,7 +557,7 @@ SECTION_RODATA static f32 const lit_4776[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(804A411C, &lit_4776); +COMPILER_STRIP_GATE(0x804A411C, &lit_4776); #pragma pop /* 804A4124-804A412C 000038 0008+00 0/1 0/0 0/0 .rodata @4777 */ @@ -566,7 +566,7 @@ COMPILER_STRIP_GATE(804A411C, &lit_4776); SECTION_RODATA static u8 const lit_4777[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(804A4124, &lit_4777); +COMPILER_STRIP_GATE(0x804A4124, &lit_4777); #pragma pop /* 804A412C-804A4134 000040 0008+00 0/1 0/0 0/0 .rodata @4778 */ @@ -575,7 +575,7 @@ COMPILER_STRIP_GATE(804A4124, &lit_4777); SECTION_RODATA static u8 const lit_4778[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(804A412C, &lit_4778); +COMPILER_STRIP_GATE(0x804A412C, &lit_4778); #pragma pop /* 804A4134-804A413C 000048 0008+00 0/1 0/0 0/0 .rodata @4779 */ @@ -584,7 +584,7 @@ COMPILER_STRIP_GATE(804A412C, &lit_4778); SECTION_RODATA static u8 const lit_4779[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(804A4134, &lit_4779); +COMPILER_STRIP_GATE(0x804A4134, &lit_4779); #pragma pop /* 804A36D8-804A3FB4 000918 08DC+00 1/1 0/0 0/0 .text execute__8daCrod_cFv */ diff --git a/rel/d/a/d_a_cstaf/d_a_cstaF.cpp b/rel/d/a/d_a_cstaf/d_a_cstaF.cpp index c49f9602ea4..b1b8c0b6f2d 100644 --- a/rel/d/a/d_a_cstaf/d_a_cstaF.cpp +++ b/rel/d/a/d_a_cstaf/d_a_cstaF.cpp @@ -32,14 +32,14 @@ struct mDoExt_morf_c { struct J3DModelData {}; -struct J3DAnmTevRegKey { - /* 8032B87C */ void searchUpdateMaterialID(J3DModelData*); -}; - struct J3DAnmTextureSRTKey { /* 8032B1D4 */ void searchUpdateMaterialID(J3DModelData*); }; +struct J3DAnmTevRegKey { + /* 8032B87C */ void searchUpdateMaterialID(J3DModelData*); +}; + struct J3DMaterialTable { /* 8032FCC4 */ void entryTexMtxAnimator(J3DAnmTextureSRTKey*); /* 8032FE70 */ void entryTevRegAnimator(J3DAnmTevRegKey*); @@ -63,6 +63,8 @@ struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; +struct J3DAnmTransform {}; + struct Vec {}; struct Z2Creature { @@ -71,8 +73,6 @@ struct Z2Creature { /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -150,12 +150,6 @@ struct dPa_control_c { cXyz const*, f32); }; -struct dBgS_AcchCir { - /* 80075EAC */ dBgS_AcchCir(); - /* 80075F58 */ void SetWall(f32, f32); - /* 804DE220 */ ~dBgS_AcchCir(); -}; - struct cBgS_PolyInfo { /* 802680B0 */ ~cBgS_PolyInfo(); }; @@ -165,6 +159,12 @@ struct dBgS { /* 80075100 */ void GetRoomId(cBgS_PolyInfo const&); }; +struct dBgS_AcchCir { + /* 80075EAC */ dBgS_AcchCir(); + /* 80075F58 */ void SetWall(f32, f32); + /* 804DE220 */ ~dBgS_AcchCir(); +}; + struct dBgS_Acch { /* 80075F94 */ ~dBgS_Acch(); /* 800760A0 */ dBgS_Acch(); @@ -489,7 +489,7 @@ static asm void daCstaF_rideCB(dBgW* param_0, fopAc_ac_c* param_1, fopAc_ac_c* p SECTION_RODATA static u8 const lit_3765[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(804DF8B8, &lit_3765); +COMPILER_STRIP_GATE(0x804DF8B8, &lit_3765); /* 804DF8C4-804DF8CC 00000C 0006+02 0/1 0/0 0/0 .rodata l_arcNameF */ #pragma push @@ -505,7 +505,7 @@ SECTION_RODATA static u8 const l_arcNameF[6 + 2 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(804DF8C4, &l_arcNameF); +COMPILER_STRIP_GATE(0x804DF8C4, &l_arcNameF); #pragma pop /* 804DF8CC-804DF8D4 000014 0007+01 0/2 0/0 0/0 .rodata l_arcNameFB */ @@ -522,14 +522,14 @@ SECTION_RODATA static u8 const l_arcNameFB[7 + 1 /* padding */] = { /* padding */ 0x00, }; -COMPILER_STRIP_GATE(804DF8CC, &l_arcNameFB); +COMPILER_STRIP_GATE(0x804DF8CC, &l_arcNameFB); #pragma pop /* 804DF8D4-804DF8DC 00001C 0008+00 1/1 0/0 0/0 .rodata l_spStageName */ SECTION_RODATA static u8 const l_spStageName[8] = { 0x52, 0x5F, 0x53, 0x50, 0x32, 0x30, 0x39, 0x00, }; -COMPILER_STRIP_GATE(804DF8D4, &l_spStageName); +COMPILER_STRIP_GATE(0x804DF8D4, &l_spStageName); /* 804DF8DC-804DF8EC 000024 0010+00 0/2 0/0 0/0 .rodata m_bckIdxTable__9daCstaF_c */ #pragma push @@ -537,7 +537,7 @@ COMPILER_STRIP_GATE(804DF8D4, &l_spStageName); SECTION_RODATA u8 const daCstaF_c::m_bckIdxTable[16] = { 0x00, 0x09, 0x00, 0x09, 0x00, 0x08, 0x00, 0x07, 0x00, 0x09, 0x00, 0x09, 0x00, 0x08, 0x00, 0x07, }; -COMPILER_STRIP_GATE(804DF8DC, &daCstaF_c::m_bckIdxTable); +COMPILER_STRIP_GATE(0x804DF8DC, &daCstaF_c::m_bckIdxTable); #pragma pop /* 804DF8EC-804DF8FC 000034 0010+00 0/1 0/0 0/0 .rodata dataTbl$4160 */ @@ -546,7 +546,7 @@ COMPILER_STRIP_GATE(804DF8DC, &daCstaF_c::m_bckIdxTable); SECTION_RODATA static u8 const dataTbl[16] = { 0x00, 0x0C, 0x00, 0x09, 0x00, 0x10, 0x00, 0x13, 0x00, 0x0C, 0x00, 0x09, 0x00, 0x11, 0x00, 0x15, }; -COMPILER_STRIP_GATE(804DF8EC, &dataTbl); +COMPILER_STRIP_GATE(0x804DF8EC, &dataTbl); #pragma pop /* 804DF8FC-804DF900 000044 0004+00 1/7 0/0 0/0 .rodata @4205 */ @@ -556,11 +556,11 @@ SECTION_RODATA static u8 const lit_4205[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(804DF8FC, &lit_4205); +COMPILER_STRIP_GATE(0x804DF8FC, &lit_4205); /* 804DF900-804DF904 000048 0004+00 1/8 0/0 0/0 .rodata @4206 */ SECTION_RODATA static f32 const lit_4206 = 1.0f; -COMPILER_STRIP_GATE(804DF900, &lit_4206); +COMPILER_STRIP_GATE(0x804DF900, &lit_4206); /* 804DD978-804DDB48 000098 01D0+00 1/0 0/0 0/0 .text CreateHeap__9daCstaF_cFv */ #pragma push @@ -587,77 +587,77 @@ asm void daCstaF_c::checkCoverModel() { #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4359 = 0x41F0147B; -COMPILER_STRIP_GATE(804DF904, &lit_4359); +COMPILER_STRIP_GATE(0x804DF904, &lit_4359); #pragma pop /* 804DF908-804DF90C 000050 0004+00 0/1 0/0 0/0 .rodata @4360 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4360 = 80.0f; -COMPILER_STRIP_GATE(804DF908, &lit_4360); +COMPILER_STRIP_GATE(0x804DF908, &lit_4360); #pragma pop /* 804DF90C-804DF910 000054 0004+00 0/1 0/0 0/0 .rodata @4361 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4361 = 160.0f; -COMPILER_STRIP_GATE(804DF90C, &lit_4361); +COMPILER_STRIP_GATE(0x804DF90C, &lit_4361); #pragma pop /* 804DF910-804DF914 000058 0004+00 0/1 0/0 0/0 .rodata @4362 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4362 = 280.0f; -COMPILER_STRIP_GATE(804DF910, &lit_4362); +COMPILER_STRIP_GATE(0x804DF910, &lit_4362); #pragma pop /* 804DF914-804DF918 00005C 0004+00 0/1 0/0 0/0 .rodata @4363 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4363 = 400.0f; -COMPILER_STRIP_GATE(804DF914, &lit_4363); +COMPILER_STRIP_GATE(0x804DF914, &lit_4363); #pragma pop /* 804DF918-804DF91C 000060 0004+00 0/1 0/0 0/0 .rodata @4364 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4364 = 475.0f; -COMPILER_STRIP_GATE(804DF918, &lit_4364); +COMPILER_STRIP_GATE(0x804DF918, &lit_4364); #pragma pop /* 804DF91C-804DF920 000064 0004+00 0/1 0/0 0/0 .rodata @4365 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4365 = 450.0f; -COMPILER_STRIP_GATE(804DF91C, &lit_4365); +COMPILER_STRIP_GATE(0x804DF91C, &lit_4365); #pragma pop /* 804DF920-804DF924 000068 0004+00 0/1 0/0 0/0 .rodata @4366 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4366 = -475.0f; -COMPILER_STRIP_GATE(804DF920, &lit_4366); +COMPILER_STRIP_GATE(0x804DF920, &lit_4366); #pragma pop /* 804DF924-804DF928 00006C 0004+00 0/1 0/0 0/0 .rodata @4367 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4367 = -8.0f; -COMPILER_STRIP_GATE(804DF924, &lit_4367); +COMPILER_STRIP_GATE(0x804DF924, &lit_4367); #pragma pop /* 804DF928-804DF92C 000070 0004+00 0/1 0/0 0/0 .rodata @4368 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4368 = -100.0f; -COMPILER_STRIP_GATE(804DF928, &lit_4368); +COMPILER_STRIP_GATE(0x804DF928, &lit_4368); #pragma pop /* 804DF92C-804DF930 000074 0004+00 0/2 0/0 0/0 .rodata @4369 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4369 = 30.0f; -COMPILER_STRIP_GATE(804DF92C, &lit_4369); +COMPILER_STRIP_GATE(0x804DF92C, &lit_4369); #pragma pop /* 804DF930-804DF938 000078 0008+00 0/3 0/0 0/0 .rodata @4371 */ @@ -666,7 +666,7 @@ COMPILER_STRIP_GATE(804DF92C, &lit_4369); SECTION_RODATA static u8 const lit_4371[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(804DF930, &lit_4371); +COMPILER_STRIP_GATE(0x804DF930, &lit_4371); #pragma pop /* 804DF9A0-804DF9E4 000000 0044+00 1/1 0/0 0/0 .data l_cylSrc */ @@ -879,7 +879,7 @@ static asm void daCstaF_Delete(daCstaF_c* param_0) { /* ############################################################################################## */ /* 804DF938-804DF93C 000080 0004+00 1/3 0/0 0/0 .rodata @4543 */ SECTION_RODATA static f32 const lit_4543 = -1000000000.0f; -COMPILER_STRIP_GATE(804DF938, &lit_4543); +COMPILER_STRIP_GATE(0x804DF938, &lit_4543); /* 804DE558-804DE5F0 000C78 0098+00 2/2 0/0 0/0 .text setRoomInfo__9daCstaF_cFv */ #pragma push @@ -896,7 +896,7 @@ asm void daCstaF_c::setRoomInfo() { SECTION_RODATA static u8 const fieldLocalBallPos[12] = { 0x00, 0x00, 0x00, 0x00, 0x43, 0x48, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(804DF93C, &fieldLocalBallPos); +COMPILER_STRIP_GATE(0x804DF93C, &fieldLocalBallPos); /* 804DE5F0-804DE698 000D10 00A8+00 2/2 0/0 0/0 .text setMatrix__9daCstaF_cFv */ #pragma push @@ -913,14 +913,14 @@ asm void daCstaF_c::setMatrix() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4720 = 18.0f; -COMPILER_STRIP_GATE(804DF948, &lit_4720); +COMPILER_STRIP_GATE(0x804DF948, &lit_4720); #pragma pop /* 804DF94C-804DF950 000094 0004+00 0/1 0/0 0/0 .rodata @4721 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4721 = 0.5f; -COMPILER_STRIP_GATE(804DF94C, &lit_4721); +COMPILER_STRIP_GATE(0x804DF94C, &lit_4721); #pragma pop /* 804DF950-804DF958 000098 0004+04 0/1 0/0 0/0 .rodata @4722 */ @@ -931,7 +931,7 @@ SECTION_RODATA static f32 const lit_4722[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(804DF950, &lit_4722); +COMPILER_STRIP_GATE(0x804DF950, &lit_4722); #pragma pop /* 804DF958-804DF960 0000A0 0008+00 0/1 0/0 0/0 .rodata @4723 */ @@ -940,7 +940,7 @@ COMPILER_STRIP_GATE(804DF950, &lit_4722); SECTION_RODATA static u8 const lit_4723[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(804DF958, &lit_4723); +COMPILER_STRIP_GATE(0x804DF958, &lit_4723); #pragma pop /* 804DF960-804DF968 0000A8 0008+00 0/1 0/0 0/0 .rodata @4724 */ @@ -949,7 +949,7 @@ COMPILER_STRIP_GATE(804DF958, &lit_4723); SECTION_RODATA static u8 const lit_4724[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(804DF960, &lit_4724); +COMPILER_STRIP_GATE(0x804DF960, &lit_4724); #pragma pop /* 804DF968-804DF970 0000B0 0008+00 0/1 0/0 0/0 .rodata @4725 */ @@ -958,25 +958,25 @@ COMPILER_STRIP_GATE(804DF960, &lit_4724); SECTION_RODATA static u8 const lit_4725[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(804DF968, &lit_4725); +COMPILER_STRIP_GATE(0x804DF968, &lit_4725); #pragma pop /* 804DF970-804DF974 0000B8 0004+00 0/1 0/0 0/0 .rodata @4726 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4726 = -30.0f; -COMPILER_STRIP_GATE(804DF970, &lit_4726); +COMPILER_STRIP_GATE(0x804DF970, &lit_4726); #pragma pop /* 804DF974-804DF978 0000BC 0004+00 1/2 0/0 0/0 .rodata @4727 */ SECTION_RODATA static f32 const lit_4727 = 100.0f; -COMPILER_STRIP_GATE(804DF974, &lit_4727); +COMPILER_STRIP_GATE(0x804DF974, &lit_4727); /* 804DF978-804DF97C 0000C0 0004+00 0/3 0/0 0/0 .rodata @4728 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4728 = -1.0f; -COMPILER_STRIP_GATE(804DF978, &lit_4728); +COMPILER_STRIP_GATE(0x804DF978, &lit_4728); #pragma pop /* 804DE698-804DEB18 000DB8 0480+00 1/1 0/0 0/0 .text posMove__9daCstaF_cFv */ @@ -1014,21 +1014,21 @@ asm void daCstaF_c::setCollision() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4884 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(804DF97C, &lit_4884); +COMPILER_STRIP_GATE(0x804DF97C, &lit_4884); #pragma pop /* 804DF980-804DF984 0000C8 0004+00 0/1 0/0 0/0 .rodata @4885 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4885 = 3.0f; -COMPILER_STRIP_GATE(804DF980, &lit_4885); +COMPILER_STRIP_GATE(0x804DF980, &lit_4885); #pragma pop /* 804DF984-804DF988 0000CC 0004+00 0/1 0/0 0/0 .rodata @4886 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4886 = 15.0f; -COMPILER_STRIP_GATE(804DF984, &lit_4886); +COMPILER_STRIP_GATE(0x804DF984, &lit_4886); #pragma pop /* 804DFAD8-804DFADC 000000 0004+00 2/2 0/0 0/0 .bss l_cancelOffset */ @@ -1062,7 +1062,7 @@ SECTION_RODATA static u8 const brkIdx[4] = { 0x00, 0x11, }; -COMPILER_STRIP_GATE(804DF988, &brkIdx); +COMPILER_STRIP_GATE(0x804DF988, &brkIdx); /* 804DF150-804DF1A4 001870 0054+00 2/2 0/0 0/0 .text initStopBrkBtk__9daCstaF_cFv */ #pragma push @@ -1084,21 +1084,21 @@ SECTION_RODATA static u8 const brIdx[4] = { 0x00, 0x10, }; -COMPILER_STRIP_GATE(804DF98C, &brIdx); +COMPILER_STRIP_GATE(0x804DF98C, &brIdx); #pragma pop /* 804DF990-804DF994 0000D8 0004+00 0/1 0/0 0/0 .rodata @4956 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4956 = 40.0f; -COMPILER_STRIP_GATE(804DF990, &lit_4956); +COMPILER_STRIP_GATE(0x804DF990, &lit_4956); #pragma pop /* 804DF994-804DF998 0000DC 0004+00 0/1 0/0 0/0 .rodata @4957 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4957 = 2.0f; -COMPILER_STRIP_GATE(804DF994, &lit_4957); +COMPILER_STRIP_GATE(0x804DF994, &lit_4957); #pragma pop /* 804DF1A4-804DF37C 0018C4 01D8+00 1/1 0/0 0/0 .text initStartBrkBtk__9daCstaF_cFv */ @@ -1136,7 +1136,7 @@ static asm void daCstaF_Execute(daCstaF_c* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5082 = 1000.0f; -COMPILER_STRIP_GATE(804DF998, &lit_5082); +COMPILER_STRIP_GATE(0x804DF998, &lit_5082); #pragma pop /* 804DF6E4-804DF800 001E04 011C+00 1/0 0/0 0/0 .text Draw__9daCstaF_cFv */ @@ -1172,7 +1172,7 @@ asm cCcD_GStts::~cCcD_GStts() { /* ############################################################################################## */ /* 804DF99C-804DF9A0 0000E4 0004+00 1/1 0/0 0/0 .rodata @5096 */ SECTION_RODATA static u32 const lit_5096 = 0x478F0481; -COMPILER_STRIP_GATE(804DF99C, &lit_5096); +COMPILER_STRIP_GATE(0x804DF99C, &lit_5096); /* 804DF874-804DF89C 001F94 0028+00 0/0 1/0 0/0 .text __sinit_d_a_cstaF_cpp */ #pragma push @@ -1186,7 +1186,7 @@ asm void __sinit_d_a_cstaF_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_804DF874 = (void*)__sinit_d_a_cstaF_cpp; +REGISTER_CTORS(0x804DF874, __sinit_d_a_cstaF_cpp); #pragma pop /* 804DF89C-804DF8A4 001FBC 0008+00 1/0 0/0 0/0 .text @36@__dt__15dBgS_StatueAcchFv */ diff --git a/rel/d/a/d_a_cstatue/d_a_cstatue.cpp b/rel/d/a/d_a_cstatue/d_a_cstatue.cpp index 6caee03f9a8..7eb3f039e40 100644 --- a/rel/d/a/d_a_cstatue/d_a_cstatue.cpp +++ b/rel/d/a/d_a_cstatue/d_a_cstatue.cpp @@ -67,20 +67,20 @@ struct mDoExt_baseAnm { /* 8000D428 */ void play(); }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; +struct J3DAnmTransform {}; + +struct J3DModelData {}; + struct Z2Creature { /* 802C03C8 */ Z2Creature(); /* 802C0420 */ ~Z2Creature(); /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -185,12 +185,6 @@ struct dPa_control_c { cXyz const*, f32); }; -struct dBgS_AcchCir { - /* 80075EAC */ dBgS_AcchCir(); - /* 80075F58 */ void SetWall(f32, f32); - /* 80664768 */ ~dBgS_AcchCir(); -}; - struct cBgS_PolyInfo { /* 802680B0 */ ~cBgS_PolyInfo(); }; @@ -202,6 +196,12 @@ struct dBgS { /* 80075100 */ void GetRoomId(cBgS_PolyInfo const&); }; +struct dBgS_AcchCir { + /* 80075EAC */ dBgS_AcchCir(); + /* 80075F58 */ void SetWall(f32, f32); + /* 80664768 */ ~dBgS_AcchCir(); +}; + struct dBgS_Acch { /* 80075F94 */ ~dBgS_Acch(); /* 800760A0 */ dBgS_Acch(); @@ -580,7 +580,7 @@ static asm void daCstatue_atHitCallback(fopAc_ac_c* param_0, dCcD_GObjInf* param SECTION_RODATA static u8 const lit_3768[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80667698, &lit_3768); +COMPILER_STRIP_GATE(0x80667698, &lit_3768); /* 806676A4-806676AC 00000C 0008+00 0/1 0/0 0/0 .rodata l_arcName */ #pragma push @@ -588,7 +588,7 @@ COMPILER_STRIP_GATE(80667698, &lit_3768); SECTION_RODATA static u8 const l_arcName[8] = { 0x43, 0x73, 0x74, 0x61, 0x74, 0x75, 0x65, 0x00, }; -COMPILER_STRIP_GATE(806676A4, &l_arcName); +COMPILER_STRIP_GATE(0x806676A4, &l_arcName); #pragma pop /* 806676AC-806676B4 000014 0007+01 0/1 0/0 0/0 .rodata l_arcNameBS */ @@ -605,7 +605,7 @@ SECTION_RODATA static u8 const l_arcNameBS[7 + 1 /* padding */] = { /* padding */ 0x00, }; -COMPILER_STRIP_GATE(806676AC, &l_arcNameBS); +COMPILER_STRIP_GATE(0x806676AC, &l_arcNameBS); #pragma pop /* 806676B4-806676FC 00001C 0046+02 0/2 0/0 0/0 .rodata m_bckIdxTable__11daCstatue_c */ @@ -686,7 +686,7 @@ SECTION_RODATA u8 const daCstatue_c::m_bckIdxTable[70 + 2 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(806676B4, &daCstatue_c::m_bckIdxTable); +COMPILER_STRIP_GATE(0x806676B4, &daCstatue_c::m_bckIdxTable); #pragma pop /* 806676FC-80667738 000064 003C+00 0/1 0/0 0/0 .rodata dataTbl$4169 */ @@ -698,7 +698,7 @@ SECTION_RODATA static u8 const dataTbl[60] = { 0x00, 0x22, 0x11, 0x00, 0x02, 0x84, 0x00, 0x0E, 0x00, 0x0B, 0x00, 0x12, 0x00, 0x15, 0x11, 0x00, 0x02, 0x84, 0x00, 0x0E, 0x00, 0x0A, 0x00, 0x12, 0x00, 0x15, 0x11, 0x00, 0x02, 0x84, }; -COMPILER_STRIP_GATE(806676FC, &dataTbl); +COMPILER_STRIP_GATE(0x806676FC, &dataTbl); #pragma pop /* 80667738-8066773C 0000A0 0004+00 1/11 0/0 0/0 .rodata @4286 */ @@ -708,11 +708,11 @@ SECTION_RODATA static u8 const lit_4286[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80667738, &lit_4286); +COMPILER_STRIP_GATE(0x80667738, &lit_4286); /* 8066773C-80667740 0000A4 0004+00 1/10 0/0 0/0 .rodata @4287 */ SECTION_RODATA static f32 const lit_4287 = 1.0f; -COMPILER_STRIP_GATE(8066773C, &lit_4287); +COMPILER_STRIP_GATE(0x8066773C, &lit_4287); /* 806679B0-806679BC 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { @@ -947,7 +947,7 @@ SECTION_RODATA static u8 const bossSphR[36] = { 0x43, 0x5C, 0x00, 0x00, 0x43, 0x8C, 0x00, 0x00, 0x43, 0x48, 0x00, 0x00, 0x43, 0x7A, 0x00, 0x00, 0x43, 0x5C, 0x00, 0x00, 0x43, 0x8C, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80667740, &bossSphR); +COMPILER_STRIP_GATE(0x80667740, &bossSphR); #pragma pop /* 80667764-80667778 0000CC 0014+00 0/1 0/0 0/0 .rodata heapSize$4390 */ @@ -957,203 +957,203 @@ SECTION_RODATA static u8 const heapSize[20] = { 0x00, 0x00, 0x11, 0x10, 0x00, 0x00, 0x08, 0xA0, 0x00, 0x00, 0x12, 0x50, 0x00, 0x00, 0x18, 0x60, 0x00, 0x00, 0x18, 0x60, }; -COMPILER_STRIP_GATE(80667764, &heapSize); +COMPILER_STRIP_GATE(0x80667764, &heapSize); #pragma pop /* 80667778-8066777C 0000E0 0004+00 0/1 0/0 0/0 .rodata @4735 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4735 = 8.0f / 5.0f; -COMPILER_STRIP_GATE(80667778, &lit_4735); +COMPILER_STRIP_GATE(0x80667778, &lit_4735); #pragma pop /* 8066777C-80667780 0000E4 0004+00 0/1 0/0 0/0 .rodata @4736 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4736 = 88.0f; -COMPILER_STRIP_GATE(8066777C, &lit_4736); +COMPILER_STRIP_GATE(0x8066777C, &lit_4736); #pragma pop /* 80667780-80667784 0000E8 0004+00 0/2 0/0 0/0 .rodata @4737 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4737 = 384.0f; -COMPILER_STRIP_GATE(80667780, &lit_4737); +COMPILER_STRIP_GATE(0x80667780, &lit_4737); #pragma pop /* 80667784-80667788 0000EC 0004+00 0/2 0/0 0/0 .rodata @4738 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4738 = 200.0f; -COMPILER_STRIP_GATE(80667784, &lit_4738); +COMPILER_STRIP_GATE(0x80667784, &lit_4738); #pragma pop /* 80667788-8066778C 0000F0 0004+00 0/1 0/0 0/0 .rodata @4739 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4739 = 0x41F0147B; -COMPILER_STRIP_GATE(80667788, &lit_4739); +COMPILER_STRIP_GATE(0x80667788, &lit_4739); #pragma pop /* 8066778C-80667790 0000F4 0004+00 0/1 0/0 0/0 .rodata @4740 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4740 = 208.0f; -COMPILER_STRIP_GATE(8066778C, &lit_4740); +COMPILER_STRIP_GATE(0x8066778C, &lit_4740); #pragma pop /* 80667790-80667794 0000F8 0004+00 0/1 0/0 0/0 .rodata @4741 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4741 = 288.0f; -COMPILER_STRIP_GATE(80667790, &lit_4741); +COMPILER_STRIP_GATE(0x80667790, &lit_4741); #pragma pop /* 80667794-80667798 0000FC 0004+00 0/1 0/0 0/0 .rodata @4742 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4742 = 392.0f; -COMPILER_STRIP_GATE(80667794, &lit_4742); +COMPILER_STRIP_GATE(0x80667794, &lit_4742); #pragma pop /* 80667798-8066779C 000100 0004+00 0/1 0/0 0/0 .rodata @4743 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4743 = 0x43D4CCCD; -COMPILER_STRIP_GATE(80667798, &lit_4743); +COMPILER_STRIP_GATE(0x80667798, &lit_4743); #pragma pop /* 8066779C-806677A0 000104 0004+00 0/1 0/0 0/0 .rodata @4744 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4744 = 528.0f; -COMPILER_STRIP_GATE(8066779C, &lit_4744); +COMPILER_STRIP_GATE(0x8066779C, &lit_4744); #pragma pop /* 806677A0-806677A4 000108 0004+00 0/1 0/0 0/0 .rodata @4745 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4745 = 0xC3D4CCCD; -COMPILER_STRIP_GATE(806677A0, &lit_4745); +COMPILER_STRIP_GATE(0x806677A0, &lit_4745); #pragma pop /* 806677A4-806677A8 00010C 0004+00 0/1 0/0 0/0 .rodata @4746 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4746 = 1440.0f; -COMPILER_STRIP_GATE(806677A4, &lit_4746); +COMPILER_STRIP_GATE(0x806677A4, &lit_4746); #pragma pop /* 806677A8-806677AC 000110 0004+00 0/1 0/0 0/0 .rodata @4747 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4747 = -8.0f; -COMPILER_STRIP_GATE(806677A8, &lit_4747); +COMPILER_STRIP_GATE(0x806677A8, &lit_4747); #pragma pop /* 806677AC-806677B0 000114 0004+00 0/1 0/0 0/0 .rodata @4748 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4748 = -100.0f; -COMPILER_STRIP_GATE(806677AC, &lit_4748); +COMPILER_STRIP_GATE(0x806677AC, &lit_4748); #pragma pop /* 806677B0-806677B4 000118 0004+00 0/1 0/0 0/0 .rodata @4749 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4749 = 3.0f / 5.0f; -COMPILER_STRIP_GATE(806677B0, &lit_4749); +COMPILER_STRIP_GATE(0x806677B0, &lit_4749); #pragma pop /* 806677B4-806677B8 00011C 0004+00 0/1 0/0 0/0 .rodata @4750 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4750 = 35.0f; -COMPILER_STRIP_GATE(806677B4, &lit_4750); +COMPILER_STRIP_GATE(0x806677B4, &lit_4750); #pragma pop /* 806677B8-806677BC 000120 0004+00 0/3 0/0 0/0 .rodata @4751 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4751 = 100.0f; -COMPILER_STRIP_GATE(806677B8, &lit_4751); +COMPILER_STRIP_GATE(0x806677B8, &lit_4751); #pragma pop /* 806677BC-806677C0 000124 0004+00 0/1 0/0 0/0 .rodata @4752 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4752 = 145.0f; -COMPILER_STRIP_GATE(806677BC, &lit_4752); +COMPILER_STRIP_GATE(0x806677BC, &lit_4752); #pragma pop /* 806677C0-806677C4 000128 0004+00 0/1 0/0 0/0 .rodata @4753 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4753 = 250.0f; -COMPILER_STRIP_GATE(806677C0, &lit_4753); +COMPILER_STRIP_GATE(0x806677C0, &lit_4753); #pragma pop /* 806677C4-806677C8 00012C 0004+00 0/1 0/0 0/0 .rodata @4754 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4754 = -145.0f; -COMPILER_STRIP_GATE(806677C4, &lit_4754); +COMPILER_STRIP_GATE(0x806677C4, &lit_4754); #pragma pop /* 806677C8-806677CC 000130 0004+00 0/1 0/0 0/0 .rodata @4755 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4755 = 300.0f; -COMPILER_STRIP_GATE(806677C8, &lit_4755); +COMPILER_STRIP_GATE(0x806677C8, &lit_4755); #pragma pop /* 806677CC-806677D0 000134 0004+00 0/1 0/0 0/0 .rodata @4756 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4756 = -5.0f; -COMPILER_STRIP_GATE(806677CC, &lit_4756); +COMPILER_STRIP_GATE(0x806677CC, &lit_4756); #pragma pop /* 806677D0-806677D4 000138 0004+00 0/1 0/0 0/0 .rodata @4757 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4757 = 4825.0f; -COMPILER_STRIP_GATE(806677D0, &lit_4757); +COMPILER_STRIP_GATE(0x806677D0, &lit_4757); #pragma pop /* 806677D4-806677D8 00013C 0004+00 0/2 0/0 0/0 .rodata @4758 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4758 = 21.0f; -COMPILER_STRIP_GATE(806677D4, &lit_4758); +COMPILER_STRIP_GATE(0x806677D4, &lit_4758); #pragma pop /* 806677D8-806677DC 000140 0004+00 0/1 0/0 0/0 .rodata @4759 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4759 = 600.0f; -COMPILER_STRIP_GATE(806677D8, &lit_4759); +COMPILER_STRIP_GATE(0x806677D8, &lit_4759); #pragma pop /* 806677DC-806677E0 000144 0004+00 0/1 0/0 0/0 .rodata @4760 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4760 = 5500.0f; -COMPILER_STRIP_GATE(806677DC, &lit_4760); +COMPILER_STRIP_GATE(0x806677DC, &lit_4760); #pragma pop /* 806677E0-806677E4 000148 0004+00 0/1 0/0 0/0 .rodata @4761 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4761 = 650000.0f; -COMPILER_STRIP_GATE(806677E0, &lit_4761); +COMPILER_STRIP_GATE(0x806677E0, &lit_4761); #pragma pop /* 806677E4-806677E8 00014C 0004+00 0/4 0/0 0/0 .rodata @4762 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4762 = 30.0f; -COMPILER_STRIP_GATE(806677E4, &lit_4762); +COMPILER_STRIP_GATE(0x806677E4, &lit_4762); #pragma pop /* 806677E8-806677F0 000150 0008+00 0/4 0/0 0/0 .rodata @4764 */ @@ -1162,7 +1162,7 @@ COMPILER_STRIP_GATE(806677E4, &lit_4762); SECTION_RODATA static u8 const lit_4764[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(806677E8, &lit_4764); +COMPILER_STRIP_GATE(0x806677E8, &lit_4764); #pragma pop /* 80663D28-8066469C 000768 0974+00 1/1 0/0 0/0 .text create__11daCstatue_cFv */ @@ -1249,7 +1249,7 @@ static asm void daCstatue_Delete(daCstatue_c* param_0) { /* ############################################################################################## */ /* 806677F0-806677F4 000158 0004+00 1/3 0/0 0/0 .rodata @4907 */ SECTION_RODATA static f32 const lit_4907 = -1000000000.0f; -COMPILER_STRIP_GATE(806677F0, &lit_4907); +COMPILER_STRIP_GATE(0x806677F0, &lit_4907); /* 80664AA0-80664B38 0014E0 0098+00 2/2 0/0 0/0 .text setRoomInfo__11daCstatue_cFv */ #pragma push @@ -1268,7 +1268,7 @@ asm void daCstatue_c::setRoomInfo() { SECTION_RODATA static u8 const normalLocalBallPos[12] = { 0x42, 0x8C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(806677F4, &normalLocalBallPos); +COMPILER_STRIP_GATE(0x806677F4, &normalLocalBallPos); #pragma pop /* 80667800-8066780C 000168 000C+00 0/1 0/0 0/0 .rodata smallLocalBallPos$4912 */ @@ -1277,7 +1277,7 @@ COMPILER_STRIP_GATE(806677F4, &normalLocalBallPos); SECTION_RODATA static u8 const smallLocalBallPos[12] = { 0x00, 0x00, 0x00, 0x00, 0x42, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80667800, &smallLocalBallPos); +COMPILER_STRIP_GATE(0x80667800, &smallLocalBallPos); #pragma pop /* 8066780C-80667818 000174 000C+00 0/1 0/0 0/0 .rodata bossLocalBallPos$4913 */ @@ -1286,14 +1286,14 @@ COMPILER_STRIP_GATE(80667800, &smallLocalBallPos); SECTION_RODATA static u8 const bossLocalBallPos[12] = { 0x43, 0xD2, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8066780C, &bossLocalBallPos); +COMPILER_STRIP_GATE(0x8066780C, &bossLocalBallPos); #pragma pop /* 80667818-8066781C 000180 0004+00 0/1 0/0 0/0 .rodata @4965 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4965 = 140.0f; -COMPILER_STRIP_GATE(80667818, &lit_4965); +COMPILER_STRIP_GATE(0x80667818, &lit_4965); #pragma pop /* 80664B38-80664C9C 001578 0164+00 2/2 0/0 0/0 .text setMatrix__11daCstatue_cFv */ @@ -1311,60 +1311,60 @@ asm void daCstatue_c::setMatrix() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5281 = 18.0f; -COMPILER_STRIP_GATE(8066781C, &lit_5281); +COMPILER_STRIP_GATE(0x8066781C, &lit_5281); #pragma pop /* 80667820-80667824 000188 0004+00 1/4 0/0 0/0 .rodata @5282 */ SECTION_RODATA static f32 const lit_5282 = 0.5f; -COMPILER_STRIP_GATE(80667820, &lit_5282); +COMPILER_STRIP_GATE(0x80667820, &lit_5282); /* 80667824-80667828 00018C 0004+00 0/1 0/0 0/0 .rodata @5283 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5283 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(80667824, &lit_5283); +COMPILER_STRIP_GATE(0x80667824, &lit_5283); #pragma pop /* 80667828-8066782C 000190 0004+00 0/3 0/0 0/0 .rodata @5284 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5284 = -1.0f; -COMPILER_STRIP_GATE(80667828, &lit_5284); +COMPILER_STRIP_GATE(0x80667828, &lit_5284); #pragma pop /* 8066782C-80667830 000194 0004+00 0/1 0/0 0/0 .rodata @5285 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5285 = 6.0f; -COMPILER_STRIP_GATE(8066782C, &lit_5285); +COMPILER_STRIP_GATE(0x8066782C, &lit_5285); #pragma pop /* 80667830-80667834 000198 0004+00 0/1 0/0 0/0 .rodata @5286 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5286 = 0.25f; -COMPILER_STRIP_GATE(80667830, &lit_5286); +COMPILER_STRIP_GATE(0x80667830, &lit_5286); #pragma pop /* 80667834-80667838 00019C 0004+00 0/2 0/0 0/0 .rodata @5287 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5287 = 7.0f; -COMPILER_STRIP_GATE(80667834, &lit_5287); +COMPILER_STRIP_GATE(0x80667834, &lit_5287); #pragma pop /* 80667838-8066783C 0001A0 0004+00 0/3 0/0 0/0 .rodata @5288 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5288 = 3.0f; -COMPILER_STRIP_GATE(80667838, &lit_5288); +COMPILER_STRIP_GATE(0x80667838, &lit_5288); #pragma pop /* 8066783C-80667840 0001A4 0004+00 0/1 0/0 0/0 .rodata @5289 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5289 = 12.0f; -COMPILER_STRIP_GATE(8066783C, &lit_5289); +COMPILER_STRIP_GATE(0x8066783C, &lit_5289); #pragma pop /* 80667840-80667848 0001A8 0004+04 0/1 0/0 0/0 .rodata @5290 */ @@ -1375,7 +1375,7 @@ SECTION_RODATA static f32 const lit_5290[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80667840, &lit_5290); +COMPILER_STRIP_GATE(0x80667840, &lit_5290); #pragma pop /* 80667848-80667850 0001B0 0008+00 0/2 0/0 0/0 .rodata @5291 */ @@ -1384,7 +1384,7 @@ COMPILER_STRIP_GATE(80667840, &lit_5290); SECTION_RODATA static u8 const lit_5291[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80667848, &lit_5291); +COMPILER_STRIP_GATE(0x80667848, &lit_5291); #pragma pop /* 80667850-80667858 0001B8 0008+00 0/2 0/0 0/0 .rodata @5292 */ @@ -1393,7 +1393,7 @@ COMPILER_STRIP_GATE(80667848, &lit_5291); SECTION_RODATA static u8 const lit_5292[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80667850, &lit_5292); +COMPILER_STRIP_GATE(0x80667850, &lit_5292); #pragma pop /* 80667858-80667860 0001C0 0008+00 0/2 0/0 0/0 .rodata @5293 */ @@ -1402,28 +1402,28 @@ COMPILER_STRIP_GATE(80667850, &lit_5292); SECTION_RODATA static u8 const lit_5293[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80667858, &lit_5293); +COMPILER_STRIP_GATE(0x80667858, &lit_5293); #pragma pop /* 80667860-80667864 0001C8 0004+00 0/2 0/0 0/0 .rodata @5294 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5294 = -30.0f; -COMPILER_STRIP_GATE(80667860, &lit_5294); +COMPILER_STRIP_GATE(0x80667860, &lit_5294); #pragma pop /* 80667864-80667868 0001CC 0004+00 0/2 0/0 0/0 .rodata @5295 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5295 = 10.0f; -COMPILER_STRIP_GATE(80667864, &lit_5295); +COMPILER_STRIP_GATE(0x80667864, &lit_5295); #pragma pop /* 80667868-8066786C 0001D0 0004+00 0/1 0/0 0/0 .rodata @5296 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5296 = 0.75f; -COMPILER_STRIP_GATE(80667868, &lit_5296); +COMPILER_STRIP_GATE(0x80667868, &lit_5296); #pragma pop /* 80664C9C-80665514 0016DC 0878+00 1/1 0/0 0/0 .text posMove__11daCstatue_cFv */ @@ -1453,7 +1453,7 @@ asm cM3dGPla::~cM3dGPla() { SECTION_RODATA static u8 const localTop[12] = { 0x00, 0x00, 0x00, 0x00, 0x42, 0xB4, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8066786C, &localTop); +COMPILER_STRIP_GATE(0x8066786C, &localTop); #pragma pop /* 80667878-80667884 0001E0 000C+00 0/1 0/0 0/0 .rodata localRoot$5305 */ @@ -1462,7 +1462,7 @@ COMPILER_STRIP_GATE(8066786C, &localTop); SECTION_RODATA static u8 const localRoot[12] = { 0x00, 0x00, 0x00, 0x00, 0xC1, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80667878, &localRoot); +COMPILER_STRIP_GATE(0x80667878, &localRoot); #pragma pop /* 80667884-80667890 0001EC 000C+00 0/1 0/0 0/0 .rodata hammerSide0$5306 */ @@ -1471,7 +1471,7 @@ COMPILER_STRIP_GATE(80667878, &localRoot); SECTION_RODATA static u8 const hammerSide0[12] = { 0xC2, 0x20, 0x00, 0x00, 0x42, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80667884, &hammerSide0); +COMPILER_STRIP_GATE(0x80667884, &hammerSide0); #pragma pop /* 80667890-8066789C 0001F8 000C+00 0/1 0/0 0/0 .rodata hammerSide1$5307 */ @@ -1480,7 +1480,7 @@ COMPILER_STRIP_GATE(80667884, &hammerSide0); SECTION_RODATA static u8 const hammerSide1[12] = { 0x42, 0x20, 0x00, 0x00, 0x42, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80667890, &hammerSide1); +COMPILER_STRIP_GATE(0x80667890, &hammerSide1); #pragma pop /* 8066789C-806678A4 000204 0008+00 0/1 0/0 0/0 .rodata effName$5309 */ @@ -1489,7 +1489,7 @@ COMPILER_STRIP_GATE(80667890, &hammerSide1); SECTION_RODATA static u8 const effName[8] = { 0x09, 0xD0, 0x09, 0xD1, 0x09, 0xD2, 0x09, 0xD5, }; -COMPILER_STRIP_GATE(8066789C, &effName); +COMPILER_STRIP_GATE(0x8066789C, &effName); #pragma pop /* 806678A4-806678B8 00020C 0012+02 0/1 0/0 0/0 .rodata bossJntIdx$5353 */ @@ -1518,7 +1518,7 @@ SECTION_RODATA static u8 const bossJntIdx[18 + 2 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(806678A4, &bossJntIdx); +COMPILER_STRIP_GATE(0x806678A4, &bossJntIdx); #pragma pop /* 806678B8-80667924 000220 006C+00 0/1 0/0 0/0 .rodata bossLocalOffset$5354 */ @@ -1533,56 +1533,56 @@ SECTION_RODATA static u8 const bossLocalOffset[108] = { 0x00, 0x00, 0x00, 0x00, 0x43, 0xBE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x43, 0x48, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC1, 0xA0, 0x00, 0x00, }; -COMPILER_STRIP_GATE(806678B8, &bossLocalOffset); +COMPILER_STRIP_GATE(0x806678B8, &bossLocalOffset); #pragma pop /* 80667924-80667928 00028C 0004+00 0/1 0/0 0/0 .rodata @5620 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5620 = 36.0f; -COMPILER_STRIP_GATE(80667924, &lit_5620); +COMPILER_STRIP_GATE(0x80667924, &lit_5620); #pragma pop /* 80667928-8066792C 000290 0004+00 0/1 0/0 0/0 .rodata @5621 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5621 = 13.0f; -COMPILER_STRIP_GATE(80667928, &lit_5621); +COMPILER_STRIP_GATE(0x80667928, &lit_5621); #pragma pop /* 8066792C-80667930 000294 0004+00 0/1 0/0 0/0 .rodata @5622 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5622 = 17.0f; -COMPILER_STRIP_GATE(8066792C, &lit_5622); +COMPILER_STRIP_GATE(0x8066792C, &lit_5622); #pragma pop /* 80667930-80667934 000298 0004+00 0/1 0/0 0/0 .rodata @5623 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5623 = 160000.0f; -COMPILER_STRIP_GATE(80667930, &lit_5623); +COMPILER_STRIP_GATE(0x80667930, &lit_5623); #pragma pop /* 80667934-80667938 00029C 0004+00 0/1 0/0 0/0 .rodata @5624 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5624 = 640000.0f; -COMPILER_STRIP_GATE(80667934, &lit_5624); +COMPILER_STRIP_GATE(0x80667934, &lit_5624); #pragma pop /* 80667938-8066793C 0002A0 0004+00 0/1 0/0 0/0 .rodata @5625 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5625 = 240.0f; -COMPILER_STRIP_GATE(80667938, &lit_5625); +COMPILER_STRIP_GATE(0x80667938, &lit_5625); #pragma pop /* 8066793C-80667940 0002A4 0004+00 0/1 0/0 0/0 .rodata @5626 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5626 = 2.0f; -COMPILER_STRIP_GATE(8066793C, &lit_5626); +COMPILER_STRIP_GATE(0x8066793C, &lit_5626); #pragma pop /* 80667B80-80667B84 000008 0001+03 1/1 0/0 0/0 .bss @1109 */ @@ -1718,7 +1718,7 @@ asm void daCstatue_c::checkHammerReverse() { SECTION_RODATA static u8 const hitEffectCenter[12] = { 0xC0, 0x01, 0xFB, 0xE7, 0x42, 0xF0, 0xE0, 0xC4, 0x43, 0xA0, 0x3B, 0xC8, }; -COMPILER_STRIP_GATE(80667940, &hitEffectCenter); +COMPILER_STRIP_GATE(0x80667940, &hitEffectCenter); #pragma pop /* 8066794C-80667958 0002B4 000C+00 0/1 0/0 0/0 .rodata hitEffectEye$5689 */ @@ -1727,7 +1727,7 @@ COMPILER_STRIP_GATE(80667940, &hitEffectCenter); SECTION_RODATA static u8 const hitEffectEye[12] = { 0xC0, 0x01, 0xFB, 0xE7, 0xC2, 0xA1, 0x85, 0xA2, 0x44, 0x20, 0xB4, 0xFE, }; -COMPILER_STRIP_GATE(8066794C, &hitEffectEye); +COMPILER_STRIP_GATE(0x8066794C, &hitEffectEye); #pragma pop /* 80667958-80667964 0002C0 000C+00 0/1 0/0 0/0 .rodata behindCenter$5690 */ @@ -1736,7 +1736,7 @@ COMPILER_STRIP_GATE(8066794C, &hitEffectEye); SECTION_RODATA static u8 const behindCenter[12] = { 0x41, 0xC3, 0xF9, 0xDB, 0x43, 0x4B, 0x1D, 0x30, 0xC2, 0xBE, 0xFA, 0x60, }; -COMPILER_STRIP_GATE(80667958, &behindCenter); +COMPILER_STRIP_GATE(0x80667958, &behindCenter); #pragma pop /* 80667964-80667970 0002CC 000C+00 0/1 0/0 0/0 .rodata behindEye$5691 */ @@ -1745,7 +1745,7 @@ COMPILER_STRIP_GATE(80667958, &behindCenter); SECTION_RODATA static u8 const behindEye[12] = { 0x42, 0xF8, 0xCC, 0x4A, 0x43, 0x46, 0x44, 0x9C, 0xC3, 0xE7, 0x0B, 0x20, }; -COMPILER_STRIP_GATE(80667964, &behindEye); +COMPILER_STRIP_GATE(0x80667964, &behindEye); #pragma pop /* 80667970-8066797C 0002D8 000C+00 0/1 0/0 0/0 .rodata startAnimeCenter$5692 */ @@ -1754,7 +1754,7 @@ COMPILER_STRIP_GATE(80667964, &behindEye); SECTION_RODATA static u8 const startAnimeCenter[12] = { 0x42, 0xA1, 0x35, 0x3F, 0x43, 0x86, 0x81, 0xCA, 0x43, 0x93, 0x19, 0xFC, }; -COMPILER_STRIP_GATE(80667970, &startAnimeCenter); +COMPILER_STRIP_GATE(0x80667970, &startAnimeCenter); #pragma pop /* 8066797C-80667988 0002E4 000C+00 0/1 0/0 0/0 .rodata startAnimeEye$5693 */ @@ -1763,7 +1763,7 @@ COMPILER_STRIP_GATE(80667970, &startAnimeCenter); SECTION_RODATA static u8 const startAnimeEye[12] = { 0x43, 0x2A, 0xFE, 0xFA, 0x43, 0x88, 0x52, 0x6E, 0x44, 0x23, 0x8C, 0x18, }; -COMPILER_STRIP_GATE(8066797C, &startAnimeEye); +COMPILER_STRIP_GATE(0x8066797C, &startAnimeEye); #pragma pop /* 80665F80-80666390 0029C0 0410+00 1/1 0/0 0/0 .text setDemo__11daCstatue_cFv */ @@ -1781,21 +1781,21 @@ asm void daCstatue_c::setDemo() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6088 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(80667988, &lit_6088); +COMPILER_STRIP_GATE(0x80667988, &lit_6088); #pragma pop /* 8066798C-80667990 0002F4 0004+00 0/1 0/0 0/0 .rodata @6089 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_6089 = 0x3A83126F; -COMPILER_STRIP_GATE(8066798C, &lit_6089); +COMPILER_STRIP_GATE(0x8066798C, &lit_6089); #pragma pop /* 80667990-80667994 0002F8 0004+00 0/2 0/0 0/0 .rodata @6090 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6090 = 5.0f; -COMPILER_STRIP_GATE(80667990, &lit_6090); +COMPILER_STRIP_GATE(0x80667990, &lit_6090); #pragma pop /* 80666390-80666B80 002DD0 07F0+00 1/1 0/0 0/0 .text setAnime__11daCstatue_cFv */ @@ -1835,7 +1835,7 @@ SECTION_RODATA static u8 const brkIdx_6108[10 + 2 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80667994, &brkIdx_6108); +COMPILER_STRIP_GATE(0x80667994, &brkIdx_6108); /* 80666BF8-80666C38 003638 0040+00 2/2 0/0 0/0 .text initStopBrkBtk__11daCstatue_cFv */ #pragma push @@ -1866,7 +1866,7 @@ SECTION_RODATA static u8 const brkIdx_6115[10 + 2 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(806679A0, &brkIdx_6115); +COMPILER_STRIP_GATE(0x806679A0, &brkIdx_6115); #pragma pop /* 80666C38-80666DE8 003678 01B0+00 2/2 0/0 0/0 .text initStartBrkBtk__11daCstatue_cFv */ @@ -1884,7 +1884,7 @@ asm void daCstatue_c::initStartBrkBtk() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6396 = 50.0f; -COMPILER_STRIP_GATE(806679AC, &lit_6396); +COMPILER_STRIP_GATE(0x806679AC, &lit_6396); #pragma pop /* 80666DE8-80667418 003828 0630+00 1/1 0/0 0/0 .text execute__11daCstatue_cFv */ diff --git a/rel/d/a/d_a_demo00/d_a_demo00.cpp b/rel/d/a/d_a_demo00/d_a_demo00.cpp index 02ee8cbd6d3..e1a99c75290 100644 --- a/rel/d/a/d_a_demo00/d_a_demo00.cpp +++ b/rel/d/a/d_a_demo00/d_a_demo00.cpp @@ -24,12 +24,12 @@ struct mDoGph_gInf_c { static u8 mFrameBufferTimg[4]; }; -struct J3DDeformData {}; - struct J3DSkinDeform { /* 8032C96C */ J3DSkinDeform(); }; +struct J3DDeformData {}; + struct J3DModel { /* 80327A2C */ void setDeformData(J3DDeformData*, u32); /* 80327AA0 */ void setSkinDeform(J3DSkinDeform*, u32); @@ -52,13 +52,13 @@ struct mDoExt_invisibleModel { /* 8000E7C0 */ void entryDL(cXyz*); }; -struct J3DAnmColor {}; +struct J3DAnmTextureSRTKey {}; struct J3DAnmTexPattern {}; struct J3DAnmTevRegKey {}; -struct J3DAnmTextureSRTKey {}; +struct J3DAnmColor {}; struct J3DMaterialTable { /* 8032F64C */ void removeMatColorAnimator(J3DAnmColor*); @@ -97,20 +97,20 @@ struct mDoExt_baseAnm { /* 8000D428 */ void play(); }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; +struct J3DAnmTransform {}; + +struct J3DModelData {}; + struct Z2Creature { /* 802C03C8 */ Z2Creature(); /* 802C0420 */ ~Z2Creature(); /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -130,10 +130,10 @@ struct mDoExt_3DlineMatSortPacket { /* 80014738 */ void setMat(mDoExt_3DlineMat_c*); }; -struct dKy_tevstr_c {}; - struct ResTIMG {}; +struct dKy_tevstr_c {}; + struct mDoExt_3DlineMat1_c { /* 80013360 */ void init(u16, u16, ResTIMG*, int); /* 80013FB0 */ void update(int, _GXColor&, dKy_tevstr_c*); @@ -547,6 +547,12 @@ asm cXyz::~cXyz() { #pragma pop /* ############################################################################################## */ +/* 804A8998-804A8998 000138 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_804A8998 = "V_24_tri_joint"; +#pragma pop + /* 804A89C0-804A89CC 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -817,7 +823,7 @@ asm cM3dGPla::~cM3dGPla() { SECTION_RODATA static u8 const lit_3727[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(804A8860, &lit_3727); +COMPILER_STRIP_GATE(0x804A8860, &lit_3727); /* 804A886C-804A8870 00000C 0004+00 3/10 0/0 0/0 .rodata @4004 */ SECTION_RODATA static u8 const lit_4004[4] = { @@ -826,7 +832,7 @@ SECTION_RODATA static u8 const lit_4004[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(804A886C, &lit_4004); +COMPILER_STRIP_GATE(0x804A886C, &lit_4004); /* 804A4520-804A45A0 000300 0080+00 1/1 0/0 0/0 .text get_foward_angle__FP4cXyzP4cXyzPsPs */ @@ -844,12 +850,12 @@ static asm void get_foward_angle(cXyz* param_0, cXyz* param_1, s16* param_2, s16 #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4122 = 1000.0f; -COMPILER_STRIP_GATE(804A8870, &lit_4122); +COMPILER_STRIP_GATE(0x804A8870, &lit_4122); #pragma pop /* 804A8874-804A8878 000014 0004+00 1/2 0/0 0/0 .rodata @4123 */ SECTION_RODATA static f32 const lit_4123 = 10000000.0f; -COMPILER_STRIP_GATE(804A8874, &lit_4123); +COMPILER_STRIP_GATE(0x804A8874, &lit_4123); /* 804A8878-804A8880 000018 0008+00 0/3 0/0 0/0 .rodata @4124 */ #pragma push @@ -857,7 +863,7 @@ COMPILER_STRIP_GATE(804A8874, &lit_4123); SECTION_RODATA static u8 const lit_4124[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(804A8878, &lit_4124); +COMPILER_STRIP_GATE(0x804A8878, &lit_4124); #pragma pop /* 804A8880-804A8888 000020 0008+00 0/3 0/0 0/0 .rodata @4125 */ @@ -866,7 +872,7 @@ COMPILER_STRIP_GATE(804A8878, &lit_4124); SECTION_RODATA static u8 const lit_4125[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(804A8880, &lit_4125); +COMPILER_STRIP_GATE(0x804A8880, &lit_4125); #pragma pop /* 804A8888-804A8890 000028 0008+00 0/3 0/0 0/0 .rodata @4126 */ @@ -875,21 +881,21 @@ COMPILER_STRIP_GATE(804A8880, &lit_4125); SECTION_RODATA static u8 const lit_4126[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(804A8888, &lit_4126); +COMPILER_STRIP_GATE(0x804A8888, &lit_4126); #pragma pop /* 804A8890-804A8894 000030 0004+00 0/1 0/0 0/0 .rodata @4127 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4127 = 1.5f; -COMPILER_STRIP_GATE(804A8890, &lit_4127); +COMPILER_STRIP_GATE(0x804A8890, &lit_4127); #pragma pop /* 804A8894-804A8898 000034 0004+00 0/1 0/0 0/0 .rodata @4128 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4128 = -1000000000.0f; -COMPILER_STRIP_GATE(804A8894, &lit_4128); +COMPILER_STRIP_GATE(0x804A8894, &lit_4128); #pragma pop /* 804A45A0-804A4948 000380 03A8+00 2/2 0/0 0/0 .text setBaseMtx__10daDemo00_cFv */ @@ -907,35 +913,35 @@ asm void daDemo00_c::setBaseMtx() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4284 = 100000000.0f; -COMPILER_STRIP_GATE(804A8898, &lit_4284); +COMPILER_STRIP_GATE(0x804A8898, &lit_4284); #pragma pop /* 804A889C-804A88A0 00003C 0004+00 0/1 0/0 0/0 .rodata @4285 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4285 = -100000000.0f; -COMPILER_STRIP_GATE(804A889C, &lit_4285); +COMPILER_STRIP_GATE(0x804A889C, &lit_4285); #pragma pop /* 804A88A0-804A88A4 000040 0004+00 0/2 0/0 0/0 .rodata @4286 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4286 = 0.5f; -COMPILER_STRIP_GATE(804A88A0, &lit_4286); +COMPILER_STRIP_GATE(0x804A88A0, &lit_4286); #pragma pop /* 804A88A4-804A88A8 000044 0004+00 0/5 0/0 0/0 .rodata @4287 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4287 = 3.0f; -COMPILER_STRIP_GATE(804A88A4, &lit_4287); +COMPILER_STRIP_GATE(0x804A88A4, &lit_4287); #pragma pop /* 804A88A8-804A88AC 000048 0004+00 0/1 0/0 0/0 .rodata @4288 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4288 = 0.25f; -COMPILER_STRIP_GATE(804A88A8, &lit_4288); +COMPILER_STRIP_GATE(0x804A88A8, &lit_4288); #pragma pop /* 804A4948-804A4D48 000728 0400+00 1/1 0/0 0/0 .text setShadowSize__10daDemo00_cFv */ @@ -948,6 +954,14 @@ asm void daDemo00_c::setShadowSize() { } #pragma pop +/* ############################################################################################## */ +/* 804A8998-804A8998 000138 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_804A89A7 = "B_dummy"; +SECTION_DEAD static char const* const stringBase_804A89AF = "cy_kankyo"; +#pragma pop + /* 804A4D48-804A4F54 000B28 020C+00 1/1 0/0 0/0 .text awaCheck__FP8J3DModel */ #pragma push #pragma optimization_level 0 @@ -974,7 +988,7 @@ static asm void createHeapCallBack(fopAc_ac_c* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4654 = 1.0f; -COMPILER_STRIP_GATE(804A88AC, &lit_4654); +COMPILER_STRIP_GATE(0x804A88AC, &lit_4654); #pragma pop /* 804A88B0-804A88B8 000050 0004+04 0/2 0/0 0/0 .rodata @4655 */ @@ -985,7 +999,13 @@ SECTION_RODATA static f32 const lit_4655[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(804A88B0, &lit_4655); +COMPILER_STRIP_GATE(0x804A88B0, &lit_4655); +#pragma pop + +/* 804A8998-804A8998 000138 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_804A89B9 = "Always"; #pragma pop /* 804A4F74-804A5750 000D54 07DC+00 1/1 0/0 0/0 .text createHeap__10daDemo00_cFv */ @@ -1013,7 +1033,7 @@ asm J3DFrameCtrl::~J3DFrameCtrl() { SECTION_RODATA static u8 const lit_4719[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(804A88B8, &lit_4719); +COMPILER_STRIP_GATE(0x804A88B8, &lit_4719); /* 804A5798-804A594C 001578 01B4+00 2/0 0/0 0/0 .text actStandby__10daDemo00_cFP13dDemo_actor_c */ #pragma push @@ -1030,21 +1050,21 @@ asm void daDemo00_c::actStandby(dDemo_actor_c* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4990 = -1.0f; -COMPILER_STRIP_GATE(804A88C0, &lit_4990); +COMPILER_STRIP_GATE(0x804A88C0, &lit_4990); #pragma pop /* 804A88C4-804A88C8 000064 0004+00 0/2 0/0 0/0 .rodata @4991 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4991 = 100.0f; -COMPILER_STRIP_GATE(804A88C4, &lit_4991); +COMPILER_STRIP_GATE(0x804A88C4, &lit_4991); #pragma pop /* 804A88C8-804A88CC 000068 0004+00 0/2 0/0 0/0 .rodata @4992 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4992 = 20.0f; -COMPILER_STRIP_GATE(804A88C8, &lit_4992); +COMPILER_STRIP_GATE(0x804A88C8, &lit_4992); #pragma pop /* 804A594C-804A604C 00172C 0700+00 1/0 0/0 0/0 .text @@ -1088,62 +1108,62 @@ SECTION_RODATA static u8 const data_804A88CC[4] = { 0xFF, 0xFF, }; -COMPILER_STRIP_GATE(804A88CC, &data_804A88CC); +COMPILER_STRIP_GATE(0x804A88CC, &data_804A88CC); /* 804A88D0-804A88D4 000070 0004+00 0/1 0/0 0/0 .rodata @5279 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5279 = 6.0f; -COMPILER_STRIP_GATE(804A88D0, &lit_5279); +COMPILER_STRIP_GATE(0x804A88D0, &lit_5279); #pragma pop /* 804A88D4-804A88D8 000074 0004+00 0/1 0/0 0/0 .rodata @5280 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5280 = -5.0f; -COMPILER_STRIP_GATE(804A88D4, &lit_5280); +COMPILER_STRIP_GATE(0x804A88D4, &lit_5280); #pragma pop /* 804A88D8-804A88DC 000078 0004+00 0/1 0/0 0/0 .rodata @5281 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5281 = 130.0f; -COMPILER_STRIP_GATE(804A88D8, &lit_5281); +COMPILER_STRIP_GATE(0x804A88D8, &lit_5281); #pragma pop /* 804A88DC-804A88E0 00007C 0004+00 0/1 0/0 0/0 .rodata @5282 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5282 = -30.0f; -COMPILER_STRIP_GATE(804A88DC, &lit_5282); +COMPILER_STRIP_GATE(0x804A88DC, &lit_5282); #pragma pop /* 804A88E0-804A88E4 000080 0004+00 0/1 0/0 0/0 .rodata @5283 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5283 = 78.0f; -COMPILER_STRIP_GATE(804A88E0, &lit_5283); +COMPILER_STRIP_GATE(0x804A88E0, &lit_5283); #pragma pop /* 804A88E4-804A88E8 000084 0004+00 0/1 0/0 0/0 .rodata @5284 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5284 = 60.0f; -COMPILER_STRIP_GATE(804A88E4, &lit_5284); +COMPILER_STRIP_GATE(0x804A88E4, &lit_5284); #pragma pop /* 804A88E8-804A88EC 000088 0004+00 0/4 0/0 0/0 .rodata @5285 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5285 = 15.0f; -COMPILER_STRIP_GATE(804A88E8, &lit_5285); +COMPILER_STRIP_GATE(0x804A88E8, &lit_5285); #pragma pop /* 804A88EC-804A88F0 00008C 0004+00 0/1 0/0 0/0 .rodata @5286 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5286 = 32768.0f; -COMPILER_STRIP_GATE(804A88EC, &lit_5286); +COMPILER_STRIP_GATE(0x804A88EC, &lit_5286); #pragma pop /* 804A61F0-804A6428 001FD0 0238+00 1/1 0/0 0/0 .text teduna_calc__FP4cXyzP4cXyzP4cXyzsi @@ -1162,119 +1182,119 @@ static asm void teduna_calc(cXyz* param_0, cXyz* param_1, cXyz* param_2, s16 par #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5403 = 9.0f; -COMPILER_STRIP_GATE(804A88F0, &lit_5403); +COMPILER_STRIP_GATE(0x804A88F0, &lit_5403); #pragma pop /* 804A88F4-804A88F8 000094 0004+00 0/1 0/0 0/0 .rodata @5404 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5404 = 107.0f; -COMPILER_STRIP_GATE(804A88F4, &lit_5404); +COMPILER_STRIP_GATE(0x804A88F4, &lit_5404); #pragma pop /* 804A88F8-804A88FC 000098 0004+00 0/1 0/0 0/0 .rodata @5405 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5405 = -32.0f; -COMPILER_STRIP_GATE(804A88F8, &lit_5405); +COMPILER_STRIP_GATE(0x804A88F8, &lit_5405); #pragma pop /* 804A88FC-804A8900 00009C 0004+00 0/1 0/0 0/0 .rodata @5406 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5406 = -68.0f; -COMPILER_STRIP_GATE(804A88FC, &lit_5406); +COMPILER_STRIP_GATE(0x804A88FC, &lit_5406); #pragma pop /* 804A8900-804A8904 0000A0 0004+00 0/1 0/0 0/0 .rodata @5407 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5407 = 79.0f; -COMPILER_STRIP_GATE(804A8900, &lit_5407); +COMPILER_STRIP_GATE(0x804A8900, &lit_5407); #pragma pop /* 804A8904-804A8908 0000A4 0004+00 0/1 0/0 0/0 .rodata @5408 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5408 = -26.0f; -COMPILER_STRIP_GATE(804A8904, &lit_5408); +COMPILER_STRIP_GATE(0x804A8904, &lit_5408); #pragma pop /* 804A8908-804A890C 0000A8 0004+00 0/1 0/0 0/0 .rodata @5409 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5409 = -48.0f; -COMPILER_STRIP_GATE(804A8908, &lit_5409); +COMPILER_STRIP_GATE(0x804A8908, &lit_5409); #pragma pop /* 804A890C-804A8910 0000AC 0004+00 0/1 0/0 0/0 .rodata @5410 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5410 = 61.0f; -COMPILER_STRIP_GATE(804A890C, &lit_5410); +COMPILER_STRIP_GATE(0x804A890C, &lit_5410); #pragma pop /* 804A8910-804A8914 0000B0 0004+00 0/1 0/0 0/0 .rodata @5411 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5411 = 18.0f; -COMPILER_STRIP_GATE(804A8910, &lit_5411); +COMPILER_STRIP_GATE(0x804A8910, &lit_5411); #pragma pop /* 804A8914-804A8918 0000B4 0004+00 0/1 0/0 0/0 .rodata @5412 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5412 = 191.0f; -COMPILER_STRIP_GATE(804A8914, &lit_5412); +COMPILER_STRIP_GATE(0x804A8914, &lit_5412); #pragma pop /* 804A8918-804A891C 0000B8 0004+00 0/1 0/0 0/0 .rodata @5413 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5413 = 28.0f; -COMPILER_STRIP_GATE(804A8918, &lit_5413); +COMPILER_STRIP_GATE(0x804A8918, &lit_5413); #pragma pop /* 804A891C-804A8920 0000BC 0004+00 0/1 0/0 0/0 .rodata @5414 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5414 = -80.0f; -COMPILER_STRIP_GATE(804A891C, &lit_5414); +COMPILER_STRIP_GATE(0x804A891C, &lit_5414); #pragma pop /* 804A8920-804A8924 0000C0 0004+00 0/1 0/0 0/0 .rodata @5415 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5415 = -15.0f; -COMPILER_STRIP_GATE(804A8920, &lit_5415); +COMPILER_STRIP_GATE(0x804A8920, &lit_5415); #pragma pop /* 804A8924-804A8928 0000C4 0004+00 0/1 0/0 0/0 .rodata @5416 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5416 = 68.0f; -COMPILER_STRIP_GATE(804A8924, &lit_5416); +COMPILER_STRIP_GATE(0x804A8924, &lit_5416); #pragma pop /* 804A8928-804A892C 0000C8 0004+00 0/1 0/0 0/0 .rodata @5417 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5417 = 48.0f; -COMPILER_STRIP_GATE(804A8928, &lit_5417); +COMPILER_STRIP_GATE(0x804A8928, &lit_5417); #pragma pop /* 804A892C-804A8930 0000CC 0004+00 0/1 0/0 0/0 .rodata @5418 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5418 = 40.0f; -COMPILER_STRIP_GATE(804A892C, &lit_5418); +COMPILER_STRIP_GATE(0x804A892C, &lit_5418); #pragma pop /* 804A8930-804A8934 0000D0 0004+00 0/2 0/0 0/0 .rodata @5419 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5419 = -12.0f; -COMPILER_STRIP_GATE(804A8930, &lit_5419); +COMPILER_STRIP_GATE(0x804A8930, &lit_5419); #pragma pop /* 804A8C18-804A8C1C 000008 0001+03 2/2 0/0 0/0 .bss @1109 */ @@ -1433,21 +1453,21 @@ static asm void teduna_ganon_hand_set(J3DModel* param_0, int param_1, int param_ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5483 = 65536.0f; -COMPILER_STRIP_GATE(804A8934, &lit_5483); +COMPILER_STRIP_GATE(0x804A8934, &lit_5483); #pragma pop /* 804A8938-804A893C 0000D8 0004+00 0/1 0/0 0/0 .rodata @5484 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5484 = 4.0f / 5.0f; -COMPILER_STRIP_GATE(804A8938, &lit_5484); +COMPILER_STRIP_GATE(0x804A8938, &lit_5484); #pragma pop /* 804A893C-804A8940 0000DC 0004+00 0/2 0/0 0/0 .rodata @5485 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5485 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(804A893C, &lit_5485); +COMPILER_STRIP_GATE(0x804A893C, &lit_5485); #pragma pop /* 804A692C-804A6C48 00270C 031C+00 1/1 0/0 0/0 .text ke_control__FP10daDemo00_cP12demo_s1_ke_sif @@ -1466,21 +1486,21 @@ static asm void ke_control(daDemo00_c* param_0, demo_s1_ke_s* param_1, int param #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5509 = 3.0f / 5.0f; -COMPILER_STRIP_GATE(804A8940, &lit_5509); +COMPILER_STRIP_GATE(0x804A8940, &lit_5509); #pragma pop /* 804A8944-804A8948 0000E4 0004+00 0/1 0/0 0/0 .rodata @5510 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5510 = 3.5f; -COMPILER_STRIP_GATE(804A8944, &lit_5510); +COMPILER_STRIP_GATE(0x804A8944, &lit_5510); #pragma pop /* 804A8948-804A894C 0000E8 0004+00 0/1 0/0 0/0 .rodata @5511 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5511 = 9.0f / 5.0f; -COMPILER_STRIP_GATE(804A8948, &lit_5511); +COMPILER_STRIP_GATE(0x804A8948, &lit_5511); #pragma pop /* 804A6C48-804A6D20 002A28 00D8+00 1/1 0/0 0/0 .text @@ -1500,49 +1520,49 @@ static asm void ke_move(daDemo00_c* param_0, mDoExt_3DlineMat0_c* param_1, demo_ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5560 = 2000.0f; -COMPILER_STRIP_GATE(804A894C, &lit_5560); +COMPILER_STRIP_GATE(0x804A894C, &lit_5560); #pragma pop /* 804A8950-804A8954 0000F0 0004+00 0/1 0/0 0/0 .rodata @5561 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5561 = 7.5f; -COMPILER_STRIP_GATE(804A8950, &lit_5561); +COMPILER_STRIP_GATE(0x804A8950, &lit_5561); #pragma pop /* 804A8954-804A8958 0000F4 0004+00 0/1 0/0 0/0 .rodata @5562 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5562 = 2.25f; -COMPILER_STRIP_GATE(804A8954, &lit_5562); +COMPILER_STRIP_GATE(0x804A8954, &lit_5562); #pragma pop /* 804A8958-804A895C 0000F8 0004+00 0/1 0/0 0/0 .rodata @5563 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5563 = 10.0f; -COMPILER_STRIP_GATE(804A8958, &lit_5563); +COMPILER_STRIP_GATE(0x804A8958, &lit_5563); #pragma pop /* 804A895C-804A8960 0000FC 0004+00 0/1 0/0 0/0 .rodata @5564 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5564 = 8.0f; -COMPILER_STRIP_GATE(804A895C, &lit_5564); +COMPILER_STRIP_GATE(0x804A895C, &lit_5564); #pragma pop /* 804A8960-804A8964 000100 0004+00 0/1 0/0 0/0 .rodata @5565 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5565 = 30.0f; -COMPILER_STRIP_GATE(804A8960, &lit_5565); +COMPILER_STRIP_GATE(0x804A8960, &lit_5565); #pragma pop /* 804A8964-804A8968 000104 0004+00 0/1 0/0 0/0 .rodata @5566 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5566 = 35.0f; -COMPILER_STRIP_GATE(804A8964, &lit_5566); +COMPILER_STRIP_GATE(0x804A8964, &lit_5566); #pragma pop /* 804A6D20-804A6F74 002B00 0254+00 1/1 0/0 0/0 .text ke_set__FP10daDemo00_c */ @@ -1570,70 +1590,70 @@ static asm void daDemo00_Draw(daDemo00_c* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6201 = 200.0f; -COMPILER_STRIP_GATE(804A8968, &lit_6201); +COMPILER_STRIP_GATE(0x804A8968, &lit_6201); #pragma pop /* 804A896C-804A8970 00010C 0004+00 0/1 0/0 0/0 .rodata @6202 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6202 = -700.0f; -COMPILER_STRIP_GATE(804A896C, &lit_6202); +COMPILER_STRIP_GATE(0x804A896C, &lit_6202); #pragma pop /* 804A8970-804A8974 000110 0004+00 0/1 0/0 0/0 .rodata @6203 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6203 = 1600.0f; -COMPILER_STRIP_GATE(804A8970, &lit_6203); +COMPILER_STRIP_GATE(0x804A8970, &lit_6203); #pragma pop /* 804A8974-804A8978 000114 0004+00 0/1 0/0 0/0 .rodata @6204 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6204 = -200.0f; -COMPILER_STRIP_GATE(804A8974, &lit_6204); +COMPILER_STRIP_GATE(0x804A8974, &lit_6204); #pragma pop /* 804A8978-804A897C 000118 0004+00 0/1 0/0 0/0 .rodata @6205 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6205 = 600.0f; -COMPILER_STRIP_GATE(804A8978, &lit_6205); +COMPILER_STRIP_GATE(0x804A8978, &lit_6205); #pragma pop /* 804A897C-804A8980 00011C 0004+00 0/1 0/0 0/0 .rodata @6206 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6206 = 50.0f; -COMPILER_STRIP_GATE(804A897C, &lit_6206); +COMPILER_STRIP_GATE(0x804A897C, &lit_6206); #pragma pop /* 804A8980-804A8984 000120 0004+00 0/1 0/0 0/0 .rodata @6207 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6207 = 2.0f; -COMPILER_STRIP_GATE(804A8980, &lit_6207); +COMPILER_STRIP_GATE(0x804A8980, &lit_6207); #pragma pop /* 804A8984-804A8988 000124 0004+00 0/1 0/0 0/0 .rodata @6208 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6208 = 10000.0f; -COMPILER_STRIP_GATE(804A8984, &lit_6208); +COMPILER_STRIP_GATE(0x804A8984, &lit_6208); #pragma pop /* 804A8988-804A898C 000128 0004+00 0/1 0/0 0/0 .rodata @6209 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6209 = 17.0f / 20.0f; -COMPILER_STRIP_GATE(804A8988, &lit_6209); +COMPILER_STRIP_GATE(0x804A8988, &lit_6209); #pragma pop /* 804A898C-804A8990 00012C 0004+00 0/1 0/0 0/0 .rodata @6210 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_6210 = 0x38D1B717; -COMPILER_STRIP_GATE(804A898C, &lit_6210); +COMPILER_STRIP_GATE(0x804A898C, &lit_6210); #pragma pop /* 804A6F94-804A7B88 002D74 0BF4+00 1/1 0/0 0/0 .text draw__10daDemo00_cFv */ @@ -1719,7 +1739,7 @@ asm void __sinit_d_a_demo00_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_804A8720 = (void*)__sinit_d_a_demo00_cpp; +REGISTER_CTORS(0x804A8720, __sinit_d_a_demo00_cpp); #pragma pop /* 804A87DC-804A8814 0045BC 0038+00 1/1 0/0 0/0 .text __arraydtor$5213 */ @@ -1747,14 +1767,14 @@ asm void func_804A8814() { #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_6393 = 0x43360B61; -COMPILER_STRIP_GATE(804A8990, &lit_6393); +COMPILER_STRIP_GATE(0x804A8990, &lit_6393); #pragma pop /* 804A8994-804A8998 000134 0004+00 0/0 0/0 0/0 .rodata @6394 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6394 = 90.0f; -COMPILER_STRIP_GATE(804A8994, &lit_6394); +COMPILER_STRIP_GATE(0x804A8994, &lit_6394); #pragma pop /* 804A8E20-804A8E24 000210 0004+00 0/0 0/0 0/0 .bss @@ -1935,12 +1955,4 @@ static u8 data_804A8E80[4]; static u8 data_804A8E84[4]; #pragma pop -/* 804A8998-804A89C0 000138 0028+00 3/2 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_804A8998 = "V_24_tri_joint"; -SECTION_DEAD static char const* const stringBase_804A89A7 = "B_dummy"; -SECTION_DEAD static char const* const stringBase_804A89AF = "cy_kankyo"; -SECTION_DEAD static char const* const stringBase_804A89B9 = "Always"; -#pragma pop +/* 804A8998-804A8998 000138 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/d_a_demo_item/d_a_demo_item.cpp b/rel/d/a/d_a_demo_item/d_a_demo_item.cpp index 83d63990da2..e190aaeb1db 100644 --- a/rel/d/a/d_a_demo_item/d_a_demo_item.cpp +++ b/rel/d/a/d_a_demo_item/d_a_demo_item.cpp @@ -90,10 +90,10 @@ struct dPa_followEcallBack { /* 80049580 */ dPa_followEcallBack(u8, u8); }; -struct _GXColor {}; - struct csXyz {}; +struct _GXColor {}; + struct dPa_control_c { /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, @@ -289,11 +289,11 @@ bool daDitem_c::__CreateHeap() { /* ############################################################################################## */ /* 804E19D4-804E19D8 000000 0004+00 6/6 0/0 0/0 .rodata l_light_color */ SECTION_RODATA static u32 const l_light_color = 0x8C7C6AFF; -COMPILER_STRIP_GATE(804E19D4, &l_light_color); +COMPILER_STRIP_GATE(0x804E19D4, &l_light_color); /* 804E19D8-804E19DC 000004 0004+00 4/7 0/0 0/0 .rodata @3812 */ SECTION_RODATA static f32 const lit_3812 = 1.0f; -COMPILER_STRIP_GATE(804E19D8, &lit_3812); +COMPILER_STRIP_GATE(0x804E19D8, &lit_3812); /* 804E19DC-804E19E0 000008 0004+00 2/6 0/0 0/0 .rodata @3813 */ SECTION_RODATA static u8 const lit_3813[4] = { @@ -302,7 +302,7 @@ SECTION_RODATA static u8 const lit_3813[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(804E19DC, &lit_3813); +COMPILER_STRIP_GATE(0x804E19DC, &lit_3813); /* 804DFBD4-804DFC98 0000F4 00C4+00 1/1 0/0 0/0 .text CreateInit__9daDitem_cFv */ #pragma push @@ -329,21 +329,21 @@ asm void daDitem_c::action() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3927 = 11.0f / 20.0f; -COMPILER_STRIP_GATE(804E19E0, &lit_3927); +COMPILER_STRIP_GATE(0x804E19E0, &lit_3927); #pragma pop /* 804E19E4-804E19E8 000010 0004+00 0/1 0/0 0/0 .rodata @3928 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3928 = 6.0f / 5.0f; -COMPILER_STRIP_GATE(804E19E4, &lit_3928); +COMPILER_STRIP_GATE(0x804E19E4, &lit_3928); #pragma pop /* 804E19E8-804E19EC 000014 0004+00 0/1 0/0 0/0 .rodata @3929 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3929 = 4.0f / 5.0f; -COMPILER_STRIP_GATE(804E19E8, &lit_3929); +COMPILER_STRIP_GATE(0x804E19E8, &lit_3929); #pragma pop /* 804DFD10-804E00A0 000230 0390+00 1/1 0/0 0/0 .text actionStart__9daDitem_cFv */ @@ -369,7 +369,38 @@ asm cXyz::~cXyz() { /* ############################################################################################## */ /* 804E19EC-804E19F0 000018 0004+00 1/1 0/0 0/0 .rodata @4145 */ SECTION_RODATA static f32 const lit_4145 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(804E19EC, &lit_4145); +COMPILER_STRIP_GATE(0x804E19EC, &lit_4145); + +/* 804E1A4C-804E1A4C 000078 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_804E1A4C = "F_SP116"; +SECTION_DEAD static char const* const stringBase_804E1A54 = "F_SP118"; +SECTION_DEAD static char const* const stringBase_804E1A5C = "F_SP121"; +SECTION_DEAD static char const* const stringBase_804E1A64 = "D_SB06"; +SECTION_DEAD static char const* const stringBase_804E1A6B = "F_SP115"; +SECTION_DEAD static char const* const stringBase_804E1A73 = "F_SP108"; +SECTION_DEAD static char const* const stringBase_804E1A7B = "F_SP110"; +SECTION_DEAD static char const* const stringBase_804E1A83 = "F_SP109"; +SECTION_DEAD static char const* const stringBase_804E1A8B = "F_SP126"; +SECTION_DEAD static char const* const stringBase_804E1A93 = "D_MN05"; +SECTION_DEAD static char const* const stringBase_804E1A9A = "D_MN04"; +SECTION_DEAD static char const* const stringBase_804E1AA1 = "D_MN01"; +SECTION_DEAD static char const* const stringBase_804E1AA8 = "D_MN10"; +SECTION_DEAD static char const* const stringBase_804E1AAF = "D_MN11"; +SECTION_DEAD static char const* const stringBase_804E1AB6 = "D_MN06"; +SECTION_DEAD static char const* const stringBase_804E1ABD = "D_MN07"; +SECTION_DEAD static char const* const stringBase_804E1AC4 = "D_MN08"; +SECTION_DEAD static char const* const stringBase_804E1ACB = "F_SP128"; +SECTION_DEAD static char const* const stringBase_804E1AD3 = "F_SP114"; +SECTION_DEAD static char const* const stringBase_804E1ADB = "F_SP00"; +SECTION_DEAD static char const* const stringBase_804E1AE2 = "F_SP127"; +SECTION_DEAD static char const* const stringBase_804E1AEA = "D_SB02"; +SECTION_DEAD static char const* const stringBase_804E1AF1 = "D_SB03"; +SECTION_DEAD static char const* const stringBase_804E1AF8 = "D_SB04"; +SECTION_DEAD static char const* const stringBase_804E1AFF = "D_SB00"; +SECTION_DEAD static char const* const stringBase_804E1B06 = "F_SP117"; +#pragma pop /* 804E00DC-804E0A50 0005FC 0974+00 1/1 0/0 0/0 .text actionEvent__9daDitem_cFv */ #pragma push @@ -386,14 +417,14 @@ asm void daDitem_c::actionEvent() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4175 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(804E19F0, &lit_4175); +COMPILER_STRIP_GATE(0x804E19F0, &lit_4175); #pragma pop /* 804E19F4-804E19F8 000020 0004+00 0/1 0/0 0/0 .rodata @4176 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4176 = 3.0f; -COMPILER_STRIP_GATE(804E19F4, &lit_4176); +COMPILER_STRIP_GATE(0x804E19F4, &lit_4176); #pragma pop /* 804E0A50-804E0B40 000F70 00F0+00 1/1 0/0 0/0 .text actionWaitLightEnd__9daDitem_cFv */ @@ -451,7 +482,7 @@ asm void daDitem_c::endInsectEffect() { SECTION_RODATA static u8 const l_event_reg[12] = { 0xF0, 0xFF, 0xEF, 0xFF, 0xEE, 0xFF, 0xED, 0xFF, 0xEC, 0xFF, 0xEB, 0xFF, }; -COMPILER_STRIP_GATE(804E19F8, &l_event_reg); +COMPILER_STRIP_GATE(0x804E19F8, &l_event_reg); /* 804E0D44-804E0DB4 001264 0070+00 1/1 0/0 0/0 .text onEventReg__9daDitem_cFii */ #pragma push @@ -468,42 +499,42 @@ asm void daDitem_c::onEventReg(int param_0, int param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4361 = 200.0f; -COMPILER_STRIP_GATE(804E1A04, &lit_4361); +COMPILER_STRIP_GATE(0x804E1A04, &lit_4361); #pragma pop /* 804E1A08-804E1A0C 000034 0004+00 0/1 0/0 0/0 .rodata @4362 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4362 = 90.0f; -COMPILER_STRIP_GATE(804E1A08, &lit_4362); +COMPILER_STRIP_GATE(0x804E1A08, &lit_4362); #pragma pop /* 804E1A0C-804E1A10 000038 0004+00 0/1 0/0 0/0 .rodata @4363 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4363 = 50.0f; -COMPILER_STRIP_GATE(804E1A0C, &lit_4363); +COMPILER_STRIP_GATE(0x804E1A0C, &lit_4363); #pragma pop /* 804E1A10-804E1A14 00003C 0004+00 0/1 0/0 0/0 .rodata @4364 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4364 = 30.0f; -COMPILER_STRIP_GATE(804E1A10, &lit_4364); +COMPILER_STRIP_GATE(0x804E1A10, &lit_4364); #pragma pop /* 804E1A14-804E1A18 000040 0004+00 0/1 0/0 0/0 .rodata @4365 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4365 = 140.0f; -COMPILER_STRIP_GATE(804E1A14, &lit_4365); +COMPILER_STRIP_GATE(0x804E1A14, &lit_4365); #pragma pop /* 804E1A18-804E1A1C 000044 0004+00 0/2 0/0 0/0 .rodata @4366 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4366 = 20.0f; -COMPILER_STRIP_GATE(804E1A18, &lit_4366); +COMPILER_STRIP_GATE(0x804E1A18, &lit_4366); #pragma pop /* 804E1BE8-804E1BEC 000008 0001+03 2/2 0/0 0/0 .bss @1109 */ @@ -692,11 +723,11 @@ asm void daDitem_c::initEffectLight() { /* ############################################################################################## */ /* 804E1A1C-804E1A20 000048 0004+00 1/2 0/0 0/0 .rodata @4394 */ SECTION_RODATA static f32 const lit_4394 = 0.5f; -COMPILER_STRIP_GATE(804E1A1C, &lit_4394); +COMPILER_STRIP_GATE(0x804E1A1C, &lit_4394); /* 804E1A20-804E1A24 00004C 0004+00 1/1 0/0 0/0 .rodata @4395 */ SECTION_RODATA static f32 const lit_4395 = 8.0f; -COMPILER_STRIP_GATE(804E1A20, &lit_4395); +COMPILER_STRIP_GATE(0x804E1A20, &lit_4395); /* 804E10D0-804E111C 0015F0 004C+00 2/2 0/0 0/0 .text settingEffectLight__9daDitem_cFv */ #pragma push @@ -738,7 +769,7 @@ void daDitem_c::setListStart() { SECTION_RODATA static u8 const nodisp_mat[8] = { 0x70, 0x61, 0x72, 0x74, 0x73, 0x5F, 0x6D, 0x00, }; -COMPILER_STRIP_GATE(804E1A24, &nodisp_mat); +COMPILER_STRIP_GATE(0x804E1A24, &nodisp_mat); /* 804E1230-804E12C8 001750 0098+00 1/1 0/0 0/0 .text draw_WOOD_STICK__9daDitem_cFv */ #pragma push @@ -876,21 +907,21 @@ asm dBgS_ObjAcch::~dBgS_ObjAcch() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4668 = 7.0f / 20.0f; -COMPILER_STRIP_GATE(804E1A2C, &lit_4668); +COMPILER_STRIP_GATE(0x804E1A2C, &lit_4668); #pragma pop /* 804E1A30-804E1A34 00005C 0004+00 0/1 0/0 0/0 .rodata @4669 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4669 = 10.0f; -COMPILER_STRIP_GATE(804E1A30, &lit_4669); +COMPILER_STRIP_GATE(0x804E1A30, &lit_4669); #pragma pop /* 804E1A34-804E1A38 000060 0004+00 0/1 0/0 0/0 .rodata @4670 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4670 = 15.0f; -COMPILER_STRIP_GATE(804E1A34, &lit_4670); +COMPILER_STRIP_GATE(0x804E1A34, &lit_4670); #pragma pop /* 804E16BC-804E1878 001BDC 01BC+00 1/0 0/0 0/0 .text daDitem_Execute__FP9daDitem_c */ @@ -918,35 +949,35 @@ static asm void daDitem_Draw(daDitem_c* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4716 = 115.0f; -COMPILER_STRIP_GATE(804E1A38, &lit_4716); +COMPILER_STRIP_GATE(0x804E1A38, &lit_4716); #pragma pop /* 804E1A3C-804E1A40 000068 0004+00 0/1 0/0 0/0 .rodata @4717 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4717 = 54.0f; -COMPILER_STRIP_GATE(804E1A3C, &lit_4717); +COMPILER_STRIP_GATE(0x804E1A3C, &lit_4717); #pragma pop /* 804E1A40-804E1A44 00006C 0004+00 0/1 0/0 0/0 .rodata @4718 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4718 = 13.0f; -COMPILER_STRIP_GATE(804E1A40, &lit_4718); +COMPILER_STRIP_GATE(0x804E1A40, &lit_4718); #pragma pop /* 804E1A44-804E1A48 000070 0004+00 0/1 0/0 0/0 .rodata @4719 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4719 = 135.0f; -COMPILER_STRIP_GATE(804E1A44, &lit_4719); +COMPILER_STRIP_GATE(0x804E1A44, &lit_4719); #pragma pop /* 804E1A48-804E1A4C 000074 0004+00 0/1 0/0 0/0 .rodata @4720 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4720 = 57.0f; -COMPILER_STRIP_GATE(804E1A48, &lit_4720); +COMPILER_STRIP_GATE(0x804E1A48, &lit_4720); #pragma pop /* 804E18CC-804E19B0 001DEC 00E4+00 0/0 1/0 0/0 .text __sinit_d_a_demo_item_cpp */ @@ -961,7 +992,7 @@ asm void __sinit_d_a_demo_item_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_804E18CC = (void*)__sinit_d_a_demo_item_cpp; +REGISTER_CTORS(0x804E18CC, __sinit_d_a_demo_item_cpp); #pragma pop /* 804E19B0-804E19B8 001ED0 0008+00 1/0 0/0 0/0 .text @36@__dt__12dBgS_ObjAcchFv */ @@ -1156,34 +1187,4 @@ static u8 data_804E1D18[4]; static u8 data_804E1D1C[4]; #pragma pop -/* 804E1A4C-804E1B0E 000078 00C2+00 1/1 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_804E1A4C = "F_SP116"; -SECTION_DEAD static char const* const stringBase_804E1A54 = "F_SP118"; -SECTION_DEAD static char const* const stringBase_804E1A5C = "F_SP121"; -SECTION_DEAD static char const* const stringBase_804E1A64 = "D_SB06"; -SECTION_DEAD static char const* const stringBase_804E1A6B = "F_SP115"; -SECTION_DEAD static char const* const stringBase_804E1A73 = "F_SP108"; -SECTION_DEAD static char const* const stringBase_804E1A7B = "F_SP110"; -SECTION_DEAD static char const* const stringBase_804E1A83 = "F_SP109"; -SECTION_DEAD static char const* const stringBase_804E1A8B = "F_SP126"; -SECTION_DEAD static char const* const stringBase_804E1A93 = "D_MN05"; -SECTION_DEAD static char const* const stringBase_804E1A9A = "D_MN04"; -SECTION_DEAD static char const* const stringBase_804E1AA1 = "D_MN01"; -SECTION_DEAD static char const* const stringBase_804E1AA8 = "D_MN10"; -SECTION_DEAD static char const* const stringBase_804E1AAF = "D_MN11"; -SECTION_DEAD static char const* const stringBase_804E1AB6 = "D_MN06"; -SECTION_DEAD static char const* const stringBase_804E1ABD = "D_MN07"; -SECTION_DEAD static char const* const stringBase_804E1AC4 = "D_MN08"; -SECTION_DEAD static char const* const stringBase_804E1ACB = "F_SP128"; -SECTION_DEAD static char const* const stringBase_804E1AD3 = "F_SP114"; -SECTION_DEAD static char const* const stringBase_804E1ADB = "F_SP00"; -SECTION_DEAD static char const* const stringBase_804E1AE2 = "F_SP127"; -SECTION_DEAD static char const* const stringBase_804E1AEA = "D_SB02"; -SECTION_DEAD static char const* const stringBase_804E1AF1 = "D_SB03"; -SECTION_DEAD static char const* const stringBase_804E1AF8 = "D_SB04"; -SECTION_DEAD static char const* const stringBase_804E1AFF = "D_SB00"; -SECTION_DEAD static char const* const stringBase_804E1B06 = "F_SP117"; -#pragma pop +/* 804E1A4C-804E1A4C 000078 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/d_a_disappear/d_a_disappear.cpp b/rel/d/a/d_a_disappear/d_a_disappear.cpp index 28d74adc60a..39a8c82a1d6 100644 --- a/rel/d/a/d_a_disappear/d_a_disappear.cpp +++ b/rel/d/a/d_a_disappear/d_a_disappear.cpp @@ -19,13 +19,13 @@ struct disappear_class {}; struct dPa_levelEcallBack {}; -struct cXyz {}; - struct dKy_tevstr_c {}; +struct csXyz {}; + struct _GXColor {}; -struct csXyz {}; +struct cXyz {}; struct dPa_control_c { /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, @@ -33,10 +33,10 @@ struct dPa_control_c { cXyz const*, f32); }; -struct Vec {}; - struct JAISoundID {}; +struct Vec {}; + struct Z2SeMgr { /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); }; @@ -125,7 +125,7 @@ static bool daDisappear_Delete(disappear_class* param_0) { /* ############################################################################################## */ /* 804A9460-804A9464 000000 0004+00 4/4 0/0 0/0 .rodata @3704 */ SECTION_RODATA static f32 const lit_3704 = 1.0f; -COMPILER_STRIP_GATE(804A9460, &lit_3704); +COMPILER_STRIP_GATE(0x804A9460, &lit_3704); /* 804A9480-804A9488 000000 0008+00 1/1 0/0 0/0 .data da_name$3684 */ SECTION_DATA static u8 da_name_3684[8] = { @@ -175,14 +175,14 @@ static asm void ghost_disappear(disappear_class* param_0, f32 param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3787 = -1.0f; -COMPILER_STRIP_GATE(804A9464, &lit_3787); +COMPILER_STRIP_GATE(0x804A9464, &lit_3787); #pragma pop /* 804A9468-804A946C 000008 0004+00 0/1 0/0 0/0 .rodata @3788 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_3788 = 0x3FD53F7D; -COMPILER_STRIP_GATE(804A9468, &lit_3788); +COMPILER_STRIP_GATE(0x804A9468, &lit_3788); #pragma pop /* 804A9494-804A94A4 000014 000E+02 1/1 0/0 0/0 .data da_name$3736 */ @@ -222,21 +222,21 @@ static asm void set_disappear(disappear_class* param_0, f32 param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3825 = 1.0f / 100.0f; -COMPILER_STRIP_GATE(804A946C, &lit_3825); +COMPILER_STRIP_GATE(0x804A946C, &lit_3825); #pragma pop /* 804A9470-804A9474 000010 0004+00 0/1 0/0 0/0 .rodata @3826 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3826 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(804A9470, &lit_3826); +COMPILER_STRIP_GATE(0x804A9470, &lit_3826); #pragma pop /* 804A9474-804A9478 000014 0004+00 0/1 0/0 0/0 .rodata @3827 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3827 = 50.0f; -COMPILER_STRIP_GATE(804A9474, &lit_3827); +COMPILER_STRIP_GATE(0x804A9474, &lit_3827); #pragma pop /* 804A9478-804A9480 000018 0008+00 0/1 0/0 0/0 .rodata @3829 */ @@ -245,7 +245,7 @@ COMPILER_STRIP_GATE(804A9474, &lit_3827); SECTION_RODATA static u8 const lit_3829[8] = { 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(804A9478, &lit_3829); +COMPILER_STRIP_GATE(0x804A9478, &lit_3829); #pragma pop /* 804A9364-804A9458 0004C4 00F4+00 1/0 0/0 0/0 .text daDisappear_Create__FP10fopAc_ac_c diff --git a/rel/d/a/d_a_dmidna/d_a_dmidna.cpp b/rel/d/a/d_a_dmidna/d_a_dmidna.cpp index 9fa39c6ed6e..13a9687fc26 100644 --- a/rel/d/a/d_a_dmidna/d_a_dmidna.cpp +++ b/rel/d/a/d_a_dmidna/d_a_dmidna.cpp @@ -21,16 +21,16 @@ struct mDoMtx_stack_c { static u8 now[48]; }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; - struct J3DAnmTransform {}; +struct J3DModelData {}; + +struct Z2Creature {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -132,11 +132,11 @@ SECTION_RODATA static u8 const l_arcName[7 + 1 /* padding */] = { /* padding */ 0x00, }; -COMPILER_STRIP_GATE(8045D290, &l_arcName); +COMPILER_STRIP_GATE(0x8045D290, &l_arcName); /* 8045D298-8045D29C 000008 0004+00 1/1 0/0 0/0 .rodata @3769 */ SECTION_RODATA static f32 const lit_3769 = 1.0f; -COMPILER_STRIP_GATE(8045D298, &lit_3769); +COMPILER_STRIP_GATE(0x8045D298, &lit_3769); /* 8045CED8-8045CFC4 000078 00EC+00 1/1 0/0 0/0 .text createHeap__10daDmidna_cFv */ #pragma push diff --git a/rel/d/a/d_a_do/d_a_do.cpp b/rel/d/a/d_a_do/d_a_do.cpp index 0612a582f22..390b34922f8 100644 --- a/rel/d/a/d_a_do/d_a_do.cpp +++ b/rel/d/a/d_a_do/d_a_do.cpp @@ -41,10 +41,10 @@ struct mDoExt_McaMorfCallBack1_c {}; struct Vec {}; -struct J3DModelData {}; - struct J3DAnmTransform {}; +struct J3DModelData {}; + struct mDoExt_McaMorf { /* 8000FC4C */ mDoExt_McaMorf(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, int, @@ -103,10 +103,10 @@ struct dRes_control_c { struct dPa_levelEcallBack {}; -struct _GXColor {}; - struct csXyz {}; +struct _GXColor {}; + struct dPa_control_c { /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, @@ -444,34 +444,34 @@ extern "C" void __register_global_object(); /* ############################################################################################## */ /* 8066EDE8-8066EDEC 000000 0004+00 29/29 0/0 0/0 .rodata @3662 */ SECTION_RODATA static f32 const lit_3662 = 1.0f; -COMPILER_STRIP_GATE(8066EDE8, &lit_3662); +COMPILER_STRIP_GATE(0x8066EDE8, &lit_3662); /* 8066EDEC-8066EDF0 000004 0004+00 0/1 0/0 0/0 .rodata @3663 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3663 = 2.5f; -COMPILER_STRIP_GATE(8066EDEC, &lit_3663); +COMPILER_STRIP_GATE(0x8066EDEC, &lit_3663); #pragma pop /* 8066EDF0-8066EDF4 000008 0004+00 0/1 0/0 0/0 .rodata @3664 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3664 = 12.0f; -COMPILER_STRIP_GATE(8066EDF0, &lit_3664); +COMPILER_STRIP_GATE(0x8066EDF0, &lit_3664); #pragma pop /* 8066EDF4-8066EDF8 00000C 0004+00 0/13 0/0 0/0 .rodata @3665 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3665 = 2.0f; -COMPILER_STRIP_GATE(8066EDF4, &lit_3665); +COMPILER_STRIP_GATE(0x8066EDF4, &lit_3665); #pragma pop /* 8066EDF8-8066EDFC 000010 0004+00 0/1 0/0 0/0 .rodata @3666 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3666 = 600.0f; -COMPILER_STRIP_GATE(8066EDF8, &lit_3666); +COMPILER_STRIP_GATE(0x8066EDF8, &lit_3666); #pragma pop /* 8066EFBC-8066EFF4 -00001 0038+00 1/1 0/0 0/0 .data @4195 */ @@ -655,14 +655,20 @@ SECTION_RODATA static u8 const lit_3682[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(8066EDFC, &lit_3682); +COMPILER_STRIP_GATE(0x8066EDFC, &lit_3682); #pragma pop /* 8066EE00-8066EE04 000018 0004+00 0/2 0/0 0/0 .rodata @3683 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3683 = -1.0f; -COMPILER_STRIP_GATE(8066EE00, &lit_3683); +COMPILER_STRIP_GATE(0x8066EE00, &lit_3683); +#pragma pop + +/* 8066EFB0-8066EFB0 0001C8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8066EFB0 = "Do"; #pragma pop /* 80667DA8-80667E68 000148 00C0+00 16/16 0/0 0/0 .text anm_init__FP8do_classifUcf */ @@ -690,14 +696,14 @@ static asm void nodeCallBack(J3DJoint* param_0, int param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3772 = 100.0f; -COMPILER_STRIP_GATE(8066EE04, &lit_3772); +COMPILER_STRIP_GATE(0x8066EE04, &lit_3772); #pragma pop /* 8066EE08-8066EE0C 000020 0004+00 0/3 0/0 0/0 .rodata @3773 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3773 = 400.0f; -COMPILER_STRIP_GATE(8066EE08, &lit_3773); +COMPILER_STRIP_GATE(0x8066EE08, &lit_3773); #pragma pop /* 80667FE4-80668134 000384 0150+00 1/0 0/0 0/0 .text daDo_Draw__FP8do_class */ @@ -723,7 +729,7 @@ asm cXyz::~cXyz() { /* ############################################################################################## */ /* 8066EE0C-8066EE10 000024 0004+00 1/8 0/0 0/0 .rodata @3816 */ SECTION_RODATA static f32 const lit_3816 = 50.0f; -COMPILER_STRIP_GATE(8066EE0C, &lit_3816); +COMPILER_STRIP_GATE(0x8066EE0C, &lit_3816); /* 80668170-80668264 000510 00F4+00 1/1 0/0 0/0 .text * daDo_other_bg_check__FP8do_classP10fopAc_ac_c */ @@ -739,7 +745,7 @@ static asm void daDo_other_bg_check(do_class* param_0, fopAc_ac_c* param_1) { /* ############################################################################################## */ /* 8066EE10-8066EE14 000028 0004+00 1/7 0/0 0/0 .rodata @3846 */ SECTION_RODATA static f32 const lit_3846 = 30.0f; -COMPILER_STRIP_GATE(8066EE10, &lit_3846); +COMPILER_STRIP_GATE(0x8066EE10, &lit_3846); /* 80668264-8066833C 000604 00D8+00 1/1 0/0 0/0 .text daDo_other_bg_check2__FP8do_classP4cXyz */ #pragma push @@ -869,13 +875,13 @@ static asm void s_w_sub(void* param_0, void* param_1) { /* ############################################################################################## */ /* 8066EE14-8066EE18 00002C 0004+00 1/4 0/0 0/0 .rodata @3922 */ SECTION_RODATA static f32 const lit_3922 = 200.0f; -COMPILER_STRIP_GATE(8066EE14, &lit_3922); +COMPILER_STRIP_GATE(0x8066EE14, &lit_3922); /* 8066EE18-8066EE1C 000030 0004+00 0/3 0/0 0/0 .rodata @3923 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3923 = 240.0f; -COMPILER_STRIP_GATE(8066EE18, &lit_3923); +COMPILER_STRIP_GATE(0x8066EE18, &lit_3923); #pragma pop /* 8066F2FC-8066F310 00008C 0014+00 0/1 0/0 0/0 .bss target_bgc */ @@ -919,7 +925,7 @@ static asm void do_carry_check(do_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3981 = 4.0f / 5.0f; -COMPILER_STRIP_GATE(8066EE1C, &lit_3981); +COMPILER_STRIP_GATE(0x8066EE1C, &lit_3981); #pragma pop /* 80668624-80668754 0009C4 0130+00 1/1 0/0 0/0 .text depth_check__FP8do_class4cXyzf */ @@ -935,7 +941,7 @@ static asm void depth_check(do_class* param_0, cXyz param_1, f32 param_2) { /* ############################################################################################## */ /* 8066EE20-8066EE24 000038 0004+00 1/1 0/0 0/0 .rodata @3994 */ SECTION_RODATA static f32 const lit_3994 = 8.0f; -COMPILER_STRIP_GATE(8066EE20, &lit_3994); +COMPILER_STRIP_GATE(0x8066EE20, &lit_3994); /* 80668754-8066886C 000AF4 0118+00 1/1 0/0 0/0 .text water_check__FP8do_class */ #pragma push @@ -952,21 +958,21 @@ static asm void water_check(do_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4025 = 25.0f; -COMPILER_STRIP_GATE(8066EE24, &lit_4025); +COMPILER_STRIP_GATE(0x8066EE24, &lit_4025); #pragma pop /* 8066EE28-8066EE2C 000040 0004+00 0/1 0/0 0/0 .rodata @4026 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4026 = 60.0f; -COMPILER_STRIP_GATE(8066EE28, &lit_4026); +COMPILER_STRIP_GATE(0x8066EE28, &lit_4026); #pragma pop /* 8066EE2C-8066EE30 000044 0004+00 0/11 0/0 0/0 .rodata @4027 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4027 = 5.0f; -COMPILER_STRIP_GATE(8066EE2C, &lit_4027); +COMPILER_STRIP_GATE(0x8066EE2C, &lit_4027); #pragma pop /* 8066886C-80668A30 000C0C 01C4+00 4/4 0/0 0/0 .text dansa_check__FP8do_class4cXyzf */ @@ -984,14 +990,14 @@ static asm void dansa_check(do_class* param_0, cXyz param_1, f32 param_2) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4057 = 70.0f; -COMPILER_STRIP_GATE(8066EE30, &lit_4057); +COMPILER_STRIP_GATE(0x8066EE30, &lit_4057); #pragma pop /* 8066EE34-8066EE38 00004C 0004+00 0/1 0/0 0/0 .rodata @4058 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4058 = 9.0f; -COMPILER_STRIP_GATE(8066EE34, &lit_4058); +COMPILER_STRIP_GATE(0x8066EE34, &lit_4058); #pragma pop /* 80668A30-80668B18 000DD0 00E8+00 3/3 0/0 0/0 .text dansa_check2__FP8do_classf */ @@ -1007,11 +1013,11 @@ static asm void dansa_check2(do_class* param_0, f32 param_1) { /* ############################################################################################## */ /* 8066EE38-8066EE3C 000050 0004+00 1/1 0/0 0/0 .rodata @4068 */ SECTION_RODATA static f32 const lit_4068 = 130.0f; -COMPILER_STRIP_GATE(8066EE38, &lit_4068); +COMPILER_STRIP_GATE(0x8066EE38, &lit_4068); /* 8066EE3C-8066EE40 000054 0004+00 1/4 0/0 0/0 .rodata @4069 */ SECTION_RODATA static f32 const lit_4069 = 15.0f; -COMPILER_STRIP_GATE(8066EE3C, &lit_4069); +COMPILER_STRIP_GATE(0x8066EE3C, &lit_4069); /* 80668B18-80668BA0 000EB8 0088+00 4/4 0/0 0/0 .text move_dansa_check__FP8do_classf */ #pragma push @@ -1030,7 +1036,7 @@ static asm void move_dansa_check(do_class* param_0, f32 param_1) { SECTION_RODATA static u8 const lit_4134[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8066EE40, &lit_4134); +COMPILER_STRIP_GATE(0x8066EE40, &lit_4134); #pragma pop /* 8066EE48-8066EE50 000060 0008+00 0/3 0/0 0/0 .rodata @4135 */ @@ -1039,7 +1045,7 @@ COMPILER_STRIP_GATE(8066EE40, &lit_4134); SECTION_RODATA static u8 const lit_4135[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8066EE48, &lit_4135); +COMPILER_STRIP_GATE(0x8066EE48, &lit_4135); #pragma pop /* 8066EE50-8066EE58 000068 0008+00 0/3 0/0 0/0 .rodata @4136 */ @@ -1048,7 +1054,7 @@ COMPILER_STRIP_GATE(8066EE48, &lit_4135); SECTION_RODATA static u8 const lit_4136[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8066EE50, &lit_4136); +COMPILER_STRIP_GATE(0x8066EE50, &lit_4136); #pragma pop /* 8066EE58-8066EE60 000070 0008+00 0/1 0/0 0/0 .rodata @4138 */ @@ -1057,7 +1063,7 @@ COMPILER_STRIP_GATE(8066EE50, &lit_4136); SECTION_RODATA static u8 const lit_4138[8] = { 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8066EE58, &lit_4138); +COMPILER_STRIP_GATE(0x8066EE58, &lit_4138); #pragma pop /* 80668BA0-80668D5C 000F40 01BC+00 5/5 0/0 0/0 .text area_check__FP8do_class */ @@ -1075,7 +1081,7 @@ static asm void area_check(do_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4189 = 20.0f; -COMPILER_STRIP_GATE(8066EE60, &lit_4189); +COMPILER_STRIP_GATE(0x8066EE60, &lit_4189); #pragma pop /* 80668D5C-80669050 0010FC 02F4+00 2/1 0/0 0/0 .text do_stay__FP8do_class */ @@ -1093,105 +1099,105 @@ static asm void do_stay(do_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4190 = 1000.0f; -COMPILER_STRIP_GATE(8066EE64, &lit_4190); +COMPILER_STRIP_GATE(0x8066EE64, &lit_4190); #pragma pop /* 8066EE68-8066EE6C 000080 0004+00 0/5 0/0 0/0 .rodata @4191 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4191 = 2000.0f; -COMPILER_STRIP_GATE(8066EE68, &lit_4191); +COMPILER_STRIP_GATE(0x8066EE68, &lit_4191); #pragma pop /* 8066EE6C-8066EE70 000084 0004+00 0/9 0/0 0/0 .rodata @4192 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4192 = 10.0f; -COMPILER_STRIP_GATE(8066EE6C, &lit_4192); +COMPILER_STRIP_GATE(0x8066EE6C, &lit_4192); #pragma pop /* 8066EE70-8066EE74 000088 0004+00 0/0 0/0 0/0 .rodata @4193 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4193 = 1500.0f; -COMPILER_STRIP_GATE(8066EE70, &lit_4193); +COMPILER_STRIP_GATE(0x8066EE70, &lit_4193); #pragma pop /* 8066EE74-8066EE78 00008C 0004+00 0/8 0/0 0/0 .rodata @4194 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4194 = 3.0f; -COMPILER_STRIP_GATE(8066EE74, &lit_4194); +COMPILER_STRIP_GATE(0x8066EE74, &lit_4194); #pragma pop /* 8066EE78-8066EE7C 000090 0004+00 0/4 0/0 0/0 .rodata @4336 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4336 = 4.0f; -COMPILER_STRIP_GATE(8066EE78, &lit_4336); +COMPILER_STRIP_GATE(0x8066EE78, &lit_4336); #pragma pop /* 8066EE7C-8066EE80 000094 0004+00 0/1 0/0 0/0 .rodata @4337 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4337 = 17.0f / 10.0f; -COMPILER_STRIP_GATE(8066EE7C, &lit_4337); +COMPILER_STRIP_GATE(0x8066EE7C, &lit_4337); #pragma pop /* 8066EE80-8066EE84 000098 0004+00 0/1 0/0 0/0 .rodata @4338 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4338 = 65536.0f; -COMPILER_STRIP_GATE(8066EE80, &lit_4338); +COMPILER_STRIP_GATE(0x8066EE80, &lit_4338); #pragma pop /* 8066EE84-8066EE88 00009C 0004+00 0/1 0/0 0/0 .rodata @4339 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4339 = 300.0f; -COMPILER_STRIP_GATE(8066EE84, &lit_4339); +COMPILER_STRIP_GATE(0x8066EE84, &lit_4339); #pragma pop /* 8066EE88-8066EE8C 0000A0 0004+00 0/1 0/0 0/0 .rodata @4340 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4340 = 13.0f / 10.0f; -COMPILER_STRIP_GATE(8066EE88, &lit_4340); +COMPILER_STRIP_GATE(0x8066EE88, &lit_4340); #pragma pop /* 8066EE8C-8066EE90 0000A4 0004+00 0/3 0/0 0/0 .rodata @4341 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4341 = 3.0f / 5.0f; -COMPILER_STRIP_GATE(8066EE8C, &lit_4341); +COMPILER_STRIP_GATE(0x8066EE8C, &lit_4341); #pragma pop /* 8066EE90-8066EE94 0000A8 0004+00 0/4 0/0 0/0 .rodata @4342 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4342 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(8066EE90, &lit_4342); +COMPILER_STRIP_GATE(0x8066EE90, &lit_4342); #pragma pop /* 8066EE94-8066EE98 0000AC 0004+00 0/2 0/0 0/0 .rodata @4343 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4343 = 150.0f; -COMPILER_STRIP_GATE(8066EE94, &lit_4343); +COMPILER_STRIP_GATE(0x8066EE94, &lit_4343); #pragma pop /* 8066EE98-8066EE9C 0000B0 0004+00 0/3 0/0 0/0 .rodata @4344 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4344 = 3000.0f; -COMPILER_STRIP_GATE(8066EE98, &lit_4344); +COMPILER_STRIP_GATE(0x8066EE98, &lit_4344); #pragma pop /* 8066EE9C-8066EEA0 0000B4 0004+00 0/3 0/0 0/0 .rodata @4345 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4345 = 1.0f / 20.0f; -COMPILER_STRIP_GATE(8066EE9C, &lit_4345); +COMPILER_STRIP_GATE(0x8066EE9C, &lit_4345); #pragma pop /* 80669050-8066973C 0013F0 06EC+00 2/1 0/0 0/0 .text do_walk__FP8do_class */ @@ -1209,14 +1215,14 @@ static asm void do_walk(do_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4377 = 0.25f; -COMPILER_STRIP_GATE(8066EEA0, &lit_4377); +COMPILER_STRIP_GATE(0x8066EEA0, &lit_4377); #pragma pop /* 8066EEA4-8066EEA8 0000BC 0004+00 0/2 0/0 0/0 .rodata @4378 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4378 = 160.0f; -COMPILER_STRIP_GATE(8066EEA4, &lit_4378); +COMPILER_STRIP_GATE(0x8066EEA4, &lit_4378); #pragma pop /* 8066973C-806698D0 001ADC 0194+00 1/1 0/0 0/0 .text do_walk_run__FP8do_class */ @@ -1234,49 +1240,49 @@ static asm void do_walk_run(do_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4400 = 4000.0f; -COMPILER_STRIP_GATE(8066EEA8, &lit_4400); +COMPILER_STRIP_GATE(0x8066EEA8, &lit_4400); #pragma pop /* 8066EEAC-8066EEB0 0000C4 0004+00 0/3 0/0 0/0 .rodata @4401 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4401 = 1.5f; -COMPILER_STRIP_GATE(8066EEAC, &lit_4401); +COMPILER_STRIP_GATE(0x8066EEAC, &lit_4401); #pragma pop /* 8066EEB0-8066EEB4 0000C8 0004+00 0/5 0/0 0/0 .rodata @4402 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4402 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(8066EEB0, &lit_4402); +COMPILER_STRIP_GATE(0x8066EEB0, &lit_4402); #pragma pop /* 8066EEB4-8066EEB8 0000CC 0004+00 0/1 0/0 0/0 .rodata @4403 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4403 = 6.0f / 5.0f; -COMPILER_STRIP_GATE(8066EEB4, &lit_4403); +COMPILER_STRIP_GATE(0x8066EEB4, &lit_4403); #pragma pop /* 8066EEB8-8066EEBC 0000D0 0004+00 0/1 0/0 0/0 .rodata @4404 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4404 = 1.0f / 50.0f; -COMPILER_STRIP_GATE(8066EEB8, &lit_4404); +COMPILER_STRIP_GATE(0x8066EEB8, &lit_4404); #pragma pop /* 8066EEBC-8066EEC0 0000D4 0004+00 0/2 0/0 0/0 .rodata @4405 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4405 = 320.0f; -COMPILER_STRIP_GATE(8066EEBC, &lit_4405); +COMPILER_STRIP_GATE(0x8066EEBC, &lit_4405); #pragma pop /* 8066EEC0-8066EEC4 0000D8 0004+00 0/1 0/0 0/0 .rodata @4406 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4406 = 7.0f / 5.0f; -COMPILER_STRIP_GATE(8066EEC0, &lit_4406); +COMPILER_STRIP_GATE(0x8066EEC0, &lit_4406); #pragma pop /* 806698D0-80669A1C 001C70 014C+00 1/1 0/0 0/0 .text do_run__FP8do_class */ @@ -1294,7 +1300,7 @@ static asm void do_run(do_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4435 = 360.0f; -COMPILER_STRIP_GATE(8066EEC4, &lit_4435); +COMPILER_STRIP_GATE(0x8066EEC4, &lit_4435); #pragma pop /* 80669A1C-80669B80 001DBC 0164+00 1/1 0/0 0/0 .text do_run_walk__FP8do_class */ @@ -1322,98 +1328,98 @@ static asm void do_wait_1(do_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4545 = 75.0f; -COMPILER_STRIP_GATE(8066EEC8, &lit_4545); +COMPILER_STRIP_GATE(0x8066EEC8, &lit_4545); #pragma pop /* 8066EECC-8066EED0 0000E4 0004+00 0/0 0/0 0/0 .rodata @4546 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4546 = 96.0f; -COMPILER_STRIP_GATE(8066EECC, &lit_4546); +COMPILER_STRIP_GATE(0x8066EECC, &lit_4546); #pragma pop /* 8066EED0-8066EED4 0000E8 0004+00 0/0 0/0 0/0 .rodata @4547 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4547 = 5000.0f; -COMPILER_STRIP_GATE(8066EED0, &lit_4547); +COMPILER_STRIP_GATE(0x8066EED0, &lit_4547); #pragma pop /* 8066EED4-8066EED8 0000EC 0004+00 0/0 0/0 0/0 .rodata @4548 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4548 = -176.0f; -COMPILER_STRIP_GATE(8066EED4, &lit_4548); +COMPILER_STRIP_GATE(0x8066EED4, &lit_4548); #pragma pop /* 8066EED8-8066EEDC 0000F0 0004+00 0/0 0/0 0/0 .rodata @4549 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4549 = 10000.0f; -COMPILER_STRIP_GATE(8066EED8, &lit_4549); +COMPILER_STRIP_GATE(0x8066EED8, &lit_4549); #pragma pop /* 8066EEDC-8066EEE0 0000F4 0004+00 0/0 0/0 0/0 .rodata @4550 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4550 = -3.0f; -COMPILER_STRIP_GATE(8066EEDC, &lit_4550); +COMPILER_STRIP_GATE(0x8066EEDC, &lit_4550); #pragma pop /* 8066EEE0-8066EEE4 0000F8 0004+00 0/2 0/0 0/0 .rodata @4551 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4551 = 120.0f; -COMPILER_STRIP_GATE(8066EEE0, &lit_4551); +COMPILER_STRIP_GATE(0x8066EEE0, &lit_4551); #pragma pop /* 8066EEE4-8066EEE8 0000FC 0004+00 0/0 0/0 0/0 .rodata @4552 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4552 = 3.5f; -COMPILER_STRIP_GATE(8066EEE4, &lit_4552); +COMPILER_STRIP_GATE(0x8066EEE4, &lit_4552); #pragma pop /* 8066EEE8-8066EEEC 000100 0004+00 0/0 0/0 0/0 .rodata @4553 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4553 = 176.0f; -COMPILER_STRIP_GATE(8066EEE8, &lit_4553); +COMPILER_STRIP_GATE(0x8066EEE8, &lit_4553); #pragma pop /* 8066EEEC-8066EEF0 000104 0004+00 0/0 0/0 0/0 .rodata @4554 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4554 = 11.0f / 5.0f; -COMPILER_STRIP_GATE(8066EEEC, &lit_4554); +COMPILER_STRIP_GATE(0x8066EEEC, &lit_4554); #pragma pop /* 8066EEF0-8066EEF4 000108 0004+00 0/1 0/0 0/0 .rodata @4555 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4555 = 0x3CB020C5; -COMPILER_STRIP_GATE(8066EEF0, &lit_4555); +COMPILER_STRIP_GATE(0x8066EEF0, &lit_4555); #pragma pop /* 8066EEF4-8066EEF8 00010C 0004+00 0/1 0/0 0/0 .rodata @4556 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4556 = 127.0f; -COMPILER_STRIP_GATE(8066EEF4, &lit_4556); +COMPILER_STRIP_GATE(0x8066EEF4, &lit_4556); #pragma pop /* 8066EEF8-8066EEFC 000110 0004+00 0/2 0/0 0/0 .rodata @4587 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4587 = 15000.0f; -COMPILER_STRIP_GATE(8066EEF8, &lit_4587); +COMPILER_STRIP_GATE(0x8066EEF8, &lit_4587); #pragma pop /* 8066EEFC-8066EF00 000114 0004+00 0/5 0/0 0/0 .rodata @4588 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4588 = 0.5f; -COMPILER_STRIP_GATE(8066EEFC, &lit_4588); +COMPILER_STRIP_GATE(0x8066EEFC, &lit_4588); #pragma pop /* 8066A1C4-8066A3D0 002564 020C+00 1/1 0/0 0/0 .text do_wait_2__FP8do_class */ @@ -1441,14 +1447,14 @@ static asm void do_sit(do_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4709 = -100.0f; -COMPILER_STRIP_GATE(8066EF00, &lit_4709); +COMPILER_STRIP_GATE(0x8066EF00, &lit_4709); #pragma pop /* 8066EF04-8066EF08 00011C 0004+00 0/1 0/0 0/0 .rodata @4710 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4710 = 250.0f; -COMPILER_STRIP_GATE(8066EF04, &lit_4710); +COMPILER_STRIP_GATE(0x8066EF04, &lit_4710); #pragma pop /* 8066A5DC-8066A80C 00297C 0230+00 1/1 0/0 0/0 .text hang_set__FP8do_class */ @@ -1466,14 +1472,14 @@ static asm void hang_set(do_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4763 = 28.0f; -COMPILER_STRIP_GATE(8066EF08, &lit_4763); +COMPILER_STRIP_GATE(0x8066EF08, &lit_4763); #pragma pop /* 8066EF0C-8066EF10 000124 0004+00 0/1 0/0 0/0 .rodata @4764 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4764 = -60.0f; -COMPILER_STRIP_GATE(8066EF0C, &lit_4764); +COMPILER_STRIP_GATE(0x8066EF0C, &lit_4764); #pragma pop /* 8066A80C-8066AB78 002BAC 036C+00 1/1 0/0 0/0 .text do_hang__FP8do_class */ @@ -1486,6 +1492,13 @@ static asm void do_hang(do_class* param_0) { } #pragma pop +/* ############################################################################################## */ +/* 8066EFB0-8066EFB0 0001C8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8066EFB3 = "F_SP116"; +#pragma pop + /* 8066AB78-8066B650 002F18 0AD8+00 2/1 0/0 0/0 .text do_food__FP8do_class */ #pragma push #pragma optimization_level 0 @@ -1501,70 +1514,70 @@ static asm void do_food(do_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4962 = 0.75f; -COMPILER_STRIP_GATE(8066EF10, &lit_4962); +COMPILER_STRIP_GATE(0x8066EF10, &lit_4962); #pragma pop /* 8066EF14-8066EF18 00012C 0004+00 0/0 0/0 0/0 .rodata @4963 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4963 = -1050.0f; -COMPILER_STRIP_GATE(8066EF14, &lit_4963); +COMPILER_STRIP_GATE(0x8066EF14, &lit_4963); #pragma pop /* 8066EF18-8066EF1C 000130 0004+00 0/0 0/0 0/0 .rodata @4964 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4964 = -4314.0f; -COMPILER_STRIP_GATE(8066EF18, &lit_4964); +COMPILER_STRIP_GATE(0x8066EF18, &lit_4964); #pragma pop /* 8066EF1C-8066EF20 000134 0004+00 0/0 0/0 0/0 .rodata @4965 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4965 = 728.0f; -COMPILER_STRIP_GATE(8066EF1C, &lit_4965); +COMPILER_STRIP_GATE(0x8066EF1C, &lit_4965); #pragma pop /* 8066EF20-8066EF24 000138 0004+00 0/0 0/0 0/0 .rodata @4966 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4966 = 11.0f; -COMPILER_STRIP_GATE(8066EF20, &lit_4966); +COMPILER_STRIP_GATE(0x8066EF20, &lit_4966); #pragma pop /* 8066EF24-8066EF28 00013C 0004+00 0/0 0/0 0/0 .rodata @4967 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4967 = 3.0f / 10.0f; -COMPILER_STRIP_GATE(8066EF24, &lit_4967); +COMPILER_STRIP_GATE(0x8066EF24, &lit_4967); #pragma pop /* 8066EF28-8066EF2C 000140 0004+00 0/0 0/0 0/0 .rodata @4968 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4968 = 8.0f / 5.0f; -COMPILER_STRIP_GATE(8066EF28, &lit_4968); +COMPILER_STRIP_GATE(0x8066EF28, &lit_4968); #pragma pop /* 8066EF2C-8066EF30 000144 0004+00 0/1 0/0 0/0 .rodata @4991 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4991 = 3.0f / 20.0f; -COMPILER_STRIP_GATE(8066EF2C, &lit_4991); +COMPILER_STRIP_GATE(0x8066EF2C, &lit_4991); #pragma pop /* 8066EF30-8066EF34 000148 0004+00 0/2 0/0 0/0 .rodata @4992 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4992 = 45.0f; -COMPILER_STRIP_GATE(8066EF30, &lit_4992); +COMPILER_STRIP_GATE(0x8066EF30, &lit_4992); #pragma pop /* 8066EF34-8066EF38 00014C 0004+00 0/1 0/0 0/0 .rodata @4993 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4993 = 7.0f / 10.0f; -COMPILER_STRIP_GATE(8066EF34, &lit_4993); +COMPILER_STRIP_GATE(0x8066EF34, &lit_4993); #pragma pop /* 8066B650-8066B774 0039F0 0124+00 1/1 0/0 0/0 .text do_swim__FP8do_class */ @@ -1592,35 +1605,35 @@ static asm void s_c_sub(void* param_0, void* param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5110 = 800.0f; -COMPILER_STRIP_GATE(8066EF38, &lit_5110); +COMPILER_STRIP_GATE(0x8066EF38, &lit_5110); #pragma pop /* 8066EF3C-8066EF40 000154 0004+00 0/1 0/0 0/0 .rodata @5111 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5111 = 500.0f; -COMPILER_STRIP_GATE(8066EF3C, &lit_5111); +COMPILER_STRIP_GATE(0x8066EF3C, &lit_5111); #pragma pop /* 8066EF40-8066EF44 000158 0004+00 0/1 0/0 0/0 .rodata @5112 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5112 = 550.0f; -COMPILER_STRIP_GATE(8066EF40, &lit_5112); +COMPILER_STRIP_GATE(0x8066EF40, &lit_5112); #pragma pop /* 8066EF44-8066EF48 00015C 0004+00 0/2 0/0 0/0 .rodata @5113 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5113 = 52.0f; -COMPILER_STRIP_GATE(8066EF44, &lit_5113); +COMPILER_STRIP_GATE(0x8066EF44, &lit_5113); #pragma pop /* 8066EF48-8066EF4C 000160 0004+00 0/1 0/0 0/0 .rodata @5114 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5114 = 230.0f; -COMPILER_STRIP_GATE(8066EF48, &lit_5114); +COMPILER_STRIP_GATE(0x8066EF48, &lit_5114); #pragma pop /* 8066B7C0-8066BD3C 003B60 057C+00 1/1 0/0 0/0 .text do_help__FP8do_class */ @@ -1638,14 +1651,14 @@ static asm void do_help(do_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5344 = 3.0f / 40.0f; -COMPILER_STRIP_GATE(8066EF4C, &lit_5344); +COMPILER_STRIP_GATE(0x8066EF4C, &lit_5344); #pragma pop /* 8066EF50-8066EF54 000168 0004+00 0/1 0/0 0/0 .rodata @5345 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5345 = -80.0f; -COMPILER_STRIP_GATE(8066EF50, &lit_5345); +COMPILER_STRIP_GATE(0x8066EF50, &lit_5345); #pragma pop /* 8066BD3C-8066C894 0040DC 0B58+00 2/1 0/0 0/0 .text do_boat__FP8do_class */ @@ -1663,21 +1676,21 @@ static asm void do_boat(do_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5346 = 40.0f; -COMPILER_STRIP_GATE(8066EF54, &lit_5346); +COMPILER_STRIP_GATE(0x8066EF54, &lit_5346); #pragma pop /* 8066EF58-8066EF5C 000170 0004+00 0/0 0/0 0/0 .rodata @5347 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5347 = 180.0f; -COMPILER_STRIP_GATE(8066EF58, &lit_5347); +COMPILER_STRIP_GATE(0x8066EF58, &lit_5347); #pragma pop /* 8066EF5C-8066EF60 000174 0004+00 0/1 0/0 0/0 .rodata @5407 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5407 = 1.0f / 40.0f; -COMPILER_STRIP_GATE(8066EF5C, &lit_5407); +COMPILER_STRIP_GATE(0x8066EF5C, &lit_5407); #pragma pop /* 8066C894-8066CAA8 004C34 0214+00 1/1 0/0 0/0 .text do_a_swim__FP8do_class */ @@ -1699,7 +1712,7 @@ SECTION_RODATA static f32 const lit_5477[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(8066EF60, &lit_5477); +COMPILER_STRIP_GATE(0x8066EF60, &lit_5477); #pragma pop /* 8066EF68-8066EF70 000180 0008+00 0/2 0/0 0/0 .rodata @5480 */ @@ -1708,7 +1721,7 @@ COMPILER_STRIP_GATE(8066EF60, &lit_5477); SECTION_RODATA static u8 const lit_5480[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8066EF68, &lit_5480); +COMPILER_STRIP_GATE(0x8066EF68, &lit_5480); #pragma pop /* 8066CAA8-8066CDEC 004E48 0344+00 1/1 0/0 0/0 .text do_carry__FP8do_class */ @@ -1736,7 +1749,7 @@ static asm void do_message(do_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5948 = -7.0f; -COMPILER_STRIP_GATE(8066EF70, &lit_5948); +COMPILER_STRIP_GATE(0x8066EF70, &lit_5948); #pragma pop /* 8066CEC4-8066DD48 005264 0E84+00 2/1 0/0 0/0 .text action__FP8do_class */ @@ -1764,77 +1777,77 @@ static asm void message(do_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5949 = 6.0f; -COMPILER_STRIP_GATE(8066EF74, &lit_5949); +COMPILER_STRIP_GATE(0x8066EF74, &lit_5949); #pragma pop /* 8066EF78-8066EF7C 000190 0004+00 0/0 0/0 0/0 .rodata @5950 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5950 = -25.0f; -COMPILER_STRIP_GATE(8066EF78, &lit_5950); +COMPILER_STRIP_GATE(0x8066EF78, &lit_5950); #pragma pop /* 8066EF7C-8066EF80 000194 0004+00 0/0 0/0 0/0 .rodata @5951 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5951 = 35.0f; -COMPILER_STRIP_GATE(8066EF7C, &lit_5951); +COMPILER_STRIP_GATE(0x8066EF7C, &lit_5951); #pragma pop /* 8066EF80-8066EF84 000198 0004+00 0/0 0/0 0/0 .rodata @5952 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5952 = -16.0f; -COMPILER_STRIP_GATE(8066EF80, &lit_5952); +COMPILER_STRIP_GATE(0x8066EF80, &lit_5952); #pragma pop /* 8066EF84-8066EF88 00019C 0004+00 0/0 0/0 0/0 .rodata @5953 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5953 = 80.0f; -COMPILER_STRIP_GATE(8066EF84, &lit_5953); +COMPILER_STRIP_GATE(0x8066EF84, &lit_5953); #pragma pop /* 8066EF88-8066EF8C 0001A0 0004+00 0/0 0/0 0/0 .rodata @5954 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5954 = 1.0f / 25.0f; -COMPILER_STRIP_GATE(8066EF88, &lit_5954); +COMPILER_STRIP_GATE(0x8066EF88, &lit_5954); #pragma pop /* 8066EF8C-8066EF90 0001A4 0004+00 0/1 0/0 0/0 .rodata @6210 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6210 = 16.0f; -COMPILER_STRIP_GATE(8066EF8C, &lit_6210); +COMPILER_STRIP_GATE(0x8066EF8C, &lit_6210); #pragma pop /* 8066EF90-8066EF94 0001A8 0004+00 0/1 0/0 0/0 .rodata @6211 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6211 = 13.0f; -COMPILER_STRIP_GATE(8066EF90, &lit_6211); +COMPILER_STRIP_GATE(0x8066EF90, &lit_6211); #pragma pop /* 8066EF94-8066EF98 0001AC 0004+00 0/1 0/0 0/0 .rodata @6212 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6212 = -15.0f; -COMPILER_STRIP_GATE(8066EF94, &lit_6212); +COMPILER_STRIP_GATE(0x8066EF94, &lit_6212); #pragma pop /* 8066EF98-8066EF9C 0001B0 0004+00 0/1 0/0 0/0 .rodata @6213 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6213 = 13000.0f; -COMPILER_STRIP_GATE(8066EF98, &lit_6213); +COMPILER_STRIP_GATE(0x8066EF98, &lit_6213); #pragma pop /* 8066EF9C-8066EFA0 0001B4 0004+00 0/1 0/0 0/0 .rodata @6214 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6214 = -24.0f; -COMPILER_STRIP_GATE(8066EF9C, &lit_6214); +COMPILER_STRIP_GATE(0x8066EF9C, &lit_6214); #pragma pop /* 8066DE64-8066E494 006204 0630+00 2/1 0/0 0/0 .text daDo_Execute__FP8do_class */ @@ -1887,28 +1900,28 @@ asm J3DFrameCtrl::~J3DFrameCtrl() { #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_6421 = 0x407FEF9E; -COMPILER_STRIP_GATE(8066EFA0, &lit_6421); +COMPILER_STRIP_GATE(0x8066EFA0, &lit_6421); #pragma pop /* 8066EFA4-8066EFA8 0001BC 0004+00 0/1 0/0 0/0 .rodata @6422 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6422 = 7216.0f; -COMPILER_STRIP_GATE(8066EFA4, &lit_6422); +COMPILER_STRIP_GATE(0x8066EFA4, &lit_6422); #pragma pop /* 8066EFA8-8066EFAC 0001C0 0004+00 0/1 0/0 0/0 .rodata @6423 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6423 = 220.0f; -COMPILER_STRIP_GATE(8066EFA8, &lit_6423); +COMPILER_STRIP_GATE(0x8066EFA8, &lit_6423); #pragma pop /* 8066EFAC-8066EFB0 0001C4 0004+00 0/1 0/0 0/0 .rodata @6424 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6424 = -4808.0f; -COMPILER_STRIP_GATE(8066EFAC, &lit_6424); +COMPILER_STRIP_GATE(0x8066EFAC, &lit_6424); #pragma pop /* 8066E81C-8066EAE4 006BBC 02C8+00 1/0 0/0 0/0 .text daDo_Create__FP10fopAc_ac_c */ @@ -1983,7 +1996,7 @@ asm void __sinit_d_a_do_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_8066ED88 = (void*)__sinit_d_a_do_cpp; +REGISTER_CTORS(0x8066ED88, __sinit_d_a_do_cpp); #pragma pop /* 8066EDC4-8066EDCC 007164 0008+00 1/0 0/0 0/0 .text @36@__dt__12dBgS_ObjAcchFv */ @@ -2190,10 +2203,4 @@ static u8 data_8066F388[4]; static u8 data_8066F38C[4]; #pragma pop -/* 8066EFB0-8066EFBB 0001C8 000B+00 5/5 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_8066EFB0 = "Do"; -SECTION_DEAD static char const* const stringBase_8066EFB3 = "F_SP116"; -#pragma pop +/* 8066EFB0-8066EFB0 0001C8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/d_a_dshutter/d_a_dshutter.cpp b/rel/d/a/d_a_dshutter/d_a_dshutter.cpp index 9651f7741e4..181528d7f11 100644 --- a/rel/d/a/d_a_dshutter/d_a_dshutter.cpp +++ b/rel/d/a/d_a_dshutter/d_a_dshutter.cpp @@ -112,10 +112,10 @@ struct dBgS_MoveBgActor { /* 80078950 */ void MoveBGExecute(); }; -struct Vec {}; - struct JAISoundID {}; +struct Vec {}; + struct Z2SeMgr { /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); }; @@ -151,7 +151,7 @@ extern "C" static void daDsh_Execute__FP7daDsh_c(); extern "C" static bool daDsh_IsDelete__FP7daDsh_c(); extern "C" static void daDsh_Delete__FP7daDsh_c(); extern "C" static void daDsh_Create__FP10fopAc_ac_c(); -extern "C" void func_80467DF8(s16*); +extern "C" void func_80467DF8(void* _this, s16*); extern "C" void __sinit_d_a_dshutter_cpp(); extern "C" extern char const* const d_a_dshutter__stringBase0; @@ -219,6 +219,15 @@ extern "C" f32 CLOSE_BOUND_RATIO__7daDsh_c; // /* ############################################################################################## */ +/* 80467F40-80467F40 00003C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80467F40 = "K_tetd"; +SECTION_DEAD static char const* const stringBase_80467F47 = "S_bsaku00"; +SECTION_DEAD static char const* const stringBase_80467F51 = "S_lv7saku"; +SECTION_DEAD static char const* const stringBase_80467F5B = ""; +#pragma pop + /* 80467F5C-80467F68 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -382,7 +391,7 @@ asm daDsh_c::~daDsh_c() { SECTION_RODATA static u8 const l_bmd[12] = { 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x04, }; -COMPILER_STRIP_GATE(80467F04, &l_bmd); +COMPILER_STRIP_GATE(0x80467F04, &l_bmd); /* 8046751C-8046759C 0000FC 0080+00 1/0 0/0 0/0 .text CreateHeap__7daDsh_cFv */ #pragma push @@ -579,13 +588,13 @@ asm void daDsh_c::executeOpenWait() { SECTION_RODATA static u8 const l_dzb[12] = { 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x07, }; -COMPILER_STRIP_GATE(80467F10, &l_dzb); +COMPILER_STRIP_GATE(0x80467F10, &l_dzb); /* 80467F1C-80467F28 000018 000C+00 1/1 0/0 0/0 .rodata l_heap_size */ SECTION_RODATA static u8 const l_heap_size[12] = { 0x00, 0x00, 0x0C, 0x10, 0x00, 0x00, 0x0C, 0x10, 0x00, 0x00, 0x3D, 0x60, }; -COMPILER_STRIP_GATE(80467F1C, &l_heap_size); +COMPILER_STRIP_GATE(0x80467F1C, &l_heap_size); /* 80467F28-80467F2C 000024 0004+00 1/2 0/0 0/0 .rodata @3781 */ SECTION_RODATA static u8 const lit_3781[4] = { @@ -594,27 +603,27 @@ SECTION_RODATA static u8 const lit_3781[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80467F28, &lit_3781); +COMPILER_STRIP_GATE(0x80467F28, &lit_3781); /* 80467F2C-80467F30 000028 0004+00 0/1 0/0 0/0 .rodata @3782 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3782 = 100.0f; -COMPILER_STRIP_GATE(80467F2C, &lit_3782); +COMPILER_STRIP_GATE(0x80467F2C, &lit_3782); #pragma pop /* 80467F30-80467F34 00002C 0004+00 0/1 0/0 0/0 .rodata @3783 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3783 = 1.0f; -COMPILER_STRIP_GATE(80467F30, &lit_3783); +COMPILER_STRIP_GATE(0x80467F30, &lit_3783); #pragma pop /* 80467F34-80467F38 000030 0004+00 0/1 0/0 0/0 .rodata @3784 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3784 = -1.0f; -COMPILER_STRIP_GATE(80467F34, &lit_3784); +COMPILER_STRIP_GATE(0x80467F34, &lit_3784); #pragma pop /* 80467840-80467988 000420 0148+00 1/0 0/0 0/0 .text initOpen__7daDsh_cFv */ @@ -630,11 +639,11 @@ asm void daDsh_c::initOpen() { /* ############################################################################################## */ /* 80467F38-80467F3C 000034 0004+00 2/2 0/0 0/0 .rodata @3802 */ SECTION_RODATA static f32 const lit_3802 = 2.0f; -COMPILER_STRIP_GATE(80467F38, &lit_3802); +COMPILER_STRIP_GATE(0x80467F38, &lit_3802); /* 80467F3C-80467F40 000038 0004+00 2/2 0/0 0/0 .rodata @3803 */ SECTION_RODATA static f32 const lit_3803 = 8.0f; -COMPILER_STRIP_GATE(80467F3C, &lit_3803); +COMPILER_STRIP_GATE(0x80467F3C, &lit_3803); /* 804680E0-804680F8 000070 0018+00 2/3 0/0 0/0 .bss l_closeWaitAction */ static u8 l_closeWaitAction[24]; @@ -917,7 +926,7 @@ static asm void daDsh_Create(fopAc_ac_c* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80467DF8(s16* param_0) { +extern "C" asm void func_80467DF8(void* _this, s16* param_0) { nofralloc #include "asm/rel/d/a/d_a_dshutter/d_a_dshutter/func_80467DF8.s" } @@ -935,15 +944,7 @@ asm void __sinit_d_a_dshutter_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80467E14 = (void*)__sinit_d_a_dshutter_cpp; +REGISTER_CTORS(0x80467E14, __sinit_d_a_dshutter_cpp); #pragma pop -/* 80467F40-80467F5C 00003C 001C+00 2/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80467F40 = "K_tetd"; -SECTION_DEAD static char const* const stringBase_80467F47 = "S_bsaku00"; -SECTION_DEAD static char const* const stringBase_80467F51 = "S_lv7saku"; -SECTION_DEAD static char const* const stringBase_80467F5B = ""; -#pragma pop +/* 80467F40-80467F40 00003C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/d_a_econt/d_a_econt.cpp b/rel/d/a/d_a_econt/d_a_econt.cpp index ee934c22cc0..1632879edbc 100644 --- a/rel/d/a/d_a_econt/d_a_econt.cpp +++ b/rel/d/a/d_a_econt/d_a_econt.cpp @@ -110,27 +110,27 @@ static asm void daEcont_Delete(econt_class* param_0) { /* ############################################################################################## */ /* 8051977C-80519780 000000 0004+00 1/1 0/0 0/0 .rodata @3870 */ SECTION_RODATA static f32 const lit_3870 = 210.0f; -COMPILER_STRIP_GATE(8051977C, &lit_3870); +COMPILER_STRIP_GATE(0x8051977C, &lit_3870); /* 80519780-80519784 000004 0004+00 0/1 0/0 0/0 .rodata @3871 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3871 = 410.0f; -COMPILER_STRIP_GATE(80519780, &lit_3871); +COMPILER_STRIP_GATE(0x80519780, &lit_3871); #pragma pop /* 80519784-80519788 000008 0004+00 0/1 0/0 0/0 .rodata @3872 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3872 = 32.0f; -COMPILER_STRIP_GATE(80519784, &lit_3872); +COMPILER_STRIP_GATE(0x80519784, &lit_3872); #pragma pop /* 80519788-8051978C 00000C 0004+00 0/1 0/0 0/0 .rodata @3873 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3873 = 419.0f; -COMPILER_STRIP_GATE(80519788, &lit_3873); +COMPILER_STRIP_GATE(0x80519788, &lit_3873); #pragma pop /* 805196E4-80519774 000244 0090+00 1/0 0/0 0/0 .text daEcont_Create__FP10fopAc_ac_c */ diff --git a/rel/d/a/d_a_ep/d_a_ep.cpp b/rel/d/a/d_a_ep/d_a_ep.cpp index 60f8d183cad..c4c60b59c31 100644 --- a/rel/d/a/d_a_ep/d_a_ep.cpp +++ b/rel/d/a/d_a_ep/d_a_ep.cpp @@ -80,10 +80,10 @@ struct dRes_control_c { struct dPa_levelEcallBack {}; -struct _GXColor {}; - struct csXyz {}; +struct _GXColor {}; + struct dPa_control_c { /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, @@ -404,13 +404,13 @@ extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; /* ############################################################################################## */ /* 8046AFC4-8046AFC8 000000 0004+00 9/9 0/0 0/0 .rodata @3681 */ SECTION_RODATA static f32 const lit_3681 = 50.0f; -COMPILER_STRIP_GATE(8046AFC4, &lit_3681); +COMPILER_STRIP_GATE(0x8046AFC4, &lit_3681); /* 8046AFC8-8046AFCC 000004 0004+00 0/3 0/0 0/0 .rodata @3682 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3682 = 200.0f; -COMPILER_STRIP_GATE(8046AFC8, &lit_3682); +COMPILER_STRIP_GATE(0x8046AFC8, &lit_3682); #pragma pop /* 8046AFCC-8046AFD0 000008 0004+00 2/10 0/0 0/0 .rodata @3683 */ @@ -420,11 +420,11 @@ SECTION_RODATA static u8 const lit_3683[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(8046AFCC, &lit_3683); +COMPILER_STRIP_GATE(0x8046AFCC, &lit_3683); /* 8046AFD0-8046AFD4 00000C 0004+00 1/8 0/0 0/0 .rodata @3684 */ SECTION_RODATA static f32 const lit_3684 = 1.0f; -COMPILER_STRIP_GATE(8046AFD0, &lit_3684); +COMPILER_STRIP_GATE(0x8046AFD0, &lit_3684); /* 804681F8-804682F8 000078 0100+00 1/1 0/0 0/0 .text hahen_draw__FP8ep_class */ #pragma push @@ -441,81 +441,81 @@ static asm void hahen_draw(ep_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3859 = 5.0f; -COMPILER_STRIP_GATE(8046AFD4, &lit_3859); +COMPILER_STRIP_GATE(0x8046AFD4, &lit_3859); #pragma pop /* 8046AFD8-8046AFDC 000014 0004+00 0/1 0/0 0/0 .rodata @3860 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3860 = -90.0f; -COMPILER_STRIP_GATE(8046AFD8, &lit_3860); +COMPILER_STRIP_GATE(0x8046AFD8, &lit_3860); #pragma pop /* 8046AFDC-8046AFE0 000018 0004+00 0/1 0/0 0/0 .rodata @3861 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3861 = 100.0f; -COMPILER_STRIP_GATE(8046AFDC, &lit_3861); +COMPILER_STRIP_GATE(0x8046AFDC, &lit_3861); #pragma pop /* 8046AFE0-8046AFE4 00001C 0004+00 0/2 0/0 0/0 .rodata @3862 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3862 = 35.0f; -COMPILER_STRIP_GATE(8046AFE0, &lit_3862); +COMPILER_STRIP_GATE(0x8046AFE0, &lit_3862); #pragma pop /* 8046AFE4-8046AFE8 000020 0004+00 0/2 0/0 0/0 .rodata @3863 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3863 = 6.0f; -COMPILER_STRIP_GATE(8046AFE4, &lit_3863); +COMPILER_STRIP_GATE(0x8046AFE4, &lit_3863); #pragma pop /* 8046AFE8-8046AFEC 000024 0004+00 0/1 0/0 0/0 .rodata @3864 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3864 = -20.0f; -COMPILER_STRIP_GATE(8046AFE8, &lit_3864); +COMPILER_STRIP_GATE(0x8046AFE8, &lit_3864); #pragma pop /* 8046AFEC-8046AFF0 000028 0004+00 0/1 0/0 0/0 .rodata @3865 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3865 = -3.0f / 10.0f; -COMPILER_STRIP_GATE(8046AFEC, &lit_3865); +COMPILER_STRIP_GATE(0x8046AFEC, &lit_3865); #pragma pop /* 8046AFF0-8046AFF4 00002C 0004+00 0/1 0/0 0/0 .rodata @3866 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3866 = 17000.0f; -COMPILER_STRIP_GATE(8046AFF0, &lit_3866); +COMPILER_STRIP_GATE(0x8046AFF0, &lit_3866); #pragma pop /* 8046AFF4-8046AFF8 000030 0004+00 0/1 0/0 0/0 .rodata @3867 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3867 = 10000.0f; -COMPILER_STRIP_GATE(8046AFF4, &lit_3867); +COMPILER_STRIP_GATE(0x8046AFF4, &lit_3867); #pragma pop /* 8046AFF8-8046AFFC 000034 0004+00 0/3 0/0 0/0 .rodata @3868 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3868 = 0.5f; -COMPILER_STRIP_GATE(8046AFF8, &lit_3868); +COMPILER_STRIP_GATE(0x8046AFF8, &lit_3868); #pragma pop /* 8046AFFC-8046B000 000038 0004+00 1/6 0/0 0/0 .rodata @3869 */ SECTION_RODATA static f32 const lit_3869 = -1.0f; -COMPILER_STRIP_GATE(8046AFFC, &lit_3869); +COMPILER_STRIP_GATE(0x8046AFFC, &lit_3869); /* 8046B000-8046B004 00003C 0004+00 0/1 0/0 0/0 .rodata @3870 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3870 = -10.0f; -COMPILER_STRIP_GATE(8046B000, &lit_3870); +COMPILER_STRIP_GATE(0x8046B000, &lit_3870); #pragma pop /* 8046B004-8046B00C 000040 0008+00 0/3 0/0 0/0 .rodata @3871 */ @@ -524,7 +524,7 @@ COMPILER_STRIP_GATE(8046B000, &lit_3870); SECTION_RODATA static u8 const lit_3871[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8046B004, &lit_3871); +COMPILER_STRIP_GATE(0x8046B004, &lit_3871); #pragma pop /* 8046B00C-8046B014 000048 0008+00 0/3 0/0 0/0 .rodata @3872 */ @@ -533,7 +533,7 @@ COMPILER_STRIP_GATE(8046B004, &lit_3871); SECTION_RODATA static u8 const lit_3872[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8046B00C, &lit_3872); +COMPILER_STRIP_GATE(0x8046B00C, &lit_3872); #pragma pop /* 8046B014-8046B01C 000050 0008+00 0/3 0/0 0/0 .rodata @3873 */ @@ -542,42 +542,42 @@ COMPILER_STRIP_GATE(8046B00C, &lit_3872); SECTION_RODATA static u8 const lit_3873[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8046B014, &lit_3873); +COMPILER_STRIP_GATE(0x8046B014, &lit_3873); #pragma pop /* 8046B01C-8046B020 000058 0004+00 0/2 0/0 0/0 .rodata @3874 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3874 = 1.0f / 100.0f; -COMPILER_STRIP_GATE(8046B01C, &lit_3874); +COMPILER_STRIP_GATE(0x8046B01C, &lit_3874); #pragma pop /* 8046B020-8046B024 00005C 0004+00 0/1 0/0 0/0 .rodata @3875 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3875 = 11.0f / 10.0f; -COMPILER_STRIP_GATE(8046B020, &lit_3875); +COMPILER_STRIP_GATE(0x8046B020, &lit_3875); #pragma pop /* 8046B024-8046B028 000060 0004+00 0/1 0/0 0/0 .rodata @3876 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3876 = -0.5f; -COMPILER_STRIP_GATE(8046B024, &lit_3876); +COMPILER_STRIP_GATE(0x8046B024, &lit_3876); #pragma pop /* 8046B028-8046B02C 000064 0004+00 0/1 0/0 0/0 .rodata @3877 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3877 = 65536.0f; -COMPILER_STRIP_GATE(8046B028, &lit_3877); +COMPILER_STRIP_GATE(0x8046B028, &lit_3877); #pragma pop /* 8046B02C-8046B030 000068 0004+00 0/1 0/0 0/0 .rodata @3878 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3878 = 7.0f / 10.0f; -COMPILER_STRIP_GATE(8046B02C, &lit_3878); +COMPILER_STRIP_GATE(0x8046B02C, &lit_3878); #pragma pop /* 8046B0F8-8046B104 000000 000C+00 2/2 0/0 0/0 .data cNullVec__6Z2Calc */ @@ -629,35 +629,35 @@ static asm void hahen_normal(ep_class* param_0, ep_hahen_s* param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3959 = 60.0f; -COMPILER_STRIP_GATE(8046B030, &lit_3959); +COMPILER_STRIP_GATE(0x8046B030, &lit_3959); #pragma pop /* 8046B034-8046B038 000070 0004+00 0/3 0/0 0/0 .rodata @3960 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3960 = 3.0f; -COMPILER_STRIP_GATE(8046B034, &lit_3960); +COMPILER_STRIP_GATE(0x8046B034, &lit_3960); #pragma pop /* 8046B038-8046B03C 000074 0004+00 0/1 0/0 0/0 .rodata @3961 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3961 = 19.0f / 20.0f; -COMPILER_STRIP_GATE(8046B038, &lit_3961); +COMPILER_STRIP_GATE(0x8046B038, &lit_3961); #pragma pop /* 8046B03C-8046B040 000078 0004+00 0/1 0/0 0/0 .rodata @3962 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3962 = 2.0f; -COMPILER_STRIP_GATE(8046B03C, &lit_3962); +COMPILER_STRIP_GATE(0x8046B03C, &lit_3962); #pragma pop /* 8046B040-8046B044 00007C 0004+00 0/2 0/0 0/0 .rodata @3963 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3963 = 1.0f / 20.0f; -COMPILER_STRIP_GATE(8046B040, &lit_3963); +COMPILER_STRIP_GATE(0x8046B040, &lit_3963); #pragma pop /* 80468A90-80468E50 000910 03C0+00 1/1 0/0 0/0 .text hahen_water__FP8ep_classP10ep_hahen_s */ @@ -675,28 +675,28 @@ static asm void hahen_water(ep_class* param_0, ep_hahen_s* param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4015 = 80.0f; -COMPILER_STRIP_GATE(8046B044, &lit_4015); +COMPILER_STRIP_GATE(0x8046B044, &lit_4015); #pragma pop /* 8046B048-8046B04C 000084 0004+00 0/2 0/0 0/0 .rodata @4016 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4016 = 10.0f; -COMPILER_STRIP_GATE(8046B048, &lit_4016); +COMPILER_STRIP_GATE(0x8046B048, &lit_4016); #pragma pop /* 8046B04C-8046B050 000088 0004+00 0/3 0/0 0/0 .rodata @4017 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4017 = 70.0f; -COMPILER_STRIP_GATE(8046B04C, &lit_4017); +COMPILER_STRIP_GATE(0x8046B04C, &lit_4017); #pragma pop /* 8046B050-8046B054 00008C 0004+00 0/4 0/0 0/0 .rodata @4018 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4018 = 30.0f; -COMPILER_STRIP_GATE(8046B050, &lit_4018); +COMPILER_STRIP_GATE(0x8046B050, &lit_4018); #pragma pop /* 80468E50-80469034 000CD0 01E4+00 1/1 0/0 0/0 .text hahen_carry__FP8ep_classP10ep_hahen_s */ @@ -724,7 +724,7 @@ static asm void hahen_cast(ep_class* param_0, ep_hahen_s* param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4205 = 20.0f; -COMPILER_STRIP_GATE(8046B054, &lit_4205); +COMPILER_STRIP_GATE(0x8046B054, &lit_4205); #pragma pop /* 804690F8-80469568 000F78 0470+00 1/1 0/0 0/0 .text hahen_move__FP8ep_class */ @@ -747,6 +747,13 @@ static asm void daEp_Draw(ep_class* param_0) { } #pragma pop +/* ############################################################################################## */ +/* 8046B0D0-8046B0D0 00010C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8046B0D0 = "SHOKUDAI_SWITCH"; +#pragma pop + /* 804695F8-80469658 001478 0060+00 2/2 0/0 0/0 .text ep_switch_event_end__FP8ep_class */ #pragma push #pragma optimization_level 0 @@ -757,6 +764,13 @@ static asm void ep_switch_event_end(ep_class* param_0) { } #pragma pop +/* ############################################################################################## */ +/* 8046B0D0-8046B0D0 00010C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8046B0E0 = "SHOKUDAI"; +#pragma pop + /* 80469658-80469700 0014D8 00A8+00 1/1 0/0 0/0 .text ep_switch_event_begin__FP8ep_class */ #pragma push @@ -769,6 +783,13 @@ static asm void ep_switch_event_begin(ep_class* param_0) { #pragma pop /* ############################################################################################## */ +/* 8046B0D0-8046B0D0 00010C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8046B0E9 = "WAIT"; +SECTION_DEAD static char const* const stringBase_8046B0EE = "FIRE"; +#pragma pop + /* 8046B120-8046B128 -00001 0008+00 1/1 0/0 0/0 .data actions$4245 */ SECTION_DATA static void* actions[2] = { (void*)(((char*)&d_a_ep__stringBase0) + 0x19), @@ -791,49 +812,49 @@ static asm void ep_switch_event_move(ep_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4461 = 15.0f; -COMPILER_STRIP_GATE(8046B058, &lit_4461); +COMPILER_STRIP_GATE(0x8046B058, &lit_4461); #pragma pop /* 8046B05C-8046B060 000098 0004+00 0/1 0/0 0/0 .rodata @4462 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4462 = 235.0f; -COMPILER_STRIP_GATE(8046B05C, &lit_4462); +COMPILER_STRIP_GATE(0x8046B05C, &lit_4462); #pragma pop /* 8046B060-8046B064 00009C 0004+00 0/1 0/0 0/0 .rodata @4463 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4463 = -240.0f; -COMPILER_STRIP_GATE(8046B060, &lit_4463); +COMPILER_STRIP_GATE(0x8046B060, &lit_4463); #pragma pop /* 8046B064-8046B068 0000A0 0004+00 0/2 0/0 0/0 .rodata @4464 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4464 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(8046B064, &lit_4464); +COMPILER_STRIP_GATE(0x8046B064, &lit_4464); #pragma pop /* 8046B068-8046B06C 0000A4 0004+00 0/1 0/0 0/0 .rodata @4465 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4465 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(8046B068, &lit_4465); +COMPILER_STRIP_GATE(0x8046B068, &lit_4465); #pragma pop /* 8046B06C-8046B070 0000A8 0004+00 0/1 0/0 0/0 .rodata @4466 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4466 = 500.0f; -COMPILER_STRIP_GATE(8046B06C, &lit_4466); +COMPILER_STRIP_GATE(0x8046B06C, &lit_4466); #pragma pop /* 8046B070-8046B074 0000AC 0004+00 0/2 0/0 0/0 .rodata @4467 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4467 = 4.0f; -COMPILER_STRIP_GATE(8046B070, &lit_4467); +COMPILER_STRIP_GATE(0x8046B070, &lit_4467); #pragma pop /* 8046B128-8046B12C 000030 0004+00 0/1 0/0 0/0 .data l_particle_fire_A$4270 */ @@ -884,14 +905,14 @@ static asm void ep_move(ep_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4502 = 140.0f; -COMPILER_STRIP_GATE(8046B074, &lit_4502); +COMPILER_STRIP_GATE(0x8046B074, &lit_4502); #pragma pop /* 8046B078-8046B07C 0000B4 0004+00 0/1 0/0 0/0 .rodata @4503 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4503 = 280.0f; -COMPILER_STRIP_GATE(8046B078, &lit_4503); +COMPILER_STRIP_GATE(0x8046B078, &lit_4503); #pragma pop /* 80469EDC-8046A0A8 001D5C 01CC+00 1/1 0/0 0/0 .text daEp_set_mtx__FP8ep_class */ @@ -909,127 +930,127 @@ static asm void daEp_set_mtx(ep_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4627 = 8000.0f; -COMPILER_STRIP_GATE(8046B07C, &lit_4627); +COMPILER_STRIP_GATE(0x8046B07C, &lit_4627); #pragma pop /* 8046B080-8046B084 0000BC 0004+00 0/1 0/0 0/0 .rodata @4628 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4628 = -100.0f; -COMPILER_STRIP_GATE(8046B080, &lit_4628); +COMPILER_STRIP_GATE(0x8046B080, &lit_4628); #pragma pop /* 8046B084-8046B088 0000C0 0004+00 0/1 0/0 0/0 .rodata @4629 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4629 = -9.0f / 10.0f; -COMPILER_STRIP_GATE(8046B084, &lit_4629); +COMPILER_STRIP_GATE(0x8046B084, &lit_4629); #pragma pop /* 8046B088-8046B08C 0000C4 0004+00 0/1 0/0 0/0 .rodata @4630 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4630 = 1000000.0f; -COMPILER_STRIP_GATE(8046B088, &lit_4630); +COMPILER_STRIP_GATE(0x8046B088, &lit_4630); #pragma pop /* 8046B08C-8046B090 0000C8 0004+00 0/1 0/0 0/0 .rodata @4631 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4631 = -30.0f; -COMPILER_STRIP_GATE(8046B08C, &lit_4631); +COMPILER_STRIP_GATE(0x8046B08C, &lit_4631); #pragma pop /* 8046B090-8046B094 0000CC 0004+00 0/1 0/0 0/0 .rodata @4632 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4632 = 180.0f; -COMPILER_STRIP_GATE(8046B090, &lit_4632); +COMPILER_STRIP_GATE(0x8046B090, &lit_4632); #pragma pop /* 8046B094-8046B098 0000D0 0004+00 0/1 0/0 0/0 .rodata @4633 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4633 = 8.0f; -COMPILER_STRIP_GATE(8046B094, &lit_4633); +COMPILER_STRIP_GATE(0x8046B094, &lit_4633); #pragma pop /* 8046B098-8046B09C 0000D4 0004+00 0/1 0/0 0/0 .rodata @4634 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4634 = 11.0f / 20.0f; -COMPILER_STRIP_GATE(8046B098, &lit_4634); +COMPILER_STRIP_GATE(0x8046B098, &lit_4634); #pragma pop /* 8046B09C-8046B0A0 0000D8 0004+00 0/1 0/0 0/0 .rodata @4635 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4635 = 0.75f; -COMPILER_STRIP_GATE(8046B09C, &lit_4635); +COMPILER_STRIP_GATE(0x8046B09C, &lit_4635); #pragma pop /* 8046B0A0-8046B0A4 0000DC 0004+00 0/1 0/0 0/0 .rodata @4636 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4636 = 3.0f / 40.0f; -COMPILER_STRIP_GATE(8046B0A0, &lit_4636); +COMPILER_STRIP_GATE(0x8046B0A0, &lit_4636); #pragma pop /* 8046B0A4-8046B0A8 0000E0 0004+00 0/1 0/0 0/0 .rodata @4637 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4637 = 2.0f / 5.0f; -COMPILER_STRIP_GATE(8046B0A4, &lit_4637); +COMPILER_STRIP_GATE(0x8046B0A4, &lit_4637); #pragma pop /* 8046B0A8-8046B0AC 0000E4 0004+00 0/1 0/0 0/0 .rodata @4638 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4638 = 1.0f / 25.0f; -COMPILER_STRIP_GATE(8046B0A8, &lit_4638); +COMPILER_STRIP_GATE(0x8046B0A8, &lit_4638); #pragma pop /* 8046B0AC-8046B0B0 0000E8 0004+00 1/2 0/0 0/0 .rodata @4639 */ SECTION_RODATA static f32 const lit_4639 = -160.0f; -COMPILER_STRIP_GATE(8046B0AC, &lit_4639); +COMPILER_STRIP_GATE(0x8046B0AC, &lit_4639); /* 8046B0B0-8046B0B4 0000EC 0004+00 1/2 0/0 0/0 .rodata @4640 */ SECTION_RODATA static f32 const lit_4640 = 160.0f; -COMPILER_STRIP_GATE(8046B0B0, &lit_4640); +COMPILER_STRIP_GATE(0x8046B0B0, &lit_4640); /* 8046B0B4-8046B0B8 0000F0 0004+00 0/1 0/0 0/0 .rodata @4641 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4641 = 40.0f; -COMPILER_STRIP_GATE(8046B0B4, &lit_4641); +COMPILER_STRIP_GATE(0x8046B0B4, &lit_4641); #pragma pop /* 8046B0B8-8046B0BC 0000F4 0004+00 0/1 0/0 0/0 .rodata @4642 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4642 = 110.0f; -COMPILER_STRIP_GATE(8046B0B8, &lit_4642); +COMPILER_STRIP_GATE(0x8046B0B8, &lit_4642); #pragma pop /* 8046B0BC-8046B0C0 0000F8 0004+00 0/1 0/0 0/0 .rodata @4643 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4643 = 3000.0f; -COMPILER_STRIP_GATE(8046B0BC, &lit_4643); +COMPILER_STRIP_GATE(0x8046B0BC, &lit_4643); #pragma pop /* 8046B0C0-8046B0C4 0000FC 0004+00 0/1 0/0 0/0 .rodata @4644 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4644 = 1000.0f; -COMPILER_STRIP_GATE(8046B0C0, &lit_4644); +COMPILER_STRIP_GATE(0x8046B0C0, &lit_4644); #pragma pop /* 8046B0C4-8046B0C8 000100 0004+00 0/1 0/0 0/0 .rodata @4645 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4645 = 2000.0f; -COMPILER_STRIP_GATE(8046B0C4, &lit_4645); +COMPILER_STRIP_GATE(0x8046B0C4, &lit_4645); #pragma pop /* 8046B134-8046B13C 00003C 0006+02 1/1 0/0 0/0 .data eff_name$4560 */ @@ -1060,6 +1081,13 @@ static bool daEp_IsDelete(ep_class* param_0) { return true; } +/* ############################################################################################## */ +/* 8046B0D0-8046B0D0 00010C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8046B0F3 = "Ep"; +#pragma pop + /* 8046A6DC-8046A724 00255C 0048+00 1/0 0/0 0/0 .text daEp_Delete__FP8ep_class */ #pragma push #pragma optimization_level 0 @@ -1102,14 +1130,14 @@ static asm void daEp_CreateInit(fopAc_ac_c* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4763 = 240.0f; -COMPILER_STRIP_GATE(8046B0C8, &lit_4763); +COMPILER_STRIP_GATE(0x8046B0C8, &lit_4763); #pragma pop /* 8046B0CC-8046B0D0 000108 0004+00 0/1 0/0 0/0 .rodata @4764 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4764 = 255.0f; -COMPILER_STRIP_GATE(8046B0CC, &lit_4764); +COMPILER_STRIP_GATE(0x8046B0CC, &lit_4764); #pragma pop /* 8046B15C-8046B19C 000064 0040+00 0/1 0/0 0/0 .data sph_src$4695 */ @@ -1347,13 +1375,4 @@ static asm void func_8046AFB4() { } #pragma pop -/* 8046B0D0-8046B0F6 00010C 0026+00 7/6 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_8046B0D0 = "SHOKUDAI_SWITCH"; -SECTION_DEAD static char const* const stringBase_8046B0E0 = "SHOKUDAI"; -SECTION_DEAD static char const* const stringBase_8046B0E9 = "WAIT"; -SECTION_DEAD static char const* const stringBase_8046B0EE = "FIRE"; -SECTION_DEAD static char const* const stringBase_8046B0F3 = "Ep"; -#pragma pop +/* 8046B0D0-8046B0D0 00010C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/d_a_formation_mng/d_a_formation_mng.cpp b/rel/d/a/d_a_formation_mng/d_a_formation_mng.cpp index 4106cf4f7c1..a42f673bbce 100644 --- a/rel/d/a/d_a_formation_mng/d_a_formation_mng.cpp +++ b/rel/d/a/d_a_formation_mng/d_a_formation_mng.cpp @@ -202,24 +202,24 @@ SECTION_RODATA u8 const daFmtMng_c::M_attr[24] = { 0x00, 0x00, 0x00, 0x14, 0x40, 0xC0, 0x00, 0x00, 0x3F, 0x00, 0x00, 0x00, 0x42, 0xF0, 0x00, 0x00, 0x43, 0x16, 0x00, 0x00, 0x00, 0x0A, 0x40, 0x00, }; -COMPILER_STRIP_GATE(808378A8, &daFmtMng_c::M_attr); +COMPILER_STRIP_GATE(0x808378A8, &daFmtMng_c::M_attr); /* 808378C0-808378C4 000018 0004+00 1/7 0/0 0/0 .rodata @3979 */ SECTION_RODATA static f32 const lit_3979 = 1.0f; -COMPILER_STRIP_GATE(808378C0, &lit_3979); +COMPILER_STRIP_GATE(0x808378C0, &lit_3979); /* 808378C4-808378C8 00001C 0004+00 0/6 0/0 0/0 .rodata @3980 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3980 = 12.0f; -COMPILER_STRIP_GATE(808378C4, &lit_3980); +COMPILER_STRIP_GATE(0x808378C4, &lit_3980); #pragma pop /* 808378C8-808378CC 000020 0004+00 0/6 0/0 0/0 .rodata @3981 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3981 = 5.0f; -COMPILER_STRIP_GATE(808378C8, &lit_3981); +COMPILER_STRIP_GATE(0x808378C8, &lit_3981); #pragma pop /* 80835558-80835624 000078 00CC+00 1/0 0/0 0/0 .text initWait__10daFmtMng_cFv */ @@ -240,7 +240,7 @@ SECTION_RODATA static u8 const lit_4082[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(808378CC, &lit_4082); +COMPILER_STRIP_GATE(0x808378CC, &lit_4082); /* 808378D0-808378D8 000028 0008+00 0/5 0/0 0/0 .rodata @4083 */ #pragma push @@ -248,7 +248,7 @@ COMPILER_STRIP_GATE(808378CC, &lit_4082); SECTION_RODATA static u8 const lit_4083[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(808378D0, &lit_4083); +COMPILER_STRIP_GATE(0x808378D0, &lit_4083); #pragma pop /* 808378D8-808378E0 000030 0008+00 0/5 0/0 0/0 .rodata @4084 */ @@ -257,7 +257,7 @@ COMPILER_STRIP_GATE(808378D0, &lit_4083); SECTION_RODATA static u8 const lit_4084[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(808378D8, &lit_4084); +COMPILER_STRIP_GATE(0x808378D8, &lit_4084); #pragma pop /* 808378E0-808378E8 000038 0008+00 0/5 0/0 0/0 .rodata @4085 */ @@ -266,21 +266,21 @@ COMPILER_STRIP_GATE(808378D8, &lit_4084); SECTION_RODATA static u8 const lit_4085[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(808378E0, &lit_4085); +COMPILER_STRIP_GATE(0x808378E0, &lit_4085); #pragma pop /* 808378E8-808378EC 000040 0004+00 0/3 0/0 0/0 .rodata @4086 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4086 = 200.0f; -COMPILER_STRIP_GATE(808378E8, &lit_4086); +COMPILER_STRIP_GATE(0x808378E8, &lit_4086); #pragma pop /* 808378EC-808378F0 000044 0004+00 0/2 0/0 0/0 .rodata @4087 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4087 = 0.5f; -COMPILER_STRIP_GATE(808378EC, &lit_4087); +COMPILER_STRIP_GATE(0x808378EC, &lit_4087); #pragma pop /* 808378F0-808378F8 000048 0008+00 0/2 0/0 0/0 .rodata @4089 */ @@ -289,7 +289,7 @@ COMPILER_STRIP_GATE(808378EC, &lit_4087); SECTION_RODATA static u8 const lit_4089[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(808378F0, &lit_4089); +COMPILER_STRIP_GATE(0x808378F0, &lit_4089); #pragma pop /* 80835624-80835B24 000144 0500+00 2/2 0/0 0/0 .text initMemberPos__10daFmtMng_cFv */ @@ -468,7 +468,7 @@ asm void daFmtMng_c::executeWalk() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4357 = 1000000000.0f; -COMPILER_STRIP_GATE(808378F8, &lit_4357); +COMPILER_STRIP_GATE(0x808378F8, &lit_4357); #pragma pop /* 8083622C-808365B0 000D4C 0384+00 1/1 0/0 0/0 .text setMovePath__10daFmtMng_cFP8FmtPos_ci */ @@ -496,7 +496,7 @@ asm void daFmtMng_Path_c::checkPathEnd(cXyz param_0, f32 param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4408 = 10.0f; -COMPILER_STRIP_GATE(808378FC, &lit_4408); +COMPILER_STRIP_GATE(0x808378FC, &lit_4408); #pragma pop /* 8083665C-80836810 00117C 01B4+00 2/2 0/0 0/0 .text checkPoint__15daFmtMng_Path_cF4cXyzf */ @@ -569,28 +569,28 @@ asm void daFmtMng_c::executeMotion() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4595 = -40.0f; -COMPILER_STRIP_GATE(80837900, &lit_4595); +COMPILER_STRIP_GATE(0x80837900, &lit_4595); #pragma pop /* 80837904-80837908 00005C 0004+00 0/1 0/0 0/0 .rodata @4596 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4596 = -10.0f; -COMPILER_STRIP_GATE(80837904, &lit_4596); +COMPILER_STRIP_GATE(0x80837904, &lit_4596); #pragma pop /* 80837908-8083790C 000060 0004+00 0/1 0/0 0/0 .rodata @4597 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4597 = -80.0f; -COMPILER_STRIP_GATE(80837908, &lit_4597); +COMPILER_STRIP_GATE(0x80837908, &lit_4597); #pragma pop /* 8083790C-80837910 000064 0004+00 0/1 0/0 0/0 .rodata @4598 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4598 = 40.0f; -COMPILER_STRIP_GATE(8083790C, &lit_4598); +COMPILER_STRIP_GATE(0x8083790C, &lit_4598); #pragma pop /* 80837910-80837918 000068 0004+04 0/1 0/0 0/0 .rodata @4599 */ @@ -601,7 +601,7 @@ SECTION_RODATA static f32 const lit_4599[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80837910, &lit_4599); +COMPILER_STRIP_GATE(0x80837910, &lit_4599); #pragma pop /* 80836F78-80837078 001A98 0100+00 1/0 0/0 0/0 .text initFight__10daFmtMng_cFv */ @@ -636,7 +636,7 @@ static bool daFmtMng_Draw(daFmtMng_c* param_0) { SECTION_RODATA static u8 const lit_4714[8] = { 0x40, 0x7F, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80837918, &lit_4714); +COMPILER_STRIP_GATE(0x80837918, &lit_4714); #pragma pop /* 80837920-80837928 000078 0008+00 0/1 0/0 0/0 .rodata @4715 */ @@ -645,7 +645,7 @@ COMPILER_STRIP_GATE(80837918, &lit_4714); SECTION_RODATA static u8 const lit_4715[8] = { 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80837920, &lit_4715); +COMPILER_STRIP_GATE(0x80837920, &lit_4715); #pragma pop /* 80837258-808373BC 001D78 0164+00 1/0 0/0 0/0 .text daFmtMng_Execute__FP10daFmtMng_c */ @@ -707,7 +707,7 @@ asm void daFmtMng_c::create() { /* ############################################################################################## */ /* 80837928-8083792C 000080 0004+00 1/1 0/0 0/0 .rodata @4802 */ SECTION_RODATA static f32 const lit_4802 = -1.0f; -COMPILER_STRIP_GATE(80837928, &lit_4802); +COMPILER_STRIP_GATE(0x80837928, &lit_4802); /* 8083750C-80837798 00202C 028C+00 1/1 0/0 0/0 .text create_init__10daFmtMng_cFv */ #pragma push @@ -736,7 +736,7 @@ asm void __sinit_d_a_formation_mng_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_8083779C = (void*)__sinit_d_a_formation_mng_cpp; +REGISTER_CTORS(0x8083779C, __sinit_d_a_formation_mng_cpp); #pragma pop /* ############################################################################################## */ diff --git a/rel/d/a/d_a_fr/d_a_fr.cpp b/rel/d/a/d_a_fr/d_a_fr.cpp index 6195e782333..8ea68a392bf 100644 --- a/rel/d/a/d_a_fr/d_a_fr.cpp +++ b/rel/d/a/d_a_fr/d_a_fr.cpp @@ -34,10 +34,10 @@ struct mDoExt_McaMorfCallBack1_c {}; struct Vec {}; -struct J3DModelData {}; - struct J3DAnmTransform {}; +struct J3DModelData {}; + struct mDoExt_McaMorf { /* 8000FC4C */ mDoExt_McaMorf(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, int, @@ -123,10 +123,10 @@ struct dBgS_AcchCir { /* 80075F58 */ void SetWall(f32, f32); }; -struct dBgS {}; - struct csXyz {}; +struct dBgS {}; + struct dBgS_Acch { /* 80075F94 */ ~dBgS_Acch(); /* 800760A0 */ dBgS_Acch(); @@ -317,45 +317,45 @@ extern "C" void __register_global_object(); /* ############################################################################################## */ /* 8051B9C8-8051B9CC 000000 0004+00 15/15 0/0 0/0 .rodata @3649 */ SECTION_RODATA static f32 const lit_3649 = 10.0f; -COMPILER_STRIP_GATE(8051B9C8, &lit_3649); +COMPILER_STRIP_GATE(0x8051B9C8, &lit_3649); /* 8051B9CC-8051B9D0 000004 0004+00 1/6 0/0 0/0 .rodata @3650 */ SECTION_RODATA static f32 const lit_3650 = 20.0f; -COMPILER_STRIP_GATE(8051B9CC, &lit_3650); +COMPILER_STRIP_GATE(0x8051B9CC, &lit_3650); /* 8051B9D0-8051B9D4 000008 0004+00 0/1 0/0 0/0 .rodata @3651 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3651 = -5.0f; -COMPILER_STRIP_GATE(8051B9D0, &lit_3651); +COMPILER_STRIP_GATE(0x8051B9D0, &lit_3651); #pragma pop /* 8051B9D4-8051B9D8 00000C 0004+00 0/2 0/0 0/0 .rodata @3652 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3652 = 300.0f; -COMPILER_STRIP_GATE(8051B9D4, &lit_3652); +COMPILER_STRIP_GATE(0x8051B9D4, &lit_3652); #pragma pop /* 8051B9D8-8051B9DC 000010 0004+00 0/1 0/0 0/0 .rodata @3653 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3653 = 15.0f; -COMPILER_STRIP_GATE(8051B9D8, &lit_3653); +COMPILER_STRIP_GATE(0x8051B9D8, &lit_3653); #pragma pop /* 8051B9DC-8051B9E0 000014 0004+00 0/5 0/0 0/0 .rodata @3654 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3654 = 5.0f; -COMPILER_STRIP_GATE(8051B9DC, &lit_3654); +COMPILER_STRIP_GATE(0x8051B9DC, &lit_3654); #pragma pop /* 8051B9E0-8051B9E4 000018 0004+00 0/1 0/0 0/0 .rodata @3655 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3655 = 6.0f; -COMPILER_STRIP_GATE(8051B9E0, &lit_3655); +COMPILER_STRIP_GATE(0x8051B9E0, &lit_3655); #pragma pop /* 8051BA94-8051BB60 -00001 00CC+00 1/1 0/0 0/0 .data @4226 */ @@ -466,11 +466,17 @@ SECTION_RODATA static u8 const lit_3669[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(8051B9E4, &lit_3669); +COMPILER_STRIP_GATE(0x8051B9E4, &lit_3669); /* 8051B9E8-8051B9EC 000020 0004+00 1/2 0/0 0/0 .rodata @3670 */ SECTION_RODATA static f32 const lit_3670 = -1.0f; -COMPILER_STRIP_GATE(8051B9E8, &lit_3670); +COMPILER_STRIP_GATE(0x8051B9E8, &lit_3670); + +/* 8051BA88-8051BA88 0000C0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8051BA88 = "Fr"; +#pragma pop /* 8051994C-805199F4 00014C 00A8+00 7/7 0/0 0/0 .text anm_init__FP8fr_classifUcf */ #pragma push @@ -485,7 +491,7 @@ static asm void anm_init(fr_class* param_0, int param_1, f32 param_2, u8 param_3 /* ############################################################################################## */ /* 8051B9EC-8051B9F0 000024 0004+00 2/10 0/0 0/0 .rodata @3691 */ SECTION_RODATA static f32 const lit_3691 = 1.0f; -COMPILER_STRIP_GATE(8051B9EC, &lit_3691); +COMPILER_STRIP_GATE(0x8051B9EC, &lit_3691); /* 805199F4-80519AB8 0001F4 00C4+00 1/0 0/0 0/0 .text daFr_Draw__FP8fr_class */ #pragma push @@ -504,7 +510,7 @@ SECTION_RODATA static f32 const lit_3700[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(8051B9F0, &lit_3700); +COMPILER_STRIP_GATE(0x8051B9F0, &lit_3700); /* 80519AB8-80519B14 0002B8 005C+00 1/1 0/0 0/0 .text sibuki_set__FP8fr_class */ #pragma push @@ -533,7 +539,7 @@ static asm void s_wd_sub(void* param_0, void* param_1) { SECTION_RODATA static u8 const lit_3762[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8051B9F8, &lit_3762); +COMPILER_STRIP_GATE(0x8051B9F8, &lit_3762); #pragma pop /* 8051BA00-8051BA08 000038 0008+00 0/1 0/0 0/0 .rodata @3763 */ @@ -542,7 +548,7 @@ COMPILER_STRIP_GATE(8051B9F8, &lit_3762); SECTION_RODATA static u8 const lit_3763[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8051BA00, &lit_3763); +COMPILER_STRIP_GATE(0x8051BA00, &lit_3763); #pragma pop /* 8051BA08-8051BA10 000040 0008+00 0/1 0/0 0/0 .rodata @3764 */ @@ -551,14 +557,14 @@ COMPILER_STRIP_GATE(8051BA00, &lit_3763); SECTION_RODATA static u8 const lit_3764[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8051BA08, &lit_3764); +COMPILER_STRIP_GATE(0x8051BA08, &lit_3764); #pragma pop /* 8051BA10-8051BA14 000048 0004+00 0/1 0/0 0/0 .rodata @3765 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3765 = 22.0f; -COMPILER_STRIP_GATE(8051BA10, &lit_3765); +COMPILER_STRIP_GATE(0x8051BA10, &lit_3765); #pragma pop /* 80519B60-80519D28 000360 01C8+00 1/1 0/0 0/0 .text wd_check__FP8fr_class */ @@ -576,7 +582,7 @@ static asm void wd_check(fr_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3796 = 50.0f; -COMPILER_STRIP_GATE(8051BA14, &lit_3796); +COMPILER_STRIP_GATE(0x8051BA14, &lit_3796); #pragma pop /* 80519D28-80519E24 000528 00FC+00 4/4 0/0 0/0 .text way_bg_check__FP8fr_class */ @@ -594,21 +600,21 @@ static asm void way_bg_check(fr_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3849 = 4.0f / 5.0f; -COMPILER_STRIP_GATE(8051BA18, &lit_3849); +COMPILER_STRIP_GATE(0x8051BA18, &lit_3849); #pragma pop /* 8051BA1C-8051BA20 000054 0004+00 0/3 0/0 0/0 .rodata @3850 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3850 = 2.0f; -COMPILER_STRIP_GATE(8051BA1C, &lit_3850); +COMPILER_STRIP_GATE(0x8051BA1C, &lit_3850); #pragma pop /* 8051BA20-8051BA24 000058 0004+00 0/3 0/0 0/0 .rodata @3851 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3851 = 0.5f; -COMPILER_STRIP_GATE(8051BA20, &lit_3851); +COMPILER_STRIP_GATE(0x8051BA20, &lit_3851); #pragma pop /* 8051BC10-8051BC14 000008 0004+00 2/2 0/0 0/0 .bss None */ @@ -635,28 +641,28 @@ static asm void fr_normal(fr_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3901 = 3.0f; -COMPILER_STRIP_GATE(8051BA24, &lit_3901); +COMPILER_STRIP_GATE(0x8051BA24, &lit_3901); #pragma pop /* 8051BA28-8051BA2C 000060 0004+00 0/1 0/0 0/0 .rodata @3902 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3902 = 4.0f; -COMPILER_STRIP_GATE(8051BA28, &lit_3902); +COMPILER_STRIP_GATE(0x8051BA28, &lit_3902); #pragma pop /* 8051BA2C-8051BA30 000064 0004+00 0/2 0/0 0/0 .rodata @3903 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3903 = 8000.0f; -COMPILER_STRIP_GATE(8051BA2C, &lit_3903); +COMPILER_STRIP_GATE(0x8051BA2C, &lit_3903); #pragma pop /* 8051BA30-8051BA34 000068 0004+00 0/2 0/0 0/0 .rodata @3904 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3904 = 200.0f; -COMPILER_STRIP_GATE(8051BA30, &lit_3904); +COMPILER_STRIP_GATE(0x8051BA30, &lit_3904); #pragma pop /* 8051A0D8-8051A318 0008D8 0240+00 1/2 0/0 0/0 .text fr_away__FP8fr_class */ @@ -674,28 +680,28 @@ static asm void fr_away(fr_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3957 = 1.5f; -COMPILER_STRIP_GATE(8051BA34, &lit_3957); +COMPILER_STRIP_GATE(0x8051BA34, &lit_3957); #pragma pop /* 8051BA38-8051BA3C 000070 0004+00 0/2 0/0 0/0 .rodata @3958 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3958 = 100.0f; -COMPILER_STRIP_GATE(8051BA38, &lit_3958); +COMPILER_STRIP_GATE(0x8051BA38, &lit_3958); #pragma pop /* 8051BA3C-8051BA40 000074 0004+00 0/2 0/0 0/0 .rodata @3959 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3959 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(8051BA3C, &lit_3959); +COMPILER_STRIP_GATE(0x8051BA3C, &lit_3959); #pragma pop /* 8051BA40-8051BA44 000078 0004+00 0/2 0/0 0/0 .rodata @3960 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3960 = 1.0f / 20.0f; -COMPILER_STRIP_GATE(8051BA40, &lit_3960); +COMPILER_STRIP_GATE(0x8051BA40, &lit_3960); #pragma pop /* 8051A318-8051A558 000B18 0240+00 1/1 0/0 0/0 .text fr_s_normal__FP8fr_class */ @@ -713,21 +719,21 @@ static asm void fr_s_normal(fr_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3981 = 30.0f; -COMPILER_STRIP_GATE(8051BA44, &lit_3981); +COMPILER_STRIP_GATE(0x8051BA44, &lit_3981); #pragma pop /* 8051BA48-8051BA4C 000080 0004+00 0/1 0/0 0/0 .rodata @3982 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3982 = 13.0f; -COMPILER_STRIP_GATE(8051BA48, &lit_3982); +COMPILER_STRIP_GATE(0x8051BA48, &lit_3982); #pragma pop /* 8051BA4C-8051BA50 000084 0004+00 0/1 0/0 0/0 .rodata @3983 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3983 = 3.0f / 20.0f; -COMPILER_STRIP_GATE(8051BA4C, &lit_3983); +COMPILER_STRIP_GATE(0x8051BA4C, &lit_3983); #pragma pop /* 8051A558-8051A620 000D58 00C8+00 1/1 0/0 0/0 .text fr_s_wait__FP8fr_class */ @@ -765,35 +771,35 @@ static asm void fr_eat(fr_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4108 = 0x3FAA3D71; -COMPILER_STRIP_GATE(8051BA50, &lit_4108); +COMPILER_STRIP_GATE(0x8051BA50, &lit_4108); #pragma pop /* 8051BA54-8051BA58 00008C 0004+00 0/1 0/0 0/0 .rodata @4109 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4109 = -5000.0f; -COMPILER_STRIP_GATE(8051BA54, &lit_4109); +COMPILER_STRIP_GATE(0x8051BA54, &lit_4109); #pragma pop /* 8051BA58-8051BA5C 000090 0004+00 0/1 0/0 0/0 .rodata @4110 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4110 = 700.0f; -COMPILER_STRIP_GATE(8051BA58, &lit_4110); +COMPILER_STRIP_GATE(0x8051BA58, &lit_4110); #pragma pop /* 8051BA5C-8051BA60 000094 0004+00 0/2 0/0 0/0 .rodata @4111 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4111 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(8051BA5C, &lit_4111); +COMPILER_STRIP_GATE(0x8051BA5C, &lit_4111); #pragma pop /* 8051BA60-8051BA64 000098 0004+00 0/2 0/0 0/0 .rodata @4112 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4112 = 500.0f; -COMPILER_STRIP_GATE(8051BA60, &lit_4112); +COMPILER_STRIP_GATE(0x8051BA60, &lit_4112); #pragma pop /* 8051A904-8051AA9C 001104 0198+00 2/2 0/0 0/0 .text swim_on__FP8fr_class */ @@ -811,14 +817,14 @@ static asm void swim_on(fr_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4144 = -500.0f; -COMPILER_STRIP_GATE(8051BA64, &lit_4144); +COMPILER_STRIP_GATE(0x8051BA64, &lit_4144); #pragma pop /* 8051BA68-8051BA6C 0000A0 0004+00 0/2 0/0 0/0 .rodata @4145 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4145 = 2.0f / 5.0f; -COMPILER_STRIP_GATE(8051BA68, &lit_4145); +COMPILER_STRIP_GATE(0x8051BA68, &lit_4145); #pragma pop /* 8051AA9C-8051AC2C 00129C 0190+00 1/1 0/0 0/0 .text swim_off__FP8fr_class */ @@ -836,7 +842,7 @@ static asm void swim_off(fr_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4158 = 400.0f; -COMPILER_STRIP_GATE(8051BA6C, &lit_4158); +COMPILER_STRIP_GATE(0x8051BA6C, &lit_4158); #pragma pop /* 8051AC2C-8051AD04 00142C 00D8+00 1/1 0/0 0/0 .text fr_message__FP8fr_class */ @@ -874,14 +880,14 @@ static asm void message(fr_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4224 = -80.0f; -COMPILER_STRIP_GATE(8051BA70, &lit_4224); +COMPILER_STRIP_GATE(0x8051BA70, &lit_4224); #pragma pop /* 8051BA74-8051BA78 0000AC 0004+00 0/0 0/0 0/0 .rodata @4225 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4225 = 7.0f / 20.0f; -COMPILER_STRIP_GATE(8051BA74, &lit_4225); +COMPILER_STRIP_GATE(0x8051BA74, &lit_4225); #pragma pop /* 8051BA78-8051BA80 0000B0 0008+00 0/1 0/0 0/0 .rodata @4322 */ @@ -890,7 +896,7 @@ COMPILER_STRIP_GATE(8051BA74, &lit_4225); SECTION_RODATA static u8 const lit_4322[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8051BA78, &lit_4322); +COMPILER_STRIP_GATE(0x8051BA78, &lit_4322); #pragma pop /* 8051B170-8051B354 001970 01E4+00 2/1 0/0 0/0 .text daFr_Execute__FP8fr_class */ @@ -943,14 +949,20 @@ asm J3DFrameCtrl::~J3DFrameCtrl() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4466 = 0.75f; -COMPILER_STRIP_GATE(8051BA80, &lit_4466); +COMPILER_STRIP_GATE(0x8051BA80, &lit_4466); #pragma pop /* 8051BA84-8051BA88 0000BC 0004+00 0/1 0/0 0/0 .rodata @4467 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4467 = 65536.0f; -COMPILER_STRIP_GATE(8051BA84, &lit_4467); +COMPILER_STRIP_GATE(0x8051BA84, &lit_4467); +#pragma pop + +/* 8051BA88-8051BA88 0000C0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8051BA8B = "F_SP127"; #pragma pop /* 8051B598-8051B820 001D98 0288+00 1/0 0/0 0/0 .text daFr_Create__FP10fopAc_ac_c */ @@ -1015,7 +1027,7 @@ asm void __sinit_d_a_fr_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_8051B968 = (void*)__sinit_d_a_fr_cpp; +REGISTER_CTORS(0x8051B968, __sinit_d_a_fr_cpp); #pragma pop /* 8051B9A4-8051B9AC 0021A4 0008+00 1/0 0/0 0/0 .text @36@__dt__12dBgS_ObjAcchFv */ @@ -1038,10 +1050,4 @@ static asm void func_8051B9AC() { } #pragma pop -/* 8051BA88-8051BA93 0000C0 000B+00 4/4 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_8051BA88 = "Fr"; -SECTION_DEAD static char const* const stringBase_8051BA8B = "F_SP127"; -#pragma pop +/* 8051BA88-8051BA88 0000C0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/d_a_grass/d_a_grass.cpp b/rel/d/a/d_a_grass/d_a_grass.cpp index 5baa0247a4b..74aaecb3d77 100644 --- a/rel/d/a/d_a_grass/d_a_grass.cpp +++ b/rel/d/a/d_a_grass/d_a_grass.cpp @@ -75,13 +75,13 @@ struct dPa_levelEcallBack {}; struct dKy_tevstr_c {}; -struct _GXColor {}; - struct csXyz { /* 802673F4 */ csXyz(s16, s16, s16); /* 8051EB4C */ ~csXyz(); }; +struct _GXColor {}; + struct dPa_control_c { /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, @@ -252,7 +252,7 @@ extern "C" void create__9daGrass_cFv(); extern "C" static void daGrass_Delete__FP9daGrass_c(); extern "C" static void daGrass_execute__FP9daGrass_c(); extern "C" static void daGrass_draw__FP9daGrass_c(); -extern "C" void func_8051D7B4(u8*); +extern "C" void func_8051D7B4(void* _this, u8*); extern "C" void __sinit_d_a_grass_cpp(); extern "C" void WorkCo__13dGrass_data_cFP10fopAc_ac_cUli(); extern "C" void WorkAt_NoCutAnim__13dGrass_data_cFP10fopAc_ac_cUliP15dCcMassS_HitInfP8cCcD_Obj(); @@ -428,7 +428,7 @@ extern "C" void __register_global_object(); /* ############################################################################################## */ /* 80523028-8052302C 000000 0004+00 14/14 0/0 0/0 .rodata @3999 */ SECTION_RODATA static f32 const lit_3999 = 3.0f / 5.0f; -COMPILER_STRIP_GATE(80523028, &lit_3999); +COMPILER_STRIP_GATE(0x80523028, &lit_3999); /* 8052302C-80523030 000004 0004+00 1/10 0/0 0/0 .rodata @4000 */ SECTION_RODATA static u8 const lit_4000[4] = { @@ -437,90 +437,90 @@ SECTION_RODATA static u8 const lit_4000[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(8052302C, &lit_4000); +COMPILER_STRIP_GATE(0x8052302C, &lit_4000); /* 80523030-80523034 000008 0004+00 0/1 0/0 0/0 .rodata @4001 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4001 = 1600.0f; -COMPILER_STRIP_GATE(80523030, &lit_4001); +COMPILER_STRIP_GATE(0x80523030, &lit_4001); #pragma pop /* 80523034-80523038 00000C 0004+00 0/5 0/0 0/0 .rodata @4002 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4002 = 40.0f; -COMPILER_STRIP_GATE(80523034, &lit_4002); +COMPILER_STRIP_GATE(0x80523034, &lit_4002); #pragma pop /* 80523038-8052303C 000010 0004+00 0/2 0/0 0/0 .rodata @4003 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4003 = 65.0f; -COMPILER_STRIP_GATE(80523038, &lit_4003); +COMPILER_STRIP_GATE(0x80523038, &lit_4003); #pragma pop /* 8052303C-80523040 000014 0004+00 0/3 0/0 0/0 .rodata @4148 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4148 = 5.0f; -COMPILER_STRIP_GATE(8052303C, &lit_4148); +COMPILER_STRIP_GATE(0x8052303C, &lit_4148); #pragma pop /* 80523040-80523044 000018 0004+00 0/2 0/0 0/0 .rodata @4149 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4149 = 9.0f / 10.0f; -COMPILER_STRIP_GATE(80523040, &lit_4149); +COMPILER_STRIP_GATE(0x80523040, &lit_4149); #pragma pop /* 80523044-80523048 00001C 0004+00 0/3 0/0 0/0 .rodata @4150 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4150 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(80523044, &lit_4150); +COMPILER_STRIP_GATE(0x80523044, &lit_4150); #pragma pop /* 80523048-8052304C 000020 0004+00 0/1 0/0 0/0 .rodata @4151 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4151 = 2.5f; -COMPILER_STRIP_GATE(80523048, &lit_4151); +COMPILER_STRIP_GATE(0x80523048, &lit_4151); #pragma pop /* 8052304C-80523050 000024 0004+00 0/3 0/0 0/0 .rodata @4152 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4152 = 0.5f; -COMPILER_STRIP_GATE(8052304C, &lit_4152); +COMPILER_STRIP_GATE(0x8052304C, &lit_4152); #pragma pop /* 80523050-80523054 000028 0004+00 0/1 0/0 0/0 .rodata @4153 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4153 = 1.5f; -COMPILER_STRIP_GATE(80523050, &lit_4153); +COMPILER_STRIP_GATE(0x80523050, &lit_4153); #pragma pop /* 80523054-80523058 00002C 0004+00 0/1 0/0 0/0 .rodata @4154 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4154 = 1.0f / 20.0f; -COMPILER_STRIP_GATE(80523054, &lit_4154); +COMPILER_STRIP_GATE(0x80523054, &lit_4154); #pragma pop /* 80523058-8052305C 000030 0004+00 0/1 0/0 0/0 .rodata @4155 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4155 = 20.0f; -COMPILER_STRIP_GATE(80523058, &lit_4155); +COMPILER_STRIP_GATE(0x80523058, &lit_4155); #pragma pop /* 8052305C-80523060 000034 0004+00 0/3 0/0 0/0 .rodata @4156 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4156 = 3.0f / 10.0f; -COMPILER_STRIP_GATE(8052305C, &lit_4156); +COMPILER_STRIP_GATE(0x8052305C, &lit_4156); #pragma pop /* 80523060-80523068 000038 0008+00 0/9 0/0 0/0 .rodata @4158 */ @@ -529,7 +529,7 @@ COMPILER_STRIP_GATE(8052305C, &lit_4156); SECTION_RODATA static u8 const lit_4158[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80523060, &lit_4158); +COMPILER_STRIP_GATE(0x80523060, &lit_4158); #pragma pop /* 80523068-80523070 000040 0008+00 0/2 0/0 0/0 .rodata @4509 */ @@ -538,7 +538,7 @@ COMPILER_STRIP_GATE(80523060, &lit_4158); SECTION_RODATA static u8 const lit_4509[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80523068, &lit_4509); +COMPILER_STRIP_GATE(0x80523068, &lit_4509); #pragma pop /* 80523070-80523078 000048 0008+00 0/2 0/0 0/0 .rodata @4510 */ @@ -547,7 +547,7 @@ COMPILER_STRIP_GATE(80523068, &lit_4509); SECTION_RODATA static u8 const lit_4510[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80523070, &lit_4510); +COMPILER_STRIP_GATE(0x80523070, &lit_4510); #pragma pop /* 80523078-80523080 000050 0008+00 0/2 0/0 0/0 .rodata @4511 */ @@ -556,48 +556,48 @@ COMPILER_STRIP_GATE(80523070, &lit_4510); SECTION_RODATA static u8 const lit_4511[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80523078, &lit_4511); +COMPILER_STRIP_GATE(0x80523078, &lit_4511); #pragma pop /* 80523080-80523084 000058 0004+00 0/2 0/0 0/0 .rodata @4512 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4512 = 200.0f; -COMPILER_STRIP_GATE(80523080, &lit_4512); +COMPILER_STRIP_GATE(0x80523080, &lit_4512); #pragma pop /* 80523084-80523088 00005C 0004+00 0/1 0/0 0/0 .rodata @4513 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4513 = 158.0f; -COMPILER_STRIP_GATE(80523084, &lit_4513); +COMPILER_STRIP_GATE(0x80523084, &lit_4513); #pragma pop /* 80523088-8052308C 000060 0004+00 0/2 0/0 0/0 .rodata @4514 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4514 = 500.0f; -COMPILER_STRIP_GATE(80523088, &lit_4514); +COMPILER_STRIP_GATE(0x80523088, &lit_4514); #pragma pop /* 8052308C-80523090 000064 0004+00 0/3 0/0 0/0 .rodata @4515 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4515 = 25.0f; -COMPILER_STRIP_GATE(8052308C, &lit_4515); +COMPILER_STRIP_GATE(0x8052308C, &lit_4515); #pragma pop /* 80523090-80523094 000068 0004+00 1/8 0/0 0/0 .rodata @4516 */ SECTION_RODATA static f32 const lit_4516 = 1.0f; -COMPILER_STRIP_GATE(80523090, &lit_4516); +COMPILER_STRIP_GATE(0x80523090, &lit_4516); /* 80523094-80523098 00006C 0004+00 1/3 0/0 0/0 .rodata @4517 */ SECTION_RODATA static f32 const lit_4517 = -1.0f; -COMPILER_STRIP_GATE(80523094, &lit_4517); +COMPILER_STRIP_GATE(0x80523094, &lit_4517); /* 80523098-8052309C 000070 0004+00 2/3 0/0 0/0 .rodata @4600 */ SECTION_RODATA static f32 const lit_4600 = 15.0f; -COMPILER_STRIP_GATE(80523098, &lit_4600); +COMPILER_STRIP_GATE(0x80523098, &lit_4600); /* 8052309C-805230A4 000074 0008+00 0/1 0/0 0/0 .rodata @4656 */ #pragma push @@ -605,7 +605,7 @@ COMPILER_STRIP_GATE(80523098, &lit_4600); SECTION_RODATA static u8 const lit_4656[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8052309C, &lit_4656); +COMPILER_STRIP_GATE(0x8052309C, &lit_4656); #pragma pop /* 805230A4-805230AC 00007C 0008+00 0/1 0/0 0/0 .rodata @4657 */ @@ -614,126 +614,126 @@ COMPILER_STRIP_GATE(8052309C, &lit_4656); SECTION_RODATA static u8 const lit_4657[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(805230A4, &lit_4657); +COMPILER_STRIP_GATE(0x805230A4, &lit_4657); #pragma pop /* 805230AC-805230B0 000084 0004+00 0/1 0/0 0/0 .rodata @4835 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4835 = 90.0f; -COMPILER_STRIP_GATE(805230AC, &lit_4835); +COMPILER_STRIP_GATE(0x805230AC, &lit_4835); #pragma pop /* 805230B0-805230B4 000088 0004+00 0/1 0/0 0/0 .rodata @4836 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4836 = 135.0f; -COMPILER_STRIP_GATE(805230B0, &lit_4836); +COMPILER_STRIP_GATE(0x805230B0, &lit_4836); #pragma pop /* 805230B4-805230B8 00008C 0004+00 0/1 0/0 0/0 .rodata @4837 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4837 = 1.0f / 45.0f; -COMPILER_STRIP_GATE(805230B4, &lit_4837); +COMPILER_STRIP_GATE(0x805230B4, &lit_4837); #pragma pop /* 805230B8-805230BC 000090 0004+00 0/2 0/0 0/0 .rodata @4838 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4838 = 100.0f; -COMPILER_STRIP_GATE(805230B8, &lit_4838); +COMPILER_STRIP_GATE(0x805230B8, &lit_4838); #pragma pop /* 805230BC-805230C0 000094 0004+00 0/1 0/0 0/0 .rodata @4839 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4839 = 18.0f; -COMPILER_STRIP_GATE(805230BC, &lit_4839); +COMPILER_STRIP_GATE(0x805230BC, &lit_4839); #pragma pop /* 805230C0-805230C4 000098 0004+00 0/1 0/0 0/0 .rodata @4840 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4840 = 225.0f; -COMPILER_STRIP_GATE(805230C0, &lit_4840); +COMPILER_STRIP_GATE(0x805230C0, &lit_4840); #pragma pop /* 805230C4-805230C8 00009C 0004+00 0/1 0/0 0/0 .rodata @4841 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4841 = 1.0f / 90.0f; -COMPILER_STRIP_GATE(805230C4, &lit_4841); +COMPILER_STRIP_GATE(0x805230C4, &lit_4841); #pragma pop /* 805230C8-805230CC 0000A0 0004+00 0/1 0/0 0/0 .rodata @4842 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4842 = 82.0f; -COMPILER_STRIP_GATE(805230C8, &lit_4842); +COMPILER_STRIP_GATE(0x805230C8, &lit_4842); #pragma pop /* 805230CC-805230D0 0000A4 0004+00 0/1 0/0 0/0 .rodata @4843 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4843 = 270.0f; -COMPILER_STRIP_GATE(805230CC, &lit_4843); +COMPILER_STRIP_GATE(0x805230CC, &lit_4843); #pragma pop /* 805230D0-805230D4 0000A8 0004+00 0/1 0/0 0/0 .rodata @4844 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4844 = 57.0f; -COMPILER_STRIP_GATE(805230D0, &lit_4844); +COMPILER_STRIP_GATE(0x805230D0, &lit_4844); #pragma pop /* 805230D4-805230D8 0000AC 0004+00 0/1 0/0 0/0 .rodata @4845 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4845 = -25.0f; -COMPILER_STRIP_GATE(805230D4, &lit_4845); +COMPILER_STRIP_GATE(0x805230D4, &lit_4845); #pragma pop /* 805230D8-805230DC 0000B0 0004+00 0/1 0/0 0/0 .rodata @4846 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4846 = 315.0f; -COMPILER_STRIP_GATE(805230D8, &lit_4846); +COMPILER_STRIP_GATE(0x805230D8, &lit_4846); #pragma pop /* 805230DC-805230E0 0000B4 0004+00 0/1 0/0 0/0 .rodata @4847 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4847 = -18.0f; -COMPILER_STRIP_GATE(805230DC, &lit_4847); +COMPILER_STRIP_GATE(0x805230DC, &lit_4847); #pragma pop /* 805230E0-805230E4 0000B8 0004+00 0/2 0/0 0/0 .rodata @4848 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4848 = 255.0f; -COMPILER_STRIP_GATE(805230E0, &lit_4848); +COMPILER_STRIP_GATE(0x805230E0, &lit_4848); #pragma pop /* 805230E4-805230E8 0000BC 0004+00 0/2 0/0 0/0 .rodata @4849 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4849 = 4.0f; -COMPILER_STRIP_GATE(805230E4, &lit_4849); +COMPILER_STRIP_GATE(0x805230E4, &lit_4849); #pragma pop /* 805230E8-805230EC 0000C0 0004+00 0/1 0/0 0/0 .rodata @4850 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4850 = 0x3B000000; -COMPILER_STRIP_GATE(805230E8, &lit_4850); +COMPILER_STRIP_GATE(0x805230E8, &lit_4850); #pragma pop /* 805230EC-805230F0 0000C4 0004+00 0/1 0/0 0/0 .rodata @4851 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4851 = 11.0f / 10.0f; -COMPILER_STRIP_GATE(805230EC, &lit_4851); +COMPILER_STRIP_GATE(0x805230EC, &lit_4851); #pragma pop /* 805230F0-805230F8 0000C8 0004+04 0/2 0/0 0/0 .rodata @4852 */ @@ -744,7 +744,7 @@ SECTION_RODATA static f32 const lit_4852[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(805230F0, &lit_4852); +COMPILER_STRIP_GATE(0x805230F0, &lit_4852); #pragma pop /* 805230F8-80523100 0000D0 0008+00 0/2 0/0 0/0 .rodata @4854 */ @@ -753,216 +753,216 @@ COMPILER_STRIP_GATE(805230F0, &lit_4852); SECTION_RODATA static u8 const lit_4854[8] ALIGN_DECL(16) = { 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(805230F8, &lit_4854); +COMPILER_STRIP_GATE(0x805230F8, &lit_4854); #pragma pop /* 80523100-80523104 0000D8 0004+00 0/1 0/0 0/0 .rodata @4996 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4996 = 9.0f / 100.0f; -COMPILER_STRIP_GATE(80523100, &lit_4996); +COMPILER_STRIP_GATE(0x80523100, &lit_4996); #pragma pop /* 80523104-80523108 0000DC 0004+00 0/1 0/0 0/0 .rodata @4997 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4997 = 1.0f / 100.0f; -COMPILER_STRIP_GATE(80523104, &lit_4997); +COMPILER_STRIP_GATE(0x80523104, &lit_4997); #pragma pop /* 80523108-8052310C 0000E0 0004+00 0/1 0/0 0/0 .rodata @4998 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4998 = 290.0f; -COMPILER_STRIP_GATE(80523108, &lit_4998); +COMPILER_STRIP_GATE(0x80523108, &lit_4998); #pragma pop /* 8052310C-80523110 0000E4 0004+00 0/2 0/0 0/0 .rodata @4999 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4999 = 2.0f; -COMPILER_STRIP_GATE(8052310C, &lit_4999); +COMPILER_STRIP_GATE(0x8052310C, &lit_4999); #pragma pop /* 80523110-80523114 0000E8 0004+00 0/1 0/0 0/0 .rodata @5000 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5000 = 525.0f; -COMPILER_STRIP_GATE(80523110, &lit_5000); +COMPILER_STRIP_GATE(0x80523110, &lit_5000); #pragma pop /* 80523114-80523118 0000EC 0004+00 0/1 0/0 0/0 .rodata @5001 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5001 = 325.0f; -COMPILER_STRIP_GATE(80523114, &lit_5001); +COMPILER_STRIP_GATE(0x80523114, &lit_5001); #pragma pop /* 80523118-8052311C 0000F0 0004+00 0/3 0/0 0/0 .rodata @5002 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5002 = 7.0f / 10.0f; -COMPILER_STRIP_GATE(80523118, &lit_5002); +COMPILER_STRIP_GATE(0x80523118, &lit_5002); #pragma pop /* 8052311C-80523120 0000F4 0004+00 0/1 0/0 0/0 .rodata @5003 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_5003 = 0x3D800000; -COMPILER_STRIP_GATE(8052311C, &lit_5003); +COMPILER_STRIP_GATE(0x8052311C, &lit_5003); #pragma pop /* 80523120-80523124 0000F8 0004+00 0/1 0/0 0/0 .rodata @5004 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5004 = -1.0f / 5.0f; -COMPILER_STRIP_GATE(80523120, &lit_5004); +COMPILER_STRIP_GATE(0x80523120, &lit_5004); #pragma pop /* 80523124-80523128 0000FC 0004+00 0/2 0/0 0/0 .rodata @5005 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5005 = 10.0f; -COMPILER_STRIP_GATE(80523124, &lit_5005); +COMPILER_STRIP_GATE(0x80523124, &lit_5005); #pragma pop /* 80523128-8052312C 000100 0004+00 0/1 0/0 0/0 .rodata @5006 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5006 = 8.0f / 5.0f; -COMPILER_STRIP_GATE(80523128, &lit_5006); +COMPILER_STRIP_GATE(0x80523128, &lit_5006); #pragma pop /* 8052312C-80523130 000104 0004+00 0/1 0/0 0/0 .rodata @5007 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5007 = 120.0f; -COMPILER_STRIP_GATE(8052312C, &lit_5007); +COMPILER_STRIP_GATE(0x8052312C, &lit_5007); #pragma pop /* 80523130-80523134 000108 0004+00 2/3 0/0 0/0 .rodata @5022 */ SECTION_RODATA static f32 const lit_5022 = 50.0f; -COMPILER_STRIP_GATE(80523130, &lit_5022); +COMPILER_STRIP_GATE(0x80523130, &lit_5022); /* 80523134-80523138 00010C 0004+00 0/1 0/0 0/0 .rodata @5142 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5142 = 18.0f / 11.0f; -COMPILER_STRIP_GATE(80523134, &lit_5142); +COMPILER_STRIP_GATE(0x80523134, &lit_5142); #pragma pop /* 80523138-8052313C 000110 0004+00 0/2 0/0 0/0 .rodata @5143 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5143 = 260.0f; -COMPILER_STRIP_GATE(80523138, &lit_5143); +COMPILER_STRIP_GATE(0x80523138, &lit_5143); #pragma pop /* 8052313C-80523140 000114 0004+00 0/2 0/0 0/0 .rodata @5144 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5144 = 4096.0f; -COMPILER_STRIP_GATE(8052313C, &lit_5144); +COMPILER_STRIP_GATE(0x8052313C, &lit_5144); #pragma pop /* 80523140-80523144 000118 0004+00 0/1 0/0 0/0 .rodata @5145 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_5145 = 0x3ECCCCCC; -COMPILER_STRIP_GATE(80523140, &lit_5145); +COMPILER_STRIP_GATE(0x80523140, &lit_5145); #pragma pop /* 80523144-80523148 00011C 0004+00 0/2 0/0 0/0 .rodata @5146 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5146 = 4.0f / 5.0f; -COMPILER_STRIP_GATE(80523144, &lit_5146); +COMPILER_STRIP_GATE(0x80523144, &lit_5146); #pragma pop /* 80523148-8052314C 000120 0004+00 0/1 0/0 0/0 .rodata @5147 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5147 = 11.0f / 50.0f; -COMPILER_STRIP_GATE(80523148, &lit_5147); +COMPILER_STRIP_GATE(0x80523148, &lit_5147); #pragma pop /* 8052314C-80523150 000124 0004+00 0/1 0/0 0/0 .rodata @5148 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5148 = 162.0f; -COMPILER_STRIP_GATE(8052314C, &lit_5148); +COMPILER_STRIP_GATE(0x8052314C, &lit_5148); #pragma pop /* 80523150-80523154 000128 0004+00 0/1 0/0 0/0 .rodata @5149 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5149 = 16.0f / 25.0f; -COMPILER_STRIP_GATE(80523150, &lit_5149); +COMPILER_STRIP_GATE(0x80523150, &lit_5149); #pragma pop /* 80523154-80523158 00012C 0004+00 0/1 0/0 0/0 .rodata @5150 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5150 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(80523154, &lit_5150); +COMPILER_STRIP_GATE(0x80523154, &lit_5150); #pragma pop /* 80523158-8052315C 000130 0004+00 0/1 0/0 0/0 .rodata @5151 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5151 = 3200.0f; -COMPILER_STRIP_GATE(80523158, &lit_5151); +COMPILER_STRIP_GATE(0x80523158, &lit_5151); #pragma pop /* 8052315C-80523160 000134 0004+00 0/1 0/0 0/0 .rodata @5261 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5261 = 900.0f; -COMPILER_STRIP_GATE(8052315C, &lit_5261); +COMPILER_STRIP_GATE(0x8052315C, &lit_5261); #pragma pop /* 80523160-80523164 000138 0004+00 0/2 0/0 0/0 .rodata @5262 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5262 = 30.0f; -COMPILER_STRIP_GATE(80523160, &lit_5262); +COMPILER_STRIP_GATE(0x80523160, &lit_5262); #pragma pop /* 80523164-80523168 00013C 0004+00 1/1 0/0 0/0 .rodata @5352 */ SECTION_RODATA static f32 const lit_5352 = 220.0f; -COMPILER_STRIP_GATE(80523164, &lit_5352); +COMPILER_STRIP_GATE(0x80523164, &lit_5352); /* 80523168-8052316C 000140 0004+00 0/1 0/0 0/0 .rodata @5781 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5781 = 180.0f; -COMPILER_STRIP_GATE(80523168, &lit_5781); +COMPILER_STRIP_GATE(0x80523168, &lit_5781); #pragma pop /* 8052316C-80523170 000144 0004+00 0/1 0/0 0/0 .rodata @5782 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5782 = 128.0f; -COMPILER_STRIP_GATE(8052316C, &lit_5782); +COMPILER_STRIP_GATE(0x8052316C, &lit_5782); #pragma pop /* 80523170-80523174 000148 0004+00 0/1 0/0 0/0 .rodata @5783 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5783 = 150.0f; -COMPILER_STRIP_GATE(80523170, &lit_5783); +COMPILER_STRIP_GATE(0x80523170, &lit_5783); #pragma pop /* 80523174-80523178 00014C 0004+00 0/1 0/0 0/0 .rodata @5784 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5784 = 80.0f; -COMPILER_STRIP_GATE(80523174, &lit_5784); +COMPILER_STRIP_GATE(0x80523174, &lit_5784); #pragma pop /* 80523178-8052317C 000150 0004+00 1/1 0/0 0/0 .rodata @5839 */ SECTION_RODATA static f32 const lit_5839 = 60.0f; -COMPILER_STRIP_GATE(80523178, &lit_5839); +COMPILER_STRIP_GATE(0x80523178, &lit_5839); /* 8052317C-80523184 000154 0008+00 0/1 0/0 0/0 .rodata @5916 */ #pragma push @@ -970,14 +970,14 @@ COMPILER_STRIP_GATE(80523178, &lit_5839); SECTION_RODATA static u8 const lit_5916[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8052317C, &lit_5916); +COMPILER_STRIP_GATE(0x8052317C, &lit_5916); #pragma pop /* 80523184-80523188 00015C 0004+00 0/0 0/0 0/0 .rodata @5958 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_5958 = 0xFFFFFFFF; -COMPILER_STRIP_GATE(80523184, &lit_5958); +COMPILER_STRIP_GATE(0x80523184, &lit_5958); #pragma pop /* 80523188-80523190 000160 0008+00 0/0 0/0 0/0 .rodata @5961 */ @@ -986,57 +986,57 @@ COMPILER_STRIP_GATE(80523184, &lit_5958); SECTION_RODATA static u8 const lit_5961[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80523188, &lit_5961); +COMPILER_STRIP_GATE(0x80523188, &lit_5961); #pragma pop /* 80523190-80523194 000168 0004+00 0/0 0/0 0/0 .rodata @6080 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_6080 = 0x3D000000; -COMPILER_STRIP_GATE(80523190, &lit_6080); +COMPILER_STRIP_GATE(0x80523190, &lit_6080); #pragma pop /* 80523194-80523198 00016C 0004+00 0/0 0/0 0/0 .rodata @6081 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6081 = -2.0f / 5.0f; -COMPILER_STRIP_GATE(80523194, &lit_6081); +COMPILER_STRIP_GATE(0x80523194, &lit_6081); #pragma pop /* 80523198-8052319C 000170 0004+00 0/0 0/0 0/0 .rodata @6082 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6082 = 6.0f; -COMPILER_STRIP_GATE(80523198, &lit_6082); +COMPILER_STRIP_GATE(0x80523198, &lit_6082); #pragma pop /* 8052319C-805231A0 000174 0004+00 0/1 0/0 0/0 .rodata @6165 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6165 = 1000.0f; -COMPILER_STRIP_GATE(8052319C, &lit_6165); +COMPILER_STRIP_GATE(0x8052319C, &lit_6165); #pragma pop /* 805231A0-805231A4 000178 0004+00 0/1 0/0 0/0 .rodata @6166 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6166 = 160.0f; -COMPILER_STRIP_GATE(805231A0, &lit_6166); +COMPILER_STRIP_GATE(0x805231A0, &lit_6166); #pragma pop /* 805231A4-805231A8 00017C 0004+00 1/1 0/0 0/0 .rodata @6182 */ SECTION_RODATA static f32 const lit_6182 = -1000000000.0f; -COMPILER_STRIP_GATE(805231A4, &lit_6182); +COMPILER_STRIP_GATE(0x805231A4, &lit_6182); /* 805231A8-805231AC 000180 0004+00 1/1 0/0 0/0 .rodata @6262 */ SECTION_RODATA static f32 const lit_6262 = 7.0f; -COMPILER_STRIP_GATE(805231A8, &lit_6262); +COMPILER_STRIP_GATE(0x805231A8, &lit_6262); /* 805231AC-805231B0 000184 0004+00 0/1 0/0 0/0 .rodata @6337 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6337 = 31.0f; -COMPILER_STRIP_GATE(805231AC, &lit_6337); +COMPILER_STRIP_GATE(0x805231AC, &lit_6337); #pragma pop /* 8051BD4C-8051BEFC 0000EC 01B0+00 1/1 0/0 0/0 .text randam_addcol_set__FPs */ @@ -7004,28 +7004,36 @@ static asm void daGrass_create(daGrass_c* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6978 = 1200.0f; -COMPILER_STRIP_GATE(805231B0, &lit_6978); +COMPILER_STRIP_GATE(0x805231B0, &lit_6978); #pragma pop /* 805231B4-805231B8 00018C 0004+00 0/1 0/0 0/0 .rodata @6979 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6979 = 75.0f; -COMPILER_STRIP_GATE(805231B4, &lit_6979); +COMPILER_STRIP_GATE(0x805231B4, &lit_6979); #pragma pop /* 805231B8-805231BC 000190 0004+00 0/1 0/0 0/0 .rodata @6980 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6980 = 83.0f / 100.0f; -COMPILER_STRIP_GATE(805231B8, &lit_6980); +COMPILER_STRIP_GATE(0x805231B8, &lit_6980); #pragma pop /* 805231BC-805231C0 000194 0004+00 0/1 0/0 0/0 .rodata @6981 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6981 = 23.0f / 10.0f; -COMPILER_STRIP_GATE(805231BC, &lit_6981); +COMPILER_STRIP_GATE(0x805231BC, &lit_6981); +#pragma pop + +/* 805231C0-805231C0 000198 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_805231C0 = "D_MN01"; +SECTION_DEAD static char const* const stringBase_805231C7 = "D_MN54"; +SECTION_DEAD static char const* const stringBase_805231CE = "D_MN07A"; #pragma pop /* 8051C304-8051D6CC 0006A4 13C8+00 1/1 0/0 0/0 .text create__9daGrass_cFv */ @@ -7072,7 +7080,7 @@ static asm void daGrass_draw(daGrass_c* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_8051D7B4(u8* param_0) { +extern "C" asm void func_8051D7B4(void* _this, u8* param_0) { nofralloc #include "asm/rel/d/a/d_a_grass/d_a_grass/func_8051D7B4.s" } @@ -7090,7 +7098,7 @@ asm void __sinit_d_a_grass_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_8051D7D0 = (void*)__sinit_d_a_grass_cpp; +REGISTER_CTORS(0x8051D7D0, __sinit_d_a_grass_cpp); #pragma pop /* 8051D88C-8051DA20 001C2C 0194+00 1/1 0/0 0/0 .text WorkCo__13dGrass_data_cFP10fopAc_ac_cUli */ @@ -7568,11 +7576,4 @@ asm dFlower_data_c::dFlower_data_c() { } #pragma pop -/* 805231C0-805231D6 000198 0016+00 4/4 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_805231C0 = "D_MN01"; -SECTION_DEAD static char const* const stringBase_805231C7 = "D_MN54"; -SECTION_DEAD static char const* const stringBase_805231CE = "D_MN07A"; -#pragma pop +/* 805231C0-805231C0 000198 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/d_a_guard_mng/d_a_guard_mng.cpp b/rel/d/a/d_a_guard_mng/d_a_guard_mng.cpp index c4e1e37cead..df7442b38a6 100644 --- a/rel/d/a/d_a_guard_mng/d_a_guard_mng.cpp +++ b/rel/d/a/d_a_guard_mng/d_a_guard_mng.cpp @@ -82,11 +82,11 @@ static asm void s_sub(void* param_0, void* param_1) { SECTION_RODATA static u8 const data_80837DE4[8] = { 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, 0x01, }; -COMPILER_STRIP_GATE(80837DE4, &data_80837DE4); +COMPILER_STRIP_GATE(0x80837DE4, &data_80837DE4); /* 80837DEC-80837DF0 000008 0004+00 1/1 0/0 0/0 .rodata @3663 */ SECTION_RODATA static f32 const lit_3663 = 1000000000.0f; -COMPILER_STRIP_GATE(80837DEC, &lit_3663); +COMPILER_STRIP_GATE(0x80837DEC, &lit_3663); /* 80837B9C-80837BEC 0000FC 0050+00 1/1 0/0 0/0 .text checkMerchantNum__12daGuardMng_cFv */ diff --git a/rel/d/a/d_a_hitobj/d_a_hitobj.cpp b/rel/d/a/d_a_hitobj/d_a_hitobj.cpp index ce365e26e59..32bad80981c 100644 --- a/rel/d/a/d_a_hitobj/d_a_hitobj.cpp +++ b/rel/d/a/d_a_hitobj/d_a_hitobj.cpp @@ -117,6 +117,15 @@ static bool daHitobj_IsDelete(hitobj_class* param_0) { return true; } +/* ############################################################################################## */ +/* 8046B5D4-8046B5D4 000000 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8046B5D4 = "Hitobj"; +/* @stringBase0 padding */ +SECTION_DEAD static char const* const pad_8046B5DB = ""; +#pragma pop + /* 8046B3D0-8046B400 0000F0 0030+00 1/0 0/0 0/0 .text daHitobj_Delete__FP12hitobj_class */ #pragma push @@ -203,11 +212,4 @@ asm cM3dGAab::~cM3dGAab() { } #pragma pop -/* 8046B5D4-8046B5DC 000000 0007+01 2/2 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_8046B5D4 = "Hitobj"; -/* @stringBase0 padding */ -SECTION_DEAD static char const* const pad_8046B5DB = ""; -#pragma pop +/* 8046B5D4-8046B5D4 000000 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/d_a_horse/d_a_horse.cpp b/rel/d/a/d_a_horse/d_a_horse.cpp index b0c48f77918..270dc74faaf 100644 --- a/rel/d/a/d_a_horse/d_a_horse.cpp +++ b/rel/d/a/d_a_horse/d_a_horse.cpp @@ -64,11 +64,11 @@ struct mDoExt_3DlineMatSortPacket { /* 80014738 */ void setMat(mDoExt_3DlineMat_c*); }; -struct dKy_tevstr_c {}; +struct ResTIMG {}; struct _GXColor {}; -struct ResTIMG {}; +struct dKy_tevstr_c {}; struct mDoExt_3DlineMat1_c { /* 80013360 */ void init(u16, u16, ResTIMG*, int); @@ -303,12 +303,6 @@ struct dPa_control_c { _GXColor const*, cXyz const*, f32); }; -struct dBgS_AcchCir { - /* 80075EAC */ dBgS_AcchCir(); - /* 80075F58 */ void SetWall(f32, f32); - /* 808452E4 */ ~dBgS_AcchCir(); -}; - struct dBgS { /* 80074B98 */ void GetExitId(cBgS_PolyInfo const&); /* 80074BE8 */ void GetPolyColor(cBgS_PolyInfo const&); @@ -318,6 +312,12 @@ struct dBgS { /* 80075100 */ void GetRoomId(cBgS_PolyInfo const&); }; +struct dBgS_AcchCir { + /* 80075EAC */ dBgS_AcchCir(); + /* 80075F58 */ void SetWall(f32, f32); + /* 808452E4 */ ~dBgS_AcchCir(); +}; + struct dBgS_Acch { /* 80075F94 */ ~dBgS_Acch(); /* 800760A0 */ dBgS_Acch(); @@ -504,7 +504,6 @@ struct Z2CreatureRide { /* 802C4FFC */ Z2CreatureRide(); /* 802C5114 */ ~Z2CreatureRide(); /* 802C520C */ void init(Vec*, Vec*, u8, u8); - /* 802C522C */ void setLinkRiding(bool); }; struct Z2Creature { @@ -534,9 +533,9 @@ template struct J3DMtxCalcNoAnm {}; /* J3DMtxCalcNoAnm */ struct J3DMtxCalcNoAnm__template0 { - /* 808392DC */ void func_808392DC(); - /* 80844BB4 */ void func_80844BB4(Vec const&, f32 const (&)[3][4]); - /* 80844BDC */ void func_80844BDC(); + /* 808392DC */ void func_808392DC(void* _this); + /* 80844BB4 */ void func_80844BB4(void* _this, Vec const&, f32 const (&)[3][4]); + /* 80844BDC */ void func_80844BDC(void* _this); }; struct J3DMtxCalcJ3DSysInitMaya { @@ -594,7 +593,7 @@ extern "C" static void daHorse_modelCallBack__FP8J3DJointi(); extern "C" static void daHorse_searchSingleBoar__FP10fopAc_ac_cPv(); extern "C" void createHeap__9daHorse_cFv(); extern "C" void __ct__4cXyzFv(); -extern "C" void func_808392DC(); +extern "C" void func_808392DC(void* _this); extern "C" void __dt__19J3DMtxCalcNoAnmBaseFv(); extern "C" void __dt__10J3DMtxCalcFv(); extern "C" static void daHorse_createHeap__FP10fopAc_ac_c(); @@ -688,8 +687,8 @@ extern "C" bool getAnmTransform__10J3DMtxCalcFUc(); extern "C" bool getAnmTransform__10J3DMtxCalcFv(); extern "C" void setWeight__10J3DMtxCalcFUcf(); extern "C" void getWeight__10J3DMtxCalcCFUc(); -extern "C" void func_80844BB4(Vec const&, f32 const (&)[3][4]); -extern "C" void func_80844BDC(); +extern "C" void func_80844BB4(void* _this, Vec const&, f32 const (&)[3][4]); +extern "C" void func_80844BDC(void* _this); extern "C" void __sinit_d_a_horse_cpp(); extern "C" static void func_80844CA0(); extern "C" static void func_80844CA8(); @@ -967,7 +966,7 @@ extern "C" void __register_global_object(); SECTION_RODATA static u8 const lit_3894[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(808454AC, &lit_3894); +COMPILER_STRIP_GATE(0x808454AC, &lit_3894); /* 808454B8-808454C0 00000C 0006+02 2/6 0/0 0/0 .rodata l_arcName */ SECTION_RODATA static u8 const l_arcName[6 + 2 /* padding */] = { @@ -981,19 +980,19 @@ SECTION_RODATA static u8 const l_arcName[6 + 2 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(808454B8, &l_arcName); +COMPILER_STRIP_GATE(0x808454B8, &l_arcName); /* 808454C0-808454C8 000014 0008+00 2/5 0/0 0/0 .rodata m_footJointTable__9daHorse_c */ SECTION_RODATA u8 const daHorse_c::m_footJointTable[8] = { 0x00, 0x03, 0x00, 0x07, 0x00, 0x1B, 0x00, 0x1F, }; -COMPILER_STRIP_GATE(808454C0, &daHorse_c::m_footJointTable); +COMPILER_STRIP_GATE(0x808454C0, &daHorse_c::m_footJointTable); /* 808454C8-808454CC 00001C 0004+00 0/0 0/0 0/0 .rodata m_callLimitDistance2__9daHorse_c */ #pragma push #pragma force_active on SECTION_RODATA f32 const daHorse_c::m_callLimitDistance2 = 640000.0f; -COMPILER_STRIP_GATE(808454C8, &daHorse_c::m_callLimitDistance2); +COMPILER_STRIP_GATE(0x808454C8, &daHorse_c::m_callLimitDistance2); #pragma pop /* 808454CC-808455F0 000020 0124+00 1/20 0/0 0/0 .rodata m__14daHorse_hio_c0 */ @@ -1018,21 +1017,21 @@ SECTION_RODATA u8 const daHorse_hio_c0::m[292] = { 0x00, 0x00, 0x00, 0x00, 0x42, 0x0C, 0x00, 0x00, 0x3F, 0x8C, 0xCC, 0xCD, 0x3F, 0xA6, 0x66, 0x66, 0x41, 0x70, 0x00, 0x00, }; -COMPILER_STRIP_GATE(808454CC, &daHorse_hio_c0::m); +COMPILER_STRIP_GATE(0x808454CC, &daHorse_hio_c0::m); /* 808455F0-808455F4 000144 0004+00 3/11 0/0 0/0 .rodata @4303 */ SECTION_RODATA static f32 const lit_4303 = 3.0f; -COMPILER_STRIP_GATE(808455F0, &lit_4303); +COMPILER_STRIP_GATE(0x808455F0, &lit_4303); /* 808455F4-808455F8 000148 0004+00 4/28 0/0 0/0 .rodata @4304 */ SECTION_RODATA static f32 const lit_4304 = 1.0f; -COMPILER_STRIP_GATE(808455F4, &lit_4304); +COMPILER_STRIP_GATE(0x808455F4, &lit_4304); /* 808455F8-808455FC 00014C 0004+00 0/1 0/0 0/0 .rodata @4305 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4305 = -4.5f; -COMPILER_STRIP_GATE(808455F8, &lit_4305); +COMPILER_STRIP_GATE(0x808455F8, &lit_4305); #pragma pop /* 808455FC-80845600 000150 0004+00 14/51 0/0 0/0 .rodata @4306 */ @@ -1042,13 +1041,13 @@ SECTION_RODATA static u8 const lit_4306[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(808455FC, &lit_4306); +COMPILER_STRIP_GATE(0x808455FC, &lit_4306); /* 80845600-80845604 000154 0004+00 0/1 0/0 0/0 .rodata @4307 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4307 = 20.0f / 17.0f; -COMPILER_STRIP_GATE(80845600, &lit_4307); +COMPILER_STRIP_GATE(0x80845600, &lit_4307); #pragma pop /* 80845604-8084560C 000158 0004+04 0/1 0/0 0/0 .rodata @4308 */ @@ -1059,7 +1058,7 @@ SECTION_RODATA static f32 const lit_4308[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80845604, &lit_4308); +COMPILER_STRIP_GATE(0x80845604, &lit_4308); #pragma pop /* 8084560C-80845614 000160 0008+00 0/8 0/0 0/0 .rodata @4309 */ @@ -1068,7 +1067,7 @@ COMPILER_STRIP_GATE(80845604, &lit_4308); SECTION_RODATA static u8 const lit_4309[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8084560C, &lit_4309); +COMPILER_STRIP_GATE(0x8084560C, &lit_4309); #pragma pop /* 80845614-8084561C 000168 0008+00 0/8 0/0 0/0 .rodata @4310 */ @@ -1077,7 +1076,7 @@ COMPILER_STRIP_GATE(8084560C, &lit_4309); SECTION_RODATA static u8 const lit_4310[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80845614, &lit_4310); +COMPILER_STRIP_GATE(0x80845614, &lit_4310); #pragma pop /* 8084561C-80845624 000170 0008+00 0/8 0/0 0/0 .rodata @4311 */ @@ -1086,28 +1085,28 @@ COMPILER_STRIP_GATE(80845614, &lit_4310); SECTION_RODATA static u8 const lit_4311[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8084561C, &lit_4311); +COMPILER_STRIP_GATE(0x8084561C, &lit_4311); #pragma pop /* 80845624-80845628 000178 0004+00 0/1 0/0 0/0 .rodata @4312 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4312 = 6.0f / 5.0f; -COMPILER_STRIP_GATE(80845624, &lit_4312); +COMPILER_STRIP_GATE(0x80845624, &lit_4312); #pragma pop /* 80845628-8084562C 00017C 0004+00 0/4 0/0 0/0 .rodata @4313 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4313 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(80845628, &lit_4313); +COMPILER_STRIP_GATE(0x80845628, &lit_4313); #pragma pop /* 8084562C-80845634 000180 0008+00 3/15 0/0 0/0 .rodata @4315 */ SECTION_RODATA static u8 const lit_4315[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8084562C, &lit_4315); +COMPILER_STRIP_GATE(0x8084562C, &lit_4315); /* 80837F2C-8083836C 0000EC 0440+00 1/1 0/0 0/0 .text setReinPos__13daHorseRein_cFi */ #pragma push @@ -1145,28 +1144,28 @@ asm void daHorseRein_c::setReinPosPart(int param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4465 = 100.0f; -COMPILER_STRIP_GATE(80845634, &lit_4465); +COMPILER_STRIP_GATE(0x80845634, &lit_4465); #pragma pop /* 80845638-8084563C 00018C 0004+00 0/5 0/0 0/0 .rodata @4466 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4466 = 200.0f; -COMPILER_STRIP_GATE(80845638, &lit_4466); +COMPILER_STRIP_GATE(0x80845638, &lit_4466); #pragma pop /* 8084563C-80845640 000190 0004+00 0/3 0/0 0/0 .rodata @4467 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4467 = 25.0f; -COMPILER_STRIP_GATE(8084563C, &lit_4467); +COMPILER_STRIP_GATE(0x8084563C, &lit_4467); #pragma pop /* 80845640-80845644 000194 0004+00 0/2 0/0 0/0 .rodata @4468 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4468 = 5.0f; -COMPILER_STRIP_GATE(80845640, &lit_4468); +COMPILER_STRIP_GATE(0x80845640, &lit_4468); #pragma pop /* 808458D4-808458E0 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ @@ -1637,7 +1636,7 @@ cXyz::cXyz() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_808392DC() { +extern "C" asm void func_808392DC(void* _this) { nofralloc #include "asm/rel/d/a/d_a_horse/d_a_horse/func_808392DC.s" } @@ -1674,6 +1673,14 @@ static asm void daHorse_createHeap(fopAc_ac_c* param_0) { } #pragma pop +/* ############################################################################################## */ +/* 8084585C-8084585C 0003B0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8084585C = "F_SP108"; +SECTION_DEAD static char const* const stringBase_80845864 = "F_SP104"; +#pragma pop + /* 8083940C-80839498 0015CC 008C+00 1/1 0/0 0/0 .text checkEnding__9daHorse_cFv */ #pragma push #pragma optimization_level 0 @@ -1687,49 +1694,62 @@ asm void daHorse_c::checkEnding() { /* ############################################################################################## */ /* 80845644-80845648 000198 0004+00 1/5 0/0 0/0 .rodata @5176 */ SECTION_RODATA static f32 const lit_5176 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(80845644, &lit_5176); +COMPILER_STRIP_GATE(0x80845644, &lit_5176); /* 80845648-8084564C 00019C 0004+00 0/3 0/0 0/0 .rodata @5177 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5177 = 60.0f; -COMPILER_STRIP_GATE(80845648, &lit_5177); +COMPILER_STRIP_GATE(0x80845648, &lit_5177); #pragma pop /* 8084564C-80845650 0001A0 0004+00 1/2 0/0 0/0 .rodata @5178 */ SECTION_RODATA static f32 const lit_5178 = 150.0f; -COMPILER_STRIP_GATE(8084564C, &lit_5178); +COMPILER_STRIP_GATE(0x8084564C, &lit_5178); /* 80845650-80845654 0001A4 0004+00 0/2 0/0 0/0 .rodata @5179 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5179 = 240.0f; -COMPILER_STRIP_GATE(80845650, &lit_5179); +COMPILER_STRIP_GATE(0x80845650, &lit_5179); #pragma pop /* 80845654-80845658 0001A8 0004+00 1/4 0/0 0/0 .rodata @5180 */ SECTION_RODATA static f32 const lit_5180 = 500.0f; -COMPILER_STRIP_GATE(80845654, &lit_5180); +COMPILER_STRIP_GATE(0x80845654, &lit_5180); /* 80845658-8084565C 0001AC 0004+00 0/3 0/0 0/0 .rodata @5181 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5181 = -5.0f; -COMPILER_STRIP_GATE(80845658, &lit_5181); +COMPILER_STRIP_GATE(0x80845658, &lit_5181); #pragma pop /* 8084565C-80845660 0001B0 0004+00 0/3 0/0 0/0 .rodata @5182 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5182 = 35.0f; -COMPILER_STRIP_GATE(8084565C, &lit_5182); +COMPILER_STRIP_GATE(0x8084565C, &lit_5182); #pragma pop /* 80845660-80845664 0001B4 0004+00 0/1 0/0 0/0 .rodata @5183 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5183 = 55.0f; -COMPILER_STRIP_GATE(80845660, &lit_5183); +COMPILER_STRIP_GATE(0x80845660, &lit_5183); +#pragma pop + +/* 8084585C-8084585C 0003B0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8084586C = "F_SP109"; +SECTION_DEAD static char const* const stringBase_80845874 = ""; +SECTION_DEAD static char const* const stringBase_80845875 = "F_SP00"; +SECTION_DEAD static char const* const stringBase_8084587C = "F_SP103"; +SECTION_DEAD static char const* const stringBase_80845884 = "F_SP113"; +SECTION_DEAD static char const* const stringBase_8084588C = "F_SP102"; +SECTION_DEAD static char const* const stringBase_80845894 = "D_MN09B"; +SECTION_DEAD static char const* const stringBase_8084589C = "F_SP123"; #pragma pop /* 80839498-80839CFC 001658 0864+00 1/1 0/0 0/0 .text create__9daHorse_cFv */ @@ -1777,19 +1797,19 @@ asm void daHorse_c::resetBasAnime() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5529 = -1.0f; -COMPILER_STRIP_GATE(80845664, &lit_5529); +COMPILER_STRIP_GATE(0x80845664, &lit_5529); #pragma pop /* 80845668-8084566C 0001BC 0004+00 0/3 0/0 0/0 .rodata @5530 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5530 = 8.0f; -COMPILER_STRIP_GATE(80845668, &lit_5530); +COMPILER_STRIP_GATE(0x80845668, &lit_5530); #pragma pop /* 8084566C-80845670 0001C0 0004+00 1/9 0/0 0/0 .rodata @5531 */ SECTION_RODATA static f32 const lit_5531 = 0.5f; -COMPILER_STRIP_GATE(8084566C, &lit_5531); +COMPILER_STRIP_GATE(0x8084566C, &lit_5531); /* 80839ED4-8083A20C 002094 0338+00 1/1 0/0 0/0 .text setDoubleAnime__9daHorse_cFfffUsUsf */ @@ -1819,14 +1839,14 @@ asm void daHorse_c::setSingleAnime(u16 param_0, f32 param_1, f32 param_2, s16 pa #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5629 = 18.0f; -COMPILER_STRIP_GATE(80845670, &lit_5629); +COMPILER_STRIP_GATE(0x80845670, &lit_5629); #pragma pop /* 80845674-80845678 0001C8 0004+00 0/1 0/0 0/0 .rodata @5630 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_5630 = 0x3C449BA6; -COMPILER_STRIP_GATE(80845674, &lit_5630); +COMPILER_STRIP_GATE(0x80845674, &lit_5630); #pragma pop /* 8083A3C4-8083A5AC 002584 01E8+00 1/1 0/0 0/0 .text animePlay__9daHorse_cFv */ @@ -1842,7 +1862,7 @@ asm void daHorse_c::animePlay() { /* ############################################################################################## */ /* 80845678-8084567C 0001CC 0004+00 3/13 0/0 0/0 .rodata @5722 */ SECTION_RODATA static f32 const lit_5722 = 1.0f / 20.0f; -COMPILER_STRIP_GATE(80845678, &lit_5722); +COMPILER_STRIP_GATE(0x80845678, &lit_5722); /* 8083A5AC-8083A890 00276C 02E4+00 1/1 0/0 0/0 .text checkDemoAction__9daHorse_cFv */ #pragma push @@ -1859,7 +1879,7 @@ asm void daHorse_c::checkDemoAction() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5814 = 400.0f; -COMPILER_STRIP_GATE(8084567C, &lit_5814); +COMPILER_STRIP_GATE(0x8084567C, &lit_5814); #pragma pop /* 8083A890-8083AC7C 002A50 03EC+00 1/1 0/0 0/0 .text setStickRodeoMove__9daHorse_cFv */ @@ -1887,14 +1907,14 @@ asm void daHorse_c::setStickCallMove() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5889 = 10000.0f; -COMPILER_STRIP_GATE(80845680, &lit_5889); +COMPILER_STRIP_GATE(0x80845680, &lit_5889); #pragma pop /* 80845684-80845688 0001D8 0004+00 0/1 0/0 0/0 .rodata @5890 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5890 = 1600.0f; -COMPILER_STRIP_GATE(80845684, &lit_5890); +COMPILER_STRIP_GATE(0x80845684, &lit_5890); #pragma pop /* 8083ACEC-8083AEC0 002EAC 01D4+00 2/2 0/0 0/0 .text setDemoMoveData__9daHorse_cFPUlPC4cXyz */ @@ -1907,6 +1927,19 @@ asm void daHorse_c::setDemoMoveData(u32* param_0, cXyz const* param_1) { } #pragma pop +/* ############################################################################################## */ +/* 8084585C-8084585C 0003B0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_808458A4 = "Horse"; +SECTION_DEAD static char const* const stringBase_808458AA = "pos"; +SECTION_DEAD static char const* const stringBase_808458AE = "angle"; +SECTION_DEAD static char const* const stringBase_808458B4 = "prm0"; +SECTION_DEAD static char const* const stringBase_808458B9 = "ride"; +SECTION_DEAD static char const* const stringBase_808458BE = "disXZ"; +SECTION_DEAD static char const* const stringBase_808458C4 = "disY"; +#pragma pop + /* 8083AEC0-8083B578 003080 06B8+00 1/1 0/0 0/0 .text setDemoData__9daHorse_cFv */ #pragma push #pragma optimization_level 0 @@ -1955,42 +1988,42 @@ void daHorse_c::setTurnVibration() { SECTION_RODATA static u8 const footEffectRate[16] = { 0x3E, 0x8A, 0x3D, 0x71, 0x3E, 0xCC, 0xCC, 0xCD, 0x3F, 0x66, 0x66, 0x66, 0x3E, 0x2E, 0x14, 0x7B, }; -COMPILER_STRIP_GATE(80845688, &footEffectRate); +COMPILER_STRIP_GATE(0x80845688, &footEffectRate); #pragma pop /* 80845698-8084569C 0001EC 0004+00 0/3 0/0 0/0 .rodata @6389 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6389 = 10.0f; -COMPILER_STRIP_GATE(80845698, &lit_6389); +COMPILER_STRIP_GATE(0x80845698, &lit_6389); #pragma pop /* 8084569C-808456A0 0001F0 0004+00 0/1 0/0 0/0 .rodata @6390 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6390 = 34.0f; -COMPILER_STRIP_GATE(8084569C, &lit_6390); +COMPILER_STRIP_GATE(0x8084569C, &lit_6390); #pragma pop /* 808456A0-808456A4 0001F4 0004+00 0/2 0/0 0/0 .rodata @6391 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6391 = 12.0f; -COMPILER_STRIP_GATE(808456A0, &lit_6391); +COMPILER_STRIP_GATE(0x808456A0, &lit_6391); #pragma pop /* 808456A4-808456A8 0001F8 0004+00 0/2 0/0 0/0 .rodata @6392 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6392 = 14.0f; -COMPILER_STRIP_GATE(808456A4, &lit_6392); +COMPILER_STRIP_GATE(0x808456A4, &lit_6392); #pragma pop /* 808456A8-808456AC 0001FC 0004+00 0/1 0/0 0/0 .rodata @6393 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6393 = 19.0f; -COMPILER_STRIP_GATE(808456A8, &lit_6393); +COMPILER_STRIP_GATE(0x808456A8, &lit_6393); #pragma pop /* 8083B830-8083BF48 0039F0 0718+00 6/6 0/0 0/0 .text setMoveAnime__9daHorse_cFf */ @@ -2008,56 +2041,56 @@ asm void daHorse_c::setMoveAnime(f32 param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6871 = -33500.0f; -COMPILER_STRIP_GATE(808456AC, &lit_6871); +COMPILER_STRIP_GATE(0x808456AC, &lit_6871); #pragma pop /* 808456B0-808456B4 000204 0004+00 0/1 0/0 0/0 .rodata @6872 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6872 = -20500.0f; -COMPILER_STRIP_GATE(808456B0, &lit_6872); +COMPILER_STRIP_GATE(0x808456B0, &lit_6872); #pragma pop /* 808456B4-808456B8 000208 0004+00 0/2 0/0 0/0 .rodata @6873 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6873 = 300.0f; -COMPILER_STRIP_GATE(808456B4, &lit_6873); +COMPILER_STRIP_GATE(0x808456B4, &lit_6873); #pragma pop /* 808456B8-808456BC 00020C 0004+00 0/1 0/0 0/0 .rodata @6874 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6874 = 23716.0f; -COMPILER_STRIP_GATE(808456B8, &lit_6874); +COMPILER_STRIP_GATE(0x808456B8, &lit_6874); #pragma pop /* 808456BC-808456C0 000210 0004+00 0/2 0/0 0/0 .rodata @6875 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6875 = 50.0f; -COMPILER_STRIP_GATE(808456BC, &lit_6875); +COMPILER_STRIP_GATE(0x808456BC, &lit_6875); #pragma pop /* 808456C0-808456C4 000214 0004+00 0/1 0/0 0/0 .rodata @6876 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_6876 = 0x43360B61; -COMPILER_STRIP_GATE(808456C0, &lit_6876); +COMPILER_STRIP_GATE(0x808456C0, &lit_6876); #pragma pop /* 808456C4-808456C8 000218 0004+00 0/1 0/0 0/0 .rodata @6877 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6877 = 101.0f; -COMPILER_STRIP_GATE(808456C4, &lit_6877); +COMPILER_STRIP_GATE(0x808456C4, &lit_6877); #pragma pop /* 808456C8-808456CC 00021C 0004+00 0/1 0/0 0/0 .rodata @6878 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6878 = -200.0f; -COMPILER_STRIP_GATE(808456C8, &lit_6878); +COMPILER_STRIP_GATE(0x808456C8, &lit_6878); #pragma pop /* 8083BF48-8083CA80 004108 0B38+00 6/6 0/0 0/0 .text checkHorseNoMove__9daHorse_cFi */ @@ -2086,25 +2119,25 @@ asm void daHorse_c::checkTurnPlayerState() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7216 = 1000000.0f; -COMPILER_STRIP_GATE(808456CC, &lit_7216); +COMPILER_STRIP_GATE(0x808456CC, &lit_7216); #pragma pop /* 808456D0-808456D4 000224 0004+00 0/1 0/0 0/0 .rodata @7217 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7217 = 2250000.0f; -COMPILER_STRIP_GATE(808456D0, &lit_7217); +COMPILER_STRIP_GATE(0x808456D0, &lit_7217); #pragma pop /* 808456D4-808456D8 000228 0004+00 1/3 0/0 0/0 .rodata @7218 */ SECTION_RODATA static f32 const lit_7218 = 7.0f / 10.0f; -COMPILER_STRIP_GATE(808456D4, &lit_7218); +COMPILER_STRIP_GATE(0x808456D4, &lit_7218); /* 808456D8-808456DC 00022C 0004+00 0/3 0/0 0/0 .rodata @7219 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7219 = 4.0f / 5.0f; -COMPILER_STRIP_GATE(808456D8, &lit_7219); +COMPILER_STRIP_GATE(0x808456D8, &lit_7219); #pragma pop /* 8083CB38-8083D748 004CF8 0C10+00 2/2 0/0 0/0 .text setSpeedAndAngle__9daHorse_cFv */ @@ -2130,7 +2163,7 @@ asm void daHorse_c::checkWaitTurn() const { /* ############################################################################################## */ /* 808456DC-808456E0 000230 0004+00 1/2 0/0 0/0 .rodata @7274 */ SECTION_RODATA static f32 const lit_7274 = -1000000000.0f; -COMPILER_STRIP_GATE(808456DC, &lit_7274); +COMPILER_STRIP_GATE(0x808456DC, &lit_7274); /* 8083D774-8083D918 005934 01A4+00 2/2 0/0 0/0 .text setRoomInfo__9daHorse_cFi */ #pragma push @@ -2147,7 +2180,7 @@ asm void daHorse_c::setRoomInfo(int param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7300 = -15.0f; -COMPILER_STRIP_GATE(808456E0, &lit_7300); +COMPILER_STRIP_GATE(0x808456E0, &lit_7300); #pragma pop /* 80845BB8-80845BBC 000008 0001+03 6/6 0/0 0/0 .bss @1109 */ @@ -2288,21 +2321,21 @@ asm void daHorse_c::setBodyPart() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7362 = 4.0f; -COMPILER_STRIP_GATE(808456E4, &lit_7362); +COMPILER_STRIP_GATE(0x808456E4, &lit_7362); #pragma pop /* 808456E8-808456EC 00023C 0004+00 0/1 0/0 0/0 .rodata @7363 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7363 = 3.0f / 10.0f; -COMPILER_STRIP_GATE(808456E8, &lit_7363); +COMPILER_STRIP_GATE(0x808456E8, &lit_7363); #pragma pop /* 808456EC-808456F0 000240 0004+00 0/1 0/0 0/0 .rodata @7364 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7364 = 140.0f; -COMPILER_STRIP_GATE(808456EC, &lit_7364); +COMPILER_STRIP_GATE(0x808456EC, &lit_7364); #pragma pop /* 8083D9D8-8083DC58 005B98 0280+00 2/2 0/0 0/0 .text setMatrix__9daHorse_cFv */ @@ -2322,7 +2355,7 @@ asm void daHorse_c::setMatrix() { SECTION_RODATA static u8 const lit_7373[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(808456F0, &lit_7373); +COMPILER_STRIP_GATE(0x808456F0, &lit_7373); #pragma pop /* 808456FC-80845704 000250 0006+02 0/1 0/0 0/0 .rodata @7374 */ @@ -2339,21 +2372,21 @@ SECTION_RODATA static u8 const lit_7374[6 + 2 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(808456FC, &lit_7374); +COMPILER_STRIP_GATE(0x808456FC, &lit_7374); #pragma pop /* 80845704-80845708 000258 0004+00 0/1 0/0 0/0 .rodata @7439 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7439 = 1200.0f; -COMPILER_STRIP_GATE(80845704, &lit_7439); +COMPILER_STRIP_GATE(0x80845704, &lit_7439); #pragma pop /* 80845708-8084570C 00025C 0004+00 0/1 0/0 0/0 .rodata @7440 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7440 = 700.0f; -COMPILER_STRIP_GATE(80845708, &lit_7440); +COMPILER_STRIP_GATE(0x80845708, &lit_7440); #pragma pop /* 8083DC58-8083DEEC 005E18 0294+00 1/1 0/0 0/0 .text setDashEffect__9daHorse_cFPUl */ @@ -2371,42 +2404,42 @@ asm void daHorse_c::setDashEffect(u32* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7691 = 2.0f; -COMPILER_STRIP_GATE(8084570C, &lit_7691); +COMPILER_STRIP_GATE(0x8084570C, &lit_7691); #pragma pop /* 80845710-80845714 000264 0004+00 0/1 0/0 0/0 .rodata @7692 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7692 = 255.0f; -COMPILER_STRIP_GATE(80845710, &lit_7692); +COMPILER_STRIP_GATE(0x80845710, &lit_7692); #pragma pop /* 80845714-80845718 000268 0004+00 0/3 0/0 0/0 .rodata @7693 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7693 = 1.5f; -COMPILER_STRIP_GATE(80845714, &lit_7693); +COMPILER_STRIP_GATE(0x80845714, &lit_7693); #pragma pop /* 80845718-8084571C 00026C 0004+00 0/1 0/0 0/0 .rodata @7694 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7694 = 9.0f / 5.0f; -COMPILER_STRIP_GATE(80845718, &lit_7694); +COMPILER_STRIP_GATE(0x80845718, &lit_7694); #pragma pop /* 8084571C-80845720 000270 0004+00 0/1 0/0 0/0 .rodata @7695 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7695 = -0.75f; -COMPILER_STRIP_GATE(8084571C, &lit_7695); +COMPILER_STRIP_GATE(0x8084571C, &lit_7695); #pragma pop /* 80845720-80845724 000274 0004+00 0/2 0/0 0/0 .rodata @7696 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7696 = 0.75f; -COMPILER_STRIP_GATE(80845720, &lit_7696); +COMPILER_STRIP_GATE(0x80845720, &lit_7696); #pragma pop /* 80845C44-80845C54 000094 000C+04 0/1 0/0 0/0 .bss @7469 */ @@ -2474,26 +2507,26 @@ asm void daHorse_c::setEffect() { SECTION_RODATA static u8 const localHeadPos[12] = { 0x41, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80845724, &localHeadPos); +COMPILER_STRIP_GATE(0x80845724, &localHeadPos); #pragma pop /* 80845730-80845734 000284 0004+00 0/1 0/0 0/0 .rodata @7747 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7747 = 170.0f; -COMPILER_STRIP_GATE(80845730, &lit_7747); +COMPILER_STRIP_GATE(0x80845730, &lit_7747); #pragma pop /* 80845734-80845738 000288 0004+00 0/1 0/0 0/0 .rodata @7748 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7748 = 83.0f; -COMPILER_STRIP_GATE(80845734, &lit_7748); +COMPILER_STRIP_GATE(0x80845734, &lit_7748); #pragma pop /* 80845738-8084573C 00028C 0004+00 1/3 0/0 0/0 .rodata @7749 */ SECTION_RODATA static f32 const lit_7749 = 80.0f; -COMPILER_STRIP_GATE(80845738, &lit_7749); +COMPILER_STRIP_GATE(0x80845738, &lit_7749); /* 8083E4D8-8083E6E8 006698 0210+00 1/1 0/0 0/0 .text setCollision__9daHorse_cFv */ #pragma push @@ -2528,7 +2561,7 @@ asm void daHorse_c::setTailAngle() { /* ############################################################################################## */ /* 8084573C-80845740 000290 0004+00 1/1 0/0 0/0 .rodata @7848 */ SECTION_RODATA static f32 const lit_7848 = 250000.0f; -COMPILER_STRIP_GATE(8084573C, &lit_7848); +COMPILER_STRIP_GATE(0x8084573C, &lit_7848); /* 8083E8A4-8083EA78 006A64 01D4+00 1/1 0/0 0/0 .text setNeckAngle__9daHorse_cFv */ #pragma push @@ -2565,7 +2598,7 @@ asm void daHorse_c::setFootMatrix() { #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_8279 = 0x3BA3D70A; -COMPILER_STRIP_GATE(80845740, &lit_8279); +COMPILER_STRIP_GATE(0x80845740, &lit_8279); #pragma pop /* 8083ED88-8083F3B0 006F48 0628+00 1/1 0/0 0/0 .text setLegAngle__9daHorse_cFfiiPs */ @@ -2583,21 +2616,21 @@ asm void daHorse_c::setLegAngle(f32 param_0, int param_1, int param_2, s16* para #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8509 = 120.0f; -COMPILER_STRIP_GATE(80845744, &lit_8509); +COMPILER_STRIP_GATE(0x80845744, &lit_8509); #pragma pop /* 80845748-8084574C 00029C 0004+00 0/2 0/0 0/0 .rodata @8510 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8510 = 1000.0f; -COMPILER_STRIP_GATE(80845748, &lit_8510); +COMPILER_STRIP_GATE(0x80845748, &lit_8510); #pragma pop /* 8084574C-80845750 0002A0 0004+00 0/4 0/0 0/0 .rodata @8511 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8511 = 30.0f; -COMPILER_STRIP_GATE(8084574C, &lit_8511); +COMPILER_STRIP_GATE(0x8084574C, &lit_8511); #pragma pop /* 8083F3B0-8083F9AC 007570 05FC+00 1/1 0/0 0/0 .text footBgCheck__9daHorse_cFv */ @@ -2615,56 +2648,56 @@ asm void daHorse_c::footBgCheck() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8623 = 63.0f; -COMPILER_STRIP_GATE(80845750, &lit_8623); +COMPILER_STRIP_GATE(0x80845750, &lit_8623); #pragma pop /* 80845754-80845758 0002A8 0004+00 0/1 0/0 0/0 .rodata @8624 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8624 = 17.0f; -COMPILER_STRIP_GATE(80845754, &lit_8624); +COMPILER_STRIP_GATE(0x80845754, &lit_8624); #pragma pop /* 80845758-8084575C 0002AC 0004+00 0/1 0/0 0/0 .rodata @8625 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8625 = 11.0f; -COMPILER_STRIP_GATE(80845758, &lit_8625); +COMPILER_STRIP_GATE(0x80845758, &lit_8625); #pragma pop /* 8084575C-80845760 0002B0 0004+00 0/1 0/0 0/0 .rodata @8626 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8626 = -11.0f; -COMPILER_STRIP_GATE(8084575C, &lit_8626); +COMPILER_STRIP_GATE(0x8084575C, &lit_8626); #pragma pop /* 80845760-80845764 0002B4 0004+00 0/1 0/0 0/0 .rodata @8627 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8627 = -35.0f; -COMPILER_STRIP_GATE(80845760, &lit_8627); +COMPILER_STRIP_GATE(0x80845760, &lit_8627); #pragma pop /* 80845764-80845768 0002B8 0004+00 0/2 0/0 0/0 .rodata @8628 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8628 = 8192.0f; -COMPILER_STRIP_GATE(80845764, &lit_8628); +COMPILER_STRIP_GATE(0x80845764, &lit_8628); #pragma pop /* 80845768-8084576C 0002BC 0004+00 0/1 0/0 0/0 .rodata @8629 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_8629 = 0x3A03126F; -COMPILER_STRIP_GATE(80845768, &lit_8629); +COMPILER_STRIP_GATE(0x80845768, &lit_8629); #pragma pop /* 8084576C-80845770 0002C0 0004+00 0/3 0/0 0/0 .rodata @8630 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8630 = 20.0f; -COMPILER_STRIP_GATE(8084576C, &lit_8630); +COMPILER_STRIP_GATE(0x8084576C, &lit_8630); #pragma pop /* 80845CB4-80845CC4 000104 000C+04 0/1 0/0 0/0 .bss @8516 */ @@ -2740,13 +2773,13 @@ asm void daHorse_c::copyReinPos() { SECTION_RODATA static u8 const zeldaLocalLeft[12] = { 0x40, 0x40, 0x00, 0x00, 0xBF, 0x00, 0x00, 0x00, 0xC0, 0xA0, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80845770, &zeldaLocalLeft); +COMPILER_STRIP_GATE(0x80845770, &zeldaLocalLeft); /* 8084577C-80845788 0002D0 000C+00 1/1 0/0 0/0 .rodata zeldaLocalRight$8683 */ SECTION_RODATA static u8 const zeldaLocalRight[12] = { 0x40, 0x40, 0x00, 0x00, 0xBF, 0x00, 0x00, 0x00, 0x40, 0xA0, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8084577C, &zeldaLocalRight); +COMPILER_STRIP_GATE(0x8084577C, &zeldaLocalRight); /* 8083FEB4-8084010C 008074 0258+00 1/0 0/0 0/0 .text setReinPosHandSubstance__9daHorse_cFi */ #pragma push @@ -2763,14 +2796,14 @@ asm void daHorse_c::setReinPosHandSubstance(int param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8805 = 29.0f; -COMPILER_STRIP_GATE(80845788, &lit_8805); +COMPILER_STRIP_GATE(0x80845788, &lit_8805); #pragma pop /* 8084578C-80845790 0002E0 0004+00 0/2 0/0 0/0 .rodata @8806 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8806 = -2.0f; -COMPILER_STRIP_GATE(8084578C, &lit_8806); +COMPILER_STRIP_GATE(0x8084578C, &lit_8806); #pragma pop /* 80845D24-80845D34 000174 000C+04 0/1 0/0 0/0 .bss @8753 */ @@ -2812,14 +2845,14 @@ asm void daHorse_c::setReinPosNormalSubstance() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8904 = 220.0f; -COMPILER_STRIP_GATE(80845790, &lit_8904); +COMPILER_STRIP_GATE(0x80845790, &lit_8904); #pragma pop /* 80845794-80845798 0002E8 0004+00 0/1 0/0 0/0 .rodata @8905 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8905 = -170.0f; -COMPILER_STRIP_GATE(80845794, &lit_8905); +COMPILER_STRIP_GATE(0x80845794, &lit_8905); #pragma pop /* 80845D5C-80845D6C 0001AC 000C+04 0/1 0/0 0/0 .bss @8813 */ @@ -2904,7 +2937,7 @@ asm void daHorse_c::checkServiceWaitAnime() { /* ############################################################################################## */ /* 80845798-8084579C 0002EC 0004+00 1/1 0/0 0/0 .rodata @8963 */ SECTION_RODATA static f32 const lit_8963 = 9.0f / 10.0f; -COMPILER_STRIP_GATE(80845798, &lit_8963); +COMPILER_STRIP_GATE(0x80845798, &lit_8963); /* 80840844-808408F0 008A04 00AC+00 2/2 0/0 0/0 .text checkTurnInput__9daHorse_cFv */ #pragma push @@ -3011,14 +3044,20 @@ asm void daHorse_c::savePos() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9264 = 4000000.0f; -COMPILER_STRIP_GATE(8084579C, &lit_9264); +COMPILER_STRIP_GATE(0x8084579C, &lit_9264); #pragma pop /* 808457A0-808457A4 0002F4 0004+00 0/2 0/0 0/0 .rodata @9265 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9265 = 640000.0f; -COMPILER_STRIP_GATE(808457A0, &lit_9265); +COMPILER_STRIP_GATE(0x808457A0, &lit_9265); +#pragma pop + +/* 8084585C-8084585C 0003B0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_808458C9 = "F_SP110"; #pragma pop /* 808411D0-80841468 009390 0298+00 1/0 0/0 0/0 .text callHorseSubstance__9daHorse_cFPC4cXyz */ @@ -3098,35 +3137,35 @@ asm void daHorse_c::procWaitInit() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9537 = 15.0f; -COMPILER_STRIP_GATE(808457A4, &lit_9537); +COMPILER_STRIP_GATE(0x808457A4, &lit_9537); #pragma pop /* 808457A8-808457AC 0002FC 0004+00 0/1 0/0 0/0 .rodata @9538 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9538 = 1.0f / 100.0f; -COMPILER_STRIP_GATE(808457A8, &lit_9538); +COMPILER_STRIP_GATE(0x808457A8, &lit_9538); #pragma pop /* 808457AC-808457B0 000300 0004+00 0/1 0/0 0/0 .rodata @9539 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9539 = 2.0f / 5.0f; -COMPILER_STRIP_GATE(808457AC, &lit_9539); +COMPILER_STRIP_GATE(0x808457AC, &lit_9539); #pragma pop /* 808457B0-808457B4 000304 0004+00 0/1 0/0 0/0 .rodata @9540 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9540 = 3.0f / 5.0f; -COMPILER_STRIP_GATE(808457B0, &lit_9540); +COMPILER_STRIP_GATE(0x808457B0, &lit_9540); #pragma pop /* 808457B4-808457B8 000308 0004+00 0/2 0/0 0/0 .rodata @9541 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9541 = 6.0f; -COMPILER_STRIP_GATE(808457B4, &lit_9541); +COMPILER_STRIP_GATE(0x808457B4, &lit_9541); #pragma pop /* 808417B8-80841F04 009978 074C+00 1/0 0/0 0/0 .text procWait__9daHorse_cFv */ @@ -3154,7 +3193,7 @@ asm void daHorse_c::procMoveInit() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9676 = 350.0f; -COMPILER_STRIP_GATE(808457B8, &lit_9676); +COMPILER_STRIP_GATE(0x808457B8, &lit_9676); #pragma pop /* 80841F80-808423DC 00A140 045C+00 1/0 0/0 0/0 .text procMove__9daHorse_cFv */ @@ -3172,7 +3211,7 @@ asm void daHorse_c::procMove() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9716 = 27.0f / 10.0f; -COMPILER_STRIP_GATE(808457BC, &lit_9716); +COMPILER_STRIP_GATE(0x808457BC, &lit_9716); #pragma pop /* 808423DC-808425BC 00A59C 01E0+00 3/3 0/0 0/0 .text procStopInit__9daHorse_cFv */ @@ -3194,7 +3233,7 @@ SECTION_RODATA static u8 const stopFootEffectFrame[48] = { 0x41, 0x60, 0x00, 0x00, 0x41, 0xD8, 0x00, 0x00, 0x40, 0xA0, 0x00, 0x00, 0x41, 0x00, 0x00, 0x00, 0x41, 0x90, 0x00, 0x00, 0x41, 0x00, 0x00, 0x00, 0x41, 0x50, 0x00, 0x00, 0x41, 0xB8, 0x00, 0x00, }; -COMPILER_STRIP_GATE(808457C0, &stopFootEffectFrame); +COMPILER_STRIP_GATE(0x808457C0, &stopFootEffectFrame); #pragma pop /* 808457F0-80845820 000344 0030+00 0/1 0/0 0/0 .rodata stopStandFootEffectFrame$9721 */ @@ -3205,28 +3244,28 @@ SECTION_RODATA static u8 const stopStandFootEffectFrame[48] = { 0x41, 0x98, 0x00, 0x00, 0x41, 0xD0, 0x00, 0x00, 0x40, 0xA0, 0x00, 0x00, 0x41, 0x20, 0x00, 0x00, 0x41, 0x90, 0x00, 0x00, 0x40, 0xE0, 0x00, 0x00, 0x41, 0x90, 0x00, 0x00, 0x41, 0xD0, 0x00, 0x00, }; -COMPILER_STRIP_GATE(808457F0, &stopStandFootEffectFrame); +COMPILER_STRIP_GATE(0x808457F0, &stopStandFootEffectFrame); #pragma pop /* 80845820-80845824 000374 0004+00 0/1 0/0 0/0 .rodata @9792 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9792 = 3.5f; -COMPILER_STRIP_GATE(80845820, &lit_9792); +COMPILER_STRIP_GATE(0x80845820, &lit_9792); #pragma pop /* 80845824-80845828 000378 0004+00 0/1 0/0 0/0 .rodata @9793 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9793 = 59.0f; -COMPILER_STRIP_GATE(80845824, &lit_9793); +COMPILER_STRIP_GATE(0x80845824, &lit_9793); #pragma pop /* 80845828-8084582C 00037C 0004+00 0/1 0/0 0/0 .rodata @9794 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9794 = 32.0f; -COMPILER_STRIP_GATE(80845828, &lit_9794); +COMPILER_STRIP_GATE(0x80845828, &lit_9794); #pragma pop /* 808425BC-80842878 00A77C 02BC+00 1/0 0/0 0/0 .text procStop__9daHorse_cFv */ @@ -3244,21 +3283,21 @@ asm void daHorse_c::procStop() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9831 = 52.0f; -COMPILER_STRIP_GATE(8084582C, &lit_9831); +COMPILER_STRIP_GATE(0x8084582C, &lit_9831); #pragma pop /* 80845830-80845834 000384 0004+00 0/1 0/0 0/0 .rodata @9832 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_9832 = 0x3DC90FDB; -COMPILER_STRIP_GATE(80845830, &lit_9832); +COMPILER_STRIP_GATE(0x80845830, &lit_9832); #pragma pop /* 80845834-80845838 000388 0004+00 0/1 0/0 0/0 .rodata @9833 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9833 = 53.0f; -COMPILER_STRIP_GATE(80845834, &lit_9833); +COMPILER_STRIP_GATE(0x80845834, &lit_9833); #pragma pop /* 80842878-80842AB0 00AA38 0238+00 6/6 0/0 0/0 .text procTurnInit__9daHorse_cFi */ @@ -3276,7 +3315,7 @@ asm void daHorse_c::procTurnInit(int param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9982 = 2000.0f; -COMPILER_STRIP_GATE(80845838, &lit_9982); +COMPILER_STRIP_GATE(0x80845838, &lit_9982); #pragma pop /* 80842AB0-80843008 00AC70 0558+00 1/0 0/0 0/0 .text procTurn__9daHorse_cFv */ @@ -3304,7 +3343,7 @@ asm void daHorse_c::procJumpInit(int param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10106 = 7.0f; -COMPILER_STRIP_GATE(8084583C, &lit_10106); +COMPILER_STRIP_GATE(0x8084583C, &lit_10106); #pragma pop /* 808432E0-80843604 00B4A0 0324+00 1/0 0/0 0/0 .text procJump__9daHorse_cFv */ @@ -3407,14 +3446,14 @@ static asm void daHorse_searchSceneChangeArea(fopAc_ac_c* param_0, void* param_1 SECTION_RODATA static u8 const lit_10308[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80845840, &lit_10308); +COMPILER_STRIP_GATE(0x80845840, &lit_10308); #pragma pop /* 8084584C-80845850 0003A0 0004+00 0/1 0/0 0/0 .rodata @10523 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_10523 = 0x38D1B717; -COMPILER_STRIP_GATE(8084584C, &lit_10523); +COMPILER_STRIP_GATE(0x8084584C, &lit_10523); #pragma pop /* 80843C74-80844570 00BE34 08FC+00 1/1 0/0 0/0 .text execute__9daHorse_cFv */ @@ -3530,7 +3569,7 @@ asm void J3DMtxCalc::getWeight(u8 param_0) const { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80844BB4(Vec const& param_0, f32 const (¶m_1)[3][4]) { +extern "C" asm void func_80844BB4(void* _this, Vec const& param_0, f32 const (¶m_1)[3][4]) { nofralloc #include "asm/rel/d/a/d_a_horse/d_a_horse/func_80844BB4.s" } @@ -3541,7 +3580,7 @@ extern "C" asm void func_80844BB4(Vec const& param_0, f32 const (¶m_1)[3][4] #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80844BDC() { +extern "C" asm void func_80844BDC(void* _this) { nofralloc #include "asm/rel/d/a/d_a_horse/d_a_horse/func_80844BDC.s" } @@ -3552,21 +3591,21 @@ extern "C" asm void func_80844BDC() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10703 = 23.5f; -COMPILER_STRIP_GATE(80845850, &lit_10703); +COMPILER_STRIP_GATE(0x80845850, &lit_10703); #pragma pop /* 80845854-80845858 0003A8 0004+00 0/1 0/0 0/0 .rodata @10704 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10704 = -20.0f; -COMPILER_STRIP_GATE(80845854, &lit_10704); +COMPILER_STRIP_GATE(0x80845854, &lit_10704); #pragma pop /* 80845858-8084585C 0003AC 0004+00 0/1 0/0 0/0 .rodata @10705 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10705 = 25.5f; -COMPILER_STRIP_GATE(80845858, &lit_10705); +COMPILER_STRIP_GATE(0x80845858, &lit_10705); #pragma pop /* 80844C0C-80844CA0 00CDCC 0094+00 0/0 1/0 0/0 .text __sinit_d_a_horse_cpp */ @@ -3581,7 +3620,7 @@ asm void __sinit_d_a_horse_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80844C0C = (void*)__sinit_d_a_horse_cpp; +REGISTER_CTORS(0x80844C0C, __sinit_d_a_horse_cpp); #pragma pop /* 80844CA0-80844CA8 00CE60 0008+00 1/0 0/0 0/0 .text @36@__dt__14dBgS_HorseAcchFv */ @@ -3953,26 +3992,4 @@ static u8 data_80845E10[4]; static u8 data_80845E14[4]; #pragma pop -/* 8084585C-808458D1 0003B0 0075+00 4/4 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_8084585C = "F_SP108"; -SECTION_DEAD static char const* const stringBase_80845864 = "F_SP104"; -SECTION_DEAD static char const* const stringBase_8084586C = "F_SP109"; -SECTION_DEAD static char const* const stringBase_80845874 = ""; -SECTION_DEAD static char const* const stringBase_80845875 = "F_SP00"; -SECTION_DEAD static char const* const stringBase_8084587C = "F_SP103"; -SECTION_DEAD static char const* const stringBase_80845884 = "F_SP113"; -SECTION_DEAD static char const* const stringBase_8084588C = "F_SP102"; -SECTION_DEAD static char const* const stringBase_80845894 = "D_MN09B"; -SECTION_DEAD static char const* const stringBase_8084589C = "F_SP123"; -SECTION_DEAD static char const* const stringBase_808458A4 = "Horse"; -SECTION_DEAD static char const* const stringBase_808458AA = "pos"; -SECTION_DEAD static char const* const stringBase_808458AE = "angle"; -SECTION_DEAD static char const* const stringBase_808458B4 = "prm0"; -SECTION_DEAD static char const* const stringBase_808458B9 = "ride"; -SECTION_DEAD static char const* const stringBase_808458BE = "disXZ"; -SECTION_DEAD static char const* const stringBase_808458C4 = "disY"; -SECTION_DEAD static char const* const stringBase_808458C9 = "F_SP110"; -#pragma pop +/* 8084585C-8084585C 0003B0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/d_a_hozelda/d_a_hozelda.cpp b/rel/d/a/d_a_hozelda/d_a_hozelda.cpp index 5b687951ad2..4b680649748 100644 --- a/rel/d/a/d_a_hozelda/d_a_hozelda.cpp +++ b/rel/d/a/d_a_hozelda/d_a_hozelda.cpp @@ -201,9 +201,9 @@ template struct J3DMtxCalcNoAnm {}; /* J3DMtxCalcNoAnm */ struct J3DMtxCalcNoAnm__template0 { - /* 8084642C */ void func_8084642C(); - /* 80848CE0 */ void func_80848CE0(Vec const&, f32 const (&)[3][4]); - /* 80848D08 */ void func_80848D08(); + /* 8084642C */ void func_8084642C(void* _this); + /* 80848CE0 */ void func_80848CE0(void* _this, Vec const&, f32 const (&)[3][4]); + /* 80848D08 */ void func_80848D08(void* _this); }; struct J3DMtxCalcJ3DSysInitMaya { @@ -251,7 +251,7 @@ extern "C" static void daHoZelda_searchGanon__FP10fopAc_ac_cPv(); extern "C" void init__18daHoZelda_matAnm_cFv(); extern "C" void calc__18daHoZelda_matAnm_cCFP11J3DMaterial(); extern "C" void createHeap__11daHoZelda_cFv(); -extern "C" void func_8084642C(); +extern "C" void func_8084642C(void* _this); extern "C" void __dt__19J3DMtxCalcNoAnmBaseFv(); extern "C" void __dt__10J3DMtxCalcFv(); extern "C" void __dt__15J3DTevKColorAnmFv(); @@ -306,9 +306,9 @@ extern "C" bool getAnmTransform__10J3DMtxCalcFUc(); extern "C" bool getAnmTransform__10J3DMtxCalcFv(); extern "C" void setWeight__10J3DMtxCalcFUcf(); extern "C" void getWeight__10J3DMtxCalcCFUc(); -extern "C" void func_80848CE0(Vec const&, f32 const (&)[3][4]); -extern "C" void func_80848D08(); -extern "C" void func_80848D38(u8*); +extern "C" void func_80848CE0(void* _this, Vec const&, f32 const (&)[3][4]); +extern "C" void func_80848D08(void* _this); +extern "C" void func_80848D38(void* _this, u8*); extern "C" void __dt__18daHoZelda_matAnm_cFv(); extern "C" u8 const m__16daHoZelda_hio_c0[16]; @@ -432,7 +432,7 @@ static asm void daHoZelda_searchGanon(fopAc_ac_c* param_0, void* param_1) { SECTION_RODATA static u8 const l_arcName[8] = { 0x48, 0x6F, 0x5A, 0x65, 0x6C, 0x64, 0x61, 0x00, }; -COMPILER_STRIP_GATE(80848E3C, &l_arcName); +COMPILER_STRIP_GATE(0x80848E3C, &l_arcName); /* 80848E44-80848E54 000008 0010+00 0/5 0/0 0/0 .rodata m__16daHoZelda_hio_c0 */ #pragma push @@ -440,7 +440,7 @@ COMPILER_STRIP_GATE(80848E3C, &l_arcName); SECTION_RODATA u8 const daHoZelda_hio_c0::m[16] = { 0x03, 0x8E, 0x2A, 0xAA, 0x40, 0x00, 0x00, 0x00, 0x45, 0x5A, 0xC0, 0x00, 0x45, 0x7A, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80848E44, &daHoZelda_hio_c0::m); +COMPILER_STRIP_GATE(0x80848E44, &daHoZelda_hio_c0::m); #pragma pop /* 80848E54-80848E58 000018 0004+00 6/17 0/0 0/0 .rodata @3697 */ @@ -450,7 +450,7 @@ SECTION_RODATA static u8 const lit_3697[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80848E54, &lit_3697); +COMPILER_STRIP_GATE(0x80848E54, &lit_3697); /* 80845EAC-80845EDC 00008C 0030+00 2/2 0/0 0/0 .text init__18daHoZelda_matAnm_cFv */ #pragma push @@ -465,13 +465,13 @@ asm void daHoZelda_matAnm_c::init() { /* ############################################################################################## */ /* 80848E58-80848E5C 00001C 0004+00 5/14 0/0 0/0 .rodata @3722 */ SECTION_RODATA static f32 const lit_3722 = 1.0f; -COMPILER_STRIP_GATE(80848E58, &lit_3722); +COMPILER_STRIP_GATE(0x80848E58, &lit_3722); /* 80848E5C-80848E64 000020 0008+00 1/6 0/0 0/0 .rodata @3724 */ SECTION_RODATA static u8 const lit_3724[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80848E5C, &lit_3724); +COMPILER_STRIP_GATE(0x80848E5C, &lit_3724); /* 80845EDC-80846000 0000BC 0124+00 1/0 0/0 0/0 .text calc__18daHoZelda_matAnm_cCFP11J3DMaterial */ @@ -597,7 +597,7 @@ asm void daHoZelda_c::createHeap() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_8084642C() { +extern "C" asm void func_8084642C(void* _this) { nofralloc #include "asm/rel/d/a/d_a_hozelda/d_a_hozelda/func_8084642C.s" } @@ -758,7 +758,7 @@ static asm void daHoZelda_modelCallBack(J3DJoint* param_0, int param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4062 = -1.0f; -COMPILER_STRIP_GATE(80848E64, &lit_4062); +COMPILER_STRIP_GATE(0x80848E64, &lit_4062); #pragma pop /* 808469B0-80846C4C 000B90 029C+00 1/1 0/0 0/0 .text create__11daHoZelda_cFv */ @@ -866,7 +866,7 @@ asm void daHoZelda_c::setDoubleAnime(f32 param_0, f32 param_1, f32 param_2, u16 /* ############################################################################################## */ /* 80848E68-80848E6C 00002C 0004+00 1/2 0/0 0/0 .rodata @4209 */ SECTION_RODATA static f32 const lit_4209 = 3.0f; -COMPILER_STRIP_GATE(80848E68, &lit_4209); +COMPILER_STRIP_GATE(0x80848E68, &lit_4209); /* 8084718C-80847234 00136C 00A8+00 1/1 0/0 0/0 .text setUpperAnime__11daHoZelda_cFUs */ #pragma push @@ -904,7 +904,7 @@ asm void daHoZelda_c::setSingleAnime(u16 param_0, f32 param_1, f32 param_2, s16 #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4283 = 0x3C449BA6; -COMPILER_STRIP_GATE(80848E6C, &lit_4283); +COMPILER_STRIP_GATE(0x80848E6C, &lit_4283); #pragma pop /* 80847430-80847574 001610 0144+00 1/1 0/0 0/0 .text animePlay__11daHoZelda_cFv */ @@ -952,7 +952,7 @@ asm void daHoZelda_c::setNormalFace() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4530 = 4.0f; -COMPILER_STRIP_GATE(80848E70, &lit_4530); +COMPILER_STRIP_GATE(0x80848E70, &lit_4530); #pragma pop /* 808476B0-80847E44 001890 0794+00 1/1 0/0 0/0 .text setAnm__11daHoZelda_cFv */ @@ -972,7 +972,7 @@ asm void daHoZelda_c::setAnm() { SECTION_RODATA static u8 const localEyePos[12] = { 0x41, 0x00, 0x00, 0x00, 0xC1, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80848E74, &localEyePos); +COMPILER_STRIP_GATE(0x80848E74, &localEyePos); #pragma pop /* 80848E80-80848E8C 000044 000C+00 0/1 0/0 0/0 .rodata localHeadCenterPos$4538 */ @@ -981,28 +981,28 @@ COMPILER_STRIP_GATE(80848E74, &localEyePos); SECTION_RODATA static u8 const localHeadCenterPos[12] = { 0x41, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80848E80, &localHeadCenterPos); +COMPILER_STRIP_GATE(0x80848E80, &localHeadCenterPos); #pragma pop /* 80848E8C-80848E90 000050 0004+00 0/1 0/0 0/0 .rodata @4580 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4580 = 80.0f; -COMPILER_STRIP_GATE(80848E8C, &lit_4580); +COMPILER_STRIP_GATE(0x80848E8C, &lit_4580); #pragma pop /* 80848E90-80848E94 000054 0004+00 0/1 0/0 0/0 .rodata @4581 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4581 = 10.0f; -COMPILER_STRIP_GATE(80848E90, &lit_4581); +COMPILER_STRIP_GATE(0x80848E90, &lit_4581); #pragma pop /* 80848E94-80848E98 000058 0004+00 0/1 0/0 0/0 .rodata @4582 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4582 = -2.0f; -COMPILER_STRIP_GATE(80848E94, &lit_4582); +COMPILER_STRIP_GATE(0x80848E94, &lit_4582); #pragma pop /* 80847E44-80847F54 002024 0110+00 2/2 0/0 0/0 .text setBowModel__11daHoZelda_cFv */ @@ -1020,13 +1020,13 @@ asm void daHoZelda_c::setBowModel() { SECTION_RODATA static u8 const localHorseRidePos[12] = { 0xC0, 0xBC, 0x9B, 0xA6, 0x42, 0x52, 0x70, 0xA4, 0x40, 0x82, 0x87, 0x2B, }; -COMPILER_STRIP_GATE(80848E98, &localHorseRidePos); +COMPILER_STRIP_GATE(0x80848E98, &localHorseRidePos); /* 80848EA4-80848EB0 000068 000C+00 1/1 0/0 0/0 .rodata localFrontHorseRidePos$4587 */ SECTION_RODATA static u8 const localFrontHorseRidePos[12] = { 0xC2, 0x97, 0xC9, 0xBA, 0x42, 0x66, 0x70, 0xA4, 0x40, 0x82, 0x87, 0x2B, }; -COMPILER_STRIP_GATE(80848EA4, &localFrontHorseRidePos); +COMPILER_STRIP_GATE(0x80848EA4, &localFrontHorseRidePos); /* 80847F54-80848058 002134 0104+00 2/2 0/0 0/0 .text setMatrix__11daHoZelda_cFv */ #pragma push @@ -1073,13 +1073,13 @@ asm void daHoZelda_c::setBowBck(u16 param_0) { SECTION_RODATA static u8 const baseRidePos[12] = { 0x3D, 0xCC, 0xCC, 0xCD, 0x43, 0x6C, 0xB3, 0x33, 0xC2, 0x7E, 0x37, 0x4C, }; -COMPILER_STRIP_GATE(80848EB0, &baseRidePos); +COMPILER_STRIP_GATE(0x80848EB0, &baseRidePos); /* 80848EBC-80848EC8 000080 000C+00 1/1 0/0 0/0 .rodata frontRidePos$4673 */ SECTION_RODATA static u8 const frontRidePos[12] = { 0x3D, 0xCC, 0xCC, 0xCD, 0x43, 0x71, 0xB3, 0x33, 0x40, 0xCE, 0x45, 0xA0, }; -COMPILER_STRIP_GATE(80848EBC, &frontRidePos); +COMPILER_STRIP_GATE(0x80848EBC, &frontRidePos); /* 8084819C-80848204 00237C 0068+00 2/2 0/0 0/0 .text setRideOffset__11daHoZelda_cFv */ #pragma push @@ -1106,42 +1106,42 @@ asm void daHoZelda_c::clearEyeMove() { #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4752 = 0x39000000; -COMPILER_STRIP_GATE(80848EC8, &lit_4752); +COMPILER_STRIP_GATE(0x80848EC8, &lit_4752); #pragma pop /* 80848ECC-80848ED0 000090 0004+00 0/1 0/0 0/0 .rodata @4753 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4753 = -1.0f / 5.0f; -COMPILER_STRIP_GATE(80848ECC, &lit_4753); +COMPILER_STRIP_GATE(0x80848ECC, &lit_4753); #pragma pop /* 80848ED0-80848ED4 000094 0004+00 0/1 0/0 0/0 .rodata @4754 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4754 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(80848ED0, &lit_4754); +COMPILER_STRIP_GATE(0x80848ED0, &lit_4754); #pragma pop /* 80848ED4-80848ED8 000098 0004+00 0/1 0/0 0/0 .rodata @4755 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4755 = 0.5f; -COMPILER_STRIP_GATE(80848ED4, &lit_4755); +COMPILER_STRIP_GATE(0x80848ED4, &lit_4755); #pragma pop /* 80848ED8-80848EDC 00009C 0004+00 0/1 0/0 0/0 .rodata @4756 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4756 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(80848ED8, &lit_4756); +COMPILER_STRIP_GATE(0x80848ED8, &lit_4756); #pragma pop /* 80848EDC-80848EE0 0000A0 0004+00 0/1 0/0 0/0 .rodata @4757 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4757 = 3.0f / 100.0f; -COMPILER_STRIP_GATE(80848EDC, &lit_4757); +COMPILER_STRIP_GATE(0x80848EDC, &lit_4757); #pragma pop /* 80848254-808484B8 002434 0264+00 1/1 0/0 0/0 .text setEyeMove__11daHoZelda_cFPC4cXyzss @@ -1160,14 +1160,14 @@ asm void daHoZelda_c::setEyeMove(cXyz const* param_0, s16 param_1, s16 param_2) #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4861 = 250000.0f; -COMPILER_STRIP_GATE(80848EE0, &lit_4861); +COMPILER_STRIP_GATE(0x80848EE0, &lit_4861); #pragma pop /* 80848EE4-80848EE8 0000A8 0004+00 0/1 0/0 0/0 .rodata @4862 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4862 = 90000.0f; -COMPILER_STRIP_GATE(80848EE4, &lit_4862); +COMPILER_STRIP_GATE(0x80848EE4, &lit_4862); #pragma pop /* 808484B8-80848774 002698 02BC+00 1/1 0/0 0/0 .text setNeckAngle__11daHoZelda_cFv */ @@ -1185,7 +1185,7 @@ asm void daHoZelda_c::setNeckAngle() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4938 = 40.0f; -COMPILER_STRIP_GATE(80848EE8, &lit_4938); +COMPILER_STRIP_GATE(0x80848EE8, &lit_4938); #pragma pop /* 80848EEC-80848EF4 0000B0 0008+00 0/1 0/0 0/0 .rodata @4939 */ @@ -1194,7 +1194,7 @@ COMPILER_STRIP_GATE(80848EE8, &lit_4938); SECTION_RODATA static u8 const lit_4939[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80848EEC, &lit_4939); +COMPILER_STRIP_GATE(0x80848EEC, &lit_4939); #pragma pop /* 80848EF4-80848EFC 0000B8 0008+00 0/1 0/0 0/0 .rodata @4940 */ @@ -1203,7 +1203,7 @@ COMPILER_STRIP_GATE(80848EEC, &lit_4939); SECTION_RODATA static u8 const lit_4940[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80848EF4, &lit_4940); +COMPILER_STRIP_GATE(0x80848EF4, &lit_4940); #pragma pop /* 80848EFC-80848F04 0000C0 0008+00 0/1 0/0 0/0 .rodata @4941 */ @@ -1212,7 +1212,7 @@ COMPILER_STRIP_GATE(80848EF4, &lit_4940); SECTION_RODATA static u8 const lit_4941[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80848EFC, &lit_4941); +COMPILER_STRIP_GATE(0x80848EFC, &lit_4941); #pragma pop /* 80848774-808489CC 002954 0258+00 1/1 0/0 0/0 .text searchBodyAngle__11daHoZelda_cFv */ @@ -1319,7 +1319,7 @@ asm void J3DMtxCalc::getWeight(u8 param_0) const { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80848CE0(Vec const& param_0, f32 const (¶m_1)[3][4]) { +extern "C" asm void func_80848CE0(void* _this, Vec const& param_0, f32 const (¶m_1)[3][4]) { nofralloc #include "asm/rel/d/a/d_a_hozelda/d_a_hozelda/func_80848CE0.s" } @@ -1330,7 +1330,7 @@ extern "C" asm void func_80848CE0(Vec const& param_0, f32 const (¶m_1)[3][4] #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80848D08() { +extern "C" asm void func_80848D08(void* _this) { nofralloc #include "asm/rel/d/a/d_a_hozelda/d_a_hozelda/func_80848D08.s" } @@ -1340,7 +1340,7 @@ extern "C" asm void func_80848D08() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80848D38(u8* param_0) { +extern "C" asm void func_80848D38(void* _this, u8* param_0) { nofralloc #include "asm/rel/d/a/d_a_hozelda/d_a_hozelda/func_80848D38.s" } diff --git a/rel/d/a/d_a_izumi_gate/d_a_izumi_gate.cpp b/rel/d/a/d_a_izumi_gate/d_a_izumi_gate.cpp index a0d234857fe..4497d0634dc 100644 --- a/rel/d/a/d_a_izumi_gate/d_a_izumi_gate.cpp +++ b/rel/d/a/d_a_izumi_gate/d_a_izumi_gate.cpp @@ -179,6 +179,13 @@ static asm void daIzumiGate_Delete(daIzumiGate_c* param_0) { #pragma pop /* ############################################################################################## */ +/* 80849408-80849408 000000 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80849408 = "M_IzmGate"; +SECTION_DEAD static char const* const stringBase_80849412 = "M_IzumiGate_b.dzb"; +#pragma pop + /* 80849438-8084943C -00001 0004+00 3/3 0/0 0/0 .data l_arcName */ SECTION_DATA static void* l_arcName = (void*)&d_a_izumi_gate__stringBase0; @@ -229,6 +236,15 @@ static asm void daIzumiGate_Create(fopAc_ac_c* param_0) { } #pragma pop +/* ############################################################################################## */ +/* 80849408-80849408 000000 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80849424 = "M_IzumiGate_b.bmd"; +/* @stringBase0 padding */ +SECTION_DEAD static char const* const pad_80849436 = "\0"; +#pragma pop + /* 80849260-808492D8 000240 0078+00 1/0 0/0 0/0 .text CreateHeap__13daIzumiGate_cFv */ #pragma push #pragma optimization_level 0 @@ -280,13 +296,4 @@ asm void daIzumiGate_c::Delete() { } #pragma pop -/* 80849408-80849438 000000 002E+02 3/2 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80849408 = "M_IzmGate"; -SECTION_DEAD static char const* const stringBase_80849412 = "M_IzumiGate_b.dzb"; -SECTION_DEAD static char const* const stringBase_80849424 = "M_IzumiGate_b.bmd"; -/* @stringBase0 padding */ -SECTION_DEAD static char const* const pad_80849436 = "\0"; -#pragma pop +/* 80849408-80849408 000000 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/d_a_kago/d_a_kago.cpp b/rel/d/a/d_a_kago/d_a_kago.cpp index b4a89087d2f..64f3aa4fcd7 100644 --- a/rel/d/a/d_a_kago/d_a_kago.cpp +++ b/rel/d/a/d_a_kago/d_a_kago.cpp @@ -36,16 +36,16 @@ struct mDoMtx_stack_c { static u8 now[48]; }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; - struct J3DAnmTransform {}; +struct J3DModelData {}; + +struct Z2Creature {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -79,10 +79,10 @@ struct daObj_Balloon_c { /* 80BA80F4 */ void saveBestScore(); }; -struct J3DJoint {}; - struct J3DModel {}; +struct J3DJoint {}; + struct daKago_c { /* 80849660 */ void getBckName(int); /* 808496F0 */ void setBck(int, u8, f32, f32); @@ -675,85 +675,85 @@ extern "C" void checkHitWaterFall__16daTagWaterFall_cF4cXyz(); /* ############################################################################################## */ /* 80854B04-80854B08 000000 0004+00 27/27 0/0 0/0 .rodata @3929 */ SECTION_RODATA static f32 const lit_3929 = 1024.0f; -COMPILER_STRIP_GATE(80854B04, &lit_3929); +COMPILER_STRIP_GATE(0x80854B04, &lit_3929); /* 80854B08-80854B0C 000004 0004+00 0/1 0/0 0/0 .rodata @3930 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3930 = 512.0f; -COMPILER_STRIP_GATE(80854B08, &lit_3930); +COMPILER_STRIP_GATE(0x80854B08, &lit_3930); #pragma pop /* 80854B0C-80854B10 000008 0004+00 0/1 0/0 0/0 .rodata @3931 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3931 = 256.0f; -COMPILER_STRIP_GATE(80854B0C, &lit_3931); +COMPILER_STRIP_GATE(0x80854B0C, &lit_3931); #pragma pop /* 80854B10-80854B14 00000C 0004+00 11/25 0/0 0/0 .rodata @3932 */ SECTION_RODATA static f32 const lit_3932 = 1.0f; -COMPILER_STRIP_GATE(80854B10, &lit_3932); +COMPILER_STRIP_GATE(0x80854B10, &lit_3932); /* 80854B14-80854B18 000010 0004+00 0/6 0/0 0/0 .rodata @3933 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3933 = 50.0f; -COMPILER_STRIP_GATE(80854B14, &lit_3933); +COMPILER_STRIP_GATE(0x80854B14, &lit_3933); #pragma pop /* 80854B18-80854B1C 000014 0004+00 0/7 0/0 0/0 .rodata @3934 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3934 = 70.0f; -COMPILER_STRIP_GATE(80854B18, &lit_3934); +COMPILER_STRIP_GATE(0x80854B18, &lit_3934); #pragma pop /* 80854B1C-80854B20 000018 0004+00 0/1 0/0 0/0 .rodata @3935 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3935 = 90.0f; -COMPILER_STRIP_GATE(80854B1C, &lit_3935); +COMPILER_STRIP_GATE(0x80854B1C, &lit_3935); #pragma pop /* 80854B20-80854B24 00001C 0004+00 0/6 0/0 0/0 .rodata @3936 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3936 = 5.0f; -COMPILER_STRIP_GATE(80854B20, &lit_3936); +COMPILER_STRIP_GATE(0x80854B20, &lit_3936); #pragma pop /* 80854B24-80854B28 000020 0004+00 0/5 0/0 0/0 .rodata @3937 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3937 = 300.0f; -COMPILER_STRIP_GATE(80854B24, &lit_3937); +COMPILER_STRIP_GATE(0x80854B24, &lit_3937); #pragma pop /* 80854B28-80854B2C 000024 0004+00 0/6 0/0 0/0 .rodata @3938 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3938 = 3.0f; -COMPILER_STRIP_GATE(80854B28, &lit_3938); +COMPILER_STRIP_GATE(0x80854B28, &lit_3938); #pragma pop /* 80854B2C-80854B30 000028 0004+00 0/1 0/0 0/0 .rodata @3939 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3939 = 85.0f; -COMPILER_STRIP_GATE(80854B2C, &lit_3939); +COMPILER_STRIP_GATE(0x80854B2C, &lit_3939); #pragma pop /* 80854B30-80854B34 00002C 0004+00 0/2 0/0 0/0 .rodata @3940 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3940 = 700.0f; -COMPILER_STRIP_GATE(80854B30, &lit_3940); +COMPILER_STRIP_GATE(0x80854B30, &lit_3940); #pragma pop /* 80854B34-80854B38 000030 0004+00 1/7 0/0 0/0 .rodata @3941 */ SECTION_RODATA static f32 const lit_3941 = 200.0f; -COMPILER_STRIP_GATE(80854B34, &lit_3941); +COMPILER_STRIP_GATE(0x80854B34, &lit_3941); /* 80854B38-80854B3C 000034 0004+00 4/27 0/0 0/0 .rodata @3942 */ SECTION_RODATA static u8 const lit_3942[4] = { @@ -762,11 +762,11 @@ SECTION_RODATA static u8 const lit_3942[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80854B38, &lit_3942); +COMPILER_STRIP_GATE(0x80854B38, &lit_3942); /* 80854B3C-80854B40 000038 0004+00 2/13 0/0 0/0 .rodata @3943 */ SECTION_RODATA static f32 const lit_3943 = 10.0f; -COMPILER_STRIP_GATE(80854B3C, &lit_3943); +COMPILER_STRIP_GATE(0x80854B3C, &lit_3943); /* 80854D4C-80854D8C 000000 0040+00 1/1 0/0 0/0 .data cc_sph_src__22@unnamed@d_a_kago_cpp@ */ SECTION_DATA static u8 data_80854D4C[64] = { @@ -981,7 +981,7 @@ asm void daKago_c::getBckName(int param_0) { /* ############################################################################################## */ /* 80854B40-80854B44 00003C 0004+00 1/1 0/0 0/0 .rodata @3978 */ SECTION_RODATA static f32 const lit_3978 = -1.0f; -COMPILER_STRIP_GATE(80854B40, &lit_3978); +COMPILER_STRIP_GATE(0x80854B40, &lit_3978); /* 808496F0-80849798 000230 00A8+00 13/13 0/0 0/0 .text setBck__8daKago_cFiUcff */ #pragma push @@ -1006,13 +1006,13 @@ asm void daKago_c::checkBck(int param_0) { /* ############################################################################################## */ /* 80854B44-80854B48 000040 0004+00 1/9 0/0 0/0 .rodata @4033 */ SECTION_RODATA static f32 const lit_4033 = 100.0f; -COMPILER_STRIP_GATE(80854B44, &lit_4033); +COMPILER_STRIP_GATE(0x80854B44, &lit_4033); /* 80854B48-80854B4C 000044 0004+00 0/1 0/0 0/0 .rodata @4034 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4034 = 3500.0f; -COMPILER_STRIP_GATE(80854B48, &lit_4034); +COMPILER_STRIP_GATE(0x80854B48, &lit_4034); #pragma pop /* 808497F8-80849924 000338 012C+00 1/1 0/0 0/0 .text draw__8daKago_cFv */ @@ -1045,6 +1045,13 @@ static asm void daKago_Draw(daKago_c* param_0) { } #pragma pop +/* ############################################################################################## */ +/* 80854D14-80854D14 000210 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80854D14 = "F_SP112"; +#pragma pop + /* 80849980-80849BA8 0004C0 0228+00 1/1 0/0 0/0 .text executeBalloonMenu__8daKago_cFv */ #pragma push #pragma optimization_level 0 @@ -1062,7 +1069,7 @@ asm void daKago_c::executeBalloonMenu() { SECTION_RODATA static u8 const lit_4201[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80854B4C, &lit_4201); +COMPILER_STRIP_GATE(0x80854B4C, &lit_4201); #pragma pop /* 80854B54-80854B5C 000050 0008+00 0/5 0/0 0/0 .rodata @4202 */ @@ -1071,7 +1078,7 @@ COMPILER_STRIP_GATE(80854B4C, &lit_4201); SECTION_RODATA static u8 const lit_4202[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80854B54, &lit_4202); +COMPILER_STRIP_GATE(0x80854B54, &lit_4202); #pragma pop /* 80854B5C-80854B64 000058 0008+00 0/5 0/0 0/0 .rodata @4203 */ @@ -1080,28 +1087,28 @@ COMPILER_STRIP_GATE(80854B54, &lit_4202); SECTION_RODATA static u8 const lit_4203[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80854B5C, &lit_4203); +COMPILER_STRIP_GATE(0x80854B5C, &lit_4203); #pragma pop /* 80854B64-80854B68 000060 0004+00 0/5 0/0 0/0 .rodata @4204 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4204 = 500.0f; -COMPILER_STRIP_GATE(80854B64, &lit_4204); +COMPILER_STRIP_GATE(0x80854B64, &lit_4204); #pragma pop /* 80854B68-80854B6C 000064 0004+00 0/1 0/0 0/0 .rodata @4205 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4205 = -1000000000.0f; -COMPILER_STRIP_GATE(80854B68, &lit_4205); +COMPILER_STRIP_GATE(0x80854B68, &lit_4205); #pragma pop /* 80854B6C-80854B70 000068 0004+00 0/1 0/0 0/0 .rodata @4206 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4206 = 80.0f; -COMPILER_STRIP_GATE(80854B6C, &lit_4206); +COMPILER_STRIP_GATE(0x80854B6C, &lit_4206); #pragma pop /* 80854F68-80854F6C 000008 0004+00 2/2 0/0 0/0 .bss None */ @@ -1128,14 +1135,14 @@ asm void daKago_c::checkGroundHeight(cXyz param_0, f32* param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4255 = 1000000000.0f; -COMPILER_STRIP_GATE(80854B70, &lit_4255); +COMPILER_STRIP_GATE(0x80854B70, &lit_4255); #pragma pop /* 80854B74-80854B78 000070 0004+00 0/1 0/0 0/0 .rodata @4256 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4256 = 310.0f; -COMPILER_STRIP_GATE(80854B74, &lit_4256); +COMPILER_STRIP_GATE(0x80854B74, &lit_4256); #pragma pop /* 8084A070-8084A210 000BB0 01A0+00 4/4 0/0 0/0 .text checkRoofHeight__8daKago_cF4cXyz */ @@ -1151,7 +1158,7 @@ asm void daKago_c::checkRoofHeight(cXyz param_0) { /* ############################################################################################## */ /* 80854B78-80854B7C 000074 0004+00 2/9 0/0 0/0 .rodata @4270 */ SECTION_RODATA static f32 const lit_4270 = 30.0f; -COMPILER_STRIP_GATE(80854B78, &lit_4270); +COMPILER_STRIP_GATE(0x80854B78, &lit_4270); /* 8084A210-8084A2A8 000D50 0098+00 1/1 0/0 0/0 .text checkMoveHeight__8daKago_cFv */ #pragma push @@ -1168,7 +1175,7 @@ asm void daKago_c::checkMoveHeight() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4415 = 9.0f / 10.0f; -COMPILER_STRIP_GATE(80854B7C, &lit_4415); +COMPILER_STRIP_GATE(0x80854B7C, &lit_4415); #pragma pop /* 8084A2A8-8084A694 000DE8 03EC+00 1/1 0/0 0/0 .text checkSizeBg__8daKago_cFv */ @@ -1272,133 +1279,133 @@ asm void daKago_c::setRideOff() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4478 = -77875.0f; -COMPILER_STRIP_GATE(80854B80, &lit_4478); +COMPILER_STRIP_GATE(0x80854B80, &lit_4478); #pragma pop /* 80854B84-80854B88 000080 0004+00 0/0 0/0 0/0 .rodata @4479 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4479 = -18287.0f; -COMPILER_STRIP_GATE(80854B84, &lit_4479); +COMPILER_STRIP_GATE(0x80854B84, &lit_4479); #pragma pop /* 80854B88-80854B8C 000084 0004+00 0/0 0/0 0/0 .rodata @4480 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4480 = 42000.0f; -COMPILER_STRIP_GATE(80854B88, &lit_4480); +COMPILER_STRIP_GATE(0x80854B88, &lit_4480); #pragma pop /* 80854B8C-80854B90 000088 0004+00 0/0 0/0 0/0 .rodata @4481 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4481 = -77275.0f; -COMPILER_STRIP_GATE(80854B8C, &lit_4481); +COMPILER_STRIP_GATE(0x80854B8C, &lit_4481); #pragma pop /* 80854B90-80854B94 00008C 0004+00 0/1 0/0 0/0 .rodata @4482 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4482 = -18500.0f; -COMPILER_STRIP_GATE(80854B90, &lit_4482); +COMPILER_STRIP_GATE(0x80854B90, &lit_4482); #pragma pop /* 80854B94-80854B98 000090 0004+00 0/0 0/0 0/0 .rodata @4483 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4483 = 41090.0f; -COMPILER_STRIP_GATE(80854B94, &lit_4483); +COMPILER_STRIP_GATE(0x80854B94, &lit_4483); #pragma pop /* 80854B98-80854B9C 000094 0004+00 0/1 0/0 0/0 .rodata @4484 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4484 = -77615.0f; -COMPILER_STRIP_GATE(80854B98, &lit_4484); +COMPILER_STRIP_GATE(0x80854B98, &lit_4484); #pragma pop /* 80854B9C-80854BA0 000098 0004+00 0/0 0/0 0/0 .rodata @4485 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4485 = -18640.0f; -COMPILER_STRIP_GATE(80854B9C, &lit_4485); +COMPILER_STRIP_GATE(0x80854B9C, &lit_4485); #pragma pop /* 80854BA0-80854BA4 00009C 0004+00 0/1 0/0 0/0 .rodata @4486 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4486 = 41400.0f; -COMPILER_STRIP_GATE(80854BA0, &lit_4486); +COMPILER_STRIP_GATE(0x80854BA0, &lit_4486); #pragma pop /* 80854BA4-80854BA8 0000A0 0004+00 0/0 0/0 0/0 .rodata @4487 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4487 = 3703.0f; -COMPILER_STRIP_GATE(80854BA4, &lit_4487); +COMPILER_STRIP_GATE(0x80854BA4, &lit_4487); #pragma pop /* 80854BA8-80854BAC 0000A4 0004+00 0/0 0/0 0/0 .rodata @4488 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4488 = 337.0f; -COMPILER_STRIP_GATE(80854BA8, &lit_4488); +COMPILER_STRIP_GATE(0x80854BA8, &lit_4488); #pragma pop /* 80854BAC-80854BB0 0000A8 0004+00 0/0 0/0 0/0 .rodata @4489 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4489 = 863.0f; -COMPILER_STRIP_GATE(80854BAC, &lit_4489); +COMPILER_STRIP_GATE(0x80854BAC, &lit_4489); #pragma pop /* 80854BB0-80854BB4 0000AC 0004+00 0/0 0/0 0/0 .rodata @4490 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4490 = 3726.0f; -COMPILER_STRIP_GATE(80854BB0, &lit_4490); +COMPILER_STRIP_GATE(0x80854BB0, &lit_4490); #pragma pop /* 80854BB4-80854BB8 0000B0 0004+00 0/0 0/0 0/0 .rodata @4491 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4491 = 272.0f; -COMPILER_STRIP_GATE(80854BB4, &lit_4491); +COMPILER_STRIP_GATE(0x80854BB4, &lit_4491); #pragma pop /* 80854BB8-80854BBC 0000B4 0004+00 0/0 0/0 0/0 .rodata @4492 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4492 = 1196.0f; -COMPILER_STRIP_GATE(80854BB8, &lit_4492); +COMPILER_STRIP_GATE(0x80854BB8, &lit_4492); #pragma pop /* 80854BBC-80854BC0 0000B8 0004+00 0/0 0/0 0/0 .rodata @4493 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4493 = 3782.0f; -COMPILER_STRIP_GATE(80854BBC, &lit_4493); +COMPILER_STRIP_GATE(0x80854BBC, &lit_4493); #pragma pop /* 80854BC0-80854BC4 0000BC 0004+00 0/0 0/0 0/0 .rodata @4494 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4494 = 222.0f; -COMPILER_STRIP_GATE(80854BC0, &lit_4494); +COMPILER_STRIP_GATE(0x80854BC0, &lit_4494); #pragma pop /* 80854BC4-80854BC8 0000C0 0004+00 0/0 0/0 0/0 .rodata @4495 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4495 = 690.0f; -COMPILER_STRIP_GATE(80854BC4, &lit_4495); +COMPILER_STRIP_GATE(0x80854BC4, &lit_4495); #pragma pop /* 80854BC8-80854BCC 0000C4 0004+00 0/1 0/0 0/0 .rodata @4657 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4657 = 100000.0f; -COMPILER_STRIP_GATE(80854BC8, &lit_4657); +COMPILER_STRIP_GATE(0x80854BC8, &lit_4657); #pragma pop /* 8084AC2C-8084AE78 00176C 024C+00 1/1 0/0 0/0 .text searchNearPassPoint__8daKago_cFv */ @@ -1476,14 +1483,14 @@ asm void daKago_c::checkHeight() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4759 = -22984.0f; -COMPILER_STRIP_GATE(80854BCC, &lit_4759); +COMPILER_STRIP_GATE(0x80854BCC, &lit_4759); #pragma pop /* 80854BD0-80854BD4 0000CC 0004+00 0/1 0/0 0/0 .rodata @4760 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4760 = 7455.0f; -COMPILER_STRIP_GATE(80854BD0, &lit_4760); +COMPILER_STRIP_GATE(0x80854BD0, &lit_4760); #pragma pop /* 8084B134-8084B1E0 001C74 00AC+00 2/2 0/0 0/0 .text checkYaguraPos__8daKago_cF4cXyz */ @@ -1521,7 +1528,7 @@ asm void daKago_c::checkAttackStart() { SECTION_RODATA static u8 const lit_4923[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80854BD4, &lit_4923); +COMPILER_STRIP_GATE(0x80854BD4, &lit_4923); /* 8084B5DC-8084B6F4 00211C 0118+00 1/1 0/0 0/0 .text getValueY__8daKago_cFf */ #pragma push @@ -1568,14 +1575,14 @@ asm void daKago_c::flySpeedCalcLockOn() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5091 = 40.0f; -COMPILER_STRIP_GATE(80854BDC, &lit_5091); +COMPILER_STRIP_GATE(0x80854BDC, &lit_5091); #pragma pop /* 80854BE0-80854BE4 0000DC 0004+00 0/5 0/0 0/0 .rodata @5092 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5092 = 20.0f; -COMPILER_STRIP_GATE(80854BE0, &lit_5092); +COMPILER_STRIP_GATE(0x80854BE0, &lit_5092); #pragma pop /* 8084B96C-8084C078 0024AC 070C+00 2/2 0/0 0/0 .text flySpeedCalc__8daKago_cFsi */ @@ -1623,7 +1630,7 @@ asm void daKago_c::setFlyAnime() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5329 = 2.0f; -COMPILER_STRIP_GATE(80854BE4, &lit_5329); +COMPILER_STRIP_GATE(0x80854BE4, &lit_5329); #pragma pop /* 8084C2CC-8084C8FC 002E0C 0630+00 1/1 0/0 0/0 .text executeFly__8daKago_cFv */ @@ -1641,32 +1648,32 @@ asm void daKago_c::executeFly() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5478 = -30.0f; -COMPILER_STRIP_GATE(80854BE8, &lit_5478); +COMPILER_STRIP_GATE(0x80854BE8, &lit_5478); #pragma pop /* 80854BEC-80854BF0 0000E8 0004+00 0/1 0/0 0/0 .rodata @5479 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5479 = -50.0f; -COMPILER_STRIP_GATE(80854BEC, &lit_5479); +COMPILER_STRIP_GATE(0x80854BEC, &lit_5479); #pragma pop /* 80854BF0-80854BF4 0000EC 0004+00 0/1 0/0 0/0 .rodata @5480 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5480 = 22.0f; -COMPILER_STRIP_GATE(80854BF0, &lit_5480); +COMPILER_STRIP_GATE(0x80854BF0, &lit_5480); #pragma pop /* 80854BF4-80854BF8 0000F0 0004+00 1/5 0/0 0/0 .rodata @5481 */ SECTION_RODATA static f32 const lit_5481 = 0.5f; -COMPILER_STRIP_GATE(80854BF4, &lit_5481); +COMPILER_STRIP_GATE(0x80854BF4, &lit_5481); /* 80854BF8-80854BFC 0000F4 0004+00 0/1 0/0 0/0 .rodata @5482 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5482 = -10.0f; -COMPILER_STRIP_GATE(80854BF8, &lit_5482); +COMPILER_STRIP_GATE(0x80854BF8, &lit_5482); #pragma pop /* 8084C8FC-8084D108 00343C 080C+00 1/1 0/0 0/0 .text executeStagger__8daKago_cFv */ @@ -1704,35 +1711,35 @@ asm void daKago_c::calcAttackMove(int param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5671 = 9.0f; -COMPILER_STRIP_GATE(80854BFC, &lit_5671); +COMPILER_STRIP_GATE(0x80854BFC, &lit_5671); #pragma pop /* 80854C00-80854C04 0000FC 0004+00 0/2 0/0 0/0 .rodata @5672 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5672 = 12.0f; -COMPILER_STRIP_GATE(80854C00, &lit_5672); +COMPILER_STRIP_GATE(0x80854C00, &lit_5672); #pragma pop /* 80854C04-80854C08 000100 0004+00 0/2 0/0 0/0 .rodata @5673 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5673 = 35.0f; -COMPILER_STRIP_GATE(80854C04, &lit_5673); +COMPILER_STRIP_GATE(0x80854C04, &lit_5673); #pragma pop /* 80854C08-80854C0C 000104 0004+00 0/1 0/0 0/0 .rodata @5674 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5674 = 23.0f; -COMPILER_STRIP_GATE(80854C08, &lit_5674); +COMPILER_STRIP_GATE(0x80854C08, &lit_5674); #pragma pop /* 80854C0C-80854C10 000108 0004+00 0/2 0/0 0/0 .rodata @5675 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5675 = 8000.0f; -COMPILER_STRIP_GATE(80854C0C, &lit_5675); +COMPILER_STRIP_GATE(0x80854C0C, &lit_5675); #pragma pop /* 8084D50C-8084DA18 00404C 050C+00 1/1 0/0 0/0 .text executeAttack__8daKago_cFv */ @@ -1750,28 +1757,28 @@ asm void daKago_c::executeAttack() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5722 = 1500.0f; -COMPILER_STRIP_GATE(80854C10, &lit_5722); +COMPILER_STRIP_GATE(0x80854C10, &lit_5722); #pragma pop /* 80854C14-80854C18 000110 0004+00 0/2 0/0 0/0 .rodata @5723 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5723 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(80854C14, &lit_5723); +COMPILER_STRIP_GATE(0x80854C14, &lit_5723); #pragma pop /* 80854C18-80854C1C 000114 0004+00 0/3 0/0 0/0 .rodata @5724 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5724 = -1000.0f; -COMPILER_STRIP_GATE(80854C18, &lit_5724); +COMPILER_STRIP_GATE(0x80854C18, &lit_5724); #pragma pop /* 80854C1C-80854C20 000118 0004+00 0/1 0/0 0/0 .rodata @5725 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5725 = 60.0f; -COMPILER_STRIP_GATE(80854C1C, &lit_5725); +COMPILER_STRIP_GATE(0x80854C1C, &lit_5725); #pragma pop /* 8084DA18-8084DBFC 004558 01E4+00 2/2 0/0 0/0 .text calcCircleCamera__8daKago_cFi */ @@ -1799,42 +1806,42 @@ asm void daKago_c::executeEvent() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5852 = -90000.0f; -COMPILER_STRIP_GATE(80854C20, &lit_5852); +COMPILER_STRIP_GATE(0x80854C20, &lit_5852); #pragma pop /* 80854C24-80854C28 000120 0004+00 0/1 0/0 0/0 .rodata @5853 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5853 = 1000.0f; -COMPILER_STRIP_GATE(80854C24, &lit_5853); +COMPILER_STRIP_GATE(0x80854C24, &lit_5853); #pragma pop /* 80854C28-80854C2C 000124 0004+00 0/3 0/0 0/0 .rodata @5854 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5854 = -300.0f; -COMPILER_STRIP_GATE(80854C28, &lit_5854); +COMPILER_STRIP_GATE(0x80854C28, &lit_5854); #pragma pop /* 80854C2C-80854C30 000128 0004+00 0/2 0/0 0/0 .rodata @5855 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5855 = -100.0f; -COMPILER_STRIP_GATE(80854C2C, &lit_5855); +COMPILER_STRIP_GATE(0x80854C2C, &lit_5855); #pragma pop /* 80854C30-80854C34 00012C 0004+00 0/1 0/0 0/0 .rodata @5856 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5856 = -16000.0f; -COMPILER_STRIP_GATE(80854C30, &lit_5856); +COMPILER_STRIP_GATE(0x80854C30, &lit_5856); #pragma pop /* 80854C34-80854C38 000130 0004+00 0/1 0/0 0/0 .rodata @5857 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5857 = 40000.0f; -COMPILER_STRIP_GATE(80854C34, &lit_5857); +COMPILER_STRIP_GATE(0x80854C34, &lit_5857); #pragma pop /* 8084DD18-8084E2D4 004858 05BC+00 1/1 0/0 0/0 .text initPerchDemo__8daKago_cFv */ @@ -1852,14 +1859,14 @@ asm void daKago_c::initPerchDemo() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6160 = 3.0f / 10.0f; -COMPILER_STRIP_GATE(80854C38, &lit_6160); +COMPILER_STRIP_GATE(0x80854C38, &lit_6160); #pragma pop /* 80854C3C-80854C40 000138 0004+00 0/1 0/0 0/0 .rodata @6161 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6161 = -3.0f; -COMPILER_STRIP_GATE(80854C3C, &lit_6161); +COMPILER_STRIP_GATE(0x80854C3C, &lit_6161); #pragma pop /* 8084E2D4-8084F09C 004E14 0DC8+00 2/1 0/0 0/0 .text executePerchDemo__8daKago_cFv */ @@ -1877,42 +1884,42 @@ asm void daKago_c::executePerchDemo() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6162 = 2000.0f; -COMPILER_STRIP_GATE(80854C40, &lit_6162); +COMPILER_STRIP_GATE(0x80854C40, &lit_6162); #pragma pop /* 80854C44-80854C48 000140 0004+00 0/3 0/0 0/0 .rodata @6163 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6163 = 400.0f; -COMPILER_STRIP_GATE(80854C44, &lit_6163); +COMPILER_STRIP_GATE(0x80854C44, &lit_6163); #pragma pop /* 80854C48-80854C4C 000144 0004+00 0/0 0/0 0/0 .rodata @6164 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6164 = 1.0f / 20.0f; -COMPILER_STRIP_GATE(80854C48, &lit_6164); +COMPILER_STRIP_GATE(0x80854C48, &lit_6164); #pragma pop /* 80854C4C-80854C50 000148 0004+00 0/1 0/0 0/0 .rodata @6165 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6165 = -800.0f; -COMPILER_STRIP_GATE(80854C4C, &lit_6165); +COMPILER_STRIP_GATE(0x80854C4C, &lit_6165); #pragma pop /* 80854C50-80854C54 00014C 0004+00 0/3 0/0 0/0 .rodata @6372 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6372 = -200.0f; -COMPILER_STRIP_GATE(80854C50, &lit_6372); +COMPILER_STRIP_GATE(0x80854C50, &lit_6372); #pragma pop /* 80854C54-80854C58 000150 0004+00 0/1 0/0 0/0 .rodata @6373 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6373 = -500.0f; -COMPILER_STRIP_GATE(80854C54, &lit_6373); +COMPILER_STRIP_GATE(0x80854C54, &lit_6373); #pragma pop /* 8084F09C-8084FA58 005BDC 09BC+00 1/1 0/0 0/0 .text PerchDemoAwayForward__8daKago_cFv @@ -1951,42 +1958,42 @@ asm void daKago_c::executeEvent2() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6544 = -103292.0f; -COMPILER_STRIP_GATE(80854C58, &lit_6544); +COMPILER_STRIP_GATE(0x80854C58, &lit_6544); #pragma pop /* 80854C5C-80854C60 000158 0004+00 0/1 0/0 0/0 .rodata @6545 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6545 = -23437.0f; -COMPILER_STRIP_GATE(80854C5C, &lit_6545); +COMPILER_STRIP_GATE(0x80854C5C, &lit_6545); #pragma pop /* 80854C60-80854C64 00015C 0004+00 0/1 0/0 0/0 .rodata @6546 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6546 = 39925.0f; -COMPILER_STRIP_GATE(80854C60, &lit_6546); +COMPILER_STRIP_GATE(0x80854C60, &lit_6546); #pragma pop /* 80854C64-80854C68 000160 0004+00 0/1 0/0 0/0 .rodata @6547 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6547 = -60000.0f; -COMPILER_STRIP_GATE(80854C64, &lit_6547); +COMPILER_STRIP_GATE(0x80854C64, &lit_6547); #pragma pop /* 80854C68-80854C6C 000164 0004+00 0/1 0/0 0/0 .rodata @6548 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6548 = -11000.0f; -COMPILER_STRIP_GATE(80854C68, &lit_6548); +COMPILER_STRIP_GATE(0x80854C68, &lit_6548); #pragma pop /* 80854C6C-80854C70 000168 0004+00 0/1 0/0 0/0 .rodata @6549 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6549 = 28000.0f; -COMPILER_STRIP_GATE(80854C6C, &lit_6549); +COMPILER_STRIP_GATE(0x80854C6C, &lit_6549); #pragma pop /* 8084FB50-80850384 006690 0834+00 2/1 0/0 0/0 .text initFirstDemo__8daKago_cFv */ @@ -2002,104 +2009,104 @@ asm void daKago_c::initFirstDemo() { /* ############################################################################################## */ /* 80854C70-80854C74 00016C 0004+00 1/2 0/0 0/0 .rodata @6550 */ SECTION_RODATA static f32 const lit_6550 = 150.0f; -COMPILER_STRIP_GATE(80854C70, &lit_6550); +COMPILER_STRIP_GATE(0x80854C70, &lit_6550); /* 80854C74-80854C78 000170 0004+00 0/0 0/0 0/0 .rodata @6551 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6551 = -67000.0f; -COMPILER_STRIP_GATE(80854C74, &lit_6551); +COMPILER_STRIP_GATE(0x80854C74, &lit_6551); #pragma pop /* 80854C78-80854C7C 000174 0004+00 0/1 0/0 0/0 .rodata @6552 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6552 = -13000.0f; -COMPILER_STRIP_GATE(80854C78, &lit_6552); +COMPILER_STRIP_GATE(0x80854C78, &lit_6552); #pragma pop /* 80854C7C-80854C80 000178 0004+00 0/0 0/0 0/0 .rodata @6553 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6553 = -76600.0f; -COMPILER_STRIP_GATE(80854C7C, &lit_6553); +COMPILER_STRIP_GATE(0x80854C7C, &lit_6553); #pragma pop /* 80854C80-80854C84 00017C 0004+00 0/0 0/0 0/0 .rodata @6554 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6554 = -15500.0f; -COMPILER_STRIP_GATE(80854C80, &lit_6554); +COMPILER_STRIP_GATE(0x80854C80, &lit_6554); #pragma pop /* 80854C84-80854C88 000180 0004+00 0/0 0/0 0/0 .rodata @6555 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6555 = 37340.0f; -COMPILER_STRIP_GATE(80854C84, &lit_6555); +COMPILER_STRIP_GATE(0x80854C84, &lit_6555); #pragma pop /* 80854C88-80854C8C 000184 0004+00 0/0 0/0 0/0 .rodata @6556 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6556 = -75232.0f; -COMPILER_STRIP_GATE(80854C88, &lit_6556); +COMPILER_STRIP_GATE(0x80854C88, &lit_6556); #pragma pop /* 80854C8C-80854C90 000188 0004+00 0/0 0/0 0/0 .rodata @6557 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6557 = -14685.0f; -COMPILER_STRIP_GATE(80854C8C, &lit_6557); +COMPILER_STRIP_GATE(0x80854C8C, &lit_6557); #pragma pop /* 80854C90-80854C94 00018C 0004+00 0/0 0/0 0/0 .rodata @6558 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6558 = 34417.0f; -COMPILER_STRIP_GATE(80854C90, &lit_6558); +COMPILER_STRIP_GATE(0x80854C90, &lit_6558); #pragma pop /* 80854C94-80854C98 000190 0004+00 0/0 0/0 0/0 .rodata @6559 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6559 = 5000.0f; -COMPILER_STRIP_GATE(80854C94, &lit_6559); +COMPILER_STRIP_GATE(0x80854C94, &lit_6559); #pragma pop /* 80854C98-80854C9C 000194 0004+00 0/1 0/0 0/0 .rodata @6917 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6917 = 1250.0f; -COMPILER_STRIP_GATE(80854C98, &lit_6917); +COMPILER_STRIP_GATE(0x80854C98, &lit_6917); #pragma pop /* 80854C9C-80854CA0 000198 0004+00 0/1 0/0 0/0 .rodata @6918 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6918 = 67.0f / 10.0f; -COMPILER_STRIP_GATE(80854C9C, &lit_6918); +COMPILER_STRIP_GATE(0x80854C9C, &lit_6918); #pragma pop /* 80854CA0-80854CA4 00019C 0004+00 0/1 0/0 0/0 .rodata @6919 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6919 = -400.0f; -COMPILER_STRIP_GATE(80854CA0, &lit_6919); +COMPILER_STRIP_GATE(0x80854CA0, &lit_6919); #pragma pop /* 80854CA4-80854CA8 0001A0 0004+00 0/1 0/0 0/0 .rodata @6920 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6920 = 71.0f / 10.0f; -COMPILER_STRIP_GATE(80854CA4, &lit_6920); +COMPILER_STRIP_GATE(0x80854CA4, &lit_6920); #pragma pop /* 80854CA8-80854CAC 0001A4 0004+00 0/1 0/0 0/0 .rodata @6921 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6921 = 4.0f; -COMPILER_STRIP_GATE(80854CA8, &lit_6921); +COMPILER_STRIP_GATE(0x80854CA8, &lit_6921); #pragma pop /* 80850384-808513E4 006EC4 1060+00 2/1 0/0 0/0 .text executeFirstDemo__8daKago_cFv */ @@ -2127,56 +2134,56 @@ asm void daKago_c::executePerch2() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6922 = 350.0f; -COMPILER_STRIP_GATE(80854CAC, &lit_6922); +COMPILER_STRIP_GATE(0x80854CAC, &lit_6922); #pragma pop /* 80854CB0-80854CB4 0001AC 0004+00 0/0 0/0 0/0 .rodata @6923 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6923 = 6.0f; -COMPILER_STRIP_GATE(80854CB0, &lit_6923); +COMPILER_STRIP_GATE(0x80854CB0, &lit_6923); #pragma pop /* 80854CB4-80854CB8 0001B0 0004+00 0/1 0/0 0/0 .rodata @7121 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7121 = -700.0f; -COMPILER_STRIP_GATE(80854CB4, &lit_7121); +COMPILER_STRIP_GATE(0x80854CB4, &lit_7121); #pragma pop /* 80854CB8-80854CBC 0001B4 0004+00 0/1 0/0 0/0 .rodata @7122 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7122 = -74500.0f; -COMPILER_STRIP_GATE(80854CB8, &lit_7122); +COMPILER_STRIP_GATE(0x80854CB8, &lit_7122); #pragma pop /* 80854CBC-80854CC0 0001B8 0004+00 0/1 0/0 0/0 .rodata @7123 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7123 = -12775.0f; -COMPILER_STRIP_GATE(80854CBC, &lit_7123); +COMPILER_STRIP_GATE(0x80854CBC, &lit_7123); #pragma pop /* 80854CC0-80854CC4 0001BC 0004+00 0/1 0/0 0/0 .rodata @7124 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7124 = 31400.0f; -COMPILER_STRIP_GATE(80854CC0, &lit_7124); +COMPILER_STRIP_GATE(0x80854CC0, &lit_7124); #pragma pop /* 80854CC4-80854CC8 0001C0 0004+00 0/1 0/0 0/0 .rodata @7125 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7125 = -79460.0f; -COMPILER_STRIP_GATE(80854CC4, &lit_7125); +COMPILER_STRIP_GATE(0x80854CC4, &lit_7125); #pragma pop /* 80854CC8-80854CCC 0001C4 0004+00 0/1 0/0 0/0 .rodata @7126 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7126 = 34200.0f; -COMPILER_STRIP_GATE(80854CC8, &lit_7126); +COMPILER_STRIP_GATE(0x80854CC8, &lit_7126); #pragma pop /* 80851434-80851DEC 007F74 09B8+00 2/1 0/0 0/0 .text executeLandingLakeHairia__8daKago_cFv */ @@ -2194,98 +2201,98 @@ asm void daKago_c::executeLandingLakeHairia() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7127 = -76900.0f; -COMPILER_STRIP_GATE(80854CCC, &lit_7127); +COMPILER_STRIP_GATE(0x80854CCC, &lit_7127); #pragma pop /* 80854CD0-80854CD4 0001CC 0004+00 0/0 0/0 0/0 .rodata @7128 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7128 = -18550.0f; -COMPILER_STRIP_GATE(80854CD0, &lit_7128); +COMPILER_STRIP_GATE(0x80854CD0, &lit_7128); #pragma pop /* 80854CD4-80854CD8 0001D0 0004+00 0/0 0/0 0/0 .rodata @7129 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7129 = 41660.0f; -COMPILER_STRIP_GATE(80854CD4, &lit_7129); +COMPILER_STRIP_GATE(0x80854CD4, &lit_7129); #pragma pop /* 80854CD8-80854CDC 0001D4 0004+00 0/1 0/0 0/0 .rodata @7286 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7286 = 5750.0f; -COMPILER_STRIP_GATE(80854CD8, &lit_7286); +COMPILER_STRIP_GATE(0x80854CD8, &lit_7286); #pragma pop /* 80854CDC-80854CE0 0001D8 0004+00 0/1 0/0 0/0 .rodata @7287 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7287 = 1600.0f; -COMPILER_STRIP_GATE(80854CDC, &lit_7287); +COMPILER_STRIP_GATE(0x80854CDC, &lit_7287); #pragma pop /* 80854CE0-80854CE4 0001DC 0004+00 0/1 0/0 0/0 .rodata @7288 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7288 = 6100.0f; -COMPILER_STRIP_GATE(80854CE0, &lit_7288); +COMPILER_STRIP_GATE(0x80854CE0, &lit_7288); #pragma pop /* 80854CE4-80854CE8 0001E0 0004+00 0/1 0/0 0/0 .rodata @7289 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7289 = 2900.0f; -COMPILER_STRIP_GATE(80854CE4, &lit_7289); +COMPILER_STRIP_GATE(0x80854CE4, &lit_7289); #pragma pop /* 80854CE8-80854CEC 0001E4 0004+00 0/1 0/0 0/0 .rodata @7290 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7290 = 3630.0f; -COMPILER_STRIP_GATE(80854CE8, &lit_7290); +COMPILER_STRIP_GATE(0x80854CE8, &lit_7290); #pragma pop /* 80854CEC-80854CF0 0001E8 0004+00 0/1 0/0 0/0 .rodata @7291 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7291 = 600.0f; -COMPILER_STRIP_GATE(80854CEC, &lit_7291); +COMPILER_STRIP_GATE(0x80854CEC, &lit_7291); #pragma pop /* 80854CF0-80854CF4 0001EC 0004+00 0/1 0/0 0/0 .rodata @7292 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7292 = 15.0f; -COMPILER_STRIP_GATE(80854CF0, &lit_7292); +COMPILER_STRIP_GATE(0x80854CF0, &lit_7292); #pragma pop /* 80854CF4-80854CF8 0001F0 0004+00 0/1 0/0 0/0 .rodata @7293 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7293 = 3440.0f; -COMPILER_STRIP_GATE(80854CF4, &lit_7293); +COMPILER_STRIP_GATE(0x80854CF4, &lit_7293); #pragma pop /* 80854CF8-80854CFC 0001F4 0004+00 0/1 0/0 0/0 .rodata @7294 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7294 = 3584.0f; -COMPILER_STRIP_GATE(80854CF8, &lit_7294); +COMPILER_STRIP_GATE(0x80854CF8, &lit_7294); #pragma pop /* 80854CFC-80854D00 0001F8 0004+00 0/1 0/0 0/0 .rodata @7295 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7295 = 270.0f; -COMPILER_STRIP_GATE(80854CFC, &lit_7295); +COMPILER_STRIP_GATE(0x80854CFC, &lit_7295); #pragma pop /* 80854D00-80854D04 0001FC 0004+00 0/1 0/0 0/0 .rodata @7296 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7296 = 1007.0f; -COMPILER_STRIP_GATE(80854D00, &lit_7296); +COMPILER_STRIP_GATE(0x80854D00, &lit_7296); #pragma pop /* 80851DEC-808525B0 00892C 07C4+00 1/1 0/0 0/0 .text executeLandingBoartHouse__8daKago_cFv */ @@ -2414,21 +2421,21 @@ static asm void s_waterfall(void* param_0, void* param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7910 = 27.0f; -COMPILER_STRIP_GATE(80854D04, &lit_7910); +COMPILER_STRIP_GATE(0x80854D04, &lit_7910); #pragma pop /* 80854D08-80854D0C 000204 0004+00 0/1 0/0 0/0 .rodata @7911 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7911 = 29.0f; -COMPILER_STRIP_GATE(80854D08, &lit_7911); +COMPILER_STRIP_GATE(0x80854D08, &lit_7911); #pragma pop /* 80854D0C-80854D10 000208 0004+00 0/1 0/0 0/0 .rodata @7912 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7912 = 26.0f; -COMPILER_STRIP_GATE(80854D0C, &lit_7912); +COMPILER_STRIP_GATE(0x80854D0C, &lit_7912); #pragma pop /* 8085392C-80853BCC 00A46C 02A0+00 1/1 0/0 0/0 .text setFlySound__8daKago_cFv */ @@ -2446,7 +2453,7 @@ asm void daKago_c::setFlySound() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7981 = 1.5f; -COMPILER_STRIP_GATE(80854D10, &lit_7981); +COMPILER_STRIP_GATE(0x80854D10, &lit_7981); #pragma pop /* 80853BCC-80853EF0 00A70C 0324+00 2/1 0/0 0/0 .text action__8daKago_cFv */ @@ -2564,6 +2571,18 @@ static asm void useHeapInit(fopAc_ac_c* param_0) { } #pragma pop +/* ############################################################################################## */ +/* 80854D14-80854D14 000210 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80854D1C = "E_YC"; +SECTION_DEAD static char const* const stringBase_80854D21 = "KAGO_YAMI"; +SECTION_DEAD static char const* const stringBase_80854D2B = "E_KC"; +SECTION_DEAD static char const* const stringBase_80854D30 = "KAGO_HIKARI"; +SECTION_DEAD static char const* const stringBase_80854D3C = "F_SP115"; +SECTION_DEAD static char const* const stringBase_80854D44 = "F_SP126"; +#pragma pop + /* 808544D8-80854928 00B018 0450+00 1/1 0/0 0/0 .text create__8daKago_cFv */ #pragma push #pragma optimization_level 0 @@ -2641,7 +2660,7 @@ asm void __sinit_d_a_kago_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80854A94 = (void*)__sinit_d_a_kago_cpp; +REGISTER_CTORS(0x80854A94, __sinit_d_a_kago_cpp); #pragma pop /* 80854AD0-80854AD8 00B610 0008+00 1/0 0/0 0/0 .text @36@__dt__12dBgS_ObjAcchFv */ @@ -2674,15 +2693,4 @@ asm void daPy_py_c::getMidnaActor() { } #pragma pop -/* 80854D14-80854D4C 000210 0038+00 2/2 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80854D14 = "F_SP112"; -SECTION_DEAD static char const* const stringBase_80854D1C = "E_YC"; -SECTION_DEAD static char const* const stringBase_80854D21 = "KAGO_YAMI"; -SECTION_DEAD static char const* const stringBase_80854D2B = "E_KC"; -SECTION_DEAD static char const* const stringBase_80854D30 = "KAGO_HIKARI"; -SECTION_DEAD static char const* const stringBase_80854D3C = "F_SP115"; -SECTION_DEAD static char const* const stringBase_80854D44 = "F_SP126"; -#pragma pop +/* 80854D14-80854D14 000210 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/d_a_mant/d_a_mant.cpp b/rel/d/a/d_a_mant/d_a_mant.cpp index 07b736a7936..bb367d86c71 100644 --- a/rel/d/a/d_a_mant/d_a_mant.cpp +++ b/rel/d/a/d_a_mant/d_a_mant.cpp @@ -203,13 +203,13 @@ extern "C" u8 sOldVcdVatCmd__8J3DShape[4]; /* ############################################################################################## */ /* 80862C4C-80862C50 000000 0004+00 5/5 0/0 0/0 .rodata @3815 */ SECTION_RODATA static u32 const lit_3815 = 0x01000000; -COMPILER_STRIP_GATE(80862C4C, &lit_3815); +COMPILER_STRIP_GATE(0x80862C4C, &lit_3815); /* 80862C50-80862C54 000004 0004+00 0/1 0/0 0/0 .rodata @3818 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_3818 = 0x01000000; -COMPILER_STRIP_GATE(80862C50, &lit_3818); +COMPILER_STRIP_GATE(0x80862C50, &lit_3818); #pragma pop /* 80862C54-80862C58 000008 0004+00 0/1 0/0 0/0 .rodata @3821 */ @@ -221,7 +221,7 @@ SECTION_RODATA static u8 const lit_3821[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80862C54, &lit_3821); +COMPILER_STRIP_GATE(0x80862C54, &lit_3821); #pragma pop /* 80862C58-80862C5C 00000C 0004+00 0/1 0/0 0/0 .rodata @3824 */ @@ -233,7 +233,7 @@ SECTION_RODATA static u8 const lit_3824[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80862C58, &lit_3824); +COMPILER_STRIP_GATE(0x80862C58, &lit_3824); #pragma pop /* 80862C5C-80862C60 000010 0004+00 1/5 0/0 0/0 .rodata @3849 */ @@ -243,7 +243,7 @@ SECTION_RODATA static u8 const lit_3849[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80862C5C, &lit_3849); +COMPILER_STRIP_GATE(0x80862C5C, &lit_3849); /* 80862D20-80862D2C 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { @@ -2347,105 +2347,105 @@ static asm void daMant_Draw(mant_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4113 = 0.5f; -COMPILER_STRIP_GATE(80862C60, &lit_4113); +COMPILER_STRIP_GATE(0x80862C60, &lit_4113); #pragma pop /* 80862C64-80862C68 000018 0004+00 0/1 0/0 0/0 .rodata @4114 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4114 = -60.0f; -COMPILER_STRIP_GATE(80862C64, &lit_4114); +COMPILER_STRIP_GATE(0x80862C64, &lit_4114); #pragma pop /* 80862C68-80862C6C 00001C 0004+00 0/1 0/0 0/0 .rodata @4115 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4115 = 50.0f; -COMPILER_STRIP_GATE(80862C68, &lit_4115); +COMPILER_STRIP_GATE(0x80862C68, &lit_4115); #pragma pop /* 80862C6C-80862C70 000020 0004+00 0/1 0/0 0/0 .rodata @4116 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4116 = 3.0f; -COMPILER_STRIP_GATE(80862C6C, &lit_4116); +COMPILER_STRIP_GATE(0x80862C6C, &lit_4116); #pragma pop /* 80862C70-80862C74 000024 0004+00 0/4 0/0 0/0 .rodata @4117 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4117 = 1.0f; -COMPILER_STRIP_GATE(80862C70, &lit_4117); +COMPILER_STRIP_GATE(0x80862C70, &lit_4117); #pragma pop /* 80862C74-80862C78 000028 0004+00 0/2 0/0 0/0 .rodata @4118 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4118 = 1.0f / 20.0f; -COMPILER_STRIP_GATE(80862C74, &lit_4118); +COMPILER_STRIP_GATE(0x80862C74, &lit_4118); #pragma pop /* 80862C78-80862C7C 00002C 0004+00 0/1 0/0 0/0 .rodata @4119 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4119 = -15.0f; -COMPILER_STRIP_GATE(80862C78, &lit_4119); +COMPILER_STRIP_GATE(0x80862C78, &lit_4119); #pragma pop /* 80862C7C-80862C80 000030 0004+00 0/2 0/0 0/0 .rodata @4120 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4120 = 7.0f / 100.0f; -COMPILER_STRIP_GATE(80862C7C, &lit_4120); +COMPILER_STRIP_GATE(0x80862C7C, &lit_4120); #pragma pop /* 80862C80-80862C84 000034 0004+00 0/1 0/0 0/0 .rodata @4121 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4121 = 1.0f / 100.0f; -COMPILER_STRIP_GATE(80862C80, &lit_4121); +COMPILER_STRIP_GATE(0x80862C80, &lit_4121); #pragma pop /* 80862C84-80862C88 000038 0004+00 0/3 0/0 0/0 .rodata @4122 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4122 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(80862C84, &lit_4122); +COMPILER_STRIP_GATE(0x80862C84, &lit_4122); #pragma pop /* 80862C88-80862C8C 00003C 0004+00 0/1 0/0 0/0 .rodata @4123 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4123 = 2.0f; -COMPILER_STRIP_GATE(80862C88, &lit_4123); +COMPILER_STRIP_GATE(0x80862C88, &lit_4123); #pragma pop /* 80862C8C-80862C90 000040 0004+00 0/2 0/0 0/0 .rodata @4124 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4124 = 5.0f; -COMPILER_STRIP_GATE(80862C8C, &lit_4124); +COMPILER_STRIP_GATE(0x80862C8C, &lit_4124); #pragma pop /* 80862C90-80862C94 000044 0004+00 0/1 0/0 0/0 .rodata @4125 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4125 = 6.0f; -COMPILER_STRIP_GATE(80862C90, &lit_4125); +COMPILER_STRIP_GATE(0x80862C90, &lit_4125); #pragma pop /* 80862C94-80862C98 000048 0004+00 0/1 0/0 0/0 .rodata @4126 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4126 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(80862C94, &lit_4126); +COMPILER_STRIP_GATE(0x80862C94, &lit_4126); #pragma pop /* 80862C98-80862C9C 00004C 0004+00 0/1 0/0 0/0 .rodata @4127 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4127 = 85.0f; -COMPILER_STRIP_GATE(80862C98, &lit_4127); +COMPILER_STRIP_GATE(0x80862C98, &lit_4127); #pragma pop /* 80862C9C-80862CA4 000050 0004+04 0/1 0/0 0/0 .rodata @4128 */ @@ -2456,7 +2456,7 @@ SECTION_RODATA static f32 const lit_4128[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80862C9C, &lit_4128); +COMPILER_STRIP_GATE(0x80862C9C, &lit_4128); #pragma pop /* 80862CA4-80862CAC 000058 0008+00 0/2 0/0 0/0 .rodata @4130 */ @@ -2465,7 +2465,7 @@ COMPILER_STRIP_GATE(80862C9C, &lit_4128); SECTION_RODATA static u8 const lit_4130[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80862CA4, &lit_4130); +COMPILER_STRIP_GATE(0x80862CA4, &lit_4130); #pragma pop /* 8086AD40-8086ADA0 008020 0060+00 1/0 0/0 0/0 .data l_Egnd_mantPAL */ @@ -2831,14 +2831,14 @@ asm cXyz::~cXyz() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4238 = 12.0f; -COMPILER_STRIP_GATE(80862CAC, &lit_4238); +COMPILER_STRIP_GATE(0x80862CAC, &lit_4238); #pragma pop /* 80862CB0-80862CB4 000064 0004+00 0/1 0/0 0/0 .rodata @4239 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4239 = 9.0f / 10.0f; -COMPILER_STRIP_GATE(80862CB0, &lit_4239); +COMPILER_STRIP_GATE(0x80862CB0, &lit_4239); #pragma pop /* 80862CB4-80862CBC 000068 0008+00 0/1 0/0 0/0 .rodata @4240 */ @@ -2847,7 +2847,7 @@ COMPILER_STRIP_GATE(80862CB0, &lit_4239); SECTION_RODATA static u8 const lit_4240[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80862CB4, &lit_4240); +COMPILER_STRIP_GATE(0x80862CB4, &lit_4240); #pragma pop /* 80862CBC-80862CC4 000070 0008+00 0/1 0/0 0/0 .rodata @4241 */ @@ -2856,7 +2856,7 @@ COMPILER_STRIP_GATE(80862CB4, &lit_4240); SECTION_RODATA static u8 const lit_4241[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80862CBC, &lit_4241); +COMPILER_STRIP_GATE(0x80862CBC, &lit_4241); #pragma pop /* 80862CC4-80862CCC 000078 0008+00 0/1 0/0 0/0 .rodata @4242 */ @@ -2865,49 +2865,49 @@ COMPILER_STRIP_GATE(80862CBC, &lit_4241); SECTION_RODATA static u8 const lit_4242[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80862CC4, &lit_4242); +COMPILER_STRIP_GATE(0x80862CC4, &lit_4242); #pragma pop /* 80862CCC-80862CD0 000080 0004+00 0/1 0/0 0/0 .rodata @4243 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4243 = 10.0f; -COMPILER_STRIP_GATE(80862CCC, &lit_4243); +COMPILER_STRIP_GATE(0x80862CCC, &lit_4243); #pragma pop /* 80862CD0-80862CD4 000084 0004+00 0/1 0/0 0/0 .rodata @4244 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4244 = 4.0f; -COMPILER_STRIP_GATE(80862CD0, &lit_4244); +COMPILER_STRIP_GATE(0x80862CD0, &lit_4244); #pragma pop /* 80862CD4-80862CD8 000088 0004+00 0/1 0/0 0/0 .rodata @4245 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4245 = 3.0f / 5.0f; -COMPILER_STRIP_GATE(80862CD4, &lit_4245); +COMPILER_STRIP_GATE(0x80862CD4, &lit_4245); #pragma pop /* 80862CD8-80862CDC 00008C 0004+00 0/1 0/0 0/0 .rodata @4246 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4246 = 0x3E860A92; -COMPILER_STRIP_GATE(80862CD8, &lit_4246); +COMPILER_STRIP_GATE(0x80862CD8, &lit_4246); #pragma pop /* 80862CDC-80862CE0 000090 0004+00 0/3 0/0 0/0 .rodata @4247 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4247 = -10.0f; -COMPILER_STRIP_GATE(80862CDC, &lit_4247); +COMPILER_STRIP_GATE(0x80862CDC, &lit_4247); #pragma pop /* 80862CE0-80862CE4 000094 0004+00 0/2 0/0 0/0 .rodata @4248 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4248 = -20.0f; -COMPILER_STRIP_GATE(80862CE0, &lit_4248); +COMPILER_STRIP_GATE(0x80862CE0, &lit_4248); #pragma pop /* 80861F9C-80862424 000D7C 0488+00 1/1 0/0 0/0 .text mant_v_calc__FP10mant_class */ @@ -2935,77 +2935,77 @@ static asm void mant_move(mant_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4472 = 21.0f; -COMPILER_STRIP_GATE(80862CE4, &lit_4472); +COMPILER_STRIP_GATE(0x80862CE4, &lit_4472); #pragma pop /* 80862CE8-80862CEC 00009C 0004+00 0/1 0/0 0/0 .rodata @4473 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4473 = 0.75f; -COMPILER_STRIP_GATE(80862CE8, &lit_4473); +COMPILER_STRIP_GATE(0x80862CE8, &lit_4473); #pragma pop /* 80862CEC-80862CF0 0000A0 0004+00 0/1 0/0 0/0 .rodata @4474 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4474 = -5.0f; -COMPILER_STRIP_GATE(80862CEC, &lit_4474); +COMPILER_STRIP_GATE(0x80862CEC, &lit_4474); #pragma pop /* 80862CF0-80862CF4 0000A4 0004+00 0/1 0/0 0/0 .rodata @4475 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4475 = -3.0f; -COMPILER_STRIP_GATE(80862CF0, &lit_4475); +COMPILER_STRIP_GATE(0x80862CF0, &lit_4475); #pragma pop /* 80862CF4-80862CF8 0000A8 0004+00 0/1 0/0 0/0 .rodata @4476 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4476 = 25.0f; -COMPILER_STRIP_GATE(80862CF4, &lit_4476); +COMPILER_STRIP_GATE(0x80862CF4, &lit_4476); #pragma pop /* 80862CF8-80862CFC 0000AC 0004+00 0/1 0/0 0/0 .rodata @4477 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4477 = 11.0f / 20.0f; -COMPILER_STRIP_GATE(80862CF8, &lit_4477); +COMPILER_STRIP_GATE(0x80862CF8, &lit_4477); #pragma pop /* 80862CFC-80862D00 0000B0 0004+00 0/1 0/0 0/0 .rodata @4478 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4478 = -13.0f; -COMPILER_STRIP_GATE(80862CFC, &lit_4478); +COMPILER_STRIP_GATE(0x80862CFC, &lit_4478); #pragma pop /* 80862D00-80862D04 0000B4 0004+00 0/1 0/0 0/0 .rodata @4479 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4479 = 3.0f / 10.0f; -COMPILER_STRIP_GATE(80862D00, &lit_4479); +COMPILER_STRIP_GATE(0x80862D00, &lit_4479); #pragma pop /* 80862D04-80862D08 0000B8 0004+00 0/1 0/0 0/0 .rodata @4480 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4480 = 65536.0f; -COMPILER_STRIP_GATE(80862D04, &lit_4480); +COMPILER_STRIP_GATE(0x80862D04, &lit_4480); #pragma pop /* 80862D08-80862D0C 0000BC 0004+00 0/1 0/0 0/0 .rodata @4481 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4481 = 32.0f; -COMPILER_STRIP_GATE(80862D08, &lit_4481); +COMPILER_STRIP_GATE(0x80862D08, &lit_4481); #pragma pop /* 80862D0C-80862D10 0000C0 0004+00 0/1 0/0 0/0 .rodata @4482 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4482 = 64.0f; -COMPILER_STRIP_GATE(80862D0C, &lit_4482); +COMPILER_STRIP_GATE(0x80862D0C, &lit_4482); #pragma pop /* 8086BF74-8086BF78 000004 0004+00 1/1 0/0 0/0 .bss mant_cut_type */ @@ -3036,28 +3036,28 @@ static bool daMant_Delete(mant_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4536 = -2000.0f; -COMPILER_STRIP_GATE(80862D10, &lit_4536); +COMPILER_STRIP_GATE(0x80862D10, &lit_4536); #pragma pop /* 80862D14-80862D18 0000C8 0004+00 0/1 0/0 0/0 .rodata @4537 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4537 = 2000.0f; -COMPILER_STRIP_GATE(80862D14, &lit_4537); +COMPILER_STRIP_GATE(0x80862D14, &lit_4537); #pragma pop /* 80862D18-80862D1C 0000CC 0004+00 0/1 0/0 0/0 .rodata @4538 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4538 = 30.0f; -COMPILER_STRIP_GATE(80862D18, &lit_4538); +COMPILER_STRIP_GATE(0x80862D18, &lit_4538); #pragma pop /* 80862D1C-80862D20 0000D0 0004+00 0/1 0/0 0/0 .rodata @4539 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4539 = 7.0f / 10.0f; -COMPILER_STRIP_GATE(80862D1C, &lit_4539); +COMPILER_STRIP_GATE(0x80862D1C, &lit_4539); #pragma pop /* 8086BF08-8086BF28 -00001 0020+00 1/0 0/0 0/0 .data l_daMant_Method */ diff --git a/rel/d/a/d_a_mg_fish/d_a_mg_fish.cpp b/rel/d/a/d_a_mg_fish/d_a_mg_fish.cpp index 3efb0280543..9453aae0856 100644 --- a/rel/d/a/d_a_mg_fish/d_a_mg_fish.cpp +++ b/rel/d/a/d_a_mg_fish/d_a_mg_fish.cpp @@ -53,10 +53,10 @@ struct mDoExt_McaMorfCallBack1_c {}; struct Vec {}; -struct J3DModelData {}; - struct J3DAnmTransform {}; +struct J3DModelData {}; + struct mDoExt_McaMorf { /* 8000FC4C */ mDoExt_McaMorf(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, int, @@ -553,27 +553,27 @@ extern "C" void __register_global_object(); /* ############################################################################################## */ /* 80536168-8053616C 000000 0004+00 36/36 0/0 0/0 .rodata @3679 */ SECTION_RODATA static f32 const lit_3679 = 1.0f; -COMPILER_STRIP_GATE(80536168, &lit_3679); +COMPILER_STRIP_GATE(0x80536168, &lit_3679); /* 8053616C-80536170 000004 0004+00 0/5 0/0 0/0 .rodata @3680 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3680 = 5.0f; -COMPILER_STRIP_GATE(8053616C, &lit_3680); +COMPILER_STRIP_GATE(0x8053616C, &lit_3680); #pragma pop /* 80536170-80536174 000008 0004+00 0/8 0/0 0/0 .rodata @3681 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3681 = 300.0f; -COMPILER_STRIP_GATE(80536170, &lit_3681); +COMPILER_STRIP_GATE(0x80536170, &lit_3681); #pragma pop /* 80536174-80536178 00000C 0004+00 0/4 0/0 0/0 .rodata @3682 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3682 = 400.0f; -COMPILER_STRIP_GATE(80536174, &lit_3682); +COMPILER_STRIP_GATE(0x80536174, &lit_3682); #pragma pop /* 805364A4-805364B0 000000 000C+00 2/2 0/0 0/0 .data cNullVec__6Z2Calc */ @@ -999,14 +999,14 @@ asm daMg_Fish_HIO_c::daMg_Fish_HIO_c() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3713 = 1.0f / 50.0f; -COMPILER_STRIP_GATE(80536178, &lit_3713); +COMPILER_STRIP_GATE(0x80536178, &lit_3713); #pragma pop /* 8053617C-80536180 000014 0004+00 0/19 0/0 0/0 .rodata @3714 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3714 = 100.0f; -COMPILER_STRIP_GATE(8053617C, &lit_3714); +COMPILER_STRIP_GATE(0x8053617C, &lit_3714); #pragma pop /* 80536180-80536184 000018 0004+00 5/31 0/0 0/0 .rodata @3715 */ @@ -1016,7 +1016,7 @@ SECTION_RODATA static u8 const lit_3715[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80536180, &lit_3715); +COMPILER_STRIP_GATE(0x80536180, &lit_3715); /* 80529D7C-80529E4C 00013C 00D0+00 3/3 0/0 0/0 .text hit_vib_set__FP13mg_fish_class */ #pragma push @@ -1041,11 +1041,11 @@ asm cXyz::~cXyz() { /* ############################################################################################## */ /* 80536184-80536188 00001C 0004+00 1/5 0/0 0/0 .rodata @3723 */ SECTION_RODATA static f32 const lit_3723 = 2.0f / 5.0f; -COMPILER_STRIP_GATE(80536184, &lit_3723); +COMPILER_STRIP_GATE(0x80536184, &lit_3723); /* 80536188-8053618C 000020 0004+00 1/10 0/0 0/0 .rodata @3724 */ SECTION_RODATA static f32 const lit_3724 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(80536188, &lit_3724); +COMPILER_STRIP_GATE(0x80536188, &lit_3724); /* 80529E88-80529F10 000248 0088+00 6/6 0/0 0/0 .text sibuki_set__FP13mg_fish_classf4cXyz */ @@ -1073,7 +1073,7 @@ static asm void s_hitfish_sub(void* param_0, void* param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3759 = 30.0f; -COMPILER_STRIP_GATE(8053618C, &lit_3759); +COMPILER_STRIP_GATE(0x8053618C, &lit_3759); #pragma pop /* 80536190-80536198 000028 0004+04 0/10 0/0 0/0 .rodata @3812 */ @@ -1084,7 +1084,7 @@ SECTION_RODATA static f32 const lit_3812[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80536190, &lit_3812); +COMPILER_STRIP_GATE(0x80536190, &lit_3812); #pragma pop /* 80536198-805361A0 000030 0008+00 0/15 0/0 0/0 .rodata @3813 */ @@ -1093,7 +1093,7 @@ COMPILER_STRIP_GATE(80536190, &lit_3812); SECTION_RODATA static u8 const lit_3813[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80536198, &lit_3813); +COMPILER_STRIP_GATE(0x80536198, &lit_3813); #pragma pop /* 805361A0-805361A8 000038 0008+00 0/15 0/0 0/0 .rodata @3814 */ @@ -1102,7 +1102,7 @@ COMPILER_STRIP_GATE(80536198, &lit_3813); SECTION_RODATA static u8 const lit_3814[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(805361A0, &lit_3814); +COMPILER_STRIP_GATE(0x805361A0, &lit_3814); #pragma pop /* 805361A8-805361B0 000040 0008+00 0/15 0/0 0/0 .rodata @3815 */ @@ -1111,7 +1111,7 @@ COMPILER_STRIP_GATE(805361A0, &lit_3814); SECTION_RODATA static u8 const lit_3815[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(805361A8, &lit_3815); +COMPILER_STRIP_GATE(0x805361A8, &lit_3815); #pragma pop /* 80529F68-8052A114 000328 01AC+00 2/2 0/0 0/0 .text pl_check__FP13mg_fish_classf */ @@ -1127,7 +1127,7 @@ static asm void pl_check(mg_fish_class* param_0, f32 param_1) { /* ############################################################################################## */ /* 805361B0-805361B4 000048 0004+00 1/5 0/0 0/0 .rodata @3823 */ SECTION_RODATA static f32 const lit_3823 = -1.0f; -COMPILER_STRIP_GATE(805361B0, &lit_3823); +COMPILER_STRIP_GATE(0x805361B0, &lit_3823); /* 8052A114-8052A1C0 0004D4 00AC+00 2/2 0/0 0/0 .text anm_init__FP13mg_fish_classifUcf */ #pragma push @@ -1143,7 +1143,7 @@ static asm void anm_init(mg_fish_class* param_0, int param_1, f32 param_2, u8 pa /* ############################################################################################## */ /* 805361B4-805361B8 00004C 0004+00 2/8 0/0 0/0 .rodata @3833 */ SECTION_RODATA static f32 const lit_3833 = 2.0f; -COMPILER_STRIP_GATE(805361B4, &lit_3833); +COMPILER_STRIP_GATE(0x805361B4, &lit_3833); /* 8052A1C0-8052A21C 000580 005C+00 3/3 0/0 0/0 .text mouth_open__FP13mg_fish_class */ #pragma push @@ -1178,7 +1178,7 @@ static asm void s_lure_sub(void* param_0, void* param_1) { /* ############################################################################################## */ /* 805361B8-805361BC 000050 0004+00 1/9 0/0 0/0 .rodata @3869 */ SECTION_RODATA static f32 const lit_3869 = 20.0f; -COMPILER_STRIP_GATE(805361B8, &lit_3869); +COMPILER_STRIP_GATE(0x805361B8, &lit_3869); /* 8052A2F4-8052A380 0006B4 008C+00 1/1 0/0 0/0 .text s_esa_sub__FPvPv */ #pragma push @@ -1317,35 +1317,35 @@ static asm void s_other_search_sub(void* param_0, void* param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3987 = 1000.0f; -COMPILER_STRIP_GATE(805361BC, &lit_3987); +COMPILER_STRIP_GATE(0x805361BC, &lit_3987); #pragma pop /* 805361C0-805361C4 000058 0004+00 0/12 0/0 0/0 .rodata @3988 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3988 = 1.5f; -COMPILER_STRIP_GATE(805361C0, &lit_3988); +COMPILER_STRIP_GATE(0x805361C0, &lit_3988); #pragma pop /* 805361C4-805361C8 00005C 0004+00 0/12 0/0 0/0 .rodata @3989 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3989 = 0.5f; -COMPILER_STRIP_GATE(805361C4, &lit_3989); +COMPILER_STRIP_GATE(0x805361C4, &lit_3989); #pragma pop /* 805361C8-805361CC 000060 0004+00 0/1 0/0 0/0 .rodata @3990 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3990 = -80.0f; -COMPILER_STRIP_GATE(805361C8, &lit_3990); +COMPILER_STRIP_GATE(0x805361C8, &lit_3990); #pragma pop /* 805361CC-805361D0 000064 0004+00 0/3 0/0 0/0 .rodata @3991 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3991 = 60.0f; -COMPILER_STRIP_GATE(805361CC, &lit_3991); +COMPILER_STRIP_GATE(0x805361CC, &lit_3991); #pragma pop /* 8052A464-8052A7BC 000824 0358+00 1/1 0/0 0/0 .text search_lure__FP13mg_fish_classi */ @@ -1523,21 +1523,21 @@ static asm void s_sg_sub(void* param_0, void* param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4523 = 10000.0f; -COMPILER_STRIP_GATE(805361D0, &lit_4523); +COMPILER_STRIP_GATE(0x805361D0, &lit_4523); #pragma pop /* 805361D4-805361D8 00006C 0004+00 0/13 0/0 0/0 .rodata @4524 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4524 = 50.0f; -COMPILER_STRIP_GATE(805361D4, &lit_4524); +COMPILER_STRIP_GATE(0x805361D4, &lit_4524); #pragma pop /* 805361D8-805361DC 000070 0004+00 0/2 0/0 0/0 .rodata @4525 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4525 = 600.0f; -COMPILER_STRIP_GATE(805361D8, &lit_4525); +COMPILER_STRIP_GATE(0x805361D8, &lit_4525); #pragma pop /* 8052B4B4-8052B928 001874 0474+00 1/1 0/0 0/0 .text daMg_Fish_Draw__FP13mg_fish_class @@ -1554,11 +1554,11 @@ static asm void daMg_Fish_Draw(mg_fish_class* param_0) { /* ############################################################################################## */ /* 805361DC-805361E0 000074 0004+00 2/7 0/0 0/0 .rodata @4538 */ SECTION_RODATA static f32 const lit_4538 = 1500.0f; -COMPILER_STRIP_GATE(805361DC, &lit_4538); +COMPILER_STRIP_GATE(0x805361DC, &lit_4538); /* 805361E0-805361E4 000078 0004+00 1/1 0/0 0/0 .rodata @4539 */ SECTION_RODATA static f32 const lit_4539 = -100000.0f; -COMPILER_STRIP_GATE(805361E0, &lit_4539); +COMPILER_STRIP_GATE(0x805361E0, &lit_4539); /* 8052B928-8052B9CC 001CE8 00A4+00 1/1 0/0 0/0 .text get_surface_y__FP13mg_fish_classP4cXyz */ #pragma push @@ -1595,14 +1595,14 @@ asm dBgS_ObjGndChk::~dBgS_ObjGndChk() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4647 = 2000.0f; -COMPILER_STRIP_GATE(805361E4, &lit_4647); +COMPILER_STRIP_GATE(0x805361E4, &lit_4647); #pragma pop /* 805361E8-805361EC 000080 0004+00 0/14 0/0 0/0 .rodata @4648 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4648 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(805361E8, &lit_4648); +COMPILER_STRIP_GATE(0x805361E8, &lit_4648); #pragma pop /* 8052BB30-8052BF68 001EF0 0438+00 1/1 0/0 0/0 .text mf_swim__FP13mg_fish_class */ @@ -1630,14 +1630,14 @@ static asm void pos_bg_check(cXyz* param_0, cXyz* param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4738 = 500.0f; -COMPILER_STRIP_GATE(805361EC, &lit_4738); +COMPILER_STRIP_GATE(0x805361EC, &lit_4738); #pragma pop /* 805361F0-805361F4 000088 0004+00 0/3 0/0 0/0 .rodata @4739 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4739 = 7000.0f; -COMPILER_STRIP_GATE(805361F0, &lit_4739); +COMPILER_STRIP_GATE(0x805361F0, &lit_4739); #pragma pop /* 8052BFF8-8052C230 0023B8 0238+00 1/1 0/0 0/0 .text path_search__FP13mg_fish_class */ @@ -1655,14 +1655,14 @@ static asm void path_search(mg_fish_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4806 = 200.0f; -COMPILER_STRIP_GATE(805361F4, &lit_4806); +COMPILER_STRIP_GATE(0x805361F4, &lit_4806); #pragma pop /* 805361F8-805361FC 000090 0004+00 0/5 0/0 0/0 .rodata @4807 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4807 = 40.0f; -COMPILER_STRIP_GATE(805361F8, &lit_4807); +COMPILER_STRIP_GATE(0x805361F8, &lit_4807); #pragma pop /* 8052C230-8052C574 0025F0 0344+00 1/1 0/0 0/0 .text mf_swim_p__FP13mg_fish_class */ @@ -1690,7 +1690,7 @@ static asm void mf_swim_s(mg_fish_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4976 = 1.0f / 100.0f; -COMPILER_STRIP_GATE(805361FC, &lit_4976); +COMPILER_STRIP_GATE(0x805361FC, &lit_4976); #pragma pop /* 8052CAA0-8052CD68 002E60 02C8+00 1/1 0/0 0/0 .text mf_stay__FP13mg_fish_class */ @@ -1708,19 +1708,19 @@ static asm void mf_stay(mg_fish_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5103 = 14000.0f; -COMPILER_STRIP_GATE(80536200, &lit_5103); +COMPILER_STRIP_GATE(0x80536200, &lit_5103); #pragma pop /* 80536204-80536208 00009C 0004+00 0/6 0/0 0/0 .rodata @5104 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5104 = 150.0f; -COMPILER_STRIP_GATE(80536204, &lit_5104); +COMPILER_STRIP_GATE(0x80536204, &lit_5104); #pragma pop /* 80536208-8053620C 0000A0 0004+00 1/6 0/0 0/0 .rodata @5105 */ SECTION_RODATA static f32 const lit_5105 = 3.0f / 10.0f; -COMPILER_STRIP_GATE(80536208, &lit_5105); +COMPILER_STRIP_GATE(0x80536208, &lit_5105); /* 8052CD68-8052D3BC 003128 0654+00 1/1 0/0 0/0 .text mf_away__FP13mg_fish_class */ #pragma push @@ -1737,63 +1737,63 @@ static asm void mf_away(mg_fish_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5280 = 8000.0f; -COMPILER_STRIP_GATE(8053620C, &lit_5280); +COMPILER_STRIP_GATE(0x8053620C, &lit_5280); #pragma pop /* 80536210-80536214 0000A8 0004+00 0/4 0/0 0/0 .rodata @5281 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5281 = 0.25f; -COMPILER_STRIP_GATE(80536210, &lit_5281); +COMPILER_STRIP_GATE(0x80536210, &lit_5281); #pragma pop /* 80536214-80536218 0000AC 0004+00 0/4 0/0 0/0 .rodata @5282 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5282 = 65536.0f; -COMPILER_STRIP_GATE(80536214, &lit_5282); +COMPILER_STRIP_GATE(0x80536214, &lit_5282); #pragma pop /* 80536218-8053621C 0000B0 0004+00 0/3 0/0 0/0 .rodata @5283 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5283 = -30.0f; -COMPILER_STRIP_GATE(80536218, &lit_5283); +COMPILER_STRIP_GATE(0x80536218, &lit_5283); #pragma pop /* 8053621C-80536220 0000B4 0004+00 0/9 0/0 0/0 .rodata @5284 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5284 = 1.0f / 20.0f; -COMPILER_STRIP_GATE(8053621C, &lit_5284); +COMPILER_STRIP_GATE(0x8053621C, &lit_5284); #pragma pop /* 80536220-80536224 0000B8 0004+00 0/2 0/0 0/0 .rodata @5285 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5285 = -10.0f; -COMPILER_STRIP_GATE(80536220, &lit_5285); +COMPILER_STRIP_GATE(0x80536220, &lit_5285); #pragma pop /* 80536224-80536228 0000BC 0004+00 0/4 0/0 0/0 .rodata @5286 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5286 = -1.0f / 10.0f; -COMPILER_STRIP_GATE(80536224, &lit_5286); +COMPILER_STRIP_GATE(0x80536224, &lit_5286); #pragma pop /* 80536228-8053622C 0000C0 0004+00 0/2 0/0 0/0 .rodata @5287 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_5287 = 0x3B03126F; -COMPILER_STRIP_GATE(80536228, &lit_5287); +COMPILER_STRIP_GATE(0x80536228, &lit_5287); #pragma pop /* 8053622C-80536230 0000C4 0004+00 0/3 0/0 0/0 .rodata @5288 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5288 = 1300.0f; -COMPILER_STRIP_GATE(8053622C, &lit_5288); +COMPILER_STRIP_GATE(0x8053622C, &lit_5288); #pragma pop /* 8052D3BC-8052DAE4 00377C 0728+00 1/1 0/0 0/0 .text ri_swim__FP13mg_fish_class */ @@ -1834,35 +1834,35 @@ SECTION_RODATA static void* const lit_5316[11] = { (void*)&joint_offset_LM, (void*)&joint_offset_RI, (void*)&joint_offset_NP, (void*)&joint_offset_CF, (void*)&joint_offset_KS, }; -COMPILER_STRIP_GATE(80536230, &lit_5316); +COMPILER_STRIP_GATE(0x80536230, &lit_5316); #pragma pop /* 8053625C-80536260 0000F4 0004+00 0/4 0/0 0/0 .rodata @5379 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5379 = 7.0f; -COMPILER_STRIP_GATE(8053625C, &lit_5379); +COMPILER_STRIP_GATE(0x8053625C, &lit_5379); #pragma pop /* 80536260-80536264 0000F8 0004+00 0/6 0/0 0/0 .rodata @5380 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5380 = 3.0f; -COMPILER_STRIP_GATE(80536260, &lit_5380); +COMPILER_STRIP_GATE(0x80536260, &lit_5380); #pragma pop /* 80536264-80536268 0000FC 0004+00 0/1 0/0 0/0 .rodata @5381 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5381 = 2.75f; -COMPILER_STRIP_GATE(80536264, &lit_5381); +COMPILER_STRIP_GATE(0x80536264, &lit_5381); #pragma pop /* 80536268-8053626C 000100 0004+00 0/3 0/0 0/0 .rodata @5382 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5382 = 13.0f / 10.0f; -COMPILER_STRIP_GATE(80536268, &lit_5382); +COMPILER_STRIP_GATE(0x80536268, &lit_5382); #pragma pop /* 8052DAE4-8052DEB8 003EA4 03D4+00 1/1 0/0 0/0 .text dmcalc__FP13mg_fish_class */ @@ -1880,63 +1880,63 @@ static asm void dmcalc(mg_fish_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5632 = 1.0f / 40.0f; -COMPILER_STRIP_GATE(8053626C, &lit_5632); +COMPILER_STRIP_GATE(0x8053626C, &lit_5632); #pragma pop /* 80536270-80536274 000108 0004+00 0/4 0/0 0/0 .rodata @5633 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5633 = 3.0f / 20.0f; -COMPILER_STRIP_GATE(80536270, &lit_5633); +COMPILER_STRIP_GATE(0x80536270, &lit_5633); #pragma pop /* 80536274-80536278 00010C 0004+00 0/7 0/0 0/0 .rodata @5634 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5634 = 15.0f; -COMPILER_STRIP_GATE(80536274, &lit_5634); +COMPILER_STRIP_GATE(0x80536274, &lit_5634); #pragma pop /* 80536278-8053627C 000110 0004+00 0/1 0/0 0/0 .rodata @5635 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5635 = 1.75f; -COMPILER_STRIP_GATE(80536278, &lit_5635); +COMPILER_STRIP_GATE(0x80536278, &lit_5635); #pragma pop /* 8053627C-80536280 000114 0004+00 0/2 0/0 0/0 .rodata @5636 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5636 = 12.0f; -COMPILER_STRIP_GATE(8053627C, &lit_5636); +COMPILER_STRIP_GATE(0x8053627C, &lit_5636); #pragma pop /* 80536280-80536284 000118 0004+00 0/6 0/0 0/0 .rodata @5637 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5637 = 3.0f / 5.0f; -COMPILER_STRIP_GATE(80536280, &lit_5637); +COMPILER_STRIP_GATE(0x80536280, &lit_5637); #pragma pop /* 80536284-80536288 00011C 0004+00 0/2 0/0 0/0 .rodata @5638 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5638 = 25.0f; -COMPILER_STRIP_GATE(80536284, &lit_5638); +COMPILER_STRIP_GATE(0x80536284, &lit_5638); #pragma pop /* 80536288-8053628C 000120 0004+00 0/5 0/0 0/0 .rodata @5639 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5639 = 2.5f; -COMPILER_STRIP_GATE(80536288, &lit_5639); +COMPILER_STRIP_GATE(0x80536288, &lit_5639); #pragma pop /* 8053628C-80536290 000124 0004+00 0/1 0/0 0/0 .rodata @5640 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5640 = -3.0f / 20.0f; -COMPILER_STRIP_GATE(8053628C, &lit_5640); +COMPILER_STRIP_GATE(0x8053628C, &lit_5640); #pragma pop /* 8052DEB8-8052EAA0 004278 0BE8+00 1/1 0/0 0/0 .text mf_lure_search__FP13mg_fish_class @@ -1955,7 +1955,7 @@ static asm void mf_lure_search(mg_fish_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5781 = 7.0f / 10.0f; -COMPILER_STRIP_GATE(80536290, &lit_5781); +COMPILER_STRIP_GATE(0x80536290, &lit_5781); #pragma pop /* 8052EAA0-8052F120 004E60 0680+00 1/1 0/0 0/0 .text mf_bait_search__FP13mg_fish_class @@ -1974,84 +1974,84 @@ static asm void mf_bait_search(mg_fish_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5957 = 4.0f / 5.0f; -COMPILER_STRIP_GATE(80536294, &lit_5957); +COMPILER_STRIP_GATE(0x80536294, &lit_5957); #pragma pop /* 80536298-8053629C 000130 0004+00 0/3 0/0 0/0 .rodata @5958 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5958 = 7.0f / 20.0f; -COMPILER_STRIP_GATE(80536298, &lit_5958); +COMPILER_STRIP_GATE(0x80536298, &lit_5958); #pragma pop /* 8053629C-805362A0 000134 0004+00 0/1 0/0 0/0 .rodata @5959 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5959 = 11.0f / 20.0f; -COMPILER_STRIP_GATE(8053629C, &lit_5959); +COMPILER_STRIP_GATE(0x8053629C, &lit_5959); #pragma pop /* 805362A0-805362A4 000138 0004+00 0/1 0/0 0/0 .rodata @5960 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5960 = 13.0f; -COMPILER_STRIP_GATE(805362A0, &lit_5960); +COMPILER_STRIP_GATE(0x805362A0, &lit_5960); #pragma pop /* 805362A4-805362A8 00013C 0004+00 0/1 0/0 0/0 .rodata @5961 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5961 = 13.0f / 20.0f; -COMPILER_STRIP_GATE(805362A4, &lit_5961); +COMPILER_STRIP_GATE(0x805362A4, &lit_5961); #pragma pop /* 805362A8-805362AC 000140 0004+00 0/1 0/0 0/0 .rodata @5962 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5962 = 45.0f; -COMPILER_STRIP_GATE(805362A8, &lit_5962); +COMPILER_STRIP_GATE(0x805362A8, &lit_5962); #pragma pop /* 805362AC-805362B0 000144 0004+00 0/2 0/0 0/0 .rodata @5963 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5963 = 11.0f; -COMPILER_STRIP_GATE(805362AC, &lit_5963); +COMPILER_STRIP_GATE(0x805362AC, &lit_5963); #pragma pop /* 805362B0-805362B4 000148 0004+00 0/1 0/0 0/0 .rodata @5964 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5964 = 9.0f; -COMPILER_STRIP_GATE(805362B0, &lit_5964); +COMPILER_STRIP_GATE(0x805362B0, &lit_5964); #pragma pop /* 805362B4-805362B8 00014C 0004+00 0/2 0/0 0/0 .rodata @5965 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5965 = 8.0f; -COMPILER_STRIP_GATE(805362B4, &lit_5965); +COMPILER_STRIP_GATE(0x805362B4, &lit_5965); #pragma pop /* 805362B8-805362BC 000150 0004+00 0/2 0/0 0/0 .rodata @5966 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5966 = 6.0f; -COMPILER_STRIP_GATE(805362B8, &lit_5966); +COMPILER_STRIP_GATE(0x805362B8, &lit_5966); #pragma pop /* 805362BC-805362C0 000154 0004+00 0/1 0/0 0/0 .rodata @5967 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5967 = 90.0f; -COMPILER_STRIP_GATE(805362BC, &lit_5967); +COMPILER_STRIP_GATE(0x805362BC, &lit_5967); #pragma pop /* 805362C0-805362C4 000158 0004+00 0/5 0/0 0/0 .rodata @5968 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5968 = 4000.0f; -COMPILER_STRIP_GATE(805362C0, &lit_5968); +COMPILER_STRIP_GATE(0x805362C0, &lit_5968); #pragma pop /* 8052F120-8052FA4C 0054E0 092C+00 1/1 0/0 0/0 .text mf_hit__FP13mg_fish_class */ @@ -2069,35 +2069,35 @@ static asm void mf_hit(mg_fish_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6132 = 16384.0f; -COMPILER_STRIP_GATE(805362C4, &lit_6132); +COMPILER_STRIP_GATE(0x805362C4, &lit_6132); #pragma pop /* 805362C8-805362CC 000160 0004+00 0/1 0/0 0/0 .rodata @6133 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6133 = 384.0f; -COMPILER_STRIP_GATE(805362C8, &lit_6133); +COMPILER_STRIP_GATE(0x805362C8, &lit_6133); #pragma pop /* 805362CC-805362D0 000164 0004+00 0/1 0/0 0/0 .rodata @6134 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6134 = 23.0f; -COMPILER_STRIP_GATE(805362CC, &lit_6134); +COMPILER_STRIP_GATE(0x805362CC, &lit_6134); #pragma pop /* 805362D0-805362D4 000168 0004+00 0/1 0/0 0/0 .rodata @6135 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6135 = -0.5f; -COMPILER_STRIP_GATE(805362D0, &lit_6135); +COMPILER_STRIP_GATE(0x805362D0, &lit_6135); #pragma pop /* 805362D4-805362D8 00016C 0004+00 0/1 0/0 0/0 .rodata @6136 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6136 = 13000.0f; -COMPILER_STRIP_GATE(805362D4, &lit_6136); +COMPILER_STRIP_GATE(0x805362D4, &lit_6136); #pragma pop /* 8052FA4C-8053036C 005E0C 0920+00 1/1 0/0 0/0 .text mf_jump__FP13mg_fish_class */ @@ -2125,7 +2125,7 @@ static asm void pota_set(mg_fish_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6293 = 3000.0f; -COMPILER_STRIP_GATE(805362D8, &lit_6293); +COMPILER_STRIP_GATE(0x805362D8, &lit_6293); #pragma pop /* 8053055C-80530924 00691C 03C8+00 1/1 0/0 0/0 .text mf_catch__FP13mg_fish_class */ @@ -2143,35 +2143,35 @@ static asm void mf_catch(mg_fish_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6455 = 80.0f; -COMPILER_STRIP_GATE(805362DC, &lit_6455); +COMPILER_STRIP_GATE(0x805362DC, &lit_6455); #pragma pop /* 805362E0-805362E4 000178 0004+00 0/1 0/0 0/0 .rodata @6456 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_6456 = 0xBB03126F; -COMPILER_STRIP_GATE(805362E0, &lit_6456); +COMPILER_STRIP_GATE(0x805362E0, &lit_6456); #pragma pop /* 805362E4-805362E8 00017C 0004+00 0/1 0/0 0/0 .rodata @6457 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6457 = -1.0f / 5.0f; -COMPILER_STRIP_GATE(805362E4, &lit_6457); +COMPILER_STRIP_GATE(0x805362E4, &lit_6457); #pragma pop /* 805362E8-805362EC 000180 0004+00 0/1 0/0 0/0 .rodata @6458 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6458 = 14.0f; -COMPILER_STRIP_GATE(805362E8, &lit_6458); +COMPILER_STRIP_GATE(0x805362E8, &lit_6458); #pragma pop /* 805362EC-805362F0 000184 0004+00 0/1 0/0 0/0 .rodata @6459 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6459 = 32768.0f; -COMPILER_STRIP_GATE(805362EC, &lit_6459); +COMPILER_STRIP_GATE(0x805362EC, &lit_6459); #pragma pop /* 80530924-8053109C 006CE4 0778+00 1/1 0/0 0/0 .text mf_esa_search__FP13mg_fish_class */ @@ -2199,42 +2199,42 @@ static asm void mf_esa_hit(mg_fish_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6648 = 5000.0f; -COMPILER_STRIP_GATE(805362F0, &lit_6648); +COMPILER_STRIP_GATE(0x805362F0, &lit_6648); #pragma pop /* 805362F4-805362F8 00018C 0004+00 0/1 0/0 0/0 .rodata @6649 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6649 = 700.0f; -COMPILER_STRIP_GATE(805362F4, &lit_6649); +COMPILER_STRIP_GATE(0x805362F4, &lit_6649); #pragma pop /* 805362F8-805362FC 000190 0004+00 0/3 0/0 0/0 .rodata @6650 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6650 = 180.0f; -COMPILER_STRIP_GATE(805362F8, &lit_6650); +COMPILER_STRIP_GATE(0x805362F8, &lit_6650); #pragma pop /* 805362FC-80536300 000194 0004+00 0/1 0/0 0/0 .rodata @6651 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6651 = 160.0f; -COMPILER_STRIP_GATE(805362FC, &lit_6651); +COMPILER_STRIP_GATE(0x805362FC, &lit_6651); #pragma pop /* 80536300-80536304 000198 0004+00 0/1 0/0 0/0 .rodata @6652 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6652 = 58.0f; -COMPILER_STRIP_GATE(80536300, &lit_6652); +COMPILER_STRIP_GATE(0x80536300, &lit_6652); #pragma pop /* 80536304-80536308 00019C 0004+00 0/1 0/0 0/0 .rodata @6653 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_6653 = 0x3BA3D70A; -COMPILER_STRIP_GATE(80536304, &lit_6653); +COMPILER_STRIP_GATE(0x80536304, &lit_6653); #pragma pop /* 805313D8-8053198C 007798 05B4+00 1/1 0/0 0/0 .text mf_esa_catch__FP13mg_fish_class */ @@ -2252,28 +2252,28 @@ static asm void mf_esa_catch(mg_fish_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6722 = 70.0f; -COMPILER_STRIP_GATE(80536308, &lit_6722); +COMPILER_STRIP_GATE(0x80536308, &lit_6722); #pragma pop /* 8053630C-80536310 0001A4 0004+00 0/1 0/0 0/0 .rodata @6723 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6723 = 190.0f; -COMPILER_STRIP_GATE(8053630C, &lit_6723); +COMPILER_STRIP_GATE(0x8053630C, &lit_6723); #pragma pop /* 80536310-80536314 0001A8 0004+00 0/4 0/0 0/0 .rodata @6724 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6724 = -720.0f; -COMPILER_STRIP_GATE(80536310, &lit_6724); +COMPILER_STRIP_GATE(0x80536310, &lit_6724); #pragma pop /* 80536314-80536318 0001AC 0004+00 0/1 0/0 0/0 .rodata @6725 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_6725 = 0x3B83126F; -COMPILER_STRIP_GATE(80536314, &lit_6725); +COMPILER_STRIP_GATE(0x80536314, &lit_6725); #pragma pop /* 8053198C-80531CD4 007D4C 0348+00 1/1 0/0 0/0 .text mf_aqua__FP13mg_fish_class */ @@ -2291,21 +2291,21 @@ static asm void mf_aqua(mg_fish_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6847 = 120.0f; -COMPILER_STRIP_GATE(80536318, &lit_6847); +COMPILER_STRIP_GATE(0x80536318, &lit_6847); #pragma pop /* 8053631C-80536320 0001B4 0004+00 0/1 0/0 0/0 .rodata @6848 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6848 = 140.0f; -COMPILER_STRIP_GATE(8053631C, &lit_6848); +COMPILER_STRIP_GATE(0x8053631C, &lit_6848); #pragma pop /* 80536320-80536324 0001B8 0004+00 0/1 0/0 0/0 .rodata @6849 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6849 = 220.0f; -COMPILER_STRIP_GATE(80536320, &lit_6849); +COMPILER_STRIP_GATE(0x80536320, &lit_6849); #pragma pop /* 80531CD4-805322E0 008094 060C+00 1/1 0/0 0/0 .text ri_aqua__FP13mg_fish_class */ @@ -2323,7 +2323,7 @@ static asm void ri_aqua(mg_fish_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6893 = 6.0f / 5.0f; -COMPILER_STRIP_GATE(80536324, &lit_6893); +COMPILER_STRIP_GATE(0x80536324, &lit_6893); #pragma pop /* 805322E0-805324D8 0086A0 01F8+00 1/1 0/0 0/0 .text mf_aqua_tilt__FP13mg_fish_class */ @@ -2341,14 +2341,20 @@ static asm void mf_aqua_tilt(mg_fish_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7221 = 4500.0f; -COMPILER_STRIP_GATE(80536328, &lit_7221); +COMPILER_STRIP_GATE(0x80536328, &lit_7221); #pragma pop /* 8053632C-80536330 0001C4 0004+00 0/1 0/0 0/0 .rodata @7222 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7222 = 27.0f / 10.0f; -COMPILER_STRIP_GATE(8053632C, &lit_7222); +COMPILER_STRIP_GATE(0x8053632C, &lit_7222); +#pragma pop + +/* 80536438-80536438 0002D0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80536438 = "F_SP127"; #pragma pop /* 805324D8-80533268 008898 0D90+00 2/1 0/0 0/0 .text action__FP13mg_fish_class */ @@ -2366,140 +2372,140 @@ static asm void action(mg_fish_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_7223 = 0x38D1B717; -COMPILER_STRIP_GATE(80536330, &lit_7223); +COMPILER_STRIP_GATE(0x80536330, &lit_7223); #pragma pop /* 80536334-80536338 0001CC 0004+00 0/0 0/0 0/0 .rodata @7224 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_7224 = 0x391D4952; -COMPILER_STRIP_GATE(80536334, &lit_7224); +COMPILER_STRIP_GATE(0x80536334, &lit_7224); #pragma pop /* 80536338-8053633C 0001D0 0004+00 0/0 0/0 0/0 .rodata @7225 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_7225 = 0x3951B717; -COMPILER_STRIP_GATE(80536338, &lit_7225); +COMPILER_STRIP_GATE(0x80536338, &lit_7225); #pragma pop /* 8053633C-80536340 0001D4 0004+00 0/0 0/0 0/0 .rodata @7226 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_7226 = 0x399D4952; -COMPILER_STRIP_GATE(8053633C, &lit_7226); +COMPILER_STRIP_GATE(0x8053633C, &lit_7226); #pragma pop /* 80536340-80536344 0001D8 0004+00 0/0 0/0 0/0 .rodata @7227 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_7227 = 0x39D1B717; -COMPILER_STRIP_GATE(80536340, &lit_7227); +COMPILER_STRIP_GATE(0x80536340, &lit_7227); #pragma pop /* 80536344-80536348 0001DC 0004+00 0/0 0/0 0/0 .rodata @7228 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_7228 = 0x3983126F; -COMPILER_STRIP_GATE(80536344, &lit_7228); +COMPILER_STRIP_GATE(0x80536344, &lit_7228); #pragma pop /* 80536348-8053634C 0001E0 0004+00 0/1 0/0 0/0 .rodata @7229 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7229 = 35.0f; -COMPILER_STRIP_GATE(80536348, &lit_7229); +COMPILER_STRIP_GATE(0x80536348, &lit_7229); #pragma pop /* 8053634C-80536350 0001E4 0004+00 0/0 0/0 0/0 .rodata @7230 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7230 = -9000.0f; -COMPILER_STRIP_GATE(8053634C, &lit_7230); +COMPILER_STRIP_GATE(0x8053634C, &lit_7230); #pragma pop /* 80536350-80536354 0001E8 0004+00 0/0 0/0 0/0 .rodata @7231 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7231 = -1000.0f; -COMPILER_STRIP_GATE(80536350, &lit_7231); +COMPILER_STRIP_GATE(0x80536350, &lit_7231); #pragma pop /* 80536354-80536358 0001EC 0004+00 0/0 0/0 0/0 .rodata @7232 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7232 = 2500.0f; -COMPILER_STRIP_GATE(80536354, &lit_7232); +COMPILER_STRIP_GATE(0x80536354, &lit_7232); #pragma pop /* 80536358-8053635C 0001F0 0004+00 0/0 0/0 0/0 .rodata @7233 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7233 = 4.5f; -COMPILER_STRIP_GATE(80536358, &lit_7233); +COMPILER_STRIP_GATE(0x80536358, &lit_7233); #pragma pop /* 8053635C-80536360 0001F4 0004+00 0/1 0/0 0/0 .rodata @7234 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7234 = 1.0f / 25.0f; -COMPILER_STRIP_GATE(8053635C, &lit_7234); +COMPILER_STRIP_GATE(0x8053635C, &lit_7234); #pragma pop /* 80536360-80536364 0001F8 0004+00 0/0 0/0 0/0 .rodata @7235 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7235 = -675.0f; -COMPILER_STRIP_GATE(80536360, &lit_7235); +COMPILER_STRIP_GATE(0x80536360, &lit_7235); #pragma pop /* 80536364-80536368 0001FC 0004+00 0/0 0/0 0/0 .rodata @7236 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7236 = -765.0f; -COMPILER_STRIP_GATE(80536364, &lit_7236); +COMPILER_STRIP_GATE(0x80536364, &lit_7236); #pragma pop /* 80536368-8053636C 000200 0004+00 0/0 0/0 0/0 .rodata @7237 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7237 = 290.0f; -COMPILER_STRIP_GATE(80536368, &lit_7237); +COMPILER_STRIP_GATE(0x80536368, &lit_7237); #pragma pop /* 8053636C-80536370 000204 0004+00 0/0 0/0 0/0 .rodata @7238 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7238 = -150.0f; -COMPILER_STRIP_GATE(8053636C, &lit_7238); +COMPILER_STRIP_GATE(0x8053636C, &lit_7238); #pragma pop /* 80536370-80536374 000208 0004+00 0/0 0/0 0/0 .rodata @7239 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7239 = 3500.0f; -COMPILER_STRIP_GATE(80536370, &lit_7239); +COMPILER_STRIP_GATE(0x80536370, &lit_7239); #pragma pop /* 80536374-80536378 00020C 0004+00 0/0 0/0 0/0 .rodata @7240 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7240 = 23333.0f; -COMPILER_STRIP_GATE(80536374, &lit_7240); +COMPILER_STRIP_GATE(0x80536374, &lit_7240); #pragma pop /* 80536378-8053637C 000210 0004+00 0/0 0/0 0/0 .rodata @7241 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7241 = 800.0f; -COMPILER_STRIP_GATE(80536378, &lit_7241); +COMPILER_STRIP_GATE(0x80536378, &lit_7241); #pragma pop /* 8053637C-80536380 000214 0004+00 0/2 0/0 0/0 .rodata @7288 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7288 = -3.0f; -COMPILER_STRIP_GATE(8053637C, &lit_7288); +COMPILER_STRIP_GATE(0x8053637C, &lit_7288); #pragma pop /* 80533268-80533484 009628 021C+00 1/1 0/0 0/0 .text ke_control__FP13mg_fish_classP7mf_ke_s */ @@ -2529,7 +2535,7 @@ static asm void ke_move(mg_fish_class* param_0, mf_ke_s* param_1, int param_2) { SECTION_RODATA static u8 const lit_7384[12] = { 0x3F, 0x80, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x40, 0x60, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80536380, &lit_7384); +COMPILER_STRIP_GATE(0x80536380, &lit_7384); #pragma pop /* 8053638C-80536398 000224 000C+00 0/1 0/0 0/0 .rodata @7398 */ @@ -2538,140 +2544,140 @@ COMPILER_STRIP_GATE(80536380, &lit_7384); SECTION_RODATA static u8 const lit_7398[12] = { 0x3F, 0x80, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x40, 0x60, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8053638C, &lit_7398); +COMPILER_STRIP_GATE(0x8053638C, &lit_7398); #pragma pop /* 80536398-8053639C 000230 0004+00 0/1 0/0 0/0 .rodata @8029 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8029 = -5.0f; -COMPILER_STRIP_GATE(80536398, &lit_8029); +COMPILER_STRIP_GATE(0x80536398, &lit_8029); #pragma pop /* 8053639C-805363A0 000234 0004+00 0/1 0/0 0/0 .rodata @8030 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8030 = -100.0f; -COMPILER_STRIP_GATE(8053639C, &lit_8030); +COMPILER_STRIP_GATE(0x8053639C, &lit_8030); #pragma pop /* 805363A0-805363A4 000238 0004+00 0/1 0/0 0/0 .rodata @8031 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8031 = 28.0f / 25.0f; -COMPILER_STRIP_GATE(805363A0, &lit_8031); +COMPILER_STRIP_GATE(0x805363A0, &lit_8031); #pragma pop /* 805363A4-805363A8 00023C 0004+00 0/1 0/0 0/0 .rodata @8032 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8032 = -25.0f; -COMPILER_STRIP_GATE(805363A4, &lit_8032); +COMPILER_STRIP_GATE(0x805363A4, &lit_8032); #pragma pop /* 805363A8-805363AC 000240 0004+00 0/1 0/0 0/0 .rodata @8033 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8033 = -15.0f; -COMPILER_STRIP_GATE(805363A8, &lit_8033); +COMPILER_STRIP_GATE(0x805363A8, &lit_8033); #pragma pop /* 805363AC-805363B0 000244 0004+00 0/1 0/0 0/0 .rodata @8034 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8034 = 11.0f / 10.0f; -COMPILER_STRIP_GATE(805363AC, &lit_8034); +COMPILER_STRIP_GATE(0x805363AC, &lit_8034); #pragma pop /* 805363B0-805363B4 000248 0004+00 0/1 0/0 0/0 .rodata @8035 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8035 = 29.0f; -COMPILER_STRIP_GATE(805363B0, &lit_8035); +COMPILER_STRIP_GATE(0x805363B0, &lit_8035); #pragma pop /* 805363B4-805363B8 00024C 0004+00 0/1 0/0 0/0 .rodata @8036 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8036 = 9.0f / 25.0f; -COMPILER_STRIP_GATE(805363B4, &lit_8036); +COMPILER_STRIP_GATE(0x805363B4, &lit_8036); #pragma pop /* 805363B8-805363BC 000250 0004+00 0/1 0/0 0/0 .rodata @8037 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8037 = -40.0f; -COMPILER_STRIP_GATE(805363B8, &lit_8037); +COMPILER_STRIP_GATE(0x805363B8, &lit_8037); #pragma pop /* 805363BC-805363C0 000254 0004+00 0/1 0/0 0/0 .rodata @8038 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8038 = 17.0f; -COMPILER_STRIP_GATE(805363BC, &lit_8038); +COMPILER_STRIP_GATE(0x805363BC, &lit_8038); #pragma pop /* 805363C0-805363C4 000258 0004+00 0/1 0/0 0/0 .rodata @8039 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8039 = -9.0f; -COMPILER_STRIP_GATE(805363C0, &lit_8039); +COMPILER_STRIP_GATE(0x805363C0, &lit_8039); #pragma pop /* 805363C4-805363C8 00025C 0004+00 0/1 0/0 0/0 .rodata @8040 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8040 = 2600.0f; -COMPILER_STRIP_GATE(805363C4, &lit_8040); +COMPILER_STRIP_GATE(0x805363C4, &lit_8040); #pragma pop /* 805363C8-805363CC 000260 0004+00 0/1 0/0 0/0 .rodata @8041 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8041 = -8.0f; -COMPILER_STRIP_GATE(805363C8, &lit_8041); +COMPILER_STRIP_GATE(0x805363C8, &lit_8041); #pragma pop /* 805363CC-805363D0 000264 0004+00 0/1 0/0 0/0 .rodata @8042 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8042 = -14.0f; -COMPILER_STRIP_GATE(805363CC, &lit_8042); +COMPILER_STRIP_GATE(0x805363CC, &lit_8042); #pragma pop /* 805363D0-805363D4 000268 0004+00 0/1 0/0 0/0 .rodata @8043 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8043 = -19.0f; -COMPILER_STRIP_GATE(805363D0, &lit_8043); +COMPILER_STRIP_GATE(0x805363D0, &lit_8043); #pragma pop /* 805363D4-805363D8 00026C 0004+00 0/1 0/0 0/0 .rodata @8044 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8044 = -2.0f; -COMPILER_STRIP_GATE(805363D4, &lit_8044); +COMPILER_STRIP_GATE(0x805363D4, &lit_8044); #pragma pop /* 805363D8-805363DC 000270 0004+00 0/1 0/0 0/0 .rodata @8045 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8045 = 12.0f / 25.0f; -COMPILER_STRIP_GATE(805363D8, &lit_8045); +COMPILER_STRIP_GATE(0x805363D8, &lit_8045); #pragma pop /* 805363DC-805363E0 000274 0004+00 0/1 0/0 0/0 .rodata @8046 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8046 = -45.0f; -COMPILER_STRIP_GATE(805363DC, &lit_8046); +COMPILER_STRIP_GATE(0x805363DC, &lit_8046); #pragma pop /* 805363E0-805363E4 000278 0004+00 0/1 0/0 0/0 .rodata @8047 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8047 = -35.0f; -COMPILER_STRIP_GATE(805363E0, &lit_8047); +COMPILER_STRIP_GATE(0x805363E0, &lit_8047); #pragma pop /* 80536BEC-80536BFC 000074 000C+04 0/1 0/0 0/0 .bss @7455 */ @@ -2807,119 +2813,119 @@ static asm void useHeapImg_fisht(fopAc_ac_c* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8763 = -200.0f; -COMPILER_STRIP_GATE(805363E4, &lit_8763); +COMPILER_STRIP_GATE(0x805363E4, &lit_8763); #pragma pop /* 805363E8-805363EC 000280 0004+00 0/1 0/0 0/0 .rodata @8764 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8764 = 127.0f / 50.0f; -COMPILER_STRIP_GATE(805363E8, &lit_8764); +COMPILER_STRIP_GATE(0x805363E8, &lit_8764); #pragma pop /* 805363EC-805363F0 000284 0004+00 0/1 0/0 0/0 .rodata @8765 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_8765 = 0x3D5A7B0B; -COMPILER_STRIP_GATE(805363EC, &lit_8765); +COMPILER_STRIP_GATE(0x805363EC, &lit_8765); #pragma pop /* 805363F0-805363F4 000288 0004+00 0/1 0/0 0/0 .rodata @8766 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_8766 = 0x3CAC0831; -COMPILER_STRIP_GATE(805363F0, &lit_8766); +COMPILER_STRIP_GATE(0x805363F0, &lit_8766); #pragma pop /* 805363F4-805363F8 00028C 0004+00 0/1 0/0 0/0 .rodata @8767 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8767 = 7.0f / 25.0f; -COMPILER_STRIP_GATE(805363F4, &lit_8767); +COMPILER_STRIP_GATE(0x805363F4, &lit_8767); #pragma pop /* 805363F8-805363FC 000290 0004+00 0/1 0/0 0/0 .rodata @8768 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8768 = 67.0f / 100.0f; -COMPILER_STRIP_GATE(805363F8, &lit_8768); +COMPILER_STRIP_GATE(0x805363F8, &lit_8768); #pragma pop /* 805363FC-80536400 000294 0004+00 0/1 0/0 0/0 .rodata @8769 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_8769 = 0x3D1FBE77; -COMPILER_STRIP_GATE(805363FC, &lit_8769); +COMPILER_STRIP_GATE(0x805363FC, &lit_8769); #pragma pop /* 80536400-80536404 000298 0004+00 0/1 0/0 0/0 .rodata @8770 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8770 = 3.0f / 100.0f; -COMPILER_STRIP_GATE(80536400, &lit_8770); +COMPILER_STRIP_GATE(0x80536400, &lit_8770); #pragma pop /* 80536404-80536408 00029C 0004+00 0/1 0/0 0/0 .rodata @8771 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_8771 = 0x3CE6F71A; -COMPILER_STRIP_GATE(80536404, &lit_8771); +COMPILER_STRIP_GATE(0x80536404, &lit_8771); #pragma pop /* 80536408-8053640C 0002A0 0004+00 0/1 0/0 0/0 .rodata @8772 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_8772 = 0x3C35DCC6; -COMPILER_STRIP_GATE(80536408, &lit_8772); +COMPILER_STRIP_GATE(0x80536408, &lit_8772); #pragma pop /* 8053640C-80536410 0002A4 0004+00 0/1 0/0 0/0 .rodata @8773 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8773 = 17.0f / 20.0f; -COMPILER_STRIP_GATE(8053640C, &lit_8773); +COMPILER_STRIP_GATE(0x8053640C, &lit_8773); #pragma pop /* 80536410-80536414 0002A8 0004+00 0/1 0/0 0/0 .rodata @8774 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8774 = 9.0f / 10.0f; -COMPILER_STRIP_GATE(80536410, &lit_8774); +COMPILER_STRIP_GATE(0x80536410, &lit_8774); #pragma pop /* 80536414-80536418 0002AC 0004+00 0/1 0/0 0/0 .rodata @8775 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8775 = 21.0f / 50.0f; -COMPILER_STRIP_GATE(80536414, &lit_8775); +COMPILER_STRIP_GATE(0x80536414, &lit_8775); #pragma pop /* 80536418-8053641C 0002B0 0004+00 0/1 0/0 0/0 .rodata @8776 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8776 = 20000.0f; -COMPILER_STRIP_GATE(80536418, &lit_8776); +COMPILER_STRIP_GATE(0x80536418, &lit_8776); #pragma pop /* 8053641C-80536420 0002B4 0004+00 0/1 0/0 0/0 .rodata @8777 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8777 = 110.0f; -COMPILER_STRIP_GATE(8053641C, &lit_8777); +COMPILER_STRIP_GATE(0x8053641C, &lit_8777); #pragma pop /* 80536420-80536424 0002B8 0004+00 0/1 0/0 0/0 .rodata @8778 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8778 = 200000.0f; -COMPILER_STRIP_GATE(80536420, &lit_8778); +COMPILER_STRIP_GATE(0x80536420, &lit_8778); #pragma pop /* 80536424-80536428 0002BC 0004+00 0/1 0/0 0/0 .rodata @8779 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8779 = 100000.0f; -COMPILER_STRIP_GATE(80536424, &lit_8779); +COMPILER_STRIP_GATE(0x80536424, &lit_8779); #pragma pop /* 80536428-80536430 0002C0 0008+00 0/1 0/0 0/0 .rodata @8781 */ @@ -2928,7 +2934,7 @@ COMPILER_STRIP_GATE(80536424, &lit_8779); SECTION_RODATA static u8 const lit_8781[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80536428, &lit_8781); +COMPILER_STRIP_GATE(0x80536428, &lit_8781); #pragma pop /* 80536430-80536438 0002C8 0008+00 0/1 0/0 0/0 .rodata @8782 */ @@ -2937,7 +2943,24 @@ COMPILER_STRIP_GATE(80536428, &lit_8781); SECTION_RODATA static u8 const lit_8782[8] = { 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80536430, &lit_8782); +COMPILER_STRIP_GATE(0x80536430, &lit_8782); +#pragma pop + +/* 80536438-80536438 0002D0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80536440 = "Mg_f_lm"; +SECTION_DEAD static char const* const stringBase_80536448 = "Mg_f_np"; +SECTION_DEAD static char const* const stringBase_80536450 = "Mg_f_cf"; +SECTION_DEAD static char const* const stringBase_80536458 = "Mg_f_ri"; +SECTION_DEAD static char const* const stringBase_80536460 = "Mg_f_ks"; +SECTION_DEAD static char const* const stringBase_80536468 = "Mg_f_bg"; +SECTION_DEAD static char const* const stringBase_80536470 = "Mg_f_bt"; +SECTION_DEAD static char const* const stringBase_80536478 = "Mg_f_sp"; +SECTION_DEAD static char const* const stringBase_80536480 = "Mg_f_bb"; +SECTION_DEAD static char const* const stringBase_80536488 = "Mg_f_lh"; +SECTION_DEAD static char const* const stringBase_80536490 = "O_gD_bott"; +SECTION_DEAD static char const* const stringBase_8053649A = "R_SP127"; #pragma pop /* 80535138-80535DA8 00B4F8 0C70+00 1/0 0/0 0/0 .text daMg_Fish_Create__FP10fopAc_ac_c */ @@ -3072,7 +3095,7 @@ asm void __sinit_d_a_mg_fish_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_805360F0 = (void*)__sinit_d_a_mg_fish_cpp; +REGISTER_CTORS(0x805360F0, __sinit_d_a_mg_fish_cpp); #pragma pop /* 8053612C-80536134 00C4EC 0008+00 1/0 0/0 0/0 .text @20@__dt__14dBgS_ObjGndChkFv */ @@ -3297,21 +3320,4 @@ static u8 data_80536D54[4]; static u8 data_80536D58[4]; #pragma pop -/* 80536438-805364A2 0002D0 006A+00 2/2 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80536438 = "F_SP127"; -SECTION_DEAD static char const* const stringBase_80536440 = "Mg_f_lm"; -SECTION_DEAD static char const* const stringBase_80536448 = "Mg_f_np"; -SECTION_DEAD static char const* const stringBase_80536450 = "Mg_f_cf"; -SECTION_DEAD static char const* const stringBase_80536458 = "Mg_f_ri"; -SECTION_DEAD static char const* const stringBase_80536460 = "Mg_f_ks"; -SECTION_DEAD static char const* const stringBase_80536468 = "Mg_f_bg"; -SECTION_DEAD static char const* const stringBase_80536470 = "Mg_f_bt"; -SECTION_DEAD static char const* const stringBase_80536478 = "Mg_f_sp"; -SECTION_DEAD static char const* const stringBase_80536480 = "Mg_f_bb"; -SECTION_DEAD static char const* const stringBase_80536488 = "Mg_f_lh"; -SECTION_DEAD static char const* const stringBase_80536490 = "O_gD_bott"; -SECTION_DEAD static char const* const stringBase_8053649A = "R_SP127"; -#pragma pop +/* 80536438-80536438 0002D0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/d_a_mg_fshop/d_a_mg_fshop.cpp b/rel/d/a/d_a_mg_fshop/d_a_mg_fshop.cpp index b47998332db..fd1fcca05ea 100644 --- a/rel/d/a/d_a_mg_fshop/d_a_mg_fshop.cpp +++ b/rel/d/a/d_a_mg_fshop/d_a_mg_fshop.cpp @@ -405,20 +405,20 @@ static asm void Reel_CallBack(J3DJoint* param_0, int param_1) { /* ############################################################################################## */ /* 80870094-80870098 000000 0004+00 13/13 0/0 0/0 .rodata @3829 */ SECTION_RODATA static f32 const lit_3829 = 2.0f; -COMPILER_STRIP_GATE(80870094, &lit_3829); +COMPILER_STRIP_GATE(0x80870094, &lit_3829); /* 80870098-8087009C 000004 0004+00 0/7 0/0 0/0 .rodata @3830 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3830 = 1.0f; -COMPILER_STRIP_GATE(80870098, &lit_3830); +COMPILER_STRIP_GATE(0x80870098, &lit_3830); #pragma pop /* 8087009C-808700A0 000008 0004+00 0/2 0/0 0/0 .rodata @3831 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3831 = 1.5f; -COMPILER_STRIP_GATE(8087009C, &lit_3831); +COMPILER_STRIP_GATE(0x8087009C, &lit_3831); #pragma pop /* 8086C140-8086C214 0001C0 00D4+00 1/1 0/0 0/0 .text frog_CallBack__FP8J3DJointi */ @@ -434,7 +434,7 @@ static asm void frog_CallBack(J3DJoint* param_0, int param_1) { /* ############################################################################################## */ /* 808700A0-808700A4 00000C 0004+00 2/3 0/0 0/0 .rodata @3871 */ SECTION_RODATA static f32 const lit_3871 = 5.0f; -COMPILER_STRIP_GATE(808700A0, &lit_3871); +COMPILER_STRIP_GATE(0x808700A0, &lit_3871); /* 80870958-8087095C 000008 0001+03 2/2 0/0 0/0 .bss @1109 */ static u8 lit_1109[1 + 3 /* padding */]; @@ -583,21 +583,21 @@ extern "C" u8 ArcIX_A_crsaka_model[32]; #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_3977 = 0x42853333; -COMPILER_STRIP_GATE(808700A4, &lit_3977); +COMPILER_STRIP_GATE(0x808700A4, &lit_3977); #pragma pop /* 808700A8-808700AC 000014 0004+00 0/2 0/0 0/0 .rodata @3978 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3978 = 1200.0f; -COMPILER_STRIP_GATE(808700A8, &lit_3978); +COMPILER_STRIP_GATE(0x808700A8, &lit_3978); #pragma pop /* 808700AC-808700B0 000018 0004+00 0/2 0/0 0/0 .rodata @3979 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3979 = 6.0f / 5.0f; -COMPILER_STRIP_GATE(808700AC, &lit_3979); +COMPILER_STRIP_GATE(0x808700AC, &lit_3979); #pragma pop /* 808700B0-808700B4 00001C 0004+00 1/11 0/0 0/0 .rodata @3980 */ @@ -607,7 +607,7 @@ SECTION_RODATA static u8 const lit_3980[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(808700B0, &lit_3980); +COMPILER_STRIP_GATE(0x808700B0, &lit_3980); /* 80870284-80870290 000000 000C+00 3/3 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { @@ -1819,49 +1819,49 @@ static asm void daFshop_Draw(fshop_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4049 = 65536.0f; -COMPILER_STRIP_GATE(808700B4, &lit_4049); +COMPILER_STRIP_GATE(0x808700B4, &lit_4049); #pragma pop /* 808700B8-808700BC 000024 0004+00 0/1 0/0 0/0 .rodata @4050 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4050 = 500.0f; -COMPILER_STRIP_GATE(808700B8, &lit_4050); +COMPILER_STRIP_GATE(0x808700B8, &lit_4050); #pragma pop /* 808700BC-808700C0 000028 0004+00 0/1 0/0 0/0 .rodata @4051 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4051 = 1000.0f; -COMPILER_STRIP_GATE(808700BC, &lit_4051); +COMPILER_STRIP_GATE(0x808700BC, &lit_4051); #pragma pop /* 808700C0-808700C4 00002C 0004+00 0/3 0/0 0/0 .rodata @4052 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4052 = 40.0f; -COMPILER_STRIP_GATE(808700C0, &lit_4052); +COMPILER_STRIP_GATE(0x808700C0, &lit_4052); #pragma pop /* 808700C4-808700C8 000030 0004+00 0/2 0/0 0/0 .rodata @4053 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4053 = 25.0f; -COMPILER_STRIP_GATE(808700C4, &lit_4053); +COMPILER_STRIP_GATE(0x808700C4, &lit_4053); #pragma pop /* 808700C8-808700CC 000034 0004+00 0/2 0/0 0/0 .rodata @4054 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4054 = 13.0f; -COMPILER_STRIP_GATE(808700C8, &lit_4054); +COMPILER_STRIP_GATE(0x808700C8, &lit_4054); #pragma pop /* 808700CC-808700D0 000038 0004+00 0/1 0/0 0/0 .rodata @4055 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4055 = 12.0f; -COMPILER_STRIP_GATE(808700CC, &lit_4055); +COMPILER_STRIP_GATE(0x808700CC, &lit_4055); #pragma pop /* 8087072C-80870738 0004A8 000C+00 0/0 0/0 0/0 .data lure_scale */ @@ -1927,21 +1927,21 @@ static asm void lure_set(fshop_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4164 = 15.0f; -COMPILER_STRIP_GATE(808700D0, &lit_4164); +COMPILER_STRIP_GATE(0x808700D0, &lit_4164); #pragma pop /* 808700D4-808700D8 000040 0004+00 0/2 0/0 0/0 .rodata @4165 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4165 = -4.0f / 5.0f; -COMPILER_STRIP_GATE(808700D4, &lit_4165); +COMPILER_STRIP_GATE(0x808700D4, &lit_4165); #pragma pop /* 808700D8-808700DC 000044 0004+00 0/2 0/0 0/0 .rodata @4166 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4166 = 4.0f; -COMPILER_STRIP_GATE(808700D8, &lit_4166); +COMPILER_STRIP_GATE(0x808700D8, &lit_4166); #pragma pop /* 80870774-8087078C 0004F0 0018+00 1/1 0/0 0/0 .data guide_p$4084 */ @@ -1981,35 +1981,35 @@ asm cXyz::~cXyz() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4190 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(808700DC, &lit_4190); +COMPILER_STRIP_GATE(0x808700DC, &lit_4190); #pragma pop /* 808700E0-808700E4 00004C 0004+00 0/1 0/0 0/0 .rodata @4191 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4191 = 7.0f / 10.0f; -COMPILER_STRIP_GATE(808700E0, &lit_4191); +COMPILER_STRIP_GATE(0x808700E0, &lit_4191); #pragma pop /* 808700E4-808700E8 000050 0004+00 0/1 0/0 0/0 .rodata @4192 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4192 = 60.0f; -COMPILER_STRIP_GATE(808700E4, &lit_4192); +COMPILER_STRIP_GATE(0x808700E4, &lit_4192); #pragma pop /* 808700E8-808700EC 000054 0004+00 0/1 0/0 0/0 .rodata @4193 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4193 = 35.0f; -COMPILER_STRIP_GATE(808700E8, &lit_4193); +COMPILER_STRIP_GATE(0x808700E8, &lit_4193); #pragma pop /* 808700EC-808700F0 000058 0004+00 0/3 0/0 0/0 .rodata @4194 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4194 = 1.0f / 20.0f; -COMPILER_STRIP_GATE(808700EC, &lit_4194); +COMPILER_STRIP_GATE(0x808700EC, &lit_4194); #pragma pop /* 8086CC6C-8086CD70 000CEC 0104+00 1/1 0/0 0/0 .text s_fish_sub__FPvPv */ @@ -2027,21 +2027,21 @@ static asm void s_fish_sub(void* param_0, void* param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4248 = 150.0f; -COMPILER_STRIP_GATE(808700F0, &lit_4248); +COMPILER_STRIP_GATE(0x808700F0, &lit_4248); #pragma pop /* 808700F4-808700F8 000060 0004+00 0/1 0/0 0/0 .rodata @4249 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4249 = 1800.0f; -COMPILER_STRIP_GATE(808700F4, &lit_4249); +COMPILER_STRIP_GATE(0x808700F4, &lit_4249); #pragma pop /* 808700F8-808700FC 000064 0004+00 0/1 0/0 0/0 .rodata @4250 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4250 = 50.0f; -COMPILER_STRIP_GATE(808700F8, &lit_4250); +COMPILER_STRIP_GATE(0x808700F8, &lit_4250); #pragma pop /* 8086CD70-8086CF8C 000DF0 021C+00 1/1 0/0 0/0 .text tsubo_set__FP11fshop_class */ @@ -2059,35 +2059,35 @@ static asm void tsubo_set(fshop_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4289 = 0.5f; -COMPILER_STRIP_GATE(808700FC, &lit_4289); +COMPILER_STRIP_GATE(0x808700FC, &lit_4289); #pragma pop /* 80870100-80870104 00006C 0004+00 0/1 0/0 0/0 .rodata @4290 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4290 = 200.0f; -COMPILER_STRIP_GATE(80870100, &lit_4290); +COMPILER_STRIP_GATE(0x80870100, &lit_4290); #pragma pop /* 80870104-80870108 000070 0004+00 0/2 0/0 0/0 .rodata @4291 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4291 = 600.0f; -COMPILER_STRIP_GATE(80870104, &lit_4291); +COMPILER_STRIP_GATE(0x80870104, &lit_4291); #pragma pop /* 80870108-8087010C 000074 0004+00 0/1 0/0 0/0 .rodata @4292 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4292 = 1.0f / 50.0f; -COMPILER_STRIP_GATE(80870108, &lit_4292); +COMPILER_STRIP_GATE(0x80870108, &lit_4292); #pragma pop /* 8087010C-80870110 000078 0004+00 0/1 0/0 0/0 .rodata @4293 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4293 = 3.0f; -COMPILER_STRIP_GATE(8087010C, &lit_4293); +COMPILER_STRIP_GATE(0x8087010C, &lit_4293); #pragma pop /* 8086CF8C-8086D1A0 00100C 0214+00 1/1 0/0 0/0 .text weed_control__FP11fshop_classP9fs_weed_s */ @@ -2115,39 +2115,39 @@ static asm void stage_copy(fshop_class* param_0, fshop_class* param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4376 = -10000.0f; -COMPILER_STRIP_GATE(80870110, &lit_4376); +COMPILER_STRIP_GATE(0x80870110, &lit_4376); #pragma pop /* 80870114-80870118 000080 0004+00 0/1 0/0 0/0 .rodata @4377 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4377 = 1.0f / 100.0f; -COMPILER_STRIP_GATE(80870114, &lit_4377); +COMPILER_STRIP_GATE(0x80870114, &lit_4377); #pragma pop /* 80870118-8087011C 000084 0004+00 0/2 0/0 0/0 .rodata @4378 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4378 = -10.0f; -COMPILER_STRIP_GATE(80870118, &lit_4378); +COMPILER_STRIP_GATE(0x80870118, &lit_4378); #pragma pop /* 8087011C-80870120 000088 0004+00 0/1 0/0 0/0 .rodata @4379 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4379 = -18.0f; -COMPILER_STRIP_GATE(8087011C, &lit_4379); +COMPILER_STRIP_GATE(0x8087011C, &lit_4379); #pragma pop /* 80870120-80870124 00008C 0004+00 1/4 0/0 0/0 .rodata @4380 */ SECTION_RODATA static f32 const lit_4380 = 2.5f; -COMPILER_STRIP_GATE(80870120, &lit_4380); +COMPILER_STRIP_GATE(0x80870120, &lit_4380); /* 80870124-80870128 000090 0004+00 0/1 0/0 0/0 .rodata @4381 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4381 = -2.0f; -COMPILER_STRIP_GATE(80870124, &lit_4381); +COMPILER_STRIP_GATE(0x80870124, &lit_4381); #pragma pop /* 8086D1EC-8086D48C 00126C 02A0+00 1/1 0/0 0/0 .text koro2_mtx_set__FP11fshop_class */ @@ -2185,77 +2185,77 @@ static asm void s_ball_sub(void* param_0, void* param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4459 = 284.0f; -COMPILER_STRIP_GATE(80870128, &lit_4459); +COMPILER_STRIP_GATE(0x80870128, &lit_4459); #pragma pop /* 8087012C-80870130 000098 0004+00 0/1 0/0 0/0 .rodata @4460 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4460 = 0x42AF999A; -COMPILER_STRIP_GATE(8087012C, &lit_4460); +COMPILER_STRIP_GATE(0x8087012C, &lit_4460); #pragma pop /* 80870130-80870134 00009C 0004+00 0/1 0/0 0/0 .rodata @4461 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4461 = 432.0f; -COMPILER_STRIP_GATE(80870130, &lit_4461); +COMPILER_STRIP_GATE(0x80870130, &lit_4461); #pragma pop /* 80870134-80870138 0000A0 0004+00 0/1 0/0 0/0 .rodata @4462 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4462 = 204.0f; -COMPILER_STRIP_GATE(80870134, &lit_4462); +COMPILER_STRIP_GATE(0x80870134, &lit_4462); #pragma pop /* 80870138-8087013C 0000A4 0004+00 0/1 0/0 0/0 .rodata @4463 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4463 = 0xC4A90666; -COMPILER_STRIP_GATE(80870138, &lit_4463); +COMPILER_STRIP_GATE(0x80870138, &lit_4463); #pragma pop /* 8087013C-80870140 0000A8 0004+00 0/1 0/0 0/0 .rodata @4464 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4464 = 430.0f; -COMPILER_STRIP_GATE(8087013C, &lit_4464); +COMPILER_STRIP_GATE(0x8087013C, &lit_4464); #pragma pop /* 80870140-80870144 0000AC 0004+00 0/2 0/0 0/0 .rodata @4465 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4465 = 10.0f; -COMPILER_STRIP_GATE(80870140, &lit_4465); +COMPILER_STRIP_GATE(0x80870140, &lit_4465); #pragma pop /* 80870144-80870148 0000B0 0004+00 0/2 0/0 0/0 .rodata @4466 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4466 = 4.0f / 5.0f; -COMPILER_STRIP_GATE(80870144, &lit_4466); +COMPILER_STRIP_GATE(0x80870144, &lit_4466); #pragma pop /* 80870148-8087014C 0000B4 0004+00 0/2 0/0 0/0 .rodata @4467 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4467 = 3.0f / 20.0f; -COMPILER_STRIP_GATE(80870148, &lit_4467); +COMPILER_STRIP_GATE(0x80870148, &lit_4467); #pragma pop /* 8087014C-80870150 0000B8 0004+00 0/1 0/0 0/0 .rodata @4468 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4468 = -3.0f / 20.0f; -COMPILER_STRIP_GATE(8087014C, &lit_4468); +COMPILER_STRIP_GATE(0x8087014C, &lit_4468); #pragma pop /* 80870150-80870154 0000BC 0004+00 0/1 0/0 0/0 .rodata @4469 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4469 = -6000.0f; -COMPILER_STRIP_GATE(80870150, &lit_4469); +COMPILER_STRIP_GATE(0x80870150, &lit_4469); #pragma pop /* 80870AC0-80870AC4 000170 0004+00 1/1 0/0 0/0 .bss old_stick_x$4410 */ @@ -2300,28 +2300,28 @@ static asm void ball_wall_check(fshop_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4838 = 3.0f / 125.0f; -COMPILER_STRIP_GATE(80870154, &lit_4838); +COMPILER_STRIP_GATE(0x80870154, &lit_4838); #pragma pop /* 80870158-8087015C 0000C4 0004+00 0/1 0/0 0/0 .rodata @4839 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4839 = 0x3E75C290; -COMPILER_STRIP_GATE(80870158, &lit_4839); +COMPILER_STRIP_GATE(0x80870158, &lit_4839); #pragma pop /* 8087015C-80870160 0000C8 0004+00 0/1 0/0 0/0 .rodata @4840 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4840 = 3.5f; -COMPILER_STRIP_GATE(8087015C, &lit_4840); +COMPILER_STRIP_GATE(0x8087015C, &lit_4840); #pragma pop /* 80870160-80870164 0000CC 0004+00 0/1 0/0 0/0 .rodata @4841 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4841 = -15.0f; -COMPILER_STRIP_GATE(80870160, &lit_4841); +COMPILER_STRIP_GATE(0x80870160, &lit_4841); #pragma pop /* 80870164-8087016C 0000D0 0004+04 0/1 0/0 0/0 .rodata @4842 */ @@ -2332,7 +2332,7 @@ SECTION_RODATA static f32 const lit_4842[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80870164, &lit_4842); +COMPILER_STRIP_GATE(0x80870164, &lit_4842); #pragma pop /* 8087016C-80870174 0000D8 0008+00 0/1 0/0 0/0 .rodata @4843 */ @@ -2341,7 +2341,7 @@ COMPILER_STRIP_GATE(80870164, &lit_4842); SECTION_RODATA static u8 const lit_4843[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8087016C, &lit_4843); +COMPILER_STRIP_GATE(0x8087016C, &lit_4843); #pragma pop /* 80870174-8087017C 0000E0 0008+00 0/1 0/0 0/0 .rodata @4844 */ @@ -2350,7 +2350,7 @@ COMPILER_STRIP_GATE(8087016C, &lit_4843); SECTION_RODATA static u8 const lit_4844[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80870174, &lit_4844); +COMPILER_STRIP_GATE(0x80870174, &lit_4844); #pragma pop /* 8087017C-80870184 0000E8 0008+00 0/1 0/0 0/0 .rodata @4845 */ @@ -2359,119 +2359,119 @@ COMPILER_STRIP_GATE(80870174, &lit_4844); SECTION_RODATA static u8 const lit_4845[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8087017C, &lit_4845); +COMPILER_STRIP_GATE(0x8087017C, &lit_4845); #pragma pop /* 80870184-80870188 0000F0 0004+00 0/1 0/0 0/0 .rodata @4846 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4846 = 65.0f; -COMPILER_STRIP_GATE(80870184, &lit_4846); +COMPILER_STRIP_GATE(0x80870184, &lit_4846); #pragma pop /* 80870188-8087018C 0000F4 0004+00 0/1 0/0 0/0 .rodata @4847 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4847 = 7.0f; -COMPILER_STRIP_GATE(80870188, &lit_4847); +COMPILER_STRIP_GATE(0x80870188, &lit_4847); #pragma pop /* 8087018C-80870190 0000F8 0004+00 0/1 0/0 0/0 .rodata @4848 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4848 = -5.0f; -COMPILER_STRIP_GATE(8087018C, &lit_4848); +COMPILER_STRIP_GATE(0x8087018C, &lit_4848); #pragma pop /* 80870190-80870194 0000FC 0004+00 0/2 0/0 0/0 .rodata @4849 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4849 = 30.0f; -COMPILER_STRIP_GATE(80870190, &lit_4849); +COMPILER_STRIP_GATE(0x80870190, &lit_4849); #pragma pop /* 80870194-80870198 000100 0004+00 0/1 0/0 0/0 .rodata @4850 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4850 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(80870194, &lit_4850); +COMPILER_STRIP_GATE(0x80870194, &lit_4850); #pragma pop /* 80870198-8087019C 000104 0004+00 0/1 0/0 0/0 .rodata @4851 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4851 = 190.0f; -COMPILER_STRIP_GATE(80870198, &lit_4851); +COMPILER_STRIP_GATE(0x80870198, &lit_4851); #pragma pop /* 8087019C-808701A0 000108 0004+00 0/2 0/0 0/0 .rodata @4852 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4852 = -720.0f; -COMPILER_STRIP_GATE(8087019C, &lit_4852); +COMPILER_STRIP_GATE(0x8087019C, &lit_4852); #pragma pop /* 808701A0-808701A4 00010C 0004+00 0/1 0/0 0/0 .rodata @4853 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4853 = 70.0f; -COMPILER_STRIP_GATE(808701A0, &lit_4853); +COMPILER_STRIP_GATE(0x808701A0, &lit_4853); #pragma pop /* 808701A4-808701A8 000110 0004+00 0/2 0/0 0/0 .rodata @4854 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4854 = -30.0f; -COMPILER_STRIP_GATE(808701A4, &lit_4854); +COMPILER_STRIP_GATE(0x808701A4, &lit_4854); #pragma pop /* 808701A8-808701AC 000114 0004+00 0/2 0/0 0/0 .rodata @4855 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4855 = 220.0f; -COMPILER_STRIP_GATE(808701A8, &lit_4855); +COMPILER_STRIP_GATE(0x808701A8, &lit_4855); #pragma pop /* 808701AC-808701B0 000118 0004+00 0/2 0/0 0/0 .rodata @4856 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4856 = -450.0f; -COMPILER_STRIP_GATE(808701AC, &lit_4856); +COMPILER_STRIP_GATE(0x808701AC, &lit_4856); #pragma pop /* 808701B0-808701B4 00011C 0004+00 0/1 0/0 0/0 .rodata @4857 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4857 = -250.0f; -COMPILER_STRIP_GATE(808701B0, &lit_4857); +COMPILER_STRIP_GATE(0x808701B0, &lit_4857); #pragma pop /* 808701B4-808701B8 000120 0004+00 0/1 0/0 0/0 .rodata @4858 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4858 = 325.0f; -COMPILER_STRIP_GATE(808701B4, &lit_4858); +COMPILER_STRIP_GATE(0x808701B4, &lit_4858); #pragma pop /* 808701B8-808701BC 000124 0004+00 0/1 0/0 0/0 .rodata @4859 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4859 = 237.0f; -COMPILER_STRIP_GATE(808701B8, &lit_4859); +COMPILER_STRIP_GATE(0x808701B8, &lit_4859); #pragma pop /* 808701BC-808701C0 000128 0004+00 0/1 0/0 0/0 .rodata @4860 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4860 = 1300.0f; -COMPILER_STRIP_GATE(808701BC, &lit_4860); +COMPILER_STRIP_GATE(0x808701BC, &lit_4860); #pragma pop /* 808701C0-808701C4 00012C 0004+00 0/1 0/0 0/0 .rodata @4861 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4861 = 140.0f; -COMPILER_STRIP_GATE(808701C0, &lit_4861); +COMPILER_STRIP_GATE(0x808701C0, &lit_4861); #pragma pop /* 808701C4-808701CC 000130 0004+04 0/1 0/0 0/0 .rodata @4862 */ @@ -2482,14 +2482,14 @@ SECTION_RODATA static f32 const lit_4862[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(808701C4, &lit_4862); +COMPILER_STRIP_GATE(0x808701C4, &lit_4862); #pragma pop /* 808701CC-808701D4 000138 0008+00 1/3 0/0 0/0 .rodata @4864 */ SECTION_RODATA static u8 const lit_4864[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(808701CC, &lit_4864); +COMPILER_STRIP_GATE(0x808701CC, &lit_4864); /* 8086DA00-8086E6C4 001A80 0CC4+00 2/1 0/0 0/0 .text daFshop_Execute__FP11fshop_class */ #pragma push @@ -2507,6 +2507,13 @@ static bool daFshop_IsDelete(fshop_class* param_0) { return true; } +/* ############################################################################################## */ +/* 8087027C-8087027C 0001E8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8087027C = "Fshop"; +#pragma pop + /* 8086E6CC-8086E7F0 00274C 0124+00 1/0 0/0 0/0 .text daFshop_Delete__FP11fshop_class */ #pragma push #pragma optimization_level 0 @@ -2563,133 +2570,133 @@ static asm void koro2_heapinit(fopAc_ac_c* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5206 = -370.0f; -COMPILER_STRIP_GATE(808701D4, &lit_5206); +COMPILER_STRIP_GATE(0x808701D4, &lit_5206); #pragma pop /* 808701D8-808701DC 000144 0004+00 0/1 0/0 0/0 .rodata @5207 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5207 = 16.0f; -COMPILER_STRIP_GATE(808701D8, &lit_5207); +COMPILER_STRIP_GATE(0x808701D8, &lit_5207); #pragma pop /* 808701DC-808701E0 000148 0004+00 0/2 0/0 0/0 .rodata @5208 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5208 = 215.0f; -COMPILER_STRIP_GATE(808701DC, &lit_5208); +COMPILER_STRIP_GATE(0x808701DC, &lit_5208); #pragma pop /* 808701E0-808701E4 00014C 0004+00 0/1 0/0 0/0 .rodata @5209 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5209 = 43.0f; -COMPILER_STRIP_GATE(808701E0, &lit_5209); +COMPILER_STRIP_GATE(0x808701E0, &lit_5209); #pragma pop /* 808701E4-808701E8 000150 0004+00 0/1 0/0 0/0 .rodata @5210 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5210 = 593.0f; -COMPILER_STRIP_GATE(808701E4, &lit_5210); +COMPILER_STRIP_GATE(0x808701E4, &lit_5210); #pragma pop /* 808701E8-808701EC 000154 0004+00 0/1 0/0 0/0 .rodata @5211 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5211 = 32768.0f; -COMPILER_STRIP_GATE(808701E8, &lit_5211); +COMPILER_STRIP_GATE(0x808701E8, &lit_5211); #pragma pop /* 808701EC-808701F0 000158 0004+00 0/1 0/0 0/0 .rodata @5212 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5212 = 3.0f / 10.0f; -COMPILER_STRIP_GATE(808701EC, &lit_5212); +COMPILER_STRIP_GATE(0x808701EC, &lit_5212); #pragma pop /* 808701F0-808701F4 00015C 0004+00 0/1 0/0 0/0 .rodata @5213 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_5213 = 0x403F5C29; -COMPILER_STRIP_GATE(808701F0, &lit_5213); +COMPILER_STRIP_GATE(0x808701F0, &lit_5213); #pragma pop /* 808701F4-808701F8 000160 0004+00 0/1 0/0 0/0 .rodata @5214 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_5214 = 0x3F3851EB; -COMPILER_STRIP_GATE(808701F4, &lit_5214); +COMPILER_STRIP_GATE(0x808701F4, &lit_5214); #pragma pop /* 808701F8-808701FC 000164 0004+00 0/1 0/0 0/0 .rodata @5215 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_5215 = 0x3FFEB852; -COMPILER_STRIP_GATE(808701F8, &lit_5215); +COMPILER_STRIP_GATE(0x808701F8, &lit_5215); #pragma pop /* 808701FC-80870200 000168 0004+00 0/1 0/0 0/0 .rodata @5216 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5216 = -685.0f; -COMPILER_STRIP_GATE(808701FC, &lit_5216); +COMPILER_STRIP_GATE(0x808701FC, &lit_5216); #pragma pop /* 80870200-80870204 00016C 0004+00 0/1 0/0 0/0 .rodata @5217 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5217 = 18.0f; -COMPILER_STRIP_GATE(80870200, &lit_5217); +COMPILER_STRIP_GATE(0x80870200, &lit_5217); #pragma pop /* 80870204-80870208 000170 0004+00 0/1 0/0 0/0 .rodata @5218 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5218 = 565.0f; -COMPILER_STRIP_GATE(80870204, &lit_5218); +COMPILER_STRIP_GATE(0x80870204, &lit_5218); #pragma pop /* 80870208-8087020C 000174 0004+00 0/1 0/0 0/0 .rodata @5219 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5219 = 177.0f; -COMPILER_STRIP_GATE(80870208, &lit_5219); +COMPILER_STRIP_GATE(0x80870208, &lit_5219); #pragma pop /* 8087020C-80870210 000178 0004+00 0/1 0/0 0/0 .rodata @5220 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5220 = 290.0f; -COMPILER_STRIP_GATE(8087020C, &lit_5220); +COMPILER_STRIP_GATE(0x8087020C, &lit_5220); #pragma pop /* 80870210-80870214 00017C 0004+00 0/1 0/0 0/0 .rodata @5221 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5221 = 550.0f; -COMPILER_STRIP_GATE(80870210, &lit_5221); +COMPILER_STRIP_GATE(0x80870210, &lit_5221); #pragma pop /* 80870214-80870218 000180 0004+00 0/1 0/0 0/0 .rodata @5222 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5222 = 560.0f; -COMPILER_STRIP_GATE(80870214, &lit_5222); +COMPILER_STRIP_GATE(0x80870214, &lit_5222); #pragma pop /* 80870218-8087021C 000184 0004+00 0/1 0/0 0/0 .rodata @5223 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5223 = -16384.0f; -COMPILER_STRIP_GATE(80870218, &lit_5223); +COMPILER_STRIP_GATE(0x80870218, &lit_5223); #pragma pop /* 8087021C-80870220 000188 0004+00 0/2 0/0 0/0 .rodata @5224 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5224 = 2000.0f; -COMPILER_STRIP_GATE(8087021C, &lit_5224); +COMPILER_STRIP_GATE(0x8087021C, &lit_5224); #pragma pop /* 8087084C-8087085C 0005C8 0010+00 0/1 0/0 0/0 .data lure_d$5019 */ @@ -2763,98 +2770,98 @@ SECTION_RODATA static u8 const lit_5249[32] = { 0x00, 0x00, 0x84, 0xA0, 0x00, 0x00, 0x9A, 0xC0, 0x00, 0x00, 0xB4, 0x40, 0x00, 0x00, 0xE1, 0x00, 0x00, 0x00, 0x82, 0x20, 0x00, 0x00, 0x9A, 0x40, 0x00, 0x00, 0x64, 0xE0, 0x00, 0x00, 0xA9, 0xE0, }; -COMPILER_STRIP_GATE(80870220, &lit_5249); +COMPILER_STRIP_GATE(0x80870220, &lit_5249); #pragma pop /* 80870240-80870244 0001AC 0004+00 0/1 0/0 0/0 .rodata @5476 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5476 = 9.0f; -COMPILER_STRIP_GATE(80870240, &lit_5476); +COMPILER_STRIP_GATE(0x80870240, &lit_5476); #pragma pop /* 80870244-80870248 0001B0 0004+00 0/1 0/0 0/0 .rodata @5477 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5477 = 11.0f; -COMPILER_STRIP_GATE(80870244, &lit_5477); +COMPILER_STRIP_GATE(0x80870244, &lit_5477); #pragma pop /* 80870248-8087024C 0001B4 0004+00 0/1 0/0 0/0 .rodata @5478 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5478 = 20.0f; -COMPILER_STRIP_GATE(80870248, &lit_5478); +COMPILER_STRIP_GATE(0x80870248, &lit_5478); #pragma pop /* 8087024C-80870250 0001B8 0004+00 0/1 0/0 0/0 .rodata @5479 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5479 = 67.0f; -COMPILER_STRIP_GATE(8087024C, &lit_5479); +COMPILER_STRIP_GATE(0x8087024C, &lit_5479); #pragma pop /* 80870250-80870254 0001BC 0004+00 0/1 0/0 0/0 .rodata @5480 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5480 = 9.0f / 10.0f; -COMPILER_STRIP_GATE(80870250, &lit_5480); +COMPILER_STRIP_GATE(0x80870250, &lit_5480); #pragma pop /* 80870254-80870258 0001C0 0004+00 0/1 0/0 0/0 .rodata @5481 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5481 = 3.0f / 5.0f; -COMPILER_STRIP_GATE(80870254, &lit_5481); +COMPILER_STRIP_GATE(0x80870254, &lit_5481); #pragma pop /* 80870258-8087025C 0001C4 0004+00 0/1 0/0 0/0 .rodata @5482 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5482 = 127.0f / 50.0f; -COMPILER_STRIP_GATE(80870258, &lit_5482); +COMPILER_STRIP_GATE(0x80870258, &lit_5482); #pragma pop /* 8087025C-80870260 0001C8 0004+00 0/1 0/0 0/0 .rodata @5483 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5483 = -648.0f; -COMPILER_STRIP_GATE(8087025C, &lit_5483); +COMPILER_STRIP_GATE(0x8087025C, &lit_5483); #pragma pop /* 80870260-80870264 0001CC 0004+00 0/1 0/0 0/0 .rodata @5484 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5484 = 380.0f; -COMPILER_STRIP_GATE(80870260, &lit_5484); +COMPILER_STRIP_GATE(0x80870260, &lit_5484); #pragma pop /* 80870264-80870268 0001D0 0004+00 0/1 0/0 0/0 .rodata @5485 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5485 = -131.0f; -COMPILER_STRIP_GATE(80870264, &lit_5485); +COMPILER_STRIP_GATE(0x80870264, &lit_5485); #pragma pop /* 80870268-8087026C 0001D4 0004+00 0/1 0/0 0/0 .rodata @5486 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5486 = 3000.0f; -COMPILER_STRIP_GATE(80870268, &lit_5486); +COMPILER_STRIP_GATE(0x80870268, &lit_5486); #pragma pop /* 8087026C-80870270 0001D8 0004+00 0/1 0/0 0/0 .rodata @5487 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5487 = -4500.0f; -COMPILER_STRIP_GATE(8087026C, &lit_5487); +COMPILER_STRIP_GATE(0x8087026C, &lit_5487); #pragma pop /* 80870270-80870274 0001DC 0004+00 0/1 0/0 0/0 .rodata @5488 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5488 = -878.0f; -COMPILER_STRIP_GATE(80870270, &lit_5488); +COMPILER_STRIP_GATE(0x80870270, &lit_5488); #pragma pop /* 80870274-8087027C 0001E0 0008+00 0/1 0/0 0/0 .rodata @5490 */ @@ -2863,7 +2870,7 @@ COMPILER_STRIP_GATE(80870270, &lit_5488); SECTION_RODATA static u8 const lit_5490[8] = { 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80870274, &lit_5490); +COMPILER_STRIP_GATE(0x80870274, &lit_5490); #pragma pop /* 808708B4-808708BC 000630 0008+00 1/1 0/0 0/0 .data check_kind$5285 */ @@ -3050,7 +3057,7 @@ asm void __sinit_d_a_mg_fshop_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_8087001C = (void*)__sinit_d_a_mg_fshop_cpp; +REGISTER_CTORS(0x8087001C, __sinit_d_a_mg_fshop_cpp); #pragma pop /* 80870070-80870078 0040F0 0008+00 1/0 0/0 0/0 .text @36@__dt__12dBgS_ObjAcchFv */ @@ -3245,9 +3252,4 @@ static u8 data_80870B24[4]; static u8 data_80870B28[4]; #pragma pop -/* 8087027C-80870282 0001E8 0006+00 5/5 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_8087027C = "Fshop"; -#pragma pop +/* 8087027C-8087027C 0001E8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/d_a_mg_rod/d_a_mg_rod.cpp b/rel/d/a/d_a_mg_rod/d_a_mg_rod.cpp index 4686388e73f..52d84c3bf43 100644 --- a/rel/d/a/d_a_mg_rod/d_a_mg_rod.cpp +++ b/rel/d/a/d_a_mg_rod/d_a_mg_rod.cpp @@ -667,52 +667,52 @@ extern "C" void actionInitWait2__11daObjLife_cFv(); SECTION_RODATA static u8 const lit_3879[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(804BB534, &lit_3879); +COMPILER_STRIP_GATE(0x804BB534, &lit_3879); /* 804BB540-804BB544 00000C 0004+00 1/34 0/0 0/0 .rodata @4285 */ SECTION_RODATA static f32 const lit_4285 = 1.0f; -COMPILER_STRIP_GATE(804BB540, &lit_4285); +COMPILER_STRIP_GATE(0x804BB540, &lit_4285); /* 804BB544-804BB548 000010 0004+00 0/8 0/0 0/0 .rodata @4286 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4286 = 3.0f / 10.0f; -COMPILER_STRIP_GATE(804BB544, &lit_4286); +COMPILER_STRIP_GATE(0x804BB544, &lit_4286); #pragma pop /* 804BB548-804BB54C 000014 0004+00 0/6 0/0 0/0 .rodata @4287 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4287 = 7.0f / 10.0f; -COMPILER_STRIP_GATE(804BB548, &lit_4287); +COMPILER_STRIP_GATE(0x804BB548, &lit_4287); #pragma pop /* 804BB54C-804BB550 000018 0004+00 0/1 0/0 0/0 .rodata @4288 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4288 = -7.0f; -COMPILER_STRIP_GATE(804BB54C, &lit_4288); +COMPILER_STRIP_GATE(0x804BB54C, &lit_4288); #pragma pop /* 804BB550-804BB554 00001C 0004+00 0/6 0/0 0/0 .rodata @4289 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4289 = 35.0f; -COMPILER_STRIP_GATE(804BB550, &lit_4289); +COMPILER_STRIP_GATE(0x804BB550, &lit_4289); #pragma pop /* 804BB554-804BB558 000020 0004+00 0/6 0/0 0/0 .rodata @4290 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4290 = 4.0f / 5.0f; -COMPILER_STRIP_GATE(804BB554, &lit_4290); +COMPILER_STRIP_GATE(0x804BB554, &lit_4290); #pragma pop /* 804BB558-804BB55C 000024 0004+00 0/7 0/0 0/0 .rodata @4291 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4291 = 1.5f; -COMPILER_STRIP_GATE(804BB558, &lit_4291); +COMPILER_STRIP_GATE(0x804BB558, &lit_4291); #pragma pop /* 804BB850-804BB85C 000000 000C+00 4/4 0/0 0/0 .data cNullVec__6Z2Calc */ @@ -1145,7 +1145,7 @@ asm dmg_rod_HIO_c::dmg_rod_HIO_c() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4325 = 13.0f / 10.0f; -COMPILER_STRIP_GATE(804BB55C, &lit_4325); +COMPILER_STRIP_GATE(0x804BB55C, &lit_4325); #pragma pop /* 804A964C-804A9734 00014C 00E8+00 1/1 0/0 0/0 .text frog_nodeCallBack__FP8J3DJointi */ @@ -1191,7 +1191,7 @@ static asm void Worm_nodeCallBack(J3DJoint* param_0, int param_1) { /* ############################################################################################## */ /* 804BB560-804BB564 00002C 0004+00 1/5 0/0 0/0 .rodata @4545 */ SECTION_RODATA static f32 const lit_4545 = 5000.0f; -COMPILER_STRIP_GATE(804BB560, &lit_4545); +COMPILER_STRIP_GATE(0x804BB560, &lit_4545); /* 804A99E0-804A9EAC 0004E0 04CC+00 1/0 0/0 0/0 .text dmg_rod_Draw__FP13dmg_rod_class */ #pragma push @@ -1208,67 +1208,67 @@ static asm void dmg_rod_Draw(dmg_rod_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4872 = -50.0f; -COMPILER_STRIP_GATE(804BB564, &lit_4872); +COMPILER_STRIP_GATE(0x804BB564, &lit_4872); #pragma pop /* 804BB568-804BB56C 000034 0004+00 0/4 0/0 0/0 .rodata @4873 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4873 = -20.0f; -COMPILER_STRIP_GATE(804BB568, &lit_4873); +COMPILER_STRIP_GATE(0x804BB568, &lit_4873); #pragma pop /* 804BB56C-804BB570 000038 0004+00 0/1 0/0 0/0 .rodata @4874 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4874 = -70.0f; -COMPILER_STRIP_GATE(804BB56C, &lit_4874); +COMPILER_STRIP_GATE(0x804BB56C, &lit_4874); #pragma pop /* 804BB570-804BB574 00003C 0004+00 0/1 0/0 0/0 .rodata @4875 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4875 = -33.0f; -COMPILER_STRIP_GATE(804BB570, &lit_4875); +COMPILER_STRIP_GATE(0x804BB570, &lit_4875); #pragma pop /* 804BB574-804BB578 000040 0004+00 1/9 0/0 0/0 .rodata @4876 */ SECTION_RODATA static f32 const lit_4876 = 30.0f; -COMPILER_STRIP_GATE(804BB574, &lit_4876); +COMPILER_STRIP_GATE(0x804BB574, &lit_4876); /* 804BB578-804BB57C 000044 0004+00 0/1 0/0 0/0 .rodata @4877 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4877 = 115.0f; -COMPILER_STRIP_GATE(804BB578, &lit_4877); +COMPILER_STRIP_GATE(0x804BB578, &lit_4877); #pragma pop /* 804BB57C-804BB580 000048 0004+00 0/8 0/0 0/0 .rodata @4878 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4878 = -30.0f; -COMPILER_STRIP_GATE(804BB57C, &lit_4878); +COMPILER_STRIP_GATE(0x804BB57C, &lit_4878); #pragma pop /* 804BB580-804BB584 00004C 0004+00 0/12 0/0 0/0 .rodata @4879 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4879 = 1000.0f; -COMPILER_STRIP_GATE(804BB580, &lit_4879); +COMPILER_STRIP_GATE(0x804BB580, &lit_4879); #pragma pop /* 804BB584-804BB588 000050 0004+00 0/20 0/0 0/0 .rodata @4880 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4880 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(804BB584, &lit_4880); +COMPILER_STRIP_GATE(0x804BB584, &lit_4880); #pragma pop /* 804BB588-804BB58C 000054 0004+00 0/2 0/0 0/0 .rodata @4881 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4881 = 6.0f / 5.0f; -COMPILER_STRIP_GATE(804BB588, &lit_4881); +COMPILER_STRIP_GATE(0x804BB588, &lit_4881); #pragma pop /* 804BB58C-804BB590 000058 0004+00 2/37 0/0 0/0 .rodata @4882 */ @@ -1278,66 +1278,66 @@ SECTION_RODATA static u8 const lit_4882[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(804BB58C, &lit_4882); +COMPILER_STRIP_GATE(0x804BB58C, &lit_4882); /* 804BB590-804BB594 00005C 0004+00 0/13 0/0 0/0 .rodata @4883 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4883 = 3.0f; -COMPILER_STRIP_GATE(804BB590, &lit_4883); +COMPILER_STRIP_GATE(0x804BB590, &lit_4883); #pragma pop /* 804BB594-804BB598 000060 0004+00 0/16 0/0 0/0 .rodata @4884 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4884 = 5.0f; -COMPILER_STRIP_GATE(804BB594, &lit_4884); +COMPILER_STRIP_GATE(0x804BB594, &lit_4884); #pragma pop /* 804BB598-804BB59C 000064 0004+00 0/1 0/0 0/0 .rodata @4885 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4885 = -5.5f; -COMPILER_STRIP_GATE(804BB598, &lit_4885); +COMPILER_STRIP_GATE(0x804BB598, &lit_4885); #pragma pop /* 804BB59C-804BB5A0 000068 0004+00 1/6 0/0 0/0 .rodata @4886 */ SECTION_RODATA static f32 const lit_4886 = -1.0f; -COMPILER_STRIP_GATE(804BB59C, &lit_4886); +COMPILER_STRIP_GATE(0x804BB59C, &lit_4886); /* 804BB5A0-804BB5A4 00006C 0004+00 0/9 0/0 0/0 .rodata @4887 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4887 = -10.0f; -COMPILER_STRIP_GATE(804BB5A0, &lit_4887); +COMPILER_STRIP_GATE(0x804BB5A0, &lit_4887); #pragma pop /* 804BB5A4-804BB5A8 000070 0004+00 0/1 0/0 0/0 .rodata @4888 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4888 = 16.0f; -COMPILER_STRIP_GATE(804BB5A4, &lit_4888); +COMPILER_STRIP_GATE(0x804BB5A4, &lit_4888); #pragma pop /* 804BB5A8-804BB5AC 000074 0004+00 0/7 0/0 0/0 .rodata @4889 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4889 = 300.0f; -COMPILER_STRIP_GATE(804BB5A8, &lit_4889); +COMPILER_STRIP_GATE(0x804BB5A8, &lit_4889); #pragma pop /* 804BB5AC-804BB5B0 000078 0004+00 0/20 0/0 0/0 .rodata @4890 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4890 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(804BB5AC, &lit_4890); +COMPILER_STRIP_GATE(0x804BB5AC, &lit_4890); #pragma pop /* 804BB5B0-804BB5B4 00007C 0004+00 0/1 0/0 0/0 .rodata @4891 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4891 = 0x3D539970; -COMPILER_STRIP_GATE(804BB5B0, &lit_4891); +COMPILER_STRIP_GATE(0x804BB5B0, &lit_4891); #pragma pop /* 804BB5B4-804BB5BC 000080 0008+00 0/15 0/0 0/0 .rodata @4892 */ @@ -1346,7 +1346,7 @@ COMPILER_STRIP_GATE(804BB5B0, &lit_4891); SECTION_RODATA static u8 const lit_4892[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(804BB5B4, &lit_4892); +COMPILER_STRIP_GATE(0x804BB5B4, &lit_4892); #pragma pop /* 804BB5BC-804BB5C4 000088 0008+00 0/15 0/0 0/0 .rodata @4893 */ @@ -1355,7 +1355,7 @@ COMPILER_STRIP_GATE(804BB5B4, &lit_4892); SECTION_RODATA static u8 const lit_4893[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(804BB5BC, &lit_4893); +COMPILER_STRIP_GATE(0x804BB5BC, &lit_4893); #pragma pop /* 804BB5C4-804BB5CC 000090 0008+00 0/15 0/0 0/0 .rodata @4894 */ @@ -1364,21 +1364,21 @@ COMPILER_STRIP_GATE(804BB5BC, &lit_4893); SECTION_RODATA static u8 const lit_4894[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(804BB5C4, &lit_4894); +COMPILER_STRIP_GATE(0x804BB5C4, &lit_4894); #pragma pop /* 804BB5CC-804BB5D0 000098 0004+00 0/1 0/0 0/0 .rodata @4895 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4895 = 0x3D958106; -COMPILER_STRIP_GATE(804BB5CC, &lit_4895); +COMPILER_STRIP_GATE(0x804BB5CC, &lit_4895); #pragma pop /* 804BB5D0-804BB5D4 00009C 0004+00 0/24 0/0 0/0 .rodata @4896 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4896 = 0.5f; -COMPILER_STRIP_GATE(804BB5D0, &lit_4896); +COMPILER_STRIP_GATE(0x804BB5D0, &lit_4896); #pragma pop /* 804BB5D4-804BB5DC 0000A0 0008+00 0/6 0/0 0/0 .rodata @4898 */ @@ -1387,7 +1387,7 @@ COMPILER_STRIP_GATE(804BB5D0, &lit_4896); SECTION_RODATA static u8 const lit_4898[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(804BB5D4, &lit_4898); +COMPILER_STRIP_GATE(0x804BB5D4, &lit_4898); #pragma pop /* 804BB5DC-804BB5E4 0000A8 0008+00 0/4 0/0 0/0 .rodata @4902 */ @@ -1396,7 +1396,7 @@ COMPILER_STRIP_GATE(804BB5D4, &lit_4898); SECTION_RODATA static u8 const lit_4902[8] = { 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(804BB5DC, &lit_4902); +COMPILER_STRIP_GATE(0x804BB5DC, &lit_4902); #pragma pop /* 804A9EAC-804AAB78 0009AC 0CCC+00 1/1 0/0 0/0 .text rod_control__FP13dmg_rod_class */ @@ -1424,25 +1424,25 @@ static asm void rod_main(dmg_rod_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5034 = 500.0f; -COMPILER_STRIP_GATE(804BB5E4, &lit_5034); +COMPILER_STRIP_GATE(0x804BB5E4, &lit_5034); #pragma pop /* 804BB5E8-804BB5EC 0000B4 0004+00 3/19 0/0 0/0 .rodata @5035 */ SECTION_RODATA static f32 const lit_5035 = 50.0f; -COMPILER_STRIP_GATE(804BB5E8, &lit_5035); +COMPILER_STRIP_GATE(0x804BB5E8, &lit_5035); /* 804BB5EC-804BB5F0 0000B8 0004+00 0/18 0/0 0/0 .rodata @5036 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5036 = 2.0f; -COMPILER_STRIP_GATE(804BB5EC, &lit_5036); +COMPILER_STRIP_GATE(0x804BB5EC, &lit_5036); #pragma pop /* 804BB5F0-804BB5F4 0000BC 0004+00 0/3 0/0 0/0 .rodata @5037 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5037 = 0.25f; -COMPILER_STRIP_GATE(804BB5F0, &lit_5037); +COMPILER_STRIP_GATE(0x804BB5F0, &lit_5037); #pragma pop /* 804BBB90-804BBB94 000008 0001+03 7/7 0/0 0/0 .bss @1109 */ @@ -1587,27 +1587,27 @@ asm cM3dGPla::~cM3dGPla() { /* ############################################################################################## */ /* 804BB5F4-804BB5F8 0000C0 0004+00 1/13 0/0 0/0 .rodata @5172 */ SECTION_RODATA static f32 const lit_5172 = 100.0f; -COMPILER_STRIP_GATE(804BB5F4, &lit_5172); +COMPILER_STRIP_GATE(0x804BB5F4, &lit_5172); /* 804BB5F8-804BB5FC 0000C4 0004+00 0/7 0/0 0/0 .rodata @5173 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5173 = 1.0f / 20.0f; -COMPILER_STRIP_GATE(804BB5F8, &lit_5173); +COMPILER_STRIP_GATE(0x804BB5F8, &lit_5173); #pragma pop /* 804BB5FC-804BB600 0000C8 0004+00 0/2 0/0 0/0 .rodata @5174 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5174 = 19.0f / 20.0f; -COMPILER_STRIP_GATE(804BB5FC, &lit_5174); +COMPILER_STRIP_GATE(0x804BB5FC, &lit_5174); #pragma pop /* 804BB600-804BB604 0000CC 0004+00 0/6 0/0 0/0 .rodata @5175 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5175 = 1.0f / 50.0f; -COMPILER_STRIP_GATE(804BB600, &lit_5175); +COMPILER_STRIP_GATE(0x804BB600, &lit_5175); #pragma pop /* 804AB064-804AB588 001B64 0524+00 1/1 0/0 0/0 .text line_control2__FP13dmg_rod_class */ @@ -1625,77 +1625,77 @@ static asm void line_control2(dmg_rod_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5362 = 20.0f; -COMPILER_STRIP_GATE(804BB604, &lit_5362); +COMPILER_STRIP_GATE(0x804BB604, &lit_5362); #pragma pop /* 804BB608-804BB60C 0000D4 0004+00 0/2 0/0 0/0 .rodata @5363 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5363 = 700.0f; -COMPILER_STRIP_GATE(804BB608, &lit_5363); +COMPILER_STRIP_GATE(0x804BB608, &lit_5363); #pragma pop /* 804BB60C-804BB610 0000D8 0004+00 0/4 0/0 0/0 .rodata @5364 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5364 = 2.0f / 5.0f; -COMPILER_STRIP_GATE(804BB60C, &lit_5364); +COMPILER_STRIP_GATE(0x804BB60C, &lit_5364); #pragma pop /* 804BB610-804BB614 0000DC 0004+00 0/6 0/0 0/0 .rodata @5365 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5365 = 1.0f / 100.0f; -COMPILER_STRIP_GATE(804BB610, &lit_5365); +COMPILER_STRIP_GATE(0x804BB610, &lit_5365); #pragma pop /* 804BB614-804BB618 0000E0 0004+00 0/3 0/0 0/0 .rodata @5366 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5366 = 40.0f; -COMPILER_STRIP_GATE(804BB614, &lit_5366); +COMPILER_STRIP_GATE(0x804BB614, &lit_5366); #pragma pop /* 804BB618-804BB61C 0000E4 0004+00 0/8 0/0 0/0 .rodata @5367 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5367 = 2000.0f; -COMPILER_STRIP_GATE(804BB618, &lit_5367); +COMPILER_STRIP_GATE(0x804BB618, &lit_5367); #pragma pop /* 804BB61C-804BB620 0000E8 0004+00 0/3 0/0 0/0 .rodata @5368 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5368 = 60.0f; -COMPILER_STRIP_GATE(804BB61C, &lit_5368); +COMPILER_STRIP_GATE(0x804BB61C, &lit_5368); #pragma pop /* 804BB620-804BB624 0000EC 0004+00 0/2 0/0 0/0 .rodata @5369 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_5369 = 0x3B449BA6; -COMPILER_STRIP_GATE(804BB620, &lit_5369); +COMPILER_STRIP_GATE(0x804BB620, &lit_5369); #pragma pop /* 804BB624-804BB628 0000F0 0004+00 0/2 0/0 0/0 .rodata @5370 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5370 = 70.0f; -COMPILER_STRIP_GATE(804BB624, &lit_5370); +COMPILER_STRIP_GATE(0x804BB624, &lit_5370); #pragma pop /* 804BB628-804BB62C 0000F4 0004+00 0/1 0/0 0/0 .rodata @5371 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5371 = 7.0f / 100.0f; -COMPILER_STRIP_GATE(804BB628, &lit_5371); +COMPILER_STRIP_GATE(0x804BB628, &lit_5371); #pragma pop /* 804BB62C-804BB630 0000F8 0004+00 0/1 0/0 0/0 .rodata @5372 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5372 = 2.0f / 25.0f; -COMPILER_STRIP_GATE(804BB62C, &lit_5372); +COMPILER_STRIP_GATE(0x804BB62C, &lit_5372); #pragma pop /* 804AB588-804ABCE0 002088 0758+00 1/1 0/0 0/0 .text line_control1_u__FP13dmg_rod_class @@ -1778,14 +1778,14 @@ static asm void s_boat_sub(void* param_0, void* param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5543 = 0.125f; -COMPILER_STRIP_GATE(804BB630, &lit_5543); +COMPILER_STRIP_GATE(0x804BB630, &lit_5543); #pragma pop /* 804BB634-804BB638 000100 0004+00 0/8 0/0 0/0 .rodata @5544 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5544 = 15.0f; -COMPILER_STRIP_GATE(804BB634, &lit_5544); +COMPILER_STRIP_GATE(0x804BB634, &lit_5544); #pragma pop /* 804AC228-804AC41C 002D28 01F4+00 1/1 0/0 0/0 .text lure_onboat__FP13dmg_rod_class */ @@ -1803,56 +1803,56 @@ static asm void lure_onboat(dmg_rod_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5745 = 11.0f / 40.0f; -COMPILER_STRIP_GATE(804BB638, &lit_5745); +COMPILER_STRIP_GATE(0x804BB638, &lit_5745); #pragma pop /* 804BB63C-804BB640 000108 0004+00 0/1 0/0 0/0 .rodata @5746 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5746 = -14000.0f; -COMPILER_STRIP_GATE(804BB63C, &lit_5746); +COMPILER_STRIP_GATE(0x804BB63C, &lit_5746); #pragma pop /* 804BB640-804BB644 00010C 0004+00 0/5 0/0 0/0 .rodata @5747 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5747 = 7000.0f; -COMPILER_STRIP_GATE(804BB640, &lit_5747); +COMPILER_STRIP_GATE(0x804BB640, &lit_5747); #pragma pop /* 804BB644-804BB648 000110 0004+00 0/2 0/0 0/0 .rodata @5748 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5748 = 3.0f / 5.0f; -COMPILER_STRIP_GATE(804BB644, &lit_5748); +COMPILER_STRIP_GATE(0x804BB644, &lit_5748); #pragma pop /* 804BB648-804BB64C 000114 0004+00 0/1 0/0 0/0 .rodata @5749 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_5749 = 0x3BA3D70A; -COMPILER_STRIP_GATE(804BB648, &lit_5749); +COMPILER_STRIP_GATE(0x804BB648, &lit_5749); #pragma pop /* 804BB64C-804BB650 000118 0004+00 0/2 0/0 0/0 .rodata @5750 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5750 = -100.0f; -COMPILER_STRIP_GATE(804BB64C, &lit_5750); +COMPILER_STRIP_GATE(0x804BB64C, &lit_5750); #pragma pop /* 804BB650-804BB654 00011C 0004+00 0/3 0/0 0/0 .rodata @5751 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5751 = -40.0f; -COMPILER_STRIP_GATE(804BB650, &lit_5751); +COMPILER_STRIP_GATE(0x804BB650, &lit_5751); #pragma pop /* 804BB654-804BB658 000120 0004+00 0/2 0/0 0/0 .rodata @5752 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5752 = 25.0f; -COMPILER_STRIP_GATE(804BB654, &lit_5752); +COMPILER_STRIP_GATE(0x804BB654, &lit_5752); #pragma pop /* 804AC41C-804ACB94 002F1C 0778+00 1/1 0/0 0/0 .text lure_standby__FP13dmg_rod_class */ @@ -1880,49 +1880,49 @@ static asm void lure_bound_se_set(dmg_rod_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_5913 = 0x3C2C0831; -COMPILER_STRIP_GATE(804BB658, &lit_5913); +COMPILER_STRIP_GATE(0x804BB658, &lit_5913); #pragma pop /* 804BB65C-804BB660 000128 0004+00 0/1 0/0 0/0 .rodata @5914 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_5914 = 0x3C343958; -COMPILER_STRIP_GATE(804BB65C, &lit_5914); +COMPILER_STRIP_GATE(0x804BB65C, &lit_5914); #pragma pop /* 804BB660-804BB664 00012C 0004+00 0/2 0/0 0/0 .rodata @5915 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5915 = -2.0f; -COMPILER_STRIP_GATE(804BB660, &lit_5915); +COMPILER_STRIP_GATE(0x804BB660, &lit_5915); #pragma pop /* 804BB664-804BB668 000130 0004+00 0/3 0/0 0/0 .rodata @5916 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5916 = 3000.0f; -COMPILER_STRIP_GATE(804BB664, &lit_5916); +COMPILER_STRIP_GATE(0x804BB664, &lit_5916); #pragma pop /* 804BB668-804BB66C 000134 0004+00 0/6 0/0 0/0 .rodata @5917 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5917 = -5.0f; -COMPILER_STRIP_GATE(804BB668, &lit_5917); +COMPILER_STRIP_GATE(0x804BB668, &lit_5917); #pragma pop /* 804BB66C-804BB670 000138 0004+00 0/1 0/0 0/0 .rodata @5918 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5918 = 12000.0f; -COMPILER_STRIP_GATE(804BB66C, &lit_5918); +COMPILER_STRIP_GATE(0x804BB66C, &lit_5918); #pragma pop /* 804BB670-804BB674 00013C 0004+00 0/5 0/0 0/0 .rodata @5919 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5919 = 4000.0f; -COMPILER_STRIP_GATE(804BB670, &lit_5919); +COMPILER_STRIP_GATE(0x804BB670, &lit_5919); #pragma pop /* 804ACC1C-804AD46C 00371C 0850+00 1/1 0/0 0/0 .text lure_cast__FP13dmg_rod_class */ @@ -1961,7 +1961,7 @@ static asm void s_wd_sub(void* param_0, void* param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6020 = 22.0f; -COMPILER_STRIP_GATE(804BB674, &lit_6020); +COMPILER_STRIP_GATE(0x804BB674, &lit_6020); #pragma pop /* 804AD5F8-804AD7C0 0040F8 01C8+00 1/1 0/0 0/0 .text wd_check__FP13dmg_rod_class */ @@ -1979,14 +1979,14 @@ static asm void wd_check(dmg_rod_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6048 = 12.0f; -COMPILER_STRIP_GATE(804BB678, &lit_6048); +COMPILER_STRIP_GATE(0x804BB678, &lit_6048); #pragma pop /* 804BB67C-804BB680 000148 0004+00 0/5 0/0 0/0 .rodata @6049 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6049 = 6.0f; -COMPILER_STRIP_GATE(804BB67C, &lit_6049); +COMPILER_STRIP_GATE(0x804BB67C, &lit_6049); #pragma pop /* 804AD7C0-804AD918 0042C0 0158+00 1/1 0/0 0/0 .text fr_action__FP13dmg_rod_classf */ @@ -2004,28 +2004,28 @@ static asm void fr_action(dmg_rod_class* param_0, f32 param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6095 = 8.0f; -COMPILER_STRIP_GATE(804BB680, &lit_6095); +COMPILER_STRIP_GATE(0x804BB680, &lit_6095); #pragma pop /* 804BB684-804BB688 000150 0004+00 0/1 0/0 0/0 .rodata @6096 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6096 = 13000.0f; -COMPILER_STRIP_GATE(804BB684, &lit_6096); +COMPILER_STRIP_GATE(0x804BB684, &lit_6096); #pragma pop /* 804BB688-804BB68C 000154 0004+00 0/4 0/0 0/0 .rodata @6097 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6097 = 4.0f; -COMPILER_STRIP_GATE(804BB688, &lit_6097); +COMPILER_STRIP_GATE(0x804BB688, &lit_6097); #pragma pop /* 804BB68C-804BB690 000158 0004+00 0/4 0/0 0/0 .rodata @6098 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6098 = 400.0f; -COMPILER_STRIP_GATE(804BB68C, &lit_6098); +COMPILER_STRIP_GATE(0x804BB68C, &lit_6098); #pragma pop /* 804AD918-804ADB58 004418 0240+00 1/2 0/0 0/0 .text pe_action__FP13dmg_rod_classf */ @@ -2043,14 +2043,14 @@ static asm void pe_action(dmg_rod_class* param_0, f32 param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6141 = 10.0f; -COMPILER_STRIP_GATE(804BB690, &lit_6141); +COMPILER_STRIP_GATE(0x804BB690, &lit_6141); #pragma pop /* 804BB694-804BB698 000160 0004+00 0/1 0/0 0/0 .rodata @6142 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6142 = 127.0f; -COMPILER_STRIP_GATE(804BB694, &lit_6142); +COMPILER_STRIP_GATE(0x804BB694, &lit_6142); #pragma pop /* 804ADB58-804ADDD4 004658 027C+00 1/2 0/0 0/0 .text po_action__FP13dmg_rod_classf */ @@ -2068,28 +2068,28 @@ static asm void po_action(dmg_rod_class* param_0, f32 param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6183 = 15000.0f; -COMPILER_STRIP_GATE(804BB698, &lit_6183); +COMPILER_STRIP_GATE(0x804BB698, &lit_6183); #pragma pop /* 804BB69C-804BB6A0 000168 0004+00 0/1 0/0 0/0 .rodata @6184 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6184 = 10000.0f; -COMPILER_STRIP_GATE(804BB69C, &lit_6184); +COMPILER_STRIP_GATE(0x804BB69C, &lit_6184); #pragma pop /* 804BB6A0-804BB6A4 00016C 0004+00 0/1 0/0 0/0 .rodata @6185 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6185 = 1300.0f; -COMPILER_STRIP_GATE(804BB6A0, &lit_6185); +COMPILER_STRIP_GATE(0x804BB6A0, &lit_6185); #pragma pop /* 804BB6A4-804BB6A8 000170 0004+00 0/2 0/0 0/0 .rodata @6186 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6186 = 9.0f; -COMPILER_STRIP_GATE(804BB6A4, &lit_6186); +COMPILER_STRIP_GATE(0x804BB6A4, &lit_6186); #pragma pop /* 804ADDD4-804AE06C 0048D4 0298+00 1/1 0/0 0/0 .text ws_action__FP13dmg_rod_classf */ @@ -2107,28 +2107,28 @@ static asm void ws_action(dmg_rod_class* param_0, f32 param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6224 = -1.0f / 5.0f; -COMPILER_STRIP_GATE(804BB6A8, &lit_6224); +COMPILER_STRIP_GATE(0x804BB6A8, &lit_6224); #pragma pop /* 804BB6AC-804BB6B0 000178 0004+00 0/2 0/0 0/0 .rodata @6225 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6225 = -500.0f; -COMPILER_STRIP_GATE(804BB6AC, &lit_6225); +COMPILER_STRIP_GATE(0x804BB6AC, &lit_6225); #pragma pop /* 804BB6B0-804BB6B4 00017C 0004+00 0/4 0/0 0/0 .rodata @6226 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6226 = -200.0f; -COMPILER_STRIP_GATE(804BB6B0, &lit_6226); +COMPILER_STRIP_GATE(0x804BB6B0, &lit_6226); #pragma pop /* 804BB6B4-804BB6B8 000180 0004+00 0/1 0/0 0/0 .rodata @6227 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6227 = 28000.0f; -COMPILER_STRIP_GATE(804BB6B4, &lit_6227); +COMPILER_STRIP_GATE(0x804BB6B4, &lit_6227); #pragma pop /* 804AE06C-804AE250 004B6C 01E4+00 1/1 0/0 0/0 .text sp_action__FP13dmg_rod_classf */ @@ -2146,14 +2146,14 @@ static asm void sp_action(dmg_rod_class* param_0, f32 param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6321 = 32768.0f; -COMPILER_STRIP_GATE(804BB6B8, &lit_6321); +COMPILER_STRIP_GATE(0x804BB6B8, &lit_6321); #pragma pop /* 804BB6BC-804BB6C0 000188 0004+00 0/3 0/0 0/0 .rodata @6322 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6322 = 16000.0f; -COMPILER_STRIP_GATE(804BB6BC, &lit_6322); +COMPILER_STRIP_GATE(0x804BB6BC, &lit_6322); #pragma pop /* 804AE250-804AE778 004D50 0528+00 1/1 0/0 0/0 .text ground_action__FP13dmg_rod_class */ @@ -2171,21 +2171,21 @@ static asm void ground_action(dmg_rod_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6387 = 0.75f; -COMPILER_STRIP_GATE(804BB6C0, &lit_6387); +COMPILER_STRIP_GATE(0x804BB6C0, &lit_6387); #pragma pop /* 804BB6C4-804BB6C8 000190 0004+00 0/1 0/0 0/0 .rodata @6388 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6388 = 7.0f; -COMPILER_STRIP_GATE(804BB6C4, &lit_6388); +COMPILER_STRIP_GATE(0x804BB6C4, &lit_6388); #pragma pop /* 804BB6C8-804BB6CC 000194 0004+00 0/2 0/0 0/0 .rodata @6389 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6389 = 13.0f / 20.0f; -COMPILER_STRIP_GATE(804BB6C8, &lit_6389); +COMPILER_STRIP_GATE(0x804BB6C8, &lit_6389); #pragma pop /* 804AE778-804AEA80 005278 0308+00 1/1 0/0 0/0 .text wd_action__FP13dmg_rod_classfP5wd_ss */ @@ -2224,56 +2224,56 @@ static asm void action_eff_set(dmg_rod_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_6778 = 0x450D3DCB; -COMPILER_STRIP_GATE(804BB6CC, &lit_6778); +COMPILER_STRIP_GATE(0x804BB6CC, &lit_6778); #pragma pop /* 804BB6D0-804BB6D4 00019C 0004+00 0/1 0/0 0/0 .rodata @6779 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6779 = -1.0f / 10.0f; -COMPILER_STRIP_GATE(804BB6D0, &lit_6779); +COMPILER_STRIP_GATE(0x804BB6D0, &lit_6779); #pragma pop /* 804BB6D4-804BB6D8 0001A0 0004+00 0/1 0/0 0/0 .rodata @6780 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6780 = 11.0f; -COMPILER_STRIP_GATE(804BB6D4, &lit_6780); +COMPILER_STRIP_GATE(0x804BB6D4, &lit_6780); #pragma pop /* 804BB6D8-804BB6DC 0001A4 0004+00 0/1 0/0 0/0 .rodata @6781 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_6781 = 0x3C03126E; -COMPILER_STRIP_GATE(804BB6D8, &lit_6781); +COMPILER_STRIP_GATE(0x804BB6D8, &lit_6781); #pragma pop /* 804BB6DC-804BB6E0 0001A8 0004+00 0/1 0/0 0/0 .rodata @6782 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_6782 = 0x3C1BA5E3; -COMPILER_STRIP_GATE(804BB6DC, &lit_6782); +COMPILER_STRIP_GATE(0x804BB6DC, &lit_6782); #pragma pop /* 804BB6E0-804BB6E4 0001AC 0004+00 0/1 0/0 0/0 .rodata @6783 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6783 = 2.5f; -COMPILER_STRIP_GATE(804BB6E0, &lit_6783); +COMPILER_STRIP_GATE(0x804BB6E0, &lit_6783); #pragma pop /* 804BB6E4-804BB6E8 0001B0 0004+00 0/1 0/0 0/0 .rodata @6784 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6784 = 450.0f; -COMPILER_STRIP_GATE(804BB6E4, &lit_6784); +COMPILER_STRIP_GATE(0x804BB6E4, &lit_6784); #pragma pop /* 804BB6E8-804BB6EC 0001B4 0004+00 0/1 0/0 0/0 .rodata @6785 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6785 = 90.0f; -COMPILER_STRIP_GATE(804BB6E8, &lit_6785); +COMPILER_STRIP_GATE(0x804BB6E8, &lit_6785); #pragma pop /* 804AEE18-804AFA70 005918 0C58+00 1/1 0/0 0/0 .text lure_action__FP13dmg_rod_class */ @@ -2291,28 +2291,28 @@ static asm void lure_action(dmg_rod_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6993 = -3.5f; -COMPILER_STRIP_GATE(804BB6EC, &lit_6993); +COMPILER_STRIP_GATE(0x804BB6EC, &lit_6993); #pragma pop /* 804BB6F0-804BB6F4 0001BC 0004+00 0/1 0/0 0/0 .rodata @6994 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_6994 = 0x3B83126F; -COMPILER_STRIP_GATE(804BB6F0, &lit_6994); +COMPILER_STRIP_GATE(0x804BB6F0, &lit_6994); #pragma pop /* 804BB6F4-804BB6F8 0001C0 0004+00 0/10 0/0 0/0 .rodata @6995 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6995 = 200.0f; -COMPILER_STRIP_GATE(804BB6F4, &lit_6995); +COMPILER_STRIP_GATE(0x804BB6F4, &lit_6995); #pragma pop /* 804BB6F8-804BB6FC 0001C4 0004+00 0/3 0/0 0/0 .rodata @6996 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6996 = -0.5f; -COMPILER_STRIP_GATE(804BB6F8, &lit_6996); +COMPILER_STRIP_GATE(0x804BB6F8, &lit_6996); #pragma pop /* 804AFA70-804B02C4 006570 0854+00 1/1 0/0 0/0 .text lure_hit__FP13dmg_rod_classP13mg_fish_class @@ -2331,28 +2331,28 @@ static asm void lure_hit(dmg_rod_class* param_0, mg_fish_class* param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7218 = 23.0f / 10.0f; -COMPILER_STRIP_GATE(804BB6FC, &lit_7218); +COMPILER_STRIP_GATE(0x804BB6FC, &lit_7218); #pragma pop /* 804BB700-804BB704 0001CC 0004+00 0/1 0/0 0/0 .rodata @7219 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7219 = 20000.0f; -COMPILER_STRIP_GATE(804BB700, &lit_7219); +COMPILER_STRIP_GATE(0x804BB700, &lit_7219); #pragma pop /* 804BB704-804BB708 0001D0 0004+00 0/2 0/0 0/0 .rodata @7220 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_7220 = 0x421D7AF6; -COMPILER_STRIP_GATE(804BB704, &lit_7220); +COMPILER_STRIP_GATE(0x804BB704, &lit_7220); #pragma pop /* 804BB708-804BB70C 0001D4 0004+00 0/2 0/0 0/0 .rodata @7221 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7221 = 127.0f / 50.0f; -COMPILER_STRIP_GATE(804BB708, &lit_7221); +COMPILER_STRIP_GATE(0x804BB708, &lit_7221); #pragma pop /* 804B02C4-804B0A90 006DC4 07CC+00 1/1 0/0 0/0 .text lure_catch__FP13dmg_rod_class */ @@ -2370,7 +2370,7 @@ static asm void lure_catch(dmg_rod_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7320 = -300.0f; -COMPILER_STRIP_GATE(804BB70C, &lit_7320); +COMPILER_STRIP_GATE(0x804BB70C, &lit_7320); #pragma pop /* 804B0A90-804B0E74 007590 03E4+00 1/1 0/0 0/0 .text lure_bare__FP13dmg_rod_class */ @@ -2388,14 +2388,14 @@ static asm void lure_bare(dmg_rod_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_7428 = 0x3E999998; -COMPILER_STRIP_GATE(804BB710, &lit_7428); +COMPILER_STRIP_GATE(0x804BB710, &lit_7428); #pragma pop /* 804BB714-804BB718 0001E0 0004+00 0/5 0/0 0/0 .rodata @7429 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7429 = 150.0f; -COMPILER_STRIP_GATE(804BB714, &lit_7429); +COMPILER_STRIP_GATE(0x804BB714, &lit_7429); #pragma pop /* 804B0E74-804B11CC 007974 0358+00 1/1 0/0 0/0 .text lure_heart__FP13dmg_rod_class */ @@ -2424,21 +2424,21 @@ static asm void hook_set(dmg_rod_class* param_0, cXyz* param_1, int param_2) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7680 = 6000.0f; -COMPILER_STRIP_GATE(804BB718, &lit_7680); +COMPILER_STRIP_GATE(0x804BB718, &lit_7680); #pragma pop /* 804BB71C-804BB720 0001E8 0004+00 0/2 0/0 0/0 .rodata @7681 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7681 = -4000.0f; -COMPILER_STRIP_GATE(804BB71C, &lit_7681); +COMPILER_STRIP_GATE(0x804BB71C, &lit_7681); #pragma pop /* 804BB720-804BB724 0001EC 0004+00 0/3 0/0 0/0 .rodata @7682 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7682 = 2500.0f; -COMPILER_STRIP_GATE(804BB720, &lit_7682); +COMPILER_STRIP_GATE(0x804BB720, &lit_7682); #pragma pop /* 804B16B8-804B1D14 0081B8 065C+00 1/1 0/0 0/0 .text lure_disp__FP13dmg_rod_class */ @@ -2466,42 +2466,42 @@ static asm void lure_main(dmg_rod_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7880 = 7.0f / 20.0f; -COMPILER_STRIP_GATE(804BB724, &lit_7880); +COMPILER_STRIP_GATE(0x804BB724, &lit_7880); #pragma pop /* 804BB728-804BB72C 0001F4 0004+00 0/1 0/0 0/0 .rodata @7990 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7990 = 800.0f; -COMPILER_STRIP_GATE(804BB728, &lit_7990); +COMPILER_STRIP_GATE(0x804BB728, &lit_7990); #pragma pop /* 804BB72C-804BB730 0001F8 0004+00 0/2 0/0 0/0 .rodata @7991 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7991 = 45.0f; -COMPILER_STRIP_GATE(804BB72C, &lit_7991); +COMPILER_STRIP_GATE(0x804BB72C, &lit_7991); #pragma pop /* 804BB730-804BB734 0001FC 0004+00 0/1 0/0 0/0 .rodata @7992 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7992 = 17.0f; -COMPILER_STRIP_GATE(804BB730, &lit_7992); +COMPILER_STRIP_GATE(0x804BB730, &lit_7992); #pragma pop /* 804BB734-804BB738 000200 0004+00 0/1 0/0 0/0 .rodata @7993 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7993 = 4096.0f; -COMPILER_STRIP_GATE(804BB734, &lit_7993); +COMPILER_STRIP_GATE(0x804BB734, &lit_7993); #pragma pop /* 804BB738-804BB73C 000204 0004+00 0/1 0/0 0/0 .rodata @7994 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7994 = 6.5f; -COMPILER_STRIP_GATE(804BB738, &lit_7994); +COMPILER_STRIP_GATE(0x804BB738, &lit_7994); #pragma pop /* 804B265C-804B2C54 00915C 05F8+00 4/4 0/0 0/0 .text uki_calc__FP13dmg_rod_class */ @@ -2519,21 +2519,21 @@ static asm void uki_calc(dmg_rod_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_8106 = 0x3D88888D; -COMPILER_STRIP_GATE(804BB73C, &lit_8106); +COMPILER_STRIP_GATE(0x804BB73C, &lit_8106); #pragma pop /* 804BB740-804BB744 00020C 0004+00 0/1 0/0 0/0 .rodata @8107 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_8107 = 0x3ECCCCCC; -COMPILER_STRIP_GATE(804BB740, &lit_8107); +COMPILER_STRIP_GATE(0x804BB740, &lit_8107); #pragma pop /* 804BB744-804BB748 000210 0004+00 0/1 0/0 0/0 .rodata @8108 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8108 = -9.0f / 10.0f; -COMPILER_STRIP_GATE(804BB744, &lit_8108); +COMPILER_STRIP_GATE(0x804BB744, &lit_8108); #pragma pop /* 804B2C54-804B30E8 009754 0494+00 1/1 0/0 0/0 .text uki_ready__FP13dmg_rod_class */ @@ -2562,42 +2562,42 @@ static asm void uki_rod_bg_check(dmg_rod_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8187 = 6700.0f; -COMPILER_STRIP_GATE(804BB748, &lit_8187); +COMPILER_STRIP_GATE(0x804BB748, &lit_8187); #pragma pop /* 804BB74C-804BB750 000218 0004+00 0/1 0/0 0/0 .rodata @8188 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8188 = -4200.0f; -COMPILER_STRIP_GATE(804BB74C, &lit_8188); +COMPILER_STRIP_GATE(0x804BB74C, &lit_8188); #pragma pop /* 804BB750-804BB754 00021C 0004+00 0/2 0/0 0/0 .rodata @8189 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8189 = -15000.0f; -COMPILER_STRIP_GATE(804BB750, &lit_8189); +COMPILER_STRIP_GATE(0x804BB750, &lit_8189); #pragma pop /* 804BB754-804BB758 000220 0004+00 0/1 0/0 0/0 .rodata @8190 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8190 = 3500.0f; -COMPILER_STRIP_GATE(804BB754, &lit_8190); +COMPILER_STRIP_GATE(0x804BB754, &lit_8190); #pragma pop /* 804BB758-804BB75C 000224 0004+00 0/1 0/0 0/0 .rodata @8191 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8191 = -11000.0f; -COMPILER_STRIP_GATE(804BB758, &lit_8191); +COMPILER_STRIP_GATE(0x804BB758, &lit_8191); #pragma pop /* 804BB75C-804BB760 000228 0004+00 0/1 0/0 0/0 .rodata @8192 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8192 = 140.0f; -COMPILER_STRIP_GATE(804BB75C, &lit_8192); +COMPILER_STRIP_GATE(0x804BB75C, &lit_8192); #pragma pop /* 804B31D8-804B345C 009CD8 0284+00 3/3 0/0 0/0 .text uki_pl_arm_calc__FP13dmg_rod_class @@ -2616,21 +2616,21 @@ static asm void uki_pl_arm_calc(dmg_rod_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8348 = 21.0f / 20.0f; -COMPILER_STRIP_GATE(804BB760, &lit_8348); +COMPILER_STRIP_GATE(0x804BB760, &lit_8348); #pragma pop /* 804BB764-804BB768 000230 0004+00 0/2 0/0 0/0 .rodata @8349 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_8349 = 0x3DCCCCCC; -COMPILER_STRIP_GATE(804BB764, &lit_8349); +COMPILER_STRIP_GATE(0x804BB764, &lit_8349); #pragma pop /* 804BB768-804BB76C 000234 0004+00 0/2 0/0 0/0 .rodata @8350 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8350 = 350.0f; -COMPILER_STRIP_GATE(804BB768, &lit_8350); +COMPILER_STRIP_GATE(0x804BB768, &lit_8350); #pragma pop /* 804B345C-804B3B7C 009F5C 0720+00 1/1 0/0 0/0 .text uki_standby__FP13dmg_rod_class */ @@ -2648,21 +2648,21 @@ static asm void uki_standby(dmg_rod_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8448 = 11.0f / 10.0f; -COMPILER_STRIP_GATE(804BB76C, &lit_8448); +COMPILER_STRIP_GATE(0x804BB76C, &lit_8448); #pragma pop /* 804BB770-804BB774 00023C 0004+00 0/1 0/0 0/0 .rodata @8449 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8449 = 11.0f / 20.0f; -COMPILER_STRIP_GATE(804BB770, &lit_8449); +COMPILER_STRIP_GATE(0x804BB770, &lit_8449); #pragma pop /* 804BB774-804BB778 000240 0004+00 0/1 0/0 0/0 .rodata @8450 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8450 = 280.0f; -COMPILER_STRIP_GATE(804BB774, &lit_8450); +COMPILER_STRIP_GATE(0x804BB774, &lit_8450); #pragma pop /* 804B3B7C-804B40B8 00A67C 053C+00 1/1 0/0 0/0 .text uki_hit__FP13dmg_rod_class */ @@ -2690,14 +2690,14 @@ static asm void bb_get(dmg_rod_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8720 = 3.0f / 20.0f; -COMPILER_STRIP_GATE(804BB778, &lit_8720); +COMPILER_STRIP_GATE(0x804BB778, &lit_8720); #pragma pop /* 804BB77C-804BB780 000248 0004+00 0/1 0/0 0/0 .rodata @8721 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_8721 = 0x4223999A; -COMPILER_STRIP_GATE(804BB77C, &lit_8721); +COMPILER_STRIP_GATE(0x804BB77C, &lit_8721); #pragma pop /* 804B41A0-804B4A94 00ACA0 08F4+00 1/1 0/0 0/0 .text uki_catch__FP13dmg_rod_class */ @@ -2755,98 +2755,104 @@ static asm void s_bt_sub(void* param_0, void* param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9271 = 4.25f; -COMPILER_STRIP_GATE(804BB780, &lit_9271); +COMPILER_STRIP_GATE(0x804BB780, &lit_9271); #pragma pop /* 804BB784-804BB788 000250 0004+00 0/1 0/0 0/0 .rodata @9272 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_9272 = 0x3D9DB22D; -COMPILER_STRIP_GATE(804BB784, &lit_9272); +COMPILER_STRIP_GATE(0x804BB784, &lit_9272); #pragma pop /* 804BB788-804BB78C 000254 0004+00 0/1 0/0 0/0 .rodata @9273 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_9273 = 0x409FAE14; -COMPILER_STRIP_GATE(804BB788, &lit_9273); +COMPILER_STRIP_GATE(0x804BB788, &lit_9273); #pragma pop /* 804BB78C-804BB790 000258 0004+00 0/1 0/0 0/0 .rodata @9274 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9274 = 6800.0f; -COMPILER_STRIP_GATE(804BB78C, &lit_9274); +COMPILER_STRIP_GATE(0x804BB78C, &lit_9274); #pragma pop /* 804BB790-804BB794 00025C 0004+00 0/1 0/0 0/0 .rodata @9275 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9275 = -270.0f; -COMPILER_STRIP_GATE(804BB790, &lit_9275); +COMPILER_STRIP_GATE(0x804BB790, &lit_9275); #pragma pop /* 804BB794-804BB798 000260 0004+00 0/1 0/0 0/0 .rodata @9276 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9276 = -4600.0f; -COMPILER_STRIP_GATE(804BB794, &lit_9276); +COMPILER_STRIP_GATE(0x804BB794, &lit_9276); #pragma pop /* 804BB798-804BB79C 000264 0004+00 0/1 0/0 0/0 .rodata @9277 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9277 = 3100.0f; -COMPILER_STRIP_GATE(804BB798, &lit_9277); +COMPILER_STRIP_GATE(0x804BB798, &lit_9277); #pragma pop /* 804BB79C-804BB7A0 000268 0004+00 0/1 0/0 0/0 .rodata @9278 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9278 = 3616.0f; -COMPILER_STRIP_GATE(804BB79C, &lit_9278); +COMPILER_STRIP_GATE(0x804BB79C, &lit_9278); #pragma pop /* 804BB7A0-804BB7A4 00026C 0004+00 0/1 0/0 0/0 .rodata @9279 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9279 = -4739.0f; -COMPILER_STRIP_GATE(804BB7A0, &lit_9279); +COMPILER_STRIP_GATE(0x804BB7A0, &lit_9279); #pragma pop /* 804BB7A4-804BB7A8 000270 0004+00 0/1 0/0 0/0 .rodata @9280 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9280 = 900.0f; -COMPILER_STRIP_GATE(804BB7A4, &lit_9280); +COMPILER_STRIP_GATE(0x804BB7A4, &lit_9280); #pragma pop /* 804BB7A8-804BB7AC 000274 0004+00 0/1 0/0 0/0 .rodata @9281 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9281 = 16.5f; -COMPILER_STRIP_GATE(804BB7A8, &lit_9281); +COMPILER_STRIP_GATE(0x804BB7A8, &lit_9281); #pragma pop /* 804BB7AC-804BB7B0 000278 0004+00 0/1 0/0 0/0 .rodata @9282 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9282 = -9.0f; -COMPILER_STRIP_GATE(804BB7AC, &lit_9282); +COMPILER_STRIP_GATE(0x804BB7AC, &lit_9282); #pragma pop /* 804BB7B0-804BB7B4 00027C 0004+00 0/3 0/0 0/0 .rodata @9283 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9283 = -3.0f; -COMPILER_STRIP_GATE(804BB7B0, &lit_9283); +COMPILER_STRIP_GATE(0x804BB7B0, &lit_9283); #pragma pop /* 804BB7B4-804BB7B8 000280 0004+00 0/1 0/0 0/0 .rodata @9284 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_9284 = 0x3D851EB8; -COMPILER_STRIP_GATE(804BB7B4, &lit_9284); +COMPILER_STRIP_GATE(0x804BB7B4, &lit_9284); +#pragma pop + +/* 804BB830-804BB830 0002FC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_804BB830 = "F_SP127"; #pragma pop /* 804BC0E4-804BC0F4 00055C 000C+04 0/1 0/0 0/0 .bss @8906 */ @@ -2892,119 +2898,119 @@ static asm void cam_3d_morf(dmg_rod_class* param_0, f32 param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10166 = 180.0f; -COMPILER_STRIP_GATE(804BB7B8, &lit_10166); +COMPILER_STRIP_GATE(0x804BB7B8, &lit_10166); #pragma pop /* 804BB7BC-804BB7C0 000288 0004+00 0/2 0/0 0/0 .rodata @10167 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10167 = 55.0f; -COMPILER_STRIP_GATE(804BB7BC, &lit_10167); +COMPILER_STRIP_GATE(0x804BB7BC, &lit_10167); #pragma pop /* 804BB7C0-804BB7C4 00028C 0004+00 0/1 0/0 0/0 .rodata @10168 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10168 = 230.0f; -COMPILER_STRIP_GATE(804BB7C0, &lit_10168); +COMPILER_STRIP_GATE(0x804BB7C0, &lit_10168); #pragma pop /* 804BB7C4-804BB7C8 000290 0004+00 0/2 0/0 0/0 .rodata @10169 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10169 = 120.0f; -COMPILER_STRIP_GATE(804BB7C4, &lit_10169); +COMPILER_STRIP_GATE(0x804BB7C4, &lit_10169); #pragma pop /* 804BB7C8-804BB7CC 000294 0004+00 0/1 0/0 0/0 .rodata @10170 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_10170 = 0x3C75C28F; -COMPILER_STRIP_GATE(804BB7C8, &lit_10170); +COMPILER_STRIP_GATE(0x804BB7C8, &lit_10170); #pragma pop /* 804BB7CC-804BB7D0 000298 0004+00 0/2 0/0 0/0 .rodata @10171 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10171 = 130.0f; -COMPILER_STRIP_GATE(804BB7CC, &lit_10171); +COMPILER_STRIP_GATE(0x804BB7CC, &lit_10171); #pragma pop /* 804BB7D0-804BB7D4 00029C 0004+00 0/1 0/0 0/0 .rodata @10172 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10172 = 80.0f; -COMPILER_STRIP_GATE(804BB7D0, &lit_10172); +COMPILER_STRIP_GATE(0x804BB7D0, &lit_10172); #pragma pop /* 804BB7D4-804BB7D8 0002A0 0004+00 0/1 0/0 0/0 .rodata @10173 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10173 = 75.0f; -COMPILER_STRIP_GATE(804BB7D4, &lit_10173); +COMPILER_STRIP_GATE(0x804BB7D4, &lit_10173); #pragma pop /* 804BB7D8-804BB7DC 0002A4 0004+00 0/1 0/0 0/0 .rodata @10174 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10174 = 220.0f; -COMPILER_STRIP_GATE(804BB7D8, &lit_10174); +COMPILER_STRIP_GATE(0x804BB7D8, &lit_10174); #pragma pop /* 804BB7DC-804BB7E0 0002A8 0004+00 0/1 0/0 0/0 .rodata @10175 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10175 = 13.0f; -COMPILER_STRIP_GATE(804BB7DC, &lit_10175); +COMPILER_STRIP_GATE(0x804BB7DC, &lit_10175); #pragma pop /* 804BB7E0-804BB7E4 0002AC 0004+00 0/2 0/0 0/0 .rodata @10176 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10176 = -150.0f; -COMPILER_STRIP_GATE(804BB7E0, &lit_10176); +COMPILER_STRIP_GATE(0x804BB7E0, &lit_10176); #pragma pop /* 804BB7E4-804BB7E8 0002B0 0004+00 0/1 0/0 0/0 .rodata @10177 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10177 = 110.0f; -COMPILER_STRIP_GATE(804BB7E4, &lit_10177); +COMPILER_STRIP_GATE(0x804BB7E4, &lit_10177); #pragma pop /* 804BB7E8-804BB7EC 0002B4 0004+00 0/1 0/0 0/0 .rodata @10178 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10178 = -2800.0f; -COMPILER_STRIP_GATE(804BB7E8, &lit_10178); +COMPILER_STRIP_GATE(0x804BB7E8, &lit_10178); #pragma pop /* 804BB7EC-804BB7F0 0002B8 0004+00 0/1 0/0 0/0 .rodata @10179 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10179 = 4608.0f; -COMPILER_STRIP_GATE(804BB7EC, &lit_10179); +COMPILER_STRIP_GATE(0x804BB7EC, &lit_10179); #pragma pop /* 804BB7F0-804BB7F4 0002BC 0004+00 0/1 0/0 0/0 .rodata @10180 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10180 = 1500.0f; -COMPILER_STRIP_GATE(804BB7F0, &lit_10180); +COMPILER_STRIP_GATE(0x804BB7F0, &lit_10180); #pragma pop /* 804BB7F4-804BB7F8 0002C0 0004+00 0/2 0/0 0/0 .rodata @10181 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10181 = -25.0f; -COMPILER_STRIP_GATE(804BB7F4, &lit_10181); +COMPILER_STRIP_GATE(0x804BB7F4, &lit_10181); #pragma pop /* 804BB7F8-804BB7FC 0002C4 0004+00 0/1 0/0 0/0 .rodata @10182 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10182 = -4.0f / 5.0f; -COMPILER_STRIP_GATE(804BB7F8, &lit_10182); +COMPILER_STRIP_GATE(0x804BB7F8, &lit_10182); #pragma pop /* 804BC118-804BC120 000590 0004+04 0/1 0/0 0/0 .bss old_stick_x$9448 */ @@ -3034,49 +3040,49 @@ static asm void play_camera(dmg_rod_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10647 = 250.0f; -COMPILER_STRIP_GATE(804BB7FC, &lit_10647); +COMPILER_STRIP_GATE(0x804BB7FC, &lit_10647); #pragma pop /* 804BB800-804BB804 0002CC 0004+00 0/1 0/0 0/0 .rodata @10648 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10648 = -170.0f; -COMPILER_STRIP_GATE(804BB800, &lit_10648); +COMPILER_STRIP_GATE(0x804BB800, &lit_10648); #pragma pop /* 804BB804-804BB808 0002D0 0004+00 0/1 0/0 0/0 .rodata @10649 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10649 = -80.0f; -COMPILER_STRIP_GATE(804BB804, &lit_10649); +COMPILER_STRIP_GATE(0x804BB804, &lit_10649); #pragma pop /* 804BB808-804BB80C 0002D4 0004+00 0/1 0/0 0/0 .rodata @10650 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10650 = 3277.0f; -COMPILER_STRIP_GATE(804BB808, &lit_10650); +COMPILER_STRIP_GATE(0x804BB808, &lit_10650); #pragma pop /* 804BB80C-804BB810 0002D8 0004+00 0/1 0/0 0/0 .rodata @10651 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10651 = 13034.0f; -COMPILER_STRIP_GATE(804BB80C, &lit_10651); +COMPILER_STRIP_GATE(0x804BB80C, &lit_10651); #pragma pop /* 804BB810-804BB814 0002DC 0004+00 0/1 0/0 0/0 .rodata @10652 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10652 = -400.0f; -COMPILER_STRIP_GATE(804BB810, &lit_10652); +COMPILER_STRIP_GATE(0x804BB810, &lit_10652); #pragma pop /* 804BB814-804BB818 0002E0 0004+00 0/1 0/0 0/0 .rodata @10653 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10653 = -250.0f; -COMPILER_STRIP_GATE(804BB814, &lit_10653); +COMPILER_STRIP_GATE(0x804BB814, &lit_10653); #pragma pop /* 804B805C-804B9318 00EB5C 12BC+00 1/1 0/0 0/0 .text play_camera_u__FP13dmg_rod_class */ @@ -3094,28 +3100,28 @@ static asm void play_camera_u(dmg_rod_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_11065 = 9.0f / 10.0f; -COMPILER_STRIP_GATE(804BB818, &lit_11065); +COMPILER_STRIP_GATE(0x804BB818, &lit_11065); #pragma pop /* 804BB81C-804BB820 0002E8 0004+00 0/1 0/0 0/0 .rodata @11066 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_11066 = 31.0f; -COMPILER_STRIP_GATE(804BB81C, &lit_11066); +COMPILER_STRIP_GATE(0x804BB81C, &lit_11066); #pragma pop /* 804BB820-804BB824 0002EC 0004+00 0/1 0/0 0/0 .rodata @11067 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_11067 = 0x3A83126F; -COMPILER_STRIP_GATE(804BB820, &lit_11067); +COMPILER_STRIP_GATE(0x804BB820, &lit_11067); #pragma pop /* 804BB824-804BB828 0002F0 0004+00 0/1 0/0 0/0 .rodata @11068 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_11068 = -27.0f; -COMPILER_STRIP_GATE(804BB824, &lit_11068); +COMPILER_STRIP_GATE(0x804BB824, &lit_11068); #pragma pop /* 804B9318-804BA098 00FE18 0D80+00 2/1 0/0 0/0 .text dmg_rod_Execute__FP13dmg_rod_class @@ -3156,7 +3162,13 @@ static asm void dmg_rod_Delete(dmg_rod_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_11348 = 65536.0f; -COMPILER_STRIP_GATE(804BB828, &lit_11348); +COMPILER_STRIP_GATE(0x804BB828, &lit_11348); +#pragma pop + +/* 804BB830-804BB830 0002FC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_804BB838 = "Alink"; #pragma pop /* 804BA1F4-804BA83C 010CF4 0648+00 1/1 0/0 0/0 .text useHeapInit__FP10fopAc_ac_c */ @@ -3174,7 +3186,14 @@ static asm void useHeapInit(fopAc_ac_c* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_11462 = -50000.0f; -COMPILER_STRIP_GATE(804BB82C, &lit_11462); +COMPILER_STRIP_GATE(0x804BB82C, &lit_11462); +#pragma pop + +/* 804BB830-804BB830 0002FC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_804BB83E = "T_MUKAO"; +SECTION_DEAD static char const* const stringBase_804BB846 = "Mg_rod"; #pragma pop /* 804BA83C-804BAC0C 01133C 03D0+00 1/0 0/0 0/0 .text dmg_rod_Create__FP10fopAc_ac_c */ @@ -3309,7 +3328,7 @@ asm void __sinit_d_a_mg_rod_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_804BB0B8 = (void*)__sinit_d_a_mg_rod_cpp; +REGISTER_CTORS(0x804BB0B8, __sinit_d_a_mg_rod_cpp); #pragma pop /* 804BB130-804BB168 011C30 0038+00 1/1 0/0 0/0 .text __arraydtor$4920 */ @@ -3752,12 +3771,4 @@ static u8 data_804BC188[4]; static u8 data_804BC18C[4]; #pragma pop -/* 804BB830-804BB84D 0002FC 001D+00 4/4 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_804BB830 = "F_SP127"; -SECTION_DEAD static char const* const stringBase_804BB838 = "Alink"; -SECTION_DEAD static char const* const stringBase_804BB83E = "T_MUKAO"; -SECTION_DEAD static char const* const stringBase_804BB846 = "Mg_rod"; -#pragma pop +/* 804BB830-804BB830 0002FC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/d_a_midna/d_a_midna.cpp b/rel/d/a/d_a_midna/d_a_midna.cpp index 575d238bd68..95bdf6cf17c 100644 --- a/rel/d/a/d_a_midna/d_a_midna.cpp +++ b/rel/d/a/d_a_midna/d_a_midna.cpp @@ -76,10 +76,10 @@ struct mDoExt_baseAnm { /* 8000D428 */ void play(); }; -struct mDoExt_McaMorfCallBack2_c {}; - struct J3DTransformInfo {}; +struct mDoExt_McaMorfCallBack2_c {}; + struct mDoExt_McaMorfCallBack1_c {}; struct Z2Creature { @@ -371,9 +371,8 @@ struct J3DSys { static u8 mCurrentMtx[48]; }; -struct J3DAnmTexPattern { - /* 8032AF50 */ void getTexNo(u16, u16*) const; - /* 8032B09C */ void searchUpdateMaterialID(J3DModelData*); +struct J3DAnmTextureSRTKey { + /* 8032B1D4 */ void searchUpdateMaterialID(J3DModelData*); }; struct J3DAnmTevRegKey { @@ -382,8 +381,9 @@ struct J3DAnmTevRegKey { /* 8032B87C */ void searchUpdateMaterialID(J3DModelData*); }; -struct J3DAnmTextureSRTKey { - /* 8032B1D4 */ void searchUpdateMaterialID(J3DModelData*); +struct J3DAnmTexPattern { + /* 8032AF50 */ void getTexNo(u16, u16*) const; + /* 8032B09C */ void searchUpdateMaterialID(J3DModelData*); }; struct J3DMaterialTable { @@ -491,7 +491,7 @@ extern "C" static void daMidna_Draw__FP9daMidna_c(); extern "C" void __dt__9daMidna_cFv(); extern "C" static void daMidna_Delete__FP9daMidna_c(); extern "C" void calc__11J3DTexNoAnmCFPUs(); -extern "C" void func_804C637C(u8*); +extern "C" void func_804C637C(void* _this, u8*); extern "C" void __dt__20daMidna_McaMorfCB1_cFv(); extern "C" void __dt__16daMidna_matAnm_cFv(); extern "C" u8 const m__14daMidna_hio_c0[32]; @@ -705,7 +705,7 @@ extern "C" extern u8 struct_804C6CD8[4]; SECTION_RODATA static u8 const lit_3777[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(804C64C8, &lit_3777); +COMPILER_STRIP_GATE(0x804C64C8, &lit_3777); /* 804C64D4-804C64DC 00000C 0006+02 5/6 0/0 0/0 .rodata l_arcName */ SECTION_RODATA static u8 const l_arcName[6 + 2 /* padding */] = { @@ -719,7 +719,7 @@ SECTION_RODATA static u8 const l_arcName[6 + 2 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(804C64D4, &l_arcName); +COMPILER_STRIP_GATE(0x804C64D4, &l_arcName); /* 804C64DC-804C64E8 000014 000C+00 0/1 0/0 0/0 .rodata l_eyeOffset */ #pragma push @@ -727,7 +727,7 @@ COMPILER_STRIP_GATE(804C64D4, &l_arcName); SECTION_RODATA static u8 const l_eyeOffset[12] = { 0x41, 0x80, 0x00, 0x00, 0xC1, 0x26, 0x66, 0x67, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(804C64DC, &l_eyeOffset); +COMPILER_STRIP_GATE(0x804C64DC, &l_eyeOffset); #pragma pop /* 804C64E8-804C64F4 000020 000C+00 0/1 0/0 0/0 .rodata l_headCenterOffset */ @@ -736,7 +736,7 @@ COMPILER_STRIP_GATE(804C64DC, &l_eyeOffset); SECTION_RODATA static u8 const l_headCenterOffset[12] = { 0x00, 0x00, 0x00, 0x00, 0xC1, 0x26, 0x66, 0x67, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(804C64E8, &l_headCenterOffset); +COMPILER_STRIP_GATE(0x804C64E8, &l_headCenterOffset); #pragma pop /* 804C64F4-804C64FC 00002C 0008+00 0/2 0/0 0/0 .rodata l_normalColor */ @@ -745,21 +745,21 @@ COMPILER_STRIP_GATE(804C64E8, &l_headCenterOffset); SECTION_RODATA static u8 const l_normalColor[8] = { 0x00, 0x50, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(804C64F4, &l_normalColor); +COMPILER_STRIP_GATE(0x804C64F4, &l_normalColor); #pragma pop /* 804C64FC-804C6500 000034 0004+00 0/3 0/0 0/0 .rodata l_normalKColor */ #pragma push #pragma force_active on SECTION_RODATA static u32 const l_normalKColor = 0xB4870000; -COMPILER_STRIP_GATE(804C64FC, &l_normalKColor); +COMPILER_STRIP_GATE(0x804C64FC, &l_normalKColor); #pragma pop /* 804C6500-804C6504 000038 0004+00 0/3 0/0 0/0 .rodata l_normalKColor2 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const l_normalKColor2 = 0x00C3C300; -COMPILER_STRIP_GATE(804C6500, &l_normalKColor2); +COMPILER_STRIP_GATE(0x804C6500, &l_normalKColor2); #pragma pop /* 804C6504-804C650C 00003C 0008+00 0/1 0/0 0/0 .rodata l_bigColor */ @@ -768,28 +768,28 @@ COMPILER_STRIP_GATE(804C6500, &l_normalKColor2); SECTION_RODATA static u8 const l_bigColor[8] = { 0x00, 0xFF, 0x00, 0x64, 0x00, 0x78, 0x00, 0x00, }; -COMPILER_STRIP_GATE(804C6504, &l_bigColor); +COMPILER_STRIP_GATE(0x804C6504, &l_bigColor); #pragma pop /* 804C650C-804C6510 000044 0004+00 0/1 0/0 0/0 .rodata l_bigKColor */ #pragma push #pragma force_active on SECTION_RODATA static u32 const l_bigKColor = 0x1E000000; -COMPILER_STRIP_GATE(804C650C, &l_bigKColor); +COMPILER_STRIP_GATE(0x804C650C, &l_bigKColor); #pragma pop /* 804C6510-804C6514 000048 0004+00 0/3 0/0 0/0 .rodata l_lNormalKColor */ #pragma push #pragma force_active on SECTION_RODATA static u32 const l_lNormalKColor = 0xFFDC0000; -COMPILER_STRIP_GATE(804C6510, &l_lNormalKColor); +COMPILER_STRIP_GATE(0x804C6510, &l_lNormalKColor); #pragma pop /* 804C6514-804C6518 00004C 0004+00 0/3 0/0 0/0 .rodata l_lNormalKColor2 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const l_lNormalKColor2 = 0x00C3EB00; -COMPILER_STRIP_GATE(804C6514, &l_lNormalKColor2); +COMPILER_STRIP_GATE(0x804C6514, &l_lNormalKColor2); #pragma pop /* 804C6518-804C6520 000050 0008+00 0/1 0/0 0/0 .rodata l_lBigColor */ @@ -798,14 +798,14 @@ COMPILER_STRIP_GATE(804C6514, &l_lNormalKColor2); SECTION_RODATA static u8 const l_lBigColor[8] = { 0x00, 0xFF, 0x00, 0x78, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(804C6518, &l_lBigColor); +COMPILER_STRIP_GATE(0x804C6518, &l_lBigColor); #pragma pop /* 804C6520-804C6524 000058 0004+00 0/1 0/0 0/0 .rodata l_lBigKColor2 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const l_lBigKColor2 = 0xAAFFC300; -COMPILER_STRIP_GATE(804C6520, &l_lBigKColor2); +COMPILER_STRIP_GATE(0x804C6520, &l_lBigKColor2); #pragma pop /* 804C6524-804C6560 00005C 003C+00 0/2 0/0 0/0 .rodata l_hairScale */ @@ -817,7 +817,7 @@ SECTION_RODATA static u8 const l_hairScale[60] = { 0x00, 0x00, 0x3F, 0x00, 0x00, 0x00, 0x3D, 0xCC, 0xCC, 0xCD, 0x3F, 0x33, 0x33, 0x33, 0x3F, 0x33, 0x33, 0x33, 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, }; -COMPILER_STRIP_GATE(804C6524, &l_hairScale); +COMPILER_STRIP_GATE(0x804C6524, &l_hairScale); #pragma pop /* 804C6560-804C6580 000098 0020+00 1/3 0/0 0/0 .rodata m__14daMidna_hio_c0 */ @@ -825,7 +825,7 @@ SECTION_RODATA u8 const daMidna_hio_c0::m[32] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0xC2, 0xAE, 0x00, 0x00, 0x41, 0xC8, 0x00, 0x00, }; -COMPILER_STRIP_GATE(804C6560, &daMidna_hio_c0::m); +COMPILER_STRIP_GATE(0x804C6560, &daMidna_hio_c0::m); /* 804C6580-804C6584 0000B8 0004+00 6/18 0/0 0/0 .rodata @4278 */ SECTION_RODATA static u8 const lit_4278[4] = { @@ -834,7 +834,7 @@ SECTION_RODATA static u8 const lit_4278[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(804C6580, &lit_4278); +COMPILER_STRIP_GATE(0x804C6580, &lit_4278); /* 804BC218-804BC248 000078 0030+00 2/2 0/0 0/0 .text init__16daMidna_matAnm_cFv */ #pragma push @@ -849,13 +849,13 @@ asm void daMidna_matAnm_c::init() { /* ############################################################################################## */ /* 804C6584-804C6588 0000BC 0004+00 5/14 0/0 0/0 .rodata @4303 */ SECTION_RODATA static f32 const lit_4303 = 1.0f; -COMPILER_STRIP_GATE(804C6584, &lit_4303); +COMPILER_STRIP_GATE(0x804C6584, &lit_4303); /* 804C6588-804C6590 0000C0 0008+00 3/9 0/0 0/0 .rodata @4305 */ SECTION_RODATA static u8 const lit_4305[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(804C6588, &lit_4305); +COMPILER_STRIP_GATE(0x804C6588, &lit_4305); /* 804BC248-804BC36C 0000A8 0124+00 1/0 0/0 0/0 .text calc__16daMidna_matAnm_cCFP11J3DMaterial */ #pragma push @@ -953,6 +953,25 @@ asm void daMidna_c::initDemoModel(J3DModel** param_0, char const* param_1, u32 p #pragma pop /* ############################################################################################## */ +/* 804C6A60-804C6A60 000598 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_804C6A60 = "demo00_Midna_cut00_HL_tmp.bmd"; +SECTION_DEAD static char const* const stringBase_804C6A7E = "demo00_Midna_cut00_HL_tmp.bck"; +SECTION_DEAD static char const* const stringBase_804C6A9C = "demo00_Midna_cut00_HR_tmp.bmd"; +SECTION_DEAD static char const* const stringBase_804C6ABA = "demo00_Midna_cut00_HR_tmp.bck"; +SECTION_DEAD static char const* const stringBase_804C6AD8 = "demo00_Midna_cut00_HD_tmp.bmd"; +SECTION_DEAD static char const* const stringBase_804C6AF6 = "demo00_Midna_cut00_HD_tmp.bck"; +SECTION_DEAD static char const* const stringBase_804C6B14 = "demo00_Midna_cut00_FC_blend.bmd"; +SECTION_DEAD static char const* const stringBase_804C6B34 = "demo00_Midna_cut00_FC_tongue.bmd"; +SECTION_DEAD static char const* const stringBase_804C6B55 = "demo00_Midna_cut00_FC_tmp.bck"; +SECTION_DEAD static char const* const stringBase_804C6B73 = "demo00_Midna_cut00_BD_tmp.bmd"; +SECTION_DEAD static char const* const stringBase_804C6B91 = "demo00_Midna_cut00_BD_mask.bmd"; +SECTION_DEAD static char const* const stringBase_804C6BB0 = "demo00_Midna_cut00_BD_hands.bmd"; +SECTION_DEAD static char const* const stringBase_804C6BD0 = "demo00_Midna_cut00_BD_hairhand.bmd"; +SECTION_DEAD static char const* const stringBase_804C6BF3 = "demo00_Midna_cut00_FC_tmp.bls"; +#pragma pop + /* 804C6C34-804C6C40 -00001 000C+00 1/1 0/0 0/0 .data @4662 */ SECTION_DATA static void* lit_4662[3] = { (void*)NULL, @@ -1163,7 +1182,7 @@ SECTION_RODATA u8 const daMidna_c::m_texDataTable[84] = { 0x03, 0xFE, 0x03, 0x9B, 0x03, 0xFF, 0x03, 0x9C, 0x03, 0xF8, 0x03, 0x99, 0x03, 0xF9, 0x03, 0x99, 0x04, 0x00, 0x03, 0x9D, 0x03, 0xFB, 0x03, 0x99, 0x03, 0xFD, 0x03, 0x99, }; -COMPILER_STRIP_GATE(804C6590, &daMidna_c::m_texDataTable); +COMPILER_STRIP_GATE(0x804C6590, &daMidna_c::m_texDataTable); #pragma pop /* 804C65E4-804C6860 00011C 027C+00 3/12 0/0 0/0 .rodata m_anmDataTable__9daMidna_c */ @@ -1209,11 +1228,11 @@ SECTION_RODATA u8 const daMidna_c::m_anmDataTable[636] = { 0x00, 0x00, 0x00, 0x00, 0x02, 0x1B, 0x00, 0x00, 0xBF, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0xC4, 0x00, 0x00, 0xBF, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(804C65E4, &daMidna_c::m_anmDataTable); +COMPILER_STRIP_GATE(0x804C65E4, &daMidna_c::m_anmDataTable); /* 804C6860-804C6864 000398 0004+00 1/5 0/0 0/0 .rodata @4838 */ SECTION_RODATA static f32 const lit_4838 = -1.0f; -COMPILER_STRIP_GATE(804C6860, &lit_4838); +COMPILER_STRIP_GATE(0x804C6860, &lit_4838); /* 804BD274-804BD8B8 0010D4 0644+00 1/1 0/0 0/0 .text create__9daMidna_cFv */ #pragma push @@ -1265,18 +1284,18 @@ static asm void daMidna_Create(fopAc_ac_c* param_0) { #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_5078 = 0x3C449BA6; -COMPILER_STRIP_GATE(804C6864, &lit_5078); +COMPILER_STRIP_GATE(0x804C6864, &lit_5078); #pragma pop /* 804C6868-804C686C 0003A0 0004+00 1/2 0/0 0/0 .rodata @5079 */ SECTION_RODATA static u32 const lit_5079 = 0x3A83126F; -COMPILER_STRIP_GATE(804C6868, &lit_5079); +COMPILER_STRIP_GATE(0x804C6868, &lit_5079); /* 804C686C-804C6870 0003A4 0004+00 0/6 0/0 0/0 .rodata @5080 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5080 = 2.0f; -COMPILER_STRIP_GATE(804C686C, &lit_5080); +COMPILER_STRIP_GATE(0x804C686C, &lit_5080); #pragma pop /* 804BD93C-804BDE04 00179C 04C8+00 2/2 0/0 0/0 .text allAnimePlay__9daMidna_cFv */ @@ -1296,7 +1315,7 @@ asm void daMidna_c::allAnimePlay() { SECTION_RODATA static u8 const lit_5087[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(804C6870, &lit_5087); +COMPILER_STRIP_GATE(0x804C6870, &lit_5087); #pragma pop /* 804C687C-804C6888 0003B4 000C+00 0/1 0/0 0/0 .rodata @5088 */ @@ -1305,7 +1324,7 @@ COMPILER_STRIP_GATE(804C6870, &lit_5087); SECTION_RODATA static u8 const lit_5088[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(804C687C, &lit_5088); +COMPILER_STRIP_GATE(0x804C687C, &lit_5088); #pragma pop /* 804C6888-804C6894 0003C0 000C+00 0/1 0/0 0/0 .rodata @5093 */ @@ -1314,112 +1333,112 @@ COMPILER_STRIP_GATE(804C687C, &lit_5088); SECTION_RODATA static u8 const lit_5093[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(804C6888, &lit_5093); +COMPILER_STRIP_GATE(0x804C6888, &lit_5093); #pragma pop /* 804C6894-804C6898 0003CC 0004+00 0/1 0/0 0/0 .rodata @5309 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5309 = -98.0f; -COMPILER_STRIP_GATE(804C6894, &lit_5309); +COMPILER_STRIP_GATE(0x804C6894, &lit_5309); #pragma pop /* 804C6898-804C689C 0003D0 0004+00 0/2 0/0 0/0 .rodata @5310 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5310 = 17.0f; -COMPILER_STRIP_GATE(804C6898, &lit_5310); +COMPILER_STRIP_GATE(0x804C6898, &lit_5310); #pragma pop /* 804C689C-804C68A0 0003D4 0004+00 0/1 0/0 0/0 .rodata @5311 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5311 = -30.0f; -COMPILER_STRIP_GATE(804C689C, &lit_5311); +COMPILER_STRIP_GATE(0x804C689C, &lit_5311); #pragma pop /* 804C68A0-804C68A4 0003D8 0004+00 0/1 0/0 0/0 .rodata @5312 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5312 = 65.0f; -COMPILER_STRIP_GATE(804C68A0, &lit_5312); +COMPILER_STRIP_GATE(0x804C68A0, &lit_5312); #pragma pop /* 804C68A4-804C68A8 0003DC 0004+00 0/2 0/0 0/0 .rodata @5313 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5313 = 90.0f; -COMPILER_STRIP_GATE(804C68A4, &lit_5313); +COMPILER_STRIP_GATE(0x804C68A4, &lit_5313); #pragma pop /* 804C68A8-804C68AC 0003E0 0004+00 0/1 0/0 0/0 .rodata @5314 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5314 = 80.0f; -COMPILER_STRIP_GATE(804C68A8, &lit_5314); +COMPILER_STRIP_GATE(0x804C68A8, &lit_5314); #pragma pop /* 804C68AC-804C68B0 0003E4 0004+00 0/3 0/0 0/0 .rodata @5315 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5315 = 100.0f; -COMPILER_STRIP_GATE(804C68AC, &lit_5315); +COMPILER_STRIP_GATE(0x804C68AC, &lit_5315); #pragma pop /* 804C68B0-804C68B4 0003E8 0004+00 0/1 0/0 0/0 .rodata @5316 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5316 = 150.0f; -COMPILER_STRIP_GATE(804C68B0, &lit_5316); +COMPILER_STRIP_GATE(0x804C68B0, &lit_5316); #pragma pop /* 804C68B4-804C68B8 0003EC 0004+00 0/1 0/0 0/0 .rodata @5317 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5317 = -8.0f / 5.0f; -COMPILER_STRIP_GATE(804C68B4, &lit_5317); +COMPILER_STRIP_GATE(0x804C68B4, &lit_5317); #pragma pop /* 804C68B8-804C68BC 0003F0 0004+00 0/1 0/0 0/0 .rodata @5318 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5318 = -39.0f / 25.0f; -COMPILER_STRIP_GATE(804C68B8, &lit_5318); +COMPILER_STRIP_GATE(0x804C68B8, &lit_5318); #pragma pop /* 804C68BC-804C68C0 0003F4 0004+00 0/1 0/0 0/0 .rodata @5319 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5319 = -33.0f / 5.0f; -COMPILER_STRIP_GATE(804C68BC, &lit_5319); +COMPILER_STRIP_GATE(0x804C68BC, &lit_5319); #pragma pop /* 804C68C0-804C68C4 0003F8 0004+00 0/2 0/0 0/0 .rodata @5320 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5320 = 1.0f / 20.0f; -COMPILER_STRIP_GATE(804C68C0, &lit_5320); +COMPILER_STRIP_GATE(0x804C68C0, &lit_5320); #pragma pop /* 804C68C4-804C68C8 0003FC 0004+00 0/2 0/0 0/0 .rodata @5321 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5321 = 24.0f; -COMPILER_STRIP_GATE(804C68C4, &lit_5321); +COMPILER_STRIP_GATE(0x804C68C4, &lit_5321); #pragma pop /* 804C68C8-804C68CC 000400 0004+00 0/2 0/0 0/0 .rodata @5322 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5322 = 16384.0f; -COMPILER_STRIP_GATE(804C68C8, &lit_5322); +COMPILER_STRIP_GATE(0x804C68C8, &lit_5322); #pragma pop /* 804C68CC-804C68D0 000404 0004+00 0/1 0/0 0/0 .rodata @5323 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5323 = -150.0f; -COMPILER_STRIP_GATE(804C68CC, &lit_5323); +COMPILER_STRIP_GATE(0x804C68CC, &lit_5323); #pragma pop /* 804BDE04-804BE470 001C64 066C+00 2/2 0/0 0/0 .text setMatrix__9daMidna_cFv */ @@ -1437,14 +1456,14 @@ asm void daMidna_c::setMatrix() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5780 = 6.5f; -COMPILER_STRIP_GATE(804C68D0, &lit_5780); +COMPILER_STRIP_GATE(0x804C68D0, &lit_5780); #pragma pop /* 804C68D4-804C68D8 00040C 0004+00 0/1 0/0 0/0 .rodata @5781 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5781 = 20.0f; -COMPILER_STRIP_GATE(804C68D4, &lit_5781); +COMPILER_STRIP_GATE(0x804C68D4, &lit_5781); #pragma pop /* 804BE470-804BED1C 0022D0 08AC+00 2/2 0/0 0/0 .text setBodyPartMatrix__9daMidna_cFv */ @@ -1474,49 +1493,49 @@ asm void daMidna_c::setRoomInfo() { SECTION_RODATA static u8 const localItemPos[12] = { 0x00, 0x00, 0x00, 0x00, 0xC2, 0x88, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(804C68D8, &localItemPos); +COMPILER_STRIP_GATE(0x804C68D8, &localItemPos); #pragma pop /* 804C68E4-804C68E8 00041C 0004+00 0/1 0/0 0/0 .rodata @5883 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5883 = 14.0f; -COMPILER_STRIP_GATE(804C68E4, &lit_5883); +COMPILER_STRIP_GATE(0x804C68E4, &lit_5883); #pragma pop /* 804C68E8-804C68EC 000420 0004+00 0/4 0/0 0/0 .rodata @5884 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5884 = 3.0f; -COMPILER_STRIP_GATE(804C68E8, &lit_5884); +COMPILER_STRIP_GATE(0x804C68E8, &lit_5884); #pragma pop /* 804C68EC-804C68F0 000424 0004+00 0/1 0/0 0/0 .rodata @5885 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5885 = 250.0f; -COMPILER_STRIP_GATE(804C68EC, &lit_5885); +COMPILER_STRIP_GATE(0x804C68EC, &lit_5885); #pragma pop /* 804C68F0-804C68F4 000428 0004+00 0/2 0/0 0/0 .rodata @5886 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5886 = 50.0f; -COMPILER_STRIP_GATE(804C68F0, &lit_5886); +COMPILER_STRIP_GATE(0x804C68F0, &lit_5886); #pragma pop /* 804C68F4-804C68F8 00042C 0004+00 0/3 0/0 0/0 .rodata @5887 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5887 = 30.0f; -COMPILER_STRIP_GATE(804C68F4, &lit_5887); +COMPILER_STRIP_GATE(0x804C68F4, &lit_5887); #pragma pop /* 804C68F8-804C68FC 000430 0004+00 0/1 0/0 0/0 .rodata @5888 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5888 = 120.0f; -COMPILER_STRIP_GATE(804C68F8, &lit_5888); +COMPILER_STRIP_GATE(0x804C68F8, &lit_5888); #pragma pop /* 804BEDB8-804BEFA0 002C18 01E8+00 1/1 0/0 0/0 .text setBodyPartPos__9daMidna_cFv */ @@ -1546,21 +1565,21 @@ asm void daMidna_c::checkAppear() { SECTION_RODATA static u8 const lit_5997[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(804C68FC, &lit_5997); +COMPILER_STRIP_GATE(0x804C68FC, &lit_5997); #pragma pop /* 804C6908-804C690C 000440 0004+00 0/1 0/0 0/0 .rodata @6386 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6386 = 72.0f; -COMPILER_STRIP_GATE(804C6908, &lit_6386); +COMPILER_STRIP_GATE(0x804C6908, &lit_6386); #pragma pop /* 804C690C-804C6910 000444 0004+00 0/1 0/0 0/0 .rodata @6387 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6387 = 40000.0f; -COMPILER_STRIP_GATE(804C690C, &lit_6387); +COMPILER_STRIP_GATE(0x804C690C, &lit_6387); #pragma pop /* 804C6910-804C6918 000448 0008+00 0/4 0/0 0/0 .rodata @6388 */ @@ -1569,7 +1588,7 @@ COMPILER_STRIP_GATE(804C690C, &lit_6387); SECTION_RODATA static u8 const lit_6388[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(804C6910, &lit_6388); +COMPILER_STRIP_GATE(0x804C6910, &lit_6388); #pragma pop /* 804C6918-804C6920 000450 0008+00 0/4 0/0 0/0 .rodata @6389 */ @@ -1578,7 +1597,7 @@ COMPILER_STRIP_GATE(804C6910, &lit_6388); SECTION_RODATA static u8 const lit_6389[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(804C6918, &lit_6389); +COMPILER_STRIP_GATE(0x804C6918, &lit_6389); #pragma pop /* 804C6920-804C6928 000458 0008+00 0/4 0/0 0/0 .rodata @6390 */ @@ -1587,35 +1606,35 @@ COMPILER_STRIP_GATE(804C6918, &lit_6389); SECTION_RODATA static u8 const lit_6390[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(804C6920, &lit_6390); +COMPILER_STRIP_GATE(0x804C6920, &lit_6390); #pragma pop /* 804C6928-804C692C 000460 0004+00 0/2 0/0 0/0 .rodata @6391 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6391 = 10.0f; -COMPILER_STRIP_GATE(804C6928, &lit_6391); +COMPILER_STRIP_GATE(0x804C6928, &lit_6391); #pragma pop /* 804C692C-804C6930 000464 0004+00 0/4 0/0 0/0 .rodata @6392 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6392 = 0.5f; -COMPILER_STRIP_GATE(804C692C, &lit_6392); +COMPILER_STRIP_GATE(0x804C692C, &lit_6392); #pragma pop /* 804C6930-804C6934 000468 0004+00 0/1 0/0 0/0 .rodata @6393 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6393 = 26.0f; -COMPILER_STRIP_GATE(804C6930, &lit_6393); +COMPILER_STRIP_GATE(0x804C6930, &lit_6393); #pragma pop /* 804C6934-804C6938 00046C 0004+00 0/1 0/0 0/0 .rodata @6394 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6394 = 13.0f; -COMPILER_STRIP_GATE(804C6934, &lit_6394); +COMPILER_STRIP_GATE(0x804C6934, &lit_6394); #pragma pop /* 804C6938-804C6940 000470 0004+04 0/2 0/0 0/0 .rodata @6395 */ @@ -1626,7 +1645,7 @@ SECTION_RODATA static f32 const lit_6395[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(804C6938, &lit_6395); +COMPILER_STRIP_GATE(0x804C6938, &lit_6395); #pragma pop /* 804BF070-804BFF80 002ED0 0F10+00 1/1 0/0 0/0 .text checkMidnaPosState__9daMidna_cFv */ @@ -1695,7 +1714,7 @@ asm void daMidna_c::setDemoAnm() { SECTION_RODATA static u8 const lit_6968[8] = { 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(804C6940, &lit_6968); +COMPILER_STRIP_GATE(0x804C6940, &lit_6968); /* 804C0BAC-804C0C6C 004A0C 00C0+00 2/2 0/0 0/0 .text setFaceBtp__9daMidna_cFUsi */ #pragma push @@ -1768,109 +1787,109 @@ SECTION_RODATA static u8 const motionTable[36] = { 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x19, 0x00, 0x00, 0x00, 0x1A, 0x00, 0x00, 0x00, 0x17, }; -COMPILER_STRIP_GATE(804C6948, &motionTable); +COMPILER_STRIP_GATE(0x804C6948, &motionTable); #pragma pop /* 804C696C-804C6970 0004A4 0004+00 1/2 0/0 0/0 .rodata @7990 */ SECTION_RODATA static f32 const lit_7990 = 5.0f; -COMPILER_STRIP_GATE(804C696C, &lit_7990); +COMPILER_STRIP_GATE(0x804C696C, &lit_7990); /* 804C6970-804C6974 0004A8 0004+00 0/2 0/0 0/0 .rodata @7991 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7991 = 19.0f; -COMPILER_STRIP_GATE(804C6970, &lit_7991); +COMPILER_STRIP_GATE(0x804C6970, &lit_7991); #pragma pop /* 804C6974-804C6978 0004AC 0004+00 0/1 0/0 0/0 .rodata @7992 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7992 = 9.0f / 10.0f; -COMPILER_STRIP_GATE(804C6974, &lit_7992); +COMPILER_STRIP_GATE(0x804C6974, &lit_7992); #pragma pop /* 804C6978-804C697C 0004B0 0004+00 0/1 0/0 0/0 .rodata @7993 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_7993 = 0x42103D92; -COMPILER_STRIP_GATE(804C6978, &lit_7993); +COMPILER_STRIP_GATE(0x804C6978, &lit_7993); #pragma pop /* 804C697C-804C6980 0004B4 0004+00 0/1 0/0 0/0 .rodata @7994 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_7994 = 0xC168408A; -COMPILER_STRIP_GATE(804C697C, &lit_7994); +COMPILER_STRIP_GATE(0x804C697C, &lit_7994); #pragma pop /* 804C6980-804C6984 0004B8 0004+00 0/1 0/0 0/0 .rodata @7995 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7995 = 1000.0f; -COMPILER_STRIP_GATE(804C6980, &lit_7995); +COMPILER_STRIP_GATE(0x804C6980, &lit_7995); #pragma pop /* 804C6984-804C6988 0004BC 0004+00 0/2 0/0 0/0 .rodata @7996 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7996 = 9.0f; -COMPILER_STRIP_GATE(804C6984, &lit_7996); +COMPILER_STRIP_GATE(0x804C6984, &lit_7996); #pragma pop /* 804C6988-804C698C 0004C0 0004+00 0/2 0/0 0/0 .rodata @7997 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7997 = 12.0f; -COMPILER_STRIP_GATE(804C6988, &lit_7997); +COMPILER_STRIP_GATE(0x804C6988, &lit_7997); #pragma pop /* 804C698C-804C6990 0004C4 0004+00 0/3 0/0 0/0 .rodata @7998 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7998 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(804C698C, &lit_7998); +COMPILER_STRIP_GATE(0x804C698C, &lit_7998); #pragma pop /* 804C6990-804C6994 0004C8 0004+00 0/1 0/0 0/0 .rodata @7999 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7999 = 95.0f; -COMPILER_STRIP_GATE(804C6990, &lit_7999); +COMPILER_STRIP_GATE(0x804C6990, &lit_7999); #pragma pop /* 804C6994-804C6998 0004CC 0004+00 0/2 0/0 0/0 .rodata @8000 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8000 = 1.0f / 100.0f; -COMPILER_STRIP_GATE(804C6994, &lit_8000); +COMPILER_STRIP_GATE(0x804C6994, &lit_8000); #pragma pop /* 804C6998-804C699C 0004D0 0004+00 0/1 0/0 0/0 .rodata @8001 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8001 = 1.0f / 80.0f; -COMPILER_STRIP_GATE(804C6998, &lit_8001); +COMPILER_STRIP_GATE(0x804C6998, &lit_8001); #pragma pop /* 804C699C-804C69A0 0004D4 0004+00 0/1 0/0 0/0 .rodata @8002 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8002 = 110.0f; -COMPILER_STRIP_GATE(804C699C, &lit_8002); +COMPILER_STRIP_GATE(0x804C699C, &lit_8002); #pragma pop /* 804C69A0-804C69A4 0004D8 0004+00 0/1 0/0 0/0 .rodata @8003 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8003 = 15.0f; -COMPILER_STRIP_GATE(804C69A0, &lit_8003); +COMPILER_STRIP_GATE(0x804C69A0, &lit_8003); #pragma pop /* 804C69A4-804C69A8 0004DC 0004+00 0/1 0/0 0/0 .rodata @8004 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8004 = 53.0f; -COMPILER_STRIP_GATE(804C69A4, &lit_8004); +COMPILER_STRIP_GATE(0x804C69A4, &lit_8004); #pragma pop /* 804C103C-804C287C 004E9C 1840+00 2/2 0/0 0/0 .text setAnm__9daMidna_cFv */ @@ -1910,42 +1929,42 @@ asm void daMidna_c::clearEyeMove() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8185 = 75.0f; -COMPILER_STRIP_GATE(804C69A8, &lit_8185); +COMPILER_STRIP_GATE(0x804C69A8, &lit_8185); #pragma pop /* 804C69AC-804C69B0 0004E4 0004+00 0/1 0/0 0/0 .rodata @8186 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_8186 = 0x39000000; -COMPILER_STRIP_GATE(804C69AC, &lit_8186); +COMPILER_STRIP_GATE(0x804C69AC, &lit_8186); #pragma pop /* 804C69B0-804C69B4 0004E8 0004+00 0/1 0/0 0/0 .rodata @8187 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8187 = 8.0f; -COMPILER_STRIP_GATE(804C69B0, &lit_8187); +COMPILER_STRIP_GATE(0x804C69B0, &lit_8187); #pragma pop /* 804C69B4-804C69B8 0004EC 0004+00 0/1 0/0 0/0 .rodata @8188 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8188 = -1.0f / 5.0f; -COMPILER_STRIP_GATE(804C69B4, &lit_8188); +COMPILER_STRIP_GATE(0x804C69B4, &lit_8188); #pragma pop /* 804C69B8-804C69BC 0004F0 0004+00 0/1 0/0 0/0 .rodata @8189 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8189 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(804C69B8, &lit_8189); +COMPILER_STRIP_GATE(0x804C69B8, &lit_8189); #pragma pop /* 804C69BC-804C69C0 0004F4 0004+00 0/1 0/0 0/0 .rodata @8190 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8190 = 3.0f / 100.0f; -COMPILER_STRIP_GATE(804C69BC, &lit_8190); +COMPILER_STRIP_GATE(0x804C69BC, &lit_8190); #pragma pop /* 804C2AB8-804C2EBC 006918 0404+00 1/1 0/0 0/0 .text setEyeMove__9daMidna_cFPC4cXyzss */ @@ -1975,14 +1994,14 @@ asm void daMidna_c::setNeckAngle() { SECTION_RODATA static u8 const localOffset[12] = { 0x00, 0x00, 0x00, 0x00, 0x43, 0x08, 0x00, 0x00, 0xC0, 0x19, 0x99, 0x9A, }; -COMPILER_STRIP_GATE(804C69C0, &localOffset); +COMPILER_STRIP_GATE(0x804C69C0, &localOffset); #pragma pop /* 804C69CC-804C69D0 000504 0004+00 0/2 0/0 0/0 .rodata @8304 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8304 = 28.0f; -COMPILER_STRIP_GATE(804C69CC, &lit_8304); +COMPILER_STRIP_GATE(0x804C69CC, &lit_8304); #pragma pop /* 804C3168-804C3298 006FC8 0130+00 1/1 0/0 0/0 .text initHairAngle__9daMidna_cFv */ @@ -2002,56 +2021,56 @@ asm void daMidna_c::initHairAngle() { SECTION_RODATA static u8 const hairOffset[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41, 0xE0, 0x00, 0x00, }; -COMPILER_STRIP_GATE(804C69D0, &hairOffset); +COMPILER_STRIP_GATE(0x804C69D0, &hairOffset); #pragma pop /* 804C69DC-804C69E0 000514 0004+00 0/1 0/0 0/0 .rodata @8646 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8646 = 0.75f; -COMPILER_STRIP_GATE(804C69DC, &lit_8646); +COMPILER_STRIP_GATE(0x804C69DC, &lit_8646); #pragma pop /* 804C69E0-804C69E4 000518 0004+00 0/1 0/0 0/0 .rodata @8647 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8647 = 1.0f / 25.0f; -COMPILER_STRIP_GATE(804C69E0, &lit_8647); +COMPILER_STRIP_GATE(0x804C69E0, &lit_8647); #pragma pop /* 804C69E4-804C69E8 00051C 0004+00 0/1 0/0 0/0 .rodata @8648 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8648 = 2048.0f; -COMPILER_STRIP_GATE(804C69E4, &lit_8648); +COMPILER_STRIP_GATE(0x804C69E4, &lit_8648); #pragma pop /* 804C69E8-804C69EC 000520 0004+00 0/1 0/0 0/0 .rodata @8649 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8649 = 4096.0f; -COMPILER_STRIP_GATE(804C69E8, &lit_8649); +COMPILER_STRIP_GATE(0x804C69E8, &lit_8649); #pragma pop /* 804C69EC-804C69F0 000524 0004+00 0/1 0/0 0/0 .rodata @8650 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8650 = 3.0f / 10.0f; -COMPILER_STRIP_GATE(804C69EC, &lit_8650); +COMPILER_STRIP_GATE(0x804C69EC, &lit_8650); #pragma pop /* 804C69F0-804C69F4 000528 0004+00 0/1 0/0 0/0 .rodata @8651 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_8651 = 0xBFDDB22D; -COMPILER_STRIP_GATE(804C69F0, &lit_8651); +COMPILER_STRIP_GATE(0x804C69F0, &lit_8651); #pragma pop /* 804C69F4-804C69F8 00052C 0004+00 0/1 0/0 0/0 .rodata @8652 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_8652 = 0xBF13CE53; -COMPILER_STRIP_GATE(804C69F4, &lit_8652); +COMPILER_STRIP_GATE(0x804C69F4, &lit_8652); #pragma pop /* 804C3298-804C3F04 0070F8 0C6C+00 2/2 0/0 0/0 .text setHairAngle__9daMidna_cFv */ @@ -2064,6 +2083,18 @@ asm void daMidna_c::setHairAngle() { } #pragma pop +/* ############################################################################################## */ +/* 804C6A60-804C6A60 000598 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_804C6C11 = "Midna"; +SECTION_DEAD static char const* const stringBase_804C6C17 = "pos"; +SECTION_DEAD static char const* const stringBase_804C6C1B = "speed"; +SECTION_DEAD static char const* const stringBase_804C6C21 = "angle"; +SECTION_DEAD static char const* const stringBase_804C6C27 = "npos"; +SECTION_DEAD static char const* const stringBase_804C6C2C = "fprm0"; +#pragma pop + /* 804C3F04-804C4394 007D64 0490+00 1/1 0/0 0/0 .text setDemoData__9daMidna_cFv */ #pragma push #pragma optimization_level 0 @@ -2111,7 +2142,7 @@ asm void daMidna_c::initMidnaModel() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9021 = 700.0f; -COMPILER_STRIP_GATE(804C69F8, &lit_9021); +COMPILER_STRIP_GATE(0x804C69F8, &lit_9021); #pragma pop /* 804C4750-804C49B8 0085B0 0268+00 2/2 0/0 0/0 .text daMidna_searchNpc__FP10fopAc_ac_cPv @@ -2163,56 +2194,56 @@ SECTION_RODATA static u8 const anmSoundLabel[32] = { 0x00, 0x06, 0x00, 0xDE, 0x00, 0x06, 0x00, 0xDF, 0x00, 0x06, 0x00, 0xE9, 0x00, 0x06, 0x00, 0xEA, 0x00, 0x06, 0x00, 0xEB, 0x00, 0x06, 0x00, 0xEC, 0x00, 0x06, 0x00, 0xE0, 0x00, 0x06, 0x00, 0xE1, }; -COMPILER_STRIP_GATE(804C69FC, &anmSoundLabel); +COMPILER_STRIP_GATE(0x804C69FC, &anmSoundLabel); #pragma pop /* 804C6A1C-804C6A20 000554 0004+00 0/1 0/0 0/0 .rodata @9219 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9219 = 83.0f; -COMPILER_STRIP_GATE(804C6A1C, &lit_9219); +COMPILER_STRIP_GATE(0x804C6A1C, &lit_9219); #pragma pop /* 804C6A20-804C6A24 000558 0004+00 0/1 0/0 0/0 .rodata @9220 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9220 = 99.0f; -COMPILER_STRIP_GATE(804C6A20, &lit_9220); +COMPILER_STRIP_GATE(0x804C6A20, &lit_9220); #pragma pop /* 804C6A24-804C6A28 00055C 0004+00 0/1 0/0 0/0 .rodata @9221 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9221 = 66.0f; -COMPILER_STRIP_GATE(804C6A24, &lit_9221); +COMPILER_STRIP_GATE(0x804C6A24, &lit_9221); #pragma pop /* 804C6A28-804C6A2C 000560 0004+00 0/1 0/0 0/0 .rodata @9222 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9222 = 11.0f; -COMPILER_STRIP_GATE(804C6A28, &lit_9222); +COMPILER_STRIP_GATE(0x804C6A28, &lit_9222); #pragma pop /* 804C6A2C-804C6A30 000564 0004+00 0/1 0/0 0/0 .rodata @9223 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9223 = 35.0f; -COMPILER_STRIP_GATE(804C6A2C, &lit_9223); +COMPILER_STRIP_GATE(0x804C6A2C, &lit_9223); #pragma pop /* 804C6A30-804C6A34 000568 0004+00 0/1 0/0 0/0 .rodata @9224 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9224 = 67.0f; -COMPILER_STRIP_GATE(804C6A30, &lit_9224); +COMPILER_STRIP_GATE(0x804C6A30, &lit_9224); #pragma pop /* 804C6A34-804C6A38 00056C 0004+00 0/1 0/0 0/0 .rodata @9225 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9225 = 34.0f; -COMPILER_STRIP_GATE(804C6A34, &lit_9225); +COMPILER_STRIP_GATE(0x804C6A34, &lit_9225); #pragma pop /* 804C4BC0-804C4FDC 008A20 041C+00 1/1 0/0 0/0 .text setSound__9daMidna_cFv */ @@ -2232,7 +2263,7 @@ asm void daMidna_c::setSound() { SECTION_RODATA static u8 const throughEffectJoint[12] = { 0x00, 0x04, 0x00, 0x02, 0x00, 0x14, 0x00, 0x04, 0x00, 0x02, 0x00, 0x14, }; -COMPILER_STRIP_GATE(804C6A38, &throughEffectJoint); +COMPILER_STRIP_GATE(0x804C6A38, &throughEffectJoint); #pragma pop /* 804C6A44-804C6A50 00057C 000C+00 0/1 0/0 0/0 .rodata throughEffectName$9353 */ @@ -2241,7 +2272,7 @@ COMPILER_STRIP_GATE(804C6A38, &throughEffectJoint); SECTION_RODATA static u8 const throughEffectName[12] = { 0x84, 0xDA, 0x84, 0xD9, 0x84, 0xDB, 0x84, 0xDD, 0x84, 0xDC, 0x84, 0xDE, }; -COMPILER_STRIP_GATE(804C6A44, &throughEffectName); +COMPILER_STRIP_GATE(0x804C6A44, &throughEffectName); #pragma pop /* 804C4FDC-804C59E8 008E3C 0A0C+00 1/1 0/0 0/0 .text execute__9daMidna_cFv */ @@ -2269,28 +2300,28 @@ static asm void daMidna_Execute(daMidna_c* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9812 = -32.0f; -COMPILER_STRIP_GATE(804C6A50, &lit_9812); +COMPILER_STRIP_GATE(0x804C6A50, &lit_9812); #pragma pop /* 804C6A54-804C6A58 00058C 0004+00 0/1 0/0 0/0 .rodata @9813 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9813 = 200.0f; -COMPILER_STRIP_GATE(804C6A54, &lit_9813); +COMPILER_STRIP_GATE(0x804C6A54, &lit_9813); #pragma pop /* 804C6A58-804C6A5C 000590 0004+00 0/1 0/0 0/0 .rodata @9814 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9814 = 600.0f; -COMPILER_STRIP_GATE(804C6A58, &lit_9814); +COMPILER_STRIP_GATE(0x804C6A58, &lit_9814); #pragma pop /* 804C6A5C-804C6A60 000594 0004+00 0/1 0/0 0/0 .rodata @9815 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9815 = 40.0f; -COMPILER_STRIP_GATE(804C6A5C, &lit_9815); +COMPILER_STRIP_GATE(0x804C6A5C, &lit_9815); #pragma pop /* 804C5A08-804C6184 009868 077C+00 1/1 0/0 0/0 .text draw__9daMidna_cFv */ @@ -2347,7 +2378,7 @@ asm void J3DTexNoAnm::calc(u16* param_0) const { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_804C637C(u8* param_0) { +extern "C" asm void func_804C637C(void* _this, u8* param_0) { nofralloc #include "asm/rel/d/a/d_a_midna/d_a_midna/func_804C637C.s" } @@ -2373,28 +2404,4 @@ asm daMidna_matAnm_c::~daMidna_matAnm_c() { } #pragma pop -/* 804C6A60-804C6C32 000598 01D2+00 2/2 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_804C6A60 = "demo00_Midna_cut00_HL_tmp.bmd"; -SECTION_DEAD static char const* const stringBase_804C6A7E = "demo00_Midna_cut00_HL_tmp.bck"; -SECTION_DEAD static char const* const stringBase_804C6A9C = "demo00_Midna_cut00_HR_tmp.bmd"; -SECTION_DEAD static char const* const stringBase_804C6ABA = "demo00_Midna_cut00_HR_tmp.bck"; -SECTION_DEAD static char const* const stringBase_804C6AD8 = "demo00_Midna_cut00_HD_tmp.bmd"; -SECTION_DEAD static char const* const stringBase_804C6AF6 = "demo00_Midna_cut00_HD_tmp.bck"; -SECTION_DEAD static char const* const stringBase_804C6B14 = "demo00_Midna_cut00_FC_blend.bmd"; -SECTION_DEAD static char const* const stringBase_804C6B34 = "demo00_Midna_cut00_FC_tongue.bmd"; -SECTION_DEAD static char const* const stringBase_804C6B55 = "demo00_Midna_cut00_FC_tmp.bck"; -SECTION_DEAD static char const* const stringBase_804C6B73 = "demo00_Midna_cut00_BD_tmp.bmd"; -SECTION_DEAD static char const* const stringBase_804C6B91 = "demo00_Midna_cut00_BD_mask.bmd"; -SECTION_DEAD static char const* const stringBase_804C6BB0 = "demo00_Midna_cut00_BD_hands.bmd"; -SECTION_DEAD static char const* const stringBase_804C6BD0 = "demo00_Midna_cut00_BD_hairhand.bmd"; -SECTION_DEAD static char const* const stringBase_804C6BF3 = "demo00_Midna_cut00_FC_tmp.bls"; -SECTION_DEAD static char const* const stringBase_804C6C11 = "Midna"; -SECTION_DEAD static char const* const stringBase_804C6C17 = "pos"; -SECTION_DEAD static char const* const stringBase_804C6C1B = "speed"; -SECTION_DEAD static char const* const stringBase_804C6C21 = "angle"; -SECTION_DEAD static char const* const stringBase_804C6C27 = "npos"; -SECTION_DEAD static char const* const stringBase_804C6C2C = "fprm0"; -#pragma pop +/* 804C6A60-804C6A60 000598 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/d_a_mirror/d_a_mirror.cpp b/rel/d/a/d_a_mirror/d_a_mirror.cpp index 0e932453c4b..4ae0f9c6553 100644 --- a/rel/d/a/d_a_mirror/d_a_mirror.cpp +++ b/rel/d/a/d_a_mirror/d_a_mirror.cpp @@ -286,6 +286,13 @@ static asm void daMirror_c_createHeap(fopAc_ac_c* param_0) { #pragma pop /* ############################################################################################## */ +/* 80872650-80872650 0000C4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80872650 = "Mirror"; +SECTION_DEAD static char const* const stringBase_80872657 = "MR-Table"; +#pragma pop + /* 80872660-80872664 -00001 0004+00 3/3 0/0 0/0 .data l_arcName */ SECTION_DATA static void* l_arcName = (void*)&d_a_mirror__stringBase0; @@ -388,7 +395,7 @@ asm void dMirror_packet_c::entryModel(J3DModel* param_0) { /* ############################################################################################## */ /* 8087258C-80872590 000000 0004+00 3/3 0/0 0/0 .rodata @3884 */ SECTION_RODATA static u32 const lit_3884 = 0x000000FF; -COMPILER_STRIP_GATE(8087258C, &lit_3884); +COMPILER_STRIP_GATE(0x8087258C, &lit_3884); /* 80872590-80872598 000004 0008+00 0/1 0/0 0/0 .rodata l_texCoord$3899 */ #pragma push @@ -396,7 +403,7 @@ COMPILER_STRIP_GATE(8087258C, &lit_3884); SECTION_RODATA static u8 const l_texCoord[8] = { 0x00, 0x00, 0x01, 0x00, 0x01, 0x01, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80872590, &l_texCoord); +COMPILER_STRIP_GATE(0x80872590, &l_texCoord); #pragma pop /* 80872598-8087259C 00000C 0004+00 2/4 0/0 0/0 .rodata @3945 */ @@ -406,27 +413,27 @@ SECTION_RODATA static u8 const lit_3945[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80872598, &lit_3945); +COMPILER_STRIP_GATE(0x80872598, &lit_3945); /* 8087259C-808725A0 000010 0004+00 0/1 0/0 0/0 .rodata @3946 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3946 = 100.0f; -COMPILER_STRIP_GATE(8087259C, &lit_3946); +COMPILER_STRIP_GATE(0x8087259C, &lit_3946); #pragma pop /* 808725A0-808725A4 000014 0004+00 0/3 0/0 0/0 .rodata @3947 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3947 = 1.0f; -COMPILER_STRIP_GATE(808725A0, &lit_3947); +COMPILER_STRIP_GATE(0x808725A0, &lit_3947); #pragma pop /* 808725A4-808725A8 000018 0004+00 0/1 0/0 0/0 .rodata @3948 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3948 = -100.0f; -COMPILER_STRIP_GATE(808725A4, &lit_3948); +COMPILER_STRIP_GATE(0x808725A4, &lit_3948); #pragma pop /* 80870D88-80871268 000248 04E0+00 1/1 0/0 0/0 .text mirrorZdraw__16dMirror_packet_cFPfPfffffff @@ -449,7 +456,7 @@ SECTION_RODATA static u8 const lit_3956[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(808725A8, &lit_3956); +COMPILER_STRIP_GATE(0x808725A8, &lit_3956); /* 80871268-8087146C 000728 0204+00 1/1 0/0 0/0 .text * modelDraw__16dMirror_packet_cFP8J3DModelPA4_f */ @@ -467,56 +474,56 @@ asm void dMirror_packet_c::modelDraw(J3DModel* param_0, f32 (*param_1)[4]) { #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4345 = 0x3C8EFA35; -COMPILER_STRIP_GATE(808725AC, &lit_4345); +COMPILER_STRIP_GATE(0x808725AC, &lit_4345); #pragma pop /* 808725B0-808725B4 000024 0004+00 0/1 0/0 0/0 .rodata @4346 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4346 = 0.5f; -COMPILER_STRIP_GATE(808725B0, &lit_4346); +COMPILER_STRIP_GATE(0x808725B0, &lit_4346); #pragma pop /* 808725B4-808725B8 000028 0004+00 0/1 0/0 0/0 .rodata @4347 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4347 = 2.0f; -COMPILER_STRIP_GATE(808725B4, &lit_4347); +COMPILER_STRIP_GATE(0x808725B4, &lit_4347); #pragma pop /* 808725B8-808725BC 00002C 0004+00 0/1 0/0 0/0 .rodata @4348 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4348 = 304.0f; -COMPILER_STRIP_GATE(808725B8, &lit_4348); +COMPILER_STRIP_GATE(0x808725B8, &lit_4348); #pragma pop /* 808725BC-808725C0 000030 0004+00 0/1 0/0 0/0 .rodata @4349 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4349 = 608.0f; -COMPILER_STRIP_GATE(808725BC, &lit_4349); +COMPILER_STRIP_GATE(0x808725BC, &lit_4349); #pragma pop /* 808725C0-808725C4 000034 0004+00 0/1 0/0 0/0 .rodata @4350 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4350 = 224.0f; -COMPILER_STRIP_GATE(808725C0, &lit_4350); +COMPILER_STRIP_GATE(0x808725C0, &lit_4350); #pragma pop /* 808725C4-808725C8 000038 0004+00 0/1 0/0 0/0 .rodata @4351 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4351 = 448.0f; -COMPILER_STRIP_GATE(808725C4, &lit_4351); +COMPILER_STRIP_GATE(0x808725C4, &lit_4351); #pragma pop /* 808725C8-808725CC 00003C 0004+00 0/1 0/0 0/0 .rodata @4352 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4352 = 8.0f; -COMPILER_STRIP_GATE(808725C8, &lit_4352); +COMPILER_STRIP_GATE(0x808725C8, &lit_4352); #pragma pop /* 808725CC-808725D4 000040 0004+04 0/2 0/0 0/0 .rodata @4353 */ @@ -527,7 +534,7 @@ SECTION_RODATA static f32 const lit_4353[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(808725CC, &lit_4353); +COMPILER_STRIP_GATE(0x808725CC, &lit_4353); #pragma pop /* 808725D4-808725DC 000048 0008+00 0/1 0/0 0/0 .rodata @4355 */ @@ -536,7 +543,7 @@ COMPILER_STRIP_GATE(808725CC, &lit_4353); SECTION_RODATA static u8 const lit_4355[8] = { 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(808725D4, &lit_4355); +COMPILER_STRIP_GATE(0x808725D4, &lit_4355); #pragma pop /* 8087146C-80871D84 00092C 0918+00 1/1 0/0 0/1 .text mainDraw__16dMirror_packet_cFv */ @@ -618,7 +625,7 @@ SECTION_RODATA static u8 const lit_4406[48] = { 0x43, 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0x91, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC2, 0x91, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(808725DC, &lit_4406); +COMPILER_STRIP_GATE(0x808725DC, &lit_4406); #pragma pop /* 8087260C-8087263C 000080 0030+00 1/1 0/0 0/0 .rodata @@ -628,20 +635,20 @@ SECTION_RODATA static u8 const data_8087260C[48] = { 0x42, 0xC8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0x48, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC2, 0x48, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8087260C, &data_8087260C); +COMPILER_STRIP_GATE(0x8087260C, &data_8087260C); /* 8087263C-80872648 0000B0 000C+00 1/1 0/0 0/0 .rodata * l_mirrorLook$localstatic4$create__10daMirror_cFv */ SECTION_RODATA static u8 const data_8087263C[12] = { 0x00, 0x00, 0x00, 0x00, 0x42, 0x48, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8087263C, &data_8087263C); +COMPILER_STRIP_GATE(0x8087263C, &data_8087263C); /* 80872648-8087264C 0000BC 0004+00 0/1 0/0 0/0 .rodata @4544 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4544 = 10.0f; -COMPILER_STRIP_GATE(80872648, &lit_4544); +COMPILER_STRIP_GATE(0x80872648, &lit_4544); #pragma pop /* 8087206C-80872344 00152C 02D8+00 2/2 0/0 0/0 .text create__10daMirror_cFv */ @@ -677,7 +684,7 @@ static asm void daMirror_execute(daMirror_c* param_0) { /* ############################################################################################## */ /* 8087264C-80872650 0000C0 0004+00 1/1 0/0 0/0 .rodata @4574 */ SECTION_RODATA static f32 const lit_4574 = 40000.0f; -COMPILER_STRIP_GATE(8087264C, &lit_4574); +COMPILER_STRIP_GATE(0x8087264C, &lit_4574); /* 808723E4-808724C0 0018A4 00DC+00 1/1 0/0 0/0 .text execute__10daMirror_cFv */ #pragma push @@ -710,10 +717,4 @@ asm void daMirror_c::entryModel(J3DModel* param_0) { } #pragma pop -/* 80872650-80872660 0000C4 0010+00 2/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80872650 = "Mirror"; -SECTION_DEAD static char const* const stringBase_80872657 = "MR-Table"; -#pragma pop +/* 80872650-80872650 0000C4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/d_a_movie_player/d_a_movie_player.cpp b/rel/d/a/d_a_movie_player/d_a_movie_player.cpp index 0674cc223e9..07b00595555 100644 --- a/rel/d/a/d_a_movie_player/d_a_movie_player.cpp +++ b/rel/d/a/d_a_movie_player/d_a_movie_player.cpp @@ -94,7 +94,6 @@ struct JASMixMode {}; struct JASDriver { /* 8029C9DC */ void registerMixCallback(s16* (*)(s32), JASMixMode); - /* 8029E180 */ void getOutputMode(); }; // @@ -622,7 +621,7 @@ SECTION_RODATA static u8 const __THPJpegNaturalOrder[80] = { 0x3A, 0x3B, 0x34, 0x2D, 0x26, 0x1F, 0x27, 0x2E, 0x35, 0x3C, 0x3D, 0x36, 0x2F, 0x37, 0x3E, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, }; -COMPILER_STRIP_GATE(80879034, &__THPJpegNaturalOrder); +COMPILER_STRIP_GATE(0x80879034, &__THPJpegNaturalOrder); /* 80879084-808790C4 000050 0040+00 1/1 0/0 0/0 .rodata __THPAANScaleFactor */ SECTION_RODATA static u8 const __THPAANScaleFactor[64] = { @@ -631,13 +630,13 @@ SECTION_RODATA static u8 const __THPAANScaleFactor[64] = { 0x3F, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3F, 0xE9, 0x24, 0x69, 0xC0, 0x00, 0x00, 0x00, 0x3F, 0xE1, 0x51, 0x7A, 0x80, 0x00, 0x00, 0x00, 0x3F, 0xD1, 0xA8, 0x55, 0xE0, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80879084, &__THPAANScaleFactor); +COMPILER_STRIP_GATE(0x80879084, &__THPAANScaleFactor); /* 808790C4-808790CC 000090 0008+00 1/1 0/0 0/0 .rodata @3998 */ SECTION_RODATA static u8 const lit_3998[8] = { 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(808790C4, &lit_3998); +COMPILER_STRIP_GATE(0x808790C4, &lit_3998); /* 808731B4-80873574 000AD4 03C0+00 1/1 0/0 0/0 .text __THPReadQuantizationTable */ #pragma push @@ -755,35 +754,35 @@ asm void __THPDecompressiMCURow512x448() { #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4205 = 0x3FB504F3; -COMPILER_STRIP_GATE(808790CC, &lit_4205); +COMPILER_STRIP_GATE(0x808790CC, &lit_4205); #pragma pop /* 808790D0-808790D4 00009C 0004+00 0/2 0/0 0/0 .rodata @4206 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4206 = 0x3FEC835E; -COMPILER_STRIP_GATE(808790D0, &lit_4206); +COMPILER_STRIP_GATE(0x808790D0, &lit_4206); #pragma pop /* 808790D4-808790D8 0000A0 0004+00 0/2 0/0 0/0 .rodata @4207 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4207 = 0x3F8A8BD4; -COMPILER_STRIP_GATE(808790D4, &lit_4207); +COMPILER_STRIP_GATE(0x808790D4, &lit_4207); #pragma pop /* 808790D8-808790DC 0000A4 0004+00 0/2 0/0 0/0 .rodata @4208 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4208 = 0xC0273D75; -COMPILER_STRIP_GATE(808790D8, &lit_4208); +COMPILER_STRIP_GATE(0x808790D8, &lit_4208); #pragma pop /* 808790DC-808790E0 0000A8 0004+00 0/2 0/0 0/0 .rodata @4209 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4209 = 1024.0f; -COMPILER_STRIP_GATE(808790DC, &lit_4209); +COMPILER_STRIP_GATE(0x808790DC, &lit_4209); #pragma pop /* 80873FBC-8087445C 0018DC 04A0+00 3/3 0/0 0/0 .text __THPInverseDCTY8 */ @@ -1027,6 +1026,12 @@ static asm void daMP_NEXT_READ_SIZE(daMP_THPReadBuffer* param_0) { #pragma pop /* ############################################################################################## */ +/* 8087911C-8087911C 0000E8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8087911C = "Can't create read thread\n"; +#pragma pop + /* 8087A198-8087C198 000BF8 2000+00 0/1 0/0 0/0 .bss daMP_ReadThreadStack */ #pragma push #pragma force_active on @@ -1147,6 +1152,13 @@ static asm void daMP_VideoDecoderForOnMemory(void* param_0) { } #pragma pop +/* ############################################################################################## */ +/* 8087911C-8087911C 0000E8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80879136 = "Can't create video decode thread\n"; +#pragma pop + /* 80875FD4-808760EC 0038F4 0118+00 1/1 0/0 0/0 .text daMP_CreateVideoDecodeThread__FlPUc */ #pragma push @@ -1269,6 +1281,13 @@ static asm void daMP_AudioDecoderForOnMemory(void* param_0) { } #pragma pop +/* ############################################################################################## */ +/* 8087911C-8087911C 0000E8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80879158 = "Can't create audio decode thread\n"; +#pragma pop + /* 808763EC-808764E8 003D0C 00FC+00 1/1 0/0 0/0 .text daMP_CreateAudioDecodeThread__FlPUc */ #pragma push @@ -1313,13 +1332,13 @@ static asm void daMP_THPGXRestore() { /* ############################################################################################## */ /* 808790E0-808790E4 0000AC 0004+00 1/1 0/0 0/0 .rodata @4465 */ SECTION_RODATA static f32 const lit_4465 = 100.0f; -COMPILER_STRIP_GATE(808790E0, &lit_4465); +COMPILER_STRIP_GATE(0x808790E0, &lit_4465); /* 808790E4-808790E8 0000B0 0004+00 0/0 0/0 0/0 .rodata @4466 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4466 = 60.0f; -COMPILER_STRIP_GATE(808790E4, &lit_4466); +COMPILER_STRIP_GATE(0x808790E4, &lit_4466); #pragma pop /* 808790E8-808790F0 0000B4 0008+00 0/1 0/0 0/0 .rodata @4779 */ @@ -1328,28 +1347,28 @@ COMPILER_STRIP_GATE(808790E4, &lit_4466); SECTION_RODATA static u8 const lit_4779[8] = { 0xFF, 0xA6, 0x00, 0x00, 0xFF, 0x8E, 0x00, 0x87, }; -COMPILER_STRIP_GATE(808790E8, &lit_4779); +COMPILER_STRIP_GATE(0x808790E8, &lit_4779); #pragma pop /* 808790F0-808790F4 0000BC 0004+00 0/1 0/0 0/0 .rodata @4782 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4782 = 0x0000E258; -COMPILER_STRIP_GATE(808790F0, &lit_4782); +COMPILER_STRIP_GATE(0x808790F0, &lit_4782); #pragma pop /* 808790F4-808790F8 0000C0 0004+00 0/1 0/0 0/0 .rodata @4785 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4785 = 0xB30000B6; -COMPILER_STRIP_GATE(808790F4, &lit_4785); +COMPILER_STRIP_GATE(0x808790F4, &lit_4785); #pragma pop /* 808790F8-808790FC 0000C4 0004+00 0/1 0/0 0/0 .rodata @4788 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4788 = 0xFF00FF80; -COMPILER_STRIP_GATE(808790F8, &lit_4788); +COMPILER_STRIP_GATE(0x808790F8, &lit_4788); #pragma pop /* 808790FC-80879100 0000C8 0004+00 2/4 0/0 0/0 .rodata @4809 */ @@ -1359,13 +1378,13 @@ SECTION_RODATA static u8 const lit_4809[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(808790FC, &lit_4809); +COMPILER_STRIP_GATE(0x808790FC, &lit_4809); /* 80879100-80879104 0000CC 0004+00 0/1 0/0 0/0 .rodata @4810 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4810 = -1.0f; -COMPILER_STRIP_GATE(80879100, &lit_4810); +COMPILER_STRIP_GATE(0x80879100, &lit_4810); #pragma pop /* 80879104-8087910C 0000D0 0004+04 1/3 0/0 0/0 .rodata @4811 */ @@ -1374,13 +1393,13 @@ SECTION_RODATA static f32 const lit_4811[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80879104, &lit_4811); +COMPILER_STRIP_GATE(0x80879104, &lit_4811); /* 8087910C-80879114 0000D8 0008+00 2/3 0/0 0/0 .rodata @4814 */ SECTION_RODATA static u8 const lit_4814[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8087910C, &lit_4814); +COMPILER_STRIP_GATE(0x8087910C, &lit_4814); /* 8087667C-80876BA8 003F9C 052C+00 1/1 0/0 0/0 .text * daMP_THPGXYuv2RgbSetup__FPC16_GXRenderModeObj */ @@ -1443,7 +1462,7 @@ static asm void GXPosition3s16() { /* ############################################################################################## */ /* 80879114-80879118 0000E0 0004+00 1/1 0/0 0/0 .rodata @4894 */ SECTION_RODATA static f32 const lit_4894 = 7.0f / 10.0f; -COMPILER_STRIP_GATE(80879114, &lit_4894); +COMPILER_STRIP_GATE(0x80879114, &lit_4894); /* 80879434-80879534 000000 0100+00 1/1 0/0 0/0 .data daMP_VolumeTable */ SECTION_DATA static u8 daMP_VolumeTable[256] = { @@ -1615,7 +1634,31 @@ static asm void daMP_THPPlayerQuit() { /* ############################################################################################## */ /* 80879118-8087911C 0000E4 0004+00 1/2 0/0 0/0 .rodata @4983 */ SECTION_RODATA static f32 const lit_4983 = 127.0f; -COMPILER_STRIP_GATE(80879118, &lit_4983); +COMPILER_STRIP_GATE(0x80879118, &lit_4983); + +/* 8087911C-8087911C 0000E8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8087917A = + "You must call daMP_THPPlayerInit before you call" + " this function\n"; +SECTION_DEAD static char const* const stringBase_808791BA = + "Can't open %s. Because thp file have already ope" + "ned.\n"; +SECTION_DEAD static char const* const stringBase_808791F0 = "Can't open %s.\n"; +SECTION_DEAD static char const* const stringBase_80879200 = + "Fail to read the header from THP file.\n"; +SECTION_DEAD static char const* const stringBase_80879228 = "THP"; +SECTION_DEAD static char const* const stringBase_8087922C = "This file is not THP file.\n"; +SECTION_DEAD static char const* const stringBase_80879248 = "invalid version.\n"; +SECTION_DEAD static char const* const stringBase_8087925A = + "Fail to read the frame component infomation from" + " THP file.\n"; +SECTION_DEAD static char const* const stringBase_80879296 = + "Fail to read the video infomation from THP file." + "\n"; +SECTION_DEAD static char const* const stringBase_808792C8 = "Unknow frame components.\n"; +#pragma pop /* 8087730C-808776EC 004C2C 03E0+00 1/1 0/0 0/0 .text daMP_THPPlayerOpen__FPCci */ #pragma push @@ -1717,6 +1760,23 @@ static asm void daMP_PrepareReady(int param_0) { } #pragma pop +/* ############################################################################################## */ +/* 8087911C-8087911C 0000E8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_808792E2 = + "This thp file doesn't have the offset data\n"; +SECTION_DEAD static char const* const stringBase_8087930E = + "Fail to read the offset data from THP file.\n"; +SECTION_DEAD static char const* const stringBase_8087933B = + "Specified frame number is over total frame numbe" + "r\n"; +SECTION_DEAD static char const* const stringBase_8087936E = + "Specified audio track number is invalid\n"; +SECTION_DEAD static char const* const stringBase_80879397 = + "Fail to read all movie data from THP file\n"; +#pragma pop + /* 80877FB8-808782A0 0058D8 02E8+00 1/1 0/0 0/0 .text daMP_THPPlayerPrepare__Flll */ #pragma push #pragma optimization_level 0 @@ -1851,6 +1911,15 @@ static asm void daMP_THPPlayerSetVolume(s32 param_0, s32 param_1) { } #pragma pop +/* ############################################################################################## */ +/* 8087911C-8087911C 0000E8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_808793C2 = "Fail to open the thp file\n"; +SECTION_DEAD static char const* const stringBase_808793DD = "Can't allocate the memory"; +SECTION_DEAD static char const* const stringBase_808793F7 = "Fail to prepare\n"; +#pragma pop + /* 80878758-808788BC 006078 0164+00 1/1 0/0 0/0 .text daMP_ActivePlayer_Init__FPCc */ #pragma push #pragma optimization_level 0 @@ -1920,6 +1989,13 @@ static asm void JKRFree(void* param_0) { } #pragma pop +/* ############################################################################################## */ +/* 8087911C-8087911C 0000E8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80879408 = "Error happen"; +#pragma pop + /* 80878938-80878994 006258 005C+00 1/1 0/0 0/0 .text daMP_ActivePlayer_Main__Fv */ #pragma push #pragma optimization_level 0 @@ -2025,6 +2101,13 @@ asm void daMP_c::daMP_c_Get_arg_movieNo() { } #pragma pop +/* ############################################################################################## */ +/* 8087911C-8087911C 0000E8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80879415 = "/Movie/demo_movie%02d_%02d.thp"; +#pragma pop + /* 80878C28-80878D10 006548 00E8+00 1/1 0/0 0/0 .text daMP_c_Init__6daMP_cFv */ #pragma push #pragma optimization_level 0 @@ -2228,7 +2311,7 @@ asm void __sinit_d_a_movie_player_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80878FB0 = (void*)__sinit_d_a_movie_player_cpp; +REGISTER_CTORS(0x80878FB0, __sinit_d_a_movie_player_cpp); #pragma pop /* ############################################################################################## */ @@ -2463,46 +2546,4 @@ static u8 data_80945B6C[4]; static u8 data_80945B70[4]; #pragma pop -/* 8087911C-80879434 0000E8 0318+00 8/8 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_8087911C = "Can't create read thread\n"; -SECTION_DEAD static char const* const stringBase_80879136 = "Can't create video decode thread\n"; -SECTION_DEAD static char const* const stringBase_80879158 = "Can't create audio decode thread\n"; -SECTION_DEAD static char const* const stringBase_8087917A = - "You must call daMP_THPPlayerInit before you call" - " this function\n"; -SECTION_DEAD static char const* const stringBase_808791BA = - "Can't open %s. Because thp file have already ope" - "ned.\n"; -SECTION_DEAD static char const* const stringBase_808791F0 = "Can't open %s.\n"; -SECTION_DEAD static char const* const stringBase_80879200 = - "Fail to read the header from THP file.\n"; -SECTION_DEAD static char const* const stringBase_80879228 = "THP"; -SECTION_DEAD static char const* const stringBase_8087922C = "This file is not THP file.\n"; -SECTION_DEAD static char const* const stringBase_80879248 = "invalid version.\n"; -SECTION_DEAD static char const* const stringBase_8087925A = - "Fail to read the frame component infomation from" - " THP file.\n"; -SECTION_DEAD static char const* const stringBase_80879296 = - "Fail to read the video infomation from THP file." - "\n"; -SECTION_DEAD static char const* const stringBase_808792C8 = "Unknow frame components.\n"; -SECTION_DEAD static char const* const stringBase_808792E2 = - "This thp file doesn't have the offset data\n"; -SECTION_DEAD static char const* const stringBase_8087930E = - "Fail to read the offset data from THP file.\n"; -SECTION_DEAD static char const* const stringBase_8087933B = - "Specified frame number is over total frame numbe" - "r\n"; -SECTION_DEAD static char const* const stringBase_8087936E = - "Specified audio track number is invalid\n"; -SECTION_DEAD static char const* const stringBase_80879397 = - "Fail to read all movie data from THP file\n"; -SECTION_DEAD static char const* const stringBase_808793C2 = "Fail to open the thp file\n"; -SECTION_DEAD static char const* const stringBase_808793DD = "Can't allocate the memory"; -SECTION_DEAD static char const* const stringBase_808793F7 = "Fail to prepare\n"; -SECTION_DEAD static char const* const stringBase_80879408 = "Error happen"; -SECTION_DEAD static char const* const stringBase_80879415 = "/Movie/demo_movie%02d_%02d.thp"; -#pragma pop +/* 8087911C-8087911C 0000E8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/d_a_myna/d_a_myna.cpp b/rel/d/a/d_a_myna/d_a_myna.cpp index da599536e9b..27235246dfb 100644 --- a/rel/d/a/d_a_myna/d_a_myna.cpp +++ b/rel/d/a/d_a_myna/d_a_myna.cpp @@ -52,20 +52,20 @@ struct mDoExt_baseAnm { /* 8000D428 */ void play(); }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; +struct J3DAnmTransform {}; + +struct J3DModelData {}; + struct Z2Creature { /* 802C03C8 */ Z2Creature(); /* 802C0420 */ ~Z2Creature(); /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -94,10 +94,10 @@ struct daObj_SSItem_c { /* 80CE77F8 */ void getExchangeItemPtr(); }; -struct J3DModel {}; - struct J3DAnmTransformKey {}; +struct J3DModel {}; + struct J3DFrameCtrl { /* 803283FC */ void init(s16); /* 80946370 */ ~J3DFrameCtrl(); @@ -422,8 +422,8 @@ extern "C" void __dt__12daMyna_HIO_cFv(); extern "C" void __dt__14mDoHIO_entry_cFv(); extern "C" void getHeadTopPos__9daPy_py_cCFv(); extern "C" void __dt__8daMyna_cFv(); -extern "C" void func_8094ABAC(s16*); -extern "C" void func_8094ABC8(int, int); +extern "C" void func_8094ABAC(void* _this, s16*); +extern "C" void func_8094ABC8(void* _this, int, int); extern "C" void __sinit_d_a_myna_cpp(); extern "C" u8 const mCcDSph__8daMyna_c[64]; extern "C" extern char const* const d_a_myna__stringBase0; @@ -741,7 +741,7 @@ SECTION_RODATA u8 const daMyna_c::mCcDSph[64] = { 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41, 0x70, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8094B1B0, &daMyna_c::mCcDSph); +COMPILER_STRIP_GATE(0x8094B1B0, &daMyna_c::mCcDSph); /* 8094B1F0-8094B1F4 000040 0004+00 25/32 0/0 0/0 .rodata @3926 */ SECTION_RODATA static u8 const lit_3926[4] = { @@ -750,7 +750,7 @@ SECTION_RODATA static u8 const lit_3926[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(8094B1F0, &lit_3926); +COMPILER_STRIP_GATE(0x8094B1F0, &lit_3926); /* 80945E80-80945EC0 000300 0040+00 1/0 0/0 0/0 .text baseMotion00__8daMyna_cFi */ #pragma push @@ -823,6 +823,28 @@ asm void daMyna_c::baseMotion06(int param_0) { #pragma pop /* ############################################################################################## */ +/* 8094B24C-8094B24C 00009C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8094B24C = "MYNA_hovering.bck"; +SECTION_DEAD static char const* const stringBase_8094B25E = "MYNA_wait_a.bck"; +SECTION_DEAD static char const* const stringBase_8094B26E = "MYNA_pick_a.bck"; +SECTION_DEAD static char const* const stringBase_8094B27E = "MYNA_pick_b.bck"; +SECTION_DEAD static char const* const stringBase_8094B28E = "MYNA_jump.bck"; +SECTION_DEAD static char const* const stringBase_8094B29C = "MYNA_sidestepL.bck"; +SECTION_DEAD static char const* const stringBase_8094B2AF = "MYNA_sidestepR.bck"; +SECTION_DEAD static char const* const stringBase_8094B2C2 = "MYNA_lightup.bck"; +SECTION_DEAD static char const* const stringBase_8094B2D3 = "MYNA_attack.bck"; +SECTION_DEAD static char const* const stringBase_8094B2E3 = "MYNA_talk_a.bck"; +SECTION_DEAD static char const* const stringBase_8094B2F3 = "MYNA_talk_b.bck"; +SECTION_DEAD static char const* const stringBase_8094B303 = "MYNA_wait_b.bck"; +SECTION_DEAD static char const* const stringBase_8094B313 = "MYNA_wait_c.bck"; +SECTION_DEAD static char const* const stringBase_8094B323 = "MYNA_talk_c.bck"; +SECTION_DEAD static char const* const stringBase_8094B333 = "MYNA_wait_d.bck"; +SECTION_DEAD static char const* const stringBase_8094B343 = "MYNA.btp"; +SECTION_DEAD static char const* const stringBase_8094B34C = "Npc_myna"; +#pragma pop + /* 8094B360-8094B36C 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -1609,11 +1631,11 @@ asm void daMyna_c::draw() { /* ############################################################################################## */ /* 8094B1F4-8094B1F8 000044 0004+00 1/1 0/0 0/0 .rodata @4207 */ SECTION_RODATA static f32 const lit_4207 = 40.0f; -COMPILER_STRIP_GATE(8094B1F4, &lit_4207); +COMPILER_STRIP_GATE(0x8094B1F4, &lit_4207); /* 8094B1F8-8094B1FC 000048 0004+00 1/3 0/0 0/0 .rodata @4208 */ SECTION_RODATA static f32 const lit_4208 = 100.0f; -COMPILER_STRIP_GATE(8094B1F8, &lit_4208); +COMPILER_STRIP_GATE(0x8094B1F8, &lit_4208); /* 809464CC-809466D8 00094C 020C+00 2/2 0/0 0/0 .text execute__8daMyna_cFv */ #pragma push @@ -1628,7 +1650,13 @@ asm void daMyna_c::execute() { /* ############################################################################################## */ /* 8094B1FC-8094B200 00004C 0004+00 11/12 0/0 0/0 .rodata @4270 */ SECTION_RODATA static f32 const lit_4270 = 1.0f; -COMPILER_STRIP_GATE(8094B1FC, &lit_4270); +COMPILER_STRIP_GATE(0x8094B1FC, &lit_4270); + +/* 8094B24C-8094B24C 00009C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8094B355 = "MYNA.bmd"; +#pragma pop /* 809466D8-8094686C 000B58 0194+00 1/1 0/0 0/0 .text createHeap__8daMyna_cFv */ #pragma push @@ -1765,7 +1793,7 @@ asm void daMyna_c::greet_wait_init() { /* ############################################################################################## */ /* 8094B200-8094B204 000050 0004+00 1/1 0/0 0/0 .rodata @4481 */ SECTION_RODATA static f32 const lit_4481 = 350.0f; -COMPILER_STRIP_GATE(8094B200, &lit_4481); +COMPILER_STRIP_GATE(0x8094B200, &lit_4481); /* 80946EB0-80947030 001330 0180+00 1/0 0/0 0/0 .text greet_wait_move__8daMyna_cFv */ #pragma push @@ -1810,7 +1838,7 @@ asm void daMyna_c::shopping_wait_init() { /* ############################################################################################## */ /* 8094B204-8094B208 000054 0004+00 1/1 0/0 0/0 .rodata @4655 */ SECTION_RODATA static f32 const lit_4655 = 450.0f; -COMPILER_STRIP_GATE(8094B204, &lit_4655); +COMPILER_STRIP_GATE(0x8094B204, &lit_4655); /* 809471E8-809475B4 001668 03CC+00 1/0 0/0 0/0 .text shopping_wait_move__8daMyna_cFv */ #pragma push @@ -1901,7 +1929,7 @@ SECTION_RODATA static f32 const lit_4828[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(8094B208, &lit_4828); +COMPILER_STRIP_GATE(0x8094B208, &lit_4828); #pragma pop /* 8094B210-8094B218 000060 0008+00 0/6 0/0 0/0 .rodata @4829 */ @@ -1910,7 +1938,7 @@ COMPILER_STRIP_GATE(8094B208, &lit_4828); SECTION_RODATA static u8 const lit_4829[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8094B210, &lit_4829); +COMPILER_STRIP_GATE(0x8094B210, &lit_4829); #pragma pop /* 8094B218-8094B220 000068 0008+00 0/6 0/0 0/0 .rodata @4830 */ @@ -1919,7 +1947,7 @@ COMPILER_STRIP_GATE(8094B210, &lit_4829); SECTION_RODATA static u8 const lit_4830[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8094B218, &lit_4830); +COMPILER_STRIP_GATE(0x8094B218, &lit_4830); #pragma pop /* 8094B220-8094B228 000070 0008+00 0/6 0/0 0/0 .rodata @4831 */ @@ -1928,7 +1956,7 @@ COMPILER_STRIP_GATE(8094B218, &lit_4830); SECTION_RODATA static u8 const lit_4831[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8094B220, &lit_4831); +COMPILER_STRIP_GATE(0x8094B220, &lit_4831); #pragma pop /* 80947AA4-80947CD0 001F24 022C+00 1/0 0/0 0/0 .text turn_on_start_move__8daMyna_cFv */ @@ -2149,7 +2177,7 @@ asm void daMyna_c::soldoutItem(unsigned int param_0) { /* ############################################################################################## */ /* 8094B228-8094B22C 000078 0004+00 1/2 0/0 0/0 .rodata @5221 */ SECTION_RODATA static f32 const lit_5221 = 15.0f; -COMPILER_STRIP_GATE(8094B228, &lit_5221); +COMPILER_STRIP_GATE(0x8094B228, &lit_5221); /* 80948828-80948ADC 002CA8 02B4+00 2/2 0/0 0/0 .text fly_attack_move__8daMyna_cFv */ #pragma push @@ -2166,21 +2194,21 @@ asm void daMyna_c::fly_attack_move() { #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_5317 = 0x3A83126F; -COMPILER_STRIP_GATE(8094B22C, &lit_5317); +COMPILER_STRIP_GATE(0x8094B22C, &lit_5317); #pragma pop /* 8094B230-8094B234 000080 0004+00 0/1 0/0 0/0 .rodata @5318 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5318 = 25.0f; -COMPILER_STRIP_GATE(8094B230, &lit_5318); +COMPILER_STRIP_GATE(0x8094B230, &lit_5318); #pragma pop /* 8094B234-8094B238 000084 0004+00 0/1 0/0 0/0 .rodata @5319 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5319 = 3.0f; -COMPILER_STRIP_GATE(8094B234, &lit_5319); +COMPILER_STRIP_GATE(0x8094B234, &lit_5319); #pragma pop /* 80948ADC-80948DFC 002F5C 0320+00 2/2 0/0 0/0 .text fly_return_move__8daMyna_cFv */ @@ -2198,7 +2226,7 @@ asm void daMyna_c::fly_return_move() { SECTION_RODATA static u8 const lit_5332[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8094B238, &lit_5332); +COMPILER_STRIP_GATE(0x8094B238, &lit_5332); /* 80948DFC-80948E84 00327C 0088+00 2/2 0/0 0/0 .text fly_body_wave__8daMyna_cFv */ #pragma push @@ -2265,7 +2293,7 @@ asm void daMyna_c::deleteItem(unsigned int param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5455 = 200.0f; -COMPILER_STRIP_GATE(8094B240, &lit_5455); +COMPILER_STRIP_GATE(0x8094B240, &lit_5455); #pragma pop /* 80949190-80949408 003610 0278+00 1/1 0/0 0/0 .text initiate__8daMyna_cFv */ @@ -2446,7 +2474,7 @@ asm void daMyna_c::chkPlayerInEvtArea(fopAc_ac_c* param_0, cXyz param_1) { /* ############################################################################################## */ /* 8094B244-8094B248 000094 0004+00 2/3 0/0 0/0 .rodata @5889 */ SECTION_RODATA static f32 const lit_5889 = 6.0f; -COMPILER_STRIP_GATE(8094B244, &lit_5889); +COMPILER_STRIP_GATE(0x8094B244, &lit_5889); /* 80949EE8-8094A054 004368 016C+00 2/1 0/0 0/0 .text animeControl__8daMyna_cFv */ #pragma push @@ -2484,7 +2512,7 @@ asm void daMyna_c::playDefaultWaitAnime() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6108 = 0.25f; -COMPILER_STRIP_GATE(8094B248, &lit_6108); +COMPILER_STRIP_GATE(0x8094B248, &lit_6108); #pragma pop /* 8094A608-8094A890 004A88 0288+00 1/1 0/0 0/0 .text setDefaultWaitAnime__8daMyna_cFUc @@ -2612,7 +2640,7 @@ asm daMyna_c::~daMyna_c() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_8094ABAC(s16* param_0) { +extern "C" asm void func_8094ABAC(void* _this, s16* param_0) { nofralloc #include "asm/rel/d/a/d_a_myna/d_a_myna/func_8094ABAC.s" } @@ -2622,7 +2650,7 @@ extern "C" asm void func_8094ABAC(s16* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_8094ABC8(int param_0, int param_1) { +extern "C" asm void func_8094ABC8(void* _this, int param_0, int param_1) { nofralloc #include "asm/rel/d/a/d_a_myna/d_a_myna/func_8094ABC8.s" } @@ -2640,7 +2668,7 @@ asm void __sinit_d_a_myna_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_8094AC44 = (void*)__sinit_d_a_myna_cpp; +REGISTER_CTORS(0x8094AC44, __sinit_d_a_myna_cpp); #pragma pop /* ############################################################################################## */ @@ -2815,26 +2843,4 @@ static u8 data_8094BB2C[4]; static u8 data_8094BB30[4]; #pragma pop -/* 8094B24C-8094B35E 00009C 0112+00 7/5 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_8094B24C = "MYNA_hovering.bck"; -SECTION_DEAD static char const* const stringBase_8094B25E = "MYNA_wait_a.bck"; -SECTION_DEAD static char const* const stringBase_8094B26E = "MYNA_pick_a.bck"; -SECTION_DEAD static char const* const stringBase_8094B27E = "MYNA_pick_b.bck"; -SECTION_DEAD static char const* const stringBase_8094B28E = "MYNA_jump.bck"; -SECTION_DEAD static char const* const stringBase_8094B29C = "MYNA_sidestepL.bck"; -SECTION_DEAD static char const* const stringBase_8094B2AF = "MYNA_sidestepR.bck"; -SECTION_DEAD static char const* const stringBase_8094B2C2 = "MYNA_lightup.bck"; -SECTION_DEAD static char const* const stringBase_8094B2D3 = "MYNA_attack.bck"; -SECTION_DEAD static char const* const stringBase_8094B2E3 = "MYNA_talk_a.bck"; -SECTION_DEAD static char const* const stringBase_8094B2F3 = "MYNA_talk_b.bck"; -SECTION_DEAD static char const* const stringBase_8094B303 = "MYNA_wait_b.bck"; -SECTION_DEAD static char const* const stringBase_8094B313 = "MYNA_wait_c.bck"; -SECTION_DEAD static char const* const stringBase_8094B323 = "MYNA_talk_c.bck"; -SECTION_DEAD static char const* const stringBase_8094B333 = "MYNA_wait_d.bck"; -SECTION_DEAD static char const* const stringBase_8094B343 = "MYNA.btp"; -SECTION_DEAD static char const* const stringBase_8094B34C = "Npc_myna"; -SECTION_DEAD static char const* const stringBase_8094B355 = "MYNA.bmd"; -#pragma pop +/* 8094B24C-8094B24C 00009C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/d_a_nbomb/d_a_nbomb.cpp b/rel/d/a/d_a_nbomb/d_a_nbomb.cpp index 230a4f36e07..b85a5b0cee7 100644 --- a/rel/d/a/d_a_nbomb/d_a_nbomb.cpp +++ b/rel/d/a/d_a_nbomb/d_a_nbomb.cpp @@ -610,7 +610,7 @@ static asm void daNbomb_coHitCallback(fopAc_ac_c* param_0, dCcD_GObjInf* param_1 SECTION_RODATA static u8 const lit_3767[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(804CC340, &lit_3767); +COMPILER_STRIP_GATE(0x804CC340, &lit_3767); /* 804CC34C-804CC358 00000C 000C+00 0/1 0/0 0/0 .rodata l_localCenterOffset */ #pragma push @@ -618,7 +618,7 @@ COMPILER_STRIP_GATE(804CC340, &lit_3767); SECTION_RODATA static u8 const l_localCenterOffset[12] = { 0x00, 0x00, 0x00, 0x00, 0x41, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(804CC34C, &l_localCenterOffset); +COMPILER_STRIP_GATE(0x804CC34C, &l_localCenterOffset); #pragma pop /* 804CC358-804CC360 000018 0006+02 1/0 0/0 0/0 .rodata l_arcNameBombF */ @@ -633,7 +633,7 @@ SECTION_RODATA static u8 const l_arcNameBombF[6 + 2 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(804CC358, &l_arcNameBombF); +COMPILER_STRIP_GATE(0x804CC358, &l_arcNameBombF); /* 804CC360-804CC368 000020 0005+03 1/1 0/0 0/0 .rodata l_arcNameBombE */ SECTION_RODATA static u8 const l_arcNameBombE[5 + 3 /* padding */] = { @@ -647,7 +647,7 @@ SECTION_RODATA static u8 const l_arcNameBombE[5 + 3 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(804CC360, &l_arcNameBombE); +COMPILER_STRIP_GATE(0x804CC360, &l_arcNameBombE); /* 804CC368-804CC370 000028 0005+03 1/1 0/0 0/0 .rodata l_arcNameBombEW */ SECTION_RODATA static u8 const l_arcNameBombEW[5 + 3 /* padding */] = { @@ -661,29 +661,29 @@ SECTION_RODATA static u8 const l_arcNameBombEW[5 + 3 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(804CC368, &l_arcNameBombEW); +COMPILER_STRIP_GATE(0x804CC368, &l_arcNameBombEW); /* 804CC370-804CC374 000030 0004+00 0/2 0/0 0/0 .rodata @4213 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4213 = 2.0f; -COMPILER_STRIP_GATE(804CC370, &lit_4213); +COMPILER_STRIP_GATE(0x804CC370, &lit_4213); #pragma pop /* 804CC374-804CC378 000034 0004+00 1/6 0/0 0/0 .rodata @4214 */ SECTION_RODATA static f32 const lit_4214 = 0.5f; -COMPILER_STRIP_GATE(804CC374, &lit_4214); +COMPILER_STRIP_GATE(0x804CC374, &lit_4214); /* 804CC378-804CC37C 000038 0004+00 0/3 0/0 0/0 .rodata @4215 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4215 = 10.0f; -COMPILER_STRIP_GATE(804CC378, &lit_4215); +COMPILER_STRIP_GATE(0x804CC378, &lit_4215); #pragma pop /* 804CC37C-804CC380 00003C 0004+00 3/13 0/0 0/0 .rodata @4216 */ SECTION_RODATA static f32 const lit_4216 = 1.0f; -COMPILER_STRIP_GATE(804CC37C, &lit_4216); +COMPILER_STRIP_GATE(0x804CC37C, &lit_4216); /* 804C6E34-804C6F78 000154 0144+00 1/1 0/0 0/0 .text tgHitCallback__9daNbomb_cFP12dCcD_GObjInf */ #pragma push @@ -725,20 +725,20 @@ SECTION_RODATA static u8 const lit_4255[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(804CC380, &lit_4255); +COMPILER_STRIP_GATE(0x804CC380, &lit_4255); /* 804CC384-804CC388 000044 0004+00 0/1 0/0 0/0 .rodata @4256 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4256 = 250000.0f; -COMPILER_STRIP_GATE(804CC384, &lit_4256); +COMPILER_STRIP_GATE(0x804CC384, &lit_4256); #pragma pop /* 804CC388-804CC38C 000048 0004+00 0/4 0/0 0/0 .rodata @4257 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4257 = 100.0f; -COMPILER_STRIP_GATE(804CC388, &lit_4257); +COMPILER_STRIP_GATE(0x804CC388, &lit_4257); #pragma pop /* 804C6FD8-804C70C0 0002F8 00E8+00 1/1 0/0 0/0 .text searchEnemy__9daNbomb_cFP10fopAc_ac_c */ @@ -768,7 +768,7 @@ static asm void daNbomb_searchEnemy(fopAc_ac_c* param_0, void* param_1) { SECTION_RODATA static u8 const bmdIdx[12] = { 0x00, 0x1E, 0x00, 0x27, 0x00, 0x26, 0x00, 0x03, 0x00, 0x0E, 0x00, 0x0A, }; -COMPILER_STRIP_GATE(804CC38C, &bmdIdx); +COMPILER_STRIP_GATE(0x804CC38C, &bmdIdx); #pragma pop /* 804CC4D8-804CC518 000000 0040+00 1/1 0/0 0/0 .data l_sphSrc */ @@ -996,81 +996,87 @@ SECTION_RODATA static u8 const heapSize[24] = { 0x00, 0x00, 0x0E, 0xB0, 0x00, 0x00, 0x0E, 0xB0, 0x00, 0x00, 0x17, 0xC0, 0x00, 0x00, 0x0E, 0xB0, 0x00, 0x00, 0x25, 0x00, 0x00, 0x00, 0x0F, 0x90, }; -COMPILER_STRIP_GATE(804CC398, &heapSize); +COMPILER_STRIP_GATE(0x804CC398, &heapSize); #pragma pop /* 804CC3B0-804CC3B4 000070 0004+00 2/6 0/0 0/0 .rodata @4678 */ SECTION_RODATA static f32 const lit_4678 = 30.0f; -COMPILER_STRIP_GATE(804CC3B0, &lit_4678); +COMPILER_STRIP_GATE(0x804CC3B0, &lit_4678); /* 804CC3B4-804CC3B8 000074 0004+00 0/1 0/0 0/0 .rodata @4679 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4679 = 60.0f; -COMPILER_STRIP_GATE(804CC3B4, &lit_4679); +COMPILER_STRIP_GATE(0x804CC3B4, &lit_4679); #pragma pop /* 804CC3B8-804CC3BC 000078 0004+00 0/1 0/0 0/0 .rodata @4680 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4680 = 10000.0f; -COMPILER_STRIP_GATE(804CC3B8, &lit_4680); +COMPILER_STRIP_GATE(0x804CC3B8, &lit_4680); #pragma pop /* 804CC3BC-804CC3C0 00007C 0004+00 0/1 0/0 0/0 .rodata @4681 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4681 = 110.0f; -COMPILER_STRIP_GATE(804CC3BC, &lit_4681); +COMPILER_STRIP_GATE(0x804CC3BC, &lit_4681); #pragma pop /* 804CC3C0-804CC3C4 000080 0004+00 0/2 0/0 0/0 .rodata @4682 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4682 = 0.75f; -COMPILER_STRIP_GATE(804CC3C0, &lit_4682); +COMPILER_STRIP_GATE(0x804CC3C0, &lit_4682); #pragma pop /* 804CC3C4-804CC3C8 000084 0004+00 0/1 0/0 0/0 .rodata @4683 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4683 = 3.0f / 5.0f; -COMPILER_STRIP_GATE(804CC3C4, &lit_4683); +COMPILER_STRIP_GATE(0x804CC3C4, &lit_4683); #pragma pop /* 804CC3C8-804CC3CC 000088 0004+00 0/4 0/0 0/0 .rodata @4684 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4684 = 5.0f; -COMPILER_STRIP_GATE(804CC3C8, &lit_4684); +COMPILER_STRIP_GATE(0x804CC3C8, &lit_4684); #pragma pop /* 804CC3CC-804CC3D0 00008C 0004+00 0/1 0/0 0/0 .rodata @4685 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4685 = -36.0f; -COMPILER_STRIP_GATE(804CC3CC, &lit_4685); +COMPILER_STRIP_GATE(0x804CC3CC, &lit_4685); #pragma pop /* 804CC3D0-804CC3D4 000090 0004+00 0/1 0/0 0/0 .rodata @4686 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4686 = 36.0f; -COMPILER_STRIP_GATE(804CC3D0, &lit_4686); +COMPILER_STRIP_GATE(0x804CC3D0, &lit_4686); #pragma pop /* 804CC3D4-804CC3D8 000094 0004+00 0/1 0/0 0/0 .rodata @4687 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4687 = 66.0f; -COMPILER_STRIP_GATE(804CC3D4, &lit_4687); +COMPILER_STRIP_GATE(0x804CC3D4, &lit_4687); #pragma pop /* 804CC3D8-804CC3E0 000098 0008+00 4/8 0/0 0/0 .rodata @4689 */ SECTION_RODATA static u8 const lit_4689[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(804CC3D8, &lit_4689); +COMPILER_STRIP_GATE(0x804CC3D8, &lit_4689); + +/* 804CC4D0-804CC4D0 000190 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_804CC4D0 = "D_MN01A"; +#pragma pop /* 804C7324-804C7B44 000644 0820+00 1/1 0/0 0/0 .text create__9daNbomb_cFv */ #pragma push @@ -1185,7 +1191,7 @@ asm void daNbomb_c::checkTimerStop() { /* ############################################################################################## */ /* 804CC3E0-804CC3E4 0000A0 0004+00 3/3 0/0 0/0 .rodata @5021 */ SECTION_RODATA static f32 const lit_5021 = 1.5f; -COMPILER_STRIP_GATE(804CC3E0, &lit_5021); +COMPILER_STRIP_GATE(0x804CC3E0, &lit_5021); /* 804C82D8-804C8430 0015F8 0158+00 5/5 0/0 0/0 .text checkExplode__9daNbomb_cFv */ #pragma push @@ -1200,7 +1206,7 @@ asm void daNbomb_c::checkExplode() { /* ############################################################################################## */ /* 804CC3E4-804CC3E8 0000A4 0004+00 1/2 0/0 0/0 .rodata @5036 */ SECTION_RODATA static f32 const lit_5036 = -1000000000.0f; -COMPILER_STRIP_GATE(804CC3E4, &lit_5036); +COMPILER_STRIP_GATE(0x804CC3E4, &lit_5036); /* 804C8430-804C84D8 001750 00A8+00 5/5 0/0 0/0 .text setRoomInfo__9daNbomb_cFv */ #pragma push @@ -1217,7 +1223,7 @@ asm void daNbomb_c::setRoomInfo() { SECTION_RODATA static u8 const localOffset[12] = { 0x00, 0x00, 0x00, 0x00, 0x42, 0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(804CC3E8, &localOffset); +COMPILER_STRIP_GATE(0x804CC3E8, &localOffset); /* 804C84D8-804C8588 0017F8 00B0+00 2/2 0/0 0/0 .text setSmokePos__9daNbomb_cFv */ #pragma push @@ -1232,7 +1238,7 @@ asm void daNbomb_c::setSmokePos() { /* ############################################################################################## */ /* 804CC3F4-804CC3F8 0000B4 0004+00 1/1 0/0 0/0 .rodata @5143 */ SECTION_RODATA static f32 const lit_5143 = 9.0f / 5.0f; -COMPILER_STRIP_GATE(804CC3F4, &lit_5143); +COMPILER_STRIP_GATE(0x804CC3F4, &lit_5143); /* 804CC688-804CC68C 000008 0001+03 1/1 0/0 0/0 .bss @1109 */ static u8 lit_1109[1 + 3 /* padding */]; @@ -1382,7 +1388,7 @@ asm void daNbomb_c::checkWaterIn() { /* ############################################################################################## */ /* 804CC3F8-804CC3FC 0000B8 0004+00 1/1 0/0 0/0 .rodata @5214 */ SECTION_RODATA static u32 const lit_5214 = 0x43360B61; -COMPILER_STRIP_GATE(804CC3F8, &lit_5214); +COMPILER_STRIP_GATE(0x804CC3F8, &lit_5214); /* 804C8928-804C8A40 001C48 0118+00 3/3 0/0 0/0 .text insectLineCheck__9daNbomb_cFv */ #pragma push @@ -1409,7 +1415,7 @@ asm cM3dGPla::~cM3dGPla() { #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_5289 = 0x3F7FBE77; -COMPILER_STRIP_GATE(804CC3FC, &lit_5289); +COMPILER_STRIP_GATE(0x804CC3FC, &lit_5289); #pragma pop /* 804C8A88-804C8CF8 001DA8 0270+00 2/2 0/0 0/0 .text setHitPolygon__9daNbomb_cFi */ @@ -1449,7 +1455,7 @@ SECTION_RODATA static u8 const normalNameID[18 + 2 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(804CC400, &normalNameID); +COMPILER_STRIP_GATE(0x804CC400, &normalNameID); #pragma pop /* 804CC414-804CC424 0000D4 0010+00 0/1 0/0 0/0 .rodata waterNameID$5298 */ @@ -1458,7 +1464,7 @@ COMPILER_STRIP_GATE(804CC400, &normalNameID); SECTION_RODATA static u8 const waterNameID[16] = { 0x0A, 0x05, 0x0A, 0x06, 0x0A, 0x07, 0x0A, 0x08, 0x0A, 0x09, 0x0A, 0x0A, 0x0A, 0x0B, 0x0A, 0x0C, }; -COMPILER_STRIP_GATE(804CC414, &waterNameID); +COMPILER_STRIP_GATE(0x804CC414, &waterNameID); #pragma pop /* 804CC424-804CC438 0000E4 0012+02 0/1 0/0 0/0 .rodata waterNameID2$5299 */ @@ -1487,42 +1493,42 @@ SECTION_RODATA static u8 const waterNameID2[18 + 2 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(804CC424, &waterNameID2); +COMPILER_STRIP_GATE(0x804CC424, &waterNameID2); #pragma pop /* 804CC438-804CC43C 0000F8 0004+00 0/2 0/0 0/0 .rodata @5400 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5400 = 65536.0f; -COMPILER_STRIP_GATE(804CC438, &lit_5400); +COMPILER_STRIP_GATE(0x804CC438, &lit_5400); #pragma pop /* 804CC43C-804CC440 0000FC 0004+00 0/1 0/0 0/0 .rodata @5401 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5401 = 600.0f; -COMPILER_STRIP_GATE(804CC43C, &lit_5401); +COMPILER_STRIP_GATE(0x804CC43C, &lit_5401); #pragma pop /* 804CC440-804CC444 000100 0004+00 0/1 0/0 0/0 .rodata @5402 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5402 = 500.0f; -COMPILER_STRIP_GATE(804CC440, &lit_5402); +COMPILER_STRIP_GATE(0x804CC440, &lit_5402); #pragma pop /* 804CC444-804CC448 000104 0004+00 0/1 0/0 0/0 .rodata @5403 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5403 = 160000.0f; -COMPILER_STRIP_GATE(804CC444, &lit_5403); +COMPILER_STRIP_GATE(0x804CC444, &lit_5403); #pragma pop /* 804CC448-804CC44C 000108 0004+00 0/1 0/0 0/0 .rodata @5404 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5404 = 640000.0f; -COMPILER_STRIP_GATE(804CC448, &lit_5404); +COMPILER_STRIP_GATE(0x804CC448, &lit_5404); #pragma pop /* 804C8CF8-804C9118 002018 0420+00 5/5 0/0 0/0 .text procExplodeInit__9daNbomb_cFv */ @@ -1540,7 +1546,7 @@ asm void daNbomb_c::procExplodeInit() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5451 = 1500.0f; -COMPILER_STRIP_GATE(804CC44C, &lit_5451); +COMPILER_STRIP_GATE(0x804CC44C, &lit_5451); #pragma pop /* 804CC450-804CC458 000110 0008+00 0/4 0/0 0/0 .rodata @5452 */ @@ -1549,7 +1555,7 @@ COMPILER_STRIP_GATE(804CC44C, &lit_5451); SECTION_RODATA static u8 const lit_5452[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(804CC450, &lit_5452); +COMPILER_STRIP_GATE(0x804CC450, &lit_5452); #pragma pop /* 804CC458-804CC460 000118 0008+00 0/4 0/0 0/0 .rodata @5453 */ @@ -1558,7 +1564,7 @@ COMPILER_STRIP_GATE(804CC450, &lit_5452); SECTION_RODATA static u8 const lit_5453[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(804CC458, &lit_5453); +COMPILER_STRIP_GATE(0x804CC458, &lit_5453); #pragma pop /* 804CC460-804CC468 000120 0008+00 0/4 0/0 0/0 .rodata @5454 */ @@ -1567,33 +1573,33 @@ COMPILER_STRIP_GATE(804CC458, &lit_5453); SECTION_RODATA static u8 const lit_5454[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(804CC460, &lit_5454); +COMPILER_STRIP_GATE(0x804CC460, &lit_5454); #pragma pop /* 804CC468-804CC46C 000128 0004+00 0/1 0/0 0/0 .rodata @5455 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5455 = 1.0f / 50.0f; -COMPILER_STRIP_GATE(804CC468, &lit_5455); +COMPILER_STRIP_GATE(0x804CC468, &lit_5455); #pragma pop /* 804CC46C-804CC470 00012C 0004+00 0/1 0/0 0/0 .rodata @5456 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5456 = 99.0f / 100.0f; -COMPILER_STRIP_GATE(804CC46C, &lit_5456); +COMPILER_STRIP_GATE(0x804CC46C, &lit_5456); #pragma pop /* 804CC470-804CC474 000130 0004+00 0/1 0/0 0/0 .rodata @5457 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5457 = 0.25f; -COMPILER_STRIP_GATE(804CC470, &lit_5457); +COMPILER_STRIP_GATE(0x804CC470, &lit_5457); #pragma pop /* 804CC474-804CC478 000134 0004+00 2/4 0/0 0/0 .rodata @5458 */ SECTION_RODATA static f32 const lit_5458 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(804CC474, &lit_5458); +COMPILER_STRIP_GATE(0x804CC474, &lit_5458); /* 804C9118-804C93E0 002438 02C8+00 1/0 0/0 0/0 .text procExplode__9daNbomb_cFv */ #pragma push @@ -1640,54 +1646,54 @@ asm void daNbomb_c::procWaitInit() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5873 = 300.0f; -COMPILER_STRIP_GATE(804CC478, &lit_5873); +COMPILER_STRIP_GATE(0x804CC478, &lit_5873); #pragma pop /* 804CC47C-804CC480 00013C 0004+00 0/1 0/0 0/0 .rodata @5874 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5874 = -20.0f; -COMPILER_STRIP_GATE(804CC47C, &lit_5874); +COMPILER_STRIP_GATE(0x804CC47C, &lit_5874); #pragma pop /* 804CC480-804CC484 000140 0004+00 0/1 0/0 0/0 .rodata @5875 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5875 = 7.0f / 10.0f; -COMPILER_STRIP_GATE(804CC480, &lit_5875); +COMPILER_STRIP_GATE(0x804CC480, &lit_5875); #pragma pop /* 804CC484-804CC488 000144 0004+00 0/1 0/0 0/0 .rodata @5876 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5876 = 16384.0f; -COMPILER_STRIP_GATE(804CC484, &lit_5876); +COMPILER_STRIP_GATE(0x804CC484, &lit_5876); #pragma pop /* 804CC488-804CC48C 000148 0004+00 0/2 0/0 0/0 .rodata @5877 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5877 = -1.0f; -COMPILER_STRIP_GATE(804CC488, &lit_5877); +COMPILER_STRIP_GATE(0x804CC488, &lit_5877); #pragma pop /* 804CC48C-804CC490 00014C 0004+00 0/1 0/0 0/0 .rodata @5878 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5878 = 7.0f; -COMPILER_STRIP_GATE(804CC48C, &lit_5878); +COMPILER_STRIP_GATE(0x804CC48C, &lit_5878); #pragma pop /* 804CC490-804CC494 000150 0004+00 0/1 0/0 0/0 .rodata @5879 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5879 = 9.0f / 10.0f; -COMPILER_STRIP_GATE(804CC490, &lit_5879); +COMPILER_STRIP_GATE(0x804CC490, &lit_5879); #pragma pop /* 804CC494-804CC498 000154 0004+00 1/2 0/0 0/0 .rodata @5880 */ SECTION_RODATA static f32 const lit_5880 = 20.0f; -COMPILER_STRIP_GATE(804CC494, &lit_5880); +COMPILER_STRIP_GATE(0x804CC494, &lit_5880); /* 804CC498-804CC4A0 000158 0008+00 0/1 0/0 0/0 .rodata @5882 */ #pragma push @@ -1695,7 +1701,7 @@ COMPILER_STRIP_GATE(804CC494, &lit_5880); SECTION_RODATA static u8 const lit_5882[8] = { 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(804CC498, &lit_5882); +COMPILER_STRIP_GATE(0x804CC498, &lit_5882); #pragma pop /* 804C9984-804CA268 002CA4 08E4+00 2/1 0/0 0/0 .text procWait__9daNbomb_cFv */ @@ -1752,7 +1758,7 @@ asm void daNbomb_c::procBoomerangMove() { /* ############################################################################################## */ /* 804CC4A0-804CC4A4 000160 0004+00 1/1 0/0 0/0 .rodata @6001 */ SECTION_RODATA static f32 const lit_6001 = 3.0f; -COMPILER_STRIP_GATE(804CC4A0, &lit_6001); +COMPILER_STRIP_GATE(0x804CC4A0, &lit_6001); /* 804CA688-804CA780 0039A8 00F8+00 2/2 0/0 0/0 .text procInsectMoveInit__9daNbomb_cFv */ #pragma push @@ -1769,42 +1775,42 @@ asm void daNbomb_c::procInsectMoveInit() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6207 = 50.0f; -COMPILER_STRIP_GATE(804CC4A4, &lit_6207); +COMPILER_STRIP_GATE(0x804CC4A4, &lit_6207); #pragma pop /* 804CC4A8-804CC4AC 000168 0004+00 0/1 0/0 0/0 .rodata @6208 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6208 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(804CC4A8, &lit_6208); +COMPILER_STRIP_GATE(0x804CC4A8, &lit_6208); #pragma pop /* 804CC4AC-804CC4B0 00016C 0004+00 0/1 0/0 0/0 .rodata @6209 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_6209 = 0x3DB2B8C3; -COMPILER_STRIP_GATE(804CC4AC, &lit_6209); +COMPILER_STRIP_GATE(0x804CC4AC, &lit_6209); #pragma pop /* 804CC4B0-804CC4B4 000170 0004+00 0/1 0/0 0/0 .rodata @6210 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_6210 = 0x3C0EFA36; -COMPILER_STRIP_GATE(804CC4B0, &lit_6210); +COMPILER_STRIP_GATE(0x804CC4B0, &lit_6210); #pragma pop /* 804CC4B4-804CC4B8 000174 0004+00 0/3 0/0 0/0 .rodata @6211 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6211 = 25.0f; -COMPILER_STRIP_GATE(804CC4B4, &lit_6211); +COMPILER_STRIP_GATE(0x804CC4B4, &lit_6211); #pragma pop /* 804CC4B8-804CC4BC 000178 0004+00 0/1 0/0 0/0 .rodata @6212 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6212 = 8.0f; -COMPILER_STRIP_GATE(804CC4B8, &lit_6212); +COMPILER_STRIP_GATE(0x804CC4B8, &lit_6212); #pragma pop /* 804CA780-804CAEE8 003AA0 0768+00 2/1 0/0 0/0 .text procInsectMove__9daNbomb_cFv */ @@ -1822,21 +1828,21 @@ asm void daNbomb_c::procInsectMove() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6601 = 1.0f / 40.0f; -COMPILER_STRIP_GATE(804CC4BC, &lit_6601); +COMPILER_STRIP_GATE(0x804CC4BC, &lit_6601); #pragma pop /* 804CC4C0-804CC4C4 000180 0004+00 0/1 0/0 0/0 .rodata @6602 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6602 = 180.0f; -COMPILER_STRIP_GATE(804CC4C0, &lit_6602); +COMPILER_STRIP_GATE(0x804CC4C0, &lit_6602); #pragma pop /* 804CC4C4-804CC4C8 000184 0004+00 0/1 0/0 0/0 .rodata @6603 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6603 = -25.0f; -COMPILER_STRIP_GATE(804CC4C4, &lit_6603); +COMPILER_STRIP_GATE(0x804CC4C4, &lit_6603); #pragma pop /* 804CAEE8-804CBC40 004208 0D58+00 1/1 0/0 0/0 .text execute__9daNbomb_cFv */ @@ -1864,14 +1870,14 @@ static asm void daNbomb_Execute(daNbomb_c* param_0) { #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_6782 = 0x40490FDB; -COMPILER_STRIP_GATE(804CC4C8, &lit_6782); +COMPILER_STRIP_GATE(0x804CC4C8, &lit_6782); #pragma pop /* 804CC4CC-804CC4D0 00018C 0004+00 0/1 0/0 0/0 .rodata @6783 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6783 = 15.0f; -COMPILER_STRIP_GATE(804CC4CC, &lit_6783); +COMPILER_STRIP_GATE(0x804CC4CC, &lit_6783); #pragma pop /* 804CBC60-804CC200 004F80 05A0+00 1/1 0/0 0/0 .text draw__9daNbomb_cFv */ @@ -1916,7 +1922,7 @@ asm void __sinit_d_a_nbomb_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_804CC268 = (void*)__sinit_d_a_nbomb_cpp; +REGISTER_CTORS(0x804CC268, __sinit_d_a_nbomb_cpp); #pragma pop /* 804CC2B0-804CC2B8 0055D0 0008+00 1/0 0/0 0/0 .text @36@__dt__13dBgS_BombAcchFv */ @@ -2165,9 +2171,4 @@ static u8 data_804CC744[4]; static u8 data_804CC748[4]; #pragma pop -/* 804CC4D0-804CC4D8 000190 0008+00 1/1 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_804CC4D0 = "D_MN01A"; -#pragma pop +/* 804CC4D0-804CC4D0 000190 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/d_a_ni/d_a_ni.cpp b/rel/d/a/d_a_ni/d_a_ni.cpp index 9a53535d227..304d86d4849 100644 --- a/rel/d/a/d_a_ni/d_a_ni.cpp +++ b/rel/d/a/d_a_ni/d_a_ni.cpp @@ -43,10 +43,10 @@ struct mDoExt_McaMorfCallBack1_c {}; struct Vec {}; -struct J3DModelData {}; - struct J3DAnmTransform {}; +struct J3DModelData {}; + struct mDoExt_McaMorf { /* 8000FC4C */ mDoExt_McaMorf(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, int, @@ -479,55 +479,55 @@ extern "C" void __register_global_object(); /* ############################################################################################## */ /* 809511C0-809511C4 000000 0004+00 23/23 0/0 0/0 .rodata @3958 */ SECTION_RODATA static f32 const lit_3958 = 6.0f / 5.0f; -COMPILER_STRIP_GATE(809511C0, &lit_3958); +COMPILER_STRIP_GATE(0x809511C0, &lit_3958); /* 809511C4-809511C8 000004 0004+00 0/1 0/0 0/0 .rodata @3959 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3959 = 4.0f; -COMPILER_STRIP_GATE(809511C4, &lit_3959); +COMPILER_STRIP_GATE(0x809511C4, &lit_3959); #pragma pop /* 809511C8-809511CC 000008 0004+00 0/3 0/0 0/0 .rodata @3960 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3960 = 1.5f; -COMPILER_STRIP_GATE(809511C8, &lit_3960); +COMPILER_STRIP_GATE(0x809511C8, &lit_3960); #pragma pop /* 809511CC-809511D0 00000C 0004+00 0/4 0/0 0/0 .rodata @3961 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3961 = 200.0f; -COMPILER_STRIP_GATE(809511CC, &lit_3961); +COMPILER_STRIP_GATE(0x809511CC, &lit_3961); #pragma pop /* 809511D0-809511D4 000010 0004+00 0/3 0/0 0/0 .rodata @3962 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3962 = 15.0f; -COMPILER_STRIP_GATE(809511D0, &lit_3962); +COMPILER_STRIP_GATE(0x809511D0, &lit_3962); #pragma pop /* 809511D4-809511D8 000014 0004+00 0/10 0/0 0/0 .rodata @3963 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3963 = 20.0f; -COMPILER_STRIP_GATE(809511D4, &lit_3963); +COMPILER_STRIP_GATE(0x809511D4, &lit_3963); #pragma pop /* 809511D8-809511DC 000018 0004+00 0/5 0/0 0/0 .rodata @3964 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3964 = 40.0f; -COMPILER_STRIP_GATE(809511D8, &lit_3964); +COMPILER_STRIP_GATE(0x809511D8, &lit_3964); #pragma pop /* 809511DC-809511E0 00001C 0004+00 0/3 0/0 0/0 .rodata @3965 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3965 = -1.0f; -COMPILER_STRIP_GATE(809511DC, &lit_3965); +COMPILER_STRIP_GATE(0x809511DC, &lit_3965); #pragma pop /* 80951330-8095133C 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ @@ -719,7 +719,7 @@ asm daNi_HIO_c::daNi_HIO_c() { /* ############################################################################################## */ /* 809511E0-809511E4 000020 0004+00 2/19 0/0 0/0 .rodata @3981 */ SECTION_RODATA static f32 const lit_3981 = 1.0f; -COMPILER_STRIP_GATE(809511E0, &lit_3981); +COMPILER_STRIP_GATE(0x809511E0, &lit_3981); /* 809511E4-809511E8 000024 0004+00 1/16 0/0 0/0 .rodata @3982 */ SECTION_RODATA static u8 const lit_3982[4] = { @@ -728,7 +728,13 @@ SECTION_RODATA static u8 const lit_3982[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(809511E4, &lit_3982); +COMPILER_STRIP_GATE(0x809511E4, &lit_3982); + +/* 8095131C-8095131C 00015C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8095131C = "Ni"; +#pragma pop /* 8094BCA8-8094BD68 000168 00C0+00 13/13 0/0 0/0 .text anm_init__FP8ni_classifUcf */ #pragma push @@ -765,14 +771,14 @@ static asm void nodeCallBack(J3DJoint* param_0, int param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4128 = 100.0f; -COMPILER_STRIP_GATE(809511E8, &lit_4128); +COMPILER_STRIP_GATE(0x809511E8, &lit_4128); #pragma pop /* 809511EC-809511F0 00002C 0004+00 0/3 0/0 0/0 .rodata @4129 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4129 = 400.0f; -COMPILER_STRIP_GATE(809511EC, &lit_4129); +COMPILER_STRIP_GATE(0x809511EC, &lit_4129); #pragma pop /* 8094C110-8094C204 0005D0 00F4+00 1/0 0/0 0/0 .text daNi_Draw__FP8ni_class */ @@ -810,14 +816,14 @@ static asm void s_play_sub(void* param_0, void* param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4172 = 2000.0f; -COMPILER_STRIP_GATE(809511F0, &lit_4172); +COMPILER_STRIP_GATE(0x809511F0, &lit_4172); #pragma pop /* 809511F4-809511F8 000034 0004+00 0/7 0/0 0/0 .rodata @4173 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4173 = 30.0f; -COMPILER_STRIP_GATE(809511F4, &lit_4173); +COMPILER_STRIP_GATE(0x809511F4, &lit_4173); #pragma pop /* 809511F8-80951200 000038 0004+04 0/7 0/0 0/0 .rodata @4174 */ @@ -828,7 +834,7 @@ SECTION_RODATA static f32 const lit_4174[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(809511F8, &lit_4174); +COMPILER_STRIP_GATE(0x809511F8, &lit_4174); #pragma pop /* 80951200-80951208 000040 0008+00 0/2 0/0 0/0 .rodata @4176 */ @@ -837,7 +843,7 @@ COMPILER_STRIP_GATE(809511F8, &lit_4174); SECTION_RODATA static u8 const lit_4176[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80951200, &lit_4176); +COMPILER_STRIP_GATE(0x80951200, &lit_4176); #pragma pop /* 8094C298-8094C4B0 000758 0218+00 1/1 0/0 0/0 .text damage_check__FP8ni_class */ @@ -970,7 +976,7 @@ static asm void s_t_sub(void* param_0, void* param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4238 = 1000.0f; -COMPILER_STRIP_GATE(80951208, &lit_4238); +COMPILER_STRIP_GATE(0x80951208, &lit_4238); #pragma pop /* 8094C520-8094C688 0009E0 0168+00 1/1 0/0 0/0 .text search_test__FP8ni_class */ @@ -998,7 +1004,7 @@ static asm void ni_carry_check(ni_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4274 = 300.0f; -COMPILER_STRIP_GATE(8095120C, &lit_4274); +COMPILER_STRIP_GATE(0x8095120C, &lit_4274); #pragma pop /* 8094C6C4-8094C7B4 000B84 00F0+00 1/1 0/0 0/0 .text move_gake_check__FP8ni_classf */ @@ -1016,56 +1022,56 @@ static asm void move_gake_check(ni_class* param_0, f32 param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4414 = 50.0f; -COMPILER_STRIP_GATE(80951210, &lit_4414); +COMPILER_STRIP_GATE(0x80951210, &lit_4414); #pragma pop /* 80951214-80951218 000054 0004+00 0/1 0/0 0/0 .rodata @4415 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4415 = 70.0f; -COMPILER_STRIP_GATE(80951214, &lit_4415); +COMPILER_STRIP_GATE(0x80951214, &lit_4415); #pragma pop /* 80951218-8095121C 000058 0004+00 0/6 0/0 0/0 .rodata @4416 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4416 = 3.0f; -COMPILER_STRIP_GATE(80951218, &lit_4416); +COMPILER_STRIP_GATE(0x80951218, &lit_4416); #pragma pop /* 8095121C-80951220 00005C 0004+00 0/2 0/0 0/0 .rodata @4417 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4417 = 8000.0f; -COMPILER_STRIP_GATE(8095121C, &lit_4417); +COMPILER_STRIP_GATE(0x8095121C, &lit_4417); #pragma pop /* 80951220-80951224 000060 0004+00 0/3 0/0 0/0 .rodata @4418 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4418 = 500.0f; -COMPILER_STRIP_GATE(80951220, &lit_4418); +COMPILER_STRIP_GATE(0x80951220, &lit_4418); #pragma pop /* 80951224-80951228 000064 0004+00 0/3 0/0 0/0 .rodata @4419 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4419 = 60.0f; -COMPILER_STRIP_GATE(80951224, &lit_4419); +COMPILER_STRIP_GATE(0x80951224, &lit_4419); #pragma pop /* 80951228-8095122C 000068 0004+00 0/8 0/0 0/0 .rodata @4420 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4420 = 5.0f; -COMPILER_STRIP_GATE(80951228, &lit_4420); +COMPILER_STRIP_GATE(0x80951228, &lit_4420); #pragma pop /* 8095122C-80951230 00006C 0004+00 0/2 0/0 0/0 .rodata @4421 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4421 = 16.0f; -COMPILER_STRIP_GATE(8095122C, &lit_4421); +COMPILER_STRIP_GATE(0x8095122C, &lit_4421); #pragma pop /* 80951230-80951238 000070 0008+00 0/3 0/0 0/0 .rodata @4422 */ @@ -1074,7 +1080,7 @@ COMPILER_STRIP_GATE(8095122C, &lit_4421); SECTION_RODATA static u8 const lit_4422[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80951230, &lit_4422); +COMPILER_STRIP_GATE(0x80951230, &lit_4422); #pragma pop /* 80951238-80951240 000078 0008+00 0/3 0/0 0/0 .rodata @4423 */ @@ -1083,7 +1089,7 @@ COMPILER_STRIP_GATE(80951230, &lit_4422); SECTION_RODATA static u8 const lit_4423[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80951238, &lit_4423); +COMPILER_STRIP_GATE(0x80951238, &lit_4423); #pragma pop /* 80951240-80951248 000080 0008+00 0/3 0/0 0/0 .rodata @4424 */ @@ -1092,35 +1098,35 @@ COMPILER_STRIP_GATE(80951238, &lit_4423); SECTION_RODATA static u8 const lit_4424[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80951240, &lit_4424); +COMPILER_STRIP_GATE(0x80951240, &lit_4424); #pragma pop /* 80951248-8095124C 000088 0004+00 0/2 0/0 0/0 .rodata @4425 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4425 = 3000.0f; -COMPILER_STRIP_GATE(80951248, &lit_4425); +COMPILER_STRIP_GATE(0x80951248, &lit_4425); #pragma pop /* 8095124C-80951250 00008C 0004+00 0/1 0/0 0/0 .rodata @4426 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4426 = -914.0f; -COMPILER_STRIP_GATE(8095124C, &lit_4426); +COMPILER_STRIP_GATE(0x8095124C, &lit_4426); #pragma pop /* 80951250-80951254 000090 0004+00 0/1 0/0 0/0 .rodata @4427 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4427 = 160.0f; -COMPILER_STRIP_GATE(80951250, &lit_4427); +COMPILER_STRIP_GATE(0x80951250, &lit_4427); #pragma pop /* 80951254-80951258 000094 0004+00 0/1 0/0 0/0 .rodata @4428 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4428 = 3931.0f; -COMPILER_STRIP_GATE(80951254, &lit_4428); +COMPILER_STRIP_GATE(0x80951254, &lit_4428); #pragma pop /* 8094C7B4-8094CE7C 000C74 06C8+00 1/1 0/0 0/0 .text ni_normal__FP8ni_class */ @@ -1138,28 +1144,28 @@ static asm void ni_normal(ni_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4513 = 2.0f; -COMPILER_STRIP_GATE(80951258, &lit_4513); +COMPILER_STRIP_GATE(0x80951258, &lit_4513); #pragma pop /* 8095125C-80951260 00009C 0004+00 0/1 0/0 0/0 .rodata @4514 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4514 = 8.0f; -COMPILER_STRIP_GATE(8095125C, &lit_4514); +COMPILER_STRIP_GATE(0x8095125C, &lit_4514); #pragma pop /* 80951260-80951264 0000A0 0004+00 0/3 0/0 0/0 .rodata @4515 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4515 = 25.0f; -COMPILER_STRIP_GATE(80951260, &lit_4515); +COMPILER_STRIP_GATE(0x80951260, &lit_4515); #pragma pop /* 80951264-80951268 0000A4 0004+00 0/2 0/0 0/0 .rodata @4516 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4516 = 10000.0f; -COMPILER_STRIP_GATE(80951264, &lit_4516); +COMPILER_STRIP_GATE(0x80951264, &lit_4516); #pragma pop /* 8094CE7C-8094D2A4 00133C 0428+00 1/1 0/0 0/0 .text ni_away__FP8ni_class */ @@ -1177,7 +1183,7 @@ static asm void ni_away(ni_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4578 = 65536.0f; -COMPILER_STRIP_GATE(80951268, &lit_4578); +COMPILER_STRIP_GATE(0x80951268, &lit_4578); #pragma pop /* 8094D2A4-8094D60C 001764 0368+00 1/1 0/0 0/0 .text ni_swim__FP8ni_class */ @@ -1195,14 +1201,14 @@ static asm void ni_swim(ni_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4623 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(8095126C, &lit_4623); +COMPILER_STRIP_GATE(0x8095126C, &lit_4623); #pragma pop /* 80951270-80951274 0000B0 0004+00 0/1 0/0 0/0 .rodata @4624 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4624 = 2500.0f; -COMPILER_STRIP_GATE(80951270, &lit_4624); +COMPILER_STRIP_GATE(0x80951270, &lit_4624); #pragma pop /* 8094D60C-8094D7BC 001ACC 01B0+00 1/1 0/0 0/0 .text ni_carry__FP8ni_class */ @@ -1220,7 +1226,7 @@ static asm void ni_carry(ni_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4649 = -20.0f; -COMPILER_STRIP_GATE(80951274, &lit_4649); +COMPILER_STRIP_GATE(0x80951274, &lit_4649); #pragma pop /* 8094D7BC-8094D8EC 001C7C 0130+00 1/1 0/0 0/0 .text ni_fly__FP8ni_class */ @@ -1238,7 +1244,7 @@ static asm void ni_fly(ni_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4668 = -20000.0f; -COMPILER_STRIP_GATE(80951278, &lit_4668); +COMPILER_STRIP_GATE(0x80951278, &lit_4668); #pragma pop /* 8094D8EC-8094DA0C 001DAC 0120+00 1/1 0/0 0/0 .text ni_drop__FP8ni_class */ @@ -1266,7 +1272,7 @@ static asm void ni_return(ni_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4712 = 7.0f / 20.0f; -COMPILER_STRIP_GATE(8095127C, &lit_4712); +COMPILER_STRIP_GATE(0x8095127C, &lit_4712); #pragma pop /* 8094DB98-8094DD10 002058 0178+00 1/1 0/0 0/0 .text ni_damage__FP8ni_class */ @@ -1294,7 +1300,7 @@ static asm void s_b_sub(void* param_0, void* param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4744 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(80951280, &lit_4744); +COMPILER_STRIP_GATE(0x80951280, &lit_4744); #pragma pop /* 8094DD74-8094DED0 002234 015C+00 1/1 0/0 0/0 .text ni_windspin__FP8ni_class */ @@ -1312,35 +1318,35 @@ static asm void ni_windspin(ni_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4843 = -5.0f; -COMPILER_STRIP_GATE(80951284, &lit_4843); +COMPILER_STRIP_GATE(0x80951284, &lit_4843); #pragma pop /* 80951288-8095128C 0000C8 0004+00 0/1 0/0 0/0 .rodata @4844 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4844 = 20000.0f; -COMPILER_STRIP_GATE(80951288, &lit_4844); +COMPILER_STRIP_GATE(0x80951288, &lit_4844); #pragma pop /* 8095128C-80951290 0000CC 0004+00 0/1 0/0 0/0 .rodata @4845 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4845 = -37864.0f; -COMPILER_STRIP_GATE(8095128C, &lit_4845); +COMPILER_STRIP_GATE(0x8095128C, &lit_4845); #pragma pop /* 80951290-80951294 0000D0 0004+00 0/1 0/0 0/0 .rodata @4846 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4846 = 1012.0f; -COMPILER_STRIP_GATE(80951290, &lit_4846); +COMPILER_STRIP_GATE(0x80951290, &lit_4846); #pragma pop /* 80951294-80951298 0000D4 0004+00 0/1 0/0 0/0 .rodata @4847 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4847 = -22106.0f; -COMPILER_STRIP_GATE(80951294, &lit_4847); +COMPILER_STRIP_GATE(0x80951294, &lit_4847); #pragma pop /* 8094DED0-8094E2B0 002390 03E0+00 1/2 0/0 0/0 .text ni_demo0__FP8ni_class */ @@ -1378,7 +1384,7 @@ static asm void playwallcheck(ni_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5117 = 1.0f / 20.0f; -COMPILER_STRIP_GATE(80951298, &lit_5117); +COMPILER_STRIP_GATE(0x80951298, &lit_5117); #pragma pop /* 8094E4FC-8094ED90 0029BC 0894+00 2/1 0/0 0/0 .text ni_play__FP8ni_class */ @@ -1396,133 +1402,133 @@ static asm void ni_play(ni_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5118 = -10.0f; -COMPILER_STRIP_GATE(8095129C, &lit_5118); +COMPILER_STRIP_GATE(0x8095129C, &lit_5118); #pragma pop /* 809512A0-809512A4 0000E0 0004+00 0/0 0/0 0/0 .rodata @5119 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5119 = -2.0f; -COMPILER_STRIP_GATE(809512A0, &lit_5119); +COMPILER_STRIP_GATE(0x809512A0, &lit_5119); #pragma pop /* 809512A4-809512A8 0000E4 0004+00 0/1 0/0 0/0 .rodata @5120 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5120 = 3.0f / 10.0f; -COMPILER_STRIP_GATE(809512A4, &lit_5120); +COMPILER_STRIP_GATE(0x809512A4, &lit_5120); #pragma pop /* 809512A8-809512AC 0000E8 0004+00 0/0 0/0 0/0 .rodata @5121 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5121 = 0.25f; -COMPILER_STRIP_GATE(809512A8, &lit_5121); +COMPILER_STRIP_GATE(0x809512A8, &lit_5121); #pragma pop /* 809512AC-809512B0 0000EC 0004+00 0/1 0/0 0/0 .rodata @5122 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5122 = 0.5f; -COMPILER_STRIP_GATE(809512AC, &lit_5122); +COMPILER_STRIP_GATE(0x809512AC, &lit_5122); #pragma pop /* 809512B0-809512B4 0000F0 0004+00 0/0 0/0 0/0 .rodata @5123 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5123 = 0.75f; -COMPILER_STRIP_GATE(809512B0, &lit_5123); +COMPILER_STRIP_GATE(0x809512B0, &lit_5123); #pragma pop /* 809512B4-809512B8 0000F4 0004+00 0/0 0/0 0/0 .rodata @5124 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5124 = -15.0f; -COMPILER_STRIP_GATE(809512B4, &lit_5124); +COMPILER_STRIP_GATE(0x809512B4, &lit_5124); #pragma pop /* 809512B8-809512BC 0000F8 0004+00 0/1 0/0 0/0 .rodata @5300 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5300 = -1.0f / 20.0f; -COMPILER_STRIP_GATE(809512B8, &lit_5300); +COMPILER_STRIP_GATE(0x809512B8, &lit_5300); #pragma pop /* 809512BC-809512C0 0000FC 0004+00 0/2 0/0 0/0 .rodata @5301 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5301 = 55.0f; -COMPILER_STRIP_GATE(809512BC, &lit_5301); +COMPILER_STRIP_GATE(0x809512BC, &lit_5301); #pragma pop /* 809512C0-809512C4 000100 0004+00 0/1 0/0 0/0 .rodata @5302 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5302 = 180.0f; -COMPILER_STRIP_GATE(809512C0, &lit_5302); +COMPILER_STRIP_GATE(0x809512C0, &lit_5302); #pragma pop /* 809512C4-809512C8 000104 0004+00 0/1 0/0 0/0 .rodata @5303 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5303 = 230.0f; -COMPILER_STRIP_GATE(809512C4, &lit_5303); +COMPILER_STRIP_GATE(0x809512C4, &lit_5303); #pragma pop /* 809512C8-809512CC 000108 0004+00 0/1 0/0 0/0 .rodata @5304 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5304 = 150.0f; -COMPILER_STRIP_GATE(809512C8, &lit_5304); +COMPILER_STRIP_GATE(0x809512C8, &lit_5304); #pragma pop /* 809512CC-809512D0 00010C 0004+00 0/1 0/0 0/0 .rodata @5305 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5305 = 5000.0f; -COMPILER_STRIP_GATE(809512CC, &lit_5305); +COMPILER_STRIP_GATE(0x809512CC, &lit_5305); #pragma pop /* 809512D0-809512D4 000110 0004+00 0/1 0/0 0/0 .rodata @5306 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5306 = -25.0f; -COMPILER_STRIP_GATE(809512D0, &lit_5306); +COMPILER_STRIP_GATE(0x809512D0, &lit_5306); #pragma pop /* 809512D4-809512D8 000114 0004+00 0/1 0/0 0/0 .rodata @5307 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5307 = 800.0f; -COMPILER_STRIP_GATE(809512D4, &lit_5307); +COMPILER_STRIP_GATE(0x809512D4, &lit_5307); #pragma pop /* 809512D8-809512DC 000118 0004+00 0/1 0/0 0/0 .rodata @5308 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5308 = 1.0f / 100.0f; -COMPILER_STRIP_GATE(809512D8, &lit_5308); +COMPILER_STRIP_GATE(0x809512D8, &lit_5308); #pragma pop /* 809512DC-809512E0 00011C 0004+00 0/1 0/0 0/0 .rodata @5309 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5309 = -250.0f; -COMPILER_STRIP_GATE(809512DC, &lit_5309); +COMPILER_STRIP_GATE(0x809512DC, &lit_5309); #pragma pop /* 809512E0-809512E4 000120 0004+00 0/1 0/0 0/0 .rodata @5310 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5310 = 120.0f; -COMPILER_STRIP_GATE(809512E0, &lit_5310); +COMPILER_STRIP_GATE(0x809512E0, &lit_5310); #pragma pop /* 809512E4-809512E8 000124 0004+00 0/1 0/0 0/0 .rodata @5311 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5311 = 250.0f; -COMPILER_STRIP_GATE(809512E4, &lit_5311); +COMPILER_STRIP_GATE(0x809512E4, &lit_5311); #pragma pop /* 8094ED90-8094F5D8 003250 0848+00 1/1 0/0 0/0 .text play_camera__FP8ni_class */ @@ -1535,6 +1541,13 @@ static asm void play_camera(ni_class* param_0) { } #pragma pop +/* ############################################################################################## */ +/* 8095131C-8095131C 00015C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8095131F = "F_SP103"; +#pragma pop + /* 8094F5D8-809502B4 003A98 0CDC+00 2/1 0/0 0/0 .text action__FP8ni_class */ #pragma push #pragma optimization_level 0 @@ -1560,70 +1573,70 @@ static asm void message(ni_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5661 = -80.0f; -COMPILER_STRIP_GATE(809512E8, &lit_5661); +COMPILER_STRIP_GATE(0x809512E8, &lit_5661); #pragma pop /* 809512EC-809512F0 00012C 0004+00 0/0 0/0 0/0 .rodata @5662 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5662 = 32768.0f; -COMPILER_STRIP_GATE(809512EC, &lit_5662); +COMPILER_STRIP_GATE(0x809512EC, &lit_5662); #pragma pop /* 809512F0-809512F4 000130 0004+00 0/0 0/0 0/0 .rodata @5663 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5663 = 1076.0f; -COMPILER_STRIP_GATE(809512F0, &lit_5663); +COMPILER_STRIP_GATE(0x809512F0, &lit_5663); #pragma pop /* 809512F4-809512F8 000134 0004+00 0/0 0/0 0/0 .rodata @5664 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5664 = 4128.0f; -COMPILER_STRIP_GATE(809512F4, &lit_5664); +COMPILER_STRIP_GATE(0x809512F4, &lit_5664); #pragma pop /* 809512F8-809512FC 000138 0004+00 0/0 0/0 0/0 .rodata @5665 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5665 = 50000.0f; -COMPILER_STRIP_GATE(809512F8, &lit_5665); +COMPILER_STRIP_GATE(0x809512F8, &lit_5665); #pragma pop /* 809512FC-80951300 00013C 0004+00 0/1 0/0 0/0 .rodata @5803 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5803 = 23.0f; -COMPILER_STRIP_GATE(809512FC, &lit_5803); +COMPILER_STRIP_GATE(0x809512FC, &lit_5803); #pragma pop /* 80951300-80951304 000140 0004+00 0/1 0/0 0/0 .rodata @5804 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5804 = 9.0f; -COMPILER_STRIP_GATE(80951300, &lit_5804); +COMPILER_STRIP_GATE(0x80951300, &lit_5804); #pragma pop /* 80951304-80951308 000144 0004+00 0/1 0/0 0/0 .rodata @5805 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5805 = 13.0f; -COMPILER_STRIP_GATE(80951304, &lit_5805); +COMPILER_STRIP_GATE(0x80951304, &lit_5805); #pragma pop /* 80951308-8095130C 000148 0004+00 0/1 0/0 0/0 .rodata @5806 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5806 = 17.0f; -COMPILER_STRIP_GATE(80951308, &lit_5806); +COMPILER_STRIP_GATE(0x80951308, &lit_5806); #pragma pop /* 8095130C-80951310 00014C 0004+00 0/1 0/0 0/0 .rodata @5807 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5807 = 21.0f; -COMPILER_STRIP_GATE(8095130C, &lit_5807); +COMPILER_STRIP_GATE(0x8095130C, &lit_5807); #pragma pop /* 809503D8-80950870 004898 0498+00 2/1 0/0 0/0 .text daNi_Execute__FP8ni_class */ @@ -1676,21 +1689,27 @@ asm J3DFrameCtrl::~J3DFrameCtrl() { #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_6033 = 0x403FEF9E; -COMPILER_STRIP_GATE(80951310, &lit_6033); +COMPILER_STRIP_GATE(0x80951310, &lit_6033); #pragma pop /* 80951314-80951318 000154 0004+00 0/1 0/0 0/0 .rodata @6034 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6034 = 45.0f; -COMPILER_STRIP_GATE(80951314, &lit_6034); +COMPILER_STRIP_GATE(0x80951314, &lit_6034); #pragma pop /* 80951318-8095131C 000158 0004+00 0/1 0/0 0/0 .rodata @6035 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6035 = -1000000000.0f; -COMPILER_STRIP_GATE(80951318, &lit_6035); +COMPILER_STRIP_GATE(0x80951318, &lit_6035); +#pragma pop + +/* 8095131C-8095131C 00015C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80951327 = "F_SP108"; #pragma pop /* 80950B30-80950F04 004FF0 03D4+00 1/0 0/0 0/0 .text daNi_Create__FP10fopAc_ac_c */ @@ -1785,7 +1804,7 @@ asm void __sinit_d_a_ni_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80951160 = (void*)__sinit_d_a_ni_cpp; +REGISTER_CTORS(0x80951160, __sinit_d_a_ni_cpp); #pragma pop /* 8095119C-809511A4 00565C 0008+00 1/0 0/0 0/0 .text @36@__dt__12dBgS_ObjAcchFv */ @@ -1992,11 +2011,4 @@ static u8 data_8095167C[4]; static u8 data_80951680[4]; #pragma pop -/* 8095131C-8095132F 00015C 0013+00 5/5 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_8095131C = "Ni"; -SECTION_DEAD static char const* const stringBase_8095131F = "F_SP103"; -SECTION_DEAD static char const* const stringBase_80951327 = "F_SP108"; -#pragma pop +/* 8095131C-8095131C 00015C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/d_a_passer_mng/d_a_passer_mng.cpp b/rel/d/a/d_a_passer_mng/d_a_passer_mng.cpp index f11bc333e22..3e3390a17bc 100644 --- a/rel/d/a/d_a_passer_mng/d_a_passer_mng.cpp +++ b/rel/d/a/d_a_passer_mng/d_a_passer_mng.cpp @@ -57,7 +57,7 @@ extern "C" static void daPasserMng_Delete__FP13daPasserMng_c(); extern "C" static void daPasserMng_Create__FP10fopAc_ac_c(); extern "C" void create__13daPasserMng_cFv(); extern "C" void create_init__13daPasserMng_cFv(); -extern "C" void func_80D46B9C(int, int); +extern "C" void func_80D46B9C(void* _this, int, int); extern "C" void* mGroupTbl__13daPasserMng_c[4]; extern "C" extern void* g_profile_PASSER_MNG[12]; @@ -125,7 +125,7 @@ SECTION_RODATA static u8 const groupA[32] = { 0x07, 0x00, 0x00, 0x00, 0x11, 0x00, 0x00, 0x04, 0x50, 0x00, 0x00, 0x06, 0x01, 0x00, 0x00, 0x07, 0x01, 0x00, 0x00, 0x05, 0x01, 0x00, 0x00, 0x1B, 0x01, 0x00, 0x00, 0x1C, 0x00, 0x00, 0x00, 0x1D, }; -COMPILER_STRIP_GATE(80D46C20, &groupA); +COMPILER_STRIP_GATE(0x80D46C20, &groupA); /* 80D46C40-80D46C64 000020 0024+00 1/0 0/0 0/0 .rodata groupB */ SECTION_RODATA static u8 const groupB[36] = { @@ -133,7 +133,7 @@ SECTION_RODATA static u8 const groupB[36] = { 0x11, 0x00, 0x00, 0x12, 0x10, 0x00, 0x00, 0x13, 0x40, 0x00, 0x00, 0x09, 0x40, 0x00, 0x00, 0x08, 0x50, 0x00, 0x00, 0x0A, 0x01, 0x00, 0x00, 0x0B, }; -COMPILER_STRIP_GATE(80D46C40, &groupB); +COMPILER_STRIP_GATE(0x80D46C40, &groupB); /* 80D46C64-80D46C88 000044 0024+00 1/0 0/0 0/0 .rodata groupC */ SECTION_RODATA static u8 const groupC[36] = { @@ -141,14 +141,14 @@ SECTION_RODATA static u8 const groupC[36] = { 0x50, 0x00, 0x00, 0x02, 0x01, 0x00, 0x00, 0x03, 0x21, 0x00, 0x00, 0x17, 0x10, 0x00, 0x00, 0x18, 0x01, 0x00, 0x00, 0x19, 0x10, 0x00, 0x00, 0x1A, }; -COMPILER_STRIP_GATE(80D46C64, &groupC); +COMPILER_STRIP_GATE(0x80D46C64, &groupC); /* 80D46C88-80D46CA8 000068 0020+00 1/0 0/0 0/0 .rodata groupD */ SECTION_RODATA static u8 const groupD[32] = { 0x07, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x14, 0x21, 0x00, 0x00, 0x15, 0x00, 0x00, 0x00, 0x16, 0x11, 0x00, 0x00, 0x0C, 0x50, 0x00, 0x00, 0x0E, 0x40, 0x00, 0x00, 0x0F, 0x01, 0x00, 0x00, 0x0D, }; -COMPILER_STRIP_GATE(80D46C88, &groupD); +COMPILER_STRIP_GATE(0x80D46C88, &groupD); /* 80D46CB0-80D46CC0 -00001 0010+00 1/1 0/0 0/0 .data mGroupTbl__13daPasserMng_c */ SECTION_DATA void* daPasserMng_c::mGroupTbl[4] = { @@ -299,13 +299,13 @@ asm void daPasserMng_c::create_init() { SECTION_RODATA static u8 const lit_4430[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D46CA8, &lit_4430); +COMPILER_STRIP_GATE(0x80D46CA8, &lit_4430); /* 80D46B9C-80D46C18 0014FC 007C+00 3/3 0/0 0/0 .text cLib_getRndValue__Fii */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80D46B9C(int param_0, int param_1) { +extern "C" asm void func_80D46B9C(void* _this, int param_0, int param_1) { nofralloc #include "asm/rel/d/a/d_a_passer_mng/d_a_passer_mng/func_80D46B9C.s" } diff --git a/rel/d/a/d_a_peru/d_a_peru.cpp b/rel/d/a/d_a_peru/d_a_peru.cpp index 57804039b0a..090540d8c95 100644 --- a/rel/d/a/d_a_peru/d_a_peru.cpp +++ b/rel/d/a/d_a_peru/d_a_peru.cpp @@ -22,12 +22,14 @@ struct mDoMtx_stack_c { static u8 now[48]; }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; +struct J3DAnmTransform {}; + +struct J3DModelData {}; + struct Vec {}; struct Z2Creature { @@ -36,8 +38,6 @@ struct Z2Creature { /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -65,6 +65,8 @@ struct daPy_py_c { /* 80D4C034 */ void checkNowWolf(); }; +struct daNpcT_faceMotionAnmData_c {}; + struct daNpcT_MotionSeqMngr_c { struct sequenceStepData_c {}; @@ -72,14 +74,12 @@ struct daNpcT_MotionSeqMngr_c { /* 80D4B7BC */ ~daNpcT_MotionSeqMngr_c(); }; +struct daNpcT_evtData_c {}; + struct daNpcT_motionAnmData_c {}; struct J3DJoint {}; -struct daNpcT_faceMotionAnmData_c {}; - -struct daNpcT_evtData_c {}; - struct daPeru_c { /* 80D46EEC */ ~daPeru_c(); /* 80D46FCC */ void create(); @@ -154,10 +154,10 @@ struct dCcD_GObjInf { /* 800840E4 */ ~dCcD_GObjInf(); }; -struct J3DModel {}; - struct _GXColorS10 {}; +struct J3DModel {}; + struct daNpcT_c { /* 80147FA4 */ void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*); /* 801483F8 */ void loadRes(s8 const*, char const**); @@ -694,6 +694,15 @@ extern "C" void __register_global_object(); // /* ############################################################################################## */ +/* 80D4C1B0-80D4C1B0 000150 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80D4C1B0 = ""; +SECTION_DEAD static char const* const stringBase_80D4C1B1 = "PERU_APPEAR"; +SECTION_DEAD static char const* const stringBase_80D4C1BD = "PERU_APPEAR_SKIP"; +SECTION_DEAD static char const* const stringBase_80D4C1CE = "Peru"; +#pragma pop + /* 80D4C1DC-80D4C1E8 000000 000C+00 3/3 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -1203,34 +1212,34 @@ SECTION_RODATA u8 const daPeru_Param_c::m[152] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D4C060, &daPeru_Param_c::m); +COMPILER_STRIP_GATE(0x80D4C060, &daPeru_Param_c::m); /* 80D4C0F8-80D4C0FC 000098 0004+00 0/2 0/0 0/0 .rodata @4050 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4050 = -300.0f; -COMPILER_STRIP_GATE(80D4C0F8, &lit_4050); +COMPILER_STRIP_GATE(0x80D4C0F8, &lit_4050); #pragma pop /* 80D4C0FC-80D4C100 00009C 0004+00 0/1 0/0 0/0 .rodata @4051 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4051 = -50.0f; -COMPILER_STRIP_GATE(80D4C0FC, &lit_4051); +COMPILER_STRIP_GATE(0x80D4C0FC, &lit_4051); #pragma pop /* 80D4C100-80D4C104 0000A0 0004+00 0/2 0/0 0/0 .rodata @4052 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4052 = 300.0f; -COMPILER_STRIP_GATE(80D4C100, &lit_4052); +COMPILER_STRIP_GATE(0x80D4C100, &lit_4052); #pragma pop /* 80D4C104-80D4C108 0000A4 0004+00 0/1 0/0 0/0 .rodata @4053 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4053 = 450.0f; -COMPILER_STRIP_GATE(80D4C104, &lit_4053); +COMPILER_STRIP_GATE(0x80D4C104, &lit_4053); #pragma pop /* 80D46FCC-80D4720C 0001CC 0240+00 1/1 0/0 0/0 .text create__8daPeru_cFv */ @@ -1251,25 +1260,25 @@ SECTION_RODATA static u8 const lit_4199[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D4C108, &lit_4199); +COMPILER_STRIP_GATE(0x80D4C108, &lit_4199); /* 80D4C10C-80D4C110 0000AC 0004+00 0/2 0/0 0/0 .rodata @4200 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4200 = 65536.0f; -COMPILER_STRIP_GATE(80D4C10C, &lit_4200); +COMPILER_STRIP_GATE(0x80D4C10C, &lit_4200); #pragma pop /* 80D4C110-80D4C114 0000B0 0004+00 0/3 0/0 0/0 .rodata @4201 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4201 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(80D4C110, &lit_4201); +COMPILER_STRIP_GATE(0x80D4C110, &lit_4201); #pragma pop /* 80D4C114-80D4C118 0000B4 0004+00 3/5 0/0 0/0 .rodata @4348 */ SECTION_RODATA static f32 const lit_4348 = 1.0f; -COMPILER_STRIP_GATE(80D4C114, &lit_4348); +COMPILER_STRIP_GATE(0x80D4C114, &lit_4348); /* 80D4720C-80D474A0 00040C 0294+00 1/1 0/0 0/0 .text CreateHeap__8daPeru_cFv */ #pragma push @@ -1386,21 +1395,21 @@ asm J3DMatColorAnm::J3DMatColorAnm() { #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4395 = 0x45345E66; -COMPILER_STRIP_GATE(80D4C118, &lit_4395); +COMPILER_STRIP_GATE(0x80D4C118, &lit_4395); #pragma pop /* 80D4C11C-80D4C120 0000BC 0004+00 0/2 0/0 0/0 .rodata @4396 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4396 = -880.0f; -COMPILER_STRIP_GATE(80D4C11C, &lit_4396); +COMPILER_STRIP_GATE(0x80D4C11C, &lit_4396); #pragma pop /* 80D4C120-80D4C124 0000C0 0004+00 0/2 0/0 0/0 .rodata @4397 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4397 = 0x45AF8A66; -COMPILER_STRIP_GATE(80D4C120, &lit_4397); +COMPILER_STRIP_GATE(0x80D4C120, &lit_4397); #pragma pop /* 80D4765C-80D47750 00085C 00F4+00 1/1 0/0 0/0 .text typeInitialize__8daPeru_cFv */ @@ -1436,7 +1445,7 @@ asm void daPeru_c::Execute() { /* ############################################################################################## */ /* 80D4C124-80D4C128 0000C4 0004+00 1/1 0/0 0/0 .rodata @4430 */ SECTION_RODATA static f32 const lit_4430 = 100.0f; -COMPILER_STRIP_GATE(80D4C124, &lit_4430); +COMPILER_STRIP_GATE(0x80D4C124, &lit_4430); /* 80D477A4-80D47840 0009A4 009C+00 1/1 0/0 0/0 .text Draw__8daPeru_cFv */ #pragma push @@ -1502,7 +1511,7 @@ asm void daPeru_c::setParam() { /* ############################################################################################## */ /* 80D4C128-80D4C12C 0000C8 0004+00 4/14 0/0 0/0 .rodata @4548 */ SECTION_RODATA static f32 const lit_4548 = -1.0f; -COMPILER_STRIP_GATE(80D4C128, &lit_4548); +COMPILER_STRIP_GATE(0x80D4C128, &lit_4548); /* 80D47C4C-80D47CAC 000E4C 0060+00 1/0 0/0 0/0 .text setAfterTalkMotion__8daPeru_cFv */ #pragma push @@ -1559,28 +1568,28 @@ asm void daPeru_c::action() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4662 = 10.0f; -COMPILER_STRIP_GATE(80D4C12C, &lit_4662); +COMPILER_STRIP_GATE(0x80D4C12C, &lit_4662); #pragma pop /* 80D4C130-80D4C134 0000D0 0004+00 0/1 0/0 0/0 .rodata @4663 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4663 = 0x38C90FDB; -COMPILER_STRIP_GATE(80D4C130, &lit_4663); +COMPILER_STRIP_GATE(0x80D4C130, &lit_4663); #pragma pop /* 80D4C134-80D4C138 0000D4 0004+00 0/2 0/0 0/0 .rodata @4664 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4664 = 30.0f; -COMPILER_STRIP_GATE(80D4C134, &lit_4664); +COMPILER_STRIP_GATE(0x80D4C134, &lit_4664); #pragma pop /* 80D4C138-80D4C140 0000D8 0008+00 1/3 0/0 0/0 .rodata @4666 */ SECTION_RODATA static u8 const lit_4666[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D4C138, &lit_4666); +COMPILER_STRIP_GATE(0x80D4C138, &lit_4666); /* 80D47F5C-80D481A4 00115C 0248+00 1/0 0/0 0/0 .text setAttnPos__8daPeru_cFv */ #pragma push @@ -1599,7 +1608,7 @@ asm void daPeru_c::setAttnPos() { SECTION_RODATA static u8 const lit_4724[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D4C140, &lit_4724); +COMPILER_STRIP_GATE(0x80D4C140, &lit_4724); #pragma pop /* 80D4C148-80D4C150 0000E8 0008+00 0/3 0/0 0/0 .rodata @4725 */ @@ -1608,7 +1617,7 @@ COMPILER_STRIP_GATE(80D4C140, &lit_4724); SECTION_RODATA static u8 const lit_4725[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D4C148, &lit_4725); +COMPILER_STRIP_GATE(0x80D4C148, &lit_4725); #pragma pop /* 80D4C150-80D4C158 0000F0 0008+00 0/3 0/0 0/0 .rodata @4726 */ @@ -1617,14 +1626,14 @@ COMPILER_STRIP_GATE(80D4C148, &lit_4725); SECTION_RODATA static u8 const lit_4726[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D4C150, &lit_4726); +COMPILER_STRIP_GATE(0x80D4C150, &lit_4726); #pragma pop /* 80D4C158-80D4C160 0000F8 0008+00 1/1 0/0 0/0 .rodata @4737 */ SECTION_RODATA static u8 const lit_4737[8] = { 0x41, 0xA0, 0x00, 0x00, 0xC1, 0x20, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D4C158, &lit_4737); +COMPILER_STRIP_GATE(0x80D4C158, &lit_4737); /* 80D481A4-80D4835C 0013A4 01B8+00 1/0 0/0 0/0 .text setCollision__8daPeru_cFv */ #pragma push @@ -1646,7 +1655,7 @@ bool daPeru_c::drawDbgInfo() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daPeru_c::setAction(int (daPeru_c::*)(int), int param_1) { +asm void daPeru_c::setAction(int (daPeru_c::*param_0)(int), int param_1) { nofralloc #include "asm/rel/d/a/d_a_peru/d_a_peru/setAction__8daPeru_cFM8daPeru_cFPCvPvi_ii.s" } @@ -1698,42 +1707,42 @@ asm void daPeru_c::talk(int param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5061 = -9.0f; -COMPILER_STRIP_GATE(80D4C160, &lit_5061); +COMPILER_STRIP_GATE(0x80D4C160, &lit_5061); #pragma pop /* 80D4C164-80D4C168 000104 0004+00 0/1 0/0 0/0 .rodata @5062 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5062 = 22.0f; -COMPILER_STRIP_GATE(80D4C164, &lit_5062); +COMPILER_STRIP_GATE(0x80D4C164, &lit_5062); #pragma pop /* 80D4C168-80D4C16C 000108 0004+00 0/1 0/0 0/0 .rodata @5063 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5063 = 36.0f; -COMPILER_STRIP_GATE(80D4C168, &lit_5063); +COMPILER_STRIP_GATE(0x80D4C168, &lit_5063); #pragma pop /* 80D4C16C-80D4C170 00010C 0004+00 0/1 0/0 0/0 .rodata @5064 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5064 = 14.5f; -COMPILER_STRIP_GATE(80D4C16C, &lit_5064); +COMPILER_STRIP_GATE(0x80D4C16C, &lit_5064); #pragma pop /* 80D4C170-80D4C174 000110 0004+00 0/1 0/0 0/0 .rodata @5065 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5065 = 18.0f; -COMPILER_STRIP_GATE(80D4C170, &lit_5065); +COMPILER_STRIP_GATE(0x80D4C170, &lit_5065); #pragma pop /* 80D4C174-80D4C178 000114 0004+00 0/1 0/0 0/0 .rodata @5066 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5066 = 4.0f; -COMPILER_STRIP_GATE(80D4C174, &lit_5066); +COMPILER_STRIP_GATE(0x80D4C174, &lit_5066); #pragma pop /* 80D48A7C-80D48C58 001C7C 01DC+00 1/0 0/0 0/0 .text jump_st__8daPeru_cFi */ @@ -1761,7 +1770,7 @@ asm void daPeru_c::jump_ed(int param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5169 = 23.0f; -COMPILER_STRIP_GATE(80D4C178, &lit_5169); +COMPILER_STRIP_GATE(0x80D4C178, &lit_5169); #pragma pop /* 80D48E34-80D48FA8 002034 0174+00 1/0 0/0 0/0 .text sniff__8daPeru_cFi */ @@ -1779,7 +1788,7 @@ asm void daPeru_c::sniff(int param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5207 = 6.0f / 5.0f; -COMPILER_STRIP_GATE(80D4C17C, &lit_5207); +COMPILER_STRIP_GATE(0x80D4C17C, &lit_5207); #pragma pop /* 80D48FA8-80D4910C 0021A8 0164+00 1/0 0/0 0/0 .text demo_appear__8daPeru_cFi */ @@ -1797,21 +1806,21 @@ asm void daPeru_c::demo_appear(int param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5247 = 24.0f / 5.0f; -COMPILER_STRIP_GATE(80D4C180, &lit_5247); +COMPILER_STRIP_GATE(0x80D4C180, &lit_5247); #pragma pop /* 80D4C184-80D4C188 000124 0004+00 0/1 0/0 0/0 .rodata @5248 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5248 = 13.0f / 10.0f; -COMPILER_STRIP_GATE(80D4C184, &lit_5248); +COMPILER_STRIP_GATE(0x80D4C184, &lit_5248); #pragma pop /* 80D4C188-80D4C18C 000128 0004+00 0/1 0/0 0/0 .rodata @5249 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5249 = 130.0f; -COMPILER_STRIP_GATE(80D4C188, &lit_5249); +COMPILER_STRIP_GATE(0x80D4C188, &lit_5249); #pragma pop /* 80D4910C-80D492A8 00230C 019C+00 1/0 0/0 0/0 .text demo_walk_to_link__8daPeru_cFi */ @@ -1829,7 +1838,7 @@ asm void daPeru_c::demo_walk_to_link(int param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5282 = 21.0f / 5.0f; -COMPILER_STRIP_GATE(80D4C18C, &lit_5282); +COMPILER_STRIP_GATE(0x80D4C18C, &lit_5282); #pragma pop /* 80D492A8-80D49418 0024A8 0170+00 1/0 0/0 0/0 .text demo_walk_circle__8daPeru_cFi */ @@ -1847,21 +1856,21 @@ asm void daPeru_c::demo_walk_circle(int param_0) { #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_5360 = 0x45405B96; -COMPILER_STRIP_GATE(80D4C190, &lit_5360); +COMPILER_STRIP_GATE(0x80D4C190, &lit_5360); #pragma pop /* 80D4C194-80D4C198 000134 0004+00 0/1 0/0 0/0 .rodata @5361 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_5361 = 0xC4598148; -COMPILER_STRIP_GATE(80D4C194, &lit_5361); +COMPILER_STRIP_GATE(0x80D4C194, &lit_5361); #pragma pop /* 80D4C198-80D4C19C 000138 0004+00 0/1 0/0 0/0 .rodata @5362 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_5362 = 0x45BD3A31; -COMPILER_STRIP_GATE(80D4C198, &lit_5362); +COMPILER_STRIP_GATE(0x80D4C198, &lit_5362); #pragma pop /* 80D49418-80D4971C 002618 0304+00 1/0 0/0 0/0 .text demo_walk_to_window__8daPeru_cFi */ @@ -1879,35 +1888,35 @@ asm void daPeru_c::demo_walk_to_window(int param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5436 = 8.0f; -COMPILER_STRIP_GATE(80D4C19C, &lit_5436); +COMPILER_STRIP_GATE(0x80D4C19C, &lit_5436); #pragma pop /* 80D4C1A0-80D4C1A4 000140 0004+00 0/1 0/0 0/0 .rodata @5437 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_5437 = 0x453305F0; -COMPILER_STRIP_GATE(80D4C1A0, &lit_5437); +COMPILER_STRIP_GATE(0x80D4C1A0, &lit_5437); #pragma pop /* 80D4C1A4-80D4C1A8 000144 0004+00 0/1 0/0 0/0 .rodata @5438 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_5438 = 0xC4524EE9; -COMPILER_STRIP_GATE(80D4C1A4, &lit_5438); +COMPILER_STRIP_GATE(0x80D4C1A4, &lit_5438); #pragma pop /* 80D4C1A8-80D4C1AC 000148 0004+00 0/1 0/0 0/0 .rodata @5439 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_5439 = 0x45ADFCC7; -COMPILER_STRIP_GATE(80D4C1A8, &lit_5439); +COMPILER_STRIP_GATE(0x80D4C1A8, &lit_5439); #pragma pop /* 80D4C1AC-80D4C1B0 00014C 0004+00 0/1 0/0 0/0 .rodata @5440 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5440 = 60.0f; -COMPILER_STRIP_GATE(80D4C1AC, &lit_5440); +COMPILER_STRIP_GATE(0x80D4C1AC, &lit_5440); #pragma pop /* 80D4971C-80D499AC 00291C 0290+00 1/0 0/0 0/0 .text demo_walk_to_pathway__8daPeru_cFi @@ -1921,6 +1930,13 @@ asm void daPeru_c::demo_walk_to_pathway(int param_0) { } #pragma pop +/* ############################################################################################## */ +/* 80D4C1B0-80D4C1B0 000150 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80D4C1D3 = "cut_id"; +#pragma pop + /* 80D499AC-80D49A40 002BAC 0094+00 1/0 0/0 0/0 .text cutAppear__8daPeru_cFi */ #pragma push #pragma optimization_level 0 @@ -2533,7 +2549,7 @@ asm void __sinit_d_a_peru_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80D4BD90 = (void*)__sinit_d_a_peru_cpp; +REGISTER_CTORS(0x80D4BD90, __sinit_d_a_peru_cpp); #pragma pop /* 80D4BE2C-80D4BEC4 00502C 0098+00 1/1 0/0 0/0 .text @@ -2825,13 +2841,4 @@ static u8 data_80D4C8B8[4]; static u8 data_80D4C8BC[4]; #pragma pop -/* 80D4C1B0-80D4C1DA 000150 002A+00 6/3 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80D4C1B0 = ""; -SECTION_DEAD static char const* const stringBase_80D4C1B1 = "PERU_APPEAR"; -SECTION_DEAD static char const* const stringBase_80D4C1BD = "PERU_APPEAR_SKIP"; -SECTION_DEAD static char const* const stringBase_80D4C1CE = "Peru"; -SECTION_DEAD static char const* const stringBase_80D4C1D3 = "cut_id"; -#pragma pop +/* 80D4C1B0-80D4C1B0 000150 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/d_a_ppolamp/d_a_ppolamp.cpp b/rel/d/a/d_a_ppolamp/d_a_ppolamp.cpp index bfb5bf12c8e..a33bbab40f1 100644 --- a/rel/d/a/d_a_ppolamp/d_a_ppolamp.cpp +++ b/rel/d/a/d_a_ppolamp/d_a_ppolamp.cpp @@ -152,6 +152,12 @@ static asm void daPPolamp_c_createHeap(fopAc_ac_c* param_0) { #pragma pop /* ############################################################################################## */ +/* 80D4D2C8-80D4D2C8 00004C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80D4D2C8 = "PPolamp"; +#pragma pop + /* 80D4D2D0-80D4D2D4 -00001 0004+00 3/3 0/0 0/0 .data l_arcName */ SECTION_DATA static void* l_arcName = (void*)&d_a_ppolamp__stringBase0; @@ -206,7 +212,7 @@ asm daPPolamp_c::~daPPolamp_c() { SECTION_RODATA static u8 const lit_3757[12] = { 0x00, 0x00, 0x00, 0x00, 0xC2, 0x34, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D4D27C, &lit_3757); +COMPILER_STRIP_GATE(0x80D4D27C, &lit_3757); /* 80D4C9FC-80D4CB24 00013C 0128+00 1/1 0/0 0/0 .text create__11daPPolamp_cFv */ #pragma push @@ -233,13 +239,13 @@ asm void daPPolamp_c::execute() { SECTION_RODATA static u8 const lit_3797[8] = { 0x00, 0x48, 0x00, 0x85, 0x00, 0xFF, 0x00, 0xFF, }; -COMPILER_STRIP_GATE(80D4D288, &lit_3797); +COMPILER_STRIP_GATE(0x80D4D288, &lit_3797); /* 80D4D290-80D4D298 000014 0008+00 1/1 0/0 0/0 .rodata @3802 */ SECTION_RODATA static u8 const lit_3802[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0x00, 0xFF, }; -COMPILER_STRIP_GATE(80D4D290, &lit_3802); +COMPILER_STRIP_GATE(0x80D4D290, &lit_3802); /* 80D4D340-80D4D344 000000 0001+03 1/1 0/0 0/0 .bss @1109 */ static u8 lit_1109[1 + 3 /* padding */]; @@ -381,7 +387,7 @@ asm void daPPolamp_c::setModelMtx() { SECTION_RODATA static u8 const lit_3859[12] = { 0x00, 0x00, 0x00, 0x00, 0xC2, 0x34, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D4D298, &lit_3859); +COMPILER_STRIP_GATE(0x80D4D298, &lit_3859); /* 80D4CDA8-80D4CE9C 0004E8 00F4+00 1/1 0/0 0/0 .text setPclModelMtx__11daPPolamp_cFv */ #pragma push @@ -396,7 +402,7 @@ asm void daPPolamp_c::setPclModelMtx() { /* ############################################################################################## */ /* 80D4D2A4-80D4D2A8 000028 0004+00 2/2 0/0 0/0 .rodata @3909 */ SECTION_RODATA static f32 const lit_3909 = 1.0f; -COMPILER_STRIP_GATE(80D4D2A4, &lit_3909); +COMPILER_STRIP_GATE(0x80D4D2A4, &lit_3909); /* 80D4CE9C-80D4CFB0 0005DC 0114+00 1/1 0/0 0/0 .text createHeap__11daPPolamp_cFv */ #pragma push @@ -413,35 +419,35 @@ asm void daPPolamp_c::createHeap() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3922 = 450.0f; -COMPILER_STRIP_GATE(80D4D2A8, &lit_3922); +COMPILER_STRIP_GATE(0x80D4D2A8, &lit_3922); #pragma pop /* 80D4D2AC-80D4D2B0 000030 0004+00 0/1 0/0 0/0 .rodata @3923 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3923 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(80D4D2AC, &lit_3923); +COMPILER_STRIP_GATE(0x80D4D2AC, &lit_3923); #pragma pop /* 80D4D2B0-80D4D2B4 000034 0004+00 0/1 0/0 0/0 .rodata @3924 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3924 = 11.0f / 10.0f; -COMPILER_STRIP_GATE(80D4D2B0, &lit_3924); +COMPILER_STRIP_GATE(0x80D4D2B0, &lit_3924); #pragma pop /* 80D4D2B4-80D4D2B8 000038 0004+00 0/1 0/0 0/0 .rodata @3925 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3925 = 3.0f / 25.0f; -COMPILER_STRIP_GATE(80D4D2B4, &lit_3925); +COMPILER_STRIP_GATE(0x80D4D2B4, &lit_3925); #pragma pop /* 80D4D2B8-80D4D2BC 00003C 0004+00 0/1 0/0 0/0 .rodata @3926 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3926 = 80.0f; -COMPILER_STRIP_GATE(80D4D2B8, &lit_3926); +COMPILER_STRIP_GATE(0x80D4D2B8, &lit_3926); #pragma pop /* 80D4D2BC-80D4D2C4 000040 0008+00 0/1 0/0 0/0 .rodata @3928 */ @@ -450,7 +456,7 @@ COMPILER_STRIP_GATE(80D4D2B8, &lit_3926); SECTION_RODATA static u8 const lit_3928[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D4D2BC, &lit_3928); +COMPILER_STRIP_GATE(0x80D4D2BC, &lit_3928); #pragma pop /* 80D4CFB0-80D4D10C 0006F0 015C+00 1/1 0/0 0/0 .text moveSwing__11daPPolamp_cFv */ @@ -466,7 +472,7 @@ asm void daPPolamp_c::moveSwing() { /* ############################################################################################## */ /* 80D4D2C4-80D4D2C8 000048 0004+00 1/1 0/0 0/0 .rodata @3936 */ SECTION_RODATA static f32 const lit_3936 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(80D4D2C4, &lit_3936); +COMPILER_STRIP_GATE(0x80D4D2C4, &lit_3936); /* 80D4D10C-80D4D140 00084C 0034+00 1/1 0/0 0/0 .text initParam__11daPPolamp_cFv */ #pragma push @@ -703,9 +709,4 @@ static u8 data_80D4D3F0[4]; static u8 data_80D4D3F4[4]; #pragma pop -/* 80D4D2C8-80D4D2D0 00004C 0008+00 1/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80D4D2C8 = "PPolamp"; -#pragma pop +/* 80D4D2C8-80D4D2C8 00004C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/d_a_scene_exit/d_a_scene_exit.cpp b/rel/d/a/d_a_scene_exit/d_a_scene_exit.cpp index f52eeff3583..6991d3a1d02 100644 --- a/rel/d/a/d_a_scene_exit/d_a_scene_exit.cpp +++ b/rel/d/a/d_a_scene_exit/d_a_scene_exit.cpp @@ -37,10 +37,10 @@ struct dSv_event_c { /* 800349BC */ void isEventBit(u16) const; }; -struct Vec {}; - struct JAISoundID {}; +struct Vec {}; + struct Z2SeMgr { /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); }; @@ -98,11 +98,11 @@ asm void daScex_c::checkWork() { /* ############################################################################################## */ /* 80485C98-80485C9C 000000 0004+00 2/2 0/0 0/0 .rodata @3758 */ SECTION_RODATA static f32 const lit_3758 = 75.0f; -COMPILER_STRIP_GATE(80485C98, &lit_3758); +COMPILER_STRIP_GATE(0x80485C98, &lit_3758); /* 80485C9C-80485CA0 000004 0004+00 1/1 0/0 0/0 .rodata @3759 */ SECTION_RODATA static f32 const lit_3759 = 150.0f; -COMPILER_STRIP_GATE(80485C9C, &lit_3759); +COMPILER_STRIP_GATE(0x80485C9C, &lit_3759); /* 80485974-80485A30 0001B4 00BC+00 1/0 0/0 0/0 .text daScex_Create__FP10fopAc_ac_c */ #pragma push @@ -134,21 +134,21 @@ SECTION_RODATA static u8 const lit_3840[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80485CA0, &lit_3840); +COMPILER_STRIP_GATE(0x80485CA0, &lit_3840); #pragma pop /* 80485CA4-80485CA8 00000C 0004+00 0/1 0/0 0/0 .rodata @3841 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3841 = 1.0f; -COMPILER_STRIP_GATE(80485CA4, &lit_3841); +COMPILER_STRIP_GATE(0x80485CA4, &lit_3841); #pragma pop /* 80485CA8-80485CAC 000010 0004+00 0/1 0/0 0/0 .rodata @3842 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3842 = -1.0f; -COMPILER_STRIP_GATE(80485CA8, &lit_3842); +COMPILER_STRIP_GATE(0x80485CA8, &lit_3842); #pragma pop /* 80485A50-80485C90 000290 0240+00 1/1 0/0 0/0 .text execute__8daScex_cFv */ diff --git a/rel/d/a/d_a_scene_exit2/d_a_scene_exit2.cpp b/rel/d/a/d_a_scene_exit2/d_a_scene_exit2.cpp index 91e7723af6f..97708d43d24 100644 --- a/rel/d/a/d_a_scene_exit2/d_a_scene_exit2.cpp +++ b/rel/d/a/d_a_scene_exit2/d_a_scene_exit2.cpp @@ -56,10 +56,10 @@ struct dEvent_manager_c { /* 8004817C */ void cutEnd(int); }; -struct Vec {}; - struct JAISoundID {}; +struct Vec {}; + struct Z2SeMgr { /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); }; @@ -90,7 +90,7 @@ extern "C" static void daScExit_Draw__FP10daScExit_c(); extern "C" static void daScExit_Execute__FP10daScExit_c(); extern "C" static void daScExit_Delete__FP10daScExit_c(); extern "C" static void daScExit_Create__FP10daScExit_c(); -extern "C" void func_8059E7D0(u8*); +extern "C" void func_8059E7D0(void* _this, u8*); extern "C" extern char const* const d_a_scene_exit2__stringBase0; extern "C" extern void* g_profile_SCENE_EXIT2[12]; @@ -151,7 +151,14 @@ asm void daScExit_c::setBaseMtx() { /* ############################################################################################## */ /* 8059E7F4-8059E7F8 000000 0004+00 2/2 0/0 0/0 .rodata @3659 */ SECTION_RODATA static f32 const lit_3659 = 100.0f; -COMPILER_STRIP_GATE(8059E7F4, &lit_3659); +COMPILER_STRIP_GATE(0x8059E7F4, &lit_3659); + +/* 8059E808-8059E808 000014 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8059E808 = "SceneExit"; +SECTION_DEAD static char const* const stringBase_8059E812 = "SCENE_EXIT"; +#pragma pop /* 8059E838-8059E844 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { @@ -308,21 +315,30 @@ void daScExit_c::actionDead() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3797 = 1.0f; -COMPILER_STRIP_GATE(8059E7F8, &lit_3797); +COMPILER_STRIP_GATE(0x8059E7F8, &lit_3797); #pragma pop /* 8059E7FC-8059E800 000008 0004+00 0/1 0/0 0/0 .rodata @3798 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3798 = -1.0f; -COMPILER_STRIP_GATE(8059E7FC, &lit_3798); +COMPILER_STRIP_GATE(0x8059E7FC, &lit_3798); #pragma pop /* 8059E800-8059E804 00000C 0004+00 0/1 0/0 0/0 .rodata @3799 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3799 = 800.0f; -COMPILER_STRIP_GATE(8059E800, &lit_3799); +COMPILER_STRIP_GATE(0x8059E800, &lit_3799); +#pragma pop + +/* 8059E808-8059E808 000014 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8059E81D = "WAIT"; +SECTION_DEAD static char const* const stringBase_8059E822 = "START"; +SECTION_DEAD static char const* const stringBase_8059E828 = "SCENE_CHG"; +SECTION_DEAD static char const* const stringBase_8059E832 = "Timer"; #pragma pop /* 8059E8C0-8059E8CC -00001 000C+00 1/1 0/0 0/0 .data action_table$3745 */ @@ -411,7 +427,7 @@ static asm void daScExit_Create(daScExit_c* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_8059E7D0(u8* param_0) { +extern "C" asm void func_8059E7D0(void* _this, u8* param_0) { nofralloc #include "asm/rel/d/a/d_a_scene_exit2/d_a_scene_exit2/func_8059E7D0.s" } @@ -427,7 +443,7 @@ SECTION_RODATA static u8 const lit_3800[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(8059E804, &lit_3800); +COMPILER_STRIP_GATE(0x8059E804, &lit_3800); #pragma pop /* 8059E8CC-8059E8EC -00001 0020+00 1/0 0/0 0/0 .data l_daScExit_Method */ @@ -452,14 +468,4 @@ SECTION_DATA extern void* g_profile_SCENE_EXIT2[12] = { (void*)0x00040000, (void*)0x000E0000, }; -/* 8059E808-8059E838 000014 0030+00 4/1 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_8059E808 = "SceneExit"; -SECTION_DEAD static char const* const stringBase_8059E812 = "SCENE_EXIT"; -SECTION_DEAD static char const* const stringBase_8059E81D = "WAIT"; -SECTION_DEAD static char const* const stringBase_8059E822 = "START"; -SECTION_DEAD static char const* const stringBase_8059E828 = "SCENE_CHG"; -SECTION_DEAD static char const* const stringBase_8059E832 = "Timer"; -#pragma pop +/* 8059E808-8059E808 000014 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/d_a_set_bgobj/d_a_set_bgobj.cpp b/rel/d/a/d_a_set_bgobj/d_a_set_bgobj.cpp index 864f1dcb600..c8bd8b7068a 100644 --- a/rel/d/a/d_a_set_bgobj/d_a_set_bgobj.cpp +++ b/rel/d/a/d_a_set_bgobj/d_a_set_bgobj.cpp @@ -82,7 +82,7 @@ SECTION_RODATA static u8 const l_specName[9 + 3 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80485F00, &l_specName); +COMPILER_STRIP_GATE(0x80485F00, &l_specName); /* 80485F10-80485F1C 000000 000A+02 1/1 0/0 0/0 .data l_bg_profName$3618 */ SECTION_DATA static u8 l_bg_profName[10 + 2 /* padding */] = { @@ -111,6 +111,13 @@ asm void daSetBgObj_c::CreateInit() { } #pragma pop +/* ############################################################################################## */ +/* 80485F0C-80485F0C 00000C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80485F0C = "%s"; +#pragma pop + /* 80485DFC-80485E88 0000FC 008C+00 1/1 0/0 0/0 .text create__12daSetBgObj_cFv */ #pragma push #pragma optimization_level 0 @@ -176,9 +183,4 @@ SECTION_DATA extern void* g_profile_SET_BG_OBJ[12] = { (void*)0x00040100, (void*)0x000E0000, }; -/* 80485F0C-80485F0F 00000C 0003+00 1/1 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80485F0C = "%s"; -#pragma pop +/* 80485F0C-80485F0C 00000C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/d_a_shop_item/d_a_shop_item.cpp b/rel/d/a/d_a_shop_item/d_a_shop_item.cpp index 475f5c229ac..48b1eb456ac 100644 --- a/rel/d/a/d_a_shop_item/d_a_shop_item.cpp +++ b/rel/d/a/d_a_shop_item/d_a_shop_item.cpp @@ -194,6 +194,13 @@ extern "C" f32 mSystemFar__14mDoLib_clipper; // Declarations: // +/* ############################################################################################## */ +/* 8059F48C-8059F48C 000054 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8059F48C = "R_SP160"; +#pragma pop + /* 8059E9B8-8059EC04 000078 024C+00 2/2 0/0 0/0 .text getShopArcname__12daShopItem_cFv */ #pragma push #pragma optimization_level 0 @@ -207,7 +214,7 @@ asm void daShopItem_c::getShopArcname() { /* ############################################################################################## */ /* 8059F438-8059F43C 000000 0004+00 2/2 0/0 0/0 .rodata m_cullfar_max__12daShopItem_c */ SECTION_RODATA f32 const daShopItem_c::m_cullfar_max = 5000.0f; -COMPILER_STRIP_GATE(8059F438, &daShopItem_c::m_cullfar_max); +COMPILER_STRIP_GATE(0x8059F438, &daShopItem_c::m_cullfar_max); /* 8059F43C-8059F46C 000004 002E+02 1/1 0/0 0/0 .rodata HeapSizeTbl$3665 */ SECTION_RODATA static u8 const HeapSizeTbl[46 + 2 /* padding */] = { @@ -261,7 +268,7 @@ SECTION_RODATA static u8 const HeapSizeTbl[46 + 2 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(8059F43C, &HeapSizeTbl); +COMPILER_STRIP_GATE(0x8059F43C, &HeapSizeTbl); /* 8059EC04-8059EC1C 0002C4 0018+00 1/1 0/0 0/0 .text getHeapSize__12daShopItem_cFv */ #pragma push @@ -278,7 +285,7 @@ asm void daShopItem_c::getHeapSize() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3718 = -100.0f; -COMPILER_STRIP_GATE(8059F46C, &lit_3718); +COMPILER_STRIP_GATE(0x8059F46C, &lit_3718); #pragma pop /* 8059F470-8059F474 000038 0004+00 0/2 0/0 0/0 .rodata @3719 */ @@ -290,39 +297,45 @@ SECTION_RODATA static u8 const lit_3719[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(8059F470, &lit_3719); +COMPILER_STRIP_GATE(0x8059F470, &lit_3719); #pragma pop /* 8059F474-8059F478 00003C 0004+00 0/1 0/0 0/0 .rodata @3720 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3720 = 100.0f; -COMPILER_STRIP_GATE(8059F474, &lit_3720); +COMPILER_STRIP_GATE(0x8059F474, &lit_3720); #pragma pop /* 8059F478-8059F47C 000040 0004+00 0/1 0/0 0/0 .rodata @3721 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3721 = 200.0f; -COMPILER_STRIP_GATE(8059F478, &lit_3721); +COMPILER_STRIP_GATE(0x8059F478, &lit_3721); #pragma pop /* 8059F47C-8059F480 000044 0004+00 1/3 0/0 0/0 .rodata @3722 */ SECTION_RODATA static f32 const lit_3722 = 1.0f; -COMPILER_STRIP_GATE(8059F47C, &lit_3722); +COMPILER_STRIP_GATE(0x8059F47C, &lit_3722); /* 8059F480-8059F484 000048 0004+00 0/1 0/0 0/0 .rodata @3723 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3723 = 5000.0f; -COMPILER_STRIP_GATE(8059F480, &lit_3723); +COMPILER_STRIP_GATE(0x8059F480, &lit_3723); #pragma pop /* 8059F484-8059F488 00004C 0004+00 0/1 0/0 0/0 .rodata @3724 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3724 = 4.0f / 5.0f; -COMPILER_STRIP_GATE(8059F484, &lit_3724); +COMPILER_STRIP_GATE(0x8059F484, &lit_3724); +#pragma pop + +/* 8059F48C-8059F48C 000054 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8059F494 = "R_SP109"; #pragma pop /* 8059EC1C-8059ED58 0002DC 013C+00 1/1 0/0 0/0 .text CreateInit__12daShopItem_cFv */ @@ -375,7 +388,7 @@ void daShopItem_c::setListStart() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3823 = 80.0f; -COMPILER_STRIP_GATE(8059F488, &lit_3823); +COMPILER_STRIP_GATE(0x8059F488, &lit_3823); #pragma pop /* 8059EFA0-8059F024 000660 0084+00 1/0 0/0 0/0 .text setShadow__12daShopItem_cFv */ @@ -614,10 +627,4 @@ static asm void func_8059F428() { } #pragma pop -/* 8059F48C-8059F49C 000054 0010+00 2/2 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_8059F48C = "R_SP160"; -SECTION_DEAD static char const* const stringBase_8059F494 = "R_SP109"; -#pragma pop +/* 8059F48C-8059F48C 000054 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/d_a_spinner/d_a_spinner.cpp b/rel/d/a/d_a_spinner/d_a_spinner.cpp index 1e0a8a58197..3c73ddc8a8d 100644 --- a/rel/d/a/d_a_spinner/d_a_spinner.cpp +++ b/rel/d/a/d_a_spinner/d_a_spinner.cpp @@ -132,13 +132,6 @@ struct dPa_control_c { _GXColor const*, cXyz const*, f32); }; -struct dBgS_AcchCir { - /* 80075EAC */ dBgS_AcchCir(); - /* 80075F40 */ void SetWallR(f32); - /* 80075F58 */ void SetWall(f32, f32); - /* 804D1EF8 */ ~dBgS_AcchCir(); -}; - struct dBgS { /* 80074BE8 */ void GetPolyColor(cBgS_PolyInfo const&); /* 80074CBC */ void GetSpecialCode(cBgS_PolyInfo const&); @@ -147,6 +140,13 @@ struct dBgS { /* 80075100 */ void GetRoomId(cBgS_PolyInfo const&); }; +struct dBgS_AcchCir { + /* 80075EAC */ dBgS_AcchCir(); + /* 80075F40 */ void SetWallR(f32); + /* 80075F58 */ void SetWall(f32, f32); + /* 804D1EF8 */ ~dBgS_AcchCir(); +}; + struct dBgS_Acch { /* 80075F94 */ ~dBgS_Acch(); /* 800760A0 */ dBgS_Acch(); @@ -481,11 +481,11 @@ extern "C" void __register_global_object(); SECTION_RODATA static u8 const lit_3768[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(804D4D90, &lit_3768); +COMPILER_STRIP_GATE(0x804D4D90, &lit_3768); /* 804D4D9C-804D4DA0 00000C 0004+00 1/8 0/0 0/0 .rodata @4168 */ SECTION_RODATA static f32 const lit_4168 = 1.0f; -COMPILER_STRIP_GATE(804D4D9C, &lit_4168); +COMPILER_STRIP_GATE(0x804D4D9C, &lit_4168); /* 804D198C-804D1A50 0000EC 00C4+00 1/1 0/0 0/0 .text createHeap__11daSpinner_cFv */ #pragma push @@ -512,42 +512,42 @@ static asm void daSpinner_createHeap(fopAc_ac_c* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4241 = 10000.0f; -COMPILER_STRIP_GATE(804D4DA0, &lit_4241); +COMPILER_STRIP_GATE(0x804D4DA0, &lit_4241); #pragma pop /* 804D4DA4-804D4DA8 000014 0004+00 0/1 0/0 0/0 .rodata @4242 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4242 = 0x42480A3D; -COMPILER_STRIP_GATE(804D4DA4, &lit_4242); +COMPILER_STRIP_GATE(0x804D4DA4, &lit_4242); #pragma pop /* 804D4DA8-804D4DAC 000018 0004+00 0/4 0/0 0/0 .rodata @4243 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4243 = 58.0f; -COMPILER_STRIP_GATE(804D4DA8, &lit_4243); +COMPILER_STRIP_GATE(0x804D4DA8, &lit_4243); #pragma pop /* 804D4DAC-804D4DB0 00001C 0004+00 0/1 0/0 0/0 .rodata @4244 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4244 = 0x4301FD71; -COMPILER_STRIP_GATE(804D4DAC, &lit_4244); +COMPILER_STRIP_GATE(0x804D4DAC, &lit_4244); #pragma pop /* 804D4DB0-804D4DB4 000020 0004+00 0/1 0/0 0/0 .rodata @4245 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4245 = 35.0f; -COMPILER_STRIP_GATE(804D4DB0, &lit_4245); +COMPILER_STRIP_GATE(0x804D4DB0, &lit_4245); #pragma pop /* 804D4DB4-804D4DB8 000024 0004+00 0/1 0/0 0/0 .rodata @4246 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4246 = 85.0f; -COMPILER_STRIP_GATE(804D4DB4, &lit_4246); +COMPILER_STRIP_GATE(0x804D4DB4, &lit_4246); #pragma pop /* 804D4DB8-804D4DC0 000028 0004+04 0/9 0/0 0/0 .rodata @4247 */ @@ -564,7 +564,7 @@ SECTION_RODATA static u8 const lit_4247[4 + 4 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(804D4DB8, &lit_4247); +COMPILER_STRIP_GATE(0x804D4DB8, &lit_4247); #pragma pop /* 804D4DC0-804D4DC8 000030 0008+00 0/2 0/0 0/0 .rodata @4249 */ @@ -573,7 +573,7 @@ COMPILER_STRIP_GATE(804D4DB8, &lit_4247); SECTION_RODATA static u8 const lit_4249[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(804D4DC0, &lit_4249); +COMPILER_STRIP_GATE(0x804D4DC0, &lit_4249); #pragma pop /* 804D4EA8-804D4EEC 000000 0044+00 1/1 0/0 0/0 .data l_cylSrc */ @@ -790,7 +790,7 @@ static asm void daSpinner_Delete(daSpinner_c* param_0) { /* ############################################################################################## */ /* 804D4DC8-804D4DCC 000038 0004+00 1/1 0/0 0/0 .rodata @4409 */ SECTION_RODATA static f32 const lit_4409 = -1000000000.0f; -COMPILER_STRIP_GATE(804D4DC8, &lit_4409); +COMPILER_STRIP_GATE(0x804D4DC8, &lit_4409); /* 804D21E0-804D2278 000940 0098+00 2/2 0/0 0/0 .text setRoomInfo__11daSpinner_cFv */ #pragma push @@ -805,7 +805,7 @@ asm void daSpinner_c::setRoomInfo() { /* ############################################################################################## */ /* 804D4DCC-804D4DD0 00003C 0004+00 1/1 0/0 0/0 .rodata @4429 */ SECTION_RODATA static f32 const lit_4429 = 90.0f; -COMPILER_STRIP_GATE(804D4DCC, &lit_4429); +COMPILER_STRIP_GATE(0x804D4DCC, &lit_4429); /* 804D2278-804D2320 0009D8 00A8+00 2/2 0/0 0/0 .text setMatrix__11daSpinner_cFv */ #pragma push @@ -822,21 +822,21 @@ asm void daSpinner_c::setMatrix() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4591 = 1.5f; -COMPILER_STRIP_GATE(804D4DD0, &lit_4591); +COMPILER_STRIP_GATE(0x804D4DD0, &lit_4591); #pragma pop /* 804D4DD4-804D4DD8 000044 0004+00 0/2 0/0 0/0 .rodata @4592 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4592 = 3.0f; -COMPILER_STRIP_GATE(804D4DD4, &lit_4592); +COMPILER_STRIP_GATE(0x804D4DD4, &lit_4592); #pragma pop /* 804D4DD8-804D4DDC 000048 0004+00 0/1 0/0 0/0 .rodata @4593 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4593 = 2.0f; -COMPILER_STRIP_GATE(804D4DD8, &lit_4593); +COMPILER_STRIP_GATE(0x804D4DD8, &lit_4593); #pragma pop /* 804D4FC8-804D4FCC 000008 0001+03 1/1 0/0 0/0 .bss @1109 */ @@ -965,7 +965,7 @@ asm void daSpinner_c::setEffect() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4930 = -20.0f; -COMPILER_STRIP_GATE(804D4DDC, &lit_4930); +COMPILER_STRIP_GATE(0x804D4DDC, &lit_4930); #pragma pop /* 804D4DE0-804D4DE8 000050 0004+04 0/1 0/0 0/0 .rodata @4931 */ @@ -976,7 +976,7 @@ SECTION_RODATA static u32 const lit_4931[1 + 1 /* padding */] = { /* padding */ 0x00000000, }; -COMPILER_STRIP_GATE(804D4DE0, &lit_4931); +COMPILER_STRIP_GATE(0x804D4DE0, &lit_4931); #pragma pop /* 804D4DE8-804D4DF0 000058 0008+00 0/3 0/0 0/0 .rodata @4932 */ @@ -985,7 +985,7 @@ COMPILER_STRIP_GATE(804D4DE0, &lit_4931); SECTION_RODATA static u8 const lit_4932[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(804D4DE8, &lit_4932); +COMPILER_STRIP_GATE(0x804D4DE8, &lit_4932); #pragma pop /* 804D4DF0-804D4DF8 000060 0008+00 0/3 0/0 0/0 .rodata @4933 */ @@ -994,7 +994,7 @@ COMPILER_STRIP_GATE(804D4DE8, &lit_4932); SECTION_RODATA static u8 const lit_4933[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(804D4DF0, &lit_4933); +COMPILER_STRIP_GATE(0x804D4DF0, &lit_4933); #pragma pop /* 804D4DF8-804D4E00 000068 0008+00 0/3 0/0 0/0 .rodata @4934 */ @@ -1003,35 +1003,35 @@ COMPILER_STRIP_GATE(804D4DF0, &lit_4933); SECTION_RODATA static u8 const lit_4934[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(804D4DF8, &lit_4934); +COMPILER_STRIP_GATE(0x804D4DF8, &lit_4934); #pragma pop /* 804D4E00-804D4E04 000070 0004+00 0/1 0/0 0/0 .rodata @4935 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4935 = 0x3BB6365E; -COMPILER_STRIP_GATE(804D4E00, &lit_4935); +COMPILER_STRIP_GATE(0x804D4E00, &lit_4935); #pragma pop /* 804D4E04-804D4E08 000074 0004+00 0/1 0/0 0/0 .rodata @4936 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4936 = 0x4333D588; -COMPILER_STRIP_GATE(804D4E04, &lit_4936); +COMPILER_STRIP_GATE(0x804D4E04, &lit_4936); #pragma pop /* 804D4E08-804D4E0C 000078 0004+00 0/1 0/0 0/0 .rodata @4937 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4937 = 29.0f; -COMPILER_STRIP_GATE(804D4E08, &lit_4937); +COMPILER_STRIP_GATE(0x804D4E08, &lit_4937); #pragma pop /* 804D4E0C-804D4E10 00007C 0004+00 0/1 0/0 0/0 .rodata @4938 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4938 = 50.0f; -COMPILER_STRIP_GATE(804D4E0C, &lit_4938); +COMPILER_STRIP_GATE(0x804D4E0C, &lit_4938); #pragma pop /* 804D25F4-804D3048 000D54 0A54+00 1/1 0/0 0/0 .text posMove__11daSpinner_cFv */ @@ -1069,7 +1069,7 @@ asm void daSpinner_c::setReflectAngle() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5053 = -1.0f; -COMPILER_STRIP_GATE(804D4E10, &lit_5053); +COMPILER_STRIP_GATE(0x804D4E10, &lit_5053); #pragma pop /* 804D3174-804D3468 0018D4 02F4+00 1/1 0/0 0/0 .text setWallHit__11daSpinner_cFsUl */ @@ -1097,7 +1097,7 @@ asm cM3dGPla::~cM3dGPla() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5091 = 20.0f; -COMPILER_STRIP_GATE(804D4E14, &lit_5091); +COMPILER_STRIP_GATE(0x804D4E14, &lit_5091); #pragma pop /* 804D34B0-804D3618 001C10 0168+00 1/1 0/0 0/0 .text setAnm__11daSpinner_cFv */ @@ -1130,6 +1130,13 @@ asm void daSpinner_c::getPathNextPos() { } #pragma pop +/* ############################################################################################## */ +/* 804D4EA0-804D4EA0 000110 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_804D4EA0 = "D_MN10A"; +#pragma pop + /* 804D36F4-804D3774 001E54 0080+00 1/1 0/0 0/0 .text checkLineWallHit__11daSpinner_cFP4cXyzP4cXyz */ #pragma push @@ -1148,7 +1155,7 @@ asm void daSpinner_c::checkLineWallHit(cXyz* param_0, cXyz* param_1) { SECTION_RODATA static u8 const sideCheckVec0[12] = { 0x41, 0xF0, 0x00, 0x00, 0x41, 0x20, 0x00, 0x00, 0x40, 0xA0, 0x00, 0x00, }; -COMPILER_STRIP_GATE(804D4E18, &sideCheckVec0); +COMPILER_STRIP_GATE(0x804D4E18, &sideCheckVec0); #pragma pop /* 804D4E24-804D4E30 000094 000C+00 0/1 0/0 0/0 .rodata sideCheckVec1$5144 */ @@ -1157,7 +1164,7 @@ COMPILER_STRIP_GATE(804D4E18, &sideCheckVec0); SECTION_RODATA static u8 const sideCheckVec1[12] = { 0xC1, 0xF0, 0x00, 0x00, 0x41, 0x20, 0x00, 0x00, 0x40, 0xA0, 0x00, 0x00, }; -COMPILER_STRIP_GATE(804D4E24, &sideCheckVec1); +COMPILER_STRIP_GATE(0x804D4E24, &sideCheckVec1); #pragma pop /* 804D4E30-804D4E3C 0000A0 000C+00 0/1 0/0 0/0 .rodata initSide0$5145 */ @@ -1166,7 +1173,7 @@ COMPILER_STRIP_GATE(804D4E24, &sideCheckVec1); SECTION_RODATA static u8 const initSide0[12] = { 0x42, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(804D4E30, &initSide0); +COMPILER_STRIP_GATE(0x804D4E30, &initSide0); #pragma pop /* 804D4E3C-804D4E48 0000AC 000C+00 0/1 0/0 0/0 .rodata initSide1$5146 */ @@ -1175,7 +1182,7 @@ COMPILER_STRIP_GATE(804D4E30, &initSide0); SECTION_RODATA static u8 const initSide1[12] = { 0xC2, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(804D4E3C, &initSide1); +COMPILER_STRIP_GATE(0x804D4E3C, &initSide1); #pragma pop /* 804D4E48-804D4E54 0000B8 000C+00 0/1 0/0 0/0 .rodata initSideOld0$5147 */ @@ -1184,7 +1191,7 @@ COMPILER_STRIP_GATE(804D4E3C, &initSide1); SECTION_RODATA static u8 const initSideOld0[12] = { 0x42, 0x9C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(804D4E48, &initSideOld0); +COMPILER_STRIP_GATE(0x804D4E48, &initSideOld0); #pragma pop /* 804D4E54-804D4E60 0000C4 000C+00 0/1 0/0 0/0 .rodata initSideOld1$5148 */ @@ -1193,7 +1200,7 @@ COMPILER_STRIP_GATE(804D4E48, &initSideOld0); SECTION_RODATA static u8 const initSideOld1[12] = { 0xC2, 0x9C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(804D4E54, &initSideOld1); +COMPILER_STRIP_GATE(0x804D4E54, &initSideOld1); #pragma pop /* 804D4E60-804D4E68 0000D0 0008+00 0/1 0/0 0/0 .rodata @5295 */ @@ -1202,7 +1209,7 @@ COMPILER_STRIP_GATE(804D4E54, &initSideOld1); SECTION_RODATA static u8 const lit_5295[8] = { 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(804D4E60, &lit_5295); +COMPILER_STRIP_GATE(0x804D4E60, &lit_5295); #pragma pop /* 804D3774-804D3D60 001ED4 05EC+00 1/1 0/0 0/0 .text checkPathMove__11daSpinner_cFv */ @@ -1225,14 +1232,14 @@ SECTION_RODATA static u8 const effName[4] = { 0x08, 0xC6, }; -COMPILER_STRIP_GATE(804D4E68, &effName); +COMPILER_STRIP_GATE(0x804D4E68, &effName); #pragma pop /* 804D4E6C-804D4E70 0000DC 0004+00 0/1 0/0 0/0 .rodata @5361 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5361 = 10.0f; -COMPILER_STRIP_GATE(804D4E6C, &lit_5361); +COMPILER_STRIP_GATE(0x804D4E6C, &lit_5361); #pragma pop /* 804D3D60-804D3F14 0024C0 01B4+00 1/1 0/0 0/0 .text setSpreadEffect__11daSpinner_cFv */ @@ -1261,70 +1268,70 @@ asm void daSpinner_c::clearSpreadEffect() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5671 = 1.0f / 100.0f; -COMPILER_STRIP_GATE(804D4E70, &lit_5671); +COMPILER_STRIP_GATE(0x804D4E70, &lit_5671); #pragma pop /* 804D4E74-804D4E78 0000E4 0004+00 0/1 0/0 0/0 .rodata @5672 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5672 = 2330.0f; -COMPILER_STRIP_GATE(804D4E74, &lit_5672); +COMPILER_STRIP_GATE(0x804D4E74, &lit_5672); #pragma pop /* 804D4E78-804D4E7C 0000E8 0004+00 0/1 0/0 0/0 .rodata @5673 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5673 = 17.0f / 20.0f; -COMPILER_STRIP_GATE(804D4E78, &lit_5673); +COMPILER_STRIP_GATE(0x804D4E78, &lit_5673); #pragma pop /* 804D4E7C-804D4E80 0000EC 0004+00 0/1 0/0 0/0 .rodata @5674 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5674 = 3.0f / 10.0f; -COMPILER_STRIP_GATE(804D4E7C, &lit_5674); +COMPILER_STRIP_GATE(0x804D4E7C, &lit_5674); #pragma pop /* 804D4E80-804D4E84 0000F0 0004+00 0/1 0/0 0/0 .rodata @5675 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5675 = 5.0f; -COMPILER_STRIP_GATE(804D4E80, &lit_5675); +COMPILER_STRIP_GATE(0x804D4E80, &lit_5675); #pragma pop /* 804D4E84-804D4E88 0000F4 0004+00 0/1 0/0 0/0 .rodata @5676 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5676 = 0.5f; -COMPILER_STRIP_GATE(804D4E84, &lit_5676); +COMPILER_STRIP_GATE(0x804D4E84, &lit_5676); #pragma pop /* 804D4E88-804D4E8C 0000F8 0004+00 0/1 0/0 0/0 .rodata @5677 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5677 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(804D4E88, &lit_5677); +COMPILER_STRIP_GATE(0x804D4E88, &lit_5677); #pragma pop /* 804D4E8C-804D4E90 0000FC 0004+00 0/1 0/0 0/0 .rodata @5678 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5678 = 2000.0f; -COMPILER_STRIP_GATE(804D4E8C, &lit_5678); +COMPILER_STRIP_GATE(0x804D4E8C, &lit_5678); #pragma pop /* 804D4E90-804D4E94 000100 0004+00 0/1 0/0 0/0 .rodata @5679 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5679 = 9.0f; -COMPILER_STRIP_GATE(804D4E90, &lit_5679); +COMPILER_STRIP_GATE(0x804D4E90, &lit_5679); #pragma pop /* 804D4E94-804D4E98 000104 0004+00 0/1 0/0 0/0 .rodata @5680 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5680 = 100.0f; -COMPILER_STRIP_GATE(804D4E94, &lit_5680); +COMPILER_STRIP_GATE(0x804D4E94, &lit_5680); #pragma pop /* 804D3F8C-804D4B94 0026EC 0C08+00 1/1 0/0 0/0 .text execute__11daSpinner_cFv */ @@ -1353,14 +1360,14 @@ static asm void daSpinner_Execute(daSpinner_c* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5723 = 70.0f; -COMPILER_STRIP_GATE(804D4E98, &lit_5723); +COMPILER_STRIP_GATE(0x804D4E98, &lit_5723); #pragma pop /* 804D4E9C-804D4EA0 00010C 0004+00 0/1 0/0 0/0 .rodata @5724 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5724 = 300.0f; -COMPILER_STRIP_GATE(804D4E9C, &lit_5724); +COMPILER_STRIP_GATE(0x804D4E9C, &lit_5724); #pragma pop /* 804D4BB4-804D4D08 003314 0154+00 1/1 0/0 0/0 .text draw__11daSpinner_cFv */ @@ -1592,9 +1599,4 @@ static u8 data_804D5090[4]; static u8 data_804D5094[4]; #pragma pop -/* 804D4EA0-804D4EA8 000110 0008+00 2/2 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_804D4EA0 = "D_MN10A"; -#pragma pop +/* 804D4EA0-804D4EA0 000110 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/d_a_sq/d_a_sq.cpp b/rel/d/a/d_a_sq/d_a_sq.cpp index 3c620ae1e3b..4593bfefe27 100644 --- a/rel/d/a/d_a_sq/d_a_sq.cpp +++ b/rel/d/a/d_a_sq/d_a_sq.cpp @@ -36,10 +36,10 @@ struct mDoExt_McaMorfCallBack1_c {}; struct Vec {}; -struct J3DModelData {}; - struct J3DAnmTransform {}; +struct J3DModelData {}; + struct mDoExt_McaMorf { /* 8000FC4C */ mDoExt_McaMorf(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, int, @@ -127,10 +127,10 @@ struct dBgS_AcchCir { /* 80075F58 */ void SetWall(f32, f32); }; -struct dBgS {}; - struct csXyz {}; +struct dBgS {}; + struct dBgS_Acch { /* 80075F94 */ ~dBgS_Acch(); /* 800760A0 */ dBgS_Acch(); @@ -296,52 +296,52 @@ extern "C" void __register_global_object(); /* ############################################################################################## */ /* 805A1158-805A115C 000000 0004+00 12/12 0/0 0/0 .rodata @3769 */ SECTION_RODATA static f32 const lit_3769 = 2.0f; -COMPILER_STRIP_GATE(805A1158, &lit_3769); +COMPILER_STRIP_GATE(0x805A1158, &lit_3769); /* 805A115C-805A1160 000004 0004+00 0/4 0/0 0/0 .rodata @3770 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3770 = 20.0f; -COMPILER_STRIP_GATE(805A115C, &lit_3770); +COMPILER_STRIP_GATE(0x805A115C, &lit_3770); #pragma pop /* 805A1160-805A1164 000008 0004+00 1/11 0/0 0/0 .rodata @3771 */ SECTION_RODATA static f32 const lit_3771 = 1.0f; -COMPILER_STRIP_GATE(805A1160, &lit_3771); +COMPILER_STRIP_GATE(0x805A1160, &lit_3771); /* 805A1164-805A1168 00000C 0004+00 0/3 0/0 0/0 .rodata @3772 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3772 = 100.0f; -COMPILER_STRIP_GATE(805A1164, &lit_3772); +COMPILER_STRIP_GATE(0x805A1164, &lit_3772); #pragma pop /* 805A1168-805A116C 000010 0004+00 0/1 0/0 0/0 .rodata @3773 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3773 = 25.0f; -COMPILER_STRIP_GATE(805A1168, &lit_3773); +COMPILER_STRIP_GATE(0x805A1168, &lit_3773); #pragma pop /* 805A116C-805A1170 000014 0004+00 0/5 0/0 0/0 .rodata @3774 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3774 = 30.0f; -COMPILER_STRIP_GATE(805A116C, &lit_3774); +COMPILER_STRIP_GATE(0x805A116C, &lit_3774); #pragma pop /* 805A1170-805A1174 000018 0004+00 0/1 0/0 0/0 .rodata @3775 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3775 = 1000.0f; -COMPILER_STRIP_GATE(805A1170, &lit_3775); +COMPILER_STRIP_GATE(0x805A1170, &lit_3775); #pragma pop /* 805A1174-805A1178 00001C 0004+00 0/1 0/0 0/0 .rodata @3776 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3776 = 17.0f; -COMPILER_STRIP_GATE(805A1174, &lit_3776); +COMPILER_STRIP_GATE(0x805A1174, &lit_3776); #pragma pop /* 805A11E8-805A11F8 000000 0010+00 2/2 0/0 0/0 .data wait_bck */ @@ -450,14 +450,20 @@ SECTION_RODATA static u8 const lit_3798[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(805A1178, &lit_3798); +COMPILER_STRIP_GATE(0x805A1178, &lit_3798); #pragma pop /* 805A117C-805A1180 000024 0004+00 0/1 0/0 0/0 .rodata @3799 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3799 = -1.0f; -COMPILER_STRIP_GATE(805A117C, &lit_3799); +COMPILER_STRIP_GATE(0x805A117C, &lit_3799); +#pragma pop + +/* 805A11E4-805A11E4 00008C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_805A11E4 = "Sq"; #pragma pop /* 8059F6D8-8059F808 000158 0130+00 5/5 0/0 0/0 .text anm_init__FP8sq_classifUcfi */ @@ -476,14 +482,14 @@ static asm void anm_init(sq_class* param_0, int param_1, f32 param_2, u8 param_3 #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3826 = 400.0f; -COMPILER_STRIP_GATE(805A1180, &lit_3826); +COMPILER_STRIP_GATE(0x805A1180, &lit_3826); #pragma pop /* 805A1184-805A1188 00002C 0004+00 0/4 0/0 0/0 .rodata @3827 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3827 = 10.0f; -COMPILER_STRIP_GATE(805A1184, &lit_3827); +COMPILER_STRIP_GATE(0x805A1184, &lit_3827); #pragma pop /* 805A1330-805A1334 000008 0004+00 2/2 0/0 0/0 .bss None */ @@ -528,11 +534,11 @@ SECTION_RODATA static u8 const lit_3884[6 + 2 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(805A1188, &lit_3884); +COMPILER_STRIP_GATE(0x805A1188, &lit_3884); /* 805A1190-805A1194 000038 0004+00 1/1 0/0 0/0 .rodata @3886 */ SECTION_RODATA static u32 const lit_3886 = 0x403F5C29; -COMPILER_STRIP_GATE(805A1190, &lit_3886); +COMPILER_STRIP_GATE(0x805A1190, &lit_3886); /* 8059F9FC-8059FA68 00047C 006C+00 2/2 0/0 0/0 .text turn_set__FP8sq_class */ #pragma push @@ -549,63 +555,63 @@ static asm void turn_set(sq_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3953 = 60.0f; -COMPILER_STRIP_GATE(805A1194, &lit_3953); +COMPILER_STRIP_GATE(0x805A1194, &lit_3953); #pragma pop /* 805A1198-805A119C 000040 0004+00 0/1 0/0 0/0 .rodata @3954 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3954 = 120.0f; -COMPILER_STRIP_GATE(805A1198, &lit_3954); +COMPILER_STRIP_GATE(0x805A1198, &lit_3954); #pragma pop /* 805A119C-805A11A0 000044 0004+00 0/2 0/0 0/0 .rodata @3955 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3955 = 15.0f; -COMPILER_STRIP_GATE(805A119C, &lit_3955); +COMPILER_STRIP_GATE(0x805A119C, &lit_3955); #pragma pop /* 805A11A0-805A11A4 000048 0004+00 0/2 0/0 0/0 .rodata @3956 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3956 = 8.0f; -COMPILER_STRIP_GATE(805A11A0, &lit_3956); +COMPILER_STRIP_GATE(0x805A11A0, &lit_3956); #pragma pop /* 805A11A4-805A11A8 00004C 0004+00 0/4 0/0 0/0 .rodata @3957 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3957 = 4.0f; -COMPILER_STRIP_GATE(805A11A4, &lit_3957); +COMPILER_STRIP_GATE(0x805A11A4, &lit_3957); #pragma pop /* 805A11A8-805A11AC 000050 0004+00 0/4 0/0 0/0 .rodata @3958 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3958 = 6.0f; -COMPILER_STRIP_GATE(805A11A8, &lit_3958); +COMPILER_STRIP_GATE(0x805A11A8, &lit_3958); #pragma pop /* 805A11AC-805A11B0 000054 0004+00 0/1 0/0 0/0 .rodata @3959 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3959 = 16000.0f; -COMPILER_STRIP_GATE(805A11AC, &lit_3959); +COMPILER_STRIP_GATE(0x805A11AC, &lit_3959); #pragma pop /* 805A11B0-805A11B4 000058 0004+00 0/2 0/0 0/0 .rodata @3960 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3960 = 40.0f; -COMPILER_STRIP_GATE(805A11B0, &lit_3960); +COMPILER_STRIP_GATE(0x805A11B0, &lit_3960); #pragma pop /* 805A11B4-805A11B8 00005C 0004+00 0/2 0/0 0/0 .rodata @3961 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3961 = 5.0f; -COMPILER_STRIP_GATE(805A11B4, &lit_3961); +COMPILER_STRIP_GATE(0x805A11B4, &lit_3961); #pragma pop /* 805A11B8-805A11C0 000060 0008+00 0/3 0/0 0/0 .rodata @3965 */ @@ -614,7 +620,7 @@ COMPILER_STRIP_GATE(805A11B4, &lit_3961); SECTION_RODATA static u8 const lit_3965[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(805A11B8, &lit_3965); +COMPILER_STRIP_GATE(0x805A11B8, &lit_3965); #pragma pop /* 8059FA68-8059FE50 0004E8 03E8+00 1/1 0/0 0/0 .text sq_normal__FP8sq_class */ @@ -632,21 +638,21 @@ static asm void sq_normal(sq_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3998 = 1.5f; -COMPILER_STRIP_GATE(805A11C0, &lit_3998); +COMPILER_STRIP_GATE(0x805A11C0, &lit_3998); #pragma pop /* 805A11C4-805A11C8 00006C 0004+00 0/1 0/0 0/0 .rodata @3999 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3999 = 50.0f; -COMPILER_STRIP_GATE(805A11C4, &lit_3999); +COMPILER_STRIP_GATE(0x805A11C4, &lit_3999); #pragma pop /* 805A11C8-805A11CC 000070 0004+00 0/1 0/0 0/0 .rodata @4000 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4000 = 8000.0f; -COMPILER_STRIP_GATE(805A11C8, &lit_4000); +COMPILER_STRIP_GATE(0x805A11C8, &lit_4000); #pragma pop /* 8059FE50-805A0024 0008D0 01D4+00 1/1 0/0 0/0 .text sq_away__FP8sq_class */ @@ -664,7 +670,7 @@ static asm void sq_away(sq_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4026 = 0x403FEF9E; -COMPILER_STRIP_GATE(805A11CC, &lit_4026); +COMPILER_STRIP_GATE(0x805A11CC, &lit_4026); #pragma pop /* 805A0024-805A0160 000AA4 013C+00 1/1 0/0 0/0 .text sq_carry__FP8sq_class */ @@ -702,21 +708,21 @@ static asm void sq_message(sq_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4119 = -7.0f; -COMPILER_STRIP_GATE(805A11D0, &lit_4119); +COMPILER_STRIP_GATE(0x805A11D0, &lit_4119); #pragma pop /* 805A11D4-805A11D8 00007C 0004+00 0/1 0/0 0/0 .rodata @4120 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4120 = 300.0f; -COMPILER_STRIP_GATE(805A11D4, &lit_4120); +COMPILER_STRIP_GATE(0x805A11D4, &lit_4120); #pragma pop /* 805A11D8-805A11DC 000080 0004+00 0/1 0/0 0/0 .rodata @4121 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4121 = -120.0f; -COMPILER_STRIP_GATE(805A11D8, &lit_4121); +COMPILER_STRIP_GATE(0x805A11D8, &lit_4121); #pragma pop /* 805A037C-805A06A4 000DFC 0328+00 1/1 0/0 0/0 .text action__FP8sq_class */ @@ -744,7 +750,7 @@ static asm void message(sq_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4198 = 0.25f; -COMPILER_STRIP_GATE(805A11DC, &lit_4198); +COMPILER_STRIP_GATE(0x805A11DC, &lit_4198); #pragma pop /* 805A07C8-805A09EC 001248 0224+00 2/1 0/0 0/0 .text daSq_Execute__FP8sq_class */ @@ -797,7 +803,7 @@ asm J3DFrameCtrl::~J3DFrameCtrl() { #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4385 = 0x407FEF9E; -COMPILER_STRIP_GATE(805A11E0, &lit_4385); +COMPILER_STRIP_GATE(0x805A11E0, &lit_4385); #pragma pop /* 805A0C30-805A0FB0 0016B0 0380+00 1/0 0/0 0/0 .text daSq_Create__FP10fopAc_ac_c */ @@ -862,7 +868,7 @@ asm void __sinit_d_a_sq_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_805A10F8 = (void*)__sinit_d_a_sq_cpp; +REGISTER_CTORS(0x805A10F8, __sinit_d_a_sq_cpp); #pragma pop /* 805A1134-805A113C 001BB4 0008+00 1/0 0/0 0/0 .text @36@__dt__12dBgS_ObjAcchFv */ @@ -885,9 +891,4 @@ static asm void func_805A113C() { } #pragma pop -/* 805A11E4-805A11E7 00008C 0003+00 4/4 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_805A11E4 = "Sq"; -#pragma pop +/* 805A11E4-805A11E4 00008C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/d_a_startAndGoal/d_a_startAndGoal.cpp b/rel/d/a/d_a_startAndGoal/d_a_startAndGoal.cpp index bd71d5d251b..a8c3e57d3f0 100644 --- a/rel/d/a/d_a_startAndGoal/d_a_startAndGoal.cpp +++ b/rel/d/a/d_a_startAndGoal/d_a_startAndGoal.cpp @@ -222,34 +222,34 @@ SECTION_RODATA static u8 const l_DATA[1 + 3 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D4DEB8, &l_DATA); +COMPILER_STRIP_GATE(0x80D4DEB8, &l_DATA); /* 80D4DEBC-80D4DEC0 000004 0004+00 0/1 0/0 0/0 .rodata @3913 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3913 = 210.0f; -COMPILER_STRIP_GATE(80D4DEBC, &lit_3913); +COMPILER_STRIP_GATE(0x80D4DEBC, &lit_3913); #pragma pop /* 80D4DEC0-80D4DEC4 000008 0004+00 0/1 0/0 0/0 .rodata @3914 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3914 = 410.0f; -COMPILER_STRIP_GATE(80D4DEC0, &lit_3914); +COMPILER_STRIP_GATE(0x80D4DEC0, &lit_3914); #pragma pop /* 80D4DEC4-80D4DEC8 00000C 0004+00 0/1 0/0 0/0 .rodata @3915 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3915 = 32.0f; -COMPILER_STRIP_GATE(80D4DEC4, &lit_3915); +COMPILER_STRIP_GATE(0x80D4DEC4, &lit_3915); #pragma pop /* 80D4DEC8-80D4DECC 000010 0004+00 0/1 0/0 0/0 .rodata @3916 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3916 = 419.0f; -COMPILER_STRIP_GATE(80D4DEC8, &lit_3916); +COMPILER_STRIP_GATE(0x80D4DEC8, &lit_3916); #pragma pop /* 80D4D998-80D4DA68 000258 00D0+00 1/1 0/0 0/0 .text init__16daStartAndGoal_cFv */ diff --git a/rel/d/a/d_a_suspend/d_a_suspend.cpp b/rel/d/a/d_a_suspend/d_a_suspend.cpp index 2e63e646968..009dd8f4cc5 100644 --- a/rel/d/a/d_a_suspend/d_a_suspend.cpp +++ b/rel/d/a/d_a_suspend/d_a_suspend.cpp @@ -46,27 +46,27 @@ extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; /* ############################################################################################## */ /* 804D523C-804D5240 000000 0004+00 1/1 0/0 0/0 .rodata @3640 */ SECTION_RODATA static f32 const lit_3640 = 1250.0f; -COMPILER_STRIP_GATE(804D523C, &lit_3640); +COMPILER_STRIP_GATE(0x804D523C, &lit_3640); /* 804D5240-804D5244 000004 0004+00 0/1 0/0 0/0 .rodata @3641 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3641 = 2500.0f; -COMPILER_STRIP_GATE(804D5240, &lit_3641); +COMPILER_STRIP_GATE(0x804D5240, &lit_3641); #pragma pop /* 804D5244-804D5248 000008 0004+00 0/1 0/0 0/0 .rodata @3642 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3642 = 125.0f; -COMPILER_STRIP_GATE(804D5244, &lit_3642); +COMPILER_STRIP_GATE(0x804D5244, &lit_3642); #pragma pop /* 804D5248-804D524C 00000C 0004+00 0/1 0/0 0/0 .rodata @3643 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3643 = 250.0f; -COMPILER_STRIP_GATE(804D5248, &lit_3643); +COMPILER_STRIP_GATE(0x804D5248, &lit_3643); #pragma pop /* 804D5118-804D51E0 000078 00C8+00 1/1 0/0 0/0 .text create__7daSus_cFv */ diff --git a/rel/d/a/d_a_swBall/d_a_swBall.cpp b/rel/d/a/d_a_swBall/d_a_swBall.cpp index d52b12726e5..12f91957a38 100644 --- a/rel/d/a/d_a_swBall/d_a_swBall.cpp +++ b/rel/d/a/d_a_swBall/d_a_swBall.cpp @@ -55,7 +55,7 @@ extern "C" bool _delete__10daSwBall_cFv(); extern "C" static void daSwBall_Execute__FP10daSwBall_c(); extern "C" static void daSwBall_Delete__FP10daSwBall_c(); extern "C" static void daSwBall_Create__FP10fopAc_ac_c(); -extern "C" void func_80D4E974(u8*); +extern "C" void func_80D4E974(void* _this, u8*); extern "C" extern void* g_profile_SwBall[12]; // @@ -106,20 +106,20 @@ static asm void s_ball_sub(void* param_0, void* param_1) { /* ############################################################################################## */ /* 80D4E998-80D4E99C 000000 0004+00 2/2 0/0 0/0 .rodata @3718 */ SECTION_RODATA static f32 const lit_3718 = 10.0f; -COMPILER_STRIP_GATE(80D4E998, &lit_3718); +COMPILER_STRIP_GATE(0x80D4E998, &lit_3718); /* 80D4E99C-80D4E9A0 000004 0004+00 0/1 0/0 0/0 .rodata @3719 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3719 = 100.0f; -COMPILER_STRIP_GATE(80D4E99C, &lit_3719); +COMPILER_STRIP_GATE(0x80D4E99C, &lit_3719); #pragma pop /* 80D4E9A0-80D4E9A4 000008 0004+00 0/1 0/0 0/0 .rodata @3720 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3720 = -100.0f; -COMPILER_STRIP_GATE(80D4E9A0, &lit_3720); +COMPILER_STRIP_GATE(0x80D4E9A0, &lit_3720); #pragma pop /* 80D4E9A4-80D4E9A8 00000C 0004+00 0/2 0/0 0/0 .rodata @3721 */ @@ -131,7 +131,7 @@ SECTION_RODATA static u8 const lit_3721[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D4E9A4, &lit_3721); +COMPILER_STRIP_GATE(0x80D4E9A4, &lit_3721); #pragma pop /* 80D4E054-80D4E194 0000F4 0140+00 2/2 0/0 0/0 .text checkArea_sub__10daSwBall_cFP10fopAc_ac_c */ @@ -265,7 +265,7 @@ void daSwBall_c::actionStop() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3994 = 300.0f; -COMPILER_STRIP_GATE(80D4E9A8, &lit_3994); +COMPILER_STRIP_GATE(0x80D4E9A8, &lit_3994); #pragma pop /* 80D4E6C8-80D4E90C 000768 0244+00 1/1 0/0 0/0 .text PutCrrPos__10daSwBall_cFv */ @@ -317,7 +317,7 @@ static asm void daSwBall_Create(fopAc_ac_c* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80D4E974(u8* param_0) { +extern "C" asm void func_80D4E974(void* _this, u8* param_0) { nofralloc #include "asm/rel/d/a/d_a_swBall/d_a_swBall/func_80D4E974.s" } diff --git a/rel/d/a/d_a_swLBall/d_a_swLBall.cpp b/rel/d/a/d_a_swLBall/d_a_swLBall.cpp index 4096e848cfb..713a1c67a87 100644 --- a/rel/d/a/d_a_swLBall/d_a_swLBall.cpp +++ b/rel/d/a/d_a_swLBall/d_a_swLBall.cpp @@ -58,7 +58,7 @@ extern "C" bool _delete__11daSwLBall_cFv(); extern "C" static void daSwLBall_Execute__FP11daSwLBall_c(); extern "C" static void daSwLBall_Delete__FP11daSwLBall_c(); extern "C" static void daSwLBall_Create__FP10fopAc_ac_c(); -extern "C" void func_80D4F4AC(u8*); +extern "C" void func_80D4F4AC(void* _this, u8*); extern "C" extern void* g_profile_SwLBall[12]; // @@ -110,20 +110,20 @@ static asm void s_lb_sub(void* param_0, void* param_1) { /* ############################################################################################## */ /* 80D4F4D0-80D4F4D4 000000 0004+00 2/2 0/0 0/0 .rodata @3723 */ SECTION_RODATA static f32 const lit_3723 = 10.0f; -COMPILER_STRIP_GATE(80D4F4D0, &lit_3723); +COMPILER_STRIP_GATE(0x80D4F4D0, &lit_3723); /* 80D4F4D4-80D4F4D8 000004 0004+00 0/1 0/0 0/0 .rodata @3724 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3724 = 100.0f; -COMPILER_STRIP_GATE(80D4F4D4, &lit_3724); +COMPILER_STRIP_GATE(0x80D4F4D4, &lit_3724); #pragma pop /* 80D4F4D8-80D4F4DC 000008 0004+00 0/1 0/0 0/0 .rodata @3725 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3725 = -100.0f; -COMPILER_STRIP_GATE(80D4F4D8, &lit_3725); +COMPILER_STRIP_GATE(0x80D4F4D8, &lit_3725); #pragma pop /* 80D4F4DC-80D4F4E0 00000C 0004+00 0/2 0/0 0/0 .rodata @3726 */ @@ -135,7 +135,7 @@ SECTION_RODATA static u8 const lit_3726[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D4F4DC, &lit_3726); +COMPILER_STRIP_GATE(0x80D4F4DC, &lit_3726); #pragma pop /* 80D4EB8C-80D4ECCC 00010C 0140+00 2/2 0/0 0/0 .text checkArea_sub__11daSwLBall_cFP10fopAc_ac_c @@ -291,7 +291,7 @@ void daSwLBall_c::actionStop() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4000 = 300.0f; -COMPILER_STRIP_GATE(80D4F4E0, &lit_4000); +COMPILER_STRIP_GATE(0x80D4F4E0, &lit_4000); #pragma pop /* 80D4F224-80D4F444 0007A4 0220+00 1/1 0/0 0/0 .text PutCrrPos__11daSwLBall_cFv */ @@ -345,7 +345,7 @@ static asm void daSwLBall_Create(fopAc_ac_c* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80D4F4AC(u8* param_0) { +extern "C" asm void func_80D4F4AC(void* _this, u8* param_0) { nofralloc #include "asm/rel/d/a/d_a_swLBall/d_a_swLBall/func_80D4F4AC.s" } diff --git a/rel/d/a/d_a_swc00/d_a_swc00.cpp b/rel/d/a/d_a_swc00/d_a_swc00.cpp index 56a724f5aad..061b7df3dbd 100644 --- a/rel/d/a/d_a_swc00/d_a_swc00.cpp +++ b/rel/d/a/d_a_swc00/d_a_swc00.cpp @@ -99,7 +99,7 @@ extern "C" extern u8 data_805A1F28[4]; /* ############################################################################################## */ /* 805A1D94-805A1D98 000000 0004+00 2/2 0/0 0/0 .rodata @3708 */ SECTION_RODATA static f32 const lit_3708 = -100.0f; -COMPILER_STRIP_GATE(805A1D94, &lit_3708); +COMPILER_STRIP_GATE(0x805A1D94, &lit_3708); /* 805A13F8-805A15DC 000078 01E4+00 1/1 0/0 0/0 .text hitCheck__FP9daSwc00_c */ #pragma push @@ -122,6 +122,13 @@ static asm void daSwc00_Execute(daSwc00_c* param_0) { #pragma pop /* ############################################################################################## */ +/* 805A1DAC-805A1DAC 000018 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_805A1DAC = + "領域スイッチ：引数０が不正値<%d>です\n"; +#pragma pop + /* 805A1DD4-805A1DE0 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -317,35 +324,35 @@ static asm void daSwc00_Create(fopAc_ac_c* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3991 = 100.0f; -COMPILER_STRIP_GATE(805A1D98, &lit_3991); +COMPILER_STRIP_GATE(0x805A1D98, &lit_3991); #pragma pop /* 805A1D9C-805A1DA0 000008 0004+00 0/0 0/0 0/0 .rodata @3992 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3992 = 30.0f; -COMPILER_STRIP_GATE(805A1D9C, &lit_3992); +COMPILER_STRIP_GATE(0x805A1D9C, &lit_3992); #pragma pop /* 805A1DA0-805A1DA4 00000C 0004+00 0/0 0/0 0/0 .rodata @3993 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3993 = 1000.0f; -COMPILER_STRIP_GATE(805A1DA0, &lit_3993); +COMPILER_STRIP_GATE(0x805A1DA0, &lit_3993); #pragma pop /* 805A1DA4-805A1DA8 000010 0004+00 0/0 0/0 0/0 .rodata @3994 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3994 = 10.0f; -COMPILER_STRIP_GATE(805A1DA4, &lit_3994); +COMPILER_STRIP_GATE(0x805A1DA4, &lit_3994); #pragma pop /* 805A1DA8-805A1DAC 000014 0004+00 0/0 0/0 0/0 .rodata @3995 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3995 = 50.0f; -COMPILER_STRIP_GATE(805A1DA8, &lit_3995); +COMPILER_STRIP_GATE(0x805A1DA8, &lit_3995); #pragma pop /* 805A1ED4-805A1EF4 -00001 0020+00 1/0 0/0 0/0 .data l_daSwc00_Method */ @@ -370,10 +377,4 @@ SECTION_DATA extern void* g_profile_SWC00[12] = { (void*)0x00040000, (void*)NULL, }; -/* 805A1DAC-805A1DD2 000018 0026+00 1/1 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_805A1DAC = - "領域スイッチ：引数０が不正値<%d>です\n"; -#pragma pop +/* 805A1DAC-805A1DAC 000018 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/d_a_swhit0/d_a_swhit0.cpp b/rel/d/a/d_a_swhit0/d_a_swhit0.cpp index 7e71a1afb5c..c714f40aeb8 100644 --- a/rel/d/a/d_a_swhit0/d_a_swhit0.cpp +++ b/rel/d/a/d_a_swhit0/d_a_swhit0.cpp @@ -140,10 +140,10 @@ struct cCcS { /* 80264BA8 */ void Set(cCcD_Obj*); }; -struct Vec {}; - struct JAISoundID {}; +struct Vec {}; + struct Z2SeMgr { /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); }; @@ -199,7 +199,7 @@ extern "C" static void daSwhit0_Draw__FP10daSwhit0_c(); extern "C" static void daSwhit0_Execute__FP10daSwhit0_c(); extern "C" static void daSwhit0_Delete__FP10daSwhit0_c(); extern "C" static void daSwhit0_Create__FP10fopAc_ac_c(); -extern "C" void func_8048734C(u8*); +extern "C" void func_8048734C(void* _this, u8*); extern "C" extern char const* const d_a_swhit0__stringBase0; // @@ -318,6 +318,14 @@ asm void daSwhit0_c::getType() { } #pragma pop +/* ############################################################################################## */ +/* 80487388-80487388 000018 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80487388 = "S_swHit00"; +SECTION_DEAD static char const* const stringBase_80487392 = "DEFAULT_SWITCH"; +#pragma pop + /* 80486064-804860EC 0000E4 0088+00 1/1 0/0 0/0 .text makeEventId__10daSwhit0_cFv */ #pragma push #pragma optimization_level 0 @@ -331,7 +339,7 @@ asm void daSwhit0_c::makeEventId() { /* ############################################################################################## */ /* 80487370-80487374 000000 0004+00 6/6 0/0 0/0 .rodata @3685 */ SECTION_RODATA static f32 const lit_3685 = 1.0f; -COMPILER_STRIP_GATE(80487370, &lit_3685); +COMPILER_STRIP_GATE(0x80487370, &lit_3685); /* 804873BC-804873C0 -00001 0004+00 3/3 0/0 0/0 .data l_arcName */ SECTION_DATA static void* l_arcName = (void*)&d_a_swhit0__stringBase0; @@ -349,7 +357,7 @@ asm void daSwhit0_c::CreateHeap() { /* ############################################################################################## */ /* 80487374-80487378 000004 0004+00 1/1 0/0 0/0 .rodata @3725 */ SECTION_RODATA static f32 const lit_3725 = 95.0f; -COMPILER_STRIP_GATE(80487374, &lit_3725); +COMPILER_STRIP_GATE(0x80487374, &lit_3725); /* 804873C0-80487400 000004 0040+00 1/1 0/0 0/0 .data l_sph_src */ SECTION_DATA static u8 l_sph_src[64] = { @@ -380,6 +388,13 @@ static asm void CheckCreateHeap(fopAc_ac_c* param_0) { #pragma pop /* ############################################################################################## */ +/* 80487388-80487388 000018 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_804873A1 = "WAIT"; +SECTION_DEAD static char const* const stringBase_804873A6 = "CHANGE"; +#pragma pop + /* 80487400-80487408 -00001 0008+00 1/1 0/0 0/0 .data action_table$3953 */ SECTION_DATA static void* action_table[2] = { (void*)(((char*)&d_a_swhit0__stringBase0) + 0x19), @@ -546,7 +561,7 @@ SECTION_RODATA static f32 const lit_3982[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80487378, &lit_3982); +COMPILER_STRIP_GATE(0x80487378, &lit_3982); /* 804868A8-804869C4 000928 011C+00 2/2 0/0 0/0 .text DemoProc__10daSwhit0_cFv */ #pragma push @@ -558,6 +573,13 @@ asm void daSwhit0_c::DemoProc() { } #pragma pop +/* ############################################################################################## */ +/* 80487388-80487388 000018 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_804873AD = "D_MN06"; +#pragma pop + /* 804869C4-80486ABC 000A44 00F8+00 2/2 0/0 0/0 .text orderEvent__10daSwhit0_cFv */ #pragma push #pragma optimization_level 0 @@ -588,6 +610,13 @@ asm void daSwhit0_c::actionToOnReady() { } #pragma pop +/* ############################################################################################## */ +/* 80487388-80487388 000018 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_804873B4 = "SWITCH"; +#pragma pop + /* 80486C28-80486CE4 000CA8 00BC+00 1/1 0/0 0/0 .text actionToOnOrder__10daSwhit0_cFv */ #pragma push #pragma optimization_level 0 @@ -653,7 +682,7 @@ asm void daSwhit0_c::setDrawMtx() { SECTION_RODATA static u8 const lit_4212[8] = { 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80487380, &lit_4212); +COMPILER_STRIP_GATE(0x80487380, &lit_4212); /* 80487138-80487228 0011B8 00F0+00 1/0 0/0 0/0 .text daSwhit0_Draw__FP10daSwhit0_c */ #pragma push @@ -699,20 +728,10 @@ static asm void daSwhit0_Create(fopAc_ac_c* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_8048734C(u8* param_0) { +extern "C" asm void func_8048734C(void* _this, u8* param_0) { nofralloc #include "asm/rel/d/a/d_a_swhit0/d_a_swhit0/func_8048734C.s" } #pragma pop -/* 80487388-804873BB 000018 0033+00 5/3 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80487388 = "S_swHit00"; -SECTION_DEAD static char const* const stringBase_80487392 = "DEFAULT_SWITCH"; -SECTION_DEAD static char const* const stringBase_804873A1 = "WAIT"; -SECTION_DEAD static char const* const stringBase_804873A6 = "CHANGE"; -SECTION_DEAD static char const* const stringBase_804873AD = "D_MN06"; -SECTION_DEAD static char const* const stringBase_804873B4 = "SWITCH"; -#pragma pop +/* 80487388-80487388 000018 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/d_a_tbox/d_a_tbox.cpp b/rel/d/a/d_a_tbox/d_a_tbox.cpp index 2b62be79133..3806187f654 100644 --- a/rel/d/a/d_a_tbox/d_a_tbox.cpp +++ b/rel/d/a/d_a_tbox/d_a_tbox.cpp @@ -236,7 +236,6 @@ struct dEvt_control_c { /* 80042468 */ void reset(); /* 80043500 */ void searchMapEventData(u8, s32); /* 800436BC */ void setPtI(void*); - /* 800436EC */ void setPtI_Id(unsigned int); }; struct dEvent_manager_c { @@ -678,7 +677,7 @@ SECTION_RODATA static u8 const l_cull_size_box[24] = { 0xC3, 0x16, 0x00, 0x00, 0xC1, 0x20, 0x00, 0x00, 0xC3, 0x16, 0x00, 0x00, 0x43, 0x16, 0x00, 0x00, 0x43, 0x96, 0x00, 0x00, 0x42, 0xC8, 0x00, 0x00, }; -COMPILER_STRIP_GATE(804961D4, &l_cull_size_box); +COMPILER_STRIP_GATE(0x804961D4, &l_cull_size_box); /* 804961EC-80496228 000018 003C+00 1/2 0/0 0/0 .rodata l_cyl_info */ SECTION_RODATA static u8 const l_cyl_info[60] = { @@ -687,28 +686,46 @@ SECTION_RODATA static u8 const l_cyl_info[60] = { 0x00, 0x00, 0x42, 0x48, 0x00, 0x00, 0x42, 0x8C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC2, 0x70, 0x00, 0x00, 0x42, 0x8C, 0x00, 0x00, 0x42, 0xA0, 0x00, 0x00, }; -COMPILER_STRIP_GATE(804961EC, &l_cyl_info); +COMPILER_STRIP_GATE(0x804961EC, &l_cyl_info); /* 80496228-8049622C 000054 0004+00 1/3 0/0 0/0 .rodata @3833 */ SECTION_RODATA static f32 const lit_3833 = -2.0f; -COMPILER_STRIP_GATE(80496228, &lit_3833); +COMPILER_STRIP_GATE(0x80496228, &lit_3833); /* 8049622C-80496230 000058 0004+00 1/3 0/0 0/0 .rodata @3834 */ SECTION_RODATA static f32 const lit_3834 = 70.0f; -COMPILER_STRIP_GATE(8049622C, &lit_3834); +COMPILER_STRIP_GATE(0x8049622C, &lit_3834); /* 80496230-80496234 00005C 0004+00 0/1 0/0 0/0 .rodata @3835 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3835 = 3.0f / 10.0f; -COMPILER_STRIP_GATE(80496230, &lit_3835); +COMPILER_STRIP_GATE(0x80496230, &lit_3835); #pragma pop /* 80496234-80496238 000060 0004+00 0/2 0/0 0/0 .rodata @3836 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3836 = 11.0f / 20.0f; -COMPILER_STRIP_GATE(80496234, &lit_3836); +COMPILER_STRIP_GATE(0x80496234, &lit_3836); +#pragma pop + +/* 80496334-80496334 000160 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80496334 = "TREASURE"; +SECTION_DEAD static char const* const stringBase_8049633D = "Dalways"; +SECTION_DEAD static char const* const stringBase_80496345 = "BoxC"; +SECTION_DEAD static char const* const stringBase_8049634A = "D_MN01B"; +SECTION_DEAD static char const* const stringBase_80496352 = "DEFAULT_TREASURE_BOSS"; +SECTION_DEAD static char const* const stringBase_80496368 = "R_SP01"; +SECTION_DEAD static char const* const stringBase_8049636F = + "ジャンプ宝箱：ジャンプ先の取得に失敗しました！\n"; +SECTION_DEAD static char const* const stringBase_8049639F = "WAIT"; +SECTION_DEAD static char const* const stringBase_804963A4 = "OPEN"; +SECTION_DEAD static char const* const stringBase_804963A9 = "APPEAR"; +SECTION_DEAD static char const* const stringBase_804963B0 = "OPEN_SHORT"; +SECTION_DEAD static char const* const stringBase_804963BB = "DROP"; #pragma pop /* 80496494-804964A0 000000 000C+00 4/4 0/0 0/0 .data cNullVec__6Z2Calc */ @@ -1343,12 +1360,12 @@ asm void daTbox_c::getModelInfo() { SECTION_RODATA static u8 const l_open_se_id[12] = { 0x00, 0x08, 0x00, 0x1F, 0x00, 0x08, 0x00, 0x20, 0x00, 0x08, 0x00, 0x22, }; -COMPILER_STRIP_GATE(80496238, &l_open_se_id); +COMPILER_STRIP_GATE(0x80496238, &l_open_se_id); #pragma pop /* 80496244-80496248 000070 0004+00 1/10 0/0 0/0 .rodata @3933 */ SECTION_RODATA static f32 const lit_3933 = 1.0f; -COMPILER_STRIP_GATE(80496244, &lit_3933); +COMPILER_STRIP_GATE(0x80496244, &lit_3933); /* 80496248-8049624C 000074 0004+00 6/19 0/0 0/0 .rodata @3934 */ SECTION_RODATA static u8 const lit_3934[4] = { @@ -1357,7 +1374,7 @@ SECTION_RODATA static u8 const lit_3934[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80496248, &lit_3934); +COMPILER_STRIP_GATE(0x80496248, &lit_3934); /* 80490E6C-80491170 00022C 0304+00 1/1 0/0 0/0 .text commonShapeSet__8daTbox_cFv */ #pragma push @@ -1469,7 +1486,7 @@ asm void daTbox_c::setDzb() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4041 = -1.0f; -COMPILER_STRIP_GATE(8049624C, &lit_4041); +COMPILER_STRIP_GATE(0x8049624C, &lit_4041); #pragma pop /* 80491484-80491544 000844 00C0+00 1/1 0/0 0/0 .text surfaceProc__8daTbox_cFv */ @@ -1527,7 +1544,7 @@ asm void daTbox_c::CreateHeap() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4169 = 500.0f; -COMPILER_STRIP_GATE(80496250, &lit_4169); +COMPILER_STRIP_GATE(0x80496250, &lit_4169); #pragma pop /* 80491744-804919B0 000B04 026C+00 1/1 0/0 0/0 .text CreateInit__8daTbox_cFv */ @@ -1543,11 +1560,11 @@ asm void daTbox_c::CreateInit() { /* ############################################################################################## */ /* 80496254-80496258 000080 0004+00 3/4 0/0 0/0 .rodata @4222 */ SECTION_RODATA static f32 const lit_4222 = 5.0f; -COMPILER_STRIP_GATE(80496254, &lit_4222); +COMPILER_STRIP_GATE(0x80496254, &lit_4222); /* 80496258-8049625C 000084 0004+00 2/2 0/0 0/0 .rodata @4223 */ SECTION_RODATA static f32 const lit_4223 = 30.0f; -COMPILER_STRIP_GATE(80496258, &lit_4223); +COMPILER_STRIP_GATE(0x80496258, &lit_4223); /* 804919B0-80491BB0 000D70 0200+00 1/1 0/0 0/0 .text initPos__8daTbox_cFv */ #pragma push @@ -1564,7 +1581,7 @@ asm void daTbox_c::initPos() { SECTION_RODATA static u8 const lit_4357[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8049625C, &lit_4357); +COMPILER_STRIP_GATE(0x8049625C, &lit_4357); /* 80491BB0-80491F68 000F70 03B8+00 1/1 0/0 0/0 .text initAnm__8daTbox_cFv */ #pragma push @@ -1581,14 +1598,14 @@ asm void daTbox_c::initAnm() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4404 = 22500.0f; -COMPILER_STRIP_GATE(80496264, &lit_4404); +COMPILER_STRIP_GATE(0x80496264, &lit_4404); #pragma pop /* 80496268-8049626C 000094 0004+00 0/1 0/0 0/0 .rodata @4405 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4405 = 20.0f; -COMPILER_STRIP_GATE(80496268, &lit_4405); +COMPILER_STRIP_GATE(0x80496268, &lit_4405); #pragma pop /* 80491F68-804920A8 001328 0140+00 1/1 0/0 0/0 .text boxCheck__8daTbox_cFv */ @@ -1604,7 +1621,7 @@ asm void daTbox_c::boxCheck() { /* ############################################################################################## */ /* 8049626C-80496270 000098 0004+00 1/1 0/0 0/0 .rodata @4441 */ SECTION_RODATA static f32 const lit_4441 = 21.0f; -COMPILER_STRIP_GATE(8049626C, &lit_4441); +COMPILER_STRIP_GATE(0x8049626C, &lit_4441); /* 804920A8-8049216C 001468 00C4+00 1/1 0/0 0/0 .text demoProcOpen__8daTbox_cFv */ #pragma push @@ -1622,7 +1639,7 @@ SECTION_RODATA static u8 const key_frame[28] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x1E, 0x00, 0x00, 0x00, 0x25, 0x00, 0x00, 0x00, 0x2C, 0x00, 0x00, 0x00, 0x5C, 0x00, 0x00, 0x00, 0x8C, }; -COMPILER_STRIP_GATE(80496270, &key_frame); +COMPILER_STRIP_GATE(0x80496270, &key_frame); /* 8049628C-804962C4 0000B8 0038+00 1/1 0/0 0/0 .rodata key_color$4446 */ SECTION_RODATA static u8 const key_color[56] = { @@ -1631,7 +1648,7 @@ SECTION_RODATA static u8 const key_color[56] = { 0x00, 0x24, 0x00, 0xFF, 0x00, 0xFF, 0x00, 0xC3, 0x00, 0x8A, 0x00, 0xFF, 0x00, 0xFF, 0x00, 0xC3, 0x00, 0x8A, 0x00, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, }; -COMPILER_STRIP_GATE(8049628C, &key_color); +COMPILER_STRIP_GATE(0x8049628C, &key_color); /* 8049216C-8049233C 00152C 01D0+00 1/1 0/0 0/0 .text lightColorProc__8daTbox_cFv */ #pragma push @@ -1646,13 +1663,13 @@ asm void daTbox_c::lightColorProc() { /* ############################################################################################## */ /* 804962C4-804962C8 0000F0 0004+00 1/3 0/0 0/0 .rodata @4499 */ SECTION_RODATA static f32 const lit_4499 = 1.0f / 20.0f; -COMPILER_STRIP_GATE(804962C4, &lit_4499); +COMPILER_STRIP_GATE(0x804962C4, &lit_4499); /* 804962C8-804962CC 0000F4 0004+00 0/1 0/0 0/0 .rodata @4500 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4500 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(804962C8, &lit_4500); +COMPILER_STRIP_GATE(0x804962C8, &lit_4500); #pragma pop /* 8049233C-80492398 0016FC 005C+00 1/1 0/0 0/0 .text environmentProc__8daTbox_cFv */ @@ -1704,7 +1721,7 @@ SECTION_RODATA static f32 const lit_4670[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(804962CC, &lit_4670); +COMPILER_STRIP_GATE(0x804962CC, &lit_4670); #pragma pop /* 804962D4-804962DC 000100 0008+00 0/5 0/0 0/0 .rodata @4671 */ @@ -1713,7 +1730,7 @@ COMPILER_STRIP_GATE(804962CC, &lit_4670); SECTION_RODATA static u8 const lit_4671[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(804962D4, &lit_4671); +COMPILER_STRIP_GATE(0x804962D4, &lit_4671); #pragma pop /* 804962DC-804962E4 000108 0008+00 0/5 0/0 0/0 .rodata @4672 */ @@ -1722,7 +1739,7 @@ COMPILER_STRIP_GATE(804962D4, &lit_4671); SECTION_RODATA static u8 const lit_4672[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(804962DC, &lit_4672); +COMPILER_STRIP_GATE(0x804962DC, &lit_4672); #pragma pop /* 804962E4-804962EC 000110 0008+00 0/5 0/0 0/0 .rodata @4673 */ @@ -1731,14 +1748,14 @@ COMPILER_STRIP_GATE(804962DC, &lit_4672); SECTION_RODATA static u8 const lit_4673[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(804962E4, &lit_4673); +COMPILER_STRIP_GATE(0x804962E4, &lit_4673); #pragma pop /* 804962EC-804962F0 000118 0004+00 0/2 0/0 0/0 .rodata @4674 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4674 = 19.0f; -COMPILER_STRIP_GATE(804962EC, &lit_4674); +COMPILER_STRIP_GATE(0x804962EC, &lit_4674); #pragma pop /* 80492450-804928DC 001810 048C+00 1/1 0/0 0/0 .text dropProcInit__8daTbox_cFv */ @@ -1764,7 +1781,7 @@ asm void daTbox_c::calcJumpGoalAndAngle(cXyz* param_0, s16* param_1) { /* ############################################################################################## */ /* 804962F0-804962F4 00011C 0004+00 1/1 0/0 0/0 .rodata @4756 */ SECTION_RODATA static u32 const lit_4756 = 0x43360B61; -COMPILER_STRIP_GATE(804962F0, &lit_4756); +COMPILER_STRIP_GATE(0x804962F0, &lit_4756); /* 80492B10-80492BC8 001ED0 00B8+00 4/4 0/0 0/0 .text getDropSAngle__8daTbox_cFPs */ #pragma push @@ -1811,14 +1828,14 @@ asm void daTbox_c::dropProcInit2() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4949 = 10.0f; -COMPILER_STRIP_GATE(804962F4, &lit_4949); +COMPILER_STRIP_GATE(0x804962F4, &lit_4949); #pragma pop /* 804962F8-804962FC 000124 0004+00 0/1 0/0 0/0 .rodata @4950 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4950 = 400.0f; -COMPILER_STRIP_GATE(804962F8, &lit_4950); +COMPILER_STRIP_GATE(0x804962F8, &lit_4950); #pragma pop /* 80492F50-804932C0 002310 0370+00 2/2 0/0 0/0 .text dropProc__8daTbox_cFv */ @@ -1848,14 +1865,14 @@ asm dBgS_ObjGndChk::~dBgS_ObjGndChk() { SECTION_RODATA static u8 const eff_id[12] = { 0x88, 0x40, 0x88, 0x41, 0x88, 0x42, 0x88, 0x43, 0x88, 0x44, 0x88, 0x45, }; -COMPILER_STRIP_GATE(804962FC, &eff_id); +COMPILER_STRIP_GATE(0x804962FC, &eff_id); #pragma pop /* 80496308-8049630C 000134 0004+00 0/1 0/0 0/0 .rodata @4998 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4998 = 55.0f; -COMPILER_STRIP_GATE(80496308, &lit_4998); +COMPILER_STRIP_GATE(0x80496308, &lit_4998); #pragma pop /* 80493338-80493484 0026F8 014C+00 1/1 0/0 0/0 .text demoInitAppear__8daTbox_cFv */ @@ -1871,7 +1888,7 @@ asm void daTbox_c::demoInitAppear() { /* ############################################################################################## */ /* 8049630C-80496310 000138 0004+00 1/1 0/0 0/0 .rodata @5021 */ SECTION_RODATA static f32 const lit_5021 = 110.0f; -COMPILER_STRIP_GATE(8049630C, &lit_5021); +COMPILER_STRIP_GATE(0x8049630C, &lit_5021); /* 80493484-80493518 002844 0094+00 1/1 0/0 0/0 .text demoProcAppear__8daTbox_cFv */ #pragma push @@ -1886,7 +1903,7 @@ asm void daTbox_c::demoProcAppear() { /* ############################################################################################## */ /* 80496310-80496314 00013C 0004+00 1/1 0/0 0/0 .rodata @5135 */ SECTION_RODATA static f32 const lit_5135 = -130.0f; -COMPILER_STRIP_GATE(80496310, &lit_5135); +COMPILER_STRIP_GATE(0x80496310, &lit_5135); /* 80493518-80493838 0028D8 0320+00 7/7 0/0 0/0 .text demoProc__8daTbox_cFv */ #pragma push @@ -1923,6 +1940,16 @@ bool daTbox_c::actionWait() { return true; } +/* ############################################################################################## */ +/* 80496334-80496334 000160 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_804963C0 = "F_SP121"; +SECTION_DEAD static char const* const stringBase_804963C8 = + "ハートの欠片：想定外の配置です。イベントビットセットできませんでした！\n"; +SECTION_DEAD static char const* const stringBase_80496410 = "F_SP109"; +#pragma pop + /* 804939FC-80493CC8 002DBC 02CC+00 1/0 0/0 0/0 .text actionDemo__8daTbox_cFv */ #pragma push #pragma optimization_level 0 @@ -1933,6 +1960,13 @@ asm void daTbox_c::actionDemo() { } #pragma pop +/* ############################################################################################## */ +/* 80496334-80496334 000160 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80496418 = "DEFAULT_TREASURE_APPEAR"; +#pragma pop + /* 80493CC8-80493D90 003088 00C8+00 2/0 0/0 0/0 .text actionDemo2__8daTbox_cFv */ #pragma push #pragma optimization_level 0 @@ -2004,6 +2038,16 @@ asm void daTbox_c::setGetDemoItem() { } #pragma pop +/* ############################################################################################## */ +/* 80496334-80496334 000160 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80496430 = "DEFAULT_TREASURE_SIMPLE"; +SECTION_DEAD static char const* const stringBase_80496448 = "DEFAULT_TREASURE_NOTOPEN"; +SECTION_DEAD static char const* const stringBase_80496461 = "DEFAULT_TREASURE_EFFECT"; +SECTION_DEAD static char const* const stringBase_80496479 = "DEFAULT_TREASURE_NORMAL"; +#pragma pop + /* 804946A4-804948CC 003A64 0228+00 11/0 0/0 0/0 .text actionOpenWait__8daTbox_cFv */ #pragma push #pragma optimization_level 0 @@ -2043,7 +2087,7 @@ SECTION_RODATA static u32 const lit_5774[1 + 1 /* padding */] = { /* padding */ 0x00000000, }; -COMPILER_STRIP_GATE(80496314, &lit_5774); +COMPILER_STRIP_GATE(0x80496314, &lit_5774); #pragma pop /* 8049631C-80496324 000148 0008+00 0/1 0/0 0/0 .rodata @5777 */ @@ -2052,7 +2096,7 @@ COMPILER_STRIP_GATE(80496314, &lit_5774); SECTION_RODATA static u8 const lit_5777[8] = { 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8049631C, &lit_5777); +COMPILER_STRIP_GATE(0x8049631C, &lit_5777); #pragma pop /* 80494A0C-80494D88 003DCC 037C+00 1/1 0/0 0/0 .text settingDropDemoCamera__8daTbox_cFv @@ -2142,21 +2186,21 @@ asm void daTbox_c::initBaseMtx() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6112 = 50.0f; -COMPILER_STRIP_GATE(80496324, &lit_6112); +COMPILER_STRIP_GATE(0x80496324, &lit_6112); #pragma pop /* 80496328-8049632C 000154 0004+00 0/1 0/0 0/0 .rodata @6113 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6113 = -50.0f; -COMPILER_STRIP_GATE(80496328, &lit_6113); +COMPILER_STRIP_GATE(0x80496328, &lit_6113); #pragma pop /* 8049632C-80496330 000158 0004+00 0/1 0/0 0/0 .rodata @6114 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6114 = 15.0f; -COMPILER_STRIP_GATE(8049632C, &lit_6114); +COMPILER_STRIP_GATE(0x8049632C, &lit_6114); #pragma pop /* 80495490-80495660 004850 01D0+00 4/4 0/0 0/0 .text setBaseMtx__8daTbox_cFv */ @@ -2369,7 +2413,7 @@ asm daTbox_HIO_c::~daTbox_HIO_c() { /* ############################################################################################## */ /* 80496330-80496334 00015C 0004+00 1/1 0/0 0/0 .rodata @6499 */ SECTION_RODATA static f32 const lit_6499 = 35.0f; -COMPILER_STRIP_GATE(80496330, &lit_6499); +COMPILER_STRIP_GATE(0x80496330, &lit_6499); /* 80496114-80496188 0054D4 0074+00 0/0 1/0 0/0 .text __sinit_d_a_tbox_cpp */ #pragma push @@ -2383,7 +2427,7 @@ asm void __sinit_d_a_tbox_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80496114 = (void*)__sinit_d_a_tbox_cpp; +REGISTER_CTORS(0x80496114, __sinit_d_a_tbox_cpp); #pragma pop /* 80496188-80496190 005548 0008+00 1/0 0/0 0/0 .text @20@__dt__14dBgS_ObjGndChkFv */ @@ -2618,30 +2662,4 @@ static u8 data_80496990[4]; static u8 data_80496994[4]; #pragma pop -/* 80496334-80496491 000160 015D+00 12/9 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80496334 = "TREASURE"; -SECTION_DEAD static char const* const stringBase_8049633D = "Dalways"; -SECTION_DEAD static char const* const stringBase_80496345 = "BoxC"; -SECTION_DEAD static char const* const stringBase_8049634A = "D_MN01B"; -SECTION_DEAD static char const* const stringBase_80496352 = "DEFAULT_TREASURE_BOSS"; -SECTION_DEAD static char const* const stringBase_80496368 = "R_SP01"; -SECTION_DEAD static char const* const stringBase_8049636F = - "ジャンプ宝箱：ジャンプ先の取得に失敗しました！\n"; -SECTION_DEAD static char const* const stringBase_8049639F = "WAIT"; -SECTION_DEAD static char const* const stringBase_804963A4 = "OPEN"; -SECTION_DEAD static char const* const stringBase_804963A9 = "APPEAR"; -SECTION_DEAD static char const* const stringBase_804963B0 = "OPEN_SHORT"; -SECTION_DEAD static char const* const stringBase_804963BB = "DROP"; -SECTION_DEAD static char const* const stringBase_804963C0 = "F_SP121"; -SECTION_DEAD static char const* const stringBase_804963C8 = - "ハートの欠片：想定外の配置です。イベントビットセットできませんでした！\n"; -SECTION_DEAD static char const* const stringBase_80496410 = "F_SP109"; -SECTION_DEAD static char const* const stringBase_80496418 = "DEFAULT_TREASURE_APPEAR"; -SECTION_DEAD static char const* const stringBase_80496430 = "DEFAULT_TREASURE_SIMPLE"; -SECTION_DEAD static char const* const stringBase_80496448 = "DEFAULT_TREASURE_NOTOPEN"; -SECTION_DEAD static char const* const stringBase_80496461 = "DEFAULT_TREASURE_EFFECT"; -SECTION_DEAD static char const* const stringBase_80496479 = "DEFAULT_TREASURE_NORMAL"; -#pragma pop +/* 80496334-80496334 000160 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/d_a_tbox2/d_a_tbox2.cpp b/rel/d/a/d_a_tbox2/d_a_tbox2.cpp index 3d21085ac6b..19eb63ab81c 100644 --- a/rel/d/a/d_a_tbox2/d_a_tbox2.cpp +++ b/rel/d/a/d_a_tbox2/d_a_tbox2.cpp @@ -98,7 +98,6 @@ struct dEvt_info_c { struct dEvt_control_c { /* 80042468 */ void reset(); /* 800436BC */ void setPtI(void*); - /* 800436EC */ void setPtI_Id(unsigned int); }; struct dEvent_manager_c { @@ -422,7 +421,7 @@ SECTION_RODATA static u8 const l_resInfo[32] = { 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x0D, 0x00, 0x00, 0x00, 0x0E, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x0F, 0x00, 0x00, 0x00, 0x10, }; -COMPILER_STRIP_GATE(80498160, &l_resInfo); +COMPILER_STRIP_GATE(0x80498160, &l_resInfo); /* 80498180-804981BC 000020 003C+00 1/2 0/0 0/0 .rodata l_cyl_info */ SECTION_RODATA static u8 const l_cyl_info[60] = { @@ -431,13 +430,13 @@ SECTION_RODATA static u8 const l_cyl_info[60] = { 0x00, 0x00, 0x42, 0x48, 0x00, 0x00, 0x42, 0x8C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC2, 0x70, 0x00, 0x00, 0x42, 0x8C, 0x00, 0x00, 0x42, 0xA0, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80498180, &l_cyl_info); +COMPILER_STRIP_GATE(0x80498180, &l_cyl_info); /* 804981BC-804981C0 00005C 0004+00 0/1 0/0 0/0 .rodata @3714 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3714 = 50.0f; -COMPILER_STRIP_GATE(804981BC, &lit_3714); +COMPILER_STRIP_GATE(0x804981BC, &lit_3714); #pragma pop /* 804981C0-804981C4 000060 0004+00 1/3 0/0 0/0 .rodata @3715 */ @@ -447,22 +446,29 @@ SECTION_RODATA static u8 const lit_3715[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(804981C0, &lit_3715); +COMPILER_STRIP_GATE(0x804981C0, &lit_3715); /* 804981C4-804981C8 000064 0004+00 0/1 0/0 0/0 .rodata @3716 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3716 = -6.0f; -COMPILER_STRIP_GATE(804981C4, &lit_3716); +COMPILER_STRIP_GATE(0x804981C4, &lit_3716); #pragma pop /* 804981C8-804981CC 000068 0004+00 1/2 0/0 0/0 .rodata @3717 */ SECTION_RODATA static f32 const lit_3717 = 5.0f; -COMPILER_STRIP_GATE(804981C8, &lit_3717); +COMPILER_STRIP_GATE(0x804981C8, &lit_3717); /* 804981CC-804981D0 00006C 0004+00 1/2 0/0 0/0 .rodata @3718 */ SECTION_RODATA static f32 const lit_3718 = 30.0f; -COMPILER_STRIP_GATE(804981CC, &lit_3718); +COMPILER_STRIP_GATE(0x804981CC, &lit_3718); + +/* 804981E0-804981E0 000080 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_804981E0 = "Tbox2"; +SECTION_DEAD static char const* const stringBase_804981E6 = "TREASURE"; +#pragma pop /* 8049825C-80498268 000000 000C+00 2/2 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { @@ -510,7 +516,16 @@ asm void daTbox2_c::Create() { /* ############################################################################################## */ /* 804981D0-804981D4 000070 0004+00 4/4 0/0 0/0 .rodata @3763 */ SECTION_RODATA static f32 const lit_3763 = 1.0f; -COMPILER_STRIP_GATE(804981D0, &lit_3763); +COMPILER_STRIP_GATE(0x804981D0, &lit_3763); + +/* 804981E0-804981E0 000080 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_804981EF = "WAIT"; +SECTION_DEAD static char const* const stringBase_804981F4 = "OPEN"; +SECTION_DEAD static char const* const stringBase_804981F9 = "APPEAR"; +SECTION_DEAD static char const* const stringBase_80498200 = "OPEN_SHORT"; +#pragma pop /* 804982C8-804982D8 -00001 0010+00 1/1 0/0 0/0 .data action_table$3964 */ SECTION_DATA static void* action_table[4] = { @@ -790,7 +805,7 @@ asm dCcD_GStts::~dCcD_GStts() { /* ############################################################################################## */ /* 804981D4-804981D8 000074 0004+00 1/1 0/0 0/0 .rodata @4021 */ SECTION_RODATA static f32 const lit_4021 = -1.0f; -COMPILER_STRIP_GATE(804981D4, &lit_4021); +COMPILER_STRIP_GATE(0x804981D4, &lit_4021); /* 8049724C-80497478 0008AC 022C+00 3/3 0/0 0/0 .text demoProc__9daTbox2_cFv */ #pragma push @@ -929,6 +944,15 @@ asm void daTbox2_c::init_actionOpenWait() { } #pragma pop +/* ############################################################################################## */ +/* 804981E0-804981E0 000080 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8049820B = "DEFAULT_TREASURE_SIMPLE"; +SECTION_DEAD static char const* const stringBase_80498223 = "DEFAULT_TREASURE_NOTOPEN"; +SECTION_DEAD static char const* const stringBase_8049823C = "DEFAULT_TREASURE_NORMAL"; +#pragma pop + /* 80497A18-80497BD0 001078 01B8+00 1/0 0/0 0/0 .text actionOpenWait__9daTbox2_cFv */ #pragma push #pragma optimization_level 0 @@ -954,14 +978,20 @@ asm void daTbox2_c::setGetDemoItem() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4266 = 22500.0f; -COMPILER_STRIP_GATE(804981D8, &lit_4266); +COMPILER_STRIP_GATE(0x804981D8, &lit_4266); #pragma pop /* 804981DC-804981E0 00007C 0004+00 0/1 0/0 0/0 .rodata @4267 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4267 = 20.0f; -COMPILER_STRIP_GATE(804981DC, &lit_4267); +COMPILER_STRIP_GATE(0x804981DC, &lit_4267); +#pragma pop + +/* 804981E0-804981E0 000080 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80498254 = "R_SP01"; #pragma pop /* 80497C60-80497DA0 0012C0 0140+00 1/1 0/0 0/0 .text boxCheck__9daTbox2_cFv */ @@ -1071,18 +1101,4 @@ static asm void func_80498150() { } #pragma pop -/* 804981E0-8049825B 000080 007B+00 5/2 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_804981E0 = "Tbox2"; -SECTION_DEAD static char const* const stringBase_804981E6 = "TREASURE"; -SECTION_DEAD static char const* const stringBase_804981EF = "WAIT"; -SECTION_DEAD static char const* const stringBase_804981F4 = "OPEN"; -SECTION_DEAD static char const* const stringBase_804981F9 = "APPEAR"; -SECTION_DEAD static char const* const stringBase_80498200 = "OPEN_SHORT"; -SECTION_DEAD static char const* const stringBase_8049820B = "DEFAULT_TREASURE_SIMPLE"; -SECTION_DEAD static char const* const stringBase_80498223 = "DEFAULT_TREASURE_NOTOPEN"; -SECTION_DEAD static char const* const stringBase_8049823C = "DEFAULT_TREASURE_NORMAL"; -SECTION_DEAD static char const* const stringBase_80498254 = "R_SP01"; -#pragma pop +/* 804981E0-804981E0 000080 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/d_a_title/d_a_title.cpp b/rel/d/a/d_a_title/d_a_title.cpp index ba12f4c40c6..541b55c9d92 100644 --- a/rel/d/a/d_a_title/d_a_title.cpp +++ b/rel/d/a/d_a_title/d_a_title.cpp @@ -139,10 +139,10 @@ struct dDemo_c { static u8 m_object[4]; }; -struct Vec {}; - struct JAISoundID {}; +struct Vec {}; + struct Z2SeMgr { /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); }; @@ -310,7 +310,7 @@ extern "C" void __register_global_object(); SECTION_RODATA static u8 const lit_3772[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D67BD4, &lit_3772); +COMPILER_STRIP_GATE(0x80D67BD4, &lit_3772); /* 80D67BE0-80D67BE8 00000C 0006+02 3/3 0/0 0/0 .rodata l_arcName */ SECTION_RODATA static u8 const l_arcName[6 + 2 /* padding */] = { @@ -324,24 +324,24 @@ SECTION_RODATA static u8 const l_arcName[6 + 2 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D67BE0, &l_arcName); +COMPILER_STRIP_GATE(0x80D67BE0, &l_arcName); /* 80D67BE8-80D67BEC 000014 0004+00 3/4 0/0 0/0 .rodata @4003 */ SECTION_RODATA static f32 const lit_4003 = 1.0f; -COMPILER_STRIP_GATE(80D67BE8, &lit_4003); +COMPILER_STRIP_GATE(0x80D67BE8, &lit_4003); /* 80D67BEC-80D67BF0 000018 0004+00 0/1 0/0 0/0 .rodata @4004 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4004 = 303.0f; -COMPILER_STRIP_GATE(80D67BEC, &lit_4004); +COMPILER_STRIP_GATE(0x80D67BEC, &lit_4004); #pragma pop /* 80D67BF0-80D67BF4 00001C 0004+00 0/1 0/0 0/0 .rodata @4005 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4005 = 347.0f; -COMPILER_STRIP_GATE(80D67BF0, &lit_4005); +COMPILER_STRIP_GATE(0x80D67BF0, &lit_4005); #pragma pop /* 80D67C40-80D67C4C 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ @@ -495,7 +495,7 @@ asm daTit_HIO_c::daTit_HIO_c() { /* ############################################################################################## */ /* 80D67BF4-80D67BF8 000020 0004+00 1/1 0/0 0/0 .rodata @4030 */ SECTION_RODATA static f32 const lit_4030 = 2.0f; -COMPILER_STRIP_GATE(80D67BF4, &lit_4030); +COMPILER_STRIP_GATE(0x80D67BF4, &lit_4030); /* 80D66B54-80D66CDC 000134 0188+00 1/1 0/0 0/0 .text CreateHeap__9daTitle_cFv */ #pragma push @@ -508,6 +508,12 @@ asm void daTitle_c::CreateHeap() { #pragma pop /* ############################################################################################## */ +/* 80D67C10-80D67C10 00003C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80D67C10 = "/res/Layout/Title2D.arc"; +#pragma pop + /* 80D67D80-80D67D8C 000008 000C+00 1/1 0/0 0/0 .bss @3998 */ static u8 lit_3998[12]; @@ -543,7 +549,7 @@ SECTION_RODATA static u8 const lit_4139[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D67BF8, &lit_4139); +COMPILER_STRIP_GATE(0x80D67BF8, &lit_4139); /* 80D66E9C-80D66F34 00047C 0098+00 1/1 0/0 0/0 .text Execute__9daTitle_cFv */ #pragma push @@ -575,6 +581,14 @@ asm void daTitle_c::loadWait_init() { } #pragma pop +/* ############################################################################################## */ +/* 80D67C10-80D67C10 00003C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80D67C28 = "zelda_press_start.blo"; +SECTION_DEAD static char const* const stringBase_80D67C3E = ""; +#pragma pop + /* 80D6701C-80D672E0 0005FC 02C4+00 1/0 0/0 0/0 .text loadWait_proc__9daTitle_cFv */ #pragma push #pragma optimization_level 0 @@ -642,7 +656,7 @@ SECTION_RODATA static f32 const lit_4287[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80D67BFC, &lit_4287); +COMPILER_STRIP_GATE(0x80D67BFC, &lit_4287); /* 80D674B4-80D67544 000A94 0090+00 1/0 0/0 0/0 .text keyWait__9daTitle_cFv */ #pragma push @@ -679,7 +693,7 @@ asm void daTitle_c::nextScene_proc() { SECTION_RODATA static u8 const lit_4337[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D67C04, &lit_4337); +COMPILER_STRIP_GATE(0x80D67C04, &lit_4337); /* 80D675EC-80D676AC 000BCC 00C0+00 1/1 0/0 0/0 .text fastLogoDispInit__9daTitle_cFv */ #pragma push @@ -716,7 +730,7 @@ asm void daTitle_c::getDemoPrm() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4453 = -430.0f; -COMPILER_STRIP_GATE(80D67C0C, &lit_4453); +COMPILER_STRIP_GATE(0x80D67C0C, &lit_4453); #pragma pop /* 80D67768-80D6786C 000D48 0104+00 1/1 0/0 0/0 .text Draw__9daTitle_cFv */ @@ -816,7 +830,7 @@ asm void __sinit_d_a_title_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80D67A50 = (void*)__sinit_d_a_title_cpp; +REGISTER_CTORS(0x80D67A50, __sinit_d_a_title_cpp); #pragma pop /* 80D67B30-80D67B78 001110 0048+00 1/0 0/0 0/0 .text __dt__15dDlst_daTitle_cFv */ @@ -839,11 +853,4 @@ asm J3DFrameCtrl::~J3DFrameCtrl() { } #pragma pop -/* 80D67C10-80D67C3F 00003C 002F+00 2/3 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80D67C10 = "/res/Layout/Title2D.arc"; -SECTION_DEAD static char const* const stringBase_80D67C28 = "zelda_press_start.blo"; -SECTION_DEAD static char const* const stringBase_80D67C3E = ""; -#pragma pop +/* 80D67C10-80D67C10 00003C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/d_a_vrbox/d_a_vrbox.cpp b/rel/d/a/d_a_vrbox/d_a_vrbox.cpp index a589611ace2..3d68f24ea3c 100644 --- a/rel/d/a/d_a_vrbox/d_a_vrbox.cpp +++ b/rel/d/a/d_a_vrbox/d_a_vrbox.cpp @@ -80,11 +80,11 @@ SECTION_RODATA static u8 const lit_3695[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80498990, &lit_3695); +COMPILER_STRIP_GATE(0x80498990, &lit_3695); /* 80498994-80498998 000004 0004+00 1/1 0/0 0/0 .rodata @3696 */ SECTION_RODATA static f32 const lit_3696 = 9.0f / 100.0f; -COMPILER_STRIP_GATE(80498994, &lit_3696); +COMPILER_STRIP_GATE(0x80498994, &lit_3696); /* 80498518-804986B8 000078 01A0+00 1/0 0/0 0/0 .text daVrbox_Draw__FP11vrbox_class */ #pragma push @@ -123,6 +123,13 @@ static bool daVrbox_Delete(vrbox_class* param_0) { return true; } +/* ############################################################################################## */ +/* 80498998-80498998 000008 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80498998 = "vrbox_sora.bmd"; +#pragma pop + /* 80498868-804988DC 0003C8 0074+00 1/1 0/0 0/0 .text daVrbox_solidHeapCB__FP10fopAc_ac_c */ #pragma push @@ -167,9 +174,4 @@ SECTION_DATA extern void* g_profile_VRBOX[12] = { (void*)0x00044000, (void*)NULL, }; -/* 80498998-804989A7 000008 000F+00 1/1 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80498998 = "vrbox_sora.bmd"; -#pragma pop +/* 80498998-80498998 000008 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/d_a_vrbox2/d_a_vrbox2.cpp b/rel/d/a/d_a_vrbox2/d_a_vrbox2.cpp index d5453769eed..3bfe966cc52 100644 --- a/rel/d/a/d_a_vrbox2/d_a_vrbox2.cpp +++ b/rel/d/a/d_a_vrbox2/d_a_vrbox2.cpp @@ -122,7 +122,7 @@ extern "C" extern u8 struct_80450D64[4]; /* ############################################################################################## */ /* 80499A6C-80499A70 000000 0004+00 4/4 0/0 0/0 .rodata @3627 */ SECTION_RODATA static f32 const lit_3627 = 1.0f; -COMPILER_STRIP_GATE(80499A6C, &lit_3627); +COMPILER_STRIP_GATE(0x80499A6C, &lit_3627); /* 80499A70-80499A74 000004 0004+00 1/3 0/0 0/0 .rodata @3628 */ SECTION_RODATA static u8 const lit_3628[4] = { @@ -131,7 +131,7 @@ SECTION_RODATA static u8 const lit_3628[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80499A70, &lit_3628); +COMPILER_STRIP_GATE(0x80499A70, &lit_3628); /* 80498A78-80498ACC 000078 0054+00 1/1 0/0 0/0 .text texScrollCheck__FRf */ #pragma push @@ -148,81 +148,88 @@ static asm void texScrollCheck(f32& param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3835 = 9.0f / 100.0f; -COMPILER_STRIP_GATE(80499A74, &lit_3835); +COMPILER_STRIP_GATE(0x80499A74, &lit_3835); #pragma pop /* 80499A78-80499A7C 00000C 0004+00 0/1 0/0 0/0 .rodata @3836 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3836 = 8000.0f; -COMPILER_STRIP_GATE(80499A78, &lit_3836); +COMPILER_STRIP_GATE(0x80499A78, &lit_3836); #pragma pop /* 80499A7C-80499A80 000010 0004+00 1/3 0/0 0/0 .rodata @3837 */ SECTION_RODATA static f32 const lit_3837 = 255.0f; -COMPILER_STRIP_GATE(80499A7C, &lit_3837); +COMPILER_STRIP_GATE(0x80499A7C, &lit_3837); /* 80499A80-80499A84 000014 0004+00 0/1 0/0 0/0 .rodata @3838 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3838 = 2.0f / 5.0f; -COMPILER_STRIP_GATE(80499A80, &lit_3838); +COMPILER_STRIP_GATE(0x80499A80, &lit_3838); #pragma pop /* 80499A84-80499A88 000018 0004+00 0/1 0/0 0/0 .rodata @3839 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3839 = 270.0f; -COMPILER_STRIP_GATE(80499A84, &lit_3839); +COMPILER_STRIP_GATE(0x80499A84, &lit_3839); #pragma pop /* 80499A88-80499A8C 00001C 0004+00 0/1 0/0 0/0 .rodata @3840 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3840 = 240.0f; -COMPILER_STRIP_GATE(80499A88, &lit_3840); +COMPILER_STRIP_GATE(0x80499A88, &lit_3840); #pragma pop /* 80499A8C-80499A90 000020 0004+00 0/2 0/0 0/0 .rodata @3841 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3841 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(80499A8C, &lit_3841); +COMPILER_STRIP_GATE(0x80499A8C, &lit_3841); #pragma pop /* 80499A90-80499A94 000024 0004+00 0/1 0/0 0/0 .rodata @3842 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3842 = 300.0f; -COMPILER_STRIP_GATE(80499A90, &lit_3842); +COMPILER_STRIP_GATE(0x80499A90, &lit_3842); #pragma pop /* 80499A94-80499A98 000028 0004+00 0/1 0/0 0/0 .rodata @3843 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3843 = 17.0f / 20.0f; -COMPILER_STRIP_GATE(80499A94, &lit_3843); +COMPILER_STRIP_GATE(0x80499A94, &lit_3843); #pragma pop /* 80499A98-80499A9C 00002C 0004+00 0/1 0/0 0/0 .rodata @3844 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3844 = 3.0f / 20.0f; -COMPILER_STRIP_GATE(80499A98, &lit_3844); +COMPILER_STRIP_GATE(0x80499A98, &lit_3844); #pragma pop /* 80499A9C-80499AA0 000030 0004+00 0/1 0/0 0/0 .rodata @3845 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3845 = 483.0f; -COMPILER_STRIP_GATE(80499A9C, &lit_3845); +COMPILER_STRIP_GATE(0x80499A9C, &lit_3845); #pragma pop /* 80499AA0-80499AA4 000034 0004+00 0/1 0/0 0/0 .rodata @3846 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3846 = 100.0f; -COMPILER_STRIP_GATE(80499AA0, &lit_3846); +COMPILER_STRIP_GATE(0x80499AA0, &lit_3846); +#pragma pop + +/* 80499AC4-80499AC4 000058 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80499AC4 = "F_SP102"; +SECTION_DEAD static char const* const stringBase_80499ACC = "F_SP127"; #pragma pop /* 80499B78-80499B7C 000000 0002+02 1/1 0/0 0/0 .bss mangZ$3688 */ @@ -243,56 +250,62 @@ static asm void daVrbox2_Draw(vrbox2_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4069 = 0x3A03126F; -COMPILER_STRIP_GATE(80499AA4, &lit_4069); +COMPILER_STRIP_GATE(0x80499AA4, &lit_4069); #pragma pop /* 80499AA8-80499AAC 00003C 0004+00 0/1 0/0 0/0 .rodata @4070 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4070 = 3.0f / 10.0f; -COMPILER_STRIP_GATE(80499AA8, &lit_4070); +COMPILER_STRIP_GATE(0x80499AA8, &lit_4070); #pragma pop /* 80499AAC-80499AB0 000040 0004+00 0/1 0/0 0/0 .rodata @4071 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4071 = 1.75f; -COMPILER_STRIP_GATE(80499AAC, &lit_4071); +COMPILER_STRIP_GATE(0x80499AAC, &lit_4071); #pragma pop /* 80499AB0-80499AB4 000044 0004+00 0/1 0/0 0/0 .rodata @4072 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4072 = 22.0f / 5.0f; -COMPILER_STRIP_GATE(80499AB0, &lit_4072); +COMPILER_STRIP_GATE(0x80499AB0, &lit_4072); #pragma pop /* 80499AB4-80499AB8 000048 0004+00 0/1 0/0 0/0 .rodata @4073 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4073 = 11.0f / 5.0f; -COMPILER_STRIP_GATE(80499AB4, &lit_4073); +COMPILER_STRIP_GATE(0x80499AB4, &lit_4073); #pragma pop /* 80499AB8-80499ABC 00004C 0004+00 0/1 0/0 0/0 .rodata @4074 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4074 = 97.5f; -COMPILER_STRIP_GATE(80499AB8, &lit_4074); +COMPILER_STRIP_GATE(0x80499AB8, &lit_4074); #pragma pop /* 80499ABC-80499AC0 000050 0004+00 0/1 0/0 0/0 .rodata @4075 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4075 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(80499ABC, &lit_4075); +COMPILER_STRIP_GATE(0x80499ABC, &lit_4075); #pragma pop /* 80499AC0-80499AC4 000054 0004+00 0/1 0/0 0/0 .rodata @4076 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4076 = 0x38D1B717; -COMPILER_STRIP_GATE(80499AC0, &lit_4076); +COMPILER_STRIP_GATE(0x80499AC0, &lit_4076); +#pragma pop + +/* 80499AC4-80499AC4 000058 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80499AD4 = "R_SP30"; #pragma pop /* 804990DC-804997E8 0006DC 070C+00 1/1 0/0 0/0 .text daVrbox2_color_set__FP12vrbox2_class */ @@ -328,6 +341,16 @@ static bool daVrbox2_Delete(vrbox2_class* param_0) { return true; } +/* ############################################################################################## */ +/* 80499AC4-80499AC4 000058 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80499ADB = "vrbox_kumo.bmd"; +SECTION_DEAD static char const* const stringBase_80499AEA = "vrbox_sun.bmd"; +SECTION_DEAD static char const* const stringBase_80499AF8 = "vrbox_sun.btk"; +SECTION_DEAD static char const* const stringBase_80499B06 = "vrbox_kasumiM.bmd"; +#pragma pop + /* 8049983C-80499978 000E3C 013C+00 1/1 0/0 0/0 .text daVrbox2_solidHeapCB__FP10fopAc_ac_c */ #pragma push #pragma optimization_level 0 @@ -388,15 +411,4 @@ asm J3DFrameCtrl::~J3DFrameCtrl() { } #pragma pop -/* 80499AC4-80499B18 000058 0054+00 3/3 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80499AC4 = "F_SP102"; -SECTION_DEAD static char const* const stringBase_80499ACC = "F_SP127"; -SECTION_DEAD static char const* const stringBase_80499AD4 = "R_SP30"; -SECTION_DEAD static char const* const stringBase_80499ADB = "vrbox_kumo.bmd"; -SECTION_DEAD static char const* const stringBase_80499AEA = "vrbox_sun.bmd"; -SECTION_DEAD static char const* const stringBase_80499AF8 = "vrbox_sun.btk"; -SECTION_DEAD static char const* const stringBase_80499B06 = "vrbox_kasumiM.bmd"; -#pragma pop +/* 80499AC4-80499AC4 000058 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/d_a_warp_bug/d_a_warp_bug.cpp b/rel/d/a/d_a_warp_bug/d_a_warp_bug.cpp index 8ba21794117..0f45e7e5300 100644 --- a/rel/d/a/d_a_warp_bug/d_a_warp_bug.cpp +++ b/rel/d/a/d_a_warp_bug/d_a_warp_bug.cpp @@ -105,7 +105,16 @@ void daWarpBug_c::create_init() { /* ############################################################################################## */ /* 80D681DC-80D681E0 000000 0004+00 1/1 0/0 0/0 .rodata @3709 */ SECTION_RODATA static f32 const lit_3709 = 1.0f; -COMPILER_STRIP_GATE(80D681DC, &lit_3709); +COMPILER_STRIP_GATE(0x80D681DC, &lit_3709); + +/* 80D681E0-80D681E0 000004 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80D681E0 = "WarpBug"; +SECTION_DEAD static char const* const stringBase_80D681E8 = "kisei.bmd"; +SECTION_DEAD static char const* const stringBase_80D681F2 = "kisei.brk"; +SECTION_DEAD static char const* const stringBase_80D681FC = "kisei.btk"; +#pragma pop /* 80D68208-80D6820C -00001 0004+00 3/3 0/0 0/0 .data l_arcName */ SECTION_DATA static void* l_arcName = (void*)&d_a_warp_bug__stringBase0; @@ -217,12 +226,4 @@ static asm void daWarpBug_Create(fopAc_ac_c* param_0) { } #pragma pop -/* 80D681E0-80D68206 000004 0026+00 2/1 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80D681E0 = "WarpBug"; -SECTION_DEAD static char const* const stringBase_80D681E8 = "kisei.bmd"; -SECTION_DEAD static char const* const stringBase_80D681F2 = "kisei.brk"; -SECTION_DEAD static char const* const stringBase_80D681FC = "kisei.btk"; -#pragma pop +/* 80D681E0-80D681E0 000004 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/d_a_ykgr/d_a_ykgr.cpp b/rel/d/a/d_a_ykgr/d_a_ykgr.cpp index 2ecd5061616..ee219511057 100644 --- a/rel/d/a/d_a_ykgr/d_a_ykgr.cpp +++ b/rel/d/a/d_a_ykgr/d_a_ykgr.cpp @@ -37,13 +37,13 @@ struct daYkgr_HIO_c { struct dPa_levelEcallBack {}; -struct cXyz {}; - struct dKy_tevstr_c {}; +struct csXyz {}; + struct _GXColor {}; -struct csXyz {}; +struct cXyz {}; struct dPa_control_c { /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, @@ -152,13 +152,13 @@ asm void dPa_YkgrPcallBack::draw(JPABaseEmitter* param_0, JPABaseParticle* param /* ############################################################################################## */ /* 805A8FBC-805A8FC0 000000 0004+00 6/6 0/0 0/0 .rodata @3759 */ SECTION_RODATA static f32 const lit_3759 = -17.0f; -COMPILER_STRIP_GATE(805A8FBC, &lit_3759); +COMPILER_STRIP_GATE(0x805A8FBC, &lit_3759); /* 805A8FC0-805A8FC4 000004 0004+00 0/1 0/0 0/0 .rodata @3760 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3760 = 47.0f; -COMPILER_STRIP_GATE(805A8FC0, &lit_3760); +COMPILER_STRIP_GATE(0x805A8FC0, &lit_3760); #pragma pop /* 805A8FC4-805A8FC8 000008 0004+00 0/5 0/0 0/0 .rodata @3761 */ @@ -170,14 +170,14 @@ SECTION_RODATA static u8 const lit_3761[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(805A8FC4, &lit_3761); +COMPILER_STRIP_GATE(0x805A8FC4, &lit_3761); #pragma pop /* 805A8FC8-805A8FCC 00000C 0004+00 0/4 0/0 0/0 .rodata @3762 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3762 = 0.5f; -COMPILER_STRIP_GATE(805A8FC8, &lit_3762); +COMPILER_STRIP_GATE(0x805A8FC8, &lit_3762); #pragma pop /* 805A8FCC-805A8FD4 000010 0004+04 0/4 0/0 0/0 .rodata @3763 */ @@ -188,7 +188,7 @@ SECTION_RODATA static f32 const lit_3763[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(805A8FCC, &lit_3763); +COMPILER_STRIP_GATE(0x805A8FCC, &lit_3763); #pragma pop /* 805A8FD4-805A8FDC 000018 0008+00 0/2 0/0 0/0 .rodata @3766 */ @@ -197,7 +197,7 @@ COMPILER_STRIP_GATE(805A8FCC, &lit_3763); SECTION_RODATA static u8 const lit_3766[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(805A8FD4, &lit_3766); +COMPILER_STRIP_GATE(0x805A8FD4, &lit_3766); #pragma pop /* 805A84D4-805A85D4 000134 0100+00 2/2 0/0 0/0 .text setParam__17dPa_YkgrPcallBackFf */ @@ -217,7 +217,7 @@ asm void dPa_YkgrPcallBack::setParam(f32 param_0) { SECTION_RODATA static u8 const lit_3846[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(805A8FDC, &lit_3846); +COMPILER_STRIP_GATE(0x805A8FDC, &lit_3846); #pragma pop /* 805A8FE4-805A8FEC 000028 0008+00 0/1 0/0 0/0 .rodata @3847 */ @@ -226,7 +226,7 @@ COMPILER_STRIP_GATE(805A8FDC, &lit_3846); SECTION_RODATA static u8 const lit_3847[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(805A8FE4, &lit_3847); +COMPILER_STRIP_GATE(0x805A8FE4, &lit_3847); #pragma pop /* 805A8FEC-805A8FF4 000030 0008+00 0/1 0/0 0/0 .rodata @3848 */ @@ -235,7 +235,7 @@ COMPILER_STRIP_GATE(805A8FE4, &lit_3847); SECTION_RODATA static u8 const lit_3848[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(805A8FEC, &lit_3848); +COMPILER_STRIP_GATE(0x805A8FEC, &lit_3848); #pragma pop /* 805A90B8-805A90BC 000008 0001+03 1/1 0/0 0/0 .bss @1109 */ @@ -355,7 +355,7 @@ asm void daYkgr_c::getPosRate() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3951 = -3.0f; -COMPILER_STRIP_GATE(805A8FF4, &lit_3951); +COMPILER_STRIP_GATE(0x805A8FF4, &lit_3951); #pragma pop /* 805A912C-805A9138 00007C 000C+00 0/1 0/0 0/0 .bss @3851 */ @@ -387,14 +387,14 @@ static bool daYkgrDelete(void* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3976 = 0.25f; -COMPILER_STRIP_GATE(805A8FF8, &lit_3976); +COMPILER_STRIP_GATE(0x805A8FF8, &lit_3976); #pragma pop /* 805A8FFC-805A9000 000040 0004+00 0/1 0/0 0/0 .rodata @3977 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3977 = 1.0f / 20.0f; -COMPILER_STRIP_GATE(805A8FFC, &lit_3977); +COMPILER_STRIP_GATE(0x805A8FFC, &lit_3977); #pragma pop /* 805A8A50-805A8BBC 0006B0 016C+00 1/0 0/0 0/0 .text daYkgrExecute__FPv */ @@ -412,14 +412,20 @@ static asm void daYkgrExecute(void* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4032 = 100.0f; -COMPILER_STRIP_GATE(805A9000, &lit_4032); +COMPILER_STRIP_GATE(0x805A9000, &lit_4032); #pragma pop /* 805A9004-805A9008 000048 0004+00 0/1 0/0 0/0 .rodata @4033 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4033 = 255.0f; -COMPILER_STRIP_GATE(805A9004, &lit_4033); +COMPILER_STRIP_GATE(0x805A9004, &lit_4033); +#pragma pop + +/* 805A9018-805A9018 00005C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_805A9018 = "D_MN04A"; #pragma pop /* 805A8BBC-805A8D90 00081C 01D4+00 1/0 0/0 0/0 .text daYkgrDraw__FPv */ @@ -533,28 +539,28 @@ void JPAParticleCallBack::execute(JPABaseEmitter* param_0, JPABaseParticle* para #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4061 = -16.0f; -COMPILER_STRIP_GATE(805A9008, &lit_4061); +COMPILER_STRIP_GATE(0x805A9008, &lit_4061); #pragma pop /* 805A900C-805A9010 000050 0004+00 0/1 0/0 0/0 .rodata @4062 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4062 = -5.0f; -COMPILER_STRIP_GATE(805A900C, &lit_4062); +COMPILER_STRIP_GATE(0x805A900C, &lit_4062); #pragma pop /* 805A9010-805A9014 000054 0004+00 0/1 0/0 0/0 .rodata @4063 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4063 = 1500.0f; -COMPILER_STRIP_GATE(805A9010, &lit_4063); +COMPILER_STRIP_GATE(0x805A9010, &lit_4063); #pragma pop /* 805A9014-805A9018 000058 0004+00 0/1 0/0 0/0 .rodata @4064 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4064 = 500.0f; -COMPILER_STRIP_GATE(805A9014, &lit_4064); +COMPILER_STRIP_GATE(0x805A9014, &lit_4064); #pragma pop /* 805A8EA0-805A8FA4 000B00 0104+00 0/0 1/0 0/0 .text __sinit_d_a_ykgr_cpp */ @@ -569,7 +575,7 @@ asm void __sinit_d_a_ykgr_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_805A8EA0 = (void*)__sinit_d_a_ykgr_cpp; +REGISTER_CTORS(0x805A8EA0, __sinit_d_a_ykgr_cpp); #pragma pop /* 805A8FA4-805A8FA8 000C04 0004+00 1/0 0/0 0/0 .text @@ -750,9 +756,4 @@ static u8 data_805A91B4[4]; static u8 data_805A91B8[4]; #pragma pop -/* 805A9018-805A9020 00005C 0008+00 1/1 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_805A9018 = "D_MN04A"; -#pragma pop +/* 805A9018-805A9018 00005C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/door/d_a_door_boss/d_a_door_boss.cpp b/rel/d/a/door/d_a_door_boss/d_a_door_boss.cpp index 22a8b610403..357febef7ff 100644 --- a/rel/d/a/door/d_a_door_boss/d_a_door_boss.cpp +++ b/rel/d/a/door/d_a_door_boss/d_a_door_boss.cpp @@ -329,6 +329,13 @@ extern "C" extern u8 data_80670BB0[4]; // Declarations: // +/* ############################################################################################## */ +/* 80670984-80670984 000070 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80670984 = "Z_bdor00"; +#pragma pop + /* 8066F418-8066F424 000078 000C+00 4/4 0/0 0/0 .text getArcName__9daBdoor_cFv */ #pragma push #pragma optimization_level 0 @@ -339,6 +346,13 @@ asm void daBdoor_c::getArcName() { } #pragma pop +/* ############################################################################################## */ +/* 80670984-80670984 000070 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8067098D = "Z_bdor00.bmd"; +#pragma pop + /* 8066F424-8066F434 000084 0010+00 1/1 0/0 0/0 .text getBmd__9daBdoor_cFv */ #pragma push #pragma optimization_level 0 @@ -349,6 +363,13 @@ asm void daBdoor_c::getBmd() { } #pragma pop +/* ############################################################################################## */ +/* 80670984-80670984 000070 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8067099A = "door30.dzb"; +#pragma pop + /* 8066F434-8066F444 000094 0010+00 1/1 0/0 0/0 .text getDzb__9daBdoor_cFv */ #pragma push #pragma optimization_level 0 @@ -359,6 +380,13 @@ asm void daBdoor_c::getDzb() { } #pragma pop +/* ############################################################################################## */ +/* 80670984-80670984 000070 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_806709A5 = "door_shutterBoss.bmd"; +#pragma pop + /* 8066F444-8066F454 0000A4 0010+00 1/1 0/0 0/0 .text getBmd2__9daBdoor_cFv */ #pragma push #pragma optimization_level 0 @@ -392,7 +420,25 @@ static asm void CheckCreateHeap(fopAc_ac_c* param_0) { /* ############################################################################################## */ /* 80670914-80670918 000000 0004+00 4/4 0/0 0/0 .rodata @3726 */ SECTION_RODATA static f32 const lit_3726 = 1.0f; -COMPILER_STRIP_GATE(80670914, &lit_3726); +COMPILER_STRIP_GATE(0x80670914, &lit_3726); + +/* 80670984-80670984 000070 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_806709BA = "VlockB.bmd"; +SECTION_DEAD static char const* const stringBase_806709C5 = "VlockB.bck"; +SECTION_DEAD static char const* const stringBase_806709D0 = "WAIT"; +SECTION_DEAD static char const* const stringBase_806709D5 = "UNLOCK"; +SECTION_DEAD static char const* const stringBase_806709DC = "OPEN"; +SECTION_DEAD static char const* const stringBase_806709E1 = "SETGOAL"; +SECTION_DEAD static char const* const stringBase_806709E9 = "SETGOAL2"; +SECTION_DEAD static char const* const stringBase_806709F2 = "CLOSE"; +SECTION_DEAD static char const* const stringBase_806709F8 = "SMOKE"; +SECTION_DEAD static char const* const stringBase_806709FE = "SMOKE_END"; +SECTION_DEAD static char const* const stringBase_80670A08 = "END"; +SECTION_DEAD static char const* const stringBase_80670A0C = "END_CHECK"; +SECTION_DEAD static char const* const stringBase_80670A16 = "CHG_SCENE"; +#pragma pop /* 80670A20-80670A2C 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { @@ -579,7 +625,7 @@ asm J3DFrameCtrl::~J3DFrameCtrl() { /* ############################################################################################## */ /* 80670918-8067091C 000004 0004+00 1/1 0/0 0/0 .rodata @3755 */ SECTION_RODATA static f32 const lit_3755 = 300.0f; -COMPILER_STRIP_GATE(80670918, &lit_3755); +COMPILER_STRIP_GATE(0x80670918, &lit_3755); /* 8066F738-8066F7EC 000398 00B4+00 3/3 0/0 0/0 .text calcMtx__9daBdoor_cFv */ #pragma push @@ -594,7 +640,7 @@ asm void daBdoor_c::calcMtx() { /* ############################################################################################## */ /* 8067091C-80670920 000008 0004+00 1/1 0/0 0/0 .rodata @3769 */ SECTION_RODATA static f32 const lit_3769 = 250.0f; -COMPILER_STRIP_GATE(8067091C, &lit_3769); +COMPILER_STRIP_GATE(0x8067091C, &lit_3769); /* 80670920-80670924 00000C 0004+00 2/4 0/0 0/0 .rodata @3770 */ SECTION_RODATA static u8 const lit_3770[4] = { @@ -603,7 +649,7 @@ SECTION_RODATA static u8 const lit_3770[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80670920, &lit_3770); +COMPILER_STRIP_GATE(0x80670920, &lit_3770); /* 8066F7EC-8066F8E4 00044C 00F8+00 1/1 0/0 0/0 .text CreateInit__9daBdoor_cFv */ #pragma push @@ -670,49 +716,49 @@ asm void daBdoor_c::demoProc() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3934 = -1.0f; -COMPILER_STRIP_GATE(80670924, &lit_3934); +COMPILER_STRIP_GATE(0x80670924, &lit_3934); #pragma pop /* 80670928-8067092C 000014 0004+00 0/0 0/0 0/0 .rodata @3935 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3935 = 60.0f; -COMPILER_STRIP_GATE(80670928, &lit_3935); +COMPILER_STRIP_GATE(0x80670928, &lit_3935); #pragma pop /* 8067092C-80670930 000018 0004+00 0/0 0/0 0/0 .rodata @3936 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3936 = 6.0f; -COMPILER_STRIP_GATE(8067092C, &lit_3936); +COMPILER_STRIP_GATE(0x8067092C, &lit_3936); #pragma pop /* 80670930-80670934 00001C 0004+00 0/0 0/0 0/0 .rodata @3937 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3937 = 600.0f; -COMPILER_STRIP_GATE(80670930, &lit_3937); +COMPILER_STRIP_GATE(0x80670930, &lit_3937); #pragma pop /* 80670934-80670938 000020 0004+00 0/1 0/0 0/0 .rodata @3968 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3968 = 0.5f; -COMPILER_STRIP_GATE(80670934, &lit_3968); +COMPILER_STRIP_GATE(0x80670934, &lit_3968); #pragma pop /* 80670938-8067093C 000024 0004+00 0/1 0/0 0/0 .rodata @3969 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3969 = -1000.0f; -COMPILER_STRIP_GATE(80670938, &lit_3969); +COMPILER_STRIP_GATE(0x80670938, &lit_3969); #pragma pop /* 8067093C-80670940 000028 0004+00 0/1 0/0 0/0 .rodata @3970 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3970 = -240.0f; -COMPILER_STRIP_GATE(8067093C, &lit_3970); +COMPILER_STRIP_GATE(0x8067093C, &lit_3970); #pragma pop /* 8066FF04-8067002C 000B64 0128+00 1/1 0/0 0/0 .text calcGoal__9daBdoor_cFP4cXyzi */ @@ -738,7 +784,7 @@ asm void daBdoor_c::smokeInit() { /* ############################################################################################## */ /* 80670940-80670944 00002C 0004+00 1/1 0/0 0/0 .rodata @4028 */ SECTION_RODATA static f32 const lit_4028 = 200.0f; -COMPILER_STRIP_GATE(80670940, &lit_4028); +COMPILER_STRIP_GATE(0x80670940, &lit_4028); /* 80670944-8067094C 000030 0004+04 1/1 0/0 0/0 .rodata @4029 */ SECTION_RODATA static f32 const lit_4029[1 + 1 /* padding */] = { @@ -746,13 +792,13 @@ SECTION_RODATA static f32 const lit_4029[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80670944, &lit_4029); +COMPILER_STRIP_GATE(0x80670944, &lit_4029); /* 8067094C-80670954 000038 0008+00 1/1 0/0 0/0 .rodata @4031 */ SECTION_RODATA static u8 const lit_4031[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8067094C, &lit_4031); +COMPILER_STRIP_GATE(0x8067094C, &lit_4031); /* 806700C4-806701F4 000D24 0130+00 1/1 0/0 0/0 .text checkArea__9daBdoor_cFv */ #pragma push @@ -818,7 +864,7 @@ SECTION_RODATA static u8 const l_door_open_demo[21 + 3 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80670954, &l_door_open_demo); +COMPILER_STRIP_GATE(0x80670954, &l_door_open_demo); /* 8067096C-8067097C 000058 000D+03 2/2 0/0 0/0 .rodata l_staff_name */ SECTION_RODATA static u8 const l_staff_name[13 + 3 /* padding */] = { @@ -840,7 +886,7 @@ SECTION_RODATA static u8 const l_staff_name[13 + 3 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(8067096C, &l_staff_name); +COMPILER_STRIP_GATE(0x8067096C, &l_staff_name); /* 80670328-806703C0 000F88 0098+00 1/0 0/0 0/0 .text actionCloseWait__9daBdoor_cFv */ #pragma push @@ -867,14 +913,14 @@ asm void daBdoor_c::actionOpen() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4143 = 180.0f; -COMPILER_STRIP_GATE(8067097C, &lit_4143); +COMPILER_STRIP_GATE(0x8067097C, &lit_4143); #pragma pop /* 80670980-80670984 00006C 0004+00 0/1 0/0 0/0 .rodata @4144 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4144 = -180.0f; -COMPILER_STRIP_GATE(80670980, &lit_4144); +COMPILER_STRIP_GATE(0x80670980, &lit_4144); #pragma pop /* 806703E4-80670544 001044 0160+00 1/0 0/0 0/0 .text actionEnd__9daBdoor_cFv */ @@ -987,25 +1033,4 @@ static asm void func_80670904() { } #pragma pop -/* 80670984-80670A20 000070 009C+00 6/5 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80670984 = "Z_bdor00"; -SECTION_DEAD static char const* const stringBase_8067098D = "Z_bdor00.bmd"; -SECTION_DEAD static char const* const stringBase_8067099A = "door30.dzb"; -SECTION_DEAD static char const* const stringBase_806709A5 = "door_shutterBoss.bmd"; -SECTION_DEAD static char const* const stringBase_806709BA = "VlockB.bmd"; -SECTION_DEAD static char const* const stringBase_806709C5 = "VlockB.bck"; -SECTION_DEAD static char const* const stringBase_806709D0 = "WAIT"; -SECTION_DEAD static char const* const stringBase_806709D5 = "UNLOCK"; -SECTION_DEAD static char const* const stringBase_806709DC = "OPEN"; -SECTION_DEAD static char const* const stringBase_806709E1 = "SETGOAL"; -SECTION_DEAD static char const* const stringBase_806709E9 = "SETGOAL2"; -SECTION_DEAD static char const* const stringBase_806709F2 = "CLOSE"; -SECTION_DEAD static char const* const stringBase_806709F8 = "SMOKE"; -SECTION_DEAD static char const* const stringBase_806709FE = "SMOKE_END"; -SECTION_DEAD static char const* const stringBase_80670A08 = "END"; -SECTION_DEAD static char const* const stringBase_80670A0C = "END_CHECK"; -SECTION_DEAD static char const* const stringBase_80670A16 = "CHG_SCENE"; -#pragma pop +/* 80670984-80670984 000070 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/door/d_a_door_bossL5/d_a_door_bossL5.cpp b/rel/d/a/door/d_a_door_bossL5/d_a_door_bossL5.cpp index 664fd0e3a69..0377e72baac 100644 --- a/rel/d/a/door/d_a_door_bossL5/d_a_door_bossL5.cpp +++ b/rel/d/a/door/d_a_door_bossL5/d_a_door_bossL5.cpp @@ -252,7 +252,7 @@ extern "C" static void daBdoorL5_Draw__FP11daBdoorL5_c(); extern "C" static void daBdoorL5_Execute__FP11daBdoorL5_c(); extern "C" static void daBdoorL5_Delete__FP11daBdoorL5_c(); extern "C" static void daBdoorL5_Create__FP10fopAc_ac_c(); -extern "C" void func_80672494(u8*); +extern "C" void func_80672494(void* _this, u8*); extern "C" static void func_806724B0(); extern "C" static void func_806724B8(); extern "C" extern char const* const d_a_door_bossL5__stringBase0; @@ -341,6 +341,13 @@ extern "C" extern u8 data_806727A0[4]; // Declarations: // +/* ############################################################################################## */ +/* 80672548-80672548 000080 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80672548 = "Z_bdor00"; +#pragma pop + /* 80670C38-80670C44 000078 000C+00 4/4 0/0 0/0 .text getArcName__11daBdoorL5_cFv */ #pragma push #pragma optimization_level 0 @@ -351,6 +358,13 @@ asm void daBdoorL5_c::getArcName() { } #pragma pop +/* ############################################################################################## */ +/* 80672548-80672548 000080 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80672551 = "static"; +#pragma pop + /* 80670C44-80670C54 000084 0010+00 3/3 0/0 0/0 .text getAlwaysArcName__11daBdoorL5_cFv */ #pragma push @@ -362,6 +376,13 @@ asm void daBdoorL5_c::getAlwaysArcName() { } #pragma pop +/* ############################################################################################## */ +/* 80672548-80672548 000080 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80672558 = "Z_bdor00.bmd"; +#pragma pop + /* 80670C54-80670C64 000094 0010+00 1/1 0/0 0/0 .text getBmd__11daBdoorL5_cFv */ #pragma push #pragma optimization_level 0 @@ -372,6 +393,13 @@ asm void daBdoorL5_c::getBmd() { } #pragma pop +/* ############################################################################################## */ +/* 80672548-80672548 000080 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80672565 = "door-shutterBoss.dzb"; +#pragma pop + /* 80670C64-80670C74 0000A4 0010+00 1/1 0/0 0/0 .text getDzb__11daBdoorL5_cFv */ #pragma push #pragma optimization_level 0 @@ -382,6 +410,13 @@ asm void daBdoorL5_c::getDzb() { } #pragma pop +/* ############################################################################################## */ +/* 80672548-80672548 000080 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8067257A = "BDoorTAnm"; +#pragma pop + /* 80670C74-80670C84 0000B4 0010+00 5/5 0/0 0/0 .text getAnmArcName__11daBdoorL5_cFv */ #pragma push #pragma optimization_level 0 @@ -452,7 +487,7 @@ SECTION_RODATA static u8 const l_door_open_demo[22 + 2 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(806724C8, &l_door_open_demo); +COMPILER_STRIP_GATE(0x806724C8, &l_door_open_demo); /* 806724E0-806724FC 000018 001A+02 0/1 0/0 0/0 .rodata l_door_open_demo_1st */ #pragma push @@ -488,7 +523,7 @@ SECTION_RODATA static u8 const l_door_open_demo_1st[26 + 2 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(806724E0, &l_door_open_demo_1st); +COMPILER_STRIP_GATE(0x806724E0, &l_door_open_demo_1st); #pragma pop /* 806724FC-8067250C 000034 000D+03 3/3 0/0 0/0 .rodata l_staff_name */ @@ -511,11 +546,30 @@ SECTION_RODATA static u8 const l_staff_name[13 + 3 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(806724FC, &l_staff_name); +COMPILER_STRIP_GATE(0x806724FC, &l_staff_name); /* 8067250C-80672510 000044 0004+00 5/6 0/0 0/0 .rodata @3757 */ SECTION_RODATA static f32 const lit_3757 = 1.0f; -COMPILER_STRIP_GATE(8067250C, &lit_3757); +COMPILER_STRIP_GATE(0x8067250C, &lit_3757); + +/* 80672548-80672548 000080 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80672584 = "WAIT"; +SECTION_DEAD static char const* const stringBase_80672589 = "UNLOCK"; +SECTION_DEAD static char const* const stringBase_80672590 = "OPEN"; +SECTION_DEAD static char const* const stringBase_80672595 = "SETGOAL"; +SECTION_DEAD static char const* const stringBase_8067259D = "SETGOAL2"; +SECTION_DEAD static char const* const stringBase_806725A6 = "CLOSE"; +SECTION_DEAD static char const* const stringBase_806725AC = "SMOKE"; +SECTION_DEAD static char const* const stringBase_806725B2 = "SMOKE_END"; +SECTION_DEAD static char const* const stringBase_806725BC = "END"; +SECTION_DEAD static char const* const stringBase_806725C0 = "END_CHECK"; +SECTION_DEAD static char const* const stringBase_806725CA = "CHG_SCENE"; +SECTION_DEAD static char const* const stringBase_806725D4 = "KEYDELETE"; +SECTION_DEAD static char const* const stringBase_806725DE = "PLY_NODISP"; +SECTION_DEAD static char const* const stringBase_806725E9 = "PLY_DISP"; +#pragma pop /* 806725F4-80672600 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { @@ -720,7 +774,7 @@ asm void daBdoorL5_c::calcMtx() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3787 = 250.0f; -COMPILER_STRIP_GATE(80672510, &lit_3787); +COMPILER_STRIP_GATE(0x80672510, &lit_3787); #pragma pop /* 80670F5C-8067106C 00039C 0110+00 1/1 0/0 0/0 .text CreateInit__11daBdoorL5_cFv */ @@ -798,12 +852,12 @@ asm void daBdoorL5_c::openInit() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3980 = 18.0f; -COMPILER_STRIP_GATE(80672514, &lit_3980); +COMPILER_STRIP_GATE(0x80672514, &lit_3980); #pragma pop /* 80672518-8067251C 000050 0004+00 2/3 0/0 0/0 .rodata @3981 */ SECTION_RODATA static f32 const lit_3981 = -1.0f; -COMPILER_STRIP_GATE(80672518, &lit_3981); +COMPILER_STRIP_GATE(0x80672518, &lit_3981); /* 80671670-80671718 000AB0 00A8+00 1/1 0/0 0/0 .text openProc__11daBdoorL5_cFv */ #pragma push @@ -848,7 +902,7 @@ SECTION_RODATA static u8 const lit_4015[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(8067251C, &lit_4015); +COMPILER_STRIP_GATE(0x8067251C, &lit_4015); /* 80671820-80671878 000C60 0058+00 1/1 0/0 0/0 .text closeEnd__11daBdoorL5_cFv */ #pragma push @@ -875,21 +929,21 @@ asm void daBdoorL5_c::unlockInit() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4063 = 0.5f; -COMPILER_STRIP_GATE(80672520, &lit_4063); +COMPILER_STRIP_GATE(0x80672520, &lit_4063); #pragma pop /* 80672524-80672528 00005C 0004+00 0/1 0/0 0/0 .rodata @4064 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4064 = -1000.0f; -COMPILER_STRIP_GATE(80672524, &lit_4064); +COMPILER_STRIP_GATE(0x80672524, &lit_4064); #pragma pop /* 80672528-8067252C 000060 0004+00 0/1 0/0 0/0 .rodata @4065 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4065 = -240.0f; -COMPILER_STRIP_GATE(80672528, &lit_4065); +COMPILER_STRIP_GATE(0x80672528, &lit_4065); #pragma pop /* 80671954-80671A7C 000D94 0128+00 1/1 0/0 0/0 .text calcGoal__11daBdoorL5_cFP4cXyzi */ @@ -915,7 +969,7 @@ asm void daBdoorL5_c::smokeInit() { /* ############################################################################################## */ /* 8067252C-80672530 000064 0004+00 1/1 0/0 0/0 .rodata @4110 */ SECTION_RODATA static f32 const lit_4110 = 50.0f; -COMPILER_STRIP_GATE(8067252C, &lit_4110); +COMPILER_STRIP_GATE(0x8067252C, &lit_4110); /* 80671B14-80671C14 000F54 0100+00 1/1 0/0 0/0 .text createKey__11daBdoorL5_cFv */ #pragma push @@ -930,17 +984,17 @@ asm void daBdoorL5_c::createKey() { /* ############################################################################################## */ /* 80672530-80672534 000068 0004+00 1/1 0/0 0/0 .rodata @4154 */ SECTION_RODATA static f32 const lit_4154 = 200.0f; -COMPILER_STRIP_GATE(80672530, &lit_4154); +COMPILER_STRIP_GATE(0x80672530, &lit_4154); /* 80672534-80672538 00006C 0004+00 1/1 0/0 0/0 .rodata @4155 */ SECTION_RODATA static f32 const lit_4155 = 100.0f; -COMPILER_STRIP_GATE(80672534, &lit_4155); +COMPILER_STRIP_GATE(0x80672534, &lit_4155); /* 80672538-80672540 000070 0008+00 1/1 0/0 0/0 .rodata @4157 */ SECTION_RODATA static u8 const lit_4157[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80672538, &lit_4157); +COMPILER_STRIP_GATE(0x80672538, &lit_4157); /* 80671C14-80671D44 001054 0130+00 1/1 0/0 0/0 .text checkArea__11daBdoorL5_cFv */ #pragma push @@ -1002,14 +1056,14 @@ asm void daBdoorL5_c::actionOpen() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4289 = 180.0f; -COMPILER_STRIP_GATE(80672540, &lit_4289); +COMPILER_STRIP_GATE(0x80672540, &lit_4289); #pragma pop /* 80672544-80672548 00007C 0004+00 0/1 0/0 0/0 .rodata @4290 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4290 = -180.0f; -COMPILER_STRIP_GATE(80672544, &lit_4290); +COMPILER_STRIP_GATE(0x80672544, &lit_4290); #pragma pop /* 80672004-80672164 001444 0160+00 1/0 0/0 0/0 .text actionEnd__11daBdoorL5_cFv */ @@ -1098,7 +1152,7 @@ static asm void daBdoorL5_Create(fopAc_ac_c* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80672494(u8* param_0) { +extern "C" asm void func_80672494(void* _this, u8* param_0) { nofralloc #include "asm/rel/d/a/door/d_a_door_bossL5/d_a_door_bossL5/func_80672494.s" } @@ -1124,27 +1178,4 @@ static asm void func_806724B8() { } #pragma pop -/* 80672548-806725F2 000080 00AA+00 6/5 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80672548 = "Z_bdor00"; -SECTION_DEAD static char const* const stringBase_80672551 = "static"; -SECTION_DEAD static char const* const stringBase_80672558 = "Z_bdor00.bmd"; -SECTION_DEAD static char const* const stringBase_80672565 = "door-shutterBoss.dzb"; -SECTION_DEAD static char const* const stringBase_8067257A = "BDoorTAnm"; -SECTION_DEAD static char const* const stringBase_80672584 = "WAIT"; -SECTION_DEAD static char const* const stringBase_80672589 = "UNLOCK"; -SECTION_DEAD static char const* const stringBase_80672590 = "OPEN"; -SECTION_DEAD static char const* const stringBase_80672595 = "SETGOAL"; -SECTION_DEAD static char const* const stringBase_8067259D = "SETGOAL2"; -SECTION_DEAD static char const* const stringBase_806725A6 = "CLOSE"; -SECTION_DEAD static char const* const stringBase_806725AC = "SMOKE"; -SECTION_DEAD static char const* const stringBase_806725B2 = "SMOKE_END"; -SECTION_DEAD static char const* const stringBase_806725BC = "END"; -SECTION_DEAD static char const* const stringBase_806725C0 = "END_CHECK"; -SECTION_DEAD static char const* const stringBase_806725CA = "CHG_SCENE"; -SECTION_DEAD static char const* const stringBase_806725D4 = "KEYDELETE"; -SECTION_DEAD static char const* const stringBase_806725DE = "PLY_NODISP"; -SECTION_DEAD static char const* const stringBase_806725E9 = "PLY_DISP"; -#pragma pop +/* 80672548-80672548 000080 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/door/d_a_door_bossl1/d_a_door_bossL1.cpp b/rel/d/a/door/d_a_door_bossl1/d_a_door_bossL1.cpp index e5ca2ec9c3d..67025b82469 100644 --- a/rel/d/a/door/d_a_door_bossl1/d_a_door_bossL1.cpp +++ b/rel/d/a/door/d_a_door_bossl1/d_a_door_bossL1.cpp @@ -139,10 +139,10 @@ struct cBgS_PolyInfo { /* 802680B0 */ ~cBgS_PolyInfo(); }; -struct _GXColor {}; - struct csXyz {}; +struct _GXColor {}; + struct dPa_control_c { /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, @@ -291,7 +291,7 @@ extern "C" static void daBdoorL1_Draw__FP11daBdoorL1_c(); extern "C" static void daBdoorL1_Execute__FP11daBdoorL1_c(); extern "C" static void daBdoorL1_Delete__FP11daBdoorL1_c(); extern "C" static void daBdoorL1_Create__FP10fopAc_ac_c(); -extern "C" void func_804E49E0(int*); +extern "C" void func_804E49E0(void* _this, int*); extern "C" static void func_804E49FC(); extern "C" static void func_804E4A04(); extern "C" extern char const* const d_a_door_bossL1__stringBase0; @@ -393,6 +393,31 @@ extern "C" extern u8 data_804E50A8[4]; // /* ############################################################################################## */ +/* 804E4ADC-804E4ADC 0000C8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_804E4ADC = "D_MN05"; +SECTION_DEAD static char const* const stringBase_804E4AE3 = "D_MN05A"; +SECTION_DEAD static char const* const stringBase_804E4AEB = "D_MN04"; +SECTION_DEAD static char const* const stringBase_804E4AF2 = "D_MN04A"; +SECTION_DEAD static char const* const stringBase_804E4AFA = "D_MN01"; +SECTION_DEAD static char const* const stringBase_804E4B01 = "D_MN01A"; +SECTION_DEAD static char const* const stringBase_804E4B09 = "D_MN10"; +SECTION_DEAD static char const* const stringBase_804E4B10 = "D_MN10A"; +SECTION_DEAD static char const* const stringBase_804E4B18 = "D_MN11"; +SECTION_DEAD static char const* const stringBase_804E4B1F = "D_MN11A"; +SECTION_DEAD static char const* const stringBase_804E4B27 = "D_MN06"; +SECTION_DEAD static char const* const stringBase_804E4B2E = "D_MN06A"; +SECTION_DEAD static char const* const stringBase_804E4B36 = "D_MN07"; +SECTION_DEAD static char const* const stringBase_804E4B3D = "D_MN07A"; +SECTION_DEAD static char const* const stringBase_804E4B45 = "D_MN08"; +SECTION_DEAD static char const* const stringBase_804E4B4C = "D_MN08A"; +SECTION_DEAD static char const* const stringBase_804E4B54 = "D_MN09"; +SECTION_DEAD static char const* const stringBase_804E4B5B = "D_MN09A"; +SECTION_DEAD static char const* const stringBase_804E4B63 = "D_MN54"; +SECTION_DEAD static char const* const stringBase_804E4B6A = "D_MN54A"; +#pragma pop + /* 804E4DF8-804E4E04 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -446,6 +471,18 @@ static asm void getNowLevel() { #pragma pop /* ############################################################################################## */ +/* 804E4ADC-804E4ADC 0000C8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_804E4B72 = "DEFAULT_BS_SHUTTER_L1_F"; +SECTION_DEAD static char const* const stringBase_804E4B8A = "DEFAULT_BS_SHUTTER_L2_F"; +SECTION_DEAD static char const* const stringBase_804E4BA2 = "DEFAULT_BS_SHUTTER_L4_F"; +SECTION_DEAD static char const* const stringBase_804E4BBA = "DEFAULT_BS_SHUTTER_L6_F"; +SECTION_DEAD static char const* const stringBase_804E4BD2 = "DEFAULT_BS_SHUTTER_L7_F"; +SECTION_DEAD static char const* const stringBase_804E4BEA = "DEFAULT_BS_SHUTTER_L8_F"; +SECTION_DEAD static char const* const stringBase_804E4C02 = "DEFAULT_BS_SHUTTER_L9_F"; +#pragma pop + /* 804E4E68-804E4E90 -00001 0028+00 1/1 0/0 0/0 .data @3700 */ SECTION_DATA static void* lit_3700[10] = { (void*)(((char*)getDoorEventName__11daBdoorL1_cFv) + 0xA0), @@ -472,6 +509,18 @@ asm void daBdoorL1_c::getDoorEventName() { #pragma pop /* ############################################################################################## */ +/* 804E4ADC-804E4ADC 0000C8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_804E4C1A = "DEFAULT_BS_SHUTTER_L1_F_2"; +SECTION_DEAD static char const* const stringBase_804E4C34 = "DEFAULT_BS_SHUTTER_L2_F_2"; +SECTION_DEAD static char const* const stringBase_804E4C4E = "DEFAULT_BS_SHUTTER_L4_F_2"; +SECTION_DEAD static char const* const stringBase_804E4C68 = "DEFAULT_BS_SHUTTER_L6_F_2"; +SECTION_DEAD static char const* const stringBase_804E4C82 = "DEFAULT_BS_SHUTTER_L7_F_2"; +SECTION_DEAD static char const* const stringBase_804E4C9C = "DEFAULT_BS_SHUTTER_L8_F_2"; +SECTION_DEAD static char const* const stringBase_804E4CB6 = "DEFAULT_BS_SHUTTER_L9_F_2"; +#pragma pop + /* 804E4E90-804E4EB8 -00001 0028+00 1/1 0/0 0/0 .data @3713 */ SECTION_DATA static void* lit_3713[10] = { (void*)(((char*)getDoorEventName2__11daBdoorL1_cFv) + 0xA0), @@ -498,6 +547,18 @@ asm void daBdoorL1_c::getDoorEventName2() { #pragma pop /* ############################################################################################## */ +/* 804E4ADC-804E4ADC 0000C8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_804E4CD0 = "L1Bdoor"; +SECTION_DEAD static char const* const stringBase_804E4CD8 = "L2Bdoor"; +SECTION_DEAD static char const* const stringBase_804E4CE0 = "L4Bdoor"; +SECTION_DEAD static char const* const stringBase_804E4CE8 = "L6Bdoor"; +SECTION_DEAD static char const* const stringBase_804E4CF0 = "L7Bdoor"; +SECTION_DEAD static char const* const stringBase_804E4CF8 = "L8Bdoor"; +SECTION_DEAD static char const* const stringBase_804E4D00 = "L9Bdoor"; +#pragma pop + /* 804E4EB8-804E4EE0 -00001 0028+00 1/1 0/0 0/0 .data @3726 */ SECTION_DATA static void* lit_3726[10] = { (void*)(((char*)getArcName__11daBdoorL1_cFv) + 0xA0), @@ -522,6 +583,14 @@ asm void daBdoorL1_c::getArcName() { } #pragma pop +/* ############################################################################################## */ +/* 804E4ADC-804E4ADC 0000C8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_804E4D08 = "BDoorYAnm"; +SECTION_DEAD static char const* const stringBase_804E4D12 = "BDoorTAnm"; +#pragma pop + /* 804E2060-804E20C4 000340 0064+00 5/5 0/0 0/0 .text getAnmArcName__11daBdoorL1_cFv */ #pragma push #pragma optimization_level 0 @@ -562,6 +631,13 @@ asm void daBdoorL1_c::getCloseAnm() { } #pragma pop +/* ############################################################################################## */ +/* 804E4ADC-804E4ADC 0000C8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_804E4D1C = "static"; +#pragma pop + /* 804E21AC-804E21BC 00048C 0010+00 3/3 0/0 0/0 .text getAlwaysArcName__11daBdoorL1_cFv */ #pragma push @@ -573,6 +649,13 @@ asm void daBdoorL1_c::getAlwaysArcName() { } #pragma pop +/* ############################################################################################## */ +/* 804E4ADC-804E4ADC 0000C8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_804E4D23 = "door_shutterBoss.bmd"; +#pragma pop + /* 804E21BC-804E21CC 00049C 0010+00 1/1 0/0 0/0 .text getBmd__11daBdoorL1_cFv */ #pragma push #pragma optimization_level 0 @@ -583,6 +666,13 @@ asm void daBdoorL1_c::getBmd() { } #pragma pop +/* ############################################################################################## */ +/* 804E4ADC-804E4ADC 0000C8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_804E4D38 = "door-shutterBoss.dzb"; +#pragma pop + /* 804E21CC-804E21DC 0004AC 0010+00 1/1 0/0 0/0 .text getDzb__11daBdoorL1_cFv */ #pragma push #pragma optimization_level 0 @@ -635,7 +725,7 @@ SECTION_RODATA static u8 const l_staff_name[13 + 3 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(804E4A14, &l_staff_name); +COMPILER_STRIP_GATE(0x804E4A14, &l_staff_name); /* 804E4A24-804E4A50 000010 002C+00 1/1 0/0 0/0 .rodata l_heap_size */ SECTION_RODATA static u8 const l_heap_size[44] = { @@ -643,11 +733,35 @@ SECTION_RODATA static u8 const l_heap_size[44] = { 0x00, 0x00, 0x00, 0x21, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x15, 0x00, 0x00, 0x00, 0x15, 0x00, 0x00, 0x00, 0x16, 0x00, 0x00, 0x00, 0x15, 0x00, 0x00, 0x00, 0x22, 0x60, }; -COMPILER_STRIP_GATE(804E4A24, &l_heap_size); +COMPILER_STRIP_GATE(0x804E4A24, &l_heap_size); /* 804E4A50-804E4A54 00003C 0004+00 3/7 0/0 0/0 .rodata @3861 */ SECTION_RODATA static f32 const lit_3861 = 1.0f; -COMPILER_STRIP_GATE(804E4A50, &lit_3861); +COMPILER_STRIP_GATE(0x804E4A50, &lit_3861); + +/* 804E4ADC-804E4ADC 0000C8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_804E4D4D = "door_shutterBoss.btk"; +SECTION_DEAD static char const* const stringBase_804E4D62 = "WAIT"; +SECTION_DEAD static char const* const stringBase_804E4D67 = "SETANGLE"; +SECTION_DEAD static char const* const stringBase_804E4D70 = "UNLOCK"; +SECTION_DEAD static char const* const stringBase_804E4D77 = "OPEN"; +SECTION_DEAD static char const* const stringBase_804E4D7C = "SETGOAL"; +SECTION_DEAD static char const* const stringBase_804E4D84 = "SETGOAL2"; +SECTION_DEAD static char const* const stringBase_804E4D8D = "CLOSE"; +SECTION_DEAD static char const* const stringBase_804E4D93 = "SMOKE"; +SECTION_DEAD static char const* const stringBase_804E4D99 = "SMOKE_END"; +SECTION_DEAD static char const* const stringBase_804E4DA3 = "END"; +SECTION_DEAD static char const* const stringBase_804E4DA7 = "END_CHECK"; +SECTION_DEAD static char const* const stringBase_804E4DB1 = "CHG_SCENE"; +SECTION_DEAD static char const* const stringBase_804E4DBB = "STOP_CLOSE"; +SECTION_DEAD static char const* const stringBase_804E4DC6 = "PLY_DISP"; +SECTION_DEAD static char const* const stringBase_804E4DCF = "PLY_NODISP"; +SECTION_DEAD static char const* const stringBase_804E4DDA = "SETPOS"; +SECTION_DEAD static char const* const stringBase_804E4DE1 = "LIGHT_ANM"; +SECTION_DEAD static char const* const stringBase_804E4DEB = "INIT"; +#pragma pop /* 804E4EE0-804E4F28 -00001 0048+00 1/1 0/0 0/0 .data action_table$4021 */ SECTION_DATA static void* action_table[18] = { @@ -842,11 +956,11 @@ SECTION_RODATA static u8 const lit_3919[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(804E4A54, &lit_3919); +COMPILER_STRIP_GATE(0x804E4A54, &lit_3919); /* 804E4A58-804E4A5C 000044 0004+00 1/1 0/0 0/0 .rodata @3920 */ SECTION_RODATA static f32 const lit_3920 = 20.0f; -COMPILER_STRIP_GATE(804E4A58, &lit_3920); +COMPILER_STRIP_GATE(0x804E4A58, &lit_3920); /* 804E2578-804E2754 000858 01DC+00 2/2 0/0 0/0 .text calcMtx__11daBdoorL1_cFv */ #pragma push @@ -863,21 +977,21 @@ asm void daBdoorL1_c::calcMtx() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3946 = 250.0f; -COMPILER_STRIP_GATE(804E4A5C, &lit_3946); +COMPILER_STRIP_GATE(0x804E4A5C, &lit_3946); #pragma pop /* 804E4A60-804E4A64 00004C 0004+00 0/1 0/0 0/0 .rodata @3947 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3947 = -60.0f; -COMPILER_STRIP_GATE(804E4A60, &lit_3947); +COMPILER_STRIP_GATE(0x804E4A60, &lit_3947); #pragma pop /* 804E4A64-804E4A68 000050 0004+00 0/1 0/0 0/0 .rodata @3948 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3948 = 60.0f; -COMPILER_STRIP_GATE(804E4A64, &lit_3948); +COMPILER_STRIP_GATE(0x804E4A64, &lit_3948); #pragma pop /* 804E2754-804E28E4 000A34 0190+00 1/1 0/0 0/0 .text CreateInit__11daBdoorL1_cFv */ @@ -930,6 +1044,13 @@ asm void daBdoorL1_c::getDemoAction() { } #pragma pop +/* ############################################################################################## */ +/* 804E4ADC-804E4ADC 0000C8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_804E4DF0 = "Timer"; +#pragma pop + /* 804E2BC0-804E3180 000EA0 05C0+00 5/3 0/0 0/0 .text demoProc__11daBdoorL1_cFv */ #pragma push #pragma optimization_level 0 @@ -943,7 +1064,7 @@ asm void daBdoorL1_c::demoProc() { /* ############################################################################################## */ /* 804E4A68-804E4A6C 000054 0004+00 2/5 0/0 0/0 .rodata @4238 */ SECTION_RODATA static f32 const lit_4238 = -1.0f; -COMPILER_STRIP_GATE(804E4A68, &lit_4238); +COMPILER_STRIP_GATE(0x804E4A68, &lit_4238); /* 804E4A6C-804E4A74 000058 0006+02 0/1 0/0 0/0 .rodata l_lv1_eff$4252 */ #pragma push @@ -959,7 +1080,7 @@ SECTION_RODATA static u8 const l_lv1_eff[6 + 2 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(804E4A6C, &l_lv1_eff); +COMPILER_STRIP_GATE(0x804E4A6C, &l_lv1_eff); #pragma pop /* 804E4A74-804E4A7C 000060 0006+02 0/1 0/0 0/0 .rodata l_lv2_eff$4253 */ @@ -976,7 +1097,7 @@ SECTION_RODATA static u8 const l_lv2_eff[6 + 2 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(804E4A74, &l_lv2_eff); +COMPILER_STRIP_GATE(0x804E4A74, &l_lv2_eff); #pragma pop /* 804E4A7C-804E4A80 000068 0004+00 0/1 0/0 0/0 .rodata l_lv4_eff_a$4254 */ @@ -988,7 +1109,7 @@ SECTION_RODATA static u8 const l_lv4_eff_a[4] = { 0x8C, 0x49, }; -COMPILER_STRIP_GATE(804E4A7C, &l_lv4_eff_a); +COMPILER_STRIP_GATE(0x804E4A7C, &l_lv4_eff_a); #pragma pop /* 804E4A80-804E4A84 00006C 0004+00 0/1 0/0 0/0 .rodata l_lv4_eff_b$4255 */ @@ -1000,7 +1121,7 @@ SECTION_RODATA static u8 const l_lv4_eff_b[4] = { 0x8C, 0x4B, }; -COMPILER_STRIP_GATE(804E4A80, &l_lv4_eff_b); +COMPILER_STRIP_GATE(0x804E4A80, &l_lv4_eff_b); #pragma pop /* 804E4A84-804E4A88 000070 0004+00 0/1 0/0 0/0 .rodata l_lv6_eff_a$4256 */ @@ -1012,7 +1133,7 @@ SECTION_RODATA static u8 const l_lv6_eff_a[4] = { 0x8C, 0x4D, }; -COMPILER_STRIP_GATE(804E4A84, &l_lv6_eff_a); +COMPILER_STRIP_GATE(0x804E4A84, &l_lv6_eff_a); #pragma pop /* 804E4A88-804E4A8C 000074 0004+00 0/1 0/0 0/0 .rodata l_lv6_eff_b$4257 */ @@ -1024,7 +1145,7 @@ SECTION_RODATA static u8 const l_lv6_eff_b[4] = { 0x8C, 0x4F, }; -COMPILER_STRIP_GATE(804E4A88, &l_lv6_eff_b); +COMPILER_STRIP_GATE(0x804E4A88, &l_lv6_eff_b); #pragma pop /* 804E3180-804E357C 001460 03FC+00 1/1 0/0 0/0 .text openInit__11daBdoorL1_cFv */ @@ -1042,14 +1163,14 @@ asm void daBdoorL1_c::openInit() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4466 = 12.0f; -COMPILER_STRIP_GATE(804E4A8C, &lit_4466); +COMPILER_STRIP_GATE(0x804E4A8C, &lit_4466); #pragma pop /* 804E4A90-804E4A94 00007C 0004+00 0/1 0/0 0/0 .rodata @4467 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4467 = 18.0f; -COMPILER_STRIP_GATE(804E4A90, &lit_4467); +COMPILER_STRIP_GATE(0x804E4A90, &lit_4467); #pragma pop /* 804E357C-804E3794 00185C 0218+00 1/1 0/0 0/0 .text openProc__11daBdoorL1_cFv */ @@ -1087,28 +1208,28 @@ asm void daBdoorL1_c::closeInit() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4574 = 11.0f; -COMPILER_STRIP_GATE(804E4A94, &lit_4574); +COMPILER_STRIP_GATE(0x804E4A94, &lit_4574); #pragma pop /* 804E4A98-804E4A9C 000084 0004+00 0/1 0/0 0/0 .rodata @4575 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4575 = 4.0f; -COMPILER_STRIP_GATE(804E4A98, &lit_4575); +COMPILER_STRIP_GATE(0x804E4A98, &lit_4575); #pragma pop /* 804E4A9C-804E4AA0 000088 0004+00 0/1 0/0 0/0 .rodata @4576 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4576 = 10.0f; -COMPILER_STRIP_GATE(804E4A9C, &lit_4576); +COMPILER_STRIP_GATE(0x804E4A9C, &lit_4576); #pragma pop /* 804E4AA0-804E4AA4 00008C 0004+00 0/1 0/0 0/0 .rodata @4577 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4577 = 33.0f / 20.0f; -COMPILER_STRIP_GATE(804E4AA0, &lit_4577); +COMPILER_STRIP_GATE(0x804E4AA0, &lit_4577); #pragma pop /* 804E3A2C-804E3C0C 001D0C 01E0+00 1/1 0/0 0/0 .text closeProc__11daBdoorL1_cFv */ @@ -1141,21 +1262,21 @@ asm void daBdoorL1_c::unlockInit() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4626 = 100.0f; -COMPILER_STRIP_GATE(804E4AA4, &lit_4626); +COMPILER_STRIP_GATE(0x804E4AA4, &lit_4626); #pragma pop /* 804E4AA8-804E4AAC 000094 0004+00 0/1 0/0 0/0 .rodata @4627 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4627 = -100.0f; -COMPILER_STRIP_GATE(804E4AA8, &lit_4627); +COMPILER_STRIP_GATE(0x804E4AA8, &lit_4627); #pragma pop /* 804E4AAC-804E4AB0 000098 0004+00 0/1 0/0 0/0 .rodata @4628 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4628 = 70.0f; -COMPILER_STRIP_GATE(804E4AAC, &lit_4628); +COMPILER_STRIP_GATE(0x804E4AAC, &lit_4628); #pragma pop /* 804E3CCC-804E3DE8 001FAC 011C+00 1/1 0/0 0/0 .text setPos__11daBdoorL1_cFv */ @@ -1173,21 +1294,21 @@ asm void daBdoorL1_c::setPos() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4655 = 0.5f; -COMPILER_STRIP_GATE(804E4AB0, &lit_4655); +COMPILER_STRIP_GATE(0x804E4AB0, &lit_4655); #pragma pop /* 804E4AB4-804E4AB8 0000A0 0004+00 0/1 0/0 0/0 .rodata @4656 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4656 = -1000.0f; -COMPILER_STRIP_GATE(804E4AB4, &lit_4656); +COMPILER_STRIP_GATE(0x804E4AB4, &lit_4656); #pragma pop /* 804E4AB8-804E4ABC 0000A4 0004+00 0/1 0/0 0/0 .rodata @4657 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4657 = -240.0f; -COMPILER_STRIP_GATE(804E4AB8, &lit_4657); +COMPILER_STRIP_GATE(0x804E4AB8, &lit_4657); #pragma pop /* 804E3DE8-804E3F10 0020C8 0128+00 1/1 0/0 0/0 .text calcGoal__11daBdoorL1_cFP4cXyzi */ @@ -1213,7 +1334,7 @@ asm void daBdoorL1_c::setAngle() { /* ############################################################################################## */ /* 804E4ABC-804E4AC0 0000A8 0004+00 1/1 0/0 0/0 .rodata @4706 */ SECTION_RODATA static f32 const lit_4706 = 50.0f; -COMPILER_STRIP_GATE(804E4ABC, &lit_4706); +COMPILER_STRIP_GATE(0x804E4ABC, &lit_4706); /* 804E3FF8-804E4100 0022D8 0108+00 1/1 0/0 0/0 .text createKey__11daBdoorL1_cFv */ #pragma push @@ -1245,7 +1366,7 @@ asm void daBdoorL1_c::deleteEmitter() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4825 = 200.0f; -COMPILER_STRIP_GATE(804E4AC0, &lit_4825); +COMPILER_STRIP_GATE(0x804E4AC0, &lit_4825); #pragma pop /* 804E4AC4-804E4ACC 0000B0 0004+04 0/1 0/0 0/0 .rodata @4826 */ @@ -1256,7 +1377,7 @@ SECTION_RODATA static f32 const lit_4826[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(804E4AC4, &lit_4826); +COMPILER_STRIP_GATE(0x804E4AC4, &lit_4826); #pragma pop /* 804E4ACC-804E4AD4 0000B8 0008+00 0/1 0/0 0/0 .rodata @4828 */ @@ -1265,7 +1386,7 @@ COMPILER_STRIP_GATE(804E4AC4, &lit_4826); SECTION_RODATA static u8 const lit_4828[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(804E4ACC, &lit_4828); +COMPILER_STRIP_GATE(0x804E4ACC, &lit_4828); #pragma pop /* 804E4158-804E432C 002438 01D4+00 1/1 0/0 0/0 .text checkArea__11daBdoorL1_cFv */ @@ -1328,14 +1449,14 @@ asm void daBdoorL1_c::actionOpen() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4930 = 180.0f; -COMPILER_STRIP_GATE(804E4AD4, &lit_4930); +COMPILER_STRIP_GATE(0x804E4AD4, &lit_4930); #pragma pop /* 804E4AD8-804E4ADC 0000C4 0004+00 0/1 0/0 0/0 .rodata @4931 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4931 = -180.0f; -COMPILER_STRIP_GATE(804E4AD8, &lit_4931); +COMPILER_STRIP_GATE(0x804E4AD8, &lit_4931); #pragma pop /* 804E44EC-804E464C 0027CC 0160+00 1/0 0/0 0/0 .text actionEnd__11daBdoorL1_cFv */ @@ -1424,7 +1545,7 @@ static asm void daBdoorL1_Create(fopAc_ac_c* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_804E49E0(int* param_0) { +extern "C" asm void func_804E49E0(void* _this, int* param_0) { nofralloc #include "asm/rel/d/a/door/d_a_door_bossl1/d_a_door_bossL1/func_804E49E0.s" } @@ -1450,74 +1571,4 @@ static asm void func_804E4A04() { } #pragma pop -/* 804E4ADC-804E4DF6 0000C8 031A+00 12/10 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_804E4ADC = "D_MN05"; -SECTION_DEAD static char const* const stringBase_804E4AE3 = "D_MN05A"; -SECTION_DEAD static char const* const stringBase_804E4AEB = "D_MN04"; -SECTION_DEAD static char const* const stringBase_804E4AF2 = "D_MN04A"; -SECTION_DEAD static char const* const stringBase_804E4AFA = "D_MN01"; -SECTION_DEAD static char const* const stringBase_804E4B01 = "D_MN01A"; -SECTION_DEAD static char const* const stringBase_804E4B09 = "D_MN10"; -SECTION_DEAD static char const* const stringBase_804E4B10 = "D_MN10A"; -SECTION_DEAD static char const* const stringBase_804E4B18 = "D_MN11"; -SECTION_DEAD static char const* const stringBase_804E4B1F = "D_MN11A"; -SECTION_DEAD static char const* const stringBase_804E4B27 = "D_MN06"; -SECTION_DEAD static char const* const stringBase_804E4B2E = "D_MN06A"; -SECTION_DEAD static char const* const stringBase_804E4B36 = "D_MN07"; -SECTION_DEAD static char const* const stringBase_804E4B3D = "D_MN07A"; -SECTION_DEAD static char const* const stringBase_804E4B45 = "D_MN08"; -SECTION_DEAD static char const* const stringBase_804E4B4C = "D_MN08A"; -SECTION_DEAD static char const* const stringBase_804E4B54 = "D_MN09"; -SECTION_DEAD static char const* const stringBase_804E4B5B = "D_MN09A"; -SECTION_DEAD static char const* const stringBase_804E4B63 = "D_MN54"; -SECTION_DEAD static char const* const stringBase_804E4B6A = "D_MN54A"; -SECTION_DEAD static char const* const stringBase_804E4B72 = "DEFAULT_BS_SHUTTER_L1_F"; -SECTION_DEAD static char const* const stringBase_804E4B8A = "DEFAULT_BS_SHUTTER_L2_F"; -SECTION_DEAD static char const* const stringBase_804E4BA2 = "DEFAULT_BS_SHUTTER_L4_F"; -SECTION_DEAD static char const* const stringBase_804E4BBA = "DEFAULT_BS_SHUTTER_L6_F"; -SECTION_DEAD static char const* const stringBase_804E4BD2 = "DEFAULT_BS_SHUTTER_L7_F"; -SECTION_DEAD static char const* const stringBase_804E4BEA = "DEFAULT_BS_SHUTTER_L8_F"; -SECTION_DEAD static char const* const stringBase_804E4C02 = "DEFAULT_BS_SHUTTER_L9_F"; -SECTION_DEAD static char const* const stringBase_804E4C1A = "DEFAULT_BS_SHUTTER_L1_F_2"; -SECTION_DEAD static char const* const stringBase_804E4C34 = "DEFAULT_BS_SHUTTER_L2_F_2"; -SECTION_DEAD static char const* const stringBase_804E4C4E = "DEFAULT_BS_SHUTTER_L4_F_2"; -SECTION_DEAD static char const* const stringBase_804E4C68 = "DEFAULT_BS_SHUTTER_L6_F_2"; -SECTION_DEAD static char const* const stringBase_804E4C82 = "DEFAULT_BS_SHUTTER_L7_F_2"; -SECTION_DEAD static char const* const stringBase_804E4C9C = "DEFAULT_BS_SHUTTER_L8_F_2"; -SECTION_DEAD static char const* const stringBase_804E4CB6 = "DEFAULT_BS_SHUTTER_L9_F_2"; -SECTION_DEAD static char const* const stringBase_804E4CD0 = "L1Bdoor"; -SECTION_DEAD static char const* const stringBase_804E4CD8 = "L2Bdoor"; -SECTION_DEAD static char const* const stringBase_804E4CE0 = "L4Bdoor"; -SECTION_DEAD static char const* const stringBase_804E4CE8 = "L6Bdoor"; -SECTION_DEAD static char const* const stringBase_804E4CF0 = "L7Bdoor"; -SECTION_DEAD static char const* const stringBase_804E4CF8 = "L8Bdoor"; -SECTION_DEAD static char const* const stringBase_804E4D00 = "L9Bdoor"; -SECTION_DEAD static char const* const stringBase_804E4D08 = "BDoorYAnm"; -SECTION_DEAD static char const* const stringBase_804E4D12 = "BDoorTAnm"; -SECTION_DEAD static char const* const stringBase_804E4D1C = "static"; -SECTION_DEAD static char const* const stringBase_804E4D23 = "door_shutterBoss.bmd"; -SECTION_DEAD static char const* const stringBase_804E4D38 = "door-shutterBoss.dzb"; -SECTION_DEAD static char const* const stringBase_804E4D4D = "door_shutterBoss.btk"; -SECTION_DEAD static char const* const stringBase_804E4D62 = "WAIT"; -SECTION_DEAD static char const* const stringBase_804E4D67 = "SETANGLE"; -SECTION_DEAD static char const* const stringBase_804E4D70 = "UNLOCK"; -SECTION_DEAD static char const* const stringBase_804E4D77 = "OPEN"; -SECTION_DEAD static char const* const stringBase_804E4D7C = "SETGOAL"; -SECTION_DEAD static char const* const stringBase_804E4D84 = "SETGOAL2"; -SECTION_DEAD static char const* const stringBase_804E4D8D = "CLOSE"; -SECTION_DEAD static char const* const stringBase_804E4D93 = "SMOKE"; -SECTION_DEAD static char const* const stringBase_804E4D99 = "SMOKE_END"; -SECTION_DEAD static char const* const stringBase_804E4DA3 = "END"; -SECTION_DEAD static char const* const stringBase_804E4DA7 = "END_CHECK"; -SECTION_DEAD static char const* const stringBase_804E4DB1 = "CHG_SCENE"; -SECTION_DEAD static char const* const stringBase_804E4DBB = "STOP_CLOSE"; -SECTION_DEAD static char const* const stringBase_804E4DC6 = "PLY_DISP"; -SECTION_DEAD static char const* const stringBase_804E4DCF = "PLY_NODISP"; -SECTION_DEAD static char const* const stringBase_804E4DDA = "SETPOS"; -SECTION_DEAD static char const* const stringBase_804E4DE1 = "LIGHT_ANM"; -SECTION_DEAD static char const* const stringBase_804E4DEB = "INIT"; -SECTION_DEAD static char const* const stringBase_804E4DF0 = "Timer"; -#pragma pop +/* 804E4ADC-804E4ADC 0000C8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/door/d_a_door_dbdoor00/d_a_door_dbdoor00.cpp b/rel/d/a/door/d_a_door_dbdoor00/d_a_door_dbdoor00.cpp index 431dc00a8f0..b01989c153a 100644 --- a/rel/d/a/door/d_a_door_dbdoor00/d_a_door_dbdoor00.cpp +++ b/rel/d/a/door/d_a_door_dbdoor00/d_a_door_dbdoor00.cpp @@ -266,6 +266,14 @@ static asm void nodeCallBack(J3DJoint* param_0, int param_1) { } #pragma pop +/* ############################################################################################## */ +/* 8045E56C-8045E56C 000038 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8045E56C = "door-pushDouble_"; +SECTION_DEAD static char const* const stringBase_8045E57D = "static"; +#pragma pop + /* 8045D470-8045D480 000170 0010+00 3/3 0/0 0/0 .text getAlwaysArcName__12daDbDoor00_cFv */ #pragma push @@ -277,6 +285,13 @@ asm void daDbDoor00_c::getAlwaysArcName() { } #pragma pop +/* ############################################################################################## */ +/* 8045E56C-8045E56C 000038 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8045E584 = "door-pushDouble.dzb"; +#pragma pop + /* 8045D480-8045D490 000180 0010+00 1/1 0/0 0/0 .text getDzb__12daDbDoor00_cFv */ #pragma push #pragma optimization_level 0 @@ -287,6 +302,13 @@ asm void daDbDoor00_c::getDzb() { } #pragma pop +/* ############################################################################################## */ +/* 8045E56C-8045E56C 000038 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8045E598 = "door-pushDoubleDummy.bmd"; +#pragma pop + /* 8045D490-8045D4A0 000190 0010+00 1/1 0/0 0/0 .text getDummyBmdName__12daDbDoor00_cFv */ #pragma push @@ -298,6 +320,13 @@ asm void daDbDoor00_c::getDummyBmdName() { } #pragma pop +/* ############################################################################################## */ +/* 8045E56C-8045E56C 000038 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8045E5B1 = "DbDoor0"; +#pragma pop + /* 8045D4A0-8045D4B0 0001A0 0010+00 3/3 0/0 0/0 .text getBmdArcName__12daDbDoor00_cFv */ #pragma push #pragma optimization_level 0 @@ -309,6 +338,12 @@ asm void daDbDoor00_c::getBmdArcName() { #pragma pop /* ############################################################################################## */ +/* 8045E56C-8045E56C 000038 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8045E5B9 = "%s%02d.bmd"; +#pragma pop + /* 8045E664-8045E670 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -364,6 +399,14 @@ static asm void CheckCreateHeap(fopAc_ac_c* param_0) { } #pragma pop +/* ############################################################################################## */ +/* 8045E56C-8045E56C 000038 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8045E5C4 = "DbDoor00_L"; +SECTION_DEAD static char const* const stringBase_8045E5CF = "DbDoor00_R"; +#pragma pop + /* 8045D594-8045D744 000294 01B0+00 1/1 0/0 0/0 .text CreateHeap__12daDbDoor00_cFv */ #pragma push #pragma optimization_level 0 @@ -382,41 +425,41 @@ SECTION_RODATA static u8 const lit_3806[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(8045E534, &lit_3806); +COMPILER_STRIP_GATE(0x8045E534, &lit_3806); /* 8045E538-8045E53C 000004 0004+00 0/1 0/0 0/0 .rodata @3807 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3807 = -150.0f; -COMPILER_STRIP_GATE(8045E538, &lit_3807); +COMPILER_STRIP_GATE(0x8045E538, &lit_3807); #pragma pop /* 8045E53C-8045E540 000008 0004+00 0/1 0/0 0/0 .rodata @3808 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3808 = -400.0f; -COMPILER_STRIP_GATE(8045E53C, &lit_3808); +COMPILER_STRIP_GATE(0x8045E53C, &lit_3808); #pragma pop /* 8045E540-8045E544 00000C 0004+00 0/1 0/0 0/0 .rodata @3809 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3809 = 80.0f; -COMPILER_STRIP_GATE(8045E540, &lit_3809); +COMPILER_STRIP_GATE(0x8045E540, &lit_3809); #pragma pop /* 8045E544-8045E548 000010 0004+00 0/1 0/0 0/0 .rodata @3810 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3810 = 70.0f; -COMPILER_STRIP_GATE(8045E544, &lit_3810); +COMPILER_STRIP_GATE(0x8045E544, &lit_3810); #pragma pop /* 8045E548-8045E54C 000014 0004+00 0/1 0/0 0/0 .rodata @3811 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3811 = -80.0f; -COMPILER_STRIP_GATE(8045E548, &lit_3811); +COMPILER_STRIP_GATE(0x8045E548, &lit_3811); #pragma pop /* 8045D744-8045D8F4 000444 01B0+00 4/4 0/0 0/0 .text calcMtx__12daDbDoor00_cFv */ @@ -432,7 +475,7 @@ asm void daDbDoor00_c::calcMtx() { /* ############################################################################################## */ /* 8045E54C-8045E550 000018 0004+00 1/1 0/0 0/0 .rodata @3826 */ SECTION_RODATA static f32 const lit_3826 = 250.0f; -COMPILER_STRIP_GATE(8045E54C, &lit_3826); +COMPILER_STRIP_GATE(0x8045E54C, &lit_3826); /* 8045D8F4-8045D9A8 0005F4 00B4+00 1/1 0/0 0/0 .text CreateInit__12daDbDoor00_cFv */ #pragma push @@ -455,6 +498,20 @@ asm void daDbDoor00_c::create() { #pragma pop /* ############################################################################################## */ +/* 8045E56C-8045E56C 000038 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8045E5DA = "WAIT"; +SECTION_DEAD static char const* const stringBase_8045E5DF = "SET_START"; +SECTION_DEAD static char const* const stringBase_8045E5E9 = "SET_ANGLE"; +SECTION_DEAD static char const* const stringBase_8045E5F3 = "END"; +SECTION_DEAD static char const* const stringBase_8045E5F7 = "OPEN"; +SECTION_DEAD static char const* const stringBase_8045E5FC = "STOP_OPEN"; +SECTION_DEAD static char const* const stringBase_8045E606 = "SET_GOAL"; +SECTION_DEAD static char const* const stringBase_8045E60F = "SET_GOAL2"; +SECTION_DEAD static char const* const stringBase_8045E619 = "ADJUSTMENT"; +#pragma pop + /* 8045E688-8045E6AC -00001 0024+00 1/1 0/0 0/0 .data action_table$3865 */ SECTION_DATA static void* action_table[9] = { (void*)(((char*)&d_a_door_dbdoor00__stringBase0) + 0x6E), @@ -479,6 +536,12 @@ asm void daDbDoor00_c::getDemoAction() { #pragma pop /* ############################################################################################## */ +/* 8045E56C-8045E56C 000038 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8045E624 = "Timer"; +#pragma pop + /* 8045E6AC-8045E6D0 -00001 0024+00 1/1 0/0 0/0 .data @3957 */ SECTION_DATA static void* lit_3957[9] = { (void*)(((char*)demoProc__12daDbDoor00_cFv) + 0x1A4), @@ -507,49 +570,49 @@ asm void daDbDoor00_c::demoProc() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3953 = 1.0f; -COMPILER_STRIP_GATE(8045E550, &lit_3953); +COMPILER_STRIP_GATE(0x8045E550, &lit_3953); #pragma pop /* 8045E554-8045E558 000020 0004+00 0/0 0/0 0/0 .rodata @3954 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3954 = -1.0f; -COMPILER_STRIP_GATE(8045E554, &lit_3954); +COMPILER_STRIP_GATE(0x8045E554, &lit_3954); #pragma pop /* 8045E558-8045E55C 000024 0004+00 0/0 0/0 0/0 .rodata @3955 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3955 = 9.0f / 10.0f; -COMPILER_STRIP_GATE(8045E558, &lit_3955); +COMPILER_STRIP_GATE(0x8045E558, &lit_3955); #pragma pop /* 8045E55C-8045E560 000028 0004+00 0/0 0/0 0/0 .rodata @3956 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3956 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(8045E55C, &lit_3956); +COMPILER_STRIP_GATE(0x8045E55C, &lit_3956); #pragma pop /* 8045E560-8045E564 00002C 0004+00 0/1 0/0 0/0 .rodata @4032 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4032 = 160.0f; -COMPILER_STRIP_GATE(8045E560, &lit_4032); +COMPILER_STRIP_GATE(0x8045E560, &lit_4032); #pragma pop /* 8045E564-8045E568 000030 0004+00 0/1 0/0 0/0 .rodata @4033 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4033 = 200.0f; -COMPILER_STRIP_GATE(8045E564, &lit_4033); +COMPILER_STRIP_GATE(0x8045E564, &lit_4033); #pragma pop /* 8045E568-8045E56C 000034 0004+00 0/1 0/0 0/0 .rodata @4034 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4034 = -200.0f; -COMPILER_STRIP_GATE(8045E568, &lit_4034); +COMPILER_STRIP_GATE(0x8045E568, &lit_4034); #pragma pop /* 8045DE44-8045DF70 000B44 012C+00 1/1 0/0 0/0 .text checkArea__12daDbDoor00_cFv */ @@ -577,6 +640,13 @@ asm void daDbDoor00_c::actionWait() { } #pragma pop +/* ############################################################################################## */ +/* 8045E56C-8045E56C 000038 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8045E62A = "DBDOOR00_STOP_OPEN"; +#pragma pop + /* 8045DF9C-8045E000 000C9C 0064+00 1/0 0/0 0/0 .text actionLockWait__12daDbDoor00_cFv */ #pragma push #pragma optimization_level 0 @@ -587,6 +657,13 @@ asm void daDbDoor00_c::actionLockWait() { } #pragma pop +/* ############################################################################################## */ +/* 8045E56C-8045E56C 000038 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8045E63D = "DOUBLE_DOOR"; +#pragma pop + /* 8045E000-8045E094 000D00 0094+00 1/0 0/0 0/0 .text actionLockOff__12daDbDoor00_cFv */ #pragma push #pragma optimization_level 0 @@ -607,6 +684,13 @@ asm void daDbDoor00_c::actionLockDemo() { } #pragma pop +/* ############################################################################################## */ +/* 8045E56C-8045E56C 000038 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8045E649 = "DEFAULT_DOUBLE_DOOR_OPEN"; +#pragma pop + /* 8045E108-8045E1C8 000E08 00C0+00 1/0 0/0 0/0 .text actionCloseWait__12daDbDoor00_cFv */ #pragma push @@ -815,29 +899,4 @@ SECTION_DATA extern void* g_profile_DBDOOR[12] = { (void*)0x00044000, (void*)0x00060000, }; -/* 8045E56C-8045E662 000038 00F6+00 13/11 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_8045E56C = "door-pushDouble_"; -SECTION_DEAD static char const* const stringBase_8045E57D = "static"; -SECTION_DEAD static char const* const stringBase_8045E584 = "door-pushDouble.dzb"; -SECTION_DEAD static char const* const stringBase_8045E598 = "door-pushDoubleDummy.bmd"; -SECTION_DEAD static char const* const stringBase_8045E5B1 = "DbDoor0"; -SECTION_DEAD static char const* const stringBase_8045E5B9 = "%s%02d.bmd"; -SECTION_DEAD static char const* const stringBase_8045E5C4 = "DbDoor00_L"; -SECTION_DEAD static char const* const stringBase_8045E5CF = "DbDoor00_R"; -SECTION_DEAD static char const* const stringBase_8045E5DA = "WAIT"; -SECTION_DEAD static char const* const stringBase_8045E5DF = "SET_START"; -SECTION_DEAD static char const* const stringBase_8045E5E9 = "SET_ANGLE"; -SECTION_DEAD static char const* const stringBase_8045E5F3 = "END"; -SECTION_DEAD static char const* const stringBase_8045E5F7 = "OPEN"; -SECTION_DEAD static char const* const stringBase_8045E5FC = "STOP_OPEN"; -SECTION_DEAD static char const* const stringBase_8045E606 = "SET_GOAL"; -SECTION_DEAD static char const* const stringBase_8045E60F = "SET_GOAL2"; -SECTION_DEAD static char const* const stringBase_8045E619 = "ADJUSTMENT"; -SECTION_DEAD static char const* const stringBase_8045E624 = "Timer"; -SECTION_DEAD static char const* const stringBase_8045E62A = "DBDOOR00_STOP_OPEN"; -SECTION_DEAD static char const* const stringBase_8045E63D = "DOUBLE_DOOR"; -SECTION_DEAD static char const* const stringBase_8045E649 = "DEFAULT_DOUBLE_DOOR_OPEN"; -#pragma pop +/* 8045E56C-8045E56C 000038 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/door/d_a_door_knob00/d_a_door_knob00.cpp b/rel/d/a/door/d_a_door_knob00/d_a_door_knob00.cpp index d672c0e5f24..a844eb3e5ce 100644 --- a/rel/d/a/door/d_a_door_knob00/d_a_door_knob00.cpp +++ b/rel/d/a/door/d_a_door_knob00/d_a_door_knob00.cpp @@ -361,6 +361,14 @@ asm void knob_param_c::getExitNo(fopAc_ac_c* param_0) { } #pragma pop +/* ############################################################################################## */ +/* 804606C4-804606C4 00005C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_804606C4 = "door-knob_"; +SECTION_DEAD static char const* const stringBase_804606CF = "static"; +#pragma pop + /* 8045E888-8045E898 0000A8 0010+00 4/4 0/0 0/0 .text getAlwaysArcName__10daKnob20_cFv */ #pragma push #pragma optimization_level 0 @@ -371,6 +379,13 @@ asm void daKnob20_c::getAlwaysArcName() { } #pragma pop +/* ############################################################################################## */ +/* 804606C4-804606C4 00005C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_804606D6 = "DoorK10"; +#pragma pop + /* 8045E898-8045E8A8 0000B8 0010+00 3/3 0/0 0/0 .text getEvArcName__10daKnob20_cFv */ #pragma push #pragma optimization_level 0 @@ -381,6 +396,13 @@ asm void daKnob20_c::getEvArcName() { } #pragma pop +/* ############################################################################################## */ +/* 804606C4-804606C4 00005C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_804606DE = "door-knob.dzb"; +#pragma pop + /* 8045E8A8-8045E8B8 0000C8 0010+00 1/1 0/0 0/0 .text getDzb__10daKnob20_cFv */ #pragma push #pragma optimization_level 0 @@ -391,6 +413,13 @@ asm void daKnob20_c::getDzb() { } #pragma pop +/* ############################################################################################## */ +/* 804606C4-804606C4 00005C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_804606EC = "door-knobDummy.bmd"; +#pragma pop + /* 8045E8B8-8045E8C8 0000D8 0010+00 1/1 0/0 0/0 .text getDummyBmd__10daKnob20_cFv */ #pragma push #pragma optimization_level 0 @@ -402,6 +431,12 @@ asm void daKnob20_c::getDummyBmd() { #pragma pop /* ############################################################################################## */ +/* 804606C4-804606C4 00005C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_804606FF = "%s%02d.bmd"; +#pragma pop + /* 80460874-80460880 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -459,7 +494,14 @@ static asm void CheckCreateHeap(fopAc_ac_c* param_0) { /* ############################################################################################## */ /* 80460668-8046066C 000000 0004+00 8/8 0/0 0/0 .rodata @3876 */ SECTION_RODATA static f32 const lit_3876 = 1.0f; -COMPILER_STRIP_GATE(80460668, &lit_3876); +COMPILER_STRIP_GATE(0x80460668, &lit_3876); + +/* 804606C4-804606C4 00005C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8046070A = "FDoorA.bck"; +SECTION_DEAD static char const* const stringBase_80460715 = "FDoor"; +#pragma pop /* 8045E960-8045EBA0 000180 0240+00 1/1 0/0 0/0 .text CreateHeap__10daKnob20_cFv */ #pragma push @@ -476,7 +518,7 @@ asm void daKnob20_c::CreateHeap() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3892 = -75.0f; -COMPILER_STRIP_GATE(8046066C, &lit_3892); +COMPILER_STRIP_GATE(0x8046066C, &lit_3892); #pragma pop /* 80460670-80460674 000008 0004+00 1/5 0/0 0/0 .rodata @3893 */ @@ -486,13 +528,13 @@ SECTION_RODATA static u8 const lit_3893[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80460670, &lit_3893); +COMPILER_STRIP_GATE(0x80460670, &lit_3893); /* 80460674-80460678 00000C 0004+00 0/1 0/0 0/0 .rodata @3894 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3894 = 75.0f; -COMPILER_STRIP_GATE(80460674, &lit_3894); +COMPILER_STRIP_GATE(0x80460674, &lit_3894); #pragma pop /* 8045EBA0-8045EC44 0003C0 00A4+00 3/3 0/0 0/0 .text calcMtx__10daKnob20_cFv */ @@ -508,11 +550,11 @@ asm void daKnob20_c::calcMtx() { /* ############################################################################################## */ /* 80460678-8046067C 000010 0004+00 1/1 0/0 0/0 .rodata @3908 */ SECTION_RODATA static f32 const lit_3908 = 150.0f; -COMPILER_STRIP_GATE(80460678, &lit_3908); +COMPILER_STRIP_GATE(0x80460678, &lit_3908); /* 8046067C-80460680 000014 0004+00 1/1 0/0 0/0 .rodata @3909 */ SECTION_RODATA static f32 const lit_3909 = 2.0f; -COMPILER_STRIP_GATE(8046067C, &lit_3909); +COMPILER_STRIP_GATE(0x8046067C, &lit_3909); /* 8045EC44-8045ED1C 000464 00D8+00 1/1 0/0 0/0 .text CreateInit__10daKnob20_cFv */ #pragma push @@ -525,6 +567,35 @@ asm void daKnob20_c::CreateInit() { #pragma pop /* ############################################################################################## */ +/* 804606C4-804606C4 00005C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8046071B = "DEFAULT_KNOB_DOOR_F_OPEN"; +SECTION_DEAD static char const* const stringBase_80460734 = "DEFAULT_KNOB_DOOR_B_OPEN"; +SECTION_DEAD static char const* const stringBase_8046074D = "DEFAULT_KNOB_TALK"; +SECTION_DEAD static char const* const stringBase_8046075F = "DEFAULT_KNOB_TALK_B"; +SECTION_DEAD static char const* const stringBase_80460773 = "DEFAULT_KNOB_TALK_F_OPEN"; +SECTION_DEAD static char const* const stringBase_8046078C = "DEFAULT_KNOB_TALK_B_OPEN"; +SECTION_DEAD static char const* const stringBase_804607A5 = "F_SP116"; +SECTION_DEAD static char const* const stringBase_804607AD = "WAIT"; +SECTION_DEAD static char const* const stringBase_804607B2 = "SETSTART"; +SECTION_DEAD static char const* const stringBase_804607BB = "SETANGLE"; +SECTION_DEAD static char const* const stringBase_804607C4 = "ADJUSTMENT"; +SECTION_DEAD static char const* const stringBase_804607CF = "OPEN_PUSH"; +SECTION_DEAD static char const* const stringBase_804607D9 = "OPEN_PULL"; +SECTION_DEAD static char const* const stringBase_804607E3 = "OPEN_PUSH2"; +SECTION_DEAD static char const* const stringBase_804607EE = "OPEN_PULL2"; +SECTION_DEAD static char const* const stringBase_804607F9 = "OPEN_PUSH_STOP"; +SECTION_DEAD static char const* const stringBase_80460808 = "OPEN_PULL_STOP"; +SECTION_DEAD static char const* const stringBase_80460817 = "TALK"; +SECTION_DEAD static char const* const stringBase_8046081C = "TALK_END"; +SECTION_DEAD static char const* const stringBase_80460825 = "SETSTART_PUSH"; +SECTION_DEAD static char const* const stringBase_80460833 = "SETSTART_PULL"; +SECTION_DEAD static char const* const stringBase_80460841 = "DEMO_OPEN"; +SECTION_DEAD static char const* const stringBase_8046084B = "DEMO_CLOSE"; +SECTION_DEAD static char const* const stringBase_80460856 = "FDoorB.bck"; +#pragma pop + /* 80460898-804608B4 -00001 001C+00 1/1 0/0 0/0 .data ev_name_table$4009 */ SECTION_DATA static void* ev_name_table[7] = { (void*)(((char*)&d_a_door_knob00__stringBase0) + 0x57), @@ -781,7 +852,7 @@ asm void daKnob20_c::setEventId() { SECTION_RODATA static u8 const lit_4088[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80460680, &lit_4088); +COMPILER_STRIP_GATE(0x80460680, &lit_4088); #pragma pop /* 80460688-80460690 000020 0008+00 0/1 0/0 0/0 .rodata @4089 */ @@ -790,7 +861,7 @@ COMPILER_STRIP_GATE(80460680, &lit_4088); SECTION_RODATA static u8 const lit_4089[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80460688, &lit_4089); +COMPILER_STRIP_GATE(0x80460688, &lit_4089); #pragma pop /* 80460690-80460698 000028 0008+00 0/1 0/0 0/0 .rodata @4090 */ @@ -799,7 +870,7 @@ COMPILER_STRIP_GATE(80460688, &lit_4089); SECTION_RODATA static u8 const lit_4090[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80460690, &lit_4090); +COMPILER_STRIP_GATE(0x80460690, &lit_4090); #pragma pop /* 8045F058-8045F29C 000878 0244+00 1/1 0/0 0/0 .text checkArea__10daKnob20_cFfff */ @@ -817,21 +888,21 @@ asm void daKnob20_c::checkArea(f32 param_0, f32 param_1, f32 param_2) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4139 = 80.0f; -COMPILER_STRIP_GATE(80460698, &lit_4139); +COMPILER_STRIP_GATE(0x80460698, &lit_4139); #pragma pop /* 8046069C-804606A0 000034 0004+00 0/1 0/0 0/0 .rodata @4140 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4140 = 110.0f; -COMPILER_STRIP_GATE(8046069C, &lit_4140); +COMPILER_STRIP_GATE(0x8046069C, &lit_4140); #pragma pop /* 804606A0-804606A4 000038 0004+00 0/1 0/0 0/0 .rodata @4141 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4141 = 250.0f; -COMPILER_STRIP_GATE(804606A0, &lit_4141); +COMPILER_STRIP_GATE(0x804606A0, &lit_4141); #pragma pop /* 8045F29C-8045F428 000ABC 018C+00 3/3 0/0 0/0 .text setEventPrm__10daKnob20_cFv */ @@ -879,7 +950,7 @@ asm void daKnob20_c::getDemoAction() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4272 = -70.0f; -COMPILER_STRIP_GATE(804606A4, &lit_4272); +COMPILER_STRIP_GATE(0x804606A4, &lit_4272); #pragma pop /* 8045F568-8045F8A4 000D88 033C+00 9/7 0/0 0/0 .text demoProc__10daKnob20_cFv */ @@ -917,21 +988,21 @@ asm void daKnob20_c::setAngle() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4273 = -1.0f; -COMPILER_STRIP_GATE(804606A8, &lit_4273); +COMPILER_STRIP_GATE(0x804606A8, &lit_4273); #pragma pop /* 804606AC-804606B0 000044 0004+00 0/1 0/0 0/0 .rodata @4330 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4330 = 4.0f / 5.0f; -COMPILER_STRIP_GATE(804606AC, &lit_4330); +COMPILER_STRIP_GATE(0x804606AC, &lit_4330); #pragma pop /* 804606B0-804606B4 000048 0004+00 0/1 0/0 0/0 .rodata @4331 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4331 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(804606B0, &lit_4331); +COMPILER_STRIP_GATE(0x804606B0, &lit_4331); #pragma pop /* 8045F968-8045FA98 001188 0130+00 1/1 0/0 0/0 .text adjustmentProc__10daKnob20_cFv */ @@ -949,7 +1020,7 @@ asm void daKnob20_c::adjustmentProc() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4363 = 38.0f; -COMPILER_STRIP_GATE(804606B4, &lit_4363); +COMPILER_STRIP_GATE(0x804606B4, &lit_4363); #pragma pop /* 8045FA98-8045FBF8 0012B8 0160+00 1/1 0/0 0/0 .text openInit__10daKnob20_cFi */ @@ -965,7 +1036,7 @@ asm void daKnob20_c::openInit(int param_0) { /* ############################################################################################## */ /* 804606B8-804606BC 000050 0004+00 1/1 0/0 0/0 .rodata @4377 */ SECTION_RODATA static f32 const lit_4377 = 15.0f; -COMPILER_STRIP_GATE(804606B8, &lit_4377); +COMPILER_STRIP_GATE(0x804606B8, &lit_4377); /* 8045FBF8-8045FCA4 001418 00AC+00 1/1 0/0 0/0 .text openProc__10daKnob20_cFi */ #pragma push @@ -982,14 +1053,14 @@ asm void daKnob20_c::openProc(int param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4424 = 180.0f; -COMPILER_STRIP_GATE(804606BC, &lit_4424); +COMPILER_STRIP_GATE(0x804606BC, &lit_4424); #pragma pop /* 804606C0-804606C4 000058 0004+00 0/1 0/0 0/0 .rodata @4425 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4425 = -180.0f; -COMPILER_STRIP_GATE(804606C0, &lit_4425); +COMPILER_STRIP_GATE(0x804606C0, &lit_4425); #pragma pop /* 8045FCA4-8045FDF8 0014C4 0154+00 1/1 0/0 0/0 .text openEnd__10daKnob20_cFi */ @@ -1002,6 +1073,13 @@ asm void daKnob20_c::openEnd(int param_0) { } #pragma pop +/* ############################################################################################## */ +/* 804606C4-804606C4 00005C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80460861 = "SHUTTER_DOOR"; +#pragma pop + /* 8045FDF8-8045FE68 001618 0070+00 3/3 0/0 0/0 .text initOpenDemo__10daKnob20_cFv */ #pragma push #pragma optimization_level 0 @@ -1022,6 +1100,13 @@ asm void daKnob20_c::startDemoProc() { } #pragma pop +/* ############################################################################################## */ +/* 804606C4-804606C4 00005C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8046086E = "kdoor"; +#pragma pop + /* 8045FF08-8045FFB0 001728 00A8+00 1/0 0/0 0/0 .text actionWait__10daKnob20_cFv */ #pragma push #pragma optimization_level 0 @@ -1172,42 +1257,4 @@ static asm void daKnob20_Create(fopAc_ac_c* param_0) { } #pragma pop -/* 804606C4-80460874 00005C 01B0+00 17/13 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_804606C4 = "door-knob_"; -SECTION_DEAD static char const* const stringBase_804606CF = "static"; -SECTION_DEAD static char const* const stringBase_804606D6 = "DoorK10"; -SECTION_DEAD static char const* const stringBase_804606DE = "door-knob.dzb"; -SECTION_DEAD static char const* const stringBase_804606EC = "door-knobDummy.bmd"; -SECTION_DEAD static char const* const stringBase_804606FF = "%s%02d.bmd"; -SECTION_DEAD static char const* const stringBase_8046070A = "FDoorA.bck"; -SECTION_DEAD static char const* const stringBase_80460715 = "FDoor"; -SECTION_DEAD static char const* const stringBase_8046071B = "DEFAULT_KNOB_DOOR_F_OPEN"; -SECTION_DEAD static char const* const stringBase_80460734 = "DEFAULT_KNOB_DOOR_B_OPEN"; -SECTION_DEAD static char const* const stringBase_8046074D = "DEFAULT_KNOB_TALK"; -SECTION_DEAD static char const* const stringBase_8046075F = "DEFAULT_KNOB_TALK_B"; -SECTION_DEAD static char const* const stringBase_80460773 = "DEFAULT_KNOB_TALK_F_OPEN"; -SECTION_DEAD static char const* const stringBase_8046078C = "DEFAULT_KNOB_TALK_B_OPEN"; -SECTION_DEAD static char const* const stringBase_804607A5 = "F_SP116"; -SECTION_DEAD static char const* const stringBase_804607AD = "WAIT"; -SECTION_DEAD static char const* const stringBase_804607B2 = "SETSTART"; -SECTION_DEAD static char const* const stringBase_804607BB = "SETANGLE"; -SECTION_DEAD static char const* const stringBase_804607C4 = "ADJUSTMENT"; -SECTION_DEAD static char const* const stringBase_804607CF = "OPEN_PUSH"; -SECTION_DEAD static char const* const stringBase_804607D9 = "OPEN_PULL"; -SECTION_DEAD static char const* const stringBase_804607E3 = "OPEN_PUSH2"; -SECTION_DEAD static char const* const stringBase_804607EE = "OPEN_PULL2"; -SECTION_DEAD static char const* const stringBase_804607F9 = "OPEN_PUSH_STOP"; -SECTION_DEAD static char const* const stringBase_80460808 = "OPEN_PULL_STOP"; -SECTION_DEAD static char const* const stringBase_80460817 = "TALK"; -SECTION_DEAD static char const* const stringBase_8046081C = "TALK_END"; -SECTION_DEAD static char const* const stringBase_80460825 = "SETSTART_PUSH"; -SECTION_DEAD static char const* const stringBase_80460833 = "SETSTART_PULL"; -SECTION_DEAD static char const* const stringBase_80460841 = "DEMO_OPEN"; -SECTION_DEAD static char const* const stringBase_8046084B = "DEMO_CLOSE"; -SECTION_DEAD static char const* const stringBase_80460856 = "FDoorB.bck"; -SECTION_DEAD static char const* const stringBase_80460861 = "SHUTTER_DOOR"; -SECTION_DEAD static char const* const stringBase_8046086E = "kdoor"; -#pragma pop +/* 804606C4-804606C4 00005C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1.cpp b/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1.cpp index c70ac9cab65..d2925f5a373 100644 --- a/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1.cpp +++ b/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1.cpp @@ -175,12 +175,12 @@ struct cBgS_PolyInfo { /* 802680B0 */ ~cBgS_PolyInfo(); }; -struct _GXColor {}; - struct csXyz { /* 802673F4 */ csXyz(s16, s16, s16); }; +struct _GXColor {}; + struct dPa_control_c { /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, @@ -382,7 +382,7 @@ extern "C" static void daMBdoorL1_Draw__FP12daMBdoorL1_c(); extern "C" static void daMBdoorL1_Execute__FP12daMBdoorL1_c(); extern "C" static void daMBdoorL1_Delete__FP12daMBdoorL1_c(); extern "C" static void daMBdoorL1_Create__FP10fopAc_ac_c(); -extern "C" void func_8067750C(int*); +extern "C" void func_8067750C(void* _this, int*); extern "C" static void func_80677528(); extern "C" static void func_80677530(); extern "C" static void func_80677538(); @@ -571,21 +571,21 @@ SECTION_RODATA static u8 const l_staff_name[13 + 3 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80677558, &l_staff_name); +COMPILER_STRIP_GATE(0x80677558, &l_staff_name); /* 80677568-80677580 000010 0018+00 1/1 0/0 0/0 .rodata l_door_heap_size */ SECTION_RODATA static u8 const l_door_heap_size[24] = { 0x00, 0x00, 0x0A, 0xE0, 0x18, 0x20, 0x11, 0x80, 0x18, 0x20, 0x13, 0x10, 0x0A, 0xE0, 0x0A, 0xE0, 0x13, 0xA0, 0x18, 0x20, 0x0A, 0xE0, 0x13, 0x10, }; -COMPILER_STRIP_GATE(80677568, &l_door_heap_size); +COMPILER_STRIP_GATE(0x80677568, &l_door_heap_size); /* 80677580-80677598 000028 0018+00 1/1 0/0 0/0 .rodata l_stop_heap_size */ SECTION_RODATA static u8 const l_stop_heap_size[24] = { 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x15, 0x40, 0x1B, 0xD0, 0x0E, 0xA0, 0x08, 0x00, 0x0E, 0xB0, 0x08, 0x00, 0x08, 0x00, 0x1B, 0xD0, }; -COMPILER_STRIP_GATE(80677580, &l_stop_heap_size); +COMPILER_STRIP_GATE(0x80677580, &l_stop_heap_size); /* 80677598-8067759C 000040 0004+00 3/16 0/0 0/0 .rodata @3740 */ SECTION_RODATA static u8 const lit_3740[4] = { @@ -594,15 +594,32 @@ SECTION_RODATA static u8 const lit_3740[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80677598, &lit_3740); +COMPILER_STRIP_GATE(0x80677598, &lit_3740); /* 8067759C-806775A0 000044 0004+00 1/9 0/0 0/0 .rodata @3741 */ SECTION_RODATA static f32 const lit_3741 = 1.0f; -COMPILER_STRIP_GATE(8067759C, &lit_3741); +COMPILER_STRIP_GATE(0x8067759C, &lit_3741); /* 806775A0-806775A4 000048 0004+00 1/7 0/0 0/0 .rodata @3742 */ SECTION_RODATA static f32 const lit_3742 = -1.0f; -COMPILER_STRIP_GATE(806775A0, &lit_3742); +COMPILER_STRIP_GATE(0x806775A0, &lit_3742); + +/* 80677660-80677660 000108 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80677660 = "DEFAULT_MBS_SHUTTER_L1_F"; +SECTION_DEAD static char const* const stringBase_80677679 = "DEFAULT_MBS_SHUTTER_L3_F"; +SECTION_DEAD static char const* const stringBase_80677692 = "DEFAULT_MBS_SHUTTER_L7_F"; +SECTION_DEAD static char const* const stringBase_806776AB = "DEFAULT_MBS_SHUTTER_L8_F"; +SECTION_DEAD static char const* const stringBase_806776C4 = "DEFAULT_MBS_SHUTTER_L1_B"; +SECTION_DEAD static char const* const stringBase_806776DD = "DEFAULT_MBS_SHUTTER_L3_B"; +SECTION_DEAD static char const* const stringBase_806776F6 = "DEFAULT_MBS_SHUTTER_L7_B"; +SECTION_DEAD static char const* const stringBase_8067770F = "DEFAULT_MBS_SHUTTER_L8_B"; +SECTION_DEAD static char const* const stringBase_80677728 = "DEFAULT_MBS_KNOB_OPEN_B"; +SECTION_DEAD static char const* const stringBase_80677740 = "DEFAULT_MBS_KNOB_OPEN_F"; +SECTION_DEAD static char const* const stringBase_80677758 = "DEFAULT_MBS_KNOB_NOTOPEN_B"; +SECTION_DEAD static char const* const stringBase_80677773 = "DEFAULT_MBS_KNOB_NOTOPEN_F"; +#pragma pop /* 80677970-8067797C 000000 000C+00 2/2 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { @@ -701,14 +718,14 @@ asm void dDoor_stop2_c::closeInit(fopAc_ac_c* param_0, u8 param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3752 = 60.0f; -COMPILER_STRIP_GATE(806775A4, &lit_3752); +COMPILER_STRIP_GATE(0x806775A4, &lit_3752); #pragma pop /* 806775A8-806775AC 000050 0004+00 0/1 0/0 0/0 .rodata @3753 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3753 = 6.0f; -COMPILER_STRIP_GATE(806775A8, &lit_3753); +COMPILER_STRIP_GATE(0x806775A8, &lit_3753); #pragma pop /* 80672AE4-80672B70 000324 008C+00 2/2 0/0 0/0 .text closeProc__13dDoor_stop2_cFP10fopAc_ac_c */ @@ -751,11 +768,11 @@ asm void dDoor_stop2_c::openInit(fopAc_ac_c* param_0, u8 param_1) { /* ############################################################################################## */ /* 806775AC-806775B0 000054 0004+00 1/2 0/0 0/0 .rodata @3801 */ SECTION_RODATA static f32 const lit_3801 = 30.0f; -COMPILER_STRIP_GATE(806775AC, &lit_3801); +COMPILER_STRIP_GATE(0x806775AC, &lit_3801); /* 806775B0-806775B4 000058 0004+00 1/1 0/0 0/0 .rodata @3802 */ SECTION_RODATA static f32 const lit_3802 = 4.0f; -COMPILER_STRIP_GATE(806775B0, &lit_3802); +COMPILER_STRIP_GATE(0x806775B0, &lit_3802); /* 80672CD8-80672D80 000518 00A8+00 1/1 0/0 0/0 .text openProc__13dDoor_stop2_cFP10fopAc_ac_c */ #pragma push @@ -791,7 +808,7 @@ asm void dDoor_stop2_c::draw(fopAc_ac_c* param_0) { /* ############################################################################################## */ /* 806775B4-806775B8 00005C 0004+00 2/3 0/0 0/0 .rodata @3834 */ SECTION_RODATA static f32 const lit_3834 = 300.0f; -COMPILER_STRIP_GATE(806775B4, &lit_3834); +COMPILER_STRIP_GATE(0x806775B4, &lit_3834); /* 80672E44-80672E70 000684 002C+00 2/2 0/0 0/0 .text getHeight__13dDoor_stop2_cFv */ #pragma push @@ -803,6 +820,14 @@ asm void dDoor_stop2_c::getHeight() { } #pragma pop +/* ############################################################################################## */ +/* 80677660-80677660 000108 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8067778E = "DoorY00"; +SECTION_DEAD static char const* const stringBase_80677796 = "DoorT00"; +#pragma pop + /* 80672E70-80672EE8 0006B0 0078+00 5/5 0/0 0/0 .text getAnmArcName__12daMBdoorL1_cFv */ #pragma push #pragma optimization_level 0 @@ -814,6 +839,16 @@ asm void daMBdoorL1_c::getAnmArcName() { #pragma pop /* ############################################################################################## */ +/* 80677660-80677660 000108 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8067779E = "L1MBdoor"; +SECTION_DEAD static char const* const stringBase_806777A7 = "L3MBdoor"; +SECTION_DEAD static char const* const stringBase_806777B0 = "L5MBdoor"; +SECTION_DEAD static char const* const stringBase_806777B9 = "L8MBdoor"; +SECTION_DEAD static char const* const stringBase_806777C2 = "L7MBdoor"; +#pragma pop + /* 80677A58-80677A88 -00001 0030+00 1/1 0/0 0/0 .data @3859 */ SECTION_DATA static void* lit_3859[12] = { (void*)(((char*)getArcName__12daMBdoorL1_cFv) + 0x30), @@ -840,6 +875,13 @@ asm void daMBdoorL1_c::getArcName() { } #pragma pop +/* ############################################################################################## */ +/* 80677660-80677660 000108 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_806777CB = "static"; +#pragma pop + /* 80672F74-80672F84 0007B4 0010+00 4/4 0/0 0/0 .text getAlwaysArcName__12daMBdoorL1_cFv */ #pragma push @@ -861,6 +903,14 @@ asm void daMBdoorL1_c::getDoorType() { } #pragma pop +/* ############################################################################################## */ +/* 80677660-80677660 000108 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_806777D2 = "oj_DoorOpD.bck"; +SECTION_DEAD static char const* const stringBase_806777E1 = "oj_DoorOpC.bck"; +#pragma pop + /* 80672FE4-80673048 000824 0064+00 2/2 0/0 0/0 .text getOpenAnm__12daMBdoorL1_cFv */ #pragma push #pragma optimization_level 0 @@ -871,6 +921,14 @@ asm void daMBdoorL1_c::getOpenAnm() { } #pragma pop +/* ############################################################################################## */ +/* 80677660-80677660 000108 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_806777F0 = "oj_DoorCloseD.bck"; +SECTION_DEAD static char const* const stringBase_80677802 = "oj_DoorCloseC.bck"; +#pragma pop + /* 80673048-806730AC 000888 0064+00 1/1 0/0 0/0 .text getCloseAnm__12daMBdoorL1_cFv */ #pragma push #pragma optimization_level 0 @@ -881,6 +939,14 @@ asm void daMBdoorL1_c::getCloseAnm() { } #pragma pop +/* ############################################################################################## */ +/* 80677660-80677660 000108 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80677814 = "door-knob_00.bmd"; +SECTION_DEAD static char const* const stringBase_80677825 = "door-shutter_00.bmd"; +#pragma pop + /* 806730AC-80673100 0008EC 0054+00 1/1 0/0 0/0 .text getBmd__12daMBdoorL1_cFv */ #pragma push #pragma optimization_level 0 @@ -891,6 +957,13 @@ asm void daMBdoorL1_c::getBmd() { } #pragma pop +/* ############################################################################################## */ +/* 80677660-80677660 000108 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80677839 = "door-shutter_00.btk"; +#pragma pop + /* 80673100-80673110 000940 0010+00 1/1 0/0 0/0 .text getBtk__12daMBdoorL1_cFv */ #pragma push #pragma optimization_level 0 @@ -901,6 +974,13 @@ asm void daMBdoorL1_c::getBtk() { } #pragma pop +/* ############################################################################################## */ +/* 80677660-80677660 000108 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8067784D = "door-shutter.dzb"; +#pragma pop + /* 80673110-80673140 000950 0030+00 1/1 0/0 0/0 .text getDzb__12daMBdoorL1_cFv */ #pragma push #pragma optimization_level 0 @@ -927,14 +1007,48 @@ asm void daMBdoorL1_c::getDoorModelData() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4033 = -75.0f; -COMPILER_STRIP_GATE(806775B8, &lit_4033); +COMPILER_STRIP_GATE(0x806775B8, &lit_4033); #pragma pop /* 806775BC-806775C0 000064 0004+00 0/1 0/0 0/0 .rodata @4034 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4034 = 7.0f / 5.0f; -COMPILER_STRIP_GATE(806775BC, &lit_4034); +COMPILER_STRIP_GATE(0x806775BC, &lit_4034); +#pragma pop + +/* 80677660-80677660 000108 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8067785E = "FDoorA.bck"; +SECTION_DEAD static char const* const stringBase_80677869 = "door-stop.bmd"; +SECTION_DEAD static char const* const stringBase_80677877 = "WAIT"; +SECTION_DEAD static char const* const stringBase_8067787C = "SETANGLE"; +SECTION_DEAD static char const* const stringBase_80677885 = "UNLOCK"; +SECTION_DEAD static char const* const stringBase_8067788C = "OPEN"; +SECTION_DEAD static char const* const stringBase_80677891 = "SETGOAL"; +SECTION_DEAD static char const* const stringBase_80677899 = "SETGOAL2"; +SECTION_DEAD static char const* const stringBase_806778A2 = "CLOSE"; +SECTION_DEAD static char const* const stringBase_806778A8 = "STOP_CLOSE"; +SECTION_DEAD static char const* const stringBase_806778B3 = "STOP_OPEN"; +SECTION_DEAD static char const* const stringBase_806778BD = "SMOKE"; +SECTION_DEAD static char const* const stringBase_806778C3 = "SMOKE_END"; +SECTION_DEAD static char const* const stringBase_806778CD = "END"; +SECTION_DEAD static char const* const stringBase_806778D1 = "END_CHECK"; +SECTION_DEAD static char const* const stringBase_806778DB = "CHG_SCENE"; +SECTION_DEAD static char const* const stringBase_806778E5 = "OPEN_PULL"; +SECTION_DEAD static char const* const stringBase_806778EF = "OPEN_PUSH"; +SECTION_DEAD static char const* const stringBase_806778F9 = ""; +SECTION_DEAD static char const* const stringBase_806778FA = "ADJUSTMENT"; +SECTION_DEAD static char const* const stringBase_80677905 = "OPEN_PUSH2"; +SECTION_DEAD static char const* const stringBase_80677910 = "OPEN_PULL2"; +SECTION_DEAD static char const* const stringBase_8067791B = "SETSTART_PUSH"; +SECTION_DEAD static char const* const stringBase_80677929 = "SETSTART_PULL"; +SECTION_DEAD static char const* const stringBase_80677937 = "SETPOS"; +SECTION_DEAD static char const* const stringBase_8067793E = "LIGHT_ANM"; +SECTION_DEAD static char const* const stringBase_80677948 = "INIT"; +SECTION_DEAD static char const* const stringBase_8067794D = "Timer"; +SECTION_DEAD static char const* const stringBase_80677953 = "FDoorB.bck"; #pragma pop /* 80677A88-80677AF0 -00001 0068+00 1/1 0/0 0/0 .data action_table$4271 */ @@ -1208,14 +1322,14 @@ asm J3DFrameCtrl::~J3DFrameCtrl() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4083 = 220.0f; -COMPILER_STRIP_GATE(806775C0, &lit_4083); +COMPILER_STRIP_GATE(0x806775C0, &lit_4083); #pragma pop /* 806775C4-806775C8 00006C 0004+00 0/1 0/0 0/0 .rodata @4084 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4084 = -220.0f; -COMPILER_STRIP_GATE(806775C4, &lit_4084); +COMPILER_STRIP_GATE(0x806775C4, &lit_4084); #pragma pop /* 806735F8-80673790 000E38 0198+00 4/4 0/0 0/0 .text calcMtx__12daMBdoorL1_cFv */ @@ -1231,7 +1345,7 @@ asm void daMBdoorL1_c::calcMtx() { /* ############################################################################################## */ /* 806775C8-806775CC 000070 0004+00 1/1 0/0 0/0 .rodata @4122 */ SECTION_RODATA static f32 const lit_4122 = 35.0f; -COMPILER_STRIP_GATE(806775C8, &lit_4122); +COMPILER_STRIP_GATE(0x806775C8, &lit_4122); /* 80673790-806738CC 000FD0 013C+00 1/1 0/0 0/0 .text createKey__12daMBdoorL1_cFv */ #pragma push @@ -1248,7 +1362,7 @@ asm void daMBdoorL1_c::createKey() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4179 = 150.0f; -COMPILER_STRIP_GATE(806775CC, &lit_4179); +COMPILER_STRIP_GATE(0x806775CC, &lit_4179); #pragma pop /* 806738CC-80673B9C 00110C 02D0+00 1/1 0/0 0/0 .text CreateInit__12daMBdoorL1_cFv */ @@ -1316,21 +1430,21 @@ asm void daMBdoorL1_c::demoProc() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4675 = -37.5f; -COMPILER_STRIP_GATE(806775D0, &lit_4675); +COMPILER_STRIP_GATE(0x806775D0, &lit_4675); #pragma pop /* 806775D4-806775D8 00007C 0004+00 0/2 0/0 0/0 .rodata @4676 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4676 = -70.0f; -COMPILER_STRIP_GATE(806775D4, &lit_4676); +COMPILER_STRIP_GATE(0x806775D4, &lit_4676); #pragma pop /* 806775D8-806775DC 000080 0004+00 0/0 0/0 0/0 .rodata @4677 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4677 = 37.5f; -COMPILER_STRIP_GATE(806775D8, &lit_4677); +COMPILER_STRIP_GATE(0x806775D8, &lit_4677); #pragma pop /* 806775DC-806775E0 000084 0004+00 0/1 0/0 0/0 .rodata l_eff_id$4696 */ @@ -1342,7 +1456,7 @@ SECTION_RODATA static u8 const l_eff_id[4] = { 0x82, 0x96, }; -COMPILER_STRIP_GATE(806775DC, &l_eff_id); +COMPILER_STRIP_GATE(0x806775DC, &l_eff_id); #pragma pop /* 806775E0-806775EC 000088 000A+02 0/1 0/0 0/0 .rodata l_eff_id_lv3$4705 */ @@ -1363,7 +1477,7 @@ SECTION_RODATA static u8 const l_eff_id_lv3[10 + 2 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(806775E0, &l_eff_id_lv3); +COMPILER_STRIP_GATE(0x806775E0, &l_eff_id_lv3); #pragma pop /* 806775EC-806775F8 000094 000A+02 0/1 0/0 0/0 .rodata l_eff_id_lv4$4706 */ @@ -1384,7 +1498,7 @@ SECTION_RODATA static u8 const l_eff_id_lv4[10 + 2 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(806775EC, &l_eff_id_lv4); +COMPILER_STRIP_GATE(0x806775EC, &l_eff_id_lv4); #pragma pop /* 80674AF4-80674DA4 002334 02B0+00 1/1 0/0 0/0 .text openInit__12daMBdoorL1_cFv */ @@ -1402,21 +1516,21 @@ asm void daMBdoorL1_c::openInit() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4829 = 17.0f; -COMPILER_STRIP_GATE(806775F8, &lit_4829); +COMPILER_STRIP_GATE(0x806775F8, &lit_4829); #pragma pop /* 806775FC-80677600 0000A4 0004+00 0/1 0/0 0/0 .rodata @4830 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4830 = 18.0f; -COMPILER_STRIP_GATE(806775FC, &lit_4830); +COMPILER_STRIP_GATE(0x806775FC, &lit_4830); #pragma pop /* 80677600-80677604 0000A8 0004+00 0/1 0/0 0/0 .rodata @4831 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4831 = 20.0f; -COMPILER_STRIP_GATE(80677600, &lit_4831); +COMPILER_STRIP_GATE(0x80677600, &lit_4831); #pragma pop /* 80674DA4-80674FDC 0025E4 0238+00 1/1 0/0 0/0 .text openProc__12daMBdoorL1_cFv */ @@ -1444,7 +1558,7 @@ asm void daMBdoorL1_c::openEnd() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4901 = 200.0f; -COMPILER_STRIP_GATE(80677604, &lit_4901); +COMPILER_STRIP_GATE(0x80677604, &lit_4901); #pragma pop /* 80675068-806752BC 0028A8 0254+00 1/1 0/0 0/0 .text closeInit__12daMBdoorL1_cFv */ @@ -1502,7 +1616,7 @@ asm void daMBdoorL1_c::unlock() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5000 = 38.0f; -COMPILER_STRIP_GATE(80677608, &lit_5000); +COMPILER_STRIP_GATE(0x80677608, &lit_5000); #pragma pop /* 80675470-80675678 002CB0 0208+00 1/1 0/0 0/0 .text openInitKnob__12daMBdoorL1_cFi */ @@ -1518,7 +1632,7 @@ asm void daMBdoorL1_c::openInitKnob(int param_0) { /* ############################################################################################## */ /* 8067760C-80677610 0000B4 0004+00 1/1 0/0 0/0 .rodata @5017 */ SECTION_RODATA static f32 const lit_5017 = 15.0f; -COMPILER_STRIP_GATE(8067760C, &lit_5017); +COMPILER_STRIP_GATE(0x8067760C, &lit_5017); /* 80675678-80675734 002EB8 00BC+00 1/1 0/0 0/0 .text openProcKnob__12daMBdoorL1_cFi */ #pragma push @@ -1535,14 +1649,14 @@ asm void daMBdoorL1_c::openProcKnob(int param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5069 = 180.0f; -COMPILER_STRIP_GATE(80677610, &lit_5069); +COMPILER_STRIP_GATE(0x80677610, &lit_5069); #pragma pop /* 80677614-80677618 0000BC 0004+00 0/2 0/0 0/0 .rodata @5070 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5070 = -180.0f; -COMPILER_STRIP_GATE(80677614, &lit_5070); +COMPILER_STRIP_GATE(0x80677614, &lit_5070); #pragma pop /* 80675734-80675894 002F74 0160+00 1/1 0/0 0/0 .text openEndKnob__12daMBdoorL1_cFi */ @@ -1560,35 +1674,35 @@ asm void daMBdoorL1_c::openEndKnob(int param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5096 = 0.5f; -COMPILER_STRIP_GATE(80677618, &lit_5096); +COMPILER_STRIP_GATE(0x80677618, &lit_5096); #pragma pop /* 8067761C-80677620 0000C4 0004+00 0/1 0/0 0/0 .rodata @5097 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5097 = -1000.0f; -COMPILER_STRIP_GATE(8067761C, &lit_5097); +COMPILER_STRIP_GATE(0x8067761C, &lit_5097); #pragma pop /* 80677620-80677624 0000C8 0004+00 0/1 0/0 0/0 .rodata @5098 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5098 = 1000.0f; -COMPILER_STRIP_GATE(80677620, &lit_5098); +COMPILER_STRIP_GATE(0x80677620, &lit_5098); #pragma pop /* 80677624-80677628 0000CC 0004+00 0/1 0/0 0/0 .rodata @5099 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5099 = -240.0f; -COMPILER_STRIP_GATE(80677624, &lit_5099); +COMPILER_STRIP_GATE(0x80677624, &lit_5099); #pragma pop /* 80677628-8067762C 0000D0 0004+00 0/1 0/0 0/0 .rodata @5100 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5100 = 240.0f; -COMPILER_STRIP_GATE(80677628, &lit_5100); +COMPILER_STRIP_GATE(0x80677628, &lit_5100); #pragma pop /* 80675894-806759E4 0030D4 0150+00 1/1 0/0 0/0 .text calcGoal__12daMBdoorL1_cFP4cXyzi */ @@ -1627,28 +1741,28 @@ asm void daMBdoorL1_c::setAngleQuickly() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5195 = 75.0f; -COMPILER_STRIP_GATE(8067762C, &lit_5195); +COMPILER_STRIP_GATE(0x8067762C, &lit_5195); #pragma pop /* 80677630-80677634 0000D8 0004+00 0/2 0/0 0/0 .rodata @5196 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5196 = 70.0f; -COMPILER_STRIP_GATE(80677630, &lit_5196); +COMPILER_STRIP_GATE(0x80677630, &lit_5196); #pragma pop /* 80677634-80677638 0000DC 0004+00 0/1 0/0 0/0 .rodata @5197 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5197 = 4.0f / 5.0f; -COMPILER_STRIP_GATE(80677634, &lit_5197); +COMPILER_STRIP_GATE(0x80677634, &lit_5197); #pragma pop /* 80677638-8067763C 0000E0 0004+00 0/1 0/0 0/0 .rodata @5198 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5198 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(80677638, &lit_5198); +COMPILER_STRIP_GATE(0x80677638, &lit_5198); #pragma pop /* 80675B30-80675DB0 003370 0280+00 1/1 0/0 0/0 .text adjustmentProc__12daMBdoorL1_cFv */ @@ -1666,14 +1780,14 @@ asm void daMBdoorL1_c::adjustmentProc() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5229 = 100.0f; -COMPILER_STRIP_GATE(8067763C, &lit_5229); +COMPILER_STRIP_GATE(0x8067763C, &lit_5229); #pragma pop /* 80677640-80677644 0000E8 0004+00 0/1 0/0 0/0 .rodata @5230 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5230 = -100.0f; -COMPILER_STRIP_GATE(80677640, &lit_5230); +COMPILER_STRIP_GATE(0x80677640, &lit_5230); #pragma pop /* 80675DB0-80675EE4 0035F0 0134+00 1/1 0/0 0/0 .text setPos__12daMBdoorL1_cFv */ @@ -1711,19 +1825,19 @@ asm dBgS_ObjGndChk::~dBgS_ObjGndChk() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5279 = 50.0f; -COMPILER_STRIP_GATE(80677644, &lit_5279); +COMPILER_STRIP_GATE(0x80677644, &lit_5279); #pragma pop /* 80677648-8067764C 0000F0 0004+00 0/0 0/0 0/0 .rodata @5280 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5280 = -1000000000.0f; -COMPILER_STRIP_GATE(80677648, &lit_5280); +COMPILER_STRIP_GATE(0x80677648, &lit_5280); #pragma pop /* 8067764C-80677650 0000F4 0004+00 1/1 0/0 0/0 .rodata @5293 */ SECTION_RODATA static f32 const lit_5293 = 10.0f; -COMPILER_STRIP_GATE(8067764C, &lit_5293); +COMPILER_STRIP_GATE(0x8067764C, &lit_5293); /* 80676004-806760B4 003844 00B0+00 1/1 0/0 0/0 .text smokeInit2__12daMBdoorL1_cFv */ #pragma push @@ -1738,17 +1852,17 @@ asm void daMBdoorL1_c::smokeInit2() { /* ############################################################################################## */ /* 80677650-80677654 0000F8 0004+00 1/1 0/0 0/0 .rodata @5381 */ SECTION_RODATA static f32 const lit_5381 = 130.0f; -COMPILER_STRIP_GATE(80677650, &lit_5381); +COMPILER_STRIP_GATE(0x80677650, &lit_5381); /* 80677654-80677658 0000FC 0004+00 1/1 0/0 0/0 .rodata @5382 */ SECTION_RODATA static f32 const lit_5382 = 110.0f; -COMPILER_STRIP_GATE(80677654, &lit_5382); +COMPILER_STRIP_GATE(0x80677654, &lit_5382); /* 80677658-80677660 000100 0008+00 1/1 0/0 0/0 .rodata @5384 */ SECTION_RODATA static u8 const lit_5384[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80677658, &lit_5384); +COMPILER_STRIP_GATE(0x80677658, &lit_5384); /* 806760B4-806762A4 0038F4 01F0+00 1/1 0/0 0/0 .text checkArea__12daMBdoorL1_cFv */ #pragma push @@ -1900,6 +2014,13 @@ bool daMBdoorL1_c::actionWait() { return true; } +/* ############################################################################################## */ +/* 80677660-80677660 000108 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8067795E = "DEFAULT_STOP_OPEN"; +#pragma pop + /* 80676BE8-80676DEC 004428 0204+00 2/1 0/0 0/0 .text actionCloseWait__12daMBdoorL1_cFv */ #pragma push @@ -2060,7 +2181,7 @@ static asm void daMBdoorL1_Create(fopAc_ac_c* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_8067750C(int* param_0) { +extern "C" asm void func_8067750C(void* _this, int* param_0) { nofralloc #include "asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/func_8067750C.s" } @@ -2116,66 +2237,4 @@ static asm void func_80677548() { } #pragma pop -/* 80677660-80677970 000108 0310+00 16/11 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80677660 = "DEFAULT_MBS_SHUTTER_L1_F"; -SECTION_DEAD static char const* const stringBase_80677679 = "DEFAULT_MBS_SHUTTER_L3_F"; -SECTION_DEAD static char const* const stringBase_80677692 = "DEFAULT_MBS_SHUTTER_L7_F"; -SECTION_DEAD static char const* const stringBase_806776AB = "DEFAULT_MBS_SHUTTER_L8_F"; -SECTION_DEAD static char const* const stringBase_806776C4 = "DEFAULT_MBS_SHUTTER_L1_B"; -SECTION_DEAD static char const* const stringBase_806776DD = "DEFAULT_MBS_SHUTTER_L3_B"; -SECTION_DEAD static char const* const stringBase_806776F6 = "DEFAULT_MBS_SHUTTER_L7_B"; -SECTION_DEAD static char const* const stringBase_8067770F = "DEFAULT_MBS_SHUTTER_L8_B"; -SECTION_DEAD static char const* const stringBase_80677728 = "DEFAULT_MBS_KNOB_OPEN_B"; -SECTION_DEAD static char const* const stringBase_80677740 = "DEFAULT_MBS_KNOB_OPEN_F"; -SECTION_DEAD static char const* const stringBase_80677758 = "DEFAULT_MBS_KNOB_NOTOPEN_B"; -SECTION_DEAD static char const* const stringBase_80677773 = "DEFAULT_MBS_KNOB_NOTOPEN_F"; -SECTION_DEAD static char const* const stringBase_8067778E = "DoorY00"; -SECTION_DEAD static char const* const stringBase_80677796 = "DoorT00"; -SECTION_DEAD static char const* const stringBase_8067779E = "L1MBdoor"; -SECTION_DEAD static char const* const stringBase_806777A7 = "L3MBdoor"; -SECTION_DEAD static char const* const stringBase_806777B0 = "L5MBdoor"; -SECTION_DEAD static char const* const stringBase_806777B9 = "L8MBdoor"; -SECTION_DEAD static char const* const stringBase_806777C2 = "L7MBdoor"; -SECTION_DEAD static char const* const stringBase_806777CB = "static"; -SECTION_DEAD static char const* const stringBase_806777D2 = "oj_DoorOpD.bck"; -SECTION_DEAD static char const* const stringBase_806777E1 = "oj_DoorOpC.bck"; -SECTION_DEAD static char const* const stringBase_806777F0 = "oj_DoorCloseD.bck"; -SECTION_DEAD static char const* const stringBase_80677802 = "oj_DoorCloseC.bck"; -SECTION_DEAD static char const* const stringBase_80677814 = "door-knob_00.bmd"; -SECTION_DEAD static char const* const stringBase_80677825 = "door-shutter_00.bmd"; -SECTION_DEAD static char const* const stringBase_80677839 = "door-shutter_00.btk"; -SECTION_DEAD static char const* const stringBase_8067784D = "door-shutter.dzb"; -SECTION_DEAD static char const* const stringBase_8067785E = "FDoorA.bck"; -SECTION_DEAD static char const* const stringBase_80677869 = "door-stop.bmd"; -SECTION_DEAD static char const* const stringBase_80677877 = "WAIT"; -SECTION_DEAD static char const* const stringBase_8067787C = "SETANGLE"; -SECTION_DEAD static char const* const stringBase_80677885 = "UNLOCK"; -SECTION_DEAD static char const* const stringBase_8067788C = "OPEN"; -SECTION_DEAD static char const* const stringBase_80677891 = "SETGOAL"; -SECTION_DEAD static char const* const stringBase_80677899 = "SETGOAL2"; -SECTION_DEAD static char const* const stringBase_806778A2 = "CLOSE"; -SECTION_DEAD static char const* const stringBase_806778A8 = "STOP_CLOSE"; -SECTION_DEAD static char const* const stringBase_806778B3 = "STOP_OPEN"; -SECTION_DEAD static char const* const stringBase_806778BD = "SMOKE"; -SECTION_DEAD static char const* const stringBase_806778C3 = "SMOKE_END"; -SECTION_DEAD static char const* const stringBase_806778CD = "END"; -SECTION_DEAD static char const* const stringBase_806778D1 = "END_CHECK"; -SECTION_DEAD static char const* const stringBase_806778DB = "CHG_SCENE"; -SECTION_DEAD static char const* const stringBase_806778E5 = "OPEN_PULL"; -SECTION_DEAD static char const* const stringBase_806778EF = "OPEN_PUSH"; -SECTION_DEAD static char const* const stringBase_806778F9 = ""; -SECTION_DEAD static char const* const stringBase_806778FA = "ADJUSTMENT"; -SECTION_DEAD static char const* const stringBase_80677905 = "OPEN_PUSH2"; -SECTION_DEAD static char const* const stringBase_80677910 = "OPEN_PULL2"; -SECTION_DEAD static char const* const stringBase_8067791B = "SETSTART_PUSH"; -SECTION_DEAD static char const* const stringBase_80677929 = "SETSTART_PULL"; -SECTION_DEAD static char const* const stringBase_80677937 = "SETPOS"; -SECTION_DEAD static char const* const stringBase_8067793E = "LIGHT_ANM"; -SECTION_DEAD static char const* const stringBase_80677948 = "INIT"; -SECTION_DEAD static char const* const stringBase_8067794D = "Timer"; -SECTION_DEAD static char const* const stringBase_80677953 = "FDoorB.bck"; -SECTION_DEAD static char const* const stringBase_8067795E = "DEFAULT_STOP_OPEN"; -#pragma pop +/* 80677660-80677660 000108 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/door/d_a_door_push/d_a_door_push.cpp b/rel/d/a/door/d_a_door_push/d_a_door_push.cpp index 3c664a534c7..1302b2cb219 100644 --- a/rel/d/a/door/d_a_door_push/d_a_door_push.cpp +++ b/rel/d/a/door/d_a_door_push/d_a_door_push.cpp @@ -117,10 +117,10 @@ struct cBgS { /* 80074250 */ void Release(dBgW_Base*); }; -struct Vec {}; - struct JAISoundID {}; +struct Vec {}; + struct Z2SeMgr { /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); /* 802AC50C */ void seStartLevel(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); @@ -167,7 +167,7 @@ extern "C" void __ct__4cXyzFv(); extern "C" static void daDoorPush_MoveBGDelete__FP12daDoorPush_c(); extern "C" static void daDoorPush_MoveBGExecute__FP12daDoorPush_c(); extern "C" static void daDoorPush_MoveBGDraw__FP12daDoorPush_c(); -extern "C" void func_80678EA8(u8*); +extern "C" void func_80678EA8(void* _this, u8*); extern "C" extern char const* const d_a_door_push__stringBase0; // @@ -267,7 +267,7 @@ static asm void PPCallBack2(fopAc_ac_c* param_0, fopAc_ac_c* param_1, s16 param_ /* ############################################################################################## */ /* 80678ECC-80678ED0 000000 0004+00 4/4 0/0 0/0 .rodata @3688 */ SECTION_RODATA static f32 const lit_3688 = -550.0f; -COMPILER_STRIP_GATE(80678ECC, &lit_3688); +COMPILER_STRIP_GATE(0x80678ECC, &lit_3688); /* 80678ED0-80678ED4 000004 0004+00 0/3 0/0 0/0 .rodata @3689 */ #pragma push @@ -278,14 +278,14 @@ SECTION_RODATA static u8 const lit_3689[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80678ED0, &lit_3689); +COMPILER_STRIP_GATE(0x80678ED0, &lit_3689); #pragma pop /* 80678ED4-80678ED8 000008 0004+00 0/1 0/0 0/0 .rodata @3690 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3690 = 550.0f; -COMPILER_STRIP_GATE(80678ED4, &lit_3690); +COMPILER_STRIP_GATE(0x80678ED4, &lit_3690); #pragma pop /* 80677E08-80677F38 0000C8 0130+00 1/1 0/0 0/0 .text initBaseMtx__12daDoorPush_cFv */ @@ -303,14 +303,14 @@ asm void daDoorPush_c::initBaseMtx() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3716 = 450.0f; -COMPILER_STRIP_GATE(80678ED8, &lit_3716); +COMPILER_STRIP_GATE(0x80678ED8, &lit_3716); #pragma pop /* 80678EDC-80678EE0 000010 0004+00 0/1 0/0 0/0 .rodata @3717 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3717 = 75.0f; -COMPILER_STRIP_GATE(80678EDC, &lit_3717); +COMPILER_STRIP_GATE(0x80678EDC, &lit_3717); #pragma pop /* 80677F38-80678060 0001F8 0128+00 2/2 0/0 0/0 .text setBaseMtx__12daDoorPush_cFv */ @@ -336,7 +336,14 @@ asm cXyz::~cXyz() { /* ############################################################################################## */ /* 80678EE0-80678EE4 000014 0004+00 1/1 0/0 0/0 .rodata @3744 */ SECTION_RODATA static f32 const lit_3744 = 5.0f; -COMPILER_STRIP_GATE(80678EE0, &lit_3744); +COMPILER_STRIP_GATE(0x80678EE0, &lit_3744); + +/* 80678F18-80678F18 00004C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80678F18 = "V_OsuDoor"; +SECTION_DEAD static char const* const stringBase_80678F22 = "PUSH_DOOR_L"; +#pragma pop /* 80678F50-80678F5C 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { @@ -446,13 +453,13 @@ SECTION_RODATA static f32 const lit_3870[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80678EE4, &lit_3870); +COMPILER_STRIP_GATE(0x80678EE4, &lit_3870); /* 80678EEC-80678EF4 000020 0008+00 1/1 0/0 0/0 .rodata @3872 */ SECTION_RODATA static u8 const lit_3872[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80678EEC, &lit_3872); +COMPILER_STRIP_GATE(0x80678EEC, &lit_3872); /* 806784B4-80678664 000774 01B0+00 1/0 0/0 0/0 .text modeWait__12daDoorPush_cFv */ #pragma push @@ -548,6 +555,16 @@ asm void daDoorPush_c::actionEvent() { #pragma pop /* ############################################################################################## */ +/* 80678F18-80678F18 00004C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80678F2E = "WAIT"; +SECTION_DEAD static char const* const stringBase_80678F33 = "OPEN"; +SECTION_DEAD static char const* const stringBase_80678F38 = "SCENE_CHG"; +SECTION_DEAD static char const* const stringBase_80678F42 = "pdoor"; +SECTION_DEAD static char const* const stringBase_80678F48 = "Timer"; +#pragma pop + /* 80678FEC-80678FF8 -00001 000C+00 1/1 0/0 0/0 .data action_table$3910 */ SECTION_DATA static void* action_table[3] = { (void*)(((char*)&d_a_door_push__stringBase0) + 0x16), @@ -580,29 +597,29 @@ asm void daDoorPush_c::rotateInit() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3985 = 1.0f; -COMPILER_STRIP_GATE(80678EF4, &lit_3985); +COMPILER_STRIP_GATE(0x80678EF4, &lit_3985); #pragma pop /* 80678EF8-80678EFC 00002C 0004+00 0/0 0/0 0/0 .rodata @3986 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3986 = -1.0f; -COMPILER_STRIP_GATE(80678EF8, &lit_3986); +COMPILER_STRIP_GATE(0x80678EF8, &lit_3986); #pragma pop /* 80678EFC-80678F00 000030 0004+00 1/1 0/0 0/0 .rodata @4009 */ SECTION_RODATA static f32 const lit_4009 = 5461.0f; -COMPILER_STRIP_GATE(80678EFC, &lit_4009); +COMPILER_STRIP_GATE(0x80678EFC, &lit_4009); /* 80678F00-80678F04 000034 0004+00 1/1 0/0 0/0 .rodata @4010 */ SECTION_RODATA static f32 const lit_4010 = 60.0f; -COMPILER_STRIP_GATE(80678F00, &lit_4010); +COMPILER_STRIP_GATE(0x80678F00, &lit_4010); /* 80678F04-80678F0C 000038 0008+00 1/1 0/0 0/0 .rodata @4012 */ SECTION_RODATA static u8 const lit_4012[8] = { 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80678F04, &lit_4012); +COMPILER_STRIP_GATE(0x80678F04, &lit_4012); /* 80678B10-80678BC0 000DD0 00B0+00 1/1 0/0 0/0 .text rotate__12daDoorPush_cFv */ #pragma push @@ -619,21 +636,21 @@ asm void daDoorPush_c::rotate() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4031 = 300.0f; -COMPILER_STRIP_GATE(80678F0C, &lit_4031); +COMPILER_STRIP_GATE(0x80678F0C, &lit_4031); #pragma pop /* 80678F10-80678F14 000044 0004+00 0/1 0/0 0/0 .rodata @4032 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4032 = -400.0f; -COMPILER_STRIP_GATE(80678F10, &lit_4032); +COMPILER_STRIP_GATE(0x80678F10, &lit_4032); #pragma pop /* 80678F14-80678F18 000048 0004+00 0/1 0/0 0/0 .rodata @4033 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4033 = -300.0f; -COMPILER_STRIP_GATE(80678F14, &lit_4033); +COMPILER_STRIP_GATE(0x80678F14, &lit_4033); #pragma pop /* 80678BC0-80678C70 000E80 00B0+00 1/1 0/0 0/0 .text setGoal__12daDoorPush_cFv */ @@ -753,21 +770,10 @@ static asm void daDoorPush_MoveBGDraw(daDoorPush_c* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80678EA8(u8* param_0) { +extern "C" asm void func_80678EA8(void* _this, u8* param_0) { nofralloc #include "asm/rel/d/a/door/d_a_door_push/d_a_door_push/func_80678EA8.s" } #pragma pop -/* 80678F18-80678F4E 00004C 0036+00 4/2 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80678F18 = "V_OsuDoor"; -SECTION_DEAD static char const* const stringBase_80678F22 = "PUSH_DOOR_L"; -SECTION_DEAD static char const* const stringBase_80678F2E = "WAIT"; -SECTION_DEAD static char const* const stringBase_80678F33 = "OPEN"; -SECTION_DEAD static char const* const stringBase_80678F38 = "SCENE_CHG"; -SECTION_DEAD static char const* const stringBase_80678F42 = "pdoor"; -SECTION_DEAD static char const* const stringBase_80678F48 = "Timer"; -#pragma pop +/* 80678F18-80678F18 00004C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/door/d_a_door_shutter/d_a_door_shutter.cpp b/rel/d/a/door/d_a_door_shutter/d_a_door_shutter.cpp index a4bda510b14..a93de0fd9b7 100644 --- a/rel/d/a/door/d_a_door_shutter/d_a_door_shutter.cpp +++ b/rel/d/a/door/d_a_door_shutter/d_a_door_shutter.cpp @@ -201,12 +201,12 @@ struct cBgS_PolyInfo { /* 802680B0 */ ~cBgS_PolyInfo(); }; -struct _GXColor {}; - struct csXyz { /* 802673F4 */ csXyz(s16, s16, s16); }; +struct _GXColor {}; + struct dPa_control_c { /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, @@ -431,7 +431,7 @@ extern "C" static void daDoor20_Delete__FP10daDoor20_c(); extern "C" static void daDoor20_Create__FP10fopAc_ac_c(); extern "C" void __dt__12dBgS_AcchCirFv(); extern "C" void __dt__12dBgS_ObjAcchFv(); -extern "C" void func_804667EC(u8*); +extern "C" void func_804667EC(void* _this, u8*); extern "C" static void func_80466808(); extern "C" static void func_80466810(); extern "C" extern char const* const d_a_door_shutter__stringBase0; @@ -583,6 +583,13 @@ extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; // Declarations: // +/* ############################################################################################## */ +/* 804668D8-804668D8 0000B8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_804668D8 = "door-stop.bmd"; +#pragma pop + /* 80460B38-80460B70 000078 0038+00 1/1 0/0 0/0 .text getStopBmdName__10daDoor20_cFv */ #pragma push #pragma optimization_level 0 @@ -603,6 +610,13 @@ asm void daDoor20_c::getStopModelData() { } #pragma pop +/* ############################################################################################## */ +/* 804668D8-804668D8 0000B8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_804668E6 = "static"; +#pragma pop + /* 80460B94-80460BA4 0000D4 0010+00 4/4 0/0 0/0 .text getAlwaysArcName__10daDoor20_cFv */ #pragma push #pragma optimization_level 0 @@ -614,6 +628,17 @@ asm void daDoor20_c::getAlwaysArcName() { #pragma pop /* ############################################################################################## */ +/* 804668D8-804668D8 0000B8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_804668ED = "DoorT00"; +SECTION_DEAD static char const* const stringBase_804668F5 = "DoorY00"; +SECTION_DEAD static char const* const stringBase_804668FD = "DoorK00"; +SECTION_DEAD static char const* const stringBase_80466905 = "DoorLV8"; +SECTION_DEAD static char const* const stringBase_8046690D = "DoorLV7"; +SECTION_DEAD static char const* const stringBase_80466915 = "DoorLV9"; +#pragma pop + /* 80466E7C-80466E88 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -660,6 +685,13 @@ asm void daDoor20_c::getArcName() { #pragma pop /* ############################################################################################## */ +/* 804668D8-804668D8 0000B8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8046691D = "door-shutter_%02d.bmd"; +SECTION_DEAD static char const* const stringBase_80466933 = "door-knob_%02d.bmd"; +#pragma pop + /* 80467340-80467360 000000 0020+00 1/1 0/0 0/0 .bss bmdName$3984 */ static u8 bmdName[32]; @@ -673,6 +705,13 @@ asm void daDoor20_c::getBmdName() { } #pragma pop +/* ############################################################################################## */ +/* 804668D8-804668D8 0000B8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80466946 = "door-shutter_00.btk"; +#pragma pop + /* 80460CF0-80460D00 000230 0010+00 1/1 0/0 0/0 .text getBtk__10daDoor20_cFv */ #pragma push #pragma optimization_level 0 @@ -683,6 +722,14 @@ asm void daDoor20_c::getBtk() { } #pragma pop +/* ############################################################################################## */ +/* 804668D8-804668D8 0000B8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8046695A = "door-shutter.dzb"; +SECTION_DEAD static char const* const stringBase_8046696B = "door-shutterlv9.dzb"; +#pragma pop + /* 80460D00-80460D5C 000240 005C+00 1/0 0/0 0/0 .text getDzbName__10daDoor20_cFv */ #pragma push #pragma optimization_level 0 @@ -706,7 +753,7 @@ asm void daDoor20_c::getModelData() { /* ############################################################################################## */ /* 80466820-80466824 000000 0004+00 17/17 0/0 0/0 .rodata @4018 */ SECTION_RODATA static f32 const lit_4018 = 12100.0f; -COMPILER_STRIP_GATE(80466820, &lit_4018); +COMPILER_STRIP_GATE(0x80466820, &lit_4018); /* 80460D80-80460D8C 0002C0 000C+00 1/1 0/0 0/0 .text getSize2X__10daDoor20_cFv */ #pragma push @@ -731,11 +778,96 @@ static asm void CheckCreateHeap(fopAc_ac_c* param_0) { /* ############################################################################################## */ /* 80466824-80466828 000004 0004+00 6/12 0/0 0/0 .rodata @4124 */ SECTION_RODATA static f32 const lit_4124 = 1.0f; -COMPILER_STRIP_GATE(80466824, &lit_4124); +COMPILER_STRIP_GATE(0x80466824, &lit_4124); /* 80466828-8046682C 000008 0004+00 1/1 0/0 0/0 .rodata @4125 */ SECTION_RODATA static f32 const lit_4125 = 7.0f / 5.0f; -COMPILER_STRIP_GATE(80466828, &lit_4125); +COMPILER_STRIP_GATE(0x80466828, &lit_4125); + +/* 804668D8-804668D8 0000B8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8046697F = "FDoorA.bck"; +SECTION_DEAD static char const* const stringBase_8046698A = "oj_DoorOpD.bck"; +SECTION_DEAD static char const* const stringBase_80466999 = "oj_DoorOpC.bck"; +SECTION_DEAD static char const* const stringBase_804669A8 = "oj_DoorOpF.bck"; +SECTION_DEAD static char const* const stringBase_804669B7 = "md_oj_DoorOpF.bck"; +SECTION_DEAD static char const* const stringBase_804669C9 = "md_oj_DoorOpD.bck"; +SECTION_DEAD static char const* const stringBase_804669DB = "D_MN10"; +SECTION_DEAD static char const* const stringBase_804669E2 = "md_oj_DoorOpC.bck"; +SECTION_DEAD static char const* const stringBase_804669F4 = "oj_DoorCloseF.bck"; +SECTION_DEAD static char const* const stringBase_80466A06 = "oj_DoorCloseD.bck"; +SECTION_DEAD static char const* const stringBase_80466A18 = "oj_DoorCloseC.bck"; +SECTION_DEAD static char const* const stringBase_80466A2A = "D_MN09"; +SECTION_DEAD static char const* const stringBase_80466A31 = "SHUTTER_DOOR"; +SECTION_DEAD static char const* const stringBase_80466A3E = "Timer"; +SECTION_DEAD static char const* const stringBase_80466A44 = "FDoorB.bck"; +SECTION_DEAD static char const* const stringBase_80466A4F = "D_MN01"; +SECTION_DEAD static char const* const stringBase_80466A56 = "D_MN11"; +SECTION_DEAD static char const* const stringBase_80466A5D = "D_MN11B"; +SECTION_DEAD static char const* const stringBase_80466A65 = "CAMERA"; +SECTION_DEAD static char const* const stringBase_80466A6C = "D_MN05"; +SECTION_DEAD static char const* const stringBase_80466A73 = "D_MN04"; +SECTION_DEAD static char const* const stringBase_80466A7A = "F_SP115"; +SECTION_DEAD static char const* const stringBase_80466A82 = "シャッタードア：鍵タイプが不明です\n"; +SECTION_DEAD static char const* const stringBase_80466AA6 = "DEFAULT_STOP_OPEN"; +SECTION_DEAD static char const* const stringBase_80466AB8 = "DEFAULT_SHUTTER_DOOR_10"; +SECTION_DEAD static char const* const stringBase_80466AD0 = "DEFAULT_SHUTTER_DOOR_F_STOP"; +SECTION_DEAD static char const* const stringBase_80466AEC = "WOLF_SHUTTER_DOOR_10"; +SECTION_DEAD static char const* const stringBase_80466B01 = "WOLF_SHUTTER_DOOR_F_STOP"; +SECTION_DEAD static char const* const stringBase_80466B1A = "DEFAULT_SHUTTER_DOOR_14"; +SECTION_DEAD static char const* const stringBase_80466B32 = "DEFAULT_SHUTTER_DOOR_F_STOP_14"; +SECTION_DEAD static char const* const stringBase_80466B51 = "WOLF_SHUTTER_DOOR_14"; +SECTION_DEAD static char const* const stringBase_80466B66 = "WOLF_SHUTTER_DOOR_F_STOP_14"; +SECTION_DEAD static char const* const stringBase_80466B82 = "DEFAULT_SHUTTER_DOOR_18"; +SECTION_DEAD static char const* const stringBase_80466B9A = "DEFAULT_SHUTTER_DOOR_F_STOP_18"; +SECTION_DEAD static char const* const stringBase_80466BB9 = "WOLF_SHUTTER_DOOR_18"; +SECTION_DEAD static char const* const stringBase_80466BCE = "WOLF_SHUTTER_DOOR_F_STOP_18"; +SECTION_DEAD static char const* const stringBase_80466BEA = "DEFAULT_KNOB_DOOR_F"; +SECTION_DEAD static char const* const stringBase_80466BFE = "DEFAULT_KNOB_DOOR_B"; +SECTION_DEAD static char const* const stringBase_80466C12 = "DEFAULT_KNOB_DOOR_F_STOP"; +SECTION_DEAD static char const* const stringBase_80466C2B = "DEFAULT_KNOB_DOOR_B_STOP"; +SECTION_DEAD static char const* const stringBase_80466C44 = "DEFAULT_KNOB_DOOR_NOTOPEN_F"; +SECTION_DEAD static char const* const stringBase_80466C60 = "DEFAULT_KNOB_DOOR_NOTOPEN_B"; +SECTION_DEAD static char const* const stringBase_80466C7C = "DEFAULT_KNOB_DOOR_TALK_NOTOPEN_F"; +SECTION_DEAD static char const* const stringBase_80466C9D = "DEFAULT_SHUTTER_DOOR_20"; +SECTION_DEAD static char const* const stringBase_80466CB5 = "DEFAULT_SHUTTER_DOOR_F_STOP_20"; +SECTION_DEAD static char const* const stringBase_80466CD4 = "WOLF_SHUTTER_DOOR_20"; +SECTION_DEAD static char const* const stringBase_80466CE9 = "WOLF_SHUTTER_DOOR_F_STOP_20"; +SECTION_DEAD static char const* const stringBase_80466D05 = "DEFAULT_SHUTTER_DOOR_22"; +SECTION_DEAD static char const* const stringBase_80466D1D = "DEFAULT_SHUTTER_DOOR_F_STOP_22"; +SECTION_DEAD static char const* const stringBase_80466D3C = "WOLF_SHUTTER_DOOR_22"; +SECTION_DEAD static char const* const stringBase_80466D51 = "WOLF_SHUTTER_DOOR_F_STOP_22"; +SECTION_DEAD static char const* const stringBase_80466D6D = "WAIT"; +SECTION_DEAD static char const* const stringBase_80466D72 = "STOP_OPEN"; +SECTION_DEAD static char const* const stringBase_80466D7C = "STOP_CLOSE"; +SECTION_DEAD static char const* const stringBase_80466D87 = "OPEN"; +SECTION_DEAD static char const* const stringBase_80466D8C = "CLOSE"; +SECTION_DEAD static char const* const stringBase_80466D92 = "SMOKE"; +SECTION_DEAD static char const* const stringBase_80466D98 = "SMOKE_END"; +SECTION_DEAD static char const* const stringBase_80466DA2 = "SETGOAL"; +SECTION_DEAD static char const* const stringBase_80466DAA = "UNLOCK"; +SECTION_DEAD static char const* const stringBase_80466DB1 = "SETSTART"; +SECTION_DEAD static char const* const stringBase_80466DBA = "SETANGLE"; +SECTION_DEAD static char const* const stringBase_80466DC3 = "ADJUSTMENT"; +SECTION_DEAD static char const* const stringBase_80466DCE = "OPEN_PUSH"; +SECTION_DEAD static char const* const stringBase_80466DD8 = "OPEN_PULL"; +SECTION_DEAD static char const* const stringBase_80466DE2 = "OPEN_PUSH2"; +SECTION_DEAD static char const* const stringBase_80466DED = "OPEN_PULL2"; +SECTION_DEAD static char const* const stringBase_80466DF8 = "TALK"; +SECTION_DEAD static char const* const stringBase_80466DFD = "SETSTART_PUSH"; +SECTION_DEAD static char const* const stringBase_80466E0B = "SETSTART_PULL"; +SECTION_DEAD static char const* const stringBase_80466E19 = "END_CHECK"; +SECTION_DEAD static char const* const stringBase_80466E23 = "DROP_BF"; +SECTION_DEAD static char const* const stringBase_80466E2B = "DROP_AF"; +SECTION_DEAD static char const* const stringBase_80466E33 = "DELETE_LOCK"; +SECTION_DEAD static char const* const stringBase_80466E3F = "OPEN_INIT"; +SECTION_DEAD static char const* const stringBase_80466E49 = "ADJUSTMENT2"; +SECTION_DEAD static char const* const stringBase_80466E55 = "NOT_OPEN"; +SECTION_DEAD static char const* const stringBase_80466E5E = "MESSAGE"; +SECTION_DEAD static char const* const stringBase_80466E66 = "LIGHT_ANM"; +SECTION_DEAD static char const* const stringBase_80466E70 = "LIGHT_ANM2"; +#pragma pop /* 80466ED0-80466F04 -00001 0034+00 1/1 0/0 0/0 .data @4126 */ SECTION_DATA static void* lit_4126[13] = { @@ -1182,13 +1314,13 @@ SECTION_RODATA static u8 const lit_4256[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(8046682C, &lit_4256); +COMPILER_STRIP_GATE(0x8046682C, &lit_4256); /* 80466830-80466834 000010 0004+00 0/1 0/0 0/0 .rodata @4257 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4257 = 62500.0f; -COMPILER_STRIP_GATE(80466830, &lit_4257); +COMPILER_STRIP_GATE(0x80466830, &lit_4257); #pragma pop /* 8046129C-804616EC 0007DC 0450+00 1/1 0/0 0/0 .text setEventPrm__10daDoor20_cFv */ @@ -1227,42 +1359,42 @@ asm void daDoor20_c::adjustmentAngle() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4346 = 75.0f; -COMPILER_STRIP_GATE(80466834, &lit_4346); +COMPILER_STRIP_GATE(0x80466834, &lit_4346); #pragma pop /* 80466838-8046683C 000018 0004+00 0/1 0/0 0/0 .rodata @4347 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4347 = -75.0f; -COMPILER_STRIP_GATE(80466838, &lit_4347); +COMPILER_STRIP_GATE(0x80466838, &lit_4347); #pragma pop /* 8046683C-80466840 00001C 0004+00 0/1 0/0 0/0 .rodata @4348 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4348 = -70.0f; -COMPILER_STRIP_GATE(8046683C, &lit_4348); +COMPILER_STRIP_GATE(0x8046683C, &lit_4348); #pragma pop /* 80466840-80466844 000020 0004+00 0/1 0/0 0/0 .rodata @4349 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4349 = -65.0f; -COMPILER_STRIP_GATE(80466840, &lit_4349); +COMPILER_STRIP_GATE(0x80466840, &lit_4349); #pragma pop /* 80466844-80466848 000024 0004+00 0/2 0/0 0/0 .rodata @4350 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4350 = 4.0f / 5.0f; -COMPILER_STRIP_GATE(80466844, &lit_4350); +COMPILER_STRIP_GATE(0x80466844, &lit_4350); #pragma pop /* 80466848-8046684C 000028 0004+00 0/1 0/0 0/0 .rodata @4351 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4351 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(80466848, &lit_4351); +COMPILER_STRIP_GATE(0x80466848, &lit_4351); #pragma pop /* 80461874-80461A44 000DB4 01D0+00 1/1 0/0 0/0 .text adjustmentProc__10daDoor20_cFv */ @@ -1304,7 +1436,7 @@ SECTION_RODATA static u8 const l_eff_id_lv3[10 + 2 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(8046684C, &l_eff_id_lv3); +COMPILER_STRIP_GATE(0x8046684C, &l_eff_id_lv3); #pragma pop /* 80466858-80466864 000038 000A+02 0/1 0/0 0/0 .rodata l_eff_id_lv4$4377 */ @@ -1325,7 +1457,7 @@ SECTION_RODATA static u8 const l_eff_id_lv4[10 + 2 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80466858, &l_eff_id_lv4); +COMPILER_STRIP_GATE(0x80466858, &l_eff_id_lv4); #pragma pop /* 80461A60-80461D24 000FA0 02C4+00 1/1 0/0 0/0 .text openInit_0__10daDoor20_cFv */ @@ -1346,7 +1478,7 @@ SECTION_RODATA static u8 const l_eff_id[4] = { 0x82, 0x96, }; -COMPILER_STRIP_GATE(80466864, &l_eff_id); +COMPILER_STRIP_GATE(0x80466864, &l_eff_id); /* 80461D24-80461EC4 001264 01A0+00 1/1 0/0 0/0 .text openInit_1__10daDoor20_cFv */ #pragma push @@ -1373,25 +1505,25 @@ asm void daDoor20_c::openInit(int param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4607 = 17.0f; -COMPILER_STRIP_GATE(80466868, &lit_4607); +COMPILER_STRIP_GATE(0x80466868, &lit_4607); #pragma pop /* 8046686C-80466870 00004C 0004+00 0/1 0/0 0/0 .rodata @4608 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4608 = 18.0f; -COMPILER_STRIP_GATE(8046686C, &lit_4608); +COMPILER_STRIP_GATE(0x8046686C, &lit_4608); #pragma pop /* 80466870-80466874 000050 0004+00 3/7 0/0 0/0 .rodata @4609 */ SECTION_RODATA static f32 const lit_4609 = -1.0f; -COMPILER_STRIP_GATE(80466870, &lit_4609); +COMPILER_STRIP_GATE(0x80466870, &lit_4609); /* 80466874-80466878 000054 0004+00 0/1 0/0 0/0 .rodata @4610 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4610 = 20.0f; -COMPILER_STRIP_GATE(80466874, &lit_4610); +COMPILER_STRIP_GATE(0x80466874, &lit_4610); #pragma pop /* 80461F60-804622A8 0014A0 0348+00 2/1 0/0 0/0 .text openProc__10daDoor20_cFi */ @@ -1434,7 +1566,7 @@ asm void daDoor20_c::openEnd(int param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4706 = 200.0f; -COMPILER_STRIP_GATE(80466878, &lit_4706); +COMPILER_STRIP_GATE(0x80466878, &lit_4706); #pragma pop /* 80462398-8046266C 0018D8 02D4+00 1/1 0/0 0/0 .text closeInit_0__10daDoor20_cFv */ @@ -1507,7 +1639,7 @@ asm void daDoor20_c::closeEnd(int param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4805 = 100.0f; -COMPILER_STRIP_GATE(8046687C, &lit_4805); +COMPILER_STRIP_GATE(0x8046687C, &lit_4805); #pragma pop /* 80462928-80462A1C 001E68 00F4+00 1/1 0/0 0/0 .text openInit2__10daDoor20_cFv */ @@ -1535,14 +1667,14 @@ asm void daDoor20_c::closeEnd2() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4849 = 220.0f; -COMPILER_STRIP_GATE(80466880, &lit_4849); +COMPILER_STRIP_GATE(0x80466880, &lit_4849); #pragma pop /* 80466884-80466888 000064 0004+00 0/1 0/0 0/0 .rodata @4850 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4850 = -220.0f; -COMPILER_STRIP_GATE(80466884, &lit_4850); +COMPILER_STRIP_GATE(0x80466884, &lit_4850); #pragma pop /* 80462A5C-80462B58 001F9C 00FC+00 1/1 0/0 0/0 .text calcMtx_2__10daDoor20_cFv */ @@ -1570,70 +1702,70 @@ asm void daDoor20_c::calcMtx() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4916 = 30.0f; -COMPILER_STRIP_GATE(80466888, &lit_4916); +COMPILER_STRIP_GATE(0x80466888, &lit_4916); #pragma pop /* 8046688C-80466890 00006C 0004+00 0/1 0/0 0/0 .rodata @4917 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4917 = 150.0f; -COMPILER_STRIP_GATE(8046688C, &lit_4917); +COMPILER_STRIP_GATE(0x8046688C, &lit_4917); #pragma pop /* 80466890-80466894 000070 0004+00 0/3 0/0 0/0 .rodata @4918 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4918 = -300.0f; -COMPILER_STRIP_GATE(80466890, &lit_4918); +COMPILER_STRIP_GATE(0x80466890, &lit_4918); #pragma pop /* 80466894-80466898 000074 0004+00 0/1 0/0 0/0 .rodata @4919 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4919 = -50.0f; -COMPILER_STRIP_GATE(80466894, &lit_4919); +COMPILER_STRIP_GATE(0x80466894, &lit_4919); #pragma pop /* 80466898-8046689C 000078 0004+00 0/4 0/0 0/0 .rodata @4920 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4920 = 300.0f; -COMPILER_STRIP_GATE(80466898, &lit_4920); +COMPILER_STRIP_GATE(0x80466898, &lit_4920); #pragma pop /* 8046689C-804668A0 00007C 0004+00 0/1 0/0 0/0 .rodata @4921 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4921 = 700.0f; -COMPILER_STRIP_GATE(8046689C, &lit_4921); +COMPILER_STRIP_GATE(0x8046689C, &lit_4921); #pragma pop /* 804668A0-804668A4 000080 0004+00 0/1 0/0 0/0 .rodata @4922 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4922 = 50.0f; -COMPILER_STRIP_GATE(804668A0, &lit_4922); +COMPILER_STRIP_GATE(0x804668A0, &lit_4922); #pragma pop /* 804668A4-804668A8 000084 0004+00 0/3 0/0 0/0 .rodata @4923 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4923 = -200.0f; -COMPILER_STRIP_GATE(804668A4, &lit_4923); +COMPILER_STRIP_GATE(0x804668A4, &lit_4923); #pragma pop /* 804668A8-804668AC 000088 0004+00 0/1 0/0 0/0 .rodata @4924 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4924 = 500.0f; -COMPILER_STRIP_GATE(804668A8, &lit_4924); +COMPILER_STRIP_GATE(0x804668A8, &lit_4924); #pragma pop /* 804668AC-804668B0 00008C 0004+00 0/1 0/0 0/0 .rodata @4925 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4925 = 10.0f; -COMPILER_STRIP_GATE(804668AC, &lit_4925); +COMPILER_STRIP_GATE(0x804668AC, &lit_4925); #pragma pop /* 80462C2C-80462EB4 00216C 0288+00 2/1 0/0 0/0 .text CreateInit__10daDoor20_cFv */ @@ -1771,49 +1903,49 @@ asm void daDoor20_c::_delete() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5338 = 24.0f; -COMPILER_STRIP_GATE(804668B0, &lit_5338); +COMPILER_STRIP_GATE(0x804668B0, &lit_5338); #pragma pop /* 804668B4-804668B8 000094 0004+00 0/0 0/0 0/0 .rodata @5339 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5339 = 19.0f; -COMPILER_STRIP_GATE(804668B4, &lit_5339); +COMPILER_STRIP_GATE(0x804668B4, &lit_5339); #pragma pop /* 804668B8-804668BC 000098 0004+00 0/0 0/0 0/0 .rodata @5340 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5340 = 76.0f; -COMPILER_STRIP_GATE(804668B8, &lit_5340); +COMPILER_STRIP_GATE(0x804668B8, &lit_5340); #pragma pop /* 804668BC-804668C0 00009C 0004+00 0/1 0/0 0/0 .rodata @5670 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5670 = 107.0f; -COMPILER_STRIP_GATE(804668BC, &lit_5670); +COMPILER_STRIP_GATE(0x804668BC, &lit_5670); #pragma pop /* 804668C0-804668C4 0000A0 0004+00 0/1 0/0 0/0 .rodata @5671 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5671 = -17.0f; -COMPILER_STRIP_GATE(804668C0, &lit_5671); +COMPILER_STRIP_GATE(0x804668C0, &lit_5671); #pragma pop /* 804668C4-804668C8 0000A4 0004+00 0/1 0/0 0/0 .rodata @5672 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5672 = 35.0f; -COMPILER_STRIP_GATE(804668C4, &lit_5672); +COMPILER_STRIP_GATE(0x804668C4, &lit_5672); #pragma pop /* 804668C8-804668CC 0000A8 0004+00 0/1 0/0 0/0 .rodata @5673 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5673 = -35.0f; -COMPILER_STRIP_GATE(804668C8, &lit_5673); +COMPILER_STRIP_GATE(0x804668C8, &lit_5673); #pragma pop /* 80464858-80464AE4 003D98 028C+00 2/2 0/0 0/0 .text createKey__10daDoor20_cFv */ @@ -2092,14 +2224,14 @@ asm void dDoor_stop_c::closeInit(daDoor20_c* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6377 = 60.0f; -COMPILER_STRIP_GATE(804668CC, &lit_6377); +COMPILER_STRIP_GATE(0x804668CC, &lit_6377); #pragma pop /* 804668D0-804668D4 0000B0 0004+00 0/1 0/0 0/0 .rodata @6378 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6378 = 6.0f; -COMPILER_STRIP_GATE(804668D0, &lit_6378); +COMPILER_STRIP_GATE(0x804668D0, &lit_6378); #pragma pop /* 804662C0-8046634C 005800 008C+00 2/2 0/0 0/0 .text closeProc__12dDoor_stop_cFP10daDoor20_c */ @@ -2127,7 +2259,7 @@ asm void dDoor_stop_c::openInit(daDoor20_c* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6409 = 4.0f; -COMPILER_STRIP_GATE(804668D4, &lit_6409); +COMPILER_STRIP_GATE(0x804668D4, &lit_6409); #pragma pop /* 80466458-804664E8 005998 0090+00 1/1 0/0 0/0 .text openProc__12dDoor_stop_cFP10daDoor20_c */ @@ -2234,7 +2366,7 @@ asm dBgS_ObjAcch::~dBgS_ObjAcch() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_804667EC(u8* param_0) { +extern "C" asm void func_804667EC(void* _this, u8* param_0) { nofralloc #include "asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/func_804667EC.s" } @@ -2260,101 +2392,4 @@ static asm void func_80466810() { } #pragma pop -/* 804668D8-80466E7B 0000B8 05A3+00 34/21 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_804668D8 = "door-stop.bmd"; -SECTION_DEAD static char const* const stringBase_804668E6 = "static"; -SECTION_DEAD static char const* const stringBase_804668ED = "DoorT00"; -SECTION_DEAD static char const* const stringBase_804668F5 = "DoorY00"; -SECTION_DEAD static char const* const stringBase_804668FD = "DoorK00"; -SECTION_DEAD static char const* const stringBase_80466905 = "DoorLV8"; -SECTION_DEAD static char const* const stringBase_8046690D = "DoorLV7"; -SECTION_DEAD static char const* const stringBase_80466915 = "DoorLV9"; -SECTION_DEAD static char const* const stringBase_8046691D = "door-shutter_%02d.bmd"; -SECTION_DEAD static char const* const stringBase_80466933 = "door-knob_%02d.bmd"; -SECTION_DEAD static char const* const stringBase_80466946 = "door-shutter_00.btk"; -SECTION_DEAD static char const* const stringBase_8046695A = "door-shutter.dzb"; -SECTION_DEAD static char const* const stringBase_8046696B = "door-shutterlv9.dzb"; -SECTION_DEAD static char const* const stringBase_8046697F = "FDoorA.bck"; -SECTION_DEAD static char const* const stringBase_8046698A = "oj_DoorOpD.bck"; -SECTION_DEAD static char const* const stringBase_80466999 = "oj_DoorOpC.bck"; -SECTION_DEAD static char const* const stringBase_804669A8 = "oj_DoorOpF.bck"; -SECTION_DEAD static char const* const stringBase_804669B7 = "md_oj_DoorOpF.bck"; -SECTION_DEAD static char const* const stringBase_804669C9 = "md_oj_DoorOpD.bck"; -SECTION_DEAD static char const* const stringBase_804669DB = "D_MN10"; -SECTION_DEAD static char const* const stringBase_804669E2 = "md_oj_DoorOpC.bck"; -SECTION_DEAD static char const* const stringBase_804669F4 = "oj_DoorCloseF.bck"; -SECTION_DEAD static char const* const stringBase_80466A06 = "oj_DoorCloseD.bck"; -SECTION_DEAD static char const* const stringBase_80466A18 = "oj_DoorCloseC.bck"; -SECTION_DEAD static char const* const stringBase_80466A2A = "D_MN09"; -SECTION_DEAD static char const* const stringBase_80466A31 = "SHUTTER_DOOR"; -SECTION_DEAD static char const* const stringBase_80466A3E = "Timer"; -SECTION_DEAD static char const* const stringBase_80466A44 = "FDoorB.bck"; -SECTION_DEAD static char const* const stringBase_80466A4F = "D_MN01"; -SECTION_DEAD static char const* const stringBase_80466A56 = "D_MN11"; -SECTION_DEAD static char const* const stringBase_80466A5D = "D_MN11B"; -SECTION_DEAD static char const* const stringBase_80466A65 = "CAMERA"; -SECTION_DEAD static char const* const stringBase_80466A6C = "D_MN05"; -SECTION_DEAD static char const* const stringBase_80466A73 = "D_MN04"; -SECTION_DEAD static char const* const stringBase_80466A7A = "F_SP115"; -SECTION_DEAD static char const* const stringBase_80466A82 = "シャッタードア：鍵タイプが不明です\n"; -SECTION_DEAD static char const* const stringBase_80466AA6 = "DEFAULT_STOP_OPEN"; -SECTION_DEAD static char const* const stringBase_80466AB8 = "DEFAULT_SHUTTER_DOOR_10"; -SECTION_DEAD static char const* const stringBase_80466AD0 = "DEFAULT_SHUTTER_DOOR_F_STOP"; -SECTION_DEAD static char const* const stringBase_80466AEC = "WOLF_SHUTTER_DOOR_10"; -SECTION_DEAD static char const* const stringBase_80466B01 = "WOLF_SHUTTER_DOOR_F_STOP"; -SECTION_DEAD static char const* const stringBase_80466B1A = "DEFAULT_SHUTTER_DOOR_14"; -SECTION_DEAD static char const* const stringBase_80466B32 = "DEFAULT_SHUTTER_DOOR_F_STOP_14"; -SECTION_DEAD static char const* const stringBase_80466B51 = "WOLF_SHUTTER_DOOR_14"; -SECTION_DEAD static char const* const stringBase_80466B66 = "WOLF_SHUTTER_DOOR_F_STOP_14"; -SECTION_DEAD static char const* const stringBase_80466B82 = "DEFAULT_SHUTTER_DOOR_18"; -SECTION_DEAD static char const* const stringBase_80466B9A = "DEFAULT_SHUTTER_DOOR_F_STOP_18"; -SECTION_DEAD static char const* const stringBase_80466BB9 = "WOLF_SHUTTER_DOOR_18"; -SECTION_DEAD static char const* const stringBase_80466BCE = "WOLF_SHUTTER_DOOR_F_STOP_18"; -SECTION_DEAD static char const* const stringBase_80466BEA = "DEFAULT_KNOB_DOOR_F"; -SECTION_DEAD static char const* const stringBase_80466BFE = "DEFAULT_KNOB_DOOR_B"; -SECTION_DEAD static char const* const stringBase_80466C12 = "DEFAULT_KNOB_DOOR_F_STOP"; -SECTION_DEAD static char const* const stringBase_80466C2B = "DEFAULT_KNOB_DOOR_B_STOP"; -SECTION_DEAD static char const* const stringBase_80466C44 = "DEFAULT_KNOB_DOOR_NOTOPEN_F"; -SECTION_DEAD static char const* const stringBase_80466C60 = "DEFAULT_KNOB_DOOR_NOTOPEN_B"; -SECTION_DEAD static char const* const stringBase_80466C7C = "DEFAULT_KNOB_DOOR_TALK_NOTOPEN_F"; -SECTION_DEAD static char const* const stringBase_80466C9D = "DEFAULT_SHUTTER_DOOR_20"; -SECTION_DEAD static char const* const stringBase_80466CB5 = "DEFAULT_SHUTTER_DOOR_F_STOP_20"; -SECTION_DEAD static char const* const stringBase_80466CD4 = "WOLF_SHUTTER_DOOR_20"; -SECTION_DEAD static char const* const stringBase_80466CE9 = "WOLF_SHUTTER_DOOR_F_STOP_20"; -SECTION_DEAD static char const* const stringBase_80466D05 = "DEFAULT_SHUTTER_DOOR_22"; -SECTION_DEAD static char const* const stringBase_80466D1D = "DEFAULT_SHUTTER_DOOR_F_STOP_22"; -SECTION_DEAD static char const* const stringBase_80466D3C = "WOLF_SHUTTER_DOOR_22"; -SECTION_DEAD static char const* const stringBase_80466D51 = "WOLF_SHUTTER_DOOR_F_STOP_22"; -SECTION_DEAD static char const* const stringBase_80466D6D = "WAIT"; -SECTION_DEAD static char const* const stringBase_80466D72 = "STOP_OPEN"; -SECTION_DEAD static char const* const stringBase_80466D7C = "STOP_CLOSE"; -SECTION_DEAD static char const* const stringBase_80466D87 = "OPEN"; -SECTION_DEAD static char const* const stringBase_80466D8C = "CLOSE"; -SECTION_DEAD static char const* const stringBase_80466D92 = "SMOKE"; -SECTION_DEAD static char const* const stringBase_80466D98 = "SMOKE_END"; -SECTION_DEAD static char const* const stringBase_80466DA2 = "SETGOAL"; -SECTION_DEAD static char const* const stringBase_80466DAA = "UNLOCK"; -SECTION_DEAD static char const* const stringBase_80466DB1 = "SETSTART"; -SECTION_DEAD static char const* const stringBase_80466DBA = "SETANGLE"; -SECTION_DEAD static char const* const stringBase_80466DC3 = "ADJUSTMENT"; -SECTION_DEAD static char const* const stringBase_80466DCE = "OPEN_PUSH"; -SECTION_DEAD static char const* const stringBase_80466DD8 = "OPEN_PULL"; -SECTION_DEAD static char const* const stringBase_80466DE2 = "OPEN_PUSH2"; -SECTION_DEAD static char const* const stringBase_80466DED = "OPEN_PULL2"; -SECTION_DEAD static char const* const stringBase_80466DF8 = "TALK"; -SECTION_DEAD static char const* const stringBase_80466DFD = "SETSTART_PUSH"; -SECTION_DEAD static char const* const stringBase_80466E0B = "SETSTART_PULL"; -SECTION_DEAD static char const* const stringBase_80466E19 = "END_CHECK"; -SECTION_DEAD static char const* const stringBase_80466E23 = "DROP_BF"; -SECTION_DEAD static char const* const stringBase_80466E2B = "DROP_AF"; -SECTION_DEAD static char const* const stringBase_80466E33 = "DELETE_LOCK"; -SECTION_DEAD static char const* const stringBase_80466E3F = "OPEN_INIT"; -SECTION_DEAD static char const* const stringBase_80466E49 = "ADJUSTMENT2"; -SECTION_DEAD static char const* const stringBase_80466E55 = "NOT_OPEN"; -SECTION_DEAD static char const* const stringBase_80466E5E = "MESSAGE"; -SECTION_DEAD static char const* const stringBase_80466E66 = "LIGHT_ANM"; -SECTION_DEAD static char const* const stringBase_80466E70 = "LIGHT_ANM2"; -#pragma pop +/* 804668D8-804668D8 0000B8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/e/d_a_e_ai/d_a_e_ai.cpp b/rel/d/a/e/d_a_e_ai/d_a_e_ai.cpp index a698540b3ea..9a0ae434a79 100644 --- a/rel/d/a/e/d_a_e_ai/d_a_e_ai.cpp +++ b/rel/d/a/e/d_a_e_ai/d_a_e_ai.cpp @@ -42,16 +42,16 @@ struct mDoExt_baseAnm { /* 8000D428 */ void play(); }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; - struct J3DAnmTransform {}; +struct J3DModelData {}; + +struct Z2Creature {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -127,10 +127,10 @@ struct dRes_control_c { struct dPa_levelEcallBack {}; -struct _GXColor {}; - struct csXyz {}; +struct _GXColor {}; + struct dPa_control_c { /* 8004C218 */ void setHitMark(u16, fopAc_ac_c*, cXyz const*, csXyz const*, cXyz const*, u32); /* 8004D4CC */ void set(u32, u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, @@ -438,7 +438,7 @@ extern "C" void __register_global_object(); /* ############################################################################################## */ /* 8067C3FC-8067C400 000000 0004+00 15/15 0/0 0/0 .rodata @3789 */ SECTION_RODATA static f32 const lit_3789 = 100.0f; -COMPILER_STRIP_GATE(8067C3FC, &lit_3789); +COMPILER_STRIP_GATE(0x8067C3FC, &lit_3789); /* 8067C400-8067C404 000004 0004+00 2/13 0/0 0/0 .rodata @3790 */ SECTION_RODATA static u8 const lit_3790[4] = { @@ -447,7 +447,7 @@ SECTION_RODATA static u8 const lit_3790[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(8067C400, &lit_3790); +COMPILER_STRIP_GATE(0x8067C400, &lit_3790); /* 8067C404-8067C40C 000008 0004+04 1/11 0/0 0/0 .rodata @3791 */ SECTION_RODATA static f32 const lit_3791[1 + 1 /* padding */] = { @@ -455,7 +455,7 @@ SECTION_RODATA static f32 const lit_3791[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(8067C404, &lit_3791); +COMPILER_STRIP_GATE(0x8067C404, &lit_3791); /* 8067C40C-8067C414 000010 0008+00 0/3 0/0 0/0 .rodata @3792 */ #pragma push @@ -463,7 +463,7 @@ COMPILER_STRIP_GATE(8067C404, &lit_3791); SECTION_RODATA static u8 const lit_3792[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8067C40C, &lit_3792); +COMPILER_STRIP_GATE(0x8067C40C, &lit_3792); #pragma pop /* 8067C414-8067C41C 000018 0008+00 0/3 0/0 0/0 .rodata @3793 */ @@ -472,7 +472,7 @@ COMPILER_STRIP_GATE(8067C40C, &lit_3792); SECTION_RODATA static u8 const lit_3793[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8067C414, &lit_3793); +COMPILER_STRIP_GATE(0x8067C414, &lit_3793); #pragma pop /* 8067C41C-8067C424 000020 0008+00 0/3 0/0 0/0 .rodata @3794 */ @@ -481,42 +481,42 @@ COMPILER_STRIP_GATE(8067C414, &lit_3793); SECTION_RODATA static u8 const lit_3794[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8067C41C, &lit_3794); +COMPILER_STRIP_GATE(0x8067C41C, &lit_3794); #pragma pop /* 8067C424-8067C428 000028 0004+00 0/1 0/0 0/0 .rodata @3795 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3795 = 1.0f / 100.0f; -COMPILER_STRIP_GATE(8067C424, &lit_3795); +COMPILER_STRIP_GATE(0x8067C424, &lit_3795); #pragma pop /* 8067C428-8067C42C 00002C 0004+00 0/1 0/0 0/0 .rodata @3810 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3810 = 20.0f; -COMPILER_STRIP_GATE(8067C428, &lit_3810); +COMPILER_STRIP_GATE(0x8067C428, &lit_3810); #pragma pop /* 8067C42C-8067C430 000030 0004+00 0/1 0/0 0/0 .rodata @3811 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3811 = 700.0f; -COMPILER_STRIP_GATE(8067C42C, &lit_3811); +COMPILER_STRIP_GATE(0x8067C42C, &lit_3811); #pragma pop /* 8067C430-8067C434 000034 0004+00 0/1 0/0 0/0 .rodata @3812 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3812 = 350.0f; -COMPILER_STRIP_GATE(8067C430, &lit_3812); +COMPILER_STRIP_GATE(0x8067C430, &lit_3812); #pragma pop /* 8067C434-8067C438 000038 0004+00 0/1 0/0 0/0 .rodata @3813 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3813 = 190.0f; -COMPILER_STRIP_GATE(8067C434, &lit_3813); +COMPILER_STRIP_GATE(0x8067C434, &lit_3813); #pragma pop /* 8067C540-8067C54C 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ @@ -687,7 +687,7 @@ SECTION_RODATA static u8 const at_sph_src[64] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41, 0xF0, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8067C438, &at_sph_src); +COMPILER_STRIP_GATE(0x8067C438, &at_sph_src); /* 8067C478-8067C4B8 00007C 0040+00 1/1 0/0 0/0 .rodata shield_sph_src$3818 */ SECTION_RODATA static u8 const shield_sph_src[64] = { @@ -696,7 +696,7 @@ SECTION_RODATA static u8 const shield_sph_src[64] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41, 0xF0, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8067C478, &shield_sph_src); +COMPILER_STRIP_GATE(0x8067C478, &shield_sph_src); /* 806791BC-80679284 00013C 00C8+00 1/1 0/0 0/0 .text initCcCylinder__10e_ai_classFv */ #pragma push @@ -713,7 +713,7 @@ asm void e_ai_class::initCcCylinder() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3848 = 50.0f; -COMPILER_STRIP_GATE(8067C4B8, &lit_3848); +COMPILER_STRIP_GATE(0x8067C4B8, &lit_3848); #pragma pop /* 80679284-80679350 000204 00CC+00 1/1 0/0 0/0 .text setCcCylinder__10e_ai_classFv */ @@ -729,7 +729,13 @@ asm void e_ai_class::setCcCylinder() { /* ############################################################################################## */ /* 8067C4BC-8067C4C0 0000C0 0004+00 1/1 0/0 0/0 .rodata @3854 */ SECTION_RODATA static f32 const lit_3854 = -1.0f; -COMPILER_STRIP_GATE(8067C4BC, &lit_3854); +COMPILER_STRIP_GATE(0x8067C4BC, &lit_3854); + +/* 8067C538-8067C538 00013C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8067C538 = "E_AI"; +#pragma pop /* 80679350-806793FC 0002D0 00AC+00 6/6 0/0 0/0 .text anm_init__10e_ai_classFifUcf */ #pragma push @@ -746,7 +752,7 @@ asm void e_ai_class::anm_init(int param_0, f32 param_1, u8 param_2, f32 param_3) #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3887 = 1000.0f; -COMPILER_STRIP_GATE(8067C4C0, &lit_3887); +COMPILER_STRIP_GATE(0x8067C4C0, &lit_3887); #pragma pop /* 806793FC-806794F4 00037C 00F8+00 1/1 0/0 0/0 .text Draw__10e_ai_classFv */ @@ -795,21 +801,21 @@ asm void e_ai_class::pl_check(f32 param_0, s16 param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4111 = 80.0f; -COMPILER_STRIP_GATE(8067C4C4, &lit_4111); +COMPILER_STRIP_GATE(0x8067C4C4, &lit_4111); #pragma pop /* 8067C4C8-8067C4CC 0000CC 0004+00 0/1 0/0 0/0 .rodata @4112 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4112 = -60.0f; -COMPILER_STRIP_GATE(8067C4C8, &lit_4112); +COMPILER_STRIP_GATE(0x8067C4C8, &lit_4112); #pragma pop /* 8067C4CC-8067C4D0 0000D0 0004+00 0/4 0/0 0/0 .rodata @4113 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4113 = 5.0f; -COMPILER_STRIP_GATE(8067C4CC, &lit_4113); +COMPILER_STRIP_GATE(0x8067C4CC, &lit_4113); #pragma pop /* 8067968C-80679DC8 00060C 073C+00 1/1 0/0 0/0 .text damage_check__10e_ai_classFv */ @@ -827,56 +833,56 @@ asm void e_ai_class::damage_check() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4256 = 40.0f; -COMPILER_STRIP_GATE(8067C4D0, &lit_4256); +COMPILER_STRIP_GATE(0x8067C4D0, &lit_4256); #pragma pop /* 8067C4D4-8067C4D8 0000D8 0004+00 0/1 0/0 0/0 .rodata @4257 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4257 = 4.0f; -COMPILER_STRIP_GATE(8067C4D4, &lit_4257); +COMPILER_STRIP_GATE(0x8067C4D4, &lit_4257); #pragma pop /* 8067C4D8-8067C4DC 0000DC 0004+00 0/1 0/0 0/0 .rodata @4258 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4258 = 7.0f; -COMPILER_STRIP_GATE(8067C4D8, &lit_4258); +COMPILER_STRIP_GATE(0x8067C4D8, &lit_4258); #pragma pop /* 8067C4DC-8067C4E0 0000E0 0004+00 0/1 0/0 0/0 .rodata @4259 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4259 = -20.0f; -COMPILER_STRIP_GATE(8067C4DC, &lit_4259); +COMPILER_STRIP_GATE(0x8067C4DC, &lit_4259); #pragma pop /* 8067C4E0-8067C4E4 0000E4 0004+00 0/1 0/0 0/0 .rodata @4260 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4260 = 10.0f; -COMPILER_STRIP_GATE(8067C4E0, &lit_4260); +COMPILER_STRIP_GATE(0x8067C4E0, &lit_4260); #pragma pop /* 8067C4E4-8067C4E8 0000E8 0004+00 0/4 0/0 0/0 .rodata @4261 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4261 = 0.5f; -COMPILER_STRIP_GATE(8067C4E4, &lit_4261); +COMPILER_STRIP_GATE(0x8067C4E4, &lit_4261); #pragma pop /* 8067C4E8-8067C4EC 0000EC 0004+00 0/1 0/0 0/0 .rodata @4262 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4262 = 2000.0f; -COMPILER_STRIP_GATE(8067C4E8, &lit_4262); +COMPILER_STRIP_GATE(0x8067C4E8, &lit_4262); #pragma pop /* 8067C4EC-8067C4F0 0000F0 0004+00 0/3 0/0 0/0 .rodata @4263 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4263 = 25.0f; -COMPILER_STRIP_GATE(8067C4EC, &lit_4263); +COMPILER_STRIP_GATE(0x8067C4EC, &lit_4263); #pragma pop /* 8067C698-8067C69C 000008 0004+00 2/2 0/0 0/0 .bss None */ @@ -903,7 +909,7 @@ asm void e_ai_class::e_ai_damage() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4316 = 15.0f; -COMPILER_STRIP_GATE(8067C4F0, &lit_4316); +COMPILER_STRIP_GATE(0x8067C4F0, &lit_4316); #pragma pop /* 8067A2CC-8067A54C 00124C 0280+00 1/1 0/0 0/0 .text e_ai_attack__10e_ai_classFv */ @@ -925,7 +931,7 @@ SECTION_RODATA static f32 const lit_4437[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(8067C4F4, &lit_4437); +COMPILER_STRIP_GATE(0x8067C4F4, &lit_4437); #pragma pop /* 8067C4FC-8067C504 000100 0008+00 0/2 0/0 0/0 .rodata @4439 */ @@ -934,7 +940,7 @@ COMPILER_STRIP_GATE(8067C4F4, &lit_4437); SECTION_RODATA static u8 const lit_4439[8] = { 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8067C4FC, &lit_4439); +COMPILER_STRIP_GATE(0x8067C4FC, &lit_4439); #pragma pop /* 8067A54C-8067AA48 0014CC 04FC+00 1/1 0/0 0/0 .text e_ai_move__10e_ai_classFv */ @@ -972,7 +978,7 @@ asm void e_ai_class::e_ai_return() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4636 = 200.0f; -COMPILER_STRIP_GATE(8067C504, &lit_4636); +COMPILER_STRIP_GATE(0x8067C504, &lit_4636); #pragma pop /* 8067B024-8067B2B0 001FA4 028C+00 1/1 0/0 0/0 .text action__10e_ai_classFv */ @@ -998,7 +1004,7 @@ asm void e_ai_class::PlayerWaySet() { /* ############################################################################################## */ /* 8067C508-8067C50C 00010C 0004+00 1/1 0/0 0/0 .rodata @4661 */ SECTION_RODATA static f32 const lit_4661 = 130.0f; -COMPILER_STRIP_GATE(8067C508, &lit_4661); +COMPILER_STRIP_GATE(0x8067C508, &lit_4661); /* 8067B31C-8067B378 00229C 005C+00 1/1 0/0 0/0 .text AttentionSet__10e_ai_classFv */ #pragma push @@ -1015,42 +1021,42 @@ asm void e_ai_class::AttentionSet() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4719 = 1.5f; -COMPILER_STRIP_GATE(8067C50C, &lit_4719); +COMPILER_STRIP_GATE(0x8067C50C, &lit_4719); #pragma pop /* 8067C510-8067C514 000114 0004+00 0/1 0/0 0/0 .rodata @4720 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4720 = -130.0f; -COMPILER_STRIP_GATE(8067C510, &lit_4720); +COMPILER_STRIP_GATE(0x8067C510, &lit_4720); #pragma pop /* 8067C514-8067C518 000118 0004+00 0/1 0/0 0/0 .rodata @4721 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4721 = -150.0f; -COMPILER_STRIP_GATE(8067C514, &lit_4721); +COMPILER_STRIP_GATE(0x8067C514, &lit_4721); #pragma pop /* 8067C518-8067C51C 00011C 0004+00 0/1 0/0 0/0 .rodata @4722 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4722 = -30000.0f; -COMPILER_STRIP_GATE(8067C518, &lit_4722); +COMPILER_STRIP_GATE(0x8067C518, &lit_4722); #pragma pop /* 8067C51C-8067C520 000120 0004+00 0/1 0/0 0/0 .rodata @4723 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4723 = 20000.0f; -COMPILER_STRIP_GATE(8067C51C, &lit_4723); +COMPILER_STRIP_GATE(0x8067C51C, &lit_4723); #pragma pop /* 8067C520-8067C524 000124 0004+00 0/1 0/0 0/0 .rodata @4724 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4724 = 15000.0f; -COMPILER_STRIP_GATE(8067C520, &lit_4724); +COMPILER_STRIP_GATE(0x8067C520, &lit_4724); #pragma pop /* 8067B378-8067B598 0022F8 0220+00 1/1 0/0 0/0 .text Execute__10e_ai_classFv */ @@ -1153,35 +1159,35 @@ static asm void useHeapInit(fopAc_ac_c* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4886 = -200.0f; -COMPILER_STRIP_GATE(8067C524, &lit_4886); +COMPILER_STRIP_GATE(0x8067C524, &lit_4886); #pragma pop /* 8067C528-8067C52C 00012C 0004+00 0/1 0/0 0/0 .rodata @4887 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4887 = -300.0f; -COMPILER_STRIP_GATE(8067C528, &lit_4887); +COMPILER_STRIP_GATE(0x8067C528, &lit_4887); #pragma pop /* 8067C52C-8067C530 000130 0004+00 0/1 0/0 0/0 .rodata @4888 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4888 = 300.0f; -COMPILER_STRIP_GATE(8067C52C, &lit_4888); +COMPILER_STRIP_GATE(0x8067C52C, &lit_4888); #pragma pop /* 8067C530-8067C534 000134 0004+00 0/1 0/0 0/0 .rodata @4889 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4889 = 150.0f; -COMPILER_STRIP_GATE(8067C530, &lit_4889); +COMPILER_STRIP_GATE(0x8067C530, &lit_4889); #pragma pop /* 8067C534-8067C538 000138 0004+00 0/1 0/0 0/0 .rodata @4890 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4890 = -10.0f; -COMPILER_STRIP_GATE(8067C534, &lit_4890); +COMPILER_STRIP_GATE(0x8067C534, &lit_4890); #pragma pop /* 8067B8E4-8067BAEC 002864 0208+00 1/1 0/0 0/0 .text Create__10e_ai_classFv */ @@ -1306,7 +1312,7 @@ asm void __sinit_d_a_e_ai_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_8067BF88 = (void*)__sinit_d_a_e_ai_cpp; +REGISTER_CTORS(0x8067BF88, __sinit_d_a_e_ai_cpp); #pragma pop /* 8067BFC4-8067BFCC 002F44 0008+00 1/0 0/0 0/0 .text @36@__dt__12dBgS_ObjAcchFv */ @@ -1341,9 +1347,4 @@ static asm void setMidnaBindEffect(fopEn_enemy_c* param_0, Z2CreatureEnemy* para } #pragma pop -/* 8067C538-8067C53D 00013C 0005+00 8/8 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_8067C538 = "E_AI"; -#pragma pop +/* 8067C538-8067C538 00013C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/e/d_a_e_arrow/d_a_e_arrow.cpp b/rel/d/a/e/d_a_e_arrow/d_a_e_arrow.cpp index a2ac776a606..a4d8e30b9c0 100644 --- a/rel/d/a/e/d_a_e_arrow/d_a_e_arrow.cpp +++ b/rel/d/a/e/d_a_e_arrow/d_a_e_arrow.cpp @@ -394,7 +394,7 @@ static asm void daE_ARROW_Draw(e_arrow_class* param_0) { SECTION_RODATA static u8 const lit_3983[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8067E880, &lit_3983); +COMPILER_STRIP_GATE(0x8067E880, &lit_3983); /* 8067E88C-8067E890 00000C 0004+00 2/9 0/0 0/0 .rodata @4362 */ SECTION_RODATA static u8 const lit_4362[4] = { @@ -403,34 +403,34 @@ SECTION_RODATA static u8 const lit_4362[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(8067E88C, &lit_4362); +COMPILER_STRIP_GATE(0x8067E88C, &lit_4362); /* 8067E890-8067E894 000010 0004+00 0/1 0/0 0/0 .rodata @4363 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4363 = 28.0f; -COMPILER_STRIP_GATE(8067E890, &lit_4363); +COMPILER_STRIP_GATE(0x8067E890, &lit_4363); #pragma pop /* 8067E894-8067E898 000014 0004+00 0/1 0/0 0/0 .rodata @4364 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4364 = 20.0f; -COMPILER_STRIP_GATE(8067E894, &lit_4364); +COMPILER_STRIP_GATE(0x8067E894, &lit_4364); #pragma pop /* 8067E898-8067E89C 000018 0004+00 0/1 0/0 0/0 .rodata @4365 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4365 = 9.0f / 10.0f; -COMPILER_STRIP_GATE(8067E898, &lit_4365); +COMPILER_STRIP_GATE(0x8067E898, &lit_4365); #pragma pop /* 8067E89C-8067E8A0 00001C 0004+00 0/1 0/0 0/0 .rodata @4366 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4366 = 4.0f / 5.0f; -COMPILER_STRIP_GATE(8067E89C, &lit_4366); +COMPILER_STRIP_GATE(0x8067E89C, &lit_4366); #pragma pop /* 8067E8A0-8067E8A8 000020 0004+04 1/7 0/0 0/0 .rodata @4367 */ @@ -439,7 +439,7 @@ SECTION_RODATA static f32 const lit_4367[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(8067E8A0, &lit_4367); +COMPILER_STRIP_GATE(0x8067E8A0, &lit_4367); /* 8067E8A8-8067E8B0 000028 0008+00 0/1 0/0 0/0 .rodata @4368 */ #pragma push @@ -447,7 +447,7 @@ COMPILER_STRIP_GATE(8067E8A0, &lit_4367); SECTION_RODATA static u8 const lit_4368[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8067E8A8, &lit_4368); +COMPILER_STRIP_GATE(0x8067E8A8, &lit_4368); #pragma pop /* 8067E8B0-8067E8B8 000030 0008+00 0/1 0/0 0/0 .rodata @4369 */ @@ -456,7 +456,7 @@ COMPILER_STRIP_GATE(8067E8A8, &lit_4368); SECTION_RODATA static u8 const lit_4369[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8067E8B0, &lit_4369); +COMPILER_STRIP_GATE(0x8067E8B0, &lit_4369); #pragma pop /* 8067E8B8-8067E8C0 000038 0008+00 0/1 0/0 0/0 .rodata @4370 */ @@ -465,7 +465,7 @@ COMPILER_STRIP_GATE(8067E8B0, &lit_4369); SECTION_RODATA static u8 const lit_4370[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8067E8B8, &lit_4370); +COMPILER_STRIP_GATE(0x8067E8B8, &lit_4370); #pragma pop /* 8067C874-8067CB68 000194 02F4+00 1/1 0/0 0/0 .text fire_eff_set__FP13e_arrow_class */ @@ -493,85 +493,85 @@ asm cXyz::~cXyz() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4543 = 200.0f; -COMPILER_STRIP_GATE(8067E8C0, &lit_4543); +COMPILER_STRIP_GATE(0x8067E8C0, &lit_4543); #pragma pop /* 8067E8C4-8067E8C8 000044 0004+00 0/1 0/0 0/0 .rodata @4544 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4544 = -93652.0f; -COMPILER_STRIP_GATE(8067E8C4, &lit_4544); +COMPILER_STRIP_GATE(0x8067E8C4, &lit_4544); #pragma pop /* 8067E8C8-8067E8CC 000048 0004+00 0/1 0/0 0/0 .rodata @4545 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4545 = -5975.0f; -COMPILER_STRIP_GATE(8067E8C8, &lit_4545); +COMPILER_STRIP_GATE(0x8067E8C8, &lit_4545); #pragma pop /* 8067E8CC-8067E8D0 00004C 0004+00 0/1 0/0 0/0 .rodata @4546 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4546 = 7.0f / 20.0f; -COMPILER_STRIP_GATE(8067E8CC, &lit_4546); +COMPILER_STRIP_GATE(0x8067E8CC, &lit_4546); #pragma pop /* 8067E8D0-8067E8D4 000050 0004+00 0/1 0/0 0/0 .rodata @4547 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4547 = 3.0f / 10.0f; -COMPILER_STRIP_GATE(8067E8D0, &lit_4547); +COMPILER_STRIP_GATE(0x8067E8D0, &lit_4547); #pragma pop /* 8067E8D4-8067E8D8 000054 0004+00 1/2 0/0 0/0 .rodata @4548 */ SECTION_RODATA static f32 const lit_4548 = 0.5f; -COMPILER_STRIP_GATE(8067E8D4, &lit_4548); +COMPILER_STRIP_GATE(0x8067E8D4, &lit_4548); /* 8067E8D8-8067E8DC 000058 0004+00 1/2 0/0 0/0 .rodata @4549 */ SECTION_RODATA static f32 const lit_4549 = -30.0f; -COMPILER_STRIP_GATE(8067E8D8, &lit_4549); +COMPILER_STRIP_GATE(0x8067E8D8, &lit_4549); /* 8067E8DC-8067E8E0 00005C 0004+00 0/1 0/0 0/0 .rodata @4550 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4550 = 2000.0f; -COMPILER_STRIP_GATE(8067E8DC, &lit_4550); +COMPILER_STRIP_GATE(0x8067E8DC, &lit_4550); #pragma pop /* 8067E8E0-8067E8E4 000060 0004+00 0/1 0/0 0/0 .rodata @4551 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4551 = 10000.0f; -COMPILER_STRIP_GATE(8067E8E0, &lit_4551); +COMPILER_STRIP_GATE(0x8067E8E0, &lit_4551); #pragma pop /* 8067E8E4-8067E8E8 000064 0004+00 0/1 0/0 0/0 .rodata @4552 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4552 = 32768.0f; -COMPILER_STRIP_GATE(8067E8E4, &lit_4552); +COMPILER_STRIP_GATE(0x8067E8E4, &lit_4552); #pragma pop /* 8067E8E8-8067E8EC 000068 0004+00 0/1 0/0 0/0 .rodata @4553 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4553 = 8000.0f; -COMPILER_STRIP_GATE(8067E8E8, &lit_4553); +COMPILER_STRIP_GATE(0x8067E8E8, &lit_4553); #pragma pop /* 8067E8EC-8067E8F0 00006C 0004+00 0/1 0/0 0/0 .rodata @4554 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4554 = 4000.0f; -COMPILER_STRIP_GATE(8067E8EC, &lit_4554); +COMPILER_STRIP_GATE(0x8067E8EC, &lit_4554); #pragma pop /* 8067E8F0-8067E8F4 000070 0004+00 0/1 0/0 0/0 .rodata @4555 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4555 = 2.0f / 5.0f; -COMPILER_STRIP_GATE(8067E8F0, &lit_4555); +COMPILER_STRIP_GATE(0x8067E8F0, &lit_4555); #pragma pop /* 8067EB18-8067EB1C 000008 0001+03 2/2 0/0 0/0 .bss @1109 */ @@ -694,12 +694,12 @@ static asm void hit_check(e_arrow_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4604 = 100.0f; -COMPILER_STRIP_GATE(8067E8F4, &lit_4604); +COMPILER_STRIP_GATE(0x8067E8F4, &lit_4604); #pragma pop /* 8067E8F8-8067E8FC 000078 0004+00 1/2 0/0 0/0 .rodata @4605 */ SECTION_RODATA static f32 const lit_4605 = 65535.0f; -COMPILER_STRIP_GATE(8067E8F8, &lit_4605); +COMPILER_STRIP_GATE(0x8067E8F8, &lit_4605); /* 8067D21C-8067D40C 000B3C 01F0+00 1/1 0/0 0/0 .text e_arrow_shot__FP13e_arrow_class */ #pragma push @@ -716,14 +716,14 @@ static asm void e_arrow_shot(e_arrow_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4628 = 30.0f; -COMPILER_STRIP_GATE(8067E8FC, &lit_4628); +COMPILER_STRIP_GATE(0x8067E8FC, &lit_4628); #pragma pop /* 8067E900-8067E904 000080 0004+00 0/3 0/0 0/0 .rodata @4629 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4629 = -1.0f; -COMPILER_STRIP_GATE(8067E900, &lit_4629); +COMPILER_STRIP_GATE(0x8067E900, &lit_4629); #pragma pop /* 8067D40C-8067D530 000D2C 0124+00 1/1 0/0 0/0 .text e_arrow_bg__FP13e_arrow_class */ @@ -749,7 +749,7 @@ static asm void e_arrow_spin(e_arrow_class* param_0) { /* ############################################################################################## */ /* 8067E904-8067E908 000084 0004+00 1/2 0/0 0/0 .rodata @4659 */ SECTION_RODATA static f32 const lit_4659 = 300.0f; -COMPILER_STRIP_GATE(8067E904, &lit_4659); +COMPILER_STRIP_GATE(0x8067E904, &lit_4659); /* 8067D5FC-8067D68C 000F1C 0090+00 1/1 0/0 0/0 .text s_limit_sub__FPvPv */ #pragma push @@ -766,63 +766,63 @@ static asm void s_limit_sub(void* param_0, void* param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4754 = 39000.0f; -COMPILER_STRIP_GATE(8067E908, &lit_4754); +COMPILER_STRIP_GATE(0x8067E908, &lit_4754); #pragma pop /* 8067E90C-8067E910 00008C 0004+00 0/1 0/0 0/0 .rodata @4755 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4755 = 41200.0f; -COMPILER_STRIP_GATE(8067E90C, &lit_4755); +COMPILER_STRIP_GATE(0x8067E90C, &lit_4755); #pragma pop /* 8067E910-8067E914 000090 0004+00 0/1 0/0 0/0 .rodata @4756 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4756 = -700.0f; -COMPILER_STRIP_GATE(8067E910, &lit_4756); +COMPILER_STRIP_GATE(0x8067E910, &lit_4756); #pragma pop /* 8067E914-8067E918 000094 0004+00 0/1 0/0 0/0 .rodata @4757 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4757 = 36800.0f; -COMPILER_STRIP_GATE(8067E914, &lit_4757); +COMPILER_STRIP_GATE(0x8067E914, &lit_4757); #pragma pop /* 8067E918-8067E91C 000098 0004+00 0/1 0/0 0/0 .rodata @4758 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4758 = 700.0f; -COMPILER_STRIP_GATE(8067E918, &lit_4758); +COMPILER_STRIP_GATE(0x8067E918, &lit_4758); #pragma pop /* 8067E91C-8067E920 00009C 0004+00 0/1 0/0 0/0 .rodata @4759 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4759 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(8067E91C, &lit_4759); +COMPILER_STRIP_GATE(0x8067E91C, &lit_4759); #pragma pop /* 8067E920-8067E924 0000A0 0004+00 0/1 0/0 0/0 .rodata @4760 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4760 = -10000.0f; -COMPILER_STRIP_GATE(8067E920, &lit_4760); +COMPILER_STRIP_GATE(0x8067E920, &lit_4760); #pragma pop /* 8067E924-8067E928 0000A4 0004+00 0/2 0/0 0/0 .rodata @4761 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4761 = 10.0f; -COMPILER_STRIP_GATE(8067E924, &lit_4761); +COMPILER_STRIP_GATE(0x8067E924, &lit_4761); #pragma pop /* 8067E928-8067E92C 0000A8 0004+00 0/1 0/0 0/0 .rodata @4762 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4762 = 800.0f; -COMPILER_STRIP_GATE(8067E928, &lit_4762); +COMPILER_STRIP_GATE(0x8067E928, &lit_4762); #pragma pop /* 8067E978-8067E984 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ @@ -1008,35 +1008,35 @@ static asm void e_arrow_shield(e_arrow_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4858 = 2500.0f; -COMPILER_STRIP_GATE(8067E92C, &lit_4858); +COMPILER_STRIP_GATE(0x8067E92C, &lit_4858); #pragma pop /* 8067E930-8067E934 0000B0 0004+00 0/1 0/0 0/0 .rodata @4859 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4859 = 1.0f / 100.0f; -COMPILER_STRIP_GATE(8067E930, &lit_4859); +COMPILER_STRIP_GATE(0x8067E930, &lit_4859); #pragma pop /* 8067E934-8067E938 0000B4 0004+00 0/1 0/0 0/0 .rodata @4860 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4860 = 60.0f; -COMPILER_STRIP_GATE(8067E934, &lit_4860); +COMPILER_STRIP_GATE(0x8067E934, &lit_4860); #pragma pop /* 8067E938-8067E93C 0000B8 0004+00 0/2 0/0 0/0 .rodata @4861 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4861 = 50.0f; -COMPILER_STRIP_GATE(8067E938, &lit_4861); +COMPILER_STRIP_GATE(0x8067E938, &lit_4861); #pragma pop /* 8067E93C-8067E940 0000BC 0004+00 0/1 0/0 0/0 .rodata @4862 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4862 = 5.0f; -COMPILER_STRIP_GATE(8067E93C, &lit_4862); +COMPILER_STRIP_GATE(0x8067E93C, &lit_4862); #pragma pop /* 8067E940-8067E948 0000C0 0004+04 0/1 0/0 0/0 .rodata @4863 */ @@ -1047,7 +1047,7 @@ SECTION_RODATA static f32 const lit_4863[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(8067E940, &lit_4863); +COMPILER_STRIP_GATE(0x8067E940, &lit_4863); #pragma pop /* 8067E948-8067E950 0000C8 0008+00 0/2 0/0 0/0 .rodata @4865 */ @@ -1056,7 +1056,7 @@ COMPILER_STRIP_GATE(8067E940, &lit_4863); SECTION_RODATA static u8 const lit_4865[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8067E948, &lit_4865); +COMPILER_STRIP_GATE(0x8067E948, &lit_4865); #pragma pop /* 8067DC58-8067DE54 001578 01FC+00 1/1 0/0 0/0 .text e_arrow_demo_bound__FP13e_arrow_class */ @@ -1074,14 +1074,14 @@ static asm void e_arrow_demo_bound(e_arrow_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4914 = 1000.0f; -COMPILER_STRIP_GATE(8067E950, &lit_4914); +COMPILER_STRIP_GATE(0x8067E950, &lit_4914); #pragma pop /* 8067E954-8067E958 0000D4 0004+00 0/1 0/0 0/0 .rodata @4915 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4915 = -300.0f; -COMPILER_STRIP_GATE(8067E954, &lit_4915); +COMPILER_STRIP_GATE(0x8067E954, &lit_4915); #pragma pop /* 8067DE54-8067E0BC 001774 0268+00 1/1 0/0 0/0 .text action__FP13e_arrow_class */ @@ -1099,35 +1099,35 @@ static asm void action(e_arrow_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4979 = 40.0f; -COMPILER_STRIP_GATE(8067E958, &lit_4979); +COMPILER_STRIP_GATE(0x8067E958, &lit_4979); #pragma pop /* 8067E95C-8067E960 0000DC 0004+00 0/1 0/0 0/0 .rodata @4980 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4980 = -40.0f; -COMPILER_STRIP_GATE(8067E95C, &lit_4980); +COMPILER_STRIP_GATE(0x8067E95C, &lit_4980); #pragma pop /* 8067E960-8067E964 0000E0 0004+00 0/1 0/0 0/0 .rodata @4981 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4981 = 19.0f / 20.0f; -COMPILER_STRIP_GATE(8067E960, &lit_4981); +COMPILER_STRIP_GATE(0x8067E960, &lit_4981); #pragma pop /* 8067E964-8067E968 0000E4 0004+00 0/1 0/0 0/0 .rodata @4982 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4982 = -60.0f; -COMPILER_STRIP_GATE(8067E964, &lit_4982); +COMPILER_STRIP_GATE(0x8067E964, &lit_4982); #pragma pop /* 8067E968-8067E96C 0000E8 0004+00 0/1 0/0 0/0 .rodata @4983 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4983 = -10.0f; -COMPILER_STRIP_GATE(8067E968, &lit_4983); +COMPILER_STRIP_GATE(0x8067E968, &lit_4983); #pragma pop /* 8067E0BC-8067E304 0019DC 0248+00 1/0 0/0 0/0 .text daE_ARROW_Execute__FP13e_arrow_class */ @@ -1166,6 +1166,14 @@ static asm void useHeapInit(fopAc_ac_c* param_0) { } #pragma pop +/* ############################################################################################## */ +/* 8067E96C-8067E96C 0000EC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8067E96C = "E_rdy"; +SECTION_DEAD static char const* const stringBase_8067E972 = "E_rd"; +#pragma pop + /* 8067E428-8067E724 001D48 02FC+00 1/0 0/0 0/0 .text daE_ARROW_Create__FP10fopAc_ac_c */ #pragma push #pragma optimization_level 0 @@ -1425,10 +1433,4 @@ static u8 data_8067EBF0[4]; static u8 data_8067EBF4[4]; #pragma pop -/* 8067E96C-8067E977 0000EC 000B+00 1/1 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_8067E96C = "E_rdy"; -SECTION_DEAD static char const* const stringBase_8067E972 = "E_rd"; -#pragma pop +/* 8067E96C-8067E96C 0000EC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/e/d_a_e_ba/d_a_e_ba.cpp b/rel/d/a/e/d_a_e_ba/d_a_e_ba.cpp index e9074423b4e..ec7ae1e7d9c 100644 --- a/rel/d/a/e/d_a_e_ba/d_a_e_ba.cpp +++ b/rel/d/a/e/d_a_e_ba/d_a_e_ba.cpp @@ -19,16 +19,16 @@ struct mDoMtx_stack_c { static u8 now[48]; }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; - struct J3DAnmTransform {}; +struct J3DModelData {}; + +struct Z2Creature {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -90,10 +90,10 @@ struct dRes_control_c { struct dPa_levelEcallBack {}; -struct _GXColor {}; - struct csXyz {}; +struct _GXColor {}; + struct dPa_control_c { struct level_c { /* 8004B918 */ void getEmitter(u32); @@ -386,7 +386,7 @@ extern "C" void __register_global_object(); /* ############################################################################################## */ /* 806823BC-806823C0 000000 0004+00 20/20 0/0 0/0 .rodata @3947 */ SECTION_RODATA static f32 const lit_3947 = 100.0f; -COMPILER_STRIP_GATE(806823BC, &lit_3947); +COMPILER_STRIP_GATE(0x806823BC, &lit_3947); /* 806823C0-806823C4 000004 0004+00 1/16 0/0 0/0 .rodata @3948 */ SECTION_RODATA static u8 const lit_3948[4] = { @@ -395,7 +395,7 @@ SECTION_RODATA static u8 const lit_3948[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(806823C0, &lit_3948); +COMPILER_STRIP_GATE(0x806823C0, &lit_3948); /* 806823C4-806823CC 000008 0004+04 1/17 0/0 0/0 .rodata @3949 */ SECTION_RODATA static f32 const lit_3949[1 + 1 /* padding */] = { @@ -403,7 +403,7 @@ SECTION_RODATA static f32 const lit_3949[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(806823C4, &lit_3949); +COMPILER_STRIP_GATE(0x806823C4, &lit_3949); /* 806823CC-806823D4 000010 0008+00 0/3 0/0 0/0 .rodata @3950 */ #pragma push @@ -411,7 +411,7 @@ COMPILER_STRIP_GATE(806823C4, &lit_3949); SECTION_RODATA static u8 const lit_3950[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(806823CC, &lit_3950); +COMPILER_STRIP_GATE(0x806823CC, &lit_3950); #pragma pop /* 806823D4-806823DC 000018 0008+00 0/3 0/0 0/0 .rodata @3951 */ @@ -420,7 +420,7 @@ COMPILER_STRIP_GATE(806823CC, &lit_3950); SECTION_RODATA static u8 const lit_3951[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(806823D4, &lit_3951); +COMPILER_STRIP_GATE(0x806823D4, &lit_3951); #pragma pop /* 806823DC-806823E4 000020 0008+00 0/3 0/0 0/0 .rodata @3952 */ @@ -429,35 +429,43 @@ COMPILER_STRIP_GATE(806823D4, &lit_3951); SECTION_RODATA static u8 const lit_3952[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(806823DC, &lit_3952); +COMPILER_STRIP_GATE(0x806823DC, &lit_3952); #pragma pop /* 806823E4-806823E8 000028 0004+00 0/1 0/0 0/0 .rodata @3953 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3953 = 1.0f / 100.0f; -COMPILER_STRIP_GATE(806823E4, &lit_3953); +COMPILER_STRIP_GATE(0x806823E4, &lit_3953); #pragma pop /* 806823E8-806823EC 00002C 0004+00 0/3 0/0 0/0 .rodata @3968 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3968 = 15.0f; -COMPILER_STRIP_GATE(806823E8, &lit_3968); +COMPILER_STRIP_GATE(0x806823E8, &lit_3968); #pragma pop /* 806823EC-806823F0 000030 0004+00 0/1 0/0 0/0 .rodata @3969 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3969 = 250.0f; -COMPILER_STRIP_GATE(806823EC, &lit_3969); +COMPILER_STRIP_GATE(0x806823EC, &lit_3969); #pragma pop /* 806823F0-806823F4 000034 0004+00 0/3 0/0 0/0 .rodata @3970 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3970 = 40.0f; -COMPILER_STRIP_GATE(806823F0, &lit_3970); +COMPILER_STRIP_GATE(0x806823F0, &lit_3970); +#pragma pop + +/* 8068248C-8068248C 0000D0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8068248C = "E_ba"; +SECTION_DEAD static char const* const stringBase_80682491 = "E_fb"; +SECTION_DEAD static char const* const stringBase_80682496 = "E_ib"; #pragma pop /* 8068249C-806824A8 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ @@ -663,7 +671,7 @@ static asm void ba_disappear(fopAc_ac_c* param_0) { /* ############################################################################################## */ /* 806823F4-806823F8 000038 0004+00 1/1 0/0 0/0 .rodata @3996 */ SECTION_RODATA static f32 const lit_3996 = -1.0f; -COMPILER_STRIP_GATE(806823F4, &lit_3996); +COMPILER_STRIP_GATE(0x806823F4, &lit_3996); /* 8067ED90-8067EE38 000190 00A8+00 11/11 0/0 0/0 .text anm_init__FP10e_ba_classifUcf */ #pragma push @@ -721,21 +729,21 @@ static asm void pl_check(e_ba_class* param_0, f32 param_1, s16 param_2) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4122 = 70.0f; -COMPILER_STRIP_GATE(806823F8, &lit_4122); +COMPILER_STRIP_GATE(0x806823F8, &lit_4122); #pragma pop /* 806823FC-80682400 000040 0004+00 0/1 0/0 0/0 .rodata @4123 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4123 = 80.0f; -COMPILER_STRIP_GATE(806823FC, &lit_4123); +COMPILER_STRIP_GATE(0x806823FC, &lit_4123); #pragma pop /* 80682400-80682404 000044 0004+00 0/3 0/0 0/0 .rodata @4124 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4124 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(80682400, &lit_4124); +COMPILER_STRIP_GATE(0x80682400, &lit_4124); #pragma pop /* 8067F0AC-8067F2DC 0004AC 0230+00 1/1 0/0 0/0 .text damage_check__FP10e_ba_class */ @@ -753,7 +761,7 @@ static asm void damage_check(e_ba_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4156 = 50.0f; -COMPILER_STRIP_GATE(80682404, &lit_4156); +COMPILER_STRIP_GATE(0x80682404, &lit_4156); #pragma pop /* 80682638-8068263C 000008 0004+00 2/2 0/0 0/0 .bss None */ @@ -783,14 +791,14 @@ static asm void path_check(e_ba_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4242 = 2000.0f; -COMPILER_STRIP_GATE(80682408, &lit_4242); +COMPILER_STRIP_GATE(0x80682408, &lit_4242); #pragma pop /* 8068240C-80682410 000050 0004+00 0/1 0/0 0/0 .rodata @4243 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4243 = 1.0f / 25.0f; -COMPILER_STRIP_GATE(8068240C, &lit_4243); +COMPILER_STRIP_GATE(0x8068240C, &lit_4243); #pragma pop /* 8067F544-8067F6D4 000944 0190+00 6/6 0/0 0/0 .text fly_move__FP10e_ba_class */ @@ -808,21 +816,21 @@ static asm void fly_move(e_ba_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4275 = 9.0f / 10.0f; -COMPILER_STRIP_GATE(80682410, &lit_4275); +COMPILER_STRIP_GATE(0x80682410, &lit_4275); #pragma pop /* 80682414-80682418 000058 0004+00 0/3 0/0 0/0 .rodata @4276 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4276 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(80682414, &lit_4276); +COMPILER_STRIP_GATE(0x80682414, &lit_4276); #pragma pop /* 80682418-8068241C 00005C 0004+00 0/5 0/0 0/0 .rodata @4277 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4277 = 0.5f; -COMPILER_STRIP_GATE(80682418, &lit_4277); +COMPILER_STRIP_GATE(0x80682418, &lit_4277); #pragma pop /* 8067F6D4-8067F81C 000AD4 0148+00 1/1 0/0 0/0 .text e_ba_roof__FP10e_ba_class */ @@ -840,14 +848,14 @@ static asm void e_ba_roof(e_ba_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4307 = 3.0f; -COMPILER_STRIP_GATE(8068241C, &lit_4307); +COMPILER_STRIP_GATE(0x8068241C, &lit_4307); #pragma pop /* 80682420-80682424 000064 0004+00 0/4 0/0 0/0 .rodata @4308 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4308 = 3.0f / 10.0f; -COMPILER_STRIP_GATE(80682420, &lit_4308); +COMPILER_STRIP_GATE(0x80682420, &lit_4308); #pragma pop /* 8067F81C-8067F9E0 000C1C 01C4+00 1/1 0/0 0/0 .text e_ba_fight_fly__FP10e_ba_class */ @@ -865,35 +873,35 @@ static asm void e_ba_fight_fly(e_ba_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4376 = 2.0f; -COMPILER_STRIP_GATE(80682424, &lit_4376); +COMPILER_STRIP_GATE(0x80682424, &lit_4376); #pragma pop /* 80682428-8068242C 00006C 0004+00 0/5 0/0 0/0 .rodata @4377 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4377 = 30.0f; -COMPILER_STRIP_GATE(80682428, &lit_4377); +COMPILER_STRIP_GATE(0x80682428, &lit_4377); #pragma pop /* 8068242C-80682430 000070 0004+00 0/1 0/0 0/0 .rodata @4378 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4378 = 12288.0f; -COMPILER_STRIP_GATE(8068242C, &lit_4378); +COMPILER_STRIP_GATE(0x8068242C, &lit_4378); #pragma pop /* 80682430-80682434 000074 0004+00 0/2 0/0 0/0 .rodata @4379 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4379 = 150.0f; -COMPILER_STRIP_GATE(80682430, &lit_4379); +COMPILER_STRIP_GATE(0x80682430, &lit_4379); #pragma pop /* 80682434-80682438 000078 0004+00 0/3 0/0 0/0 .rodata @4380 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4380 = 10.0f; -COMPILER_STRIP_GATE(80682434, &lit_4380); +COMPILER_STRIP_GATE(0x80682434, &lit_4380); #pragma pop /* 8067F9E0-8067FD68 000DE0 0388+00 1/1 0/0 0/0 .text e_ba_fight__FP10e_ba_class */ @@ -911,7 +919,7 @@ static asm void e_ba_fight(e_ba_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4417 = 120.0f; -COMPILER_STRIP_GATE(80682438, &lit_4417); +COMPILER_STRIP_GATE(0x80682438, &lit_4417); #pragma pop /* 8067FD68-8067FF60 001168 01F8+00 1/1 0/0 0/0 .text e_ba_attack__FP10e_ba_class */ @@ -929,14 +937,14 @@ static asm void e_ba_attack(e_ba_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4459 = 500.0f; -COMPILER_STRIP_GATE(8068243C, &lit_4459); +COMPILER_STRIP_GATE(0x8068243C, &lit_4459); #pragma pop /* 80682440-80682444 000084 0004+00 0/3 0/0 0/0 .rodata @4460 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4460 = 200.0f; -COMPILER_STRIP_GATE(80682440, &lit_4460); +COMPILER_STRIP_GATE(0x80682440, &lit_4460); #pragma pop /* 8067FF60-8068018C 001360 022C+00 1/1 0/0 0/0 .text e_ba_fly__FP10e_ba_class */ @@ -974,21 +982,21 @@ static asm void e_ba_path_fly(e_ba_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4587 = 1.5f; -COMPILER_STRIP_GATE(80682444, &lit_4587); +COMPILER_STRIP_GATE(0x80682444, &lit_4587); #pragma pop /* 80682448-8068244C 00008C 0004+00 0/1 0/0 0/0 .rodata @4588 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4588 = 65536.0f; -COMPILER_STRIP_GATE(80682448, &lit_4588); +COMPILER_STRIP_GATE(0x80682448, &lit_4588); #pragma pop /* 8068244C-80682450 000090 0004+00 0/1 0/0 0/0 .rodata @4589 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4589 = 4.0f / 5.0f; -COMPILER_STRIP_GATE(8068244C, &lit_4589); +COMPILER_STRIP_GATE(0x8068244C, &lit_4589); #pragma pop /* 806806B4-806808AC 001AB4 01F8+00 1/1 0/0 0/0 .text e_ba_chance__FP10e_ba_class */ @@ -1006,14 +1014,14 @@ static asm void e_ba_chance(e_ba_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4629 = -20.0f; -COMPILER_STRIP_GATE(80682450, &lit_4629); +COMPILER_STRIP_GATE(0x80682450, &lit_4629); #pragma pop /* 80682454-80682458 000098 0004+00 0/2 0/0 0/0 .rodata @4630 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4630 = 4.0f; -COMPILER_STRIP_GATE(80682454, &lit_4630); +COMPILER_STRIP_GATE(0x80682454, &lit_4630); #pragma pop /* 806808AC-80680AF4 001CAC 0248+00 1/1 0/0 0/0 .text e_ba_wolfbite__FP10e_ba_class */ @@ -1031,14 +1039,14 @@ static asm void e_ba_wolfbite(e_ba_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4654 = 15000.0f; -COMPILER_STRIP_GATE(80682458, &lit_4654); +COMPILER_STRIP_GATE(0x80682458, &lit_4654); #pragma pop /* 8068245C-80682460 0000A0 0004+00 0/1 0/0 0/0 .rodata @4655 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4655 = 1000.0f; -COMPILER_STRIP_GATE(8068245C, &lit_4655); +COMPILER_STRIP_GATE(0x8068245C, &lit_4655); #pragma pop /* 80680AF4-80680C98 001EF4 01A4+00 1/1 0/0 0/0 .text e_ba_wind__FP10e_ba_class */ @@ -1056,21 +1064,21 @@ static asm void e_ba_wind(e_ba_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4678 = 20.0f; -COMPILER_STRIP_GATE(80682460, &lit_4678); +COMPILER_STRIP_GATE(0x80682460, &lit_4678); #pragma pop /* 80682464-80682468 0000A8 0004+00 0/2 0/0 0/0 .rodata @4679 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4679 = 100000.0f; -COMPILER_STRIP_GATE(80682464, &lit_4679); +COMPILER_STRIP_GATE(0x80682464, &lit_4679); #pragma pop /* 80682468-8068246C 0000AC 0004+00 0/1 0/0 0/0 .rodata @4680 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4680 = 7.0f / 10.0f; -COMPILER_STRIP_GATE(80682468, &lit_4680); +COMPILER_STRIP_GATE(0x80682468, &lit_4680); #pragma pop /* 80680C98-80680DCC 002098 0134+00 1/1 0/0 0/0 .text e_ba_appear__FP10e_ba_class */ @@ -1098,21 +1106,21 @@ static asm void action(e_ba_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4747 = 5.0f; -COMPILER_STRIP_GATE(8068246C, &lit_4747); +COMPILER_STRIP_GATE(0x8068246C, &lit_4747); #pragma pop /* 80682470-80682474 0000B4 0004+00 0/1 0/0 0/0 .rodata @4938 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4938 = 20000.0f; -COMPILER_STRIP_GATE(80682470, &lit_4938); +COMPILER_STRIP_GATE(0x80682470, &lit_4938); #pragma pop /* 80682474-80682478 0000B8 0004+00 0/1 0/0 0/0 .rodata @4939 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4939 = 3.0f / 5.0f; -COMPILER_STRIP_GATE(80682474, &lit_4939); +COMPILER_STRIP_GATE(0x80682474, &lit_4939); #pragma pop /* 80681128-80681734 002528 060C+00 2/1 0/0 0/0 .text daE_BA_Execute__FP10e_ba_class */ @@ -1155,7 +1163,7 @@ static asm void useHeapInit(fopAc_ac_c* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5134 = -200.0f; -COMPILER_STRIP_GATE(80682478, &lit_5134); +COMPILER_STRIP_GATE(0x80682478, &lit_5134); #pragma pop /* 8068247C-80682484 0000C0 0004+04 0/1 0/0 0/0 .rodata @5135 */ @@ -1166,7 +1174,7 @@ SECTION_RODATA static f32 const lit_5135[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(8068247C, &lit_5135); +COMPILER_STRIP_GATE(0x8068247C, &lit_5135); #pragma pop /* 80682484-8068248C 0000C8 0008+00 0/1 0/0 0/0 .rodata @5137 */ @@ -1175,7 +1183,7 @@ COMPILER_STRIP_GATE(8068247C, &lit_5135); SECTION_RODATA static u8 const lit_5137[8] = { 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80682484, &lit_5137); +COMPILER_STRIP_GATE(0x80682484, &lit_5137); #pragma pop /* 80681890-80681CEC 002C90 045C+00 1/0 0/0 0/0 .text daE_BA_Create__FP10fopAc_ac_c */ @@ -1270,7 +1278,7 @@ asm void __sinit_d_a_e_ba_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80681F48 = (void*)__sinit_d_a_e_ba_cpp; +REGISTER_CTORS(0x80681F48, __sinit_d_a_e_ba_cpp); #pragma pop /* 80681F84-80681F8C 003384 0008+00 1/0 0/0 0/0 .text @36@__dt__12dBgS_ObjAcchFv */ @@ -1305,11 +1313,4 @@ static asm void setMidnaBindEffect(fopEn_enemy_c* param_0, Z2CreatureEnemy* para } #pragma pop -/* 8068248C-8068249B 0000D0 000F+00 2/1 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_8068248C = "E_ba"; -SECTION_DEAD static char const* const stringBase_80682491 = "E_fb"; -SECTION_DEAD static char const* const stringBase_80682496 = "E_ib"; -#pragma pop +/* 8068248C-8068248C 0000D0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/e/d_a_e_bee/d_a_e_bee.cpp b/rel/d/a/e/d_a_e_bee/d_a_e_bee.cpp index d324ed7ca74..c2939d9eac4 100644 --- a/rel/d/a/e/d_a_e_bee/d_a_e_bee.cpp +++ b/rel/d/a/e/d_a_e_bee/d_a_e_bee.cpp @@ -61,10 +61,10 @@ struct dPa_control_c { /* 8004C218 */ void setHitMark(u16, fopAc_ac_c*, cXyz const*, csXyz const*, cXyz const*, u32); }; -struct J3DModelData {}; - struct J3DModel {}; +struct J3DModelData {}; + struct dComIfG_play_c { /* 8002CAF0 */ void addSimpleModel(J3DModelData*, int, u8); /* 8002CB30 */ void removeSimpleModel(J3DModelData*, int); @@ -306,7 +306,7 @@ extern "C" void __register_global_object(); /* ############################################################################################## */ /* 80685434-80685438 000000 0004+00 8/8 0/0 0/0 .rodata @3770 */ SECTION_RODATA static f32 const lit_3770 = 1.0f; -COMPILER_STRIP_GATE(80685434, &lit_3770); +COMPILER_STRIP_GATE(0x80685434, &lit_3770); /* 8068552C-80685570 000000 0044+00 1/1 0/0 0/0 .data cc_cyl_src$4798 */ SECTION_DATA static u8 cc_cyl_src[68] = { @@ -509,21 +509,21 @@ static asm void bee_mtxset(bee_s* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3929 = 30.0f; -COMPILER_STRIP_GATE(80685438, &lit_3929); +COMPILER_STRIP_GATE(0x80685438, &lit_3929); #pragma pop /* 8068543C-80685440 000008 0004+00 0/4 0/0 0/0 .rodata @3930 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3930 = 5.0f; -COMPILER_STRIP_GATE(8068543C, &lit_3930); +COMPILER_STRIP_GATE(0x8068543C, &lit_3930); #pragma pop /* 80685440-80685444 00000C 0004+00 0/1 0/0 0/0 .rodata @3931 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3931 = -30.0f; -COMPILER_STRIP_GATE(80685440, &lit_3931); +COMPILER_STRIP_GATE(0x80685440, &lit_3931); #pragma pop /* 80685444-80685448 000010 0004+00 0/6 0/0 0/0 .rodata @3932 */ @@ -535,14 +535,14 @@ SECTION_RODATA static u8 const lit_3932[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80685444, &lit_3932); +COMPILER_STRIP_GATE(0x80685444, &lit_3932); #pragma pop /* 80685448-8068544C 000014 0004+00 0/1 0/0 0/0 .rodata @3933 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3933 = -10.0f; -COMPILER_STRIP_GATE(80685448, &lit_3933); +COMPILER_STRIP_GATE(0x80685448, &lit_3933); #pragma pop /* 80682A70-80682D78 0002F0 0308+00 1/1 0/0 0/0 .text bee_ground_ang_set__FP5bee_s */ @@ -570,42 +570,42 @@ asm cXyz::~cXyz() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4190 = 15.0f; -COMPILER_STRIP_GATE(8068544C, &lit_4190); +COMPILER_STRIP_GATE(0x8068544C, &lit_4190); #pragma pop /* 80685450-80685454 00001C 0004+00 0/4 0/0 0/0 .rodata @4191 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4191 = 100.0f; -COMPILER_STRIP_GATE(80685450, &lit_4191); +COMPILER_STRIP_GATE(0x80685450, &lit_4191); #pragma pop /* 80685454-80685458 000020 0004+00 0/2 0/0 0/0 .rodata @4192 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4192 = 50.0f; -COMPILER_STRIP_GATE(80685454, &lit_4192); +COMPILER_STRIP_GATE(0x80685454, &lit_4192); #pragma pop /* 80685458-8068545C 000024 0004+00 0/2 0/0 0/0 .rodata @4193 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4193 = 17.0f; -COMPILER_STRIP_GATE(80685458, &lit_4193); +COMPILER_STRIP_GATE(0x80685458, &lit_4193); #pragma pop /* 8068545C-80685460 000028 0004+00 0/1 0/0 0/0 .rodata @4194 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4194 = 125.0f; -COMPILER_STRIP_GATE(8068545C, &lit_4194); +COMPILER_STRIP_GATE(0x8068545C, &lit_4194); #pragma pop /* 80685460-80685464 00002C 0004+00 0/2 0/0 0/0 .rodata @4195 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4195 = 150.0f; -COMPILER_STRIP_GATE(80685460, &lit_4195); +COMPILER_STRIP_GATE(0x80685460, &lit_4195); #pragma pop /* 80685464-8068546C 000030 0008+00 0/3 0/0 0/0 .rodata @4196 */ @@ -614,7 +614,7 @@ COMPILER_STRIP_GATE(80685460, &lit_4195); SECTION_RODATA static u8 const lit_4196[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80685464, &lit_4196); +COMPILER_STRIP_GATE(0x80685464, &lit_4196); #pragma pop /* 8068546C-80685474 000038 0008+00 0/3 0/0 0/0 .rodata @4197 */ @@ -623,7 +623,7 @@ COMPILER_STRIP_GATE(80685464, &lit_4196); SECTION_RODATA static u8 const lit_4197[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8068546C, &lit_4197); +COMPILER_STRIP_GATE(0x8068546C, &lit_4197); #pragma pop /* 80685474-8068547C 000040 0008+00 0/3 0/0 0/0 .rodata @4198 */ @@ -632,70 +632,70 @@ COMPILER_STRIP_GATE(8068546C, &lit_4197); SECTION_RODATA static u8 const lit_4198[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80685474, &lit_4198); +COMPILER_STRIP_GATE(0x80685474, &lit_4198); #pragma pop /* 8068547C-80685480 000048 0004+00 0/1 0/0 0/0 .rodata @4199 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4199 = 40.0f; -COMPILER_STRIP_GATE(8068547C, &lit_4199); +COMPILER_STRIP_GATE(0x8068547C, &lit_4199); #pragma pop /* 80685480-80685484 00004C 0004+00 0/2 0/0 0/0 .rodata @4200 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4200 = 300.0f; -COMPILER_STRIP_GATE(80685480, &lit_4200); +COMPILER_STRIP_GATE(0x80685480, &lit_4200); #pragma pop /* 80685484-80685488 000050 0004+00 0/1 0/0 0/0 .rodata @4201 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4201 = 10000.0f; -COMPILER_STRIP_GATE(80685484, &lit_4201); +COMPILER_STRIP_GATE(0x80685484, &lit_4201); #pragma pop /* 80685488-8068548C 000054 0004+00 0/2 0/0 0/0 .rodata @4202 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4202 = 55.0f; -COMPILER_STRIP_GATE(80685488, &lit_4202); +COMPILER_STRIP_GATE(0x80685488, &lit_4202); #pragma pop /* 8068548C-80685490 000058 0004+00 0/1 0/0 0/0 .rodata @4203 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4203 = 500.0f; -COMPILER_STRIP_GATE(8068548C, &lit_4203); +COMPILER_STRIP_GATE(0x8068548C, &lit_4203); #pragma pop /* 80685490-80685494 00005C 0004+00 0/1 0/0 0/0 .rodata @4204 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4204 = 0.5f; -COMPILER_STRIP_GATE(80685490, &lit_4204); +COMPILER_STRIP_GATE(0x80685490, &lit_4204); #pragma pop /* 80685494-80685498 000060 0004+00 0/1 0/0 0/0 .rodata @4205 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4205 = 2000.0f; -COMPILER_STRIP_GATE(80685494, &lit_4205); +COMPILER_STRIP_GATE(0x80685494, &lit_4205); #pragma pop /* 80685498-8068549C 000064 0004+00 0/1 0/0 0/0 .rodata @4206 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4206 = 1500.0f; -COMPILER_STRIP_GATE(80685498, &lit_4206); +COMPILER_STRIP_GATE(0x80685498, &lit_4206); #pragma pop /* 8068549C-806854A0 000068 0004+00 0/3 0/0 0/0 .rodata @4207 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4207 = 200.0f; -COMPILER_STRIP_GATE(8068549C, &lit_4207); +COMPILER_STRIP_GATE(0x8068549C, &lit_4207); #pragma pop /* 80685694-80685698 000064 0004+00 1/2 0/0 0/0 .bss None */ @@ -716,70 +716,70 @@ static asm void bee_fly_action(e_bee_class* param_0, bee_s* param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4353 = 1.0f / 50.0f; -COMPILER_STRIP_GATE(806854A0, &lit_4353); +COMPILER_STRIP_GATE(0x806854A0, &lit_4353); #pragma pop /* 806854A4-806854A8 000070 0004+00 0/2 0/0 0/0 .rodata @4354 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4354 = 10.0f; -COMPILER_STRIP_GATE(806854A4, &lit_4354); +COMPILER_STRIP_GATE(0x806854A4, &lit_4354); #pragma pop /* 806854A8-806854AC 000074 0004+00 0/1 0/0 0/0 .rodata @4355 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4355 = 2.0f; -COMPILER_STRIP_GATE(806854A8, &lit_4355); +COMPILER_STRIP_GATE(0x806854A8, &lit_4355); #pragma pop /* 806854AC-806854B0 000078 0004+00 0/3 0/0 0/0 .rodata @4356 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4356 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(806854AC, &lit_4356); +COMPILER_STRIP_GATE(0x806854AC, &lit_4356); #pragma pop /* 806854B0-806854B4 00007C 0004+00 0/1 0/0 0/0 .rodata @4357 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4357 = 32768.0f; -COMPILER_STRIP_GATE(806854B0, &lit_4357); +COMPILER_STRIP_GATE(0x806854B0, &lit_4357); #pragma pop /* 806854B4-806854B8 000080 0004+00 0/1 0/0 0/0 .rodata @4358 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4358 = -51.0f; -COMPILER_STRIP_GATE(806854B4, &lit_4358); +COMPILER_STRIP_GATE(0x806854B4, &lit_4358); #pragma pop /* 806854B8-806854BC 000084 0004+00 0/1 0/0 0/0 .rodata @4359 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4359 = 6.0f / 5.0f; -COMPILER_STRIP_GATE(806854B8, &lit_4359); +COMPILER_STRIP_GATE(0x806854B8, &lit_4359); #pragma pop /* 806854BC-806854C0 000088 0004+00 0/1 0/0 0/0 .rodata @4360 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4360 = 400.0f; -COMPILER_STRIP_GATE(806854BC, &lit_4360); +COMPILER_STRIP_GATE(0x806854BC, &lit_4360); #pragma pop /* 806854C0-806854C4 00008C 0004+00 0/2 0/0 0/0 .rodata @4361 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4361 = 20.0f; -COMPILER_STRIP_GATE(806854C0, &lit_4361); +COMPILER_STRIP_GATE(0x806854C0, &lit_4361); #pragma pop /* 806854C4-806854C8 000090 0004+00 0/3 0/0 0/0 .rodata @4362 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4362 = 65536.0f; -COMPILER_STRIP_GATE(806854C4, &lit_4362); +COMPILER_STRIP_GATE(0x806854C4, &lit_4362); #pragma pop /* 806835FC-80683DDC 000E7C 07E0+00 1/1 0/0 0/0 .text bee_nest_action__FP11e_bee_classP5bee_sSc */ @@ -797,35 +797,35 @@ static asm void bee_nest_action(e_bee_class* param_0, bee_s* param_1, s8 param_2 #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4395 = 3.0f; -COMPILER_STRIP_GATE(806854C8, &lit_4395); +COMPILER_STRIP_GATE(0x806854C8, &lit_4395); #pragma pop /* 806854CC-806854D0 000098 0004+00 0/1 0/0 0/0 .rodata @4396 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4396 = 1000.0f; -COMPILER_STRIP_GATE(806854CC, &lit_4396); +COMPILER_STRIP_GATE(0x806854CC, &lit_4396); #pragma pop /* 806854D0-806854D4 00009C 0004+00 0/1 0/0 0/0 .rodata @4397 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4397 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(806854D0, &lit_4397); +COMPILER_STRIP_GATE(0x806854D0, &lit_4397); #pragma pop /* 806854D4-806854D8 0000A0 0004+00 0/1 0/0 0/0 .rodata @4398 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4398 = 3.0f / 10.0f; -COMPILER_STRIP_GATE(806854D4, &lit_4398); +COMPILER_STRIP_GATE(0x806854D4, &lit_4398); #pragma pop /* 806854D8-806854DC 0000A4 0004+00 0/1 0/0 0/0 .rodata @4399 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4399 = 1.0f / 100.0f; -COMPILER_STRIP_GATE(806854D8, &lit_4399); +COMPILER_STRIP_GATE(0x806854D8, &lit_4399); #pragma pop /* 80683DDC-80683FF4 00165C 0218+00 1/1 0/0 0/0 .text bee_fail__FP5bee_s */ @@ -843,7 +843,7 @@ static asm void bee_fail(bee_s* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4448 = 4000.0f; -COMPILER_STRIP_GATE(806854DC, &lit_4448); +COMPILER_STRIP_GATE(0x806854DC, &lit_4448); #pragma pop /* 80683FF4-80684248 001874 0254+00 1/1 0/0 0/0 .text bee_start__FP11e_bee_classP5bee_s @@ -862,42 +862,42 @@ static asm void bee_start(e_bee_class* param_0, bee_s* param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4676 = -20000.0f; -COMPILER_STRIP_GATE(806854E0, &lit_4676); +COMPILER_STRIP_GATE(0x806854E0, &lit_4676); #pragma pop /* 806854E4-806854E8 0000B0 0004+00 0/1 0/0 0/0 .rodata @4677 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4677 = 30000.0f; -COMPILER_STRIP_GATE(806854E4, &lit_4677); +COMPILER_STRIP_GATE(0x806854E4, &lit_4677); #pragma pop /* 806854E8-806854EC 0000B4 0004+00 0/1 0/0 0/0 .rodata @4678 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4678 = -15000.0f; -COMPILER_STRIP_GATE(806854E8, &lit_4678); +COMPILER_STRIP_GATE(0x806854E8, &lit_4678); #pragma pop /* 806854EC-806854F0 0000B8 0004+00 0/1 0/0 0/0 .rodata @4679 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4679 = 120.0f; -COMPILER_STRIP_GATE(806854EC, &lit_4679); +COMPILER_STRIP_GATE(0x806854EC, &lit_4679); #pragma pop /* 806854F0-806854F4 0000BC 0004+00 0/1 0/0 0/0 .rodata @4680 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4680 = 2500.0f; -COMPILER_STRIP_GATE(806854F0, &lit_4680); +COMPILER_STRIP_GATE(0x806854F0, &lit_4680); #pragma pop /* 806854F4-806854F8 0000C0 0004+00 0/1 0/0 0/0 .rodata @4681 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4681 = 7.0f / 20.0f; -COMPILER_STRIP_GATE(806854F4, &lit_4681); +COMPILER_STRIP_GATE(0x806854F4, &lit_4681); #pragma pop /* 80685698-806856A8 000068 000C+04 0/1 0/0 0/0 .bss @4455 */ @@ -943,7 +943,13 @@ static bool daE_Bee_IsDelete(e_bee_class* param_0) { SECTION_RODATA static u8 const l_bmdidx_4715[16] = { 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x06, }; -COMPILER_STRIP_GATE(806854F8, &l_bmdidx_4715); +COMPILER_STRIP_GATE(0x806854F8, &l_bmdidx_4715); + +/* 80685524-80685524 0000F0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80685524 = "E_bee"; +#pragma pop /* 80684B64-80684C70 0023E4 010C+00 1/0 0/0 0/0 .text daE_Bee_Delete__FP11e_bee_class */ #pragma push @@ -972,14 +978,14 @@ static asm void useHeapInit(fopAc_ac_c* param_0) { SECTION_RODATA static u8 const l_bmdidx_4800[16] = { 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x06, }; -COMPILER_STRIP_GATE(80685508, &l_bmdidx_4800); +COMPILER_STRIP_GATE(0x80685508, &l_bmdidx_4800); #pragma pop /* 80685518-8068551C 0000E4 0004+00 0/1 0/0 0/0 .rodata @4910 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4910 = -80.0f; -COMPILER_STRIP_GATE(80685518, &lit_4910); +COMPILER_STRIP_GATE(0x80685518, &lit_4910); #pragma pop /* 8068551C-80685524 0000E8 0008+00 0/1 0/0 0/0 .rodata @4912 */ @@ -988,7 +994,7 @@ COMPILER_STRIP_GATE(80685518, &lit_4910); SECTION_RODATA static u8 const lit_4912[8] = { 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8068551C, &lit_4912); +COMPILER_STRIP_GATE(0x8068551C, &lit_4912); #pragma pop /* 80684E24-80685224 0026A4 0400+00 1/0 0/0 0/0 .text daE_Bee_Create__FP10fopAc_ac_c */ @@ -1073,7 +1079,7 @@ asm void __sinit_d_a_e_bee_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_806853E4 = (void*)__sinit_d_a_e_bee_cpp; +REGISTER_CTORS(0x806853E4, __sinit_d_a_e_bee_cpp); #pragma pop /* ############################################################################################## */ @@ -1248,9 +1254,4 @@ static u8 data_80685710[4]; static u8 data_80685714[4]; #pragma pop -/* 80685524-8068552A 0000F0 0006+00 3/3 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80685524 = "E_bee"; -#pragma pop +/* 80685524-80685524 0000F0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/e/d_a_e_bg/d_a_e_bg.cpp b/rel/d/a/e/d_a_e_bg/d_a_e_bg.cpp index 695a3ac0159..13c37b7b368 100644 --- a/rel/d/a/e/d_a_e_bg/d_a_e_bg.cpp +++ b/rel/d/a/e/d_a_e_bg/d_a_e_bg.cpp @@ -32,16 +32,16 @@ struct mDoExt_baseAnm { /* 8000D428 */ void play(); }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; - struct J3DAnmTransform {}; +struct J3DModelData {}; + +struct Z2Creature {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -56,10 +56,10 @@ struct fopAc_ac_c { /* 80018B64 */ fopAc_ac_c(); }; -struct J3DJoint {}; - struct J3DModel {}; +struct J3DJoint {}; + struct daE_BG_c { /* 8068585C */ void ctrlJoint(J3DJoint*, J3DModel*); /* 80685948 */ void JointCallBack(J3DJoint*, int); @@ -114,10 +114,10 @@ struct dRes_control_c { struct dPa_levelEcallBack {}; -struct _GXColor {}; - struct csXyz {}; +struct _GXColor {}; + struct dPa_control_c { struct level_c { /* 8004B918 */ void getEmitter(u32); @@ -444,29 +444,29 @@ extern "C" void __register_global_object(); /* ############################################################################################## */ /* 8068A244-8068A248 000000 0004+00 12/12 0/0 0/0 .rodata @3768 */ SECTION_RODATA static f32 const lit_3768 = 8.0f; -COMPILER_STRIP_GATE(8068A244, &lit_3768); +COMPILER_STRIP_GATE(0x8068A244, &lit_3768); /* 8068A248-8068A24C 000004 0004+00 0/1 0/0 0/0 .rodata @3769 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3769 = 16.0f; -COMPILER_STRIP_GATE(8068A248, &lit_3769); +COMPILER_STRIP_GATE(0x8068A248, &lit_3769); #pragma pop /* 8068A24C-8068A250 000008 0004+00 0/1 0/0 0/0 .rodata @3770 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3770 = 1000.0f; -COMPILER_STRIP_GATE(8068A24C, &lit_3770); +COMPILER_STRIP_GATE(0x8068A24C, &lit_3770); #pragma pop /* 8068A250-8068A254 00000C 0004+00 1/3 0/0 0/0 .rodata @3771 */ SECTION_RODATA static f32 const lit_3771 = 500.0f; -COMPILER_STRIP_GATE(8068A250, &lit_3771); +COMPILER_STRIP_GATE(0x8068A250, &lit_3771); /* 8068A254-8068A258 000010 0004+00 1/5 0/0 0/0 .rodata @3772 */ SECTION_RODATA static f32 const lit_3772 = 100.0f; -COMPILER_STRIP_GATE(8068A254, &lit_3772); +COMPILER_STRIP_GATE(0x8068A254, &lit_3772); /* 8068A314-8068A354 000000 0040+00 1/1 0/0 0/0 .data cc_bg_src__22@unnamed@d_a_e_bg_cpp@ */ @@ -635,21 +635,21 @@ asm void daE_BG_c::JointCallBack(J3DJoint* param_0, int param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3887 = 30.0f; -COMPILER_STRIP_GATE(8068A258, &lit_3887); +COMPILER_STRIP_GATE(0x8068A258, &lit_3887); #pragma pop /* 8068A25C-8068A260 000018 0004+00 0/1 0/0 0/0 .rodata @3888 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3888 = 32.0f; -COMPILER_STRIP_GATE(8068A25C, &lit_3888); +COMPILER_STRIP_GATE(0x8068A25C, &lit_3888); #pragma pop /* 8068A260-8068A264 00001C 0004+00 0/2 0/0 0/0 .rodata @3889 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3889 = 200.0f; -COMPILER_STRIP_GATE(8068A260, &lit_3889); +COMPILER_STRIP_GATE(0x8068A260, &lit_3889); #pragma pop /* 8068A264-8068A268 000020 0004+00 1/11 0/0 0/0 .rodata @3890 */ @@ -659,11 +659,11 @@ SECTION_RODATA static u8 const lit_3890[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(8068A264, &lit_3890); +COMPILER_STRIP_GATE(0x8068A264, &lit_3890); /* 8068A268-8068A26C 000024 0004+00 2/7 0/0 0/0 .rodata @3891 */ SECTION_RODATA static f32 const lit_3891 = 1.0f; -COMPILER_STRIP_GATE(8068A268, &lit_3891); +COMPILER_STRIP_GATE(0x8068A268, &lit_3891); /* 80685994-80685B50 000274 01BC+00 1/1 0/0 0/0 .text draw__8daE_BG_cFv */ #pragma push @@ -688,7 +688,13 @@ static asm void daE_BG_Draw(daE_BG_c* param_0) { /* ############################################################################################## */ /* 8068A26C-8068A270 000028 0004+00 1/1 0/0 0/0 .rodata @3905 */ SECTION_RODATA static f32 const lit_3905 = -1.0f; -COMPILER_STRIP_GATE(8068A26C, &lit_3905); +COMPILER_STRIP_GATE(0x8068A26C, &lit_3905); + +/* 8068A308-8068A308 0000C4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8068A308 = "E_BG"; +#pragma pop /* 80685B70-80685C14 000450 00A4+00 2/2 0/0 0/0 .text setBck__8daE_BG_cFiUcff */ #pragma push @@ -733,7 +739,7 @@ asm void daE_BG_c::setSparkEffect() { /* ############################################################################################## */ /* 8068A270-8068A274 00002C 0004+00 1/5 0/0 0/0 .rodata @4007 */ SECTION_RODATA static f32 const lit_4007 = 20.0f; -COMPILER_STRIP_GATE(8068A270, &lit_4007); +COMPILER_STRIP_GATE(0x8068A270, &lit_4007); /* 80685F04-80685F88 0007E4 0084+00 2/2 0/0 0/0 .text search_esa__8daE_BG_cFv */ #pragma push @@ -772,7 +778,7 @@ asm void daE_BG_c::executeBorn() { SECTION_RODATA static u8 const lit_4347[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8068A274, &lit_4347); +COMPILER_STRIP_GATE(0x8068A274, &lit_4347); #pragma pop /* 8068A27C-8068A284 000038 0008+00 0/3 0/0 0/0 .rodata @4348 */ @@ -781,7 +787,7 @@ COMPILER_STRIP_GATE(8068A274, &lit_4347); SECTION_RODATA static u8 const lit_4348[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8068A27C, &lit_4348); +COMPILER_STRIP_GATE(0x8068A27C, &lit_4348); #pragma pop /* 8068A284-8068A28C 000040 0008+00 0/3 0/0 0/0 .rodata @4349 */ @@ -790,63 +796,63 @@ COMPILER_STRIP_GATE(8068A27C, &lit_4348); SECTION_RODATA static u8 const lit_4349[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8068A284, &lit_4349); +COMPILER_STRIP_GATE(0x8068A284, &lit_4349); #pragma pop /* 8068A28C-8068A290 000048 0004+00 0/4 0/0 0/0 .rodata @4350 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4350 = -1000000000.0f; -COMPILER_STRIP_GATE(8068A28C, &lit_4350); +COMPILER_STRIP_GATE(0x8068A28C, &lit_4350); #pragma pop /* 8068A290-8068A294 00004C 0004+00 0/3 0/0 0/0 .rodata @4351 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4351 = 50.0f; -COMPILER_STRIP_GATE(8068A290, &lit_4351); +COMPILER_STRIP_GATE(0x8068A290, &lit_4351); #pragma pop /* 8068A294-8068A298 000050 0004+00 0/1 0/0 0/0 .rodata @4352 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4352 = 16000.0f; -COMPILER_STRIP_GATE(8068A294, &lit_4352); +COMPILER_STRIP_GATE(0x8068A294, &lit_4352); #pragma pop /* 8068A298-8068A29C 000054 0004+00 0/2 0/0 0/0 .rodata @4353 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4353 = 8192.0f; -COMPILER_STRIP_GATE(8068A298, &lit_4353); +COMPILER_STRIP_GATE(0x8068A298, &lit_4353); #pragma pop /* 8068A29C-8068A2A0 000058 0004+00 0/1 0/0 0/0 .rodata @4354 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4354 = 90.0f; -COMPILER_STRIP_GATE(8068A29C, &lit_4354); +COMPILER_STRIP_GATE(0x8068A29C, &lit_4354); #pragma pop /* 8068A2A0-8068A2A4 00005C 0004+00 0/2 0/0 0/0 .rodata @4355 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4355 = 4.0f; -COMPILER_STRIP_GATE(8068A2A0, &lit_4355); +COMPILER_STRIP_GATE(0x8068A2A0, &lit_4355); #pragma pop /* 8068A2A4-8068A2A8 000060 0004+00 0/5 0/0 0/0 .rodata @4356 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4356 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(8068A2A4, &lit_4356); +COMPILER_STRIP_GATE(0x8068A2A4, &lit_4356); #pragma pop /* 8068A2A8-8068A2AC 000064 0004+00 0/1 0/0 0/0 .rodata @4357 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4357 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(8068A2A8, &lit_4357); +COMPILER_STRIP_GATE(0x8068A2A8, &lit_4357); #pragma pop /* 8068A2AC-8068A2B4 000068 0004+04 0/1 0/0 0/0 .rodata @4358 */ @@ -857,7 +863,7 @@ SECTION_RODATA static f32 const lit_4358[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(8068A2AC, &lit_4358); +COMPILER_STRIP_GATE(0x8068A2AC, &lit_4358); #pragma pop /* 8068A2B4-8068A2BC 000070 0008+00 0/1 0/0 0/0 .rodata @4360 */ @@ -866,7 +872,7 @@ COMPILER_STRIP_GATE(8068A2AC, &lit_4358); SECTION_RODATA static u8 const lit_4360[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8068A2B4, &lit_4360); +COMPILER_STRIP_GATE(0x8068A2B4, &lit_4360); #pragma pop /* 80686210-80686C90 000AF0 0A80+00 1/1 0/0 0/0 .text executeSwim__8daE_BG_cFv */ @@ -884,7 +890,7 @@ asm void daE_BG_c::executeSwim() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4646 = -5.0f; -COMPILER_STRIP_GATE(8068A2BC, &lit_4646); +COMPILER_STRIP_GATE(0x8068A2BC, &lit_4646); #pragma pop /* 80686C90-80687B38 001570 0EA8+00 2/1 0/0 0/0 .text executeAttack__8daE_BG_cFv */ @@ -902,42 +908,42 @@ asm void daE_BG_c::executeAttack() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4647 = 300.0f; -COMPILER_STRIP_GATE(8068A2C0, &lit_4647); +COMPILER_STRIP_GATE(0x8068A2C0, &lit_4647); #pragma pop /* 8068A2C4-8068A2C8 000080 0004+00 0/2 0/0 0/0 .rodata @4678 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4678 = 3.0f; -COMPILER_STRIP_GATE(8068A2C4, &lit_4678); +COMPILER_STRIP_GATE(0x8068A2C4, &lit_4678); #pragma pop /* 8068A2C8-8068A2CC 000084 0004+00 0/4 0/0 0/0 .rodata @4679 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4679 = 10.0f; -COMPILER_STRIP_GATE(8068A2C8, &lit_4679); +COMPILER_STRIP_GATE(0x8068A2C8, &lit_4679); #pragma pop /* 8068A2CC-8068A2D0 000088 0004+00 0/3 0/0 0/0 .rodata @4680 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4680 = 5.0f; -COMPILER_STRIP_GATE(8068A2CC, &lit_4680); +COMPILER_STRIP_GATE(0x8068A2CC, &lit_4680); #pragma pop /* 8068A2D0-8068A2D4 00008C 0004+00 0/3 0/0 0/0 .rodata @4681 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4681 = -1.0f / 10.0f; -COMPILER_STRIP_GATE(8068A2D0, &lit_4681); +COMPILER_STRIP_GATE(0x8068A2D0, &lit_4681); #pragma pop /* 8068A2D4-8068A2D8 000090 0004+00 0/3 0/0 0/0 .rodata @4682 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4682 = -3.0f; -COMPILER_STRIP_GATE(8068A2D4, &lit_4682); +COMPILER_STRIP_GATE(0x8068A2D4, &lit_4682); #pragma pop /* 80687B38-80687CD8 002418 01A0+00 1/1 0/0 0/0 .text executeDamage__8daE_BG_cFv */ @@ -975,14 +981,14 @@ asm void daE_BG_c::executeBomb() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4834 = -100.0f; -COMPILER_STRIP_GATE(8068A2D8, &lit_4834); +COMPILER_STRIP_GATE(0x8068A2D8, &lit_4834); #pragma pop /* 8068A2DC-8068A2E0 000098 0004+00 0/1 0/0 0/0 .rodata @4835 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4835 = -40.0f; -COMPILER_STRIP_GATE(8068A2DC, &lit_4835); +COMPILER_STRIP_GATE(0x8068A2DC, &lit_4835); #pragma pop /* 80687FC4-8068838C 0028A4 03C8+00 1/1 0/0 0/0 .text executeBirth__8daE_BG_cFv */ @@ -1010,7 +1016,7 @@ asm void daE_BG_c::executeHook() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5094 = 0.5f; -COMPILER_STRIP_GATE(8068A2E0, &lit_5094); +COMPILER_STRIP_GATE(0x8068A2E0, &lit_5094); #pragma pop /* 806883D0-80689168 002CB0 0D98+00 2/1 0/0 0/0 .text executeEat__8daE_BG_cFv */ @@ -1038,42 +1044,42 @@ asm void daE_BG_c::action() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5095 = 60.0f; -COMPILER_STRIP_GATE(8068A2E4, &lit_5095); +COMPILER_STRIP_GATE(0x8068A2E4, &lit_5095); #pragma pop /* 8068A2E8-8068A2EC 0000A4 0004+00 0/0 0/0 0/0 .rodata @5096 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5096 = 70.0f; -COMPILER_STRIP_GATE(8068A2E8, &lit_5096); +COMPILER_STRIP_GATE(0x8068A2E8, &lit_5096); #pragma pop /* 8068A2EC-8068A2F0 0000A8 0004+00 0/0 0/0 0/0 .rodata @5097 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5097 = 3.0f / 10.0f; -COMPILER_STRIP_GATE(8068A2EC, &lit_5097); +COMPILER_STRIP_GATE(0x8068A2EC, &lit_5097); #pragma pop /* 8068A2F0-8068A2F4 0000AC 0004+00 0/0 0/0 0/0 .rodata @5158 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5158 = 1.5f; -COMPILER_STRIP_GATE(8068A2F0, &lit_5158); +COMPILER_STRIP_GATE(0x8068A2F0, &lit_5158); #pragma pop /* 8068A2F4-8068A2F8 0000B0 0004+00 0/2 0/0 0/0 .rodata @5220 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5220 = 25.0f; -COMPILER_STRIP_GATE(8068A2F4, &lit_5220); +COMPILER_STRIP_GATE(0x8068A2F4, &lit_5220); #pragma pop /* 8068A2F8-8068A2FC 0000B4 0004+00 0/1 0/0 0/0 .rodata @5221 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5221 = -25.0f; -COMPILER_STRIP_GATE(8068A2F8, &lit_5221); +COMPILER_STRIP_GATE(0x8068A2F8, &lit_5221); #pragma pop /* 80689544-8068966C 003E24 0128+00 1/1 0/0 0/0 .text mtx_set__8daE_BG_cFv */ @@ -1091,7 +1097,7 @@ asm void daE_BG_c::mtx_set() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5270 = 35.0f; -COMPILER_STRIP_GATE(8068A2FC, &lit_5270); +COMPILER_STRIP_GATE(0x8068A2FC, &lit_5270); #pragma pop /* 8068966C-806897EC 003F4C 0180+00 1/1 0/0 0/0 .text cc_set__8daE_BG_cFv */ @@ -1149,6 +1155,13 @@ static asm void daE_BG_Delete(daE_BG_c* param_0) { } #pragma pop +/* ############################################################################################## */ +/* 8068A308-8068A308 0000C4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8068A30D = "E_bg"; +#pragma pop + /* 80689A0C-80689BD0 0042EC 01C4+00 1/1 0/0 0/0 .text CreateHeap__8daE_BG_cFv */ #pragma push #pragma optimization_level 0 @@ -1184,14 +1197,14 @@ static asm void useHeapInit(fopAc_ac_c* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5533 = -50.0f; -COMPILER_STRIP_GATE(8068A300, &lit_5533); +COMPILER_STRIP_GATE(0x8068A300, &lit_5533); #pragma pop /* 8068A304-8068A308 0000C0 0004+00 0/1 0/0 0/0 .rodata @5534 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5534 = 3000.0f; -COMPILER_STRIP_GATE(8068A304, &lit_5534); +COMPILER_STRIP_GATE(0x8068A304, &lit_5534); #pragma pop /* 80689C38-8068A07C 004518 0444+00 1/1 0/0 0/0 .text create__8daE_BG_cFv */ @@ -1266,7 +1279,7 @@ asm void __sinit_d_a_e_bg_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_8068A1E4 = (void*)__sinit_d_a_e_bg_cpp; +REGISTER_CTORS(0x8068A1E4, __sinit_d_a_e_bg_cpp); #pragma pop /* 8068A220-8068A228 004B00 0008+00 1/0 0/0 0/0 .text @36@__dt__12dBgS_ObjAcchFv */ @@ -1289,10 +1302,4 @@ static asm void func_8068A228() { } #pragma pop -/* 8068A308-8068A312 0000C4 000A+00 4/4 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_8068A308 = "E_BG"; -SECTION_DEAD static char const* const stringBase_8068A30D = "E_bg"; -#pragma pop +/* 8068A308-8068A308 0000C4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/e/d_a_e_bi/d_a_e_bi.cpp b/rel/d/a/e/d_a_e_bi/d_a_e_bi.cpp index e7cfbe8b864..2db32572230 100644 --- a/rel/d/a/e/d_a_e_bi/d_a_e_bi.cpp +++ b/rel/d/a/e/d_a_e_bi/d_a_e_bi.cpp @@ -20,16 +20,16 @@ struct mDoMtx_stack_c { static u8 now[48]; }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; - struct J3DAnmTransform {}; +struct J3DModelData {}; + +struct Z2Creature {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -90,10 +90,10 @@ struct dRes_control_c { struct dPa_levelEcallBack {}; -struct _GXColor {}; - struct csXyz {}; +struct _GXColor {}; + struct dPa_control_c { struct level_c { /* 8004B918 */ void getEmitter(u32); @@ -440,7 +440,7 @@ extern "C" void __register_global_object(); /* ############################################################################################## */ /* 8068D7EC-8068D7F0 000000 0004+00 13/13 0/0 0/0 .rodata @3903 */ SECTION_RODATA static f32 const lit_3903 = 100.0f; -COMPILER_STRIP_GATE(8068D7EC, &lit_3903); +COMPILER_STRIP_GATE(0x8068D7EC, &lit_3903); /* 8068D7F0-8068D7F4 000004 0004+00 2/13 0/0 0/0 .rodata @3904 */ SECTION_RODATA static u8 const lit_3904[4] = { @@ -449,7 +449,7 @@ SECTION_RODATA static u8 const lit_3904[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(8068D7F0, &lit_3904); +COMPILER_STRIP_GATE(0x8068D7F0, &lit_3904); /* 8068D7F4-8068D7FC 000008 0004+04 1/10 0/0 0/0 .rodata @3905 */ SECTION_RODATA static f32 const lit_3905[1 + 1 /* padding */] = { @@ -457,7 +457,7 @@ SECTION_RODATA static f32 const lit_3905[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(8068D7F4, &lit_3905); +COMPILER_STRIP_GATE(0x8068D7F4, &lit_3905); /* 8068D7FC-8068D804 000010 0008+00 0/5 0/0 0/0 .rodata @3906 */ #pragma push @@ -465,7 +465,7 @@ COMPILER_STRIP_GATE(8068D7F4, &lit_3905); SECTION_RODATA static u8 const lit_3906[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8068D7FC, &lit_3906); +COMPILER_STRIP_GATE(0x8068D7FC, &lit_3906); #pragma pop /* 8068D804-8068D80C 000018 0008+00 0/5 0/0 0/0 .rodata @3907 */ @@ -474,7 +474,7 @@ COMPILER_STRIP_GATE(8068D7FC, &lit_3906); SECTION_RODATA static u8 const lit_3907[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8068D804, &lit_3907); +COMPILER_STRIP_GATE(0x8068D804, &lit_3907); #pragma pop /* 8068D80C-8068D814 000020 0008+00 0/5 0/0 0/0 .rodata @3908 */ @@ -483,35 +483,35 @@ COMPILER_STRIP_GATE(8068D804, &lit_3907); SECTION_RODATA static u8 const lit_3908[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8068D80C, &lit_3908); +COMPILER_STRIP_GATE(0x8068D80C, &lit_3908); #pragma pop /* 8068D814-8068D818 000028 0004+00 0/2 0/0 0/0 .rodata @3909 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3909 = 1.0f / 100.0f; -COMPILER_STRIP_GATE(8068D814, &lit_3909); +COMPILER_STRIP_GATE(0x8068D814, &lit_3909); #pragma pop /* 8068D818-8068D81C 00002C 0004+00 0/1 0/0 0/0 .rodata @3924 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3924 = 400.0f; -COMPILER_STRIP_GATE(8068D818, &lit_3924); +COMPILER_STRIP_GATE(0x8068D818, &lit_3924); #pragma pop /* 8068D81C-8068D820 000030 0004+00 0/1 0/0 0/0 .rodata @3925 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3925 = 600.0f; -COMPILER_STRIP_GATE(8068D81C, &lit_3925); +COMPILER_STRIP_GATE(0x8068D81C, &lit_3925); #pragma pop /* 8068D820-8068D824 000034 0004+00 0/3 0/0 0/0 .rodata @3926 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3926 = 10.0f; -COMPILER_STRIP_GATE(8068D820, &lit_3926); +COMPILER_STRIP_GATE(0x8068D820, &lit_3926); #pragma pop /* 8068D8EC-8068D8F8 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ @@ -728,7 +728,13 @@ asm daE_BI_HIO_c::daE_BI_HIO_c() { /* ############################################################################################## */ /* 8068D824-8068D828 000038 0004+00 1/1 0/0 0/0 .rodata @3940 */ SECTION_RODATA static f32 const lit_3940 = -1.0f; -COMPILER_STRIP_GATE(8068D824, &lit_3940); +COMPILER_STRIP_GATE(0x8068D824, &lit_3940); + +/* 8068D8D8-8068D8D8 0000EC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8068D8D8 = "E_BI"; +#pragma pop /* 8068A634-8068A6E0 000134 00AC+00 6/6 0/0 0/0 .text anm_init__FP10e_bi_classifUcf */ #pragma push @@ -745,7 +751,7 @@ static asm void anm_init(e_bi_class* param_0, int param_1, f32 param_2, u8 param #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4073 = 800.0f; -COMPILER_STRIP_GATE(8068D828, &lit_4073); +COMPILER_STRIP_GATE(0x8068D828, &lit_4073); #pragma pop /* 8068A6E0-8068A90C 0001E0 022C+00 1/0 0/0 0/0 .text daE_BI_Draw__FP10e_bi_class */ @@ -783,26 +789,26 @@ static asm void damage_check(e_bi_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4207 = 3.0f; -COMPILER_STRIP_GATE(8068D82C, &lit_4207); +COMPILER_STRIP_GATE(0x8068D82C, &lit_4207); #pragma pop /* 8068D830-8068D834 000044 0004+00 0/4 0/0 0/0 .rodata @4208 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4208 = 2.0f; -COMPILER_STRIP_GATE(8068D830, &lit_4208); +COMPILER_STRIP_GATE(0x8068D830, &lit_4208); #pragma pop /* 8068D834-8068D838 000048 0004+00 0/1 0/0 0/0 .rodata @4209 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4209 = 5.0f; -COMPILER_STRIP_GATE(8068D834, &lit_4209); +COMPILER_STRIP_GATE(0x8068D834, &lit_4209); #pragma pop /* 8068D838-8068D83C 00004C 0004+00 1/2 0/0 0/0 .rodata @4210 */ SECTION_RODATA static f32 const lit_4210 = 50.0f; -COMPILER_STRIP_GATE(8068D838, &lit_4210); +COMPILER_STRIP_GATE(0x8068D838, &lit_4210); /* 8068DAE0-8068DAE4 000008 0001+03 1/1 0/0 0/0 .bss @1109 */ static u8 lit_1109[1 + 3 /* padding */]; @@ -927,21 +933,21 @@ static asm void e_bi_up(e_bi_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4315 = 150.0f; -COMPILER_STRIP_GATE(8068D83C, &lit_4315); +COMPILER_STRIP_GATE(0x8068D83C, &lit_4315); #pragma pop /* 8068D840-8068D844 000054 0004+00 0/2 0/0 0/0 .rodata @4316 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4316 = 20.0f; -COMPILER_STRIP_GATE(8068D840, &lit_4316); +COMPILER_STRIP_GATE(0x8068D840, &lit_4316); #pragma pop /* 8068D844-8068D848 000058 0004+00 0/1 0/0 0/0 .rodata @4317 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4317 = 1.5f; -COMPILER_STRIP_GATE(8068D844, &lit_4317); +COMPILER_STRIP_GATE(0x8068D844, &lit_4317); #pragma pop /* 8068B068-8068B428 000B68 03C0+00 1/1 0/0 0/0 .text e_bi_move__FP10e_bi_class */ @@ -959,42 +965,42 @@ static asm void e_bi_move(e_bi_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4410 = 9.0f / 10.0f; -COMPILER_STRIP_GATE(8068D848, &lit_4410); +COMPILER_STRIP_GATE(0x8068D848, &lit_4410); #pragma pop /* 8068D84C-8068D850 000060 0004+00 0/2 0/0 0/0 .rodata @4411 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4411 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(8068D84C, &lit_4411); +COMPILER_STRIP_GATE(0x8068D84C, &lit_4411); #pragma pop /* 8068D850-8068D854 000064 0004+00 0/1 0/0 0/0 .rodata @4412 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4412 = 3800.0f; -COMPILER_STRIP_GATE(8068D850, &lit_4412); +COMPILER_STRIP_GATE(0x8068D850, &lit_4412); #pragma pop /* 8068D854-8068D858 000068 0004+00 0/1 0/0 0/0 .rodata @4413 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4413 = 23.0f; -COMPILER_STRIP_GATE(8068D854, &lit_4413); +COMPILER_STRIP_GATE(0x8068D854, &lit_4413); #pragma pop /* 8068D858-8068D85C 00006C 0004+00 0/1 0/0 0/0 .rodata @4414 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4414 = 128.0f; -COMPILER_STRIP_GATE(8068D858, &lit_4414); +COMPILER_STRIP_GATE(0x8068D858, &lit_4414); #pragma pop /* 8068D85C-8068D860 000070 0004+00 0/1 0/0 0/0 .rodata @4415 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4415 = 127.0f; -COMPILER_STRIP_GATE(8068D85C, &lit_4415); +COMPILER_STRIP_GATE(0x8068D85C, &lit_4415); #pragma pop /* 8068B428-8068B764 000F28 033C+00 1/1 0/0 0/0 .text e_bi_ex__FP10e_bi_class */ @@ -1012,28 +1018,28 @@ static asm void e_bi_ex(e_bi_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4454 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(8068D860, &lit_4454); +COMPILER_STRIP_GATE(0x8068D860, &lit_4454); #pragma pop /* 8068D864-8068D868 000078 0004+00 0/1 0/0 0/0 .rodata @4455 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4455 = -2.0f; -COMPILER_STRIP_GATE(8068D864, &lit_4455); +COMPILER_STRIP_GATE(0x8068D864, &lit_4455); #pragma pop /* 8068D868-8068D86C 00007C 0004+00 0/1 0/0 0/0 .rodata @4456 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4456 = 1.0f / 50.0f; -COMPILER_STRIP_GATE(8068D868, &lit_4456); +COMPILER_STRIP_GATE(0x8068D868, &lit_4456); #pragma pop /* 8068D86C-8068D870 000080 0004+00 0/1 0/0 0/0 .rodata @4457 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4457 = 70.0f; -COMPILER_STRIP_GATE(8068D86C, &lit_4457); +COMPILER_STRIP_GATE(0x8068D86C, &lit_4457); #pragma pop /* 8068B764-8068B938 001264 01D4+00 1/1 0/0 0/0 .text e_bi_water__FP10e_bi_class */ @@ -1051,7 +1057,7 @@ static asm void e_bi_water(e_bi_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4473 = 40.0f; -COMPILER_STRIP_GATE(8068D870, &lit_4473); +COMPILER_STRIP_GATE(0x8068D870, &lit_4473); #pragma pop /* 8068D874-8068D87C 000088 0008+00 0/1 0/0 0/0 .rodata @4476 */ @@ -1060,7 +1066,7 @@ COMPILER_STRIP_GATE(8068D870, &lit_4473); SECTION_RODATA static u8 const lit_4476[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8068D874, &lit_4476); +COMPILER_STRIP_GATE(0x8068D874, &lit_4476); #pragma pop /* 8068B938-8068BA28 001438 00F0+00 1/1 0/0 0/0 .text e_bi_disap__FP10e_bi_class */ @@ -1076,7 +1082,7 @@ static asm void e_bi_disap(e_bi_class* param_0) { /* ############################################################################################## */ /* 8068D87C-8068D880 000090 0004+00 1/1 0/0 0/0 .rodata @4485 */ SECTION_RODATA static f32 const lit_4485 = 300.0f; -COMPILER_STRIP_GATE(8068D87C, &lit_4485); +COMPILER_STRIP_GATE(0x8068D87C, &lit_4485); /* 8068BA28-8068BAE0 001528 00B8+00 1/1 0/0 0/0 .text water_check__FP10e_bi_class */ #pragma push @@ -1103,28 +1109,28 @@ static asm void action(e_bi_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4659 = 0.5f; -COMPILER_STRIP_GATE(8068D880, &lit_4659); +COMPILER_STRIP_GATE(0x8068D880, &lit_4659); #pragma pop /* 8068D884-8068D888 000098 0004+00 0/0 0/0 0/0 .rodata @4660 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4660 = 4.0f / 5.0f; -COMPILER_STRIP_GATE(8068D884, &lit_4660); +COMPILER_STRIP_GATE(0x8068D884, &lit_4660); #pragma pop /* 8068D888-8068D88C 00009C 0004+00 0/0 0/0 0/0 .rodata @4661 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4661 = 0.75f; -COMPILER_STRIP_GATE(8068D888, &lit_4661); +COMPILER_STRIP_GATE(0x8068D888, &lit_4661); #pragma pop /* 8068D88C-8068D890 0000A0 0004+00 0/1 0/0 0/0 .rodata @4704 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4704 = 500.0f; -COMPILER_STRIP_GATE(8068D88C, &lit_4704); +COMPILER_STRIP_GATE(0x8068D88C, &lit_4704); #pragma pop /* 8068C068-8068C1E8 001B68 0180+00 1/1 0/0 0/0 .text s_fw_sub__FPvPv */ @@ -1140,7 +1146,7 @@ static asm void s_fw_sub(void* param_0, void* param_1) { /* ############################################################################################## */ /* 8068D890-8068D894 0000A4 0004+00 1/2 0/0 0/0 .rodata @4738 */ SECTION_RODATA static f32 const lit_4738 = 200.0f; -COMPILER_STRIP_GATE(8068D890, &lit_4738); +COMPILER_STRIP_GATE(0x8068D890, &lit_4738); /* 8068C1E8-8068C350 001CE8 0168+00 1/1 0/0 0/0 .text ride_movebg_init__FP10e_bi_class */ #pragma push @@ -1167,105 +1173,105 @@ asm dBgS_ObjGndChk::~dBgS_ObjGndChk() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4906 = 27.0f; -COMPILER_STRIP_GATE(8068D894, &lit_4906); +COMPILER_STRIP_GATE(0x8068D894, &lit_4906); #pragma pop /* 8068D898-8068D89C 0000AC 0004+00 0/1 0/0 0/0 .rodata @4907 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4907 = -27.0f; -COMPILER_STRIP_GATE(8068D898, &lit_4907); +COMPILER_STRIP_GATE(0x8068D898, &lit_4907); #pragma pop /* 8068D89C-8068D8A0 0000B0 0004+00 0/1 0/0 0/0 .rodata @4908 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4908 = 7.5f; -COMPILER_STRIP_GATE(8068D89C, &lit_4908); +COMPILER_STRIP_GATE(0x8068D89C, &lit_4908); #pragma pop /* 8068D8A0-8068D8A4 0000B4 0004+00 0/1 0/0 0/0 .rodata @4909 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4909 = 26.0f; -COMPILER_STRIP_GATE(8068D8A0, &lit_4909); +COMPILER_STRIP_GATE(0x8068D8A0, &lit_4909); #pragma pop /* 8068D8A4-8068D8A8 0000B8 0004+00 0/1 0/0 0/0 .rodata @4910 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4910 = 7.0f; -COMPILER_STRIP_GATE(8068D8A4, &lit_4910); +COMPILER_STRIP_GATE(0x8068D8A4, &lit_4910); #pragma pop /* 8068D8A8-8068D8AC 0000BC 0004+00 0/1 0/0 0/0 .rodata @4911 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4911 = 18.0f; -COMPILER_STRIP_GATE(8068D8A8, &lit_4911); +COMPILER_STRIP_GATE(0x8068D8A8, &lit_4911); #pragma pop /* 8068D8AC-8068D8B0 0000C0 0004+00 0/1 0/0 0/0 .rodata @4912 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4912 = 8.0f; -COMPILER_STRIP_GATE(8068D8AC, &lit_4912); +COMPILER_STRIP_GATE(0x8068D8AC, &lit_4912); #pragma pop /* 8068D8B0-8068D8B4 0000C4 0004+00 0/1 0/0 0/0 .rodata @4913 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4913 = 15.0f; -COMPILER_STRIP_GATE(8068D8B0, &lit_4913); +COMPILER_STRIP_GATE(0x8068D8B0, &lit_4913); #pragma pop /* 8068D8B4-8068D8B8 0000C8 0004+00 0/1 0/0 0/0 .rodata @4914 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4914 = 45.0f; -COMPILER_STRIP_GATE(8068D8B4, &lit_4914); +COMPILER_STRIP_GATE(0x8068D8B4, &lit_4914); #pragma pop /* 8068D8B8-8068D8BC 0000CC 0004+00 0/1 0/0 0/0 .rodata @4915 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4915 = -20000.0f; -COMPILER_STRIP_GATE(8068D8B8, &lit_4915); +COMPILER_STRIP_GATE(0x8068D8B8, &lit_4915); #pragma pop /* 8068D8BC-8068D8C0 0000D0 0004+00 0/1 0/0 0/0 .rodata @4916 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4916 = 25.0f; -COMPILER_STRIP_GATE(8068D8BC, &lit_4916); +COMPILER_STRIP_GATE(0x8068D8BC, &lit_4916); #pragma pop /* 8068D8C0-8068D8C4 0000D4 0004+00 0/1 0/0 0/0 .rodata @4917 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4917 = 120.0f; -COMPILER_STRIP_GATE(8068D8C0, &lit_4917); +COMPILER_STRIP_GATE(0x8068D8C0, &lit_4917); #pragma pop /* 8068D8C4-8068D8C8 0000D8 0004+00 0/1 0/0 0/0 .rodata @4918 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4918 = 90.0f; -COMPILER_STRIP_GATE(8068D8C4, &lit_4918); +COMPILER_STRIP_GATE(0x8068D8C4, &lit_4918); #pragma pop /* 8068D8C8-8068D8CC 0000DC 0004+00 0/1 0/0 0/0 .rodata @4919 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4919 = 17000.0f; -COMPILER_STRIP_GATE(8068D8C8, &lit_4919); +COMPILER_STRIP_GATE(0x8068D8C8, &lit_4919); #pragma pop /* 8068D8CC-8068D8D0 0000E0 0004+00 0/2 0/0 0/0 .rodata @4920 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4920 = 30.0f; -COMPILER_STRIP_GATE(8068D8CC, &lit_4920); +COMPILER_STRIP_GATE(0x8068D8CC, &lit_4920); #pragma pop /* 8068C3C8-8068CA98 001EC8 06D0+00 2/1 0/0 0/0 .text daE_BI_Execute__FP10e_bi_class */ @@ -1308,14 +1314,21 @@ static asm void useHeapInit(fopAc_ac_c* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5096 = -200.0f; -COMPILER_STRIP_GATE(8068D8D0, &lit_5096); +COMPILER_STRIP_GATE(0x8068D8D0, &lit_5096); #pragma pop /* 8068D8D4-8068D8D8 0000E8 0004+00 0/1 0/0 0/0 .rodata @5097 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5097 = 65535.0f; -COMPILER_STRIP_GATE(8068D8D4, &lit_5097); +COMPILER_STRIP_GATE(0x8068D8D4, &lit_5097); +#pragma pop + +/* 8068D8D8-8068D8D8 0000EC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8068D8DD = "D_MN05A"; +SECTION_DEAD static char const* const stringBase_8068D8E5 = "E_bi"; #pragma pop /* 8068CC00-8068D080 002700 0480+00 1/0 0/0 0/0 .text daE_BI_Create__FP10fopAc_ac_c */ @@ -1420,7 +1433,7 @@ asm void __sinit_d_a_e_bi_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_8068D324 = (void*)__sinit_d_a_e_bi_cpp; +REGISTER_CTORS(0x8068D324, __sinit_d_a_e_bi_cpp); #pragma pop /* 8068D360-8068D368 002E60 0008+00 1/0 0/0 0/0 .text @20@__dt__14dBgS_ObjGndChkFv */ @@ -1679,11 +1692,4 @@ static u8 data_8068DBC0[4]; static u8 data_8068DBC4[4]; #pragma pop -/* 8068D8D8-8068D8EA 0000EC 0012+00 4/4 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_8068D8D8 = "E_BI"; -SECTION_DEAD static char const* const stringBase_8068D8DD = "D_MN05A"; -SECTION_DEAD static char const* const stringBase_8068D8E5 = "E_bi"; -#pragma pop +/* 8068D8D8-8068D8D8 0000EC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/e/d_a_e_bi_leaf/d_a_e_bi_leaf.cpp b/rel/d/a/e/d_a_e_bi_leaf/d_a_e_bi_leaf.cpp index 28d85703f5b..e95631ae8ca 100644 --- a/rel/d/a/e/d_a_e_bi_leaf/d_a_e_bi_leaf.cpp +++ b/rel/d/a/e/d_a_e_bi_leaf/d_a_e_bi_leaf.cpp @@ -122,6 +122,15 @@ static bool daE_BI_LEAF_IsDelete(e_bi_leaf_class* param_0) { return true; } +/* ############################################################################################## */ +/* 8068DFE0-8068DFE0 000000 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8068DFE0 = "E_BI"; +/* @stringBase0 padding */ +SECTION_DEAD static char const* const pad_8068DFE5 = "\0\0"; +#pragma pop + /* 8068DE70-8068DEA0 000290 0030+00 1/0 0/0 0/0 .text daE_BI_LEAF_Delete__FP15e_bi_leaf_class */ #pragma push #pragma optimization_level 0 @@ -176,11 +185,4 @@ SECTION_DATA extern void* g_profile_E_BI_LEAF[12] = { (void*)0x00040000, (void*)NULL, }; -/* 8068DFE0-8068DFE8 000000 0005+03 3/3 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_8068DFE0 = "E_BI"; -/* @stringBase0 padding */ -SECTION_DEAD static char const* const pad_8068DFE5 = "\0\0"; -#pragma pop +/* 8068DFE0-8068DFE0 000000 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/e/d_a_e_bs/d_a_e_bs.cpp b/rel/d/a/e/d_a_e_bs/d_a_e_bs.cpp index 5d1b8977968..7b9e149524d 100644 --- a/rel/d/a/e/d_a_e_bs/d_a_e_bs.cpp +++ b/rel/d/a/e/d_a_e_bs/d_a_e_bs.cpp @@ -19,16 +19,16 @@ struct mDoMtx_stack_c { static u8 now[48]; }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; - struct J3DAnmTransform {}; +struct J3DModelData {}; + +struct Z2Creature {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -95,10 +95,10 @@ struct dRes_control_c { struct dPa_levelEcallBack {}; -struct _GXColor {}; - struct csXyz {}; +struct _GXColor {}; + struct dPa_control_c { /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, @@ -411,7 +411,7 @@ extern "C" void __register_global_object(); /* ############################################################################################## */ /* 80690DD8-80690DDC 000000 0004+00 13/13 0/0 0/0 .rodata @3788 */ SECTION_RODATA static f32 const lit_3788 = 100.0f; -COMPILER_STRIP_GATE(80690DD8, &lit_3788); +COMPILER_STRIP_GATE(0x80690DD8, &lit_3788); /* 80690DDC-80690DE0 000004 0004+00 3/13 0/0 0/0 .rodata @3789 */ SECTION_RODATA static u8 const lit_3789[4] = { @@ -420,7 +420,7 @@ SECTION_RODATA static u8 const lit_3789[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80690DDC, &lit_3789); +COMPILER_STRIP_GATE(0x80690DDC, &lit_3789); /* 80690DE0-80690DE8 000008 0004+04 2/13 0/0 0/0 .rodata @3790 */ SECTION_RODATA static f32 const lit_3790[1 + 1 /* padding */] = { @@ -428,7 +428,7 @@ SECTION_RODATA static f32 const lit_3790[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80690DE0, &lit_3790); +COMPILER_STRIP_GATE(0x80690DE0, &lit_3790); /* 80690DE8-80690DF0 000010 0008+00 0/1 0/0 0/0 .rodata @3791 */ #pragma push @@ -436,7 +436,7 @@ COMPILER_STRIP_GATE(80690DE0, &lit_3790); SECTION_RODATA static u8 const lit_3791[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80690DE8, &lit_3791); +COMPILER_STRIP_GATE(0x80690DE8, &lit_3791); #pragma pop /* 80690DF0-80690DF8 000018 0008+00 0/1 0/0 0/0 .rodata @3792 */ @@ -445,7 +445,7 @@ COMPILER_STRIP_GATE(80690DE8, &lit_3791); SECTION_RODATA static u8 const lit_3792[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80690DF0, &lit_3792); +COMPILER_STRIP_GATE(0x80690DF0, &lit_3792); #pragma pop /* 80690DF8-80690E00 000020 0008+00 0/1 0/0 0/0 .rodata @3793 */ @@ -454,42 +454,42 @@ COMPILER_STRIP_GATE(80690DF0, &lit_3792); SECTION_RODATA static u8 const lit_3793[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80690DF8, &lit_3793); +COMPILER_STRIP_GATE(0x80690DF8, &lit_3793); #pragma pop /* 80690E00-80690E04 000028 0004+00 0/1 0/0 0/0 .rodata @3794 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3794 = 1.0f / 100.0f; -COMPILER_STRIP_GATE(80690E00, &lit_3794); +COMPILER_STRIP_GATE(0x80690E00, &lit_3794); #pragma pop /* 80690E04-80690E08 00002C 0004+00 0/3 0/0 0/0 .rodata @3809 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3809 = 3.0f; -COMPILER_STRIP_GATE(80690E04, &lit_3809); +COMPILER_STRIP_GATE(0x80690E04, &lit_3809); #pragma pop /* 80690E08-80690E0C 000030 0004+00 0/1 0/0 0/0 .rodata @3810 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3810 = 3000.0f; -COMPILER_STRIP_GATE(80690E08, &lit_3810); +COMPILER_STRIP_GATE(0x80690E08, &lit_3810); #pragma pop /* 80690E0C-80690E10 000034 0004+00 0/1 0/0 0/0 .rodata @3811 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3811 = 6.0f; -COMPILER_STRIP_GATE(80690E0C, &lit_3811); +COMPILER_STRIP_GATE(0x80690E0C, &lit_3811); #pragma pop /* 80690E10-80690E14 000038 0004+00 0/2 0/0 0/0 .rodata @3812 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3812 = 200.0f; -COMPILER_STRIP_GATE(80690E10, &lit_3812); +COMPILER_STRIP_GATE(0x80690E10, &lit_3812); #pragma pop /* 80690EC4-80690ED0 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ @@ -691,12 +691,18 @@ asm daE_BS_HIO_c::daE_BS_HIO_c() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3826 = 5.0f; -COMPILER_STRIP_GATE(80690E14, &lit_3826); +COMPILER_STRIP_GATE(0x80690E14, &lit_3826); #pragma pop /* 80690E18-80690E1C 000040 0004+00 1/2 0/0 0/0 .rodata @3827 */ SECTION_RODATA static f32 const lit_3827 = -1.0f; -COMPILER_STRIP_GATE(80690E18, &lit_3827); +COMPILER_STRIP_GATE(0x80690E18, &lit_3827); + +/* 80690EB8-80690EB8 0000E0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80690EB8 = "E_BS"; +#pragma pop /* 8068E178-8068E1F4 000138 007C+00 1/1 0/0 0/0 .text wepon_anm_init__FP10e_bs_classi */ #pragma push @@ -733,14 +739,14 @@ static asm void nodeCallBack(J3DJoint* param_0, int param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3896 = 50.0f; -COMPILER_STRIP_GATE(80690E1C, &lit_3896); +COMPILER_STRIP_GATE(0x80690E1C, &lit_3896); #pragma pop /* 80690E20-80690E24 000048 0004+00 0/2 0/0 0/0 .rodata @3897 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3897 = 600.0f; -COMPILER_STRIP_GATE(80690E20, &lit_3897); +COMPILER_STRIP_GATE(0x80690E20, &lit_3897); #pragma pop /* 8068E3D4-8068E4F0 000394 011C+00 1/0 0/0 0/0 .text daE_BS_Draw__FP10e_bs_class */ @@ -788,7 +794,7 @@ static asm void pl_check(e_bs_class* param_0, f32 param_1, s16 param_2) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3996 = 20.0f; -COMPILER_STRIP_GATE(80690E24, &lit_3996); +COMPILER_STRIP_GATE(0x80690E24, &lit_3996); #pragma pop /* 8068E708-8068E8C4 0006C8 01BC+00 1/1 0/0 0/0 .text e_bs_appear__FP10e_bs_class */ @@ -806,28 +812,28 @@ static asm void e_bs_appear(e_bs_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4040 = 32768.0f; -COMPILER_STRIP_GATE(80690E28, &lit_4040); +COMPILER_STRIP_GATE(0x80690E28, &lit_4040); #pragma pop /* 80690E2C-80690E30 000054 0004+00 0/1 0/0 0/0 .rodata @4041 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4041 = 10000.0f; -COMPILER_STRIP_GATE(80690E2C, &lit_4041); +COMPILER_STRIP_GATE(0x80690E2C, &lit_4041); #pragma pop /* 80690E30-80690E34 000058 0004+00 0/3 0/0 0/0 .rodata @4042 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4042 = 10.0f; -COMPILER_STRIP_GATE(80690E30, &lit_4042); +COMPILER_STRIP_GATE(0x80690E30, &lit_4042); #pragma pop /* 80690E34-80690E38 00005C 0004+00 0/1 0/0 0/0 .rodata @4043 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4043 = 2000.0f; -COMPILER_STRIP_GATE(80690E34, &lit_4043); +COMPILER_STRIP_GATE(0x80690E34, &lit_4043); #pragma pop /* 80691090-80691094 000008 0004+00 2/2 0/0 0/0 .bss None */ @@ -854,7 +860,7 @@ static asm void e_bs_normal(e_bs_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4123 = 15.0f; -COMPILER_STRIP_GATE(80690E38, &lit_4123); +COMPILER_STRIP_GATE(0x80690E38, &lit_4123); #pragma pop /* 8068EB50-8068EF2C 000B10 03DC+00 2/1 0/0 0/0 .text e_bs_fight_run__FP10e_bs_class */ @@ -902,28 +908,28 @@ static asm void e_bs_damage(e_bs_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4124 = 2.0f; -COMPILER_STRIP_GATE(80690E3C, &lit_4124); +COMPILER_STRIP_GATE(0x80690E3C, &lit_4124); #pragma pop /* 80690E40-80690E44 000068 0004+00 0/1 0/0 0/0 .rodata @4125 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4125 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(80690E40, &lit_4125); +COMPILER_STRIP_GATE(0x80690E40, &lit_4125); #pragma pop /* 80690E44-80690E48 00006C 0004+00 0/0 0/0 0/0 .rodata @4126 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4126 = 1.5f; -COMPILER_STRIP_GATE(80690E44, &lit_4126); +COMPILER_STRIP_GATE(0x80690E44, &lit_4126); #pragma pop /* 80690E48-80690E4C 000070 0004+00 0/1 0/0 0/0 .rodata @4127 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4127 = 30.0f; -COMPILER_STRIP_GATE(80690E48, &lit_4127); +COMPILER_STRIP_GATE(0x80690E48, &lit_4127); #pragma pop /* 8068F208-8068F4C4 0011C8 02BC+00 1/1 0/0 0/0 .text damage_check__FP10e_bs_class */ @@ -941,77 +947,77 @@ static asm void damage_check(e_bs_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4128 = 7.0f / 20.0f; -COMPILER_STRIP_GATE(80690E4C, &lit_4128); +COMPILER_STRIP_GATE(0x80690E4C, &lit_4128); #pragma pop /* 80690E50-80690E54 000078 0004+00 0/0 0/0 0/0 .rodata @4129 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4129 = -1.5f; -COMPILER_STRIP_GATE(80690E50, &lit_4129); +COMPILER_STRIP_GATE(0x80690E50, &lit_4129); #pragma pop /* 80690E54-80690E58 00007C 0004+00 0/2 0/0 0/0 .rodata @4130 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4130 = 0.5f; -COMPILER_STRIP_GATE(80690E54, &lit_4130); +COMPILER_STRIP_GATE(0x80690E54, &lit_4130); #pragma pop /* 80690E58-80690E5C 000080 0004+00 0/1 0/0 0/0 .rodata @4431 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4431 = -5.0f; -COMPILER_STRIP_GATE(80690E58, &lit_4431); +COMPILER_STRIP_GATE(0x80690E58, &lit_4431); #pragma pop /* 80690E5C-80690E60 000084 0004+00 0/1 0/0 0/0 .rodata @4432 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4432 = -60.0f; -COMPILER_STRIP_GATE(80690E5C, &lit_4432); +COMPILER_STRIP_GATE(0x80690E5C, &lit_4432); #pragma pop /* 80690E60-80690E64 000088 0004+00 0/1 0/0 0/0 .rodata @4433 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4433 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(80690E60, &lit_4433); +COMPILER_STRIP_GATE(0x80690E60, &lit_4433); #pragma pop /* 80690E64-80690E68 00008C 0004+00 0/2 0/0 0/0 .rodata @4434 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4434 = 7.0f; -COMPILER_STRIP_GATE(80690E64, &lit_4434); +COMPILER_STRIP_GATE(0x80690E64, &lit_4434); #pragma pop /* 80690E68-80690E6C 000090 0004+00 0/1 0/0 0/0 .rodata @4435 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4435 = 3.0f / 10.0f; -COMPILER_STRIP_GATE(80690E68, &lit_4435); +COMPILER_STRIP_GATE(0x80690E68, &lit_4435); #pragma pop /* 80690E6C-80690E70 000094 0004+00 0/1 0/0 0/0 .rodata @4436 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4436 = 2500.0f; -COMPILER_STRIP_GATE(80690E6C, &lit_4436); +COMPILER_STRIP_GATE(0x80690E6C, &lit_4436); #pragma pop /* 80690E70-80690E74 000098 0004+00 0/1 0/0 0/0 .rodata @4437 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4437 = -150.0f; -COMPILER_STRIP_GATE(80690E70, &lit_4437); +COMPILER_STRIP_GATE(0x80690E70, &lit_4437); #pragma pop /* 80690E74-80690E78 00009C 0004+00 0/1 0/0 0/0 .rodata @4438 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4438 = 4000.0f; -COMPILER_STRIP_GATE(80690E74, &lit_4438); +COMPILER_STRIP_GATE(0x80690E74, &lit_4438); #pragma pop /* 8068F4C4-8068FA04 001484 0540+00 1/1 0/0 0/0 .text action__FP10e_bs_class */ @@ -1029,49 +1035,49 @@ static asm void action(e_bs_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4491 = 38.0f; -COMPILER_STRIP_GATE(80690E78, &lit_4491); +COMPILER_STRIP_GATE(0x80690E78, &lit_4491); #pragma pop /* 80690E7C-80690E80 0000A4 0004+00 0/1 0/0 0/0 .rodata @4492 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4492 = 54.0f; -COMPILER_STRIP_GATE(80690E7C, &lit_4492); +COMPILER_STRIP_GATE(0x80690E7C, &lit_4492); #pragma pop /* 80690E80-80690E84 0000A8 0004+00 0/1 0/0 0/0 .rodata @4493 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4493 = 9.0f; -COMPILER_STRIP_GATE(80690E80, &lit_4493); +COMPILER_STRIP_GATE(0x80690E80, &lit_4493); #pragma pop /* 80690E84-80690E88 0000AC 0004+00 0/1 0/0 0/0 .rodata @4494 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4494 = 14.0f; -COMPILER_STRIP_GATE(80690E84, &lit_4494); +COMPILER_STRIP_GATE(0x80690E84, &lit_4494); #pragma pop /* 80690E88-80690E8C 0000B0 0004+00 0/1 0/0 0/0 .rodata @4495 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4495 = 29.0f; -COMPILER_STRIP_GATE(80690E88, &lit_4495); +COMPILER_STRIP_GATE(0x80690E88, &lit_4495); #pragma pop /* 80690E8C-80690E90 0000B4 0004+00 0/1 0/0 0/0 .rodata @4496 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4496 = 16.0f; -COMPILER_STRIP_GATE(80690E8C, &lit_4496); +COMPILER_STRIP_GATE(0x80690E8C, &lit_4496); #pragma pop /* 80690E90-80690E94 0000B8 0004+00 0/1 0/0 0/0 .rodata @4497 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4497 = 19.0f; -COMPILER_STRIP_GATE(80690E90, &lit_4497); +COMPILER_STRIP_GATE(0x80690E90, &lit_4497); #pragma pop /* 8068FA04-8068FBDC 0019C4 01D8+00 1/1 0/0 0/0 .text anm_se_set__FP10e_bs_class */ @@ -1089,28 +1095,28 @@ static asm void anm_se_set(e_bs_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4599 = -200000.0f; -COMPILER_STRIP_GATE(80690E94, &lit_4599); +COMPILER_STRIP_GATE(0x80690E94, &lit_4599); #pragma pop /* 80690E98-80690E9C 0000C0 0004+00 0/1 0/0 0/0 .rodata @4600 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4600 = -150000.0f; -COMPILER_STRIP_GATE(80690E98, &lit_4600); +COMPILER_STRIP_GATE(0x80690E98, &lit_4600); #pragma pop /* 80690E9C-80690EA0 0000C4 0004+00 0/1 0/0 0/0 .rodata @4601 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4601 = 35.0f; -COMPILER_STRIP_GATE(80690E9C, &lit_4601); +COMPILER_STRIP_GATE(0x80690E9C, &lit_4601); #pragma pop /* 80690EA0-80690EA4 0000C8 0004+00 0/1 0/0 0/0 .rodata @4602 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4602 = 120.0f; -COMPILER_STRIP_GATE(80690EA0, &lit_4602); +COMPILER_STRIP_GATE(0x80690EA0, &lit_4602); #pragma pop /* 8068FBDC-8068FFA8 001B9C 03CC+00 2/1 0/0 0/0 .text daE_BS_Execute__FP10e_bs_class */ @@ -1153,21 +1159,21 @@ static asm void useHeapInit(fopAc_ac_c* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4791 = 500.0f; -COMPILER_STRIP_GATE(80690EA4, &lit_4791); +COMPILER_STRIP_GATE(0x80690EA4, &lit_4791); #pragma pop /* 80690EA8-80690EAC 0000D0 0004+00 0/1 0/0 0/0 .rodata @4792 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4792 = 80.0f; -COMPILER_STRIP_GATE(80690EA8, &lit_4792); +COMPILER_STRIP_GATE(0x80690EA8, &lit_4792); #pragma pop /* 80690EAC-80690EB0 0000D4 0004+00 0/1 0/0 0/0 .rodata @4793 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4793 = 65535.0f; -COMPILER_STRIP_GATE(80690EAC, &lit_4793); +COMPILER_STRIP_GATE(0x80690EAC, &lit_4793); #pragma pop /* 80690EB0-80690EB8 0000D8 0008+00 0/1 0/0 0/0 .rodata @4795 */ @@ -1176,7 +1182,13 @@ COMPILER_STRIP_GATE(80690EAC, &lit_4793); SECTION_RODATA static u8 const lit_4795[8] = { 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80690EB0, &lit_4795); +COMPILER_STRIP_GATE(0x80690EB0, &lit_4795); +#pragma pop + +/* 80690EB8-80690EB8 0000E0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80690EBD = "E_bs"; #pragma pop /* 80690224-806905B8 0021E4 0394+00 1/0 0/0 0/0 .text daE_BS_Create__FP10fopAc_ac_c */ @@ -1291,7 +1303,7 @@ asm void __sinit_d_a_e_bs_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80690964 = (void*)__sinit_d_a_e_bs_cpp; +REGISTER_CTORS(0x80690964, __sinit_d_a_e_bs_cpp); #pragma pop /* 806909A0-806909A8 002960 0008+00 1/0 0/0 0/0 .text @36@__dt__12dBgS_ObjAcchFv */ @@ -1326,10 +1338,4 @@ static asm void setMidnaBindEffect(fopEn_enemy_c* param_0, Z2CreatureEnemy* para } #pragma pop -/* 80690EB8-80690EC2 0000E0 000A+00 5/5 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80690EB8 = "E_BS"; -SECTION_DEAD static char const* const stringBase_80690EBD = "E_bs"; -#pragma pop +/* 80690EB8-80690EB8 0000E0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/e/d_a_e_bu/d_a_e_bu.cpp b/rel/d/a/e/d_a_e_bu/d_a_e_bu.cpp index c2376d6860d..ae50dac60b3 100644 --- a/rel/d/a/e/d_a_e_bu/d_a_e_bu.cpp +++ b/rel/d/a/e/d_a_e_bu/d_a_e_bu.cpp @@ -19,16 +19,16 @@ struct mDoMtx_stack_c { static u8 now[48]; }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; - struct J3DAnmTransform {}; +struct J3DModelData {}; + +struct Z2Creature {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -83,10 +83,10 @@ struct dRes_control_c { struct dPa_levelEcallBack {}; -struct _GXColor {}; - struct csXyz {}; +struct _GXColor {}; + struct dPa_control_c { struct level_c { /* 8004B918 */ void getEmitter(u32); @@ -389,7 +389,7 @@ extern "C" void __register_global_object(); /* ############################################################################################## */ /* 80694690-80694694 000000 0004+00 17/17 0/0 0/0 .rodata @3788 */ SECTION_RODATA static f32 const lit_3788 = 100.0f; -COMPILER_STRIP_GATE(80694690, &lit_3788); +COMPILER_STRIP_GATE(0x80694690, &lit_3788); /* 80694694-80694698 000004 0004+00 1/13 0/0 0/0 .rodata @3789 */ SECTION_RODATA static u8 const lit_3789[4] = { @@ -398,7 +398,7 @@ SECTION_RODATA static u8 const lit_3789[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80694694, &lit_3789); +COMPILER_STRIP_GATE(0x80694694, &lit_3789); /* 80694698-806946A0 000008 0004+04 2/13 0/0 0/0 .rodata @3790 */ SECTION_RODATA static f32 const lit_3790[1 + 1 /* padding */] = { @@ -406,7 +406,7 @@ SECTION_RODATA static f32 const lit_3790[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80694698, &lit_3790); +COMPILER_STRIP_GATE(0x80694698, &lit_3790); /* 806946A0-806946A8 000010 0008+00 0/2 0/0 0/0 .rodata @3791 */ #pragma push @@ -414,7 +414,7 @@ COMPILER_STRIP_GATE(80694698, &lit_3790); SECTION_RODATA static u8 const lit_3791[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(806946A0, &lit_3791); +COMPILER_STRIP_GATE(0x806946A0, &lit_3791); #pragma pop /* 806946A8-806946B0 000018 0008+00 0/2 0/0 0/0 .rodata @3792 */ @@ -423,7 +423,7 @@ COMPILER_STRIP_GATE(806946A0, &lit_3791); SECTION_RODATA static u8 const lit_3792[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(806946A8, &lit_3792); +COMPILER_STRIP_GATE(0x806946A8, &lit_3792); #pragma pop /* 806946B0-806946B8 000020 0008+00 0/2 0/0 0/0 .rodata @3793 */ @@ -432,42 +432,42 @@ COMPILER_STRIP_GATE(806946A8, &lit_3792); SECTION_RODATA static u8 const lit_3793[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(806946B0, &lit_3793); +COMPILER_STRIP_GATE(0x806946B0, &lit_3793); #pragma pop /* 806946B8-806946BC 000028 0004+00 0/1 0/0 0/0 .rodata @3794 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3794 = 1.0f / 100.0f; -COMPILER_STRIP_GATE(806946B8, &lit_3794); +COMPILER_STRIP_GATE(0x806946B8, &lit_3794); #pragma pop /* 806946BC-806946C0 00002C 0004+00 0/2 0/0 0/0 .rodata @3809 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3809 = 1.5f; -COMPILER_STRIP_GATE(806946BC, &lit_3809); +COMPILER_STRIP_GATE(0x806946BC, &lit_3809); #pragma pop /* 806946C0-806946C4 000030 0004+00 0/1 0/0 0/0 .rodata @3810 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3810 = 15.0f; -COMPILER_STRIP_GATE(806946C0, &lit_3810); +COMPILER_STRIP_GATE(0x806946C0, &lit_3810); #pragma pop /* 806946C4-806946C8 000034 0004+00 0/1 0/0 0/0 .rodata @3811 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3811 = 250.0f; -COMPILER_STRIP_GATE(806946C4, &lit_3811); +COMPILER_STRIP_GATE(0x806946C4, &lit_3811); #pragma pop /* 806946C8-806946CC 000038 0004+00 0/2 0/0 0/0 .rodata @3812 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3812 = 40.0f; -COMPILER_STRIP_GATE(806946C8, &lit_3812); +COMPILER_STRIP_GATE(0x806946C8, &lit_3812); #pragma pop /* 8069477C-80694788 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ @@ -689,7 +689,13 @@ static asm void bu_disappear(fopAc_ac_c* param_0) { /* ############################################################################################## */ /* 806946CC-806946D0 00003C 0004+00 1/1 0/0 0/0 .rodata @3836 */ SECTION_RODATA static f32 const lit_3836 = -1.0f; -COMPILER_STRIP_GATE(806946CC, &lit_3836); +COMPILER_STRIP_GATE(0x806946CC, &lit_3836); + +/* 80694770-80694770 0000E0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80694770 = "E_BU"; +#pragma pop /* 80691250-806912FC 000190 00AC+00 6/6 0/0 0/0 .text anm_init__FP10e_bu_classifUcf */ #pragma push @@ -714,7 +720,7 @@ static asm void nodeCallBack(J3DJoint* param_0, int param_1) { /* ############################################################################################## */ /* 806946D0-806946D4 000040 0004+00 1/5 0/0 0/0 .rodata @3889 */ SECTION_RODATA static f32 const lit_3889 = 30.0f; -COMPILER_STRIP_GATE(806946D0, &lit_3889); +COMPILER_STRIP_GATE(0x806946D0, &lit_3889); /* 80694958-8069495C 000008 0004+00 2/2 0/0 0/0 .bss None */ static u8 data_80694958[4]; @@ -761,14 +767,14 @@ static asm void pl_check(e_bu_class* param_0, f32 param_1, s16 param_2) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3968 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(806946D4, &lit_3968); +COMPILER_STRIP_GATE(0x806946D4, &lit_3968); #pragma pop /* 806946D8-806946DC 000048 0004+00 0/1 0/0 0/0 .rodata @3969 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3969 = 80.0f; -COMPILER_STRIP_GATE(806946D8, &lit_3969); +COMPILER_STRIP_GATE(0x806946D8, &lit_3969); #pragma pop /* 80691660-8069182C 0005A0 01CC+00 1/1 0/0 0/0 .text damage_check__FP10e_bu_class */ @@ -786,7 +792,7 @@ static asm void damage_check(e_bu_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4001 = 50.0f; -COMPILER_STRIP_GATE(806946DC, &lit_4001); +COMPILER_STRIP_GATE(0x806946DC, &lit_4001); #pragma pop /* 80694984-80694A83 000034 00FF+00 1/1 0/0 0/0 .bss check_index$4007 */ @@ -807,14 +813,14 @@ static asm void path_check(e_bu_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4087 = 2000.0f; -COMPILER_STRIP_GATE(806946E0, &lit_4087); +COMPILER_STRIP_GATE(0x806946E0, &lit_4087); #pragma pop /* 806946E4-806946E8 000054 0004+00 0/1 0/0 0/0 .rodata @4088 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4088 = 1.0f / 25.0f; -COMPILER_STRIP_GATE(806946E4, &lit_4088); +COMPILER_STRIP_GATE(0x806946E4, &lit_4088); #pragma pop /* 80691A94-80691C24 0009D4 0190+00 4/4 0/0 0/0 .text fly_move__FP10e_bu_class */ @@ -832,28 +838,28 @@ static asm void fly_move(e_bu_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4118 = 1.0f / 20.0f; -COMPILER_STRIP_GATE(806946E8, &lit_4118); +COMPILER_STRIP_GATE(0x806946E8, &lit_4118); #pragma pop /* 806946EC-806946F0 00005C 0004+00 0/3 0/0 0/0 .rodata @4119 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4119 = 20.0f; -COMPILER_STRIP_GATE(806946EC, &lit_4119); +COMPILER_STRIP_GATE(0x806946EC, &lit_4119); #pragma pop /* 806946F0-806946F4 000060 0004+00 0/5 0/0 0/0 .rodata @4120 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4120 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(806946F0, &lit_4120); +COMPILER_STRIP_GATE(0x806946F0, &lit_4120); #pragma pop /* 806946F4-806946F8 000064 0004+00 0/1 0/0 0/0 .rodata @4121 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4121 = 35.0f; -COMPILER_STRIP_GATE(806946F4, &lit_4121); +COMPILER_STRIP_GATE(0x806946F4, &lit_4121); #pragma pop /* 80691C24-80691DC4 000B64 01A0+00 1/1 0/0 0/0 .text e_bu_wait__FP10e_bu_class */ @@ -871,7 +877,7 @@ static asm void e_bu_wait(e_bu_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4142 = 10.0f; -COMPILER_STRIP_GATE(806946F8, &lit_4142); +COMPILER_STRIP_GATE(0x806946F8, &lit_4142); #pragma pop /* 80691DC4-80691F10 000D04 014C+00 1/1 0/0 0/0 .text e_bu_fight_fly__FP10e_bu_class */ @@ -889,14 +895,14 @@ static asm void e_bu_fight_fly(e_bu_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4205 = 12288.0f; -COMPILER_STRIP_GATE(806946FC, &lit_4205); +COMPILER_STRIP_GATE(0x806946FC, &lit_4205); #pragma pop /* 80694700-80694704 000070 0004+00 0/2 0/0 0/0 .rodata @4206 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4206 = 150.0f; -COMPILER_STRIP_GATE(80694700, &lit_4206); +COMPILER_STRIP_GATE(0x80694700, &lit_4206); #pragma pop /* 80691F10-8069222C 000E50 031C+00 1/1 0/0 0/0 .text e_bu_fight__FP10e_bu_class */ @@ -914,28 +920,28 @@ static asm void e_bu_fight(e_bu_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4258 = 2.0f; -COMPILER_STRIP_GATE(80694704, &lit_4258); +COMPILER_STRIP_GATE(0x80694704, &lit_4258); #pragma pop /* 80694708-8069470C 000078 0004+00 0/1 0/0 0/0 .rodata @4259 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4259 = 120.0f; -COMPILER_STRIP_GATE(80694708, &lit_4259); +COMPILER_STRIP_GATE(0x80694708, &lit_4259); #pragma pop /* 8069470C-80694710 00007C 0004+00 0/1 0/0 0/0 .rodata @4260 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4260 = 3000.0f; -COMPILER_STRIP_GATE(8069470C, &lit_4260); +COMPILER_STRIP_GATE(0x8069470C, &lit_4260); #pragma pop /* 80694710-80694714 000080 0004+00 0/1 0/0 0/0 .rodata @4261 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4261 = 70.0f; -COMPILER_STRIP_GATE(80694710, &lit_4261); +COMPILER_STRIP_GATE(0x80694710, &lit_4261); #pragma pop /* 8069222C-8069243C 00116C 0210+00 1/1 0/0 0/0 .text e_bu_attack__FP10e_bu_class */ @@ -953,21 +959,21 @@ static asm void e_bu_attack(e_bu_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4299 = 500.0f; -COMPILER_STRIP_GATE(80694714, &lit_4299); +COMPILER_STRIP_GATE(0x80694714, &lit_4299); #pragma pop /* 80694718-8069471C 000088 0004+00 0/3 0/0 0/0 .rodata @4300 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4300 = 200.0f; -COMPILER_STRIP_GATE(80694718, &lit_4300); +COMPILER_STRIP_GATE(0x80694718, &lit_4300); #pragma pop /* 8069471C-80694720 00008C 0004+00 0/2 0/0 0/0 .rodata @4301 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4301 = 3.0f / 10.0f; -COMPILER_STRIP_GATE(8069471C, &lit_4301); +COMPILER_STRIP_GATE(0x8069471C, &lit_4301); #pragma pop /* 8069243C-8069262C 00137C 01F0+00 1/1 0/0 0/0 .text e_bu_fly__FP10e_bu_class */ @@ -985,7 +991,7 @@ static asm void e_bu_fly(e_bu_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4362 = 3.0f; -COMPILER_STRIP_GATE(80694720, &lit_4362); +COMPILER_STRIP_GATE(0x80694720, &lit_4362); #pragma pop /* 8069262C-80692930 00156C 0304+00 1/1 0/0 0/0 .text e_bu_path_fly__FP10e_bu_class */ @@ -1003,21 +1009,21 @@ static asm void e_bu_path_fly(e_bu_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4381 = 0.5f; -COMPILER_STRIP_GATE(80694724, &lit_4381); +COMPILER_STRIP_GATE(0x80694724, &lit_4381); #pragma pop /* 80694728-8069472C 000098 0004+00 0/1 0/0 0/0 .rodata @4382 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4382 = 65536.0f; -COMPILER_STRIP_GATE(80694728, &lit_4382); +COMPILER_STRIP_GATE(0x80694728, &lit_4382); #pragma pop /* 8069472C-80694730 00009C 0004+00 0/1 0/0 0/0 .rodata @4383 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4383 = 5.0f; -COMPILER_STRIP_GATE(8069472C, &lit_4383); +COMPILER_STRIP_GATE(0x8069472C, &lit_4383); #pragma pop /* 80692930-80692AF4 001870 01C4+00 1/1 0/0 0/0 .text e_bu_chance__FP10e_bu_class */ @@ -1055,77 +1061,77 @@ static asm void action(e_bu_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4451 = 10000.0f; -COMPILER_STRIP_GATE(80694730, &lit_4451); +COMPILER_STRIP_GATE(0x80694730, &lit_4451); #pragma pop /* 80694734-80694738 0000A4 0004+00 0/0 0/0 0/0 .rodata @4452 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4452 = 400.0f; -COMPILER_STRIP_GATE(80694734, &lit_4452); +COMPILER_STRIP_GATE(0x80694734, &lit_4452); #pragma pop /* 80694738-8069473C 0000A8 0004+00 0/0 0/0 0/0 .rodata @4453 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4453 = 4000.0f; -COMPILER_STRIP_GATE(80694738, &lit_4453); +COMPILER_STRIP_GATE(0x80694738, &lit_4453); #pragma pop /* 8069473C-80694740 0000AC 0004+00 0/0 0/0 0/0 .rodata @4454 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4454 = 8000.0f; -COMPILER_STRIP_GATE(8069473C, &lit_4454); +COMPILER_STRIP_GATE(0x8069473C, &lit_4454); #pragma pop /* 80694740-80694744 0000B0 0004+00 0/0 0/0 0/0 .rodata @4455 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4455 = -2.0f / 5.0f; -COMPILER_STRIP_GATE(80694740, &lit_4455); +COMPILER_STRIP_GATE(0x80694740, &lit_4455); #pragma pop /* 80694744-80694748 0000B4 0004+00 0/0 0/0 0/0 .rodata @4456 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4456 = 7.0f; -COMPILER_STRIP_GATE(80694744, &lit_4456); +COMPILER_STRIP_GATE(0x80694744, &lit_4456); #pragma pop /* 80694748-8069474C 0000B8 0004+00 0/1 0/0 0/0 .rodata @4545 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4545 = 4.0f / 5.0f; -COMPILER_STRIP_GATE(80694748, &lit_4545); +COMPILER_STRIP_GATE(0x80694748, &lit_4545); #pragma pop /* 8069474C-80694750 0000BC 0004+00 0/0 0/0 0/0 .rodata @4546 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4546 = 0.75f; -COMPILER_STRIP_GATE(8069474C, &lit_4546); +COMPILER_STRIP_GATE(0x8069474C, &lit_4546); #pragma pop /* 80694750-80694754 0000C0 0004+00 0/1 0/0 0/0 .rodata @4716 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4716 = 4.0f; -COMPILER_STRIP_GATE(80694750, &lit_4716); +COMPILER_STRIP_GATE(0x80694750, &lit_4716); #pragma pop /* 80694754-80694758 0000C4 0004+00 0/1 0/0 0/0 .rodata @4717 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4717 = 6.0f / 5.0f; -COMPILER_STRIP_GATE(80694754, &lit_4717); +COMPILER_STRIP_GATE(0x80694754, &lit_4717); #pragma pop /* 80694758-8069475C 0000C8 0004+00 0/1 0/0 0/0 .rodata @4718 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4718 = 30000.0f; -COMPILER_STRIP_GATE(80694758, &lit_4718); +COMPILER_STRIP_GATE(0x80694758, &lit_4718); #pragma pop /* 80693528-80693A30 002468 0508+00 2/1 0/0 0/0 .text daE_BU_Execute__FP10e_bu_class */ @@ -1168,7 +1174,7 @@ static asm void useHeapInit(fopAc_ac_c* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4918 = -200.0f; -COMPILER_STRIP_GATE(8069475C, &lit_4918); +COMPILER_STRIP_GATE(0x8069475C, &lit_4918); #pragma pop /* 80694760-80694768 0000D0 0004+04 0/1 0/0 0/0 .rodata @4919 */ @@ -1179,7 +1185,7 @@ SECTION_RODATA static f32 const lit_4919[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80694760, &lit_4919); +COMPILER_STRIP_GATE(0x80694760, &lit_4919); #pragma pop /* 80694768-80694770 0000D8 0008+00 0/1 0/0 0/0 .rodata @4921 */ @@ -1188,7 +1194,13 @@ COMPILER_STRIP_GATE(80694760, &lit_4919); SECTION_RODATA static u8 const lit_4921[8] = { 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80694768, &lit_4921); +COMPILER_STRIP_GATE(0x80694768, &lit_4921); +#pragma pop + +/* 80694770-80694770 0000E0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80694775 = "E_bu"; #pragma pop /* 80693BD4-80693FC0 002B14 03EC+00 1/0 0/0 0/0 .text daE_BU_Create__FP10fopAc_ac_c */ @@ -1283,7 +1295,7 @@ asm void __sinit_d_a_e_bu_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_8069421C = (void*)__sinit_d_a_e_bu_cpp; +REGISTER_CTORS(0x8069421C, __sinit_d_a_e_bu_cpp); #pragma pop /* 80694258-80694260 003198 0008+00 1/0 0/0 0/0 .text @36@__dt__12dBgS_ObjAcchFv */ @@ -1318,10 +1330,4 @@ static asm void setMidnaBindEffect(fopEn_enemy_c* param_0, Z2CreatureEnemy* para } #pragma pop -/* 80694770-8069477A 0000E0 000A+00 4/4 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80694770 = "E_BU"; -SECTION_DEAD static char const* const stringBase_80694775 = "E_bu"; -#pragma pop +/* 80694770-80694770 0000E0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/e/d_a_e_bug/d_a_e_bug.cpp b/rel/d/a/e/d_a_e_bug/d_a_e_bug.cpp index f994888c317..f1b21d3936c 100644 --- a/rel/d/a/e/d_a_e_bug/d_a_e_bug.cpp +++ b/rel/d/a/e/d_a_e_bug/d_a_e_bug.cpp @@ -65,10 +65,10 @@ struct dPa_control_c { /* 8004C218 */ void setHitMark(u16, fopAc_ac_c*, cXyz const*, csXyz const*, cXyz const*, u32); }; -struct J3DModelData {}; - struct J3DModel {}; +struct J3DModelData {}; + struct dComIfG_play_c { /* 8002CAF0 */ void addSimpleModel(J3DModelData*, int, u8); /* 8002CB30 */ void removeSimpleModel(J3DModelData*, int); @@ -232,11 +232,11 @@ extern "C" void __register_global_object(); /* ############################################################################################## */ /* 80697CA0-80697CA4 000000 0004+00 13/13 0/0 0/0 .rodata @3829 */ SECTION_RODATA static f32 const lit_3829 = 1.5f; -COMPILER_STRIP_GATE(80697CA0, &lit_3829); +COMPILER_STRIP_GATE(0x80697CA0, &lit_3829); /* 80697CA4-80697CA8 000004 0004+00 1/6 0/0 0/0 .rodata @3830 */ SECTION_RODATA static f32 const lit_3830 = 1.0f; -COMPILER_STRIP_GATE(80697CA4, &lit_3830); +COMPILER_STRIP_GATE(0x80697CA4, &lit_3830); /* 80697DA8-80697DB8 000000 0010+00 1/1 0/0 0/0 .data c_x$3877 */ SECTION_DATA static u8 c_x[16] = { @@ -417,7 +417,7 @@ SECTION_RODATA static u8 const lit_3945[4 + 4 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80697CA8, &lit_3945); +COMPILER_STRIP_GATE(0x80697CA8, &lit_3945); /* 80697CB0-80697CB8 000010 0008+00 0/5 0/0 0/0 .rodata @3946 */ #pragma push @@ -425,7 +425,7 @@ COMPILER_STRIP_GATE(80697CA8, &lit_3945); SECTION_RODATA static u8 const lit_3946[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80697CB0, &lit_3946); +COMPILER_STRIP_GATE(0x80697CB0, &lit_3946); #pragma pop /* 80697CB8-80697CC0 000018 0008+00 0/5 0/0 0/0 .rodata @3947 */ @@ -434,7 +434,7 @@ COMPILER_STRIP_GATE(80697CB0, &lit_3946); SECTION_RODATA static u8 const lit_3947[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80697CB8, &lit_3947); +COMPILER_STRIP_GATE(0x80697CB8, &lit_3947); #pragma pop /* 80697CC0-80697CC8 000020 0008+00 0/5 0/0 0/0 .rodata @3948 */ @@ -443,21 +443,21 @@ COMPILER_STRIP_GATE(80697CB8, &lit_3947); SECTION_RODATA static u8 const lit_3948[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80697CC0, &lit_3948); +COMPILER_STRIP_GATE(0x80697CC0, &lit_3948); #pragma pop /* 80697CC8-80697CCC 000028 0004+00 0/6 0/0 0/0 .rodata @3949 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3949 = 5.0f; -COMPILER_STRIP_GATE(80697CC8, &lit_3949); +COMPILER_STRIP_GATE(0x80697CC8, &lit_3949); #pragma pop /* 80697CCC-80697CD0 00002C 0004+00 0/5 0/0 0/0 .rodata @3950 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3950 = 20.0f; -COMPILER_STRIP_GATE(80697CCC, &lit_3950); +COMPILER_STRIP_GATE(0x80697CCC, &lit_3950); #pragma pop /* 80694CC8-80694F58 000228 0290+00 3/3 0/0 0/0 .text simple_bg_check__FP5bug_si */ @@ -493,7 +493,7 @@ static asm void bug_mtxset(bug_s* param_0) { /* ############################################################################################## */ /* 80697CD0-80697CD4 000030 0004+00 2/4 0/0 0/0 .rodata @4019 */ SECTION_RODATA static f32 const lit_4019 = 2.0f; -COMPILER_STRIP_GATE(80697CD0, &lit_4019); +COMPILER_STRIP_GATE(0x80697CD0, &lit_4019); /* 8069506C-806951C8 0005CC 015C+00 1/1 0/0 0/0 .text bug_mtxset_stick__FP5bug_s */ #pragma push @@ -518,7 +518,7 @@ static asm void bug_mtxset_stickW(bug_s* param_0) { /* ############################################################################################## */ /* 80697CD4-80697CD8 000034 0004+00 1/1 0/0 0/0 .rodata @4108 */ SECTION_RODATA static f32 const lit_4108 = -4.0f; -COMPILER_STRIP_GATE(80697CD4, &lit_4108); +COMPILER_STRIP_GATE(0x80697CD4, &lit_4108); /* 806953E4-806954D4 000944 00F0+00 1/1 0/0 0/0 .text bug_mtxset_fail__FP5bug_s */ #pragma push @@ -535,21 +535,21 @@ static asm void bug_mtxset_fail(bug_s* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4205 = 30.0f; -COMPILER_STRIP_GATE(80697CD8, &lit_4205); +COMPILER_STRIP_GATE(0x80697CD8, &lit_4205); #pragma pop /* 80697CDC-80697CE0 00003C 0004+00 0/1 0/0 0/0 .rodata @4206 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4206 = -30.0f; -COMPILER_STRIP_GATE(80697CDC, &lit_4206); +COMPILER_STRIP_GATE(0x80697CDC, &lit_4206); #pragma pop /* 80697CE0-80697CE4 000040 0004+00 0/1 0/0 0/0 .rodata @4207 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4207 = -10.0f; -COMPILER_STRIP_GATE(80697CE0, &lit_4207); +COMPILER_STRIP_GATE(0x80697CE0, &lit_4207); #pragma pop /* 806954D4-806957DC 000A34 0308+00 1/1 0/0 0/0 .text bug_ground_ang_set__FP5bug_s */ @@ -567,28 +567,28 @@ static asm void bug_ground_ang_set(bug_s* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4230 = 3.0f; -COMPILER_STRIP_GATE(80697CE4, &lit_4230); +COMPILER_STRIP_GATE(0x80697CE4, &lit_4230); #pragma pop /* 80697CE8-80697CEC 000048 0004+00 0/1 0/0 0/0 .rodata @4231 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4231 = -60.0f; -COMPILER_STRIP_GATE(80697CE8, &lit_4231); +COMPILER_STRIP_GATE(0x80697CE8, &lit_4231); #pragma pop /* 80697CEC-80697CF0 00004C 0004+00 0/2 0/0 0/0 .rodata @4232 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4232 = 70.0f; -COMPILER_STRIP_GATE(80697CEC, &lit_4232); +COMPILER_STRIP_GATE(0x80697CEC, &lit_4232); #pragma pop /* 80697CF0-80697CF4 000050 0004+00 0/4 0/0 0/0 .rodata @4233 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4233 = 0.5f; -COMPILER_STRIP_GATE(80697CF0, &lit_4233); +COMPILER_STRIP_GATE(0x80697CF0, &lit_4233); #pragma pop /* 806957DC-806958E8 000D3C 010C+00 2/2 0/0 0/0 .text bug_action__FP11e_bug_classP5bug_s @@ -607,56 +607,56 @@ static asm void bug_action(e_bug_class* param_0, bug_s* param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4309 = 1000.0f; -COMPILER_STRIP_GATE(80697CF4, &lit_4309); +COMPILER_STRIP_GATE(0x80697CF4, &lit_4309); #pragma pop /* 80697CF8-80697CFC 000058 0004+00 0/3 0/0 0/0 .rodata @4310 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4310 = 600.0f; -COMPILER_STRIP_GATE(80697CF8, &lit_4310); +COMPILER_STRIP_GATE(0x80697CF8, &lit_4310); #pragma pop /* 80697CFC-80697D00 00005C 0004+00 0/5 0/0 0/0 .rodata @4311 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4311 = 200.0f; -COMPILER_STRIP_GATE(80697CFC, &lit_4311); +COMPILER_STRIP_GATE(0x80697CFC, &lit_4311); #pragma pop /* 80697D00-80697D04 000060 0004+00 0/2 0/0 0/0 .rodata @4312 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4312 = 40.0f; -COMPILER_STRIP_GATE(80697D00, &lit_4312); +COMPILER_STRIP_GATE(0x80697D00, &lit_4312); #pragma pop /* 80697D04-80697D08 000064 0004+00 0/2 0/0 0/0 .rodata @4313 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4313 = 13.0f; -COMPILER_STRIP_GATE(80697D04, &lit_4313); +COMPILER_STRIP_GATE(0x80697D04, &lit_4313); #pragma pop /* 80697D08-80697D0C 000068 0004+00 0/1 0/0 0/0 .rodata @4314 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4314 = 7.0f; -COMPILER_STRIP_GATE(80697D08, &lit_4314); +COMPILER_STRIP_GATE(0x80697D08, &lit_4314); #pragma pop /* 80697D0C-80697D10 00006C 0004+00 0/1 0/0 0/0 .rodata @4315 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4315 = 3.0f / 5.0f; -COMPILER_STRIP_GATE(80697D0C, &lit_4315); +COMPILER_STRIP_GATE(0x80697D0C, &lit_4315); #pragma pop /* 80697D10-80697D14 000070 0004+00 0/2 0/0 0/0 .rodata @4316 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4316 = 9.0f; -COMPILER_STRIP_GATE(80697D10, &lit_4316); +COMPILER_STRIP_GATE(0x80697D10, &lit_4316); #pragma pop /* 80697E90-80697E9C 000068 000C+00 0/1 0/0 0/0 .bss @3831 */ @@ -692,21 +692,21 @@ static asm void bug_stick(bug_s* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4358 = 41.0f; -COMPILER_STRIP_GATE(80697D14, &lit_4358); +COMPILER_STRIP_GATE(0x80697D14, &lit_4358); #pragma pop /* 80697D18-80697D1C 000078 0004+00 0/2 0/0 0/0 .rodata @4359 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4359 = 10.0f; -COMPILER_STRIP_GATE(80697D18, &lit_4359); +COMPILER_STRIP_GATE(0x80697D18, &lit_4359); #pragma pop /* 80697D1C-80697D20 00007C 0004+00 0/1 0/0 0/0 .rodata @4360 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4360 = -13.0f; -COMPILER_STRIP_GATE(80697D1C, &lit_4360); +COMPILER_STRIP_GATE(0x80697D1C, &lit_4360); #pragma pop /* 80695BE4-80695DE8 001144 0204+00 1/1 0/0 0/0 .text bug_stickW__FP5bug_s */ @@ -724,14 +724,14 @@ static asm void bug_stickW(bug_s* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4376 = 25.0f; -COMPILER_STRIP_GATE(80697D20, &lit_4376); +COMPILER_STRIP_GATE(0x80697D20, &lit_4376); #pragma pop /* 80697D24-80697D28 000084 0004+00 0/1 0/0 0/0 .rodata @4377 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4377 = 8.0f; -COMPILER_STRIP_GATE(80697D24, &lit_4377); +COMPILER_STRIP_GATE(0x80697D24, &lit_4377); #pragma pop /* 80695DE8-80695ECC 001348 00E4+00 1/1 0/0 0/0 .text wind_move__FP5bug_s */ @@ -749,14 +749,14 @@ static asm void wind_move(bug_s* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4395 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(80697D28, &lit_4395); +COMPILER_STRIP_GATE(0x80697D28, &lit_4395); #pragma pop /* 80697D2C-80697D30 00008C 0004+00 0/1 0/0 0/0 .rodata @4396 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4396 = 1.0f / 100.0f; -COMPILER_STRIP_GATE(80697D2C, &lit_4396); +COMPILER_STRIP_GATE(0x80697D2C, &lit_4396); #pragma pop /* 80695ECC-80695FCC 00142C 0100+00 1/1 0/0 0/0 .text bug_fail__FP11e_bug_classP5bug_s */ @@ -774,42 +774,42 @@ static asm void bug_fail(e_bug_class* param_0, bug_s* param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4562 = 50.0f; -COMPILER_STRIP_GATE(80697D30, &lit_4562); +COMPILER_STRIP_GATE(0x80697D30, &lit_4562); #pragma pop /* 80697D34-80697D38 000094 0004+00 0/3 0/0 0/0 .rodata @4563 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4563 = 100.0f; -COMPILER_STRIP_GATE(80697D34, &lit_4563); +COMPILER_STRIP_GATE(0x80697D34, &lit_4563); #pragma pop /* 80697D38-80697D3C 000098 0004+00 0/1 0/0 0/0 .rodata @4564 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4564 = -400.0f; -COMPILER_STRIP_GATE(80697D38, &lit_4564); +COMPILER_STRIP_GATE(0x80697D38, &lit_4564); #pragma pop /* 80697D3C-80697D40 00009C 0004+00 0/1 0/0 0/0 .rodata @4565 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4565 = 15.0f; -COMPILER_STRIP_GATE(80697D3C, &lit_4565); +COMPILER_STRIP_GATE(0x80697D3C, &lit_4565); #pragma pop /* 80697D40-80697D44 0000A0 0004+00 0/1 0/0 0/0 .rodata @4566 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4566 = 35.0f; -COMPILER_STRIP_GATE(80697D40, &lit_4566); +COMPILER_STRIP_GATE(0x80697D40, &lit_4566); #pragma pop /* 80697D44-80697D48 0000A4 0004+00 0/3 0/0 0/0 .rodata @4567 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4567 = 65536.0f; -COMPILER_STRIP_GATE(80697D44, &lit_4567); +COMPILER_STRIP_GATE(0x80697D44, &lit_4567); #pragma pop /* 80697D48-80697D50 0000A8 0004+04 0/1 0/0 0/0 .rodata @4568 */ @@ -820,7 +820,7 @@ SECTION_RODATA static f32 const lit_4568[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80697D48, &lit_4568); +COMPILER_STRIP_GATE(0x80697D48, &lit_4568); #pragma pop /* 80695FCC-806965B4 00152C 05E8+00 1/1 0/0 0/0 .text damage_check__FP11e_bug_classP5bug_s */ @@ -840,7 +840,7 @@ static asm void damage_check(e_bug_class* param_0, bug_s* param_1) { SECTION_RODATA static u8 const lit_4630[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80697D50, &lit_4630); +COMPILER_STRIP_GATE(0x80697D50, &lit_4630); #pragma pop /* 806965B4-80696828 001B14 0274+00 1/1 0/0 0/0 .text set_wait__FP11e_bug_classP5bug_s */ @@ -858,47 +858,47 @@ static asm void set_wait(e_bug_class* param_0, bug_s* param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4761 = 700.0f; -COMPILER_STRIP_GATE(80697D58, &lit_4761); +COMPILER_STRIP_GATE(0x80697D58, &lit_4761); #pragma pop /* 80697D5C-80697D60 0000BC 0004+00 0/1 0/0 0/0 .rodata @4762 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4762 = 3000.0f; -COMPILER_STRIP_GATE(80697D5C, &lit_4762); +COMPILER_STRIP_GATE(0x80697D5C, &lit_4762); #pragma pop /* 80697D60-80697D64 0000C0 0004+00 0/1 0/0 0/0 .rodata @4763 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4763 = 140.0f; -COMPILER_STRIP_GATE(80697D60, &lit_4763); +COMPILER_STRIP_GATE(0x80697D60, &lit_4763); #pragma pop /* 80697D64-80697D68 0000C4 0004+00 0/1 0/0 0/0 .rodata @4764 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4764 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(80697D64, &lit_4764); +COMPILER_STRIP_GATE(0x80697D64, &lit_4764); #pragma pop /* 80697D68-80697D6C 0000C8 0004+00 0/1 0/0 0/0 .rodata @4765 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4765 = 2.0f / 5.0f; -COMPILER_STRIP_GATE(80697D68, &lit_4765); +COMPILER_STRIP_GATE(0x80697D68, &lit_4765); #pragma pop /* 80697D6C-80697D70 0000CC 0004+00 0/1 0/0 0/0 .rodata @4766 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4766 = -150.0f; -COMPILER_STRIP_GATE(80697D6C, &lit_4766); +COMPILER_STRIP_GATE(0x80697D6C, &lit_4766); #pragma pop /* 80697D70-80697D74 0000D0 0004+00 1/2 0/0 0/0 .rodata @4767 */ SECTION_RODATA static f32 const lit_4767 = 300.0f; -COMPILER_STRIP_GATE(80697D70, &lit_4767); +COMPILER_STRIP_GATE(0x80697D70, &lit_4767); /* 80696828-80696E84 001D88 065C+00 1/1 0/0 0/0 .text normal_move__FP11e_bug_classP5bug_s */ @@ -914,7 +914,7 @@ static asm void normal_move(e_bug_class* param_0, bug_s* param_1) { /* ############################################################################################## */ /* 80697D74-80697D78 0000D4 0004+00 1/1 0/0 0/0 .rodata @4842 */ SECTION_RODATA static f32 const lit_4842 = 2000.0f; -COMPILER_STRIP_GATE(80697D74, &lit_4842); +COMPILER_STRIP_GATE(0x80697D74, &lit_4842); /* 80696E84-80697160 0023E4 02DC+00 1/1 0/0 0/0 .text bug_control__FP11e_bug_class */ #pragma push @@ -951,14 +951,14 @@ static asm void s_bomb_sub(void* param_0, void* param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4947 = 120.0f; -COMPILER_STRIP_GATE(80697D78, &lit_4947); +COMPILER_STRIP_GATE(0x80697D78, &lit_4947); #pragma pop /* 80697D7C-80697D80 0000DC 0004+00 0/1 0/0 0/0 .rodata @4948 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4948 = 130.0f; -COMPILER_STRIP_GATE(80697D7C, &lit_4948); +COMPILER_STRIP_GATE(0x80697D7C, &lit_4948); #pragma pop /* 80697294-806975A0 0027F4 030C+00 2/1 0/0 0/0 .text daE_Bug_Execute__FP11e_bug_class */ @@ -982,7 +982,13 @@ static bool daE_Bug_IsDelete(e_bug_class* param_0) { SECTION_RODATA static u8 const l_bmdidx_4962[8] = { 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x04, }; -COMPILER_STRIP_GATE(80697D80, &l_bmdidx_4962); +COMPILER_STRIP_GATE(0x80697D80, &l_bmdidx_4962); + +/* 80697D98-80697D98 0000F8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80697D98 = "E_bug"; +#pragma pop /* 806975A8-806976B4 002B08 010C+00 1/0 0/0 0/0 .text daE_Bug_Delete__FP11e_bug_class */ #pragma push @@ -1011,7 +1017,7 @@ static asm void useHeapInit(fopAc_ac_c* param_0) { SECTION_RODATA static u8 const l_bmdidx_5049[8] = { 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x04, }; -COMPILER_STRIP_GATE(80697D88, &l_bmdidx_5049); +COMPILER_STRIP_GATE(0x80697D88, &l_bmdidx_5049); #pragma pop /* 80697D90-80697D98 0000F0 0008+00 0/1 0/0 0/0 .rodata @5142 */ @@ -1020,7 +1026,13 @@ COMPILER_STRIP_GATE(80697D88, &l_bmdidx_5049); SECTION_RODATA static u8 const lit_5142[8] = { 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80697D90, &lit_5142); +COMPILER_STRIP_GATE(0x80697D90, &lit_5142); +#pragma pop + +/* 80697D98-80697D98 0000F8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80697D9E = "T_ENEMY"; #pragma pop /* 806977A8-80697B4C 002D08 03A4+00 1/0 0/0 0/0 .text daE_Bug_Create__FP10fopAc_ac_c */ @@ -1075,7 +1087,7 @@ asm void __sinit_d_a_e_bug_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80697C34 = (void*)__sinit_d_a_e_bug_cpp; +REGISTER_CTORS(0x80697C34, __sinit_d_a_e_bug_cpp); #pragma pop /* ############################################################################################## */ @@ -1250,10 +1262,4 @@ static u8 data_80697F0C[4]; static u8 data_80697F10[4]; #pragma pop -/* 80697D98-80697DA6 0000F8 000E+00 3/3 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80697D98 = "E_bug"; -SECTION_DEAD static char const* const stringBase_80697D9E = "T_ENEMY"; -#pragma pop +/* 80697D98-80697D98 0000F8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/e/d_a_e_cr/d_a_e_cr.cpp b/rel/d/a/e/d_a_e_cr/d_a_e_cr.cpp index ffbf7c56b0e..32d346d566b 100644 --- a/rel/d/a/e/d_a_e_cr/d_a_e_cr.cpp +++ b/rel/d/a/e/d_a_e_cr/d_a_e_cr.cpp @@ -19,16 +19,16 @@ struct mDoMtx_stack_c { static u8 now[48]; }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; - struct J3DAnmTransform {}; +struct J3DModelData {}; + +struct Z2Creature {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -78,10 +78,10 @@ struct dRes_control_c { struct dPa_levelEcallBack {}; -struct _GXColor {}; - struct csXyz {}; +struct _GXColor {}; + struct dPa_control_c { /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, @@ -344,7 +344,7 @@ extern "C" void __register_global_object(); /* ############################################################################################## */ /* 80699CB0-80699CB4 000000 0004+00 8/8 0/0 0/0 .rodata @3788 */ SECTION_RODATA static f32 const lit_3788 = 100.0f; -COMPILER_STRIP_GATE(80699CB0, &lit_3788); +COMPILER_STRIP_GATE(0x80699CB0, &lit_3788); /* 80699CB4-80699CB8 000004 0004+00 2/7 0/0 0/0 .rodata @3789 */ SECTION_RODATA static u8 const lit_3789[4] = { @@ -353,7 +353,7 @@ SECTION_RODATA static u8 const lit_3789[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80699CB4, &lit_3789); +COMPILER_STRIP_GATE(0x80699CB4, &lit_3789); /* 80699CB8-80699CC0 000008 0004+04 2/7 0/0 0/0 .rodata @3790 */ SECTION_RODATA static f32 const lit_3790[1 + 1 /* padding */] = { @@ -361,7 +361,7 @@ SECTION_RODATA static f32 const lit_3790[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80699CB8, &lit_3790); +COMPILER_STRIP_GATE(0x80699CB8, &lit_3790); /* 80699CC0-80699CC8 000010 0008+00 0/1 0/0 0/0 .rodata @3791 */ #pragma push @@ -369,7 +369,7 @@ COMPILER_STRIP_GATE(80699CB8, &lit_3790); SECTION_RODATA static u8 const lit_3791[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80699CC0, &lit_3791); +COMPILER_STRIP_GATE(0x80699CC0, &lit_3791); #pragma pop /* 80699CC8-80699CD0 000018 0008+00 0/1 0/0 0/0 .rodata @3792 */ @@ -378,7 +378,7 @@ COMPILER_STRIP_GATE(80699CC0, &lit_3791); SECTION_RODATA static u8 const lit_3792[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80699CC8, &lit_3792); +COMPILER_STRIP_GATE(0x80699CC8, &lit_3792); #pragma pop /* 80699CD0-80699CD8 000020 0008+00 0/1 0/0 0/0 .rodata @3793 */ @@ -387,32 +387,32 @@ COMPILER_STRIP_GATE(80699CC8, &lit_3792); SECTION_RODATA static u8 const lit_3793[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80699CD0, &lit_3793); +COMPILER_STRIP_GATE(0x80699CD0, &lit_3793); #pragma pop /* 80699CD8-80699CDC 000028 0004+00 0/1 0/0 0/0 .rodata @3794 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3794 = 1.0f / 100.0f; -COMPILER_STRIP_GATE(80699CD8, &lit_3794); +COMPILER_STRIP_GATE(0x80699CD8, &lit_3794); #pragma pop /* 80699CDC-80699CE0 00002C 0004+00 0/2 0/0 0/0 .rodata @3809 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3809 = 3.0f; -COMPILER_STRIP_GATE(80699CDC, &lit_3809); +COMPILER_STRIP_GATE(0x80699CDC, &lit_3809); #pragma pop /* 80699CE0-80699CE4 000030 0004+00 1/3 0/0 0/0 .rodata @3810 */ SECTION_RODATA static f32 const lit_3810 = 40.0f; -COMPILER_STRIP_GATE(80699CE0, &lit_3810); +COMPILER_STRIP_GATE(0x80699CE0, &lit_3810); /* 80699CE4-80699CE8 000034 0004+00 0/1 0/0 0/0 .rodata @3811 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3811 = 400.0f; -COMPILER_STRIP_GATE(80699CE4, &lit_3811); +COMPILER_STRIP_GATE(0x80699CE4, &lit_3811); #pragma pop /* 80699D4C-80699D58 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ @@ -563,7 +563,13 @@ asm daE_CR_HIO_c::daE_CR_HIO_c() { /* ############################################################################################## */ /* 80699CE8-80699CEC 000038 0004+00 1/1 0/0 0/0 .rodata @3825 */ SECTION_RODATA static f32 const lit_3825 = -1.0f; -COMPILER_STRIP_GATE(80699CE8, &lit_3825); +COMPILER_STRIP_GATE(0x80699CE8, &lit_3825); + +/* 80699D40-80699D40 000090 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80699D40 = "E_CR"; +#pragma pop /* 80698044-806980F0 000124 00AC+00 3/3 0/0 0/0 .text anm_init__FP10e_cr_classifUcf */ #pragma push @@ -629,7 +635,7 @@ static asm void damage_check(e_cr_class* param_0) { /* ############################################################################################## */ /* 80699CEC-80699CF0 00003C 0004+00 2/4 0/0 0/0 .rodata @3954 */ SECTION_RODATA static f32 const lit_3954 = 50.0f; -COMPILER_STRIP_GATE(80699CEC, &lit_3954); +COMPILER_STRIP_GATE(0x80699CEC, &lit_3954); /* 80698498-806985A4 000578 010C+00 1/1 0/0 0/0 .text way_bg_check__FP10e_cr_classf */ #pragma push @@ -646,77 +652,77 @@ static asm void way_bg_check(e_cr_class* param_0, f32 param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4018 = 30.0f; -COMPILER_STRIP_GATE(80699CF0, &lit_4018); +COMPILER_STRIP_GATE(0x80699CF0, &lit_4018); #pragma pop /* 80699CF4-80699CF8 000044 0004+00 0/1 0/0 0/0 .rodata @4019 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4019 = 60.0f; -COMPILER_STRIP_GATE(80699CF4, &lit_4019); +COMPILER_STRIP_GATE(0x80699CF4, &lit_4019); #pragma pop /* 80699CF8-80699CFC 000048 0004+00 0/1 0/0 0/0 .rodata @4020 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4020 = 200.0f; -COMPILER_STRIP_GATE(80699CF8, &lit_4020); +COMPILER_STRIP_GATE(0x80699CF8, &lit_4020); #pragma pop /* 80699CFC-80699D00 00004C 0004+00 0/2 0/0 0/0 .rodata @4021 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4021 = 20.0f; -COMPILER_STRIP_GATE(80699CFC, &lit_4021); +COMPILER_STRIP_GATE(0x80699CFC, &lit_4021); #pragma pop /* 80699D00-80699D04 000050 0004+00 0/2 0/0 0/0 .rodata @4022 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4022 = 10.0f; -COMPILER_STRIP_GATE(80699D00, &lit_4022); +COMPILER_STRIP_GATE(0x80699D00, &lit_4022); #pragma pop /* 80699D04-80699D08 000054 0004+00 0/1 0/0 0/0 .rodata @4023 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4023 = 30000.0f; -COMPILER_STRIP_GATE(80699D04, &lit_4023); +COMPILER_STRIP_GATE(0x80699D04, &lit_4023); #pragma pop /* 80699D08-80699D0C 000058 0004+00 0/4 0/0 0/0 .rodata @4024 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4024 = 5.0f; -COMPILER_STRIP_GATE(80699D08, &lit_4024); +COMPILER_STRIP_GATE(0x80699D08, &lit_4024); #pragma pop /* 80699D0C-80699D10 00005C 0004+00 0/1 0/0 0/0 .rodata @4025 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4025 = 15000.0f; -COMPILER_STRIP_GATE(80699D0C, &lit_4025); +COMPILER_STRIP_GATE(0x80699D0C, &lit_4025); #pragma pop /* 80699D10-80699D14 000060 0004+00 0/3 0/0 0/0 .rodata @4026 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4026 = 0.5f; -COMPILER_STRIP_GATE(80699D10, &lit_4026); +COMPILER_STRIP_GATE(0x80699D10, &lit_4026); #pragma pop /* 80699D14-80699D18 000064 0004+00 0/1 0/0 0/0 .rodata @4027 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4027 = 35.0f; -COMPILER_STRIP_GATE(80699D14, &lit_4027); +COMPILER_STRIP_GATE(0x80699D14, &lit_4027); #pragma pop /* 80699D18-80699D1C 000068 0004+00 0/2 0/0 0/0 .rodata @4028 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4028 = 15.0f; -COMPILER_STRIP_GATE(80699D18, &lit_4028); +COMPILER_STRIP_GATE(0x80699D18, &lit_4028); #pragma pop /* 80699E88-80699E8C 000008 0004+00 2/2 0/0 0/0 .bss None */ @@ -743,21 +749,21 @@ static asm void e_cr_move(e_cr_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4051 = 2.0f; -COMPILER_STRIP_GATE(80699D1C, &lit_4051); +COMPILER_STRIP_GATE(0x80699D1C, &lit_4051); #pragma pop /* 80699D20-80699D24 000070 0004+00 0/1 0/0 0/0 .rodata @4052 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4052 = -25.0f; -COMPILER_STRIP_GATE(80699D20, &lit_4052); +COMPILER_STRIP_GATE(0x80699D20, &lit_4052); #pragma pop /* 80699D24-80699D28 000074 0004+00 0/1 0/0 0/0 .rodata @4053 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4053 = 4.0f; -COMPILER_STRIP_GATE(80699D24, &lit_4053); +COMPILER_STRIP_GATE(0x80699D24, &lit_4053); #pragma pop /* 80698A5C-80698B80 000B3C 0124+00 1/1 0/0 0/0 .text e_cr_s_damage__FP10e_cr_class */ @@ -775,35 +781,35 @@ static asm void e_cr_s_damage(e_cr_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4074 = 38.0f; -COMPILER_STRIP_GATE(80699D28, &lit_4074); +COMPILER_STRIP_GATE(0x80699D28, &lit_4074); #pragma pop /* 80699D2C-80699D30 00007C 0004+00 0/1 0/0 0/0 .rodata @4075 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4075 = 8.0f; -COMPILER_STRIP_GATE(80699D2C, &lit_4075); +COMPILER_STRIP_GATE(0x80699D2C, &lit_4075); #pragma pop /* 80699D30-80699D34 000080 0004+00 0/1 0/0 0/0 .rodata @4076 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4076 = -30.0f; -COMPILER_STRIP_GATE(80699D30, &lit_4076); +COMPILER_STRIP_GATE(0x80699D30, &lit_4076); #pragma pop /* 80699D34-80699D38 000084 0004+00 0/1 0/0 0/0 .rodata @4077 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4077 = 1000.0f; -COMPILER_STRIP_GATE(80699D34, &lit_4077); +COMPILER_STRIP_GATE(0x80699D34, &lit_4077); #pragma pop /* 80699D38-80699D3C 000088 0004+00 0/1 0/0 0/0 .rodata @4078 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4078 = 25.0f; -COMPILER_STRIP_GATE(80699D38, &lit_4078); +COMPILER_STRIP_GATE(0x80699D38, &lit_4078); #pragma pop /* 80698B80-80698D6C 000C60 01EC+00 1/1 0/0 0/0 .text e_cr_damage__FP10e_cr_class */ @@ -821,7 +827,7 @@ static asm void e_cr_damage(e_cr_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4124 = 7.0f; -COMPILER_STRIP_GATE(80699D3C, &lit_4124); +COMPILER_STRIP_GATE(0x80699D3C, &lit_4124); #pragma pop /* 80698D6C-80698F88 000E4C 021C+00 1/1 0/0 0/0 .text action__FP10e_cr_class */ @@ -869,6 +875,13 @@ static asm void useHeapInit(fopAc_ac_c* param_0) { } #pragma pop +/* ############################################################################################## */ +/* 80699D40-80699D40 000090 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80699D45 = "E_cr"; +#pragma pop + /* 8069936C-806995E0 00144C 0274+00 1/0 0/0 0/0 .text daE_CR_Create__FP10fopAc_ac_c */ #pragma push #pragma optimization_level 0 @@ -961,7 +974,7 @@ asm void __sinit_d_a_e_cr_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_8069983C = (void*)__sinit_d_a_e_cr_cpp; +REGISTER_CTORS(0x8069983C, __sinit_d_a_e_cr_cpp); #pragma pop /* 80699878-80699880 001958 0008+00 1/0 0/0 0/0 .text @36@__dt__12dBgS_ObjAcchFv */ @@ -996,10 +1009,4 @@ static asm void setMidnaBindEffect(fopEn_enemy_c* param_0, Z2CreatureEnemy* para } #pragma pop -/* 80699D40-80699D4A 000090 000A+00 4/4 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80699D40 = "E_CR"; -SECTION_DEAD static char const* const stringBase_80699D45 = "E_cr"; -#pragma pop +/* 80699D40-80699D40 000090 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/e/d_a_e_cr_egg/d_a_e_cr_egg.cpp b/rel/d/a/e/d_a_e_cr_egg/d_a_e_cr_egg.cpp index 5f9e62ffff6..0aa24cc3cb1 100644 --- a/rel/d/a/e/d_a_e_cr_egg/d_a_e_cr_egg.cpp +++ b/rel/d/a/e/d_a_e_cr_egg/d_a_e_cr_egg.cpp @@ -49,10 +49,10 @@ struct dRes_control_c { struct dPa_levelEcallBack {}; -struct _GXColor {}; - struct csXyz {}; +struct _GXColor {}; + struct dPa_control_c { /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, @@ -236,11 +236,11 @@ extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; /* ############################################################################################## */ /* 8069A8CC-8069A8D0 000000 0004+00 4/4 0/0 0/0 .rodata @3657 */ SECTION_RODATA static f32 const lit_3657 = 30.0f; -COMPILER_STRIP_GATE(8069A8CC, &lit_3657); +COMPILER_STRIP_GATE(0x8069A8CC, &lit_3657); /* 8069A8D0-8069A8D4 000004 0004+00 1/3 0/0 0/0 .rodata @3658 */ SECTION_RODATA static f32 const lit_3658 = 1.0f; -COMPILER_STRIP_GATE(8069A8D0, &lit_3658); +COMPILER_STRIP_GATE(0x8069A8D0, &lit_3658); /* 80699F38-80699FC8 000078 0090+00 1/0 0/0 0/0 .text daE_CR_EGG_Draw__FP14e_cr_egg_class */ @@ -260,56 +260,56 @@ static asm void daE_CR_EGG_Draw(e_cr_egg_class* param_0) { SECTION_RODATA static u8 const lit_3676[12] = { 0x00, 0x00, 0x00, 0x28, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x0A, }; -COMPILER_STRIP_GATE(8069A8D4, &lit_3676); +COMPILER_STRIP_GATE(0x8069A8D4, &lit_3676); #pragma pop /* 8069A8E0-8069A8E4 000014 0004+00 0/1 0/0 0/0 .rodata @3702 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3702 = 5.0f; -COMPILER_STRIP_GATE(8069A8E0, &lit_3702); +COMPILER_STRIP_GATE(0x8069A8E0, &lit_3702); #pragma pop /* 8069A8E4-8069A8E8 000018 0004+00 0/2 0/0 0/0 .rodata @3703 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3703 = 3.0f; -COMPILER_STRIP_GATE(8069A8E4, &lit_3703); +COMPILER_STRIP_GATE(0x8069A8E4, &lit_3703); #pragma pop /* 8069A8E8-8069A8EC 00001C 0004+00 0/1 0/0 0/0 .rodata @3704 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3704 = 10000.0f; -COMPILER_STRIP_GATE(8069A8E8, &lit_3704); +COMPILER_STRIP_GATE(0x8069A8E8, &lit_3704); #pragma pop /* 8069A8EC-8069A8F0 000020 0004+00 0/1 0/0 0/0 .rodata @3705 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3705 = -0.5f; -COMPILER_STRIP_GATE(8069A8EC, &lit_3705); +COMPILER_STRIP_GATE(0x8069A8EC, &lit_3705); #pragma pop /* 8069A8F0-8069A8F4 000024 0004+00 0/1 0/0 0/0 .rodata @3706 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3706 = 8000.0f; -COMPILER_STRIP_GATE(8069A8F0, &lit_3706); +COMPILER_STRIP_GATE(0x8069A8F0, &lit_3706); #pragma pop /* 8069A8F4-8069A8F8 000028 0004+00 0/1 0/0 0/0 .rodata @3707 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3707 = -1.0f; -COMPILER_STRIP_GATE(8069A8F4, &lit_3707); +COMPILER_STRIP_GATE(0x8069A8F4, &lit_3707); #pragma pop /* 8069A8F8-8069A8FC 00002C 0004+00 0/1 0/0 0/0 .rodata @3708 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3708 = 0.5f; -COMPILER_STRIP_GATE(8069A8F8, &lit_3708); +COMPILER_STRIP_GATE(0x8069A8F8, &lit_3708); #pragma pop /* 8069A914-8069A920 000000 000C+00 1/1 0/0 0/0 .data spy$3662 */ @@ -333,7 +333,7 @@ static asm void e_cr_egg_move(e_cr_egg_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3728 = 700.0f; -COMPILER_STRIP_GATE(8069A8FC, &lit_3728); +COMPILER_STRIP_GATE(0x8069A8FC, &lit_3728); #pragma pop /* 8069A900-8069A904 000034 0004+00 0/2 0/0 0/0 .rodata @3729 */ @@ -345,12 +345,12 @@ SECTION_RODATA static u8 const lit_3729[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(8069A900, &lit_3729); +COMPILER_STRIP_GATE(0x8069A900, &lit_3729); #pragma pop /* 8069A904-8069A908 000038 0004+00 1/3 0/0 0/0 .rodata @3730 */ SECTION_RODATA static f32 const lit_3730 = 20.0f; -COMPILER_STRIP_GATE(8069A904, &lit_3730); +COMPILER_STRIP_GATE(0x8069A904, &lit_3730); /* 8069A258-8069A378 000398 0120+00 1/1 0/0 0/0 .text action__FP14e_cr_egg_class */ #pragma push @@ -367,7 +367,7 @@ static asm void action(e_cr_egg_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3770 = -20.0f; -COMPILER_STRIP_GATE(8069A908, &lit_3770); +COMPILER_STRIP_GATE(0x8069A908, &lit_3770); #pragma pop /* 8069A378-8069A4C4 0004B8 014C+00 2/1 0/0 0/0 .text daE_CR_EGG_Execute__FP14e_cr_egg_class */ @@ -385,6 +385,13 @@ static bool daE_CR_EGG_IsDelete(e_cr_egg_class* param_0) { return true; } +/* ############################################################################################## */ +/* 8069A90C-8069A90C 000040 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8069A90C = "E_CR"; +#pragma pop + /* 8069A4CC-8069A510 00060C 0044+00 1/0 0/0 0/0 .text daE_CR_EGG_Delete__FP14e_cr_egg_class */ #pragma push #pragma optimization_level 0 @@ -524,9 +531,4 @@ static asm void func_8069A8BC() { } #pragma pop -/* 8069A90C-8069A911 000040 0005+00 3/3 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_8069A90C = "E_CR"; -#pragma pop +/* 8069A90C-8069A90C 000040 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/e/d_a_e_db/d_a_e_db.cpp b/rel/d/a/e/d_a_e_db/d_a_e_db.cpp index b9b8814276a..ab7a2bb6133 100644 --- a/rel/d/a/e/d_a_e_db/d_a_e_db.cpp +++ b/rel/d/a/e/d_a_e_db/d_a_e_db.cpp @@ -19,16 +19,16 @@ struct mDoMtx_stack_c { static u8 now[48]; }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; - struct J3DAnmTransform {}; +struct J3DModelData {}; + +struct Z2Creature {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -53,11 +53,11 @@ struct mDoExt_3DlineMatSortPacket { /* 80014738 */ void setMat(mDoExt_3DlineMat_c*); }; -struct dKy_tevstr_c {}; +struct ResTIMG {}; struct _GXColor {}; -struct ResTIMG {}; +struct dKy_tevstr_c {}; struct mDoExt_3DlineMat1_c { /* 80013360 */ void init(u16, u16, ResTIMG*, int); @@ -499,7 +499,7 @@ extern "C" void __register_global_object(); /* ############################################################################################## */ /* 806A190C-806A1910 000000 0004+00 23/23 0/0 0/0 .rodata @3902 */ SECTION_RODATA static f32 const lit_3902 = 100.0f; -COMPILER_STRIP_GATE(806A190C, &lit_3902); +COMPILER_STRIP_GATE(0x806A190C, &lit_3902); /* 806A1910-806A1914 000004 0004+00 3/22 0/0 0/0 .rodata @3903 */ SECTION_RODATA static u8 const lit_3903[4] = { @@ -508,7 +508,7 @@ SECTION_RODATA static u8 const lit_3903[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(806A1910, &lit_3903); +COMPILER_STRIP_GATE(0x806A1910, &lit_3903); /* 806A1914-806A191C 000008 0004+04 1/20 0/0 0/0 .rodata @3904 */ SECTION_RODATA static f32 const lit_3904[1 + 1 /* padding */] = { @@ -516,7 +516,7 @@ SECTION_RODATA static f32 const lit_3904[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(806A1914, &lit_3904); +COMPILER_STRIP_GATE(0x806A1914, &lit_3904); /* 806A191C-806A1924 000010 0008+00 0/6 0/0 0/0 .rodata @3905 */ #pragma push @@ -524,7 +524,7 @@ COMPILER_STRIP_GATE(806A1914, &lit_3904); SECTION_RODATA static u8 const lit_3905[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(806A191C, &lit_3905); +COMPILER_STRIP_GATE(0x806A191C, &lit_3905); #pragma pop /* 806A1924-806A192C 000018 0008+00 0/6 0/0 0/0 .rodata @3906 */ @@ -533,7 +533,7 @@ COMPILER_STRIP_GATE(806A191C, &lit_3905); SECTION_RODATA static u8 const lit_3906[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(806A1924, &lit_3906); +COMPILER_STRIP_GATE(0x806A1924, &lit_3906); #pragma pop /* 806A192C-806A1934 000020 0008+00 0/6 0/0 0/0 .rodata @3907 */ @@ -542,28 +542,28 @@ COMPILER_STRIP_GATE(806A1924, &lit_3906); SECTION_RODATA static u8 const lit_3907[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(806A192C, &lit_3907); +COMPILER_STRIP_GATE(0x806A192C, &lit_3907); #pragma pop /* 806A1934-806A1938 000028 0004+00 0/1 0/0 0/0 .rodata @3908 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3908 = 1.0f / 100.0f; -COMPILER_STRIP_GATE(806A1934, &lit_3908); +COMPILER_STRIP_GATE(0x806A1934, &lit_3908); #pragma pop /* 806A1938-806A193C 00002C 0004+00 0/6 0/0 0/0 .rodata @3923 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3923 = 0.5f; -COMPILER_STRIP_GATE(806A1938, &lit_3923); +COMPILER_STRIP_GATE(0x806A1938, &lit_3923); #pragma pop /* 806A193C-806A1940 000030 0004+00 0/1 0/0 0/0 .rodata @3924 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3924 = 6.0f / 5.0f; -COMPILER_STRIP_GATE(806A193C, &lit_3924); +COMPILER_STRIP_GATE(0x806A193C, &lit_3924); #pragma pop /* 806A1A74-806A1A80 000000 000C+00 2/2 0/0 0/0 .data cNullVec__6Z2Calc */ @@ -880,7 +880,13 @@ asm daE_DB_HIO_c::daE_DB_HIO_c() { /* ############################################################################################## */ /* 806A1940-806A1944 000034 0004+00 2/3 0/0 0/0 .rodata @3938 */ SECTION_RODATA static f32 const lit_3938 = -1.0f; -COMPILER_STRIP_GATE(806A1940, &lit_3938); +COMPILER_STRIP_GATE(0x806A1940, &lit_3938); + +/* 806A1A6C-806A1A6C 000160 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_806A1A6C = "E_db"; +#pragma pop /* 8069AB34-8069ABE0 000134 00AC+00 12/12 0/0 0/0 .text anm_init__FP10e_db_classifUcf */ #pragma push @@ -908,14 +914,14 @@ static asm void leaf_anm_init(e_db_class* param_0, int param_1, f32 param_2, u8 #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4015 = 50.0f; -COMPILER_STRIP_GATE(806A1944, &lit_4015); +COMPILER_STRIP_GATE(0x806A1944, &lit_4015); #pragma pop /* 806A1948-806A194C 00003C 0004+00 0/1 0/0 0/0 .rodata @4016 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4016 = 600.0f; -COMPILER_STRIP_GATE(806A1948, &lit_4016); +COMPILER_STRIP_GATE(0x806A1948, &lit_4016); #pragma pop /* 8069ACB8-8069AFB4 0002B8 02FC+00 1/0 0/0 0/0 .text daE_DB_Draw__FP10e_db_class */ @@ -943,46 +949,46 @@ static asm void pl_check(e_db_class* param_0, f32 param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4118 = 10.0f; -COMPILER_STRIP_GATE(806A194C, &lit_4118); +COMPILER_STRIP_GATE(0x806A194C, &lit_4118); #pragma pop /* 806A1950-806A1954 000044 0004+00 0/1 0/0 0/0 .rodata @4119 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4119 = -15.0f; -COMPILER_STRIP_GATE(806A1950, &lit_4119); +COMPILER_STRIP_GATE(0x806A1950, &lit_4119); #pragma pop /* 806A1954-806A1958 000048 0004+00 0/4 0/0 0/0 .rodata @4120 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4120 = 60.0f; -COMPILER_STRIP_GATE(806A1954, &lit_4120); +COMPILER_STRIP_GATE(0x806A1954, &lit_4120); #pragma pop /* 806A1958-806A195C 00004C 0004+00 0/9 0/0 0/0 .rodata @4121 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4121 = 30.0f; -COMPILER_STRIP_GATE(806A1958, &lit_4121); +COMPILER_STRIP_GATE(0x806A1958, &lit_4121); #pragma pop /* 806A195C-806A1960 000050 0004+00 1/8 0/0 0/0 .rodata @4122 */ SECTION_RODATA static f32 const lit_4122 = 5.0f; -COMPILER_STRIP_GATE(806A195C, &lit_4122); +COMPILER_STRIP_GATE(0x806A195C, &lit_4122); /* 806A1960-806A1964 000054 0004+00 0/9 0/0 0/0 .rodata @4123 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4123 = 20.0f; -COMPILER_STRIP_GATE(806A1960, &lit_4123); +COMPILER_STRIP_GATE(0x806A1960, &lit_4123); #pragma pop /* 806A1964-806A1968 000058 0004+00 0/2 0/0 0/0 .rodata @4124 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4124 = -10.0f; -COMPILER_STRIP_GATE(806A1964, &lit_4124); +COMPILER_STRIP_GATE(0x806A1964, &lit_4124); #pragma pop /* 8069B000-8069B468 000600 0468+00 1/1 0/0 0/0 .text damage_check__FP10e_db_class */ @@ -1000,56 +1006,56 @@ static asm void damage_check(e_db_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4183 = -170.0f; -COMPILER_STRIP_GATE(806A1968, &lit_4183); +COMPILER_STRIP_GATE(0x806A1968, &lit_4183); #pragma pop /* 806A196C-806A1970 000060 0004+00 0/4 0/0 0/0 .rodata @4184 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4184 = 170.0f; -COMPILER_STRIP_GATE(806A196C, &lit_4184); +COMPILER_STRIP_GATE(0x806A196C, &lit_4184); #pragma pop /* 806A1970-806A1974 000064 0004+00 0/5 0/0 0/0 .rodata @4185 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4185 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(806A1970, &lit_4185); +COMPILER_STRIP_GATE(0x806A1970, &lit_4185); #pragma pop /* 806A1974-806A1978 000068 0004+00 0/7 0/0 0/0 .rodata @4186 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4186 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(806A1974, &lit_4186); +COMPILER_STRIP_GATE(0x806A1974, &lit_4186); #pragma pop /* 806A1978-806A197C 00006C 0004+00 0/1 0/0 0/0 .rodata @4187 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4187 = 4.0f; -COMPILER_STRIP_GATE(806A1978, &lit_4187); +COMPILER_STRIP_GATE(0x806A1978, &lit_4187); #pragma pop /* 806A197C-806A1980 000070 0004+00 0/2 0/0 0/0 .rodata @4188 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4188 = 2.0f / 5.0f; -COMPILER_STRIP_GATE(806A197C, &lit_4188); +COMPILER_STRIP_GATE(0x806A197C, &lit_4188); #pragma pop /* 806A1980-806A1984 000074 0004+00 0/1 0/0 0/0 .rodata @4189 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4189 = 1.0f / 50.0f; -COMPILER_STRIP_GATE(806A1980, &lit_4189); +COMPILER_STRIP_GATE(0x806A1980, &lit_4189); #pragma pop /* 806A1984-806A1988 000078 0004+00 0/8 0/0 0/0 .rodata @4190 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4190 = 1.0f / 20.0f; -COMPILER_STRIP_GATE(806A1984, &lit_4190); +COMPILER_STRIP_GATE(0x806A1984, &lit_4190); #pragma pop /* 806A1D98-806A1D9C 000008 0004+00 2/2 0/0 0/0 .bss None */ @@ -1086,28 +1092,28 @@ static asm void e_db_appear(e_db_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4253 = 15.0f; -COMPILER_STRIP_GATE(806A1988, &lit_4253); +COMPILER_STRIP_GATE(0x806A1988, &lit_4253); #pragma pop /* 806A198C-806A1990 000080 0004+00 0/3 0/0 0/0 .rodata @4254 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4254 = 40.0f; -COMPILER_STRIP_GATE(806A198C, &lit_4254); +COMPILER_STRIP_GATE(0x806A198C, &lit_4254); #pragma pop /* 806A1990-806A1994 000084 0004+00 0/3 0/0 0/0 .rodata @4255 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4255 = 400.0f; -COMPILER_STRIP_GATE(806A1990, &lit_4255); +COMPILER_STRIP_GATE(0x806A1990, &lit_4255); #pragma pop /* 806A1994-806A1998 000088 0004+00 0/1 0/0 0/0 .rodata @4256 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4256 = 3.0f / 20.0f; -COMPILER_STRIP_GATE(806A1994, &lit_4256); +COMPILER_STRIP_GATE(0x806A1994, &lit_4256); #pragma pop /* 8069BA80-8069BC4C 001080 01CC+00 1/1 0/0 0/0 .text e_db_appear_v__FP10e_db_class */ @@ -1125,42 +1131,42 @@ static asm void e_db_appear_v(e_db_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4356 = 0.75f; -COMPILER_STRIP_GATE(806A1998, &lit_4356); +COMPILER_STRIP_GATE(0x806A1998, &lit_4356); #pragma pop /* 806A199C-806A19A0 000090 0004+00 0/1 0/0 0/0 .rodata @4357 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4357 = 90.0f; -COMPILER_STRIP_GATE(806A199C, &lit_4357); +COMPILER_STRIP_GATE(0x806A199C, &lit_4357); #pragma pop /* 806A19A0-806A19A4 000094 0004+00 0/2 0/0 0/0 .rodata @4358 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4358 = -100.0f; -COMPILER_STRIP_GATE(806A19A0, &lit_4358); +COMPILER_STRIP_GATE(0x806A19A0, &lit_4358); #pragma pop /* 806A19A4-806A19A8 000098 0004+00 0/2 0/0 0/0 .rodata @4359 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4359 = 3.0f / 10.0f; -COMPILER_STRIP_GATE(806A19A4, &lit_4359); +COMPILER_STRIP_GATE(0x806A19A4, &lit_4359); #pragma pop /* 806A19A8-806A19AC 00009C 0004+00 0/1 0/0 0/0 .rodata @4360 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4360 = 700.0f; -COMPILER_STRIP_GATE(806A19A8, &lit_4360); +COMPILER_STRIP_GATE(0x806A19A8, &lit_4360); #pragma pop /* 806A19AC-806A19B4 0000A0 0008+00 1/3 0/0 0/0 .rodata @4362 */ SECTION_RODATA static u8 const lit_4362[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(806A19AC, &lit_4362); +COMPILER_STRIP_GATE(0x806A19AC, &lit_4362); /* 8069BC4C-8069C1AC 00124C 0560+00 1/1 0/0 0/0 .text e_db_wait__FP10e_db_class */ #pragma push @@ -1177,14 +1183,14 @@ static asm void e_db_wait(e_db_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4392 = 70.0f; -COMPILER_STRIP_GATE(806A19B4, &lit_4392); +COMPILER_STRIP_GATE(0x806A19B4, &lit_4392); #pragma pop /* 806A19B8-806A19BC 0000AC 0004+00 0/2 0/0 0/0 .rodata @4393 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4393 = 250.0f; -COMPILER_STRIP_GATE(806A19B8, &lit_4393); +COMPILER_STRIP_GATE(0x806A19B8, &lit_4393); #pragma pop /* 8069C1AC-8069C408 0017AC 025C+00 1/1 0/0 0/0 .text e_db_mk_roof__FP10e_db_class */ @@ -1202,49 +1208,49 @@ static asm void e_db_mk_roof(e_db_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4603 = 350.0f; -COMPILER_STRIP_GATE(806A19BC, &lit_4603); +COMPILER_STRIP_GATE(0x806A19BC, &lit_4603); #pragma pop /* 806A19C0-806A19C4 0000B4 0004+00 0/2 0/0 0/0 .rodata @4604 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4604 = 4.0f / 5.0f; -COMPILER_STRIP_GATE(806A19C0, &lit_4604); +COMPILER_STRIP_GATE(0x806A19C0, &lit_4604); #pragma pop /* 806A19C4-806A19C8 0000B8 0004+00 0/1 0/0 0/0 .rodata @4605 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4605 = 2.0f; -COMPILER_STRIP_GATE(806A19C4, &lit_4605); +COMPILER_STRIP_GATE(0x806A19C4, &lit_4605); #pragma pop /* 806A19C8-806A19CC 0000BC 0004+00 0/2 0/0 0/0 .rodata @4606 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4606 = 2000.0f; -COMPILER_STRIP_GATE(806A19C8, &lit_4606); +COMPILER_STRIP_GATE(0x806A19C8, &lit_4606); #pragma pop /* 806A19CC-806A19D0 0000C0 0004+00 0/1 0/0 0/0 .rodata @4607 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4607 = -70.0f; -COMPILER_STRIP_GATE(806A19CC, &lit_4607); +COMPILER_STRIP_GATE(0x806A19CC, &lit_4607); #pragma pop /* 806A19D0-806A19D4 0000C4 0004+00 0/1 0/0 0/0 .rodata @4608 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4608 = 80.0f; -COMPILER_STRIP_GATE(806A19D0, &lit_4608); +COMPILER_STRIP_GATE(0x806A19D0, &lit_4608); #pragma pop /* 806A19D4-806A19D8 0000C8 0004+00 0/3 0/0 0/0 .rodata @4609 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4609 = 200.0f; -COMPILER_STRIP_GATE(806A19D4, &lit_4609); +COMPILER_STRIP_GATE(0x806A19D4, &lit_4609); #pragma pop /* 8069C408-8069CED8 001A08 0AD0+00 1/1 0/0 0/0 .text e_db_attack__FP10e_db_class */ @@ -1272,14 +1278,14 @@ static asm void e_db_attack_s(e_db_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4723 = 230.0f; -COMPILER_STRIP_GATE(806A19D8, &lit_4723); +COMPILER_STRIP_GATE(0x806A19D8, &lit_4723); #pragma pop /* 806A19DC-806A19E0 0000D0 0004+00 0/5 0/0 0/0 .rodata @4724 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4724 = 3.0f; -COMPILER_STRIP_GATE(806A19DC, &lit_4724); +COMPILER_STRIP_GATE(0x806A19DC, &lit_4724); #pragma pop /* 8069D234-8069D534 002834 0300+00 1/1 0/0 0/0 .text e_db_chance__FP10e_db_class */ @@ -1297,14 +1303,14 @@ static asm void e_db_chance(e_db_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4767 = -50.0f; -COMPILER_STRIP_GATE(806A19E0, &lit_4767); +COMPILER_STRIP_GATE(0x806A19E0, &lit_4767); #pragma pop /* 806A19E4-806A19E8 0000D8 0004+00 0/1 0/0 0/0 .rodata @4768 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4768 = 23.0f / 25.0f; -COMPILER_STRIP_GATE(806A19E4, &lit_4768); +COMPILER_STRIP_GATE(0x806A19E4, &lit_4768); #pragma pop /* 8069D534-8069D770 002B34 023C+00 1/1 0/0 0/0 .text e_db_s_damage__FP10e_db_class */ @@ -1322,21 +1328,21 @@ static asm void e_db_s_damage(e_db_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4848 = -20.0f; -COMPILER_STRIP_GATE(806A19E8, &lit_4848); +COMPILER_STRIP_GATE(0x806A19E8, &lit_4848); #pragma pop /* 806A19EC-806A19F0 0000E0 0004+00 0/1 0/0 0/0 .rodata @4849 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4849 = 450.0f; -COMPILER_STRIP_GATE(806A19EC, &lit_4849); +COMPILER_STRIP_GATE(0x806A19EC, &lit_4849); #pragma pop /* 806A19F0-806A19F4 0000E4 0004+00 0/1 0/0 0/0 .rodata @4850 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4850 = -1.0f / 10.0f; -COMPILER_STRIP_GATE(806A19F0, &lit_4850); +COMPILER_STRIP_GATE(0x806A19F0, &lit_4850); #pragma pop /* 8069D770-8069DB68 002D70 03F8+00 1/1 0/0 0/0 .text e_db_damage__FP10e_db_class */ @@ -1354,14 +1360,14 @@ static asm void e_db_damage(e_db_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4936 = -30.0f; -COMPILER_STRIP_GATE(806A19F4, &lit_4936); +COMPILER_STRIP_GATE(0x806A19F4, &lit_4936); #pragma pop /* 806A19F8-806A19FC 0000EC 0004+00 0/1 0/0 0/0 .rodata @4937 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4937 = -200.0f; -COMPILER_STRIP_GATE(806A19F8, &lit_4937); +COMPILER_STRIP_GATE(0x806A19F8, &lit_4937); #pragma pop /* 8069DB68-8069DEC4 003168 035C+00 1/1 0/0 0/0 .text kuki_control1__FP10e_db_class */ @@ -1387,7 +1393,7 @@ static asm void kuki_control2(e_db_class* param_0) { /* ############################################################################################## */ /* 806A19FC-806A1A00 0000F0 0004+00 1/1 0/0 0/0 .rodata @4992 */ SECTION_RODATA static f32 const lit_4992 = 11.0f; -COMPILER_STRIP_GATE(806A19FC, &lit_4992); +COMPILER_STRIP_GATE(0x806A19FC, &lit_4992); /* 8069E038-8069E114 003638 00DC+00 1/1 0/0 0/0 .text kuki_control3__FP10e_db_class */ #pragma push @@ -1414,7 +1420,7 @@ static asm void kuki_ha_set(e_db_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5085 = -5.0f; -COMPILER_STRIP_GATE(806A1A00, &lit_5085); +COMPILER_STRIP_GATE(0x806A1A00, &lit_5085); #pragma pop /* 8069E200-8069E504 003800 0304+00 1/1 0/0 0/0 .text kuki_control1_e__FP10e_db_class */ @@ -1432,7 +1438,7 @@ static asm void kuki_control1_e(e_db_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5349 = 25.0f; -COMPILER_STRIP_GATE(806A1A04, &lit_5349); +COMPILER_STRIP_GATE(0x806A1A04, &lit_5349); #pragma pop /* 8069E504-8069F360 003B04 0E5C+00 2/1 0/0 0/0 .text e_db_escape__FP10e_db_class */ @@ -1450,77 +1456,77 @@ static asm void e_db_escape(e_db_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5350 = 300.0f; -COMPILER_STRIP_GATE(806A1A08, &lit_5350); +COMPILER_STRIP_GATE(0x806A1A08, &lit_5350); #pragma pop /* 806A1A0C-806A1A10 000100 0004+00 0/0 0/0 0/0 .rodata @5351 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5351 = 7.5f; -COMPILER_STRIP_GATE(806A1A0C, &lit_5351); +COMPILER_STRIP_GATE(0x806A1A0C, &lit_5351); #pragma pop /* 806A1A10-806A1A14 000104 0004+00 0/0 0/0 0/0 .rodata @5352 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5352 = 0.25f; -COMPILER_STRIP_GATE(806A1A10, &lit_5352); +COMPILER_STRIP_GATE(0x806A1A10, &lit_5352); #pragma pop /* 806A1A14-806A1A18 000108 0004+00 0/0 0/0 0/0 .rodata @5353 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5353 = 65536.0f; -COMPILER_STRIP_GATE(806A1A14, &lit_5353); +COMPILER_STRIP_GATE(0x806A1A14, &lit_5353); #pragma pop /* 806A1A18-806A1A1C 00010C 0004+00 0/0 0/0 0/0 .rodata @5354 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5354 = 5000.0f; -COMPILER_STRIP_GATE(806A1A18, &lit_5354); +COMPILER_STRIP_GATE(0x806A1A18, &lit_5354); #pragma pop /* 806A1A1C-806A1A20 000110 0004+00 0/0 0/0 0/0 .rodata @5355 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5355 = -80.0f; -COMPILER_STRIP_GATE(806A1A1C, &lit_5355); +COMPILER_STRIP_GATE(0x806A1A1C, &lit_5355); #pragma pop /* 806A1A20-806A1A24 000114 0004+00 0/1 0/0 0/0 .rodata @5356 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5356 = 35.0f; -COMPILER_STRIP_GATE(806A1A20, &lit_5356); +COMPILER_STRIP_GATE(0x806A1A20, &lit_5356); #pragma pop /* 806A1A24-806A1A28 000118 0004+00 0/1 0/0 0/0 .rodata @5357 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5357 = -7.0f; -COMPILER_STRIP_GATE(806A1A24, &lit_5357); +COMPILER_STRIP_GATE(0x806A1A24, &lit_5357); #pragma pop /* 806A1A28-806A1A2C 00011C 0004+00 0/1 0/0 0/0 .rodata @5358 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5358 = 9.0f / 5.0f; -COMPILER_STRIP_GATE(806A1A28, &lit_5358); +COMPILER_STRIP_GATE(0x806A1A28, &lit_5358); #pragma pop /* 806A1A2C-806A1A30 000120 0004+00 0/1 0/0 0/0 .rodata @5499 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5499 = -40.0f; -COMPILER_STRIP_GATE(806A1A2C, &lit_5499); +COMPILER_STRIP_GATE(0x806A1A2C, &lit_5499); #pragma pop /* 806A1A30-806A1A34 000124 0004+00 0/1 0/0 0/0 .rodata @5500 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5500 = -3.0f / 10.0f; -COMPILER_STRIP_GATE(806A1A30, &lit_5500); +COMPILER_STRIP_GATE(0x806A1A30, &lit_5500); #pragma pop /* 8069F360-8069F978 004960 0618+00 1/1 0/0 0/0 .text e_db_e_dead__FP10e_db_class */ @@ -1558,35 +1564,35 @@ static asm void eff_set(e_db_class* param_0, int param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5644 = -30000.0f; -COMPILER_STRIP_GATE(806A1A34, &lit_5644); +COMPILER_STRIP_GATE(0x806A1A34, &lit_5644); #pragma pop /* 806A1A38-806A1A3C 00012C 0004+00 0/0 0/0 0/0 .rodata @5645 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5645 = 300000.0f; -COMPILER_STRIP_GATE(806A1A38, &lit_5645); +COMPILER_STRIP_GATE(0x806A1A38, &lit_5645); #pragma pop /* 806A1A3C-806A1A40 000130 0004+00 0/0 0/0 0/0 .rodata @5646 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5646 = 30000.0f; -COMPILER_STRIP_GATE(806A1A3C, &lit_5646); +COMPILER_STRIP_GATE(0x806A1A3C, &lit_5646); #pragma pop /* 806A1A40-806A1A44 000134 0004+00 0/1 0/0 0/0 .rodata @5816 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5816 = 22.0f; -COMPILER_STRIP_GATE(806A1A40, &lit_5816); +COMPILER_STRIP_GATE(0x806A1A40, &lit_5816); #pragma pop /* 806A1A44-806A1A48 000138 0004+00 0/1 0/0 0/0 .rodata @5817 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5817 = 21.0f; -COMPILER_STRIP_GATE(806A1A44, &lit_5817); +COMPILER_STRIP_GATE(0x806A1A44, &lit_5817); #pragma pop /* 806A03C4-806A052C 0059C4 0168+00 1/1 0/0 0/0 .text anm_se_set__FP10e_db_class */ @@ -1604,14 +1610,14 @@ static asm void anm_se_set(e_db_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5910 = 10000.0f; -COMPILER_STRIP_GATE(806A1A48, &lit_5910); +COMPILER_STRIP_GATE(0x806A1A48, &lit_5910); #pragma pop /* 806A1A4C-806A1A50 000140 0004+00 0/1 0/0 0/0 .rodata @5911 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5911 = -20000.0f; -COMPILER_STRIP_GATE(806A1A4C, &lit_5911); +COMPILER_STRIP_GATE(0x806A1A4C, &lit_5911); #pragma pop /* 806A052C-806A08F0 005B2C 03C4+00 2/1 0/0 0/0 .text daE_DB_Execute__FP10e_db_class */ @@ -1654,21 +1660,21 @@ static asm void useHeapInit(fopAc_ac_c* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6122 = 500.0f; -COMPILER_STRIP_GATE(806A1A50, &lit_6122); +COMPILER_STRIP_GATE(0x806A1A50, &lit_6122); #pragma pop /* 806A1A54-806A1A58 000148 0004+00 0/1 0/0 0/0 .rodata @6123 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6123 = -300.0f; -COMPILER_STRIP_GATE(806A1A54, &lit_6123); +COMPILER_STRIP_GATE(0x806A1A54, &lit_6123); #pragma pop /* 806A1A58-806A1A5C 00014C 0004+00 0/1 0/0 0/0 .rodata @6124 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6124 = -400.0f; -COMPILER_STRIP_GATE(806A1A58, &lit_6124); +COMPILER_STRIP_GATE(0x806A1A58, &lit_6124); #pragma pop /* 806A1A5C-806A1A64 000150 0004+04 0/1 0/0 0/0 .rodata @6125 */ @@ -1679,7 +1685,7 @@ SECTION_RODATA static f32 const lit_6125[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(806A1A5C, &lit_6125); +COMPILER_STRIP_GATE(0x806A1A5C, &lit_6125); #pragma pop /* 806A1A64-806A1A6C 000158 0008+00 0/1 0/0 0/0 .rodata @6127 */ @@ -1688,7 +1694,7 @@ COMPILER_STRIP_GATE(806A1A5C, &lit_6125); SECTION_RODATA static u8 const lit_6127[8] = { 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(806A1A64, &lit_6127); +COMPILER_STRIP_GATE(0x806A1A64, &lit_6127); #pragma pop /* 806A0B54-806A106C 006154 0518+00 1/0 0/0 0/0 .text daE_DB_Create__FP10fopAc_ac_c */ @@ -1813,7 +1819,7 @@ asm void __sinit_d_a_e_db_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_806A1420 = (void*)__sinit_d_a_e_db_cpp; +REGISTER_CTORS(0x806A1420, __sinit_d_a_e_db_cpp); #pragma pop /* 806A145C-806A1464 006A5C 0008+00 1/0 0/0 0/0 .text @36@__dt__12dBgS_ObjAcchFv */ @@ -1868,9 +1874,4 @@ asm cXyz::~cXyz() { } #pragma pop -/* 806A1A6C-806A1A71 000160 0005+00 5/5 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_806A1A6C = "E_db"; -#pragma pop +/* 806A1A6C-806A1A6C 000160 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/e/d_a_e_db_leaf/d_a_e_db_leaf.cpp b/rel/d/a/e/d_a_e_db_leaf/d_a_e_db_leaf.cpp index 08099575842..cd25b86d353 100644 --- a/rel/d/a/e/d_a_e_db_leaf/d_a_e_db_leaf.cpp +++ b/rel/d/a/e/d_a_e_db_leaf/d_a_e_db_leaf.cpp @@ -124,6 +124,13 @@ static bool daE_DB_LEAF_IsDelete(e_db_leaf_class* param_0) { return true; } +/* ############################################################################################## */ +/* 806A2118-806A2118 000004 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_806A2118 = "E_DB"; +#pragma pop + /* 806A1F2C-806A1F5C 00016C 0030+00 1/0 0/0 0/0 .text daE_DB_LEAF_Delete__FP15e_db_leaf_class */ #pragma push #pragma optimization_level 0 @@ -137,7 +144,7 @@ static asm void daE_DB_LEAF_Delete(e_db_leaf_class* param_0) { /* ############################################################################################## */ /* 806A2114-806A2118 000000 0004+00 1/1 0/0 0/0 .rodata @3699 */ SECTION_RODATA static f32 const lit_3699 = 1.0f; -COMPILER_STRIP_GATE(806A2114, &lit_3699); +COMPILER_STRIP_GATE(0x806A2114, &lit_3699); /* 806A1F5C-806A205C 00019C 0100+00 1/1 0/0 0/0 .text useHeapInit__FP10fopAc_ac_c */ #pragma push @@ -183,9 +190,4 @@ SECTION_DATA extern void* g_profile_E_DB_LEAF[12] = { (void*)0x00040000, (void*)NULL, }; -/* 806A2118-806A211D 000004 0005+00 3/3 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_806A2118 = "E_DB"; -#pragma pop +/* 806A2118-806A2118 000004 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/e/d_a_e_dd/d_a_e_dd.cpp b/rel/d/a/e/d_a_e_dd/d_a_e_dd.cpp index bb1154a1e6e..74ef462526e 100644 --- a/rel/d/a/e/d_a_e_dd/d_a_e_dd.cpp +++ b/rel/d/a/e/d_a_e_dd/d_a_e_dd.cpp @@ -32,16 +32,16 @@ struct mDoExt_baseAnm { /* 8000D428 */ void play(); }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; - struct J3DAnmTransform {}; +struct J3DModelData {}; + +struct Z2Creature {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -96,10 +96,10 @@ struct dRes_control_c { struct dPa_levelEcallBack {}; -struct _GXColor {}; - struct csXyz {}; +struct _GXColor {}; + struct dPa_control_c { struct level_c { /* 8004B918 */ void getEmitter(u32); @@ -463,7 +463,7 @@ extern "C" void __register_global_object(); /* ############################################################################################## */ /* 806A71C4-806A71C8 000000 0004+00 22/22 0/0 0/0 .rodata @3903 */ SECTION_RODATA static f32 const lit_3903 = 100.0f; -COMPILER_STRIP_GATE(806A71C4, &lit_3903); +COMPILER_STRIP_GATE(0x806A71C4, &lit_3903); /* 806A71C8-806A71CC 000004 0004+00 2/20 0/0 0/0 .rodata @3904 */ SECTION_RODATA static u8 const lit_3904[4] = { @@ -472,7 +472,7 @@ SECTION_RODATA static u8 const lit_3904[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(806A71C8, &lit_3904); +COMPILER_STRIP_GATE(0x806A71C8, &lit_3904); /* 806A71CC-806A71D4 000008 0004+04 1/17 0/0 0/0 .rodata @3905 */ SECTION_RODATA static f32 const lit_3905[1 + 1 /* padding */] = { @@ -480,7 +480,7 @@ SECTION_RODATA static f32 const lit_3905[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(806A71CC, &lit_3905); +COMPILER_STRIP_GATE(0x806A71CC, &lit_3905); /* 806A71D4-806A71DC 000010 0008+00 0/4 0/0 0/0 .rodata @3906 */ #pragma push @@ -488,7 +488,7 @@ COMPILER_STRIP_GATE(806A71CC, &lit_3905); SECTION_RODATA static u8 const lit_3906[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(806A71D4, &lit_3906); +COMPILER_STRIP_GATE(0x806A71D4, &lit_3906); #pragma pop /* 806A71DC-806A71E4 000018 0008+00 0/4 0/0 0/0 .rodata @3907 */ @@ -497,7 +497,7 @@ COMPILER_STRIP_GATE(806A71D4, &lit_3906); SECTION_RODATA static u8 const lit_3907[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(806A71DC, &lit_3907); +COMPILER_STRIP_GATE(0x806A71DC, &lit_3907); #pragma pop /* 806A71E4-806A71EC 000020 0008+00 0/4 0/0 0/0 .rodata @3908 */ @@ -506,56 +506,56 @@ COMPILER_STRIP_GATE(806A71DC, &lit_3907); SECTION_RODATA static u8 const lit_3908[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(806A71E4, &lit_3908); +COMPILER_STRIP_GATE(0x806A71E4, &lit_3908); #pragma pop /* 806A71EC-806A71F0 000028 0004+00 0/1 0/0 0/0 .rodata @3909 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3909 = 1.0f / 100.0f; -COMPILER_STRIP_GATE(806A71EC, &lit_3909); +COMPILER_STRIP_GATE(0x806A71EC, &lit_3909); #pragma pop /* 806A71F0-806A71F4 00002C 0004+00 0/1 0/0 0/0 .rodata @3924 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3924 = 4.0f; -COMPILER_STRIP_GATE(806A71F0, &lit_3924); +COMPILER_STRIP_GATE(0x806A71F0, &lit_3924); #pragma pop /* 806A71F4-806A71F8 000030 0004+00 0/6 0/0 0/0 .rodata @3925 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3925 = 10.0f; -COMPILER_STRIP_GATE(806A71F4, &lit_3925); +COMPILER_STRIP_GATE(0x806A71F4, &lit_3925); #pragma pop /* 806A71F8-806A71FC 000034 0004+00 0/1 0/0 0/0 .rodata @3926 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3926 = 800.0f; -COMPILER_STRIP_GATE(806A71F8, &lit_3926); +COMPILER_STRIP_GATE(0x806A71F8, &lit_3926); #pragma pop /* 806A71FC-806A7200 000038 0004+00 0/1 0/0 0/0 .rodata @3927 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3927 = 550.0f; -COMPILER_STRIP_GATE(806A71FC, &lit_3927); +COMPILER_STRIP_GATE(0x806A71FC, &lit_3927); #pragma pop /* 806A7200-806A7204 00003C 0004+00 0/1 0/0 0/0 .rodata @3928 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3928 = 30.0f; -COMPILER_STRIP_GATE(806A7200, &lit_3928); +COMPILER_STRIP_GATE(0x806A7200, &lit_3928); #pragma pop /* 806A7204-806A7208 000040 0004+00 0/2 0/0 0/0 .rodata @3929 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3929 = 1.5f; -COMPILER_STRIP_GATE(806A7204, &lit_3929); +COMPILER_STRIP_GATE(0x806A7204, &lit_3929); #pragma pop /* 806A72C0-806A72CC 000000 000C+00 2/2 0/0 0/0 .data cNullVec__6Z2Calc */ @@ -803,7 +803,13 @@ asm daE_DD_HIO_c::daE_DD_HIO_c() { /* ############################################################################################## */ /* 806A7208-806A720C 000044 0004+00 1/4 0/0 0/0 .rodata @3943 */ SECTION_RODATA static f32 const lit_3943 = -1.0f; -COMPILER_STRIP_GATE(806A7208, &lit_3943); +COMPILER_STRIP_GATE(0x806A7208, &lit_3943); + +/* 806A72B4-806A72B4 0000F0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_806A72B4 = "E_DD"; +#pragma pop /* 806A22CC-806A2378 00014C 00AC+00 10/10 0/0 0/0 .text anm_init__FP10e_dd_classifUcf */ #pragma push @@ -828,13 +834,13 @@ static asm void nodeCallBack(J3DJoint* param_0, int param_1) { /* ############################################################################################## */ /* 806A720C-806A7210 000048 0004+00 2/8 0/0 0/0 .rodata @4029 */ SECTION_RODATA static f32 const lit_4029 = 50.0f; -COMPILER_STRIP_GATE(806A720C, &lit_4029); +COMPILER_STRIP_GATE(0x806A720C, &lit_4029); /* 806A7210-806A7214 00004C 0004+00 0/1 0/0 0/0 .rodata @4030 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4030 = 1200.0f; -COMPILER_STRIP_GATE(806A7210, &lit_4030); +COMPILER_STRIP_GATE(0x806A7210, &lit_4030); #pragma pop /* 806A254C-806A264C 0003CC 0100+00 1/0 0/0 0/0 .text daE_DD_Draw__FP10e_dd_class */ @@ -873,7 +879,7 @@ static asm void pl_check(e_dd_class* param_0, f32 param_1, s16 param_2) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4094 = 300.0f; -COMPILER_STRIP_GATE(806A7214, &lit_4094); +COMPILER_STRIP_GATE(0x806A7214, &lit_4094); #pragma pop /* 806A27A8-806A28A8 000628 0100+00 1/1 0/0 0/0 .text way_gake_check__FP10e_dd_classf */ @@ -911,7 +917,7 @@ static asm void way_bg_check(e_dd_class* param_0, f32 param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4262 = 0.5f; -COMPILER_STRIP_GATE(806A7218, &lit_4262); +COMPILER_STRIP_GATE(0x806A7218, &lit_4262); #pragma pop /* 806A74B8-806A74BC 000008 0004+00 2/2 0/0 0/0 .bss None */ @@ -941,28 +947,28 @@ static asm void path_check(e_dd_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4373 = 200.0f; -COMPILER_STRIP_GATE(806A721C, &lit_4373); +COMPILER_STRIP_GATE(0x806A721C, &lit_4373); #pragma pop /* 806A7220-806A7224 00005C 0004+00 0/2 0/0 0/0 .rodata @4374 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4374 = 15.0f; -COMPILER_STRIP_GATE(806A7220, &lit_4374); +COMPILER_STRIP_GATE(0x806A7220, &lit_4374); #pragma pop /* 806A7224-806A7228 000060 0004+00 0/2 0/0 0/0 .rodata @4375 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4375 = 64.0f; -COMPILER_STRIP_GATE(806A7224, &lit_4375); +COMPILER_STRIP_GATE(0x806A7224, &lit_4375); #pragma pop /* 806A7228-806A722C 000064 0004+00 0/9 0/0 0/0 .rodata @4376 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4376 = 3.0f; -COMPILER_STRIP_GATE(806A7228, &lit_4376); +COMPILER_STRIP_GATE(0x806A7228, &lit_4376); #pragma pop /* 806A2F14-806A34DC 000D94 05C8+00 1/1 0/0 0/0 .text e_dd_wall__FP10e_dd_class */ @@ -980,21 +986,21 @@ static asm void e_dd_wall(e_dd_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4492 = 32768.0f; -COMPILER_STRIP_GATE(806A722C, &lit_4492); +COMPILER_STRIP_GATE(0x806A722C, &lit_4492); #pragma pop /* 806A7230-806A7234 00006C 0004+00 0/3 0/0 0/0 .rodata @4493 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4493 = 10000.0f; -COMPILER_STRIP_GATE(806A7230, &lit_4493); +COMPILER_STRIP_GATE(0x806A7230, &lit_4493); #pragma pop /* 806A7234-806A7238 000070 0004+00 0/1 0/0 0/0 .rodata @4494 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4494 = 400.0f; -COMPILER_STRIP_GATE(806A7234, &lit_4494); +COMPILER_STRIP_GATE(0x806A7234, &lit_4494); #pragma pop /* 806A34DC-806A3AE8 00135C 060C+00 1/1 0/0 0/0 .text e_dd_normal__FP10e_dd_class */ @@ -1012,14 +1018,14 @@ static asm void e_dd_normal(e_dd_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4545 = 12.0f; -COMPILER_STRIP_GATE(806A7238, &lit_4545); +COMPILER_STRIP_GATE(0x806A7238, &lit_4545); #pragma pop /* 806A723C-806A7240 000078 0004+00 0/1 0/0 0/0 .rodata @4546 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4546 = 2.0f; -COMPILER_STRIP_GATE(806A723C, &lit_4546); +COMPILER_STRIP_GATE(0x806A723C, &lit_4546); #pragma pop /* 806A3AE8-806A3D64 001968 027C+00 1/1 0/0 0/0 .text e_dd_run__FP10e_dd_class */ @@ -1037,21 +1043,21 @@ static asm void e_dd_run(e_dd_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4598 = 60.0f; -COMPILER_STRIP_GATE(806A7240, &lit_4598); +COMPILER_STRIP_GATE(0x806A7240, &lit_4598); #pragma pop /* 806A7244-806A7248 000080 0004+00 0/4 0/0 0/0 .rodata @4599 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4599 = 5.0f; -COMPILER_STRIP_GATE(806A7244, &lit_4599); +COMPILER_STRIP_GATE(0x806A7244, &lit_4599); #pragma pop /* 806A7248-806A724C 000084 0004+00 0/2 0/0 0/0 .rodata @4600 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4600 = 40.0f; -COMPILER_STRIP_GATE(806A7248, &lit_4600); +COMPILER_STRIP_GATE(0x806A7248, &lit_4600); #pragma pop /* 806A3D64-806A3F98 001BE4 0234+00 1/1 0/0 0/0 .text s_b_sub__FPvPv */ @@ -1069,14 +1075,14 @@ static asm void s_b_sub(void* param_0, void* param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4668 = 20.0f; -COMPILER_STRIP_GATE(806A724C, &lit_4668); +COMPILER_STRIP_GATE(0x806A724C, &lit_4668); #pragma pop /* 806A7250-806A7254 00008C 0004+00 0/1 0/0 0/0 .rodata @4669 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4669 = 1000.0f; -COMPILER_STRIP_GATE(806A7250, &lit_4669); +COMPILER_STRIP_GATE(0x806A7250, &lit_4669); #pragma pop /* 806A3F98-806A42F0 001E18 0358+00 1/1 0/0 0/0 .text e_dd_attack__FP10e_dd_class */ @@ -1164,77 +1170,77 @@ static asm void action(e_dd_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4996 = -100.0f; -COMPILER_STRIP_GATE(806A7254, &lit_4996); +COMPILER_STRIP_GATE(0x806A7254, &lit_4996); #pragma pop /* 806A7258-806A725C 000094 0004+00 0/0 0/0 0/0 .rodata @4997 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4997 = 162.0f; -COMPILER_STRIP_GATE(806A7258, &lit_4997); +COMPILER_STRIP_GATE(0x806A7258, &lit_4997); #pragma pop /* 806A725C-806A7260 000098 0004+00 0/0 0/0 0/0 .rodata @4998 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4998 = 150.0f; -COMPILER_STRIP_GATE(806A725C, &lit_4998); +COMPILER_STRIP_GATE(0x806A725C, &lit_4998); #pragma pop /* 806A7260-806A7264 00009C 0004+00 0/0 0/0 0/0 .rodata @4999 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4999 = 65536.0f; -COMPILER_STRIP_GATE(806A7260, &lit_4999); +COMPILER_STRIP_GATE(0x806A7260, &lit_4999); #pragma pop /* 806A7264-806A7268 0000A0 0004+00 0/0 0/0 0/0 .rodata @5000 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5000 = 360.0f; -COMPILER_STRIP_GATE(806A7264, &lit_5000); +COMPILER_STRIP_GATE(0x806A7264, &lit_5000); #pragma pop /* 806A7268-806A726C 0000A4 0004+00 0/1 0/0 0/0 .rodata @5265 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5265 = 14.5f; -COMPILER_STRIP_GATE(806A7268, &lit_5265); +COMPILER_STRIP_GATE(0x806A7268, &lit_5265); #pragma pop /* 806A726C-806A7270 0000A8 0004+00 0/1 0/0 0/0 .rodata @5266 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5266 = 21.0f; -COMPILER_STRIP_GATE(806A726C, &lit_5266); +COMPILER_STRIP_GATE(0x806A726C, &lit_5266); #pragma pop /* 806A7270-806A7274 0000AC 0004+00 0/1 0/0 0/0 .rodata @5267 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5267 = 27.0f; -COMPILER_STRIP_GATE(806A7270, &lit_5267); +COMPILER_STRIP_GATE(0x806A7270, &lit_5267); #pragma pop /* 806A7274-806A7278 0000B0 0004+00 0/1 0/0 0/0 .rodata @5268 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5268 = 31.0f; -COMPILER_STRIP_GATE(806A7274, &lit_5268); +COMPILER_STRIP_GATE(0x806A7274, &lit_5268); #pragma pop /* 806A7278-806A727C 0000B4 0004+00 0/1 0/0 0/0 .rodata @5269 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5269 = 9.0f; -COMPILER_STRIP_GATE(806A7278, &lit_5269); +COMPILER_STRIP_GATE(0x806A7278, &lit_5269); #pragma pop /* 806A727C-806A7280 0000B8 0004+00 0/1 0/0 0/0 .rodata @5270 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5270 = 44.0f; -COMPILER_STRIP_GATE(806A727C, &lit_5270); +COMPILER_STRIP_GATE(0x806A727C, &lit_5270); #pragma pop /* 806A52CC-806A5A6C 00314C 07A0+00 1/1 0/0 0/0 .text anm_se_set__FP10e_dd_class */ @@ -1252,56 +1258,56 @@ static asm void anm_se_set(e_dd_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5457 = 57.0f; -COMPILER_STRIP_GATE(806A7280, &lit_5457); +COMPILER_STRIP_GATE(0x806A7280, &lit_5457); #pragma pop /* 806A7284-806A7288 0000C0 0004+00 0/1 0/0 0/0 .rodata @5458 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5458 = 46.0f; -COMPILER_STRIP_GATE(806A7284, &lit_5458); +COMPILER_STRIP_GATE(0x806A7284, &lit_5458); #pragma pop /* 806A7288-806A728C 0000C4 0004+00 0/1 0/0 0/0 .rodata @5459 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5459 = -40.0f; -COMPILER_STRIP_GATE(806A7288, &lit_5459); +COMPILER_STRIP_GATE(0x806A7288, &lit_5459); #pragma pop /* 806A728C-806A7290 0000C8 0004+00 0/1 0/0 0/0 .rodata @5460 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5460 = -25.0f; -COMPILER_STRIP_GATE(806A728C, &lit_5460); +COMPILER_STRIP_GATE(0x806A728C, &lit_5460); #pragma pop /* 806A7290-806A7294 0000CC 0004+00 0/1 0/0 0/0 .rodata @5461 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5461 = 75.0f; -COMPILER_STRIP_GATE(806A7290, &lit_5461); +COMPILER_STRIP_GATE(0x806A7290, &lit_5461); #pragma pop /* 806A7294-806A7298 0000D0 0004+00 0/1 0/0 0/0 .rodata @5462 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5462 = 250.0f; -COMPILER_STRIP_GATE(806A7294, &lit_5462); +COMPILER_STRIP_GATE(0x806A7294, &lit_5462); #pragma pop /* 806A7298-806A729C 0000D4 0004+00 0/1 0/0 0/0 .rodata @5463 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5463 = 70.0f; -COMPILER_STRIP_GATE(806A7298, &lit_5463); +COMPILER_STRIP_GATE(0x806A7298, &lit_5463); #pragma pop /* 806A729C-806A72A0 0000D8 0004+00 0/1 0/0 0/0 .rodata @5464 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5464 = 350.0f; -COMPILER_STRIP_GATE(806A729C, &lit_5464); +COMPILER_STRIP_GATE(0x806A729C, &lit_5464); #pragma pop /* 806A5A6C-806A60E0 0038EC 0674+00 2/1 0/0 0/0 .text daE_DD_Execute__FP10e_dd_class */ @@ -1319,6 +1325,13 @@ static bool daE_DD_IsDelete(e_dd_class* param_0) { return true; } +/* ############################################################################################## */ +/* 806A72B4-806A72B4 0000F0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_806A72B9 = "E_dd"; +#pragma pop + /* 806A60E8-806A6154 003F68 006C+00 1/0 0/0 0/0 .text daE_DD_Delete__FP10e_dd_class */ #pragma push #pragma optimization_level 0 @@ -1354,7 +1367,7 @@ asm J3DFrameCtrl::~J3DFrameCtrl() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5623 = -400.0f; -COMPILER_STRIP_GATE(806A72A0, &lit_5623); +COMPILER_STRIP_GATE(0x806A72A0, &lit_5623); #pragma pop /* 806A6400-806A65C4 004280 01C4+00 1/1 0/0 0/0 .text kabe_initial_pos_set__FP10e_dd_class */ @@ -1372,28 +1385,28 @@ static asm void kabe_initial_pos_set(e_dd_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5769 = -500.0f; -COMPILER_STRIP_GATE(806A72A4, &lit_5769); +COMPILER_STRIP_GATE(0x806A72A4, &lit_5769); #pragma pop /* 806A72A8-806A72AC 0000E4 0004+00 0/1 0/0 0/0 .rodata @5770 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5770 = -200.0f; -COMPILER_STRIP_GATE(806A72A8, &lit_5770); +COMPILER_STRIP_GATE(0x806A72A8, &lit_5770); #pragma pop /* 806A72AC-806A72B0 0000E8 0004+00 0/1 0/0 0/0 .rodata @5771 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5771 = 500.0f; -COMPILER_STRIP_GATE(806A72AC, &lit_5771); +COMPILER_STRIP_GATE(0x806A72AC, &lit_5771); #pragma pop /* 806A72B0-806A72B4 0000EC 0004+00 0/1 0/0 0/0 .rodata @5772 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5772 = 65535.0f; -COMPILER_STRIP_GATE(806A72B0, &lit_5772); +COMPILER_STRIP_GATE(0x806A72B0, &lit_5772); #pragma pop /* 806A65C4-806A69A4 004444 03E0+00 1/0 0/0 0/0 .text daE_DD_Create__FP10fopAc_ac_c */ @@ -1508,7 +1521,7 @@ asm void __sinit_d_a_e_dd_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_806A6D50 = (void*)__sinit_d_a_e_dd_cpp; +REGISTER_CTORS(0x806A6D50, __sinit_d_a_e_dd_cpp); #pragma pop /* 806A6D8C-806A6D94 004C0C 0008+00 1/0 0/0 0/0 .text @36@__dt__12dBgS_ObjAcchFv */ @@ -1543,10 +1556,4 @@ static asm void setMidnaBindEffect(fopEn_enemy_c* param_0, Z2CreatureEnemy* para } #pragma pop -/* 806A72B4-806A72BE 0000F0 000A+00 4/4 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_806A72B4 = "E_DD"; -SECTION_DEAD static char const* const stringBase_806A72B9 = "E_dd"; -#pragma pop +/* 806A72B4-806A72B4 0000F0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/e/d_a_e_df/d_a_e_df.cpp b/rel/d/a/e/d_a_e_df/d_a_e_df.cpp index 5a0b9dfc179..ae290610120 100644 --- a/rel/d/a/e/d_a_e_df/d_a_e_df.cpp +++ b/rel/d/a/e/d_a_e_df/d_a_e_df.cpp @@ -28,16 +28,16 @@ struct mDoMtx_stack_c { static u8 now[48]; }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; - struct J3DAnmTransform {}; +struct J3DModelData {}; + +struct Z2Creature {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -65,10 +65,10 @@ struct daPy_py_c { static u8 m_midnaActor[4]; }; -struct J3DJoint {}; - struct J3DModel {}; +struct J3DJoint {}; + struct daE_DF_c { /* 806A7710 */ void CreateHeap(); /* 806A7828 */ void initCcCylinder(); @@ -391,7 +391,7 @@ extern "C" void __register_global_object(); /* ############################################################################################## */ /* 806A9F30-806A9F34 000000 0004+00 11/11 0/0 0/0 .rodata @3916 */ SECTION_RODATA static f32 const lit_3916 = 100.0f; -COMPILER_STRIP_GATE(806A9F30, &lit_3916); +COMPILER_STRIP_GATE(0x806A9F30, &lit_3916); /* 806A9F34-806A9F38 000004 0004+00 2/12 0/0 0/0 .rodata @3917 */ SECTION_RODATA static u8 const lit_3917[4] = { @@ -400,7 +400,7 @@ SECTION_RODATA static u8 const lit_3917[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(806A9F34, &lit_3917); +COMPILER_STRIP_GATE(0x806A9F34, &lit_3917); /* 806AA004-806AA010 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { @@ -526,7 +526,13 @@ SECTION_RODATA static f32 const lit_3918[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(806A9F38, &lit_3918); +COMPILER_STRIP_GATE(0x806A9F38, &lit_3918); + +/* 806A9FFC-806A9FFC 0000CC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_806A9FFC = "E_DF"; +#pragma pop /* 806A7710-806A7808 000110 00F8+00 1/1 0/0 0/0 .text CreateHeap__8daE_DF_cFv */ #pragma push @@ -555,7 +561,7 @@ static asm void useHeapInit(fopAc_ac_c* param_0) { SECTION_RODATA static u8 const lit_3919[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(806A9F40, &lit_3919); +COMPILER_STRIP_GATE(0x806A9F40, &lit_3919); #pragma pop /* 806A9F48-806A9F50 000018 0008+00 0/3 0/0 0/0 .rodata @3920 */ @@ -564,7 +570,7 @@ COMPILER_STRIP_GATE(806A9F40, &lit_3919); SECTION_RODATA static u8 const lit_3920[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(806A9F48, &lit_3920); +COMPILER_STRIP_GATE(0x806A9F48, &lit_3920); #pragma pop /* 806A9F50-806A9F58 000020 0008+00 0/3 0/0 0/0 .rodata @3921 */ @@ -573,14 +579,14 @@ COMPILER_STRIP_GATE(806A9F48, &lit_3920); SECTION_RODATA static u8 const lit_3921[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(806A9F50, &lit_3921); +COMPILER_STRIP_GATE(0x806A9F50, &lit_3921); #pragma pop /* 806A9F58-806A9F5C 000028 0004+00 0/1 0/0 0/0 .rodata @3922 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3922 = 1.0f / 100.0f; -COMPILER_STRIP_GATE(806A9F58, &lit_3922); +COMPILER_STRIP_GATE(0x806A9F58, &lit_3922); #pragma pop /* 806A9F5C-806A9FA0 00002C 0044+00 1/1 0/0 0/0 .rodata ccCylSrc$3961 */ @@ -591,7 +597,7 @@ SECTION_RODATA static u8 const ccCylSrc[68] = { 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x43, 0x16, 0x00, 0x00, 0x43, 0x1E, 0x00, 0x00, }; -COMPILER_STRIP_GATE(806A9F5C, &ccCylSrc); +COMPILER_STRIP_GATE(0x806A9F5C, &ccCylSrc); /* 806A7828-806A78A0 000228 0078+00 1/1 0/0 0/0 .text initCcCylinder__8daE_DF_cFv */ #pragma push @@ -616,7 +622,7 @@ asm void daE_DF_c::setCcCylinder() { /* ############################################################################################## */ /* 806A9FA0-806A9FA4 000070 0004+00 1/1 0/0 0/0 .rodata @3977 */ SECTION_RODATA static f32 const lit_3977 = -1.0f; -COMPILER_STRIP_GATE(806A9FA0, &lit_3977); +COMPILER_STRIP_GATE(0x806A9FA0, &lit_3977); /* 806A78D4-806A7980 0002D4 00AC+00 6/6 0/0 0/0 .text SetAnm__8daE_DF_cFiiff */ #pragma push @@ -633,12 +639,12 @@ asm void daE_DF_c::SetAnm(int param_0, int param_1, f32 param_2, f32 param_3) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4024 = 600.0f; -COMPILER_STRIP_GATE(806A9FA4, &lit_4024); +COMPILER_STRIP_GATE(0x806A9FA4, &lit_4024); #pragma pop /* 806A9FA8-806A9FAC 000078 0004+00 1/5 0/0 0/0 .rodata @4025 */ SECTION_RODATA static f32 const lit_4025 = 400.0f; -COMPILER_STRIP_GATE(806A9FA8, &lit_4025); +COMPILER_STRIP_GATE(0x806A9FA8, &lit_4025); /* 806A7980-806A7B40 000380 01C0+00 2/2 0/0 0/0 .text CameraSet__8daE_DF_cFf */ #pragma push @@ -673,13 +679,13 @@ asm void daE_DF_c::SetReleaseCam() { /* ############################################################################################## */ /* 806A9FAC-806A9FB0 00007C 0004+00 1/1 0/0 0/0 .rodata @4096 */ SECTION_RODATA static f32 const lit_4096 = 4.0f / 5.0f; -COMPILER_STRIP_GATE(806A9FAC, &lit_4096); +COMPILER_STRIP_GATE(0x806A9FAC, &lit_4096); /* 806A9FB0-806A9FB8 000080 0008+00 2/2 0/0 0/0 .rodata @4098 */ SECTION_RODATA static u8 const lit_4098[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(806A9FB0, &lit_4098); +COMPILER_STRIP_GATE(0x806A9FB0, &lit_4098); /* 806A7CE0-806A7E30 0006E0 0150+00 1/1 0/0 0/0 .text ctrlJoint__8daE_DF_cFP8J3DJointP8J3DModel */ #pragma push @@ -706,28 +712,28 @@ static asm void JointCallBack(J3DJoint* param_0, int param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4163 = 300.0f; -COMPILER_STRIP_GATE(806A9FB8, &lit_4163); +COMPILER_STRIP_GATE(0x806A9FB8, &lit_4163); #pragma pop /* 806A9FBC-806A9FC0 00008C 0004+00 0/1 0/0 0/0 .rodata @4164 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4164 = -10.0f; -COMPILER_STRIP_GATE(806A9FBC, &lit_4164); +COMPILER_STRIP_GATE(0x806A9FBC, &lit_4164); #pragma pop /* 806A9FC0-806A9FC4 000090 0004+00 0/1 0/0 0/0 .rodata @4165 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4165 = 170.0f; -COMPILER_STRIP_GATE(806A9FC0, &lit_4165); +COMPILER_STRIP_GATE(0x806A9FC0, &lit_4165); #pragma pop /* 806A9FC4-806A9FC8 000094 0004+00 0/1 0/0 0/0 .rodata @4166 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4166 = 320.0f; -COMPILER_STRIP_GATE(806A9FC4, &lit_4166); +COMPILER_STRIP_GATE(0x806A9FC4, &lit_4166); #pragma pop /* 806A7E7C-806A8030 00087C 01B4+00 1/1 0/0 0/0 .text s_obj_sub__FPvPv */ @@ -773,7 +779,7 @@ asm void daE_DF_c::Obj_Damage() { /* ############################################################################################## */ /* 806A9FC8-806A9FCC 000098 0004+00 1/6 0/0 0/0 .rodata @4238 */ SECTION_RODATA static f32 const lit_4238 = 5.0f; -COMPILER_STRIP_GATE(806A9FC8, &lit_4238); +COMPILER_STRIP_GATE(0x806A9FC8, &lit_4238); /* 806A8244-806A8368 000C44 0124+00 1/1 0/0 0/0 .text DamageAction__8daE_DF_cFv */ #pragma push @@ -800,35 +806,35 @@ asm void daE_DF_c::BombEatAction() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4370 = 24.0f; -COMPILER_STRIP_GATE(806A9FCC, &lit_4370); +COMPILER_STRIP_GATE(0x806A9FCC, &lit_4370); #pragma pop /* 806A9FD0-806A9FD4 0000A0 0004+00 0/1 0/0 0/0 .rodata @4371 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4371 = 25.0f; -COMPILER_STRIP_GATE(806A9FD0, &lit_4371); +COMPILER_STRIP_GATE(0x806A9FD0, &lit_4371); #pragma pop /* 806A9FD4-806A9FD8 0000A4 0004+00 0/1 0/0 0/0 .rodata @4372 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4372 = 60.0f; -COMPILER_STRIP_GATE(806A9FD4, &lit_4372); +COMPILER_STRIP_GATE(0x806A9FD4, &lit_4372); #pragma pop /* 806A9FD8-806A9FDC 0000A8 0004+00 0/1 0/0 0/0 .rodata @4373 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4373 = 2.0f; -COMPILER_STRIP_GATE(806A9FD8, &lit_4373); +COMPILER_STRIP_GATE(0x806A9FD8, &lit_4373); #pragma pop /* 806A9FDC-806A9FE0 0000AC 0004+00 0/1 0/0 0/0 .rodata @4374 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4374 = 15.0f; -COMPILER_STRIP_GATE(806A9FDC, &lit_4374); +COMPILER_STRIP_GATE(0x806A9FDC, &lit_4374); #pragma pop /* 806A8790-806A8938 001190 01A8+00 1/1 0/0 0/0 .text Spid_Out__8daE_DF_cFv */ @@ -846,14 +852,14 @@ asm void daE_DF_c::Spid_Out() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4444 = 4000.0f; -COMPILER_STRIP_GATE(806A9FE0, &lit_4444); +COMPILER_STRIP_GATE(0x806A9FE0, &lit_4444); #pragma pop /* 806A9FE4-806A9FE8 0000B4 0004+00 0/1 0/0 0/0 .rodata @4445 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4445 = 10.0f; -COMPILER_STRIP_GATE(806A9FE4, &lit_4445); +COMPILER_STRIP_GATE(0x806A9FE4, &lit_4445); #pragma pop /* 806A8938-806A8C80 001338 0348+00 1/1 0/0 0/0 .text LinkEatAction__8daE_DF_cFv */ @@ -901,7 +907,7 @@ asm void daE_DF_c::EatAction() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4566 = 200.0f; -COMPILER_STRIP_GATE(806A9FE8, &lit_4566); +COMPILER_STRIP_GATE(0x806A9FE8, &lit_4566); #pragma pop /* 806A8F2C-806A91B4 00192C 0288+00 1/1 0/0 0/0 .text SearchAction__8daE_DF_cFv */ @@ -947,11 +953,11 @@ asm void daE_DF_c::Action() { /* ############################################################################################## */ /* 806A9FEC-806A9FF0 0000BC 0004+00 1/1 0/0 0/0 .rodata @4621 */ SECTION_RODATA static f32 const lit_4621 = 1.5f; -COMPILER_STRIP_GATE(806A9FEC, &lit_4621); +COMPILER_STRIP_GATE(0x806A9FEC, &lit_4621); /* 806A9FF0-806A9FF4 0000C0 0004+00 1/1 0/0 0/0 .rodata @4622 */ SECTION_RODATA static f32 const lit_4622 = 38.0f; -COMPILER_STRIP_GATE(806A9FF0, &lit_4622); +COMPILER_STRIP_GATE(0x806A9FF0, &lit_4622); /* 806A9384-806A949C 001D84 0118+00 1/1 0/0 0/0 .text Execute__8daE_DF_cFv */ #pragma push @@ -966,7 +972,7 @@ asm void daE_DF_c::Execute() { /* ############################################################################################## */ /* 806A9FF4-806A9FF8 0000C4 0004+00 1/1 0/0 0/0 .rodata @4627 */ SECTION_RODATA static f32 const lit_4627 = 80.0f; -COMPILER_STRIP_GATE(806A9FF4, &lit_4627); +COMPILER_STRIP_GATE(0x806A9FF4, &lit_4627); /* 806A949C-806A94E0 001E9C 0044+00 1/1 0/0 0/0 .text Yazirushi__8daE_DF_cFv */ #pragma push @@ -1052,7 +1058,7 @@ static asm void daE_DF_Delete(daE_DF_c* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4811 = -200.0f; -COMPILER_STRIP_GATE(806A9FF8, &lit_4811); +COMPILER_STRIP_GATE(0x806A9FF8, &lit_4811); #pragma pop /* 806AA0D4-806AA0E0 00000C 000C+00 1/1 0/0 0/0 .bss @3932 */ @@ -1143,7 +1149,7 @@ asm void __sinit_d_a_e_df_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_806A9ACC = (void*)__sinit_d_a_e_df_cpp; +REGISTER_CTORS(0x806A9ACC, __sinit_d_a_e_df_cpp); #pragma pop /* 806A9B08-806A9F1C 002508 0414+00 1/1 0/0 0/0 .text @@ -1158,9 +1164,4 @@ static asm void setMidnaBindEffect(fopEn_enemy_c* param_0, Z2CreatureEnemy* para } #pragma pop -/* 806A9FFC-806AA001 0000CC 0005+00 4/4 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_806A9FFC = "E_DF"; -#pragma pop +/* 806A9FFC-806A9FFC 0000CC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/e/d_a_e_dk/d_a_e_dk.cpp b/rel/d/a/e/d_a_e_dk/d_a_e_dk.cpp index 776cb68bb5d..7c3fbde1835 100644 --- a/rel/d/a/e/d_a_e_dk/d_a_e_dk.cpp +++ b/rel/d/a/e/d_a_e_dk/d_a_e_dk.cpp @@ -45,16 +45,16 @@ struct mDoExt_baseAnm { /* 8000D428 */ void play(); }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; - struct J3DAnmTransform {}; +struct J3DModelData {}; + +struct Z2Creature {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -69,14 +69,14 @@ struct fopAc_ac_c { /* 80018B64 */ fopAc_ac_c(); }; -struct cBgD_Vtx_t {}; - -struct cM3dGPla {}; - struct dBgS_SphChk { /* 80078A14 */ dBgS_SphChk(); }; +struct cM3dGPla {}; + +struct cBgD_Vtx_t {}; + struct daE_DK_c { /* 806AA228 */ void draw(); /* 806AA5C8 */ void setBck(int, u8, f32, f32); @@ -462,20 +462,20 @@ extern "C" void __register_global_object(); /* ############################################################################################## */ /* 806AD538-806AD53C 000000 0004+00 17/17 0/0 0/0 .rodata @3764 */ SECTION_RODATA static f32 const lit_3764 = 2.0f; -COMPILER_STRIP_GATE(806AD538, &lit_3764); +COMPILER_STRIP_GATE(0x806AD538, &lit_3764); /* 806AD53C-806AD540 000004 0004+00 0/2 0/0 0/0 .rodata @3765 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3765 = 700.0f; -COMPILER_STRIP_GATE(806AD53C, &lit_3765); +COMPILER_STRIP_GATE(0x806AD53C, &lit_3765); #pragma pop /* 806AD540-806AD544 000008 0004+00 0/3 0/0 0/0 .rodata @3766 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3766 = 1000.0f; -COMPILER_STRIP_GATE(806AD540, &lit_3766); +COMPILER_STRIP_GATE(0x806AD540, &lit_3766); #pragma pop /* 806AD634-806AD640 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ @@ -644,7 +644,7 @@ asm daE_DK_HIO_c::daE_DK_HIO_c() { SECTION_RODATA static u8 const data_806AD544[8] = { 0x00, 0x00, 0x00, 0x17, 0x00, 0x00, 0x00, 0x16, }; -COMPILER_STRIP_GATE(806AD544, &data_806AD544); +COMPILER_STRIP_GATE(0x806AD544, &data_806AD544); #pragma pop /* 806AD54C-806AD554 000014 0008+00 0/1 0/0 0/0 .rodata dk_btk_name__22@unnamed@d_a_e_dk_cpp@ */ @@ -653,14 +653,14 @@ COMPILER_STRIP_GATE(806AD544, &data_806AD544); SECTION_RODATA static u8 const data_806AD54C[8] = { 0x00, 0x00, 0x00, 0x1B, 0x00, 0x00, 0x00, 0x1A, }; -COMPILER_STRIP_GATE(806AD54C, &data_806AD54C); +COMPILER_STRIP_GATE(0x806AD54C, &data_806AD54C); #pragma pop /* 806AD554-806AD558 00001C 0004+00 0/9 0/0 0/0 .rodata @3872 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3872 = 100.0f; -COMPILER_STRIP_GATE(806AD554, &lit_3872); +COMPILER_STRIP_GATE(0x806AD554, &lit_3872); #pragma pop /* 806AD558-806AD55C 000020 0004+00 3/14 0/0 0/0 .rodata @3873 */ @@ -670,11 +670,11 @@ SECTION_RODATA static u8 const lit_3873[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(806AD558, &lit_3873); +COMPILER_STRIP_GATE(0x806AD558, &lit_3873); /* 806AD55C-806AD560 000024 0004+00 2/10 0/0 0/0 .rodata @3874 */ SECTION_RODATA static f32 const lit_3874 = 1.0f; -COMPILER_STRIP_GATE(806AD55C, &lit_3874); +COMPILER_STRIP_GATE(0x806AD55C, &lit_3874); /* 806AA228-806AA5A8 000128 0380+00 1/1 0/0 0/0 .text draw__8daE_DK_cFv */ #pragma push @@ -703,7 +703,13 @@ SECTION_RODATA static f32 const lit_3893[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(806AD560, &lit_3893); +COMPILER_STRIP_GATE(0x806AD560, &lit_3893); + +/* 806AD628-806AD628 0000F0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_806AD628 = "E_DK"; +#pragma pop /* 806AA5C8-806AA68C 0004C8 00C4+00 5/5 0/0 0/0 .text setBck__8daE_DK_cFiUcff */ #pragma push @@ -752,7 +758,7 @@ asm void daE_DK_c::damage_check() { SECTION_RODATA static u8 const lit_3993[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(806AD568, &lit_3993); +COMPILER_STRIP_GATE(0x806AD568, &lit_3993); #pragma pop /* 806AD570-806AD578 000038 0008+00 0/3 0/0 0/0 .rodata @3994 */ @@ -761,7 +767,7 @@ COMPILER_STRIP_GATE(806AD568, &lit_3993); SECTION_RODATA static u8 const lit_3994[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(806AD570, &lit_3994); +COMPILER_STRIP_GATE(0x806AD570, &lit_3994); #pragma pop /* 806AD578-806AD580 000040 0008+00 0/3 0/0 0/0 .rodata @3995 */ @@ -770,7 +776,7 @@ COMPILER_STRIP_GATE(806AD570, &lit_3994); SECTION_RODATA static u8 const lit_3995[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(806AD578, &lit_3995); +COMPILER_STRIP_GATE(0x806AD578, &lit_3995); #pragma pop /* 806AD7F8-806AD7FC 000008 0004+00 2/2 0/0 0/0 .bss None */ @@ -797,28 +803,28 @@ asm void daE_DK_c::checkPlayerSearch() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4018 = 8.0f; -COMPILER_STRIP_GATE(806AD580, &lit_4018); +COMPILER_STRIP_GATE(0x806AD580, &lit_4018); #pragma pop /* 806AD584-806AD588 00004C 0004+00 0/3 0/0 0/0 .rodata @4019 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4019 = 30.0f; -COMPILER_STRIP_GATE(806AD584, &lit_4019); +COMPILER_STRIP_GATE(0x806AD584, &lit_4019); #pragma pop /* 806AD588-806AD58C 000050 0004+00 0/4 0/0 0/0 .rodata @4020 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4020 = 60.0f; -COMPILER_STRIP_GATE(806AD588, &lit_4020); +COMPILER_STRIP_GATE(0x806AD588, &lit_4020); #pragma pop /* 806AD58C-806AD590 000054 0004+00 0/1 0/0 0/0 .rodata @4021 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4021 = 400.0f; -COMPILER_STRIP_GATE(806AD58C, &lit_4021); +COMPILER_STRIP_GATE(0x806AD58C, &lit_4021); #pragma pop /* 806AAB18-806AAC24 000A18 010C+00 2/2 0/0 0/0 .text checkPlayerAttack__8daE_DK_cFf */ @@ -836,14 +842,14 @@ asm void daE_DK_c::checkPlayerAttack(f32 param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4043 = -1000000000.0f; -COMPILER_STRIP_GATE(806AD590, &lit_4043); +COMPILER_STRIP_GATE(0x806AD590, &lit_4043); #pragma pop /* 806AD594-806AD598 00005C 0004+00 0/1 0/0 0/0 .rodata @4044 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4044 = 350.0f; -COMPILER_STRIP_GATE(806AD594, &lit_4044); +COMPILER_STRIP_GATE(0x806AD594, &lit_4044); #pragma pop /* 806AAC24-806AAD68 000B24 0144+00 1/1 0/0 0/0 .text checkWaterHeight__8daE_DK_cFv */ @@ -861,12 +867,12 @@ asm void daE_DK_c::checkWaterHeight() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4061 = 3.0f; -COMPILER_STRIP_GATE(806AD598, &lit_4061); +COMPILER_STRIP_GATE(0x806AD598, &lit_4061); #pragma pop /* 806AD59C-806AD5A0 000064 0004+00 1/5 0/0 0/0 .rodata @4062 */ SECTION_RODATA static f32 const lit_4062 = 150.0f; -COMPILER_STRIP_GATE(806AD59C, &lit_4062); +COMPILER_STRIP_GATE(0x806AD59C, &lit_4062); /* 806AAD68-806AAE10 000C68 00A8+00 1/1 0/0 0/0 .text * SphBgcCallBack__8daE_DK_cFP11dBgS_SphChkP10cBgD_Vtx_tiiiP8cM3dGPlaPv */ @@ -885,14 +891,14 @@ asm void daE_DK_c::SphBgcCallBack(dBgS_SphChk* param_0, cBgD_Vtx_t* param_1, int #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4125 = 32768.0f; -COMPILER_STRIP_GATE(806AD5A0, &lit_4125); +COMPILER_STRIP_GATE(0x806AD5A0, &lit_4125); #pragma pop /* 806AD5A4-806AD5A8 00006C 0004+00 0/1 0/0 0/0 .rodata @4126 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4126 = 0x3BB400B4; -COMPILER_STRIP_GATE(806AD5A4, &lit_4126); +COMPILER_STRIP_GATE(0x806AD5A4, &lit_4126); #pragma pop /* 806AD5A8-806AD5B0 000070 0008+00 0/1 0/0 0/0 .rodata @4131 */ @@ -901,7 +907,7 @@ COMPILER_STRIP_GATE(806AD5A4, &lit_4126); SECTION_RODATA static u8 const lit_4131[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(806AD5A8, &lit_4131); +COMPILER_STRIP_GATE(0x806AD5A8, &lit_4131); #pragma pop /* 806AAE10-806AB054 000D10 0244+00 1/1 0/0 0/0 .text setElectricEffect__8daE_DK_cFv */ @@ -939,70 +945,70 @@ asm void daE_DK_c::setBodyDeadEffect() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4327 = 80.0f; -COMPILER_STRIP_GATE(806AD5B0, &lit_4327); +COMPILER_STRIP_GATE(0x806AD5B0, &lit_4327); #pragma pop /* 806AD5B4-806AD5B8 00007C 0004+00 0/3 0/0 0/0 .rodata @4328 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4328 = 70.0f; -COMPILER_STRIP_GATE(806AD5B4, &lit_4328); +COMPILER_STRIP_GATE(0x806AD5B4, &lit_4328); #pragma pop /* 806AD5B8-806AD5BC 000080 0004+00 0/3 0/0 0/0 .rodata @4329 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4329 = 5.0f; -COMPILER_STRIP_GATE(806AD5B8, &lit_4329); +COMPILER_STRIP_GATE(0x806AD5B8, &lit_4329); #pragma pop /* 806AD5BC-806AD5C0 000084 0004+00 0/2 0/0 0/0 .rodata @4330 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4330 = 4.0f; -COMPILER_STRIP_GATE(806AD5BC, &lit_4330); +COMPILER_STRIP_GATE(0x806AD5BC, &lit_4330); #pragma pop /* 806AD5C0-806AD5C4 000088 0004+00 0/3 0/0 0/0 .rodata @4331 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4331 = 6.0f; -COMPILER_STRIP_GATE(806AD5C0, &lit_4331); +COMPILER_STRIP_GATE(0x806AD5C0, &lit_4331); #pragma pop /* 806AD5C4-806AD5C8 00008C 0004+00 0/3 0/0 0/0 .rodata @4332 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4332 = 200.0f; -COMPILER_STRIP_GATE(806AD5C4, &lit_4332); +COMPILER_STRIP_GATE(0x806AD5C4, &lit_4332); #pragma pop /* 806AD5C8-806AD5CC 000090 0004+00 0/2 0/0 0/0 .rodata @4333 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4333 = 9.0f; -COMPILER_STRIP_GATE(806AD5C8, &lit_4333); +COMPILER_STRIP_GATE(0x806AD5C8, &lit_4333); #pragma pop /* 806AD5CC-806AD5D0 000094 0004+00 0/6 0/0 0/0 .rodata @4334 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4334 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(806AD5CC, &lit_4334); +COMPILER_STRIP_GATE(0x806AD5CC, &lit_4334); #pragma pop /* 806AD5D0-806AD5D4 000098 0004+00 0/2 0/0 0/0 .rodata @4335 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4335 = -5.0f; -COMPILER_STRIP_GATE(806AD5D0, &lit_4335); +COMPILER_STRIP_GATE(0x806AD5D0, &lit_4335); #pragma pop /* 806AD5D4-806AD5D8 00009C 0004+00 0/2 0/0 0/0 .rodata @4336 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4336 = 3.0f / 10.0f; -COMPILER_STRIP_GATE(806AD5D4, &lit_4336); +COMPILER_STRIP_GATE(0x806AD5D4, &lit_4336); #pragma pop /* 806AB29C-806AB684 00119C 03E8+00 1/1 0/0 0/0 .text executeWait__8daE_DK_cFv */ @@ -1020,7 +1026,7 @@ asm void daE_DK_c::executeWait() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4437 = 50.0f; -COMPILER_STRIP_GATE(806AD5D8, &lit_4437); +COMPILER_STRIP_GATE(0x806AD5D8, &lit_4437); #pragma pop /* 806AB684-806ABA78 001584 03F4+00 1/1 0/0 0/0 .text executeChase__8daE_DK_cFv */ @@ -1038,14 +1044,14 @@ asm void daE_DK_c::executeChase() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4478 = 14.0f; -COMPILER_STRIP_GATE(806AD5DC, &lit_4478); +COMPILER_STRIP_GATE(0x806AD5DC, &lit_4478); #pragma pop /* 806AD5E0-806AD5E4 0000A8 0004+00 0/1 0/0 0/0 .rodata @4479 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4479 = -3.0f; -COMPILER_STRIP_GATE(806AD5E0, &lit_4479); +COMPILER_STRIP_GATE(0x806AD5E0, &lit_4479); #pragma pop /* 806ABA78-806ABCC8 001978 0250+00 1/1 0/0 0/0 .text executeAttack__8daE_DK_cFv */ @@ -1073,7 +1079,7 @@ asm void daE_DK_c::executeDamage() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4524 = -2.0f; -COMPILER_STRIP_GATE(806AD5E4, &lit_4524); +COMPILER_STRIP_GATE(0x806AD5E4, &lit_4524); #pragma pop /* 806ABE3C-806ABF6C 001D3C 0130+00 1/1 0/0 0/0 .text BodyDeathMove__8daE_DK_cFv */ @@ -1091,42 +1097,42 @@ asm void daE_DK_c::BodyDeathMove() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4595 = 7.0f; -COMPILER_STRIP_GATE(806AD5E8, &lit_4595); +COMPILER_STRIP_GATE(0x806AD5E8, &lit_4595); #pragma pop /* 806AD5EC-806AD5F0 0000B4 0004+00 0/1 0/0 0/0 .rodata @4596 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4596 = 10.0f; -COMPILER_STRIP_GATE(806AD5EC, &lit_4596); +COMPILER_STRIP_GATE(0x806AD5EC, &lit_4596); #pragma pop /* 806AD5F0-806AD5F4 0000B8 0004+00 0/1 0/0 0/0 .rodata @4597 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4597 = 125.0f; -COMPILER_STRIP_GATE(806AD5F0, &lit_4597); +COMPILER_STRIP_GATE(0x806AD5F0, &lit_4597); #pragma pop /* 806AD5F4-806AD5F8 0000BC 0004+00 0/1 0/0 0/0 .rodata @4598 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4598 = -25.0f; -COMPILER_STRIP_GATE(806AD5F4, &lit_4598); +COMPILER_STRIP_GATE(0x806AD5F4, &lit_4598); #pragma pop /* 806AD5F8-806AD5FC 0000C0 0004+00 0/3 0/0 0/0 .rodata @4599 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4599 = 90.0f; -COMPILER_STRIP_GATE(806AD5F8, &lit_4599); +COMPILER_STRIP_GATE(0x806AD5F8, &lit_4599); #pragma pop /* 806AD5FC-806AD600 0000C4 0004+00 0/1 0/0 0/0 .rodata @4600 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4600 = 120.0f; -COMPILER_STRIP_GATE(806AD5FC, &lit_4600); +COMPILER_STRIP_GATE(0x806AD5FC, &lit_4600); #pragma pop /* 806ABF6C-806AC390 001E6C 0424+00 1/1 0/0 0/0 .text executeDeath__8daE_DK_cFv */ @@ -1154,14 +1160,14 @@ asm void daE_DK_c::action() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4690 = -50.0f; -COMPILER_STRIP_GATE(806AD600, &lit_4690); +COMPILER_STRIP_GATE(0x806AD600, &lit_4690); #pragma pop /* 806AD604-806AD608 0000CC 0004+00 0/1 0/0 0/0 .rodata @4691 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4691 = -90.0f; -COMPILER_STRIP_GATE(806AD604, &lit_4691); +COMPILER_STRIP_GATE(0x806AD604, &lit_4691); #pragma pop /* 806AC5BC-806AC754 0024BC 0198+00 1/1 0/0 0/0 .text mtx_set__8daE_DK_cFv */ @@ -1179,21 +1185,21 @@ asm void daE_DK_c::mtx_set() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4767 = 40.0f; -COMPILER_STRIP_GATE(806AD608, &lit_4767); +COMPILER_STRIP_GATE(0x806AD608, &lit_4767); #pragma pop /* 806AD60C-806AD610 0000D4 0004+00 0/1 0/0 0/0 .rodata @4768 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4768 = 20.0f; -COMPILER_STRIP_GATE(806AD60C, &lit_4768); +COMPILER_STRIP_GATE(0x806AD60C, &lit_4768); #pragma pop /* 806AD610-806AD614 0000D8 0004+00 0/1 0/0 0/0 .rodata @4769 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4769 = 160.0f; -COMPILER_STRIP_GATE(806AD610, &lit_4769); +COMPILER_STRIP_GATE(0x806AD610, &lit_4769); #pragma pop /* 806AC754-806AC968 002654 0214+00 1/1 0/0 0/0 .text cc_set__8daE_DK_cFv */ @@ -1286,7 +1292,7 @@ static asm void useHeapInit(fopAc_ac_c* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4983 = 500.0f; -COMPILER_STRIP_GATE(806AD614, &lit_4983); +COMPILER_STRIP_GATE(0x806AD614, &lit_4983); #pragma pop /* 806AD618-806AD620 0000E0 0004+04 0/1 0/0 0/0 .rodata @4984 */ @@ -1297,7 +1303,7 @@ SECTION_RODATA static f32 const lit_4984[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(806AD618, &lit_4984); +COMPILER_STRIP_GATE(0x806AD618, &lit_4984); #pragma pop /* 806AD620-806AD628 0000E8 0008+00 0/1 0/0 0/0 .rodata @4986 */ @@ -1306,7 +1312,13 @@ COMPILER_STRIP_GATE(806AD618, &lit_4984); SECTION_RODATA static u8 const lit_4986[8] = { 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(806AD620, &lit_4986); +COMPILER_STRIP_GATE(0x806AD620, &lit_4986); +#pragma pop + +/* 806AD628-806AD628 0000F0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_806AD62D = "E_dk"; #pragma pop /* 806ACE14-806AD0AC 002D14 0298+00 1/1 0/0 0/0 .text create__8daE_DK_cFv */ @@ -1421,7 +1433,7 @@ asm void __sinit_d_a_e_dk_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_806AD4D8 = (void*)__sinit_d_a_e_dk_cpp; +REGISTER_CTORS(0x806AD4D8, __sinit_d_a_e_dk_cpp); #pragma pop /* 806AD514-806AD51C 003414 0008+00 1/0 0/0 0/0 .text @36@__dt__12dBgS_ObjAcchFv */ @@ -1444,10 +1456,4 @@ static asm void func_806AD51C() { } #pragma pop -/* 806AD628-806AD632 0000F0 000A+00 5/5 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_806AD628 = "E_DK"; -SECTION_DEAD static char const* const stringBase_806AD62D = "E_dk"; -#pragma pop +/* 806AD628-806AD628 0000F0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/e/d_a_e_dn/d_a_e_dn.cpp b/rel/d/a/e/d_a_e_dn/d_a_e_dn.cpp index ded276fea9a..2a92c32b613 100644 --- a/rel/d/a/e/d_a_e_dn/d_a_e_dn.cpp +++ b/rel/d/a/e/d_a_e_dn/d_a_e_dn.cpp @@ -19,16 +19,16 @@ struct mDoMtx_stack_c { static u8 now[48]; }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; - struct J3DAnmTransform {}; +struct J3DModelData {}; + +struct Z2Creature {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -90,13 +90,13 @@ struct dRes_control_c { struct dPa_levelEcallBack {}; -struct _GXColor {}; - struct csXyz { /* 804EE350 */ csXyz(); /* 804EE85C */ ~csXyz(); }; +struct _GXColor {}; + struct dPa_control_c { struct level_c { /* 8004B918 */ void getEmitter(u32); @@ -111,10 +111,10 @@ struct dPa_control_c { cXyz const*, f32); }; -struct dJntColData_c {}; - struct J3DModel {}; +struct dJntColData_c {}; + struct dJntCol_c { /* 80035C8C */ dJntCol_c(); /* 80035CA0 */ void init(fopAc_ac_c*, dJntColData_c const*, J3DModel*, int); @@ -521,7 +521,7 @@ extern "C" void __register_global_object(); /* ############################################################################################## */ /* 804EE8AC-804EE8B0 000000 0004+00 35/35 0/0 0/0 .rodata @3789 */ SECTION_RODATA static f32 const lit_3789 = 100.0f; -COMPILER_STRIP_GATE(804EE8AC, &lit_3789); +COMPILER_STRIP_GATE(0x804EE8AC, &lit_3789); /* 804EE8B0-804EE8B4 000004 0004+00 2/29 0/0 0/0 .rodata @3790 */ SECTION_RODATA static u8 const lit_3790[4] = { @@ -530,7 +530,7 @@ SECTION_RODATA static u8 const lit_3790[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(804EE8B0, &lit_3790); +COMPILER_STRIP_GATE(0x804EE8B0, &lit_3790); /* 804EE8B4-804EE8BC 000008 0004+04 2/22 0/0 0/0 .rodata @3791 */ SECTION_RODATA static f32 const lit_3791[1 + 1 /* padding */] = { @@ -538,7 +538,7 @@ SECTION_RODATA static f32 const lit_3791[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(804EE8B4, &lit_3791); +COMPILER_STRIP_GATE(0x804EE8B4, &lit_3791); /* 804EE8BC-804EE8C4 000010 0008+00 0/5 0/0 0/0 .rodata @3792 */ #pragma push @@ -546,7 +546,7 @@ COMPILER_STRIP_GATE(804EE8B4, &lit_3791); SECTION_RODATA static u8 const lit_3792[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(804EE8BC, &lit_3792); +COMPILER_STRIP_GATE(0x804EE8BC, &lit_3792); #pragma pop /* 804EE8C4-804EE8CC 000018 0008+00 0/5 0/0 0/0 .rodata @3793 */ @@ -555,7 +555,7 @@ COMPILER_STRIP_GATE(804EE8BC, &lit_3792); SECTION_RODATA static u8 const lit_3793[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(804EE8C4, &lit_3793); +COMPILER_STRIP_GATE(0x804EE8C4, &lit_3793); #pragma pop /* 804EE8CC-804EE8D4 000020 0008+00 0/5 0/0 0/0 .rodata @3794 */ @@ -564,46 +564,46 @@ COMPILER_STRIP_GATE(804EE8C4, &lit_3793); SECTION_RODATA static u8 const lit_3794[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(804EE8CC, &lit_3794); +COMPILER_STRIP_GATE(0x804EE8CC, &lit_3794); #pragma pop /* 804EE8D4-804EE8D8 000028 0004+00 0/1 0/0 0/0 .rodata @3795 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3795 = 1.0f / 100.0f; -COMPILER_STRIP_GATE(804EE8D4, &lit_3795); +COMPILER_STRIP_GATE(0x804EE8D4, &lit_3795); #pragma pop /* 804EE8D8-804EE8DC 00002C 0004+00 0/2 0/0 0/0 .rodata @3810 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3810 = 11.0f / 10.0f; -COMPILER_STRIP_GATE(804EE8D8, &lit_3810); +COMPILER_STRIP_GATE(0x804EE8D8, &lit_3810); #pragma pop /* 804EE8DC-804EE8E0 000030 0004+00 0/1 0/0 0/0 .rodata @3811 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3811 = 7.5f; -COMPILER_STRIP_GATE(804EE8DC, &lit_3811); +COMPILER_STRIP_GATE(0x804EE8DC, &lit_3811); #pragma pop /* 804EE8E0-804EE8E4 000034 0004+00 1/4 0/0 0/0 .rodata @3812 */ SECTION_RODATA static f32 const lit_3812 = 25.0f; -COMPILER_STRIP_GATE(804EE8E0, &lit_3812); +COMPILER_STRIP_GATE(0x804EE8E0, &lit_3812); /* 804EE8E4-804EE8E8 000038 0004+00 0/5 0/0 0/0 .rodata @3813 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3813 = 300.0f; -COMPILER_STRIP_GATE(804EE8E4, &lit_3813); +COMPILER_STRIP_GATE(0x804EE8E4, &lit_3813); #pragma pop /* 804EE8E8-804EE8EC 00003C 0004+00 0/1 0/0 0/0 .rodata @3814 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3814 = 350.0f; -COMPILER_STRIP_GATE(804EE8E8, &lit_3814); +COMPILER_STRIP_GATE(0x804EE8E8, &lit_3814); #pragma pop /* 804EEA40-804EEA4C 000000 000C+00 2/2 0/0 0/0 .data cNullVec__6Z2Calc */ @@ -1011,7 +1011,13 @@ static asm void dn_disappear(e_dn_class* param_0) { /* ############################################################################################## */ /* 804EE8EC-804EE8F0 000040 0004+00 1/4 0/0 0/0 .rodata @3854 */ SECTION_RODATA static f32 const lit_3854 = -1.0f; -COMPILER_STRIP_GATE(804EE8EC, &lit_3854); +COMPILER_STRIP_GATE(0x804EE8EC, &lit_3854); + +/* 804EEA34-804EEA34 000188 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_804EEA34 = "E_dn"; +#pragma pop /* 804E52D0-804E537C 000210 00AC+00 18/18 0/0 0/0 .text anm_init__FP10e_dn_classifUcf */ #pragma push @@ -1038,14 +1044,14 @@ static asm void nodeCallBack(J3DJoint* param_0, int param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4094 = 50.0f; -COMPILER_STRIP_GATE(804EE8F0, &lit_4094); +COMPILER_STRIP_GATE(0x804EE8F0, &lit_4094); #pragma pop /* 804EE8F4-804EE8F8 000048 0004+00 0/1 0/0 0/0 .rodata @4095 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4095 = 950.0f; -COMPILER_STRIP_GATE(804EE8F4, &lit_4095); +COMPILER_STRIP_GATE(0x804EE8F4, &lit_4095); #pragma pop /* 804E5838-804E5B20 000778 02E8+00 1/0 0/0 0/0 .text daE_DN_Draw__FP10e_dn_class */ @@ -1199,28 +1205,28 @@ static asm void s_b_sub(void* param_0, void* param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4322 = 30.0f; -COMPILER_STRIP_GATE(804EE8F8, &lit_4322); +COMPILER_STRIP_GATE(0x804EE8F8, &lit_4322); #pragma pop /* 804EE8FC-804EE900 000050 0004+00 0/1 0/0 0/0 .rodata @4323 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4323 = 500.0f; -COMPILER_STRIP_GATE(804EE8FC, &lit_4323); +COMPILER_STRIP_GATE(0x804EE8FC, &lit_4323); #pragma pop /* 804EE900-804EE904 000054 0004+00 0/1 0/0 0/0 .rodata @4324 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4324 = -125.0f; -COMPILER_STRIP_GATE(804EE900, &lit_4324); +COMPILER_STRIP_GATE(0x804EE900, &lit_4324); #pragma pop /* 804EE904-804EE908 000058 0004+00 0/1 0/0 0/0 .rodata @4325 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4325 = 1500.0f; -COMPILER_STRIP_GATE(804EE904, &lit_4325); +COMPILER_STRIP_GATE(0x804EE904, &lit_4325); #pragma pop /* 804E5D4C-804E61D8 000C8C 048C+00 2/2 0/0 0/0 .text search_bomb__FP10e_dn_classi */ @@ -1289,7 +1295,7 @@ static asm void move_gake_check(e_dn_class* param_0, f32 param_1, s8 param_2) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4435 = 200.0f; -COMPILER_STRIP_GATE(804EE908, &lit_4435); +COMPILER_STRIP_GATE(0x804EE908, &lit_4435); #pragma pop /* 804E6448-804E6608 001388 01C0+00 1/1 0/0 0/0 .text jump_pos_check__FP10e_dn_classP4cXyz */ @@ -1307,28 +1313,28 @@ static asm void jump_pos_check(e_dn_class* param_0, cXyz* param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4535 = 10.0f; -COMPILER_STRIP_GATE(804EE90C, &lit_4535); +COMPILER_STRIP_GATE(0x804EE90C, &lit_4535); #pragma pop /* 804EE910-804EE914 000064 0004+00 0/2 0/0 0/0 .rodata @4536 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4536 = 9.0f / 10.0f; -COMPILER_STRIP_GATE(804EE910, &lit_4536); +COMPILER_STRIP_GATE(0x804EE910, &lit_4536); #pragma pop /* 804EE914-804EE918 000068 0004+00 0/3 0/0 0/0 .rodata @4537 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4537 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(804EE914, &lit_4537); +COMPILER_STRIP_GATE(0x804EE914, &lit_4537); #pragma pop /* 804EE918-804EE91C 00006C 0004+00 0/3 0/0 0/0 .rodata @4538 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4538 = 2000.0f; -COMPILER_STRIP_GATE(804EE918, &lit_4538); +COMPILER_STRIP_GATE(0x804EE918, &lit_4538); #pragma pop /* 804E6608-804E6A8C 001548 0484+00 2/1 0/0 0/0 .text e_dn_stay__FP10e_dn_class */ @@ -1346,42 +1352,42 @@ static asm void e_dn_stay(e_dn_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4539 = 3.0f; -COMPILER_STRIP_GATE(804EE91C, &lit_4539); +COMPILER_STRIP_GATE(0x804EE91C, &lit_4539); #pragma pop /* 804EE920-804EE924 000074 0004+00 0/3 0/0 0/0 .rodata @4540 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4540 = 1.5f; -COMPILER_STRIP_GATE(804EE920, &lit_4540); +COMPILER_STRIP_GATE(0x804EE920, &lit_4540); #pragma pop /* 804EE924-804EE928 000078 0004+00 0/4 0/0 0/0 .rodata @4541 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4541 = 20.0f; -COMPILER_STRIP_GATE(804EE924, &lit_4541); +COMPILER_STRIP_GATE(0x804EE924, &lit_4541); #pragma pop /* 804EE928-804EE92C 00007C 0004+00 0/12 0/0 0/0 .rodata @4542 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4542 = 5.0f; -COMPILER_STRIP_GATE(804EE928, &lit_4542); +COMPILER_STRIP_GATE(0x804EE928, &lit_4542); #pragma pop /* 804EE92C-804EE930 000080 0004+00 0/1 0/0 0/0 .rodata @4543 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4543 = 40.0f; -COMPILER_STRIP_GATE(804EE92C, &lit_4543); +COMPILER_STRIP_GATE(0x804EE92C, &lit_4543); #pragma pop /* 804EE930-804EE934 000084 0004+00 0/0 0/0 0/0 .rodata @4544 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4544 = 13.0f / 10.0f; -COMPILER_STRIP_GATE(804EE930, &lit_4544); +COMPILER_STRIP_GATE(0x804EE930, &lit_4544); #pragma pop /* 804EE934-804EE93C 000088 0004+04 0/0 0/0 0/0 .rodata @4545 */ @@ -1392,7 +1398,7 @@ SECTION_RODATA static f32 const lit_4545[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(804EE934, &lit_4545); +COMPILER_STRIP_GATE(0x804EE934, &lit_4545); #pragma pop /* 804EE93C-804EE944 000090 0008+00 0/1 0/0 0/0 .rodata @4550 */ @@ -1401,28 +1407,28 @@ COMPILER_STRIP_GATE(804EE934, &lit_4545); SECTION_RODATA static u8 const lit_4550[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(804EE93C, &lit_4550); +COMPILER_STRIP_GATE(0x804EE93C, &lit_4550); #pragma pop /* 804EE944-804EE948 000098 0004+00 0/1 0/0 0/0 .rodata @4611 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4611 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(804EE944, &lit_4611); +COMPILER_STRIP_GATE(0x804EE944, &lit_4611); #pragma pop /* 804EE948-804EE94C 00009C 0004+00 0/3 0/0 0/0 .rodata @4612 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4612 = 1.0f / 20.0f; -COMPILER_STRIP_GATE(804EE948, &lit_4612); +COMPILER_STRIP_GATE(0x804EE948, &lit_4612); #pragma pop /* 804EE94C-804EE950 0000A0 0004+00 0/2 0/0 0/0 .rodata @4613 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4613 = 250.0f; -COMPILER_STRIP_GATE(804EE94C, &lit_4613); +COMPILER_STRIP_GATE(0x804EE94C, &lit_4613); #pragma pop /* 804E6A8C-804E6DBC 0019CC 0330+00 1/1 0/0 0/0 .text e_dn_otoreac__FP10e_dn_class */ @@ -1450,42 +1456,42 @@ static asm void e_dn_bomb_action(e_dn_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4715 = 600.0f; -COMPILER_STRIP_GATE(804EE950, &lit_4715); +COMPILER_STRIP_GATE(0x804EE950, &lit_4715); #pragma pop /* 804EE954-804EE958 0000A8 0004+00 0/2 0/0 0/0 .rodata @4716 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4716 = -30.0f; -COMPILER_STRIP_GATE(804EE954, &lit_4716); +COMPILER_STRIP_GATE(0x804EE954, &lit_4716); #pragma pop /* 804EE958-804EE95C 0000AC 0004+00 0/1 0/0 0/0 .rodata @4717 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4717 = 60.0f; -COMPILER_STRIP_GATE(804EE958, &lit_4717); +COMPILER_STRIP_GATE(0x804EE958, &lit_4717); #pragma pop /* 804EE95C-804EE960 0000B0 0004+00 0/2 0/0 0/0 .rodata @4718 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4718 = 15.0f; -COMPILER_STRIP_GATE(804EE95C, &lit_4718); +COMPILER_STRIP_GATE(0x804EE95C, &lit_4718); #pragma pop /* 804EE960-804EE964 0000B4 0004+00 0/1 0/0 0/0 .rodata @4783 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4783 = 32768.0f; -COMPILER_STRIP_GATE(804EE960, &lit_4783); +COMPILER_STRIP_GATE(0x804EE960, &lit_4783); #pragma pop /* 804EE964-804EE968 0000B8 0004+00 0/1 0/0 0/0 .rodata @4784 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4784 = 10000.0f; -COMPILER_STRIP_GATE(804EE964, &lit_4784); +COMPILER_STRIP_GATE(0x804EE964, &lit_4784); #pragma pop /* 804E72C8-804E7620 002208 0358+00 1/1 0/0 0/0 .text e_dn_normal__FP10e_dn_class */ @@ -1503,7 +1509,7 @@ static asm void e_dn_normal(e_dn_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4811 = -5.0f; -COMPILER_STRIP_GATE(804EE968, &lit_4811); +COMPILER_STRIP_GATE(0x804EE968, &lit_4811); #pragma pop /* 804E7620-804E77A8 002560 0188+00 1/1 0/0 0/0 .text e_dn_drawback__FP10e_dn_class */ @@ -1521,12 +1527,12 @@ static asm void e_dn_drawback(e_dn_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4872 = 2.0f; -COMPILER_STRIP_GATE(804EE96C, &lit_4872); +COMPILER_STRIP_GATE(0x804EE96C, &lit_4872); #pragma pop /* 804EE970-804EE974 0000C4 0004+00 1/6 0/0 0/0 .rodata @4873 */ SECTION_RODATA static f32 const lit_4873 = 150.0f; -COMPILER_STRIP_GATE(804EE970, &lit_4873); +COMPILER_STRIP_GATE(0x804EE970, &lit_4873); /* 804E77A8-804E7B34 0026E8 038C+00 1/1 0/0 0/0 .text e_dn_wolfbite__FP10e_dn_class */ #pragma push @@ -1553,7 +1559,7 @@ static asm void way_check(e_dn_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4933 = 1000.0f; -COMPILER_STRIP_GATE(804EE974, &lit_4933); +COMPILER_STRIP_GATE(0x804EE974, &lit_4933); #pragma pop /* 804EEF90-804EEF94 0000A8 0004+00 2/2 0/0 0/0 .bss learn_check */ @@ -1574,35 +1580,35 @@ static asm void shot_s_sub(void* param_0, void* param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5115 = 120.0f; -COMPILER_STRIP_GATE(804EE978, &lit_5115); +COMPILER_STRIP_GATE(0x804EE978, &lit_5115); #pragma pop /* 804EE97C-804EE980 0000D0 0004+00 0/1 0/0 0/0 .rodata @5116 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5116 = 32763.0f; -COMPILER_STRIP_GATE(804EE97C, &lit_5116); +COMPILER_STRIP_GATE(0x804EE97C, &lit_5116); #pragma pop /* 804EE980-804EE984 0000D4 0004+00 0/1 0/0 0/0 .rodata @5117 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5117 = 0.75f; -COMPILER_STRIP_GATE(804EE980, &lit_5117); +COMPILER_STRIP_GATE(0x804EE980, &lit_5117); #pragma pop /* 804EE984-804EE988 0000D8 0004+00 0/4 0/0 0/0 .rodata @5118 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5118 = 0.5f; -COMPILER_STRIP_GATE(804EE984, &lit_5118); +COMPILER_STRIP_GATE(0x804EE984, &lit_5118); #pragma pop /* 804EE988-804EE98C 0000DC 0004+00 0/1 0/0 0/0 .rodata @5119 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5119 = 19.0f / 10.0f; -COMPILER_STRIP_GATE(804EE988, &lit_5119); +COMPILER_STRIP_GATE(0x804EE988, &lit_5119); #pragma pop /* 804E7D18-804E8620 002C58 0908+00 1/1 0/0 0/0 .text e_dn_fight_run__FP10e_dn_class */ @@ -1630,7 +1636,7 @@ static asm void e_dn_jump(e_dn_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5272 = 35.0f; -COMPILER_STRIP_GATE(804EE98C, &lit_5272); +COMPILER_STRIP_GATE(0x804EE98C, &lit_5272); #pragma pop /* 804E8848-804E8D78 003788 0530+00 1/1 0/0 0/0 .text e_dn_gakejump__FP10e_dn_class */ @@ -1658,7 +1664,7 @@ static asm void at_hit_check(e_dn_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5333 = 6.0f; -COMPILER_STRIP_GATE(804EE990, &lit_5333); +COMPILER_STRIP_GATE(0x804EE990, &lit_5333); #pragma pop /* 804E8DD8-804E8F78 003D18 01A0+00 1/1 0/0 0/0 .text e_dn_attack_0__FP10e_dn_class */ @@ -1706,7 +1712,7 @@ static asm void e_dn_tail_attack(e_dn_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5542 = -8.0f; -COMPILER_STRIP_GATE(804EE994, &lit_5542); +COMPILER_STRIP_GATE(0x804EE994, &lit_5542); #pragma pop /* 804E9544-804E973C 004484 01F8+00 2/1 0/0 0/0 .text e_dn_guard__FP10e_dn_class */ @@ -1734,21 +1740,21 @@ static asm void e_dn_s_damage(e_dn_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5543 = 8.0f; -COMPILER_STRIP_GATE(804EE998, &lit_5543); +COMPILER_STRIP_GATE(0x804EE998, &lit_5543); #pragma pop /* 804EE99C-804EE9A0 0000F0 0004+00 0/2 0/0 0/0 .rodata @5592 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5592 = 70.0f; -COMPILER_STRIP_GATE(804EE99C, &lit_5592); +COMPILER_STRIP_GATE(0x804EE99C, &lit_5592); #pragma pop /* 804EE9A0-804EE9A4 0000F4 0004+00 0/1 0/0 0/0 .rodata @5593 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5593 = -150.0f; -COMPILER_STRIP_GATE(804EE9A0, &lit_5593); +COMPILER_STRIP_GATE(0x804EE9A0, &lit_5593); #pragma pop /* 804E97EC-804E99A0 00472C 01B4+00 1/1 0/0 0/0 .text kado_check__FP10e_dn_class */ @@ -1786,7 +1792,7 @@ asm dBgS_ObjGndChk::~dBgS_ObjGndChk() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5977 = 8000.0f; -COMPILER_STRIP_GATE(804EE9A4, &lit_5977); +COMPILER_STRIP_GATE(0x804EE9A4, &lit_5977); #pragma pop /* 804E9B68-804EA700 004AA8 0B98+00 2/1 0/0 0/0 .text e_dn_damage__FP10e_dn_class */ @@ -1804,35 +1810,35 @@ static asm void e_dn_damage(e_dn_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5978 = -100.0f; -COMPILER_STRIP_GATE(804EE9A8, &lit_5978); +COMPILER_STRIP_GATE(0x804EE9A8, &lit_5978); #pragma pop /* 804EE9AC-804EE9B0 000100 0004+00 0/0 0/0 0/0 .rodata @5979 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5979 = 9.0f / 5.0f; -COMPILER_STRIP_GATE(804EE9AC, &lit_5979); +COMPILER_STRIP_GATE(0x804EE9AC, &lit_5979); #pragma pop /* 804EE9B0-804EE9B4 000104 0004+00 0/3 0/0 0/0 .rodata @5980 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5980 = -20.0f; -COMPILER_STRIP_GATE(804EE9B0, &lit_5980); +COMPILER_STRIP_GATE(0x804EE9B0, &lit_5980); #pragma pop /* 804EE9B4-804EE9B8 000108 0004+00 0/1 0/0 0/0 .rodata @6004 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6004 = -3.0f; -COMPILER_STRIP_GATE(804EE9B4, &lit_6004); +COMPILER_STRIP_GATE(0x804EE9B4, &lit_6004); #pragma pop /* 804EE9B8-804EE9BC 00010C 0004+00 0/1 0/0 0/0 .rodata @6005 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6005 = -6.0f; -COMPILER_STRIP_GATE(804EE9B8, &lit_6005); +COMPILER_STRIP_GATE(0x804EE9B8, &lit_6005); #pragma pop /* 804EA700-804EA854 005640 0154+00 1/1 0/0 0/0 .text e_dn_backdrop__FP10e_dn_class */ @@ -1860,42 +1866,42 @@ static asm void e_dn_water(e_dn_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6097 = -8613.0f; -COMPILER_STRIP_GATE(804EE9BC, &lit_6097); +COMPILER_STRIP_GATE(0x804EE9BC, &lit_6097); #pragma pop /* 804EE9C0-804EE9C4 000114 0004+00 0/1 0/0 0/0 .rodata @6098 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6098 = 8017.0f; -COMPILER_STRIP_GATE(804EE9C0, &lit_6098); +COMPILER_STRIP_GATE(0x804EE9C0, &lit_6098); #pragma pop /* 804EE9C4-804EE9C8 000118 0004+00 0/1 0/0 0/0 .rodata @6099 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6099 = -8044.0f; -COMPILER_STRIP_GATE(804EE9C4, &lit_6099); +COMPILER_STRIP_GATE(0x804EE9C4, &lit_6099); #pragma pop /* 804EE9C8-804EE9CC 00011C 0004+00 0/1 0/0 0/0 .rodata @6100 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6100 = 8616.0f; -COMPILER_STRIP_GATE(804EE9C8, &lit_6100); +COMPILER_STRIP_GATE(0x804EE9C8, &lit_6100); #pragma pop /* 804EE9CC-804EE9D0 000120 0004+00 0/2 0/0 0/0 .rodata @6101 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6101 = 3000.0f; -COMPILER_STRIP_GATE(804EE9CC, &lit_6101); +COMPILER_STRIP_GATE(0x804EE9CC, &lit_6101); #pragma pop /* 804EE9D0-804EE9D4 000124 0004+00 0/2 0/0 0/0 .rodata @6102 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6102 = 800.0f; -COMPILER_STRIP_GATE(804EE9D0, &lit_6102); +COMPILER_STRIP_GATE(0x804EE9D0, &lit_6102); #pragma pop /* 804EA9F4-804EAD1C 005934 0328+00 1/1 0/0 0/0 .text e_dn_reg__FP10e_dn_class */ @@ -1923,7 +1929,7 @@ static asm void wolfkick_damage(e_dn_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6120 = 700.0f; -COMPILER_STRIP_GATE(804EE9D4, &lit_6120); +COMPILER_STRIP_GATE(0x804EE9D4, &lit_6120); #pragma pop /* 804EADD4-804EAEE4 005D14 0110+00 1/1 0/0 0/0 .text big_damage__FP10e_dn_class */ @@ -1981,147 +1987,153 @@ static asm void anm_se_set(e_dn_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6928 = 3.0f / 10.0f; -COMPILER_STRIP_GATE(804EE9D8, &lit_6928); +COMPILER_STRIP_GATE(0x804EE9D8, &lit_6928); #pragma pop /* 804EE9DC-804EE9E0 000130 0004+00 0/0 0/0 0/0 .rodata @6929 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6929 = -4.0f; -COMPILER_STRIP_GATE(804EE9DC, &lit_6929); +COMPILER_STRIP_GATE(0x804EE9DC, &lit_6929); #pragma pop /* 804EE9E0-804EE9E4 000134 0004+00 0/0 0/0 0/0 .rodata @6930 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6930 = 7.0f; -COMPILER_STRIP_GATE(804EE9E0, &lit_6930); +COMPILER_STRIP_GATE(0x804EE9E0, &lit_6930); #pragma pop /* 804EE9E4-804EE9E8 000138 0004+00 0/0 0/0 0/0 .rodata @6931 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6931 = 2500.0f; -COMPILER_STRIP_GATE(804EE9E4, &lit_6931); +COMPILER_STRIP_GATE(0x804EE9E4, &lit_6931); #pragma pop /* 804EE9E8-804EE9EC 00013C 0004+00 0/0 0/0 0/0 .rodata @6932 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6932 = 15000.0f; -COMPILER_STRIP_GATE(804EE9E8, &lit_6932); +COMPILER_STRIP_GATE(0x804EE9E8, &lit_6932); #pragma pop /* 804EE9EC-804EE9F0 000140 0004+00 0/0 0/0 0/0 .rodata @6933 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6933 = 12000.0f; -COMPILER_STRIP_GATE(804EE9EC, &lit_6933); +COMPILER_STRIP_GATE(0x804EE9EC, &lit_6933); #pragma pop /* 804EE9F0-804EE9F4 000144 0004+00 0/0 0/0 0/0 .rodata @6934 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6934 = -1000000000.0f; -COMPILER_STRIP_GATE(804EE9F0, &lit_6934); +COMPILER_STRIP_GATE(0x804EE9F0, &lit_6934); #pragma pop /* 804EE9F4-804EE9F8 000148 0004+00 0/1 0/0 0/0 .rodata @7355 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7355 = -10.0f; -COMPILER_STRIP_GATE(804EE9F4, &lit_7355); +COMPILER_STRIP_GATE(0x804EE9F4, &lit_7355); #pragma pop /* 804EE9F8-804EE9FC 00014C 0004+00 0/2 0/0 0/0 .rodata @7356 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7356 = -200.0f; -COMPILER_STRIP_GATE(804EE9F8, &lit_7356); +COMPILER_STRIP_GATE(0x804EE9F8, &lit_7356); #pragma pop /* 804EE9FC-804EEA00 000150 0004+00 0/1 0/0 0/0 .rodata @7357 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7357 = -20000.0f; -COMPILER_STRIP_GATE(804EE9FC, &lit_7357); +COMPILER_STRIP_GATE(0x804EE9FC, &lit_7357); #pragma pop /* 804EEA00-804EEA04 000154 0004+00 0/1 0/0 0/0 .rodata @7358 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7358 = 200000.0f; -COMPILER_STRIP_GATE(804EEA00, &lit_7358); +COMPILER_STRIP_GATE(0x804EEA00, &lit_7358); #pragma pop /* 804EEA04-804EEA08 000158 0004+00 0/1 0/0 0/0 .rodata @7359 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7359 = 30000.0f; -COMPILER_STRIP_GATE(804EEA04, &lit_7359); +COMPILER_STRIP_GATE(0x804EEA04, &lit_7359); #pragma pop /* 804EEA08-804EEA0C 00015C 0004+00 0/1 0/0 0/0 .rodata @7360 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7360 = 45.0f; -COMPILER_STRIP_GATE(804EEA08, &lit_7360); +COMPILER_STRIP_GATE(0x804EEA08, &lit_7360); #pragma pop /* 804EEA0C-804EEA10 000160 0004+00 0/2 0/0 0/0 .rodata @7361 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7361 = 80.0f; -COMPILER_STRIP_GATE(804EEA0C, &lit_7361); +COMPILER_STRIP_GATE(0x804EEA0C, &lit_7361); #pragma pop /* 804EEA10-804EEA14 000164 0004+00 0/1 0/0 0/0 .rodata @7362 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7362 = -23500.0f; -COMPILER_STRIP_GATE(804EEA10, &lit_7362); +COMPILER_STRIP_GATE(0x804EEA10, &lit_7362); #pragma pop /* 804EEA14-804EEA18 000168 0004+00 0/1 0/0 0/0 .rodata @7363 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7363 = -50000.0f; -COMPILER_STRIP_GATE(804EEA14, &lit_7363); +COMPILER_STRIP_GATE(0x804EEA14, &lit_7363); #pragma pop /* 804EEA18-804EEA1C 00016C 0004+00 0/1 0/0 0/0 .rodata @7364 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7364 = -30000.0f; -COMPILER_STRIP_GATE(804EEA18, &lit_7364); +COMPILER_STRIP_GATE(0x804EEA18, &lit_7364); #pragma pop /* 804EEA1C-804EEA20 000170 0004+00 0/1 0/0 0/0 .rodata @7365 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7365 = 2.0f / 5.0f; -COMPILER_STRIP_GATE(804EEA1C, &lit_7365); +COMPILER_STRIP_GATE(0x804EEA1C, &lit_7365); #pragma pop /* 804EEA20-804EEA24 000174 0004+00 0/1 0/0 0/0 .rodata @7366 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7366 = 180.0f; -COMPILER_STRIP_GATE(804EEA20, &lit_7366); +COMPILER_STRIP_GATE(0x804EEA20, &lit_7366); #pragma pop /* 804EEA24-804EEA28 000178 0004+00 0/1 0/0 0/0 .rodata @7367 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7367 = -5000.0f; -COMPILER_STRIP_GATE(804EEA24, &lit_7367); +COMPILER_STRIP_GATE(0x804EEA24, &lit_7367); #pragma pop /* 804EEA28-804EEA2C 00017C 0004+00 0/1 0/0 0/0 .rodata @7368 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7368 = -300.0f; -COMPILER_STRIP_GATE(804EEA28, &lit_7368); +COMPILER_STRIP_GATE(0x804EEA28, &lit_7368); +#pragma pop + +/* 804EEA34-804EEA34 000188 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_804EEA39 = "D_MN07"; #pragma pop /* 804EEF94-804EEF98 0000AC 0004+00 1/2 0/0 0/0 .bss c_start */ @@ -2167,14 +2179,14 @@ static asm void useHeapInit(fopAc_ac_c* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7548 = 100000.0f; -COMPILER_STRIP_GATE(804EEA2C, &lit_7548); +COMPILER_STRIP_GATE(0x804EEA2C, &lit_7548); #pragma pop /* 804EEA30-804EEA34 000184 0004+00 0/1 0/0 0/0 .rodata @7549 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7549 = 65535.0f; -COMPILER_STRIP_GATE(804EEA30, &lit_7549); +COMPILER_STRIP_GATE(0x804EEA30, &lit_7549); #pragma pop /* 804EDAEC-804EDE58 008A2C 036C+00 1/0 0/0 0/0 .text daE_DN_Create__FP10fopAc_ac_c */ @@ -2304,7 +2316,7 @@ asm void __sinit_d_a_e_dn_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_804EE3E4 = (void*)__sinit_d_a_e_dn_cpp; +REGISTER_CTORS(0x804EE3E4, __sinit_d_a_e_dn_cpp); #pragma pop /* 804EE420-804EE428 009360 0008+00 1/0 0/0 0/0 .text @20@__dt__14dBgS_ObjGndChkFv */ @@ -2551,10 +2563,4 @@ static u8 data_804EEFF4[4]; static u8 data_804EEFF8[4]; #pragma pop -/* 804EEA34-804EEA40 000188 000C+00 5/5 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_804EEA34 = "E_dn"; -SECTION_DEAD static char const* const stringBase_804EEA39 = "D_MN07"; -#pragma pop +/* 804EEA34-804EEA34 000188 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/e/d_a_e_dt/d_a_e_dt.cpp b/rel/d/a/e/d_a_e_dt/d_a_e_dt.cpp index b509ad022c9..e38952df215 100644 --- a/rel/d/a/e/d_a_e_dt/d_a_e_dt.cpp +++ b/rel/d/a/e/d_a_e_dt/d_a_e_dt.cpp @@ -39,16 +39,16 @@ struct mDoGph_gInf_c { /* 80008078 */ void onBlure(); }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; - struct J3DAnmTransform {}; +struct J3DModelData {}; + +struct Z2Creature {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -67,10 +67,10 @@ struct daPy_py_c { /* 8015F914 */ void setPlayerDamage(int, int); }; -struct J3DJoint {}; - struct J3DModel {}; +struct J3DJoint {}; + struct daE_DT_c { /* 806AD97C */ void ctrlJoint(J3DJoint*, J3DModel*); /* 806ADBA0 */ void JointCallBack(J3DJoint*, int); @@ -641,63 +641,63 @@ extern "C" void __register_global_object(); /* ############################################################################################## */ /* 806B5CD4-806B5CD8 000000 0004+00 22/22 0/0 0/0 .rodata @3792 */ SECTION_RODATA static f32 const lit_3792 = 1.5f; -COMPILER_STRIP_GATE(806B5CD4, &lit_3792); +COMPILER_STRIP_GATE(0x806B5CD4, &lit_3792); /* 806B5CD8-806B5CDC 000004 0004+00 0/2 0/0 0/0 .rodata @3793 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3793 = 8.0f; -COMPILER_STRIP_GATE(806B5CD8, &lit_3793); +COMPILER_STRIP_GATE(0x806B5CD8, &lit_3793); #pragma pop /* 806B5CDC-806B5CE0 000008 0004+00 0/1 0/0 0/0 .rodata @3794 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3794 = 170.0f; -COMPILER_STRIP_GATE(806B5CDC, &lit_3794); +COMPILER_STRIP_GATE(0x806B5CDC, &lit_3794); #pragma pop /* 806B5CE0-806B5CE4 00000C 0004+00 0/1 0/0 0/0 .rodata @3795 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3795 = 1536.0f; -COMPILER_STRIP_GATE(806B5CE0, &lit_3795); +COMPILER_STRIP_GATE(0x806B5CE0, &lit_3795); #pragma pop /* 806B5CE4-806B5CE8 000010 0004+00 0/1 0/0 0/0 .rodata @3796 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3796 = 25.0f; -COMPILER_STRIP_GATE(806B5CE4, &lit_3796); +COMPILER_STRIP_GATE(0x806B5CE4, &lit_3796); #pragma pop /* 806B5CE8-806B5CEC 000014 0004+00 1/12 0/0 0/0 .rodata @3797 */ SECTION_RODATA static f32 const lit_3797 = 3.0f; -COMPILER_STRIP_GATE(806B5CE8, &lit_3797); +COMPILER_STRIP_GATE(0x806B5CE8, &lit_3797); /* 806B5CEC-806B5CF0 000018 0004+00 1/4 0/0 0/0 .rodata @3798 */ SECTION_RODATA static f32 const lit_3798 = 300.0f; -COMPILER_STRIP_GATE(806B5CEC, &lit_3798); +COMPILER_STRIP_GATE(0x806B5CEC, &lit_3798); /* 806B5CF0-806B5CF4 00001C 0004+00 0/1 0/0 0/0 .rodata @3799 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3799 = 120.0f; -COMPILER_STRIP_GATE(806B5CF0, &lit_3799); +COMPILER_STRIP_GATE(0x806B5CF0, &lit_3799); #pragma pop /* 806B5CF4-806B5CF8 000020 0004+00 0/1 0/0 0/0 .rodata @3800 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3800 = -55.0f; -COMPILER_STRIP_GATE(806B5CF4, &lit_3800); +COMPILER_STRIP_GATE(0x806B5CF4, &lit_3800); #pragma pop /* 806B5CF8-806B5CFC 000024 0004+00 0/1 0/0 0/0 .rodata @3801 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3801 = 105.0f; -COMPILER_STRIP_GATE(806B5CF8, &lit_3801); +COMPILER_STRIP_GATE(0x806B5CF8, &lit_3801); #pragma pop /* 806B5EEC-806B5F14 000000 0028+00 1/1 0/0 0/0 .data eDt_ShakeFrame__6E_DT_n */ @@ -1033,13 +1033,13 @@ SECTION_RODATA static f32 const lit_3868[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(806B5CFC, &lit_3868); +COMPILER_STRIP_GATE(0x806B5CFC, &lit_3868); /* 806B5D04-806B5D0C 000030 0008+00 1/3 0/0 0/0 .rodata @3870 */ SECTION_RODATA static u8 const lit_3870[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(806B5D04, &lit_3870); +COMPILER_STRIP_GATE(0x806B5D04, &lit_3870); /* 806AD97C-806ADBA0 00015C 0224+00 2/1 0/0 0/0 .text ctrlJoint__8daE_DT_cFP8J3DJointP8J3DModel */ #pragma push @@ -1087,67 +1087,67 @@ asm void daE_DT_c::JointCallBackTuba(J3DJoint* param_0, int param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4061 = 24.0f; -COMPILER_STRIP_GATE(806B5D0C, &lit_4061); +COMPILER_STRIP_GATE(0x806B5D0C, &lit_4061); #pragma pop /* 806B5D10-806B5D14 00003C 0004+00 0/1 0/0 0/0 .rodata @4062 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4062 = 18.0f; -COMPILER_STRIP_GATE(806B5D10, &lit_4062); +COMPILER_STRIP_GATE(0x806B5D10, &lit_4062); #pragma pop /* 806B5D14-806B5D18 000040 0004+00 0/1 0/0 0/0 .rodata @4063 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4063 = 6.0f; -COMPILER_STRIP_GATE(806B5D14, &lit_4063); +COMPILER_STRIP_GATE(0x806B5D14, &lit_4063); #pragma pop /* 806B5D18-806B5D1C 000044 0004+00 0/1 0/0 0/0 .rodata @4064 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4064 = 255.0f; -COMPILER_STRIP_GATE(806B5D18, &lit_4064); +COMPILER_STRIP_GATE(0x806B5D18, &lit_4064); #pragma pop /* 806B5D1C-806B5D20 000048 0004+00 0/1 0/0 0/0 .rodata @4065 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4065 = 16.0f; -COMPILER_STRIP_GATE(806B5D1C, &lit_4065); +COMPILER_STRIP_GATE(0x806B5D1C, &lit_4065); #pragma pop /* 806B5D20-806B5D24 00004C 0004+00 1/5 0/0 0/0 .rodata @4066 */ SECTION_RODATA static f32 const lit_4066 = 10.0f; -COMPILER_STRIP_GATE(806B5D20, &lit_4066); +COMPILER_STRIP_GATE(0x806B5D20, &lit_4066); /* 806B5D24-806B5D28 000050 0004+00 0/2 0/0 0/0 .rodata @4067 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4067 = 12.0f; -COMPILER_STRIP_GATE(806B5D24, &lit_4067); +COMPILER_STRIP_GATE(0x806B5D24, &lit_4067); #pragma pop /* 806B5D28-806B5D2C 000054 0004+00 0/2 0/0 0/0 .rodata @4068 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4068 = -20.0f; -COMPILER_STRIP_GATE(806B5D28, &lit_4068); +COMPILER_STRIP_GATE(0x806B5D28, &lit_4068); #pragma pop /* 806B5D2C-806B5D30 000058 0004+00 0/3 0/0 0/0 .rodata @4069 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4069 = -30.0f; -COMPILER_STRIP_GATE(806B5D2C, &lit_4069); +COMPILER_STRIP_GATE(0x806B5D2C, &lit_4069); #pragma pop /* 806B5D30-806B5D34 00005C 0004+00 0/2 0/0 0/0 .rodata @4070 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4070 = -10.0f; -COMPILER_STRIP_GATE(806B5D30, &lit_4070); +COMPILER_STRIP_GATE(0x806B5D30, &lit_4070); #pragma pop /* 806B5D34-806B5D38 000060 0004+00 4/24 0/0 0/0 .rodata @4071 */ @@ -1157,31 +1157,31 @@ SECTION_RODATA static u8 const lit_4071[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(806B5D34, &lit_4071); +COMPILER_STRIP_GATE(0x806B5D34, &lit_4071); /* 806B5D38-806B5D3C 000064 0004+00 1/6 0/0 0/0 .rodata @4072 */ SECTION_RODATA static f32 const lit_4072 = 100.0f; -COMPILER_STRIP_GATE(806B5D38, &lit_4072); +COMPILER_STRIP_GATE(0x806B5D38, &lit_4072); /* 806B5D3C-806B5D40 000068 0004+00 0/1 0/0 0/0 .rodata @4073 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4073 = 1000.0f; -COMPILER_STRIP_GATE(806B5D3C, &lit_4073); +COMPILER_STRIP_GATE(0x806B5D3C, &lit_4073); #pragma pop /* 806B5D40-806B5D44 00006C 0004+00 0/3 0/0 0/0 .rodata @4074 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4074 = 2000.0f; -COMPILER_STRIP_GATE(806B5D40, &lit_4074); +COMPILER_STRIP_GATE(0x806B5D40, &lit_4074); #pragma pop /* 806B5D44-806B5D48 000070 0004+00 0/2 0/0 0/0 .rodata @4075 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4075 = 4000.0f; -COMPILER_STRIP_GATE(806B5D44, &lit_4075); +COMPILER_STRIP_GATE(0x806B5D44, &lit_4075); #pragma pop /* 806B6260-806B6264 000008 0001+03 2/2 0/0 0/0 .bss @1109 */ @@ -1338,7 +1338,13 @@ asm void daE_DT_c::DemoSkipCallBack(void* param_0, int param_1) { /* ############################################################################################## */ /* 806B5D48-806B5D4C 000074 0004+00 1/3 0/0 0/0 .rodata @4112 */ SECTION_RODATA static f32 const lit_4112 = -1.0f; -COMPILER_STRIP_GATE(806B5D48, &lit_4112); +COMPILER_STRIP_GATE(0x806B5D48, &lit_4112); + +/* 806B5ED0-806B5ED0 0001FC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_806B5ED0 = "E_DT"; +#pragma pop /* 806AE64C-806AE6F0 000E2C 00A4+00 11/11 0/0 0/0 .text setBck__8daE_DT_cFiUcff */ #pragma push @@ -1375,14 +1381,14 @@ asm void daE_DT_c::setActionMode(int param_0, int param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4233 = -3.0f / 10.0f; -COMPILER_STRIP_GATE(806B5D4C, &lit_4233); +COMPILER_STRIP_GATE(0x806B5D4C, &lit_4233); #pragma pop /* 806B5D50-806B5D54 00007C 0004+00 0/2 0/0 0/0 .rodata @4234 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4234 = 130.0f; -COMPILER_STRIP_GATE(806B5D50, &lit_4234); +COMPILER_STRIP_GATE(0x806B5D50, &lit_4234); #pragma pop /* 806AE758-806AEB48 000F38 03F0+00 1/1 0/0 0/0 .text damage_check__8daE_DT_cFv */ @@ -1430,7 +1436,7 @@ asm cM3dGPla::~cM3dGPla() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4367 = 15.0f; -COMPILER_STRIP_GATE(806B5D54, &lit_4367); +COMPILER_STRIP_GATE(0x806B5D54, &lit_4367); #pragma pop /* 806AED94-806AEEFC 001574 0168+00 1/1 0/0 0/0 .text checkTongueBg__8daE_DT_cFv */ @@ -1446,7 +1452,7 @@ asm void daE_DT_c::checkTongueBg() { /* ############################################################################################## */ /* 806B5D58-806B5D5C 000084 0004+00 1/1 0/0 0/0 .rodata @4382 */ SECTION_RODATA static f32 const lit_4382 = -1000000000.0f; -COMPILER_STRIP_GATE(806B5D58, &lit_4382); +COMPILER_STRIP_GATE(0x806B5D58, &lit_4382); /* 806AEEFC-806AEFE8 0016DC 00EC+00 1/1 0/0 0/0 .text checkWaterSurface__8daE_DT_cFv */ #pragma push @@ -1545,14 +1551,14 @@ asm void daE_DT_c::setSwingEffect() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4630 = 29.0f; -COMPILER_STRIP_GATE(806B5D5C, &lit_4630); +COMPILER_STRIP_GATE(0x806B5D5C, &lit_4630); #pragma pop /* 806B5D60-806B5D64 00008C 0004+00 0/1 0/0 0/0 .rodata @4631 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4631 = 59.0f; -COMPILER_STRIP_GATE(806B5D60, &lit_4631); +COMPILER_STRIP_GATE(0x806B5D60, &lit_4631); #pragma pop /* 806AF5CC-806AF740 001DAC 0174+00 1/1 0/0 0/0 .text setStepEffect__8daE_DT_cFv */ @@ -1705,7 +1711,7 @@ static asm void s_demo_otama(void* param_0, void* param_1) { SECTION_RODATA static u8 const lit_4976[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(806B5D64, &lit_4976); +COMPILER_STRIP_GATE(0x806B5D64, &lit_4976); #pragma pop /* 806B5D6C-806B5D74 000098 0008+00 0/2 0/0 0/0 .rodata @4977 */ @@ -1714,7 +1720,7 @@ COMPILER_STRIP_GATE(806B5D64, &lit_4976); SECTION_RODATA static u8 const lit_4977[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(806B5D6C, &lit_4977); +COMPILER_STRIP_GATE(0x806B5D6C, &lit_4977); #pragma pop /* 806B5D74-806B5D7C 0000A0 0008+00 0/2 0/0 0/0 .rodata @4978 */ @@ -1723,14 +1729,14 @@ COMPILER_STRIP_GATE(806B5D6C, &lit_4977); SECTION_RODATA static u8 const lit_4978[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(806B5D74, &lit_4978); +COMPILER_STRIP_GATE(0x806B5D74, &lit_4978); #pragma pop /* 806B5D7C-806B5D80 0000A8 0004+00 0/2 0/0 0/0 .rodata @4979 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4979 = 200.0f; -COMPILER_STRIP_GATE(806B5D7C, &lit_4979); +COMPILER_STRIP_GATE(0x806B5D7C, &lit_4979); #pragma pop /* 806B6334-806B6340 0000DC 000C+00 0/1 0/0 0/0 .bss @3802 */ @@ -1777,21 +1783,21 @@ asm void daE_DT_c::isShutterOpen() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5088 = 45.0f; -COMPILER_STRIP_GATE(806B5D80, &lit_5088); +COMPILER_STRIP_GATE(0x806B5D80, &lit_5088); #pragma pop /* 806B5D84-806B5D88 0000B0 0004+00 0/3 0/0 0/0 .rodata @5089 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5089 = 150.0f; -COMPILER_STRIP_GATE(806B5D84, &lit_5089); +COMPILER_STRIP_GATE(0x806B5D84, &lit_5089); #pragma pop /* 806B5D88-806B5D8C 0000B4 0004+00 0/5 0/0 0/0 .rodata @5090 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5090 = 30.0f; -COMPILER_STRIP_GATE(806B5D88, &lit_5090); +COMPILER_STRIP_GATE(0x806B5D88, &lit_5090); #pragma pop /* 806B0200-806B0368 0029E0 0168+00 1/1 0/0 0/0 .text executeWait__8daE_DT_cFv */ @@ -1809,28 +1815,28 @@ asm void daE_DT_c::executeWait() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5155 = 1200.0f; -COMPILER_STRIP_GATE(806B5D8C, &lit_5155); +COMPILER_STRIP_GATE(0x806B5D8C, &lit_5155); #pragma pop /* 806B5D90-806B5D94 0000BC 0004+00 0/1 0/0 0/0 .rodata @5156 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5156 = 27.0f; -COMPILER_STRIP_GATE(806B5D90, &lit_5156); +COMPILER_STRIP_GATE(0x806B5D90, &lit_5156); #pragma pop /* 806B5D94-806B5D98 0000C0 0004+00 0/1 0/0 0/0 .rodata @5157 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5157 = 35.0f; -COMPILER_STRIP_GATE(806B5D94, &lit_5157); +COMPILER_STRIP_GATE(0x806B5D94, &lit_5157); #pragma pop /* 806B5D98-806B5D9C 0000C4 0004+00 0/2 0/0 0/0 .rodata @5158 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5158 = 70.0f; -COMPILER_STRIP_GATE(806B5D98, &lit_5158); +COMPILER_STRIP_GATE(0x806B5D98, &lit_5158); #pragma pop /* 806B0368-806B063C 002B48 02D4+00 1/5 0/0 0/0 .text executeCry__8daE_DT_cFv */ @@ -1858,21 +1864,21 @@ asm void daE_DT_c::executeShake() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5315 = 1500.0f; -COMPILER_STRIP_GATE(806B5D9C, &lit_5315); +COMPILER_STRIP_GATE(0x806B5D9C, &lit_5315); #pragma pop /* 806B5DA0-806B5DA4 0000CC 0004+00 0/1 0/0 0/0 .rodata @5316 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5316 = 32768.0f; -COMPILER_STRIP_GATE(806B5DA0, &lit_5316); +COMPILER_STRIP_GATE(0x806B5DA0, &lit_5316); #pragma pop /* 806B5DA4-806B5DA8 0000D0 0004+00 0/1 0/0 0/0 .rodata @5317 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5317 = 8192.0f; -COMPILER_STRIP_GATE(806B5DA4, &lit_5317); +COMPILER_STRIP_GATE(0x806B5DA4, &lit_5317); #pragma pop /* 806B07C4-806B0E9C 002FA4 06D8+00 2/1 0/0 0/0 .text executeWalk__8daE_DT_cFv */ @@ -1890,35 +1896,35 @@ asm void daE_DT_c::executeWalk() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5318 = 23.0f; -COMPILER_STRIP_GATE(806B5DA8, &lit_5318); +COMPILER_STRIP_GATE(0x806B5DA8, &lit_5318); #pragma pop /* 806B5DAC-806B5DB0 0000D8 0004+00 0/0 0/0 0/0 .rodata @5319 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5319 = 65.0f; -COMPILER_STRIP_GATE(806B5DAC, &lit_5319); +COMPILER_STRIP_GATE(0x806B5DAC, &lit_5319); #pragma pop /* 806B5DB0-806B5DB4 0000DC 0004+00 0/2 0/0 0/0 .rodata @5520 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5520 = 160.0f; -COMPILER_STRIP_GATE(806B5DB0, &lit_5520); +COMPILER_STRIP_GATE(0x806B5DB0, &lit_5520); #pragma pop /* 806B5DB4-806B5DB8 0000E0 0004+00 0/1 0/0 0/0 .rodata @5521 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5521 = 20.0f; -COMPILER_STRIP_GATE(806B5DB4, &lit_5521); +COMPILER_STRIP_GATE(0x806B5DB4, &lit_5521); #pragma pop /* 806B5DB8-806B5DBC 0000E4 0004+00 0/3 0/0 0/0 .rodata @5522 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5522 = -5.0f; -COMPILER_STRIP_GATE(806B5DB8, &lit_5522); +COMPILER_STRIP_GATE(0x806B5DB8, &lit_5522); #pragma pop /* 806B0E9C-806B177C 00367C 08E0+00 2/1 0/0 0/0 .text executeJump__8daE_DT_cFv */ @@ -1936,77 +1942,77 @@ asm void daE_DT_c::executeJump() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5523 = 700.0f; -COMPILER_STRIP_GATE(806B5DBC, &lit_5523); +COMPILER_STRIP_GATE(0x806B5DBC, &lit_5523); #pragma pop /* 806B5DC0-806B5DC4 0000EC 0004+00 0/0 0/0 0/0 .rodata @5524 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5524 = 87.0f; -COMPILER_STRIP_GATE(806B5DC0, &lit_5524); +COMPILER_STRIP_GATE(0x806B5DC0, &lit_5524); #pragma pop /* 806B5DC4-806B5DC8 0000F0 0004+00 0/1 0/0 0/0 .rodata @5525 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5525 = -50.0f; -COMPILER_STRIP_GATE(806B5DC4, &lit_5525); +COMPILER_STRIP_GATE(0x806B5DC4, &lit_5525); #pragma pop /* 806B5DC8-806B5DCC 0000F4 0004+00 0/1 0/0 0/0 .rodata @5526 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5526 = 4096.0f; -COMPILER_STRIP_GATE(806B5DC8, &lit_5526); +COMPILER_STRIP_GATE(0x806B5DC8, &lit_5526); #pragma pop /* 806B5DCC-806B5DD0 0000F8 0004+00 0/0 0/0 0/0 .rodata @5527 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5527 = 470.0f; -COMPILER_STRIP_GATE(806B5DCC, &lit_5527); +COMPILER_STRIP_GATE(0x806B5DCC, &lit_5527); #pragma pop /* 806B5DD0-806B5DD4 0000FC 0004+00 0/1 0/0 0/0 .rodata @5528 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5528 = 0.5f; -COMPILER_STRIP_GATE(806B5DD0, &lit_5528); +COMPILER_STRIP_GATE(0x806B5DD0, &lit_5528); #pragma pop /* 806B5DD4-806B5DD8 000100 0004+00 0/1 0/0 0/0 .rodata @5529 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5529 = 5.0f; -COMPILER_STRIP_GATE(806B5DD4, &lit_5529); +COMPILER_STRIP_GATE(0x806B5DD4, &lit_5529); #pragma pop /* 806B5DD8-806B5DDC 000104 0004+00 0/0 0/0 0/0 .rodata @5530 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5530 = 3.0f / 10.0f; -COMPILER_STRIP_GATE(806B5DD8, &lit_5530); +COMPILER_STRIP_GATE(0x806B5DD8, &lit_5530); #pragma pop /* 806B5DDC-806B5DE0 000108 0004+00 0/1 0/0 0/0 .rodata @5531 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5531 = 6.0f / 5.0f; -COMPILER_STRIP_GATE(806B5DDC, &lit_5531); +COMPILER_STRIP_GATE(0x806B5DDC, &lit_5531); #pragma pop /* 806B5DE0-806B5DE4 00010C 0004+00 0/1 0/0 0/0 .rodata @5613 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5613 = 56.0f; -COMPILER_STRIP_GATE(806B5DE0, &lit_5613); +COMPILER_STRIP_GATE(0x806B5DE0, &lit_5613); #pragma pop /* 806B5DE4-806B5DE8 000110 0004+00 0/3 0/0 0/0 .rodata @5614 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5614 = 50.0f; -COMPILER_STRIP_GATE(806B5DE4, &lit_5614); +COMPILER_STRIP_GATE(0x806B5DE4, &lit_5614); #pragma pop /* 806B177C-806B1B60 003F5C 03E4+00 1/1 0/0 0/0 .text executeDown__8daE_DT_cFv */ @@ -2044,14 +2050,14 @@ asm void daE_DT_c::executeDamage() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5705 = 119.0f; -COMPILER_STRIP_GATE(806B5DE8, &lit_5705); +COMPILER_STRIP_GATE(0x806B5DE8, &lit_5705); #pragma pop /* 806B5DEC-806B5DF0 000118 0004+00 0/1 0/0 0/0 .rodata @5706 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5706 = 135.0f; -COMPILER_STRIP_GATE(806B5DEC, &lit_5706); +COMPILER_STRIP_GATE(0x806B5DEC, &lit_5706); #pragma pop /* 806B1D48-806B1F78 004528 0230+00 1/1 0/0 0/0 .text executeBombDamage__8daE_DT_cFv */ @@ -2069,7 +2075,7 @@ asm void daE_DT_c::executeBombDamage() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5952 = 450.0f; -COMPILER_STRIP_GATE(806B5DF0, &lit_5952); +COMPILER_STRIP_GATE(0x806B5DF0, &lit_5952); #pragma pop /* 806B1F78-806B28E4 004758 096C+00 2/1 0/0 0/0 .text executeDeath__8daE_DT_cFv */ @@ -2097,84 +2103,84 @@ asm void daE_DT_c::pointInSight(cXyz* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5953 = -1000.0f; -COMPILER_STRIP_GATE(806B5DF4, &lit_5953); +COMPILER_STRIP_GATE(0x806B5DF4, &lit_5953); #pragma pop /* 806B5DF8-806B5DFC 000124 0004+00 0/0 0/0 0/0 .rodata @5954 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5954 = 800.0f; -COMPILER_STRIP_GATE(806B5DF8, &lit_5954); +COMPILER_STRIP_GATE(0x806B5DF8, &lit_5954); #pragma pop /* 806B5DFC-806B5E00 000128 0004+00 0/0 0/0 0/0 .rodata @5955 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5955 = 55.0f; -COMPILER_STRIP_GATE(806B5DFC, &lit_5955); +COMPILER_STRIP_GATE(0x806B5DFC, &lit_5955); #pragma pop /* 806B5E00-806B5E04 00012C 0004+00 0/1 0/0 0/0 .rodata @5956 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5956 = 110.0f; -COMPILER_STRIP_GATE(806B5E00, &lit_5956); +COMPILER_STRIP_GATE(0x806B5E00, &lit_5956); #pragma pop /* 806B5E04-806B5E08 000130 0004+00 0/0 0/0 0/0 .rodata @5957 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5957 = 125.0f; -COMPILER_STRIP_GATE(806B5E04, &lit_5957); +COMPILER_STRIP_GATE(0x806B5E04, &lit_5957); #pragma pop /* 806B5E08-806B5E0C 000134 0004+00 0/0 0/0 0/0 .rodata @5958 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5958 = 212.0f; -COMPILER_STRIP_GATE(806B5E08, &lit_5958); +COMPILER_STRIP_GATE(0x806B5E08, &lit_5958); #pragma pop /* 806B5E0C-806B5E10 000138 0004+00 0/0 0/0 0/0 .rodata @5959 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5959 = 176.0f; -COMPILER_STRIP_GATE(806B5E0C, &lit_5959); +COMPILER_STRIP_GATE(0x806B5E0C, &lit_5959); #pragma pop /* 806B5E10-806B5E14 00013C 0004+00 0/0 0/0 0/0 .rodata @5960 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_5960 = 0x41D1999A; -COMPILER_STRIP_GATE(806B5E10, &lit_5960); +COMPILER_STRIP_GATE(0x806B5E10, &lit_5960); #pragma pop /* 806B5E14-806B5E18 000140 0004+00 0/0 0/0 0/0 .rodata @5961 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5961 = 180.0f; -COMPILER_STRIP_GATE(806B5E14, &lit_5961); +COMPILER_STRIP_GATE(0x806B5E14, &lit_5961); #pragma pop /* 806B5E18-806B5E1C 000144 0004+00 0/0 0/0 0/0 .rodata @5962 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5962 = 3.0f / 100.0f; -COMPILER_STRIP_GATE(806B5E18, &lit_5962); +COMPILER_STRIP_GATE(0x806B5E18, &lit_5962); #pragma pop /* 806B5E1C-806B5E20 000148 0004+00 0/1 0/0 0/0 .rodata @5963 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5963 = 600.0f; -COMPILER_STRIP_GATE(806B5E1C, &lit_5963); +COMPILER_STRIP_GATE(0x806B5E1C, &lit_5963); #pragma pop /* 806B5E20-806B5E24 00014C 0004+00 0/1 0/0 0/0 .rodata @5964 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5964 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(806B5E20, &lit_5964); +COMPILER_STRIP_GATE(0x806B5E20, &lit_5964); #pragma pop /* 806B5E24-806B5E2C 000150 0008+00 0/0 0/0 0/0 .rodata @5967 */ @@ -2183,42 +2189,42 @@ COMPILER_STRIP_GATE(806B5E20, &lit_5964); SECTION_RODATA static u8 const lit_5967[8] = { 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(806B5E24, &lit_5967); +COMPILER_STRIP_GATE(0x806B5E24, &lit_5967); #pragma pop /* 806B5E2C-806B5E30 000158 0004+00 0/4 0/0 0/0 .rodata @6430 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6430 = -100.0f; -COMPILER_STRIP_GATE(806B5E2C, &lit_6430); +COMPILER_STRIP_GATE(0x806B5E2C, &lit_6430); #pragma pop /* 806B5E30-806B5E34 00015C 0004+00 0/1 0/0 0/0 .rodata @6431 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6431 = 29.0f / 10.0f; -COMPILER_STRIP_GATE(806B5E30, &lit_6431); +COMPILER_STRIP_GATE(0x806B5E30, &lit_6431); #pragma pop /* 806B5E34-806B5E38 000160 0004+00 0/1 0/0 0/0 .rodata @6432 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6432 = 14.0f; -COMPILER_STRIP_GATE(806B5E34, &lit_6432); +COMPILER_STRIP_GATE(0x806B5E34, &lit_6432); #pragma pop /* 806B5E38-806B5E3C 000164 0004+00 0/1 0/0 0/0 .rodata @6433 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6433 = 19.0f; -COMPILER_STRIP_GATE(806B5E38, &lit_6433); +COMPILER_STRIP_GATE(0x806B5E38, &lit_6433); #pragma pop /* 806B5E3C-806B5E40 000168 0004+00 0/1 0/0 0/0 .rodata @6434 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6434 = 60.0f; -COMPILER_STRIP_GATE(806B5E3C, &lit_6434); +COMPILER_STRIP_GATE(0x806B5E3C, &lit_6434); #pragma pop /* 806B29D4-806B3B08 0051B4 1134+00 2/1 0/0 0/0 .text executeOpening__8daE_DT_cFv */ @@ -2236,126 +2242,126 @@ asm void daE_DT_c::executeOpening() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6435 = -300.0f; -COMPILER_STRIP_GATE(806B5E40, &lit_6435); +COMPILER_STRIP_GATE(0x806B5E40, &lit_6435); #pragma pop /* 806B5E44-806B5E48 000170 0004+00 0/1 0/0 0/0 .rodata @6436 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6436 = 3000.0f; -COMPILER_STRIP_GATE(806B5E44, &lit_6436); +COMPILER_STRIP_GATE(0x806B5E44, &lit_6436); #pragma pop /* 806B5E48-806B5E4C 000174 0004+00 0/0 0/0 0/0 .rodata @6437 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6437 = 1700.0f; -COMPILER_STRIP_GATE(806B5E48, &lit_6437); +COMPILER_STRIP_GATE(0x806B5E48, &lit_6437); #pragma pop /* 806B5E4C-806B5E50 000178 0004+00 0/0 0/0 0/0 .rodata @6438 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6438 = 3400.0f; -COMPILER_STRIP_GATE(806B5E4C, &lit_6438); +COMPILER_STRIP_GATE(0x806B5E4C, &lit_6438); #pragma pop /* 806B5E50-806B5E54 00017C 0004+00 0/0 0/0 0/0 .rodata @6439 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6439 = 1400.0f; -COMPILER_STRIP_GATE(806B5E50, &lit_6439); +COMPILER_STRIP_GATE(0x806B5E50, &lit_6439); #pragma pop /* 806B5E54-806B5E58 000180 0004+00 0/0 0/0 0/0 .rodata @6440 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6440 = 143.0f; -COMPILER_STRIP_GATE(806B5E54, &lit_6440); +COMPILER_STRIP_GATE(0x806B5E54, &lit_6440); #pragma pop /* 806B5E58-806B5E5C 000184 0004+00 0/0 0/0 0/0 .rodata @6441 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6441 = 3112.0f; -COMPILER_STRIP_GATE(806B5E58, &lit_6441); +COMPILER_STRIP_GATE(0x806B5E58, &lit_6441); #pragma pop /* 806B5E5C-806B5E60 000188 0004+00 0/0 0/0 0/0 .rodata @6442 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6442 = 243.0f; -COMPILER_STRIP_GATE(806B5E5C, &lit_6442); +COMPILER_STRIP_GATE(0x806B5E5C, &lit_6442); #pragma pop /* 806B5E60-806B5E64 00018C 0004+00 0/0 0/0 0/0 .rodata @6443 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6443 = -150.0f; -COMPILER_STRIP_GATE(806B5E60, &lit_6443); +COMPILER_STRIP_GATE(0x806B5E60, &lit_6443); #pragma pop /* 806B5E64-806B5E68 000190 0004+00 0/0 0/0 0/0 .rodata @6444 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6444 = 1600.0f; -COMPILER_STRIP_GATE(806B5E64, &lit_6444); +COMPILER_STRIP_GATE(0x806B5E64, &lit_6444); #pragma pop /* 806B5E68-806B5E6C 000194 0004+00 0/0 0/0 0/0 .rodata @6445 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6445 = 115.0f; -COMPILER_STRIP_GATE(806B5E68, &lit_6445); +COMPILER_STRIP_GATE(0x806B5E68, &lit_6445); #pragma pop /* 806B5E6C-806B5E70 000198 0004+00 0/0 0/0 0/0 .rodata @6446 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6446 = 1550.0f; -COMPILER_STRIP_GATE(806B5E6C, &lit_6446); +COMPILER_STRIP_GATE(0x806B5E6C, &lit_6446); #pragma pop /* 806B5E70-806B5E74 00019C 0004+00 0/1 0/0 0/0 .rodata @6447 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6447 = 350.0f; -COMPILER_STRIP_GATE(806B5E70, &lit_6447); +COMPILER_STRIP_GATE(0x806B5E70, &lit_6447); #pragma pop /* 806B5E74-806B5E78 0001A0 0004+00 0/2 0/0 0/0 .rodata @6448 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6448 = -500.0f; -COMPILER_STRIP_GATE(806B5E74, &lit_6448); +COMPILER_STRIP_GATE(0x806B5E74, &lit_6448); #pragma pop /* 806B5E78-806B5E7C 0001A4 0004+00 0/0 0/0 0/0 .rodata @6449 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6449 = 290.0f; -COMPILER_STRIP_GATE(806B5E78, &lit_6449); +COMPILER_STRIP_GATE(0x806B5E78, &lit_6449); #pragma pop /* 806B5E7C-806B5E80 0001A8 0004+00 0/0 0/0 0/0 .rodata @6450 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6450 = 330.0f; -COMPILER_STRIP_GATE(806B5E7C, &lit_6450); +COMPILER_STRIP_GATE(0x806B5E7C, &lit_6450); #pragma pop /* 806B5E80-806B5E84 0001AC 0004+00 0/1 0/0 0/0 .rodata @6451 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6451 = 40.0f; -COMPILER_STRIP_GATE(806B5E80, &lit_6451); +COMPILER_STRIP_GATE(0x806B5E80, &lit_6451); #pragma pop /* 806B5E84-806B5E88 0001B0 0004+00 0/2 0/0 0/0 .rodata @6618 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6618 = 400.0f; -COMPILER_STRIP_GATE(806B5E84, &lit_6618); +COMPILER_STRIP_GATE(0x806B5E84, &lit_6618); #pragma pop /* 806B3B08-806B40D8 0062E8 05D0+00 1/1 0/0 0/0 .text calcCamera__8daE_DT_cFv */ @@ -2373,67 +2379,67 @@ asm void daE_DT_c::calcCamera() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6724 = -80.0f; -COMPILER_STRIP_GATE(806B5E88, &lit_6724); +COMPILER_STRIP_GATE(0x806B5E88, &lit_6724); #pragma pop /* 806B5E8C-806B5E90 0001B8 0004+00 0/1 0/0 0/0 .rodata @6725 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6725 = 9.0f; -COMPILER_STRIP_GATE(806B5E8C, &lit_6725); +COMPILER_STRIP_GATE(0x806B5E8C, &lit_6725); #pragma pop /* 806B5E90-806B5E94 0001BC 0004+00 0/1 0/0 0/0 .rodata @6726 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6726 = 2048.0f; -COMPILER_STRIP_GATE(806B5E90, &lit_6726); +COMPILER_STRIP_GATE(0x806B5E90, &lit_6726); #pragma pop /* 806B5E94-806B5E98 0001C0 0004+00 0/1 0/0 0/0 .rodata @6727 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6727 = 6144.0f; -COMPILER_STRIP_GATE(806B5E94, &lit_6727); +COMPILER_STRIP_GATE(0x806B5E94, &lit_6727); #pragma pop /* 806B5E98-806B5E9C 0001C4 0004+00 0/1 0/0 0/0 .rodata @6728 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6728 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(806B5E98, &lit_6728); +COMPILER_STRIP_GATE(0x806B5E98, &lit_6728); #pragma pop /* 806B5E9C-806B5EA0 0001C8 0004+00 0/1 0/0 0/0 .rodata @6729 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6729 = 1.0f / 20.0f; -COMPILER_STRIP_GATE(806B5E9C, &lit_6729); +COMPILER_STRIP_GATE(0x806B5E9C, &lit_6729); #pragma pop /* 806B5EA0-806B5EA4 0001CC 0004+00 0/1 0/0 0/0 .rodata @6730 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6730 = 80.0f; -COMPILER_STRIP_GATE(806B5EA0, &lit_6730); +COMPILER_STRIP_GATE(0x806B5EA0, &lit_6730); #pragma pop /* 806B5EA4-806B5EA8 0001D0 0004+00 0/1 0/0 0/0 .rodata @6731 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6731 = 2.0f; -COMPILER_STRIP_GATE(806B5EA4, &lit_6731); +COMPILER_STRIP_GATE(0x806B5EA4, &lit_6731); #pragma pop /* 806B5EA8-806B5EAC 0001D4 0004+00 1/2 0/0 0/0 .rodata @6732 */ SECTION_RODATA static f32 const lit_6732 = 1.0f / 50.0f; -COMPILER_STRIP_GATE(806B5EA8, &lit_6732); +COMPILER_STRIP_GATE(0x806B5EA8, &lit_6732); /* 806B5EAC-806B5EB0 0001D8 0004+00 0/1 0/0 0/0 .rodata @6733 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6733 = 1.0f / 100.0f; -COMPILER_STRIP_GATE(806B5EAC, &lit_6733); +COMPILER_STRIP_GATE(0x806B5EAC, &lit_6733); #pragma pop /* 806B40D8-806B4724 0068B8 064C+00 1/1 0/0 0/0 .text calcBoxAndTuba__8daE_DT_cFv */ @@ -2471,28 +2477,28 @@ asm void daE_DT_c::mtx_set() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6949 = 510.0f; -COMPILER_STRIP_GATE(806B5EB0, &lit_6949); +COMPILER_STRIP_GATE(0x806B5EB0, &lit_6949); #pragma pop /* 806B5EB4-806B5EB8 0001E0 0004+00 0/1 0/0 0/0 .rodata @6950 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6950 = 360.0f; -COMPILER_STRIP_GATE(806B5EB4, &lit_6950); +COMPILER_STRIP_GATE(0x806B5EB4, &lit_6950); #pragma pop /* 806B5EB8-806B5EBC 0001E4 0004+00 0/1 0/0 0/0 .rodata @6951 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6951 = 370.0f; -COMPILER_STRIP_GATE(806B5EB8, &lit_6951); +COMPILER_STRIP_GATE(0x806B5EB8, &lit_6951); #pragma pop /* 806B5EBC-806B5EC0 0001E8 0004+00 0/1 0/0 0/0 .rodata @6952 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6952 = 220.0f; -COMPILER_STRIP_GATE(806B5EBC, &lit_6952); +COMPILER_STRIP_GATE(0x806B5EBC, &lit_6952); #pragma pop /* 806B4B24-806B4FD8 007304 04B4+00 1/1 0/0 0/0 .text cc_set__8daE_DT_cFv */ @@ -2530,6 +2536,14 @@ static bool daE_DT_IsDelete(daE_DT_c* param_0) { return true; } +/* ############################################################################################## */ +/* 806B5ED0-806B5ED0 0001FC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_806B5ED5 = "Dalways"; +SECTION_DEAD static char const* const stringBase_806B5EDD = "E_OT"; +#pragma pop + /* 806B5158-806B51F4 007938 009C+00 1/1 0/0 0/0 .text _delete__8daE_DT_cFv */ #pragma push #pragma optimization_level 0 @@ -2550,6 +2564,13 @@ static asm void daE_DT_Delete(daE_DT_c* param_0) { } #pragma pop +/* ############################################################################################## */ +/* 806B5ED0-806B5ED0 0001FC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_806B5EE2 = "BoxB.bmd"; +#pragma pop + /* 806B5214-806B5440 0079F4 022C+00 1/1 0/0 0/0 .text CreateHeap__8daE_DT_cFv */ #pragma push #pragma optimization_level 0 @@ -2575,28 +2596,28 @@ static asm void useHeapInit(fopAc_ac_c* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7217 = -700.0f; -COMPILER_STRIP_GATE(806B5EC0, &lit_7217); +COMPILER_STRIP_GATE(0x806B5EC0, &lit_7217); #pragma pop /* 806B5EC4-806B5EC8 0001F0 0004+00 0/1 0/0 0/0 .rodata @7218 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7218 = -200.0f; -COMPILER_STRIP_GATE(806B5EC4, &lit_7218); +COMPILER_STRIP_GATE(0x806B5EC4, &lit_7218); #pragma pop /* 806B5EC8-806B5ECC 0001F4 0004+00 0/1 0/0 0/0 .rodata @7219 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7219 = 500.0f; -COMPILER_STRIP_GATE(806B5EC8, &lit_7219); +COMPILER_STRIP_GATE(0x806B5EC8, &lit_7219); #pragma pop /* 806B5ECC-806B5ED0 0001F8 0004+00 0/1 0/0 0/0 .rodata @7220 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7220 = -800.0f; -COMPILER_STRIP_GATE(806B5ECC, &lit_7220); +COMPILER_STRIP_GATE(0x806B5ECC, &lit_7220); #pragma pop /* 806B5460-806B592C 007C40 04CC+00 1/1 0/0 0/0 .text create__8daE_DT_cFv */ @@ -2706,7 +2727,7 @@ asm void __sinit_d_a_e_dt_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_806B5C24 = (void*)__sinit_d_a_e_dt_cpp; +REGISTER_CTORS(0x806B5C24, __sinit_d_a_e_dt_cpp); #pragma pop /* 806B5C7C-806B5C84 00845C 0008+00 1/0 0/0 0/0 .text @36@__dt__12dBgS_ObjAcchFv */ @@ -2911,12 +2932,4 @@ static u8 data_806B63A8[4]; static u8 data_806B63AC[4]; #pragma pop -/* 806B5ED0-806B5EEB 0001FC 001B+00 5/5 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_806B5ED0 = "E_DT"; -SECTION_DEAD static char const* const stringBase_806B5ED5 = "Dalways"; -SECTION_DEAD static char const* const stringBase_806B5EDD = "E_OT"; -SECTION_DEAD static char const* const stringBase_806B5EE2 = "BoxB.bmd"; -#pragma pop +/* 806B5ED0-806B5ED0 0001FC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/e/d_a_e_fb/d_a_e_fb.cpp b/rel/d/a/e/d_a_e_fb/d_a_e_fb.cpp index 1782716cfaf..e5ee48f217f 100644 --- a/rel/d/a/e/d_a_e_fb/d_a_e_fb.cpp +++ b/rel/d/a/e/d_a_e_fb/d_a_e_fb.cpp @@ -43,16 +43,16 @@ struct mDoExt_brkAnm { /* 8000D7A8 */ void entry(J3DMaterialTable*, f32); }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; - struct J3DAnmTransform {}; +struct J3DModelData {}; + +struct Z2Creature {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -414,11 +414,11 @@ extern "C" void __register_global_object(); /* ############################################################################################## */ /* 806B8F8C-806B8F90 000000 0004+00 9/9 0/0 0/0 .rodata @3662 */ SECTION_RODATA static f32 const lit_3662 = 1.5f; -COMPILER_STRIP_GATE(806B8F8C, &lit_3662); +COMPILER_STRIP_GATE(0x806B8F8C, &lit_3662); /* 806B8F90-806B8F94 000004 0004+00 1/1 0/0 0/0 .rodata @3663 */ SECTION_RODATA static f32 const lit_3663 = 1500.0f; -COMPILER_STRIP_GATE(806B8F90, &lit_3663); +COMPILER_STRIP_GATE(0x806B8F90, &lit_3663); /* 806B9034-806B9074 000000 0040+00 1/1 0/0 0/0 .data cc_fb_src__22@unnamed@d_a_e_fb_cpp@ */ @@ -602,14 +602,14 @@ asm void daE_FB_c::JointCallBack(J3DJoint* param_0, int param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3748 = 10.0f; -COMPILER_STRIP_GATE(806B8F94, &lit_3748); +COMPILER_STRIP_GATE(0x806B8F94, &lit_3748); #pragma pop /* 806B8F98-806B8F9C 00000C 0004+00 0/1 0/0 0/0 .rodata @3749 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3749 = 1300.0f; -COMPILER_STRIP_GATE(806B8F98, &lit_3749); +COMPILER_STRIP_GATE(0x806B8F98, &lit_3749); #pragma pop /* 806B8F9C-806B8FA0 000010 0004+00 2/7 0/0 0/0 .rodata @3750 */ @@ -619,11 +619,11 @@ SECTION_RODATA static u8 const lit_3750[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(806B8F9C, &lit_3750); +COMPILER_STRIP_GATE(0x806B8F9C, &lit_3750); /* 806B8FA0-806B8FA4 000014 0004+00 4/8 0/0 0/0 .rodata @3751 */ SECTION_RODATA static f32 const lit_3751 = 1.0f; -COMPILER_STRIP_GATE(806B8FA0, &lit_3751); +COMPILER_STRIP_GATE(0x806B8FA0, &lit_3751); /* 806B91B0-806B91B4 000008 0001+03 1/1 0/0 0/0 .bss @1109 */ static u8 lit_1109[1 + 3 /* padding */]; @@ -746,7 +746,13 @@ static asm void daE_FB_Draw(daE_FB_c* param_0) { /* ############################################################################################## */ /* 806B8FA4-806B8FA8 000018 0004+00 1/2 0/0 0/0 .rodata @3764 */ SECTION_RODATA static f32 const lit_3764 = -1.0f; -COMPILER_STRIP_GATE(806B8FA4, &lit_3764); +COMPILER_STRIP_GATE(0x806B8FA4, &lit_3764); + +/* 806B9028-806B9028 00009C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_806B9028 = "E_FL"; +#pragma pop /* 806B67E0-806B688C 000420 00AC+00 3/3 0/0 0/0 .text setBck__8daE_FB_cFiUcff */ #pragma push @@ -781,7 +787,7 @@ asm void daE_FB_c::damage_check() { /* ############################################################################################## */ /* 806B8FA8-806B8FAC 00001C 0004+00 1/3 0/0 0/0 .rodata @3877 */ SECTION_RODATA static f32 const lit_3877 = 100.0f; -COMPILER_STRIP_GATE(806B8FA8, &lit_3877); +COMPILER_STRIP_GATE(0x806B8FA8, &lit_3877); /* 806B6D20-806B6DF4 000960 00D4+00 3/3 0/0 0/0 .text mBgLineCheck__8daE_FB_cFv */ #pragma push @@ -808,42 +814,42 @@ asm void daE_FB_c::search_check() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3965 = 6.0f; -COMPILER_STRIP_GATE(806B8FAC, &lit_3965); +COMPILER_STRIP_GATE(0x806B8FAC, &lit_3965); #pragma pop /* 806B8FB0-806B8FB4 000024 0004+00 0/2 0/0 0/0 .rodata @3966 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3966 = 300.0f; -COMPILER_STRIP_GATE(806B8FB0, &lit_3966); +COMPILER_STRIP_GATE(0x806B8FB0, &lit_3966); #pragma pop /* 806B8FB4-806B8FB8 000028 0004+00 0/2 0/0 0/0 .rodata @3967 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3967 = -300.0f; -COMPILER_STRIP_GATE(806B8FB4, &lit_3967); +COMPILER_STRIP_GATE(0x806B8FB4, &lit_3967); #pragma pop /* 806B8FB8-806B8FBC 00002C 0004+00 0/2 0/0 0/0 .rodata @3968 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3968 = -2800.0f; -COMPILER_STRIP_GATE(806B8FB8, &lit_3968); +COMPILER_STRIP_GATE(0x806B8FB8, &lit_3968); #pragma pop /* 806B8FBC-806B8FC0 000030 0004+00 0/2 0/0 0/0 .rodata @3969 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3969 = -3600.0f; -COMPILER_STRIP_GATE(806B8FBC, &lit_3969); +COMPILER_STRIP_GATE(0x806B8FBC, &lit_3969); #pragma pop /* 806B8FC0-806B8FC4 000034 0004+00 0/1 0/0 0/0 .rodata @3970 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3970 = -700.0f; -COMPILER_STRIP_GATE(806B8FC0, &lit_3970); +COMPILER_STRIP_GATE(0x806B8FC0, &lit_3970); #pragma pop /* 806B6F40-806B70FC 000B80 01BC+00 1/1 0/0 0/0 .text executeWait__8daE_FB_cFv */ @@ -861,42 +867,42 @@ asm void daE_FB_c::executeWait() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4260 = 36.0f; -COMPILER_STRIP_GATE(806B8FC4, &lit_4260); +COMPILER_STRIP_GATE(0x806B8FC4, &lit_4260); #pragma pop /* 806B8FC8-806B8FCC 00003C 0004+00 0/1 0/0 0/0 .rodata @4261 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4261 = 160.0f; -COMPILER_STRIP_GATE(806B8FC8, &lit_4261); +COMPILER_STRIP_GATE(0x806B8FC8, &lit_4261); #pragma pop /* 806B8FCC-806B8FD0 000040 0004+00 0/1 0/0 0/0 .rodata @4262 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4262 = 250.0f; -COMPILER_STRIP_GATE(806B8FCC, &lit_4262); +COMPILER_STRIP_GATE(0x806B8FCC, &lit_4262); #pragma pop /* 806B8FD0-806B8FD4 000044 0004+00 0/3 0/0 0/0 .rodata @4263 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4263 = 200.0f; -COMPILER_STRIP_GATE(806B8FD0, &lit_4263); +COMPILER_STRIP_GATE(0x806B8FD0, &lit_4263); #pragma pop /* 806B8FD4-806B8FD8 000048 0004+00 0/1 0/0 0/0 .rodata @4264 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4264 = -1.0f / 5.0f; -COMPILER_STRIP_GATE(806B8FD4, &lit_4264); +COMPILER_STRIP_GATE(0x806B8FD4, &lit_4264); #pragma pop /* 806B8FD8-806B8FDC 00004C 0004+00 0/1 0/0 0/0 .rodata @4265 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4265 = -900.0f; -COMPILER_STRIP_GATE(806B8FD8, &lit_4265); +COMPILER_STRIP_GATE(0x806B8FD8, &lit_4265); #pragma pop /* 806B8FDC-806B8FE4 000050 0008+00 0/3 0/0 0/0 .rodata @4267 */ @@ -905,7 +911,7 @@ COMPILER_STRIP_GATE(806B8FD8, &lit_4265); SECTION_RODATA static u8 const lit_4267[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(806B8FDC, &lit_4267); +COMPILER_STRIP_GATE(0x806B8FDC, &lit_4267); #pragma pop /* 806B9220-806B9224 000078 0004+00 2/2 0/0 0/0 .bss mFireTimer */ @@ -926,21 +932,21 @@ asm void daE_FB_c::executeAttack() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4370 = 3.0f; -COMPILER_STRIP_GATE(806B8FE4, &lit_4370); +COMPILER_STRIP_GATE(0x806B8FE4, &lit_4370); #pragma pop /* 806B8FE8-806B8FEC 00005C 0004+00 0/1 0/0 0/0 .rodata @4371 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4371 = 4000.0f; -COMPILER_STRIP_GATE(806B8FE8, &lit_4371); +COMPILER_STRIP_GATE(0x806B8FE8, &lit_4371); #pragma pop /* 806B8FEC-806B8FF0 000060 0004+00 0/1 0/0 0/0 .rodata @4372 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4372 = 50.0f; -COMPILER_STRIP_GATE(806B8FEC, &lit_4372); +COMPILER_STRIP_GATE(0x806B8FEC, &lit_4372); #pragma pop /* 806B78A0-806B7B88 0014E0 02E8+00 1/1 0/0 0/0 .text executeDamage__8daE_FB_cFv */ @@ -958,21 +964,21 @@ asm void daE_FB_c::executeDamage() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4451 = 35.0f; -COMPILER_STRIP_GATE(806B8FF0, &lit_4451); +COMPILER_STRIP_GATE(0x806B8FF0, &lit_4451); #pragma pop /* 806B8FF4-806B8FF8 000068 0004+00 0/1 0/0 0/0 .rodata @4452 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4452 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(806B8FF4, &lit_4452); +COMPILER_STRIP_GATE(0x806B8FF4, &lit_4452); #pragma pop /* 806B8FF8-806B8FFC 00006C 0004+00 0/2 0/0 0/0 .rodata @4453 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4453 = 40.0f; -COMPILER_STRIP_GATE(806B8FF8, &lit_4453); +COMPILER_STRIP_GATE(0x806B8FF8, &lit_4453); #pragma pop /* 806B9224-806B9228 00007C 0004+00 2/3 0/0 0/0 .bss None */ @@ -997,7 +1003,7 @@ SECTION_RODATA static f32 const lit_4528[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(806B8FFC, &lit_4528); +COMPILER_STRIP_GATE(0x806B8FFC, &lit_4528); #pragma pop /* 806B9004-806B900C 000078 0008+00 0/1 0/0 0/0 .rodata @4531 */ @@ -1006,7 +1012,7 @@ COMPILER_STRIP_GATE(806B8FFC, &lit_4528); SECTION_RODATA static u8 const lit_4531[8] = { 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(806B9004, &lit_4531); +COMPILER_STRIP_GATE(0x806B9004, &lit_4531); #pragma pop /* 806B7DDC-806B80A4 001A1C 02C8+00 1/1 0/0 0/0 .text action__8daE_FB_cFv */ @@ -1034,35 +1040,35 @@ asm void daE_FB_c::mtx_set() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4604 = -20.0f; -COMPILER_STRIP_GATE(806B900C, &lit_4604); +COMPILER_STRIP_GATE(0x806B900C, &lit_4604); #pragma pop /* 806B9010-806B9014 000084 0004+00 0/1 0/0 0/0 .rodata @4605 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4605 = 30.0f; -COMPILER_STRIP_GATE(806B9010, &lit_4605); +COMPILER_STRIP_GATE(0x806B9010, &lit_4605); #pragma pop /* 806B9014-806B9018 000088 0004+00 0/1 0/0 0/0 .rodata @4606 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4606 = 150.0f; -COMPILER_STRIP_GATE(806B9014, &lit_4606); +COMPILER_STRIP_GATE(0x806B9014, &lit_4606); #pragma pop /* 806B9018-806B901C 00008C 0004+00 0/1 0/0 0/0 .rodata @4607 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4607 = -40.0f; -COMPILER_STRIP_GATE(806B9018, &lit_4607); +COMPILER_STRIP_GATE(0x806B9018, &lit_4607); #pragma pop /* 806B901C-806B9020 000090 0004+00 0/1 0/0 0/0 .rodata @4608 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4608 = 170.0f; -COMPILER_STRIP_GATE(806B901C, &lit_4608); +COMPILER_STRIP_GATE(0x806B901C, &lit_4608); #pragma pop /* 806B811C-806B82B4 001D5C 0198+00 1/1 0/0 0/0 .text cc_set__8daE_FB_cFv */ @@ -1175,14 +1181,20 @@ static asm void useHeapInit(fopAc_ac_c* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4934 = -200.0f; -COMPILER_STRIP_GATE(806B9020, &lit_4934); +COMPILER_STRIP_GATE(0x806B9020, &lit_4934); #pragma pop /* 806B9024-806B9028 000098 0004+00 0/1 0/0 0/0 .rodata @4935 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4935 = 80.0f; -COMPILER_STRIP_GATE(806B9024, &lit_4935); +COMPILER_STRIP_GATE(0x806B9024, &lit_4935); +#pragma pop + +/* 806B9028-806B9028 00009C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_806B902D = "E_fb"; #pragma pop /* 806B88E0-806B8C1C 002520 033C+00 1/1 0/0 0/0 .text create__8daE_FB_cFv */ @@ -1267,7 +1279,7 @@ asm void __sinit_d_a_e_fb_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_806B8F2C = (void*)__sinit_d_a_e_fb_cpp; +REGISTER_CTORS(0x806B8F2C, __sinit_d_a_e_fb_cpp); #pragma pop /* 806B8F68-806B8F70 002BA8 0008+00 1/0 0/0 0/0 .text @36@__dt__12dBgS_ObjAcchFv */ @@ -1462,10 +1474,4 @@ static u8 data_806B9284[4]; static u8 data_806B9288[4]; #pragma pop -/* 806B9028-806B9032 00009C 000A+00 4/4 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_806B9028 = "E_FL"; -SECTION_DEAD static char const* const stringBase_806B902D = "E_fb"; -#pragma pop +/* 806B9028-806B9028 00009C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/e/d_a_e_fk/d_a_e_fk.cpp b/rel/d/a/e/d_a_e_fk/d_a_e_fk.cpp index 499427fc46c..ca8d2f39a71 100644 --- a/rel/d/a/e/d_a_e_fk/d_a_e_fk.cpp +++ b/rel/d/a/e/d_a_e_fk/d_a_e_fk.cpp @@ -35,16 +35,16 @@ struct mDoExt_invisibleModel { /* 8000E7C0 */ void entryDL(cXyz*); }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; - struct J3DAnmTransform {}; +struct J3DModelData {}; + +struct Z2Creature {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -355,7 +355,7 @@ extern "C" void __register_global_object(); /* ############################################################################################## */ /* 806BB6D0-806BB6D4 000000 0004+00 12/12 0/0 0/0 .rodata @3826 */ SECTION_RODATA static f32 const lit_3826 = 100.0f; -COMPILER_STRIP_GATE(806BB6D0, &lit_3826); +COMPILER_STRIP_GATE(0x806BB6D0, &lit_3826); /* 806BB6D4-806BB6D8 000004 0004+00 4/10 0/0 0/0 .rodata @3827 */ SECTION_RODATA static u8 const lit_3827[4] = { @@ -364,7 +364,7 @@ SECTION_RODATA static u8 const lit_3827[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(806BB6D4, &lit_3827); +COMPILER_STRIP_GATE(0x806BB6D4, &lit_3827); /* 806BB6D8-806BB6E0 000008 0004+04 2/7 0/0 0/0 .rodata @3828 */ SECTION_RODATA static f32 const lit_3828[1 + 1 /* padding */] = { @@ -372,7 +372,7 @@ SECTION_RODATA static f32 const lit_3828[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(806BB6D8, &lit_3828); +COMPILER_STRIP_GATE(0x806BB6D8, &lit_3828); /* 806BB6E0-806BB6E8 000010 0008+00 0/1 0/0 0/0 .rodata @3829 */ #pragma push @@ -380,7 +380,7 @@ COMPILER_STRIP_GATE(806BB6D8, &lit_3828); SECTION_RODATA static u8 const lit_3829[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(806BB6E0, &lit_3829); +COMPILER_STRIP_GATE(0x806BB6E0, &lit_3829); #pragma pop /* 806BB6E8-806BB6F0 000018 0008+00 0/1 0/0 0/0 .rodata @3830 */ @@ -389,7 +389,7 @@ COMPILER_STRIP_GATE(806BB6E0, &lit_3829); SECTION_RODATA static u8 const lit_3830[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(806BB6E8, &lit_3830); +COMPILER_STRIP_GATE(0x806BB6E8, &lit_3830); #pragma pop /* 806BB6F0-806BB6F8 000020 0008+00 0/1 0/0 0/0 .rodata @3831 */ @@ -398,23 +398,23 @@ COMPILER_STRIP_GATE(806BB6E8, &lit_3830); SECTION_RODATA static u8 const lit_3831[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(806BB6F0, &lit_3831); +COMPILER_STRIP_GATE(0x806BB6F0, &lit_3831); #pragma pop /* 806BB6F8-806BB6FC 000028 0004+00 0/0 0/0 0/0 .rodata @3832 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3832 = 1.0f / 100.0f; -COMPILER_STRIP_GATE(806BB6F8, &lit_3832); +COMPILER_STRIP_GATE(0x806BB6F8, &lit_3832); #pragma pop /* 806BB6FC-806BB700 00002C 0004+00 1/1 0/0 0/0 .rodata @3848 */ SECTION_RODATA static f32 const lit_3848 = 4.0f / 5.0f; -COMPILER_STRIP_GATE(806BB6FC, &lit_3848); +COMPILER_STRIP_GATE(0x806BB6FC, &lit_3848); /* 806BB700-806BB704 000030 0004+00 1/1 0/0 0/0 .rodata @3849 */ SECTION_RODATA static f32 const lit_3849 = 2.0f; -COMPILER_STRIP_GATE(806BB700, &lit_3849); +COMPILER_STRIP_GATE(0x806BB700, &lit_3849); /* 806BB82C-806BB84C -00001 0020+00 1/0 0/0 0/0 .data l_daE_FK_Method */ SECTION_DATA static void* l_daE_FK_Method[8] = { @@ -482,6 +482,13 @@ asm daE_FK_HIO_c::daE_FK_HIO_c() { } #pragma pop +/* ############################################################################################## */ +/* 806BB81C-806BB81C 00014C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_806BB81C = "E_fk"; +#pragma pop + /* 806B93CC-806B9514 00012C 0148+00 1/1 0/0 0/0 .text CreateHeap__8daE_FK_cFv */ #pragma push #pragma optimization_level 0 @@ -510,7 +517,7 @@ SECTION_RODATA static u8 const ccBodySphSrc[64] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0xC8, 0x00, 0x00, }; -COMPILER_STRIP_GATE(806BB704, &ccBodySphSrc); +COMPILER_STRIP_GATE(0x806BB704, &ccBodySphSrc); /* 806B9534-806B95BC 000294 0088+00 1/1 0/0 0/0 .text initBodySph__8daE_FK_cFv */ #pragma push @@ -530,7 +537,7 @@ SECTION_RODATA static u8 const ccSphSrc[64] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0xA0, 0x00, 0x00, }; -COMPILER_STRIP_GATE(806BB744, &ccSphSrc); +COMPILER_STRIP_GATE(0x806BB744, &ccSphSrc); /* 806B95BC-806B9670 00031C 00B4+00 1/1 0/0 0/0 .text initSwordSph__8daE_FK_cFv */ #pragma push @@ -545,7 +552,7 @@ asm void daE_FK_c::initSwordSph() { /* ############################################################################################## */ /* 806BB784-806BB788 0000B4 0004+00 1/1 0/0 0/0 .rodata @3951 */ SECTION_RODATA static f32 const lit_3951 = 400.0f; -COMPILER_STRIP_GATE(806BB784, &lit_3951); +COMPILER_STRIP_GATE(0x806BB784, &lit_3951); /* 806BB8D0-806BB8D4 000008 0001+03 3/3 0/0 0/0 .bss @1109 */ static u8 lit_1109[1 + 3 /* padding */]; @@ -663,21 +670,21 @@ asm void daE_FK_c::SetBodySph() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3972 = -500.0f; -COMPILER_STRIP_GATE(806BB788, &lit_3972); +COMPILER_STRIP_GATE(0x806BB788, &lit_3972); #pragma pop /* 806BB78C-806BB790 0000BC 0004+00 0/1 0/0 0/0 .rodata @3973 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3973 = 350.0f; -COMPILER_STRIP_GATE(806BB78C, &lit_3973); +COMPILER_STRIP_GATE(0x806BB78C, &lit_3973); #pragma pop /* 806BB790-806BB794 0000C0 0004+00 0/1 0/0 0/0 .rodata @3974 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3974 = 250.0f; -COMPILER_STRIP_GATE(806BB790, &lit_3974); +COMPILER_STRIP_GATE(0x806BB790, &lit_3974); #pragma pop /* 806B97A4-806B98C4 000504 0120+00 1/1 0/0 0/0 .text SetSwordSph__8daE_FK_cFv */ @@ -693,13 +700,13 @@ asm void daE_FK_c::SetSwordSph() { /* ############################################################################################## */ /* 806BB794-806BB798 0000C4 0004+00 1/1 0/0 0/0 .rodata @4008 */ SECTION_RODATA static f32 const lit_4008 = 3.0f / 10.0f; -COMPILER_STRIP_GATE(806BB794, &lit_4008); +COMPILER_STRIP_GATE(0x806BB794, &lit_4008); /* 806BB798-806BB7A0 0000C8 0008+00 1/1 0/0 0/0 .rodata @4010 */ SECTION_RODATA static u8 const lit_4010[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(806BB798, &lit_4010); +COMPILER_STRIP_GATE(0x806BB798, &lit_4010); /* 806B98C4-806B99DC 000624 0118+00 1/1 0/0 0/0 .text ctrlJoint__8daE_FK_cFP8J3DJointP8J3DModel */ #pragma push @@ -724,7 +731,13 @@ static asm void JointCallBack(J3DJoint* param_0, int param_1) { /* ############################################################################################## */ /* 806BB7A0-806BB7A4 0000D0 0004+00 1/1 0/0 0/0 .rodata @4037 */ SECTION_RODATA static f32 const lit_4037 = -1.0f; -COMPILER_STRIP_GATE(806BB7A0, &lit_4037); +COMPILER_STRIP_GATE(0x806BB7A0, &lit_4037); + +/* 806BB81C-806BB81C 00014C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_806BB821 = "e_fk"; +#pragma pop /* 806B9A28-806B9AD8 000788 00B0+00 4/4 0/0 0/0 .text SetAnm__8daE_FK_cFiiff */ #pragma push @@ -741,19 +754,19 @@ asm void daE_FK_c::SetAnm(int param_0, int param_1, f32 param_2, f32 param_3) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4067 = 30.0f; -COMPILER_STRIP_GATE(806BB7A4, &lit_4067); +COMPILER_STRIP_GATE(0x806BB7A4, &lit_4067); #pragma pop /* 806BB7A8-806BB7AC 0000D8 0004+00 0/0 0/0 0/0 .rodata @4068 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4068 = 300.0f; -COMPILER_STRIP_GATE(806BB7A8, &lit_4068); +COMPILER_STRIP_GATE(0x806BB7A8, &lit_4068); #pragma pop /* 806BB7AC-806BB7B0 0000DC 0004+00 1/1 0/0 0/0 .rodata @4129 */ SECTION_RODATA static f32 const lit_4129 = 150.0f; -COMPILER_STRIP_GATE(806BB7AC, &lit_4129); +COMPILER_STRIP_GATE(0x806BB7AC, &lit_4129); /* 806B9AD8-806B9B2C 000838 0054+00 1/1 0/0 0/0 .text Yazirushi__8daE_FK_cFv */ #pragma push @@ -770,12 +783,12 @@ asm void daE_FK_c::Yazirushi() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4138 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(806BB7B0, &lit_4138); +COMPILER_STRIP_GATE(0x806BB7B0, &lit_4138); #pragma pop /* 806BB7B4-806BB7B8 0000E4 0004+00 1/4 0/0 0/0 .rodata @4139 */ SECTION_RODATA static f32 const lit_4139 = 5.0f; -COMPILER_STRIP_GATE(806BB7B4, &lit_4139); +COMPILER_STRIP_GATE(0x806BB7B4, &lit_4139); /* 806B9B2C-806B9BB4 00088C 0088+00 5/5 0/0 0/0 .text SpeedSet__8daE_FK_cFv */ #pragma push @@ -847,26 +860,26 @@ asm void daE_FK_c::OnAt() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4234 = 2000.0f; -COMPILER_STRIP_GATE(806BB7B8, &lit_4234); +COMPILER_STRIP_GATE(0x806BB7B8, &lit_4234); #pragma pop /* 806BB7BC-806BB7C0 0000EC 0004+00 0/1 0/0 0/0 .rodata @4235 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4235 = 1000.0f; -COMPILER_STRIP_GATE(806BB7BC, &lit_4235); +COMPILER_STRIP_GATE(0x806BB7BC, &lit_4235); #pragma pop /* 806BB7C0-806BB7C4 0000F0 0004+00 0/0 0/0 0/0 .rodata @4236 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4236 = -4000.0f; -COMPILER_STRIP_GATE(806BB7C0, &lit_4236); +COMPILER_STRIP_GATE(0x806BB7C0, &lit_4236); #pragma pop /* 806BB7C4-806BB7C8 0000F4 0004+00 1/1 0/0 0/0 .rodata @4250 */ SECTION_RODATA static f32 const lit_4250 = 4000.0f; -COMPILER_STRIP_GATE(806BB7C4, &lit_4250); +COMPILER_STRIP_GATE(0x806BB7C4, &lit_4250); /* 806BB930-806BB934 000068 0004+00 0/1 0/0 0/0 .bss s_dis__22@unnamed@d_a_e_fk_cpp@ */ #pragma push @@ -929,21 +942,21 @@ asm void daE_FK_c::R_MoveAction() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4265 = -100.0f; -COMPILER_STRIP_GATE(806BB7C8, &lit_4265); +COMPILER_STRIP_GATE(0x806BB7C8, &lit_4265); #pragma pop /* 806BB7CC-806BB7D0 0000FC 0004+00 0/3 0/0 0/0 .rodata @4281 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4281 = 0.5f; -COMPILER_STRIP_GATE(806BB7CC, &lit_4281); +COMPILER_STRIP_GATE(0x806BB7CC, &lit_4281); #pragma pop /* 806BB7D0-806BB7D4 000100 0004+00 0/2 0/0 0/0 .rodata @4282 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4282 = 1.0f / 50.0f; -COMPILER_STRIP_GATE(806BB7D0, &lit_4282); +COMPILER_STRIP_GATE(0x806BB7D0, &lit_4282); #pragma pop /* 806B9E6C-806B9F20 000BCC 00B4+00 1/1 0/0 0/0 .text StartAction__8daE_FK_cFv */ @@ -961,7 +974,7 @@ asm void daE_FK_c::StartAction() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4293 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(806BB7D4, &lit_4293); +COMPILER_STRIP_GATE(0x806BB7D4, &lit_4293); #pragma pop /* 806B9F20-806BA004 000C80 00E4+00 1/1 0/0 0/0 .text RunAction__8daE_FK_cFv */ @@ -989,14 +1002,14 @@ asm void daE_FK_c::Action() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4325 = 3.0f / 100.0f; -COMPILER_STRIP_GATE(806BB7D8, &lit_4325); +COMPILER_STRIP_GATE(0x806BB7D8, &lit_4325); #pragma pop /* 806BB7DC-806BB7E0 00010C 0004+00 0/1 0/0 0/0 .rodata @4326 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4326 = 1.0f / 20.0f; -COMPILER_STRIP_GATE(806BB7DC, &lit_4326); +COMPILER_STRIP_GATE(0x806BB7DC, &lit_4326); #pragma pop /* 806BA024-806BA188 000D84 0164+00 1/1 0/0 0/0 .text DeathAction__8daE_FK_cFv */ @@ -1034,14 +1047,14 @@ asm void daE_FK_c::DamageAction() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4376 = 608.0f; -COMPILER_STRIP_GATE(806BB7E0, &lit_4376); +COMPILER_STRIP_GATE(0x806BB7E0, &lit_4376); #pragma pop /* 806BB7E4-806BB7E8 000114 0004+00 0/1 0/0 0/0 .rodata @4377 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4377 = 448.0f; -COMPILER_STRIP_GATE(806BB7E4, &lit_4377); +COMPILER_STRIP_GATE(0x806BB7E4, &lit_4377); #pragma pop /* 806BA330-806BA3B4 001090 0084+00 1/1 0/0 0/0 .text checkViewArea__8daE_FK_cFv */ @@ -1059,7 +1072,7 @@ asm void daE_FK_c::checkViewArea() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4418 = 1500.0f; -COMPILER_STRIP_GATE(806BB7E8, &lit_4418); +COMPILER_STRIP_GATE(0x806BB7E8, &lit_4418); #pragma pop /* 806BB974-806BB978 -00001 0004+00 0/2 0/0 0/0 .bss None */ @@ -1085,14 +1098,14 @@ asm void daE_FK_c::AttackAction() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4430 = 3.5f; -COMPILER_STRIP_GATE(806BB7EC, &lit_4430); +COMPILER_STRIP_GATE(0x806BB7EC, &lit_4430); #pragma pop /* 806BB7F0-806BB7F4 000120 0004+00 0/1 0/0 0/0 .rodata @4431 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4431 = -3.5f; -COMPILER_STRIP_GATE(806BB7F0, &lit_4431); +COMPILER_STRIP_GATE(0x806BB7F0, &lit_4431); #pragma pop /* 806BA61C-806BA6EC 00137C 00D0+00 1/1 0/0 0/0 .text UpDown__8daE_FK_cFv */ @@ -1108,7 +1121,7 @@ asm void daE_FK_c::UpDown() { /* ############################################################################################## */ /* 806BB7F4-806BB7F8 000124 0004+00 1/2 0/0 0/0 .rodata @4556 */ SECTION_RODATA static f32 const lit_4556 = 50.0f; -COMPILER_STRIP_GATE(806BB7F4, &lit_4556); +COMPILER_STRIP_GATE(0x806BB7F4, &lit_4556); /* 806BA6EC-806BABB8 00144C 04CC+00 1/1 0/0 0/0 .text Execute__8daE_FK_cFv */ #pragma push @@ -1133,7 +1146,7 @@ asm void daE_FK_c::At_Check(int param_0) { /* ############################################################################################## */ /* 806BB7F8-806BB7FC 000128 0004+00 1/1 0/0 0/0 .rodata @4618 */ SECTION_RODATA static f32 const lit_4618 = 255.0f; -COMPILER_STRIP_GATE(806BB7F8, &lit_4618); +COMPILER_STRIP_GATE(0x806BB7F8, &lit_4618); /* 806BACEC-806BADB4 001A4C 00C8+00 1/1 0/0 0/0 .text Draw__8daE_FK_cFv */ #pragma push @@ -1215,14 +1228,14 @@ static asm void daE_FK_Delete(daE_FK_c* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4707 = 85.0f; -COMPILER_STRIP_GATE(806BB7FC, &lit_4707); +COMPILER_STRIP_GATE(0x806BB7FC, &lit_4707); #pragma pop /* 806BB800-806BB804 000130 0004+00 0/1 0/0 0/0 .rodata @4708 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4708 = 75.0f; -COMPILER_STRIP_GATE(806BB800, &lit_4708); +COMPILER_STRIP_GATE(0x806BB800, &lit_4708); #pragma pop /* 806BAF74-806BB004 001CD4 0090+00 1/1 0/0 0/0 .text CreateChk__8daE_FK_cFv */ @@ -1240,21 +1253,27 @@ asm void daE_FK_c::CreateChk() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4818 = -700.0f; -COMPILER_STRIP_GATE(806BB804, &lit_4818); +COMPILER_STRIP_GATE(0x806BB804, &lit_4818); #pragma pop /* 806BB808-806BB80C 000138 0004+00 0/1 0/0 0/0 .rodata @4819 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4819 = 700.0f; -COMPILER_STRIP_GATE(806BB808, &lit_4819); +COMPILER_STRIP_GATE(0x806BB808, &lit_4819); #pragma pop /* 806BB80C-806BB810 00013C 0004+00 0/1 0/0 0/0 .rodata @4820 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4820 = 3.0f; -COMPILER_STRIP_GATE(806BB80C, &lit_4820); +COMPILER_STRIP_GATE(0x806BB80C, &lit_4820); +#pragma pop + +/* 806BB81C-806BB81C 00014C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_806BB826 = "E_FK"; #pragma pop /* 806BB004-806BB324 001D64 0320+00 1/1 0/0 0/0 .text Create__8daE_FK_cFv */ @@ -1342,21 +1361,21 @@ asm daE_FK_HIO_c::~daE_FK_HIO_c() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4929 = 217.0f; -COMPILER_STRIP_GATE(806BB810, &lit_4929); +COMPILER_STRIP_GATE(0x806BB810, &lit_4929); #pragma pop /* 806BB814-806BB818 000144 0004+00 0/1 0/0 0/0 .rodata @4930 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4930 = 1275.0f; -COMPILER_STRIP_GATE(806BB814, &lit_4930); +COMPILER_STRIP_GATE(0x806BB814, &lit_4930); #pragma pop /* 806BB818-806BB81C 000148 0004+00 0/1 0/0 0/0 .rodata @4931 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4931 = -57.0f; -COMPILER_STRIP_GATE(806BB818, &lit_4931); +COMPILER_STRIP_GATE(0x806BB818, &lit_4931); #pragma pop /* 806BB5DC-806BB670 00233C 0094+00 0/0 1/0 0/0 .text __sinit_d_a_e_fk_cpp */ @@ -1371,7 +1390,7 @@ asm void __sinit_d_a_e_fk_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_806BB5DC = (void*)__sinit_d_a_e_fk_cpp; +REGISTER_CTORS(0x806BB5DC, __sinit_d_a_e_fk_cpp); #pragma pop /* 806BB670-806BB678 0023D0 0008+00 1/0 0/0 0/0 .text @36@__dt__12dBgS_ObjAcchFv */ @@ -1576,11 +1595,4 @@ static u8 data_806BB9D4[4]; static u8 data_806BB9D8[4]; #pragma pop -/* 806BB81C-806BB82B 00014C 000F+00 4/4 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_806BB81C = "E_fk"; -SECTION_DEAD static char const* const stringBase_806BB821 = "e_fk"; -SECTION_DEAD static char const* const stringBase_806BB826 = "E_FK"; -#pragma pop +/* 806BB81C-806BB81C 00014C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/e/d_a_e_fm/d_a_e_fm.cpp b/rel/d/a/e/d_a_e_fm/d_a_e_fm.cpp index 255652dc00d..f0f3e8f4482 100644 --- a/rel/d/a/e/d_a_e_fm/d_a_e_fm.cpp +++ b/rel/d/a/e/d_a_e_fm/d_a_e_fm.cpp @@ -60,10 +60,10 @@ struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; -struct J3DModelData {}; - struct J3DAnmTransform {}; +struct J3DModelData {}; + struct mDoExt_McaMorf { /* 8000FC4C */ mDoExt_McaMorf(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, int, @@ -139,14 +139,14 @@ struct dRes_control_c { struct dPa_levelEcallBack {}; -struct _GXColor {}; - struct csXyz { /* 804FA06C */ csXyz(); /* 802673F4 */ csXyz(s16, s16, s16); /* 804EF63C */ ~csXyz(); }; +struct _GXColor {}; + struct dPa_control_c { struct level_c { /* 8004B918 */ void getEmitter(u32); @@ -622,104 +622,104 @@ extern "C" void Rolling__13daObjHHASHI_cFP4cXyzffSc(); /* ############################################################################################## */ /* 804FA6BC-804FA6C0 000000 0004+00 31/31 0/0 0/0 .rodata @3777 */ SECTION_RODATA static f32 const lit_3777 = 1.0f; -COMPILER_STRIP_GATE(804FA6BC, &lit_3777); +COMPILER_STRIP_GATE(0x804FA6BC, &lit_3777); /* 804FA6C0-804FA6C4 000004 0004+00 0/3 0/0 0/0 .rodata @3778 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3778 = 3.0f; -COMPILER_STRIP_GATE(804FA6C0, &lit_3778); +COMPILER_STRIP_GATE(0x804FA6C0, &lit_3778); #pragma pop /* 804FA6C4-804FA6C8 000008 0004+00 0/2 0/0 0/0 .rodata @3779 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3779 = 2.5f; -COMPILER_STRIP_GATE(804FA6C4, &lit_3779); +COMPILER_STRIP_GATE(0x804FA6C4, &lit_3779); #pragma pop /* 804FA6C8-804FA6CC 00000C 0004+00 0/7 0/0 0/0 .rodata @3780 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3780 = 5.0f; -COMPILER_STRIP_GATE(804FA6C8, &lit_3780); +COMPILER_STRIP_GATE(0x804FA6C8, &lit_3780); #pragma pop /* 804FA6CC-804FA6D0 000010 0004+00 0/2 0/0 0/0 .rodata @3781 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3781 = 4.0f; -COMPILER_STRIP_GATE(804FA6CC, &lit_3781); +COMPILER_STRIP_GATE(0x804FA6CC, &lit_3781); #pragma pop /* 804FA6D0-804FA6D4 000014 0004+00 0/2 0/0 0/0 .rodata @3782 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3782 = 20000.0f; -COMPILER_STRIP_GATE(804FA6D0, &lit_3782); +COMPILER_STRIP_GATE(0x804FA6D0, &lit_3782); #pragma pop /* 804FA6D4-804FA6D8 000018 0004+00 0/1 0/0 0/0 .rodata @3783 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3783 = 1500.0f; -COMPILER_STRIP_GATE(804FA6D4, &lit_3783); +COMPILER_STRIP_GATE(0x804FA6D4, &lit_3783); #pragma pop /* 804FA6D8-804FA6DC 00001C 0004+00 0/2 0/0 0/0 .rodata @3784 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3784 = 600.0f; -COMPILER_STRIP_GATE(804FA6D8, &lit_3784); +COMPILER_STRIP_GATE(0x804FA6D8, &lit_3784); #pragma pop /* 804FA6DC-804FA6E0 000020 0004+00 0/2 0/0 0/0 .rodata @3785 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3785 = 120.0f; -COMPILER_STRIP_GATE(804FA6DC, &lit_3785); +COMPILER_STRIP_GATE(0x804FA6DC, &lit_3785); #pragma pop /* 804FA6E0-804FA6E4 000024 0004+00 0/5 0/0 0/0 .rodata @3786 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3786 = 1000.0f; -COMPILER_STRIP_GATE(804FA6E0, &lit_3786); +COMPILER_STRIP_GATE(0x804FA6E0, &lit_3786); #pragma pop /* 804FA6E4-804FA6E8 000028 0004+00 0/5 0/0 0/0 .rodata @3787 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3787 = 2.0f; -COMPILER_STRIP_GATE(804FA6E4, &lit_3787); +COMPILER_STRIP_GATE(0x804FA6E4, &lit_3787); #pragma pop /* 804FA6E8-804FA6EC 00002C 0004+00 0/3 0/0 0/0 .rodata @3788 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3788 = 35.0f; -COMPILER_STRIP_GATE(804FA6E8, &lit_3788); +COMPILER_STRIP_GATE(0x804FA6E8, &lit_3788); #pragma pop /* 804FA6EC-804FA6F0 000030 0004+00 0/1 0/0 0/0 .rodata @3789 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3789 = 7000.0f; -COMPILER_STRIP_GATE(804FA6EC, &lit_3789); +COMPILER_STRIP_GATE(0x804FA6EC, &lit_3789); #pragma pop /* 804FA6F0-804FA6F4 000034 0004+00 0/1 0/0 0/0 .rodata @3790 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3790 = 180.0f; -COMPILER_STRIP_GATE(804FA6F0, &lit_3790); +COMPILER_STRIP_GATE(0x804FA6F0, &lit_3790); #pragma pop /* 804FA6F4-804FA6F8 000038 0004+00 0/9 0/0 0/0 .rodata @3791 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3791 = 20.0f; -COMPILER_STRIP_GATE(804FA6F4, &lit_3791); +COMPILER_STRIP_GATE(0x804FA6F4, &lit_3791); #pragma pop /* 804FA6F8-804FA6FC 00003C 0004+00 4/30 0/0 0/0 .rodata @3792 */ @@ -729,76 +729,76 @@ SECTION_RODATA static u8 const lit_3792[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(804FA6F8, &lit_3792); +COMPILER_STRIP_GATE(0x804FA6F8, &lit_3792); /* 804FA6FC-804FA700 000040 0004+00 0/1 0/0 0/0 .rodata @3793 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3793 = 17.0f / 10.0f; -COMPILER_STRIP_GATE(804FA6FC, &lit_3793); +COMPILER_STRIP_GATE(0x804FA6FC, &lit_3793); #pragma pop /* 804FA700-804FA704 000044 0004+00 0/2 0/0 0/0 .rodata @3794 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3794 = 1.5f; -COMPILER_STRIP_GATE(804FA700, &lit_3794); +COMPILER_STRIP_GATE(0x804FA700, &lit_3794); #pragma pop /* 804FA704-804FA708 000048 0004+00 0/1 0/0 0/0 .rodata @3795 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3795 = 36000.0f; -COMPILER_STRIP_GATE(804FA704, &lit_3795); +COMPILER_STRIP_GATE(0x804FA704, &lit_3795); #pragma pop /* 804FA708-804FA70C 00004C 0004+00 0/3 0/0 0/0 .rodata @3796 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3796 = 40.0f; -COMPILER_STRIP_GATE(804FA708, &lit_3796); +COMPILER_STRIP_GATE(0x804FA708, &lit_3796); #pragma pop /* 804FA70C-804FA710 000050 0004+00 0/1 0/0 0/0 .rodata @3797 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3797 = 753.0f; -COMPILER_STRIP_GATE(804FA70C, &lit_3797); +COMPILER_STRIP_GATE(0x804FA70C, &lit_3797); #pragma pop /* 804FA710-804FA714 000054 0004+00 0/1 0/0 0/0 .rodata @3798 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3798 = 258.0f; -COMPILER_STRIP_GATE(804FA710, &lit_3798); +COMPILER_STRIP_GATE(0x804FA710, &lit_3798); #pragma pop /* 804FA714-804FA718 000058 0004+00 0/1 0/0 0/0 .rodata @3799 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3799 = -2100.0f; -COMPILER_STRIP_GATE(804FA714, &lit_3799); +COMPILER_STRIP_GATE(0x804FA714, &lit_3799); #pragma pop /* 804FA718-804FA71C 00005C 0004+00 0/2 0/0 0/0 .rodata @3800 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3800 = 1100.0f; -COMPILER_STRIP_GATE(804FA718, &lit_3800); +COMPILER_STRIP_GATE(0x804FA718, &lit_3800); #pragma pop /* 804FA71C-804FA720 000060 0004+00 0/6 0/0 0/0 .rodata @3801 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3801 = 300.0f; -COMPILER_STRIP_GATE(804FA71C, &lit_3801); +COMPILER_STRIP_GATE(0x804FA71C, &lit_3801); #pragma pop /* 804FA720-804FA724 000064 0004+00 0/1 0/0 0/0 .rodata @3802 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3802 = 1200.0f; -COMPILER_STRIP_GATE(804FA720, &lit_3802); +COMPILER_STRIP_GATE(0x804FA720, &lit_3802); #pragma pop /* 804FA950-804FA95C 000000 000C+00 5/5 0/0 0/0 .data cNullVec__6Z2Calc */ @@ -1401,7 +1401,7 @@ SECTION_RODATA static f32 const lit_3846[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(804FA724, &lit_3846); +COMPILER_STRIP_GATE(0x804FA724, &lit_3846); /* 804EF308-804EF3CC 000308 00C4+00 1/1 0/0 0/0 .text s_hasira_poscheck__FPvPv */ #pragma push @@ -1420,7 +1420,7 @@ static asm void s_hasira_poscheck(void* param_0, void* param_1) { SECTION_RODATA static u8 const lit_3927[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(804FA72C, &lit_3927); +COMPILER_STRIP_GATE(0x804FA72C, &lit_3927); #pragma pop /* 804FA734-804FA73C 000078 0008+00 0/5 0/0 0/0 .rodata @3928 */ @@ -1429,7 +1429,7 @@ COMPILER_STRIP_GATE(804FA72C, &lit_3927); SECTION_RODATA static u8 const lit_3928[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(804FA734, &lit_3928); +COMPILER_STRIP_GATE(0x804FA734, &lit_3928); #pragma pop /* 804FA73C-804FA744 000080 0008+00 0/5 0/0 0/0 .rodata @3929 */ @@ -1438,7 +1438,7 @@ COMPILER_STRIP_GATE(804FA734, &lit_3928); SECTION_RODATA static u8 const lit_3929[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(804FA73C, &lit_3929); +COMPILER_STRIP_GATE(0x804FA73C, &lit_3929); #pragma pop /* 804FAF78-804FAF7C 000128 0004+00 2/2 0/0 0/0 .bss fire_range */ @@ -1487,7 +1487,7 @@ static asm void hasira_hahen_hit(cXyz* param_0, f32 param_1, f32 param_2, s8 par /* ############################################################################################## */ /* 804FA744-804FA748 000088 0004+00 1/10 0/0 0/0 .rodata @3964 */ SECTION_RODATA static f32 const lit_3964 = -1.0f; -COMPILER_STRIP_GATE(804FA744, &lit_3964); +COMPILER_STRIP_GATE(0x804FA744, &lit_3964); /* 804EF710-804EF808 000710 00F8+00 5/5 0/0 0/0 .text carry_off__FP10e_fm_classi */ #pragma push @@ -1499,6 +1499,13 @@ static asm void carry_off(e_fm_class* param_0, int param_1) { } #pragma pop +/* ############################################################################################## */ +/* 804FA948-804FA948 00028C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_804FA948 = "E_fm"; +#pragma pop + /* 804EF808-804EF8B8 000808 00B0+00 13/13 0/0 0/0 .text anm_init__FP10e_fm_classifUcf */ #pragma push #pragma optimization_level 0 @@ -1524,35 +1531,35 @@ static asm void nodeCallBack(J3DJoint* param_0, int param_1) { #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4059 = 0x3B03126F; -COMPILER_STRIP_GATE(804FA748, &lit_4059); +COMPILER_STRIP_GATE(0x804FA748, &lit_4059); #pragma pop /* 804FA74C-804FA750 000090 0004+00 0/1 0/0 0/0 .rodata @4060 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4060 = 3.0f / 5.0f; -COMPILER_STRIP_GATE(804FA74C, &lit_4060); +COMPILER_STRIP_GATE(0x804FA74C, &lit_4060); #pragma pop /* 804FA750-804FA754 000094 0004+00 0/2 0/0 0/0 .rodata @4061 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4061 = 0.75f; -COMPILER_STRIP_GATE(804FA750, &lit_4061); +COMPILER_STRIP_GATE(0x804FA750, &lit_4061); #pragma pop /* 804FA754-804FA758 000098 0004+00 0/2 0/0 0/0 .rodata @4062 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4062 = 8.0f; -COMPILER_STRIP_GATE(804FA754, &lit_4062); +COMPILER_STRIP_GATE(0x804FA754, &lit_4062); #pragma pop /* 804FA758-804FA75C 00009C 0004+00 0/1 0/0 0/0 .rodata @4063 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4063 = 0x3E2AAAC1; -COMPILER_STRIP_GATE(804FA758, &lit_4063); +COMPILER_STRIP_GATE(0x804FA758, &lit_4063); #pragma pop /* 804FA75C-804FA764 0000A0 0008+00 0/5 0/0 0/0 .rodata @4065 */ @@ -1561,7 +1568,7 @@ COMPILER_STRIP_GATE(804FA758, &lit_4063); SECTION_RODATA static u8 const lit_4065[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(804FA75C, &lit_4065); +COMPILER_STRIP_GATE(0x804FA75C, &lit_4065); #pragma pop /* 804EF99C-804EFC3C 00099C 02A0+00 1/1 0/0 0/0 .text chain_draw__FP10e_fm_classP7chain_si */ @@ -1579,21 +1586,21 @@ static asm void chain_draw(e_fm_class* param_0, chain_s* param_1, int param_2) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4193 = 255.0f; -COMPILER_STRIP_GATE(804FA764, &lit_4193); +COMPILER_STRIP_GATE(0x804FA764, &lit_4193); #pragma pop /* 804FA768-804FA76C 0000AC 0004+00 0/10 0/0 0/0 .rodata @4194 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4194 = 100.0f; -COMPILER_STRIP_GATE(804FA768, &lit_4194); +COMPILER_STRIP_GATE(0x804FA768, &lit_4194); #pragma pop /* 804FA76C-804FA770 0000B0 0004+00 0/1 0/0 0/0 .rodata @4195 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4195 = 2500.0f; -COMPILER_STRIP_GATE(804FA76C, &lit_4195); +COMPILER_STRIP_GATE(0x804FA76C, &lit_4195); #pragma pop /* 804EFC3C-804EFF68 000C3C 032C+00 1/0 0/0 0/0 .text daE_FM_Draw__FP10e_fm_class */ @@ -1609,7 +1616,7 @@ static asm void daE_FM_Draw(e_fm_class* param_0) { /* ############################################################################################## */ /* 804FA770-804FA774 0000B4 0004+00 1/9 0/0 0/0 .rodata @4237 */ SECTION_RODATA static f32 const lit_4237 = 30.0f; -COMPILER_STRIP_GATE(804FA770, &lit_4237); +COMPILER_STRIP_GATE(0x804FA770, &lit_4237); /* 804EFF68-804F005C 000F68 00F4+00 1/1 0/0 0/0 .text other_bg_check__FP10e_fm_classP10fopAc_ac_c */ @@ -1637,14 +1644,14 @@ static asm void pl_check(e_fm_class* param_0, f32 param_1, s16 param_2) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4355 = 15.0f; -COMPILER_STRIP_GATE(804FA774, &lit_4355); +COMPILER_STRIP_GATE(0x804FA774, &lit_4355); #pragma pop /* 804FA778-804FA77C 0000BC 0004+00 0/8 0/0 0/0 .rodata @4356 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4356 = 50.0f; -COMPILER_STRIP_GATE(804FA778, &lit_4356); +COMPILER_STRIP_GATE(0x804FA778, &lit_4356); #pragma pop /* 804F00E4-804F0530 0010E4 044C+00 1/1 0/0 0/0 .text e_fm_normal__FP10e_fm_class */ @@ -1662,21 +1669,21 @@ static asm void e_fm_normal(e_fm_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4486 = 10.0f; -COMPILER_STRIP_GATE(804FA77C, &lit_4486); +COMPILER_STRIP_GATE(0x804FA77C, &lit_4486); #pragma pop /* 804FA780-804FA784 0000C4 0004+00 0/7 0/0 0/0 .rodata @4487 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4487 = 0.5f; -COMPILER_STRIP_GATE(804FA780, &lit_4487); +COMPILER_STRIP_GATE(0x804FA780, &lit_4487); #pragma pop /* 804FA784-804FA788 0000C8 0004+00 0/1 0/0 0/0 .rodata @4488 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4488 = 280.0f; -COMPILER_STRIP_GATE(804FA784, &lit_4488); +COMPILER_STRIP_GATE(0x804FA784, &lit_4488); #pragma pop /* 804F0530-804F0A78 001530 0548+00 1/1 0/0 0/0 .text e_fm_fight_run__FP10e_fm_class */ @@ -1714,7 +1721,7 @@ static asm void tame_eff_set(e_fm_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4705 = 3.0f / 10.0f; -COMPILER_STRIP_GATE(804FA788, &lit_4705); +COMPILER_STRIP_GATE(0x804FA788, &lit_4705); #pragma pop /* 804F0F80-804F11D8 001F80 0258+00 1/1 0/0 0/0 .text e_fm_f_fight__FP10e_fm_class */ @@ -1762,7 +1769,7 @@ static asm void e_fm_fire(e_fm_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4917 = 7.0f / 10.0f; -COMPILER_STRIP_GATE(804FA78C, &lit_4917); +COMPILER_STRIP_GATE(0x804FA78C, &lit_4917); #pragma pop /* 804F16C4-804F1918 0026C4 0254+00 1/1 0/0 0/0 .text e_fm_stop__FP10e_fm_class */ @@ -1780,14 +1787,14 @@ static asm void e_fm_stop(e_fm_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5129 = 10000.0f; -COMPILER_STRIP_GATE(804FA790, &lit_5129); +COMPILER_STRIP_GATE(0x804FA790, &lit_5129); #pragma pop /* 804FA794-804FA798 0000D8 0004+00 0/1 0/0 0/0 .rodata @5130 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5130 = 250.0f; -COMPILER_STRIP_GATE(804FA794, &lit_5130); +COMPILER_STRIP_GATE(0x804FA794, &lit_5130); #pragma pop /* 804F1918-804F20F4 002918 07DC+00 1/1 0/0 0/0 .text e_fm_damage_run__FP10e_fm_class */ @@ -1815,413 +1822,413 @@ static asm void cam_3d_morf(e_fm_class* param_0, f32 param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5881 = 55.0f; -COMPILER_STRIP_GATE(804FA798, &lit_5881); +COMPILER_STRIP_GATE(0x804FA798, &lit_5881); #pragma pop /* 804FA79C-804FA7A0 0000E0 0004+00 0/3 0/0 0/0 .rodata @5882 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5882 = -100.0f; -COMPILER_STRIP_GATE(804FA79C, &lit_5882); +COMPILER_STRIP_GATE(0x804FA79C, &lit_5882); #pragma pop /* 804FA7A0-804FA7A4 0000E4 0004+00 0/2 0/0 0/0 .rodata @5883 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5883 = -200.0f; -COMPILER_STRIP_GATE(804FA7A0, &lit_5883); +COMPILER_STRIP_GATE(0x804FA7A0, &lit_5883); #pragma pop /* 804FA7A4-804FA7A8 0000E8 0004+00 0/5 0/0 0/0 .rodata @5884 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5884 = 200.0f; -COMPILER_STRIP_GATE(804FA7A4, &lit_5884); +COMPILER_STRIP_GATE(0x804FA7A4, &lit_5884); #pragma pop /* 804FA7A8-804FA7AC 0000EC 0004+00 0/1 0/0 0/0 .rodata @5885 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5885 = 700.0f; -COMPILER_STRIP_GATE(804FA7A8, &lit_5885); +COMPILER_STRIP_GATE(0x804FA7A8, &lit_5885); #pragma pop /* 804FA7AC-804FA7B0 0000F0 0004+00 0/2 0/0 0/0 .rodata @5886 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5886 = 400.0f; -COMPILER_STRIP_GATE(804FA7AC, &lit_5886); +COMPILER_STRIP_GATE(0x804FA7AC, &lit_5886); #pragma pop /* 804FA7B0-804FA7B4 0000F4 0004+00 0/2 0/0 0/0 .rodata @5887 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5887 = -400.0f; -COMPILER_STRIP_GATE(804FA7B0, &lit_5887); +COMPILER_STRIP_GATE(0x804FA7B0, &lit_5887); #pragma pop /* 804FA7B4-804FA7B8 0000F8 0004+00 0/1 0/0 0/0 .rodata @5888 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5888 = -550.0f; -COMPILER_STRIP_GATE(804FA7B4, &lit_5888); +COMPILER_STRIP_GATE(0x804FA7B4, &lit_5888); #pragma pop /* 804FA7B8-804FA7BC 0000FC 0004+00 0/2 0/0 0/0 .rodata @5889 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5889 = 800.0f; -COMPILER_STRIP_GATE(804FA7B8, &lit_5889); +COMPILER_STRIP_GATE(0x804FA7B8, &lit_5889); #pragma pop /* 804FA7BC-804FA7C0 000100 0004+00 0/1 0/0 0/0 .rodata @5890 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5890 = 176.0f; -COMPILER_STRIP_GATE(804FA7BC, &lit_5890); +COMPILER_STRIP_GATE(0x804FA7BC, &lit_5890); #pragma pop /* 804FA7C0-804FA7C4 000104 0004+00 0/1 0/0 0/0 .rodata @5891 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5891 = 1782.0f; -COMPILER_STRIP_GATE(804FA7C0, &lit_5891); +COMPILER_STRIP_GATE(0x804FA7C0, &lit_5891); #pragma pop /* 804FA7C4-804FA7C8 000108 0004+00 0/1 0/0 0/0 .rodata @5892 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5892 = 217.0f; -COMPILER_STRIP_GATE(804FA7C4, &lit_5892); +COMPILER_STRIP_GATE(0x804FA7C4, &lit_5892); #pragma pop /* 804FA7C8-804FA7CC 00010C 0004+00 0/1 0/0 0/0 .rodata @5893 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5893 = 1968.0f; -COMPILER_STRIP_GATE(804FA7C8, &lit_5893); +COMPILER_STRIP_GATE(0x804FA7C8, &lit_5893); #pragma pop /* 804FA7CC-804FA7D0 000110 0004+00 0/1 0/0 0/0 .rodata @5894 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5894 = 671.0f; -COMPILER_STRIP_GATE(804FA7CC, &lit_5894); +COMPILER_STRIP_GATE(0x804FA7CC, &lit_5894); #pragma pop /* 804FA7D0-804FA7D4 000114 0004+00 0/1 0/0 0/0 .rodata @5895 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5895 = 1664.0f; -COMPILER_STRIP_GATE(804FA7D0, &lit_5895); +COMPILER_STRIP_GATE(0x804FA7D0, &lit_5895); #pragma pop /* 804FA7D4-804FA7D8 000118 0004+00 0/1 0/0 0/0 .rodata @5896 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5896 = 752.0f; -COMPILER_STRIP_GATE(804FA7D4, &lit_5896); +COMPILER_STRIP_GATE(0x804FA7D4, &lit_5896); #pragma pop /* 804FA7D8-804FA7DC 00011C 0004+00 0/1 0/0 0/0 .rodata @5897 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5897 = 1836.0f; -COMPILER_STRIP_GATE(804FA7D8, &lit_5897); +COMPILER_STRIP_GATE(0x804FA7D8, &lit_5897); #pragma pop /* 804FA7DC-804FA7E0 000120 0004+00 0/3 0/0 0/0 .rodata @5898 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5898 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(804FA7DC, &lit_5898); +COMPILER_STRIP_GATE(0x804FA7DC, &lit_5898); #pragma pop /* 804FA7E0-804FA7E4 000124 0004+00 0/1 0/0 0/0 .rodata @5899 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5899 = 1.0f / 125.0f; -COMPILER_STRIP_GATE(804FA7E0, &lit_5899); +COMPILER_STRIP_GATE(0x804FA7E0, &lit_5899); #pragma pop /* 804FA7E4-804FA7E8 000128 0004+00 0/1 0/0 0/0 .rodata @5900 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_5900 = 0x3951B717; -COMPILER_STRIP_GATE(804FA7E4, &lit_5900); +COMPILER_STRIP_GATE(0x804FA7E4, &lit_5900); #pragma pop /* 804FA7E8-804FA7EC 00012C 0004+00 0/1 0/0 0/0 .rodata @5901 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5901 = 140.0f; -COMPILER_STRIP_GATE(804FA7E8, &lit_5901); +COMPILER_STRIP_GATE(0x804FA7E8, &lit_5901); #pragma pop /* 804FA7EC-804FA7F0 000130 0004+00 0/1 0/0 0/0 .rodata @5902 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5902 = 669.0f; -COMPILER_STRIP_GATE(804FA7EC, &lit_5902); +COMPILER_STRIP_GATE(0x804FA7EC, &lit_5902); #pragma pop /* 804FA7F0-804FA7F4 000134 0004+00 0/1 0/0 0/0 .rodata @5903 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5903 = 163.0f; -COMPILER_STRIP_GATE(804FA7F0, &lit_5903); +COMPILER_STRIP_GATE(0x804FA7F0, &lit_5903); #pragma pop /* 804FA7F4-804FA7F8 000138 0004+00 0/1 0/0 0/0 .rodata @5904 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5904 = 857.0f; -COMPILER_STRIP_GATE(804FA7F4, &lit_5904); +COMPILER_STRIP_GATE(0x804FA7F4, &lit_5904); #pragma pop /* 804FA7F8-804FA7FC 00013C 0004+00 0/1 0/0 0/0 .rodata @5905 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5905 = 211.0f; -COMPILER_STRIP_GATE(804FA7F8, &lit_5905); +COMPILER_STRIP_GATE(0x804FA7F8, &lit_5905); #pragma pop /* 804FA7FC-804FA800 000140 0004+00 0/1 0/0 0/0 .rodata @5906 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5906 = 673.0f; -COMPILER_STRIP_GATE(804FA7FC, &lit_5906); +COMPILER_STRIP_GATE(0x804FA7FC, &lit_5906); #pragma pop /* 804FA800-804FA804 000144 0004+00 0/1 0/0 0/0 .rodata @5907 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5907 = 1.0f / 100.0f; -COMPILER_STRIP_GATE(804FA800, &lit_5907); +COMPILER_STRIP_GATE(0x804FA800, &lit_5907); #pragma pop /* 804FA804-804FA808 000148 0004+00 0/1 0/0 0/0 .rodata @5908 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_5908 = 0x3A03126F; -COMPILER_STRIP_GATE(804FA804, &lit_5908); +COMPILER_STRIP_GATE(0x804FA804, &lit_5908); #pragma pop /* 804FA808-804FA80C 00014C 0004+00 0/1 0/0 0/0 .rodata @5909 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5909 = 14.0f / 5.0f; -COMPILER_STRIP_GATE(804FA808, &lit_5909); +COMPILER_STRIP_GATE(0x804FA808, &lit_5909); #pragma pop /* 804FA80C-804FA810 000150 0004+00 0/1 0/0 0/0 .rodata @5910 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5910 = 496.0f; -COMPILER_STRIP_GATE(804FA80C, &lit_5910); +COMPILER_STRIP_GATE(0x804FA80C, &lit_5910); #pragma pop /* 804FA810-804FA814 000154 0004+00 0/1 0/0 0/0 .rodata @5911 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5911 = 162.0f; -COMPILER_STRIP_GATE(804FA810, &lit_5911); +COMPILER_STRIP_GATE(0x804FA810, &lit_5911); #pragma pop /* 804FA814-804FA818 000158 0004+00 0/1 0/0 0/0 .rodata @5912 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5912 = 97.0f / 10.0f; -COMPILER_STRIP_GATE(804FA814, &lit_5912); +COMPILER_STRIP_GATE(0x804FA814, &lit_5912); #pragma pop /* 804FA818-804FA81C 00015C 0004+00 0/1 0/0 0/0 .rodata @5913 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5913 = 362.0f; -COMPILER_STRIP_GATE(804FA818, &lit_5913); +COMPILER_STRIP_GATE(0x804FA818, &lit_5913); #pragma pop /* 804FA81C-804FA820 000160 0004+00 0/1 0/0 0/0 .rodata @5914 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5914 = 296.0f; -COMPILER_STRIP_GATE(804FA81C, &lit_5914); +COMPILER_STRIP_GATE(0x804FA81C, &lit_5914); #pragma pop /* 804FA820-804FA824 000164 0004+00 0/3 0/0 0/0 .rodata @5915 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5915 = 1.0f / 20.0f; -COMPILER_STRIP_GATE(804FA820, &lit_5915); +COMPILER_STRIP_GATE(0x804FA820, &lit_5915); #pragma pop /* 804FA824-804FA828 000168 0004+00 0/1 0/0 0/0 .rodata @5916 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5916 = 900.0f; -COMPILER_STRIP_GATE(804FA824, &lit_5916); +COMPILER_STRIP_GATE(0x804FA824, &lit_5916); #pragma pop /* 804FA828-804FA82C 00016C 0004+00 0/2 0/0 0/0 .rodata @5917 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5917 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(804FA828, &lit_5917); +COMPILER_STRIP_GATE(0x804FA828, &lit_5917); #pragma pop /* 804FA82C-804FA830 000170 0004+00 0/1 0/0 0/0 .rodata @5918 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5918 = 0.125f; -COMPILER_STRIP_GATE(804FA82C, &lit_5918); +COMPILER_STRIP_GATE(0x804FA82C, &lit_5918); #pragma pop /* 804FA830-804FA834 000174 0004+00 0/1 0/0 0/0 .rodata @5919 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5919 = 12.5f; -COMPILER_STRIP_GATE(804FA830, &lit_5919); +COMPILER_STRIP_GATE(0x804FA830, &lit_5919); #pragma pop /* 804FA834-804FA838 000178 0004+00 0/3 0/0 0/0 .rodata @5920 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5920 = 1.0f / 50.0f; -COMPILER_STRIP_GATE(804FA834, &lit_5920); +COMPILER_STRIP_GATE(0x804FA834, &lit_5920); #pragma pop /* 804FA838-804FA83C 00017C 0004+00 0/1 0/0 0/0 .rodata @5921 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5921 = 370.0f; -COMPILER_STRIP_GATE(804FA838, &lit_5921); +COMPILER_STRIP_GATE(0x804FA838, &lit_5921); #pragma pop /* 804FA83C-804FA840 000180 0004+00 0/1 0/0 0/0 .rodata @5922 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5922 = 85.0f; -COMPILER_STRIP_GATE(804FA83C, &lit_5922); +COMPILER_STRIP_GATE(0x804FA83C, &lit_5922); #pragma pop /* 804FA840-804FA844 000184 0004+00 0/1 0/0 0/0 .rodata @5923 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5923 = 207.0f; -COMPILER_STRIP_GATE(804FA840, &lit_5923); +COMPILER_STRIP_GATE(0x804FA840, &lit_5923); #pragma pop /* 804FA844-804FA848 000188 0004+00 0/1 0/0 0/0 .rodata @5924 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5924 = 615.0f; -COMPILER_STRIP_GATE(804FA844, &lit_5924); +COMPILER_STRIP_GATE(0x804FA844, &lit_5924); #pragma pop /* 804FA848-804FA84C 00018C 0004+00 0/1 0/0 0/0 .rodata @5925 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5925 = -343.0f; -COMPILER_STRIP_GATE(804FA848, &lit_5925); +COMPILER_STRIP_GATE(0x804FA848, &lit_5925); #pragma pop /* 804FA84C-804FA850 000190 0004+00 0/1 0/0 0/0 .rodata @5926 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5926 = 813.0f; -COMPILER_STRIP_GATE(804FA84C, &lit_5926); +COMPILER_STRIP_GATE(0x804FA84C, &lit_5926); #pragma pop /* 804FA850-804FA854 000194 0004+00 0/1 0/0 0/0 .rodata @5927 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5927 = 942.0f; -COMPILER_STRIP_GATE(804FA850, &lit_5927); +COMPILER_STRIP_GATE(0x804FA850, &lit_5927); #pragma pop /* 804FA854-804FA858 000198 0004+00 0/1 0/0 0/0 .rodata @5928 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5928 = -1001.0f; -COMPILER_STRIP_GATE(804FA854, &lit_5928); +COMPILER_STRIP_GATE(0x804FA854, &lit_5928); #pragma pop /* 804FA858-804FA85C 00019C 0004+00 0/1 0/0 0/0 .rodata @5929 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5929 = 223.0f; -COMPILER_STRIP_GATE(804FA858, &lit_5929); +COMPILER_STRIP_GATE(0x804FA858, &lit_5929); #pragma pop /* 804FA85C-804FA860 0001A0 0004+00 0/1 0/0 0/0 .rodata @5930 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5930 = 474.0f; -COMPILER_STRIP_GATE(804FA85C, &lit_5930); +COMPILER_STRIP_GATE(0x804FA85C, &lit_5930); #pragma pop /* 804FA860-804FA864 0001A4 0004+00 0/1 0/0 0/0 .rodata @5931 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5931 = 636.0f; -COMPILER_STRIP_GATE(804FA860, &lit_5931); +COMPILER_STRIP_GATE(0x804FA860, &lit_5931); #pragma pop /* 804FA864-804FA868 0001A8 0004+00 0/1 0/0 0/0 .rodata @5932 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5932 = 802.0f; -COMPILER_STRIP_GATE(804FA864, &lit_5932); +COMPILER_STRIP_GATE(0x804FA864, &lit_5932); #pragma pop /* 804FA868-804FA86C 0001AC 0004+00 0/1 0/0 0/0 .rodata @5933 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5933 = -630.0f; -COMPILER_STRIP_GATE(804FA868, &lit_5933); +COMPILER_STRIP_GATE(0x804FA868, &lit_5933); #pragma pop /* 804FA86C-804FA870 0001B0 0004+00 0/2 0/0 0/0 .rodata @5934 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5934 = 3.0f / 20.0f; -COMPILER_STRIP_GATE(804FA86C, &lit_5934); +COMPILER_STRIP_GATE(0x804FA86C, &lit_5934); #pragma pop /* 804FA870-804FA874 0001B4 0004+00 0/1 0/0 0/0 .rodata @5935 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5935 = 70.0f; -COMPILER_STRIP_GATE(804FA870, &lit_5935); +COMPILER_STRIP_GATE(0x804FA870, &lit_5935); #pragma pop /* 804FA874-804FA878 0001B8 0004+00 0/1 0/0 0/0 .rodata @5936 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5936 = 210.0f; -COMPILER_STRIP_GATE(804FA874, &lit_5936); +COMPILER_STRIP_GATE(0x804FA874, &lit_5936); #pragma pop /* 804FA878-804FA87C 0001BC 0004+00 0/2 0/0 0/0 .rodata @5937 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5937 = -363.0f; -COMPILER_STRIP_GATE(804FA878, &lit_5937); +COMPILER_STRIP_GATE(0x804FA878, &lit_5937); #pragma pop /* 804FA87C-804FA880 0001C0 0004+00 0/2 0/0 0/0 .rodata @5938 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5938 = 291.0f; -COMPILER_STRIP_GATE(804FA87C, &lit_5938); +COMPILER_STRIP_GATE(0x804FA87C, &lit_5938); #pragma pop /* 804FA880-804FA884 0001C4 0004+00 0/1 0/0 0/0 .rodata @5939 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5939 = 7.5f; -COMPILER_STRIP_GATE(804FA880, &lit_5939); +COMPILER_STRIP_GATE(0x804FA880, &lit_5939); #pragma pop /* 804FAF7C-804FAF80 00012C 0004+00 2/3 0/0 0/0 .bss demo_stop */ @@ -2262,42 +2269,42 @@ static asm void e_fm_a_down(e_fm_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6312 = -500.0f; -COMPILER_STRIP_GATE(804FA884, &lit_6312); +COMPILER_STRIP_GATE(0x804FA884, &lit_6312); #pragma pop /* 804FA888-804FA88C 0001CC 0004+00 0/1 0/0 0/0 .rodata @6313 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6313 = -800.0f; -COMPILER_STRIP_GATE(804FA888, &lit_6313); +COMPILER_STRIP_GATE(0x804FA888, &lit_6313); #pragma pop /* 804FA88C-804FA890 0001D0 0004+00 0/1 0/0 0/0 .rodata @6314 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6314 = 677.0f; -COMPILER_STRIP_GATE(804FA88C, &lit_6314); +COMPILER_STRIP_GATE(0x804FA88C, &lit_6314); #pragma pop /* 804FA890-804FA894 0001D4 0004+00 0/1 0/0 0/0 .rodata @6315 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6315 = -226.0f; -COMPILER_STRIP_GATE(804FA890, &lit_6315); +COMPILER_STRIP_GATE(0x804FA890, &lit_6315); #pragma pop /* 804FA894-804FA898 0001D8 0004+00 0/1 0/0 0/0 .rodata @6316 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6316 = -677.0f; -COMPILER_STRIP_GATE(804FA894, &lit_6316); +COMPILER_STRIP_GATE(0x804FA894, &lit_6316); #pragma pop /* 804FA898-804FA89C 0001DC 0004+00 0/2 0/0 0/0 .rodata @6317 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6317 = 80.0f; -COMPILER_STRIP_GATE(804FA898, &lit_6317); +COMPILER_STRIP_GATE(0x804FA898, &lit_6317); #pragma pop /* 804F4740-804F4BDC 005740 049C+00 1/1 0/0 0/0 .text e_fm_start__FP10e_fm_class */ @@ -2335,63 +2342,63 @@ static asm void damage_check(e_fm_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6637 = -20.0f; -COMPILER_STRIP_GATE(804FA89C, &lit_6637); +COMPILER_STRIP_GATE(0x804FA89C, &lit_6637); #pragma pop /* 804FA8A0-804FA8A4 0001E4 0004+00 0/1 0/0 0/0 .rodata @6638 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6638 = 73.0f / 100.0f; -COMPILER_STRIP_GATE(804FA8A0, &lit_6638); +COMPILER_STRIP_GATE(0x804FA8A0, &lit_6638); #pragma pop /* 804FA8A4-804FA8A8 0001E8 0004+00 0/1 0/0 0/0 .rodata @6639 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6639 = 3.0f / 25.0f; -COMPILER_STRIP_GATE(804FA8A4, &lit_6639); +COMPILER_STRIP_GATE(0x804FA8A4, &lit_6639); #pragma pop /* 804FA8A8-804FA8AC 0001EC 0004+00 0/1 0/0 0/0 .rodata @6640 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6640 = 33.0f / 50.0f; -COMPILER_STRIP_GATE(804FA8A8, &lit_6640); +COMPILER_STRIP_GATE(0x804FA8A8, &lit_6640); #pragma pop /* 804FA8AC-804FA8B0 0001F0 0004+00 0/1 0/0 0/0 .rodata @6641 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6641 = 17.0f / 100.0f; -COMPILER_STRIP_GATE(804FA8AC, &lit_6641); +COMPILER_STRIP_GATE(0x804FA8AC, &lit_6641); #pragma pop /* 804FA8B0-804FA8B4 0001F4 0004+00 0/1 0/0 0/0 .rodata @6642 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6642 = 110.0f; -COMPILER_STRIP_GATE(804FA8B0, &lit_6642); +COMPILER_STRIP_GATE(0x804FA8B0, &lit_6642); #pragma pop /* 804FA8B4-804FA8B8 0001F8 0004+00 0/1 0/0 0/0 .rodata @6643 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6643 = 1024.0f; -COMPILER_STRIP_GATE(804FA8B4, &lit_6643); +COMPILER_STRIP_GATE(0x804FA8B4, &lit_6643); #pragma pop /* 804FA8B8-804FA8BC 0001FC 0004+00 0/1 0/0 0/0 .rodata @6644 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6644 = 16384.0f; -COMPILER_STRIP_GATE(804FA8B8, &lit_6644); +COMPILER_STRIP_GATE(0x804FA8B8, &lit_6644); #pragma pop /* 804FA8BC-804FA8C0 000200 0004+00 0/1 0/0 0/0 .rodata @6645 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6645 = 2048.0f; -COMPILER_STRIP_GATE(804FA8BC, &lit_6645); +COMPILER_STRIP_GATE(0x804FA8BC, &lit_6645); #pragma pop /* 804F5148-804F5990 006148 0848+00 1/1 0/0 0/0 .text chain_control1__FP10e_fm_classP7chain_si */ @@ -2409,56 +2416,56 @@ static asm void chain_control1(e_fm_class* param_0, chain_s* param_1, int param_ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6749 = -10000.0f; -COMPILER_STRIP_GATE(804FA8C0, &lit_6749); +COMPILER_STRIP_GATE(0x804FA8C0, &lit_6749); #pragma pop /* 804FA8C4-804FA8C8 000208 0004+00 0/1 0/0 0/0 .rodata @6750 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6750 = -80.0f; -COMPILER_STRIP_GATE(804FA8C4, &lit_6750); +COMPILER_STRIP_GATE(0x804FA8C4, &lit_6750); #pragma pop /* 804FA8C8-804FA8CC 00020C 0004+00 0/2 0/0 0/0 .rodata @6751 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6751 = 1.0f / 40.0f; -COMPILER_STRIP_GATE(804FA8C8, &lit_6751); +COMPILER_STRIP_GATE(0x804FA8C8, &lit_6751); #pragma pop /* 804FA8CC-804FA8D0 000210 0004+00 0/1 0/0 0/0 .rodata @6752 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6752 = 18.0f; -COMPILER_STRIP_GATE(804FA8CC, &lit_6752); +COMPILER_STRIP_GATE(0x804FA8CC, &lit_6752); #pragma pop /* 804FA8D0-804FA8D4 000214 0004+00 0/1 0/0 0/0 .rodata @6753 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6753 = 48.0f; -COMPILER_STRIP_GATE(804FA8D0, &lit_6753); +COMPILER_STRIP_GATE(0x804FA8D0, &lit_6753); #pragma pop /* 804FA8D4-804FA8D8 000218 0004+00 0/1 0/0 0/0 .rodata @6754 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6754 = 7.0f; -COMPILER_STRIP_GATE(804FA8D4, &lit_6754); +COMPILER_STRIP_GATE(0x804FA8D4, &lit_6754); #pragma pop /* 804FA8D8-804FA8DC 00021C 0004+00 0/3 0/0 0/0 .rodata @6755 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6755 = -5.0f; -COMPILER_STRIP_GATE(804FA8D8, &lit_6755); +COMPILER_STRIP_GATE(0x804FA8D8, &lit_6755); #pragma pop /* 804FA8DC-804FA8E0 000220 0004+00 0/1 0/0 0/0 .rodata @6756 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6756 = -10.0f; -COMPILER_STRIP_GATE(804FA8DC, &lit_6756); +COMPILER_STRIP_GATE(0x804FA8DC, &lit_6756); #pragma pop /* 804F5990-804F5EF4 006990 0564+00 1/1 0/0 0/0 .text chain_control2__FP10e_fm_classP7chain_si */ @@ -2510,35 +2517,35 @@ static asm void action(e_fm_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7066 = -300.0f; -COMPILER_STRIP_GATE(804FA8E0, &lit_7066); +COMPILER_STRIP_GATE(0x804FA8E0, &lit_7066); #pragma pop /* 804FA8E4-804FA8E8 000228 0004+00 0/2 0/0 0/0 .rodata @7269 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7269 = 13.0f / 20.0f; -COMPILER_STRIP_GATE(804FA8E4, &lit_7269); +COMPILER_STRIP_GATE(0x804FA8E4, &lit_7269); #pragma pop /* 804FA8E8-804FA8EC 00022C 0004+00 0/1 0/0 0/0 .rodata @7270 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7270 = 2.0f / 25.0f; -COMPILER_STRIP_GATE(804FA8E8, &lit_7270); +COMPILER_STRIP_GATE(0x804FA8E8, &lit_7270); #pragma pop /* 804FA8EC-804FA8F0 000230 0004+00 0/1 0/0 0/0 .rodata @7271 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7271 = 10.5f; -COMPILER_STRIP_GATE(804FA8EC, &lit_7271); +COMPILER_STRIP_GATE(0x804FA8EC, &lit_7271); #pragma pop /* 804FA8F0-804FA8F4 000234 0004+00 0/1 0/0 0/0 .rodata @7272 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7272 = 37.0f / 10.0f; -COMPILER_STRIP_GATE(804FA8F0, &lit_7272); +COMPILER_STRIP_GATE(0x804FA8F0, &lit_7272); #pragma pop /* 804F6BD0-804F72D0 007BD0 0700+00 1/1 0/0 0/0 .text effect_set__FP10e_fm_class */ @@ -2556,126 +2563,126 @@ static asm void effect_set(e_fm_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8309 = 145.0f; -COMPILER_STRIP_GATE(804FA8F4, &lit_8309); +COMPILER_STRIP_GATE(0x804FA8F4, &lit_8309); #pragma pop /* 804FA8F8-804FA8FC 00023C 0004+00 0/1 0/0 0/0 .rodata @8310 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8310 = 13.0f; -COMPILER_STRIP_GATE(804FA8F8, &lit_8310); +COMPILER_STRIP_GATE(0x804FA8F8, &lit_8310); #pragma pop /* 804FA8FC-804FA900 000240 0004+00 0/1 0/0 0/0 .rodata @8311 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_8311 = 0x3A83126F; -COMPILER_STRIP_GATE(804FA8FC, &lit_8311); +COMPILER_STRIP_GATE(0x804FA8FC, &lit_8311); #pragma pop /* 804FA900-804FA904 000244 0004+00 0/1 0/0 0/0 .rodata @8312 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8312 = -20000.0f; -COMPILER_STRIP_GATE(804FA900, &lit_8312); +COMPILER_STRIP_GATE(0x804FA900, &lit_8312); #pragma pop /* 804FA904-804FA908 000248 0004+00 0/1 0/0 0/0 .rodata @8313 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8313 = 170.0f; -COMPILER_STRIP_GATE(804FA904, &lit_8313); +COMPILER_STRIP_GATE(0x804FA904, &lit_8313); #pragma pop /* 804FA908-804FA90C 00024C 0004+00 0/1 0/0 0/0 .rodata @8314 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8314 = 29.0f; -COMPILER_STRIP_GATE(804FA908, &lit_8314); +COMPILER_STRIP_GATE(0x804FA908, &lit_8314); #pragma pop /* 804FA90C-804FA910 000250 0004+00 0/1 0/0 0/0 .rodata @8315 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_8315 = 0x38D1B717; -COMPILER_STRIP_GATE(804FA90C, &lit_8315); +COMPILER_STRIP_GATE(0x804FA90C, &lit_8315); #pragma pop /* 804FA910-804FA914 000254 0004+00 0/1 0/0 0/0 .rodata @8316 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8316 = -25.0f; -COMPILER_STRIP_GATE(804FA910, &lit_8316); +COMPILER_STRIP_GATE(0x804FA910, &lit_8316); #pragma pop /* 804FA914-804FA918 000258 0004+00 0/1 0/0 0/0 .rodata @8317 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8317 = 125.0f; -COMPILER_STRIP_GATE(804FA914, &lit_8317); +COMPILER_STRIP_GATE(0x804FA914, &lit_8317); #pragma pop /* 804FA918-804FA91C 00025C 0004+00 0/1 0/0 0/0 .rodata @8318 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8318 = 11.0f / 5.0f; -COMPILER_STRIP_GATE(804FA918, &lit_8318); +COMPILER_STRIP_GATE(0x804FA918, &lit_8318); #pragma pop /* 804FA91C-804FA920 000260 0004+00 0/1 0/0 0/0 .rodata @8319 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8319 = 9.0f / 5.0f; -COMPILER_STRIP_GATE(804FA91C, &lit_8319); +COMPILER_STRIP_GATE(0x804FA91C, &lit_8319); #pragma pop /* 804FA920-804FA924 000264 0004+00 0/1 0/0 0/0 .rodata @8320 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8320 = 60.0f; -COMPILER_STRIP_GATE(804FA920, &lit_8320); +COMPILER_STRIP_GATE(0x804FA920, &lit_8320); #pragma pop /* 804FA924-804FA928 000268 0004+00 0/1 0/0 0/0 .rodata @8321 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8321 = 550.0f; -COMPILER_STRIP_GATE(804FA924, &lit_8321); +COMPILER_STRIP_GATE(0x804FA924, &lit_8321); #pragma pop /* 804FA928-804FA92C 00026C 0004+00 0/1 0/0 0/0 .rodata @8322 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8322 = 9.0f / 50.0f; -COMPILER_STRIP_GATE(804FA928, &lit_8322); +COMPILER_STRIP_GATE(0x804FA928, &lit_8322); #pragma pop /* 804FA92C-804FA930 000270 0004+00 0/1 0/0 0/0 .rodata @8323 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8323 = -50.0f; -COMPILER_STRIP_GATE(804FA92C, &lit_8323); +COMPILER_STRIP_GATE(0x804FA92C, &lit_8323); #pragma pop /* 804FA930-804FA934 000274 0004+00 0/1 0/0 0/0 .rodata @8324 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8324 = -35.0f; -COMPILER_STRIP_GATE(804FA930, &lit_8324); +COMPILER_STRIP_GATE(0x804FA930, &lit_8324); #pragma pop /* 804FA934-804FA938 000278 0004+00 0/1 0/0 0/0 .rodata @8325 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8325 = -23000.0f; -COMPILER_STRIP_GATE(804FA934, &lit_8325); +COMPILER_STRIP_GATE(0x804FA934, &lit_8325); #pragma pop /* 804FA938-804FA93C 00027C 0004+00 0/1 0/0 0/0 .rodata @8326 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8326 = 40000.0f; -COMPILER_STRIP_GATE(804FA938, &lit_8326); +COMPILER_STRIP_GATE(0x804FA938, &lit_8326); #pragma pop /* 804F72D0-804F8C60 0082D0 1990+00 2/1 0/0 0/0 .text daE_FM_Execute__FP10e_fm_class */ @@ -2728,21 +2735,21 @@ asm J3DFrameCtrl::~J3DFrameCtrl() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8842 = 209.0f; -COMPILER_STRIP_GATE(804FA93C, &lit_8842); +COMPILER_STRIP_GATE(0x804FA93C, &lit_8842); #pragma pop /* 804FA940-804FA944 000284 0004+00 0/1 0/0 0/0 .rodata @8843 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8843 = 861.0f; -COMPILER_STRIP_GATE(804FA940, &lit_8843); +COMPILER_STRIP_GATE(0x804FA940, &lit_8843); #pragma pop /* 804FA944-804FA948 000288 0004+00 0/1 0/0 0/0 .rodata @8844 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8844 = 65535.0f; -COMPILER_STRIP_GATE(804FA944, &lit_8844); +COMPILER_STRIP_GATE(0x804FA944, &lit_8844); #pragma pop /* 804F9614-804F9B64 00A614 0550+00 1/0 0/0 0/0 .text daE_FM_Create__FP10fopAc_ac_c */ @@ -2927,7 +2934,7 @@ asm void __sinit_d_a_e_fm_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_804FA420 = (void*)__sinit_d_a_e_fm_cpp; +REGISTER_CTORS(0x804FA420, __sinit_d_a_e_fm_cpp); #pragma pop /* 804FA478-804FA480 00B478 0008+00 1/0 0/0 0/0 .text @36@__dt__12dBgS_ObjAcchFv */ @@ -3205,9 +3212,4 @@ static u8 data_804FAFE0[4]; static u8 data_804FAFE4[4]; #pragma pop -/* 804FA948-804FA94D 00028C 0005+00 5/5 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_804FA948 = "E_fm"; -#pragma pop +/* 804FA948-804FA948 00028C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/e/d_a_e_fs/d_a_e_fs.cpp b/rel/d/a/e/d_a_e_fs/d_a_e_fs.cpp index d44d61977a4..8af9087b740 100644 --- a/rel/d/a/e/d_a_e_fs/d_a_e_fs.cpp +++ b/rel/d/a/e/d_a_e_fs/d_a_e_fs.cpp @@ -19,16 +19,16 @@ struct mDoMtx_stack_c { static u8 now[48]; }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; - struct J3DAnmTransform {}; +struct J3DModelData {}; + +struct Z2Creature {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -94,10 +94,10 @@ struct dRes_control_c { struct dPa_levelEcallBack {}; -struct _GXColor {}; - struct csXyz {}; +struct _GXColor {}; + struct dPa_control_c { /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, @@ -429,7 +429,7 @@ extern "C" void __register_global_object(); /* ############################################################################################## */ /* 806BE48C-806BE490 000000 0004+00 16/16 0/0 0/0 .rodata @3917 */ SECTION_RODATA static f32 const lit_3917 = 100.0f; -COMPILER_STRIP_GATE(806BE48C, &lit_3917); +COMPILER_STRIP_GATE(0x806BE48C, &lit_3917); /* 806BE490-806BE494 000004 0004+00 2/10 0/0 0/0 .rodata @3918 */ SECTION_RODATA static u8 const lit_3918[4] = { @@ -438,7 +438,7 @@ SECTION_RODATA static u8 const lit_3918[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(806BE490, &lit_3918); +COMPILER_STRIP_GATE(0x806BE490, &lit_3918); /* 806BE494-806BE49C 000008 0004+04 1/10 0/0 0/0 .rodata @3919 */ SECTION_RODATA static f32 const lit_3919[1 + 1 /* padding */] = { @@ -446,7 +446,7 @@ SECTION_RODATA static f32 const lit_3919[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(806BE494, &lit_3919); +COMPILER_STRIP_GATE(0x806BE494, &lit_3919); /* 806BE49C-806BE4A4 000010 0008+00 0/2 0/0 0/0 .rodata @3920 */ #pragma push @@ -454,7 +454,7 @@ COMPILER_STRIP_GATE(806BE494, &lit_3919); SECTION_RODATA static u8 const lit_3920[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(806BE49C, &lit_3920); +COMPILER_STRIP_GATE(0x806BE49C, &lit_3920); #pragma pop /* 806BE4A4-806BE4AC 000018 0008+00 0/2 0/0 0/0 .rodata @3921 */ @@ -463,7 +463,7 @@ COMPILER_STRIP_GATE(806BE49C, &lit_3920); SECTION_RODATA static u8 const lit_3921[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(806BE4A4, &lit_3921); +COMPILER_STRIP_GATE(0x806BE4A4, &lit_3921); #pragma pop /* 806BE4AC-806BE4B4 000020 0008+00 0/2 0/0 0/0 .rodata @3922 */ @@ -472,35 +472,35 @@ COMPILER_STRIP_GATE(806BE4A4, &lit_3921); SECTION_RODATA static u8 const lit_3922[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(806BE4AC, &lit_3922); +COMPILER_STRIP_GATE(0x806BE4AC, &lit_3922); #pragma pop /* 806BE4B4-806BE4B8 000028 0004+00 0/1 0/0 0/0 .rodata @3923 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3923 = 1.0f / 100.0f; -COMPILER_STRIP_GATE(806BE4B4, &lit_3923); +COMPILER_STRIP_GATE(0x806BE4B4, &lit_3923); #pragma pop /* 806BE4B8-806BE4BC 00002C 0004+00 0/1 0/0 0/0 .rodata @3938 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3938 = 350.0f; -COMPILER_STRIP_GATE(806BE4B8, &lit_3938); +COMPILER_STRIP_GATE(0x806BE4B8, &lit_3938); #pragma pop /* 806BE4BC-806BE4C0 000030 0004+00 0/1 0/0 0/0 .rodata @3939 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3939 = 170.0f; -COMPILER_STRIP_GATE(806BE4BC, &lit_3939); +COMPILER_STRIP_GATE(0x806BE4BC, &lit_3939); #pragma pop /* 806BE4C0-806BE4C4 000034 0004+00 0/2 0/0 0/0 .rodata @3940 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3940 = 2000.0f; -COMPILER_STRIP_GATE(806BE4C0, &lit_3940); +COMPILER_STRIP_GATE(0x806BE4C0, &lit_3940); #pragma pop /* 806BE580-806BE58C 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ @@ -698,7 +698,13 @@ asm daE_Fs_HIO_c::daE_Fs_HIO_c() { /* ############################################################################################## */ /* 806BE4C4-806BE4C8 000038 0004+00 1/1 0/0 0/0 .rodata @3954 */ SECTION_RODATA static f32 const lit_3954 = -1.0f; -COMPILER_STRIP_GATE(806BE4C4, &lit_3954); +COMPILER_STRIP_GATE(0x806BE4C4, &lit_3954); + +/* 806BE564-806BE564 0000D8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_806BE564 = "E_FS"; +#pragma pop /* 806BBB10-806BBBBC 000130 00AC+00 7/7 0/0 0/0 .text anm_init__FP10e_fs_classifUcf */ #pragma push @@ -715,14 +721,14 @@ static asm void anm_init(e_fs_class* param_0, int param_1, f32 param_2, u8 param #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3984 = 1000.0f; -COMPILER_STRIP_GATE(806BE4C8, &lit_3984); +COMPILER_STRIP_GATE(0x806BE4C8, &lit_3984); #pragma pop /* 806BE4CC-806BE4D0 000040 0004+00 0/4 0/0 0/0 .rodata @3985 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3985 = 50.0f; -COMPILER_STRIP_GATE(806BE4CC, &lit_3985); +COMPILER_STRIP_GATE(0x806BE4CC, &lit_3985); #pragma pop /* 806BBBBC-806BBCDC 0001DC 0120+00 1/0 0/0 0/0 .text daE_Fs_Draw__FP10e_fs_class */ @@ -750,42 +756,42 @@ static asm void way_bg_check(e_fs_class* param_0, f32 param_1, s16 param_2) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4075 = 10000.0f; -COMPILER_STRIP_GATE(806BE4D0, &lit_4075); +COMPILER_STRIP_GATE(0x806BE4D0, &lit_4075); #pragma pop /* 806BE4D4-806BE4D8 000048 0004+00 0/4 0/0 0/0 .rodata @4076 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4076 = 10.0f; -COMPILER_STRIP_GATE(806BE4D4, &lit_4076); +COMPILER_STRIP_GATE(0x806BE4D4, &lit_4076); #pragma pop /* 806BE4D8-806BE4DC 00004C 0004+00 0/1 0/0 0/0 .rodata @4077 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4077 = 38.0f; -COMPILER_STRIP_GATE(806BE4D8, &lit_4077); +COMPILER_STRIP_GATE(0x806BE4D8, &lit_4077); #pragma pop /* 806BE4DC-806BE4E0 000050 0004+00 0/3 0/0 0/0 .rodata @4078 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4078 = 200.0f; -COMPILER_STRIP_GATE(806BE4DC, &lit_4078); +COMPILER_STRIP_GATE(0x806BE4DC, &lit_4078); #pragma pop /* 806BE4E0-806BE4E4 000054 0004+00 0/4 0/0 0/0 .rodata @4079 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4079 = 7.0f / 10.0f; -COMPILER_STRIP_GATE(806BE4E0, &lit_4079); +COMPILER_STRIP_GATE(0x806BE4E0, &lit_4079); #pragma pop /* 806BE4E4-806BE4E8 000058 0004+00 0/4 0/0 0/0 .rodata @4080 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4080 = 0.5f; -COMPILER_STRIP_GATE(806BE4E4, &lit_4080); +COMPILER_STRIP_GATE(0x806BE4E4, &lit_4080); #pragma pop /* 806BBDF4-806BC0A8 000414 02B4+00 1/1 0/0 0/0 .text e_fs_appear__FP10e_fs_class */ @@ -803,21 +809,21 @@ static asm void e_fs_appear(e_fs_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4117 = 2.0f; -COMPILER_STRIP_GATE(806BE4E8, &lit_4117); +COMPILER_STRIP_GATE(0x806BE4E8, &lit_4117); #pragma pop /* 806BE4EC-806BE4F0 000060 0004+00 0/1 0/0 0/0 .rodata @4118 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4118 = 60.0f; -COMPILER_STRIP_GATE(806BE4EC, &lit_4118); +COMPILER_STRIP_GATE(0x806BE4EC, &lit_4118); #pragma pop /* 806BE4F0-806BE4F4 000064 0004+00 0/1 0/0 0/0 .rodata @4119 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4119 = 4.0f; -COMPILER_STRIP_GATE(806BE4F0, &lit_4119); +COMPILER_STRIP_GATE(0x806BE4F0, &lit_4119); #pragma pop /* 806BC0A8-806BC264 0006C8 01BC+00 1/1 0/0 0/0 .text e_fs_wait__FP10e_fs_class */ @@ -835,35 +841,35 @@ static asm void e_fs_wait(e_fs_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4155 = 20.0f; -COMPILER_STRIP_GATE(806BE4F4, &lit_4155); +COMPILER_STRIP_GATE(0x806BE4F4, &lit_4155); #pragma pop /* 806BE4F8-806BE4FC 00006C 0004+00 0/1 0/0 0/0 .rodata @4156 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4156 = 4.0f / 5.0f; -COMPILER_STRIP_GATE(806BE4F8, &lit_4156); +COMPILER_STRIP_GATE(0x806BE4F8, &lit_4156); #pragma pop /* 806BE4FC-806BE500 000070 0004+00 0/2 0/0 0/0 .rodata @4157 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4157 = 5.0f; -COMPILER_STRIP_GATE(806BE4FC, &lit_4157); +COMPILER_STRIP_GATE(0x806BE4FC, &lit_4157); #pragma pop /* 806BE500-806BE504 000074 0004+00 0/2 0/0 0/0 .rodata @4158 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4158 = 300.0f; -COMPILER_STRIP_GATE(806BE500, &lit_4158); +COMPILER_STRIP_GATE(0x806BE500, &lit_4158); #pragma pop /* 806BE504-806BE508 000078 0004+00 0/1 0/0 0/0 .rodata @4159 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4159 = 32000.0f; -COMPILER_STRIP_GATE(806BE504, &lit_4159); +COMPILER_STRIP_GATE(0x806BE504, &lit_4159); #pragma pop /* 806BE760-806BE764 000008 0001+03 1/1 0/0 0/0 .bss @1109 */ @@ -982,14 +988,14 @@ static asm void e_fs_move(e_fs_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4237 = 9.0f; -COMPILER_STRIP_GATE(806BE508, &lit_4237); +COMPILER_STRIP_GATE(0x806BE508, &lit_4237); #pragma pop /* 806BE50C-806BE510 000080 0004+00 0/1 0/0 0/0 .rodata @4238 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4238 = -10.0f; -COMPILER_STRIP_GATE(806BE50C, &lit_4238); +COMPILER_STRIP_GATE(0x806BE50C, &lit_4238); #pragma pop /* 806BC444-806BC750 000A64 030C+00 1/1 0/0 0/0 .text e_fs_attack__FP10e_fs_class */ @@ -1017,35 +1023,41 @@ static asm void e_fs_damage(e_fs_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4338 = 2.0f / 5.0f; -COMPILER_STRIP_GATE(806BE510, &lit_4338); +COMPILER_STRIP_GATE(0x806BE510, &lit_4338); #pragma pop /* 806BE514-806BE518 000088 0004+00 0/1 0/0 0/0 .rodata @4339 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4339 = 23.0f; -COMPILER_STRIP_GATE(806BE514, &lit_4339); +COMPILER_STRIP_GATE(0x806BE514, &lit_4339); #pragma pop /* 806BE518-806BE51C 00008C 0004+00 0/1 0/0 0/0 .rodata @4340 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4340 = 15.0f; -COMPILER_STRIP_GATE(806BE518, &lit_4340); +COMPILER_STRIP_GATE(0x806BE518, &lit_4340); #pragma pop /* 806BE51C-806BE520 000090 0004+00 0/1 0/0 0/0 .rodata @4341 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4341 = 1.25f; -COMPILER_STRIP_GATE(806BE51C, &lit_4341); +COMPILER_STRIP_GATE(0x806BE51C, &lit_4341); #pragma pop /* 806BE520-806BE524 000094 0004+00 0/1 0/0 0/0 .rodata @4342 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4342 = 13.0f / 10.0f; -COMPILER_STRIP_GATE(806BE520, &lit_4342); +COMPILER_STRIP_GATE(0x806BE520, &lit_4342); +#pragma pop + +/* 806BE564-806BE564 0000D8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_806BE569 = "F_SP117"; #pragma pop /* 806BE7CC-806BE7DC 000074 000C+04 0/1 0/0 0/0 .bss @4275 */ @@ -1075,21 +1087,21 @@ static asm void e_fs_end(e_fs_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4380 = -40.0f; -COMPILER_STRIP_GATE(806BE524, &lit_4380); +COMPILER_STRIP_GATE(0x806BE524, &lit_4380); #pragma pop /* 806BE528-806BE52C 00009C 0004+00 0/1 0/0 0/0 .rodata @4381 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4381 = -30.0f; -COMPILER_STRIP_GATE(806BE528, &lit_4381); +COMPILER_STRIP_GATE(0x806BE528, &lit_4381); #pragma pop /* 806BE52C-806BE530 0000A0 0004+00 0/1 0/0 0/0 .rodata @4382 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4382 = -5.0f; -COMPILER_STRIP_GATE(806BE52C, &lit_4382); +COMPILER_STRIP_GATE(0x806BE52C, &lit_4382); #pragma pop /* 806BCC30-806BCDDC 001250 01AC+00 1/1 0/0 0/0 .text damage_check__FP10e_fs_class */ @@ -1107,14 +1119,14 @@ static asm void damage_check(e_fs_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4396 = 608.0f; -COMPILER_STRIP_GATE(806BE530, &lit_4396); +COMPILER_STRIP_GATE(0x806BE530, &lit_4396); #pragma pop /* 806BE534-806BE538 0000A8 0004+00 0/1 0/0 0/0 .rodata @4397 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4397 = 448.0f; -COMPILER_STRIP_GATE(806BE534, &lit_4397); +COMPILER_STRIP_GATE(0x806BE534, &lit_4397); #pragma pop /* 806BCDDC-806BCE5C 0013FC 0080+00 1/1 0/0 0/0 .text checkViewArea__FP4cXyz */ @@ -1132,7 +1144,7 @@ static asm void checkViewArea(cXyz* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4447 = 20000.0f; -COMPILER_STRIP_GATE(806BE538, &lit_4447); +COMPILER_STRIP_GATE(0x806BE538, &lit_4447); #pragma pop /* 806BCE5C-806BD0A8 00147C 024C+00 2/1 0/0 0/0 .text e_fs_demowait__FP10e_fs_class */ @@ -1164,7 +1176,7 @@ SECTION_RODATA static f32 const lit_4448[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(806BE53C, &lit_4448); +COMPILER_STRIP_GATE(0x806BE53C, &lit_4448); #pragma pop /* 806BE544-806BE54C 0000B8 0008+00 0/0 0/0 0/0 .rodata @4451 */ @@ -1173,42 +1185,42 @@ COMPILER_STRIP_GATE(806BE53C, &lit_4448); SECTION_RODATA static u8 const lit_4451[8] = { 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(806BE544, &lit_4451); +COMPILER_STRIP_GATE(0x806BE544, &lit_4451); #pragma pop /* 806BE54C-806BE550 0000C0 0004+00 0/0 0/0 0/0 .rodata @4544 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4544 = -80.0f; -COMPILER_STRIP_GATE(806BE54C, &lit_4544); +COMPILER_STRIP_GATE(0x806BE54C, &lit_4544); #pragma pop /* 806BE550-806BE554 0000C4 0004+00 0/0 0/0 0/0 .rodata @4545 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4545 = 400.0f; -COMPILER_STRIP_GATE(806BE550, &lit_4545); +COMPILER_STRIP_GATE(0x806BE550, &lit_4545); #pragma pop /* 806BE554-806BE558 0000C8 0004+00 0/1 0/0 0/0 .rodata @4622 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4622 = 1.5f; -COMPILER_STRIP_GATE(806BE554, &lit_4622); +COMPILER_STRIP_GATE(0x806BE554, &lit_4622); #pragma pop /* 806BE558-806BE55C 0000CC 0004+00 0/1 0/0 0/0 .rodata @4623 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4623 = 120.0f; -COMPILER_STRIP_GATE(806BE558, &lit_4623); +COMPILER_STRIP_GATE(0x806BE558, &lit_4623); #pragma pop /* 806BE55C-806BE560 0000D0 0004+00 0/1 0/0 0/0 .rodata @4624 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4624 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(806BE55C, &lit_4624); +COMPILER_STRIP_GATE(0x806BE55C, &lit_4624); #pragma pop /* 806BD3E0-806BD6D0 001A00 02F0+00 2/1 0/0 0/0 .text daE_Fs_Execute__FP10e_fs_class */ @@ -1251,7 +1263,14 @@ static asm void useHeapIe_fst(fopAc_ac_c* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4838 = -200.0f; -COMPILER_STRIP_GATE(806BE560, &lit_4838); +COMPILER_STRIP_GATE(0x806BE560, &lit_4838); +#pragma pop + +/* 806BE564-806BE564 0000D8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_806BE571 = "F_SP108"; +SECTION_DEAD static char const* const stringBase_806BE579 = "E_fs"; #pragma pop /* 806BD838-806BDD38 001E58 0500+00 1/0 0/0 0/0 .text daE_Fs_Create__FP10fopAc_ac_c */ @@ -1356,7 +1375,7 @@ asm void __sinit_d_a_e_fs_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_806BDFDC = (void*)__sinit_d_a_e_fs_cpp; +REGISTER_CTORS(0x806BDFDC, __sinit_d_a_e_fs_cpp); #pragma pop /* 806BE018-806BE020 002638 0008+00 1/0 0/0 0/0 .text @36@__dt__12dBgS_ObjAcchFv */ @@ -1573,12 +1592,4 @@ static u8 data_806BE844[4]; static u8 data_806BE848[4]; #pragma pop -/* 806BE564-806BE57E 0000D8 001A+00 5/5 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_806BE564 = "E_FS"; -SECTION_DEAD static char const* const stringBase_806BE569 = "F_SP117"; -SECTION_DEAD static char const* const stringBase_806BE571 = "F_SP108"; -SECTION_DEAD static char const* const stringBase_806BE579 = "E_fs"; -#pragma pop +/* 806BE564-806BE564 0000D8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/e/d_a_e_fz/d_a_e_fz.cpp b/rel/d/a/e/d_a_e_fz/d_a_e_fz.cpp index c257ac38db4..18261126241 100644 --- a/rel/d/a/e/d_a_e_fz/d_a_e_fz.cpp +++ b/rel/d/a/e/d_a_e_fz/d_a_e_fz.cpp @@ -435,7 +435,7 @@ extern "C" void __register_global_object(); /* ############################################################################################## */ /* 806C1938-806C193C 000000 0004+00 13/13 0/0 0/0 .rodata @3803 */ SECTION_RODATA static f32 const lit_3803 = 100.0f; -COMPILER_STRIP_GATE(806C1938, &lit_3803); +COMPILER_STRIP_GATE(0x806C1938, &lit_3803); /* 806C193C-806C1940 000004 0004+00 1/12 0/0 0/0 .rodata @3804 */ SECTION_RODATA static u8 const lit_3804[4] = { @@ -444,7 +444,7 @@ SECTION_RODATA static u8 const lit_3804[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(806C193C, &lit_3804); +COMPILER_STRIP_GATE(0x806C193C, &lit_3804); /* 806C1940-806C1948 000008 0004+04 2/10 0/0 0/0 .rodata @3805 */ SECTION_RODATA static f32 const lit_3805[1 + 1 /* padding */] = { @@ -452,7 +452,7 @@ SECTION_RODATA static f32 const lit_3805[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(806C1940, &lit_3805); +COMPILER_STRIP_GATE(0x806C1940, &lit_3805); /* 806C1948-806C1950 000010 0008+00 0/1 0/0 0/0 .rodata @3806 */ #pragma push @@ -460,7 +460,7 @@ COMPILER_STRIP_GATE(806C1940, &lit_3805); SECTION_RODATA static u8 const lit_3806[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(806C1948, &lit_3806); +COMPILER_STRIP_GATE(0x806C1948, &lit_3806); #pragma pop /* 806C1950-806C1958 000018 0008+00 0/1 0/0 0/0 .rodata @3807 */ @@ -469,7 +469,7 @@ COMPILER_STRIP_GATE(806C1948, &lit_3806); SECTION_RODATA static u8 const lit_3807[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(806C1950, &lit_3807); +COMPILER_STRIP_GATE(0x806C1950, &lit_3807); #pragma pop /* 806C1958-806C1960 000020 0008+00 0/1 0/0 0/0 .rodata @3808 */ @@ -478,91 +478,91 @@ COMPILER_STRIP_GATE(806C1950, &lit_3807); SECTION_RODATA static u8 const lit_3808[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(806C1958, &lit_3808); +COMPILER_STRIP_GATE(0x806C1958, &lit_3808); #pragma pop /* 806C1960-806C1964 000028 0004+00 0/1 0/0 0/0 .rodata @3809 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3809 = 1.0f / 100.0f; -COMPILER_STRIP_GATE(806C1960, &lit_3809); +COMPILER_STRIP_GATE(0x806C1960, &lit_3809); #pragma pop /* 806C1964-806C1968 00002C 0004+00 0/1 0/0 0/0 .rodata @3824 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3824 = 7.0f / 5.0f; -COMPILER_STRIP_GATE(806C1964, &lit_3824); +COMPILER_STRIP_GATE(0x806C1964, &lit_3824); #pragma pop /* 806C1968-806C196C 000030 0004+00 0/1 0/0 0/0 .rodata @3825 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3825 = 1000.0f; -COMPILER_STRIP_GATE(806C1968, &lit_3825); +COMPILER_STRIP_GATE(0x806C1968, &lit_3825); #pragma pop /* 806C196C-806C1970 000034 0004+00 0/1 0/0 0/0 .rodata @3826 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3826 = 800.0f; -COMPILER_STRIP_GATE(806C196C, &lit_3826); +COMPILER_STRIP_GATE(0x806C196C, &lit_3826); #pragma pop /* 806C1970-806C1974 000038 0004+00 0/1 0/0 0/0 .rodata @3827 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3827 = 350.0f; -COMPILER_STRIP_GATE(806C1970, &lit_3827); +COMPILER_STRIP_GATE(0x806C1970, &lit_3827); #pragma pop /* 806C1974-806C1978 00003C 0004+00 0/1 0/0 0/0 .rodata @3828 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3828 = 2.0f; -COMPILER_STRIP_GATE(806C1974, &lit_3828); +COMPILER_STRIP_GATE(0x806C1974, &lit_3828); #pragma pop /* 806C1978-806C197C 000040 0004+00 0/1 0/0 0/0 .rodata @3829 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3829 = 6.0f; -COMPILER_STRIP_GATE(806C1978, &lit_3829); +COMPILER_STRIP_GATE(0x806C1978, &lit_3829); #pragma pop /* 806C197C-806C1980 000044 0004+00 0/3 0/0 0/0 .rodata @3830 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3830 = 10.0f; -COMPILER_STRIP_GATE(806C197C, &lit_3830); +COMPILER_STRIP_GATE(0x806C197C, &lit_3830); #pragma pop /* 806C1980-806C1984 000048 0004+00 0/3 0/0 0/0 .rodata @3831 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3831 = 50.0f; -COMPILER_STRIP_GATE(806C1980, &lit_3831); +COMPILER_STRIP_GATE(0x806C1980, &lit_3831); #pragma pop /* 806C1984-806C1988 00004C 0004+00 0/2 0/0 0/0 .rodata @3832 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3832 = 3.0f; -COMPILER_STRIP_GATE(806C1984, &lit_3832); +COMPILER_STRIP_GATE(0x806C1984, &lit_3832); #pragma pop /* 806C1988-806C198C 000050 0004+00 0/4 0/0 0/0 .rodata @3833 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3833 = 40.0f; -COMPILER_STRIP_GATE(806C1988, &lit_3833); +COMPILER_STRIP_GATE(0x806C1988, &lit_3833); #pragma pop /* 806C198C-806C1990 000054 0004+00 0/1 0/0 0/0 .rodata @3834 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3834 = 80.0f; -COMPILER_STRIP_GATE(806C198C, &lit_3834); +COMPILER_STRIP_GATE(0x806C198C, &lit_3834); #pragma pop /* 806C1A00-806C1A0C 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ @@ -748,7 +748,7 @@ asm daE_FZ_HIO_c::daE_FZ_HIO_c() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3863 = 300.0f; -COMPILER_STRIP_GATE(806C1990, &lit_3863); +COMPILER_STRIP_GATE(0x806C1990, &lit_3863); #pragma pop /* 806BE9D4-806BEAD8 000174 0104+00 1/1 0/0 0/0 .text draw__8daE_FZ_cFv */ @@ -814,7 +814,7 @@ asm void daE_FZ_c::deadnextSet(bool param_0) { /* ############################################################################################## */ /* 806C1994-806C1998 00005C 0004+00 1/3 0/0 0/0 .rodata @4109 */ SECTION_RODATA static f32 const lit_4109 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(806C1994, &lit_4109); +COMPILER_STRIP_GATE(0x806C1994, &lit_4109); /* 806C1BA0-806C1BA4 000008 0004+00 2/2 0/0 0/0 .bss None */ static u8 data_806C1BA0[4]; @@ -840,14 +840,14 @@ asm void daE_FZ_c::damage_check() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4139 = 70.0f; -COMPILER_STRIP_GATE(806C1998, &lit_4139); +COMPILER_STRIP_GATE(0x806C1998, &lit_4139); #pragma pop /* 806C199C-806C19A0 000064 0004+00 0/2 0/0 0/0 .rodata @4140 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4140 = -1000000000.0f; -COMPILER_STRIP_GATE(806C199C, &lit_4140); +COMPILER_STRIP_GATE(0x806C199C, &lit_4140); #pragma pop /* 806BF444-806BF58C 000BE4 0148+00 3/3 0/0 0/0 .text way_gake_check__8daE_FZ_cFv */ @@ -865,28 +865,28 @@ asm void daE_FZ_c::way_gake_check() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4200 = 200.0f; -COMPILER_STRIP_GATE(806C19A0, &lit_4200); +COMPILER_STRIP_GATE(0x806C19A0, &lit_4200); #pragma pop /* 806C19A4-806C19A8 00006C 0004+00 0/1 0/0 0/0 .rodata @4201 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4201 = 32768.0f; -COMPILER_STRIP_GATE(806C19A4, &lit_4201); +COMPILER_STRIP_GATE(0x806C19A4, &lit_4201); #pragma pop /* 806C19A8-806C19AC 000070 0004+00 0/2 0/0 0/0 .rodata @4202 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4202 = 10000.0f; -COMPILER_STRIP_GATE(806C19A8, &lit_4202); +COMPILER_STRIP_GATE(0x806C19A8, &lit_4202); #pragma pop /* 806C19AC-806C19B0 000074 0004+00 0/2 0/0 0/0 .rodata @4203 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4203 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(806C19AC, &lit_4203); +COMPILER_STRIP_GATE(0x806C19AC, &lit_4203); #pragma pop /* 806C19B0-806C19B8 000078 0008+00 0/2 0/0 0/0 .rodata @4205 */ @@ -895,7 +895,7 @@ COMPILER_STRIP_GATE(806C19AC, &lit_4203); SECTION_RODATA static u8 const lit_4205[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(806C19B0, &lit_4205); +COMPILER_STRIP_GATE(0x806C19B0, &lit_4205); #pragma pop /* 806BF58C-806BF8E8 000D2C 035C+00 1/1 0/0 0/0 .text executeWait__8daE_FZ_cFv */ @@ -923,7 +923,7 @@ asm void daE_FZ_c::executeMove() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4243 = 7.0f / 10.0f; -COMPILER_STRIP_GATE(806C19B8, &lit_4243); +COMPILER_STRIP_GATE(0x806C19B8, &lit_4243); #pragma pop /* 806BFA64-806BFB60 001204 00FC+00 1/1 0/0 0/0 .text executeAttack__8daE_FZ_cFv */ @@ -951,35 +951,35 @@ asm void daE_FZ_c::executeDamage() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4322 = 4096.0f; -COMPILER_STRIP_GATE(806C19BC, &lit_4322); +COMPILER_STRIP_GATE(0x806C19BC, &lit_4322); #pragma pop /* 806C19C0-806C19C4 000088 0004+00 0/0 0/0 0/0 .rodata @4323 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4323 = 3.0f / 10.0f; -COMPILER_STRIP_GATE(806C19C0, &lit_4323); +COMPILER_STRIP_GATE(0x806C19C0, &lit_4323); #pragma pop /* 806C19C4-806C19C8 00008C 0004+00 0/2 0/0 0/0 .rodata @4419 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4419 = 400.0f; -COMPILER_STRIP_GATE(806C19C4, &lit_4419); +COMPILER_STRIP_GATE(0x806C19C4, &lit_4419); #pragma pop /* 806C19C8-806C19CC 000090 0004+00 0/1 0/0 0/0 .rodata @4420 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4420 = 3.0f / 100.0f; -COMPILER_STRIP_GATE(806C19C8, &lit_4420); +COMPILER_STRIP_GATE(0x806C19C8, &lit_4420); #pragma pop /* 806C19CC-806C19D0 000094 0004+00 0/4 0/0 0/0 .rodata @4421 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4421 = 60.0f; -COMPILER_STRIP_GATE(806C19CC, &lit_4421); +COMPILER_STRIP_GATE(0x806C19CC, &lit_4421); #pragma pop /* 806BFF94-806C0224 001734 0290+00 1/1 0/0 0/0 .text executeRollMove__8daE_FZ_cFv */ @@ -997,7 +997,7 @@ asm void daE_FZ_c::executeRollMove() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4517 = 35.0f; -COMPILER_STRIP_GATE(806C19D0, &lit_4517); +COMPILER_STRIP_GATE(0x806C19D0, &lit_4517); #pragma pop /* 806C0224-806C06DC 0019C4 04B8+00 1/1 0/0 0/0 .text action__8daE_FZ_cFv */ @@ -1025,7 +1025,7 @@ asm void daE_FZ_c::mtx_set() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4562 = 25.0f; -COMPILER_STRIP_GATE(806C19D4, &lit_4562); +COMPILER_STRIP_GATE(0x806C19D4, &lit_4562); #pragma pop /* 806C0760-806C08C4 001F00 0164+00 1/1 0/0 0/0 .text cc_set__8daE_FZ_cFv */ @@ -1043,7 +1043,7 @@ asm void daE_FZ_c::cc_set() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4627 = 4.0f / 5.0f; -COMPILER_STRIP_GATE(806C19D8, &lit_4627); +COMPILER_STRIP_GATE(0x806C19D8, &lit_4627); #pragma pop /* 806C08C4-806C0B00 002064 023C+00 1/1 0/0 0/0 .text execute__8daE_FZ_cFv */ @@ -1081,6 +1081,13 @@ static bool daE_FZ_IsDelete(daE_FZ_c* param_0) { return true; } +/* ############################################################################################## */ +/* 806C19F4-806C19F4 0000BC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_806C19F4 = "E_FZ"; +#pragma pop + /* 806C0B94-806C0C08 002334 0074+00 1/1 0/0 0/0 .text _delete__8daE_FZ_cFv */ #pragma push #pragma optimization_level 0 @@ -1126,42 +1133,48 @@ static asm void useHeapInit(fopAc_ac_c* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4847 = -200.0f; -COMPILER_STRIP_GATE(806C19DC, &lit_4847); +COMPILER_STRIP_GATE(0x806C19DC, &lit_4847); #pragma pop /* 806C19E0-806C19E4 0000A8 0004+00 0/1 0/0 0/0 .rodata @4848 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4848 = 30.0f; -COMPILER_STRIP_GATE(806C19E0, &lit_4848); +COMPILER_STRIP_GATE(0x806C19E0, &lit_4848); #pragma pop /* 806C19E4-806C19E8 0000AC 0004+00 0/1 0/0 0/0 .rodata @4849 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4849 = 4.0f; -COMPILER_STRIP_GATE(806C19E4, &lit_4849); +COMPILER_STRIP_GATE(0x806C19E4, &lit_4849); #pragma pop /* 806C19E8-806C19EC 0000B0 0004+00 0/1 0/0 0/0 .rodata @4850 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4850 = 20.0f; -COMPILER_STRIP_GATE(806C19E8, &lit_4850); +COMPILER_STRIP_GATE(0x806C19E8, &lit_4850); #pragma pop /* 806C19EC-806C19F0 0000B4 0004+00 0/1 0/0 0/0 .rodata @4851 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4851 = -5.0f; -COMPILER_STRIP_GATE(806C19EC, &lit_4851); +COMPILER_STRIP_GATE(0x806C19EC, &lit_4851); #pragma pop /* 806C19F0-806C19F4 0000B8 0004+00 0/1 0/0 0/0 .rodata @4852 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4852 = 0.5f; -COMPILER_STRIP_GATE(806C19F0, &lit_4852); +COMPILER_STRIP_GATE(0x806C19F0, &lit_4852); +#pragma pop + +/* 806C19F4-806C19F4 0000BC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_806C19F9 = "E_fz"; #pragma pop /* 806C0CD0-806C1208 002470 0538+00 1/1 0/0 0/0 .text create__8daE_FZ_cFv */ @@ -1271,7 +1284,7 @@ asm void __sinit_d_a_e_fz_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_806C1488 = (void*)__sinit_d_a_e_fz_cpp; +REGISTER_CTORS(0x806C1488, __sinit_d_a_e_fz_cpp); #pragma pop /* 806C14C4-806C14CC 002C64 0008+00 1/0 0/0 0/0 .text @36@__dt__12dBgS_ObjAcchFv */ @@ -1316,10 +1329,4 @@ asm cXyz::~cXyz() { } #pragma pop -/* 806C19F4-806C19FE 0000BC 000A+00 3/3 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_806C19F4 = "E_FZ"; -SECTION_DEAD static char const* const stringBase_806C19F9 = "E_fz"; -#pragma pop +/* 806C19F4-806C19F4 0000BC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/e/d_a_e_ga/d_a_e_ga.cpp b/rel/d/a/e/d_a_e_ga/d_a_e_ga.cpp index e28f25e3d25..72f04f3b0ba 100644 --- a/rel/d/a/e/d_a_e_ga/d_a_e_ga.cpp +++ b/rel/d/a/e/d_a_e_ga/d_a_e_ga.cpp @@ -54,10 +54,10 @@ struct dRes_control_c { /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); }; -struct J3DModelData {}; - struct J3DModel {}; +struct J3DModelData {}; + struct dComIfG_play_c { /* 8002CAF0 */ void addSimpleModel(J3DModelData*, int, u8); /* 8002CB30 */ void removeSimpleModel(J3DModelData*, int); @@ -142,7 +142,7 @@ extern "C" void __register_global_object(); /* ############################################################################################## */ /* 804FBB90-804FBB94 000000 0004+00 5/5 0/0 0/0 .rodata @3646 */ SECTION_RODATA static f32 const lit_3646 = 1.0f; -COMPILER_STRIP_GATE(804FBB90, &lit_3646); +COMPILER_STRIP_GATE(0x804FBB90, &lit_3646); /* 804FBBE0-804FBC00 -00001 0020+00 1/0 0/0 0/0 .data l_daE_Ga_Method */ SECTION_DATA static void* l_daE_Ga_Method[8] = { @@ -198,21 +198,21 @@ static asm void daE_Ga_Draw(e_ga_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3713 = 100.0f; -COMPILER_STRIP_GATE(804FBB94, &lit_3713); +COMPILER_STRIP_GATE(0x804FBB94, &lit_3713); #pragma pop /* 804FBB98-804FBB9C 000008 0004+00 0/1 0/0 0/0 .rodata @3714 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3714 = 10.0f; -COMPILER_STRIP_GATE(804FBB98, &lit_3714); +COMPILER_STRIP_GATE(0x804FBB98, &lit_3714); #pragma pop /* 804FBB9C-804FBBA0 00000C 0004+00 0/2 0/0 0/0 .rodata @3715 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3715 = 200.0f; -COMPILER_STRIP_GATE(804FBB9C, &lit_3715); +COMPILER_STRIP_GATE(0x804FBB9C, &lit_3715); #pragma pop /* 804FBBA0-804FBBA8 000010 0004+04 0/3 0/0 0/0 .rodata @3716 */ @@ -229,7 +229,7 @@ SECTION_RODATA static u8 const lit_3716[4 + 4 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(804FBBA0, &lit_3716); +COMPILER_STRIP_GATE(0x804FBBA0, &lit_3716); #pragma pop /* 804FBBA8-804FBBB0 000018 0008+00 0/2 0/0 0/0 .rodata @3718 */ @@ -238,7 +238,7 @@ COMPILER_STRIP_GATE(804FBBA0, &lit_3716); SECTION_RODATA static u8 const lit_3718[8] = { 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(804FBBA8, &lit_3718); +COMPILER_STRIP_GATE(0x804FBBA8, &lit_3718); #pragma pop /* 804FB1B0-804FB3A8 0001B0 01F8+00 1/1 0/0 0/0 .text ga_fly__FP10e_ga_classP4ga_s */ @@ -256,14 +256,14 @@ static asm void ga_fly(e_ga_class* param_0, ga_s* param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3759 = 12.0f; -COMPILER_STRIP_GATE(804FBBB0, &lit_3759); +COMPILER_STRIP_GATE(0x804FBBB0, &lit_3759); #pragma pop /* 804FBBB4-804FBBB8 000024 0004+00 0/1 0/0 0/0 .rodata @3760 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3760 = 7.0f; -COMPILER_STRIP_GATE(804FBBB4, &lit_3760); +COMPILER_STRIP_GATE(0x804FBBB4, &lit_3760); #pragma pop /* 804FB3A8-804FB5C0 0003A8 0218+00 1/1 0/0 0/0 .text bt_fly__FP10e_ga_classP4ga_s */ @@ -281,14 +281,14 @@ static asm void bt_fly(e_ga_class* param_0, ga_s* param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3796 = -15.0f; -COMPILER_STRIP_GATE(804FBBB8, &lit_3796); +COMPILER_STRIP_GATE(0x804FBBB8, &lit_3796); #pragma pop /* 804FBBBC-804FBBC0 00002C 0004+00 0/1 0/0 0/0 .rodata @3797 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3797 = -5.0f; -COMPILER_STRIP_GATE(804FBBBC, &lit_3797); +COMPILER_STRIP_GATE(0x804FBBBC, &lit_3797); #pragma pop /* 804FB5C0-804FB6F8 0005C0 0138+00 1/1 0/0 0/0 .text ga_control__FP10e_ga_class */ @@ -317,6 +317,12 @@ static bool daE_Ga_IsDelete(e_ga_class* param_0) { } /* ############################################################################################## */ +/* 804FBBD4-804FBBD4 000044 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_804FBBD4 = "E_ga"; +#pragma pop + /* 804FBC48-804FBC4C 000008 0004+00 2/2 0/0 0/0 .bss None */ static u8 data_804FBC48[4]; @@ -330,6 +336,13 @@ static asm void daE_Ga_Delete(e_ga_class* param_0) { } #pragma pop +/* ############################################################################################## */ +/* 804FBBD4-804FBBD4 000044 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_804FBBD9 = "E_Ga"; +#pragma pop + /* 804FB7C4-804FB874 0007C4 00B0+00 1/1 0/0 0/0 .text useHeapInit__FP10fopAc_ac_c */ #pragma push #pragma optimization_level 0 @@ -350,35 +363,35 @@ SECTION_RODATA static u8 const l_bmdidx[4] = { 0x00, 0x03, }; -COMPILER_STRIP_GATE(804FBBC0, &l_bmdidx); +COMPILER_STRIP_GATE(0x804FBBC0, &l_bmdidx); #pragma pop /* 804FBBC4-804FBBC8 000034 0004+00 0/1 0/0 0/0 .rodata @3912 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3912 = 65536.0f; -COMPILER_STRIP_GATE(804FBBC4, &lit_3912); +COMPILER_STRIP_GATE(0x804FBBC4, &lit_3912); #pragma pop /* 804FBBC8-804FBBCC 000038 0004+00 0/1 0/0 0/0 .rodata @3913 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3913 = 3.0f / 10.0f; -COMPILER_STRIP_GATE(804FBBC8, &lit_3913); +COMPILER_STRIP_GATE(0x804FBBC8, &lit_3913); #pragma pop /* 804FBBCC-804FBBD0 00003C 0004+00 0/1 0/0 0/0 .rodata @3914 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3914 = 4.0f / 5.0f; -COMPILER_STRIP_GATE(804FBBCC, &lit_3914); +COMPILER_STRIP_GATE(0x804FBBCC, &lit_3914); #pragma pop /* 804FBBD0-804FBBD4 000040 0004+00 0/1 0/0 0/0 .rodata @3915 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3915 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(804FBBD0, &lit_3915); +COMPILER_STRIP_GATE(0x804FBBD0, &lit_3915); #pragma pop /* 804FBC4C-804FBC58 00000C 000C+00 1/1 0/0 0/0 .bss @3641 */ @@ -434,13 +447,7 @@ asm void __sinit_d_a_e_ga_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_804FBB40 = (void*)__sinit_d_a_e_ga_cpp; +REGISTER_CTORS(0x804FBB40, __sinit_d_a_e_ga_cpp); #pragma pop -/* 804FBBD4-804FBBDE 000044 000A+00 3/3 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_804FBBD4 = "E_ga"; -SECTION_DEAD static char const* const stringBase_804FBBD9 = "E_Ga"; -#pragma pop +/* 804FBBD4-804FBBD4 000044 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/e/d_a_e_gb/d_a_e_gb.cpp b/rel/d/a/e/d_a_e_gb/d_a_e_gb.cpp index aa4acc8fc52..d9755331ae8 100644 --- a/rel/d/a/e/d_a_e_gb/d_a_e_gb.cpp +++ b/rel/d/a/e/d_a_e_gb/d_a_e_gb.cpp @@ -38,10 +38,10 @@ struct mDoExt_McaMorfCallBack1_c {}; struct Vec {}; -struct J3DModelData {}; - struct J3DAnmTransform {}; +struct J3DModelData {}; + struct mDoExt_McaMorf { /* 8000FC4C */ mDoExt_McaMorf(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, int, @@ -110,13 +110,13 @@ struct dRes_control_c { struct dPa_levelEcallBack {}; -struct _GXColor {}; - struct csXyz { /* 806C6F48 */ csXyz(); /* 806C7440 */ ~csXyz(); }; +struct _GXColor {}; + struct dPa_control_c { struct level_c { /* 8004B918 */ void getEmitter(u32); @@ -505,7 +505,7 @@ extern "C" void actionWaitInit__7daKey_cFv(); /* ############################################################################################## */ /* 806C74E8-806C74EC 000000 0004+00 20/20 0/0 0/0 .rodata @3906 */ SECTION_RODATA static f32 const lit_3906 = 100.0f; -COMPILER_STRIP_GATE(806C74E8, &lit_3906); +COMPILER_STRIP_GATE(0x806C74E8, &lit_3906); /* 806C74EC-806C74F0 000004 0004+00 4/24 0/0 0/0 .rodata @3907 */ SECTION_RODATA static u8 const lit_3907[4] = { @@ -514,7 +514,7 @@ SECTION_RODATA static u8 const lit_3907[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(806C74EC, &lit_3907); +COMPILER_STRIP_GATE(0x806C74EC, &lit_3907); /* 806C74F0-806C74F8 000008 0004+04 3/18 0/0 0/0 .rodata @3908 */ SECTION_RODATA static f32 const lit_3908[1 + 1 /* padding */] = { @@ -522,7 +522,7 @@ SECTION_RODATA static f32 const lit_3908[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(806C74F0, &lit_3908); +COMPILER_STRIP_GATE(0x806C74F0, &lit_3908); /* 806C74F8-806C7500 000010 0008+00 0/5 0/0 0/0 .rodata @3909 */ #pragma push @@ -530,7 +530,7 @@ COMPILER_STRIP_GATE(806C74F0, &lit_3908); SECTION_RODATA static u8 const lit_3909[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(806C74F8, &lit_3909); +COMPILER_STRIP_GATE(0x806C74F8, &lit_3909); #pragma pop /* 806C7500-806C7508 000018 0008+00 0/5 0/0 0/0 .rodata @3910 */ @@ -539,7 +539,7 @@ COMPILER_STRIP_GATE(806C74F8, &lit_3909); SECTION_RODATA static u8 const lit_3910[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(806C7500, &lit_3910); +COMPILER_STRIP_GATE(0x806C7500, &lit_3910); #pragma pop /* 806C7508-806C7510 000020 0008+00 0/5 0/0 0/0 .rodata @3911 */ @@ -548,19 +548,19 @@ COMPILER_STRIP_GATE(806C7500, &lit_3910); SECTION_RODATA static u8 const lit_3911[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(806C7508, &lit_3911); +COMPILER_STRIP_GATE(0x806C7508, &lit_3911); #pragma pop /* 806C7510-806C7514 000028 0004+00 0/1 0/0 0/0 .rodata @3912 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3912 = 1.0f / 100.0f; -COMPILER_STRIP_GATE(806C7510, &lit_3912); +COMPILER_STRIP_GATE(0x806C7510, &lit_3912); #pragma pop /* 806C7514-806C7518 00002C 0004+00 1/1 0/0 0/0 .rodata @3927 */ SECTION_RODATA static f32 const lit_3927 = 65.0f; -COMPILER_STRIP_GATE(806C7514, &lit_3927); +COMPILER_STRIP_GATE(0x806C7514, &lit_3927); /* 806C76C4-806C76D0 000000 000C+00 2/2 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { @@ -881,7 +881,13 @@ asm daE_GB_HIO_c::daE_GB_HIO_c() { /* ############################################################################################## */ /* 806C7518-806C751C 000030 0004+00 3/9 0/0 0/0 .rodata @3941 */ SECTION_RODATA static f32 const lit_3941 = -1.0f; -COMPILER_STRIP_GATE(806C7518, &lit_3941); +COMPILER_STRIP_GATE(0x806C7518, &lit_3941); + +/* 806C76B8-806C76B8 0001D0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_806C76B8 = "E_gb"; +#pragma pop /* 806C1D3C-806C1DEC 00013C 00B0+00 7/7 0/0 0/0 .text head_anm_init__FP10e_gb_classifUcf */ @@ -912,7 +918,7 @@ static asm void body_anm_init(e_gb_class* param_0, int param_1, f32 param_2, u8 #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4012 = 1400.0f; -COMPILER_STRIP_GATE(806C751C, &lit_4012); +COMPILER_STRIP_GATE(0x806C751C, &lit_4012); #pragma pop /* 806C1E9C-806C2078 00029C 01DC+00 1/0 0/0 0/0 .text daE_GB_Draw__FP10e_gb_class */ @@ -930,56 +936,56 @@ static asm void daE_GB_Draw(e_gb_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4108 = 3.0f; -COMPILER_STRIP_GATE(806C7520, &lit_4108); +COMPILER_STRIP_GATE(0x806C7520, &lit_4108); #pragma pop /* 806C7524-806C7528 00003C 0004+00 0/6 0/0 0/0 .rodata @4109 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4109 = 10.0f; -COMPILER_STRIP_GATE(806C7524, &lit_4109); +COMPILER_STRIP_GATE(0x806C7524, &lit_4109); #pragma pop /* 806C7528-806C752C 000040 0004+00 0/2 0/0 0/0 .rodata @4110 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4110 = 1000.0f; -COMPILER_STRIP_GATE(806C7528, &lit_4110); +COMPILER_STRIP_GATE(0x806C7528, &lit_4110); #pragma pop /* 806C752C-806C7530 000044 0004+00 0/5 0/0 0/0 .rodata @4111 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4111 = 30.0f; -COMPILER_STRIP_GATE(806C752C, &lit_4111); +COMPILER_STRIP_GATE(0x806C752C, &lit_4111); #pragma pop /* 806C7530-806C7534 000048 0004+00 0/2 0/0 0/0 .rodata @4112 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4112 = 450.0f; -COMPILER_STRIP_GATE(806C7530, &lit_4112); +COMPILER_STRIP_GATE(0x806C7530, &lit_4112); #pragma pop /* 806C7534-806C7538 00004C 0004+00 0/2 0/0 0/0 .rodata @4113 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4113 = 200.0f; -COMPILER_STRIP_GATE(806C7534, &lit_4113); +COMPILER_STRIP_GATE(0x806C7534, &lit_4113); #pragma pop /* 806C7538-806C753C 000050 0004+00 0/1 0/0 0/0 .rodata @4114 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4114 = 1500.0f; -COMPILER_STRIP_GATE(806C7538, &lit_4114); +COMPILER_STRIP_GATE(0x806C7538, &lit_4114); #pragma pop /* 806C753C-806C7540 000054 0004+00 0/5 0/0 0/0 .rodata @4115 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4115 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(806C753C, &lit_4115); +COMPILER_STRIP_GATE(0x806C753C, &lit_4115); #pragma pop /* 806C7540-806C7548 000058 0004+04 0/3 0/0 0/0 .rodata @4116 */ @@ -990,7 +996,7 @@ SECTION_RODATA static f32 const lit_4116[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(806C7540, &lit_4116); +COMPILER_STRIP_GATE(0x806C7540, &lit_4116); #pragma pop /* 806C7548-806C7550 000060 0008+00 0/2 0/0 0/0 .rodata @4118 */ @@ -999,7 +1005,7 @@ COMPILER_STRIP_GATE(806C7540, &lit_4116); SECTION_RODATA static u8 const lit_4118[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(806C7548, &lit_4118); +COMPILER_STRIP_GATE(0x806C7548, &lit_4118); #pragma pop /* 806C7928-806C792C 000008 0004+00 2/2 0/0 0/0 .bss None */ @@ -1026,49 +1032,49 @@ static asm void e_gb_wait(e_gb_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4217 = 20.0f; -COMPILER_STRIP_GATE(806C7550, &lit_4217); +COMPILER_STRIP_GATE(0x806C7550, &lit_4217); #pragma pop /* 806C7554-806C7558 00006C 0004+00 0/1 0/0 0/0 .rodata @4218 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4218 = 1200.0f; -COMPILER_STRIP_GATE(806C7554, &lit_4218); +COMPILER_STRIP_GATE(0x806C7554, &lit_4218); #pragma pop /* 806C7558-806C755C 000070 0004+00 0/3 0/0 0/0 .rodata @4219 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4219 = 0.5f; -COMPILER_STRIP_GATE(806C7558, &lit_4219); +COMPILER_STRIP_GATE(0x806C7558, &lit_4219); #pragma pop /* 806C755C-806C7560 000074 0004+00 0/7 0/0 0/0 .rodata @4220 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4220 = 5.0f; -COMPILER_STRIP_GATE(806C755C, &lit_4220); +COMPILER_STRIP_GATE(0x806C755C, &lit_4220); #pragma pop /* 806C7560-806C7564 000078 0004+00 0/2 0/0 0/0 .rodata @4221 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4221 = 3000.0f; -COMPILER_STRIP_GATE(806C7560, &lit_4221); +COMPILER_STRIP_GATE(0x806C7560, &lit_4221); #pragma pop /* 806C7564-806C7568 00007C 0004+00 0/7 0/0 0/0 .rodata @4222 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4222 = 2.0f; -COMPILER_STRIP_GATE(806C7564, &lit_4222); +COMPILER_STRIP_GATE(0x806C7564, &lit_4222); #pragma pop /* 806C7568-806C756C 000080 0004+00 0/3 0/0 0/0 .rodata @4223 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4223 = -30.0f; -COMPILER_STRIP_GATE(806C7568, &lit_4223); +COMPILER_STRIP_GATE(0x806C7568, &lit_4223); #pragma pop /* 806C2560-806C2AB0 000960 0550+00 1/1 0/0 0/0 .text e_gb_attack_1__FP10e_gb_class */ @@ -1086,42 +1092,42 @@ static asm void e_gb_attack_1(e_gb_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4326 = 49.0f; -COMPILER_STRIP_GATE(806C756C, &lit_4326); +COMPILER_STRIP_GATE(0x806C756C, &lit_4326); #pragma pop /* 806C7570-806C7574 000088 0004+00 0/1 0/0 0/0 .rodata @4327 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4327 = 16.0f; -COMPILER_STRIP_GATE(806C7570, &lit_4327); +COMPILER_STRIP_GATE(0x806C7570, &lit_4327); #pragma pop /* 806C7574-806C7578 00008C 0004+00 0/1 0/0 0/0 .rodata @4328 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4328 = 6.0f; -COMPILER_STRIP_GATE(806C7574, &lit_4328); +COMPILER_STRIP_GATE(0x806C7574, &lit_4328); #pragma pop /* 806C7578-806C757C 000090 0004+00 0/3 0/0 0/0 .rodata @4329 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4329 = 50.0f; -COMPILER_STRIP_GATE(806C7578, &lit_4329); +COMPILER_STRIP_GATE(0x806C7578, &lit_4329); #pragma pop /* 806C757C-806C7580 000094 0004+00 0/5 0/0 0/0 .rodata @4330 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4330 = 150.0f; -COMPILER_STRIP_GATE(806C757C, &lit_4330); +COMPILER_STRIP_GATE(0x806C757C, &lit_4330); #pragma pop /* 806C7580-806C7584 000098 0004+00 0/1 0/0 0/0 .rodata @4331 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4331 = 17.0f / 10.0f; -COMPILER_STRIP_GATE(806C7580, &lit_4331); +COMPILER_STRIP_GATE(0x806C7580, &lit_4331); #pragma pop /* 806C2AB0-806C2FC0 000EB0 0510+00 1/1 0/0 0/0 .text e_gb_attack_2__FP10e_gb_class */ @@ -1139,7 +1145,7 @@ static asm void e_gb_attack_2(e_gb_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4367 = 800.0f; -COMPILER_STRIP_GATE(806C7584, &lit_4367); +COMPILER_STRIP_GATE(0x806C7584, &lit_4367); #pragma pop /* 806C7588-806C7590 0000A0 0004+04 0/2 0/0 0/0 .rodata @4368 */ @@ -1150,7 +1156,7 @@ SECTION_RODATA static f32 const lit_4368[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(806C7588, &lit_4368); +COMPILER_STRIP_GATE(0x806C7588, &lit_4368); #pragma pop /* 806C2FC0-806C3194 0013C0 01D4+00 1/1 0/0 0/0 .text e_gb_damage__FP10e_gb_class */ @@ -1170,7 +1176,7 @@ static asm void e_gb_damage(e_gb_class* param_0) { SECTION_RODATA static u8 const lit_4415[8] = { 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(806C7590, &lit_4415); +COMPILER_STRIP_GATE(0x806C7590, &lit_4415); #pragma pop /* 806C3194-806C33C8 001594 0234+00 1/1 0/0 0/0 .text e_gb_end__FP10e_gb_class */ @@ -1188,42 +1194,42 @@ static asm void e_gb_end(e_gb_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4434 = -6112.0f; -COMPILER_STRIP_GATE(806C7598, &lit_4434); +COMPILER_STRIP_GATE(0x806C7598, &lit_4434); #pragma pop /* 806C759C-806C75A0 0000B4 0004+00 0/1 0/0 0/0 .rodata @4435 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4435 = 4520.0f; -COMPILER_STRIP_GATE(806C759C, &lit_4435); +COMPILER_STRIP_GATE(0x806C759C, &lit_4435); #pragma pop /* 806C75A0-806C75A4 0000B8 0004+00 0/1 0/0 0/0 .rodata @4436 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4436 = 10800.0f; -COMPILER_STRIP_GATE(806C75A0, &lit_4436); +COMPILER_STRIP_GATE(0x806C75A0, &lit_4436); #pragma pop /* 806C75A4-806C75A8 0000BC 0004+00 0/1 0/0 0/0 .rodata @4437 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4437 = -5450.0f; -COMPILER_STRIP_GATE(806C75A4, &lit_4437); +COMPILER_STRIP_GATE(0x806C75A4, &lit_4437); #pragma pop /* 806C75A8-806C75AC 0000C0 0004+00 0/2 0/0 0/0 .rodata @4438 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4438 = 500.0f; -COMPILER_STRIP_GATE(806C75A8, &lit_4438); +COMPILER_STRIP_GATE(0x806C75A8, &lit_4438); #pragma pop /* 806C75AC-806C75B0 0000C4 0004+00 0/2 0/0 0/0 .rodata @4439 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4439 = 80.0f; -COMPILER_STRIP_GATE(806C75AC, &lit_4439); +COMPILER_STRIP_GATE(0x806C75AC, &lit_4439); #pragma pop /* 806C33C8-806C3558 0017C8 0190+00 1/1 0/0 0/0 .text e_gb_start__FP10e_gb_class */ @@ -1241,21 +1247,21 @@ static asm void e_gb_start(e_gb_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4533 = -200.0f; -COMPILER_STRIP_GATE(806C75B0, &lit_4533); +COMPILER_STRIP_GATE(0x806C75B0, &lit_4533); #pragma pop /* 806C75B4-806C75B8 0000CC 0004+00 0/1 0/0 0/0 .rodata @4534 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4534 = 0x3D0F5C29; -COMPILER_STRIP_GATE(806C75B4, &lit_4534); +COMPILER_STRIP_GATE(0x806C75B4, &lit_4534); #pragma pop /* 806C75B8-806C75BC 0000D0 0004+00 0/2 0/0 0/0 .rodata @4535 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4535 = 60.0f; -COMPILER_STRIP_GATE(806C75B8, &lit_4535); +COMPILER_STRIP_GATE(0x806C75B8, &lit_4535); #pragma pop /* 806C3558-806C3904 001958 03AC+00 1/1 0/0 0/0 .text kuki_control1__FP10e_gb_class */ @@ -1283,7 +1289,7 @@ static asm void kuki_control2(e_gb_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4612 = 17.0f; -COMPILER_STRIP_GATE(806C75BC, &lit_4612); +COMPILER_STRIP_GATE(0x806C75BC, &lit_4612); #pragma pop /* 806C3A78-806C3C44 001E78 01CC+00 1/1 0/0 0/0 .text kuki_control3__FP10e_gb_class */ @@ -1301,7 +1307,7 @@ static asm void kuki_control3(e_gb_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4650 = 110.0f; -COMPILER_STRIP_GATE(806C75C0, &lit_4650); +COMPILER_STRIP_GATE(0x806C75C0, &lit_4650); #pragma pop /* 806C3C44-806C3D20 002044 00DC+00 1/1 0/0 0/0 .text s_b_sub__FPvPv */ @@ -1369,21 +1375,21 @@ static asm void e_gf_eatbomb(e_gb_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4802 = 35.0f; -COMPILER_STRIP_GATE(806C75C4, &lit_4802); +COMPILER_STRIP_GATE(0x806C75C4, &lit_4802); #pragma pop /* 806C75C8-806C75CC 0000E0 0004+00 0/1 0/0 0/0 .rodata @4979 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4979 = 4.0f; -COMPILER_STRIP_GATE(806C75C8, &lit_4979); +COMPILER_STRIP_GATE(0x806C75C8, &lit_4979); #pragma pop /* 806C75CC-806C75D0 0000E4 0004+00 0/1 0/0 0/0 .rodata @4980 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4980 = -6.0f; -COMPILER_STRIP_GATE(806C75CC, &lit_4980); +COMPILER_STRIP_GATE(0x806C75CC, &lit_4980); #pragma pop /* 806C48EC-806C4AB4 002CEC 01C8+00 1/1 0/0 0/0 .text e_gf_end__FP10e_gb_class */ @@ -1401,7 +1407,7 @@ static asm void e_gf_end(e_gb_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5039 = 47.0f; -COMPILER_STRIP_GATE(806C75D0, &lit_5039); +COMPILER_STRIP_GATE(0x806C75D0, &lit_5039); #pragma pop /* 806C4AB4-806C4CC4 002EB4 0210+00 1/1 0/0 0/0 .text damage_check2__FP10e_gb_class */ @@ -1439,343 +1445,343 @@ static asm void cam_3d_morf(e_gb_class* param_0, f32 param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5351 = 55.0f; -COMPILER_STRIP_GATE(806C75D4, &lit_5351); +COMPILER_STRIP_GATE(0x806C75D4, &lit_5351); #pragma pop /* 806C75D8-806C75DC 0000F0 0004+00 0/1 0/0 0/0 .rodata @5352 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5352 = -5750.0f; -COMPILER_STRIP_GATE(806C75D8, &lit_5352); +COMPILER_STRIP_GATE(0x806C75D8, &lit_5352); #pragma pop /* 806C75DC-806C75E0 0000F4 0004+00 0/1 0/0 0/0 .rodata @5353 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5353 = 4410.0f; -COMPILER_STRIP_GATE(806C75DC, &lit_5353); +COMPILER_STRIP_GATE(0x806C75DC, &lit_5353); #pragma pop /* 806C75E0-806C75E4 0000F8 0004+00 0/1 0/0 0/0 .rodata @5354 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5354 = 10684.0f; -COMPILER_STRIP_GATE(806C75E0, &lit_5354); +COMPILER_STRIP_GATE(0x806C75E0, &lit_5354); #pragma pop /* 806C75E4-806C75E8 0000FC 0004+00 0/1 0/0 0/0 .rodata @5355 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5355 = -5689.0f; -COMPILER_STRIP_GATE(806C75E4, &lit_5355); +COMPILER_STRIP_GATE(0x806C75E4, &lit_5355); #pragma pop /* 806C75E8-806C75EC 000100 0004+00 0/1 0/0 0/0 .rodata @5356 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5356 = 4747.0f; -COMPILER_STRIP_GATE(806C75E8, &lit_5356); +COMPILER_STRIP_GATE(0x806C75E8, &lit_5356); #pragma pop /* 806C75EC-806C75F0 000104 0004+00 0/1 0/0 0/0 .rodata @5357 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5357 = 15000.0f; -COMPILER_STRIP_GATE(806C75EC, &lit_5357); +COMPILER_STRIP_GATE(0x806C75EC, &lit_5357); #pragma pop /* 806C75F0-806C75F4 000108 0004+00 0/1 0/0 0/0 .rodata @5358 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5358 = -5700.0f; -COMPILER_STRIP_GATE(806C75F0, &lit_5358); +COMPILER_STRIP_GATE(0x806C75F0, &lit_5358); #pragma pop /* 806C75F4-806C75F8 00010C 0004+00 0/1 0/0 0/0 .rodata @5359 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5359 = 4740.0f; -COMPILER_STRIP_GATE(806C75F4, &lit_5359); +COMPILER_STRIP_GATE(0x806C75F4, &lit_5359); #pragma pop /* 806C75F8-806C75FC 000110 0004+00 0/1 0/0 0/0 .rodata @5360 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5360 = 14644.0f; -COMPILER_STRIP_GATE(806C75F8, &lit_5360); +COMPILER_STRIP_GATE(0x806C75F8, &lit_5360); #pragma pop /* 806C75FC-806C7600 000114 0004+00 0/1 0/0 0/0 .rodata @5361 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5361 = 14643.0f; -COMPILER_STRIP_GATE(806C75FC, &lit_5361); +COMPILER_STRIP_GATE(0x806C75FC, &lit_5361); #pragma pop /* 806C7600-806C7604 000118 0004+00 0/1 0/0 0/0 .rodata @5362 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5362 = -5723.0f; -COMPILER_STRIP_GATE(806C7600, &lit_5362); +COMPILER_STRIP_GATE(0x806C7600, &lit_5362); #pragma pop /* 806C7604-806C7608 00011C 0004+00 0/1 0/0 0/0 .rodata @5363 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5363 = 4733.0f; -COMPILER_STRIP_GATE(806C7604, &lit_5363); +COMPILER_STRIP_GATE(0x806C7604, &lit_5363); #pragma pop /* 806C7608-806C760C 000120 0004+00 0/1 0/0 0/0 .rodata @5364 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5364 = 14293.0f; -COMPILER_STRIP_GATE(806C7608, &lit_5364); +COMPILER_STRIP_GATE(0x806C7608, &lit_5364); #pragma pop /* 806C760C-806C7610 000124 0004+00 0/1 0/0 0/0 .rodata @5365 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5365 = 4350.0f; -COMPILER_STRIP_GATE(806C760C, &lit_5365); +COMPILER_STRIP_GATE(0x806C760C, &lit_5365); #pragma pop /* 806C7610-806C7614 000128 0004+00 0/1 0/0 0/0 .rodata @5366 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5366 = 9670.0f; -COMPILER_STRIP_GATE(806C7610, &lit_5366); +COMPILER_STRIP_GATE(0x806C7610, &lit_5366); #pragma pop /* 806C7614-806C7618 00012C 0004+00 0/1 0/0 0/0 .rodata @5367 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5367 = 1.0f / 50.0f; -COMPILER_STRIP_GATE(806C7614, &lit_5367); +COMPILER_STRIP_GATE(0x806C7614, &lit_5367); #pragma pop /* 806C7618-806C761C 000130 0004+00 0/1 0/0 0/0 .rodata @5368 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_5368 = 0x3A03126F; -COMPILER_STRIP_GATE(806C7618, &lit_5368); +COMPILER_STRIP_GATE(0x806C7618, &lit_5368); #pragma pop /* 806C761C-806C7620 000134 0004+00 0/1 0/0 0/0 .rodata @5369 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5369 = -5690.0f; -COMPILER_STRIP_GATE(806C761C, &lit_5369); +COMPILER_STRIP_GATE(0x806C761C, &lit_5369); #pragma pop /* 806C7620-806C7624 000138 0004+00 0/1 0/0 0/0 .rodata @5370 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5370 = 4432.0f; -COMPILER_STRIP_GATE(806C7620, &lit_5370); +COMPILER_STRIP_GATE(0x806C7620, &lit_5370); #pragma pop /* 806C7624-806C7628 00013C 0004+00 0/1 0/0 0/0 .rodata @5371 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5371 = 9610.0f; -COMPILER_STRIP_GATE(806C7624, &lit_5371); +COMPILER_STRIP_GATE(0x806C7624, &lit_5371); #pragma pop /* 806C7628-806C762C 000140 0004+00 0/1 0/0 0/0 .rodata @5372 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5372 = -5709.0f; -COMPILER_STRIP_GATE(806C7628, &lit_5372); +COMPILER_STRIP_GATE(0x806C7628, &lit_5372); #pragma pop /* 806C762C-806C7630 000144 0004+00 0/1 0/0 0/0 .rodata @5373 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5373 = 4445.0f; -COMPILER_STRIP_GATE(806C762C, &lit_5373); +COMPILER_STRIP_GATE(0x806C762C, &lit_5373); #pragma pop /* 806C7630-806C7634 000148 0004+00 0/1 0/0 0/0 .rodata @5374 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5374 = 9961.0f; -COMPILER_STRIP_GATE(806C7630, &lit_5374); +COMPILER_STRIP_GATE(0x806C7630, &lit_5374); #pragma pop /* 806C7634-806C7638 00014C 0004+00 0/1 0/0 0/0 .rodata @5375 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5375 = -5741.0f; -COMPILER_STRIP_GATE(806C7634, &lit_5375); +COMPILER_STRIP_GATE(0x806C7634, &lit_5375); #pragma pop /* 806C7638-806C763C 000150 0004+00 0/1 0/0 0/0 .rodata @5376 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5376 = 10530.0f; -COMPILER_STRIP_GATE(806C7638, &lit_5376); +COMPILER_STRIP_GATE(0x806C7638, &lit_5376); #pragma pop /* 806C763C-806C7640 000154 0004+00 0/1 0/0 0/0 .rodata @5377 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5377 = -5760.0f; -COMPILER_STRIP_GATE(806C763C, &lit_5377); +COMPILER_STRIP_GATE(0x806C763C, &lit_5377); #pragma pop /* 806C7640-806C7644 000158 0004+00 0/1 0/0 0/0 .rodata @5378 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5378 = 4496.0f; -COMPILER_STRIP_GATE(806C7640, &lit_5378); +COMPILER_STRIP_GATE(0x806C7640, &lit_5378); #pragma pop /* 806C7644-806C7648 00015C 0004+00 0/1 0/0 0/0 .rodata @5379 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5379 = 10896.0f; -COMPILER_STRIP_GATE(806C7644, &lit_5379); +COMPILER_STRIP_GATE(0x806C7644, &lit_5379); #pragma pop /* 806C7648-806C764C 000160 0004+00 0/1 0/0 0/0 .rodata @5380 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5380 = -5706.0f; -COMPILER_STRIP_GATE(806C7648, &lit_5380); +COMPILER_STRIP_GATE(0x806C7648, &lit_5380); #pragma pop /* 806C764C-806C7650 000164 0004+00 0/1 0/0 0/0 .rodata @5381 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5381 = 4526.0f; -COMPILER_STRIP_GATE(806C764C, &lit_5381); +COMPILER_STRIP_GATE(0x806C764C, &lit_5381); #pragma pop /* 806C7650-806C7654 000168 0004+00 0/1 0/0 0/0 .rodata @5382 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5382 = 11379.0f; -COMPILER_STRIP_GATE(806C7650, &lit_5382); +COMPILER_STRIP_GATE(0x806C7650, &lit_5382); #pragma pop /* 806C7654-806C7658 00016C 0004+00 0/1 0/0 0/0 .rodata @5383 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5383 = -5687.0f; -COMPILER_STRIP_GATE(806C7654, &lit_5383); +COMPILER_STRIP_GATE(0x806C7654, &lit_5383); #pragma pop /* 806C7658-806C765C 000170 0004+00 0/1 0/0 0/0 .rodata @5384 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5384 = 4505.0f; -COMPILER_STRIP_GATE(806C7658, &lit_5384); +COMPILER_STRIP_GATE(0x806C7658, &lit_5384); #pragma pop /* 806C765C-806C7660 000174 0004+00 0/1 0/0 0/0 .rodata @5385 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5385 = 11008.0f; -COMPILER_STRIP_GATE(806C765C, &lit_5385); +COMPILER_STRIP_GATE(0x806C765C, &lit_5385); #pragma pop /* 806C7660-806C7664 000178 0004+00 0/1 0/0 0/0 .rodata @5386 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5386 = -5624.0f; -COMPILER_STRIP_GATE(806C7660, &lit_5386); +COMPILER_STRIP_GATE(0x806C7660, &lit_5386); #pragma pop /* 806C7664-806C7668 00017C 0004+00 0/1 0/0 0/0 .rodata @5387 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5387 = 4439.0f; -COMPILER_STRIP_GATE(806C7664, &lit_5387); +COMPILER_STRIP_GATE(0x806C7664, &lit_5387); #pragma pop /* 806C7668-806C766C 000180 0004+00 0/1 0/0 0/0 .rodata @5388 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5388 = 9818.0f; -COMPILER_STRIP_GATE(806C7668, &lit_5388); +COMPILER_STRIP_GATE(0x806C7668, &lit_5388); #pragma pop /* 806C766C-806C7670 000184 0004+00 0/1 0/0 0/0 .rodata @5389 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5389 = -5604.0f; -COMPILER_STRIP_GATE(806C766C, &lit_5389); +COMPILER_STRIP_GATE(0x806C766C, &lit_5389); #pragma pop /* 806C7670-806C7674 000188 0004+00 0/1 0/0 0/0 .rodata @5390 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5390 = 4418.0f; -COMPILER_STRIP_GATE(806C7670, &lit_5390); +COMPILER_STRIP_GATE(0x806C7670, &lit_5390); #pragma pop /* 806C7674-806C7678 00018C 0004+00 0/1 0/0 0/0 .rodata @5391 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5391 = 9447.0f; -COMPILER_STRIP_GATE(806C7674, &lit_5391); +COMPILER_STRIP_GATE(0x806C7674, &lit_5391); #pragma pop /* 806C7678-806C767C 000190 0004+00 0/1 0/0 0/0 .rodata @5392 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5392 = 4584.0f; -COMPILER_STRIP_GATE(806C7678, &lit_5392); +COMPILER_STRIP_GATE(0x806C7678, &lit_5392); #pragma pop /* 806C767C-806C7680 000194 0004+00 0/1 0/0 0/0 .rodata @5393 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5393 = 400.0f; -COMPILER_STRIP_GATE(806C767C, &lit_5393); +COMPILER_STRIP_GATE(0x806C767C, &lit_5393); #pragma pop /* 806C7680-806C7684 000198 0004+00 0/1 0/0 0/0 .rodata @5394 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5394 = 1.0f / 25.0f; -COMPILER_STRIP_GATE(806C7680, &lit_5394); +COMPILER_STRIP_GATE(0x806C7680, &lit_5394); #pragma pop /* 806C7684-806C7688 00019C 0004+00 0/1 0/0 0/0 .rodata @5395 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_5395 = 0x3B03126F; -COMPILER_STRIP_GATE(806C7684, &lit_5395); +COMPILER_STRIP_GATE(0x806C7684, &lit_5395); #pragma pop /* 806C7688-806C768C 0001A0 0004+00 0/1 0/0 0/0 .rodata @5396 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5396 = 300.0f; -COMPILER_STRIP_GATE(806C7688, &lit_5396); +COMPILER_STRIP_GATE(0x806C7688, &lit_5396); #pragma pop /* 806C768C-806C7690 0001A4 0004+00 0/1 0/0 0/0 .rodata @5397 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5397 = -600.0f; -COMPILER_STRIP_GATE(806C768C, &lit_5397); +COMPILER_STRIP_GATE(0x806C768C, &lit_5397); #pragma pop /* 806C7690-806C7694 0001A8 0004+00 0/1 0/0 0/0 .rodata @5398 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5398 = -250.0f; -COMPILER_STRIP_GATE(806C7690, &lit_5398); +COMPILER_STRIP_GATE(0x806C7690, &lit_5398); #pragma pop /* 806C7694-806C7698 0001AC 0004+00 0/1 0/0 0/0 .rodata @5399 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5399 = 120.0f; -COMPILER_STRIP_GATE(806C7694, &lit_5399); +COMPILER_STRIP_GATE(0x806C7694, &lit_5399); #pragma pop /* 806C4F0C-806C59F4 00330C 0AE8+00 1/1 0/0 0/0 .text demo_camera__FP10e_gb_class */ @@ -1793,49 +1799,49 @@ static asm void demo_camera(e_gb_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5688 = -50.0f; -COMPILER_STRIP_GATE(806C7698, &lit_5688); +COMPILER_STRIP_GATE(0x806C7698, &lit_5688); #pragma pop /* 806C769C-806C76A0 0001B4 0004+00 0/1 0/0 0/0 .rodata @5689 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5689 = 8.0f; -COMPILER_STRIP_GATE(806C769C, &lit_5689); +COMPILER_STRIP_GATE(0x806C769C, &lit_5689); #pragma pop /* 806C76A0-806C76A4 0001B8 0004+00 0/1 0/0 0/0 .rodata @5690 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5690 = 10000.0f; -COMPILER_STRIP_GATE(806C76A0, &lit_5690); +COMPILER_STRIP_GATE(0x806C76A0, &lit_5690); #pragma pop /* 806C76A4-806C76A8 0001BC 0004+00 0/1 0/0 0/0 .rodata @5691 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5691 = 160.0f; -COMPILER_STRIP_GATE(806C76A4, &lit_5691); +COMPILER_STRIP_GATE(0x806C76A4, &lit_5691); #pragma pop /* 806C76A8-806C76AC 0001C0 0004+00 0/1 0/0 0/0 .rodata @5692 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5692 = 170.0f; -COMPILER_STRIP_GATE(806C76A8, &lit_5692); +COMPILER_STRIP_GATE(0x806C76A8, &lit_5692); #pragma pop /* 806C76AC-806C76B0 0001C4 0004+00 0/1 0/0 0/0 .rodata @5693 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5693 = 1.5f; -COMPILER_STRIP_GATE(806C76AC, &lit_5693); +COMPILER_STRIP_GATE(0x806C76AC, &lit_5693); #pragma pop /* 806C76B0-806C76B4 0001C8 0004+00 0/1 0/0 0/0 .rodata @5694 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_5694 = 0x3A83126F; -COMPILER_STRIP_GATE(806C76B0, &lit_5694); +COMPILER_STRIP_GATE(0x806C76B0, &lit_5694); #pragma pop /* 806C59F4-806C64A0 003DF4 0AAC+00 2/1 0/0 0/0 .text daE_GB_Execute__FP10e_gb_class */ @@ -1863,6 +1869,13 @@ static asm void daE_GB_Delete(e_gb_class* param_0) { } #pragma pop +/* ############################################################################################## */ +/* 806C76B8-806C76B8 0001D0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_806C76BD = "D_MN05"; +#pragma pop + /* 806C651C-806C6894 00491C 0378+00 1/1 0/0 0/0 .text useHeapInit__FP10fopAc_ac_c */ #pragma push #pragma optimization_level 0 @@ -1888,7 +1901,7 @@ asm J3DFrameCtrl::~J3DFrameCtrl() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5877 = 65535.0f; -COMPILER_STRIP_GATE(806C76B4, &lit_5877); +COMPILER_STRIP_GATE(0x806C76B4, &lit_5877); #pragma pop /* 806C68DC-806C6B94 004CDC 02B8+00 1/0 0/0 0/0 .text daE_GB_Create__FP10fopAc_ac_c */ @@ -2013,7 +2026,7 @@ asm void __sinit_d_a_e_gb_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_806C6FE0 = (void*)__sinit_d_a_e_gb_cpp; +REGISTER_CTORS(0x806C6FE0, __sinit_d_a_e_gb_cpp); #pragma pop /* 806C701C-806C7024 00541C 0008+00 1/0 0/0 0/0 .text @36@__dt__12dBgS_ObjAcchFv */ @@ -2078,10 +2091,4 @@ asm void daKey_c::setPos(cXyz param_0) { } #pragma pop -/* 806C76B8-806C76C4 0001D0 000C+00 5/5 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_806C76B8 = "E_gb"; -SECTION_DEAD static char const* const stringBase_806C76BD = "D_MN05"; -#pragma pop +/* 806C76B8-806C76B8 0001D0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/e/d_a_e_ge/d_a_e_ge.cpp b/rel/d/a/e/d_a_e_ge/d_a_e_ge.cpp index 153e9d8be46..2f94c264f7c 100644 --- a/rel/d/a/e/d_a_e_ge/d_a_e_ge.cpp +++ b/rel/d/a/e/d_a_e_ge/d_a_e_ge.cpp @@ -31,16 +31,16 @@ struct mDoMtx_stack_c { static u8 now[48]; }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; - struct J3DAnmTransform {}; +struct J3DModelData {}; + +struct Z2Creature {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -463,7 +463,7 @@ extern "C" void __register_global_object(); /* ############################################################################################## */ /* 806CD000-806CD004 000000 0004+00 18/18 0/0 0/0 .rodata @3904 */ SECTION_RODATA static f32 const lit_3904 = 100.0f; -COMPILER_STRIP_GATE(806CD000, &lit_3904); +COMPILER_STRIP_GATE(0x806CD000, &lit_3904); /* 806CD004-806CD008 000004 0004+00 4/18 0/0 0/0 .rodata @3905 */ SECTION_RODATA static u8 const lit_3905[4] = { @@ -472,7 +472,7 @@ SECTION_RODATA static u8 const lit_3905[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(806CD004, &lit_3905); +COMPILER_STRIP_GATE(0x806CD004, &lit_3905); /* 806CD008-806CD010 000008 0004+04 2/15 0/0 0/0 .rodata @3906 */ SECTION_RODATA static f32 const lit_3906[1 + 1 /* padding */] = { @@ -480,7 +480,7 @@ SECTION_RODATA static f32 const lit_3906[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(806CD008, &lit_3906); +COMPILER_STRIP_GATE(0x806CD008, &lit_3906); /* 806CD010-806CD018 000010 0008+00 0/8 0/0 0/0 .rodata @3907 */ #pragma push @@ -488,7 +488,7 @@ COMPILER_STRIP_GATE(806CD008, &lit_3906); SECTION_RODATA static u8 const lit_3907[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(806CD010, &lit_3907); +COMPILER_STRIP_GATE(0x806CD010, &lit_3907); #pragma pop /* 806CD018-806CD020 000018 0008+00 0/8 0/0 0/0 .rodata @3908 */ @@ -497,7 +497,7 @@ COMPILER_STRIP_GATE(806CD010, &lit_3907); SECTION_RODATA static u8 const lit_3908[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(806CD018, &lit_3908); +COMPILER_STRIP_GATE(0x806CD018, &lit_3908); #pragma pop /* 806CD020-806CD028 000020 0008+00 0/8 0/0 0/0 .rodata @3909 */ @@ -506,67 +506,67 @@ COMPILER_STRIP_GATE(806CD018, &lit_3908); SECTION_RODATA static u8 const lit_3909[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(806CD020, &lit_3909); +COMPILER_STRIP_GATE(0x806CD020, &lit_3909); #pragma pop /* 806CD028-806CD02C 000028 0004+00 0/1 0/0 0/0 .rodata @3910 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3910 = 1.0f / 100.0f; -COMPILER_STRIP_GATE(806CD028, &lit_3910); +COMPILER_STRIP_GATE(0x806CD028, &lit_3910); #pragma pop /* 806CD02C-806CD030 00002C 0004+00 0/4 0/0 0/0 .rodata @3925 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3925 = 1000.0f; -COMPILER_STRIP_GATE(806CD02C, &lit_3925); +COMPILER_STRIP_GATE(0x806CD02C, &lit_3925); #pragma pop /* 806CD030-806CD034 000030 0004+00 2/7 0/0 0/0 .rodata @3926 */ SECTION_RODATA static f32 const lit_3926 = 300.0f; -COMPILER_STRIP_GATE(806CD030, &lit_3926); +COMPILER_STRIP_GATE(0x806CD030, &lit_3926); /* 806CD034-806CD038 000034 0004+00 0/1 0/0 0/0 .rodata @3927 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3927 = 600.0f; -COMPILER_STRIP_GATE(806CD034, &lit_3927); +COMPILER_STRIP_GATE(0x806CD034, &lit_3927); #pragma pop /* 806CD038-806CD03C 000038 0004+00 0/2 0/0 0/0 .rodata @3928 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3928 = 15.0f; -COMPILER_STRIP_GATE(806CD038, &lit_3928); +COMPILER_STRIP_GATE(0x806CD038, &lit_3928); #pragma pop /* 806CD03C-806CD040 00003C 0004+00 0/1 0/0 0/0 .rodata @3929 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3929 = 28000.0f; -COMPILER_STRIP_GATE(806CD03C, &lit_3929); +COMPILER_STRIP_GATE(0x806CD03C, &lit_3929); #pragma pop /* 806CD040-806CD044 000040 0004+00 0/1 0/0 0/0 .rodata @3930 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3930 = 13.0f / 10.0f; -COMPILER_STRIP_GATE(806CD040, &lit_3930); +COMPILER_STRIP_GATE(0x806CD040, &lit_3930); #pragma pop /* 806CD044-806CD048 000044 0004+00 0/2 0/0 0/0 .rodata @3931 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3931 = 500.0f; -COMPILER_STRIP_GATE(806CD044, &lit_3931); +COMPILER_STRIP_GATE(0x806CD044, &lit_3931); #pragma pop /* 806CD048-806CD04C 000048 0004+00 0/1 0/0 0/0 .rodata @3932 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3932 = 110.0f; -COMPILER_STRIP_GATE(806CD048, &lit_3932); +COMPILER_STRIP_GATE(0x806CD048, &lit_3932); #pragma pop /* 806CD118-806CD124 000000 000C+00 2/2 0/0 0/0 .data cNullVec__6Z2Calc */ @@ -833,7 +833,13 @@ asm daE_GE_HIO_c::daE_GE_HIO_c() { /* ############################################################################################## */ /* 806CD04C-806CD050 00004C 0004+00 1/1 0/0 0/0 .rodata @3946 */ SECTION_RODATA static f32 const lit_3946 = -1.0f; -COMPILER_STRIP_GATE(806CD04C, &lit_3946); +COMPILER_STRIP_GATE(0x806CD04C, &lit_3946); + +/* 806CD10C-806CD10C 00010C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_806CD10C = "E_GE"; +#pragma pop /* 806C7AB8-806C7B5C 000158 00A4+00 10/10 0/0 0/0 .text bckSet__8daE_GE_cFifUcf */ #pragma push @@ -860,7 +866,7 @@ asm void daE_GE_c::bckCheck(int param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3975 = 400.0f; -COMPILER_STRIP_GATE(806CD050, &lit_3975); +COMPILER_STRIP_GATE(0x806CD050, &lit_3975); #pragma pop /* 806C7BB8-806C7C8C 000258 00D4+00 1/1 0/0 0/0 .text draw__8daE_GE_cFv */ @@ -896,7 +902,7 @@ asm void daE_GE_c::checkBeforeBg(int param_0, f32 param_1) { /* ############################################################################################## */ /* 806CD054-806CD058 000054 0004+00 1/5 0/0 0/0 .rodata @4025 */ SECTION_RODATA static f32 const lit_4025 = 10.0f; -COMPILER_STRIP_GATE(806CD054, &lit_4025); +COMPILER_STRIP_GATE(0x806CD054, &lit_4025); /* 806CD358-806CD35C 000008 0004+00 2/2 0/0 0/0 .bss None */ static u8 data_806CD358[4]; @@ -920,7 +926,7 @@ static asm void s_arrow_sub(void* param_0, void* param_1) { /* ############################################################################################## */ /* 806CD058-806CD05C 000058 0004+00 1/5 0/0 0/0 .rodata @4044 */ SECTION_RODATA static f32 const lit_4044 = 5.0f; -COMPILER_STRIP_GATE(806CD058, &lit_4044); +COMPILER_STRIP_GATE(0x806CD058, &lit_4044); /* 806C7E7C-806C7F44 00051C 00C8+00 2/2 0/0 0/0 .text s_ge_surprise__FPvPv */ #pragma push @@ -981,19 +987,19 @@ asm void daE_GE_c::setActionMode(int param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4153 = 55.0f; -COMPILER_STRIP_GATE(806CD05C, &lit_4153); +COMPILER_STRIP_GATE(0x806CD05C, &lit_4153); #pragma pop /* 806CD060-806CD064 000060 0004+00 0/1 0/0 0/0 .rodata @4154 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4154 = 25.0f; -COMPILER_STRIP_GATE(806CD060, &lit_4154); +COMPILER_STRIP_GATE(0x806CD060, &lit_4154); #pragma pop /* 806CD064-806CD068 000064 0004+00 1/8 0/0 0/0 .rodata @4155 */ SECTION_RODATA static f32 const lit_4155 = 30.0f; -COMPILER_STRIP_GATE(806CD064, &lit_4155); +COMPILER_STRIP_GATE(0x806CD064, &lit_4155); /* 806C8130-806C8374 0007D0 0244+00 1/1 0/0 0/0 .text damage_check__8daE_GE_cFv */ #pragma push @@ -1012,13 +1018,13 @@ SECTION_RODATA static f32 const lit_4166[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(806CD068, &lit_4166); +COMPILER_STRIP_GATE(0x806CD068, &lit_4166); /* 806CD070-806CD078 000070 0008+00 2/3 0/0 0/0 .rodata @4168 */ SECTION_RODATA static u8 const lit_4168[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(806CD070, &lit_4168); +COMPILER_STRIP_GATE(0x806CD070, &lit_4168); /* 806C8374-806C83F8 000A14 0084+00 1/1 0/0 0/0 .text checkOtherAttacker__8daE_GE_cFv */ #pragma push @@ -1033,7 +1039,7 @@ asm void daE_GE_c::checkOtherAttacker() { /* ############################################################################################## */ /* 806CD078-806CD07C 000078 0004+00 1/3 0/0 0/0 .rodata @4178 */ SECTION_RODATA static f32 const lit_4178 = 700.0f; -COMPILER_STRIP_GATE(806CD078, &lit_4178); +COMPILER_STRIP_GATE(0x806CD078, &lit_4178); /* 806C83F8-806C84A0 000A98 00A8+00 2/2 0/0 0/0 .text searchNextAttacker__8daE_GE_cFv */ #pragma push @@ -1061,7 +1067,7 @@ asm void daE_GE_c::checkCircleSpeedAdd(cXyz* param_0, cXyz* param_1) { #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4290 = 0x2EAFEBFF; -COMPILER_STRIP_GATE(806CD07C, &lit_4290); +COMPILER_STRIP_GATE(0x806CD07C, &lit_4290); #pragma pop /* 806C8518-806C88C8 000BB8 03B0+00 1/1 0/0 0/0 .text setAddCalcSpeed__8daE_GE_cFR4cXyzRC4cXyzffff @@ -1079,7 +1085,7 @@ asm void daE_GE_c::setAddCalcSpeed(cXyz& param_0, cXyz const& param_1, f32 param /* ############################################################################################## */ /* 806CD080-806CD084 000080 0004+00 1/2 0/0 0/0 .rodata @4304 */ SECTION_RODATA static f32 const lit_4304 = 8.0f; -COMPILER_STRIP_GATE(806CD080, &lit_4304); +COMPILER_STRIP_GATE(0x806CD080, &lit_4304); /* 806C88C8-806C89C0 000F68 00F8+00 4/4 0/0 0/0 .text calcCircleFly__8daE_GE_cFP4cXyzP4cXyzsfsf */ #pragma push @@ -1097,14 +1103,14 @@ asm void daE_GE_c::calcCircleFly(cXyz* param_0, cXyz* param_1, s16 param_2, f32 #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4355 = 3.0f; -COMPILER_STRIP_GATE(806CD084, &lit_4355); +COMPILER_STRIP_GATE(0x806CD084, &lit_4355); #pragma pop /* 806CD088-806CD08C 000088 0004+00 0/2 0/0 0/0 .rodata @4356 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4356 = 6.0f; -COMPILER_STRIP_GATE(806CD088, &lit_4356); +COMPILER_STRIP_GATE(0x806CD088, &lit_4356); #pragma pop /* 806C89C0-806C8C20 001060 0260+00 1/0 0/0 0/0 .text executeWait__8daE_GE_cFv */ @@ -1122,39 +1128,39 @@ asm void daE_GE_c::executeWait() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4467 = 0.5f; -COMPILER_STRIP_GATE(806CD08C, &lit_4467); +COMPILER_STRIP_GATE(0x806CD08C, &lit_4467); #pragma pop /* 806CD090-806CD094 000090 0004+00 1/5 0/0 0/0 .rodata @4468 */ SECTION_RODATA static f32 const lit_4468 = 20.0f; -COMPILER_STRIP_GATE(806CD090, &lit_4468); +COMPILER_STRIP_GATE(0x806CD090, &lit_4468); /* 806CD094-806CD098 000094 0004+00 0/1 0/0 0/0 .rodata @4469 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4469 = -400.0f; -COMPILER_STRIP_GATE(806CD094, &lit_4469); +COMPILER_STRIP_GATE(0x806CD094, &lit_4469); #pragma pop /* 806CD098-806CD09C 000098 0004+00 0/2 0/0 0/0 .rodata @4470 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4470 = 4.0f; -COMPILER_STRIP_GATE(806CD098, &lit_4470); +COMPILER_STRIP_GATE(0x806CD098, &lit_4470); #pragma pop /* 806CD09C-806CD0A0 00009C 0004+00 0/7 0/0 0/0 .rodata @4471 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4471 = 50.0f; -COMPILER_STRIP_GATE(806CD09C, &lit_4471); +COMPILER_STRIP_GATE(0x806CD09C, &lit_4471); #pragma pop /* 806CD0A0-806CD0A4 0000A0 0004+00 0/2 0/0 0/0 .rodata @4472 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4472 = 2000.0f; -COMPILER_STRIP_GATE(806CD0A0, &lit_4472); +COMPILER_STRIP_GATE(0x806CD0A0, &lit_4472); #pragma pop /* 806C8C20-806C9150 0012C0 0530+00 1/0 0/0 0/0 .text executeFly__8daE_GE_cFv */ @@ -1183,49 +1189,49 @@ asm void daE_GE_c::checkAttackPossible(s16 param_0, bool param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4796 = 2500.0f; -COMPILER_STRIP_GATE(806CD0A4, &lit_4796); +COMPILER_STRIP_GATE(0x806CD0A4, &lit_4796); #pragma pop /* 806CD0A8-806CD0AC 0000A8 0004+00 0/1 0/0 0/0 .rodata @4797 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4797 = 260892.0f; -COMPILER_STRIP_GATE(806CD0A8, &lit_4797); +COMPILER_STRIP_GATE(0x806CD0A8, &lit_4797); #pragma pop /* 806CD0AC-806CD0B0 0000AC 0004+00 0/1 0/0 0/0 .rodata @4798 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4798 = 128.0f; -COMPILER_STRIP_GATE(806CD0AC, &lit_4798); +COMPILER_STRIP_GATE(0x806CD0AC, &lit_4798); #pragma pop /* 806CD0B0-806CD0B4 0000B0 0004+00 0/2 0/0 0/0 .rodata @4799 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4799 = 12.0f; -COMPILER_STRIP_GATE(806CD0B0, &lit_4799); +COMPILER_STRIP_GATE(0x806CD0B0, &lit_4799); #pragma pop /* 806CD0B4-806CD0B8 0000B4 0004+00 0/2 0/0 0/0 .rodata @4800 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4800 = 19.0f; -COMPILER_STRIP_GATE(806CD0B4, &lit_4800); +COMPILER_STRIP_GATE(0x806CD0B4, &lit_4800); #pragma pop /* 806CD0B8-806CD0BC 0000B8 0004+00 0/2 0/0 0/0 .rodata @4801 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4801 = 26.0f; -COMPILER_STRIP_GATE(806CD0B8, &lit_4801); +COMPILER_STRIP_GATE(0x806CD0B8, &lit_4801); #pragma pop /* 806CD0BC-806CD0C0 0000BC 0004+00 0/2 0/0 0/0 .rodata @4802 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4802 = 4096.0f; -COMPILER_STRIP_GATE(806CD0BC, &lit_4802); +COMPILER_STRIP_GATE(0x806CD0BC, &lit_4802); #pragma pop /* 806C921C-806C9F04 0018BC 0CE8+00 1/0 0/0 0/0 .text executeAttack__8daE_GE_cFv */ @@ -1253,7 +1259,7 @@ asm void daE_GE_c::setBackAnime(int param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5065 = 1500.0f; -COMPILER_STRIP_GATE(806CD0C0, &lit_5065); +COMPILER_STRIP_GATE(0x806CD0C0, &lit_5065); #pragma pop /* 806CA024-806CAA34 0026C4 0A10+00 2/0 0/0 0/0 .text executeBack__8daE_GE_cFv */ @@ -1271,56 +1277,56 @@ asm void daE_GE_c::executeBack() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5066 = 150.0f; -COMPILER_STRIP_GATE(806CD0C4, &lit_5066); +COMPILER_STRIP_GATE(0x806CD0C4, &lit_5066); #pragma pop /* 806CD0C8-806CD0CC 0000C8 0004+00 0/0 0/0 0/0 .rodata @5067 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5067 = 140.0f; -COMPILER_STRIP_GATE(806CD0C8, &lit_5067); +COMPILER_STRIP_GATE(0x806CD0C8, &lit_5067); #pragma pop /* 806CD0CC-806CD0D0 0000CC 0004+00 0/0 0/0 0/0 .rodata @5068 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5068 = 17.0f; -COMPILER_STRIP_GATE(806CD0CC, &lit_5068); +COMPILER_STRIP_GATE(0x806CD0CC, &lit_5068); #pragma pop /* 806CD0D0-806CD0D4 0000D0 0004+00 0/0 0/0 0/0 .rodata @5069 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5069 = 24.0f; -COMPILER_STRIP_GATE(806CD0D0, &lit_5069); +COMPILER_STRIP_GATE(0x806CD0D0, &lit_5069); #pragma pop /* 806CD0D4-806CD0D8 0000D4 0004+00 0/0 0/0 0/0 .rodata @5070 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5070 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(806CD0D4, &lit_5070); +COMPILER_STRIP_GATE(0x806CD0D4, &lit_5070); #pragma pop /* 806CD0D8-806CD0DC 0000D8 0004+00 0/1 0/0 0/0 .rodata @5126 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5126 = -50.0f; -COMPILER_STRIP_GATE(806CD0D8, &lit_5126); +COMPILER_STRIP_GATE(0x806CD0D8, &lit_5126); #pragma pop /* 806CD0DC-806CD0E0 0000DC 0004+00 0/1 0/0 0/0 .rodata @5127 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5127 = 16.0f; -COMPILER_STRIP_GATE(806CD0DC, &lit_5127); +COMPILER_STRIP_GATE(0x806CD0DC, &lit_5127); #pragma pop /* 806CD0E0-806CD0E4 0000E0 0004+00 0/1 0/0 0/0 .rodata @5128 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5128 = 23.0f; -COMPILER_STRIP_GATE(806CD0E0, &lit_5128); +COMPILER_STRIP_GATE(0x806CD0E0, &lit_5128); #pragma pop /* 806CAA34-806CADCC 0030D4 0398+00 1/0 0/0 0/0 .text executeDown__8daE_GE_cFv */ @@ -1358,21 +1364,21 @@ asm void daE_GE_c::setSurprise() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5254 = 32768.0f; -COMPILER_STRIP_GATE(806CD0E4, &lit_5254); +COMPILER_STRIP_GATE(0x806CD0E4, &lit_5254); #pragma pop /* 806CD0E8-806CD0EC 0000E8 0004+00 0/1 0/0 0/0 .rodata @5255 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5255 = 800.0f; -COMPILER_STRIP_GATE(806CD0E8, &lit_5255); +COMPILER_STRIP_GATE(0x806CD0E8, &lit_5255); #pragma pop /* 806CD0EC-806CD0F0 0000EC 0004+00 0/2 0/0 0/0 .rodata @5256 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5256 = 70.0f; -COMPILER_STRIP_GATE(806CD0EC, &lit_5256); +COMPILER_STRIP_GATE(0x806CD0EC, &lit_5256); #pragma pop /* 806CAE58-806CB280 0034F8 0428+00 1/0 0/0 0/0 .text executeSurprise__8daE_GE_cFv */ @@ -1388,7 +1394,7 @@ asm void daE_GE_c::executeSurprise() { /* ############################################################################################## */ /* 806CD0F0-806CD0F4 0000F0 0004+00 1/1 0/0 0/0 .rodata @5270 */ SECTION_RODATA static f32 const lit_5270 = 40.0f; -COMPILER_STRIP_GATE(806CD0F0, &lit_5270); +COMPILER_STRIP_GATE(0x806CD0F0, &lit_5270); /* 806CB280-806CB2F0 003920 0070+00 1/1 0/0 0/0 .text setCaw__8daE_GE_cFv */ #pragma push @@ -1415,14 +1421,14 @@ asm void daE_GE_c::executeCaw() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5483 = 60.0f; -COMPILER_STRIP_GATE(806CD0F4, &lit_5483); +COMPILER_STRIP_GATE(0x806CD0F4, &lit_5483); #pragma pop /* 806CD0F8-806CD0FC 0000F8 0004+00 0/1 0/0 0/0 .rodata @5484 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5484 = 2.0f; -COMPILER_STRIP_GATE(806CD0F8, &lit_5484); +COMPILER_STRIP_GATE(0x806CD0F8, &lit_5484); #pragma pop /* 806CB6FC-806CBAB8 003D9C 03BC+00 1/0 0/0 0/0 .text executeWind__8daE_GE_cFv */ @@ -1440,7 +1446,7 @@ asm void daE_GE_c::executeWind() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5506 = 1.5f; -COMPILER_STRIP_GATE(806CD0FC, &lit_5506); +COMPILER_STRIP_GATE(0x806CD0FC, &lit_5506); #pragma pop /* 806CBAB8-806CBC38 004158 0180+00 1/0 0/0 0/0 .text executeShield__8daE_GE_cFv */ @@ -1478,7 +1484,7 @@ asm void daE_GE_c::mtx_set() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5605 = 35.0f; -COMPILER_STRIP_GATE(806CD100, &lit_5605); +COMPILER_STRIP_GATE(0x806CD100, &lit_5605); #pragma pop /* 806CBEF0-806CC068 004590 0178+00 1/1 0/0 0/0 .text cc_set__8daE_GE_cFv */ @@ -1561,14 +1567,20 @@ static asm void useHeapInit(fopAc_ac_c* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5842 = -200.0f; -COMPILER_STRIP_GATE(806CD104, &lit_5842); +COMPILER_STRIP_GATE(0x806CD104, &lit_5842); #pragma pop /* 806CD108-806CD10C 000108 0004+00 0/1 0/0 0/0 .rodata @5843 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5843 = -1000000000.0f; -COMPILER_STRIP_GATE(806CD108, &lit_5843); +COMPILER_STRIP_GATE(0x806CD108, &lit_5843); +#pragma pop + +/* 806CD10C-806CD10C 00010C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_806CD111 = "E_ge"; #pragma pop /* 806CC390-806CC824 004A30 0494+00 1/1 0/0 0/0 .text create__8daE_GE_cFv */ @@ -1673,7 +1685,7 @@ asm void __sinit_d_a_e_ge_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_806CCAA0 = (void*)__sinit_d_a_e_ge_cpp; +REGISTER_CTORS(0x806CCAA0, __sinit_d_a_e_ge_cpp); #pragma pop /* 806CCBC8-806CCBD0 005268 0008+00 1/0 0/0 0/0 .text @36@__dt__12dBgS_ObjAcchFv */ @@ -1708,10 +1720,4 @@ static asm void setMidnaBindEffect(fopEn_enemy_c* param_0, Z2CreatureEnemy* para } #pragma pop -/* 806CD10C-806CD116 00010C 000A+00 6/6 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_806CD10C = "E_GE"; -SECTION_DEAD static char const* const stringBase_806CD111 = "E_ge"; -#pragma pop +/* 806CD10C-806CD10C 00010C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/e/d_a_e_gi/d_a_e_gi.cpp b/rel/d/a/e/d_a_e_gi/d_a_e_gi.cpp index 4ef18929656..0aeebebc96c 100644 --- a/rel/d/a/e/d_a_e_gi/d_a_e_gi.cpp +++ b/rel/d/a/e/d_a_e_gi/d_a_e_gi.cpp @@ -30,16 +30,16 @@ struct mDoMtx_stack_c { static u8 now[48]; }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; - struct J3DAnmTransform {}; +struct J3DModelData {}; + +struct Z2Creature {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -66,10 +66,10 @@ struct daPy_py_c { static u8 m_midnaActor[4]; }; -struct J3DJoint {}; - struct J3DModel {}; +struct J3DJoint {}; + struct daE_GI_c { /* 806CD4F4 */ void ctrlJoint(J3DJoint*, J3DModel*); /* 806CD594 */ void JointCallBack(J3DJoint*, int); @@ -470,7 +470,7 @@ extern "C" void __register_global_object(); /* ############################################################################################## */ /* 806D0E60-806D0E64 000000 0004+00 15/15 0/0 0/0 .rodata @3907 */ SECTION_RODATA static f32 const lit_3907 = 100.0f; -COMPILER_STRIP_GATE(806D0E60, &lit_3907); +COMPILER_STRIP_GATE(0x806D0E60, &lit_3907); /* 806D0E64-806D0E68 000004 0004+00 2/15 0/0 0/0 .rodata @3908 */ SECTION_RODATA static u8 const lit_3908[4] = { @@ -479,7 +479,7 @@ SECTION_RODATA static u8 const lit_3908[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(806D0E64, &lit_3908); +COMPILER_STRIP_GATE(0x806D0E64, &lit_3908); /* 806D0E68-806D0E70 000008 0004+04 3/14 0/0 0/0 .rodata @3909 */ SECTION_RODATA static f32 const lit_3909[1 + 1 /* padding */] = { @@ -487,7 +487,7 @@ SECTION_RODATA static f32 const lit_3909[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(806D0E68, &lit_3909); +COMPILER_STRIP_GATE(0x806D0E68, &lit_3909); /* 806D0E70-806D0E78 000010 0008+00 0/2 0/0 0/0 .rodata @3910 */ #pragma push @@ -495,7 +495,7 @@ COMPILER_STRIP_GATE(806D0E68, &lit_3909); SECTION_RODATA static u8 const lit_3910[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(806D0E70, &lit_3910); +COMPILER_STRIP_GATE(0x806D0E70, &lit_3910); #pragma pop /* 806D0E78-806D0E80 000018 0008+00 0/1 0/0 0/0 .rodata @3911 */ @@ -504,7 +504,7 @@ COMPILER_STRIP_GATE(806D0E70, &lit_3910); SECTION_RODATA static u8 const lit_3911[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(806D0E78, &lit_3911); +COMPILER_STRIP_GATE(0x806D0E78, &lit_3911); #pragma pop /* 806D0E80-806D0E88 000020 0008+00 0/1 0/0 0/0 .rodata @3912 */ @@ -513,74 +513,74 @@ COMPILER_STRIP_GATE(806D0E78, &lit_3911); SECTION_RODATA static u8 const lit_3912[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(806D0E80, &lit_3912); +COMPILER_STRIP_GATE(0x806D0E80, &lit_3912); #pragma pop /* 806D0E88-806D0E8C 000028 0004+00 0/1 0/0 0/0 .rodata @3913 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3913 = 1.0f / 100.0f; -COMPILER_STRIP_GATE(806D0E88, &lit_3913); +COMPILER_STRIP_GATE(0x806D0E88, &lit_3913); #pragma pop /* 806D0E8C-806D0E90 00002C 0004+00 0/1 0/0 0/0 .rodata @3928 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3928 = 11.0f / 10.0f; -COMPILER_STRIP_GATE(806D0E8C, &lit_3928); +COMPILER_STRIP_GATE(0x806D0E8C, &lit_3928); #pragma pop /* 806D0E90-806D0E94 000030 0004+00 0/1 0/0 0/0 .rodata @3929 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3929 = 4.0f; -COMPILER_STRIP_GATE(806D0E90, &lit_3929); +COMPILER_STRIP_GATE(0x806D0E90, &lit_3929); #pragma pop /* 806D0E94-806D0E98 000034 0004+00 0/2 0/0 0/0 .rodata @3930 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3930 = 1200.0f; -COMPILER_STRIP_GATE(806D0E94, &lit_3930); +COMPILER_STRIP_GATE(0x806D0E94, &lit_3930); #pragma pop /* 806D0E98-806D0E9C 000038 0004+00 0/1 0/0 0/0 .rodata @3931 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3931 = 380.0f; -COMPILER_STRIP_GATE(806D0E98, &lit_3931); +COMPILER_STRIP_GATE(0x806D0E98, &lit_3931); #pragma pop /* 806D0E9C-806D0EA0 00003C 0004+00 0/1 0/0 0/0 .rodata @3932 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3932 = 16384.0f; -COMPILER_STRIP_GATE(806D0E9C, &lit_3932); +COMPILER_STRIP_GATE(0x806D0E9C, &lit_3932); #pragma pop /* 806D0EA0-806D0EA4 000040 0004+00 0/1 0/0 0/0 .rodata @3933 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3933 = 135.0f; -COMPILER_STRIP_GATE(806D0EA0, &lit_3933); +COMPILER_STRIP_GATE(0x806D0EA0, &lit_3933); #pragma pop /* 806D0EA4-806D0EA8 000044 0004+00 0/1 0/0 0/0 .rodata @3934 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3934 = 110.0f; -COMPILER_STRIP_GATE(806D0EA4, &lit_3934); +COMPILER_STRIP_GATE(0x806D0EA4, &lit_3934); #pragma pop /* 806D0EA8-806D0EAC 000048 0004+00 1/3 0/0 0/0 .rodata @3935 */ SECTION_RODATA static f32 const lit_3935 = 20.0f; -COMPILER_STRIP_GATE(806D0EA8, &lit_3935); +COMPILER_STRIP_GATE(0x806D0EA8, &lit_3935); /* 806D0EAC-806D0EB0 00004C 0004+00 0/1 0/0 0/0 .rodata @3936 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3936 = 35.0f; -COMPILER_STRIP_GATE(806D0EAC, &lit_3936); +COMPILER_STRIP_GATE(0x806D0EAC, &lit_3936); #pragma pop /* 806D0F84-806D0F90 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ @@ -805,7 +805,13 @@ static asm void daE_GI_Draw(daE_GI_c* param_0) { /* ############################################################################################## */ /* 806D0EB0-806D0EB4 000050 0004+00 1/2 0/0 0/0 .rodata @4040 */ SECTION_RODATA static f32 const lit_4040 = -1.0f; -COMPILER_STRIP_GATE(806D0EB0, &lit_4040); +COMPILER_STRIP_GATE(0x806D0EB0, &lit_4040); + +/* 806D0F78-806D0F78 000118 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_806D0F78 = "E_GI"; +#pragma pop /* 806CD868-806CD90C 0004C8 00A4+00 7/7 0/0 0/0 .text setBck__8daE_GI_cFiUcff */ #pragma push @@ -820,7 +826,7 @@ asm void daE_GI_c::setBck(int param_0, u8 param_1, f32 param_2, f32 param_3) { /* ############################################################################################## */ /* 806D0EB4-806D0EB8 000054 0004+00 1/2 0/0 0/0 .rodata @4056 */ SECTION_RODATA static f32 const lit_4056 = 150.0f; -COMPILER_STRIP_GATE(806D0EB4, &lit_4056); +COMPILER_STRIP_GATE(0x806D0EB4, &lit_4056); /* 806CD90C-806CD938 00056C 002C+00 8/8 0/0 0/0 .text setActionMode__8daE_GI_cFii */ #pragma push @@ -837,21 +843,21 @@ asm void daE_GI_c::setActionMode(int param_0, int param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4173 = 0.5f; -COMPILER_STRIP_GATE(806D0EB8, &lit_4173); +COMPILER_STRIP_GATE(0x806D0EB8, &lit_4173); #pragma pop /* 806D0EBC-806D0EC0 00005C 0004+00 0/1 0/0 0/0 .rodata @4174 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4174 = 3.0f / 20.0f; -COMPILER_STRIP_GATE(806D0EBC, &lit_4174); +COMPILER_STRIP_GATE(0x806D0EBC, &lit_4174); #pragma pop /* 806D0EC0-806D0EC4 000060 0004+00 0/1 0/0 0/0 .rodata @4175 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4175 = 0.25f; -COMPILER_STRIP_GATE(806D0EC0, &lit_4175); +COMPILER_STRIP_GATE(0x806D0EC0, &lit_4175); #pragma pop /* 806D1128-806D112C 000008 0004+00 2/2 0/0 0/0 .bss None */ @@ -888,7 +894,7 @@ asm void daE_GI_c::setWeaponAtBit(u8 param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4218 = 9.0f; -COMPILER_STRIP_GATE(806D0EC4, &lit_4218); +COMPILER_STRIP_GATE(0x806D0EC4, &lit_4218); #pragma pop /* 806D0EC8-806D0ED0 000068 0004+04 0/1 0/0 0/0 .rodata @4219 */ @@ -899,14 +905,14 @@ SECTION_RODATA static f32 const lit_4219[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(806D0EC8, &lit_4219); +COMPILER_STRIP_GATE(0x806D0EC8, &lit_4219); #pragma pop /* 806D0ED0-806D0ED8 000070 0008+00 1/3 0/0 0/0 .rodata @4222 */ SECTION_RODATA static u8 const lit_4222[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(806D0ED0, &lit_4222); +COMPILER_STRIP_GATE(0x806D0ED0, &lit_4222); /* 806D1164-806D1168 000044 0004+00 4/4 0/0 0/0 .bss m_cry_gi */ static u8 m_cry_gi[4]; @@ -936,21 +942,21 @@ asm void daE_GI_c::setAttackEffect() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4273 = 44.0f; -COMPILER_STRIP_GATE(806D0ED8, &lit_4273); +COMPILER_STRIP_GATE(0x806D0ED8, &lit_4273); #pragma pop /* 806D0EDC-806D0EE0 00007C 0004+00 0/1 0/0 0/0 .rodata @4274 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4274 = -190.0f; -COMPILER_STRIP_GATE(806D0EDC, &lit_4274); +COMPILER_STRIP_GATE(0x806D0EDC, &lit_4274); #pragma pop /* 806D0EE0-806D0EE4 000080 0004+00 0/1 0/0 0/0 .rodata @4275 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4275 = -1000000000.0f; -COMPILER_STRIP_GATE(806D0EE0, &lit_4275); +COMPILER_STRIP_GATE(0x806D0EE0, &lit_4275); #pragma pop /* 806CDFB0-806CE0D4 000C10 0124+00 1/1 0/0 0/0 .text setDragSwordEffect__8daE_GI_cFv */ @@ -966,7 +972,7 @@ asm void daE_GI_c::setDragSwordEffect() { /* ############################################################################################## */ /* 806D0EE4-806D0EE8 000084 0004+00 1/1 0/0 0/0 .rodata @4296 */ SECTION_RODATA static f32 const lit_4296 = 85.0f; -COMPILER_STRIP_GATE(806D0EE4, &lit_4296); +COMPILER_STRIP_GATE(0x806D0EE4, &lit_4296); /* 806CE0D4-806CE184 000D34 00B0+00 1/1 0/0 0/0 .text setDeathSmokeEffect__8daE_GI_cFv */ #pragma push @@ -991,7 +997,7 @@ asm void daE_GI_c::setDamageEffect() { /* ############################################################################################## */ /* 806D0EE8-806D0EEC 000088 0004+00 1/1 0/0 0/0 .rodata @4356 */ SECTION_RODATA static f32 const lit_4356 = 1000.0f; -COMPILER_STRIP_GATE(806D0EE8, &lit_4356); +COMPILER_STRIP_GATE(0x806D0EE8, &lit_4356); /* 806CE280-806CE31C 000EE0 009C+00 1/1 0/0 0/0 .text s_other_gi__FPvPv */ #pragma push @@ -1006,7 +1012,7 @@ static asm void s_other_gi(void* param_0, void* param_1) { /* ############################################################################################## */ /* 806D0EEC-806D0EF0 00008C 0004+00 1/1 0/0 0/0 .rodata @4378 */ SECTION_RODATA static f32 const lit_4378 = 500.0f; -COMPILER_STRIP_GATE(806D0EEC, &lit_4378); +COMPILER_STRIP_GATE(0x806D0EEC, &lit_4378); /* 806CE31C-806CE3C4 000F7C 00A8+00 1/1 0/0 0/0 .text s_battle_gi__FPvPv */ #pragma push @@ -1023,49 +1029,49 @@ static asm void s_battle_gi(void* param_0, void* param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4466 = 3.0f; -COMPILER_STRIP_GATE(806D0EF0, &lit_4466); +COMPILER_STRIP_GATE(0x806D0EF0, &lit_4466); #pragma pop /* 806D0EF4-806D0EF8 000094 0004+00 0/2 0/0 0/0 .rodata @4467 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4467 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(806D0EF4, &lit_4467); +COMPILER_STRIP_GATE(0x806D0EF4, &lit_4467); #pragma pop /* 806D0EF8-806D0EFC 000098 0004+00 0/2 0/0 0/0 .rodata @4468 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4468 = 1024.0f; -COMPILER_STRIP_GATE(806D0EF8, &lit_4468); +COMPILER_STRIP_GATE(0x806D0EF8, &lit_4468); #pragma pop /* 806D0EFC-806D0F00 00009C 0004+00 0/2 0/0 0/0 .rodata @4469 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4469 = 256.0f; -COMPILER_STRIP_GATE(806D0EFC, &lit_4469); +COMPILER_STRIP_GATE(0x806D0EFC, &lit_4469); #pragma pop /* 806D0F00-806D0F04 0000A0 0004+00 0/1 0/0 0/0 .rodata @4470 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4470 = 14.0f; -COMPILER_STRIP_GATE(806D0F00, &lit_4470); +COMPILER_STRIP_GATE(0x806D0F00, &lit_4470); #pragma pop /* 806D0F04-806D0F08 0000A4 0004+00 0/1 0/0 0/0 .rodata @4471 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4471 = 40.0f; -COMPILER_STRIP_GATE(806D0F04, &lit_4471); +COMPILER_STRIP_GATE(0x806D0F04, &lit_4471); #pragma pop /* 806D0F08-806D0F0C 0000A8 0004+00 0/1 0/0 0/0 .rodata @4472 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4472 = 2.0f; -COMPILER_STRIP_GATE(806D0F08, &lit_4472); +COMPILER_STRIP_GATE(0x806D0F08, &lit_4472); #pragma pop /* 806CE3C4-806CE6AC 001024 02E8+00 1/1 0/0 0/0 .text executeSleep__8daE_GI_cFv */ @@ -1083,7 +1089,7 @@ asm void daE_GI_c::executeSleep() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4509 = 10.0f; -COMPILER_STRIP_GATE(806D0F0C, &lit_4509); +COMPILER_STRIP_GATE(0x806D0F0C, &lit_4509); #pragma pop /* 806CE6AC-806CE858 00130C 01AC+00 1/1 0/0 0/0 .text executeWait__8daE_GI_cFv */ @@ -1101,35 +1107,35 @@ asm void daE_GI_c::executeWait() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4594 = 50.0f; -COMPILER_STRIP_GATE(806D0F10, &lit_4594); +COMPILER_STRIP_GATE(0x806D0F10, &lit_4594); #pragma pop /* 806D0F14-806D0F18 0000B4 0004+00 0/1 0/0 0/0 .rodata @4595 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4595 = 29.0f; -COMPILER_STRIP_GATE(806D0F14, &lit_4595); +COMPILER_STRIP_GATE(0x806D0F14, &lit_4595); #pragma pop /* 806D0F18-806D0F1C 0000B8 0004+00 0/1 0/0 0/0 .rodata @4596 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4596 = 34.0f; -COMPILER_STRIP_GATE(806D0F18, &lit_4596); +COMPILER_STRIP_GATE(0x806D0F18, &lit_4596); #pragma pop /* 806D0F1C-806D0F20 0000BC 0004+00 0/1 0/0 0/0 .rodata @4597 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4597 = 54.0f; -COMPILER_STRIP_GATE(806D0F1C, &lit_4597); +COMPILER_STRIP_GATE(0x806D0F1C, &lit_4597); #pragma pop /* 806D0F20-806D0F24 0000C0 0004+00 0/4 0/0 0/0 .rodata @4598 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4598 = 200.0f; -COMPILER_STRIP_GATE(806D0F20, &lit_4598); +COMPILER_STRIP_GATE(0x806D0F20, &lit_4598); #pragma pop /* 806CE858-806CEC94 0014B8 043C+00 1/1 0/0 0/0 .text executeChase__8daE_GI_cFv */ @@ -1147,56 +1153,56 @@ asm void daE_GI_c::executeChase() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4699 = 60.0f; -COMPILER_STRIP_GATE(806D0F24, &lit_4699); +COMPILER_STRIP_GATE(0x806D0F24, &lit_4699); #pragma pop /* 806D0F28-806D0F2C 0000C8 0004+00 0/1 0/0 0/0 .rodata @4700 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4700 = 71.0f; -COMPILER_STRIP_GATE(806D0F28, &lit_4700); +COMPILER_STRIP_GATE(0x806D0F28, &lit_4700); #pragma pop /* 806D0F2C-806D0F30 0000CC 0004+00 0/1 0/0 0/0 .rodata @4701 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4701 = 76.0f; -COMPILER_STRIP_GATE(806D0F2C, &lit_4701); +COMPILER_STRIP_GATE(0x806D0F2C, &lit_4701); #pragma pop /* 806D0F30-806D0F34 0000D0 0004+00 0/1 0/0 0/0 .rodata @4702 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4702 = 70.0f; -COMPILER_STRIP_GATE(806D0F30, &lit_4702); +COMPILER_STRIP_GATE(0x806D0F30, &lit_4702); #pragma pop /* 806D0F34-806D0F38 0000D4 0004+00 0/3 0/0 0/0 .rodata @4703 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4703 = 1.5f; -COMPILER_STRIP_GATE(806D0F34, &lit_4703); +COMPILER_STRIP_GATE(0x806D0F34, &lit_4703); #pragma pop /* 806D0F38-806D0F3C 0000D8 0004+00 0/1 0/0 0/0 .rodata @4704 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4704 = 80.0f; -COMPILER_STRIP_GATE(806D0F38, &lit_4704); +COMPILER_STRIP_GATE(0x806D0F38, &lit_4704); #pragma pop /* 806D0F3C-806D0F40 0000DC 0004+00 0/2 0/0 0/0 .rodata @4705 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4705 = 33.0f; -COMPILER_STRIP_GATE(806D0F3C, &lit_4705); +COMPILER_STRIP_GATE(0x806D0F3C, &lit_4705); #pragma pop /* 806D0F40-806D0F44 0000E0 0004+00 0/1 0/0 0/0 .rodata @4706 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4706 = -150.0f; -COMPILER_STRIP_GATE(806D0F40, &lit_4706); +COMPILER_STRIP_GATE(0x806D0F40, &lit_4706); #pragma pop /* 806CEC94-806CF0B8 0018F4 0424+00 2/1 0/0 0/0 .text executeAttack__8daE_GI_cFv */ @@ -1214,21 +1220,21 @@ asm void daE_GI_c::executeAttack() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4781 = 72.0f; -COMPILER_STRIP_GATE(806D0F44, &lit_4781); +COMPILER_STRIP_GATE(0x806D0F44, &lit_4781); #pragma pop /* 806D0F48-806D0F4C 0000E8 0004+00 0/1 0/0 0/0 .rodata @4782 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4782 = 45.0f; -COMPILER_STRIP_GATE(806D0F48, &lit_4782); +COMPILER_STRIP_GATE(0x806D0F48, &lit_4782); #pragma pop /* 806D0F4C-806D0F50 0000EC 0004+00 0/1 0/0 0/0 .rodata @4783 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4783 = -50.0f; -COMPILER_STRIP_GATE(806D0F4C, &lit_4783); +COMPILER_STRIP_GATE(0x806D0F4C, &lit_4783); #pragma pop /* 806CF0B8-806CF410 001D18 0358+00 1/1 0/0 0/0 .text executeDamage__8daE_GI_cFv */ @@ -1264,7 +1270,7 @@ asm void daE_GI_c::PushButtonCount() { /* ############################################################################################## */ /* 806D0F50-806D0F54 0000F0 0004+00 1/1 0/0 0/0 .rodata @4917 */ SECTION_RODATA static f32 const lit_4917 = 300.0f; -COMPILER_STRIP_GATE(806D0F50, &lit_4917); +COMPILER_STRIP_GATE(0x806D0F50, &lit_4917); /* 806CF878-806CFB60 0024D8 02E8+00 1/1 0/0 0/0 .text action__8daE_GI_cFv */ #pragma push @@ -1291,42 +1297,42 @@ asm void daE_GI_c::mtx_set() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5011 = 30.0f; -COMPILER_STRIP_GATE(806D0F54, &lit_5011); +COMPILER_STRIP_GATE(0x806D0F54, &lit_5011); #pragma pop /* 806D0F58-806D0F5C 0000F8 0004+00 0/1 0/0 0/0 .rodata @5012 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5012 = -33.0f; -COMPILER_STRIP_GATE(806D0F58, &lit_5012); +COMPILER_STRIP_GATE(0x806D0F58, &lit_5012); #pragma pop /* 806D0F5C-806D0F60 0000FC 0004+00 0/1 0/0 0/0 .rodata @5013 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5013 = -11.0f; -COMPILER_STRIP_GATE(806D0F5C, &lit_5013); +COMPILER_STRIP_GATE(0x806D0F5C, &lit_5013); #pragma pop /* 806D0F60-806D0F64 000100 0004+00 0/1 0/0 0/0 .rodata @5014 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5014 = 55.0f; -COMPILER_STRIP_GATE(806D0F60, &lit_5014); +COMPILER_STRIP_GATE(0x806D0F60, &lit_5014); #pragma pop /* 806D0F64-806D0F68 000104 0004+00 0/1 0/0 0/0 .rodata @5015 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5015 = 11.0f; -COMPILER_STRIP_GATE(806D0F64, &lit_5015); +COMPILER_STRIP_GATE(0x806D0F64, &lit_5015); #pragma pop /* 806D0F68-806D0F6C 000108 0004+00 0/1 0/0 0/0 .rodata @5016 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5016 = -55.0f; -COMPILER_STRIP_GATE(806D0F68, &lit_5016); +COMPILER_STRIP_GATE(0x806D0F68, &lit_5016); #pragma pop /* 806CFBF0-806CFDF4 002850 0204+00 1/1 0/0 0/0 .text cc_set__8daE_GI_cFv */ @@ -1344,7 +1350,7 @@ asm void daE_GI_c::cc_set() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5085 = -30.0f; -COMPILER_STRIP_GATE(806D0F6C, &lit_5085); +COMPILER_STRIP_GATE(0x806D0F6C, &lit_5085); #pragma pop /* 806CFDF4-806D002C 002A54 0238+00 1/1 0/0 0/0 .text execute__8daE_GI_cFv */ @@ -1417,14 +1423,20 @@ static asm void useHeapInit(fopAc_ac_c* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5256 = -200.0f; -COMPILER_STRIP_GATE(806D0F70, &lit_5256); +COMPILER_STRIP_GATE(0x806D0F70, &lit_5256); #pragma pop /* 806D0F74-806D0F78 000114 0004+00 0/1 0/0 0/0 .rodata @5257 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5257 = -5.0f; -COMPILER_STRIP_GATE(806D0F74, &lit_5257); +COMPILER_STRIP_GATE(0x806D0F74, &lit_5257); +#pragma pop + +/* 806D0F78-806D0F78 000118 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_806D0F7D = "E_gi"; #pragma pop /* 806D027C-806D0608 002EDC 038C+00 1/1 0/0 0/1 .text create__8daE_GI_cFv */ @@ -1549,7 +1561,7 @@ asm void __sinit_d_a_e_gi_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_806D09D4 = (void*)__sinit_d_a_e_gi_cpp; +REGISTER_CTORS(0x806D09D4, __sinit_d_a_e_gi_cpp); #pragma pop /* 806D0A10-806D0A18 003670 0008+00 1/0 0/0 0/0 .text @36@__dt__12dBgS_ObjAcchFv */ @@ -1594,10 +1606,4 @@ asm void daPy_py_c::checkNowWolf() { } #pragma pop -/* 806D0F78-806D0F82 000118 000A+00 4/4 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_806D0F78 = "E_GI"; -SECTION_DEAD static char const* const stringBase_806D0F7D = "E_gi"; -#pragma pop +/* 806D0F78-806D0F78 000118 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/e/d_a_e_gm/d_a_e_gm.cpp b/rel/d/a/e/d_a_e_gm/d_a_e_gm.cpp index bc573a3845d..8d2226ef72b 100644 --- a/rel/d/a/e/d_a_e_gm/d_a_e_gm.cpp +++ b/rel/d/a/e/d_a_e_gm/d_a_e_gm.cpp @@ -35,16 +35,16 @@ struct mDoMtx_stack_c { static u8 now[48]; }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; - struct J3DAnmTransform {}; +struct J3DModelData {}; + +struct Z2Creature {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -437,7 +437,7 @@ extern "C" void __register_global_object(); /* ############################################################################################## */ /* 806D79A0-806D79A4 000000 0004+00 26/26 0/0 0/0 .rodata @3906 */ SECTION_RODATA static f32 const lit_3906 = 100.0f; -COMPILER_STRIP_GATE(806D79A0, &lit_3906); +COMPILER_STRIP_GATE(0x806D79A0, &lit_3906); /* 806D79A4-806D79A8 000004 0004+00 1/23 0/0 0/0 .rodata @3907 */ SECTION_RODATA static u8 const lit_3907[4] = { @@ -446,7 +446,7 @@ SECTION_RODATA static u8 const lit_3907[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(806D79A4, &lit_3907); +COMPILER_STRIP_GATE(0x806D79A4, &lit_3907); /* 806D79A8-806D79B0 000008 0004+04 4/24 0/0 0/0 .rodata @3908 */ SECTION_RODATA static f32 const lit_3908[1 + 1 /* padding */] = { @@ -454,7 +454,7 @@ SECTION_RODATA static f32 const lit_3908[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(806D79A8, &lit_3908); +COMPILER_STRIP_GATE(0x806D79A8, &lit_3908); /* 806D79B0-806D79B8 000010 0008+00 0/6 0/0 0/0 .rodata @3909 */ #pragma push @@ -462,7 +462,7 @@ COMPILER_STRIP_GATE(806D79A8, &lit_3908); SECTION_RODATA static u8 const lit_3909[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(806D79B0, &lit_3909); +COMPILER_STRIP_GATE(0x806D79B0, &lit_3909); #pragma pop /* 806D79B8-806D79C0 000018 0008+00 0/6 0/0 0/0 .rodata @3910 */ @@ -471,7 +471,7 @@ COMPILER_STRIP_GATE(806D79B0, &lit_3909); SECTION_RODATA static u8 const lit_3910[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(806D79B8, &lit_3910); +COMPILER_STRIP_GATE(0x806D79B8, &lit_3910); #pragma pop /* 806D79C0-806D79C8 000020 0008+00 0/6 0/0 0/0 .rodata @3911 */ @@ -480,53 +480,53 @@ COMPILER_STRIP_GATE(806D79B8, &lit_3910); SECTION_RODATA static u8 const lit_3911[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(806D79C0, &lit_3911); +COMPILER_STRIP_GATE(0x806D79C0, &lit_3911); #pragma pop /* 806D79C8-806D79CC 000028 0004+00 0/1 0/0 0/0 .rodata @3912 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3912 = 1.0f / 100.0f; -COMPILER_STRIP_GATE(806D79C8, &lit_3912); +COMPILER_STRIP_GATE(0x806D79C8, &lit_3912); #pragma pop /* 806D79CC-806D79D0 00002C 0004+00 0/2 0/0 0/0 .rodata @4055 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4055 = 13.0f / 10.0f; -COMPILER_STRIP_GATE(806D79CC, &lit_4055); +COMPILER_STRIP_GATE(0x806D79CC, &lit_4055); #pragma pop /* 806D79D0-806D79D4 000030 0004+00 0/6 0/0 0/0 .rodata @4056 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4056 = 8.0f; -COMPILER_STRIP_GATE(806D79D0, &lit_4056); +COMPILER_STRIP_GATE(0x806D79D0, &lit_4056); #pragma pop /* 806D79D4-806D79D8 000034 0004+00 0/10 0/0 0/0 .rodata @4057 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4057 = 10.0f; -COMPILER_STRIP_GATE(806D79D4, &lit_4057); +COMPILER_STRIP_GATE(0x806D79D4, &lit_4057); #pragma pop /* 806D79D8-806D79DC 000038 0004+00 0/2 0/0 0/0 .rodata @4058 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4058 = 20.0f; -COMPILER_STRIP_GATE(806D79D8, &lit_4058); +COMPILER_STRIP_GATE(0x806D79D8, &lit_4058); #pragma pop /* 806D79DC-806D79E0 00003C 0004+00 1/5 0/0 0/0 .rodata @4059 */ SECTION_RODATA static f32 const lit_4059 = 15.0f; -COMPILER_STRIP_GATE(806D79DC, &lit_4059); +COMPILER_STRIP_GATE(0x806D79DC, &lit_4059); /* 806D79E0-806D79E4 000040 0004+00 0/1 0/0 0/0 .rodata @4060 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4060 = 300.0f; -COMPILER_STRIP_GATE(806D79E0, &lit_4060); +COMPILER_STRIP_GATE(0x806D79E0, &lit_4060); #pragma pop /* 806D7AFC-806D7B08 000000 000C+00 8/8 0/0 0/0 .data cNullVec__6Z2Calc */ @@ -1121,7 +1121,7 @@ asm daE_GM_HIO_c::daE_GM_HIO_c() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daE_GM_c::setAction(void (daE_GM_c::*)()) { +asm void daE_GM_c::setAction(void (daE_GM_c::*param_0)()) { nofralloc #include "asm/rel/d/a/e/d_a_e_gm/d_a_e_gm/setAction__8daE_GM_cFM8daE_GM_cFPCvPv_v.s" } @@ -1130,7 +1130,7 @@ asm void daE_GM_c::setAction(void (daE_GM_c::*)()) { /* ############################################################################################## */ /* 806D79E4-806D79E8 000044 0004+00 1/18 0/0 0/0 .rodata @4100 */ SECTION_RODATA static f32 const lit_4100 = -1.0f; -COMPILER_STRIP_GATE(806D79E4, &lit_4100); +COMPILER_STRIP_GATE(0x806D79E4, &lit_4100); /* 806D7E78-806D7E7C 000008 0001+03 5/5 0/0 0/0 .bss @1109 */ static u8 lit_1109[1 + 3 /* padding */]; @@ -1284,7 +1284,7 @@ asm void daE_GM_c::action() { /* ############################################################################################## */ /* 806D79E8-806D79EC 000048 0004+00 1/1 0/0 0/0 .rodata @4119 */ SECTION_RODATA static f32 const lit_4119 = 4000.0f; -COMPILER_STRIP_GATE(806D79E8, &lit_4119); +COMPILER_STRIP_GATE(0x806D79E8, &lit_4119); /* 806D14E0-806D1580 000360 00A0+00 7/7 0/0 0/0 .text s_obj_sub2__FPvPv */ #pragma push @@ -1301,74 +1301,74 @@ static asm void s_obj_sub2(void* param_0, void* param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4211 = -100.0f; -COMPILER_STRIP_GATE(806D79EC, &lit_4211); +COMPILER_STRIP_GATE(0x806D79EC, &lit_4211); #pragma pop /* 806D79F0-806D79F4 000050 0004+00 0/5 0/0 0/0 .rodata @4212 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4212 = 50.0f; -COMPILER_STRIP_GATE(806D79F0, &lit_4212); +COMPILER_STRIP_GATE(0x806D79F0, &lit_4212); #pragma pop /* 806D79F4-806D79F8 000054 0004+00 0/12 0/0 0/0 .rodata @4213 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4213 = -5.0f; -COMPILER_STRIP_GATE(806D79F4, &lit_4213); +COMPILER_STRIP_GATE(0x806D79F4, &lit_4213); #pragma pop /* 806D79F8-806D79FC 000058 0004+00 0/1 0/0 0/0 .rodata @4214 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4214 = -10.0f; -COMPILER_STRIP_GATE(806D79F8, &lit_4214); +COMPILER_STRIP_GATE(0x806D79F8, &lit_4214); #pragma pop /* 806D79FC-806D7A00 00005C 0004+00 0/2 0/0 0/0 .rodata @4215 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4215 = 32768.0f; -COMPILER_STRIP_GATE(806D79FC, &lit_4215); +COMPILER_STRIP_GATE(0x806D79FC, &lit_4215); #pragma pop /* 806D7A00-806D7A04 000060 0004+00 0/1 0/0 0/0 .rodata @4216 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4216 = 8192.0f; -COMPILER_STRIP_GATE(806D7A00, &lit_4216); +COMPILER_STRIP_GATE(0x806D7A00, &lit_4216); #pragma pop /* 806D7A04-806D7A08 000064 0004+00 0/7 0/0 0/0 .rodata @4217 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4217 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(806D7A04, &lit_4217); +COMPILER_STRIP_GATE(0x806D7A04, &lit_4217); #pragma pop /* 806D7A08-806D7A0C 000068 0004+00 0/2 0/0 0/0 .rodata @4218 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4218 = 1.0f / 20.0f; -COMPILER_STRIP_GATE(806D7A08, &lit_4218); +COMPILER_STRIP_GATE(0x806D7A08, &lit_4218); #pragma pop /* 806D7A0C-806D7A10 00006C 0004+00 1/10 0/0 0/0 .rodata @4219 */ SECTION_RODATA static f32 const lit_4219 = 5.0f; -COMPILER_STRIP_GATE(806D7A0C, &lit_4219); +COMPILER_STRIP_GATE(0x806D7A0C, &lit_4219); /* 806D7A10-806D7A14 000070 0004+00 0/1 0/0 0/0 .rodata @4220 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4220 = 6.0f / 5.0f; -COMPILER_STRIP_GATE(806D7A10, &lit_4220); +COMPILER_STRIP_GATE(0x806D7A10, &lit_4220); #pragma pop /* 806D7A14-806D7A18 000074 0004+00 0/1 0/0 0/0 .rodata @4221 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4221 = 3.0f / 5.0f; -COMPILER_STRIP_GATE(806D7A14, &lit_4221); +COMPILER_STRIP_GATE(0x806D7A14, &lit_4221); #pragma pop /* 806D1580-806D1A9C 000400 051C+00 3/6 0/0 0/0 .text egg_wait__8daE_GM_cFv */ @@ -1386,14 +1386,20 @@ asm void daE_GM_c::egg_wait() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4268 = 3.0f; -COMPILER_STRIP_GATE(806D7A18, &lit_4268); +COMPILER_STRIP_GATE(0x806D7A18, &lit_4268); #pragma pop /* 806D7A1C-806D7A20 00007C 0004+00 0/10 0/0 0/0 .rodata @4269 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4269 = 30.0f; -COMPILER_STRIP_GATE(806D7A1C, &lit_4269); +COMPILER_STRIP_GATE(0x806D7A1C, &lit_4269); +#pragma pop + +/* 806D7AF0-806D7AF0 000150 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_806D7AF0 = "E_gm"; #pragma pop /* 806D1A9C-806D1CC0 00091C 0224+00 2/0 0/0 0/0 .text appear__8daE_GM_cFv */ @@ -1413,7 +1419,7 @@ asm void daE_GM_c::appear() { SECTION_RODATA static u8 const l_rand[8] = { 0xF8, 0x00, 0x04, 0x00, 0xFC, 0x00, 0x08, 0x00, }; -COMPILER_STRIP_GATE(806D7A20, &l_rand); +COMPILER_STRIP_GATE(0x806D7A20, &l_rand); #pragma pop /* 806D7A28-806D7A30 000088 0008+00 0/2 0/0 0/0 .rodata l_rand2 */ @@ -1422,7 +1428,7 @@ COMPILER_STRIP_GATE(806D7A20, &l_rand); SECTION_RODATA static u8 const l_rand2[8] = { 0xD0, 0x00, 0x38, 0x00, 0xB8, 0x00, 0x50, 0x00, }; -COMPILER_STRIP_GATE(806D7A28, &l_rand2); +COMPILER_STRIP_GATE(0x806D7A28, &l_rand2); #pragma pop /* 806D7A30-806D7A40 000090 0010+00 0/0 0/0 0/0 .rodata l_rand_base_spd */ @@ -1431,35 +1437,35 @@ COMPILER_STRIP_GATE(806D7A28, &l_rand2); SECTION_RODATA static u8 const l_rand_base_spd[16] = { 0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(806D7A30, &l_rand_base_spd); +COMPILER_STRIP_GATE(0x806D7A30, &l_rand_base_spd); #pragma pop /* 806D7A40-806D7A44 0000A0 0004+00 0/5 0/0 0/0 .rodata @4397 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4397 = 2.0f; -COMPILER_STRIP_GATE(806D7A40, &lit_4397); +COMPILER_STRIP_GATE(0x806D7A40, &lit_4397); #pragma pop /* 806D7A44-806D7A48 0000A4 0004+00 0/3 0/0 0/0 .rodata @4398 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4398 = 0.5f; -COMPILER_STRIP_GATE(806D7A44, &lit_4398); +COMPILER_STRIP_GATE(0x806D7A44, &lit_4398); #pragma pop /* 806D7A48-806D7A4C 0000A8 0004+00 0/1 0/0 0/0 .rodata @4399 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4399 = 6.5f; -COMPILER_STRIP_GATE(806D7A48, &lit_4399); +COMPILER_STRIP_GATE(0x806D7A48, &lit_4399); #pragma pop /* 806D7A4C-806D7A50 0000AC 0004+00 0/2 0/0 0/0 .rodata @4400 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4400 = 400.0f; -COMPILER_STRIP_GATE(806D7A4C, &lit_4400); +COMPILER_STRIP_GATE(0x806D7A4C, &lit_4400); #pragma pop /* 806D1CC0-806D21A4 000B40 04E4+00 4/0 0/0 0/0 .text walk__8daE_GM_cFv */ @@ -1475,11 +1481,11 @@ asm void daE_GM_c::walk() { /* ############################################################################################## */ /* 806D7A50-806D7A54 0000B0 0004+00 1/2 0/0 0/0 .rodata @4424 */ SECTION_RODATA static f32 const lit_4424 = 9.0f; -COMPILER_STRIP_GATE(806D7A50, &lit_4424); +COMPILER_STRIP_GATE(0x806D7A50, &lit_4424); /* 806D7A54-806D7A58 0000B4 0004+00 1/1 0/0 0/0 .rodata @4425 */ SECTION_RODATA static f32 const lit_4425 = 11.0f; -COMPILER_STRIP_GATE(806D7A54, &lit_4425); +COMPILER_STRIP_GATE(0x806D7A54, &lit_4425); /* 806D21A4-806D2294 001024 00F0+00 3/3 0/0 0/0 .text create_item__8daE_GM_cFv */ #pragma push @@ -1496,21 +1502,21 @@ asm void daE_GM_c::create_item() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4465 = 60.0f; -COMPILER_STRIP_GATE(806D7A58, &lit_4465); +COMPILER_STRIP_GATE(0x806D7A58, &lit_4465); #pragma pop /* 806D7A5C-806D7A60 0000BC 0004+00 0/2 0/0 0/0 .rodata @4466 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4466 = 2.0f / 5.0f; -COMPILER_STRIP_GATE(806D7A5C, &lit_4466); +COMPILER_STRIP_GATE(0x806D7A5C, &lit_4466); #pragma pop /* 806D7A60-806D7A64 0000C0 0004+00 0/1 0/0 0/0 .rodata @4467 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4467 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(806D7A60, &lit_4467); +COMPILER_STRIP_GATE(0x806D7A60, &lit_4467); #pragma pop /* 806D2294-806D24C0 001114 022C+00 1/0 0/0 0/0 .text pechanko_damage__8daE_GM_cFv */ @@ -1538,21 +1544,21 @@ asm void daE_GM_c::wait() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4531 = 40.0f; -COMPILER_STRIP_GATE(806D7A64, &lit_4531); +COMPILER_STRIP_GATE(0x806D7A64, &lit_4531); #pragma pop /* 806D7A68-806D7A6C 0000C8 0004+00 0/1 0/0 0/0 .rodata @4532 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4532 = 11.0f / 10.0f; -COMPILER_STRIP_GATE(806D7A68, &lit_4532); +COMPILER_STRIP_GATE(0x806D7A68, &lit_4532); #pragma pop /* 806D7A6C-806D7A70 0000CC 0004+00 0/2 0/0 0/0 .rodata @4533 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4533 = 4.0f / 5.0f; -COMPILER_STRIP_GATE(806D7A6C, &lit_4533); +COMPILER_STRIP_GATE(0x806D7A6C, &lit_4533); #pragma pop /* 806D25E8-806D289C 001468 02B4+00 1/0 0/0 0/0 .text egg_damage__8daE_GM_cFv */ @@ -1570,7 +1576,7 @@ asm void daE_GM_c::egg_damage() { SECTION_RODATA static u8 const l_eff_id[8] = { 0x85, 0x4C, 0x85, 0x4D, 0x85, 0x4E, 0x85, 0x4F, }; -COMPILER_STRIP_GATE(806D7A70, &l_eff_id); +COMPILER_STRIP_GATE(0x806D7A70, &l_eff_id); /* 806D289C-806D2940 00171C 00A4+00 5/5 0/0 0/0 .text setDeathLightEffect__8daE_GM_cFv */ #pragma push @@ -1597,7 +1603,7 @@ asm void daE_GM_c::setEggBreakEffect() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4664 = 16.0f; -COMPILER_STRIP_GATE(806D7A78, &lit_4664); +COMPILER_STRIP_GATE(0x806D7A78, &lit_4664); #pragma pop /* 806D29E4-806D2DD4 001864 03F0+00 1/0 0/0 0/0 .text damage__8daE_GM_cFv */ @@ -1615,21 +1621,27 @@ asm void daE_GM_c::damage() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4785 = 73.0f; -COMPILER_STRIP_GATE(806D7A7C, &lit_4785); +COMPILER_STRIP_GATE(0x806D7A7C, &lit_4785); #pragma pop /* 806D7A80-806D7A84 0000E0 0004+00 0/2 0/0 0/0 .rodata @4786 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4786 = 75.0f; -COMPILER_STRIP_GATE(806D7A80, &lit_4786); +COMPILER_STRIP_GATE(0x806D7A80, &lit_4786); #pragma pop /* 806D7A84-806D7A88 0000E4 0004+00 0/1 0/0 0/0 .rodata @4787 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4787 = 12.0f; -COMPILER_STRIP_GATE(806D7A84, &lit_4787); +COMPILER_STRIP_GATE(0x806D7A84, &lit_4787); +#pragma pop + +/* 806D7AF0-806D7AF0 000150 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_806D7AF5 = "E_mg"; #pragma pop /* 806D2DD4-806D3308 001C54 0534+00 1/0 0/0 0/0 .text core_damage__8daE_GM_cFv */ @@ -1678,14 +1690,14 @@ asm void daE_GM_c::core_pechanko_damage() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4932 = 80.0f; -COMPILER_STRIP_GATE(806D7A88, &lit_4932); +COMPILER_STRIP_GATE(0x806D7A88, &lit_4932); #pragma pop /* 806D7A8C-806D7A90 0000EC 0004+00 0/1 0/0 0/0 .rodata @4933 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4933 = 140.0f; -COMPILER_STRIP_GATE(806D7A8C, &lit_4933); +COMPILER_STRIP_GATE(0x806D7A8C, &lit_4933); #pragma pop /* 806D378C-806D398C 00260C 0200+00 1/0 0/0 0/0 .text hook__8daE_GM_cFv */ @@ -1713,14 +1725,14 @@ asm void daE_GM_c::rebound() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5123 = 350.0f; -COMPILER_STRIP_GATE(806D7A90, &lit_5123); +COMPILER_STRIP_GATE(0x806D7A90, &lit_5123); #pragma pop /* 806D7A94-806D7A98 0000F4 0004+00 0/2 0/0 0/0 .rodata @5124 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5124 = 4.0f; -COMPILER_STRIP_GATE(806D7A94, &lit_5124); +COMPILER_STRIP_GATE(0x806D7A94, &lit_5124); #pragma pop /* 806D3EC4-806D4288 002D44 03C4+00 2/0 0/0 0/0 .text walk2__8daE_GM_cFv */ @@ -1758,42 +1770,42 @@ asm void daE_GM_c::core_wait() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5243 = 1000.0f; -COMPILER_STRIP_GATE(806D7A98, &lit_5243); +COMPILER_STRIP_GATE(0x806D7A98, &lit_5243); #pragma pop /* 806D7A9C-806D7AA0 0000FC 0004+00 0/1 0/0 0/0 .rodata @5399 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5399 = 800.0f; -COMPILER_STRIP_GATE(806D7A9C, &lit_5399); +COMPILER_STRIP_GATE(0x806D7A9C, &lit_5399); #pragma pop /* 806D7AA0-806D7AA4 000100 0004+00 0/1 0/0 0/0 .rodata @5400 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5400 = 256.0f; -COMPILER_STRIP_GATE(806D7AA0, &lit_5400); +COMPILER_STRIP_GATE(0x806D7AA0, &lit_5400); #pragma pop /* 806D7AA4-806D7AA8 000104 0004+00 0/1 0/0 0/0 .rodata @5401 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5401 = 2000.0f; -COMPILER_STRIP_GATE(806D7AA4, &lit_5401); +COMPILER_STRIP_GATE(0x806D7AA4, &lit_5401); #pragma pop /* 806D7AA8-806D7AAC 000108 0004+00 0/1 0/0 0/0 .rodata @5402 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5402 = 18.0f; -COMPILER_STRIP_GATE(806D7AA8, &lit_5402); +COMPILER_STRIP_GATE(0x806D7AA8, &lit_5402); #pragma pop /* 806D7AAC-806D7AB0 00010C 0004+00 0/1 0/0 0/0 .rodata @5403 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5403 = 13.0f; -COMPILER_STRIP_GATE(806D7AAC, &lit_5403); +COMPILER_STRIP_GATE(0x806D7AAC, &lit_5403); #pragma pop /* 806D462C-806D4D1C 0034AC 06F0+00 5/0 0/0 0/0 .text core_escape__8daE_GM_cFv */ @@ -1825,7 +1837,7 @@ SECTION_RODATA static f32 const lit_5565[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(806D7AB0, &lit_5565); +COMPILER_STRIP_GATE(0x806D7AB0, &lit_5565); #pragma pop /* 806D7AB8-806D7AC0 000118 0008+00 0/1 0/0 0/0 .rodata @5568 */ @@ -1834,7 +1846,7 @@ COMPILER_STRIP_GATE(806D7AB0, &lit_5565); SECTION_RODATA static u8 const lit_5568[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(806D7AB8, &lit_5568); +COMPILER_STRIP_GATE(0x806D7AB8, &lit_5568); #pragma pop /* 806D4EF4-806D545C 003D74 0568+00 3/0 0/0 0/0 .text normal_wait__8daE_GM_cFv */ @@ -1852,14 +1864,14 @@ asm void daE_GM_c::normal_wait() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5621 = 19.0f; -COMPILER_STRIP_GATE(806D7AC0, &lit_5621); +COMPILER_STRIP_GATE(0x806D7AC0, &lit_5621); #pragma pop /* 806D7AC4-806D7AC8 000124 0004+00 0/1 0/0 0/0 .rodata @5622 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5622 = 7.5f; -COMPILER_STRIP_GATE(806D7AC4, &lit_5622); +COMPILER_STRIP_GATE(0x806D7AC4, &lit_5622); #pragma pop /* 806D545C-806D578C 0042DC 0330+00 1/0 0/0 0/0 .text normal_chase__8daE_GM_cFv */ @@ -1877,7 +1889,7 @@ asm void daE_GM_c::normal_chase() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5681 = 1.0f / 25.0f; -COMPILER_STRIP_GATE(806D7AC8, &lit_5681); +COMPILER_STRIP_GATE(0x806D7AC8, &lit_5681); #pragma pop /* 806D578C-806D59D0 00460C 0244+00 1/1 0/0 0/0 .text mtx_set__8daE_GM_cFv */ @@ -1895,14 +1907,14 @@ asm void daE_GM_c::mtx_set() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5768 = -15.0f; -COMPILER_STRIP_GATE(806D7ACC, &lit_5768); +COMPILER_STRIP_GATE(0x806D7ACC, &lit_5768); #pragma pop /* 806D7AD0-806D7AD4 000130 0004+00 0/1 0/0 0/0 .rodata @5769 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5769 = 120.0f; -COMPILER_STRIP_GATE(806D7AD0, &lit_5769); +COMPILER_STRIP_GATE(0x806D7AD0, &lit_5769); #pragma pop /* 806D59D0-806D5D54 004850 0384+00 1/1 0/0 0/0 .text cc_set__8daE_GM_cFv */ @@ -1920,14 +1932,14 @@ asm void daE_GM_c::cc_set() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5869 = 255.0f; -COMPILER_STRIP_GATE(806D7AD4, &lit_5869); +COMPILER_STRIP_GATE(0x806D7AD4, &lit_5869); #pragma pop /* 806D7AD8-806D7ADC 000138 0004+00 0/1 0/0 0/0 .rodata @5870 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5870 = 700.0f; -COMPILER_STRIP_GATE(806D7AD8, &lit_5870); +COMPILER_STRIP_GATE(0x806D7AD8, &lit_5870); #pragma pop /* 806D5D54-806D62FC 004BD4 05A8+00 1/1 0/0 0/0 .text draw__8daE_GM_cFv */ @@ -2030,7 +2042,7 @@ static asm void useHeapInit(fopAc_ac_c* param_0) { #pragma push #pragma force_active on SECTION_RODATA static u32 const l_damage_count = 0x01010103; -COMPILER_STRIP_GATE(806D7ADC, &l_damage_count); +COMPILER_STRIP_GATE(0x806D7ADC, &l_damage_count); #pragma pop /* 806D7AE0-806D7AE8 000140 0008+00 0/1 0/0 0/0 .rodata l_heapsize */ @@ -2039,7 +2051,7 @@ COMPILER_STRIP_GATE(806D7ADC, &l_damage_count); SECTION_RODATA static u8 const l_heapsize[8] = { 0x31, 0x20, 0x31, 0x20, 0x21, 0xE0, 0x2D, 0xE0, }; -COMPILER_STRIP_GATE(806D7AE0, &l_heapsize); +COMPILER_STRIP_GATE(0x806D7AE0, &l_heapsize); #pragma pop /* 806D7AE8-806D7AF0 000148 0008+00 0/1 0/0 0/0 .rodata @6321 */ @@ -2048,7 +2060,7 @@ COMPILER_STRIP_GATE(806D7AE0, &l_heapsize); SECTION_RODATA static u8 const lit_6321[8] = { 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(806D7AE8, &lit_6321); +COMPILER_STRIP_GATE(0x806D7AE8, &lit_6321); #pragma pop /* 806D6CF0-806D71F4 005B70 0504+00 1/1 0/0 0/0 .text create__8daE_GM_cFv */ @@ -2153,7 +2165,7 @@ asm void __sinit_d_a_e_gm_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_806D7470 = (void*)__sinit_d_a_e_gm_cpp; +REGISTER_CTORS(0x806D7470, __sinit_d_a_e_gm_cpp); #pragma pop /* 806D74F0-806D74F8 006370 0008+00 1/0 0/0 0/0 .text @36@__dt__12dBgS_ObjAcchFv */ @@ -2380,10 +2392,4 @@ static u8 data_806D7F7C[4]; static u8 data_806D7F80[4]; #pragma pop -/* 806D7AF0-806D7AFA 000150 000A+00 17/17 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_806D7AF0 = "E_gm"; -SECTION_DEAD static char const* const stringBase_806D7AF5 = "E_mg"; -#pragma pop +/* 806D7AF0-806D7AF0 000150 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/e/d_a_e_gob/d_a_e_gob.cpp b/rel/d/a/e/d_a_e_gob/d_a_e_gob.cpp index be2c0bb8da7..f9d41b51a53 100644 --- a/rel/d/a/e/d_a_e_gob/d_a_e_gob.cpp +++ b/rel/d/a/e/d_a_e_gob/d_a_e_gob.cpp @@ -26,18 +26,18 @@ struct mDoGph_gInf_c { /* 80007FD8 */ void fadeOut(f32, _GXColor&); }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; +struct J3DAnmTransform {}; + +struct J3DModelData {}; + struct Z2Creature { /* 802C03C8 */ Z2Creature(); }; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -493,27 +493,27 @@ extern "C" void __register_global_object(); /* ############################################################################################## */ /* 806DEE38-806DEE3C 000000 0004+00 18/18 0/0 0/0 .rodata @3763 */ SECTION_RODATA static f32 const lit_3763 = 11.0f / 10.0f; -COMPILER_STRIP_GATE(806DEE38, &lit_3763); +COMPILER_STRIP_GATE(0x806DEE38, &lit_3763); /* 806DEE3C-806DEE40 000004 0004+00 0/1 0/0 0/0 .rodata @3764 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3764 = 8.0f; -COMPILER_STRIP_GATE(806DEE3C, &lit_3764); +COMPILER_STRIP_GATE(0x806DEE3C, &lit_3764); #pragma pop /* 806DEE40-806DEE44 000008 0004+00 0/1 0/0 0/0 .rodata @3765 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3765 = 4.0f; -COMPILER_STRIP_GATE(806DEE40, &lit_3765); +COMPILER_STRIP_GATE(0x806DEE40, &lit_3765); #pragma pop /* 806DEE44-806DEE48 00000C 0004+00 0/3 0/0 0/0 .rodata @3766 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3766 = 30.0f; -COMPILER_STRIP_GATE(806DEE44, &lit_3766); +COMPILER_STRIP_GATE(0x806DEE44, &lit_3766); #pragma pop /* 806DF05C-806DF090 -00001 0034+00 1/1 0/0 0/0 .data @4087 */ @@ -699,13 +699,13 @@ static asm void nodeCallBack(J3DJoint* param_0, int param_1) { /* ############################################################################################## */ /* 806DEE48-806DEE4C 000010 0004+00 1/6 0/0 0/0 .rodata @3908 */ SECTION_RODATA static f32 const lit_3908 = 50.0f; -COMPILER_STRIP_GATE(806DEE48, &lit_3908); +COMPILER_STRIP_GATE(0x806DEE48, &lit_3908); /* 806DEE4C-806DEE50 000014 0004+00 0/2 0/0 0/0 .rodata @3909 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3909 = 1400.0f; -COMPILER_STRIP_GATE(806DEE4C, &lit_3909); +COMPILER_STRIP_GATE(0x806DEE4C, &lit_3909); #pragma pop /* 806DEE50-806DEE54 000018 0004+00 2/16 0/0 0/0 .rodata @3910 */ @@ -715,11 +715,11 @@ SECTION_RODATA static u8 const lit_3910[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(806DEE50, &lit_3910); +COMPILER_STRIP_GATE(0x806DEE50, &lit_3910); /* 806DEE54-806DEE58 00001C 0004+00 1/15 0/0 0/0 .rodata @3911 */ SECTION_RODATA static f32 const lit_3911 = 1.0f; -COMPILER_STRIP_GATE(806DEE54, &lit_3911); +COMPILER_STRIP_GATE(0x806DEE54, &lit_3911); /* 806D842C-806D853C 00048C 0110+00 1/0 0/0 0/0 .text daE_GOB_Draw__FP11e_gob_class */ #pragma push @@ -744,7 +744,13 @@ asm cXyz::~cXyz() { /* ############################################################################################## */ /* 806DEE58-806DEE5C 000020 0004+00 1/3 0/0 0/0 .rodata @3919 */ SECTION_RODATA static f32 const lit_3919 = -1.0f; -COMPILER_STRIP_GATE(806DEE58, &lit_3919); +COMPILER_STRIP_GATE(0x806DEE58, &lit_3919); + +/* 806DF054-806DF054 00021C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_806DF054 = "E_gob"; +#pragma pop /* 806D8578-806D8624 0005D8 00AC+00 11/11 0/0 0/0 .text anm_init__FP11e_gob_classifUcf */ #pragma push @@ -771,98 +777,98 @@ static asm void damage_check(e_gob_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4072 = 10.0f; -COMPILER_STRIP_GATE(806DEE5C, &lit_4072); +COMPILER_STRIP_GATE(0x806DEE5C, &lit_4072); #pragma pop /* 806DEE60-806DEE64 000028 0004+00 0/2 0/0 0/0 .rodata @4073 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4073 = 20.0f; -COMPILER_STRIP_GATE(806DEE60, &lit_4073); +COMPILER_STRIP_GATE(0x806DEE60, &lit_4073); #pragma pop /* 806DEE64-806DEE68 00002C 0004+00 0/1 0/0 0/0 .rodata @4074 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4074 = 600.0f; -COMPILER_STRIP_GATE(806DEE64, &lit_4074); +COMPILER_STRIP_GATE(0x806DEE64, &lit_4074); #pragma pop /* 806DEE68-806DEE6C 000030 0004+00 0/1 0/0 0/0 .rodata @4075 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4075 = 200.0f; -COMPILER_STRIP_GATE(806DEE68, &lit_4075); +COMPILER_STRIP_GATE(0x806DEE68, &lit_4075); #pragma pop /* 806DEE6C-806DEE70 000034 0004+00 0/2 0/0 0/0 .rodata @4076 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4076 = 70.0f; -COMPILER_STRIP_GATE(806DEE6C, &lit_4076); +COMPILER_STRIP_GATE(0x806DEE6C, &lit_4076); #pragma pop /* 806DEE70-806DEE74 000038 0004+00 0/0 0/0 0/0 .rodata @4077 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4077 = 650.0f; -COMPILER_STRIP_GATE(806DEE70, &lit_4077); +COMPILER_STRIP_GATE(0x806DEE70, &lit_4077); #pragma pop /* 806DEE74-806DEE78 00003C 0004+00 0/0 0/0 0/0 .rodata @4078 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4078 = 350.0f; -COMPILER_STRIP_GATE(806DEE74, &lit_4078); +COMPILER_STRIP_GATE(0x806DEE74, &lit_4078); #pragma pop /* 806DEE78-806DEE7C 000040 0004+00 0/0 0/0 0/0 .rodata @4079 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4079 = 450.0f; -COMPILER_STRIP_GATE(806DEE78, &lit_4079); +COMPILER_STRIP_GATE(0x806DEE78, &lit_4079); #pragma pop /* 806DEE7C-806DEE80 000044 0004+00 0/0 0/0 0/0 .rodata @4080 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4080 = 7.0f / 10.0f; -COMPILER_STRIP_GATE(806DEE7C, &lit_4080); +COMPILER_STRIP_GATE(0x806DEE7C, &lit_4080); #pragma pop /* 806DEE80-806DEE84 000048 0004+00 0/8 0/0 0/0 .rodata @4081 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4081 = 5.0f; -COMPILER_STRIP_GATE(806DEE80, &lit_4081); +COMPILER_STRIP_GATE(0x806DEE80, &lit_4081); #pragma pop /* 806DEE84-806DEE88 00004C 0004+00 0/2 0/0 0/0 .rodata @4082 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4082 = 60.0f; -COMPILER_STRIP_GATE(806DEE84, &lit_4082); +COMPILER_STRIP_GATE(0x806DEE84, &lit_4082); #pragma pop /* 806DEE88-806DEE8C 000050 0004+00 0/0 0/0 0/0 .rodata @4083 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4083 = 90.0f; -COMPILER_STRIP_GATE(806DEE88, &lit_4083); +COMPILER_STRIP_GATE(0x806DEE88, &lit_4083); #pragma pop /* 806DEE8C-806DEE90 000054 0004+00 0/2 0/0 0/0 .rodata @4084 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4084 = 400.0f; -COMPILER_STRIP_GATE(806DEE8C, &lit_4084); +COMPILER_STRIP_GATE(0x806DEE8C, &lit_4084); #pragma pop /* 806DEE90-806DEE94 000058 0004+00 0/8 0/0 0/0 .rodata @4085 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4085 = 2.0f; -COMPILER_STRIP_GATE(806DEE90, &lit_4085); +COMPILER_STRIP_GATE(0x806DEE90, &lit_4085); #pragma pop /* 806DF288-806DF28C 000008 0001+03 3/3 0/0 0/0 .bss @1109 */ @@ -1006,7 +1012,7 @@ static asm void attack(e_gob_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4212 = 3.0f; -COMPILER_STRIP_GATE(806DEE94, &lit_4212); +COMPILER_STRIP_GATE(0x806DEE94, &lit_4212); #pragma pop /* 806D93CC-806D9514 00142C 0148+00 1/1 0/0 0/0 .text defence__FP11e_gob_class */ @@ -1024,53 +1030,53 @@ static asm void defence(e_gob_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4213 = 700.0f; -COMPILER_STRIP_GATE(806DEE98, &lit_4213); +COMPILER_STRIP_GATE(0x806DEE98, &lit_4213); #pragma pop /* 806DEE9C-806DEEA0 000064 0004+00 0/1 0/0 0/0 .rodata @4398 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4398 = 21.5f; -COMPILER_STRIP_GATE(806DEE9C, &lit_4398); +COMPILER_STRIP_GATE(0x806DEE9C, &lit_4398); #pragma pop /* 806DEEA0-806DEEA4 000068 0004+00 0/1 0/0 0/0 .rodata @4399 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4399 = -2.0f; -COMPILER_STRIP_GATE(806DEEA0, &lit_4399); +COMPILER_STRIP_GATE(0x806DEEA0, &lit_4399); #pragma pop /* 806DEEA4-806DEEA8 00006C 0004+00 1/2 0/0 0/0 .rodata @4400 */ SECTION_RODATA static f32 const lit_4400 = 300.0f; -COMPILER_STRIP_GATE(806DEEA4, &lit_4400); +COMPILER_STRIP_GATE(0x806DEEA4, &lit_4400); /* 806DEEA8-806DEEAC 000070 0004+00 0/3 0/0 0/0 .rodata @4401 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4401 = 100.0f; -COMPILER_STRIP_GATE(806DEEA8, &lit_4401); +COMPILER_STRIP_GATE(0x806DEEA8, &lit_4401); #pragma pop /* 806DEEAC-806DEEB0 000074 0004+00 0/2 0/0 0/0 .rodata @4402 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4402 = 35.0f; -COMPILER_STRIP_GATE(806DEEAC, &lit_4402); +COMPILER_STRIP_GATE(0x806DEEAC, &lit_4402); #pragma pop /* 806DEEB0-806DEEB4 000078 0004+00 0/1 0/0 0/0 .rodata @4403 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4403 = 320.0f; -COMPILER_STRIP_GATE(806DEEB0, &lit_4403); +COMPILER_STRIP_GATE(0x806DEEB0, &lit_4403); #pragma pop /* 806DEEB4-806DEEB8 00007C 0004+00 0/1 0/0 0/0 .rodata @4404 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4404 = 800.0f; -COMPILER_STRIP_GATE(806DEEB4, &lit_4404); +COMPILER_STRIP_GATE(0x806DEEB4, &lit_4404); #pragma pop /* 806D9514-806D9C80 001574 076C+00 1/1 0/0 0/0 .text ball__FP11e_gob_class */ @@ -1108,28 +1114,28 @@ static asm void damage(e_gob_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4755 = 0.5f; -COMPILER_STRIP_GATE(806DEEB8, &lit_4755); +COMPILER_STRIP_GATE(0x806DEEB8, &lit_4755); #pragma pop /* 806DEEBC-806DEEC0 000084 0004+00 0/1 0/0 0/0 .rodata @4756 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4756 = 40.0f; -COMPILER_STRIP_GATE(806DEEBC, &lit_4756); +COMPILER_STRIP_GATE(0x806DEEBC, &lit_4756); #pragma pop /* 806DEEC0-806DEEC4 000088 0004+00 0/1 0/0 0/0 .rodata @4757 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4757 = 4.0f / 5.0f; -COMPILER_STRIP_GATE(806DEEC0, &lit_4757); +COMPILER_STRIP_GATE(0x806DEEC0, &lit_4757); #pragma pop /* 806DEEC4-806DEEC8 00008C 0004+00 0/1 0/0 0/0 .rodata @4758 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4758 = 25.0f; -COMPILER_STRIP_GATE(806DEEC4, &lit_4758); +COMPILER_STRIP_GATE(0x806DEEC4, &lit_4758); #pragma pop /* 806DEEC8-806DEED0 000090 0004+04 0/3 0/0 0/0 .rodata @4759 */ @@ -1140,7 +1146,7 @@ SECTION_RODATA static f32 const lit_4759[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(806DEEC8, &lit_4759); +COMPILER_STRIP_GATE(0x806DEEC8, &lit_4759); #pragma pop /* 806DEED0-806DEED8 000098 0008+00 0/1 0/0 0/0 .rodata @4760 */ @@ -1149,7 +1155,7 @@ COMPILER_STRIP_GATE(806DEEC8, &lit_4759); SECTION_RODATA static u8 const lit_4760[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(806DEED0, &lit_4760); +COMPILER_STRIP_GATE(0x806DEED0, &lit_4760); #pragma pop /* 806DEED8-806DEEE0 0000A0 0008+00 0/1 0/0 0/0 .rodata @4761 */ @@ -1158,7 +1164,7 @@ COMPILER_STRIP_GATE(806DEED0, &lit_4760); SECTION_RODATA static u8 const lit_4761[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(806DEED8, &lit_4761); +COMPILER_STRIP_GATE(0x806DEED8, &lit_4761); #pragma pop /* 806DEEE0-806DEEE8 0000A8 0008+00 0/1 0/0 0/0 .rodata @4762 */ @@ -1167,28 +1173,28 @@ COMPILER_STRIP_GATE(806DEED8, &lit_4761); SECTION_RODATA static u8 const lit_4762[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(806DEEE0, &lit_4762); +COMPILER_STRIP_GATE(0x806DEEE0, &lit_4762); #pragma pop /* 806DEEE8-806DEEEC 0000B0 0004+00 0/1 0/0 0/0 .rodata @4763 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4763 = 32768.0f; -COMPILER_STRIP_GATE(806DEEE8, &lit_4763); +COMPILER_STRIP_GATE(0x806DEEE8, &lit_4763); #pragma pop /* 806DEEEC-806DEEF0 0000B4 0004+00 0/2 0/0 0/0 .rodata @4764 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4764 = -50.0f; -COMPILER_STRIP_GATE(806DEEEC, &lit_4764); +COMPILER_STRIP_GATE(0x806DEEEC, &lit_4764); #pragma pop /* 806DEEF0-806DEEF4 0000B8 0004+00 0/2 0/0 0/0 .rodata @4765 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4765 = 170.0f; -COMPILER_STRIP_GATE(806DEEF0, &lit_4765); +COMPILER_STRIP_GATE(0x806DEEF0, &lit_4765); #pragma pop /* 806D9DE0-806DAB6C 001E40 0D8C+00 1/1 0/0 0/0 .text glab__FP11e_gob_class */ @@ -1206,21 +1212,21 @@ static asm void glab(e_gob_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4870 = 110.0f; -COMPILER_STRIP_GATE(806DEEF4, &lit_4870); +COMPILER_STRIP_GATE(0x806DEEF4, &lit_4870); #pragma pop /* 806DEEF8-806DEEFC 0000C0 0004+00 0/2 0/0 0/0 .rodata @4871 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4871 = 2000.0f; -COMPILER_STRIP_GATE(806DEEF8, &lit_4871); +COMPILER_STRIP_GATE(0x806DEEF8, &lit_4871); #pragma pop /* 806DEEFC-806DEF00 0000C4 0004+00 0/4 0/0 0/0 .rodata @4872 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4872 = 500.0f; -COMPILER_STRIP_GATE(806DEEFC, &lit_4872); +COMPILER_STRIP_GATE(0x806DEEFC, &lit_4872); #pragma pop /* 806DAB6C-806DB038 002BCC 04CC+00 1/1 0/0 0/0 .text jump__FP11e_gob_class */ @@ -1268,21 +1274,21 @@ static asm void s_set(e_gob_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4940 = 150.0f; -COMPILER_STRIP_GATE(806DEF00, &lit_4940); +COMPILER_STRIP_GATE(0x806DEF00, &lit_4940); #pragma pop /* 806DEF04-806DEF08 0000CC 0004+00 0/2 0/0 0/0 .rodata @4941 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4941 = 15.0f; -COMPILER_STRIP_GATE(806DEF04, &lit_4941); +COMPILER_STRIP_GATE(0x806DEF04, &lit_4941); #pragma pop /* 806DEF08-806DEF0C 0000D0 0004+00 0/2 0/0 0/0 .rodata @5062 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5062 = 2120.0f; -COMPILER_STRIP_GATE(806DEF08, &lit_5062); +COMPILER_STRIP_GATE(0x806DEF08, &lit_5062); #pragma pop /* 806DB548-806DB768 0035A8 0220+00 1/1 0/0 0/0 .text message__FP11e_gob_class */ @@ -1320,77 +1326,77 @@ static asm void cam_3d_morf(e_gob_class* param_0, f32 param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5435 = -30.0f; -COMPILER_STRIP_GATE(806DEF0C, &lit_5435); +COMPILER_STRIP_GATE(0x806DEF0C, &lit_5435); #pragma pop /* 806DEF10-806DEF14 0000D8 0004+00 0/0 0/0 0/0 .rodata @5436 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5436 = 1350.0f; -COMPILER_STRIP_GATE(806DEF10, &lit_5436); +COMPILER_STRIP_GATE(0x806DEF10, &lit_5436); #pragma pop /* 806DEF14-806DEF18 0000DC 0004+00 0/1 0/0 0/0 .rodata @5437 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5437 = 120.0f; -COMPILER_STRIP_GATE(806DEF14, &lit_5437); +COMPILER_STRIP_GATE(0x806DEF14, &lit_5437); #pragma pop /* 806DEF18-806DEF1C 0000E0 0004+00 0/0 0/0 0/0 .rodata @5438 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5438 = 12.0f; -COMPILER_STRIP_GATE(806DEF18, &lit_5438); +COMPILER_STRIP_GATE(0x806DEF18, &lit_5438); #pragma pop /* 806DEF1C-806DEF20 0000E4 0004+00 0/0 0/0 0/0 .rodata @5439 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5439 = -170.0f; -COMPILER_STRIP_GATE(806DEF1C, &lit_5439); +COMPILER_STRIP_GATE(0x806DEF1C, &lit_5439); #pragma pop /* 806DEF20-806DEF24 0000E8 0004+00 0/0 0/0 0/0 .rodata @5440 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5440 = -1000000000.0f; -COMPILER_STRIP_GATE(806DEF20, &lit_5440); +COMPILER_STRIP_GATE(0x806DEF20, &lit_5440); #pragma pop /* 806DEF24-806DEF28 0000EC 0004+00 0/0 0/0 0/0 .rodata @5441 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5441 = 16384.0f; -COMPILER_STRIP_GATE(806DEF24, &lit_5441); +COMPILER_STRIP_GATE(0x806DEF24, &lit_5441); #pragma pop /* 806DEF28-806DEF2C 0000F0 0004+00 0/0 0/0 0/0 .rodata @5442 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5442 = 3.0f / 10.0f; -COMPILER_STRIP_GATE(806DEF28, &lit_5442); +COMPILER_STRIP_GATE(0x806DEF28, &lit_5442); #pragma pop /* 806DEF2C-806DEF30 0000F4 0004+00 0/0 0/0 0/0 .rodata @5443 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5443 = 1.0f / 100.0f; -COMPILER_STRIP_GATE(806DEF2C, &lit_5443); +COMPILER_STRIP_GATE(0x806DEF2C, &lit_5443); #pragma pop /* 806DEF30-806DEF34 0000F8 0004+00 0/1 0/0 0/0 .rodata @5444 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5444 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(806DEF30, &lit_5444); +COMPILER_STRIP_GATE(0x806DEF30, &lit_5444); #pragma pop /* 806DEF34-806DEF38 0000FC 0004+00 0/0 0/0 0/0 .rodata @5445 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5445 = 4000.0f; -COMPILER_STRIP_GATE(806DEF34, &lit_5445); +COMPILER_STRIP_GATE(0x806DEF34, &lit_5445); #pragma pop /* 806DEF38-806DEF40 000100 0008+00 0/0 0/0 0/0 .rodata @5449 */ @@ -1399,329 +1405,329 @@ COMPILER_STRIP_GATE(806DEF34, &lit_5445); SECTION_RODATA static u8 const lit_5449[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(806DEF38, &lit_5449); +COMPILER_STRIP_GATE(0x806DEF38, &lit_5449); #pragma pop /* 806DEF40-806DEF44 000108 0004+00 0/1 0/0 0/0 .rodata @5983 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5983 = 55.0f; -COMPILER_STRIP_GATE(806DEF40, &lit_5983); +COMPILER_STRIP_GATE(0x806DEF40, &lit_5983); #pragma pop /* 806DEF44-806DEF48 00010C 0004+00 0/1 0/0 0/0 .rodata @5984 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5984 = -104.0f; -COMPILER_STRIP_GATE(806DEF44, &lit_5984); +COMPILER_STRIP_GATE(0x806DEF44, &lit_5984); #pragma pop /* 806DEF48-806DEF4C 000110 0004+00 0/1 0/0 0/0 .rodata @5985 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5985 = 2205.0f; -COMPILER_STRIP_GATE(806DEF48, &lit_5985); +COMPILER_STRIP_GATE(0x806DEF48, &lit_5985); #pragma pop /* 806DEF4C-806DEF50 000114 0004+00 0/1 0/0 0/0 .rodata @5986 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5986 = 1078.0f; -COMPILER_STRIP_GATE(806DEF4C, &lit_5986); +COMPILER_STRIP_GATE(0x806DEF4C, &lit_5986); #pragma pop /* 806DEF50-806DEF54 000118 0004+00 0/1 0/0 0/0 .rodata @5987 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5987 = -175.0f; -COMPILER_STRIP_GATE(806DEF50, &lit_5987); +COMPILER_STRIP_GATE(0x806DEF50, &lit_5987); #pragma pop /* 806DEF54-806DEF58 00011C 0004+00 0/1 0/0 0/0 .rodata @5988 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5988 = 2246.0f; -COMPILER_STRIP_GATE(806DEF54, &lit_5988); +COMPILER_STRIP_GATE(0x806DEF54, &lit_5988); #pragma pop /* 806DEF58-806DEF5C 000120 0004+00 0/1 0/0 0/0 .rodata @5989 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5989 = 1418.0f; -COMPILER_STRIP_GATE(806DEF58, &lit_5989); +COMPILER_STRIP_GATE(0x806DEF58, &lit_5989); #pragma pop /* 806DEF5C-806DEF60 000124 0004+00 0/1 0/0 0/0 .rodata @5990 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5990 = 1100.0f; -COMPILER_STRIP_GATE(806DEF5C, &lit_5990); +COMPILER_STRIP_GATE(0x806DEF5C, &lit_5990); #pragma pop /* 806DEF60-806DEF64 000128 0004+00 0/1 0/0 0/0 .rodata @5991 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5991 = 2289.0f; -COMPILER_STRIP_GATE(806DEF60, &lit_5991); +COMPILER_STRIP_GATE(0x806DEF60, &lit_5991); #pragma pop /* 806DEF64-806DEF68 00012C 0004+00 0/1 0/0 0/0 .rodata @5992 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5992 = -1694.0f; -COMPILER_STRIP_GATE(806DEF64, &lit_5992); +COMPILER_STRIP_GATE(0x806DEF64, &lit_5992); #pragma pop /* 806DEF68-806DEF6C 000130 0004+00 0/1 0/0 0/0 .rodata @5993 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5993 = 2293.0f; -COMPILER_STRIP_GATE(806DEF68, &lit_5993); +COMPILER_STRIP_GATE(0x806DEF68, &lit_5993); #pragma pop /* 806DEF6C-806DEF70 000134 0004+00 0/1 0/0 0/0 .rodata @5994 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5994 = -1349.0f; -COMPILER_STRIP_GATE(806DEF6C, &lit_5994); +COMPILER_STRIP_GATE(0x806DEF6C, &lit_5994); #pragma pop /* 806DEF70-806DEF74 000138 0004+00 0/1 0/0 0/0 .rodata @5995 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5995 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(806DEF70, &lit_5995); +COMPILER_STRIP_GATE(0x806DEF70, &lit_5995); #pragma pop /* 806DEF74-806DEF78 00013C 0004+00 0/1 0/0 0/0 .rodata @5996 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_5996 = 0x3B03126F; -COMPILER_STRIP_GATE(806DEF74, &lit_5996); +COMPILER_STRIP_GATE(0x806DEF74, &lit_5996); #pragma pop /* 806DEF78-806DEF7C 000140 0004+00 0/1 0/0 0/0 .rodata @5997 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5997 = 3000.0f; -COMPILER_STRIP_GATE(806DEF78, &lit_5997); +COMPILER_STRIP_GATE(0x806DEF78, &lit_5997); #pragma pop /* 806DEF7C-806DEF80 000144 0004+00 0/1 0/0 0/0 .rodata @5998 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5998 = -293.0f; -COMPILER_STRIP_GATE(806DEF7C, &lit_5998); +COMPILER_STRIP_GATE(0x806DEF7C, &lit_5998); #pragma pop /* 806DEF80-806DEF84 000148 0004+00 0/1 0/0 0/0 .rodata @5999 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5999 = 279.0f; -COMPILER_STRIP_GATE(806DEF80, &lit_5999); +COMPILER_STRIP_GATE(0x806DEF80, &lit_5999); #pragma pop /* 806DEF84-806DEF88 00014C 0004+00 0/1 0/0 0/0 .rodata @6000 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6000 = 1988.0f; -COMPILER_STRIP_GATE(806DEF84, &lit_6000); +COMPILER_STRIP_GATE(0x806DEF84, &lit_6000); #pragma pop /* 806DEF88-806DEF8C 000150 0004+00 0/1 0/0 0/0 .rodata @6001 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6001 = -341.0f; -COMPILER_STRIP_GATE(806DEF88, &lit_6001); +COMPILER_STRIP_GATE(0x806DEF88, &lit_6001); #pragma pop /* 806DEF8C-806DEF90 000154 0004+00 0/2 0/0 0/0 .rodata @6002 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6002 = 24.0f; -COMPILER_STRIP_GATE(806DEF8C, &lit_6002); +COMPILER_STRIP_GATE(0x806DEF8C, &lit_6002); #pragma pop /* 806DEF90-806DEF94 000158 0004+00 0/1 0/0 0/0 .rodata @6003 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6003 = 2223.0f; -COMPILER_STRIP_GATE(806DEF90, &lit_6003); +COMPILER_STRIP_GATE(0x806DEF90, &lit_6003); #pragma pop /* 806DEF94-806DEF98 00015C 0004+00 0/1 0/0 0/0 .rodata @6004 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6004 = 37.0f / 5.0f; -COMPILER_STRIP_GATE(806DEF94, &lit_6004); +COMPILER_STRIP_GATE(0x806DEF94, &lit_6004); #pragma pop /* 806DEF98-806DEF9C 000160 0004+00 0/1 0/0 0/0 .rodata @6005 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6005 = 945.0f; -COMPILER_STRIP_GATE(806DEF98, &lit_6005); +COMPILER_STRIP_GATE(0x806DEF98, &lit_6005); #pragma pop /* 806DEF9C-806DEFA0 000164 0004+00 0/1 0/0 0/0 .rodata @6006 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6006 = 806.0f; -COMPILER_STRIP_GATE(806DEF9C, &lit_6006); +COMPILER_STRIP_GATE(0x806DEF9C, &lit_6006); #pragma pop /* 806DEFA0-806DEFA4 000168 0004+00 0/1 0/0 0/0 .rodata @6007 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6007 = -168.0f; -COMPILER_STRIP_GATE(806DEFA0, &lit_6007); +COMPILER_STRIP_GATE(0x806DEFA0, &lit_6007); #pragma pop /* 806DEFA4-806DEFA8 00016C 0004+00 0/1 0/0 0/0 .rodata @6008 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6008 = 921.0f; -COMPILER_STRIP_GATE(806DEFA4, &lit_6008); +COMPILER_STRIP_GATE(0x806DEFA4, &lit_6008); #pragma pop /* 806DEFA8-806DEFAC 000170 0004+00 0/1 0/0 0/0 .rodata @6009 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6009 = 1450.0f; -COMPILER_STRIP_GATE(806DEFA8, &lit_6009); +COMPILER_STRIP_GATE(0x806DEFA8, &lit_6009); #pragma pop /* 806DEFAC-806DEFB0 000174 0004+00 0/1 0/0 0/0 .rodata @6010 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6010 = 1.0f / 20.0f; -COMPILER_STRIP_GATE(806DEFAC, &lit_6010); +COMPILER_STRIP_GATE(0x806DEFAC, &lit_6010); #pragma pop /* 806DEFB0-806DEFB4 000178 0004+00 0/1 0/0 0/0 .rodata @6011 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_6011 = 0x3A83126F; -COMPILER_STRIP_GATE(806DEFB0, &lit_6011); +COMPILER_STRIP_GATE(0x806DEFB0, &lit_6011); #pragma pop /* 806DEFB4-806DEFB8 00017C 0004+00 0/2 0/0 0/0 .rodata @6012 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6012 = -500.0f; -COMPILER_STRIP_GATE(806DEFB4, &lit_6012); +COMPILER_STRIP_GATE(0x806DEFB4, &lit_6012); #pragma pop /* 806DEFB8-806DEFBC 000180 0004+00 0/1 0/0 0/0 .rodata @6013 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6013 = 1800.0f; -COMPILER_STRIP_GATE(806DEFB8, &lit_6013); +COMPILER_STRIP_GATE(0x806DEFB8, &lit_6013); #pragma pop /* 806DEFBC-806DEFC0 000184 0004+00 0/2 0/0 0/0 .rodata @6014 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6014 = -400.0f; -COMPILER_STRIP_GATE(806DEFBC, &lit_6014); +COMPILER_STRIP_GATE(0x806DEFBC, &lit_6014); #pragma pop /* 806DEFC0-806DEFC4 000188 0004+00 0/1 0/0 0/0 .rodata @6015 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6015 = -200.0f; -COMPILER_STRIP_GATE(806DEFC0, &lit_6015); +COMPILER_STRIP_GATE(0x806DEFC0, &lit_6015); #pragma pop /* 806DEFC4-806DEFC8 00018C 0004+00 0/1 0/0 0/0 .rodata @6016 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6016 = 250.0f; -COMPILER_STRIP_GATE(806DEFC4, &lit_6016); +COMPILER_STRIP_GATE(0x806DEFC4, &lit_6016); #pragma pop /* 806DEFC8-806DEFCC 000190 0004+00 0/2 0/0 0/0 .rodata @6017 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6017 = -5.0f; -COMPILER_STRIP_GATE(806DEFC8, &lit_6017); +COMPILER_STRIP_GATE(0x806DEFC8, &lit_6017); #pragma pop /* 806DEFCC-806DEFD0 000194 0004+00 0/1 0/0 0/0 .rodata @6018 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6018 = 306.0f; -COMPILER_STRIP_GATE(806DEFCC, &lit_6018); +COMPILER_STRIP_GATE(0x806DEFCC, &lit_6018); #pragma pop /* 806DEFD0-806DEFD4 000198 0004+00 0/1 0/0 0/0 .rodata @6019 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6019 = 1187.0f; -COMPILER_STRIP_GATE(806DEFD0, &lit_6019); +COMPILER_STRIP_GATE(0x806DEFD0, &lit_6019); #pragma pop /* 806DEFD4-806DEFD8 00019C 0004+00 0/1 0/0 0/0 .rodata @6020 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6020 = -372.0f; -COMPILER_STRIP_GATE(806DEFD4, &lit_6020); +COMPILER_STRIP_GATE(0x806DEFD4, &lit_6020); #pragma pop /* 806DEFD8-806DEFDC 0001A0 0004+00 0/1 0/0 0/0 .rodata @6021 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6021 = -2218.0f; -COMPILER_STRIP_GATE(806DEFD8, &lit_6021); +COMPILER_STRIP_GATE(0x806DEFD8, &lit_6021); #pragma pop /* 806DEFDC-806DEFE0 0001A4 0004+00 0/1 0/0 0/0 .rodata @6022 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6022 = 3100.0f; -COMPILER_STRIP_GATE(806DEFDC, &lit_6022); +COMPILER_STRIP_GATE(0x806DEFDC, &lit_6022); #pragma pop /* 806DEFE0-806DEFE4 0001A8 0004+00 0/1 0/0 0/0 .rodata @6023 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6023 = 1256.0f; -COMPILER_STRIP_GATE(806DEFE0, &lit_6023); +COMPILER_STRIP_GATE(0x806DEFE0, &lit_6023); #pragma pop /* 806DEFE4-806DEFE8 0001AC 0004+00 0/1 0/0 0/0 .rodata @6024 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6024 = -2486.0f; -COMPILER_STRIP_GATE(806DEFE4, &lit_6024); +COMPILER_STRIP_GATE(0x806DEFE4, &lit_6024); #pragma pop /* 806DEFE8-806DEFEC 0001B0 0004+00 0/1 0/0 0/0 .rodata @6025 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6025 = 3256.0f; -COMPILER_STRIP_GATE(806DEFE8, &lit_6025); +COMPILER_STRIP_GATE(0x806DEFE8, &lit_6025); #pragma pop /* 806DEFEC-806DEFF0 0001B4 0004+00 0/1 0/0 0/0 .rodata @6026 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6026 = -1.0f / 10.0f; -COMPILER_STRIP_GATE(806DEFEC, &lit_6026); +COMPILER_STRIP_GATE(0x806DEFEC, &lit_6026); #pragma pop /* 806DEFF0-806DEFF4 0001B8 0004+00 0/1 0/0 0/0 .rodata @6027 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6027 = 1150.0f; -COMPILER_STRIP_GATE(806DEFF0, &lit_6027); +COMPILER_STRIP_GATE(0x806DEFF0, &lit_6027); #pragma pop /* 806DEFF4-806DEFF8 0001BC 0004+00 0/1 0/0 0/0 .rodata @6028 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6028 = 3.0f / 100.0f; -COMPILER_STRIP_GATE(806DEFF4, &lit_6028); +COMPILER_STRIP_GATE(0x806DEFF4, &lit_6028); #pragma pop /* 806DEFF8-806DF000 0001C0 0004+04 0/1 0/0 0/0 .rodata @6029 */ @@ -1732,7 +1738,7 @@ SECTION_RODATA static f32 const lit_6029[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(806DEFF8, &lit_6029); +COMPILER_STRIP_GATE(0x806DEFF8, &lit_6029); #pragma pop /* 806DF000-806DF008 0001C8 0008+00 0/1 0/0 0/0 .rodata @6031 */ @@ -1741,7 +1747,7 @@ COMPILER_STRIP_GATE(806DEFF8, &lit_6029); SECTION_RODATA static u8 const lit_6031[8] = { 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(806DF000, &lit_6031); +COMPILER_STRIP_GATE(0x806DF000, &lit_6031); #pragma pop /* 806DC5D4-806DD800 004634 122C+00 1/1 0/0 0/0 .text demo_camera__FP11e_gob_class */ @@ -1759,105 +1765,105 @@ static asm void demo_camera(e_gob_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6340 = 21.0f; -COMPILER_STRIP_GATE(806DF008, &lit_6340); +COMPILER_STRIP_GATE(0x806DF008, &lit_6340); #pragma pop /* 806DF00C-806DF010 0001D4 0004+00 0/1 0/0 0/0 .rodata @6341 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6341 = 44.0f; -COMPILER_STRIP_GATE(806DF00C, &lit_6341); +COMPILER_STRIP_GATE(0x806DF00C, &lit_6341); #pragma pop /* 806DF010-806DF014 0001D8 0004+00 0/1 0/0 0/0 .rodata @6342 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6342 = 27.0f; -COMPILER_STRIP_GATE(806DF010, &lit_6342); +COMPILER_STRIP_GATE(0x806DF010, &lit_6342); #pragma pop /* 806DF014-806DF018 0001DC 0004+00 0/1 0/0 0/0 .rodata @6343 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6343 = 9.0f; -COMPILER_STRIP_GATE(806DF014, &lit_6343); +COMPILER_STRIP_GATE(0x806DF014, &lit_6343); #pragma pop /* 806DF018-806DF01C 0001E0 0004+00 0/1 0/0 0/0 .rodata @6344 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6344 = 18.0f; -COMPILER_STRIP_GATE(806DF018, &lit_6344); +COMPILER_STRIP_GATE(0x806DF018, &lit_6344); #pragma pop /* 806DF01C-806DF020 0001E4 0004+00 0/1 0/0 0/0 .rodata @6345 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6345 = 32.5f; -COMPILER_STRIP_GATE(806DF01C, &lit_6345); +COMPILER_STRIP_GATE(0x806DF01C, &lit_6345); #pragma pop /* 806DF020-806DF024 0001E8 0004+00 0/1 0/0 0/0 .rodata @6346 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6346 = 7.5f; -COMPILER_STRIP_GATE(806DF020, &lit_6346); +COMPILER_STRIP_GATE(0x806DF020, &lit_6346); #pragma pop /* 806DF024-806DF028 0001EC 0004+00 0/1 0/0 0/0 .rodata @6347 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6347 = 22.5f; -COMPILER_STRIP_GATE(806DF024, &lit_6347); +COMPILER_STRIP_GATE(0x806DF024, &lit_6347); #pragma pop /* 806DF028-806DF02C 0001F0 0004+00 0/1 0/0 0/0 .rodata @6348 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6348 = 29.5f; -COMPILER_STRIP_GATE(806DF028, &lit_6348); +COMPILER_STRIP_GATE(0x806DF028, &lit_6348); #pragma pop /* 806DF02C-806DF030 0001F4 0004+00 0/1 0/0 0/0 .rodata @6349 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6349 = 24.5f; -COMPILER_STRIP_GATE(806DF02C, &lit_6349); +COMPILER_STRIP_GATE(0x806DF02C, &lit_6349); #pragma pop /* 806DF030-806DF034 0001F8 0004+00 0/1 0/0 0/0 .rodata @6350 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6350 = 41.0f; -COMPILER_STRIP_GATE(806DF030, &lit_6350); +COMPILER_STRIP_GATE(0x806DF030, &lit_6350); #pragma pop /* 806DF034-806DF038 0001FC 0004+00 0/1 0/0 0/0 .rodata @6351 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6351 = 2.5f; -COMPILER_STRIP_GATE(806DF034, &lit_6351); +COMPILER_STRIP_GATE(0x806DF034, &lit_6351); #pragma pop /* 806DF038-806DF03C 000200 0004+00 0/1 0/0 0/0 .rodata @6352 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6352 = 16.0f; -COMPILER_STRIP_GATE(806DF038, &lit_6352); +COMPILER_STRIP_GATE(0x806DF038, &lit_6352); #pragma pop /* 806DF03C-806DF040 000204 0004+00 0/1 0/0 0/0 .rodata @6353 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6353 = 12000.0f; -COMPILER_STRIP_GATE(806DF03C, &lit_6353); +COMPILER_STRIP_GATE(0x806DF03C, &lit_6353); #pragma pop /* 806DF040-806DF044 000208 0004+00 0/1 0/0 0/0 .rodata @6354 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6354 = 13000.0f; -COMPILER_STRIP_GATE(806DF040, &lit_6354); +COMPILER_STRIP_GATE(0x806DF040, &lit_6354); #pragma pop /* 806DD800-806DE4B8 005860 0CB8+00 2/1 0/0 0/0 .text daE_GOB_Execute__FP11e_gob_class */ @@ -1901,28 +1907,28 @@ static asm void useHeapInit(fopAc_ac_c* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6497 = -7.0f; -COMPILER_STRIP_GATE(806DF044, &lit_6497); +COMPILER_STRIP_GATE(0x806DF044, &lit_6497); #pragma pop /* 806DF048-806DF04C 000210 0004+00 0/1 0/0 0/0 .rodata @6498 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6498 = -300.0f; -COMPILER_STRIP_GATE(806DF048, &lit_6498); +COMPILER_STRIP_GATE(0x806DF048, &lit_6498); #pragma pop /* 806DF04C-806DF050 000214 0004+00 0/1 0/0 0/0 .rodata @6499 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6499 = 2100.0f; -COMPILER_STRIP_GATE(806DF04C, &lit_6499); +COMPILER_STRIP_GATE(0x806DF04C, &lit_6499); #pragma pop /* 806DF050-806DF054 000218 0004+00 0/1 0/0 0/0 .rodata @6500 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6500 = -2180.0f; -COMPILER_STRIP_GATE(806DF050, &lit_6500); +COMPILER_STRIP_GATE(0x806DF050, &lit_6500); #pragma pop /* 806DE69C-806DEA10 0066FC 0374+00 1/0 0/0 0/0 .text daE_GOB_Create__FP10fopAc_ac_c */ @@ -1997,7 +2003,7 @@ asm void __sinit_d_a_e_gob_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_806DED18 = (void*)__sinit_d_a_e_gob_cpp; +REGISTER_CTORS(0x806DED18, __sinit_d_a_e_gob_cpp); #pragma pop /* 806DED84-806DED8C 006DE4 0008+00 1/0 0/0 0/0 .text @20@__dt__14dBgS_ObjGndChkFv */ @@ -2232,9 +2238,4 @@ static u8 data_806DF370[4]; static u8 data_806DF374[4]; #pragma pop -/* 806DF054-806DF05A 00021C 0006+00 4/4 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_806DF054 = "E_gob"; -#pragma pop +/* 806DF054-806DF054 00021C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/e/d_a_e_gs/d_a_e_gs.cpp b/rel/d/a/e/d_a_e_gs/d_a_e_gs.cpp index a81bfbdbad4..1cb13496429 100644 --- a/rel/d/a/e/d_a_e_gs/d_a_e_gs.cpp +++ b/rel/d/a/e/d_a_e_gs/d_a_e_gs.cpp @@ -28,16 +28,16 @@ struct mDoExt_invisibleModel { /* 8000E7C0 */ void entryDL(cXyz*); }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; - struct J3DAnmTransform {}; +struct J3DModelData {}; + +struct Z2Creature {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -160,27 +160,27 @@ extern "C" void __register_global_object(); /* ############################################################################################## */ /* 806DFDF4-806DFDF8 000000 0004+00 3/3 0/0 0/0 .rodata @3646 */ SECTION_RODATA static f32 const lit_3646 = 6.0f / 5.0f; -COMPILER_STRIP_GATE(806DFDF4, &lit_3646); +COMPILER_STRIP_GATE(0x806DFDF4, &lit_3646); /* 806DFDF8-806DFDFC 000004 0004+00 0/1 0/0 0/0 .rodata @3647 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3647 = 60.0f; -COMPILER_STRIP_GATE(806DFDF8, &lit_3647); +COMPILER_STRIP_GATE(0x806DFDF8, &lit_3647); #pragma pop /* 806DFDFC-806DFE00 000008 0004+00 0/1 0/0 0/0 .rodata @3648 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3648 = 30.0f; -COMPILER_STRIP_GATE(806DFDFC, &lit_3648); +COMPILER_STRIP_GATE(0x806DFDFC, &lit_3648); #pragma pop /* 806DFE00-806DFE04 00000C 0004+00 0/1 0/0 0/0 .rodata @3649 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3649 = 300.0f; -COMPILER_STRIP_GATE(806DFE00, &lit_3649); +COMPILER_STRIP_GATE(0x806DFE00, &lit_3649); #pragma pop /* 806DFE34-806DFE54 -00001 0020+00 1/0 0/0 0/0 .data l_daE_GS_Method */ @@ -230,11 +230,17 @@ SECTION_RODATA static u8 const lit_3663[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(806DFE04, &lit_3663); +COMPILER_STRIP_GATE(0x806DFE04, &lit_3663); /* 806DFE08-806DFE0C 000014 0004+00 1/1 0/0 0/0 .rodata @3664 */ SECTION_RODATA static f32 const lit_3664 = -1.0f; -COMPILER_STRIP_GATE(806DFE08, &lit_3664); +COMPILER_STRIP_GATE(0x806DFE08, &lit_3664); + +/* 806DFE2C-806DFE2C 000038 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_806DFE2C = "E_gs"; +#pragma pop /* 806DF4B4-806DF560 000134 00AC+00 1/1 0/0 0/0 .text anm_init__FP10e_gs_classifUcf */ #pragma push @@ -249,7 +255,7 @@ static asm void anm_init(e_gs_class* param_0, int param_1, f32 param_2, u8 param /* ############################################################################################## */ /* 806DFE0C-806DFE10 000018 0004+00 2/4 0/0 0/0 .rodata @3687 */ SECTION_RODATA static f32 const lit_3687 = 1.0f; -COMPILER_STRIP_GATE(806DFE0C, &lit_3687); +COMPILER_STRIP_GATE(0x806DFE0C, &lit_3687); /* 806DF560-806DF660 0001E0 0100+00 1/0 0/0 0/0 .text daE_GS_Draw__FP10e_gs_class */ #pragma push @@ -266,28 +272,28 @@ static asm void daE_GS_Draw(e_gs_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3715 = 40.0f; -COMPILER_STRIP_GATE(806DFE10, &lit_3715); +COMPILER_STRIP_GATE(0x806DFE10, &lit_3715); #pragma pop /* 806DFE14-806DFE18 000020 0004+00 0/1 0/0 0/0 .rodata @3716 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3716 = 50.0f; -COMPILER_STRIP_GATE(806DFE14, &lit_3716); +COMPILER_STRIP_GATE(0x806DFE14, &lit_3716); #pragma pop /* 806DFE18-806DFE1C 000024 0004+00 0/1 0/0 0/0 .rodata @3717 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3717 = 10.0f; -COMPILER_STRIP_GATE(806DFE18, &lit_3717); +COMPILER_STRIP_GATE(0x806DFE18, &lit_3717); #pragma pop /* 806DFE1C-806DFE20 000028 0004+00 0/1 0/0 0/0 .rodata @3718 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3718 = 20.0f; -COMPILER_STRIP_GATE(806DFE1C, &lit_3718); +COMPILER_STRIP_GATE(0x806DFE1C, &lit_3718); #pragma pop /* 806DFE98-806DFE9C 000008 0004+00 2/2 0/0 0/0 .bss None */ @@ -324,7 +330,7 @@ static asm void action(e_gs_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3789 = 255.0f; -COMPILER_STRIP_GATE(806DFE20, &lit_3789); +COMPILER_STRIP_GATE(0x806DFE20, &lit_3789); #pragma pop /* 806DF874-806DFA48 0004F4 01D4+00 2/1 0/0 0/0 .text daE_GS_Execute__FP10e_gs_class */ @@ -365,11 +371,11 @@ static asm void useHeapInit(fopAc_ac_c* param_0) { /* ############################################################################################## */ /* 806DFE24-806DFE28 000030 0004+00 1/1 0/0 0/0 .rodata @3893 */ SECTION_RODATA static f32 const lit_3893 = -200.0f; -COMPILER_STRIP_GATE(806DFE24, &lit_3893); +COMPILER_STRIP_GATE(0x806DFE24, &lit_3893); /* 806DFE28-806DFE2C 000034 0004+00 1/1 0/0 0/0 .rodata @3894 */ SECTION_RODATA static f32 const lit_3894 = 200.0f; -COMPILER_STRIP_GATE(806DFE28, &lit_3894); +COMPILER_STRIP_GATE(0x806DFE28, &lit_3894); /* 806DFC00-806DFD5C 000880 015C+00 1/0 0/0 0/0 .text daE_GS_Create__FP10fopAc_ac_c */ #pragma push @@ -403,12 +409,7 @@ asm void __sinit_d_a_e_gs_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_806DFDA4 = (void*)__sinit_d_a_e_gs_cpp; +REGISTER_CTORS(0x806DFDA4, __sinit_d_a_e_gs_cpp); #pragma pop -/* 806DFE2C-806DFE31 000038 0005+00 4/4 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_806DFE2C = "E_gs"; -#pragma pop +/* 806DFE2C-806DFE2C 000038 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/e/d_a_e_hb/d_a_e_hb.cpp b/rel/d/a/e/d_a_e_hb/d_a_e_hb.cpp index 17d302a0ab8..67c3b8eee4d 100644 --- a/rel/d/a/e/d_a_e_hb/d_a_e_hb.cpp +++ b/rel/d/a/e/d_a_e_hb/d_a_e_hb.cpp @@ -19,16 +19,16 @@ struct mDoMtx_stack_c { static u8 now[48]; }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; - struct J3DAnmTransform {}; +struct J3DModelData {}; + +struct Z2Creature {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -53,11 +53,11 @@ struct mDoExt_3DlineMatSortPacket { /* 80014738 */ void setMat(mDoExt_3DlineMat_c*); }; -struct dKy_tevstr_c {}; +struct ResTIMG {}; struct _GXColor {}; -struct ResTIMG {}; +struct dKy_tevstr_c {}; struct mDoExt_3DlineMat1_c { /* 80013360 */ void init(u16, u16, ResTIMG*, int); @@ -454,7 +454,7 @@ extern "C" void __register_global_object(); /* ############################################################################################## */ /* 80500B04-80500B08 000000 0004+00 16/16 0/0 0/0 .rodata @3788 */ SECTION_RODATA static f32 const lit_3788 = 100.0f; -COMPILER_STRIP_GATE(80500B04, &lit_3788); +COMPILER_STRIP_GATE(0x80500B04, &lit_3788); /* 80500B08-80500B0C 000004 0004+00 4/18 0/0 0/0 .rodata @3789 */ SECTION_RODATA static u8 const lit_3789[4] = { @@ -463,7 +463,7 @@ SECTION_RODATA static u8 const lit_3789[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80500B08, &lit_3789); +COMPILER_STRIP_GATE(0x80500B08, &lit_3789); /* 80500B0C-80500B14 000008 0004+04 3/15 0/0 0/0 .rodata @3790 */ SECTION_RODATA static f32 const lit_3790[1 + 1 /* padding */] = { @@ -471,7 +471,7 @@ SECTION_RODATA static f32 const lit_3790[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80500B0C, &lit_3790); +COMPILER_STRIP_GATE(0x80500B0C, &lit_3790); /* 80500B14-80500B1C 000010 0008+00 0/5 0/0 0/0 .rodata @3791 */ #pragma push @@ -479,7 +479,7 @@ COMPILER_STRIP_GATE(80500B0C, &lit_3790); SECTION_RODATA static u8 const lit_3791[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80500B14, &lit_3791); +COMPILER_STRIP_GATE(0x80500B14, &lit_3791); #pragma pop /* 80500B1C-80500B24 000018 0008+00 0/5 0/0 0/0 .rodata @3792 */ @@ -488,7 +488,7 @@ COMPILER_STRIP_GATE(80500B14, &lit_3791); SECTION_RODATA static u8 const lit_3792[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80500B1C, &lit_3792); +COMPILER_STRIP_GATE(0x80500B1C, &lit_3792); #pragma pop /* 80500B24-80500B2C 000020 0008+00 0/5 0/0 0/0 .rodata @3793 */ @@ -497,19 +497,19 @@ COMPILER_STRIP_GATE(80500B1C, &lit_3792); SECTION_RODATA static u8 const lit_3793[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80500B24, &lit_3793); +COMPILER_STRIP_GATE(0x80500B24, &lit_3793); #pragma pop /* 80500B2C-80500B30 000028 0004+00 0/1 0/0 0/0 .rodata @3794 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3794 = 1.0f / 100.0f; -COMPILER_STRIP_GATE(80500B2C, &lit_3794); +COMPILER_STRIP_GATE(0x80500B2C, &lit_3794); #pragma pop /* 80500B30-80500B34 00002C 0004+00 1/4 0/0 0/0 .rodata @3809 */ SECTION_RODATA static f32 const lit_3809 = 0.5f; -COMPILER_STRIP_GATE(80500B30, &lit_3809); +COMPILER_STRIP_GATE(0x80500B30, &lit_3809); /* 80500C3C-80500C48 000000 000C+00 2/2 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { @@ -757,7 +757,13 @@ asm daE_HB_HIO_c::daE_HB_HIO_c() { /* ############################################################################################## */ /* 80500B34-80500B38 000030 0004+00 2/3 0/0 0/0 .rodata @3823 */ SECTION_RODATA static f32 const lit_3823 = -1.0f; -COMPILER_STRIP_GATE(80500B34, &lit_3823); +COMPILER_STRIP_GATE(0x80500B34, &lit_3823); + +/* 80500C34-80500C34 000130 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80500C34 = "E_hb"; +#pragma pop /* 804FBDB8-804FBE64 000138 00AC+00 8/8 0/0 0/0 .text anm_init__FP10e_hb_classifUcf */ #pragma push @@ -786,14 +792,14 @@ static asm void leaf_anm_init(e_hb_class* param_0, int param_1, f32 param_2, u8 #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3870 = 50.0f; -COMPILER_STRIP_GATE(80500B38, &lit_3870); +COMPILER_STRIP_GATE(0x80500B38, &lit_3870); #pragma pop /* 80500B3C-80500B40 000038 0004+00 0/1 0/0 0/0 .rodata @3871 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3871 = 600.0f; -COMPILER_STRIP_GATE(80500B3C, &lit_3871); +COMPILER_STRIP_GATE(0x80500B3C, &lit_3871); #pragma pop /* 804FBF3C-804FC0C0 0002BC 0184+00 1/0 0/0 0/0 .text daE_HB_Draw__FP10e_hb_class */ @@ -831,70 +837,70 @@ static asm void damage_check(e_hb_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4035 = 10.0f; -COMPILER_STRIP_GATE(80500B40, &lit_4035); +COMPILER_STRIP_GATE(0x80500B40, &lit_4035); #pragma pop /* 80500B44-80500B48 000040 0004+00 0/2 0/0 0/0 .rodata @4036 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4036 = -170.0f; -COMPILER_STRIP_GATE(80500B44, &lit_4036); +COMPILER_STRIP_GATE(0x80500B44, &lit_4036); #pragma pop /* 80500B48-80500B4C 000044 0004+00 0/4 0/0 0/0 .rodata @4037 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4037 = 170.0f; -COMPILER_STRIP_GATE(80500B48, &lit_4037); +COMPILER_STRIP_GATE(0x80500B48, &lit_4037); #pragma pop /* 80500B4C-80500B50 000048 0004+00 0/4 0/0 0/0 .rodata @4038 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4038 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(80500B4C, &lit_4038); +COMPILER_STRIP_GATE(0x80500B4C, &lit_4038); #pragma pop /* 80500B50-80500B54 00004C 0004+00 0/6 0/0 0/0 .rodata @4039 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4039 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(80500B50, &lit_4039); +COMPILER_STRIP_GATE(0x80500B50, &lit_4039); #pragma pop /* 80500B54-80500B58 000050 0004+00 0/5 0/0 0/0 .rodata @4040 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4040 = 20.0f; -COMPILER_STRIP_GATE(80500B54, &lit_4040); +COMPILER_STRIP_GATE(0x80500B54, &lit_4040); #pragma pop /* 80500B58-80500B5C 000054 0004+00 0/1 0/0 0/0 .rodata @4041 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4041 = 4.0f; -COMPILER_STRIP_GATE(80500B58, &lit_4041); +COMPILER_STRIP_GATE(0x80500B58, &lit_4041); #pragma pop /* 80500B5C-80500B60 000058 0004+00 0/1 0/0 0/0 .rodata @4042 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4042 = 2.0f / 5.0f; -COMPILER_STRIP_GATE(80500B5C, &lit_4042); +COMPILER_STRIP_GATE(0x80500B5C, &lit_4042); #pragma pop /* 80500B60-80500B64 00005C 0004+00 0/1 0/0 0/0 .rodata @4043 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4043 = 1.0f / 50.0f; -COMPILER_STRIP_GATE(80500B60, &lit_4043); +COMPILER_STRIP_GATE(0x80500B60, &lit_4043); #pragma pop /* 80500B64-80500B68 000060 0004+00 0/7 0/0 0/0 .rodata @4044 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4044 = 1.0f / 20.0f; -COMPILER_STRIP_GATE(80500B64, &lit_4044); +COMPILER_STRIP_GATE(0x80500B64, &lit_4044); #pragma pop /* 80500E60-80500E64 000008 0004+00 2/2 0/0 0/0 .bss None */ @@ -921,7 +927,7 @@ static asm void e_hb_stay(e_hb_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4078 = 30.0f; -COMPILER_STRIP_GATE(80500B68, &lit_4078); +COMPILER_STRIP_GATE(0x80500B68, &lit_4078); #pragma pop /* 804FC85C-804FCB1C 000BDC 02C0+00 1/1 0/0 0/0 .text e_hb_appear__FP10e_hb_class */ @@ -937,41 +943,41 @@ static asm void e_hb_appear(e_hb_class* param_0) { /* ############################################################################################## */ /* 80500B6C-80500B70 000068 0004+00 1/5 0/0 0/0 .rodata @4108 */ SECTION_RODATA static f32 const lit_4108 = 5.0f; -COMPILER_STRIP_GATE(80500B6C, &lit_4108); +COMPILER_STRIP_GATE(0x80500B6C, &lit_4108); /* 80500B70-80500B74 00006C 0004+00 0/3 0/0 0/0 .rodata @4109 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4109 = 15.0f; -COMPILER_STRIP_GATE(80500B70, &lit_4109); +COMPILER_STRIP_GATE(0x80500B70, &lit_4109); #pragma pop /* 80500B74-80500B78 000070 0004+00 0/3 0/0 0/0 .rodata @4110 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4110 = 60.0f; -COMPILER_STRIP_GATE(80500B74, &lit_4110); +COMPILER_STRIP_GATE(0x80500B74, &lit_4110); #pragma pop /* 80500B78-80500B7C 000074 0004+00 0/3 0/0 0/0 .rodata @4111 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4111 = 40.0f; -COMPILER_STRIP_GATE(80500B78, &lit_4111); +COMPILER_STRIP_GATE(0x80500B78, &lit_4111); #pragma pop /* 80500B7C-80500B80 000078 0004+00 0/2 0/0 0/0 .rodata @4112 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4112 = 400.0f; -COMPILER_STRIP_GATE(80500B7C, &lit_4112); +COMPILER_STRIP_GATE(0x80500B7C, &lit_4112); #pragma pop /* 80500B80-80500B84 00007C 0004+00 0/1 0/0 0/0 .rodata @4113 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4113 = 3.0f / 20.0f; -COMPILER_STRIP_GATE(80500B80, &lit_4113); +COMPILER_STRIP_GATE(0x80500B80, &lit_4113); #pragma pop /* 804FCB1C-804FCCE8 000E9C 01CC+00 1/1 0/0 0/0 .text e_hb_appear_v__FP10e_hb_class */ @@ -989,28 +995,28 @@ static asm void e_hb_appear_v(e_hb_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4206 = 0.75f; -COMPILER_STRIP_GATE(80500B84, &lit_4206); +COMPILER_STRIP_GATE(0x80500B84, &lit_4206); #pragma pop /* 80500B88-80500B8C 000084 0004+00 0/1 0/0 0/0 .rodata @4207 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4207 = 90.0f; -COMPILER_STRIP_GATE(80500B88, &lit_4207); +COMPILER_STRIP_GATE(0x80500B88, &lit_4207); #pragma pop /* 80500B8C-80500B90 000088 0004+00 0/2 0/0 0/0 .rodata @4208 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4208 = -100.0f; -COMPILER_STRIP_GATE(80500B8C, &lit_4208); +COMPILER_STRIP_GATE(0x80500B8C, &lit_4208); #pragma pop /* 80500B90-80500B94 00008C 0004+00 0/1 0/0 0/0 .rodata @4209 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4209 = 3.0f / 10.0f; -COMPILER_STRIP_GATE(80500B90, &lit_4209); +COMPILER_STRIP_GATE(0x80500B90, &lit_4209); #pragma pop /* 80500B94-80500B9C 000090 0004+04 0/1 0/0 0/0 .rodata @4210 */ @@ -1021,14 +1027,14 @@ SECTION_RODATA static f32 const lit_4210[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80500B94, &lit_4210); +COMPILER_STRIP_GATE(0x80500B94, &lit_4210); #pragma pop /* 80500B9C-80500BA4 000098 0008+00 1/3 0/0 0/0 .rodata @4212 */ SECTION_RODATA static u8 const lit_4212[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80500B9C, &lit_4212); +COMPILER_STRIP_GATE(0x80500B9C, &lit_4212); /* 804FCCE8-804FD230 001068 0548+00 1/1 0/0 0/0 .text e_hb_wait__FP10e_hb_class */ #pragma push @@ -1045,49 +1051,49 @@ static asm void e_hb_wait(e_hb_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4405 = 350.0f; -COMPILER_STRIP_GATE(80500BA4, &lit_4405); +COMPILER_STRIP_GATE(0x80500BA4, &lit_4405); #pragma pop /* 80500BA8-80500BAC 0000A4 0004+00 0/1 0/0 0/0 .rodata @4406 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4406 = 4.0f / 5.0f; -COMPILER_STRIP_GATE(80500BA8, &lit_4406); +COMPILER_STRIP_GATE(0x80500BA8, &lit_4406); #pragma pop /* 80500BAC-80500BB0 0000A8 0004+00 0/1 0/0 0/0 .rodata @4407 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4407 = 2.0f; -COMPILER_STRIP_GATE(80500BAC, &lit_4407); +COMPILER_STRIP_GATE(0x80500BAC, &lit_4407); #pragma pop /* 80500BB0-80500BB4 0000AC 0004+00 0/1 0/0 0/0 .rodata @4408 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4408 = 2000.0f; -COMPILER_STRIP_GATE(80500BB0, &lit_4408); +COMPILER_STRIP_GATE(0x80500BB0, &lit_4408); #pragma pop /* 80500BB4-80500BB8 0000B0 0004+00 0/2 0/0 0/0 .rodata @4409 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4409 = 70.0f; -COMPILER_STRIP_GATE(80500BB4, &lit_4409); +COMPILER_STRIP_GATE(0x80500BB4, &lit_4409); #pragma pop /* 80500BB8-80500BBC 0000B4 0004+00 0/3 0/0 0/0 .rodata @4410 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4410 = -50.0f; -COMPILER_STRIP_GATE(80500BB8, &lit_4410); +COMPILER_STRIP_GATE(0x80500BB8, &lit_4410); #pragma pop /* 80500BBC-80500BC0 0000B8 0004+00 0/1 0/0 0/0 .rodata @4411 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4411 = 200.0f; -COMPILER_STRIP_GATE(80500BBC, &lit_4411); +COMPILER_STRIP_GATE(0x80500BBC, &lit_4411); #pragma pop /* 804FD230-804FDC90 0015B0 0A60+00 1/1 0/0 0/0 .text e_hb_attack__FP10e_hb_class */ @@ -1105,14 +1111,14 @@ static asm void e_hb_attack(e_hb_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4464 = 230.0f; -COMPILER_STRIP_GATE(80500BC0, &lit_4464); +COMPILER_STRIP_GATE(0x80500BC0, &lit_4464); #pragma pop /* 80500BC4-80500BC8 0000C0 0004+00 0/4 0/0 0/0 .rodata @4465 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4465 = 3.0f; -COMPILER_STRIP_GATE(80500BC4, &lit_4465); +COMPILER_STRIP_GATE(0x80500BC4, &lit_4465); #pragma pop /* 804FDC90-804FDF90 002010 0300+00 1/1 0/0 0/0 .text e_hb_chance__FP10e_hb_class */ @@ -1130,14 +1136,14 @@ static asm void e_hb_chance(e_hb_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4510 = 250.0f; -COMPILER_STRIP_GATE(80500BC8, &lit_4510); +COMPILER_STRIP_GATE(0x80500BC8, &lit_4510); #pragma pop /* 80500BCC-80500BD0 0000C8 0004+00 0/1 0/0 0/0 .rodata @4511 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4511 = 23.0f / 25.0f; -COMPILER_STRIP_GATE(80500BCC, &lit_4511); +COMPILER_STRIP_GATE(0x80500BCC, &lit_4511); #pragma pop /* 804FDF90-804FE1E8 002310 0258+00 1/1 0/0 0/0 .text e_hb_s_damage__FP10e_hb_class */ @@ -1155,21 +1161,21 @@ static asm void e_hb_s_damage(e_hb_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4588 = -20.0f; -COMPILER_STRIP_GATE(80500BD0, &lit_4588); +COMPILER_STRIP_GATE(0x80500BD0, &lit_4588); #pragma pop /* 80500BD4-80500BD8 0000D0 0004+00 0/1 0/0 0/0 .rodata @4589 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4589 = 450.0f; -COMPILER_STRIP_GATE(80500BD4, &lit_4589); +COMPILER_STRIP_GATE(0x80500BD4, &lit_4589); #pragma pop /* 80500BD8-80500BDC 0000D4 0004+00 0/1 0/0 0/0 .rodata @4590 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4590 = -1.0f / 10.0f; -COMPILER_STRIP_GATE(80500BD8, &lit_4590); +COMPILER_STRIP_GATE(0x80500BD8, &lit_4590); #pragma pop /* 804FE1E8-804FE5C8 002568 03E0+00 1/1 0/0 0/0 .text e_hb_damage__FP10e_hb_class */ @@ -1187,14 +1193,14 @@ static asm void e_hb_damage(e_hb_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4669 = -30.0f; -COMPILER_STRIP_GATE(80500BDC, &lit_4669); +COMPILER_STRIP_GATE(0x80500BDC, &lit_4669); #pragma pop /* 80500BE0-80500BE4 0000DC 0004+00 0/1 0/0 0/0 .rodata @4670 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4670 = -200.0f; -COMPILER_STRIP_GATE(80500BE0, &lit_4670); +COMPILER_STRIP_GATE(0x80500BE0, &lit_4670); #pragma pop /* 804FE5C8-804FE8F8 002948 0330+00 1/1 0/0 0/0 .text kuki_control1__FP10e_hb_class */ @@ -1220,7 +1226,7 @@ static asm void kuki_control2(e_hb_class* param_0) { /* ############################################################################################## */ /* 80500BE4-80500BE8 0000E0 0004+00 1/1 0/0 0/0 .rodata @4725 */ SECTION_RODATA static f32 const lit_4725 = 11.0f; -COMPILER_STRIP_GATE(80500BE4, &lit_4725); +COMPILER_STRIP_GATE(0x80500BE4, &lit_4725); /* 804FEA6C-804FEB48 002DEC 00DC+00 1/1 0/0 0/0 .text kuki_control3__FP10e_hb_class */ #pragma push @@ -1267,70 +1273,70 @@ static asm void eff_set(e_hb_class* param_0, int param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4821 = -10.0f; -COMPILER_STRIP_GATE(80500BE8, &lit_4821); +COMPILER_STRIP_GATE(0x80500BE8, &lit_4821); #pragma pop /* 80500BEC-80500BF0 0000E8 0004+00 0/1 0/0 0/0 .rodata @4822 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4822 = 10000.0f; -COMPILER_STRIP_GATE(80500BEC, &lit_4822); +COMPILER_STRIP_GATE(0x80500BEC, &lit_4822); #pragma pop /* 80500BF0-80500BF4 0000EC 0004+00 0/0 0/0 0/0 .rodata @4823 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4823 = 65536.0f; -COMPILER_STRIP_GATE(80500BF0, &lit_4823); +COMPILER_STRIP_GATE(0x80500BF0, &lit_4823); #pragma pop /* 80500BF4-80500BF8 0000F0 0004+00 0/0 0/0 0/0 .rodata @4824 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4824 = -5.0f; -COMPILER_STRIP_GATE(80500BF4, &lit_4824); +COMPILER_STRIP_GATE(0x80500BF4, &lit_4824); #pragma pop /* 80500BF8-80500BFC 0000F4 0004+00 0/0 0/0 0/0 .rodata @4963 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4963 = 25.0f; -COMPILER_STRIP_GATE(80500BF8, &lit_4963); +COMPILER_STRIP_GATE(0x80500BF8, &lit_4963); #pragma pop /* 80500BFC-80500C00 0000F8 0004+00 0/1 0/0 0/0 .rodata @4964 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4964 = -30000.0f; -COMPILER_STRIP_GATE(80500BFC, &lit_4964); +COMPILER_STRIP_GATE(0x80500BFC, &lit_4964); #pragma pop /* 80500C00-80500C04 0000FC 0004+00 0/0 0/0 0/0 .rodata @4965 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4965 = 300000.0f; -COMPILER_STRIP_GATE(80500C00, &lit_4965); +COMPILER_STRIP_GATE(0x80500C00, &lit_4965); #pragma pop /* 80500C04-80500C08 000100 0004+00 0/0 0/0 0/0 .rodata @4966 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4966 = 30000.0f; -COMPILER_STRIP_GATE(80500C04, &lit_4966); +COMPILER_STRIP_GATE(0x80500C04, &lit_4966); #pragma pop /* 80500C08-80500C0C 000104 0004+00 0/1 0/0 0/0 .rodata @5136 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5136 = 22.0f; -COMPILER_STRIP_GATE(80500C08, &lit_5136); +COMPILER_STRIP_GATE(0x80500C08, &lit_5136); #pragma pop /* 80500C0C-80500C10 000108 0004+00 0/1 0/0 0/0 .rodata @5137 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5137 = 21.0f; -COMPILER_STRIP_GATE(80500C0C, &lit_5137); +COMPILER_STRIP_GATE(0x80500C0C, &lit_5137); #pragma pop /* 804FF5DC-804FF744 00395C 0168+00 1/1 0/0 0/0 .text anm_se_set__FP10e_hb_class */ @@ -1348,7 +1354,7 @@ static asm void anm_se_set(e_hb_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5234 = -20000.0f; -COMPILER_STRIP_GATE(80500C10, &lit_5234); +COMPILER_STRIP_GATE(0x80500C10, &lit_5234); #pragma pop /* 804FF744-804FFAFC 003AC4 03B8+00 2/1 0/0 0/0 .text daE_HB_Execute__FP10e_hb_class */ @@ -1391,28 +1397,28 @@ static asm void useHeapInit(fopAc_ac_c* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5440 = 500.0f; -COMPILER_STRIP_GATE(80500C14, &lit_5440); +COMPILER_STRIP_GATE(0x80500C14, &lit_5440); #pragma pop /* 80500C18-80500C1C 000114 0004+00 0/1 0/0 0/0 .rodata @5441 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5441 = -300.0f; -COMPILER_STRIP_GATE(80500C18, &lit_5441); +COMPILER_STRIP_GATE(0x80500C18, &lit_5441); #pragma pop /* 80500C1C-80500C20 000118 0004+00 0/1 0/0 0/0 .rodata @5442 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5442 = -400.0f; -COMPILER_STRIP_GATE(80500C1C, &lit_5442); +COMPILER_STRIP_GATE(0x80500C1C, &lit_5442); #pragma pop /* 80500C20-80500C24 00011C 0004+00 0/1 0/0 0/0 .rodata @5443 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5443 = 300.0f; -COMPILER_STRIP_GATE(80500C20, &lit_5443); +COMPILER_STRIP_GATE(0x80500C20, &lit_5443); #pragma pop /* 80500C24-80500C2C 000120 0004+04 0/1 0/0 0/0 .rodata @5444 */ @@ -1423,7 +1429,7 @@ SECTION_RODATA static f32 const lit_5444[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80500C24, &lit_5444); +COMPILER_STRIP_GATE(0x80500C24, &lit_5444); #pragma pop /* 80500C2C-80500C34 000128 0008+00 0/1 0/0 0/0 .rodata @5446 */ @@ -1432,7 +1438,7 @@ COMPILER_STRIP_GATE(80500C24, &lit_5444); SECTION_RODATA static u8 const lit_5446[8] = { 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80500C2C, &lit_5446); +COMPILER_STRIP_GATE(0x80500C2C, &lit_5446); #pragma pop /* 804FFD60-80500264 0040E0 0504+00 1/0 0/0 0/0 .text daE_HB_Create__FP10fopAc_ac_c */ @@ -1557,7 +1563,7 @@ asm void __sinit_d_a_e_hb_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80500618 = (void*)__sinit_d_a_e_hb_cpp; +REGISTER_CTORS(0x80500618, __sinit_d_a_e_hb_cpp); #pragma pop /* 80500654-8050065C 0049D4 0008+00 1/0 0/0 0/0 .text @36@__dt__12dBgS_ObjAcchFv */ @@ -1612,9 +1618,4 @@ asm cXyz::~cXyz() { } #pragma pop -/* 80500C34-80500C39 000130 0005+00 5/5 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80500C34 = "E_hb"; -#pragma pop +/* 80500C34-80500C34 000130 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/e/d_a_e_hb_leaf/d_a_e_hb_leaf.cpp b/rel/d/a/e/d_a_e_hb_leaf/d_a_e_hb_leaf.cpp index f3dc4e585ab..4941ea7294a 100644 --- a/rel/d/a/e/d_a_e_hb_leaf/d_a_e_hb_leaf.cpp +++ b/rel/d/a/e/d_a_e_hb_leaf/d_a_e_hb_leaf.cpp @@ -126,6 +126,13 @@ static bool daE_HB_LEAF_IsDelete(e_hb_leaf_class* param_0) { return true; } +/* ############################################################################################## */ +/* 806E0294-806E0294 000004 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_806E0294 = "E_HB"; +#pragma pop + /* 806E00A8-806E00D8 0001C8 0030+00 1/0 0/0 0/0 .text daE_HB_LEAF_Delete__FP15e_hb_leaf_class */ #pragma push #pragma optimization_level 0 @@ -139,7 +146,7 @@ static asm void daE_HB_LEAF_Delete(e_hb_leaf_class* param_0) { /* ############################################################################################## */ /* 806E0290-806E0294 000000 0004+00 1/1 0/0 0/0 .rodata @3690 */ SECTION_RODATA static f32 const lit_3690 = 1.0f; -COMPILER_STRIP_GATE(806E0290, &lit_3690); +COMPILER_STRIP_GATE(0x806E0290, &lit_3690); /* 806E00D8-806E01D8 0001F8 0100+00 1/1 0/0 0/0 .text useHeapInit__FP10fopAc_ac_c */ #pragma push @@ -185,9 +192,4 @@ SECTION_DATA extern void* g_profile_E_HB_LEAF[12] = { (void*)0x00040000, (void*)NULL, }; -/* 806E0294-806E0299 000004 0005+00 3/3 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_806E0294 = "E_HB"; -#pragma pop +/* 806E0294-806E0294 000004 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/e/d_a_e_hm/d_a_e_hm.cpp b/rel/d/a/e/d_a_e_hm/d_a_e_hm.cpp index 1e50c2054d3..e942f0ee910 100644 --- a/rel/d/a/e/d_a_e_hm/d_a_e_hm.cpp +++ b/rel/d/a/e/d_a_e_hm/d_a_e_hm.cpp @@ -52,16 +52,16 @@ struct mDoExt_baseAnm { /* 8000D428 */ void play(); }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; - struct J3DAnmTransform {}; +struct J3DModelData {}; + +struct Z2Creature {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -89,10 +89,10 @@ struct daPy_py_c { static u8 m_midnaActor[4]; }; -struct J3DJoint {}; - struct J3DModel {}; +struct J3DJoint {}; + struct daE_HM_c { /* 806E043C */ void CreateHeap(); /* 806E06C0 */ void initCcCylinder(); @@ -537,7 +537,7 @@ extern "C" void __register_global_object(); /* ############################################################################################## */ /* 806E5920-806E5924 000000 0004+00 32/32 0/0 0/0 .rodata @3791 */ SECTION_RODATA static f32 const lit_3791 = 100.0f; -COMPILER_STRIP_GATE(806E5920, &lit_3791); +COMPILER_STRIP_GATE(0x806E5920, &lit_3791); /* 806E5924-806E5928 000004 0004+00 1/26 0/0 0/0 .rodata @3792 */ SECTION_RODATA static u8 const lit_3792[4] = { @@ -546,7 +546,7 @@ SECTION_RODATA static u8 const lit_3792[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(806E5924, &lit_3792); +COMPILER_STRIP_GATE(0x806E5924, &lit_3792); /* 806E5928-806E5930 000008 0004+04 4/22 0/0 0/0 .rodata @3793 */ SECTION_RODATA static f32 const lit_3793[1 + 1 /* padding */] = { @@ -554,7 +554,7 @@ SECTION_RODATA static f32 const lit_3793[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(806E5928, &lit_3793); +COMPILER_STRIP_GATE(0x806E5928, &lit_3793); /* 806E5930-806E5938 000010 0008+00 0/7 0/0 0/0 .rodata @3794 */ #pragma push @@ -562,7 +562,7 @@ COMPILER_STRIP_GATE(806E5928, &lit_3793); SECTION_RODATA static u8 const lit_3794[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(806E5930, &lit_3794); +COMPILER_STRIP_GATE(0x806E5930, &lit_3794); #pragma pop /* 806E5938-806E5940 000018 0008+00 0/7 0/0 0/0 .rodata @3795 */ @@ -571,7 +571,7 @@ COMPILER_STRIP_GATE(806E5930, &lit_3794); SECTION_RODATA static u8 const lit_3795[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(806E5938, &lit_3795); +COMPILER_STRIP_GATE(0x806E5938, &lit_3795); #pragma pop /* 806E5940-806E5948 000020 0008+00 0/7 0/0 0/0 .rodata @3796 */ @@ -580,49 +580,49 @@ COMPILER_STRIP_GATE(806E5938, &lit_3795); SECTION_RODATA static u8 const lit_3796[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(806E5940, &lit_3796); +COMPILER_STRIP_GATE(0x806E5940, &lit_3796); #pragma pop /* 806E5948-806E594C 000028 0004+00 0/1 0/0 0/0 .rodata @3797 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3797 = 1.0f / 100.0f; -COMPILER_STRIP_GATE(806E5948, &lit_3797); +COMPILER_STRIP_GATE(0x806E5948, &lit_3797); #pragma pop /* 806E594C-806E5950 00002C 0004+00 0/1 0/0 0/0 .rodata @3812 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3812 = 600.0f; -COMPILER_STRIP_GATE(806E594C, &lit_3812); +COMPILER_STRIP_GATE(0x806E594C, &lit_3812); #pragma pop /* 806E5950-806E5954 000030 0004+00 0/1 0/0 0/0 .rodata @3813 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3813 = -16.0f; -COMPILER_STRIP_GATE(806E5950, &lit_3813); +COMPILER_STRIP_GATE(0x806E5950, &lit_3813); #pragma pop /* 806E5954-806E5958 000034 0004+00 0/1 0/0 0/0 .rodata @3814 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3814 = 44.0f; -COMPILER_STRIP_GATE(806E5954, &lit_3814); +COMPILER_STRIP_GATE(0x806E5954, &lit_3814); #pragma pop /* 806E5958-806E595C 000038 0004+00 0/4 0/0 0/0 .rodata @3815 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3815 = -9.0f; -COMPILER_STRIP_GATE(806E5958, &lit_3815); +COMPILER_STRIP_GATE(0x806E5958, &lit_3815); #pragma pop /* 806E595C-806E5960 00003C 0004+00 0/1 0/0 0/0 .rodata @3816 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3816 = 11.0f / 10.0f; -COMPILER_STRIP_GATE(806E595C, &lit_3816); +COMPILER_STRIP_GATE(0x806E595C, &lit_3816); #pragma pop /* 806E5A7C-806E5A88 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ @@ -802,6 +802,13 @@ asm daE_HM_HIO_c::daE_HM_HIO_c() { } #pragma pop +/* ############################################################################################## */ +/* 806E5A74-806E5A74 000154 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_806E5A74 = "E_HM"; +#pragma pop + /* 806E043C-806E0658 00013C 021C+00 1/1 0/0 0/0 .text CreateHeap__8daE_HM_cFv */ #pragma push #pragma optimization_level 0 @@ -840,7 +847,7 @@ SECTION_RODATA static u8 const ccShpSrc[64] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0x48, 0x00, 0x00, }; -COMPILER_STRIP_GATE(806E5960, &ccShpSrc); +COMPILER_STRIP_GATE(0x806E5960, &ccShpSrc); /* 806E06C0-806E074C 0003C0 008C+00 1/1 0/0 0/0 .text initCcCylinder__8daE_HM_cFv */ #pragma push @@ -855,7 +862,7 @@ asm void daE_HM_c::initCcCylinder() { /* ############################################################################################## */ /* 806E59A0-806E59A4 000080 0004+00 2/8 0/0 0/0 .rodata @3923 */ SECTION_RODATA static f32 const lit_3923 = 50.0f; -COMPILER_STRIP_GATE(806E59A0, &lit_3923); +COMPILER_STRIP_GATE(0x806E59A0, &lit_3923); /* 806E074C-806E0880 00044C 0134+00 1/1 0/0 0/0 .text setCcCylinder__8daE_HM_cFv */ #pragma push @@ -882,49 +889,49 @@ static asm void other_bg_check(daE_HM_c* param_0, fopAc_ac_c* param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4016 = 6.0f; -COMPILER_STRIP_GATE(806E59A4, &lit_4016); +COMPILER_STRIP_GATE(0x806E59A4, &lit_4016); #pragma pop /* 806E59A8-806E59AC 000088 0004+00 0/0 0/0 0/0 .rodata @4017 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4017 = -8.0f; -COMPILER_STRIP_GATE(806E59A8, &lit_4017); +COMPILER_STRIP_GATE(0x806E59A8, &lit_4017); #pragma pop /* 806E59AC-806E59B0 00008C 0004+00 0/0 0/0 0/0 .rodata @4018 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4018 = -13.0f; -COMPILER_STRIP_GATE(806E59AC, &lit_4018); +COMPILER_STRIP_GATE(0x806E59AC, &lit_4018); #pragma pop /* 806E59B0-806E59B4 000090 0004+00 0/0 0/0 0/0 .rodata @4019 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4019 = -14.0f; -COMPILER_STRIP_GATE(806E59B0, &lit_4019); +COMPILER_STRIP_GATE(0x806E59B0, &lit_4019); #pragma pop /* 806E59B4-806E59B8 000094 0004+00 0/0 0/0 0/0 .rodata @4020 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4020 = -4.0f; -COMPILER_STRIP_GATE(806E59B4, &lit_4020); +COMPILER_STRIP_GATE(0x806E59B4, &lit_4020); #pragma pop /* 806E59B8-806E59BC 000098 0004+00 0/0 0/0 0/0 .rodata @4021 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4021 = -5.0f; -COMPILER_STRIP_GATE(806E59B8, &lit_4021); +COMPILER_STRIP_GATE(0x806E59B8, &lit_4021); #pragma pop /* 806E59BC-806E59C0 00009C 0004+00 0/0 0/0 0/0 .rodata @4022 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4022 = -11.0f; -COMPILER_STRIP_GATE(806E59BC, &lit_4022); +COMPILER_STRIP_GATE(0x806E59BC, &lit_4022); #pragma pop /* 806E59C0-806E59C8 0000A0 0004+04 0/0 0/0 0/0 .rodata @4023 */ @@ -935,7 +942,7 @@ SECTION_RODATA static f32 const lit_4023[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(806E59C0, &lit_4023); +COMPILER_STRIP_GATE(0x806E59C0, &lit_4023); #pragma pop /* 806E59C8-806E59D0 0000A8 0008+00 0/2 0/0 0/0 .rodata @4026 */ @@ -944,7 +951,7 @@ COMPILER_STRIP_GATE(806E59C0, &lit_4023); SECTION_RODATA static u8 const lit_4026[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(806E59C8, &lit_4026); +COMPILER_STRIP_GATE(0x806E59C8, &lit_4026); #pragma pop /* 806E0958-806E0D64 000658 040C+00 3/1 0/0 0/0 .text ctrlJoint__8daE_HM_cFP8J3DJointP8J3DModel */ @@ -980,7 +987,7 @@ asm void daE_HM_c::Particle_Set(u32& param_0, u16 param_1) { /* ############################################################################################## */ /* 806E59D0-806E59D4 0000B0 0004+00 1/2 0/0 0/0 .rodata @4079 */ SECTION_RODATA static f32 const lit_4079 = -1.0f; -COMPILER_STRIP_GATE(806E59D0, &lit_4079); +COMPILER_STRIP_GATE(0x806E59D0, &lit_4079); /* 806E0E8C-806E0F38 000B8C 00AC+00 12/12 0/0 0/0 .text SetAnm__8daE_HM_cFiiff */ #pragma push @@ -1008,21 +1015,21 @@ asm void daE_HM_c::W_TargetAngle(cXyz param_0, cXyz param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4134 = 20.0f; -COMPILER_STRIP_GATE(806E59D4, &lit_4134); +COMPILER_STRIP_GATE(0x806E59D4, &lit_4134); #pragma pop /* 806E59D8-806E59DC 0000B8 0004+00 0/1 0/0 0/0 .rodata @4135 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4135 = -20.0f; -COMPILER_STRIP_GATE(806E59D8, &lit_4135); +COMPILER_STRIP_GATE(0x806E59D8, &lit_4135); #pragma pop /* 806E59DC-806E59E0 0000BC 0004+00 0/6 0/0 0/0 .rodata @4136 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4136 = 10.0f; -COMPILER_STRIP_GATE(806E59DC, &lit_4136); +COMPILER_STRIP_GATE(0x806E59DC, &lit_4136); #pragma pop /* 806E0FF4-806E1118 000CF4 0124+00 1/1 0/0 0/0 .text W_DeathSpSet__8daE_HM_cFv */ @@ -1040,61 +1047,61 @@ asm void daE_HM_c::W_DeathSpSet() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4317 = 2.0f; -COMPILER_STRIP_GATE(806E59E0, &lit_4317); +COMPILER_STRIP_GATE(0x806E59E0, &lit_4317); #pragma pop /* 806E59E4-806E59E8 0000C4 0004+00 0/3 0/0 0/0 .rodata @4318 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4318 = 4.0f / 5.0f; -COMPILER_STRIP_GATE(806E59E4, &lit_4318); +COMPILER_STRIP_GATE(0x806E59E4, &lit_4318); #pragma pop /* 806E59E8-806E59EC 0000C8 0004+00 0/1 0/0 0/0 .rodata @4379 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4379 = 768.0f; -COMPILER_STRIP_GATE(806E59E8, &lit_4379); +COMPILER_STRIP_GATE(0x806E59E8, &lit_4379); #pragma pop /* 806E59EC-806E59F0 0000CC 0004+00 0/6 0/0 0/0 .rodata @4380 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4380 = 30.0f; -COMPILER_STRIP_GATE(806E59EC, &lit_4380); +COMPILER_STRIP_GATE(0x806E59EC, &lit_4380); #pragma pop /* 806E59F0-806E59F4 0000D0 0004+00 0/4 0/0 0/0 .rodata @4381 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4381 = 1.0f / 25.0f; -COMPILER_STRIP_GATE(806E59F0, &lit_4381); +COMPILER_STRIP_GATE(0x806E59F0, &lit_4381); #pragma pop /* 806E59F4-806E59F8 0000D4 0004+00 0/1 0/0 0/0 .rodata @4382 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4382 = -6.0f; -COMPILER_STRIP_GATE(806E59F4, &lit_4382); +COMPILER_STRIP_GATE(0x806E59F4, &lit_4382); #pragma pop /* 806E59F8-806E59FC 0000D8 0004+00 0/1 0/0 0/0 .rodata @4383 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4383 = -1.0f / 5.0f; -COMPILER_STRIP_GATE(806E59F8, &lit_4383); +COMPILER_STRIP_GATE(0x806E59F8, &lit_4383); #pragma pop /* 806E59FC-806E5A00 0000DC 0004+00 0/3 0/0 0/0 .rodata @4384 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4384 = 15.0f; -COMPILER_STRIP_GATE(806E59FC, &lit_4384); +COMPILER_STRIP_GATE(0x806E59FC, &lit_4384); #pragma pop /* 806E5A00-806E5A04 0000E0 0004+00 1/10 0/0 0/0 .rodata @4385 */ SECTION_RODATA static f32 const lit_4385 = 5.0f; -COMPILER_STRIP_GATE(806E5A00, &lit_4385); +COMPILER_STRIP_GATE(0x806E5A00, &lit_4385); /* 806E1118-806E1370 000E18 0258+00 1/1 0/0 0/0 .text W_DeathAction__8daE_HM_cFv */ #pragma push @@ -1121,14 +1128,14 @@ asm void daE_HM_c::W_DeathMotion() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4523 = 3.0f; -COMPILER_STRIP_GATE(806E5A04, &lit_4523); +COMPILER_STRIP_GATE(0x806E5A04, &lit_4523); #pragma pop /* 806E5A08-806E5A0C 0000E8 0004+00 0/2 0/0 0/0 .rodata @4524 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4524 = -100.0f; -COMPILER_STRIP_GATE(806E5A08, &lit_4524); +COMPILER_STRIP_GATE(0x806E5A08, &lit_4524); #pragma pop /* 806E155C-806E1858 00125C 02FC+00 2/2 0/0 0/0 .text W_MoveCheckWall__8daE_HM_cFv */ @@ -1156,21 +1163,21 @@ asm cM3dGPla::~cM3dGPla() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4572 = -300.0f; -COMPILER_STRIP_GATE(806E5A0C, &lit_4572); +COMPILER_STRIP_GATE(0x806E5A0C, &lit_4572); #pragma pop /* 806E5A10-806E5A14 0000F0 0004+00 0/4 0/0 0/0 .rodata @4573 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4573 = 300.0f; -COMPILER_STRIP_GATE(806E5A10, &lit_4573); +COMPILER_STRIP_GATE(0x806E5A10, &lit_4573); #pragma pop /* 806E5A14-806E5A18 0000F4 0004+00 0/5 0/0 0/0 .rodata @4574 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4574 = 200.0f; -COMPILER_STRIP_GATE(806E5A14, &lit_4574); +COMPILER_STRIP_GATE(0x806E5A14, &lit_4574); #pragma pop /* 806E18A0-806E1A00 0015A0 0160+00 1/1 0/0 0/0 .text W_WallCheck__8daE_HM_cFv */ @@ -1198,14 +1205,14 @@ asm void daE_HM_c::WallExecute() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4596 = -30.0f; -COMPILER_STRIP_GATE(806E5A18, &lit_4596); +COMPILER_STRIP_GATE(0x806E5A18, &lit_4596); #pragma pop /* 806E5A1C-806E5A20 0000FC 0004+00 0/1 0/0 0/0 .rodata @4619 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4619 = 1.0f / 20.0f; -COMPILER_STRIP_GATE(806E5A1C, &lit_4619); +COMPILER_STRIP_GATE(0x806E5A1C, &lit_4619); #pragma pop /* 806E1AA0-806E1B5C 0017A0 00BC+00 1/1 0/0 0/0 .text WallCreateExecute__8daE_HM_cFv */ @@ -1251,7 +1258,7 @@ asm void daE_HM_c::UpDeathAction() { /* ############################################################################################## */ /* 806E5A20-806E5A24 000100 0004+00 1/4 0/0 0/0 .rodata @4809 */ SECTION_RODATA static f32 const lit_4809 = 40.0f; -COMPILER_STRIP_GATE(806E5A20, &lit_4809); +COMPILER_STRIP_GATE(0x806E5A20, &lit_4809); /* 806E5BD8-806E5BDC 000008 0001+03 2/2 0/0 0/0 .bss @1109 */ static u8 lit_1109[1 + 3 /* padding */]; @@ -1389,7 +1396,7 @@ asm void daE_HM_c::UpExecute() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4862 = 150.0f; -COMPILER_STRIP_GATE(806E5A24, &lit_4862); +COMPILER_STRIP_GATE(0x806E5A24, &lit_4862); #pragma pop /* 806E25E8-806E2694 0022E8 00AC+00 2/2 0/0 0/0 .text WallCheck__8daE_HM_cFv */ @@ -1407,7 +1414,7 @@ asm void daE_HM_c::WallCheck() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4941 = 0.5f; -COMPILER_STRIP_GATE(806E5A28, &lit_4941); +COMPILER_STRIP_GATE(0x806E5A28, &lit_4941); #pragma pop /* 806E2694-806E29B8 002394 0324+00 2/2 0/0 0/0 .text MoveCheck__8daE_HM_cFv */ @@ -1425,28 +1432,28 @@ asm void daE_HM_c::MoveCheck() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4998 = 70.0f; -COMPILER_STRIP_GATE(806E5A2C, &lit_4998); +COMPILER_STRIP_GATE(0x806E5A2C, &lit_4998); #pragma pop /* 806E5A30-806E5A34 000110 0004+00 0/1 0/0 0/0 .rodata @4999 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4999 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(806E5A30, &lit_4999); +COMPILER_STRIP_GATE(0x806E5A30, &lit_4999); #pragma pop /* 806E5A34-806E5A38 000114 0004+00 0/1 0/0 0/0 .rodata @5000 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5000 = 69.0f; -COMPILER_STRIP_GATE(806E5A34, &lit_5000); +COMPILER_STRIP_GATE(0x806E5A34, &lit_5000); #pragma pop /* 806E5A38-806E5A3C 000118 0004+00 0/1 0/0 0/0 .rodata @5001 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5001 = 3.0f / 20.0f; -COMPILER_STRIP_GATE(806E5A38, &lit_5001); +COMPILER_STRIP_GATE(0x806E5A38, &lit_5001); #pragma pop /* 806E29B8-806E2B80 0026B8 01C8+00 3/3 0/0 0/0 .text ShippuAction__8daE_HM_cFv */ @@ -1474,7 +1481,7 @@ asm void daE_HM_c::ShieldMotion() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5031 = -15.0f; -COMPILER_STRIP_GATE(806E5A3C, &lit_5031); +COMPILER_STRIP_GATE(0x806E5A3C, &lit_5031); #pragma pop /* 806E5C44-806E5C48 000074 0004+00 1/2 0/0 0/0 .bss s_dis__22@unnamed@d_a_e_hm_cpp@ */ @@ -1549,7 +1556,7 @@ SECTION_RODATA static f32 const lit_5073[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(806E5A40, &lit_5073); +COMPILER_STRIP_GATE(0x806E5A40, &lit_5073); #pragma pop /* 806E5A48-806E5A50 000128 0008+00 0/1 0/0 0/0 .rodata @5074 */ @@ -1558,7 +1565,7 @@ COMPILER_STRIP_GATE(806E5A40, &lit_5073); SECTION_RODATA static u8 const lit_5074[8] = { 0xBF, 0xD3, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, }; -COMPILER_STRIP_GATE(806E5A48, &lit_5074); +COMPILER_STRIP_GATE(0x806E5A48, &lit_5074); #pragma pop /* 806E2D40-806E2EA0 002A40 0160+00 2/2 0/0 0/0 .text DeathMotion__8daE_HM_cFv */ @@ -1606,14 +1613,14 @@ asm void daE_HM_c::AttackAfter() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5204 = 31.0f; -COMPILER_STRIP_GATE(806E5A50, &lit_5204); +COMPILER_STRIP_GATE(0x806E5A50, &lit_5204); #pragma pop /* 806E5A54-806E5A58 000134 0004+00 0/1 0/0 0/0 .rodata @5205 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5205 = 32.0f; -COMPILER_STRIP_GATE(806E5A54, &lit_5205); +COMPILER_STRIP_GATE(0x806E5A54, &lit_5205); #pragma pop /* 806E3208-806E3420 002F08 0218+00 1/1 0/0 0/0 .text AttackMotion__8daE_HM_cFv */ @@ -1641,7 +1648,7 @@ asm void daE_HM_c::AttackAction() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5252 = 21.0f; -COMPILER_STRIP_GATE(806E5A58, &lit_5252); +COMPILER_STRIP_GATE(0x806E5A58, &lit_5252); #pragma pop /* 806E34C8-806E3690 0031C8 01C8+00 1/1 0/0 0/0 .text FreeMove__8daE_HM_cFv */ @@ -1657,7 +1664,7 @@ asm void daE_HM_c::FreeMove() { /* ############################################################################################## */ /* 806E5A5C-806E5A60 00013C 0004+00 1/1 0/0 0/0 .rodata @5266 */ SECTION_RODATA static f32 const lit_5266 = 500.0f; -COMPILER_STRIP_GATE(806E5A5C, &lit_5266); +COMPILER_STRIP_GATE(0x806E5A5C, &lit_5266); /* 806E3690-806E3724 003390 0094+00 1/1 0/0 0/0 .text LinkSearch__8daE_HM_cFv */ #pragma push @@ -1724,7 +1731,7 @@ asm void daE_HM_c::Obj_Damage() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5466 = 33.0f; -COMPILER_STRIP_GATE(806E5A60, &lit_5466); +COMPILER_STRIP_GATE(0x806E5A60, &lit_5466); #pragma pop /* 806E3BE4-806E4008 0038E4 0424+00 1/1 0/0 0/0 .text ActionMode__8daE_HM_cFv */ @@ -1772,21 +1779,21 @@ asm void daE_HM_c::Execute() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5604 = 255.0f; -COMPILER_STRIP_GATE(806E5A64, &lit_5604); +COMPILER_STRIP_GATE(0x806E5A64, &lit_5604); #pragma pop /* 806E5A68-806E5A6C 000148 0004+00 0/1 0/0 0/0 .rodata @5605 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5605 = 400.0f; -COMPILER_STRIP_GATE(806E5A68, &lit_5605); +COMPILER_STRIP_GATE(0x806E5A68, &lit_5605); #pragma pop /* 806E5A6C-806E5A70 00014C 0004+00 0/1 0/0 0/0 .rodata @5606 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5606 = 80.0f; -COMPILER_STRIP_GATE(806E5A6C, &lit_5606); +COMPILER_STRIP_GATE(0x806E5A6C, &lit_5606); #pragma pop /* 806E434C-806E44F0 00404C 01A4+00 1/1 0/0 0/0 .text Draw__8daE_HM_cFv */ @@ -1879,7 +1886,7 @@ asm void daE_HM_c::CheckWall() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5878 = 60.0f; -COMPILER_STRIP_GATE(806E5A70, &lit_5878); +COMPILER_STRIP_GATE(0x806E5A70, &lit_5878); #pragma pop /* 806E4CCC-806E4E64 0049CC 0198+00 1/1 0/0 0/0 .text CreateStyle__8daE_HM_cFv */ @@ -1994,7 +2001,7 @@ asm void __sinit_d_a_e_hm_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_806E5440 = (void*)__sinit_d_a_e_hm_cpp; +REGISTER_CTORS(0x806E5440, __sinit_d_a_e_hm_cpp); #pragma pop /* 806E54AC-806E54B4 0051AC 0008+00 1/0 0/0 0/0 .text @36@__dt__12dBgS_ObjAcchFv */ @@ -2211,9 +2218,4 @@ static u8 data_806E5CE0[4]; static u8 data_806E5CE4[4]; #pragma pop -/* 806E5A74-806E5A79 000154 0005+00 5/5 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_806E5A74 = "E_HM"; -#pragma pop +/* 806E5A74-806E5A74 000154 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/e/d_a_e_hp/d_a_e_hp.cpp b/rel/d/a/e/d_a_e_hp/d_a_e_hp.cpp index e16fed90e69..fc0372b4289 100644 --- a/rel/d/a/e/d_a_e_hp/d_a_e_hp.cpp +++ b/rel/d/a/e/d_a_e_hp/d_a_e_hp.cpp @@ -40,16 +40,16 @@ struct mDoExt_invisibleModel { /* 8000E7C0 */ void entryDL(cXyz*); }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; - struct J3DAnmTransform {}; +struct J3DModelData {}; + +struct Z2Creature {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -166,7 +166,6 @@ struct dPa_control_c { struct dEvt_control_c { /* 80042468 */ void reset(); /* 8004368C */ void setPtT(void*); - /* 800436EC */ void setPtI_Id(unsigned int); }; struct dEvent_manager_c { @@ -545,7 +544,7 @@ extern "C" void __register_global_object(); /* ############################################################################################## */ /* 806EA1F4-806EA1F8 000000 0004+00 13/13 0/0 0/0 .rodata @3905 */ SECTION_RODATA static f32 const lit_3905 = 100.0f; -COMPILER_STRIP_GATE(806EA1F4, &lit_3905); +COMPILER_STRIP_GATE(0x806EA1F4, &lit_3905); /* 806EA1F8-806EA1FC 000004 0004+00 2/14 0/0 0/0 .rodata @3906 */ SECTION_RODATA static u8 const lit_3906[4] = { @@ -554,7 +553,7 @@ SECTION_RODATA static u8 const lit_3906[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(806EA1F8, &lit_3906); +COMPILER_STRIP_GATE(0x806EA1F8, &lit_3906); /* 806EA1FC-806EA204 000008 0004+04 1/10 0/0 0/0 .rodata @3907 */ SECTION_RODATA static f32 const lit_3907[1 + 1 /* padding */] = { @@ -562,7 +561,7 @@ SECTION_RODATA static f32 const lit_3907[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(806EA1FC, &lit_3907); +COMPILER_STRIP_GATE(0x806EA1FC, &lit_3907); /* 806EA204-806EA20C 000010 0008+00 0/8 0/0 0/0 .rodata @3908 */ #pragma push @@ -570,7 +569,7 @@ COMPILER_STRIP_GATE(806EA1FC, &lit_3907); SECTION_RODATA static u8 const lit_3908[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(806EA204, &lit_3908); +COMPILER_STRIP_GATE(0x806EA204, &lit_3908); #pragma pop /* 806EA20C-806EA214 000018 0008+00 0/8 0/0 0/0 .rodata @3909 */ @@ -579,7 +578,7 @@ COMPILER_STRIP_GATE(806EA204, &lit_3908); SECTION_RODATA static u8 const lit_3909[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(806EA20C, &lit_3909); +COMPILER_STRIP_GATE(0x806EA20C, &lit_3909); #pragma pop /* 806EA214-806EA21C 000020 0008+00 0/8 0/0 0/0 .rodata @3910 */ @@ -588,19 +587,19 @@ COMPILER_STRIP_GATE(806EA20C, &lit_3909); SECTION_RODATA static u8 const lit_3910[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(806EA214, &lit_3910); +COMPILER_STRIP_GATE(0x806EA214, &lit_3910); #pragma pop /* 806EA21C-806EA220 000028 0004+00 0/1 0/0 0/0 .rodata @3911 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3911 = 1.0f / 100.0f; -COMPILER_STRIP_GATE(806EA21C, &lit_3911); +COMPILER_STRIP_GATE(0x806EA21C, &lit_3911); #pragma pop /* 806EA220-806EA224 00002C 0004+00 1/1 0/0 0/0 .rodata @3926 */ SECTION_RODATA static f32 const lit_3926 = 6.0f / 5.0f; -COMPILER_STRIP_GATE(806EA220, &lit_3926); +COMPILER_STRIP_GATE(0x806EA220, &lit_3926); /* 806EA2E8-806EA2F4 000000 000C+00 2/2 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { @@ -851,42 +850,42 @@ asm void daE_HP_c::LampJointCallBack(J3DJoint* param_0, int param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4178 = 600.0f; -COMPILER_STRIP_GATE(806EA224, &lit_4178); +COMPILER_STRIP_GATE(0x806EA224, &lit_4178); #pragma pop /* 806EA228-806EA22C 000034 0004+00 0/3 0/0 0/0 .rodata @4179 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4179 = 30.0f; -COMPILER_STRIP_GATE(806EA228, &lit_4179); +COMPILER_STRIP_GATE(0x806EA228, &lit_4179); #pragma pop /* 806EA22C-806EA230 000038 0004+00 0/1 0/0 0/0 .rodata @4180 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4180 = -20.0f; -COMPILER_STRIP_GATE(806EA22C, &lit_4180); +COMPILER_STRIP_GATE(0x806EA22C, &lit_4180); #pragma pop /* 806EA230-806EA234 00003C 0004+00 0/1 0/0 0/0 .rodata @4181 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4181 = 40.0f; -COMPILER_STRIP_GATE(806EA230, &lit_4181); +COMPILER_STRIP_GATE(0x806EA230, &lit_4181); #pragma pop /* 806EA234-806EA238 000040 0004+00 0/4 0/0 0/0 .rodata @4182 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4182 = 7.0f / 10.0f; -COMPILER_STRIP_GATE(806EA234, &lit_4182); +COMPILER_STRIP_GATE(0x806EA234, &lit_4182); #pragma pop /* 806EA238-806EA23C 000044 0004+00 0/1 0/0 0/0 .rodata @4183 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4183 = 4.0f; -COMPILER_STRIP_GATE(806EA238, &lit_4183); +COMPILER_STRIP_GATE(0x806EA238, &lit_4183); #pragma pop /* 806EA4E8-806EA4EC 000008 0004+00 2/2 0/0 0/0 .bss None */ @@ -921,7 +920,13 @@ static asm void daE_HP_Draw(daE_HP_c* param_0) { /* ############################################################################################## */ /* 806EA23C-806EA240 000048 0004+00 1/1 0/0 0/0 .rodata @4196 */ SECTION_RODATA static f32 const lit_4196 = -1.0f; -COMPILER_STRIP_GATE(806EA23C, &lit_4196); +COMPILER_STRIP_GATE(0x806EA23C, &lit_4196); + +/* 806EA2CC-806EA2CC 0000D8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_806EA2CC = "E_HP"; +#pragma pop /* 806E6514-806E65C0 000814 00AC+00 6/6 0/0 0/0 .text setBck__8daE_HP_cFiUcff */ #pragma push @@ -956,7 +961,7 @@ asm void daE_HP_c::mChkDistance(f32 param_0) { /* ############################################################################################## */ /* 806EA240-806EA244 00004C 0004+00 1/1 0/0 0/0 .rodata @4301 */ SECTION_RODATA static f32 const lit_4301 = 250.0f; -COMPILER_STRIP_GATE(806EA240, &lit_4301); +COMPILER_STRIP_GATE(0x806EA240, &lit_4301); /* 806E673C-806E6948 000A3C 020C+00 1/1 0/0 0/0 .text damage_check__8daE_HP_cFv */ #pragma push @@ -973,14 +978,14 @@ asm void daE_HP_c::damage_check() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4367 = 3.0f; -COMPILER_STRIP_GATE(806EA244, &lit_4367); +COMPILER_STRIP_GATE(0x806EA244, &lit_4367); #pragma pop /* 806EA248-806EA24C 000054 0004+00 0/2 0/0 0/0 .rodata @4368 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4368 = 5.0f; -COMPILER_STRIP_GATE(806EA248, &lit_4368); +COMPILER_STRIP_GATE(0x806EA248, &lit_4368); #pragma pop /* 806E6948-806E6C74 000C48 032C+00 1/1 0/0 0/0 .text executeWait__8daE_HP_cFv */ @@ -998,21 +1003,21 @@ asm void daE_HP_c::executeWait() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4418 = 10.0f; -COMPILER_STRIP_GATE(806EA24C, &lit_4418); +COMPILER_STRIP_GATE(0x806EA24C, &lit_4418); #pragma pop /* 806EA250-806EA254 00005C 0004+00 0/4 0/0 0/0 .rodata @4419 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4419 = 20.0f; -COMPILER_STRIP_GATE(806EA250, &lit_4419); +COMPILER_STRIP_GATE(0x806EA250, &lit_4419); #pragma pop /* 806EA254-806EA258 000060 0004+00 0/4 0/0 0/0 .rodata @4420 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4420 = 300.0f; -COMPILER_STRIP_GATE(806EA254, &lit_4420); +COMPILER_STRIP_GATE(0x806EA254, &lit_4420); #pragma pop /* 806E6C74-806E6ED8 000F74 0264+00 1/1 0/0 0/0 .text executeMove__8daE_HP_cFv */ @@ -1030,7 +1035,7 @@ asm void daE_HP_c::executeMove() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4493 = 0.5f; -COMPILER_STRIP_GATE(806EA258, &lit_4493); +COMPILER_STRIP_GATE(0x806EA258, &lit_4493); #pragma pop /* 806E6ED8-806E7228 0011D8 0350+00 1/1 0/0 0/0 .text executeRetMove__8daE_HP_cFv */ @@ -1048,7 +1053,7 @@ asm void daE_HP_c::executeRetMove() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4562 = 32.0f; -COMPILER_STRIP_GATE(806EA25C, &lit_4562); +COMPILER_STRIP_GATE(0x806EA25C, &lit_4562); #pragma pop /* 806E7228-806E7574 001528 034C+00 1/1 0/0 0/0 .text executeAttack__8daE_HP_cFv */ @@ -1076,35 +1081,35 @@ asm void daE_HP_c::executeDamage() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4781 = 200.0f; -COMPILER_STRIP_GATE(806EA260, &lit_4781); +COMPILER_STRIP_GATE(0x806EA260, &lit_4781); #pragma pop /* 806EA264-806EA268 000070 0004+00 0/1 0/0 0/0 .rodata @4782 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4782 = 0x42424925; -COMPILER_STRIP_GATE(806EA264, &lit_4782); +COMPILER_STRIP_GATE(0x806EA264, &lit_4782); #pragma pop /* 806EA268-806EA26C 000074 0004+00 0/3 0/0 0/0 .rodata @4783 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4783 = 170.0f; -COMPILER_STRIP_GATE(806EA268, &lit_4783); +COMPILER_STRIP_GATE(0x806EA268, &lit_4783); #pragma pop /* 806EA26C-806EA270 000078 0004+00 0/2 0/0 0/0 .rodata @4784 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4784 = 1000.0f; -COMPILER_STRIP_GATE(806EA26C, &lit_4784); +COMPILER_STRIP_GATE(0x806EA26C, &lit_4784); #pragma pop /* 806EA270-806EA274 00007C 0004+00 0/1 0/0 0/0 .rodata @4785 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4785 = 4.0f / 5.0f; -COMPILER_STRIP_GATE(806EA270, &lit_4785); +COMPILER_STRIP_GATE(0x806EA270, &lit_4785); #pragma pop /* 806EA274-806EA27C 000080 0004+04 0/3 0/0 0/0 .rodata @4786 */ @@ -1115,7 +1120,7 @@ SECTION_RODATA static f32 const lit_4786[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(806EA274, &lit_4786); +COMPILER_STRIP_GATE(0x806EA274, &lit_4786); #pragma pop /* 806EA27C-806EA284 000088 0008+00 0/2 0/0 0/0 .rodata @4788 */ @@ -1124,7 +1129,7 @@ COMPILER_STRIP_GATE(806EA274, &lit_4786); SECTION_RODATA static u8 const lit_4788[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(806EA27C, &lit_4788); +COMPILER_STRIP_GATE(0x806EA27C, &lit_4788); #pragma pop /* 806E77C0-806E7E94 001AC0 06D4+00 1/1 0/0 0/0 .text executeDown__8daE_HP_cFv */ @@ -1137,6 +1142,13 @@ asm void daE_HP_c::executeDown() { } #pragma pop +/* ############################################################################################## */ +/* 806EA2CC-806EA2CC 0000D8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_806EA2D1 = "DEFAULT_GETITEM"; +#pragma pop + /* 806E7E94-806E814C 002194 02B8+00 1/1 0/0 0/0 .text executeDead__8daE_HP_cFv */ #pragma push #pragma optimization_level 0 @@ -1147,6 +1159,13 @@ asm void daE_HP_c::executeDead() { } #pragma pop +/* ############################################################################################## */ +/* 806EA2CC-806EA2CC 0000D8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_806EA2E1 = "E_hp"; +#pragma pop + /* 806E814C-806E8978 00244C 082C+00 2/1 0/0 0/0 .text action__8daE_HP_cFv */ #pragma push #pragma optimization_level 0 @@ -1172,63 +1191,63 @@ asm cM3dGPla::~cM3dGPla() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5054 = -1000000000.0f; -COMPILER_STRIP_GATE(806EA284, &lit_5054); +COMPILER_STRIP_GATE(0x806EA284, &lit_5054); #pragma pop /* 806EA288-806EA28C 000094 0004+00 0/0 0/0 0/0 .rodata @5055 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5055 = -3.0f; -COMPILER_STRIP_GATE(806EA288, &lit_5055); +COMPILER_STRIP_GATE(0x806EA288, &lit_5055); #pragma pop /* 806EA28C-806EA290 000098 0004+00 0/1 0/0 0/0 .rodata @5056 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5056 = 60.0f; -COMPILER_STRIP_GATE(806EA28C, &lit_5056); +COMPILER_STRIP_GATE(0x806EA28C, &lit_5056); #pragma pop /* 806EA290-806EA294 00009C 0004+00 0/1 0/0 0/0 .rodata @5057 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5057 = 255.0f; -COMPILER_STRIP_GATE(806EA290, &lit_5057); +COMPILER_STRIP_GATE(0x806EA290, &lit_5057); #pragma pop /* 806EA294-806EA298 0000A0 0004+00 0/1 0/0 0/0 .rodata @5168 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5168 = 12.0f; -COMPILER_STRIP_GATE(806EA294, &lit_5168); +COMPILER_STRIP_GATE(0x806EA294, &lit_5168); #pragma pop /* 806EA298-806EA29C 0000A4 0004+00 0/1 0/0 0/0 .rodata @5169 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5169 = 400.0f; -COMPILER_STRIP_GATE(806EA298, &lit_5169); +COMPILER_STRIP_GATE(0x806EA298, &lit_5169); #pragma pop /* 806EA29C-806EA2A0 0000A8 0004+00 0/1 0/0 0/0 .rodata @5170 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5170 = 6000.0f; -COMPILER_STRIP_GATE(806EA29C, &lit_5170); +COMPILER_STRIP_GATE(0x806EA29C, &lit_5170); #pragma pop /* 806EA2A0-806EA2A4 0000AC 0004+00 0/1 0/0 0/0 .rodata @5171 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5171 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(806EA2A0, &lit_5171); +COMPILER_STRIP_GATE(0x806EA2A0, &lit_5171); #pragma pop /* 806EA2A4-806EA2A8 0000B0 0004+00 0/1 0/0 0/0 .rodata @5172 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5172 = 2500.0f; -COMPILER_STRIP_GATE(806EA2A4, &lit_5172); +COMPILER_STRIP_GATE(0x806EA2A4, &lit_5172); #pragma pop /* 806E89C0-806E8DE0 002CC0 0420+00 2/2 0/0 0/0 .text mtx_set__8daE_HP_cFv */ @@ -1246,35 +1265,35 @@ asm void daE_HP_c::mtx_set() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5243 = 25.0f; -COMPILER_STRIP_GATE(806EA2A8, &lit_5243); +COMPILER_STRIP_GATE(0x806EA2A8, &lit_5243); #pragma pop /* 806EA2AC-806EA2B0 0000B8 0004+00 0/1 0/0 0/0 .rodata @5244 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5244 = -40.0f; -COMPILER_STRIP_GATE(806EA2AC, &lit_5244); +COMPILER_STRIP_GATE(0x806EA2AC, &lit_5244); #pragma pop /* 806EA2B0-806EA2B4 0000BC 0004+00 0/1 0/0 0/0 .rodata @5245 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5245 = 120.0f; -COMPILER_STRIP_GATE(806EA2B0, &lit_5245); +COMPILER_STRIP_GATE(0x806EA2B0, &lit_5245); #pragma pop /* 806EA2B4-806EA2B8 0000C0 0004+00 0/1 0/0 0/0 .rodata @5246 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5246 = 23.0f; -COMPILER_STRIP_GATE(806EA2B4, &lit_5246); +COMPILER_STRIP_GATE(0x806EA2B4, &lit_5246); #pragma pop /* 806EA2B8-806EA2BC 0000C4 0004+00 0/1 0/0 0/0 .rodata @5247 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5247 = 42.0f; -COMPILER_STRIP_GATE(806EA2B8, &lit_5247); +COMPILER_STRIP_GATE(0x806EA2B8, &lit_5247); #pragma pop /* 806E8DE0-806E8FEC 0030E0 020C+00 1/1 0/0 0/0 .text cc_set__8daE_HP_cFv */ @@ -1361,7 +1380,7 @@ SECTION_RODATA static f32 const lit_5512[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(806EA2BC, &lit_5512); +COMPILER_STRIP_GATE(0x806EA2BC, &lit_5512); #pragma pop /* 806EA2C4-806EA2CC 0000D0 0008+00 0/1 0/0 0/0 .rodata @5514 */ @@ -1370,7 +1389,7 @@ COMPILER_STRIP_GATE(806EA2BC, &lit_5512); SECTION_RODATA static u8 const lit_5514[8] = { 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(806EA2C4, &lit_5514); +COMPILER_STRIP_GATE(0x806EA2C4, &lit_5514); #pragma pop /* 806E951C-806E9900 00381C 03E4+00 1/1 0/0 0/0 .text create__8daE_HP_cFv */ @@ -1495,7 +1514,7 @@ asm void __sinit_d_a_e_hp_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_806E9D80 = (void*)__sinit_d_a_e_hp_cpp; +REGISTER_CTORS(0x806E9D80, __sinit_d_a_e_hp_cpp); #pragma pop /* 806E9DBC-806E9DC4 0040BC 0008+00 1/0 0/0 0/0 .text @36@__dt__12dBgS_ObjAcchFv */ @@ -1530,11 +1549,4 @@ static asm void setMidnaBindEffect(fopEn_enemy_c* param_0, Z2CreatureEnemy* para } #pragma pop -/* 806EA2CC-806EA2E6 0000D8 001A+00 6/6 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_806EA2CC = "E_HP"; -SECTION_DEAD static char const* const stringBase_806EA2D1 = "DEFAULT_GETITEM"; -SECTION_DEAD static char const* const stringBase_806EA2E1 = "E_hp"; -#pragma pop +/* 806EA2CC-806EA2CC 0000D8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/e/d_a_e_hz/d_a_e_hz.cpp b/rel/d/a/e/d_a_e_hz/d_a_e_hz.cpp index a623f6d3e73..37973755ea6 100644 --- a/rel/d/a/e/d_a_e_hz/d_a_e_hz.cpp +++ b/rel/d/a/e/d_a_e_hz/d_a_e_hz.cpp @@ -33,16 +33,16 @@ struct mDoMtx_stack_c { static u8 now[48]; }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; - struct J3DAnmTransform {}; +struct J3DModelData {}; + +struct Z2Creature {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -69,10 +69,10 @@ struct daObjCarry_c { /* 80474448 */ void mode_init_drop(u8); }; -struct J3DJoint {}; - struct J3DModel {}; +struct J3DJoint {}; + struct daE_HZ_c { /* 806EA690 */ void setBck(int, u8, f32, f32); /* 806EA734 */ void checkBck(int); @@ -556,7 +556,7 @@ extern "C" void __register_global_object(); /* ############################################################################################## */ /* 806F0860-806F0864 000000 0004+00 29/29 0/0 0/0 .rodata @3966 */ SECTION_RODATA static f32 const lit_3966 = 100.0f; -COMPILER_STRIP_GATE(806F0860, &lit_3966); +COMPILER_STRIP_GATE(0x806F0860, &lit_3966); /* 806F0864-806F0868 000004 0004+00 2/23 0/0 0/0 .rodata @3967 */ SECTION_RODATA static u8 const lit_3967[4] = { @@ -565,7 +565,7 @@ SECTION_RODATA static u8 const lit_3967[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(806F0864, &lit_3967); +COMPILER_STRIP_GATE(0x806F0864, &lit_3967); /* 806F0868-806F0870 000008 0004+04 2/17 0/0 0/0 .rodata @3968 */ SECTION_RODATA static f32 const lit_3968[1 + 1 /* padding */] = { @@ -573,7 +573,7 @@ SECTION_RODATA static f32 const lit_3968[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(806F0868, &lit_3968); +COMPILER_STRIP_GATE(0x806F0868, &lit_3968); /* 806F0870-806F0878 000010 0008+00 0/5 0/0 0/0 .rodata @3969 */ #pragma push @@ -581,7 +581,7 @@ COMPILER_STRIP_GATE(806F0868, &lit_3968); SECTION_RODATA static u8 const lit_3969[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(806F0870, &lit_3969); +COMPILER_STRIP_GATE(0x806F0870, &lit_3969); #pragma pop /* 806F0878-806F0880 000018 0008+00 0/5 0/0 0/0 .rodata @3970 */ @@ -590,7 +590,7 @@ COMPILER_STRIP_GATE(806F0870, &lit_3969); SECTION_RODATA static u8 const lit_3970[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(806F0878, &lit_3970); +COMPILER_STRIP_GATE(0x806F0878, &lit_3970); #pragma pop /* 806F0880-806F0888 000020 0008+00 0/5 0/0 0/0 .rodata @3971 */ @@ -599,84 +599,84 @@ COMPILER_STRIP_GATE(806F0878, &lit_3970); SECTION_RODATA static u8 const lit_3971[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(806F0880, &lit_3971); +COMPILER_STRIP_GATE(0x806F0880, &lit_3971); #pragma pop /* 806F0888-806F088C 000028 0004+00 0/1 0/0 0/0 .rodata @3972 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3972 = 1.0f / 100.0f; -COMPILER_STRIP_GATE(806F0888, &lit_3972); +COMPILER_STRIP_GATE(0x806F0888, &lit_3972); #pragma pop /* 806F088C-806F0890 00002C 0004+00 0/2 0/0 0/0 .rodata @3987 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3987 = 700.0f; -COMPILER_STRIP_GATE(806F088C, &lit_3987); +COMPILER_STRIP_GATE(0x806F088C, &lit_3987); #pragma pop /* 806F0890-806F0894 000030 0004+00 0/1 0/0 0/0 .rodata @3988 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3988 = 1200.0f; -COMPILER_STRIP_GATE(806F0890, &lit_3988); +COMPILER_STRIP_GATE(0x806F0890, &lit_3988); #pragma pop /* 806F0894-806F0898 000034 0004+00 0/8 0/0 0/0 .rodata @3989 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3989 = 20.0f; -COMPILER_STRIP_GATE(806F0894, &lit_3989); +COMPILER_STRIP_GATE(0x806F0894, &lit_3989); #pragma pop /* 806F0898-806F089C 000038 0004+00 0/1 0/0 0/0 .rodata @3990 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3990 = 160.0f; -COMPILER_STRIP_GATE(806F0898, &lit_3990); +COMPILER_STRIP_GATE(0x806F0898, &lit_3990); #pragma pop /* 806F089C-806F08A0 00003C 0004+00 0/1 0/0 0/0 .rodata @3991 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3991 = 5000.0f; -COMPILER_STRIP_GATE(806F089C, &lit_3991); +COMPILER_STRIP_GATE(0x806F089C, &lit_3991); #pragma pop /* 806F08A0-806F08A4 000040 0004+00 0/3 0/0 0/0 .rodata @3992 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3992 = 400.0f; -COMPILER_STRIP_GATE(806F08A0, &lit_3992); +COMPILER_STRIP_GATE(0x806F08A0, &lit_3992); #pragma pop /* 806F08A4-806F08A8 000044 0004+00 0/4 0/0 0/0 .rodata @3993 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3993 = 15.0f; -COMPILER_STRIP_GATE(806F08A4, &lit_3993); +COMPILER_STRIP_GATE(0x806F08A4, &lit_3993); #pragma pop /* 806F08A8-806F08AC 000048 0004+00 0/1 0/0 0/0 .rodata @3994 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3994 = 7.0f / 10.0f; -COMPILER_STRIP_GATE(806F08A8, &lit_3994); +COMPILER_STRIP_GATE(0x806F08A8, &lit_3994); #pragma pop /* 806F08AC-806F08B0 00004C 0004+00 0/1 0/0 0/0 .rodata @3995 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3995 = 7.0f; -COMPILER_STRIP_GATE(806F08AC, &lit_3995); +COMPILER_STRIP_GATE(0x806F08AC, &lit_3995); #pragma pop /* 806F08B0-806F08B4 000050 0004+00 0/7 0/0 0/0 .rodata @3996 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3996 = 50.0f; -COMPILER_STRIP_GATE(806F08B0, &lit_3996); +COMPILER_STRIP_GATE(0x806F08B0, &lit_3996); #pragma pop /* 806F0974-806F0980 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ @@ -858,7 +858,13 @@ asm daE_HZ_HIO_c::daE_HZ_HIO_c() { /* ############################################################################################## */ /* 806F08B4-806F08B8 000054 0004+00 1/1 0/0 0/0 .rodata @4010 */ SECTION_RODATA static f32 const lit_4010 = -1.0f; -COMPILER_STRIP_GATE(806F08B4, &lit_4010); +COMPILER_STRIP_GATE(0x806F08B4, &lit_4010); + +/* 806F095C-806F095C 0000FC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_806F095C = "E_HZ"; +#pragma pop /* 806EA690-806EA734 000170 00A4+00 12/12 0/0 0/0 .text setBck__8daE_HZ_cFiUcff */ #pragma push @@ -885,7 +891,7 @@ asm void daE_HZ_c::checkBck(int param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4064 = 800.0f; -COMPILER_STRIP_GATE(806F08B8, &lit_4064); +COMPILER_STRIP_GATE(0x806F08B8, &lit_4064); #pragma pop /* 806EA790-806EA998 000270 0208+00 1/1 0/0 0/0 .text draw__8daE_HZ_cFv */ @@ -913,7 +919,7 @@ static asm void daE_HZ_Draw(daE_HZ_c* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4115 = 500.0f; -COMPILER_STRIP_GATE(806F08BC, &lit_4115); +COMPILER_STRIP_GATE(0x806F08BC, &lit_4115); #pragma pop /* 806F0B30-806F0B34 000008 0001+03 4/4 0/0 0/0 .bss @1109 */ @@ -1067,18 +1073,18 @@ asm void daE_HZ_c::checkHideStart() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4262 = 110.0f; -COMPILER_STRIP_GATE(806F08C0, &lit_4262); +COMPILER_STRIP_GATE(0x806F08C0, &lit_4262); #pragma pop /* 806F08C4-806F08C8 000064 0004+00 2/6 0/0 0/0 .rodata @4263 */ SECTION_RODATA static f32 const lit_4263 = 2.0f; -COMPILER_STRIP_GATE(806F08C4, &lit_4263); +COMPILER_STRIP_GATE(0x806F08C4, &lit_4263); /* 806F08C8-806F08CC 000068 0004+00 0/8 0/0 0/0 .rodata @4264 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4264 = 10.0f; -COMPILER_STRIP_GATE(806F08C8, &lit_4264); +COMPILER_STRIP_GATE(0x806F08C8, &lit_4264); #pragma pop /* 806EAEDC-806EB05C 0009BC 0180+00 1/1 0/0 0/0 .text checkAttackStart__8daE_HZ_cFv */ @@ -1126,12 +1132,12 @@ asm void daE_HZ_c::isWait() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4377 = 300.0f; -COMPILER_STRIP_GATE(806F08CC, &lit_4377); +COMPILER_STRIP_GATE(0x806F08CC, &lit_4377); #pragma pop /* 806F08D0-806F08D4 000070 0004+00 2/3 0/0 0/0 .rodata @4378 */ SECTION_RODATA static f32 const lit_4378 = -1000000000.0f; -COMPILER_STRIP_GATE(806F08D0, &lit_4378); +COMPILER_STRIP_GATE(0x806F08D0, &lit_4378); /* 806EB13C-806EB2E8 000C1C 01AC+00 1/1 0/0 0/0 .text checkFall__8daE_HZ_cFv */ #pragma push @@ -1156,20 +1162,20 @@ asm void daE_HZ_c::setCloseSmokeEffect() { /* ############################################################################################## */ /* 806F08D4-806F08D8 000074 0004+00 1/4 0/0 0/0 .rodata @4505 */ SECTION_RODATA static f32 const lit_4505 = 30.0f; -COMPILER_STRIP_GATE(806F08D4, &lit_4505); +COMPILER_STRIP_GATE(0x806F08D4, &lit_4505); /* 806F08D8-806F08DC 000078 0004+00 0/8 0/0 0/0 .rodata @4506 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4506 = 5.0f; -COMPILER_STRIP_GATE(806F08D8, &lit_4506); +COMPILER_STRIP_GATE(0x806F08D8, &lit_4506); #pragma pop /* 806F08DC-806F08E0 00007C 0004+00 0/3 0/0 0/0 .rodata @4507 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4507 = 1.5f; -COMPILER_STRIP_GATE(806F08DC, &lit_4507); +COMPILER_STRIP_GATE(0x806F08DC, &lit_4507); #pragma pop /* 806EB3EC-806EB7B0 000ECC 03C4+00 1/1 0/0 0/0 .text executeWait__8daE_HZ_cFv */ @@ -1197,21 +1203,21 @@ asm void daE_HZ_c::getHideSpeed() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4641 = 3.0f; -COMPILER_STRIP_GATE(806F08E0, &lit_4641); +COMPILER_STRIP_GATE(0x806F08E0, &lit_4641); #pragma pop /* 806F08E4-806F08E8 000084 0004+00 0/4 0/0 0/0 .rodata @4642 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4642 = 35.0f; -COMPILER_STRIP_GATE(806F08E4, &lit_4642); +COMPILER_STRIP_GATE(0x806F08E4, &lit_4642); #pragma pop /* 806F08E8-806F08EC 000088 0004+00 0/1 0/0 0/0 .rodata @4643 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4643 = 73.0f; -COMPILER_STRIP_GATE(806F08E8, &lit_4643); +COMPILER_STRIP_GATE(0x806F08E8, &lit_4643); #pragma pop /* 806EB818-806EBD44 0012F8 052C+00 1/1 0/0 0/0 .text executeHide__8daE_HZ_cFv */ @@ -1229,21 +1235,21 @@ asm void daE_HZ_c::executeHide() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4751 = 8.0f; -COMPILER_STRIP_GATE(806F08EC, &lit_4751); +COMPILER_STRIP_GATE(0x806F08EC, &lit_4751); #pragma pop /* 806F08F0-806F08F4 000090 0004+00 0/2 0/0 0/0 .rodata @4752 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4752 = 38.0f; -COMPILER_STRIP_GATE(806F08F0, &lit_4752); +COMPILER_STRIP_GATE(0x806F08F0, &lit_4752); #pragma pop /* 806F08F4-806F08F8 000094 0004+00 0/2 0/0 0/0 .rodata @4753 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4753 = 60.0f; -COMPILER_STRIP_GATE(806F08F4, &lit_4753); +COMPILER_STRIP_GATE(0x806F08F4, &lit_4753); #pragma pop /* 806EBD44-806EC068 001824 0324+00 1/1 0/0 0/0 .text executeAttack__8daE_HZ_cFv */ @@ -1271,42 +1277,42 @@ asm void daE_HZ_c::initBackWalk() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4997 = 4.0f; -COMPILER_STRIP_GATE(806F08F8, &lit_4997); +COMPILER_STRIP_GATE(0x806F08F8, &lit_4997); #pragma pop /* 806F08FC-806F0900 00009C 0004+00 0/5 0/0 0/0 .rodata @4998 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4998 = -5.0f; -COMPILER_STRIP_GATE(806F08FC, &lit_4998); +COMPILER_STRIP_GATE(0x806F08FC, &lit_4998); #pragma pop /* 806F0900-806F0904 0000A0 0004+00 0/2 0/0 0/0 .rodata @4999 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4999 = -20.0f; -COMPILER_STRIP_GATE(806F0900, &lit_4999); +COMPILER_STRIP_GATE(0x806F0900, &lit_4999); #pragma pop /* 806F0904-806F0908 0000A4 0004+00 0/2 0/0 0/0 .rodata @5000 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5000 = 23.0f; -COMPILER_STRIP_GATE(806F0904, &lit_5000); +COMPILER_STRIP_GATE(0x806F0904, &lit_5000); #pragma pop /* 806F0908-806F090C 0000A8 0004+00 0/3 0/0 0/0 .rodata @5001 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5001 = 14.0f; -COMPILER_STRIP_GATE(806F0908, &lit_5001); +COMPILER_STRIP_GATE(0x806F0908, &lit_5001); #pragma pop /* 806F090C-806F0910 0000AC 0004+00 0/2 0/0 0/0 .rodata @5002 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5002 = 28.0f; -COMPILER_STRIP_GATE(806F090C, &lit_5002); +COMPILER_STRIP_GATE(0x806F090C, &lit_5002); #pragma pop /* 806EC348-806ECAEC 001E28 07A4+00 1/1 0/0 0/0 .text executeAway__8daE_HZ_cFv */ @@ -1334,42 +1340,42 @@ asm void daE_HZ_c::setWindEnd() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5308 = 1000.0f; -COMPILER_STRIP_GATE(806F0910, &lit_5308); +COMPILER_STRIP_GATE(0x806F0910, &lit_5308); #pragma pop /* 806F0914-806F0918 0000B4 0004+00 0/1 0/0 0/0 .rodata @5309 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5309 = 6.0f; -COMPILER_STRIP_GATE(806F0914, &lit_5309); +COMPILER_STRIP_GATE(0x806F0914, &lit_5309); #pragma pop /* 806F0918-806F091C 0000B8 0004+00 0/1 0/0 0/0 .rodata @5310 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5310 = 8192.0f; -COMPILER_STRIP_GATE(806F0918, &lit_5310); +COMPILER_STRIP_GATE(0x806F0918, &lit_5310); #pragma pop /* 806F091C-806F0920 0000BC 0004+00 0/1 0/0 0/0 .rodata @5311 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5311 = 512.0f; -COMPILER_STRIP_GATE(806F091C, &lit_5311); +COMPILER_STRIP_GATE(0x806F091C, &lit_5311); #pragma pop /* 806F0920-806F0924 0000C0 0004+00 0/2 0/0 0/0 .rodata @5312 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5312 = 13.0f; -COMPILER_STRIP_GATE(806F0920, &lit_5312); +COMPILER_STRIP_GATE(0x806F0920, &lit_5312); #pragma pop /* 806F0924-806F0928 0000C4 0004+00 0/1 0/0 0/0 .rodata @5313 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5313 = 25.0f; -COMPILER_STRIP_GATE(806F0924, &lit_5313); +COMPILER_STRIP_GATE(0x806F0924, &lit_5313); #pragma pop /* 806F0928-806F0930 0000C8 0008+00 0/2 0/0 0/0 .rodata @5315 */ @@ -1378,7 +1384,7 @@ COMPILER_STRIP_GATE(806F0924, &lit_5313); SECTION_RODATA static u8 const lit_5315[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(806F0928, &lit_5315); +COMPILER_STRIP_GATE(0x806F0928, &lit_5315); #pragma pop /* 806ECB64-806ED5B0 002644 0A4C+00 1/1 0/0 0/0 .text executeWind__8daE_HZ_cFv */ @@ -1436,14 +1442,14 @@ asm void daE_HZ_c::executeDamage() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5482 = 41.5f; -COMPILER_STRIP_GATE(806F0930, &lit_5482); +COMPILER_STRIP_GATE(0x806F0930, &lit_5482); #pragma pop /* 806F0934-806F0938 0000D4 0004+00 0/1 0/0 0/0 .rodata @5483 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5483 = 2.0f / 5.0f; -COMPILER_STRIP_GATE(806F0934, &lit_5483); +COMPILER_STRIP_GATE(0x806F0934, &lit_5483); #pragma pop /* 806EDAA8-806EDDCC 003588 0324+00 1/1 0/0 0/0 .text executeDeath__8daE_HZ_cFv */ @@ -1471,7 +1477,7 @@ asm void daE_HZ_c::setWindChanceEnd() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5546 = 6144.0f; -COMPILER_STRIP_GATE(806F0938, &lit_5546); +COMPILER_STRIP_GATE(0x806F0938, &lit_5546); #pragma pop /* 806EDDE8-806EE120 0038C8 0338+00 1/1 0/0 0/0 .text executeWindChance__8daE_HZ_cFv */ @@ -1489,7 +1495,7 @@ asm void daE_HZ_c::executeWindChance() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5580 = 24.0f; -COMPILER_STRIP_GATE(806F093C, &lit_5580); +COMPILER_STRIP_GATE(0x806F093C, &lit_5580); #pragma pop /* 806EE120-806EE2A4 003C00 0184+00 1/1 0/0 0/0 .text executeWindWalk__8daE_HZ_cFv */ @@ -1530,21 +1536,21 @@ asm void daE_HZ_c::setWaterEffect() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5703 = 36.0f; -COMPILER_STRIP_GATE(806F0940, &lit_5703); +COMPILER_STRIP_GATE(0x806F0940, &lit_5703); #pragma pop /* 806F0944-806F0948 0000E4 0004+00 0/1 0/0 0/0 .rodata @5704 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5704 = 57.0f; -COMPILER_STRIP_GATE(806F0944, &lit_5704); +COMPILER_STRIP_GATE(0x806F0944, &lit_5704); #pragma pop /* 806F0948-806F094C 0000E8 0004+00 0/2 0/0 0/0 .rodata @5705 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5705 = 150.0f; -COMPILER_STRIP_GATE(806F0948, &lit_5705); +COMPILER_STRIP_GATE(0x806F0948, &lit_5705); #pragma pop /* 806EE3BC-806EE820 003E9C 0464+00 1/1 0/0 0/0 .text executeWaterDeath__8daE_HZ_cFv */ @@ -1610,7 +1616,7 @@ asm void daE_HZ_c::mtx_set() { /* ############################################################################################## */ /* 806F094C-806F0950 0000EC 0004+00 1/1 0/0 0/0 .rodata @6030 */ SECTION_RODATA static f32 const lit_6030 = 80.0f; -COMPILER_STRIP_GATE(806F094C, &lit_6030); +COMPILER_STRIP_GATE(0x806F094C, &lit_6030); /* 806EF2C8-806EF46C 004DA8 01A4+00 1/1 0/0 0/0 .text cc_set__8daE_HZ_cFv */ #pragma push @@ -1687,6 +1693,13 @@ asm void daE_HZ_c::JointCallBack(J3DJoint* param_0, int param_1) { } #pragma pop +/* ############################################################################################## */ +/* 806F095C-806F095C 0000FC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_806F0961 = "E_hzp"; +#pragma pop + /* 806EF8CC-806EFB34 0053AC 0268+00 1/1 0/0 0/0 .text CreateHeap__8daE_HZ_cFv */ #pragma push #pragma optimization_level 0 @@ -1722,21 +1735,28 @@ asm void daE_HZ_c::setInitPos() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6337 = -200.0f; -COMPILER_STRIP_GATE(806F0950, &lit_6337); +COMPILER_STRIP_GATE(0x806F0950, &lit_6337); #pragma pop /* 806F0954-806F0958 0000F4 0004+00 0/1 0/0 0/0 .rodata @6338 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6338 = 200.0f; -COMPILER_STRIP_GATE(806F0954, &lit_6338); +COMPILER_STRIP_GATE(0x806F0954, &lit_6338); #pragma pop /* 806F0958-806F095C 0000F8 0004+00 0/1 0/0 0/0 .rodata @6339 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6339 = -60.0f; -COMPILER_STRIP_GATE(806F0958, &lit_6339); +COMPILER_STRIP_GATE(0x806F0958, &lit_6339); +#pragma pop + +/* 806F095C-806F095C 0000FC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_806F0967 = "E_hzp2"; +SECTION_DEAD static char const* const stringBase_806F096E = "E_hz"; #pragma pop /* 806EFC18-806EFFAC 0056F8 0394+00 1/1 0/0 0/0 .text create__8daE_HZ_cFv */ @@ -1871,7 +1891,7 @@ asm void __sinit_d_a_e_hz_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_806F03B0 = (void*)__sinit_d_a_e_hz_cpp; +REGISTER_CTORS(0x806F03B0, __sinit_d_a_e_hz_cpp); #pragma pop /* 806F03EC-806F03F4 005ECC 0008+00 1/0 0/0 0/0 .text @36@__dt__12dBgS_ObjAcchFv */ @@ -2088,12 +2108,4 @@ static u8 data_806F0C3C[4]; static u8 data_806F0C40[4]; #pragma pop -/* 806F095C-806F0973 0000FC 0017+00 5/5 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_806F095C = "E_HZ"; -SECTION_DEAD static char const* const stringBase_806F0961 = "E_hzp"; -SECTION_DEAD static char const* const stringBase_806F0967 = "E_hzp2"; -SECTION_DEAD static char const* const stringBase_806F096E = "E_hz"; -#pragma pop +/* 806F095C-806F095C 0000FC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/e/d_a_e_hzelda/d_a_e_hzelda.cpp b/rel/d/a/e/d_a_e_hzelda/d_a_e_hzelda.cpp index b56b43b33ec..7355babd827 100644 --- a/rel/d/a/e/d_a_e_hzelda/d_a_e_hzelda.cpp +++ b/rel/d/a/e/d_a_e_hzelda/d_a_e_hzelda.cpp @@ -41,16 +41,16 @@ struct mDoExt_brkAnm { /* 8000D7A8 */ void entry(J3DMaterialTable*, f32); }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; - struct J3DAnmTransform {}; +struct J3DModelData {}; + +struct Z2Creature {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -497,7 +497,7 @@ extern "C" void __register_global_object(); /* ############################################################################################## */ /* 806F5514-806F5518 000000 0004+00 15/15 0/0 0/0 .rodata @3767 */ SECTION_RODATA static f32 const lit_3767 = 1.0f; -COMPILER_STRIP_GATE(806F5514, &lit_3767); +COMPILER_STRIP_GATE(0x806F5514, &lit_3767); /* 806F565C-806F5668 000000 000C+00 2/2 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { @@ -758,11 +758,17 @@ SECTION_RODATA static u8 const lit_3781[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(806F5518, &lit_3781); +COMPILER_STRIP_GATE(0x806F5518, &lit_3781); /* 806F551C-806F5520 000008 0004+00 1/2 0/0 0/0 .rodata @3782 */ SECTION_RODATA static f32 const lit_3782 = -1.0f; -COMPILER_STRIP_GATE(806F551C, &lit_3782); +COMPILER_STRIP_GATE(0x806F551C, &lit_3782); + +/* 806F5654-806F5654 000140 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_806F5654 = "Hzelda"; +#pragma pop /* 806F0D70-806F0E1C 000110 00AC+00 5/5 0/0 0/0 .text anm_init__FP14e_hzelda_classifUcf */ @@ -791,21 +797,21 @@ static asm void nodeCallBack(J3DJoint* param_0, int param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3910 = 255.0f; -COMPILER_STRIP_GATE(806F5520, &lit_3910); +COMPILER_STRIP_GATE(0x806F5520, &lit_3910); #pragma pop /* 806F5524-806F5528 000010 0004+00 0/3 0/0 0/0 .rodata @3911 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3911 = 150.0f; -COMPILER_STRIP_GATE(806F5524, &lit_3911); +COMPILER_STRIP_GATE(0x806F5524, &lit_3911); #pragma pop /* 806F5528-806F552C 000014 0004+00 0/5 0/0 0/0 .rodata @3912 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3912 = 100.0f; -COMPILER_STRIP_GATE(806F5528, &lit_3912); +COMPILER_STRIP_GATE(0x806F5528, &lit_3912); #pragma pop /* 806F552C-806F5534 000018 0004+04 0/3 0/0 0/0 .rodata @3913 */ @@ -816,7 +822,7 @@ SECTION_RODATA static f32 const lit_3913[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(806F552C, &lit_3913); +COMPILER_STRIP_GATE(0x806F552C, &lit_3913); #pragma pop /* 806F1004-806F1214 0003A4 0210+00 1/0 0/0 0/0 .text daE_HZELDA_Draw__FP14e_hzelda_class @@ -837,7 +843,7 @@ static asm void daE_HZELDA_Draw(e_hzelda_class* param_0) { SECTION_RODATA static u8 const lit_3965[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(806F5534, &lit_3965); +COMPILER_STRIP_GATE(0x806F5534, &lit_3965); #pragma pop /* 806F553C-806F5544 000028 0008+00 0/3 0/0 0/0 .rodata @3966 */ @@ -846,7 +852,7 @@ COMPILER_STRIP_GATE(806F5534, &lit_3965); SECTION_RODATA static u8 const lit_3966[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(806F553C, &lit_3966); +COMPILER_STRIP_GATE(0x806F553C, &lit_3966); #pragma pop /* 806F5544-806F554C 000030 0008+00 0/3 0/0 0/0 .rodata @3967 */ @@ -855,7 +861,7 @@ COMPILER_STRIP_GATE(806F553C, &lit_3966); SECTION_RODATA static u8 const lit_3967[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(806F5544, &lit_3967); +COMPILER_STRIP_GATE(0x806F5544, &lit_3967); #pragma pop /* 806F1214-806F13A8 0005B4 0194+00 1/1 0/0 0/0 .text shot_s_sub__FPvPv */ @@ -873,49 +879,49 @@ static asm void shot_s_sub(void* param_0, void* param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4064 = 10.0f; -COMPILER_STRIP_GATE(806F554C, &lit_4064); +COMPILER_STRIP_GATE(0x806F554C, &lit_4064); #pragma pop /* 806F5550-806F5554 00003C 0004+00 0/2 0/0 0/0 .rodata @4065 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4065 = 3.0f; -COMPILER_STRIP_GATE(806F5550, &lit_4065); +COMPILER_STRIP_GATE(0x806F5550, &lit_4065); #pragma pop /* 806F5554-806F5558 000040 0004+00 0/2 0/0 0/0 .rodata @4066 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4066 = 300.0f; -COMPILER_STRIP_GATE(806F5554, &lit_4066); +COMPILER_STRIP_GATE(0x806F5554, &lit_4066); #pragma pop /* 806F5558-806F555C 000044 0004+00 0/5 0/0 0/0 .rodata @4067 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4067 = 30.0f; -COMPILER_STRIP_GATE(806F5558, &lit_4067); +COMPILER_STRIP_GATE(0x806F5558, &lit_4067); #pragma pop /* 806F555C-806F5560 000048 0004+00 0/2 0/0 0/0 .rodata @4068 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4068 = 600.0f; -COMPILER_STRIP_GATE(806F555C, &lit_4068); +COMPILER_STRIP_GATE(0x806F555C, &lit_4068); #pragma pop /* 806F5560-806F5564 00004C 0004+00 0/6 0/0 0/0 .rodata @4069 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4069 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(806F5560, &lit_4069); +COMPILER_STRIP_GATE(0x806F5560, &lit_4069); #pragma pop /* 806F5564-806F5568 000050 0004+00 0/5 0/0 0/0 .rodata @4070 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4070 = 0.5f; -COMPILER_STRIP_GATE(806F5564, &lit_4070); +COMPILER_STRIP_GATE(0x806F5564, &lit_4070); #pragma pop /* 806F13A8-806F1758 000748 03B0+00 1/1 0/0 0/0 .text e_hzelda_wait__FP14e_hzelda_class @@ -934,53 +940,53 @@ static asm void e_hzelda_wait(e_hzelda_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4071 = 7.0f / 10.0f; -COMPILER_STRIP_GATE(806F5568, &lit_4071); +COMPILER_STRIP_GATE(0x806F5568, &lit_4071); #pragma pop /* 806F556C-806F5570 000058 0004+00 0/2 0/0 0/0 .rodata @4072 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4072 = 40.0f; -COMPILER_STRIP_GATE(806F556C, &lit_4072); +COMPILER_STRIP_GATE(0x806F556C, &lit_4072); #pragma pop /* 806F5570-806F5574 00005C 0004+00 1/3 0/0 0/0 .rodata @4073 */ SECTION_RODATA static f32 const lit_4073 = 2.0f; -COMPILER_STRIP_GATE(806F5570, &lit_4073); +COMPILER_STRIP_GATE(0x806F5570, &lit_4073); /* 806F5574-806F5578 000060 0004+00 0/5 0/0 0/0 .rodata @4185 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4185 = 5.0f; -COMPILER_STRIP_GATE(806F5574, &lit_4185); +COMPILER_STRIP_GATE(0x806F5574, &lit_4185); #pragma pop /* 806F5578-806F557C 000064 0004+00 0/4 0/0 0/0 .rodata @4186 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4186 = 50.0f; -COMPILER_STRIP_GATE(806F5578, &lit_4186); +COMPILER_STRIP_GATE(0x806F5578, &lit_4186); #pragma pop /* 806F557C-806F5580 000068 0004+00 0/4 0/0 0/0 .rodata @4187 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4187 = 200.0f; -COMPILER_STRIP_GATE(806F557C, &lit_4187); +COMPILER_STRIP_GATE(0x806F557C, &lit_4187); #pragma pop /* 806F5580-806F5584 00006C 0004+00 0/2 0/0 0/0 .rodata @4188 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4188 = 20.0f; -COMPILER_STRIP_GATE(806F5580, &lit_4188); +COMPILER_STRIP_GATE(0x806F5580, &lit_4188); #pragma pop /* 806F5584-806F5588 000070 0004+00 0/4 0/0 0/0 .rodata @4189 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4189 = 1.0f / 20.0f; -COMPILER_STRIP_GATE(806F5584, &lit_4189); +COMPILER_STRIP_GATE(0x806F5584, &lit_4189); #pragma pop /* 806F1758-806F1C9C 000AF8 0544+00 1/1 0/0 0/0 .text e_hzelda_attack_a__FP14e_hzelda_class */ @@ -998,35 +1004,35 @@ static asm void e_hzelda_attack_a(e_hzelda_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4242 = 8.0f; -COMPILER_STRIP_GATE(806F5588, &lit_4242); +COMPILER_STRIP_GATE(0x806F5588, &lit_4242); #pragma pop /* 806F558C-806F5590 000078 0004+00 0/1 0/0 0/0 .rodata @4243 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4243 = 12.0f; -COMPILER_STRIP_GATE(806F558C, &lit_4243); +COMPILER_STRIP_GATE(0x806F558C, &lit_4243); #pragma pop /* 806F5590-806F5594 00007C 0004+00 0/1 0/0 0/0 .rodata @4244 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4244 = 65536.0f; -COMPILER_STRIP_GATE(806F5590, &lit_4244); +COMPILER_STRIP_GATE(0x806F5590, &lit_4244); #pragma pop /* 806F5594-806F5598 000080 0004+00 0/3 0/0 0/0 .rodata @4245 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4245 = 80.0f; -COMPILER_STRIP_GATE(806F5594, &lit_4245); +COMPILER_STRIP_GATE(0x806F5594, &lit_4245); #pragma pop /* 806F5598-806F559C 000084 0004+00 0/1 0/0 0/0 .rodata @4246 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4246 = 210.0f; -COMPILER_STRIP_GATE(806F5598, &lit_4246); +COMPILER_STRIP_GATE(0x806F5598, &lit_4246); #pragma pop /* 806F559C-806F55A4 000088 0008+00 0/3 0/0 0/0 .rodata @4248 */ @@ -1035,7 +1041,7 @@ COMPILER_STRIP_GATE(806F5598, &lit_4246); SECTION_RODATA static u8 const lit_4248[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(806F559C, &lit_4248); +COMPILER_STRIP_GATE(0x806F559C, &lit_4248); #pragma pop /* 806F1C9C-806F1FA4 00103C 0308+00 1/1 0/0 0/0 .text e_hzelda_attack_b__FP14e_hzelda_class */ @@ -1063,35 +1069,35 @@ static asm void ball_crash_eff_set(e_hzelda_class* param_0, f32 param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4455 = 41.0f; -COMPILER_STRIP_GATE(806F55A4, &lit_4455); +COMPILER_STRIP_GATE(0x806F55A4, &lit_4455); #pragma pop /* 806F55A8-806F55AC 000094 0004+00 0/2 0/0 0/0 .rodata @4456 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4456 = 35.0f; -COMPILER_STRIP_GATE(806F55A8, &lit_4456); +COMPILER_STRIP_GATE(0x806F55A8, &lit_4456); #pragma pop /* 806F55AC-806F55B0 000098 0004+00 0/2 0/0 0/0 .rodata @4457 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4457 = 400.0f; -COMPILER_STRIP_GATE(806F55AC, &lit_4457); +COMPILER_STRIP_GATE(0x806F55AC, &lit_4457); #pragma pop /* 806F55B0-806F55B4 00009C 0004+00 0/1 0/0 0/0 .rodata @4458 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4458 = 15.0f; -COMPILER_STRIP_GATE(806F55B0, &lit_4458); +COMPILER_STRIP_GATE(0x806F55B0, &lit_4458); #pragma pop /* 806F55B4-806F55B8 0000A0 0004+00 0/2 0/0 0/0 .rodata @4459 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4459 = 2.0f / 5.0f; -COMPILER_STRIP_GATE(806F55B4, &lit_4459); +COMPILER_STRIP_GATE(0x806F55B4, &lit_4459); #pragma pop /* 806F2054-806F28C8 0013F4 0874+00 1/1 0/0 0/0 .text e_hzelda_attack_c__FP14e_hzelda_class */ @@ -1120,84 +1126,84 @@ static asm void e_hzelda_damage(e_hzelda_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4611 = -150.0f; -COMPILER_STRIP_GATE(806F55B8, &lit_4611); +COMPILER_STRIP_GATE(0x806F55B8, &lit_4611); #pragma pop /* 806F55BC-806F55C0 0000A8 0004+00 0/1 0/0 0/0 .rodata @4612 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4612 = -400.0f; -COMPILER_STRIP_GATE(806F55BC, &lit_4612); +COMPILER_STRIP_GATE(0x806F55BC, &lit_4612); #pragma pop /* 806F55C0-806F55C4 0000AC 0004+00 0/1 0/0 0/0 .rodata @4613 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4613 = -1000.0f; -COMPILER_STRIP_GATE(806F55C0, &lit_4613); +COMPILER_STRIP_GATE(0x806F55C0, &lit_4613); #pragma pop /* 806F55C4-806F55C8 0000B0 0004+00 0/1 0/0 0/0 .rodata @4614 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4614 = 3500.0f; -COMPILER_STRIP_GATE(806F55C4, &lit_4614); +COMPILER_STRIP_GATE(0x806F55C4, &lit_4614); #pragma pop /* 806F55C8-806F55CC 0000B4 0004+00 0/1 0/0 0/0 .rodata @4615 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4615 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(806F55C8, &lit_4615); +COMPILER_STRIP_GATE(0x806F55C8, &lit_4615); #pragma pop /* 806F55CC-806F55D0 0000B8 0004+00 0/1 0/0 0/0 .rodata @4616 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4616 = -3500.0f; -COMPILER_STRIP_GATE(806F55CC, &lit_4616); +COMPILER_STRIP_GATE(0x806F55CC, &lit_4616); #pragma pop /* 806F55D0-806F55D4 0000BC 0004+00 0/1 0/0 0/0 .rodata @4617 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4617 = 2000.0f; -COMPILER_STRIP_GATE(806F55D0, &lit_4617); +COMPILER_STRIP_GATE(0x806F55D0, &lit_4617); #pragma pop /* 806F55D4-806F55D8 0000C0 0004+00 0/2 0/0 0/0 .rodata @4618 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4618 = -2000.0f; -COMPILER_STRIP_GATE(806F55D4, &lit_4618); +COMPILER_STRIP_GATE(0x806F55D4, &lit_4618); #pragma pop /* 806F55D8-806F55DC 0000C4 0004+00 0/1 0/0 0/0 .rodata @4619 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4619 = -0.5f; -COMPILER_STRIP_GATE(806F55D8, &lit_4619); +COMPILER_STRIP_GATE(0x806F55D8, &lit_4619); #pragma pop /* 806F55DC-806F55E0 0000C8 0004+00 0/2 0/0 0/0 .rodata @4620 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4620 = -10.0f; -COMPILER_STRIP_GATE(806F55DC, &lit_4620); +COMPILER_STRIP_GATE(0x806F55DC, &lit_4620); #pragma pop /* 806F55E0-806F55E4 0000CC 0004+00 0/1 0/0 0/0 .rodata @4621 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4621 = 9000.0f; -COMPILER_STRIP_GATE(806F55E0, &lit_4621); +COMPILER_STRIP_GATE(0x806F55E0, &lit_4621); #pragma pop /* 806F55E4-806F55E8 0000D0 0004+00 0/1 0/0 0/0 .rodata @4622 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4622 = -9000.0f; -COMPILER_STRIP_GATE(806F55E4, &lit_4622); +COMPILER_STRIP_GATE(0x806F55E4, &lit_4622); #pragma pop /* 806F2A3C-806F2F9C 001DDC 0560+00 1/1 0/0 0/0 .text action__FP14e_hzelda_class */ @@ -1226,42 +1232,42 @@ static asm void ball_bg_check(e_hzelda_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4742 = 55.0f; -COMPILER_STRIP_GATE(806F55E8, &lit_4742); +COMPILER_STRIP_GATE(0x806F55E8, &lit_4742); #pragma pop /* 806F55EC-806F55F0 0000D8 0004+00 0/1 0/0 0/0 .rodata @4743 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4743 = 500.0f; -COMPILER_STRIP_GATE(806F55EC, &lit_4743); +COMPILER_STRIP_GATE(0x806F55EC, &lit_4743); #pragma pop /* 806F55F0-806F55F4 0000DC 0004+00 0/1 0/0 0/0 .rodata @4744 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4744 = -300.0f; -COMPILER_STRIP_GATE(806F55F0, &lit_4744); +COMPILER_STRIP_GATE(0x806F55F0, &lit_4744); #pragma pop /* 806F55F4-806F55F8 0000E0 0004+00 0/1 0/0 0/0 .rodata @4745 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4745 = -100.0f; -COMPILER_STRIP_GATE(806F55F4, &lit_4745); +COMPILER_STRIP_GATE(0x806F55F4, &lit_4745); #pragma pop /* 806F55F8-806F55FC 0000E4 0004+00 0/1 0/0 0/0 .rodata @4746 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4746 = -50.0f; -COMPILER_STRIP_GATE(806F55F8, &lit_4746); +COMPILER_STRIP_GATE(0x806F55F8, &lit_4746); #pragma pop /* 806F55FC-806F5600 0000E8 0004+00 0/1 0/0 0/0 .rodata @4747 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4747 = 0x3C87FCB9; -COMPILER_STRIP_GATE(806F55FC, &lit_4747); +COMPILER_STRIP_GATE(0x806F55FC, &lit_4747); #pragma pop /* 806F3084-806F3388 002424 0304+00 1/1 0/0 0/0 .text demo_camera__FP14e_hzelda_class */ @@ -1279,21 +1285,21 @@ static asm void demo_camera(e_hzelda_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4795 = 21.0f; -COMPILER_STRIP_GATE(806F5600, &lit_4795); +COMPILER_STRIP_GATE(0x806F5600, &lit_4795); #pragma pop /* 806F5604-806F5608 0000F0 0004+00 0/1 0/0 0/0 .rodata @4796 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4796 = 36.0f; -COMPILER_STRIP_GATE(806F5604, &lit_4796); +COMPILER_STRIP_GATE(0x806F5604, &lit_4796); #pragma pop /* 806F5608-806F560C 0000F4 0004+00 0/1 0/0 0/0 .rodata @4797 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4797 = 26.0f; -COMPILER_STRIP_GATE(806F5608, &lit_4797); +COMPILER_STRIP_GATE(0x806F5608, &lit_4797); #pragma pop /* 806F3388-806F3590 002728 0208+00 1/1 0/0 0/0 .text anm_se_set__FP14e_hzelda_class */ @@ -1311,112 +1317,112 @@ static asm void anm_se_set(e_hzelda_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5410 = -200000.0f; -COMPILER_STRIP_GATE(806F560C, &lit_5410); +COMPILER_STRIP_GATE(0x806F560C, &lit_5410); #pragma pop /* 806F5610-806F5614 0000FC 0004+00 0/1 0/0 0/0 .rodata @5411 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5411 = 100000.0f; -COMPILER_STRIP_GATE(806F5610, &lit_5411); +COMPILER_STRIP_GATE(0x806F5610, &lit_5411); #pragma pop /* 806F5614-806F5618 000100 0004+00 0/1 0/0 0/0 .rodata @5412 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5412 = 20000.0f; -COMPILER_STRIP_GATE(806F5614, &lit_5412); +COMPILER_STRIP_GATE(0x806F5614, &lit_5412); #pragma pop /* 806F5618-806F561C 000104 0004+00 0/1 0/0 0/0 .rodata @5413 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5413 = 25.0f; -COMPILER_STRIP_GATE(806F5618, &lit_5413); +COMPILER_STRIP_GATE(0x806F5618, &lit_5413); #pragma pop /* 806F561C-806F5620 000108 0004+00 0/1 0/0 0/0 .rodata @5414 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5414 = -40.0f; -COMPILER_STRIP_GATE(806F561C, &lit_5414); +COMPILER_STRIP_GATE(0x806F561C, &lit_5414); #pragma pop /* 806F5620-806F5624 00010C 0004+00 0/1 0/0 0/0 .rodata @5415 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5415 = 110.0f; -COMPILER_STRIP_GATE(806F5620, &lit_5415); +COMPILER_STRIP_GATE(0x806F5620, &lit_5415); #pragma pop /* 806F5624-806F5628 000110 0004+00 0/1 0/0 0/0 .rodata @5416 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5416 = -80.0f; -COMPILER_STRIP_GATE(806F5624, &lit_5416); +COMPILER_STRIP_GATE(0x806F5624, &lit_5416); #pragma pop /* 806F5628-806F562C 000114 0004+00 0/1 0/0 0/0 .rodata @5417 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5417 = 1.0f / 50.0f; -COMPILER_STRIP_GATE(806F5628, &lit_5417); +COMPILER_STRIP_GATE(0x806F5628, &lit_5417); #pragma pop /* 806F562C-806F5630 000118 0004+00 0/1 0/0 0/0 .rodata @5418 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5418 = 140.0f; -COMPILER_STRIP_GATE(806F562C, &lit_5418); +COMPILER_STRIP_GATE(0x806F562C, &lit_5418); #pragma pop /* 806F5630-806F5634 00011C 0004+00 0/1 0/0 0/0 .rodata @5419 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5419 = 10000.0f; -COMPILER_STRIP_GATE(806F5630, &lit_5419); +COMPILER_STRIP_GATE(0x806F5630, &lit_5419); #pragma pop /* 806F5634-806F5638 000120 0004+00 0/1 0/0 0/0 .rodata @5420 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_5420 = 0x42652E14; -COMPILER_STRIP_GATE(806F5634, &lit_5420); +COMPILER_STRIP_GATE(0x806F5634, &lit_5420); #pragma pop /* 806F5638-806F563C 000124 0004+00 0/1 0/0 0/0 .rodata @5421 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5421 = 60.0f; -COMPILER_STRIP_GATE(806F5638, &lit_5421); +COMPILER_STRIP_GATE(0x806F5638, &lit_5421); #pragma pop /* 806F563C-806F5640 000128 0004+00 0/1 0/0 0/0 .rodata @5422 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5422 = 120.0f; -COMPILER_STRIP_GATE(806F563C, &lit_5422); +COMPILER_STRIP_GATE(0x806F563C, &lit_5422); #pragma pop /* 806F5640-806F5644 00012C 0004+00 0/1 0/0 0/0 .rodata @5423 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5423 = 180.0f; -COMPILER_STRIP_GATE(806F5640, &lit_5423); +COMPILER_STRIP_GATE(0x806F5640, &lit_5423); #pragma pop /* 806F5644-806F5648 000130 0004+00 0/1 0/0 0/0 .rodata @5424 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_5424 = 0x40490FDB; -COMPILER_STRIP_GATE(806F5644, &lit_5424); +COMPILER_STRIP_GATE(0x806F5644, &lit_5424); #pragma pop /* 806F5648-806F564C 000134 0004+00 0/1 0/0 0/0 .rodata @5425 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5425 = 1.0f / 40.0f; -COMPILER_STRIP_GATE(806F5648, &lit_5425); +COMPILER_STRIP_GATE(0x806F5648, &lit_5425); #pragma pop /* 806F5928-806F592C 000008 0004+00 2/2 0/0 0/0 .bss None */ @@ -1478,14 +1484,14 @@ asm J3DFrameCtrl::~J3DFrameCtrl() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5650 = -200.0f; -COMPILER_STRIP_GATE(806F564C, &lit_5650); +COMPILER_STRIP_GATE(0x806F564C, &lit_5650); #pragma pop /* 806F5650-806F5654 00013C 0004+00 0/1 0/0 0/0 .rodata @5651 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5651 = 70.0f; -COMPILER_STRIP_GATE(806F5650, &lit_5651); +COMPILER_STRIP_GATE(0x806F5650, &lit_5651); #pragma pop /* 806F4B1C-806F4E48 003EBC 032C+00 1/0 0/0 0/0 .text daE_HZELDA_Create__FP10fopAc_ac_c @@ -1611,7 +1617,7 @@ asm void __sinit_d_a_e_hzelda_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_806F54B4 = (void*)__sinit_d_a_e_hzelda_cpp; +REGISTER_CTORS(0x806F54B4, __sinit_d_a_e_hzelda_cpp); #pragma pop /* 806F54F0-806F54F8 004890 0008+00 1/0 0/0 0/0 .text @36@__dt__12dBgS_ObjAcchFv */ @@ -1634,9 +1640,4 @@ static asm void func_806F54F8() { } #pragma pop -/* 806F5654-806F565B 000140 0007+00 4/4 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_806F5654 = "Hzelda"; -#pragma pop +/* 806F5654-806F5654 000140 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/e/d_a_e_is/d_a_e_is.cpp b/rel/d/a/e/d_a_e_is/d_a_e_is.cpp index d638ee47f9d..12023e84756 100644 --- a/rel/d/a/e/d_a_e_is/d_a_e_is.cpp +++ b/rel/d/a/e/d_a_e_is/d_a_e_is.cpp @@ -19,16 +19,16 @@ struct mDoMtx_stack_c { static u8 now[48]; }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; - struct J3DAnmTransform {}; +struct J3DModelData {}; + +struct Z2Creature {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -84,10 +84,10 @@ struct dRes_control_c { struct dPa_levelEcallBack {}; -struct _GXColor {}; - struct csXyz {}; +struct _GXColor {}; + struct dPa_control_c { /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, @@ -350,34 +350,34 @@ extern "C" void __register_global_object(); /* ############################################################################################## */ /* 806F7B6C-806F7B70 000000 0004+00 14/14 0/0 0/0 .rodata @3648 */ SECTION_RODATA static f32 const lit_3648 = 1.0f; -COMPILER_STRIP_GATE(806F7B6C, &lit_3648); +COMPILER_STRIP_GATE(0x806F7B6C, &lit_3648); /* 806F7B70-806F7B74 000004 0004+00 0/1 0/0 0/0 .rodata @3649 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3649 = 7.0f; -COMPILER_STRIP_GATE(806F7B70, &lit_3649); +COMPILER_STRIP_GATE(0x806F7B70, &lit_3649); #pragma pop /* 806F7B74-806F7B78 000008 0004+00 0/1 0/0 0/0 .rodata @3650 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3650 = 300.0f; -COMPILER_STRIP_GATE(806F7B74, &lit_3650); +COMPILER_STRIP_GATE(0x806F7B74, &lit_3650); #pragma pop /* 806F7B78-806F7B7C 00000C 0004+00 0/2 0/0 0/0 .rodata @3651 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3651 = 200.0f; -COMPILER_STRIP_GATE(806F7B78, &lit_3651); +COMPILER_STRIP_GATE(0x806F7B78, &lit_3651); #pragma pop /* 806F7B7C-806F7B80 000010 0004+00 0/1 0/0 0/0 .rodata @3652 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3652 = 120.0f; -COMPILER_STRIP_GATE(806F7B7C, &lit_3652); +COMPILER_STRIP_GATE(0x806F7B7C, &lit_3652); #pragma pop /* 806F7C1C-806F7C28 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ @@ -534,11 +534,17 @@ SECTION_RODATA static u8 const lit_3666[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(806F7B80, &lit_3666); +COMPILER_STRIP_GATE(0x806F7B80, &lit_3666); /* 806F7B84-806F7B88 000018 0004+00 1/1 0/0 0/0 .rodata @3667 */ SECTION_RODATA static f32 const lit_3667 = -1.0f; -COMPILER_STRIP_GATE(806F7B84, &lit_3667); +COMPILER_STRIP_GATE(0x806F7B84, &lit_3667); + +/* 806F7C14-806F7C14 0000A8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_806F7C14 = "E_IS"; +#pragma pop /* 806F5A94-806F5B40 000134 00AC+00 7/7 0/0 0/0 .text anm_init__FP10e_is_classifUcf */ #pragma push @@ -555,77 +561,77 @@ static asm void anm_init(e_is_class* param_0, int param_1, f32 param_2, u8 param #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3710 = 242.0f; -COMPILER_STRIP_GATE(806F7B88, &lit_3710); +COMPILER_STRIP_GATE(0x806F7B88, &lit_3710); #pragma pop /* 806F7B8C-806F7B90 000020 0004+00 0/1 0/0 0/0 .rodata @3711 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3711 = 117.0f; -COMPILER_STRIP_GATE(806F7B8C, &lit_3711); +COMPILER_STRIP_GATE(0x806F7B8C, &lit_3711); #pragma pop /* 806F7B90-806F7B94 000024 0004+00 0/1 0/0 0/0 .rodata @3712 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3712 = 255.0f; -COMPILER_STRIP_GATE(806F7B90, &lit_3712); +COMPILER_STRIP_GATE(0x806F7B90, &lit_3712); #pragma pop /* 806F7B94-806F7B98 000028 0004+00 0/2 0/0 0/0 .rodata @3713 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3713 = 80.0f; -COMPILER_STRIP_GATE(806F7B94, &lit_3713); +COMPILER_STRIP_GATE(0x806F7B94, &lit_3713); #pragma pop /* 806F7B98-806F7B9C 00002C 0004+00 0/6 0/0 0/0 .rodata @3714 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3714 = 10.0f; -COMPILER_STRIP_GATE(806F7B98, &lit_3714); +COMPILER_STRIP_GATE(0x806F7B98, &lit_3714); #pragma pop /* 806F7B9C-806F7BA0 000030 0004+00 0/1 0/0 0/0 .rodata @3715 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3715 = 55.0f; -COMPILER_STRIP_GATE(806F7B9C, &lit_3715); +COMPILER_STRIP_GATE(0x806F7B9C, &lit_3715); #pragma pop /* 806F7BA0-806F7BA4 000034 0004+00 0/1 0/0 0/0 .rodata @3716 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3716 = 60.0f; -COMPILER_STRIP_GATE(806F7BA0, &lit_3716); +COMPILER_STRIP_GATE(0x806F7BA0, &lit_3716); #pragma pop /* 806F7BA4-806F7BA8 000038 0004+00 0/1 0/0 0/0 .rodata @3717 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3717 = 225.0f; -COMPILER_STRIP_GATE(806F7BA4, &lit_3717); +COMPILER_STRIP_GATE(0x806F7BA4, &lit_3717); #pragma pop /* 806F7BA8-806F7BAC 00003C 0004+00 0/2 0/0 0/0 .rodata @3718 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3718 = 150.0f; -COMPILER_STRIP_GATE(806F7BA8, &lit_3718); +COMPILER_STRIP_GATE(0x806F7BA8, &lit_3718); #pragma pop /* 806F7BAC-806F7BB0 000040 0004+00 0/4 0/0 0/0 .rodata @3719 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3719 = 50.0f; -COMPILER_STRIP_GATE(806F7BAC, &lit_3719); +COMPILER_STRIP_GATE(0x806F7BAC, &lit_3719); #pragma pop /* 806F7BB0-806F7BB4 000044 0004+00 0/1 0/0 0/0 .rodata @3720 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3720 = 600.0f; -COMPILER_STRIP_GATE(806F7BB0, &lit_3720); +COMPILER_STRIP_GATE(0x806F7BB0, &lit_3720); #pragma pop /* 806F5B40-806F5E38 0001E0 02F8+00 1/0 0/0 0/0 .text daE_IS_Draw__FP10e_is_class */ @@ -703,7 +709,7 @@ static asm void e_is_move(e_is_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3917 = 100000.0f; -COMPILER_STRIP_GATE(806F7BB4, &lit_3917); +COMPILER_STRIP_GATE(0x806F7BB4, &lit_3917); #pragma pop /* 806F63FC-806F65BC 000A9C 01C0+00 1/1 0/0 0/0 .text e_is_attack__FP10e_is_class */ @@ -721,14 +727,14 @@ static asm void e_is_attack(e_is_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3965 = 20.0f; -COMPILER_STRIP_GATE(806F7BB8, &lit_3965); +COMPILER_STRIP_GATE(0x806F7BB8, &lit_3965); #pragma pop /* 806F7BBC-806F7BC0 000050 0004+00 0/3 0/0 0/0 .rodata @3966 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3966 = 2.0f; -COMPILER_STRIP_GATE(806F7BBC, &lit_3966); +COMPILER_STRIP_GATE(0x806F7BBC, &lit_3966); #pragma pop /* 806F65BC-806F67B0 000C5C 01F4+00 1/1 0/0 0/0 .text e_is_trap__FP10e_is_class */ @@ -746,35 +752,35 @@ static asm void e_is_trap(e_is_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3967 = 29.0f; -COMPILER_STRIP_GATE(806F7BC0, &lit_3967); +COMPILER_STRIP_GATE(0x806F7BC0, &lit_3967); #pragma pop /* 806F7BC4-806F7BC8 000058 0004+00 0/1 0/0 0/0 .rodata @3968 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3968 = 0.5f; -COMPILER_STRIP_GATE(806F7BC4, &lit_3968); +COMPILER_STRIP_GATE(0x806F7BC4, &lit_3968); #pragma pop /* 806F7BC8-806F7BCC 00005C 0004+00 0/0 0/0 0/0 .rodata @3969 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3969 = 3.0f; -COMPILER_STRIP_GATE(806F7BC8, &lit_3969); +COMPILER_STRIP_GATE(0x806F7BC8, &lit_3969); #pragma pop /* 806F7BCC-806F7BD0 000060 0004+00 0/1 0/0 0/0 .rodata @3970 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3970 = -1040.0f; -COMPILER_STRIP_GATE(806F7BCC, &lit_3970); +COMPILER_STRIP_GATE(0x806F7BCC, &lit_3970); #pragma pop /* 806F7BD0-806F7BD4 000064 0004+00 0/1 0/0 0/0 .rodata @4007 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4007 = 1.0f / 100.0f; -COMPILER_STRIP_GATE(806F7BD0, &lit_4007); +COMPILER_STRIP_GATE(0x806F7BD0, &lit_4007); #pragma pop /* 806F67B0-806F691C 000E50 016C+00 1/1 0/0 0/0 .text e_is_poweroff__FP10e_is_class */ @@ -792,7 +798,7 @@ static asm void e_is_poweroff(e_is_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4031 = 5.0f; -COMPILER_STRIP_GATE(806F7BD4, &lit_4031); +COMPILER_STRIP_GATE(0x806F7BD4, &lit_4031); #pragma pop /* 806F691C-806F6A38 000FBC 011C+00 1/1 0/0 0/0 .text e_is_damage__FP10e_is_class */ @@ -830,7 +836,7 @@ static asm void e_is_sekizou(e_is_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4102 = 1000.0f; -COMPILER_STRIP_GATE(806F7BD8, &lit_4102); +COMPILER_STRIP_GATE(0x806F7BD8, &lit_4102); #pragma pop /* 806F6B7C-806F6D90 00121C 0214+00 1/1 0/0 0/0 .text action__FP10e_is_class */ @@ -846,11 +852,11 @@ static asm void action(e_is_class* param_0) { /* ############################################################################################## */ /* 806F7BDC-806F7BE0 000070 0004+00 1/1 0/0 0/0 .rodata @4120 */ SECTION_RODATA static f32 const lit_4120 = 39.0f; -COMPILER_STRIP_GATE(806F7BDC, &lit_4120); +COMPILER_STRIP_GATE(0x806F7BDC, &lit_4120); /* 806F7BE0-806F7BE4 000074 0004+00 1/1 0/0 0/0 .rodata @4121 */ SECTION_RODATA static f32 const lit_4121 = 19.0f; -COMPILER_STRIP_GATE(806F7BE0, &lit_4121); +COMPILER_STRIP_GATE(0x806F7BE0, &lit_4121); /* 806F6D90-806F6E58 001430 00C8+00 1/1 0/0 0/0 .text anm_se_set__FP10e_is_class */ #pragma push @@ -867,49 +873,49 @@ static asm void anm_se_set(e_is_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4205 = 1.0f / 50.0f; -COMPILER_STRIP_GATE(806F7BE4, &lit_4205); +COMPILER_STRIP_GATE(0x806F7BE4, &lit_4205); #pragma pop /* 806F7BE8-806F7BEC 00007C 0004+00 0/1 0/0 0/0 .rodata @4206 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4206 = 100.0f; -COMPILER_STRIP_GATE(806F7BE8, &lit_4206); +COMPILER_STRIP_GATE(0x806F7BE8, &lit_4206); #pragma pop /* 806F7BEC-806F7BF0 000080 0004+00 0/1 0/0 0/0 .rodata @4207 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4207 = 20000.0f; -COMPILER_STRIP_GATE(806F7BEC, &lit_4207); +COMPILER_STRIP_GATE(0x806F7BEC, &lit_4207); #pragma pop /* 806F7BF0-806F7BF4 000084 0004+00 0/1 0/0 0/0 .rodata @4208 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4208 = -30000.0f; -COMPILER_STRIP_GATE(806F7BF0, &lit_4208); +COMPILER_STRIP_GATE(0x806F7BF0, &lit_4208); #pragma pop /* 806F7BF4-806F7BF8 000088 0004+00 0/1 0/0 0/0 .rodata @4209 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4209 = 15000.0f; -COMPILER_STRIP_GATE(806F7BF4, &lit_4209); +COMPILER_STRIP_GATE(0x806F7BF4, &lit_4209); #pragma pop /* 806F7BF8-806F7BFC 00008C 0004+00 0/1 0/0 0/0 .rodata @4210 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4210 = 30.0f; -COMPILER_STRIP_GATE(806F7BF8, &lit_4210); +COMPILER_STRIP_GATE(0x806F7BF8, &lit_4210); #pragma pop /* 806F7BFC-806F7C00 000090 0004+00 0/1 0/0 0/0 .rodata @4211 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4211 = 15350.0f; -COMPILER_STRIP_GATE(806F7BFC, &lit_4211); +COMPILER_STRIP_GATE(0x806F7BFC, &lit_4211); #pragma pop /* 806F6E58-806F7204 0014F8 03AC+00 2/1 0/0 0/0 .text daE_IS_Execute__FP10e_is_class */ @@ -952,35 +958,35 @@ static asm void useHeapInit(fopAc_ac_c* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4332 = -500.0f; -COMPILER_STRIP_GATE(806F7C00, &lit_4332); +COMPILER_STRIP_GATE(0x806F7C00, &lit_4332); #pragma pop /* 806F7C04-806F7C08 000098 0004+00 0/1 0/0 0/0 .rodata @4333 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4333 = -200.0f; -COMPILER_STRIP_GATE(806F7C04, &lit_4333); +COMPILER_STRIP_GATE(0x806F7C04, &lit_4333); #pragma pop /* 806F7C08-806F7C0C 00009C 0004+00 0/1 0/0 0/0 .rodata @4334 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4334 = 500.0f; -COMPILER_STRIP_GATE(806F7C08, &lit_4334); +COMPILER_STRIP_GATE(0x806F7C08, &lit_4334); #pragma pop /* 806F7C0C-806F7C10 0000A0 0004+00 0/1 0/0 0/0 .rodata @4335 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4335 = -7.0f; -COMPILER_STRIP_GATE(806F7C0C, &lit_4335); +COMPILER_STRIP_GATE(0x806F7C0C, &lit_4335); #pragma pop /* 806F7C10-806F7C14 0000A4 0004+00 0/1 0/0 0/0 .rodata @4336 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4336 = 3650.0f; -COMPILER_STRIP_GATE(806F7C10, &lit_4336); +COMPILER_STRIP_GATE(0x806F7C10, &lit_4336); #pragma pop /* 806F736C-806F76B4 001A0C 0348+00 1/0 0/0 0/0 .text daE_IS_Create__FP10fopAc_ac_c */ @@ -1095,7 +1101,7 @@ asm void __sinit_d_a_e_is_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_806F7B0C = (void*)__sinit_d_a_e_is_cpp; +REGISTER_CTORS(0x806F7B0C, __sinit_d_a_e_is_cpp); #pragma pop /* 806F7B48-806F7B50 0021E8 0008+00 1/0 0/0 0/0 .text @36@__dt__12dBgS_ObjAcchFv */ @@ -1118,9 +1124,4 @@ static asm void func_806F7B50() { } #pragma pop -/* 806F7C14-806F7C19 0000A8 0005+00 4/4 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_806F7C14 = "E_IS"; -#pragma pop +/* 806F7C14-806F7C14 0000A8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/e/d_a_e_kg/d_a_e_kg.cpp b/rel/d/a/e/d_a_e_kg/d_a_e_kg.cpp index ead6b814d31..5102578065e 100644 --- a/rel/d/a/e/d_a_e_kg/d_a_e_kg.cpp +++ b/rel/d/a/e/d_a_e_kg/d_a_e_kg.cpp @@ -28,16 +28,16 @@ struct mDoExt_btpAnm { /* 8000D5E8 */ void entry(J3DMaterialTable*, s16); }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; - struct J3DAnmTransform {}; +struct J3DModelData {}; + +struct Z2Creature {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -92,10 +92,10 @@ struct dRes_control_c { struct dPa_levelEcallBack {}; -struct _GXColor {}; - struct csXyz {}; +struct _GXColor {}; + struct dPa_control_c { /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, @@ -369,7 +369,7 @@ extern "C" void __register_global_object(); /* ############################################################################################## */ /* 806FA3A4-806FA3A8 000000 0004+00 13/13 0/0 0/0 .rodata @3788 */ SECTION_RODATA static f32 const lit_3788 = 100.0f; -COMPILER_STRIP_GATE(806FA3A4, &lit_3788); +COMPILER_STRIP_GATE(0x806FA3A4, &lit_3788); /* 806FA3A8-806FA3AC 000004 0004+00 2/10 0/0 0/0 .rodata @3789 */ SECTION_RODATA static u8 const lit_3789[4] = { @@ -378,7 +378,7 @@ SECTION_RODATA static u8 const lit_3789[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(806FA3A8, &lit_3789); +COMPILER_STRIP_GATE(0x806FA3A8, &lit_3789); /* 806FA3AC-806FA3B4 000008 0004+04 1/10 0/0 0/0 .rodata @3790 */ SECTION_RODATA static f32 const lit_3790[1 + 1 /* padding */] = { @@ -386,7 +386,7 @@ SECTION_RODATA static f32 const lit_3790[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(806FA3AC, &lit_3790); +COMPILER_STRIP_GATE(0x806FA3AC, &lit_3790); /* 806FA3B4-806FA3BC 000010 0008+00 0/1 0/0 0/0 .rodata @3791 */ #pragma push @@ -394,7 +394,7 @@ COMPILER_STRIP_GATE(806FA3AC, &lit_3790); SECTION_RODATA static u8 const lit_3791[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(806FA3B4, &lit_3791); +COMPILER_STRIP_GATE(0x806FA3B4, &lit_3791); #pragma pop /* 806FA3BC-806FA3C4 000018 0008+00 0/1 0/0 0/0 .rodata @3792 */ @@ -403,7 +403,7 @@ COMPILER_STRIP_GATE(806FA3B4, &lit_3791); SECTION_RODATA static u8 const lit_3792[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(806FA3BC, &lit_3792); +COMPILER_STRIP_GATE(0x806FA3BC, &lit_3792); #pragma pop /* 806FA3C4-806FA3CC 000020 0008+00 0/1 0/0 0/0 .rodata @3793 */ @@ -412,35 +412,35 @@ COMPILER_STRIP_GATE(806FA3BC, &lit_3792); SECTION_RODATA static u8 const lit_3793[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(806FA3C4, &lit_3793); +COMPILER_STRIP_GATE(0x806FA3C4, &lit_3793); #pragma pop /* 806FA3CC-806FA3D0 000028 0004+00 0/1 0/0 0/0 .rodata @3794 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3794 = 1.0f / 100.0f; -COMPILER_STRIP_GATE(806FA3CC, &lit_3794); +COMPILER_STRIP_GATE(0x806FA3CC, &lit_3794); #pragma pop /* 806FA3D0-806FA3D4 00002C 0004+00 0/1 0/0 0/0 .rodata @3809 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3809 = 13.0f / 10.0f; -COMPILER_STRIP_GATE(806FA3D0, &lit_3809); +COMPILER_STRIP_GATE(0x806FA3D0, &lit_3809); #pragma pop /* 806FA3D4-806FA3D8 000030 0004+00 0/1 0/0 0/0 .rodata @3810 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3810 = 10.0f; -COMPILER_STRIP_GATE(806FA3D4, &lit_3810); +COMPILER_STRIP_GATE(0x806FA3D4, &lit_3810); #pragma pop /* 806FA3D8-806FA3DC 000034 0004+00 0/1 0/0 0/0 .rodata @3811 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3811 = 600.0f; -COMPILER_STRIP_GATE(806FA3D8, &lit_3811); +COMPILER_STRIP_GATE(0x806FA3D8, &lit_3811); #pragma pop /* 806FA474-806FA480 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ @@ -613,7 +613,13 @@ asm daE_KG_HIO_c::daE_KG_HIO_c() { /* ############################################################################################## */ /* 806FA3DC-806FA3E0 000038 0004+00 1/1 0/0 0/0 .rodata @3825 */ SECTION_RODATA static f32 const lit_3825 = -1.0f; -COMPILER_STRIP_GATE(806FA3DC, &lit_3825); +COMPILER_STRIP_GATE(0x806FA3DC, &lit_3825); + +/* 806FA46C-806FA46C 0000C8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_806FA46C = "E_kg"; +#pragma pop /* 806F7F24-806F7FD0 000124 00AC+00 6/6 0/0 0/0 .text anm_init__FP10e_kg_classifUcf */ #pragma push @@ -628,13 +634,13 @@ static asm void anm_init(e_kg_class* param_0, int param_1, f32 param_2, u8 param /* ############################################################################################## */ /* 806FA3E0-806FA3E4 00003C 0004+00 2/7 0/0 0/0 .rodata @3853 */ SECTION_RODATA static f32 const lit_3853 = 50.0f; -COMPILER_STRIP_GATE(806FA3E0, &lit_3853); +COMPILER_STRIP_GATE(0x806FA3E0, &lit_3853); /* 806FA3E4-806FA3E8 000040 0004+00 0/1 0/0 0/0 .rodata @3854 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3854 = 700.0f; -COMPILER_STRIP_GATE(806FA3E4, &lit_3854); +COMPILER_STRIP_GATE(0x806FA3E4, &lit_3854); #pragma pop /* 806F7FD0-806F80D0 0001D0 0100+00 1/0 0/0 0/0 .text daE_KG_Draw__FP10e_kg_class */ @@ -693,42 +699,42 @@ static asm void way_bg_check(e_kg_class* param_0, f32 param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4001 = 0.5f; -COMPILER_STRIP_GATE(806FA3E8, &lit_4001); +COMPILER_STRIP_GATE(0x806FA3E8, &lit_4001); #pragma pop /* 806FA3EC-806FA3F0 000048 0004+00 0/1 0/0 0/0 .rodata @4002 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4002 = 200.0f; -COMPILER_STRIP_GATE(806FA3EC, &lit_4002); +COMPILER_STRIP_GATE(0x806FA3EC, &lit_4002); #pragma pop /* 806FA3F0-806FA3F4 00004C 0004+00 0/1 0/0 0/0 .rodata @4003 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4003 = 32768.0f; -COMPILER_STRIP_GATE(806FA3F0, &lit_4003); +COMPILER_STRIP_GATE(0x806FA3F0, &lit_4003); #pragma pop /* 806FA3F4-806FA3F8 000050 0004+00 0/2 0/0 0/0 .rodata @4004 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4004 = 10000.0f; -COMPILER_STRIP_GATE(806FA3F4, &lit_4004); +COMPILER_STRIP_GATE(0x806FA3F4, &lit_4004); #pragma pop /* 806FA3F8-806FA3FC 000054 0004+00 0/1 0/0 0/0 .rodata @4005 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4005 = 400.0f; -COMPILER_STRIP_GATE(806FA3F8, &lit_4005); +COMPILER_STRIP_GATE(0x806FA3F8, &lit_4005); #pragma pop /* 806FA3FC-806FA400 000058 0004+00 0/7 0/0 0/0 .rodata @4006 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4006 = 5.0f; -COMPILER_STRIP_GATE(806FA3FC, &lit_4006); +COMPILER_STRIP_GATE(0x806FA3FC, &lit_4006); #pragma pop /* 806FA5E8-806FA5EC 000008 0004+00 2/2 0/0 0/0 .bss None */ @@ -755,49 +761,49 @@ static asm void e_kg_move(e_kg_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4075 = 2.0f; -COMPILER_STRIP_GATE(806FA400, &lit_4075); +COMPILER_STRIP_GATE(0x806FA400, &lit_4075); #pragma pop /* 806FA404-806FA408 000060 0004+00 0/1 0/0 0/0 .rodata @4076 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4076 = 300.0f; -COMPILER_STRIP_GATE(806FA404, &lit_4076); +COMPILER_STRIP_GATE(0x806FA404, &lit_4076); #pragma pop /* 806FA408-806FA40C 000064 0004+00 0/2 0/0 0/0 .rodata @4077 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4077 = 20.0f; -COMPILER_STRIP_GATE(806FA408, &lit_4077); +COMPILER_STRIP_GATE(0x806FA408, &lit_4077); #pragma pop /* 806FA40C-806FA410 000068 0004+00 0/1 0/0 0/0 .rodata @4078 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4078 = 40.0f; -COMPILER_STRIP_GATE(806FA40C, &lit_4078); +COMPILER_STRIP_GATE(0x806FA40C, &lit_4078); #pragma pop /* 806FA410-806FA414 00006C 0004+00 0/1 0/0 0/0 .rodata @4079 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4079 = -10.0f; -COMPILER_STRIP_GATE(806FA410, &lit_4079); +COMPILER_STRIP_GATE(0x806FA410, &lit_4079); #pragma pop /* 806FA414-806FA418 000070 0004+00 0/2 0/0 0/0 .rodata @4080 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4080 = 15.0f; -COMPILER_STRIP_GATE(806FA414, &lit_4080); +COMPILER_STRIP_GATE(0x806FA414, &lit_4080); #pragma pop /* 806FA418-806FA41C 000074 0004+00 0/2 0/0 0/0 .rodata @4081 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4081 = 30.0f; -COMPILER_STRIP_GATE(806FA418, &lit_4081); +COMPILER_STRIP_GATE(0x806FA418, &lit_4081); #pragma pop /* 806F8714-806F8A40 000914 032C+00 1/1 0/0 0/0 .text e_kg_attack__FP10e_kg_class */ @@ -815,35 +821,35 @@ static asm void e_kg_attack(e_kg_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4101 = 3.0f; -COMPILER_STRIP_GATE(806FA41C, &lit_4101); +COMPILER_STRIP_GATE(0x806FA41C, &lit_4101); #pragma pop /* 806FA420-806FA424 00007C 0004+00 0/1 0/0 0/0 .rodata @4102 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4102 = -50.0f; -COMPILER_STRIP_GATE(806FA420, &lit_4102); +COMPILER_STRIP_GATE(0x806FA420, &lit_4102); #pragma pop /* 806FA424-806FA428 000080 0004+00 0/1 0/0 0/0 .rodata @4103 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4103 = 4.0f / 5.0f; -COMPILER_STRIP_GATE(806FA424, &lit_4103); +COMPILER_STRIP_GATE(0x806FA424, &lit_4103); #pragma pop /* 806FA428-806FA42C 000084 0004+00 0/2 0/0 0/0 .rodata @4104 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4104 = 4.0f; -COMPILER_STRIP_GATE(806FA428, &lit_4104); +COMPILER_STRIP_GATE(0x806FA428, &lit_4104); #pragma pop /* 806FA42C-806FA430 000088 0004+00 0/2 0/0 0/0 .rodata @4105 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4105 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(806FA42C, &lit_4105); +COMPILER_STRIP_GATE(0x806FA42C, &lit_4105); #pragma pop /* 806F8A40-806F8B50 000C40 0110+00 1/1 0/0 0/0 .text e_kg_back__FP10e_kg_class */ @@ -861,7 +867,7 @@ static asm void e_kg_back(e_kg_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4126 = -40.0f; -COMPILER_STRIP_GATE(806FA430, &lit_4126); +COMPILER_STRIP_GATE(0x806FA430, &lit_4126); #pragma pop /* 806F8B50-806F8C90 000D50 0140+00 1/1 0/0 0/0 .text e_kg_s_damage__FP10e_kg_class */ @@ -879,49 +885,49 @@ static asm void e_kg_s_damage(e_kg_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4163 = 45.0f; -COMPILER_STRIP_GATE(806FA434, &lit_4163); +COMPILER_STRIP_GATE(0x806FA434, &lit_4163); #pragma pop /* 806FA438-806FA43C 000094 0004+00 0/1 0/0 0/0 .rodata @4164 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4164 = -35.0f; -COMPILER_STRIP_GATE(806FA438, &lit_4164); +COMPILER_STRIP_GATE(0x806FA438, &lit_4164); #pragma pop /* 806FA43C-806FA440 000098 0004+00 0/1 0/0 0/0 .rodata @4165 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4165 = 1700.0f; -COMPILER_STRIP_GATE(806FA43C, &lit_4165); +COMPILER_STRIP_GATE(0x806FA43C, &lit_4165); #pragma pop /* 806FA440-806FA444 00009C 0004+00 0/1 0/0 0/0 .rodata @4166 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4166 = 0.75f; -COMPILER_STRIP_GATE(806FA440, &lit_4166); +COMPILER_STRIP_GATE(0x806FA440, &lit_4166); #pragma pop /* 806FA444-806FA448 0000A0 0004+00 0/1 0/0 0/0 .rodata @4167 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4167 = 11.0f / 10.0f; -COMPILER_STRIP_GATE(806FA444, &lit_4167); +COMPILER_STRIP_GATE(0x806FA444, &lit_4167); #pragma pop /* 806FA448-806FA44C 0000A4 0004+00 0/1 0/0 0/0 .rodata @4168 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4168 = 0x3C75C28F; -COMPILER_STRIP_GATE(806FA448, &lit_4168); +COMPILER_STRIP_GATE(0x806FA448, &lit_4168); #pragma pop /* 806FA44C-806FA450 0000A8 0004+00 0/1 0/0 0/0 .rodata @4169 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4169 = 7.0f / 10.0f; -COMPILER_STRIP_GATE(806FA44C, &lit_4169); +COMPILER_STRIP_GATE(0x806FA44C, &lit_4169); #pragma pop /* 806F8C90-806F8F04 000E90 0274+00 1/1 0/0 0/0 .text e_kg_damage__FP10e_kg_class */ @@ -939,7 +945,7 @@ static asm void e_kg_damage(e_kg_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4198 = 25.0f; -COMPILER_STRIP_GATE(806FA450, &lit_4198); +COMPILER_STRIP_GATE(0x806FA450, &lit_4198); #pragma pop /* 806F8F04-806F90F8 001104 01F4+00 1/1 0/0 0/0 .text e_kg_roof__FP10e_kg_class */ @@ -969,28 +975,28 @@ static asm void action(e_kg_class* param_0) { SECTION_RODATA static u8 const lit_4278[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(806FA454, &lit_4278); +COMPILER_STRIP_GATE(0x806FA454, &lit_4278); #pragma pop /* 806FA45C-806FA460 0000B8 0004+00 0/1 0/0 0/0 .rodata @4296 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4296 = 9.0f; -COMPILER_STRIP_GATE(806FA45C, &lit_4296); +COMPILER_STRIP_GATE(0x806FA45C, &lit_4296); #pragma pop /* 806FA460-806FA464 0000BC 0004+00 0/1 0/0 0/0 .rodata @4297 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4297 = 16.0f; -COMPILER_STRIP_GATE(806FA460, &lit_4297); +COMPILER_STRIP_GATE(0x806FA460, &lit_4297); #pragma pop /* 806FA464-806FA468 0000C0 0004+00 0/1 0/0 0/0 .rodata @4298 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4298 = 23.0f; -COMPILER_STRIP_GATE(806FA464, &lit_4298); +COMPILER_STRIP_GATE(0x806FA464, &lit_4298); #pragma pop /* 806F9400-806F94D0 001600 00D0+00 1/1 0/0 0/0 .text anm_se_set__FP10e_kg_class */ @@ -1051,7 +1057,7 @@ asm J3DFrameCtrl::~J3DFrameCtrl() { /* ############################################################################################## */ /* 806FA468-806FA46C 0000C4 0004+00 1/1 0/0 0/0 .rodata @4549 */ SECTION_RODATA static f32 const lit_4549 = 65535.0f; -COMPILER_STRIP_GATE(806FA468, &lit_4549); +COMPILER_STRIP_GATE(0x806FA468, &lit_4549); /* 806F9A00-806F9CD4 001C00 02D4+00 1/0 0/0 0/0 .text daE_KG_Create__FP10fopAc_ac_c */ #pragma push @@ -1145,7 +1151,7 @@ asm void __sinit_d_a_e_kg_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_806F9F30 = (void*)__sinit_d_a_e_kg_cpp; +REGISTER_CTORS(0x806F9F30, __sinit_d_a_e_kg_cpp); #pragma pop /* 806F9F6C-806F9F74 00216C 0008+00 1/0 0/0 0/0 .text @36@__dt__12dBgS_ObjAcchFv */ @@ -1180,9 +1186,4 @@ static asm void setMidnaBindEffect(fopEn_enemy_c* param_0, Z2CreatureEnemy* para } #pragma pop -/* 806FA46C-806FA471 0000C8 0005+00 4/4 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_806FA46C = "E_kg"; -#pragma pop +/* 806FA46C-806FA46C 0000C8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/e/d_a_e_kk/d_a_e_kk.cpp b/rel/d/a/e/d_a_e_kk/d_a_e_kk.cpp index 3c99a20ca2b..6cb7cea55b3 100644 --- a/rel/d/a/e/d_a_e_kk/d_a_e_kk.cpp +++ b/rel/d/a/e/d_a_e_kk/d_a_e_kk.cpp @@ -22,16 +22,16 @@ struct mDoMtx_stack_c { static u8 now[48]; }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; - struct J3DAnmTransform {}; +struct J3DModelData {}; + +struct Z2Creature {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -52,10 +52,10 @@ struct daPy_py_c { static u8 m_midnaActor[4]; }; -struct J3DJoint {}; - struct J3DModel {}; +struct J3DJoint {}; + struct Vec {}; struct cXyz { @@ -484,7 +484,7 @@ extern "C" void __register_global_object(); /* ############################################################################################## */ /* 806FF5E8-806FF5EC 000000 0004+00 21/21 0/0 0/0 .rodata @3792 */ SECTION_RODATA static f32 const lit_3792 = 100.0f; -COMPILER_STRIP_GATE(806FF5E8, &lit_3792); +COMPILER_STRIP_GATE(0x806FF5E8, &lit_3792); /* 806FF5EC-806FF5F0 000004 0004+00 2/17 0/0 0/0 .rodata @3793 */ SECTION_RODATA static u8 const lit_3793[4] = { @@ -493,7 +493,7 @@ SECTION_RODATA static u8 const lit_3793[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(806FF5EC, &lit_3793); +COMPILER_STRIP_GATE(0x806FF5EC, &lit_3793); /* 806FF5F0-806FF5F8 000008 0004+04 2/17 0/0 0/0 .rodata @3794 */ SECTION_RODATA static f32 const lit_3794[1 + 1 /* padding */] = { @@ -501,7 +501,7 @@ SECTION_RODATA static f32 const lit_3794[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(806FF5F0, &lit_3794); +COMPILER_STRIP_GATE(0x806FF5F0, &lit_3794); /* 806FF5F8-806FF600 000010 0008+00 0/1 0/0 0/0 .rodata @3795 */ #pragma push @@ -509,7 +509,7 @@ COMPILER_STRIP_GATE(806FF5F0, &lit_3794); SECTION_RODATA static u8 const lit_3795[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(806FF5F8, &lit_3795); +COMPILER_STRIP_GATE(0x806FF5F8, &lit_3795); #pragma pop /* 806FF600-806FF608 000018 0008+00 0/1 0/0 0/0 .rodata @3796 */ @@ -518,7 +518,7 @@ COMPILER_STRIP_GATE(806FF5F8, &lit_3795); SECTION_RODATA static u8 const lit_3796[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(806FF600, &lit_3796); +COMPILER_STRIP_GATE(0x806FF600, &lit_3796); #pragma pop /* 806FF608-806FF610 000020 0008+00 0/1 0/0 0/0 .rodata @3797 */ @@ -527,35 +527,35 @@ COMPILER_STRIP_GATE(806FF600, &lit_3796); SECTION_RODATA static u8 const lit_3797[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(806FF608, &lit_3797); +COMPILER_STRIP_GATE(0x806FF608, &lit_3797); #pragma pop /* 806FF610-806FF614 000028 0004+00 0/1 0/0 0/0 .rodata @3798 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3798 = 1.0f / 100.0f; -COMPILER_STRIP_GATE(806FF610, &lit_3798); +COMPILER_STRIP_GATE(0x806FF610, &lit_3798); #pragma pop /* 806FF614-806FF618 00002C 0004+00 0/1 0/0 0/0 .rodata @3813 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3813 = 1500.0f; -COMPILER_STRIP_GATE(806FF614, &lit_3813); +COMPILER_STRIP_GATE(0x806FF614, &lit_3813); #pragma pop /* 806FF618-806FF61C 000030 0004+00 0/1 0/0 0/0 .rodata @3814 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3814 = 900.0f; -COMPILER_STRIP_GATE(806FF618, &lit_3814); +COMPILER_STRIP_GATE(0x806FF618, &lit_3814); #pragma pop /* 806FF61C-806FF620 000034 0004+00 0/2 0/0 0/0 .rodata @3815 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3815 = 1000.0f; -COMPILER_STRIP_GATE(806FF61C, &lit_3815); +COMPILER_STRIP_GATE(0x806FF61C, &lit_3815); #pragma pop /* 806FF6C4-806FF6D0 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ @@ -755,14 +755,14 @@ asm void daE_KK_c::JointCallBack(J3DJoint* param_0, int param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3920 = 10.0f; -COMPILER_STRIP_GATE(806FF620, &lit_3920); +COMPILER_STRIP_GATE(0x806FF620, &lit_3920); #pragma pop /* 806FF624-806FF628 00003C 0004+00 0/2 0/0 0/0 .rodata @3921 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3921 = 2000.0f; -COMPILER_STRIP_GATE(806FF624, &lit_3921); +COMPILER_STRIP_GATE(0x806FF624, &lit_3921); #pragma pop /* 806FA848-806FAA48 000228 0200+00 1/1 0/0 0/0 .text draw__8daE_KK_cFv */ @@ -788,7 +788,13 @@ static asm void daE_KK_Draw(daE_KK_c* param_0) { /* ############################################################################################## */ /* 806FF628-806FF62C 000040 0004+00 2/5 0/0 0/0 .rodata @3931 */ SECTION_RODATA static f32 const lit_3931 = -1.0f; -COMPILER_STRIP_GATE(806FF628, &lit_3931); +COMPILER_STRIP_GATE(0x806FF628, &lit_3931); + +/* 806FF6B8-806FF6B8 0000D0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_806FF6B8 = "E_KK"; +#pragma pop /* 806FAA68-806FAB14 000448 00AC+00 10/10 0/0 0/0 .text setBck__8daE_KK_cFiUcff */ #pragma push @@ -835,7 +841,7 @@ asm void daE_KK_c::setActionMode(int param_0, int param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4140 = -70.0f; -COMPILER_STRIP_GATE(806FF62C, &lit_4140); +COMPILER_STRIP_GATE(0x806FF62C, &lit_4140); #pragma pop /* 806FF880-806FF884 000008 0004+00 2/2 0/0 0/0 .bss None */ @@ -860,11 +866,11 @@ asm void daE_KK_c::damage_check() { /* ############################################################################################## */ /* 806FF630-806FF634 000048 0004+00 1/2 0/0 0/0 .rodata @4202 */ SECTION_RODATA static f32 const lit_4202 = 200.0f; -COMPILER_STRIP_GATE(806FF630, &lit_4202); +COMPILER_STRIP_GATE(0x806FF630, &lit_4202); /* 806FF634-806FF638 00004C 0004+00 1/3 0/0 0/0 .rodata @4203 */ SECTION_RODATA static f32 const lit_4203 = 50.0f; -COMPILER_STRIP_GATE(806FF634, &lit_4203); +COMPILER_STRIP_GATE(0x806FF634, &lit_4203); /* 806FB2EC-806FB4F4 000CCC 0208+00 8/8 0/0 0/0 .text nextActionCheck__8daE_KK_cFv */ #pragma push @@ -881,14 +887,14 @@ asm void daE_KK_c::nextActionCheck() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4254 = 300.0f; -COMPILER_STRIP_GATE(806FF638, &lit_4254); +COMPILER_STRIP_GATE(0x806FF638, &lit_4254); #pragma pop /* 806FF63C-806FF640 000054 0004+00 0/1 0/0 0/0 .rodata @4255 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4255 = -1000000000.0f; -COMPILER_STRIP_GATE(806FF63C, &lit_4255); +COMPILER_STRIP_GATE(0x806FF63C, &lit_4255); #pragma pop /* 806FB4F4-806FB6C0 000ED4 01CC+00 2/2 0/0 0/0 .text way_gake_check__8daE_KK_cFv */ @@ -916,14 +922,14 @@ asm void daE_KK_c::mDeadEffSet(cXyz& param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4304 = 3.0f; -COMPILER_STRIP_GATE(806FF640, &lit_4304); +COMPILER_STRIP_GATE(0x806FF640, &lit_4304); #pragma pop /* 806FF644-806FF648 00005C 0004+00 0/2 0/0 0/0 .rodata @4305 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4305 = 60.0f; -COMPILER_STRIP_GATE(806FF644, &lit_4305); +COMPILER_STRIP_GATE(0x806FF644, &lit_4305); #pragma pop /* 806FB7D8-806FB908 0011B8 0130+00 1/1 0/0 0/0 .text executeWait__8daE_KK_cFv */ @@ -951,21 +957,21 @@ asm void daE_KK_c::executeIcicleWait() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4425 = 5.0f; -COMPILER_STRIP_GATE(806FF648, &lit_4425); +COMPILER_STRIP_GATE(0x806FF648, &lit_4425); #pragma pop /* 806FF64C-806FF650 000064 0004+00 0/1 0/0 0/0 .rodata @4426 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4426 = 4.0f / 5.0f; -COMPILER_STRIP_GATE(806FF64C, &lit_4426); +COMPILER_STRIP_GATE(0x806FF64C, &lit_4426); #pragma pop /* 806FF650-806FF654 000068 0004+00 0/2 0/0 0/0 .rodata @4427 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4427 = 2.0f; -COMPILER_STRIP_GATE(806FF650, &lit_4427); +COMPILER_STRIP_GATE(0x806FF650, &lit_4427); #pragma pop /* 806FBB1C-806FBE98 0014FC 037C+00 1/1 0/0 0/0 .text executeWalk__8daE_KK_cFv */ @@ -993,14 +999,14 @@ asm void daE_KK_c::executeSpearThrow() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4656 = 0.5f; -COMPILER_STRIP_GATE(806FF654, &lit_4656); +COMPILER_STRIP_GATE(0x806FF654, &lit_4656); #pragma pop /* 806FF658-806FF65C 000070 0004+00 0/1 0/0 0/0 .rodata @4657 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4657 = 15.0f; -COMPILER_STRIP_GATE(806FF658, &lit_4657); +COMPILER_STRIP_GATE(0x806FF658, &lit_4657); #pragma pop /* 806FC370-806FC75C 001D50 03EC+00 1/1 0/0 0/0 .text executeBackWalk__8daE_KK_cFv */ @@ -1038,14 +1044,14 @@ asm void daE_KK_c::executeGuard() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4745 = -80.0f; -COMPILER_STRIP_GATE(806FF65C, &lit_4745); +COMPILER_STRIP_GATE(0x806FF65C, &lit_4745); #pragma pop /* 806FF660-806FF664 000078 0004+00 0/1 0/0 0/0 .rodata @4746 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4746 = 7.0f / 10.0f; -COMPILER_STRIP_GATE(806FF660, &lit_4746); +COMPILER_STRIP_GATE(0x806FF660, &lit_4746); #pragma pop /* 806FCA28-806FCC34 002408 020C+00 1/1 0/0 0/0 .text executeDamage__8daE_KK_cFv */ @@ -1063,21 +1069,21 @@ asm void daE_KK_c::executeDamage() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4847 = 600.0f; -COMPILER_STRIP_GATE(806FF664, &lit_4847); +COMPILER_STRIP_GATE(0x806FF664, &lit_4847); #pragma pop /* 806FF668-806FF66C 000080 0004+00 0/2 0/0 0/0 .rodata @4848 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4848 = 20.0f; -COMPILER_STRIP_GATE(806FF668, &lit_4848); +COMPILER_STRIP_GATE(0x806FF668, &lit_4848); #pragma pop /* 806FF66C-806FF670 000084 0004+00 0/3 0/0 0/0 .rodata @4849 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4849 = 80.0f; -COMPILER_STRIP_GATE(806FF66C, &lit_4849); +COMPILER_STRIP_GATE(0x806FF66C, &lit_4849); #pragma pop /* 806FCC34-806FD068 002614 0434+00 1/1 0/0 0/0 .text executeAttack__8daE_KK_cFv */ @@ -1105,28 +1111,28 @@ asm void daE_KK_c::executeDead() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5078 = 120.0f; -COMPILER_STRIP_GATE(806FF670, &lit_5078); +COMPILER_STRIP_GATE(0x806FF670, &lit_5078); #pragma pop /* 806FF674-806FF678 00008C 0004+00 0/1 0/0 0/0 .rodata @5079 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5079 = 7.0f; -COMPILER_STRIP_GATE(806FF674, &lit_5079); +COMPILER_STRIP_GATE(0x806FF674, &lit_5079); #pragma pop /* 806FF678-806FF67C 000090 0004+00 0/1 0/0 0/0 .rodata @5080 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5080 = 1.5f; -COMPILER_STRIP_GATE(806FF678, &lit_5080); +COMPILER_STRIP_GATE(0x806FF678, &lit_5080); #pragma pop /* 806FF67C-806FF680 000094 0004+00 0/1 0/0 0/0 .rodata @5081 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5081 = -300.0f; -COMPILER_STRIP_GATE(806FF67C, &lit_5081); +COMPILER_STRIP_GATE(0x806FF67C, &lit_5081); #pragma pop /* 806FF680-806FF688 000098 0004+04 0/1 0/0 0/0 .rodata @5082 */ @@ -1137,7 +1143,7 @@ SECTION_RODATA static f32 const lit_5082[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(806FF680, &lit_5082); +COMPILER_STRIP_GATE(0x806FF680, &lit_5082); #pragma pop /* 806FF688-806FF690 0000A0 0008+00 0/3 0/0 0/0 .rodata @5084 */ @@ -1146,7 +1152,7 @@ COMPILER_STRIP_GATE(806FF680, &lit_5082); SECTION_RODATA static u8 const lit_5084[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(806FF688, &lit_5084); +COMPILER_STRIP_GATE(0x806FF688, &lit_5084); #pragma pop /* 806FD294-806FD930 002C74 069C+00 1/1 0/0 0/0 .text executeWeaponMove__8daE_KK_cFv */ @@ -1174,28 +1180,28 @@ asm void daE_KK_c::action() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5170 = 70.0f; -COMPILER_STRIP_GATE(806FF690, &lit_5170); +COMPILER_STRIP_GATE(0x806FF690, &lit_5170); #pragma pop /* 806FF694-806FF698 0000AC 0004+00 0/0 0/0 0/0 .rodata @5171 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5171 = 150.0f; -COMPILER_STRIP_GATE(806FF694, &lit_5171); +COMPILER_STRIP_GATE(0x806FF694, &lit_5171); #pragma pop /* 806FF698-806FF69C 0000B0 0004+00 0/1 0/0 0/0 .rodata @5233 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5233 = 230.0f; -COMPILER_STRIP_GATE(806FF698, &lit_5233); +COMPILER_STRIP_GATE(0x806FF698, &lit_5233); #pragma pop /* 806FF69C-806FF6A0 0000B4 0004+00 0/2 0/0 0/0 .rodata @5234 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5234 = -60.0f; -COMPILER_STRIP_GATE(806FF69C, &lit_5234); +COMPILER_STRIP_GATE(0x806FF69C, &lit_5234); #pragma pop /* 806FDD0C-806FDF0C 0036EC 0200+00 2/2 0/0 0/0 .text mtx_set__8daE_KK_cFv */ @@ -1223,14 +1229,14 @@ asm void daE_KK_c::weapon_mtx_set() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5333 = 250.0f; -COMPILER_STRIP_GATE(806FF6A0, &lit_5333); +COMPILER_STRIP_GATE(0x806FF6A0, &lit_5333); #pragma pop /* 806FF6A4-806FF6A8 0000BC 0004+00 0/1 0/0 0/0 .rodata @5334 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5334 = 40.0f; -COMPILER_STRIP_GATE(806FF6A4, &lit_5334); +COMPILER_STRIP_GATE(0x806FF6A4, &lit_5334); #pragma pop /* 806FE0B8-806FE2A8 003A98 01F0+00 1/1 0/0 0/0 .text cc_set__8daE_KK_cFv */ @@ -1313,14 +1319,14 @@ static asm void useHeapInit(fopAc_ac_c* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5668 = -3.0f; -COMPILER_STRIP_GATE(806FF6A8, &lit_5668); +COMPILER_STRIP_GATE(0x806FF6A8, &lit_5668); #pragma pop /* 806FF6AC-806FF6B0 0000C4 0004+00 0/1 0/0 0/0 .rodata @5669 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5669 = -600.0f; -COMPILER_STRIP_GATE(806FF6AC, &lit_5669); +COMPILER_STRIP_GATE(0x806FF6AC, &lit_5669); #pragma pop /* 806FF6B0-806FF6B8 0000C8 0008+00 0/1 0/0 0/0 .rodata @5671 */ @@ -1329,7 +1335,13 @@ COMPILER_STRIP_GATE(806FF6AC, &lit_5669); SECTION_RODATA static u8 const lit_5671[8] = { 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(806FF6B0, &lit_5671); +COMPILER_STRIP_GATE(0x806FF6B0, &lit_5671); +#pragma pop + +/* 806FF6B8-806FF6B8 0000D0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_806FF6BD = "E_kk"; #pragma pop /* 806FE6B8-806FED20 004098 0668+00 1/1 0/0 0/0 .text create__8daE_KK_cFv */ @@ -1469,7 +1481,7 @@ asm void __sinit_d_a_e_kk_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_806FF138 = (void*)__sinit_d_a_e_kk_cpp; +REGISTER_CTORS(0x806FF138, __sinit_d_a_e_kk_cpp); #pragma pop /* 806FF174-806FF17C 004B54 0008+00 1/0 0/0 0/0 .text @36@__dt__12dBgS_ObjAcchFv */ @@ -1514,10 +1526,4 @@ asm cXyz::~cXyz() { } #pragma pop -/* 806FF6B8-806FF6C2 0000D0 000A+00 5/5 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_806FF6B8 = "E_KK"; -SECTION_DEAD static char const* const stringBase_806FF6BD = "E_kk"; -#pragma pop +/* 806FF6B8-806FF6B8 0000D0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/e/d_a_e_kr/d_a_e_kr.cpp b/rel/d/a/e/d_a_e_kr/d_a_e_kr.cpp index 2a50f0fda38..2fcbc2eaeba 100644 --- a/rel/d/a/e/d_a_e_kr/d_a_e_kr.cpp +++ b/rel/d/a/e/d_a_e_kr/d_a_e_kr.cpp @@ -21,16 +21,16 @@ struct mDoHIO_entry_c { /* 8070563C */ ~mDoHIO_entry_c(); }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; - struct J3DAnmTransform {}; +struct J3DModelData {}; + +struct Z2Creature {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -96,12 +96,12 @@ struct dRes_control_c { struct dPa_levelEcallBack {}; -struct _GXColor {}; - struct csXyz { /* 80267404 */ void operator+(csXyz&); }; +struct _GXColor {}; + struct dPa_control_c { /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, @@ -435,7 +435,7 @@ static asm void nodeCallBack(J3DJoint* param_0, int param_1) { /* ############################################################################################## */ /* 80705AF8-80705AFC 000000 0004+00 19/19 0/0 0/0 .rodata @3903 */ SECTION_RODATA static f32 const lit_3903 = 100.0f; -COMPILER_STRIP_GATE(80705AF8, &lit_3903); +COMPILER_STRIP_GATE(0x80705AF8, &lit_3903); /* 80705AFC-80705B00 000004 0004+00 3/16 0/0 0/0 .rodata @3904 */ SECTION_RODATA static u8 const lit_3904[4] = { @@ -444,7 +444,7 @@ SECTION_RODATA static u8 const lit_3904[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80705AFC, &lit_3904); +COMPILER_STRIP_GATE(0x80705AFC, &lit_3904); /* 80705B00-80705B08 000008 0004+04 1/14 0/0 0/0 .rodata @3905 */ SECTION_RODATA static f32 const lit_3905[1 + 1 /* padding */] = { @@ -452,7 +452,7 @@ SECTION_RODATA static f32 const lit_3905[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80705B00, &lit_3905); +COMPILER_STRIP_GATE(0x80705B00, &lit_3905); /* 80705B08-80705B10 000010 0008+00 0/3 0/0 0/0 .rodata @3906 */ #pragma push @@ -460,7 +460,7 @@ COMPILER_STRIP_GATE(80705B00, &lit_3905); SECTION_RODATA static u8 const lit_3906[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80705B08, &lit_3906); +COMPILER_STRIP_GATE(0x80705B08, &lit_3906); #pragma pop /* 80705B10-80705B18 000018 0008+00 0/3 0/0 0/0 .rodata @3907 */ @@ -469,7 +469,7 @@ COMPILER_STRIP_GATE(80705B08, &lit_3906); SECTION_RODATA static u8 const lit_3907[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80705B10, &lit_3907); +COMPILER_STRIP_GATE(0x80705B10, &lit_3907); #pragma pop /* 80705B18-80705B20 000020 0008+00 0/3 0/0 0/0 .rodata @3908 */ @@ -478,19 +478,25 @@ COMPILER_STRIP_GATE(80705B10, &lit_3907); SECTION_RODATA static u8 const lit_3908[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80705B18, &lit_3908); +COMPILER_STRIP_GATE(0x80705B18, &lit_3908); #pragma pop /* 80705B20-80705B24 000028 0004+00 0/2 0/0 0/0 .rodata @3909 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3909 = 1.0f / 100.0f; -COMPILER_STRIP_GATE(80705B20, &lit_3909); +COMPILER_STRIP_GATE(0x80705B20, &lit_3909); #pragma pop /* 80705B24-80705B28 00002C 0004+00 1/1 0/0 0/0 .rodata @4043 */ SECTION_RODATA static f32 const lit_4043 = -1.0f; -COMPILER_STRIP_GATE(80705B24, &lit_4043); +COMPILER_STRIP_GATE(0x80705B24, &lit_4043); + +/* 80705C4C-80705C4C 000154 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80705C4C = "E_kr"; +#pragma pop /* 806FFCD8-806FFD84 000418 00AC+00 8/8 0/0 0/0 .text anm_init__FP10e_kr_classifUcf */ #pragma push @@ -537,7 +543,7 @@ static asm void e_kr_setpos_bg_check(e_kr_class* param_0) { SECTION_RODATA static u8 const lit_4155[8] = { 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80705B28, &lit_4155); +COMPILER_STRIP_GATE(0x80705B28, &lit_4155); /* 80705FE8-80705FF4 000008 000C+00 1/1 0/0 0/0 .bss @3921 */ static u8 lit_3921[12]; @@ -558,7 +564,7 @@ static asm void e_kr_player_view_check(e_kr_class* param_0) { /* ############################################################################################## */ /* 80705B30-80705B34 000038 0004+00 1/5 0/0 0/0 .rodata @4167 */ SECTION_RODATA static f32 const lit_4167 = 20.0f; -COMPILER_STRIP_GATE(80705B30, &lit_4167); +COMPILER_STRIP_GATE(0x80705B30, &lit_4167); /* 80700108-80700174 000848 006C+00 2/2 0/0 0/0 .text pl_horse_check__FP10e_kr_class */ #pragma push @@ -575,14 +581,14 @@ static asm void pl_horse_check(e_kr_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4192 = 150.0f; -COMPILER_STRIP_GATE(80705B34, &lit_4192); +COMPILER_STRIP_GATE(0x80705B34, &lit_4192); #pragma pop /* 80705B38-80705B3C 000040 0004+00 0/1 0/0 0/0 .rodata @4193 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4193 = 1200.0f; -COMPILER_STRIP_GATE(80705B38, &lit_4193); +COMPILER_STRIP_GATE(0x80705B38, &lit_4193); #pragma pop /* 80700174-80700204 0008B4 0090+00 1/1 0/0 0/0 .text daE_Kr_shadowDraw__FP10e_kr_class @@ -611,21 +617,21 @@ static asm void daE_Kr_Draw(e_kr_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4249 = 0.5f; -COMPILER_STRIP_GATE(80705B3C, &lit_4249); +COMPILER_STRIP_GATE(0x80705B3C, &lit_4249); #pragma pop /* 80705B40-80705B44 000048 0004+00 0/1 0/0 0/0 .rodata @4250 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4250 = 1.0f / 25.0f; -COMPILER_STRIP_GATE(80705B40, &lit_4250); +COMPILER_STRIP_GATE(0x80705B40, &lit_4250); #pragma pop /* 80705B44-80705B48 00004C 0004+00 0/7 0/0 0/0 .rodata @4251 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4251 = 5.0f; -COMPILER_STRIP_GATE(80705B44, &lit_4251); +COMPILER_STRIP_GATE(0x80705B44, &lit_4251); #pragma pop /* 8070034C-80700588 000A8C 023C+00 6/6 0/0 0/0 .text e_kr_pos_move__FP10e_kr_class */ @@ -643,26 +649,26 @@ static asm void e_kr_pos_move(e_kr_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4269 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(80705B48, &lit_4269); +COMPILER_STRIP_GATE(0x80705B48, &lit_4269); #pragma pop /* 80705B4C-80705B50 000054 0004+00 0/1 0/0 0/0 .rodata @4270 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4270 = 3.0f; -COMPILER_STRIP_GATE(80705B4C, &lit_4270); +COMPILER_STRIP_GATE(0x80705B4C, &lit_4270); #pragma pop /* 80705B50-80705B54 000058 0004+00 0/0 0/0 0/0 .rodata @4271 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4271 = -0.5f; -COMPILER_STRIP_GATE(80705B50, &lit_4271); +COMPILER_STRIP_GATE(0x80705B50, &lit_4271); #pragma pop /* 80705B54-80705B58 00005C 0004+00 1/3 0/0 0/0 .rodata @4289 */ SECTION_RODATA static f32 const lit_4289 = 500.0f; -COMPILER_STRIP_GATE(80705B54, &lit_4289); +COMPILER_STRIP_GATE(0x80705B54, &lit_4289); /* 80700588-80700638 000CC8 00B0+00 1/1 0/0 0/0 .text coach_path_check__FP10e_kr_class */ #pragma push @@ -679,14 +685,14 @@ static asm void coach_path_check(e_kr_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4420 = 12.0f; -COMPILER_STRIP_GATE(80705B58, &lit_4420); +COMPILER_STRIP_GATE(0x80705B58, &lit_4420); #pragma pop /* 80705B5C-80705B60 000064 0004+00 0/2 0/0 0/0 .rodata @4421 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4421 = 2.0f; -COMPILER_STRIP_GATE(80705B5C, &lit_4421); +COMPILER_STRIP_GATE(0x80705B5C, &lit_4421); #pragma pop /* 80700638-80700AF8 000D78 04C0+00 1/1 0/0 0/0 .text e_kr_path_move__FP10e_kr_class */ @@ -704,63 +710,63 @@ static asm void e_kr_path_move(e_kr_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4422 = 0x42700001; -COMPILER_STRIP_GATE(80705B60, &lit_4422); +COMPILER_STRIP_GATE(0x80705B60, &lit_4422); #pragma pop /* 80705B64-80705B68 00006C 0004+00 0/1 0/0 0/0 .rodata @4423 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4423 = 5000.0f; -COMPILER_STRIP_GATE(80705B64, &lit_4423); +COMPILER_STRIP_GATE(0x80705B64, &lit_4423); #pragma pop /* 80705B68-80705B6C 000070 0004+00 0/4 0/0 0/0 .rodata @4424 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4424 = 300.0f; -COMPILER_STRIP_GATE(80705B68, &lit_4424); +COMPILER_STRIP_GATE(0x80705B68, &lit_4424); #pragma pop /* 80705B6C-80705B70 000074 0004+00 0/2 0/0 0/0 .rodata @4425 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4425 = 2000.0f; -COMPILER_STRIP_GATE(80705B6C, &lit_4425); +COMPILER_STRIP_GATE(0x80705B6C, &lit_4425); #pragma pop /* 80705B70-80705B74 000078 0004+00 0/0 0/0 0/0 .rodata @4426 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4426 = -2000.0f; -COMPILER_STRIP_GATE(80705B70, &lit_4426); +COMPILER_STRIP_GATE(0x80705B70, &lit_4426); #pragma pop /* 80705B74-80705B78 00007C 0004+00 0/5 0/0 0/0 .rodata @4500 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4500 = 50.0f; -COMPILER_STRIP_GATE(80705B74, &lit_4500); +COMPILER_STRIP_GATE(0x80705B74, &lit_4500); #pragma pop /* 80705B78-80705B7C 000080 0004+00 0/5 0/0 0/0 .rodata @4501 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4501 = 200.0f; -COMPILER_STRIP_GATE(80705B78, &lit_4501); +COMPILER_STRIP_GATE(0x80705B78, &lit_4501); #pragma pop /* 80705B7C-80705B80 000084 0004+00 0/3 0/0 0/0 .rodata @4502 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4502 = 60.0f; -COMPILER_STRIP_GATE(80705B7C, &lit_4502); +COMPILER_STRIP_GATE(0x80705B7C, &lit_4502); #pragma pop /* 80705B80-80705B84 000088 0004+00 0/1 0/0 0/0 .rodata @4503 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4503 = 25.0f; -COMPILER_STRIP_GATE(80705B80, &lit_4503); +COMPILER_STRIP_GATE(0x80705B80, &lit_4503); #pragma pop /* 80700AF8-80700E3C 001238 0344+00 1/1 0/0 0/0 .text e_kr_auto_move__FP10e_kr_class */ @@ -778,91 +784,91 @@ static asm void e_kr_auto_move(e_kr_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4827 = 30.0f; -COMPILER_STRIP_GATE(80705B84, &lit_4827); +COMPILER_STRIP_GATE(0x80705B84, &lit_4827); #pragma pop /* 80705B88-80705B8C 000090 0004+00 0/3 0/0 0/0 .rodata @4828 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4828 = 10.0f; -COMPILER_STRIP_GATE(80705B88, &lit_4828); +COMPILER_STRIP_GATE(0x80705B88, &lit_4828); #pragma pop /* 80705B8C-80705B90 000094 0004+00 0/3 0/0 0/0 .rodata @4829 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4829 = 400.0f; -COMPILER_STRIP_GATE(80705B8C, &lit_4829); +COMPILER_STRIP_GATE(0x80705B8C, &lit_4829); #pragma pop /* 80705B90-80705B94 000098 0004+00 0/3 0/0 0/0 .rodata @4830 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4830 = 1000.0f; -COMPILER_STRIP_GATE(80705B90, &lit_4830); +COMPILER_STRIP_GATE(0x80705B90, &lit_4830); #pragma pop /* 80705B94-80705B98 00009C 0004+00 0/0 0/0 0/0 .rodata @4831 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4831 = 1280.0f; -COMPILER_STRIP_GATE(80705B94, &lit_4831); +COMPILER_STRIP_GATE(0x80705B94, &lit_4831); #pragma pop /* 80705B98-80705B9C 0000A0 0004+00 0/0 0/0 0/0 .rodata @4832 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4832 = 768.0f; -COMPILER_STRIP_GATE(80705B98, &lit_4832); +COMPILER_STRIP_GATE(0x80705B98, &lit_4832); #pragma pop /* 80705B9C-80705BA0 0000A4 0004+00 0/0 0/0 0/0 .rodata @4833 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4833 = 1.0f / 20.0f; -COMPILER_STRIP_GATE(80705B9C, &lit_4833); +COMPILER_STRIP_GATE(0x80705B9C, &lit_4833); #pragma pop /* 80705BA0-80705BA4 0000A8 0004+00 0/0 0/0 0/0 .rodata @4834 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4834 = 7000.0f; -COMPILER_STRIP_GATE(80705BA0, &lit_4834); +COMPILER_STRIP_GATE(0x80705BA0, &lit_4834); #pragma pop /* 80705BA4-80705BA8 0000AC 0004+00 0/1 0/0 0/0 .rodata @4835 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4835 = 600.0f; -COMPILER_STRIP_GATE(80705BA4, &lit_4835); +COMPILER_STRIP_GATE(0x80705BA4, &lit_4835); #pragma pop /* 80705BA8-80705BAC 0000B0 0004+00 0/0 0/0 0/0 .rodata @4836 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4836 = 35.0f; -COMPILER_STRIP_GATE(80705BA8, &lit_4836); +COMPILER_STRIP_GATE(0x80705BA8, &lit_4836); #pragma pop /* 80705BAC-80705BB0 0000B4 0004+00 0/0 0/0 0/0 .rodata @4837 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4837 = 1350.0f; -COMPILER_STRIP_GATE(80705BAC, &lit_4837); +COMPILER_STRIP_GATE(0x80705BAC, &lit_4837); #pragma pop /* 80705BB0-80705BB4 0000B8 0004+00 0/0 0/0 0/0 .rodata @4838 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4838 = -10.0f; -COMPILER_STRIP_GATE(80705BB0, &lit_4838); +COMPILER_STRIP_GATE(0x80705BB0, &lit_4838); #pragma pop /* 80705BB4-80705BB8 0000BC 0004+00 0/2 0/0 0/0 .rodata @4839 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4839 = 3000.0f; -COMPILER_STRIP_GATE(80705BB4, &lit_4839); +COMPILER_STRIP_GATE(0x80705BB4, &lit_4839); #pragma pop /* 80705BB8-80705BC0 0000C0 0004+04 0/2 0/0 0/0 .rodata @4840 */ @@ -873,7 +879,7 @@ SECTION_RODATA static f32 const lit_4840[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80705BB8, &lit_4840); +COMPILER_STRIP_GATE(0x80705BB8, &lit_4840); #pragma pop /* 80705BC0-80705BC8 0000C8 0008+00 0/2 0/0 0/0 .rodata @4843 */ @@ -882,7 +888,7 @@ COMPILER_STRIP_GATE(80705BB8, &lit_4840); SECTION_RODATA static u8 const lit_4843[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80705BC0, &lit_4843); +COMPILER_STRIP_GATE(0x80705BC0, &lit_4843); #pragma pop /* 80705C54-80705C60 000000 000C+00 2/2 0/0 0/0 .data cNullVec__6Z2Calc */ @@ -988,55 +994,55 @@ static asm void e_kr_atack_move(e_kr_class* param_0) { /* ############################################################################################## */ /* 80705BC8-80705BCC 0000D0 0004+00 1/2 0/0 0/0 .rodata @5003 */ SECTION_RODATA static f32 const lit_5003 = 6.0f / 5.0f; -COMPILER_STRIP_GATE(80705BC8, &lit_5003); +COMPILER_STRIP_GATE(0x80705BC8, &lit_5003); /* 80705BCC-80705BD0 0000D4 0004+00 0/3 0/0 0/0 .rodata @5004 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5004 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(80705BCC, &lit_5004); +COMPILER_STRIP_GATE(0x80705BCC, &lit_5004); #pragma pop /* 80705BD0-80705BD4 0000D8 0004+00 0/3 0/0 0/0 .rodata @5005 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5005 = 70.0f; -COMPILER_STRIP_GATE(80705BD0, &lit_5005); +COMPILER_STRIP_GATE(0x80705BD0, &lit_5005); #pragma pop /* 80705BD4-80705BD8 0000DC 0004+00 0/1 0/0 0/0 .rodata @5006 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5006 = 180.0f; -COMPILER_STRIP_GATE(80705BD4, &lit_5006); +COMPILER_STRIP_GATE(0x80705BD4, &lit_5006); #pragma pop /* 80705BD8-80705BDC 0000E0 0004+00 0/1 0/0 0/0 .rodata @5007 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5007 = 19.0f / 20.0f; -COMPILER_STRIP_GATE(80705BD8, &lit_5007); +COMPILER_STRIP_GATE(0x80705BD8, &lit_5007); #pragma pop /* 80705BDC-80705BE0 0000E4 0004+00 0/3 0/0 0/0 .rodata @5008 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5008 = 2.0f / 5.0f; -COMPILER_STRIP_GATE(80705BDC, &lit_5008); +COMPILER_STRIP_GATE(0x80705BDC, &lit_5008); #pragma pop /* 80705BE0-80705BE4 0000E8 0004+00 0/1 0/0 0/0 .rodata @5009 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5009 = 250.0f; -COMPILER_STRIP_GATE(80705BE0, &lit_5009); +COMPILER_STRIP_GATE(0x80705BE0, &lit_5009); #pragma pop /* 80705BE4-80705BE8 0000EC 0004+00 0/1 0/0 0/0 .rodata @5010 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5010 = -100.0f; -COMPILER_STRIP_GATE(80705BE4, &lit_5010); +COMPILER_STRIP_GATE(0x80705BE4, &lit_5010); #pragma pop /* 80701CF4-807025B8 002434 08C4+00 1/1 0/0 0/0 .text e_kr_horse_move__FP10e_kr_class */ @@ -1139,28 +1145,28 @@ static asm void body_smoke_set(e_kr_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5111 = 1.5f; -COMPILER_STRIP_GATE(80705BE8, &lit_5111); +COMPILER_STRIP_GATE(0x80705BE8, &lit_5111); #pragma pop /* 80705BEC-80705BF0 0000F4 0004+00 0/0 0/0 0/0 .rodata @5112 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5112 = 80.0f; -COMPILER_STRIP_GATE(80705BEC, &lit_5112); +COMPILER_STRIP_GATE(0x80705BEC, &lit_5112); #pragma pop /* 80705BF0-80705BF4 0000F8 0004+00 0/0 0/0 0/0 .rodata @5113 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5113 = 4.0f / 5.0f; -COMPILER_STRIP_GATE(80705BF0, &lit_5113); +COMPILER_STRIP_GATE(0x80705BF0, &lit_5113); #pragma pop /* 80705BF4-80705BF8 0000FC 0004+00 0/1 0/0 0/0 .rodata @5267 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5267 = -50.0f; -COMPILER_STRIP_GATE(80705BF4, &lit_5267); +COMPILER_STRIP_GATE(0x80705BF4, &lit_5267); #pragma pop /* 80705DCC-80705DDC 000178 0010+00 1/1 0/0 0/0 .data wing_j$5235 */ @@ -1183,35 +1189,35 @@ static asm void wing_smoke_set(e_kr_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5342 = -3.0f; -COMPILER_STRIP_GATE(80705BF8, &lit_5342); +COMPILER_STRIP_GATE(0x80705BF8, &lit_5342); #pragma pop /* 80705BFC-80705C00 000104 0004+00 0/1 0/0 0/0 .rodata @5343 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5343 = 24.0f / 25.0f; -COMPILER_STRIP_GATE(80705BFC, &lit_5343); +COMPILER_STRIP_GATE(0x80705BFC, &lit_5343); #pragma pop /* 80705C00-80705C04 000108 0004+00 0/2 0/0 0/0 .rodata @5344 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5344 = 8000.0f; -COMPILER_STRIP_GATE(80705C00, &lit_5344); +COMPILER_STRIP_GATE(0x80705C00, &lit_5344); #pragma pop /* 80705C04-80705C08 00010C 0004+00 0/1 0/0 0/0 .rodata @5345 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5345 = 15.0f; -COMPILER_STRIP_GATE(80705C04, &lit_5345); +COMPILER_STRIP_GATE(0x80705C04, &lit_5345); #pragma pop /* 80705C08-80705C0C 000110 0004+00 0/1 0/0 0/0 .rodata @5346 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5346 = -30.0f; -COMPILER_STRIP_GATE(80705C08, &lit_5346); +COMPILER_STRIP_GATE(0x80705C08, &lit_5346); #pragma pop /* 8070338C-80703990 003ACC 0604+00 1/1 0/0 0/0 .text e_kr_damage__FP10e_kr_class */ @@ -1239,14 +1245,14 @@ static asm void damage_check(e_kr_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5493 = -1000000000.0f; -COMPILER_STRIP_GATE(80705C0C, &lit_5493); +COMPILER_STRIP_GATE(0x80705C0C, &lit_5493); #pragma pop /* 80705C10-80705C14 000118 0004+00 0/1 0/0 0/0 .rodata @5494 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5494 = 75.0f; -COMPILER_STRIP_GATE(80705C10, &lit_5494); +COMPILER_STRIP_GATE(0x80705C10, &lit_5494); #pragma pop /* 80703D74-807040B0 0044B4 033C+00 1/1 0/0 0/0 .text ground_angle_set__FP10e_kr_class */ @@ -1262,7 +1268,7 @@ static asm void ground_angle_set(e_kr_class* param_0) { /* ############################################################################################## */ /* 80705C14-80705C18 00011C 0004+00 1/1 0/0 0/0 .rodata @5527 */ SECTION_RODATA static f32 const lit_5527 = 13.0f / 10.0f; -COMPILER_STRIP_GATE(80705C14, &lit_5527); +COMPILER_STRIP_GATE(0x80705C14, &lit_5527); /* 80705DDC-80705E08 -00001 002C+00 1/1 0/0 0/0 .data @5528 */ SECTION_DATA static void* lit_5528[11] = { @@ -1294,35 +1300,35 @@ static asm void action(e_kr_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5725 = 27.0f; -COMPILER_STRIP_GATE(80705C18, &lit_5725); +COMPILER_STRIP_GATE(0x80705C18, &lit_5725); #pragma pop /* 80705C1C-80705C20 000124 0004+00 0/1 0/0 0/0 .rodata @5726 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5726 = 11.0f; -COMPILER_STRIP_GATE(80705C1C, &lit_5726); +COMPILER_STRIP_GATE(0x80705C1C, &lit_5726); #pragma pop /* 80705C20-80705C24 000128 0004+00 0/2 0/0 0/0 .rodata @5727 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5727 = 10000.0f; -COMPILER_STRIP_GATE(80705C20, &lit_5727); +COMPILER_STRIP_GATE(0x80705C20, &lit_5727); #pragma pop /* 80705C24-80705C28 00012C 0004+00 0/1 0/0 0/0 .rodata @5728 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5728 = 200000.0f; -COMPILER_STRIP_GATE(80705C24, &lit_5728); +COMPILER_STRIP_GATE(0x80705C24, &lit_5728); #pragma pop /* 80705C28-80705C2C 000130 0004+00 0/1 0/0 0/0 .rodata @5729 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5729 = 3.0f / 10.0f; -COMPILER_STRIP_GATE(80705C28, &lit_5729); +COMPILER_STRIP_GATE(0x80705C28, &lit_5729); #pragma pop /* 80704208-80704B5C 004948 0954+00 2/1 0/0 0/0 .text daE_Kr_Execute__FP10e_kr_class */ @@ -1365,14 +1371,14 @@ static asm void useHeapInit(fopAc_ac_c* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5872 = -300.0f; -COMPILER_STRIP_GATE(80705C2C, &lit_5872); +COMPILER_STRIP_GATE(0x80705C2C, &lit_5872); #pragma pop /* 80705C30-80705C34 000138 0004+00 0/1 0/0 0/0 .rodata @5873 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5873 = -200.0f; -COMPILER_STRIP_GATE(80705C30, &lit_5873); +COMPILER_STRIP_GATE(0x80705C30, &lit_5873); #pragma pop /* 80705E08-80705E48 0001B4 0040+00 0/1 0/0 0/0 .data at_sph_src$5807 */ @@ -1580,42 +1586,42 @@ asm cCcD_GStts::~cCcD_GStts() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6045 = 2500.0f; -COMPILER_STRIP_GATE(80705C34, &lit_6045); +COMPILER_STRIP_GATE(0x80705C34, &lit_6045); #pragma pop /* 80705C38-80705C3C 000140 0004+00 0/1 0/0 0/0 .rodata @6046 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6046 = 7.0f / 20.0f; -COMPILER_STRIP_GATE(80705C38, &lit_6046); +COMPILER_STRIP_GATE(0x80705C38, &lit_6046); #pragma pop /* 80705C3C-80705C40 000144 0004+00 0/1 0/0 0/0 .rodata @6047 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6047 = 3.5f; -COMPILER_STRIP_GATE(80705C3C, &lit_6047); +COMPILER_STRIP_GATE(0x80705C3C, &lit_6047); #pragma pop /* 80705C40-80705C44 000148 0004+00 0/1 0/0 0/0 .rodata @6048 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6048 = 40.0f; -COMPILER_STRIP_GATE(80705C40, &lit_6048); +COMPILER_STRIP_GATE(0x80705C40, &lit_6048); #pragma pop /* 80705C44-80705C48 00014C 0004+00 0/1 0/0 0/0 .rodata @6049 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6049 = 1500.0f; -COMPILER_STRIP_GATE(80705C44, &lit_6049); +COMPILER_STRIP_GATE(0x80705C44, &lit_6049); #pragma pop /* 80705C48-80705C4C 000150 0004+00 0/1 0/0 0/0 .rodata @6050 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6050 = -40.0f; -COMPILER_STRIP_GATE(80705C48, &lit_6050); +COMPILER_STRIP_GATE(0x80705C48, &lit_6050); #pragma pop /* 80705FB8-80705FC4 000364 000C+00 2/2 0/0 0/0 .data __vt__9e_krHIO_c */ @@ -1651,7 +1657,7 @@ asm void __sinit_d_a_e_kr_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80705438 = (void*)__sinit_d_a_e_kr_cpp; +REGISTER_CTORS(0x80705438, __sinit_d_a_e_kr_cpp); #pragma pop /* 80705574-807055E0 005CB4 006C+00 2/1 0/0 0/0 .text __dt__9e_krHIO_cFv */ @@ -1726,9 +1732,4 @@ asm cXyz::~cXyz() { } #pragma pop -/* 80705C4C-80705C51 000154 0005+00 4/4 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80705C4C = "E_kr"; -#pragma pop +/* 80705C4C-80705C4C 000154 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/e/d_a_e_mb/d_a_e_mb.cpp b/rel/d/a/e/d_a_e_mb/d_a_e_mb.cpp index 37986d8b6af..ed776cf3339 100644 --- a/rel/d/a/e/d_a_e_mb/d_a_e_mb.cpp +++ b/rel/d/a/e/d_a_e_mb/d_a_e_mb.cpp @@ -29,16 +29,16 @@ struct mDoExt_btpAnm { /* 8000D5E8 */ void entry(J3DMaterialTable*, s16); }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; - struct J3DAnmTransform {}; +struct J3DModelData {}; + +struct Z2Creature {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -68,11 +68,11 @@ struct mDoExt_3DlineMatSortPacket { /* 80014738 */ void setMat(mDoExt_3DlineMat_c*); }; -struct dKy_tevstr_c {}; +struct ResTIMG {}; struct _GXColor {}; -struct ResTIMG {}; +struct dKy_tevstr_c {}; struct mDoExt_3DlineMat1_c { /* 80013360 */ void init(u16, u16, ResTIMG*, int); @@ -294,20 +294,20 @@ extern "C" void __register_global_object(); /* ############################################################################################## */ /* 80708A10-80708A14 000000 0004+00 9/9 0/0 0/0 .rodata @3764 */ SECTION_RODATA static f32 const lit_3764 = 1.0f; -COMPILER_STRIP_GATE(80708A10, &lit_3764); +COMPILER_STRIP_GATE(0x80708A10, &lit_3764); /* 80708A14-80708A18 000004 0004+00 0/2 0/0 0/0 .rodata @3765 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3765 = 50.0f; -COMPILER_STRIP_GATE(80708A14, &lit_3765); +COMPILER_STRIP_GATE(0x80708A14, &lit_3765); #pragma pop /* 80708A18-80708A1C 000008 0004+00 0/1 0/0 0/0 .rodata @3766 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3766 = 1.5f; -COMPILER_STRIP_GATE(80708A18, &lit_3766); +COMPILER_STRIP_GATE(0x80708A18, &lit_3766); #pragma pop /* 80708A1C-80708A20 00000C 0004+00 2/9 0/0 0/0 .rodata @3767 */ @@ -317,13 +317,13 @@ SECTION_RODATA static u8 const lit_3767[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80708A1C, &lit_3767); +COMPILER_STRIP_GATE(0x80708A1C, &lit_3767); /* 80708A20-80708A24 000010 0004+00 0/1 0/0 0/0 .rodata @3768 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3768 = 70.0f; -COMPILER_STRIP_GATE(80708A20, &lit_3768); +COMPILER_STRIP_GATE(0x80708A20, &lit_3768); #pragma pop /* 80708AF0-80708AF4 000000 0004+00 1/1 0/0 0/0 .data l_color$3793 */ @@ -421,7 +421,13 @@ asm daE_MB_HIO_c::daE_MB_HIO_c() { /* ############################################################################################## */ /* 80708A24-80708A28 000014 0004+00 1/2 0/0 0/0 .rodata @3782 */ SECTION_RODATA static f32 const lit_3782 = -1.0f; -COMPILER_STRIP_GATE(80708A24, &lit_3782); +COMPILER_STRIP_GATE(0x80708A24, &lit_3782); + +/* 80708AE8-80708AE8 0000D8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80708AE8 = "E_mb"; +#pragma pop /* 807061B4-80706260 000134 00AC+00 5/5 0/0 0/0 .text anm_init__FP10e_mb_classifUcf */ #pragma push @@ -605,42 +611,42 @@ static asm void e_mb_standby(e_mb_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3880 = 250.0f; -COMPILER_STRIP_GATE(80708A28, &lit_3880); +COMPILER_STRIP_GATE(0x80708A28, &lit_3880); #pragma pop /* 80708A2C-80708A30 00001C 0004+00 0/1 0/0 0/0 .rodata @3881 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3881 = 100.0f; -COMPILER_STRIP_GATE(80708A2C, &lit_3881); +COMPILER_STRIP_GATE(0x80708A2C, &lit_3881); #pragma pop /* 80708A30-80708A34 000020 0004+00 0/0 0/0 0/0 .rodata @3882 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3882 = 125.0f; -COMPILER_STRIP_GATE(80708A30, &lit_3882); +COMPILER_STRIP_GATE(0x80708A30, &lit_3882); #pragma pop /* 80708A34-80708A38 000024 0004+00 0/2 0/0 0/0 .rodata @3883 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3883 = 30.0f; -COMPILER_STRIP_GATE(80708A34, &lit_3883); +COMPILER_STRIP_GATE(0x80708A34, &lit_3883); #pragma pop /* 80708A38-80708A3C 000028 0004+00 0/3 0/0 0/0 .rodata @3943 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3943 = 5.0f; -COMPILER_STRIP_GATE(80708A38, &lit_3943); +COMPILER_STRIP_GATE(0x80708A38, &lit_3943); #pragma pop /* 80708A3C-80708A40 00002C 0004+00 0/2 0/0 0/0 .rodata @3944 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3944 = 15.0f; -COMPILER_STRIP_GATE(80708A3C, &lit_3944); +COMPILER_STRIP_GATE(0x80708A3C, &lit_3944); #pragma pop /* 80708A40-80708A48 000030 0008+00 0/4 0/0 0/0 .rodata @3945 */ @@ -649,7 +655,7 @@ COMPILER_STRIP_GATE(80708A3C, &lit_3944); SECTION_RODATA static u8 const lit_3945[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80708A40, &lit_3945); +COMPILER_STRIP_GATE(0x80708A40, &lit_3945); #pragma pop /* 80708A48-80708A50 000038 0008+00 0/4 0/0 0/0 .rodata @3946 */ @@ -658,7 +664,7 @@ COMPILER_STRIP_GATE(80708A40, &lit_3945); SECTION_RODATA static u8 const lit_3946[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80708A48, &lit_3946); +COMPILER_STRIP_GATE(0x80708A48, &lit_3946); #pragma pop /* 80708A50-80708A58 000040 0008+00 0/4 0/0 0/0 .rodata @3947 */ @@ -667,14 +673,14 @@ COMPILER_STRIP_GATE(80708A48, &lit_3946); SECTION_RODATA static u8 const lit_3947[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80708A50, &lit_3947); +COMPILER_STRIP_GATE(0x80708A50, &lit_3947); #pragma pop /* 80708A58-80708A5C 000048 0004+00 0/2 0/0 0/0 .rodata @3948 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3948 = 20.0f; -COMPILER_STRIP_GATE(80708A58, &lit_3948); +COMPILER_STRIP_GATE(0x80708A58, &lit_3948); #pragma pop /* 80708CB8-80708CC4 0000D0 000C+00 0/1 0/0 0/0 .bss @3828 */ @@ -711,35 +717,35 @@ asm cXyz::~cXyz() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4102 = 3.0f; -COMPILER_STRIP_GATE(80708A5C, &lit_4102); +COMPILER_STRIP_GATE(0x80708A5C, &lit_4102); #pragma pop /* 80708A60-80708A64 000050 0004+00 0/1 0/0 0/0 .rodata @4103 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4103 = 2.0f; -COMPILER_STRIP_GATE(80708A60, &lit_4103); +COMPILER_STRIP_GATE(0x80708A60, &lit_4103); #pragma pop /* 80708A64-80708A68 000054 0004+00 0/2 0/0 0/0 .rodata @4104 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4104 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(80708A64, &lit_4104); +COMPILER_STRIP_GATE(0x80708A64, &lit_4104); #pragma pop /* 80708A68-80708A6C 000058 0004+00 0/2 0/0 0/0 .rodata @4105 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4105 = 400.0f; -COMPILER_STRIP_GATE(80708A68, &lit_4105); +COMPILER_STRIP_GATE(0x80708A68, &lit_4105); #pragma pop /* 80708A6C-80708A70 00005C 0004+00 0/1 0/0 0/0 .rodata @4106 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4106 = 11.0f / 10.0f; -COMPILER_STRIP_GATE(80708A6C, &lit_4106); +COMPILER_STRIP_GATE(0x80708A6C, &lit_4106); #pragma pop /* 80708A70-80708A78 000060 0008+00 0/2 0/0 0/0 .rodata @4109 */ @@ -748,7 +754,7 @@ COMPILER_STRIP_GATE(80708A6C, &lit_4106); SECTION_RODATA static u8 const lit_4109[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80708A70, &lit_4109); +COMPILER_STRIP_GATE(0x80708A70, &lit_4109); #pragma pop /* 807068D4-80706F90 000854 06BC+00 1/1 0/0 0/0 .text e_mb_move__FP10e_mb_class */ @@ -766,14 +772,14 @@ static asm void e_mb_move(e_mb_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4177 = 25.0f; -COMPILER_STRIP_GATE(80708A78, &lit_4177); +COMPILER_STRIP_GATE(0x80708A78, &lit_4177); #pragma pop /* 80708A7C-80708A80 00006C 0004+00 0/2 0/0 0/0 .rodata @4178 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4178 = 0.5f; -COMPILER_STRIP_GATE(80708A7C, &lit_4178); +COMPILER_STRIP_GATE(0x80708A7C, &lit_4178); #pragma pop /* 80706F90-8070723C 000F10 02AC+00 1/1 0/0 0/0 .text e_mb_walk2__FP10e_mb_class */ @@ -799,7 +805,7 @@ static asm void e_mb_firstdemo(e_mb_class* param_0) { /* ############################################################################################## */ /* 80708A80-80708A84 000070 0004+00 1/1 0/0 0/0 .rodata @4241 */ SECTION_RODATA static f32 const lit_4241 = 20000.0f; -COMPILER_STRIP_GATE(80708A80, &lit_4241); +COMPILER_STRIP_GATE(0x80708A80, &lit_4241); /* 80707560-80707570 0014E0 0010+00 1/1 0/0 0/0 .text e_mb_end__FP10e_mb_class */ #pragma push @@ -826,95 +832,95 @@ static asm void action(e_mb_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4601 = 32768.0f; -COMPILER_STRIP_GATE(80708A84, &lit_4601); +COMPILER_STRIP_GATE(0x80708A84, &lit_4601); #pragma pop /* 80708A88-80708A8C 000078 0004+00 0/1 0/0 0/0 .rodata @4602 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4602 = -3.0f / 10.0f; -COMPILER_STRIP_GATE(80708A88, &lit_4602); +COMPILER_STRIP_GATE(0x80708A88, &lit_4602); #pragma pop /* 80708A8C-80708A90 00007C 0004+00 0/1 0/0 0/0 .rodata @4603 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4603 = 35.0f; -COMPILER_STRIP_GATE(80708A8C, &lit_4603); +COMPILER_STRIP_GATE(0x80708A8C, &lit_4603); #pragma pop /* 80708A90-80708A94 000080 0004+00 1/2 0/0 0/0 .rodata @4604 */ SECTION_RODATA static f32 const lit_4604 = 10.0f; -COMPILER_STRIP_GATE(80708A90, &lit_4604); +COMPILER_STRIP_GATE(0x80708A90, &lit_4604); /* 80708A94-80708A98 000084 0004+00 0/1 0/0 0/0 .rodata @4605 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4605 = 60.0f; -COMPILER_STRIP_GATE(80708A94, &lit_4605); +COMPILER_STRIP_GATE(0x80708A94, &lit_4605); #pragma pop /* 80708A98-80708A9C 000088 0004+00 0/1 0/0 0/0 .rodata @4606 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4606 = -35.0f; -COMPILER_STRIP_GATE(80708A98, &lit_4606); +COMPILER_STRIP_GATE(0x80708A98, &lit_4606); #pragma pop /* 80708A9C-80708AA0 00008C 0004+00 0/1 0/0 0/0 .rodata @4607 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4607 = 150.0f; -COMPILER_STRIP_GATE(80708A9C, &lit_4607); +COMPILER_STRIP_GATE(0x80708A9C, &lit_4607); #pragma pop /* 80708AA0-80708AA4 000090 0004+00 0/1 0/0 0/0 .rodata @4608 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4608 = -20000.0f; -COMPILER_STRIP_GATE(80708AA0, &lit_4608); +COMPILER_STRIP_GATE(0x80708AA0, &lit_4608); #pragma pop /* 80708AA4-80708AA8 000094 0004+00 0/1 0/0 0/0 .rodata @4609 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4609 = 40000.0f; -COMPILER_STRIP_GATE(80708AA4, &lit_4609); +COMPILER_STRIP_GATE(0x80708AA4, &lit_4609); #pragma pop /* 80708AA8-80708AAC 000098 0004+00 0/1 0/0 0/0 .rodata @4610 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4610 = 55000.0f; -COMPILER_STRIP_GATE(80708AA8, &lit_4610); +COMPILER_STRIP_GATE(0x80708AA8, &lit_4610); #pragma pop /* 80708AAC-80708AB0 00009C 0004+00 0/1 0/0 0/0 .rodata @4611 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4611 = 200.0f; -COMPILER_STRIP_GATE(80708AAC, &lit_4611); +COMPILER_STRIP_GATE(0x80708AAC, &lit_4611); #pragma pop /* 80708AB0-80708AB4 0000A0 0004+00 0/1 0/0 0/0 .rodata @4612 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4612 = 1800.0f; -COMPILER_STRIP_GATE(80708AB0, &lit_4612); +COMPILER_STRIP_GATE(0x80708AB0, &lit_4612); #pragma pop /* 80708AB4-80708AB8 0000A4 0004+00 0/1 0/0 0/0 .rodata @4613 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4613 = -500.0f; -COMPILER_STRIP_GATE(80708AB4, &lit_4613); +COMPILER_STRIP_GATE(0x80708AB4, &lit_4613); #pragma pop /* 80708AB8-80708ABC 0000A8 0004+00 0/1 0/0 0/0 .rodata @4614 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4614 = 1.0f / 15.0f; -COMPILER_STRIP_GATE(80708AB8, &lit_4614); +COMPILER_STRIP_GATE(0x80708AB8, &lit_4614); #pragma pop /* 80708CD0-80708CDC 0000E8 000C+00 0/1 0/0 0/0 .bss @3829 */ @@ -1019,77 +1025,77 @@ asm daE_MB_HIO_c::~daE_MB_HIO_c() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4898 = -2575.0f; -COMPILER_STRIP_GATE(80708ABC, &lit_4898); +COMPILER_STRIP_GATE(0x80708ABC, &lit_4898); #pragma pop /* 80708AC0-80708AC4 0000B0 0004+00 0/1 0/0 0/0 .rodata @4899 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4899 = 1050.0f; -COMPILER_STRIP_GATE(80708AC0, &lit_4899); +COMPILER_STRIP_GATE(0x80708AC0, &lit_4899); #pragma pop /* 80708AC4-80708AC8 0000B4 0004+00 0/1 0/0 0/0 .rodata @4900 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4900 = 1060.0f; -COMPILER_STRIP_GATE(80708AC4, &lit_4900); +COMPILER_STRIP_GATE(0x80708AC4, &lit_4900); #pragma pop /* 80708AC8-80708ACC 0000B8 0004+00 0/1 0/0 0/0 .rodata @4901 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4901 = -1944.0f; -COMPILER_STRIP_GATE(80708AC8, &lit_4901); +COMPILER_STRIP_GATE(0x80708AC8, &lit_4901); #pragma pop /* 80708ACC-80708AD0 0000BC 0004+00 0/1 0/0 0/0 .rodata @4902 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4902 = -1923.0f; -COMPILER_STRIP_GATE(80708ACC, &lit_4902); +COMPILER_STRIP_GATE(0x80708ACC, &lit_4902); #pragma pop /* 80708AD0-80708AD4 0000C0 0004+00 0/1 0/0 0/0 .rodata @4903 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4903 = 1432.0f; -COMPILER_STRIP_GATE(80708AD0, &lit_4903); +COMPILER_STRIP_GATE(0x80708AD0, &lit_4903); #pragma pop /* 80708AD4-80708AD8 0000C4 0004+00 0/1 0/0 0/0 .rodata @4904 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4904 = 2606.0f; -COMPILER_STRIP_GATE(80708AD4, &lit_4904); +COMPILER_STRIP_GATE(0x80708AD4, &lit_4904); #pragma pop /* 80708AD8-80708ADC 0000C8 0004+00 0/1 0/0 0/0 .rodata @4905 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4905 = 1070.0f; -COMPILER_STRIP_GATE(80708AD8, &lit_4905); +COMPILER_STRIP_GATE(0x80708AD8, &lit_4905); #pragma pop /* 80708ADC-80708AE0 0000CC 0004+00 0/1 0/0 0/0 .rodata @4906 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4906 = 2126.0f; -COMPILER_STRIP_GATE(80708ADC, &lit_4906); +COMPILER_STRIP_GATE(0x80708ADC, &lit_4906); #pragma pop /* 80708AE0-80708AE4 0000D0 0004+00 0/1 0/0 0/0 .rodata @4907 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4907 = 2099.0f; -COMPILER_STRIP_GATE(80708AE0, &lit_4907); +COMPILER_STRIP_GATE(0x80708AE0, &lit_4907); #pragma pop /* 80708AE4-80708AE8 0000D4 0004+00 0/1 0/0 0/0 .rodata @4908 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4908 = 1011.0f; -COMPILER_STRIP_GATE(80708AE4, &lit_4908); +COMPILER_STRIP_GATE(0x80708AE4, &lit_4908); #pragma pop /* 80708CE8-80708CF4 000100 000C+00 0/1 0/0 0/0 .bss @3830 */ @@ -1116,7 +1122,7 @@ asm void __sinit_d_a_e_mb_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80708874 = (void*)__sinit_d_a_e_mb_cpp; +REGISTER_CTORS(0x80708874, __sinit_d_a_e_mb_cpp); #pragma pop /* ############################################################################################## */ @@ -1291,9 +1297,4 @@ static u8 data_80708D5C[4]; static u8 data_80708D60[4]; #pragma pop -/* 80708AE8-80708AED 0000D8 0005+00 5/5 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80708AE8 = "E_mb"; -#pragma pop +/* 80708AE8-80708AE8 0000D8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/e/d_a_e_md/d_a_e_md.cpp b/rel/d/a/e/d_a_e_md/d_a_e_md.cpp index a4763d07402..00e71b83db7 100644 --- a/rel/d/a/e/d_a_e_md/d_a_e_md.cpp +++ b/rel/d/a/e/d_a_e_md/d_a_e_md.cpp @@ -26,16 +26,16 @@ struct mDoMtx_stack_c { static u8 now[48]; }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; - struct J3DAnmTransform {}; +struct J3DModelData {}; + +struct Z2Creature {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -180,10 +180,10 @@ struct cBgS_PolyInfo {}; struct _GXTexObj {}; -struct Vec {}; - struct JAISoundID {}; +struct Vec {}; + struct Z2SeMgr { /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); }; @@ -329,7 +329,7 @@ SECTION_RODATA static u8 const ccCylSrc[68] = { 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0x70, 0x00, 0x00, 0x43, 0xAF, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8070A4EC, &ccCylSrc); +COMPILER_STRIP_GATE(0x8070A4EC, &ccCylSrc); /* 80708DF8-80708E70 000078 0078+00 1/1 0/0 0/0 .text initCcCylinder__8daE_MD_cFv */ #pragma push @@ -344,7 +344,7 @@ asm void daE_MD_c::initCcCylinder() { /* ############################################################################################## */ /* 8070A530-8070A534 000044 0004+00 1/1 0/0 0/0 .rodata @3776 */ SECTION_RODATA static f32 const lit_3776 = 80.0f; -COMPILER_STRIP_GATE(8070A530, &lit_3776); +COMPILER_STRIP_GATE(0x8070A530, &lit_3776); /* 80708E70-80708EE8 0000F0 0078+00 3/3 0/0 0/0 .text setCcCylinder__8daE_MD_cFf */ #pragma push @@ -359,7 +359,13 @@ asm void daE_MD_c::setCcCylinder(f32 param_0) { /* ############################################################################################## */ /* 8070A534-8070A538 000048 0004+00 3/4 0/0 0/0 .rodata @3858 */ SECTION_RODATA static f32 const lit_3858 = 1.0f; -COMPILER_STRIP_GATE(8070A534, &lit_3858); +COMPILER_STRIP_GATE(0x8070A534, &lit_3858); + +/* 8070A570-8070A570 000084 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8070A570 = "E_MD"; +#pragma pop /* 80708EE8-807091D0 000168 02E8+00 1/1 0/0 0/0 .text useHeapInit__FP10fopAc_ac_c */ #pragma push @@ -389,11 +395,11 @@ SECTION_RODATA static u8 const lit_3870[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(8070A538, &lit_3870); +COMPILER_STRIP_GATE(0x8070A538, &lit_3870); /* 8070A53C-8070A540 000050 0004+00 2/2 0/0 0/0 .rodata @3871 */ SECTION_RODATA static f32 const lit_3871 = -1.0f; -COMPILER_STRIP_GATE(8070A53C, &lit_3871); +COMPILER_STRIP_GATE(0x8070A53C, &lit_3871); /* 807091F0-807092A4 000470 00B4+00 1/1 0/0 0/0 .text SetAnm__8daE_MD_cFP16mDoExt_McaMorfSOiiff */ #pragma push @@ -449,7 +455,7 @@ asm void daE_MD_c::WaitAction() { /* ############################################################################################## */ /* 8070A540-8070A544 000054 0004+00 1/1 0/0 0/0 .rodata @4032 */ SECTION_RODATA static f32 const lit_4032 = 5.0f; -COMPILER_STRIP_GATE(8070A540, &lit_4032); +COMPILER_STRIP_GATE(0x8070A540, &lit_4032); /* 8070994C-80709A04 000BCC 00B8+00 1/1 0/0 0/0 .text HalfBreakAction__8daE_MD_cFv */ #pragma push @@ -466,7 +472,7 @@ asm void daE_MD_c::HalfBreakAction() { SECTION_RODATA static u8 const lit_4045[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8070A544, &lit_4045); +COMPILER_STRIP_GATE(0x8070A544, &lit_4045); /* 80709A04-80709ABC 000C84 00B8+00 3/3 0/0 0/0 .text VibAction__8daE_MD_cFv */ #pragma push @@ -481,11 +487,11 @@ asm void daE_MD_c::VibAction() { /* ############################################################################################## */ /* 8070A54C-8070A550 000060 0004+00 3/3 0/0 0/0 .rodata @4064 */ SECTION_RODATA static f32 const lit_4064 = 350.0f; -COMPILER_STRIP_GATE(8070A54C, &lit_4064); +COMPILER_STRIP_GATE(0x8070A54C, &lit_4064); /* 8070A550-8070A554 000064 0004+00 1/3 0/0 0/0 .rodata @4065 */ SECTION_RODATA static f32 const lit_4065 = 100.0f; -COMPILER_STRIP_GATE(8070A550, &lit_4065); +COMPILER_STRIP_GATE(0x8070A550, &lit_4065); /* 80709ABC-80709BB4 000D3C 00F8+00 1/1 0/0 0/0 .text DummyAction__8daE_MD_cFv */ #pragma push @@ -552,7 +558,7 @@ asm void daE_MD_c::setBaseMtx() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4212 = 1000.0f; -COMPILER_STRIP_GATE(8070A554, &lit_4212); +COMPILER_STRIP_GATE(0x8070A554, &lit_4212); #pragma pop /* 80709E6C-8070A024 0010EC 01B8+00 1/0 0/0 0/0 .text daE_MD_Draw__FP8daE_MD_c */ @@ -580,42 +586,42 @@ static asm void daE_MD_Execute(daE_MD_c* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4411 = -1500.0f; -COMPILER_STRIP_GATE(8070A558, &lit_4411); +COMPILER_STRIP_GATE(0x8070A558, &lit_4411); #pragma pop /* 8070A55C-8070A560 000070 0004+00 0/1 0/0 0/0 .rodata @4412 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4412 = -950.0f; -COMPILER_STRIP_GATE(8070A55C, &lit_4412); +COMPILER_STRIP_GATE(0x8070A55C, &lit_4412); #pragma pop /* 8070A560-8070A564 000074 0004+00 0/1 0/0 0/0 .rodata @4413 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4413 = 560.0f; -COMPILER_STRIP_GATE(8070A560, &lit_4413); +COMPILER_STRIP_GATE(0x8070A560, &lit_4413); #pragma pop /* 8070A564-8070A568 000078 0004+00 0/1 0/0 0/0 .rodata @4414 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4414 = 10.0f; -COMPILER_STRIP_GATE(8070A564, &lit_4414); +COMPILER_STRIP_GATE(0x8070A564, &lit_4414); #pragma pop /* 8070A568-8070A56C 00007C 0004+00 0/1 0/0 0/0 .rodata @4415 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4415 = 1500.0f; -COMPILER_STRIP_GATE(8070A568, &lit_4415); +COMPILER_STRIP_GATE(0x8070A568, &lit_4415); #pragma pop /* 8070A56C-8070A570 000080 0004+00 0/1 0/0 0/0 .rodata @4416 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4416 = 200.0f; -COMPILER_STRIP_GATE(8070A56C, &lit_4416); +COMPILER_STRIP_GATE(0x8070A56C, &lit_4416); #pragma pop /* 8070A578-8070A598 -00001 0020+00 1/0 0/0 0/0 .data l_daE_MD_Method */ @@ -732,9 +738,4 @@ static asm void func_8070A4DC() { } #pragma pop -/* 8070A570-8070A575 000084 0005+00 4/4 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_8070A570 = "E_MD"; -#pragma pop +/* 8070A570-8070A570 000084 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/e/d_a_e_mf/d_a_e_mf.cpp b/rel/d/a/e/d_a_e_mf/d_a_e_mf.cpp index a6984712619..76b0f4b02c4 100644 --- a/rel/d/a/e/d_a_e_mf/d_a_e_mf.cpp +++ b/rel/d/a/e/d_a_e_mf/d_a_e_mf.cpp @@ -19,16 +19,16 @@ struct mDoMtx_stack_c { static u8 now[48]; }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; - struct J3DAnmTransform {}; +struct J3DModelData {}; + +struct Z2Creature {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -88,13 +88,13 @@ struct dRes_control_c { struct dPa_levelEcallBack {}; -struct _GXColor {}; - struct csXyz { /* 80713418 */ csXyz(); /* 80713924 */ ~csXyz(); }; +struct _GXColor {}; + struct dPa_control_c { struct level_c { /* 8004B918 */ void getEmitter(u32); @@ -109,10 +109,10 @@ struct dPa_control_c { cXyz const*, f32); }; -struct dJntColData_c {}; - struct J3DModel {}; +struct dJntColData_c {}; + struct dJntCol_c { /* 80035C8C */ dJntCol_c(); /* 80035CA0 */ void init(fopAc_ac_c*, dJntColData_c const*, J3DModel*, int); @@ -522,7 +522,7 @@ extern "C" void __register_global_object(); /* ############################################################################################## */ /* 80713974-80713978 000000 0004+00 33/33 0/0 0/0 .rodata @3828 */ SECTION_RODATA static f32 const lit_3828 = 100.0f; -COMPILER_STRIP_GATE(80713974, &lit_3828); +COMPILER_STRIP_GATE(0x80713974, &lit_3828); /* 80713978-8071397C 000004 0004+00 2/27 0/0 0/0 .rodata @3829 */ SECTION_RODATA static u8 const lit_3829[4] = { @@ -531,7 +531,7 @@ SECTION_RODATA static u8 const lit_3829[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80713978, &lit_3829); +COMPILER_STRIP_GATE(0x80713978, &lit_3829); /* 8071397C-80713984 000008 0004+04 2/20 0/0 0/0 .rodata @3830 */ SECTION_RODATA static f32 const lit_3830[1 + 1 /* padding */] = { @@ -539,7 +539,7 @@ SECTION_RODATA static f32 const lit_3830[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(8071397C, &lit_3830); +COMPILER_STRIP_GATE(0x8071397C, &lit_3830); /* 80713984-8071398C 000010 0008+00 0/5 0/0 0/0 .rodata @3831 */ #pragma push @@ -547,7 +547,7 @@ COMPILER_STRIP_GATE(8071397C, &lit_3830); SECTION_RODATA static u8 const lit_3831[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80713984, &lit_3831); +COMPILER_STRIP_GATE(0x80713984, &lit_3831); #pragma pop /* 8071398C-80713994 000018 0008+00 0/5 0/0 0/0 .rodata @3832 */ @@ -556,7 +556,7 @@ COMPILER_STRIP_GATE(80713984, &lit_3831); SECTION_RODATA static u8 const lit_3832[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8071398C, &lit_3832); +COMPILER_STRIP_GATE(0x8071398C, &lit_3832); #pragma pop /* 80713994-8071399C 000020 0008+00 0/5 0/0 0/0 .rodata @3833 */ @@ -565,49 +565,49 @@ COMPILER_STRIP_GATE(8071398C, &lit_3832); SECTION_RODATA static u8 const lit_3833[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80713994, &lit_3833); +COMPILER_STRIP_GATE(0x80713994, &lit_3833); #pragma pop /* 8071399C-807139A0 000028 0004+00 0/1 0/0 0/0 .rodata @3834 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3834 = 1.0f / 100.0f; -COMPILER_STRIP_GATE(8071399C, &lit_3834); +COMPILER_STRIP_GATE(0x8071399C, &lit_3834); #pragma pop /* 807139A0-807139A4 00002C 0004+00 0/1 0/0 0/0 .rodata @3849 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3849 = 13.0f / 10.0f; -COMPILER_STRIP_GATE(807139A0, &lit_3849); +COMPILER_STRIP_GATE(0x807139A0, &lit_3849); #pragma pop /* 807139A4-807139A8 000030 0004+00 0/1 0/0 0/0 .rodata @3850 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3850 = 8.0f; -COMPILER_STRIP_GATE(807139A4, &lit_3850); +COMPILER_STRIP_GATE(0x807139A4, &lit_3850); #pragma pop /* 807139A8-807139AC 000034 0004+00 0/1 0/0 0/0 .rodata @3851 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3851 = 28.0f; -COMPILER_STRIP_GATE(807139A8, &lit_3851); +COMPILER_STRIP_GATE(0x807139A8, &lit_3851); #pragma pop /* 807139AC-807139B0 000038 0004+00 0/6 0/0 0/0 .rodata @3852 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3852 = 300.0f; -COMPILER_STRIP_GATE(807139AC, &lit_3852); +COMPILER_STRIP_GATE(0x807139AC, &lit_3852); #pragma pop /* 807139B0-807139B4 00003C 0004+00 0/1 0/0 0/0 .rodata @3853 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3853 = 350.0f; -COMPILER_STRIP_GATE(807139B0, &lit_3853); +COMPILER_STRIP_GATE(0x807139B0, &lit_3853); #pragma pop /* 80713B08-80713B14 000000 000C+00 2/2 0/0 0/0 .data cNullVec__6Z2Calc */ @@ -980,7 +980,13 @@ static asm void mf_disappear(e_mf_class* param_0) { /* ############################################################################################## */ /* 807139B4-807139B8 000040 0004+00 1/4 0/0 0/0 .rodata @3893 */ SECTION_RODATA static f32 const lit_3893 = -1.0f; -COMPILER_STRIP_GATE(807139B4, &lit_3893); +COMPILER_STRIP_GATE(0x807139B4, &lit_3893); + +/* 80713AF4-80713AF4 000180 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80713AF4 = "E_mf"; +#pragma pop /* 8070A82C-8070A8D8 00020C 00AC+00 16/16 0/0 0/0 .text anm_init__FP10e_mf_classifUcf */ #pragma push @@ -1007,14 +1013,14 @@ static asm void nodeCallBack(J3DJoint* param_0, int param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4120 = 50.0f; -COMPILER_STRIP_GATE(807139B8, &lit_4120); +COMPILER_STRIP_GATE(0x807139B8, &lit_4120); #pragma pop /* 807139BC-807139C0 000048 0004+00 0/1 0/0 0/0 .rodata @4121 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4121 = 1150.0f; -COMPILER_STRIP_GATE(807139BC, &lit_4121); +COMPILER_STRIP_GATE(0x807139BC, &lit_4121); #pragma pop /* 8070AD94-8070B03C 000774 02A8+00 1/0 0/0 0/0 .text daE_MF_Draw__FP10e_mf_class */ @@ -1168,28 +1174,28 @@ static asm void s_b_sub(void* param_0, void* param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4346 = 30.0f; -COMPILER_STRIP_GATE(807139C0, &lit_4346); +COMPILER_STRIP_GATE(0x807139C0, &lit_4346); #pragma pop /* 807139C4-807139C8 000050 0004+00 0/1 0/0 0/0 .rodata @4347 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4347 = 500.0f; -COMPILER_STRIP_GATE(807139C4, &lit_4347); +COMPILER_STRIP_GATE(0x807139C4, &lit_4347); #pragma pop /* 807139C8-807139CC 000054 0004+00 0/1 0/0 0/0 .rodata @4348 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4348 = -125.0f; -COMPILER_STRIP_GATE(807139C8, &lit_4348); +COMPILER_STRIP_GATE(0x807139C8, &lit_4348); #pragma pop /* 807139CC-807139D0 000058 0004+00 0/1 0/0 0/0 .rodata @4349 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4349 = 1500.0f; -COMPILER_STRIP_GATE(807139CC, &lit_4349); +COMPILER_STRIP_GATE(0x807139CC, &lit_4349); #pragma pop /* 8070B268-8070B6E0 000C48 0478+00 2/2 0/0 0/0 .text search_bomb__FP10e_mf_classi */ @@ -1258,7 +1264,7 @@ static asm void move_gake_check(e_mf_class* param_0, f32 param_1, s8 param_2) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4459 = 200.0f; -COMPILER_STRIP_GATE(807139D0, &lit_4459); +COMPILER_STRIP_GATE(0x807139D0, &lit_4459); #pragma pop /* 8070B950-8070BB10 001330 01C0+00 1/1 0/0 0/0 .text jump_pos_check__FP10e_mf_classP4cXyz */ @@ -1276,28 +1282,28 @@ static asm void jump_pos_check(e_mf_class* param_0, cXyz* param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4559 = 10.0f; -COMPILER_STRIP_GATE(807139D4, &lit_4559); +COMPILER_STRIP_GATE(0x807139D4, &lit_4559); #pragma pop /* 807139D8-807139DC 000064 0004+00 0/2 0/0 0/0 .rodata @4560 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4560 = 9.0f / 10.0f; -COMPILER_STRIP_GATE(807139D8, &lit_4560); +COMPILER_STRIP_GATE(0x807139D8, &lit_4560); #pragma pop /* 807139DC-807139E0 000068 0004+00 0/3 0/0 0/0 .rodata @4561 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4561 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(807139DC, &lit_4561); +COMPILER_STRIP_GATE(0x807139DC, &lit_4561); #pragma pop /* 807139E0-807139E4 00006C 0004+00 0/2 0/0 0/0 .rodata @4562 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4562 = 2000.0f; -COMPILER_STRIP_GATE(807139E0, &lit_4562); +COMPILER_STRIP_GATE(0x807139E0, &lit_4562); #pragma pop /* 8070BB10-8070BF94 0014F0 0484+00 2/1 0/0 0/0 .text e_mf_stay__FP10e_mf_class */ @@ -1315,42 +1321,42 @@ static asm void e_mf_stay(e_mf_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4563 = 3.0f; -COMPILER_STRIP_GATE(807139E4, &lit_4563); +COMPILER_STRIP_GATE(0x807139E4, &lit_4563); #pragma pop /* 807139E8-807139EC 000074 0004+00 0/4 0/0 0/0 .rodata @4564 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4564 = 1.5f; -COMPILER_STRIP_GATE(807139E8, &lit_4564); +COMPILER_STRIP_GATE(0x807139E8, &lit_4564); #pragma pop /* 807139EC-807139F0 000078 0004+00 0/5 0/0 0/0 .rodata @4565 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4565 = 20.0f; -COMPILER_STRIP_GATE(807139EC, &lit_4565); +COMPILER_STRIP_GATE(0x807139EC, &lit_4565); #pragma pop /* 807139F0-807139F4 00007C 0004+00 0/10 0/0 0/0 .rodata @4566 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4566 = 5.0f; -COMPILER_STRIP_GATE(807139F0, &lit_4566); +COMPILER_STRIP_GATE(0x807139F0, &lit_4566); #pragma pop /* 807139F4-807139F8 000080 0004+00 0/1 0/0 0/0 .rodata @4567 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4567 = 40.0f; -COMPILER_STRIP_GATE(807139F4, &lit_4567); +COMPILER_STRIP_GATE(0x807139F4, &lit_4567); #pragma pop /* 807139F8-807139FC 000084 0004+00 0/0 0/0 0/0 .rodata @4568 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4568 = 75.0f; -COMPILER_STRIP_GATE(807139F8, &lit_4568); +COMPILER_STRIP_GATE(0x807139F8, &lit_4568); #pragma pop /* 807139FC-80713A04 000088 0008+00 0/1 0/0 0/0 .rodata @4573 */ @@ -1359,28 +1365,28 @@ COMPILER_STRIP_GATE(807139F8, &lit_4568); SECTION_RODATA static u8 const lit_4573[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(807139FC, &lit_4573); +COMPILER_STRIP_GATE(0x807139FC, &lit_4573); #pragma pop /* 80713A04-80713A08 000090 0004+00 0/1 0/0 0/0 .rodata @4634 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4634 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(80713A04, &lit_4634); +COMPILER_STRIP_GATE(0x80713A04, &lit_4634); #pragma pop /* 80713A08-80713A0C 000094 0004+00 0/2 0/0 0/0 .rodata @4635 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4635 = 1.0f / 20.0f; -COMPILER_STRIP_GATE(80713A08, &lit_4635); +COMPILER_STRIP_GATE(0x80713A08, &lit_4635); #pragma pop /* 80713A0C-80713A10 000098 0004+00 0/2 0/0 0/0 .rodata @4636 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4636 = 250.0f; -COMPILER_STRIP_GATE(80713A0C, &lit_4636); +COMPILER_STRIP_GATE(0x80713A0C, &lit_4636); #pragma pop /* 8070BF94-8070C2C4 001974 0330+00 1/1 0/0 0/0 .text e_mf_otoreac__FP10e_mf_class */ @@ -1408,42 +1414,42 @@ static asm void e_mf_bomb_action(e_mf_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4737 = 600.0f; -COMPILER_STRIP_GATE(80713A10, &lit_4737); +COMPILER_STRIP_GATE(0x80713A10, &lit_4737); #pragma pop /* 80713A14-80713A18 0000A0 0004+00 0/1 0/0 0/0 .rodata @4738 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4738 = -30.0f; -COMPILER_STRIP_GATE(80713A14, &lit_4738); +COMPILER_STRIP_GATE(0x80713A14, &lit_4738); #pragma pop /* 80713A18-80713A1C 0000A4 0004+00 0/2 0/0 0/0 .rodata @4739 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4739 = 60.0f; -COMPILER_STRIP_GATE(80713A18, &lit_4739); +COMPILER_STRIP_GATE(0x80713A18, &lit_4739); #pragma pop /* 80713A1C-80713A20 0000A8 0004+00 0/2 0/0 0/0 .rodata @4740 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4740 = 15.0f; -COMPILER_STRIP_GATE(80713A1C, &lit_4740); +COMPILER_STRIP_GATE(0x80713A1C, &lit_4740); #pragma pop /* 80713A20-80713A24 0000AC 0004+00 0/1 0/0 0/0 .rodata @4805 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4805 = 32768.0f; -COMPILER_STRIP_GATE(80713A20, &lit_4805); +COMPILER_STRIP_GATE(0x80713A20, &lit_4805); #pragma pop /* 80713A24-80713A28 0000B0 0004+00 0/1 0/0 0/0 .rodata @4806 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4806 = 10000.0f; -COMPILER_STRIP_GATE(80713A24, &lit_4806); +COMPILER_STRIP_GATE(0x80713A24, &lit_4806); #pragma pop /* 8070C7C4-8070CB1C 0021A4 0358+00 1/1 0/0 0/0 .text e_mf_normal__FP10e_mf_class */ @@ -1461,7 +1467,7 @@ static asm void e_mf_normal(e_mf_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4834 = -5.0f; -COMPILER_STRIP_GATE(80713A28, &lit_4834); +COMPILER_STRIP_GATE(0x80713A28, &lit_4834); #pragma pop /* 8070CB1C-8070CCB8 0024FC 019C+00 1/1 0/0 0/0 .text e_mf_drawback__FP10e_mf_class */ @@ -1479,12 +1485,12 @@ static asm void e_mf_drawback(e_mf_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4899 = 2.0f; -COMPILER_STRIP_GATE(80713A2C, &lit_4899); +COMPILER_STRIP_GATE(0x80713A2C, &lit_4899); #pragma pop /* 80713A30-80713A34 0000BC 0004+00 1/5 0/0 0/0 .rodata @4900 */ SECTION_RODATA static f32 const lit_4900 = 150.0f; -COMPILER_STRIP_GATE(80713A30, &lit_4900); +COMPILER_STRIP_GATE(0x80713A30, &lit_4900); /* 8070CCB8-8070D090 002698 03D8+00 1/1 0/0 0/0 .text e_mf_wolfbite__FP10e_mf_class */ #pragma push @@ -1511,7 +1517,7 @@ static asm void way_check(e_mf_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4971 = 1000.0f; -COMPILER_STRIP_GATE(80713A34, &lit_4971); +COMPILER_STRIP_GATE(0x80713A34, &lit_4971); #pragma pop /* 8070D0D0-8070D2C8 002AB0 01F8+00 1/1 0/0 0/0 .text shot_s_sub__FPvPv */ @@ -1529,35 +1535,35 @@ static asm void shot_s_sub(void* param_0, void* param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5152 = 120.0f; -COMPILER_STRIP_GATE(80713A38, &lit_5152); +COMPILER_STRIP_GATE(0x80713A38, &lit_5152); #pragma pop /* 80713A3C-80713A40 0000C8 0004+00 0/1 0/0 0/0 .rodata @5153 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5153 = 32763.0f; -COMPILER_STRIP_GATE(80713A3C, &lit_5153); +COMPILER_STRIP_GATE(0x80713A3C, &lit_5153); #pragma pop /* 80713A40-80713A44 0000CC 0004+00 0/1 0/0 0/0 .rodata @5154 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5154 = 13.0f / 20.0f; -COMPILER_STRIP_GATE(80713A40, &lit_5154); +COMPILER_STRIP_GATE(0x80713A40, &lit_5154); #pragma pop /* 80713A44-80713A48 0000D0 0004+00 0/4 0/0 0/0 .rodata @5155 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5155 = 0.5f; -COMPILER_STRIP_GATE(80713A44, &lit_5155); +COMPILER_STRIP_GATE(0x80713A44, &lit_5155); #pragma pop /* 80713A48-80713A4C 0000D4 0004+00 0/1 0/0 0/0 .rodata @5156 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5156 = 19.0f / 10.0f; -COMPILER_STRIP_GATE(80713A48, &lit_5156); +COMPILER_STRIP_GATE(0x80713A48, &lit_5156); #pragma pop /* 8070D2C8-8070DBB4 002CA8 08EC+00 1/1 0/0 0/0 .text e_mf_fight_run__FP10e_mf_class */ @@ -1585,14 +1591,14 @@ static asm void e_mf_jump(e_mf_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5310 = 35.0f; -COMPILER_STRIP_GATE(80713A4C, &lit_5310); +COMPILER_STRIP_GATE(0x80713A4C, &lit_5310); #pragma pop /* 80713A50-80713A54 0000DC 0004+00 0/1 0/0 0/0 .rodata @5311 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5311 = 11.0f / 10.0f; -COMPILER_STRIP_GATE(80713A50, &lit_5311); +COMPILER_STRIP_GATE(0x80713A50, &lit_5311); #pragma pop /* 8070DDDC-8070E30C 0037BC 0530+00 1/1 0/0 0/0 .text e_mf_gakejump__FP10e_mf_class */ @@ -1620,19 +1626,19 @@ static asm void at_hit_check(e_mf_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5389 = 6.0f; -COMPILER_STRIP_GATE(80713A54, &lit_5389); +COMPILER_STRIP_GATE(0x80713A54, &lit_5389); #pragma pop /* 80713A58-80713A5C 0000E4 0004+00 0/1 0/0 0/0 .rodata @5390 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5390 = -35.0f; -COMPILER_STRIP_GATE(80713A58, &lit_5390); +COMPILER_STRIP_GATE(0x80713A58, &lit_5390); #pragma pop /* 80713A5C-80713A60 0000E8 0004+00 1/3 0/0 0/0 .rodata @5391 */ SECTION_RODATA static f32 const lit_5391 = 25.0f; -COMPILER_STRIP_GATE(80713A5C, &lit_5391); +COMPILER_STRIP_GATE(0x80713A5C, &lit_5391); /* 8070E36C-8070E5E0 003D4C 0274+00 1/1 0/0 0/0 .text e_mf_attack__FP10e_mf_class */ #pragma push @@ -1659,14 +1665,14 @@ static asm void tail_eff_set(e_mf_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5509 = 55.0f; -COMPILER_STRIP_GATE(80713A60, &lit_5509); +COMPILER_STRIP_GATE(0x80713A60, &lit_5509); #pragma pop /* 80713A64-80713A68 0000F0 0004+00 0/1 0/0 0/0 .rodata @5510 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5510 = 4.0f; -COMPILER_STRIP_GATE(80713A64, &lit_5510); +COMPILER_STRIP_GATE(0x80713A64, &lit_5510); #pragma pop /* 8070E760-8070EA10 004140 02B0+00 1/1 0/0 0/0 .text e_mf_tail_attack__FP10e_mf_class */ @@ -1684,7 +1690,7 @@ static asm void e_mf_tail_attack(e_mf_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5566 = -8.0f; -COMPILER_STRIP_GATE(80713A68, &lit_5566); +COMPILER_STRIP_GATE(0x80713A68, &lit_5566); #pragma pop /* 8070EA10-8070EC60 0043F0 0250+00 2/1 0/0 0/0 .text e_mf_guard__FP10e_mf_class */ @@ -1712,14 +1718,14 @@ static asm void e_mf_s_damage(e_mf_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5615 = 70.0f; -COMPILER_STRIP_GATE(80713A6C, &lit_5615); +COMPILER_STRIP_GATE(0x80713A6C, &lit_5615); #pragma pop /* 80713A70-80713A74 0000FC 0004+00 0/1 0/0 0/0 .rodata @5616 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5616 = -150.0f; -COMPILER_STRIP_GATE(80713A70, &lit_5616); +COMPILER_STRIP_GATE(0x80713A70, &lit_5616); #pragma pop /* 8070ED10-8070EEC4 0046F0 01B4+00 1/1 0/0 0/0 .text kado_check__FP10e_mf_class */ @@ -1757,7 +1763,7 @@ asm dBgS_ObjGndChk::~dBgS_ObjGndChk() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6006 = 8000.0f; -COMPILER_STRIP_GATE(80713A74, &lit_6006); +COMPILER_STRIP_GATE(0x80713A74, &lit_6006); #pragma pop /* 8070F08C-8070FBEC 004A6C 0B60+00 2/1 0/0 0/0 .text e_mf_damage__FP10e_mf_class */ @@ -1775,35 +1781,35 @@ static asm void e_mf_damage(e_mf_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6007 = -100.0f; -COMPILER_STRIP_GATE(80713A78, &lit_6007); +COMPILER_STRIP_GATE(0x80713A78, &lit_6007); #pragma pop /* 80713A7C-80713A80 000108 0004+00 0/0 0/0 0/0 .rodata @6008 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6008 = 9.0f / 5.0f; -COMPILER_STRIP_GATE(80713A7C, &lit_6008); +COMPILER_STRIP_GATE(0x80713A7C, &lit_6008); #pragma pop /* 80713A80-80713A84 00010C 0004+00 0/3 0/0 0/0 .rodata @6009 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6009 = -20.0f; -COMPILER_STRIP_GATE(80713A80, &lit_6009); +COMPILER_STRIP_GATE(0x80713A80, &lit_6009); #pragma pop /* 80713A84-80713A88 000110 0004+00 0/1 0/0 0/0 .rodata @6033 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6033 = -3.0f; -COMPILER_STRIP_GATE(80713A84, &lit_6033); +COMPILER_STRIP_GATE(0x80713A84, &lit_6033); #pragma pop /* 80713A88-80713A8C 000114 0004+00 0/1 0/0 0/0 .rodata @6034 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6034 = -6.0f; -COMPILER_STRIP_GATE(80713A88, &lit_6034); +COMPILER_STRIP_GATE(0x80713A88, &lit_6034); #pragma pop /* 8070FBEC-8070FD40 0055CC 0154+00 1/1 0/0 0/0 .text e_mf_backdrop__FP10e_mf_class */ @@ -1841,21 +1847,21 @@ static asm void wolfkick_damage(e_mf_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6087 = 3000.0f; -COMPILER_STRIP_GATE(80713A8C, &lit_6087); +COMPILER_STRIP_GATE(0x80713A8C, &lit_6087); #pragma pop /* 80713A90-80713A94 00011C 0004+00 0/1 0/0 0/0 .rodata @6088 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6088 = 800.0f; -COMPILER_STRIP_GATE(80713A90, &lit_6088); +COMPILER_STRIP_GATE(0x80713A90, &lit_6088); #pragma pop /* 80713A94-80713A98 000120 0004+00 0/1 0/0 0/0 .rodata @6089 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6089 = 700.0f; -COMPILER_STRIP_GATE(80713A94, &lit_6089); +COMPILER_STRIP_GATE(0x80713A94, &lit_6089); #pragma pop /* 8070FF98-807100A8 005978 0110+00 1/1 0/0 0/0 .text big_damage__FP10e_mf_class */ @@ -1913,147 +1919,153 @@ static asm void anm_se_set(e_mf_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6886 = 3.0f / 10.0f; -COMPILER_STRIP_GATE(80713A98, &lit_6886); +COMPILER_STRIP_GATE(0x80713A98, &lit_6886); #pragma pop /* 80713A9C-80713AA0 000128 0004+00 0/0 0/0 0/0 .rodata @6887 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6887 = -4.0f; -COMPILER_STRIP_GATE(80713A9C, &lit_6887); +COMPILER_STRIP_GATE(0x80713A9C, &lit_6887); #pragma pop /* 80713AA0-80713AA4 00012C 0004+00 0/0 0/0 0/0 .rodata @6888 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6888 = 7.0f; -COMPILER_STRIP_GATE(80713AA0, &lit_6888); +COMPILER_STRIP_GATE(0x80713AA0, &lit_6888); #pragma pop /* 80713AA4-80713AA8 000130 0004+00 0/0 0/0 0/0 .rodata @6889 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6889 = 2500.0f; -COMPILER_STRIP_GATE(80713AA4, &lit_6889); +COMPILER_STRIP_GATE(0x80713AA4, &lit_6889); #pragma pop /* 80713AA8-80713AAC 000134 0004+00 0/0 0/0 0/0 .rodata @6890 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6890 = 15000.0f; -COMPILER_STRIP_GATE(80713AA8, &lit_6890); +COMPILER_STRIP_GATE(0x80713AA8, &lit_6890); #pragma pop /* 80713AAC-80713AB0 000138 0004+00 0/0 0/0 0/0 .rodata @6891 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6891 = 12000.0f; -COMPILER_STRIP_GATE(80713AAC, &lit_6891); +COMPILER_STRIP_GATE(0x80713AAC, &lit_6891); #pragma pop /* 80713AB0-80713AB4 00013C 0004+00 0/0 0/0 0/0 .rodata @6892 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6892 = -1000000000.0f; -COMPILER_STRIP_GATE(80713AB0, &lit_6892); +COMPILER_STRIP_GATE(0x80713AB0, &lit_6892); #pragma pop /* 80713AB4-80713AB8 000140 0004+00 0/1 0/0 0/0 .rodata @7307 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7307 = -10.0f; -COMPILER_STRIP_GATE(80713AB4, &lit_7307); +COMPILER_STRIP_GATE(0x80713AB4, &lit_7307); #pragma pop /* 80713AB8-80713ABC 000144 0004+00 0/2 0/0 0/0 .rodata @7308 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7308 = -200.0f; -COMPILER_STRIP_GATE(80713AB8, &lit_7308); +COMPILER_STRIP_GATE(0x80713AB8, &lit_7308); #pragma pop /* 80713ABC-80713AC0 000148 0004+00 0/1 0/0 0/0 .rodata @7309 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7309 = -20000.0f; -COMPILER_STRIP_GATE(80713ABC, &lit_7309); +COMPILER_STRIP_GATE(0x80713ABC, &lit_7309); #pragma pop /* 80713AC0-80713AC4 00014C 0004+00 0/1 0/0 0/0 .rodata @7310 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7310 = 200000.0f; -COMPILER_STRIP_GATE(80713AC0, &lit_7310); +COMPILER_STRIP_GATE(0x80713AC0, &lit_7310); #pragma pop /* 80713AC4-80713AC8 000150 0004+00 0/1 0/0 0/0 .rodata @7311 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7311 = 30000.0f; -COMPILER_STRIP_GATE(80713AC4, &lit_7311); +COMPILER_STRIP_GATE(0x80713AC4, &lit_7311); #pragma pop /* 80713AC8-80713ACC 000154 0004+00 0/1 0/0 0/0 .rodata @7312 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7312 = 45.0f; -COMPILER_STRIP_GATE(80713AC8, &lit_7312); +COMPILER_STRIP_GATE(0x80713AC8, &lit_7312); #pragma pop /* 80713ACC-80713AD0 000158 0004+00 0/2 0/0 0/0 .rodata @7313 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7313 = 80.0f; -COMPILER_STRIP_GATE(80713ACC, &lit_7313); +COMPILER_STRIP_GATE(0x80713ACC, &lit_7313); #pragma pop /* 80713AD0-80713AD4 00015C 0004+00 0/1 0/0 0/0 .rodata @7314 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7314 = -23500.0f; -COMPILER_STRIP_GATE(80713AD0, &lit_7314); +COMPILER_STRIP_GATE(0x80713AD0, &lit_7314); #pragma pop /* 80713AD4-80713AD8 000160 0004+00 0/1 0/0 0/0 .rodata @7315 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7315 = -50000.0f; -COMPILER_STRIP_GATE(80713AD4, &lit_7315); +COMPILER_STRIP_GATE(0x80713AD4, &lit_7315); #pragma pop /* 80713AD8-80713ADC 000164 0004+00 0/1 0/0 0/0 .rodata @7316 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7316 = -30000.0f; -COMPILER_STRIP_GATE(80713AD8, &lit_7316); +COMPILER_STRIP_GATE(0x80713AD8, &lit_7316); #pragma pop /* 80713ADC-80713AE0 000168 0004+00 0/1 0/0 0/0 .rodata @7317 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7317 = 2.0f / 5.0f; -COMPILER_STRIP_GATE(80713ADC, &lit_7317); +COMPILER_STRIP_GATE(0x80713ADC, &lit_7317); #pragma pop /* 80713AE0-80713AE4 00016C 0004+00 0/1 0/0 0/0 .rodata @7318 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7318 = 180.0f; -COMPILER_STRIP_GATE(80713AE0, &lit_7318); +COMPILER_STRIP_GATE(0x80713AE0, &lit_7318); #pragma pop /* 80713AE4-80713AE8 000170 0004+00 0/1 0/0 0/0 .rodata @7319 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7319 = -5000.0f; -COMPILER_STRIP_GATE(80713AE4, &lit_7319); +COMPILER_STRIP_GATE(0x80713AE4, &lit_7319); #pragma pop /* 80713AE8-80713AEC 000174 0004+00 0/1 0/0 0/0 .rodata @7320 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7320 = -300.0f; -COMPILER_STRIP_GATE(80713AE8, &lit_7320); +COMPILER_STRIP_GATE(0x80713AE8, &lit_7320); +#pragma pop + +/* 80713AF4-80713AF4 000180 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80713AF9 = "D_MN07"; #pragma pop /* 80713FC4-80713FC8 0000A4 0004+00 1/2 0/0 0/0 .bss c_start */ @@ -2099,14 +2111,20 @@ static asm void useHeapInit(fopAc_ac_c* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7484 = 100000.0f; -COMPILER_STRIP_GATE(80713AEC, &lit_7484); +COMPILER_STRIP_GATE(0x80713AEC, &lit_7484); #pragma pop /* 80713AF0-80713AF4 00017C 0004+00 0/1 0/0 0/0 .rodata @7485 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7485 = 65535.0f; -COMPILER_STRIP_GATE(80713AF0, &lit_7485); +COMPILER_STRIP_GATE(0x80713AF0, &lit_7485); +#pragma pop + +/* 80713AF4-80713AF4 000180 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80713B00 = "D_MN09"; #pragma pop /* 80712BF0-80712F20 0085D0 0330+00 1/0 0/0 0/0 .text daE_MF_Create__FP10fopAc_ac_c */ @@ -2236,7 +2254,7 @@ asm void __sinit_d_a_e_mf_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_807134AC = (void*)__sinit_d_a_e_mf_cpp; +REGISTER_CTORS(0x807134AC, __sinit_d_a_e_mf_cpp); #pragma pop /* 807134E8-807134F0 008EC8 0008+00 1/0 0/0 0/0 .text @20@__dt__14dBgS_ObjGndChkFv */ @@ -2483,11 +2501,4 @@ static u8 data_80714024[4]; static u8 data_80714028[4]; #pragma pop -/* 80713AF4-80713B07 000180 0013+00 5/5 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80713AF4 = "E_mf"; -SECTION_DEAD static char const* const stringBase_80713AF9 = "D_MN07"; -SECTION_DEAD static char const* const stringBase_80713B00 = "D_MN09"; -#pragma pop +/* 80713AF4-80713AF4 000180 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/e/d_a_e_mk/d_a_e_mk.cpp b/rel/d/a/e/d_a_e_mk/d_a_e_mk.cpp index e3aebea26dd..44433a77447 100644 --- a/rel/d/a/e/d_a_e_mk/d_a_e_mk.cpp +++ b/rel/d/a/e/d_a_e_mk/d_a_e_mk.cpp @@ -29,16 +29,16 @@ struct mDoExt_btpAnm { /* 8000D5E8 */ void entry(J3DMaterialTable*, s16); }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; - struct J3DAnmTransform {}; +struct J3DModelData {}; + +struct Z2Creature {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -118,10 +118,10 @@ struct dRes_control_c { struct dPa_levelEcallBack {}; -struct _GXColor {}; - struct csXyz {}; +struct _GXColor {}; + struct dPa_control_c { struct level_c { /* 8004B918 */ void getEmitter(u32); @@ -479,17 +479,17 @@ extern "C" void __register_global_object(); /* ############################################################################################## */ /* 8071C544-8071C548 000000 0004+00 22/22 0/0 0/0 .rodata @3777 */ SECTION_RODATA static f32 const lit_3777 = 13.0f / 10.0f; -COMPILER_STRIP_GATE(8071C544, &lit_3777); +COMPILER_STRIP_GATE(0x8071C544, &lit_3777); /* 8071C548-8071C54C 000004 0004+00 1/20 0/0 0/0 .rodata @3778 */ SECTION_RODATA static f32 const lit_3778 = 1.0f; -COMPILER_STRIP_GATE(8071C548, &lit_3778); +COMPILER_STRIP_GATE(0x8071C548, &lit_3778); /* 8071C54C-8071C550 000008 0004+00 0/1 0/0 0/0 .rodata @3779 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3779 = 1800.0f; -COMPILER_STRIP_GATE(8071C54C, &lit_3779); +COMPILER_STRIP_GATE(0x8071C54C, &lit_3779); #pragma pop /* 8071C550-8071C554 00000C 0004+00 3/21 0/0 0/0 .rodata @3780 */ @@ -499,7 +499,7 @@ SECTION_RODATA static u8 const lit_3780[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(8071C550, &lit_3780); +COMPILER_STRIP_GATE(0x8071C550, &lit_3780); /* 8071C7FC-8071C828 -00001 002C+00 1/1 0/0 0/0 .data @4295 */ SECTION_DATA static void* lit_4295[11] = { @@ -710,7 +710,13 @@ asm daE_MK_HIO_c::daE_MK_HIO_c() { /* ############################################################################################## */ /* 8071C554-8071C558 000010 0004+00 2/4 0/0 0/0 .rodata @3794 */ SECTION_RODATA static f32 const lit_3794 = -1.0f; -COMPILER_STRIP_GATE(8071C554, &lit_3794); +COMPILER_STRIP_GATE(0x8071C554, &lit_3794); + +/* 8071C7E8-8071C7E8 0002A4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8071C7E8 = "E_mk"; +#pragma pop /* 8071417C-80714228 00013C 00AC+00 9/9 0/0 0/0 .text anm_init__FP10e_mk_classifUcf */ #pragma push @@ -738,19 +744,19 @@ static asm void ok_anm_init(e_mk_class* param_0, int param_1, f32 param_2, u8 pa #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3862 = 50.0f; -COMPILER_STRIP_GATE(8071C558, &lit_3862); +COMPILER_STRIP_GATE(0x8071C558, &lit_3862); #pragma pop /* 8071C55C-8071C560 000018 0004+00 0/2 0/0 0/0 .rodata @3863 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3863 = 1200.0f; -COMPILER_STRIP_GATE(8071C55C, &lit_3863); +COMPILER_STRIP_GATE(0x8071C55C, &lit_3863); #pragma pop /* 8071C560-8071C564 00001C 0004+00 1/9 0/0 0/0 .rodata @3864 */ SECTION_RODATA static f32 const lit_3864 = 500.0f; -COMPILER_STRIP_GATE(8071C560, &lit_3864); +COMPILER_STRIP_GATE(0x8071C560, &lit_3864); /* 807142D0-80714498 000290 01C8+00 1/0 0/0 0/0 .text daE_MK_Draw__FP10e_mk_class */ #pragma push @@ -960,7 +966,7 @@ SECTION_RODATA static f32 const lit_3969[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(8071C564, &lit_3969); +COMPILER_STRIP_GATE(0x8071C564, &lit_3969); #pragma pop /* 8071C56C-8071C574 000028 0008+00 0/3 0/0 0/0 .rodata @3970 */ @@ -969,7 +975,7 @@ COMPILER_STRIP_GATE(8071C564, &lit_3969); SECTION_RODATA static u8 const lit_3970[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8071C56C, &lit_3970); +COMPILER_STRIP_GATE(0x8071C56C, &lit_3970); #pragma pop /* 8071C574-8071C57C 000030 0008+00 0/3 0/0 0/0 .rodata @3971 */ @@ -978,7 +984,7 @@ COMPILER_STRIP_GATE(8071C56C, &lit_3970); SECTION_RODATA static u8 const lit_3971[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8071C574, &lit_3971); +COMPILER_STRIP_GATE(0x8071C574, &lit_3971); #pragma pop /* 8071C57C-8071C584 000038 0008+00 0/3 0/0 0/0 .rodata @3972 */ @@ -987,35 +993,35 @@ COMPILER_STRIP_GATE(8071C574, &lit_3971); SECTION_RODATA static u8 const lit_3972[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8071C57C, &lit_3972); +COMPILER_STRIP_GATE(0x8071C57C, &lit_3972); #pragma pop /* 8071C584-8071C588 000040 0004+00 0/3 0/0 0/0 .rodata @3973 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3973 = 700.0f; -COMPILER_STRIP_GATE(8071C584, &lit_3973); +COMPILER_STRIP_GATE(0x8071C584, &lit_3973); #pragma pop /* 8071C588-8071C58C 000044 0004+00 0/1 0/0 0/0 .rodata @3974 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3974 = 3.0f / 10.0f; -COMPILER_STRIP_GATE(8071C588, &lit_3974); +COMPILER_STRIP_GATE(0x8071C588, &lit_3974); #pragma pop /* 8071C58C-8071C590 000048 0004+00 0/6 0/0 0/0 .rodata @3975 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3975 = 100.0f; -COMPILER_STRIP_GATE(8071C58C, &lit_3975); +COMPILER_STRIP_GATE(0x8071C58C, &lit_3975); #pragma pop /* 8071C590-8071C594 00004C 0004+00 0/2 0/0 0/0 .rodata @3976 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3976 = 2000.0f; -COMPILER_STRIP_GATE(8071C590, &lit_3976); +COMPILER_STRIP_GATE(0x8071C590, &lit_3976); #pragma pop /* 807145A4-80714874 000564 02D0+00 1/1 0/0 0/0 .text search_hasira__FP10e_mk_class */ @@ -1043,14 +1049,14 @@ static asm void s_d_sub(void* param_0, void* param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4057 = 0.5f; -COMPILER_STRIP_GATE(8071C594, &lit_4057); +COMPILER_STRIP_GATE(0x8071C594, &lit_4057); #pragma pop /* 8071C598-8071C59C 000054 0004+00 0/1 0/0 0/0 .rodata @4058 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4058 = 5000.0f; -COMPILER_STRIP_GATE(8071C598, &lit_4058); +COMPILER_STRIP_GATE(0x8071C598, &lit_4058); #pragma pop /* 807148FC-80714B78 0008BC 027C+00 1/1 0/0 0/0 .text search_db__FP10e_mk_class */ @@ -1068,28 +1074,28 @@ static asm void search_db(e_mk_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4286 = 2.0f; -COMPILER_STRIP_GATE(8071C59C, &lit_4286); +COMPILER_STRIP_GATE(0x8071C59C, &lit_4286); #pragma pop /* 8071C5A0-8071C5A4 00005C 0004+00 0/6 0/0 0/0 .rodata @4287 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4287 = 3.0f; -COMPILER_STRIP_GATE(8071C5A0, &lit_4287); +COMPILER_STRIP_GATE(0x8071C5A0, &lit_4287); #pragma pop /* 8071C5A4-8071C5A8 000060 0004+00 0/10 0/0 0/0 .rodata @4288 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4288 = 5.0f; -COMPILER_STRIP_GATE(8071C5A4, &lit_4288); +COMPILER_STRIP_GATE(0x8071C5A4, &lit_4288); #pragma pop /* 8071C5A8-8071C5AC 000064 0004+00 0/3 0/0 0/0 .rodata @4289 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4289 = 800.0f; -COMPILER_STRIP_GATE(8071C5A8, &lit_4289); +COMPILER_STRIP_GATE(0x8071C5A8, &lit_4289); #pragma pop /* 80714B78-807154A8 000B38 0930+00 2/1 0/0 0/0 .text e_mk_move__FP10e_mk_class */ @@ -1107,42 +1113,42 @@ static asm void e_mk_move(e_mk_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4290 = 70.0f; -COMPILER_STRIP_GATE(8071C5AC, &lit_4290); +COMPILER_STRIP_GATE(0x8071C5AC, &lit_4290); #pragma pop /* 8071C5B0-8071C5B4 00006C 0004+00 0/5 0/0 0/0 .rodata @4291 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4291 = 200.0f; -COMPILER_STRIP_GATE(8071C5B0, &lit_4291); +COMPILER_STRIP_GATE(0x8071C5B0, &lit_4291); #pragma pop /* 8071C5B4-8071C5B8 000070 0004+00 0/3 0/0 0/0 .rodata @4292 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4292 = 300.0f; -COMPILER_STRIP_GATE(8071C5B4, &lit_4292); +COMPILER_STRIP_GATE(0x8071C5B4, &lit_4292); #pragma pop /* 8071C5B8-8071C5BC 000074 0004+00 0/1 0/0 0/0 .rodata @4293 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4293 = 0.75f; -COMPILER_STRIP_GATE(8071C5B8, &lit_4293); +COMPILER_STRIP_GATE(0x8071C5B8, &lit_4293); #pragma pop /* 8071C5BC-8071C5C0 000078 0004+00 0/2 0/0 0/0 .rodata @4321 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4321 = 40.0f; -COMPILER_STRIP_GATE(8071C5BC, &lit_4321); +COMPILER_STRIP_GATE(0x8071C5BC, &lit_4321); #pragma pop /* 8071C5C0-8071C5C4 00007C 0004+00 0/4 0/0 0/0 .rodata @4322 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4322 = 10.0f; -COMPILER_STRIP_GATE(8071C5C0, &lit_4322); +COMPILER_STRIP_GATE(0x8071C5C0, &lit_4322); #pragma pop /* 807154A8-80715618 001468 0170+00 1/1 0/0 0/0 .text e_mk_wait__FP10e_mk_class */ @@ -1184,28 +1190,28 @@ static asm void e_mk_yoro(e_mk_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4434 = 15.0f; -COMPILER_STRIP_GATE(8071C5C4, &lit_4434); +COMPILER_STRIP_GATE(0x8071C5C4, &lit_4434); #pragma pop /* 8071C5C8-8071C5CC 000084 0004+00 0/0 0/0 0/0 .rodata @4435 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4435 = 0x3EAA7EFA; -COMPILER_STRIP_GATE(8071C5C8, &lit_4435); +COMPILER_STRIP_GATE(0x8071C5C8, &lit_4435); #pragma pop /* 8071C5CC-8071C5D0 000088 0004+00 0/7 0/0 0/0 .rodata @4550 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4550 = 30.0f; -COMPILER_STRIP_GATE(8071C5CC, &lit_4550); +COMPILER_STRIP_GATE(0x8071C5CC, &lit_4550); #pragma pop /* 8071C5D0-8071C5D4 00008C 0004+00 0/5 0/0 0/0 .rodata @4551 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4551 = -10.0f; -COMPILER_STRIP_GATE(8071C5D0, &lit_4551); +COMPILER_STRIP_GATE(0x8071C5D0, &lit_4551); #pragma pop /* 80715D2C-807160B0 001CEC 0384+00 1/1 0/0 0/0 .text e_mk_drop__FP10e_mk_class */ @@ -1243,7 +1249,7 @@ static asm void damage_check(e_mk_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4711 = 7.0f; -COMPILER_STRIP_GATE(8071C5D4, &lit_4711); +COMPILER_STRIP_GATE(0x8071C5D4, &lit_4711); #pragma pop /* 8071637C-80716780 00233C 0404+00 1/1 0/0 0/0 .text e_mk_s_demo__FP10e_mk_class */ @@ -1261,35 +1267,35 @@ static asm void e_mk_s_demo(e_mk_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4907 = -1000.0f; -COMPILER_STRIP_GATE(8071C5D8, &lit_4907); +COMPILER_STRIP_GATE(0x8071C5D8, &lit_4907); #pragma pop /* 8071C5DC-8071C5E0 000098 0004+00 0/2 0/0 0/0 .rodata @4908 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4908 = 12.0f; -COMPILER_STRIP_GATE(8071C5DC, &lit_4908); +COMPILER_STRIP_GATE(0x8071C5DC, &lit_4908); #pragma pop /* 8071C5E0-8071C5E4 00009C 0004+00 0/1 0/0 0/0 .rodata @4909 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4909 = -3.0f / 100.0f; -COMPILER_STRIP_GATE(8071C5E0, &lit_4909); +COMPILER_STRIP_GATE(0x8071C5E0, &lit_4909); #pragma pop /* 8071C5E4-8071C5E8 0000A0 0004+00 0/1 0/0 0/0 .rodata @4910 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4910 = -2.0f; -COMPILER_STRIP_GATE(8071C5E4, &lit_4910); +COMPILER_STRIP_GATE(0x8071C5E4, &lit_4910); #pragma pop /* 8071C5E8-8071C5EC 0000A4 0004+00 0/1 0/0 0/0 .rodata @4911 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4911 = -50.0f; -COMPILER_STRIP_GATE(8071C5E8, &lit_4911); +COMPILER_STRIP_GATE(0x8071C5E8, &lit_4911); #pragma pop /* 8071C5EC-8071C5F4 0000A8 0004+04 0/2 0/0 0/0 .rodata @4912 */ @@ -1300,7 +1306,7 @@ SECTION_RODATA static f32 const lit_4912[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(8071C5EC, &lit_4912); +COMPILER_STRIP_GATE(0x8071C5EC, &lit_4912); #pragma pop /* 8071C5F4-8071C5FC 0000B0 0008+00 0/2 0/0 0/0 .rodata @4914 */ @@ -1309,7 +1315,7 @@ COMPILER_STRIP_GATE(8071C5EC, &lit_4912); SECTION_RODATA static u8 const lit_4914[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8071C5F4, &lit_4914); +COMPILER_STRIP_GATE(0x8071C5F4, &lit_4914); #pragma pop /* 80716780-80716F48 002740 07C8+00 1/1 0/0 0/0 .text e_mk_e_demo__FP10e_mk_class */ @@ -1347,175 +1353,175 @@ static asm void cam_3d_morf(e_mk_class* param_0, f32 param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5004 = -600.0f; -COMPILER_STRIP_GATE(8071C5FC, &lit_5004); +COMPILER_STRIP_GATE(0x8071C5FC, &lit_5004); #pragma pop /* 8071C600-8071C604 0000BC 0004+00 0/2 0/0 0/0 .rodata @5297 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5297 = 2500.0f; -COMPILER_STRIP_GATE(8071C600, &lit_5297); +COMPILER_STRIP_GATE(0x8071C600, &lit_5297); #pragma pop /* 8071C604-8071C608 0000C0 0004+00 0/1 0/0 0/0 .rodata @5298 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5298 = -271.0f; -COMPILER_STRIP_GATE(8071C604, &lit_5298); +COMPILER_STRIP_GATE(0x8071C604, &lit_5298); #pragma pop /* 8071C608-8071C60C 0000C4 0004+00 0/1 0/0 0/0 .rodata @5299 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5299 = 4559.0f; -COMPILER_STRIP_GATE(8071C608, &lit_5299); +COMPILER_STRIP_GATE(0x8071C608, &lit_5299); #pragma pop /* 8071C60C-8071C610 0000C8 0004+00 0/1 0/0 0/0 .rodata @5300 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5300 = -7241.0f; -COMPILER_STRIP_GATE(8071C60C, &lit_5300); +COMPILER_STRIP_GATE(0x8071C60C, &lit_5300); #pragma pop /* 8071C610-8071C614 0000CC 0004+00 0/2 0/0 0/0 .rodata @5301 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5301 = -70.0f; -COMPILER_STRIP_GATE(8071C610, &lit_5301); +COMPILER_STRIP_GATE(0x8071C610, &lit_5301); #pragma pop /* 8071C614-8071C618 0000D0 0004+00 0/1 0/0 0/0 .rodata @5302 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5302 = 4378.0f; -COMPILER_STRIP_GATE(8071C614, &lit_5302); +COMPILER_STRIP_GATE(0x8071C614, &lit_5302); #pragma pop /* 8071C618-8071C61C 0000D4 0004+00 0/1 0/0 0/0 .rodata @5303 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5303 = -6233.0f; -COMPILER_STRIP_GATE(8071C618, &lit_5303); +COMPILER_STRIP_GATE(0x8071C618, &lit_5303); #pragma pop /* 8071C61C-8071C620 0000D8 0004+00 0/3 0/0 0/0 .rodata @5304 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5304 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(8071C61C, &lit_5304); +COMPILER_STRIP_GATE(0x8071C61C, &lit_5304); #pragma pop /* 8071C620-8071C624 0000DC 0004+00 0/1 0/0 0/0 .rodata @5305 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5305 = 3.0f / 100.0f; -COMPILER_STRIP_GATE(8071C620, &lit_5305); +COMPILER_STRIP_GATE(0x8071C620, &lit_5305); #pragma pop /* 8071C624-8071C628 0000E0 0004+00 0/1 0/0 0/0 .rodata @5306 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_5306 = 0x3A03126F; -COMPILER_STRIP_GATE(8071C624, &lit_5306); +COMPILER_STRIP_GATE(0x8071C624, &lit_5306); #pragma pop /* 8071C628-8071C62C 0000E4 0004+00 0/1 0/0 0/0 .rodata @5307 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5307 = 150.0f; -COMPILER_STRIP_GATE(8071C628, &lit_5307); +COMPILER_STRIP_GATE(0x8071C628, &lit_5307); #pragma pop /* 8071C62C-8071C630 0000E8 0004+00 0/2 0/0 0/0 .rodata @5308 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5308 = 250.0f; -COMPILER_STRIP_GATE(8071C62C, &lit_5308); +COMPILER_STRIP_GATE(0x8071C62C, &lit_5308); #pragma pop /* 8071C630-8071C634 0000EC 0004+00 0/1 0/0 0/0 .rodata @5309 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5309 = 230.0f; -COMPILER_STRIP_GATE(8071C630, &lit_5309); +COMPILER_STRIP_GATE(0x8071C630, &lit_5309); #pragma pop /* 8071C634-8071C638 0000F0 0004+00 0/2 0/0 0/0 .rodata @5310 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5310 = 1100.0f; -COMPILER_STRIP_GATE(8071C634, &lit_5310); +COMPILER_STRIP_GATE(0x8071C634, &lit_5310); #pragma pop /* 8071C638-8071C63C 0000F4 0004+00 0/3 0/0 0/0 .rodata @5311 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5311 = -300.0f; -COMPILER_STRIP_GATE(8071C638, &lit_5311); +COMPILER_STRIP_GATE(0x8071C638, &lit_5311); #pragma pop /* 8071C63C-8071C640 0000F8 0004+00 0/1 0/0 0/0 .rodata @5312 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5312 = 2450.0f; -COMPILER_STRIP_GATE(8071C63C, &lit_5312); +COMPILER_STRIP_GATE(0x8071C63C, &lit_5312); #pragma pop /* 8071C640-8071C644 0000FC 0004+00 0/2 0/0 0/0 .rodata @5313 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5313 = 3500.0f; -COMPILER_STRIP_GATE(8071C640, &lit_5313); +COMPILER_STRIP_GATE(0x8071C640, &lit_5313); #pragma pop /* 8071C644-8071C648 000100 0004+00 0/2 0/0 0/0 .rodata @5314 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5314 = -150.0f; -COMPILER_STRIP_GATE(8071C644, &lit_5314); +COMPILER_STRIP_GATE(0x8071C644, &lit_5314); #pragma pop /* 8071C648-8071C64C 000104 0004+00 0/3 0/0 0/0 .rodata @5315 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5315 = -200.0f; -COMPILER_STRIP_GATE(8071C648, &lit_5315); +COMPILER_STRIP_GATE(0x8071C648, &lit_5315); #pragma pop /* 8071C64C-8071C650 000108 0004+00 0/2 0/0 0/0 .rodata @5316 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5316 = 1000.0f; -COMPILER_STRIP_GATE(8071C64C, &lit_5316); +COMPILER_STRIP_GATE(0x8071C64C, &lit_5316); #pragma pop /* 8071C650-8071C654 00010C 0004+00 0/3 0/0 0/0 .rodata @5317 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5317 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(8071C650, &lit_5317); +COMPILER_STRIP_GATE(0x8071C650, &lit_5317); #pragma pop /* 8071C654-8071C658 000110 0004+00 0/1 0/0 0/0 .rodata @5318 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5318 = 9.0f / 20.0f; -COMPILER_STRIP_GATE(8071C654, &lit_5318); +COMPILER_STRIP_GATE(0x8071C654, &lit_5318); #pragma pop /* 8071C658-8071C65C 000114 0004+00 0/2 0/0 0/0 .rodata @5319 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5319 = 400.0f; -COMPILER_STRIP_GATE(8071C658, &lit_5319); +COMPILER_STRIP_GATE(0x8071C658, &lit_5319); #pragma pop /* 8071C65C-8071C660 000118 0004+00 0/1 0/0 0/0 .rodata @5320 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5320 = -400.0f; -COMPILER_STRIP_GATE(8071C65C, &lit_5320); +COMPILER_STRIP_GATE(0x8071C65C, &lit_5320); #pragma pop /* 807174E4-8071823C 0034A4 0D58+00 1/1 0/0 0/0 .text demo_camera_start__FP10e_mk_class @@ -1534,154 +1540,154 @@ static asm void demo_camera_start(e_mk_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5634 = 55.0f; -COMPILER_STRIP_GATE(8071C660, &lit_5634); +COMPILER_STRIP_GATE(0x8071C660, &lit_5634); #pragma pop /* 8071C664-8071C668 000120 0004+00 0/2 0/0 0/0 .rodata @5635 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5635 = 10000.0f; -COMPILER_STRIP_GATE(8071C664, &lit_5635); +COMPILER_STRIP_GATE(0x8071C664, &lit_5635); #pragma pop /* 8071C668-8071C66C 000124 0004+00 0/2 0/0 0/0 .rodata @5636 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5636 = 130.0f; -COMPILER_STRIP_GATE(8071C668, &lit_5636); +COMPILER_STRIP_GATE(0x8071C668, &lit_5636); #pragma pop /* 8071C66C-8071C670 000128 0004+00 0/1 0/0 0/0 .rodata @5637 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5637 = 450.0f; -COMPILER_STRIP_GATE(8071C66C, &lit_5637); +COMPILER_STRIP_GATE(0x8071C66C, &lit_5637); #pragma pop /* 8071C670-8071C674 00012C 0004+00 0/2 0/0 0/0 .rodata @5638 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5638 = -100.0f; -COMPILER_STRIP_GATE(8071C670, &lit_5638); +COMPILER_STRIP_GATE(0x8071C670, &lit_5638); #pragma pop /* 8071C674-8071C678 000130 0004+00 0/2 0/0 0/0 .rodata @5639 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5639 = 1.0f / 50.0f; -COMPILER_STRIP_GATE(8071C674, &lit_5639); +COMPILER_STRIP_GATE(0x8071C674, &lit_5639); #pragma pop /* 8071C678-8071C67C 000134 0004+00 0/1 0/0 0/0 .rodata @5640 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5640 = 1400.0f; -COMPILER_STRIP_GATE(8071C678, &lit_5640); +COMPILER_STRIP_GATE(0x8071C678, &lit_5640); #pragma pop /* 8071C67C-8071C680 000138 0004+00 0/3 0/0 0/0 .rodata @5641 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5641 = 20.0f; -COMPILER_STRIP_GATE(8071C67C, &lit_5641); +COMPILER_STRIP_GATE(0x8071C67C, &lit_5641); #pragma pop /* 8071C680-8071C684 00013C 0004+00 0/1 0/0 0/0 .rodata @5642 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5642 = 1300.0f; -COMPILER_STRIP_GATE(8071C680, &lit_5642); +COMPILER_STRIP_GATE(0x8071C680, &lit_5642); #pragma pop /* 8071C684-8071C688 000140 0004+00 0/1 0/0 0/0 .rodata @5643 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5643 = 170.0f; -COMPILER_STRIP_GATE(8071C684, &lit_5643); +COMPILER_STRIP_GATE(0x8071C684, &lit_5643); #pragma pop /* 8071C688-8071C68C 000144 0004+00 0/2 0/0 0/0 .rodata @5644 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5644 = 190.0f; -COMPILER_STRIP_GATE(8071C688, &lit_5644); +COMPILER_STRIP_GATE(0x8071C688, &lit_5644); #pragma pop /* 8071C68C-8071C690 000148 0004+00 0/1 0/0 0/0 .rodata @5645 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5645 = 5500.0f; -COMPILER_STRIP_GATE(8071C68C, &lit_5645); +COMPILER_STRIP_GATE(0x8071C68C, &lit_5645); #pragma pop /* 8071C690-8071C694 00014C 0004+00 0/1 0/0 0/0 .rodata @5646 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5646 = 2300.0f; -COMPILER_STRIP_GATE(8071C690, &lit_5646); +COMPILER_STRIP_GATE(0x8071C690, &lit_5646); #pragma pop /* 8071C694-8071C698 000150 0004+00 0/1 0/0 0/0 .rodata @5647 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5647 = -5000.0f; -COMPILER_STRIP_GATE(8071C694, &lit_5647); +COMPILER_STRIP_GATE(0x8071C694, &lit_5647); #pragma pop /* 8071C698-8071C69C 000154 0004+00 0/1 0/0 0/0 .rodata @5648 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5648 = 370.0f; -COMPILER_STRIP_GATE(8071C698, &lit_5648); +COMPILER_STRIP_GATE(0x8071C698, &lit_5648); #pragma pop /* 8071C69C-8071C6A0 000158 0004+00 0/2 0/0 0/0 .rodata @5649 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5649 = 600.0f; -COMPILER_STRIP_GATE(8071C69C, &lit_5649); +COMPILER_STRIP_GATE(0x8071C69C, &lit_5649); #pragma pop /* 8071C6A0-8071C6A4 00015C 0004+00 0/2 0/0 0/0 .rodata @5650 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5650 = 1.0f / 100.0f; -COMPILER_STRIP_GATE(8071C6A0, &lit_5650); +COMPILER_STRIP_GATE(0x8071C6A0, &lit_5650); #pragma pop /* 8071C6A4-8071C6A8 000160 0004+00 0/1 0/0 0/0 .rodata @5651 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5651 = 900.0f; -COMPILER_STRIP_GATE(8071C6A4, &lit_5651); +COMPILER_STRIP_GATE(0x8071C6A4, &lit_5651); #pragma pop /* 8071C6A8-8071C6AC 000164 0004+00 0/1 0/0 0/0 .rodata @5652 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5652 = 45.0f; -COMPILER_STRIP_GATE(8071C6A8, &lit_5652); +COMPILER_STRIP_GATE(0x8071C6A8, &lit_5652); #pragma pop /* 8071C6AC-8071C6B0 000168 0004+00 0/1 0/0 0/0 .rodata @5653 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5653 = 2.0f / 5.0f; -COMPILER_STRIP_GATE(8071C6AC, &lit_5653); +COMPILER_STRIP_GATE(0x8071C6AC, &lit_5653); #pragma pop /* 8071C6B0-8071C6B4 00016C 0004+00 0/2 0/0 0/0 .rodata @5654 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5654 = 110.0f; -COMPILER_STRIP_GATE(8071C6B0, &lit_5654); +COMPILER_STRIP_GATE(0x8071C6B0, &lit_5654); #pragma pop /* 8071C6B4-8071C6B8 000170 0004+00 0/1 0/0 0/0 .rodata @5655 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5655 = 20000.0f; -COMPILER_STRIP_GATE(8071C6B4, &lit_5655); +COMPILER_STRIP_GATE(0x8071C6B4, &lit_5655); #pragma pop /* 8071823C-80719488 0041FC 124C+00 1/1 0/0 0/0 .text demo_camera_end__FP10e_mk_class */ @@ -1729,287 +1735,287 @@ static asm void s_brg_sub2(void* param_0, void* param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5961 = -711.0f; -COMPILER_STRIP_GATE(8071C6B8, &lit_5961); +COMPILER_STRIP_GATE(0x8071C6B8, &lit_5961); #pragma pop /* 8071C6BC-8071C6C0 000178 0004+00 0/1 0/0 0/0 .rodata @5962 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5962 = 3588.0f; -COMPILER_STRIP_GATE(8071C6BC, &lit_5962); +COMPILER_STRIP_GATE(0x8071C6BC, &lit_5962); #pragma pop /* 8071C6C0-8071C6C4 00017C 0004+00 0/1 0/0 0/0 .rodata @5963 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5963 = 2730.0f; -COMPILER_STRIP_GATE(8071C6C0, &lit_5963); +COMPILER_STRIP_GATE(0x8071C6C0, &lit_5963); #pragma pop /* 8071C6C4-8071C6C8 000180 0004+00 0/1 0/0 0/0 .rodata @5964 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5964 = 116.0f; -COMPILER_STRIP_GATE(8071C6C4, &lit_5964); +COMPILER_STRIP_GATE(0x8071C6C4, &lit_5964); #pragma pop /* 8071C6C8-8071C6CC 000184 0004+00 0/1 0/0 0/0 .rodata @5965 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5965 = 3400.0f; -COMPILER_STRIP_GATE(8071C6C8, &lit_5965); +COMPILER_STRIP_GATE(0x8071C6C8, &lit_5965); #pragma pop /* 8071C6CC-8071C6D0 000188 0004+00 0/1 0/0 0/0 .rodata @5966 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5966 = 4597.0f; -COMPILER_STRIP_GATE(8071C6CC, &lit_5966); +COMPILER_STRIP_GATE(0x8071C6CC, &lit_5966); #pragma pop /* 8071C6D0-8071C6D4 00018C 0004+00 0/1 0/0 0/0 .rodata @5967 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5967 = -291.0f; -COMPILER_STRIP_GATE(8071C6D0, &lit_5967); +COMPILER_STRIP_GATE(0x8071C6D0, &lit_5967); #pragma pop /* 8071C6D4-8071C6D8 000190 0004+00 0/1 0/0 0/0 .rodata @5968 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5968 = 3256.0f; -COMPILER_STRIP_GATE(8071C6D4, &lit_5968); +COMPILER_STRIP_GATE(0x8071C6D4, &lit_5968); #pragma pop /* 8071C6D8-8071C6DC 000194 0004+00 0/1 0/0 0/0 .rodata @5969 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5969 = 2640.0f; -COMPILER_STRIP_GATE(8071C6D8, &lit_5969); +COMPILER_STRIP_GATE(0x8071C6D8, &lit_5969); #pragma pop /* 8071C6DC-8071C6E0 000198 0004+00 0/1 0/0 0/0 .rodata @5970 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5970 = 1060.0f; -COMPILER_STRIP_GATE(8071C6DC, &lit_5970); +COMPILER_STRIP_GATE(0x8071C6DC, &lit_5970); #pragma pop /* 8071C6E0-8071C6E4 00019C 0004+00 0/1 0/0 0/0 .rodata @5971 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5971 = 3795.0f; -COMPILER_STRIP_GATE(8071C6E0, &lit_5971); +COMPILER_STRIP_GATE(0x8071C6E0, &lit_5971); #pragma pop /* 8071C6E4-8071C6E8 0001A0 0004+00 0/1 0/0 0/0 .rodata @5972 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5972 = 4086.0f; -COMPILER_STRIP_GATE(8071C6E4, &lit_5972); +COMPILER_STRIP_GATE(0x8071C6E4, &lit_5972); #pragma pop /* 8071C6E8-8071C6EC 0001A4 0004+00 0/1 0/0 0/0 .rodata @5973 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_5973 = 0x3C75C28F; -COMPILER_STRIP_GATE(8071C6E8, &lit_5973); +COMPILER_STRIP_GATE(0x8071C6E8, &lit_5973); #pragma pop /* 8071C6EC-8071C6F0 0001A8 0004+00 0/1 0/0 0/0 .rodata @5974 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5974 = 1.0f / 20.0f; -COMPILER_STRIP_GATE(8071C6EC, &lit_5974); +COMPILER_STRIP_GATE(0x8071C6EC, &lit_5974); #pragma pop /* 8071C6F0-8071C6F4 0001AC 0004+00 0/1 0/0 0/0 .rodata @5975 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5975 = 3300.0f; -COMPILER_STRIP_GATE(8071C6F0, &lit_5975); +COMPILER_STRIP_GATE(0x8071C6F0, &lit_5975); #pragma pop /* 8071C6F4-8071C6F8 0001B0 0004+00 0/1 0/0 0/0 .rodata @5976 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5976 = 4326.0f; -COMPILER_STRIP_GATE(8071C6F4, &lit_5976); +COMPILER_STRIP_GATE(0x8071C6F4, &lit_5976); #pragma pop /* 8071C6F8-8071C6FC 0001B4 0004+00 0/1 0/0 0/0 .rodata @5977 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5977 = 3350.0f; -COMPILER_STRIP_GATE(8071C6F8, &lit_5977); +COMPILER_STRIP_GATE(0x8071C6F8, &lit_5977); #pragma pop /* 8071C6FC-8071C700 0001B8 0004+00 0/1 0/0 0/0 .rodata @5978 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5978 = 220.0f; -COMPILER_STRIP_GATE(8071C6FC, &lit_5978); +COMPILER_STRIP_GATE(0x8071C6FC, &lit_5978); #pragma pop /* 8071C700-8071C704 0001BC 0004+00 0/1 0/0 0/0 .rodata @5979 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5979 = 90.0f; -COMPILER_STRIP_GATE(8071C700, &lit_5979); +COMPILER_STRIP_GATE(0x8071C700, &lit_5979); #pragma pop /* 8071C704-8071C708 0001C0 0004+00 0/1 0/0 0/0 .rodata @5980 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5980 = -477.0f; -COMPILER_STRIP_GATE(8071C704, &lit_5980); +COMPILER_STRIP_GATE(0x8071C704, &lit_5980); #pragma pop /* 8071C708-8071C70C 0001C4 0004+00 0/1 0/0 0/0 .rodata @5981 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5981 = 3119.0f; -COMPILER_STRIP_GATE(8071C708, &lit_5981); +COMPILER_STRIP_GATE(0x8071C708, &lit_5981); #pragma pop /* 8071C70C-8071C710 0001C8 0004+00 0/1 0/0 0/0 .rodata @5982 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5982 = 1643.0f; -COMPILER_STRIP_GATE(8071C70C, &lit_5982); +COMPILER_STRIP_GATE(0x8071C70C, &lit_5982); #pragma pop /* 8071C710-8071C714 0001CC 0004+00 0/1 0/0 0/0 .rodata @5983 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5983 = 1600.0f; -COMPILER_STRIP_GATE(8071C710, &lit_5983); +COMPILER_STRIP_GATE(0x8071C710, &lit_5983); #pragma pop /* 8071C714-8071C718 0001D0 0004+00 0/1 0/0 0/0 .rodata @5984 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5984 = 3200.0f; -COMPILER_STRIP_GATE(8071C714, &lit_5984); +COMPILER_STRIP_GATE(0x8071C714, &lit_5984); #pragma pop /* 8071C718-8071C71C 0001D4 0004+00 0/1 0/0 0/0 .rodata @5985 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5985 = 550.0f; -COMPILER_STRIP_GATE(8071C718, &lit_5985); +COMPILER_STRIP_GATE(0x8071C718, &lit_5985); #pragma pop /* 8071C71C-8071C720 0001D8 0004+00 0/1 0/0 0/0 .rodata @5986 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5986 = 3373.0f; -COMPILER_STRIP_GATE(8071C71C, &lit_5986); +COMPILER_STRIP_GATE(0x8071C71C, &lit_5986); #pragma pop /* 8071C720-8071C724 0001DC 0004+00 0/1 0/0 0/0 .rodata @5987 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5987 = -282.0f; -COMPILER_STRIP_GATE(8071C720, &lit_5987); +COMPILER_STRIP_GATE(0x8071C720, &lit_5987); #pragma pop /* 8071C724-8071C728 0001E0 0004+00 0/1 0/0 0/0 .rodata @5988 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5988 = 2534.0f; -COMPILER_STRIP_GATE(8071C724, &lit_5988); +COMPILER_STRIP_GATE(0x8071C724, &lit_5988); #pragma pop /* 8071C728-8071C72C 0001E4 0004+00 0/1 0/0 0/0 .rodata @5989 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5989 = 3147.0f; -COMPILER_STRIP_GATE(8071C728, &lit_5989); +COMPILER_STRIP_GATE(0x8071C728, &lit_5989); #pragma pop /* 8071C72C-8071C730 0001E8 0004+00 0/1 0/0 0/0 .rodata @5990 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5990 = 3310.0f; -COMPILER_STRIP_GATE(8071C72C, &lit_5990); +COMPILER_STRIP_GATE(0x8071C72C, &lit_5990); #pragma pop /* 8071C730-8071C734 0001EC 0004+00 0/1 0/0 0/0 .rodata @5991 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5991 = 3427.0f; -COMPILER_STRIP_GATE(8071C730, &lit_5991); +COMPILER_STRIP_GATE(0x8071C730, &lit_5991); #pragma pop /* 8071C734-8071C738 0001F0 0004+00 0/1 0/0 0/0 .rodata @5992 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5992 = 4.0f; -COMPILER_STRIP_GATE(8071C734, &lit_5992); +COMPILER_STRIP_GATE(0x8071C734, &lit_5992); #pragma pop /* 8071C738-8071C73C 0001F4 0004+00 0/1 0/0 0/0 .rodata @5993 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5993 = 3393.0f; -COMPILER_STRIP_GATE(8071C738, &lit_5993); +COMPILER_STRIP_GATE(0x8071C738, &lit_5993); #pragma pop /* 8071C73C-8071C740 0001F8 0004+00 0/1 0/0 0/0 .rodata @5994 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5994 = 4180.0f; -COMPILER_STRIP_GATE(8071C73C, &lit_5994); +COMPILER_STRIP_GATE(0x8071C73C, &lit_5994); #pragma pop /* 8071C740-8071C744 0001FC 0004+00 0/1 0/0 0/0 .rodata @5995 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5995 = -131.0f; -COMPILER_STRIP_GATE(8071C740, &lit_5995); +COMPILER_STRIP_GATE(0x8071C740, &lit_5995); #pragma pop /* 8071C744-8071C748 000200 0004+00 0/1 0/0 0/0 .rodata @5996 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5996 = 3452.0f; -COMPILER_STRIP_GATE(8071C744, &lit_5996); +COMPILER_STRIP_GATE(0x8071C744, &lit_5996); #pragma pop /* 8071C748-8071C74C 000204 0004+00 0/1 0/0 0/0 .rodata @5997 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5997 = 4552.0f; -COMPILER_STRIP_GATE(8071C748, &lit_5997); +COMPILER_STRIP_GATE(0x8071C748, &lit_5997); #pragma pop /* 8071C74C-8071C750 000208 0004+00 0/1 0/0 0/0 .rodata @5998 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5998 = 3422.0f; -COMPILER_STRIP_GATE(8071C74C, &lit_5998); +COMPILER_STRIP_GATE(0x8071C74C, &lit_5998); #pragma pop /* 8071C750-8071C754 00020C 0004+00 0/1 0/0 0/0 .rodata @5999 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5999 = 4520.0f; -COMPILER_STRIP_GATE(8071C750, &lit_5999); +COMPILER_STRIP_GATE(0x8071C750, &lit_5999); #pragma pop /* 8071C754-8071C758 000210 0004+00 0/1 0/0 0/0 .rodata @6000 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6000 = 343.0f; -COMPILER_STRIP_GATE(8071C754, &lit_6000); +COMPILER_STRIP_GATE(0x8071C754, &lit_6000); #pragma pop /* 8071C758-8071C75C 000214 0004+00 0/1 0/0 0/0 .rodata @6001 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6001 = 4271.0f; -COMPILER_STRIP_GATE(8071C758, &lit_6001); +COMPILER_STRIP_GATE(0x8071C758, &lit_6001); #pragma pop /* 80719594-8071A06C 005554 0AD8+00 1/1 0/0 0/0 .text demo_camera_r04__FP10e_mk_class */ @@ -2027,14 +2033,14 @@ static asm void demo_camera_r04(e_mk_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6052 = -500.0f; -COMPILER_STRIP_GATE(8071C75C, &lit_6052); +COMPILER_STRIP_GATE(0x8071C75C, &lit_6052); #pragma pop /* 8071C760-8071C764 00021C 0004+00 0/1 0/0 0/0 .rodata @6053 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6053 = -120.0f; -COMPILER_STRIP_GATE(8071C760, &lit_6053); +COMPILER_STRIP_GATE(0x8071C760, &lit_6053); #pragma pop /* 8071A06C-8071A22C 00602C 01C0+00 1/1 0/0 0/0 .text demo_camera_bohit__FP10e_mk_class @@ -2048,6 +2054,13 @@ static asm void demo_camera_bohit(e_mk_class* param_0) { } #pragma pop +/* ############################################################################################## */ +/* 8071C7E8-8071C7E8 0002A4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8071C7ED = "D_MN05"; +#pragma pop + /* 8071A22C-8071A538 0061EC 030C+00 2/1 0/0 0/0 .text demo_camera__FP10e_mk_class */ #pragma push #pragma optimization_level 0 @@ -2063,12 +2076,12 @@ static asm void demo_camera(e_mk_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6175 = 7.5f; -COMPILER_STRIP_GATE(8071C764, &lit_6175); +COMPILER_STRIP_GATE(0x8071C764, &lit_6175); #pragma pop /* 8071C768-8071C76C 000224 0004+00 1/1 0/0 0/0 .rodata @6243 */ SECTION_RODATA static f32 const lit_6243 = 2.5f; -COMPILER_STRIP_GATE(8071C768, &lit_6243); +COMPILER_STRIP_GATE(0x8071C768, &lit_6243); /* 8071A538-8071A808 0064F8 02D0+00 2/1 0/0 0/0 .text action__FP10e_mk_class */ #pragma push @@ -2085,63 +2098,63 @@ static asm void action(e_mk_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6458 = 13.0f; -COMPILER_STRIP_GATE(8071C76C, &lit_6458); +COMPILER_STRIP_GATE(0x8071C76C, &lit_6458); #pragma pop /* 8071C770-8071C774 00022C 0004+00 0/1 0/0 0/0 .rodata @6459 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6459 = 21.0f; -COMPILER_STRIP_GATE(8071C770, &lit_6459); +COMPILER_STRIP_GATE(0x8071C770, &lit_6459); #pragma pop /* 8071C774-8071C778 000230 0004+00 0/1 0/0 0/0 .rodata @6460 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6460 = 31.0f; -COMPILER_STRIP_GATE(8071C774, &lit_6460); +COMPILER_STRIP_GATE(0x8071C774, &lit_6460); #pragma pop /* 8071C778-8071C77C 000234 0004+00 0/1 0/0 0/0 .rodata @6461 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6461 = 41.0f; -COMPILER_STRIP_GATE(8071C778, &lit_6461); +COMPILER_STRIP_GATE(0x8071C778, &lit_6461); #pragma pop /* 8071C77C-8071C780 000238 0004+00 0/1 0/0 0/0 .rodata @6462 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6462 = 64.0f; -COMPILER_STRIP_GATE(8071C77C, &lit_6462); +COMPILER_STRIP_GATE(0x8071C77C, &lit_6462); #pragma pop /* 8071C780-8071C784 00023C 0004+00 0/1 0/0 0/0 .rodata @6463 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6463 = 32.0f; -COMPILER_STRIP_GATE(8071C780, &lit_6463); +COMPILER_STRIP_GATE(0x8071C780, &lit_6463); #pragma pop /* 8071C784-8071C788 000240 0004+00 0/1 0/0 0/0 .rodata @6464 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6464 = 8.0f; -COMPILER_STRIP_GATE(8071C784, &lit_6464); +COMPILER_STRIP_GATE(0x8071C784, &lit_6464); #pragma pop /* 8071C788-8071C78C 000244 0004+00 0/1 0/0 0/0 .rodata @6465 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6465 = 38.0f; -COMPILER_STRIP_GATE(8071C788, &lit_6465); +COMPILER_STRIP_GATE(0x8071C788, &lit_6465); #pragma pop /* 8071C78C-8071C790 000248 0004+00 0/1 0/0 0/0 .rodata @6466 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6466 = 6.0f; -COMPILER_STRIP_GATE(8071C78C, &lit_6466); +COMPILER_STRIP_GATE(0x8071C78C, &lit_6466); #pragma pop /* 8071A808-8071AF14 0067C8 070C+00 1/1 0/0 0/0 .text anm_se_set__FP10e_mk_class */ @@ -2159,42 +2172,42 @@ static asm void anm_se_set(e_mk_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6730 = 32768.0f; -COMPILER_STRIP_GATE(8071C790, &lit_6730); +COMPILER_STRIP_GATE(0x8071C790, &lit_6730); #pragma pop /* 8071C794-8071C798 000250 0004+00 0/1 0/0 0/0 .rodata @6731 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6731 = 60.0f; -COMPILER_STRIP_GATE(8071C794, &lit_6731); +COMPILER_STRIP_GATE(0x8071C794, &lit_6731); #pragma pop /* 8071C798-8071C79C 000254 0004+00 0/1 0/0 0/0 .rodata @6732 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_6732 = 0x413FD70A; -COMPILER_STRIP_GATE(8071C798, &lit_6732); +COMPILER_STRIP_GATE(0x8071C798, &lit_6732); #pragma pop /* 8071C79C-8071C7A0 000258 0004+00 0/1 0/0 0/0 .rodata @6733 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6733 = -30.0f; -COMPILER_STRIP_GATE(8071C79C, &lit_6733); +COMPILER_STRIP_GATE(0x8071C79C, &lit_6733); #pragma pop /* 8071C7A0-8071C7A4 00025C 0004+00 0/1 0/0 0/0 .rodata @6734 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6734 = -2.0f / 5.0f; -COMPILER_STRIP_GATE(8071C7A0, &lit_6734); +COMPILER_STRIP_GATE(0x8071C7A0, &lit_6734); #pragma pop /* 8071C7A4-8071C7A8 000260 0004+00 0/1 0/0 0/0 .rodata @6735 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6735 = 100000.0f; -COMPILER_STRIP_GATE(8071C7A4, &lit_6735); +COMPILER_STRIP_GATE(0x8071C7A4, &lit_6735); #pragma pop /* 8071AF14-8071B9C4 006ED4 0AB0+00 2/1 0/0 0/0 .text daE_MK_Execute__FP10e_mk_class */ @@ -2247,56 +2260,62 @@ asm J3DFrameCtrl::~J3DFrameCtrl() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6943 = 80.0f; -COMPILER_STRIP_GATE(8071C7A8, &lit_6943); +COMPILER_STRIP_GATE(0x8071C7A8, &lit_6943); #pragma pop /* 8071C7AC-8071C7B0 000268 0004+00 0/1 0/0 0/0 .rodata @6944 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6944 = 3900.0f; -COMPILER_STRIP_GATE(8071C7AC, &lit_6944); +COMPILER_STRIP_GATE(0x8071C7AC, &lit_6944); #pragma pop /* 8071C7B0-8071C7B4 00026C 0004+00 0/1 0/0 0/0 .rodata @6945 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6945 = -3000.0f; -COMPILER_STRIP_GATE(8071C7B0, &lit_6945); +COMPILER_STRIP_GATE(0x8071C7B0, &lit_6945); #pragma pop /* 8071C7B4-8071C7B8 000270 0004+00 0/1 0/0 0/0 .rodata @6946 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6946 = -21.0f; -COMPILER_STRIP_GATE(8071C7B4, &lit_6946); +COMPILER_STRIP_GATE(0x8071C7B4, &lit_6946); #pragma pop /* 8071C7B8-8071C7BC 000274 0004+00 0/1 0/0 0/0 .rodata @6947 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6947 = 5114.0f; -COMPILER_STRIP_GATE(8071C7B8, &lit_6947); +COMPILER_STRIP_GATE(0x8071C7B8, &lit_6947); #pragma pop /* 8071C7BC-8071C7C0 000278 0004+00 0/1 0/0 0/0 .rodata @6948 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6948 = -4941.0f; -COMPILER_STRIP_GATE(8071C7BC, &lit_6948); +COMPILER_STRIP_GATE(0x8071C7BC, &lit_6948); #pragma pop /* 8071C7C0-8071C7C4 00027C 0004+00 0/1 0/0 0/0 .rodata @6949 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6949 = -4401.0f; -COMPILER_STRIP_GATE(8071C7C0, &lit_6949); +COMPILER_STRIP_GATE(0x8071C7C0, &lit_6949); #pragma pop /* 8071C7C4-8071C7C8 000280 0004+00 0/1 0/0 0/0 .rodata @6950 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6950 = -5.0f; -COMPILER_STRIP_GATE(8071C7C4, &lit_6950); +COMPILER_STRIP_GATE(0x8071C7C4, &lit_6950); +#pragma pop + +/* 8071C7E8-8071C7E8 0002A4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8071C7F4 = "D_MN05B"; #pragma pop /* 8071BD14-8071C190 007CD4 047C+00 1/0 0/0 0/0 .text daE_MK_Create__FP10fopAc_ac_c */ @@ -2364,56 +2383,56 @@ asm daE_MK_HIO_c::~daE_MK_HIO_c() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7096 = 1050.0f; -COMPILER_STRIP_GATE(8071C7C8, &lit_7096); +COMPILER_STRIP_GATE(0x8071C7C8, &lit_7096); #pragma pop /* 8071C7CC-8071C7D0 000288 0004+00 0/1 0/0 0/0 .rodata @7097 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7097 = -450.0f; -COMPILER_STRIP_GATE(8071C7CC, &lit_7097); +COMPILER_STRIP_GATE(0x8071C7CC, &lit_7097); #pragma pop /* 8071C7D0-8071C7D4 00028C 0004+00 0/1 0/0 0/0 .rodata @7098 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7098 = 1262.0f; -COMPILER_STRIP_GATE(8071C7D0, &lit_7098); +COMPILER_STRIP_GATE(0x8071C7D0, &lit_7098); #pragma pop /* 8071C7D4-8071C7D8 000290 0004+00 0/1 0/0 0/0 .rodata @7099 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7099 = 1030.0f; -COMPILER_STRIP_GATE(8071C7D4, &lit_7099); +COMPILER_STRIP_GATE(0x8071C7D4, &lit_7099); #pragma pop /* 8071C7D8-8071C7DC 000294 0004+00 0/1 0/0 0/0 .rodata @7100 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7100 = -1665.0f; -COMPILER_STRIP_GATE(8071C7D8, &lit_7100); +COMPILER_STRIP_GATE(0x8071C7D8, &lit_7100); #pragma pop /* 8071C7DC-8071C7E0 000298 0004+00 0/1 0/0 0/0 .rodata @7101 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7101 = 2400.0f; -COMPILER_STRIP_GATE(8071C7DC, &lit_7101); +COMPILER_STRIP_GATE(0x8071C7DC, &lit_7101); #pragma pop /* 8071C7E0-8071C7E4 00029C 0004+00 0/1 0/0 0/0 .rodata @7102 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7102 = 1115.0f; -COMPILER_STRIP_GATE(8071C7E0, &lit_7102); +COMPILER_STRIP_GATE(0x8071C7E0, &lit_7102); #pragma pop /* 8071C7E4-8071C7E8 0002A0 0004+00 0/1 0/0 0/0 .rodata @7103 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7103 = -1850.0f; -COMPILER_STRIP_GATE(8071C7E4, &lit_7103); +COMPILER_STRIP_GATE(0x8071C7E4, &lit_7103); #pragma pop /* 8071C434-8071C520 0083F4 00EC+00 0/0 1/0 0/0 .text __sinit_d_a_e_mk_cpp */ @@ -2428,7 +2447,7 @@ asm void __sinit_d_a_e_mk_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_8071C434 = (void*)__sinit_d_a_e_mk_cpp; +REGISTER_CTORS(0x8071C434, __sinit_d_a_e_mk_cpp); #pragma pop /* 8071C520-8071C528 0084E0 0008+00 1/0 0/0 0/0 .text @36@__dt__12dBgS_ObjAcchFv */ @@ -2623,11 +2642,4 @@ static u8 data_8071CBF0[4]; static u8 data_8071CBF4[4]; #pragma pop -/* 8071C7E8-8071C7FC 0002A4 0014+00 6/6 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_8071C7E8 = "E_mk"; -SECTION_DEAD static char const* const stringBase_8071C7ED = "D_MN05"; -SECTION_DEAD static char const* const stringBase_8071C7F4 = "D_MN05B"; -#pragma pop +/* 8071C7E8-8071C7E8 0002A4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/e/d_a_e_mk_bo/d_a_e_mk_bo.cpp b/rel/d/a/e/d_a_e_mk_bo/d_a_e_mk_bo.cpp index cdc202a20a2..95a1f4dc3e2 100644 --- a/rel/d/a/e/d_a_e_mk_bo/d_a_e_mk_bo.cpp +++ b/rel/d/a/e/d_a_e_mk_bo/d_a_e_mk_bo.cpp @@ -39,10 +39,10 @@ struct mDoExt_McaMorfCallBack1_c {}; struct Vec {}; -struct J3DModelData {}; - struct J3DAnmTransform {}; +struct J3DModelData {}; + struct mDoExt_McaMorf { /* 8000FC4C */ mDoExt_McaMorf(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, int, @@ -82,10 +82,10 @@ struct dRes_control_c { struct dPa_levelEcallBack {}; -struct _GXColor {}; - struct csXyz {}; +struct _GXColor {}; + struct dPa_control_c { struct level_c { /* 8004B918 */ void getEmitter(u32); @@ -367,24 +367,24 @@ SECTION_RODATA static u8 const lit_3776[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(8071F640, &lit_3776); +COMPILER_STRIP_GATE(0x8071F640, &lit_3776); /* 8071F644-8071F648 000004 0004+00 1/8 0/0 0/0 .rodata @3777 */ SECTION_RODATA static f32 const lit_3777 = 1.0f; -COMPILER_STRIP_GATE(8071F644, &lit_3777); +COMPILER_STRIP_GATE(0x8071F644, &lit_3777); /* 8071F648-8071F64C 000008 0004+00 0/3 0/0 0/0 .rodata @3778 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3778 = 100.0f; -COMPILER_STRIP_GATE(8071F648, &lit_3778); +COMPILER_STRIP_GATE(0x8071F648, &lit_3778); #pragma pop /* 8071F64C-8071F650 00000C 0004+00 0/1 0/0 0/0 .rodata @3779 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3779 = 3.0f; -COMPILER_STRIP_GATE(8071F64C, &lit_3779); +COMPILER_STRIP_GATE(0x8071F64C, &lit_3779); #pragma pop /* 8071CE30-8071D084 000230 0254+00 1/1 0/0 0/0 .text hit_check__FP13e_mk_bo_class */ @@ -404,7 +404,7 @@ static asm void hit_check(e_mk_bo_class* param_0) { SECTION_RODATA static u8 const lit_3934[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8071F650, &lit_3934); +COMPILER_STRIP_GATE(0x8071F650, &lit_3934); #pragma pop /* 8071F658-8071F660 000018 0008+00 0/3 0/0 0/0 .rodata @3935 */ @@ -413,7 +413,7 @@ COMPILER_STRIP_GATE(8071F650, &lit_3934); SECTION_RODATA static u8 const lit_3935[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8071F658, &lit_3935); +COMPILER_STRIP_GATE(0x8071F658, &lit_3935); #pragma pop /* 8071F660-8071F668 000020 0008+00 0/3 0/0 0/0 .rodata @3936 */ @@ -422,70 +422,70 @@ COMPILER_STRIP_GATE(8071F658, &lit_3935); SECTION_RODATA static u8 const lit_3936[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8071F660, &lit_3936); +COMPILER_STRIP_GATE(0x8071F660, &lit_3936); #pragma pop /* 8071F668-8071F66C 000028 0004+00 0/1 0/0 0/0 .rodata @3937 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3937 = 300.0f; -COMPILER_STRIP_GATE(8071F668, &lit_3937); +COMPILER_STRIP_GATE(0x8071F668, &lit_3937); #pragma pop /* 8071F66C-8071F670 00002C 0004+00 0/3 0/0 0/0 .rodata @3938 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3938 = 160.0f; -COMPILER_STRIP_GATE(8071F66C, &lit_3938); +COMPILER_STRIP_GATE(0x8071F66C, &lit_3938); #pragma pop /* 8071F670-8071F674 000030 0004+00 0/3 0/0 0/0 .rodata @3939 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3939 = 350.0f; -COMPILER_STRIP_GATE(8071F670, &lit_3939); +COMPILER_STRIP_GATE(0x8071F670, &lit_3939); #pragma pop /* 8071F674-8071F678 000034 0004+00 0/3 0/0 0/0 .rodata @3940 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3940 = 600.0f; -COMPILER_STRIP_GATE(8071F674, &lit_3940); +COMPILER_STRIP_GATE(0x8071F674, &lit_3940); #pragma pop /* 8071F678-8071F67C 000038 0004+00 0/1 0/0 0/0 .rodata @3941 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3941 = 120.0f; -COMPILER_STRIP_GATE(8071F678, &lit_3941); +COMPILER_STRIP_GATE(0x8071F678, &lit_3941); #pragma pop /* 8071F67C-8071F680 00003C 0004+00 0/1 0/0 0/0 .rodata @3942 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3942 = 30.0f; -COMPILER_STRIP_GATE(8071F67C, &lit_3942); +COMPILER_STRIP_GATE(0x8071F67C, &lit_3942); #pragma pop /* 8071F680-8071F684 000040 0004+00 0/4 0/0 0/0 .rodata @3943 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3943 = 40.0f; -COMPILER_STRIP_GATE(8071F680, &lit_3943); +COMPILER_STRIP_GATE(0x8071F680, &lit_3943); #pragma pop /* 8071F684-8071F688 000044 0004+00 0/5 0/0 0/0 .rodata @3944 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3944 = 50.0f; -COMPILER_STRIP_GATE(8071F684, &lit_3944); +COMPILER_STRIP_GATE(0x8071F684, &lit_3944); #pragma pop /* 8071F688-8071F68C 000048 0004+00 0/5 0/0 0/0 .rodata @3945 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3945 = 5.0f; -COMPILER_STRIP_GATE(8071F688, &lit_3945); +COMPILER_STRIP_GATE(0x8071F688, &lit_3945); #pragma pop /* 8071D084-8071D694 000484 0610+00 1/1 0/0 0/0 .text e_mk_bo_shot__FP13e_mk_bo_class */ @@ -503,21 +503,21 @@ static asm void e_mk_bo_shot(e_mk_bo_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4065 = 5000.0f; -COMPILER_STRIP_GATE(8071F68C, &lit_4065); +COMPILER_STRIP_GATE(0x8071F68C, &lit_4065); #pragma pop /* 8071F690-8071F694 000050 0004+00 0/1 0/0 0/0 .rodata @4066 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4066 = -3900.0f; -COMPILER_STRIP_GATE(8071F690, &lit_4066); +COMPILER_STRIP_GATE(0x8071F690, &lit_4066); #pragma pop /* 8071F694-8071F698 000054 0004+00 0/3 0/0 0/0 .rodata @4067 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4067 = 200.0f; -COMPILER_STRIP_GATE(8071F694, &lit_4067); +COMPILER_STRIP_GATE(0x8071F694, &lit_4067); #pragma pop /* 8071D694-8071DBA0 000A94 050C+00 1/1 0/0 0/0 .text e_mk_bo_start__FP13e_mk_bo_class */ @@ -545,28 +545,28 @@ static asm void e_mk_bo_r04(e_mk_bo_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4210 = 500.0f; -COMPILER_STRIP_GATE(8071F698, &lit_4210); +COMPILER_STRIP_GATE(0x8071F698, &lit_4210); #pragma pop /* 8071F69C-8071F6A0 00005C 0004+00 0/1 0/0 0/0 .rodata @4211 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4211 = 7.0f; -COMPILER_STRIP_GATE(8071F69C, &lit_4211); +COMPILER_STRIP_GATE(0x8071F69C, &lit_4211); #pragma pop /* 8071F6A0-8071F6A4 000060 0004+00 0/1 0/0 0/0 .rodata @4212 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4212 = -2.0f / 5.0f; -COMPILER_STRIP_GATE(8071F6A0, &lit_4212); +COMPILER_STRIP_GATE(0x8071F6A0, &lit_4212); #pragma pop /* 8071F6A4-8071F6A8 000064 0004+00 0/2 0/0 0/0 .rodata @4213 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4213 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(8071F6A4, &lit_4213); +COMPILER_STRIP_GATE(0x8071F6A4, &lit_4213); #pragma pop /* 8071F6A8-8071F6B0 000068 0004+04 0/1 0/0 0/0 .rodata @4214 */ @@ -577,7 +577,7 @@ SECTION_RODATA static f32 const lit_4214[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(8071F6A8, &lit_4214); +COMPILER_STRIP_GATE(0x8071F6A8, &lit_4214); #pragma pop /* 8071F6B0-8071F6B8 000070 0008+00 0/1 0/0 0/0 .rodata @4216 */ @@ -586,7 +586,7 @@ COMPILER_STRIP_GATE(8071F6A8, &lit_4214); SECTION_RODATA static u8 const lit_4216[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8071F6B0, &lit_4216); +COMPILER_STRIP_GATE(0x8071F6B0, &lit_4216); #pragma pop /* 8071DF04-8071E1A4 001304 02A0+00 1/1 0/0 0/0 .text e_mk_bo_hasira__FP13e_mk_bo_class @@ -615,28 +615,28 @@ static asm void e_mk_bo_demo_ground(e_mk_bo_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4306 = -1.0f; -COMPILER_STRIP_GATE(8071F6B8, &lit_4306); +COMPILER_STRIP_GATE(0x8071F6B8, &lit_4306); #pragma pop /* 8071F6BC-8071F6C0 00007C 0004+00 0/1 0/0 0/0 .rodata @4307 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4307 = 20.0f; -COMPILER_STRIP_GATE(8071F6BC, &lit_4307); +COMPILER_STRIP_GATE(0x8071F6BC, &lit_4307); #pragma pop /* 8071F6C0-8071F6C4 000080 0004+00 0/1 0/0 0/0 .rodata @4308 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4308 = 0.5f; -COMPILER_STRIP_GATE(8071F6C0, &lit_4308); +COMPILER_STRIP_GATE(0x8071F6C0, &lit_4308); #pragma pop /* 8071F6C4-8071F6C8 000084 0004+00 0/1 0/0 0/0 .rodata @4309 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4309 = 170.0f; -COMPILER_STRIP_GATE(8071F6C4, &lit_4309); +COMPILER_STRIP_GATE(0x8071F6C4, &lit_4309); #pragma pop /* 8071F820-8071F824 000008 0001+03 1/1 0/0 0/0 .bss @1109 */ @@ -757,7 +757,7 @@ static asm void e_mk_bo_demo_spin(e_mk_bo_class* param_0) { /* ############################################################################################## */ /* 8071F6C8-8071F6CC 000088 0004+00 1/2 0/0 0/0 .rodata @4353 */ SECTION_RODATA static f32 const lit_4353 = 10000.0f; -COMPILER_STRIP_GATE(8071F6C8, &lit_4353); +COMPILER_STRIP_GATE(0x8071F6C8, &lit_4353); /* 8071E6C4-8071E8A4 001AC4 01E0+00 1/1 0/0 0/0 .text action__FP13e_mk_bo_class */ #pragma push @@ -774,7 +774,7 @@ static asm void action(e_mk_bo_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4580 = 100000.0f; -COMPILER_STRIP_GATE(8071F6CC, &lit_4580); +COMPILER_STRIP_GATE(0x8071F6CC, &lit_4580); #pragma pop /* 8071F6E0-8071F6EC 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ @@ -845,6 +845,13 @@ static bool daE_MK_BO_IsDelete(e_mk_bo_class* param_0) { return true; } +/* ############################################################################################## */ +/* 8071F6D8-8071F6D8 000098 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8071F6D8 = "E_mk"; +#pragma pop + /* 8071EED4-8071EF24 0022D4 0050+00 1/0 0/0 0/0 .text daE_MK_BO_Delete__FP13e_mk_bo_class */ #pragma push @@ -967,14 +974,14 @@ asm J3DFrameCtrl::~J3DFrameCtrl() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4729 = 80.0f; -COMPILER_STRIP_GATE(8071F6D0, &lit_4729); +COMPILER_STRIP_GATE(0x8071F6D0, &lit_4729); #pragma pop /* 8071F6D4-8071F6D8 000094 0004+00 0/1 0/0 0/0 .rodata @4730 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4730 = 65535.0f; -COMPILER_STRIP_GATE(8071F6D4, &lit_4730); +COMPILER_STRIP_GATE(0x8071F6D4, &lit_4730); #pragma pop /* 8071F168-8071F3D0 002568 0268+00 1/0 0/0 0/0 .text daE_MK_BO_Create__FP10fopAc_ac_c */ @@ -1249,9 +1256,4 @@ static u8 data_8071F8D8[4]; static u8 data_8071F8DC[4]; #pragma pop -/* 8071F6D8-8071F6DD 000098 0005+00 3/3 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_8071F6D8 = "E_mk"; -#pragma pop +/* 8071F6D8-8071F6D8 000098 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/e/d_a_e_mm/d_a_e_mm.cpp b/rel/d/a/e/d_a_e_mm/d_a_e_mm.cpp index 1e5ca1e47fb..733ddfa2302 100644 --- a/rel/d/a/e/d_a_e_mm/d_a_e_mm.cpp +++ b/rel/d/a/e/d_a_e_mm/d_a_e_mm.cpp @@ -19,16 +19,16 @@ struct mDoMtx_stack_c { static u8 now[48]; }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; - struct J3DAnmTransform {}; +struct J3DModelData {}; + +struct Z2Creature {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -83,10 +83,10 @@ struct dRes_control_c { struct dPa_levelEcallBack {}; -struct _GXColor {}; - struct csXyz {}; +struct _GXColor {}; + struct dPa_control_c { struct level_c { /* 8004B918 */ void getEmitter(u32); @@ -390,7 +390,7 @@ extern "C" void __register_global_object(); /* ############################################################################################## */ /* 80722C3C-80722C40 000000 0004+00 14/14 0/0 0/0 .rodata @3789 */ SECTION_RODATA static f32 const lit_3789 = 100.0f; -COMPILER_STRIP_GATE(80722C3C, &lit_3789); +COMPILER_STRIP_GATE(0x80722C3C, &lit_3789); /* 80722C40-80722C44 000004 0004+00 1/12 0/0 0/0 .rodata @3790 */ SECTION_RODATA static u8 const lit_3790[4] = { @@ -399,7 +399,7 @@ SECTION_RODATA static u8 const lit_3790[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80722C40, &lit_3790); +COMPILER_STRIP_GATE(0x80722C40, &lit_3790); /* 80722C44-80722C4C 000008 0004+04 3/13 0/0 0/0 .rodata @3791 */ SECTION_RODATA static f32 const lit_3791[1 + 1 /* padding */] = { @@ -407,7 +407,7 @@ SECTION_RODATA static f32 const lit_3791[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80722C44, &lit_3791); +COMPILER_STRIP_GATE(0x80722C44, &lit_3791); /* 80722C4C-80722C54 000010 0008+00 0/1 0/0 0/0 .rodata @3792 */ #pragma push @@ -415,7 +415,7 @@ COMPILER_STRIP_GATE(80722C44, &lit_3791); SECTION_RODATA static u8 const lit_3792[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80722C4C, &lit_3792); +COMPILER_STRIP_GATE(0x80722C4C, &lit_3792); #pragma pop /* 80722C54-80722C5C 000018 0008+00 0/1 0/0 0/0 .rodata @3793 */ @@ -424,7 +424,7 @@ COMPILER_STRIP_GATE(80722C4C, &lit_3792); SECTION_RODATA static u8 const lit_3793[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80722C54, &lit_3793); +COMPILER_STRIP_GATE(0x80722C54, &lit_3793); #pragma pop /* 80722C5C-80722C64 000020 0008+00 0/1 0/0 0/0 .rodata @3794 */ @@ -433,60 +433,60 @@ COMPILER_STRIP_GATE(80722C54, &lit_3793); SECTION_RODATA static u8 const lit_3794[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80722C5C, &lit_3794); +COMPILER_STRIP_GATE(0x80722C5C, &lit_3794); #pragma pop /* 80722C64-80722C68 000028 0004+00 0/1 0/0 0/0 .rodata @3795 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3795 = 1.0f / 100.0f; -COMPILER_STRIP_GATE(80722C64, &lit_3795); +COMPILER_STRIP_GATE(0x80722C64, &lit_3795); #pragma pop /* 80722C68-80722C6C 00002C 0004+00 0/1 0/0 0/0 .rodata @3810 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3810 = 7.0f / 5.0f; -COMPILER_STRIP_GATE(80722C68, &lit_3810); +COMPILER_STRIP_GATE(0x80722C68, &lit_3810); #pragma pop /* 80722C6C-80722C70 000030 0004+00 1/2 0/0 0/0 .rodata @3811 */ SECTION_RODATA static f32 const lit_3811 = 2.0f; -COMPILER_STRIP_GATE(80722C6C, &lit_3811); +COMPILER_STRIP_GATE(0x80722C6C, &lit_3811); /* 80722C70-80722C74 000034 0004+00 0/1 0/0 0/0 .rodata @3812 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3812 = 15.0f; -COMPILER_STRIP_GATE(80722C70, &lit_3812); +COMPILER_STRIP_GATE(0x80722C70, &lit_3812); #pragma pop /* 80722C74-80722C78 000038 0004+00 0/1 0/0 0/0 .rodata @3813 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3813 = 1000.0f; -COMPILER_STRIP_GATE(80722C74, &lit_3813); +COMPILER_STRIP_GATE(0x80722C74, &lit_3813); #pragma pop /* 80722C78-80722C7C 00003C 0004+00 0/1 0/0 0/0 .rodata @3814 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3814 = 2.5f; -COMPILER_STRIP_GATE(80722C78, &lit_3814); +COMPILER_STRIP_GATE(0x80722C78, &lit_3814); #pragma pop /* 80722C7C-80722C80 000040 0004+00 0/2 0/0 0/0 .rodata @3815 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3815 = 8.0f; -COMPILER_STRIP_GATE(80722C7C, &lit_3815); +COMPILER_STRIP_GATE(0x80722C7C, &lit_3815); #pragma pop /* 80722C80-80722C84 000044 0004+00 0/6 0/0 0/0 .rodata @3816 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3816 = 10.0f; -COMPILER_STRIP_GATE(80722C80, &lit_3816); +COMPILER_STRIP_GATE(0x80722C80, &lit_3816); #pragma pop /* 80722CF4-80722D00 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ @@ -670,7 +670,13 @@ asm daE_MM_HIO_c::daE_MM_HIO_c() { /* ############################################################################################## */ /* 80722C84-80722C88 000048 0004+00 1/4 0/0 0/0 .rodata @3830 */ SECTION_RODATA static f32 const lit_3830 = -1.0f; -COMPILER_STRIP_GATE(80722C84, &lit_3830); +COMPILER_STRIP_GATE(0x80722C84, &lit_3830); + +/* 80722CE8-80722CE8 0000AC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80722CE8 = "E_MM"; +#pragma pop /* 8071FA44-8071FAF0 000164 00AC+00 8/8 0/0 0/0 .text anm_init__FP10e_mm_classifUcf */ #pragma push @@ -687,7 +693,7 @@ static asm void anm_init(e_mm_class* param_0, int param_1, f32 param_2, u8 param #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3860 = 700.0f; -COMPILER_STRIP_GATE(80722C88, &lit_3860); +COMPILER_STRIP_GATE(0x80722C88, &lit_3860); #pragma pop /* 8071FAF0-8071FBC4 000210 00D4+00 1/0 0/0 0/0 .text daE_MM_Draw__FP10e_mm_class */ @@ -715,21 +721,21 @@ static asm void pl_check(e_mm_class* param_0, f32 param_1, s16 param_2) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3909 = 3.0f; -COMPILER_STRIP_GATE(80722C8C, &lit_3909); +COMPILER_STRIP_GATE(0x80722C8C, &lit_3909); #pragma pop /* 80722C90-80722C94 000054 0004+00 0/3 0/0 0/0 .rodata @3910 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3910 = -20.0f; -COMPILER_STRIP_GATE(80722C90, &lit_3910); +COMPILER_STRIP_GATE(0x80722C90, &lit_3910); #pragma pop /* 80722C94-80722C98 000058 0004+00 0/2 0/0 0/0 .rodata @3911 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3911 = 25.0f; -COMPILER_STRIP_GATE(80722C94, &lit_3911); +COMPILER_STRIP_GATE(0x80722C94, &lit_3911); #pragma pop /* 80722EB0-80722EB4 000008 0004+00 2/2 0/0 0/0 .bss None */ @@ -757,14 +763,14 @@ static asm void damage_checkMetOn(e_mm_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3961 = 0.5f; -COMPILER_STRIP_GATE(80722C98, &lit_3961); +COMPILER_STRIP_GATE(0x80722C98, &lit_3961); #pragma pop /* 80722C9C-80722CA0 000060 0004+00 0/2 0/0 0/0 .rodata @3962 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3962 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(80722C9C, &lit_3962); +COMPILER_STRIP_GATE(0x80722C9C, &lit_3962); #pragma pop /* 8071FE98-807201A0 0005B8 0308+00 1/1 0/0 0/0 .text damage_check__FP10e_mm_class */ @@ -780,13 +786,13 @@ static asm void damage_check(e_mm_class* param_0) { /* ############################################################################################## */ /* 80722CA0-80722CA4 000064 0004+00 1/2 0/0 0/0 .rodata @3995 */ SECTION_RODATA static f32 const lit_3995 = 40.0f; -COMPILER_STRIP_GATE(80722CA0, &lit_3995); +COMPILER_STRIP_GATE(0x80722CA0, &lit_3995); /* 80722CA4-80722CA8 000068 0004+00 0/1 0/0 0/0 .rodata @3996 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3996 = -50.0f; -COMPILER_STRIP_GATE(80722CA4, &lit_3996); +COMPILER_STRIP_GATE(0x80722CA4, &lit_3996); #pragma pop /* 807201A0-807202F0 0008C0 0150+00 2/2 0/0 0/0 .text wall_check__FP10e_mm_classf */ @@ -825,14 +831,14 @@ static asm void mWaterEffSet(e_mm_class* param_0, bool param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4141 = 200.0f; -COMPILER_STRIP_GATE(80722CA8, &lit_4141); +COMPILER_STRIP_GATE(0x80722CA8, &lit_4141); #pragma pop /* 80722CAC-80722CB0 000070 0004+00 0/1 0/0 0/0 .rodata @4142 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4142 = -1000000000.0f; -COMPILER_STRIP_GATE(80722CAC, &lit_4142); +COMPILER_STRIP_GATE(0x80722CAC, &lit_4142); #pragma pop /* 80720590-807206FC 000CB0 016C+00 3/3 0/0 0/0 .text way_gake_check__FP10e_mm_class */ @@ -850,19 +856,19 @@ static asm void way_gake_check(e_mm_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4227 = 32768.0f; -COMPILER_STRIP_GATE(80722CB0, &lit_4227); +COMPILER_STRIP_GATE(0x80722CB0, &lit_4227); #pragma pop /* 80722CB4-80722CB8 000078 0004+00 0/1 0/0 0/0 .rodata @4228 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4228 = 10000.0f; -COMPILER_STRIP_GATE(80722CB4, &lit_4228); +COMPILER_STRIP_GATE(0x80722CB4, &lit_4228); #pragma pop /* 80722CB8-80722CBC 00007C 0004+00 1/3 0/0 0/0 .rodata @4229 */ SECTION_RODATA static f32 const lit_4229 = 50.0f; -COMPILER_STRIP_GATE(80722CB8, &lit_4229); +COMPILER_STRIP_GATE(0x80722CB8, &lit_4229); /* 80722CBC-80722CC4 000080 0004+04 0/1 0/0 0/0 .rodata @4230 */ #pragma push @@ -872,7 +878,7 @@ SECTION_RODATA static f32 const lit_4230[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80722CBC, &lit_4230); +COMPILER_STRIP_GATE(0x80722CBC, &lit_4230); #pragma pop /* 80722CC4-80722CCC 000088 0008+00 0/1 0/0 0/0 .rodata @4232 */ @@ -881,7 +887,7 @@ COMPILER_STRIP_GATE(80722CBC, &lit_4230); SECTION_RODATA static u8 const lit_4232[8] = { 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80722CC4, &lit_4232); +COMPILER_STRIP_GATE(0x80722CC4, &lit_4232); #pragma pop /* 807206FC-80720B50 000E1C 0454+00 1/1 0/0 0/0 .text e_mm_normal__FP10e_mm_class */ @@ -899,14 +905,14 @@ static asm void e_mm_normal(e_mm_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4358 = 1.5f; -COMPILER_STRIP_GATE(80722CCC, &lit_4358); +COMPILER_STRIP_GATE(0x80722CCC, &lit_4358); #pragma pop /* 80722CD0-80722CD4 000094 0004+00 0/2 0/0 0/0 .rodata @4359 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4359 = 20.0f; -COMPILER_STRIP_GATE(80722CD0, &lit_4359); +COMPILER_STRIP_GATE(0x80722CD0, &lit_4359); #pragma pop /* 80720B50-807211CC 001270 067C+00 1/1 0/0 0/0 .text e_mm_dash__FP10e_mm_class */ @@ -974,26 +980,26 @@ static asm void action(e_mm_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4618 = 80.0f; -COMPILER_STRIP_GATE(80722CD4, &lit_4618); +COMPILER_STRIP_GATE(0x80722CD4, &lit_4618); #pragma pop /* 80722CD8-80722CDC 00009C 0004+00 0/0 0/0 0/0 .rodata @4619 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4619 = 3000.0f; -COMPILER_STRIP_GATE(80722CD8, &lit_4619); +COMPILER_STRIP_GATE(0x80722CD8, &lit_4619); #pragma pop /* 80722CDC-80722CE0 0000A0 0004+00 0/0 0/0 0/0 .rodata @4620 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4620 = 500.0f; -COMPILER_STRIP_GATE(80722CDC, &lit_4620); +COMPILER_STRIP_GATE(0x80722CDC, &lit_4620); #pragma pop /* 80722CE0-80722CE4 0000A4 0004+00 1/1 0/0 0/0 .rodata @4701 */ SECTION_RODATA static f32 const lit_4701 = 35353.0f; -COMPILER_STRIP_GATE(80722CE0, &lit_4701); +COMPILER_STRIP_GATE(0x80722CE0, &lit_4701); /* 80721D44-80722004 002464 02C0+00 2/1 0/0 0/0 .text daE_MM_Execute__FP10e_mm_class */ #pragma push @@ -1033,7 +1039,13 @@ static asm void useHeapInit(fopAc_ac_c* param_0) { /* ############################################################################################## */ /* 80722CE4-80722CE8 0000A8 0004+00 1/1 0/0 0/0 .rodata @4886 */ SECTION_RODATA static f32 const lit_4886 = 60.0f; -COMPILER_STRIP_GATE(80722CE4, &lit_4886); +COMPILER_STRIP_GATE(0x80722CE4, &lit_4886); + +/* 80722CE8-80722CE8 0000AC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80722CED = "E_mm"; +#pragma pop /* 8072218C-8072256C 0028AC 03E0+00 1/0 0/0 0/0 .text daE_MM_Create__FP10fopAc_ac_c */ #pragma push @@ -1127,7 +1139,7 @@ asm void __sinit_d_a_e_mm_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_807227C8 = (void*)__sinit_d_a_e_mm_cpp; +REGISTER_CTORS(0x807227C8, __sinit_d_a_e_mm_cpp); #pragma pop /* 80722804-8072280C 002F24 0008+00 1/0 0/0 0/0 .text @36@__dt__12dBgS_ObjAcchFv */ @@ -1162,10 +1174,4 @@ static asm void setMidnaBindEffect(fopEn_enemy_c* param_0, Z2CreatureEnemy* para } #pragma pop -/* 80722CE8-80722CF2 0000AC 000A+00 4/4 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80722CE8 = "E_MM"; -SECTION_DEAD static char const* const stringBase_80722CED = "E_mm"; -#pragma pop +/* 80722CE8-80722CE8 0000AC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/e/d_a_e_mm_mt/d_a_e_mm_mt.cpp b/rel/d/a/e/d_a_e_mm_mt/d_a_e_mm_mt.cpp index 1b85182da5d..d050cb948ab 100644 --- a/rel/d/a/e/d_a_e_mm_mt/d_a_e_mm_mt.cpp +++ b/rel/d/a/e/d_a_e_mm_mt/d_a_e_mm_mt.cpp @@ -342,7 +342,7 @@ extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; /* ############################################################################################## */ /* 80725858-8072585C 000000 0004+00 9/9 0/0 0/0 .rodata @3789 */ SECTION_RODATA static f32 const lit_3789 = 100.0f; -COMPILER_STRIP_GATE(80725858, &lit_3789); +COMPILER_STRIP_GATE(0x80725858, &lit_3789); /* 8072585C-80725860 000004 0004+00 1/9 0/0 0/0 .rodata @3790 */ SECTION_RODATA static u8 const lit_3790[4] = { @@ -351,7 +351,7 @@ SECTION_RODATA static u8 const lit_3790[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(8072585C, &lit_3790); +COMPILER_STRIP_GATE(0x8072585C, &lit_3790); /* 80725860-80725868 000008 0004+04 0/6 0/0 0/0 .rodata @3791 */ #pragma push @@ -361,7 +361,7 @@ SECTION_RODATA static f32 const lit_3791[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80725860, &lit_3791); +COMPILER_STRIP_GATE(0x80725860, &lit_3791); #pragma pop /* 80725868-80725870 000010 0008+00 0/1 0/0 0/0 .rodata @3792 */ @@ -370,7 +370,7 @@ COMPILER_STRIP_GATE(80725860, &lit_3791); SECTION_RODATA static u8 const lit_3792[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80725868, &lit_3792); +COMPILER_STRIP_GATE(0x80725868, &lit_3792); #pragma pop /* 80725870-80725878 000018 0008+00 0/1 0/0 0/0 .rodata @3793 */ @@ -379,7 +379,7 @@ COMPILER_STRIP_GATE(80725868, &lit_3792); SECTION_RODATA static u8 const lit_3793[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80725870, &lit_3793); +COMPILER_STRIP_GATE(0x80725870, &lit_3793); #pragma pop /* 80725878-80725880 000020 0008+00 0/1 0/0 0/0 .rodata @3794 */ @@ -388,21 +388,21 @@ COMPILER_STRIP_GATE(80725870, &lit_3793); SECTION_RODATA static u8 const lit_3794[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80725878, &lit_3794); +COMPILER_STRIP_GATE(0x80725878, &lit_3794); #pragma pop /* 80725880-80725884 000028 0004+00 0/1 0/0 0/0 .rodata @3795 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3795 = 1.0f / 100.0f; -COMPILER_STRIP_GATE(80725880, &lit_3795); +COMPILER_STRIP_GATE(0x80725880, &lit_3795); #pragma pop /* 80725884-80725888 00002C 0004+00 0/1 0/0 0/0 .rodata @3829 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3829 = 700.0f; -COMPILER_STRIP_GATE(80725884, &lit_3829); +COMPILER_STRIP_GATE(0x80725884, &lit_3829); #pragma pop /* 80722F78-8072305C 000078 00E4+00 1/0 0/0 0/0 .text daE_MM_MT_Draw__FP13e_mm_mt_class @@ -421,14 +421,14 @@ static asm void daE_MM_MT_Draw(e_mm_mt_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3883 = 20.0f; -COMPILER_STRIP_GATE(80725888, &lit_3883); +COMPILER_STRIP_GATE(0x80725888, &lit_3883); #pragma pop /* 8072588C-80725890 000034 0004+00 0/4 0/0 0/0 .rodata @3884 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3884 = -1.0f; -COMPILER_STRIP_GATE(8072588C, &lit_3884); +COMPILER_STRIP_GATE(0x8072588C, &lit_3884); #pragma pop /* 8072305C-80723270 00015C 0214+00 2/2 0/0 0/0 .text e_mm_hookCheck__FP13e_mm_mt_class @@ -458,70 +458,70 @@ static asm void e_mm_mt_normal(e_mm_mt_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4008 = 150.0f; -COMPILER_STRIP_GATE(80725890, &lit_4008); +COMPILER_STRIP_GATE(0x80725890, &lit_4008); #pragma pop /* 80725894-80725898 00003C 0004+00 0/1 0/0 0/0 .rodata @4009 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4009 = 3.0f; -COMPILER_STRIP_GATE(80725894, &lit_4009); +COMPILER_STRIP_GATE(0x80725894, &lit_4009); #pragma pop /* 80725898-8072589C 000040 0004+00 0/1 0/0 0/0 .rodata @4010 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4010 = 3.0f / 20.0f; -COMPILER_STRIP_GATE(80725898, &lit_4010); +COMPILER_STRIP_GATE(0x80725898, &lit_4010); #pragma pop /* 8072589C-807258A0 000044 0004+00 0/2 0/0 0/0 .rodata @4011 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4011 = 2000.0f; -COMPILER_STRIP_GATE(8072589C, &lit_4011); +COMPILER_STRIP_GATE(0x8072589C, &lit_4011); #pragma pop /* 807258A0-807258A4 000048 0004+00 0/2 0/0 0/0 .rodata @4012 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4012 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(807258A0, &lit_4012); +COMPILER_STRIP_GATE(0x807258A0, &lit_4012); #pragma pop /* 807258A4-807258A8 00004C 0004+00 0/4 0/0 0/0 .rodata @4013 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4013 = 200.0f; -COMPILER_STRIP_GATE(807258A4, &lit_4013); +COMPILER_STRIP_GATE(0x807258A4, &lit_4013); #pragma pop /* 807258A8-807258AC 000050 0004+00 0/1 0/0 0/0 .rodata @4014 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4014 = 59.0f / 20.0f; -COMPILER_STRIP_GATE(807258A8, &lit_4014); +COMPILER_STRIP_GATE(0x807258A8, &lit_4014); #pragma pop /* 807258AC-807258B0 000054 0004+00 0/2 0/0 0/0 .rodata @4015 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4015 = 5.0f; -COMPILER_STRIP_GATE(807258AC, &lit_4015); +COMPILER_STRIP_GATE(0x807258AC, &lit_4015); #pragma pop /* 807258B0-807258B4 000058 0004+00 0/3 0/0 0/0 .rodata @4016 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4016 = 30.0f; -COMPILER_STRIP_GATE(807258B0, &lit_4016); +COMPILER_STRIP_GATE(0x807258B0, &lit_4016); #pragma pop /* 807258B4-807258B8 00005C 0004+00 0/3 0/0 0/0 .rodata @4017 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4017 = 0.5f; -COMPILER_STRIP_GATE(807258B4, &lit_4017); +COMPILER_STRIP_GATE(0x807258B4, &lit_4017); #pragma pop /* 807234E8-80723744 0005E8 025C+00 1/1 0/0 0/0 .text e_mm_mt_hagare__FP13e_mm_mt_class @@ -540,28 +540,28 @@ static asm void e_mm_mt_hagare(e_mm_mt_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4089 = 10.0f; -COMPILER_STRIP_GATE(807258B8, &lit_4089); +COMPILER_STRIP_GATE(0x807258B8, &lit_4089); #pragma pop /* 807258BC-807258C0 000064 0004+00 0/1 0/0 0/0 .rodata @4090 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4090 = 0.25f; -COMPILER_STRIP_GATE(807258BC, &lit_4090); +COMPILER_STRIP_GATE(0x807258BC, &lit_4090); #pragma pop /* 807258C0-807258C4 000068 0004+00 0/2 0/0 0/0 .rodata @4091 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4091 = 1000.0f; -COMPILER_STRIP_GATE(807258C0, &lit_4091); +COMPILER_STRIP_GATE(0x807258C0, &lit_4091); #pragma pop /* 807258C4-807258C8 00006C 0004+00 0/1 0/0 0/0 .rodata @4092 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4092 = -1000000000.0f; -COMPILER_STRIP_GATE(807258C4, &lit_4092); +COMPILER_STRIP_GATE(0x807258C4, &lit_4092); #pragma pop /* 80723744-807239CC 000844 0288+00 1/1 0/0 0/0 .text e_mm_mt_carry__FP13e_mm_mt_class */ @@ -579,7 +579,7 @@ static asm void e_mm_mt_carry(e_mm_mt_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4146 = -50.0f; -COMPILER_STRIP_GATE(807258C8, &lit_4146); +COMPILER_STRIP_GATE(0x807258C8, &lit_4146); #pragma pop /* 807239CC-80723B70 000ACC 01A4+00 1/1 0/0 0/0 .text wall_angle_get__FP13e_mm_mt_class @@ -598,63 +598,63 @@ static asm void wall_angle_get(e_mm_mt_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4338 = -3.0f / 10.0f; -COMPILER_STRIP_GATE(807258CC, &lit_4338); +COMPILER_STRIP_GATE(0x807258CC, &lit_4338); #pragma pop /* 807258D0-807258D4 000078 0004+00 0/1 0/0 0/0 .rodata @4339 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4339 = -30.0f; -COMPILER_STRIP_GATE(807258D0, &lit_4339); +COMPILER_STRIP_GATE(0x807258D0, &lit_4339); #pragma pop /* 807258D4-807258D8 00007C 0004+00 0/1 0/0 0/0 .rodata @4340 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4340 = -2.0f / 5.0f; -COMPILER_STRIP_GATE(807258D4, &lit_4340); +COMPILER_STRIP_GATE(0x807258D4, &lit_4340); #pragma pop /* 807258D8-807258DC 000080 0004+00 0/1 0/0 0/0 .rodata @4341 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4341 = 0.75f; -COMPILER_STRIP_GATE(807258D8, &lit_4341); +COMPILER_STRIP_GATE(0x807258D8, &lit_4341); #pragma pop /* 807258DC-807258E0 000084 0004+00 0/1 0/0 0/0 .rodata @4342 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4342 = 3500.0f; -COMPILER_STRIP_GATE(807258DC, &lit_4342); +COMPILER_STRIP_GATE(0x807258DC, &lit_4342); #pragma pop /* 807258E0-807258E4 000088 0004+00 0/1 0/0 0/0 .rodata @4343 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4343 = 1.5f; -COMPILER_STRIP_GATE(807258E0, &lit_4343); +COMPILER_STRIP_GATE(0x807258E0, &lit_4343); #pragma pop /* 807258E4-807258E8 00008C 0004+00 0/1 0/0 0/0 .rodata @4344 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4344 = 1300.0f; -COMPILER_STRIP_GATE(807258E4, &lit_4344); +COMPILER_STRIP_GATE(0x807258E4, &lit_4344); #pragma pop /* 807258E8-807258EC 000090 0004+00 0/2 0/0 0/0 .rodata @4345 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4345 = 2.0f; -COMPILER_STRIP_GATE(807258E8, &lit_4345); +COMPILER_STRIP_GATE(0x807258E8, &lit_4345); #pragma pop /* 807258EC-807258F0 000094 0004+00 0/1 0/0 0/0 .rodata @4346 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4346 = -5.0f; -COMPILER_STRIP_GATE(807258EC, &lit_4346); +COMPILER_STRIP_GATE(0x807258EC, &lit_4346); #pragma pop /* 807258F0-807258F8 000098 0008+00 0/2 0/0 0/0 .rodata @4348 */ @@ -663,7 +663,7 @@ COMPILER_STRIP_GATE(807258EC, &lit_4346); SECTION_RODATA static u8 const lit_4348[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(807258F0, &lit_4348); +COMPILER_STRIP_GATE(0x807258F0, &lit_4348); #pragma pop /* 80723B70-80724190 000C70 0620+00 1/1 0/0 0/0 .text e_mm_mt_drop__FP13e_mm_mt_class */ @@ -681,77 +681,77 @@ static asm void e_mm_mt_drop(e_mm_mt_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4730 = 50.0f; -COMPILER_STRIP_GATE(807258F8, &lit_4730); +COMPILER_STRIP_GATE(0x807258F8, &lit_4730); #pragma pop /* 807258FC-80725900 0000A4 0004+00 0/1 0/0 0/0 .rodata @4731 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4731 = 40.0f; -COMPILER_STRIP_GATE(807258FC, &lit_4731); +COMPILER_STRIP_GATE(0x807258FC, &lit_4731); #pragma pop /* 80725900-80725904 0000A8 0004+00 0/1 0/0 0/0 .rodata @4732 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4732 = 5500.0f; -COMPILER_STRIP_GATE(80725900, &lit_4732); +COMPILER_STRIP_GATE(0x80725900, &lit_4732); #pragma pop /* 80725904-80725908 0000AC 0004+00 0/1 0/0 0/0 .rodata @4733 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4733 = 5000.0f; -COMPILER_STRIP_GATE(80725904, &lit_4733); +COMPILER_STRIP_GATE(0x80725904, &lit_4733); #pragma pop /* 80725908-8072590C 0000B0 0004+00 0/1 0/0 0/0 .rodata @4734 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4734 = 3000.0f; -COMPILER_STRIP_GATE(80725908, &lit_4734); +COMPILER_STRIP_GATE(0x80725908, &lit_4734); #pragma pop /* 8072590C-80725910 0000B4 0004+00 0/1 0/0 0/0 .rodata @4735 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4735 = 4000.0f; -COMPILER_STRIP_GATE(8072590C, &lit_4735); +COMPILER_STRIP_GATE(0x8072590C, &lit_4735); #pragma pop /* 80725910-80725914 0000B8 0004+00 0/1 0/0 0/0 .rodata @4736 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4736 = 7.0f / 10.0f; -COMPILER_STRIP_GATE(80725910, &lit_4736); +COMPILER_STRIP_GATE(0x80725910, &lit_4736); #pragma pop /* 80725914-80725918 0000BC 0004+00 0/1 0/0 0/0 .rodata @4737 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4737 = -60.0f; -COMPILER_STRIP_GATE(80725914, &lit_4737); +COMPILER_STRIP_GATE(0x80725914, &lit_4737); #pragma pop /* 80725918-8072591C 0000C0 0004+00 0/1 0/0 0/0 .rodata @4738 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4738 = -90.0f; -COMPILER_STRIP_GATE(80725918, &lit_4738); +COMPILER_STRIP_GATE(0x80725918, &lit_4738); #pragma pop /* 8072591C-80725920 0000C4 0004+00 0/1 0/0 0/0 .rodata @4739 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4739 = 60.0f; -COMPILER_STRIP_GATE(8072591C, &lit_4739); +COMPILER_STRIP_GATE(0x8072591C, &lit_4739); #pragma pop /* 80725920-80725924 0000C8 0004+00 0/1 0/0 0/0 .rodata @4740 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4740 = 20000.0f; -COMPILER_STRIP_GATE(80725920, &lit_4740); +COMPILER_STRIP_GATE(0x80725920, &lit_4740); #pragma pop /* 80724190-80724D40 001290 0BB0+00 1/1 0/0 0/0 .text action__FP13e_mm_mt_class */ @@ -779,6 +779,13 @@ static bool daE_MM_MT_IsDelete(e_mm_mt_class* param_0) { return true; } +/* ############################################################################################## */ +/* 8072592C-8072592C 0000D4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8072592C = "E_MM_MT"; +#pragma pop + /* 80724DFC-80724E58 001EFC 005C+00 1/0 0/0 0/0 .text daE_MM_MT_Delete__FP13e_mm_mt_class */ #pragma push @@ -805,14 +812,14 @@ static asm void useHeapInit(fopAc_ac_c* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4896 = -200.0f; -COMPILER_STRIP_GATE(80725924, &lit_4896); +COMPILER_STRIP_GATE(0x80725924, &lit_4896); #pragma pop /* 80725928-8072592C 0000D0 0004+00 0/1 0/0 0/0 .rodata @4897 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4897 = 65535.0f; -COMPILER_STRIP_GATE(80725928, &lit_4897); +COMPILER_STRIP_GATE(0x80725928, &lit_4897); #pragma pop /* 80725934-80725940 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ @@ -1053,9 +1060,4 @@ static asm void setMidnaBindEffect(fopEn_enemy_c* param_0, Z2CreatureEnemy* para } #pragma pop -/* 8072592C-80725934 0000D4 0008+00 3/3 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_8072592C = "E_MM_MT"; -#pragma pop +/* 8072592C-8072592C 0000D4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/e/d_a_e_ms/d_a_e_ms.cpp b/rel/d/a/e/d_a_e_ms/d_a_e_ms.cpp index 9df16b84734..959e88d2e3b 100644 --- a/rel/d/a/e/d_a_e_ms/d_a_e_ms.cpp +++ b/rel/d/a/e/d_a_e_ms/d_a_e_ms.cpp @@ -20,16 +20,16 @@ struct mDoMtx_stack_c { static u8 now[48]; }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; - struct J3DAnmTransform {}; +struct J3DModelData {}; + +struct Z2Creature {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -91,10 +91,10 @@ struct dRes_control_c { struct dPa_levelEcallBack {}; -struct _GXColor {}; - struct csXyz {}; +struct _GXColor {}; + struct dPa_control_c { /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, @@ -403,7 +403,7 @@ extern "C" void __register_global_object(); /* ############################################################################################## */ /* 80729504-80729508 000000 0004+00 14/14 0/0 0/0 .rodata @3800 */ SECTION_RODATA static f32 const lit_3800 = 100.0f; -COMPILER_STRIP_GATE(80729504, &lit_3800); +COMPILER_STRIP_GATE(0x80729504, &lit_3800); /* 80729508-8072950C 000004 0004+00 2/13 0/0 0/0 .rodata @3801 */ SECTION_RODATA static u8 const lit_3801[4] = { @@ -412,7 +412,7 @@ SECTION_RODATA static u8 const lit_3801[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80729508, &lit_3801); +COMPILER_STRIP_GATE(0x80729508, &lit_3801); /* 8072950C-80729514 000008 0004+04 3/13 0/0 0/0 .rodata @3802 */ SECTION_RODATA static f32 const lit_3802[1 + 1 /* padding */] = { @@ -420,7 +420,7 @@ SECTION_RODATA static f32 const lit_3802[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(8072950C, &lit_3802); +COMPILER_STRIP_GATE(0x8072950C, &lit_3802); /* 80729514-8072951C 000010 0008+00 0/3 0/0 0/0 .rodata @3803 */ #pragma push @@ -428,7 +428,7 @@ COMPILER_STRIP_GATE(8072950C, &lit_3802); SECTION_RODATA static u8 const lit_3803[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80729514, &lit_3803); +COMPILER_STRIP_GATE(0x80729514, &lit_3803); #pragma pop /* 8072951C-80729524 000018 0008+00 0/3 0/0 0/0 .rodata @3804 */ @@ -437,7 +437,7 @@ COMPILER_STRIP_GATE(80729514, &lit_3803); SECTION_RODATA static u8 const lit_3804[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8072951C, &lit_3804); +COMPILER_STRIP_GATE(0x8072951C, &lit_3804); #pragma pop /* 80729524-8072952C 000020 0008+00 0/3 0/0 0/0 .rodata @3805 */ @@ -446,42 +446,42 @@ COMPILER_STRIP_GATE(8072951C, &lit_3804); SECTION_RODATA static u8 const lit_3805[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80729524, &lit_3805); +COMPILER_STRIP_GATE(0x80729524, &lit_3805); #pragma pop /* 8072952C-80729530 000028 0004+00 0/1 0/0 0/0 .rodata @3806 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3806 = 1.0f / 100.0f; -COMPILER_STRIP_GATE(8072952C, &lit_3806); +COMPILER_STRIP_GATE(0x8072952C, &lit_3806); #pragma pop /* 80729530-80729534 00002C 0004+00 0/2 0/0 0/0 .rodata @3821 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3821 = 15.0f; -COMPILER_STRIP_GATE(80729530, &lit_3821); +COMPILER_STRIP_GATE(0x80729530, &lit_3821); #pragma pop /* 80729534-80729538 000030 0004+00 0/5 0/0 0/0 .rodata @3822 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3822 = 40.0f; -COMPILER_STRIP_GATE(80729534, &lit_3822); +COMPILER_STRIP_GATE(0x80729534, &lit_3822); #pragma pop /* 80729538-8072953C 000034 0004+00 0/1 0/0 0/0 .rodata @3823 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3823 = 4.0f; -COMPILER_STRIP_GATE(80729538, &lit_3823); +COMPILER_STRIP_GATE(0x80729538, &lit_3823); #pragma pop /* 8072953C-80729540 000038 0004+00 0/1 0/0 0/0 .rodata @3824 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3824 = 450.0f; -COMPILER_STRIP_GATE(8072953C, &lit_3824); +COMPILER_STRIP_GATE(0x8072953C, &lit_3824); #pragma pop /* 80729610-8072961C 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ @@ -660,7 +660,13 @@ asm daE_MS_HIO_c::daE_MS_HIO_c() { /* ############################################################################################## */ /* 80729540-80729544 00003C 0004+00 1/1 0/0 0/0 .rodata @3838 */ SECTION_RODATA static f32 const lit_3838 = -1.0f; -COMPILER_STRIP_GATE(80729540, &lit_3838); +COMPILER_STRIP_GATE(0x80729540, &lit_3838); + +/* 807295FC-807295FC 0000F8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_807295FC = "E_MS"; +#pragma pop /* 80725BD4-80725C80 000134 00AC+00 7/7 0/0 0/0 .text anm_init__FP10e_ms_classifUcf */ #pragma push @@ -687,7 +693,7 @@ static asm void pl_check(e_ms_class* param_0, f32 param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3888 = 400.0f; -COMPILER_STRIP_GATE(80729544, &lit_3888); +COMPILER_STRIP_GATE(0x80729544, &lit_3888); #pragma pop /* 80725CCC-80725DEC 00022C 0120+00 1/0 0/0 0/0 .text daE_MS_Draw__FP10e_ms_class */ @@ -703,7 +709,7 @@ static asm void daE_MS_Draw(e_ms_class* param_0) { /* ############################################################################################## */ /* 80729548-8072954C 000044 0004+00 2/4 0/0 0/0 .rodata @3907 */ SECTION_RODATA static f32 const lit_3907 = 50.0f; -COMPILER_STRIP_GATE(80729548, &lit_3907); +COMPILER_STRIP_GATE(0x80729548, &lit_3907); /* 80725DEC-80725ED4 00034C 00E8+00 2/2 0/0 0/0 .text sibuki_set__FP10e_ms_class */ #pragma push @@ -845,7 +851,7 @@ static asm void s_d_sub(void* param_0, void* param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4005 = 1000.0f; -COMPILER_STRIP_GATE(8072954C, &lit_4005); +COMPILER_STRIP_GATE(0x8072954C, &lit_4005); #pragma pop /* 8072606C-807261E8 0005CC 017C+00 1/1 0/0 0/0 .text search_dokuro__FP10e_ms_class */ @@ -861,13 +867,13 @@ static asm void search_dokuro(e_ms_class* param_0) { /* ############################################################################################## */ /* 80729550-80729554 00004C 0004+00 1/3 0/0 0/0 .rodata @4052 */ SECTION_RODATA static f32 const lit_4052 = 65535.0f; -COMPILER_STRIP_GATE(80729550, &lit_4052); +COMPILER_STRIP_GATE(0x80729550, &lit_4052); /* 80729554-80729558 000050 0004+00 0/1 0/0 0/0 .rodata @4053 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4053 = 150.0f; -COMPILER_STRIP_GATE(80729554, &lit_4053); +COMPILER_STRIP_GATE(0x80729554, &lit_4053); #pragma pop /* 807261E8-80726360 000748 0178+00 1/1 0/0 0/0 .text way_set__FP10e_ms_class */ @@ -885,63 +891,63 @@ static asm void way_set(e_ms_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4103 = 0.5f; -COMPILER_STRIP_GATE(80729558, &lit_4103); +COMPILER_STRIP_GATE(0x80729558, &lit_4103); #pragma pop /* 8072955C-80729560 000058 0004+00 0/5 0/0 0/0 .rodata @4104 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4104 = 3.0f; -COMPILER_STRIP_GATE(8072955C, &lit_4104); +COMPILER_STRIP_GATE(0x8072955C, &lit_4104); #pragma pop /* 80729560-80729564 00005C 0004+00 0/3 0/0 0/0 .rodata @4105 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4105 = 30.0f; -COMPILER_STRIP_GATE(80729560, &lit_4105); +COMPILER_STRIP_GATE(0x80729560, &lit_4105); #pragma pop /* 80729564-80729568 000060 0004+00 0/2 0/0 0/0 .rodata @4106 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4106 = 60.0f; -COMPILER_STRIP_GATE(80729564, &lit_4106); +COMPILER_STRIP_GATE(0x80729564, &lit_4106); #pragma pop /* 80729568-8072956C 000064 0004+00 0/2 0/0 0/0 .rodata @4107 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4107 = 2000.0f; -COMPILER_STRIP_GATE(80729568, &lit_4107); +COMPILER_STRIP_GATE(0x80729568, &lit_4107); #pragma pop /* 8072956C-80729570 000068 0004+00 0/2 0/0 0/0 .rodata @4108 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4108 = 200.0f; -COMPILER_STRIP_GATE(8072956C, &lit_4108); +COMPILER_STRIP_GATE(0x8072956C, &lit_4108); #pragma pop /* 80729570-80729574 00006C 0004+00 0/1 0/0 0/0 .rodata @4109 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4109 = 1.5f; -COMPILER_STRIP_GATE(80729570, &lit_4109); +COMPILER_STRIP_GATE(0x80729570, &lit_4109); #pragma pop /* 80729574-80729578 000070 0004+00 0/1 0/0 0/0 .rodata @4110 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4110 = 4000.0f; -COMPILER_STRIP_GATE(80729574, &lit_4110); +COMPILER_STRIP_GATE(0x80729574, &lit_4110); #pragma pop /* 80729578-8072957C 000074 0004+00 0/1 0/0 0/0 .rodata @4111 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4111 = 0.25f; -COMPILER_STRIP_GATE(80729578, &lit_4111); +COMPILER_STRIP_GATE(0x80729578, &lit_4111); #pragma pop /* 80726360-80726730 0008C0 03D0+00 1/1 0/0 0/0 .text e_ms_normal__FP10e_ms_class */ @@ -959,14 +965,14 @@ static asm void e_ms_normal(e_ms_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4180 = 300.0f; -COMPILER_STRIP_GATE(8072957C, &lit_4180); +COMPILER_STRIP_GATE(0x8072957C, &lit_4180); #pragma pop /* 80729580-80729584 00007C 0004+00 0/4 0/0 0/0 .rodata @4181 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4181 = 10.0f; -COMPILER_STRIP_GATE(80729580, &lit_4181); +COMPILER_STRIP_GATE(0x80729580, &lit_4181); #pragma pop /* 80726730-80726A70 000C90 0340+00 1/1 0/0 0/0 .text e_ms_attack__FP10e_ms_class */ @@ -984,14 +990,14 @@ static asm void e_ms_attack(e_ms_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4297 = 70.0f; -COMPILER_STRIP_GATE(80729584, &lit_4297); +COMPILER_STRIP_GATE(0x80729584, &lit_4297); #pragma pop /* 80729588-8072958C 000084 0004+00 0/2 0/0 0/0 .rodata @4298 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4298 = 10000.0f; -COMPILER_STRIP_GATE(80729588, &lit_4298); +COMPILER_STRIP_GATE(0x80729588, &lit_4298); #pragma pop /* 80726A70-80726F54 000FD0 04E4+00 1/1 0/0 0/0 .text search_ground_1__FP10e_ms_class */ @@ -1014,14 +1020,14 @@ cXyz::cXyz() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4323 = 5.0f; -COMPILER_STRIP_GATE(8072958C, &lit_4323); +COMPILER_STRIP_GATE(0x8072958C, &lit_4323); #pragma pop /* 80729590-80729594 00008C 0004+00 0/3 0/0 0/0 .rodata @4324 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4324 = 20.0f; -COMPILER_STRIP_GATE(80729590, &lit_4324); +COMPILER_STRIP_GATE(0x80729590, &lit_4324); #pragma pop /* 80726F58-80727100 0014B8 01A8+00 1/1 0/0 0/0 .text e_ms_swim__FP10e_ms_class */ @@ -1039,35 +1045,35 @@ static asm void e_ms_swim(e_ms_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4397 = 75.0f; -COMPILER_STRIP_GATE(80729594, &lit_4397); +COMPILER_STRIP_GATE(0x80729594, &lit_4397); #pragma pop /* 80729598-8072959C 000094 0004+00 0/1 0/0 0/0 .rodata @4398 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4398 = 90.0f; -COMPILER_STRIP_GATE(80729598, &lit_4398); +COMPILER_STRIP_GATE(0x80729598, &lit_4398); #pragma pop /* 8072959C-807295A0 000098 0004+00 0/1 0/0 0/0 .rodata @4399 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4399 = 65.0f; -COMPILER_STRIP_GATE(8072959C, &lit_4399); +COMPILER_STRIP_GATE(0x8072959C, &lit_4399); #pragma pop /* 807295A0-807295A4 00009C 0004+00 0/1 0/0 0/0 .rodata @4400 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4400 = -2.0f; -COMPILER_STRIP_GATE(807295A0, &lit_4400); +COMPILER_STRIP_GATE(0x807295A0, &lit_4400); #pragma pop /* 807295A4-807295A8 0000A0 0004+00 0/3 0/0 0/0 .rodata @4401 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4401 = 2.0f; -COMPILER_STRIP_GATE(807295A4, &lit_4401); +COMPILER_STRIP_GATE(0x807295A4, &lit_4401); #pragma pop /* 80727100-807274D8 001660 03D8+00 1/1 0/0 0/0 .text e_ms_dokuro__FP10e_ms_class */ @@ -1085,7 +1091,7 @@ static asm void e_ms_dokuro(e_ms_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4431 = -30.0f; -COMPILER_STRIP_GATE(807295A8, &lit_4431); +COMPILER_STRIP_GATE(0x807295A8, &lit_4431); #pragma pop /* 807274D8-80727704 001A38 022C+00 1/1 0/0 0/0 .text e_ms_damage__FP10e_ms_class */ @@ -1143,112 +1149,112 @@ static asm void action(e_ms_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4619 = 500.0f; -COMPILER_STRIP_GATE(807295AC, &lit_4619); +COMPILER_STRIP_GATE(0x807295AC, &lit_4619); #pragma pop /* 807295B0-807295B4 0000AC 0004+00 0/0 0/0 0/0 .rodata @4620 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4620 = -7.0f; -COMPILER_STRIP_GATE(807295B0, &lit_4620); +COMPILER_STRIP_GATE(0x807295B0, &lit_4620); #pragma pop /* 807295B4-807295B8 0000B0 0004+00 0/0 0/0 0/0 .rodata @4621 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4621 = -80.0f; -COMPILER_STRIP_GATE(807295B4, &lit_4621); +COMPILER_STRIP_GATE(0x807295B4, &lit_4621); #pragma pop /* 807295B8-807295BC 0000B4 0004+00 0/1 0/0 0/0 .rodata @4622 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4622 = 3.0f / 10.0f; -COMPILER_STRIP_GATE(807295B8, &lit_4622); +COMPILER_STRIP_GATE(0x807295B8, &lit_4622); #pragma pop /* 807295BC-807295C0 0000B8 0004+00 0/0 0/0 0/0 .rodata @4623 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4623 = 45.0f; -COMPILER_STRIP_GATE(807295BC, &lit_4623); +COMPILER_STRIP_GATE(0x807295BC, &lit_4623); #pragma pop /* 807295C0-807295C4 0000BC 0004+00 0/0 0/0 0/0 .rodata @4624 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4624 = 47.0f; -COMPILER_STRIP_GATE(807295C0, &lit_4624); +COMPILER_STRIP_GATE(0x807295C0, &lit_4624); #pragma pop /* 807295C4-807295C8 0000C0 0004+00 0/0 0/0 0/0 .rodata @4625 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4625 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(807295C4, &lit_4625); +COMPILER_STRIP_GATE(0x807295C4, &lit_4625); #pragma pop /* 807295C8-807295CC 0000C4 0004+00 0/1 0/0 0/0 .rodata @4626 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4626 = 35.0f; -COMPILER_STRIP_GATE(807295C8, &lit_4626); +COMPILER_STRIP_GATE(0x807295C8, &lit_4626); #pragma pop /* 807295CC-807295D0 0000C8 0004+00 0/0 0/0 0/0 .rodata @4627 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4627 = 2.0f / 5.0f; -COMPILER_STRIP_GATE(807295CC, &lit_4627); +COMPILER_STRIP_GATE(0x807295CC, &lit_4627); #pragma pop /* 807295D0-807295D4 0000CC 0004+00 0/1 0/0 0/0 .rodata @4735 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4735 = 44.0f; -COMPILER_STRIP_GATE(807295D0, &lit_4735); +COMPILER_STRIP_GATE(0x807295D0, &lit_4735); #pragma pop /* 807295D4-807295D8 0000D0 0004+00 0/1 0/0 0/0 .rodata @4736 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4736 = 6.0f; -COMPILER_STRIP_GATE(807295D4, &lit_4736); +COMPILER_STRIP_GATE(0x807295D4, &lit_4736); #pragma pop /* 807295D8-807295DC 0000D4 0004+00 0/1 0/0 0/0 .rodata @4737 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4737 = 6.5f; -COMPILER_STRIP_GATE(807295D8, &lit_4737); +COMPILER_STRIP_GATE(0x807295D8, &lit_4737); #pragma pop /* 807295DC-807295E0 0000D8 0004+00 0/1 0/0 0/0 .rodata @4738 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4738 = 8.0f; -COMPILER_STRIP_GATE(807295DC, &lit_4738); +COMPILER_STRIP_GATE(0x807295DC, &lit_4738); #pragma pop /* 807295E0-807295E4 0000DC 0004+00 0/1 0/0 0/0 .rodata @4739 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4739 = 2.5f; -COMPILER_STRIP_GATE(807295E0, &lit_4739); +COMPILER_STRIP_GATE(0x807295E0, &lit_4739); #pragma pop /* 807295E4-807295E8 0000E0 0004+00 0/1 0/0 0/0 .rodata @4740 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4740 = 4.5f; -COMPILER_STRIP_GATE(807295E4, &lit_4740); +COMPILER_STRIP_GATE(0x807295E4, &lit_4740); #pragma pop /* 807295E8-807295EC 0000E4 0004+00 0/1 0/0 0/0 .rodata @4741 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4741 = 9.5f; -COMPILER_STRIP_GATE(807295E8, &lit_4741); +COMPILER_STRIP_GATE(0x807295E8, &lit_4741); #pragma pop /* 8072803C-80728464 00259C 0428+00 1/1 0/0 0/0 .text anm_se_set__FP10e_ms_class */ @@ -1266,28 +1272,34 @@ static asm void anm_se_set(e_ms_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4857 = -400.0f; -COMPILER_STRIP_GATE(807295EC, &lit_4857); +COMPILER_STRIP_GATE(0x807295EC, &lit_4857); #pragma pop /* 807295F0-807295F4 0000EC 0004+00 0/1 0/0 0/0 .rodata @4858 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4858 = -60.0f; -COMPILER_STRIP_GATE(807295F0, &lit_4858); +COMPILER_STRIP_GATE(0x807295F0, &lit_4858); #pragma pop /* 807295F4-807295F8 0000F0 0004+00 0/1 0/0 0/0 .rodata @4859 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4859 = -20.0f; -COMPILER_STRIP_GATE(807295F4, &lit_4859); +COMPILER_STRIP_GATE(0x807295F4, &lit_4859); #pragma pop /* 807295F8-807295FC 0000F4 0004+00 0/1 0/0 0/0 .rodata @4860 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4860 = 7.0f; -COMPILER_STRIP_GATE(807295F8, &lit_4860); +COMPILER_STRIP_GATE(0x807295F8, &lit_4860); +#pragma pop + +/* 807295FC-807295FC 0000F8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80729601 = "D_MN10"; #pragma pop /* 8072987C-8072988C 0000C4 000C+04 0/1 0/0 0/0 .bss @4778 */ @@ -1337,6 +1349,13 @@ static asm void useHeapInit(fopAc_ac_c* param_0) { } #pragma pop +/* ############################################################################################## */ +/* 807295FC-807295FC 0000F8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80729608 = "E_ms"; +#pragma pop + /* 80728A88-80728DF8 002FE8 0370+00 1/0 0/0 0/0 .text daE_MS_Create__FP10fopAc_ac_c */ #pragma push #pragma optimization_level 0 @@ -1429,7 +1448,7 @@ asm void __sinit_d_a_e_ms_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80729054 = (void*)__sinit_d_a_e_ms_cpp; +REGISTER_CTORS(0x80729054, __sinit_d_a_e_ms_cpp); #pragma pop /* 80729090-80729098 0035F0 0008+00 1/0 0/0 0/0 .text @36@__dt__12dBgS_ObjAcchFv */ @@ -1646,11 +1665,4 @@ static u8 data_807298F4[4]; static u8 data_807298F8[4]; #pragma pop -/* 807295FC-8072960D 0000F8 0011+00 5/5 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_807295FC = "E_MS"; -SECTION_DEAD static char const* const stringBase_80729601 = "D_MN10"; -SECTION_DEAD static char const* const stringBase_80729608 = "E_ms"; -#pragma pop +/* 807295FC-807295FC 0000F8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/e/d_a_e_nest/d_a_e_nest.cpp b/rel/d/a/e/d_a_e_nest/d_a_e_nest.cpp index f43d58a1e98..97630c1dec5 100644 --- a/rel/d/a/e/d_a_e_nest/d_a_e_nest.cpp +++ b/rel/d/a/e/d_a_e_nest/d_a_e_nest.cpp @@ -91,10 +91,10 @@ struct dRes_control_c { struct dPa_levelEcallBack {}; -struct _GXColor {}; - struct csXyz {}; +struct _GXColor {}; + struct dPa_control_c { /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, @@ -445,7 +445,7 @@ extern "C" void endHawkCamera__10daNPC_TK_cFv(); /* ############################################################################################## */ /* 805046DC-805046E0 000000 0004+00 16/16 0/0 0/0 .rodata @3999 */ SECTION_RODATA static f32 const lit_3999 = 1.0f; -COMPILER_STRIP_GATE(805046DC, &lit_3999); +COMPILER_STRIP_GATE(0x805046DC, &lit_3999); /* 805047FC-80504808 000000 000C+00 1/1 0/0 0/0 .data c_x$4617 */ SECTION_DATA static u8 c_x[12] = { @@ -578,7 +578,7 @@ SECTION_RODATA static u8 const lit_4066[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(805046E0, &lit_4066); +COMPILER_STRIP_GATE(0x805046E0, &lit_4066); /* 805046E4-805046EC 000008 0008+00 0/5 0/0 0/0 .rodata @4067 */ #pragma push @@ -586,7 +586,7 @@ COMPILER_STRIP_GATE(805046E0, &lit_4066); SECTION_RODATA static u8 const lit_4067[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(805046E4, &lit_4067); +COMPILER_STRIP_GATE(0x805046E4, &lit_4067); #pragma pop /* 805046EC-805046F4 000010 0008+00 0/5 0/0 0/0 .rodata @4068 */ @@ -595,7 +595,7 @@ COMPILER_STRIP_GATE(805046E4, &lit_4067); SECTION_RODATA static u8 const lit_4068[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(805046EC, &lit_4068); +COMPILER_STRIP_GATE(0x805046EC, &lit_4068); #pragma pop /* 805046F4-805046FC 000018 0008+00 0/5 0/0 0/0 .rodata @4069 */ @@ -604,14 +604,14 @@ COMPILER_STRIP_GATE(805046EC, &lit_4068); SECTION_RODATA static u8 const lit_4069[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(805046F4, &lit_4069); +COMPILER_STRIP_GATE(0x805046F4, &lit_4069); #pragma pop /* 805046FC-80504700 000020 0004+00 0/1 0/0 0/0 .rodata @4070 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4070 = 120.0f; -COMPILER_STRIP_GATE(805046FC, &lit_4070); +COMPILER_STRIP_GATE(0x805046FC, &lit_4070); #pragma pop /* 80501040-805011CC 0001A0 018C+00 1/1 0/0 0/0 .text s_bomb_sub__FPvPv */ @@ -629,102 +629,102 @@ static asm void s_bomb_sub(void* param_0, void* param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4198 = 500.0f; -COMPILER_STRIP_GATE(80504700, &lit_4198); +COMPILER_STRIP_GATE(0x80504700, &lit_4198); #pragma pop /* 80504704-80504708 000028 0004+00 0/4 0/0 0/0 .rodata @4199 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4199 = 0.5f; -COMPILER_STRIP_GATE(80504704, &lit_4199); +COMPILER_STRIP_GATE(0x80504704, &lit_4199); #pragma pop /* 80504708-8050470C 00002C 0004+00 0/2 0/0 0/0 .rodata @4200 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4200 = -5.0f; -COMPILER_STRIP_GATE(80504708, &lit_4200); +COMPILER_STRIP_GATE(0x80504708, &lit_4200); #pragma pop /* 8050470C-80504710 000030 0004+00 0/2 0/0 0/0 .rodata @4201 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4201 = 19.0f / 20.0f; -COMPILER_STRIP_GATE(8050470C, &lit_4201); +COMPILER_STRIP_GATE(0x8050470C, &lit_4201); #pragma pop /* 80504710-80504714 000034 0004+00 0/1 0/0 0/0 .rodata @4202 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4202 = 4.0f; -COMPILER_STRIP_GATE(80504710, &lit_4202); +COMPILER_STRIP_GATE(0x80504710, &lit_4202); #pragma pop /* 80504714-80504718 000038 0004+00 0/1 0/0 0/0 .rodata @4203 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4203 = -50.0f; -COMPILER_STRIP_GATE(80504714, &lit_4203); +COMPILER_STRIP_GATE(0x80504714, &lit_4203); #pragma pop /* 80504718-8050471C 00003C 0004+00 0/5 0/0 0/0 .rodata @4204 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4204 = 100.0f; -COMPILER_STRIP_GATE(80504718, &lit_4204); +COMPILER_STRIP_GATE(0x80504718, &lit_4204); #pragma pop /* 8050471C-80504720 000040 0004+00 0/1 0/0 0/0 .rodata @4205 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4205 = -7.0f; -COMPILER_STRIP_GATE(8050471C, &lit_4205); +COMPILER_STRIP_GATE(0x8050471C, &lit_4205); #pragma pop /* 80504720-80504724 000044 0004+00 0/2 0/0 0/0 .rodata @4206 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4206 = 15.0f; -COMPILER_STRIP_GATE(80504720, &lit_4206); +COMPILER_STRIP_GATE(0x80504720, &lit_4206); #pragma pop /* 80504724-80504728 000048 0004+00 0/5 0/0 0/0 .rodata @4207 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4207 = 10.0f; -COMPILER_STRIP_GATE(80504724, &lit_4207); +COMPILER_STRIP_GATE(0x80504724, &lit_4207); #pragma pop /* 80504728-8050472C 00004C 0004+00 1/7 0/0 0/0 .rodata @4208 */ SECTION_RODATA static f32 const lit_4208 = 50.0f; -COMPILER_STRIP_GATE(80504728, &lit_4208); +COMPILER_STRIP_GATE(0x80504728, &lit_4208); /* 8050472C-80504730 000050 0004+00 0/3 0/0 0/0 .rodata @4209 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4209 = -1.0f; -COMPILER_STRIP_GATE(8050472C, &lit_4209); +COMPILER_STRIP_GATE(0x8050472C, &lit_4209); #pragma pop /* 80504730-80504734 000054 0004+00 0/1 0/0 0/0 .rodata @4210 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4210 = 400.0f; -COMPILER_STRIP_GATE(80504730, &lit_4210); +COMPILER_STRIP_GATE(0x80504730, &lit_4210); #pragma pop /* 80504734-80504738 000058 0004+00 0/1 0/0 0/0 .rodata @4211 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4211 = 5000.0f; -COMPILER_STRIP_GATE(80504734, &lit_4211); +COMPILER_STRIP_GATE(0x80504734, &lit_4211); #pragma pop /* 80504738-8050473C 00005C 0004+00 0/1 0/0 0/0 .rodata @4212 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4212 = 1.0f / 100.0f; -COMPILER_STRIP_GATE(80504738, &lit_4212); +COMPILER_STRIP_GATE(0x80504738, &lit_4212); #pragma pop /* 8050473C-80504744 000060 0004+04 0/3 0/0 0/0 .rodata @4213 */ @@ -735,14 +735,14 @@ SECTION_RODATA static f32 const lit_4213[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(8050473C, &lit_4213); +COMPILER_STRIP_GATE(0x8050473C, &lit_4213); #pragma pop /* 80504744-8050474C 000068 0008+00 1/3 0/0 0/0 .rodata @4215 */ SECTION_RODATA static u8 const lit_4215[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80504744, &lit_4215); +COMPILER_STRIP_GATE(0x80504744, &lit_4215); /* 805011CC-805017FC 00032C 0630+00 1/1 0/0 0/0 .text * hahen_normal__FP12e_nest_classP12nest_hahen_s */ @@ -790,35 +790,35 @@ static asm void daE_Nest_Draw(e_nest_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4297 = -90.0f; -COMPILER_STRIP_GATE(8050474C, &lit_4297); +COMPILER_STRIP_GATE(0x8050474C, &lit_4297); #pragma pop /* 80504750-80504754 000074 0004+00 0/3 0/0 0/0 .rodata @4298 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4298 = 40.0f; -COMPILER_STRIP_GATE(80504750, &lit_4298); +COMPILER_STRIP_GATE(0x80504750, &lit_4298); #pragma pop /* 80504754-80504758 000078 0004+00 0/1 0/0 0/0 .rodata @4299 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4299 = -30.0f; -COMPILER_STRIP_GATE(80504754, &lit_4299); +COMPILER_STRIP_GATE(0x80504754, &lit_4299); #pragma pop /* 80504758-8050475C 00007C 0004+00 0/5 0/0 0/0 .rodata @4300 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4300 = 5.0f; -COMPILER_STRIP_GATE(80504758, &lit_4300); +COMPILER_STRIP_GATE(0x80504758, &lit_4300); #pragma pop /* 8050475C-80504760 000080 0004+00 0/3 0/0 0/0 .rodata @4301 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4301 = 30.0f; -COMPILER_STRIP_GATE(8050475C, &lit_4301); +COMPILER_STRIP_GATE(0x8050475C, &lit_4301); #pragma pop /* 80501A40-80501BDC 000BA0 019C+00 2/2 0/0 0/0 .text mtx_cc_set__FP12e_nest_class */ @@ -834,7 +834,13 @@ static asm void mtx_cc_set(e_nest_class* param_0) { /* ############################################################################################## */ /* 80504760-80504764 000084 0004+00 2/3 0/0 0/0 .rodata @4431 */ SECTION_RODATA static f32 const lit_4431 = 135.0f; -COMPILER_STRIP_GATE(80504760, &lit_4431); +COMPILER_STRIP_GATE(0x80504760, &lit_4431); + +/* 805047EC-805047EC 000110 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_805047EC = "F_SP103"; +#pragma pop /* 80501BDC-805020D0 000D3C 04F4+00 1/1 0/0 0/0 .text e_nest_normal__FP12e_nest_class */ #pragma push @@ -851,14 +857,14 @@ static asm void e_nest_normal(e_nest_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4489 = -10.0f; -COMPILER_STRIP_GATE(80504764, &lit_4489); +COMPILER_STRIP_GATE(0x80504764, &lit_4489); #pragma pop /* 80504768-8050476C 00008C 0004+00 0/3 0/0 0/0 .rodata @4490 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4490 = 200.0f; -COMPILER_STRIP_GATE(80504768, &lit_4490); +COMPILER_STRIP_GATE(0x80504768, &lit_4490); #pragma pop /* 805020D0-80502280 001230 01B0+00 1/1 0/0 0/0 .text wall_angle_get__FP12e_nest_class */ @@ -876,42 +882,42 @@ static asm void wall_angle_get(e_nest_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4547 = 20.0f; -COMPILER_STRIP_GATE(8050476C, &lit_4547); +COMPILER_STRIP_GATE(0x8050476C, &lit_4547); #pragma pop /* 80504770-80504774 000094 0004+00 0/2 0/0 0/0 .rodata @4548 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4548 = 1000.0f; -COMPILER_STRIP_GATE(80504770, &lit_4548); +COMPILER_STRIP_GATE(0x80504770, &lit_4548); #pragma pop /* 80504774-80504778 000098 0004+00 0/1 0/0 0/0 .rodata @4549 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4549 = 1300.0f; -COMPILER_STRIP_GATE(80504774, &lit_4549); +COMPILER_STRIP_GATE(0x80504774, &lit_4549); #pragma pop /* 80504778-8050477C 00009C 0004+00 0/2 0/0 0/0 .rodata @4550 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4550 = -80.0f; -COMPILER_STRIP_GATE(80504778, &lit_4550); +COMPILER_STRIP_GATE(0x80504778, &lit_4550); #pragma pop /* 8050477C-80504780 0000A0 0004+00 0/1 0/0 0/0 .rodata @4551 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4551 = -3.0f / 10.0f; -COMPILER_STRIP_GATE(8050477C, &lit_4551); +COMPILER_STRIP_GATE(0x8050477C, &lit_4551); #pragma pop /* 80504780-80504784 0000A4 0004+00 0/3 0/0 0/0 .rodata @4552 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4552 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(80504780, &lit_4552); +COMPILER_STRIP_GATE(0x80504780, &lit_4552); #pragma pop /* 80502280-805025C4 0013E0 0344+00 1/1 0/0 0/0 .text e_nest_drop__FP12e_nest_class */ @@ -939,7 +945,7 @@ static asm void e_nest_carry(e_nest_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4611 = 3000.0f; -COMPILER_STRIP_GATE(80504784, &lit_4611); +COMPILER_STRIP_GATE(0x80504784, &lit_4611); #pragma pop /* 80502730-8050284C 001890 011C+00 1/1 0/0 0/0 .text water_check__FP12e_nest_class */ @@ -957,7 +963,7 @@ static asm void water_check(e_nest_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4683 = 3.0f; -COMPILER_STRIP_GATE(80504788, &lit_4683); +COMPILER_STRIP_GATE(0x80504788, &lit_4683); #pragma pop /* 8050284C-80502AD4 0019AC 0288+00 1/1 0/0 0/0 .text simple_bg_check__FP12e_nest_class @@ -976,28 +982,28 @@ static asm void simple_bg_check(e_nest_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4717 = 0.25f; -COMPILER_STRIP_GATE(8050478C, &lit_4717); +COMPILER_STRIP_GATE(0x8050478C, &lit_4717); #pragma pop /* 80504790-80504794 0000B4 0004+00 0/2 0/0 0/0 .rodata @4718 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4718 = 60.0f; -COMPILER_STRIP_GATE(80504790, &lit_4718); +COMPILER_STRIP_GATE(0x80504790, &lit_4718); #pragma pop /* 80504794-80504798 0000B8 0004+00 0/1 0/0 0/0 .rodata @4719 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4719 = 1.0f / 20.0f; -COMPILER_STRIP_GATE(80504794, &lit_4719); +COMPILER_STRIP_GATE(0x80504794, &lit_4719); #pragma pop /* 80504798-8050479C 0000BC 0004+00 0/1 0/0 0/0 .rodata @4720 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4720 = 0x3B83126F; -COMPILER_STRIP_GATE(80504798, &lit_4720); +COMPILER_STRIP_GATE(0x80504798, &lit_4720); #pragma pop /* 80502AD4-80502D30 001C34 025C+00 1/1 0/0 0/0 .text e_nest_float__FP12e_nest_class */ @@ -1015,14 +1021,14 @@ static asm void e_nest_float(e_nest_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4844 = -150.0f; -COMPILER_STRIP_GATE(8050479C, &lit_4844); +COMPILER_STRIP_GATE(0x8050479C, &lit_4844); #pragma pop /* 805047A0-805047A4 0000C4 0004+00 0/1 0/0 0/0 .rodata @4845 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4845 = 230.0f; -COMPILER_STRIP_GATE(805047A0, &lit_4845); +COMPILER_STRIP_GATE(0x805047A0, &lit_4845); #pragma pop /* 80502D30-80503120 001E90 03F0+00 1/1 0/0 0/0 .text e_nest_hahen__FP12e_nest_class */ @@ -1050,35 +1056,35 @@ static asm void e_nest_hook(e_nest_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5004 = -2.0f; -COMPILER_STRIP_GATE(805047A4, &lit_5004); +COMPILER_STRIP_GATE(0x805047A4, &lit_5004); #pragma pop /* 805047A8-805047AC 0000CC 0004+00 0/1 0/0 0/0 .rodata @5005 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5005 = 2.5f; -COMPILER_STRIP_GATE(805047A8, &lit_5005); +COMPILER_STRIP_GATE(0x805047A8, &lit_5005); #pragma pop /* 805047AC-805047B0 0000D0 0004+00 0/1 0/0 0/0 .rodata @5006 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5006 = -8.0f; -COMPILER_STRIP_GATE(805047AC, &lit_5006); +COMPILER_STRIP_GATE(0x805047AC, &lit_5006); #pragma pop /* 805047B0-805047B4 0000D4 0004+00 0/1 0/0 0/0 .rodata @5007 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5007 = 2500.0f; -COMPILER_STRIP_GATE(805047B0, &lit_5007); +COMPILER_STRIP_GATE(0x805047B0, &lit_5007); #pragma pop /* 805047B4-805047B8 0000D8 0004+00 0/2 0/0 0/0 .rodata @5008 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5008 = 7.0f / 10.0f; -COMPILER_STRIP_GATE(805047B4, &lit_5008); +COMPILER_STRIP_GATE(0x805047B4, &lit_5008); #pragma pop /* 805031CC-80503668 00232C 049C+00 1/1 0/0 0/0 .text bee_nest_action__FP12e_nest_class @@ -1107,42 +1113,42 @@ static asm void shot_b_sub(void* param_0, void* param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5110 = 55.0f; -COMPILER_STRIP_GATE(805047B8, &lit_5110); +COMPILER_STRIP_GATE(0x805047B8, &lit_5110); #pragma pop /* 805047BC-805047C0 0000E0 0004+00 0/1 0/0 0/0 .rodata @5111 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5111 = -1290.0f; -COMPILER_STRIP_GATE(805047BC, &lit_5111); +COMPILER_STRIP_GATE(0x805047BC, &lit_5111); #pragma pop /* 805047C0-805047C4 0000E4 0004+00 0/1 0/0 0/0 .rodata @5112 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5112 = 1342.0f; -COMPILER_STRIP_GATE(805047C0, &lit_5112); +COMPILER_STRIP_GATE(0x805047C0, &lit_5112); #pragma pop /* 805047C4-805047C8 0000E8 0004+00 0/1 0/0 0/0 .rodata @5113 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5113 = 1077.0f; -COMPILER_STRIP_GATE(805047C4, &lit_5113); +COMPILER_STRIP_GATE(0x805047C4, &lit_5113); #pragma pop /* 805047C8-805047CC 0000EC 0004+00 0/2 0/0 0/0 .rodata @5114 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5114 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(805047C8, &lit_5114); +COMPILER_STRIP_GATE(0x805047C8, &lit_5114); #pragma pop /* 805047CC-805047D0 0000F0 0004+00 0/1 0/0 0/0 .rodata @5115 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5115 = 3.0f / 20.0f; -COMPILER_STRIP_GATE(805047CC, &lit_5115); +COMPILER_STRIP_GATE(0x805047CC, &lit_5115); #pragma pop /* 805036E0-80503984 002840 02A4+00 1/1 0/0 0/0 .text demo_camera__FP12e_nest_class */ @@ -1160,21 +1166,21 @@ static asm void demo_camera(e_nest_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5202 = 10000.0f; -COMPILER_STRIP_GATE(805047D0, &lit_5202); +COMPILER_STRIP_GATE(0x805047D0, &lit_5202); #pragma pop /* 805047D4-805047D8 0000F8 0004+00 0/1 0/0 0/0 .rodata @5203 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5203 = 25.0f; -COMPILER_STRIP_GATE(805047D4, &lit_5203); +COMPILER_STRIP_GATE(0x805047D4, &lit_5203); #pragma pop /* 805047D8-805047DC 0000FC 0004+00 0/1 0/0 0/0 .rodata @5204 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5204 = 65536.0f; -COMPILER_STRIP_GATE(805047D8, &lit_5204); +COMPILER_STRIP_GATE(0x805047D8, &lit_5204); #pragma pop /* 80503984-80503E24 002AE4 04A0+00 1/0 0/0 0/0 .text daE_Nest_Execute__FP12e_nest_class @@ -1194,6 +1200,13 @@ static bool daE_Nest_IsDelete(e_nest_class* param_0) { return true; } +/* ############################################################################################## */ +/* 805047EC-805047EC 000110 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_805047F4 = "E_nest"; +#pragma pop + /* 80503E2C-80503EA0 002F8C 0074+00 1/0 0/0 0/0 .text daE_Nest_Delete__FP12e_nest_class */ #pragma push @@ -1220,14 +1233,14 @@ static asm void useHeapInit(fopAc_ac_c* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5399 = -300.0f; -COMPILER_STRIP_GATE(805047DC, &lit_5399); +COMPILER_STRIP_GATE(0x805047DC, &lit_5399); #pragma pop /* 805047E0-805047E4 000104 0004+00 0/1 0/0 0/0 .rodata @5400 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5400 = 300.0f; -COMPILER_STRIP_GATE(805047E0, &lit_5400); +COMPILER_STRIP_GATE(0x805047E0, &lit_5400); #pragma pop /* 805047E4-805047EC 000108 0008+00 0/1 0/0 0/0 .rodata @5402 */ @@ -1236,7 +1249,7 @@ COMPILER_STRIP_GATE(805047E0, &lit_5400); SECTION_RODATA static u8 const lit_5402[8] = { 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(805047E4, &lit_5402); +COMPILER_STRIP_GATE(0x805047E4, &lit_5402); #pragma pop /* 80503FCC-805044AC 00312C 04E0+00 1/0 0/0 0/0 .text daE_Nest_Create__FP10fopAc_ac_c */ @@ -1326,7 +1339,7 @@ asm void __sinit_d_a_e_nest_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_8050467C = (void*)__sinit_d_a_e_nest_cpp; +REGISTER_CTORS(0x8050467C, __sinit_d_a_e_nest_cpp); #pragma pop /* 805046B8-805046C0 003818 0008+00 1/0 0/0 0/0 .text @36@__dt__12dBgS_ObjAcchFv */ @@ -1349,10 +1362,4 @@ static asm void func_805046C0() { } #pragma pop -/* 805047EC-805047FB 000110 000F+00 5/5 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_805047EC = "F_SP103"; -SECTION_DEAD static char const* const stringBase_805047F4 = "E_nest"; -#pragma pop +/* 805047EC-805047EC 000110 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/e/d_a_e_nz/d_a_e_nz.cpp b/rel/d/a/e/d_a_e_nz/d_a_e_nz.cpp index d71b5193f10..66f3029d79b 100644 --- a/rel/d/a/e/d_a_e_nz/d_a_e_nz.cpp +++ b/rel/d/a/e/d_a_e_nz/d_a_e_nz.cpp @@ -34,16 +34,16 @@ struct mDoExt_invisibleModel { /* 8000E7C0 */ void entryDL(cXyz*); }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; - struct J3DAnmTransform {}; +struct J3DModelData {}; + +struct Z2Creature {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -96,10 +96,10 @@ struct dRes_control_c { struct dPa_levelEcallBack {}; -struct _GXColor {}; - struct csXyz {}; +struct _GXColor {}; + struct dPa_control_c { struct level_c { /* 8004B918 */ void getEmitter(u32); @@ -379,7 +379,7 @@ extern "C" void __register_global_object(); /* ############################################################################################## */ /* 8072C180-8072C184 000000 0004+00 8/8 0/0 0/0 .rodata @3789 */ SECTION_RODATA static f32 const lit_3789 = 100.0f; -COMPILER_STRIP_GATE(8072C180, &lit_3789); +COMPILER_STRIP_GATE(0x8072C180, &lit_3789); /* 8072C184-8072C188 000004 0004+00 2/9 0/0 0/0 .rodata @3790 */ SECTION_RODATA static u8 const lit_3790[4] = { @@ -388,7 +388,7 @@ SECTION_RODATA static u8 const lit_3790[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(8072C184, &lit_3790); +COMPILER_STRIP_GATE(0x8072C184, &lit_3790); /* 8072C188-8072C190 000008 0004+04 2/9 0/0 0/0 .rodata @3791 */ SECTION_RODATA static f32 const lit_3791[1 + 1 /* padding */] = { @@ -396,7 +396,7 @@ SECTION_RODATA static f32 const lit_3791[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(8072C188, &lit_3791); +COMPILER_STRIP_GATE(0x8072C188, &lit_3791); /* 8072C190-8072C198 000010 0008+00 0/2 0/0 0/0 .rodata @3792 */ #pragma push @@ -404,7 +404,7 @@ COMPILER_STRIP_GATE(8072C188, &lit_3791); SECTION_RODATA static u8 const lit_3792[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8072C190, &lit_3792); +COMPILER_STRIP_GATE(0x8072C190, &lit_3792); #pragma pop /* 8072C198-8072C1A0 000018 0008+00 0/2 0/0 0/0 .rodata @3793 */ @@ -413,7 +413,7 @@ COMPILER_STRIP_GATE(8072C190, &lit_3792); SECTION_RODATA static u8 const lit_3793[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8072C198, &lit_3793); +COMPILER_STRIP_GATE(0x8072C198, &lit_3793); #pragma pop /* 8072C1A0-8072C1A8 000020 0008+00 0/2 0/0 0/0 .rodata @3794 */ @@ -422,47 +422,47 @@ COMPILER_STRIP_GATE(8072C198, &lit_3793); SECTION_RODATA static u8 const lit_3794[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8072C1A0, &lit_3794); +COMPILER_STRIP_GATE(0x8072C1A0, &lit_3794); #pragma pop /* 8072C1A8-8072C1AC 000028 0004+00 0/1 0/0 0/0 .rodata @3795 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3795 = 1.0f / 100.0f; -COMPILER_STRIP_GATE(8072C1A8, &lit_3795); +COMPILER_STRIP_GATE(0x8072C1A8, &lit_3795); #pragma pop /* 8072C1AC-8072C1B0 00002C 0004+00 0/1 0/0 0/0 .rodata @3810 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3810 = 6.0f / 5.0f; -COMPILER_STRIP_GATE(8072C1AC, &lit_3810); +COMPILER_STRIP_GATE(0x8072C1AC, &lit_3810); #pragma pop /* 8072C1B0-8072C1B4 000030 0004+00 0/3 0/0 0/0 .rodata @3811 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3811 = 25.0f; -COMPILER_STRIP_GATE(8072C1B0, &lit_3811); +COMPILER_STRIP_GATE(0x8072C1B0, &lit_3811); #pragma pop /* 8072C1B4-8072C1B8 000034 0004+00 0/1 0/0 0/0 .rodata @3812 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3812 = 45.0f; -COMPILER_STRIP_GATE(8072C1B4, &lit_3812); +COMPILER_STRIP_GATE(0x8072C1B4, &lit_3812); #pragma pop /* 8072C1B8-8072C1BC 000038 0004+00 0/2 0/0 0/0 .rodata @3813 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3813 = 60.0f; -COMPILER_STRIP_GATE(8072C1B8, &lit_3813); +COMPILER_STRIP_GATE(0x8072C1B8, &lit_3813); #pragma pop /* 8072C1BC-8072C1C0 00003C 0004+00 1/4 0/0 0/0 .rodata @3814 */ SECTION_RODATA static f32 const lit_3814 = 30.0f; -COMPILER_STRIP_GATE(8072C1BC, &lit_3814); +COMPILER_STRIP_GATE(0x8072C1BC, &lit_3814); /* 8072C24C-8072C258 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { @@ -631,7 +631,13 @@ asm daE_NZ_HIO_c::daE_NZ_HIO_c() { /* ############################################################################################## */ /* 8072C1C0-8072C1C4 000040 0004+00 1/1 0/0 0/0 .rodata @3828 */ SECTION_RODATA static f32 const lit_3828 = -1.0f; -COMPILER_STRIP_GATE(8072C1C0, &lit_3828); +COMPILER_STRIP_GATE(0x8072C1C0, &lit_3828); + +/* 8072C240-8072C240 0000C0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8072C240 = "E_NZ"; +#pragma pop /* 80729A3C-80729AE8 00013C 00AC+00 4/4 0/0 0/0 .text anm_init__FP10e_nz_classifUcf */ #pragma push @@ -668,95 +674,95 @@ static asm void daE_NZ_Draw(e_nz_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3935 = 0.5f; -COMPILER_STRIP_GATE(8072C1C4, &lit_3935); +COMPILER_STRIP_GATE(0x8072C1C4, &lit_3935); #pragma pop /* 8072C1C8-8072C1CC 000048 0004+00 0/3 0/0 0/0 .rodata @3936 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3936 = 3.0f; -COMPILER_STRIP_GATE(8072C1C8, &lit_3936); +COMPILER_STRIP_GATE(0x8072C1C8, &lit_3936); #pragma pop /* 8072C1CC-8072C1D0 00004C 0004+00 1/2 0/0 0/0 .rodata @3937 */ SECTION_RODATA static f32 const lit_3937 = 65535.0f; -COMPILER_STRIP_GATE(8072C1CC, &lit_3937); +COMPILER_STRIP_GATE(0x8072C1CC, &lit_3937); /* 8072C1D0-8072C1D4 000050 0004+00 0/1 0/0 0/0 .rodata @3938 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3938 = 7.0f; -COMPILER_STRIP_GATE(8072C1D0, &lit_3938); +COMPILER_STRIP_GATE(0x8072C1D0, &lit_3938); #pragma pop /* 8072C1D4-8072C1D8 000054 0004+00 0/1 0/0 0/0 .rodata @3939 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3939 = 3000.0f; -COMPILER_STRIP_GATE(8072C1D4, &lit_3939); +COMPILER_STRIP_GATE(0x8072C1D4, &lit_3939); #pragma pop /* 8072C1D8-8072C1DC 000058 0004+00 0/1 0/0 0/0 .rodata @3940 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3940 = 20.0f; -COMPILER_STRIP_GATE(8072C1D8, &lit_3940); +COMPILER_STRIP_GATE(0x8072C1D8, &lit_3940); #pragma pop /* 8072C1DC-8072C1E0 00005C 0004+00 0/1 0/0 0/0 .rodata @3941 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3941 = 9.0f; -COMPILER_STRIP_GATE(8072C1DC, &lit_3941); +COMPILER_STRIP_GATE(0x8072C1DC, &lit_3941); #pragma pop /* 8072C1E0-8072C1E4 000060 0004+00 0/2 0/0 0/0 .rodata @3942 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3942 = 10.0f; -COMPILER_STRIP_GATE(8072C1E0, &lit_3942); +COMPILER_STRIP_GATE(0x8072C1E0, &lit_3942); #pragma pop /* 8072C1E4-8072C1E8 000064 0004+00 0/2 0/0 0/0 .rodata @3943 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3943 = 200.0f; -COMPILER_STRIP_GATE(8072C1E4, &lit_3943); +COMPILER_STRIP_GATE(0x8072C1E4, &lit_3943); #pragma pop /* 8072C1E8-8072C1EC 000068 0004+00 0/2 0/0 0/0 .rodata @3944 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3944 = 50.0f; -COMPILER_STRIP_GATE(8072C1E8, &lit_3944); +COMPILER_STRIP_GATE(0x8072C1E8, &lit_3944); #pragma pop /* 8072C1EC-8072C1F0 00006C 0004+00 0/1 0/0 0/0 .rodata @3945 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3945 = 500.0f; -COMPILER_STRIP_GATE(8072C1EC, &lit_3945); +COMPILER_STRIP_GATE(0x8072C1EC, &lit_3945); #pragma pop /* 8072C1F0-8072C1F4 000070 0004+00 0/1 0/0 0/0 .rodata @3946 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3946 = 700.0f; -COMPILER_STRIP_GATE(8072C1F0, &lit_3946); +COMPILER_STRIP_GATE(0x8072C1F0, &lit_3946); #pragma pop /* 8072C1F4-8072C1F8 000074 0004+00 0/2 0/0 0/0 .rodata @3947 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3947 = 400.0f; -COMPILER_STRIP_GATE(8072C1F4, &lit_3947); +COMPILER_STRIP_GATE(0x8072C1F4, &lit_3947); #pragma pop /* 8072C1F8-8072C1FC 000078 0004+00 0/1 0/0 0/0 .rodata @3948 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3948 = 0.25f; -COMPILER_STRIP_GATE(8072C1F8, &lit_3948); +COMPILER_STRIP_GATE(0x8072C1F8, &lit_3948); #pragma pop /* 8072C3E8-8072C3EC 000008 0001+03 1/1 0/0 0/0 .bss @1109 */ @@ -875,14 +881,14 @@ static asm void e_nz_normal(e_nz_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4088 = 5.0f; -COMPILER_STRIP_GATE(8072C1FC, &lit_4088); +COMPILER_STRIP_GATE(0x8072C1FC, &lit_4088); #pragma pop /* 8072C200-8072C204 000080 0004+00 0/2 0/0 0/0 .rodata @4089 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4089 = 2.0f; -COMPILER_STRIP_GATE(8072C200, &lit_4089); +COMPILER_STRIP_GATE(0x8072C200, &lit_4089); #pragma pop /* 8072A044-8072A680 000744 063C+00 1/1 0/0 0/0 .text e_nz_attack__FP10e_nz_class */ @@ -920,21 +926,21 @@ static asm void damage_check(e_nz_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4180 = 40.0f; -COMPILER_STRIP_GATE(8072C204, &lit_4180); +COMPILER_STRIP_GATE(0x8072C204, &lit_4180); #pragma pop /* 8072C208-8072C20C 000088 0004+00 0/1 0/0 0/0 .rodata @4181 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4181 = -30.0f; -COMPILER_STRIP_GATE(8072C208, &lit_4181); +COMPILER_STRIP_GATE(0x8072C208, &lit_4181); #pragma pop /* 8072C20C-8072C210 00008C 0004+00 0/1 0/0 0/0 .rodata @4182 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4182 = 15.0f; -COMPILER_STRIP_GATE(8072C20C, &lit_4182); +COMPILER_STRIP_GATE(0x8072C20C, &lit_4182); #pragma pop /* 8072A8CC-8072AA90 000FCC 01C4+00 1/1 0/0 0/0 .text e_nz_damage__FP10e_nz_class */ @@ -964,28 +970,28 @@ static asm void getPolyColor(cBgS_PolyInfo& param_0, int param_1, _GXColor* para #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4318 = -8.0f; -COMPILER_STRIP_GATE(8072C210, &lit_4318); +COMPILER_STRIP_GATE(0x8072C210, &lit_4318); #pragma pop /* 8072C214-8072C218 000094 0004+00 0/1 0/0 0/0 .rodata @4319 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4319 = -120.0f; -COMPILER_STRIP_GATE(8072C214, &lit_4319); +COMPILER_STRIP_GATE(0x8072C214, &lit_4319); #pragma pop /* 8072C218-8072C21C 000098 0004+00 0/1 0/0 0/0 .rodata @4320 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4320 = 5000.0f; -COMPILER_STRIP_GATE(8072C218, &lit_4320); +COMPILER_STRIP_GATE(0x8072C218, &lit_4320); #pragma pop /* 8072C21C-8072C220 00009C 0004+00 0/1 0/0 0/0 .rodata @4321 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4321 = 7.0f / 20.0f; -COMPILER_STRIP_GATE(8072C21C, &lit_4321); +COMPILER_STRIP_GATE(0x8072C21C, &lit_4321); #pragma pop /* 8072C458-8072C468 000078 000C+04 0/1 0/0 0/0 .bss @4220 */ @@ -1015,28 +1021,28 @@ static asm void action(e_nz_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4444 = 255.0f; -COMPILER_STRIP_GATE(8072C220, &lit_4444); +COMPILER_STRIP_GATE(0x8072C220, &lit_4444); #pragma pop /* 8072C224-8072C228 0000A4 0004+00 0/1 0/0 0/0 .rodata @4445 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4445 = 8.0f; -COMPILER_STRIP_GATE(8072C224, &lit_4445); +COMPILER_STRIP_GATE(0x8072C224, &lit_4445); #pragma pop /* 8072C228-8072C22C 0000A8 0004+00 0/1 0/0 0/0 .rodata @4446 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4446 = 10000.0f; -COMPILER_STRIP_GATE(8072C228, &lit_4446); +COMPILER_STRIP_GATE(0x8072C228, &lit_4446); #pragma pop /* 8072C22C-8072C230 0000AC 0004+00 0/1 0/0 0/0 .rodata @4447 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4447 = 300.0f; -COMPILER_STRIP_GATE(8072C22C, &lit_4447); +COMPILER_STRIP_GATE(0x8072C22C, &lit_4447); #pragma pop /* 8072C230-8072C238 0000B0 0004+04 0/1 0/0 0/0 .rodata @4448 */ @@ -1047,7 +1053,7 @@ SECTION_RODATA static f32 const lit_4448[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(8072C230, &lit_4448); +COMPILER_STRIP_GATE(0x8072C230, &lit_4448); #pragma pop /* 8072C238-8072C240 0000B8 0008+00 0/1 0/0 0/0 .rodata @4450 */ @@ -1056,7 +1062,7 @@ COMPILER_STRIP_GATE(8072C230, &lit_4448); SECTION_RODATA static u8 const lit_4450[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8072C238, &lit_4450); +COMPILER_STRIP_GATE(0x8072C238, &lit_4450); #pragma pop /* 8072B09C-8072B5D4 00179C 0538+00 2/1 0/0 0/0 .text daE_NZ_Execute__FP10e_nz_class */ @@ -1094,6 +1100,13 @@ static asm void useHeapInit(fopAc_ac_c* param_0) { } #pragma pop +/* ############################################################################################## */ +/* 8072C240-8072C240 0000C0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8072C245 = "E_nz"; +#pragma pop + /* 8072B7C4-8072BA74 001EC4 02B0+00 1/0 0/0 0/0 .text daE_NZ_Create__FP10fopAc_ac_c */ #pragma push #pragma optimization_level 0 @@ -1186,7 +1199,7 @@ asm void __sinit_d_a_e_nz_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_8072BCD0 = (void*)__sinit_d_a_e_nz_cpp; +REGISTER_CTORS(0x8072BCD0, __sinit_d_a_e_nz_cpp); #pragma pop /* 8072BD0C-8072BD14 00240C 0008+00 1/0 0/0 0/0 .text @36@__dt__12dBgS_ObjAcchFv */ @@ -1403,10 +1416,4 @@ static u8 data_8072C4D0[4]; static u8 data_8072C4D4[4]; #pragma pop -/* 8072C240-8072C24A 0000C0 000A+00 4/4 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_8072C240 = "E_NZ"; -SECTION_DEAD static char const* const stringBase_8072C245 = "E_nz"; -#pragma pop +/* 8072C240-8072C240 0000C0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/e/d_a_e_oc/d_a_e_oc.cpp b/rel/d/a/e/d_a_e_oc/d_a_e_oc.cpp index 0a8c2900e61..8c4bf0866b5 100644 --- a/rel/d/a/e/d_a_e_oc/d_a_e_oc.cpp +++ b/rel/d/a/e/d_a_e_oc/d_a_e_oc.cpp @@ -31,16 +31,16 @@ struct mDoMtx_stack_c { static u8 now[48]; }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; - struct J3DAnmTransform {}; +struct J3DModelData {}; + +struct Z2Creature {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -61,10 +61,10 @@ struct daPy_py_c { static u8 m_midnaActor[4]; }; -struct J3DJoint {}; - struct J3DModel {}; +struct J3DJoint {}; + struct daE_OC_c { /* 8072C630 */ void ctrlJoint(J3DJoint*, J3DModel*); /* 8072C6E8 */ void JointCallBack(J3DJoint*, int); @@ -606,7 +606,7 @@ extern "C" void __register_global_object(); /* ############################################################################################## */ /* 80735B28-80735B2C 000000 0004+00 36/36 0/0 0/0 .rodata @3911 */ SECTION_RODATA static f32 const lit_3911 = 100.0f; -COMPILER_STRIP_GATE(80735B28, &lit_3911); +COMPILER_STRIP_GATE(0x80735B28, &lit_3911); /* 80735B2C-80735B30 000004 0004+00 3/31 0/0 0/0 .rodata @3912 */ SECTION_RODATA static u8 const lit_3912[4] = { @@ -615,7 +615,7 @@ SECTION_RODATA static u8 const lit_3912[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80735B2C, &lit_3912); +COMPILER_STRIP_GATE(0x80735B2C, &lit_3912); /* 80735B30-80735B38 000008 0004+04 3/24 0/0 0/0 .rodata @3913 */ SECTION_RODATA static f32 const lit_3913[1 + 1 /* padding */] = { @@ -623,7 +623,7 @@ SECTION_RODATA static f32 const lit_3913[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80735B30, &lit_3913); +COMPILER_STRIP_GATE(0x80735B30, &lit_3913); /* 80735B38-80735B40 000010 0008+00 0/9 0/0 0/0 .rodata @3914 */ #pragma push @@ -631,7 +631,7 @@ COMPILER_STRIP_GATE(80735B30, &lit_3913); SECTION_RODATA static u8 const lit_3914[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80735B38, &lit_3914); +COMPILER_STRIP_GATE(0x80735B38, &lit_3914); #pragma pop /* 80735B40-80735B48 000018 0008+00 0/9 0/0 0/0 .rodata @3915 */ @@ -640,7 +640,7 @@ COMPILER_STRIP_GATE(80735B38, &lit_3914); SECTION_RODATA static u8 const lit_3915[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80735B40, &lit_3915); +COMPILER_STRIP_GATE(0x80735B40, &lit_3915); #pragma pop /* 80735B48-80735B50 000020 0008+00 0/9 0/0 0/0 .rodata @3916 */ @@ -649,14 +649,14 @@ COMPILER_STRIP_GATE(80735B40, &lit_3915); SECTION_RODATA static u8 const lit_3916[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80735B48, &lit_3916); +COMPILER_STRIP_GATE(0x80735B48, &lit_3916); #pragma pop /* 80735B50-80735B54 000028 0004+00 0/1 0/0 0/0 .rodata @3917 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3917 = 1.0f / 100.0f; -COMPILER_STRIP_GATE(80735B50, &lit_3917); +COMPILER_STRIP_GATE(0x80735B50, &lit_3917); #pragma pop /* 80735B54-80735B7C 00002C 0028+00 0/1 0/0 0/0 .rodata oc_attackb_trans__6E_OC_n */ @@ -667,7 +667,7 @@ SECTION_RODATA u8 const E_OC_n::oc_attackb_trans[40] = { 0x00, 0x00, 0x41, 0x74, 0xCC, 0xCD, 0x42, 0x19, 0x99, 0x9A, 0x42, 0x7D, 0x33, 0x33, 0x42, 0xAC, 0x66, 0x66, 0x42, 0xCE, 0x99, 0x9A, 0x42, 0xE0, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80735B54, &E_OC_n::oc_attackb_trans); +COMPILER_STRIP_GATE(0x80735B54, &E_OC_n::oc_attackb_trans); #pragma pop /* 80735B7C-80735BA4 000054 0028+00 0/1 0/0 0/0 .rodata oc_attackc_trans__6E_OC_n */ @@ -678,56 +678,56 @@ SECTION_RODATA u8 const E_OC_n::oc_attackc_trans[40] = { 0x00, 0x00, 0x42, 0xB7, 0x00, 0x00, 0x42, 0xB7, 0x00, 0x00, 0x42, 0xB7, 0x00, 0x00, 0x42, 0xB7, 0x00, 0x00, 0x42, 0xB7, 0x00, 0x00, 0x42, 0xB7, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80735B7C, &E_OC_n::oc_attackc_trans); +COMPILER_STRIP_GATE(0x80735B7C, &E_OC_n::oc_attackc_trans); #pragma pop /* 80735BA4-80735BA8 00007C 0004+00 0/1 0/0 0/0 .rodata @3932 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3932 = 1.5f; -COMPILER_STRIP_GATE(80735BA4, &lit_3932); +COMPILER_STRIP_GATE(0x80735BA4, &lit_3932); #pragma pop /* 80735BA8-80735BAC 000080 0004+00 0/1 0/0 0/0 .rodata @3933 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3933 = 1200.0f; -COMPILER_STRIP_GATE(80735BA8, &lit_3933); +COMPILER_STRIP_GATE(0x80735BA8, &lit_3933); #pragma pop /* 80735BAC-80735BB0 000084 0004+00 0/1 0/0 0/0 .rodata @3934 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3934 = 5000.0f; -COMPILER_STRIP_GATE(80735BAC, &lit_3934); +COMPILER_STRIP_GATE(0x80735BAC, &lit_3934); #pragma pop /* 80735BB0-80735BB4 000088 0004+00 0/5 0/0 0/0 .rodata @3935 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3935 = 400.0f; -COMPILER_STRIP_GATE(80735BB0, &lit_3935); +COMPILER_STRIP_GATE(0x80735BB0, &lit_3935); #pragma pop /* 80735BB4-80735BB8 00008C 0004+00 0/1 0/0 0/0 .rodata @3936 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3936 = 2000.0f; -COMPILER_STRIP_GATE(80735BB4, &lit_3936); +COMPILER_STRIP_GATE(0x80735BB4, &lit_3936); #pragma pop /* 80735BB8-80735BBC 000090 0004+00 0/1 0/0 0/0 .rodata @3937 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3937 = 1400.0f; -COMPILER_STRIP_GATE(80735BB8, &lit_3937); +COMPILER_STRIP_GATE(0x80735BB8, &lit_3937); #pragma pop /* 80735BBC-80735BC0 000094 0004+00 0/3 0/0 0/0 .rodata @3938 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3938 = 70.0f; -COMPILER_STRIP_GATE(80735BBC, &lit_3938); +COMPILER_STRIP_GATE(0x80735BBC, &lit_3938); #pragma pop /* 80735D2C-80735D38 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ @@ -1011,7 +1011,7 @@ asm void daE_OC_c::JointCallBack(J3DJoint* param_0, int param_1) { /* ############################################################################################## */ /* 80735BC0-80735BC4 000098 0004+00 1/2 0/0 0/0 .rodata @4030 */ SECTION_RODATA static f32 const lit_4030 = 1000.0f; -COMPILER_STRIP_GATE(80735BC0, &lit_4030); +COMPILER_STRIP_GATE(0x80735BC0, &lit_4030); /* 8072C734-8072C918 000254 01E4+00 1/1 0/0 0/0 .text draw__8daE_OC_cFv */ #pragma push @@ -1038,7 +1038,7 @@ static asm void daE_OC_Draw(daE_OC_c* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4119 = 200.0f; -COMPILER_STRIP_GATE(80735BC4, &lit_4119); +COMPILER_STRIP_GATE(0x80735BC4, &lit_4119); #pragma pop /* 80736000-80736004 000008 0001+03 3/3 0/0 0/0 .bss @1109 */ @@ -1210,7 +1210,7 @@ asm void daE_OC_c::setWatchMode() { /* ############################################################################################## */ /* 80735BC8-80735BCC 0000A0 0004+00 1/1 0/0 0/0 .rodata @4206 */ SECTION_RODATA static f32 const lit_4206 = 12.0f; -COMPILER_STRIP_GATE(80735BC8, &lit_4206); +COMPILER_STRIP_GATE(0x80735BC8, &lit_4206); /* 8072CE00-8072CF00 000920 0100+00 1/1 0/0 0/0 .text searchPlayer__8daE_OC_cFv */ #pragma push @@ -1276,7 +1276,7 @@ static asm void s_demo_oc(void* param_0, void* param_1) { /* ############################################################################################## */ /* 80735BCC-80735BD0 0000A4 0004+00 1/7 0/0 0/0 .rodata @4463 */ SECTION_RODATA static f32 const lit_4463 = 300.0f; -COMPILER_STRIP_GATE(80735BCC, &lit_4463); +COMPILER_STRIP_GATE(0x80735BCC, &lit_4463); /* 8072D364-8072D5F8 000E84 0294+00 1/1 0/0 0/0 .text checkBeforeBg__8daE_OC_cFv */ #pragma push @@ -1313,7 +1313,7 @@ asm void daE_OC_c::checkBeforeBgFind() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4555 = -1000000000.0f; -COMPILER_STRIP_GATE(80735BD0, &lit_4555); +COMPILER_STRIP_GATE(0x80735BD0, &lit_4555); #pragma pop /* 8072D87C-8072D994 00139C 0118+00 2/2 0/0 0/0 .text checkBeforeFloorBg__8daE_OC_cFf */ @@ -1331,14 +1331,14 @@ asm void daE_OC_c::checkBeforeFloorBg(f32 param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4587 = 50.0f; -COMPILER_STRIP_GATE(80735BD4, &lit_4587); +COMPILER_STRIP_GATE(0x80735BD4, &lit_4587); #pragma pop /* 80735BD8-80735BDC 0000B0 0004+00 0/2 0/0 0/0 .rodata @4588 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4588 = -200.0f; -COMPILER_STRIP_GATE(80735BD8, &lit_4588); +COMPILER_STRIP_GATE(0x80735BD8, &lit_4588); #pragma pop /* 8072D994-8072DB10 0014B4 017C+00 1/1 0/0 0/0 .text checkDamageBg__8daE_OC_cFv */ @@ -1356,7 +1356,7 @@ asm void daE_OC_c::checkDamageBg() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4644 = 80.0f; -COMPILER_STRIP_GATE(80735BDC, &lit_4644); +COMPILER_STRIP_GATE(0x80735BDC, &lit_4644); #pragma pop /* 8072DB10-8072DCBC 001630 01AC+00 1/1 0/0 0/0 .text setGroundAngle__8daE_OC_cFv */ @@ -1402,7 +1402,13 @@ asm void daE_OC_c::offTgSph() { /* ############################################################################################## */ /* 80735BE0-80735BE4 0000B8 0004+00 1/2 0/0 0/0 .rodata @4855 */ SECTION_RODATA static f32 const lit_4855 = 0.5f; -COMPILER_STRIP_GATE(80735BE0, &lit_4855); +COMPILER_STRIP_GATE(0x80735BE0, &lit_4855); + +/* 80735D0C-80735D0C 0001E4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80735D0C = "E_OC"; +#pragma pop /* 8072DDF4-8072E274 001914 0480+00 1/1 0/0 0/0 .text damage_check__8daE_OC_cFv */ #pragma push @@ -1417,7 +1423,13 @@ asm void daE_OC_c::damage_check() { /* ############################################################################################## */ /* 80735BE4-80735BE8 0000BC 0004+00 1/3 0/0 0/0 .rodata @4862 */ SECTION_RODATA static f32 const lit_4862 = -1.0f; -COMPILER_STRIP_GATE(80735BE4, &lit_4862); +COMPILER_STRIP_GATE(0x80735BE4, &lit_4862); + +/* 80735D0C-80735D0C 0001E4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80735D11 = "E_ocb"; +#pragma pop /* 8072E274-8072E31C 001D94 00A8+00 17/17 0/0 0/0 .text setBck__8daE_OC_cFiUcff */ #pragma push @@ -1462,7 +1474,7 @@ asm void daE_OC_c::getHeadAngle() { /* ############################################################################################## */ /* 80735BE8-80735BEC 0000C0 0004+00 1/1 0/0 0/0 .rodata @4962 */ SECTION_RODATA static f32 const lit_4962 = -10.0f; -COMPILER_STRIP_GATE(80735BE8, &lit_4962); +COMPILER_STRIP_GATE(0x80735BE8, &lit_4962); /* 8072E498-8072E528 001FB8 0090+00 1/1 0/0 0/0 .text setStabPos__8daE_OC_cFv */ #pragma push @@ -1487,11 +1499,11 @@ asm void daE_OC_c::setWaitSound() { /* ############################################################################################## */ /* 80735BEC-80735BF0 0000C4 0004+00 1/2 0/0 0/0 .rodata @4991 */ SECTION_RODATA static f32 const lit_4991 = 14.0f; -COMPILER_STRIP_GATE(80735BEC, &lit_4991); +COMPILER_STRIP_GATE(0x80735BEC, &lit_4991); /* 80735BF0-80735BF4 0000C8 0004+00 1/6 0/0 0/0 .rodata @4992 */ SECTION_RODATA static f32 const lit_4992 = 30.0f; -COMPILER_STRIP_GATE(80735BF0, &lit_4992); +COMPILER_STRIP_GATE(0x80735BF0, &lit_4992); /* 8072E5A4-8072E670 0020C4 00CC+00 1/1 0/0 0/0 .text setWalkSound__8daE_OC_cFv */ #pragma push @@ -1508,7 +1520,7 @@ asm void daE_OC_c::setWalkSound() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5016 = 9.0f; -COMPILER_STRIP_GATE(80735BF4, &lit_5016); +COMPILER_STRIP_GATE(0x80735BF4, &lit_5016); #pragma pop /* 8072E670-8072E788 002190 0118+00 1/1 0/0 0/0 .text setWalkStSound__8daE_OC_cFv */ @@ -1526,7 +1538,7 @@ asm void daE_OC_c::setWalkStSound() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5047 = 8.5f; -COMPILER_STRIP_GATE(80735BF8, &lit_5047); +COMPILER_STRIP_GATE(0x80735BF8, &lit_5047); #pragma pop /* 8072E788-8072E910 0022A8 0188+00 1/1 0/0 0/0 .text setDashSound__8daE_OC_cFv */ @@ -1544,28 +1556,28 @@ asm void daE_OC_c::setDashSound() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5075 = 6.5f; -COMPILER_STRIP_GATE(80735BFC, &lit_5075); +COMPILER_STRIP_GATE(0x80735BFC, &lit_5075); #pragma pop /* 80735C00-80735C04 0000D8 0004+00 0/6 0/0 0/0 .rodata @5076 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5076 = 20.0f; -COMPILER_STRIP_GATE(80735C00, &lit_5076); +COMPILER_STRIP_GATE(0x80735C00, &lit_5076); #pragma pop /* 80735C04-80735C08 0000DC 0004+00 0/1 0/0 0/0 .rodata @5077 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5077 = 13.0f; -COMPILER_STRIP_GATE(80735C04, &lit_5077); +COMPILER_STRIP_GATE(0x80735C04, &lit_5077); #pragma pop /* 80735C08-80735C0C 0000E0 0004+00 0/2 0/0 0/0 .rodata @5078 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5078 = 28.5f; -COMPILER_STRIP_GATE(80735C08, &lit_5078); +COMPILER_STRIP_GATE(0x80735C08, &lit_5078); #pragma pop /* 8072E910-8072EA58 002430 0148+00 1/1 0/0 0/0 .text setWaitStSound__8daE_OC_cFv */ @@ -1593,21 +1605,21 @@ asm void daE_OC_c::setFootNoteSound() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5214 = 5.0f; -COMPILER_STRIP_GATE(80735C0C, &lit_5214); +COMPILER_STRIP_GATE(0x80735C0C, &lit_5214); #pragma pop /* 80735C10-80735C14 0000E8 0004+00 0/2 0/0 0/0 .rodata @5215 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5215 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(80735C10, &lit_5215); +COMPILER_STRIP_GATE(0x80735C10, &lit_5215); #pragma pop /* 80735C14-80735C18 0000EC 0004+00 0/6 0/0 0/0 .rodata @5216 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5216 = 10.0f; -COMPILER_STRIP_GATE(80735C14, &lit_5216); +COMPILER_STRIP_GATE(0x80735C14, &lit_5216); #pragma pop /* 8072EAA4-8072F1A8 0025C4 0704+00 1/1 0/0 0/0 .text executeWait__8daE_OC_cFv */ @@ -1625,28 +1637,28 @@ asm void daE_OC_c::executeWait() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5299 = 150.0f; -COMPILER_STRIP_GATE(80735C18, &lit_5299); +COMPILER_STRIP_GATE(0x80735C18, &lit_5299); #pragma pop /* 80735C1C-80735C20 0000F4 0004+00 0/6 0/0 0/0 .rodata @5300 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5300 = 500.0f; -COMPILER_STRIP_GATE(80735C1C, &lit_5300); +COMPILER_STRIP_GATE(0x80735C1C, &lit_5300); #pragma pop /* 80735C20-80735C24 0000F8 0004+00 0/1 0/0 0/0 .rodata @5301 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5301 = 32768.0f; -COMPILER_STRIP_GATE(80735C20, &lit_5301); +COMPILER_STRIP_GATE(0x80735C20, &lit_5301); #pragma pop /* 80735C24-80735C28 0000FC 0004+00 0/1 0/0 0/0 .rodata @5302 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5302 = 4.0f; -COMPILER_STRIP_GATE(80735C24, &lit_5302); +COMPILER_STRIP_GATE(0x80735C24, &lit_5302); #pragma pop /* 8072F1A8-8072F5E0 002CC8 0438+00 1/1 0/0 0/0 .text executeWalk__8daE_OC_cFv */ @@ -1664,14 +1676,14 @@ asm void daE_OC_c::executeWalk() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5352 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(80735C28, &lit_5352); +COMPILER_STRIP_GATE(0x80735C28, &lit_5352); #pragma pop /* 80735C2C-80735C30 000104 0004+00 0/1 0/0 0/0 .rodata @5353 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5353 = 3.0f / 5.0f; -COMPILER_STRIP_GATE(80735C2C, &lit_5353); +COMPILER_STRIP_GATE(0x80735C2C, &lit_5353); #pragma pop /* 8072F5E0-8072F914 003100 0334+00 1/1 0/0 0/0 .text executeTalk__8daE_OC_cFv */ @@ -1689,28 +1701,34 @@ asm void daE_OC_c::executeTalk() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5553 = 13.0f / 10.0f; -COMPILER_STRIP_GATE(80735C30, &lit_5553); +COMPILER_STRIP_GATE(0x80735C30, &lit_5553); #pragma pop /* 80735C34-80735C38 00010C 0004+00 0/2 0/0 0/0 .rodata @5554 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5554 = 6.0f / 5.0f; -COMPILER_STRIP_GATE(80735C34, &lit_5554); +COMPILER_STRIP_GATE(0x80735C34, &lit_5554); #pragma pop /* 80735C38-80735C3C 000110 0004+00 0/1 0/0 0/0 .rodata @5555 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5555 = -3.0f; -COMPILER_STRIP_GATE(80735C38, &lit_5555); +COMPILER_STRIP_GATE(0x80735C38, &lit_5555); #pragma pop /* 80735C3C-80735C40 000114 0004+00 0/3 0/0 0/0 .rodata @5556 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5556 = -15.0f; -COMPILER_STRIP_GATE(80735C3C, &lit_5556); +COMPILER_STRIP_GATE(0x80735C3C, &lit_5556); +#pragma pop + +/* 80735D0C-80735D0C 0001E4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80735D17 = "D_MN05"; #pragma pop /* 8072F914-807302E8 003434 09D4+00 1/1 0/0 0/0 .text executeFind__8daE_OC_cFv */ @@ -1728,7 +1746,7 @@ asm void daE_OC_c::executeFind() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5645 = 45.0f; -COMPILER_STRIP_GATE(80735C40, &lit_5645); +COMPILER_STRIP_GATE(0x80735C40, &lit_5645); #pragma pop /* 807302E8-807305C0 003E08 02D8+00 1/1 0/0 0/0 .text setWeaponGroundAngle__8daE_OC_cFv @@ -1747,35 +1765,35 @@ asm void daE_OC_c::setWeaponGroundAngle() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5849 = 12.5f; -COMPILER_STRIP_GATE(80735C44, &lit_5849); +COMPILER_STRIP_GATE(0x80735C44, &lit_5849); #pragma pop /* 80735C48-80735C4C 000120 0004+00 0/1 0/0 0/0 .rodata @5850 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5850 = 19.0f; -COMPILER_STRIP_GATE(80735C48, &lit_5850); +COMPILER_STRIP_GATE(0x80735C48, &lit_5850); #pragma pop /* 80735C4C-80735C50 000124 0004+00 0/1 0/0 0/0 .rodata @5851 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5851 = 7.0f; -COMPILER_STRIP_GATE(80735C4C, &lit_5851); +COMPILER_STRIP_GATE(0x80735C4C, &lit_5851); #pragma pop /* 80735C50-80735C54 000128 0004+00 0/1 0/0 0/0 .rodata @5852 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5852 = 11.5f; -COMPILER_STRIP_GATE(80735C50, &lit_5852); +COMPILER_STRIP_GATE(0x80735C50, &lit_5852); #pragma pop /* 80735C54-80735C58 00012C 0004+00 0/1 0/0 0/0 .rodata @5853 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5853 = 22.0f; -COMPILER_STRIP_GATE(80735C54, &lit_5853); +COMPILER_STRIP_GATE(0x80735C54, &lit_5853); #pragma pop /* 807305C0-80730DC0 0040E0 0800+00 1/1 0/0 0/0 .text executeAttack__8daE_OC_cFv */ @@ -1803,35 +1821,35 @@ asm void daE_OC_c::executeDamage() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5921 = -20.0f; -COMPILER_STRIP_GATE(80735C58, &lit_5921); +COMPILER_STRIP_GATE(0x80735C58, &lit_5921); #pragma pop /* 80735C5C-80735C60 000134 0004+00 0/1 0/0 0/0 .rodata @5922 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5922 = 3.0f; -COMPILER_STRIP_GATE(80735C5C, &lit_5922); +COMPILER_STRIP_GATE(0x80735C5C, &lit_5922); #pragma pop /* 80735C60-80735C64 000138 0004+00 0/4 0/0 0/0 .rodata @5923 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5923 = 2.0f; -COMPILER_STRIP_GATE(80735C60, &lit_5923); +COMPILER_STRIP_GATE(0x80735C60, &lit_5923); #pragma pop /* 80735C64-80735C68 00013C 0004+00 0/1 0/0 0/0 .rodata @6039 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6039 = 40.0f; -COMPILER_STRIP_GATE(80735C64, &lit_6039); +COMPILER_STRIP_GATE(0x80735C64, &lit_6039); #pragma pop /* 80735C68-80735C6C 000140 0004+00 0/2 0/0 0/0 .rodata @6040 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6040 = 15.0f; -COMPILER_STRIP_GATE(80735C68, &lit_6040); +COMPILER_STRIP_GATE(0x80735C68, &lit_6040); #pragma pop /* 80731124-807316F8 004C44 05D4+00 1/1 0/0 0/0 .text executeBigDamage__8daE_OC_cFv */ @@ -1849,7 +1867,7 @@ asm void daE_OC_c::executeBigDamage() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6089 = 35.0f; -COMPILER_STRIP_GATE(80735C6C, &lit_6089); +COMPILER_STRIP_GATE(0x80735C6C, &lit_6089); #pragma pop /* 807316F8-807319E4 005218 02EC+00 1/1 0/0 0/0 .text executeWatch__8daE_OC_cFv */ @@ -1867,7 +1885,7 @@ asm void daE_OC_c::executeWatch() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6147 = 60.0f; -COMPILER_STRIP_GATE(80735C70, &lit_6147); +COMPILER_STRIP_GATE(0x80735C70, &lit_6147); #pragma pop /* 807319E4-80731D18 005504 0334+00 1/1 0/0 0/0 .text executeSoundWatch__8daE_OC_cFv */ @@ -1895,7 +1913,7 @@ asm void daE_OC_c::checkBeforeDeath() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6198 = 2.0f / 5.0f; -COMPILER_STRIP_GATE(80735C74, &lit_6198); +COMPILER_STRIP_GATE(0x80735C74, &lit_6198); #pragma pop /* 80731D4C-80731F5C 00586C 0210+00 1/1 0/0 0/0 .text executeDeath__8daE_OC_cFv */ @@ -1936,28 +1954,28 @@ asm void daE_OC_c::setWaterEffect() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6299 = 140.0f; -COMPILER_STRIP_GATE(80735C78, &lit_6299); +COMPILER_STRIP_GATE(0x80735C78, &lit_6299); #pragma pop /* 80735C7C-80735C80 000154 0004+00 0/1 0/0 0/0 .rodata @6300 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6300 = 24.0f; -COMPILER_STRIP_GATE(80735C7C, &lit_6300); +COMPILER_STRIP_GATE(0x80735C7C, &lit_6300); #pragma pop /* 80735C80-80735C84 000158 0004+00 0/1 0/0 0/0 .rodata @6301 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6301 = 37.0f; -COMPILER_STRIP_GATE(80735C80, &lit_6301); +COMPILER_STRIP_GATE(0x80735C80, &lit_6301); #pragma pop /* 80735C84-80735C88 00015C 0004+00 0/1 0/0 0/0 .rodata @6302 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6302 = 49.0f; -COMPILER_STRIP_GATE(80735C84, &lit_6302); +COMPILER_STRIP_GATE(0x80735C84, &lit_6302); #pragma pop /* 80732074-807323A4 005B94 0330+00 1/1 0/0 0/0 .text executeWaterDeath__8daE_OC_cFv */ @@ -1975,91 +1993,91 @@ asm void daE_OC_c::executeWaterDeath() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6488 = -4264.0f; -COMPILER_STRIP_GATE(80735C88, &lit_6488); +COMPILER_STRIP_GATE(0x80735C88, &lit_6488); #pragma pop /* 80735C8C-80735C90 000164 0004+00 0/2 0/0 0/0 .rodata @6489 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6489 = 302.0f; -COMPILER_STRIP_GATE(80735C8C, &lit_6489); +COMPILER_STRIP_GATE(0x80735C8C, &lit_6489); #pragma pop /* 80735C90-80735C94 000168 0004+00 0/2 0/0 0/0 .rodata @6490 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6490 = -2330.0f; -COMPILER_STRIP_GATE(80735C90, &lit_6490); +COMPILER_STRIP_GATE(0x80735C90, &lit_6490); #pragma pop /* 80735C94-80735C98 00016C 0004+00 0/1 0/0 0/0 .rodata @6491 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6491 = 16200.0f; -COMPILER_STRIP_GATE(80735C94, &lit_6491); +COMPILER_STRIP_GATE(0x80735C94, &lit_6491); #pragma pop /* 80735C98-80735C9C 000170 0004+00 0/1 0/0 0/0 .rodata @6492 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6492 = 2850.0f; -COMPILER_STRIP_GATE(80735C98, &lit_6492); +COMPILER_STRIP_GATE(0x80735C98, &lit_6492); #pragma pop /* 80735C9C-80735CA0 000174 0004+00 0/1 0/0 0/0 .rodata @6493 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6493 = 7000.0f; -COMPILER_STRIP_GATE(80735C9C, &lit_6493); +COMPILER_STRIP_GATE(0x80735C9C, &lit_6493); #pragma pop /* 80735CA0-80735CA4 000178 0004+00 0/1 0/0 0/0 .rodata @6494 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6494 = 16300.0f; -COMPILER_STRIP_GATE(80735CA0, &lit_6494); +COMPILER_STRIP_GATE(0x80735CA0, &lit_6494); #pragma pop /* 80735CA4-80735CA8 00017C 0004+00 0/1 0/0 0/0 .rodata @6495 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6495 = 3700.0f; -COMPILER_STRIP_GATE(80735CA4, &lit_6495); +COMPILER_STRIP_GATE(0x80735CA4, &lit_6495); #pragma pop /* 80735CA8-80735CAC 000180 0004+00 0/1 0/0 0/0 .rodata @6496 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6496 = 8400.0f; -COMPILER_STRIP_GATE(80735CA8, &lit_6496); +COMPILER_STRIP_GATE(0x80735CA8, &lit_6496); #pragma pop /* 80735CAC-80735CB0 000184 0004+00 0/1 0/0 0/0 .rodata @6497 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6497 = 16325.0f; -COMPILER_STRIP_GATE(80735CAC, &lit_6497); +COMPILER_STRIP_GATE(0x80735CAC, &lit_6497); #pragma pop /* 80735CB0-80735CB4 000188 0004+00 0/1 0/0 0/0 .rodata @6498 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6498 = 2858.0f; -COMPILER_STRIP_GATE(80735CB0, &lit_6498); +COMPILER_STRIP_GATE(0x80735CB0, &lit_6498); #pragma pop /* 80735CB4-80735CB8 00018C 0004+00 0/1 0/0 0/0 .rodata @6499 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6499 = 6597.0f; -COMPILER_STRIP_GATE(80735CB4, &lit_6499); +COMPILER_STRIP_GATE(0x80735CB4, &lit_6499); #pragma pop /* 80735CB8-80735CBC 000190 0004+00 0/2 0/0 0/0 .rodata @6500 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6500 = 55.0f; -COMPILER_STRIP_GATE(80735CB8, &lit_6500); +COMPILER_STRIP_GATE(0x80735CB8, &lit_6500); #pragma pop /* 807323A4-80732B04 005EC4 0760+00 2/1 0/0 0/0 .text executeDemoMaster__8daE_OC_cFv */ @@ -2242,77 +2260,77 @@ static asm void useHeapInit(fopAc_ac_c* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6501 = 16450.0f; -COMPILER_STRIP_GATE(80735CBC, &lit_6501); +COMPILER_STRIP_GATE(0x80735CBC, &lit_6501); #pragma pop /* 80735CC0-80735CC4 000198 0004+00 0/0 0/0 0/0 .rodata @6502 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6502 = 3050.0f; -COMPILER_STRIP_GATE(80735CC0, &lit_6502); +COMPILER_STRIP_GATE(0x80735CC0, &lit_6502); #pragma pop /* 80735CC4-80735CC8 00019C 0004+00 0/0 0/0 0/0 .rodata @6503 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6503 = 8250.0f; -COMPILER_STRIP_GATE(80735CC4, &lit_6503); +COMPILER_STRIP_GATE(0x80735CC4, &lit_6503); #pragma pop /* 80735CC8-80735CCC 0001A0 0004+00 0/0 0/0 0/0 .rodata @6504 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6504 = 16310.0f; -COMPILER_STRIP_GATE(80735CC8, &lit_6504); +COMPILER_STRIP_GATE(0x80735CC8, &lit_6504); #pragma pop /* 80735CCC-80735CD0 0001A4 0004+00 0/0 0/0 0/0 .rodata @6505 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6505 = 2970.0f; -COMPILER_STRIP_GATE(80735CCC, &lit_6505); +COMPILER_STRIP_GATE(0x80735CCC, &lit_6505); #pragma pop /* 80735CD0-80735CD4 0001A8 0004+00 0/0 0/0 0/0 .rodata @6506 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6506 = 7500.0f; -COMPILER_STRIP_GATE(80735CD0, &lit_6506); +COMPILER_STRIP_GATE(0x80735CD0, &lit_6506); #pragma pop /* 80735CD4-80735CD8 0001AC 0004+00 0/0 0/0 0/0 .rodata @6507 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6507 = 16449.0f; -COMPILER_STRIP_GATE(80735CD4, &lit_6507); +COMPILER_STRIP_GATE(0x80735CD4, &lit_6507); #pragma pop /* 80735CD8-80735CDC 0001B0 0004+00 0/0 0/0 0/0 .rodata @6508 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6508 = 3300.0f; -COMPILER_STRIP_GATE(80735CD8, &lit_6508); +COMPILER_STRIP_GATE(0x80735CD8, &lit_6508); #pragma pop /* 80735CDC-80735CE0 0001B4 0004+00 0/0 0/0 0/0 .rodata @6509 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6509 = 7879.0f; -COMPILER_STRIP_GATE(80735CDC, &lit_6509); +COMPILER_STRIP_GATE(0x80735CDC, &lit_6509); #pragma pop /* 80735CE0-80735CE4 0001B8 0004+00 0/0 0/0 0/0 .rodata @6510 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6510 = 2950.0f; -COMPILER_STRIP_GATE(80735CE0, &lit_6510); +COMPILER_STRIP_GATE(0x80735CE0, &lit_6510); #pragma pop /* 80735CE4-80735CE8 0001BC 0004+00 0/0 0/0 0/0 .rodata @6511 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6511 = 47.0f; -COMPILER_STRIP_GATE(80735CE4, &lit_6511); +COMPILER_STRIP_GATE(0x80735CE4, &lit_6511); #pragma pop /* 80735CE8-80735CF0 0001C0 0004+04 0/0 0/0 0/0 .rodata @6512 */ @@ -2323,7 +2341,7 @@ SECTION_RODATA static f32 const lit_6512[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80735CE8, &lit_6512); +COMPILER_STRIP_GATE(0x80735CE8, &lit_6512); #pragma pop /* 80735CF0-80735CF8 0001C8 0008+00 0/1 0/0 0/0 .rodata @6515 */ @@ -2332,42 +2350,49 @@ COMPILER_STRIP_GATE(80735CE8, &lit_6512); SECTION_RODATA static u8 const lit_6515[8] = { 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80735CF0, &lit_6515); +COMPILER_STRIP_GATE(0x80735CF0, &lit_6515); #pragma pop /* 80735CF8-80735CFC 0001D0 0004+00 0/0 0/0 0/0 .rodata @6590 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6590 = 16249.0f; -COMPILER_STRIP_GATE(80735CF8, &lit_6590); +COMPILER_STRIP_GATE(0x80735CF8, &lit_6590); #pragma pop /* 80735CFC-80735D00 0001D4 0004+00 0/0 0/0 0/0 .rodata @6591 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6591 = 4000.0f; -COMPILER_STRIP_GATE(80735CFC, &lit_6591); +COMPILER_STRIP_GATE(0x80735CFC, &lit_6591); #pragma pop /* 80735D00-80735D04 0001D8 0004+00 0/0 0/0 0/0 .rodata @6592 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6592 = 8036.0f; -COMPILER_STRIP_GATE(80735D00, &lit_6592); +COMPILER_STRIP_GATE(0x80735D00, &lit_6592); #pragma pop /* 80735D04-80735D08 0001DC 0004+00 0/1 0/0 0/0 .rodata @7495 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7495 = 95.0f; -COMPILER_STRIP_GATE(80735D04, &lit_7495); +COMPILER_STRIP_GATE(0x80735D04, &lit_7495); #pragma pop /* 80735D08-80735D0C 0001E0 0004+00 0/1 0/0 0/0 .rodata @7496 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7496 = -5.0f; -COMPILER_STRIP_GATE(80735D08, &lit_7496); +COMPILER_STRIP_GATE(0x80735D08, &lit_7496); +#pragma pop + +/* 80735D0C-80735D0C 0001E4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80735D1E = "E_OC2"; +SECTION_DEAD static char const* const stringBase_80735D24 = "E_oc"; #pragma pop /* 80734DA8-807352AC 0088C8 0504+00 1/1 0/0 0/0 .text create__8daE_OC_cFv */ @@ -2492,7 +2517,7 @@ asm void __sinit_d_a_e_oc_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80735678 = (void*)__sinit_d_a_e_oc_cpp; +REGISTER_CTORS(0x80735678, __sinit_d_a_e_oc_cpp); #pragma pop /* 807356B4-807356BC 0091D4 0008+00 1/0 0/0 0/0 .text @36@__dt__12dBgS_ObjAcchFv */ @@ -2709,13 +2734,4 @@ static u8 data_80736100[4]; static u8 data_80736104[4]; #pragma pop -/* 80735D0C-80735D29 0001E4 001D+00 11/11 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80735D0C = "E_OC"; -SECTION_DEAD static char const* const stringBase_80735D11 = "E_ocb"; -SECTION_DEAD static char const* const stringBase_80735D17 = "D_MN05"; -SECTION_DEAD static char const* const stringBase_80735D1E = "E_OC2"; -SECTION_DEAD static char const* const stringBase_80735D24 = "E_oc"; -#pragma pop +/* 80735D0C-80735D0C 0001E4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg.cpp b/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg.cpp index baa274886ec..a05fa9d4111 100644 --- a/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg.cpp +++ b/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg.cpp @@ -33,16 +33,16 @@ struct mDoExt_baseAnm { /* 8000D428 */ void play(); }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; - struct J3DAnmTransform {}; +struct J3DModelData {}; + +struct Z2Creature {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -70,10 +70,10 @@ struct fopAcM_gc_c { static f32 mGroundY; }; -struct J3DJoint {}; - struct J3DModel {}; +struct J3DJoint {}; + struct daE_OctBg_c { /* 8073626C */ void setAction(void (daE_OctBg_c::*)()); /* 80736310 */ void setSparkEffect(); @@ -125,10 +125,10 @@ struct dRes_control_c { struct dPa_levelEcallBack {}; -struct _GXColor {}; - struct csXyz {}; +struct _GXColor {}; + struct dPa_control_c { struct level_c { /* 8004B918 */ void getEmitter(u32); @@ -424,41 +424,41 @@ extern "C" void __register_global_object(); /* ############################################################################################## */ /* 80739D60-80739D64 000000 0004+00 15/15 0/0 0/0 .rodata @3768 */ SECTION_RODATA static f32 const lit_3768 = 1200.0f; -COMPILER_STRIP_GATE(80739D60, &lit_3768); +COMPILER_STRIP_GATE(0x80739D60, &lit_3768); /* 80739D64-80739D68 000004 0004+00 0/1 0/0 0/0 .rodata @3769 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3769 = 1400.0f; -COMPILER_STRIP_GATE(80739D64, &lit_3769); +COMPILER_STRIP_GATE(0x80739D64, &lit_3769); #pragma pop /* 80739D68-80739D6C 000008 0004+00 0/2 0/0 0/0 .rodata @3770 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3770 = 500.0f; -COMPILER_STRIP_GATE(80739D68, &lit_3770); +COMPILER_STRIP_GATE(0x80739D68, &lit_3770); #pragma pop /* 80739D6C-80739D70 00000C 0004+00 0/5 0/0 0/0 .rodata @3771 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3771 = 100.0f; -COMPILER_STRIP_GATE(80739D6C, &lit_3771); +COMPILER_STRIP_GATE(0x80739D6C, &lit_3771); #pragma pop /* 80739D70-80739D74 000010 0004+00 0/2 0/0 0/0 .rodata @3772 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3772 = 1.5f; -COMPILER_STRIP_GATE(80739D70, &lit_3772); +COMPILER_STRIP_GATE(0x80739D70, &lit_3772); #pragma pop /* 80739D74-80739D78 000014 0004+00 0/2 0/0 0/0 .rodata @3773 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3773 = 2000.0f; -COMPILER_STRIP_GATE(80739D74, &lit_3773); +COMPILER_STRIP_GATE(0x80739D74, &lit_3773); #pragma pop /* 80739E54-80739E60 000000 000C+00 4/4 0/0 0/0 .data cNullVec__6Z2Calc */ @@ -835,7 +835,7 @@ asm daE_OctBg_HIO_c::daE_OctBg_HIO_c() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daE_OctBg_c::setAction(void (daE_OctBg_c::*)()) { +asm void daE_OctBg_c::setAction(void (daE_OctBg_c::*param_0)()) { nofralloc #include "asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/setAction__11daE_OctBg_cFM11daE_OctBg_cFPCvPv_v.s" } @@ -844,7 +844,7 @@ asm void daE_OctBg_c::setAction(void (daE_OctBg_c::*)()) { /* ############################################################################################## */ /* 80739D78-80739D7C 000018 0004+00 2/6 0/0 0/0 .rodata @3823 */ SECTION_RODATA static f32 const lit_3823 = 1.0f; -COMPILER_STRIP_GATE(80739D78, &lit_3823); +COMPILER_STRIP_GATE(0x80739D78, &lit_3823); /* 80736310-80736418 0001F0 0108+00 1/1 0/0 0/0 .text setSparkEffect__11daE_OctBg_cFv */ #pragma push @@ -871,7 +871,7 @@ asm void daE_OctBg_c::checkExplode() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3915 = 4096.0f; -COMPILER_STRIP_GATE(80739D7C, &lit_3915); +COMPILER_STRIP_GATE(0x80739D7C, &lit_3915); #pragma pop /* 80739D80-80739D88 000020 0004+04 0/4 0/0 0/0 .rodata @3916 */ @@ -882,7 +882,7 @@ SECTION_RODATA static f32 const lit_3916[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80739D80, &lit_3916); +COMPILER_STRIP_GATE(0x80739D80, &lit_3916); #pragma pop /* 80739D88-80739D90 000028 0008+00 0/3 0/0 0/0 .rodata @3918 */ @@ -891,7 +891,7 @@ COMPILER_STRIP_GATE(80739D80, &lit_3916); SECTION_RODATA static u8 const lit_3918[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80739D88, &lit_3918); +COMPILER_STRIP_GATE(0x80739D88, &lit_3918); #pragma pop /* 8073651C-80736840 0003FC 0324+00 1/1 0/0 0/0 .text action__11daE_OctBg_cFv */ @@ -905,6 +905,12 @@ asm void daE_OctBg_c::action() { #pragma pop /* ############################################################################################## */ +/* 80739E44-80739E44 0000E4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80739E44 = "E_bg"; +#pragma pop + /* 8073A100-8073A104 000008 0001+03 3/3 0/0 0/0 .bss @1109 */ static u8 lit_1109[1 + 3 /* padding */]; @@ -1026,27 +1032,27 @@ SECTION_RODATA static u8 const lit_3985[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80739D90, &lit_3985); +COMPILER_STRIP_GATE(0x80739D90, &lit_3985); /* 80739D94-80739D98 000034 0004+00 0/2 0/0 0/0 .rodata @3986 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3986 = 25.0f; -COMPILER_STRIP_GATE(80739D94, &lit_3986); +COMPILER_STRIP_GATE(0x80739D94, &lit_3986); #pragma pop /* 80739D98-80739D9C 000038 0004+00 0/1 0/0 0/0 .rodata @3987 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3987 = 35.0f; -COMPILER_STRIP_GATE(80739D98, &lit_3987); +COMPILER_STRIP_GATE(0x80739D98, &lit_3987); #pragma pop /* 80739D9C-80739DA0 00003C 0004+00 0/5 0/0 0/0 .rodata @3988 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3988 = 20.0f; -COMPILER_STRIP_GATE(80739D9C, &lit_3988); +COMPILER_STRIP_GATE(0x80739D9C, &lit_3988); #pragma pop /* 8073A140-8073A14C 000048 000C+00 1/1 0/0 0/0 .bss @3763 */ @@ -1077,7 +1083,7 @@ SECTION_RODATA static f32 const lit_4046[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80739DA0, &lit_4046); +COMPILER_STRIP_GATE(0x80739DA0, &lit_4046); #pragma pop /* 80736A78-80736BB4 000958 013C+00 1/1 0/0 0/0 .text mtx_set__11daE_OctBg_cFv */ @@ -1097,7 +1103,7 @@ asm void daE_OctBg_c::mtx_set() { SECTION_RODATA static u8 const lit_4102[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80739DA8, &lit_4102); +COMPILER_STRIP_GATE(0x80739DA8, &lit_4102); #pragma pop /* 80739DB0-80739DB8 000050 0008+00 0/5 0/0 0/0 .rodata @4103 */ @@ -1106,7 +1112,7 @@ COMPILER_STRIP_GATE(80739DA8, &lit_4102); SECTION_RODATA static u8 const lit_4103[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80739DB0, &lit_4103); +COMPILER_STRIP_GATE(0x80739DB0, &lit_4103); #pragma pop /* 80739DB8-80739DC0 000058 0008+00 0/5 0/0 0/0 .rodata @4104 */ @@ -1115,7 +1121,7 @@ COMPILER_STRIP_GATE(80739DB0, &lit_4103); SECTION_RODATA static u8 const lit_4104[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80739DB8, &lit_4104); +COMPILER_STRIP_GATE(0x80739DB8, &lit_4104); #pragma pop /* 80736BB4-80736DAC 000A94 01F8+00 1/1 0/0 0/0 .text checkNormalAttack__11daE_OctBg_cFv @@ -1144,39 +1150,39 @@ asm void daE_OctBg_c::checkChase() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4148 = -16384.0f; -COMPILER_STRIP_GATE(80739DC0, &lit_4148); +COMPILER_STRIP_GATE(0x80739DC0, &lit_4148); #pragma pop /* 80739DC4-80739DC8 000064 0004+00 1/2 0/0 0/0 .rodata @4149 */ SECTION_RODATA static f32 const lit_4149 = 32768.0f; -COMPILER_STRIP_GATE(80739DC4, &lit_4149); +COMPILER_STRIP_GATE(0x80739DC4, &lit_4149); /* 80739DC8-80739DCC 000068 0004+00 0/4 0/0 0/0 .rodata @4150 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4150 = 10.0f; -COMPILER_STRIP_GATE(80739DC8, &lit_4150); +COMPILER_STRIP_GATE(0x80739DC8, &lit_4150); #pragma pop /* 80739DCC-80739DD0 00006C 0004+00 0/2 0/0 0/0 .rodata @4151 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4151 = 18.0f; -COMPILER_STRIP_GATE(80739DCC, &lit_4151); +COMPILER_STRIP_GATE(0x80739DCC, &lit_4151); #pragma pop /* 80739DD0-80739DD4 000070 0004+00 0/1 0/0 0/0 .rodata @4152 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4152 = 1.0f / 20.0f; -COMPILER_STRIP_GATE(80739DD0, &lit_4152); +COMPILER_STRIP_GATE(0x80739DD0, &lit_4152); #pragma pop /* 80739DD4-80739DD8 000074 0004+00 0/6 0/0 0/0 .rodata @4153 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4153 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(80739DD4, &lit_4153); +COMPILER_STRIP_GATE(0x80739DD4, &lit_4153); #pragma pop /* 80736E30-80737028 000D10 01F8+00 1/0 0/0 0/0 .text born_swim__11daE_OctBg_cFv */ @@ -1194,42 +1200,42 @@ asm void daE_OctBg_c::born_swim() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4292 = 16384.0f; -COMPILER_STRIP_GATE(80739DD8, &lit_4292); +COMPILER_STRIP_GATE(0x80739DD8, &lit_4292); #pragma pop /* 80739DDC-80739DE0 00007C 0004+00 0/1 0/0 0/0 .rodata @4293 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4293 = 8192.0f; -COMPILER_STRIP_GATE(80739DDC, &lit_4293); +COMPILER_STRIP_GATE(0x80739DDC, &lit_4293); #pragma pop /* 80739DE0-80739DE4 000080 0004+00 0/2 0/0 0/0 .rodata @4294 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4294 = 30.0f; -COMPILER_STRIP_GATE(80739DE0, &lit_4294); +COMPILER_STRIP_GATE(0x80739DE0, &lit_4294); #pragma pop /* 80739DE4-80739DE8 000084 0004+00 0/4 0/0 0/0 .rodata @4295 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4295 = 200.0f; -COMPILER_STRIP_GATE(80739DE4, &lit_4295); +COMPILER_STRIP_GATE(0x80739DE4, &lit_4295); #pragma pop /* 80739DE8-80739DEC 000088 0004+00 0/1 0/0 0/0 .rodata @4296 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4296 = 4.0f; -COMPILER_STRIP_GATE(80739DE8, &lit_4296); +COMPILER_STRIP_GATE(0x80739DE8, &lit_4296); #pragma pop /* 80739DEC-80739DF0 00008C 0004+00 0/1 0/0 0/0 .rodata @4297 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4297 = -4.0f; -COMPILER_STRIP_GATE(80739DEC, &lit_4297); +COMPILER_STRIP_GATE(0x80739DEC, &lit_4297); #pragma pop /* 80737028-80737574 000F08 054C+00 7/0 0/0 0/0 .text swim__11daE_OctBg_cFv */ @@ -1268,28 +1274,28 @@ asm void daE_OctBg_c::checkCoreFishAttack() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4445 = 8.0f; -COMPILER_STRIP_GATE(80739DF0, &lit_4445); +COMPILER_STRIP_GATE(0x80739DF0, &lit_4445); #pragma pop /* 80739DF4-80739DF8 000094 0004+00 0/2 0/0 0/0 .rodata @4446 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4446 = -8.0f; -COMPILER_STRIP_GATE(80739DF4, &lit_4446); +COMPILER_STRIP_GATE(0x80739DF4, &lit_4446); #pragma pop /* 80739DF8-80739DFC 000098 0004+00 0/3 0/0 0/0 .rodata @4447 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4447 = 2.0f / 5.0f; -COMPILER_STRIP_GATE(80739DF8, &lit_4447); +COMPILER_STRIP_GATE(0x80739DF8, &lit_4447); #pragma pop /* 80739DFC-80739E00 00009C 0004+00 0/1 0/0 0/0 .rodata @4448 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4448 = -18.0f; -COMPILER_STRIP_GATE(80739DFC, &lit_4448); +COMPILER_STRIP_GATE(0x80739DFC, &lit_4448); #pragma pop /* 80737678-80737C48 001558 05D0+00 5/0 0/0 0/0 .text chase_core__11daE_OctBg_cFv */ @@ -1307,28 +1313,28 @@ asm void daE_OctBg_c::chase_core() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4559 = 60.0f; -COMPILER_STRIP_GATE(80739E00, &lit_4559); +COMPILER_STRIP_GATE(0x80739E00, &lit_4559); #pragma pop /* 80739E04-80739E08 0000A4 0004+00 0/2 0/0 0/0 .rodata @4560 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4560 = 80.0f; -COMPILER_STRIP_GATE(80739E04, &lit_4560); +COMPILER_STRIP_GATE(0x80739E04, &lit_4560); #pragma pop /* 80739E08-80739E0C 0000A8 0004+00 0/2 0/0 0/0 .rodata @4561 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4561 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(80739E08, &lit_4561); +COMPILER_STRIP_GATE(0x80739E08, &lit_4561); #pragma pop /* 80739E0C-80739E10 0000AC 0004+00 0/3 0/0 0/0 .rodata @4562 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4562 = -1.0f / 10.0f; -COMPILER_STRIP_GATE(80739E0C, &lit_4562); +COMPILER_STRIP_GATE(0x80739E0C, &lit_4562); #pragma pop /* 80737C48-8073814C 001B28 0504+00 3/0 0/0 0/0 .text normal_attack__11daE_OctBg_cFv */ @@ -1346,49 +1352,49 @@ asm void daE_OctBg_c::normal_attack() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4678 = 230.0f; -COMPILER_STRIP_GATE(80739E10, &lit_4678); +COMPILER_STRIP_GATE(0x80739E10, &lit_4678); #pragma pop /* 80739E14-80739E18 0000B4 0004+00 0/2 0/0 0/0 .rodata @4679 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4679 = 50.0f; -COMPILER_STRIP_GATE(80739E14, &lit_4679); +COMPILER_STRIP_GATE(0x80739E14, &lit_4679); #pragma pop /* 80739E18-80739E1C 0000B8 0004+00 0/1 0/0 0/0 .rodata @4680 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4680 = 800.0f; -COMPILER_STRIP_GATE(80739E18, &lit_4680); +COMPILER_STRIP_GATE(0x80739E18, &lit_4680); #pragma pop /* 80739E1C-80739E20 0000BC 0004+00 0/1 0/0 0/0 .rodata @4681 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4681 = 40.0f; -COMPILER_STRIP_GATE(80739E1C, &lit_4681); +COMPILER_STRIP_GATE(0x80739E1C, &lit_4681); #pragma pop /* 80739E20-80739E24 0000C0 0004+00 0/1 0/0 0/0 .rodata @4682 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4682 = 14.0f; -COMPILER_STRIP_GATE(80739E20, &lit_4682); +COMPILER_STRIP_GATE(0x80739E20, &lit_4682); #pragma pop /* 80739E24-80739E28 0000C4 0004+00 0/1 0/0 0/0 .rodata @4683 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4683 = -14.0f; -COMPILER_STRIP_GATE(80739E24, &lit_4683); +COMPILER_STRIP_GATE(0x80739E24, &lit_4683); #pragma pop /* 80739E28-80739E2C 0000C8 0004+00 0/1 0/0 0/0 .rodata @4684 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4684 = 400.0f; -COMPILER_STRIP_GATE(80739E28, &lit_4684); +COMPILER_STRIP_GATE(0x80739E28, &lit_4684); #pragma pop /* 8073814C-80738714 00202C 05C8+00 2/0 0/0 0/0 .text core_fish_attack__11daE_OctBg_cFv @@ -1407,7 +1413,7 @@ asm void daE_OctBg_c::core_fish_attack() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4728 = -10.0f; -COMPILER_STRIP_GATE(80739E2C, &lit_4728); +COMPILER_STRIP_GATE(0x80739E2C, &lit_4728); #pragma pop /* 80738714-80738914 0025F4 0200+00 1/0 0/0 0/0 .text back_swim__11daE_OctBg_cFv */ @@ -1445,21 +1451,21 @@ asm void daE_OctBg_c::hook() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4813 = -1.0f; -COMPILER_STRIP_GATE(80739E30, &lit_4813); +COMPILER_STRIP_GATE(0x80739E30, &lit_4813); #pragma pop /* 80739E34-80739E38 0000D4 0004+00 0/2 0/0 0/0 .rodata @4814 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4814 = 5.0f; -COMPILER_STRIP_GATE(80739E34, &lit_4814); +COMPILER_STRIP_GATE(0x80739E34, &lit_4814); #pragma pop /* 80739E38-80739E3C 0000D8 0004+00 0/2 0/0 0/0 .rodata @4815 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4815 = -3.0f; -COMPILER_STRIP_GATE(80739E38, &lit_4815); +COMPILER_STRIP_GATE(0x80739E38, &lit_4815); #pragma pop /* 80738A4C-80738C2C 00292C 01E0+00 3/0 0/0 0/0 .text damage__11daE_OctBg_cFv */ @@ -1569,7 +1575,13 @@ asm J3DFrameCtrl::~J3DFrameCtrl() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5138 = -50.0f; -COMPILER_STRIP_GATE(80739E3C, &lit_5138); +COMPILER_STRIP_GATE(0x80739E3C, &lit_5138); +#pragma pop + +/* 80739E44-80739E44 0000E4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80739E49 = "E_octbg"; #pragma pop /* 80739424-807397B8 003304 0394+00 1/1 0/0 0/0 .text create__11daE_OctBg_cFv */ @@ -1648,7 +1660,7 @@ static asm void daE_OctBg_Create(daE_OctBg_c* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5288 = 32.0f; -COMPILER_STRIP_GATE(80739E40, &lit_5288); +COMPILER_STRIP_GATE(0x80739E40, &lit_5288); #pragma pop /* 807399A4-80739BA0 003884 01FC+00 1/1 0/0 0/0 .text draw__11daE_OctBg_cFv */ @@ -1714,7 +1726,7 @@ asm void __sinit_d_a_e_oct_bg_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80739D00 = (void*)__sinit_d_a_e_oct_bg_cpp; +REGISTER_CTORS(0x80739D00, __sinit_d_a_e_oct_bg_cpp); #pragma pop /* 80739D3C-80739D44 003C1C 0008+00 1/0 0/0 0/0 .text @36@__dt__12dBgS_ObjAcchFv */ @@ -1909,10 +1921,4 @@ static u8 data_8073A1D0[4]; static u8 data_8073A1D4[4]; #pragma pop -/* 80739E44-80739E51 0000E4 000D+00 5/5 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80739E44 = "E_bg"; -SECTION_DEAD static char const* const stringBase_80739E49 = "E_octbg"; -#pragma pop +/* 80739E44-80739E44 0000E4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/e/d_a_e_ot/d_a_e_ot.cpp b/rel/d/a/e/d_a_e_ot/d_a_e_ot.cpp index 96e8a5917cf..916b2014369 100644 --- a/rel/d/a/e/d_a_e_ot/d_a_e_ot.cpp +++ b/rel/d/a/e/d_a_e_ot/d_a_e_ot.cpp @@ -43,16 +43,16 @@ struct mDoExt_baseAnm { /* 8000D428 */ void play(); }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; - struct J3DAnmTransform {}; +struct J3DModelData {}; + +struct Z2Creature {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -430,7 +430,7 @@ extern "C" void __register_global_object(); /* ############################################################################################## */ /* 8073CEA8-8073CEAC 000000 0004+00 14/14 0/0 0/0 .rodata @3910 */ SECTION_RODATA static f32 const lit_3910 = 100.0f; -COMPILER_STRIP_GATE(8073CEA8, &lit_3910); +COMPILER_STRIP_GATE(0x8073CEA8, &lit_3910); /* 8073CEAC-8073CEB0 000004 0004+00 1/11 0/0 0/0 .rodata @3911 */ SECTION_RODATA static u8 const lit_3911[4] = { @@ -439,7 +439,7 @@ SECTION_RODATA static u8 const lit_3911[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(8073CEAC, &lit_3911); +COMPILER_STRIP_GATE(0x8073CEAC, &lit_3911); /* 8073CEB0-8073CEB8 000008 0004+04 4/13 0/0 0/0 .rodata @3912 */ SECTION_RODATA static f32 const lit_3912[1 + 1 /* padding */] = { @@ -447,7 +447,7 @@ SECTION_RODATA static f32 const lit_3912[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(8073CEB0, &lit_3912); +COMPILER_STRIP_GATE(0x8073CEB0, &lit_3912); /* 8073CEB8-8073CEC0 000010 0008+00 0/2 0/0 0/0 .rodata @3913 */ #pragma push @@ -455,7 +455,7 @@ COMPILER_STRIP_GATE(8073CEB0, &lit_3912); SECTION_RODATA static u8 const lit_3913[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8073CEB8, &lit_3913); +COMPILER_STRIP_GATE(0x8073CEB8, &lit_3913); #pragma pop /* 8073CEC0-8073CEC8 000018 0008+00 0/2 0/0 0/0 .rodata @3914 */ @@ -464,7 +464,7 @@ COMPILER_STRIP_GATE(8073CEB8, &lit_3913); SECTION_RODATA static u8 const lit_3914[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8073CEC0, &lit_3914); +COMPILER_STRIP_GATE(0x8073CEC0, &lit_3914); #pragma pop /* 8073CEC8-8073CED0 000020 0008+00 0/2 0/0 0/0 .rodata @3915 */ @@ -473,33 +473,33 @@ COMPILER_STRIP_GATE(8073CEC0, &lit_3914); SECTION_RODATA static u8 const lit_3915[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8073CEC8, &lit_3915); +COMPILER_STRIP_GATE(0x8073CEC8, &lit_3915); #pragma pop /* 8073CED0-8073CED4 000028 0004+00 0/2 0/0 0/0 .rodata @3916 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3916 = 1.0f / 100.0f; -COMPILER_STRIP_GATE(8073CED0, &lit_3916); +COMPILER_STRIP_GATE(0x8073CED0, &lit_3916); #pragma pop /* 8073CED4-8073CED8 00002C 0004+00 0/2 0/0 0/0 .rodata @3932 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3932 = 13.0f; -COMPILER_STRIP_GATE(8073CED4, &lit_3932); +COMPILER_STRIP_GATE(0x8073CED4, &lit_3932); #pragma pop /* 8073CED8-8073CEDC 000030 0004+00 0/2 0/0 0/0 .rodata @3933 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3933 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(8073CED8, &lit_3933); +COMPILER_STRIP_GATE(0x8073CED8, &lit_3933); #pragma pop /* 8073CEDC-8073CEE0 000034 0004+00 1/6 0/0 0/0 .rodata @3934 */ SECTION_RODATA static f32 const lit_3934 = 20.0f; -COMPILER_STRIP_GATE(8073CEDC, &lit_3934); +COMPILER_STRIP_GATE(0x8073CEDC, &lit_3934); /* 8073CF74-8073CF80 000000 000C+00 3/3 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { @@ -762,7 +762,7 @@ asm daE_OT_HIO_c::daE_OT_HIO_c() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3976 = 300.0f; -COMPILER_STRIP_GATE(8073CEE0, &lit_3976); +COMPILER_STRIP_GATE(0x8073CEE0, &lit_3976); #pragma pop /* 8073A314-8073A434 000134 0120+00 1/1 0/0 0/0 .text draw__8daE_OT_cFv */ @@ -788,7 +788,13 @@ static asm void daE_OT_Draw(daE_OT_c* param_0) { /* ############################################################################################## */ /* 8073CEE4-8073CEE8 00003C 0004+00 2/2 0/0 0/0 .rodata @3986 */ SECTION_RODATA static f32 const lit_3986 = -1.0f; -COMPILER_STRIP_GATE(8073CEE4, &lit_3986); +COMPILER_STRIP_GATE(0x8073CEE4, &lit_3986); + +/* 8073CF6C-8073CF6C 0000C4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8073CF6C = "E_OT"; +#pragma pop /* 8073A454-8073A4F8 000274 00A4+00 4/4 0/0 0/0 .text setBck__8daE_OT_cFiUcff */ #pragma push @@ -815,7 +821,7 @@ asm void daE_OT_c::setActionMode(int param_0, int param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4075 = 500.0f; -COMPILER_STRIP_GATE(8073CEE8, &lit_4075); +COMPILER_STRIP_GATE(0x8073CEE8, &lit_4075); #pragma pop /* 8073A510-8073A7B0 000330 02A0+00 1/1 0/0 0/0 .text damage_check__8daE_OT_cFv */ @@ -841,7 +847,7 @@ asm void daE_OT_c::checkWaterSurface() { /* ############################################################################################## */ /* 8073CEEC-8073CEF0 000044 0004+00 2/3 0/0 0/0 .rodata @4125 */ SECTION_RODATA static f32 const lit_4125 = 0.5f; -COMPILER_STRIP_GATE(8073CEEC, &lit_4125); +COMPILER_STRIP_GATE(0x8073CEEC, &lit_4125); /* 8073D270-8073D274 000008 0001+03 1/1 0/0 0/0 .bss @1109 */ static u8 lit_1109[1 + 3 /* padding */]; @@ -993,7 +999,7 @@ asm void daE_OT_c::setDeathLightEffect() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4199 = 15.0f; -COMPILER_STRIP_GATE(8073CEF0, &lit_4199); +COMPILER_STRIP_GATE(0x8073CEF0, &lit_4199); #pragma pop /* 8073AB38-8073AC14 000958 00DC+00 1/1 0/0 0/0 .text setEggStay__8daE_OT_cFv */ @@ -1011,21 +1017,21 @@ asm void daE_OT_c::setEggStay() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4269 = 2.0f / 5.0f; -COMPILER_STRIP_GATE(8073CEF4, &lit_4269); +COMPILER_STRIP_GATE(0x8073CEF4, &lit_4269); #pragma pop /* 8073CEF8-8073CEFC 000050 0004+00 0/1 0/0 0/0 .rodata @4270 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4270 = 7.0f / 5.0f; -COMPILER_STRIP_GATE(8073CEF8, &lit_4270); +COMPILER_STRIP_GATE(0x8073CEF8, &lit_4270); #pragma pop /* 8073CEFC-8073CF00 000054 0004+00 0/1 0/0 0/0 .rodata @4271 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4271 = 1.0f / 20.0f; -COMPILER_STRIP_GATE(8073CEFC, &lit_4271); +COMPILER_STRIP_GATE(0x8073CEFC, &lit_4271); #pragma pop /* 8073AC14-8073AF70 000A34 035C+00 2/1 0/0 0/0 .text executeEgg__8daE_OT_cFv */ @@ -1043,56 +1049,56 @@ asm void daE_OT_c::executeEgg() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4272 = 5.0f; -COMPILER_STRIP_GATE(8073CF00, &lit_4272); +COMPILER_STRIP_GATE(0x8073CF00, &lit_4272); #pragma pop /* 8073CF04-8073CF08 00005C 0004+00 0/1 0/0 0/0 .rodata @4273 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4273 = 4096.0f; -COMPILER_STRIP_GATE(8073CF04, &lit_4273); +COMPILER_STRIP_GATE(0x8073CF04, &lit_4273); #pragma pop /* 8073CF08-8073CF0C 000060 0004+00 0/1 0/0 0/0 .rodata @4274 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4274 = 50.0f; -COMPILER_STRIP_GATE(8073CF08, &lit_4274); +COMPILER_STRIP_GATE(0x8073CF08, &lit_4274); #pragma pop /* 8073CF0C-8073CF10 000064 0004+00 0/3 0/0 0/0 .rodata @4275 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4275 = 30.0f; -COMPILER_STRIP_GATE(8073CF0C, &lit_4275); +COMPILER_STRIP_GATE(0x8073CF0C, &lit_4275); #pragma pop /* 8073CF10-8073CF14 000068 0004+00 0/1 0/0 0/0 .rodata @4276 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4276 = 10.0f; -COMPILER_STRIP_GATE(8073CF10, &lit_4276); +COMPILER_STRIP_GATE(0x8073CF10, &lit_4276); #pragma pop /* 8073CF14-8073CF18 00006C 0004+00 0/1 0/0 0/0 .rodata @4277 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4277 = 16384.0f; -COMPILER_STRIP_GATE(8073CF14, &lit_4277); +COMPILER_STRIP_GATE(0x8073CF14, &lit_4277); #pragma pop /* 8073CF18-8073CF1C 000070 0004+00 0/0 0/0 0/0 .rodata @4278 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4278 = -16384.0f; -COMPILER_STRIP_GATE(8073CF18, &lit_4278); +COMPILER_STRIP_GATE(0x8073CF18, &lit_4278); #pragma pop /* 8073CF1C-8073CF20 000074 0004+00 0/3 0/0 0/0 .rodata @4279 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4279 = -5.0f; -COMPILER_STRIP_GATE(8073CF1C, &lit_4279); +COMPILER_STRIP_GATE(0x8073CF1C, &lit_4279); #pragma pop /* 8073CF20-8073CF28 000078 0004+04 0/0 0/0 0/0 .rodata @4280 */ @@ -1103,7 +1109,7 @@ SECTION_RODATA static f32 const lit_4280[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(8073CF20, &lit_4280); +COMPILER_STRIP_GATE(0x8073CF20, &lit_4280); #pragma pop /* 8073CF28-8073CF30 000080 0008+00 0/4 0/0 0/0 .rodata @4283 */ @@ -1112,21 +1118,21 @@ COMPILER_STRIP_GATE(8073CF20, &lit_4280); SECTION_RODATA static u8 const lit_4283[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8073CF28, &lit_4283); +COMPILER_STRIP_GATE(0x8073CF28, &lit_4283); #pragma pop /* 8073CF30-8073CF34 000088 0004+00 0/4 0/0 0/0 .rodata @4314 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4314 = 3.0f; -COMPILER_STRIP_GATE(8073CF30, &lit_4314); +COMPILER_STRIP_GATE(0x8073CF30, &lit_4314); #pragma pop /* 8073CF34-8073CF38 00008C 0004+00 0/2 0/0 0/0 .rodata @4315 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4315 = 32768.0f; -COMPILER_STRIP_GATE(8073CF34, &lit_4315); +COMPILER_STRIP_GATE(0x8073CF34, &lit_4315); #pragma pop /* 8073AF70-8073B0D0 000D90 0160+00 1/1 0/0 0/0 .text executeBorn__8daE_OT_cFv */ @@ -1144,14 +1150,14 @@ asm void daE_OT_c::executeBorn() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4382 = 180.0f; -COMPILER_STRIP_GATE(8073CF38, &lit_4382); +COMPILER_STRIP_GATE(0x8073CF38, &lit_4382); #pragma pop /* 8073CF3C-8073CF40 000094 0004+00 0/1 0/0 0/0 .rodata @4383 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4383 = 2.0f; -COMPILER_STRIP_GATE(8073CF3C, &lit_4383); +COMPILER_STRIP_GATE(0x8073CF3C, &lit_4383); #pragma pop /* 8073B0D0-8073B428 000EF0 0358+00 1/1 0/0 0/0 .text executeAttack__8daE_OT_cFv */ @@ -1169,14 +1175,14 @@ asm void daE_OT_c::executeAttack() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4449 = 8192.0f; -COMPILER_STRIP_GATE(8073CF40, &lit_4449); +COMPILER_STRIP_GATE(0x8073CF40, &lit_4449); #pragma pop /* 8073CF44-8073CF48 00009C 0004+00 0/2 0/0 0/0 .rodata @4450 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4450 = 25.0f; -COMPILER_STRIP_GATE(8073CF44, &lit_4450); +COMPILER_STRIP_GATE(0x8073CF44, &lit_4450); #pragma pop /* 8073B428-8073B854 001248 042C+00 2/1 0/0 0/0 .text executePanic__8daE_OT_cFv */ @@ -1194,42 +1200,42 @@ asm void daE_OT_c::executePanic() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4451 = 11.0f; -COMPILER_STRIP_GATE(8073CF48, &lit_4451); +COMPILER_STRIP_GATE(0x8073CF48, &lit_4451); #pragma pop /* 8073CF4C-8073CF50 0000A4 0004+00 0/0 0/0 0/0 .rodata @4452 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4452 = 1.5f; -COMPILER_STRIP_GATE(8073CF4C, &lit_4452); +COMPILER_STRIP_GATE(0x8073CF4C, &lit_4452); #pragma pop /* 8073CF50-8073CF54 0000A8 0004+00 0/2 0/0 0/0 .rodata @4509 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4509 = 40.0f; -COMPILER_STRIP_GATE(8073CF50, &lit_4509); +COMPILER_STRIP_GATE(0x8073CF50, &lit_4509); #pragma pop /* 8073CF54-8073CF58 0000AC 0004+00 0/1 0/0 0/0 .rodata @4510 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4510 = 1.0f / 50.0f; -COMPILER_STRIP_GATE(8073CF54, &lit_4510); +COMPILER_STRIP_GATE(0x8073CF54, &lit_4510); #pragma pop /* 8073CF58-8073CF5C 0000B0 0004+00 0/1 0/0 0/0 .rodata @4511 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4511 = 160.0f; -COMPILER_STRIP_GATE(8073CF58, &lit_4511); +COMPILER_STRIP_GATE(0x8073CF58, &lit_4511); #pragma pop /* 8073CF5C-8073CF60 0000B4 0004+00 0/1 0/0 0/0 .rodata @4512 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4512 = 470.0f; -COMPILER_STRIP_GATE(8073CF5C, &lit_4512); +COMPILER_STRIP_GATE(0x8073CF5C, &lit_4512); #pragma pop /* 8073B854-8073BB9C 001674 0348+00 1/1 0/0 0/0 .text executeDamage__8daE_OT_cFv */ @@ -1352,21 +1358,21 @@ static asm void useHeapInit(fopAc_ac_c* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4832 = -200.0f; -COMPILER_STRIP_GATE(8073CF60, &lit_4832); +COMPILER_STRIP_GATE(0x8073CF60, &lit_4832); #pragma pop /* 8073CF64-8073CF68 0000BC 0004+00 0/1 0/0 0/0 .rodata @4833 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4833 = 200.0f; -COMPILER_STRIP_GATE(8073CF64, &lit_4833); +COMPILER_STRIP_GATE(0x8073CF64, &lit_4833); #pragma pop /* 8073CF68-8073CF6C 0000C0 0004+00 0/1 0/0 0/0 .rodata @4834 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4834 = 60.0f; -COMPILER_STRIP_GATE(8073CF68, &lit_4834); +COMPILER_STRIP_GATE(0x8073CF68, &lit_4834); #pragma pop /* 8073C31C-8073C77C 00213C 0460+00 1/1 0/0 0/0 .text create__8daE_OT_cFv */ @@ -1471,7 +1477,7 @@ asm void __sinit_d_a_e_ot_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_8073C9F8 = (void*)__sinit_d_a_e_ot_cpp; +REGISTER_CTORS(0x8073C9F8, __sinit_d_a_e_ot_cpp); #pragma pop /* 8073CA34-8073CA3C 002854 0008+00 1/0 0/0 0/0 .text @36@__dt__12dBgS_ObjAcchFv */ @@ -1688,9 +1694,4 @@ static u8 data_8073D358[4]; static u8 data_8073D35C[4]; #pragma pop -/* 8073CF6C-8073CF71 0000C4 0005+00 4/4 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_8073CF6C = "E_OT"; -#pragma pop +/* 8073CF6C-8073CF6C 0000C4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/e/d_a_e_ph/d_a_e_ph.cpp b/rel/d/a/e/d_a_e_ph/d_a_e_ph.cpp index a5593bd099d..e9dfb70f13b 100644 --- a/rel/d/a/e/d_a_e_ph/d_a_e_ph.cpp +++ b/rel/d/a/e/d_a_e_ph/d_a_e_ph.cpp @@ -24,16 +24,16 @@ struct mDoMtx_stack_c { static u8 now[48]; }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; - struct J3DAnmTransform {}; +struct J3DModelData {}; + +struct Z2Creature {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -49,10 +49,10 @@ struct fopAc_ac_c { /* 80018B64 */ fopAc_ac_c(); }; -struct J3DJoint {}; - struct J3DModel {}; +struct J3DJoint {}; + struct daE_PH_c { /* 8073D48C */ void initCcSph(); /* 8073D5C4 */ void SetStopingCam(); @@ -442,17 +442,17 @@ SECTION_RODATA static u8 const lit_3767[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80741BF4, &lit_3767); +COMPILER_STRIP_GATE(0x80741BF4, &lit_3767); /* 80741BF8-80741BFC 000004 0004+00 1/11 0/0 0/0 .rodata @3768 */ SECTION_RODATA static f32 const lit_3768 = 1.0f; -COMPILER_STRIP_GATE(80741BF8, &lit_3768); +COMPILER_STRIP_GATE(0x80741BF8, &lit_3768); /* 80741BFC-80741C00 000008 0004+00 0/5 0/0 0/0 .rodata @3769 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3769 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(80741BFC, &lit_3769); +COMPILER_STRIP_GATE(0x80741BFC, &lit_3769); #pragma pop /* 80741D1C-80741D3C -00001 0020+00 1/0 0/0 0/0 .data l_daE_PH_Method */ @@ -529,7 +529,7 @@ SECTION_RODATA static u8 const ccSphSrc[64] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC2, 0xC8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0x70, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80741C00, &ccSphSrc); +COMPILER_STRIP_GATE(0x80741C00, &ccSphSrc); /* 8073D48C-8073D4EC 00012C 0060+00 1/1 0/0 0/0 .text initCcSph__8daE_PH_cFv */ #pragma push @@ -544,7 +544,7 @@ asm void daE_PH_c::initCcSph() { /* ############################################################################################## */ /* 80741C40-80741C44 00004C 0004+00 1/7 0/0 0/0 .rodata @3805 */ SECTION_RODATA static f32 const lit_3805 = 100.0f; -COMPILER_STRIP_GATE(80741C40, &lit_3805); +COMPILER_STRIP_GATE(0x80741C40, &lit_3805); /* 8073D4EC-8073D5C4 00018C 00D8+00 1/1 0/0 0/0 .text other_bg_check__FP8daE_PH_cP10fopAc_ac_c */ #pragma push @@ -621,14 +621,14 @@ static asm void JointCallBack(J3DJoint* param_0, int param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4021 = -10.0f; -COMPILER_STRIP_GATE(80741C44, &lit_4021); +COMPILER_STRIP_GATE(0x80741C44, &lit_4021); #pragma pop /* 80741C48-80741C4C 000054 0004+00 0/3 0/0 0/0 .rodata @4022 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4022 = 80.0f; -COMPILER_STRIP_GATE(80741C48, &lit_4022); +COMPILER_STRIP_GATE(0x80741C48, &lit_4022); #pragma pop /* 8073D950-8073D9EC 0005F0 009C+00 1/1 0/0 0/0 .text setCcSph__8daE_PH_cFv */ @@ -641,6 +641,13 @@ asm void daE_PH_c::setCcSph() { } #pragma pop +/* ############################################################################################## */ +/* 80741D0C-80741D0C 000118 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80741D0C = "E_PH"; +#pragma pop + /* 8073D9EC-8073DAE4 00068C 00F8+00 1/1 0/0 0/0 .text useHeapInit__FP10fopAc_ac_c */ #pragma push #pragma optimization_level 0 @@ -674,7 +681,7 @@ static asm void daE_PH_Delete(daE_PH_c* param_0) { /* ############################################################################################## */ /* 80741C4C-80741C50 000058 0004+00 1/1 0/0 0/0 .rodata @4064 */ SECTION_RODATA static f32 const lit_4064 = -1.0f; -COMPILER_STRIP_GATE(80741C4C, &lit_4064); +COMPILER_STRIP_GATE(0x80741C4C, &lit_4064); /* 8073DB28-8073DBD4 0007C8 00AC+00 5/5 0/0 0/0 .text SetAnm__8daE_PH_cFiiff */ #pragma push @@ -691,7 +698,7 @@ asm void daE_PH_c::SetAnm(int param_0, int param_1, f32 param_2, f32 param_3) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4128 = 1000000000.0f; -COMPILER_STRIP_GATE(80741C50, &lit_4128); +COMPILER_STRIP_GATE(0x80741C50, &lit_4128); #pragma pop /* 80741C54-80741C5C 000060 0008+00 0/7 0/0 0/0 .rodata @4129 */ @@ -700,7 +707,7 @@ COMPILER_STRIP_GATE(80741C50, &lit_4128); SECTION_RODATA static u8 const lit_4129[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80741C54, &lit_4129); +COMPILER_STRIP_GATE(0x80741C54, &lit_4129); #pragma pop /* 80741C5C-80741C64 000068 0008+00 0/7 0/0 0/0 .rodata @4130 */ @@ -709,7 +716,7 @@ COMPILER_STRIP_GATE(80741C54, &lit_4129); SECTION_RODATA static u8 const lit_4130[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80741C5C, &lit_4130); +COMPILER_STRIP_GATE(0x80741C5C, &lit_4130); #pragma pop /* 80741C64-80741C6C 000070 0008+00 0/7 0/0 0/0 .rodata @4131 */ @@ -718,7 +725,7 @@ COMPILER_STRIP_GATE(80741C5C, &lit_4130); SECTION_RODATA static u8 const lit_4131[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80741C64, &lit_4131); +COMPILER_STRIP_GATE(0x80741C64, &lit_4131); #pragma pop /* 8073DBD4-8073DDF8 000874 0224+00 1/1 0/0 0/0 .text SearchNearP__8daE_PH_cFv */ @@ -736,7 +743,7 @@ asm void daE_PH_c::SearchNearP() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4196 = 5.0f; -COMPILER_STRIP_GATE(80741C6C, &lit_4196); +COMPILER_STRIP_GATE(0x80741C6C, &lit_4196); #pragma pop /* 8073DDF8-8073E068 000A98 0270+00 2/2 0/0 0/0 .text FlyAnm__8daE_PH_cFv */ @@ -752,13 +759,13 @@ asm void daE_PH_c::FlyAnm() { /* ############################################################################################## */ /* 80741C70-80741C74 00007C 0004+00 1/1 0/0 0/0 .rodata @4213 */ SECTION_RODATA static f32 const lit_4213 = 50.0f; -COMPILER_STRIP_GATE(80741C70, &lit_4213); +COMPILER_STRIP_GATE(0x80741C70, &lit_4213); /* 80741C74-80741C7C 000080 0008+00 3/7 0/0 0/0 .rodata @4215 */ SECTION_RODATA static u8 const lit_4215[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80741C74, &lit_4215); +COMPILER_STRIP_GATE(0x80741C74, &lit_4215); /* 80741DC0-80741DC4 000008 0004+00 2/2 0/0 0/0 .bss None */ static u8 data_80741DC0[4]; @@ -784,25 +791,25 @@ asm void daE_PH_c::SetShapeAngle() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4284 = 10.0f; -COMPILER_STRIP_GATE(80741C7C, &lit_4284); +COMPILER_STRIP_GATE(0x80741C7C, &lit_4284); #pragma pop /* 80741C80-80741C84 00008C 0004+00 0/3 0/0 0/0 .rodata @4285 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4285 = 20.0f; -COMPILER_STRIP_GATE(80741C80, &lit_4285); +COMPILER_STRIP_GATE(0x80741C80, &lit_4285); #pragma pop /* 80741C84-80741C88 000090 0004+00 1/2 0/0 0/0 .rodata @4286 */ SECTION_RODATA static f32 const lit_4286 = 3.0f / 50.0f; -COMPILER_STRIP_GATE(80741C84, &lit_4286); +COMPILER_STRIP_GATE(0x80741C84, &lit_4286); /* 80741C88-80741C8C 000094 0004+00 0/2 0/0 0/0 .rodata @4287 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4287 = -1000000000.0f; -COMPILER_STRIP_GATE(80741C88, &lit_4287); +COMPILER_STRIP_GATE(0x80741C88, &lit_4287); #pragma pop /* 8073E22C-8073E4A4 000ECC 0278+00 1/1 0/0 0/0 .text GoTarget__8daE_PH_cFv */ @@ -820,14 +827,14 @@ asm void daE_PH_c::GoTarget() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4406 = 1.5f; -COMPILER_STRIP_GATE(80741C8C, &lit_4406); +COMPILER_STRIP_GATE(0x80741C8C, &lit_4406); #pragma pop /* 80741C90-80741C94 00009C 0004+00 0/3 0/0 0/0 .rodata @4407 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4407 = 0.5f; -COMPILER_STRIP_GATE(80741C90, &lit_4407); +COMPILER_STRIP_GATE(0x80741C90, &lit_4407); #pragma pop /* 80741C94-80741C9C 0000A0 0004+04 0/2 0/0 0/0 .rodata @4408 */ @@ -838,7 +845,7 @@ SECTION_RODATA static f32 const lit_4408[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80741C94, &lit_4408); +COMPILER_STRIP_GATE(0x80741C94, &lit_4408); #pragma pop /* 80741C9C-80741CA4 0000A8 0008+00 0/3 0/0 0/0 .rodata @4410 */ @@ -847,7 +854,7 @@ COMPILER_STRIP_GATE(80741C94, &lit_4408); SECTION_RODATA static u8 const lit_4410[8] = { 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80741C9C, &lit_4410); +COMPILER_STRIP_GATE(0x80741C9C, &lit_4410); #pragma pop /* 8073E4A4-8073E8B0 001144 040C+00 2/2 0/0 0/0 .text SetCheckAngle__8daE_PH_cFv */ @@ -875,7 +882,7 @@ asm void daE_PH_c::C_CheckPoint() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4447 = 3.0f; -COMPILER_STRIP_GATE(80741CA4, &lit_4447); +COMPILER_STRIP_GATE(0x80741CA4, &lit_4447); #pragma pop /* 8073E924-8073EA50 0015C4 012C+00 2/2 0/0 0/0 .text DownBoots__8daE_PH_cFv */ @@ -901,7 +908,7 @@ asm void daE_PH_c::UpBoots() { /* ############################################################################################## */ /* 80741CA8-80741CAC 0000B4 0004+00 1/2 0/0 0/0 .rodata @4501 */ SECTION_RODATA static f32 const lit_4501 = 6.0f; -COMPILER_STRIP_GATE(80741CA8, &lit_4501); +COMPILER_STRIP_GATE(0x80741CA8, &lit_4501); /* 8073EB64-8073ED0C 001804 01A8+00 1/1 0/0 0/0 .text C_Action__8daE_PH_cFv */ #pragma push @@ -936,7 +943,7 @@ asm void daE_PH_c::SearchBackPos() { /* ############################################################################################## */ /* 80741CAC-80741CB0 0000B8 0004+00 1/2 0/0 0/0 .rodata @4548 */ SECTION_RODATA static f32 const lit_4548 = 3.0f / 10.0f; -COMPILER_STRIP_GATE(80741CAC, &lit_4548); +COMPILER_STRIP_GATE(0x80741CAC, &lit_4548); /* 8073EDA0-8073EE68 001A40 00C8+00 1/1 0/0 0/0 .text S_SetPlaySpeed__8daE_PH_cFv */ #pragma push @@ -953,14 +960,14 @@ asm void daE_PH_c::S_SetPlaySpeed() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4642 = 1.0f / 100.0f; -COMPILER_STRIP_GATE(80741CB0, &lit_4642); +COMPILER_STRIP_GATE(0x80741CB0, &lit_4642); #pragma pop /* 80741CB4-80741CB8 0000C0 0004+00 0/1 0/0 0/0 .rodata @4643 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4643 = 1.0f / 20.0f; -COMPILER_STRIP_GATE(80741CB4, &lit_4643); +COMPILER_STRIP_GATE(0x80741CB4, &lit_4643); #pragma pop /* 8073EE68-8073F250 001B08 03E8+00 1/1 0/0 0/0 .text S_GoTarget__8daE_PH_cFv */ @@ -978,7 +985,7 @@ asm void daE_PH_c::S_GoTarget() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4688 = 200.0f; -COMPILER_STRIP_GATE(80741CB8, &lit_4688); +COMPILER_STRIP_GATE(0x80741CB8, &lit_4688); #pragma pop /* 8073F250-8073F3D4 001EF0 0184+00 1/1 0/0 0/0 .text S_CheckPoint__8daE_PH_cFv */ @@ -1006,7 +1013,7 @@ asm void daE_PH_c::S_SetAngle() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4886 = 1000.0f; -COMPILER_STRIP_GATE(80741CBC, &lit_4886); +COMPILER_STRIP_GATE(0x80741CBC, &lit_4886); #pragma pop /* 8073F8C8-8073FB70 002568 02A8+00 1/1 0/0 0/0 .text FlyAnm2__8daE_PH_cFv */ @@ -1034,7 +1041,7 @@ asm void daE_PH_c::S_Action() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4924 = 30.0f; -COMPILER_STRIP_GATE(80741CC0, &lit_4924); +COMPILER_STRIP_GATE(0x80741CC0, &lit_4924); #pragma pop /* 8073FBDC-8073FD70 00287C 0194+00 1/1 0/0 0/0 .text StopAction__8daE_PH_cFv */ @@ -1050,11 +1057,17 @@ asm void daE_PH_c::StopAction() { /* ############################################################################################## */ /* 80741CC4-80741CC8 0000D0 0004+00 1/2 0/0 0/0 .rodata @4979 */ SECTION_RODATA static f32 const lit_4979 = 2000.0f; -COMPILER_STRIP_GATE(80741CC4, &lit_4979); +COMPILER_STRIP_GATE(0x80741CC4, &lit_4979); /* 80741CC8-80741CCC 0000D4 0004+00 1/1 0/0 0/0 .rodata @4980 */ SECTION_RODATA static f32 const lit_4980 = 3000.0f; -COMPILER_STRIP_GATE(80741CC8, &lit_4980); +COMPILER_STRIP_GATE(0x80741CC8, &lit_4980); + +/* 80741D0C-80741D0C 000118 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80741D11 = "D_MN07A"; +#pragma pop /* 8073FD70-80740024 002A10 02B4+00 1/1 0/0 0/0 .text Action__8daE_PH_cFv */ #pragma push @@ -1081,35 +1094,35 @@ asm void daE_PH_c::SetHeadAngle(s16 param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5051 = -2638.0f; -COMPILER_STRIP_GATE(80741CCC, &lit_5051); +COMPILER_STRIP_GATE(0x80741CCC, &lit_5051); #pragma pop /* 80741CD0-80741CD4 0000DC 0004+00 0/1 0/0 0/0 .rodata @5052 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5052 = 2566.0f; -COMPILER_STRIP_GATE(80741CD0, &lit_5052); +COMPILER_STRIP_GATE(0x80741CD0, &lit_5052); #pragma pop /* 80741CD4-80741CD8 0000E0 0004+00 0/2 0/0 0/0 .rodata @5053 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5053 = 500.0f; -COMPILER_STRIP_GATE(80741CD4, &lit_5053); +COMPILER_STRIP_GATE(0x80741CD4, &lit_5053); #pragma pop /* 80741CD8-80741CDC 0000E4 0004+00 0/1 0/0 0/0 .rodata @5054 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5054 = 40.0f; -COMPILER_STRIP_GATE(80741CD8, &lit_5054); +COMPILER_STRIP_GATE(0x80741CD8, &lit_5054); #pragma pop /* 80741CDC-80741CE0 0000E8 0004+00 0/2 0/0 0/0 .rodata @5055 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5055 = -500.0f; -COMPILER_STRIP_GATE(80741CDC, &lit_5055); +COMPILER_STRIP_GATE(0x80741CDC, &lit_5055); #pragma pop /* 80740098-80740318 002D38 0280+00 1/1 0/0 0/0 .text CamAction__8daE_PH_cFv */ @@ -1127,49 +1140,49 @@ asm void daE_PH_c::CamAction() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5163 = 150.0f; -COMPILER_STRIP_GATE(80741CE0, &lit_5163); +COMPILER_STRIP_GATE(0x80741CE0, &lit_5163); #pragma pop /* 80741CE4-80741CE8 0000F0 0004+00 0/1 0/0 0/0 .rodata @5164 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5164 = 154.0f; -COMPILER_STRIP_GATE(80741CE4, &lit_5164); +COMPILER_STRIP_GATE(0x80741CE4, &lit_5164); #pragma pop /* 80741CE8-80741CEC 0000F4 0004+00 0/1 0/0 0/0 .rodata @5165 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5165 = 70.0f; -COMPILER_STRIP_GATE(80741CE8, &lit_5165); +COMPILER_STRIP_GATE(0x80741CE8, &lit_5165); #pragma pop /* 80741CEC-80741CF0 0000F8 0004+00 0/1 0/0 0/0 .rodata @5166 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5166 = 126.0f; -COMPILER_STRIP_GATE(80741CEC, &lit_5166); +COMPILER_STRIP_GATE(0x80741CEC, &lit_5166); #pragma pop /* 80741CF0-80741CF4 0000FC 0004+00 0/1 0/0 0/0 .rodata @5167 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5167 = -9.0f / 5.0f; -COMPILER_STRIP_GATE(80741CF0, &lit_5167); +COMPILER_STRIP_GATE(0x80741CF0, &lit_5167); #pragma pop /* 80741CF4-80741CF8 000100 0004+00 0/1 0/0 0/0 .rodata @5168 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5168 = 15.0f; -COMPILER_STRIP_GATE(80741CF4, &lit_5168); +COMPILER_STRIP_GATE(0x80741CF4, &lit_5168); #pragma pop /* 80741CF8-80741CFC 000104 0004+00 0/1 0/0 0/0 .rodata @5169 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5169 = 3.5f; -COMPILER_STRIP_GATE(80741CF8, &lit_5169); +COMPILER_STRIP_GATE(0x80741CF8, &lit_5169); #pragma pop /* 80740318-807408C0 002FB8 05A8+00 1/1 0/0 0/0 .text DemoAction__8daE_PH_cFv */ @@ -1187,7 +1200,7 @@ asm void daE_PH_c::DemoAction() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5218 = 2300.0f; -COMPILER_STRIP_GATE(80741CFC, &lit_5218); +COMPILER_STRIP_GATE(0x80741CFC, &lit_5218); #pragma pop /* 807408C0-80740B3C 003560 027C+00 1/1 0/0 0/0 .text ToumeiAction__8daE_PH_cFv */ @@ -1225,14 +1238,14 @@ asm void daE_PH_c::AttentionSet() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5359 = 2.0f; -COMPILER_STRIP_GATE(80741D00, &lit_5359); +COMPILER_STRIP_GATE(0x80741D00, &lit_5359); #pragma pop /* 80741D04-80741D08 000110 0004+00 0/1 0/0 0/0 .rodata @5360 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5360 = -15.0f; -COMPILER_STRIP_GATE(80741D04, &lit_5360); +COMPILER_STRIP_GATE(0x80741D04, &lit_5360); #pragma pop /* 80740E70-807410B0 003B10 0240+00 1/1 0/0 0/0 .text ObjHit__8daE_PH_cFv */ @@ -1268,7 +1281,7 @@ asm void daE_PH_c::De_Timer() { /* ############################################################################################## */ /* 80741D08-80741D0C 000114 0004+00 1/1 0/0 0/0 .rodata @5389 */ SECTION_RODATA static f32 const lit_5389 = 170.0f; -COMPILER_STRIP_GATE(80741D08, &lit_5389); +COMPILER_STRIP_GATE(0x80741D08, &lit_5389); /* 807411C0-80741200 003E60 0040+00 1/1 0/0 0/0 .text EyeSet__8daE_PH_cFv */ #pragma push @@ -1387,7 +1400,7 @@ asm void __sinit_d_a_e_ph_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80741B94 = (void*)__sinit_d_a_e_ph_cpp; +REGISTER_CTORS(0x80741B94, __sinit_d_a_e_ph_cpp); #pragma pop /* 80741BD0-80741BD8 004870 0008+00 1/0 0/0 0/0 .text @36@__dt__12dBgS_ObjAcchFv */ @@ -1410,10 +1423,4 @@ static asm void func_80741BD8() { } #pragma pop -/* 80741D0C-80741D19 000118 000D+00 6/6 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80741D0C = "E_PH"; -SECTION_DEAD static char const* const stringBase_80741D11 = "D_MN07A"; -#pragma pop +/* 80741D0C-80741D0C 000118 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/e/d_a_e_pm/d_a_e_pm.cpp b/rel/d/a/e/d_a_e_pm/d_a_e_pm.cpp index b1920db1f4f..174b908a7d7 100644 --- a/rel/d/a/e/d_a_e_pm/d_a_e_pm.cpp +++ b/rel/d/a/e/d_a_e_pm/d_a_e_pm.cpp @@ -39,16 +39,16 @@ struct mDoExt_btpAnm { /* 8000D5E8 */ void entry(J3DMaterialTable*, s16); }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; - struct J3DAnmTransform {}; +struct J3DModelData {}; + +struct Z2Creature {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -86,10 +86,10 @@ struct daPy_py_c { static u8 m_midnaActor[4]; }; -struct J3DJoint {}; - struct J3DModel {}; +struct J3DJoint {}; + struct daE_PM_c { /* 80741FB4 */ void DemoSkip(int); /* 80742004 */ void DemoSkipCallBack(void*, int); @@ -630,7 +630,7 @@ extern "C" void __register_global_object(); /* ############################################################################################## */ /* 8074BF3C-8074BF40 000000 0004+00 35/35 0/0 0/0 .rodata @3910 */ SECTION_RODATA static f32 const lit_3910 = 100.0f; -COMPILER_STRIP_GATE(8074BF3C, &lit_3910); +COMPILER_STRIP_GATE(0x8074BF3C, &lit_3910); /* 8074BF40-8074BF44 000004 0004+00 5/35 0/0 0/0 .rodata @3911 */ SECTION_RODATA static u8 const lit_3911[4] = { @@ -639,7 +639,7 @@ SECTION_RODATA static u8 const lit_3911[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(8074BF40, &lit_3911); +COMPILER_STRIP_GATE(0x8074BF40, &lit_3911); /* 8074BF44-8074BF4C 000008 0004+04 3/28 0/0 0/0 .rodata @3912 */ SECTION_RODATA static f32 const lit_3912[1 + 1 /* padding */] = { @@ -647,7 +647,7 @@ SECTION_RODATA static f32 const lit_3912[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(8074BF44, &lit_3912); +COMPILER_STRIP_GATE(0x8074BF44, &lit_3912); /* 8074BF4C-8074BF54 000010 0008+00 0/9 0/0 0/0 .rodata @3913 */ #pragma push @@ -655,7 +655,7 @@ COMPILER_STRIP_GATE(8074BF44, &lit_3912); SECTION_RODATA static u8 const lit_3913[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8074BF4C, &lit_3913); +COMPILER_STRIP_GATE(0x8074BF4C, &lit_3913); #pragma pop /* 8074BF54-8074BF5C 000018 0008+00 0/9 0/0 0/0 .rodata @3914 */ @@ -664,7 +664,7 @@ COMPILER_STRIP_GATE(8074BF4C, &lit_3913); SECTION_RODATA static u8 const lit_3914[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8074BF54, &lit_3914); +COMPILER_STRIP_GATE(0x8074BF54, &lit_3914); #pragma pop /* 8074BF5C-8074BF64 000020 0008+00 0/9 0/0 0/0 .rodata @3915 */ @@ -673,77 +673,77 @@ COMPILER_STRIP_GATE(8074BF54, &lit_3914); SECTION_RODATA static u8 const lit_3915[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8074BF5C, &lit_3915); +COMPILER_STRIP_GATE(0x8074BF5C, &lit_3915); #pragma pop /* 8074BF64-8074BF68 000028 0004+00 0/2 0/0 0/0 .rodata @3916 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3916 = 1.0f / 100.0f; -COMPILER_STRIP_GATE(8074BF64, &lit_3916); +COMPILER_STRIP_GATE(0x8074BF64, &lit_3916); #pragma pop /* 8074BF68-8074BF6C 00002C 0004+00 0/1 0/0 0/0 .rodata @3933 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3933 = 13.0f / 10.0f; -COMPILER_STRIP_GATE(8074BF68, &lit_3933); +COMPILER_STRIP_GATE(0x8074BF68, &lit_3933); #pragma pop /* 8074BF6C-8074BF70 000030 0004+00 0/7 0/0 0/0 .rodata @3934 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3934 = 400.0f; -COMPILER_STRIP_GATE(8074BF6C, &lit_3934); +COMPILER_STRIP_GATE(0x8074BF6C, &lit_3934); #pragma pop /* 8074BF70-8074BF74 000034 0004+00 0/4 0/0 0/0 .rodata @3935 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3935 = 20.0f; -COMPILER_STRIP_GATE(8074BF70, &lit_3935); +COMPILER_STRIP_GATE(0x8074BF70, &lit_3935); #pragma pop /* 8074BF74-8074BF78 000038 0004+00 0/6 0/0 0/0 .rodata @3936 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3936 = 300.0f; -COMPILER_STRIP_GATE(8074BF74, &lit_3936); +COMPILER_STRIP_GATE(0x8074BF74, &lit_3936); #pragma pop /* 8074BF78-8074BF7C 00003C 0004+00 0/2 0/0 0/0 .rodata @3937 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3937 = 180.0f; -COMPILER_STRIP_GATE(8074BF78, &lit_3937); +COMPILER_STRIP_GATE(0x8074BF78, &lit_3937); #pragma pop /* 8074BF7C-8074BF80 000040 0004+00 0/1 0/0 0/0 .rodata @3938 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3938 = 90.0f; -COMPILER_STRIP_GATE(8074BF7C, &lit_3938); +COMPILER_STRIP_GATE(0x8074BF7C, &lit_3938); #pragma pop /* 8074BF80-8074BF84 000044 0004+00 0/1 0/0 0/0 .rodata @3939 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3939 = 255.0f; -COMPILER_STRIP_GATE(8074BF80, &lit_3939); +COMPILER_STRIP_GATE(0x8074BF80, &lit_3939); #pragma pop /* 8074BF84-8074BF88 000048 0004+00 0/1 0/0 0/0 .rodata @3940 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3940 = 85.0f; -COMPILER_STRIP_GATE(8074BF84, &lit_3940); +COMPILER_STRIP_GATE(0x8074BF84, &lit_3940); #pragma pop /* 8074BF88-8074BF8C 00004C 0004+00 0/1 0/0 0/0 .rodata @3941 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3941 = 4.0f; -COMPILER_STRIP_GATE(8074BF88, &lit_3941); +COMPILER_STRIP_GATE(0x8074BF88, &lit_3941); #pragma pop /* 8074C150-8074C15C 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ @@ -1017,6 +1017,13 @@ asm void daE_PM_c::DemoSkipCallBack(void* param_0, int param_1) { } #pragma pop +/* ############################################################################################## */ +/* 8074C148-8074C148 00020C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8074C148 = "E_PM"; +#pragma pop + /* 80742038-80742388 000238 0350+00 1/1 0/0 0/0 .text CreateHeap__8daE_PM_cFv */ #pragma push #pragma optimization_level 0 @@ -1066,7 +1073,7 @@ SECTION_RODATA static u8 const ccCylSrc[68] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0x20, 0x00, 0x00, 0x43, 0x02, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8074BF8C, &ccCylSrc); +COMPILER_STRIP_GATE(0x8074BF8C, &ccCylSrc); /* 80742448-807424C0 000648 0078+00 1/1 0/0 0/0 .text initCcCylinder__8daE_PM_cFv */ #pragma push @@ -1121,7 +1128,7 @@ asm void daE_PM_c::Particle_Set(u16 param_0, cXyz param_1) { /* ############################################################################################## */ /* 8074BFD0-8074BFD4 000094 0004+00 1/3 0/0 0/0 .rodata @4114 */ SECTION_RODATA static f32 const lit_4114 = -1.0f; -COMPILER_STRIP_GATE(8074BFD0, &lit_4114); +COMPILER_STRIP_GATE(0x8074BFD0, &lit_4114); /* 80742674-80742720 000874 00AC+00 20/20 0/0 0/0 .text SetAnm__8daE_PM_cFiiff */ #pragma push @@ -1146,7 +1153,7 @@ asm cM3dGPla::~cM3dGPla() { /* ############################################################################################## */ /* 8074BFD4-8074BFD8 000098 0004+00 2/4 0/0 0/0 .rodata @4153 */ SECTION_RODATA static f32 const lit_4153 = 30.0f; -COMPILER_STRIP_GATE(8074BFD4, &lit_4153); +COMPILER_STRIP_GATE(0x8074BFD4, &lit_4153); /* 80742768-80742810 000968 00A8+00 2/2 0/0 0/0 .text way_bg_check2__FP8daE_PM_c4cXyz4cXyz */ #pragma push @@ -1161,7 +1168,7 @@ static asm void way_bg_check2(daE_PM_c* param_0, cXyz param_1, cXyz param_2) { /* ############################################################################################## */ /* 8074BFD8-8074BFDC 00009C 0004+00 1/1 0/0 0/0 .rodata @4223 */ SECTION_RODATA static f32 const lit_4223 = 40.0f; -COMPILER_STRIP_GATE(8074BFD8, &lit_4223); +COMPILER_STRIP_GATE(0x8074BFD8, &lit_4223); /* 80742810-807428A8 000A10 0098+00 1/1 0/0 0/0 .text Yazirushi__8daE_PM_cFv */ #pragma push @@ -1178,7 +1185,7 @@ asm void daE_PM_c::Yazirushi() { SECTION_RODATA static u8 const lit_4239[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8074BFDC, &lit_4239); +COMPILER_STRIP_GATE(0x8074BFDC, &lit_4239); /* 807428A8-80742958 000AA8 00B0+00 1/1 0/0 0/0 .text SearchRndP__8daE_PM_cFv */ #pragma push @@ -1310,7 +1317,7 @@ asm void daE_PM_c::SearchFarP() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4407 = 1000000000.0f; -COMPILER_STRIP_GATE(8074BFE4, &lit_4407); +COMPILER_STRIP_GATE(0x8074BFE4, &lit_4407); #pragma pop /* 80742C94-80742E1C 000E94 0188+00 3/3 0/0 0/0 .text SearchNearP__8daE_PM_cFv */ @@ -1346,7 +1353,7 @@ asm void daE_PM_c::SetGakkiEffect() { /* ############################################################################################## */ /* 8074BFE8-8074BFEC 0000AC 0004+00 1/1 0/0 0/0 .rodata @4520 */ SECTION_RODATA static f32 const lit_4520 = 65.0f; -COMPILER_STRIP_GATE(8074BFE8, &lit_4520); +COMPILER_STRIP_GATE(0x8074BFE8, &lit_4520); /* 807430C4-80743210 0012C4 014C+00 4/4 0/0 0/0 .text CameraSet__8daE_PM_cFv */ #pragma push @@ -1383,21 +1390,21 @@ asm void daE_PM_c::SetStopCam(cXyz param_0, f32 param_1, f32 param_2, s16 param_ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4593 = 2.0f; -COMPILER_STRIP_GATE(8074BFEC, &lit_4593); +COMPILER_STRIP_GATE(0x8074BFEC, &lit_4593); #pragma pop /* 8074BFF0-8074BFF4 0000B4 0004+00 0/1 0/0 0/0 .rodata @4594 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4594 = 160.0f; -COMPILER_STRIP_GATE(8074BFF0, &lit_4594); +COMPILER_STRIP_GATE(0x8074BFF0, &lit_4594); #pragma pop /* 8074BFF4-8074BFF8 0000B8 0004+00 0/2 0/0 0/0 .rodata @4595 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4595 = 80.0f; -COMPILER_STRIP_GATE(8074BFF4, &lit_4595); +COMPILER_STRIP_GATE(0x8074BFF4, &lit_4595); #pragma pop /* 807433E8-80743524 0015E8 013C+00 1/1 0/0 0/0 .text SetMoveCam2__8daE_PM_cFff */ @@ -1435,119 +1442,119 @@ asm void daE_PM_c::SetReleaseCam() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4778 = -10728.0f; -COMPILER_STRIP_GATE(8074BFF8, &lit_4778); +COMPILER_STRIP_GATE(0x8074BFF8, &lit_4778); #pragma pop /* 8074BFFC-8074C000 0000C0 0004+00 0/1 0/0 0/0 .rodata @4779 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4779 = 17052.0f; -COMPILER_STRIP_GATE(8074BFFC, &lit_4779); +COMPILER_STRIP_GATE(0x8074BFFC, &lit_4779); #pragma pop /* 8074C000-8074C004 0000C4 0004+00 0/2 0/0 0/0 .rodata @4780 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4780 = 800.0f; -COMPILER_STRIP_GATE(8074C000, &lit_4780); +COMPILER_STRIP_GATE(0x8074C000, &lit_4780); #pragma pop /* 8074C004-8074C008 0000C8 0004+00 0/1 0/0 0/0 .rodata @4781 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4781 = -10477.0f; -COMPILER_STRIP_GATE(8074C004, &lit_4781); +COMPILER_STRIP_GATE(0x8074C004, &lit_4781); #pragma pop /* 8074C008-8074C00C 0000CC 0004+00 0/1 0/0 0/0 .rodata @4782 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4782 = 17710.0f; -COMPILER_STRIP_GATE(8074C008, &lit_4782); +COMPILER_STRIP_GATE(0x8074C008, &lit_4782); #pragma pop /* 8074C00C-8074C010 0000D0 0004+00 0/2 0/0 0/0 .rodata @4783 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4783 = 1500.0f; -COMPILER_STRIP_GATE(8074C00C, &lit_4783); +COMPILER_STRIP_GATE(0x8074C00C, &lit_4783); #pragma pop /* 8074C010-8074C014 0000D4 0004+00 0/1 0/0 0/0 .rodata @4784 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4784 = 8500.0f; -COMPILER_STRIP_GATE(8074C010, &lit_4784); +COMPILER_STRIP_GATE(0x8074C010, &lit_4784); #pragma pop /* 8074C014-8074C018 0000D8 0004+00 0/1 0/0 0/0 .rodata @4785 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4785 = 600.0f; -COMPILER_STRIP_GATE(8074C014, &lit_4785); +COMPILER_STRIP_GATE(0x8074C014, &lit_4785); #pragma pop /* 8074C018-8074C01C 0000DC 0004+00 0/11 0/0 0/0 .rodata @4786 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4786 = 200.0f; -COMPILER_STRIP_GATE(8074C018, &lit_4786); +COMPILER_STRIP_GATE(0x8074C018, &lit_4786); #pragma pop /* 8074C01C-8074C020 0000E0 0004+00 0/2 0/0 0/0 .rodata @4787 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4787 = -5.0f; -COMPILER_STRIP_GATE(8074C01C, &lit_4787); +COMPILER_STRIP_GATE(0x8074C01C, &lit_4787); #pragma pop /* 8074C020-8074C024 0000E4 0004+00 0/20 0/0 0/0 .rodata @4788 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4788 = 5.0f; -COMPILER_STRIP_GATE(8074C020, &lit_4788); +COMPILER_STRIP_GATE(0x8074C020, &lit_4788); #pragma pop /* 8074C024-8074C028 0000E8 0004+00 0/1 0/0 0/0 .rodata @4789 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4789 = 900.0f; -COMPILER_STRIP_GATE(8074C024, &lit_4789); +COMPILER_STRIP_GATE(0x8074C024, &lit_4789); #pragma pop /* 8074C028-8074C02C 0000EC 0004+00 0/1 0/0 0/0 .rodata @4790 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4790 = 1.0f / 40.0f; -COMPILER_STRIP_GATE(8074C028, &lit_4790); +COMPILER_STRIP_GATE(0x8074C028, &lit_4790); #pragma pop /* 8074C02C-8074C030 0000F0 0004+00 0/13 0/0 0/0 .rodata @4791 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4791 = 50.0f; -COMPILER_STRIP_GATE(8074C02C, &lit_4791); +COMPILER_STRIP_GATE(0x8074C02C, &lit_4791); #pragma pop /* 8074C030-8074C034 0000F4 0004+00 0/2 0/0 0/0 .rodata @4792 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4792 = -300.0f; -COMPILER_STRIP_GATE(8074C030, &lit_4792); +COMPILER_STRIP_GATE(0x8074C030, &lit_4792); #pragma pop /* 8074C034-8074C038 0000F8 0004+00 0/1 0/0 0/0 .rodata @4793 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4793 = 3.0f / 20.0f; -COMPILER_STRIP_GATE(8074C034, &lit_4793); +COMPILER_STRIP_GATE(0x8074C034, &lit_4793); #pragma pop /* 8074C038-8074C03C 0000FC 0004+00 0/8 0/0 0/0 .rodata @4794 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4794 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(8074C038, &lit_4794); +COMPILER_STRIP_GATE(0x8074C038, &lit_4794); #pragma pop /* 807436A4-80743D10 0018A4 066C+00 1/1 0/0 0/0 .text Ap_StartAction__8daE_PM_cFv */ @@ -1575,77 +1582,77 @@ static asm void s_obj_sub(void* param_0, void* param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4972 = 500.0f; -COMPILER_STRIP_GATE(8074C03C, &lit_4972); +COMPILER_STRIP_GATE(0x8074C03C, &lit_4972); #pragma pop /* 8074C040-8074C044 000104 0004+00 0/3 0/0 0/0 .rodata @4973 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4973 = 150.0f; -COMPILER_STRIP_GATE(8074C040, &lit_4973); +COMPILER_STRIP_GATE(0x8074C040, &lit_4973); #pragma pop /* 8074C044-8074C048 000108 0004+00 0/1 0/0 0/0 .rodata @4974 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4974 = -11239.0f; -COMPILER_STRIP_GATE(8074C044, &lit_4974); +COMPILER_STRIP_GATE(0x8074C044, &lit_4974); #pragma pop /* 8074C048-8074C04C 00010C 0004+00 0/1 0/0 0/0 .rodata @4975 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4975 = 1850.0f; -COMPILER_STRIP_GATE(8074C048, &lit_4975); +COMPILER_STRIP_GATE(0x8074C048, &lit_4975); #pragma pop /* 8074C04C-8074C050 000110 0004+00 0/1 0/0 0/0 .rodata @4976 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4976 = 16932.0f; -COMPILER_STRIP_GATE(8074C04C, &lit_4976); +COMPILER_STRIP_GATE(0x8074C04C, &lit_4976); #pragma pop /* 8074C050-8074C054 000114 0004+00 0/1 0/0 0/0 .rodata @4977 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4977 = -10954.0f; -COMPILER_STRIP_GATE(8074C050, &lit_4977); +COMPILER_STRIP_GATE(0x8074C050, &lit_4977); #pragma pop /* 8074C054-8074C058 000118 0004+00 0/2 0/0 0/0 .rodata @4978 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4978 = 1900.0f; -COMPILER_STRIP_GATE(8074C054, &lit_4978); +COMPILER_STRIP_GATE(0x8074C054, &lit_4978); #pragma pop /* 8074C058-8074C05C 00011C 0004+00 0/1 0/0 0/0 .rodata @4979 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4979 = 17025.0f; -COMPILER_STRIP_GATE(8074C058, &lit_4979); +COMPILER_STRIP_GATE(0x8074C058, &lit_4979); #pragma pop /* 8074C05C-8074C060 000120 0004+00 0/2 0/0 0/0 .rodata @4980 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4980 = -500.0f; -COMPILER_STRIP_GATE(8074C05C, &lit_4980); +COMPILER_STRIP_GATE(0x8074C05C, &lit_4980); #pragma pop /* 8074C060-8074C064 000124 0004+00 0/1 0/0 0/0 .rodata @4981 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4981 = 120.0f; -COMPILER_STRIP_GATE(8074C060, &lit_4981); +COMPILER_STRIP_GATE(0x8074C060, &lit_4981); #pragma pop /* 8074C064-8074C068 000128 0004+00 0/1 0/0 0/0 .rodata @4982 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4982 = -70.0f; -COMPILER_STRIP_GATE(8074C064, &lit_4982); +COMPILER_STRIP_GATE(0x8074C064, &lit_4982); #pragma pop /* 80743D8C-807444F0 001F8C 0764+00 1/2 0/0 0/0 .text Ap_CreateAction__8daE_PM_cFv */ @@ -1663,42 +1670,42 @@ asm void daE_PM_c::Ap_CreateAction() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5045 = 13.0f; -COMPILER_STRIP_GATE(8074C068, &lit_5045); +COMPILER_STRIP_GATE(0x8074C068, &lit_5045); #pragma pop /* 8074C06C-8074C070 000130 0004+00 0/3 0/0 0/0 .rodata @5046 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5046 = 1.0f / 20.0f; -COMPILER_STRIP_GATE(8074C06C, &lit_5046); +COMPILER_STRIP_GATE(0x8074C06C, &lit_5046); #pragma pop /* 8074C070-8074C074 000134 0004+00 0/3 0/0 0/0 .rodata @5047 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5047 = 10.0f; -COMPILER_STRIP_GATE(8074C070, &lit_5047); +COMPILER_STRIP_GATE(0x8074C070, &lit_5047); #pragma pop /* 8074C074-8074C078 000138 0004+00 0/2 0/0 0/0 .rodata @5048 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5048 = -9881.0f; -COMPILER_STRIP_GATE(8074C074, &lit_5048); +COMPILER_STRIP_GATE(0x8074C074, &lit_5048); #pragma pop /* 8074C078-8074C07C 00013C 0004+00 0/2 0/0 0/0 .rodata @5049 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5049 = 1892.0f; -COMPILER_STRIP_GATE(8074C078, &lit_5049); +COMPILER_STRIP_GATE(0x8074C078, &lit_5049); #pragma pop /* 8074C07C-8074C080 000140 0004+00 0/2 0/0 0/0 .rodata @5050 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5050 = 17971.0f; -COMPILER_STRIP_GATE(8074C07C, &lit_5050); +COMPILER_STRIP_GATE(0x8074C07C, &lit_5050); #pragma pop /* 8074C3E8-8074C3EC 0000A8 0002+02 13/16 0/0 0/0 .bss s_TargetAngle__22@unnamed@d_a_e_pm_cpp@ */ @@ -1727,20 +1734,20 @@ asm void daE_PM_c::AppearAction() { /* ############################################################################################## */ /* 8074C080-8074C084 000144 0004+00 1/2 0/0 0/0 .rodata @5216 */ SECTION_RODATA static f32 const lit_5216 = 0.5f; -COMPILER_STRIP_GATE(8074C080, &lit_5216); +COMPILER_STRIP_GATE(0x8074C080, &lit_5216); /* 8074C084-8074C088 000148 0004+00 0/4 0/0 0/0 .rodata @5217 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5217 = -30.0f; -COMPILER_STRIP_GATE(8074C084, &lit_5217); +COMPILER_STRIP_GATE(0x8074C084, &lit_5217); #pragma pop /* 8074C088-8074C08C 00014C 0004+00 0/1 0/0 0/0 .rodata @5218 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5218 = 15000.0f; -COMPILER_STRIP_GATE(8074C088, &lit_5218); +COMPILER_STRIP_GATE(0x8074C088, &lit_5218); #pragma pop /* 80744878-80744DA0 002A78 0528+00 1/1 0/0 0/0 .text DemoBeforeEscape__8daE_PM_cFv */ @@ -1758,21 +1765,21 @@ asm void daE_PM_c::DemoBeforeEscape() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5341 = -100.0f; -COMPILER_STRIP_GATE(8074C08C, &lit_5341); +COMPILER_STRIP_GATE(0x8074C08C, &lit_5341); #pragma pop /* 8074C090-8074C094 000154 0004+00 0/2 0/0 0/0 .rodata @5342 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5342 = -3.0f; -COMPILER_STRIP_GATE(8074C090, &lit_5342); +COMPILER_STRIP_GATE(0x8074C090, &lit_5342); #pragma pop /* 8074C094-8074C098 000158 0004+00 0/4 0/0 0/0 .rodata @5343 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5343 = 10000.0f; -COMPILER_STRIP_GATE(8074C094, &lit_5343); +COMPILER_STRIP_GATE(0x8074C094, &lit_5343); #pragma pop /* 80744DA0-807453F4 002FA0 0654+00 1/1 0/0 0/0 .text DemoAfterEscape__8daE_PM_cFv */ @@ -1810,14 +1817,14 @@ asm void daE_PM_c::WaitAction() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5440 = -1000000000.0f; -COMPILER_STRIP_GATE(8074C098, &lit_5440); +COMPILER_STRIP_GATE(0x8074C098, &lit_5440); #pragma pop /* 8074C09C-8074C0A0 000160 0004+00 0/1 0/0 0/0 .rodata @5441 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5441 = -50.0f; -COMPILER_STRIP_GATE(8074C09C, &lit_5441); +COMPILER_STRIP_GATE(0x8074C09C, &lit_5441); #pragma pop /* 807455F4-807458F8 0037F4 0304+00 1/1 0/0 0/0 .text GroundCheck__8daE_PM_cFv */ @@ -1845,21 +1852,21 @@ asm dBgS_ObjGndChk::~dBgS_ObjGndChk() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5483 = 29.0f / 5.0f; -COMPILER_STRIP_GATE(8074C0A0, &lit_5483); +COMPILER_STRIP_GATE(0x8074C0A0, &lit_5483); #pragma pop /* 8074C0A4-8074C0A8 000168 0004+00 0/1 0/0 0/0 .rodata @5484 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5484 = 5.5f; -COMPILER_STRIP_GATE(8074C0A4, &lit_5484); +COMPILER_STRIP_GATE(0x8074C0A4, &lit_5484); #pragma pop /* 8074C0A8-8074C0AC 00016C 0004+00 0/1 0/0 0/0 .rodata @5485 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5485 = 12.0f; -COMPILER_STRIP_GATE(8074C0A8, &lit_5485); +COMPILER_STRIP_GATE(0x8074C0A8, &lit_5485); #pragma pop /* 80745970-80745C44 003B70 02D4+00 1/1 0/0 0/0 .text EscapeAction__8daE_PM_cFv */ @@ -1897,21 +1904,21 @@ asm void daE_PM_c::Action() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5709 = 3.0f / 100.0f; -COMPILER_STRIP_GATE(8074C0AC, &lit_5709); +COMPILER_STRIP_GATE(0x8074C0AC, &lit_5709); #pragma pop /* 8074C0B0-8074C0B4 000174 0004+00 0/1 0/0 0/0 .rodata @5710 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5710 = 3.0f; -COMPILER_STRIP_GATE(8074C0B0, &lit_5710); +COMPILER_STRIP_GATE(0x8074C0B0, &lit_5710); #pragma pop /* 8074C0B4-8074C0B8 000178 0004+00 0/1 0/0 0/0 .rodata @5711 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5711 = 2500.0f; -COMPILER_STRIP_GATE(8074C0B4, &lit_5711); +COMPILER_STRIP_GATE(0x8074C0B4, &lit_5711); #pragma pop /* 80745ED0-80746624 0040D0 0754+00 2/1 0/0 0/0 .text DemoBossStart2__8daE_PM_cFv */ @@ -1949,98 +1956,98 @@ asm void daE_PM_c::BossEscapeAction() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5712 = 106.0f; -COMPILER_STRIP_GATE(8074C0B8, &lit_5712); +COMPILER_STRIP_GATE(0x8074C0B8, &lit_5712); #pragma pop /* 8074C0BC-8074C0C0 000180 0004+00 0/0 0/0 0/0 .rodata @5713 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5713 = 124.0f; -COMPILER_STRIP_GATE(8074C0BC, &lit_5713); +COMPILER_STRIP_GATE(0x8074C0BC, &lit_5713); #pragma pop /* 8074C0C0-8074C0C4 000184 0004+00 0/0 0/0 0/0 .rodata @5714 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5714 = 115.0f; -COMPILER_STRIP_GATE(8074C0C0, &lit_5714); +COMPILER_STRIP_GATE(0x8074C0C0, &lit_5714); #pragma pop /* 8074C0C4-8074C0C8 000188 0004+00 0/0 0/0 0/0 .rodata @5715 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5715 = 133.0f; -COMPILER_STRIP_GATE(8074C0C4, &lit_5715); +COMPILER_STRIP_GATE(0x8074C0C4, &lit_5715); #pragma pop /* 8074C0C8-8074C0CC 00018C 0004+00 0/0 0/0 0/0 .rodata @5716 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5716 = 146.0f; -COMPILER_STRIP_GATE(8074C0C8, &lit_5716); +COMPILER_STRIP_GATE(0x8074C0C8, &lit_5716); #pragma pop /* 8074C0CC-8074C0D0 000190 0004+00 0/0 0/0 0/0 .rodata @5717 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5717 = 159.0f; -COMPILER_STRIP_GATE(8074C0CC, &lit_5717); +COMPILER_STRIP_GATE(0x8074C0CC, &lit_5717); #pragma pop /* 8074C0D0-8074C0D4 000194 0004+00 0/0 0/0 0/0 .rodata @5718 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5718 = 173.0f; -COMPILER_STRIP_GATE(8074C0D0, &lit_5718); +COMPILER_STRIP_GATE(0x8074C0D0, &lit_5718); #pragma pop /* 8074C0D4-8074C0D8 000198 0004+00 0/0 0/0 0/0 .rodata @5719 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5719 = 184.0f; -COMPILER_STRIP_GATE(8074C0D4, &lit_5719); +COMPILER_STRIP_GATE(0x8074C0D4, &lit_5719); #pragma pop /* 8074C0D8-8074C0DC 00019C 0004+00 0/0 0/0 0/0 .rodata @5720 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5720 = -80.0f; -COMPILER_STRIP_GATE(8074C0D8, &lit_5720); +COMPILER_STRIP_GATE(0x8074C0D8, &lit_5720); #pragma pop /* 8074C0DC-8074C0E0 0001A0 0004+00 0/0 0/0 0/0 .rodata @5991 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5991 = 240.0f; -COMPILER_STRIP_GATE(8074C0DC, &lit_5991); +COMPILER_STRIP_GATE(0x8074C0DC, &lit_5991); #pragma pop /* 8074C0E0-8074C0E4 0001A4 0004+00 0/5 0/0 0/0 .rodata @5992 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5992 = 1000.0f; -COMPILER_STRIP_GATE(8074C0E0, &lit_5992); +COMPILER_STRIP_GATE(0x8074C0E0, &lit_5992); #pragma pop /* 8074C0E4-8074C0E8 0001A8 0004+00 0/0 0/0 0/0 .rodata @5993 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5993 = 250.0f; -COMPILER_STRIP_GATE(8074C0E4, &lit_5993); +COMPILER_STRIP_GATE(0x8074C0E4, &lit_5993); #pragma pop /* 8074C0E8-8074C0EC 0001AC 0004+00 0/0 0/0 0/0 .rodata @5994 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5994 = 2.0f / 25.0f; -COMPILER_STRIP_GATE(8074C0E8, &lit_5994); +COMPILER_STRIP_GATE(0x8074C0E8, &lit_5994); #pragma pop /* 8074C0EC-8074C0F0 0001B0 0004+00 0/1 0/0 0/0 .rodata @6124 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6124 = 16000.0f; -COMPILER_STRIP_GATE(8074C0EC, &lit_6124); +COMPILER_STRIP_GATE(0x8074C0EC, &lit_6124); #pragma pop /* 80747500-807476A0 005700 01A0+00 2/2 0/0 0/0 .text s_boss_sub__FPvPv */ @@ -2058,42 +2065,42 @@ static asm void s_boss_sub(void* param_0, void* param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6337 = 2000.0f; -COMPILER_STRIP_GATE(8074C0F0, &lit_6337); +COMPILER_STRIP_GATE(0x8074C0F0, &lit_6337); #pragma pop /* 8074C0F4-8074C0F8 0001B8 0004+00 0/1 0/0 0/0 .rodata @6338 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6338 = -5355.0f; -COMPILER_STRIP_GATE(8074C0F4, &lit_6338); +COMPILER_STRIP_GATE(0x8074C0F4, &lit_6338); #pragma pop /* 8074C0F8-8074C0FC 0001BC 0004+00 0/1 0/0 0/0 .rodata @6339 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6339 = 11060.0f; -COMPILER_STRIP_GATE(8074C0F8, &lit_6339); +COMPILER_STRIP_GATE(0x8074C0F8, &lit_6339); #pragma pop /* 8074C0FC-8074C100 0001C0 0004+00 0/1 0/0 0/0 .rodata @6340 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6340 = -5700.0f; -COMPILER_STRIP_GATE(8074C0FC, &lit_6340); +COMPILER_STRIP_GATE(0x8074C0FC, &lit_6340); #pragma pop /* 8074C100-8074C104 0001C4 0004+00 0/1 0/0 0/0 .rodata @6341 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6341 = 5190.0f; -COMPILER_STRIP_GATE(8074C100, &lit_6341); +COMPILER_STRIP_GATE(0x8074C100, &lit_6341); #pragma pop /* 8074C104-8074C108 0001C8 0004+00 0/1 0/0 0/0 .rodata @6342 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6342 = 350.0f; -COMPILER_STRIP_GATE(8074C104, &lit_6342); +COMPILER_STRIP_GATE(0x8074C104, &lit_6342); #pragma pop /* 807476A0-80747F38 0058A0 0898+00 2/1 0/0 0/0 .text BossDamageAction__8daE_PM_cFv */ @@ -2121,42 +2128,42 @@ asm void daE_PM_c::BossWaitAction() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6343 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(8074C108, &lit_6343); +COMPILER_STRIP_GATE(0x8074C108, &lit_6343); #pragma pop /* 8074C10C-8074C110 0001D0 0004+00 0/1 0/0 0/0 .rodata @6623 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6623 = 196.0f; -COMPILER_STRIP_GATE(8074C10C, &lit_6623); +COMPILER_STRIP_GATE(0x8074C10C, &lit_6623); #pragma pop /* 8074C110-8074C114 0001D4 0004+00 0/1 0/0 0/0 .rodata @6624 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6624 = 195.0f; -COMPILER_STRIP_GATE(8074C110, &lit_6624); +COMPILER_STRIP_GATE(0x8074C110, &lit_6624); #pragma pop /* 8074C114-8074C118 0001D8 0004+00 0/1 0/0 0/0 .rodata @6625 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6625 = 30000.0f; -COMPILER_STRIP_GATE(8074C114, &lit_6625); +COMPILER_STRIP_GATE(0x8074C114, &lit_6625); #pragma pop /* 8074C118-8074C11C 0001DC 0004+00 0/1 0/0 0/0 .rodata @6626 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6626 = 15.0f; -COMPILER_STRIP_GATE(8074C118, &lit_6626); +COMPILER_STRIP_GATE(0x8074C118, &lit_6626); #pragma pop /* 8074C11C-8074C120 0001E0 0004+00 0/2 0/0 0/0 .rodata @6627 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6627 = -200.0f; -COMPILER_STRIP_GATE(8074C11C, &lit_6627); +COMPILER_STRIP_GATE(0x8074C11C, &lit_6627); #pragma pop /* 807480A4-80748964 0062A4 08C0+00 1/1 0/0 0/0 .text BossDeathAction__8daE_PM_cFv */ @@ -2184,7 +2191,7 @@ asm void daE_PM_c::BossAction() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6712 = 1.5f; -COMPILER_STRIP_GATE(8074C120, &lit_6712); +COMPILER_STRIP_GATE(0x8074C120, &lit_6712); #pragma pop /* 80748B18-80748D74 006D18 025C+00 1/1 0/0 0/0 .text Execute__8daE_PM_cFv */ @@ -2202,21 +2209,21 @@ asm void daE_PM_c::Execute() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6921 = -10000.0f; -COMPILER_STRIP_GATE(8074C124, &lit_6921); +COMPILER_STRIP_GATE(0x8074C124, &lit_6921); #pragma pop /* 8074C128-8074C12C 0001EC 0004+00 0/2 0/0 0/0 .rodata @6922 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6922 = -9.0f; -COMPILER_STRIP_GATE(8074C128, &lit_6922); +COMPILER_STRIP_GATE(0x8074C128, &lit_6922); #pragma pop /* 8074C12C-8074C130 0001F0 0004+00 0/1 0/0 0/0 .rodata @6923 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6923 = -150.0f; -COMPILER_STRIP_GATE(8074C12C, &lit_6923); +COMPILER_STRIP_GATE(0x8074C12C, &lit_6923); #pragma pop /* 80748D74-8074954C 006F74 07D8+00 2/2 0/0 0/0 .text StartAction__8daE_PM_cFv */ @@ -2275,7 +2282,7 @@ asm void daE_PM_c::CreateChk() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7229 = 1280.0f; -COMPILER_STRIP_GATE(8074C130, &lit_7229); +COMPILER_STRIP_GATE(0x8074C130, &lit_7229); #pragma pop /* 8074C134-8074C13C 0001F8 0004+04 0/1 0/0 0/0 .rodata @7230 */ @@ -2286,7 +2293,7 @@ SECTION_RODATA static f32 const lit_7230[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(8074C134, &lit_7230); +COMPILER_STRIP_GATE(0x8074C134, &lit_7230); #pragma pop /* 80749ED0-8074A14C 0080D0 027C+00 1/1 0/0 0/0 .text LampAction__8daE_PM_cFv */ @@ -2364,7 +2371,7 @@ asm void daE_PM_c::Delete() { SECTION_RODATA static u8 const lit_7464[8] = { 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8074C13C, &lit_7464); +COMPILER_STRIP_GATE(0x8074C13C, &lit_7464); /* 8074AB28-8074ABA8 008D28 0080+00 1/1 0/0 0/0 .text setBaseMtx__8daE_PM_cFv */ #pragma push @@ -2391,7 +2398,7 @@ asm void daE_PM_c::setGakkiBaseMtx() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7575 = -35.0f; -COMPILER_STRIP_GATE(8074C144, &lit_7575); +COMPILER_STRIP_GATE(0x8074C144, &lit_7575); #pragma pop /* 8074AC10-8074AE90 008E10 0280+00 1/1 0/0 0/0 .text setLampBaseMtx__8daE_PM_cFv */ @@ -2551,7 +2558,7 @@ asm void __sinit_d_a_e_pm_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_8074BAB0 = (void*)__sinit_d_a_e_pm_cpp; +REGISTER_CTORS(0x8074BAB0, __sinit_d_a_e_pm_cpp); #pragma pop /* 8074BAEC-8074BAF4 009CEC 0008+00 1/0 0/0 0/0 .text @20@__dt__14dBgS_ObjGndChkFv */ @@ -2788,9 +2795,4 @@ static u8 data_8074C448[4]; static u8 data_8074C44C[4]; #pragma pop -/* 8074C148-8074C14D 00020C 0005+00 7/7 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_8074C148 = "E_PM"; -#pragma pop +/* 8074C148-8074C148 00020C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/e/d_a_e_po/d_a_e_po.cpp b/rel/d/a/e/d_a_e_po/d_a_e_po.cpp index 57f7b28c663..40ab83ecc75 100644 --- a/rel/d/a/e/d_a_e_po/d_a_e_po.cpp +++ b/rel/d/a/e/d_a_e_po/d_a_e_po.cpp @@ -50,16 +50,16 @@ struct mDoExt_invisibleModel { /* 8000E7C0 */ void entryDL(cXyz*); }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; - struct J3DAnmTransform {}; +struct J3DModelData {}; + +struct Z2Creature {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -154,13 +154,13 @@ struct dPa_hermiteEcallBack_c { /* 8004F6B8 */ void setOldPosP(cXyz const*, cXyz const*); }; -struct _GXColor {}; - struct csXyz { /* 80756D8C */ csXyz(); /* 80757290 */ ~csXyz(); }; +struct _GXColor {}; + struct dPa_control_c { struct level_c { /* 8004B918 */ void getEmitter(u32); @@ -185,7 +185,6 @@ struct dEvt_info_c { struct dEvt_control_c { /* 80042468 */ void reset(); /* 8004368C */ void setPtT(void*); - /* 800436EC */ void setPtI_Id(unsigned int); }; struct dEvent_manager_c { @@ -398,7 +397,7 @@ extern "C" static void dComIfGp_particle_getEmitter__FUl(); extern "C" static void dComIfGp_particle_set__FUlUsPC4cXyzPC5csXyzPC4cXyz(); extern "C" static void fopAcM_isSwitch__FPC10fopAc_ac_ci(); extern "C" static void fopAcM_GetID__FPCv(); -extern "C" static void fopAcM_SetGroup__FP10fopAc_ac_cUc(); +extern "C" void fopAcM_SetGroup__FP10fopAc_ac_cUc(); extern "C" void OnCoSetBit__14cCcD_ObjHitInfFv(); extern "C" static void action__FP10e_po_class(); extern "C" static void daE_PO_Execute__FP10e_po_class(); @@ -656,7 +655,7 @@ extern "C" void __register_global_object(); /* ############################################################################################## */ /* 807576FC-80757700 000000 0004+00 20/20 0/0 0/0 .rodata @3917 */ SECTION_RODATA static f32 const lit_3917 = 100.0f; -COMPILER_STRIP_GATE(807576FC, &lit_3917); +COMPILER_STRIP_GATE(0x807576FC, &lit_3917); /* 80757700-80757704 000004 0004+00 2/19 0/0 0/0 .rodata @3918 */ SECTION_RODATA static u8 const lit_3918[4] = { @@ -665,7 +664,7 @@ SECTION_RODATA static u8 const lit_3918[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80757700, &lit_3918); +COMPILER_STRIP_GATE(0x80757700, &lit_3918); /* 80757704-8075770C 000008 0004+04 2/19 0/0 0/0 .rodata @3919 */ SECTION_RODATA static f32 const lit_3919[1 + 1 /* padding */] = { @@ -673,7 +672,7 @@ SECTION_RODATA static f32 const lit_3919[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80757704, &lit_3919); +COMPILER_STRIP_GATE(0x80757704, &lit_3919); /* 8075770C-80757714 000010 0008+00 0/5 0/0 0/0 .rodata @3920 */ #pragma push @@ -681,7 +680,7 @@ COMPILER_STRIP_GATE(80757704, &lit_3919); SECTION_RODATA static u8 const lit_3920[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8075770C, &lit_3920); +COMPILER_STRIP_GATE(0x8075770C, &lit_3920); #pragma pop /* 80757714-8075771C 000018 0008+00 0/5 0/0 0/0 .rodata @3921 */ @@ -690,7 +689,7 @@ COMPILER_STRIP_GATE(8075770C, &lit_3920); SECTION_RODATA static u8 const lit_3921[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80757714, &lit_3921); +COMPILER_STRIP_GATE(0x80757714, &lit_3921); #pragma pop /* 8075771C-80757724 000020 0008+00 0/5 0/0 0/0 .rodata @3922 */ @@ -699,49 +698,49 @@ COMPILER_STRIP_GATE(80757714, &lit_3921); SECTION_RODATA static u8 const lit_3922[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8075771C, &lit_3922); +COMPILER_STRIP_GATE(0x8075771C, &lit_3922); #pragma pop /* 80757724-80757728 000028 0004+00 0/1 0/0 0/0 .rodata @3923 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3923 = 1.0f / 100.0f; -COMPILER_STRIP_GATE(80757724, &lit_3923); +COMPILER_STRIP_GATE(0x80757724, &lit_3923); #pragma pop /* 80757728-8075772C 00002C 0004+00 0/1 0/0 0/0 .rodata @3938 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3938 = 6.0f / 5.0f; -COMPILER_STRIP_GATE(80757728, &lit_3938); +COMPILER_STRIP_GATE(0x80757728, &lit_3938); #pragma pop /* 8075772C-80757730 000030 0004+00 0/3 0/0 0/0 .rodata @3939 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3939 = 1000.0f; -COMPILER_STRIP_GATE(8075772C, &lit_3939); +COMPILER_STRIP_GATE(0x8075772C, &lit_3939); #pragma pop /* 80757730-80757734 000034 0004+00 0/1 0/0 0/0 .rodata @3940 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3940 = 300.0f; -COMPILER_STRIP_GATE(80757730, &lit_3940); +COMPILER_STRIP_GATE(0x80757730, &lit_3940); #pragma pop /* 80757734-80757738 000038 0004+00 0/2 0/0 0/0 .rodata @3941 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3941 = 15.0f; -COMPILER_STRIP_GATE(80757734, &lit_3941); +COMPILER_STRIP_GATE(0x80757734, &lit_3941); #pragma pop /* 80757738-8075773C 00003C 0004+00 0/1 0/0 0/0 .rodata @3942 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3942 = 700.0f; -COMPILER_STRIP_GATE(80757738, &lit_3942); +COMPILER_STRIP_GATE(0x80757738, &lit_3942); #pragma pop /* 80757AA4-80757AB0 000000 000C+00 4/4 0/0 0/0 .data cNullVec__6Z2Calc */ @@ -778,19 +777,16 @@ SECTION_DATA static u8 e_env[8] = { }; #pragma pop -/* 80757AD4-80757ADC -00001 0008+00 6/8 0/0 0/0 .data None */ -SECTION_DATA static u8 struct_80757AD4[8] = { - /* 80757AD4 0006+00 data_80757AD4 eff_id$3805 */ - 0x02, - 0x9D, - 0x02, - 0x9E, - 0x02, - 0x9F, - /* 80757ADA 0002+00 data_80757ADA mAttackNo */ - 0x00, - 0x03, +/* 80757AD4-80757ADA 000030 0006+00 0/1 0/0 0/0 .data eff_id$3805 */ +#pragma push +#pragma force_active on +SECTION_DATA static u8 eff_id[6] = { + 0x02, 0x9D, 0x02, 0x9E, 0x02, 0x9F, }; +#pragma pop + +/* 80757ADA-80757ADC 000036 0002+00 6/7 0/0 0/0 .data mAttackNo */ +SECTION_DATA static u16 mAttackNo = 0x0003; /* 80757ADC-80757AE0 000038 0004+00 1/2 0/0 0/0 .data mHaba */ SECTION_DATA static f32 mHaba = 400.0f; @@ -1146,7 +1142,13 @@ static asm void mArg0Check(e_po_class* param_0, s16 param_1) { /* ############################################################################################## */ /* 8075773C-80757740 000040 0004+00 1/2 0/0 0/0 .rodata @3974 */ SECTION_RODATA static f32 const lit_3974 = -1.0f; -COMPILER_STRIP_GATE(8075773C, &lit_3974); +COMPILER_STRIP_GATE(0x8075773C, &lit_3974); + +/* 80757A88-80757A88 00038C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80757A88 = "E_PO"; +#pragma pop /* 8074C660-8074C70C 000200 00AC+00 12/12 0/0 0/0 .text anm_init__FP10e_po_classifUcf */ #pragma push @@ -1173,21 +1175,21 @@ static asm void nodeCallBack(J3DJoint* param_0, int param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4111 = 45.0f; -COMPILER_STRIP_GATE(80757740, &lit_4111); +COMPILER_STRIP_GATE(0x80757740, &lit_4111); #pragma pop /* 80757744-80757748 000048 0004+00 0/3 0/0 0/0 .rodata @4112 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4112 = 7.0f / 10.0f; -COMPILER_STRIP_GATE(80757744, &lit_4112); +COMPILER_STRIP_GATE(0x80757744, &lit_4112); #pragma pop /* 80757748-8075774C 00004C 0004+00 0/3 0/0 0/0 .rodata @4113 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4113 = 4.0f; -COMPILER_STRIP_GATE(80757748, &lit_4113); +COMPILER_STRIP_GATE(0x80757748, &lit_4113); #pragma pop /* 80757E10-80757E14 000008 0001+03 3/3 0/0 0/0 .bss @1109 */ @@ -1316,35 +1318,35 @@ static asm void daE_PO_Draw(e_po_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4262 = 10.0f; -COMPILER_STRIP_GATE(8075774C, &lit_4262); +COMPILER_STRIP_GATE(0x8075774C, &lit_4262); #pragma pop /* 80757750-80757754 000054 0004+00 0/6 0/0 0/0 .rodata @4263 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4263 = 0.5f; -COMPILER_STRIP_GATE(80757750, &lit_4263); +COMPILER_STRIP_GATE(0x80757750, &lit_4263); #pragma pop /* 80757754-80757758 000058 0004+00 0/1 0/0 0/0 .rodata @4264 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4264 = 1.5f; -COMPILER_STRIP_GATE(80757754, &lit_4264); +COMPILER_STRIP_GATE(0x80757754, &lit_4264); #pragma pop /* 80757758-8075775C 00005C 0004+00 0/4 0/0 0/0 .rodata @4265 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4265 = 250.0f; -COMPILER_STRIP_GATE(80757758, &lit_4265); +COMPILER_STRIP_GATE(0x80757758, &lit_4265); #pragma pop /* 8075775C-80757760 000060 0004+00 0/5 0/0 0/0 .rodata @4266 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4266 = 200.0f; -COMPILER_STRIP_GATE(8075775C, &lit_4266); +COMPILER_STRIP_GATE(0x8075775C, &lit_4266); #pragma pop /* 8074CCCC-8074D16C 00086C 04A0+00 3/3 0/0 0/0 .text e_po_opening__FP10e_po_class */ @@ -1362,14 +1364,14 @@ static asm void e_po_opening(e_po_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4297 = 3.0f; -COMPILER_STRIP_GATE(80757760, &lit_4297); +COMPILER_STRIP_GATE(0x80757760, &lit_4297); #pragma pop /* 80757764-80757768 000068 0004+00 0/5 0/0 0/0 .rodata @4298 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4298 = 50.0f; -COMPILER_STRIP_GATE(80757764, &lit_4298); +COMPILER_STRIP_GATE(0x80757764, &lit_4298); #pragma pop /* 8074D16C-8074D338 000D0C 01CC+00 1/1 0/0 0/0 .text e_po_wait__FP10e_po_class */ @@ -1387,7 +1389,7 @@ static asm void e_po_wait(e_po_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4328 = 8.0f; -COMPILER_STRIP_GATE(80757768, &lit_4328); +COMPILER_STRIP_GATE(0x80757768, &lit_4328); #pragma pop /* 8074D338-8074D500 000ED8 01C8+00 1/1 0/0 0/0 .text e_po_avoid__FP10e_po_class */ @@ -1405,42 +1407,42 @@ static asm void e_po_avoid(e_po_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4521 = 7000.0f; -COMPILER_STRIP_GATE(8075776C, &lit_4521); +COMPILER_STRIP_GATE(0x8075776C, &lit_4521); #pragma pop /* 80757770-80757774 000074 0004+00 0/5 0/0 0/0 .rodata @4522 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4522 = 20.0f; -COMPILER_STRIP_GATE(80757770, &lit_4522); +COMPILER_STRIP_GATE(0x80757770, &lit_4522); #pragma pop /* 80757774-80757778 000078 0004+00 0/3 0/0 0/0 .rodata @4523 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4523 = 30.0f; -COMPILER_STRIP_GATE(80757774, &lit_4523); +COMPILER_STRIP_GATE(0x80757774, &lit_4523); #pragma pop /* 80757778-8075777C 00007C 0004+00 0/3 0/0 0/0 .rodata @4524 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4524 = 5.0f; -COMPILER_STRIP_GATE(80757778, &lit_4524); +COMPILER_STRIP_GATE(0x80757778, &lit_4524); #pragma pop /* 8075777C-80757780 000080 0004+00 0/2 0/0 0/0 .rodata @4525 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4525 = -5.0f; -COMPILER_STRIP_GATE(8075777C, &lit_4525); +COMPILER_STRIP_GATE(0x8075777C, &lit_4525); #pragma pop /* 80757780-80757784 000084 0004+00 0/2 0/0 0/0 .rodata @4526 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4526 = 1.0f / 20.0f; -COMPILER_STRIP_GATE(80757780, &lit_4526); +COMPILER_STRIP_GATE(0x80757780, &lit_4526); #pragma pop /* 8074D500-8074DC40 0010A0 0740+00 1/1 0/0 0/0 .text e_po_search__FP10e_po_class */ @@ -1458,14 +1460,14 @@ static asm void e_po_search(e_po_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4632 = 65536.0f; -COMPILER_STRIP_GATE(80757784, &lit_4632); +COMPILER_STRIP_GATE(0x80757784, &lit_4632); #pragma pop /* 80757788-8075778C 00008C 0004+00 0/3 0/0 0/0 .rodata @4633 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4633 = 4.0f / 5.0f; -COMPILER_STRIP_GATE(80757788, &lit_4633); +COMPILER_STRIP_GATE(0x80757788, &lit_4633); #pragma pop /* 8074DC40-8074E168 0017E0 0528+00 1/1 0/0 0/0 .text e_po_attack__FP10e_po_class */ @@ -1483,7 +1485,7 @@ static asm void e_po_attack(e_po_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4720 = -20.0f; -COMPILER_STRIP_GATE(8075778C, &lit_4720); +COMPILER_STRIP_GATE(0x8075778C, &lit_4720); #pragma pop /* 8074E168-8074E4EC 001D08 0384+00 1/1 0/0 0/0 .text damage_check__FP10e_po_class */ @@ -1501,7 +1503,7 @@ static asm void damage_check(e_po_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4756 = 2.0f; -COMPILER_STRIP_GATE(80757790, &lit_4756); +COMPILER_STRIP_GATE(0x80757790, &lit_4756); #pragma pop /* 8074E4EC-8074E694 00208C 01A8+00 1/1 0/0 0/0 .text e_po_damage__FP10e_po_class */ @@ -1524,6 +1526,13 @@ static asm void e_po_wolfbite(e_po_class* param_0) { } #pragma pop +/* ############################################################################################## */ +/* 80757A88-80757A88 00038C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80757A8D = "DEFAULT_GETITEM"; +#pragma pop + /* 8074EA6C-807501B0 00260C 1744+00 2/1 0/0 0/0 .text e_po_dead__FP10e_po_class */ #pragma push #pragma optimization_level 0 @@ -1539,7 +1548,7 @@ static asm void e_po_dead(e_po_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5627 = -1000000000.0f; -COMPILER_STRIP_GATE(80757794, &lit_5627); +COMPILER_STRIP_GATE(0x80757794, &lit_5627); #pragma pop /* 807501B0-8075030C 003D50 015C+00 2/2 0/0 0/0 .text e_rollingMove__FP10e_po_classsff */ @@ -1557,63 +1566,63 @@ static asm void e_rollingMove(e_po_class* param_0, s16 param_1, f32 param_2, f32 #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5628 = 70.0f; -COMPILER_STRIP_GATE(80757798, &lit_5628); +COMPILER_STRIP_GATE(0x80757798, &lit_5628); #pragma pop /* 8075779C-807577A0 0000A0 0004+00 0/2 0/0 0/0 .rodata @5629 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5629 = 60.0f; -COMPILER_STRIP_GATE(8075779C, &lit_5629); +COMPILER_STRIP_GATE(0x8075779C, &lit_5629); #pragma pop /* 807577A0-807577A4 0000A4 0004+00 0/1 0/0 0/0 .rodata @5630 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5630 = -490.0f; -COMPILER_STRIP_GATE(807577A0, &lit_5630); +COMPILER_STRIP_GATE(0x807577A0, &lit_5630); #pragma pop /* 807577A4-807577A8 0000A8 0004+00 0/0 0/0 0/0 .rodata @5631 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5631 = 1526.0f; -COMPILER_STRIP_GATE(807577A4, &lit_5631); +COMPILER_STRIP_GATE(0x807577A4, &lit_5631); #pragma pop /* 807577A8-807577AC 0000AC 0004+00 0/1 0/0 0/0 .rodata @5632 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5632 = -1590.0f; -COMPILER_STRIP_GATE(807577A8, &lit_5632); +COMPILER_STRIP_GATE(0x807577A8, &lit_5632); #pragma pop /* 807577AC-807577B0 0000B0 0004+00 0/1 0/0 0/0 .rodata @5633 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5633 = 6.0f; -COMPILER_STRIP_GATE(807577AC, &lit_5633); +COMPILER_STRIP_GATE(0x807577AC, &lit_5633); #pragma pop /* 807577B0-807577B4 0000B4 0004+00 0/1 0/0 0/0 .rodata @5634 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5634 = 800.0f; -COMPILER_STRIP_GATE(807577B0, &lit_5634); +COMPILER_STRIP_GATE(0x807577B0, &lit_5634); #pragma pop /* 807577B4-807577B8 0000B8 0004+00 0/1 0/0 0/0 .rodata @5899 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5899 = -4400.0f; -COMPILER_STRIP_GATE(807577B4, &lit_5899); +COMPILER_STRIP_GATE(0x807577B4, &lit_5899); #pragma pop /* 807577B8-807577BC 0000BC 0004+00 0/2 0/0 0/0 .rodata @5900 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5900 = 4000.0f; -COMPILER_STRIP_GATE(807577B8, &lit_5900); +COMPILER_STRIP_GATE(0x807577B8, &lit_5900); #pragma pop /* 8075030C-80750E88 003EAC 0B7C+00 2/1 0/0 0/0 .text e_po_limbering__FP10e_po_class */ @@ -1631,14 +1640,14 @@ static asm void e_po_limbering(e_po_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5901 = 400.0f; -COMPILER_STRIP_GATE(807577BC, &lit_5901); +COMPILER_STRIP_GATE(0x807577BC, &lit_5901); #pragma pop /* 807577C0-807577C4 0000C4 0004+00 0/1 0/0 0/0 .rodata @5902 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5902 = 600.0f; -COMPILER_STRIP_GATE(807577C0, &lit_5902); +COMPILER_STRIP_GATE(0x807577C0, &lit_5902); #pragma pop /* 80750E88-80751408 004A28 0580+00 1/1 0/0 0/0 .text e_po_roll_move__FP10e_po_class */ @@ -1656,1092 +1665,1092 @@ static asm void e_po_roll_move(e_po_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6814 = -13.0f; -COMPILER_STRIP_GATE(807577C4, &lit_6814); +COMPILER_STRIP_GATE(0x807577C4, &lit_6814); #pragma pop /* 807577C8-807577CC 0000CC 0004+00 0/1 0/0 0/0 .rodata @6815 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6815 = 143.0f; -COMPILER_STRIP_GATE(807577C8, &lit_6815); +COMPILER_STRIP_GATE(0x807577C8, &lit_6815); #pragma pop /* 807577CC-807577D0 0000D0 0004+00 0/1 0/0 0/0 .rodata @6816 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6816 = 344.0f; -COMPILER_STRIP_GATE(807577CC, &lit_6816); +COMPILER_STRIP_GATE(0x807577CC, &lit_6816); #pragma pop /* 807577D0-807577D4 0000D4 0004+00 0/1 0/0 0/0 .rodata @6817 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6817 = 48.0f; -COMPILER_STRIP_GATE(807577D0, &lit_6817); +COMPILER_STRIP_GATE(0x807577D0, &lit_6817); #pragma pop /* 807577D4-807577D8 0000D8 0004+00 0/1 0/0 0/0 .rodata @6818 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6818 = 631.0f; -COMPILER_STRIP_GATE(807577D4, &lit_6818); +COMPILER_STRIP_GATE(0x807577D4, &lit_6818); #pragma pop /* 807577D8-807577DC 0000DC 0004+00 0/1 0/0 0/0 .rodata @6819 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6819 = -2300.0f; -COMPILER_STRIP_GATE(807577D8, &lit_6819); +COMPILER_STRIP_GATE(0x807577D8, &lit_6819); #pragma pop /* 807577DC-807577E0 0000E0 0004+00 0/1 0/0 0/0 .rodata @6820 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6820 = -697.0f; -COMPILER_STRIP_GATE(807577DC, &lit_6820); +COMPILER_STRIP_GATE(0x807577DC, &lit_6820); #pragma pop /* 807577E0-807577E4 0000E4 0004+00 0/1 0/0 0/0 .rodata @6821 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6821 = 515.0f; -COMPILER_STRIP_GATE(807577E0, &lit_6821); +COMPILER_STRIP_GATE(0x807577E0, &lit_6821); #pragma pop /* 807577E4-807577E8 0000E8 0004+00 0/1 0/0 0/0 .rodata @6822 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6822 = -1640.0f; -COMPILER_STRIP_GATE(807577E4, &lit_6822); +COMPILER_STRIP_GATE(0x807577E4, &lit_6822); #pragma pop /* 807577E8-807577EC 0000EC 0004+00 0/1 0/0 0/0 .rodata @6823 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6823 = -645.0f; -COMPILER_STRIP_GATE(807577E8, &lit_6823); +COMPILER_STRIP_GATE(0x807577E8, &lit_6823); #pragma pop /* 807577EC-807577F0 0000F0 0004+00 0/1 0/0 0/0 .rodata @6824 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6824 = 640.0f; -COMPILER_STRIP_GATE(807577EC, &lit_6824); +COMPILER_STRIP_GATE(0x807577EC, &lit_6824); #pragma pop /* 807577F0-807577F4 0000F4 0004+00 0/1 0/0 0/0 .rodata @6825 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6825 = -1900.0f; -COMPILER_STRIP_GATE(807577F0, &lit_6825); +COMPILER_STRIP_GATE(0x807577F0, &lit_6825); #pragma pop /* 807577F4-807577F8 0000F8 0004+00 0/1 0/0 0/0 .rodata @6826 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6826 = 778.0f; -COMPILER_STRIP_GATE(807577F4, &lit_6826); +COMPILER_STRIP_GATE(0x807577F4, &lit_6826); #pragma pop /* 807577F8-807577FC 0000FC 0004+00 0/1 0/0 0/0 .rodata @6827 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6827 = 496.0f; -COMPILER_STRIP_GATE(807577F8, &lit_6827); +COMPILER_STRIP_GATE(0x807577F8, &lit_6827); #pragma pop /* 807577FC-80757800 000100 0004+00 0/1 0/0 0/0 .rodata @6828 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6828 = -1619.0f; -COMPILER_STRIP_GATE(807577FC, &lit_6828); +COMPILER_STRIP_GATE(0x807577FC, &lit_6828); #pragma pop /* 80757800-80757804 000104 0004+00 0/1 0/0 0/0 .rodata @6829 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6829 = -35.0f; -COMPILER_STRIP_GATE(80757800, &lit_6829); +COMPILER_STRIP_GATE(0x80757800, &lit_6829); #pragma pop /* 80757804-80757808 000108 0004+00 0/1 0/0 0/0 .rodata @6830 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6830 = 241.0f; -COMPILER_STRIP_GATE(80757804, &lit_6830); +COMPILER_STRIP_GATE(0x80757804, &lit_6830); #pragma pop /* 80757808-8075780C 00010C 0004+00 0/1 0/0 0/0 .rodata @6831 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6831 = -1223.0f; -COMPILER_STRIP_GATE(80757808, &lit_6831); +COMPILER_STRIP_GATE(0x80757808, &lit_6831); #pragma pop /* 8075780C-80757810 000110 0004+00 0/1 0/0 0/0 .rodata @6832 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6832 = 635.0f; -COMPILER_STRIP_GATE(8075780C, &lit_6832); +COMPILER_STRIP_GATE(0x8075780C, &lit_6832); #pragma pop /* 80757810-80757814 000114 0004+00 0/1 0/0 0/0 .rodata @6833 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6833 = -2360.0f; -COMPILER_STRIP_GATE(80757810, &lit_6833); +COMPILER_STRIP_GATE(0x80757810, &lit_6833); #pragma pop /* 80757814-80757818 000118 0004+00 0/1 0/0 0/0 .rodata @6834 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6834 = -32.0f; -COMPILER_STRIP_GATE(80757814, &lit_6834); +COMPILER_STRIP_GATE(0x80757814, &lit_6834); #pragma pop /* 80757818-8075781C 00011C 0004+00 0/1 0/0 0/0 .rodata @6835 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6835 = 177.0f; -COMPILER_STRIP_GATE(80757818, &lit_6835); +COMPILER_STRIP_GATE(0x80757818, &lit_6835); #pragma pop /* 8075781C-80757820 000120 0004+00 0/1 0/0 0/0 .rodata @6836 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6836 = -846.0f; -COMPILER_STRIP_GATE(8075781C, &lit_6836); +COMPILER_STRIP_GATE(0x8075781C, &lit_6836); #pragma pop /* 80757820-80757824 000124 0004+00 0/1 0/0 0/0 .rodata @6837 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6837 = 40.0f; -COMPILER_STRIP_GATE(80757820, &lit_6837); +COMPILER_STRIP_GATE(0x80757820, &lit_6837); #pragma pop /* 80757824-80757828 000128 0004+00 0/1 0/0 0/0 .rodata @6838 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6838 = 740.0f; -COMPILER_STRIP_GATE(80757824, &lit_6838); +COMPILER_STRIP_GATE(0x80757824, &lit_6838); #pragma pop /* 80757828-8075782C 00012C 0004+00 0/1 0/0 0/0 .rodata @6839 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6839 = -2850.0f; -COMPILER_STRIP_GATE(80757828, &lit_6839); +COMPILER_STRIP_GATE(0x80757828, &lit_6839); #pragma pop /* 8075782C-80757830 000130 0004+00 0/1 0/0 0/0 .rodata @6840 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6840 = 39.0f; -COMPILER_STRIP_GATE(8075782C, &lit_6840); +COMPILER_STRIP_GATE(0x8075782C, &lit_6840); #pragma pop /* 80757830-80757834 000134 0004+00 0/1 0/0 0/0 .rodata @6841 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6841 = -577.0f; -COMPILER_STRIP_GATE(80757830, &lit_6841); +COMPILER_STRIP_GATE(0x80757830, &lit_6841); #pragma pop /* 80757834-80757838 000138 0004+00 0/2 0/0 0/0 .rodata @6842 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6842 = -45.0f; -COMPILER_STRIP_GATE(80757834, &lit_6842); +COMPILER_STRIP_GATE(0x80757834, &lit_6842); #pragma pop /* 80757838-8075783C 00013C 0004+00 0/1 0/0 0/0 .rodata @6843 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6843 = 197.0f; -COMPILER_STRIP_GATE(80757838, &lit_6843); +COMPILER_STRIP_GATE(0x80757838, &lit_6843); #pragma pop /* 8075783C-80757840 000140 0004+00 0/1 0/0 0/0 .rodata @6844 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6844 = 1620.0f; -COMPILER_STRIP_GATE(8075783C, &lit_6844); +COMPILER_STRIP_GATE(0x8075783C, &lit_6844); #pragma pop /* 80757840-80757844 000144 0004+00 0/1 0/0 0/0 .rodata @6845 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6845 = 1630.0f; -COMPILER_STRIP_GATE(80757840, &lit_6845); +COMPILER_STRIP_GATE(0x80757840, &lit_6845); #pragma pop /* 80757844-80757848 000148 0004+00 0/1 0/0 0/0 .rodata @6846 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6846 = 450.0f; -COMPILER_STRIP_GATE(80757844, &lit_6846); +COMPILER_STRIP_GATE(0x80757844, &lit_6846); #pragma pop /* 80757848-8075784C 00014C 0004+00 0/1 0/0 0/0 .rodata @6847 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6847 = 1575.0f; -COMPILER_STRIP_GATE(80757848, &lit_6847); +COMPILER_STRIP_GATE(0x80757848, &lit_6847); #pragma pop /* 8075784C-80757850 000150 0004+00 0/1 0/0 0/0 .rodata @6848 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6848 = 160.0f; -COMPILER_STRIP_GATE(8075784C, &lit_6848); +COMPILER_STRIP_GATE(0x8075784C, &lit_6848); #pragma pop /* 80757850-80757854 000154 0004+00 0/1 0/0 0/0 .rodata @6849 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6849 = -420.0f; -COMPILER_STRIP_GATE(80757850, &lit_6849); +COMPILER_STRIP_GATE(0x80757850, &lit_6849); #pragma pop /* 80757854-80757858 000158 0004+00 0/1 0/0 0/0 .rodata @6850 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6850 = -715.0f; -COMPILER_STRIP_GATE(80757854, &lit_6850); +COMPILER_STRIP_GATE(0x80757854, &lit_6850); #pragma pop /* 80757858-8075785C 00015C 0004+00 0/1 0/0 0/0 .rodata @6851 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6851 = 1350.0f; -COMPILER_STRIP_GATE(80757858, &lit_6851); +COMPILER_STRIP_GATE(0x80757858, &lit_6851); #pragma pop /* 8075785C-80757860 000160 0004+00 0/1 0/0 0/0 .rodata @6852 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6852 = 90.0f; -COMPILER_STRIP_GATE(8075785C, &lit_6852); +COMPILER_STRIP_GATE(0x8075785C, &lit_6852); #pragma pop /* 80757860-80757864 000164 0004+00 0/1 0/0 0/0 .rodata @6853 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6853 = -480.0f; -COMPILER_STRIP_GATE(80757860, &lit_6853); +COMPILER_STRIP_GATE(0x80757860, &lit_6853); #pragma pop /* 80757864-80757868 000168 0004+00 0/1 0/0 0/0 .rodata @6854 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6854 = -30.0f; -COMPILER_STRIP_GATE(80757864, &lit_6854); +COMPILER_STRIP_GATE(0x80757864, &lit_6854); #pragma pop /* 80757868-8075786C 00016C 0004+00 0/1 0/0 0/0 .rodata @6855 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6855 = 1970.0f; -COMPILER_STRIP_GATE(80757868, &lit_6855); +COMPILER_STRIP_GATE(0x80757868, &lit_6855); #pragma pop /* 8075786C-80757870 000170 0004+00 0/1 0/0 0/0 .rodata @6856 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6856 = -1090.0f; -COMPILER_STRIP_GATE(8075786C, &lit_6856); +COMPILER_STRIP_GATE(0x8075786C, &lit_6856); #pragma pop /* 80757870-80757874 000174 0004+00 0/1 0/0 0/0 .rodata @6857 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6857 = -74.0f; -COMPILER_STRIP_GATE(80757870, &lit_6857); +COMPILER_STRIP_GATE(0x80757870, &lit_6857); #pragma pop /* 80757874-80757878 000178 0004+00 0/1 0/0 0/0 .rodata @6858 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6858 = 684.0f; -COMPILER_STRIP_GATE(80757874, &lit_6858); +COMPILER_STRIP_GATE(0x80757874, &lit_6858); #pragma pop /* 80757878-8075787C 00017C 0004+00 0/1 0/0 0/0 .rodata @6859 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6859 = -1095.0f; -COMPILER_STRIP_GATE(80757878, &lit_6859); +COMPILER_STRIP_GATE(0x80757878, &lit_6859); #pragma pop /* 8075787C-80757880 000180 0004+00 0/1 0/0 0/0 .rodata @6860 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6860 = -31.0f; -COMPILER_STRIP_GATE(8075787C, &lit_6860); +COMPILER_STRIP_GATE(0x8075787C, &lit_6860); #pragma pop /* 80757880-80757884 000184 0004+00 0/1 0/0 0/0 .rodata @6861 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6861 = 846.0f; -COMPILER_STRIP_GATE(80757880, &lit_6861); +COMPILER_STRIP_GATE(0x80757880, &lit_6861); #pragma pop /* 80757884-80757888 000188 0004+00 0/1 0/0 0/0 .rodata @6862 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6862 = -2029.0f; -COMPILER_STRIP_GATE(80757884, &lit_6862); +COMPILER_STRIP_GATE(0x80757884, &lit_6862); #pragma pop /* 80757888-8075788C 00018C 0004+00 0/1 0/0 0/0 .rodata @6863 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6863 = -10.0f; -COMPILER_STRIP_GATE(80757888, &lit_6863); +COMPILER_STRIP_GATE(0x80757888, &lit_6863); #pragma pop /* 8075788C-80757890 000190 0004+00 0/1 0/0 0/0 .rodata @6864 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6864 = 165.0f; -COMPILER_STRIP_GATE(8075788C, &lit_6864); +COMPILER_STRIP_GATE(0x8075788C, &lit_6864); #pragma pop /* 80757890-80757894 000194 0004+00 0/1 0/0 0/0 .rodata @6865 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6865 = 690.0f; -COMPILER_STRIP_GATE(80757890, &lit_6865); +COMPILER_STRIP_GATE(0x80757890, &lit_6865); #pragma pop /* 80757894-80757898 000198 0004+00 0/1 0/0 0/0 .rodata @6866 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6866 = 53.0f; -COMPILER_STRIP_GATE(80757894, &lit_6866); +COMPILER_STRIP_GATE(0x80757894, &lit_6866); #pragma pop /* 80757898-8075789C 00019C 0004+00 0/1 0/0 0/0 .rodata @6867 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6867 = 563.0f; -COMPILER_STRIP_GATE(80757898, &lit_6867); +COMPILER_STRIP_GATE(0x80757898, &lit_6867); #pragma pop /* 8075789C-807578A0 0001A0 0004+00 0/1 0/0 0/0 .rodata @6868 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6868 = -1971.0f; -COMPILER_STRIP_GATE(8075789C, &lit_6868); +COMPILER_STRIP_GATE(0x8075789C, &lit_6868); #pragma pop /* 807578A0-807578A4 0001A4 0004+00 0/1 0/0 0/0 .rodata @6869 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6869 = -942.0f; -COMPILER_STRIP_GATE(807578A0, &lit_6869); +COMPILER_STRIP_GATE(0x807578A0, &lit_6869); #pragma pop /* 807578A4-807578A8 0001A8 0004+00 0/1 0/0 0/0 .rodata @6870 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6870 = 433.0f; -COMPILER_STRIP_GATE(807578A4, &lit_6870); +COMPILER_STRIP_GATE(0x807578A4, &lit_6870); #pragma pop /* 807578A8-807578AC 0001AC 0004+00 0/1 0/0 0/0 .rodata @6871 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6871 = -1403.0f; -COMPILER_STRIP_GATE(807578A8, &lit_6871); +COMPILER_STRIP_GATE(0x807578A8, &lit_6871); #pragma pop /* 807578AC-807578B0 0001B0 0004+00 0/1 0/0 0/0 .rodata @6872 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6872 = -590.0f; -COMPILER_STRIP_GATE(807578AC, &lit_6872); +COMPILER_STRIP_GATE(0x807578AC, &lit_6872); #pragma pop /* 807578B0-807578B4 0001B4 0004+00 0/1 0/0 0/0 .rodata @6873 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6873 = 715.0f; -COMPILER_STRIP_GATE(807578B0, &lit_6873); +COMPILER_STRIP_GATE(0x807578B0, &lit_6873); #pragma pop /* 807578B4-807578B8 0001B8 0004+00 0/1 0/0 0/0 .rodata @6874 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6874 = -1560.0f; -COMPILER_STRIP_GATE(807578B4, &lit_6874); +COMPILER_STRIP_GATE(0x807578B4, &lit_6874); #pragma pop /* 807578B8-807578BC 0001BC 0004+00 0/1 0/0 0/0 .rodata @6875 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6875 = 1030.0f; -COMPILER_STRIP_GATE(807578B8, &lit_6875); +COMPILER_STRIP_GATE(0x807578B8, &lit_6875); #pragma pop /* 807578BC-807578C0 0001C0 0004+00 0/1 0/0 0/0 .rodata @6876 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6876 = 410.0f; -COMPILER_STRIP_GATE(807578BC, &lit_6876); +COMPILER_STRIP_GATE(0x807578BC, &lit_6876); #pragma pop /* 807578C0-807578C4 0001C4 0004+00 0/1 0/0 0/0 .rodata @6877 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6877 = -1400.0f; -COMPILER_STRIP_GATE(807578C0, &lit_6877); +COMPILER_STRIP_GATE(0x807578C0, &lit_6877); #pragma pop /* 807578C4-807578C8 0001C8 0004+00 0/1 0/0 0/0 .rodata @6878 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6878 = 84.0f; -COMPILER_STRIP_GATE(807578C4, &lit_6878); +COMPILER_STRIP_GATE(0x807578C4, &lit_6878); #pragma pop /* 807578C8-807578CC 0001CC 0004+00 0/1 0/0 0/0 .rodata @6879 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6879 = -851.0f; -COMPILER_STRIP_GATE(807578C8, &lit_6879); +COMPILER_STRIP_GATE(0x807578C8, &lit_6879); #pragma pop /* 807578CC-807578D0 0001D0 0004+00 0/1 0/0 0/0 .rodata @6880 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6880 = 520.0f; -COMPILER_STRIP_GATE(807578CC, &lit_6880); +COMPILER_STRIP_GATE(0x807578CC, &lit_6880); #pragma pop /* 807578D0-807578D4 0001D4 0004+00 0/1 0/0 0/0 .rodata @6881 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6881 = -1990.0f; -COMPILER_STRIP_GATE(807578D0, &lit_6881); +COMPILER_STRIP_GATE(0x807578D0, &lit_6881); #pragma pop /* 807578D4-807578D8 0001D8 0004+00 0/1 0/0 0/0 .rodata @6882 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6882 = -155.0f; -COMPILER_STRIP_GATE(807578D4, &lit_6882); +COMPILER_STRIP_GATE(0x807578D4, &lit_6882); #pragma pop /* 807578D8-807578DC 0001DC 0004+00 0/1 0/0 0/0 .rodata @6883 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6883 = 105.0f; -COMPILER_STRIP_GATE(807578D8, &lit_6883); +COMPILER_STRIP_GATE(0x807578D8, &lit_6883); #pragma pop /* 807578DC-807578E0 0001E0 0004+00 0/1 0/0 0/0 .rodata @6884 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6884 = -262.0f; -COMPILER_STRIP_GATE(807578DC, &lit_6884); +COMPILER_STRIP_GATE(0x807578DC, &lit_6884); #pragma pop /* 807578E0-807578E4 0001E4 0004+00 0/1 0/0 0/0 .rodata @6885 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6885 = 670.0f; -COMPILER_STRIP_GATE(807578E0, &lit_6885); +COMPILER_STRIP_GATE(0x807578E0, &lit_6885); #pragma pop /* 807578E4-807578E8 0001E8 0004+00 0/1 0/0 0/0 .rodata @6886 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6886 = -2520.0f; -COMPILER_STRIP_GATE(807578E4, &lit_6886); +COMPILER_STRIP_GATE(0x807578E4, &lit_6886); #pragma pop /* 807578E8-807578EC 0001EC 0004+00 0/1 0/0 0/0 .rodata @6887 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6887 = -17.0f; -COMPILER_STRIP_GATE(807578E8, &lit_6887); +COMPILER_STRIP_GATE(0x807578E8, &lit_6887); #pragma pop /* 807578EC-807578F0 0001F0 0004+00 0/1 0/0 0/0 .rodata @6888 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6888 = 256.0f; -COMPILER_STRIP_GATE(807578EC, &lit_6888); +COMPILER_STRIP_GATE(0x807578EC, &lit_6888); #pragma pop /* 807578F0-807578F4 0001F4 0004+00 0/1 0/0 0/0 .rodata @6889 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6889 = -236.0f; -COMPILER_STRIP_GATE(807578F0, &lit_6889); +COMPILER_STRIP_GATE(0x807578F0, &lit_6889); #pragma pop /* 807578F4-807578F8 0001F8 0004+00 0/1 0/0 0/0 .rodata @6890 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6890 = -255.0f; -COMPILER_STRIP_GATE(807578F4, &lit_6890); +COMPILER_STRIP_GATE(0x807578F4, &lit_6890); #pragma pop /* 807578F8-807578FC 0001FC 0004+00 0/1 0/0 0/0 .rodata @6891 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6891 = 58.0f; -COMPILER_STRIP_GATE(807578F8, &lit_6891); +COMPILER_STRIP_GATE(0x807578F8, &lit_6891); #pragma pop /* 807578FC-80757900 000200 0004+00 0/1 0/0 0/0 .rodata @6892 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6892 = 1382.0f; -COMPILER_STRIP_GATE(807578FC, &lit_6892); +COMPILER_STRIP_GATE(0x807578FC, &lit_6892); #pragma pop /* 80757900-80757904 000204 0004+00 0/1 0/0 0/0 .rodata @6893 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6893 = 1365.0f; -COMPILER_STRIP_GATE(80757900, &lit_6893); +COMPILER_STRIP_GATE(0x80757900, &lit_6893); #pragma pop /* 80757904-80757908 000208 0004+00 0/1 0/0 0/0 .rodata @6894 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6894 = 665.0f; -COMPILER_STRIP_GATE(80757904, &lit_6894); +COMPILER_STRIP_GATE(0x80757904, &lit_6894); #pragma pop /* 80757908-8075790C 00020C 0004+00 0/1 0/0 0/0 .rodata @6895 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6895 = 1440.0f; -COMPILER_STRIP_GATE(80757908, &lit_6895); +COMPILER_STRIP_GATE(0x80757908, &lit_6895); #pragma pop /* 8075790C-80757910 000210 0004+00 0/1 0/0 0/0 .rodata @6896 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6896 = 175.0f; -COMPILER_STRIP_GATE(8075790C, &lit_6896); +COMPILER_STRIP_GATE(0x8075790C, &lit_6896); #pragma pop /* 80757910-80757914 000214 0004+00 0/1 0/0 0/0 .rodata @6897 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6897 = -95.0f; -COMPILER_STRIP_GATE(80757910, &lit_6897); +COMPILER_STRIP_GATE(0x80757910, &lit_6897); #pragma pop /* 80757914-80757918 000218 0004+00 0/1 0/0 0/0 .rodata @6898 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6898 = -475.0f; -COMPILER_STRIP_GATE(80757914, &lit_6898); +COMPILER_STRIP_GATE(0x80757914, &lit_6898); #pragma pop /* 80757918-8075791C 00021C 0004+00 0/1 0/0 0/0 .rodata @6899 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6899 = 1415.0f; -COMPILER_STRIP_GATE(80757918, &lit_6899); +COMPILER_STRIP_GATE(0x80757918, &lit_6899); #pragma pop /* 8075791C-80757920 000220 0004+00 0/1 0/0 0/0 .rodata @6900 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6900 = 350.0f; -COMPILER_STRIP_GATE(8075791C, &lit_6900); +COMPILER_STRIP_GATE(0x8075791C, &lit_6900); #pragma pop /* 80757920-80757924 000224 0004+00 0/1 0/0 0/0 .rodata @6901 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6901 = -750.0f; -COMPILER_STRIP_GATE(80757920, &lit_6901); +COMPILER_STRIP_GATE(0x80757920, &lit_6901); #pragma pop /* 80757924-80757928 000228 0004+00 0/1 0/0 0/0 .rodata @6902 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6902 = 2260.0f; -COMPILER_STRIP_GATE(80757924, &lit_6902); +COMPILER_STRIP_GATE(0x80757924, &lit_6902); #pragma pop /* 80757928-8075792C 00022C 0004+00 0/1 0/0 0/0 .rodata @6903 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6903 = -890.0f; -COMPILER_STRIP_GATE(80757928, &lit_6903); +COMPILER_STRIP_GATE(0x80757928, &lit_6903); #pragma pop /* 8075792C-80757930 000230 0004+00 0/1 0/0 0/0 .rodata @6904 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6904 = -94.0f; -COMPILER_STRIP_GATE(8075792C, &lit_6904); +COMPILER_STRIP_GATE(0x8075792C, &lit_6904); #pragma pop /* 80757930-80757934 000234 0004+00 0/1 0/0 0/0 .rodata @6905 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6905 = 693.0f; -COMPILER_STRIP_GATE(80757930, &lit_6905); +COMPILER_STRIP_GATE(0x80757930, &lit_6905); #pragma pop /* 80757934-80757938 000238 0004+00 0/1 0/0 0/0 .rodata @6906 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6906 = -739.0f; -COMPILER_STRIP_GATE(80757934, &lit_6906); +COMPILER_STRIP_GATE(0x80757934, &lit_6906); #pragma pop /* 80757938-8075793C 00023C 0004+00 0/1 0/0 0/0 .rodata @6907 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6907 = -41.0f; -COMPILER_STRIP_GATE(80757938, &lit_6907); +COMPILER_STRIP_GATE(0x80757938, &lit_6907); #pragma pop /* 8075793C-80757940 000240 0004+00 0/1 0/0 0/0 .rodata @6908 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6908 = -1676.0f; -COMPILER_STRIP_GATE(8075793C, &lit_6908); +COMPILER_STRIP_GATE(0x8075793C, &lit_6908); #pragma pop /* 80757940-80757944 000244 0004+00 0/1 0/0 0/0 .rodata @6909 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6909 = 110.0f; -COMPILER_STRIP_GATE(80757940, &lit_6909); +COMPILER_STRIP_GATE(0x80757940, &lit_6909); #pragma pop /* 80757944-80757948 000248 0004+00 0/1 0/0 0/0 .rodata @6910 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6910 = -3350.0f; -COMPILER_STRIP_GATE(80757944, &lit_6910); +COMPILER_STRIP_GATE(0x80757944, &lit_6910); #pragma pop /* 80757948-8075794C 00024C 0004+00 0/1 0/0 0/0 .rodata @6911 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6911 = 550.0f; -COMPILER_STRIP_GATE(80757948, &lit_6911); +COMPILER_STRIP_GATE(0x80757948, &lit_6911); #pragma pop /* 8075794C-80757950 000250 0004+00 0/1 0/0 0/0 .rodata @6912 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6912 = -2165.0f; -COMPILER_STRIP_GATE(8075794C, &lit_6912); +COMPILER_STRIP_GATE(0x8075794C, &lit_6912); #pragma pop /* 80757950-80757954 000254 0004+00 0/1 0/0 0/0 .rodata @6913 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6913 = -726.0f; -COMPILER_STRIP_GATE(80757950, &lit_6913); +COMPILER_STRIP_GATE(0x80757950, &lit_6913); #pragma pop /* 80757954-80757958 000258 0004+00 0/1 0/0 0/0 .rodata @6914 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6914 = 540.0f; -COMPILER_STRIP_GATE(80757954, &lit_6914); +COMPILER_STRIP_GATE(0x80757954, &lit_6914); #pragma pop /* 80757958-8075795C 00025C 0004+00 0/1 0/0 0/0 .rodata @6915 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6915 = -2089.0f; -COMPILER_STRIP_GATE(80757958, &lit_6915); +COMPILER_STRIP_GATE(0x80757958, &lit_6915); #pragma pop /* 8075795C-80757960 000260 0004+00 0/1 0/0 0/0 .rodata @6916 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6916 = 653.0f; -COMPILER_STRIP_GATE(8075795C, &lit_6916); +COMPILER_STRIP_GATE(0x8075795C, &lit_6916); #pragma pop /* 80757960-80757964 000264 0004+00 0/1 0/0 0/0 .rodata @6917 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6917 = 770.0f; -COMPILER_STRIP_GATE(80757960, &lit_6917); +COMPILER_STRIP_GATE(0x80757960, &lit_6917); #pragma pop /* 80757964-80757968 000268 0004+00 0/1 0/0 0/0 .rodata @6918 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6918 = -2231.0f; -COMPILER_STRIP_GATE(80757964, &lit_6918); +COMPILER_STRIP_GATE(0x80757964, &lit_6918); #pragma pop /* 80757968-8075796C 00026C 0004+00 0/1 0/0 0/0 .rodata @6919 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6919 = 725.0f; -COMPILER_STRIP_GATE(80757968, &lit_6919); +COMPILER_STRIP_GATE(0x80757968, &lit_6919); #pragma pop /* 8075796C-80757970 000270 0004+00 0/1 0/0 0/0 .rodata @6920 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6920 = -1629.0f; -COMPILER_STRIP_GATE(8075796C, &lit_6920); +COMPILER_STRIP_GATE(0x8075796C, &lit_6920); #pragma pop /* 80757970-80757974 000274 0004+00 0/1 0/0 0/0 .rodata @6921 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6921 = -609.0f; -COMPILER_STRIP_GATE(80757970, &lit_6921); +COMPILER_STRIP_GATE(0x80757970, &lit_6921); #pragma pop /* 80757974-80757978 000278 0004+00 0/1 0/0 0/0 .rodata @6922 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6922 = -2634.0f; -COMPILER_STRIP_GATE(80757974, &lit_6922); +COMPILER_STRIP_GATE(0x80757974, &lit_6922); #pragma pop /* 80757978-8075797C 00027C 0004+00 0/1 0/0 0/0 .rodata @6923 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6923 = -531.0f; -COMPILER_STRIP_GATE(80757978, &lit_6923); +COMPILER_STRIP_GATE(0x80757978, &lit_6923); #pragma pop /* 8075797C-80757980 000280 0004+00 0/1 0/0 0/0 .rodata @6924 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6924 = -1834.0f; -COMPILER_STRIP_GATE(8075797C, &lit_6924); +COMPILER_STRIP_GATE(0x8075797C, &lit_6924); #pragma pop /* 80757980-80757984 000284 0004+00 0/1 0/0 0/0 .rodata @6925 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6925 = 458.0f; -COMPILER_STRIP_GATE(80757980, &lit_6925); +COMPILER_STRIP_GATE(0x80757980, &lit_6925); #pragma pop /* 80757984-80757988 000288 0004+00 0/1 0/0 0/0 .rodata @6926 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6926 = 970.0f; -COMPILER_STRIP_GATE(80757984, &lit_6926); +COMPILER_STRIP_GATE(0x80757984, &lit_6926); #pragma pop /* 80757988-8075798C 00028C 0004+00 0/1 0/0 0/0 .rodata @6927 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6927 = -2446.0f; -COMPILER_STRIP_GATE(80757988, &lit_6927); +COMPILER_STRIP_GATE(0x80757988, &lit_6927); #pragma pop /* 8075798C-80757990 000290 0004+00 0/1 0/0 0/0 .rodata @6928 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6928 = 530.0f; -COMPILER_STRIP_GATE(8075798C, &lit_6928); +COMPILER_STRIP_GATE(0x8075798C, &lit_6928); #pragma pop /* 80757990-80757994 000294 0004+00 0/1 0/0 0/0 .rodata @6929 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6929 = -1844.0f; -COMPILER_STRIP_GATE(80757990, &lit_6929); +COMPILER_STRIP_GATE(0x80757990, &lit_6929); #pragma pop /* 80757994-80757998 000298 0004+00 0/1 0/0 0/0 .rodata @6930 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6930 = -469.0f; -COMPILER_STRIP_GATE(80757994, &lit_6930); +COMPILER_STRIP_GATE(0x80757994, &lit_6930); #pragma pop /* 80757998-8075799C 00029C 0004+00 0/1 0/0 0/0 .rodata @6931 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6931 = -2409.0f; -COMPILER_STRIP_GATE(80757998, &lit_6931); +COMPILER_STRIP_GATE(0x80757998, &lit_6931); #pragma pop /* 8075799C-807579A0 0002A0 0004+00 0/1 0/0 0/0 .rodata @6932 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6932 = 1500.0f; -COMPILER_STRIP_GATE(8075799C, &lit_6932); +COMPILER_STRIP_GATE(0x8075799C, &lit_6932); #pragma pop /* 807579A0-807579A4 0002A4 0004+00 0/1 0/0 0/0 .rodata @6933 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6933 = 1645.0f; -COMPILER_STRIP_GATE(807579A0, &lit_6933); +COMPILER_STRIP_GATE(0x807579A0, &lit_6933); #pragma pop /* 807579A4-807579A8 0002A8 0004+00 0/1 0/0 0/0 .rodata @6934 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6934 = 430.0f; -COMPILER_STRIP_GATE(807579A4, &lit_6934); +COMPILER_STRIP_GATE(0x807579A4, &lit_6934); #pragma pop /* 807579A8-807579AC 0002AC 0004+00 0/1 0/0 0/0 .rodata @6935 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6935 = 1580.0f; -COMPILER_STRIP_GATE(807579A8, &lit_6935); +COMPILER_STRIP_GATE(0x807579A8, &lit_6935); #pragma pop /* 807579AC-807579B0 0002B0 0004+00 0/2 0/0 0/0 .rodata @6936 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6936 = 150.0f; -COMPILER_STRIP_GATE(807579AC, &lit_6936); +COMPILER_STRIP_GATE(0x807579AC, &lit_6936); #pragma pop /* 807579B0-807579B4 0002B4 0004+00 0/1 0/0 0/0 .rodata @6937 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6937 = -610.0f; -COMPILER_STRIP_GATE(807579B0, &lit_6937); +COMPILER_STRIP_GATE(0x807579B0, &lit_6937); #pragma pop /* 807579B4-807579B8 0002B8 0004+00 0/1 0/0 0/0 .rodata @6938 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6938 = -1550.0f; -COMPILER_STRIP_GATE(807579B4, &lit_6938); +COMPILER_STRIP_GATE(0x807579B4, &lit_6938); #pragma pop /* 807579B8-807579BC 0002BC 0004+00 0/1 0/0 0/0 .rodata @6939 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6939 = 1200.0f; -COMPILER_STRIP_GATE(807579B8, &lit_6939); +COMPILER_STRIP_GATE(0x807579B8, &lit_6939); #pragma pop /* 807579BC-807579C0 0002C0 0004+00 0/1 0/0 0/0 .rodata @6940 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6940 = -605.0f; -COMPILER_STRIP_GATE(807579BC, &lit_6940); +COMPILER_STRIP_GATE(0x807579BC, &lit_6940); #pragma pop /* 807579C0-807579C4 0002C4 0004+00 0/2 0/0 0/0 .rodata @6941 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6941 = 80.0f; -COMPILER_STRIP_GATE(807579C0, &lit_6941); +COMPILER_STRIP_GATE(0x807579C0, &lit_6941); #pragma pop /* 807579C4-807579C8 0002C8 0004+00 0/1 0/0 0/0 .rodata @6942 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6942 = 2100.0f; -COMPILER_STRIP_GATE(807579C4, &lit_6942); +COMPILER_STRIP_GATE(0x807579C4, &lit_6942); #pragma pop /* 807579C8-807579CC 0002CC 0004+00 0/1 0/0 0/0 .rodata @6943 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6943 = -200.0f; -COMPILER_STRIP_GATE(807579C8, &lit_6943); +COMPILER_STRIP_GATE(0x807579C8, &lit_6943); #pragma pop /* 807579CC-807579D0 0002D0 0004+00 0/1 0/0 0/0 .rodata @6944 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6944 = 1810.0f; -COMPILER_STRIP_GATE(807579CC, &lit_6944); +COMPILER_STRIP_GATE(0x807579CC, &lit_6944); #pragma pop /* 807579D0-807579D4 0002D4 0004+00 0/1 0/0 0/0 .rodata @6945 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6945 = -1800.0f; -COMPILER_STRIP_GATE(807579D0, &lit_6945); +COMPILER_STRIP_GATE(0x807579D0, &lit_6945); #pragma pop /* 807579D4-807579D8 0002D8 0004+00 0/1 0/0 0/0 .rodata @6946 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6946 = -626.0f; -COMPILER_STRIP_GATE(807579D4, &lit_6946); +COMPILER_STRIP_GATE(0x807579D4, &lit_6946); #pragma pop /* 807579D8-807579DC 0002DC 0004+00 0/1 0/0 0/0 .rodata @6947 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6947 = 660.0f; -COMPILER_STRIP_GATE(807579D8, &lit_6947); +COMPILER_STRIP_GATE(0x807579D8, &lit_6947); #pragma pop /* 807579DC-807579E0 0002E0 0004+00 0/1 0/0 0/0 .rodata @6948 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6948 = -1839.0f; -COMPILER_STRIP_GATE(807579DC, &lit_6948); +COMPILER_STRIP_GATE(0x807579DC, &lit_6948); #pragma pop /* 807579E0-807579E4 0002E4 0004+00 0/1 0/0 0/0 .rodata @6949 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6949 = 553.0f; -COMPILER_STRIP_GATE(807579E0, &lit_6949); +COMPILER_STRIP_GATE(0x807579E0, &lit_6949); #pragma pop /* 807579E4-807579E8 0002E8 0004+00 0/1 0/0 0/0 .rodata @6950 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6950 = 870.0f; -COMPILER_STRIP_GATE(807579E4, &lit_6950); +COMPILER_STRIP_GATE(0x807579E4, &lit_6950); #pragma pop /* 807579E8-807579EC 0002EC 0004+00 0/1 0/0 0/0 .rodata @6951 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6951 = -2426.0f; -COMPILER_STRIP_GATE(807579E8, &lit_6951); +COMPILER_STRIP_GATE(0x807579E8, &lit_6951); #pragma pop /* 807579EC-807579F0 0002F0 0004+00 0/1 0/0 0/0 .rodata @6952 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6952 = 625.0f; -COMPILER_STRIP_GATE(807579EC, &lit_6952); +COMPILER_STRIP_GATE(0x807579EC, &lit_6952); #pragma pop /* 807579F0-807579F4 0002F4 0004+00 0/1 0/0 0/0 .rodata @6953 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6953 = -1849.0f; -COMPILER_STRIP_GATE(807579F0, &lit_6953); +COMPILER_STRIP_GATE(0x807579F0, &lit_6953); #pragma pop /* 807579F4-807579F8 0002F8 0004+00 0/1 0/0 0/0 .rodata @6954 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6954 = -549.0f; -COMPILER_STRIP_GATE(807579F4, &lit_6954); +COMPILER_STRIP_GATE(0x807579F4, &lit_6954); #pragma pop /* 807579F8-807579FC 0002FC 0004+00 0/1 0/0 0/0 .rodata @6955 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6955 = -2424.0f; -COMPILER_STRIP_GATE(807579F8, &lit_6955); +COMPILER_STRIP_GATE(0x807579F8, &lit_6955); #pragma pop /* 807579FC-80757A00 000300 0004+00 0/1 0/0 0/0 .rodata @6956 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6956 = 555.0f; -COMPILER_STRIP_GATE(807579FC, &lit_6956); +COMPILER_STRIP_GATE(0x807579FC, &lit_6956); #pragma pop /* 80757A00-80757A04 000304 0004+00 0/2 0/0 0/0 .rodata @6957 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6957 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(80757A00, &lit_6957); +COMPILER_STRIP_GATE(0x80757A00, &lit_6957); #pragma pop /* 80757A04-80757A08 000308 0004+00 0/1 0/0 0/0 .rodata @6958 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6958 = 3.0f / 10.0f; -COMPILER_STRIP_GATE(80757A04, &lit_6958); +COMPILER_STRIP_GATE(0x80757A04, &lit_6958); #pragma pop /* 80757A08-80757A0C 00030C 0004+00 0/1 0/0 0/0 .rodata @6959 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6959 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(80757A08, &lit_6959); +COMPILER_STRIP_GATE(0x80757A08, &lit_6959); #pragma pop /* 80757A0C-80757A10 000310 0004+00 0/2 0/0 0/0 .rodata @6960 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6960 = 500.0f; -COMPILER_STRIP_GATE(80757A0C, &lit_6960); +COMPILER_STRIP_GATE(0x80757A0C, &lit_6960); #pragma pop /* 80757A10-80757A14 000314 0004+00 0/1 0/0 0/0 .rodata @6961 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6961 = -400.0f; -COMPILER_STRIP_GATE(80757A10, &lit_6961); +COMPILER_STRIP_GATE(0x80757A10, &lit_6961); #pragma pop /* 80757A14-80757A18 000318 0004+00 0/2 0/0 0/0 .rodata @6962 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6962 = -600.0f; -COMPILER_STRIP_GATE(80757A14, &lit_6962); +COMPILER_STRIP_GATE(0x80757A14, &lit_6962); #pragma pop /* 80757A18-80757A1C 00031C 0004+00 0/1 0/0 0/0 .rodata @6963 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6963 = -470.0f; -COMPILER_STRIP_GATE(80757A18, &lit_6963); +COMPILER_STRIP_GATE(0x80757A18, &lit_6963); #pragma pop /* 80757A1C-80757A20 000320 0004+00 0/1 0/0 0/0 .rodata @6964 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6964 = 320.0f; -COMPILER_STRIP_GATE(80757A1C, &lit_6964); +COMPILER_STRIP_GATE(0x80757A1C, &lit_6964); #pragma pop /* 80757A20-80757A24 000324 0004+00 0/1 0/0 0/0 .rodata @6965 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6965 = -128.0f; -COMPILER_STRIP_GATE(80757A20, &lit_6965); +COMPILER_STRIP_GATE(0x80757A20, &lit_6965); #pragma pop /* 80757A24-80757A28 000328 0004+00 0/2 0/0 0/0 .rodata @6966 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6966 = 55.0f; -COMPILER_STRIP_GATE(80757A24, &lit_6966); +COMPILER_STRIP_GATE(0x80757A24, &lit_6966); #pragma pop /* 80757A28-80757A2C 00032C 0004+00 0/1 0/0 0/0 .rodata @6967 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6967 = -601.0f; -COMPILER_STRIP_GATE(80757A28, &lit_6967); +COMPILER_STRIP_GATE(0x80757A28, &lit_6967); #pragma pop /* 80757A2C-80757A30 000330 0004+00 0/1 0/0 0/0 .rodata @6968 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6968 = 136.0f; -COMPILER_STRIP_GATE(80757A2C, &lit_6968); +COMPILER_STRIP_GATE(0x80757A2C, &lit_6968); #pragma pop /* 80757A30-80757A34 000334 0004+00 0/1 0/0 0/0 .rodata @6969 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6969 = -354.0f; -COMPILER_STRIP_GATE(80757A30, &lit_6969); +COMPILER_STRIP_GATE(0x80757A30, &lit_6969); #pragma pop /* 80757A34-80757A3C 000338 0004+04 0/1 0/0 0/0 .rodata @6970 */ @@ -2752,7 +2761,7 @@ SECTION_RODATA static f32 const lit_6970[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80757A34, &lit_6970); +COMPILER_STRIP_GATE(0x80757A34, &lit_6970); #pragma pop /* 80757A3C-80757A44 000340 0008+00 0/2 0/0 0/0 .rodata @6972 */ @@ -2761,7 +2770,7 @@ COMPILER_STRIP_GATE(80757A34, &lit_6970); SECTION_RODATA static u8 const lit_6972[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80757A3C, &lit_6972); +COMPILER_STRIP_GATE(0x80757A3C, &lit_6972); #pragma pop /* 80757EA0-80757EB0 000098 000C+04 0/1 0/0 0/0 .bss @6025 */ @@ -3184,16 +3193,11 @@ static asm void fopAcM_GetID(void const* param_0) { } #pragma pop -/* 80754AC0-80754AC8 008660 0008+00 1/1 0/0 0/0 .text fopAcM_SetGroup__FP10fopAc_ac_cUc +/* 80754AC0-80754AC8 -00001 0008+00 0/0 0/0 0/0 .text fopAcM_SetGroup__FP10fopAc_ac_cUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void fopAcM_SetGroup(fopAc_ac_c* param_0, u8 param_1) { - nofralloc -#include "asm/rel/d/a/e/d_a_e_po/d_a_e_po/fopAcM_SetGroup__FP10fopAc_ac_cUc.s" +void fopAcM_SetGroup(fopAc_ac_c* param_0, u8 param_1) { + *(u8*)(((u8*)param_0) + 1174) /* param_0->field_0x496 */ = (u8)(param_1); } -#pragma pop /* 80754AC8-80754AD8 008668 0010+00 1/1 0/0 0/0 .text OnCoSetBit__14cCcD_ObjHitInfFv */ #pragma push @@ -3210,14 +3214,14 @@ asm void cCcD_ObjHitInf::OnCoSetBit() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7231 = 230.0f; -COMPILER_STRIP_GATE(80757A44, &lit_7231); +COMPILER_STRIP_GATE(0x80757A44, &lit_7231); #pragma pop /* 80757A48-80757A4C 00034C 0004+00 0/1 0/0 0/0 .rodata @7232 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7232 = 255.0f; -COMPILER_STRIP_GATE(80757A48, &lit_7232); +COMPILER_STRIP_GATE(0x80757A48, &lit_7232); #pragma pop /* 80754AD8-807550EC 008678 0614+00 2/1 0/0 0/0 .text action__FP10e_po_class */ @@ -3235,42 +3239,42 @@ static asm void action(e_po_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7523 = -22.0f; -COMPILER_STRIP_GATE(80757A4C, &lit_7523); +COMPILER_STRIP_GATE(0x80757A4C, &lit_7523); #pragma pop /* 80757A50-80757A54 000354 0004+00 0/1 0/0 0/0 .rodata @7524 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7524 = 24.0f; -COMPILER_STRIP_GATE(80757A50, &lit_7524); +COMPILER_STRIP_GATE(0x80757A50, &lit_7524); #pragma pop /* 80757A54-80757A58 000358 0004+00 0/1 0/0 0/0 .rodata @7525 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7525 = -42.0f / 5.0f; -COMPILER_STRIP_GATE(80757A54, &lit_7525); +COMPILER_STRIP_GATE(0x80757A54, &lit_7525); #pragma pop /* 80757A58-80757A5C 00035C 0004+00 0/1 0/0 0/0 .rodata @7526 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7526 = -25.0f; -COMPILER_STRIP_GATE(80757A58, &lit_7526); +COMPILER_STRIP_GATE(0x80757A58, &lit_7526); #pragma pop /* 80757A5C-80757A60 000360 0004+00 0/1 0/0 0/0 .rodata @7527 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7527 = 6000.0f; -COMPILER_STRIP_GATE(80757A5C, &lit_7527); +COMPILER_STRIP_GATE(0x80757A5C, &lit_7527); #pragma pop /* 80757A60-80757A64 000364 0004+00 0/1 0/0 0/0 .rodata @7528 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7528 = -15.0f; -COMPILER_STRIP_GATE(80757A60, &lit_7528); +COMPILER_STRIP_GATE(0x80757A60, &lit_7528); #pragma pop /* 807550EC-80755C00 008C8C 0B14+00 2/1 0/0 0/0 .text daE_PO_Execute__FP10e_po_class */ @@ -3320,63 +3324,69 @@ static asm void useHeapInit(fopAc_ac_c* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8006 = -500.0f; -COMPILER_STRIP_GATE(80757A64, &lit_8006); +COMPILER_STRIP_GATE(0x80757A64, &lit_8006); #pragma pop /* 80757A68-80757A6C 00036C 0004+00 0/1 0/0 0/0 .rodata @8007 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8007 = 95.0f; -COMPILER_STRIP_GATE(80757A68, &lit_8007); +COMPILER_STRIP_GATE(0x80757A68, &lit_8007); #pragma pop /* 80757A6C-80757A70 000370 0004+00 0/1 0/0 0/0 .rodata @8008 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8008 = 4170.0f; -COMPILER_STRIP_GATE(80757A6C, &lit_8008); +COMPILER_STRIP_GATE(0x80757A6C, &lit_8008); #pragma pop /* 80757A70-80757A74 000374 0004+00 0/1 0/0 0/0 .rodata @8009 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8009 = -5180.0f; -COMPILER_STRIP_GATE(80757A70, &lit_8009); +COMPILER_STRIP_GATE(0x80757A70, &lit_8009); #pragma pop /* 80757A74-80757A78 000378 0004+00 0/1 0/0 0/0 .rodata @8010 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8010 = 5630.0f; -COMPILER_STRIP_GATE(80757A74, &lit_8010); +COMPILER_STRIP_GATE(0x80757A74, &lit_8010); #pragma pop /* 80757A78-80757A7C 00037C 0004+00 0/1 0/0 0/0 .rodata @8011 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8011 = 1050.0f; -COMPILER_STRIP_GATE(80757A78, &lit_8011); +COMPILER_STRIP_GATE(0x80757A78, &lit_8011); #pragma pop /* 80757A7C-80757A80 000380 0004+00 0/1 0/0 0/0 .rodata @8012 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8012 = 4560.0f; -COMPILER_STRIP_GATE(80757A7C, &lit_8012); +COMPILER_STRIP_GATE(0x80757A7C, &lit_8012); #pragma pop /* 80757A80-80757A84 000384 0004+00 0/1 0/0 0/0 .rodata @8013 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8013 = -4550.0f; -COMPILER_STRIP_GATE(80757A80, &lit_8013); +COMPILER_STRIP_GATE(0x80757A80, &lit_8013); #pragma pop /* 80757A84-80757A88 000388 0004+00 0/1 0/0 0/0 .rodata @8014 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8014 = 1055.0f; -COMPILER_STRIP_GATE(80757A84, &lit_8014); +COMPILER_STRIP_GATE(0x80757A84, &lit_8014); +#pragma pop + +/* 80757A88-80757A88 00038C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80757A9D = "E_po"; #pragma pop /* 80756020-80756900 009BC0 08E0+00 1/0 0/0 0/0 .text daE_PO_Create__FP10fopAc_ac_c */ @@ -3535,7 +3545,7 @@ asm void __sinit_d_a_e_po_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80756E30 = (void*)__sinit_d_a_e_po_cpp; +REGISTER_CTORS(0x80756E30, __sinit_d_a_e_po_cpp); #pragma pop /* 80756E6C-80756E74 00AA0C 0008+00 1/0 0/0 0/0 .text @36@__dt__12dBgS_ObjAcchFv */ @@ -3641,15 +3651,10 @@ static asm void dComIfGp_getVibration() { } #pragma pop -/* 807573C0-807573C8 00AF60 0008+00 1/1 0/0 0/0 .text __ct__10JAISoundIDFUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm JAISoundID::JAISoundID(u32 param_0) { - nofralloc -#include "asm/rel/d/a/e/d_a_e_po/d_a_e_po/__ct__10JAISoundIDFUl.s" +/* 807573C0-807573C8 -00001 0008+00 0/0 0/0 0/0 .text __ct__10JAISoundIDFUl */ +JAISoundID::JAISoundID(u32 param_0) { + *(u32*)this = (u32)(param_0); } -#pragma pop /* 807573C8-807573FC 00AF68 0034+00 1/1 0/0 0/0 .text fopAcM_offSwitch__FPC10fopAc_ac_ci */ @@ -4046,11 +4051,4 @@ static u8 data_80758478[4]; static u8 data_8075847C[4]; #pragma pop -/* 80757A88-80757AA2 00038C 001A+00 5/5 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80757A88 = "E_PO"; -SECTION_DEAD static char const* const stringBase_80757A8D = "DEFAULT_GETITEM"; -SECTION_DEAD static char const* const stringBase_80757A9D = "E_po"; -#pragma pop +/* 80757A88-80757A88 00038C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/e/d_a_e_pz/d_a_e_pz.cpp b/rel/d/a/e/d_a_e_pz/d_a_e_pz.cpp index 0aa7940ad4f..877ee35a4a9 100644 --- a/rel/d/a/e/d_a_e_pz/d_a_e_pz.cpp +++ b/rel/d/a/e/d_a_e_pz/d_a_e_pz.cpp @@ -48,16 +48,16 @@ struct mDoExt_baseAnm { /* 8000D428 */ void play(); }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; - struct J3DAnmTransform {}; +struct J3DModelData {}; + +struct Z2Creature {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -561,7 +561,7 @@ extern "C" void __register_global_object(); /* ############################################################################################## */ /* 807614FC-80761500 000000 0004+00 16/16 0/0 0/0 .rodata @3906 */ SECTION_RODATA static f32 const lit_3906 = 100.0f; -COMPILER_STRIP_GATE(807614FC, &lit_3906); +COMPILER_STRIP_GATE(0x807614FC, &lit_3906); /* 80761500-80761504 000004 0004+00 5/17 0/0 0/0 .rodata @3907 */ SECTION_RODATA static u8 const lit_3907[4] = { @@ -570,7 +570,7 @@ SECTION_RODATA static u8 const lit_3907[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80761500, &lit_3907); +COMPILER_STRIP_GATE(0x80761500, &lit_3907); /* 80761504-8076150C 000008 0004+04 4/16 0/0 0/0 .rodata @3908 */ SECTION_RODATA static f32 const lit_3908[1 + 1 /* padding */] = { @@ -578,7 +578,7 @@ SECTION_RODATA static f32 const lit_3908[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80761504, &lit_3908); +COMPILER_STRIP_GATE(0x80761504, &lit_3908); /* 8076150C-80761514 000010 0008+00 0/2 0/0 0/0 .rodata @3909 */ #pragma push @@ -586,7 +586,7 @@ COMPILER_STRIP_GATE(80761504, &lit_3908); SECTION_RODATA static u8 const lit_3909[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8076150C, &lit_3909); +COMPILER_STRIP_GATE(0x8076150C, &lit_3909); #pragma pop /* 80761514-8076151C 000018 0008+00 0/2 0/0 0/0 .rodata @3910 */ @@ -595,7 +595,7 @@ COMPILER_STRIP_GATE(8076150C, &lit_3909); SECTION_RODATA static u8 const lit_3910[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80761514, &lit_3910); +COMPILER_STRIP_GATE(0x80761514, &lit_3910); #pragma pop /* 8076151C-80761524 000020 0008+00 0/2 0/0 0/0 .rodata @3911 */ @@ -604,33 +604,33 @@ COMPILER_STRIP_GATE(80761514, &lit_3910); SECTION_RODATA static u8 const lit_3911[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8076151C, &lit_3911); +COMPILER_STRIP_GATE(0x8076151C, &lit_3911); #pragma pop /* 80761524-80761528 000028 0004+00 0/1 0/0 0/0 .rodata @3912 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3912 = 1.0f / 100.0f; -COMPILER_STRIP_GATE(80761524, &lit_3912); +COMPILER_STRIP_GATE(0x80761524, &lit_3912); #pragma pop /* 80761528-8076152C 00002C 0004+00 0/6 0/0 0/0 .rodata @3927 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3927 = 10.0f; -COMPILER_STRIP_GATE(80761528, &lit_3927); +COMPILER_STRIP_GATE(0x80761528, &lit_3927); #pragma pop /* 8076152C-80761530 000030 0004+00 0/1 0/0 0/0 .rodata @3928 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3928 = 35.0f; -COMPILER_STRIP_GATE(8076152C, &lit_3928); +COMPILER_STRIP_GATE(0x8076152C, &lit_3928); #pragma pop /* 80761530-80761534 000034 0004+00 1/8 0/0 0/0 .rodata @3929 */ SECTION_RODATA static f32 const lit_3929 = 3.0f; -COMPILER_STRIP_GATE(80761530, &lit_3929); +COMPILER_STRIP_GATE(0x80761530, &lit_3929); /* 807617BC-807617C8 000000 000C+00 3/3 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { @@ -1173,7 +1173,7 @@ asm daE_PZ_HIO_c::daE_PZ_HIO_c() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4040 = 800.0f; -COMPILER_STRIP_GATE(80761534, &lit_4040); +COMPILER_STRIP_GATE(0x80761534, &lit_4040); #pragma pop /* 807585BC-807587E0 00013C 0224+00 1/1 0/0 0/0 .text draw__8daE_PZ_cFv */ @@ -1199,7 +1199,13 @@ static asm void daE_PZ_Draw(daE_PZ_c* param_0) { /* ############################################################################################## */ /* 80761538-8076153C 00003C 0004+00 1/6 0/0 0/0 .rodata @4050 */ SECTION_RODATA static f32 const lit_4050 = -1.0f; -COMPILER_STRIP_GATE(80761538, &lit_4050); +COMPILER_STRIP_GATE(0x80761538, &lit_4050); + +/* 807617B4-807617B4 0002B8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_807617B4 = "E_PZ"; +#pragma pop /* 80758800-807588AC 000380 00AC+00 6/6 0/0 0/0 .text setBck__8daE_PZ_cFiUcff */ #pragma push @@ -1236,25 +1242,25 @@ asm void daE_PZ_c::mEntrySUB(bool param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4115 = 7.0f / 10.0f; -COMPILER_STRIP_GATE(8076153C, &lit_4115); +COMPILER_STRIP_GATE(0x8076153C, &lit_4115); #pragma pop /* 80761540-80761544 000044 0004+00 0/3 0/0 0/0 .rodata @4116 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4116 = 4.0f / 5.0f; -COMPILER_STRIP_GATE(80761540, &lit_4116); +COMPILER_STRIP_GATE(0x80761540, &lit_4116); #pragma pop /* 80761544-80761548 000048 0004+00 1/3 0/0 0/0 .rodata @4117 */ SECTION_RODATA static f32 const lit_4117 = 2.0f; -COMPILER_STRIP_GATE(80761544, &lit_4117); +COMPILER_STRIP_GATE(0x80761544, &lit_4117); /* 80761548-8076154C 00004C 0004+00 0/1 0/0 0/0 .rodata @4118 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4118 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(80761548, &lit_4118); +COMPILER_STRIP_GATE(0x80761548, &lit_4118); #pragma pop /* 80761DC0-80761DC4 000008 0001+03 3/3 0/0 0/0 .bss @1109 */ @@ -1372,14 +1378,14 @@ asm void daE_PZ_c::mPzScaleSet(bool param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4159 = 5.0f; -COMPILER_STRIP_GATE(8076154C, &lit_4159); +COMPILER_STRIP_GATE(0x8076154C, &lit_4159); #pragma pop /* 80761550-80761554 000054 0004+00 0/1 0/0 0/0 .rodata @4160 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4160 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(80761550, &lit_4160); +COMPILER_STRIP_GATE(0x80761550, &lit_4160); #pragma pop /* 80758BA0-80758D44 000720 01A4+00 1/1 0/0 0/0 .text mEnemyScaleSet__8daE_PZ_cFv */ @@ -1437,7 +1443,7 @@ static asm void s_PointSearch(void* param_0, void* param_1) { SECTION_RODATA static u8 const lit_4333[8] = { 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80761554, &lit_4333); +COMPILER_STRIP_GATE(0x80761554, &lit_4333); /* 807592F4-807593CC 000E74 00D8+00 1/1 0/0 0/0 .text executeSearchPoint__8daE_PZ_cFv */ #pragma push @@ -1454,532 +1460,532 @@ asm void daE_PZ_c::executeSearchPoint() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4925 = -50.0f; -COMPILER_STRIP_GATE(8076155C, &lit_4925); +COMPILER_STRIP_GATE(0x8076155C, &lit_4925); #pragma pop /* 80761560-80761564 000064 0004+00 0/1 0/0 0/0 .rodata @4926 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4926 = -3150.0f; -COMPILER_STRIP_GATE(80761560, &lit_4926); +COMPILER_STRIP_GATE(0x80761560, &lit_4926); #pragma pop /* 80761564-80761568 000068 0004+00 0/1 0/0 0/0 .rodata @4927 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4927 = -3140.0f; -COMPILER_STRIP_GATE(80761564, &lit_4927); +COMPILER_STRIP_GATE(0x80761564, &lit_4927); #pragma pop /* 80761568-8076156C 00006C 0004+00 0/1 0/0 0/0 .rodata @4928 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4928 = 105.0f; -COMPILER_STRIP_GATE(80761568, &lit_4928); +COMPILER_STRIP_GATE(0x80761568, &lit_4928); #pragma pop /* 8076156C-80761570 000070 0004+00 0/1 0/0 0/0 .rodata @4929 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4929 = 70.0f; -COMPILER_STRIP_GATE(8076156C, &lit_4929); +COMPILER_STRIP_GATE(0x8076156C, &lit_4929); #pragma pop /* 80761570-80761574 000074 0004+00 0/1 0/0 0/0 .rodata @4930 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4930 = -2950.0f; -COMPILER_STRIP_GATE(80761570, &lit_4930); +COMPILER_STRIP_GATE(0x80761570, &lit_4930); #pragma pop /* 80761574-80761578 000078 0004+00 0/1 0/0 0/0 .rodata @4931 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4931 = -65.0f; -COMPILER_STRIP_GATE(80761574, &lit_4931); +COMPILER_STRIP_GATE(0x80761574, &lit_4931); #pragma pop /* 80761578-8076157C 00007C 0004+00 0/1 0/0 0/0 .rodata @4932 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4932 = 270.0f; -COMPILER_STRIP_GATE(80761578, &lit_4932); +COMPILER_STRIP_GATE(0x80761578, &lit_4932); #pragma pop /* 8076157C-80761580 000080 0004+00 0/1 0/0 0/0 .rodata @4933 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4933 = -3200.0f; -COMPILER_STRIP_GATE(8076157C, &lit_4933); +COMPILER_STRIP_GATE(0x8076157C, &lit_4933); #pragma pop /* 80761580-80761584 000084 0004+00 0/1 0/0 0/0 .rodata @4934 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4934 = -95.0f; -COMPILER_STRIP_GATE(80761580, &lit_4934); +COMPILER_STRIP_GATE(0x80761580, &lit_4934); #pragma pop /* 80761584-80761588 000088 0004+00 0/1 0/0 0/0 .rodata @4935 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4935 = 180.0f; -COMPILER_STRIP_GATE(80761584, &lit_4935); +COMPILER_STRIP_GATE(0x80761584, &lit_4935); #pragma pop /* 80761588-8076158C 00008C 0004+00 0/1 0/0 0/0 .rodata @4936 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4936 = -3100.0f; -COMPILER_STRIP_GATE(80761588, &lit_4936); +COMPILER_STRIP_GATE(0x80761588, &lit_4936); #pragma pop /* 8076158C-80761590 000090 0004+00 0/1 0/0 0/0 .rodata @4937 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4937 = -20.0f; -COMPILER_STRIP_GATE(8076158C, &lit_4937); +COMPILER_STRIP_GATE(0x8076158C, &lit_4937); #pragma pop /* 80761590-80761594 000094 0004+00 0/3 0/0 0/0 .rodata @4938 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4938 = 30.0f; -COMPILER_STRIP_GATE(80761590, &lit_4938); +COMPILER_STRIP_GATE(0x80761590, &lit_4938); #pragma pop /* 80761594-80761598 000098 0004+00 0/1 0/0 0/0 .rodata @4939 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4939 = -1590.0f; -COMPILER_STRIP_GATE(80761594, &lit_4939); +COMPILER_STRIP_GATE(0x80761594, &lit_4939); #pragma pop /* 80761598-8076159C 00009C 0004+00 0/1 0/0 0/0 .rodata @4940 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4940 = -110.0f; -COMPILER_STRIP_GATE(80761598, &lit_4940); +COMPILER_STRIP_GATE(0x80761598, &lit_4940); #pragma pop /* 8076159C-807615A0 0000A0 0004+00 0/1 0/0 0/0 .rodata @4941 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4941 = 170.0f; -COMPILER_STRIP_GATE(8076159C, &lit_4941); +COMPILER_STRIP_GATE(0x8076159C, &lit_4941); #pragma pop /* 807615A0-807615A4 0000A4 0004+00 0/1 0/0 0/0 .rodata @4942 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4942 = -940.0f; -COMPILER_STRIP_GATE(807615A0, &lit_4942); +COMPILER_STRIP_GATE(0x807615A0, &lit_4942); #pragma pop /* 807615A4-807615A8 0000A8 0004+00 0/1 0/0 0/0 .rodata @4943 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4943 = -60.0f; -COMPILER_STRIP_GATE(807615A4, &lit_4943); +COMPILER_STRIP_GATE(0x807615A4, &lit_4943); #pragma pop /* 807615A8-807615AC 0000AC 0004+00 0/1 0/0 0/0 .rodata @4944 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4944 = 560.0f; -COMPILER_STRIP_GATE(807615A8, &lit_4944); +COMPILER_STRIP_GATE(0x807615A8, &lit_4944); #pragma pop /* 807615AC-807615B0 0000B0 0004+00 0/1 0/0 0/0 .rodata @4945 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4945 = -1420.0f; -COMPILER_STRIP_GATE(807615AC, &lit_4945); +COMPILER_STRIP_GATE(0x807615AC, &lit_4945); #pragma pop /* 807615B0-807615B4 0000B4 0004+00 0/1 0/0 0/0 .rodata @4946 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4946 = -157.0f; -COMPILER_STRIP_GATE(807615B0, &lit_4946); +COMPILER_STRIP_GATE(0x807615B0, &lit_4946); #pragma pop /* 807615B4-807615B8 0000B8 0004+00 0/1 0/0 0/0 .rodata @4947 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4947 = 128.0f; -COMPILER_STRIP_GATE(807615B4, &lit_4947); +COMPILER_STRIP_GATE(0x807615B4, &lit_4947); #pragma pop /* 807615B8-807615BC 0000BC 0004+00 0/1 0/0 0/0 .rodata @4948 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4948 = -3260.0f; -COMPILER_STRIP_GATE(807615B8, &lit_4948); +COMPILER_STRIP_GATE(0x807615B8, &lit_4948); #pragma pop /* 807615BC-807615C0 0000C0 0004+00 0/2 0/0 0/0 .rodata @4949 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4949 = 150.0f; -COMPILER_STRIP_GATE(807615BC, &lit_4949); +COMPILER_STRIP_GATE(0x807615BC, &lit_4949); #pragma pop /* 807615C0-807615C4 0000C4 0004+00 0/1 0/0 0/0 .rodata @4950 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4950 = -3050.0f; -COMPILER_STRIP_GATE(807615C0, &lit_4950); +COMPILER_STRIP_GATE(0x807615C0, &lit_4950); #pragma pop /* 807615C4-807615C8 0000C8 0004+00 0/1 0/0 0/0 .rodata @4951 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4951 = 125.0f; -COMPILER_STRIP_GATE(807615C4, &lit_4951); +COMPILER_STRIP_GATE(0x807615C4, &lit_4951); #pragma pop /* 807615C8-807615CC 0000CC 0004+00 0/1 0/0 0/0 .rodata @4952 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4952 = -2710.0f; -COMPILER_STRIP_GATE(807615C8, &lit_4952); +COMPILER_STRIP_GATE(0x807615C8, &lit_4952); #pragma pop /* 807615CC-807615D0 0000D0 0004+00 0/1 0/0 0/0 .rodata @4953 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4953 = 380.0f; -COMPILER_STRIP_GATE(807615CC, &lit_4953); +COMPILER_STRIP_GATE(0x807615CC, &lit_4953); #pragma pop /* 807615D0-807615D4 0000D4 0004+00 0/1 0/0 0/0 .rodata @4954 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4954 = -2515.0f; -COMPILER_STRIP_GATE(807615D0, &lit_4954); +COMPILER_STRIP_GATE(0x807615D0, &lit_4954); #pragma pop /* 807615D4-807615D8 0000D8 0004+00 0/4 0/0 0/0 .rodata @4955 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4955 = 300.0f; -COMPILER_STRIP_GATE(807615D4, &lit_4955); +COMPILER_STRIP_GATE(0x807615D4, &lit_4955); #pragma pop /* 807615D8-807615DC 0000DC 0004+00 0/1 0/0 0/0 .rodata @4956 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4956 = -2960.0f; -COMPILER_STRIP_GATE(807615D8, &lit_4956); +COMPILER_STRIP_GATE(0x807615D8, &lit_4956); #pragma pop /* 807615DC-807615E0 0000E0 0004+00 0/1 0/0 0/0 .rodata @4957 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4957 = -15.0f; -COMPILER_STRIP_GATE(807615DC, &lit_4957); +COMPILER_STRIP_GATE(0x807615DC, &lit_4957); #pragma pop /* 807615E0-807615E4 0000E4 0004+00 0/2 0/0 0/0 .rodata @4958 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4958 = 200.0f; -COMPILER_STRIP_GATE(807615E0, &lit_4958); +COMPILER_STRIP_GATE(0x807615E0, &lit_4958); #pragma pop /* 807615E4-807615E8 0000E8 0004+00 0/1 0/0 0/0 .rodata @4959 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4959 = -3160.0f; -COMPILER_STRIP_GATE(807615E4, &lit_4959); +COMPILER_STRIP_GATE(0x807615E4, &lit_4959); #pragma pop /* 807615E8-807615EC 0000EC 0004+00 0/1 0/0 0/0 .rodata @4960 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4960 = -10.0f; -COMPILER_STRIP_GATE(807615E8, &lit_4960); +COMPILER_STRIP_GATE(0x807615E8, &lit_4960); #pragma pop /* 807615EC-807615F0 0000F0 0004+00 0/1 0/0 0/0 .rodata @4961 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4961 = 120.0f; -COMPILER_STRIP_GATE(807615EC, &lit_4961); +COMPILER_STRIP_GATE(0x807615EC, &lit_4961); #pragma pop /* 807615F0-807615F4 0000F4 0004+00 0/1 0/0 0/0 .rodata @4962 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4962 = -3010.0f; -COMPILER_STRIP_GATE(807615F0, &lit_4962); +COMPILER_STRIP_GATE(0x807615F0, &lit_4962); #pragma pop /* 807615F4-807615F8 0000F8 0004+00 0/1 0/0 0/0 .rodata @4963 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4963 = -1120.0f; -COMPILER_STRIP_GATE(807615F4, &lit_4963); +COMPILER_STRIP_GATE(0x807615F4, &lit_4963); #pragma pop /* 807615F8-807615FC 0000FC 0004+00 0/1 0/0 0/0 .rodata @4964 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4964 = -210.0f; -COMPILER_STRIP_GATE(807615F8, &lit_4964); +COMPILER_STRIP_GATE(0x807615F8, &lit_4964); #pragma pop /* 807615FC-80761600 000100 0004+00 0/2 0/0 0/0 .rodata @4965 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4965 = 40.0f; -COMPILER_STRIP_GATE(807615FC, &lit_4965); +COMPILER_STRIP_GATE(0x807615FC, &lit_4965); #pragma pop /* 80761600-80761604 000104 0004+00 0/1 0/0 0/0 .rodata @4966 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4966 = -2790.0f; -COMPILER_STRIP_GATE(80761600, &lit_4966); +COMPILER_STRIP_GATE(0x80761600, &lit_4966); #pragma pop /* 80761604-80761608 000108 0004+00 0/1 0/0 0/0 .rodata @4967 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4967 = 185.0f; -COMPILER_STRIP_GATE(80761604, &lit_4967); +COMPILER_STRIP_GATE(0x80761604, &lit_4967); #pragma pop /* 80761608-8076160C 00010C 0004+00 0/1 0/0 0/0 .rodata @4968 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4968 = -3330.0f; -COMPILER_STRIP_GATE(80761608, &lit_4968); +COMPILER_STRIP_GATE(0x80761608, &lit_4968); #pragma pop /* 8076160C-80761610 000110 0004+00 0/1 0/0 0/0 .rodata @4969 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4969 = 310.0f; -COMPILER_STRIP_GATE(8076160C, &lit_4969); +COMPILER_STRIP_GATE(0x8076160C, &lit_4969); #pragma pop /* 80761610-80761614 000114 0004+00 0/1 0/0 0/0 .rodata @4970 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4970 = 85.0f; -COMPILER_STRIP_GATE(80761610, &lit_4970); +COMPILER_STRIP_GATE(0x80761610, &lit_4970); #pragma pop /* 80761614-80761618 000118 0004+00 0/1 0/0 0/0 .rodata @4971 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4971 = -2745.0f; -COMPILER_STRIP_GATE(80761614, &lit_4971); +COMPILER_STRIP_GATE(0x80761614, &lit_4971); #pragma pop /* 80761618-8076161C 00011C 0004+00 0/1 0/0 0/0 .rodata @4972 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4972 = 110.0f; -COMPILER_STRIP_GATE(80761618, &lit_4972); +COMPILER_STRIP_GATE(0x80761618, &lit_4972); #pragma pop /* 8076161C-80761620 000120 0004+00 0/1 0/0 0/0 .rodata @4973 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4973 = 705.0f; -COMPILER_STRIP_GATE(8076161C, &lit_4973); +COMPILER_STRIP_GATE(0x8076161C, &lit_4973); #pragma pop /* 80761620-80761624 000124 0004+00 0/1 0/0 0/0 .rodata @4974 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4974 = -3650.0f; -COMPILER_STRIP_GATE(80761620, &lit_4974); +COMPILER_STRIP_GATE(0x80761620, &lit_4974); #pragma pop /* 80761624-80761628 000128 0004+00 0/2 0/0 0/0 .rodata @4975 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4975 = 220.0f; -COMPILER_STRIP_GATE(80761624, &lit_4975); +COMPILER_STRIP_GATE(0x80761624, &lit_4975); #pragma pop /* 80761628-8076162C 00012C 0004+00 0/1 0/0 0/0 .rodata @4976 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4976 = -1930.0f; -COMPILER_STRIP_GATE(80761628, &lit_4976); +COMPILER_STRIP_GATE(0x80761628, &lit_4976); #pragma pop /* 8076162C-80761630 000130 0004+00 0/1 0/0 0/0 .rodata @4977 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4977 = -130.0f; -COMPILER_STRIP_GATE(8076162C, &lit_4977); +COMPILER_STRIP_GATE(0x8076162C, &lit_4977); #pragma pop /* 80761630-80761634 000134 0004+00 0/2 0/0 0/0 .rodata @4978 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4978 = -600.0f; -COMPILER_STRIP_GATE(80761630, &lit_4978); +COMPILER_STRIP_GATE(0x80761630, &lit_4978); #pragma pop /* 80761634-80761638 000138 0004+00 0/1 0/0 0/0 .rodata @4979 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4979 = -85.0f; -COMPILER_STRIP_GATE(80761634, &lit_4979); +COMPILER_STRIP_GATE(0x80761634, &lit_4979); #pragma pop /* 80761638-8076163C 00013C 0004+00 0/1 0/0 0/0 .rodata @4980 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4980 = 320.0f; -COMPILER_STRIP_GATE(80761638, &lit_4980); +COMPILER_STRIP_GATE(0x80761638, &lit_4980); #pragma pop /* 8076163C-80761640 000140 0004+00 0/1 0/0 0/0 .rodata @4981 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4981 = 295.0f; -COMPILER_STRIP_GATE(8076163C, &lit_4981); +COMPILER_STRIP_GATE(0x8076163C, &lit_4981); #pragma pop /* 80761640-80761644 000144 0004+00 0/1 0/0 0/0 .rodata @4982 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4982 = 210.0f; -COMPILER_STRIP_GATE(80761640, &lit_4982); +COMPILER_STRIP_GATE(0x80761640, &lit_4982); #pragma pop /* 80761644-80761648 000148 0004+00 0/1 0/0 0/0 .rodata @4983 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4983 = -2670.0f; -COMPILER_STRIP_GATE(80761644, &lit_4983); +COMPILER_STRIP_GATE(0x80761644, &lit_4983); #pragma pop /* 80761648-8076164C 00014C 0004+00 0/1 0/0 0/0 .rodata @4984 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4984 = -5.0f; -COMPILER_STRIP_GATE(80761648, &lit_4984); +COMPILER_STRIP_GATE(0x80761648, &lit_4984); #pragma pop /* 8076164C-80761650 000150 0004+00 0/1 0/0 0/0 .rodata @4985 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4985 = -2325.0f; -COMPILER_STRIP_GATE(8076164C, &lit_4985); +COMPILER_STRIP_GATE(0x8076164C, &lit_4985); #pragma pop /* 80761650-80761654 000154 0004+00 0/1 0/0 0/0 .rodata @4986 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4986 = 145.0f; -COMPILER_STRIP_GATE(80761650, &lit_4986); +COMPILER_STRIP_GATE(0x80761650, &lit_4986); #pragma pop /* 80761654-80761658 000158 0004+00 0/1 0/0 0/0 .rodata @4987 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4987 = -2200.0f; -COMPILER_STRIP_GATE(80761654, &lit_4987); +COMPILER_STRIP_GATE(0x80761654, &lit_4987); #pragma pop /* 80761658-8076165C 00015C 0004+00 0/1 0/0 0/0 .rodata @4988 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4988 = 75.0f; -COMPILER_STRIP_GATE(80761658, &lit_4988); +COMPILER_STRIP_GATE(0x80761658, &lit_4988); #pragma pop /* 8076165C-80761660 000160 0004+00 0/1 0/0 0/0 .rodata @4989 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4989 = -3270.0f; -COMPILER_STRIP_GATE(8076165C, &lit_4989); +COMPILER_STRIP_GATE(0x8076165C, &lit_4989); #pragma pop /* 80761660-80761664 000164 0004+00 0/1 0/0 0/0 .rodata @4990 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4990 = -205.0f; -COMPILER_STRIP_GATE(80761660, &lit_4990); +COMPILER_STRIP_GATE(0x80761660, &lit_4990); #pragma pop /* 80761664-80761668 000168 0004+00 0/1 0/0 0/0 .rodata @4991 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4991 = -3430.0f; -COMPILER_STRIP_GATE(80761664, &lit_4991); +COMPILER_STRIP_GATE(0x80761664, &lit_4991); #pragma pop /* 80761668-8076166C 00016C 0004+00 0/2 0/0 0/0 .rodata @4992 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4992 = 20.0f; -COMPILER_STRIP_GATE(80761668, &lit_4992); +COMPILER_STRIP_GATE(0x80761668, &lit_4992); #pragma pop /* 8076166C-80761670 000170 0004+00 0/1 0/0 0/0 .rodata @4993 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4993 = 130.0f; -COMPILER_STRIP_GATE(8076166C, &lit_4993); +COMPILER_STRIP_GATE(0x8076166C, &lit_4993); #pragma pop /* 80761670-80761674 000174 0004+00 0/1 0/0 0/0 .rodata @4994 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4994 = -2630.0f; -COMPILER_STRIP_GATE(80761670, &lit_4994); +COMPILER_STRIP_GATE(0x80761670, &lit_4994); #pragma pop /* 80761674-80761678 000178 0004+00 0/1 0/0 0/0 .rodata @4995 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4995 = 15.0f; -COMPILER_STRIP_GATE(80761674, &lit_4995); +COMPILER_STRIP_GATE(0x80761674, &lit_4995); #pragma pop /* 80761678-8076167C 00017C 0004+00 0/1 0/0 0/0 .rodata @4996 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4996 = 285.0f; -COMPILER_STRIP_GATE(80761678, &lit_4996); +COMPILER_STRIP_GATE(0x80761678, &lit_4996); #pragma pop /* 8076167C-80761680 000180 0004+00 0/1 0/0 0/0 .rodata @4997 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4997 = -760.0f; -COMPILER_STRIP_GATE(8076167C, &lit_4997); +COMPILER_STRIP_GATE(0x8076167C, &lit_4997); #pragma pop /* 80761680-80761684 000184 0004+00 0/3 0/0 0/0 .rodata @4998 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4998 = -1500.0f; -COMPILER_STRIP_GATE(80761680, &lit_4998); +COMPILER_STRIP_GATE(0x80761680, &lit_4998); #pragma pop /* 80761684-80761688 000188 0004+00 0/1 0/0 0/0 .rodata @4999 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4999 = -2800.0f; -COMPILER_STRIP_GATE(80761684, &lit_4999); +COMPILER_STRIP_GATE(0x80761684, &lit_4999); #pragma pop /* 80761688-8076168C 00018C 0004+00 0/1 0/0 0/0 .rodata @5000 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5000 = -2500.0f; -COMPILER_STRIP_GATE(80761688, &lit_5000); +COMPILER_STRIP_GATE(0x80761688, &lit_5000); #pragma pop /* 80761E2C-80761E3C 000074 000C+04 0/1 0/0 0/0 .bss @4339 */ @@ -2256,112 +2262,112 @@ asm void daE_PZ_c::executeWait() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5001 = -100.0f; -COMPILER_STRIP_GATE(8076168C, &lit_5001); +COMPILER_STRIP_GATE(0x8076168C, &lit_5001); #pragma pop /* 80761690-80761694 000194 0004+00 0/0 0/0 0/0 .rodata @5002 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5002 = -3300.0f; -COMPILER_STRIP_GATE(80761690, &lit_5002); +COMPILER_STRIP_GATE(0x80761690, &lit_5002); #pragma pop /* 80761694-80761698 000198 0004+00 0/0 0/0 0/0 .rodata @5003 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5003 = -3000.0f; -COMPILER_STRIP_GATE(80761694, &lit_5003); +COMPILER_STRIP_GATE(0x80761694, &lit_5003); #pragma pop /* 80761698-8076169C 00019C 0004+00 0/0 0/0 0/0 .rodata @5004 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5004 = 0.5f; -COMPILER_STRIP_GATE(80761698, &lit_5004); +COMPILER_STRIP_GATE(0x80761698, &lit_5004); #pragma pop /* 8076169C-807616A0 0001A0 0004+00 0/0 0/0 0/0 .rodata @5005 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5005 = 1000.0f; -COMPILER_STRIP_GATE(8076169C, &lit_5005); +COMPILER_STRIP_GATE(0x8076169C, &lit_5005); #pragma pop /* 807616A0-807616A4 0001A4 0004+00 0/1 0/0 0/0 .rodata @5006 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5006 = 140.0f; -COMPILER_STRIP_GATE(807616A0, &lit_5006); +COMPILER_STRIP_GATE(0x807616A0, &lit_5006); #pragma pop /* 807616A4-807616A8 0001A8 0004+00 0/2 0/0 0/0 .rodata @5007 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5007 = -1300.0f; -COMPILER_STRIP_GATE(807616A4, &lit_5007); +COMPILER_STRIP_GATE(0x807616A4, &lit_5007); #pragma pop /* 807616A8-807616AC 0001AC 0004+00 0/0 0/0 0/0 .rodata @5008 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5008 = -70.0f; -COMPILER_STRIP_GATE(807616A8, &lit_5008); +COMPILER_STRIP_GATE(0x807616A8, &lit_5008); #pragma pop /* 807616AC-807616B0 0001B0 0004+00 0/1 0/0 0/0 .rodata @5009 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5009 = 250.0f; -COMPILER_STRIP_GATE(807616AC, &lit_5009); +COMPILER_STRIP_GATE(0x807616AC, &lit_5009); #pragma pop /* 807616B0-807616B4 0001B4 0004+00 0/0 0/0 0/0 .rodata @5010 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5010 = -950.0f; -COMPILER_STRIP_GATE(807616B0, &lit_5010); +COMPILER_STRIP_GATE(0x807616B0, &lit_5010); #pragma pop /* 807616B4-807616B8 0001B8 0004+00 0/0 0/0 0/0 .rodata @5011 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5011 = -700.0f; -COMPILER_STRIP_GATE(807616B4, &lit_5011); +COMPILER_STRIP_GATE(0x807616B4, &lit_5011); #pragma pop /* 807616B8-807616BC 0001BC 0004+00 0/0 0/0 0/0 .rodata @5012 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5012 = -800.0f; -COMPILER_STRIP_GATE(807616B8, &lit_5012); +COMPILER_STRIP_GATE(0x807616B8, &lit_5012); #pragma pop /* 807616BC-807616C0 0001C0 0004+00 0/0 0/0 0/0 .rodata @5013 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5013 = -300.0f; -COMPILER_STRIP_GATE(807616BC, &lit_5013); +COMPILER_STRIP_GATE(0x807616BC, &lit_5013); #pragma pop /* 807616C0-807616C4 0001C4 0004+00 0/1 0/0 0/0 .rodata @5014 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5014 = -1200.0f; -COMPILER_STRIP_GATE(807616C0, &lit_5014); +COMPILER_STRIP_GATE(0x807616C0, &lit_5014); #pragma pop /* 807616C4-807616C8 0001C8 0004+00 0/0 0/0 0/0 .rodata @5015 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5015 = -2600.0f; -COMPILER_STRIP_GATE(807616C4, &lit_5015); +COMPILER_STRIP_GATE(0x807616C4, &lit_5015); #pragma pop /* 807616C8-807616CC 0001CC 0004+00 0/0 0/0 0/0 .rodata @5016 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5016 = 6.0f; -COMPILER_STRIP_GATE(807616C8, &lit_5016); +COMPILER_STRIP_GATE(0x807616C8, &lit_5016); #pragma pop /* 807616CC-807616D4 0001D0 0004+04 0/0 0/0 0/0 .rodata @5017 */ @@ -2372,20 +2378,20 @@ SECTION_RODATA static f32 const lit_5017[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(807616CC, &lit_5017); +COMPILER_STRIP_GATE(0x807616CC, &lit_5017); #pragma pop /* 807616D4-807616DC 0001D8 0008+00 1/1 0/0 0/0 .rodata @5083 */ SECTION_RODATA static u8 const lit_5083[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(807616D4, &lit_5083); +COMPILER_STRIP_GATE(0x807616D4, &lit_5083); /* 807616DC-807616E0 0001E0 0004+00 0/1 0/0 0/0 .rodata @5608 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5608 = 2.0f / 5.0f; -COMPILER_STRIP_GATE(807616DC, &lit_5608); +COMPILER_STRIP_GATE(0x807616DC, &lit_5608); #pragma pop /* 8075C6AC-8075CB80 00422C 04D4+00 1/1 0/0 0/0 .text executeAttack__8daE_PZ_cFv */ @@ -2403,7 +2409,7 @@ asm void daE_PZ_c::executeAttack() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5672 = -40.0f; -COMPILER_STRIP_GATE(807616E0, &lit_5672); +COMPILER_STRIP_GATE(0x807616E0, &lit_5672); #pragma pop /* 8075CB80-8075CE68 004700 02E8+00 1/1 0/0 0/0 .text executeDamage__8daE_PZ_cFv */ @@ -2421,21 +2427,21 @@ asm void daE_PZ_c::executeDamage() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5974 = 215.0f; -COMPILER_STRIP_GATE(807616E4, &lit_5974); +COMPILER_STRIP_GATE(0x807616E4, &lit_5974); #pragma pop /* 807616E8-807616EC 0001EC 0004+00 0/1 0/0 0/0 .rodata @5975 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5975 = 880.0f; -COMPILER_STRIP_GATE(807616E8, &lit_5975); +COMPILER_STRIP_GATE(0x807616E8, &lit_5975); #pragma pop /* 807616EC-807616F0 0001F0 0004+00 0/2 0/0 0/0 .rodata @5976 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5976 = 400.0f; -COMPILER_STRIP_GATE(807616EC, &lit_5976); +COMPILER_STRIP_GATE(0x807616EC, &lit_5976); #pragma pop /* 80762194-807621A4 0003DC 000C+04 0/1 0/0 0/0 .bss @5677 */ @@ -2562,28 +2568,28 @@ asm void daE_PZ_c::mtx_set() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5977 = 6.0f / 5.0f; -COMPILER_STRIP_GATE(807616F0, &lit_5977); +COMPILER_STRIP_GATE(0x807616F0, &lit_5977); #pragma pop /* 807616F4-807616F8 0001F8 0004+00 0/0 0/0 0/0 .rodata @5978 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5978 = 500.0f; -COMPILER_STRIP_GATE(807616F4, &lit_5978); +COMPILER_STRIP_GATE(0x807616F4, &lit_5978); #pragma pop /* 807616F8-807616FC 0001FC 0004+00 0/1 0/0 0/0 .rodata @5979 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5979 = 50.0f; -COMPILER_STRIP_GATE(807616F8, &lit_5979); +COMPILER_STRIP_GATE(0x807616F8, &lit_5979); #pragma pop /* 807616FC-80761700 000200 0004+00 0/0 0/0 0/0 .rodata @5980 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5980 = 11.0f / 5.0f; -COMPILER_STRIP_GATE(807616FC, &lit_5980); +COMPILER_STRIP_GATE(0x807616FC, &lit_5980); #pragma pop /* 80761700-80761748 000204 0048+00 0/0 0/0 0/0 .rodata BIRTH_DT */ @@ -2596,7 +2602,7 @@ SECTION_RODATA static u8 const BIRTH_DT[72] = { 0x00, 0x00, 0x08, 0x01, 0xCD, 0x00, 0x00, 0xFF, 0x1F, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x0C, 0x01, 0xE4, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0x28, 0x00, 0x00, 0x00, 0x03, }; -COMPILER_STRIP_GATE(80761700, &BIRTH_DT); +COMPILER_STRIP_GATE(0x80761700, &BIRTH_DT); #pragma pop /* 80761748-80761760 00024C 0018+00 0/0 0/0 0/0 .rodata mDBaBa_birthAngle_dt */ @@ -2606,7 +2612,7 @@ SECTION_RODATA static u8 const mDBaBa_birthAngle_dt[24] = { 0x00, 0x00, 0x2A, 0xAA, 0x55, 0x54, 0x7F, 0xFE, 0xAA, 0xA8, 0xD5, 0x52, 0x10, 0x00, 0x3A, 0xAA, 0x65, 0x54, 0x8F, 0xFE, 0xBA, 0xA8, 0xE5, 0x52, }; -COMPILER_STRIP_GATE(80761748, &mDBaBa_birthAngle_dt); +COMPILER_STRIP_GATE(0x80761748, &mDBaBa_birthAngle_dt); #pragma pop /* 80761760-80761790 000264 0030+00 0/0 0/0 0/0 .rodata mDBaBa_birthHani_dt */ @@ -2617,21 +2623,21 @@ SECTION_RODATA static u8 const mDBaBa_birthHani_dt[48] = { 0x44, 0x16, 0x00, 0x00, 0x44, 0x16, 0x00, 0x00, 0x44, 0xE1, 0x00, 0x00, 0x44, 0xE1, 0x00, 0x00, 0x44, 0xE1, 0x00, 0x00, 0x44, 0xE1, 0x00, 0x00, 0x44, 0xE1, 0x00, 0x00, 0x44, 0xE1, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80761760, &mDBaBa_birthHani_dt); +COMPILER_STRIP_GATE(0x80761760, &mDBaBa_birthHani_dt); #pragma pop /* 80761790-80761794 000294 0004+00 0/0 0/0 0/0 .rodata @6712 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6712 = -2000.0f; -COMPILER_STRIP_GATE(80761790, &lit_6712); +COMPILER_STRIP_GATE(0x80761790, &lit_6712); #pragma pop /* 80761794-80761798 000298 0004+00 0/1 0/0 0/0 .rodata @6935 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6935 = -120.0f; -COMPILER_STRIP_GATE(80761794, &lit_6935); +COMPILER_STRIP_GATE(0x80761794, &lit_6935); #pragma pop /* 8075F7E8-8075F964 007368 017C+00 1/1 0/0 0/0 .text cc_set__8daE_PZ_cFv */ @@ -2724,49 +2730,49 @@ static asm void useHeapInit(fopAc_ac_c* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7430 = -4000.0f; -COMPILER_STRIP_GATE(80761798, &lit_7430); +COMPILER_STRIP_GATE(0x80761798, &lit_7430); #pragma pop /* 8076179C-807617A0 0002A0 0004+00 0/1 0/0 0/0 .rodata @7431 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7431 = 4000.0f; -COMPILER_STRIP_GATE(8076179C, &lit_7431); +COMPILER_STRIP_GATE(0x8076179C, &lit_7431); #pragma pop /* 807617A0-807617A4 0002A4 0004+00 0/1 0/0 0/0 .rodata @7432 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7432 = -3.0f; -COMPILER_STRIP_GATE(807617A0, &lit_7432); +COMPILER_STRIP_GATE(0x807617A0, &lit_7432); #pragma pop /* 807617A4-807617A8 0002A8 0004+00 0/1 0/0 0/0 .rodata @7433 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7433 = -400.0f; -COMPILER_STRIP_GATE(807617A4, &lit_7433); +COMPILER_STRIP_GATE(0x807617A4, &lit_7433); #pragma pop /* 807617A8-807617AC 0002AC 0004+00 0/1 0/0 0/0 .rodata @7434 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7434 = -10000.0f; -COMPILER_STRIP_GATE(807617A8, &lit_7434); +COMPILER_STRIP_GATE(0x807617A8, &lit_7434); #pragma pop /* 807617AC-807617B0 0002B0 0004+00 0/1 0/0 0/0 .rodata @7435 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7435 = 10000.0f; -COMPILER_STRIP_GATE(807617AC, &lit_7435); +COMPILER_STRIP_GATE(0x807617AC, &lit_7435); #pragma pop /* 807617B0-807617B4 0002B4 0004+00 0/1 0/0 0/0 .rodata @7436 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7436 = 60.0f; -COMPILER_STRIP_GATE(807617B0, &lit_7436); +COMPILER_STRIP_GATE(0x807617B0, &lit_7436); #pragma pop /* 8076010C-807607EC 007C8C 06E0+00 1/1 0/0 0/0 .text create__8daE_PZ_cFv */ @@ -2896,7 +2902,7 @@ asm void __sinit_d_a_e_pz_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80760CA8 = (void*)__sinit_d_a_e_pz_cpp; +REGISTER_CTORS(0x80760CA8, __sinit_d_a_e_pz_cpp); #pragma pop /* 80760CE4-80760CEC 008864 0008+00 1/0 0/0 0/0 .text @36@__dt__12dBgS_ObjAcchFv */ @@ -2941,16 +2947,11 @@ asm cXyz::~cXyz() { } #pragma pop -/* 80761144-8076114C 008CC4 0008+00 1/1 0/0 0/0 .text changeDemoMoveAngle__9daPy_py_cFs +/* 80761144-8076114C -00001 0008+00 0/0 0/0 0/0 .text changeDemoMoveAngle__9daPy_py_cFs */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daPy_py_c::changeDemoMoveAngle(s16 param_0) { - nofralloc -#include "asm/rel/d/a/e/d_a_e_pz/d_a_e_pz/changeDemoMoveAngle__9daPy_py_cFs.s" +void daPy_py_c::changeDemoMoveAngle(s16 param_0) { + *(u16*)(((u8*)this) + 1542) /* this->field_0x606 */ = (u16)(param_0); } -#pragma pop /* 8076114C-80761164 008CCC 0018+00 1/1 0/0 0/0 .text zero__4cXyzFv */ #pragma push @@ -3329,9 +3330,4 @@ static u8 data_80762288[4]; static u8 data_8076228C[4]; #pragma pop -/* 807617B4-807617B9 0002B8 0005+00 5/5 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_807617B4 = "E_PZ"; -#pragma pop +/* 807617B4-807617B4 0002B8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/e/d_a_e_rb/d_a_e_rb.cpp b/rel/d/a/e/d_a_e_rb/d_a_e_rb.cpp index b685e2bca05..8354307bdf4 100644 --- a/rel/d/a/e/d_a_e_rb/d_a_e_rb.cpp +++ b/rel/d/a/e/d_a_e_rb/d_a_e_rb.cpp @@ -27,16 +27,16 @@ struct mDoMtx_stack_c { static u8 now[48]; }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; - struct J3DAnmTransform {}; +struct J3DModelData {}; + +struct Z2Creature {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -85,10 +85,10 @@ struct dRes_control_c { struct dPa_levelEcallBack {}; -struct _GXColor {}; - struct csXyz {}; +struct _GXColor {}; + struct dPa_control_c { /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, @@ -387,7 +387,7 @@ extern "C" void __register_global_object(); /* ############################################################################################## */ /* 80764D0C-80764D10 000000 0004+00 13/13 0/0 0/0 .rodata @3788 */ SECTION_RODATA static f32 const lit_3788 = 100.0f; -COMPILER_STRIP_GATE(80764D0C, &lit_3788); +COMPILER_STRIP_GATE(0x80764D0C, &lit_3788); /* 80764D10-80764D14 000004 0004+00 1/9 0/0 0/0 .rodata @3789 */ SECTION_RODATA static u8 const lit_3789[4] = { @@ -396,7 +396,7 @@ SECTION_RODATA static u8 const lit_3789[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80764D10, &lit_3789); +COMPILER_STRIP_GATE(0x80764D10, &lit_3789); /* 80764D14-80764D1C 000008 0004+04 1/10 0/0 0/0 .rodata @3790 */ SECTION_RODATA static f32 const lit_3790[1 + 1 /* padding */] = { @@ -404,7 +404,7 @@ SECTION_RODATA static f32 const lit_3790[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80764D14, &lit_3790); +COMPILER_STRIP_GATE(0x80764D14, &lit_3790); /* 80764D1C-80764D24 000010 0008+00 0/1 0/0 0/0 .rodata @3791 */ #pragma push @@ -412,7 +412,7 @@ COMPILER_STRIP_GATE(80764D14, &lit_3790); SECTION_RODATA static u8 const lit_3791[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80764D1C, &lit_3791); +COMPILER_STRIP_GATE(0x80764D1C, &lit_3791); #pragma pop /* 80764D24-80764D2C 000018 0008+00 0/1 0/0 0/0 .rodata @3792 */ @@ -421,7 +421,7 @@ COMPILER_STRIP_GATE(80764D1C, &lit_3791); SECTION_RODATA static u8 const lit_3792[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80764D24, &lit_3792); +COMPILER_STRIP_GATE(0x80764D24, &lit_3792); #pragma pop /* 80764D2C-80764D34 000020 0008+00 0/1 0/0 0/0 .rodata @3793 */ @@ -430,23 +430,23 @@ COMPILER_STRIP_GATE(80764D24, &lit_3792); SECTION_RODATA static u8 const lit_3793[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80764D2C, &lit_3793); +COMPILER_STRIP_GATE(0x80764D2C, &lit_3793); #pragma pop /* 80764D34-80764D38 000028 0004+00 0/2 0/0 0/0 .rodata @3794 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3794 = 1.0f / 100.0f; -COMPILER_STRIP_GATE(80764D34, &lit_3794); +COMPILER_STRIP_GATE(0x80764D34, &lit_3794); #pragma pop /* 80764D38-80764D3C 00002C 0004+00 1/2 0/0 0/0 .rodata @3809 */ SECTION_RODATA static f32 const lit_3809 = 1.5f; -COMPILER_STRIP_GATE(80764D38, &lit_3809); +COMPILER_STRIP_GATE(0x80764D38, &lit_3809); /* 80764D3C-80764D40 000030 0004+00 1/1 0/0 0/0 .rodata @3810 */ SECTION_RODATA static f32 const lit_3810 = -5.0f; -COMPILER_STRIP_GATE(80764D3C, &lit_3810); +COMPILER_STRIP_GATE(0x80764D3C, &lit_3810); /* 80764DDC-80764DE8 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { @@ -634,7 +634,13 @@ asm daE_RB_HIO_c::daE_RB_HIO_c() { /* ############################################################################################## */ /* 80764D40-80764D44 000034 0004+00 1/2 0/0 0/0 .rodata @3824 */ SECTION_RODATA static f32 const lit_3824 = -1.0f; -COMPILER_STRIP_GATE(80764D40, &lit_3824); +COMPILER_STRIP_GATE(0x80764D40, &lit_3824); + +/* 80764DD4-80764DD4 0000C8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80764DD4 = "E_rb"; +#pragma pop /* 807623BC-80762464 00011C 00A8+00 5/5 0/0 0/0 .text anm_init__FP10e_rb_classifUcf */ #pragma push @@ -651,21 +657,21 @@ static asm void anm_init(e_rb_class* param_0, int param_1, f32 param_2, u8 param #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3842 = -70.0f; -COMPILER_STRIP_GATE(80764D44, &lit_3842); +COMPILER_STRIP_GATE(0x80764D44, &lit_3842); #pragma pop /* 80764D48-80764D4C 00003C 0004+00 0/2 0/0 0/0 .rodata @3843 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3843 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(80764D48, &lit_3843); +COMPILER_STRIP_GATE(0x80764D48, &lit_3843); #pragma pop /* 80764D4C-80764D50 000040 0004+00 0/4 0/0 0/0 .rodata @3844 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3844 = 40.0f; -COMPILER_STRIP_GATE(80764D4C, &lit_3844); +COMPILER_STRIP_GATE(0x80764D4C, &lit_3844); #pragma pop /* 80764F80-80764F84 000008 0004+00 2/2 0/0 0/0 .bss None */ @@ -692,23 +698,23 @@ static asm void daE_RB_Draw(e_rb_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3889 = 60.0f; -COMPILER_STRIP_GATE(80764D50, &lit_3889); +COMPILER_STRIP_GATE(0x80764D50, &lit_3889); #pragma pop /* 80764D54-80764D58 000048 0004+00 2/6 0/0 0/0 .rodata @3890 */ SECTION_RODATA static f32 const lit_3890 = 50.0f; -COMPILER_STRIP_GATE(80764D54, &lit_3890); +COMPILER_STRIP_GATE(0x80764D54, &lit_3890); /* 80764D58-80764D5C 00004C 0004+00 0/2 0/0 0/0 .rodata @3891 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3891 = 20.0f; -COMPILER_STRIP_GATE(80764D58, &lit_3891); +COMPILER_STRIP_GATE(0x80764D58, &lit_3891); #pragma pop /* 80764D5C-80764D60 000050 0004+00 1/2 0/0 0/0 .rodata @3892 */ SECTION_RODATA static f32 const lit_3892 = 65536.0f; -COMPILER_STRIP_GATE(80764D5C, &lit_3892); +COMPILER_STRIP_GATE(0x80764D5C, &lit_3892); /* 80762554-80762764 0002B4 0210+00 1/1 0/0 0/0 .text damage_check__FP10e_rb_class */ #pragma push @@ -725,7 +731,7 @@ static asm void damage_check(e_rb_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3901 = -200.0f; -COMPILER_STRIP_GATE(80764D60, &lit_3901); +COMPILER_STRIP_GATE(0x80764D60, &lit_3901); #pragma pop /* 80762764-807627E4 0004C4 0080+00 1/1 0/0 0/0 .text e_rb_stay__FP10e_rb_class */ @@ -743,21 +749,21 @@ static asm void e_rb_stay(e_rb_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3933 = 800.0f; -COMPILER_STRIP_GATE(80764D64, &lit_3933); +COMPILER_STRIP_GATE(0x80764D64, &lit_3933); #pragma pop /* 80764D68-80764D6C 00005C 0004+00 0/1 0/0 0/0 .rodata @3934 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3934 = 300.0f; -COMPILER_STRIP_GATE(80764D68, &lit_3934); +COMPILER_STRIP_GATE(0x80764D68, &lit_3934); #pragma pop /* 80764D6C-80764D70 000060 0004+00 0/4 0/0 0/0 .rodata @3935 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3935 = 3.0f; -COMPILER_STRIP_GATE(80764D6C, &lit_3935); +COMPILER_STRIP_GATE(0x80764D6C, &lit_3935); #pragma pop /* 807627E4-807629D8 000544 01F4+00 1/1 0/0 0/0 .text e_rb_appear__FP10e_rb_class */ @@ -775,28 +781,28 @@ static asm void e_rb_appear(e_rb_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3982 = 200.0f; -COMPILER_STRIP_GATE(80764D70, &lit_3982); +COMPILER_STRIP_GATE(0x80764D70, &lit_3982); #pragma pop /* 80764D74-80764D78 000068 0004+00 0/1 0/0 0/0 .rodata @3983 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3983 = 400.0f; -COMPILER_STRIP_GATE(80764D74, &lit_3983); +COMPILER_STRIP_GATE(0x80764D74, &lit_3983); #pragma pop /* 80764D78-80764D7C 00006C 0004+00 0/2 0/0 0/0 .rodata @3984 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3984 = 33.0f; -COMPILER_STRIP_GATE(80764D78, &lit_3984); +COMPILER_STRIP_GATE(0x80764D78, &lit_3984); #pragma pop /* 80764D7C-80764D80 000070 0004+00 0/1 0/0 0/0 .rodata @3985 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_3985 = 0x3BA3D70A; -COMPILER_STRIP_GATE(80764D7C, &lit_3985); +COMPILER_STRIP_GATE(0x80764D7C, &lit_3985); #pragma pop /* 807629D8-80762C4C 000738 0274+00 1/1 0/0 0/0 .text e_rb_move__FP10e_rb_class */ @@ -814,21 +820,21 @@ static asm void e_rb_move(e_rb_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4026 = 30.0f; -COMPILER_STRIP_GATE(80764D80, &lit_4026); +COMPILER_STRIP_GATE(0x80764D80, &lit_4026); #pragma pop /* 80764D84-80764D88 000078 0004+00 0/2 0/0 0/0 .rodata @4027 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4027 = 2.0f; -COMPILER_STRIP_GATE(80764D84, &lit_4027); +COMPILER_STRIP_GATE(0x80764D84, &lit_4027); #pragma pop /* 80764D88-80764D8C 00007C 0004+00 0/1 0/0 0/0 .rodata @4028 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4028 = 4.0f / 5.0f; -COMPILER_STRIP_GATE(80764D88, &lit_4028); +COMPILER_STRIP_GATE(0x80764D88, &lit_4028); #pragma pop /* 80762C4C-80762E90 0009AC 0244+00 1/1 0/0 0/0 .text e_rb_attack__FP10e_rb_class */ @@ -846,7 +852,7 @@ static asm void e_rb_attack(e_rb_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4043 = 2.5f; -COMPILER_STRIP_GATE(80764D8C, &lit_4043); +COMPILER_STRIP_GATE(0x80764D8C, &lit_4043); #pragma pop /* 80762E90-80762FD4 000BF0 0144+00 1/1 0/0 0/0 .text e_rb_disappear__FP10e_rb_class */ @@ -864,7 +870,7 @@ static asm void e_rb_disappear(e_rb_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4063 = 10.0f; -COMPILER_STRIP_GATE(80764D90, &lit_4063); +COMPILER_STRIP_GATE(0x80764D90, &lit_4063); #pragma pop /* 80764D94-80764D9C 000088 0004+04 0/2 0/0 0/0 .rodata @4064 */ @@ -875,7 +881,7 @@ SECTION_RODATA static f32 const lit_4064[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80764D94, &lit_4064); +COMPILER_STRIP_GATE(0x80764D94, &lit_4064); #pragma pop /* 80764D9C-80764DA4 000090 0008+00 0/1 0/0 0/0 .rodata @4066 */ @@ -884,7 +890,7 @@ COMPILER_STRIP_GATE(80764D94, &lit_4064); SECTION_RODATA static u8 const lit_4066[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80764D9C, &lit_4066); +COMPILER_STRIP_GATE(0x80764D9C, &lit_4066); #pragma pop /* 80762FD4-807631E0 000D34 020C+00 1/1 0/0 0/0 .text e_rb_damage__FP10e_rb_class */ @@ -916,14 +922,14 @@ SECTION_RODATA static f32 const lit_4165[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80764DA4, &lit_4165); +COMPILER_STRIP_GATE(0x80764DA4, &lit_4165); #pragma pop /* 80764DAC-80764DB4 0000A0 0008+00 1/2 0/0 0/0 .rodata @4183 */ SECTION_RODATA static u8 const lit_4183[8] = { 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80764DAC, &lit_4183); +COMPILER_STRIP_GATE(0x80764DAC, &lit_4183); /* 80763554-80763618 0012B4 00C4+00 1/1 0/0 0/0 .text e_rb_base_0__FP10e_rb_class */ #pragma push @@ -957,42 +963,42 @@ static asm void s_s_sub(void* param_0, void* param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4362 = 15.0f; -COMPILER_STRIP_GATE(80764DB4, &lit_4362); +COMPILER_STRIP_GATE(0x80764DB4, &lit_4362); #pragma pop /* 80764DB8-80764DBC 0000AC 0004+00 0/1 0/0 0/0 .rodata @4363 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4363 = 500.0f; -COMPILER_STRIP_GATE(80764DB8, &lit_4363); +COMPILER_STRIP_GATE(0x80764DB8, &lit_4363); #pragma pop /* 80764DBC-80764DC0 0000B0 0004+00 0/2 0/0 0/0 .rodata @4364 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4364 = 1.0f / 20.0f; -COMPILER_STRIP_GATE(80764DBC, &lit_4364); +COMPILER_STRIP_GATE(0x80764DBC, &lit_4364); #pragma pop /* 80764DC0-80764DC4 0000B4 0004+00 0/1 0/0 0/0 .rodata @4365 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4365 = 5.0f; -COMPILER_STRIP_GATE(80764DC0, &lit_4365); +COMPILER_STRIP_GATE(0x80764DC0, &lit_4365); #pragma pop /* 80764DC4-80764DC8 0000B8 0004+00 0/1 0/0 0/0 .rodata @4366 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4366 = 150.0f; -COMPILER_STRIP_GATE(80764DC4, &lit_4366); +COMPILER_STRIP_GATE(0x80764DC4, &lit_4366); #pragma pop /* 80764DC8-80764DCC 0000BC 0004+00 0/1 0/0 0/0 .rodata @4367 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4367 = -1000000000.0f; -COMPILER_STRIP_GATE(80764DC8, &lit_4367); +COMPILER_STRIP_GATE(0x80764DC8, &lit_4367); #pragma pop /* 807636BC-80763CF0 00141C 0634+00 1/1 0/0 0/0 .text e_rb_base_1__FP10e_rb_class */ @@ -1040,14 +1046,14 @@ static asm void e_rb_base(e_rb_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4492 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(80764DCC, &lit_4492); +COMPILER_STRIP_GATE(0x80764DCC, &lit_4492); #pragma pop /* 80764DD0-80764DD4 0000C4 0004+00 0/1 0/0 0/0 .rodata @4493 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4493 = 30000.0f; -COMPILER_STRIP_GATE(80764DD0, &lit_4493); +COMPILER_STRIP_GATE(0x80764DD0, &lit_4493); #pragma pop /* 80763DF4-80764104 001B54 0310+00 2/1 0/0 0/0 .text daE_RB_Execute__FP10e_rb_class */ @@ -1177,7 +1183,7 @@ asm void __sinit_d_a_e_rb_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80764880 = (void*)__sinit_d_a_e_rb_cpp; +REGISTER_CTORS(0x80764880, __sinit_d_a_e_rb_cpp); #pragma pop /* 807648BC-807648C4 00261C 0008+00 1/0 0/0 0/0 .text @20@__dt__14dBgS_ObjGndChkFv */ @@ -1242,9 +1248,4 @@ static asm void setMidnaBindEffect(fopEn_enemy_c* param_0, Z2CreatureEnemy* para } #pragma pop -/* 80764DD4-80764DD9 0000C8 0005+00 4/4 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80764DD4 = "E_rb"; -#pragma pop +/* 80764DD4-80764DD4 0000C8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/e/d_a_e_rd/d_a_e_rd.cpp b/rel/d/a/e/d_a_e_rd/d_a_e_rd.cpp index aff7a325979..6078bcce327 100644 --- a/rel/d/a/e/d_a_e_rd/d_a_e_rd.cpp +++ b/rel/d/a/e/d_a_e_rd/d_a_e_rd.cpp @@ -26,16 +26,16 @@ struct mDoGph_gInf_c { /* 80008078 */ void onBlure(); }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; - struct J3DAnmTransform {}; +struct J3DModelData {}; + +struct Z2Creature {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -711,7 +711,7 @@ extern "C" void BreakSet__13daObjH_Saku_cFv(); /* ############################################################################################## */ /* 80518584-80518588 000000 0004+00 61/61 0/0 0/0 .rodata @4208 */ SECTION_RODATA static f32 const lit_4208 = 100.0f; -COMPILER_STRIP_GATE(80518584, &lit_4208); +COMPILER_STRIP_GATE(0x80518584, &lit_4208); /* 80518588-8051858C 000004 0004+00 7/53 0/0 0/0 .rodata @4209 */ SECTION_RODATA static u8 const lit_4209[4] = { @@ -720,7 +720,7 @@ SECTION_RODATA static u8 const lit_4209[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80518588, &lit_4209); +COMPILER_STRIP_GATE(0x80518588, &lit_4209); /* 8051858C-80518594 000008 0004+04 3/41 0/0 0/0 .rodata @4210 */ SECTION_RODATA static f32 const lit_4210[1 + 1 /* padding */] = { @@ -728,7 +728,7 @@ SECTION_RODATA static f32 const lit_4210[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(8051858C, &lit_4210); +COMPILER_STRIP_GATE(0x8051858C, &lit_4210); /* 80518594-8051859C 000010 0008+00 0/9 0/0 0/0 .rodata @4211 */ #pragma push @@ -736,7 +736,7 @@ COMPILER_STRIP_GATE(8051858C, &lit_4210); SECTION_RODATA static u8 const lit_4211[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80518594, &lit_4211); +COMPILER_STRIP_GATE(0x80518594, &lit_4211); #pragma pop /* 8051859C-805185A4 000018 0008+00 0/9 0/0 0/0 .rodata @4212 */ @@ -745,7 +745,7 @@ COMPILER_STRIP_GATE(80518594, &lit_4211); SECTION_RODATA static u8 const lit_4212[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8051859C, &lit_4212); +COMPILER_STRIP_GATE(0x8051859C, &lit_4212); #pragma pop /* 805185A4-805185AC 000020 0008+00 0/9 0/0 0/0 .rodata @4213 */ @@ -754,102 +754,102 @@ COMPILER_STRIP_GATE(8051859C, &lit_4212); SECTION_RODATA static u8 const lit_4213[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(805185A4, &lit_4213); +COMPILER_STRIP_GATE(0x805185A4, &lit_4213); #pragma pop /* 805185AC-805185B0 000028 0004+00 0/1 0/0 0/0 .rodata @4214 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4214 = 1.0f / 100.0f; -COMPILER_STRIP_GATE(805185AC, &lit_4214); +COMPILER_STRIP_GATE(0x805185AC, &lit_4214); #pragma pop /* 805185B0-805185B4 00002C 0004+00 0/1 0/0 0/0 .rodata @4229 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4229 = 6.0f / 5.0f; -COMPILER_STRIP_GATE(805185B0, &lit_4229); +COMPILER_STRIP_GATE(0x805185B0, &lit_4229); #pragma pop /* 805185B4-805185B8 000030 0004+00 0/1 0/0 0/0 .rodata @4230 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4230 = 3.5f; -COMPILER_STRIP_GATE(805185B4, &lit_4230); +COMPILER_STRIP_GATE(0x805185B4, &lit_4230); #pragma pop /* 805185B8-805185BC 000034 0004+00 0/1 0/0 0/0 .rodata @4231 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4231 = 14.0f; -COMPILER_STRIP_GATE(805185B8, &lit_4231); +COMPILER_STRIP_GATE(0x805185B8, &lit_4231); #pragma pop /* 805185BC-805185C0 000038 0004+00 0/1 0/0 0/0 .rodata @4232 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4232 = 250.0f; -COMPILER_STRIP_GATE(805185BC, &lit_4232); +COMPILER_STRIP_GATE(0x805185BC, &lit_4232); #pragma pop /* 805185C0-805185C4 00003C 0004+00 0/5 0/0 0/0 .rodata @4233 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4233 = 300.0f; -COMPILER_STRIP_GATE(805185C0, &lit_4233); +COMPILER_STRIP_GATE(0x805185C0, &lit_4233); #pragma pop /* 805185C4-805185C8 000040 0004+00 0/1 0/0 0/0 .rodata @4234 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4234 = 11.0f / 10.0f; -COMPILER_STRIP_GATE(805185C4, &lit_4234); +COMPILER_STRIP_GATE(0x805185C4, &lit_4234); #pragma pop /* 805185C8-805185CC 000044 0004+00 0/1 0/0 0/0 .rodata @4235 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4235 = 1300.0f; -COMPILER_STRIP_GATE(805185C8, &lit_4235); +COMPILER_STRIP_GATE(0x805185C8, &lit_4235); #pragma pop /* 805185CC-805185D0 000048 0004+00 0/4 0/0 0/0 .rodata @4236 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4236 = 2000.0f; -COMPILER_STRIP_GATE(805185CC, &lit_4236); +COMPILER_STRIP_GATE(0x805185CC, &lit_4236); #pragma pop /* 805185D0-805185D4 00004C 0004+00 0/15 0/0 0/0 .rodata @4237 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4237 = 3.0f; -COMPILER_STRIP_GATE(805185D0, &lit_4237); +COMPILER_STRIP_GATE(0x805185D0, &lit_4237); #pragma pop /* 805185D4-805185D8 000050 0004+00 0/1 0/0 0/0 .rodata @4238 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4238 = 75.0f; -COMPILER_STRIP_GATE(805185D4, &lit_4238); +COMPILER_STRIP_GATE(0x805185D4, &lit_4238); #pragma pop /* 805185D8-805185DC 000054 0004+00 0/21 0/0 0/0 .rodata @4239 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4239 = 5.0f; -COMPILER_STRIP_GATE(805185D8, &lit_4239); +COMPILER_STRIP_GATE(0x805185D8, &lit_4239); #pragma pop /* 805185DC-805185E0 000058 0004+00 1/23 0/0 0/0 .rodata @4240 */ SECTION_RODATA static f32 const lit_4240 = 10.0f; -COMPILER_STRIP_GATE(805185DC, &lit_4240); +COMPILER_STRIP_GATE(0x805185DC, &lit_4240); /* 805185E0-805185E4 00005C 0004+00 0/1 0/0 0/0 .rodata @4241 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4241 = 33.0f; -COMPILER_STRIP_GATE(805185E0, &lit_4241); +COMPILER_STRIP_GATE(0x805185E0, &lit_4241); #pragma pop /* 805189A8-805189B4 000000 000C+00 2/2 0/0 0/0 .data cNullVec__6Z2Calc */ @@ -1512,20 +1512,26 @@ static asm void get_pla(fopAc_ac_c* param_0) { /* ############################################################################################## */ /* 805185E4-805185E8 000060 0004+00 2/11 0/0 0/0 .rodata @4289 */ SECTION_RODATA static f32 const lit_4289 = -1.0f; -COMPILER_STRIP_GATE(805185E4, &lit_4289); +COMPILER_STRIP_GATE(0x805185E4, &lit_4289); /* 805185E8-805185EC 000064 0004+00 0/9 0/0 0/0 .rodata @4290 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4290 = 30.0f; -COMPILER_STRIP_GATE(805185E8, &lit_4290); +COMPILER_STRIP_GATE(0x805185E8, &lit_4290); #pragma pop /* 805185EC-805185F4 000068 0008+00 1/4 0/0 0/0 .rodata @4293 */ SECTION_RODATA static u8 const lit_4293[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(805185EC, &lit_4293); +COMPILER_STRIP_GATE(0x805185EC, &lit_4293); + +/* 80518968-80518968 0003E4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80518968 = "E_rdb"; +#pragma pop /* 80504BD4-80504D28 000254 0154+00 36/36 0/0 0/0 .text anm_init__FP10e_rd_classifUcf */ #pragma push @@ -1552,7 +1558,7 @@ static asm void horn_anm_init(e_rd_class* param_0, int param_1, f32 param_2, u8 /* ############################################################################################## */ /* 805185F4-805185F8 000070 0004+00 1/2 0/0 0/0 .rodata @4468 */ SECTION_RODATA static f32 const lit_4468 = 3.0f / 10.0f; -COMPILER_STRIP_GATE(805185F4, &lit_4468); +COMPILER_STRIP_GATE(0x805185F4, &lit_4468); /* 80504DDC-805052F4 00045C 0518+00 1/1 0/0 0/0 .text nodeCallBack__FP8J3DJointi */ #pragma push @@ -1589,7 +1595,7 @@ static asm void nodeCallBack_bow(J3DJoint* param_0, int param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4681 = 1200.0f; -COMPILER_STRIP_GATE(805185F8, &lit_4681); +COMPILER_STRIP_GATE(0x805185F8, &lit_4681); #pragma pop /* 805054CC-805059A4 000B4C 04D8+00 1/0 0/0 0/0 .text daE_RD_Draw__FP10e_rd_class */ @@ -1605,7 +1611,7 @@ static asm void daE_RD_Draw(e_rd_class* param_0) { /* ############################################################################################## */ /* 805185FC-80518600 000078 0004+00 1/2 0/0 0/0 .rodata @4720 */ SECTION_RODATA static f32 const lit_4720 = 130.0f; -COMPILER_STRIP_GATE(805185FC, &lit_4720); +COMPILER_STRIP_GATE(0x805185FC, &lit_4720); /* 805059A4-80505A94 001024 00F0+00 4/4 0/0 0/0 .text other_bg_check__FP10e_rd_classP10fopAc_ac_c */ @@ -1793,7 +1799,7 @@ static asm void search_bomb(e_rd_class* param_0, int param_1) { /* ############################################################################################## */ /* 80518600-80518604 00007C 0004+00 1/14 0/0 0/0 .rodata @4967 */ SECTION_RODATA static f32 const lit_4967 = 50.0f; -COMPILER_STRIP_GATE(80518600, &lit_4967); +COMPILER_STRIP_GATE(0x80518600, &lit_4967); /* 80505E44-80505F50 0014C4 010C+00 3/3 0/0 0/0 .text way_bg_check__FP10e_rd_classf */ #pragma push @@ -1810,7 +1816,7 @@ static asm void way_bg_check(e_rd_class* param_0, f32 param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5009 = 80.0f; -COMPILER_STRIP_GATE(80518604, &lit_5009); +COMPILER_STRIP_GATE(0x80518604, &lit_5009); #pragma pop /* 80505F50-8050610C 0015D0 01BC+00 3/3 0/0 0/0 .text ride_off__FP10e_rd_class */ @@ -1838,14 +1844,20 @@ static asm void s_wb_sub(void* param_0, void* param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5109 = 1500.0f; -COMPILER_STRIP_GATE(80518608, &lit_5109); +COMPILER_STRIP_GATE(0x80518608, &lit_5109); #pragma pop /* 8051860C-80518610 000088 0004+00 0/2 0/0 0/0 .rodata @5110 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5110 = 5000.0f; -COMPILER_STRIP_GATE(8051860C, &lit_5110); +COMPILER_STRIP_GATE(0x8051860C, &lit_5110); +#pragma pop + +/* 80518968-80518968 0003E4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8051896E = "F_SP121"; #pragma pop /* 805061DC-8050642C 00185C 0250+00 2/2 0/0 0/0 .text search_wb__FP10e_rd_classs */ @@ -1881,11 +1893,17 @@ static asm void wb_init_ride(e_rd_class* param_0) { /* ############################################################################################## */ /* 80518610-80518614 00008C 0004+00 1/1 0/0 0/0 .rodata @5189 */ SECTION_RODATA static f32 const lit_5189 = -9800.0f; -COMPILER_STRIP_GATE(80518610, &lit_5189); +COMPILER_STRIP_GATE(0x80518610, &lit_5189); /* 80518614-80518618 000090 0004+00 1/5 0/0 0/0 .rodata @5190 */ SECTION_RODATA static f32 const lit_5190 = 10000.0f; -COMPILER_STRIP_GATE(80518614, &lit_5190); +COMPILER_STRIP_GATE(0x80518614, &lit_5190); + +/* 80518968-80518968 0003E4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80518976 = "F_SP128"; +#pragma pop /* 805065D4-80506758 001C54 0184+00 10/10 0/0 0/0 .text pl_check__FP10e_rd_classfs */ #pragma push @@ -1932,28 +1950,28 @@ static asm void move_gake_check(e_rd_class* param_0, f32 param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5276 = -8400.0f; -COMPILER_STRIP_GATE(80518618, &lit_5276); +COMPILER_STRIP_GATE(0x80518618, &lit_5276); #pragma pop /* 8051861C-80518620 000098 0004+00 0/2 0/0 0/0 .rodata @5277 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5277 = 65535.0f; -COMPILER_STRIP_GATE(8051861C, &lit_5277); +COMPILER_STRIP_GATE(0x8051861C, &lit_5277); #pragma pop /* 80518620-80518624 00009C 0004+00 0/4 0/0 0/0 .rodata @5278 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5278 = 1000.0f; -COMPILER_STRIP_GATE(80518620, &lit_5278); +COMPILER_STRIP_GATE(0x80518620, &lit_5278); #pragma pop /* 80518624-80518628 0000A0 0004+00 0/3 0/0 0/0 .rodata @5279 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5279 = 150.0f; -COMPILER_STRIP_GATE(80518624, &lit_5279); +COMPILER_STRIP_GATE(0x80518624, &lit_5279); #pragma pop /* 80506890-80506A60 001F10 01D0+00 1/1 0/0 0/0 .text way_check__FP10e_rd_class */ @@ -1971,7 +1989,7 @@ static asm void way_check(e_rd_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5350 = 0.5f; -COMPILER_STRIP_GATE(80518628, &lit_5350); +COMPILER_STRIP_GATE(0x80518628, &lit_5350); #pragma pop /* 80519234-80519334 0000FC 00FF+01 1/1 0/0 0/0 .bss check_index$5284 */ @@ -1990,20 +2008,20 @@ static asm void path_check(e_rd_class* param_0) { /* ############################################################################################## */ /* 8051862C-80518630 0000A8 0004+00 1/13 0/0 0/0 .rodata @5450 */ SECTION_RODATA static f32 const lit_5450 = 2.0f; -COMPILER_STRIP_GATE(8051862C, &lit_5450); +COMPILER_STRIP_GATE(0x8051862C, &lit_5450); /* 80518630-80518634 0000AC 0004+00 0/12 0/0 0/0 .rodata @5451 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5451 = 200.0f; -COMPILER_STRIP_GATE(80518630, &lit_5451); +COMPILER_STRIP_GATE(0x80518630, &lit_5451); #pragma pop /* 80518634-80518638 0000B0 0004+00 0/3 0/0 0/0 .rodata @5452 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5452 = 4000.0f; -COMPILER_STRIP_GATE(80518634, &lit_5452); +COMPILER_STRIP_GATE(0x80518634, &lit_5452); #pragma pop /* 80506C8C-80507144 00230C 04B8+00 1/1 0/0 0/0 .text e_rd_normal__FP10e_rd_class */ @@ -2021,14 +2039,14 @@ static asm void e_rd_normal(e_rd_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5568 = 24.0f; -COMPILER_STRIP_GATE(80518638, &lit_5568); +COMPILER_STRIP_GATE(0x80518638, &lit_5568); #pragma pop /* 8051863C-80518640 0000B8 0004+00 0/1 0/0 0/0 .rodata @5569 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5569 = 7.0f / 10.0f; -COMPILER_STRIP_GATE(8051863C, &lit_5569); +COMPILER_STRIP_GATE(0x8051863C, &lit_5569); #pragma pop /* 80507144-80507784 0027C4 0640+00 2/1 0/0 0/0 .text e_rd_fight_run__FP10e_rd_class */ @@ -2056,49 +2074,49 @@ static asm void at_hit_check(e_rd_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5570 = 7.0f; -COMPILER_STRIP_GATE(80518640, &lit_5570); +COMPILER_STRIP_GATE(0x80518640, &lit_5570); #pragma pop /* 80518644-80518648 0000C0 0004+00 0/6 0/0 0/0 .rodata @5571 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5571 = 15.0f; -COMPILER_STRIP_GATE(80518644, &lit_5571); +COMPILER_STRIP_GATE(0x80518644, &lit_5571); #pragma pop /* 80518648-8051864C 0000C4 0004+00 0/2 0/0 0/0 .rodata @5572 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5572 = 1.0f / 20.0f; -COMPILER_STRIP_GATE(80518648, &lit_5572); +COMPILER_STRIP_GATE(0x80518648, &lit_5572); #pragma pop /* 8051864C-80518650 0000C8 0004+00 0/4 0/0 0/0 .rodata @5573 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5573 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(8051864C, &lit_5573); +COMPILER_STRIP_GATE(0x8051864C, &lit_5573); #pragma pop /* 80518650-80518654 0000CC 0004+00 0/13 0/0 0/0 .rodata @5574 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5574 = 20.0f; -COMPILER_STRIP_GATE(80518650, &lit_5574); +COMPILER_STRIP_GATE(0x80518650, &lit_5574); #pragma pop /* 80518654-80518658 0000D0 0004+00 0/2 0/0 0/0 .rodata @5696 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5696 = 6.0f; -COMPILER_STRIP_GATE(80518654, &lit_5696); +COMPILER_STRIP_GATE(0x80518654, &lit_5696); #pragma pop /* 80518658-8051865C 0000D4 0004+00 0/1 0/0 0/0 .rodata @5697 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5697 = 44.0f; -COMPILER_STRIP_GATE(80518658, &lit_5697); +COMPILER_STRIP_GATE(0x80518658, &lit_5697); #pragma pop /* 805077E4-80507B90 002E64 03AC+00 1/1 0/0 0/0 .text e_rd_fight__FP10e_rd_class */ @@ -2126,21 +2144,21 @@ static asm void e_rd_bow_run(e_rd_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5854 = 9.0f / 10.0f; -COMPILER_STRIP_GATE(8051865C, &lit_5854); +COMPILER_STRIP_GATE(0x8051865C, &lit_5854); #pragma pop /* 80518660-80518664 0000DC 0004+00 0/5 0/0 0/0 .rodata @5855 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5855 = 4.0f; -COMPILER_STRIP_GATE(80518660, &lit_5855); +COMPILER_STRIP_GATE(0x80518660, &lit_5855); #pragma pop /* 80518664-80518668 0000E0 0004+00 0/3 0/0 0/0 .rodata @5856 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5856 = -100.0f; -COMPILER_STRIP_GATE(80518664, &lit_5856); +COMPILER_STRIP_GATE(0x80518664, &lit_5856); #pragma pop /* 80507F98-805082C8 003618 0330+00 1/1 0/0 0/0 .text e_rd_bow__FP10e_rd_class */ @@ -2168,14 +2186,14 @@ static asm void s_command3_sub(void* param_0, void* param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5965 = 60.0f; -COMPILER_STRIP_GATE(80518668, &lit_5965); +COMPILER_STRIP_GATE(0x80518668, &lit_5965); #pragma pop /* 8051866C-80518670 0000E8 0004+00 0/10 0/0 0/0 .rodata @5966 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5966 = 40.0f; -COMPILER_STRIP_GATE(8051866C, &lit_5966); +COMPILER_STRIP_GATE(0x8051866C, &lit_5966); #pragma pop /* 80508334-80508790 0039B4 045C+00 1/1 0/0 0/0 .text e_rd_bow2__FP10e_rd_class */ @@ -2193,14 +2211,14 @@ static asm void e_rd_bow2(e_rd_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6033 = 34800.0f; -COMPILER_STRIP_GATE(80518670, &lit_6033); +COMPILER_STRIP_GATE(0x80518670, &lit_6033); #pragma pop /* 80518674-80518678 0000F0 0004+00 0/1 0/0 0/0 .rodata @6034 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6034 = -14900.0f; -COMPILER_STRIP_GATE(80518674, &lit_6034); +COMPILER_STRIP_GATE(0x80518674, &lit_6034); #pragma pop /* 80508790-80508A34 003E10 02A4+00 1/1 0/0 0/0 .text e_rd_bow_ikki__FP10e_rd_class */ @@ -2218,7 +2236,7 @@ static asm void e_rd_bow_ikki(e_rd_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6071 = -30.0f; -COMPILER_STRIP_GATE(80518678, &lit_6071); +COMPILER_STRIP_GATE(0x80518678, &lit_6071); #pragma pop /* 80508A34-80508B98 0040B4 0164+00 1/1 0/0 0/0 .text e_rd_avoid__FP10e_rd_class */ @@ -2256,42 +2274,42 @@ static asm void e_rd_wb_ride(e_rd_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6342 = -120.0f; -COMPILER_STRIP_GATE(8051867C, &lit_6342); +COMPILER_STRIP_GATE(0x8051867C, &lit_6342); #pragma pop /* 80518680-80518684 0000FC 0004+00 0/1 0/0 0/0 .rodata @6343 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6343 = 1.5f; -COMPILER_STRIP_GATE(80518680, &lit_6343); +COMPILER_STRIP_GATE(0x80518680, &lit_6343); #pragma pop /* 80518684-80518688 000100 0004+00 0/0 0/0 0/0 .rodata @6344 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6344 = 230.0f; -COMPILER_STRIP_GATE(80518684, &lit_6344); +COMPILER_STRIP_GATE(0x80518684, &lit_6344); #pragma pop /* 80518688-8051868C 000104 0004+00 0/2 0/0 0/0 .rodata @6345 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6345 = -20.0f; -COMPILER_STRIP_GATE(80518688, &lit_6345); +COMPILER_STRIP_GATE(0x80518688, &lit_6345); #pragma pop /* 8051868C-80518690 000108 0004+00 0/1 0/0 0/0 .rodata @6651 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6651 = 850.0f; -COMPILER_STRIP_GATE(8051868C, &lit_6651); +COMPILER_STRIP_GATE(0x8051868C, &lit_6651); #pragma pop /* 80518690-80518694 00010C 0004+00 0/1 0/0 0/0 .rodata @6652 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6652 = 750.0f; -COMPILER_STRIP_GATE(80518690, &lit_6652); +COMPILER_STRIP_GATE(0x80518690, &lit_6652); #pragma pop /* 805098E4-8050A3EC 004F64 0B08+00 2/1 0/0 0/0 .text e_rd_wb_run__FP10e_rd_class */ @@ -2309,21 +2327,21 @@ static asm void e_rd_wb_run(e_rd_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6653 = 800.0f; -COMPILER_STRIP_GATE(80518694, &lit_6653); +COMPILER_STRIP_GATE(0x80518694, &lit_6653); #pragma pop /* 80518698-8051869C 000114 0004+00 0/0 0/0 0/0 .rodata @6654 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6654 = 550.0f; -COMPILER_STRIP_GATE(80518698, &lit_6654); +COMPILER_STRIP_GATE(0x80518698, &lit_6654); #pragma pop /* 8051869C-805186A0 000118 0004+00 0/1 0/0 0/0 .rodata @6701 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6701 = 7000.0f; -COMPILER_STRIP_GATE(8051869C, &lit_6701); +COMPILER_STRIP_GATE(0x8051869C, &lit_6701); #pragma pop /* 8050A3EC-8050A578 005A6C 018C+00 1/1 0/0 0/0 .text s_wbrun_sub__FPvPv */ @@ -2341,7 +2359,7 @@ static asm void s_wbrun_sub(void* param_0, void* param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6803 = 70.0f; -COMPILER_STRIP_GATE(805186A0, &lit_6803); +COMPILER_STRIP_GATE(0x805186A0, &lit_6803); #pragma pop /* 8050A578-8050A908 005BF8 0390+00 1/1 0/0 0/0 .text e_rd_wb_run_B__FP10e_rd_class */ @@ -2387,20 +2405,20 @@ static asm void e_rd_s_damage(e_rd_class* param_0) { /* ############################################################################################## */ /* 805186A4-805186A8 000120 0004+00 1/2 0/0 0/0 .rodata @6964 */ SECTION_RODATA static f32 const lit_6964 = 600.0f; -COMPILER_STRIP_GATE(805186A4, &lit_6964); +COMPILER_STRIP_GATE(0x805186A4, &lit_6964); /* 805186A8-805186AC 000124 0004+00 0/2 0/0 0/0 .rodata @6965 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6965 = 500.0f; -COMPILER_STRIP_GATE(805186A8, &lit_6965); +COMPILER_STRIP_GATE(0x805186A8, &lit_6965); #pragma pop /* 805186AC-805186B0 000128 0004+00 0/1 0/0 0/0 .rodata @7044 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7044 = -150.0f; -COMPILER_STRIP_GATE(805186AC, &lit_7044); +COMPILER_STRIP_GATE(0x805186AC, &lit_7044); #pragma pop /* 8050B0F4-8050B2A8 006774 01B4+00 1/1 0/0 0/0 .text kado_check__FP10e_rd_class */ @@ -2448,7 +2466,7 @@ asm dBgS_ObjGndChk::~dBgS_ObjGndChk() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7343 = 8000.0f; -COMPILER_STRIP_GATE(805186B0, &lit_7343); +COMPILER_STRIP_GATE(0x805186B0, &lit_7343); #pragma pop /* 8050B5B4-8050C12C 006C34 0B78+00 2/1 0/0 0/0 .text e_rd_damage__FP10e_rd_class */ @@ -2476,28 +2494,28 @@ static asm void gake_check(e_rd_class* param_0, f32 param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7344 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(805186B4, &lit_7344); +COMPILER_STRIP_GATE(0x805186B4, &lit_7344); #pragma pop /* 805186B8-805186BC 000134 0004+00 0/2 0/0 0/0 .rodata @7345 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7345 = 35.0f; -COMPILER_STRIP_GATE(805186B8, &lit_7345); +COMPILER_STRIP_GATE(0x805186B8, &lit_7345); #pragma pop /* 805186BC-805186C0 000138 0004+00 0/1 0/0 0/0 .rodata @7435 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7435 = 350.0f; -COMPILER_STRIP_GATE(805186BC, &lit_7435); +COMPILER_STRIP_GATE(0x805186BC, &lit_7435); #pragma pop /* 805186C0-805186C4 00013C 0004+00 0/2 0/0 0/0 .rodata @7436 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7436 = 13.0f / 10.0f; -COMPILER_STRIP_GATE(805186C0, &lit_7436); +COMPILER_STRIP_GATE(0x805186C0, &lit_7436); #pragma pop /* 8050C2D8-8050C4B0 007958 01D8+00 1/1 0/0 0/0 .text s_bikkuri_sub__FPvPv */ @@ -2635,7 +2653,7 @@ static asm void e_rd_ikki2_start(e_rd_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8026 = 57.0f; -COMPILER_STRIP_GATE(805186C4, &lit_8026); +COMPILER_STRIP_GATE(0x805186C4, &lit_8026); #pragma pop /* 8050DF38-8050E214 0095B8 02DC+00 1/1 0/0 0/0 .text e_rd_kiba_end__FP10e_rd_class */ @@ -2713,7 +2731,7 @@ static asm void wolfkick_damage(e_rd_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8211 = 3000.0f; -COMPILER_STRIP_GATE(805186C8, &lit_8211); +COMPILER_STRIP_GATE(0x805186C8, &lit_8211); #pragma pop /* 8050E9E8-8050EBF8 00A068 0210+00 1/1 0/0 0/0 .text big_damage__FP10e_rd_class */ @@ -2741,7 +2759,7 @@ static asm void small_damage(e_rd_class* param_0, int param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8270 = 65536.0f; -COMPILER_STRIP_GATE(805186CC, &lit_8270); +COMPILER_STRIP_GATE(0x805186CC, &lit_8270); #pragma pop /* 8050ED28-8050EEC0 00A3A8 0198+00 1/1 0/0 0/0 .text part_break__FP10e_rd_class */ @@ -2759,14 +2777,14 @@ static asm void part_break(e_rd_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8517 = 25.0f; -COMPILER_STRIP_GATE(805186D0, &lit_8517); +COMPILER_STRIP_GATE(0x805186D0, &lit_8517); #pragma pop /* 805186D4-805186D8 000150 0004+00 0/2 0/0 0/0 .rodata @8518 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8518 = 400.0f; -COMPILER_STRIP_GATE(805186D4, &lit_8518); +COMPILER_STRIP_GATE(0x805186D4, &lit_8518); #pragma pop /* 8050EEC0-8050FADC 00A540 0C1C+00 1/2 0/0 0/0 .text damage_check__FP10e_rd_class */ @@ -2858,21 +2876,21 @@ static asm void e_rd_tag(e_rd_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8914 = 9900.0f; -COMPILER_STRIP_GATE(805186D8, &lit_8914); +COMPILER_STRIP_GATE(0x805186D8, &lit_8914); #pragma pop /* 805186DC-805186E0 000158 0004+00 0/1 0/0 0/0 .rodata @8981 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8981 = -5551.0f; -COMPILER_STRIP_GATE(805186DC, &lit_8981); +COMPILER_STRIP_GATE(0x805186DC, &lit_8981); #pragma pop /* 805186E0-805186E4 00015C 0004+00 0/1 0/0 0/0 .rodata @8982 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8982 = 5525.0f; -COMPILER_STRIP_GATE(805186E0, &lit_8982); +COMPILER_STRIP_GATE(0x805186E0, &lit_8982); #pragma pop /* 80510D2C-80510DEC 00C3AC 00C0+00 1/1 0/0 0/0 .text e_rd_reg__FP10e_rd_class */ @@ -2900,84 +2918,84 @@ static asm void action(e_rd_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9623 = 700.0f; -COMPILER_STRIP_GATE(805186E4, &lit_9623); +COMPILER_STRIP_GATE(0x805186E4, &lit_9623); #pragma pop /* 805186E8-805186EC 000164 0004+00 0/0 0/0 0/0 .rodata @9624 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9624 = -5.0f; -COMPILER_STRIP_GATE(805186E8, &lit_9624); +COMPILER_STRIP_GATE(0x805186E8, &lit_9624); #pragma pop /* 805186EC-805186F0 000168 0004+00 0/0 0/0 0/0 .rodata @9625 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9625 = -65.0f; -COMPILER_STRIP_GATE(805186EC, &lit_9625); +COMPILER_STRIP_GATE(0x805186EC, &lit_9625); #pragma pop /* 805186F0-805186F4 00016C 0004+00 0/0 0/0 0/0 .rodata @9626 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9626 = -45.0f; -COMPILER_STRIP_GATE(805186F0, &lit_9626); +COMPILER_STRIP_GATE(0x805186F0, &lit_9626); #pragma pop /* 805186F4-805186F8 000170 0004+00 0/0 0/0 0/0 .rodata @9627 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9627 = 4.5f; -COMPILER_STRIP_GATE(805186F4, &lit_9627); +COMPILER_STRIP_GATE(0x805186F4, &lit_9627); #pragma pop /* 805186F8-805186FC 000174 0004+00 0/0 0/0 0/0 .rodata @9628 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9628 = 12000.0f; -COMPILER_STRIP_GATE(805186F8, &lit_9628); +COMPILER_STRIP_GATE(0x805186F8, &lit_9628); #pragma pop /* 805186FC-80518700 000178 0004+00 0/1 0/0 0/0 .rodata @9629 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9629 = -1000000000.0f; -COMPILER_STRIP_GATE(805186FC, &lit_9629); +COMPILER_STRIP_GATE(0x805186FC, &lit_9629); #pragma pop /* 80518700-80518704 00017C 0004+00 0/1 0/0 0/0 .rodata @9691 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9691 = 62.0f; -COMPILER_STRIP_GATE(80518700, &lit_9691); +COMPILER_STRIP_GATE(0x80518700, &lit_9691); #pragma pop /* 80518704-80518708 000180 0004+00 0/1 0/0 0/0 .rodata @9692 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9692 = 22.0f; -COMPILER_STRIP_GATE(80518704, &lit_9692); +COMPILER_STRIP_GATE(0x80518704, &lit_9692); #pragma pop /* 80518708-8051870C 000184 0004+00 0/2 0/0 0/0 .rodata @9693 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9693 = -50.0f; -COMPILER_STRIP_GATE(80518708, &lit_9693); +COMPILER_STRIP_GATE(0x80518708, &lit_9693); #pragma pop /* 8051870C-80518710 000188 0004+00 0/2 0/0 0/0 .rodata @9694 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9694 = 90.0f; -COMPILER_STRIP_GATE(8051870C, &lit_9694); +COMPILER_STRIP_GATE(0x8051870C, &lit_9694); #pragma pop /* 80518710-80518714 00018C 0004+00 0/1 0/0 0/0 .rodata @9695 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9695 = -60.0f; -COMPILER_STRIP_GATE(80518710, &lit_9695); +COMPILER_STRIP_GATE(0x80518710, &lit_9695); #pragma pop /* 80512914-80512B40 00DF94 022C+00 1/1 0/0 0/0 .text fire_eff_set__FP10e_rd_class */ @@ -3057,7 +3075,7 @@ static asm void s_lv9rd_sub2(void* param_0, void* param_1) { /* ############################################################################################## */ /* 80518714-80518718 000190 0004+00 1/1 0/0 0/0 .rodata @9772 */ SECTION_RODATA static f32 const lit_9772 = 50000.0f; -COMPILER_STRIP_GATE(80518714, &lit_9772); +COMPILER_STRIP_GATE(0x80518714, &lit_9772); /* 80512E08-80512E74 00E488 006C+00 1/1 0/0 0/0 .text s_lv9rd_sub3__FPvPv */ #pragma push @@ -3114,14 +3132,14 @@ static asm void cam_spd_set(e_rd_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10302 = 55.0f; -COMPILER_STRIP_GATE(80518718, &lit_10302); +COMPILER_STRIP_GATE(0x80518718, &lit_10302); #pragma pop /* 8051871C-80518720 000198 0004+00 0/1 0/0 0/0 .rodata @10303 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10303 = 900.0f; -COMPILER_STRIP_GATE(8051871C, &lit_10303); +COMPILER_STRIP_GATE(0x8051871C, &lit_10303); #pragma pop /* 8051309C-80514640 00E71C 15A4+00 2/1 0/0 0/0 .text demo_camera__FP10e_rd_class */ @@ -3139,875 +3157,881 @@ static asm void demo_camera(e_rd_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10304 = -7875.0f; -COMPILER_STRIP_GATE(80518720, &lit_10304); +COMPILER_STRIP_GATE(0x80518720, &lit_10304); #pragma pop /* 80518724-80518728 0001A0 0004+00 0/0 0/0 0/0 .rodata @10305 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10305 = 2125.0f; -COMPILER_STRIP_GATE(80518724, &lit_10305); +COMPILER_STRIP_GATE(0x80518724, &lit_10305); #pragma pop /* 80518728-8051872C 0001A4 0004+00 0/0 0/0 0/0 .rodata @10306 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10306 = 7895.0f; -COMPILER_STRIP_GATE(80518728, &lit_10306); +COMPILER_STRIP_GATE(0x80518728, &lit_10306); #pragma pop /* 8051872C-80518730 0001A8 0004+00 0/0 0/0 0/0 .rodata @10307 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10307 = -7527.0f; -COMPILER_STRIP_GATE(8051872C, &lit_10307); +COMPILER_STRIP_GATE(0x8051872C, &lit_10307); #pragma pop /* 80518730-80518734 0001AC 0004+00 0/0 0/0 0/0 .rodata @10308 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10308 = 2084.0f; -COMPILER_STRIP_GATE(80518730, &lit_10308); +COMPILER_STRIP_GATE(0x80518730, &lit_10308); #pragma pop /* 80518734-80518738 0001B0 0004+00 0/0 0/0 0/0 .rodata @10309 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10309 = 7552.0f; -COMPILER_STRIP_GATE(80518734, &lit_10309); +COMPILER_STRIP_GATE(0x80518734, &lit_10309); #pragma pop /* 80518738-8051873C 0001B4 0004+00 0/0 0/0 0/0 .rodata @10310 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_10310 = 0x3B03126F; -COMPILER_STRIP_GATE(80518738, &lit_10310); +COMPILER_STRIP_GATE(0x80518738, &lit_10310); #pragma pop /* 8051873C-80518740 0001B8 0004+00 0/0 0/0 0/0 .rodata @10311 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10311 = -5182.0f; -COMPILER_STRIP_GATE(8051873C, &lit_10311); +COMPILER_STRIP_GATE(0x8051873C, &lit_10311); #pragma pop /* 80518740-80518744 0001BC 0004+00 0/0 0/0 0/0 .rodata @10312 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10312 = 5237.0f; -COMPILER_STRIP_GATE(80518740, &lit_10312); +COMPILER_STRIP_GATE(0x80518740, &lit_10312); #pragma pop /* 80518744-80518748 0001C0 0004+00 0/0 0/0 0/0 .rodata @10313 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10313 = 45.0f; -COMPILER_STRIP_GATE(80518744, &lit_10313); +COMPILER_STRIP_GATE(0x80518744, &lit_10313); #pragma pop /* 80518748-8051874C 0001C4 0004+00 0/0 0/0 0/0 .rodata @10314 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10314 = -7241.0f; -COMPILER_STRIP_GATE(80518748, &lit_10314); +COMPILER_STRIP_GATE(0x80518748, &lit_10314); #pragma pop /* 8051874C-80518750 0001C8 0004+00 0/0 0/0 0/0 .rodata @10315 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10315 = 4310.0f; -COMPILER_STRIP_GATE(8051874C, &lit_10315); +COMPILER_STRIP_GATE(0x8051874C, &lit_10315); #pragma pop /* 80518750-80518754 0001CC 0004+00 0/0 0/0 0/0 .rodata @10316 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10316 = 7269.0f; -COMPILER_STRIP_GATE(80518750, &lit_10316); +COMPILER_STRIP_GATE(0x80518750, &lit_10316); #pragma pop /* 80518754-80518758 0001D0 0004+00 0/0 0/0 0/0 .rodata @10317 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10317 = -6913.0f; -COMPILER_STRIP_GATE(80518754, &lit_10317); +COMPILER_STRIP_GATE(0x80518754, &lit_10317); #pragma pop /* 80518758-8051875C 0001D4 0004+00 0/0 0/0 0/0 .rodata @10318 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10318 = 4139.0f; -COMPILER_STRIP_GATE(80518758, &lit_10318); +COMPILER_STRIP_GATE(0x80518758, &lit_10318); #pragma pop /* 8051875C-80518760 0001D8 0004+00 0/0 0/0 0/0 .rodata @10319 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10319 = 6948.0f; -COMPILER_STRIP_GATE(8051875C, &lit_10319); +COMPILER_STRIP_GATE(0x8051875C, &lit_10319); #pragma pop /* 80518760-80518764 0001DC 0004+00 0/0 0/0 0/0 .rodata @10320 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10320 = 3.0f / 20.0f; -COMPILER_STRIP_GATE(80518760, &lit_10320); +COMPILER_STRIP_GATE(0x80518760, &lit_10320); #pragma pop /* 80518764-80518768 0001E0 0004+00 0/0 0/0 0/0 .rodata @10321 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_10321 = 0x3BA3D70A; -COMPILER_STRIP_GATE(80518764, &lit_10321); +COMPILER_STRIP_GATE(0x80518764, &lit_10321); #pragma pop /* 80518768-8051876C 0001E4 0004+00 0/0 0/0 0/0 .rodata @10322 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10322 = -8330.0f; -COMPILER_STRIP_GATE(80518768, &lit_10322); +COMPILER_STRIP_GATE(0x80518768, &lit_10322); #pragma pop /* 8051876C-80518770 0001E8 0004+00 0/0 0/0 0/0 .rodata @10323 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10323 = 4359.0f; -COMPILER_STRIP_GATE(8051876C, &lit_10323); +COMPILER_STRIP_GATE(0x8051876C, &lit_10323); #pragma pop /* 80518770-80518774 0001EC 0004+00 0/0 0/0 0/0 .rodata @10324 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10324 = 8449.0f; -COMPILER_STRIP_GATE(80518770, &lit_10324); +COMPILER_STRIP_GATE(0x80518770, &lit_10324); #pragma pop /* 80518774-80518778 0001F0 0004+00 0/0 0/0 0/0 .rodata @10325 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10325 = -8183.0f; -COMPILER_STRIP_GATE(80518774, &lit_10325); +COMPILER_STRIP_GATE(0x80518774, &lit_10325); #pragma pop /* 80518778-8051877C 0001F4 0004+00 0/0 0/0 0/0 .rodata @10326 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10326 = 4264.0f; -COMPILER_STRIP_GATE(80518778, &lit_10326); +COMPILER_STRIP_GATE(0x80518778, &lit_10326); #pragma pop /* 8051877C-80518780 0001F8 0004+00 0/0 0/0 0/0 .rodata @10327 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10327 = 7991.0f; -COMPILER_STRIP_GATE(8051877C, &lit_10327); +COMPILER_STRIP_GATE(0x8051877C, &lit_10327); #pragma pop /* 80518780-80518784 0001FC 0004+00 0/0 0/0 0/0 .rodata @10328 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10328 = -8033.0f; -COMPILER_STRIP_GATE(80518780, &lit_10328); +COMPILER_STRIP_GATE(0x80518780, &lit_10328); #pragma pop /* 80518784-80518788 000200 0004+00 0/0 0/0 0/0 .rodata @10329 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10329 = 4259.0f; -COMPILER_STRIP_GATE(80518784, &lit_10329); +COMPILER_STRIP_GATE(0x80518784, &lit_10329); #pragma pop /* 80518788-8051878C 000204 0004+00 0/0 0/0 0/0 .rodata @10330 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10330 = 8143.0f; -COMPILER_STRIP_GATE(80518788, &lit_10330); +COMPILER_STRIP_GATE(0x80518788, &lit_10330); #pragma pop /* 8051878C-80518790 000208 0004+00 0/0 0/0 0/0 .rodata @10331 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10331 = -8337.0f; -COMPILER_STRIP_GATE(8051878C, &lit_10331); +COMPILER_STRIP_GATE(0x8051878C, &lit_10331); #pragma pop /* 80518790-80518794 00020C 0004+00 0/0 0/0 0/0 .rodata @10332 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10332 = 4488.0f; -COMPILER_STRIP_GATE(80518790, &lit_10332); +COMPILER_STRIP_GATE(0x80518790, &lit_10332); #pragma pop /* 80518794-80518798 000210 0004+00 0/0 0/0 0/0 .rodata @10333 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10333 = 8451.0f; -COMPILER_STRIP_GATE(80518794, &lit_10333); +COMPILER_STRIP_GATE(0x80518794, &lit_10333); #pragma pop /* 80518798-8051879C 000214 0004+00 0/0 0/0 0/0 .rodata @10334 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10334 = -4910.0f; -COMPILER_STRIP_GATE(80518798, &lit_10334); +COMPILER_STRIP_GATE(0x80518798, &lit_10334); #pragma pop /* 8051879C-805187A0 000218 0004+00 0/0 0/0 0/0 .rodata @10335 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10335 = 2012.0f; -COMPILER_STRIP_GATE(8051879C, &lit_10335); +COMPILER_STRIP_GATE(0x8051879C, &lit_10335); #pragma pop /* 805187A0-805187A4 00021C 0004+00 0/0 0/0 0/0 .rodata @10336 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10336 = 4976.0f; -COMPILER_STRIP_GATE(805187A0, &lit_10336); +COMPILER_STRIP_GATE(0x805187A0, &lit_10336); #pragma pop /* 805187A4-805187A8 000220 0004+00 0/0 0/0 0/0 .rodata @10337 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10337 = -5235.0f; -COMPILER_STRIP_GATE(805187A4, &lit_10337); +COMPILER_STRIP_GATE(0x805187A4, &lit_10337); #pragma pop /* 805187A8-805187AC 000224 0004+00 0/0 0/0 0/0 .rodata @10338 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10338 = 2179.0f; -COMPILER_STRIP_GATE(805187A8, &lit_10338); +COMPILER_STRIP_GATE(0x805187A8, &lit_10338); #pragma pop /* 805187AC-805187B0 000228 0004+00 0/0 0/0 0/0 .rodata @10339 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10339 = 5302.0f; -COMPILER_STRIP_GATE(805187AC, &lit_10339); +COMPILER_STRIP_GATE(0x805187AC, &lit_10339); #pragma pop /* 805187B0-805187B4 00022C 0004+00 0/1 0/0 0/0 .rodata @10340 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10340 = 2500.0f; -COMPILER_STRIP_GATE(805187B0, &lit_10340); +COMPILER_STRIP_GATE(0x805187B0, &lit_10340); #pragma pop /* 805187B4-805187B8 000230 0004+00 0/0 0/0 0/0 .rodata @10341 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10341 = 3.0f / 100.0f; -COMPILER_STRIP_GATE(805187B4, &lit_10341); +COMPILER_STRIP_GATE(0x805187B4, &lit_10341); #pragma pop /* 805187B8-805187BC 000234 0004+00 0/0 0/0 0/0 .rodata @10342 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10342 = -0.5f; -COMPILER_STRIP_GATE(805187B8, &lit_10342); +COMPILER_STRIP_GATE(0x805187B8, &lit_10342); #pragma pop /* 805187BC-805187C0 000238 0004+00 0/0 0/0 0/0 .rodata @10343 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10343 = -5197.0f; -COMPILER_STRIP_GATE(805187BC, &lit_10343); +COMPILER_STRIP_GATE(0x805187BC, &lit_10343); #pragma pop /* 805187C0-805187C4 00023C 0004+00 0/0 0/0 0/0 .rodata @10344 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10344 = 1712.0f; -COMPILER_STRIP_GATE(805187C0, &lit_10344); +COMPILER_STRIP_GATE(0x805187C0, &lit_10344); #pragma pop /* 805187C4-805187C8 000240 0004+00 0/0 0/0 0/0 .rodata @10345 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10345 = 5039.0f; -COMPILER_STRIP_GATE(805187C4, &lit_10345); +COMPILER_STRIP_GATE(0x805187C4, &lit_10345); #pragma pop /* 805187C8-805187CC 000244 0004+00 0/0 0/0 0/0 .rodata @10346 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10346 = -5215.0f; -COMPILER_STRIP_GATE(805187C8, &lit_10346); +COMPILER_STRIP_GATE(0x805187C8, &lit_10346); #pragma pop /* 805187CC-805187D0 000248 0004+00 0/0 0/0 0/0 .rodata @10347 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10347 = 2108.0f; -COMPILER_STRIP_GATE(805187CC, &lit_10347); +COMPILER_STRIP_GATE(0x805187CC, &lit_10347); #pragma pop /* 805187D0-805187D4 00024C 0004+00 0/0 0/0 0/0 .rodata @10348 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10348 = 5327.0f; -COMPILER_STRIP_GATE(805187D0, &lit_10348); +COMPILER_STRIP_GATE(0x805187D0, &lit_10348); #pragma pop /* 805187D4-805187D8 000250 0004+00 0/0 0/0 0/0 .rodata @10349 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10349 = -5025.0f; -COMPILER_STRIP_GATE(805187D4, &lit_10349); +COMPILER_STRIP_GATE(0x805187D4, &lit_10349); #pragma pop /* 805187D8-805187DC 000254 0004+00 0/0 0/0 0/0 .rodata @10350 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10350 = 2270.0f; -COMPILER_STRIP_GATE(805187D8, &lit_10350); +COMPILER_STRIP_GATE(0x805187D8, &lit_10350); #pragma pop /* 805187DC-805187E0 000258 0004+00 0/0 0/0 0/0 .rodata @10351 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10351 = 4909.0f; -COMPILER_STRIP_GATE(805187DC, &lit_10351); +COMPILER_STRIP_GATE(0x805187DC, &lit_10351); #pragma pop /* 805187E0-805187E4 00025C 0004+00 0/0 0/0 0/0 .rodata @10352 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10352 = -5529.0f; -COMPILER_STRIP_GATE(805187E0, &lit_10352); +COMPILER_STRIP_GATE(0x805187E0, &lit_10352); #pragma pop /* 805187E4-805187E8 000260 0004+00 0/0 0/0 0/0 .rodata @10353 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10353 = 2457.0f; -COMPILER_STRIP_GATE(805187E4, &lit_10353); +COMPILER_STRIP_GATE(0x805187E4, &lit_10353); #pragma pop /* 805187E8-805187EC 000264 0004+00 0/0 0/0 0/0 .rodata @10354 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10354 = 5589.0f; -COMPILER_STRIP_GATE(805187E8, &lit_10354); +COMPILER_STRIP_GATE(0x805187E8, &lit_10354); #pragma pop /* 805187EC-805187F0 000268 0004+00 0/0 0/0 0/0 .rodata @10355 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10355 = -5232.0f; -COMPILER_STRIP_GATE(805187EC, &lit_10355); +COMPILER_STRIP_GATE(0x805187EC, &lit_10355); #pragma pop /* 805187F0-805187F4 00026C 0004+00 0/0 0/0 0/0 .rodata @10356 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10356 = 2201.0f; -COMPILER_STRIP_GATE(805187F0, &lit_10356); +COMPILER_STRIP_GATE(0x805187F0, &lit_10356); #pragma pop /* 805187F4-805187F8 000270 0004+00 0/0 0/0 0/0 .rodata @10357 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10357 = 5295.0f; -COMPILER_STRIP_GATE(805187F4, &lit_10357); +COMPILER_STRIP_GATE(0x805187F4, &lit_10357); #pragma pop /* 805187F8-805187FC 000274 0004+00 0/0 0/0 0/0 .rodata @10358 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10358 = -5580.0f; -COMPILER_STRIP_GATE(805187F8, &lit_10358); +COMPILER_STRIP_GATE(0x805187F8, &lit_10358); #pragma pop /* 805187FC-80518800 000278 0004+00 0/0 0/0 0/0 .rodata @10359 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10359 = 2188.0f; -COMPILER_STRIP_GATE(805187FC, &lit_10359); +COMPILER_STRIP_GATE(0x805187FC, &lit_10359); #pragma pop /* 80518800-80518804 00027C 0004+00 0/0 0/0 0/0 .rodata @10360 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10360 = 5640.0f; -COMPILER_STRIP_GATE(80518800, &lit_10360); +COMPILER_STRIP_GATE(0x80518800, &lit_10360); #pragma pop /* 80518804-80518808 000280 0004+00 0/1 0/0 0/0 .rodata @10361 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10361 = 2.0f / 5.0f; -COMPILER_STRIP_GATE(80518804, &lit_10361); +COMPILER_STRIP_GATE(0x80518804, &lit_10361); #pragma pop /* 80518808-8051880C 000284 0004+00 0/0 0/0 0/0 .rodata @10362 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10362 = -5821.0f; -COMPILER_STRIP_GATE(80518808, &lit_10362); +COMPILER_STRIP_GATE(0x80518808, &lit_10362); #pragma pop /* 8051880C-80518810 000288 0004+00 0/0 0/0 0/0 .rodata @10363 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10363 = 5850.0f; -COMPILER_STRIP_GATE(8051880C, &lit_10363); +COMPILER_STRIP_GATE(0x8051880C, &lit_10363); #pragma pop /* 80518810-80518814 00028C 0004+00 0/0 0/0 0/0 .rodata @10364 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10364 = -5406.0f; -COMPILER_STRIP_GATE(80518810, &lit_10364); +COMPILER_STRIP_GATE(0x80518810, &lit_10364); #pragma pop /* 80518814-80518818 000290 0004+00 0/0 0/0 0/0 .rodata @10365 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10365 = 2168.0f; -COMPILER_STRIP_GATE(80518814, &lit_10365); +COMPILER_STRIP_GATE(0x80518814, &lit_10365); #pragma pop /* 80518818-8051881C 000294 0004+00 0/0 0/0 0/0 .rodata @10366 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10366 = 5468.0f; -COMPILER_STRIP_GATE(80518818, &lit_10366); +COMPILER_STRIP_GATE(0x80518818, &lit_10366); #pragma pop /* 8051881C-80518820 000298 0004+00 0/0 0/0 0/0 .rodata @10367 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10367 = -5058.0f; -COMPILER_STRIP_GATE(8051881C, &lit_10367); +COMPILER_STRIP_GATE(0x8051881C, &lit_10367); #pragma pop /* 80518820-80518824 00029C 0004+00 0/0 0/0 0/0 .rodata @10368 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10368 = 2181.0f; -COMPILER_STRIP_GATE(80518820, &lit_10368); +COMPILER_STRIP_GATE(0x80518820, &lit_10368); #pragma pop /* 80518824-80518828 0002A0 0004+00 0/0 0/0 0/0 .rodata @10369 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10369 = 5124.0f; -COMPILER_STRIP_GATE(80518824, &lit_10369); +COMPILER_STRIP_GATE(0x80518824, &lit_10369); #pragma pop /* 80518828-8051882C 0002A4 0004+00 0/0 0/0 0/0 .rodata @10370 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10370 = -3963.0f; -COMPILER_STRIP_GATE(80518828, &lit_10370); +COMPILER_STRIP_GATE(0x80518828, &lit_10370); #pragma pop /* 8051882C-80518830 0002A8 0004+00 0/0 0/0 0/0 .rodata @10371 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10371 = 147.0f; -COMPILER_STRIP_GATE(8051882C, &lit_10371); +COMPILER_STRIP_GATE(0x8051882C, &lit_10371); #pragma pop /* 80518830-80518834 0002AC 0004+00 0/0 0/0 0/0 .rodata @10372 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10372 = 8094.0f; -COMPILER_STRIP_GATE(80518830, &lit_10372); +COMPILER_STRIP_GATE(0x80518830, &lit_10372); #pragma pop /* 80518834-80518838 0002B0 0004+00 0/0 0/0 0/0 .rodata @10373 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10373 = -4080.0f; -COMPILER_STRIP_GATE(80518834, &lit_10373); +COMPILER_STRIP_GATE(0x80518834, &lit_10373); #pragma pop /* 80518838-8051883C 0002B4 0004+00 0/0 0/0 0/0 .rodata @10374 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10374 = 134.0f; -COMPILER_STRIP_GATE(80518838, &lit_10374); +COMPILER_STRIP_GATE(0x80518838, &lit_10374); #pragma pop /* 8051883C-80518840 0002B8 0004+00 0/0 0/0 0/0 .rodata @10375 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10375 = 8190.0f; -COMPILER_STRIP_GATE(8051883C, &lit_10375); +COMPILER_STRIP_GATE(0x8051883C, &lit_10375); #pragma pop /* 80518840-80518844 0002BC 0004+00 0/0 0/0 0/0 .rodata @10376 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10376 = -4527.0f; -COMPILER_STRIP_GATE(80518840, &lit_10376); +COMPILER_STRIP_GATE(0x80518840, &lit_10376); #pragma pop /* 80518844-80518848 0002C0 0004+00 0/0 0/0 0/0 .rodata @10377 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10377 = 143.0f; -COMPILER_STRIP_GATE(80518844, &lit_10377); +COMPILER_STRIP_GATE(0x80518844, &lit_10377); #pragma pop /* 80518848-8051884C 0002C4 0004+00 0/0 0/0 0/0 .rodata @10378 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10378 = 8305.0f; -COMPILER_STRIP_GATE(80518848, &lit_10378); +COMPILER_STRIP_GATE(0x80518848, &lit_10378); #pragma pop /* 8051884C-80518850 0002C8 0004+00 0/0 0/0 0/0 .rodata @10379 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10379 = -4676.0f; -COMPILER_STRIP_GATE(8051884C, &lit_10379); +COMPILER_STRIP_GATE(0x8051884C, &lit_10379); #pragma pop /* 80518850-80518854 0002CC 0004+00 0/0 0/0 0/0 .rodata @10380 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10380 = 161.0f; -COMPILER_STRIP_GATE(80518850, &lit_10380); +COMPILER_STRIP_GATE(0x80518850, &lit_10380); #pragma pop /* 80518854-80518858 0002D0 0004+00 0/0 0/0 0/0 .rodata @10381 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10381 = 8282.0f; -COMPILER_STRIP_GATE(80518854, &lit_10381); +COMPILER_STRIP_GATE(0x80518854, &lit_10381); #pragma pop /* 80518858-8051885C 0002D4 0004+00 0/0 0/0 0/0 .rodata @10382 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10382 = -4552.0f; -COMPILER_STRIP_GATE(80518858, &lit_10382); +COMPILER_STRIP_GATE(0x80518858, &lit_10382); #pragma pop /* 8051885C-80518860 0002D8 0004+00 0/0 0/0 0/0 .rodata @10383 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10383 = 8461.0f; -COMPILER_STRIP_GATE(8051885C, &lit_10383); +COMPILER_STRIP_GATE(0x8051885C, &lit_10383); #pragma pop /* 80518860-80518864 0002DC 0004+00 0/0 0/0 0/0 .rodata @10384 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10384 = -4701.0f; -COMPILER_STRIP_GATE(80518860, &lit_10384); +COMPILER_STRIP_GATE(0x80518860, &lit_10384); #pragma pop /* 80518864-80518868 0002E0 0004+00 0/0 0/0 0/0 .rodata @10385 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10385 = 8438.0f; -COMPILER_STRIP_GATE(80518864, &lit_10385); +COMPILER_STRIP_GATE(0x80518864, &lit_10385); #pragma pop /* 80518868-8051886C 0002E4 0004+00 0/0 0/0 0/0 .rodata @10386 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10386 = -5397.0f; -COMPILER_STRIP_GATE(80518868, &lit_10386); +COMPILER_STRIP_GATE(0x80518868, &lit_10386); #pragma pop /* 8051886C-80518870 0002E8 0004+00 0/0 0/0 0/0 .rodata @10387 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10387 = 5921.0f; -COMPILER_STRIP_GATE(8051886C, &lit_10387); +COMPILER_STRIP_GATE(0x8051886C, &lit_10387); #pragma pop /* 80518870-80518874 0002EC 0004+00 0/1 0/0 0/0 .rodata @10388 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_10388 = 0x3A83126F; -COMPILER_STRIP_GATE(80518870, &lit_10388); +COMPILER_STRIP_GATE(0x80518870, &lit_10388); #pragma pop /* 80518874-80518878 0002F0 0004+00 0/0 0/0 0/0 .rodata @10389 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10389 = -5275.0f; -COMPILER_STRIP_GATE(80518874, &lit_10389); +COMPILER_STRIP_GATE(0x80518874, &lit_10389); #pragma pop /* 80518878-8051887C 0002F4 0004+00 0/0 0/0 0/0 .rodata @10390 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10390 = 2327.0f; -COMPILER_STRIP_GATE(80518878, &lit_10390); +COMPILER_STRIP_GATE(0x80518878, &lit_10390); #pragma pop /* 8051887C-80518880 0002F8 0004+00 0/0 0/0 0/0 .rodata @10391 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10391 = 5812.0f; -COMPILER_STRIP_GATE(8051887C, &lit_10391); +COMPILER_STRIP_GATE(0x8051887C, &lit_10391); #pragma pop /* 80518880-80518884 0002FC 0004+00 0/0 0/0 0/0 .rodata @10392 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10392 = -5367.0f; -COMPILER_STRIP_GATE(80518880, &lit_10392); +COMPILER_STRIP_GATE(0x80518880, &lit_10392); #pragma pop /* 80518884-80518888 000300 0004+00 0/0 0/0 0/0 .rodata @10393 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10393 = 2689.0f; -COMPILER_STRIP_GATE(80518884, &lit_10393); +COMPILER_STRIP_GATE(0x80518884, &lit_10393); #pragma pop /* 80518888-8051888C 000304 0004+00 0/0 0/0 0/0 .rodata @10394 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10394 = 5495.0f; -COMPILER_STRIP_GATE(80518888, &lit_10394); +COMPILER_STRIP_GATE(0x80518888, &lit_10394); #pragma pop /* 8051888C-80518890 000308 0004+00 0/0 0/0 0/0 .rodata @10395 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10395 = -3906.0f; -COMPILER_STRIP_GATE(8051888C, &lit_10395); +COMPILER_STRIP_GATE(0x8051888C, &lit_10395); #pragma pop /* 80518890-80518894 00030C 0004+00 0/0 0/0 0/0 .rodata @10396 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10396 = 42.0f; -COMPILER_STRIP_GATE(80518890, &lit_10396); +COMPILER_STRIP_GATE(0x80518890, &lit_10396); #pragma pop /* 80518894-80518898 000310 0004+00 0/0 0/0 0/0 .rodata @10397 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10397 = 8198.0f; -COMPILER_STRIP_GATE(80518894, &lit_10397); +COMPILER_STRIP_GATE(0x80518894, &lit_10397); #pragma pop /* 80518898-8051889C 000314 0004+00 0/0 0/0 0/0 .rodata @10398 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10398 = -4274.0f; -COMPILER_STRIP_GATE(80518898, &lit_10398); +COMPILER_STRIP_GATE(0x80518898, &lit_10398); #pragma pop /* 8051889C-805188A0 000318 0004+00 0/0 0/0 0/0 .rodata @10399 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10399 = 272.0f; -COMPILER_STRIP_GATE(8051889C, &lit_10399); +COMPILER_STRIP_GATE(0x8051889C, &lit_10399); #pragma pop /* 805188A0-805188A4 00031C 0004+00 0/0 0/0 0/0 .rodata @10400 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10400 = 7969.0f; -COMPILER_STRIP_GATE(805188A0, &lit_10400); +COMPILER_STRIP_GATE(0x805188A0, &lit_10400); #pragma pop /* 805188A4-805188A8 000320 0004+00 0/0 0/0 0/0 .rodata @10401 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10401 = -5712.0f; -COMPILER_STRIP_GATE(805188A4, &lit_10401); +COMPILER_STRIP_GATE(0x805188A4, &lit_10401); #pragma pop /* 805188A8-805188AC 000324 0004+00 0/0 0/0 0/0 .rodata @10402 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10402 = 2308.0f; -COMPILER_STRIP_GATE(805188A8, &lit_10402); +COMPILER_STRIP_GATE(0x805188A8, &lit_10402); #pragma pop /* 805188AC-805188B0 000328 0004+00 0/0 0/0 0/0 .rodata @10403 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10403 = 5828.0f; -COMPILER_STRIP_GATE(805188AC, &lit_10403); +COMPILER_STRIP_GATE(0x805188AC, &lit_10403); #pragma pop /* 805188B0-805188B4 00032C 0004+00 0/0 0/0 0/0 .rodata @10404 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10404 = -5286.0f; -COMPILER_STRIP_GATE(805188B0, &lit_10404); +COMPILER_STRIP_GATE(0x805188B0, &lit_10404); #pragma pop /* 805188B4-805188B8 000330 0004+00 0/0 0/0 0/0 .rodata @10405 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10405 = 2104.0f; -COMPILER_STRIP_GATE(805188B4, &lit_10405); +COMPILER_STRIP_GATE(0x805188B4, &lit_10405); #pragma pop /* 805188B8-805188BC 000334 0004+00 0/0 0/0 0/0 .rodata @10406 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10406 = 5957.0f; -COMPILER_STRIP_GATE(805188B8, &lit_10406); +COMPILER_STRIP_GATE(0x805188B8, &lit_10406); #pragma pop /* 805188BC-805188C0 000338 0004+00 0/1 0/0 0/0 .rodata @10407 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10407 = 1.0f / 50.0f; -COMPILER_STRIP_GATE(805188BC, &lit_10407); +COMPILER_STRIP_GATE(0x805188BC, &lit_10407); #pragma pop /* 805188C0-805188C4 00033C 0004+00 0/0 0/0 0/0 .rodata @10408 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10408 = -4712.0f; -COMPILER_STRIP_GATE(805188C0, &lit_10408); +COMPILER_STRIP_GATE(0x805188C0, &lit_10408); #pragma pop /* 805188C4-805188C8 000340 0004+00 0/0 0/0 0/0 .rodata @10409 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10409 = 870.0f; -COMPILER_STRIP_GATE(805188C4, &lit_10409); +COMPILER_STRIP_GATE(0x805188C4, &lit_10409); #pragma pop /* 805188C8-805188CC 000344 0004+00 0/0 0/0 0/0 .rodata @10410 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10410 = 7432.0f; -COMPILER_STRIP_GATE(805188C8, &lit_10410); +COMPILER_STRIP_GATE(0x805188C8, &lit_10410); #pragma pop /* 805188CC-805188D0 000348 0004+00 0/0 0/0 0/0 .rodata @10411 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10411 = -4852.0f; -COMPILER_STRIP_GATE(805188CC, &lit_10411); +COMPILER_STRIP_GATE(0x805188CC, &lit_10411); #pragma pop /* 805188D0-805188D4 00034C 0004+00 0/0 0/0 0/0 .rodata @10412 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10412 = 1171.0f; -COMPILER_STRIP_GATE(805188D0, &lit_10412); +COMPILER_STRIP_GATE(0x805188D0, &lit_10412); #pragma pop /* 805188D4-805188D8 000350 0004+00 0/0 0/0 0/0 .rodata @10413 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10413 = 7072.0f; -COMPILER_STRIP_GATE(805188D4, &lit_10413); +COMPILER_STRIP_GATE(0x805188D4, &lit_10413); #pragma pop /* 805188D8-805188DC 000354 0004+00 0/1 0/0 0/0 .rodata @11210 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_11210 = -2000.0f; -COMPILER_STRIP_GATE(805188D8, &lit_11210); +COMPILER_STRIP_GATE(0x805188D8, &lit_11210); #pragma pop /* 805188DC-805188E0 000358 0004+00 0/1 0/0 0/0 .rodata @11211 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_11211 = -10.0f; -COMPILER_STRIP_GATE(805188DC, &lit_11211); +COMPILER_STRIP_GATE(0x805188DC, &lit_11211); #pragma pop /* 805188E0-805188E4 00035C 0004+00 0/1 0/0 0/0 .rodata @11212 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_11212 = 21.0f; -COMPILER_STRIP_GATE(805188E0, &lit_11212); +COMPILER_STRIP_GATE(0x805188E0, &lit_11212); #pragma pop /* 805188E4-805188E8 000360 0004+00 0/1 0/0 0/0 .rodata @11213 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_11213 = 38.0f; -COMPILER_STRIP_GATE(805188E4, &lit_11213); +COMPILER_STRIP_GATE(0x805188E4, &lit_11213); #pragma pop /* 805188E8-805188EC 000364 0004+00 0/1 0/0 0/0 .rodata @11214 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_11214 = -6.0f; -COMPILER_STRIP_GATE(805188E8, &lit_11214); +COMPILER_STRIP_GATE(0x805188E8, &lit_11214); #pragma pop /* 805188EC-805188F0 000368 0004+00 0/1 0/0 0/0 .rodata @11215 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_11215 = -20000.0f; -COMPILER_STRIP_GATE(805188EC, &lit_11215); +COMPILER_STRIP_GATE(0x805188EC, &lit_11215); #pragma pop /* 805188F0-805188F4 00036C 0004+00 0/1 0/0 0/0 .rodata @11216 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_11216 = 200000.0f; -COMPILER_STRIP_GATE(805188F0, &lit_11216); +COMPILER_STRIP_GATE(0x805188F0, &lit_11216); #pragma pop /* 805188F4-805188F8 000370 0004+00 0/2 0/0 0/0 .rodata @11217 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_11217 = 30000.0f; -COMPILER_STRIP_GATE(805188F4, &lit_11217); +COMPILER_STRIP_GATE(0x805188F4, &lit_11217); #pragma pop /* 805188F8-805188FC 000374 0004+00 0/1 0/0 0/0 .rodata @11218 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_11218 = 190.0f; -COMPILER_STRIP_GATE(805188F8, &lit_11218); +COMPILER_STRIP_GATE(0x805188F8, &lit_11218); #pragma pop /* 805188FC-80518900 000378 0004+00 0/1 0/0 0/0 .rodata @11219 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_11219 = 120.0f; -COMPILER_STRIP_GATE(805188FC, &lit_11219); +COMPILER_STRIP_GATE(0x805188FC, &lit_11219); #pragma pop /* 80518900-80518904 00037C 0004+00 0/1 0/0 0/0 .rodata @11220 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_11220 = -200000.0f; -COMPILER_STRIP_GATE(80518900, &lit_11220); +COMPILER_STRIP_GATE(0x80518900, &lit_11220); #pragma pop /* 80518904-80518908 000380 0004+00 0/2 0/0 0/0 .rodata @11221 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_11221 = -200.0f; -COMPILER_STRIP_GATE(80518904, &lit_11221); +COMPILER_STRIP_GATE(0x80518904, &lit_11221); #pragma pop /* 80518908-8051890C 000384 0004+00 0/1 0/0 0/0 .rodata @11222 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_11222 = -500.0f; -COMPILER_STRIP_GATE(80518908, &lit_11222); +COMPILER_STRIP_GATE(0x80518908, &lit_11222); #pragma pop /* 8051890C-80518910 000388 0004+00 0/1 0/0 0/0 .rodata @11223 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_11223 = -80.0f; -COMPILER_STRIP_GATE(8051890C, &lit_11223); +COMPILER_STRIP_GATE(0x8051890C, &lit_11223); #pragma pop /* 80518910-80518914 00038C 0004+00 0/1 0/0 0/0 .rodata @11224 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_11224 = -0.0f; -COMPILER_STRIP_GATE(80518910, &lit_11224); +COMPILER_STRIP_GATE(0x80518910, &lit_11224); +#pragma pop + +/* 80518968-80518968 0003E4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8051897E = "F_SP102"; #pragma pop /* 8051933C-80519340 000204 0004+00 0/2 0/0 0/0 .bss c_start */ @@ -4056,91 +4080,91 @@ static asm void daE_RD_Delete(e_rd_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_11395 = -4800.0f; -COMPILER_STRIP_GATE(80518914, &lit_11395); +COMPILER_STRIP_GATE(0x80518914, &lit_11395); #pragma pop /* 80518918-8051891C 000394 0004+00 0/1 0/0 0/0 .rodata @11396 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_11396 = -650.0f; -COMPILER_STRIP_GATE(80518918, &lit_11396); +COMPILER_STRIP_GATE(0x80518918, &lit_11396); #pragma pop /* 8051891C-80518920 000398 0004+00 0/1 0/0 0/0 .rodata @11397 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_11397 = -4500.0f; -COMPILER_STRIP_GATE(8051891C, &lit_11397); +COMPILER_STRIP_GATE(0x8051891C, &lit_11397); #pragma pop /* 80518920-80518924 00039C 0004+00 0/1 0/0 0/0 .rodata @11398 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_11398 = 1100.0f; -COMPILER_STRIP_GATE(80518920, &lit_11398); +COMPILER_STRIP_GATE(0x80518920, &lit_11398); #pragma pop /* 80518924-80518928 0003A0 0004+00 0/1 0/0 0/0 .rodata @11399 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_11399 = -5500.0f; -COMPILER_STRIP_GATE(80518924, &lit_11399); +COMPILER_STRIP_GATE(0x80518924, &lit_11399); #pragma pop /* 80518928-8051892C 0003A4 0004+00 0/1 0/0 0/0 .rodata @11400 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_11400 = -5800.0f; -COMPILER_STRIP_GATE(80518928, &lit_11400); +COMPILER_STRIP_GATE(0x80518928, &lit_11400); #pragma pop /* 8051892C-80518930 0003A8 0004+00 0/1 0/0 0/0 .rodata @11401 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_11401 = -1100.0f; -COMPILER_STRIP_GATE(8051892C, &lit_11401); +COMPILER_STRIP_GATE(0x8051892C, &lit_11401); #pragma pop /* 80518930-80518934 0003AC 0004+00 0/1 0/0 0/0 .rodata @11402 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_11402 = 34789.0f; -COMPILER_STRIP_GATE(80518930, &lit_11402); +COMPILER_STRIP_GATE(0x80518930, &lit_11402); #pragma pop /* 80518934-80518938 0003B0 0004+00 0/1 0/0 0/0 .rodata @11403 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_11403 = -290.0f; -COMPILER_STRIP_GATE(80518934, &lit_11403); +COMPILER_STRIP_GATE(0x80518934, &lit_11403); #pragma pop /* 80518938-8051893C 0003B4 0004+00 0/1 0/0 0/0 .rodata @11404 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_11404 = -36177.0f; -COMPILER_STRIP_GATE(80518938, &lit_11404); +COMPILER_STRIP_GATE(0x80518938, &lit_11404); #pragma pop /* 8051893C-80518940 0003B8 0004+00 0/1 0/0 0/0 .rodata @11405 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_11405 = -93620.0f; -COMPILER_STRIP_GATE(8051893C, &lit_11405); +COMPILER_STRIP_GATE(0x8051893C, &lit_11405); #pragma pop /* 80518940-80518944 0003BC 0004+00 0/1 0/0 0/0 .rodata @11406 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_11406 = -5750.0f; -COMPILER_STRIP_GATE(80518940, &lit_11406); +COMPILER_STRIP_GATE(0x80518940, &lit_11406); #pragma pop /* 80518944-80518948 0003C0 0004+00 0/1 0/0 0/0 .rodata @11407 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_11407 = 49650.0f; -COMPILER_STRIP_GATE(80518944, &lit_11407); +COMPILER_STRIP_GATE(0x80518944, &lit_11407); #pragma pop /* 80519340-80519350 000208 000C+04 0/1 0/0 0/0 .bss @11269 */ @@ -4201,49 +4225,49 @@ static asm void ride_game_actor_set(e_rd_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_11460 = -57464.0f; -COMPILER_STRIP_GATE(80518948, &lit_11460); +COMPILER_STRIP_GATE(0x80518948, &lit_11460); #pragma pop /* 8051894C-80518950 0003C8 0004+00 0/1 0/0 0/0 .rodata @11461 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_11461 = -8000.0f; -COMPILER_STRIP_GATE(8051894C, &lit_11461); +COMPILER_STRIP_GATE(0x8051894C, &lit_11461); #pragma pop /* 80518950-80518954 0003CC 0004+00 0/1 0/0 0/0 .rodata @11462 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_11462 = 82137.0f; -COMPILER_STRIP_GATE(80518950, &lit_11462); +COMPILER_STRIP_GATE(0x80518950, &lit_11462); #pragma pop /* 80518954-80518958 0003D0 0004+00 0/1 0/0 0/0 .rodata @11463 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_11463 = -58006.0f; -COMPILER_STRIP_GATE(80518954, &lit_11463); +COMPILER_STRIP_GATE(0x80518954, &lit_11463); #pragma pop /* 80518958-8051895C 0003D4 0004+00 0/1 0/0 0/0 .rodata @11464 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_11464 = 79302.0f; -COMPILER_STRIP_GATE(80518958, &lit_11464); +COMPILER_STRIP_GATE(0x80518958, &lit_11464); #pragma pop /* 8051895C-80518960 0003D8 0004+00 0/1 0/0 0/0 .rodata @11465 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_11465 = -56848.0f; -COMPILER_STRIP_GATE(8051895C, &lit_11465); +COMPILER_STRIP_GATE(0x8051895C, &lit_11465); #pragma pop /* 80518960-80518964 0003DC 0004+00 0/1 0/0 0/0 .rodata @11466 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_11466 = 84472.0f; -COMPILER_STRIP_GATE(80518960, &lit_11466); +COMPILER_STRIP_GATE(0x80518960, &lit_11466); #pragma pop /* 805193D4-805193E4 00029C 000C+04 0/1 0/0 0/0 .bss @11412 */ @@ -4295,7 +4319,17 @@ static asm void useHeapInit(fopAc_ac_c* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_12066 = 100000.0f; -COMPILER_STRIP_GATE(80518964, &lit_12066); +COMPILER_STRIP_GATE(0x80518964, &lit_12066); +#pragma pop + +/* 80518968-80518968 0003E4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80518986 = "E_RD"; +SECTION_DEAD static char const* const stringBase_8051898B = "F_SP124"; +SECTION_DEAD static char const* const stringBase_80518993 = "F_SP118"; +SECTION_DEAD static char const* const stringBase_8051899B = "E_rd"; +SECTION_DEAD static char const* const stringBase_805189A0 = "F_SP115"; #pragma pop /* 805171FC-80517AE0 01287C 08E4+00 1/0 0/0 0/0 .text daE_RD_Create__FP10fopAc_ac_c */ @@ -4430,7 +4464,7 @@ asm void __sinit_d_a_e_rd_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80518064 = (void*)__sinit_d_a_e_rd_cpp; +REGISTER_CTORS(0x80518064, __sinit_d_a_e_rd_cpp); #pragma pop /* 805180BC-805180C4 01373C 0008+00 1/0 0/0 0/0 .text @20@__dt__14dBgS_ObjGndChkFv */ @@ -4687,17 +4721,4 @@ static u8 data_80519480[4]; static u8 data_80519484[4]; #pragma pop -/* 80518968-805189A8 0003E4 0040+00 10/10 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80518968 = "E_rdb"; -SECTION_DEAD static char const* const stringBase_8051896E = "F_SP121"; -SECTION_DEAD static char const* const stringBase_80518976 = "F_SP128"; -SECTION_DEAD static char const* const stringBase_8051897E = "F_SP102"; -SECTION_DEAD static char const* const stringBase_80518986 = "E_RD"; -SECTION_DEAD static char const* const stringBase_8051898B = "F_SP124"; -SECTION_DEAD static char const* const stringBase_80518993 = "F_SP118"; -SECTION_DEAD static char const* const stringBase_8051899B = "E_rd"; -SECTION_DEAD static char const* const stringBase_805189A0 = "F_SP115"; -#pragma pop +/* 80518968-80518968 0003E4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/e/d_a_e_rdb/d_a_e_rdb.cpp b/rel/d/a/e/d_a_e_rdb/d_a_e_rdb.cpp index e55c5d9fb84..442f56e32ed 100644 --- a/rel/d/a/e/d_a_e_rdb/d_a_e_rdb.cpp +++ b/rel/d/a/e/d_a_e_rdb/d_a_e_rdb.cpp @@ -26,16 +26,16 @@ struct mDoGph_gInf_c { /* 80007FD8 */ void fadeOut(f32, _GXColor&); }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; - struct J3DAnmTransform {}; +struct J3DModelData {}; + +struct Z2Creature {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -526,7 +526,7 @@ extern "C" void __register_global_object(); /* ############################################################################################## */ /* 8076B45C-8076B460 000000 0004+00 17/17 0/0 0/0 .rodata @4007 */ SECTION_RODATA static f32 const lit_4007 = 100.0f; -COMPILER_STRIP_GATE(8076B45C, &lit_4007); +COMPILER_STRIP_GATE(0x8076B45C, &lit_4007); /* 8076B460-8076B464 000004 0004+00 2/17 0/0 0/0 .rodata @4008 */ SECTION_RODATA static u8 const lit_4008[4] = { @@ -535,7 +535,7 @@ SECTION_RODATA static u8 const lit_4008[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(8076B460, &lit_4008); +COMPILER_STRIP_GATE(0x8076B460, &lit_4008); /* 8076B464-8076B46C 000008 0004+04 1/13 0/0 0/0 .rodata @4009 */ SECTION_RODATA static f32 const lit_4009[1 + 1 /* padding */] = { @@ -543,7 +543,7 @@ SECTION_RODATA static f32 const lit_4009[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(8076B464, &lit_4009); +COMPILER_STRIP_GATE(0x8076B464, &lit_4009); /* 8076B46C-8076B474 000010 0008+00 0/2 0/0 0/0 .rodata @4010 */ #pragma push @@ -551,7 +551,7 @@ COMPILER_STRIP_GATE(8076B464, &lit_4009); SECTION_RODATA static u8 const lit_4010[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8076B46C, &lit_4010); +COMPILER_STRIP_GATE(0x8076B46C, &lit_4010); #pragma pop /* 8076B474-8076B47C 000018 0008+00 0/2 0/0 0/0 .rodata @4011 */ @@ -560,7 +560,7 @@ COMPILER_STRIP_GATE(8076B46C, &lit_4010); SECTION_RODATA static u8 const lit_4011[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8076B474, &lit_4011); +COMPILER_STRIP_GATE(0x8076B474, &lit_4011); #pragma pop /* 8076B47C-8076B484 000020 0008+00 0/2 0/0 0/0 .rodata @4012 */ @@ -569,19 +569,19 @@ COMPILER_STRIP_GATE(8076B474, &lit_4011); SECTION_RODATA static u8 const lit_4012[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8076B47C, &lit_4012); +COMPILER_STRIP_GATE(0x8076B47C, &lit_4012); #pragma pop /* 8076B484-8076B488 000028 0004+00 0/1 0/0 0/0 .rodata @4013 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4013 = 1.0f / 100.0f; -COMPILER_STRIP_GATE(8076B484, &lit_4013); +COMPILER_STRIP_GATE(0x8076B484, &lit_4013); #pragma pop /* 8076B488-8076B48C 00002C 0004+00 1/3 0/0 0/0 .rodata @4028 */ SECTION_RODATA static f32 const lit_4028 = 31.0f / 20.0f; -COMPILER_STRIP_GATE(8076B488, &lit_4028); +COMPILER_STRIP_GATE(0x8076B488, &lit_4028); /* 8076B6F8-8076B704 000000 000C+00 2/2 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { @@ -862,7 +862,13 @@ asm daE_RDB_HIO_c::daE_RDB_HIO_c() { /* ############################################################################################## */ /* 8076B48C-8076B490 000030 0004+00 1/3 0/0 0/0 .rodata @4042 */ SECTION_RODATA static f32 const lit_4042 = -1.0f; -COMPILER_STRIP_GATE(8076B48C, &lit_4042); +COMPILER_STRIP_GATE(0x8076B48C, &lit_4042); + +/* 8076B6C4-8076B6C4 000268 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8076B6C4 = "E_rdb"; +#pragma pop /* 807650F0-8076519C 000110 00AC+00 9/9 0/0 0/0 .text anm_init__FP11e_rdb_classifUcf */ #pragma push @@ -889,14 +895,14 @@ static asm void nodeCallBack(J3DJoint* param_0, int param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4169 = 1700.0f; -COMPILER_STRIP_GATE(8076B490, &lit_4169); +COMPILER_STRIP_GATE(0x8076B490, &lit_4169); #pragma pop /* 8076B494-8076B498 000038 0004+00 0/1 0/0 0/0 .rodata @4170 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4170 = 2700.0f; -COMPILER_STRIP_GATE(8076B494, &lit_4170); +COMPILER_STRIP_GATE(0x8076B494, &lit_4170); #pragma pop /* 80765314-80765600 000334 02EC+00 1/0 0/0 0/0 .text daE_RDB_Draw__FP11e_rdb_class */ @@ -935,63 +941,69 @@ static asm void player_way_check(e_rdb_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4228 = 10.0f; -COMPILER_STRIP_GATE(8076B498, &lit_4228); +COMPILER_STRIP_GATE(0x8076B498, &lit_4228); #pragma pop /* 8076B49C-8076B4A0 000040 0004+00 0/3 0/0 0/0 .rodata @4229 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4229 = 20.0f; -COMPILER_STRIP_GATE(8076B49C, &lit_4229); +COMPILER_STRIP_GATE(0x8076B49C, &lit_4229); #pragma pop /* 8076B4A0-8076B4A4 000044 0004+00 0/6 0/0 0/0 .rodata @4230 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4230 = 5.0f; -COMPILER_STRIP_GATE(8076B4A0, &lit_4230); +COMPILER_STRIP_GATE(0x8076B4A0, &lit_4230); #pragma pop /* 8076B4A4-8076B4A8 000048 0004+00 0/2 0/0 0/0 .rodata @4231 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4231 = 350.0f; -COMPILER_STRIP_GATE(8076B4A4, &lit_4231); +COMPILER_STRIP_GATE(0x8076B4A4, &lit_4231); #pragma pop /* 8076B4A8-8076B4AC 00004C 0004+00 0/1 0/0 0/0 .rodata @4232 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4232 = -2.0f; -COMPILER_STRIP_GATE(8076B4A8, &lit_4232); +COMPILER_STRIP_GATE(0x8076B4A8, &lit_4232); #pragma pop /* 8076B4AC-8076B4B0 000050 0004+00 0/3 0/0 0/0 .rodata @4233 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4233 = 400.0f; -COMPILER_STRIP_GATE(8076B4AC, &lit_4233); +COMPILER_STRIP_GATE(0x8076B4AC, &lit_4233); #pragma pop /* 8076B4B0-8076B4B4 000054 0004+00 0/7 0/0 0/0 .rodata @4234 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4234 = 3.0f; -COMPILER_STRIP_GATE(8076B4B0, &lit_4234); +COMPILER_STRIP_GATE(0x8076B4B0, &lit_4234); #pragma pop /* 8076B4B4-8076B4B8 000058 0004+00 0/1 0/0 0/0 .rodata @4235 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4235 = 420.0f; -COMPILER_STRIP_GATE(8076B4B4, &lit_4235); +COMPILER_STRIP_GATE(0x8076B4B4, &lit_4235); #pragma pop /* 8076B4B8-8076B4BC 00005C 0004+00 0/1 0/0 0/0 .rodata @4236 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4236 = 820.0f; -COMPILER_STRIP_GATE(8076B4B8, &lit_4236); +COMPILER_STRIP_GATE(0x8076B4B8, &lit_4236); +#pragma pop + +/* 8076B6C4-8076B6C4 000268 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8076B6CA = "D_MN09"; #pragma pop /* 80765678-807658E0 000698 0268+00 1/1 0/0 0/0 .text e_rdb_wait__FP11e_rdb_class */ @@ -1009,21 +1021,21 @@ static asm void e_rdb_wait(e_rdb_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4263 = 700.0f; -COMPILER_STRIP_GATE(8076B4BC, &lit_4263); +COMPILER_STRIP_GATE(0x8076B4BC, &lit_4263); #pragma pop /* 8076B4C0-8076B4C4 000064 0004+00 0/3 0/0 0/0 .rodata @4264 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4264 = 600.0f; -COMPILER_STRIP_GATE(8076B4C0, &lit_4264); +COMPILER_STRIP_GATE(0x8076B4C0, &lit_4264); #pragma pop /* 8076B4C4-8076B4C8 000068 0004+00 0/2 0/0 0/0 .rodata @4265 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4265 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(8076B4C4, &lit_4265); +COMPILER_STRIP_GATE(0x8076B4C4, &lit_4265); #pragma pop /* 807658E0-80765A98 000900 01B8+00 1/1 0/0 0/0 .text e_rdb_fight__FP11e_rdb_class */ @@ -1053,7 +1065,7 @@ static asm void getPolyColor(cBgS_PolyInfo& param_0, int param_1, _GXColor* para #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4352 = 0.5f; -COMPILER_STRIP_GATE(8076B4C8, &lit_4352); +COMPILER_STRIP_GATE(0x8076B4C8, &lit_4352); #pragma pop /* 80765B70-80765E70 000B90 0300+00 1/1 0/0 0/0 .text e_rdb_attack__FP11e_rdb_class */ @@ -1092,14 +1104,14 @@ static asm void e_rdb_defence(e_rdb_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4540 = 0x409FAE14; -COMPILER_STRIP_GATE(8076B4CC, &lit_4540); +COMPILER_STRIP_GATE(0x8076B4CC, &lit_4540); #pragma pop /* 8076B4D0-8076B4D4 000074 0004+00 0/3 0/0 0/0 .rodata @4541 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4541 = 2.0f; -COMPILER_STRIP_GATE(8076B4D0, &lit_4541); +COMPILER_STRIP_GATE(0x8076B4D0, &lit_4541); #pragma pop /* 80766294-807665B4 0012B4 0320+00 1/1 0/0 0/0 .text e_rdb_damage__FP11e_rdb_class */ @@ -1137,112 +1149,112 @@ static asm void e_rdb_start(e_rdb_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4647 = 25.0f; -COMPILER_STRIP_GATE(8076B4D4, &lit_4647); +COMPILER_STRIP_GATE(0x8076B4D4, &lit_4647); #pragma pop /* 8076B4D8-8076B4DC 00007C 0004+00 0/0 0/0 0/0 .rodata @4648 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4648 = -10.0f; -COMPILER_STRIP_GATE(8076B4D8, &lit_4648); +COMPILER_STRIP_GATE(0x8076B4D8, &lit_4648); #pragma pop /* 8076B4DC-8076B4E0 000080 0004+00 0/0 0/0 0/0 .rodata @4649 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4649 = 2.5f; -COMPILER_STRIP_GATE(8076B4DC, &lit_4649); +COMPILER_STRIP_GATE(0x8076B4DC, &lit_4649); #pragma pop /* 8076B4E0-8076B4E4 000084 0004+00 0/1 0/0 0/0 .rodata @4650 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4650 = 40.0f; -COMPILER_STRIP_GATE(8076B4E0, &lit_4650); +COMPILER_STRIP_GATE(0x8076B4E0, &lit_4650); #pragma pop /* 8076B4E4-8076B4E8 000088 0004+00 0/0 0/0 0/0 .rodata @4651 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4651 = 1470.0f; -COMPILER_STRIP_GATE(8076B4E4, &lit_4651); +COMPILER_STRIP_GATE(0x8076B4E4, &lit_4651); #pragma pop /* 8076B4E8-8076B4EC 00008C 0004+00 0/0 0/0 0/0 .rodata @4652 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4652 = 2130.0f; -COMPILER_STRIP_GATE(8076B4E8, &lit_4652); +COMPILER_STRIP_GATE(0x8076B4E8, &lit_4652); #pragma pop /* 8076B4EC-8076B4F0 000090 0004+00 0/2 0/0 0/0 .rodata @4653 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4653 = 200.0f; -COMPILER_STRIP_GATE(8076B4EC, &lit_4653); +COMPILER_STRIP_GATE(0x8076B4EC, &lit_4653); #pragma pop /* 8076B4F0-8076B4F4 000094 0004+00 0/0 0/0 0/0 .rodata @4654 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4654 = 5000.0f; -COMPILER_STRIP_GATE(8076B4F0, &lit_4654); +COMPILER_STRIP_GATE(0x8076B4F0, &lit_4654); #pragma pop /* 8076B4F4-8076B4F8 000098 0004+00 0/0 0/0 0/0 .rodata @4725 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4725 = 20000.0f; -COMPILER_STRIP_GATE(8076B4F4, &lit_4725); +COMPILER_STRIP_GATE(0x8076B4F4, &lit_4725); #pragma pop /* 8076B4F8-8076B4FC 00009C 0004+00 0/1 0/0 0/0 .rodata @4726 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4726 = 500.0f; -COMPILER_STRIP_GATE(8076B4F8, &lit_4726); +COMPILER_STRIP_GATE(0x8076B4F8, &lit_4726); #pragma pop /* 8076B4FC-8076B500 0000A0 0004+00 0/0 0/0 0/0 .rodata @4727 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4727 = 2000.0f; -COMPILER_STRIP_GATE(8076B4FC, &lit_4727); +COMPILER_STRIP_GATE(0x8076B4FC, &lit_4727); #pragma pop /* 8076B500-8076B504 0000A4 0004+00 0/0 0/0 0/0 .rodata @4728 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4728 = 3.5f; -COMPILER_STRIP_GATE(8076B500, &lit_4728); +COMPILER_STRIP_GATE(0x8076B500, &lit_4728); #pragma pop /* 8076B504-8076B508 0000A8 0004+00 0/2 0/0 0/0 .rodata @4853 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4853 = 12.0f; -COMPILER_STRIP_GATE(8076B504, &lit_4853); +COMPILER_STRIP_GATE(0x8076B504, &lit_4853); #pragma pop /* 8076B508-8076B50C 0000AC 0004+00 0/1 0/0 0/0 .rodata @4854 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4854 = 120.0f; -COMPILER_STRIP_GATE(8076B508, &lit_4854); +COMPILER_STRIP_GATE(0x8076B508, &lit_4854); #pragma pop /* 8076B50C-8076B510 0000B0 0004+00 0/1 0/0 0/0 .rodata @4855 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4855 = 190.0f; -COMPILER_STRIP_GATE(8076B50C, &lit_4855); +COMPILER_STRIP_GATE(0x8076B50C, &lit_4855); #pragma pop /* 8076B510-8076B514 0000B4 0004+00 0/3 0/0 0/0 .rodata @4856 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4856 = 150.0f; -COMPILER_STRIP_GATE(8076B510, &lit_4856); +COMPILER_STRIP_GATE(0x8076B510, &lit_4856); #pragma pop /* 80766DB4-80767294 001DD4 04E0+00 1/1 0/0 0/0 .text damage_check__FP11e_rdb_class */ @@ -1260,7 +1272,7 @@ static asm void damage_check(e_rdb_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4904 = 1000.0f; -COMPILER_STRIP_GATE(8076B514, &lit_4904); +COMPILER_STRIP_GATE(0x8076B514, &lit_4904); #pragma pop /* 80767294-80767428 0022B4 0194+00 1/1 0/0 0/0 .text shot_s_sub__FPvPv */ @@ -1407,35 +1419,35 @@ static asm void cam_spd_set(e_rdb_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5163 = -5.0f; -COMPILER_STRIP_GATE(8076B518, &lit_5163); +COMPILER_STRIP_GATE(0x8076B518, &lit_5163); #pragma pop /* 8076B51C-8076B520 0000C0 0004+00 0/0 0/0 0/0 .rodata @5164 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5164 = 36.0f / 25.0f; -COMPILER_STRIP_GATE(8076B51C, &lit_5164); +COMPILER_STRIP_GATE(0x8076B51C, &lit_5164); #pragma pop /* 8076B520-8076B524 0000C4 0004+00 0/1 0/0 0/0 .rodata @5165 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5165 = -80.0f; -COMPILER_STRIP_GATE(8076B520, &lit_5165); +COMPILER_STRIP_GATE(0x8076B520, &lit_5165); #pragma pop /* 8076B524-8076B528 0000C8 0004+00 0/1 0/0 0/0 .rodata @5166 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5166 = -150.0f; -COMPILER_STRIP_GATE(8076B524, &lit_5166); +COMPILER_STRIP_GATE(0x8076B524, &lit_5166); #pragma pop /* 8076B528-8076B52C 0000CC 0004+00 0/3 0/0 0/0 .rodata @5167 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5167 = 50.0f; -COMPILER_STRIP_GATE(8076B528, &lit_5167); +COMPILER_STRIP_GATE(0x8076B528, &lit_5167); #pragma pop /* 8076B52C-8076B534 0000D0 0004+04 0/1 0/0 0/0 .rodata @5168 */ @@ -1446,7 +1458,7 @@ SECTION_RODATA static f32 const lit_5168[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(8076B52C, &lit_5168); +COMPILER_STRIP_GATE(0x8076B52C, &lit_5168); #pragma pop /* 8076B534-8076B53C 0000D8 0008+00 0/1 0/0 0/0 .rodata @5171 */ @@ -1455,77 +1467,84 @@ COMPILER_STRIP_GATE(8076B52C, &lit_5168); SECTION_RODATA static u8 const lit_5171[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8076B534, &lit_5171); +COMPILER_STRIP_GATE(0x8076B534, &lit_5171); #pragma pop /* 8076B53C-8076B540 0000E0 0004+00 0/1 0/0 0/0 .rodata @5616 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5616 = 55.0f; -COMPILER_STRIP_GATE(8076B53C, &lit_5616); +COMPILER_STRIP_GATE(0x8076B53C, &lit_5616); #pragma pop /* 8076B540-8076B544 0000E4 0004+00 0/1 0/0 0/0 .rodata @5617 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5617 = 330.0f; -COMPILER_STRIP_GATE(8076B540, &lit_5617); +COMPILER_STRIP_GATE(0x8076B540, &lit_5617); #pragma pop /* 8076B544-8076B548 0000E8 0004+00 0/1 0/0 0/0 .rodata @5618 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5618 = 140.0f; -COMPILER_STRIP_GATE(8076B544, &lit_5618); +COMPILER_STRIP_GATE(0x8076B544, &lit_5618); #pragma pop /* 8076B548-8076B54C 0000EC 0004+00 0/2 0/0 0/0 .rodata @5619 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5619 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(8076B548, &lit_5619); +COMPILER_STRIP_GATE(0x8076B548, &lit_5619); #pragma pop /* 8076B54C-8076B550 0000F0 0004+00 0/1 0/0 0/0 .rodata @5620 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5620 = -7627.0f; -COMPILER_STRIP_GATE(8076B54C, &lit_5620); +COMPILER_STRIP_GATE(0x8076B54C, &lit_5620); #pragma pop /* 8076B550-8076B554 0000F4 0004+00 0/1 0/0 0/0 .rodata @5621 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5621 = 153.0f; -COMPILER_STRIP_GATE(8076B550, &lit_5621); +COMPILER_STRIP_GATE(0x8076B550, &lit_5621); #pragma pop /* 8076B554-8076B558 0000F8 0004+00 0/1 0/0 0/0 .rodata @5622 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5622 = -5371.0f; -COMPILER_STRIP_GATE(8076B554, &lit_5622); +COMPILER_STRIP_GATE(0x8076B554, &lit_5622); #pragma pop /* 8076B558-8076B55C 0000FC 0004+00 0/1 0/0 0/0 .rodata @5623 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5623 = -7470.0f; -COMPILER_STRIP_GATE(8076B558, &lit_5623); +COMPILER_STRIP_GATE(0x8076B558, &lit_5623); #pragma pop /* 8076B55C-8076B560 000100 0004+00 0/1 0/0 0/0 .rodata @5624 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5624 = 144.0f; -COMPILER_STRIP_GATE(8076B55C, &lit_5624); +COMPILER_STRIP_GATE(0x8076B55C, &lit_5624); #pragma pop /* 8076B560-8076B564 000104 0004+00 0/1 0/0 0/0 .rodata @5625 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5625 = -5071.0f; -COMPILER_STRIP_GATE(8076B560, &lit_5625); +COMPILER_STRIP_GATE(0x8076B560, &lit_5625); +#pragma pop + +/* 8076B6C4-8076B6C4 000268 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8076B6D1 = "force_start"; +SECTION_DEAD static char const* const stringBase_8076B6DD = "force_end"; #pragma pop /* 80767E54-80768B90 002E74 0D3C+00 2/1 0/0 0/0 .text demo_camera__FP11e_rdb_class */ @@ -1543,350 +1562,350 @@ static asm void demo_camera(e_rdb_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5626 = 3.0f / 100.0f; -COMPILER_STRIP_GATE(8076B564, &lit_5626); +COMPILER_STRIP_GATE(0x8076B564, &lit_5626); #pragma pop /* 8076B568-8076B56C 00010C 0004+00 0/0 0/0 0/0 .rodata @5627 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_5627 = 0x3B449BA6; -COMPILER_STRIP_GATE(8076B568, &lit_5627); +COMPILER_STRIP_GATE(0x8076B568, &lit_5627); #pragma pop /* 8076B56C-8076B570 000110 0004+00 0/0 0/0 0/0 .rodata @5628 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5628 = 230.0f; -COMPILER_STRIP_GATE(8076B56C, &lit_5628); +COMPILER_STRIP_GATE(0x8076B56C, &lit_5628); #pragma pop /* 8076B570-8076B574 000114 0004+00 0/0 0/0 0/0 .rodata @5629 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5629 = 220.0f; -COMPILER_STRIP_GATE(8076B570, &lit_5629); +COMPILER_STRIP_GATE(0x8076B570, &lit_5629); #pragma pop /* 8076B574-8076B578 000118 0004+00 0/1 0/0 0/0 .rodata @5630 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5630 = 30.0f; -COMPILER_STRIP_GATE(8076B574, &lit_5630); +COMPILER_STRIP_GATE(0x8076B574, &lit_5630); #pragma pop /* 8076B578-8076B57C 00011C 0004+00 0/1 0/0 0/0 .rodata @5631 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5631 = 300.0f; -COMPILER_STRIP_GATE(8076B578, &lit_5631); +COMPILER_STRIP_GATE(0x8076B578, &lit_5631); #pragma pop /* 8076B57C-8076B580 000120 0004+00 0/0 0/0 0/0 .rodata @5632 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5632 = 145.0f; -COMPILER_STRIP_GATE(8076B57C, &lit_5632); +COMPILER_STRIP_GATE(0x8076B57C, &lit_5632); #pragma pop /* 8076B580-8076B584 000124 0004+00 0/0 0/0 0/0 .rodata @5633 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5633 = 170.0f; -COMPILER_STRIP_GATE(8076B580, &lit_5633); +COMPILER_STRIP_GATE(0x8076B580, &lit_5633); #pragma pop /* 8076B584-8076B588 000128 0004+00 0/0 0/0 0/0 .rodata @5634 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5634 = 70.0f; -COMPILER_STRIP_GATE(8076B584, &lit_5634); +COMPILER_STRIP_GATE(0x8076B584, &lit_5634); #pragma pop /* 8076B588-8076B58C 00012C 0004+00 0/1 0/0 0/0 .rodata @5635 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5635 = 1.0f / 20.0f; -COMPILER_STRIP_GATE(8076B588, &lit_5635); +COMPILER_STRIP_GATE(0x8076B588, &lit_5635); #pragma pop /* 8076B58C-8076B590 000130 0004+00 0/0 0/0 0/0 .rodata @5636 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5636 = 0.25f; -COMPILER_STRIP_GATE(8076B58C, &lit_5636); +COMPILER_STRIP_GATE(0x8076B58C, &lit_5636); #pragma pop /* 8076B590-8076B594 000134 0004+00 0/0 0/0 0/0 .rodata @5637 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5637 = -7080.0f; -COMPILER_STRIP_GATE(8076B590, &lit_5637); +COMPILER_STRIP_GATE(0x8076B590, &lit_5637); #pragma pop /* 8076B594-8076B598 000138 0004+00 0/0 0/0 0/0 .rodata @5638 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5638 = -6634.0f; -COMPILER_STRIP_GATE(8076B594, &lit_5638); +COMPILER_STRIP_GATE(0x8076B594, &lit_5638); #pragma pop /* 8076B598-8076B59C 00013C 0004+00 0/0 0/0 0/0 .rodata @5639 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5639 = -10008.0f; -COMPILER_STRIP_GATE(8076B598, &lit_5639); +COMPILER_STRIP_GATE(0x8076B598, &lit_5639); #pragma pop /* 8076B59C-8076B5A0 000140 0004+00 0/0 0/0 0/0 .rodata @5640 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5640 = -2729.0f; -COMPILER_STRIP_GATE(8076B59C, &lit_5640); +COMPILER_STRIP_GATE(0x8076B59C, &lit_5640); #pragma pop /* 8076B5A0-8076B5A4 000144 0004+00 0/0 0/0 0/0 .rodata @5641 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5641 = -7530.0f; -COMPILER_STRIP_GATE(8076B5A0, &lit_5641); +COMPILER_STRIP_GATE(0x8076B5A0, &lit_5641); #pragma pop /* 8076B5A4-8076B5A8 000148 0004+00 0/0 0/0 0/0 .rodata @5642 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5642 = -5451.0f; -COMPILER_STRIP_GATE(8076B5A4, &lit_5642); +COMPILER_STRIP_GATE(0x8076B5A4, &lit_5642); #pragma pop /* 8076B5A8-8076B5AC 00014C 0004+00 0/0 0/0 0/0 .rodata @5643 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5643 = -7661.0f; -COMPILER_STRIP_GATE(8076B5A8, &lit_5643); +COMPILER_STRIP_GATE(0x8076B5A8, &lit_5643); #pragma pop /* 8076B5AC-8076B5B0 000150 0004+00 0/0 0/0 0/0 .rodata @5644 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5644 = 323.0f; -COMPILER_STRIP_GATE(8076B5AC, &lit_5644); +COMPILER_STRIP_GATE(0x8076B5AC, &lit_5644); #pragma pop /* 8076B5B0-8076B5B4 000154 0004+00 0/0 0/0 0/0 .rodata @5645 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5645 = -5684.0f; -COMPILER_STRIP_GATE(8076B5B0, &lit_5645); +COMPILER_STRIP_GATE(0x8076B5B0, &lit_5645); #pragma pop /* 8076B5B4-8076B5B8 000158 0004+00 0/0 0/0 0/0 .rodata @5646 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5646 = -7382.0f; -COMPILER_STRIP_GATE(8076B5B4, &lit_5646); +COMPILER_STRIP_GATE(0x8076B5B4, &lit_5646); #pragma pop /* 8076B5B8-8076B5BC 00015C 0004+00 0/0 0/0 0/0 .rodata @5647 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5647 = 185.0f; -COMPILER_STRIP_GATE(8076B5B8, &lit_5647); +COMPILER_STRIP_GATE(0x8076B5B8, &lit_5647); #pragma pop /* 8076B5BC-8076B5C0 000160 0004+00 0/0 0/0 0/0 .rodata @5648 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5648 = -5360.0f; -COMPILER_STRIP_GATE(8076B5BC, &lit_5648); +COMPILER_STRIP_GATE(0x8076B5BC, &lit_5648); #pragma pop /* 8076B5C0-8076B5C4 000164 0004+00 0/0 0/0 0/0 .rodata @5649 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5649 = -1.0f / 20.0f; -COMPILER_STRIP_GATE(8076B5C0, &lit_5649); +COMPILER_STRIP_GATE(0x8076B5C0, &lit_5649); #pragma pop /* 8076B5C4-8076B5C8 000168 0004+00 0/0 0/0 0/0 .rodata @5650 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5650 = -7738.0f; -COMPILER_STRIP_GATE(8076B5C4, &lit_5650); +COMPILER_STRIP_GATE(0x8076B5C4, &lit_5650); #pragma pop /* 8076B5C8-8076B5CC 00016C 0004+00 0/0 0/0 0/0 .rodata @5651 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5651 = -5086.0f; -COMPILER_STRIP_GATE(8076B5C8, &lit_5651); +COMPILER_STRIP_GATE(0x8076B5C8, &lit_5651); #pragma pop /* 8076B5CC-8076B5D0 000170 0004+00 0/0 0/0 0/0 .rodata @5652 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_5652 = 0x3BA3D70A; -COMPILER_STRIP_GATE(8076B5CC, &lit_5652); +COMPILER_STRIP_GATE(0x8076B5CC, &lit_5652); #pragma pop /* 8076B5D0-8076B5D4 000174 0004+00 0/1 0/0 0/0 .rodata @5833 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5833 = 29.0f; -COMPILER_STRIP_GATE(8076B5D0, &lit_5833); +COMPILER_STRIP_GATE(0x8076B5D0, &lit_5833); #pragma pop /* 8076B5D4-8076B5D8 000178 0004+00 0/1 0/0 0/0 .rodata @5834 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5834 = 59.0f; -COMPILER_STRIP_GATE(8076B5D4, &lit_5834); +COMPILER_STRIP_GATE(0x8076B5D4, &lit_5834); #pragma pop /* 8076B5D8-8076B5DC 00017C 0004+00 0/1 0/0 0/0 .rodata @5835 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5835 = 17.0f; -COMPILER_STRIP_GATE(8076B5D8, &lit_5835); +COMPILER_STRIP_GATE(0x8076B5D8, &lit_5835); #pragma pop /* 8076B5DC-8076B5E0 000180 0004+00 0/1 0/0 0/0 .rodata @5836 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5836 = 15.0f; -COMPILER_STRIP_GATE(8076B5DC, &lit_5836); +COMPILER_STRIP_GATE(0x8076B5DC, &lit_5836); #pragma pop /* 8076B5E0-8076B5E4 000184 0004+00 0/2 0/0 0/0 .rodata @5837 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5837 = 35.0f; -COMPILER_STRIP_GATE(8076B5E0, &lit_5837); +COMPILER_STRIP_GATE(0x8076B5E0, &lit_5837); #pragma pop /* 8076B5E4-8076B5E8 000188 0004+00 0/1 0/0 0/0 .rodata @5838 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5838 = 58.0f; -COMPILER_STRIP_GATE(8076B5E4, &lit_5838); +COMPILER_STRIP_GATE(0x8076B5E4, &lit_5838); #pragma pop /* 8076B5E8-8076B5EC 00018C 0004+00 0/1 0/0 0/0 .rodata @5839 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5839 = 61.0f; -COMPILER_STRIP_GATE(8076B5E8, &lit_5839); +COMPILER_STRIP_GATE(0x8076B5E8, &lit_5839); #pragma pop /* 8076B5EC-8076B5F0 000190 0004+00 0/1 0/0 0/0 .rodata @5840 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5840 = 110.0f; -COMPILER_STRIP_GATE(8076B5EC, &lit_5840); +COMPILER_STRIP_GATE(0x8076B5EC, &lit_5840); #pragma pop /* 8076B5F0-8076B5F4 000194 0004+00 0/1 0/0 0/0 .rodata @5841 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5841 = 4.0f; -COMPILER_STRIP_GATE(8076B5F0, &lit_5841); +COMPILER_STRIP_GATE(0x8076B5F0, &lit_5841); #pragma pop /* 8076B5F4-8076B5F8 000198 0004+00 0/1 0/0 0/0 .rodata @5842 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5842 = 50.5f; -COMPILER_STRIP_GATE(8076B5F4, &lit_5842); +COMPILER_STRIP_GATE(0x8076B5F4, &lit_5842); #pragma pop /* 8076B5F8-8076B5FC 00019C 0004+00 0/1 0/0 0/0 .rodata @5843 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5843 = 31.0f; -COMPILER_STRIP_GATE(8076B5F8, &lit_5843); +COMPILER_STRIP_GATE(0x8076B5F8, &lit_5843); #pragma pop /* 8076B5FC-8076B600 0001A0 0004+00 0/1 0/0 0/0 .rodata @5844 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5844 = 52.0f; -COMPILER_STRIP_GATE(8076B5FC, &lit_5844); +COMPILER_STRIP_GATE(0x8076B5FC, &lit_5844); #pragma pop /* 8076B600-8076B604 0001A4 0004+00 0/1 0/0 0/0 .rodata @5845 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5845 = 77.0f; -COMPILER_STRIP_GATE(8076B600, &lit_5845); +COMPILER_STRIP_GATE(0x8076B600, &lit_5845); #pragma pop /* 8076B604-8076B608 0001A8 0004+00 0/1 0/0 0/0 .rodata @5846 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5846 = 11.0f; -COMPILER_STRIP_GATE(8076B604, &lit_5846); +COMPILER_STRIP_GATE(0x8076B604, &lit_5846); #pragma pop /* 8076B608-8076B60C 0001AC 0004+00 0/1 0/0 0/0 .rodata @5847 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5847 = 83.0f; -COMPILER_STRIP_GATE(8076B608, &lit_5847); +COMPILER_STRIP_GATE(0x8076B608, &lit_5847); #pragma pop /* 8076B60C-8076B610 0001B0 0004+00 0/1 0/0 0/0 .rodata @5848 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5848 = 124.0f; -COMPILER_STRIP_GATE(8076B60C, &lit_5848); +COMPILER_STRIP_GATE(0x8076B60C, &lit_5848); #pragma pop /* 8076B610-8076B614 0001B4 0004+00 0/1 0/0 0/0 .rodata @5849 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5849 = 142.0f; -COMPILER_STRIP_GATE(8076B610, &lit_5849); +COMPILER_STRIP_GATE(0x8076B610, &lit_5849); #pragma pop /* 8076B614-8076B618 0001B8 0004+00 0/1 0/0 0/0 .rodata @5850 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5850 = 176.0f; -COMPILER_STRIP_GATE(8076B614, &lit_5850); +COMPILER_STRIP_GATE(0x8076B614, &lit_5850); #pragma pop /* 8076B618-8076B61C 0001BC 0004+00 0/1 0/0 0/0 .rodata @5851 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5851 = 13.0f; -COMPILER_STRIP_GATE(8076B618, &lit_5851); +COMPILER_STRIP_GATE(0x8076B618, &lit_5851); #pragma pop /* 8076B61C-8076B620 0001C0 0004+00 0/1 0/0 0/0 .rodata @5852 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5852 = 39.0f; -COMPILER_STRIP_GATE(8076B61C, &lit_5852); +COMPILER_STRIP_GATE(0x8076B61C, &lit_5852); #pragma pop /* 8076B620-8076B624 0001C4 0004+00 0/1 0/0 0/0 .rodata @5853 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5853 = 18.0f; -COMPILER_STRIP_GATE(8076B620, &lit_5853); +COMPILER_STRIP_GATE(0x8076B620, &lit_5853); #pragma pop /* 8076B624-8076B628 0001C8 0004+00 0/1 0/0 0/0 .rodata @5854 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5854 = 36.0f; -COMPILER_STRIP_GATE(8076B624, &lit_5854); +COMPILER_STRIP_GATE(0x8076B624, &lit_5854); #pragma pop /* 8076B628-8076B62C 0001CC 0004+00 0/1 0/0 0/0 .rodata @5855 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5855 = 43.0f; -COMPILER_STRIP_GATE(8076B628, &lit_5855); +COMPILER_STRIP_GATE(0x8076B628, &lit_5855); #pragma pop /* 80768B90-80769324 003BB0 0794+00 1/1 0/0 0/0 .text anm_se_set__FP11e_rdb_class */ @@ -1904,238 +1923,245 @@ static asm void anm_se_set(e_rdb_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6322 = -20000.0f; -COMPILER_STRIP_GATE(8076B62C, &lit_6322); +COMPILER_STRIP_GATE(0x8076B62C, &lit_6322); #pragma pop /* 8076B630-8076B634 0001D4 0004+00 0/1 0/0 0/0 .rodata @6323 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6323 = 12000.0f; -COMPILER_STRIP_GATE(8076B630, &lit_6323); +COMPILER_STRIP_GATE(0x8076B630, &lit_6323); #pragma pop /* 8076B634-8076B638 0001D8 0004+00 0/1 0/0 0/0 .rodata @6324 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6324 = 30000.0f; -COMPILER_STRIP_GATE(8076B634, &lit_6324); +COMPILER_STRIP_GATE(0x8076B634, &lit_6324); #pragma pop /* 8076B638-8076B63C 0001DC 0004+00 0/1 0/0 0/0 .rodata @6325 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6325 = 2834.0f; -COMPILER_STRIP_GATE(8076B638, &lit_6325); +COMPILER_STRIP_GATE(0x8076B638, &lit_6325); #pragma pop /* 8076B63C-8076B640 0001E0 0004+00 0/1 0/0 0/0 .rodata @6326 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6326 = 993.0f; -COMPILER_STRIP_GATE(8076B63C, &lit_6326); +COMPILER_STRIP_GATE(0x8076B63C, &lit_6326); #pragma pop /* 8076B640-8076B644 0001E4 0004+00 0/1 0/0 0/0 .rodata @6327 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6327 = -60.0f; -COMPILER_STRIP_GATE(8076B640, &lit_6327); +COMPILER_STRIP_GATE(0x8076B640, &lit_6327); #pragma pop /* 8076B644-8076B648 0001E8 0004+00 0/1 0/0 0/0 .rodata @6328 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6328 = -10000.0f; -COMPILER_STRIP_GATE(8076B644, &lit_6328); +COMPILER_STRIP_GATE(0x8076B644, &lit_6328); #pragma pop /* 8076B648-8076B64C 0001EC 0004+00 0/1 0/0 0/0 .rodata @6329 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6329 = 1.0f / 50.0f; -COMPILER_STRIP_GATE(8076B648, &lit_6329); +COMPILER_STRIP_GATE(0x8076B648, &lit_6329); #pragma pop /* 8076B64C-8076B650 0001F0 0004+00 0/1 0/0 0/0 .rodata @6330 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6330 = 2573.0f; -COMPILER_STRIP_GATE(8076B64C, &lit_6330); +COMPILER_STRIP_GATE(0x8076B64C, &lit_6330); #pragma pop /* 8076B650-8076B654 0001F4 0004+00 0/1 0/0 0/0 .rodata @6331 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6331 = 370.0f; -COMPILER_STRIP_GATE(8076B650, &lit_6331); +COMPILER_STRIP_GATE(0x8076B650, &lit_6331); #pragma pop /* 8076B654-8076B658 0001F8 0004+00 0/1 0/0 0/0 .rodata @6332 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6332 = 2200.0f; -COMPILER_STRIP_GATE(8076B654, &lit_6332); +COMPILER_STRIP_GATE(0x8076B654, &lit_6332); #pragma pop /* 8076B658-8076B65C 0001FC 0004+00 0/1 0/0 0/0 .rodata @6333 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6333 = 2901.0f; -COMPILER_STRIP_GATE(8076B658, &lit_6333); +COMPILER_STRIP_GATE(0x8076B658, &lit_6333); #pragma pop /* 8076B65C-8076B660 000200 0004+00 0/1 0/0 0/0 .rodata @6334 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6334 = 3100.0f; -COMPILER_STRIP_GATE(8076B65C, &lit_6334); +COMPILER_STRIP_GATE(0x8076B65C, &lit_6334); #pragma pop /* 8076B660-8076B664 000204 0004+00 0/1 0/0 0/0 .rodata @6335 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6335 = 222.0f; -COMPILER_STRIP_GATE(8076B660, &lit_6335); +COMPILER_STRIP_GATE(0x8076B660, &lit_6335); #pragma pop /* 8076B664-8076B668 000208 0004+00 0/1 0/0 0/0 .rodata @6336 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6336 = 1888.0f; -COMPILER_STRIP_GATE(8076B664, &lit_6336); +COMPILER_STRIP_GATE(0x8076B664, &lit_6336); #pragma pop /* 8076B668-8076B66C 00020C 0004+00 0/1 0/0 0/0 .rodata @6337 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6337 = 1900.0f; -COMPILER_STRIP_GATE(8076B668, &lit_6337); +COMPILER_STRIP_GATE(0x8076B668, &lit_6337); #pragma pop /* 8076B66C-8076B670 000210 0004+00 0/1 0/0 0/0 .rodata @6338 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6338 = 555.0f; -COMPILER_STRIP_GATE(8076B66C, &lit_6338); +COMPILER_STRIP_GATE(0x8076B66C, &lit_6338); #pragma pop /* 8076B670-8076B674 000214 0004+00 0/1 0/0 0/0 .rodata @6339 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6339 = 1600.0f; -COMPILER_STRIP_GATE(8076B670, &lit_6339); +COMPILER_STRIP_GATE(0x8076B670, &lit_6339); #pragma pop /* 8076B674-8076B678 000218 0004+00 0/1 0/0 0/0 .rodata @6340 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6340 = 1783.0f; -COMPILER_STRIP_GATE(8076B674, &lit_6340); +COMPILER_STRIP_GATE(0x8076B674, &lit_6340); #pragma pop /* 8076B678-8076B67C 00021C 0004+00 0/1 0/0 0/0 .rodata @6341 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6341 = 355.0f; -COMPILER_STRIP_GATE(8076B678, &lit_6341); +COMPILER_STRIP_GATE(0x8076B678, &lit_6341); #pragma pop /* 8076B67C-8076B680 000220 0004+00 0/1 0/0 0/0 .rodata @6342 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6342 = 1555.0f; -COMPILER_STRIP_GATE(8076B67C, &lit_6342); +COMPILER_STRIP_GATE(0x8076B67C, &lit_6342); #pragma pop /* 8076B680-8076B684 000224 0004+00 0/1 0/0 0/0 .rodata @6343 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6343 = 1332.0f; -COMPILER_STRIP_GATE(8076B680, &lit_6343); +COMPILER_STRIP_GATE(0x8076B680, &lit_6343); #pragma pop /* 8076B684-8076B688 000228 0004+00 0/1 0/0 0/0 .rodata @6344 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6344 = 550.0f; -COMPILER_STRIP_GATE(8076B684, &lit_6344); +COMPILER_STRIP_GATE(0x8076B684, &lit_6344); #pragma pop /* 8076B688-8076B68C 00022C 0004+00 0/1 0/0 0/0 .rodata @6345 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6345 = 1070.0f; -COMPILER_STRIP_GATE(8076B688, &lit_6345); +COMPILER_STRIP_GATE(0x8076B688, &lit_6345); #pragma pop /* 8076B68C-8076B690 000230 0004+00 0/1 0/0 0/0 .rodata @6346 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6346 = 1375.0f; -COMPILER_STRIP_GATE(8076B68C, &lit_6346); +COMPILER_STRIP_GATE(0x8076B68C, &lit_6346); #pragma pop /* 8076B690-8076B694 000234 0004+00 0/1 0/0 0/0 .rodata @6347 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6347 = 250.0f; -COMPILER_STRIP_GATE(8076B690, &lit_6347); +COMPILER_STRIP_GATE(0x8076B690, &lit_6347); #pragma pop /* 8076B694-8076B698 000238 0004+00 0/1 0/0 0/0 .rodata @6348 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6348 = 850.0f; -COMPILER_STRIP_GATE(8076B694, &lit_6348); +COMPILER_STRIP_GATE(0x8076B694, &lit_6348); #pragma pop /* 8076B698-8076B69C 00023C 0004+00 0/1 0/0 0/0 .rodata @6349 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6349 = 1165.0f; -COMPILER_STRIP_GATE(8076B698, &lit_6349); +COMPILER_STRIP_GATE(0x8076B698, &lit_6349); #pragma pop /* 8076B69C-8076B6A0 000240 0004+00 0/1 0/0 0/0 .rodata @6350 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6350 = 430.0f; -COMPILER_STRIP_GATE(8076B69C, &lit_6350); +COMPILER_STRIP_GATE(0x8076B69C, &lit_6350); #pragma pop /* 8076B6A0-8076B6A4 000244 0004+00 0/1 0/0 0/0 .rodata @6351 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6351 = 450.0f; -COMPILER_STRIP_GATE(8076B6A0, &lit_6351); +COMPILER_STRIP_GATE(0x8076B6A0, &lit_6351); #pragma pop /* 8076B6A4-8076B6A8 000248 0004+00 0/1 0/0 0/0 .rodata @6352 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6352 = 260.0f; -COMPILER_STRIP_GATE(8076B6A4, &lit_6352); +COMPILER_STRIP_GATE(0x8076B6A4, &lit_6352); #pragma pop /* 8076B6A8-8076B6AC 00024C 0004+00 0/1 0/0 0/0 .rodata @6353 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6353 = 522.0f; -COMPILER_STRIP_GATE(8076B6A8, &lit_6353); +COMPILER_STRIP_GATE(0x8076B6A8, &lit_6353); #pragma pop /* 8076B6AC-8076B6B0 000250 0004+00 0/1 0/0 0/0 .rodata @6354 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6354 = 1632.0f; -COMPILER_STRIP_GATE(8076B6AC, &lit_6354); +COMPILER_STRIP_GATE(0x8076B6AC, &lit_6354); #pragma pop /* 8076B6B0-8076B6B4 000254 0004+00 0/1 0/0 0/0 .rodata @6355 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6355 = 180.0f; -COMPILER_STRIP_GATE(8076B6B0, &lit_6355); +COMPILER_STRIP_GATE(0x8076B6B0, &lit_6355); +#pragma pop + +/* 8076B6C4-8076B6C4 000268 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8076B6E7 = "T_DESER"; +SECTION_DEAD static char const* const stringBase_8076B6EF = "F_SP118"; #pragma pop /* 8076BA20-8076BA30 000060 000C+04 0/1 0/0 0/0 .bss @5932 */ @@ -2329,28 +2355,28 @@ static asm void useHeapInit(fopAc_ac_c* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6539 = -200.0f; -COMPILER_STRIP_GATE(8076B6B4, &lit_6539); +COMPILER_STRIP_GATE(0x8076B6B4, &lit_6539); #pragma pop /* 8076B6B8-8076B6BC 00025C 0004+00 0/1 0/0 0/0 .rodata @6540 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6540 = -7625.0f; -COMPILER_STRIP_GATE(8076B6B8, &lit_6540); +COMPILER_STRIP_GATE(0x8076B6B8, &lit_6540); #pragma pop /* 8076B6BC-8076B6C0 000260 0004+00 0/1 0/0 0/0 .rodata @6541 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6541 = -5825.0f; -COMPILER_STRIP_GATE(8076B6BC, &lit_6541); +COMPILER_STRIP_GATE(0x8076B6BC, &lit_6541); #pragma pop /* 8076B6C0-8076B6C4 000264 0004+00 0/1 0/0 0/0 .rodata @6542 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6542 = -50.0f; -COMPILER_STRIP_GATE(8076B6C0, &lit_6542); +COMPILER_STRIP_GATE(0x8076B6C0, &lit_6542); #pragma pop /* 8076A5FC-8076AA0C 00561C 0410+00 1/0 0/0 0/0 .text daE_RDB_Create__FP10fopAc_ac_c */ @@ -2485,7 +2511,7 @@ asm void __sinit_d_a_e_rdb_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_8076AFAC = (void*)__sinit_d_a_e_rdb_cpp; +REGISTER_CTORS(0x8076AFAC, __sinit_d_a_e_rdb_cpp); #pragma pop /* 8076AFE8-8076AFF0 006008 0008+00 1/0 0/0 0/0 .text @36@__dt__12dBgS_ObjAcchFv */ @@ -2702,14 +2728,4 @@ static u8 data_8076BCC4[4]; static u8 data_8076BCC8[4]; #pragma pop -/* 8076B6C4-8076B6F7 000268 0033+00 11/11 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_8076B6C4 = "E_rdb"; -SECTION_DEAD static char const* const stringBase_8076B6CA = "D_MN09"; -SECTION_DEAD static char const* const stringBase_8076B6D1 = "force_start"; -SECTION_DEAD static char const* const stringBase_8076B6DD = "force_end"; -SECTION_DEAD static char const* const stringBase_8076B6E7 = "T_DESER"; -SECTION_DEAD static char const* const stringBase_8076B6EF = "F_SP118"; -#pragma pop +/* 8076B6C4-8076B6C4 000268 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/e/d_a_e_rdy/d_a_e_rdy.cpp b/rel/d/a/e/d_a_e_rdy/d_a_e_rdy.cpp index 524f3a059f9..04c0538e24d 100644 --- a/rel/d/a/e/d_a_e_rdy/d_a_e_rdy.cpp +++ b/rel/d/a/e/d_a_e_rdy/d_a_e_rdy.cpp @@ -25,16 +25,16 @@ struct mDoGph_gInf_c { /* 80007FD8 */ void fadeOut(f32, _GXColor&); }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; - struct J3DAnmTransform {}; +struct J3DModelData {}; + +struct Z2Creature {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -144,10 +144,10 @@ struct dMsgFlow_c { /* 8024A2D8 */ void doFlow(fopAc_ac_c*, fopAc_ac_c**, int); }; -struct dJntColData_c {}; - struct J3DModel {}; +struct dJntColData_c {}; + struct dJntCol_c { /* 80035C8C */ dJntCol_c(); /* 80035CA0 */ void init(fopAc_ac_c*, dJntColData_c const*, J3DModel*, int); @@ -644,7 +644,7 @@ extern "C" void __register_global_object(); /* ############################################################################################## */ /* 80779DFC-80779E00 000000 0004+00 43/43 0/0 0/0 .rodata @4018 */ SECTION_RODATA static f32 const lit_4018 = 100.0f; -COMPILER_STRIP_GATE(80779DFC, &lit_4018); +COMPILER_STRIP_GATE(0x80779DFC, &lit_4018); /* 80779E00-80779E04 000004 0004+00 2/34 0/0 0/0 .rodata @4019 */ SECTION_RODATA static u8 const lit_4019[4] = { @@ -653,7 +653,7 @@ SECTION_RODATA static u8 const lit_4019[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80779E00, &lit_4019); +COMPILER_STRIP_GATE(0x80779E00, &lit_4019); /* 80779E04-80779E0C 000008 0004+04 1/28 0/0 0/0 .rodata @4020 */ SECTION_RODATA static f32 const lit_4020[1 + 1 /* padding */] = { @@ -661,7 +661,7 @@ SECTION_RODATA static f32 const lit_4020[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80779E04, &lit_4020); +COMPILER_STRIP_GATE(0x80779E04, &lit_4020); /* 80779E0C-80779E14 000010 0008+00 0/6 0/0 0/0 .rodata @4021 */ #pragma push @@ -669,7 +669,7 @@ COMPILER_STRIP_GATE(80779E04, &lit_4020); SECTION_RODATA static u8 const lit_4021[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80779E0C, &lit_4021); +COMPILER_STRIP_GATE(0x80779E0C, &lit_4021); #pragma pop /* 80779E14-80779E1C 000018 0008+00 0/6 0/0 0/0 .rodata @4022 */ @@ -678,7 +678,7 @@ COMPILER_STRIP_GATE(80779E0C, &lit_4021); SECTION_RODATA static u8 const lit_4022[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80779E14, &lit_4022); +COMPILER_STRIP_GATE(0x80779E14, &lit_4022); #pragma pop /* 80779E1C-80779E24 000020 0008+00 0/6 0/0 0/0 .rodata @4023 */ @@ -687,102 +687,102 @@ COMPILER_STRIP_GATE(80779E14, &lit_4022); SECTION_RODATA static u8 const lit_4023[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80779E1C, &lit_4023); +COMPILER_STRIP_GATE(0x80779E1C, &lit_4023); #pragma pop /* 80779E24-80779E28 000028 0004+00 0/1 0/0 0/0 .rodata @4024 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4024 = 1.0f / 100.0f; -COMPILER_STRIP_GATE(80779E24, &lit_4024); +COMPILER_STRIP_GATE(0x80779E24, &lit_4024); #pragma pop /* 80779E28-80779E2C 00002C 0004+00 0/1 0/0 0/0 .rodata @4039 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4039 = 6.0f / 5.0f; -COMPILER_STRIP_GATE(80779E28, &lit_4039); +COMPILER_STRIP_GATE(0x80779E28, &lit_4039); #pragma pop /* 80779E2C-80779E30 000030 0004+00 0/1 0/0 0/0 .rodata @4040 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4040 = 3.5f; -COMPILER_STRIP_GATE(80779E2C, &lit_4040); +COMPILER_STRIP_GATE(0x80779E2C, &lit_4040); #pragma pop /* 80779E30-80779E34 000034 0004+00 0/1 0/0 0/0 .rodata @4041 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4041 = 14.0f; -COMPILER_STRIP_GATE(80779E30, &lit_4041); +COMPILER_STRIP_GATE(0x80779E30, &lit_4041); #pragma pop /* 80779E34-80779E38 000038 0004+00 0/1 0/0 0/0 .rodata @4042 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4042 = 250.0f; -COMPILER_STRIP_GATE(80779E34, &lit_4042); +COMPILER_STRIP_GATE(0x80779E34, &lit_4042); #pragma pop /* 80779E38-80779E3C 00003C 0004+00 0/5 0/0 0/0 .rodata @4043 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4043 = 300.0f; -COMPILER_STRIP_GATE(80779E38, &lit_4043); +COMPILER_STRIP_GATE(0x80779E38, &lit_4043); #pragma pop /* 80779E3C-80779E40 000040 0004+00 0/1 0/0 0/0 .rodata @4044 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4044 = 11.0f / 10.0f; -COMPILER_STRIP_GATE(80779E3C, &lit_4044); +COMPILER_STRIP_GATE(0x80779E3C, &lit_4044); #pragma pop /* 80779E40-80779E44 000044 0004+00 0/2 0/0 0/0 .rodata @4045 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4045 = 1300.0f; -COMPILER_STRIP_GATE(80779E40, &lit_4045); +COMPILER_STRIP_GATE(0x80779E40, &lit_4045); #pragma pop /* 80779E44-80779E48 000048 0004+00 0/2 0/0 0/0 .rodata @4046 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4046 = 2000.0f; -COMPILER_STRIP_GATE(80779E44, &lit_4046); +COMPILER_STRIP_GATE(0x80779E44, &lit_4046); #pragma pop /* 80779E48-80779E4C 00004C 0004+00 0/10 0/0 0/0 .rodata @4047 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4047 = 3.0f; -COMPILER_STRIP_GATE(80779E48, &lit_4047); +COMPILER_STRIP_GATE(0x80779E48, &lit_4047); #pragma pop /* 80779E4C-80779E50 000050 0004+00 0/1 0/0 0/0 .rodata @4048 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4048 = 75.0f; -COMPILER_STRIP_GATE(80779E4C, &lit_4048); +COMPILER_STRIP_GATE(0x80779E4C, &lit_4048); #pragma pop /* 80779E50-80779E54 000054 0004+00 0/13 0/0 0/0 .rodata @4049 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4049 = 5.0f; -COMPILER_STRIP_GATE(80779E50, &lit_4049); +COMPILER_STRIP_GATE(0x80779E50, &lit_4049); #pragma pop /* 80779E54-80779E58 000058 0004+00 1/17 0/0 0/0 .rodata @4050 */ SECTION_RODATA static f32 const lit_4050 = 10.0f; -COMPILER_STRIP_GATE(80779E54, &lit_4050); +COMPILER_STRIP_GATE(0x80779E54, &lit_4050); /* 80779E58-80779E5C 00005C 0004+00 0/1 0/0 0/0 .rodata @4051 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4051 = 33.0f; -COMPILER_STRIP_GATE(80779E58, &lit_4051); +COMPILER_STRIP_GATE(0x80779E58, &lit_4051); #pragma pop /* 8077A0DC-8077A0E8 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ @@ -1365,20 +1365,20 @@ asm daE_RDY_HIO_c::daE_RDY_HIO_c() { /* ############################################################################################## */ /* 80779E5C-80779E60 000060 0004+00 1/8 0/0 0/0 .rodata @4074 */ SECTION_RODATA static f32 const lit_4074 = -1.0f; -COMPILER_STRIP_GATE(80779E5C, &lit_4074); +COMPILER_STRIP_GATE(0x80779E5C, &lit_4074); /* 80779E60-80779E64 000064 0004+00 0/6 0/0 0/0 .rodata @4075 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4075 = 30.0f; -COMPILER_STRIP_GATE(80779E60, &lit_4075); +COMPILER_STRIP_GATE(0x80779E60, &lit_4075); #pragma pop /* 80779E64-80779E6C 000068 0008+00 1/5 0/0 0/0 .rodata @4078 */ SECTION_RODATA static u8 const lit_4078[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80779E64, &lit_4078); +COMPILER_STRIP_GATE(0x80779E64, &lit_4078); /* 8076BE80-8076BF6C 0001A0 00EC+00 23/23 0/0 0/0 .text anm_init__FP11e_rdy_classifUcf */ #pragma push @@ -1393,7 +1393,7 @@ static asm void anm_init(e_rdy_class* param_0, int param_1, f32 param_2, u8 para /* ############################################################################################## */ /* 80779E6C-80779E70 000070 0004+00 1/2 0/0 0/0 .rodata @4246 */ SECTION_RODATA static f32 const lit_4246 = 3.0f / 10.0f; -COMPILER_STRIP_GATE(80779E6C, &lit_4246); +COMPILER_STRIP_GATE(0x80779E6C, &lit_4246); /* 8076BF6C-8076C484 00028C 0518+00 1/1 0/0 0/0 .text nodeCallBack__FP8J3DJointi */ #pragma push @@ -1420,7 +1420,7 @@ static asm void nodeCallBack_bow(J3DJoint* param_0, int param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4408 = 1200.0f; -COMPILER_STRIP_GATE(80779E70, &lit_4408); +COMPILER_STRIP_GATE(0x80779E70, &lit_4408); #pragma pop /* 8076C54C-8076C9D0 00086C 0484+00 1/0 0/0 0/0 .text daE_RDY_Draw__FP11e_rdy_class */ @@ -1436,7 +1436,7 @@ static asm void daE_RDY_Draw(e_rdy_class* param_0) { /* ############################################################################################## */ /* 80779E74-80779E78 000078 0004+00 1/2 0/0 0/0 .rodata @4442 */ SECTION_RODATA static f32 const lit_4442 = 130.0f; -COMPILER_STRIP_GATE(80779E74, &lit_4442); +COMPILER_STRIP_GATE(0x80779E74, &lit_4442); /* 8076C9D0-8076CAA8 000CF0 00D8+00 3/3 0/0 0/0 .text other_bg_check__FP11e_rdy_classP10fopAc_ac_c */ @@ -1589,27 +1589,27 @@ static asm void s_b_sub(void* param_0, void* param_1) { /* ############################################################################################## */ /* 80779E78-80779E7C 00007C 0004+00 1/11 0/0 0/0 .rodata @4576 */ SECTION_RODATA static f32 const lit_4576 = 50.0f; -COMPILER_STRIP_GATE(80779E78, &lit_4576); +COMPILER_STRIP_GATE(0x80779E78, &lit_4576); /* 80779E7C-80779E80 000080 0004+00 0/1 0/0 0/0 .rodata @4577 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4577 = 500.0f; -COMPILER_STRIP_GATE(80779E7C, &lit_4577); +COMPILER_STRIP_GATE(0x80779E7C, &lit_4577); #pragma pop /* 80779E80-80779E84 000084 0004+00 0/1 0/0 0/0 .rodata @4578 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4578 = -125.0f; -COMPILER_STRIP_GATE(80779E80, &lit_4578); +COMPILER_STRIP_GATE(0x80779E80, &lit_4578); #pragma pop /* 80779E84-80779E88 000088 0004+00 0/1 0/0 0/0 .rodata @4579 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4579 = 1500.0f; -COMPILER_STRIP_GATE(80779E84, &lit_4579); +COMPILER_STRIP_GATE(0x80779E84, &lit_4579); #pragma pop /* 8076CB24-8076CE10 000E44 02EC+00 2/2 0/0 0/0 .text search_bomb__FP11e_rdy_classi */ @@ -1645,7 +1645,7 @@ static asm void ride_off(e_rdy_class* param_0) { /* ############################################################################################## */ /* 80779E88-80779E8C 00008C 0004+00 1/4 0/0 0/0 .rodata @4663 */ SECTION_RODATA static f32 const lit_4663 = 10000.0f; -COMPILER_STRIP_GATE(80779E88, &lit_4663); +COMPILER_STRIP_GATE(0x80779E88, &lit_4663); /* 8076D004-8076D114 001324 0110+00 6/6 0/0 0/0 .text pl_check__FP11e_rdy_classfs */ #pragma push @@ -1693,21 +1693,21 @@ static asm void move_gake_check(e_rdy_class* param_0, f32 param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4740 = 65535.0f; -COMPILER_STRIP_GATE(80779E8C, &lit_4740); +COMPILER_STRIP_GATE(0x80779E8C, &lit_4740); #pragma pop /* 80779E90-80779E94 000094 0004+00 0/4 0/0 0/0 .rodata @4741 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4741 = 1000.0f; -COMPILER_STRIP_GATE(80779E90, &lit_4741); +COMPILER_STRIP_GATE(0x80779E90, &lit_4741); #pragma pop /* 80779E94-80779E98 000098 0004+00 0/1 0/0 0/0 .rodata @4742 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4742 = 150.0f; -COMPILER_STRIP_GATE(80779E94, &lit_4742); +COMPILER_STRIP_GATE(0x80779E94, &lit_4742); #pragma pop /* 8076D24C-8076D3C4 00156C 0178+00 1/1 0/0 0/0 .text way_check__FP11e_rdy_class */ @@ -1725,7 +1725,7 @@ static asm void way_check(e_rdy_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4813 = 0.5f; -COMPILER_STRIP_GATE(80779E98, &lit_4813); +COMPILER_STRIP_GATE(0x80779E98, &lit_4813); #pragma pop /* 8077A91C-8077AA1C 0000F4 00FF+01 1/1 0/0 0/0 .bss check_index$4747 */ @@ -1746,21 +1746,21 @@ static asm void path_check(e_rdy_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4901 = 2.0f; -COMPILER_STRIP_GATE(80779E9C, &lit_4901); +COMPILER_STRIP_GATE(0x80779E9C, &lit_4901); #pragma pop /* 80779EA0-80779EA4 0000A4 0004+00 0/7 0/0 0/0 .rodata @4902 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4902 = 200.0f; -COMPILER_STRIP_GATE(80779EA0, &lit_4902); +COMPILER_STRIP_GATE(0x80779EA0, &lit_4902); #pragma pop /* 80779EA4-80779EA8 0000A8 0004+00 0/2 0/0 0/0 .rodata @4903 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4903 = 4000.0f; -COMPILER_STRIP_GATE(80779EA4, &lit_4903); +COMPILER_STRIP_GATE(0x80779EA4, &lit_4903); #pragma pop /* 8076D5F0-8076DA3C 001910 044C+00 1/1 0/0 0/0 .text e_rdy_normal__FP11e_rdy_class */ @@ -1798,49 +1798,49 @@ static asm void at_hit_check(e_rdy_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5011 = 7.0f; -COMPILER_STRIP_GATE(80779EA8, &lit_5011); +COMPILER_STRIP_GATE(0x80779EA8, &lit_5011); #pragma pop /* 80779EAC-80779EB0 0000B0 0004+00 0/4 0/0 0/0 .rodata @5012 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5012 = 15.0f; -COMPILER_STRIP_GATE(80779EAC, &lit_5012); +COMPILER_STRIP_GATE(0x80779EAC, &lit_5012); #pragma pop /* 80779EB0-80779EB4 0000B4 0004+00 0/2 0/0 0/0 .rodata @5013 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5013 = 1.0f / 20.0f; -COMPILER_STRIP_GATE(80779EB0, &lit_5013); +COMPILER_STRIP_GATE(0x80779EB0, &lit_5013); #pragma pop /* 80779EB4-80779EB8 0000B8 0004+00 0/2 0/0 0/0 .rodata @5014 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5014 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(80779EB4, &lit_5014); +COMPILER_STRIP_GATE(0x80779EB4, &lit_5014); #pragma pop /* 80779EB8-80779EBC 0000BC 0004+00 0/9 0/0 0/0 .rodata @5015 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5015 = 20.0f; -COMPILER_STRIP_GATE(80779EB8, &lit_5015); +COMPILER_STRIP_GATE(0x80779EB8, &lit_5015); #pragma pop /* 80779EBC-80779EC0 0000C0 0004+00 0/2 0/0 0/0 .rodata @5138 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5138 = 6.0f; -COMPILER_STRIP_GATE(80779EBC, &lit_5138); +COMPILER_STRIP_GATE(0x80779EBC, &lit_5138); #pragma pop /* 80779EC0-80779EC4 0000C4 0004+00 0/1 0/0 0/0 .rodata @5139 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5139 = 44.0f; -COMPILER_STRIP_GATE(80779EC0, &lit_5139); +COMPILER_STRIP_GATE(0x80779EC0, &lit_5139); #pragma pop /* 8076E06C-8076E418 00238C 03AC+00 1/1 0/0 0/0 .text e_rdy_fight__FP11e_rdy_class */ @@ -1868,21 +1868,21 @@ static asm void e_rdy_bow_run(e_rdy_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5297 = 9.0f / 10.0f; -COMPILER_STRIP_GATE(80779EC4, &lit_5297); +COMPILER_STRIP_GATE(0x80779EC4, &lit_5297); #pragma pop /* 80779EC8-80779ECC 0000CC 0004+00 0/5 0/0 0/0 .rodata @5298 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5298 = 4.0f; -COMPILER_STRIP_GATE(80779EC8, &lit_5298); +COMPILER_STRIP_GATE(0x80779EC8, &lit_5298); #pragma pop /* 80779ECC-80779ED0 0000D0 0004+00 0/2 0/0 0/0 .rodata @5299 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5299 = -100.0f; -COMPILER_STRIP_GATE(80779ECC, &lit_5299); +COMPILER_STRIP_GATE(0x80779ECC, &lit_5299); #pragma pop /* 8076E81C-8076EB4C 002B3C 0330+00 1/1 0/0 0/0 .text e_rdy_bow__FP11e_rdy_class */ @@ -1910,21 +1910,21 @@ static asm void s_command3_sub(void* param_0, void* param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5429 = 60.0f; -COMPILER_STRIP_GATE(80779ED0, &lit_5429); +COMPILER_STRIP_GATE(0x80779ED0, &lit_5429); #pragma pop /* 80779ED4-80779ED8 0000D8 0004+00 0/8 0/0 0/0 .rodata @5430 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5430 = 40.0f; -COMPILER_STRIP_GATE(80779ED4, &lit_5430); +COMPILER_STRIP_GATE(0x80779ED4, &lit_5430); #pragma pop /* 80779ED8-80779EDC 0000DC 0004+00 0/3 0/0 0/0 .rodata @5431 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5431 = -200.0f; -COMPILER_STRIP_GATE(80779ED8, &lit_5431); +COMPILER_STRIP_GATE(0x80779ED8, &lit_5431); #pragma pop /* 8076EBB8-8076F0E0 002ED8 0528+00 1/1 0/0 0/0 .text e_rdy_bow2__FP11e_rdy_class */ @@ -1942,14 +1942,14 @@ static asm void e_rdy_bow2(e_rdy_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5508 = -92938.0f; -COMPILER_STRIP_GATE(80779EDC, &lit_5508); +COMPILER_STRIP_GATE(0x80779EDC, &lit_5508); #pragma pop /* 80779EE0-80779EE4 0000E4 0004+00 0/1 0/0 0/0 .rodata @5509 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5509 = 49992.0f; -COMPILER_STRIP_GATE(80779EE0, &lit_5509); +COMPILER_STRIP_GATE(0x80779EE0, &lit_5509); #pragma pop /* 8076F0E0-8076F438 003400 0358+00 2/1 0/0 0/0 .text e_rdy_bow_ikki2__FP11e_rdy_class */ @@ -1967,49 +1967,49 @@ static asm void e_rdy_bow_ikki2(e_rdy_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5510 = 35000.0f; -COMPILER_STRIP_GATE(80779EE4, &lit_5510); +COMPILER_STRIP_GATE(0x80779EE4, &lit_5510); #pragma pop /* 80779EE8-80779EEC 0000EC 0004+00 0/0 0/0 0/0 .rodata @5511 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5511 = -93658.0f; -COMPILER_STRIP_GATE(80779EE8, &lit_5511); +COMPILER_STRIP_GATE(0x80779EE8, &lit_5511); #pragma pop /* 80779EEC-80779EF0 0000F0 0004+00 0/0 0/0 0/0 .rodata @5512 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5512 = 49894.0f; -COMPILER_STRIP_GATE(80779EEC, &lit_5512); +COMPILER_STRIP_GATE(0x80779EEC, &lit_5512); #pragma pop /* 80779EF0-80779EF4 0000F4 0004+00 0/0 0/0 0/0 .rodata @5513 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5513 = -93666.0f; -COMPILER_STRIP_GATE(80779EF0, &lit_5513); +COMPILER_STRIP_GATE(0x80779EF0, &lit_5513); #pragma pop /* 80779EF4-80779EF8 0000F8 0004+00 0/0 0/0 0/0 .rodata @5514 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5514 = -1000.0f; -COMPILER_STRIP_GATE(80779EF4, &lit_5514); +COMPILER_STRIP_GATE(0x80779EF4, &lit_5514); #pragma pop /* 80779EF8-80779EFC 0000FC 0004+00 0/0 0/0 0/0 .rodata @5515 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5515 = 5400.0f; -COMPILER_STRIP_GATE(80779EF8, &lit_5515); +COMPILER_STRIP_GATE(0x80779EF8, &lit_5515); #pragma pop /* 80779EFC-80779F00 000100 0004+00 0/2 0/0 0/0 .rodata @5553 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5553 = -30.0f; -COMPILER_STRIP_GATE(80779EFC, &lit_5553); +COMPILER_STRIP_GATE(0x80779EFC, &lit_5553); #pragma pop /* 8076F438-8076F59C 003758 0164+00 1/1 0/0 0/0 .text e_rdy_avoid__FP11e_rdy_class */ @@ -2078,56 +2078,56 @@ static asm void e_rdy_s_damage(e_rdy_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5893 = 160.0f; -COMPILER_STRIP_GATE(80779F00, &lit_5893); +COMPILER_STRIP_GATE(0x80779F00, &lit_5893); #pragma pop /* 80779F04-80779F08 000108 0004+00 0/0 0/0 0/0 .rodata @5894 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5894 = 1100.0f; -COMPILER_STRIP_GATE(80779F04, &lit_5894); +COMPILER_STRIP_GATE(0x80779F04, &lit_5894); #pragma pop /* 80779F08-80779F0C 00010C 0004+00 0/0 0/0 0/0 .rodata @5895 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5895 = 1050.0f; -COMPILER_STRIP_GATE(80779F08, &lit_5895); +COMPILER_STRIP_GATE(0x80779F08, &lit_5895); #pragma pop /* 80779F0C-80779F10 000110 0004+00 0/0 0/0 0/0 .rodata @5896 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5896 = -1100.0f; -COMPILER_STRIP_GATE(80779F0C, &lit_5896); +COMPILER_STRIP_GATE(0x80779F0C, &lit_5896); #pragma pop /* 80779F10-80779F14 000114 0004+00 0/0 0/0 0/0 .rodata @5897 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5897 = -27.0f; -COMPILER_STRIP_GATE(80779F10, &lit_5897); +COMPILER_STRIP_GATE(0x80779F10, &lit_5897); #pragma pop /* 80779F14-80779F18 000118 0004+00 0/0 0/0 0/0 .rodata @6168 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6168 = 600.0f; -COMPILER_STRIP_GATE(80779F14, &lit_6168); +COMPILER_STRIP_GATE(0x80779F14, &lit_6168); #pragma pop /* 80779F18-80779F1C 00011C 0004+00 0/2 0/0 0/0 .rodata @6243 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6243 = 70.0f; -COMPILER_STRIP_GATE(80779F18, &lit_6243); +COMPILER_STRIP_GATE(0x80779F18, &lit_6243); #pragma pop /* 80779F1C-80779F20 000120 0004+00 0/1 0/0 0/0 .rodata @6244 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6244 = -150.0f; -COMPILER_STRIP_GATE(80779F1C, &lit_6244); +COMPILER_STRIP_GATE(0x80779F1C, &lit_6244); #pragma pop /* 80770E48-80770FFC 005168 01B4+00 1/1 0/0 0/0 .text kado_check__FP11e_rdy_class */ @@ -2175,7 +2175,7 @@ asm dBgS_ObjGndChk::~dBgS_ObjGndChk() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6634 = 8000.0f; -COMPILER_STRIP_GATE(80779F20, &lit_6634); +COMPILER_STRIP_GATE(0x80779F20, &lit_6634); #pragma pop /* 807712A8-80771DA4 0055C8 0AFC+00 2/1 0/0 0/0 .text e_rdy_damage__FP11e_rdy_class */ @@ -2203,35 +2203,35 @@ static asm void gake_check(e_rdy_class* param_0, f32 param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6635 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(80779F24, &lit_6635); +COMPILER_STRIP_GATE(0x80779F24, &lit_6635); #pragma pop /* 80779F28-80779F2C 00012C 0004+00 0/1 0/0 0/0 .rodata @6636 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6636 = -20.0f; -COMPILER_STRIP_GATE(80779F28, &lit_6636); +COMPILER_STRIP_GATE(0x80779F28, &lit_6636); #pragma pop /* 80779F2C-80779F30 000130 0004+00 0/2 0/0 0/0 .rodata @6637 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6637 = 35.0f; -COMPILER_STRIP_GATE(80779F2C, &lit_6637); +COMPILER_STRIP_GATE(0x80779F2C, &lit_6637); #pragma pop /* 80779F30-80779F34 000134 0004+00 0/1 0/0 0/0 .rodata @6727 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6727 = 350.0f; -COMPILER_STRIP_GATE(80779F30, &lit_6727); +COMPILER_STRIP_GATE(0x80779F30, &lit_6727); #pragma pop /* 80779F34-80779F38 000138 0004+00 0/2 0/0 0/0 .rodata @6728 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6728 = 13.0f / 10.0f; -COMPILER_STRIP_GATE(80779F34, &lit_6728); +COMPILER_STRIP_GATE(0x80779F34, &lit_6728); #pragma pop /* 80771F50-80772128 006270 01D8+00 1/1 0/0 0/0 .text s_bikkuri_sub__FPvPv */ @@ -2279,7 +2279,7 @@ static asm void e_rdy_stand(e_rdy_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6940 = 80.0f; -COMPILER_STRIP_GATE(80779F38, &lit_6940); +COMPILER_STRIP_GATE(0x80779F38, &lit_6940); #pragma pop /* 807726F0-80772B0C 006A10 041C+00 2/1 0/0 0/0 .text e_rdy_bow3__FP11e_rdy_class */ @@ -2337,7 +2337,7 @@ static asm void e_rdy_excite(e_rdy_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7142 = 1.5f; -COMPILER_STRIP_GATE(80779F3C, &lit_7142); +COMPILER_STRIP_GATE(0x80779F3C, &lit_7142); #pragma pop /* 80773474-807735A8 007794 0134+00 1/1 0/0 0/0 .text e_rdy_water__FP11e_rdy_class */ @@ -2375,7 +2375,7 @@ static asm void wolfkick_damage(e_rdy_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7294 = 3000.0f; -COMPILER_STRIP_GATE(80779F40, &lit_7294); +COMPILER_STRIP_GATE(0x80779F40, &lit_7294); #pragma pop /* 80773B24-80773D2C 007E44 0208+00 1/1 0/0 0/0 .text big_damage__FP11e_rdy_class */ @@ -2423,49 +2423,49 @@ static asm void action(e_rdy_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7912 = -5.0f; -COMPILER_STRIP_GATE(80779F44, &lit_7912); +COMPILER_STRIP_GATE(0x80779F44, &lit_7912); #pragma pop /* 80779F48-80779F4C 00014C 0004+00 0/1 0/0 0/0 .rodata @7913 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7913 = -60.0f; -COMPILER_STRIP_GATE(80779F48, &lit_7913); +COMPILER_STRIP_GATE(0x80779F48, &lit_7913); #pragma pop /* 80779F4C-80779F50 000150 0004+00 0/0 0/0 0/0 .rodata @7914 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7914 = 4.5f; -COMPILER_STRIP_GATE(80779F4C, &lit_7914); +COMPILER_STRIP_GATE(0x80779F4C, &lit_7914); #pragma pop /* 80779F50-80779F54 000154 0004+00 0/0 0/0 0/0 .rodata @7915 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7915 = 110.0f; -COMPILER_STRIP_GATE(80779F50, &lit_7915); +COMPILER_STRIP_GATE(0x80779F50, &lit_7915); #pragma pop /* 80779F54-80779F58 000158 0004+00 0/0 0/0 0/0 .rodata @7916 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7916 = 12000.0f; -COMPILER_STRIP_GATE(80779F54, &lit_7916); +COMPILER_STRIP_GATE(0x80779F54, &lit_7916); #pragma pop /* 80779F58-80779F5C 00015C 0004+00 0/1 0/0 0/0 .rodata @7917 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7917 = -1000000000.0f; -COMPILER_STRIP_GATE(80779F58, &lit_7917); +COMPILER_STRIP_GATE(0x80779F58, &lit_7917); #pragma pop /* 80779F5C-80779F60 000160 0004+00 0/1 0/0 0/0 .rodata @7976 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7976 = 90.0f; -COMPILER_STRIP_GATE(80779F5C, &lit_7976); +COMPILER_STRIP_GATE(0x80779F5C, &lit_7976); #pragma pop /* 8077582C-80775A20 009B4C 01F4+00 1/1 0/0 0/0 .text fire_eff_set__FP11e_rdy_class */ @@ -2503,7 +2503,7 @@ static asm void s_adel_sub(void* param_0, void* param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8521 = 55.0f; -COMPILER_STRIP_GATE(80779F60, &lit_8521); +COMPILER_STRIP_GATE(0x80779F60, &lit_8521); #pragma pop /* 80775B50-80777330 009E70 17E0+00 2/1 0/0 0/0 .text demo_camera__FP11e_rdy_class */ @@ -2521,588 +2521,594 @@ static asm void demo_camera(e_rdy_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8522 = -300.0f; -COMPILER_STRIP_GATE(80779F64, &lit_8522); +COMPILER_STRIP_GATE(0x80779F64, &lit_8522); #pragma pop /* 80779F68-80779F6C 00016C 0004+00 0/0 0/0 0/0 .rodata @8523 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8523 = -102687.0f; -COMPILER_STRIP_GATE(80779F68, &lit_8523); +COMPILER_STRIP_GATE(0x80779F68, &lit_8523); #pragma pop /* 80779F6C-80779F70 000170 0004+00 0/0 0/0 0/0 .rodata @8524 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8524 = -23441.5f; -COMPILER_STRIP_GATE(80779F6C, &lit_8524); +COMPILER_STRIP_GATE(0x80779F6C, &lit_8524); #pragma pop /* 80779F70-80779F74 000174 0004+00 0/0 0/0 0/0 .rodata @8525 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8525 = 38942.0f; -COMPILER_STRIP_GATE(80779F70, &lit_8525); +COMPILER_STRIP_GATE(0x80779F70, &lit_8525); #pragma pop /* 80779F74-80779F78 000178 0004+00 0/0 0/0 0/0 .rodata @8526 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8526 = -102677.0f; -COMPILER_STRIP_GATE(80779F74, &lit_8526); +COMPILER_STRIP_GATE(0x80779F74, &lit_8526); #pragma pop /* 80779F78-80779F7C 00017C 0004+00 0/0 0/0 0/0 .rodata @8527 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8527 = -23375.0f; -COMPILER_STRIP_GATE(80779F78, &lit_8527); +COMPILER_STRIP_GATE(0x80779F78, &lit_8527); #pragma pop /* 80779F7C-80779F80 000180 0004+00 0/0 0/0 0/0 .rodata @8528 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8528 = 38866.0f; -COMPILER_STRIP_GATE(80779F7C, &lit_8528); +COMPILER_STRIP_GATE(0x80779F7C, &lit_8528); #pragma pop /* 80779F80-80779F84 000184 0004+00 0/0 0/0 0/0 .rodata @8529 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8529 = -102392.0f; -COMPILER_STRIP_GATE(80779F80, &lit_8529); +COMPILER_STRIP_GATE(0x80779F80, &lit_8529); #pragma pop /* 80779F84-80779F88 000188 0004+00 0/0 0/0 0/0 .rodata @8530 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8530 = -23393.0f; -COMPILER_STRIP_GATE(80779F84, &lit_8530); +COMPILER_STRIP_GATE(0x80779F84, &lit_8530); #pragma pop /* 80779F88-80779F8C 00018C 0004+00 0/0 0/0 0/0 .rodata @8531 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8531 = 39031.0f; -COMPILER_STRIP_GATE(80779F88, &lit_8531); +COMPILER_STRIP_GATE(0x80779F88, &lit_8531); #pragma pop /* 80779F8C-80779F90 000190 0004+00 0/0 0/0 0/0 .rodata @8532 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8532 = -102520.0f; -COMPILER_STRIP_GATE(80779F8C, &lit_8532); +COMPILER_STRIP_GATE(0x80779F8C, &lit_8532); #pragma pop /* 80779F90-80779F94 000194 0004+00 0/0 0/0 0/0 .rodata @8533 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8533 = -23416.0f; -COMPILER_STRIP_GATE(80779F90, &lit_8533); +COMPILER_STRIP_GATE(0x80779F90, &lit_8533); #pragma pop /* 80779F94-80779F98 000198 0004+00 0/0 0/0 0/0 .rodata @8534 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8534 = 38021.0f; -COMPILER_STRIP_GATE(80779F94, &lit_8534); +COMPILER_STRIP_GATE(0x80779F94, &lit_8534); #pragma pop /* 80779F98-80779F9C 00019C 0004+00 0/1 0/0 0/0 .rodata @8535 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8535 = -50.0f; -COMPILER_STRIP_GATE(80779F98, &lit_8535); +COMPILER_STRIP_GATE(0x80779F98, &lit_8535); #pragma pop /* 80779F9C-80779FA0 0001A0 0004+00 0/0 0/0 0/0 .rodata @8536 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8536 = 420.0f; -COMPILER_STRIP_GATE(80779F9C, &lit_8536); +COMPILER_STRIP_GATE(0x80779F9C, &lit_8536); #pragma pop /* 80779FA0-80779FA4 0001A4 0004+00 0/0 0/0 0/0 .rodata @8537 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8537 = 170.0f; -COMPILER_STRIP_GATE(80779FA0, &lit_8537); +COMPILER_STRIP_GATE(0x80779FA0, &lit_8537); #pragma pop /* 80779FA4-80779FA8 0001A8 0004+00 0/0 0/0 0/0 .rodata @8538 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8538 = 3.0f / 100.0f; -COMPILER_STRIP_GATE(80779FA4, &lit_8538); +COMPILER_STRIP_GATE(0x80779FA4, &lit_8538); #pragma pop /* 80779FA8-80779FAC 0001AC 0004+00 0/0 0/0 0/0 .rodata @8539 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8539 = 210.0f; -COMPILER_STRIP_GATE(80779FA8, &lit_8539); +COMPILER_STRIP_GATE(0x80779FA8, &lit_8539); #pragma pop /* 80779FAC-80779FB0 0001B0 0004+00 0/0 0/0 0/0 .rodata @8540 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8540 = 400.0f; -COMPILER_STRIP_GATE(80779FAC, &lit_8540); +COMPILER_STRIP_GATE(0x80779FAC, &lit_8540); #pragma pop /* 80779FB0-80779FB4 0001B4 0004+00 0/0 0/0 0/0 .rodata @8541 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8541 = -350.0f; -COMPILER_STRIP_GATE(80779FB0, &lit_8541); +COMPILER_STRIP_GATE(0x80779FB0, &lit_8541); #pragma pop /* 80779FB4-80779FB8 0001B8 0004+00 0/1 0/0 0/0 .rodata @8542 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8542 = 1.0f / 50.0f; -COMPILER_STRIP_GATE(80779FB4, &lit_8542); +COMPILER_STRIP_GATE(0x80779FB4, &lit_8542); #pragma pop /* 80779FB8-80779FBC 0001BC 0004+00 0/0 0/0 0/0 .rodata @8543 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8543 = -93806.0f; -COMPILER_STRIP_GATE(80779FB8, &lit_8543); +COMPILER_STRIP_GATE(0x80779FB8, &lit_8543); #pragma pop /* 80779FBC-80779FC0 0001C0 0004+00 0/0 0/0 0/0 .rodata @8544 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8544 = -5894.0f; -COMPILER_STRIP_GATE(80779FBC, &lit_8544); +COMPILER_STRIP_GATE(0x80779FBC, &lit_8544); #pragma pop /* 80779FC0-80779FC4 0001C4 0004+00 0/0 0/0 0/0 .rodata @8545 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8545 = 42791.0f; -COMPILER_STRIP_GATE(80779FC0, &lit_8545); +COMPILER_STRIP_GATE(0x80779FC0, &lit_8545); #pragma pop /* 80779FC4-80779FC8 0001C8 0004+00 0/0 0/0 0/0 .rodata @8546 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8546 = -93532.0f; -COMPILER_STRIP_GATE(80779FC4, &lit_8546); +COMPILER_STRIP_GATE(0x80779FC4, &lit_8546); #pragma pop /* 80779FC8-80779FCC 0001CC 0004+00 0/0 0/0 0/0 .rodata @8547 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8547 = -5824.0f; -COMPILER_STRIP_GATE(80779FC8, &lit_8547); +COMPILER_STRIP_GATE(0x80779FC8, &lit_8547); #pragma pop /* 80779FCC-80779FD0 0001D0 0004+00 0/0 0/0 0/0 .rodata @8548 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8548 = 43075.0f; -COMPILER_STRIP_GATE(80779FCC, &lit_8548); +COMPILER_STRIP_GATE(0x80779FCC, &lit_8548); #pragma pop /* 80779FD0-80779FD4 0001D4 0004+00 0/0 0/0 0/0 .rodata @8549 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8549 = -93705.0f; -COMPILER_STRIP_GATE(80779FD0, &lit_8549); +COMPILER_STRIP_GATE(0x80779FD0, &lit_8549); #pragma pop /* 80779FD4-80779FD8 0001D8 0004+00 0/0 0/0 0/0 .rodata @8550 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8550 = -5951.0f; -COMPILER_STRIP_GATE(80779FD4, &lit_8550); +COMPILER_STRIP_GATE(0x80779FD4, &lit_8550); #pragma pop /* 80779FD8-80779FDC 0001DC 0004+00 0/0 0/0 0/0 .rodata @8551 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8551 = 42867.0f; -COMPILER_STRIP_GATE(80779FD8, &lit_8551); +COMPILER_STRIP_GATE(0x80779FD8, &lit_8551); #pragma pop /* 80779FDC-80779FE0 0001E0 0004+00 0/0 0/0 0/0 .rodata @8552 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8552 = -93860.0f; -COMPILER_STRIP_GATE(80779FDC, &lit_8552); +COMPILER_STRIP_GATE(0x80779FDC, &lit_8552); #pragma pop /* 80779FE0-80779FE4 0001E4 0004+00 0/0 0/0 0/0 .rodata @8553 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8553 = -5786.0f; -COMPILER_STRIP_GATE(80779FE0, &lit_8553); +COMPILER_STRIP_GATE(0x80779FE0, &lit_8553); #pragma pop /* 80779FE4-80779FE8 0001E8 0004+00 0/0 0/0 0/0 .rodata @8554 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8554 = 42701.0f; -COMPILER_STRIP_GATE(80779FE4, &lit_8554); +COMPILER_STRIP_GATE(0x80779FE4, &lit_8554); #pragma pop /* 80779FE8-80779FEC 0001EC 0004+00 0/0 0/0 0/0 .rodata @8555 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8555 = -93644.0f; -COMPILER_STRIP_GATE(80779FE8, &lit_8555); +COMPILER_STRIP_GATE(0x80779FE8, &lit_8555); #pragma pop /* 80779FEC-80779FF0 0001F0 0004+00 0/0 0/0 0/0 .rodata @8556 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8556 = -5908.0f; -COMPILER_STRIP_GATE(80779FEC, &lit_8556); +COMPILER_STRIP_GATE(0x80779FEC, &lit_8556); #pragma pop /* 80779FF0-80779FF4 0001F4 0004+00 0/0 0/0 0/0 .rodata @8557 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8557 = 43016.0f; -COMPILER_STRIP_GATE(80779FF0, &lit_8557); +COMPILER_STRIP_GATE(0x80779FF0, &lit_8557); #pragma pop /* 80779FF4-80779FF8 0001F8 0004+00 0/0 0/0 0/0 .rodata @8558 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8558 = -93614.0f; -COMPILER_STRIP_GATE(80779FF4, &lit_8558); +COMPILER_STRIP_GATE(0x80779FF4, &lit_8558); #pragma pop /* 80779FF8-80779FFC 0001FC 0004+00 0/0 0/0 0/0 .rodata @8559 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8559 = -5879.0f; -COMPILER_STRIP_GATE(80779FF8, &lit_8559); +COMPILER_STRIP_GATE(0x80779FF8, &lit_8559); #pragma pop /* 80779FFC-8077A000 000200 0004+00 0/0 0/0 0/0 .rodata @8560 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8560 = 43003.0f; -COMPILER_STRIP_GATE(80779FFC, &lit_8560); +COMPILER_STRIP_GATE(0x80779FFC, &lit_8560); #pragma pop /* 8077A000-8077A004 000204 0004+00 0/0 0/0 0/0 .rodata @8561 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8561 = -93593.0f; -COMPILER_STRIP_GATE(8077A000, &lit_8561); +COMPILER_STRIP_GATE(0x8077A000, &lit_8561); #pragma pop /* 8077A004-8077A008 000208 0004+00 0/0 0/0 0/0 .rodata @8562 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8562 = -5871.0f; -COMPILER_STRIP_GATE(8077A004, &lit_8562); +COMPILER_STRIP_GATE(0x8077A004, &lit_8562); #pragma pop /* 8077A008-8077A00C 00020C 0004+00 0/0 0/0 0/0 .rodata @8563 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8563 = 42603.0f; -COMPILER_STRIP_GATE(8077A008, &lit_8563); +COMPILER_STRIP_GATE(0x8077A008, &lit_8563); #pragma pop /* 8077A00C-8077A010 000210 0004+00 0/0 0/0 0/0 .rodata @8564 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8564 = -93660.0f; -COMPILER_STRIP_GATE(8077A00C, &lit_8564); +COMPILER_STRIP_GATE(0x8077A00C, &lit_8564); #pragma pop /* 8077A010-8077A014 000214 0004+00 0/0 0/0 0/0 .rodata @8565 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8565 = -5873.0f; -COMPILER_STRIP_GATE(8077A010, &lit_8565); +COMPILER_STRIP_GATE(0x8077A010, &lit_8565); #pragma pop /* 8077A014-8077A018 000218 0004+00 0/0 0/0 0/0 .rodata @8566 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8566 = 49831.0f; -COMPILER_STRIP_GATE(8077A014, &lit_8566); +COMPILER_STRIP_GATE(0x8077A014, &lit_8566); #pragma pop /* 8077A018-8077A01C 00021C 0004+00 0/0 0/0 0/0 .rodata @8567 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8567 = -93551.0f; -COMPILER_STRIP_GATE(8077A018, &lit_8567); +COMPILER_STRIP_GATE(0x8077A018, &lit_8567); #pragma pop /* 8077A01C-8077A020 000220 0004+00 0/0 0/0 0/0 .rodata @8568 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8568 = -5926.0f; -COMPILER_STRIP_GATE(8077A01C, &lit_8568); +COMPILER_STRIP_GATE(0x8077A01C, &lit_8568); #pragma pop /* 8077A020-8077A024 000224 0004+00 0/0 0/0 0/0 .rodata @8569 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8569 = 49449.0f; -COMPILER_STRIP_GATE(8077A020, &lit_8569); +COMPILER_STRIP_GATE(0x8077A020, &lit_8569); #pragma pop /* 8077A024-8077A028 000228 0004+00 0/0 0/0 0/0 .rodata @8570 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8570 = -92666.0f; -COMPILER_STRIP_GATE(8077A024, &lit_8570); +COMPILER_STRIP_GATE(0x8077A024, &lit_8570); #pragma pop /* 8077A028-8077A02C 00022C 0004+00 0/0 0/0 0/0 .rodata @8571 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8571 = -5540.0f; -COMPILER_STRIP_GATE(8077A028, &lit_8571); +COMPILER_STRIP_GATE(0x8077A028, &lit_8571); #pragma pop /* 8077A02C-8077A030 000230 0004+00 0/0 0/0 0/0 .rodata @8572 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8572 = 43878.0f; -COMPILER_STRIP_GATE(8077A02C, &lit_8572); +COMPILER_STRIP_GATE(0x8077A02C, &lit_8572); #pragma pop /* 8077A030-8077A034 000234 0004+00 0/0 0/0 0/0 .rodata @8573 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8573 = 39000.0f; -COMPILER_STRIP_GATE(8077A030, &lit_8573); +COMPILER_STRIP_GATE(0x8077A030, &lit_8573); #pragma pop /* 8077A034-8077A038 000238 0004+00 0/0 0/0 0/0 .rodata @8574 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8574 = -93539.0f; -COMPILER_STRIP_GATE(8077A034, &lit_8574); +COMPILER_STRIP_GATE(0x8077A034, &lit_8574); #pragma pop /* 8077A038-8077A03C 00023C 0004+00 0/0 0/0 0/0 .rodata @8575 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8575 = -5857.0f; -COMPILER_STRIP_GATE(8077A038, &lit_8575); +COMPILER_STRIP_GATE(0x8077A038, &lit_8575); #pragma pop /* 8077A03C-8077A040 000240 0004+00 0/0 0/0 0/0 .rodata @8576 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8576 = 30480.0f; -COMPILER_STRIP_GATE(8077A03C, &lit_8576); +COMPILER_STRIP_GATE(0x8077A03C, &lit_8576); #pragma pop /* 8077A040-8077A044 000244 0004+00 0/0 0/0 0/0 .rodata @8577 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8577 = -4469.0f; -COMPILER_STRIP_GATE(8077A040, &lit_8577); +COMPILER_STRIP_GATE(0x8077A040, &lit_8577); #pragma pop /* 8077A044-8077A048 000248 0004+00 0/0 0/0 0/0 .rodata @8578 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8578 = -92006.0f; -COMPILER_STRIP_GATE(8077A044, &lit_8578); +COMPILER_STRIP_GATE(0x8077A044, &lit_8578); #pragma pop /* 8077A048-8077A04C 00024C 0004+00 0/1 0/0 0/0 .rodata @8579 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8579 = 30000.0f; -COMPILER_STRIP_GATE(8077A048, &lit_8579); +COMPILER_STRIP_GATE(0x8077A048, &lit_8579); #pragma pop /* 8077A04C-8077A050 000250 0004+00 0/0 0/0 0/0 .rodata @8580 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8580 = -92787.0f; -COMPILER_STRIP_GATE(8077A04C, &lit_8580); +COMPILER_STRIP_GATE(0x8077A04C, &lit_8580); #pragma pop /* 8077A050-8077A054 000254 0004+00 0/0 0/0 0/0 .rodata @8581 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8581 = -5256.0f; -COMPILER_STRIP_GATE(8077A050, &lit_8581); +COMPILER_STRIP_GATE(0x8077A050, &lit_8581); #pragma pop /* 8077A054-8077A058 000258 0004+00 0/0 0/0 0/0 .rodata @8582 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8582 = 46550.0f; -COMPILER_STRIP_GATE(8077A054, &lit_8582); +COMPILER_STRIP_GATE(0x8077A054, &lit_8582); #pragma pop /* 8077A058-8077A05C 00025C 0004+00 0/0 0/0 0/0 .rodata @8583 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8583 = -92609.0f; -COMPILER_STRIP_GATE(8077A058, &lit_8583); +COMPILER_STRIP_GATE(0x8077A058, &lit_8583); #pragma pop /* 8077A05C-8077A060 000260 0004+00 0/0 0/0 0/0 .rodata @8584 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8584 = -5139.0f; -COMPILER_STRIP_GATE(8077A05C, &lit_8584); +COMPILER_STRIP_GATE(0x8077A05C, &lit_8584); #pragma pop /* 8077A060-8077A064 000264 0004+00 0/0 0/0 0/0 .rodata @8585 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8585 = 46210.0f; -COMPILER_STRIP_GATE(8077A060, &lit_8585); +COMPILER_STRIP_GATE(0x8077A060, &lit_8585); #pragma pop /* 8077A064-8077A068 000268 0004+00 0/0 0/0 0/0 .rodata @8586 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8586 = -103242.0f; -COMPILER_STRIP_GATE(8077A064, &lit_8586); +COMPILER_STRIP_GATE(0x8077A064, &lit_8586); #pragma pop /* 8077A068-8077A06C 00026C 0004+00 0/0 0/0 0/0 .rodata @8587 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8587 = -22894.0f; -COMPILER_STRIP_GATE(8077A068, &lit_8587); +COMPILER_STRIP_GATE(0x8077A068, &lit_8587); #pragma pop /* 8077A06C-8077A070 000270 0004+00 0/0 0/0 0/0 .rodata @8588 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8588 = 38097.0f; -COMPILER_STRIP_GATE(8077A06C, &lit_8588); +COMPILER_STRIP_GATE(0x8077A06C, &lit_8588); #pragma pop /* 8077A070-8077A074 000274 0004+00 0/0 0/0 0/0 .rodata @8589 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8589 = -93652.0f; -COMPILER_STRIP_GATE(8077A070, &lit_8589); +COMPILER_STRIP_GATE(0x8077A070, &lit_8589); #pragma pop /* 8077A074-8077A078 000278 0004+00 0/0 0/0 0/0 .rodata @8590 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8590 = -5875.0f; -COMPILER_STRIP_GATE(8077A074, &lit_8590); +COMPILER_STRIP_GATE(0x8077A074, &lit_8590); #pragma pop /* 8077A078-8077A07C 00027C 0004+00 0/0 0/0 0/0 .rodata @8591 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8591 = 46674.0f; -COMPILER_STRIP_GATE(8077A078, &lit_8591); +COMPILER_STRIP_GATE(0x8077A078, &lit_8591); #pragma pop /* 8077A07C-8077A080 000280 0004+00 0/0 0/0 0/0 .rodata @8592 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8592 = -93659.0f; -COMPILER_STRIP_GATE(8077A07C, &lit_8592); +COMPILER_STRIP_GATE(0x8077A07C, &lit_8592); #pragma pop /* 8077A080-8077A084 000284 0004+00 0/0 0/0 0/0 .rodata @8593 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8593 = 32500.0f; -COMPILER_STRIP_GATE(8077A080, &lit_8593); +COMPILER_STRIP_GATE(0x8077A080, &lit_8593); #pragma pop /* 8077A084-8077A088 000288 0004+00 0/0 0/0 0/0 .rodata @8594 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8594 = -250.0f; -COMPILER_STRIP_GATE(8077A084, &lit_8594); +COMPILER_STRIP_GATE(0x8077A084, &lit_8594); #pragma pop /* 8077A088-8077A08C 00028C 0004+00 0/0 0/0 0/0 .rodata @8595 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8595 = 120.0f; -COMPILER_STRIP_GATE(8077A088, &lit_8595); +COMPILER_STRIP_GATE(0x8077A088, &lit_8595); #pragma pop /* 8077A08C-8077A090 000290 0004+00 0/1 0/0 0/0 .rodata @9184 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9184 = -1.0f / 20.0f; -COMPILER_STRIP_GATE(8077A08C, &lit_9184); +COMPILER_STRIP_GATE(0x8077A08C, &lit_9184); #pragma pop /* 8077A090-8077A094 000294 0004+00 0/1 0/0 0/0 .rodata @9185 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9185 = 38.0f; -COMPILER_STRIP_GATE(8077A090, &lit_9185); +COMPILER_STRIP_GATE(0x8077A090, &lit_9185); #pragma pop /* 8077A094-8077A098 000298 0004+00 0/1 0/0 0/0 .rodata @9186 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_9186 = 0x3A83126F; -COMPILER_STRIP_GATE(8077A094, &lit_9186); +COMPILER_STRIP_GATE(0x8077A094, &lit_9186); #pragma pop /* 8077A098-8077A09C 00029C 0004+00 0/1 0/0 0/0 .rodata @9187 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9187 = -6.0f; -COMPILER_STRIP_GATE(8077A098, &lit_9187); +COMPILER_STRIP_GATE(0x8077A098, &lit_9187); #pragma pop /* 8077A09C-8077A0A0 0002A0 0004+00 0/1 0/0 0/0 .rodata @9188 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9188 = -20000.0f; -COMPILER_STRIP_GATE(8077A09C, &lit_9188); +COMPILER_STRIP_GATE(0x8077A09C, &lit_9188); #pragma pop /* 8077A0A0-8077A0A4 0002A4 0004+00 0/1 0/0 0/0 .rodata @9189 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9189 = 200000.0f; -COMPILER_STRIP_GATE(8077A0A0, &lit_9189); +COMPILER_STRIP_GATE(0x8077A0A0, &lit_9189); #pragma pop /* 8077A0A4-8077A0A8 0002A8 0004+00 0/1 0/0 0/0 .rodata @9190 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9190 = -10.0f; -COMPILER_STRIP_GATE(8077A0A4, &lit_9190); +COMPILER_STRIP_GATE(0x8077A0A4, &lit_9190); #pragma pop /* 8077A0A8-8077A0AC 0002AC 0004+00 0/1 0/0 0/0 .rodata @9191 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9191 = -200000.0f; -COMPILER_STRIP_GATE(8077A0A8, &lit_9191); +COMPILER_STRIP_GATE(0x8077A0A8, &lit_9191); #pragma pop /* 8077A0AC-8077A0B0 0002B0 0004+00 0/1 0/0 0/0 .rodata @9192 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9192 = -500.0f; -COMPILER_STRIP_GATE(8077A0AC, &lit_9192); +COMPILER_STRIP_GATE(0x8077A0AC, &lit_9192); #pragma pop /* 8077A0B0-8077A0B4 0002B4 0004+00 0/1 0/0 0/0 .rodata @9193 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9193 = 2.0f / 5.0f; -COMPILER_STRIP_GATE(8077A0B0, &lit_9193); +COMPILER_STRIP_GATE(0x8077A0B0, &lit_9193); +#pragma pop + +/* 8077A0BC-8077A0BC 0002C0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8077A0BC = "F_SP121"; #pragma pop /* 8077AA1C-8077AA24 0001F4 0004+04 0/2 0/0 0/0 .bss c_start */ @@ -3137,6 +3143,13 @@ static asm void daE_RDY_Delete(e_rdy_class* param_0) { } #pragma pop +/* ############################################################################################## */ +/* 8077A0BC-8077A0BC 0002C0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8077A0C4 = "J_Tobi"; +#pragma pop + /* 80778998-80778D90 00CCB8 03F8+00 1/1 0/0 0/0 .text useHeapInit__FP10fopAc_ac_c */ #pragma push #pragma optimization_level 0 @@ -3152,14 +3165,21 @@ static asm void useHeapInit(fopAc_ac_c* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9541 = 5000.0f; -COMPILER_STRIP_GATE(8077A0B4, &lit_9541); +COMPILER_STRIP_GATE(0x8077A0B4, &lit_9541); #pragma pop /* 8077A0B8-8077A0BC 0002BC 0004+00 0/1 0/0 0/0 .rodata @9542 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9542 = 100000.0f; -COMPILER_STRIP_GATE(8077A0B8, &lit_9542); +COMPILER_STRIP_GATE(0x8077A0B8, &lit_9542); +#pragma pop + +/* 8077A0BC-8077A0BC 0002C0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8077A0CB = "E_rdy"; +SECTION_DEAD static char const* const stringBase_8077A0D1 = "F_SP115"; #pragma pop /* 80778D90-80779340 00D0B0 05B0+00 1/0 0/0 0/0 .text daE_RDY_Create__FP10fopAc_ac_c */ @@ -3299,7 +3319,7 @@ asm void __sinit_d_a_e_rdy_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_807798C8 = (void*)__sinit_d_a_e_rdy_cpp; +REGISTER_CTORS(0x807798C8, __sinit_d_a_e_rdy_cpp); #pragma pop /* 80779920-80779928 00DC40 0008+00 1/0 0/0 0/0 .text @20@__dt__14dBgS_ObjGndChkFv */ @@ -3566,12 +3586,4 @@ static u8 data_8077AA80[4]; static u8 data_8077AA84[4]; #pragma pop -/* 8077A0BC-8077A0D9 0002C0 001D+00 3/3 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_8077A0BC = "F_SP121"; -SECTION_DEAD static char const* const stringBase_8077A0C4 = "J_Tobi"; -SECTION_DEAD static char const* const stringBase_8077A0CB = "E_rdy"; -SECTION_DEAD static char const* const stringBase_8077A0D1 = "F_SP115"; -#pragma pop +/* 8077A0BC-8077A0BC 0002C0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/e/d_a_e_s1/d_a_e_s1.cpp b/rel/d/a/e/d_a_e_s1/d_a_e_s1.cpp index f5e1d29d59e..199ad3af056 100644 --- a/rel/d/a/e/d_a_e_s1/d_a_e_s1.cpp +++ b/rel/d/a/e/d_a_e_s1/d_a_e_s1.cpp @@ -24,16 +24,16 @@ struct mDoMtx_stack_c { static u8 now[48]; }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; - struct J3DAnmTransform {}; +struct J3DModelData {}; + +struct Z2Creature {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -132,10 +132,10 @@ struct dPa_control_c { _GXColor const*, cXyz const*, f32); }; -struct dJntColData_c {}; - struct J3DModel {}; +struct dJntColData_c {}; + struct dJntCol_c { /* 80035C8C */ dJntCol_c(); /* 80035CA0 */ void init(fopAc_ac_c*, dJntColData_c const*, J3DModel*, int); @@ -511,7 +511,7 @@ extern "C" void __register_global_object(); /* ############################################################################################## */ /* 80780DC4-80780DC8 000000 0004+00 25/25 0/0 0/0 .rodata @3903 */ SECTION_RODATA static f32 const lit_3903 = 100.0f; -COMPILER_STRIP_GATE(80780DC4, &lit_3903); +COMPILER_STRIP_GATE(0x80780DC4, &lit_3903); /* 80780DC8-80780DCC 000004 0004+00 3/21 0/0 0/0 .rodata @3904 */ SECTION_RODATA static u8 const lit_3904[4] = { @@ -520,7 +520,7 @@ SECTION_RODATA static u8 const lit_3904[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80780DC8, &lit_3904); +COMPILER_STRIP_GATE(0x80780DC8, &lit_3904); /* 80780DCC-80780DD4 000008 0004+04 3/21 0/0 0/0 .rodata @3905 */ SECTION_RODATA static f32 const lit_3905[1 + 1 /* padding */] = { @@ -528,7 +528,7 @@ SECTION_RODATA static f32 const lit_3905[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80780DCC, &lit_3905); +COMPILER_STRIP_GATE(0x80780DCC, &lit_3905); /* 80780DD4-80780DDC 000010 0008+00 0/1 0/0 0/0 .rodata @3906 */ #pragma push @@ -536,7 +536,7 @@ COMPILER_STRIP_GATE(80780DCC, &lit_3905); SECTION_RODATA static u8 const lit_3906[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80780DD4, &lit_3906); +COMPILER_STRIP_GATE(0x80780DD4, &lit_3906); #pragma pop /* 80780DDC-80780DE4 000018 0008+00 0/1 0/0 0/0 .rodata @3907 */ @@ -545,7 +545,7 @@ COMPILER_STRIP_GATE(80780DD4, &lit_3906); SECTION_RODATA static u8 const lit_3907[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80780DDC, &lit_3907); +COMPILER_STRIP_GATE(0x80780DDC, &lit_3907); #pragma pop /* 80780DE4-80780DEC 000020 0008+00 0/1 0/0 0/0 .rodata @3908 */ @@ -554,53 +554,53 @@ COMPILER_STRIP_GATE(80780DDC, &lit_3907); SECTION_RODATA static u8 const lit_3908[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80780DE4, &lit_3908); +COMPILER_STRIP_GATE(0x80780DE4, &lit_3908); #pragma pop /* 80780DEC-80780DF0 000028 0004+00 0/1 0/0 0/0 .rodata @3909 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3909 = 1.0f / 100.0f; -COMPILER_STRIP_GATE(80780DEC, &lit_3909); +COMPILER_STRIP_GATE(0x80780DEC, &lit_3909); #pragma pop /* 80780DF0-80780DF4 00002C 0004+00 0/2 0/0 0/0 .rodata @3924 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3924 = 13.0f / 10.0f; -COMPILER_STRIP_GATE(80780DF0, &lit_3924); +COMPILER_STRIP_GATE(0x80780DF0, &lit_3924); #pragma pop /* 80780DF4-80780DF8 000030 0004+00 0/3 0/0 0/0 .rodata @3925 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3925 = 4.0f; -COMPILER_STRIP_GATE(80780DF4, &lit_3925); +COMPILER_STRIP_GATE(0x80780DF4, &lit_3925); #pragma pop /* 80780DF8-80780DFC 000034 0004+00 1/5 0/0 0/0 .rodata @3926 */ SECTION_RODATA static f32 const lit_3926 = 20.0f; -COMPILER_STRIP_GATE(80780DF8, &lit_3926); +COMPILER_STRIP_GATE(0x80780DF8, &lit_3926); /* 80780DFC-80780E00 000038 0004+00 0/4 0/0 0/0 .rodata @3927 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3927 = 300.0f; -COMPILER_STRIP_GATE(80780DFC, &lit_3927); +COMPILER_STRIP_GATE(0x80780DFC, &lit_3927); #pragma pop /* 80780E00-80780E04 00003C 0004+00 0/1 0/0 0/0 .rodata @3928 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3928 = 700.0f; -COMPILER_STRIP_GATE(80780E00, &lit_3928); +COMPILER_STRIP_GATE(0x80780E00, &lit_3928); #pragma pop /* 80780E04-80780E08 000040 0004+00 0/1 0/0 0/0 .rodata @3929 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3929 = 90.0f; -COMPILER_STRIP_GATE(80780E04, &lit_3929); +COMPILER_STRIP_GATE(0x80780E04, &lit_3929); #pragma pop /* 80780FA8-80780FB4 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ @@ -897,7 +897,13 @@ asm daE_S1_HIO_c::daE_S1_HIO_c() { /* ############################################################################################## */ /* 80780E08-80780E0C 000044 0004+00 1/1 0/0 0/0 .rodata @3943 */ SECTION_RODATA static f32 const lit_3943 = -1.0f; -COMPILER_STRIP_GATE(80780E08, &lit_3943); +COMPILER_STRIP_GATE(0x80780E08, &lit_3943); + +/* 80780F74-80780F74 0001B0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80780F74 = "E_S2"; +#pragma pop /* 8077ABF8-8077ACA4 000158 00AC+00 12/12 0/0 0/0 .text anm_init__FP10e_s1_classifUcf */ #pragma push @@ -914,7 +920,7 @@ static asm void anm_init(e_s1_class* param_0, int param_1, f32 param_2, u8 param #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3989 = 1300.0f; -COMPILER_STRIP_GATE(80780E0C, &lit_3989); +COMPILER_STRIP_GATE(0x80780E0C, &lit_3989); #pragma pop /* 8077ACA4-8077AE38 000204 0194+00 1/0 0/0 0/0 .text daE_S1_Draw__FP10e_s1_class */ @@ -950,20 +956,20 @@ static asm void pl_at_check(e_s1_class* param_0, f32 param_1) { /* ############################################################################################## */ /* 80780E10-80780E14 00004C 0004+00 2/9 0/0 0/0 .rodata @4096 */ SECTION_RODATA static f32 const lit_4096 = 10.0f; -COMPILER_STRIP_GATE(80780E10, &lit_4096); +COMPILER_STRIP_GATE(0x80780E10, &lit_4096); /* 80780E14-80780E18 000050 0004+00 0/9 0/0 0/0 .rodata @4097 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4097 = 50.0f; -COMPILER_STRIP_GATE(80780E14, &lit_4097); +COMPILER_STRIP_GATE(0x80780E14, &lit_4097); #pragma pop /* 80780E18-80780E1C 000054 0004+00 0/3 0/0 0/0 .rodata @4098 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4098 = 0.5f; -COMPILER_STRIP_GATE(80780E18, &lit_4098); +COMPILER_STRIP_GATE(0x80780E18, &lit_4098); #pragma pop /* 80781340-80781344 000008 0001+03 3/3 0/0 0/0 .bss @1109 */ @@ -1111,20 +1117,20 @@ static asm void s_last_sub(void* param_0, void* param_1) { /* ############################################################################################## */ /* 80780E1C-80780E20 000058 0004+00 1/6 0/0 0/0 .rodata @4353 */ SECTION_RODATA static f32 const lit_4353 = 30.0f; -COMPILER_STRIP_GATE(80780E1C, &lit_4353); +COMPILER_STRIP_GATE(0x80780E1C, &lit_4353); /* 80780E20-80780E24 00005C 0004+00 0/1 0/0 0/0 .rodata @4354 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4354 = 65.0f; -COMPILER_STRIP_GATE(80780E20, &lit_4354); +COMPILER_STRIP_GATE(0x80780E20, &lit_4354); #pragma pop /* 80780E24-80780E28 000060 0004+00 0/2 0/0 0/0 .rodata @4355 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4355 = 60.0f; -COMPILER_STRIP_GATE(80780E24, &lit_4355); +COMPILER_STRIP_GATE(0x80780E24, &lit_4355); #pragma pop /* 8077B318-8077B928 000878 0610+00 1/1 0/0 0/0 .text damage_check__FP10e_s1_class */ @@ -1142,7 +1148,7 @@ static asm void damage_check(e_s1_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4428 = 15.0f; -COMPILER_STRIP_GATE(80780E28, &lit_4428); +COMPILER_STRIP_GATE(0x80780E28, &lit_4428); #pragma pop /* 8077B928-8077BC8C 000E88 0364+00 1/1 0/0 0/0 .text e_s1_wait__FP10e_s1_class */ @@ -1162,7 +1168,7 @@ static asm void e_s1_wait(e_s1_class* param_0) { SECTION_RODATA static u8 const lit_4475[8] = { 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80780E2C, &lit_4475); +COMPILER_STRIP_GATE(0x80780E2C, &lit_4475); #pragma pop /* 8077BC8C-8077BEAC 0011EC 0220+00 1/1 0/0 0/0 .text e_s1_roof__FP10e_s1_class */ @@ -1180,14 +1186,14 @@ static asm void e_s1_roof(e_s1_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4501 = 3.0f; -COMPILER_STRIP_GATE(80780E34, &lit_4501); +COMPILER_STRIP_GATE(0x80780E34, &lit_4501); #pragma pop /* 80780E38-80780E3C 000074 0004+00 0/1 0/0 0/0 .rodata @4502 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4502 = 0x3EAA7EFA; -COMPILER_STRIP_GATE(80780E38, &lit_4502); +COMPILER_STRIP_GATE(0x80780E38, &lit_4502); #pragma pop /* 80780E3C-80780E44 000078 0008+00 0/4 0/0 0/0 .rodata @4505 */ @@ -1196,7 +1202,7 @@ COMPILER_STRIP_GATE(80780E38, &lit_4502); SECTION_RODATA static u8 const lit_4505[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80780E3C, &lit_4505); +COMPILER_STRIP_GATE(0x80780E3C, &lit_4505); #pragma pop /* 8077BEAC-8077BFFC 00140C 0150+00 1/1 0/0 0/0 .text e_s1_fight_run__FP10e_s1_class */ @@ -1214,7 +1220,7 @@ static asm void e_s1_fight_run(e_s1_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4568 = 0x3EAAA64C; -COMPILER_STRIP_GATE(80780E44, &lit_4568); +COMPILER_STRIP_GATE(0x80780E44, &lit_4568); #pragma pop /* 8077BFFC-8077C2F8 00155C 02FC+00 1/1 0/0 0/0 .text e_s1_fight__FP10e_s1_class */ @@ -1232,14 +1238,14 @@ static asm void e_s1_fight(e_s1_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4603 = 5.0f; -COMPILER_STRIP_GATE(80780E48, &lit_4603); +COMPILER_STRIP_GATE(0x80780E48, &lit_4603); #pragma pop /* 80780E4C-80780E50 000088 0004+00 0/3 0/0 0/0 .rodata @4604 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4604 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(80780E4C, &lit_4604); +COMPILER_STRIP_GATE(0x80780E4C, &lit_4604); #pragma pop /* 8077C2F8-8077C52C 001858 0234+00 1/1 0/0 0/0 .text e_s1_bibiri__FP10e_s1_class */ @@ -1366,14 +1372,14 @@ static asm void s_posrevise_sub(void* param_0, void* param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4840 = 2.0f; -COMPILER_STRIP_GATE(80780E50, &lit_4840); +COMPILER_STRIP_GATE(0x80780E50, &lit_4840); #pragma pop /* 80780E54-80780E58 000090 0004+00 0/1 0/0 0/0 .rodata @4841 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4841 = 9.0f; -COMPILER_STRIP_GATE(80780E54, &lit_4841); +COMPILER_STRIP_GATE(0x80780E54, &lit_4841); #pragma pop /* 8077CC54-8077CF30 0021B4 02DC+00 1/1 0/0 0/0 .text e_s1_failwait__FP10e_s1_class */ @@ -1386,6 +1392,13 @@ static asm void e_s1_failwait(e_s1_class* param_0) { } #pragma pop +/* ############################################################################################## */ +/* 80780F74-80780F74 0001B0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80780F79 = "D_MN08"; +#pragma pop + /* 8077CF30-8077D448 002490 0518+00 2/1 0/0 0/0 .text e_s1_fail__FP10e_s1_class */ #pragma push #pragma optimization_level 0 @@ -1401,21 +1414,27 @@ static asm void e_s1_fail(e_s1_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4985 = 25.0f; -COMPILER_STRIP_GATE(80780E58, &lit_4985); +COMPILER_STRIP_GATE(0x80780E58, &lit_4985); #pragma pop /* 80780E5C-80780E60 000098 0004+00 0/1 0/0 0/0 .rodata @5043 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5043 = -16000.0f; -COMPILER_STRIP_GATE(80780E5C, &lit_5043); +COMPILER_STRIP_GATE(0x80780E5C, &lit_5043); #pragma pop /* 80780E60-80780E64 00009C 0004+00 0/1 0/0 0/0 .rodata @5044 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5044 = -1000.0f; -COMPILER_STRIP_GATE(80780E60, &lit_5044); +COMPILER_STRIP_GATE(0x80780E60, &lit_5044); +#pragma pop + +/* 80780F74-80780F74 0001B0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80780F80 = "F_SP108"; #pragma pop /* 8077D448-8077D6A0 0029A8 0258+00 1/1 0/0 0/0 .text e_s1_shout__FP10e_s1_class */ @@ -1433,7 +1452,7 @@ static asm void e_s1_shout(e_s1_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5099 = 50000.0f; -COMPILER_STRIP_GATE(80780E64, &lit_5099); +COMPILER_STRIP_GATE(0x80780E64, &lit_5099); #pragma pop /* 8077D6A0-8077D8A8 002C00 0208+00 2/1 0/0 0/0 .text e_s1_warpappear__FP10e_s1_class */ @@ -1451,21 +1470,21 @@ static asm void e_s1_warpappear(e_s1_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5149 = 65536.0f; -COMPILER_STRIP_GATE(80780E68, &lit_5149); +COMPILER_STRIP_GATE(0x80780E68, &lit_5149); #pragma pop /* 80780E6C-80780E70 0000A8 0004+00 0/1 0/0 0/0 .rodata @5150 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5150 = -12.0f; -COMPILER_STRIP_GATE(80780E6C, &lit_5150); +COMPILER_STRIP_GATE(0x80780E6C, &lit_5150); #pragma pop /* 80780E70-80780E74 0000AC 0004+00 0/1 0/0 0/0 .rodata @5151 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5151 = 4.0f / 5.0f; -COMPILER_STRIP_GATE(80780E70, &lit_5151); +COMPILER_STRIP_GATE(0x80780E70, &lit_5151); #pragma pop /* 8077D8A8-8077DBB8 002E08 0310+00 1/1 0/0 0/0 .text ke_control__FP10e_s1_classP7s1_ke_sif */ @@ -1483,21 +1502,21 @@ static asm void ke_control(e_s1_class* param_0, s1_ke_s* param_1, int param_2, f #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5175 = 3.0f / 5.0f; -COMPILER_STRIP_GATE(80780E74, &lit_5175); +COMPILER_STRIP_GATE(0x80780E74, &lit_5175); #pragma pop /* 80780E78-80780E7C 0000B4 0004+00 0/1 0/0 0/0 .rodata @5176 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5176 = 3.5f; -COMPILER_STRIP_GATE(80780E78, &lit_5176); +COMPILER_STRIP_GATE(0x80780E78, &lit_5176); #pragma pop /* 80780E7C-80780E80 0000B8 0004+00 0/1 0/0 0/0 .rodata @5177 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5177 = 9.0f / 5.0f; -COMPILER_STRIP_GATE(80780E7C, &lit_5177); +COMPILER_STRIP_GATE(0x80780E7C, &lit_5177); #pragma pop /* 8077DBB8-8077DC90 003118 00D8+00 1/1 0/0 0/0 .text @@ -1517,7 +1536,7 @@ static asm void ke_move(e_s1_class* param_0, mDoExt_3DlineMat0_c* param_1, s1_ke #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5247 = 250.0f; -COMPILER_STRIP_GATE(80780E80, &lit_5247); +COMPILER_STRIP_GATE(0x80780E80, &lit_5247); #pragma pop /* 8077DC90-8077E070 0031F0 03E0+00 1/1 0/0 0/0 .text e_s1_wolfbite__FP10e_s1_class */ @@ -1545,63 +1564,63 @@ static asm void action(e_s1_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_5373 = 0x43360A3D; -COMPILER_STRIP_GATE(80780E84, &lit_5373); +COMPILER_STRIP_GATE(0x80780E84, &lit_5373); #pragma pop /* 80780E88-80780E8C 0000C4 0004+00 0/1 0/0 0/0 .rodata @5374 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5374 = 40.0f; -COMPILER_STRIP_GATE(80780E88, &lit_5374); +COMPILER_STRIP_GATE(0x80780E88, &lit_5374); #pragma pop /* 80780E8C-80780E90 0000C8 0004+00 0/0 0/0 0/0 .rodata @5375 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5375 = -120.0f; -COMPILER_STRIP_GATE(80780E8C, &lit_5375); +COMPILER_STRIP_GATE(0x80780E8C, &lit_5375); #pragma pop /* 80780E90-80780E94 0000CC 0004+00 0/1 0/0 0/0 .rodata @5376 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5376 = 7.0f; -COMPILER_STRIP_GATE(80780E90, &lit_5376); +COMPILER_STRIP_GATE(0x80780E90, &lit_5376); #pragma pop /* 80780E94-80780E98 0000D0 0004+00 0/1 0/0 0/0 .rodata @5430 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5430 = 2000.0f; -COMPILER_STRIP_GATE(80780E94, &lit_5430); +COMPILER_STRIP_GATE(0x80780E94, &lit_5430); #pragma pop /* 80780E98-80780E9C 0000D4 0004+00 0/1 0/0 0/0 .rodata @5431 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5431 = 7.5f; -COMPILER_STRIP_GATE(80780E98, &lit_5431); +COMPILER_STRIP_GATE(0x80780E98, &lit_5431); #pragma pop /* 80780E9C-80780EA0 0000D8 0004+00 0/1 0/0 0/0 .rodata @5432 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5432 = 2.25f; -COMPILER_STRIP_GATE(80780E9C, &lit_5432); +COMPILER_STRIP_GATE(0x80780E9C, &lit_5432); #pragma pop /* 80780EA0-80780EA4 0000DC 0004+00 0/2 0/0 0/0 .rodata @5433 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5433 = 8.0f; -COMPILER_STRIP_GATE(80780EA0, &lit_5433); +COMPILER_STRIP_GATE(0x80780EA0, &lit_5433); #pragma pop /* 80780EA4-80780EA8 0000E0 0004+00 0/2 0/0 0/0 .rodata @5434 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5434 = 35.0f; -COMPILER_STRIP_GATE(80780EA4, &lit_5434); +COMPILER_STRIP_GATE(0x80780EA4, &lit_5434); #pragma pop /* 8077E618-8077E870 003B78 0258+00 1/1 0/0 0/0 .text ke_set__FP10e_s1_class */ @@ -1619,49 +1638,49 @@ static asm void ke_set(e_s1_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5588 = 55.0f; -COMPILER_STRIP_GATE(80780EA8, &lit_5588); +COMPILER_STRIP_GATE(0x80780EA8, &lit_5588); #pragma pop /* 80780EAC-80780EB0 0000E8 0004+00 0/1 0/0 0/0 .rodata @5589 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5589 = 1200.0f; -COMPILER_STRIP_GATE(80780EAC, &lit_5589); +COMPILER_STRIP_GATE(0x80780EAC, &lit_5589); #pragma pop /* 80780EB0-80780EB4 0000EC 0004+00 0/1 0/0 0/0 .rodata @5590 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5590 = 270.0f; -COMPILER_STRIP_GATE(80780EB0, &lit_5590); +COMPILER_STRIP_GATE(0x80780EB0, &lit_5590); #pragma pop /* 80780EB4-80780EB8 0000F0 0004+00 0/1 0/0 0/0 .rodata @5591 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5591 = 750.0f; -COMPILER_STRIP_GATE(80780EB4, &lit_5591); +COMPILER_STRIP_GATE(0x80780EB4, &lit_5591); #pragma pop /* 80780EB8-80780EBC 0000F4 0004+00 0/1 0/0 0/0 .rodata @5592 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5592 = 850.0f; -COMPILER_STRIP_GATE(80780EB8, &lit_5592); +COMPILER_STRIP_GATE(0x80780EB8, &lit_5592); #pragma pop /* 80780EBC-80780EC0 0000F8 0004+00 0/1 0/0 0/0 .rodata @5593 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5593 = 1.0f / 20.0f; -COMPILER_STRIP_GATE(80780EBC, &lit_5593); +COMPILER_STRIP_GATE(0x80780EBC, &lit_5593); #pragma pop /* 80780EC0-80780EC4 0000FC 0004+00 0/1 0/0 0/0 .rodata @5594 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_5594 = 0x3BA3D70A; -COMPILER_STRIP_GATE(80780EC0, &lit_5594); +COMPILER_STRIP_GATE(0x80780EC0, &lit_5594); #pragma pop /* 8077E870-8077EE10 003DD0 05A0+00 2/1 0/0 0/0 .text demo_camera__FP10e_s1_class */ @@ -1679,189 +1698,189 @@ static asm void demo_camera(e_s1_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5595 = -16046.0f; -COMPILER_STRIP_GATE(80780EC4, &lit_5595); +COMPILER_STRIP_GATE(0x80780EC4, &lit_5595); #pragma pop /* 80780EC8-80780ECC 000104 0004+00 0/0 0/0 0/0 .rodata @5596 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5596 = 177.0f; -COMPILER_STRIP_GATE(80780EC8, &lit_5596); +COMPILER_STRIP_GATE(0x80780EC8, &lit_5596); #pragma pop /* 80780ECC-80780ED0 000108 0004+00 0/0 0/0 0/0 .rodata @5597 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5597 = -955.0f; -COMPILER_STRIP_GATE(80780ECC, &lit_5597); +COMPILER_STRIP_GATE(0x80780ECC, &lit_5597); #pragma pop /* 80780ED0-80780ED4 00010C 0004+00 0/0 0/0 0/0 .rodata @5598 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5598 = -16174.0f; -COMPILER_STRIP_GATE(80780ED0, &lit_5598); +COMPILER_STRIP_GATE(0x80780ED0, &lit_5598); #pragma pop /* 80780ED4-80780ED8 000110 0004+00 0/0 0/0 0/0 .rodata @5599 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5599 = 331.0f; -COMPILER_STRIP_GATE(80780ED4, &lit_5599); +COMPILER_STRIP_GATE(0x80780ED4, &lit_5599); #pragma pop /* 80780ED8-80780EDC 000114 0004+00 0/0 0/0 0/0 .rodata @5600 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5600 = -731.0f; -COMPILER_STRIP_GATE(80780ED8, &lit_5600); +COMPILER_STRIP_GATE(0x80780ED8, &lit_5600); #pragma pop /* 80780EDC-80780EE0 000118 0004+00 0/0 0/0 0/0 .rodata @5601 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5601 = -15400.0f; -COMPILER_STRIP_GATE(80780EDC, &lit_5601); +COMPILER_STRIP_GATE(0x80780EDC, &lit_5601); #pragma pop /* 80780EE0-80780EE4 00011C 0004+00 0/0 0/0 0/0 .rodata @5602 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5602 = 400.0f; -COMPILER_STRIP_GATE(80780EE0, &lit_5602); +COMPILER_STRIP_GATE(0x80780EE0, &lit_5602); #pragma pop /* 80780EE4-80780EE8 000120 0004+00 0/0 0/0 0/0 .rodata @5603 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_5603 = 0x4234999A; -COMPILER_STRIP_GATE(80780EE4, &lit_5603); +COMPILER_STRIP_GATE(0x80780EE4, &lit_5603); #pragma pop /* 80780EE8-80780EEC 000124 0004+00 0/0 0/0 0/0 .rodata @5604 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5604 = -40.0f; -COMPILER_STRIP_GATE(80780EE8, &lit_5604); +COMPILER_STRIP_GATE(0x80780EE8, &lit_5604); #pragma pop /* 80780EEC-80780EF0 000128 0004+00 0/0 0/0 0/0 .rodata @5605 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5605 = -39.0f; -COMPILER_STRIP_GATE(80780EEC, &lit_5605); +COMPILER_STRIP_GATE(0x80780EEC, &lit_5605); #pragma pop /* 80780EF0-80780EF4 00012C 0004+00 0/0 0/0 0/0 .rodata @5606 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5606 = -68.0f; -COMPILER_STRIP_GATE(80780EF0, &lit_5606); +COMPILER_STRIP_GATE(0x80780EF0, &lit_5606); #pragma pop /* 80780EF4-80780EF8 000130 0004+00 0/0 0/0 0/0 .rodata @5607 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5607 = 218.0f; -COMPILER_STRIP_GATE(80780EF4, &lit_5607); +COMPILER_STRIP_GATE(0x80780EF4, &lit_5607); #pragma pop /* 80780EF8-80780EFC 000134 0004+00 0/0 0/0 0/0 .rodata @5608 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5608 = -3.0f; -COMPILER_STRIP_GATE(80780EF8, &lit_5608); +COMPILER_STRIP_GATE(0x80780EF8, &lit_5608); #pragma pop /* 80780EFC-80780F00 000138 0004+00 0/0 0/0 0/0 .rodata @5609 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5609 = 78.0f; -COMPILER_STRIP_GATE(80780EFC, &lit_5609); +COMPILER_STRIP_GATE(0x80780EFC, &lit_5609); #pragma pop /* 80780F00-80780F04 00013C 0004+00 0/0 0/0 0/0 .rodata @5610 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5610 = 42.0f; -COMPILER_STRIP_GATE(80780F00, &lit_5610); +COMPILER_STRIP_GATE(0x80780F00, &lit_5610); #pragma pop /* 80780F04-80780F08 000140 0004+00 0/0 0/0 0/0 .rodata @5611 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5611 = -16232.0f; -COMPILER_STRIP_GATE(80780F04, &lit_5611); +COMPILER_STRIP_GATE(0x80780F04, &lit_5611); #pragma pop /* 80780F08-80780F0C 000144 0004+00 0/0 0/0 0/0 .rodata @5612 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_5612 = 0x42366666; -COMPILER_STRIP_GATE(80780F08, &lit_5612); +COMPILER_STRIP_GATE(0x80780F08, &lit_5612); #pragma pop /* 80780F0C-80780F10 000148 0004+00 0/0 0/0 0/0 .rodata @5613 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5613 = 234.0f; -COMPILER_STRIP_GATE(80780F0C, &lit_5613); +COMPILER_STRIP_GATE(0x80780F0C, &lit_5613); #pragma pop /* 80780F10-80780F14 00014C 0004+00 0/0 0/0 0/0 .rodata @5614 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5614 = -16140.0f; -COMPILER_STRIP_GATE(80780F10, &lit_5614); +COMPILER_STRIP_GATE(0x80780F10, &lit_5614); #pragma pop /* 80780F14-80780F18 000150 0004+00 0/0 0/0 0/0 .rodata @5615 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5615 = 88.0f / 5.0f; -COMPILER_STRIP_GATE(80780F14, &lit_5615); +COMPILER_STRIP_GATE(0x80780F14, &lit_5615); #pragma pop /* 80780F18-80780F1C 000154 0004+00 0/0 0/0 0/0 .rodata @5616 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5616 = 518.0f; -COMPILER_STRIP_GATE(80780F18, &lit_5616); +COMPILER_STRIP_GATE(0x80780F18, &lit_5616); #pragma pop /* 80780F1C-80780F20 000158 0004+00 0/1 0/0 0/0 .rodata @5717 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5717 = 27.0f; -COMPILER_STRIP_GATE(80780F1C, &lit_5717); +COMPILER_STRIP_GATE(0x80780F1C, &lit_5717); #pragma pop /* 80780F20-80780F24 00015C 0004+00 0/1 0/0 0/0 .rodata @5718 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5718 = 57.0f; -COMPILER_STRIP_GATE(80780F20, &lit_5718); +COMPILER_STRIP_GATE(0x80780F20, &lit_5718); #pragma pop /* 80780F24-80780F28 000160 0004+00 0/1 0/0 0/0 .rodata @5719 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5719 = 6.0f; -COMPILER_STRIP_GATE(80780F24, &lit_5719); +COMPILER_STRIP_GATE(0x80780F24, &lit_5719); #pragma pop /* 80780F28-80780F2C 000164 0004+00 0/1 0/0 0/0 .rodata @5720 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5720 = 14.0f; -COMPILER_STRIP_GATE(80780F28, &lit_5720); +COMPILER_STRIP_GATE(0x80780F28, &lit_5720); #pragma pop /* 80780F2C-80780F30 000168 0004+00 0/2 0/0 0/0 .rodata @5721 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5721 = 45.0f; -COMPILER_STRIP_GATE(80780F2C, &lit_5721); +COMPILER_STRIP_GATE(0x80780F2C, &lit_5721); #pragma pop /* 8077EE10-8077F250 004370 0440+00 1/1 0/0 0/0 .text anm_se_set__FP10e_s1_class */ @@ -1889,70 +1908,76 @@ static asm void body_eff_set(e_s1_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5995 = -27035.0f; -COMPILER_STRIP_GATE(80780F30, &lit_5995); +COMPILER_STRIP_GATE(0x80780F30, &lit_5995); #pragma pop /* 80780F34-80780F38 000170 0004+00 0/1 0/0 0/0 .rodata @5996 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5996 = -35400.0f; -COMPILER_STRIP_GATE(80780F34, &lit_5996); +COMPILER_STRIP_GATE(0x80780F34, &lit_5996); #pragma pop /* 80780F38-80780F3C 000174 0004+00 0/1 0/0 0/0 .rodata @5997 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5997 = -28750.0f; -COMPILER_STRIP_GATE(80780F38, &lit_5997); +COMPILER_STRIP_GATE(0x80780F38, &lit_5997); #pragma pop /* 80780F3C-80780F40 000178 0004+00 0/1 0/0 0/0 .rodata @5998 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5998 = 35330.0f; -COMPILER_STRIP_GATE(80780F3C, &lit_5998); +COMPILER_STRIP_GATE(0x80780F3C, &lit_5998); #pragma pop /* 80780F40-80780F44 00017C 0004+00 0/1 0/0 0/0 .rodata @5999 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5999 = 34270.0f; -COMPILER_STRIP_GATE(80780F40, &lit_5999); +COMPILER_STRIP_GATE(0x80780F40, &lit_5999); #pragma pop /* 80780F44-80780F48 000180 0004+00 0/1 0/0 0/0 .rodata @6000 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6000 = -1000000000.0f; -COMPILER_STRIP_GATE(80780F44, &lit_6000); +COMPILER_STRIP_GATE(0x80780F44, &lit_6000); #pragma pop /* 80780F48-80780F4C 000184 0004+00 0/1 0/0 0/0 .rodata @6001 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6001 = 75.0f; -COMPILER_STRIP_GATE(80780F48, &lit_6001); +COMPILER_STRIP_GATE(0x80780F48, &lit_6001); #pragma pop /* 80780F4C-80780F50 000188 0004+00 0/1 0/0 0/0 .rodata @6002 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6002 = 22340.0f; -COMPILER_STRIP_GATE(80780F4C, &lit_6002); +COMPILER_STRIP_GATE(0x80780F4C, &lit_6002); #pragma pop /* 80780F50-80780F54 00018C 0004+00 0/1 0/0 0/0 .rodata @6003 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6003 = 20000.0f; -COMPILER_STRIP_GATE(80780F50, &lit_6003); +COMPILER_STRIP_GATE(0x80780F50, &lit_6003); #pragma pop /* 80780F54-80780F58 000190 0004+00 0/1 0/0 0/0 .rodata @6004 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6004 = 130.0f; -COMPILER_STRIP_GATE(80780F54, &lit_6004); +COMPILER_STRIP_GATE(0x80780F54, &lit_6004); +#pragma pop + +/* 80780F74-80780F74 0001B0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80780F88 = "F_SP121"; #pragma pop /* 8077F314-8077FC88 004874 0974+00 2/1 0/0 0/0 .text daE_S1_Execute__FP10e_s1_class */ @@ -1995,21 +2020,29 @@ static asm void useHeapInit(fopAc_ac_c* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6234 = -200.0f; -COMPILER_STRIP_GATE(80780F58, &lit_6234); +COMPILER_STRIP_GATE(0x80780F58, &lit_6234); #pragma pop /* 80780F5C-80780F60 000198 0004+00 0/1 0/0 0/0 .rodata @6235 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6235 = 200.0f; -COMPILER_STRIP_GATE(80780F5C, &lit_6235); +COMPILER_STRIP_GATE(0x80780F5C, &lit_6235); #pragma pop /* 80780F60-80780F64 00019C 0004+00 0/1 0/0 0/0 .rodata @6236 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6236 = -7.0f; -COMPILER_STRIP_GATE(80780F60, &lit_6236); +COMPILER_STRIP_GATE(0x80780F60, &lit_6236); +#pragma pop + +/* 80780F74-80780F74 0001B0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80780F90 = "D_MN08B"; +SECTION_DEAD static char const* const stringBase_80780F98 = "D_MN08C"; +SECTION_DEAD static char const* const stringBase_80780FA0 = "E_s1"; #pragma pop /* 8077FE38-807803F4 005398 05BC+00 1/0 0/0 0/0 .text daE_S1_Create__FP10fopAc_ac_c */ @@ -2142,28 +2175,28 @@ asm daE_S1_HIO_c::~daE_S1_HIO_c() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6362 = -16500.0f; -COMPILER_STRIP_GATE(80780F64, &lit_6362); +COMPILER_STRIP_GATE(0x80780F64, &lit_6362); #pragma pop /* 80780F68-80780F6C 0001A4 0004+00 0/1 0/0 0/0 .rodata @6363 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6363 = -100.0f; -COMPILER_STRIP_GATE(80780F68, &lit_6363); +COMPILER_STRIP_GATE(0x80780F68, &lit_6363); #pragma pop /* 80780F6C-80780F70 0001A8 0004+00 0/1 0/0 0/0 .rodata @6364 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6364 = -16300.0f; -COMPILER_STRIP_GATE(80780F6C, &lit_6364); +COMPILER_STRIP_GATE(0x80780F6C, &lit_6364); #pragma pop /* 80780F70-80780F74 0001AC 0004+00 0/1 0/0 0/0 .rodata @6365 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6365 = -400.0f; -COMPILER_STRIP_GATE(80780F70, &lit_6365); +COMPILER_STRIP_GATE(0x80780F70, &lit_6365); #pragma pop /* 80780888-80780950 005DE8 00C8+00 0/0 1/0 0/0 .text __sinit_d_a_e_s1_cpp */ @@ -2178,7 +2211,7 @@ asm void __sinit_d_a_e_s1_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80780888 = (void*)__sinit_d_a_e_s1_cpp; +REGISTER_CTORS(0x80780888, __sinit_d_a_e_s1_cpp); #pragma pop /* 80780950-80780958 005EB0 0008+00 1/0 0/0 0/0 .text @36@__dt__12dBgS_ObjAcchFv */ @@ -2395,15 +2428,4 @@ static u8 data_80781550[4]; static u8 data_80781554[4]; #pragma pop -/* 80780F74-80780FA5 0001B0 0031+00 7/7 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80780F74 = "E_S2"; -SECTION_DEAD static char const* const stringBase_80780F79 = "D_MN08"; -SECTION_DEAD static char const* const stringBase_80780F80 = "F_SP108"; -SECTION_DEAD static char const* const stringBase_80780F88 = "F_SP121"; -SECTION_DEAD static char const* const stringBase_80780F90 = "D_MN08B"; -SECTION_DEAD static char const* const stringBase_80780F98 = "D_MN08C"; -SECTION_DEAD static char const* const stringBase_80780FA0 = "E_s1"; -#pragma pop +/* 80780F74-80780F74 0001B0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/e/d_a_e_sb/d_a_e_sb.cpp b/rel/d/a/e/d_a_e_sb/d_a_e_sb.cpp index b4540ff668e..cf7bc0e7e64 100644 --- a/rel/d/a/e/d_a_e_sb/d_a_e_sb.cpp +++ b/rel/d/a/e/d_a_e_sb/d_a_e_sb.cpp @@ -29,16 +29,16 @@ struct mDoMtx_stack_c { static u8 now[48]; }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; - struct J3DAnmTransform {}; +struct J3DModelData {}; + +struct Z2Creature {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -64,10 +64,10 @@ struct daPy_py_c { /* 8015F398 */ void checkMasterSwordEquip(); }; -struct J3DJoint {}; - struct J3DModel {}; +struct J3DJoint {}; + struct daE_SB_c { /* 807816D8 */ void CreateHeap(); /* 807817F0 */ void initCcCylinder(); @@ -443,73 +443,73 @@ extern "C" void __register_global_object(); /* ############################################################################################## */ /* 80784D68-80784D6C 000000 0004+00 18/18 0/0 0/0 .rodata @3658 */ SECTION_RODATA static f32 const lit_3658 = 1100.0f; -COMPILER_STRIP_GATE(80784D68, &lit_3658); +COMPILER_STRIP_GATE(0x80784D68, &lit_3658); /* 80784D6C-80784D70 000004 0004+00 0/1 0/0 0/0 .rodata @3659 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3659 = 600.0f; -COMPILER_STRIP_GATE(80784D6C, &lit_3659); +COMPILER_STRIP_GATE(0x80784D6C, &lit_3659); #pragma pop /* 80784D70-80784D74 000008 0004+00 0/1 0/0 0/0 .rodata @3660 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3660 = 40.0f; -COMPILER_STRIP_GATE(80784D70, &lit_3660); +COMPILER_STRIP_GATE(0x80784D70, &lit_3660); #pragma pop /* 80784D74-80784D78 00000C 0004+00 0/1 0/0 0/0 .rodata @3661 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3661 = 35.0f; -COMPILER_STRIP_GATE(80784D74, &lit_3661); +COMPILER_STRIP_GATE(0x80784D74, &lit_3661); #pragma pop /* 80784D78-80784D7C 000010 0004+00 0/1 0/0 0/0 .rodata @3662 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3662 = 75.0f; -COMPILER_STRIP_GATE(80784D78, &lit_3662); +COMPILER_STRIP_GATE(0x80784D78, &lit_3662); #pragma pop /* 80784D7C-80784D80 000014 0004+00 0/5 0/0 0/0 .rodata @3663 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3663 = 30.0f; -COMPILER_STRIP_GATE(80784D7C, &lit_3663); +COMPILER_STRIP_GATE(0x80784D7C, &lit_3663); #pragma pop /* 80784D80-80784D84 000018 0004+00 0/1 0/0 0/0 .rodata @3664 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3664 = 83.0f / 100.0f; -COMPILER_STRIP_GATE(80784D80, &lit_3664); +COMPILER_STRIP_GATE(0x80784D80, &lit_3664); #pragma pop /* 80784D84-80784D88 00001C 0004+00 3/7 0/0 0/0 .rodata @3665 */ SECTION_RODATA static f32 const lit_3665 = 1.0f; -COMPILER_STRIP_GATE(80784D84, &lit_3665); +COMPILER_STRIP_GATE(0x80784D84, &lit_3665); /* 80784D88-80784D8C 000020 0004+00 0/2 0/0 0/0 .rodata @3666 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3666 = 7.0f / 10.0f; -COMPILER_STRIP_GATE(80784D88, &lit_3666); +COMPILER_STRIP_GATE(0x80784D88, &lit_3666); #pragma pop /* 80784D8C-80784D90 000024 0004+00 0/1 0/0 0/0 .rodata @3667 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3667 = 7.0f / 5.0f; -COMPILER_STRIP_GATE(80784D8C, &lit_3667); +COMPILER_STRIP_GATE(0x80784D8C, &lit_3667); #pragma pop /* 80784D90-80784D94 000028 0004+00 0/3 0/0 0/0 .rodata @3668 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3668 = 1000.0f; -COMPILER_STRIP_GATE(80784D90, &lit_3668); +COMPILER_STRIP_GATE(0x80784D90, &lit_3668); #pragma pop /* 80784E6C-80784E88 -00001 001C+00 1/1 0/0 0/0 .data @4468 */ @@ -596,6 +596,13 @@ asm daE_SB_HIO_c::daE_SB_HIO_c() { } #pragma pop +/* ############################################################################################## */ +/* 80784E64-80784E64 0000FC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80784E64 = "E_SB"; +#pragma pop + /* 807816D8-807817D0 000178 00F8+00 1/1 0/0 0/0 .text CreateHeap__8daE_SB_cFv */ #pragma push #pragma optimization_level 0 @@ -625,7 +632,7 @@ SECTION_RODATA static u8 const ccCylSrc[68] = { 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0xA0, 0x00, 0x00, 0x43, 0x02, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80784D94, &ccCylSrc); +COMPILER_STRIP_GATE(0x80784D94, &ccCylSrc); /* 807817F0-80781850 000290 0060+00 1/1 0/0 0/0 .text initCcCylinder__8daE_SB_cFv */ #pragma push @@ -685,11 +692,11 @@ SECTION_RODATA static u8 const lit_3758[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80784DD8, &lit_3758); +COMPILER_STRIP_GATE(0x80784DD8, &lit_3758); /* 80784DDC-80784DE0 000074 0004+00 1/6 0/0 0/0 .rodata @3759 */ SECTION_RODATA static f32 const lit_3759 = -1.0f; -COMPILER_STRIP_GATE(80784DDC, &lit_3759); +COMPILER_STRIP_GATE(0x80784DDC, &lit_3759); /* 80781A4C-80781AF8 0004EC 00AC+00 8/8 0/0 0/0 .text SetAnm__8daE_SB_cFiiff */ #pragma push @@ -704,7 +711,7 @@ asm void daE_SB_c::SetAnm(int param_0, int param_1, f32 param_2, f32 param_3) { /* ############################################################################################## */ /* 80784DE0-80784DE4 000078 0004+00 1/4 0/0 0/0 .rodata @3768 */ SECTION_RODATA static f32 const lit_3768 = -9.0f; -COMPILER_STRIP_GATE(80784DE0, &lit_3768); +COMPILER_STRIP_GATE(0x80784DE0, &lit_3768); /* 80781AF8-80781B54 000598 005C+00 8/8 0/0 0/0 .text MemberClear__8daE_SB_cFv */ #pragma push @@ -719,7 +726,7 @@ asm void daE_SB_c::MemberClear() { /* ############################################################################################## */ /* 80784DE4-80784DE8 00007C 0004+00 1/6 0/0 0/0 .rodata @3831 */ SECTION_RODATA static f32 const lit_3831 = 100.0f; -COMPILER_STRIP_GATE(80784DE4, &lit_3831); +COMPILER_STRIP_GATE(0x80784DE4, &lit_3831); /* 80781B54-80781C2C 0005F4 00D8+00 2/2 0/0 0/0 .text other_bg_check__FP8daE_SB_cP10fopAc_ac_c */ #pragma push @@ -754,13 +761,13 @@ static asm void s_bomb_sub(void* param_0, void* param_1) { /* ############################################################################################## */ /* 80784DE8-80784DEC 000080 0004+00 4/11 0/0 0/0 .rodata @3906 */ SECTION_RODATA static f32 const lit_3906 = 5.0f; -COMPILER_STRIP_GATE(80784DE8, &lit_3906); +COMPILER_STRIP_GATE(0x80784DE8, &lit_3906); /* 80784DEC-80784DF0 000084 0004+00 0/2 0/0 0/0 .rodata @3907 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3907 = -5.0f; -COMPILER_STRIP_GATE(80784DEC, &lit_3907); +COMPILER_STRIP_GATE(0x80784DEC, &lit_3907); #pragma pop /* 80784F38-80784F3C 000008 0001+03 2/2 0/0 0/0 .bss @1109 */ @@ -896,26 +903,26 @@ asm void daE_SB_c::AttackStop() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3954 = 200.0f; -COMPILER_STRIP_GATE(80784DF0, &lit_3954); +COMPILER_STRIP_GATE(0x80784DF0, &lit_3954); #pragma pop /* 80784DF4-80784DF8 00008C 0004+00 0/3 0/0 0/0 .rodata @3955 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3955 = -200.0f; -COMPILER_STRIP_GATE(80784DF4, &lit_3955); +COMPILER_STRIP_GATE(0x80784DF4, &lit_3955); #pragma pop /* 80784DF8-80784DFC 000090 0004+00 0/1 0/0 0/0 .rodata @3956 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3956 = 4.0f / 5.0f; -COMPILER_STRIP_GATE(80784DF8, &lit_3956); +COMPILER_STRIP_GATE(0x80784DF8, &lit_3956); #pragma pop /* 80784DFC-80784E00 000094 0004+00 1/4 0/0 0/0 .rodata @3957 */ SECTION_RODATA static f32 const lit_3957 = 0.5f; -COMPILER_STRIP_GATE(80784DFC, &lit_3957); +COMPILER_STRIP_GATE(0x80784DFC, &lit_3957); /* 80781F80-80782180 000A20 0200+00 1/1 0/0 0/0 .text AttackSetSP__8daE_SB_cFv */ #pragma push @@ -930,7 +937,7 @@ asm void daE_SB_c::AttackSetSP() { /* ############################################################################################## */ /* 80784E00-80784E04 000098 0004+00 1/1 0/0 0/0 .rodata @3975 */ SECTION_RODATA static f32 const lit_3975 = 1792.0f; -COMPILER_STRIP_GATE(80784E00, &lit_3975); +COMPILER_STRIP_GATE(0x80784E00, &lit_3975); /* 80782180-80782264 000C20 00E4+00 1/1 0/0 0/0 .text AttackAngle__8daE_SB_cFv */ #pragma push @@ -947,7 +954,7 @@ asm void daE_SB_c::AttackAngle() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3981 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(80784E04, &lit_3981); +COMPILER_STRIP_GATE(0x80784E04, &lit_3981); #pragma pop /* 80782264-807822B8 000D04 0054+00 1/1 0/0 0/0 .text AttackSpeedMotion__8daE_SB_cFv */ @@ -965,14 +972,14 @@ asm void daE_SB_c::AttackSpeedMotion() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4064 = 53.0f; -COMPILER_STRIP_GATE(80784E08, &lit_4064); +COMPILER_STRIP_GATE(0x80784E08, &lit_4064); #pragma pop /* 80784E0C-80784E10 0000A4 0004+00 0/1 0/0 0/0 .rodata @4065 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4065 = 64.0f; -COMPILER_STRIP_GATE(80784E0C, &lit_4065); +COMPILER_STRIP_GATE(0x80784E0C, &lit_4065); #pragma pop /* 80784E10-80784E18 0000A8 0004+04 0/1 0/0 0/0 .rodata @4066 */ @@ -983,7 +990,7 @@ SECTION_RODATA static f32 const lit_4066[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80784E10, &lit_4066); +COMPILER_STRIP_GATE(0x80784E10, &lit_4066); #pragma pop /* 807822B8-80782650 000D58 0398+00 1/1 0/0 0/0 .text Attack_Motion__8daE_SB_cFv */ @@ -1023,7 +1030,7 @@ asm void daE_SB_c::BombJumpSet() { SECTION_RODATA static u8 const lit_4130[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80784E18, &lit_4130); +COMPILER_STRIP_GATE(0x80784E18, &lit_4130); #pragma pop /* 80784E20-80784E28 0000B8 0008+00 0/2 0/0 0/0 .rodata @4131 */ @@ -1032,7 +1039,7 @@ COMPILER_STRIP_GATE(80784E18, &lit_4130); SECTION_RODATA static u8 const lit_4131[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80784E20, &lit_4131); +COMPILER_STRIP_GATE(0x80784E20, &lit_4131); #pragma pop /* 80784E28-80784E30 0000C0 0008+00 0/2 0/0 0/0 .rodata @4132 */ @@ -1041,14 +1048,14 @@ COMPILER_STRIP_GATE(80784E20, &lit_4131); SECTION_RODATA static u8 const lit_4132[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80784E28, &lit_4132); +COMPILER_STRIP_GATE(0x80784E28, &lit_4132); #pragma pop /* 80784E30-80784E34 0000C8 0004+00 0/2 0/0 0/0 .rodata @4133 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4133 = 300.0f; -COMPILER_STRIP_GATE(80784E30, &lit_4133); +COMPILER_STRIP_GATE(0x80784E30, &lit_4133); #pragma pop /* 8078273C-8078294C 0011DC 0210+00 1/1 0/0 0/0 .text GetHomeSet__8daE_SB_cFv */ @@ -1076,7 +1083,7 @@ asm void daE_SB_c::HomeJumpMotion() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4166 = 3.0f / 5.0f; -COMPILER_STRIP_GATE(80784E34, &lit_4166); +COMPILER_STRIP_GATE(0x80784E34, &lit_4166); #pragma pop /* 807829E8-80782B7C 001488 0194+00 1/1 0/0 0/0 .text Jump_Normal_Set__8daE_SB_cFv */ @@ -1164,7 +1171,7 @@ asm void daE_SB_c::ActionCheck() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4370 = 400.0f; -COMPILER_STRIP_GATE(80784E38, &lit_4370); +COMPILER_STRIP_GATE(0x80784E38, &lit_4370); #pragma pop /* 80783010-80783404 001AB0 03F4+00 1/1 0/0 0/0 .text Search__8daE_SB_cFv */ @@ -1262,21 +1269,21 @@ asm void daE_SB_c::Obj_Damage() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4467 = 49.5f; -COMPILER_STRIP_GATE(80784E3C, &lit_4467); +COMPILER_STRIP_GATE(0x80784E3C, &lit_4467); #pragma pop /* 80784E40-80784E44 0000D8 0004+00 0/1 0/0 0/0 .rodata @4656 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4656 = 6000.0f; -COMPILER_STRIP_GATE(80784E40, &lit_4656); +COMPILER_STRIP_GATE(0x80784E40, &lit_4656); #pragma pop /* 80784E44-80784E48 0000DC 0004+00 0/1 0/0 0/0 .rodata @4657 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4657 = 9.0f / 10.0f; -COMPILER_STRIP_GATE(80784E44, &lit_4657); +COMPILER_STRIP_GATE(0x80784E44, &lit_4657); #pragma pop /* 80784E48-80784E50 0000E0 0004+04 0/1 0/0 0/0 .rodata @4658 */ @@ -1287,7 +1294,7 @@ SECTION_RODATA static f32 const lit_4658[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80784E48, &lit_4658); +COMPILER_STRIP_GATE(0x80784E48, &lit_4658); #pragma pop /* 80784E50-80784E58 0000E8 0008+00 0/1 0/0 0/0 .rodata @4660 */ @@ -1296,7 +1303,7 @@ COMPILER_STRIP_GATE(80784E48, &lit_4658); SECTION_RODATA static u8 const lit_4660[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80784E50, &lit_4660); +COMPILER_STRIP_GATE(0x80784E50, &lit_4660); #pragma pop /* 80783FBC-80784144 002A5C 0188+00 1/1 0/0 0/0 .text HashiraVib__8daE_SB_cFv */ @@ -1312,7 +1319,7 @@ asm void daE_SB_c::HashiraVib() { /* ############################################################################################## */ /* 80784E58-80784E5C 0000F0 0004+00 1/2 0/0 0/0 .rodata @4682 */ SECTION_RODATA static f32 const lit_4682 = 80.0f; -COMPILER_STRIP_GATE(80784E58, &lit_4682); +COMPILER_STRIP_GATE(0x80784E58, &lit_4682); /* 80784144-807841CC 002BE4 0088+00 1/1 0/0 0/0 .text Yazirushi__8daE_SB_cFv */ #pragma push @@ -1329,14 +1336,14 @@ asm void daE_SB_c::Yazirushi() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4738 = 50.0f; -COMPILER_STRIP_GATE(80784E5C, &lit_4738); +COMPILER_STRIP_GATE(0x80784E5C, &lit_4738); #pragma pop /* 80784E60-80784E64 0000F8 0004+00 0/1 0/0 0/0 .rodata @4739 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4739 = -1000000000.0f; -COMPILER_STRIP_GATE(80784E60, &lit_4739); +COMPILER_STRIP_GATE(0x80784E60, &lit_4739); #pragma pop /* 807841CC-80784390 002C6C 01C4+00 1/1 0/0 0/0 .text setGroundAngle__8daE_SB_cFv */ @@ -1506,7 +1513,7 @@ asm void __sinit_d_a_e_sb_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80784D08 = (void*)__sinit_d_a_e_sb_cpp; +REGISTER_CTORS(0x80784D08, __sinit_d_a_e_sb_cpp); #pragma pop /* 80784D44-80784D4C 0037E4 0008+00 1/0 0/0 0/0 .text @36@__dt__12dBgS_ObjAcchFv */ @@ -1701,9 +1708,4 @@ static u8 data_8078502C[4]; static u8 data_80785030[4]; #pragma pop -/* 80784E64-80784E69 0000FC 0005+00 5/5 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80784E64 = "E_SB"; -#pragma pop +/* 80784E64-80784E64 0000FC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/e/d_a_e_sf/d_a_e_sf.cpp b/rel/d/a/e/d_a_e_sf/d_a_e_sf.cpp index 0b24202b75c..94cf3b5cdc7 100644 --- a/rel/d/a/e/d_a_e_sf/d_a_e_sf.cpp +++ b/rel/d/a/e/d_a_e_sf/d_a_e_sf.cpp @@ -19,16 +19,16 @@ struct mDoMtx_stack_c { static u8 now[48]; }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; - struct J3DAnmTransform {}; +struct J3DModelData {}; + +struct Z2Creature {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -85,10 +85,10 @@ struct dRes_control_c { struct dPa_levelEcallBack {}; -struct _GXColor {}; - struct csXyz {}; +struct _GXColor {}; + struct dPa_control_c { /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, @@ -470,7 +470,7 @@ extern "C" void __register_global_object(); /* ############################################################################################## */ /* 80789C38-80789C3C 000000 0004+00 19/19 0/0 0/0 .rodata @3908 */ SECTION_RODATA static f32 const lit_3908 = 100.0f; -COMPILER_STRIP_GATE(80789C38, &lit_3908); +COMPILER_STRIP_GATE(0x80789C38, &lit_3908); /* 80789C3C-80789C40 000004 0004+00 4/18 0/0 0/0 .rodata @3909 */ SECTION_RODATA static u8 const lit_3909[4] = { @@ -479,7 +479,7 @@ SECTION_RODATA static u8 const lit_3909[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80789C3C, &lit_3909); +COMPILER_STRIP_GATE(0x80789C3C, &lit_3909); /* 80789C40-80789C48 000008 0004+04 3/16 0/0 0/0 .rodata @3910 */ SECTION_RODATA static f32 const lit_3910[1 + 1 /* padding */] = { @@ -487,7 +487,7 @@ SECTION_RODATA static f32 const lit_3910[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80789C40, &lit_3910); +COMPILER_STRIP_GATE(0x80789C40, &lit_3910); /* 80789C48-80789C50 000010 0008+00 0/1 0/0 0/0 .rodata @3911 */ #pragma push @@ -495,7 +495,7 @@ COMPILER_STRIP_GATE(80789C40, &lit_3910); SECTION_RODATA static u8 const lit_3911[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80789C48, &lit_3911); +COMPILER_STRIP_GATE(0x80789C48, &lit_3911); #pragma pop /* 80789C50-80789C58 000018 0008+00 0/1 0/0 0/0 .rodata @3912 */ @@ -504,7 +504,7 @@ COMPILER_STRIP_GATE(80789C48, &lit_3911); SECTION_RODATA static u8 const lit_3912[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80789C50, &lit_3912); +COMPILER_STRIP_GATE(0x80789C50, &lit_3912); #pragma pop /* 80789C58-80789C60 000020 0008+00 0/1 0/0 0/0 .rodata @3913 */ @@ -513,56 +513,56 @@ COMPILER_STRIP_GATE(80789C50, &lit_3912); SECTION_RODATA static u8 const lit_3913[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80789C58, &lit_3913); +COMPILER_STRIP_GATE(0x80789C58, &lit_3913); #pragma pop /* 80789C60-80789C64 000028 0004+00 0/1 0/0 0/0 .rodata @3914 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3914 = 1.0f / 100.0f; -COMPILER_STRIP_GATE(80789C60, &lit_3914); +COMPILER_STRIP_GATE(0x80789C60, &lit_3914); #pragma pop /* 80789C64-80789C68 00002C 0004+00 0/1 0/0 0/0 .rodata @3929 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3929 = 6.0f / 5.0f; -COMPILER_STRIP_GATE(80789C64, &lit_3929); +COMPILER_STRIP_GATE(0x80789C64, &lit_3929); #pragma pop /* 80789C68-80789C6C 000030 0004+00 0/6 0/0 0/0 .rodata @3930 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3930 = 5.0f; -COMPILER_STRIP_GATE(80789C68, &lit_3930); +COMPILER_STRIP_GATE(0x80789C68, &lit_3930); #pragma pop /* 80789C6C-80789C70 000034 0004+00 0/1 0/0 0/0 .rodata @3931 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3931 = 3000.0f; -COMPILER_STRIP_GATE(80789C6C, &lit_3931); +COMPILER_STRIP_GATE(0x80789C6C, &lit_3931); #pragma pop /* 80789C70-80789C74 000038 0004+00 0/7 0/0 0/0 .rodata @3932 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3932 = 10.0f; -COMPILER_STRIP_GATE(80789C70, &lit_3932); +COMPILER_STRIP_GATE(0x80789C70, &lit_3932); #pragma pop /* 80789C74-80789C78 00003C 0004+00 0/1 0/0 0/0 .rodata @3933 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3933 = 250.0f; -COMPILER_STRIP_GATE(80789C74, &lit_3933); +COMPILER_STRIP_GATE(0x80789C74, &lit_3933); #pragma pop /* 80789C78-80789C7C 000040 0004+00 0/2 0/0 0/0 .rodata @3934 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3934 = 300.0f; -COMPILER_STRIP_GATE(80789C78, &lit_3934); +COMPILER_STRIP_GATE(0x80789C78, &lit_3934); #pragma pop /* 80789D90-80789D9C 000000 000C+00 2/2 0/0 0/0 .data cNullVec__6Z2Calc */ @@ -830,7 +830,13 @@ asm daE_SF_HIO_c::daE_SF_HIO_c() { /* ############################################################################################## */ /* 80789C7C-80789C80 000044 0004+00 1/1 0/0 0/0 .rodata @3948 */ SECTION_RODATA static f32 const lit_3948 = -1.0f; -COMPILER_STRIP_GATE(80789C7C, &lit_3948); +COMPILER_STRIP_GATE(0x80789C7C, &lit_3948); + +/* 80789D84-80789D84 00014C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80789D84 = "E_sf"; +#pragma pop /* 80785188-80785234 000148 00AC+00 11/11 0/0 0/0 .text anm_init__FP10e_sf_classifUcf */ #pragma push @@ -857,14 +863,14 @@ static asm void nodeCallBack(J3DJoint* param_0, int param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4069 = 50.0f; -COMPILER_STRIP_GATE(80789C80, &lit_4069); +COMPILER_STRIP_GATE(0x80789C80, &lit_4069); #pragma pop /* 80789C84-80789C88 00004C 0004+00 0/1 0/0 0/0 .rodata @4070 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4070 = 900.0f; -COMPILER_STRIP_GATE(80789C84, &lit_4070); +COMPILER_STRIP_GATE(0x80789C84, &lit_4070); #pragma pop /* 8078545C-80785654 00041C 01F8+00 1/0 0/0 0/0 .text daE_SF_Draw__FP10e_sf_class */ @@ -923,42 +929,42 @@ static asm void pl_check(e_sf_class* param_0, f32 param_1, s16 param_2) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4234 = 200.0f; -COMPILER_STRIP_GATE(80789C88, &lit_4234); +COMPILER_STRIP_GATE(0x80789C88, &lit_4234); #pragma pop /* 80789C8C-80789C90 000054 0004+00 0/1 0/0 0/0 .rodata @4235 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4235 = 32768.0f; -COMPILER_STRIP_GATE(80789C8C, &lit_4235); +COMPILER_STRIP_GATE(0x80789C8C, &lit_4235); #pragma pop /* 80789C90-80789C94 000058 0004+00 0/1 0/0 0/0 .rodata @4236 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4236 = 10000.0f; -COMPILER_STRIP_GATE(80789C90, &lit_4236); +COMPILER_STRIP_GATE(0x80789C90, &lit_4236); #pragma pop /* 80789C94-80789C98 00005C 0004+00 0/1 0/0 0/0 .rodata @4237 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4237 = 600.0f; -COMPILER_STRIP_GATE(80789C94, &lit_4237); +COMPILER_STRIP_GATE(0x80789C94, &lit_4237); #pragma pop /* 80789C98-80789C9C 000060 0004+00 0/5 0/0 0/0 .rodata @4238 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4238 = 3.0f; -COMPILER_STRIP_GATE(80789C98, &lit_4238); +COMPILER_STRIP_GATE(0x80789C98, &lit_4238); #pragma pop /* 80789C9C-80789CA0 000064 0004+00 0/1 0/0 0/0 .rodata @4239 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4239 = 2000.0f; -COMPILER_STRIP_GATE(80789C9C, &lit_4239); +COMPILER_STRIP_GATE(0x80789C9C, &lit_4239); #pragma pop /* 8078A030-8078A034 000008 0001+03 1/1 0/0 0/0 .bss @1109 */ @@ -1074,14 +1080,14 @@ static asm void e_sf_normal(e_sf_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4262 = -5.0f; -COMPILER_STRIP_GATE(80789CA0, &lit_4262); +COMPILER_STRIP_GATE(0x80789CA0, &lit_4262); #pragma pop /* 80789CA4-80789CA8 00006C 0004+00 0/2 0/0 0/0 .rodata @4263 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4263 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(80789CA4, &lit_4263); +COMPILER_STRIP_GATE(0x80789CA4, &lit_4263); #pragma pop /* 80785BF8-80785D30 000BB8 0138+00 1/1 0/0 0/0 .text e_sf_drawback__FP10e_sf_class */ @@ -1099,7 +1105,7 @@ static asm void e_sf_drawback(e_sf_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4349 = 15.0f; -COMPILER_STRIP_GATE(80789CA8, &lit_4349); +COMPILER_STRIP_GATE(0x80789CA8, &lit_4349); #pragma pop /* 80785D30-807860F4 000CF0 03C4+00 2/1 0/0 0/0 .text e_sf_fight_run__FP10e_sf_class */ @@ -1127,35 +1133,35 @@ static asm void at_hit_check(e_sf_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4350 = 1.0f / 20.0f; -COMPILER_STRIP_GATE(80789CAC, &lit_4350); +COMPILER_STRIP_GATE(0x80789CAC, &lit_4350); #pragma pop /* 80789CB0-80789CB4 000078 0004+00 0/3 0/0 0/0 .rodata @4351 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4351 = 20.0f; -COMPILER_STRIP_GATE(80789CB0, &lit_4351); +COMPILER_STRIP_GATE(0x80789CB0, &lit_4351); #pragma pop /* 80789CB4-80789CB8 00007C 0004+00 0/1 0/0 0/0 .rodata @4352 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4352 = 0.5f; -COMPILER_STRIP_GATE(80789CB4, &lit_4352); +COMPILER_STRIP_GATE(0x80789CB4, &lit_4352); #pragma pop /* 80789CB8-80789CBC 000080 0004+00 0/1 0/0 0/0 .rodata @4396 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4396 = 40.0f; -COMPILER_STRIP_GATE(80789CB8, &lit_4396); +COMPILER_STRIP_GATE(0x80789CB8, &lit_4396); #pragma pop /* 80789CBC-80789CC0 000084 0004+00 0/1 0/0 0/0 .rodata @4458 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4458 = 6.0f; -COMPILER_STRIP_GATE(80789CBC, &lit_4458); +COMPILER_STRIP_GATE(0x80789CBC, &lit_4458); #pragma pop /* 80786154-8078632C 001114 01D8+00 1/1 0/0 0/0 .text e_sf_attack_0__FP10e_sf_class */ @@ -1173,14 +1179,14 @@ static asm void e_sf_attack_0(e_sf_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4509 = 8.0f; -COMPILER_STRIP_GATE(80789CC0, &lit_4509); +COMPILER_STRIP_GATE(0x80789CC0, &lit_4509); #pragma pop /* 80789CC4-80789CC8 00008C 0004+00 0/2 0/0 0/0 .rodata @4510 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4510 = 55.0f; -COMPILER_STRIP_GATE(80789CC4, &lit_4510); +COMPILER_STRIP_GATE(0x80789CC4, &lit_4510); #pragma pop /* 8078632C-80786524 0012EC 01F8+00 1/1 0/0 0/0 .text e_sf_attack__FP10e_sf_class */ @@ -1198,7 +1204,7 @@ static asm void e_sf_attack(e_sf_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4556 = 2.0f; -COMPILER_STRIP_GATE(80789CC8, &lit_4556); +COMPILER_STRIP_GATE(0x80789CC8, &lit_4556); #pragma pop /* 80786524-807866F8 0014E4 01D4+00 1/1 0/0 0/0 .text e_sf_guard__FP10e_sf_class */ @@ -1222,6 +1228,12 @@ static asm void e_sf_s_damage(e_sf_class* param_0) { #pragma pop /* ############################################################################################## */ +/* 80789D84-80789D84 00014C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80789D89 = "D_MN10"; +#pragma pop + /* 8078A0A4-8078A0CC 00007C 0028+00 0/0 0/0 0/0 .bss target_info */ #pragma push #pragma force_active on @@ -1252,7 +1264,7 @@ static asm void e_sf_crash(e_sf_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4663 = 39.0f; -COMPILER_STRIP_GATE(80789CCC, &lit_4663); +COMPILER_STRIP_GATE(0x80789CCC, &lit_4663); #pragma pop /* 80789CD0-80789CD8 000098 0008+00 0/1 0/0 0/0 .rodata @4665 */ @@ -1261,7 +1273,7 @@ COMPILER_STRIP_GATE(80789CCC, &lit_4663); SECTION_RODATA static u8 const lit_4665[8] = { 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80789CD0, &lit_4665); +COMPILER_STRIP_GATE(0x80789CD0, &lit_4665); #pragma pop /* 80786B70-80786C50 001B30 00E0+00 1/1 0/0 0/0 .text e_sf_crashwait__FP10e_sf_class */ @@ -1297,7 +1309,7 @@ static asm void e_sf_getup(e_sf_class* param_0) { /* ############################################################################################## */ /* 80789CD8-80789CDC 0000A0 0004+00 1/1 0/0 0/0 .rodata @4790 */ SECTION_RODATA static f32 const lit_4790 = 1.5f; -COMPILER_STRIP_GATE(80789CD8, &lit_4790); +COMPILER_STRIP_GATE(0x80789CD8, &lit_4790); /* 80787018-807870D0 001FD8 00B8+00 1/1 0/0 0/0 .text crash_eff__FP10e_sf_class */ #pragma push @@ -1312,7 +1324,7 @@ static asm void crash_eff(e_sf_class* param_0) { /* ############################################################################################## */ /* 80789CDC-80789CE0 0000A4 0004+00 1/1 0/0 0/0 .rodata @4878 */ SECTION_RODATA static f32 const lit_4878 = 25.0f; -COMPILER_STRIP_GATE(80789CDC, &lit_4878); +COMPILER_STRIP_GATE(0x80789CDC, &lit_4878); /* 807870D0-807873C0 002090 02F0+00 1/1 0/0 0/0 .text damage_check__FP10e_sf_class */ #pragma push @@ -1339,56 +1351,56 @@ static asm void action(e_sf_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5196 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(80789CE0, &lit_5196); +COMPILER_STRIP_GATE(0x80789CE0, &lit_5196); #pragma pop /* 80789CE4-80789CE8 0000AC 0004+00 0/0 0/0 0/0 .rodata @5197 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5197 = -4.0f; -COMPILER_STRIP_GATE(80789CE4, &lit_5197); +COMPILER_STRIP_GATE(0x80789CE4, &lit_5197); #pragma pop /* 80789CE8-80789CEC 0000B0 0004+00 0/0 0/0 0/0 .rodata @5198 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5198 = -120.0f; -COMPILER_STRIP_GATE(80789CE8, &lit_5198); +COMPILER_STRIP_GATE(0x80789CE8, &lit_5198); #pragma pop /* 80789CEC-80789CF0 0000B4 0004+00 0/0 0/0 0/0 .rodata @5199 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5199 = 7.0f; -COMPILER_STRIP_GATE(80789CEC, &lit_5199); +COMPILER_STRIP_GATE(0x80789CEC, &lit_5199); #pragma pop /* 80789CF0-80789CF4 0000B8 0004+00 0/0 0/0 0/0 .rodata @5200 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5200 = 3.0f / 10.0f; -COMPILER_STRIP_GATE(80789CF0, &lit_5200); +COMPILER_STRIP_GATE(0x80789CF0, &lit_5200); #pragma pop /* 80789CF4-80789CF8 0000BC 0004+00 0/0 0/0 0/0 .rodata @5201 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5201 = 2500.0f; -COMPILER_STRIP_GATE(80789CF4, &lit_5201); +COMPILER_STRIP_GATE(0x80789CF4, &lit_5201); #pragma pop /* 80789CF8-80789CFC 0000C0 0004+00 0/0 0/0 0/0 .rodata @5202 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5202 = -150.0f; -COMPILER_STRIP_GATE(80789CF8, &lit_5202); +COMPILER_STRIP_GATE(0x80789CF8, &lit_5202); #pragma pop /* 80789CFC-80789D00 0000C4 0004+00 0/0 0/0 0/0 .rodata @5203 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5203 = 4000.0f; -COMPILER_STRIP_GATE(80789CFC, &lit_5203); +COMPILER_STRIP_GATE(0x80789CFC, &lit_5203); #pragma pop /* 80789D00-80789D08 0000C8 0004+04 0/0 0/0 0/0 .rodata @5204 */ @@ -1399,7 +1411,7 @@ SECTION_RODATA static f32 const lit_5204[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80789D00, &lit_5204); +COMPILER_STRIP_GATE(0x80789D00, &lit_5204); #pragma pop /* 80789D08-80789D10 0000D0 0008+00 0/0 0/0 0/0 .rodata @5207 */ @@ -1408,77 +1420,77 @@ COMPILER_STRIP_GATE(80789D00, &lit_5204); SECTION_RODATA static u8 const lit_5207[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80789D08, &lit_5207); +COMPILER_STRIP_GATE(0x80789D08, &lit_5207); #pragma pop /* 80789D10-80789D14 0000D8 0004+00 0/1 0/0 0/0 .rodata @5267 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5267 = 83.0f; -COMPILER_STRIP_GATE(80789D10, &lit_5267); +COMPILER_STRIP_GATE(0x80789D10, &lit_5267); #pragma pop /* 80789D14-80789D18 0000DC 0004+00 0/1 0/0 0/0 .rodata @5268 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5268 = 3.5f; -COMPILER_STRIP_GATE(80789D14, &lit_5268); +COMPILER_STRIP_GATE(0x80789D14, &lit_5268); #pragma pop /* 80789D18-80789D1C 0000E0 0004+00 0/1 0/0 0/0 .rodata @5269 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5269 = 4.0f; -COMPILER_STRIP_GATE(80789D18, &lit_5269); +COMPILER_STRIP_GATE(0x80789D18, &lit_5269); #pragma pop /* 80789D1C-80789D20 0000E4 0004+00 0/1 0/0 0/0 .rodata @5270 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5270 = 13.0f; -COMPILER_STRIP_GATE(80789D1C, &lit_5270); +COMPILER_STRIP_GATE(0x80789D1C, &lit_5270); #pragma pop /* 80789D20-80789D24 0000E8 0004+00 0/1 0/0 0/0 .rodata @5271 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5271 = 24.0f; -COMPILER_STRIP_GATE(80789D20, &lit_5271); +COMPILER_STRIP_GATE(0x80789D20, &lit_5271); #pragma pop /* 80789D24-80789D28 0000EC 0004+00 0/1 0/0 0/0 .rodata @5272 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5272 = 38.0f; -COMPILER_STRIP_GATE(80789D24, &lit_5272); +COMPILER_STRIP_GATE(0x80789D24, &lit_5272); #pragma pop /* 80789D28-80789D2C 0000F0 0004+00 0/1 0/0 0/0 .rodata @5273 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5273 = 57.0f; -COMPILER_STRIP_GATE(80789D28, &lit_5273); +COMPILER_STRIP_GATE(0x80789D28, &lit_5273); #pragma pop /* 80789D2C-80789D30 0000F4 0004+00 0/1 0/0 0/0 .rodata @5274 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5274 = 22.0f; -COMPILER_STRIP_GATE(80789D2C, &lit_5274); +COMPILER_STRIP_GATE(0x80789D2C, &lit_5274); #pragma pop /* 80789D30-80789D34 0000F8 0004+00 0/1 0/0 0/0 .rodata @5275 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5275 = 11.0f; -COMPILER_STRIP_GATE(80789D30, &lit_5275); +COMPILER_STRIP_GATE(0x80789D30, &lit_5275); #pragma pop /* 80789D34-80789D38 0000FC 0004+00 0/1 0/0 0/0 .rodata @5276 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5276 = 18.0f; -COMPILER_STRIP_GATE(80789D34, &lit_5276); +COMPILER_STRIP_GATE(0x80789D34, &lit_5276); #pragma pop /* 80787DD8-80787FE0 002D98 0208+00 1/1 0/0 0/0 .text anm_se_set__FP10e_sf_class */ @@ -1496,56 +1508,56 @@ static asm void anm_se_set(e_sf_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5447 = 75.0f; -COMPILER_STRIP_GATE(80789D38, &lit_5447); +COMPILER_STRIP_GATE(0x80789D38, &lit_5447); #pragma pop /* 80789D3C-80789D40 000104 0004+00 0/1 0/0 0/0 .rodata @5448 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5448 = 400.0f; -COMPILER_STRIP_GATE(80789D3C, &lit_5448); +COMPILER_STRIP_GATE(0x80789D3C, &lit_5448); #pragma pop /* 80789D40-80789D44 000108 0004+00 0/1 0/0 0/0 .rodata @5449 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5449 = 90.0f; -COMPILER_STRIP_GATE(80789D40, &lit_5449); +COMPILER_STRIP_GATE(0x80789D40, &lit_5449); #pragma pop /* 80789D44-80789D48 00010C 0004+00 0/1 0/0 0/0 .rodata @5450 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5450 = 0.25f; -COMPILER_STRIP_GATE(80789D44, &lit_5450); +COMPILER_STRIP_GATE(0x80789D44, &lit_5450); #pragma pop /* 80789D48-80789D4C 000110 0004+00 0/1 0/0 0/0 .rodata @5451 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5451 = -8918.0f; -COMPILER_STRIP_GATE(80789D48, &lit_5451); +COMPILER_STRIP_GATE(0x80789D48, &lit_5451); #pragma pop /* 80789D4C-80789D50 000114 0004+00 0/1 0/0 0/0 .rodata @5452 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5452 = -462.0f; -COMPILER_STRIP_GATE(80789D4C, &lit_5452); +COMPILER_STRIP_GATE(0x80789D4C, &lit_5452); #pragma pop /* 80789D50-80789D54 000118 0004+00 0/1 0/0 0/0 .rodata @5453 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5453 = 700.0f; -COMPILER_STRIP_GATE(80789D50, &lit_5453); +COMPILER_STRIP_GATE(0x80789D50, &lit_5453); #pragma pop /* 80789D54-80789D58 00011C 0004+00 0/1 0/0 0/0 .rodata @5454 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5454 = -250.0f; -COMPILER_STRIP_GATE(80789D54, &lit_5454); +COMPILER_STRIP_GATE(0x80789D54, &lit_5454); #pragma pop /* 80787FE0-80788568 002FA0 0588+00 1/1 0/0 0/0 .text demo_camera__FP10e_sf_class */ @@ -1563,63 +1575,63 @@ static asm void demo_camera(e_sf_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5676 = -200000.0f; -COMPILER_STRIP_GATE(80789D58, &lit_5676); +COMPILER_STRIP_GATE(0x80789D58, &lit_5676); #pragma pop /* 80789D5C-80789D60 000124 0004+00 0/1 0/0 0/0 .rodata @5677 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5677 = -150000.0f; -COMPILER_STRIP_GATE(80789D5C, &lit_5677); +COMPILER_STRIP_GATE(0x80789D5C, &lit_5677); #pragma pop /* 80789D60-80789D64 000128 0004+00 0/1 0/0 0/0 .rodata @5678 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5678 = -20.0f; -COMPILER_STRIP_GATE(80789D60, &lit_5678); +COMPILER_STRIP_GATE(0x80789D60, &lit_5678); #pragma pop /* 80789D64-80789D68 00012C 0004+00 0/1 0/0 0/0 .rodata @5679 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5679 = -30.0f; -COMPILER_STRIP_GATE(80789D64, &lit_5679); +COMPILER_STRIP_GATE(0x80789D64, &lit_5679); #pragma pop /* 80789D68-80789D6C 000130 0004+00 0/1 0/0 0/0 .rodata @5680 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5680 = 30.0f; -COMPILER_STRIP_GATE(80789D68, &lit_5680); +COMPILER_STRIP_GATE(0x80789D68, &lit_5680); #pragma pop /* 80789D6C-80789D70 000134 0004+00 0/2 0/0 0/0 .rodata @5681 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5681 = 80.0f; -COMPILER_STRIP_GATE(80789D6C, &lit_5681); +COMPILER_STRIP_GATE(0x80789D6C, &lit_5681); #pragma pop /* 80789D70-80789D74 000138 0004+00 0/1 0/0 0/0 .rodata @5682 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5682 = 35.0f; -COMPILER_STRIP_GATE(80789D70, &lit_5682); +COMPILER_STRIP_GATE(0x80789D70, &lit_5682); #pragma pop /* 80789D74-80789D78 00013C 0004+00 0/1 0/0 0/0 .rodata @5683 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5683 = -60.0f; -COMPILER_STRIP_GATE(80789D74, &lit_5683); +COMPILER_STRIP_GATE(0x80789D74, &lit_5683); #pragma pop /* 80789D78-80789D7C 000140 0004+00 0/1 0/0 0/0 .rodata @5684 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5684 = 180.0f; -COMPILER_STRIP_GATE(80789D78, &lit_5684); +COMPILER_STRIP_GATE(0x80789D78, &lit_5684); #pragma pop /* 80788568-80788D38 003528 07D0+00 2/1 0/0 0/0 .text daE_SF_Execute__FP10e_sf_class */ @@ -1662,14 +1674,14 @@ static asm void useHeapInit(fopAc_ac_c* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5929 = -200.0f; -COMPILER_STRIP_GATE(80789D7C, &lit_5929); +COMPILER_STRIP_GATE(0x80789D7C, &lit_5929); #pragma pop /* 80789D80-80789D84 000148 0004+00 0/1 0/0 0/0 .rodata @5930 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5930 = 65535.0f; -COMPILER_STRIP_GATE(80789D80, &lit_5930); +COMPILER_STRIP_GATE(0x80789D80, &lit_5930); #pragma pop /* 80788F88-80789418 003F48 0490+00 1/0 0/0 0/0 .text daE_SF_Create__FP10fopAc_ac_c */ @@ -1784,7 +1796,7 @@ asm void __sinit_d_a_e_sf_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_807897C4 = (void*)__sinit_d_a_e_sf_cpp; +REGISTER_CTORS(0x807897C4, __sinit_d_a_e_sf_cpp); #pragma pop /* 80789800-80789808 0047C0 0008+00 1/0 0/0 0/0 .text @36@__dt__12dBgS_ObjAcchFv */ @@ -1991,10 +2003,4 @@ static u8 data_8078A130[4]; static u8 data_8078A134[4]; #pragma pop -/* 80789D84-80789D90 00014C 000C+00 5/5 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80789D84 = "E_sf"; -SECTION_DEAD static char const* const stringBase_80789D89 = "D_MN10"; -#pragma pop +/* 80789D84-80789D84 00014C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/e/d_a_e_sg/d_a_e_sg.cpp b/rel/d/a/e/d_a_e_sg/d_a_e_sg.cpp index a735ae9e46b..f9e605d3fba 100644 --- a/rel/d/a/e/d_a_e_sg/d_a_e_sg.cpp +++ b/rel/d/a/e/d_a_e_sg/d_a_e_sg.cpp @@ -61,22 +61,22 @@ struct dRes_control_c { struct dPa_levelEcallBack {}; -struct _GXColor {}; - struct csXyz { /* 802673F4 */ csXyz(s16, s16, s16); }; +struct _GXColor {}; + struct dPa_control_c { /* 8004D4CC */ void set(u32, u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, cXyz const*, f32); }; -struct dJntColData_c {}; - struct J3DModel {}; +struct dJntColData_c {}; + struct dJntCol_c { /* 80035C8C */ dJntCol_c(); /* 80035CA0 */ void init(fopAc_ac_c*, dJntColData_c const*, J3DModel*, int); @@ -353,27 +353,27 @@ extern "C" void __register_global_object(); /* ############################################################################################## */ /* 8078DDA4-8078DDA8 000000 0004+00 13/13 0/0 0/0 .rodata @3767 */ SECTION_RODATA static f32 const lit_3767 = 6.0f / 5.0f; -COMPILER_STRIP_GATE(8078DDA4, &lit_3767); +COMPILER_STRIP_GATE(0x8078DDA4, &lit_3767); /* 8078DDA8-8078DDAC 000004 0004+00 0/7 0/0 0/0 .rodata @3768 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3768 = 10.0f; -COMPILER_STRIP_GATE(8078DDA8, &lit_3768); +COMPILER_STRIP_GATE(0x8078DDA8, &lit_3768); #pragma pop /* 8078DDAC-8078DDB0 000008 0004+00 0/1 0/0 0/0 .rodata @3769 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3769 = 13.0f; -COMPILER_STRIP_GATE(8078DDAC, &lit_3769); +COMPILER_STRIP_GATE(0x8078DDAC, &lit_3769); #pragma pop /* 8078DDB0-8078DDB4 00000C 0004+00 0/1 0/0 0/0 .rodata @3770 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3770 = 500.0f; -COMPILER_STRIP_GATE(8078DDB0, &lit_3770); +COMPILER_STRIP_GATE(0x8078DDB0, &lit_3770); #pragma pop /* 8078DEB4-8078DF34 000000 0080+00 4/4 0/0 0/0 .data stick_bit */ @@ -574,14 +574,14 @@ static asm void nodeCallBack(J3DJoint* param_0, int param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3842 = 100.0f; -COMPILER_STRIP_GATE(8078DDB4, &lit_3842); +COMPILER_STRIP_GATE(0x8078DDB4, &lit_3842); #pragma pop /* 8078DDB8-8078DDBC 000014 0004+00 0/1 0/0 0/0 .rodata @3843 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3843 = 400.0f; -COMPILER_STRIP_GATE(8078DDB8, &lit_3843); +COMPILER_STRIP_GATE(0x8078DDB8, &lit_3843); #pragma pop /* 8078DDBC-8078DDC0 000018 0004+00 1/11 0/0 0/0 .rodata @3844 */ @@ -591,13 +591,13 @@ SECTION_RODATA static u8 const lit_3844[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(8078DDBC, &lit_3844); +COMPILER_STRIP_GATE(0x8078DDBC, &lit_3844); /* 8078DDC0-8078DDC4 00001C 0004+00 0/10 0/0 0/0 .rodata @3845 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3845 = 1.0f; -COMPILER_STRIP_GATE(8078DDC0, &lit_3845); +COMPILER_STRIP_GATE(0x8078DDC0, &lit_3845); #pragma pop /* 8078A400-8078A4DC 0002C0 00DC+00 1/0 0/0 0/0 .text daE_SG_Draw__FP10e_sg_class */ @@ -742,7 +742,7 @@ SECTION_RODATA static f32 const lit_3901[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(8078DDC4, &lit_3901); +COMPILER_STRIP_GATE(0x8078DDC4, &lit_3901); /* 8078A588-8078A67C 000448 00F4+00 3/3 0/0 0/0 .text otherBgCheck__FP10fopAc_ac_cP4cXyzP4cXyz */ #pragma push @@ -793,7 +793,7 @@ static asm void s_box_sub(void* param_0, void* param_1) { SECTION_RODATA static u8 const lit_3999[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8078DDCC, &lit_3999); +COMPILER_STRIP_GATE(0x8078DDCC, &lit_3999); #pragma pop /* 8078DDD4-8078DDDC 000030 0008+00 0/6 0/0 0/0 .rodata @4000 */ @@ -802,7 +802,7 @@ COMPILER_STRIP_GATE(8078DDCC, &lit_3999); SECTION_RODATA static u8 const lit_4000[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8078DDD4, &lit_4000); +COMPILER_STRIP_GATE(0x8078DDD4, &lit_4000); #pragma pop /* 8078DDDC-8078DDE4 000038 0008+00 0/6 0/0 0/0 .rodata @4001 */ @@ -811,7 +811,7 @@ COMPILER_STRIP_GATE(8078DDD4, &lit_4000); SECTION_RODATA static u8 const lit_4001[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8078DDDC, &lit_4001); +COMPILER_STRIP_GATE(0x8078DDDC, &lit_4001); #pragma pop /* 8078A6EC-8078A9B8 0005AC 02CC+00 1/1 0/0 0/0 .text search_box__FP10e_sg_class */ @@ -827,7 +827,7 @@ static asm void search_box(e_sg_class* param_0) { /* ############################################################################################## */ /* 8078DDE4-8078DDE8 000040 0004+00 1/7 0/0 0/0 .rodata @4015 */ SECTION_RODATA static f32 const lit_4015 = 20.0f; -COMPILER_STRIP_GATE(8078DDE4, &lit_4015); +COMPILER_STRIP_GATE(0x8078DDE4, &lit_4015); /* 8078A9B8-8078AA3C 000878 0084+00 1/1 0/0 0/0 .text search_esa__FP10e_sg_class */ #pragma push @@ -844,77 +844,77 @@ static asm void search_esa(e_sg_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4216 = 50.0f; -COMPILER_STRIP_GATE(8078DDE8, &lit_4216); +COMPILER_STRIP_GATE(0x8078DDE8, &lit_4216); #pragma pop /* 8078DDEC-8078DDF0 000048 0004+00 0/8 0/0 0/0 .rodata @4217 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4217 = 0.5f; -COMPILER_STRIP_GATE(8078DDEC, &lit_4217); +COMPILER_STRIP_GATE(0x8078DDEC, &lit_4217); #pragma pop /* 8078DDF0-8078DDF4 00004C 0004+00 0/2 0/0 0/0 .rodata @4218 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4218 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(8078DDF0, &lit_4218); +COMPILER_STRIP_GATE(0x8078DDF0, &lit_4218); #pragma pop /* 8078DDF4-8078DDF8 000050 0004+00 0/2 0/0 0/0 .rodata @4219 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4219 = 1.0f / 20.0f; -COMPILER_STRIP_GATE(8078DDF4, &lit_4219); +COMPILER_STRIP_GATE(0x8078DDF4, &lit_4219); #pragma pop /* 8078DDF8-8078DDFC 000054 0004+00 0/1 0/0 0/0 .rodata @4220 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4220 = 3.0f / 10.0f; -COMPILER_STRIP_GATE(8078DDF8, &lit_4220); +COMPILER_STRIP_GATE(0x8078DDF8, &lit_4220); #pragma pop /* 8078DDFC-8078DE00 000058 0004+00 0/2 0/0 0/0 .rodata @4221 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4221 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(8078DDFC, &lit_4221); +COMPILER_STRIP_GATE(0x8078DDFC, &lit_4221); #pragma pop /* 8078DE00-8078DE04 00005C 0004+00 0/1 0/0 0/0 .rodata @4222 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4222 = 12000.0f; -COMPILER_STRIP_GATE(8078DE00, &lit_4222); +COMPILER_STRIP_GATE(0x8078DE00, &lit_4222); #pragma pop /* 8078DE04-8078DE08 000060 0004+00 0/5 0/0 0/0 .rodata @4223 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4223 = 5.0f; -COMPILER_STRIP_GATE(8078DE04, &lit_4223); +COMPILER_STRIP_GATE(0x8078DE04, &lit_4223); #pragma pop /* 8078DE08-8078DE0C 000064 0004+00 0/4 0/0 0/0 .rodata @4224 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4224 = 4000.0f; -COMPILER_STRIP_GATE(8078DE08, &lit_4224); +COMPILER_STRIP_GATE(0x8078DE08, &lit_4224); #pragma pop /* 8078DE0C-8078DE10 000068 0004+00 0/4 0/0 0/0 .rodata @4225 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4225 = -4000.0f; -COMPILER_STRIP_GATE(8078DE0C, &lit_4225); +COMPILER_STRIP_GATE(0x8078DE0C, &lit_4225); #pragma pop /* 8078DE10-8078DE14 00006C 0004+00 0/5 0/0 0/0 .rodata @4226 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4226 = 1000.0f; -COMPILER_STRIP_GATE(8078DE10, &lit_4226); +COMPILER_STRIP_GATE(0x8078DE10, &lit_4226); #pragma pop /* 8078DE14-8078DE1C 000070 0004+04 0/3 0/0 0/0 .rodata @4227 */ @@ -925,7 +925,7 @@ SECTION_RODATA static f32 const lit_4227[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(8078DE14, &lit_4227); +COMPILER_STRIP_GATE(0x8078DE14, &lit_4227); #pragma pop /* 8078DE1C-8078DE24 000078 0008+00 0/5 0/0 0/0 .rodata @4229 */ @@ -934,7 +934,7 @@ COMPILER_STRIP_GATE(8078DE14, &lit_4227); SECTION_RODATA static u8 const lit_4229[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8078DE1C, &lit_4229); +COMPILER_STRIP_GATE(0x8078DE1C, &lit_4229); #pragma pop /* 8078AA3C-8078B114 0008FC 06D8+00 1/1 0/0 0/0 .text e_sg_move__FP10e_sg_class */ @@ -952,28 +952,28 @@ static asm void e_sg_move(e_sg_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4314 = 9.0f / 10.0f; -COMPILER_STRIP_GATE(8078DE24, &lit_4314); +COMPILER_STRIP_GATE(0x8078DE24, &lit_4314); #pragma pop /* 8078DE28-8078DE2C 000084 0004+00 0/1 0/0 0/0 .rodata @4315 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4315 = 7000.0f; -COMPILER_STRIP_GATE(8078DE28, &lit_4315); +COMPILER_STRIP_GATE(0x8078DE28, &lit_4315); #pragma pop /* 8078DE2C-8078DE30 000088 0004+00 0/1 0/0 0/0 .rodata @4316 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4316 = 2.0f / 5.0f; -COMPILER_STRIP_GATE(8078DE2C, &lit_4316); +COMPILER_STRIP_GATE(0x8078DE2C, &lit_4316); #pragma pop /* 8078DE30-8078DE34 00008C 0004+00 0/2 0/0 0/0 .rodata @4317 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4317 = 80.0f; -COMPILER_STRIP_GATE(8078DE30, &lit_4317); +COMPILER_STRIP_GATE(0x8078DE30, &lit_4317); #pragma pop /* 8078B114-8078B618 000FD4 0504+00 1/1 0/0 0/0 .text e_sg_search__FP10e_sg_class */ @@ -991,49 +991,49 @@ static asm void e_sg_search(e_sg_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4448 = 60.0f; -COMPILER_STRIP_GATE(8078DE34, &lit_4448); +COMPILER_STRIP_GATE(0x8078DE34, &lit_4448); #pragma pop /* 8078DE38-8078DE3C 000094 0004+00 0/4 0/0 0/0 .rodata @4449 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4449 = 3000.0f; -COMPILER_STRIP_GATE(8078DE38, &lit_4449); +COMPILER_STRIP_GATE(0x8078DE38, &lit_4449); #pragma pop /* 8078DE3C-8078DE40 000098 0004+00 0/2 0/0 0/0 .rodata @4450 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4450 = 200.0f; -COMPILER_STRIP_GATE(8078DE3C, &lit_4450); +COMPILER_STRIP_GATE(0x8078DE3C, &lit_4450); #pragma pop /* 8078DE40-8078DE44 00009C 0004+00 0/3 0/0 0/0 .rodata @4451 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4451 = 2000.0f; -COMPILER_STRIP_GATE(8078DE40, &lit_4451); +COMPILER_STRIP_GATE(0x8078DE40, &lit_4451); #pragma pop /* 8078DE44-8078DE48 0000A0 0004+00 0/1 0/0 0/0 .rodata @4452 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4452 = 300.0f; -COMPILER_STRIP_GATE(8078DE44, &lit_4452); +COMPILER_STRIP_GATE(0x8078DE44, &lit_4452); #pragma pop /* 8078DE48-8078DE4C 0000A4 0004+00 0/1 0/0 0/0 .rodata @4453 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4453 = 700.0f; -COMPILER_STRIP_GATE(8078DE48, &lit_4453); +COMPILER_STRIP_GATE(0x8078DE48, &lit_4453); #pragma pop /* 8078DE4C-8078DE50 0000A8 0004+00 0/2 0/0 0/0 .rodata @4454 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4454 = -100.0f; -COMPILER_STRIP_GATE(8078DE4C, &lit_4454); +COMPILER_STRIP_GATE(0x8078DE4C, &lit_4454); #pragma pop /* 8078B618-8078BC24 0014D8 060C+00 1/1 0/0 0/0 .text e_sg_b_search__FP10e_sg_class */ @@ -1051,14 +1051,14 @@ static asm void e_sg_b_search(e_sg_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4543 = 40.0f; -COMPILER_STRIP_GATE(8078DE50, &lit_4543); +COMPILER_STRIP_GATE(0x8078DE50, &lit_4543); #pragma pop /* 8078DE54-8078DE58 0000B0 0004+00 0/1 0/0 0/0 .rodata @4544 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4544 = 7.0f / 10.0f; -COMPILER_STRIP_GATE(8078DE54, &lit_4544); +COMPILER_STRIP_GATE(0x8078DE54, &lit_4544); #pragma pop /* 8078BC24-8078C068 001AE4 0444+00 1/1 0/0 0/0 .text e_sg_esa_search__FP10e_sg_class */ @@ -1076,7 +1076,7 @@ static asm void e_sg_esa_search(e_sg_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4604 = 8000.0f; -COMPILER_STRIP_GATE(8078DE58, &lit_4604); +COMPILER_STRIP_GATE(0x8078DE58, &lit_4604); #pragma pop /* 8078C068-8078C470 001F28 0408+00 1/1 0/0 0/0 .text e_sg_kamu__FP10e_sg_class */ @@ -1094,14 +1094,14 @@ static asm void e_sg_kamu(e_sg_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4649 = 15000.0f; -COMPILER_STRIP_GATE(8078DE5C, &lit_4649); +COMPILER_STRIP_GATE(0x8078DE5C, &lit_4649); #pragma pop /* 8078DE60-8078DE64 0000BC 0004+00 0/2 0/0 0/0 .rodata @4650 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4650 = 3.0f; -COMPILER_STRIP_GATE(8078DE60, &lit_4650); +COMPILER_STRIP_GATE(0x8078DE60, &lit_4650); #pragma pop /* 8078C470-8078C77C 002330 030C+00 1/1 0/0 0/0 .text e_sg_drop__FP10e_sg_class */ @@ -1119,7 +1119,7 @@ static asm void e_sg_drop(e_sg_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4700 = 2.0f; -COMPILER_STRIP_GATE(8078DE64, &lit_4700); +COMPILER_STRIP_GATE(0x8078DE64, &lit_4700); #pragma pop /* 8078C77C-8078CA1C 00263C 02A0+00 1/1 0/0 0/0 .text e_sg_damage__FP10e_sg_class */ @@ -1159,70 +1159,70 @@ static asm void action(e_sg_class* param_0) { SECTION_RODATA static u8 const lit_4743[12] = { 0x3F, 0x80, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x40, 0x60, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8078DE68, &lit_4743); +COMPILER_STRIP_GATE(0x8078DE68, &lit_4743); #pragma pop /* 8078DE74-8078DE78 0000D0 0004+00 0/0 0/0 0/0 .rodata @4805 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4805 = 13000.0f; -COMPILER_STRIP_GATE(8078DE74, &lit_4805); +COMPILER_STRIP_GATE(0x8078DE74, &lit_4805); #pragma pop /* 8078DE78-8078DE7C 0000D4 0004+00 0/0 0/0 0/0 .rodata @4806 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4806 = -3.0f / 10.0f; -COMPILER_STRIP_GATE(8078DE78, &lit_4806); +COMPILER_STRIP_GATE(0x8078DE78, &lit_4806); #pragma pop /* 8078DE7C-8078DE80 0000D8 0004+00 0/0 0/0 0/0 .rodata @4807 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4807 = 0.75f; -COMPILER_STRIP_GATE(8078DE7C, &lit_4807); +COMPILER_STRIP_GATE(0x8078DE7C, &lit_4807); #pragma pop /* 8078DE80-8078DE84 0000DC 0004+00 0/0 0/0 0/0 .rodata @4808 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4808 = -2.5f; -COMPILER_STRIP_GATE(8078DE80, &lit_4808); +COMPILER_STRIP_GATE(0x8078DE80, &lit_4808); #pragma pop /* 8078DE84-8078DE88 0000E0 0004+00 0/1 0/0 0/0 .rodata @4809 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4809 = 15.0f; -COMPILER_STRIP_GATE(8078DE84, &lit_4809); +COMPILER_STRIP_GATE(0x8078DE84, &lit_4809); #pragma pop /* 8078DE88-8078DE8C 0000E4 0004+00 0/1 0/0 0/0 .rodata @4966 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4966 = -1000000000.0f; -COMPILER_STRIP_GATE(8078DE88, &lit_4966); +COMPILER_STRIP_GATE(0x8078DE88, &lit_4966); #pragma pop /* 8078DE8C-8078DE90 0000E8 0004+00 0/1 0/0 0/0 .rodata @4967 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4967 = 250.0f; -COMPILER_STRIP_GATE(8078DE8C, &lit_4967); +COMPILER_STRIP_GATE(0x8078DE8C, &lit_4967); #pragma pop /* 8078DE90-8078DE94 0000EC 0004+00 0/1 0/0 0/0 .rodata @4968 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4968 = -15.0f; -COMPILER_STRIP_GATE(8078DE90, &lit_4968); +COMPILER_STRIP_GATE(0x8078DE90, &lit_4968); #pragma pop /* 8078DE94-8078DE98 0000F0 0004+00 0/1 0/0 0/0 .rodata @4969 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4969 = 20000.0f; -COMPILER_STRIP_GATE(8078DE94, &lit_4969); +COMPILER_STRIP_GATE(0x8078DE94, &lit_4969); #pragma pop /* 8078E1C4-8078E1D4 00012C 000C+04 0/1 0/0 0/0 .bss @4849 */ @@ -1252,6 +1252,13 @@ static bool daE_SG_IsDelete(e_sg_class* param_0) { return true; } +/* ############################################################################################## */ +/* 8078DEAC-8078DEAC 000108 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8078DEAC = "E_sg"; +#pragma pop + /* 8078D5FC-8078D6B0 0034BC 00B4+00 1/0 0/0 0/0 .text daE_SG_Delete__FP10e_sg_class */ #pragma push #pragma optimization_level 0 @@ -1277,7 +1284,7 @@ static asm void useHeapInit(fopAc_ac_c* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5130 = -150.0f; -COMPILER_STRIP_GATE(8078DE98, &lit_5130); +COMPILER_STRIP_GATE(0x8078DE98, &lit_5130); #pragma pop /* 8078DE9C-8078DEA4 0000F8 0004+04 0/1 0/0 0/0 .rodata @5131 */ @@ -1288,7 +1295,7 @@ SECTION_RODATA static f32 const lit_5131[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(8078DE9C, &lit_5131); +COMPILER_STRIP_GATE(0x8078DE9C, &lit_5131); #pragma pop /* 8078DEA4-8078DEAC 000100 0008+00 0/1 0/0 0/0 .rodata @5134 */ @@ -1297,7 +1304,7 @@ COMPILER_STRIP_GATE(8078DE9C, &lit_5131); SECTION_RODATA static u8 const lit_5134[8] = { 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8078DEA4, &lit_5134); +COMPILER_STRIP_GATE(0x8078DEA4, &lit_5134); #pragma pop /* 8078D780-8078DB84 003640 0404+00 1/0 0/0 0/0 .text daE_SG_Create__FP10fopAc_ac_c */ @@ -1362,7 +1369,7 @@ asm void __sinit_d_a_e_sg_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_8078DCCC = (void*)__sinit_d_a_e_sg_cpp; +REGISTER_CTORS(0x8078DCCC, __sinit_d_a_e_sg_cpp); #pragma pop /* 8078DD44-8078DD7C 003C04 0038+00 1/1 0/0 0/0 .text __arraydtor$3865 */ @@ -1572,9 +1579,4 @@ static u8 data_8078E23C[4]; static u8 data_8078E240[4]; #pragma pop -/* 8078DEAC-8078DEB1 000108 0005+00 3/3 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_8078DEAC = "E_sg"; -#pragma pop +/* 8078DEAC-8078DEAC 000108 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/e/d_a_e_sh/d_a_e_sh.cpp b/rel/d/a/e/d_a_e_sh/d_a_e_sh.cpp index 6f22706852c..8ab9a4dd908 100644 --- a/rel/d/a/e/d_a_e_sh/d_a_e_sh.cpp +++ b/rel/d/a/e/d_a_e_sh/d_a_e_sh.cpp @@ -19,16 +19,16 @@ struct mDoMtx_stack_c { static u8 now[48]; }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; - struct J3DAnmTransform {}; +struct J3DModelData {}; + +struct Z2Creature {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -79,10 +79,10 @@ struct dRes_control_c { struct dPa_levelEcallBack {}; -struct _GXColor {}; - struct csXyz {}; +struct _GXColor {}; + struct dPa_control_c { struct level_c { /* 8004B918 */ void getEmitter(u32); @@ -390,7 +390,7 @@ extern "C" void __register_global_object(); /* ############################################################################################## */ /* 80791D70-80791D74 000000 0004+00 13/13 0/0 0/0 .rodata @3902 */ SECTION_RODATA static f32 const lit_3902 = 100.0f; -COMPILER_STRIP_GATE(80791D70, &lit_3902); +COMPILER_STRIP_GATE(0x80791D70, &lit_3902); /* 80791D74-80791D78 000004 0004+00 2/11 0/0 0/0 .rodata @3903 */ SECTION_RODATA static u8 const lit_3903[4] = { @@ -399,7 +399,7 @@ SECTION_RODATA static u8 const lit_3903[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80791D74, &lit_3903); +COMPILER_STRIP_GATE(0x80791D74, &lit_3903); /* 80791D78-80791D80 000008 0004+04 2/13 0/0 0/0 .rodata @3904 */ SECTION_RODATA static f32 const lit_3904[1 + 1 /* padding */] = { @@ -407,7 +407,7 @@ SECTION_RODATA static f32 const lit_3904[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80791D78, &lit_3904); +COMPILER_STRIP_GATE(0x80791D78, &lit_3904); /* 80791D80-80791D88 000010 0008+00 0/3 0/0 0/0 .rodata @3905 */ #pragma push @@ -415,7 +415,7 @@ COMPILER_STRIP_GATE(80791D78, &lit_3904); SECTION_RODATA static u8 const lit_3905[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80791D80, &lit_3905); +COMPILER_STRIP_GATE(0x80791D80, &lit_3905); #pragma pop /* 80791D88-80791D90 000018 0008+00 0/3 0/0 0/0 .rodata @3906 */ @@ -424,7 +424,7 @@ COMPILER_STRIP_GATE(80791D80, &lit_3905); SECTION_RODATA static u8 const lit_3906[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80791D88, &lit_3906); +COMPILER_STRIP_GATE(0x80791D88, &lit_3906); #pragma pop /* 80791D90-80791D98 000020 0008+00 0/3 0/0 0/0 .rodata @3907 */ @@ -433,70 +433,70 @@ COMPILER_STRIP_GATE(80791D88, &lit_3906); SECTION_RODATA static u8 const lit_3907[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80791D90, &lit_3907); +COMPILER_STRIP_GATE(0x80791D90, &lit_3907); #pragma pop /* 80791D98-80791D9C 000028 0004+00 0/1 0/0 0/0 .rodata @3908 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3908 = 1.0f / 100.0f; -COMPILER_STRIP_GATE(80791D98, &lit_3908); +COMPILER_STRIP_GATE(0x80791D98, &lit_3908); #pragma pop /* 80791D9C-80791DA0 00002C 0004+00 0/1 0/0 0/0 .rodata @3923 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3923 = 23.0f / 20.0f; -COMPILER_STRIP_GATE(80791D9C, &lit_3923); +COMPILER_STRIP_GATE(0x80791D9C, &lit_3923); #pragma pop /* 80791DA0-80791DA4 000030 0004+00 0/6 0/0 0/0 .rodata @3924 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3924 = 5.0f; -COMPILER_STRIP_GATE(80791DA0, &lit_3924); +COMPILER_STRIP_GATE(0x80791DA0, &lit_3924); #pragma pop /* 80791DA4-80791DA8 000034 0004+00 0/2 0/0 0/0 .rodata @3925 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3925 = 20.0f; -COMPILER_STRIP_GATE(80791DA4, &lit_3925); +COMPILER_STRIP_GATE(0x80791DA4, &lit_3925); #pragma pop /* 80791DA8-80791DAC 000038 0004+00 0/1 0/0 0/0 .rodata @3926 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3926 = 600.0f; -COMPILER_STRIP_GATE(80791DA8, &lit_3926); +COMPILER_STRIP_GATE(0x80791DA8, &lit_3926); #pragma pop /* 80791DAC-80791DB0 00003C 0004+00 0/1 0/0 0/0 .rodata @3927 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3927 = 700.0f; -COMPILER_STRIP_GATE(80791DAC, &lit_3927); +COMPILER_STRIP_GATE(0x80791DAC, &lit_3927); #pragma pop /* 80791DB0-80791DB4 000040 0004+00 0/1 0/0 0/0 .rodata @3928 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3928 = 800.0f; -COMPILER_STRIP_GATE(80791DB0, &lit_3928); +COMPILER_STRIP_GATE(0x80791DB0, &lit_3928); #pragma pop /* 80791DB4-80791DB8 000044 0004+00 0/1 0/0 0/0 .rodata @3929 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3929 = 900.0f; -COMPILER_STRIP_GATE(80791DB4, &lit_3929); +COMPILER_STRIP_GATE(0x80791DB4, &lit_3929); #pragma pop /* 80791DB8-80791DBC 000048 0004+00 0/2 0/0 0/0 .rodata @3930 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3930 = 500.0f; -COMPILER_STRIP_GATE(80791DB8, &lit_3930); +COMPILER_STRIP_GATE(0x80791DB8, &lit_3930); #pragma pop /* 80791EC8-80791ED4 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ @@ -721,7 +721,13 @@ asm daE_SH_HIO_c::daE_SH_HIO_c() { /* ############################################################################################## */ /* 80791DBC-80791DC0 00004C 0004+00 1/1 0/0 0/0 .rodata @3944 */ SECTION_RODATA static f32 const lit_3944 = -1.0f; -COMPILER_STRIP_GATE(80791DBC, &lit_3944); +COMPILER_STRIP_GATE(0x80791DBC, &lit_3944); + +/* 80791EC0-80791EC0 000150 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80791EC0 = "E_sh"; +#pragma pop /* 8078E3B4-8078E460 000154 00AC+00 6/6 0/0 0/0 .text anm_init__FP10e_sh_classifUcf */ #pragma push @@ -748,14 +754,14 @@ static asm void nodeCallBack(J3DJoint* param_0, int param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4060 = 50.0f; -COMPILER_STRIP_GATE(80791DC0, &lit_4060); +COMPILER_STRIP_GATE(0x80791DC0, &lit_4060); #pragma pop /* 80791DC4-80791DC8 000054 0004+00 0/1 0/0 0/0 .rodata @4061 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4061 = 1000.0f; -COMPILER_STRIP_GATE(80791DC4, &lit_4061); +COMPILER_STRIP_GATE(0x80791DC4, &lit_4061); #pragma pop /* 8078E6B8-8078E868 000458 01B0+00 1/0 0/0 0/0 .text daE_SH_Draw__FP10e_sh_class */ @@ -771,11 +777,11 @@ static asm void daE_SH_Draw(e_sh_class* param_0) { /* ############################################################################################## */ /* 80791DC8-80791DCC 000058 0004+00 1/1 0/0 0/0 .rodata @4144 */ SECTION_RODATA static f32 const lit_4144 = 45.0f; -COMPILER_STRIP_GATE(80791DC8, &lit_4144); +COMPILER_STRIP_GATE(0x80791DC8, &lit_4144); /* 80791DCC-80791DD0 00005C 0004+00 1/2 0/0 0/0 .rodata @4145 */ SECTION_RODATA static f32 const lit_4145 = 30.0f; -COMPILER_STRIP_GATE(80791DCC, &lit_4145); +COMPILER_STRIP_GATE(0x80791DCC, &lit_4145); /* 8078E868-8078EA58 000608 01F0+00 1/1 0/0 0/0 .text damage_check__FP10e_sh_class */ #pragma push @@ -792,7 +798,7 @@ static asm void damage_check(e_sh_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4214 = 15.0f; -COMPILER_STRIP_GATE(80791DD0, &lit_4214); +COMPILER_STRIP_GATE(0x80791DD0, &lit_4214); #pragma pop /* 807920F8-807920FC 000008 0004+00 2/2 0/0 0/0 .bss None */ @@ -817,7 +823,7 @@ static asm void e_sh_stop(e_sh_class* param_0) { /* ############################################################################################## */ /* 80791DD4-80791DD8 000064 0004+00 1/1 0/0 0/0 .rodata @4237 */ SECTION_RODATA static f32 const lit_4237 = 34.0f; -COMPILER_STRIP_GATE(80791DD4, &lit_4237); +COMPILER_STRIP_GATE(0x80791DD4, &lit_4237); /* 8078EC04-8078ECCC 0009A4 00C8+00 1/1 0/0 0/0 .text e_sh_appear__FP10e_sh_class */ #pragma push @@ -834,105 +840,105 @@ static asm void e_sh_appear(e_sh_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4378 = 0.5f; -COMPILER_STRIP_GATE(80791DD8, &lit_4378); +COMPILER_STRIP_GATE(0x80791DD8, &lit_4378); #pragma pop /* 80791DDC-80791DE0 00006C 0004+00 0/2 0/0 0/0 .rodata @4379 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4379 = 10.0f; -COMPILER_STRIP_GATE(80791DDC, &lit_4379); +COMPILER_STRIP_GATE(0x80791DDC, &lit_4379); #pragma pop /* 80791DE0-80791DE4 000070 0004+00 0/2 0/0 0/0 .rodata @4380 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4380 = 1.5f; -COMPILER_STRIP_GATE(80791DE0, &lit_4380); +COMPILER_STRIP_GATE(0x80791DE0, &lit_4380); #pragma pop /* 80791DE4-80791DE8 000074 0004+00 0/2 0/0 0/0 .rodata @4381 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4381 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(80791DE4, &lit_4381); +COMPILER_STRIP_GATE(0x80791DE4, &lit_4381); #pragma pop /* 80791DE8-80791DEC 000078 0004+00 0/1 0/0 0/0 .rodata @4382 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4382 = 1.0f / 20.0f; -COMPILER_STRIP_GATE(80791DE8, &lit_4382); +COMPILER_STRIP_GATE(0x80791DE8, &lit_4382); #pragma pop /* 80791DEC-80791DF0 00007C 0004+00 0/3 0/0 0/0 .rodata @4383 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4383 = 4.0f; -COMPILER_STRIP_GATE(80791DEC, &lit_4383); +COMPILER_STRIP_GATE(0x80791DEC, &lit_4383); #pragma pop /* 80791DF0-80791DF4 000080 0004+00 0/1 0/0 0/0 .rodata @4384 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4384 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(80791DF0, &lit_4384); +COMPILER_STRIP_GATE(0x80791DF0, &lit_4384); #pragma pop /* 80791DF4-80791DF8 000084 0004+00 0/1 0/0 0/0 .rodata @4385 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4385 = 0x3EAA7EFA; -COMPILER_STRIP_GATE(80791DF4, &lit_4385); +COMPILER_STRIP_GATE(0x80791DF4, &lit_4385); #pragma pop /* 80791DF8-80791DFC 000088 0004+00 0/2 0/0 0/0 .rodata @4386 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4386 = 200.0f; -COMPILER_STRIP_GATE(80791DF8, &lit_4386); +COMPILER_STRIP_GATE(0x80791DF8, &lit_4386); #pragma pop /* 80791DFC-80791E00 00008C 0004+00 0/1 0/0 0/0 .rodata @4387 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4387 = 0x3E0A3D71; -COMPILER_STRIP_GATE(80791DFC, &lit_4387); +COMPILER_STRIP_GATE(0x80791DFC, &lit_4387); #pragma pop /* 80791E00-80791E04 000090 0004+00 0/3 0/0 0/0 .rodata @4388 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4388 = 2.0f; -COMPILER_STRIP_GATE(80791E00, &lit_4388); +COMPILER_STRIP_GATE(0x80791E00, &lit_4388); #pragma pop /* 80791E04-80791E08 000094 0004+00 0/4 0/0 0/0 .rodata @4389 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4389 = 3.0f; -COMPILER_STRIP_GATE(80791E04, &lit_4389); +COMPILER_STRIP_GATE(0x80791E04, &lit_4389); #pragma pop /* 80791E08-80791E0C 000098 0004+00 0/2 0/0 0/0 .rodata @4390 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4390 = 0.75f; -COMPILER_STRIP_GATE(80791E08, &lit_4390); +COMPILER_STRIP_GATE(0x80791E08, &lit_4390); #pragma pop /* 80791E0C-80791E10 00009C 0004+00 0/1 0/0 0/0 .rodata @4391 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4391 = 0x3FACCCCC; -COMPILER_STRIP_GATE(80791E0C, &lit_4391); +COMPILER_STRIP_GATE(0x80791E0C, &lit_4391); #pragma pop /* 80791E10-80791E14 0000A0 0004+00 0/1 0/0 0/0 .rodata @4392 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4392 = 1.125f; -COMPILER_STRIP_GATE(80791E10, &lit_4392); +COMPILER_STRIP_GATE(0x80791E10, &lit_4392); #pragma pop /* 8078ECCC-8078F728 000A6C 0A5C+00 1/1 0/0 0/0 .text e_sh_move__FP10e_sh_class */ @@ -950,14 +956,14 @@ static asm void e_sh_move(e_sh_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4449 = 40.0f; -COMPILER_STRIP_GATE(80791E14, &lit_4449); +COMPILER_STRIP_GATE(0x80791E14, &lit_4449); #pragma pop /* 80791E18-80791E1C 0000A8 0004+00 0/2 0/0 0/0 .rodata @4450 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4450 = -5.0f; -COMPILER_STRIP_GATE(80791E18, &lit_4450); +COMPILER_STRIP_GATE(0x80791E18, &lit_4450); #pragma pop /* 8078F728-8078FA38 0014C8 0310+00 1/1 0/0 0/0 .text e_sh_attack__FP10e_sh_class */ @@ -995,7 +1001,7 @@ static asm void e_sh_damage(e_sh_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4534 = 7.0f; -COMPILER_STRIP_GATE(80791E1C, &lit_4534); +COMPILER_STRIP_GATE(0x80791E1C, &lit_4534); #pragma pop /* 8078FCC0-8078FDB0 001A60 00F0+00 1/1 0/0 0/0 .text e_sh_dead__FP10e_sh_class */ @@ -1033,168 +1039,168 @@ static asm void eff_set(e_sh_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4633 = 6.0f; -COMPILER_STRIP_GATE(80791E20, &lit_4633); +COMPILER_STRIP_GATE(0x80791E20, &lit_4633); #pragma pop /* 80791E24-80791E28 0000B4 0004+00 0/0 0/0 0/0 .rodata @4634 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4634 = -60.0f; -COMPILER_STRIP_GATE(80791E24, &lit_4634); +COMPILER_STRIP_GATE(0x80791E24, &lit_4634); #pragma pop /* 80791E28-80791E2C 0000B8 0004+00 0/0 0/0 0/0 .rodata @4635 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4635 = -25.0f; -COMPILER_STRIP_GATE(80791E28, &lit_4635); +COMPILER_STRIP_GATE(0x80791E28, &lit_4635); #pragma pop /* 80791E2C-80791E30 0000BC 0004+00 0/0 0/0 0/0 .rodata @4636 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4636 = 7.0f / 10.0f; -COMPILER_STRIP_GATE(80791E2C, &lit_4636); +COMPILER_STRIP_GATE(0x80791E2C, &lit_4636); #pragma pop /* 80791E30-80791E34 0000C0 0004+00 0/1 0/0 0/0 .rodata @4842 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4842 = 42.0f; -COMPILER_STRIP_GATE(80791E30, &lit_4842); +COMPILER_STRIP_GATE(0x80791E30, &lit_4842); #pragma pop /* 80791E34-80791E38 0000C4 0004+00 0/1 0/0 0/0 .rodata @4843 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4843 = 44.0f; -COMPILER_STRIP_GATE(80791E34, &lit_4843); +COMPILER_STRIP_GATE(0x80791E34, &lit_4843); #pragma pop /* 80791E38-80791E3C 0000C8 0004+00 0/1 0/0 0/0 .rodata @4844 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4844 = 61.0f; -COMPILER_STRIP_GATE(80791E38, &lit_4844); +COMPILER_STRIP_GATE(0x80791E38, &lit_4844); #pragma pop /* 80791E3C-80791E40 0000CC 0004+00 0/1 0/0 0/0 .rodata @4845 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4845 = 17.0f; -COMPILER_STRIP_GATE(80791E3C, &lit_4845); +COMPILER_STRIP_GATE(0x80791E3C, &lit_4845); #pragma pop /* 80791E40-80791E44 0000D0 0004+00 0/1 0/0 0/0 .rodata @4846 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4846 = 18.0f; -COMPILER_STRIP_GATE(80791E40, &lit_4846); +COMPILER_STRIP_GATE(0x80791E40, &lit_4846); #pragma pop /* 80791E44-80791E48 0000D4 0004+00 0/1 0/0 0/0 .rodata @4847 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4847 = 9.0f; -COMPILER_STRIP_GATE(80791E44, &lit_4847); +COMPILER_STRIP_GATE(0x80791E44, &lit_4847); #pragma pop /* 80791E48-80791E4C 0000D8 0004+00 0/1 0/0 0/0 .rodata @4848 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4848 = 14.0f; -COMPILER_STRIP_GATE(80791E48, &lit_4848); +COMPILER_STRIP_GATE(0x80791E48, &lit_4848); #pragma pop /* 80791E4C-80791E50 0000DC 0004+00 0/1 0/0 0/0 .rodata @4849 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4849 = 19.0f; -COMPILER_STRIP_GATE(80791E4C, &lit_4849); +COMPILER_STRIP_GATE(0x80791E4C, &lit_4849); #pragma pop /* 80791E50-80791E54 0000E0 0004+00 0/2 0/0 0/0 .rodata @4850 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4850 = 8.0f; -COMPILER_STRIP_GATE(80791E50, &lit_4850); +COMPILER_STRIP_GATE(0x80791E50, &lit_4850); #pragma pop /* 80791E54-80791E58 0000E4 0004+00 0/1 0/0 0/0 .rodata @4851 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4851 = 4.5f; -COMPILER_STRIP_GATE(80791E54, &lit_4851); +COMPILER_STRIP_GATE(0x80791E54, &lit_4851); #pragma pop /* 80791E58-80791E5C 0000E8 0004+00 0/1 0/0 0/0 .rodata @4852 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4852 = 11.5f; -COMPILER_STRIP_GATE(80791E58, &lit_4852); +COMPILER_STRIP_GATE(0x80791E58, &lit_4852); #pragma pop /* 80791E5C-80791E60 0000EC 0004+00 0/1 0/0 0/0 .rodata @4853 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4853 = 13.5f; -COMPILER_STRIP_GATE(80791E5C, &lit_4853); +COMPILER_STRIP_GATE(0x80791E5C, &lit_4853); #pragma pop /* 80791E60-80791E64 0000F0 0004+00 0/1 0/0 0/0 .rodata @4854 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4854 = 9.5f; -COMPILER_STRIP_GATE(80791E60, &lit_4854); +COMPILER_STRIP_GATE(0x80791E60, &lit_4854); #pragma pop /* 80791E64-80791E68 0000F4 0004+00 0/1 0/0 0/0 .rodata @4855 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4855 = 14.5f; -COMPILER_STRIP_GATE(80791E64, &lit_4855); +COMPILER_STRIP_GATE(0x80791E64, &lit_4855); #pragma pop /* 80791E68-80791E6C 0000F8 0004+00 0/1 0/0 0/0 .rodata @4856 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4856 = 19.5f; -COMPILER_STRIP_GATE(80791E68, &lit_4856); +COMPILER_STRIP_GATE(0x80791E68, &lit_4856); #pragma pop /* 80791E6C-80791E70 0000FC 0004+00 0/1 0/0 0/0 .rodata @4857 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4857 = 12.5f; -COMPILER_STRIP_GATE(80791E6C, &lit_4857); +COMPILER_STRIP_GATE(0x80791E6C, &lit_4857); #pragma pop /* 80791E70-80791E74 000100 0004+00 0/1 0/0 0/0 .rodata @4858 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4858 = 16.0f; -COMPILER_STRIP_GATE(80791E70, &lit_4858); +COMPILER_STRIP_GATE(0x80791E70, &lit_4858); #pragma pop /* 80791E74-80791E78 000104 0004+00 0/1 0/0 0/0 .rodata @4859 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4859 = 21.0f; -COMPILER_STRIP_GATE(80791E74, &lit_4859); +COMPILER_STRIP_GATE(0x80791E74, &lit_4859); #pragma pop /* 80791E78-80791E7C 000108 0004+00 0/1 0/0 0/0 .rodata @4860 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4860 = 28.0f; -COMPILER_STRIP_GATE(80791E78, &lit_4860); +COMPILER_STRIP_GATE(0x80791E78, &lit_4860); #pragma pop /* 80791E7C-80791E80 00010C 0004+00 0/1 0/0 0/0 .rodata @4861 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4861 = 33.0f; -COMPILER_STRIP_GATE(80791E7C, &lit_4861); +COMPILER_STRIP_GATE(0x80791E7C, &lit_4861); #pragma pop /* 80790498-80790950 002238 04B8+00 1/1 0/0 0/0 .text anm_se_set__FP10e_sh_class */ @@ -1212,70 +1218,70 @@ static asm void anm_se_set(e_sh_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5014 = 1.0f / 50.0f; -COMPILER_STRIP_GATE(80791E80, &lit_5014); +COMPILER_STRIP_GATE(0x80791E80, &lit_5014); #pragma pop /* 80791E84-80791E88 000114 0004+00 0/1 0/0 0/0 .rodata @5015 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5015 = 3.5f; -COMPILER_STRIP_GATE(80791E84, &lit_5015); +COMPILER_STRIP_GATE(0x80791E84, &lit_5015); #pragma pop /* 80791E88-80791E8C 000118 0004+00 0/1 0/0 0/0 .rodata @5016 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_5016 = 0x3A83126F; -COMPILER_STRIP_GATE(80791E88, &lit_5016); +COMPILER_STRIP_GATE(0x80791E88, &lit_5016); #pragma pop /* 80791E8C-80791E90 00011C 0004+00 0/1 0/0 0/0 .rodata @5017 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5017 = -8.0f; -COMPILER_STRIP_GATE(80791E8C, &lit_5017); +COMPILER_STRIP_GATE(0x80791E8C, &lit_5017); #pragma pop /* 80791E90-80791E94 000120 0004+00 0/1 0/0 0/0 .rodata @5018 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5018 = 15000.0f; -COMPILER_STRIP_GATE(80791E90, &lit_5018); +COMPILER_STRIP_GATE(0x80791E90, &lit_5018); #pragma pop /* 80791E94-80791E98 000124 0004+00 0/1 0/0 0/0 .rodata @5019 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5019 = -14000.0f; -COMPILER_STRIP_GATE(80791E94, &lit_5019); +COMPILER_STRIP_GATE(0x80791E94, &lit_5019); #pragma pop /* 80791E98-80791E9C 000128 0004+00 0/1 0/0 0/0 .rodata @5020 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5020 = 23000.0f; -COMPILER_STRIP_GATE(80791E98, &lit_5020); +COMPILER_STRIP_GATE(0x80791E98, &lit_5020); #pragma pop /* 80791E9C-80791EA0 00012C 0004+00 0/1 0/0 0/0 .rodata @5021 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5021 = -20.0f; -COMPILER_STRIP_GATE(80791E9C, &lit_5021); +COMPILER_STRIP_GATE(0x80791E9C, &lit_5021); #pragma pop /* 80791EA0-80791EA4 000130 0004+00 0/1 0/0 0/0 .rodata @5022 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5022 = -10.0f; -COMPILER_STRIP_GATE(80791EA0, &lit_5022); +COMPILER_STRIP_GATE(0x80791EA0, &lit_5022); #pragma pop /* 80791EA4-80791EA8 000134 0004+00 0/1 0/0 0/0 .rodata @5023 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5023 = 35.0f; -COMPILER_STRIP_GATE(80791EA4, &lit_5023); +COMPILER_STRIP_GATE(0x80791EA4, &lit_5023); #pragma pop /* 80790950-80790FC0 0026F0 0670+00 2/1 0/0 0/0 .text daE_SH_Execute__FP10e_sh_class */ @@ -1318,14 +1324,14 @@ static asm void useHeapInit(fopAc_ac_c* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5189 = 100000.0f; -COMPILER_STRIP_GATE(80791EA8, &lit_5189); +COMPILER_STRIP_GATE(0x80791EA8, &lit_5189); #pragma pop /* 80791EAC-80791EB0 00013C 0004+00 0/1 0/0 0/0 .rodata @5190 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5190 = -200.0f; -COMPILER_STRIP_GATE(80791EAC, &lit_5190); +COMPILER_STRIP_GATE(0x80791EAC, &lit_5190); #pragma pop /* 80791EB0-80791EB8 000140 0004+04 0/1 0/0 0/0 .rodata @5191 */ @@ -1336,7 +1342,7 @@ SECTION_RODATA static f32 const lit_5191[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80791EB0, &lit_5191); +COMPILER_STRIP_GATE(0x80791EB0, &lit_5191); #pragma pop /* 80791EB8-80791EC0 000148 0008+00 0/1 0/0 0/0 .rodata @5193 */ @@ -1345,7 +1351,7 @@ COMPILER_STRIP_GATE(80791EB0, &lit_5191); SECTION_RODATA static u8 const lit_5193[8] = { 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80791EB8, &lit_5193); +COMPILER_STRIP_GATE(0x80791EB8, &lit_5193); #pragma pop /* 807911D8-80791550 002F78 0378+00 1/0 0/0 0/0 .text daE_SH_Create__FP10fopAc_ac_c */ @@ -1460,7 +1466,7 @@ asm void __sinit_d_a_e_sh_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_807918FC = (void*)__sinit_d_a_e_sh_cpp; +REGISTER_CTORS(0x807918FC, __sinit_d_a_e_sh_cpp); #pragma pop /* 80791938-80791940 0036D8 0008+00 1/0 0/0 0/0 .text @36@__dt__12dBgS_ObjAcchFv */ @@ -1495,9 +1501,4 @@ static asm void setMidnaBindEffect(fopEn_enemy_c* param_0, Z2CreatureEnemy* para } #pragma pop -/* 80791EC0-80791EC5 000150 0005+00 4/4 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80791EC0 = "E_sh"; -#pragma pop +/* 80791EC0-80791EC0 000150 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/e/d_a_e_sm/d_a_e_sm.cpp b/rel/d/a/e/d_a_e_sm/d_a_e_sm.cpp index dbc964226cf..ac8024e54f5 100644 --- a/rel/d/a/e/d_a_e_sm/d_a_e_sm.cpp +++ b/rel/d/a/e/d_a_e_sm/d_a_e_sm.cpp @@ -27,16 +27,16 @@ struct mDoMtx_stack_c { static u8 now[48]; }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; - struct J3DAnmTransform {}; +struct J3DModelData {}; + +struct Z2Creature {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -509,7 +509,7 @@ extern "C" void __register_global_object(); /* ############################################################################################## */ /* 807985E0-807985E4 000000 0004+00 25/25 0/0 0/0 .rodata @3920 */ SECTION_RODATA static f32 const lit_3920 = 100.0f; -COMPILER_STRIP_GATE(807985E0, &lit_3920); +COMPILER_STRIP_GATE(0x807985E0, &lit_3920); /* 807985E4-807985E8 000004 0004+00 3/25 0/0 0/0 .rodata @3921 */ SECTION_RODATA static u8 const lit_3921[4] = { @@ -518,7 +518,7 @@ SECTION_RODATA static u8 const lit_3921[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(807985E4, &lit_3921); +COMPILER_STRIP_GATE(0x807985E4, &lit_3921); /* 807985E8-807985F0 000008 0004+04 3/23 0/0 0/0 .rodata @3922 */ SECTION_RODATA static f32 const lit_3922[1 + 1 /* padding */] = { @@ -526,7 +526,7 @@ SECTION_RODATA static f32 const lit_3922[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(807985E8, &lit_3922); +COMPILER_STRIP_GATE(0x807985E8, &lit_3922); /* 807985F0-807985F8 000010 0008+00 0/2 0/0 0/0 .rodata @3923 */ #pragma push @@ -534,7 +534,7 @@ COMPILER_STRIP_GATE(807985E8, &lit_3922); SECTION_RODATA static u8 const lit_3923[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(807985F0, &lit_3923); +COMPILER_STRIP_GATE(0x807985F0, &lit_3923); #pragma pop /* 807985F8-80798600 000018 0008+00 0/2 0/0 0/0 .rodata @3924 */ @@ -543,7 +543,7 @@ COMPILER_STRIP_GATE(807985F0, &lit_3923); SECTION_RODATA static u8 const lit_3924[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(807985F8, &lit_3924); +COMPILER_STRIP_GATE(0x807985F8, &lit_3924); #pragma pop /* 80798600-80798608 000020 0008+00 0/2 0/0 0/0 .rodata @3925 */ @@ -552,19 +552,19 @@ COMPILER_STRIP_GATE(807985F8, &lit_3924); SECTION_RODATA static u8 const lit_3925[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80798600, &lit_3925); +COMPILER_STRIP_GATE(0x80798600, &lit_3925); #pragma pop /* 80798608-8079860C 000028 0004+00 0/7 0/0 0/0 .rodata @3926 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3926 = 1.0f / 100.0f; -COMPILER_STRIP_GATE(80798608, &lit_3926); +COMPILER_STRIP_GATE(0x80798608, &lit_3926); #pragma pop /* 8079860C-80798610 00002C 0004+00 1/7 0/0 0/0 .rodata @3941 */ SECTION_RODATA static f32 const lit_3941 = 1000.0f; -COMPILER_STRIP_GATE(8079860C, &lit_3941); +COMPILER_STRIP_GATE(0x8079860C, &lit_3941); /* 8079878C-80798798 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { @@ -759,7 +759,13 @@ asm daE_Sm_HIO_c::daE_Sm_HIO_c() { /* ############################################################################################## */ /* 80798610-80798614 000030 0004+00 1/1 0/0 0/0 .rodata @3955 */ SECTION_RODATA static f32 const lit_3955 = -1.0f; -COMPILER_STRIP_GATE(80798610, &lit_3955); +COMPILER_STRIP_GATE(0x80798610, &lit_3955); + +/* 80798780-80798780 0001A0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80798780 = "E_SM"; +#pragma pop /* 80792260-8079230C 000120 00AC+00 13/13 0/0 0/0 .text SetAnm__8daE_SM_cFiiff */ #pragma push @@ -776,28 +782,28 @@ asm void daE_SM_c::SetAnm(int param_0, int param_1, f32 param_2, f32 param_3) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4010 = -255.0f; -COMPILER_STRIP_GATE(80798614, &lit_4010); +COMPILER_STRIP_GATE(0x80798614, &lit_4010); #pragma pop /* 80798618-8079861C 000038 0004+00 0/3 0/0 0/0 .rodata @4011 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4011 = 400.0f; -COMPILER_STRIP_GATE(80798618, &lit_4011); +COMPILER_STRIP_GATE(0x80798618, &lit_4011); #pragma pop /* 8079861C-80798620 00003C 0004+00 0/1 0/0 0/0 .rodata @4012 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4012 = 167.0f; -COMPILER_STRIP_GATE(8079861C, &lit_4012); +COMPILER_STRIP_GATE(0x8079861C, &lit_4012); #pragma pop /* 80798620-80798624 000040 0004+00 0/1 0/0 0/0 .rodata @4013 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4013 = 195.0f; -COMPILER_STRIP_GATE(80798620, &lit_4013); +COMPILER_STRIP_GATE(0x80798620, &lit_4013); #pragma pop /* 8079230C-80792604 0001CC 02F8+00 1/1 0/0 0/0 .text Draw__8daE_SM_cFv */ @@ -813,7 +819,7 @@ asm void daE_SM_c::Draw() { /* ############################################################################################## */ /* 80798624-80798628 000044 0004+00 3/7 0/0 0/0 .rodata @4051 */ SECTION_RODATA static f32 const lit_4051 = 80.0f; -COMPILER_STRIP_GATE(80798624, &lit_4051); +COMPILER_STRIP_GATE(0x80798624, &lit_4051); /* 80792604-80792720 0004C4 011C+00 3/3 0/0 0/0 .text way_bg_check__FP8daE_SM_cf4cXyzs */ #pragma push @@ -838,7 +844,7 @@ static asm void other_bg_check(daE_SM_c* param_0, fopAc_ac_c* param_1) { /* ############################################################################################## */ /* 80798628-8079862C 000048 0004+00 1/3 0/0 0/0 .rodata @4095 */ SECTION_RODATA static f32 const lit_4095 = 500.0f; -COMPILER_STRIP_GATE(80798628, &lit_4095); +COMPILER_STRIP_GATE(0x80798628, &lit_4095); /* 807927F8-8079285C 0006B8 0064+00 1/1 0/0 0/0 .text pl_check__FP8daE_SM_cf */ #pragma push @@ -876,49 +882,49 @@ asm void daE_SM_c::Particle_Set(u16 param_0, cXyz param_1, cXyz param_2, csXyz p #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4212 = 70.0f; -COMPILER_STRIP_GATE(8079862C, &lit_4212); +COMPILER_STRIP_GATE(0x8079862C, &lit_4212); #pragma pop /* 80798630-80798634 000050 0004+00 0/1 0/0 0/0 .rodata @4213 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4213 = 230.0f; -COMPILER_STRIP_GATE(80798630, &lit_4213); +COMPILER_STRIP_GATE(0x80798630, &lit_4213); #pragma pop /* 80798634-80798638 000054 0004+00 0/1 0/0 0/0 .rodata @4214 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4214 = 130.0f; -COMPILER_STRIP_GATE(80798634, &lit_4214); +COMPILER_STRIP_GATE(0x80798634, &lit_4214); #pragma pop /* 80798638-8079863C 000058 0004+00 0/8 0/0 0/0 .rodata @4215 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4215 = 1.0f / 20.0f; -COMPILER_STRIP_GATE(80798638, &lit_4215); +COMPILER_STRIP_GATE(0x80798638, &lit_4215); #pragma pop /* 8079863C-80798640 00005C 0004+00 0/2 0/0 0/0 .rodata @4216 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4216 = -3.0f / 10.0f; -COMPILER_STRIP_GATE(8079863C, &lit_4216); +COMPILER_STRIP_GATE(0x8079863C, &lit_4216); #pragma pop /* 80798640-80798644 000060 0004+00 0/8 0/0 0/0 .rodata @4217 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4217 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(80798640, &lit_4217); +COMPILER_STRIP_GATE(0x80798640, &lit_4217); #pragma pop /* 80798644-80798648 000064 0004+00 0/3 0/0 0/0 .rodata @4218 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4218 = 2500.0f; -COMPILER_STRIP_GATE(80798644, &lit_4218); +COMPILER_STRIP_GATE(0x80798644, &lit_4218); #pragma pop /* 80798648-80798650 000068 0008+00 0/3 0/0 0/0 .rodata @4220 */ @@ -927,7 +933,7 @@ COMPILER_STRIP_GATE(80798644, &lit_4218); SECTION_RODATA static u8 const lit_4220[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80798648, &lit_4220); +COMPILER_STRIP_GATE(0x80798648, &lit_4220); #pragma pop /* 80792914-80792C20 0007D4 030C+00 1/1 0/0 0/0 .text ArrowCheck__8daE_SM_cFv */ @@ -945,49 +951,49 @@ asm void daE_SM_c::ArrowCheck() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4294 = 3000.0f; -COMPILER_STRIP_GATE(80798650, &lit_4294); +COMPILER_STRIP_GATE(0x80798650, &lit_4294); #pragma pop /* 80798654-80798658 000074 0004+00 0/2 0/0 0/0 .rodata @4295 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4295 = 3.0f / 10.0f; -COMPILER_STRIP_GATE(80798654, &lit_4295); +COMPILER_STRIP_GATE(0x80798654, &lit_4295); #pragma pop /* 80798658-8079865C 000078 0004+00 0/4 0/0 0/0 .rodata @4296 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4296 = 0x3BA3D70A; -COMPILER_STRIP_GATE(80798658, &lit_4296); +COMPILER_STRIP_GATE(0x80798658, &lit_4296); #pragma pop /* 8079865C-80798660 00007C 0004+00 0/6 0/0 0/0 .rodata @4297 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4297 = 0.5f; -COMPILER_STRIP_GATE(8079865C, &lit_4297); +COMPILER_STRIP_GATE(0x8079865C, &lit_4297); #pragma pop /* 80798660-80798664 000080 0004+00 0/2 0/0 0/0 .rodata @4298 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4298 = 0x3DD70A3D; -COMPILER_STRIP_GATE(80798660, &lit_4298); +COMPILER_STRIP_GATE(0x80798660, &lit_4298); #pragma pop /* 80798664-80798668 000084 0004+00 0/3 0/0 0/0 .rodata @4299 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4299 = 3.0f / 100.0f; -COMPILER_STRIP_GATE(80798664, &lit_4299); +COMPILER_STRIP_GATE(0x80798664, &lit_4299); #pragma pop /* 80798668-8079866C 000088 0004+00 0/7 0/0 0/0 .rodata @4300 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4300 = 3.0f; -COMPILER_STRIP_GATE(80798668, &lit_4300); +COMPILER_STRIP_GATE(0x80798668, &lit_4300); #pragma pop /* 80792C20-80792E70 000AE0 0250+00 3/3 0/0 0/0 .text E_SM_Damage__8daE_SM_cFv */ @@ -1005,21 +1011,21 @@ asm void daE_SM_c::E_SM_Damage() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4460 = 15.0f; -COMPILER_STRIP_GATE(8079866C, &lit_4460); +COMPILER_STRIP_GATE(0x8079866C, &lit_4460); #pragma pop /* 80798670-80798674 000090 0004+00 0/7 0/0 0/0 .rodata @4461 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4461 = 20.0f; -COMPILER_STRIP_GATE(80798670, &lit_4461); +COMPILER_STRIP_GATE(0x80798670, &lit_4461); #pragma pop /* 80798674-80798678 000094 0004+00 0/7 0/0 0/0 .rodata @4462 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4462 = 5.0f; -COMPILER_STRIP_GATE(80798674, &lit_4462); +COMPILER_STRIP_GATE(0x80798674, &lit_4462); #pragma pop /* 80798678-80798680 000098 0004+04 0/2 0/0 0/0 .rodata @4463 */ @@ -1030,7 +1036,7 @@ SECTION_RODATA static f32 const lit_4463[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80798678, &lit_4463); +COMPILER_STRIP_GATE(0x80798678, &lit_4463); #pragma pop /* 80798680-80798688 0000A0 0008+00 0/1 0/0 0/0 .rodata @4464 */ @@ -1039,14 +1045,14 @@ COMPILER_STRIP_GATE(80798678, &lit_4463); SECTION_RODATA static u8 const lit_4464[8] = { 0xBF, 0xD6, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, }; -COMPILER_STRIP_GATE(80798680, &lit_4464); +COMPILER_STRIP_GATE(0x80798680, &lit_4464); #pragma pop /* 80798688-8079868C 0000A8 0004+00 0/2 0/0 0/0 .rodata @4465 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4465 = 1.5f; -COMPILER_STRIP_GATE(80798688, &lit_4465); +COMPILER_STRIP_GATE(0x80798688, &lit_4465); #pragma pop /* 80792E70-807936B4 000D30 0844+00 1/1 0/0 0/0 .text SmDamageCheck__8daE_SM_cFv */ @@ -1064,42 +1070,42 @@ asm void daE_SM_c::SmDamageCheck() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4542 = -9.0f / 10.0f; -COMPILER_STRIP_GATE(8079868C, &lit_4542); +COMPILER_STRIP_GATE(0x8079868C, &lit_4542); #pragma pop /* 80798690-80798694 0000B0 0004+00 0/1 0/0 0/0 .rodata @4543 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4543 = 32767.0f; -COMPILER_STRIP_GATE(80798690, &lit_4543); +COMPILER_STRIP_GATE(0x80798690, &lit_4543); #pragma pop /* 80798694-80798698 0000B4 0004+00 0/4 0/0 0/0 .rodata @4544 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4544 = 50.0f; -COMPILER_STRIP_GATE(80798694, &lit_4544); +COMPILER_STRIP_GATE(0x80798694, &lit_4544); #pragma pop /* 80798698-8079869C 0000B8 0004+00 0/3 0/0 0/0 .rodata @4545 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4545 = -0.0f; -COMPILER_STRIP_GATE(80798698, &lit_4545); +COMPILER_STRIP_GATE(0x80798698, &lit_4545); #pragma pop /* 8079869C-807986A0 0000BC 0004+00 0/3 0/0 0/0 .rodata @4546 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4546 = 2.0f; -COMPILER_STRIP_GATE(8079869C, &lit_4546); +COMPILER_STRIP_GATE(0x8079869C, &lit_4546); #pragma pop /* 807986A0-807986A4 0000C0 0004+00 0/5 0/0 0/0 .rodata @4547 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4547 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(807986A0, &lit_4547); +COMPILER_STRIP_GATE(0x807986A0, &lit_4547); #pragma pop /* 80798980-80798984 000008 0001+03 1/1 0/0 0/0 .bss @1109 */ @@ -1221,56 +1227,56 @@ asm void daE_SM_c::E_SM_Normal() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4548 = 700.0f; -COMPILER_STRIP_GATE(807986A4, &lit_4548); +COMPILER_STRIP_GATE(0x807986A4, &lit_4548); #pragma pop /* 807986A8-807986AC 0000C8 0004+00 0/2 0/0 0/0 .rodata @4587 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4587 = 1500.0f; -COMPILER_STRIP_GATE(807986A8, &lit_4587); +COMPILER_STRIP_GATE(0x807986A8, &lit_4587); #pragma pop /* 807986AC-807986B0 0000CC 0004+00 0/1 0/0 0/0 .rodata @4588 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4588 = 45.0f; -COMPILER_STRIP_GATE(807986AC, &lit_4588); +COMPILER_STRIP_GATE(0x807986AC, &lit_4588); #pragma pop /* 807986B0-807986B4 0000D0 0004+00 0/1 0/0 0/0 .rodata @4589 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4589 = 8.0f; -COMPILER_STRIP_GATE(807986B0, &lit_4589); +COMPILER_STRIP_GATE(0x807986B0, &lit_4589); #pragma pop /* 807986B4-807986B8 0000D4 0004+00 0/2 0/0 0/0 .rodata @4590 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4590 = 1.0f / 50.0f; -COMPILER_STRIP_GATE(807986B4, &lit_4590); +COMPILER_STRIP_GATE(0x807986B4, &lit_4590); #pragma pop /* 807986B8-807986BC 0000D8 0004+00 0/1 0/0 0/0 .rodata @4591 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4591 = -2.0f / 5.0f; -COMPILER_STRIP_GATE(807986B8, &lit_4591); +COMPILER_STRIP_GATE(0x807986B8, &lit_4591); #pragma pop /* 807986BC-807986C0 0000DC 0004+00 0/1 0/0 0/0 .rodata @4592 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4592 = 3.0f / 20.0f; -COMPILER_STRIP_GATE(807986BC, &lit_4592); +COMPILER_STRIP_GATE(0x807986BC, &lit_4592); #pragma pop /* 807986C0-807986C4 0000E0 0004+00 0/1 0/0 0/0 .rodata @4593 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4593 = 7.0f / 5.0f; -COMPILER_STRIP_GATE(807986C0, &lit_4593); +COMPILER_STRIP_GATE(0x807986C0, &lit_4593); #pragma pop /* 80793B64-80793E18 001A24 02B4+00 1/1 0/0 0/0 .text E_SM_Move__8daE_SM_cFv */ @@ -1288,35 +1294,35 @@ asm void daE_SM_c::E_SM_Move() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4637 = 2000.0f; -COMPILER_STRIP_GATE(807986C4, &lit_4637); +COMPILER_STRIP_GATE(0x807986C4, &lit_4637); #pragma pop /* 807986C8-807986CC 0000E8 0004+00 0/1 0/0 0/0 .rodata @4638 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4638 = 2600.0f; -COMPILER_STRIP_GATE(807986C8, &lit_4638); +COMPILER_STRIP_GATE(0x807986C8, &lit_4638); #pragma pop /* 807986CC-807986D0 0000EC 0004+00 0/1 0/0 0/0 .rodata @4639 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4639 = 0x3D27EF9E; -COMPILER_STRIP_GATE(807986CC, &lit_4639); +COMPILER_STRIP_GATE(0x807986CC, &lit_4639); #pragma pop /* 807986D0-807986D4 0000F0 0004+00 0/1 0/0 0/0 .rodata @4640 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4640 = 17.0f / 20.0f; -COMPILER_STRIP_GATE(807986D0, &lit_4640); +COMPILER_STRIP_GATE(0x807986D0, &lit_4640); #pragma pop /* 807986D4-807986D8 0000F4 0004+00 0/1 0/0 0/0 .rodata @4641 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4641 = 2.0f / 5.0f; -COMPILER_STRIP_GATE(807986D4, &lit_4641); +COMPILER_STRIP_GATE(0x807986D4, &lit_4641); #pragma pop /* 80793E18-80794100 001CD8 02E8+00 1/1 0/0 0/0 .text E_SM_Attack__8daE_SM_cFv */ @@ -1334,7 +1340,7 @@ asm void daE_SM_c::E_SM_Attack() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4690 = 10.0f; -COMPILER_STRIP_GATE(807986D8, &lit_4690); +COMPILER_STRIP_GATE(0x807986D8, &lit_4690); #pragma pop /* 80794100-80794338 001FC0 0238+00 1/1 0/0 0/0 .text Action__8daE_SM_cFv */ @@ -1350,7 +1356,7 @@ asm void daE_SM_c::Action() { /* ############################################################################################## */ /* 807986DC-807986E0 0000FC 0004+00 2/2 0/0 0/0 .rodata @4703 */ SECTION_RODATA static f32 const lit_4703 = 63.0f; -COMPILER_STRIP_GATE(807986DC, &lit_4703); +COMPILER_STRIP_GATE(0x807986DC, &lit_4703); /* 80794338-807943C4 0021F8 008C+00 1/1 0/0 0/0 .text E_SM_C_Normal__8daE_SM_cFv */ #pragma push @@ -1377,14 +1383,14 @@ asm void daE_SM_c::E_SM_C_Fight() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4764 = 600.0f; -COMPILER_STRIP_GATE(807986E0, &lit_4764); +COMPILER_STRIP_GATE(0x807986E0, &lit_4764); #pragma pop /* 807986E4-807986E8 000104 0004+00 0/2 0/0 0/0 .rodata @4765 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4765 = 11.0f; -COMPILER_STRIP_GATE(807986E4, &lit_4765); +COMPILER_STRIP_GATE(0x807986E4, &lit_4765); #pragma pop /* 80794458-8079473C 002318 02E4+00 1/1 0/0 0/0 .text E_SM_C_Near_Escape__8daE_SM_cFv */ @@ -1402,7 +1408,7 @@ asm void daE_SM_c::E_SM_C_Near_Escape() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4825 = 12000.0f; -COMPILER_STRIP_GATE(807986E8, &lit_4825); +COMPILER_STRIP_GATE(0x807986E8, &lit_4825); #pragma pop /* 8079473C-807949CC 0025FC 0290+00 1/1 0/0 0/0 .text E_SM_C_Far_Escape__8daE_SM_cFv */ @@ -1440,77 +1446,77 @@ asm void daE_SM_c::E_SM_C_Escape() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5011 = 220.0f; -COMPILER_STRIP_GATE(807986EC, &lit_5011); +COMPILER_STRIP_GATE(0x807986EC, &lit_5011); #pragma pop /* 807986F0-807986F4 000110 0004+00 0/0 0/0 0/0 .rodata @5012 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5012 = 73.0f; -COMPILER_STRIP_GATE(807986F0, &lit_5012); +COMPILER_STRIP_GATE(0x807986F0, &lit_5012); #pragma pop /* 807986F4-807986F8 000114 0004+00 0/0 0/0 0/0 .rodata @5013 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5013 = -3.0f / 5.0f; -COMPILER_STRIP_GATE(807986F4, &lit_5013); +COMPILER_STRIP_GATE(0x807986F4, &lit_5013); #pragma pop /* 807986F8-807986FC 000118 0004+00 0/0 0/0 0/0 .rodata @5014 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5014 = 1.0f / 25.0f; -COMPILER_STRIP_GATE(807986F8, &lit_5014); +COMPILER_STRIP_GATE(0x807986F8, &lit_5014); #pragma pop /* 807986FC-80798700 00011C 0004+00 0/0 0/0 0/0 .rodata @5015 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5015 = 9.0f / 25.0f; -COMPILER_STRIP_GATE(807986FC, &lit_5015); +COMPILER_STRIP_GATE(0x807986FC, &lit_5015); #pragma pop /* 80798700-80798704 000120 0004+00 0/0 0/0 0/0 .rodata @5016 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5016 = 6.0f; -COMPILER_STRIP_GATE(80798700, &lit_5016); +COMPILER_STRIP_GATE(0x80798700, &lit_5016); #pragma pop /* 80798704-80798708 000124 0004+00 0/0 0/0 0/0 .rodata @5017 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5017 = 17.0f; -COMPILER_STRIP_GATE(80798704, &lit_5017); +COMPILER_STRIP_GATE(0x80798704, &lit_5017); #pragma pop /* 80798708-8079870C 000128 0004+00 0/0 0/0 0/0 .rodata @5018 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5018 = 3.5f; -COMPILER_STRIP_GATE(80798708, &lit_5018); +COMPILER_STRIP_GATE(0x80798708, &lit_5018); #pragma pop /* 8079870C-80798710 00012C 0004+00 0/1 0/0 0/0 .rodata @5100 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5100 = 7.0f; -COMPILER_STRIP_GATE(8079870C, &lit_5100); +COMPILER_STRIP_GATE(0x8079870C, &lit_5100); #pragma pop /* 80798710-80798714 000130 0004+00 0/1 0/0 0/0 .rodata @5101 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5101 = 53.0f; -COMPILER_STRIP_GATE(80798710, &lit_5101); +COMPILER_STRIP_GATE(0x80798710, &lit_5101); #pragma pop /* 80798714-80798718 000134 0004+00 0/1 0/0 0/0 .rodata @5102 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5102 = 32.0f; -COMPILER_STRIP_GATE(80798714, &lit_5102); +COMPILER_STRIP_GATE(0x80798714, &lit_5102); #pragma pop /* 80795244-80795530 003104 02EC+00 3/3 0/0 0/0 .text E_SM_C_Free__8daE_SM_cFv */ @@ -1528,28 +1534,28 @@ asm void daE_SM_c::E_SM_C_Free() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5191 = 35.0f; -COMPILER_STRIP_GATE(80798718, &lit_5191); +COMPILER_STRIP_GATE(0x80798718, &lit_5191); #pragma pop /* 8079871C-80798720 00013C 0004+00 0/1 0/0 0/0 .rodata @5192 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5192 = -15.0f; -COMPILER_STRIP_GATE(8079871C, &lit_5192); +COMPILER_STRIP_GATE(0x8079871C, &lit_5192); #pragma pop /* 80798720-80798724 000140 0004+00 0/1 0/0 0/0 .rodata @5193 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5193 = 4.0f; -COMPILER_STRIP_GATE(80798720, &lit_5193); +COMPILER_STRIP_GATE(0x80798720, &lit_5193); #pragma pop /* 80798724-80798728 000144 0004+00 0/1 0/0 0/0 .rodata @5194 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5194 = 7.0f / 10.0f; -COMPILER_STRIP_GATE(80798724, &lit_5194); +COMPILER_STRIP_GATE(0x80798724, &lit_5194); #pragma pop /* 80795530-807958A0 0033F0 0370+00 1/1 0/0 0/0 .text E_SM_C_Death__8daE_SM_cFv */ @@ -1567,14 +1573,14 @@ asm void daE_SM_c::E_SM_C_Death() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5365 = -1.0f / 10.0f; -COMPILER_STRIP_GATE(80798728, &lit_5365); +COMPILER_STRIP_GATE(0x80798728, &lit_5365); #pragma pop /* 8079872C-80798730 00014C 0004+00 0/1 0/0 0/0 .rodata @5366 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5366 = -33.0f / 100.0f; -COMPILER_STRIP_GATE(8079872C, &lit_5366); +COMPILER_STRIP_GATE(0x8079872C, &lit_5366); #pragma pop /* 807958A0-80795E64 003760 05C4+00 1/1 0/0 0/0 .text C_DamageCheck__8daE_SM_cFv */ @@ -1590,20 +1596,26 @@ asm void daE_SM_c::C_DamageCheck() { /* ############################################################################################## */ /* 80798730-80798734 000150 0004+00 1/3 0/0 0/0 .rodata @5413 */ SECTION_RODATA static f32 const lit_5413 = 40.0f; -COMPILER_STRIP_GATE(80798730, &lit_5413); +COMPILER_STRIP_GATE(0x80798730, &lit_5413); /* 80798734-80798738 000154 0004+00 0/2 0/0 0/0 .rodata @5414 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5414 = 800.0f; -COMPILER_STRIP_GATE(80798734, &lit_5414); +COMPILER_STRIP_GATE(0x80798734, &lit_5414); #pragma pop /* 80798738-8079873C 000158 0004+00 0/1 0/0 0/0 .rodata @5415 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5415 = -60.0f; -COMPILER_STRIP_GATE(80798738, &lit_5415); +COMPILER_STRIP_GATE(0x80798738, &lit_5415); +#pragma pop + +/* 80798780-80798780 0001A0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80798785 = "D_SB01"; #pragma pop /* 80795E64-80796060 003D24 01FC+00 1/1 0/0 0/0 .text E_SM_C_Hook__8daE_SM_cFv */ @@ -1621,14 +1633,14 @@ asm void daE_SM_c::E_SM_C_Hook() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5430 = 608.0f; -COMPILER_STRIP_GATE(8079873C, &lit_5430); +COMPILER_STRIP_GATE(0x8079873C, &lit_5430); #pragma pop /* 80798740-80798744 000160 0004+00 0/1 0/0 0/0 .rodata @5431 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5431 = 448.0f; -COMPILER_STRIP_GATE(80798740, &lit_5431); +COMPILER_STRIP_GATE(0x80798740, &lit_5431); #pragma pop /* 80796060-807960E4 003F20 0084+00 1/1 0/0 0/0 .text CheckViewArea__8daE_SM_cFv */ @@ -1696,7 +1708,7 @@ asm void daE_SM_c::SetReleaseCam() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5563 = 300.0f; -COMPILER_STRIP_GATE(80798744, &lit_5563); +COMPILER_STRIP_GATE(0x80798744, &lit_5563); #pragma pop /* 80796490-80796628 004350 0198+00 1/1 0/0 0/0 .text DemoStart__8daE_SM_cFv */ @@ -1714,7 +1726,7 @@ asm void daE_SM_c::DemoStart() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5623 = 25.0f; -COMPILER_STRIP_GATE(80798748, &lit_5623); +COMPILER_STRIP_GATE(0x80798748, &lit_5623); #pragma pop /* 80796628-807968A0 0044E8 0278+00 1/1 0/0 0/0 .text DemoMid__8daE_SM_cFv */ @@ -1752,21 +1764,21 @@ asm void daE_SM_c::CoreAction() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5681 = -25.0f; -COMPILER_STRIP_GATE(8079874C, &lit_5681); +COMPILER_STRIP_GATE(0x8079874C, &lit_5681); #pragma pop /* 80798750-80798754 000170 0004+00 0/0 0/0 0/0 .rodata @5682 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5682 = -9.0f; -COMPILER_STRIP_GATE(80798750, &lit_5682); +COMPILER_STRIP_GATE(0x80798750, &lit_5682); #pragma pop /* 80798754-80798758 000174 0004+00 0/2 0/0 0/0 .rodata @5741 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5741 = -20.0f; -COMPILER_STRIP_GATE(80798754, &lit_5741); +COMPILER_STRIP_GATE(0x80798754, &lit_5741); #pragma pop /* 80796AEC-80796D80 0049AC 0294+00 1/1 0/0 0/0 .text ArrowOn__8daE_SM_cFv */ @@ -1824,7 +1836,7 @@ asm void daE_SM_c::CoCoreSet() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5883 = 150.0f; -COMPILER_STRIP_GATE(80798758, &lit_5883); +COMPILER_STRIP_GATE(0x80798758, &lit_5883); #pragma pop /* 80797444-807974E8 005304 00A4+00 1/1 0/0 0/0 .text CoSmSet__8daE_SM_cFv */ @@ -1927,35 +1939,35 @@ asm void daE_SM_c::initCoSph() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6098 = -400.0f; -COMPILER_STRIP_GATE(8079875C, &lit_6098); +COMPILER_STRIP_GATE(0x8079875C, &lit_6098); #pragma pop /* 80798760-80798764 000180 0004+00 0/1 0/0 0/0 .rodata @6099 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6099 = -800.0f; -COMPILER_STRIP_GATE(80798760, &lit_6099); +COMPILER_STRIP_GATE(0x80798760, &lit_6099); #pragma pop /* 80798764-80798768 000184 0004+00 0/1 0/0 0/0 .rodata @6100 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6100 = -200.0f; -COMPILER_STRIP_GATE(80798764, &lit_6100); +COMPILER_STRIP_GATE(0x80798764, &lit_6100); #pragma pop /* 80798768-8079876C 000188 0004+00 0/1 0/0 0/0 .rodata @6101 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6101 = 120.0f; -COMPILER_STRIP_GATE(80798768, &lit_6101); +COMPILER_STRIP_GATE(0x80798768, &lit_6101); #pragma pop /* 8079876C-80798770 00018C 0004+00 0/1 0/0 0/0 .rodata @6102 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6102 = 30.0f; -COMPILER_STRIP_GATE(8079876C, &lit_6102); +COMPILER_STRIP_GATE(0x8079876C, &lit_6102); #pragma pop /* 80798770-80798778 000190 0004+04 0/1 0/0 0/0 .rodata @6103 */ @@ -1966,7 +1978,7 @@ SECTION_RODATA static f32 const lit_6103[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80798770, &lit_6103); +COMPILER_STRIP_GATE(0x80798770, &lit_6103); #pragma pop /* 80798778-80798780 000198 0008+00 0/1 0/0 0/0 .rodata @6105 */ @@ -1975,7 +1987,7 @@ COMPILER_STRIP_GATE(80798770, &lit_6103); SECTION_RODATA static u8 const lit_6105[8] = { 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80798778, &lit_6105); +COMPILER_STRIP_GATE(0x80798778, &lit_6105); #pragma pop /* 80797858-80797CE0 005718 0488+00 1/1 0/0 0/0 .text Create__8daE_SM_cFv */ @@ -2085,7 +2097,7 @@ asm void __sinit_d_a_e_sm_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80798130 = (void*)__sinit_d_a_e_sm_cpp; +REGISTER_CTORS(0x80798130, __sinit_d_a_e_sm_cpp); #pragma pop /* 8079816C-80798174 00602C 0008+00 1/0 0/0 0/0 .text @36@__dt__12dBgS_ObjAcchFv */ @@ -2302,10 +2314,4 @@ static u8 data_80798A44[4]; static u8 data_80798A48[4]; #pragma pop -/* 80798780-8079878C 0001A0 000C+00 5/5 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80798780 = "E_SM"; -SECTION_DEAD static char const* const stringBase_80798785 = "D_SB01"; -#pragma pop +/* 80798780-80798780 0001A0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/e/d_a_e_sm2/d_a_e_sm2.cpp b/rel/d/a/e/d_a_e_sm2/d_a_e_sm2.cpp index e2d30e00c42..30328026e0f 100644 --- a/rel/d/a/e/d_a_e_sm2/d_a_e_sm2.cpp +++ b/rel/d/a/e/d_a_e_sm2/d_a_e_sm2.cpp @@ -48,16 +48,16 @@ struct mDoExt_btkAnm { /* 8000D6D8 */ void entry(J3DMaterialTable*, f32); }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; - struct J3DAnmTransform {}; +struct J3DModelData {}; + +struct Z2Creature {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -118,14 +118,14 @@ struct dRes_control_c { struct dPa_levelEcallBack {}; -struct _GXColor {}; - struct csXyz { /* 802673F4 */ csXyz(s16, s16, s16); /* 8079CE44 */ csXyz(); /* 8079D524 */ ~csXyz(); }; +struct _GXColor {}; + struct dPa_control_c { /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, @@ -1017,7 +1017,7 @@ static asm void nodeCallBack(J3DJoint* param_0, int param_1) { /* ############################################################################################## */ /* 8079D5B0-8079D5B4 000000 0004+00 17/17 0/0 0/0 .rodata @3790 */ SECTION_RODATA static f32 const lit_3790 = 100.0f; -COMPILER_STRIP_GATE(8079D5B0, &lit_3790); +COMPILER_STRIP_GATE(0x8079D5B0, &lit_3790); /* 8079D5B4-8079D5B8 000004 0004+00 1/11 0/0 0/0 .rodata @3791 */ SECTION_RODATA static u8 const lit_3791[4] = { @@ -1026,7 +1026,7 @@ SECTION_RODATA static u8 const lit_3791[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(8079D5B4, &lit_3791); +COMPILER_STRIP_GATE(0x8079D5B4, &lit_3791); /* 8079D5B8-8079D5C0 000008 0004+04 3/14 0/0 0/0 .rodata @3792 */ SECTION_RODATA static f32 const lit_3792[1 + 1 /* padding */] = { @@ -1034,7 +1034,7 @@ SECTION_RODATA static f32 const lit_3792[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(8079D5B8, &lit_3792); +COMPILER_STRIP_GATE(0x8079D5B8, &lit_3792); /* 8079D5C0-8079D5C8 000010 0008+00 0/2 0/0 0/0 .rodata @3793 */ #pragma push @@ -1042,7 +1042,7 @@ COMPILER_STRIP_GATE(8079D5B8, &lit_3792); SECTION_RODATA static u8 const lit_3793[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8079D5C0, &lit_3793); +COMPILER_STRIP_GATE(0x8079D5C0, &lit_3793); #pragma pop /* 8079D5C8-8079D5D0 000018 0008+00 0/2 0/0 0/0 .rodata @3794 */ @@ -1051,7 +1051,7 @@ COMPILER_STRIP_GATE(8079D5C0, &lit_3793); SECTION_RODATA static u8 const lit_3794[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8079D5C8, &lit_3794); +COMPILER_STRIP_GATE(0x8079D5C8, &lit_3794); #pragma pop /* 8079D5D0-8079D5D8 000020 0008+00 0/3 0/0 0/0 .rodata @3795 */ @@ -1060,42 +1060,42 @@ COMPILER_STRIP_GATE(8079D5C8, &lit_3794); SECTION_RODATA static u8 const lit_3795[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8079D5D0, &lit_3795); +COMPILER_STRIP_GATE(0x8079D5D0, &lit_3795); #pragma pop /* 8079D5D8-8079D5DC 000028 0004+00 0/5 0/0 0/0 .rodata @3796 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3796 = 1.0f / 100.0f; -COMPILER_STRIP_GATE(8079D5D8, &lit_3796); +COMPILER_STRIP_GATE(0x8079D5D8, &lit_3796); #pragma pop /* 8079D5DC-8079D5E0 00002C 0004+00 0/1 0/0 0/0 .rodata @4040 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4040 = 217.0f; -COMPILER_STRIP_GATE(8079D5DC, &lit_4040); +COMPILER_STRIP_GATE(0x8079D5DC, &lit_4040); #pragma pop /* 8079D5E0-8079D5E4 000030 0004+00 0/6 0/0 0/0 .rodata @4041 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4041 = 50.0f; -COMPILER_STRIP_GATE(8079D5E0, &lit_4041); +COMPILER_STRIP_GATE(0x8079D5E0, &lit_4041); #pragma pop /* 8079D5E4-8079D5E8 000034 0004+00 0/1 0/0 0/0 .rodata @4042 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4042 = 2500.0f; -COMPILER_STRIP_GATE(8079D5E4, &lit_4042); +COMPILER_STRIP_GATE(0x8079D5E4, &lit_4042); #pragma pop /* 8079D5E8-8079D5EC 000038 0004+00 0/2 0/0 0/0 .rodata @4043 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4043 = 700.0f; -COMPILER_STRIP_GATE(8079D5E8, &lit_4043); +COMPILER_STRIP_GATE(0x8079D5E8, &lit_4043); #pragma pop /* 80798D90-80799070 000330 02E0+00 1/0 0/0 0/0 .text daE_SM2_Draw__FP11e_sm2_class */ @@ -1123,14 +1123,14 @@ static asm void size_get(u8 param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4069 = 30.0f; -COMPILER_STRIP_GATE(8079D5EC, &lit_4069); +COMPILER_STRIP_GATE(0x8079D5EC, &lit_4069); #pragma pop /* 8079D5F0-8079D5F4 000040 0004+00 0/3 0/0 0/0 .rodata @4070 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4070 = 60.0f; -COMPILER_STRIP_GATE(8079D5F0, &lit_4070); +COMPILER_STRIP_GATE(0x8079D5F0, &lit_4070); #pragma pop /* 80799084-80799160 000624 00DC+00 5/5 0/0 0/0 .text sm2_delete__FP11e_sm2_class */ @@ -1158,7 +1158,7 @@ static asm void cc_stts_init(e_sm2_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4130 = 600.0f; -COMPILER_STRIP_GATE(8079D5F4, &lit_4130); +COMPILER_STRIP_GATE(0x8079D5F4, &lit_4130); #pragma pop /* 807991D4-80799394 000774 01C0+00 1/1 0/0 0/0 .text s_s_sub__FPvPv */ @@ -1186,98 +1186,98 @@ static asm void pl_check(e_sm2_class* param_0, f32 param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4201 = 6.0f; -COMPILER_STRIP_GATE(8079D5F8, &lit_4201); +COMPILER_STRIP_GATE(0x8079D5F8, &lit_4201); #pragma pop /* 8079D5FC-8079D600 00004C 0004+00 0/3 0/0 0/0 .rodata @4202 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4202 = 65536.0f; -COMPILER_STRIP_GATE(8079D5FC, &lit_4202); +COMPILER_STRIP_GATE(0x8079D5FC, &lit_4202); #pragma pop /* 8079D600-8079D604 000050 0004+00 0/1 0/0 0/0 .rodata @4203 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4203 = 23.0f; -COMPILER_STRIP_GATE(8079D600, &lit_4203); +COMPILER_STRIP_GATE(0x8079D600, &lit_4203); #pragma pop /* 8079D604-8079D608 000054 0004+00 0/3 0/0 0/0 .rodata @4204 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4204 = 3.0f; -COMPILER_STRIP_GATE(8079D604, &lit_4204); +COMPILER_STRIP_GATE(0x8079D604, &lit_4204); #pragma pop /* 8079D608-8079D60C 000058 0004+00 0/3 0/0 0/0 .rodata @4205 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4205 = 8.0f; -COMPILER_STRIP_GATE(8079D608, &lit_4205); +COMPILER_STRIP_GATE(0x8079D608, &lit_4205); #pragma pop /* 8079D60C-8079D610 00005C 0004+00 0/1 0/0 0/0 .rodata @4206 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4206 = 15.0f; -COMPILER_STRIP_GATE(8079D60C, &lit_4206); +COMPILER_STRIP_GATE(0x8079D60C, &lit_4206); #pragma pop /* 8079D610-8079D614 000060 0004+00 0/3 0/0 0/0 .rodata @4207 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4207 = 25.0f; -COMPILER_STRIP_GATE(8079D610, &lit_4207); +COMPILER_STRIP_GATE(0x8079D610, &lit_4207); #pragma pop /* 8079D614-8079D618 000064 0004+00 0/1 0/0 0/0 .rodata @4208 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4208 = 400.0f; -COMPILER_STRIP_GATE(8079D614, &lit_4208); +COMPILER_STRIP_GATE(0x8079D614, &lit_4208); #pragma pop /* 8079D618-8079D61C 000068 0004+00 0/3 0/0 0/0 .rodata @4209 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4209 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(8079D618, &lit_4209); +COMPILER_STRIP_GATE(0x8079D618, &lit_4209); #pragma pop /* 8079D61C-8079D620 00006C 0004+00 0/5 0/0 0/0 .rodata @4210 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4210 = 0.5f; -COMPILER_STRIP_GATE(8079D61C, &lit_4210); +COMPILER_STRIP_GATE(0x8079D61C, &lit_4210); #pragma pop /* 8079D620-8079D624 000070 0004+00 0/2 0/0 0/0 .rodata @4211 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4211 = 13.0f / 20.0f; -COMPILER_STRIP_GATE(8079D620, &lit_4211); +COMPILER_STRIP_GATE(0x8079D620, &lit_4211); #pragma pop /* 8079D624-8079D628 000074 0004+00 0/2 0/0 0/0 .rodata @4212 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4212 = 3.0f / 100.0f; -COMPILER_STRIP_GATE(8079D624, &lit_4212); +COMPILER_STRIP_GATE(0x8079D624, &lit_4212); #pragma pop /* 8079D628-8079D62C 000078 0004+00 0/8 0/0 0/0 .rodata @4213 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4213 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(8079D628, &lit_4213); +COMPILER_STRIP_GATE(0x8079D628, &lit_4213); #pragma pop /* 8079D62C-8079D630 00007C 0004+00 0/1 0/0 0/0 .rodata @4214 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4214 = 1.0f / 50.0f; -COMPILER_STRIP_GATE(8079D62C, &lit_4214); +COMPILER_STRIP_GATE(0x8079D62C, &lit_4214); #pragma pop /* 8079DB88-8079DB8C 000008 0001+03 1/1 0/0 0/0 .bss @1109 */ @@ -1397,40 +1397,40 @@ static asm void normal_move(e_sm2_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4254 = 20.0f; -COMPILER_STRIP_GATE(8079D630, &lit_4254); +COMPILER_STRIP_GATE(0x8079D630, &lit_4254); #pragma pop /* 8079D634-8079D638 000084 0004+00 0/4 0/0 0/0 .rodata @4255 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4255 = 5.0f; -COMPILER_STRIP_GATE(8079D634, &lit_4255); +COMPILER_STRIP_GATE(0x8079D634, &lit_4255); #pragma pop /* 8079D638-8079D63C 000088 0004+00 0/1 0/0 0/0 .rodata @4256 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4256 = 40.0f; -COMPILER_STRIP_GATE(8079D638, &lit_4256); +COMPILER_STRIP_GATE(0x8079D638, &lit_4256); #pragma pop /* 8079D63C-8079D640 00008C 0004+00 0/0 0/0 0/0 .rodata @4257 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4257 = 35.0f; -COMPILER_STRIP_GATE(8079D63C, &lit_4257); +COMPILER_STRIP_GATE(0x8079D63C, &lit_4257); #pragma pop /* 8079D640-8079D644 000090 0004+00 0/3 0/0 0/0 .rodata @4258 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4258 = 10.0f; -COMPILER_STRIP_GATE(8079D640, &lit_4258); +COMPILER_STRIP_GATE(0x8079D640, &lit_4258); #pragma pop /* 8079D644-8079D648 000094 0004+00 1/3 0/0 0/0 .rodata @4259 */ SECTION_RODATA static f32 const lit_4259 = 2.0f; -COMPILER_STRIP_GATE(8079D644, &lit_4259); +COMPILER_STRIP_GATE(0x8079D644, &lit_4259); /* 80799784-80799A50 000D24 02CC+00 2/2 0/0 0/0 .text attack__FP11e_sm2_class */ #pragma push @@ -1447,21 +1447,21 @@ static asm void attack(e_sm2_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4332 = 3.5f; -COMPILER_STRIP_GATE(8079D648, &lit_4332); +COMPILER_STRIP_GATE(0x8079D648, &lit_4332); #pragma pop /* 8079D64C-8079D650 00009C 0004+00 0/1 0/0 0/0 .rodata @4333 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4333 = 4.0f / 5.0f; -COMPILER_STRIP_GATE(8079D64C, &lit_4333); +COMPILER_STRIP_GATE(0x8079D64C, &lit_4333); #pragma pop /* 8079D650-8079D654 0000A0 0004+00 0/1 0/0 0/0 .rodata @4334 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4334 = 3.0f / 25.0f; -COMPILER_STRIP_GATE(8079D650, &lit_4334); +COMPILER_STRIP_GATE(0x8079D650, &lit_4334); #pragma pop /* 80799A50-80799DAC 000FF0 035C+00 1/1 0/0 0/0 .text combine__FP11e_sm2_class */ @@ -1479,35 +1479,35 @@ static asm void combine(e_sm2_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4409 = -150.0f; -COMPILER_STRIP_GATE(8079D654, &lit_4409); +COMPILER_STRIP_GATE(0x8079D654, &lit_4409); #pragma pop /* 8079D658-8079D65C 0000A8 0004+00 0/1 0/0 0/0 .rodata @4410 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4410 = 13.0f / 10.0f; -COMPILER_STRIP_GATE(8079D658, &lit_4410); +COMPILER_STRIP_GATE(0x8079D658, &lit_4410); #pragma pop /* 8079D65C-8079D660 0000AC 0004+00 0/1 0/0 0/0 .rodata @4411 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4411 = 13.0f / 100.0f; -COMPILER_STRIP_GATE(8079D65C, &lit_4411); +COMPILER_STRIP_GATE(0x8079D65C, &lit_4411); #pragma pop /* 8079D660-8079D664 0000B0 0004+00 0/1 0/0 0/0 .rodata @4412 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4412 = 0x3B83126F; -COMPILER_STRIP_GATE(8079D660, &lit_4412); +COMPILER_STRIP_GATE(0x8079D660, &lit_4412); #pragma pop /* 8079D664-8079D668 0000B4 0004+00 0/1 0/0 0/0 .rodata @4413 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4413 = 117.0f / 100.0f; -COMPILER_STRIP_GATE(8079D664, &lit_4413); +COMPILER_STRIP_GATE(0x8079D664, &lit_4413); #pragma pop /* 8079D668-8079D670 0000B8 0008+00 0/2 0/0 0/0 .rodata @4415 */ @@ -1516,7 +1516,13 @@ COMPILER_STRIP_GATE(8079D664, &lit_4413); SECTION_RODATA static u8 const lit_4415[8] = { 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8079D668, &lit_4415); +COMPILER_STRIP_GATE(0x8079D668, &lit_4415); +#pragma pop + +/* 8079D718-8079D718 000168 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8079D718 = "D_SB07"; #pragma pop /* 80799DAC-8079A1CC 00134C 0420+00 1/2 0/0 0/0 .text roof__FP11e_sm2_class */ @@ -1534,21 +1540,21 @@ static asm void roof(e_sm2_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4427 = -1.0f; -COMPILER_STRIP_GATE(8079D670, &lit_4427); +COMPILER_STRIP_GATE(0x8079D670, &lit_4427); #pragma pop /* 8079D674-8079D678 0000C4 0004+00 0/2 0/0 0/0 .rodata @4428 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4428 = 1.5f; -COMPILER_STRIP_GATE(8079D674, &lit_4428); +COMPILER_STRIP_GATE(0x8079D674, &lit_4428); #pragma pop /* 8079D678-8079D67C 0000C8 0004+00 0/1 0/0 0/0 .rodata @4429 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4429 = 0x3BF5C28F; -COMPILER_STRIP_GATE(8079D678, &lit_4429); +COMPILER_STRIP_GATE(0x8079D678, &lit_4429); #pragma pop /* 8079A1CC-8079A28C 00176C 00C0+00 1/1 0/0 0/0 .text water__FP11e_sm2_class */ @@ -1576,21 +1582,21 @@ static asm void eff_set(e_sm2_class* param_0, cXyz* param_1, f32 param_2) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4502 = 1.0f / 20.0f; -COMPILER_STRIP_GATE(8079D67C, &lit_4502); +COMPILER_STRIP_GATE(0x8079D67C, &lit_4502); #pragma pop /* 8079D680-8079D684 0000D0 0004+00 0/1 0/0 0/0 .rodata @4503 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4503 = 11.0f / 20.0f; -COMPILER_STRIP_GATE(8079D680, &lit_4503); +COMPILER_STRIP_GATE(0x8079D680, &lit_4503); #pragma pop /* 8079D684-8079D688 0000D4 0004+00 0/1 0/0 0/0 .rodata @4504 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4504 = 1.0f / 40.0f; -COMPILER_STRIP_GATE(8079D684, &lit_4504); +COMPILER_STRIP_GATE(0x8079D684, &lit_4504); #pragma pop /* 8079A3AC-8079A560 00194C 01B4+00 1/1 0/0 0/0 .text fail__FP11e_sm2_class */ @@ -1608,63 +1614,63 @@ static asm void fail(e_sm2_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4638 = -5.0f; -COMPILER_STRIP_GATE(8079D688, &lit_4638); +COMPILER_STRIP_GATE(0x8079D688, &lit_4638); #pragma pop /* 8079D68C-8079D690 0000DC 0004+00 0/1 0/0 0/0 .rodata @4639 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4639 = -1.5f; -COMPILER_STRIP_GATE(8079D68C, &lit_4639); +COMPILER_STRIP_GATE(0x8079D68C, &lit_4639); #pragma pop /* 8079D690-8079D694 0000E0 0004+00 0/1 0/0 0/0 .rodata @4640 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4640 = 7.0f / 5.0f; -COMPILER_STRIP_GATE(8079D690, &lit_4640); +COMPILER_STRIP_GATE(0x8079D690, &lit_4640); #pragma pop /* 8079D694-8079D698 0000E4 0004+00 0/1 0/0 0/0 .rodata @4641 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4641 = -2000.0f; -COMPILER_STRIP_GATE(8079D694, &lit_4641); +COMPILER_STRIP_GATE(0x8079D694, &lit_4641); #pragma pop /* 8079D698-8079D69C 0000E8 0004+00 0/1 0/0 0/0 .rodata @4642 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4642 = -50.0f; -COMPILER_STRIP_GATE(8079D698, &lit_4642); +COMPILER_STRIP_GATE(0x8079D698, &lit_4642); #pragma pop /* 8079D69C-8079D6A0 0000EC 0004+00 0/1 0/0 0/0 .rodata @4643 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4643 = 4.0f; -COMPILER_STRIP_GATE(8079D69C, &lit_4643); +COMPILER_STRIP_GATE(0x8079D69C, &lit_4643); #pragma pop /* 8079D6A0-8079D6A4 0000F0 0004+00 0/1 0/0 0/0 .rodata @4644 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4644 = 6000.0f; -COMPILER_STRIP_GATE(8079D6A0, &lit_4644); +COMPILER_STRIP_GATE(0x8079D6A0, &lit_4644); #pragma pop /* 8079D6A4-8079D6A8 0000F4 0004+00 0/1 0/0 0/0 .rodata @4645 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4645 = 1.0f / 25.0f; -COMPILER_STRIP_GATE(8079D6A4, &lit_4645); +COMPILER_STRIP_GATE(0x8079D6A4, &lit_4645); #pragma pop /* 8079D6A8-8079D6AC 0000F8 0004+00 0/1 0/0 0/0 .rodata @4646 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4646 = -20.0f; -COMPILER_STRIP_GATE(8079D6A8, &lit_4646); +COMPILER_STRIP_GATE(0x8079D6A8, &lit_4646); #pragma pop /* 8079A560-8079A9B4 001B00 0454+00 1/1 0/0 0/0 .text dmcalc__FP11e_sm2_class */ @@ -1682,7 +1688,7 @@ static asm void dmcalc(e_sm2_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4789 = 8000.0f; -COMPILER_STRIP_GATE(8079D6AC, &lit_4789); +COMPILER_STRIP_GATE(0x8079D6AC, &lit_4789); #pragma pop /* 8079A9B4-8079AF94 001F54 05E0+00 1/1 0/0 0/0 .text damage_check__FP11e_sm2_class */ @@ -1720,70 +1726,70 @@ asm dBgS_ObjGndChk::~dBgS_ObjGndChk() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5171 = 150.0f; -COMPILER_STRIP_GATE(8079D6B0, &lit_5171); +COMPILER_STRIP_GATE(0x8079D6B0, &lit_5171); #pragma pop /* 8079D6B4-8079D6B8 000104 0004+00 0/0 0/0 0/0 .rodata @5172 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5172 = -100.0f; -COMPILER_STRIP_GATE(8079D6B4, &lit_5172); +COMPILER_STRIP_GATE(0x8079D6B4, &lit_5172); #pragma pop /* 8079D6B8-8079D6BC 000108 0004+00 0/0 0/0 0/0 .rodata @5173 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5173 = -25.0f; -COMPILER_STRIP_GATE(8079D6B8, &lit_5173); +COMPILER_STRIP_GATE(0x8079D6B8, &lit_5173); #pragma pop /* 8079D6BC-8079D6C0 00010C 0004+00 0/0 0/0 0/0 .rodata @5174 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5174 = 200.0f; -COMPILER_STRIP_GATE(8079D6BC, &lit_5174); +COMPILER_STRIP_GATE(0x8079D6BC, &lit_5174); #pragma pop /* 8079D6C0-8079D6C4 000110 0004+00 0/0 0/0 0/0 .rodata @5175 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5175 = 500.0f; -COMPILER_STRIP_GATE(8079D6C0, &lit_5175); +COMPILER_STRIP_GATE(0x8079D6C0, &lit_5175); #pragma pop /* 8079D6C4-8079D6C8 000114 0004+00 0/0 0/0 0/0 .rodata @5176 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5176 = 9.0f; -COMPILER_STRIP_GATE(8079D6C4, &lit_5176); +COMPILER_STRIP_GATE(0x8079D6C4, &lit_5176); #pragma pop /* 8079D6C8-8079D6CC 000118 0004+00 0/0 0/0 0/0 .rodata @5177 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5177 = 12.0f; -COMPILER_STRIP_GATE(8079D6C8, &lit_5177); +COMPILER_STRIP_GATE(0x8079D6C8, &lit_5177); #pragma pop /* 8079D6CC-8079D6D0 00011C 0004+00 0/0 0/0 0/0 .rodata @5178 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5178 = 0.25f; -COMPILER_STRIP_GATE(8079D6CC, &lit_5178); +COMPILER_STRIP_GATE(0x8079D6CC, &lit_5178); #pragma pop /* 8079D6D0-8079D6D4 000120 0004+00 0/0 0/0 0/0 .rodata @5179 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_5179 = 0x3BE56042; -COMPILER_STRIP_GATE(8079D6D0, &lit_5179); +COMPILER_STRIP_GATE(0x8079D6D0, &lit_5179); #pragma pop /* 8079D6D4-8079D6D8 000124 0004+00 0/0 0/0 0/0 .rodata @5180 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5180 = 27.0f / 25.0f; -COMPILER_STRIP_GATE(8079D6D4, &lit_5180); +COMPILER_STRIP_GATE(0x8079D6D4, &lit_5180); #pragma pop /* 8079D6D8-8079D6E0 000128 0004+04 0/1 0/0 0/0 .rodata @5181 */ @@ -1794,14 +1800,14 @@ SECTION_RODATA static f32 const lit_5181[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(8079D6D8, &lit_5181); +COMPILER_STRIP_GATE(0x8079D6D8, &lit_5181); #pragma pop /* 8079D6E0-8079D6E8 000130 0008+00 1/1 0/0 0/0 .rodata @5184 */ SECTION_RODATA static u8 const lit_5184[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8079D6E0, &lit_5184); +COMPILER_STRIP_GATE(0x8079D6E0, &lit_5184); /* 8079DBE4-8079DBE8 000064 0004+00 0/0 0/0 0/0 .bss boss */ #pragma push @@ -1869,7 +1875,7 @@ static asm void col_set(e_sm2_class* param_0, s8 param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5257 = 5000.0f; -COMPILER_STRIP_GATE(8079D6E8, &lit_5257); +COMPILER_STRIP_GATE(0x8079D6E8, &lit_5257); #pragma pop /* 8079BEF0-8079C120 003490 0230+00 2/1 0/0 0/0 .text daE_SM2_Execute__FP11e_sm2_class */ @@ -1888,6 +1894,13 @@ static bool daE_SM2_IsDelete(e_sm2_class* param_0) { return true; } +/* ############################################################################################## */ +/* 8079D718-8079D718 000168 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8079D71F = "E_sm2"; +#pragma pop + /* 8079C128-8079C184 0036C8 005C+00 1/0 0/0 0/0 .text daE_SM2_Delete__FP11e_sm2_class */ #pragma push #pragma optimization_level 0 @@ -1923,28 +1936,35 @@ asm J3DFrameCtrl::~J3DFrameCtrl() { #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_5601 = 0x40DFF7CF; -COMPILER_STRIP_GATE(8079D6EC, &lit_5601); +COMPILER_STRIP_GATE(0x8079D6EC, &lit_5601); #pragma pop /* 8079D6F0-8079D6F4 000140 0004+00 0/1 0/0 0/0 .rodata @5602 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5602 = -1000.0f; -COMPILER_STRIP_GATE(8079D6F0, &lit_5602); +COMPILER_STRIP_GATE(0x8079D6F0, &lit_5602); #pragma pop /* 8079D6F4-8079D6F8 000144 0004+00 0/1 0/0 0/0 .rodata @5603 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5603 = -600.0f; -COMPILER_STRIP_GATE(8079D6F4, &lit_5603); +COMPILER_STRIP_GATE(0x8079D6F4, &lit_5603); #pragma pop /* 8079D6F8-8079D6FC 000148 0004+00 0/1 0/0 0/0 .rodata @5604 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5604 = 1000.0f; -COMPILER_STRIP_GATE(8079D6F8, &lit_5604); +COMPILER_STRIP_GATE(0x8079D6F8, &lit_5604); +#pragma pop + +/* 8079D718-8079D718 000168 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8079D725 = "T_ENEMY"; +SECTION_DEAD static char const* const stringBase_8079D72D = "D_SB01"; #pragma pop /* 8079C480-8079CB28 003A20 06A8+00 1/0 0/0 0/0 .text daE_SM2_Create__FP10fopAc_ac_c */ @@ -2062,49 +2082,49 @@ asm daE_SM2_HIO_c::~daE_SM2_HIO_c() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5769 = 117.0f; -COMPILER_STRIP_GATE(8079D6FC, &lit_5769); +COMPILER_STRIP_GATE(0x8079D6FC, &lit_5769); #pragma pop /* 8079D700-8079D704 000150 0004+00 0/1 0/0 0/0 .rodata @5770 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5770 = 170.0f; -COMPILER_STRIP_GATE(8079D700, &lit_5770); +COMPILER_STRIP_GATE(0x8079D700, &lit_5770); #pragma pop /* 8079D704-8079D708 000154 0004+00 0/1 0/0 0/0 .rodata @5771 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5771 = 90.0f; -COMPILER_STRIP_GATE(8079D704, &lit_5771); +COMPILER_STRIP_GATE(0x8079D704, &lit_5771); #pragma pop /* 8079D708-8079D70C 000158 0004+00 0/1 0/0 0/0 .rodata @5772 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5772 = 140.0f; -COMPILER_STRIP_GATE(8079D708, &lit_5772); +COMPILER_STRIP_GATE(0x8079D708, &lit_5772); #pragma pop /* 8079D70C-8079D710 00015C 0004+00 0/1 0/0 0/0 .rodata @5773 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5773 = 80.0f; -COMPILER_STRIP_GATE(8079D70C, &lit_5773); +COMPILER_STRIP_GATE(0x8079D70C, &lit_5773); #pragma pop /* 8079D710-8079D714 000160 0004+00 0/1 0/0 0/0 .rodata @5774 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5774 = 130.0f; -COMPILER_STRIP_GATE(8079D710, &lit_5774); +COMPILER_STRIP_GATE(0x8079D710, &lit_5774); #pragma pop /* 8079D714-8079D718 000164 0004+00 0/1 0/0 0/0 .rodata @5775 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5775 = 255.0f; -COMPILER_STRIP_GATE(8079D714, &lit_5775); +COMPILER_STRIP_GATE(0x8079D714, &lit_5775); #pragma pop /* 8079CF00-8079D0E8 0044A0 01E8+00 0/0 1/0 0/0 .text __sinit_d_a_e_sm2_cpp */ @@ -2119,7 +2139,7 @@ asm void __sinit_d_a_e_sm2_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_8079CF00 = (void*)__sinit_d_a_e_sm2_cpp; +REGISTER_CTORS(0x8079CF00, __sinit_d_a_e_sm2_cpp); #pragma pop /* 8079D0E8-8079D0F0 004688 0008+00 1/0 0/0 0/0 .text @20@__dt__14dBgS_ObjGndChkFv */ @@ -2376,12 +2396,4 @@ static u8 data_8079DCEC[4]; static u8 data_8079DCF0[4]; #pragma pop -/* 8079D718-8079D734 000168 001C+00 4/4 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_8079D718 = "D_SB07"; -SECTION_DEAD static char const* const stringBase_8079D71F = "E_sm2"; -SECTION_DEAD static char const* const stringBase_8079D725 = "T_ENEMY"; -SECTION_DEAD static char const* const stringBase_8079D72D = "D_SB01"; -#pragma pop +/* 8079D718-8079D718 000168 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/e/d_a_e_st/d_a_e_st.cpp b/rel/d/a/e/d_a_e_st/d_a_e_st.cpp index 7877acac5d3..5d44f75fc31 100644 --- a/rel/d/a/e/d_a_e_st/d_a_e_st.cpp +++ b/rel/d/a/e/d_a_e_st/d_a_e_st.cpp @@ -24,16 +24,16 @@ struct mDoMtx_stack_c { static u8 now[48]; }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; - struct J3DAnmTransform {}; +struct J3DModelData {}; + +struct Z2Creature {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -535,7 +535,7 @@ extern "C" void __register_global_object(); /* ############################################################################################## */ /* 807A6824-807A6828 000000 0004+00 40/40 0/0 0/0 .rodata @3903 */ SECTION_RODATA static f32 const lit_3903 = 100.0f; -COMPILER_STRIP_GATE(807A6824, &lit_3903); +COMPILER_STRIP_GATE(0x807A6824, &lit_3903); /* 807A6828-807A682C 000004 0004+00 3/36 0/0 0/0 .rodata @3904 */ SECTION_RODATA static u8 const lit_3904[4] = { @@ -544,7 +544,7 @@ SECTION_RODATA static u8 const lit_3904[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(807A6828, &lit_3904); +COMPILER_STRIP_GATE(0x807A6828, &lit_3904); /* 807A682C-807A6834 000008 0004+04 1/30 0/0 0/0 .rodata @3905 */ SECTION_RODATA static f32 const lit_3905[1 + 1 /* padding */] = { @@ -552,7 +552,7 @@ SECTION_RODATA static f32 const lit_3905[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(807A682C, &lit_3905); +COMPILER_STRIP_GATE(0x807A682C, &lit_3905); /* 807A6834-807A683C 000010 0008+00 0/1 0/0 0/0 .rodata @3906 */ #pragma push @@ -560,7 +560,7 @@ COMPILER_STRIP_GATE(807A682C, &lit_3905); SECTION_RODATA static u8 const lit_3906[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(807A6834, &lit_3906); +COMPILER_STRIP_GATE(0x807A6834, &lit_3906); #pragma pop /* 807A683C-807A6844 000018 0008+00 0/1 0/0 0/0 .rodata @3907 */ @@ -569,7 +569,7 @@ COMPILER_STRIP_GATE(807A6834, &lit_3906); SECTION_RODATA static u8 const lit_3907[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(807A683C, &lit_3907); +COMPILER_STRIP_GATE(0x807A683C, &lit_3907); #pragma pop /* 807A6844-807A684C 000020 0008+00 0/1 0/0 0/0 .rodata @3908 */ @@ -578,44 +578,44 @@ COMPILER_STRIP_GATE(807A683C, &lit_3907); SECTION_RODATA static u8 const lit_3908[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(807A6844, &lit_3908); +COMPILER_STRIP_GATE(0x807A6844, &lit_3908); #pragma pop /* 807A684C-807A6850 000028 0004+00 0/1 0/0 0/0 .rodata @3909 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3909 = 1.0f / 100.0f; -COMPILER_STRIP_GATE(807A684C, &lit_3909); +COMPILER_STRIP_GATE(0x807A684C, &lit_3909); #pragma pop /* 807A6850-807A6854 00002C 0004+00 0/2 0/0 0/0 .rodata @3924 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3924 = 17.0f / 10.0f; -COMPILER_STRIP_GATE(807A6850, &lit_3924); +COMPILER_STRIP_GATE(0x807A6850, &lit_3924); #pragma pop /* 807A6854-807A6858 000030 0004+00 0/1 0/0 0/0 .rodata @3925 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3925 = 1200.0f; -COMPILER_STRIP_GATE(807A6854, &lit_3925); +COMPILER_STRIP_GATE(0x807A6854, &lit_3925); #pragma pop /* 807A6858-807A685C 000034 0004+00 1/7 0/0 0/0 .rodata @3926 */ SECTION_RODATA static f32 const lit_3926 = 200.0f; -COMPILER_STRIP_GATE(807A6858, &lit_3926); +COMPILER_STRIP_GATE(0x807A6858, &lit_3926); /* 807A685C-807A6860 000038 0004+00 0/1 0/0 0/0 .rodata @3927 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3927 = -0.5f; -COMPILER_STRIP_GATE(807A685C, &lit_3927); +COMPILER_STRIP_GATE(0x807A685C, &lit_3927); #pragma pop /* 807A6860-807A6864 00003C 0004+00 1/3 0/0 0/0 .rodata @3928 */ SECTION_RODATA static f32 const lit_3928 = -1.0f; -COMPILER_STRIP_GATE(807A6860, &lit_3928); +COMPILER_STRIP_GATE(0x807A6860, &lit_3928); /* 807A69EC-807A69F8 000000 000C+00 2/2 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { @@ -933,6 +933,13 @@ asm daE_ST_HIO_c::daE_ST_HIO_c() { } #pragma pop +/* ############################################################################################## */ +/* 807A69E0-807A69E0 0001BC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_807A69E0 = "E_st"; +#pragma pop + /* 8079DE4C-8079DEF8 00014C 00AC+00 22/22 0/0 0/0 .text anm_init__FP10e_st_classifUcf */ #pragma push #pragma optimization_level 0 @@ -958,28 +965,28 @@ static asm void nodeCallBack(J3DJoint* param_0, int param_1) { #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4049 = 0x000000FF; -COMPILER_STRIP_GATE(807A6864, &lit_4049); +COMPILER_STRIP_GATE(0x807A6864, &lit_4049); #pragma pop /* 807A6868-807A686C 000044 0004+00 0/1 0/0 0/0 .rodata @4053 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4053 = 0x000000FF; -COMPILER_STRIP_GATE(807A6868, &lit_4053); +COMPILER_STRIP_GATE(0x807A6868, &lit_4053); #pragma pop /* 807A686C-807A6870 000048 0004+00 0/1 0/0 0/0 .rodata @4089 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4089 = 400.0f; -COMPILER_STRIP_GATE(807A686C, &lit_4089); +COMPILER_STRIP_GATE(0x807A686C, &lit_4089); #pragma pop /* 807A6870-807A6874 00004C 0004+00 0/2 0/0 0/0 .rodata @4090 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4090 = 700.0f; -COMPILER_STRIP_GATE(807A6870, &lit_4090); +COMPILER_STRIP_GATE(0x807A6870, &lit_4090); #pragma pop /* 807A6DA0-807A6DA4 000008 0001+03 2/2 0/0 0/0 .bss @1109 */ @@ -1105,7 +1112,7 @@ static asm void daE_ST_Draw(e_st_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4128 = 150.0f; -COMPILER_STRIP_GATE(807A6874, &lit_4128); +COMPILER_STRIP_GATE(0x807A6874, &lit_4128); #pragma pop /* 8079E43C-8079E550 00073C 0114+00 1/1 0/0 0/0 .text other_bg_check__FP10e_st_classP10fopAc_ac_c @@ -1122,7 +1129,7 @@ static asm void other_bg_check(e_st_class* param_0, fopAc_ac_c* param_1) { /* ############################################################################################## */ /* 807A6878-807A687C 000054 0004+00 1/1 0/0 0/0 .rodata @4175 */ SECTION_RODATA static f32 const lit_4175 = 750.0f; -COMPILER_STRIP_GATE(807A6878, &lit_4175); +COMPILER_STRIP_GATE(0x807A6878, &lit_4175); /* 8079E550-8079E684 000850 0134+00 5/5 0/0 0/0 .text pl_check__FP10e_st_classf */ #pragma push @@ -1139,53 +1146,53 @@ static asm void pl_check(e_st_class* param_0, f32 param_1) { #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4266 = 0x3B03126F; -COMPILER_STRIP_GATE(807A687C, &lit_4266); +COMPILER_STRIP_GATE(0x807A687C, &lit_4266); #pragma pop /* 807A6880-807A6884 00005C 0004+00 0/12 0/0 0/0 .rodata @4267 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4267 = 10.0f; -COMPILER_STRIP_GATE(807A6880, &lit_4267); +COMPILER_STRIP_GATE(0x807A6880, &lit_4267); #pragma pop /* 807A6884-807A6888 000060 0004+00 1/18 0/0 0/0 .rodata @4268 */ SECTION_RODATA static f32 const lit_4268 = 2.0f; -COMPILER_STRIP_GATE(807A6884, &lit_4268); +COMPILER_STRIP_GATE(0x807A6884, &lit_4268); /* 807A6888-807A688C 000064 0004+00 0/6 0/0 0/0 .rodata @4269 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4269 = 30.0f; -COMPILER_STRIP_GATE(807A6888, &lit_4269); +COMPILER_STRIP_GATE(0x807A6888, &lit_4269); #pragma pop /* 807A688C-807A6890 000068 0004+00 0/3 0/0 0/0 .rodata @4270 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4270 = 4000.0f; -COMPILER_STRIP_GATE(807A688C, &lit_4270); +COMPILER_STRIP_GATE(0x807A688C, &lit_4270); #pragma pop /* 807A6890-807A6894 00006C 0004+00 0/3 0/0 0/0 .rodata @4271 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4271 = 1000.0f; -COMPILER_STRIP_GATE(807A6890, &lit_4271); +COMPILER_STRIP_GATE(0x807A6890, &lit_4271); #pragma pop /* 807A6894-807A6898 000070 0004+00 0/2 0/0 0/0 .rodata @4272 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4272 = 2000.0f; -COMPILER_STRIP_GATE(807A6894, &lit_4272); +COMPILER_STRIP_GATE(0x807A6894, &lit_4272); #pragma pop /* 807A6898-807A689C 000074 0004+00 0/1 0/0 0/0 .rodata @4273 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4273 = 8000.0f; -COMPILER_STRIP_GATE(807A6898, &lit_4273); +COMPILER_STRIP_GATE(0x807A6898, &lit_4273); #pragma pop /* 8079E684-8079EAA8 000984 0424+00 1/1 0/0 0/0 .text damage_check__FP10e_st_class */ @@ -1201,7 +1208,7 @@ static asm void damage_check(e_st_class* param_0) { /* ############################################################################################## */ /* 807A689C-807A68A0 000078 0004+00 1/14 0/0 0/0 .rodata @4330 */ SECTION_RODATA static f32 const lit_4330 = 5.0f; -COMPILER_STRIP_GATE(807A689C, &lit_4330); +COMPILER_STRIP_GATE(0x807A689C, &lit_4330); /* 8079EAA8-8079EC90 000DA8 01E8+00 3/3 0/0 0/0 .text move_bg_check__FP10e_st_class */ #pragma push @@ -1218,7 +1225,7 @@ static asm void move_bg_check(e_st_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4393 = -300.0f; -COMPILER_STRIP_GATE(807A68A0, &lit_4393); +COMPILER_STRIP_GATE(0x807A68A0, &lit_4393); #pragma pop /* 8079EC90-8079EF3C 000F90 02AC+00 1/1 0/0 0/0 .text bg_angle_set__FP10e_st_classs */ @@ -1236,7 +1243,7 @@ static asm void bg_angle_set(e_st_class* param_0, s16 param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4430 = -400.0f; -COMPILER_STRIP_GATE(807A68A4, &lit_4430); +COMPILER_STRIP_GATE(0x807A68A4, &lit_4430); #pragma pop /* 8079EF3C-8079F08C 00123C 0150+00 3/3 0/0 0/0 .text bg_pos_get__FP10e_st_class */ @@ -1274,14 +1281,14 @@ static asm void move_calc(e_st_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4504 = 50.0f; -COMPILER_STRIP_GATE(807A68A8, &lit_4504); +COMPILER_STRIP_GATE(0x807A68A8, &lit_4504); #pragma pop /* 807A68AC-807A68B0 000088 0004+00 0/5 0/0 0/0 .rodata @4505 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4505 = 0.5f; -COMPILER_STRIP_GATE(807A68AC, &lit_4505); +COMPILER_STRIP_GATE(0x807A68AC, &lit_4505); #pragma pop /* 8079F210-8079F42C 001510 021C+00 1/1 0/0 0/0 .text e_st_wait__FP10e_st_class */ @@ -1309,28 +1316,28 @@ static asm void pl_angle_get(e_st_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4559 = 9.0f; -COMPILER_STRIP_GATE(807A68B0, &lit_4559); +COMPILER_STRIP_GATE(0x807A68B0, &lit_4559); #pragma pop /* 807A68B4-807A68B8 000090 0004+00 0/3 0/0 0/0 .rodata @4560 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4560 = 4.0f; -COMPILER_STRIP_GATE(807A68B4, &lit_4560); +COMPILER_STRIP_GATE(0x807A68B4, &lit_4560); #pragma pop /* 807A68B8-807A68BC 000094 0004+00 0/6 0/0 0/0 .rodata @4561 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4561 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(807A68B8, &lit_4561); +COMPILER_STRIP_GATE(0x807A68B8, &lit_4561); #pragma pop /* 807A68BC-807A68C0 000098 0004+00 0/3 0/0 0/0 .rodata @4562 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4562 = 7.0f; -COMPILER_STRIP_GATE(807A68BC, &lit_4562); +COMPILER_STRIP_GATE(0x807A68BC, &lit_4562); #pragma pop /* 8079F4D8-8079F6A0 0017D8 01C8+00 1/1 0/0 0/0 .text e_st_move__FP10e_st_class */ @@ -1348,42 +1355,42 @@ static asm void e_st_move(e_st_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4639 = 350.0f; -COMPILER_STRIP_GATE(807A68C0, &lit_4639); +COMPILER_STRIP_GATE(0x807A68C0, &lit_4639); #pragma pop /* 807A68C4-807A68C8 0000A0 0004+00 0/2 0/0 0/0 .rodata @4640 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4640 = 6.0f; -COMPILER_STRIP_GATE(807A68C4, &lit_4640); +COMPILER_STRIP_GATE(0x807A68C4, &lit_4640); #pragma pop /* 807A68C8-807A68CC 0000A4 0004+00 0/1 0/0 0/0 .rodata @4641 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4641 = 8.0f; -COMPILER_STRIP_GATE(807A68C8, &lit_4641); +COMPILER_STRIP_GATE(0x807A68C8, &lit_4641); #pragma pop /* 807A68CC-807A68D0 0000A8 0004+00 0/3 0/0 0/0 .rodata @4642 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4642 = 120.0f; -COMPILER_STRIP_GATE(807A68CC, &lit_4642); +COMPILER_STRIP_GATE(0x807A68CC, &lit_4642); #pragma pop /* 807A68D0-807A68D4 0000AC 0004+00 0/12 0/0 0/0 .rodata @4643 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4643 = 3.0f; -COMPILER_STRIP_GATE(807A68D0, &lit_4643); +COMPILER_STRIP_GATE(0x807A68D0, &lit_4643); #pragma pop /* 807A68D4-807A68D8 0000B0 0004+00 0/5 0/0 0/0 .rodata @4644 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4644 = 20.0f; -COMPILER_STRIP_GATE(807A68D4, &lit_4644); +COMPILER_STRIP_GATE(0x807A68D4, &lit_4644); #pragma pop /* 8079F6A0-8079FA18 0019A0 0378+00 1/1 0/0 0/0 .text e_st_pl_search__FP10e_st_class */ @@ -1419,48 +1426,48 @@ static asm void e_st_jump_attack(e_st_class* param_0) { /* ############################################################################################## */ /* 807A68D8-807A68DC 0000B4 0004+00 1/2 0/0 0/0 .rodata @5037 */ SECTION_RODATA static f32 const lit_5037 = 80.0f; -COMPILER_STRIP_GATE(807A68D8, &lit_5037); +COMPILER_STRIP_GATE(0x807A68D8, &lit_5037); /* 807A68DC-807A68E0 0000B8 0004+00 0/0 0/0 0/0 .rodata @5038 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5038 = 85.0f; -COMPILER_STRIP_GATE(807A68DC, &lit_5038); +COMPILER_STRIP_GATE(0x807A68DC, &lit_5038); #pragma pop /* 807A68E0-807A68E4 0000BC 0004+00 0/1 0/0 0/0 .rodata @5039 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5039 = -20.0f; -COMPILER_STRIP_GATE(807A68E0, &lit_5039); +COMPILER_STRIP_GATE(0x807A68E0, &lit_5039); #pragma pop /* 807A68E4-807A68E8 0000C0 0004+00 0/3 0/0 0/0 .rodata @5040 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5040 = 40.0f; -COMPILER_STRIP_GATE(807A68E4, &lit_5040); +COMPILER_STRIP_GATE(0x807A68E4, &lit_5040); #pragma pop /* 807A68E8-807A68EC 0000C4 0004+00 0/1 0/0 0/0 .rodata @5041 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5041 = 70.0f; -COMPILER_STRIP_GATE(807A68E8, &lit_5041); +COMPILER_STRIP_GATE(0x807A68E8, &lit_5041); #pragma pop /* 807A68EC-807A68F0 0000C8 0004+00 0/1 0/0 0/0 .rodata @5042 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5042 = 32768.0f; -COMPILER_STRIP_GATE(807A68EC, &lit_5042); +COMPILER_STRIP_GATE(0x807A68EC, &lit_5042); #pragma pop /* 807A68F0-807A68F4 0000CC 0004+00 0/2 0/0 0/0 .rodata @5122 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5122 = 1.0f / 19.0f; -COMPILER_STRIP_GATE(807A68F0, &lit_5122); +COMPILER_STRIP_GATE(0x807A68F0, &lit_5122); #pragma pop /* 807A68F4-807A68FC 0000D0 0008+00 0/5 0/0 0/0 .rodata @5124 */ @@ -1469,7 +1476,7 @@ COMPILER_STRIP_GATE(807A68F0, &lit_5122); SECTION_RODATA static u8 const lit_5124[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(807A68F4, &lit_5124); +COMPILER_STRIP_GATE(0x807A68F4, &lit_5124); #pragma pop /* 807A08BC-807A0B44 002BBC 0288+00 1/1 0/0 0/0 .text roof_line_calc__FP10e_st_class */ @@ -1487,14 +1494,14 @@ static asm void roof_line_calc(e_st_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5179 = 1.0f / 50.0f; -COMPILER_STRIP_GATE(807A68FC, &lit_5179); +COMPILER_STRIP_GATE(0x807A68FC, &lit_5179); #pragma pop /* 807A6900-807A6904 0000DC 0004+00 0/1 0/0 0/0 .rodata @5180 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_5180 = 0x3BA3D70A; -COMPILER_STRIP_GATE(807A6900, &lit_5180); +COMPILER_STRIP_GATE(0x807A6900, &lit_5180); #pragma pop /* 807A0B44-807A0D20 002E44 01DC+00 1/1 0/0 0/0 .text roof_line_calc2__FP10e_st_class */ @@ -1512,14 +1519,14 @@ static asm void roof_line_calc2(e_st_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5226 = 1.0f / 20.0f; -COMPILER_STRIP_GATE(807A6904, &lit_5226); +COMPILER_STRIP_GATE(0x807A6904, &lit_5226); #pragma pop /* 807A6908-807A690C 0000E4 0004+00 0/2 0/0 0/0 .rodata @5227 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5227 = -5.0f; -COMPILER_STRIP_GATE(807A6908, &lit_5227); +COMPILER_STRIP_GATE(0x807A6908, &lit_5227); #pragma pop /* 807A0D20-807A0F64 003020 0244+00 1/1 0/0 0/0 .text tail_line_calc__FP10e_st_class */ @@ -1537,7 +1544,7 @@ static asm void tail_line_calc(e_st_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5282 = 300.0f; -COMPILER_STRIP_GATE(807A690C, &lit_5282); +COMPILER_STRIP_GATE(0x807A690C, &lit_5282); #pragma pop /* 807A0F64-807A11EC 003264 0288+00 1/1 0/0 0/0 .text e_st_hang__FP10e_st_class */ @@ -1555,28 +1562,28 @@ static asm void e_st_hang(e_st_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5371 = 500.0f; -COMPILER_STRIP_GATE(807A6910, &lit_5371); +COMPILER_STRIP_GATE(0x807A6910, &lit_5371); #pragma pop /* 807A6914-807A6918 0000F0 0004+00 0/1 0/0 0/0 .rodata @5372 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5372 = 2.5f; -COMPILER_STRIP_GATE(807A6914, &lit_5372); +COMPILER_STRIP_GATE(0x807A6914, &lit_5372); #pragma pop /* 807A6918-807A691C 0000F4 0004+00 0/3 0/0 0/0 .rodata @5373 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5373 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(807A6918, &lit_5373); +COMPILER_STRIP_GATE(0x807A6918, &lit_5373); #pragma pop /* 807A691C-807A6920 0000F8 0004+00 0/2 0/0 0/0 .rodata @5374 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5374 = 15.0f; -COMPILER_STRIP_GATE(807A691C, &lit_5374); +COMPILER_STRIP_GATE(0x807A691C, &lit_5374); #pragma pop /* 807A11EC-807A1568 0034EC 037C+00 1/1 0/0 0/0 .text e_st_hang_shoot__FP10e_st_class */ @@ -1604,7 +1611,7 @@ static asm void e_st_hang_drop(e_st_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5551 = 65536.0f; -COMPILER_STRIP_GATE(807A6920, &lit_5551); +COMPILER_STRIP_GATE(0x807A6920, &lit_5551); #pragma pop /* 807A17DC-807A1DB8 003ADC 05DC+00 1/1 0/0 0/0 .text e_st_hang_2__FP10e_st_class */ @@ -1643,35 +1650,35 @@ static asm void e_st_s_damage(e_st_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5730 = 17.0f; -COMPILER_STRIP_GATE(807A6924, &lit_5730); +COMPILER_STRIP_GATE(0x807A6924, &lit_5730); #pragma pop /* 807A6928-807A692C 000104 0004+00 0/2 0/0 0/0 .rodata @5731 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5731 = 35.0f; -COMPILER_STRIP_GATE(807A6928, &lit_5731); +COMPILER_STRIP_GATE(0x807A6928, &lit_5731); #pragma pop /* 807A692C-807A6930 000108 0004+00 0/1 0/0 0/0 .rodata @5732 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5732 = -30.0f; -COMPILER_STRIP_GATE(807A692C, &lit_5732); +COMPILER_STRIP_GATE(0x807A692C, &lit_5732); #pragma pop /* 807A6930-807A6934 00010C 0004+00 0/1 0/0 0/0 .rodata @5733 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5733 = 3.0f / 10.0f; -COMPILER_STRIP_GATE(807A6930, &lit_5733); +COMPILER_STRIP_GATE(0x807A6930, &lit_5733); #pragma pop /* 807A6934-807A6938 000110 0004+00 0/1 0/0 0/0 .rodata @5734 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5734 = -3.0f / 10.0f; -COMPILER_STRIP_GATE(807A6934, &lit_5734); +COMPILER_STRIP_GATE(0x807A6934, &lit_5734); #pragma pop /* 807A2110-807A266C 004410 055C+00 1/1 0/0 0/0 .text e_st_damage__FP10e_st_class */ @@ -1689,14 +1696,14 @@ static asm void e_st_damage(e_st_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5784 = -2.0f; -COMPILER_STRIP_GATE(807A6938, &lit_5784); +COMPILER_STRIP_GATE(0x807A6938, &lit_5784); #pragma pop /* 807A693C-807A6940 000118 0004+00 0/1 0/0 0/0 .rodata @5785 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5785 = 9.0f / 10.0f; -COMPILER_STRIP_GATE(807A693C, &lit_5785); +COMPILER_STRIP_GATE(0x807A693C, &lit_5785); #pragma pop /* 807A266C-807A28A0 00496C 0234+00 1/1 0/0 0/0 .text e_st_water__FP10e_st_class */ @@ -1714,7 +1721,7 @@ static asm void e_st_water(e_st_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5796 = 3120.0f; -COMPILER_STRIP_GATE(807A6940, &lit_5796); +COMPILER_STRIP_GATE(0x807A6940, &lit_5796); #pragma pop /* 807A28A0-807A2970 004BA0 00D0+00 1/1 0/0 0/0 .text water_check__FP10e_st_class */ @@ -1762,14 +1769,14 @@ static asm void e_st_g_normal(e_st_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5928 = 29.0f / 50.0f; -COMPILER_STRIP_GATE(807A6944, &lit_5928); +COMPILER_STRIP_GATE(0x807A6944, &lit_5928); #pragma pop /* 807A6948-807A694C 000124 0004+00 0/1 0/0 0/0 .rodata @5929 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5929 = 3.5f; -COMPILER_STRIP_GATE(807A6948, &lit_5929); +COMPILER_STRIP_GATE(0x807A6948, &lit_5929); #pragma pop /* 807A2D28-807A3148 005028 0420+00 1/1 0/0 0/0 .text e_st_g_fight__FP10e_st_class */ @@ -1827,7 +1834,7 @@ static asm void e_st_g_wind(e_st_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6090 = 13.0f; -COMPILER_STRIP_GATE(807A694C, &lit_6090); +COMPILER_STRIP_GATE(0x807A694C, &lit_6090); #pragma pop /* 807A3548-807A3858 005848 0310+00 1/1 0/0 0/0 .text e_st_g_chance__FP10e_st_class */ @@ -1845,14 +1852,14 @@ static asm void e_st_g_chance(e_st_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6157 = 36.5f; -COMPILER_STRIP_GATE(807A6950, &lit_6157); +COMPILER_STRIP_GATE(0x807A6950, &lit_6157); #pragma pop /* 807A6954-807A6958 000130 0004+00 0/1 0/0 0/0 .rodata @6158 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6158 = 32.0f; -COMPILER_STRIP_GATE(807A6954, &lit_6158); +COMPILER_STRIP_GATE(0x807A6954, &lit_6158); #pragma pop /* 807A3858-807A3B38 005B58 02E0+00 1/1 0/0 0/0 .text e_st_g_end__FP10e_st_class */ @@ -1870,28 +1877,28 @@ static asm void e_st_g_end(e_st_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6249 = -10.0f; -COMPILER_STRIP_GATE(807A6958, &lit_6249); +COMPILER_STRIP_GATE(0x807A6958, &lit_6249); #pragma pop /* 807A695C-807A6960 000138 0004+00 0/1 0/0 0/0 .rodata @6250 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6250 = -40.0f; -COMPILER_STRIP_GATE(807A695C, &lit_6250); +COMPILER_STRIP_GATE(0x807A695C, &lit_6250); #pragma pop /* 807A6960-807A6964 00013C 0004+00 0/1 0/0 0/0 .rodata @6251 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6251 = -15.0f; -COMPILER_STRIP_GATE(807A6960, &lit_6251); +COMPILER_STRIP_GATE(0x807A6960, &lit_6251); #pragma pop /* 807A6964-807A6968 000140 0004+00 0/1 0/0 0/0 .rodata @6252 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6252 = -12.0f; -COMPILER_STRIP_GATE(807A6964, &lit_6252); +COMPILER_STRIP_GATE(0x807A6964, &lit_6252); #pragma pop /* 807A3B38-807A3E44 005E38 030C+00 1/1 0/0 0/0 .text damage_check_g__FP10e_st_class */ @@ -1909,14 +1916,14 @@ static asm void damage_check_g(e_st_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6283 = 58.0f; -COMPILER_STRIP_GATE(807A6968, &lit_6283); +COMPILER_STRIP_GATE(0x807A6968, &lit_6283); #pragma pop /* 807A696C-807A6970 000148 0004+00 0/1 0/0 0/0 .rodata @6284 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6284 = -1000000000.0f; -COMPILER_STRIP_GATE(807A696C, &lit_6284); +COMPILER_STRIP_GATE(0x807A696C, &lit_6284); #pragma pop /* 807A3E44-807A4004 006144 01C0+00 1/1 0/0 0/0 .text ground_angle_set__FP10e_st_class */ @@ -1934,7 +1941,7 @@ static asm void ground_angle_set(e_st_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6300 = 20000.0f; -COMPILER_STRIP_GATE(807A6970, &lit_6300); +COMPILER_STRIP_GATE(0x807A6970, &lit_6300); #pragma pop /* 807A4004-807A4148 006304 0144+00 1/1 0/0 0/0 .text foot_control__FP10e_st_classP7st_foot */ @@ -2001,147 +2008,147 @@ static asm void action(e_st_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6480 = -80.0f; -COMPILER_STRIP_GATE(807A6974, &lit_6480); +COMPILER_STRIP_GATE(0x807A6974, &lit_6480); #pragma pop /* 807A6978-807A697C 000154 0004+00 0/2 0/0 0/0 .rodata @6481 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6481 = -200.0f; -COMPILER_STRIP_GATE(807A6978, &lit_6481); +COMPILER_STRIP_GATE(0x807A6978, &lit_6481); #pragma pop /* 807A697C-807A6980 000158 0004+00 0/1 0/0 0/0 .rodata @6482 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6482 = 60.0f; -COMPILER_STRIP_GATE(807A697C, &lit_6482); +COMPILER_STRIP_GATE(0x807A697C, &lit_6482); #pragma pop /* 807A6980-807A6984 00015C 0004+00 0/2 0/0 0/0 .rodata @6483 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6483 = 55.0f; -COMPILER_STRIP_GATE(807A6980, &lit_6483); +COMPILER_STRIP_GATE(0x807A6980, &lit_6483); #pragma pop /* 807A6984-807A6988 000160 0004+00 0/0 0/0 0/0 .rodata @6484 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6484 = 25.0f; -COMPILER_STRIP_GATE(807A6984, &lit_6484); +COMPILER_STRIP_GATE(0x807A6984, &lit_6484); #pragma pop /* 807A6988-807A698C 000164 0004+00 0/0 0/0 0/0 .rodata @6485 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6485 = 4.0f / 5.0f; -COMPILER_STRIP_GATE(807A6988, &lit_6485); +COMPILER_STRIP_GATE(0x807A6988, &lit_6485); #pragma pop /* 807A698C-807A6990 000168 0004+00 0/0 0/0 0/0 .rodata @6486 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6486 = 1.5f; -COMPILER_STRIP_GATE(807A698C, &lit_6486); +COMPILER_STRIP_GATE(0x807A698C, &lit_6486); #pragma pop /* 807A6990-807A6994 00016C 0004+00 0/1 0/0 0/0 .rodata @6690 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6690 = 110.0f; -COMPILER_STRIP_GATE(807A6990, &lit_6690); +COMPILER_STRIP_GATE(0x807A6990, &lit_6690); #pragma pop /* 807A6994-807A6998 000170 0004+00 0/1 0/0 0/0 .rodata @6691 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6691 = -50.0f; -COMPILER_STRIP_GATE(807A6994, &lit_6691); +COMPILER_STRIP_GATE(0x807A6994, &lit_6691); #pragma pop /* 807A6998-807A699C 000174 0004+00 0/1 0/0 0/0 .rodata @6692 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6692 = -120.0f; -COMPILER_STRIP_GATE(807A6998, &lit_6692); +COMPILER_STRIP_GATE(0x807A6998, &lit_6692); #pragma pop /* 807A699C-807A69A0 000178 0004+00 0/1 0/0 0/0 .rodata @6693 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6693 = 11.0f; -COMPILER_STRIP_GATE(807A699C, &lit_6693); +COMPILER_STRIP_GATE(0x807A699C, &lit_6693); #pragma pop /* 807A69A0-807A69A4 00017C 0004+00 0/1 0/0 0/0 .rodata @6694 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6694 = 19.0f; -COMPILER_STRIP_GATE(807A69A0, &lit_6694); +COMPILER_STRIP_GATE(0x807A69A0, &lit_6694); #pragma pop /* 807A69A4-807A69A8 000180 0004+00 0/1 0/0 0/0 .rodata @6695 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6695 = 23.0f; -COMPILER_STRIP_GATE(807A69A4, &lit_6695); +COMPILER_STRIP_GATE(0x807A69A4, &lit_6695); #pragma pop /* 807A69A8-807A69AC 000184 0004+00 0/1 0/0 0/0 .rodata @6696 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6696 = 27.0f; -COMPILER_STRIP_GATE(807A69A8, &lit_6696); +COMPILER_STRIP_GATE(0x807A69A8, &lit_6696); #pragma pop /* 807A69AC-807A69B0 000188 0004+00 0/1 0/0 0/0 .rodata @6697 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6697 = 31.0f; -COMPILER_STRIP_GATE(807A69AC, &lit_6697); +COMPILER_STRIP_GATE(0x807A69AC, &lit_6697); #pragma pop /* 807A69B0-807A69B4 00018C 0004+00 0/1 0/0 0/0 .rodata @6698 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6698 = 39.0f; -COMPILER_STRIP_GATE(807A69B0, &lit_6698); +COMPILER_STRIP_GATE(0x807A69B0, &lit_6698); #pragma pop /* 807A69B4-807A69B8 000190 0004+00 0/1 0/0 0/0 .rodata @6699 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6699 = 65.0f; -COMPILER_STRIP_GATE(807A69B4, &lit_6699); +COMPILER_STRIP_GATE(0x807A69B4, &lit_6699); #pragma pop /* 807A69B8-807A69BC 000194 0004+00 0/1 0/0 0/0 .rodata @6700 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6700 = 100000.0f; -COMPILER_STRIP_GATE(807A69B8, &lit_6700); +COMPILER_STRIP_GATE(0x807A69B8, &lit_6700); #pragma pop /* 807A69BC-807A69C0 000198 0004+00 0/1 0/0 0/0 .rodata @6701 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6701 = 90.0f; -COMPILER_STRIP_GATE(807A69BC, &lit_6701); +COMPILER_STRIP_GATE(0x807A69BC, &lit_6701); #pragma pop /* 807A69C0-807A69C4 00019C 0004+00 0/1 0/0 0/0 .rodata @6702 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6702 = -3.0f; -COMPILER_STRIP_GATE(807A69C0, &lit_6702); +COMPILER_STRIP_GATE(0x807A69C0, &lit_6702); #pragma pop /* 807A69C4-807A69C8 0001A0 0004+00 0/1 0/0 0/0 .rodata @6703 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6703 = 2.0f / 5.0f; -COMPILER_STRIP_GATE(807A69C4, &lit_6703); +COMPILER_STRIP_GATE(0x807A69C4, &lit_6703); #pragma pop /* 807A4A40-807A53BC 006D40 097C+00 2/1 0/0 0/0 .text daE_ST_Execute__FP10e_st_class */ @@ -2192,7 +2199,7 @@ static asm void kabe_initial_pos_set(e_st_class* param_0) { /* ############################################################################################## */ /* 807A69C8-807A69CC 0001A4 0004+00 1/1 0/0 0/0 .rodata @6838 */ SECTION_RODATA static f32 const lit_6838 = 5000.0f; -COMPILER_STRIP_GATE(807A69C8, &lit_6838); +COMPILER_STRIP_GATE(0x807A69C8, &lit_6838); /* 807A578C-807A586C 007A8C 00E0+00 1/1 0/0 0/0 .text roof_initial_pos_set__FP10e_st_class */ #pragma push @@ -2209,14 +2216,14 @@ static asm void roof_initial_pos_set(e_st_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6998 = -4000.0f; -COMPILER_STRIP_GATE(807A69CC, &lit_6998); +COMPILER_STRIP_GATE(0x807A69CC, &lit_6998); #pragma pop /* 807A69D0-807A69D4 0001AC 0004+00 0/1 0/0 0/0 .rodata @6999 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6999 = 65535.0f; -COMPILER_STRIP_GATE(807A69D0, &lit_6999); +COMPILER_STRIP_GATE(0x807A69D0, &lit_6999); #pragma pop /* 807A69D4-807A69DC 0001B0 0008+00 0/1 0/0 0/0 .rodata @7001 */ @@ -2225,7 +2232,13 @@ COMPILER_STRIP_GATE(807A69D0, &lit_6999); SECTION_RODATA static u8 const lit_7001[8] = { 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(807A69D4, &lit_7001); +COMPILER_STRIP_GATE(0x807A69D4, &lit_7001); +#pragma pop + +/* 807A69E0-807A69E0 0001BC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_807A69E5 = "D_MN05"; #pragma pop /* 807A586C-807A5CF4 007B6C 0488+00 1/0 0/0 0/0 .text daE_ST_Create__FP10fopAc_ac_c */ @@ -2353,7 +2366,7 @@ asm daE_ST_HIO_c::~daE_ST_HIO_c() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7250 = 78.0f; -COMPILER_STRIP_GATE(807A69DC, &lit_7250); +COMPILER_STRIP_GATE(0x807A69DC, &lit_7250); #pragma pop /* 807A6244-807A637C 008544 0138+00 0/0 1/0 0/0 .text __sinit_d_a_e_st_cpp */ @@ -2368,7 +2381,7 @@ asm void __sinit_d_a_e_st_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_807A6244 = (void*)__sinit_d_a_e_st_cpp; +REGISTER_CTORS(0x807A6244, __sinit_d_a_e_st_cpp); #pragma pop /* 807A637C-807A6384 00867C 0008+00 1/0 0/0 0/0 .text @20@__dt__14dBgS_ObjGndChkFv */ @@ -2625,10 +2638,4 @@ static u8 data_807A6ED4[4]; static u8 data_807A6ED8[4]; #pragma pop -/* 807A69E0-807A69EC 0001BC 000C+00 4/4 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_807A69E0 = "E_st"; -SECTION_DEAD static char const* const stringBase_807A69E5 = "D_MN05"; -#pragma pop +/* 807A69E0-807A69E0 0001BC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/e/d_a_e_st_line/d_a_e_st_line.cpp b/rel/d/a/e/d_a_e_st_line/d_a_e_st_line.cpp index 48d2b692efb..65932c1dac7 100644 --- a/rel/d/a/e/d_a_e_st_line/d_a_e_st_line.cpp +++ b/rel/d/a/e/d_a_e_st_line/d_a_e_st_line.cpp @@ -100,6 +100,13 @@ static bool daE_ST_LINE_IsDelete(e_st_line_class* param_0) { return true; } +/* ############################################################################################## */ +/* 807A729C-807A729C 000070 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_807A729C = "E_st"; +#pragma pop + /* 807A6FAC-807A7008 0000CC 005C+00 1/0 0/0 0/0 .text daE_ST_LINE_Delete__FP15e_st_line_class */ #pragma push #pragma optimization_level 0 @@ -113,7 +120,7 @@ static asm void daE_ST_LINE_Delete(e_st_line_class* param_0) { /* ############################################################################################## */ /* 807A722C-807A7230 000000 0004+00 1/1 0/0 0/0 .rodata @3704 */ SECTION_RODATA static f32 const lit_3704 = 70.0f; -COMPILER_STRIP_GATE(807A722C, &lit_3704); +COMPILER_STRIP_GATE(0x807A722C, &lit_3704); /* 807A7230-807A7234 000004 0004+00 0/0 0/0 0/0 .rodata @3705 */ #pragma push @@ -124,21 +131,21 @@ SECTION_RODATA static u8 const lit_3705[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(807A7230, &lit_3705); +COMPILER_STRIP_GATE(0x807A7230, &lit_3705); #pragma pop /* 807A7234-807A7238 000008 0004+00 0/0 0/0 0/0 .rodata @3706 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3706 = 100.0f; -COMPILER_STRIP_GATE(807A7234, &lit_3706); +COMPILER_STRIP_GATE(0x807A7234, &lit_3706); #pragma pop /* 807A7238-807A723C 00000C 0004+00 0/0 0/0 0/0 .rodata @3735 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3735 = 10.0f; -COMPILER_STRIP_GATE(807A7238, &lit_3735); +COMPILER_STRIP_GATE(0x807A7238, &lit_3735); #pragma pop /* 807A723C-807A7244 000010 0004+04 0/0 0/0 0/0 .rodata @3759 */ @@ -149,7 +156,7 @@ SECTION_RODATA static f32 const lit_3759[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(807A723C, &lit_3759); +COMPILER_STRIP_GATE(0x807A723C, &lit_3759); #pragma pop /* 807A7244-807A724C 000018 0008+00 0/0 0/0 0/0 .rodata @3938 */ @@ -158,7 +165,7 @@ COMPILER_STRIP_GATE(807A723C, &lit_3759); SECTION_RODATA static u8 const lit_3938[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(807A7244, &lit_3938); +COMPILER_STRIP_GATE(0x807A7244, &lit_3938); #pragma pop /* 807A724C-807A7254 000020 0008+00 0/0 0/0 0/0 .rodata @3939 */ @@ -167,7 +174,7 @@ COMPILER_STRIP_GATE(807A7244, &lit_3938); SECTION_RODATA static u8 const lit_3939[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(807A724C, &lit_3939); +COMPILER_STRIP_GATE(0x807A724C, &lit_3939); #pragma pop /* 807A7254-807A725C 000028 0008+00 0/0 0/0 0/0 .rodata @3940 */ @@ -176,75 +183,75 @@ COMPILER_STRIP_GATE(807A724C, &lit_3939); SECTION_RODATA static u8 const lit_3940[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(807A7254, &lit_3940); +COMPILER_STRIP_GATE(0x807A7254, &lit_3940); #pragma pop /* 807A725C-807A7260 000030 0004+00 0/1 0/0 0/0 .rodata @3941 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3941 = 20.0f; -COMPILER_STRIP_GATE(807A725C, &lit_3941); +COMPILER_STRIP_GATE(0x807A725C, &lit_3941); #pragma pop /* 807A7260-807A7264 000034 0004+00 0/0 0/0 0/0 .rodata @3942 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3942 = 5.0f; -COMPILER_STRIP_GATE(807A7260, &lit_3942); +COMPILER_STRIP_GATE(0x807A7260, &lit_3942); #pragma pop /* 807A7264-807A7268 000038 0004+00 0/0 0/0 0/0 .rodata @3943 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3943 = 4.0f; -COMPILER_STRIP_GATE(807A7264, &lit_3943); +COMPILER_STRIP_GATE(0x807A7264, &lit_3943); #pragma pop /* 807A7268-807A726C 00003C 0004+00 0/0 0/0 0/0 .rodata @3944 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3944 = 40.0f; -COMPILER_STRIP_GATE(807A7268, &lit_3944); +COMPILER_STRIP_GATE(0x807A7268, &lit_3944); #pragma pop /* 807A726C-807A7270 000040 0004+00 0/0 0/0 0/0 .rodata @3945 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3945 = 50.0f; -COMPILER_STRIP_GATE(807A726C, &lit_3945); +COMPILER_STRIP_GATE(0x807A726C, &lit_3945); #pragma pop /* 807A7270-807A7274 000044 0004+00 0/0 0/0 0/0 .rodata @3946 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3946 = 5000.0f; -COMPILER_STRIP_GATE(807A7270, &lit_3946); +COMPILER_STRIP_GATE(0x807A7270, &lit_3946); #pragma pop /* 807A7274-807A7278 000048 0004+00 0/0 0/0 0/0 .rodata @3947 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3947 = 1.0f; -COMPILER_STRIP_GATE(807A7274, &lit_3947); +COMPILER_STRIP_GATE(0x807A7274, &lit_3947); #pragma pop /* 807A7278-807A727C 00004C 0004+00 0/0 0/0 0/0 .rodata @4003 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4003 = 0x3C75C28F; -COMPILER_STRIP_GATE(807A7278, &lit_4003); +COMPILER_STRIP_GATE(0x807A7278, &lit_4003); #pragma pop /* 807A727C-807A7280 000050 0004+00 0/0 0/0 0/0 .rodata @4004 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4004 = 0x3BA3D70A; -COMPILER_STRIP_GATE(807A727C, &lit_4004); +COMPILER_STRIP_GATE(0x807A727C, &lit_4004); #pragma pop /* 807A7280-807A7284 000054 0004+00 1/1 0/0 0/0 .rodata @4069 */ SECTION_RODATA static f32 const lit_4069 = 3.0f / 10.0f; -COMPILER_STRIP_GATE(807A7280, &lit_4069); +COMPILER_STRIP_GATE(0x807A7280, &lit_4069); /* 807A7008-807A707C 000128 0074+00 1/1 0/0 0/0 .text useHeapInit__FP10fopAc_ac_c */ #pragma push @@ -261,42 +268,42 @@ static asm void useHeapInit(fopAc_ac_c* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4070 = 1000.0f; -COMPILER_STRIP_GATE(807A7284, &lit_4070); +COMPILER_STRIP_GATE(0x807A7284, &lit_4070); #pragma pop /* 807A7288-807A728C 00005C 0004+00 0/0 0/0 0/0 .rodata @4071 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4071 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(807A7288, &lit_4071); +COMPILER_STRIP_GATE(0x807A7288, &lit_4071); #pragma pop /* 807A728C-807A7290 000060 0004+00 0/0 0/0 0/0 .rodata @4072 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4072 = 60.0f; -COMPILER_STRIP_GATE(807A728C, &lit_4072); +COMPILER_STRIP_GATE(0x807A728C, &lit_4072); #pragma pop /* 807A7290-807A7294 000064 0004+00 0/0 0/0 0/0 .rodata @4073 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4073 = 0.5f; -COMPILER_STRIP_GATE(807A7290, &lit_4073); +COMPILER_STRIP_GATE(0x807A7290, &lit_4073); #pragma pop /* 807A7294-807A7298 000068 0004+00 0/1 0/0 0/0 .rodata @4169 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4169 = 65535.0f; -COMPILER_STRIP_GATE(807A7294, &lit_4169); +COMPILER_STRIP_GATE(0x807A7294, &lit_4169); #pragma pop /* 807A7298-807A729C 00006C 0004+00 0/1 0/0 0/0 .rodata @4170 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4170 = 170.0f; -COMPILER_STRIP_GATE(807A7298, &lit_4170); +COMPILER_STRIP_GATE(0x807A7298, &lit_4170); #pragma pop /* 807A72A4-807A72C4 -00001 0020+00 1/0 0/0 0/0 .data l_daE_ST_LINE_Method */ @@ -342,9 +349,4 @@ cXyz::cXyz() { /* empty function */ } -/* 807A729C-807A72A1 000070 0005+00 2/2 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_807A729C = "E_st"; -#pragma pop +/* 807A729C-807A729C 000070 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/e/d_a_e_sw/d_a_e_sw.cpp b/rel/d/a/e/d_a_e_sw/d_a_e_sw.cpp index 98832e97463..cca5ac34465 100644 --- a/rel/d/a/e/d_a_e_sw/d_a_e_sw.cpp +++ b/rel/d/a/e/d_a_e_sw/d_a_e_sw.cpp @@ -25,16 +25,16 @@ struct mDoMtx_stack_c { static u8 now[48]; }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; - struct J3DAnmTransform {}; +struct J3DModelData {}; + +struct Z2Creature {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -522,7 +522,7 @@ extern "C" void __register_global_object(); /* ############################################################################################## */ /* 807AFD2C-807AFD30 000000 0004+00 38/38 0/0 0/0 .rodata @3909 */ SECTION_RODATA static f32 const lit_3909 = 100.0f; -COMPILER_STRIP_GATE(807AFD2C, &lit_3909); +COMPILER_STRIP_GATE(0x807AFD2C, &lit_3909); /* 807AFD30-807AFD34 000004 0004+00 1/33 0/0 0/0 .rodata @3910 */ SECTION_RODATA static u8 const lit_3910[4] = { @@ -531,7 +531,7 @@ SECTION_RODATA static u8 const lit_3910[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(807AFD30, &lit_3910); +COMPILER_STRIP_GATE(0x807AFD30, &lit_3910); /* 807AFD34-807AFD3C 000008 0004+04 7/38 0/0 0/0 .rodata @3911 */ SECTION_RODATA static f32 const lit_3911[1 + 1 /* padding */] = { @@ -539,7 +539,7 @@ SECTION_RODATA static f32 const lit_3911[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(807AFD34, &lit_3911); +COMPILER_STRIP_GATE(0x807AFD34, &lit_3911); /* 807AFD3C-807AFD44 000010 0008+00 0/15 0/0 0/0 .rodata @3912 */ #pragma push @@ -547,7 +547,7 @@ COMPILER_STRIP_GATE(807AFD34, &lit_3911); SECTION_RODATA static u8 const lit_3912[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(807AFD3C, &lit_3912); +COMPILER_STRIP_GATE(0x807AFD3C, &lit_3912); #pragma pop /* 807AFD44-807AFD4C 000018 0008+00 0/15 0/0 0/0 .rodata @3913 */ @@ -556,7 +556,7 @@ COMPILER_STRIP_GATE(807AFD3C, &lit_3912); SECTION_RODATA static u8 const lit_3913[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(807AFD44, &lit_3913); +COMPILER_STRIP_GATE(0x807AFD44, &lit_3913); #pragma pop /* 807AFD4C-807AFD54 000020 0008+00 0/15 0/0 0/0 .rodata @3914 */ @@ -565,42 +565,42 @@ COMPILER_STRIP_GATE(807AFD44, &lit_3913); SECTION_RODATA static u8 const lit_3914[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(807AFD4C, &lit_3914); +COMPILER_STRIP_GATE(0x807AFD4C, &lit_3914); #pragma pop /* 807AFD54-807AFD58 000028 0004+00 0/1 0/0 0/0 .rodata @3915 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3915 = 1.0f / 100.0f; -COMPILER_STRIP_GATE(807AFD54, &lit_3915); +COMPILER_STRIP_GATE(0x807AFD54, &lit_3915); #pragma pop /* 807AFD58-807AFD5C 00002C 0004+00 0/4 0/0 0/0 .rodata @3930 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3930 = 1500.0f; -COMPILER_STRIP_GATE(807AFD58, &lit_3930); +COMPILER_STRIP_GATE(0x807AFD58, &lit_3930); #pragma pop /* 807AFD5C-807AFD60 000030 0004+00 0/2 0/0 0/0 .rodata @3931 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3931 = 800.0f; -COMPILER_STRIP_GATE(807AFD5C, &lit_3931); +COMPILER_STRIP_GATE(0x807AFD5C, &lit_3931); #pragma pop /* 807AFD60-807AFD64 000034 0004+00 0/2 0/0 0/0 .rodata @3932 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3932 = 400.0f; -COMPILER_STRIP_GATE(807AFD60, &lit_3932); +COMPILER_STRIP_GATE(0x807AFD60, &lit_3932); #pragma pop /* 807AFD64-807AFD68 000038 0004+00 0/9 0/0 0/0 .rodata @3933 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3933 = 1000.0f; -COMPILER_STRIP_GATE(807AFD64, &lit_3933); +COMPILER_STRIP_GATE(0x807AFD64, &lit_3933); #pragma pop /* 807AFE7C-807AFE88 000000 000C+00 5/5 0/0 0/0 .data cNullVec__6Z2Calc */ @@ -1086,7 +1086,13 @@ asm daE_SW_HIO_c::daE_SW_HIO_c() { /* ############################################################################################## */ /* 807AFD68-807AFD6C 00003C 0004+00 1/3 0/0 0/0 .rodata @3947 */ SECTION_RODATA static f32 const lit_3947 = -1.0f; -COMPILER_STRIP_GATE(807AFD68, &lit_3947); +COMPILER_STRIP_GATE(0x807AFD68, &lit_3947); + +/* 807AFE70-807AFE70 000144 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_807AFE70 = "E_SW"; +#pragma pop /* 807A7460-807A7504 000140 00A4+00 22/22 0/0 0/0 .text bckSet__8daE_SW_cFifUcf */ #pragma push @@ -1103,7 +1109,7 @@ asm void daE_SW_c::bckSet(int param_0, f32 param_1, u8 param_2, f32 param_3) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3986 = 700.0f; -COMPILER_STRIP_GATE(807AFD6C, &lit_3986); +COMPILER_STRIP_GATE(0x807AFD6C, &lit_3986); #pragma pop /* 807A7504-807A76C4 0001E4 01C0+00 1/1 0/0 0/0 .text draw__8daE_SW_cFv */ @@ -1345,7 +1351,7 @@ asm void daE_SW_c::setModeBack() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4187 = -1000000000.0f; -COMPILER_STRIP_GATE(807AFD70, &lit_4187); +COMPILER_STRIP_GATE(0x807AFD70, &lit_4187); #pragma pop /* 807A7DAC-807A7EFC 000A8C 0150+00 1/1 0/0 0/0 .text checkFall__8daE_SW_cFv */ @@ -1373,42 +1379,42 @@ asm void daE_SW_c::checkBeforeWall() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4271 = 2.0f; -COMPILER_STRIP_GATE(807AFD74, &lit_4271); +COMPILER_STRIP_GATE(0x807AFD74, &lit_4271); #pragma pop /* 807AFD78-807AFD7C 00004C 0004+00 0/17 0/0 0/0 .rodata @4272 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4272 = 10.0f; -COMPILER_STRIP_GATE(807AFD78, &lit_4272); +COMPILER_STRIP_GATE(0x807AFD78, &lit_4272); #pragma pop /* 807AFD7C-807AFD80 000050 0004+00 0/1 0/0 0/0 .rodata @4273 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4273 = 600.0f; -COMPILER_STRIP_GATE(807AFD7C, &lit_4273); +COMPILER_STRIP_GATE(0x807AFD7C, &lit_4273); #pragma pop /* 807AFD80-807AFD84 000054 0004+00 0/2 0/0 0/0 .rodata @4274 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4274 = 60000.0f; -COMPILER_STRIP_GATE(807AFD80, &lit_4274); +COMPILER_STRIP_GATE(0x807AFD80, &lit_4274); #pragma pop /* 807AFD84-807AFD88 000058 0004+00 0/2 0/0 0/0 .rodata @4275 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4275 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(807AFD84, &lit_4275); +COMPILER_STRIP_GATE(0x807AFD84, &lit_4275); #pragma pop /* 807AFD88-807AFD8C 00005C 0004+00 0/7 0/0 0/0 .rodata @4276 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4276 = 20.0f; -COMPILER_STRIP_GATE(807AFD88, &lit_4276); +COMPILER_STRIP_GATE(0x807AFD88, &lit_4276); #pragma pop /* 807A7F88-807A8290 000C68 0308+00 1/1 0/0 0/0 .text executeWait__8daE_SW_cFv */ @@ -1424,11 +1430,11 @@ asm void daE_SW_c::executeWait() { /* ############################################################################################## */ /* 807AFD8C-807AFD90 000060 0004+00 1/6 0/0 0/0 .rodata @4293 */ SECTION_RODATA static f32 const lit_4293 = 19.0f; -COMPILER_STRIP_GATE(807AFD8C, &lit_4293); +COMPILER_STRIP_GATE(0x807AFD8C, &lit_4293); /* 807AFD90-807AFD94 000064 0004+00 1/10 0/0 0/0 .rodata @4294 */ SECTION_RODATA static f32 const lit_4294 = 30.0f; -COMPILER_STRIP_GATE(807AFD90, &lit_4294); +COMPILER_STRIP_GATE(0x807AFD90, &lit_4294); /* 807A8290-807A831C 000F70 008C+00 2/2 0/0 0/0 .text checkRunChase__8daE_SW_cFv */ #pragma push @@ -1445,70 +1451,70 @@ asm void daE_SW_c::checkRunChase() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4497 = 5.0f; -COMPILER_STRIP_GATE(807AFD94, &lit_4497); +COMPILER_STRIP_GATE(0x807AFD94, &lit_4497); #pragma pop /* 807AFD98-807AFD9C 00006C 0004+00 0/14 0/0 0/0 .rodata @4498 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4498 = 15.0f; -COMPILER_STRIP_GATE(807AFD98, &lit_4498); +COMPILER_STRIP_GATE(0x807AFD98, &lit_4498); #pragma pop /* 807AFD9C-807AFDA0 000070 0004+00 0/1 0/0 0/0 .rodata @4499 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4499 = 70.0f; -COMPILER_STRIP_GATE(807AFD9C, &lit_4499); +COMPILER_STRIP_GATE(0x807AFD9C, &lit_4499); #pragma pop /* 807AFDA0-807AFDA4 000074 0004+00 0/8 0/0 0/0 .rodata @4500 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4500 = 0.5f; -COMPILER_STRIP_GATE(807AFDA0, &lit_4500); +COMPILER_STRIP_GATE(0x807AFDA0, &lit_4500); #pragma pop /* 807AFDA4-807AFDA8 000078 0004+00 0/4 0/0 0/0 .rodata @4501 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4501 = 50.0f; -COMPILER_STRIP_GATE(807AFDA4, &lit_4501); +COMPILER_STRIP_GATE(0x807AFDA4, &lit_4501); #pragma pop /* 807AFDA8-807AFDAC 00007C 0004+00 0/2 0/0 0/0 .rodata @4502 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4502 = 150.0f; -COMPILER_STRIP_GATE(807AFDA8, &lit_4502); +COMPILER_STRIP_GATE(0x807AFDA8, &lit_4502); #pragma pop /* 807AFDAC-807AFDB0 000080 0004+00 0/7 0/0 0/0 .rodata @4503 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4503 = 200.0f; -COMPILER_STRIP_GATE(807AFDAC, &lit_4503); +COMPILER_STRIP_GATE(0x807AFDAC, &lit_4503); #pragma pop /* 807AFDB0-807AFDB4 000084 0004+00 0/1 0/0 0/0 .rodata @4504 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4504 = 3.0f / 10.0f; -COMPILER_STRIP_GATE(807AFDB0, &lit_4504); +COMPILER_STRIP_GATE(0x807AFDB0, &lit_4504); #pragma pop /* 807AFDB4-807AFDB8 000088 0004+00 0/3 0/0 0/0 .rodata @4505 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4505 = 300.0f; -COMPILER_STRIP_GATE(807AFDB4, &lit_4505); +COMPILER_STRIP_GATE(0x807AFDB4, &lit_4505); #pragma pop /* 807AFDB8-807AFDBC 00008C 0004+00 0/1 0/0 0/0 .rodata @4506 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4506 = 130.0f; -COMPILER_STRIP_GATE(807AFDB8, &lit_4506); +COMPILER_STRIP_GATE(0x807AFDB8, &lit_4506); #pragma pop /* 807A831C-807A8B98 000FFC 087C+00 1/1 0/0 0/0 .text executeChaseSlow__8daE_SW_cFv */ @@ -1526,14 +1532,14 @@ asm void daE_SW_c::executeChaseSlow() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4872 = 12288.0f; -COMPILER_STRIP_GATE(807AFDBC, &lit_4872); +COMPILER_STRIP_GATE(0x807AFDBC, &lit_4872); #pragma pop /* 807AFDC0-807AFDC4 000094 0004+00 0/2 0/0 0/0 .rodata @4873 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4873 = -200.0f; -COMPILER_STRIP_GATE(807AFDC0, &lit_4873); +COMPILER_STRIP_GATE(0x807AFDC0, &lit_4873); #pragma pop /* 807AFDC4-807AFDCC 000098 0008+00 0/1 0/0 0/0 .rodata @4874 */ @@ -1542,42 +1548,42 @@ COMPILER_STRIP_GATE(807AFDC0, &lit_4873); SECTION_RODATA static u8 const lit_4874[8] = { 0x3F, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(807AFDC4, &lit_4874); +COMPILER_STRIP_GATE(0x807AFDC4, &lit_4874); #pragma pop /* 807AFDCC-807AFDD0 0000A0 0004+00 0/1 0/0 0/0 .rodata @4875 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4875 = 350.0f; -COMPILER_STRIP_GATE(807AFDCC, &lit_4875); +COMPILER_STRIP_GATE(0x807AFDCC, &lit_4875); #pragma pop /* 807AFDD0-807AFDD4 0000A4 0004+00 0/3 0/0 0/0 .rodata @4876 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4876 = -3.0f; -COMPILER_STRIP_GATE(807AFDD0, &lit_4876); +COMPILER_STRIP_GATE(0x807AFDD0, &lit_4876); #pragma pop /* 807AFDD4-807AFDD8 0000A8 0004+00 0/1 0/0 0/0 .rodata @4877 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4877 = 250.0f; -COMPILER_STRIP_GATE(807AFDD4, &lit_4877); +COMPILER_STRIP_GATE(0x807AFDD4, &lit_4877); #pragma pop /* 807AFDD8-807AFDDC 0000AC 0004+00 0/1 0/0 0/0 .rodata @4878 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4878 = 500.0f; -COMPILER_STRIP_GATE(807AFDD8, &lit_4878); +COMPILER_STRIP_GATE(0x807AFDD8, &lit_4878); #pragma pop /* 807AFDDC-807AFDE0 0000B0 0004+00 0/7 0/0 0/0 .rodata @4879 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4879 = 3.0f; -COMPILER_STRIP_GATE(807AFDDC, &lit_4879); +COMPILER_STRIP_GATE(0x807AFDDC, &lit_4879); #pragma pop /* 807A8B98-807A9580 001878 09E8+00 1/1 0/0 0/0 .text executeChaseFast__8daE_SW_cFv */ @@ -1595,7 +1601,7 @@ asm void daE_SW_c::executeChaseFast() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4913 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(807AFDE0, &lit_4913); +COMPILER_STRIP_GATE(0x807AFDE0, &lit_4913); #pragma pop /* 807A9580-807A9768 002260 01E8+00 1/1 0/0 0/0 .text executeBomb__8daE_SW_cFv */ @@ -1613,63 +1619,63 @@ asm void daE_SW_c::executeBomb() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5057 = -4.0f; -COMPILER_STRIP_GATE(807AFDE4, &lit_5057); +COMPILER_STRIP_GATE(0x807AFDE4, &lit_5057); #pragma pop /* 807AFDE8-807AFDEC 0000BC 0004+00 0/2 0/0 0/0 .rodata @5058 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5058 = 60.0f; -COMPILER_STRIP_GATE(807AFDE8, &lit_5058); +COMPILER_STRIP_GATE(0x807AFDE8, &lit_5058); #pragma pop /* 807AFDEC-807AFDF0 0000C0 0004+00 0/2 0/0 0/0 .rodata @5059 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5059 = 25.0f; -COMPILER_STRIP_GATE(807AFDEC, &lit_5059); +COMPILER_STRIP_GATE(0x807AFDEC, &lit_5059); #pragma pop /* 807AFDF0-807AFDF4 0000C4 0004+00 0/1 0/0 0/0 .rodata @5060 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5060 = 24.0f; -COMPILER_STRIP_GATE(807AFDF0, &lit_5060); +COMPILER_STRIP_GATE(0x807AFDF0, &lit_5060); #pragma pop /* 807AFDF4-807AFDF8 0000C8 0004+00 0/1 0/0 0/0 .rodata @5061 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5061 = 23.0f; -COMPILER_STRIP_GATE(807AFDF4, &lit_5061); +COMPILER_STRIP_GATE(0x807AFDF4, &lit_5061); #pragma pop /* 807AFDF8-807AFDFC 0000CC 0004+00 0/2 0/0 0/0 .rodata @5062 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5062 = 120.0f; -COMPILER_STRIP_GATE(807AFDF8, &lit_5062); +COMPILER_STRIP_GATE(0x807AFDF8, &lit_5062); #pragma pop /* 807AFDFC-807AFE00 0000D0 0004+00 0/8 0/0 0/0 .rodata @5063 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5063 = -5.0f; -COMPILER_STRIP_GATE(807AFDFC, &lit_5063); +COMPILER_STRIP_GATE(0x807AFDFC, &lit_5063); #pragma pop /* 807AFE00-807AFE04 0000D4 0004+00 0/2 0/0 0/0 .rodata @5064 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5064 = -60.0f; -COMPILER_STRIP_GATE(807AFE00, &lit_5064); +COMPILER_STRIP_GATE(0x807AFE00, &lit_5064); #pragma pop /* 807AFE04-807AFE08 0000D8 0004+00 0/5 0/0 0/0 .rodata @5065 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5065 = -120.0f; -COMPILER_STRIP_GATE(807AFE04, &lit_5065); +COMPILER_STRIP_GATE(0x807AFE04, &lit_5065); #pragma pop /* 807A9768-807A9E58 002448 06F0+00 1/1 0/0 0/0 .text executeAttack__8daE_SW_cFv */ @@ -1687,14 +1693,14 @@ asm void daE_SW_c::executeAttack() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5104 = 40.0f; -COMPILER_STRIP_GATE(807AFE08, &lit_5104); +COMPILER_STRIP_GATE(0x807AFE08, &lit_5104); #pragma pop /* 807AFE0C-807AFE10 0000E0 0004+00 0/2 0/0 0/0 .rodata @5105 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5105 = -40.0f; -COMPILER_STRIP_GATE(807AFE0C, &lit_5105); +COMPILER_STRIP_GATE(0x807AFE0C, &lit_5105); #pragma pop /* 807A9E58-807AA050 002B38 01F8+00 2/2 0/0 0/0 .text executeHook__8daE_SW_cFv */ @@ -1712,7 +1718,7 @@ asm void daE_SW_c::executeHook() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5206 = 4096.0f; -COMPILER_STRIP_GATE(807AFE10, &lit_5206); +COMPILER_STRIP_GATE(0x807AFE10, &lit_5206); #pragma pop /* 807AFE14-807AFE1C 0000E8 0008+00 0/4 0/0 0/0 .rodata @5208 */ @@ -1721,7 +1727,7 @@ COMPILER_STRIP_GATE(807AFE10, &lit_5206); SECTION_RODATA static u8 const lit_5208[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(807AFE14, &lit_5208); +COMPILER_STRIP_GATE(0x807AFE14, &lit_5208); #pragma pop /* 807AA050-807AA44C 002D30 03FC+00 1/1 0/0 0/0 .text executeMoveOut__8daE_SW_cFv */ @@ -1749,49 +1755,49 @@ asm void daE_SW_c::executeChance() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5264 = 36.0f; -COMPILER_STRIP_GATE(807AFE1C, &lit_5264); +COMPILER_STRIP_GATE(0x807AFE1C, &lit_5264); #pragma pop /* 807AFE20-807AFE24 0000F4 0004+00 0/1 0/0 0/0 .rodata @5265 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5265 = 7.0f; -COMPILER_STRIP_GATE(807AFE20, &lit_5265); +COMPILER_STRIP_GATE(0x807AFE20, &lit_5265); #pragma pop /* 807AFE24-807AFE28 0000F8 0004+00 0/1 0/0 0/0 .rodata @5266 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5266 = 32000.0f; -COMPILER_STRIP_GATE(807AFE24, &lit_5266); +COMPILER_STRIP_GATE(0x807AFE24, &lit_5266); #pragma pop /* 807AFE28-807AFE2C 0000FC 0004+00 0/1 0/0 0/0 .rodata @5267 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5267 = 8000.0f; -COMPILER_STRIP_GATE(807AFE28, &lit_5267); +COMPILER_STRIP_GATE(0x807AFE28, &lit_5267); #pragma pop /* 807AFE2C-807AFE30 000100 0004+00 0/1 0/0 0/0 .rodata @5268 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5268 = 12.0f; -COMPILER_STRIP_GATE(807AFE2C, &lit_5268); +COMPILER_STRIP_GATE(0x807AFE2C, &lit_5268); #pragma pop /* 807AFE30-807AFE34 000104 0004+00 0/1 0/0 0/0 .rodata @5269 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5269 = 35.0f; -COMPILER_STRIP_GATE(807AFE30, &lit_5269); +COMPILER_STRIP_GATE(0x807AFE30, &lit_5269); #pragma pop /* 807AFE34-807AFE38 000108 0004+00 0/1 0/0 0/0 .rodata @5300 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5300 = 14.0f; -COMPILER_STRIP_GATE(807AFE34, &lit_5300); +COMPILER_STRIP_GATE(0x807AFE34, &lit_5300); #pragma pop /* 807AA784-807AA91C 003464 0198+00 1/1 0/0 0/0 .text executeDive__8daE_SW_cFv */ @@ -1809,21 +1815,21 @@ asm void daE_SW_c::executeDive() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5327 = 48.0f; -COMPILER_STRIP_GATE(807AFE38, &lit_5327); +COMPILER_STRIP_GATE(0x807AFE38, &lit_5327); #pragma pop /* 807AFE3C-807AFE40 000110 0004+00 0/2 0/0 0/0 .rodata @5328 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5328 = 28.0f; -COMPILER_STRIP_GATE(807AFE3C, &lit_5328); +COMPILER_STRIP_GATE(0x807AFE3C, &lit_5328); #pragma pop /* 807AFE40-807AFE44 000114 0004+00 0/2 0/0 0/0 .rodata @5329 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5329 = 8.0f; -COMPILER_STRIP_GATE(807AFE40, &lit_5329); +COMPILER_STRIP_GATE(0x807AFE40, &lit_5329); #pragma pop /* 807AA91C-807AAB7C 0035FC 0260+00 1/1 0/0 0/0 .text executeDamage__8daE_SW_cFv */ @@ -1841,7 +1847,7 @@ asm void daE_SW_c::executeDamage() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5365 = -50.0f; -COMPILER_STRIP_GATE(807AFE44, &lit_5365); +COMPILER_STRIP_GATE(0x807AFE44, &lit_5365); #pragma pop /* 807AAB7C-807AAD28 00385C 01AC+00 1/1 0/0 0/0 .text executeDie__8daE_SW_cFv */ @@ -1869,7 +1875,7 @@ static asm void s_child_sub(void* param_0, void* param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5428 = 10000.0f; -COMPILER_STRIP_GATE(807AFE48, &lit_5428); +COMPILER_STRIP_GATE(0x807AFE48, &lit_5428); #pragma pop /* 807AADCC-807AAF70 003AAC 01A4+00 1/1 0/0 0/0 .text executeMaster__8daE_SW_cFv */ @@ -1967,14 +1973,14 @@ asm void daE_SW_c::checkGroundSand() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5895 = 5000.0f; -COMPILER_STRIP_GATE(807AFE4C, &lit_5895); +COMPILER_STRIP_GATE(0x807AFE4C, &lit_5895); #pragma pop /* 807AFE50-807AFE54 000124 0004+00 0/3 0/0 0/0 .rodata @5896 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5896 = 1.5f; -COMPILER_STRIP_GATE(807AFE50, &lit_5896); +COMPILER_STRIP_GATE(0x807AFE50, &lit_5896); #pragma pop /* 807ABE50-807AC148 004B30 02F8+00 1/1 0/0 0/0 .text execute__8daE_SW_cFv */ @@ -2047,14 +2053,14 @@ static asm void useHeapInit(fopAc_ac_c* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6115 = 1000000000.0f; -COMPILER_STRIP_GATE(807AFE54, &lit_6115); +COMPILER_STRIP_GATE(0x807AFE54, &lit_6115); #pragma pop /* 807AFE58-807AFE5C 00012C 0004+00 0/2 0/0 0/0 .rodata @6116 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6116 = -10.0f; -COMPILER_STRIP_GATE(807AFE58, &lit_6116); +COMPILER_STRIP_GATE(0x807AFE58, &lit_6116); #pragma pop /* 807AFE5C-807AFE64 000130 0008+00 0/1 0/0 0/0 .rodata @6118 */ @@ -2063,7 +2069,13 @@ COMPILER_STRIP_GATE(807AFE58, &lit_6116); SECTION_RODATA static u8 const lit_6118[8] = { 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(807AFE5C, &lit_6118); +COMPILER_STRIP_GATE(0x807AFE5C, &lit_6118); +#pragma pop + +/* 807AFE70-807AFE70 000144 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_807AFE75 = "E_sw"; #pragma pop /* 807AC31C-807AC854 004FFC 0538+00 1/1 0/0 0/0 .text create__8daE_SW_cFv */ @@ -2141,7 +2153,7 @@ static asm void daE_SW_Create(daE_SW_c* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daE_SW_c::d_setAction(void (daE_SW_c::*)()) { +asm void daE_SW_c::d_setAction(void (daE_SW_c::*param_0)()) { nofralloc #include "asm/rel/d/a/e/d_a_e_sw/d_a_e_sw/d_setAction__8daE_SW_cFM8daE_SW_cFPCvPv_v.s" } @@ -2202,14 +2214,14 @@ asm void daE_SW_c::d_bm_chase() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6540 = 32768.0f; -COMPILER_STRIP_GATE(807AFE64, &lit_6540); +COMPILER_STRIP_GATE(0x807AFE64, &lit_6540); #pragma pop /* 807AFE68-807AFE6C 00013C 0004+00 0/1 0/0 0/0 .rodata @6541 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6541 = 30000.0f; -COMPILER_STRIP_GATE(807AFE68, &lit_6541); +COMPILER_STRIP_GATE(0x807AFE68, &lit_6541); #pragma pop /* 807AD4A8-807AD7C0 006188 0318+00 7/0 0/0 0/0 .text d_wait__8daE_SW_cFv */ @@ -2247,7 +2259,7 @@ asm void daE_SW_c::d_chase() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6852 = 65.0f; -COMPILER_STRIP_GATE(807AFE6C, &lit_6852); +COMPILER_STRIP_GATE(0x807AFE6C, &lit_6852); #pragma pop /* 807ADE50-807AE4B4 006B30 0664+00 3/0 0/0 0/0 .text d_attk__8daE_SW_cFv */ @@ -2382,7 +2394,7 @@ asm void __sinit_d_a_e_sw_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_807AF8B8 = (void*)__sinit_d_a_e_sw_cpp; +REGISTER_CTORS(0x807AF8B8, __sinit_d_a_e_sw_cpp); #pragma pop /* 807AF8F4-807AF8FC 0085D4 0008+00 1/0 0/0 0/0 .text @36@__dt__12dBgS_ObjAcchFv */ @@ -2589,10 +2601,4 @@ static u8 data_807B0290[4]; static u8 data_807B0294[4]; #pragma pop -/* 807AFE70-807AFE7A 000144 000A+00 4/4 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_807AFE70 = "E_SW"; -SECTION_DEAD static char const* const stringBase_807AFE75 = "E_sw"; -#pragma pop +/* 807AFE70-807AFE70 000144 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/e/d_a_e_th/d_a_e_th.cpp b/rel/d/a/e/d_a_e_th/d_a_e_th.cpp index 5765f8f9fcd..8f1dceadbdf 100644 --- a/rel/d/a/e/d_a_e_th/d_a_e_th.cpp +++ b/rel/d/a/e/d_a_e_th/d_a_e_th.cpp @@ -25,16 +25,16 @@ struct mDoMtx_stack_c { static u8 now[48]; }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; - struct J3DAnmTransform {}; +struct J3DModelData {}; + +struct Z2Creature {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -454,7 +454,7 @@ extern "C" void __register_global_object(); /* ############################################################################################## */ /* 807B449C-807B44A0 000000 0004+00 16/16 0/0 0/0 .rodata @3906 */ SECTION_RODATA static f32 const lit_3906 = 100.0f; -COMPILER_STRIP_GATE(807B449C, &lit_3906); +COMPILER_STRIP_GATE(0x807B449C, &lit_3906); /* 807B44A0-807B44A4 000004 0004+00 1/13 0/0 0/0 .rodata @3907 */ SECTION_RODATA static u8 const lit_3907[4] = { @@ -463,7 +463,7 @@ SECTION_RODATA static u8 const lit_3907[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(807B44A0, &lit_3907); +COMPILER_STRIP_GATE(0x807B44A0, &lit_3907); /* 807B44A4-807B44AC 000008 0004+04 1/11 0/0 0/0 .rodata @3908 */ SECTION_RODATA static f32 const lit_3908[1 + 1 /* padding */] = { @@ -471,7 +471,7 @@ SECTION_RODATA static f32 const lit_3908[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(807B44A4, &lit_3908); +COMPILER_STRIP_GATE(0x807B44A4, &lit_3908); /* 807B44AC-807B44B4 000010 0008+00 0/1 0/0 0/0 .rodata @3909 */ #pragma push @@ -479,7 +479,7 @@ COMPILER_STRIP_GATE(807B44A4, &lit_3908); SECTION_RODATA static u8 const lit_3909[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(807B44AC, &lit_3909); +COMPILER_STRIP_GATE(0x807B44AC, &lit_3909); #pragma pop /* 807B44B4-807B44BC 000018 0008+00 0/1 0/0 0/0 .rodata @3910 */ @@ -488,7 +488,7 @@ COMPILER_STRIP_GATE(807B44AC, &lit_3909); SECTION_RODATA static u8 const lit_3910[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(807B44B4, &lit_3910); +COMPILER_STRIP_GATE(0x807B44B4, &lit_3910); #pragma pop /* 807B44BC-807B44C4 000020 0008+00 0/1 0/0 0/0 .rodata @3911 */ @@ -497,28 +497,28 @@ COMPILER_STRIP_GATE(807B44B4, &lit_3910); SECTION_RODATA static u8 const lit_3911[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(807B44BC, &lit_3911); +COMPILER_STRIP_GATE(0x807B44BC, &lit_3911); #pragma pop /* 807B44C4-807B44C8 000028 0004+00 0/1 0/0 0/0 .rodata @3912 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3912 = 1.0f / 100.0f; -COMPILER_STRIP_GATE(807B44C4, &lit_3912); +COMPILER_STRIP_GATE(0x807B44C4, &lit_3912); #pragma pop /* 807B44C8-807B44CC 00002C 0004+00 0/1 0/0 0/0 .rodata @3927 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3927 = 1300.0f; -COMPILER_STRIP_GATE(807B44C8, &lit_3927); +COMPILER_STRIP_GATE(0x807B44C8, &lit_3927); #pragma pop /* 807B44CC-807B44D0 000030 0004+00 0/1 0/0 0/0 .rodata @3928 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3928 = 700.0f; -COMPILER_STRIP_GATE(807B44CC, &lit_3928); +COMPILER_STRIP_GATE(0x807B44CC, &lit_3928); #pragma pop /* 807B464C-807B4658 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ @@ -745,7 +745,7 @@ asm daE_TH_HIO_c::daE_TH_HIO_c() { /* ############################################################################################## */ /* 807B44D0-807B44D4 000034 0004+00 1/2 0/0 0/0 .rodata @3942 */ SECTION_RODATA static f32 const lit_3942 = 560.0f; -COMPILER_STRIP_GATE(807B44D0, &lit_3942); +COMPILER_STRIP_GATE(0x807B44D0, &lit_3942); /* 807B03C4-807B0434 000124 0070+00 1/1 0/0 0/0 .text s_md_sub1__FPvPv */ #pragma push @@ -760,7 +760,7 @@ static asm void s_md_sub1(void* param_0, void* param_1) { /* ############################################################################################## */ /* 807B44D4-807B44D8 000038 0004+00 1/1 0/0 0/0 .rodata @3956 */ SECTION_RODATA static f32 const lit_3956 = -950.0f; -COMPILER_STRIP_GATE(807B44D4, &lit_3956); +COMPILER_STRIP_GATE(0x807B44D4, &lit_3956); /* 807B0434-807B04A4 000194 0070+00 1/1 0/0 0/0 .text s_md_sub2__FPvPv */ #pragma push @@ -775,7 +775,13 @@ static asm void s_md_sub2(void* param_0, void* param_1) { /* ############################################################################################## */ /* 807B44D8-807B44DC 00003C 0004+00 1/1 0/0 0/0 .rodata @3970 */ SECTION_RODATA static f32 const lit_3970 = -1.0f; -COMPILER_STRIP_GATE(807B44D8, &lit_3970); +COMPILER_STRIP_GATE(0x807B44D8, &lit_3970); + +/* 807B4644-807B4644 0001A8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_807B4644 = "E_th"; +#pragma pop /* 807B04A4-807B0550 000204 00AC+00 6/6 0/0 0/0 .text anm_init__FP10e_th_classifUcf */ #pragma push @@ -802,56 +808,56 @@ static asm void nodeCallBack(J3DJoint* param_0, int param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4055 = 13.0f; -COMPILER_STRIP_GATE(807B44DC, &lit_4055); +COMPILER_STRIP_GATE(0x807B44DC, &lit_4055); #pragma pop /* 807B44E0-807B44E4 000044 0004+00 0/2 0/0 0/0 .rodata @4056 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4056 = -10.0f; -COMPILER_STRIP_GATE(807B44E0, &lit_4056); +COMPILER_STRIP_GATE(0x807B44E0, &lit_4056); #pragma pop /* 807B44E4-807B44E8 000048 0004+00 0/1 0/0 0/0 .rodata @4057 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4057 = 0.75f; -COMPILER_STRIP_GATE(807B44E4, &lit_4057); +COMPILER_STRIP_GATE(0x807B44E4, &lit_4057); #pragma pop /* 807B44E8-807B44EC 00004C 0004+00 0/1 0/0 0/0 .rodata @4058 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4058 = 0x3A83126F; -COMPILER_STRIP_GATE(807B44E8, &lit_4058); +COMPILER_STRIP_GATE(0x807B44E8, &lit_4058); #pragma pop /* 807B44EC-807B44F0 000050 0004+00 0/1 0/0 0/0 .rodata @4059 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4059 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(807B44EC, &lit_4059); +COMPILER_STRIP_GATE(0x807B44EC, &lit_4059); #pragma pop /* 807B44F0-807B44F4 000054 0004+00 0/1 0/0 0/0 .rodata @4060 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4060 = 2.0f; -COMPILER_STRIP_GATE(807B44F0, &lit_4060); +COMPILER_STRIP_GATE(0x807B44F0, &lit_4060); #pragma pop /* 807B44F4-807B44F8 000058 0004+00 0/4 0/0 0/0 .rodata @4061 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4061 = 10.0f; -COMPILER_STRIP_GATE(807B44F4, &lit_4061); +COMPILER_STRIP_GATE(0x807B44F4, &lit_4061); #pragma pop /* 807B44F8-807B44FC 00005C 0004+00 0/2 0/0 0/0 .rodata @4062 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4062 = 15.0f; -COMPILER_STRIP_GATE(807B44F8, &lit_4062); +COMPILER_STRIP_GATE(0x807B44F8, &lit_4062); #pragma pop /* 807B44FC-807B4504 000060 0008+00 0/1 0/0 0/0 .rodata @4064 */ @@ -860,7 +866,7 @@ COMPILER_STRIP_GATE(807B44F8, &lit_4062); SECTION_RODATA static u8 const lit_4064[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(807B44FC, &lit_4064); +COMPILER_STRIP_GATE(0x807B44FC, &lit_4064); #pragma pop /* 807B0630-807B09A4 000390 0374+00 1/1 0/0 0/0 .text ke_control__FP10e_th_classP7th_ke_si */ @@ -886,7 +892,7 @@ static asm void ke_pos_set(e_th_class* param_0, th_ke_s* param_1, int param_2) { /* ############################################################################################## */ /* 807B4504-807B4508 000068 0004+00 1/1 0/0 0/0 .rodata @4087 */ SECTION_RODATA static f32 const lit_4087 = 3.5f; -COMPILER_STRIP_GATE(807B4504, &lit_4087); +COMPILER_STRIP_GATE(0x807B4504, &lit_4087); /* 807B09E8-807B0A6C 000748 0084+00 1/1 0/0 0/0 .text ke_disp__FP10e_th_class */ #pragma push @@ -903,14 +909,14 @@ static asm void ke_disp(e_th_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4127 = 27.0f; -COMPILER_STRIP_GATE(807B4508, &lit_4127); +COMPILER_STRIP_GATE(0x807B4508, &lit_4127); #pragma pop /* 807B450C-807B4510 000070 0004+00 0/3 0/0 0/0 .rodata @4128 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4128 = 35.0f; -COMPILER_STRIP_GATE(807B450C, &lit_4128); +COMPILER_STRIP_GATE(0x807B450C, &lit_4128); #pragma pop /* 807B0A6C-807B0BD0 0007CC 0164+00 1/1 0/0 0/0 .text ke_move__FP10e_th_class */ @@ -928,14 +934,14 @@ static asm void ke_move(e_th_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4164 = 50.0f; -COMPILER_STRIP_GATE(807B4510, &lit_4164); +COMPILER_STRIP_GATE(0x807B4510, &lit_4164); #pragma pop /* 807B4514-807B4518 000078 0004+00 0/1 0/0 0/0 .rodata @4165 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4165 = 1200.0f; -COMPILER_STRIP_GATE(807B4514, &lit_4165); +COMPILER_STRIP_GATE(0x807B4514, &lit_4165); #pragma pop /* 807B0BD0-807B0D7C 000930 01AC+00 1/0 0/0 0/0 .text daE_TH_Draw__FP10e_th_class */ @@ -953,14 +959,14 @@ static asm void daE_TH_Draw(e_th_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4263 = 60.0f; -COMPILER_STRIP_GATE(807B4518, &lit_4263); +COMPILER_STRIP_GATE(0x807B4518, &lit_4263); #pragma pop /* 807B451C-807B4520 000080 0004+00 0/3 0/0 0/0 .rodata @4264 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4264 = 5.0f; -COMPILER_STRIP_GATE(807B451C, &lit_4264); +COMPILER_STRIP_GATE(0x807B451C, &lit_4264); #pragma pop /* 807B0D7C-807B0EFC 000ADC 0180+00 1/1 0/0 0/0 .text e_th_wait__FP10e_th_class */ @@ -988,7 +994,7 @@ static asm void e_th_spin(e_th_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4351 = 0.5f; -COMPILER_STRIP_GATE(807B4520, &lit_4351); +COMPILER_STRIP_GATE(0x807B4520, &lit_4351); #pragma pop /* 807B0F20-807B12B0 000C80 0390+00 2/1 0/0 0/0 .text e_th_spin_B__FP10e_th_class */ @@ -1006,21 +1012,21 @@ static asm void e_th_spin_B(e_th_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4352 = 3.0f; -COMPILER_STRIP_GATE(807B4524, &lit_4352); +COMPILER_STRIP_GATE(0x807B4524, &lit_4352); #pragma pop /* 807B4528-807B452C 00008C 0004+00 0/0 0/0 0/0 .rodata @4353 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4353 = 200.0f; -COMPILER_STRIP_GATE(807B4528, &lit_4353); +COMPILER_STRIP_GATE(0x807B4528, &lit_4353); #pragma pop /* 807B452C-807B4530 000090 0004+00 0/1 0/0 0/0 .rodata @4354 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4354 = 4.0f; -COMPILER_STRIP_GATE(807B452C, &lit_4354); +COMPILER_STRIP_GATE(0x807B452C, &lit_4354); #pragma pop /* 807B12B0-807B141C 001010 016C+00 1/1 0/0 0/0 .text e_th_shot__FP10e_th_class */ @@ -1038,21 +1044,21 @@ static asm void e_th_shot(e_th_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4355 = 1.5f; -COMPILER_STRIP_GATE(807B4530, &lit_4355); +COMPILER_STRIP_GATE(0x807B4530, &lit_4355); #pragma pop /* 807B4534-807B4538 000098 0004+00 0/0 0/0 0/0 .rodata @4356 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4356 = 1.0f / 40.0f; -COMPILER_STRIP_GATE(807B4534, &lit_4356); +COMPILER_STRIP_GATE(0x807B4534, &lit_4356); #pragma pop /* 807B4538-807B453C 00009C 0004+00 0/2 0/0 0/0 .rodata @4462 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4462 = 300.0f; -COMPILER_STRIP_GATE(807B4538, &lit_4462); +COMPILER_STRIP_GATE(0x807B4538, &lit_4462); #pragma pop /* 807B141C-807B1670 00117C 0254+00 1/1 0/0 0/0 .text e_th_return__FP10e_th_class */ @@ -1078,7 +1084,7 @@ static asm void e_th_damage(e_th_class* param_0) { /* ############################################################################################## */ /* 807B453C-807B4540 0000A0 0004+00 1/1 0/0 0/0 .rodata @4513 */ SECTION_RODATA static f32 const lit_4513 = -1200.0f; -COMPILER_STRIP_GATE(807B453C, &lit_4513); +COMPILER_STRIP_GATE(0x807B453C, &lit_4513); /* 807B176C-807B18C0 0014CC 0154+00 1/1 0/0 0/0 .text e_th_start__FP10e_th_class */ #pragma push @@ -1095,21 +1101,21 @@ static asm void e_th_start(e_th_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4540 = 10000.0f; -COMPILER_STRIP_GATE(807B4540, &lit_4540); +COMPILER_STRIP_GATE(0x807B4540, &lit_4540); #pragma pop /* 807B4544-807B4548 0000A8 0004+00 0/1 0/0 0/0 .rodata @4541 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4541 = -30.0f; -COMPILER_STRIP_GATE(807B4544, &lit_4541); +COMPILER_STRIP_GATE(0x807B4544, &lit_4541); #pragma pop /* 807B4548-807B454C 0000AC 0004+00 0/1 0/0 0/0 .rodata @4542 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4542 = 2.0f / 5.0f; -COMPILER_STRIP_GATE(807B4548, &lit_4542); +COMPILER_STRIP_GATE(0x807B4548, &lit_4542); #pragma pop /* 807B18C0-807B19AC 001620 00EC+00 1/1 0/0 0/0 .text e_th_end__FP10e_th_class */ @@ -1157,119 +1163,119 @@ static asm void cam_3d_morf(e_th_class* param_0, f32 param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4678 = -150.0f; -COMPILER_STRIP_GATE(807B454C, &lit_4678); +COMPILER_STRIP_GATE(0x807B454C, &lit_4678); #pragma pop /* 807B4550-807B4554 0000B4 0004+00 0/1 0/0 0/0 .rodata @4679 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4679 = -50.0f; -COMPILER_STRIP_GATE(807B4550, &lit_4679); +COMPILER_STRIP_GATE(0x807B4550, &lit_4679); #pragma pop /* 807B4554-807B4558 0000B8 0004+00 0/0 0/0 0/0 .rodata @4680 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4680 = 9.0f / 5.0f; -COMPILER_STRIP_GATE(807B4554, &lit_4680); +COMPILER_STRIP_GATE(0x807B4554, &lit_4680); #pragma pop /* 807B4558-807B455C 0000BC 0004+00 0/1 0/0 0/0 .rodata @4681 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4681 = 500.0f; -COMPILER_STRIP_GATE(807B4558, &lit_4681); +COMPILER_STRIP_GATE(0x807B4558, &lit_4681); #pragma pop /* 807B455C-807B4560 0000C0 0004+00 0/1 0/0 0/0 .rodata @5086 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5086 = 55.0f; -COMPILER_STRIP_GATE(807B455C, &lit_5086); +COMPILER_STRIP_GATE(0x807B455C, &lit_5086); #pragma pop /* 807B4560-807B4564 0000C4 0004+00 0/1 0/0 0/0 .rodata @5087 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5087 = 19.0f / 10.0f; -COMPILER_STRIP_GATE(807B4560, &lit_5087); +COMPILER_STRIP_GATE(0x807B4560, &lit_5087); #pragma pop /* 807B4564-807B4568 0000C8 0004+00 0/1 0/0 0/0 .rodata @5088 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5088 = -1127.0f; -COMPILER_STRIP_GATE(807B4564, &lit_5088); +COMPILER_STRIP_GATE(0x807B4564, &lit_5088); #pragma pop /* 807B4568-807B456C 0000CC 0004+00 0/1 0/0 0/0 .rodata @5089 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5089 = 140.0f; -COMPILER_STRIP_GATE(807B4568, &lit_5089); +COMPILER_STRIP_GATE(0x807B4568, &lit_5089); #pragma pop /* 807B456C-807B4570 0000D0 0004+00 0/1 0/0 0/0 .rodata @5090 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5090 = -1262.0f; -COMPILER_STRIP_GATE(807B456C, &lit_5090); +COMPILER_STRIP_GATE(0x807B456C, &lit_5090); #pragma pop /* 807B4570-807B4574 0000D4 0004+00 0/1 0/0 0/0 .rodata @5091 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5091 = 130.0f; -COMPILER_STRIP_GATE(807B4570, &lit_5091); +COMPILER_STRIP_GATE(0x807B4570, &lit_5091); #pragma pop /* 807B4574-807B4578 0000D8 0004+00 0/1 0/0 0/0 .rodata @5092 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5092 = 98.0f; -COMPILER_STRIP_GATE(807B4574, &lit_5092); +COMPILER_STRIP_GATE(0x807B4574, &lit_5092); #pragma pop /* 807B4578-807B457C 0000DC 0004+00 0/1 0/0 0/0 .rodata @5093 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5093 = -963.0f; -COMPILER_STRIP_GATE(807B4578, &lit_5093); +COMPILER_STRIP_GATE(0x807B4578, &lit_5093); #pragma pop /* 807B457C-807B4580 0000E0 0004+00 0/1 0/0 0/0 .rodata @5094 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5094 = 30.0f; -COMPILER_STRIP_GATE(807B457C, &lit_5094); +COMPILER_STRIP_GATE(0x807B457C, &lit_5094); #pragma pop /* 807B4580-807B4584 0000E4 0004+00 0/1 0/0 0/0 .rodata @5095 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5095 = 180.0f; -COMPILER_STRIP_GATE(807B4580, &lit_5095); +COMPILER_STRIP_GATE(0x807B4580, &lit_5095); #pragma pop /* 807B4584-807B4588 0000E8 0004+00 0/1 0/0 0/0 .rodata @5096 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5096 = -1043.0f; -COMPILER_STRIP_GATE(807B4584, &lit_5096); +COMPILER_STRIP_GATE(0x807B4584, &lit_5096); #pragma pop /* 807B4588-807B458C 0000EC 0004+00 0/1 0/0 0/0 .rodata @5097 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5097 = 84.0f; -COMPILER_STRIP_GATE(807B4588, &lit_5097); +COMPILER_STRIP_GATE(0x807B4588, &lit_5097); #pragma pop /* 807B458C-807B4590 0000F0 0004+00 0/1 0/0 0/0 .rodata @5098 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5098 = -1344.0f; -COMPILER_STRIP_GATE(807B458C, &lit_5098); +COMPILER_STRIP_GATE(0x807B458C, &lit_5098); #pragma pop /* 807B1F98-807B2DEC 001CF8 0E54+00 2/1 0/0 0/0 .text demo_camera__FP10e_th_class */ @@ -1287,259 +1293,259 @@ static asm void demo_camera(e_th_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5099 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(807B4590, &lit_5099); +COMPILER_STRIP_GATE(0x807B4590, &lit_5099); #pragma pop /* 807B4594-807B4598 0000F8 0004+00 0/0 0/0 0/0 .rodata @5100 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5100 = 1.0f / 20.0f; -COMPILER_STRIP_GATE(807B4594, &lit_5100); +COMPILER_STRIP_GATE(0x807B4594, &lit_5100); #pragma pop /* 807B4598-807B459C 0000FC 0004+00 0/0 0/0 0/0 .rodata @5101 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5101 = -172.0f; -COMPILER_STRIP_GATE(807B4598, &lit_5101); +COMPILER_STRIP_GATE(0x807B4598, &lit_5101); #pragma pop /* 807B459C-807B45A0 000100 0004+00 0/0 0/0 0/0 .rodata @5102 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_5102 = 0x42C76666; -COMPILER_STRIP_GATE(807B459C, &lit_5102); +COMPILER_STRIP_GATE(0x807B459C, &lit_5102); #pragma pop /* 807B45A0-807B45A4 000104 0004+00 0/0 0/0 0/0 .rodata @5103 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5103 = -1016.0f; -COMPILER_STRIP_GATE(807B45A0, &lit_5103); +COMPILER_STRIP_GATE(0x807B45A0, &lit_5103); #pragma pop /* 807B45A4-807B45A8 000108 0004+00 0/0 0/0 0/0 .rodata @5104 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5104 = -210.0f; -COMPILER_STRIP_GATE(807B45A4, &lit_5104); +COMPILER_STRIP_GATE(0x807B45A4, &lit_5104); #pragma pop /* 807B45A8-807B45AC 00010C 0004+00 0/0 0/0 0/0 .rodata @5105 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5105 = -1330.0f; -COMPILER_STRIP_GATE(807B45A8, &lit_5105); +COMPILER_STRIP_GATE(0x807B45A8, &lit_5105); #pragma pop /* 807B45AC-807B45B0 000110 0004+00 0/1 0/0 0/0 .rodata @5106 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5106 = -300.0f; -COMPILER_STRIP_GATE(807B45AC, &lit_5106); +COMPILER_STRIP_GATE(0x807B45AC, &lit_5106); #pragma pop /* 807B45B0-807B45B4 000114 0004+00 0/0 0/0 0/0 .rodata @5107 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5107 = -1104.0f; -COMPILER_STRIP_GATE(807B45B0, &lit_5107); +COMPILER_STRIP_GATE(0x807B45B0, &lit_5107); #pragma pop /* 807B45B4-807B45B8 000118 0004+00 0/0 0/0 0/0 .rodata @5108 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5108 = -56.0f; -COMPILER_STRIP_GATE(807B45B4, &lit_5108); +COMPILER_STRIP_GATE(0x807B45B4, &lit_5108); #pragma pop /* 807B45B8-807B45BC 00011C 0004+00 0/0 0/0 0/0 .rodata @5109 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_5109 = 0x4360B333; -COMPILER_STRIP_GATE(807B45B8, &lit_5109); +COMPILER_STRIP_GATE(0x807B45B8, &lit_5109); #pragma pop /* 807B45BC-807B45C0 000120 0004+00 0/0 0/0 0/0 .rodata @5110 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5110 = 598.0f; -COMPILER_STRIP_GATE(807B45BC, &lit_5110); +COMPILER_STRIP_GATE(0x807B45BC, &lit_5110); #pragma pop /* 807B45C0-807B45C4 000124 0004+00 0/0 0/0 0/0 .rodata @5111 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5111 = -54.5f; -COMPILER_STRIP_GATE(807B45C0, &lit_5111); +COMPILER_STRIP_GATE(0x807B45C0, &lit_5111); #pragma pop /* 807B45C4-807B45C8 000128 0004+00 0/0 0/0 0/0 .rodata @5112 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5112 = 177.0f; -COMPILER_STRIP_GATE(807B45C4, &lit_5112); +COMPILER_STRIP_GATE(0x807B45C4, &lit_5112); #pragma pop /* 807B45C8-807B45CC 00012C 0004+00 0/0 0/0 0/0 .rodata @5113 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5113 = 285.0f; -COMPILER_STRIP_GATE(807B45C8, &lit_5113); +COMPILER_STRIP_GATE(0x807B45C8, &lit_5113); #pragma pop /* 807B45CC-807B45D0 000130 0004+00 0/0 0/0 0/0 .rodata @5114 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_5114 = 0x3B03126F; -COMPILER_STRIP_GATE(807B45CC, &lit_5114); +COMPILER_STRIP_GATE(0x807B45CC, &lit_5114); #pragma pop /* 807B45D0-807B45D4 000134 0004+00 0/0 0/0 0/0 .rodata @5115 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5115 = -184.0f; -COMPILER_STRIP_GATE(807B45D0, &lit_5115); +COMPILER_STRIP_GATE(0x807B45D0, &lit_5115); #pragma pop /* 807B45D4-807B45D8 000138 0004+00 0/0 0/0 0/0 .rodata @5116 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_5116 = 0x42B56666; -COMPILER_STRIP_GATE(807B45D4, &lit_5116); +COMPILER_STRIP_GATE(0x807B45D4, &lit_5116); #pragma pop /* 807B45D8-807B45DC 00013C 0004+00 0/0 0/0 0/0 .rodata @5117 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5117 = -1028.0f; -COMPILER_STRIP_GATE(807B45D8, &lit_5117); +COMPILER_STRIP_GATE(0x807B45D8, &lit_5117); #pragma pop /* 807B45DC-807B45E0 000140 0004+00 0/0 0/0 0/0 .rodata @5118 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5118 = -256.5f; -COMPILER_STRIP_GATE(807B45DC, &lit_5118); +COMPILER_STRIP_GATE(0x807B45DC, &lit_5118); #pragma pop /* 807B45E0-807B45E4 000144 0004+00 0/0 0/0 0/0 .rodata @5119 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5119 = 34.0f; -COMPILER_STRIP_GATE(807B45E0, &lit_5119); +COMPILER_STRIP_GATE(0x807B45E0, &lit_5119); #pragma pop /* 807B45E4-807B45E8 000148 0004+00 0/0 0/0 0/0 .rodata @5120 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5120 = -1331.0f; -COMPILER_STRIP_GATE(807B45E4, &lit_5120); +COMPILER_STRIP_GATE(0x807B45E4, &lit_5120); #pragma pop /* 807B45E8-807B45EC 00014C 0004+00 0/0 0/0 0/0 .rodata @5121 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_5121 = 0x399D4952; -COMPILER_STRIP_GATE(807B45E8, &lit_5121); +COMPILER_STRIP_GATE(0x807B45E8, &lit_5121); #pragma pop /* 807B45EC-807B45F0 000150 0004+00 0/1 0/0 0/0 .rodata @5122 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5122 = 400.0f; -COMPILER_STRIP_GATE(807B45EC, &lit_5122); +COMPILER_STRIP_GATE(0x807B45EC, &lit_5122); #pragma pop /* 807B45F0-807B45F4 000154 0004+00 0/0 0/0 0/0 .rodata @5123 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5123 = 80.0f; -COMPILER_STRIP_GATE(807B45F0, &lit_5123); +COMPILER_STRIP_GATE(0x807B45F0, &lit_5123); #pragma pop /* 807B45F4-807B45F8 000158 0004+00 0/0 0/0 0/0 .rodata @5124 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5124 = 150.0f; -COMPILER_STRIP_GATE(807B45F4, &lit_5124); +COMPILER_STRIP_GATE(0x807B45F4, &lit_5124); #pragma pop /* 807B45F8-807B45FC 00015C 0004+00 0/1 0/0 0/0 .rodata @5125 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5125 = 20.0f; -COMPILER_STRIP_GATE(807B45F8, &lit_5125); +COMPILER_STRIP_GATE(0x807B45F8, &lit_5125); #pragma pop /* 807B45FC-807B4600 000160 0004+00 0/0 0/0 0/0 .rodata @5126 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5126 = 2.5f; -COMPILER_STRIP_GATE(807B45FC, &lit_5126); +COMPILER_STRIP_GATE(0x807B45FC, &lit_5126); #pragma pop /* 807B4600-807B4604 000164 0004+00 0/0 0/0 0/0 .rodata @5127 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5127 = 170.0f; -COMPILER_STRIP_GATE(807B4600, &lit_5127); +COMPILER_STRIP_GATE(0x807B4600, &lit_5127); #pragma pop /* 807B4604-807B4608 000168 0004+00 0/0 0/0 0/0 .rodata @5128 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5128 = -80.0f; -COMPILER_STRIP_GATE(807B4604, &lit_5128); +COMPILER_STRIP_GATE(0x807B4604, &lit_5128); #pragma pop /* 807B4608-807B460C 00016C 0004+00 0/0 0/0 0/0 .rodata @5129 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5129 = -200.0f; -COMPILER_STRIP_GATE(807B4608, &lit_5129); +COMPILER_STRIP_GATE(0x807B4608, &lit_5129); #pragma pop /* 807B460C-807B4610 000170 0004+00 0/0 0/0 0/0 .rodata @5130 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5130 = 70.0f; -COMPILER_STRIP_GATE(807B460C, &lit_5130); +COMPILER_STRIP_GATE(0x807B460C, &lit_5130); #pragma pop /* 807B4610-807B4614 000174 0004+00 0/0 0/0 0/0 .rodata @5131 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5131 = 25.0f; -COMPILER_STRIP_GATE(807B4610, &lit_5131); +COMPILER_STRIP_GATE(0x807B4610, &lit_5131); #pragma pop /* 807B4614-807B4618 000178 0004+00 0/0 0/0 0/0 .rodata @5132 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5132 = -55.0f; -COMPILER_STRIP_GATE(807B4614, &lit_5132); +COMPILER_STRIP_GATE(0x807B4614, &lit_5132); #pragma pop /* 807B4618-807B461C 00017C 0004+00 0/1 0/0 0/0 .rodata @5191 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5191 = 45.0f; -COMPILER_STRIP_GATE(807B4618, &lit_5191); +COMPILER_STRIP_GATE(0x807B4618, &lit_5191); #pragma pop /* 807B461C-807B4620 000180 0004+00 0/1 0/0 0/0 .rodata @5192 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5192 = 7.0f; -COMPILER_STRIP_GATE(807B461C, &lit_5192); +COMPILER_STRIP_GATE(0x807B461C, &lit_5192); #pragma pop /* 807B4620-807B4624 000184 0004+00 0/1 0/0 0/0 .rodata @5193 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5193 = 18.0f; -COMPILER_STRIP_GATE(807B4620, &lit_5193); +COMPILER_STRIP_GATE(0x807B4620, &lit_5193); #pragma pop /* 807B2DEC-807B300C 002B4C 0220+00 1/1 0/0 0/0 .text anm_se_set__FP10e_th_class */ @@ -1557,42 +1563,42 @@ static asm void anm_se_set(e_th_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5312 = 75.0f; -COMPILER_STRIP_GATE(807B4624, &lit_5312); +COMPILER_STRIP_GATE(0x807B4624, &lit_5312); #pragma pop /* 807B4628-807B462C 00018C 0004+00 0/1 0/0 0/0 .rodata @5313 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5313 = -50000.0f; -COMPILER_STRIP_GATE(807B4628, &lit_5313); +COMPILER_STRIP_GATE(0x807B4628, &lit_5313); #pragma pop /* 807B462C-807B4630 000190 0004+00 0/1 0/0 0/0 .rodata @5314 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5314 = 20000.0f; -COMPILER_STRIP_GATE(807B462C, &lit_5314); +COMPILER_STRIP_GATE(0x807B462C, &lit_5314); #pragma pop /* 807B4630-807B4634 000194 0004+00 0/1 0/0 0/0 .rodata @5315 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5315 = 18000.0f; -COMPILER_STRIP_GATE(807B4630, &lit_5315); +COMPILER_STRIP_GATE(0x807B4630, &lit_5315); #pragma pop /* 807B4634-807B4638 000198 0004+00 0/1 0/0 0/0 .rodata @5316 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5316 = 40.0f; -COMPILER_STRIP_GATE(807B4634, &lit_5316); +COMPILER_STRIP_GATE(0x807B4634, &lit_5316); #pragma pop /* 807B4638-807B463C 00019C 0004+00 0/1 0/0 0/0 .rodata @5317 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5317 = -20.0f; -COMPILER_STRIP_GATE(807B4638, &lit_5317); +COMPILER_STRIP_GATE(0x807B4638, &lit_5317); #pragma pop /* 807B4870-807B4874 000008 0004+00 2/2 0/0 0/0 .bss None */ @@ -1644,14 +1650,14 @@ static asm void useHeapInit(fopAc_ac_c* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5526 = -500.0f; -COMPILER_STRIP_GATE(807B463C, &lit_5526); +COMPILER_STRIP_GATE(0x807B463C, &lit_5526); #pragma pop /* 807B4640-807B4644 0001A4 0004+00 0/1 0/0 0/0 .rodata @5527 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5527 = 65535.0f; -COMPILER_STRIP_GATE(807B4640, &lit_5527); +COMPILER_STRIP_GATE(0x807B4640, &lit_5527); #pragma pop /* 807B36D0-807B3B58 003430 0488+00 1/0 0/0 0/0 .text daE_TH_Create__FP10fopAc_ac_c */ @@ -1791,7 +1797,7 @@ asm void __sinit_d_a_e_th_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_807B3FEC = (void*)__sinit_d_a_e_th_cpp; +REGISTER_CTORS(0x807B3FEC, __sinit_d_a_e_th_cpp); #pragma pop /* 807B4028-807B4030 003D88 0008+00 1/0 0/0 0/0 .text @36@__dt__12dBgS_ObjAcchFv */ @@ -1836,9 +1842,4 @@ asm cXyz::~cXyz() { } #pragma pop -/* 807B4644-807B4649 0001A8 0005+00 4/4 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_807B4644 = "E_th"; -#pragma pop +/* 807B4644-807B4644 0001A8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/e/d_a_e_th_ball/d_a_e_th_ball.cpp b/rel/d/a/e/d_a_e_th_ball/d_a_e_th_ball.cpp index a3527a4248d..d263ca1f4b3 100644 --- a/rel/d/a/e/d_a_e_th_ball/d_a_e_th_ball.cpp +++ b/rel/d/a/e/d_a_e_th_ball/d_a_e_th_ball.cpp @@ -73,10 +73,6 @@ struct dRes_control_c { /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); }; -struct dEvt_control_c { - /* 800436EC */ void setPtI_Id(unsigned int); -}; - struct dDlst_shadowControl_c { static u8 mSimpleTexObj[32]; }; @@ -127,13 +123,13 @@ struct dBgS_AcchCir { /* 80075F58 */ void SetWall(f32, f32); }; -struct dBgS {}; - struct csXyz { /* 807B7E5C */ ~csXyz(); /* 807B7E98 */ csXyz(); }; +struct dBgS {}; + struct dBgS_Acch { /* 80075F94 */ ~dBgS_Acch(); /* 800760A0 */ dBgS_Acch(); @@ -340,7 +336,7 @@ extern "C" extern u32 __float_nan; /* ############################################################################################## */ /* 807B7EB8-807B7EBC 000000 0004+00 16/16 0/0 0/0 .rodata @3746 */ SECTION_RODATA static f32 const lit_3746 = 1.0f; -COMPILER_STRIP_GATE(807B7EB8, &lit_3746); +COMPILER_STRIP_GATE(0x807B7EB8, &lit_3746); /* 807B7EBC-807B7EC0 000004 0004+00 2/14 0/0 0/0 .rodata @3747 */ SECTION_RODATA static u8 const lit_3747[4] = { @@ -349,13 +345,13 @@ SECTION_RODATA static u8 const lit_3747[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(807B7EBC, &lit_3747); +COMPILER_STRIP_GATE(0x807B7EBC, &lit_3747); /* 807B7EC0-807B7EC4 000008 0004+00 0/1 0/0 0/0 .rodata @3748 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3748 = 12.0f; -COMPILER_STRIP_GATE(807B7EC0, &lit_3748); +COMPILER_STRIP_GATE(0x807B7EC0, &lit_3748); #pragma pop /* 807B80E0-807B80E4 000000 0004+00 12/12 0/0 0/0 .bss master */ @@ -374,7 +370,7 @@ static asm void chain_draw(e_th_ball_class* param_0) { /* ############################################################################################## */ /* 807B7EC4-807B7EC8 00000C 0004+00 2/2 0/0 0/0 .rodata @3759 */ SECTION_RODATA static f32 const lit_3759 = 55.0f; -COMPILER_STRIP_GATE(807B7EC4, &lit_3759); +COMPILER_STRIP_GATE(0x807B7EC4, &lit_3759); /* 807B4C40-807B4CEC 0003A0 00AC+00 1/0 0/0 0/0 .text daE_TH_BALL_Draw__FP15e_th_ball_class */ #pragma push @@ -391,32 +387,32 @@ static asm void daE_TH_BALL_Draw(e_th_ball_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3847 = 20.0f; -COMPILER_STRIP_GATE(807B7EC8, &lit_3847); +COMPILER_STRIP_GATE(0x807B7EC8, &lit_3847); #pragma pop /* 807B7ECC-807B7ED0 000014 0004+00 0/3 0/0 0/0 .rodata @3848 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3848 = 1000.0f; -COMPILER_STRIP_GATE(807B7ECC, &lit_3848); +COMPILER_STRIP_GATE(0x807B7ECC, &lit_3848); #pragma pop /* 807B7ED0-807B7ED4 000018 0004+00 1/5 0/0 0/0 .rodata @3849 */ SECTION_RODATA static f32 const lit_3849 = 25.0f; -COMPILER_STRIP_GATE(807B7ED0, &lit_3849); +COMPILER_STRIP_GATE(0x807B7ED0, &lit_3849); /* 807B7ED4-807B7ED8 00001C 0004+00 0/5 0/0 0/0 .rodata @3850 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3850 = 200.0f; -COMPILER_STRIP_GATE(807B7ED4, &lit_3850); +COMPILER_STRIP_GATE(0x807B7ED4, &lit_3850); #pragma pop /* 807B7ED8-807B7EDC 000020 0004+00 0/3 0/0 0/0 .rodata @3851 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3851 = 7.0f; -COMPILER_STRIP_GATE(807B7ED8, &lit_3851); +COMPILER_STRIP_GATE(0x807B7ED8, &lit_3851); #pragma pop /* 807B4CEC-807B5074 00044C 0388+00 1/1 0/0 0/0 .text chain_control_01__FP15e_th_ball_class */ @@ -444,7 +440,7 @@ asm cXyz::~cXyz() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3969 = 90.0f; -COMPILER_STRIP_GATE(807B7EDC, &lit_3969); +COMPILER_STRIP_GATE(0x807B7EDC, &lit_3969); #pragma pop /* 807B7EE0-807B7EE8 000028 0004+04 0/1 0/0 0/0 .rodata @3970 */ @@ -455,7 +451,7 @@ SECTION_RODATA static f32 const lit_3970[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(807B7EE0, &lit_3970); +COMPILER_STRIP_GATE(0x807B7EE0, &lit_3970); #pragma pop /* 807B7EE8-807B7EF0 000030 0008+00 0/4 0/0 0/0 .rodata @3971 */ @@ -464,7 +460,7 @@ COMPILER_STRIP_GATE(807B7EE0, &lit_3970); SECTION_RODATA static u8 const lit_3971[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(807B7EE8, &lit_3971); +COMPILER_STRIP_GATE(0x807B7EE8, &lit_3971); #pragma pop /* 807B7EF0-807B7EF8 000038 0008+00 0/4 0/0 0/0 .rodata @3972 */ @@ -473,7 +469,7 @@ COMPILER_STRIP_GATE(807B7EE8, &lit_3971); SECTION_RODATA static u8 const lit_3972[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(807B7EF0, &lit_3972); +COMPILER_STRIP_GATE(0x807B7EF0, &lit_3972); #pragma pop /* 807B7EF8-807B7F00 000040 0008+00 0/4 0/0 0/0 .rodata @3973 */ @@ -482,21 +478,21 @@ COMPILER_STRIP_GATE(807B7EF0, &lit_3972); SECTION_RODATA static u8 const lit_3973[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(807B7EF8, &lit_3973); +COMPILER_STRIP_GATE(0x807B7EF8, &lit_3973); #pragma pop /* 807B7F00-807B7F04 000048 0004+00 0/1 0/0 0/0 .rodata @3974 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3974 = 1024.0f; -COMPILER_STRIP_GATE(807B7F00, &lit_3974); +COMPILER_STRIP_GATE(0x807B7F00, &lit_3974); #pragma pop /* 807B7F04-807B7F08 00004C 0004+00 0/1 0/0 0/0 .rodata @3975 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3975 = 16384.0f; -COMPILER_STRIP_GATE(807B7F04, &lit_3975); +COMPILER_STRIP_GATE(0x807B7F04, &lit_3975); #pragma pop /* 807B7F08-807B7F10 000050 0004+04 0/1 0/0 0/0 .rodata @3976 */ @@ -507,7 +503,7 @@ SECTION_RODATA static f32 const lit_3976[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(807B7F08, &lit_3976); +COMPILER_STRIP_GATE(0x807B7F08, &lit_3976); #pragma pop /* 807B50B0-807B54B4 000810 0404+00 1/1 0/0 0/0 .text chain_control_02__FP15e_th_ball_class */ @@ -525,7 +521,7 @@ static asm void chain_control_02(e_th_ball_class* param_0) { SECTION_RODATA static u8 const lit_4027[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(807B7F10, &lit_4027); +COMPILER_STRIP_GATE(0x807B7F10, &lit_4027); /* 807B54B4-807B56A4 000C14 01F0+00 1/1 0/0 0/0 .text chain_control_03__FP15e_th_ball_class */ #pragma push @@ -542,14 +538,14 @@ static asm void chain_control_03(e_th_ball_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4090 = 10.0f; -COMPILER_STRIP_GATE(807B7F18, &lit_4090); +COMPILER_STRIP_GATE(0x807B7F18, &lit_4090); #pragma pop /* 807B7F1C-807B7F20 000064 0004+00 0/3 0/0 0/0 .rodata @4091 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4091 = -20.0f; -COMPILER_STRIP_GATE(807B7F1C, &lit_4091); +COMPILER_STRIP_GATE(0x807B7F1C, &lit_4091); #pragma pop /* 807B56A4-807B5980 000E04 02DC+00 1/1 0/0 0/0 .text chain_control_11__FP15e_th_ball_class */ @@ -587,7 +583,7 @@ static asm void chain_control_13(e_th_ball_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4203 = 7.0f / 10.0f; -COMPILER_STRIP_GATE(807B7F20, &lit_4203); +COMPILER_STRIP_GATE(0x807B7F20, &lit_4203); #pragma pop /* 807B5C34-807B5F2C 001394 02F8+00 1/1 0/0 0/0 .text chain_control_21__FP15e_th_ball_class */ @@ -605,28 +601,28 @@ static asm void chain_control_21(e_th_ball_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4231 = 5.0f; -COMPILER_STRIP_GATE(807B7F24, &lit_4231); +COMPILER_STRIP_GATE(0x807B7F24, &lit_4231); #pragma pop /* 807B7F28-807B7F2C 000070 0004+00 0/1 0/0 0/0 .rodata @4232 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4232 = 47.0f; -COMPILER_STRIP_GATE(807B7F28, &lit_4232); +COMPILER_STRIP_GATE(0x807B7F28, &lit_4232); #pragma pop /* 807B7F2C-807B7F30 000074 0004+00 0/1 0/0 0/0 .rodata @4233 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4233 = -30.0f; -COMPILER_STRIP_GATE(807B7F2C, &lit_4233); +COMPILER_STRIP_GATE(0x807B7F2C, &lit_4233); #pragma pop /* 807B7F30-807B7F34 000078 0004+00 0/1 0/0 0/0 .rodata @4234 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4234 = 2.0f; -COMPILER_STRIP_GATE(807B7F30, &lit_4234); +COMPILER_STRIP_GATE(0x807B7F30, &lit_4234); #pragma pop /* 807B5F2C-807B60CC 00168C 01A0+00 4/4 0/0 0/0 .text normal_move__FP15e_th_ball_classSc @@ -656,77 +652,77 @@ static asm void e_th_ball_stop(e_th_ball_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4326 = 13.0f; -COMPILER_STRIP_GATE(807B7F34, &lit_4326); +COMPILER_STRIP_GATE(0x807B7F34, &lit_4326); #pragma pop /* 807B7F38-807B7F3C 000080 0004+00 0/1 0/0 0/0 .rodata @4327 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4327 = 29.0f; -COMPILER_STRIP_GATE(807B7F38, &lit_4327); +COMPILER_STRIP_GATE(0x807B7F38, &lit_4327); #pragma pop /* 807B7F3C-807B7F40 000084 0004+00 0/1 0/0 0/0 .rodata @4328 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4328 = 65536.0f; -COMPILER_STRIP_GATE(807B7F3C, &lit_4328); +COMPILER_STRIP_GATE(0x807B7F3C, &lit_4328); #pragma pop /* 807B7F40-807B7F44 000088 0004+00 0/1 0/0 0/0 .rodata @4329 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4329 = -130.0f; -COMPILER_STRIP_GATE(807B7F40, &lit_4329); +COMPILER_STRIP_GATE(0x807B7F40, &lit_4329); #pragma pop /* 807B7F44-807B7F48 00008C 0004+00 0/1 0/0 0/0 .rodata @4330 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4330 = 300.0f; -COMPILER_STRIP_GATE(807B7F44, &lit_4330); +COMPILER_STRIP_GATE(0x807B7F44, &lit_4330); #pragma pop /* 807B7F48-807B7F4C 000090 0004+00 0/2 0/0 0/0 .rodata @4331 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4331 = 0.5f; -COMPILER_STRIP_GATE(807B7F48, &lit_4331); +COMPILER_STRIP_GATE(0x807B7F48, &lit_4331); #pragma pop /* 807B7F4C-807B7F50 000094 0004+00 0/2 0/0 0/0 .rodata @4332 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4332 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(807B7F4C, &lit_4332); +COMPILER_STRIP_GATE(0x807B7F4C, &lit_4332); #pragma pop /* 807B7F50-807B7F54 000098 0004+00 0/2 0/0 0/0 .rodata @4333 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4333 = 1.0f / 50.0f; -COMPILER_STRIP_GATE(807B7F50, &lit_4333); +COMPILER_STRIP_GATE(0x807B7F50, &lit_4333); #pragma pop /* 807B7F54-807B7F58 00009C 0004+00 0/2 0/0 0/0 .rodata @4334 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4334 = 80.0f; -COMPILER_STRIP_GATE(807B7F54, &lit_4334); +COMPILER_STRIP_GATE(0x807B7F54, &lit_4334); #pragma pop /* 807B7F58-807B7F5C 0000A0 0004+00 0/3 0/0 0/0 .rodata @4335 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4335 = 50.0f; -COMPILER_STRIP_GATE(807B7F58, &lit_4335); +COMPILER_STRIP_GATE(0x807B7F58, &lit_4335); #pragma pop /* 807B7F5C-807B7F60 0000A4 0004+00 0/1 0/0 0/0 .rodata @4336 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4336 = 40.0f; -COMPILER_STRIP_GATE(807B7F5C, &lit_4336); +COMPILER_STRIP_GATE(0x807B7F5C, &lit_4336); #pragma pop /* 807B615C-807B6594 0018BC 0438+00 1/1 0/0 0/0 .text e_th_ball_spin__FP15e_th_ball_class @@ -745,14 +741,14 @@ static asm void e_th_ball_spin(e_th_ball_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4391 = -50.0f; -COMPILER_STRIP_GATE(807B7F60, &lit_4391); +COMPILER_STRIP_GATE(0x807B7F60, &lit_4391); #pragma pop /* 807B7F64-807B7F68 0000AC 0004+00 0/2 0/0 0/0 .rodata @4392 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4392 = -1.0f; -COMPILER_STRIP_GATE(807B7F64, &lit_4392); +COMPILER_STRIP_GATE(0x807B7F64, &lit_4392); #pragma pop /* 807B6594-807B6734 001CF4 01A0+00 1/1 0/0 0/0 .text wall_angle_get__FP15e_th_ball_class @@ -771,49 +767,49 @@ static asm void wall_angle_get(e_th_ball_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4430 = -25.0f; -COMPILER_STRIP_GATE(807B7F68, &lit_4430); +COMPILER_STRIP_GATE(0x807B7F68, &lit_4430); #pragma pop /* 807B7F6C-807B7F70 0000B4 0004+00 0/1 0/0 0/0 .rodata @4431 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4431 = 15.0f; -COMPILER_STRIP_GATE(807B7F6C, &lit_4431); +COMPILER_STRIP_GATE(0x807B7F6C, &lit_4431); #pragma pop /* 807B7F70-807B7F74 0000B8 0004+00 0/2 0/0 0/0 .rodata @4432 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4432 = 100.0f; -COMPILER_STRIP_GATE(807B7F70, &lit_4432); +COMPILER_STRIP_GATE(0x807B7F70, &lit_4432); #pragma pop /* 807B7F74-807B7F78 0000BC 0004+00 0/3 0/0 0/0 .rodata @4433 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4433 = 30.0f; -COMPILER_STRIP_GATE(807B7F74, &lit_4433); +COMPILER_STRIP_GATE(0x807B7F74, &lit_4433); #pragma pop /* 807B7F78-807B7F7C 0000C0 0004+00 0/1 0/0 0/0 .rodata @4434 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4434 = 4000.0f; -COMPILER_STRIP_GATE(807B7F78, &lit_4434); +COMPILER_STRIP_GATE(0x807B7F78, &lit_4434); #pragma pop /* 807B7F7C-807B7F80 0000C4 0004+00 0/2 0/0 0/0 .rodata @4435 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4435 = 3.0f / 10.0f; -COMPILER_STRIP_GATE(807B7F7C, &lit_4435); +COMPILER_STRIP_GATE(0x807B7F7C, &lit_4435); #pragma pop /* 807B7F80-807B7F84 0000C8 0004+00 0/1 0/0 0/0 .rodata @4436 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4436 = 160.0f; -COMPILER_STRIP_GATE(807B7F80, &lit_4436); +COMPILER_STRIP_GATE(0x807B7F80, &lit_4436); #pragma pop /* 807B6734-807B69A4 001E94 0270+00 1/1 0/0 0/0 .text e_th_ball_shot__FP15e_th_ball_class @@ -832,28 +828,28 @@ static asm void e_th_ball_shot(e_th_ball_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4508 = -40.0f; -COMPILER_STRIP_GATE(807B7F84, &lit_4508); +COMPILER_STRIP_GATE(0x807B7F84, &lit_4508); #pragma pop /* 807B7F88-807B7F8C 0000D0 0004+00 0/1 0/0 0/0 .rodata @4509 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4509 = 8.0f; -COMPILER_STRIP_GATE(807B7F88, &lit_4509); +COMPILER_STRIP_GATE(0x807B7F88, &lit_4509); #pragma pop /* 807B7F8C-807B7F90 0000D4 0004+00 0/1 0/0 0/0 .rodata @4510 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4510 = 3000.0f; -COMPILER_STRIP_GATE(807B7F8C, &lit_4510); +COMPILER_STRIP_GATE(0x807B7F8C, &lit_4510); #pragma pop /* 807B7F90-807B7F94 0000D8 0004+00 0/1 0/0 0/0 .rodata @4511 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4511 = 6000.0f; -COMPILER_STRIP_GATE(807B7F90, &lit_4511); +COMPILER_STRIP_GATE(0x807B7F90, &lit_4511); #pragma pop /* 807B69A4-807B6D00 002104 035C+00 1/1 0/0 0/0 .text e_th_ball_return__FP15e_th_ball_class */ @@ -871,14 +867,14 @@ static asm void e_th_ball_return(e_th_ball_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4529 = 45.0f; -COMPILER_STRIP_GATE(807B7F94, &lit_4529); +COMPILER_STRIP_GATE(0x807B7F94, &lit_4529); #pragma pop /* 807B7F98-807B7F9C 0000E0 0004+00 0/1 0/0 0/0 .rodata @4530 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4530 = 130.0f; -COMPILER_STRIP_GATE(807B7F98, &lit_4530); +COMPILER_STRIP_GATE(0x807B7F98, &lit_4530); #pragma pop /* 807B6D00-807B6DC8 002460 00C8+00 1/1 0/0 0/0 .text e_th_ball_end__FP15e_th_ball_class @@ -897,42 +893,48 @@ static asm void e_th_ball_end(e_th_ball_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4650 = 1.0f / 25.0f; -COMPILER_STRIP_GATE(807B7F9C, &lit_4650); +COMPILER_STRIP_GATE(0x807B7F9C, &lit_4650); #pragma pop /* 807B7FA0-807B7FA4 0000E8 0004+00 0/1 0/0 0/0 .rodata @4651 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4651 = 0x3B03126F; -COMPILER_STRIP_GATE(807B7FA0, &lit_4651); +COMPILER_STRIP_GATE(0x807B7FA0, &lit_4651); #pragma pop /* 807B7FA4-807B7FA8 0000EC 0004+00 0/1 0/0 0/0 .rodata @4652 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4652 = 1.0f / 20.0f; -COMPILER_STRIP_GATE(807B7FA4, &lit_4652); +COMPILER_STRIP_GATE(0x807B7FA4, &lit_4652); #pragma pop /* 807B7FA8-807B7FAC 0000F0 0004+00 0/1 0/0 0/0 .rodata @4653 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4653 = 17.0f / 20.0f; -COMPILER_STRIP_GATE(807B7FA8, &lit_4653); +COMPILER_STRIP_GATE(0x807B7FA8, &lit_4653); #pragma pop /* 807B7FAC-807B7FB0 0000F4 0004+00 0/1 0/0 0/0 .rodata @4654 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4654 = 12000.0f; -COMPILER_STRIP_GATE(807B7FAC, &lit_4654); +COMPILER_STRIP_GATE(0x807B7FAC, &lit_4654); #pragma pop /* 807B7FB0-807B7FB4 0000F8 0004+00 0/1 0/0 0/0 .rodata @4655 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4655 = 0x3D0F5C29; -COMPILER_STRIP_GATE(807B7FB0, &lit_4655); +COMPILER_STRIP_GATE(0x807B7FB0, &lit_4655); +#pragma pop + +/* 807B7FC0-807B7FC0 000108 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_807B7FC0 = "E_th"; #pragma pop /* 807B6DC8-807B7454 002528 068C+00 1/1 0/0 0/0 .text action__FP15e_th_ball_class */ @@ -974,6 +976,13 @@ static bool daE_TH_BALL_IsDelete(e_th_ball_class* param_0) { return true; } +/* ############################################################################################## */ +/* 807B7FC0-807B7FC0 000108 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_807B7FC5 = "E_th_ball"; +#pragma pop + /* 807B774C-807B77AC 002EAC 0060+00 1/0 0/0 0/0 .text daE_TH_BALL_Delete__FP15e_th_ball_class */ #pragma push #pragma optimization_level 0 @@ -999,21 +1008,21 @@ static asm void useHeapInit(fopAc_ac_c* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4827 = -2000.0f; -COMPILER_STRIP_GATE(807B7FB4, &lit_4827); +COMPILER_STRIP_GATE(0x807B7FB4, &lit_4827); #pragma pop /* 807B7FB8-807B7FBC 000100 0004+00 0/1 0/0 0/0 .rodata @4828 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4828 = -1000.0f; -COMPILER_STRIP_GATE(807B7FB8, &lit_4828); +COMPILER_STRIP_GATE(0x807B7FB8, &lit_4828); #pragma pop /* 807B7FBC-807B7FC0 000104 0004+00 0/1 0/0 0/0 .rodata @4829 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4829 = 2000.0f; -COMPILER_STRIP_GATE(807B7FBC, &lit_4829); +COMPILER_STRIP_GATE(0x807B7FBC, &lit_4829); #pragma pop /* 807B7FD0-807B8010 000000 0040+00 1/1 0/0 0/0 .data cc_sph_src$4795 */ @@ -1173,10 +1182,4 @@ static asm void func_807B7EA8() { } #pragma pop -/* 807B7FC0-807B7FCF 000108 000F+00 4/4 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_807B7FC0 = "E_th"; -SECTION_DEAD static char const* const stringBase_807B7FC5 = "E_th_ball"; -#pragma pop +/* 807B7FC0-807B7FC0 000108 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/e/d_a_e_tk/d_a_e_tk.cpp b/rel/d/a/e/d_a_e_tk/d_a_e_tk.cpp index bd5f227495d..3694becd0dc 100644 --- a/rel/d/a/e/d_a_e_tk/d_a_e_tk.cpp +++ b/rel/d/a/e/d_a_e_tk/d_a_e_tk.cpp @@ -19,16 +19,16 @@ struct mDoMtx_stack_c { static u8 now[48]; }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; - struct J3DAnmTransform {}; +struct J3DModelData {}; + +struct Z2Creature {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -72,10 +72,10 @@ struct dRes_control_c { struct dPa_levelEcallBack {}; -struct _GXColor {}; - struct csXyz {}; +struct _GXColor {}; + struct dPa_control_c { /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, @@ -316,34 +316,34 @@ extern "C" void __register_global_object(); /* ############################################################################################## */ /* 807BA26C-807BA270 000000 0004+00 11/11 0/0 0/0 .rodata @3762 */ SECTION_RODATA static f32 const lit_3762 = 19.0f / 10.0f; -COMPILER_STRIP_GATE(807BA26C, &lit_3762); +COMPILER_STRIP_GATE(0x807BA26C, &lit_3762); /* 807BA270-807BA274 000004 0004+00 0/1 0/0 0/0 .rodata @3763 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3763 = 1400.0f; -COMPILER_STRIP_GATE(807BA270, &lit_3763); +COMPILER_STRIP_GATE(0x807BA270, &lit_3763); #pragma pop /* 807BA274-807BA278 000008 0004+00 0/1 0/0 0/0 .rodata @3764 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3764 = 500.0f; -COMPILER_STRIP_GATE(807BA274, &lit_3764); +COMPILER_STRIP_GATE(0x807BA274, &lit_3764); #pragma pop /* 807BA278-807BA27C 00000C 0004+00 0/2 0/0 0/0 .rodata @3765 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3765 = 10.0f; -COMPILER_STRIP_GATE(807BA278, &lit_3765); +COMPILER_STRIP_GATE(0x807BA278, &lit_3765); #pragma pop /* 807BA27C-807BA280 000010 0004+00 0/1 0/0 0/0 .rodata @3766 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3766 = 25.0f; -COMPILER_STRIP_GATE(807BA27C, &lit_3766); +COMPILER_STRIP_GATE(0x807BA27C, &lit_3766); #pragma pop /* 807BA2F8-807BA32C -00001 0034+00 1/1 0/0 0/0 .data @4023 */ @@ -460,11 +460,17 @@ SECTION_RODATA static u8 const lit_3780[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(807BA280, &lit_3780); +COMPILER_STRIP_GATE(0x807BA280, &lit_3780); /* 807BA284-807BA288 000018 0004+00 1/1 0/0 0/0 .rodata @3781 */ SECTION_RODATA static f32 const lit_3781 = -1.0f; -COMPILER_STRIP_GATE(807BA284, &lit_3781); +COMPILER_STRIP_GATE(0x807BA284, &lit_3781); + +/* 807BA2F0-807BA2F0 000084 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_807BA2F0 = "E_tk"; +#pragma pop /* 807B8234-807B82E0 000134 00AC+00 6/6 0/0 0/0 .text anm_init__FP10e_tk_classifUcf */ #pragma push @@ -489,7 +495,7 @@ static asm void daE_TK_Draw(e_tk_class* param_0) { /* ############################################################################################## */ /* 807BA288-807BA28C 00001C 0004+00 1/3 0/0 0/0 .rodata @3820 */ SECTION_RODATA static f32 const lit_3820 = 100.0f; -COMPILER_STRIP_GATE(807BA288, &lit_3820); +COMPILER_STRIP_GATE(0x807BA288, &lit_3820); /* 807B8350-807B8428 000250 00D8+00 1/1 0/0 0/0 .text other_bg_check__FP10e_tk_classP10fopAc_ac_c */ @@ -505,7 +511,7 @@ static asm void other_bg_check(e_tk_class* param_0, fopAc_ac_c* param_1) { /* ############################################################################################## */ /* 807BA28C-807BA290 000020 0004+00 1/1 0/0 0/0 .rodata @3830 */ SECTION_RODATA static f32 const lit_3830 = 130.0f; -COMPILER_STRIP_GATE(807BA28C, &lit_3830); +COMPILER_STRIP_GATE(0x807BA28C, &lit_3830); /* 807B8428-807B8460 000328 0038+00 3/3 0/0 0/0 .text pl_y_check__FP10e_tk_class */ #pragma push @@ -542,14 +548,14 @@ static asm void damage_check(e_tk_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3897 = 50.0f; -COMPILER_STRIP_GATE(807BA290, &lit_3897); +COMPILER_STRIP_GATE(0x807BA290, &lit_3897); #pragma pop /* 807BA294-807BA298 000028 0004+00 0/2 0/0 0/0 .rodata @3898 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3898 = -50.0f; -COMPILER_STRIP_GATE(807BA294, &lit_3898); +COMPILER_STRIP_GATE(0x807BA294, &lit_3898); #pragma pop /* 807B85DC-807B86EC 0004DC 0110+00 1/1 0/0 0/0 .text way_bg_check__FP10e_tk_classf */ @@ -567,39 +573,39 @@ static asm void way_bg_check(e_tk_class* param_0, f32 param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3937 = 5.0f; -COMPILER_STRIP_GATE(807BA298, &lit_3937); +COMPILER_STRIP_GATE(0x807BA298, &lit_3937); #pragma pop /* 807BA29C-807BA2A0 000030 0004+00 1/8 0/0 0/0 .rodata @3938 */ SECTION_RODATA static f32 const lit_3938 = 1.0f; -COMPILER_STRIP_GATE(807BA29C, &lit_3938); +COMPILER_STRIP_GATE(0x807BA29C, &lit_3938); /* 807BA2A0-807BA2A4 000034 0004+00 0/1 0/0 0/0 .rodata @3939 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3939 = 8000.0f; -COMPILER_STRIP_GATE(807BA2A0, &lit_3939); +COMPILER_STRIP_GATE(0x807BA2A0, &lit_3939); #pragma pop /* 807BA2A4-807BA2A8 000038 0004+00 0/3 0/0 0/0 .rodata @3940 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3940 = 30.0f; -COMPILER_STRIP_GATE(807BA2A4, &lit_3940); +COMPILER_STRIP_GATE(0x807BA2A4, &lit_3940); #pragma pop /* 807BA2A8-807BA2AC 00003C 0004+00 0/2 0/0 0/0 .rodata @3941 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3941 = 200.0f; -COMPILER_STRIP_GATE(807BA2A8, &lit_3941); +COMPILER_STRIP_GATE(0x807BA2A8, &lit_3941); #pragma pop /* 807BA2AC-807BA2B0 000040 0004+00 0/1 0/0 0/0 .rodata @3942 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3942 = 2000.0f; -COMPILER_STRIP_GATE(807BA2AC, &lit_3942); +COMPILER_STRIP_GATE(0x807BA2AC, &lit_3942); #pragma pop /* 807BA438-807BA43C 000008 0004+00 2/2 0/0 0/0 .bss None */ @@ -626,7 +632,7 @@ static asm void e_tk_wait_0(e_tk_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4017 = 3.0f; -COMPILER_STRIP_GATE(807BA2B0, &lit_4017); +COMPILER_STRIP_GATE(0x807BA2B0, &lit_4017); #pragma pop /* 807B8980-807B8D78 000880 03F8+00 2/1 0/0 0/0 .text e_tk_find__FP10e_tk_class */ @@ -644,42 +650,42 @@ static asm void e_tk_find(e_tk_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4018 = 4.0f; -COMPILER_STRIP_GATE(807BA2B4, &lit_4018); +COMPILER_STRIP_GATE(0x807BA2B4, &lit_4018); #pragma pop /* 807BA2B8-807BA2BC 00004C 0004+00 0/3 0/0 0/0 .rodata @4019 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4019 = 2.0f; -COMPILER_STRIP_GATE(807BA2B8, &lit_4019); +COMPILER_STRIP_GATE(0x807BA2B8, &lit_4019); #pragma pop /* 807BA2BC-807BA2C0 000050 0004+00 0/0 0/0 0/0 .rodata @4020 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4020 = 3.0f / 20.0f; -COMPILER_STRIP_GATE(807BA2BC, &lit_4020); +COMPILER_STRIP_GATE(0x807BA2BC, &lit_4020); #pragma pop /* 807BA2C0-807BA2C4 000054 0004+00 0/0 0/0 0/0 .rodata @4021 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4021 = 6.0f / 5.0f; -COMPILER_STRIP_GATE(807BA2C0, &lit_4021); +COMPILER_STRIP_GATE(0x807BA2C0, &lit_4021); #pragma pop /* 807BA2C4-807BA2C8 000058 0004+00 0/2 0/0 0/0 .rodata @4022 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4022 = 20.0f; -COMPILER_STRIP_GATE(807BA2C4, &lit_4022); +COMPILER_STRIP_GATE(0x807BA2C4, &lit_4022); #pragma pop /* 807BA2C8-807BA2CC 00005C 0004+00 0/3 0/0 0/0 .rodata @4066 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4066 = 60.0f; -COMPILER_STRIP_GATE(807BA2C8, &lit_4066); +COMPILER_STRIP_GATE(0x807BA2C8, &lit_4066); #pragma pop /* 807B8D78-807B8F68 000C78 01F0+00 1/1 0/0 0/0 .text e_tk_attack__FP10e_tk_class */ @@ -737,56 +743,56 @@ static asm void action(e_tk_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4183 = 23.0f / 10.0f; -COMPILER_STRIP_GATE(807BA2CC, &lit_4183); +COMPILER_STRIP_GATE(0x807BA2CC, &lit_4183); #pragma pop /* 807BA2D0-807BA2D4 000064 0004+00 0/0 0/0 0/0 .rodata @4184 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4184 = 1.0f / 20.0f; -COMPILER_STRIP_GATE(807BA2D0, &lit_4184); +COMPILER_STRIP_GATE(0x807BA2D0, &lit_4184); #pragma pop /* 807BA2D4-807BA2D8 000068 0004+00 0/1 0/0 0/0 .rodata @4354 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4354 = 6.0f; -COMPILER_STRIP_GATE(807BA2D4, &lit_4354); +COMPILER_STRIP_GATE(0x807BA2D4, &lit_4354); #pragma pop /* 807BA2D8-807BA2DC 00006C 0004+00 0/1 0/0 0/0 .rodata @4355 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4355 = 12.0f; -COMPILER_STRIP_GATE(807BA2D8, &lit_4355); +COMPILER_STRIP_GATE(0x807BA2D8, &lit_4355); #pragma pop /* 807BA2DC-807BA2E0 000070 0004+00 0/1 0/0 0/0 .rodata @4356 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4356 = 18.0f; -COMPILER_STRIP_GATE(807BA2DC, &lit_4356); +COMPILER_STRIP_GATE(0x807BA2DC, &lit_4356); #pragma pop /* 807BA2E0-807BA2E4 000074 0004+00 0/1 0/0 0/0 .rodata @4357 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4357 = 24.0f; -COMPILER_STRIP_GATE(807BA2E0, &lit_4357); +COMPILER_STRIP_GATE(0x807BA2E0, &lit_4357); #pragma pop /* 807BA2E4-807BA2E8 000078 0004+00 0/1 0/0 0/0 .rodata @4358 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4358 = 27.0f; -COMPILER_STRIP_GATE(807BA2E4, &lit_4358); +COMPILER_STRIP_GATE(0x807BA2E4, &lit_4358); #pragma pop /* 807BA2E8-807BA2EC 00007C 0004+00 0/1 0/0 0/0 .rodata @4359 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4359 = 35.0f; -COMPILER_STRIP_GATE(807BA2E8, &lit_4359); +COMPILER_STRIP_GATE(0x807BA2E8, &lit_4359); #pragma pop /* 807B9554-807B9C50 001454 06FC+00 2/1 0/0 0/0 .text daE_TK_Execute__FP10e_tk_class */ @@ -829,7 +835,7 @@ static asm void useHeapInit(fopAc_ac_c* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4487 = -100.0f; -COMPILER_STRIP_GATE(807BA2EC, &lit_4487); +COMPILER_STRIP_GATE(0x807BA2EC, &lit_4487); #pragma pop /* 807B9DB8-807BA0C4 001CB8 030C+00 1/0 0/0 0/0 .text daE_TK_Create__FP10fopAc_ac_c */ @@ -894,7 +900,7 @@ asm void __sinit_d_a_e_tk_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_807BA20C = (void*)__sinit_d_a_e_tk_cpp; +REGISTER_CTORS(0x807BA20C, __sinit_d_a_e_tk_cpp); #pragma pop /* 807BA248-807BA250 002148 0008+00 1/0 0/0 0/0 .text @36@__dt__12dBgS_ObjAcchFv */ @@ -917,9 +923,4 @@ static asm void func_807BA250() { } #pragma pop -/* 807BA2F0-807BA2F5 000084 0005+00 4/4 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_807BA2F0 = "E_tk"; -#pragma pop +/* 807BA2F0-807BA2F0 000084 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/e/d_a_e_tk2/d_a_e_tk2.cpp b/rel/d/a/e/d_a_e_tk2/d_a_e_tk2.cpp index 5bde35df157..a4342801eaa 100644 --- a/rel/d/a/e/d_a_e_tk2/d_a_e_tk2.cpp +++ b/rel/d/a/e/d_a_e_tk2/d_a_e_tk2.cpp @@ -19,16 +19,16 @@ struct mDoMtx_stack_c { static u8 now[48]; }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; - struct J3DAnmTransform {}; +struct J3DModelData {}; + +struct Z2Creature {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -68,10 +68,10 @@ struct dRes_control_c { struct dPa_levelEcallBack {}; -struct _GXColor {}; - struct csXyz {}; +struct _GXColor {}; + struct dPa_control_c { /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, @@ -303,34 +303,34 @@ extern "C" void __register_global_object(); /* ############################################################################################## */ /* 807BBDA8-807BBDAC 000000 0004+00 7/7 0/0 0/0 .rodata @3762 */ SECTION_RODATA static f32 const lit_3762 = 23.0f / 10.0f; -COMPILER_STRIP_GATE(807BBDA8, &lit_3762); +COMPILER_STRIP_GATE(0x807BBDA8, &lit_3762); /* 807BBDAC-807BBDB0 000004 0004+00 0/1 0/0 0/0 .rodata @3763 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3763 = 1400.0f; -COMPILER_STRIP_GATE(807BBDAC, &lit_3763); +COMPILER_STRIP_GATE(0x807BBDAC, &lit_3763); #pragma pop /* 807BBDB0-807BBDB4 000008 0004+00 0/1 0/0 0/0 .rodata @3764 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3764 = 500.0f; -COMPILER_STRIP_GATE(807BBDB0, &lit_3764); +COMPILER_STRIP_GATE(0x807BBDB0, &lit_3764); #pragma pop /* 807BBDB4-807BBDB8 00000C 0004+00 0/3 0/0 0/0 .rodata @3765 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3765 = 10.0f; -COMPILER_STRIP_GATE(807BBDB4, &lit_3765); +COMPILER_STRIP_GATE(0x807BBDB4, &lit_3765); #pragma pop /* 807BBDB8-807BBDBC 000010 0004+00 0/1 0/0 0/0 .rodata @3766 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3766 = 25.0f; -COMPILER_STRIP_GATE(807BBDB8, &lit_3766); +COMPILER_STRIP_GATE(0x807BBDB8, &lit_3766); #pragma pop /* 807BBE28-807BBE5C -00001 0034+00 1/1 0/0 0/0 .data @3947 */ @@ -432,11 +432,17 @@ SECTION_RODATA static u8 const lit_3780[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(807BBDBC, &lit_3780); +COMPILER_STRIP_GATE(0x807BBDBC, &lit_3780); /* 807BBDC0-807BBDC4 000018 0004+00 1/1 0/0 0/0 .rodata @3781 */ SECTION_RODATA static f32 const lit_3781 = -1.0f; -COMPILER_STRIP_GATE(807BBDC0, &lit_3781); +COMPILER_STRIP_GATE(0x807BBDC0, &lit_3781); + +/* 807BBE20-807BBE20 000078 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_807BBE20 = "E_tk2"; +#pragma pop /* 807BA5B4-807BA660 000134 00AC+00 4/4 0/0 0/0 .text anm_init__FP11e_tk2_classifUcf */ #pragma push @@ -461,7 +467,7 @@ static asm void daE_TK2_Draw(e_tk2_class* param_0) { /* ############################################################################################## */ /* 807BBDC4-807BBDC8 00001C 0004+00 1/2 0/0 0/0 .rodata @3820 */ SECTION_RODATA static f32 const lit_3820 = 100.0f; -COMPILER_STRIP_GATE(807BBDC4, &lit_3820); +COMPILER_STRIP_GATE(0x807BBDC4, &lit_3820); /* 807BA6D0-807BA7A8 000250 00D8+00 1/1 0/0 0/0 .text other_bg_check__FP11e_tk2_classP10fopAc_ac_c */ @@ -519,12 +525,12 @@ static asm void e_tk2_wait_0(e_tk2_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3938 = 3.0f; -COMPILER_STRIP_GATE(807BBDC8, &lit_3938); +COMPILER_STRIP_GATE(0x807BBDC8, &lit_3938); #pragma pop /* 807BBDCC-807BBDD0 000024 0004+00 1/6 0/0 0/0 .rodata @3939 */ SECTION_RODATA static f32 const lit_3939 = 1.0f; -COMPILER_STRIP_GATE(807BBDCC, &lit_3939); +COMPILER_STRIP_GATE(0x807BBDCC, &lit_3939); /* 807BA9E8-807BACF8 000568 0310+00 2/1 0/0 0/0 .text e_tk2_find__FP11e_tk2_class */ #pragma push @@ -541,63 +547,63 @@ static asm void e_tk2_find(e_tk2_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3940 = 30.0f; -COMPILER_STRIP_GATE(807BBDD0, &lit_3940); +COMPILER_STRIP_GATE(0x807BBDD0, &lit_3940); #pragma pop /* 807BBDD4-807BBDD8 00002C 0004+00 0/0 0/0 0/0 .rodata @3941 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3941 = 4.0f; -COMPILER_STRIP_GATE(807BBDD4, &lit_3941); +COMPILER_STRIP_GATE(0x807BBDD4, &lit_3941); #pragma pop /* 807BBDD8-807BBDDC 000030 0004+00 0/3 0/0 0/0 .rodata @3942 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3942 = 2.0f; -COMPILER_STRIP_GATE(807BBDD8, &lit_3942); +COMPILER_STRIP_GATE(0x807BBDD8, &lit_3942); #pragma pop /* 807BBDDC-807BBDE0 000034 0004+00 0/0 0/0 0/0 .rodata @3943 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3943 = 3.0f / 20.0f; -COMPILER_STRIP_GATE(807BBDDC, &lit_3943); +COMPILER_STRIP_GATE(0x807BBDDC, &lit_3943); #pragma pop /* 807BBDE0-807BBDE4 000038 0004+00 0/0 0/0 0/0 .rodata @3944 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3944 = 6.0f / 5.0f; -COMPILER_STRIP_GATE(807BBDE0, &lit_3944); +COMPILER_STRIP_GATE(0x807BBDE0, &lit_3944); #pragma pop /* 807BBDE4-807BBDE8 00003C 0004+00 0/1 0/0 0/0 .rodata @3945 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3945 = 20.0f; -COMPILER_STRIP_GATE(807BBDE4, &lit_3945); +COMPILER_STRIP_GATE(0x807BBDE4, &lit_3945); #pragma pop /* 807BBDE8-807BBDEC 000040 0004+00 0/0 0/0 0/0 .rodata @3946 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3946 = 8000.0f; -COMPILER_STRIP_GATE(807BBDE8, &lit_3946); +COMPILER_STRIP_GATE(0x807BBDE8, &lit_3946); #pragma pop /* 807BBDEC-807BBDF0 000044 0004+00 0/1 0/0 0/0 .rodata @3988 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3988 = 70.0f; -COMPILER_STRIP_GATE(807BBDEC, &lit_3988); +COMPILER_STRIP_GATE(0x807BBDEC, &lit_3988); #pragma pop /* 807BBDF0-807BBDF4 000048 0004+00 0/2 0/0 0/0 .rodata @3989 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3989 = 50.0f; -COMPILER_STRIP_GATE(807BBDF0, &lit_3989); +COMPILER_STRIP_GATE(0x807BBDF0, &lit_3989); #pragma pop /* 807BACF8-807BAED0 000878 01D8+00 1/1 0/0 0/0 .text e_tk2_attack__FP11e_tk2_class */ @@ -645,56 +651,56 @@ static asm void action(e_tk2_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4204 = 200.0f; -COMPILER_STRIP_GATE(807BBDF4, &lit_4204); +COMPILER_STRIP_GATE(0x807BBDF4, &lit_4204); #pragma pop /* 807BBDF8-807BBDFC 000050 0004+00 0/1 0/0 0/0 .rodata @4205 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4205 = 6.0f; -COMPILER_STRIP_GATE(807BBDF8, &lit_4205); +COMPILER_STRIP_GATE(0x807BBDF8, &lit_4205); #pragma pop /* 807BBDFC-807BBE00 000054 0004+00 0/1 0/0 0/0 .rodata @4206 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4206 = 12.0f; -COMPILER_STRIP_GATE(807BBDFC, &lit_4206); +COMPILER_STRIP_GATE(0x807BBDFC, &lit_4206); #pragma pop /* 807BBE00-807BBE04 000058 0004+00 0/1 0/0 0/0 .rodata @4207 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4207 = 18.0f; -COMPILER_STRIP_GATE(807BBE00, &lit_4207); +COMPILER_STRIP_GATE(0x807BBE00, &lit_4207); #pragma pop /* 807BBE04-807BBE08 00005C 0004+00 0/1 0/0 0/0 .rodata @4208 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4208 = 24.0f; -COMPILER_STRIP_GATE(807BBE04, &lit_4208); +COMPILER_STRIP_GATE(0x807BBE04, &lit_4208); #pragma pop /* 807BBE08-807BBE0C 000060 0004+00 0/1 0/0 0/0 .rodata @4209 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4209 = 5.0f; -COMPILER_STRIP_GATE(807BBE08, &lit_4209); +COMPILER_STRIP_GATE(0x807BBE08, &lit_4209); #pragma pop /* 807BBE0C-807BBE10 000064 0004+00 0/1 0/0 0/0 .rodata @4210 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4210 = 27.0f; -COMPILER_STRIP_GATE(807BBE0C, &lit_4210); +COMPILER_STRIP_GATE(0x807BBE0C, &lit_4210); #pragma pop /* 807BBE10-807BBE14 000068 0004+00 0/1 0/0 0/0 .rodata @4211 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4211 = 35.0f; -COMPILER_STRIP_GATE(807BBE10, &lit_4211); +COMPILER_STRIP_GATE(0x807BBE10, &lit_4211); #pragma pop /* 807BB128-807BB7E4 000CA8 06BC+00 2/1 0/0 0/0 .text daE_TK2_Execute__FP11e_tk2_class */ @@ -738,21 +744,21 @@ static asm void useHeapInit(fopAc_ac_c* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4328 = -100.0f; -COMPILER_STRIP_GATE(807BBE14, &lit_4328); +COMPILER_STRIP_GATE(0x807BBE14, &lit_4328); #pragma pop /* 807BBE18-807BBE1C 000070 0004+00 0/1 0/0 0/0 .rodata @4329 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4329 = -50.0f; -COMPILER_STRIP_GATE(807BBE18, &lit_4329); +COMPILER_STRIP_GATE(0x807BBE18, &lit_4329); #pragma pop /* 807BBE1C-807BBE20 000074 0004+00 0/1 0/0 0/0 .rodata @4330 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4330 = 60.0f; -COMPILER_STRIP_GATE(807BBE1C, &lit_4330); +COMPILER_STRIP_GATE(0x807BBE1C, &lit_4330); #pragma pop /* 807BB94C-807BBC00 0014CC 02B4+00 1/0 0/0 0/0 .text daE_TK2_Create__FP10fopAc_ac_c */ @@ -817,7 +823,7 @@ asm void __sinit_d_a_e_tk2_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_807BBD48 = (void*)__sinit_d_a_e_tk2_cpp; +REGISTER_CTORS(0x807BBD48, __sinit_d_a_e_tk2_cpp); #pragma pop /* 807BBD84-807BBD8C 001904 0008+00 1/0 0/0 0/0 .text @36@__dt__12dBgS_ObjAcchFv */ @@ -840,9 +846,4 @@ static asm void func_807BBD8C() { } #pragma pop -/* 807BBE20-807BBE26 000078 0006+00 4/4 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_807BBE20 = "E_tk2"; -#pragma pop +/* 807BBE20-807BBE20 000078 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/e/d_a_e_tk_ball/d_a_e_tk_ball.cpp b/rel/d/a/e/d_a_e_tk_ball/d_a_e_tk_ball.cpp index 9804666b083..51f6c5d4cd3 100644 --- a/rel/d/a/e/d_a_e_tk_ball/d_a_e_tk_ball.cpp +++ b/rel/d/a/e/d_a_e_tk_ball/d_a_e_tk_ball.cpp @@ -49,10 +49,10 @@ struct dRes_control_c { struct dPa_levelEcallBack {}; -struct _GXColor {}; - struct csXyz {}; +struct _GXColor {}; + struct dPa_control_c { struct level_c { /* 8004B918 */ void getEmitter(u32); @@ -256,31 +256,31 @@ SECTION_RODATA static u8 const lit_3710[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(807BD56C, &lit_3710); +COMPILER_STRIP_GATE(0x807BD56C, &lit_3710); /* 807BD570-807BD574 000004 0004+00 0/1 0/0 0/0 .rodata @3711 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3711 = 30.0f; -COMPILER_STRIP_GATE(807BD570, &lit_3711); +COMPILER_STRIP_GATE(0x807BD570, &lit_3711); #pragma pop /* 807BD574-807BD578 000008 0004+00 1/2 0/0 0/0 .rodata @3712 */ SECTION_RODATA static f32 const lit_3712 = -50.0f; -COMPILER_STRIP_GATE(807BD574, &lit_3712); +COMPILER_STRIP_GATE(0x807BD574, &lit_3712); /* 807BD578-807BD57C 00000C 0004+00 0/1 0/0 0/0 .rodata @3713 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3713 = -30.0f; -COMPILER_STRIP_GATE(807BD578, &lit_3713); +COMPILER_STRIP_GATE(0x807BD578, &lit_3713); #pragma pop /* 807BD57C-807BD580 000010 0004+00 0/2 0/0 0/0 .rodata @3714 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3714 = 50.0f; -COMPILER_STRIP_GATE(807BD57C, &lit_3714); +COMPILER_STRIP_GATE(0x807BD57C, &lit_3714); #pragma pop /* 807BC070-807BC1CC 0000F0 015C+00 3/3 0/0 0/0 .text simple_bg_check__FP15e_tk_ball_class */ @@ -296,11 +296,11 @@ static asm void simple_bg_check(e_tk_ball_class* param_0) { /* ############################################################################################## */ /* 807BD580-807BD584 000014 0004+00 3/4 0/0 0/0 .rodata @3763 */ SECTION_RODATA static f32 const lit_3763 = 2.0f; -COMPILER_STRIP_GATE(807BD580, &lit_3763); +COMPILER_STRIP_GATE(0x807BD580, &lit_3763); /* 807BD584-807BD588 000018 0004+00 1/2 0/0 0/0 .rodata @3764 */ SECTION_RODATA static f32 const lit_3764 = 1.0f; -COMPILER_STRIP_GATE(807BD584, &lit_3764); +COMPILER_STRIP_GATE(0x807BD584, &lit_3764); /* 807BC1CC-807BC3F8 00024C 022C+00 3/3 0/0 0/0 .text impact_eff_set__FP15e_tk_ball_class */ @@ -318,7 +318,7 @@ static asm void impact_eff_set(e_tk_ball_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3923 = -20.0f; -COMPILER_STRIP_GATE(807BD588, &lit_3923); +COMPILER_STRIP_GATE(0x807BD588, &lit_3923); #pragma pop /* 807BD58C-807BD594 000020 0008+00 0/2 0/0 0/0 .rodata @3924 */ @@ -327,7 +327,7 @@ COMPILER_STRIP_GATE(807BD588, &lit_3923); SECTION_RODATA static u8 const lit_3924[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(807BD58C, &lit_3924); +COMPILER_STRIP_GATE(0x807BD58C, &lit_3924); #pragma pop /* 807BD594-807BD59C 000028 0008+00 0/2 0/0 0/0 .rodata @3925 */ @@ -336,7 +336,7 @@ COMPILER_STRIP_GATE(807BD58C, &lit_3924); SECTION_RODATA static u8 const lit_3925[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(807BD594, &lit_3925); +COMPILER_STRIP_GATE(0x807BD594, &lit_3925); #pragma pop /* 807BD59C-807BD5A4 000030 0008+00 0/2 0/0 0/0 .rodata @3926 */ @@ -345,28 +345,28 @@ COMPILER_STRIP_GATE(807BD594, &lit_3925); SECTION_RODATA static u8 const lit_3926[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(807BD59C, &lit_3926); +COMPILER_STRIP_GATE(0x807BD59C, &lit_3926); #pragma pop /* 807BD5A4-807BD5A8 000038 0004+00 0/1 0/0 0/0 .rodata @3927 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3927 = 10.0f; -COMPILER_STRIP_GATE(807BD5A4, &lit_3927); +COMPILER_STRIP_GATE(0x807BD5A4, &lit_3927); #pragma pop /* 807BD5A8-807BD5AC 00003C 0004+00 0/1 0/0 0/0 .rodata @3928 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3928 = -3.0f / 10.0f; -COMPILER_STRIP_GATE(807BD5A8, &lit_3928); +COMPILER_STRIP_GATE(0x807BD5A8, &lit_3928); #pragma pop /* 807BD5AC-807BD5B0 000040 0004+00 0/1 0/0 0/0 .rodata @3929 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3929 = 60.0f; -COMPILER_STRIP_GATE(807BD5AC, &lit_3929); +COMPILER_STRIP_GATE(0x807BD5AC, &lit_3929); #pragma pop /* 807BC3F8-807BCA18 000478 0620+00 1/1 0/0 0/0 .text e_tk_ball_move__FP15e_tk_ball_class @@ -406,32 +406,32 @@ static asm void e_tk_ball_drop(e_tk_ball_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4115 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(807BD5B0, &lit_4115); +COMPILER_STRIP_GATE(0x807BD5B0, &lit_4115); #pragma pop /* 807BD5B4-807BD5B8 000048 0004+00 0/1 0/0 0/0 .rodata @4116 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4116 = 300.0f; -COMPILER_STRIP_GATE(807BD5B4, &lit_4116); +COMPILER_STRIP_GATE(0x807BD5B4, &lit_4116); #pragma pop /* 807BD5B8-807BD5BC 00004C 0004+00 1/2 0/0 0/0 .rodata @4117 */ SECTION_RODATA static f32 const lit_4117 = 32768.0f; -COMPILER_STRIP_GATE(807BD5B8, &lit_4117); +COMPILER_STRIP_GATE(0x807BD5B8, &lit_4117); /* 807BD5BC-807BD5C0 000050 0004+00 0/1 0/0 0/0 .rodata @4118 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4118 = 1.5f; -COMPILER_STRIP_GATE(807BD5BC, &lit_4118); +COMPILER_STRIP_GATE(0x807BD5BC, &lit_4118); #pragma pop /* 807BD5C0-807BD5C4 000054 0004+00 0/1 0/0 0/0 .rodata @4119 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4119 = 4.0f / 5.0f; -COMPILER_STRIP_GATE(807BD5C0, &lit_4119); +COMPILER_STRIP_GATE(0x807BD5C0, &lit_4119); #pragma pop /* 807BD5D0-807BD5D8 000000 0006+02 1/1 0/0 0/0 .data e_id$3988 */ @@ -472,6 +472,14 @@ static bool daE_TK_BALL_IsDelete(e_tk_ball_class* param_0) { return true; } +/* ############################################################################################## */ +/* 807BD5C4-807BD5C4 000058 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_807BD5C4 = "E_tk"; +SECTION_DEAD static char const* const stringBase_807BD5C9 = "E_tk2"; +#pragma pop + /* 807BD0C8-807BD13C 001148 0074+00 1/0 0/0 0/0 .text daE_TK_BALL_Delete__FP15e_tk_ball_class */ #pragma push #pragma optimization_level 0 @@ -576,10 +584,4 @@ asm cM3dGAab::~cM3dGAab() { } #pragma pop -/* 807BD5C4-807BD5CF 000058 000B+00 3/3 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_807BD5C4 = "E_tk"; -SECTION_DEAD static char const* const stringBase_807BD5C9 = "E_tk2"; -#pragma pop +/* 807BD5C4-807BD5C4 000058 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/e/d_a_e_tt/d_a_e_tt.cpp b/rel/d/a/e/d_a_e_tt/d_a_e_tt.cpp index 6cb07f33d69..ba1d43a9086 100644 --- a/rel/d/a/e/d_a_e_tt/d_a_e_tt.cpp +++ b/rel/d/a/e/d_a_e_tt/d_a_e_tt.cpp @@ -23,16 +23,16 @@ struct mDoMtx_stack_c { static u8 now[48]; }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; - struct J3DAnmTransform {}; +struct J3DModelData {}; + +struct Z2Creature {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -67,10 +67,10 @@ struct daPy_py_c { static u8 m_midnaActor[4]; }; -struct J3DJoint {}; - struct J3DModel {}; +struct J3DJoint {}; + struct daE_TT_c { /* 807BD7EC */ void ctrlJoint(J3DJoint*, J3DModel*); /* 807BD8E0 */ void JointCallBack(J3DJoint*, int); @@ -490,7 +490,7 @@ extern "C" void __register_global_object(); /* ############################################################################################## */ /* 807C1FB8-807C1FBC 000000 0004+00 19/19 0/0 0/0 .rodata @3908 */ SECTION_RODATA static f32 const lit_3908 = 100.0f; -COMPILER_STRIP_GATE(807C1FB8, &lit_3908); +COMPILER_STRIP_GATE(0x807C1FB8, &lit_3908); /* 807C1FBC-807C1FC0 000004 0004+00 1/17 0/0 0/0 .rodata @3909 */ SECTION_RODATA static u8 const lit_3909[4] = { @@ -499,7 +499,7 @@ SECTION_RODATA static u8 const lit_3909[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(807C1FBC, &lit_3909); +COMPILER_STRIP_GATE(0x807C1FBC, &lit_3909); /* 807C1FC0-807C1FC8 000008 0004+04 3/13 0/0 0/0 .rodata @3910 */ SECTION_RODATA static f32 const lit_3910[1 + 1 /* padding */] = { @@ -507,7 +507,7 @@ SECTION_RODATA static f32 const lit_3910[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(807C1FC0, &lit_3910); +COMPILER_STRIP_GATE(0x807C1FC0, &lit_3910); /* 807C1FC8-807C1FD0 000010 0008+00 0/5 0/0 0/0 .rodata @3911 */ #pragma push @@ -515,7 +515,7 @@ COMPILER_STRIP_GATE(807C1FC0, &lit_3910); SECTION_RODATA static u8 const lit_3911[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(807C1FC8, &lit_3911); +COMPILER_STRIP_GATE(0x807C1FC8, &lit_3911); #pragma pop /* 807C1FD0-807C1FD8 000018 0008+00 0/5 0/0 0/0 .rodata @3912 */ @@ -524,7 +524,7 @@ COMPILER_STRIP_GATE(807C1FC8, &lit_3911); SECTION_RODATA static u8 const lit_3912[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(807C1FD0, &lit_3912); +COMPILER_STRIP_GATE(0x807C1FD0, &lit_3912); #pragma pop /* 807C1FD8-807C1FE0 000020 0008+00 0/5 0/0 0/0 .rodata @3913 */ @@ -533,39 +533,39 @@ COMPILER_STRIP_GATE(807C1FD0, &lit_3912); SECTION_RODATA static u8 const lit_3913[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(807C1FD8, &lit_3913); +COMPILER_STRIP_GATE(0x807C1FD8, &lit_3913); #pragma pop /* 807C1FE0-807C1FE4 000028 0004+00 0/1 0/0 0/0 .rodata @3914 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3914 = 1.0f / 100.0f; -COMPILER_STRIP_GATE(807C1FE0, &lit_3914); +COMPILER_STRIP_GATE(0x807C1FE0, &lit_3914); #pragma pop /* 807C1FE4-807C1FE8 00002C 0004+00 2/3 0/0 0/0 .rodata @3929 */ SECTION_RODATA static f32 const lit_3929 = 3.0f / 5.0f; -COMPILER_STRIP_GATE(807C1FE4, &lit_3929); +COMPILER_STRIP_GATE(0x807C1FE4, &lit_3929); /* 807C1FE8-807C1FEC 000030 0004+00 0/1 0/0 0/0 .rodata @3930 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3930 = 1300.0f; -COMPILER_STRIP_GATE(807C1FE8, &lit_3930); +COMPILER_STRIP_GATE(0x807C1FE8, &lit_3930); #pragma pop /* 807C1FEC-807C1FF0 000034 0004+00 0/1 0/0 0/0 .rodata @3931 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3931 = 400.0f; -COMPILER_STRIP_GATE(807C1FEC, &lit_3931); +COMPILER_STRIP_GATE(0x807C1FEC, &lit_3931); #pragma pop /* 807C1FF0-807C1FF4 000038 0004+00 0/1 0/0 0/0 .rodata @3932 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3932 = 8192.0f; -COMPILER_STRIP_GATE(807C1FF0, &lit_3932); +COMPILER_STRIP_GATE(0x807C1FF0, &lit_3932); #pragma pop /* 807C20C8-807C20D4 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ @@ -878,7 +878,7 @@ asm void daE_TT_c::JointCallBack(J3DJoint* param_0, int param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4017 = 700.0f; -COMPILER_STRIP_GATE(807C1FF4, &lit_4017); +COMPILER_STRIP_GATE(0x807C1FF4, &lit_4017); #pragma pop /* 807BD92C-807BDAC0 00026C 0194+00 1/1 0/0 0/0 .text draw__8daE_TT_cFv */ @@ -904,7 +904,13 @@ static asm void daE_TT_Draw(daE_TT_c* param_0) { /* ############################################################################################## */ /* 807C1FF8-807C1FFC 000040 0004+00 1/1 0/0 0/0 .rodata @4031 */ SECTION_RODATA static f32 const lit_4031 = -1.0f; -COMPILER_STRIP_GATE(807C1FF8, &lit_4031); +COMPILER_STRIP_GATE(0x807C1FF8, &lit_4031); + +/* 807C20B0-807C20B0 0000F8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_807C20B0 = "E_TT"; +#pragma pop /* 807BDAE0-807BDB84 000420 00A4+00 7/7 0/0 0/0 .text setBck__8daE_TT_cFiUcff */ #pragma push @@ -921,14 +927,14 @@ asm void daE_TT_c::setBck(int param_0, u8 param_1, f32 param_2, f32 param_3) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4041 = 10.0f; -COMPILER_STRIP_GATE(807C1FFC, &lit_4041); +COMPILER_STRIP_GATE(0x807C1FFC, &lit_4041); #pragma pop /* 807C2000-807C2004 000048 0004+00 0/2 0/0 0/0 .rodata @4042 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4042 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(807C2000, &lit_4042); +COMPILER_STRIP_GATE(0x807C2000, &lit_4042); #pragma pop /* 807BDB84-807BDBE4 0004C4 0060+00 4/4 0/0 0/0 .text calcHitGroundSpeed__8daE_TT_cFv */ @@ -1078,14 +1084,14 @@ asm void daE_TT_c::damage_check() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4145 = 500.0f; -COMPILER_STRIP_GATE(807C2004, &lit_4145); +COMPILER_STRIP_GATE(0x807C2004, &lit_4145); #pragma pop /* 807C2008-807C200C 000050 0004+00 0/1 0/0 0/0 .rodata @4146 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4146 = -1000000000.0f; -COMPILER_STRIP_GATE(807C2008, &lit_4146); +COMPILER_STRIP_GATE(0x807C2008, &lit_4146); #pragma pop /* 807BDE5C-807BDF60 00079C 0104+00 1/1 0/0 0/0 .text checkWaterSurface__8daE_TT_cFv */ @@ -1103,49 +1109,49 @@ asm void daE_TT_c::checkWaterSurface() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4258 = 0.75f; -COMPILER_STRIP_GATE(807C200C, &lit_4258); +COMPILER_STRIP_GATE(0x807C200C, &lit_4258); #pragma pop /* 807C2010-807C2014 000058 0004+00 0/3 0/0 0/0 .rodata @4259 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4259 = -20.0f; -COMPILER_STRIP_GATE(807C2010, &lit_4259); +COMPILER_STRIP_GATE(0x807C2010, &lit_4259); #pragma pop /* 807C2014-807C2018 00005C 0004+00 0/1 0/0 0/0 .rodata @4260 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4260 = 90.0f; -COMPILER_STRIP_GATE(807C2014, &lit_4260); +COMPILER_STRIP_GATE(0x807C2014, &lit_4260); #pragma pop /* 807C2018-807C201C 000060 0004+00 0/3 0/0 0/0 .rodata @4261 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4261 = 30.0f; -COMPILER_STRIP_GATE(807C2018, &lit_4261); +COMPILER_STRIP_GATE(0x807C2018, &lit_4261); #pragma pop /* 807C201C-807C2020 000064 0004+00 0/2 0/0 0/0 .rodata @4262 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4262 = 50.0f; -COMPILER_STRIP_GATE(807C201C, &lit_4262); +COMPILER_STRIP_GATE(0x807C201C, &lit_4262); #pragma pop /* 807C2020-807C2024 000068 0004+00 0/3 0/0 0/0 .rodata @4263 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4263 = 40.0f; -COMPILER_STRIP_GATE(807C2020, &lit_4263); +COMPILER_STRIP_GATE(0x807C2020, &lit_4263); #pragma pop /* 807C2024-807C2028 00006C 0004+00 0/3 0/0 0/0 .rodata @4264 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4264 = -10.0f; -COMPILER_STRIP_GATE(807C2024, &lit_4264); +COMPILER_STRIP_GATE(0x807C2024, &lit_4264); #pragma pop /* 807C2408-807C2418 000070 000C+04 0/1 0/0 0/0 .bss @4154 */ @@ -1173,7 +1179,7 @@ asm void daE_TT_c::checkFootGround() { /* ############################################################################################## */ /* 807C2028-807C202C 000070 0004+00 1/2 0/0 0/0 .rodata @4297 */ SECTION_RODATA static f32 const lit_4297 = 6.0f / 5.0f; -COMPILER_STRIP_GATE(807C2028, &lit_4297); +COMPILER_STRIP_GATE(0x807C2028, &lit_4297); /* 807C2424-807C2434 00008C 000C+04 0/1 0/0 0/0 .bss @4269 */ #pragma push @@ -1202,14 +1208,14 @@ asm void daE_TT_c::setBodyLandEffect() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4394 = 120.0f; -COMPILER_STRIP_GATE(807C202C, &lit_4394); +COMPILER_STRIP_GATE(0x807C202C, &lit_4394); #pragma pop /* 807C2030-807C2034 000078 0004+00 0/4 0/0 0/0 .rodata @4395 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4395 = 20.0f; -COMPILER_STRIP_GATE(807C2030, &lit_4395); +COMPILER_STRIP_GATE(0x807C2030, &lit_4395); #pragma pop /* 807C2440-807C2450 0000A8 000C+04 0/1 0/0 0/0 .bss @4302 */ @@ -1285,7 +1291,7 @@ asm void daE_TT_c::setDeathFootEffect() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4633 = 300.0f; -COMPILER_STRIP_GATE(807C2034, &lit_4633); +COMPILER_STRIP_GATE(0x807C2034, &lit_4633); #pragma pop /* 807BEBAC-807BED70 0014EC 01C4+00 5/5 0/0 0/0 .text checkPlayerSearch__8daE_TT_cFv */ @@ -1303,35 +1309,35 @@ asm void daE_TT_c::checkPlayerSearch() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4790 = -5.0f; -COMPILER_STRIP_GATE(807C2038, &lit_4790); +COMPILER_STRIP_GATE(0x807C2038, &lit_4790); #pragma pop /* 807C203C-807C2040 000084 0004+00 0/7 0/0 0/0 .rodata @4791 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4791 = 3.0f; -COMPILER_STRIP_GATE(807C203C, &lit_4791); +COMPILER_STRIP_GATE(0x807C203C, &lit_4791); #pragma pop /* 807C2040-807C2044 000088 0004+00 0/2 0/0 0/0 .rodata @4792 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4792 = 200.0f; -COMPILER_STRIP_GATE(807C2040, &lit_4792); +COMPILER_STRIP_GATE(0x807C2040, &lit_4792); #pragma pop /* 807C2044-807C2048 00008C 0004+00 0/1 0/0 0/0 .rodata @4793 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4793 = 3.0f / 10.0f; -COMPILER_STRIP_GATE(807C2044, &lit_4793); +COMPILER_STRIP_GATE(0x807C2044, &lit_4793); #pragma pop /* 807C2048-807C204C 000090 0004+00 0/1 0/0 0/0 .rodata @4794 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4794 = 12288.0f; -COMPILER_STRIP_GATE(807C2048, &lit_4794); +COMPILER_STRIP_GATE(0x807C2048, &lit_4794); #pragma pop /* 807BED70-807BF358 0016B0 05E8+00 2/1 0/0 0/0 .text executeWait__8daE_TT_cFv */ @@ -1349,32 +1355,32 @@ asm void daE_TT_c::executeWait() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4795 = 4.0f; -COMPILER_STRIP_GATE(807C204C, &lit_4795); +COMPILER_STRIP_GATE(0x807C204C, &lit_4795); #pragma pop /* 807C2050-807C2054 000098 0004+00 1/1 0/0 0/0 .rodata @4796 */ SECTION_RODATA static f32 const lit_4796 = 15.0f; -COMPILER_STRIP_GATE(807C2050, &lit_4796); +COMPILER_STRIP_GATE(0x807C2050, &lit_4796); /* 807C2054-807C2058 00009C 0004+00 0/1 0/0 0/0 .rodata @4797 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4797 = 35.0f; -COMPILER_STRIP_GATE(807C2054, &lit_4797); +COMPILER_STRIP_GATE(0x807C2054, &lit_4797); #pragma pop /* 807C2058-807C205C 0000A0 0004+00 0/1 0/0 0/0 .rodata @4798 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4798 = 5.0f; -COMPILER_STRIP_GATE(807C2058, &lit_4798); +COMPILER_STRIP_GATE(0x807C2058, &lit_4798); #pragma pop /* 807C205C-807C2060 0000A4 0004+00 0/1 0/0 0/0 .rodata @4799 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4799 = 1.5f; -COMPILER_STRIP_GATE(807C205C, &lit_4799); +COMPILER_STRIP_GATE(0x807C205C, &lit_4799); #pragma pop /* 807C2060-807C2068 0000A8 0004+04 0/0 0/0 0/0 .rodata @4940 */ @@ -1385,7 +1391,7 @@ SECTION_RODATA static f32 const lit_4940[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(807C2060, &lit_4940); +COMPILER_STRIP_GATE(0x807C2060, &lit_4940); #pragma pop /* 807C2068-807C2070 0000B0 0008+00 0/3 0/0 0/0 .rodata @4943 */ @@ -1394,7 +1400,7 @@ COMPILER_STRIP_GATE(807C2060, &lit_4940); SECTION_RODATA static u8 const lit_4943[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(807C2068, &lit_4943); +COMPILER_STRIP_GATE(0x807C2068, &lit_4943); #pragma pop /* 807BF358-807BF914 001C98 05BC+00 2/1 0/0 0/0 .text executeChase__8daE_TT_cFv */ @@ -1412,21 +1418,21 @@ asm void daE_TT_c::executeChase() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5054 = 85.0f; -COMPILER_STRIP_GATE(807C2070, &lit_5054); +COMPILER_STRIP_GATE(0x807C2070, &lit_5054); #pragma pop /* 807C2074-807C2078 0000BC 0004+00 0/1 0/0 0/0 .rodata @5055 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5055 = 17.0f; -COMPILER_STRIP_GATE(807C2074, &lit_5055); +COMPILER_STRIP_GATE(0x807C2074, &lit_5055); #pragma pop /* 807C2078-807C207C 0000C0 0004+00 0/1 0/0 0/0 .rodata @5056 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5056 = -3.0f; -COMPILER_STRIP_GATE(807C2078, &lit_5056); +COMPILER_STRIP_GATE(0x807C2078, &lit_5056); #pragma pop /* 807BF914-807BFD38 002254 0424+00 1/1 0/0 0/0 .text executeAttack__8daE_TT_cFv */ @@ -1464,21 +1470,21 @@ asm void daE_TT_c::executeDamage() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5103 = 2.0f; -COMPILER_STRIP_GATE(807C207C, &lit_5103); +COMPILER_STRIP_GATE(0x807C207C, &lit_5103); #pragma pop /* 807C2080-807C2084 0000C8 0004+00 0/1 0/0 0/0 .rodata @5178 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5178 = 18.0f; -COMPILER_STRIP_GATE(807C2080, &lit_5178); +COMPILER_STRIP_GATE(0x807C2080, &lit_5178); #pragma pop /* 807C2084-807C2088 0000CC 0004+00 0/1 0/0 0/0 .rodata @5179 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5179 = 2.0f / 5.0f; -COMPILER_STRIP_GATE(807C2084, &lit_5179); +COMPILER_STRIP_GATE(0x807C2084, &lit_5179); #pragma pop /* 807BFFF4-807C033C 002934 0348+00 1/1 0/0 0/0 .text executeDeath__8daE_TT_cFv */ @@ -1496,7 +1502,7 @@ asm void daE_TT_c::executeDeath() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5218 = 2000.0f; -COMPILER_STRIP_GATE(807C2088, &lit_5218); +COMPILER_STRIP_GATE(0x807C2088, &lit_5218); #pragma pop /* 807C033C-807C0530 002C7C 01F4+00 1/1 0/0 0/0 .text executeOutRange__8daE_TT_cFv */ @@ -1534,26 +1540,26 @@ asm void daE_TT_c::action() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5447 = 65.0f; -COMPILER_STRIP_GATE(807C208C, &lit_5447); +COMPILER_STRIP_GATE(0x807C208C, &lit_5447); #pragma pop /* 807C2090-807C2094 0000D8 0004+00 0/0 0/0 0/0 .rodata @5448 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5448 = 13.0f; -COMPILER_STRIP_GATE(807C2090, &lit_5448); +COMPILER_STRIP_GATE(0x807C2090, &lit_5448); #pragma pop /* 807C2094-807C2098 0000DC 0004+00 0/1 0/0 0/0 .rodata @5449 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5449 = 80.0f; -COMPILER_STRIP_GATE(807C2094, &lit_5449); +COMPILER_STRIP_GATE(0x807C2094, &lit_5449); #pragma pop /* 807C2098-807C209C 0000E0 0004+00 1/1 0/0 0/0 .rodata @5507 */ SECTION_RODATA static f32 const lit_5507 = 3000.0f; -COMPILER_STRIP_GATE(807C2098, &lit_5507); +COMPILER_STRIP_GATE(0x807C2098, &lit_5507); /* 807C0E10-807C0EE8 003750 00D8+00 2/2 0/0 0/0 .text mtx_set__8daE_TT_cFi */ #pragma push @@ -1570,7 +1576,7 @@ asm void daE_TT_c::mtx_set(int param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5546 = 55.0f; -COMPILER_STRIP_GATE(807C209C, &lit_5546); +COMPILER_STRIP_GATE(0x807C209C, &lit_5546); #pragma pop /* 807C0EE8-807C1024 003828 013C+00 1/1 0/0 0/0 .text cc_set__8daE_TT_cFv */ @@ -1657,7 +1663,7 @@ SECTION_RODATA static f32 const lit_5789[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(807C20A0, &lit_5789); +COMPILER_STRIP_GATE(0x807C20A0, &lit_5789); #pragma pop /* 807C20A8-807C20B0 0000F0 0008+00 0/1 0/0 0/0 .rodata @5791 */ @@ -1666,7 +1672,15 @@ COMPILER_STRIP_GATE(807C20A0, &lit_5789); SECTION_RODATA static u8 const lit_5791[8] = { 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(807C20A8, &lit_5791); +COMPILER_STRIP_GATE(0x807C20A8, &lit_5791); +#pragma pop + +/* 807C20B0-807C20B0 0000F8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_807C20B5 = "E_TTR"; +SECTION_DEAD static char const* const stringBase_807C20BB = "E_TTB"; +SECTION_DEAD static char const* const stringBase_807C20C1 = "E_tt"; #pragma pop /* 807C13B4-807C17FC 003CF4 0448+00 1/1 0/0 0/0 .text create__8daE_TT_cFv */ @@ -1781,7 +1795,7 @@ asm void __sinit_d_a_e_tt_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_807C1AF0 = (void*)__sinit_d_a_e_tt_cpp; +REGISTER_CTORS(0x807C1AF0, __sinit_d_a_e_tt_cpp); #pragma pop /* 807C1B2C-807C1B34 00446C 0008+00 1/0 0/0 0/0 .text @20@__dt__14dBgS_ObjGndChkFv */ @@ -2028,12 +2042,4 @@ static u8 data_807C24F0[4]; static u8 data_807C24F4[4]; #pragma pop -/* 807C20B0-807C20C6 0000F8 0016+00 4/4 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_807C20B0 = "E_TT"; -SECTION_DEAD static char const* const stringBase_807C20B5 = "E_TTR"; -SECTION_DEAD static char const* const stringBase_807C20BB = "E_TTB"; -SECTION_DEAD static char const* const stringBase_807C20C1 = "E_tt"; -#pragma pop +/* 807C20B0-807C20B0 0000F8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/e/d_a_e_vt/d_a_e_vt.cpp b/rel/d/a/e/d_a_e_vt/d_a_e_vt.cpp index 98bf296a73a..8b432c096e7 100644 --- a/rel/d/a/e/d_a_e_vt/d_a_e_vt.cpp +++ b/rel/d/a/e/d_a_e_vt/d_a_e_vt.cpp @@ -60,16 +60,16 @@ struct mDoExt_baseAnm { /* 8000D428 */ void play(); }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; - struct J3DAnmTransform {}; +struct J3DModelData {}; + +struct Z2Creature {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -86,11 +86,11 @@ struct mDoExt_3DlineMatSortPacket { /* 80014738 */ void setMat(mDoExt_3DlineMat_c*); }; -struct dKy_tevstr_c {}; +struct ResTIMG {}; struct _GXColor {}; -struct ResTIMG {}; +struct dKy_tevstr_c {}; struct mDoExt_3DlineMat1_c { /* 80013360 */ void init(u16, u16, ResTIMG*, int); @@ -710,7 +710,7 @@ extern "C" void __register_global_object(); /* ############################################################################################## */ /* 807CECA8-807CECAC 000000 0004+00 36/36 0/0 0/0 .rodata @3907 */ SECTION_RODATA static f32 const lit_3907 = 100.0f; -COMPILER_STRIP_GATE(807CECA8, &lit_3907); +COMPILER_STRIP_GATE(0x807CECA8, &lit_3907); /* 807CECAC-807CECB0 000004 0004+00 4/36 0/0 0/0 .rodata @3908 */ SECTION_RODATA static u8 const lit_3908[4] = { @@ -719,7 +719,7 @@ SECTION_RODATA static u8 const lit_3908[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(807CECAC, &lit_3908); +COMPILER_STRIP_GATE(0x807CECAC, &lit_3908); /* 807CECB0-807CECB8 000008 0004+04 11/34 0/0 0/0 .rodata @3909 */ SECTION_RODATA static f32 const lit_3909[1 + 1 /* padding */] = { @@ -727,7 +727,7 @@ SECTION_RODATA static f32 const lit_3909[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(807CECB0, &lit_3909); +COMPILER_STRIP_GATE(0x807CECB0, &lit_3909); /* 807CECB8-807CECC0 000010 0008+00 0/3 0/0 0/0 .rodata @3910 */ #pragma push @@ -735,7 +735,7 @@ COMPILER_STRIP_GATE(807CECB0, &lit_3909); SECTION_RODATA static u8 const lit_3910[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(807CECB8, &lit_3910); +COMPILER_STRIP_GATE(0x807CECB8, &lit_3910); #pragma pop /* 807CECC0-807CECC8 000018 0008+00 0/3 0/0 0/0 .rodata @3911 */ @@ -744,7 +744,7 @@ COMPILER_STRIP_GATE(807CECB8, &lit_3910); SECTION_RODATA static u8 const lit_3911[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(807CECC0, &lit_3911); +COMPILER_STRIP_GATE(0x807CECC0, &lit_3911); #pragma pop /* 807CECC8-807CECD0 000020 0008+00 0/3 0/0 0/0 .rodata @3912 */ @@ -753,102 +753,102 @@ COMPILER_STRIP_GATE(807CECC0, &lit_3911); SECTION_RODATA static u8 const lit_3912[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(807CECC8, &lit_3912); +COMPILER_STRIP_GATE(0x807CECC8, &lit_3912); #pragma pop /* 807CECD0-807CECD4 000028 0004+00 0/2 0/0 0/0 .rodata @3913 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3913 = 1.0f / 100.0f; -COMPILER_STRIP_GATE(807CECD0, &lit_3913); +COMPILER_STRIP_GATE(0x807CECD0, &lit_3913); #pragma pop /* 807CECD4-807CECD8 00002C 0004+00 0/1 0/0 0/0 .rodata @3928 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3928 = 6.0f / 5.0f; -COMPILER_STRIP_GATE(807CECD4, &lit_3928); +COMPILER_STRIP_GATE(0x807CECD4, &lit_3928); #pragma pop /* 807CECD8-807CECDC 000030 0004+00 0/3 0/0 0/0 .rodata @3929 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3929 = 500.0f; -COMPILER_STRIP_GATE(807CECD8, &lit_3929); +COMPILER_STRIP_GATE(0x807CECD8, &lit_3929); #pragma pop /* 807CECDC-807CECE0 000034 0004+00 0/1 0/0 0/0 .rodata @3930 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3930 = 7.0f; -COMPILER_STRIP_GATE(807CECDC, &lit_3930); +COMPILER_STRIP_GATE(0x807CECDC, &lit_3930); #pragma pop /* 807CECE0-807CECE4 000038 0004+00 0/1 0/0 0/0 .rodata @3931 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3931 = 2500.0f; -COMPILER_STRIP_GATE(807CECE0, &lit_3931); +COMPILER_STRIP_GATE(0x807CECE0, &lit_3931); #pragma pop /* 807CECE4-807CECE8 00003C 0004+00 0/3 0/0 0/0 .rodata @3932 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3932 = 1000.0f; -COMPILER_STRIP_GATE(807CECE4, &lit_3932); +COMPILER_STRIP_GATE(0x807CECE4, &lit_3932); #pragma pop /* 807CECE8-807CECEC 000040 0004+00 0/1 0/0 0/0 .rodata @3933 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3933 = 800.0f; -COMPILER_STRIP_GATE(807CECE8, &lit_3933); +COMPILER_STRIP_GATE(0x807CECE8, &lit_3933); #pragma pop /* 807CECEC-807CECF0 000044 0004+00 1/3 0/0 0/0 .rodata @3934 */ SECTION_RODATA static f32 const lit_3934 = 0.5f; -COMPILER_STRIP_GATE(807CECEC, &lit_3934); +COMPILER_STRIP_GATE(0x807CECEC, &lit_3934); /* 807CECF0-807CECF4 000048 0004+00 0/16 0/0 0/0 .rodata @3935 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3935 = 3.0f; -COMPILER_STRIP_GATE(807CECF0, &lit_3935); +COMPILER_STRIP_GATE(0x807CECF0, &lit_3935); #pragma pop /* 807CECF4-807CECF8 00004C 0004+00 0/2 0/0 0/0 .rodata @3936 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3936 = -50.0f; -COMPILER_STRIP_GATE(807CECF4, &lit_3936); +COMPILER_STRIP_GATE(0x807CECF4, &lit_3936); #pragma pop /* 807CECF8-807CECFC 000050 0004+00 0/6 0/0 0/0 .rodata @3937 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3937 = 40.0f; -COMPILER_STRIP_GATE(807CECF8, &lit_3937); +COMPILER_STRIP_GATE(0x807CECF8, &lit_3937); #pragma pop /* 807CECFC-807CED00 000054 0004+00 0/1 0/0 0/0 .rodata @3938 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3938 = 35.0f; -COMPILER_STRIP_GATE(807CECFC, &lit_3938); +COMPILER_STRIP_GATE(0x807CECFC, &lit_3938); #pragma pop /* 807CED00-807CED04 000058 0004+00 0/1 0/0 0/0 .rodata @3939 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3939 = 82.0f; -COMPILER_STRIP_GATE(807CED00, &lit_3939); +COMPILER_STRIP_GATE(0x807CED00, &lit_3939); #pragma pop /* 807CED04-807CED08 00005C 0004+00 0/2 0/0 0/0 .rodata @3940 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3940 = 210.0f; -COMPILER_STRIP_GATE(807CED04, &lit_3940); +COMPILER_STRIP_GATE(0x807CED04, &lit_3940); #pragma pop /* 807CEF08-807CEF14 000000 000C+00 3/3 0/0 0/0 .data cNullVec__6Z2Calc */ @@ -1509,57 +1509,57 @@ asm void daE_VA_c::calcJointNeck() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4314 = 74.0f; -COMPILER_STRIP_GATE(807CED08, &lit_4314); +COMPILER_STRIP_GATE(0x807CED08, &lit_4314); #pragma pop /* 807CED0C-807CED10 000064 0004+00 0/2 0/0 0/0 .rodata @4315 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4315 = 11.0f; -COMPILER_STRIP_GATE(807CED0C, &lit_4315); +COMPILER_STRIP_GATE(0x807CED0C, &lit_4315); #pragma pop /* 807CED10-807CED14 000068 0004+00 1/4 0/0 0/0 .rodata @4316 */ SECTION_RODATA static f32 const lit_4316 = 60.0f; -COMPILER_STRIP_GATE(807CED10, &lit_4316); +COMPILER_STRIP_GATE(0x807CED10, &lit_4316); /* 807CED14-807CED18 00006C 0004+00 0/3 0/0 0/0 .rodata @4317 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4317 = 80.0f; -COMPILER_STRIP_GATE(807CED14, &lit_4317); +COMPILER_STRIP_GATE(0x807CED14, &lit_4317); #pragma pop /* 807CED18-807CED1C 000070 0004+00 1/7 0/0 0/0 .rodata @4318 */ SECTION_RODATA static f32 const lit_4318 = 50.0f; -COMPILER_STRIP_GATE(807CED18, &lit_4318); +COMPILER_STRIP_GATE(0x807CED18, &lit_4318); /* 807CED1C-807CED20 000074 0004+00 0/7 0/0 0/0 .rodata @4319 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4319 = 30.0f; -COMPILER_STRIP_GATE(807CED1C, &lit_4319); +COMPILER_STRIP_GATE(0x807CED1C, &lit_4319); #pragma pop /* 807CED20-807CED24 000078 0004+00 0/1 0/0 0/0 .rodata @4320 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4320 = 4.0f / 5.0f; -COMPILER_STRIP_GATE(807CED20, &lit_4320); +COMPILER_STRIP_GATE(0x807CED20, &lit_4320); #pragma pop /* 807CED24-807CED28 00007C 0004+00 0/5 0/0 0/0 .rodata @4321 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4321 = -10.0f; -COMPILER_STRIP_GATE(807CED24, &lit_4321); +COMPILER_STRIP_GATE(0x807CED24, &lit_4321); #pragma pop /* 807CED28-807CED2C 000080 0004+00 0/5 0/0 0/0 .rodata @4322 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4322 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(807CED28, &lit_4322); +COMPILER_STRIP_GATE(0x807CED28, &lit_4322); #pragma pop /* 807C2A4C-807C3264 00054C 0818+00 1/1 0/0 0/0 .text calcJointSleeve__8daE_VA_cFv */ @@ -1577,21 +1577,21 @@ asm void daE_VA_c::calcJointSleeve() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4452 = 255.0f; -COMPILER_STRIP_GATE(807CED2C, &lit_4452); +COMPILER_STRIP_GATE(0x807CED2C, &lit_4452); #pragma pop /* 807CED30-807CED34 000088 0004+00 0/1 0/0 0/0 .rodata @4453 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4453 = 2.0f / 5.0f; -COMPILER_STRIP_GATE(807CED30, &lit_4453); +COMPILER_STRIP_GATE(0x807CED30, &lit_4453); #pragma pop /* 807CED34-807CED38 00008C 0004+00 0/2 0/0 0/0 .rodata @4454 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4454 = 2000.0f; -COMPILER_STRIP_GATE(807CED34, &lit_4454); +COMPILER_STRIP_GATE(0x807CED34, &lit_4454); #pragma pop /* 807CED38-807CED40 000090 0008+00 0/1 0/0 0/0 .rodata @4458 */ @@ -1600,7 +1600,7 @@ COMPILER_STRIP_GATE(807CED34, &lit_4454); SECTION_RODATA static u8 const lit_4458[8] = { 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(807CED38, &lit_4458); +COMPILER_STRIP_GATE(0x807CED38, &lit_4458); #pragma pop /* 807C3264-807C37F8 000D64 0594+00 1/1 0/0 0/0 .text draw__8daE_VA_cFv */ @@ -1626,7 +1626,13 @@ static asm void daE_VA_Draw(daE_VA_c* param_0) { /* ############################################################################################## */ /* 807CED40-807CED44 000098 0004+00 1/3 0/0 0/0 .rodata @4473 */ SECTION_RODATA static f32 const lit_4473 = -1.0f; -COMPILER_STRIP_GATE(807CED40, &lit_4473); +COMPILER_STRIP_GATE(0x807CED40, &lit_4473); + +/* 807CEEFC-807CEEFC 000254 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_807CEEFC = "E_VA"; +#pragma pop /* 807C3818-807C38BC 001318 00A4+00 19/19 0/0 0/0 .text setBck__8daE_VA_cFiUcff */ #pragma push @@ -1773,12 +1779,12 @@ asm void daE_VA_c::setFireEffect(int param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5085 = 16.0f / 5.0f; -COMPILER_STRIP_GATE(807CED44, &lit_5085); +COMPILER_STRIP_GATE(0x807CED44, &lit_5085); #pragma pop /* 807CED48-807CED4C 0000A0 0004+00 1/12 0/0 0/0 .rodata @5146 */ SECTION_RODATA static f32 const lit_5146 = 10.0f; -COMPILER_STRIP_GATE(807CED48, &lit_5146); +COMPILER_STRIP_GATE(0x807CED48, &lit_5146); /* 807C49B4-807C4B54 0024B4 01A0+00 1/1 0/0 0/0 .text setFootEffect__8daE_VA_cFv */ #pragma push @@ -1795,7 +1801,7 @@ asm void daE_VA_c::setFootEffect() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5224 = -7.0f; -COMPILER_STRIP_GATE(807CED4C, &lit_5224); +COMPILER_STRIP_GATE(0x807CED4C, &lit_5224); #pragma pop /* 807C4B54-807C4DFC 002654 02A8+00 1/1 0/0 0/0 .text setWeponEffect__8daE_VA_cFv */ @@ -1891,11 +1897,11 @@ asm void daE_VA_c::DemoSkipCallBack(void* param_0, int param_1) { /* ############################################################################################## */ /* 807CED50-807CED54 0000A8 0004+00 1/1 0/0 0/0 .rodata @5407 */ SECTION_RODATA static f32 const lit_5407 = 115.0f; -COMPILER_STRIP_GATE(807CED50, &lit_5407); +COMPILER_STRIP_GATE(0x807CED50, &lit_5407); /* 807CED54-807CED58 0000AC 0004+00 1/2 0/0 0/0 .rodata @5408 */ SECTION_RODATA static f32 const lit_5408 = 65.0f; -COMPILER_STRIP_GATE(807CED54, &lit_5408); +COMPILER_STRIP_GATE(0x807CED54, &lit_5408); /* 807C53DC-807C53FC 002EDC 0020+00 2/2 0/0 0/0 .text getRopeLength__8daE_VA_cFi */ #pragma push @@ -1912,56 +1918,56 @@ asm void daE_VA_c::getRopeLength(int param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5833 = 150.0f; -COMPILER_STRIP_GATE(807CED58, &lit_5833); +COMPILER_STRIP_GATE(0x807CED58, &lit_5833); #pragma pop /* 807CED5C-807CED60 0000B4 0004+00 0/2 0/0 0/0 .rodata @5834 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5834 = -150.0f; -COMPILER_STRIP_GATE(807CED5C, &lit_5834); +COMPILER_STRIP_GATE(0x807CED5C, &lit_5834); #pragma pop /* 807CED60-807CED64 0000B8 0004+00 0/2 0/0 0/0 .rodata @5835 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5835 = 400.0f; -COMPILER_STRIP_GATE(807CED60, &lit_5835); +COMPILER_STRIP_GATE(0x807CED60, &lit_5835); #pragma pop /* 807CED64-807CED68 0000BC 0004+00 0/2 0/0 0/0 .rodata @5836 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5836 = -400.0f; -COMPILER_STRIP_GATE(807CED64, &lit_5836); +COMPILER_STRIP_GATE(0x807CED64, &lit_5836); #pragma pop /* 807CED68-807CED6C 0000C0 0004+00 0/4 0/0 0/0 .rodata @5837 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5837 = -5.0f; -COMPILER_STRIP_GATE(807CED68, &lit_5837); +COMPILER_STRIP_GATE(0x807CED68, &lit_5837); #pragma pop /* 807CED6C-807CED70 0000C4 0004+00 0/4 0/0 0/0 .rodata @5838 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5838 = 5.0f; -COMPILER_STRIP_GATE(807CED6C, &lit_5838); +COMPILER_STRIP_GATE(0x807CED6C, &lit_5838); #pragma pop /* 807CED70-807CED74 0000C8 0004+00 0/2 0/0 0/0 .rodata @5839 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5839 = -3.0f; -COMPILER_STRIP_GATE(807CED70, &lit_5839); +COMPILER_STRIP_GATE(0x807CED70, &lit_5839); #pragma pop /* 807CED74-807CED78 0000CC 0004+00 0/4 0/0 0/0 .rodata @5840 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5840 = 300.0f; -COMPILER_STRIP_GATE(807CED74, &lit_5840); +COMPILER_STRIP_GATE(0x807CED74, &lit_5840); #pragma pop /* 807CED78-807CED80 0000D0 0004+04 0/1 0/0 0/0 .rodata @5841 */ @@ -1972,14 +1978,14 @@ SECTION_RODATA static f32 const lit_5841[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(807CED78, &lit_5841); +COMPILER_STRIP_GATE(0x807CED78, &lit_5841); #pragma pop /* 807CED80-807CED88 0000D8 0008+00 3/10 0/0 0/0 .rodata @5843 */ SECTION_RODATA static u8 const lit_5843[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(807CED80, &lit_5843); +COMPILER_STRIP_GATE(0x807CED80, &lit_5843); /* 807CF504-807CF510 000094 000C+00 0/1 0/0 0/0 .bss @5409 */ #pragma push @@ -2130,7 +2136,7 @@ asm void daE_VA_c::onRopeCutStatus(int param_0, int param_1, int param_2) { /* ############################################################################################## */ /* 807CED88-807CED8C 0000E0 0004+00 1/1 0/0 0/0 .rodata @5877 */ SECTION_RODATA static f32 const lit_5877 = 7168.0f; -COMPILER_STRIP_GATE(807CED88, &lit_5877); +COMPILER_STRIP_GATE(0x807CED88, &lit_5877); /* 807C5DF4-807C5EAC 0038F4 00B8+00 1/1 0/0 0/0 .text setVibRope__8daE_VA_cFff */ #pragma push @@ -2145,11 +2151,11 @@ asm void daE_VA_c::setVibRope(f32 param_0, f32 param_1) { /* ############################################################################################## */ /* 807CED8C-807CED90 0000E4 0004+00 1/1 0/0 0/0 .rodata @5913 */ SECTION_RODATA static f32 const lit_5913 = 39.0f / 10.0f; -COMPILER_STRIP_GATE(807CED8C, &lit_5913); +COMPILER_STRIP_GATE(0x807CED8C, &lit_5913); /* 807CED90-807CED94 0000E8 0004+00 1/1 0/0 0/0 .rodata @5914 */ SECTION_RODATA static f32 const lit_5914 = 4.0f; -COMPILER_STRIP_GATE(807CED90, &lit_5914); +COMPILER_STRIP_GATE(0x807CED90, &lit_5914); /* 807C5EAC-807C6164 0039AC 02B8+00 2/2 0/0 0/0 .text setVibTag__8daE_VA_cFii */ #pragma push @@ -2166,7 +2172,7 @@ asm void daE_VA_c::setVibTag(int param_0, int param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5960 = 160.0f; -COMPILER_STRIP_GATE(807CED94, &lit_5960); +COMPILER_STRIP_GATE(0x807CED94, &lit_5960); #pragma pop /* 807C6164-807C638C 003C64 0228+00 2/2 0/0 0/0 .text calcTagAngle__8daE_VA_cFv */ @@ -2194,21 +2200,21 @@ asm void daE_VA_c::calcRopeFirePos() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6069 = 110.0f; -COMPILER_STRIP_GATE(807CED98, &lit_6069); +COMPILER_STRIP_GATE(0x807CED98, &lit_6069); #pragma pop /* 807CED9C-807CEDA0 0000F4 0004+00 0/1 0/0 0/0 .rodata @6070 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6070 = 275.0f; -COMPILER_STRIP_GATE(807CED9C, &lit_6070); +COMPILER_STRIP_GATE(0x807CED9C, &lit_6070); #pragma pop /* 807CEDA0-807CEDA4 0000F8 0004+00 0/1 0/0 0/0 .rodata @6071 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6071 = 51.0f; -COMPILER_STRIP_GATE(807CEDA0, &lit_6071); +COMPILER_STRIP_GATE(0x807CEDA0, &lit_6071); #pragma pop /* 807C6564-807C67A4 004064 0240+00 1/1 0/0 0/0 .text executeDemoOpWait__8daE_VA_cFv */ @@ -2226,35 +2232,35 @@ asm void daE_VA_c::executeDemoOpWait() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6345 = 270.0f; -COMPILER_STRIP_GATE(807CEDA4, &lit_6345); +COMPILER_STRIP_GATE(0x807CEDA4, &lit_6345); #pragma pop /* 807CEDA8-807CEDAC 000100 0004+00 0/2 0/0 0/0 .rodata @6346 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6346 = 600.0f; -COMPILER_STRIP_GATE(807CEDA8, &lit_6346); +COMPILER_STRIP_GATE(0x807CEDA8, &lit_6346); #pragma pop /* 807CEDAC-807CEDB0 000104 0004+00 0/1 0/0 0/0 .rodata @6347 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6347 = 180.0f; -COMPILER_STRIP_GATE(807CEDAC, &lit_6347); +COMPILER_STRIP_GATE(0x807CEDAC, &lit_6347); #pragma pop /* 807CEDB0-807CEDB4 000108 0004+00 0/4 0/0 0/0 .rodata @6348 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6348 = 200.0f; -COMPILER_STRIP_GATE(807CEDB0, &lit_6348); +COMPILER_STRIP_GATE(0x807CEDB0, &lit_6348); #pragma pop /* 807CEDB4-807CEDB8 00010C 0004+00 0/1 0/0 0/0 .rodata @6349 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6349 = 2.5f; -COMPILER_STRIP_GATE(807CEDB4, &lit_6349); +COMPILER_STRIP_GATE(0x807CEDB4, &lit_6349); #pragma pop /* 807C67A4-807C7534 0042A4 0D90+00 2/1 0/0 0/0 .text executeDemoOp__8daE_VA_cFv */ @@ -2272,154 +2278,154 @@ asm void daE_VA_c::executeDemoOp() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6350 = 90.0f; -COMPILER_STRIP_GATE(807CEDB8, &lit_6350); +COMPILER_STRIP_GATE(0x807CEDB8, &lit_6350); #pragma pop /* 807CEDBC-807CEDC0 000114 0004+00 0/0 0/0 0/0 .rodata @6351 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6351 = -100.0f; -COMPILER_STRIP_GATE(807CEDBC, &lit_6351); +COMPILER_STRIP_GATE(0x807CEDBC, &lit_6351); #pragma pop /* 807CEDC0-807CEDC4 000118 0004+00 0/0 0/0 0/0 .rodata @6352 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6352 = 48.0f; -COMPILER_STRIP_GATE(807CEDC0, &lit_6352); +COMPILER_STRIP_GATE(0x807CEDC0, &lit_6352); #pragma pop /* 807CEDC4-807CEDC8 00011C 0004+00 0/0 0/0 0/0 .rodata @6353 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6353 = 13.0f / 10.0f; -COMPILER_STRIP_GATE(807CEDC4, &lit_6353); +COMPILER_STRIP_GATE(0x807CEDC4, &lit_6353); #pragma pop /* 807CEDC8-807CEDCC 000120 0004+00 0/0 0/0 0/0 .rodata @6354 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6354 = 459.0f; -COMPILER_STRIP_GATE(807CEDC8, &lit_6354); +COMPILER_STRIP_GATE(0x807CEDC8, &lit_6354); #pragma pop /* 807CEDCC-807CEDD0 000124 0004+00 0/0 0/0 0/0 .rodata @6355 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6355 = 394.0f; -COMPILER_STRIP_GATE(807CEDCC, &lit_6355); +COMPILER_STRIP_GATE(0x807CEDCC, &lit_6355); #pragma pop /* 807CEDD0-807CEDD4 000128 0004+00 0/0 0/0 0/0 .rodata @6356 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6356 = 920.0f; -COMPILER_STRIP_GATE(807CEDD0, &lit_6356); +COMPILER_STRIP_GATE(0x807CEDD0, &lit_6356); #pragma pop /* 807CEDD4-807CEDD8 00012C 0004+00 0/0 0/0 0/0 .rodata @6357 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6357 = 259.0f; -COMPILER_STRIP_GATE(807CEDD4, &lit_6357); +COMPILER_STRIP_GATE(0x807CEDD4, &lit_6357); #pragma pop /* 807CEDD8-807CEDDC 000130 0004+00 0/0 0/0 0/0 .rodata @6358 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6358 = 519.0f; -COMPILER_STRIP_GATE(807CEDD8, &lit_6358); +COMPILER_STRIP_GATE(0x807CEDD8, &lit_6358); #pragma pop /* 807CEDDC-807CEDE0 000134 0004+00 0/0 0/0 0/0 .rodata @6359 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6359 = 380.0f; -COMPILER_STRIP_GATE(807CEDDC, &lit_6359); +COMPILER_STRIP_GATE(0x807CEDDC, &lit_6359); #pragma pop /* 807CEDE0-807CEDE4 000138 0004+00 0/2 0/0 0/0 .rodata @6360 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6360 = 2.0f; -COMPILER_STRIP_GATE(807CEDE0, &lit_6360); +COMPILER_STRIP_GATE(0x807CEDE0, &lit_6360); #pragma pop /* 807CEDE4-807CEDE8 00013C 0004+00 0/0 0/0 0/0 .rodata @6361 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6361 = 28.0f; -COMPILER_STRIP_GATE(807CEDE4, &lit_6361); +COMPILER_STRIP_GATE(0x807CEDE4, &lit_6361); #pragma pop /* 807CEDE8-807CEDEC 000140 0004+00 0/1 0/0 0/0 .rodata @6362 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6362 = 950.0f; -COMPILER_STRIP_GATE(807CEDE8, &lit_6362); +COMPILER_STRIP_GATE(0x807CEDE8, &lit_6362); #pragma pop /* 807CEDEC-807CEDF0 000144 0004+00 0/0 0/0 0/0 .rodata @6363 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6363 = 550.0f; -COMPILER_STRIP_GATE(807CEDEC, &lit_6363); +COMPILER_STRIP_GATE(0x807CEDEC, &lit_6363); #pragma pop /* 807CEDF0-807CEDF4 000148 0004+00 0/2 0/0 0/0 .rodata @6364 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6364 = 15.0f; -COMPILER_STRIP_GATE(807CEDF0, &lit_6364); +COMPILER_STRIP_GATE(0x807CEDF0, &lit_6364); #pragma pop /* 807CEDF4-807CEDF8 00014C 0004+00 0/1 0/0 0/0 .rodata @6365 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6365 = 26.0f; -COMPILER_STRIP_GATE(807CEDF4, &lit_6365); +COMPILER_STRIP_GATE(0x807CEDF4, &lit_6365); #pragma pop /* 807CEDF8-807CEDFC 000150 0004+00 0/0 0/0 0/0 .rodata @6366 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6366 = 187.0f; -COMPILER_STRIP_GATE(807CEDF8, &lit_6366); +COMPILER_STRIP_GATE(0x807CEDF8, &lit_6366); #pragma pop /* 807CEDFC-807CEE00 000154 0004+00 0/0 0/0 0/0 .rodata @6367 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6367 = 236.0f; -COMPILER_STRIP_GATE(807CEDFC, &lit_6367); +COMPILER_STRIP_GATE(0x807CEDFC, &lit_6367); #pragma pop /* 807CEE00-807CEE04 000158 0004+00 0/0 0/0 0/0 .rodata @6368 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6368 = 21.0f / 5.0f; -COMPILER_STRIP_GATE(807CEE00, &lit_6368); +COMPILER_STRIP_GATE(0x807CEE00, &lit_6368); #pragma pop /* 807CEE04-807CEE08 00015C 0004+00 0/0 0/0 0/0 .rodata @6369 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6369 = 192.0f; -COMPILER_STRIP_GATE(807CEE04, &lit_6369); +COMPILER_STRIP_GATE(0x807CEE04, &lit_6369); #pragma pop /* 807CEE08-807CEE0C 000160 0004+00 0/0 0/0 0/0 .rodata @6370 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6370 = 67.0f; -COMPILER_STRIP_GATE(807CEE08, &lit_6370); +COMPILER_STRIP_GATE(0x807CEE08, &lit_6370); #pragma pop /* 807CEE0C-807CEE10 000164 0004+00 0/8 0/0 0/0 .rodata @6394 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6394 = 20.0f; -COMPILER_STRIP_GATE(807CEE0C, &lit_6394); +COMPILER_STRIP_GATE(0x807CEE0C, &lit_6394); #pragma pop /* 807C7534-807C7640 005034 010C+00 1/1 0/0 0/0 .text executeClearWait__8daE_VA_cFv */ @@ -2447,28 +2453,28 @@ asm void daE_VA_c::executeClearChase() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6485 = 32.0f; -COMPILER_STRIP_GATE(807CEE10, &lit_6485); +COMPILER_STRIP_GATE(0x807CEE10, &lit_6485); #pragma pop /* 807CEE14-807CEE18 00016C 0004+00 0/1 0/0 0/0 .rodata @6486 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6486 = 36.0f; -COMPILER_STRIP_GATE(807CEE14, &lit_6486); +COMPILER_STRIP_GATE(0x807CEE14, &lit_6486); #pragma pop /* 807CEE18-807CEE1C 000170 0004+00 0/1 0/0 0/0 .rodata @6487 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6487 = 43.0f; -COMPILER_STRIP_GATE(807CEE18, &lit_6487); +COMPILER_STRIP_GATE(0x807CEE18, &lit_6487); #pragma pop /* 807CEE1C-807CEE20 000174 0004+00 0/1 0/0 0/0 .rodata @6488 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6488 = 85.0f; -COMPILER_STRIP_GATE(807CEE1C, &lit_6488); +COMPILER_STRIP_GATE(0x807CEE1C, &lit_6488); #pragma pop /* 807C783C-807C7A8C 00533C 0250+00 1/1 0/0 0/0 .text executeClearAttack__8daE_VA_cFv */ @@ -2506,21 +2512,21 @@ asm void daE_VA_c::executeTransChase() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6686 = 22.0f; -COMPILER_STRIP_GATE(807CEE20, &lit_6686); +COMPILER_STRIP_GATE(0x807CEE20, &lit_6686); #pragma pop /* 807CEE24-807CEE28 00017C 0004+00 0/2 0/0 0/0 .rodata @6687 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6687 = 33.0f; -COMPILER_STRIP_GATE(807CEE24, &lit_6687); +COMPILER_STRIP_GATE(0x807CEE24, &lit_6687); #pragma pop /* 807CEE28-807CEE2C 000180 0004+00 0/2 0/0 0/0 .rodata @6688 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6688 = 53.0f; -COMPILER_STRIP_GATE(807CEE28, &lit_6688); +COMPILER_STRIP_GATE(0x807CEE28, &lit_6688); #pragma pop /* 807C7ED4-807C839C 0059D4 04C8+00 1/1 0/0 0/0 .text executeTransAttack__8daE_VA_cFv */ @@ -2589,70 +2595,70 @@ asm void daE_VA_c::executeOpaciFly() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6999 = 291.0f; -COMPILER_STRIP_GATE(807CEE2C, &lit_6999); +COMPILER_STRIP_GATE(0x807CEE2C, &lit_6999); #pragma pop /* 807CEE30-807CEE34 000188 0004+00 0/0 0/0 0/0 .rodata @7000 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7000 = 201.0f; -COMPILER_STRIP_GATE(807CEE30, &lit_7000); +COMPILER_STRIP_GATE(0x807CEE30, &lit_7000); #pragma pop /* 807CEE34-807CEE38 00018C 0004+00 0/0 0/0 0/0 .rodata @7001 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7001 = 700.0f; -COMPILER_STRIP_GATE(807CEE34, &lit_7001); +COMPILER_STRIP_GATE(0x807CEE34, &lit_7001); #pragma pop /* 807CEE38-807CEE3C 000190 0004+00 0/2 0/0 0/0 .rodata @7002 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7002 = 70.0f; -COMPILER_STRIP_GATE(807CEE38, &lit_7002); +COMPILER_STRIP_GATE(0x807CEE38, &lit_7002); #pragma pop /* 807CEE3C-807CEE40 000194 0004+00 0/0 0/0 0/0 .rodata @7003 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7003 = 6.0f; -COMPILER_STRIP_GATE(807CEE3C, &lit_7003); +COMPILER_STRIP_GATE(0x807CEE3C, &lit_7003); #pragma pop /* 807CEE40-807CEE44 000198 0004+00 0/1 0/0 0/0 .rodata @7004 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7004 = 120.0f; -COMPILER_STRIP_GATE(807CEE40, &lit_7004); +COMPILER_STRIP_GATE(0x807CEE40, &lit_7004); #pragma pop /* 807CEE44-807CEE48 00019C 0004+00 0/0 0/0 0/0 .rodata @7240 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7240 = 42.0f; -COMPILER_STRIP_GATE(807CEE44, &lit_7240); +COMPILER_STRIP_GATE(0x807CEE44, &lit_7240); #pragma pop /* 807CEE48-807CEE4C 0001A0 0004+00 0/0 0/0 0/0 .rodata @7241 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7241 = 62.0f; -COMPILER_STRIP_GATE(807CEE48, &lit_7241); +COMPILER_STRIP_GATE(0x807CEE48, &lit_7241); #pragma pop /* 807CEE4C-807CEE50 0001A4 0004+00 0/0 0/0 0/0 .rodata @7242 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7242 = 47.0f; -COMPILER_STRIP_GATE(807CEE4C, &lit_7242); +COMPILER_STRIP_GATE(0x807CEE4C, &lit_7242); #pragma pop /* 807CEE50-807CEE54 0001A8 0004+00 0/3 0/0 0/0 .rodata @7291 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7291 = -30.0f; -COMPILER_STRIP_GATE(807CEE50, &lit_7291); +COMPILER_STRIP_GATE(0x807CEE50, &lit_7291); #pragma pop /* 807C9A40-807C9C8C 007540 024C+00 1/1 0/0 0/0 .text executeOpaciDamage__8daE_VA_cFv */ @@ -2670,21 +2676,21 @@ asm void daE_VA_c::executeOpaciDamage() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7421 = 16384.0f; -COMPILER_STRIP_GATE(807CEE54, &lit_7421); +COMPILER_STRIP_GATE(0x807CEE54, &lit_7421); #pragma pop /* 807CEE58-807CEE5C 0001B0 0004+00 0/3 0/0 0/0 .rodata @7422 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7422 = 25.0f; -COMPILER_STRIP_GATE(807CEE58, &lit_7422); +COMPILER_STRIP_GATE(0x807CEE58, &lit_7422); #pragma pop /* 807CEE5C-807CEE60 0001B4 0004+00 0/1 0/0 0/0 .rodata @7423 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7423 = -40.0f; -COMPILER_STRIP_GATE(807CEE5C, &lit_7423); +COMPILER_STRIP_GATE(0x807CEE5C, &lit_7423); #pragma pop /* 807C9C8C-807CA364 00778C 06D8+00 1/1 0/0 0/0 .text executeOpaciChase__8daE_VA_cFv */ @@ -2702,28 +2708,28 @@ asm void daE_VA_c::executeOpaciChase() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7424 = 1200.0f; -COMPILER_STRIP_GATE(807CEE60, &lit_7424); +COMPILER_STRIP_GATE(0x807CEE60, &lit_7424); #pragma pop /* 807CEE64-807CEE68 0001BC 0004+00 0/1 0/0 0/0 .rodata @7509 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7509 = 27.0f; -COMPILER_STRIP_GATE(807CEE64, &lit_7509); +COMPILER_STRIP_GATE(0x807CEE64, &lit_7509); #pragma pop /* 807CEE68-807CEE6C 0001C0 0004+00 0/1 0/0 0/0 .rodata @7510 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7510 = 16.0f; -COMPILER_STRIP_GATE(807CEE68, &lit_7510); +COMPILER_STRIP_GATE(0x807CEE68, &lit_7510); #pragma pop /* 807CEE6C-807CEE70 0001C4 0004+00 0/1 0/0 0/0 .rodata @7511 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7511 = 12.0f; -COMPILER_STRIP_GATE(807CEE6C, &lit_7511); +COMPILER_STRIP_GATE(0x807CEE6C, &lit_7511); #pragma pop /* 807CA364-807CA73C 007E64 03D8+00 1/1 0/0 0/0 .text executeOpaciAttack__8daE_VA_cFv */ @@ -2783,28 +2789,28 @@ asm void daE_VA_c::executeOpaciFadeAway() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7919 = 350.0f; -COMPILER_STRIP_GATE(807CEE70, &lit_7919); +COMPILER_STRIP_GATE(0x807CEE70, &lit_7919); #pragma pop /* 807CEE74-807CEE78 0001CC 0004+00 0/1 0/0 0/0 .rodata @7920 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7920 = -54.0f; -COMPILER_STRIP_GATE(807CEE74, &lit_7920); +COMPILER_STRIP_GATE(0x807CEE74, &lit_7920); #pragma pop /* 807CEE78-807CEE7C 0001D0 0004+00 0/1 0/0 0/0 .rodata @7921 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7921 = 168.0f; -COMPILER_STRIP_GATE(807CEE78, &lit_7921); +COMPILER_STRIP_GATE(0x807CEE78, &lit_7921); #pragma pop /* 807CEE7C-807CEE80 0001D4 0004+00 0/1 0/0 0/0 .rodata @7922 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7922 = 207.0f; -COMPILER_STRIP_GATE(807CEE7C, &lit_7922); +COMPILER_STRIP_GATE(0x807CEE7C, &lit_7922); #pragma pop /* 807CB1C4-807CB8CC 008CC4 0708+00 2/1 0/0 0/0 .text executeOpaciDeath__8daE_VA_cFv */ @@ -2822,14 +2828,14 @@ asm void daE_VA_c::executeOpaciDeath() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7923 = 155.0f; -COMPILER_STRIP_GATE(807CEE80, &lit_7923); +COMPILER_STRIP_GATE(0x807CEE80, &lit_7923); #pragma pop /* 807CEE84-807CEE88 0001DC 0004+00 0/1 0/0 0/0 .rodata @8008 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8008 = 320.0f; -COMPILER_STRIP_GATE(807CEE84, &lit_8008); +COMPILER_STRIP_GATE(0x807CEE84, &lit_8008); #pragma pop /* 807CB8CC-807CBC00 0093CC 0334+00 1/1 0/0 0/0 .text calcMagicMove__8daE_VA_cFv */ @@ -2847,7 +2853,7 @@ asm void daE_VA_c::calcMagicMove() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8089 = 128.0f; -COMPILER_STRIP_GATE(807CEE88, &lit_8089); +COMPILER_STRIP_GATE(0x807CEE88, &lit_8089); #pragma pop /* 807CBC00-807CC004 009700 0404+00 1/1 0/0 0/0 .text setAlphaType__8daE_VA_cFv */ @@ -2875,7 +2881,7 @@ asm void daE_VA_c::action() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8318 = -300.0f; -COMPILER_STRIP_GATE(807CEE8C, &lit_8318); +COMPILER_STRIP_GATE(0x807CEE8C, &lit_8318); #pragma pop /* 807CC4D0-807CC864 009FD0 0394+00 1/1 0/0 0/0 .text mtx_set__8daE_VA_cFv */ @@ -2893,21 +2899,21 @@ asm void daE_VA_c::mtx_set() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8471 = -20.0f; -COMPILER_STRIP_GATE(807CEE90, &lit_8471); +COMPILER_STRIP_GATE(0x807CEE90, &lit_8471); #pragma pop /* 807CEE94-807CEE98 0001EC 0004+00 0/1 0/0 0/0 .rodata @8472 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8472 = 75.0f; -COMPILER_STRIP_GATE(807CEE94, &lit_8472); +COMPILER_STRIP_GATE(0x807CEE94, &lit_8472); #pragma pop /* 807CEE98-807CEE9C 0001F0 0004+00 0/1 0/0 0/0 .rodata @8473 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8473 = -25.0f; -COMPILER_STRIP_GATE(807CEE98, &lit_8473); +COMPILER_STRIP_GATE(0x807CEE98, &lit_8473); #pragma pop /* 807CC864-807CCD24 00A364 04C0+00 1/1 0/0 0/0 .text cc_set__8daE_VA_cFv */ @@ -3000,14 +3006,20 @@ static asm void useHeapInit(fopAc_ac_c* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8890 = -500.0f; -COMPILER_STRIP_GATE(807CEE9C, &lit_8890); +COMPILER_STRIP_GATE(0x807CEE9C, &lit_8890); #pragma pop /* 807CEEA0-807CEEA4 0001F8 0004+00 0/1 0/0 0/0 .rodata @8891 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8891 = 1850.0f; -COMPILER_STRIP_GATE(807CEEA0, &lit_8891); +COMPILER_STRIP_GATE(0x807CEEA0, &lit_8891); +#pragma pop + +/* 807CEEFC-807CEEFC 000254 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_807CEF01 = "E_va"; #pragma pop /* 807CD668-807CDAD8 00B168 0470+00 1/1 0/0 0/0 .text create__8daE_VA_cFv */ @@ -3155,154 +3167,154 @@ asm daE_VA_HIO_c::~daE_VA_HIO_c() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9204 = 990.0f; -COMPILER_STRIP_GATE(807CEEA4, &lit_9204); +COMPILER_STRIP_GATE(0x807CEEA4, &lit_9204); #pragma pop /* 807CEEA8-807CEEAC 000200 0004+00 0/1 0/0 0/0 .rodata @9205 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9205 = 971.0f; -COMPILER_STRIP_GATE(807CEEA8, &lit_9205); +COMPILER_STRIP_GATE(0x807CEEA8, &lit_9205); #pragma pop /* 807CEEAC-807CEEB0 000204 0004+00 0/1 0/0 0/0 .rodata @9206 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9206 = 326.0f; -COMPILER_STRIP_GATE(807CEEAC, &lit_9206); +COMPILER_STRIP_GATE(0x807CEEAC, &lit_9206); #pragma pop /* 807CEEB0-807CEEB4 000208 0004+00 0/1 0/0 0/0 .rodata @9207 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9207 = 582.0f; -COMPILER_STRIP_GATE(807CEEB0, &lit_9207); +COMPILER_STRIP_GATE(0x807CEEB0, &lit_9207); #pragma pop /* 807CEEB4-807CEEB8 00020C 0004+00 0/1 0/0 0/0 .rodata @9208 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9208 = -801.0f; -COMPILER_STRIP_GATE(807CEEB4, &lit_9208); +COMPILER_STRIP_GATE(0x807CEEB4, &lit_9208); #pragma pop /* 807CEEB8-807CEEBC 000210 0004+00 0/1 0/0 0/0 .rodata @9209 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9209 = -582.0f; -COMPILER_STRIP_GATE(807CEEB8, &lit_9209); +COMPILER_STRIP_GATE(0x807CEEB8, &lit_9209); #pragma pop /* 807CEEBC-807CEEC0 000214 0004+00 0/1 0/0 0/0 .rodata @9210 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9210 = -942.0f; -COMPILER_STRIP_GATE(807CEEBC, &lit_9210); +COMPILER_STRIP_GATE(0x807CEEBC, &lit_9210); #pragma pop /* 807CEEC0-807CEEC4 000218 0004+00 0/1 0/0 0/0 .rodata @9211 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9211 = 306.0f; -COMPILER_STRIP_GATE(807CEEC0, &lit_9211); +COMPILER_STRIP_GATE(0x807CEEC0, &lit_9211); #pragma pop /* 807CEEC4-807CEEC8 00021C 0004+00 0/1 0/0 0/0 .rodata @9212 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9212 = 202.0f; -COMPILER_STRIP_GATE(807CEEC4, &lit_9212); +COMPILER_STRIP_GATE(0x807CEEC4, &lit_9212); #pragma pop /* 807CEEC8-807CEECC 000220 0004+00 0/1 0/0 0/0 .rodata @9213 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9213 = 501.0f; -COMPILER_STRIP_GATE(807CEEC8, &lit_9213); +COMPILER_STRIP_GATE(0x807CEEC8, &lit_9213); #pragma pop /* 807CEECC-807CEED0 000224 0004+00 0/1 0/0 0/0 .rodata @9214 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9214 = 559.0f; -COMPILER_STRIP_GATE(807CEECC, &lit_9214); +COMPILER_STRIP_GATE(0x807CEECC, &lit_9214); #pragma pop /* 807CEED0-807CEED4 000228 0004+00 0/1 0/0 0/0 .rodata @9215 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9215 = -17.0f; -COMPILER_STRIP_GATE(807CEED0, &lit_9215); +COMPILER_STRIP_GATE(0x807CEED0, &lit_9215); #pragma pop /* 807CEED4-807CEED8 00022C 0004+00 0/1 0/0 0/0 .rodata @9216 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9216 = 458.0f; -COMPILER_STRIP_GATE(807CEED4, &lit_9216); +COMPILER_STRIP_GATE(0x807CEED4, &lit_9216); #pragma pop /* 807CEED8-807CEEDC 000230 0004+00 0/1 0/0 0/0 .rodata @9217 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9217 = -306.0f; -COMPILER_STRIP_GATE(807CEED8, &lit_9217); +COMPILER_STRIP_GATE(0x807CEED8, &lit_9217); #pragma pop /* 807CEEDC-807CEEE0 000234 0004+00 0/1 0/0 0/0 .rodata @9218 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9218 = -131.0f; -COMPILER_STRIP_GATE(807CEEDC, &lit_9218); +COMPILER_STRIP_GATE(0x807CEEDC, &lit_9218); #pragma pop /* 807CEEE0-807CEEE4 000238 0004+00 0/1 0/0 0/0 .rodata @9219 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9219 = -524.0f; -COMPILER_STRIP_GATE(807CEEE0, &lit_9219); +COMPILER_STRIP_GATE(0x807CEEE0, &lit_9219); #pragma pop /* 807CEEE4-807CEEE8 00023C 0004+00 0/1 0/0 0/0 .rodata @9220 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9220 = -414.0f; -COMPILER_STRIP_GATE(807CEEE4, &lit_9220); +COMPILER_STRIP_GATE(0x807CEEE4, &lit_9220); #pragma pop /* 807CEEE8-807CEEEC 000240 0004+00 0/1 0/0 0/0 .rodata @9221 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9221 = 347.0f; -COMPILER_STRIP_GATE(807CEEE8, &lit_9221); +COMPILER_STRIP_GATE(0x807CEEE8, &lit_9221); #pragma pop /* 807CEEEC-807CEEF0 000244 0004+00 0/1 0/0 0/0 .rodata @9222 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9222 = -15.0f; -COMPILER_STRIP_GATE(807CEEEC, &lit_9222); +COMPILER_STRIP_GATE(0x807CEEEC, &lit_9222); #pragma pop /* 807CEEF0-807CEEF4 000248 0004+00 0/1 0/0 0/0 .rodata @9223 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9223 = 8.0f; -COMPILER_STRIP_GATE(807CEEF0, &lit_9223); +COMPILER_STRIP_GATE(0x807CEEF0, &lit_9223); #pragma pop /* 807CEEF4-807CEEF8 00024C 0004+00 0/1 0/0 0/0 .rodata @9224 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9224 = -8.0f; -COMPILER_STRIP_GATE(807CEEF4, &lit_9224); +COMPILER_STRIP_GATE(0x807CEEF4, &lit_9224); #pragma pop /* 807CEEF8-807CEEFC 000250 0004+00 0/1 0/0 0/0 .rodata @9225 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9225 = 23.0f; -COMPILER_STRIP_GATE(807CEEF8, &lit_9225); +COMPILER_STRIP_GATE(0x807CEEF8, &lit_9225); #pragma pop /* 807CE2F4-807CE7E0 00BDF4 04EC+00 0/0 1/0 0/0 .text __sinit_d_a_e_vt_cpp */ @@ -3317,7 +3329,7 @@ asm void __sinit_d_a_e_vt_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_807CE2F4 = (void*)__sinit_d_a_e_vt_cpp; +REGISTER_CTORS(0x807CE2F4, __sinit_d_a_e_vt_cpp); #pragma pop /* 807CE7E0-807CE7E8 00C2E0 0008+00 1/0 0/0 0/0 .text @36@__dt__12dBgS_ObjAcchFv */ @@ -3554,10 +3566,4 @@ static u8 data_807CF740[4]; static u8 data_807CF744[4]; #pragma pop -/* 807CEEFC-807CEF06 000254 000A+00 5/5 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_807CEEFC = "E_VA"; -SECTION_DEAD static char const* const stringBase_807CEF01 = "E_va"; -#pragma pop +/* 807CEEFC-807CEEFC 000254 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/e/d_a_e_warpappear/d_a_e_warpappear.cpp b/rel/d/a/e/d_a_e_warpappear/d_a_e_warpappear.cpp index 28e0ce492b9..e61c8a40f7e 100644 --- a/rel/d/a/e/d_a_e_warpappear/d_a_e_warpappear.cpp +++ b/rel/d/a/e/d_a_e_warpappear/d_a_e_warpappear.cpp @@ -90,10 +90,10 @@ struct dPa_levelEcallBack {}; struct dKy_tevstr_c {}; -struct _GXColor {}; - struct csXyz {}; +struct _GXColor {}; + struct dPa_control_c { /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, @@ -266,48 +266,48 @@ static asm void daE_Warpappear_Draw(e_warpappear_class* param_0) { /* ############################################################################################## */ /* 807D2088-807D208C 000000 0004+00 5/5 0/0 0/0 .rodata @3864 */ SECTION_RODATA static f32 const lit_3864 = -15336.0f; -COMPILER_STRIP_GATE(807D2088, &lit_3864); +COMPILER_STRIP_GATE(0x807D2088, &lit_3864); /* 807D208C-807D2090 000004 0004+00 0/1 0/0 0/0 .rodata @3865 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3865 = -671.0f; -COMPILER_STRIP_GATE(807D208C, &lit_3865); +COMPILER_STRIP_GATE(0x807D208C, &lit_3865); #pragma pop /* 807D2090-807D2094 000008 0004+00 0/1 0/0 0/0 .rodata @3866 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3866 = 40000.0f; -COMPILER_STRIP_GATE(807D2090, &lit_3866); +COMPILER_STRIP_GATE(0x807D2090, &lit_3866); #pragma pop /* 807D2094-807D2098 00000C 0004+00 0/1 0/0 0/0 .rodata @3867 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3867 = -16552.0f; -COMPILER_STRIP_GATE(807D2094, &lit_3867); +COMPILER_STRIP_GATE(0x807D2094, &lit_3867); #pragma pop /* 807D2098-807D209C 000010 0004+00 0/1 0/0 0/0 .rodata @3868 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3868 = -144.0f; -COMPILER_STRIP_GATE(807D2098, &lit_3868); +COMPILER_STRIP_GATE(0x807D2098, &lit_3868); #pragma pop /* 807D209C-807D20A0 000014 0004+00 0/1 0/0 0/0 .rodata @3869 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3869 = -14796.0f; -COMPILER_STRIP_GATE(807D209C, &lit_3869); +COMPILER_STRIP_GATE(0x807D209C, &lit_3869); #pragma pop /* 807D20A0-807D20A4 000018 0004+00 0/1 0/0 0/0 .rodata @3870 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3870 = 382.0f; -COMPILER_STRIP_GATE(807D20A0, &lit_3870); +COMPILER_STRIP_GATE(0x807D20A0, &lit_3870); #pragma pop /* 807D2378-807D2384 000000 000C+00 3/3 0/0 0/0 .bss master_ns */ @@ -326,11 +326,11 @@ static asm void s_s1_sub(void* param_0, void* param_1) { /* ############################################################################################## */ /* 807D20A4-807D20A8 00001C 0004+00 2/2 0/0 0/0 .rodata @3883 */ SECTION_RODATA static f32 const lit_3883 = 400.0f; -COMPILER_STRIP_GATE(807D20A4, &lit_3883); +COMPILER_STRIP_GATE(0x807D20A4, &lit_3883); /* 807D20A8-807D20AC 000020 0004+00 2/2 0/0 0/0 .rodata @3884 */ SECTION_RODATA static f32 const lit_3884 = 2.0f; -COMPILER_STRIP_GATE(807D20A8, &lit_3884); +COMPILER_STRIP_GATE(0x807D20A8, &lit_3884); /* 807CF9D0-807CFA74 000270 00A4+00 1/1 0/0 0/0 .text s_s1drop_sub__FPvPv */ #pragma push @@ -350,20 +350,20 @@ SECTION_RODATA static u8 const lit_3911[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(807D20AC, &lit_3911); +COMPILER_STRIP_GATE(0x807D20AC, &lit_3911); /* 807D20B0-807D20B4 000028 0004+00 0/1 0/0 0/0 .rodata @3912 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3912 = 50000.0f; -COMPILER_STRIP_GATE(807D20B0, &lit_3912); +COMPILER_STRIP_GATE(0x807D20B0, &lit_3912); #pragma pop /* 807D20B4-807D20B8 00002C 0004+00 0/1 0/0 0/0 .rodata @3913 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3913 = 3000.0f; -COMPILER_STRIP_GATE(807D20B4, &lit_3913); +COMPILER_STRIP_GATE(0x807D20B4, &lit_3913); #pragma pop /* 807D20B8-807D20C0 000030 0004+04 3/6 0/0 0/0 .rodata @3914 */ @@ -372,7 +372,7 @@ SECTION_RODATA static f32 const lit_3914[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(807D20B8, &lit_3914); +COMPILER_STRIP_GATE(0x807D20B8, &lit_3914); /* 807CFA74-807CFB78 000314 0104+00 1/1 0/0 0/0 .text s_s1riv_sub__FPvPv */ #pragma push @@ -439,7 +439,7 @@ static asm void s_s1Yangset_sub(void* param_0, void* param_1) { SECTION_RODATA static u8 const lit_4025[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(807D20C0, &lit_4025); +COMPILER_STRIP_GATE(0x807D20C0, &lit_4025); #pragma pop /* 807D20C8-807D20D0 000040 0008+00 0/1 0/0 0/0 .rodata @4026 */ @@ -448,7 +448,7 @@ COMPILER_STRIP_GATE(807D20C0, &lit_4025); SECTION_RODATA static u8 const lit_4026[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(807D20C8, &lit_4026); +COMPILER_STRIP_GATE(0x807D20C8, &lit_4026); #pragma pop /* 807D20D0-807D20D8 000048 0008+00 0/1 0/0 0/0 .rodata @4027 */ @@ -457,14 +457,14 @@ COMPILER_STRIP_GATE(807D20C8, &lit_4026); SECTION_RODATA static u8 const lit_4027[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(807D20D0, &lit_4027); +COMPILER_STRIP_GATE(0x807D20D0, &lit_4027); #pragma pop /* 807D20D8-807D20DC 000050 0004+00 0/1 0/0 0/0 .rodata @4028 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4028 = 2000.0f; -COMPILER_STRIP_GATE(807D20D8, &lit_4028); +COMPILER_STRIP_GATE(0x807D20D8, &lit_4028); #pragma pop /* 807CFDAC-807CFFD4 00064C 0228+00 1/1 0/0 0/0 .text s_s1start_sub__FPvPv */ @@ -482,28 +482,28 @@ static asm void s_s1start_sub(void* param_0, void* param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4114 = -15200.0f; -COMPILER_STRIP_GATE(807D20DC, &lit_4114); +COMPILER_STRIP_GATE(0x807D20DC, &lit_4114); #pragma pop /* 807D20E0-807D20E4 000058 0004+00 0/1 0/0 0/0 .rodata @4115 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4115 = -35.0f; -COMPILER_STRIP_GATE(807D20E0, &lit_4115); +COMPILER_STRIP_GATE(0x807D20E0, &lit_4115); #pragma pop /* 807D20E4-807D20E8 00005C 0004+00 0/1 0/0 0/0 .rodata @4116 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4116 = 950.0f; -COMPILER_STRIP_GATE(807D20E4, &lit_4116); +COMPILER_STRIP_GATE(0x807D20E4, &lit_4116); #pragma pop /* 807D20E8-807D20EC 000060 0004+00 0/2 0/0 0/0 .rodata @4117 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4117 = 1000.0f; -COMPILER_STRIP_GATE(807D20E8, &lit_4117); +COMPILER_STRIP_GATE(0x807D20E8, &lit_4117); #pragma pop /* 807CFFD4-807D032C 000874 0358+00 1/1 0/0 0/0 .text action__FP18e_warpappear_class */ @@ -521,56 +521,62 @@ static asm void action(e_warpappear_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4796 = 55.0f; -COMPILER_STRIP_GATE(807D20EC, &lit_4796); +COMPILER_STRIP_GATE(0x807D20EC, &lit_4796); #pragma pop /* 807D20F0-807D20F4 000068 0004+00 0/1 0/0 0/0 .rodata @4797 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4797 = 300.0f; -COMPILER_STRIP_GATE(807D20F0, &lit_4797); +COMPILER_STRIP_GATE(0x807D20F0, &lit_4797); #pragma pop /* 807D20F4-807D20F8 00006C 0004+00 0/1 0/0 0/0 .rodata @4798 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4798 = -15600.0f; -COMPILER_STRIP_GATE(807D20F4, &lit_4798); +COMPILER_STRIP_GATE(0x807D20F4, &lit_4798); #pragma pop /* 807D20F8-807D20FC 000070 0004+00 0/1 0/0 0/0 .rodata @4799 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4799 = -200.0f; -COMPILER_STRIP_GATE(807D20F8, &lit_4799); +COMPILER_STRIP_GATE(0x807D20F8, &lit_4799); #pragma pop /* 807D20FC-807D2100 000074 0004+00 0/1 0/0 0/0 .rodata @4800 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4800 = 200.0f; -COMPILER_STRIP_GATE(807D20FC, &lit_4800); +COMPILER_STRIP_GATE(0x807D20FC, &lit_4800); #pragma pop /* 807D2100-807D2104 000078 0004+00 0/1 0/0 0/0 .rodata @4801 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4801 = -500.0f; -COMPILER_STRIP_GATE(807D2100, &lit_4801); +COMPILER_STRIP_GATE(0x807D2100, &lit_4801); #pragma pop /* 807D2104-807D2108 00007C 0004+00 0/1 0/0 0/0 .rodata @4802 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4802 = -100.0f; -COMPILER_STRIP_GATE(807D2104, &lit_4802); +COMPILER_STRIP_GATE(0x807D2104, &lit_4802); #pragma pop /* 807D2108-807D210C 000080 0004+00 0/1 0/0 0/0 .rodata @4803 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4803 = 100.0f; -COMPILER_STRIP_GATE(807D2108, &lit_4803); +COMPILER_STRIP_GATE(0x807D2108, &lit_4803); +#pragma pop + +/* 807D2280-807D2280 0001F8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_807D2280 = "F_SP104"; #pragma pop /* 807D2290-807D22B8 000000 0028+00 1/1 0/0 0/0 .data w_id$4228 */ @@ -658,649 +664,649 @@ static asm void mtx_set(e_warpappear_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4804 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(807D210C, &lit_4804); +COMPILER_STRIP_GATE(0x807D210C, &lit_4804); #pragma pop /* 807D2110-807D2114 000088 0004+00 0/0 0/0 0/0 .rodata @4805 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4805 = 10.0f; -COMPILER_STRIP_GATE(807D2110, &lit_4805); +COMPILER_STRIP_GATE(0x807D2110, &lit_4805); #pragma pop /* 807D2114-807D2118 00008C 0004+00 0/0 0/0 0/0 .rodata @4806 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4806 = -1.0f; -COMPILER_STRIP_GATE(807D2114, &lit_4806); +COMPILER_STRIP_GATE(0x807D2114, &lit_4806); #pragma pop /* 807D2118-807D211C 000090 0004+00 0/0 0/0 0/0 .rodata @4807 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4807 = 70.0f; -COMPILER_STRIP_GATE(807D2118, &lit_4807); +COMPILER_STRIP_GATE(0x807D2118, &lit_4807); #pragma pop /* 807D211C-807D2120 000094 0004+00 0/0 0/0 0/0 .rodata @4808 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4808 = 1.0f / 20.0f; -COMPILER_STRIP_GATE(807D211C, &lit_4808); +COMPILER_STRIP_GATE(0x807D211C, &lit_4808); #pragma pop /* 807D2120-807D2124 000098 0004+00 0/0 0/0 0/0 .rodata @4809 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4809 = 2.0f / 25.0f; -COMPILER_STRIP_GATE(807D2120, &lit_4809); +COMPILER_STRIP_GATE(0x807D2120, &lit_4809); #pragma pop /* 807D2124-807D2128 00009C 0004+00 0/0 0/0 0/0 .rodata @4810 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4810 = -1000.0f; -COMPILER_STRIP_GATE(807D2124, &lit_4810); +COMPILER_STRIP_GATE(0x807D2124, &lit_4810); #pragma pop /* 807D2128-807D212C 0000A0 0004+00 0/0 0/0 0/0 .rodata @4811 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4811 = -1500.0f; -COMPILER_STRIP_GATE(807D2128, &lit_4811); +COMPILER_STRIP_GATE(0x807D2128, &lit_4811); #pragma pop /* 807D212C-807D2130 0000A4 0004+00 0/0 0/0 0/0 .rodata @4812 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4812 = -300.0f; -COMPILER_STRIP_GATE(807D212C, &lit_4812); +COMPILER_STRIP_GATE(0x807D212C, &lit_4812); #pragma pop /* 807D2130-807D2134 0000A8 0004+00 0/0 0/0 0/0 .rodata @4813 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4813 = -14654.0f; -COMPILER_STRIP_GATE(807D2130, &lit_4813); +COMPILER_STRIP_GATE(0x807D2130, &lit_4813); #pragma pop /* 807D2134-807D2138 0000AC 0004+00 0/0 0/0 0/0 .rodata @4814 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4814 = 13.0f; -COMPILER_STRIP_GATE(807D2134, &lit_4814); +COMPILER_STRIP_GATE(0x807D2134, &lit_4814); #pragma pop /* 807D2138-807D213C 0000B0 0004+00 0/0 0/0 0/0 .rodata @4815 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4815 = -1518.0f; -COMPILER_STRIP_GATE(807D2138, &lit_4815); +COMPILER_STRIP_GATE(0x807D2138, &lit_4815); #pragma pop /* 807D213C-807D2140 0000B4 0004+00 0/0 0/0 0/0 .rodata @4816 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4816 = -15595.0f; -COMPILER_STRIP_GATE(807D213C, &lit_4816); +COMPILER_STRIP_GATE(0x807D213C, &lit_4816); #pragma pop /* 807D2140-807D2144 0000B8 0004+00 0/0 0/0 0/0 .rodata @4817 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4817 = 140.0f; -COMPILER_STRIP_GATE(807D2140, &lit_4817); +COMPILER_STRIP_GATE(0x807D2140, &lit_4817); #pragma pop /* 807D2144-807D2148 0000BC 0004+00 0/0 0/0 0/0 .rodata @4818 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4818 = -335.0f; -COMPILER_STRIP_GATE(807D2144, &lit_4818); +COMPILER_STRIP_GATE(0x807D2144, &lit_4818); #pragma pop /* 807D2148-807D214C 0000C0 0004+00 0/0 0/0 0/0 .rodata @4819 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4819 = -14932.0f; -COMPILER_STRIP_GATE(807D2148, &lit_4819); +COMPILER_STRIP_GATE(0x807D2148, &lit_4819); #pragma pop /* 807D214C-807D2150 0000C4 0004+00 0/0 0/0 0/0 .rodata @4820 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4820 = -19.0f; -COMPILER_STRIP_GATE(807D214C, &lit_4820); +COMPILER_STRIP_GATE(0x807D214C, &lit_4820); #pragma pop /* 807D2150-807D2154 0000C8 0004+00 0/0 0/0 0/0 .rodata @4821 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4821 = -847.0f; -COMPILER_STRIP_GATE(807D2150, &lit_4821); +COMPILER_STRIP_GATE(0x807D2150, &lit_4821); #pragma pop /* 807D2154-807D2158 0000CC 0004+00 0/0 0/0 0/0 .rodata @4822 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4822 = -15806.0f; -COMPILER_STRIP_GATE(807D2154, &lit_4822); +COMPILER_STRIP_GATE(0x807D2154, &lit_4822); #pragma pop /* 807D2158-807D215C 0000D0 0004+00 0/0 0/0 0/0 .rodata @4823 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4823 = 92.0f; -COMPILER_STRIP_GATE(807D2158, &lit_4823); +COMPILER_STRIP_GATE(0x807D2158, &lit_4823); #pragma pop /* 807D215C-807D2160 0000D4 0004+00 0/0 0/0 0/0 .rodata @4824 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4824 = 385.0f; -COMPILER_STRIP_GATE(807D215C, &lit_4824); +COMPILER_STRIP_GATE(0x807D215C, &lit_4824); #pragma pop /* 807D2160-807D2164 0000D8 0004+00 0/0 0/0 0/0 .rodata @4825 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4825 = 4200.0f; -COMPILER_STRIP_GATE(807D2160, &lit_4825); +COMPILER_STRIP_GATE(0x807D2160, &lit_4825); #pragma pop /* 807D2164-807D2168 0000DC 0004+00 0/0 0/0 0/0 .rodata @4826 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4826 = 30.0f; -COMPILER_STRIP_GATE(807D2164, &lit_4826); +COMPILER_STRIP_GATE(0x807D2164, &lit_4826); #pragma pop /* 807D2168-807D216C 0000E0 0004+00 0/0 0/0 0/0 .rodata @4827 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4827 = 2.0f / 5.0f; -COMPILER_STRIP_GATE(807D2168, &lit_4827); +COMPILER_STRIP_GATE(0x807D2168, &lit_4827); #pragma pop /* 807D216C-807D2170 0000E4 0004+00 0/0 0/0 0/0 .rodata @4828 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4828 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(807D216C, &lit_4828); +COMPILER_STRIP_GATE(0x807D216C, &lit_4828); #pragma pop /* 807D2170-807D2174 0000E8 0004+00 0/0 0/0 0/0 .rodata @4829 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4829 = 0x3B03126F; -COMPILER_STRIP_GATE(807D2170, &lit_4829); +COMPILER_STRIP_GATE(0x807D2170, &lit_4829); #pragma pop /* 807D2174-807D2178 0000EC 0004+00 0/0 0/0 0/0 .rodata @4830 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4830 = -16437.0f; -COMPILER_STRIP_GATE(807D2174, &lit_4830); +COMPILER_STRIP_GATE(0x807D2174, &lit_4830); #pragma pop /* 807D2178-807D217C 0000F0 0004+00 0/0 0/0 0/0 .rodata @4831 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4831 = 251.0f; -COMPILER_STRIP_GATE(807D2178, &lit_4831); +COMPILER_STRIP_GATE(0x807D2178, &lit_4831); #pragma pop /* 807D217C-807D2180 0000F4 0004+00 0/0 0/0 0/0 .rodata @4832 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4832 = -605.0f; -COMPILER_STRIP_GATE(807D217C, &lit_4832); +COMPILER_STRIP_GATE(0x807D217C, &lit_4832); #pragma pop /* 807D2180-807D2184 0000F8 0004+00 0/0 0/0 0/0 .rodata @4833 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4833 = -15451.0f; -COMPILER_STRIP_GATE(807D2180, &lit_4833); +COMPILER_STRIP_GATE(0x807D2180, &lit_4833); #pragma pop /* 807D2184-807D2188 0000FC 0004+00 0/0 0/0 0/0 .rodata @4834 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4834 = 45.0f; -COMPILER_STRIP_GATE(807D2184, &lit_4834); +COMPILER_STRIP_GATE(0x807D2184, &lit_4834); #pragma pop /* 807D2188-807D218C 000100 0004+00 0/0 0/0 0/0 .rodata @4835 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4835 = 526.0f; -COMPILER_STRIP_GATE(807D2188, &lit_4835); +COMPILER_STRIP_GATE(0x807D2188, &lit_4835); #pragma pop /* 807D218C-807D2190 000104 0004+00 0/0 0/0 0/0 .rodata @4836 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4836 = -16531.0f; -COMPILER_STRIP_GATE(807D218C, &lit_4836); +COMPILER_STRIP_GATE(0x807D218C, &lit_4836); #pragma pop /* 807D2190-807D2194 000108 0004+00 0/0 0/0 0/0 .rodata @4837 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4837 = -511.0f; -COMPILER_STRIP_GATE(807D2190, &lit_4837); +COMPILER_STRIP_GATE(0x807D2190, &lit_4837); #pragma pop /* 807D2194-807D2198 00010C 0004+00 0/0 0/0 0/0 .rodata @4838 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4838 = -15454.0f; -COMPILER_STRIP_GATE(807D2194, &lit_4838); +COMPILER_STRIP_GATE(0x807D2194, &lit_4838); #pragma pop /* 807D2198-807D219C 000110 0004+00 0/0 0/0 0/0 .rodata @4839 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4839 = 501.0f; -COMPILER_STRIP_GATE(807D2198, &lit_4839); +COMPILER_STRIP_GATE(0x807D2198, &lit_4839); #pragma pop /* 807D219C-807D21A0 000114 0004+00 0/0 0/0 0/0 .rodata @4840 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4840 = 1.0f / 50.0f; -COMPILER_STRIP_GATE(807D219C, &lit_4840); +COMPILER_STRIP_GATE(0x807D219C, &lit_4840); #pragma pop /* 807D21A0-807D21A4 000118 0004+00 0/0 0/0 0/0 .rodata @4841 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4841 = 500.0f; -COMPILER_STRIP_GATE(807D21A0, &lit_4841); +COMPILER_STRIP_GATE(0x807D21A0, &lit_4841); #pragma pop /* 807D21A4-807D21A8 00011C 0004+00 0/0 0/0 0/0 .rodata @4842 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4842 = -120.0f; -COMPILER_STRIP_GATE(807D21A4, &lit_4842); +COMPILER_STRIP_GATE(0x807D21A4, &lit_4842); #pragma pop /* 807D21A8-807D21AC 000120 0004+00 0/0 0/0 0/0 .rodata @4843 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4843 = -7.0f; -COMPILER_STRIP_GATE(807D21A8, &lit_4843); +COMPILER_STRIP_GATE(0x807D21A8, &lit_4843); #pragma pop /* 807D21AC-807D21B0 000124 0004+00 0/0 0/0 0/0 .rodata @4844 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4844 = -14474.0f; -COMPILER_STRIP_GATE(807D21AC, &lit_4844); +COMPILER_STRIP_GATE(0x807D21AC, &lit_4844); #pragma pop /* 807D21B0-807D21B4 000128 0004+00 0/0 0/0 0/0 .rodata @4845 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4845 = 87.0f; -COMPILER_STRIP_GATE(807D21B0, &lit_4845); +COMPILER_STRIP_GATE(0x807D21B0, &lit_4845); #pragma pop /* 807D21B4-807D21B8 00012C 0004+00 0/0 0/0 0/0 .rodata @4846 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4846 = -154.0f; -COMPILER_STRIP_GATE(807D21B4, &lit_4846); +COMPILER_STRIP_GATE(0x807D21B4, &lit_4846); #pragma pop /* 807D21B8-807D21BC 000130 0004+00 0/0 0/0 0/0 .rodata @4847 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4847 = -15888.0f; -COMPILER_STRIP_GATE(807D21B8, &lit_4847); +COMPILER_STRIP_GATE(0x807D21B8, &lit_4847); #pragma pop /* 807D21BC-807D21C0 000134 0004+00 0/0 0/0 0/0 .rodata @4848 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4848 = 40.0f; -COMPILER_STRIP_GATE(807D21BC, &lit_4848); +COMPILER_STRIP_GATE(0x807D21BC, &lit_4848); #pragma pop /* 807D21C0-807D21C4 000138 0004+00 0/0 0/0 0/0 .rodata @4849 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4849 = 390.0f; -COMPILER_STRIP_GATE(807D21C0, &lit_4849); +COMPILER_STRIP_GATE(0x807D21C0, &lit_4849); #pragma pop /* 807D21C4-807D21C8 00013C 0004+00 0/0 0/0 0/0 .rodata @4850 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4850 = -14447.0f; -COMPILER_STRIP_GATE(807D21C4, &lit_4850); +COMPILER_STRIP_GATE(0x807D21C4, &lit_4850); #pragma pop /* 807D21C8-807D21CC 000140 0004+00 0/0 0/0 0/0 .rodata @4851 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4851 = -131.0f; -COMPILER_STRIP_GATE(807D21C8, &lit_4851); +COMPILER_STRIP_GATE(0x807D21C8, &lit_4851); #pragma pop /* 807D21CC-807D21D0 000144 0004+00 0/0 0/0 0/0 .rodata @4852 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4852 = 15.0f; -COMPILER_STRIP_GATE(807D21CC, &lit_4852); +COMPILER_STRIP_GATE(0x807D21CC, &lit_4852); #pragma pop /* 807D21D0-807D21D4 000148 0004+00 0/0 0/0 0/0 .rodata @4853 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4853 = -15895.0f; -COMPILER_STRIP_GATE(807D21D0, &lit_4853); +COMPILER_STRIP_GATE(0x807D21D0, &lit_4853); #pragma pop /* 807D21D4-807D21D8 00014C 0004+00 0/0 0/0 0/0 .rodata @4854 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4854 = 145.0f; -COMPILER_STRIP_GATE(807D21D4, &lit_4854); +COMPILER_STRIP_GATE(0x807D21D4, &lit_4854); #pragma pop /* 807D21D8-807D21DC 000150 0004+00 0/0 0/0 0/0 .rodata @4855 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4855 = 365.0f; -COMPILER_STRIP_GATE(807D21D8, &lit_4855); +COMPILER_STRIP_GATE(0x807D21D8, &lit_4855); #pragma pop /* 807D21DC-807D21E0 000154 0004+00 0/0 0/0 0/0 .rodata @4856 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4856 = -15312.0f; -COMPILER_STRIP_GATE(807D21DC, &lit_4856); +COMPILER_STRIP_GATE(0x807D21DC, &lit_4856); #pragma pop /* 807D21E0-807D21E4 000158 0004+00 0/0 0/0 0/0 .rodata @4857 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4857 = 361.0f; -COMPILER_STRIP_GATE(807D21E0, &lit_4857); +COMPILER_STRIP_GATE(0x807D21E0, &lit_4857); #pragma pop /* 807D21E4-807D21E8 00015C 0004+00 0/0 0/0 0/0 .rodata @4858 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4858 = 1425.0f; -COMPILER_STRIP_GATE(807D21E4, &lit_4858); +COMPILER_STRIP_GATE(0x807D21E4, &lit_4858); #pragma pop /* 807D21E8-807D21EC 000160 0004+00 0/0 0/0 0/0 .rodata @4859 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4859 = -15630.0f; -COMPILER_STRIP_GATE(807D21E8, &lit_4859); +COMPILER_STRIP_GATE(0x807D21E8, &lit_4859); #pragma pop /* 807D21EC-807D21F0 000164 0004+00 0/0 0/0 0/0 .rodata @4860 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4860 = 16.0f; -COMPILER_STRIP_GATE(807D21EC, &lit_4860); +COMPILER_STRIP_GATE(0x807D21EC, &lit_4860); #pragma pop /* 807D21F0-807D21F4 000168 0004+00 0/0 0/0 0/0 .rodata @4861 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4861 = -15.0f; -COMPILER_STRIP_GATE(807D21F0, &lit_4861); +COMPILER_STRIP_GATE(0x807D21F0, &lit_4861); #pragma pop /* 807D21F4-807D21F8 00016C 0004+00 0/0 0/0 0/0 .rodata @4862 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4862 = -15605.0f; -COMPILER_STRIP_GATE(807D21F4, &lit_4862); +COMPILER_STRIP_GATE(0x807D21F4, &lit_4862); #pragma pop /* 807D21F8-807D21FC 000170 0004+00 0/0 0/0 0/0 .rodata @4863 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4863 = 144.0f; -COMPILER_STRIP_GATE(807D21F8, &lit_4863); +COMPILER_STRIP_GATE(0x807D21F8, &lit_4863); #pragma pop /* 807D21FC-807D2200 000174 0004+00 0/0 0/0 0/0 .rodata @4864 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4864 = -1017.0f; -COMPILER_STRIP_GATE(807D21FC, &lit_4864); +COMPILER_STRIP_GATE(0x807D21FC, &lit_4864); #pragma pop /* 807D2200-807D2204 000178 0004+00 0/0 0/0 0/0 .rodata @4865 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4865 = -15487.0f; -COMPILER_STRIP_GATE(807D2200, &lit_4865); +COMPILER_STRIP_GATE(0x807D2200, &lit_4865); #pragma pop /* 807D2204-807D2208 00017C 0004+00 0/0 0/0 0/0 .rodata @4866 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4866 = 69.0f; -COMPILER_STRIP_GATE(807D2204, &lit_4866); +COMPILER_STRIP_GATE(0x807D2204, &lit_4866); #pragma pop /* 807D2208-807D220C 000180 0004+00 0/0 0/0 0/0 .rodata @4867 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4867 = 491.0f; -COMPILER_STRIP_GATE(807D2208, &lit_4867); +COMPILER_STRIP_GATE(0x807D2208, &lit_4867); #pragma pop /* 807D220C-807D2210 000184 0004+00 0/0 0/0 0/0 .rodata @4868 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4868 = -15560.0f; -COMPILER_STRIP_GATE(807D220C, &lit_4868); +COMPILER_STRIP_GATE(0x807D220C, &lit_4868); #pragma pop /* 807D2210-807D2214 000188 0004+00 0/0 0/0 0/0 .rodata @4869 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4869 = 85.0f; -COMPILER_STRIP_GATE(807D2210, &lit_4869); +COMPILER_STRIP_GATE(0x807D2210, &lit_4869); #pragma pop /* 807D2214-807D2218 00018C 0004+00 0/0 0/0 0/0 .rodata @4870 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4870 = 108.0f; -COMPILER_STRIP_GATE(807D2214, &lit_4870); +COMPILER_STRIP_GATE(0x807D2214, &lit_4870); #pragma pop /* 807D2218-807D221C 000190 0004+00 0/0 0/0 0/0 .rodata @4871 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4871 = -15778.0f; -COMPILER_STRIP_GATE(807D2218, &lit_4871); +COMPILER_STRIP_GATE(0x807D2218, &lit_4871); #pragma pop /* 807D221C-807D2220 000194 0004+00 0/0 0/0 0/0 .rodata @4872 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4872 = 534.0f; -COMPILER_STRIP_GATE(807D221C, &lit_4872); +COMPILER_STRIP_GATE(0x807D221C, &lit_4872); #pragma pop /* 807D2220-807D2224 000198 0004+00 0/0 0/0 0/0 .rodata @4873 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4873 = 1538.0f; -COMPILER_STRIP_GATE(807D2220, &lit_4873); +COMPILER_STRIP_GATE(0x807D2220, &lit_4873); #pragma pop /* 807D2224-807D2228 00019C 0004+00 0/0 0/0 0/0 .rodata @4874 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4874 = 9.0f / 10.0f; -COMPILER_STRIP_GATE(807D2224, &lit_4874); +COMPILER_STRIP_GATE(0x807D2224, &lit_4874); #pragma pop /* 807D2228-807D222C 0001A0 0004+00 0/0 0/0 0/0 .rodata @4875 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4875 = 34800.0f; -COMPILER_STRIP_GATE(807D2228, &lit_4875); +COMPILER_STRIP_GATE(0x807D2228, &lit_4875); #pragma pop /* 807D222C-807D2230 0001A4 0004+00 0/0 0/0 0/0 .rodata @4876 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4876 = 5700.0f; -COMPILER_STRIP_GATE(807D222C, &lit_4876); +COMPILER_STRIP_GATE(0x807D222C, &lit_4876); #pragma pop /* 807D2230-807D2234 0001A8 0004+00 0/0 0/0 0/0 .rodata @4877 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4877 = -26735.0f; -COMPILER_STRIP_GATE(807D2230, &lit_4877); +COMPILER_STRIP_GATE(0x807D2230, &lit_4877); #pragma pop /* 807D2234-807D2238 0001AC 0004+00 0/0 0/0 0/0 .rodata @4878 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4878 = 37592.0f; -COMPILER_STRIP_GATE(807D2234, &lit_4878); +COMPILER_STRIP_GATE(0x807D2234, &lit_4878); #pragma pop /* 807D2238-807D223C 0001B0 0004+00 0/0 0/0 0/0 .rodata @4879 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4879 = 1256.0f; -COMPILER_STRIP_GATE(807D2238, &lit_4879); +COMPILER_STRIP_GATE(0x807D2238, &lit_4879); #pragma pop /* 807D223C-807D2240 0001B4 0004+00 0/0 0/0 0/0 .rodata @4880 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4880 = -24152.0f; -COMPILER_STRIP_GATE(807D223C, &lit_4880); +COMPILER_STRIP_GATE(0x807D223C, &lit_4880); #pragma pop /* 807D2240-807D2244 0001B8 0004+00 0/0 0/0 0/0 .rodata @4881 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4881 = -28000.0f; -COMPILER_STRIP_GATE(807D2240, &lit_4881); +COMPILER_STRIP_GATE(0x807D2240, &lit_4881); #pragma pop /* 807D2244-807D2248 0001BC 0004+00 0/0 0/0 0/0 .rodata @4882 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4882 = 34785.0f; -COMPILER_STRIP_GATE(807D2244, &lit_4882); +COMPILER_STRIP_GATE(0x807D2244, &lit_4882); #pragma pop /* 807D2248-807D224C 0001C0 0004+00 0/0 0/0 0/0 .rodata @4883 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4883 = -28500.0f; -COMPILER_STRIP_GATE(807D2248, &lit_4883); +COMPILER_STRIP_GATE(0x807D2248, &lit_4883); #pragma pop /* 807D224C-807D2250 0001C4 0004+00 0/0 0/0 0/0 .rodata @4884 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4884 = 0x41815556; -COMPILER_STRIP_GATE(807D224C, &lit_4884); +COMPILER_STRIP_GATE(0x807D224C, &lit_4884); #pragma pop /* 807D2250-807D2254 0001C8 0004+00 0/0 0/0 0/0 .rodata @4885 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4885 = -30.0f; -COMPILER_STRIP_GATE(807D2250, &lit_4885); +COMPILER_STRIP_GATE(0x807D2250, &lit_4885); #pragma pop /* 807D2254-807D2258 0001CC 0004+00 0/0 0/0 0/0 .rodata @4886 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4886 = 0.5f; -COMPILER_STRIP_GATE(807D2254, &lit_4886); +COMPILER_STRIP_GATE(0x807D2254, &lit_4886); #pragma pop /* 807D2258-807D225C 0001D0 0004+00 0/0 0/0 0/0 .rodata @4887 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4887 = 800.0f; -COMPILER_STRIP_GATE(807D2258, &lit_4887); +COMPILER_STRIP_GATE(0x807D2258, &lit_4887); #pragma pop /* 807D225C-807D2260 0001D4 0004+00 0/0 0/0 0/0 .rodata @4888 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4888 = 25.0f; -COMPILER_STRIP_GATE(807D225C, &lit_4888); +COMPILER_STRIP_GATE(0x807D225C, &lit_4888); #pragma pop /* 807D2260-807D2264 0001D8 0004+00 0/0 0/0 0/0 .rodata @4889 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4889 = 3.0f / 100.0f; -COMPILER_STRIP_GATE(807D2260, &lit_4889); +COMPILER_STRIP_GATE(0x807D2260, &lit_4889); #pragma pop /* 807D2264-807D2268 0001DC 0004+00 0/0 0/0 0/0 .rodata @4890 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4890 = 34397.0f; -COMPILER_STRIP_GATE(807D2264, &lit_4890); +COMPILER_STRIP_GATE(0x807D2264, &lit_4890); #pragma pop /* 807D2268-807D226C 0001E0 0004+00 0/0 0/0 0/0 .rodata @4891 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4891 = -180.0f; -COMPILER_STRIP_GATE(807D2268, &lit_4891); +COMPILER_STRIP_GATE(0x807D2268, &lit_4891); #pragma pop /* 807D226C-807D2270 0001E4 0004+00 0/0 0/0 0/0 .rodata @4892 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4892 = -31312.0f; -COMPILER_STRIP_GATE(807D226C, &lit_4892); +COMPILER_STRIP_GATE(0x807D226C, &lit_4892); #pragma pop /* 807D2270-807D2274 0001E8 0004+00 0/0 0/0 0/0 .rodata @4893 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4893 = 34218.0f; -COMPILER_STRIP_GATE(807D2270, &lit_4893); +COMPILER_STRIP_GATE(0x807D2270, &lit_4893); #pragma pop /* 807D2274-807D2278 0001EC 0004+00 0/0 0/0 0/0 .rodata @4894 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4894 = -166.0f; -COMPILER_STRIP_GATE(807D2274, &lit_4894); +COMPILER_STRIP_GATE(0x807D2274, &lit_4894); #pragma pop /* 807D2278-807D227C 0001F0 0004+00 0/0 0/0 0/0 .rodata @4895 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4895 = -31724.0f; -COMPILER_STRIP_GATE(807D2278, &lit_4895); +COMPILER_STRIP_GATE(0x807D2278, &lit_4895); #pragma pop /* 807D227C-807D2280 0001F4 0004+00 1/1 0/0 0/0 .rodata @4949 */ SECTION_RODATA static f32 const lit_4949 = 20.0f; -COMPILER_STRIP_GATE(807D227C, &lit_4949); +COMPILER_STRIP_GATE(0x807D227C, &lit_4949); /* 807D1BAC-807D1C50 00244C 00A4+00 1/0 0/0 0/0 .text * daE_Warpappear_Execute__FP18e_warpappear_class */ @@ -1319,6 +1325,13 @@ static bool daE_Warpappear_IsDelete(e_warpappear_class* param_0) { return true; } +/* ############################################################################################## */ +/* 807D2280-807D2280 0001F8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_807D2288 = "Kytag04"; +#pragma pop + /* 807D1C58-807D1C8C 0024F8 0034+00 1/0 0/0 0/0 .text * daE_Warpappear_Delete__FP18e_warpappear_class */ #pragma push @@ -1400,10 +1413,4 @@ asm void daPy_py_c::changeDemoMode(u32 param_0, int param_1, int param_2, s16 pa } #pragma pop -/* 807D2280-807D2290 0001F8 0010+00 4/4 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_807D2280 = "F_SP104"; -SECTION_DEAD static char const* const stringBase_807D2288 = "Kytag04"; -#pragma pop +/* 807D2280-807D2280 0001F8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/e/d_a_e_wb/d_a_e_wb.cpp b/rel/d/a/e/d_a_e_wb/d_a_e_wb.cpp index 3b7150c86fe..d2d9dfc92da 100644 --- a/rel/d/a/e/d_a_e_wb/d_a_e_wb.cpp +++ b/rel/d/a/e/d_a_e_wb/d_a_e_wb.cpp @@ -35,16 +35,16 @@ struct mDoGph_gInf_c { /* 807DFAB4 */ void fadeIn(f32, _GXColor&); }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; - struct J3DAnmTransform {}; +struct J3DModelData {}; + +struct Z2Creature {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -62,10 +62,10 @@ struct mDoExt_3DlineMatSortPacket { /* 80014738 */ void setMat(mDoExt_3DlineMat_c*); }; -struct dKy_tevstr_c {}; - struct ResTIMG {}; +struct dKy_tevstr_c {}; + struct mDoExt_3DlineMat1_c { /* 80013360 */ void init(u16, u16, ResTIMG*, int); /* 80013FB0 */ void update(int, _GXColor&, dKy_tevstr_c*); @@ -760,108 +760,108 @@ extern "C" void CloseSet__15daObjCRVSTEEL_cFf(); SECTION_RODATA static u8 const lit_3882[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(807E298C, &lit_3882); +COMPILER_STRIP_GATE(0x807E298C, &lit_3882); /* 807E2998-807E299C 00000C 0004+00 0/2 0/0 0/0 .rodata @4440 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4440 = 6.0f / 5.0f; -COMPILER_STRIP_GATE(807E2998, &lit_4440); +COMPILER_STRIP_GATE(0x807E2998, &lit_4440); #pragma pop /* 807E299C-807E29A0 000010 0004+00 0/1 0/0 0/0 .rodata @4441 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4441 = 3.5f; -COMPILER_STRIP_GATE(807E299C, &lit_4441); +COMPILER_STRIP_GATE(0x807E299C, &lit_4441); #pragma pop /* 807E29A0-807E29A4 000014 0004+00 0/4 0/0 0/0 .rodata @4442 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4442 = 600.0f; -COMPILER_STRIP_GATE(807E29A0, &lit_4442); +COMPILER_STRIP_GATE(0x807E29A0, &lit_4442); #pragma pop /* 807E29A4-807E29A8 000018 0004+00 0/1 0/0 0/0 .rodata @4443 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4443 = 37.0f; -COMPILER_STRIP_GATE(807E29A4, &lit_4443); +COMPILER_STRIP_GATE(0x807E29A4, &lit_4443); #pragma pop /* 807E29A8-807E29AC 00001C 0004+00 0/10 0/0 0/0 .rodata @4444 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4444 = 50.0f; -COMPILER_STRIP_GATE(807E29A8, &lit_4444); +COMPILER_STRIP_GATE(0x807E29A8, &lit_4444); #pragma pop /* 807E29AC-807E29B0 000020 0004+00 1/20 0/0 0/0 .rodata @4445 */ SECTION_RODATA static f32 const lit_4445 = 10.0f; -COMPILER_STRIP_GATE(807E29AC, &lit_4445); +COMPILER_STRIP_GATE(0x807E29AC, &lit_4445); /* 807E29B0-807E29B4 000024 0004+00 0/11 0/0 0/0 .rodata @4446 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4446 = 40.0f; -COMPILER_STRIP_GATE(807E29B0, &lit_4446); +COMPILER_STRIP_GATE(0x807E29B0, &lit_4446); #pragma pop /* 807E29B4-807E29B8 000028 0004+00 0/1 0/0 0/0 .rodata @4447 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4447 = 54.0f; -COMPILER_STRIP_GATE(807E29B4, &lit_4447); +COMPILER_STRIP_GATE(0x807E29B4, &lit_4447); #pragma pop /* 807E29B8-807E29BC 00002C 0004+00 0/2 0/0 0/0 .rodata @4448 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4448 = 25.0f; -COMPILER_STRIP_GATE(807E29B8, &lit_4448); +COMPILER_STRIP_GATE(0x807E29B8, &lit_4448); #pragma pop /* 807E29BC-807E29C0 000030 0004+00 0/1 0/0 0/0 .rodata @4449 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4449 = 45.0f; -COMPILER_STRIP_GATE(807E29BC, &lit_4449); +COMPILER_STRIP_GATE(0x807E29BC, &lit_4449); #pragma pop /* 807E29C0-807E29C4 000034 0004+00 0/4 0/0 0/0 .rodata @4450 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4450 = 55.0f; -COMPILER_STRIP_GATE(807E29C0, &lit_4450); +COMPILER_STRIP_GATE(0x807E29C0, &lit_4450); #pragma pop /* 807E29C4-807E29C8 000038 0004+00 0/9 0/0 0/0 .rodata @4451 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4451 = 30.0f; -COMPILER_STRIP_GATE(807E29C4, &lit_4451); +COMPILER_STRIP_GATE(0x807E29C4, &lit_4451); #pragma pop /* 807E29C8-807E29CC 00003C 0004+00 0/1 0/0 0/0 .rodata @4452 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4452 = 4.0f / 5.0f; -COMPILER_STRIP_GATE(807E29C8, &lit_4452); +COMPILER_STRIP_GATE(0x807E29C8, &lit_4452); #pragma pop /* 807E29CC-807E29D0 000040 0004+00 0/6 0/0 0/0 .rodata @4453 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4453 = 500.0f; -COMPILER_STRIP_GATE(807E29CC, &lit_4453); +COMPILER_STRIP_GATE(0x807E29CC, &lit_4453); #pragma pop /* 807E29D0-807E29D4 000044 0004+00 0/1 0/0 0/0 .rodata @4454 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4454 = 3500.0f; -COMPILER_STRIP_GATE(807E29D0, &lit_4454); +COMPILER_STRIP_GATE(0x807E29D0, &lit_4454); #pragma pop /* 807E2F58-807E2F64 000000 000C+00 2/2 0/0 0/0 .data cNullVec__6Z2Calc */ @@ -1425,11 +1425,11 @@ SECTION_RODATA static u8 const lit_4476[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(807E29D4, &lit_4476); +COMPILER_STRIP_GATE(0x807E29D4, &lit_4476); /* 807E29D8-807E29DC 00004C 0004+00 1/7 0/0 0/0 .rodata @4477 */ SECTION_RODATA static f32 const lit_4477 = -1.0f; -COMPILER_STRIP_GATE(807E29D8, &lit_4477); +COMPILER_STRIP_GATE(0x807E29D8, &lit_4477); /* 807D2548-807D2610 0001A8 00C8+00 26/26 0/0 0/0 .text anm_init__FP10e_wb_classifUcf */ #pragma push @@ -1454,32 +1454,32 @@ static asm void nodeCallBack(J3DJoint* param_0, int param_1) { /* ############################################################################################## */ /* 807E29DC-807E29E0 000050 0004+00 1/7 0/0 0/0 .rodata @4638 */ SECTION_RODATA static f32 const lit_4638 = 20.0f; -COMPILER_STRIP_GATE(807E29DC, &lit_4638); +COMPILER_STRIP_GATE(0x807E29DC, &lit_4638); /* 807E29E0-807E29E4 000054 0004+00 0/2 0/0 0/0 .rodata @4639 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4639 = 2.0f / 5.0f; -COMPILER_STRIP_GATE(807E29E0, &lit_4639); +COMPILER_STRIP_GATE(0x807E29E0, &lit_4639); #pragma pop /* 807E29E4-807E29E8 000058 0004+00 0/3 0/0 0/0 .rodata @4640 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4640 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(807E29E4, &lit_4640); +COMPILER_STRIP_GATE(0x807E29E4, &lit_4640); #pragma pop /* 807E29E8-807E29EC 00005C 0004+00 0/10 0/0 0/0 .rodata @4641 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4641 = 15.0f; -COMPILER_STRIP_GATE(807E29E8, &lit_4641); +COMPILER_STRIP_GATE(0x807E29E8, &lit_4641); #pragma pop /* 807E29EC-807E29F0 000060 0004+00 3/33 0/0 0/0 .rodata @4642 */ SECTION_RODATA static f32 const lit_4642 = 1.0f; -COMPILER_STRIP_GATE(807E29EC, &lit_4642); +COMPILER_STRIP_GATE(0x807E29EC, &lit_4642); /* 807E3578-807E357C 000008 0001+03 11/11 0/0 0/0 .bss @1109 */ static u8 lit_1109[1 + 3 /* padding */]; @@ -1622,21 +1622,21 @@ static asm void himo_control2(e_wb_class* param_0, cXyz* param_1, int param_2, s #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4742 = 300.0f; -COMPILER_STRIP_GATE(807E29F0, &lit_4742); +COMPILER_STRIP_GATE(0x807E29F0, &lit_4742); #pragma pop /* 807E29F4-807E29F8 000068 0004+00 0/2 0/0 0/0 .rodata @4743 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4743 = -400.0f; -COMPILER_STRIP_GATE(807E29F4, &lit_4743); +COMPILER_STRIP_GATE(0x807E29F4, &lit_4743); #pragma pop /* 807E29F8-807E29FC 00006C 0004+00 0/5 0/0 0/0 .rodata @4744 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4744 = 400.0f; -COMPILER_STRIP_GATE(807E29F8, &lit_4744); +COMPILER_STRIP_GATE(0x807E29F8, &lit_4744); #pragma pop /* 807D2D90-807D2F18 0009F0 0188+00 1/1 0/0 0/0 .text e_wb_lr_wall_check__FP10e_wb_class @@ -1655,42 +1655,42 @@ static asm void e_wb_lr_wall_check(e_wb_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4910 = 100.0f; -COMPILER_STRIP_GATE(807E29FC, &lit_4910); +COMPILER_STRIP_GATE(0x807E29FC, &lit_4910); #pragma pop /* 807E2A00-807E2A04 000074 0004+00 0/4 0/0 0/0 .rodata @4911 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4911 = 1000.0f; -COMPILER_STRIP_GATE(807E2A00, &lit_4911); +COMPILER_STRIP_GATE(0x807E2A00, &lit_4911); #pragma pop /* 807E2A04-807E2A08 000078 0004+00 0/3 0/0 0/0 .rodata @4912 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4912 = 800.0f; -COMPILER_STRIP_GATE(807E2A04, &lit_4912); +COMPILER_STRIP_GATE(0x807E2A04, &lit_4912); #pragma pop /* 807E2A08-807E2A0C 00007C 0004+00 0/2 0/0 0/0 .rodata @4913 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4913 = 80.0f; -COMPILER_STRIP_GATE(807E2A08, &lit_4913); +COMPILER_STRIP_GATE(0x807E2A08, &lit_4913); #pragma pop /* 807E2A0C-807E2A10 000080 0004+00 0/4 0/0 0/0 .rodata @4914 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4914 = -20.0f; -COMPILER_STRIP_GATE(807E2A0C, &lit_4914); +COMPILER_STRIP_GATE(0x807E2A0C, &lit_4914); #pragma pop /* 807E2A10-807E2A14 000084 0004+00 0/1 0/0 0/0 .rodata @4915 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4915 = 47.0f; -COMPILER_STRIP_GATE(807E2A10, &lit_4915); +COMPILER_STRIP_GATE(0x807E2A10, &lit_4915); #pragma pop /* 807E2A14-807E2A1C 000088 0004+04 0/2 0/0 0/0 .rodata @4916 */ @@ -1701,7 +1701,7 @@ SECTION_RODATA static f32 const lit_4916[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(807E2A14, &lit_4916); +COMPILER_STRIP_GATE(0x807E2A14, &lit_4916); #pragma pop /* 807E2A1C-807E2A24 000090 0008+00 0/6 0/0 0/0 .rodata @4917 */ @@ -1710,7 +1710,7 @@ COMPILER_STRIP_GATE(807E2A14, &lit_4916); SECTION_RODATA static u8 const lit_4917[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(807E2A1C, &lit_4917); +COMPILER_STRIP_GATE(0x807E2A1C, &lit_4917); #pragma pop /* 807E2A24-807E2A2C 000098 0008+00 0/6 0/0 0/0 .rodata @4918 */ @@ -1719,7 +1719,7 @@ COMPILER_STRIP_GATE(807E2A1C, &lit_4917); SECTION_RODATA static u8 const lit_4918[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(807E2A24, &lit_4918); +COMPILER_STRIP_GATE(0x807E2A24, &lit_4918); #pragma pop /* 807E2A2C-807E2A34 0000A0 0008+00 0/6 0/0 0/0 .rodata @4919 */ @@ -1728,14 +1728,14 @@ COMPILER_STRIP_GATE(807E2A24, &lit_4918); SECTION_RODATA static u8 const lit_4919[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(807E2A2C, &lit_4919); +COMPILER_STRIP_GATE(0x807E2A2C, &lit_4919); #pragma pop /* 807E2A34-807E2A38 0000A8 0004+00 0/4 0/0 0/0 .rodata @4920 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4920 = 60.0f; -COMPILER_STRIP_GATE(807E2A34, &lit_4920); +COMPILER_STRIP_GATE(0x807E2A34, &lit_4920); #pragma pop /* 807D2F18-807D366C 000B78 0754+00 1/0 0/0 0/0 .text daE_WB_Draw__FP10e_wb_class */ @@ -1753,21 +1753,21 @@ static asm void daE_WB_Draw(e_wb_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5004 = 120.0f; -COMPILER_STRIP_GATE(807E2A38, &lit_5004); +COMPILER_STRIP_GATE(0x807E2A38, &lit_5004); #pragma pop /* 807E2A3C-807E2A40 0000B0 0004+00 0/1 0/0 0/0 .rodata @5005 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5005 = 250.0f; -COMPILER_STRIP_GATE(807E2A3C, &lit_5005); +COMPILER_STRIP_GATE(0x807E2A3C, &lit_5005); #pragma pop /* 807E2A40-807E2A44 0000B4 0004+00 0/3 0/0 0/0 .rodata @5006 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5006 = 200.0f; -COMPILER_STRIP_GATE(807E2A40, &lit_5006); +COMPILER_STRIP_GATE(0x807E2A40, &lit_5006); #pragma pop /* 807D366C-807D387C 0012CC 0210+00 1/1 0/0 0/0 .text e_wb_wall_check__FP10e_wb_class */ @@ -1785,21 +1785,21 @@ static asm void e_wb_wall_check(e_wb_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5096 = -5000.0f; -COMPILER_STRIP_GATE(807E2A44, &lit_5096); +COMPILER_STRIP_GATE(0x807E2A44, &lit_5096); #pragma pop /* 807E2A48-807E2A4C 0000BC 0004+00 0/4 0/0 0/0 .rodata @5097 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5097 = 2000.0f; -COMPILER_STRIP_GATE(807E2A48, &lit_5097); +COMPILER_STRIP_GATE(0x807E2A48, &lit_5097); #pragma pop /* 807E2A4C-807E2A50 0000C0 0004+00 0/1 0/0 0/0 .rodata @5098 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5098 = -500.0f; -COMPILER_STRIP_GATE(807E2A4C, &lit_5098); +COMPILER_STRIP_GATE(0x807E2A4C, &lit_5098); #pragma pop /* 807D387C-807D3B94 0014DC 0318+00 1/1 0/0 0/0 .text gake_check__FP10e_wb_class */ @@ -1817,7 +1817,7 @@ static asm void gake_check(e_wb_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5175 = 150.0f; -COMPILER_STRIP_GATE(807E2A50, &lit_5175); +COMPILER_STRIP_GATE(0x807E2A50, &lit_5175); #pragma pop /* 807D3B94-807D3D94 0017F4 0200+00 1/1 0/0 0/0 .text e_wb_saku_jump_check__FP10e_wb_class */ @@ -1839,7 +1839,7 @@ SECTION_RODATA static f32 const lit_5207[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(807E2A54, &lit_5207); +COMPILER_STRIP_GATE(0x807E2A54, &lit_5207); #pragma pop /* 807E2A5C-807E2A64 0000D0 0008+00 0/3 0/0 0/0 .rodata @5209 */ @@ -1848,7 +1848,7 @@ COMPILER_STRIP_GATE(807E2A54, &lit_5207); SECTION_RODATA static u8 const lit_5209[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(807E2A5C, &lit_5209); +COMPILER_STRIP_GATE(0x807E2A5C, &lit_5209); #pragma pop /* 807D3D94-807D3F2C 0019F4 0198+00 1/1 0/0 0/0 .text e_wb_saku_check_sub__FP10e_wb_classs */ @@ -1874,7 +1874,7 @@ static asm void e_wb_saku_check(e_wb_class* param_0) { /* ############################################################################################## */ /* 807E2A64-807E2A68 0000D8 0004+00 2/15 0/0 0/0 .rodata @5242 */ SECTION_RODATA static f32 const lit_5242 = 3.0f; -COMPILER_STRIP_GATE(807E2A64, &lit_5242); +COMPILER_STRIP_GATE(0x807E2A64, &lit_5242); /* 807D3FB0-807D40A8 001C10 00F8+00 1/1 0/0 0/0 .text e_wb_wait__FP10e_wb_class */ #pragma push @@ -1911,84 +1911,90 @@ static asm void e_wb_pl_ride_now(e_wb_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5441 = 2.0f; -COMPILER_STRIP_GATE(807E2A68, &lit_5441); +COMPILER_STRIP_GATE(0x807E2A68, &lit_5441); #pragma pop /* 807E2A6C-807E2A70 0000E0 0004+00 0/1 0/0 0/0 .rodata @5442 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5442 = 22.0f; -COMPILER_STRIP_GATE(807E2A6C, &lit_5442); +COMPILER_STRIP_GATE(0x807E2A6C, &lit_5442); #pragma pop /* 807E2A70-807E2A74 0000E4 0004+00 0/1 0/0 0/0 .rodata @5443 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5443 = 1.0f / 100.0f; -COMPILER_STRIP_GATE(807E2A70, &lit_5443); +COMPILER_STRIP_GATE(0x807E2A70, &lit_5443); #pragma pop /* 807E2A74-807E2A78 0000E8 0004+00 0/6 0/0 0/0 .rodata @5444 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5444 = 1.5f; -COMPILER_STRIP_GATE(807E2A74, &lit_5444); +COMPILER_STRIP_GATE(0x807E2A74, &lit_5444); #pragma pop /* 807E2A78-807E2A7C 0000EC 0004+00 0/1 0/0 0/0 .rodata @5445 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5445 = 4500.0f; -COMPILER_STRIP_GATE(807E2A78, &lit_5445); +COMPILER_STRIP_GATE(0x807E2A78, &lit_5445); #pragma pop /* 807E2A7C-807E2A80 0000F0 0004+00 0/1 0/0 0/0 .rodata @5446 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5446 = -4500.0f; -COMPILER_STRIP_GATE(807E2A7C, &lit_5446); +COMPILER_STRIP_GATE(0x807E2A7C, &lit_5446); #pragma pop /* 807E2A80-807E2A84 0000F4 0004+00 0/1 0/0 0/0 .rodata @5447 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5447 = -1.0f / 5.0f; -COMPILER_STRIP_GATE(807E2A80, &lit_5447); +COMPILER_STRIP_GATE(0x807E2A80, &lit_5447); #pragma pop /* 807E2A84-807E2A88 0000F8 0004+00 0/17 0/0 0/0 .rodata @5448 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5448 = 5.0f; -COMPILER_STRIP_GATE(807E2A84, &lit_5448); +COMPILER_STRIP_GATE(0x807E2A84, &lit_5448); #pragma pop /* 807E2A88-807E2A8C 0000FC 0004+00 0/8 0/0 0/0 .rodata @5449 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5449 = 0.5f; -COMPILER_STRIP_GATE(807E2A88, &lit_5449); +COMPILER_STRIP_GATE(0x807E2A88, &lit_5449); #pragma pop /* 807E2A8C-807E2A90 000100 0004+00 0/2 0/0 0/0 .rodata @5450 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5450 = 3.0f / 10.0f; -COMPILER_STRIP_GATE(807E2A8C, &lit_5450); +COMPILER_STRIP_GATE(0x807E2A8C, &lit_5450); #pragma pop /* 807E2A90-807E2A94 000104 0004+00 0/1 0/0 0/0 .rodata @5451 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5451 = 7.0f / 10.0f; -COMPILER_STRIP_GATE(807E2A90, &lit_5451); +COMPILER_STRIP_GATE(0x807E2A90, &lit_5451); #pragma pop /* 807E2A94-807E2A98 000108 0004+00 0/4 0/0 0/0 .rodata @5452 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5452 = 1.0f / 20.0f; -COMPILER_STRIP_GATE(807E2A94, &lit_5452); +COMPILER_STRIP_GATE(0x807E2A94, &lit_5452); +#pragma pop + +/* 807E2F0C-807E2F0C 000580 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_807E2F0C = "F_SP118"; #pragma pop /* 807D4154-807D48C0 001DB4 076C+00 1/1 0/0 0/0 .text e_wb_pl_ride__FP10e_wb_class */ @@ -2006,7 +2012,7 @@ static asm void e_wb_pl_ride(e_wb_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5511 = 1500.0f; -COMPILER_STRIP_GATE(807E2A98, &lit_5511); +COMPILER_STRIP_GATE(0x807E2A98, &lit_5511); #pragma pop /* 807D48C0-807D4BDC 002520 031C+00 1/1 0/0 0/0 .text e_wb_f_wait__FP10e_wb_class */ @@ -2034,35 +2040,35 @@ static asm void pl_pass_check(e_wb_class* param_0, f32 param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5686 = 19.0f / 20.0f; -COMPILER_STRIP_GATE(807E2A9C, &lit_5686); +COMPILER_STRIP_GATE(0x807E2A9C, &lit_5686); #pragma pop /* 807E2AA0-807E2AA4 000114 0004+00 0/1 0/0 0/0 .rodata @5687 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5687 = 27.0f / 20.0f; -COMPILER_STRIP_GATE(807E2AA0, &lit_5687); +COMPILER_STRIP_GATE(0x807E2AA0, &lit_5687); #pragma pop /* 807E2AA4-807E2AA8 000118 0004+00 0/3 0/0 0/0 .rodata @5688 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5688 = 5000.0f; -COMPILER_STRIP_GATE(807E2AA4, &lit_5688); +COMPILER_STRIP_GATE(0x807E2AA4, &lit_5688); #pragma pop /* 807E2AA8-807E2AAC 00011C 0004+00 0/1 0/0 0/0 .rodata @5689 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5689 = 13.0f / 10.0f; -COMPILER_STRIP_GATE(807E2AA8, &lit_5689); +COMPILER_STRIP_GATE(0x807E2AA8, &lit_5689); #pragma pop /* 807E2AAC-807E2AB0 000120 0004+00 0/2 0/0 0/0 .rodata @5690 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5690 = 700.0f; -COMPILER_STRIP_GATE(807E2AAC, &lit_5690); +COMPILER_STRIP_GATE(0x807E2AAC, &lit_5690); #pragma pop /* 807D4C84-807D53AC 0028E4 0728+00 1/1 0/0 0/0 .text e_wb_f_run__FP10e_wb_class */ @@ -2100,7 +2106,7 @@ static asm void e_wb_b_wait(e_wb_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5941 = 3000.0f; -COMPILER_STRIP_GATE(807E2AB0, &lit_5941); +COMPILER_STRIP_GATE(0x807E2AB0, &lit_5941); #pragma pop /* 807E3624-807E3630 0000B4 000C+00 0/1 0/0 0/0 .bss @4746 */ @@ -2136,7 +2142,7 @@ static asm void e_wb_b_run2(e_wb_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5977 = 4000.0f; -COMPILER_STRIP_GATE(807E2AB4, &lit_5977); +COMPILER_STRIP_GATE(0x807E2AB4, &lit_5977); #pragma pop /* 807D5EBC-807D6058 003B1C 019C+00 1/1 0/0 0/0 .text e_wb_b_wait2__FP10e_wb_class */ @@ -2164,84 +2170,84 @@ static asm void e_wb_b_run(e_wb_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6243 = 6.0f; -COMPILER_STRIP_GATE(807E2AB8, &lit_6243); +COMPILER_STRIP_GATE(0x807E2AB8, &lit_6243); #pragma pop /* 807E2ABC-807E2AC0 000130 0004+00 0/0 0/0 0/0 .rodata @6244 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6244 = 6000.0f; -COMPILER_STRIP_GATE(807E2ABC, &lit_6244); +COMPILER_STRIP_GATE(0x807E2ABC, &lit_6244); #pragma pop /* 807E2AC0-807E2AC4 000134 0004+00 0/2 0/0 0/0 .rodata @6245 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6245 = -30.0f; -COMPILER_STRIP_GATE(807E2AC0, &lit_6245); +COMPILER_STRIP_GATE(0x807E2AC0, &lit_6245); #pragma pop /* 807E2AC4-807E2AC8 000138 0004+00 0/3 0/0 0/0 .rodata @6246 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6246 = 12000.0f; -COMPILER_STRIP_GATE(807E2AC4, &lit_6246); +COMPILER_STRIP_GATE(0x807E2AC4, &lit_6246); #pragma pop /* 807E2AC8-807E2ACC 00013C 0004+00 0/0 0/0 0/0 .rodata @6247 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6247 = 9000.0f; -COMPILER_STRIP_GATE(807E2AC8, &lit_6247); +COMPILER_STRIP_GATE(0x807E2AC8, &lit_6247); #pragma pop /* 807E2ACC-807E2AD0 000140 0004+00 0/0 0/0 0/0 .rodata @6248 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6248 = 28108.0f; -COMPILER_STRIP_GATE(807E2ACC, &lit_6248); +COMPILER_STRIP_GATE(0x807E2ACC, &lit_6248); #pragma pop /* 807E2AD0-807E2AD4 000144 0004+00 0/0 0/0 0/0 .rodata @6249 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6249 = 6640.0f; -COMPILER_STRIP_GATE(807E2AD0, &lit_6249); +COMPILER_STRIP_GATE(0x807E2AD0, &lit_6249); #pragma pop /* 807E2AD4-807E2AD8 000148 0004+00 0/1 0/0 0/0 .rodata @6250 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6250 = -2989.0f; -COMPILER_STRIP_GATE(807E2AD4, &lit_6250); +COMPILER_STRIP_GATE(0x807E2AD4, &lit_6250); #pragma pop /* 807E2AD8-807E2ADC 00014C 0004+00 0/1 0/0 0/0 .rodata @6251 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6251 = 1364.0f; -COMPILER_STRIP_GATE(807E2AD8, &lit_6251); +COMPILER_STRIP_GATE(0x807E2AD8, &lit_6251); #pragma pop /* 807E2ADC-807E2AE0 000150 0004+00 0/1 0/0 0/0 .rodata @6276 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6276 = 36460.0f; -COMPILER_STRIP_GATE(807E2ADC, &lit_6276); +COMPILER_STRIP_GATE(0x807E2ADC, &lit_6276); #pragma pop /* 807E2AE0-807E2AE4 000154 0004+00 0/1 0/0 0/0 .rodata @6277 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6277 = 1040.0f; -COMPILER_STRIP_GATE(807E2AE0, &lit_6277); +COMPILER_STRIP_GATE(0x807E2AE0, &lit_6277); #pragma pop /* 807E2AE4-807E2AE8 000158 0004+00 0/1 0/0 0/0 .rodata @6278 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6278 = -17020.0f; -COMPILER_STRIP_GATE(807E2AE4, &lit_6278); +COMPILER_STRIP_GATE(0x807E2AE4, &lit_6278); #pragma pop /* 807E36FC-807E370C 00018C 000C+04 0/1 0/0 0/0 .bss @6258 */ @@ -2271,140 +2277,140 @@ static asm void arrow_rd_set(e_wb_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6572 = 34789.0f; -COMPILER_STRIP_GATE(807E2AE8, &lit_6572); +COMPILER_STRIP_GATE(0x807E2AE8, &lit_6572); #pragma pop /* 807E2AEC-807E2AF0 000160 0004+00 0/1 0/0 0/0 .rodata @6573 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6573 = -290.0f; -COMPILER_STRIP_GATE(807E2AEC, &lit_6573); +COMPILER_STRIP_GATE(0x807E2AEC, &lit_6573); #pragma pop /* 807E2AF0-807E2AF4 000164 0004+00 0/1 0/0 0/0 .rodata @6574 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6574 = -36200.0f; -COMPILER_STRIP_GATE(807E2AF0, &lit_6574); +COMPILER_STRIP_GATE(0x807E2AF0, &lit_6574); #pragma pop /* 807E2AF4-807E2AF8 000168 0004+00 0/1 0/0 0/0 .rodata @6575 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6575 = -16600.0f; -COMPILER_STRIP_GATE(807E2AF4, &lit_6575); +COMPILER_STRIP_GATE(0x807E2AF4, &lit_6575); #pragma pop /* 807E2AF8-807E2AFC 00016C 0004+00 0/1 0/0 0/0 .rodata @6576 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6576 = 31.0f; -COMPILER_STRIP_GATE(807E2AF8, &lit_6576); +COMPILER_STRIP_GATE(0x807E2AF8, &lit_6576); #pragma pop /* 807E2AFC-807E2B00 000170 0004+00 0/1 0/0 0/0 .rodata @6577 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6577 = 38.0f; -COMPILER_STRIP_GATE(807E2AFC, &lit_6577); +COMPILER_STRIP_GATE(0x807E2AFC, &lit_6577); #pragma pop /* 807E2B00-807E2B04 000174 0004+00 0/1 0/0 0/0 .rodata @6578 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6578 = 65.0f; -COMPILER_STRIP_GATE(807E2B00, &lit_6578); +COMPILER_STRIP_GATE(0x807E2B00, &lit_6578); #pragma pop /* 807E2B04-807E2B08 000178 0004+00 0/1 0/0 0/0 .rodata @6579 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6579 = 108.0f; -COMPILER_STRIP_GATE(807E2B04, &lit_6579); +COMPILER_STRIP_GATE(0x807E2B04, &lit_6579); #pragma pop /* 807E2B08-807E2B0C 00017C 0004+00 0/1 0/0 0/0 .rodata @6580 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6580 = 82.0f; -COMPILER_STRIP_GATE(807E2B08, &lit_6580); +COMPILER_STRIP_GATE(0x807E2B08, &lit_6580); #pragma pop /* 807E2B0C-807E2B10 000180 0004+00 0/1 0/0 0/0 .rodata @6581 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6581 = 106.0f; -COMPILER_STRIP_GATE(807E2B0C, &lit_6581); +COMPILER_STRIP_GATE(0x807E2B0C, &lit_6581); #pragma pop /* 807E2B10-807E2B14 000184 0004+00 0/1 0/0 0/0 .rodata @6582 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6582 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(807E2B10, &lit_6582); +COMPILER_STRIP_GATE(0x807E2B10, &lit_6582); #pragma pop /* 807E2B14-807E2B18 000188 0004+00 0/2 0/0 0/0 .rodata @6583 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6583 = 3.0f / 5.0f; -COMPILER_STRIP_GATE(807E2B14, &lit_6583); +COMPILER_STRIP_GATE(0x807E2B14, &lit_6583); #pragma pop /* 807E2B18-807E2B1C 00018C 0004+00 0/2 0/0 0/0 .rodata @6584 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6584 = 3.0f / 50.0f; -COMPILER_STRIP_GATE(807E2B18, &lit_6584); +COMPILER_STRIP_GATE(0x807E2B18, &lit_6584); #pragma pop /* 807E2B1C-807E2B20 000190 0004+00 0/3 0/0 0/0 .rodata @6585 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6585 = 10000.0f; -COMPILER_STRIP_GATE(807E2B1C, &lit_6585); +COMPILER_STRIP_GATE(0x807E2B1C, &lit_6585); #pragma pop /* 807E2B20-807E2B24 000194 0004+00 0/2 0/0 0/0 .rodata @6586 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6586 = 35350.0f; -COMPILER_STRIP_GATE(807E2B20, &lit_6586); +COMPILER_STRIP_GATE(0x807E2B20, &lit_6586); #pragma pop /* 807E2B24-807E2B28 000198 0004+00 0/2 0/0 0/0 .rodata @6587 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6587 = 34243.0f; -COMPILER_STRIP_GATE(807E2B24, &lit_6587); +COMPILER_STRIP_GATE(0x807E2B24, &lit_6587); #pragma pop /* 807E2B28-807E2B2C 00019C 0004+00 0/3 0/0 0/0 .rodata @6588 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6588 = 34800.0f; -COMPILER_STRIP_GATE(807E2B28, &lit_6588); +COMPILER_STRIP_GATE(0x807E2B28, &lit_6588); #pragma pop /* 807E2B2C-807E2B30 0001A0 0004+00 0/1 0/0 0/0 .rodata @6589 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6589 = -300.0f; -COMPILER_STRIP_GATE(807E2B2C, &lit_6589); +COMPILER_STRIP_GATE(0x807E2B2C, &lit_6589); #pragma pop /* 807E2B30-807E2B34 0001A4 0004+00 0/1 0/0 0/0 .rodata @6590 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6590 = -15150.0f; -COMPILER_STRIP_GATE(807E2B30, &lit_6590); +COMPILER_STRIP_GATE(0x807E2B30, &lit_6590); #pragma pop /* 807E2B34-807E2B38 0001A8 0004+00 0/2 0/0 0/0 .rodata @6591 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6591 = -37200.0f; -COMPILER_STRIP_GATE(807E2B34, &lit_6591); +COMPILER_STRIP_GATE(0x807E2B34, &lit_6591); #pragma pop /* 807E3718-807E3724 0001A8 000C+00 0/1 0/0 0/0 .bss @6279 */ @@ -2502,35 +2508,42 @@ static asm void e_wb_b_ikki_end(e_wb_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6816 = -93620.0f; -COMPILER_STRIP_GATE(807E2B38, &lit_6816); +COMPILER_STRIP_GATE(0x807E2B38, &lit_6816); #pragma pop /* 807E2B3C-807E2B40 0001B0 0004+00 0/1 0/0 0/0 .rodata @6817 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6817 = -5750.0f; -COMPILER_STRIP_GATE(807E2B3C, &lit_6817); +COMPILER_STRIP_GATE(0x807E2B3C, &lit_6817); #pragma pop /* 807E2B40-807E2B44 0001B4 0004+00 0/1 0/0 0/0 .rodata @6818 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6818 = 48944.0f; -COMPILER_STRIP_GATE(807E2B40, &lit_6818); +COMPILER_STRIP_GATE(0x807E2B40, &lit_6818); #pragma pop /* 807E2B44-807E2B48 0001B8 0004+00 0/1 0/0 0/0 .rodata @6819 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6819 = 28423.0f; -COMPILER_STRIP_GATE(807E2B44, &lit_6819); +COMPILER_STRIP_GATE(0x807E2B44, &lit_6819); #pragma pop /* 807E2B48-807E2B4C 0001BC 0004+00 0/1 0/0 0/0 .rodata @6820 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6820 = 2500.0f; -COMPILER_STRIP_GATE(807E2B48, &lit_6820); +COMPILER_STRIP_GATE(0x807E2B48, &lit_6820); +#pragma pop + +/* 807E2F0C-807E2F0C 000580 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_807E2F14 = "RiderBoss"; +SECTION_DEAD static char const* const stringBase_807E2F1E = "action"; #pragma pop /* 807E37B0-807E37C0 000240 000C+04 0/1 0/0 0/0 .bss @6612 */ @@ -2576,28 +2589,28 @@ static asm void e_wb_b_ikki2_end(e_wb_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6887 = -7080.0f; -COMPILER_STRIP_GATE(807E2B4C, &lit_6887); +COMPILER_STRIP_GATE(0x807E2B4C, &lit_6887); #pragma pop /* 807E2B50-807E2B54 0001C4 0004+00 0/1 0/0 0/0 .rodata @6888 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6888 = -6634.0f; -COMPILER_STRIP_GATE(807E2B50, &lit_6888); +COMPILER_STRIP_GATE(0x807E2B50, &lit_6888); #pragma pop /* 807E2B54-807E2B58 0001C8 0004+00 0/1 0/0 0/0 .rodata @6889 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6889 = -10008.0f; -COMPILER_STRIP_GATE(807E2B54, &lit_6889); +COMPILER_STRIP_GATE(0x807E2B54, &lit_6889); #pragma pop /* 807E2B58-807E2B5C 0001CC 0004+00 0/1 0/0 0/0 .rodata @6890 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6890 = -2729.0f; -COMPILER_STRIP_GATE(807E2B58, &lit_6890); +COMPILER_STRIP_GATE(0x807E2B58, &lit_6890); #pragma pop /* 807D8648-807D88D8 0062A8 0290+00 2/1 0/0 0/0 .text e_wb_b_lv9_end__FP10e_wb_class */ @@ -2615,21 +2628,21 @@ static asm void e_wb_b_lv9_end(e_wb_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6891 = -12682.0f; -COMPILER_STRIP_GATE(807E2B5C, &lit_6891); +COMPILER_STRIP_GATE(0x807E2B5C, &lit_6891); #pragma pop /* 807E2B60-807E2B64 0001D4 0004+00 0/0 0/0 0/0 .rodata @6892 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6892 = -2701.0f; -COMPILER_STRIP_GATE(807E2B60, &lit_6892); +COMPILER_STRIP_GATE(0x807E2B60, &lit_6892); #pragma pop /* 807E2B64-807E2B68 0001D8 0004+00 0/1 0/0 0/0 .rodata @6914 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6914 = 7.0f / 5.0f; -COMPILER_STRIP_GATE(807E2B64, &lit_6914); +COMPILER_STRIP_GATE(0x807E2B64, &lit_6914); #pragma pop /* 807D88D8-807D8A78 006538 01A0+00 1/1 0/0 0/0 .text e_wb_a_run__FP10e_wb_class */ @@ -2657,14 +2670,14 @@ static asm void e_wb_s_damage(e_wb_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7041 = -15.0f; -COMPILER_STRIP_GATE(807E2B68, &lit_7041); +COMPILER_STRIP_GATE(0x807E2B68, &lit_7041); #pragma pop /* 807E2B6C-807E2B70 0001E0 0004+00 0/1 0/0 0/0 .rodata @7042 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7042 = 70.0f; -COMPILER_STRIP_GATE(807E2B6C, &lit_7042); +COMPILER_STRIP_GATE(0x807E2B6C, &lit_7042); #pragma pop /* 807D8C3C-807D901C 00689C 03E0+00 1/1 0/0 0/0 .text e_wb_damage__FP10e_wb_class */ @@ -2692,7 +2705,7 @@ static asm void e_wb_bg_damage(e_wb_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7178 = -50.0f; -COMPILER_STRIP_GATE(807E2B70, &lit_7178); +COMPILER_STRIP_GATE(0x807E2B70, &lit_7178); #pragma pop /* 807D91EC-807D9608 006E4C 041C+00 1/1 0/0 0/0 .text e_wb_lr_damage__FP10e_wb_class */ @@ -2720,21 +2733,21 @@ static asm void e_wb_kiba_start(e_wb_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7227 = 34000.0f; -COMPILER_STRIP_GATE(807E2B74, &lit_7227); +COMPILER_STRIP_GATE(0x807E2B74, &lit_7227); #pragma pop /* 807E2B78-807E2B7C 0001EC 0004+00 0/1 0/0 0/0 .rodata @7228 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7228 = 35500.0f; -COMPILER_STRIP_GATE(807E2B78, &lit_7228); +COMPILER_STRIP_GATE(0x807E2B78, &lit_7228); #pragma pop /* 807E2B7C-807E2B80 0001F0 0004+00 0/1 0/0 0/0 .rodata @7229 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7229 = -14500.0f; -COMPILER_STRIP_GATE(807E2B7C, &lit_7229); +COMPILER_STRIP_GATE(0x807E2B7C, &lit_7229); #pragma pop /* 807D9698-807D98D4 0072F8 023C+00 1/1 0/0 0/0 .text e_wb_kiba_end__FP10e_wb_class */ @@ -2762,21 +2775,21 @@ static asm void damage_check(e_wb_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7668 = 11.0f; -COMPILER_STRIP_GATE(807E2B80, &lit_7668); +COMPILER_STRIP_GATE(0x807E2B80, &lit_7668); #pragma pop /* 807E2B84-807E2B88 0001F8 0004+00 0/1 0/0 0/0 .rodata @7669 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7669 = 13.0f; -COMPILER_STRIP_GATE(807E2B84, &lit_7669); +COMPILER_STRIP_GATE(0x807E2B84, &lit_7669); #pragma pop /* 807E2B88-807E2B8C 0001FC 0004+00 0/2 0/0 0/0 .rodata @7670 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7670 = 4.0f; -COMPILER_STRIP_GATE(807E2B88, &lit_7670); +COMPILER_STRIP_GATE(0x807E2B88, &lit_7670); #pragma pop /* 807E37E4-807E37F4 000274 000C+04 0/1 0/0 0/0 .bss @7515 */ @@ -2860,21 +2873,21 @@ static asm void s_rddel2_sub(void* param_0, void* param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7770 = 482.0f; -COMPILER_STRIP_GATE(807E2B8C, &lit_7770); +COMPILER_STRIP_GATE(0x807E2B8C, &lit_7770); #pragma pop /* 807E2B90-807E2B94 000204 0004+00 0/1 0/0 0/0 .rodata @7771 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7771 = 3100.0f; -COMPILER_STRIP_GATE(807E2B90, &lit_7771); +COMPILER_STRIP_GATE(0x807E2B90, &lit_7771); #pragma pop /* 807E2B94-807E2B98 000208 0004+00 0/1 0/0 0/0 .rodata @7772 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7772 = 550.0f; -COMPILER_STRIP_GATE(807E2B94, &lit_7772); +COMPILER_STRIP_GATE(0x807E2B94, &lit_7772); #pragma pop /* 807DA8E0-807DAA00 008540 0120+00 1/1 0/0 0/0 .text e_wb_crv_wait__FP10e_wb_class */ @@ -2892,49 +2905,49 @@ static asm void e_wb_crv_wait(e_wb_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8125 = -46137.0f; -COMPILER_STRIP_GATE(807E2B98, &lit_8125); +COMPILER_STRIP_GATE(0x807E2B98, &lit_8125); #pragma pop /* 807E2B9C-807E2BA0 000210 0004+00 0/1 0/0 0/0 .rodata @8126 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8126 = 81549.0f; -COMPILER_STRIP_GATE(807E2B9C, &lit_8126); +COMPILER_STRIP_GATE(0x807E2B9C, &lit_8126); #pragma pop /* 807E2BA0-807E2BA4 000214 0004+00 0/1 0/0 0/0 .rodata @8127 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8127 = -7650.0f; -COMPILER_STRIP_GATE(807E2BA0, &lit_8127); +COMPILER_STRIP_GATE(0x807E2BA0, &lit_8127); #pragma pop /* 807E2BA4-807E2BA8 000218 0004+00 0/1 0/0 0/0 .rodata @8128 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8128 = 56877.0f; -COMPILER_STRIP_GATE(807E2BA4, &lit_8128); +COMPILER_STRIP_GATE(0x807E2BA4, &lit_8128); #pragma pop /* 807E2BA8-807E2BAC 00021C 0004+00 0/1 0/0 0/0 .rodata @8129 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8129 = -62943.0f; -COMPILER_STRIP_GATE(807E2BA8, &lit_8129); +COMPILER_STRIP_GATE(0x807E2BA8, &lit_8129); #pragma pop /* 807E2BAC-807E2BB0 000220 0004+00 0/1 0/0 0/0 .rodata @8130 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8130 = -9045.0f; -COMPILER_STRIP_GATE(807E2BAC, &lit_8130); +COMPILER_STRIP_GATE(0x807E2BAC, &lit_8130); #pragma pop /* 807E2BB0-807E2BB4 000224 0004+00 0/1 0/0 0/0 .rodata @8131 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8131 = 70997.0f; -COMPILER_STRIP_GATE(807E2BB0, &lit_8131); +COMPILER_STRIP_GATE(0x807E2BB0, &lit_8131); #pragma pop /* 807DAA00-807DB7E4 008660 0DE4+00 2/1 0/0 0/0 .text e_wb_c_run__FP10e_wb_class */ @@ -2947,6 +2960,14 @@ static asm void e_wb_c_run(e_wb_class* param_0) { } #pragma pop +/* ############################################################################################## */ +/* 807E2F0C-807E2F0C 000580 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_807E2F25 = "F_SP124"; +SECTION_DEAD static char const* const stringBase_807E2F2D = "D_MN09"; +#pragma pop + /* 807DB7E4-807DBEE8 009444 0704+00 2/1 0/0 0/0 .text action__FP10e_wb_class */ #pragma push #pragma optimization_level 0 @@ -3012,105 +3033,112 @@ static asm void cam_3d_morf(e_wb_class* param_0, f32 param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8132 = -700.0f; -COMPILER_STRIP_GATE(807E2BB4, &lit_8132); +COMPILER_STRIP_GATE(0x807E2BB4, &lit_8132); #pragma pop /* 807E2BB8-807E2BBC 00022C 0004+00 0/1 0/0 0/0 .rodata @8133 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8133 = -150.0f; -COMPILER_STRIP_GATE(807E2BB8, &lit_8133); +COMPILER_STRIP_GATE(0x807E2BB8, &lit_8133); #pragma pop /* 807E2BBC-807E2BC0 000230 0004+00 0/0 0/0 0/0 .rodata @8134 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8134 = 4025.0f; -COMPILER_STRIP_GATE(807E2BBC, &lit_8134); +COMPILER_STRIP_GATE(0x807E2BBC, &lit_8134); #pragma pop /* 807E2BC0-807E2BC4 000234 0004+00 0/0 0/0 0/0 .rodata @8135 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8135 = 52319.0f; -COMPILER_STRIP_GATE(807E2BC0, &lit_8135); +COMPILER_STRIP_GATE(0x807E2BC0, &lit_8135); #pragma pop /* 807E2BC4-807E2BC8 000238 0004+00 0/1 0/0 0/0 .rodata @8375 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8375 = 65535.0f; -COMPILER_STRIP_GATE(807E2BC4, &lit_8375); +COMPILER_STRIP_GATE(0x807E2BC4, &lit_8375); #pragma pop /* 807E2BC8-807E2BCC 00023C 0004+00 0/0 0/0 0/0 .rodata @8376 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8376 = -120.0f; -COMPILER_STRIP_GATE(807E2BC8, &lit_8376); +COMPILER_STRIP_GATE(0x807E2BC8, &lit_8376); #pragma pop /* 807E2BCC-807E2BD0 000240 0004+00 0/1 0/0 0/0 .rodata @9215 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9215 = -66.0f; -COMPILER_STRIP_GATE(807E2BCC, &lit_9215); +COMPILER_STRIP_GATE(0x807E2BCC, &lit_9215); #pragma pop /* 807E2BD0-807E2BD4 000244 0004+00 0/1 0/0 0/0 .rodata @9216 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9216 = -604.0f; -COMPILER_STRIP_GATE(807E2BD0, &lit_9216); +COMPILER_STRIP_GATE(0x807E2BD0, &lit_9216); #pragma pop /* 807E2BD4-807E2BD8 000248 0004+00 0/1 0/0 0/0 .rodata @9217 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9217 = 34700.0f; -COMPILER_STRIP_GATE(807E2BD4, &lit_9217); +COMPILER_STRIP_GATE(0x807E2BD4, &lit_9217); #pragma pop /* 807E2BD8-807E2BDC 00024C 0004+00 0/1 0/0 0/0 .rodata @9218 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9218 = 7896.0f; -COMPILER_STRIP_GATE(807E2BD8, &lit_9218); +COMPILER_STRIP_GATE(0x807E2BD8, &lit_9218); #pragma pop /* 807E2BDC-807E2BE0 000250 0004+00 0/1 0/0 0/0 .rodata @9219 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9219 = 34900.0f; -COMPILER_STRIP_GATE(807E2BDC, &lit_9219); +COMPILER_STRIP_GATE(0x807E2BDC, &lit_9219); #pragma pop /* 807E2BE0-807E2BE4 000254 0004+00 0/1 0/0 0/0 .rodata @9220 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9220 = -280.0f; -COMPILER_STRIP_GATE(807E2BE0, &lit_9220); +COMPILER_STRIP_GATE(0x807E2BE0, &lit_9220); #pragma pop /* 807E2BE4-807E2BE8 000258 0004+00 0/1 0/0 0/0 .rodata @9221 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9221 = -18048.0f; -COMPILER_STRIP_GATE(807E2BE4, &lit_9221); +COMPILER_STRIP_GATE(0x807E2BE4, &lit_9221); #pragma pop /* 807E2BE8-807E2BEC 00025C 0004+00 0/1 0/0 0/0 .rodata @9222 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9222 = 1200.0f; -COMPILER_STRIP_GATE(807E2BE8, &lit_9222); +COMPILER_STRIP_GATE(0x807E2BE8, &lit_9222); #pragma pop /* 807E2BEC-807E2BF0 000260 0004+00 0/2 0/0 0/0 .rodata @9223 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9223 = 1100.0f; -COMPILER_STRIP_GATE(807E2BEC, &lit_9223); +COMPILER_STRIP_GATE(0x807E2BEC, &lit_9223); +#pragma pop + +/* 807E2F0C-807E2F0C 000580 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_807E2F34 = "F_SP102"; +SECTION_DEAD static char const* const stringBase_807E2F3C = "F_SP121"; #pragma pop /* 807DC168-807DFAB4 009DC8 394C+00 2/1 0/0 0/0 .text demo_camera__FP10e_wb_class */ @@ -3170,1323 +3198,1323 @@ static asm void cM_ssin(s16 param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9224 = 350.0f; -COMPILER_STRIP_GATE(807E2BF0, &lit_9224); +COMPILER_STRIP_GATE(0x807E2BF0, &lit_9224); #pragma pop /* 807E2BF4-807E2BF8 000268 0004+00 0/1 0/0 0/0 .rodata @9225 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9225 = 12.0f; -COMPILER_STRIP_GATE(807E2BF4, &lit_9225); +COMPILER_STRIP_GATE(0x807E2BF4, &lit_9225); #pragma pop /* 807E2BF8-807E2BFC 00026C 0004+00 0/0 0/0 0/0 .rodata @9226 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9226 = -26400.0f; -COMPILER_STRIP_GATE(807E2BF8, &lit_9226); +COMPILER_STRIP_GATE(0x807E2BF8, &lit_9226); #pragma pop /* 807E2BFC-807E2C00 000270 0004+00 0/0 0/0 0/0 .rodata @9227 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9227 = -36400.0f; -COMPILER_STRIP_GATE(807E2BFC, &lit_9227); +COMPILER_STRIP_GATE(0x807E2BFC, &lit_9227); #pragma pop /* 807E2C00-807E2C04 000274 0004+00 0/0 0/0 0/0 .rodata @9228 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9228 = -16400.0f; -COMPILER_STRIP_GATE(807E2C00, &lit_9228); +COMPILER_STRIP_GATE(0x807E2C00, &lit_9228); #pragma pop /* 807E2C04-807E2C08 000278 0004+00 0/0 0/0 0/0 .rodata @9229 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9229 = -18000.0f; -COMPILER_STRIP_GATE(807E2C04, &lit_9229); +COMPILER_STRIP_GATE(0x807E2C04, &lit_9229); #pragma pop /* 807E2C08-807E2C0C 00027C 0004+00 0/0 0/0 0/0 .rodata @9230 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9230 = -25000.0f; -COMPILER_STRIP_GATE(807E2C08, &lit_9230); +COMPILER_STRIP_GATE(0x807E2C08, &lit_9230); #pragma pop /* 807E2C0C-807E2C10 000280 0004+00 0/0 0/0 0/0 .rodata @9231 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9231 = -27800.0f; -COMPILER_STRIP_GATE(807E2C0C, &lit_9231); +COMPILER_STRIP_GATE(0x807E2C0C, &lit_9231); #pragma pop /* 807E2C10-807E2C14 000284 0004+00 0/0 0/0 0/0 .rodata @9232 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9232 = 48545.0f; -COMPILER_STRIP_GATE(807E2C10, &lit_9232); +COMPILER_STRIP_GATE(0x807E2C10, &lit_9232); #pragma pop /* 807E2C14-807E2C18 000288 0004+00 0/0 0/0 0/0 .rodata @9233 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9233 = -1884.0f; -COMPILER_STRIP_GATE(807E2C14, &lit_9233); +COMPILER_STRIP_GATE(0x807E2C14, &lit_9233); #pragma pop /* 807E2C18-807E2C1C 00028C 0004+00 0/0 0/0 0/0 .rodata @9234 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9234 = -27557.0f; -COMPILER_STRIP_GATE(807E2C18, &lit_9234); +COMPILER_STRIP_GATE(0x807E2C18, &lit_9234); #pragma pop /* 807E2C1C-807E2C20 000290 0004+00 0/0 0/0 0/0 .rodata @9235 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9235 = 49099.0f; -COMPILER_STRIP_GATE(807E2C1C, &lit_9235); +COMPILER_STRIP_GATE(0x807E2C1C, &lit_9235); #pragma pop /* 807E2C20-807E2C24 000294 0004+00 0/0 0/0 0/0 .rodata @9236 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9236 = -27626.0f; -COMPILER_STRIP_GATE(807E2C20, &lit_9236); +COMPILER_STRIP_GATE(0x807E2C20, &lit_9236); #pragma pop /* 807E2C24-807E2C28 000298 0004+00 0/0 0/0 0/0 .rodata @9237 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9237 = -3500.0f; -COMPILER_STRIP_GATE(807E2C24, &lit_9237); +COMPILER_STRIP_GATE(0x807E2C24, &lit_9237); #pragma pop /* 807E2C28-807E2C2C 00029C 0004+00 0/0 0/0 0/0 .rodata @9238 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9238 = -200.0f; -COMPILER_STRIP_GATE(807E2C28, &lit_9238); +COMPILER_STRIP_GATE(0x807E2C28, &lit_9238); #pragma pop /* 807E2C2C-807E2C30 0002A0 0004+00 0/0 0/0 0/0 .rodata @9239 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9239 = -600.0f; -COMPILER_STRIP_GATE(807E2C2C, &lit_9239); +COMPILER_STRIP_GATE(0x807E2C2C, &lit_9239); #pragma pop /* 807E2C30-807E2C34 0002A4 0004+00 0/0 0/0 0/0 .rodata @9240 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9240 = -8592.0f; -COMPILER_STRIP_GATE(807E2C30, &lit_9240); +COMPILER_STRIP_GATE(0x807E2C30, &lit_9240); #pragma pop /* 807E2C34-807E2C38 0002A8 0004+00 0/0 0/0 0/0 .rodata @9241 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9241 = 342.0f; -COMPILER_STRIP_GATE(807E2C34, &lit_9241); +COMPILER_STRIP_GATE(0x807E2C34, &lit_9241); #pragma pop /* 807E2C38-807E2C3C 0002AC 0004+00 0/0 0/0 0/0 .rodata @9242 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9242 = -139.0f; -COMPILER_STRIP_GATE(807E2C38, &lit_9242); +COMPILER_STRIP_GATE(0x807E2C38, &lit_9242); #pragma pop /* 807E2C3C-807E2C40 0002B0 0004+00 0/0 0/0 0/0 .rodata @9243 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9243 = -8844.0f; -COMPILER_STRIP_GATE(807E2C3C, &lit_9243); +COMPILER_STRIP_GATE(0x807E2C3C, &lit_9243); #pragma pop /* 807E2C40-807E2C44 0002B4 0004+00 0/0 0/0 0/0 .rodata @9244 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9244 = 317.0f; -COMPILER_STRIP_GATE(807E2C40, &lit_9244); +COMPILER_STRIP_GATE(0x807E2C40, &lit_9244); #pragma pop /* 807E2C44-807E2C48 0002B8 0004+00 0/0 0/0 0/0 .rodata @9245 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9245 = 512.0f; -COMPILER_STRIP_GATE(807E2C44, &lit_9245); +COMPILER_STRIP_GATE(0x807E2C44, &lit_9245); #pragma pop /* 807E2C48-807E2C4C 0002BC 0004+00 0/0 0/0 0/0 .rodata @9246 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9246 = -8416.0f; -COMPILER_STRIP_GATE(807E2C48, &lit_9246); +COMPILER_STRIP_GATE(0x807E2C48, &lit_9246); #pragma pop /* 807E2C4C-807E2C50 0002C0 0004+00 0/0 0/0 0/0 .rodata @9247 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9247 = 345.0f; -COMPILER_STRIP_GATE(807E2C4C, &lit_9247); +COMPILER_STRIP_GATE(0x807E2C4C, &lit_9247); #pragma pop /* 807E2C50-807E2C54 0002C4 0004+00 0/0 0/0 0/0 .rodata @9248 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9248 = -8994.0f; -COMPILER_STRIP_GATE(807E2C50, &lit_9248); +COMPILER_STRIP_GATE(0x807E2C50, &lit_9248); #pragma pop /* 807E2C54-807E2C58 0002C8 0004+00 0/0 0/0 0/0 .rodata @9249 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9249 = 326.0f; -COMPILER_STRIP_GATE(807E2C54, &lit_9249); +COMPILER_STRIP_GATE(0x807E2C54, &lit_9249); #pragma pop /* 807E2C58-807E2C5C 0002CC 0004+00 0/0 0/0 0/0 .rodata @9250 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9250 = -10425.0f; -COMPILER_STRIP_GATE(807E2C58, &lit_9250); +COMPILER_STRIP_GATE(0x807E2C58, &lit_9250); #pragma pop /* 807E2C5C-807E2C60 0002D0 0004+00 0/0 0/0 0/0 .rodata @9251 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9251 = 75.0f; -COMPILER_STRIP_GATE(807E2C5C, &lit_9251); +COMPILER_STRIP_GATE(0x807E2C5C, &lit_9251); #pragma pop /* 807E2C60-807E2C64 0002D4 0004+00 0/0 0/0 0/0 .rodata @9252 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9252 = -8705.0f; -COMPILER_STRIP_GATE(807E2C60, &lit_9252); +COMPILER_STRIP_GATE(0x807E2C60, &lit_9252); #pragma pop /* 807E2C64-807E2C68 0002D8 0004+00 0/0 0/0 0/0 .rodata @9253 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9253 = 213.0f; -COMPILER_STRIP_GATE(807E2C64, &lit_9253); +COMPILER_STRIP_GATE(0x807E2C64, &lit_9253); #pragma pop /* 807E2C68-807E2C6C 0002DC 0004+00 0/0 0/0 0/0 .rodata @9254 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9254 = 1.0f / 50.0f; -COMPILER_STRIP_GATE(807E2C68, &lit_9254); +COMPILER_STRIP_GATE(0x807E2C68, &lit_9254); #pragma pop /* 807E2C6C-807E2C70 0002E0 0004+00 0/0 0/0 0/0 .rodata @9255 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_9255 = 0x3A83126F; -COMPILER_STRIP_GATE(807E2C6C, &lit_9255); +COMPILER_STRIP_GATE(0x807E2C6C, &lit_9255); #pragma pop /* 807E2C70-807E2C74 0002E4 0004+00 0/0 0/0 0/0 .rodata @9256 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9256 = -9224.0f; -COMPILER_STRIP_GATE(807E2C70, &lit_9256); +COMPILER_STRIP_GATE(0x807E2C70, &lit_9256); #pragma pop /* 807E2C74-807E2C78 0002E8 0004+00 0/0 0/0 0/0 .rodata @9257 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9257 = -8586.0f; -COMPILER_STRIP_GATE(807E2C74, &lit_9257); +COMPILER_STRIP_GATE(0x807E2C74, &lit_9257); #pragma pop /* 807E2C78-807E2C7C 0002EC 0004+00 0/0 0/0 0/0 .rodata @9258 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9258 = 447.0f; -COMPILER_STRIP_GATE(807E2C78, &lit_9258); +COMPILER_STRIP_GATE(0x807E2C78, &lit_9258); #pragma pop /* 807E2C7C-807E2C80 0002F0 0004+00 0/1 0/0 0/0 .rodata @9259 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9259 = 18.0f; -COMPILER_STRIP_GATE(807E2C7C, &lit_9259); +COMPILER_STRIP_GATE(0x807E2C7C, &lit_9259); #pragma pop /* 807E2C80-807E2C84 0002F4 0004+00 0/0 0/0 0/0 .rodata @9260 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9260 = 85.0f; -COMPILER_STRIP_GATE(807E2C80, &lit_9260); +COMPILER_STRIP_GATE(0x807E2C80, &lit_9260); #pragma pop /* 807E2C84-807E2C88 0002F8 0004+00 0/0 0/0 0/0 .rodata @9261 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9261 = -10.0f; -COMPILER_STRIP_GATE(807E2C84, &lit_9261); +COMPILER_STRIP_GATE(0x807E2C84, &lit_9261); #pragma pop /* 807E2C88-807E2C8C 0002FC 0004+00 0/0 0/0 0/0 .rodata @9262 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9262 = 180.0f; -COMPILER_STRIP_GATE(807E2C88, &lit_9262); +COMPILER_STRIP_GATE(0x807E2C88, &lit_9262); #pragma pop /* 807E2C8C-807E2C90 000300 0004+00 0/0 0/0 0/0 .rodata @9263 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_9263 = 0x3A03126F; -COMPILER_STRIP_GATE(807E2C8C, &lit_9263); +COMPILER_STRIP_GATE(0x807E2C8C, &lit_9263); #pragma pop /* 807E2C90-807E2C94 000304 0004+00 0/0 0/0 0/0 .rodata @9264 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9264 = -9110.0f; -COMPILER_STRIP_GATE(807E2C90, &lit_9264); +COMPILER_STRIP_GATE(0x807E2C90, &lit_9264); #pragma pop /* 807E2C94-807E2C98 000308 0004+00 0/0 0/0 0/0 .rodata @9265 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9265 = 492.0f; -COMPILER_STRIP_GATE(807E2C94, &lit_9265); +COMPILER_STRIP_GATE(0x807E2C94, &lit_9265); #pragma pop /* 807E2C98-807E2C9C 00030C 0004+00 0/0 0/0 0/0 .rodata @9266 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9266 = 331.0f; -COMPILER_STRIP_GATE(807E2C98, &lit_9266); +COMPILER_STRIP_GATE(0x807E2C98, &lit_9266); #pragma pop /* 807E2C9C-807E2CA0 000310 0004+00 0/0 0/0 0/0 .rodata @9267 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9267 = -8469.0f; -COMPILER_STRIP_GATE(807E2C9C, &lit_9267); +COMPILER_STRIP_GATE(0x807E2C9C, &lit_9267); #pragma pop /* 807E2CA0-807E2CA4 000314 0004+00 0/0 0/0 0/0 .rodata @9268 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9268 = 372.0f; -COMPILER_STRIP_GATE(807E2CA0, &lit_9268); +COMPILER_STRIP_GATE(0x807E2CA0, &lit_9268); #pragma pop /* 807E2CA4-807E2CA8 000318 0004+00 0/0 0/0 0/0 .rodata @9269 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9269 = -54.0f; -COMPILER_STRIP_GATE(807E2CA4, &lit_9269); +COMPILER_STRIP_GATE(0x807E2CA4, &lit_9269); #pragma pop /* 807E2CA8-807E2CAC 00031C 0004+00 0/0 0/0 0/0 .rodata @9270 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9270 = -12800.0f; -COMPILER_STRIP_GATE(807E2CA8, &lit_9270); +COMPILER_STRIP_GATE(0x807E2CA8, &lit_9270); #pragma pop /* 807E2CAC-807E2CB0 000320 0004+00 0/0 0/0 0/0 .rodata @9271 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9271 = 153.0f; -COMPILER_STRIP_GATE(807E2CAC, &lit_9271); +COMPILER_STRIP_GATE(0x807E2CAC, &lit_9271); #pragma pop /* 807E2CB0-807E2CB4 000324 0004+00 0/0 0/0 0/0 .rodata @9272 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9272 = 51.0f; -COMPILER_STRIP_GATE(807E2CB0, &lit_9272); +COMPILER_STRIP_GATE(0x807E2CB0, &lit_9272); #pragma pop /* 807E2CB4-807E2CB8 000328 0004+00 0/0 0/0 0/0 .rodata @9273 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9273 = -12022.0f; -COMPILER_STRIP_GATE(807E2CB4, &lit_9273); +COMPILER_STRIP_GATE(0x807E2CB4, &lit_9273); #pragma pop /* 807E2CB8-807E2CBC 00032C 0004+00 0/0 0/0 0/0 .rodata @9274 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9274 = -13168.0f; -COMPILER_STRIP_GATE(807E2CB8, &lit_9274); +COMPILER_STRIP_GATE(0x807E2CB8, &lit_9274); #pragma pop /* 807E2CBC-807E2CC0 000330 0004+00 0/0 0/0 0/0 .rodata @9275 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9275 = 163.0f; -COMPILER_STRIP_GATE(807E2CBC, &lit_9275); +COMPILER_STRIP_GATE(0x807E2CBC, &lit_9275); #pragma pop /* 807E2CC0-807E2CC4 000334 0004+00 0/0 0/0 0/0 .rodata @9276 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9276 = -12500.0f; -COMPILER_STRIP_GATE(807E2CC0, &lit_9276); +COMPILER_STRIP_GATE(0x807E2CC0, &lit_9276); #pragma pop /* 807E2CC4-807E2CC8 000338 0004+00 0/0 0/0 0/0 .rodata @9277 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9277 = 83.0f; -COMPILER_STRIP_GATE(807E2CC4, &lit_9277); +COMPILER_STRIP_GATE(0x807E2CC4, &lit_9277); #pragma pop /* 807E2CC8-807E2CCC 00033C 0004+00 0/0 0/0 0/0 .rodata @9278 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9278 = -593.0f; -COMPILER_STRIP_GATE(807E2CC8, &lit_9278); +COMPILER_STRIP_GATE(0x807E2CC8, &lit_9278); #pragma pop /* 807E2CCC-807E2CD0 000340 0004+00 0/0 0/0 0/0 .rodata @9279 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_9279 = 0x391D4952; -COMPILER_STRIP_GATE(807E2CCC, &lit_9279); +COMPILER_STRIP_GATE(0x807E2CCC, &lit_9279); #pragma pop /* 807E2CD0-807E2CD4 000344 0004+00 0/0 0/0 0/0 .rodata @9280 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9280 = 36156.0f; -COMPILER_STRIP_GATE(807E2CD0, &lit_9280); +COMPILER_STRIP_GATE(0x807E2CD0, &lit_9280); #pragma pop /* 807E2CD4-807E2CD8 000348 0004+00 0/0 0/0 0/0 .rodata @9281 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9281 = 985.0f; -COMPILER_STRIP_GATE(807E2CD4, &lit_9281); +COMPILER_STRIP_GATE(0x807E2CD4, &lit_9281); #pragma pop /* 807E2CD8-807E2CDC 00034C 0004+00 0/0 0/0 0/0 .rodata @9282 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9282 = -16931.0f; -COMPILER_STRIP_GATE(807E2CD8, &lit_9282); +COMPILER_STRIP_GATE(0x807E2CD8, &lit_9282); #pragma pop /* 807E2CDC-807E2CE0 000350 0004+00 0/0 0/0 0/0 .rodata @9283 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9283 = 36496.0f; -COMPILER_STRIP_GATE(807E2CDC, &lit_9283); +COMPILER_STRIP_GATE(0x807E2CDC, &lit_9283); #pragma pop /* 807E2CE0-807E2CE4 000354 0004+00 0/0 0/0 0/0 .rodata @9284 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9284 = 1358.0f; -COMPILER_STRIP_GATE(807E2CE0, &lit_9284); +COMPILER_STRIP_GATE(0x807E2CE0, &lit_9284); #pragma pop /* 807E2CE4-807E2CE8 000358 0004+00 0/0 0/0 0/0 .rodata @9285 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9285 = -17344.0f; -COMPILER_STRIP_GATE(807E2CE4, &lit_9285); +COMPILER_STRIP_GATE(0x807E2CE4, &lit_9285); #pragma pop /* 807E2CE8-807E2CEC 00035C 0004+00 0/0 0/0 0/0 .rodata @9286 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9286 = 36453.0f; -COMPILER_STRIP_GATE(807E2CE8, &lit_9286); +COMPILER_STRIP_GATE(0x807E2CE8, &lit_9286); #pragma pop /* 807E2CEC-807E2CF0 000360 0004+00 0/0 0/0 0/0 .rodata @9287 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9287 = 1116.0f; -COMPILER_STRIP_GATE(807E2CEC, &lit_9287); +COMPILER_STRIP_GATE(0x807E2CEC, &lit_9287); #pragma pop /* 807E2CF0-807E2CF4 000364 0004+00 0/0 0/0 0/0 .rodata @9288 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9288 = -16995.0f; -COMPILER_STRIP_GATE(807E2CF0, &lit_9288); +COMPILER_STRIP_GATE(0x807E2CF0, &lit_9288); #pragma pop /* 807E2CF4-807E2CF8 000368 0004+00 0/0 0/0 0/0 .rodata @9289 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9289 = 35835.0f; -COMPILER_STRIP_GATE(807E2CF4, &lit_9289); +COMPILER_STRIP_GATE(0x807E2CF4, &lit_9289); #pragma pop /* 807E2CF8-807E2CFC 00036C 0004+00 0/0 0/0 0/0 .rodata @9290 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9290 = 955.0f; -COMPILER_STRIP_GATE(807E2CF8, &lit_9290); +COMPILER_STRIP_GATE(0x807E2CF8, &lit_9290); #pragma pop /* 807E2CFC-807E2D00 000370 0004+00 0/0 0/0 0/0 .rodata @9291 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9291 = -16867.0f; -COMPILER_STRIP_GATE(807E2CFC, &lit_9291); +COMPILER_STRIP_GATE(0x807E2CFC, &lit_9291); #pragma pop /* 807E2D00-807E2D04 000374 0004+00 0/0 0/0 0/0 .rodata @9292 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9292 = -15200.0f; -COMPILER_STRIP_GATE(807E2D00, &lit_9292); +COMPILER_STRIP_GATE(0x807E2D00, &lit_9292); #pragma pop /* 807E2D04-807E2D08 000378 0004+00 0/0 0/0 0/0 .rodata @9293 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9293 = -20000.0f; -COMPILER_STRIP_GATE(807E2D04, &lit_9293); +COMPILER_STRIP_GATE(0x807E2D04, &lit_9293); #pragma pop /* 807E2D08-807E2D0C 00037C 0004+00 0/0 0/0 0/0 .rodata @9294 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9294 = 35528.0f; -COMPILER_STRIP_GATE(807E2D08, &lit_9294); +COMPILER_STRIP_GATE(0x807E2D08, &lit_9294); #pragma pop /* 807E2D0C-807E2D10 000380 0004+00 0/0 0/0 0/0 .rodata @9295 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9295 = 316.0f; -COMPILER_STRIP_GATE(807E2D0C, &lit_9295); +COMPILER_STRIP_GATE(0x807E2D0C, &lit_9295); #pragma pop /* 807E2D10-807E2D14 000384 0004+00 0/0 0/0 0/0 .rodata @9296 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9296 = -16987.0f; -COMPILER_STRIP_GATE(807E2D10, &lit_9296); +COMPILER_STRIP_GATE(0x807E2D10, &lit_9296); #pragma pop /* 807E2D14-807E2D18 000388 0004+00 0/0 0/0 0/0 .rodata @9297 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9297 = 35059.0f; -COMPILER_STRIP_GATE(807E2D14, &lit_9297); +COMPILER_STRIP_GATE(0x807E2D14, &lit_9297); #pragma pop /* 807E2D18-807E2D1C 00038C 0004+00 0/0 0/0 0/0 .rodata @9298 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9298 = -128.0f; -COMPILER_STRIP_GATE(807E2D18, &lit_9298); +COMPILER_STRIP_GATE(0x807E2D18, &lit_9298); #pragma pop /* 807E2D1C-807E2D20 000390 0004+00 0/0 0/0 0/0 .rodata @9299 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9299 = -16992.0f; -COMPILER_STRIP_GATE(807E2D1C, &lit_9299); +COMPILER_STRIP_GATE(0x807E2D1C, &lit_9299); #pragma pop /* 807E2D20-807E2D24 000394 0004+00 0/0 0/0 0/0 .rodata @9300 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9300 = 34973.0f; -COMPILER_STRIP_GATE(807E2D20, &lit_9300); +COMPILER_STRIP_GATE(0x807E2D20, &lit_9300); #pragma pop /* 807E2D24-807E2D28 000398 0004+00 0/0 0/0 0/0 .rodata @9301 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9301 = -148.0f; -COMPILER_STRIP_GATE(807E2D24, &lit_9301); +COMPILER_STRIP_GATE(0x807E2D24, &lit_9301); #pragma pop /* 807E2D28-807E2D2C 00039C 0004+00 0/0 0/0 0/0 .rodata @9302 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9302 = -16346.0f; -COMPILER_STRIP_GATE(807E2D28, &lit_9302); +COMPILER_STRIP_GATE(0x807E2D28, &lit_9302); #pragma pop /* 807E2D2C-807E2D30 0003A0 0004+00 0/0 0/0 0/0 .rodata @9303 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9303 = 3.0f / 40.0f; -COMPILER_STRIP_GATE(807E2D2C, &lit_9303); +COMPILER_STRIP_GATE(0x807E2D2C, &lit_9303); #pragma pop /* 807E2D30-807E2D34 0003A4 0004+00 0/0 0/0 0/0 .rodata @9304 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_9304 = 0x417B3333; -COMPILER_STRIP_GATE(807E2D30, &lit_9304); +COMPILER_STRIP_GATE(0x807E2D30, &lit_9304); #pragma pop /* 807E2D34-807E2D38 0003A8 0004+00 0/0 0/0 0/0 .rodata @9305 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9305 = -16820.0f; -COMPILER_STRIP_GATE(807E2D34, &lit_9305); +COMPILER_STRIP_GATE(0x807E2D34, &lit_9305); #pragma pop /* 807E2D38-807E2D3C 0003AC 0004+00 0/0 0/0 0/0 .rodata @9306 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9306 = -16170.0f; -COMPILER_STRIP_GATE(807E2D38, &lit_9306); +COMPILER_STRIP_GATE(0x807E2D38, &lit_9306); #pragma pop /* 807E2D3C-807E2D40 0003B0 0004+00 0/0 0/0 0/0 .rodata @9307 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9307 = 4.5f; -COMPILER_STRIP_GATE(807E2D3C, &lit_9307); +COMPILER_STRIP_GATE(0x807E2D3C, &lit_9307); #pragma pop /* 807E2D40-807E2D44 0003B4 0004+00 0/0 0/0 0/0 .rodata @9308 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9308 = 34843.0f; -COMPILER_STRIP_GATE(807E2D40, &lit_9308); +COMPILER_STRIP_GATE(0x807E2D40, &lit_9308); #pragma pop /* 807E2D44-807E2D48 0003B8 0004+00 0/0 0/0 0/0 .rodata @9309 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_9309 = 0xC2B96666; -COMPILER_STRIP_GATE(807E2D44, &lit_9309); +COMPILER_STRIP_GATE(0x807E2D44, &lit_9309); #pragma pop /* 807E2D48-807E2D4C 0003BC 0004+00 0/0 0/0 0/0 .rodata @9310 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9310 = -35956.0f; -COMPILER_STRIP_GATE(807E2D48, &lit_9310); +COMPILER_STRIP_GATE(0x807E2D48, &lit_9310); #pragma pop /* 807E2D4C-807E2D50 0003C0 0004+00 0/0 0/0 0/0 .rodata @9311 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9311 = 35167.0f; -COMPILER_STRIP_GATE(807E2D4C, &lit_9311); +COMPILER_STRIP_GATE(0x807E2D4C, &lit_9311); #pragma pop /* 807E2D50-807E2D54 0003C4 0004+00 0/0 0/0 0/0 .rodata @9312 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9312 = -202.0f; -COMPILER_STRIP_GATE(807E2D50, &lit_9312); +COMPILER_STRIP_GATE(0x807E2D50, &lit_9312); #pragma pop /* 807E2D54-807E2D58 0003C8 0004+00 0/0 0/0 0/0 .rodata @9313 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9313 = -35403.0f; -COMPILER_STRIP_GATE(807E2D54, &lit_9313); +COMPILER_STRIP_GATE(0x807E2D54, &lit_9313); #pragma pop /* 807E2D58-807E2D5C 0003CC 0004+00 0/0 0/0 0/0 .rodata @9314 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9314 = 34740.0f; -COMPILER_STRIP_GATE(807E2D58, &lit_9314); +COMPILER_STRIP_GATE(0x807E2D58, &lit_9314); #pragma pop /* 807E2D5C-807E2D60 0003D0 0004+00 0/0 0/0 0/0 .rodata @9315 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9315 = -35966.0f; -COMPILER_STRIP_GATE(807E2D5C, &lit_9315); +COMPILER_STRIP_GATE(0x807E2D5C, &lit_9315); #pragma pop /* 807E2D60-807E2D64 0003D4 0004+00 0/0 0/0 0/0 .rodata @9316 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9316 = 34320.0f; -COMPILER_STRIP_GATE(807E2D60, &lit_9316); +COMPILER_STRIP_GATE(0x807E2D60, &lit_9316); #pragma pop /* 807E2D64-807E2D68 0003D8 0004+00 0/0 0/0 0/0 .rodata @9317 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9317 = -35490.0f; -COMPILER_STRIP_GATE(807E2D64, &lit_9317); +COMPILER_STRIP_GATE(0x807E2D64, &lit_9317); #pragma pop /* 807E2D68-807E2D6C 0003DC 0004+00 0/0 0/0 0/0 .rodata @9318 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_9318 = 0x3BA3D70A; -COMPILER_STRIP_GATE(807E2D68, &lit_9318); +COMPILER_STRIP_GATE(0x807E2D68, &lit_9318); #pragma pop /* 807E2D6C-807E2D70 0003E0 0004+00 0/0 0/0 0/0 .rodata @9319 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_9319 = 0x3951B717; -COMPILER_STRIP_GATE(807E2D6C, &lit_9319); +COMPILER_STRIP_GATE(0x807E2D6C, &lit_9319); #pragma pop /* 807E2D70-807E2D74 0003E4 0004+00 0/0 0/0 0/0 .rodata @9320 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9320 = -18700.0f; -COMPILER_STRIP_GATE(807E2D70, &lit_9320); +COMPILER_STRIP_GATE(0x807E2D70, &lit_9320); #pragma pop /* 807E2D74-807E2D78 0003E8 0004+00 0/0 0/0 0/0 .rodata @9321 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9321 = 1679.0f; -COMPILER_STRIP_GATE(807E2D74, &lit_9321); +COMPILER_STRIP_GATE(0x807E2D74, &lit_9321); #pragma pop /* 807E2D78-807E2D7C 0003EC 0004+00 0/0 0/0 0/0 .rodata @9322 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9322 = 852.0f; -COMPILER_STRIP_GATE(807E2D78, &lit_9322); +COMPILER_STRIP_GATE(0x807E2D78, &lit_9322); #pragma pop /* 807E2D7C-807E2D80 0003F0 0004+00 0/0 0/0 0/0 .rodata @9323 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9323 = 1873.0f; -COMPILER_STRIP_GATE(807E2D7C, &lit_9323); +COMPILER_STRIP_GATE(0x807E2D7C, &lit_9323); #pragma pop /* 807E2D80-807E2D84 0003F4 0004+00 0/0 0/0 0/0 .rodata @9324 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9324 = 64.0f; -COMPILER_STRIP_GATE(807E2D80, &lit_9324); +COMPILER_STRIP_GATE(0x807E2D80, &lit_9324); #pragma pop /* 807E2D84-807E2D88 0003F8 0004+00 0/0 0/0 0/0 .rodata @9325 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9325 = 527.0f; -COMPILER_STRIP_GATE(807E2D84, &lit_9325); +COMPILER_STRIP_GATE(0x807E2D84, &lit_9325); #pragma pop /* 807E2D88-807E2D8C 0003FC 0004+00 0/0 0/0 0/0 .rodata @9326 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9326 = 1787.0f; -COMPILER_STRIP_GATE(807E2D88, &lit_9326); +COMPILER_STRIP_GATE(0x807E2D88, &lit_9326); #pragma pop /* 807E2D8C-807E2D90 000400 0004+00 0/0 0/0 0/0 .rodata @9327 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9327 = 1.75f; -COMPILER_STRIP_GATE(807E2D8C, &lit_9327); +COMPILER_STRIP_GATE(0x807E2D8C, &lit_9327); #pragma pop /* 807E2D90-807E2D94 000404 0004+00 0/0 0/0 0/0 .rodata @9328 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9328 = 484.0f; -COMPILER_STRIP_GATE(807E2D90, &lit_9328); +COMPILER_STRIP_GATE(0x807E2D90, &lit_9328); #pragma pop /* 807E2D94-807E2D98 000408 0004+00 0/0 0/0 0/0 .rodata @9329 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9329 = 1634.0f; -COMPILER_STRIP_GATE(807E2D94, &lit_9329); +COMPILER_STRIP_GATE(0x807E2D94, &lit_9329); #pragma pop /* 807E2D98-807E2D9C 00040C 0004+00 0/0 0/0 0/0 .rodata @9330 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9330 = 811.0f; -COMPILER_STRIP_GATE(807E2D98, &lit_9330); +COMPILER_STRIP_GATE(0x807E2D98, &lit_9330); #pragma pop /* 807E2D9C-807E2DA0 000410 0004+00 0/0 0/0 0/0 .rodata @9331 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9331 = 1717.0f; -COMPILER_STRIP_GATE(807E2D9C, &lit_9331); +COMPILER_STRIP_GATE(0x807E2D9C, &lit_9331); #pragma pop /* 807E2DA0-807E2DA4 000414 0004+00 0/0 0/0 0/0 .rodata @9332 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9332 = 96.0f; -COMPILER_STRIP_GATE(807E2DA0, &lit_9332); +COMPILER_STRIP_GATE(0x807E2DA0, &lit_9332); #pragma pop /* 807E2DA4-807E2DA8 000418 0004+00 0/0 0/0 0/0 .rodata @9333 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9333 = 910.0f; -COMPILER_STRIP_GATE(807E2DA4, &lit_9333); +COMPILER_STRIP_GATE(0x807E2DA4, &lit_9333); #pragma pop /* 807E2DA8-807E2DAC 00041C 0004+00 0/0 0/0 0/0 .rodata @9334 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9334 = 2226.0f; -COMPILER_STRIP_GATE(807E2DA8, &lit_9334); +COMPILER_STRIP_GATE(0x807E2DA8, &lit_9334); #pragma pop /* 807E2DAC-807E2DB0 000420 0004+00 0/0 0/0 0/0 .rodata @9335 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9335 = 56.0f; -COMPILER_STRIP_GATE(807E2DAC, &lit_9335); +COMPILER_STRIP_GATE(0x807E2DAC, &lit_9335); #pragma pop /* 807E2DB0-807E2DB4 000424 0004+00 0/0 0/0 0/0 .rodata @9336 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9336 = 751.0f; -COMPILER_STRIP_GATE(807E2DB0, &lit_9336); +COMPILER_STRIP_GATE(0x807E2DB0, &lit_9336); #pragma pop /* 807E2DB4-807E2DB8 000428 0004+00 0/0 0/0 0/0 .rodata @9337 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9337 = 1780.0f; -COMPILER_STRIP_GATE(807E2DB4, &lit_9337); +COMPILER_STRIP_GATE(0x807E2DB4, &lit_9337); #pragma pop /* 807E2DB8-807E2DBC 00042C 0004+00 0/0 0/0 0/0 .rodata @9338 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9338 = 92.0f; -COMPILER_STRIP_GATE(807E2DB8, &lit_9338); +COMPILER_STRIP_GATE(0x807E2DB8, &lit_9338); #pragma pop /* 807E2DBC-807E2DC0 000430 0004+00 0/0 0/0 0/0 .rodata @9339 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9339 = 967.0f; -COMPILER_STRIP_GATE(807E2DBC, &lit_9339); +COMPILER_STRIP_GATE(0x807E2DBC, &lit_9339); #pragma pop /* 807E2DC0-807E2DC4 000434 0004+00 0/0 0/0 0/0 .rodata @9340 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9340 = 1988.0f; -COMPILER_STRIP_GATE(807E2DC0, &lit_9340); +COMPILER_STRIP_GATE(0x807E2DC0, &lit_9340); #pragma pop /* 807E2DC4-807E2DC8 000438 0004+00 0/0 0/0 0/0 .rodata @9341 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9341 = 69.0f; -COMPILER_STRIP_GATE(807E2DC4, &lit_9341); +COMPILER_STRIP_GATE(0x807E2DC4, &lit_9341); #pragma pop /* 807E2DC8-807E2DCC 00043C 0004+00 0/0 0/0 0/0 .rodata @9342 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9342 = 475.0f; -COMPILER_STRIP_GATE(807E2DC8, &lit_9342); +COMPILER_STRIP_GATE(0x807E2DC8, &lit_9342); #pragma pop /* 807E2DCC-807E2DD0 000440 0004+00 0/0 0/0 0/0 .rodata @9343 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9343 = 2297.0f; -COMPILER_STRIP_GATE(807E2DCC, &lit_9343); +COMPILER_STRIP_GATE(0x807E2DCC, &lit_9343); #pragma pop /* 807E2DD0-807E2DD4 000444 0004+00 0/0 0/0 0/0 .rodata @9344 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9344 = 81.0f; -COMPILER_STRIP_GATE(807E2DD0, &lit_9344); +COMPILER_STRIP_GATE(0x807E2DD0, &lit_9344); #pragma pop /* 807E2DD4-807E2DD8 000448 0004+00 0/0 0/0 0/0 .rodata @9345 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9345 = 1668.0f; -COMPILER_STRIP_GATE(807E2DD4, &lit_9345); +COMPILER_STRIP_GATE(0x807E2DD4, &lit_9345); #pragma pop /* 807E2DD8-807E2DDC 00044C 0004+00 0/0 0/0 0/0 .rodata @9346 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9346 = 2285.0f; -COMPILER_STRIP_GATE(807E2DD8, &lit_9346); +COMPILER_STRIP_GATE(0x807E2DD8, &lit_9346); #pragma pop /* 807E2DDC-807E2DE0 000450 0004+00 0/0 0/0 0/0 .rodata @9347 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9347 = 95.0f; -COMPILER_STRIP_GATE(807E2DDC, &lit_9347); +COMPILER_STRIP_GATE(0x807E2DDC, &lit_9347); #pragma pop /* 807E2DE0-807E2DE4 000454 0004+00 0/0 0/0 0/0 .rodata @9348 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9348 = 2341.0f; -COMPILER_STRIP_GATE(807E2DE0, &lit_9348); +COMPILER_STRIP_GATE(0x807E2DE0, &lit_9348); #pragma pop /* 807E2DE4-807E2DE8 000458 0004+00 0/0 0/0 0/0 .rodata @9349 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9349 = 1292.0f; -COMPILER_STRIP_GATE(807E2DE4, &lit_9349); +COMPILER_STRIP_GATE(0x807E2DE4, &lit_9349); #pragma pop /* 807E2DE8-807E2DEC 00045C 0004+00 0/0 0/0 0/0 .rodata @9350 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9350 = 2120.0f; -COMPILER_STRIP_GATE(807E2DE8, &lit_9350); +COMPILER_STRIP_GATE(0x807E2DE8, &lit_9350); #pragma pop /* 807E2DEC-807E2DF0 000460 0004+00 0/0 0/0 0/0 .rodata @9351 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9351 = 2272.0f; -COMPILER_STRIP_GATE(807E2DEC, &lit_9351); +COMPILER_STRIP_GATE(0x807E2DEC, &lit_9351); #pragma pop /* 807E2DF0-807E2DF4 000464 0004+00 0/0 0/0 0/0 .rodata @9352 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9352 = 136.0f; -COMPILER_STRIP_GATE(807E2DF0, &lit_9352); +COMPILER_STRIP_GATE(0x807E2DF0, &lit_9352); #pragma pop /* 807E2DF4-807E2DF8 000468 0004+00 0/0 0/0 0/0 .rodata @9353 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9353 = 1555.0f; -COMPILER_STRIP_GATE(807E2DF4, &lit_9353); +COMPILER_STRIP_GATE(0x807E2DF4, &lit_9353); #pragma pop /* 807E2DF8-807E2DFC 00046C 0004+00 0/0 0/0 0/0 .rodata @9354 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9354 = 2056.0f; -COMPILER_STRIP_GATE(807E2DF8, &lit_9354); +COMPILER_STRIP_GATE(0x807E2DF8, &lit_9354); #pragma pop /* 807E2DFC-807E2E00 000470 0004+00 0/0 0/0 0/0 .rodata @9355 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9355 = 160.0f; -COMPILER_STRIP_GATE(807E2DFC, &lit_9355); +COMPILER_STRIP_GATE(0x807E2DFC, &lit_9355); #pragma pop /* 807E2E00-807E2E04 000474 0004+00 0/0 0/0 0/0 .rodata @9356 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9356 = 1318.0f; -COMPILER_STRIP_GATE(807E2E00, &lit_9356); +COMPILER_STRIP_GATE(0x807E2E00, &lit_9356); #pragma pop /* 807E2E04-807E2E08 000478 0004+00 0/0 0/0 0/0 .rodata @9357 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9357 = -40.0f; -COMPILER_STRIP_GATE(807E2E04, &lit_9357); +COMPILER_STRIP_GATE(0x807E2E04, &lit_9357); #pragma pop /* 807E2E08-807E2E0C 00047C 0004+00 0/0 0/0 0/0 .rodata @9358 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9358 = 2834.0f; -COMPILER_STRIP_GATE(807E2E08, &lit_9358); +COMPILER_STRIP_GATE(0x807E2E08, &lit_9358); #pragma pop /* 807E2E0C-807E2E10 000480 0004+00 0/0 0/0 0/0 .rodata @9359 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9359 = 490.0f; -COMPILER_STRIP_GATE(807E2E0C, &lit_9359); +COMPILER_STRIP_GATE(0x807E2E0C, &lit_9359); #pragma pop /* 807E2E10-807E2E14 000484 0004+00 0/0 0/0 0/0 .rodata @9360 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9360 = 1584.0f; -COMPILER_STRIP_GATE(807E2E10, &lit_9360); +COMPILER_STRIP_GATE(0x807E2E10, &lit_9360); #pragma pop /* 807E2E14-807E2E18 000488 0004+00 0/0 0/0 0/0 .rodata @9361 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9361 = 1978.0f; -COMPILER_STRIP_GATE(807E2E14, &lit_9361); +COMPILER_STRIP_GATE(0x807E2E14, &lit_9361); #pragma pop /* 807E2E18-807E2E1C 00048C 0004+00 0/0 0/0 0/0 .rodata @9362 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9362 = 87.0f; -COMPILER_STRIP_GATE(807E2E18, &lit_9362); +COMPILER_STRIP_GATE(0x807E2E18, &lit_9362); #pragma pop /* 807E2E1C-807E2E20 000490 0004+00 0/0 0/0 0/0 .rodata @9363 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9363 = 1225.0f; -COMPILER_STRIP_GATE(807E2E1C, &lit_9363); +COMPILER_STRIP_GATE(0x807E2E1C, &lit_9363); #pragma pop /* 807E2E20-807E2E24 000494 0004+00 0/0 0/0 0/0 .rodata @9364 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9364 = 1425.0f; -COMPILER_STRIP_GATE(807E2E20, &lit_9364); +COMPILER_STRIP_GATE(0x807E2E20, &lit_9364); #pragma pop /* 807E2E24-807E2E28 000498 0004+00 0/0 0/0 0/0 .rodata @9365 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9365 = 259.0f; -COMPILER_STRIP_GATE(807E2E24, &lit_9365); +COMPILER_STRIP_GATE(0x807E2E24, &lit_9365); #pragma pop /* 807E2E28-807E2E2C 00049C 0004+00 0/0 0/0 0/0 .rodata @9366 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9366 = 1583.0f; -COMPILER_STRIP_GATE(807E2E28, &lit_9366); +COMPILER_STRIP_GATE(0x807E2E28, &lit_9366); #pragma pop /* 807E2E2C-807E2E30 0004A0 0004+00 0/0 0/0 0/0 .rodata @9367 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9367 = 2265.0f; -COMPILER_STRIP_GATE(807E2E2C, &lit_9367); +COMPILER_STRIP_GATE(0x807E2E2C, &lit_9367); #pragma pop /* 807E2E30-807E2E34 0004A4 0004+00 0/0 0/0 0/0 .rodata @9368 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9368 = 127.0f; -COMPILER_STRIP_GATE(807E2E30, &lit_9368); +COMPILER_STRIP_GATE(0x807E2E30, &lit_9368); #pragma pop /* 807E2E34-807E2E38 0004A8 0004+00 0/0 0/0 0/0 .rodata @9369 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9369 = 1011.0f; -COMPILER_STRIP_GATE(807E2E34, &lit_9369); +COMPILER_STRIP_GATE(0x807E2E34, &lit_9369); #pragma pop /* 807E2E38-807E2E3C 0004AC 0004+00 0/0 0/0 0/0 .rodata @9370 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9370 = 1267.0f; -COMPILER_STRIP_GATE(807E2E38, &lit_9370); +COMPILER_STRIP_GATE(0x807E2E38, &lit_9370); #pragma pop /* 807E2E3C-807E2E40 0004B0 0004+00 0/0 0/0 0/0 .rodata @9371 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9371 = 821.0f; -COMPILER_STRIP_GATE(807E2E3C, &lit_9371); +COMPILER_STRIP_GATE(0x807E2E3C, &lit_9371); #pragma pop /* 807E2E40-807E2E44 0004B4 0004+00 0/0 0/0 0/0 .rodata @9372 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9372 = 1895.0f; -COMPILER_STRIP_GATE(807E2E40, &lit_9372); +COMPILER_STRIP_GATE(0x807E2E40, &lit_9372); #pragma pop /* 807E2E44-807E2E48 0004B8 0004+00 0/0 0/0 0/0 .rodata @9373 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9373 = 159.0f; -COMPILER_STRIP_GATE(807E2E44, &lit_9373); +COMPILER_STRIP_GATE(0x807E2E44, &lit_9373); #pragma pop /* 807E2E48-807E2E4C 0004BC 0004+00 0/0 0/0 0/0 .rodata @9374 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9374 = -129.0f; -COMPILER_STRIP_GATE(807E2E48, &lit_9374); +COMPILER_STRIP_GATE(0x807E2E48, &lit_9374); #pragma pop /* 807E2E4C-807E2E50 0004C0 0004+00 0/0 0/0 0/0 .rodata @9375 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9375 = 1984.0f; -COMPILER_STRIP_GATE(807E2E4C, &lit_9375); +COMPILER_STRIP_GATE(0x807E2E4C, &lit_9375); #pragma pop /* 807E2E50-807E2E54 0004C4 0004+00 0/0 0/0 0/0 .rodata @9376 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9376 = 151.0f; -COMPILER_STRIP_GATE(807E2E50, &lit_9376); +COMPILER_STRIP_GATE(0x807E2E50, &lit_9376); #pragma pop /* 807E2E54-807E2E58 0004C8 0004+00 0/0 0/0 0/0 .rodata @9377 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9377 = 158.0f; -COMPILER_STRIP_GATE(807E2E54, &lit_9377); +COMPILER_STRIP_GATE(0x807E2E54, &lit_9377); #pragma pop /* 807E2E58-807E2E5C 0004CC 0004+00 0/0 0/0 0/0 .rodata @9378 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9378 = 1800.0f; -COMPILER_STRIP_GATE(807E2E58, &lit_9378); +COMPILER_STRIP_GATE(0x807E2E58, &lit_9378); #pragma pop /* 807E2E5C-807E2E60 0004D0 0004+00 0/0 0/0 0/0 .rodata @9379 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9379 = -192.0f; -COMPILER_STRIP_GATE(807E2E5C, &lit_9379); +COMPILER_STRIP_GATE(0x807E2E5C, &lit_9379); #pragma pop /* 807E2E60-807E2E64 0004D4 0004+00 0/0 0/0 0/0 .rodata @9380 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9380 = 1631.0f; -COMPILER_STRIP_GATE(807E2E60, &lit_9380); +COMPILER_STRIP_GATE(0x807E2E60, &lit_9380); #pragma pop /* 807E2E64-807E2E68 0004D8 0004+00 0/0 0/0 0/0 .rodata @9381 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9381 = 195.0f; -COMPILER_STRIP_GATE(807E2E64, &lit_9381); +COMPILER_STRIP_GATE(0x807E2E64, &lit_9381); #pragma pop /* 807E2E68-807E2E6C 0004DC 0004+00 0/0 0/0 0/0 .rodata @9382 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9382 = -224.0f; -COMPILER_STRIP_GATE(807E2E68, &lit_9382); +COMPILER_STRIP_GATE(0x807E2E68, &lit_9382); #pragma pop /* 807E2E6C-807E2E70 0004E0 0004+00 0/0 0/0 0/0 .rodata @9383 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9383 = 1233.0f; -COMPILER_STRIP_GATE(807E2E6C, &lit_9383); +COMPILER_STRIP_GATE(0x807E2E6C, &lit_9383); #pragma pop /* 807E2E70-807E2E74 0004E4 0004+00 0/0 0/0 0/0 .rodata @9384 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9384 = 167.0f; -COMPILER_STRIP_GATE(807E2E70, &lit_9384); +COMPILER_STRIP_GATE(0x807E2E70, &lit_9384); #pragma pop /* 807E2E74-807E2E78 0004E8 0004+00 0/0 0/0 0/0 .rodata @9385 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9385 = 1400.0f; -COMPILER_STRIP_GATE(807E2E74, &lit_9385); +COMPILER_STRIP_GATE(0x807E2E74, &lit_9385); #pragma pop /* 807E2E78-807E2E7C 0004EC 0004+00 0/0 0/0 0/0 .rodata @9386 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9386 = -93640.0f; -COMPILER_STRIP_GATE(807E2E78, &lit_9386); +COMPILER_STRIP_GATE(0x807E2E78, &lit_9386); #pragma pop /* 807E2E7C-807E2E80 0004F0 0004+00 0/0 0/0 0/0 .rodata @9387 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9387 = 44000.0f; -COMPILER_STRIP_GATE(807E2E7C, &lit_9387); +COMPILER_STRIP_GATE(0x807E2E7C, &lit_9387); #pragma pop /* 807E2E80-807E2E84 0004F4 0004+00 0/0 0/0 0/0 .rodata @9388 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9388 = -93335.0f; -COMPILER_STRIP_GATE(807E2E80, &lit_9388); +COMPILER_STRIP_GATE(0x807E2E80, &lit_9388); #pragma pop /* 807E2E84-807E2E88 0004F8 0004+00 0/0 0/0 0/0 .rodata @9389 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9389 = 44500.0f; -COMPILER_STRIP_GATE(807E2E84, &lit_9389); +COMPILER_STRIP_GATE(0x807E2E84, &lit_9389); #pragma pop /* 807E2E88-807E2E8C 0004FC 0004+00 0/0 0/0 0/0 .rodata @9390 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9390 = -1300.0f; -COMPILER_STRIP_GATE(807E2E88, &lit_9390); +COMPILER_STRIP_GATE(0x807E2E88, &lit_9390); #pragma pop /* 807E2E8C-807E2E90 000500 0004+00 0/0 0/0 0/0 .rodata @9391 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9391 = 23.0f; -COMPILER_STRIP_GATE(807E2E8C, &lit_9391); +COMPILER_STRIP_GATE(0x807E2E8C, &lit_9391); #pragma pop /* 807E2E90-807E2E94 000504 0004+00 0/0 0/0 0/0 .rodata @9392 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9392 = -93217.0f; -COMPILER_STRIP_GATE(807E2E90, &lit_9392); +COMPILER_STRIP_GATE(0x807E2E90, &lit_9392); #pragma pop /* 807E2E94-807E2E98 000508 0004+00 0/0 0/0 0/0 .rodata @9393 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9393 = -5783.0f; -COMPILER_STRIP_GATE(807E2E94, &lit_9393); +COMPILER_STRIP_GATE(0x807E2E94, &lit_9393); #pragma pop /* 807E2E98-807E2E9C 00050C 0004+00 0/0 0/0 0/0 .rodata @9394 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9394 = 44734.0f; -COMPILER_STRIP_GATE(807E2E98, &lit_9394); +COMPILER_STRIP_GATE(0x807E2E98, &lit_9394); #pragma pop /* 807E2E9C-807E2EA0 000510 0004+00 0/0 0/0 0/0 .rodata @9395 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9395 = -92351.0f; -COMPILER_STRIP_GATE(807E2E9C, &lit_9395); +COMPILER_STRIP_GATE(0x807E2E9C, &lit_9395); #pragma pop /* 807E2EA0-807E2EA4 000514 0004+00 0/0 0/0 0/0 .rodata @9396 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9396 = -4742.0f; -COMPILER_STRIP_GATE(807E2EA0, &lit_9396); +COMPILER_STRIP_GATE(0x807E2EA0, &lit_9396); #pragma pop /* 807E2EA4-807E2EA8 000518 0004+00 0/0 0/0 0/0 .rodata @9397 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9397 = 43295.0f; -COMPILER_STRIP_GATE(807E2EA4, &lit_9397); +COMPILER_STRIP_GATE(0x807E2EA4, &lit_9397); #pragma pop /* 807E2EA8-807E2EAC 00051C 0004+00 0/0 0/0 0/0 .rodata @9398 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9398 = -93375.0f; -COMPILER_STRIP_GATE(807E2EA8, &lit_9398); +COMPILER_STRIP_GATE(0x807E2EA8, &lit_9398); #pragma pop /* 807E2EAC-807E2EB0 000520 0004+00 0/0 0/0 0/0 .rodata @9399 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9399 = -5700.0f; -COMPILER_STRIP_GATE(807E2EAC, &lit_9399); +COMPILER_STRIP_GATE(0x807E2EAC, &lit_9399); #pragma pop /* 807E2EB0-807E2EB4 000524 0004+00 0/0 0/0 0/0 .rodata @9400 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9400 = 44622.0f; -COMPILER_STRIP_GATE(807E2EB0, &lit_9400); +COMPILER_STRIP_GATE(0x807E2EB0, &lit_9400); #pragma pop /* 807E2EB4-807E2EB8 000528 0004+00 0/0 0/0 0/0 .rodata @9401 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9401 = -93153.0f; -COMPILER_STRIP_GATE(807E2EB4, &lit_9401); +COMPILER_STRIP_GATE(0x807E2EB4, &lit_9401); #pragma pop /* 807E2EB8-807E2EBC 00052C 0004+00 0/0 0/0 0/0 .rodata @9402 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9402 = -5635.0f; -COMPILER_STRIP_GATE(807E2EB8, &lit_9402); +COMPILER_STRIP_GATE(0x807E2EB8, &lit_9402); #pragma pop /* 807E2EBC-807E2EC0 000530 0004+00 0/0 0/0 0/0 .rodata @9403 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9403 = 44717.0f; -COMPILER_STRIP_GATE(807E2EBC, &lit_9403); +COMPILER_STRIP_GATE(0x807E2EBC, &lit_9403); #pragma pop /* 807E2EC0-807E2EC4 000534 0004+00 0/0 0/0 0/0 .rodata @9404 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_9404 = 0x3D872B02; -COMPILER_STRIP_GATE(807E2EC0, &lit_9404); +COMPILER_STRIP_GATE(0x807E2EC0, &lit_9404); #pragma pop /* 807E2EC4-807E2EC8 000538 0004+00 0/1 0/0 0/0 .rodata @9405 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9405 = 828.0f; -COMPILER_STRIP_GATE(807E2EC4, &lit_9405); +COMPILER_STRIP_GATE(0x807E2EC4, &lit_9405); #pragma pop /* 807E2EC8-807E2ECC 00053C 0004+00 0/1 0/0 0/0 .rodata @9406 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9406 = 554.0f; -COMPILER_STRIP_GATE(807E2EC8, &lit_9406); +COMPILER_STRIP_GATE(0x807E2EC8, &lit_9406); #pragma pop /* 807E2ECC-807E2ED0 000540 0004+00 0/1 0/0 0/0 .rodata @9781 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9781 = 9.0f; -COMPILER_STRIP_GATE(807E2ECC, &lit_9781); +COMPILER_STRIP_GATE(0x807E2ECC, &lit_9781); #pragma pop /* 807E2ED0-807E2ED4 000544 0004+00 0/1 0/0 0/0 .rodata @9782 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9782 = 16.0f; -COMPILER_STRIP_GATE(807E2ED0, &lit_9782); +COMPILER_STRIP_GATE(0x807E2ED0, &lit_9782); #pragma pop /* 807E2ED4-807E2ED8 000548 0004+00 0/1 0/0 0/0 .rodata @9783 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9783 = 14.0f; -COMPILER_STRIP_GATE(807E2ED4, &lit_9783); +COMPILER_STRIP_GATE(0x807E2ED4, &lit_9783); #pragma pop /* 807E2ED8-807E2EDC 00054C 0004+00 0/1 0/0 0/0 .rodata @9784 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9784 = 7.5f; -COMPILER_STRIP_GATE(807E2ED8, &lit_9784); +COMPILER_STRIP_GATE(0x807E2ED8, &lit_9784); #pragma pop /* 807E2EDC-807E2EE0 000550 0004+00 0/1 0/0 0/0 .rodata @9785 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9785 = 12.5f; -COMPILER_STRIP_GATE(807E2EDC, &lit_9785); +COMPILER_STRIP_GATE(0x807E2EDC, &lit_9785); #pragma pop /* 807E2EE0-807E2EE4 000554 0004+00 0/1 0/0 0/0 .rodata @9786 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9786 = 17.0f; -COMPILER_STRIP_GATE(807E2EE0, &lit_9786); +COMPILER_STRIP_GATE(0x807E2EE0, &lit_9786); #pragma pop /* 807DFB18-807E0388 00D778 0870+00 1/1 0/0 0/0 .text anm_se_eff_set__FP10e_wb_class */ @@ -4504,42 +4532,42 @@ static asm void anm_se_eff_set(e_wb_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10098 = -100.0f; -COMPILER_STRIP_GATE(807E2EE4, &lit_10098); +COMPILER_STRIP_GATE(0x807E2EE4, &lit_10098); #pragma pop /* 807E2EE8-807E2EEC 00055C 0004+00 0/1 0/0 0/0 .rodata @10099 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10099 = -1000000000.0f; -COMPILER_STRIP_GATE(807E2EE8, &lit_10099); +COMPILER_STRIP_GATE(0x807E2EE8, &lit_10099); #pragma pop /* 807E2EEC-807E2EF0 000560 0004+00 0/1 0/0 0/0 .rodata @10100 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10100 = 11.0f / 10.0f; -COMPILER_STRIP_GATE(807E2EEC, &lit_10100); +COMPILER_STRIP_GATE(0x807E2EEC, &lit_10100); #pragma pop /* 807E2EF0-807E2EF4 000564 0004+00 0/1 0/0 0/0 .rodata @10101 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10101 = -200000.0f; -COMPILER_STRIP_GATE(807E2EF0, &lit_10101); +COMPILER_STRIP_GATE(0x807E2EF0, &lit_10101); #pragma pop /* 807E2EF4-807E2EF8 000568 0004+00 0/1 0/0 0/0 .rodata @10102 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10102 = 200000.0f; -COMPILER_STRIP_GATE(807E2EF4, &lit_10102); +COMPILER_STRIP_GATE(0x807E2EF4, &lit_10102); #pragma pop /* 807E2EF8-807E2EFC 00056C 0004+00 0/1 0/0 0/0 .rodata @10103 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10103 = 9.0f / 10.0f; -COMPILER_STRIP_GATE(807E2EF8, &lit_10103); +COMPILER_STRIP_GATE(0x807E2EF8, &lit_10103); #pragma pop /* 807E3804-807E3814 000294 000C+04 0/0 0/0 0/0 .bss @7814 */ @@ -4621,6 +4649,13 @@ static asm void daE_WB_Delete(e_wb_class* param_0) { } #pragma pop +/* ############################################################################################## */ +/* 807E2F0C-807E2F0C 000580 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_807E2F44 = "Always"; +#pragma pop + /* 807E108C-807E13A8 00ECEC 031C+00 1/1 0/0 0/0 .text useHeapInit__FP10fopAc_ac_c */ #pragma push #pragma optimization_level 0 @@ -4636,21 +4671,28 @@ static asm void useHeapInit(fopAc_ac_c* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10531 = 13000.0f; -COMPILER_STRIP_GATE(807E2EFC, &lit_10531); +COMPILER_STRIP_GATE(0x807E2EFC, &lit_10531); #pragma pop /* 807E2F00-807E2F04 000574 0004+00 0/1 0/0 0/0 .rodata @10532 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10532 = -800.0f; -COMPILER_STRIP_GATE(807E2F00, &lit_10532); +COMPILER_STRIP_GATE(0x807E2F00, &lit_10532); #pragma pop /* 807E2F04-807E2F08 000578 0004+00 0/1 0/0 0/0 .rodata @10533 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10533 = 30000.0f; -COMPILER_STRIP_GATE(807E2F04, &lit_10533); +COMPILER_STRIP_GATE(0x807E2F04, &lit_10533); +#pragma pop + +/* 807E2F0C-807E2F0C 000580 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_807E2F4B = "E_bb"; +SECTION_DEAD static char const* const stringBase_807E2F50 = "E_wb"; #pragma pop /* 807E13A8-807E1CB0 00F008 0908+00 1/0 0/0 0/0 .text daE_WB_Create__FP10fopAc_ac_c */ @@ -4793,7 +4835,7 @@ asm daE_WB_HIO_c::~daE_WB_HIO_c() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10638 = -14900.0f; -COMPILER_STRIP_GATE(807E2F08, &lit_10638); +COMPILER_STRIP_GATE(0x807E2F08, &lit_10638); #pragma pop /* 807E2124-807E2238 00FD84 0114+00 0/0 1/0 0/0 .text __sinit_d_a_e_wb_cpp */ @@ -4808,7 +4850,7 @@ asm void __sinit_d_a_e_wb_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_807E2124 = (void*)__sinit_d_a_e_wb_cpp; +REGISTER_CTORS(0x807E2124, __sinit_d_a_e_wb_cpp); #pragma pop /* 807E2238-807E2270 00FE98 0038+00 1/1 0/0 0/0 .text __arraydtor$5742 */ @@ -4884,15 +4926,10 @@ asm void daPy_py_c::changeDemoMode(u32 param_0, int param_1, int param_2, s16 pa } #pragma pop -/* 807E2348-807E2350 00FFA8 0008+00 1/1 0/0 0/0 .text changeDemoParam2__9daPy_py_cFs */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daPy_py_c::changeDemoParam2(s16 param_0) { - nofralloc -#include "asm/rel/d/a/e/d_a_e_wb/d_a_e_wb/changeDemoParam2__9daPy_py_cFs.s" +/* 807E2348-807E2350 -00001 0008+00 0/0 0/0 0/0 .text changeDemoParam2__9daPy_py_cFs */ +void daPy_py_c::changeDemoParam2(s16 param_0) { + *(u16*)(((u8*)this) + 1546) /* this->field_0x60a */ = (u16)(param_0); } -#pragma pop /* 807E2350-807E235C 00FFB0 000C+00 1/1 0/0 0/0 .text fabsf__3stdFf */ #pragma push @@ -5173,15 +5210,10 @@ asm void daHorse_c::cancelOriginalDemo() { } #pragma pop -/* 807E27D0-807E27D8 010430 0008+00 1/1 0/0 0/0 .text __ct__10JAISoundIDFUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm JAISoundID::JAISoundID(u32 param_0) { - nofralloc -#include "asm/rel/d/a/e/d_a_e_wb/d_a_e_wb/__ct__10JAISoundIDFUl.s" +/* 807E27D0-807E27D8 -00001 0008+00 0/0 0/0 0/0 .text __ct__10JAISoundIDFUl */ +JAISoundID::JAISoundID(u32 param_0) { + *(u32*)this = (u32)(param_0); } -#pragma pop /* 807E27D8-807E27E8 010438 0010+00 1/1 0/0 0/0 .text dComIfGp_getVibration__Fv */ #pragma push @@ -5309,7 +5341,7 @@ static asm void dComIfGp_getEvent() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -static asm void fpcM_Search(void* (*)(void*, void*), void* param_1) { +static asm void fpcM_Search(void* (*param_0)(void*, void*), void* param_1) { nofralloc #include "asm/rel/d/a/e/d_a_e_wb/d_a_e_wb/fpcM_Search__FPFPvPv_PvPv.s" } @@ -5504,18 +5536,4 @@ static u8 data_807E3900[4]; static u8 data_807E3904[4]; #pragma pop -/* 807E2F0C-807E2F55 000580 0049+00 6/6 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_807E2F0C = "F_SP118"; -SECTION_DEAD static char const* const stringBase_807E2F14 = "RiderBoss"; -SECTION_DEAD static char const* const stringBase_807E2F1E = "action"; -SECTION_DEAD static char const* const stringBase_807E2F25 = "F_SP124"; -SECTION_DEAD static char const* const stringBase_807E2F2D = "D_MN09"; -SECTION_DEAD static char const* const stringBase_807E2F34 = "F_SP102"; -SECTION_DEAD static char const* const stringBase_807E2F3C = "F_SP121"; -SECTION_DEAD static char const* const stringBase_807E2F44 = "Always"; -SECTION_DEAD static char const* const stringBase_807E2F4B = "E_bb"; -SECTION_DEAD static char const* const stringBase_807E2F50 = "E_wb"; -#pragma pop +/* 807E2F0C-807E2F0C 000580 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/e/d_a_e_ws/d_a_e_ws.cpp b/rel/d/a/e/d_a_e_ws/d_a_e_ws.cpp index 1be4a190fe7..2888ff1da78 100644 --- a/rel/d/a/e/d_a_e_ws/d_a_e_ws.cpp +++ b/rel/d/a/e/d_a_e_ws/d_a_e_ws.cpp @@ -31,16 +31,16 @@ struct mDoMtx_stack_c { static u8 now[48]; }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; - struct J3DAnmTransform {}; +struct J3DModelData {}; + +struct Z2Creature {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -434,7 +434,7 @@ extern "C" void __register_global_object(); /* ############################################################################################## */ /* 807E7300-807E7304 000000 0004+00 15/15 0/0 0/0 .rodata @3802 */ SECTION_RODATA static f32 const lit_3802 = 100.0f; -COMPILER_STRIP_GATE(807E7300, &lit_3802); +COMPILER_STRIP_GATE(0x807E7300, &lit_3802); /* 807E7304-807E7308 000004 0004+00 3/16 0/0 0/0 .rodata @3803 */ SECTION_RODATA static u8 const lit_3803[4] = { @@ -443,7 +443,7 @@ SECTION_RODATA static u8 const lit_3803[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(807E7304, &lit_3803); +COMPILER_STRIP_GATE(0x807E7304, &lit_3803); /* 807E7308-807E7310 000008 0004+04 1/7 0/0 0/0 .rodata @3804 */ SECTION_RODATA static f32 const lit_3804[1 + 1 /* padding */] = { @@ -451,7 +451,7 @@ SECTION_RODATA static f32 const lit_3804[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(807E7308, &lit_3804); +COMPILER_STRIP_GATE(0x807E7308, &lit_3804); /* 807E7310-807E7318 000010 0008+00 0/4 0/0 0/0 .rodata @3805 */ #pragma push @@ -459,7 +459,7 @@ COMPILER_STRIP_GATE(807E7308, &lit_3804); SECTION_RODATA static u8 const lit_3805[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(807E7310, &lit_3805); +COMPILER_STRIP_GATE(0x807E7310, &lit_3805); #pragma pop /* 807E7318-807E7320 000018 0008+00 0/4 0/0 0/0 .rodata @3806 */ @@ -468,7 +468,7 @@ COMPILER_STRIP_GATE(807E7310, &lit_3805); SECTION_RODATA static u8 const lit_3806[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(807E7318, &lit_3806); +COMPILER_STRIP_GATE(0x807E7318, &lit_3806); #pragma pop /* 807E7320-807E7328 000020 0008+00 0/4 0/0 0/0 .rodata @3807 */ @@ -477,60 +477,60 @@ COMPILER_STRIP_GATE(807E7318, &lit_3806); SECTION_RODATA static u8 const lit_3807[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(807E7320, &lit_3807); +COMPILER_STRIP_GATE(0x807E7320, &lit_3807); #pragma pop /* 807E7328-807E732C 000028 0004+00 0/1 0/0 0/0 .rodata @3808 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3808 = 1.0f / 100.0f; -COMPILER_STRIP_GATE(807E7328, &lit_3808); +COMPILER_STRIP_GATE(0x807E7328, &lit_3808); #pragma pop /* 807E732C-807E7330 00002C 0004+00 0/2 0/0 0/0 .rodata @3823 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3823 = 4.0f / 5.0f; -COMPILER_STRIP_GATE(807E732C, &lit_3823); +COMPILER_STRIP_GATE(0x807E732C, &lit_3823); #pragma pop /* 807E7330-807E7334 000030 0004+00 0/3 0/0 0/0 .rodata @3824 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3824 = 50.0f; -COMPILER_STRIP_GATE(807E7330, &lit_3824); +COMPILER_STRIP_GATE(0x807E7330, &lit_3824); #pragma pop /* 807E7334-807E7338 000034 0004+00 0/1 0/0 0/0 .rodata @3825 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3825 = 300.0f; -COMPILER_STRIP_GATE(807E7334, &lit_3825); +COMPILER_STRIP_GATE(0x807E7334, &lit_3825); #pragma pop /* 807E7338-807E733C 000038 0004+00 1/4 0/0 0/0 .rodata @3826 */ SECTION_RODATA static f32 const lit_3826 = 200.0f; -COMPILER_STRIP_GATE(807E7338, &lit_3826); +COMPILER_STRIP_GATE(0x807E7338, &lit_3826); /* 807E733C-807E7340 00003C 0004+00 0/1 0/0 0/0 .rodata @3827 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3827 = 270.0f; -COMPILER_STRIP_GATE(807E733C, &lit_3827); +COMPILER_STRIP_GATE(0x807E733C, &lit_3827); #pragma pop /* 807E7340-807E7344 000040 0004+00 0/1 0/0 0/0 .rodata @3828 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3828 = 18200.0f; -COMPILER_STRIP_GATE(807E7340, &lit_3828); +COMPILER_STRIP_GATE(0x807E7340, &lit_3828); #pragma pop /* 807E7344-807E7348 000044 0004+00 0/1 0/0 0/0 .rodata @3829 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3829 = 10.0f; -COMPILER_STRIP_GATE(807E7344, &lit_3829); +COMPILER_STRIP_GATE(0x807E7344, &lit_3829); #pragma pop /* 807E7410-807E741C 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ @@ -710,7 +710,7 @@ asm daE_WS_HIO_c::daE_WS_HIO_c() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3871 = 400.0f; -COMPILER_STRIP_GATE(807E7348, &lit_3871); +COMPILER_STRIP_GATE(0x807E7348, &lit_3871); #pragma pop /* 807E3A6C-807E3C00 00014C 0194+00 1/1 0/0 0/0 .text draw__8daE_WS_cFv */ @@ -736,7 +736,13 @@ static asm void daE_WS_Draw(daE_WS_c* param_0) { /* ############################################################################################## */ /* 807E734C-807E7350 00004C 0004+00 1/1 0/0 0/0 .rodata @3885 */ SECTION_RODATA static f32 const lit_3885 = -1.0f; -COMPILER_STRIP_GATE(807E734C, &lit_3885); +COMPILER_STRIP_GATE(0x807E734C, &lit_3885); + +/* 807E7404-807E7404 000104 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_807E7404 = "E_WS"; +#pragma pop /* 807E3C20-807E3CC4 000300 00A4+00 4/4 0/0 0/0 .text setBck__8daE_WS_cFiUcff */ #pragma push @@ -753,123 +759,123 @@ asm void daE_WS_c::setBck(int param_0, u8 param_1, f32 param_2, f32 param_3) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3952 = 4.5f; -COMPILER_STRIP_GATE(807E7350, &lit_3952); +COMPILER_STRIP_GATE(0x807E7350, &lit_3952); #pragma pop /* 807E7354-807E7358 000054 0004+00 0/2 0/0 0/0 .rodata @3953 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3953 = 7.5f; -COMPILER_STRIP_GATE(807E7354, &lit_3953); +COMPILER_STRIP_GATE(0x807E7354, &lit_3953); #pragma pop /* 807E7358-807E735C 000058 0004+00 0/1 0/0 0/0 .rodata @3954 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3954 = 9.0f; -COMPILER_STRIP_GATE(807E7358, &lit_3954); +COMPILER_STRIP_GATE(0x807E7358, &lit_3954); #pragma pop /* 807E735C-807E7360 00005C 0004+00 0/1 0/0 0/0 .rodata @3955 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3955 = 13.5f; -COMPILER_STRIP_GATE(807E735C, &lit_3955); +COMPILER_STRIP_GATE(0x807E735C, &lit_3955); #pragma pop /* 807E7360-807E7364 000060 0004+00 0/1 0/0 0/0 .rodata @3956 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3956 = 16.0f; -COMPILER_STRIP_GATE(807E7360, &lit_3956); +COMPILER_STRIP_GATE(0x807E7360, &lit_3956); #pragma pop /* 807E7364-807E7368 000064 0004+00 0/1 0/0 0/0 .rodata @3957 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3957 = 19.0f; -COMPILER_STRIP_GATE(807E7364, &lit_3957); +COMPILER_STRIP_GATE(0x807E7364, &lit_3957); #pragma pop /* 807E7368-807E736C 000068 0004+00 0/1 0/0 0/0 .rodata @3958 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3958 = 23.5f; -COMPILER_STRIP_GATE(807E7368, &lit_3958); +COMPILER_STRIP_GATE(0x807E7368, &lit_3958); #pragma pop /* 807E736C-807E7370 00006C 0004+00 0/2 0/0 0/0 .rodata @3959 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3959 = 25.0f; -COMPILER_STRIP_GATE(807E736C, &lit_3959); +COMPILER_STRIP_GATE(0x807E736C, &lit_3959); #pragma pop /* 807E7370-807E7374 000070 0004+00 0/1 0/0 0/0 .rodata @3960 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3960 = 28.0f; -COMPILER_STRIP_GATE(807E7370, &lit_3960); +COMPILER_STRIP_GATE(0x807E7370, &lit_3960); #pragma pop /* 807E7374-807E7378 000074 0004+00 0/1 0/0 0/0 .rodata @3961 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3961 = 32.5f; -COMPILER_STRIP_GATE(807E7374, &lit_3961); +COMPILER_STRIP_GATE(0x807E7374, &lit_3961); #pragma pop /* 807E7378-807E737C 000078 0004+00 0/1 0/0 0/0 .rodata @3962 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3962 = 36.0f; -COMPILER_STRIP_GATE(807E7378, &lit_3962); +COMPILER_STRIP_GATE(0x807E7378, &lit_3962); #pragma pop /* 807E737C-807E7380 00007C 0004+00 0/1 0/0 0/0 .rodata @3963 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3963 = 39.5f; -COMPILER_STRIP_GATE(807E737C, &lit_3963); +COMPILER_STRIP_GATE(0x807E737C, &lit_3963); #pragma pop /* 807E7380-807E7384 000080 0004+00 1/3 0/0 0/0 .rodata @3964 */ SECTION_RODATA static f32 const lit_3964 = 0.5f; -COMPILER_STRIP_GATE(807E7380, &lit_3964); +COMPILER_STRIP_GATE(0x807E7380, &lit_3964); /* 807E7384-807E7388 000084 0004+00 0/1 0/0 0/0 .rodata @3965 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3965 = 6.0f; -COMPILER_STRIP_GATE(807E7384, &lit_3965); +COMPILER_STRIP_GATE(0x807E7384, &lit_3965); #pragma pop /* 807E7388-807E738C 000088 0004+00 0/1 0/0 0/0 .rodata @3966 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3966 = 11.0f; -COMPILER_STRIP_GATE(807E7388, &lit_3966); +COMPILER_STRIP_GATE(0x807E7388, &lit_3966); #pragma pop /* 807E738C-807E7390 00008C 0004+00 0/1 0/0 0/0 .rodata @3967 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3967 = 21.0f; -COMPILER_STRIP_GATE(807E738C, &lit_3967); +COMPILER_STRIP_GATE(0x807E738C, &lit_3967); #pragma pop /* 807E7390-807E7394 000090 0004+00 0/1 0/0 0/0 .rodata @3968 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3968 = 26.5f; -COMPILER_STRIP_GATE(807E7390, &lit_3968); +COMPILER_STRIP_GATE(0x807E7390, &lit_3968); #pragma pop /* 807E7394-807E7398 000094 0004+00 0/1 0/0 0/0 .rodata @3969 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3969 = 31.0f; -COMPILER_STRIP_GATE(807E7394, &lit_3969); +COMPILER_STRIP_GATE(0x807E7394, &lit_3969); #pragma pop /* 807E3CC4-807E3F90 0003A4 02CC+00 2/2 0/0 0/0 .text setFootSound__8daE_WS_cFv */ @@ -941,7 +947,7 @@ SECTION_RODATA static f32 const lit_4145[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(807E7398, &lit_4145); +COMPILER_STRIP_GATE(0x807E7398, &lit_4145); #pragma pop /* 807E73A0-807E73A8 0000A0 0008+00 0/1 0/0 0/0 .rodata @4147 */ @@ -950,7 +956,7 @@ COMPILER_STRIP_GATE(807E7398, &lit_4145); SECTION_RODATA static u8 const lit_4147[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(807E73A0, &lit_4147); +COMPILER_STRIP_GATE(0x807E73A0, &lit_4147); #pragma pop /* 807E4224-807E4568 000904 0344+00 1/1 0/0 0/0 .text checkPlayerPos__8daE_WS_cFv */ @@ -978,7 +984,7 @@ asm void daE_WS_c::checkAttackEnd() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4263 = 3.0f; -COMPILER_STRIP_GATE(807E73A8, &lit_4263); +COMPILER_STRIP_GATE(0x807E73A8, &lit_4263); #pragma pop /* 807E470C-807E4AB8 000DEC 03AC+00 2/1 0/0 0/0 .text executeWait__8daE_WS_cFv */ @@ -996,35 +1002,35 @@ asm void daE_WS_c::executeWait() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4264 = 32768.0f; -COMPILER_STRIP_GATE(807E73AC, &lit_4264); +COMPILER_STRIP_GATE(0x807E73AC, &lit_4264); #pragma pop /* 807E73B0-807E73B4 0000B0 0004+00 0/0 0/0 0/0 .rodata @4265 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4265 = 12.0f / 5.0f; -COMPILER_STRIP_GATE(807E73B0, &lit_4265); +COMPILER_STRIP_GATE(0x807E73B0, &lit_4265); #pragma pop /* 807E73B4-807E73B8 0000B4 0004+00 0/0 0/0 0/0 .rodata @4266 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4266 = 6.0f / 5.0f; -COMPILER_STRIP_GATE(807E73B4, &lit_4266); +COMPILER_STRIP_GATE(0x807E73B4, &lit_4266); #pragma pop /* 807E73B8-807E73BC 0000B8 0004+00 0/1 0/0 0/0 .rodata @4267 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4267 = 20.0f; -COMPILER_STRIP_GATE(807E73B8, &lit_4267); +COMPILER_STRIP_GATE(0x807E73B8, &lit_4267); #pragma pop /* 807E73BC-807E73C0 0000BC 0004+00 0/1 0/0 0/0 .rodata @4366 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4366 = 3.5f; -COMPILER_STRIP_GATE(807E73BC, &lit_4366); +COMPILER_STRIP_GATE(0x807E73BC, &lit_4366); #pragma pop /* 807E4AB8-807E4E68 001198 03B0+00 1/1 0/0 0/0 .text executeAttack__8daE_WS_cFv */ @@ -1042,49 +1048,49 @@ asm void daE_WS_c::executeAttack() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4442 = 4.0f; -COMPILER_STRIP_GATE(807E73C0, &lit_4442); +COMPILER_STRIP_GATE(0x807E73C0, &lit_4442); #pragma pop /* 807E73C4-807E73C8 0000C4 0004+00 0/2 0/0 0/0 .rodata @4443 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4443 = 5.0f; -COMPILER_STRIP_GATE(807E73C4, &lit_4443); +COMPILER_STRIP_GATE(0x807E73C4, &lit_4443); #pragma pop /* 807E73C8-807E73CC 0000C8 0004+00 0/2 0/0 0/0 .rodata @4444 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4444 = -3.0f; -COMPILER_STRIP_GATE(807E73C8, &lit_4444); +COMPILER_STRIP_GATE(0x807E73C8, &lit_4444); #pragma pop /* 807E73CC-807E73D0 0000CC 0004+00 0/2 0/0 0/0 .rodata @4445 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4445 = 2.0f; -COMPILER_STRIP_GATE(807E73CC, &lit_4445); +COMPILER_STRIP_GATE(0x807E73CC, &lit_4445); #pragma pop /* 807E73D0-807E73D4 0000D0 0004+00 0/2 0/0 0/0 .rodata @4446 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4446 = 12.0f; -COMPILER_STRIP_GATE(807E73D0, &lit_4446); +COMPILER_STRIP_GATE(0x807E73D0, &lit_4446); #pragma pop /* 807E73D4-807E73D8 0000D4 0004+00 0/2 0/0 0/0 .rodata @4447 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4447 = -20.0f; -COMPILER_STRIP_GATE(807E73D4, &lit_4447); +COMPILER_STRIP_GATE(0x807E73D4, &lit_4447); #pragma pop /* 807E73D8-807E73DC 0000D8 0004+00 0/2 0/0 0/0 .rodata @4448 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4448 = 2.0f / 5.0f; -COMPILER_STRIP_GATE(807E73D8, &lit_4448); +COMPILER_STRIP_GATE(0x807E73D8, &lit_4448); #pragma pop /* 807E4E68-807E5294 001548 042C+00 1/1 0/0 0/0 .text executeDown__8daE_WS_cFv */ @@ -1102,7 +1108,7 @@ asm void daE_WS_c::executeDown() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4507 = 30.0f; -COMPILER_STRIP_GATE(807E73DC, &lit_4507); +COMPILER_STRIP_GATE(0x807E73DC, &lit_4507); #pragma pop /* 807E5294-807E56D0 001974 043C+00 1/1 0/0 0/0 .text executeWindDown__8daE_WS_cFv */ @@ -1150,42 +1156,42 @@ asm void daE_WS_c::mtx_set() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4632 = 15.0f; -COMPILER_STRIP_GATE(807E73E0, &lit_4632); +COMPILER_STRIP_GATE(0x807E73E0, &lit_4632); #pragma pop /* 807E73E4-807E73E8 0000E4 0004+00 0/1 0/0 0/0 .rodata @4633 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4633 = 90.0f; -COMPILER_STRIP_GATE(807E73E4, &lit_4633); +COMPILER_STRIP_GATE(0x807E73E4, &lit_4633); #pragma pop /* 807E73E8-807E73EC 0000E8 0004+00 0/1 0/0 0/0 .rodata @4634 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4634 = -15.0f; -COMPILER_STRIP_GATE(807E73E8, &lit_4634); +COMPILER_STRIP_GATE(0x807E73E8, &lit_4634); #pragma pop /* 807E73EC-807E73F0 0000EC 0004+00 0/1 0/0 0/0 .rodata @4635 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4635 = -10.0f; -COMPILER_STRIP_GATE(807E73EC, &lit_4635); +COMPILER_STRIP_GATE(0x807E73EC, &lit_4635); #pragma pop /* 807E73F0-807E73F4 0000F0 0004+00 0/1 0/0 0/0 .rodata @4636 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4636 = 35.0f; -COMPILER_STRIP_GATE(807E73F0, &lit_4636); +COMPILER_STRIP_GATE(0x807E73F0, &lit_4636); #pragma pop /* 807E73F4-807E73F8 0000F4 0004+00 0/1 0/0 0/0 .rodata @4637 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4637 = 60.0f; -COMPILER_STRIP_GATE(807E73F4, &lit_4637); +COMPILER_STRIP_GATE(0x807E73F4, &lit_4637); #pragma pop /* 807E5AAC-807E5C0C 00218C 0160+00 1/1 0/0 0/0 .text cc_set__8daE_WS_cFv */ @@ -1243,7 +1249,7 @@ asm cM3dGPla::~cM3dGPla() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4908 = -40.0f; -COMPILER_STRIP_GATE(807E73F8, &lit_4908); +COMPILER_STRIP_GATE(0x807E73F8, &lit_4908); #pragma pop /* 807E5FB8-807E63F8 002698 0440+00 3/3 0/0 0/0 .text checkBeforeBg__8daE_WS_cFs */ @@ -1261,7 +1267,7 @@ asm void daE_WS_c::checkBeforeBg(s16 param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4989 = -150.0f; -COMPILER_STRIP_GATE(807E73FC, &lit_4989); +COMPILER_STRIP_GATE(0x807E73FC, &lit_4989); #pragma pop /* 807E63F8-807E66AC 002AD8 02B4+00 1/1 0/0 0/0 .text checkWall__8daE_WS_cFv */ @@ -1324,7 +1330,13 @@ static asm void useHeapInit(fopAc_ac_c* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5154 = -200.0f; -COMPILER_STRIP_GATE(807E7400, &lit_5154); +COMPILER_STRIP_GATE(0x807E7400, &lit_5154); +#pragma pop + +/* 807E7404-807E7404 000104 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_807E7409 = "E_ws"; #pragma pop /* 807E6860-807E6C10 002F40 03B0+00 1/1 0/0 0/0 .text create__8daE_WS_cFv */ @@ -1429,7 +1441,7 @@ asm void __sinit_d_a_e_ws_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_807E6E8C = (void*)__sinit_d_a_e_ws_cpp; +REGISTER_CTORS(0x807E6E8C, __sinit_d_a_e_ws_cpp); #pragma pop /* 807E6EC8-807E6ED0 0035A8 0008+00 1/0 0/0 0/0 .text @36@__dt__12dBgS_ObjAcchFv */ @@ -1464,10 +1476,4 @@ static asm void setMidnaBindEffect(fopEn_enemy_c* param_0, Z2CreatureEnemy* para } #pragma pop -/* 807E7404-807E740E 000104 000A+00 5/5 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_807E7404 = "E_WS"; -SECTION_DEAD static char const* const stringBase_807E7409 = "E_ws"; -#pragma pop +/* 807E7404-807E7404 000104 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/e/d_a_e_ww/d_a_e_ww.cpp b/rel/d/a/e/d_a_e_ww/d_a_e_ww.cpp index d476db6f4ba..bb00bb53a49 100644 --- a/rel/d/a/e/d_a_e_ww/d_a_e_ww.cpp +++ b/rel/d/a/e/d_a_e_ww/d_a_e_ww.cpp @@ -33,16 +33,16 @@ struct mDoMtx_stack_c { static u8 now[48]; }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; - struct J3DAnmTransform {}; +struct J3DModelData {}; + +struct Z2Creature {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -65,10 +65,10 @@ struct daPy_py_c { static u8 m_midnaActor[4]; }; -struct J3DJoint {}; - struct J3DModel {}; +struct J3DJoint {}; + struct daE_WW_c { /* 807E7748 */ void ctrlJoint(J3DJoint*, J3DModel*); /* 807E7800 */ void JointCallBack(J3DJoint*, int); @@ -518,7 +518,7 @@ extern "C" void __register_global_object(); /* ############################################################################################## */ /* 807EF770-807EF774 000000 0004+00 30/30 0/0 0/0 .rodata @3905 */ SECTION_RODATA static f32 const lit_3905 = 100.0f; -COMPILER_STRIP_GATE(807EF770, &lit_3905); +COMPILER_STRIP_GATE(0x807EF770, &lit_3905); /* 807EF774-807EF778 000004 0004+00 1/23 0/0 0/0 .rodata @3906 */ SECTION_RODATA static u8 const lit_3906[4] = { @@ -527,7 +527,7 @@ SECTION_RODATA static u8 const lit_3906[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(807EF774, &lit_3906); +COMPILER_STRIP_GATE(0x807EF774, &lit_3906); /* 807EF778-807EF780 000008 0004+04 2/12 0/0 0/0 .rodata @3907 */ SECTION_RODATA static f32 const lit_3907[1 + 1 /* padding */] = { @@ -535,7 +535,7 @@ SECTION_RODATA static f32 const lit_3907[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(807EF778, &lit_3907); +COMPILER_STRIP_GATE(0x807EF778, &lit_3907); /* 807EF780-807EF788 000010 0008+00 0/12 0/0 0/0 .rodata @3908 */ #pragma push @@ -543,7 +543,7 @@ COMPILER_STRIP_GATE(807EF778, &lit_3907); SECTION_RODATA static u8 const lit_3908[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(807EF780, &lit_3908); +COMPILER_STRIP_GATE(0x807EF780, &lit_3908); #pragma pop /* 807EF788-807EF790 000018 0008+00 0/12 0/0 0/0 .rodata @3909 */ @@ -552,7 +552,7 @@ COMPILER_STRIP_GATE(807EF780, &lit_3908); SECTION_RODATA static u8 const lit_3909[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(807EF788, &lit_3909); +COMPILER_STRIP_GATE(0x807EF788, &lit_3909); #pragma pop /* 807EF790-807EF798 000020 0008+00 0/12 0/0 0/0 .rodata @3910 */ @@ -561,49 +561,49 @@ COMPILER_STRIP_GATE(807EF788, &lit_3909); SECTION_RODATA static u8 const lit_3910[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(807EF790, &lit_3910); +COMPILER_STRIP_GATE(0x807EF790, &lit_3910); #pragma pop /* 807EF798-807EF79C 000028 0004+00 0/1 0/0 0/0 .rodata @3911 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3911 = 1.0f / 100.0f; -COMPILER_STRIP_GATE(807EF798, &lit_3911); +COMPILER_STRIP_GATE(0x807EF798, &lit_3911); #pragma pop /* 807EF79C-807EF7A0 00002C 0004+00 0/3 0/0 0/0 .rodata @3926 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3926 = 150.0f; -COMPILER_STRIP_GATE(807EF79C, &lit_3926); +COMPILER_STRIP_GATE(0x807EF79C, &lit_3926); #pragma pop /* 807EF7A0-807EF7A4 000030 0004+00 0/1 0/0 0/0 .rodata @3927 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3927 = 6.0f / 5.0f; -COMPILER_STRIP_GATE(807EF7A0, &lit_3927); +COMPILER_STRIP_GATE(0x807EF7A0, &lit_3927); #pragma pop /* 807EF7A4-807EF7A8 000034 0004+00 0/3 0/0 0/0 .rodata @3928 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3928 = 0.5f; -COMPILER_STRIP_GATE(807EF7A4, &lit_3928); +COMPILER_STRIP_GATE(0x807EF7A4, &lit_3928); #pragma pop /* 807EF7A8-807EF7AC 000038 0004+00 0/4 0/0 0/0 .rodata @3929 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3929 = 40.0f; -COMPILER_STRIP_GATE(807EF7A8, &lit_3929); +COMPILER_STRIP_GATE(0x807EF7A8, &lit_3929); #pragma pop /* 807EF7AC-807EF7B0 00003C 0004+00 0/3 0/0 0/0 .rodata @3930 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3930 = 25.0f; -COMPILER_STRIP_GATE(807EF7AC, &lit_3930); +COMPILER_STRIP_GATE(0x807EF7AC, &lit_3930); #pragma pop /* 807EF8CC-807EF8D8 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ @@ -890,7 +890,7 @@ asm void daE_WW_c::setHeadAngle() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4038 = 700.0f; -COMPILER_STRIP_GATE(807EF7B0, &lit_4038); +COMPILER_STRIP_GATE(0x807EF7B0, &lit_4038); #pragma pop /* 807E79D4-807E7ABC 0003D4 00E8+00 1/1 0/0 0/0 .text draw__8daE_WW_cFv */ @@ -916,7 +916,13 @@ static asm void daE_WW_Draw(daE_WW_c* param_0) { /* ############################################################################################## */ /* 807EF7B4-807EF7B8 000044 0004+00 1/1 0/0 0/0 .rodata @4048 */ SECTION_RODATA static f32 const lit_4048 = -1.0f; -COMPILER_STRIP_GATE(807EF7B4, &lit_4048); +COMPILER_STRIP_GATE(0x807EF7B4, &lit_4048); + +/* 807EF8B8-807EF8B8 000148 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_807EF8B8 = "E_WW"; +#pragma pop /* 807E7ADC-807E7B80 0004DC 00A4+00 6/6 0/0 0/0 .text setBck__8daE_WW_cFiUcff */ #pragma push @@ -941,7 +947,7 @@ asm void daE_WW_c::checkBck(int param_0) { /* ############################################################################################## */ /* 807EF7B8-807EF7BC 000048 0004+00 1/3 0/0 0/0 .rodata @4066 */ SECTION_RODATA static f32 const lit_4066 = -5.0f; -COMPILER_STRIP_GATE(807EF7B8, &lit_4066); +COMPILER_STRIP_GATE(0x807EF7B8, &lit_4066); /* 807E7BDC-807E7C20 0005DC 0044+00 11/11 0/0 0/0 .text setActionMode__8daE_WW_cFii */ #pragma push @@ -958,14 +964,14 @@ asm void daE_WW_c::setActionMode(int param_0, int param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4138 = -10.0f; -COMPILER_STRIP_GATE(807EF7BC, &lit_4138); +COMPILER_STRIP_GATE(0x807EF7BC, &lit_4138); #pragma pop /* 807EF7C0-807EF7C4 000050 0004+00 0/2 0/0 0/0 .rodata @4139 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4139 = -20.0f; -COMPILER_STRIP_GATE(807EF7C0, &lit_4139); +COMPILER_STRIP_GATE(0x807EF7C0, &lit_4139); #pragma pop /* 807E7C20-807E7E74 000620 0254+00 1/1 0/0 0/0 .text damage_check__8daE_WW_cFv */ @@ -983,28 +989,28 @@ asm void daE_WW_c::damage_check() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4166 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(807EF7C4, &lit_4166); +COMPILER_STRIP_GATE(0x807EF7C4, &lit_4166); #pragma pop /* 807EF7C8-807EF7CC 000058 0004+00 0/1 0/0 0/0 .rodata @4167 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4167 = 8.0f; -COMPILER_STRIP_GATE(807EF7C8, &lit_4167); +COMPILER_STRIP_GATE(0x807EF7C8, &lit_4167); #pragma pop /* 807EF7CC-807EF7D0 00005C 0004+00 0/8 0/0 0/0 .rodata @4168 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4168 = 3.0f; -COMPILER_STRIP_GATE(807EF7CC, &lit_4168); +COMPILER_STRIP_GATE(0x807EF7CC, &lit_4168); #pragma pop /* 807EF7D0-807EF7D8 000060 0008+00 1/5 0/0 0/0 .rodata @4170 */ SECTION_RODATA static u8 const lit_4170[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(807EF7D0, &lit_4170); +COMPILER_STRIP_GATE(0x807EF7D0, &lit_4170); /* 807E7E74-807E7FCC 000874 0158+00 1/1 0/0 0/0 .text setRandamNumber__8daE_WW_cFv */ #pragma push @@ -1029,13 +1035,13 @@ asm void daE_WW_c::getNearPlayerAngle() { /* ############################################################################################## */ /* 807EF7D8-807EF7DC 000068 0004+00 1/6 0/0 0/0 .rodata @4248 */ SECTION_RODATA static f32 const lit_4248 = -1000000000.0f; -COMPILER_STRIP_GATE(807EF7D8, &lit_4248); +COMPILER_STRIP_GATE(0x807EF7D8, &lit_4248); /* 807EF7DC-807EF7E0 00006C 0004+00 0/1 0/0 0/0 .rodata @4249 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4249 = 50.0f; -COMPILER_STRIP_GATE(807EF7DC, &lit_4249); +COMPILER_STRIP_GATE(0x807EF7DC, &lit_4249); #pragma pop /* 807E804C-807E830C 000A4C 02C0+00 1/1 0/0 0/0 .text setGroundAngle__8daE_WW_cFv */ @@ -1228,7 +1234,7 @@ static asm void s_child_ww(void* param_0, void* param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4507 = 500.0f; -COMPILER_STRIP_GATE(807EF7E0, &lit_4507); +COMPILER_STRIP_GATE(0x807EF7E0, &lit_4507); #pragma pop /* 807E8B2C-807E8C54 00152C 0128+00 1/1 0/0 0/0 .text s_obj_sub__FPvPv */ @@ -1264,7 +1270,7 @@ static asm void s_attack_ww(void* param_0, void* param_1) { /* ############################################################################################## */ /* 807EF7E4-807EF7E8 000074 0004+00 1/1 0/0 0/0 .rodata @4621 */ SECTION_RODATA static f32 const lit_4621 = 4096.0f; -COMPILER_STRIP_GATE(807EF7E4, &lit_4621); +COMPILER_STRIP_GATE(0x807EF7E4, &lit_4621); /* 807E8EEC-807E905C 0018EC 0170+00 2/2 0/0 0/0 .text createWolf__8daE_WW_cF4cXyzUc */ #pragma push @@ -1281,21 +1287,21 @@ asm void daE_WW_c::createWolf(cXyz param_0, u8 param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4824 = 2500.0f; -COMPILER_STRIP_GATE(807EF7E8, &lit_4824); +COMPILER_STRIP_GATE(0x807EF7E8, &lit_4824); #pragma pop /* 807EF7EC-807EF7F0 00007C 0004+00 0/2 0/0 0/0 .rodata @4825 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4825 = 3000.0f; -COMPILER_STRIP_GATE(807EF7EC, &lit_4825); +COMPILER_STRIP_GATE(0x807EF7EC, &lit_4825); #pragma pop /* 807EF7F0-807EF7F4 000080 0004+00 0/5 0/0 0/0 .rodata @4826 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4826 = 200.0f; -COMPILER_STRIP_GATE(807EF7F0, &lit_4826); +COMPILER_STRIP_GATE(0x807EF7F0, &lit_4826); #pragma pop /* 807EFBF8-807EFC04 000080 000C+00 0/1 0/0 0/0 .bss @4585 */ @@ -1406,28 +1412,28 @@ asm void daE_WW_c::executeMaster() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4884 = 15.0f; -COMPILER_STRIP_GATE(807EF7F4, &lit_4884); +COMPILER_STRIP_GATE(0x807EF7F4, &lit_4884); #pragma pop /* 807EF7F8-807EF7FC 000088 0004+00 0/6 0/0 0/0 .rodata @4885 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4885 = 20.0f; -COMPILER_STRIP_GATE(807EF7F8, &lit_4885); +COMPILER_STRIP_GATE(0x807EF7F8, &lit_4885); #pragma pop /* 807EF7FC-807EF800 00008C 0004+00 0/1 0/0 0/0 .rodata @4886 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4886 = 3.0f / 10.0f; -COMPILER_STRIP_GATE(807EF7FC, &lit_4886); +COMPILER_STRIP_GATE(0x807EF7FC, &lit_4886); #pragma pop /* 807EF800-807EF804 000090 0004+00 0/4 0/0 0/0 .rodata @4887 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4887 = 30.0f; -COMPILER_STRIP_GATE(807EF800, &lit_4887); +COMPILER_STRIP_GATE(0x807EF800, &lit_4887); #pragma pop /* 807E972C-807E99B8 00212C 028C+00 1/1 0/0 0/0 .text executeWait__8daE_WW_cFv */ @@ -1445,28 +1451,28 @@ asm void daE_WW_c::executeWait() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4942 = 35.0f; -COMPILER_STRIP_GATE(807EF804, &lit_4942); +COMPILER_STRIP_GATE(0x807EF804, &lit_4942); #pragma pop /* 807EF808-807EF80C 000098 0004+00 0/1 0/0 0/0 .rodata @4943 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4943 = -35.0f; -COMPILER_STRIP_GATE(807EF808, &lit_4943); +COMPILER_STRIP_GATE(0x807EF808, &lit_4943); #pragma pop /* 807EF80C-807EF810 00009C 0004+00 0/1 0/0 0/0 .rodata @4944 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4944 = 17.0f; -COMPILER_STRIP_GATE(807EF80C, &lit_4944); +COMPILER_STRIP_GATE(0x807EF80C, &lit_4944); #pragma pop /* 807EF810-807EF814 0000A0 0004+00 0/2 0/0 0/0 .rodata @4945 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4945 = -3.0f; -COMPILER_STRIP_GATE(807EF810, &lit_4945); +COMPILER_STRIP_GATE(0x807EF810, &lit_4945); #pragma pop /* 807E99B8-807E9C1C 0023B8 0264+00 1/1 0/0 0/0 .text calcJumpSpeed__8daE_WW_cFv */ @@ -1484,14 +1490,14 @@ asm void daE_WW_c::calcJumpSpeed() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5110 = 800.0f; -COMPILER_STRIP_GATE(807EF814, &lit_5110); +COMPILER_STRIP_GATE(0x807EF814, &lit_5110); #pragma pop /* 807EF818-807EF81C 0000A8 0004+00 0/3 0/0 0/0 .rodata @5111 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5111 = 5.0f; -COMPILER_STRIP_GATE(807EF818, &lit_5111); +COMPILER_STRIP_GATE(0x807EF818, &lit_5111); #pragma pop /* 807E9C1C-807EA474 00261C 0858+00 2/1 0/0 0/0 .text executeAttack__8daE_WW_cFv */ @@ -1509,35 +1515,35 @@ asm void daE_WW_c::executeAttack() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5112 = 2000.0f; -COMPILER_STRIP_GATE(807EF81C, &lit_5112); +COMPILER_STRIP_GATE(0x807EF81C, &lit_5112); #pragma pop /* 807EF820-807EF824 0000B0 0004+00 0/2 0/0 0/0 .rodata @5113 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5113 = 1000.0f; -COMPILER_STRIP_GATE(807EF820, &lit_5113); +COMPILER_STRIP_GATE(0x807EF820, &lit_5113); #pragma pop /* 807EF824-807EF828 0000B4 0004+00 0/0 0/0 0/0 .rodata @5114 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5114 = 18.0f; -COMPILER_STRIP_GATE(807EF824, &lit_5114); +COMPILER_STRIP_GATE(0x807EF824, &lit_5114); #pragma pop /* 807EF828-807EF82C 0000B8 0004+00 0/2 0/0 0/0 .rodata @5115 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5115 = 2.0f; -COMPILER_STRIP_GATE(807EF828, &lit_5115); +COMPILER_STRIP_GATE(0x807EF828, &lit_5115); #pragma pop /* 807EF82C-807EF830 0000BC 0004+00 0/3 0/0 0/0 .rodata @5256 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5256 = 1400.0f; -COMPILER_STRIP_GATE(807EF82C, &lit_5256); +COMPILER_STRIP_GATE(0x807EF82C, &lit_5256); #pragma pop /* 807EA474-807EA870 002E74 03FC+00 2/2 0/0 0/0 .text checkAttackStart__8daE_WW_cFv */ @@ -1555,49 +1561,49 @@ asm void daE_WW_c::checkAttackStart() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5522 = 1500.0f; -COMPILER_STRIP_GATE(807EF830, &lit_5522); +COMPILER_STRIP_GATE(0x807EF830, &lit_5522); #pragma pop /* 807EF834-807EF838 0000C4 0004+00 0/1 0/0 0/0 .rodata @5523 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5523 = 1.5f; -COMPILER_STRIP_GATE(807EF834, &lit_5523); +COMPILER_STRIP_GATE(0x807EF834, &lit_5523); #pragma pop /* 807EF838-807EF83C 0000C8 0004+00 0/3 0/0 0/0 .rodata @5524 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5524 = 1200.0f; -COMPILER_STRIP_GATE(807EF838, &lit_5524); +COMPILER_STRIP_GATE(0x807EF838, &lit_5524); #pragma pop /* 807EF83C-807EF840 0000CC 0004+00 0/2 0/0 0/0 .rodata @5525 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5525 = -40.0f; -COMPILER_STRIP_GATE(807EF83C, &lit_5525); +COMPILER_STRIP_GATE(0x807EF83C, &lit_5525); #pragma pop /* 807EF840-807EF844 0000D0 0004+00 0/3 0/0 0/0 .rodata @5526 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5526 = 1800.0f; -COMPILER_STRIP_GATE(807EF840, &lit_5526); +COMPILER_STRIP_GATE(0x807EF840, &lit_5526); #pragma pop /* 807EF844-807EF848 0000D4 0004+00 0/3 0/0 0/0 .rodata @5527 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5527 = 10.0f; -COMPILER_STRIP_GATE(807EF844, &lit_5527); +COMPILER_STRIP_GATE(0x807EF844, &lit_5527); #pragma pop /* 807EF848-807EF84C 0000D8 0004+00 0/2 0/0 0/0 .rodata @5528 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5528 = 1600.0f; -COMPILER_STRIP_GATE(807EF848, &lit_5528); +COMPILER_STRIP_GATE(0x807EF848, &lit_5528); #pragma pop /* 807EA870-807EB650 003270 0DE0+00 1/1 0/0 0/0 .text executeChase__8daE_WW_cFv */ @@ -1615,14 +1621,14 @@ asm void daE_WW_c::executeChase() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5607 = 14.0f; -COMPILER_STRIP_GATE(807EF84C, &lit_5607); +COMPILER_STRIP_GATE(0x807EF84C, &lit_5607); #pragma pop /* 807EF850-807EF854 0000E0 0004+00 0/1 0/0 0/0 .rodata @5608 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5608 = 21.0f; -COMPILER_STRIP_GATE(807EF850, &lit_5608); +COMPILER_STRIP_GATE(0x807EF850, &lit_5608); #pragma pop /* 807EB650-807EB964 004050 0314+00 1/1 0/0 0/0 .text executeDamage__8daE_WW_cFv */ @@ -1660,35 +1666,35 @@ asm void daE_WW_c::executeMoveOut() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6190 = 3.0f / 5.0f; -COMPILER_STRIP_GATE(807EF854, &lit_6190); +COMPILER_STRIP_GATE(0x807EF854, &lit_6190); #pragma pop /* 807EF858-807EF85C 0000E8 0004+00 0/1 0/0 0/0 .rodata @6191 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6191 = 3072.0f; -COMPILER_STRIP_GATE(807EF858, &lit_6191); +COMPILER_STRIP_GATE(0x807EF858, &lit_6191); #pragma pop /* 807EF85C-807EF860 0000EC 0004+00 0/1 0/0 0/0 .rodata @6192 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6192 = 1024.0f; -COMPILER_STRIP_GATE(807EF85C, &lit_6192); +COMPILER_STRIP_GATE(0x807EF85C, &lit_6192); #pragma pop /* 807EF860-807EF864 0000F0 0004+00 0/1 0/0 0/0 .rodata @6193 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6193 = 1700.0f; -COMPILER_STRIP_GATE(807EF860, &lit_6193); +COMPILER_STRIP_GATE(0x807EF860, &lit_6193); #pragma pop /* 807EF864-807EF868 0000F4 0004+00 0/1 0/0 0/0 .rodata @6194 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6194 = 7.0f / 10.0f; -COMPILER_STRIP_GATE(807EF864, &lit_6194); +COMPILER_STRIP_GATE(0x807EF864, &lit_6194); #pragma pop /* 807EC940-807ECE58 005340 0518+00 2/2 0/0 0/0 .text checkWalkStart__8daE_WW_cFv */ @@ -1706,7 +1712,7 @@ asm void daE_WW_c::checkWalkStart() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6359 = 300.0f; -COMPILER_STRIP_GATE(807EF868, &lit_6359); +COMPILER_STRIP_GATE(0x807EF868, &lit_6359); #pragma pop /* 807ECE58-807ED674 005858 081C+00 1/1 0/0 0/0 .text executeWalk__8daE_WW_cFv */ @@ -1724,7 +1730,7 @@ asm void daE_WW_c::executeWalk() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6385 = -30.0f; -COMPILER_STRIP_GATE(807EF86C, &lit_6385); +COMPILER_STRIP_GATE(0x807EF86C, &lit_6385); #pragma pop /* 807ED674-807ED78C 006074 0118+00 1/1 0/0 0/0 .text eWW_posMoveF__8daE_WW_cFv */ @@ -1762,21 +1768,21 @@ asm void daE_WW_c::mtx_set() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6439 = 6.0f; -COMPILER_STRIP_GATE(807EF870, &lit_6439); +COMPILER_STRIP_GATE(0x807EF870, &lit_6439); #pragma pop /* 807EF874-807EF878 000104 0004+00 0/0 0/0 0/0 .rodata @6440 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6440 = 13.0f; -COMPILER_STRIP_GATE(807EF874, &lit_6440); +COMPILER_STRIP_GATE(0x807EF874, &lit_6440); #pragma pop /* 807EF878-807EF87C 000108 0004+00 0/1 0/0 0/0 .rodata @6500 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6500 = 70.0f; -COMPILER_STRIP_GATE(807EF878, &lit_6500); +COMPILER_STRIP_GATE(0x807EF878, &lit_6500); #pragma pop /* 807EDB00-807EDCC4 006500 01C4+00 1/1 0/0 0/0 .text cc_set__8daE_WW_cFv */ @@ -1824,7 +1830,13 @@ SECTION_RODATA static u8 const lit_6556[6 + 2 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(807EF87C, &lit_6556); +COMPILER_STRIP_GATE(0x807EF87C, &lit_6556); +#pragma pop + +/* 807EF8B8-807EF8B8 000148 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_807EF8BD = "D_MN11"; #pragma pop /* 807EDE8C-807EE438 00688C 05AC+00 2/2 0/0 0/0 .text calcMoveDir__8daE_WW_cFPss */ @@ -1887,21 +1899,21 @@ static asm void useHeapInit(fopAc_ac_c* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6946 = -200.0f; -COMPILER_STRIP_GATE(807EF884, &lit_6946); +COMPILER_STRIP_GATE(0x807EF884, &lit_6946); #pragma pop /* 807EF888-807EF88C 000118 0004+00 0/1 0/0 0/0 .rodata @6947 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6947 = 65.0f; -COMPILER_STRIP_GATE(807EF888, &lit_6947); +COMPILER_STRIP_GATE(0x807EF888, &lit_6947); #pragma pop /* 807EF88C-807EF890 00011C 0004+00 0/1 0/0 0/0 .rodata @6948 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6948 = 130.0f; -COMPILER_STRIP_GATE(807EF88C, &lit_6948); +COMPILER_STRIP_GATE(0x807EF88C, &lit_6948); #pragma pop /* 807EF890-807EF898 000120 0008+00 0/1 0/0 0/0 .rodata @6950 */ @@ -1910,7 +1922,13 @@ COMPILER_STRIP_GATE(807EF88C, &lit_6948); SECTION_RODATA static u8 const lit_6950[8] = { 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(807EF890, &lit_6950); +COMPILER_STRIP_GATE(0x807EF890, &lit_6950); +#pragma pop + +/* 807EF8B8-807EF8B8 000148 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_807EF8C4 = "E_ww"; #pragma pop /* 807EE63C-807EEB38 00703C 04FC+00 1/1 0/0 0/0 .text create__8daE_WW_cFv */ @@ -2028,56 +2046,56 @@ asm daE_WW_HIO_c::~daE_WW_HIO_c() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7175 = -700.0f; -COMPILER_STRIP_GATE(807EF898, &lit_7175); +COMPILER_STRIP_GATE(0x807EF898, &lit_7175); #pragma pop /* 807EF89C-807EF8A0 00012C 0004+00 0/1 0/0 0/0 .rodata @7176 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7176 = -1000.0f; -COMPILER_STRIP_GATE(807EF89C, &lit_7176); +COMPILER_STRIP_GATE(0x807EF89C, &lit_7176); #pragma pop /* 807EF8A0-807EF8A4 000130 0004+00 0/1 0/0 0/0 .rodata @7177 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7177 = -300.0f; -COMPILER_STRIP_GATE(807EF8A0, &lit_7177); +COMPILER_STRIP_GATE(0x807EF8A0, &lit_7177); #pragma pop /* 807EF8A4-807EF8A8 000134 0004+00 0/1 0/0 0/0 .rodata @7178 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7178 = -100.0f; -COMPILER_STRIP_GATE(807EF8A4, &lit_7178); +COMPILER_STRIP_GATE(0x807EF8A4, &lit_7178); #pragma pop /* 807EF8A8-807EF8AC 000138 0004+00 0/1 0/0 0/0 .rodata @7179 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7179 = 400.0f; -COMPILER_STRIP_GATE(807EF8A8, &lit_7179); +COMPILER_STRIP_GATE(0x807EF8A8, &lit_7179); #pragma pop /* 807EF8AC-807EF8B0 00013C 0004+00 0/1 0/0 0/0 .rodata @7180 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7180 = -400.0f; -COMPILER_STRIP_GATE(807EF8AC, &lit_7180); +COMPILER_STRIP_GATE(0x807EF8AC, &lit_7180); #pragma pop /* 807EF8B0-807EF8B4 000140 0004+00 0/1 0/0 0/0 .rodata @7181 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7181 = 250.0f; -COMPILER_STRIP_GATE(807EF8B0, &lit_7181); +COMPILER_STRIP_GATE(0x807EF8B0, &lit_7181); #pragma pop /* 807EF8B4-807EF8B8 000144 0004+00 0/1 0/0 0/0 .rodata @7182 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7182 = -250.0f; -COMPILER_STRIP_GATE(807EF8B4, &lit_7182); +COMPILER_STRIP_GATE(0x807EF8B4, &lit_7182); #pragma pop /* 807EEF04-807EF2CC 007904 03C8+00 0/0 1/0 0/0 .text __sinit_d_a_e_ww_cpp */ @@ -2092,7 +2110,7 @@ asm void __sinit_d_a_e_ww_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_807EEF04 = (void*)__sinit_d_a_e_ww_cpp; +REGISTER_CTORS(0x807EEF04, __sinit_d_a_e_ww_cpp); #pragma pop /* 807EF2CC-807EF2D4 007CCC 0008+00 1/0 0/0 0/0 .text @20@__dt__14dBgS_ObjGndChkFv */ @@ -2349,11 +2367,4 @@ static u8 data_807EFDBC[4]; static u8 data_807EFDC0[4]; #pragma pop -/* 807EF8B8-807EF8C9 000148 0011+00 6/6 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_807EF8B8 = "E_WW"; -SECTION_DEAD static char const* const stringBase_807EF8BD = "D_MN11"; -SECTION_DEAD static char const* const stringBase_807EF8C4 = "E_ww"; -#pragma pop +/* 807EF8B8-807EF8B8 000148 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/e/d_a_e_yc/d_a_e_yc.cpp b/rel/d/a/e/d_a_e_yc/d_a_e_yc.cpp index 25474459bf1..280f34ac7b1 100644 --- a/rel/d/a/e/d_a_e_yc/d_a_e_yc.cpp +++ b/rel/d/a/e/d_a_e_yc/d_a_e_yc.cpp @@ -19,16 +19,16 @@ struct mDoMtx_stack_c { static u8 now[48]; }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; - struct J3DAnmTransform {}; +struct J3DModelData {}; + +struct Z2Creature {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -76,10 +76,10 @@ struct dRes_control_c { struct dPa_levelEcallBack {}; -struct _GXColor {}; - struct csXyz {}; +struct _GXColor {}; + struct dPa_control_c { struct level_c { /* 8004B918 */ void getEmitter(u32); @@ -321,7 +321,7 @@ extern "C" void __register_global_object(); /* ############################################################################################## */ /* 807F2864-807F2868 000000 0004+00 12/12 0/0 0/0 .rodata @3715 */ SECTION_RODATA static f32 const lit_3715 = 1.0f; -COMPILER_STRIP_GATE(807F2864, &lit_3715); +COMPILER_STRIP_GATE(0x807F2864, &lit_3715); /* 807F2954-807F2970 -00001 001C+00 1/1 0/0 0/0 .data @3878 */ SECTION_DATA static void* lit_3878[7] = { @@ -465,11 +465,17 @@ SECTION_RODATA static u8 const lit_3729[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(807F2868, &lit_3729); +COMPILER_STRIP_GATE(0x807F2868, &lit_3729); /* 807F286C-807F2870 000008 0004+00 1/1 0/0 0/0 .rodata @3730 */ SECTION_RODATA static f32 const lit_3730 = -1.0f; -COMPILER_STRIP_GATE(807F286C, &lit_3730); +COMPILER_STRIP_GATE(0x807F286C, &lit_3730); + +/* 807F294C-807F294C 0000E8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_807F294C = "E_yc"; +#pragma pop /* 807EFEF0-807EFF9C 000110 00AC+00 5/5 0/0 0/0 .text anm_init__FP10e_yc_classifUcf */ #pragma push @@ -486,14 +492,14 @@ static asm void anm_init(e_yc_class* param_0, int param_1, f32 param_2, u8 param #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3771 = 100.0f; -COMPILER_STRIP_GATE(807F2870, &lit_3771); +COMPILER_STRIP_GATE(0x807F2870, &lit_3771); #pragma pop /* 807F2874-807F2878 000010 0004+00 0/1 0/0 0/0 .rodata @3772 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3772 = 1700.0f; -COMPILER_STRIP_GATE(807F2874, &lit_3772); +COMPILER_STRIP_GATE(0x807F2874, &lit_3772); #pragma pop /* 807EFF9C-807F00BC 0001BC 0120+00 1/0 0/0 0/0 .text daE_YC_Draw__FP10e_yc_class */ @@ -521,21 +527,21 @@ static asm void damage_check(e_yc_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3859 = 12.0f; -COMPILER_STRIP_GATE(807F2878, &lit_3859); +COMPILER_STRIP_GATE(0x807F2878, &lit_3859); #pragma pop /* 807F287C-807F2880 000018 0004+00 0/2 0/0 0/0 .rodata @3860 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3860 = 70.0f; -COMPILER_STRIP_GATE(807F287C, &lit_3860); +COMPILER_STRIP_GATE(0x807F287C, &lit_3860); #pragma pop /* 807F2880-807F2884 00001C 0004+00 0/5 0/0 0/0 .rodata @3861 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3861 = 10.0f; -COMPILER_STRIP_GATE(807F2880, &lit_3861); +COMPILER_STRIP_GATE(0x807F2880, &lit_3861); #pragma pop /* 807F01AC-807F06AC 0003CC 0500+00 2/1 0/0 0/0 .text e_yc_fly__FP10e_yc_class */ @@ -553,119 +559,119 @@ static asm void e_yc_fly(e_yc_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3862 = 25.0f; -COMPILER_STRIP_GATE(807F2884, &lit_3862); +COMPILER_STRIP_GATE(0x807F2884, &lit_3862); #pragma pop /* 807F2888-807F288C 000024 0004+00 0/1 0/0 0/0 .rodata @3863 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3863 = 2000.0f; -COMPILER_STRIP_GATE(807F2888, &lit_3863); +COMPILER_STRIP_GATE(0x807F2888, &lit_3863); #pragma pop /* 807F288C-807F2890 000028 0004+00 0/3 0/0 0/0 .rodata @3864 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3864 = 200.0f; -COMPILER_STRIP_GATE(807F288C, &lit_3864); +COMPILER_STRIP_GATE(0x807F288C, &lit_3864); #pragma pop /* 807F2890-807F2894 00002C 0004+00 0/1 0/0 0/0 .rodata @3865 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3865 = 150.0f; -COMPILER_STRIP_GATE(807F2890, &lit_3865); +COMPILER_STRIP_GATE(0x807F2890, &lit_3865); #pragma pop /* 807F2894-807F2898 000030 0004+00 0/2 0/0 0/0 .rodata @3866 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3866 = 300.0f; -COMPILER_STRIP_GATE(807F2894, &lit_3866); +COMPILER_STRIP_GATE(0x807F2894, &lit_3866); #pragma pop /* 807F2898-807F289C 000034 0004+00 0/0 0/0 0/0 .rodata @3867 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3867 = 35.0f; -COMPILER_STRIP_GATE(807F2898, &lit_3867); +COMPILER_STRIP_GATE(0x807F2898, &lit_3867); #pragma pop /* 807F289C-807F28A0 000038 0004+00 0/0 0/0 0/0 .rodata @3868 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3868 = 0.25f; -COMPILER_STRIP_GATE(807F289C, &lit_3868); +COMPILER_STRIP_GATE(0x807F289C, &lit_3868); #pragma pop /* 807F28A0-807F28A4 00003C 0004+00 0/0 0/0 0/0 .rodata @3869 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3869 = 3.0f / 10.0f; -COMPILER_STRIP_GATE(807F28A0, &lit_3869); +COMPILER_STRIP_GATE(0x807F28A0, &lit_3869); #pragma pop /* 807F28A4-807F28A8 000040 0004+00 0/0 0/0 0/0 .rodata @3870 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3870 = 4.0f; -COMPILER_STRIP_GATE(807F28A4, &lit_3870); +COMPILER_STRIP_GATE(0x807F28A4, &lit_3870); #pragma pop /* 807F28A8-807F28AC 000044 0004+00 0/1 0/0 0/0 .rodata @3871 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3871 = 400.0f; -COMPILER_STRIP_GATE(807F28A8, &lit_3871); +COMPILER_STRIP_GATE(0x807F28A8, &lit_3871); #pragma pop /* 807F28AC-807F28B0 000048 0004+00 0/1 0/0 0/0 .rodata @3872 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3872 = 1.0f / 20.0f; -COMPILER_STRIP_GATE(807F28AC, &lit_3872); +COMPILER_STRIP_GATE(0x807F28AC, &lit_3872); #pragma pop /* 807F28B0-807F28B4 00004C 0004+00 0/1 0/0 0/0 .rodata @3873 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3873 = 3.0f; -COMPILER_STRIP_GATE(807F28B0, &lit_3873); +COMPILER_STRIP_GATE(0x807F28B0, &lit_3873); #pragma pop /* 807F28B4-807F28B8 000050 0004+00 0/2 0/0 0/0 .rodata @3874 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3874 = 0.5f; -COMPILER_STRIP_GATE(807F28B4, &lit_3874); +COMPILER_STRIP_GATE(0x807F28B4, &lit_3874); #pragma pop /* 807F28B8-807F28BC 000054 0004+00 0/1 0/0 0/0 .rodata @3875 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3875 = 1.0f / 25.0f; -COMPILER_STRIP_GATE(807F28B8, &lit_3875); +COMPILER_STRIP_GATE(0x807F28B8, &lit_3875); #pragma pop /* 807F28BC-807F28C0 000058 0004+00 0/0 0/0 0/0 .rodata @3876 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3876 = 1.0f / 100.0f; -COMPILER_STRIP_GATE(807F28BC, &lit_3876); +COMPILER_STRIP_GATE(0x807F28BC, &lit_3876); #pragma pop /* 807F28C0-807F28C4 00005C 0004+00 0/3 0/0 0/0 .rodata @3932 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3932 = 1000.0f; -COMPILER_STRIP_GATE(807F28C0, &lit_3932); +COMPILER_STRIP_GATE(0x807F28C0, &lit_3932); #pragma pop /* 807F28C4-807F28C8 000060 0004+00 0/1 0/0 0/0 .rodata @3933 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3933 = 4000.0f; -COMPILER_STRIP_GATE(807F28C4, &lit_3933); +COMPILER_STRIP_GATE(0x807F28C4, &lit_3933); #pragma pop /* 807F2B08-807F2B0C 000008 0004+00 4/4 0/0 0/0 .bss S_area_dis */ @@ -686,28 +692,28 @@ static asm void e_yc_f_fly(e_yc_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3959 = 5.0f; -COMPILER_STRIP_GATE(807F28C8, &lit_3959); +COMPILER_STRIP_GATE(0x807F28C8, &lit_3959); #pragma pop /* 807F28CC-807F28D0 000068 0004+00 0/1 0/0 0/0 .rodata @3960 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3960 = -5.0f; -COMPILER_STRIP_GATE(807F28CC, &lit_3960); +COMPILER_STRIP_GATE(0x807F28CC, &lit_3960); #pragma pop /* 807F28D0-807F28D4 00006C 0004+00 0/1 0/0 0/0 .rodata @3961 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3961 = 3000.0f; -COMPILER_STRIP_GATE(807F28D0, &lit_3961); +COMPILER_STRIP_GATE(0x807F28D0, &lit_3961); #pragma pop /* 807F28D4-807F28D8 000070 0004+00 0/2 0/0 0/0 .rodata @3962 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3962 = 5000.0f; -COMPILER_STRIP_GATE(807F28D4, &lit_3962); +COMPILER_STRIP_GATE(0x807F28D4, &lit_3962); #pragma pop /* 807F0AA0-807F0C40 000CC0 01A0+00 1/1 0/0 0/0 .text e_yc_hovering__FP10e_yc_class */ @@ -725,21 +731,21 @@ static asm void e_yc_hovering(e_yc_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4078 = 50.0f; -COMPILER_STRIP_GATE(807F28D8, &lit_4078); +COMPILER_STRIP_GATE(0x807F28D8, &lit_4078); #pragma pop /* 807F28DC-807F28E0 000078 0004+00 0/2 0/0 0/0 .rodata @4079 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4079 = 500.0f; -COMPILER_STRIP_GATE(807F28DC, &lit_4079); +COMPILER_STRIP_GATE(0x807F28DC, &lit_4079); #pragma pop /* 807F28E0-807F28E4 00007C 0004+00 0/1 0/0 0/0 .rodata @4080 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4080 = 30.0f; -COMPILER_STRIP_GATE(807F28E0, &lit_4080); +COMPILER_STRIP_GATE(0x807F28E0, &lit_4080); #pragma pop /* 807F28E4-807F28EC 000080 0008+00 0/1 0/0 0/0 .rodata @4081 */ @@ -748,7 +754,7 @@ COMPILER_STRIP_GATE(807F28E0, &lit_4080); SECTION_RODATA static u8 const lit_4081[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(807F28E4, &lit_4081); +COMPILER_STRIP_GATE(0x807F28E4, &lit_4081); #pragma pop /* 807F28EC-807F28F4 000088 0008+00 0/1 0/0 0/0 .rodata @4082 */ @@ -757,7 +763,7 @@ COMPILER_STRIP_GATE(807F28E4, &lit_4081); SECTION_RODATA static u8 const lit_4082[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(807F28EC, &lit_4082); +COMPILER_STRIP_GATE(0x807F28EC, &lit_4082); #pragma pop /* 807F28F4-807F28FC 000090 0008+00 0/1 0/0 0/0 .rodata @4083 */ @@ -766,7 +772,7 @@ COMPILER_STRIP_GATE(807F28EC, &lit_4082); SECTION_RODATA static u8 const lit_4083[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(807F28F4, &lit_4083); +COMPILER_STRIP_GATE(0x807F28F4, &lit_4083); #pragma pop /* 807F0C40-807F1218 000E60 05D8+00 2/1 0/0 0/0 .text e_yc_attack__FP10e_yc_class */ @@ -784,21 +790,21 @@ static asm void e_yc_attack(e_yc_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4084 = 350.0f; -COMPILER_STRIP_GATE(807F28FC, &lit_4084); +COMPILER_STRIP_GATE(0x807F28FC, &lit_4084); #pragma pop /* 807F2900-807F2904 00009C 0004+00 0/0 0/0 0/0 .rodata @4085 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4085 = 0.75f; -COMPILER_STRIP_GATE(807F2900, &lit_4085); +COMPILER_STRIP_GATE(0x807F2900, &lit_4085); #pragma pop /* 807F2904-807F2908 0000A0 0004+00 0/1 0/0 0/0 .rodata @4167 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4167 = 2.0f; -COMPILER_STRIP_GATE(807F2904, &lit_4167); +COMPILER_STRIP_GATE(0x807F2904, &lit_4167); #pragma pop /* 807F1218-807F165C 001438 0444+00 1/1 0/0 0/0 .text e_yc_wolfbite__FP10e_yc_class */ @@ -816,56 +822,56 @@ static asm void e_yc_wolfbite(e_yc_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4267 = 28.0f; -COMPILER_STRIP_GATE(807F2908, &lit_4267); +COMPILER_STRIP_GATE(0x807F2908, &lit_4267); #pragma pop /* 807F290C-807F2910 0000A8 0004+00 0/1 0/0 0/0 .rodata @4268 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4268 = 27.0f; -COMPILER_STRIP_GATE(807F290C, &lit_4268); +COMPILER_STRIP_GATE(0x807F290C, &lit_4268); #pragma pop /* 807F2910-807F2914 0000AC 0004+00 0/1 0/0 0/0 .rodata @4269 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4269 = 11.0f; -COMPILER_STRIP_GATE(807F2910, &lit_4269); +COMPILER_STRIP_GATE(0x807F2910, &lit_4269); #pragma pop /* 807F2914-807F2918 0000B0 0004+00 0/1 0/0 0/0 .rodata @4270 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4270 = 36.0f; -COMPILER_STRIP_GATE(807F2914, &lit_4270); +COMPILER_STRIP_GATE(0x807F2914, &lit_4270); #pragma pop /* 807F2918-807F291C 0000B4 0004+00 0/1 0/0 0/0 .rodata @4271 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4271 = 7.0f; -COMPILER_STRIP_GATE(807F2918, &lit_4271); +COMPILER_STRIP_GATE(0x807F2918, &lit_4271); #pragma pop /* 807F291C-807F2920 0000B8 0004+00 0/1 0/0 0/0 .rodata @4272 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4272 = 6.0f; -COMPILER_STRIP_GATE(807F291C, &lit_4272); +COMPILER_STRIP_GATE(0x807F291C, &lit_4272); #pragma pop /* 807F2920-807F2924 0000BC 0004+00 0/1 0/0 0/0 .rodata @4273 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4273 = 14.0f; -COMPILER_STRIP_GATE(807F2920, &lit_4273); +COMPILER_STRIP_GATE(0x807F2920, &lit_4273); #pragma pop /* 807F2924-807F2928 0000C0 0004+00 0/1 0/0 0/0 .rodata @4274 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4274 = 15.0f; -COMPILER_STRIP_GATE(807F2924, &lit_4274); +COMPILER_STRIP_GATE(0x807F2924, &lit_4274); #pragma pop /* 807F165C-807F1AD4 00187C 0478+00 1/1 0/0 0/0 .text anm_se_set__FP10e_yc_class */ @@ -883,7 +889,7 @@ static asm void anm_se_set(e_yc_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4314 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(807F2928, &lit_4314); +COMPILER_STRIP_GATE(0x807F2928, &lit_4314); #pragma pop /* 807F1AD4-807F1CE4 001CF4 0210+00 2/1 0/0 0/0 .text action__FP10e_yc_class */ @@ -901,35 +907,35 @@ static asm void action(e_yc_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4480 = -103171.0f; -COMPILER_STRIP_GATE(807F292C, &lit_4480); +COMPILER_STRIP_GATE(0x807F292C, &lit_4480); #pragma pop /* 807F2930-807F2934 0000CC 0004+00 0/1 0/0 0/0 .rodata @4481 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4481 = 38369.0f; -COMPILER_STRIP_GATE(807F2930, &lit_4481); +COMPILER_STRIP_GATE(0x807F2930, &lit_4481); #pragma pop /* 807F2934-807F2938 0000D0 0004+00 0/1 0/0 0/0 .rodata @4482 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4482 = 21000.0f; -COMPILER_STRIP_GATE(807F2934, &lit_4482); +COMPILER_STRIP_GATE(0x807F2934, &lit_4482); #pragma pop /* 807F2938-807F293C 0000D4 0004+00 0/1 0/0 0/0 .rodata @4483 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4483 = 80.0f; -COMPILER_STRIP_GATE(807F2938, &lit_4483); +COMPILER_STRIP_GATE(0x807F2938, &lit_4483); #pragma pop /* 807F293C-807F2940 0000D8 0004+00 0/1 0/0 0/0 .rodata @4484 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4484 = -30.0f; -COMPILER_STRIP_GATE(807F293C, &lit_4484); +COMPILER_STRIP_GATE(0x807F293C, &lit_4484); #pragma pop /* 807F2B0C-807F2B10 00000C 0004+00 2/2 0/0 0/0 .bss None */ @@ -981,21 +987,21 @@ static asm void useHeapInit(fopAc_ac_c* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4622 = -500.0f; -COMPILER_STRIP_GATE(807F2940, &lit_4622); +COMPILER_STRIP_GATE(0x807F2940, &lit_4622); #pragma pop /* 807F2944-807F2948 0000E0 0004+00 0/1 0/0 0/0 .rodata @4623 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4623 = -300.0f; -COMPILER_STRIP_GATE(807F2944, &lit_4623); +COMPILER_STRIP_GATE(0x807F2944, &lit_4623); #pragma pop /* 807F2948-807F294C 0000E4 0004+00 0/1 0/0 0/0 .rodata @4624 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4624 = 65535.0f; -COMPILER_STRIP_GATE(807F2948, &lit_4624); +COMPILER_STRIP_GATE(0x807F2948, &lit_4624); #pragma pop /* 807F239C-807F26BC 0025BC 0320+00 1/0 0/0 0/0 .text daE_YC_Create__FP10fopAc_ac_c */ @@ -1060,7 +1066,7 @@ asm void __sinit_d_a_e_yc_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_807F2804 = (void*)__sinit_d_a_e_yc_cpp; +REGISTER_CTORS(0x807F2804, __sinit_d_a_e_yc_cpp); #pragma pop /* 807F2840-807F2848 002A60 0008+00 1/0 0/0 0/0 .text @36@__dt__12dBgS_ObjAcchFv */ @@ -1083,9 +1089,4 @@ static asm void func_807F2848() { } #pragma pop -/* 807F294C-807F2951 0000E8 0005+00 4/4 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_807F294C = "E_yc"; -#pragma pop +/* 807F294C-807F294C 0000E8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/e/d_a_e_yd/d_a_e_yd.cpp b/rel/d/a/e/d_a_e_yd/d_a_e_yd.cpp index 04432396acd..ad46230fdc9 100644 --- a/rel/d/a/e/d_a_e_yd/d_a_e_yd.cpp +++ b/rel/d/a/e/d_a_e_yd/d_a_e_yd.cpp @@ -32,16 +32,16 @@ struct mDoExt_baseAnm { /* 8000D428 */ void play(); }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; - struct J3DAnmTransform {}; +struct J3DModelData {}; + +struct Z2Creature {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -66,11 +66,11 @@ struct mDoExt_3DlineMatSortPacket { /* 80014738 */ void setMat(mDoExt_3DlineMat_c*); }; -struct dKy_tevstr_c {}; +struct ResTIMG {}; struct _GXColor {}; -struct ResTIMG {}; +struct dKy_tevstr_c {}; struct mDoExt_3DlineMat1_c { /* 80013360 */ void init(u16, u16, ResTIMG*, int); @@ -481,7 +481,7 @@ extern "C" void __register_global_object(); /* ############################################################################################## */ /* 807F7A00-807F7A04 000000 0004+00 17/17 0/0 0/0 .rodata @3788 */ SECTION_RODATA static f32 const lit_3788 = 100.0f; -COMPILER_STRIP_GATE(807F7A00, &lit_3788); +COMPILER_STRIP_GATE(0x807F7A00, &lit_3788); /* 807F7A04-807F7A08 000004 0004+00 4/18 0/0 0/0 .rodata @3789 */ SECTION_RODATA static u8 const lit_3789[4] = { @@ -490,7 +490,7 @@ SECTION_RODATA static u8 const lit_3789[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(807F7A04, &lit_3789); +COMPILER_STRIP_GATE(0x807F7A04, &lit_3789); /* 807F7A08-807F7A10 000008 0004+04 3/15 0/0 0/0 .rodata @3790 */ SECTION_RODATA static f32 const lit_3790[1 + 1 /* padding */] = { @@ -498,7 +498,7 @@ SECTION_RODATA static f32 const lit_3790[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(807F7A08, &lit_3790); +COMPILER_STRIP_GATE(0x807F7A08, &lit_3790); /* 807F7A10-807F7A18 000010 0008+00 0/5 0/0 0/0 .rodata @3791 */ #pragma push @@ -506,7 +506,7 @@ COMPILER_STRIP_GATE(807F7A08, &lit_3790); SECTION_RODATA static u8 const lit_3791[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(807F7A10, &lit_3791); +COMPILER_STRIP_GATE(0x807F7A10, &lit_3791); #pragma pop /* 807F7A18-807F7A20 000018 0008+00 0/5 0/0 0/0 .rodata @3792 */ @@ -515,7 +515,7 @@ COMPILER_STRIP_GATE(807F7A10, &lit_3791); SECTION_RODATA static u8 const lit_3792[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(807F7A18, &lit_3792); +COMPILER_STRIP_GATE(0x807F7A18, &lit_3792); #pragma pop /* 807F7A20-807F7A28 000020 0008+00 0/5 0/0 0/0 .rodata @3793 */ @@ -524,19 +524,19 @@ COMPILER_STRIP_GATE(807F7A18, &lit_3792); SECTION_RODATA static u8 const lit_3793[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(807F7A20, &lit_3793); +COMPILER_STRIP_GATE(0x807F7A20, &lit_3793); #pragma pop /* 807F7A28-807F7A2C 000028 0004+00 0/1 0/0 0/0 .rodata @3794 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3794 = 1.0f / 100.0f; -COMPILER_STRIP_GATE(807F7A28, &lit_3794); +COMPILER_STRIP_GATE(0x807F7A28, &lit_3794); #pragma pop /* 807F7A2C-807F7A30 00002C 0004+00 1/4 0/0 0/0 .rodata @3809 */ SECTION_RODATA static f32 const lit_3809 = 0.5f; -COMPILER_STRIP_GATE(807F7A2C, &lit_3809); +COMPILER_STRIP_GATE(0x807F7A2C, &lit_3809); /* 807F7B38-807F7B44 000000 000C+00 2/2 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { @@ -793,12 +793,12 @@ asm daE_YD_HIO_c::daE_YD_HIO_c() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3870 = 1.5f; -COMPILER_STRIP_GATE(807F7A30, &lit_3870); +COMPILER_STRIP_GATE(0x807F7A30, &lit_3870); #pragma pop /* 807F7A34-807F7A38 000034 0004+00 2/4 0/0 0/0 .rodata @3871 */ SECTION_RODATA static f32 const lit_3871 = -1.0f; -COMPILER_STRIP_GATE(807F7A34, &lit_3871); +COMPILER_STRIP_GATE(0x807F7A34, &lit_3871); /* 807F2C78-807F2E20 000138 01A8+00 1/1 0/0 0/0 .text yd_disappear__FP10e_yd_class */ #pragma push @@ -810,6 +810,13 @@ static asm void yd_disappear(e_yd_class* param_0) { } #pragma pop +/* ############################################################################################## */ +/* 807F7B30-807F7B30 000130 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_807F7B30 = "E_yd"; +#pragma pop + /* 807F2E20-807F2ECC 0002E0 00AC+00 8/8 0/0 0/0 .text anm_init__FP10e_yd_classifUcf */ #pragma push #pragma optimization_level 0 @@ -837,14 +844,14 @@ static asm void leaf_anm_init(e_yd_class* param_0, int param_1, f32 param_2, u8 #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3949 = 50.0f; -COMPILER_STRIP_GATE(807F7A38, &lit_3949); +COMPILER_STRIP_GATE(0x807F7A38, &lit_3949); #pragma pop /* 807F7A3C-807F7A40 00003C 0004+00 0/1 0/0 0/0 .rodata @3950 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3950 = 600.0f; -COMPILER_STRIP_GATE(807F7A3C, &lit_3950); +COMPILER_STRIP_GATE(0x807F7A3C, &lit_3950); #pragma pop /* 807F2FA4-807F3168 000464 01C4+00 1/0 0/0 0/0 .text daE_YD_Draw__FP10e_yd_class */ @@ -882,70 +889,70 @@ static asm void damage_check(e_yd_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4075 = 10.0f; -COMPILER_STRIP_GATE(807F7A40, &lit_4075); +COMPILER_STRIP_GATE(0x807F7A40, &lit_4075); #pragma pop /* 807F7A44-807F7A48 000044 0004+00 0/2 0/0 0/0 .rodata @4076 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4076 = -170.0f; -COMPILER_STRIP_GATE(807F7A44, &lit_4076); +COMPILER_STRIP_GATE(0x807F7A44, &lit_4076); #pragma pop /* 807F7A48-807F7A4C 000048 0004+00 0/4 0/0 0/0 .rodata @4077 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4077 = 170.0f; -COMPILER_STRIP_GATE(807F7A48, &lit_4077); +COMPILER_STRIP_GATE(0x807F7A48, &lit_4077); #pragma pop /* 807F7A4C-807F7A50 00004C 0004+00 0/4 0/0 0/0 .rodata @4078 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4078 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(807F7A4C, &lit_4078); +COMPILER_STRIP_GATE(0x807F7A4C, &lit_4078); #pragma pop /* 807F7A50-807F7A54 000050 0004+00 0/6 0/0 0/0 .rodata @4079 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4079 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(807F7A50, &lit_4079); +COMPILER_STRIP_GATE(0x807F7A50, &lit_4079); #pragma pop /* 807F7A54-807F7A58 000054 0004+00 0/5 0/0 0/0 .rodata @4080 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4080 = 20.0f; -COMPILER_STRIP_GATE(807F7A54, &lit_4080); +COMPILER_STRIP_GATE(0x807F7A54, &lit_4080); #pragma pop /* 807F7A58-807F7A5C 000058 0004+00 0/1 0/0 0/0 .rodata @4081 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4081 = 4.0f; -COMPILER_STRIP_GATE(807F7A58, &lit_4081); +COMPILER_STRIP_GATE(0x807F7A58, &lit_4081); #pragma pop /* 807F7A5C-807F7A60 00005C 0004+00 0/1 0/0 0/0 .rodata @4082 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4082 = 2.0f / 5.0f; -COMPILER_STRIP_GATE(807F7A5C, &lit_4082); +COMPILER_STRIP_GATE(0x807F7A5C, &lit_4082); #pragma pop /* 807F7A60-807F7A64 000060 0004+00 0/1 0/0 0/0 .rodata @4083 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4083 = 1.0f / 50.0f; -COMPILER_STRIP_GATE(807F7A60, &lit_4083); +COMPILER_STRIP_GATE(0x807F7A60, &lit_4083); #pragma pop /* 807F7A64-807F7A68 000064 0004+00 0/7 0/0 0/0 .rodata @4084 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4084 = 1.0f / 20.0f; -COMPILER_STRIP_GATE(807F7A64, &lit_4084); +COMPILER_STRIP_GATE(0x807F7A64, &lit_4084); #pragma pop /* 807F7D68-807F7D6C 000008 0004+00 2/2 0/0 0/0 .bss None */ @@ -972,7 +979,7 @@ static asm void e_yd_stay(e_yd_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4118 = 30.0f; -COMPILER_STRIP_GATE(807F7A68, &lit_4118); +COMPILER_STRIP_GATE(0x807F7A68, &lit_4118); #pragma pop /* 807F3784-807F3A44 000C44 02C0+00 1/1 0/0 0/0 .text e_yd_appear__FP10e_yd_class */ @@ -988,41 +995,41 @@ static asm void e_yd_appear(e_yd_class* param_0) { /* ############################################################################################## */ /* 807F7A6C-807F7A70 00006C 0004+00 1/5 0/0 0/0 .rodata @4148 */ SECTION_RODATA static f32 const lit_4148 = 5.0f; -COMPILER_STRIP_GATE(807F7A6C, &lit_4148); +COMPILER_STRIP_GATE(0x807F7A6C, &lit_4148); /* 807F7A70-807F7A74 000070 0004+00 0/3 0/0 0/0 .rodata @4149 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4149 = 15.0f; -COMPILER_STRIP_GATE(807F7A70, &lit_4149); +COMPILER_STRIP_GATE(0x807F7A70, &lit_4149); #pragma pop /* 807F7A74-807F7A78 000074 0004+00 0/3 0/0 0/0 .rodata @4150 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4150 = 60.0f; -COMPILER_STRIP_GATE(807F7A74, &lit_4150); +COMPILER_STRIP_GATE(0x807F7A74, &lit_4150); #pragma pop /* 807F7A78-807F7A7C 000078 0004+00 0/3 0/0 0/0 .rodata @4151 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4151 = 40.0f; -COMPILER_STRIP_GATE(807F7A78, &lit_4151); +COMPILER_STRIP_GATE(0x807F7A78, &lit_4151); #pragma pop /* 807F7A7C-807F7A80 00007C 0004+00 0/2 0/0 0/0 .rodata @4152 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4152 = 400.0f; -COMPILER_STRIP_GATE(807F7A7C, &lit_4152); +COMPILER_STRIP_GATE(0x807F7A7C, &lit_4152); #pragma pop /* 807F7A80-807F7A84 000080 0004+00 0/1 0/0 0/0 .rodata @4153 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4153 = 3.0f / 20.0f; -COMPILER_STRIP_GATE(807F7A80, &lit_4153); +COMPILER_STRIP_GATE(0x807F7A80, &lit_4153); #pragma pop /* 807F3A44-807F3C10 000F04 01CC+00 1/1 0/0 0/0 .text e_yd_appear_v__FP10e_yd_class */ @@ -1040,42 +1047,42 @@ static asm void e_yd_appear_v(e_yd_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4246 = 0.75f; -COMPILER_STRIP_GATE(807F7A84, &lit_4246); +COMPILER_STRIP_GATE(0x807F7A84, &lit_4246); #pragma pop /* 807F7A88-807F7A8C 000088 0004+00 0/1 0/0 0/0 .rodata @4247 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4247 = 90.0f; -COMPILER_STRIP_GATE(807F7A88, &lit_4247); +COMPILER_STRIP_GATE(0x807F7A88, &lit_4247); #pragma pop /* 807F7A8C-807F7A90 00008C 0004+00 0/2 0/0 0/0 .rodata @4248 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4248 = -100.0f; -COMPILER_STRIP_GATE(807F7A8C, &lit_4248); +COMPILER_STRIP_GATE(0x807F7A8C, &lit_4248); #pragma pop /* 807F7A90-807F7A94 000090 0004+00 0/1 0/0 0/0 .rodata @4249 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4249 = 3.0f / 10.0f; -COMPILER_STRIP_GATE(807F7A90, &lit_4249); +COMPILER_STRIP_GATE(0x807F7A90, &lit_4249); #pragma pop /* 807F7A94-807F7A98 000094 0004+00 0/1 0/0 0/0 .rodata @4250 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4250 = 700.0f; -COMPILER_STRIP_GATE(807F7A94, &lit_4250); +COMPILER_STRIP_GATE(0x807F7A94, &lit_4250); #pragma pop /* 807F7A98-807F7AA0 000098 0008+00 1/3 0/0 0/0 .rodata @4252 */ SECTION_RODATA static u8 const lit_4252[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(807F7A98, &lit_4252); +COMPILER_STRIP_GATE(0x807F7A98, &lit_4252); /* 807F3C10-807F4158 0010D0 0548+00 1/1 0/0 0/0 .text e_yd_wait__FP10e_yd_class */ #pragma push @@ -1092,49 +1099,49 @@ static asm void e_yd_wait(e_yd_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4445 = 350.0f; -COMPILER_STRIP_GATE(807F7AA0, &lit_4445); +COMPILER_STRIP_GATE(0x807F7AA0, &lit_4445); #pragma pop /* 807F7AA4-807F7AA8 0000A4 0004+00 0/1 0/0 0/0 .rodata @4446 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4446 = 4.0f / 5.0f; -COMPILER_STRIP_GATE(807F7AA4, &lit_4446); +COMPILER_STRIP_GATE(0x807F7AA4, &lit_4446); #pragma pop /* 807F7AA8-807F7AAC 0000A8 0004+00 0/1 0/0 0/0 .rodata @4447 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4447 = 2.0f; -COMPILER_STRIP_GATE(807F7AA8, &lit_4447); +COMPILER_STRIP_GATE(0x807F7AA8, &lit_4447); #pragma pop /* 807F7AAC-807F7AB0 0000AC 0004+00 0/1 0/0 0/0 .rodata @4448 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4448 = 2000.0f; -COMPILER_STRIP_GATE(807F7AAC, &lit_4448); +COMPILER_STRIP_GATE(0x807F7AAC, &lit_4448); #pragma pop /* 807F7AB0-807F7AB4 0000B0 0004+00 0/2 0/0 0/0 .rodata @4449 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4449 = 70.0f; -COMPILER_STRIP_GATE(807F7AB0, &lit_4449); +COMPILER_STRIP_GATE(0x807F7AB0, &lit_4449); #pragma pop /* 807F7AB4-807F7AB8 0000B4 0004+00 0/3 0/0 0/0 .rodata @4450 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4450 = -50.0f; -COMPILER_STRIP_GATE(807F7AB4, &lit_4450); +COMPILER_STRIP_GATE(0x807F7AB4, &lit_4450); #pragma pop /* 807F7AB8-807F7ABC 0000B8 0004+00 0/1 0/0 0/0 .rodata @4451 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4451 = 200.0f; -COMPILER_STRIP_GATE(807F7AB8, &lit_4451); +COMPILER_STRIP_GATE(0x807F7AB8, &lit_4451); #pragma pop /* 807F4158-807F4BB8 001618 0A60+00 1/1 0/0 0/0 .text e_yd_attack__FP10e_yd_class */ @@ -1152,14 +1159,14 @@ static asm void e_yd_attack(e_yd_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4504 = 230.0f; -COMPILER_STRIP_GATE(807F7ABC, &lit_4504); +COMPILER_STRIP_GATE(0x807F7ABC, &lit_4504); #pragma pop /* 807F7AC0-807F7AC4 0000C0 0004+00 0/4 0/0 0/0 .rodata @4505 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4505 = 3.0f; -COMPILER_STRIP_GATE(807F7AC0, &lit_4505); +COMPILER_STRIP_GATE(0x807F7AC0, &lit_4505); #pragma pop /* 807F4BB8-807F4EB8 002078 0300+00 1/1 0/0 0/0 .text e_yd_chance__FP10e_yd_class */ @@ -1177,14 +1184,14 @@ static asm void e_yd_chance(e_yd_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4550 = 250.0f; -COMPILER_STRIP_GATE(807F7AC4, &lit_4550); +COMPILER_STRIP_GATE(0x807F7AC4, &lit_4550); #pragma pop /* 807F7AC8-807F7ACC 0000C8 0004+00 0/1 0/0 0/0 .rodata @4551 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4551 = 23.0f / 25.0f; -COMPILER_STRIP_GATE(807F7AC8, &lit_4551); +COMPILER_STRIP_GATE(0x807F7AC8, &lit_4551); #pragma pop /* 807F4EB8-807F5110 002378 0258+00 1/1 0/0 0/0 .text e_yd_s_damage__FP10e_yd_class */ @@ -1202,21 +1209,21 @@ static asm void e_yd_s_damage(e_yd_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4628 = -20.0f; -COMPILER_STRIP_GATE(807F7ACC, &lit_4628); +COMPILER_STRIP_GATE(0x807F7ACC, &lit_4628); #pragma pop /* 807F7AD0-807F7AD4 0000D0 0004+00 0/1 0/0 0/0 .rodata @4629 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4629 = 450.0f; -COMPILER_STRIP_GATE(807F7AD0, &lit_4629); +COMPILER_STRIP_GATE(0x807F7AD0, &lit_4629); #pragma pop /* 807F7AD4-807F7AD8 0000D4 0004+00 0/1 0/0 0/0 .rodata @4630 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4630 = -1.0f / 10.0f; -COMPILER_STRIP_GATE(807F7AD4, &lit_4630); +COMPILER_STRIP_GATE(0x807F7AD4, &lit_4630); #pragma pop /* 807F5110-807F54F0 0025D0 03E0+00 1/1 0/0 0/0 .text e_yd_damage__FP10e_yd_class */ @@ -1234,14 +1241,14 @@ static asm void e_yd_damage(e_yd_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4709 = -30.0f; -COMPILER_STRIP_GATE(807F7AD8, &lit_4709); +COMPILER_STRIP_GATE(0x807F7AD8, &lit_4709); #pragma pop /* 807F7ADC-807F7AE0 0000DC 0004+00 0/1 0/0 0/0 .rodata @4710 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4710 = -200.0f; -COMPILER_STRIP_GATE(807F7ADC, &lit_4710); +COMPILER_STRIP_GATE(0x807F7ADC, &lit_4710); #pragma pop /* 807F54F0-807F5820 0029B0 0330+00 1/1 0/0 0/0 .text kuki_control1__FP10e_yd_class */ @@ -1267,7 +1274,7 @@ static asm void kuki_control2(e_yd_class* param_0) { /* ############################################################################################## */ /* 807F7AE0-807F7AE4 0000E0 0004+00 1/1 0/0 0/0 .rodata @4765 */ SECTION_RODATA static f32 const lit_4765 = 11.0f; -COMPILER_STRIP_GATE(807F7AE0, &lit_4765); +COMPILER_STRIP_GATE(0x807F7AE0, &lit_4765); /* 807F5994-807F5A70 002E54 00DC+00 1/1 0/0 0/0 .text kuki_control3__FP10e_yd_class */ #pragma push @@ -1314,70 +1321,70 @@ static asm void eff_set(e_yd_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4861 = -10.0f; -COMPILER_STRIP_GATE(807F7AE4, &lit_4861); +COMPILER_STRIP_GATE(0x807F7AE4, &lit_4861); #pragma pop /* 807F7AE8-807F7AEC 0000E8 0004+00 0/1 0/0 0/0 .rodata @4862 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4862 = 10000.0f; -COMPILER_STRIP_GATE(807F7AE8, &lit_4862); +COMPILER_STRIP_GATE(0x807F7AE8, &lit_4862); #pragma pop /* 807F7AEC-807F7AF0 0000EC 0004+00 0/0 0/0 0/0 .rodata @4863 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4863 = 65536.0f; -COMPILER_STRIP_GATE(807F7AEC, &lit_4863); +COMPILER_STRIP_GATE(0x807F7AEC, &lit_4863); #pragma pop /* 807F7AF0-807F7AF4 0000F0 0004+00 0/0 0/0 0/0 .rodata @4864 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4864 = -5.0f; -COMPILER_STRIP_GATE(807F7AF0, &lit_4864); +COMPILER_STRIP_GATE(0x807F7AF0, &lit_4864); #pragma pop /* 807F7AF4-807F7AF8 0000F4 0004+00 0/0 0/0 0/0 .rodata @5003 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5003 = 25.0f; -COMPILER_STRIP_GATE(807F7AF4, &lit_5003); +COMPILER_STRIP_GATE(0x807F7AF4, &lit_5003); #pragma pop /* 807F7AF8-807F7AFC 0000F8 0004+00 0/1 0/0 0/0 .rodata @5004 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5004 = -30000.0f; -COMPILER_STRIP_GATE(807F7AF8, &lit_5004); +COMPILER_STRIP_GATE(0x807F7AF8, &lit_5004); #pragma pop /* 807F7AFC-807F7B00 0000FC 0004+00 0/0 0/0 0/0 .rodata @5005 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5005 = 300000.0f; -COMPILER_STRIP_GATE(807F7AFC, &lit_5005); +COMPILER_STRIP_GATE(0x807F7AFC, &lit_5005); #pragma pop /* 807F7B00-807F7B04 000100 0004+00 0/0 0/0 0/0 .rodata @5006 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5006 = 30000.0f; -COMPILER_STRIP_GATE(807F7B00, &lit_5006); +COMPILER_STRIP_GATE(0x807F7B00, &lit_5006); #pragma pop /* 807F7B04-807F7B08 000104 0004+00 0/1 0/0 0/0 .rodata @5167 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5167 = 22.0f; -COMPILER_STRIP_GATE(807F7B04, &lit_5167); +COMPILER_STRIP_GATE(0x807F7B04, &lit_5167); #pragma pop /* 807F7B08-807F7B0C 000108 0004+00 0/1 0/0 0/0 .rodata @5168 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5168 = 21.0f; -COMPILER_STRIP_GATE(807F7B08, &lit_5168); +COMPILER_STRIP_GATE(0x807F7B08, &lit_5168); #pragma pop /* 807F64E0-807F6648 0039A0 0168+00 1/1 0/0 0/0 .text anm_se_set__FP10e_yd_class */ @@ -1395,7 +1402,7 @@ static asm void anm_se_set(e_yd_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5238 = -20000.0f; -COMPILER_STRIP_GATE(807F7B0C, &lit_5238); +COMPILER_STRIP_GATE(0x807F7B0C, &lit_5238); #pragma pop /* 807F6648-807F694C 003B08 0304+00 2/1 0/0 0/0 .text daE_YD_Execute__FP10e_yd_class */ @@ -1448,28 +1455,28 @@ asm J3DFrameCtrl::~J3DFrameCtrl() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5468 = 500.0f; -COMPILER_STRIP_GATE(807F7B10, &lit_5468); +COMPILER_STRIP_GATE(0x807F7B10, &lit_5468); #pragma pop /* 807F7B14-807F7B18 000114 0004+00 0/1 0/0 0/0 .rodata @5469 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5469 = -300.0f; -COMPILER_STRIP_GATE(807F7B14, &lit_5469); +COMPILER_STRIP_GATE(0x807F7B14, &lit_5469); #pragma pop /* 807F7B18-807F7B1C 000118 0004+00 0/1 0/0 0/0 .rodata @5470 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5470 = -400.0f; -COMPILER_STRIP_GATE(807F7B18, &lit_5470); +COMPILER_STRIP_GATE(0x807F7B18, &lit_5470); #pragma pop /* 807F7B1C-807F7B20 00011C 0004+00 0/1 0/0 0/0 .rodata @5471 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5471 = 300.0f; -COMPILER_STRIP_GATE(807F7B1C, &lit_5471); +COMPILER_STRIP_GATE(0x807F7B1C, &lit_5471); #pragma pop /* 807F7B20-807F7B28 000120 0004+04 0/1 0/0 0/0 .rodata @5472 */ @@ -1480,7 +1487,7 @@ SECTION_RODATA static f32 const lit_5472[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(807F7B20, &lit_5472); +COMPILER_STRIP_GATE(0x807F7B20, &lit_5472); #pragma pop /* 807F7B28-807F7B30 000128 0008+00 0/1 0/0 0/0 .rodata @5474 */ @@ -1489,7 +1496,7 @@ COMPILER_STRIP_GATE(807F7B20, &lit_5472); SECTION_RODATA static u8 const lit_5474[8] = { 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(807F7B28, &lit_5474); +COMPILER_STRIP_GATE(0x807F7B28, &lit_5474); #pragma pop /* 807F6C90-807F7160 004150 04D0+00 1/0 0/0 0/0 .text daE_YD_Create__FP10fopAc_ac_c */ @@ -1614,7 +1621,7 @@ asm void __sinit_d_a_e_yd_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_807F7514 = (void*)__sinit_d_a_e_yd_cpp; +REGISTER_CTORS(0x807F7514, __sinit_d_a_e_yd_cpp); #pragma pop /* 807F7550-807F7558 004A10 0008+00 1/0 0/0 0/0 .text @36@__dt__12dBgS_ObjAcchFv */ @@ -1669,9 +1676,4 @@ asm cXyz::~cXyz() { } #pragma pop -/* 807F7B30-807F7B35 000130 0005+00 5/5 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_807F7B30 = "E_yd"; -#pragma pop +/* 807F7B30-807F7B30 000130 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/e/d_a_e_yd_leaf/d_a_e_yd_leaf.cpp b/rel/d/a/e/d_a_e_yd_leaf/d_a_e_yd_leaf.cpp index 7d3b526ef30..7486c45163b 100644 --- a/rel/d/a/e/d_a_e_yd_leaf/d_a_e_yd_leaf.cpp +++ b/rel/d/a/e/d_a_e_yd_leaf/d_a_e_yd_leaf.cpp @@ -120,20 +120,20 @@ static asm void daE_YD_LEAF_Draw(e_yd_leaf_class* param_0) { /* ############################################################################################## */ /* 807F81E8-807F81EC 000000 0004+00 3/3 0/0 0/0 .rodata @3707 */ SECTION_RODATA static f32 const lit_3707 = 1.0f; -COMPILER_STRIP_GATE(807F81E8, &lit_3707); +COMPILER_STRIP_GATE(0x807F81E8, &lit_3707); /* 807F81EC-807F81F0 000004 0004+00 0/1 0/0 0/0 .rodata @3708 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3708 = 2.0f / 25.0f; -COMPILER_STRIP_GATE(807F81EC, &lit_3708); +COMPILER_STRIP_GATE(0x807F81EC, &lit_3708); #pragma pop /* 807F81F0-807F81F4 000008 0004+00 0/1 0/0 0/0 .rodata @3709 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3709 = 1.0f / 100.0f; -COMPILER_STRIP_GATE(807F81F0, &lit_3709); +COMPILER_STRIP_GATE(0x807F81F0, &lit_3709); #pragma pop /* 807F7EC0-807F7FEC 000120 012C+00 2/1 0/0 0/0 .text daE_YD_LEAF_Execute__FP15e_yd_leaf_class */ @@ -151,6 +151,13 @@ static bool daE_YD_LEAF_IsDelete(e_yd_leaf_class* param_0) { return true; } +/* ############################################################################################## */ +/* 807F81F4-807F81F4 00000C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_807F81F4 = "E_YD"; +#pragma pop + /* 807F7FF4-807F8024 000254 0030+00 1/0 0/0 0/0 .text daE_YD_LEAF_Delete__FP15e_yd_leaf_class */ #pragma push #pragma optimization_level 0 @@ -205,9 +212,4 @@ SECTION_DATA extern void* g_profile_E_YD_LEAF[12] = { (void*)0x00040000, (void*)NULL, }; -/* 807F81F4-807F81F9 00000C 0005+00 3/3 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_807F81F4 = "E_YD"; -#pragma pop +/* 807F81F4-807F81F4 00000C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/e/d_a_e_yg/d_a_e_yg.cpp b/rel/d/a/e/d_a_e_yg/d_a_e_yg.cpp index 3663c14e9d6..09323a3c7d8 100644 --- a/rel/d/a/e/d_a_e_yg/d_a_e_yg.cpp +++ b/rel/d/a/e/d_a_e_yg/d_a_e_yg.cpp @@ -25,16 +25,16 @@ struct mDoMtx_stack_c { static u8 now[48]; }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; - struct J3DAnmTransform {}; +struct J3DModelData {}; + +struct Z2Creature {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -472,7 +472,7 @@ extern "C" void __register_global_object(); /* ############################################################################################## */ /* 807FCCB4-807FCCB8 000000 0004+00 20/20 0/0 0/0 .rodata @3801 */ SECTION_RODATA static f32 const lit_3801 = 100.0f; -COMPILER_STRIP_GATE(807FCCB4, &lit_3801); +COMPILER_STRIP_GATE(0x807FCCB4, &lit_3801); /* 807FCCB8-807FCCBC 000004 0004+00 2/17 0/0 0/0 .rodata @3802 */ SECTION_RODATA static u8 const lit_3802[4] = { @@ -481,7 +481,7 @@ SECTION_RODATA static u8 const lit_3802[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(807FCCB8, &lit_3802); +COMPILER_STRIP_GATE(0x807FCCB8, &lit_3802); /* 807FCCBC-807FCCC4 000008 0004+04 3/15 0/0 0/0 .rodata @3803 */ SECTION_RODATA static f32 const lit_3803[1 + 1 /* padding */] = { @@ -489,7 +489,7 @@ SECTION_RODATA static f32 const lit_3803[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(807FCCBC, &lit_3803); +COMPILER_STRIP_GATE(0x807FCCBC, &lit_3803); /* 807FCCC4-807FCCCC 000010 0008+00 0/3 0/0 0/0 .rodata @3804 */ #pragma push @@ -497,7 +497,7 @@ COMPILER_STRIP_GATE(807FCCBC, &lit_3803); SECTION_RODATA static u8 const lit_3804[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(807FCCC4, &lit_3804); +COMPILER_STRIP_GATE(0x807FCCC4, &lit_3804); #pragma pop /* 807FCCCC-807FCCD4 000018 0008+00 0/3 0/0 0/0 .rodata @3805 */ @@ -506,7 +506,7 @@ COMPILER_STRIP_GATE(807FCCC4, &lit_3804); SECTION_RODATA static u8 const lit_3805[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(807FCCCC, &lit_3805); +COMPILER_STRIP_GATE(0x807FCCCC, &lit_3805); #pragma pop /* 807FCCD4-807FCCDC 000020 0008+00 0/3 0/0 0/0 .rodata @3806 */ @@ -515,42 +515,42 @@ COMPILER_STRIP_GATE(807FCCCC, &lit_3805); SECTION_RODATA static u8 const lit_3806[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(807FCCD4, &lit_3806); +COMPILER_STRIP_GATE(0x807FCCD4, &lit_3806); #pragma pop /* 807FCCDC-807FCCE0 000028 0004+00 0/1 0/0 0/0 .rodata @3807 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3807 = 1.0f / 100.0f; -COMPILER_STRIP_GATE(807FCCDC, &lit_3807); +COMPILER_STRIP_GATE(0x807FCCDC, &lit_3807); #pragma pop /* 807FCCE0-807FCCE4 00002C 0004+00 0/3 0/0 0/0 .rodata @3822 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3822 = 15.0f; -COMPILER_STRIP_GATE(807FCCE0, &lit_3822); +COMPILER_STRIP_GATE(0x807FCCE0, &lit_3822); #pragma pop /* 807FCCE4-807FCCE8 000030 0004+00 0/6 0/0 0/0 .rodata @3823 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3823 = 40.0f; -COMPILER_STRIP_GATE(807FCCE4, &lit_3823); +COMPILER_STRIP_GATE(0x807FCCE4, &lit_3823); #pragma pop /* 807FCCE8-807FCCEC 000034 0004+00 0/1 0/0 0/0 .rodata @3824 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3824 = 4.0f; -COMPILER_STRIP_GATE(807FCCE8, &lit_3824); +COMPILER_STRIP_GATE(0x807FCCE8, &lit_3824); #pragma pop /* 807FCCEC-807FCCF0 000038 0004+00 0/1 0/0 0/0 .rodata @3825 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3825 = 450.0f; -COMPILER_STRIP_GATE(807FCCEC, &lit_3825); +COMPILER_STRIP_GATE(0x807FCCEC, &lit_3825); #pragma pop /* 807FCDFC-807FCE08 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ @@ -762,7 +762,13 @@ asm daE_YG_HIO_c::daE_YG_HIO_c() { /* ############################################################################################## */ /* 807FCCF0-807FCCF4 00003C 0004+00 1/2 0/0 0/0 .rodata @3839 */ SECTION_RODATA static f32 const lit_3839 = -1.0f; -COMPILER_STRIP_GATE(807FCCF0, &lit_3839); +COMPILER_STRIP_GATE(0x807FCCF0, &lit_3839); + +/* 807FCDF0-807FCDF0 00013C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_807FCDF0 = "E_YG"; +#pragma pop /* 807F8394-807F8440 000134 00AC+00 7/7 0/0 0/0 .text anm_init__FP10e_yg_classifUcf */ #pragma push @@ -789,7 +795,7 @@ static asm void pl_check(e_yg_class* param_0, f32 param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3893 = 400.0f; -COMPILER_STRIP_GATE(807FCCF4, &lit_3893); +COMPILER_STRIP_GATE(0x807FCCF4, &lit_3893); #pragma pop /* 807F848C-807F8610 00022C 0184+00 1/0 0/0 0/0 .text daE_YG_Draw__FP10e_yg_class */ @@ -805,7 +811,7 @@ static asm void daE_YG_Draw(e_yg_class* param_0) { /* ############################################################################################## */ /* 807FCCF8-807FCCFC 000044 0004+00 1/4 0/0 0/0 .rodata @3912 */ SECTION_RODATA static f32 const lit_3912 = 50.0f; -COMPILER_STRIP_GATE(807FCCF8, &lit_3912); +COMPILER_STRIP_GATE(0x807FCCF8, &lit_3912); /* 807F8610-807F86F8 0003B0 00E8+00 2/2 0/0 0/0 .text sibuki_set__FP10e_yg_class */ #pragma push @@ -822,63 +828,63 @@ static asm void sibuki_set(e_yg_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4023 = 13.0f / 20.0f; -COMPILER_STRIP_GATE(807FCCFC, &lit_4023); +COMPILER_STRIP_GATE(0x807FCCFC, &lit_4023); #pragma pop /* 807FCD00-807FCD04 00004C 0004+00 0/2 0/0 0/0 .rodata @4024 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4024 = 3.0f / 5.0f; -COMPILER_STRIP_GATE(807FCD00, &lit_4024); +COMPILER_STRIP_GATE(0x807FCD00, &lit_4024); #pragma pop /* 807FCD04-807FCD08 000050 0004+00 0/3 0/0 0/0 .rodata @4025 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4025 = 60.0f; -COMPILER_STRIP_GATE(807FCD04, &lit_4025); +COMPILER_STRIP_GATE(0x807FCD04, &lit_4025); #pragma pop /* 807FCD08-807FCD0C 000054 0004+00 0/1 0/0 0/0 .rodata @4026 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4026 = 36.0f; -COMPILER_STRIP_GATE(807FCD08, &lit_4026); +COMPILER_STRIP_GATE(0x807FCD08, &lit_4026); #pragma pop /* 807FCD0C-807FCD10 000058 0004+00 0/1 0/0 0/0 .rodata @4027 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4027 = -18.0f; -COMPILER_STRIP_GATE(807FCD0C, &lit_4027); +COMPILER_STRIP_GATE(0x807FCD0C, &lit_4027); #pragma pop /* 807FCD10-807FCD14 00005C 0004+00 0/1 0/0 0/0 .rodata @4028 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4028 = 22.0f; -COMPILER_STRIP_GATE(807FCD10, &lit_4028); +COMPILER_STRIP_GATE(0x807FCD10, &lit_4028); #pragma pop /* 807FCD14-807FCD18 000060 0004+00 0/1 0/0 0/0 .rodata @4029 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4029 = 45.0f; -COMPILER_STRIP_GATE(807FCD14, &lit_4029); +COMPILER_STRIP_GATE(0x807FCD14, &lit_4029); #pragma pop /* 807FCD18-807FCD1C 000064 0004+00 0/3 0/0 0/0 .rodata @4030 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4030 = -2.0f; -COMPILER_STRIP_GATE(807FCD18, &lit_4030); +COMPILER_STRIP_GATE(0x807FCD18, &lit_4030); #pragma pop /* 807FCD1C-807FCD20 000068 0004+00 0/1 0/0 0/0 .rodata @4031 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4031 = -68.0f; -COMPILER_STRIP_GATE(807FCD1C, &lit_4031); +COMPILER_STRIP_GATE(0x807FCD1C, &lit_4031); #pragma pop /* 807FD020-807FD024 000008 0001+03 3/3 0/0 0/0 .bss @1109 */ @@ -1038,7 +1044,7 @@ static asm void s_d_sub(void* param_0, void* param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4097 = 1000.0f; -COMPILER_STRIP_GATE(807FCD20, &lit_4097); +COMPILER_STRIP_GATE(0x807FCD20, &lit_4097); #pragma pop /* 807F8AE4-807F8C60 000884 017C+00 1/1 0/0 0/0 .text search_dokuro__FP10e_yg_class */ @@ -1056,14 +1062,14 @@ static asm void search_dokuro(e_yg_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4144 = 65535.0f; -COMPILER_STRIP_GATE(807FCD24, &lit_4144); +COMPILER_STRIP_GATE(0x807FCD24, &lit_4144); #pragma pop /* 807FCD28-807FCD2C 000074 0004+00 0/1 0/0 0/0 .rodata @4145 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4145 = 150.0f; -COMPILER_STRIP_GATE(807FCD28, &lit_4145); +COMPILER_STRIP_GATE(0x807FCD28, &lit_4145); #pragma pop /* 807F8C60-807F8DD8 000A00 0178+00 1/1 0/0 0/0 .text way_set__FP10e_yg_class */ @@ -1081,49 +1087,49 @@ static asm void way_set(e_yg_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4192 = 3.0f; -COMPILER_STRIP_GATE(807FCD2C, &lit_4192); +COMPILER_STRIP_GATE(0x807FCD2C, &lit_4192); #pragma pop /* 807FCD30-807FCD34 00007C 0004+00 0/6 0/0 0/0 .rodata @4193 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4193 = 30.0f; -COMPILER_STRIP_GATE(807FCD30, &lit_4193); +COMPILER_STRIP_GATE(0x807FCD30, &lit_4193); #pragma pop /* 807FCD34-807FCD38 000080 0004+00 0/2 0/0 0/0 .rodata @4194 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4194 = 2000.0f; -COMPILER_STRIP_GATE(807FCD34, &lit_4194); +COMPILER_STRIP_GATE(0x807FCD34, &lit_4194); #pragma pop /* 807FCD38-807FCD3C 000084 0004+00 0/2 0/0 0/0 .rodata @4195 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4195 = 200.0f; -COMPILER_STRIP_GATE(807FCD38, &lit_4195); +COMPILER_STRIP_GATE(0x807FCD38, &lit_4195); #pragma pop /* 807FCD3C-807FCD40 000088 0004+00 0/1 0/0 0/0 .rodata @4196 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4196 = 1.5f; -COMPILER_STRIP_GATE(807FCD3C, &lit_4196); +COMPILER_STRIP_GATE(0x807FCD3C, &lit_4196); #pragma pop /* 807FCD40-807FCD44 00008C 0004+00 0/1 0/0 0/0 .rodata @4197 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4197 = 4000.0f; -COMPILER_STRIP_GATE(807FCD40, &lit_4197); +COMPILER_STRIP_GATE(0x807FCD40, &lit_4197); #pragma pop /* 807FCD44-807FCD48 000090 0004+00 0/1 0/0 0/0 .rodata @4198 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4198 = 0.25f; -COMPILER_STRIP_GATE(807FCD44, &lit_4198); +COMPILER_STRIP_GATE(0x807FCD44, &lit_4198); #pragma pop /* 807F8DD8-807F9154 000B78 037C+00 1/1 0/0 0/0 .text e_yg_normal__FP10e_yg_class */ @@ -1151,28 +1157,28 @@ static asm void e_yg_attack(e_yg_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4280 = 300.0f; -COMPILER_STRIP_GATE(807FCD48, &lit_4280); +COMPILER_STRIP_GATE(0x807FCD48, &lit_4280); #pragma pop /* 807FCD4C-807FCD50 000098 0004+00 0/6 0/0 0/0 .rodata @4281 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4281 = 10.0f; -COMPILER_STRIP_GATE(807FCD4C, &lit_4281); +COMPILER_STRIP_GATE(0x807FCD4C, &lit_4281); #pragma pop /* 807FCD50-807FCD54 00009C 0004+00 0/2 0/0 0/0 .rodata @4398 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4398 = 70.0f; -COMPILER_STRIP_GATE(807FCD50, &lit_4398); +COMPILER_STRIP_GATE(0x807FCD50, &lit_4398); #pragma pop /* 807FCD54-807FCD58 0000A0 0004+00 0/3 0/0 0/0 .rodata @4399 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4399 = 10000.0f; -COMPILER_STRIP_GATE(807FCD54, &lit_4399); +COMPILER_STRIP_GATE(0x807FCD54, &lit_4399); #pragma pop /* 807F94E8-807F99CC 001288 04E4+00 1/1 0/0 0/0 .text search_ground_1__FP10e_yg_class */ @@ -1195,35 +1201,35 @@ cXyz::cXyz() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4430 = 5.0f; -COMPILER_STRIP_GATE(807FCD58, &lit_4430); +COMPILER_STRIP_GATE(0x807FCD58, &lit_4430); #pragma pop /* 807FCD5C-807FCD60 0000A8 0004+00 0/3 0/0 0/0 .rodata @4431 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4431 = 2.0f; -COMPILER_STRIP_GATE(807FCD5C, &lit_4431); +COMPILER_STRIP_GATE(0x807FCD5C, &lit_4431); #pragma pop /* 807FCD60-807FCD64 0000AC 0004+00 0/3 0/0 0/0 .rodata @4432 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4432 = 8.0f; -COMPILER_STRIP_GATE(807FCD60, &lit_4432); +COMPILER_STRIP_GATE(0x807FCD60, &lit_4432); #pragma pop /* 807FCD64-807FCD68 0000B0 0004+00 0/3 0/0 0/0 .rodata @4433 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4433 = 0.5f; -COMPILER_STRIP_GATE(807FCD64, &lit_4433); +COMPILER_STRIP_GATE(0x807FCD64, &lit_4433); #pragma pop /* 807FCD68-807FCD6C 0000B4 0004+00 0/3 0/0 0/0 .rodata @4434 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4434 = 20.0f; -COMPILER_STRIP_GATE(807FCD68, &lit_4434); +COMPILER_STRIP_GATE(0x807FCD68, &lit_4434); #pragma pop /* 807F99D0-807F9BB8 001770 01E8+00 1/1 0/0 0/0 .text e_yg_swim__FP10e_yg_class */ @@ -1241,21 +1247,21 @@ static asm void e_yg_swim(e_yg_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4500 = 75.0f; -COMPILER_STRIP_GATE(807FCD6C, &lit_4500); +COMPILER_STRIP_GATE(0x807FCD6C, &lit_4500); #pragma pop /* 807FCD70-807FCD74 0000BC 0004+00 0/1 0/0 0/0 .rodata @4501 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4501 = 90.0f; -COMPILER_STRIP_GATE(807FCD70, &lit_4501); +COMPILER_STRIP_GATE(0x807FCD70, &lit_4501); #pragma pop /* 807FCD74-807FCD78 0000C0 0004+00 0/1 0/0 0/0 .rodata @4502 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4502 = 65.0f; -COMPILER_STRIP_GATE(807FCD74, &lit_4502); +COMPILER_STRIP_GATE(0x807FCD74, &lit_4502); #pragma pop /* 807F9BB8-807F9EF8 001958 0340+00 1/1 0/0 0/0 .text e_yg_dokuro__FP10e_yg_class */ @@ -1273,7 +1279,7 @@ static asm void e_yg_dokuro(e_yg_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4532 = -30.0f; -COMPILER_STRIP_GATE(807FCD78, &lit_4532); +COMPILER_STRIP_GATE(0x807FCD78, &lit_4532); #pragma pop /* 807F9EF8-807FA14C 001C98 0254+00 1/1 0/0 0/0 .text e_yg_damage__FP10e_yg_class */ @@ -1321,28 +1327,28 @@ static asm void damage_check(e_yg_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4658 = -5.0f; -COMPILER_STRIP_GATE(807FCD7C, &lit_4658); +COMPILER_STRIP_GATE(0x807FCD7C, &lit_4658); #pragma pop /* 807FCD80-807FCD84 0000CC 0004+00 0/1 0/0 0/0 .rodata @4659 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4659 = -12.0f; -COMPILER_STRIP_GATE(807FCD80, &lit_4659); +COMPILER_STRIP_GATE(0x807FCD80, &lit_4659); #pragma pop /* 807FCD84-807FCD88 0000D0 0004+00 0/1 0/0 0/0 .rodata @4660 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4660 = 65536.0f; -COMPILER_STRIP_GATE(807FCD84, &lit_4660); +COMPILER_STRIP_GATE(0x807FCD84, &lit_4660); #pragma pop /* 807FCD88-807FCD8C 0000D4 0004+00 0/1 0/0 0/0 .rodata @4661 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4661 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(807FCD88, &lit_4661); +COMPILER_STRIP_GATE(0x807FCD88, &lit_4661); #pragma pop /* 807FCD8C-807FCD94 0000D8 0004+04 0/1 0/0 0/0 .rodata @4662 */ @@ -1353,7 +1359,7 @@ SECTION_RODATA static f32 const lit_4662[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(807FCD8C, &lit_4662); +COMPILER_STRIP_GATE(0x807FCD8C, &lit_4662); #pragma pop /* 807FCD94-807FCD9C 0000E0 0008+00 0/1 0/0 0/0 .rodata @4664 */ @@ -1362,7 +1368,7 @@ COMPILER_STRIP_GATE(807FCD8C, &lit_4662); SECTION_RODATA static u8 const lit_4664[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(807FCD94, &lit_4664); +COMPILER_STRIP_GATE(0x807FCD94, &lit_4664); #pragma pop /* 807FA478-807FA7B0 002218 0338+00 1/1 0/0 0/0 .text ke_control__FP10e_yg_classP7yg_ke_sif */ @@ -1380,14 +1386,14 @@ static asm void ke_control(e_yg_class* param_0, yg_ke_s* param_1, int param_2, f #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4687 = 3.5f; -COMPILER_STRIP_GATE(807FCD9C, &lit_4687); +COMPILER_STRIP_GATE(0x807FCD9C, &lit_4687); #pragma pop /* 807FCDA0-807FCDA4 0000EC 0004+00 0/1 0/0 0/0 .rodata @4688 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4688 = 9.0f / 5.0f; -COMPILER_STRIP_GATE(807FCDA0, &lit_4688); +COMPILER_STRIP_GATE(0x807FCDA0, &lit_4688); #pragma pop /* 807FA7B0-807FA888 002550 00D8+00 1/1 0/0 0/0 .text @@ -1590,91 +1596,91 @@ static asm void action(e_yg_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4891 = 500.0f; -COMPILER_STRIP_GATE(807FCDA4, &lit_4891); +COMPILER_STRIP_GATE(0x807FCDA4, &lit_4891); #pragma pop /* 807FCDA8-807FCDAC 0000F4 0004+00 0/0 0/0 0/0 .rodata @4892 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4892 = -7.0f; -COMPILER_STRIP_GATE(807FCDA8, &lit_4892); +COMPILER_STRIP_GATE(0x807FCDA8, &lit_4892); #pragma pop /* 807FCDAC-807FCDB0 0000F8 0004+00 0/0 0/0 0/0 .rodata @4893 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4893 = -80.0f; -COMPILER_STRIP_GATE(807FCDAC, &lit_4893); +COMPILER_STRIP_GATE(0x807FCDAC, &lit_4893); #pragma pop /* 807FCDB0-807FCDB4 0000FC 0004+00 0/1 0/0 0/0 .rodata @4894 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4894 = 3.0f / 10.0f; -COMPILER_STRIP_GATE(807FCDB0, &lit_4894); +COMPILER_STRIP_GATE(0x807FCDB0, &lit_4894); #pragma pop /* 807FCDB4-807FCDB8 000100 0004+00 0/0 0/0 0/0 .rodata @4895 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4895 = 47.0f; -COMPILER_STRIP_GATE(807FCDB4, &lit_4895); +COMPILER_STRIP_GATE(0x807FCDB4, &lit_4895); #pragma pop /* 807FCDB8-807FCDBC 000104 0004+00 0/1 0/0 0/0 .rodata @4896 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4896 = 35.0f; -COMPILER_STRIP_GATE(807FCDB8, &lit_4896); +COMPILER_STRIP_GATE(0x807FCDB8, &lit_4896); #pragma pop /* 807FCDBC-807FCDC0 000108 0004+00 0/0 0/0 0/0 .rodata @4897 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4897 = 2.0f / 5.0f; -COMPILER_STRIP_GATE(807FCDBC, &lit_4897); +COMPILER_STRIP_GATE(0x807FCDBC, &lit_4897); #pragma pop /* 807FCDC0-807FCDC4 00010C 0004+00 0/1 0/0 0/0 .rodata @4995 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4995 = 9.5f; -COMPILER_STRIP_GATE(807FCDC0, &lit_4995); +COMPILER_STRIP_GATE(0x807FCDC0, &lit_4995); #pragma pop /* 807FCDC4-807FCDC8 000110 0004+00 0/1 0/0 0/0 .rodata @4996 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4996 = 5.5f; -COMPILER_STRIP_GATE(807FCDC4, &lit_4996); +COMPILER_STRIP_GATE(0x807FCDC4, &lit_4996); #pragma pop /* 807FCDC8-807FCDCC 000114 0004+00 0/1 0/0 0/0 .rodata @4997 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4997 = 6.5f; -COMPILER_STRIP_GATE(807FCDC8, &lit_4997); +COMPILER_STRIP_GATE(0x807FCDC8, &lit_4997); #pragma pop /* 807FCDCC-807FCDD0 000118 0004+00 0/1 0/0 0/0 .rodata @4998 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4998 = 2.5f; -COMPILER_STRIP_GATE(807FCDCC, &lit_4998); +COMPILER_STRIP_GATE(0x807FCDCC, &lit_4998); #pragma pop /* 807FCDD0-807FCDD4 00011C 0004+00 0/1 0/0 0/0 .rodata @4999 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4999 = 6.0f; -COMPILER_STRIP_GATE(807FCDD0, &lit_4999); +COMPILER_STRIP_GATE(0x807FCDD0, &lit_4999); #pragma pop /* 807FCDD4-807FCDD8 000120 0004+00 0/1 0/0 0/0 .rodata @5000 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5000 = 4.5f; -COMPILER_STRIP_GATE(807FCDD4, &lit_5000); +COMPILER_STRIP_GATE(0x807FCDD4, &lit_5000); #pragma pop /* 807FB034-807FB3FC 002DD4 03C8+00 1/1 0/0 0/0 .text anm_se_set__FP10e_yg_class */ @@ -1692,21 +1698,21 @@ static asm void anm_se_set(e_yg_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5140 = -60.0f; -COMPILER_STRIP_GATE(807FCDD8, &lit_5140); +COMPILER_STRIP_GATE(0x807FCDD8, &lit_5140); #pragma pop /* 807FCDDC-807FCDE0 000128 0004+00 0/1 0/0 0/0 .rodata @5141 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5141 = -20.0f; -COMPILER_STRIP_GATE(807FCDDC, &lit_5141); +COMPILER_STRIP_GATE(0x807FCDDC, &lit_5141); #pragma pop /* 807FCDE0-807FCDE4 00012C 0004+00 0/1 0/0 0/0 .rodata @5142 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5142 = 7.0f; -COMPILER_STRIP_GATE(807FCDE0, &lit_5142); +COMPILER_STRIP_GATE(0x807FCDE0, &lit_5142); #pragma pop /* 807FD34C-807FD35C 000334 000C+04 0/1 0/0 0/0 .bss @5031 */ @@ -1761,7 +1767,13 @@ static asm void useHeapInit(fopAc_ac_c* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5310 = 41.0f; -COMPILER_STRIP_GATE(807FCDE4, &lit_5310); +COMPILER_STRIP_GATE(0x807FCDE4, &lit_5310); +#pragma pop + +/* 807FCDF0-807FCDF0 00013C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_807FCDF5 = "E_yg"; #pragma pop /* 807FBA88-807FBE70 003828 03E8+00 1/0 0/0 0/0 .text daE_YG_Create__FP10fopAc_ac_c */ @@ -1869,14 +1881,14 @@ asm daE_YG_HIO_c::~daE_YG_HIO_c() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5574 = 13.0f; -COMPILER_STRIP_GATE(807FCDE8, &lit_5574); +COMPILER_STRIP_GATE(0x807FCDE8, &lit_5574); #pragma pop /* 807FCDEC-807FCDF0 000138 0004+00 0/1 0/0 0/0 .rodata @5575 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5575 = -10.0f; -COMPILER_STRIP_GATE(807FCDEC, &lit_5575); +COMPILER_STRIP_GATE(0x807FCDEC, &lit_5575); #pragma pop /* 807FC1B0-807FC804 003F50 0654+00 0/0 1/0 0/0 .text __sinit_d_a_e_yg_cpp */ @@ -1891,7 +1903,7 @@ asm void __sinit_d_a_e_yg_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_807FC1B0 = (void*)__sinit_d_a_e_yg_cpp; +REGISTER_CTORS(0x807FC1B0, __sinit_d_a_e_yg_cpp); #pragma pop /* 807FC804-807FC80C 0045A4 0008+00 1/0 0/0 0/0 .text @36@__dt__12dBgS_ObjAcchFv */ @@ -2118,10 +2130,4 @@ static u8 data_807FD3C4[4]; static u8 data_807FD3C8[4]; #pragma pop -/* 807FCDF0-807FCDFA 00013C 000A+00 4/4 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_807FCDF0 = "E_YG"; -SECTION_DEAD static char const* const stringBase_807FCDF5 = "E_yg"; -#pragma pop +/* 807FCDF0-807FCDF0 00013C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/e/d_a_e_yh/d_a_e_yh.cpp b/rel/d/a/e/d_a_e_yh/d_a_e_yh.cpp index 0b46a1f2cc0..af063e4e332 100644 --- a/rel/d/a/e/d_a_e_yh/d_a_e_yh.cpp +++ b/rel/d/a/e/d_a_e_yh/d_a_e_yh.cpp @@ -32,16 +32,16 @@ struct mDoExt_baseAnm { /* 8000D428 */ void play(); }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; - struct J3DAnmTransform {}; +struct J3DModelData {}; + +struct Z2Creature {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -66,11 +66,11 @@ struct mDoExt_3DlineMatSortPacket { /* 80014738 */ void setMat(mDoExt_3DlineMat_c*); }; -struct dKy_tevstr_c {}; +struct ResTIMG {}; struct _GXColor {}; -struct ResTIMG {}; +struct dKy_tevstr_c {}; struct mDoExt_3DlineMat1_c { /* 80013360 */ void init(u16, u16, ResTIMG*, int); @@ -528,7 +528,7 @@ extern "C" void __register_global_object(); /* ############################################################################################## */ /* 8080427C-80804280 000000 0004+00 24/24 0/0 0/0 .rodata @3902 */ SECTION_RODATA static f32 const lit_3902 = 100.0f; -COMPILER_STRIP_GATE(8080427C, &lit_3902); +COMPILER_STRIP_GATE(0x8080427C, &lit_3902); /* 80804280-80804284 000004 0004+00 3/22 0/0 0/0 .rodata @3903 */ SECTION_RODATA static u8 const lit_3903[4] = { @@ -537,7 +537,7 @@ SECTION_RODATA static u8 const lit_3903[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80804280, &lit_3903); +COMPILER_STRIP_GATE(0x80804280, &lit_3903); /* 80804284-8080428C 000008 0004+04 2/22 0/0 0/0 .rodata @3904 */ SECTION_RODATA static f32 const lit_3904[1 + 1 /* padding */] = { @@ -545,7 +545,7 @@ SECTION_RODATA static f32 const lit_3904[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80804284, &lit_3904); +COMPILER_STRIP_GATE(0x80804284, &lit_3904); /* 8080428C-80804294 000010 0008+00 0/6 0/0 0/0 .rodata @3905 */ #pragma push @@ -553,7 +553,7 @@ COMPILER_STRIP_GATE(80804284, &lit_3904); SECTION_RODATA static u8 const lit_3905[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8080428C, &lit_3905); +COMPILER_STRIP_GATE(0x8080428C, &lit_3905); #pragma pop /* 80804294-8080429C 000018 0008+00 0/6 0/0 0/0 .rodata @3906 */ @@ -562,7 +562,7 @@ COMPILER_STRIP_GATE(8080428C, &lit_3905); SECTION_RODATA static u8 const lit_3906[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80804294, &lit_3906); +COMPILER_STRIP_GATE(0x80804294, &lit_3906); #pragma pop /* 8080429C-808042A4 000020 0008+00 0/6 0/0 0/0 .rodata @3907 */ @@ -571,28 +571,28 @@ COMPILER_STRIP_GATE(80804294, &lit_3906); SECTION_RODATA static u8 const lit_3907[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8080429C, &lit_3907); +COMPILER_STRIP_GATE(0x8080429C, &lit_3907); #pragma pop /* 808042A4-808042A8 000028 0004+00 0/1 0/0 0/0 .rodata @3908 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3908 = 1.0f / 100.0f; -COMPILER_STRIP_GATE(808042A4, &lit_3908); +COMPILER_STRIP_GATE(0x808042A4, &lit_3908); #pragma pop /* 808042A8-808042AC 00002C 0004+00 0/6 0/0 0/0 .rodata @3923 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3923 = 0.5f; -COMPILER_STRIP_GATE(808042A8, &lit_3923); +COMPILER_STRIP_GATE(0x808042A8, &lit_3923); #pragma pop /* 808042AC-808042B0 000030 0004+00 0/1 0/0 0/0 .rodata @3924 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3924 = 6.0f / 5.0f; -COMPILER_STRIP_GATE(808042AC, &lit_3924); +COMPILER_STRIP_GATE(0x808042AC, &lit_3924); #pragma pop /* 808043E8-808043F4 000000 000C+00 2/2 0/0 0/0 .data cNullVec__6Z2Calc */ @@ -918,12 +918,12 @@ asm daE_YH_HIO_c::daE_YH_HIO_c() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3985 = 1.5f; -COMPILER_STRIP_GATE(808042B0, &lit_3985); +COMPILER_STRIP_GATE(0x808042B0, &lit_3985); #pragma pop /* 808042B4-808042B8 000038 0004+00 2/4 0/0 0/0 .rodata @3986 */ SECTION_RODATA static f32 const lit_3986 = -1.0f; -COMPILER_STRIP_GATE(808042B4, &lit_3986); +COMPILER_STRIP_GATE(0x808042B4, &lit_3986); /* 807FD514-807FD6BC 000134 01A8+00 2/2 0/0 0/0 .text yh_disappear__FP10e_yh_class */ #pragma push @@ -935,6 +935,13 @@ static asm void yh_disappear(e_yh_class* param_0) { } #pragma pop +/* ############################################################################################## */ +/* 808043DC-808043DC 000160 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_808043DC = "E_yd"; +#pragma pop + /* 807FD6BC-807FD768 0002DC 00AC+00 12/12 0/0 0/0 .text anm_init__FP10e_yh_classifUcf */ #pragma push #pragma optimization_level 0 @@ -961,14 +968,14 @@ static asm void leaf_anm_init(e_yh_class* param_0, int param_1, f32 param_2, u8 #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4044 = 50.0f; -COMPILER_STRIP_GATE(808042B8, &lit_4044); +COMPILER_STRIP_GATE(0x808042B8, &lit_4044); #pragma pop /* 808042BC-808042C0 000040 0004+00 0/1 0/0 0/0 .rodata @4045 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4045 = 600.0f; -COMPILER_STRIP_GATE(808042BC, &lit_4045); +COMPILER_STRIP_GATE(0x808042BC, &lit_4045); #pragma pop /* 807FD840-807FD9D8 000460 0198+00 1/0 0/0 0/0 .text daE_YH_Draw__FP10e_yh_class */ @@ -996,46 +1003,46 @@ static asm void pl_check(e_yh_class* param_0, f32 param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4141 = 10.0f; -COMPILER_STRIP_GATE(808042C0, &lit_4141); +COMPILER_STRIP_GATE(0x808042C0, &lit_4141); #pragma pop /* 808042C4-808042C8 000048 0004+00 0/1 0/0 0/0 .rodata @4142 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4142 = -15.0f; -COMPILER_STRIP_GATE(808042C4, &lit_4142); +COMPILER_STRIP_GATE(0x808042C4, &lit_4142); #pragma pop /* 808042C8-808042CC 00004C 0004+00 0/4 0/0 0/0 .rodata @4143 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4143 = 60.0f; -COMPILER_STRIP_GATE(808042C8, &lit_4143); +COMPILER_STRIP_GATE(0x808042C8, &lit_4143); #pragma pop /* 808042CC-808042D0 000050 0004+00 0/8 0/0 0/0 .rodata @4144 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4144 = 30.0f; -COMPILER_STRIP_GATE(808042CC, &lit_4144); +COMPILER_STRIP_GATE(0x808042CC, &lit_4144); #pragma pop /* 808042D0-808042D4 000054 0004+00 1/8 0/0 0/0 .rodata @4145 */ SECTION_RODATA static f32 const lit_4145 = 5.0f; -COMPILER_STRIP_GATE(808042D0, &lit_4145); +COMPILER_STRIP_GATE(0x808042D0, &lit_4145); /* 808042D4-808042D8 000058 0004+00 0/9 0/0 0/0 .rodata @4146 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4146 = 20.0f; -COMPILER_STRIP_GATE(808042D4, &lit_4146); +COMPILER_STRIP_GATE(0x808042D4, &lit_4146); #pragma pop /* 808042D8-808042DC 00005C 0004+00 0/2 0/0 0/0 .rodata @4147 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4147 = -10.0f; -COMPILER_STRIP_GATE(808042D8, &lit_4147); +COMPILER_STRIP_GATE(0x808042D8, &lit_4147); #pragma pop /* 807FDA24-807FDE6C 000644 0448+00 1/1 0/0 0/0 .text damage_check__FP10e_yh_class */ @@ -1053,56 +1060,56 @@ static asm void damage_check(e_yh_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4206 = -170.0f; -COMPILER_STRIP_GATE(808042DC, &lit_4206); +COMPILER_STRIP_GATE(0x808042DC, &lit_4206); #pragma pop /* 808042E0-808042E4 000064 0004+00 0/4 0/0 0/0 .rodata @4207 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4207 = 170.0f; -COMPILER_STRIP_GATE(808042E0, &lit_4207); +COMPILER_STRIP_GATE(0x808042E0, &lit_4207); #pragma pop /* 808042E4-808042E8 000068 0004+00 0/5 0/0 0/0 .rodata @4208 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4208 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(808042E4, &lit_4208); +COMPILER_STRIP_GATE(0x808042E4, &lit_4208); #pragma pop /* 808042E8-808042EC 00006C 0004+00 0/7 0/0 0/0 .rodata @4209 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4209 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(808042E8, &lit_4209); +COMPILER_STRIP_GATE(0x808042E8, &lit_4209); #pragma pop /* 808042EC-808042F0 000070 0004+00 0/1 0/0 0/0 .rodata @4210 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4210 = 4.0f; -COMPILER_STRIP_GATE(808042EC, &lit_4210); +COMPILER_STRIP_GATE(0x808042EC, &lit_4210); #pragma pop /* 808042F0-808042F4 000074 0004+00 0/1 0/0 0/0 .rodata @4211 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4211 = 2.0f / 5.0f; -COMPILER_STRIP_GATE(808042F0, &lit_4211); +COMPILER_STRIP_GATE(0x808042F0, &lit_4211); #pragma pop /* 808042F4-808042F8 000078 0004+00 0/1 0/0 0/0 .rodata @4212 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4212 = 1.0f / 50.0f; -COMPILER_STRIP_GATE(808042F4, &lit_4212); +COMPILER_STRIP_GATE(0x808042F4, &lit_4212); #pragma pop /* 808042F8-808042FC 00007C 0004+00 0/8 0/0 0/0 .rodata @4213 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4213 = 1.0f / 20.0f; -COMPILER_STRIP_GATE(808042F8, &lit_4213); +COMPILER_STRIP_GATE(0x808042F8, &lit_4213); #pragma pop /* 80804718-8080471C 000008 0004+00 2/2 0/0 0/0 .bss None */ @@ -1139,28 +1146,28 @@ static asm void e_yh_appear(e_yh_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4276 = 15.0f; -COMPILER_STRIP_GATE(808042FC, &lit_4276); +COMPILER_STRIP_GATE(0x808042FC, &lit_4276); #pragma pop /* 80804300-80804304 000084 0004+00 0/3 0/0 0/0 .rodata @4277 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4277 = 40.0f; -COMPILER_STRIP_GATE(80804300, &lit_4277); +COMPILER_STRIP_GATE(0x80804300, &lit_4277); #pragma pop /* 80804304-80804308 000088 0004+00 0/3 0/0 0/0 .rodata @4278 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4278 = 400.0f; -COMPILER_STRIP_GATE(80804304, &lit_4278); +COMPILER_STRIP_GATE(0x80804304, &lit_4278); #pragma pop /* 80804308-8080430C 00008C 0004+00 0/1 0/0 0/0 .rodata @4279 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4279 = 3.0f / 20.0f; -COMPILER_STRIP_GATE(80804308, &lit_4279); +COMPILER_STRIP_GATE(0x80804308, &lit_4279); #pragma pop /* 807FE484-807FE650 0010A4 01CC+00 1/1 0/0 0/0 .text e_yh_appear_v__FP10e_yh_class */ @@ -1178,28 +1185,28 @@ static asm void e_yh_appear_v(e_yh_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4379 = 0.75f; -COMPILER_STRIP_GATE(8080430C, &lit_4379); +COMPILER_STRIP_GATE(0x8080430C, &lit_4379); #pragma pop /* 80804310-80804314 000094 0004+00 0/1 0/0 0/0 .rodata @4380 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4380 = 90.0f; -COMPILER_STRIP_GATE(80804310, &lit_4380); +COMPILER_STRIP_GATE(0x80804310, &lit_4380); #pragma pop /* 80804314-80804318 000098 0004+00 0/2 0/0 0/0 .rodata @4381 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4381 = -100.0f; -COMPILER_STRIP_GATE(80804314, &lit_4381); +COMPILER_STRIP_GATE(0x80804314, &lit_4381); #pragma pop /* 80804318-8080431C 00009C 0004+00 0/2 0/0 0/0 .rodata @4382 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4382 = 3.0f / 10.0f; -COMPILER_STRIP_GATE(80804318, &lit_4382); +COMPILER_STRIP_GATE(0x80804318, &lit_4382); #pragma pop /* 8080431C-80804324 0000A0 0004+04 0/1 0/0 0/0 .rodata @4383 */ @@ -1210,14 +1217,14 @@ SECTION_RODATA static f32 const lit_4383[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(8080431C, &lit_4383); +COMPILER_STRIP_GATE(0x8080431C, &lit_4383); #pragma pop /* 80804324-8080432C 0000A8 0008+00 1/3 0/0 0/0 .rodata @4385 */ SECTION_RODATA static u8 const lit_4385[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80804324, &lit_4385); +COMPILER_STRIP_GATE(0x80804324, &lit_4385); /* 807FE650-807FEBB0 001270 0560+00 1/1 0/0 0/0 .text e_yh_wait__FP10e_yh_class */ #pragma push @@ -1234,14 +1241,14 @@ static asm void e_yh_wait(e_yh_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4415 = 70.0f; -COMPILER_STRIP_GATE(8080432C, &lit_4415); +COMPILER_STRIP_GATE(0x8080432C, &lit_4415); #pragma pop /* 80804330-80804334 0000B4 0004+00 0/2 0/0 0/0 .rodata @4416 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4416 = 250.0f; -COMPILER_STRIP_GATE(80804330, &lit_4416); +COMPILER_STRIP_GATE(0x80804330, &lit_4416); #pragma pop /* 807FEBB0-807FEE0C 0017D0 025C+00 1/1 0/0 0/0 .text e_yh_mk_roof__FP10e_yh_class */ @@ -1259,49 +1266,49 @@ static asm void e_yh_mk_roof(e_yh_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4626 = 350.0f; -COMPILER_STRIP_GATE(80804334, &lit_4626); +COMPILER_STRIP_GATE(0x80804334, &lit_4626); #pragma pop /* 80804338-8080433C 0000BC 0004+00 0/2 0/0 0/0 .rodata @4627 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4627 = 4.0f / 5.0f; -COMPILER_STRIP_GATE(80804338, &lit_4627); +COMPILER_STRIP_GATE(0x80804338, &lit_4627); #pragma pop /* 8080433C-80804340 0000C0 0004+00 0/1 0/0 0/0 .rodata @4628 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4628 = 2.0f; -COMPILER_STRIP_GATE(8080433C, &lit_4628); +COMPILER_STRIP_GATE(0x8080433C, &lit_4628); #pragma pop /* 80804340-80804344 0000C4 0004+00 0/1 0/0 0/0 .rodata @4629 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4629 = 2000.0f; -COMPILER_STRIP_GATE(80804340, &lit_4629); +COMPILER_STRIP_GATE(0x80804340, &lit_4629); #pragma pop /* 80804344-80804348 0000C8 0004+00 0/1 0/0 0/0 .rodata @4630 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4630 = -70.0f; -COMPILER_STRIP_GATE(80804344, &lit_4630); +COMPILER_STRIP_GATE(0x80804344, &lit_4630); #pragma pop /* 80804348-8080434C 0000CC 0004+00 0/1 0/0 0/0 .rodata @4631 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4631 = 80.0f; -COMPILER_STRIP_GATE(80804348, &lit_4631); +COMPILER_STRIP_GATE(0x80804348, &lit_4631); #pragma pop /* 8080434C-80804350 0000D0 0004+00 0/3 0/0 0/0 .rodata @4632 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4632 = 200.0f; -COMPILER_STRIP_GATE(8080434C, &lit_4632); +COMPILER_STRIP_GATE(0x8080434C, &lit_4632); #pragma pop /* 807FEE0C-807FF8DC 001A2C 0AD0+00 1/1 0/0 0/0 .text e_yh_attack__FP10e_yh_class */ @@ -1329,14 +1336,14 @@ static asm void e_yh_attack_s(e_yh_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4746 = 230.0f; -COMPILER_STRIP_GATE(80804350, &lit_4746); +COMPILER_STRIP_GATE(0x80804350, &lit_4746); #pragma pop /* 80804354-80804358 0000D8 0004+00 0/5 0/0 0/0 .rodata @4747 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4747 = 3.0f; -COMPILER_STRIP_GATE(80804354, &lit_4747); +COMPILER_STRIP_GATE(0x80804354, &lit_4747); #pragma pop /* 807FFC38-807FFF38 002858 0300+00 1/1 0/0 0/0 .text e_yh_chance__FP10e_yh_class */ @@ -1354,14 +1361,14 @@ static asm void e_yh_chance(e_yh_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4790 = -50.0f; -COMPILER_STRIP_GATE(80804358, &lit_4790); +COMPILER_STRIP_GATE(0x80804358, &lit_4790); #pragma pop /* 8080435C-80804360 0000E0 0004+00 0/1 0/0 0/0 .rodata @4791 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4791 = 23.0f / 25.0f; -COMPILER_STRIP_GATE(8080435C, &lit_4791); +COMPILER_STRIP_GATE(0x8080435C, &lit_4791); #pragma pop /* 807FFF38-80800174 002B58 023C+00 1/1 0/0 0/0 .text e_yh_s_damage__FP10e_yh_class */ @@ -1379,21 +1386,21 @@ static asm void e_yh_s_damage(e_yh_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4871 = -20.0f; -COMPILER_STRIP_GATE(80804360, &lit_4871); +COMPILER_STRIP_GATE(0x80804360, &lit_4871); #pragma pop /* 80804364-80804368 0000E8 0004+00 0/1 0/0 0/0 .rodata @4872 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4872 = 450.0f; -COMPILER_STRIP_GATE(80804364, &lit_4872); +COMPILER_STRIP_GATE(0x80804364, &lit_4872); #pragma pop /* 80804368-8080436C 0000EC 0004+00 0/1 0/0 0/0 .rodata @4873 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4873 = -1.0f / 10.0f; -COMPILER_STRIP_GATE(80804368, &lit_4873); +COMPILER_STRIP_GATE(0x80804368, &lit_4873); #pragma pop /* 80800174-8080056C 002D94 03F8+00 1/1 0/0 0/0 .text e_yh_damage__FP10e_yh_class */ @@ -1411,14 +1418,14 @@ static asm void e_yh_damage(e_yh_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4959 = -30.0f; -COMPILER_STRIP_GATE(8080436C, &lit_4959); +COMPILER_STRIP_GATE(0x8080436C, &lit_4959); #pragma pop /* 80804370-80804374 0000F4 0004+00 0/1 0/0 0/0 .rodata @4960 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4960 = -200.0f; -COMPILER_STRIP_GATE(80804370, &lit_4960); +COMPILER_STRIP_GATE(0x80804370, &lit_4960); #pragma pop /* 8080056C-808008C8 00318C 035C+00 1/1 0/0 0/0 .text kuki_control1__FP10e_yh_class */ @@ -1444,7 +1451,7 @@ static asm void kuki_control2(e_yh_class* param_0) { /* ############################################################################################## */ /* 80804374-80804378 0000F8 0004+00 1/1 0/0 0/0 .rodata @5015 */ SECTION_RODATA static f32 const lit_5015 = 11.0f; -COMPILER_STRIP_GATE(80804374, &lit_5015); +COMPILER_STRIP_GATE(0x80804374, &lit_5015); /* 80800A3C-80800B18 00365C 00DC+00 1/1 0/0 0/0 .text kuki_control3__FP10e_yh_class */ #pragma push @@ -1471,7 +1478,7 @@ static asm void kuki_ha_set(e_yh_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5114 = -5.0f; -COMPILER_STRIP_GATE(80804378, &lit_5114); +COMPILER_STRIP_GATE(0x80804378, &lit_5114); #pragma pop /* 80800C40-80800F44 003860 0304+00 1/1 0/0 0/0 .text kuki_control1_e__FP10e_yh_class */ @@ -1489,7 +1496,7 @@ static asm void kuki_control1_e(e_yh_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5362 = 25.0f; -COMPILER_STRIP_GATE(8080437C, &lit_5362); +COMPILER_STRIP_GATE(0x8080437C, &lit_5362); #pragma pop /* 80800F44-80801D10 003B64 0DCC+00 2/1 0/0 0/0 .text e_yh_escape__FP10e_yh_class */ @@ -1507,70 +1514,70 @@ static asm void e_yh_escape(e_yh_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5363 = 300.0f; -COMPILER_STRIP_GATE(80804380, &lit_5363); +COMPILER_STRIP_GATE(0x80804380, &lit_5363); #pragma pop /* 80804384-80804388 000108 0004+00 0/0 0/0 0/0 .rodata @5364 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5364 = 7.5f; -COMPILER_STRIP_GATE(80804384, &lit_5364); +COMPILER_STRIP_GATE(0x80804384, &lit_5364); #pragma pop /* 80804388-8080438C 00010C 0004+00 0/0 0/0 0/0 .rodata @5365 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5365 = 0.25f; -COMPILER_STRIP_GATE(80804388, &lit_5365); +COMPILER_STRIP_GATE(0x80804388, &lit_5365); #pragma pop /* 8080438C-80804390 000110 0004+00 0/0 0/0 0/0 .rodata @5366 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5366 = 65536.0f; -COMPILER_STRIP_GATE(8080438C, &lit_5366); +COMPILER_STRIP_GATE(0x8080438C, &lit_5366); #pragma pop /* 80804390-80804394 000114 0004+00 0/0 0/0 0/0 .rodata @5367 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5367 = 5000.0f; -COMPILER_STRIP_GATE(80804390, &lit_5367); +COMPILER_STRIP_GATE(0x80804390, &lit_5367); #pragma pop /* 80804394-80804398 000118 0004+00 0/1 0/0 0/0 .rodata @5368 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5368 = 35.0f; -COMPILER_STRIP_GATE(80804394, &lit_5368); +COMPILER_STRIP_GATE(0x80804394, &lit_5368); #pragma pop /* 80804398-8080439C 00011C 0004+00 0/1 0/0 0/0 .rodata @5369 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5369 = -7.0f; -COMPILER_STRIP_GATE(80804398, &lit_5369); +COMPILER_STRIP_GATE(0x80804398, &lit_5369); #pragma pop /* 8080439C-808043A0 000120 0004+00 0/1 0/0 0/0 .rodata @5370 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5370 = 9.0f / 5.0f; -COMPILER_STRIP_GATE(8080439C, &lit_5370); +COMPILER_STRIP_GATE(0x8080439C, &lit_5370); #pragma pop /* 808043A0-808043A4 000124 0004+00 0/1 0/0 0/0 .rodata @5447 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5447 = -40.0f; -COMPILER_STRIP_GATE(808043A0, &lit_5447); +COMPILER_STRIP_GATE(0x808043A0, &lit_5447); #pragma pop /* 808043A4-808043A8 000128 0004+00 0/1 0/0 0/0 .rodata @5448 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5448 = -3.0f / 10.0f; -COMPILER_STRIP_GATE(808043A4, &lit_5448); +COMPILER_STRIP_GATE(0x808043A4, &lit_5448); #pragma pop /* 80801D10-808021D8 004930 04C8+00 1/1 0/0 0/0 .text e_yh_e_dead__FP10e_yh_class */ @@ -1608,35 +1615,35 @@ static asm void eff_set(e_yh_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5592 = -30000.0f; -COMPILER_STRIP_GATE(808043A8, &lit_5592); +COMPILER_STRIP_GATE(0x808043A8, &lit_5592); #pragma pop /* 808043AC-808043B0 000130 0004+00 0/0 0/0 0/0 .rodata @5593 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5593 = 300000.0f; -COMPILER_STRIP_GATE(808043AC, &lit_5593); +COMPILER_STRIP_GATE(0x808043AC, &lit_5593); #pragma pop /* 808043B0-808043B4 000134 0004+00 0/0 0/0 0/0 .rodata @5594 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5594 = 30000.0f; -COMPILER_STRIP_GATE(808043B0, &lit_5594); +COMPILER_STRIP_GATE(0x808043B0, &lit_5594); #pragma pop /* 808043B4-808043B8 000138 0004+00 0/1 0/0 0/0 .rodata @5759 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5759 = 22.0f; -COMPILER_STRIP_GATE(808043B4, &lit_5759); +COMPILER_STRIP_GATE(0x808043B4, &lit_5759); #pragma pop /* 808043B8-808043BC 00013C 0004+00 0/1 0/0 0/0 .rodata @5760 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5760 = 21.0f; -COMPILER_STRIP_GATE(808043B8, &lit_5760); +COMPILER_STRIP_GATE(0x808043B8, &lit_5760); #pragma pop /* 80802C30-80802D98 005850 0168+00 1/1 0/0 0/0 .text anm_se_set__FP10e_yh_class */ @@ -1654,14 +1661,14 @@ static asm void anm_se_set(e_yh_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5857 = 10000.0f; -COMPILER_STRIP_GATE(808043BC, &lit_5857); +COMPILER_STRIP_GATE(0x808043BC, &lit_5857); #pragma pop /* 808043C0-808043C4 000144 0004+00 0/1 0/0 0/0 .rodata @5858 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5858 = -20000.0f; -COMPILER_STRIP_GATE(808043C0, &lit_5858); +COMPILER_STRIP_GATE(0x808043C0, &lit_5858); #pragma pop /* 80802D98-80803178 0059B8 03E0+00 2/1 0/0 0/0 .text daE_YH_Execute__FP10e_yh_class */ @@ -1714,28 +1721,28 @@ asm J3DFrameCtrl::~J3DFrameCtrl() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6102 = 500.0f; -COMPILER_STRIP_GATE(808043C4, &lit_6102); +COMPILER_STRIP_GATE(0x808043C4, &lit_6102); #pragma pop /* 808043C8-808043CC 00014C 0004+00 0/1 0/0 0/0 .rodata @6103 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6103 = -300.0f; -COMPILER_STRIP_GATE(808043C8, &lit_6103); +COMPILER_STRIP_GATE(0x808043C8, &lit_6103); #pragma pop /* 808043CC-808043D0 000150 0004+00 0/1 0/0 0/0 .rodata @6104 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6104 = -400.0f; -COMPILER_STRIP_GATE(808043CC, &lit_6104); +COMPILER_STRIP_GATE(0x808043CC, &lit_6104); #pragma pop /* 808043D0-808043D4 000154 0004+00 0/1 0/0 0/0 .rodata @6105 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6105 = 65535.0f; -COMPILER_STRIP_GATE(808043D0, &lit_6105); +COMPILER_STRIP_GATE(0x808043D0, &lit_6105); #pragma pop /* 808043D4-808043DC 000158 0008+00 0/1 0/0 0/0 .rodata @6107 */ @@ -1744,7 +1751,13 @@ COMPILER_STRIP_GATE(808043D0, &lit_6105); SECTION_RODATA static u8 const lit_6107[8] = { 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(808043D4, &lit_6107); +COMPILER_STRIP_GATE(0x808043D4, &lit_6107); +#pragma pop + +/* 808043DC-808043DC 000160 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_808043E1 = "E_yh"; #pragma pop /* 808034BC-808039DC 0060DC 0520+00 1/0 0/0 0/0 .text daE_YH_Create__FP10fopAc_ac_c */ @@ -1869,7 +1882,7 @@ asm void __sinit_d_a_e_yh_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80803D90 = (void*)__sinit_d_a_e_yh_cpp; +REGISTER_CTORS(0x80803D90, __sinit_d_a_e_yh_cpp); #pragma pop /* 80803DCC-80803DD4 0069EC 0008+00 1/0 0/0 0/0 .text @36@__dt__12dBgS_ObjAcchFv */ @@ -1924,10 +1937,4 @@ asm cXyz::~cXyz() { } #pragma pop -/* 808043DC-808043E6 000160 000A+00 5/5 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_808043DC = "E_yd"; -SECTION_DEAD static char const* const stringBase_808043E1 = "E_yh"; -#pragma pop +/* 808043DC-808043DC 000160 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/e/d_a_e_yk/d_a_e_yk.cpp b/rel/d/a/e/d_a_e_yk/d_a_e_yk.cpp index 39f3064a175..95112db622e 100644 --- a/rel/d/a/e/d_a_e_yk/d_a_e_yk.cpp +++ b/rel/d/a/e/d_a_e_yk/d_a_e_yk.cpp @@ -19,16 +19,16 @@ struct mDoMtx_stack_c { static u8 now[48]; }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; - struct J3DAnmTransform {}; +struct J3DModelData {}; + +struct Z2Creature {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -90,10 +90,10 @@ struct dRes_control_c { struct dPa_levelEcallBack {}; -struct _GXColor {}; - struct csXyz {}; +struct _GXColor {}; + struct dPa_control_c { struct level_c { /* 8004B918 */ void getEmitter(u32); @@ -394,7 +394,7 @@ extern "C" void __register_global_object(); /* ############################################################################################## */ /* 80807C9C-80807CA0 000000 0004+00 20/20 0/0 0/0 .rodata @3941 */ SECTION_RODATA static f32 const lit_3941 = 100.0f; -COMPILER_STRIP_GATE(80807C9C, &lit_3941); +COMPILER_STRIP_GATE(0x80807C9C, &lit_3941); /* 80807CA0-80807CA4 000004 0004+00 1/15 0/0 0/0 .rodata @3942 */ SECTION_RODATA static u8 const lit_3942[4] = { @@ -403,7 +403,7 @@ SECTION_RODATA static u8 const lit_3942[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80807CA0, &lit_3942); +COMPILER_STRIP_GATE(0x80807CA0, &lit_3942); /* 80807CA4-80807CAC 000008 0004+04 1/17 0/0 0/0 .rodata @3943 */ SECTION_RODATA static f32 const lit_3943[1 + 1 /* padding */] = { @@ -411,7 +411,7 @@ SECTION_RODATA static f32 const lit_3943[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80807CA4, &lit_3943); +COMPILER_STRIP_GATE(0x80807CA4, &lit_3943); /* 80807CAC-80807CB4 000010 0008+00 0/3 0/0 0/0 .rodata @3944 */ #pragma push @@ -419,7 +419,7 @@ COMPILER_STRIP_GATE(80807CA4, &lit_3943); SECTION_RODATA static u8 const lit_3944[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80807CAC, &lit_3944); +COMPILER_STRIP_GATE(0x80807CAC, &lit_3944); #pragma pop /* 80807CB4-80807CBC 000018 0008+00 0/3 0/0 0/0 .rodata @3945 */ @@ -428,7 +428,7 @@ COMPILER_STRIP_GATE(80807CAC, &lit_3944); SECTION_RODATA static u8 const lit_3945[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80807CB4, &lit_3945); +COMPILER_STRIP_GATE(0x80807CB4, &lit_3945); #pragma pop /* 80807CBC-80807CC4 000020 0008+00 0/3 0/0 0/0 .rodata @3946 */ @@ -437,35 +437,35 @@ COMPILER_STRIP_GATE(80807CB4, &lit_3945); SECTION_RODATA static u8 const lit_3946[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80807CBC, &lit_3946); +COMPILER_STRIP_GATE(0x80807CBC, &lit_3946); #pragma pop /* 80807CC4-80807CC8 000028 0004+00 0/1 0/0 0/0 .rodata @3947 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3947 = 1.0f / 100.0f; -COMPILER_STRIP_GATE(80807CC4, &lit_3947); +COMPILER_STRIP_GATE(0x80807CC4, &lit_3947); #pragma pop /* 80807CC8-80807CCC 00002C 0004+00 0/3 0/0 0/0 .rodata @3962 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3962 = 15.0f; -COMPILER_STRIP_GATE(80807CC8, &lit_3962); +COMPILER_STRIP_GATE(0x80807CC8, &lit_3962); #pragma pop /* 80807CCC-80807CD0 000030 0004+00 0/1 0/0 0/0 .rodata @3963 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3963 = 250.0f; -COMPILER_STRIP_GATE(80807CCC, &lit_3963); +COMPILER_STRIP_GATE(0x80807CCC, &lit_3963); #pragma pop /* 80807CD0-80807CD4 000034 0004+00 0/2 0/0 0/0 .rodata @3964 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3964 = 40.0f; -COMPILER_STRIP_GATE(80807CD0, &lit_3964); +COMPILER_STRIP_GATE(0x80807CD0, &lit_3964); #pragma pop /* 80807D70-80807D7C 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ @@ -650,12 +650,12 @@ asm daE_YK_HIO_c::daE_YK_HIO_c() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4008 = 13.0f / 20.0f; -COMPILER_STRIP_GATE(80807CD4, &lit_4008); +COMPILER_STRIP_GATE(0x80807CD4, &lit_4008); #pragma pop /* 80807CD8-80807CDC 00003C 0004+00 1/2 0/0 0/0 .rodata @4009 */ SECTION_RODATA static f32 const lit_4009 = -1.0f; -COMPILER_STRIP_GATE(80807CD8, &lit_4009); +COMPILER_STRIP_GATE(0x80807CD8, &lit_4009); /* 80804870-808049E4 000130 0174+00 2/2 0/0 0/0 .text yk_disappear__FP10e_yk_class */ #pragma push @@ -667,6 +667,13 @@ static asm void yk_disappear(e_yk_class* param_0) { } #pragma pop +/* ############################################################################################## */ +/* 80807D64-80807D64 0000C8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80807D64 = "E_YK"; +#pragma pop + /* 808049E4-80804A90 0002A4 00AC+00 10/10 0/0 0/0 .text anm_init__FP10e_yk_classifUcf */ #pragma push #pragma optimization_level 0 @@ -711,7 +718,7 @@ static asm void other_bg_check(e_yk_class* param_0, fopAc_ac_c* param_1) { /* ############################################################################################## */ /* 80807CDC-80807CE0 000040 0004+00 1/1 0/0 0/0 .rodata @4103 */ SECTION_RODATA static f32 const lit_4103 = 50000.0f; -COMPILER_STRIP_GATE(80807CDC, &lit_4103); +COMPILER_STRIP_GATE(0x80807CDC, &lit_4103); /* 80804C88-80804D38 000548 00B0+00 5/5 0/0 0/0 .text pl_check__FP10e_yk_classfs */ #pragma push @@ -728,21 +735,21 @@ static asm void pl_check(e_yk_class* param_0, f32 param_1, s16 param_2) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4151 = 70.0f; -COMPILER_STRIP_GATE(80807CE0, &lit_4151); +COMPILER_STRIP_GATE(0x80807CE0, &lit_4151); #pragma pop /* 80807CE4-80807CE8 000048 0004+00 0/4 0/0 0/0 .rodata @4152 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4152 = 10.0f; -COMPILER_STRIP_GATE(80807CE4, &lit_4152); +COMPILER_STRIP_GATE(0x80807CE4, &lit_4152); #pragma pop /* 80807CE8-80807CEC 00004C 0004+00 0/3 0/0 0/0 .rodata @4153 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4153 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(80807CE8, &lit_4153); +COMPILER_STRIP_GATE(0x80807CE8, &lit_4153); #pragma pop /* 80804D38-80804F68 0005F8 0230+00 1/1 0/0 0/0 .text damage_check__FP10e_yk_class */ @@ -760,7 +767,7 @@ static asm void damage_check(e_yk_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4185 = 50.0f; -COMPILER_STRIP_GATE(80807CEC, &lit_4185); +COMPILER_STRIP_GATE(0x80807CEC, &lit_4185); #pragma pop /* 80807EF8-80807EFC 000008 0004+00 2/2 0/0 0/0 .bss None */ @@ -790,14 +797,14 @@ static asm void path_check(e_yk_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4271 = 2000.0f; -COMPILER_STRIP_GATE(80807CF0, &lit_4271); +COMPILER_STRIP_GATE(0x80807CF0, &lit_4271); #pragma pop /* 80807CF4-80807CF8 000058 0004+00 0/1 0/0 0/0 .rodata @4272 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4272 = 1.0f / 25.0f; -COMPILER_STRIP_GATE(80807CF4, &lit_4272); +COMPILER_STRIP_GATE(0x80807CF4, &lit_4272); #pragma pop /* 808051D0-80805360 000A90 0190+00 5/5 0/0 0/0 .text fly_move__FP10e_yk_class */ @@ -815,21 +822,21 @@ static asm void fly_move(e_yk_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4304 = 9.0f / 10.0f; -COMPILER_STRIP_GATE(80807CF8, &lit_4304); +COMPILER_STRIP_GATE(0x80807CF8, &lit_4304); #pragma pop /* 80807CFC-80807D00 000060 0004+00 0/2 0/0 0/0 .rodata @4305 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4305 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(80807CFC, &lit_4305); +COMPILER_STRIP_GATE(0x80807CFC, &lit_4305); #pragma pop /* 80807D00-80807D04 000064 0004+00 0/6 0/0 0/0 .rodata @4306 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4306 = 0.5f; -COMPILER_STRIP_GATE(80807D00, &lit_4306); +COMPILER_STRIP_GATE(0x80807D00, &lit_4306); #pragma pop /* 80805360-808054A8 000C20 0148+00 1/1 0/0 0/0 .text e_yk_roof__FP10e_yk_class */ @@ -847,14 +854,14 @@ static asm void e_yk_roof(e_yk_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4334 = 3.0f; -COMPILER_STRIP_GATE(80807D04, &lit_4334); +COMPILER_STRIP_GATE(0x80807D04, &lit_4334); #pragma pop /* 80807D08-80807D0C 00006C 0004+00 0/4 0/0 0/0 .rodata @4335 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4335 = 3.0f / 10.0f; -COMPILER_STRIP_GATE(80807D08, &lit_4335); +COMPILER_STRIP_GATE(0x80807D08, &lit_4335); #pragma pop /* 808054A8-80805660 000D68 01B8+00 1/1 0/0 0/0 .text e_yk_fight_fly__FP10e_yk_class */ @@ -872,28 +879,28 @@ static asm void e_yk_fight_fly(e_yk_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4398 = 2.0f; -COMPILER_STRIP_GATE(80807D0C, &lit_4398); +COMPILER_STRIP_GATE(0x80807D0C, &lit_4398); #pragma pop /* 80807D10-80807D14 000074 0004+00 0/4 0/0 0/0 .rodata @4399 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4399 = 30.0f; -COMPILER_STRIP_GATE(80807D10, &lit_4399); +COMPILER_STRIP_GATE(0x80807D10, &lit_4399); #pragma pop /* 80807D14-80807D18 000078 0004+00 0/1 0/0 0/0 .rodata @4400 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4400 = 12288.0f; -COMPILER_STRIP_GATE(80807D14, &lit_4400); +COMPILER_STRIP_GATE(0x80807D14, &lit_4400); #pragma pop /* 80807D18-80807D1C 00007C 0004+00 0/2 0/0 0/0 .rodata @4401 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4401 = 150.0f; -COMPILER_STRIP_GATE(80807D18, &lit_4401); +COMPILER_STRIP_GATE(0x80807D18, &lit_4401); #pragma pop /* 80805660-808059BC 000F20 035C+00 1/1 0/0 0/0 .text e_yk_fight__FP10e_yk_class */ @@ -911,7 +918,7 @@ static asm void e_yk_fight(e_yk_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4438 = 120.0f; -COMPILER_STRIP_GATE(80807D1C, &lit_4438); +COMPILER_STRIP_GATE(0x80807D1C, &lit_4438); #pragma pop /* 808059BC-80805BB4 00127C 01F8+00 1/1 0/0 0/0 .text e_yk_attack__FP10e_yk_class */ @@ -929,14 +936,14 @@ static asm void e_yk_attack(e_yk_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4480 = 500.0f; -COMPILER_STRIP_GATE(80807D20, &lit_4480); +COMPILER_STRIP_GATE(0x80807D20, &lit_4480); #pragma pop /* 80807D24-80807D28 000088 0004+00 0/3 0/0 0/0 .rodata @4481 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4481 = 200.0f; -COMPILER_STRIP_GATE(80807D24, &lit_4481); +COMPILER_STRIP_GATE(0x80807D24, &lit_4481); #pragma pop /* 80805BB4-80805DE0 001474 022C+00 1/1 0/0 0/0 .text e_yk_fly__FP10e_yk_class */ @@ -974,21 +981,21 @@ static asm void e_yk_path_fly(e_yk_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4608 = 1.5f; -COMPILER_STRIP_GATE(80807D28, &lit_4608); +COMPILER_STRIP_GATE(0x80807D28, &lit_4608); #pragma pop /* 80807D2C-80807D30 000090 0004+00 0/1 0/0 0/0 .rodata @4609 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4609 = 65536.0f; -COMPILER_STRIP_GATE(80807D2C, &lit_4609); +COMPILER_STRIP_GATE(0x80807D2C, &lit_4609); #pragma pop /* 80807D30-80807D34 000094 0004+00 0/1 0/0 0/0 .rodata @4610 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4610 = 4.0f / 5.0f; -COMPILER_STRIP_GATE(80807D30, &lit_4610); +COMPILER_STRIP_GATE(0x80807D30, &lit_4610); #pragma pop /* 80806308-80806500 001BC8 01F8+00 1/1 0/0 0/0 .text e_yk_chance__FP10e_yk_class */ @@ -1006,14 +1013,14 @@ static asm void e_yk_chance(e_yk_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4650 = -20.0f; -COMPILER_STRIP_GATE(80807D34, &lit_4650); +COMPILER_STRIP_GATE(0x80807D34, &lit_4650); #pragma pop /* 80807D38-80807D3C 00009C 0004+00 0/2 0/0 0/0 .rodata @4651 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4651 = 4.0f; -COMPILER_STRIP_GATE(80807D38, &lit_4651); +COMPILER_STRIP_GATE(0x80807D38, &lit_4651); #pragma pop /* 80806500-80806740 001DC0 0240+00 1/1 0/0 0/0 .text e_yk_wolfbite__FP10e_yk_class */ @@ -1031,14 +1038,14 @@ static asm void e_yk_wolfbite(e_yk_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4675 = 15000.0f; -COMPILER_STRIP_GATE(80807D3C, &lit_4675); +COMPILER_STRIP_GATE(0x80807D3C, &lit_4675); #pragma pop /* 80807D40-80807D44 0000A4 0004+00 0/1 0/0 0/0 .rodata @4676 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4676 = 1000.0f; -COMPILER_STRIP_GATE(80807D40, &lit_4676); +COMPILER_STRIP_GATE(0x80807D40, &lit_4676); #pragma pop /* 80806740-808068E4 002000 01A4+00 1/1 0/0 0/0 .text e_yk_wind__FP10e_yk_class */ @@ -1066,21 +1073,21 @@ static asm void action(e_yk_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4725 = 5.0f; -COMPILER_STRIP_GATE(80807D44, &lit_4725); +COMPILER_STRIP_GATE(0x80807D44, &lit_4725); #pragma pop /* 80807D48-80807D4C 0000AC 0004+00 0/1 0/0 0/0 .rodata @4867 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4867 = 20.0f; -COMPILER_STRIP_GATE(80807D48, &lit_4867); +COMPILER_STRIP_GATE(0x80807D48, &lit_4867); #pragma pop /* 80807D4C-80807D50 0000B0 0004+00 0/1 0/0 0/0 .rodata @4868 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4868 = 20000.0f; -COMPILER_STRIP_GATE(80807D4C, &lit_4868); +COMPILER_STRIP_GATE(0x80807D4C, &lit_4868); #pragma pop /* 80806B78-8080708C 002438 0514+00 2/1 0/0 0/0 .text daE_YK_Execute__FP10e_yk_class */ @@ -1123,21 +1130,21 @@ static asm void useHeapInit(fopAc_ac_c* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5027 = 100000.0f; -COMPILER_STRIP_GATE(80807D50, &lit_5027); +COMPILER_STRIP_GATE(0x80807D50, &lit_5027); #pragma pop /* 80807D54-80807D58 0000B8 0004+00 0/1 0/0 0/0 .rodata @5028 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5028 = -200.0f; -COMPILER_STRIP_GATE(80807D54, &lit_5028); +COMPILER_STRIP_GATE(0x80807D54, &lit_5028); #pragma pop /* 80807D58-80807D5C 0000BC 0004+00 0/1 0/0 0/0 .rodata @5029 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5029 = 65535.0f; -COMPILER_STRIP_GATE(80807D58, &lit_5029); +COMPILER_STRIP_GATE(0x80807D58, &lit_5029); #pragma pop /* 80807D5C-80807D64 0000C0 0008+00 0/1 0/0 0/0 .rodata @5031 */ @@ -1146,7 +1153,13 @@ COMPILER_STRIP_GATE(80807D58, &lit_5029); SECTION_RODATA static u8 const lit_5031[8] = { 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80807D5C, &lit_5031); +COMPILER_STRIP_GATE(0x80807D5C, &lit_5031); +#pragma pop + +/* 80807D64-80807D64 0000C8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80807D69 = "E_yk"; #pragma pop /* 808071F4-808075CC 002AB4 03D8+00 1/0 0/0 0/0 .text daE_YK_Create__FP10fopAc_ac_c */ @@ -1241,7 +1254,7 @@ asm void __sinit_d_a_e_yk_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80807828 = (void*)__sinit_d_a_e_yk_cpp; +REGISTER_CTORS(0x80807828, __sinit_d_a_e_yk_cpp); #pragma pop /* 80807864-8080786C 003124 0008+00 1/0 0/0 0/0 .text @36@__dt__12dBgS_ObjAcchFv */ @@ -1276,10 +1289,4 @@ static asm void setMidnaBindEffect(fopEn_enemy_c* param_0, Z2CreatureEnemy* para } #pragma pop -/* 80807D64-80807D6E 0000C8 000A+00 4/4 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80807D64 = "E_YK"; -SECTION_DEAD static char const* const stringBase_80807D69 = "E_yk"; -#pragma pop +/* 80807D64-80807D64 0000C8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/e/d_a_e_ym/d_a_e_ym.cpp b/rel/d/a/e/d_a_e_ym/d_a_e_ym.cpp index 6bead6a2459..9b8bd10c6aa 100644 --- a/rel/d/a/e/d_a_e_ym/d_a_e_ym.cpp +++ b/rel/d/a/e/d_a_e_ym/d_a_e_ym.cpp @@ -47,16 +47,16 @@ struct mDoExt_baseAnm { /* 8000D428 */ void play(); }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; - struct J3DAnmTransform {}; +struct J3DModelData {}; + +struct Z2Creature {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -629,7 +629,7 @@ extern "C" void checkNextPath__8daKago_cF4cXyz(); /* ############################################################################################## */ /* 80815994-80815998 000000 0004+00 48/48 0/0 0/0 .rodata @3925 */ SECTION_RODATA static f32 const lit_3925 = 100.0f; -COMPILER_STRIP_GATE(80815994, &lit_3925); +COMPILER_STRIP_GATE(0x80815994, &lit_3925); /* 80815998-8081599C 000004 0004+00 3/41 0/0 0/0 .rodata @3926 */ SECTION_RODATA static u8 const lit_3926[4] = { @@ -638,7 +638,7 @@ SECTION_RODATA static u8 const lit_3926[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80815998, &lit_3926); +COMPILER_STRIP_GATE(0x80815998, &lit_3926); /* 8081599C-808159A4 000008 0004+04 3/29 0/0 0/0 .rodata @3927 */ SECTION_RODATA static f32 const lit_3927[1 + 1 /* padding */] = { @@ -646,7 +646,7 @@ SECTION_RODATA static f32 const lit_3927[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(8081599C, &lit_3927); +COMPILER_STRIP_GATE(0x8081599C, &lit_3927); /* 808159A4-808159AC 000010 0008+00 0/25 0/0 0/0 .rodata @3928 */ #pragma push @@ -654,7 +654,7 @@ COMPILER_STRIP_GATE(8081599C, &lit_3927); SECTION_RODATA static u8 const lit_3928[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(808159A4, &lit_3928); +COMPILER_STRIP_GATE(0x808159A4, &lit_3928); #pragma pop /* 808159AC-808159B4 000018 0008+00 0/25 0/0 0/0 .rodata @3929 */ @@ -663,7 +663,7 @@ COMPILER_STRIP_GATE(808159A4, &lit_3928); SECTION_RODATA static u8 const lit_3929[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(808159AC, &lit_3929); +COMPILER_STRIP_GATE(0x808159AC, &lit_3929); #pragma pop /* 808159B4-808159BC 000020 0008+00 0/25 0/0 0/0 .rodata @3930 */ @@ -672,57 +672,57 @@ COMPILER_STRIP_GATE(808159AC, &lit_3929); SECTION_RODATA static u8 const lit_3930[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(808159B4, &lit_3930); +COMPILER_STRIP_GATE(0x808159B4, &lit_3930); #pragma pop /* 808159BC-808159C0 000028 0004+00 0/1 0/0 0/0 .rodata @3931 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3931 = 1.0f / 100.0f; -COMPILER_STRIP_GATE(808159BC, &lit_3931); +COMPILER_STRIP_GATE(0x808159BC, &lit_3931); #pragma pop /* 808159C0-808159C4 00002C 0004+00 0/7 0/0 0/0 .rodata @3946 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3946 = 20.0f; -COMPILER_STRIP_GATE(808159C0, &lit_3946); +COMPILER_STRIP_GATE(0x808159C0, &lit_3946); #pragma pop /* 808159C4-808159C8 000030 0004+00 1/15 0/0 0/0 .rodata @3947 */ SECTION_RODATA static f32 const lit_3947 = 30.0f; -COMPILER_STRIP_GATE(808159C4, &lit_3947); +COMPILER_STRIP_GATE(0x808159C4, &lit_3947); /* 808159C8-808159CC 000034 0004+00 0/2 0/0 0/0 .rodata @3948 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3948 = 3.0f / 5.0f; -COMPILER_STRIP_GATE(808159C8, &lit_3948); +COMPILER_STRIP_GATE(0x808159C8, &lit_3948); #pragma pop /* 808159CC-808159D0 000038 0004+00 1/11 0/0 0/0 .rodata @3949 */ SECTION_RODATA static f32 const lit_3949 = 3.0f; -COMPILER_STRIP_GATE(808159CC, &lit_3949); +COMPILER_STRIP_GATE(0x808159CC, &lit_3949); /* 808159D0-808159D4 00003C 0004+00 0/1 0/0 0/0 .rodata @3950 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3950 = 13.0f; -COMPILER_STRIP_GATE(808159D0, &lit_3950); +COMPILER_STRIP_GATE(0x808159D0, &lit_3950); #pragma pop /* 808159D4-808159D8 000040 0004+00 0/5 0/0 0/0 .rodata @3951 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3951 = 400.0f; -COMPILER_STRIP_GATE(808159D4, &lit_3951); +COMPILER_STRIP_GATE(0x808159D4, &lit_3951); #pragma pop /* 808159D8-808159DC 000044 0004+00 0/3 0/0 0/0 .rodata @3952 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3952 = 300.0f; -COMPILER_STRIP_GATE(808159D8, &lit_3952); +COMPILER_STRIP_GATE(0x808159D8, &lit_3952); #pragma pop /* 80815B04-80815B10 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ @@ -961,12 +961,19 @@ asm void daE_YM_c::checkBck(char const* param_0, int param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3987 = 2.0f; -COMPILER_STRIP_GATE(808159DC, &lit_3987); +COMPILER_STRIP_GATE(0x808159DC, &lit_3987); #pragma pop /* 808159E0-808159E4 00004C 0004+00 1/2 0/0 0/0 .rodata @3988 */ SECTION_RODATA static f32 const lit_3988 = -1.0f; -COMPILER_STRIP_GATE(808159E0, &lit_3988); +COMPILER_STRIP_GATE(0x808159E0, &lit_3988); + +/* 80815AEC-80815AEC 000158 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80815AEC = "E_TM"; +SECTION_DEAD static char const* const stringBase_80815AF1 = "E_YM"; +#pragma pop /* 808081E0-80808328 0001A0 0148+00 18/18 0/0 0/0 .text bckSet__8daE_YM_cFiUcff */ #pragma push @@ -993,14 +1000,14 @@ asm void daE_YM_c::bckSetFly(int param_0, u8 param_1, f32 param_2, f32 param_3) #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4101 = 255.0f; -COMPILER_STRIP_GATE(808159E4, &lit_4101); +COMPILER_STRIP_GATE(0x808159E4, &lit_4101); #pragma pop /* 808159E8-808159EC 000054 0004+00 0/6 0/0 0/0 .rodata @4102 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4102 = -70.0f; -COMPILER_STRIP_GATE(808159E8, &lit_4102); +COMPILER_STRIP_GATE(0x808159E8, &lit_4102); #pragma pop /* 808083CC-80808678 00038C 02AC+00 1/1 0/0 0/0 .text draw__8daE_YM_cFv */ @@ -1064,14 +1071,14 @@ asm void daE_YM_c::setDigEffect() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4214 = 10.0f; -COMPILER_STRIP_GATE(808159EC, &lit_4214); +COMPILER_STRIP_GATE(0x808159EC, &lit_4214); #pragma pop /* 808159F0-808159F4 00005C 0004+00 0/4 0/0 0/0 .rodata @4215 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4215 = 6.0f; -COMPILER_STRIP_GATE(808159F0, &lit_4215); +COMPILER_STRIP_GATE(0x808159F0, &lit_4215); #pragma pop /* 80808884-808089DC 000844 0158+00 8/8 0/0 0/0 .text setElecEffect1__8daE_YM_cFv */ @@ -1109,7 +1116,7 @@ asm void daE_YM_c::setFireEffect() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4416 = 600.0f; -COMPILER_STRIP_GATE(808159F4, &lit_4416); +COMPILER_STRIP_GATE(0x808159F4, &lit_4416); #pragma pop /* 80808E34-80809000 000DF4 01CC+00 3/3 0/0 0/0 .text checkWallCrash__8daE_YM_cFv */ @@ -1127,7 +1134,7 @@ asm void daE_YM_c::checkWallCrash() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4472 = 900.0f; -COMPILER_STRIP_GATE(808159F8, &lit_4472); +COMPILER_STRIP_GATE(0x808159F8, &lit_4472); #pragma pop /* 80809000-80809228 000FC0 0228+00 3/3 0/0 0/0 .text checkWolfBark__8daE_YM_cFv */ @@ -1145,7 +1152,7 @@ asm void daE_YM_c::checkWolfBark() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4603 = 150.0f; -COMPILER_STRIP_GATE(808159FC, &lit_4603); +COMPILER_STRIP_GATE(0x808159FC, &lit_4603); #pragma pop /* 80809228-8080963C 0011E8 0414+00 1/1 0/0 0/0 .text checkSurpriseLock__8daE_YM_cFv */ @@ -1161,7 +1168,7 @@ asm void daE_YM_c::checkSurpriseLock() { /* ############################################################################################## */ /* 80815A00-80815A04 00006C 0004+00 1/9 0/0 0/0 .rodata @4618 */ SECTION_RODATA static f32 const lit_4618 = 200.0f; -COMPILER_STRIP_GATE(80815A00, &lit_4618); +COMPILER_STRIP_GATE(0x80815A00, &lit_4618); /* 8080963C-808096EC 0015FC 00B0+00 2/2 0/0 0/0 .text checkRailSurprise__8daE_YM_cFv */ #pragma push @@ -1178,21 +1185,21 @@ asm void daE_YM_c::checkRailSurprise() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4820 = 50.0f; -COMPILER_STRIP_GATE(80815A04, &lit_4820); +COMPILER_STRIP_GATE(0x80815A04, &lit_4820); #pragma pop /* 80815A08-80815A0C 000074 0004+00 0/1 0/0 0/0 .rodata @4821 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4821 = 350.0f; -COMPILER_STRIP_GATE(80815A08, &lit_4821); +COMPILER_STRIP_GATE(0x80815A08, &lit_4821); #pragma pop /* 80815A0C-80815A10 000078 0004+00 0/1 0/0 0/0 .rodata @4822 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4822 = 16.0f; -COMPILER_STRIP_GATE(80815A0C, &lit_4822); +COMPILER_STRIP_GATE(0x80815A0C, &lit_4822); #pragma pop /* 808096EC-80809D6C 0016AC 0680+00 3/3 0/0 0/0 .text checkSurpriseNear__8daE_YM_cFv */ @@ -1230,18 +1237,18 @@ asm void daE_YM_c::setAppear() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4871 = 3.0f / 20.0f; -COMPILER_STRIP_GATE(80815A10, &lit_4871); +COMPILER_STRIP_GATE(0x80815A10, &lit_4871); #pragma pop /* 80815A14-80815A18 000080 0004+00 1/21 0/0 0/0 .rodata @4872 */ SECTION_RODATA static f32 const lit_4872 = 5.0f; -COMPILER_STRIP_GATE(80815A14, &lit_4872); +COMPILER_STRIP_GATE(0x80815A14, &lit_4872); /* 80815A18-80815A1C 000084 0004+00 0/3 0/0 0/0 .rodata @4873 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4873 = 9.0f; -COMPILER_STRIP_GATE(80815A18, &lit_4873); +COMPILER_STRIP_GATE(0x80815A18, &lit_4873); #pragma pop /* 80809DA8-80809EF0 001D68 0148+00 8/8 0/0 0/0 .text setMoveSound__8daE_YM_cFi */ @@ -1279,7 +1286,7 @@ asm void daE_YM_c::setActionMode(int param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5021 = -60.0f; -COMPILER_STRIP_GATE(80815A1C, &lit_5021); +COMPILER_STRIP_GATE(0x80815A1C, &lit_5021); #pragma pop /* 80809FC4-8080A57C 001F84 05B8+00 1/1 0/0 0/0 .text executeWait__8daE_YM_cFv */ @@ -1297,21 +1304,21 @@ asm void daE_YM_c::executeWait() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5268 = 1.5f; -COMPILER_STRIP_GATE(80815A20, &lit_5268); +COMPILER_STRIP_GATE(0x80815A20, &lit_5268); #pragma pop /* 80815A24-80815A28 000090 0004+00 0/2 0/0 0/0 .rodata @5269 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5269 = 32768.0f; -COMPILER_STRIP_GATE(80815A24, &lit_5269); +COMPILER_STRIP_GATE(0x80815A24, &lit_5269); #pragma pop /* 80815A28-80815A2C 000094 0004+00 0/10 0/0 0/0 .rodata @5270 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5270 = 40.0f; -COMPILER_STRIP_GATE(80815A28, &lit_5270); +COMPILER_STRIP_GATE(0x80815A28, &lit_5270); #pragma pop /* 8080A57C-8080ACB4 00253C 0738+00 1/1 0/0 0/0 .text executeMove__8daE_YM_cFv */ @@ -1329,28 +1336,28 @@ asm void daE_YM_c::executeMove() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5413 = 8.0f; -COMPILER_STRIP_GATE(80815A2C, &lit_5413); +COMPILER_STRIP_GATE(0x80815A2C, &lit_5413); #pragma pop /* 80815A30-80815A34 00009C 0004+00 0/1 0/0 0/0 .rodata @5414 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5414 = 8192.0f; -COMPILER_STRIP_GATE(80815A30, &lit_5414); +COMPILER_STRIP_GATE(0x80815A30, &lit_5414); #pragma pop /* 80815A34-80815A38 0000A0 0004+00 0/1 0/0 0/0 .rodata @5415 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5415 = 45.0f; -COMPILER_STRIP_GATE(80815A34, &lit_5415); +COMPILER_STRIP_GATE(0x80815A34, &lit_5415); #pragma pop /* 80815A38-80815A3C 0000A4 0004+00 0/4 0/0 0/0 .rodata @5416 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5416 = 500.0f; -COMPILER_STRIP_GATE(80815A38, &lit_5416); +COMPILER_STRIP_GATE(0x80815A38, &lit_5416); #pragma pop /* 80815A3C-80815A44 0000A8 0008+00 0/4 0/0 0/0 .rodata @5418 */ @@ -1359,7 +1366,7 @@ COMPILER_STRIP_GATE(80815A38, &lit_5416); SECTION_RODATA static u8 const lit_5418[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80815A3C, &lit_5418); +COMPILER_STRIP_GATE(0x80815A3C, &lit_5418); #pragma pop /* 8080ACB4-8080B444 002C74 0790+00 1/1 0/0 0/0 .text executeEscape__8daE_YM_cFv */ @@ -1377,35 +1384,41 @@ asm void daE_YM_c::executeEscape() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5644 = -5.0f; -COMPILER_STRIP_GATE(80815A44, &lit_5644); +COMPILER_STRIP_GATE(0x80815A44, &lit_5644); #pragma pop /* 80815A48-80815A4C 0000B4 0004+00 0/8 0/0 0/0 .rodata @5645 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5645 = 15.0f; -COMPILER_STRIP_GATE(80815A48, &lit_5645); +COMPILER_STRIP_GATE(0x80815A48, &lit_5645); #pragma pop /* 80815A4C-80815A50 0000B8 0004+00 0/9 0/0 0/0 .rodata @5646 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5646 = 60.0f; -COMPILER_STRIP_GATE(80815A4C, &lit_5646); +COMPILER_STRIP_GATE(0x80815A4C, &lit_5646); #pragma pop /* 80815A50-80815A54 0000BC 0004+00 0/2 0/0 0/0 .rodata @5647 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5647 = 1000.0f; -COMPILER_STRIP_GATE(80815A50, &lit_5647); +COMPILER_STRIP_GATE(0x80815A50, &lit_5647); #pragma pop /* 80815A54-80815A58 0000C0 0004+00 0/1 0/0 0/0 .rodata @5648 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5648 = -1000000000.0f; -COMPILER_STRIP_GATE(80815A54, &lit_5648); +COMPILER_STRIP_GATE(0x80815A54, &lit_5648); +#pragma pop + +/* 80815AEC-80815AEC 000158 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80815AF6 = "R_SP108"; #pragma pop /* 8080B444-8080BB34 003404 06F0+00 2/2 0/0 0/0 .text executeDown__8daE_YM_cFv */ @@ -1443,21 +1456,21 @@ asm void daE_YM_c::damage_check() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5724 = 25.0f; -COMPILER_STRIP_GATE(80815A58, &lit_5724); +COMPILER_STRIP_GATE(0x80815A58, &lit_5724); #pragma pop /* 80815A5C-80815A60 0000C8 0004+00 0/2 0/0 0/0 .rodata @5725 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5725 = 4096.0f; -COMPILER_STRIP_GATE(80815A5C, &lit_5725); +COMPILER_STRIP_GATE(0x80815A5C, &lit_5725); #pragma pop /* 80815A60-80815A64 0000CC 0004+00 0/1 0/0 0/0 .rodata @5726 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5726 = 2048.0f; -COMPILER_STRIP_GATE(80815A60, &lit_5726); +COMPILER_STRIP_GATE(0x80815A60, &lit_5726); #pragma pop /* 8080BCFC-8080C05C 003CBC 0360+00 1/1 0/0 0/0 .text executeWind__8daE_YM_cFv */ @@ -1483,7 +1496,7 @@ asm void daE_YM_c::getSurpriseType() { /* ############################################################################################## */ /* 80815A64-80815A68 0000D0 0004+00 1/1 0/0 0/0 .rodata @5774 */ SECTION_RODATA static f32 const lit_5774 = 12.0f; -COMPILER_STRIP_GATE(80815A64, &lit_5774); +COMPILER_STRIP_GATE(0x80815A64, &lit_5774); /* 8080C1FC-8080C24C 0041BC 0050+00 2/2 0/0 0/0 .text setSurpriseAway__8daE_YM_cFv */ #pragma push @@ -1500,14 +1513,14 @@ asm void daE_YM_c::setSurpriseAway() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5792 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(80815A68, &lit_5792); +COMPILER_STRIP_GATE(0x80815A68, &lit_5792); #pragma pop /* 80815A6C-80815A70 0000D8 0004+00 0/2 0/0 0/0 .rodata @5793 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5793 = 4000.0f; -COMPILER_STRIP_GATE(80815A6C, &lit_5793); +COMPILER_STRIP_GATE(0x80815A6C, &lit_5793); #pragma pop /* 8080C24C-8080C374 00420C 0128+00 1/1 0/0 0/0 .text setGoHomeType__8daE_YM_cFv */ @@ -1525,21 +1538,21 @@ asm void daE_YM_c::setGoHomeType() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6055 = -90.0f; -COMPILER_STRIP_GATE(80815A70, &lit_6055); +COMPILER_STRIP_GATE(0x80815A70, &lit_6055); #pragma pop /* 80815A74-80815A78 0000E0 0004+00 0/1 0/0 0/0 .rodata @6056 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6056 = 28.0f; -COMPILER_STRIP_GATE(80815A74, &lit_6056); +COMPILER_STRIP_GATE(0x80815A74, &lit_6056); #pragma pop /* 80815A78-80815A7C 0000E4 0004+00 0/2 0/0 0/0 .rodata @6057 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6057 = 17.0f; -COMPILER_STRIP_GATE(80815A78, &lit_6057); +COMPILER_STRIP_GATE(0x80815A78, &lit_6057); #pragma pop /* 8080C374-8080CEE0 004334 0B6C+00 2/1 0/0 0/0 .text executeSurprise__8daE_YM_cFv */ @@ -1577,49 +1590,49 @@ asm void daE_YM_c::executeFall() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6058 = 3.0f / 10.0f; -COMPILER_STRIP_GATE(80815A7C, &lit_6058); +COMPILER_STRIP_GATE(0x80815A7C, &lit_6058); #pragma pop /* 80815A80-80815A84 0000EC 0004+00 0/0 0/0 0/0 .rodata @6059 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6059 = 650.0f; -COMPILER_STRIP_GATE(80815A80, &lit_6059); +COMPILER_STRIP_GATE(0x80815A80, &lit_6059); #pragma pop /* 80815A84-80815A88 0000F0 0004+00 0/1 0/0 0/0 .rodata @6060 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6060 = 90.0f; -COMPILER_STRIP_GATE(80815A84, &lit_6060); +COMPILER_STRIP_GATE(0x80815A84, &lit_6060); #pragma pop /* 80815A88-80815A8C 0000F4 0004+00 0/0 0/0 0/0 .rodata @6061 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6061 = 75.0f; -COMPILER_STRIP_GATE(80815A88, &lit_6061); +COMPILER_STRIP_GATE(0x80815A88, &lit_6061); #pragma pop /* 80815A8C-80815A90 0000F8 0004+00 0/1 0/0 0/0 .rodata @6062 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6062 = 35.0f; -COMPILER_STRIP_GATE(80815A8C, &lit_6062); +COMPILER_STRIP_GATE(0x80815A8C, &lit_6062); #pragma pop /* 80815A90-80815A94 0000FC 0004+00 0/2 0/0 0/0 .rodata @6244 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6244 = -100.0f; -COMPILER_STRIP_GATE(80815A90, &lit_6244); +COMPILER_STRIP_GATE(0x80815A90, &lit_6244); #pragma pop /* 80815A94-80815A98 000100 0004+00 0/1 0/0 0/0 .rodata @6245 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6245 = 4.0f; -COMPILER_STRIP_GATE(80815A94, &lit_6245); +COMPILER_STRIP_GATE(0x80815A94, &lit_6245); #pragma pop /* 8080D2C8-8080D990 005288 06C8+00 1/1 0/0 0/0 .text executeAttack__8daE_YM_cFv */ @@ -1697,14 +1710,14 @@ asm void daE_YM_c::initFly() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7042 = 14.0f; -COMPILER_STRIP_GATE(80815A98, &lit_7042); +COMPILER_STRIP_GATE(0x80815A98, &lit_7042); #pragma pop /* 80815A9C-80815AA0 000108 0004+00 0/1 0/0 0/0 .rodata @7043 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7043 = -10.0f; -COMPILER_STRIP_GATE(80815A9C, &lit_7043); +COMPILER_STRIP_GATE(0x80815A9C, &lit_7043); #pragma pop /* 8080E6A0-8080F8C8 006660 1228+00 2/1 0/0 0/0 .text executeFly__8daE_YM_cFv */ @@ -1792,42 +1805,42 @@ asm void daE_YM_c::checkElectricStart() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7044 = 70.0f; -COMPILER_STRIP_GATE(80815AA0, &lit_7044); +COMPILER_STRIP_GATE(0x80815AA0, &lit_7044); #pragma pop /* 80815AA4-80815AA8 000110 0004+00 0/0 0/0 0/0 .rodata @7045 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7045 = 2.0f / 5.0f; -COMPILER_STRIP_GATE(80815AA4, &lit_7045); +COMPILER_STRIP_GATE(0x80815AA4, &lit_7045); #pragma pop /* 80815AA8-80815AAC 000114 0004+00 0/0 0/0 0/0 .rodata @7046 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7046 = -3072.0f; -COMPILER_STRIP_GATE(80815AA8, &lit_7046); +COMPILER_STRIP_GATE(0x80815AA8, &lit_7046); #pragma pop /* 80815AAC-80815AB0 000118 0004+00 0/0 0/0 0/0 .rodata @7047 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7047 = 5120.0f; -COMPILER_STRIP_GATE(80815AAC, &lit_7047); +COMPILER_STRIP_GATE(0x80815AAC, &lit_7047); #pragma pop /* 80815AB0-80815AB4 00011C 0004+00 0/1 0/0 0/0 .rodata @7048 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7048 = -15.0f; -COMPILER_STRIP_GATE(80815AB0, &lit_7048); +COMPILER_STRIP_GATE(0x80815AB0, &lit_7048); #pragma pop /* 80815AB4-80815AB8 000120 0004+00 0/1 0/0 0/0 .rodata @7556 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7556 = 36.0f; -COMPILER_STRIP_GATE(80815AB4, &lit_7556); +COMPILER_STRIP_GATE(0x80815AB4, &lit_7556); #pragma pop /* 80810E64-8081105C 008E24 01F8+00 1/1 0/0 0/0 .text executeElectric__8daE_YM_cFv */ @@ -1855,7 +1868,7 @@ asm void daE_YM_c::executeSwitch() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7719 = 512.0f; -COMPILER_STRIP_GATE(80815AB8, &lit_7719); +COMPILER_STRIP_GATE(0x80815AB8, &lit_7719); #pragma pop /* 80811740-80811838 009700 00F8+00 1/1 0/0 0/0 .text initFireFly__8daE_YM_cFi */ @@ -1873,14 +1886,14 @@ asm void daE_YM_c::initFireFly(int param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7942 = 550.0f; -COMPILER_STRIP_GATE(80815ABC, &lit_7942); +COMPILER_STRIP_GATE(0x80815ABC, &lit_7942); #pragma pop /* 80815AC0-80815AC4 00012C 0004+00 0/1 0/0 0/0 .rodata @7943 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7943 = 250.0f; -COMPILER_STRIP_GATE(80815AC0, &lit_7943); +COMPILER_STRIP_GATE(0x80815AC0, &lit_7943); #pragma pop /* 80811838-808120B0 0097F8 0878+00 1/1 0/0 0/0 .text executeFire__8daE_YM_cFv */ @@ -1898,7 +1911,7 @@ asm void daE_YM_c::executeFire() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8040 = 2000.0f; -COMPILER_STRIP_GATE(80815AC4, &lit_8040); +COMPILER_STRIP_GATE(0x80815AC4, &lit_8040); #pragma pop /* 808120B0-808123C4 00A070 0314+00 1/1 0/0 0/0 .text setRiverAttention__8daE_YM_cFv */ @@ -1926,14 +1939,14 @@ asm void daE_YM_c::setLockByCargo() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8350 = 1500.0f; -COMPILER_STRIP_GATE(80815AC8, &lit_8350); +COMPILER_STRIP_GATE(0x80815AC8, &lit_8350); #pragma pop /* 80815ACC-80815AD0 000138 0004+00 0/1 0/0 0/0 .rodata @8351 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8351 = 12.0f / 5.0f; -COMPILER_STRIP_GATE(80815ACC, &lit_8351); +COMPILER_STRIP_GATE(0x80815ACC, &lit_8351); #pragma pop /* 808123D0-80812F0C 00A390 0B3C+00 1/1 0/0 0/0 .text executeRiver__8daE_YM_cFv */ @@ -1991,14 +2004,14 @@ asm void daE_YM_c::mtx_set() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8621 = -30.0f; -COMPILER_STRIP_GATE(80815AD0, &lit_8621); +COMPILER_STRIP_GATE(0x80815AD0, &lit_8621); #pragma pop /* 80815AD4-80815AD8 000140 0004+00 0/1 0/0 0/0 .rodata @8622 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8622 = -20.0f; -COMPILER_STRIP_GATE(80815AD4, &lit_8622); +COMPILER_STRIP_GATE(0x80815AD4, &lit_8622); #pragma pop /* 808135B0-808138AC 00B570 02FC+00 1/1 0/0 0/0 .text cc_set__8daE_YM_cFv */ @@ -2096,14 +2109,14 @@ static asm void useHeapInit(fopAc_ac_c* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8964 = -200.0f; -COMPILER_STRIP_GATE(80815AD8, &lit_8964); +COMPILER_STRIP_GATE(0x80815AD8, &lit_8964); #pragma pop /* 80815ADC-80815AE0 000148 0004+00 0/1 0/0 0/0 .rodata @8965 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8965 = 80.0f; -COMPILER_STRIP_GATE(80815ADC, &lit_8965); +COMPILER_STRIP_GATE(0x80815ADC, &lit_8965); #pragma pop /* 80813EA4-808143A0 00BE64 04FC+00 2/2 0/0 0/0 .text checkBeforeBg__8daE_YM_cFs */ @@ -2141,7 +2154,7 @@ asm void daE_YM_c::checkInitialWall() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9187 = -50.0f; -COMPILER_STRIP_GATE(80815AE0, &lit_9187); +COMPILER_STRIP_GATE(0x80815AE0, &lit_9187); #pragma pop /* 80814758-80814AF0 00C718 0398+00 3/3 0/0 0/0 .text checkWall__8daE_YM_cFv */ @@ -2171,7 +2184,13 @@ asm void daE_YM_c::setHideType() { SECTION_RODATA static u8 const lit_9420[8] = { 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80815AE4, &lit_9420); +COMPILER_STRIP_GATE(0x80815AE4, &lit_9420); +#pragma pop + +/* 80815AEC-80815AEC 000158 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80815AFE = "E_ym"; #pragma pop /* 80814BA4-80815224 00CB64 0680+00 2/1 0/0 0/0 .text create__8daE_YM_cFv */ @@ -2276,7 +2295,7 @@ asm void __sinit_d_a_e_ym_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_808154A0 = (void*)__sinit_d_a_e_ym_cpp; +REGISTER_CTORS(0x808154A0, __sinit_d_a_e_ym_cpp); #pragma pop /* 808154DC-808154E4 00D49C 0008+00 1/0 0/0 0/0 .text @36@__dt__12dBgS_ObjAcchFv */ @@ -2341,12 +2360,4 @@ asm void daTag_FWall_c::getPos(u8 param_0) { } #pragma pop -/* 80815AEC-80815B03 000158 0017+00 9/9 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80815AEC = "E_TM"; -SECTION_DEAD static char const* const stringBase_80815AF1 = "E_YM"; -SECTION_DEAD static char const* const stringBase_80815AF6 = "R_SP108"; -SECTION_DEAD static char const* const stringBase_80815AFE = "E_ym"; -#pragma pop +/* 80815AEC-80815AEC 000158 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/e/d_a_e_ymb/d_a_e_ymb.cpp b/rel/d/a/e/d_a_e_ymb/d_a_e_ymb.cpp index cc1ac4cccaf..44ebea56023 100644 --- a/rel/d/a/e/d_a_e_ymb/d_a_e_ymb.cpp +++ b/rel/d/a/e/d_a_e_ymb/d_a_e_ymb.cpp @@ -53,16 +53,16 @@ struct mDoExt_baseAnm { /* 8000D428 */ void play(); }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; - struct J3DAnmTransform {}; +struct J3DModelData {}; + +struct Z2Creature {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -659,41 +659,41 @@ extern "C" void __register_global_object(); /* ############################################################################################## */ /* 808218AC-808218B0 000000 0004+00 49/49 0/0 0/0 .rodata @3791 */ SECTION_RODATA static f32 const lit_3791 = 1.0f; -COMPILER_STRIP_GATE(808218AC, &lit_3791); +COMPILER_STRIP_GATE(0x808218AC, &lit_3791); /* 808218B0-808218B4 000004 0004+00 0/4 0/0 0/0 .rodata @3792 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3792 = 10.0f; -COMPILER_STRIP_GATE(808218B0, &lit_3792); +COMPILER_STRIP_GATE(0x808218B0, &lit_3792); #pragma pop /* 808218B4-808218B8 000008 0004+00 0/2 0/0 0/0 .rodata @3793 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3793 = 70.0f; -COMPILER_STRIP_GATE(808218B4, &lit_3793); +COMPILER_STRIP_GATE(0x808218B4, &lit_3793); #pragma pop /* 808218B8-808218BC 00000C 0004+00 0/4 0/0 0/0 .rodata @3794 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3794 = 40.0f; -COMPILER_STRIP_GATE(808218B8, &lit_3794); +COMPILER_STRIP_GATE(0x808218B8, &lit_3794); #pragma pop /* 808218BC-808218C0 000010 0004+00 0/1 0/0 0/0 .rodata @3795 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3795 = 750.0f; -COMPILER_STRIP_GATE(808218BC, &lit_3795); +COMPILER_STRIP_GATE(0x808218BC, &lit_3795); #pragma pop /* 808218C0-808218C4 000014 0004+00 0/2 0/0 0/0 .rodata @3796 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3796 = 400.0f; -COMPILER_STRIP_GATE(808218C0, &lit_3796); +COMPILER_STRIP_GATE(0x808218C0, &lit_3796); #pragma pop /* 80821B10-80821B1C 000000 000C+00 2/2 0/0 0/0 .data cNullVec__6Z2Calc */ @@ -1064,13 +1064,13 @@ SECTION_RODATA static u8 const lit_3910[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(808218C4, &lit_3910); +COMPILER_STRIP_GATE(0x808218C4, &lit_3910); /* 808218C8-808218CC 00001C 0004+00 0/2 0/0 0/0 .rodata @3911 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3911 = -100.0f; -COMPILER_STRIP_GATE(808218C8, &lit_3911); +COMPILER_STRIP_GATE(0x808218C8, &lit_3911); #pragma pop /* 808218CC-808218D4 000020 0008+00 0/4 0/0 0/0 .rodata @3913 */ @@ -1079,7 +1079,7 @@ COMPILER_STRIP_GATE(808218C8, &lit_3911); SECTION_RODATA static u8 const lit_3913[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(808218CC, &lit_3913); +COMPILER_STRIP_GATE(0x808218CC, &lit_3913); #pragma pop /* 8081615C-808164B4 00013C 0358+00 1/1 0/0 0/0 .text ctrlJoint__9daE_YMB_cFP8J3DJointP8J3DModel @@ -1129,21 +1129,21 @@ static asm void rideCallBack(dBgW* param_0, fopAc_ac_c* param_1, fopAc_ac_c* par #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4064 = 255.0f; -COMPILER_STRIP_GATE(808218D4, &lit_4064); +COMPILER_STRIP_GATE(0x808218D4, &lit_4064); #pragma pop /* 808218D8-808218DC 00002C 0004+00 0/8 0/0 0/0 .rodata @4065 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4065 = 100.0f; -COMPILER_STRIP_GATE(808218D8, &lit_4065); +COMPILER_STRIP_GATE(0x808218D8, &lit_4065); #pragma pop /* 808218DC-808218E0 000030 0004+00 0/3 0/0 0/0 .rodata @4066 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4066 = 2500.0f; -COMPILER_STRIP_GATE(808218DC, &lit_4066); +COMPILER_STRIP_GATE(0x808218DC, &lit_4066); #pragma pop /* 80816554-8081695C 000534 0408+00 1/1 0/0 0/0 .text draw__9daE_YMB_cFv */ @@ -1169,7 +1169,13 @@ static asm void daE_YMB_Draw(daE_YMB_c* param_0) { /* ############################################################################################## */ /* 808218E0-808218E4 000034 0004+00 3/3 0/0 0/0 .rodata @4083 */ SECTION_RODATA static f32 const lit_4083 = -1.0f; -COMPILER_STRIP_GATE(808218E0, &lit_4083); +COMPILER_STRIP_GATE(0x808218E0, &lit_4083); + +/* 80821B04-80821B04 000258 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80821B04 = "E_YB"; +#pragma pop /* 8081697C-80816A20 00095C 00A4+00 14/14 0/0 0/0 .text setBck__9daE_YMB_cFiUcff */ #pragma push @@ -1210,7 +1216,7 @@ SECTION_RODATA static f32 const lit_4111[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(808218E4, &lit_4111); +COMPILER_STRIP_GATE(0x808218E4, &lit_4111); #pragma pop /* 80816A88-80816B7C 000A68 00F4+00 1/1 0/0 0/0 .text setLastDamage__9daE_YMB_cFv */ @@ -1240,7 +1246,7 @@ asm void daE_YMB_c::damage_check() { SECTION_RODATA static u8 const lit_4268[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(808218EC, &lit_4268); +COMPILER_STRIP_GATE(0x808218EC, &lit_4268); #pragma pop /* 808218F4-808218FC 000048 0008+00 0/14 0/0 0/0 .rodata @4269 */ @@ -1249,7 +1255,7 @@ COMPILER_STRIP_GATE(808218EC, &lit_4268); SECTION_RODATA static u8 const lit_4269[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(808218F4, &lit_4269); +COMPILER_STRIP_GATE(0x808218F4, &lit_4269); #pragma pop /* 808218FC-80821904 000050 0008+00 0/15 0/0 0/0 .rodata @4270 */ @@ -1258,14 +1264,14 @@ COMPILER_STRIP_GATE(808218F4, &lit_4269); SECTION_RODATA static u8 const lit_4270[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(808218FC, &lit_4270); +COMPILER_STRIP_GATE(0x808218FC, &lit_4270); #pragma pop /* 80821904-80821908 000058 0004+00 0/5 0/0 0/0 .rodata @4271 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4271 = 3000.0f; -COMPILER_STRIP_GATE(80821904, &lit_4271); +COMPILER_STRIP_GATE(0x80821904, &lit_4271); #pragma pop /* 80816E78-80817064 000E58 01EC+00 1/1 0/0 0/0 .text setCameraSwitch__9daE_YMB_cFv */ @@ -1283,16 +1289,16 @@ asm void daE_YMB_c::setCameraSwitch() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4289 = 1000.0f; -COMPILER_STRIP_GATE(80821908, &lit_4289); +COMPILER_STRIP_GATE(0x80821908, &lit_4289); #pragma pop /* 8082190C-80821910 000060 0004+00 1/2 0/0 0/0 .rodata @4290 */ SECTION_RODATA static f32 const lit_4290 = -1000000000.0f; -COMPILER_STRIP_GATE(8082190C, &lit_4290); +COMPILER_STRIP_GATE(0x8082190C, &lit_4290); /* 80821910-80821914 000064 0004+00 1/6 0/0 0/0 .rodata @4291 */ SECTION_RODATA static f32 const lit_4291 = 200.0f; -COMPILER_STRIP_GATE(80821910, &lit_4291); +COMPILER_STRIP_GATE(0x80821910, &lit_4291); /* 80821E18-80821E1C 000008 0001+03 8/8 0/0 0/0 .bss @1109 */ static u8 lit_1109[1 + 3 /* padding */]; @@ -1408,7 +1414,7 @@ asm void daE_YMB_c::checkWaterPos() { /* ############################################################################################## */ /* 80821914-80821918 000068 0004+00 1/4 0/0 0/0 .rodata @4304 */ SECTION_RODATA static f32 const lit_4304 = 500.0f; -COMPILER_STRIP_GATE(80821914, &lit_4304); +COMPILER_STRIP_GATE(0x80821914, &lit_4304); /* 80817164-80817200 001144 009C+00 1/1 0/0 0/0 .text checkGroundPos__9daE_YMB_cFv */ #pragma push @@ -1443,7 +1449,7 @@ asm void daE_YMB_c::setDownWaitVoice() { /* ############################################################################################## */ /* 80821918-8082191C 00006C 0004+00 1/6 0/0 0/0 .rodata @4343 */ SECTION_RODATA static f32 const lit_4343 = 150.0f; -COMPILER_STRIP_GATE(80821918, &lit_4343); +COMPILER_STRIP_GATE(0x80821918, &lit_4343); /* 808172F8-808173B0 0012D8 00B8+00 0/0 0/0 1/1 .text setHitBoardSe__9daE_YMB_cFv */ #pragma push @@ -1460,14 +1466,14 @@ asm void daE_YMB_c::setHitBoardSe() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4411 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(8082191C, &lit_4411); +COMPILER_STRIP_GATE(0x8082191C, &lit_4411); #pragma pop /* 80821920-80821924 000074 0004+00 0/4 0/0 0/0 .rodata @4412 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4412 = 20.0f; -COMPILER_STRIP_GATE(80821920, &lit_4412); +COMPILER_STRIP_GATE(0x80821920, &lit_4412); #pragma pop /* 808173B0-8081756C 001390 01BC+00 4/4 0/0 0/0 .text setElecEffect1__9daE_YMB_cFv */ @@ -1485,14 +1491,14 @@ asm void daE_YMB_c::setElecEffect1() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4487 = 2.0f; -COMPILER_STRIP_GATE(80821924, &lit_4487); +COMPILER_STRIP_GATE(0x80821924, &lit_4487); #pragma pop /* 80821928-8082192C 00007C 0004+00 0/2 0/0 0/0 .rodata @4488 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4488 = 60.0f; -COMPILER_STRIP_GATE(80821928, &lit_4488); +COMPILER_STRIP_GATE(0x80821928, &lit_4488); #pragma pop /* 8081756C-80817744 00154C 01D8+00 6/6 0/0 0/0 .text setElecEffect2__9daE_YMB_cFv */ @@ -1785,7 +1791,7 @@ static asm void search_drop(void* param_0, void* param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4858 = 300.0f; -COMPILER_STRIP_GATE(8082192C, &lit_4858); +COMPILER_STRIP_GATE(0x8082192C, &lit_4858); #pragma pop /* 808181F4-80818328 0021D4 0134+00 1/1 0/0 0/0 .text executeWait__9daE_YMB_cFv */ @@ -1813,7 +1819,7 @@ asm void daE_YMB_c::setBitePos(int param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4904 = 50.0f; -COMPILER_STRIP_GATE(80821930, &lit_4904); +COMPILER_STRIP_GATE(0x80821930, &lit_4904); #pragma pop /* 80818370-80818518 002350 01A8+00 1/1 0/0 0/0 .text setInclination__9daE_YMB_cFv */ @@ -1831,14 +1837,14 @@ asm void daE_YMB_c::setInclination() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5021 = -32.0f; -COMPILER_STRIP_GATE(80821934, &lit_5021); +COMPILER_STRIP_GATE(0x80821934, &lit_5021); #pragma pop /* 80821938-8082193C 00008C 0004+00 0/1 0/0 0/0 .rodata @5022 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5022 = 48.0f; -COMPILER_STRIP_GATE(80821938, &lit_5022); +COMPILER_STRIP_GATE(0x80821938, &lit_5022); #pragma pop /* 80818518-80818930 0024F8 0418+00 3/3 0/0 0/0 .text setBodyAngle__9daE_YMB_cFv */ @@ -1866,53 +1872,53 @@ asm void daE_YMB_c::checkWolfLockIn() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5372 = 5.0f; -COMPILER_STRIP_GATE(8082193C, &lit_5372); +COMPILER_STRIP_GATE(0x8082193C, &lit_5372); #pragma pop /* 80821940-80821944 000094 0004+00 0/2 0/0 0/0 .rodata @5373 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5373 = 2200.0f; -COMPILER_STRIP_GATE(80821940, &lit_5373); +COMPILER_STRIP_GATE(0x80821940, &lit_5373); #pragma pop /* 80821944-80821948 000098 0004+00 0/3 0/0 0/0 .rodata @5374 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5374 = 1800.0f; -COMPILER_STRIP_GATE(80821944, &lit_5374); +COMPILER_STRIP_GATE(0x80821944, &lit_5374); #pragma pop /* 80821948-8082194C 00009C 0004+00 0/2 0/0 0/0 .rodata @5375 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5375 = 2048.0f; -COMPILER_STRIP_GATE(80821948, &lit_5375); +COMPILER_STRIP_GATE(0x80821948, &lit_5375); #pragma pop /* 8082194C-80821950 0000A0 0004+00 0/3 0/0 0/0 .rodata @5376 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5376 = 0.5f; -COMPILER_STRIP_GATE(8082194C, &lit_5376); +COMPILER_STRIP_GATE(0x8082194C, &lit_5376); #pragma pop /* 80821950-80821954 0000A4 0004+00 0/3 0/0 0/0 .rodata @5377 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5377 = 650.0f; -COMPILER_STRIP_GATE(80821950, &lit_5377); +COMPILER_STRIP_GATE(0x80821950, &lit_5377); #pragma pop /* 80821954-80821958 0000A8 0004+00 1/3 0/0 0/0 .rodata @5378 */ SECTION_RODATA static f32 const lit_5378 = 2000.0f; -COMPILER_STRIP_GATE(80821954, &lit_5378); +COMPILER_STRIP_GATE(0x80821954, &lit_5378); /* 80821958-8082195C 0000AC 0004+00 0/1 0/0 0/0 .rodata @5379 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5379 = 700.0f; -COMPILER_STRIP_GATE(80821958, &lit_5379); +COMPILER_STRIP_GATE(0x80821958, &lit_5379); #pragma pop /* 80818AE8-80819610 002AC8 0B28+00 1/1 0/0 0/0 .text executeFly__9daE_YMB_cFv */ @@ -1930,14 +1936,14 @@ asm void daE_YMB_c::executeFly() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5571 = 15.0f; -COMPILER_STRIP_GATE(8082195C, &lit_5571); +COMPILER_STRIP_GATE(0x8082195C, &lit_5571); #pragma pop /* 80821960-80821964 0000B4 0004+00 0/1 0/0 0/0 .rodata @5572 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5572 = -15.0f; -COMPILER_STRIP_GATE(80821960, &lit_5572); +COMPILER_STRIP_GATE(0x80821960, &lit_5572); #pragma pop /* 80819610-80819FD0 0035F0 09C0+00 2/1 0/0 0/0 .text executeFlyAttack__9daE_YMB_cFv */ @@ -1955,21 +1961,21 @@ asm void daE_YMB_c::executeFlyAttack() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5573 = 7.0f; -COMPILER_STRIP_GATE(80821964, &lit_5573); +COMPILER_STRIP_GATE(0x80821964, &lit_5573); #pragma pop /* 80821968-8082196C 0000BC 0004+00 0/2 0/0 0/0 .rodata @5574 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5574 = 30.0f; -COMPILER_STRIP_GATE(80821968, &lit_5574); +COMPILER_STRIP_GATE(0x80821968, &lit_5574); #pragma pop /* 8082196C-80821970 0000C0 0004+00 0/2 0/0 0/0 .rodata @5744 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5744 = 1300.0f; -COMPILER_STRIP_GATE(8082196C, &lit_5744); +COMPILER_STRIP_GATE(0x8082196C, &lit_5744); #pragma pop /* 80819FD0-8081A718 003FB0 0748+00 1/1 0/0 0/0 .text executeRunAway__9daE_YMB_cFv */ @@ -1987,7 +1993,7 @@ asm void daE_YMB_c::executeRunAway() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5772 = 3.0f / 10.0f; -COMPILER_STRIP_GATE(80821970, &lit_5772); +COMPILER_STRIP_GATE(0x80821970, &lit_5772); #pragma pop /* 8081A718-8081A88C 0046F8 0174+00 1/1 0/0 0/0 .text executeGuard__9daE_YMB_cFv */ @@ -2015,70 +2021,70 @@ asm void daE_YMB_c::executeSwim() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6083 = 16384.0f; -COMPILER_STRIP_GATE(80821974, &lit_6083); +COMPILER_STRIP_GATE(0x80821974, &lit_6083); #pragma pop /* 80821978-8082197C 0000CC 0004+00 0/0 0/0 0/0 .rodata @6084 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6084 = 8192.0f; -COMPILER_STRIP_GATE(80821978, &lit_6084); +COMPILER_STRIP_GATE(0x80821978, &lit_6084); #pragma pop /* 8082197C-80821980 0000D0 0004+00 0/0 0/0 0/0 .rodata @6085 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6085 = 512.0f; -COMPILER_STRIP_GATE(8082197C, &lit_6085); +COMPILER_STRIP_GATE(0x8082197C, &lit_6085); #pragma pop /* 80821980-80821984 0000D4 0004+00 0/0 0/0 0/0 .rodata @6086 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6086 = 1536.0f; -COMPILER_STRIP_GATE(80821980, &lit_6086); +COMPILER_STRIP_GATE(0x80821980, &lit_6086); #pragma pop /* 80821984-80821988 0000D8 0004+00 0/1 0/0 0/0 .rodata @6087 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6087 = -10.0f; -COMPILER_STRIP_GATE(80821984, &lit_6087); +COMPILER_STRIP_GATE(0x80821984, &lit_6087); #pragma pop /* 80821988-8082198C 0000DC 0004+00 0/0 0/0 0/0 .rodata @6088 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6088 = 4000.0f; -COMPILER_STRIP_GATE(80821988, &lit_6088); +COMPILER_STRIP_GATE(0x80821988, &lit_6088); #pragma pop /* 8082198C-80821990 0000E0 0004+00 0/1 0/0 0/0 .rodata @6162 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6162 = -50.0f; -COMPILER_STRIP_GATE(8082198C, &lit_6162); +COMPILER_STRIP_GATE(0x8082198C, &lit_6162); #pragma pop /* 80821990-80821994 0000E4 0004+00 0/2 0/0 0/0 .rodata @6163 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6163 = 80.0f; -COMPILER_STRIP_GATE(80821990, &lit_6163); +COMPILER_STRIP_GATE(0x80821990, &lit_6163); #pragma pop /* 80821994-80821998 0000E8 0004+00 0/1 0/0 0/0 .rodata @6164 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6164 = -30.0f; -COMPILER_STRIP_GATE(80821994, &lit_6164); +COMPILER_STRIP_GATE(0x80821994, &lit_6164); #pragma pop /* 80821998-8082199C 0000EC 0004+00 0/1 0/0 0/0 .rodata @6165 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6165 = 24.0f; -COMPILER_STRIP_GATE(80821998, &lit_6165); +COMPILER_STRIP_GATE(0x80821998, &lit_6165); #pragma pop /* 8081B78C-8081BC10 00576C 0484+00 1/1 0/0 0/0 .text executeWaterJump__9daE_YMB_cFv */ @@ -2096,7 +2102,7 @@ asm void daE_YMB_c::executeWaterJump() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6254 = 1500.0f; -COMPILER_STRIP_GATE(8082199C, &lit_6254); +COMPILER_STRIP_GATE(0x8082199C, &lit_6254); #pragma pop /* 8081BC10-8081BEE8 005BF0 02D8+00 1/1 0/0 0/0 .text getNearDownPos__9daE_YMB_cFv */ @@ -2114,7 +2120,7 @@ asm void daE_YMB_c::getNearDownPos() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6356 = -20.0f; -COMPILER_STRIP_GATE(808219A0, &lit_6356); +COMPILER_STRIP_GATE(0x808219A0, &lit_6356); #pragma pop /* 8081BEE8-8081C4EC 005EC8 0604+00 1/2 0/0 0/0 .text executeDamage__9daE_YMB_cFv */ @@ -2132,7 +2138,7 @@ asm void daE_YMB_c::executeDamage() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6445 = 1.0f / 100.0f; -COMPILER_STRIP_GATE(808219A4, &lit_6445); +COMPILER_STRIP_GATE(0x808219A4, &lit_6445); #pragma pop /* 8081C4EC-8081C7D0 0064CC 02E4+00 1/1 0/0 0/0 .text setMidnaBindInit__9daE_YMB_cFP4cXyz @@ -2171,7 +2177,7 @@ asm void daE_YMB_c::setWolfLockEffect() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6596 = 16.0f; -COMPILER_STRIP_GATE(808219A8, &lit_6596); +COMPILER_STRIP_GATE(0x808219A8, &lit_6596); #pragma pop /* 8081CC14-8081CD00 006BF4 00EC+00 2/2 0/0 0/0 .text initDownToWater__9daE_YMB_cFv */ @@ -2189,7 +2195,7 @@ asm void daE_YMB_c::initDownToWater() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6654 = -60.0f; -COMPILER_STRIP_GATE(808219AC, &lit_6654); +COMPILER_STRIP_GATE(0x808219AC, &lit_6654); #pragma pop /* 8081CD00-8081CE6C 006CE0 016C+00 2/2 0/0 0/0 .text calcDownToWater__9daE_YMB_cFv */ @@ -2227,77 +2233,77 @@ asm void daE_YMB_c::setCreateDrop() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7019 = -88400.0f; -COMPILER_STRIP_GATE(808219B0, &lit_7019); +COMPILER_STRIP_GATE(0x808219B0, &lit_7019); #pragma pop /* 808219B4-808219B8 000108 0004+00 0/1 0/0 0/0 .rodata @7020 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7020 = 39000.0f; -COMPILER_STRIP_GATE(808219B4, &lit_7020); +COMPILER_STRIP_GATE(0x808219B4, &lit_7020); #pragma pop /* 808219B8-808219BC 00010C 0004+00 0/1 0/0 0/0 .rodata @7021 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7021 = -87900.0f; -COMPILER_STRIP_GATE(808219B8, &lit_7021); +COMPILER_STRIP_GATE(0x808219B8, &lit_7021); #pragma pop /* 808219BC-808219C0 000110 0004+00 0/1 0/0 0/0 .rodata @7022 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7022 = -18800.0f; -COMPILER_STRIP_GATE(808219BC, &lit_7022); +COMPILER_STRIP_GATE(0x808219BC, &lit_7022); #pragma pop /* 808219C0-808219C4 000114 0004+00 0/1 0/0 0/0 .rodata @7023 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7023 = 38050.0f; -COMPILER_STRIP_GATE(808219C0, &lit_7023); +COMPILER_STRIP_GATE(0x808219C0, &lit_7023); #pragma pop /* 808219C4-808219C8 000118 0004+00 0/1 0/0 0/0 .rodata @7024 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7024 = 263.0f; -COMPILER_STRIP_GATE(808219C4, &lit_7024); +COMPILER_STRIP_GATE(0x808219C4, &lit_7024); #pragma pop /* 808219C8-808219CC 00011C 0004+00 0/1 0/0 0/0 .rodata @7025 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7025 = 280.0f; -COMPILER_STRIP_GATE(808219C8, &lit_7025); +COMPILER_STRIP_GATE(0x808219C8, &lit_7025); #pragma pop /* 808219CC-808219D0 000120 0004+00 0/1 0/0 0/0 .rodata @7026 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7026 = -87893.0f; -COMPILER_STRIP_GATE(808219CC, &lit_7026); +COMPILER_STRIP_GATE(0x808219CC, &lit_7026); #pragma pop /* 808219D0-808219D4 000124 0004+00 0/1 0/0 0/0 .rodata @7027 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7027 = -18731.0f; -COMPILER_STRIP_GATE(808219D0, &lit_7027); +COMPILER_STRIP_GATE(0x808219D0, &lit_7027); #pragma pop /* 808219D4-808219D8 000128 0004+00 0/1 0/0 0/0 .rodata @7028 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7028 = 37578.0f; -COMPILER_STRIP_GATE(808219D4, &lit_7028); +COMPILER_STRIP_GATE(0x808219D4, &lit_7028); #pragma pop /* 808219D8-808219DC 00012C 0004+00 0/1 0/0 0/0 .rodata @7029 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7029 = -5.0f; -COMPILER_STRIP_GATE(808219D8, &lit_7029); +COMPILER_STRIP_GATE(0x808219D8, &lit_7029); #pragma pop /* 8081D594-8081DBD0 007574 063C+00 1/1 0/0 0/0 .text executeDeath__9daE_YMB_cFv */ @@ -2346,42 +2352,42 @@ asm void daE_YMB_c::calcLakeDemoPlayerPos() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7205 = -300.0f; -COMPILER_STRIP_GATE(808219DC, &lit_7205); +COMPILER_STRIP_GATE(0x808219DC, &lit_7205); #pragma pop /* 808219E0-808219E4 000134 0004+00 0/1 0/0 0/0 .rodata @7206 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7206 = -81000.0f; -COMPILER_STRIP_GATE(808219E0, &lit_7206); +COMPILER_STRIP_GATE(0x808219E0, &lit_7206); #pragma pop /* 808219E4-808219E8 000138 0004+00 0/1 0/0 0/0 .rodata @7207 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7207 = -17000.0f; -COMPILER_STRIP_GATE(808219E4, &lit_7207); +COMPILER_STRIP_GATE(0x808219E4, &lit_7207); #pragma pop /* 808219E8-808219EC 00013C 0004+00 0/1 0/0 0/0 .rodata @7208 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7208 = 33000.0f; -COMPILER_STRIP_GATE(808219E8, &lit_7208); +COMPILER_STRIP_GATE(0x808219E8, &lit_7208); #pragma pop /* 808219EC-808219F0 000140 0004+00 0/1 0/0 0/0 .rodata @7209 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7209 = -700.0f; -COMPILER_STRIP_GATE(808219EC, &lit_7209); +COMPILER_STRIP_GATE(0x808219EC, &lit_7209); #pragma pop /* 808219F0-808219F4 000144 0004+00 0/1 0/0 0/0 .rodata @7210 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7210 = 3500.0f; -COMPILER_STRIP_GATE(808219F0, &lit_7210); +COMPILER_STRIP_GATE(0x808219F0, &lit_7210); #pragma pop /* 8081DE84-8081E5B4 007E64 0730+00 1/1 0/0 0/0 .text executeLakeDemo__9daE_YMB_cFv */ @@ -2430,182 +2436,182 @@ SECTION_RODATA static u8 const lit_7228[6 + 2 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(808219F4, &lit_7228); +COMPILER_STRIP_GATE(0x808219F4, &lit_7228); #pragma pop /* 808219FC-80821A00 000150 0004+00 0/0 0/0 0/0 .rodata @7482 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7482 = -89100.0f; -COMPILER_STRIP_GATE(808219FC, &lit_7482); +COMPILER_STRIP_GATE(0x808219FC, &lit_7482); #pragma pop /* 80821A00-80821A04 000154 0004+00 0/0 0/0 0/0 .rodata @7483 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7483 = 39410.0f; -COMPILER_STRIP_GATE(80821A00, &lit_7483); +COMPILER_STRIP_GATE(0x80821A00, &lit_7483); #pragma pop /* 80821A04-80821A08 000158 0004+00 0/0 0/0 0/0 .rodata @7484 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7484 = -88463.0f; -COMPILER_STRIP_GATE(80821A04, &lit_7484); +COMPILER_STRIP_GATE(0x80821A04, &lit_7484); #pragma pop /* 80821A08-80821A0C 00015C 0004+00 0/0 0/0 0/0 .rodata @7485 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7485 = 38868.0f; -COMPILER_STRIP_GATE(80821A08, &lit_7485); +COMPILER_STRIP_GATE(0x80821A08, &lit_7485); #pragma pop /* 80821A0C-80821A10 000160 0004+00 0/0 0/0 0/0 .rodata @7486 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7486 = -88660.0f; -COMPILER_STRIP_GATE(80821A0C, &lit_7486); +COMPILER_STRIP_GATE(0x80821A0C, &lit_7486); #pragma pop /* 80821A10-80821A14 000164 0004+00 0/0 0/0 0/0 .rodata @7487 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7487 = -18918.0f; -COMPILER_STRIP_GATE(80821A10, &lit_7487); +COMPILER_STRIP_GATE(0x80821A10, &lit_7487); #pragma pop /* 80821A14-80821A18 000168 0004+00 0/0 0/0 0/0 .rodata @7488 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7488 = 38981.0f; -COMPILER_STRIP_GATE(80821A14, &lit_7488); +COMPILER_STRIP_GATE(0x80821A14, &lit_7488); #pragma pop /* 80821A18-80821A1C 00016C 0004+00 0/0 0/0 0/0 .rodata @7489 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7489 = -89144.0f; -COMPILER_STRIP_GATE(80821A18, &lit_7489); +COMPILER_STRIP_GATE(0x80821A18, &lit_7489); #pragma pop /* 80821A1C-80821A20 000170 0004+00 0/0 0/0 0/0 .rodata @7490 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7490 = -18551.0f; -COMPILER_STRIP_GATE(80821A1C, &lit_7490); +COMPILER_STRIP_GATE(0x80821A1C, &lit_7490); #pragma pop /* 80821A20-80821A24 000174 0004+00 0/0 0/0 0/0 .rodata @7491 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7491 = 39753.0f; -COMPILER_STRIP_GATE(80821A20, &lit_7491); +COMPILER_STRIP_GATE(0x80821A20, &lit_7491); #pragma pop /* 80821A24-80821A28 000178 0004+00 0/0 0/0 0/0 .rodata @7492 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7492 = 120.0f; -COMPILER_STRIP_GATE(80821A24, &lit_7492); +COMPILER_STRIP_GATE(0x80821A24, &lit_7492); #pragma pop /* 80821A28-80821A2C 00017C 0004+00 0/0 0/0 0/0 .rodata @7493 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7493 = 1.5f; -COMPILER_STRIP_GATE(80821A28, &lit_7493); +COMPILER_STRIP_GATE(0x80821A28, &lit_7493); #pragma pop /* 80821A2C-80821A30 000180 0004+00 0/0 0/0 0/0 .rodata @7494 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7494 = -88800.0f; -COMPILER_STRIP_GATE(80821A2C, &lit_7494); +COMPILER_STRIP_GATE(0x80821A2C, &lit_7494); #pragma pop /* 80821A30-80821A34 000184 0004+00 0/0 0/0 0/0 .rodata @7495 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7495 = -18266.0f; -COMPILER_STRIP_GATE(80821A30, &lit_7495); +COMPILER_STRIP_GATE(0x80821A30, &lit_7495); #pragma pop /* 80821A34-80821A38 000188 0004+00 0/0 0/0 0/0 .rodata @7496 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7496 = 39412.0f; -COMPILER_STRIP_GATE(80821A34, &lit_7496); +COMPILER_STRIP_GATE(0x80821A34, &lit_7496); #pragma pop /* 80821A38-80821A3C 00018C 0004+00 0/0 0/0 0/0 .rodata @7497 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7497 = 17.0f / 10.0f; -COMPILER_STRIP_GATE(80821A38, &lit_7497); +COMPILER_STRIP_GATE(0x80821A38, &lit_7497); #pragma pop /* 80821A3C-80821A40 000190 0004+00 0/0 0/0 0/0 .rodata @7498 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7498 = 11.0f / 5.0f; -COMPILER_STRIP_GATE(80821A3C, &lit_7498); +COMPILER_STRIP_GATE(0x80821A3C, &lit_7498); #pragma pop /* 80821A40-80821A44 000194 0004+00 0/0 0/0 0/0 .rodata @7499 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7499 = -89000.0f; -COMPILER_STRIP_GATE(80821A40, &lit_7499); +COMPILER_STRIP_GATE(0x80821A40, &lit_7499); #pragma pop /* 80821A44-80821A48 000198 0004+00 0/0 0/0 0/0 .rodata @7500 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7500 = -18583.0f; -COMPILER_STRIP_GATE(80821A44, &lit_7500); +COMPILER_STRIP_GATE(0x80821A44, &lit_7500); #pragma pop /* 80821A48-80821A4C 00019C 0004+00 0/0 0/0 0/0 .rodata @7501 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7501 = 39350.0f; -COMPILER_STRIP_GATE(80821A48, &lit_7501); +COMPILER_STRIP_GATE(0x80821A48, &lit_7501); #pragma pop /* 80821A4C-80821A50 0001A0 0004+00 0/0 0/0 0/0 .rodata @7502 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7502 = -89260.0f; -COMPILER_STRIP_GATE(80821A4C, &lit_7502); +COMPILER_STRIP_GATE(0x80821A4C, &lit_7502); #pragma pop /* 80821A50-80821A54 0001A4 0004+00 0/0 0/0 0/0 .rodata @7503 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7503 = -18650.0f; -COMPILER_STRIP_GATE(80821A50, &lit_7503); +COMPILER_STRIP_GATE(0x80821A50, &lit_7503); #pragma pop /* 80821A54-80821A58 0001A8 0004+00 0/0 0/0 0/0 .rodata @7504 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7504 = 39500.0f; -COMPILER_STRIP_GATE(80821A54, &lit_7504); +COMPILER_STRIP_GATE(0x80821A54, &lit_7504); #pragma pop /* 80821A58-80821A5C 0001AC 0004+00 0/1 0/0 0/0 .rodata @7738 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7738 = -200.0f; -COMPILER_STRIP_GATE(80821A58, &lit_7738); +COMPILER_STRIP_GATE(0x80821A58, &lit_7738); #pragma pop /* 80821A5C-80821A60 0001B0 0004+00 0/1 0/0 0/0 .rodata @7739 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7739 = 600.0f; -COMPILER_STRIP_GATE(80821A5C, &lit_7739); +COMPILER_STRIP_GATE(0x80821A5C, &lit_7739); #pragma pop /* 8081F2E0-8081FAC8 0092C0 07E8+00 1/1 0/0 0/0 .text executeBattleDemo__9daE_YMB_cFv */ @@ -2633,14 +2639,14 @@ asm void daE_YMB_c::action() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7903 = -250.0f; -COMPILER_STRIP_GATE(80821A60, &lit_7903); +COMPILER_STRIP_GATE(0x80821A60, &lit_7903); #pragma pop /* 80821A64-80821A68 0001B8 0004+00 0/1 0/0 0/0 .rodata @7904 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7904 = 250.0f; -COMPILER_STRIP_GATE(80821A64, &lit_7904); +COMPILER_STRIP_GATE(0x80821A64, &lit_7904); #pragma pop /* 8081FF88-808200A0 009F68 0118+00 1/1 0/0 0/0 .text mtx_set__9daE_YMB_cFv */ @@ -2658,7 +2664,7 @@ asm void daE_YMB_c::mtx_set() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7922 = -120.0f; -COMPILER_STRIP_GATE(80821A68, &lit_7922); +COMPILER_STRIP_GATE(0x80821A68, &lit_7922); #pragma pop /* 808200A0-80820128 00A080 0088+00 3/3 0/0 0/0 .text getBellyBitePos__9daE_YMB_cFP4cXyz @@ -2697,21 +2703,21 @@ asm void daE_YMB_c::setAttentionPos() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8122 = 180.0f; -COMPILER_STRIP_GATE(80821A6C, &lit_8122); +COMPILER_STRIP_GATE(0x80821A6C, &lit_8122); #pragma pop /* 80821A70-80821A74 0001C4 0004+00 0/1 0/0 0/0 .rodata @8123 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8123 = 240.0f; -COMPILER_STRIP_GATE(80821A70, &lit_8123); +COMPILER_STRIP_GATE(0x80821A70, &lit_8123); #pragma pop /* 80821A74-80821A78 0001C8 0004+00 0/1 0/0 0/0 .rodata @8124 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8124 = 360.0f; -COMPILER_STRIP_GATE(80821A74, &lit_8124); +COMPILER_STRIP_GATE(0x80821A74, &lit_8124); #pragma pop /* 80820668-808207AC 00A648 0144+00 1/1 0/0 0/0 .text cc_set__9daE_YMB_cFv */ @@ -2729,14 +2735,14 @@ asm void daE_YMB_c::cc_set() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8180 = 8.0f; -COMPILER_STRIP_GATE(80821A78, &lit_8180); +COMPILER_STRIP_GATE(0x80821A78, &lit_8180); #pragma pop /* 80821A7C-80821A80 0001D0 0004+00 0/1 0/0 0/0 .rodata @8181 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8181 = 6.0f; -COMPILER_STRIP_GATE(80821A7C, &lit_8181); +COMPILER_STRIP_GATE(0x80821A7C, &lit_8181); #pragma pop /* 808207AC-80820A18 00A78C 026C+00 1/1 0/0 0/0 .text execute__9daE_YMB_cFv */ @@ -2819,7 +2825,13 @@ static asm void useHeapInit(fopAc_ac_c* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8436 = -400.0f; -COMPILER_STRIP_GATE(80821A80, &lit_8436); +COMPILER_STRIP_GATE(0x80821A80, &lit_8436); +#pragma pop + +/* 80821B04-80821B04 000258 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80821B09 = "E_ymb"; #pragma pop /* 80820DD0-808211BC 00ADB0 03EC+00 1/1 0/0 0/0 .text create__9daE_YMB_cFv */ @@ -2917,224 +2929,224 @@ asm daE_YMB_HIO_c::~daE_YMB_HIO_c() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8657 = -88457.0f; -COMPILER_STRIP_GATE(80821A84, &lit_8657); +COMPILER_STRIP_GATE(0x80821A84, &lit_8657); #pragma pop /* 80821A88-80821A8C 0001DC 0004+00 0/1 0/0 0/0 .rodata @8658 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8658 = -18786.0f; -COMPILER_STRIP_GATE(80821A88, &lit_8658); +COMPILER_STRIP_GATE(0x80821A88, &lit_8658); #pragma pop /* 80821A8C-80821A90 0001E0 0004+00 0/1 0/0 0/0 .rodata @8659 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8659 = 42166.0f; -COMPILER_STRIP_GATE(80821A8C, &lit_8659); +COMPILER_STRIP_GATE(0x80821A8C, &lit_8659); #pragma pop /* 80821A90-80821A94 0001E4 0004+00 0/1 0/0 0/0 .rodata @8660 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8660 = -89307.0f; -COMPILER_STRIP_GATE(80821A90, &lit_8660); +COMPILER_STRIP_GATE(0x80821A90, &lit_8660); #pragma pop /* 80821A94-80821A98 0001E8 0004+00 0/1 0/0 0/0 .rodata @8661 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8661 = 41366.0f; -COMPILER_STRIP_GATE(80821A94, &lit_8661); +COMPILER_STRIP_GATE(0x80821A94, &lit_8661); #pragma pop /* 80821A98-80821A9C 0001EC 0004+00 0/1 0/0 0/0 .rodata @8662 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8662 = -89389.0f; -COMPILER_STRIP_GATE(80821A98, &lit_8662); +COMPILER_STRIP_GATE(0x80821A98, &lit_8662); #pragma pop /* 80821A9C-80821AA0 0001F0 0004+00 0/1 0/0 0/0 .rodata @8663 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8663 = -18785.0f; -COMPILER_STRIP_GATE(80821A9C, &lit_8663); +COMPILER_STRIP_GATE(0x80821A9C, &lit_8663); #pragma pop /* 80821AA0-80821AA4 0001F4 0004+00 0/1 0/0 0/0 .rodata @8664 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8664 = 37267.0f; -COMPILER_STRIP_GATE(80821AA0, &lit_8664); +COMPILER_STRIP_GATE(0x80821AA0, &lit_8664); #pragma pop /* 80821AA4-80821AA8 0001F8 0004+00 0/1 0/0 0/0 .rodata @8665 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8665 = -88442.0f; -COMPILER_STRIP_GATE(80821AA4, &lit_8665); +COMPILER_STRIP_GATE(0x80821AA4, &lit_8665); #pragma pop /* 80821AA8-80821AAC 0001FC 0004+00 0/1 0/0 0/0 .rodata @8666 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8666 = -18753.0f; -COMPILER_STRIP_GATE(80821AA8, &lit_8666); +COMPILER_STRIP_GATE(0x80821AA8, &lit_8666); #pragma pop /* 80821AAC-80821AB0 000200 0004+00 0/1 0/0 0/0 .rodata @8667 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8667 = 38460.0f; -COMPILER_STRIP_GATE(80821AAC, &lit_8667); +COMPILER_STRIP_GATE(0x80821AAC, &lit_8667); #pragma pop /* 80821AB0-80821AB4 000204 0004+00 0/1 0/0 0/0 .rodata @8668 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8668 = -87864.0f; -COMPILER_STRIP_GATE(80821AB0, &lit_8668); +COMPILER_STRIP_GATE(0x80821AB0, &lit_8668); #pragma pop /* 80821AB4-80821AB8 000208 0004+00 0/1 0/0 0/0 .rodata @8669 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8669 = 37112.0f; -COMPILER_STRIP_GATE(80821AB4, &lit_8669); +COMPILER_STRIP_GATE(0x80821AB4, &lit_8669); #pragma pop /* 80821AB8-80821ABC 00020C 0004+00 0/1 0/0 0/0 .rodata @8670 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8670 = -87639.0f; -COMPILER_STRIP_GATE(80821AB8, &lit_8670); +COMPILER_STRIP_GATE(0x80821AB8, &lit_8670); #pragma pop /* 80821ABC-80821AC0 000210 0004+00 0/1 0/0 0/0 .rodata @8671 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8671 = -18764.0f; -COMPILER_STRIP_GATE(80821ABC, &lit_8671); +COMPILER_STRIP_GATE(0x80821ABC, &lit_8671); #pragma pop /* 80821AC0-80821AC4 000214 0004+00 0/1 0/0 0/0 .rodata @8672 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8672 = 41016.0f; -COMPILER_STRIP_GATE(80821AC0, &lit_8672); +COMPILER_STRIP_GATE(0x80821AC0, &lit_8672); #pragma pop /* 80821AC4-80821AC8 000218 0004+00 0/1 0/0 0/0 .rodata @8673 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8673 = -88977.0f; -COMPILER_STRIP_GATE(80821AC4, &lit_8673); +COMPILER_STRIP_GATE(0x80821AC4, &lit_8673); #pragma pop /* 80821AC8-80821ACC 00021C 0004+00 0/1 0/0 0/0 .rodata @8674 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8674 = 40658.0f; -COMPILER_STRIP_GATE(80821AC8, &lit_8674); +COMPILER_STRIP_GATE(0x80821AC8, &lit_8674); #pragma pop /* 80821ACC-80821AD0 000220 0004+00 0/1 0/0 0/0 .rodata @8675 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8675 = -86467.0f; -COMPILER_STRIP_GATE(80821ACC, &lit_8675); +COMPILER_STRIP_GATE(0x80821ACC, &lit_8675); #pragma pop /* 80821AD0-80821AD4 000224 0004+00 0/1 0/0 0/0 .rodata @8676 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8676 = -18758.0f; -COMPILER_STRIP_GATE(80821AD0, &lit_8676); +COMPILER_STRIP_GATE(0x80821AD0, &lit_8676); #pragma pop /* 80821AD4-80821AD8 000228 0004+00 0/1 0/0 0/0 .rodata @8677 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8677 = 39379.0f; -COMPILER_STRIP_GATE(80821AD4, &lit_8677); +COMPILER_STRIP_GATE(0x80821AD4, &lit_8677); #pragma pop /* 80821AD8-80821ADC 00022C 0004+00 0/1 0/0 0/0 .rodata @8678 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8678 = -87372.0f; -COMPILER_STRIP_GATE(80821AD8, &lit_8678); +COMPILER_STRIP_GATE(0x80821AD8, &lit_8678); #pragma pop /* 80821ADC-80821AE0 000230 0004+00 0/1 0/0 0/0 .rodata @8679 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8679 = 40362.0f; -COMPILER_STRIP_GATE(80821ADC, &lit_8679); +COMPILER_STRIP_GATE(0x80821ADC, &lit_8679); #pragma pop /* 80821AE0-80821AE4 000234 0004+00 0/1 0/0 0/0 .rodata @8680 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8680 = -86980.0f; -COMPILER_STRIP_GATE(80821AE0, &lit_8680); +COMPILER_STRIP_GATE(0x80821AE0, &lit_8680); #pragma pop /* 80821AE4-80821AE8 000238 0004+00 0/1 0/0 0/0 .rodata @8681 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8681 = 37583.0f; -COMPILER_STRIP_GATE(80821AE4, &lit_8681); +COMPILER_STRIP_GATE(0x80821AE4, &lit_8681); #pragma pop /* 80821AE8-80821AEC 00023C 0004+00 0/1 0/0 0/0 .rodata @8682 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8682 = -90195.0f; -COMPILER_STRIP_GATE(80821AE8, &lit_8682); +COMPILER_STRIP_GATE(0x80821AE8, &lit_8682); #pragma pop /* 80821AEC-80821AF0 000240 0004+00 0/1 0/0 0/0 .rodata @8683 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8683 = -18754.0f; -COMPILER_STRIP_GATE(80821AEC, &lit_8683); +COMPILER_STRIP_GATE(0x80821AEC, &lit_8683); #pragma pop /* 80821AF0-80821AF4 000244 0004+00 0/1 0/0 0/0 .rodata @8684 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8684 = 39893.0f; -COMPILER_STRIP_GATE(80821AF0, &lit_8684); +COMPILER_STRIP_GATE(0x80821AF0, &lit_8684); #pragma pop /* 80821AF4-80821AF8 000248 0004+00 0/1 0/0 0/0 .rodata @8685 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8685 = -88342.0f; -COMPILER_STRIP_GATE(80821AF4, &lit_8685); +COMPILER_STRIP_GATE(0x80821AF4, &lit_8685); #pragma pop /* 80821AF8-80821AFC 00024C 0004+00 0/1 0/0 0/0 .rodata @8686 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8686 = 39785.0f; -COMPILER_STRIP_GATE(80821AF8, &lit_8686); +COMPILER_STRIP_GATE(0x80821AF8, &lit_8686); #pragma pop /* 80821AFC-80821B00 000250 0004+00 0/1 0/0 0/0 .rodata @8687 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8687 = -90200.0f; -COMPILER_STRIP_GATE(80821AFC, &lit_8687); +COMPILER_STRIP_GATE(0x80821AFC, &lit_8687); #pragma pop /* 80821B00-80821B04 000254 0004+00 0/1 0/0 0/0 .rodata @8688 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8688 = 38100.0f; -COMPILER_STRIP_GATE(80821B00, &lit_8688); +COMPILER_STRIP_GATE(0x80821B00, &lit_8688); #pragma pop /* 808214A8-8082187C 00B488 03D4+00 0/0 1/0 0/0 .text __sinit_d_a_e_ymb_cpp */ @@ -3149,7 +3161,7 @@ asm void __sinit_d_a_e_ymb_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_808214A8 = (void*)__sinit_d_a_e_ymb_cpp; +REGISTER_CTORS(0x808214A8, __sinit_d_a_e_ymb_cpp); #pragma pop /* 8082187C-80821898 00B85C 001C+00 1/1 0/0 0/0 .text setPos__11daObjDrop_cF4cXyz */ @@ -3334,10 +3346,4 @@ static u8 data_8082210C[4]; static u8 data_80822110[4]; #pragma pop -/* 80821B04-80821B0F 000258 000B+00 5/5 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80821B04 = "E_YB"; -SECTION_DEAD static char const* const stringBase_80821B09 = "E_ymb"; -#pragma pop +/* 80821B04-80821B04 000258 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/e/d_a_e_yr/d_a_e_yr.cpp b/rel/d/a/e/d_a_e_yr/d_a_e_yr.cpp index 38df4485e04..2c0b3f7bf9b 100644 --- a/rel/d/a/e/d_a_e_yr/d_a_e_yr.cpp +++ b/rel/d/a/e/d_a_e_yr/d_a_e_yr.cpp @@ -21,16 +21,16 @@ struct mDoHIO_entry_c { /* 80828394 */ ~mDoHIO_entry_c(); }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; - struct J3DAnmTransform {}; +struct J3DModelData {}; + +struct Z2Creature {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -93,12 +93,12 @@ struct dRes_control_c { struct dPa_levelEcallBack {}; -struct _GXColor {}; - struct csXyz { /* 80267404 */ void operator+(csXyz&); }; +struct _GXColor {}; + struct dPa_control_c { struct level_c { /* 8004B918 */ void getEmitter(u32); @@ -450,7 +450,7 @@ static asm void nodeCallBack(J3DJoint* param_0, int param_1) { /* ############################################################################################## */ /* 80828850-80828854 000000 0004+00 20/20 0/0 0/0 .rodata @3902 */ SECTION_RODATA static f32 const lit_3902 = 100.0f; -COMPILER_STRIP_GATE(80828850, &lit_3902); +COMPILER_STRIP_GATE(0x80828850, &lit_3902); /* 80828854-80828858 000004 0004+00 1/16 0/0 0/0 .rodata @3903 */ SECTION_RODATA static u8 const lit_3903[4] = { @@ -459,7 +459,7 @@ SECTION_RODATA static u8 const lit_3903[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80828854, &lit_3903); +COMPILER_STRIP_GATE(0x80828854, &lit_3903); /* 80828858-80828860 000008 0004+04 1/16 0/0 0/0 .rodata @3904 */ SECTION_RODATA static f32 const lit_3904[1 + 1 /* padding */] = { @@ -467,7 +467,7 @@ SECTION_RODATA static f32 const lit_3904[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80828858, &lit_3904); +COMPILER_STRIP_GATE(0x80828858, &lit_3904); /* 80828860-80828868 000010 0008+00 0/3 0/0 0/0 .rodata @3905 */ #pragma push @@ -475,7 +475,7 @@ COMPILER_STRIP_GATE(80828858, &lit_3904); SECTION_RODATA static u8 const lit_3905[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80828860, &lit_3905); +COMPILER_STRIP_GATE(0x80828860, &lit_3905); #pragma pop /* 80828868-80828870 000018 0008+00 0/3 0/0 0/0 .rodata @3906 */ @@ -484,7 +484,7 @@ COMPILER_STRIP_GATE(80828860, &lit_3905); SECTION_RODATA static u8 const lit_3906[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80828868, &lit_3906); +COMPILER_STRIP_GATE(0x80828868, &lit_3906); #pragma pop /* 80828870-80828878 000020 0008+00 0/3 0/0 0/0 .rodata @3907 */ @@ -493,35 +493,35 @@ COMPILER_STRIP_GATE(80828868, &lit_3906); SECTION_RODATA static u8 const lit_3907[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80828870, &lit_3907); +COMPILER_STRIP_GATE(0x80828870, &lit_3907); #pragma pop /* 80828878-8082887C 000028 0004+00 0/2 0/0 0/0 .rodata @3908 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3908 = 1.0f / 100.0f; -COMPILER_STRIP_GATE(80828878, &lit_3908); +COMPILER_STRIP_GATE(0x80828878, &lit_3908); #pragma pop /* 8082887C-80828880 00002C 0004+00 0/1 0/0 0/0 .rodata @4099 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4099 = 28.0f; -COMPILER_STRIP_GATE(8082887C, &lit_4099); +COMPILER_STRIP_GATE(0x8082887C, &lit_4099); #pragma pop /* 80828880-80828884 000030 0004+00 0/1 0/0 0/0 .rodata @4100 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4100 = 88.0f; -COMPILER_STRIP_GATE(80828880, &lit_4100); +COMPILER_STRIP_GATE(0x80828880, &lit_4100); #pragma pop /* 80828884-80828888 000034 0004+00 0/1 0/0 0/0 .rodata @4101 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4101 = 4.0f; -COMPILER_STRIP_GATE(80828884, &lit_4101); +COMPILER_STRIP_GATE(0x80828884, &lit_4101); #pragma pop /* 80828888-80828890 000038 0004+04 1/2 0/0 0/0 .rodata @4102 */ @@ -530,7 +530,7 @@ SECTION_RODATA static f32 const lit_4102[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80828888, &lit_4102); +COMPILER_STRIP_GATE(0x80828888, &lit_4102); /* 808225C0-80822790 0004A0 01D0+00 1/1 0/0 0/0 .text yr_disappear__FP10e_yr_class */ #pragma push @@ -542,6 +542,13 @@ static asm void yr_disappear(e_yr_class* param_0) { } #pragma pop +/* ############################################################################################## */ +/* 808289A8-808289A8 000158 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_808289A8 = "E_Yr"; +#pragma pop + /* 80822790-80822848 000670 00B8+00 8/8 0/0 0/0 .text anm_init__FP10e_yr_classifUcf */ #pragma push #pragma optimization_level 0 @@ -577,7 +584,7 @@ static asm void e_yr_player_bg_check(e_yr_class* param_0) { SECTION_RODATA static u8 const lit_4221[8] = { 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80828890, &lit_4221); +COMPILER_STRIP_GATE(0x80828890, &lit_4221); /* 80828DB0-80828DBC 000008 000C+00 1/1 0/0 0/0 .bss @3920 */ static u8 lit_3920[12]; @@ -600,7 +607,7 @@ static asm void e_yr_player_view_check(e_yr_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4283 = 50.0f; -COMPILER_STRIP_GATE(80828898, &lit_4283); +COMPILER_STRIP_GATE(0x80828898, &lit_4283); #pragma pop /* 80828E34-80828F33 00008C 00FF+00 1/1 0/0 0/0 .bss check_index$4227 */ @@ -619,7 +626,7 @@ static asm void path_check(e_yr_class* param_0) { /* ############################################################################################## */ /* 8082889C-808288A0 00004C 0004+00 1/6 0/0 0/0 .rodata @4295 */ SECTION_RODATA static f32 const lit_4295 = 20.0f; -COMPILER_STRIP_GATE(8082889C, &lit_4295); +COMPILER_STRIP_GATE(0x8082889C, &lit_4295); /* 80822D4C-80822DB8 000C2C 006C+00 2/2 0/0 0/0 .text pl_horse_check__FP10e_yr_class */ #pragma push @@ -636,21 +643,21 @@ static asm void pl_horse_check(e_yr_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4320 = 150.0f; -COMPILER_STRIP_GATE(808288A0, &lit_4320); +COMPILER_STRIP_GATE(0x808288A0, &lit_4320); #pragma pop /* 808288A4-808288A8 000054 0004+00 0/1 0/0 0/0 .rodata @4321 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4321 = 800.0f; -COMPILER_STRIP_GATE(808288A4, &lit_4321); +COMPILER_STRIP_GATE(0x808288A4, &lit_4321); #pragma pop /* 808288A8-808288AC 000058 0004+00 0/2 0/0 0/0 .rodata @4322 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4322 = 40.0f; -COMPILER_STRIP_GATE(808288A8, &lit_4322); +COMPILER_STRIP_GATE(0x808288A8, &lit_4322); #pragma pop /* 80822DB8-80822E48 000C98 0090+00 1/1 0/0 0/0 .text daE_Yr_shadowDraw__FP10e_yr_class @@ -679,21 +686,21 @@ static asm void daE_Yr_Draw(e_yr_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4379 = 0.5f; -COMPILER_STRIP_GATE(808288AC, &lit_4379); +COMPILER_STRIP_GATE(0x808288AC, &lit_4379); #pragma pop /* 808288B0-808288B4 000060 0004+00 0/1 0/0 0/0 .rodata @4380 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4380 = 1.0f / 25.0f; -COMPILER_STRIP_GATE(808288B0, &lit_4380); +COMPILER_STRIP_GATE(0x808288B0, &lit_4380); #pragma pop /* 808288B4-808288B8 000064 0004+00 0/7 0/0 0/0 .rodata @4381 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4381 = 5.0f; -COMPILER_STRIP_GATE(808288B4, &lit_4381); +COMPILER_STRIP_GATE(0x808288B4, &lit_4381); #pragma pop /* 80822F0C-80823148 000DEC 023C+00 6/6 0/0 0/0 .text e_yr_pos_move__FP10e_yr_class */ @@ -711,21 +718,21 @@ static asm void e_yr_pos_move(e_yr_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4399 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(808288B8, &lit_4399); +COMPILER_STRIP_GATE(0x808288B8, &lit_4399); #pragma pop /* 808288BC-808288C0 00006C 0004+00 0/2 0/0 0/0 .rodata @4400 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4400 = 3.0f; -COMPILER_STRIP_GATE(808288BC, &lit_4400); +COMPILER_STRIP_GATE(0x808288BC, &lit_4400); #pragma pop /* 808288C0-808288C4 000070 0004+00 0/1 0/0 0/0 .rodata @4401 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4401 = -0.5f; -COMPILER_STRIP_GATE(808288C0, &lit_4401); +COMPILER_STRIP_GATE(0x808288C0, &lit_4401); #pragma pop /* 80823148-80823284 001028 013C+00 1/1 0/0 0/0 .text e_yr_ground_pos_move__FP10e_yr_class */ @@ -743,28 +750,28 @@ static asm void e_yr_ground_pos_move(e_yr_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4542 = 12.0f; -COMPILER_STRIP_GATE(808288C4, &lit_4542); +COMPILER_STRIP_GATE(0x808288C4, &lit_4542); #pragma pop /* 808288C8-808288CC 000078 0004+00 0/2 0/0 0/0 .rodata @4543 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4543 = 25.0f; -COMPILER_STRIP_GATE(808288C8, &lit_4543); +COMPILER_STRIP_GATE(0x808288C8, &lit_4543); #pragma pop /* 808288CC-808288D0 00007C 0004+00 0/2 0/0 0/0 .rodata @4544 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4544 = 2.0f; -COMPILER_STRIP_GATE(808288CC, &lit_4544); +COMPILER_STRIP_GATE(0x808288CC, &lit_4544); #pragma pop /* 808288D0-808288D4 000080 0004+00 0/5 0/0 0/0 .rodata @4545 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4545 = 30.0f; -COMPILER_STRIP_GATE(808288D0, &lit_4545); +COMPILER_STRIP_GATE(0x808288D0, &lit_4545); #pragma pop /* 808289B4-808289C0 000000 000C+00 3/3 0/0 0/0 .data cNullVec__6Z2Calc */ @@ -863,56 +870,56 @@ static asm void e_yr_path_move(e_yr_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4546 = 500000.0f; -COMPILER_STRIP_GATE(808288D4, &lit_4546); +COMPILER_STRIP_GATE(0x808288D4, &lit_4546); #pragma pop /* 808288D8-808288DC 000088 0004+00 0/1 0/0 0/0 .rodata @4547 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4547 = 5000.0f; -COMPILER_STRIP_GATE(808288D8, &lit_4547); +COMPILER_STRIP_GATE(0x808288D8, &lit_4547); #pragma pop /* 808288DC-808288E0 00008C 0004+00 0/4 0/0 0/0 .rodata @4548 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4548 = 300.0f; -COMPILER_STRIP_GATE(808288DC, &lit_4548); +COMPILER_STRIP_GATE(0x808288DC, &lit_4548); #pragma pop /* 808288E0-808288E4 000090 0004+00 0/0 0/0 0/0 .rodata @4549 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4549 = 4.0f / 5.0f; -COMPILER_STRIP_GATE(808288E0, &lit_4549); +COMPILER_STRIP_GATE(0x808288E0, &lit_4549); #pragma pop /* 808288E4-808288E8 000094 0004+00 0/3 0/0 0/0 .rodata @4550 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4550 = 1000.0f; -COMPILER_STRIP_GATE(808288E4, &lit_4550); +COMPILER_STRIP_GATE(0x808288E4, &lit_4550); #pragma pop /* 808288E8-808288EC 000098 0004+00 0/5 0/0 0/0 .rodata @4604 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4604 = 200.0f; -COMPILER_STRIP_GATE(808288E8, &lit_4604); +COMPILER_STRIP_GATE(0x808288E8, &lit_4604); #pragma pop /* 808288EC-808288F0 00009C 0004+00 0/3 0/0 0/0 .rodata @4605 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4605 = 60.0f; -COMPILER_STRIP_GATE(808288EC, &lit_4605); +COMPILER_STRIP_GATE(0x808288EC, &lit_4605); #pragma pop /* 808288F0-808288F4 0000A0 0004+00 0/2 0/0 0/0 .rodata @4606 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4606 = 500.0f; -COMPILER_STRIP_GATE(808288F0, &lit_4606); +COMPILER_STRIP_GATE(0x808288F0, &lit_4606); #pragma pop /* 808239F8-80823D3C 0018D8 0344+00 1/1 0/0 0/0 .text e_yr_auto_move__FP10e_yr_class */ @@ -930,91 +937,91 @@ static asm void e_yr_auto_move(e_yr_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4933 = 10.0f; -COMPILER_STRIP_GATE(808288F4, &lit_4933); +COMPILER_STRIP_GATE(0x808288F4, &lit_4933); #pragma pop /* 808288F8-808288FC 0000A8 0004+00 0/3 0/0 0/0 .rodata @4934 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4934 = 400.0f; -COMPILER_STRIP_GATE(808288F8, &lit_4934); +COMPILER_STRIP_GATE(0x808288F8, &lit_4934); #pragma pop /* 808288FC-80828900 0000AC 0004+00 0/2 0/0 0/0 .rodata @4935 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4935 = 2000.0f; -COMPILER_STRIP_GATE(808288FC, &lit_4935); +COMPILER_STRIP_GATE(0x808288FC, &lit_4935); #pragma pop /* 80828900-80828904 0000B0 0004+00 0/0 0/0 0/0 .rodata @4936 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4936 = 1280.0f; -COMPILER_STRIP_GATE(80828900, &lit_4936); +COMPILER_STRIP_GATE(0x80828900, &lit_4936); #pragma pop /* 80828904-80828908 0000B4 0004+00 0/0 0/0 0/0 .rodata @4937 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4937 = 768.0f; -COMPILER_STRIP_GATE(80828904, &lit_4937); +COMPILER_STRIP_GATE(0x80828904, &lit_4937); #pragma pop /* 80828908-8082890C 0000B8 0004+00 0/0 0/0 0/0 .rodata @4938 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4938 = 1.0f / 20.0f; -COMPILER_STRIP_GATE(80828908, &lit_4938); +COMPILER_STRIP_GATE(0x80828908, &lit_4938); #pragma pop /* 8082890C-80828910 0000BC 0004+00 0/0 0/0 0/0 .rodata @4939 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4939 = 7000.0f; -COMPILER_STRIP_GATE(8082890C, &lit_4939); +COMPILER_STRIP_GATE(0x8082890C, &lit_4939); #pragma pop /* 80828910-80828914 0000C0 0004+00 0/1 0/0 0/0 .rodata @4940 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4940 = 250.0f; -COMPILER_STRIP_GATE(80828910, &lit_4940); +COMPILER_STRIP_GATE(0x80828910, &lit_4940); #pragma pop /* 80828914-80828918 0000C4 0004+00 0/1 0/0 0/0 .rodata @4941 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4941 = 600.0f; -COMPILER_STRIP_GATE(80828914, &lit_4941); +COMPILER_STRIP_GATE(0x80828914, &lit_4941); #pragma pop /* 80828918-8082891C 0000C8 0004+00 0/0 0/0 0/0 .rodata @4942 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4942 = 35.0f; -COMPILER_STRIP_GATE(80828918, &lit_4942); +COMPILER_STRIP_GATE(0x80828918, &lit_4942); #pragma pop /* 8082891C-80828920 0000CC 0004+00 0/0 0/0 0/0 .rodata @4943 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4943 = 1350.0f; -COMPILER_STRIP_GATE(8082891C, &lit_4943); +COMPILER_STRIP_GATE(0x8082891C, &lit_4943); #pragma pop /* 80828920-80828924 0000D0 0004+00 0/0 0/0 0/0 .rodata @4944 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4944 = -10.0f; -COMPILER_STRIP_GATE(80828920, &lit_4944); +COMPILER_STRIP_GATE(0x80828920, &lit_4944); #pragma pop /* 80828924-80828928 0000D4 0004+00 0/2 0/0 0/0 .rodata @4945 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4945 = 3000.0f; -COMPILER_STRIP_GATE(80828924, &lit_4945); +COMPILER_STRIP_GATE(0x80828924, &lit_4945); #pragma pop /* 80828928-80828930 0000D8 0004+04 0/1 0/0 0/0 .rodata @4946 */ @@ -1025,7 +1032,7 @@ SECTION_RODATA static f32 const lit_4946[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80828928, &lit_4946); +COMPILER_STRIP_GATE(0x80828928, &lit_4946); #pragma pop /* 80828930-80828938 0000E0 0008+00 0/2 0/0 0/0 .rodata @4949 */ @@ -1034,7 +1041,7 @@ COMPILER_STRIP_GATE(80828928, &lit_4946); SECTION_RODATA static u8 const lit_4949[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80828930, &lit_4949); +COMPILER_STRIP_GATE(0x80828930, &lit_4949); #pragma pop /* 80828A58-80828AE8 -00001 0090+00 1/1 0/0 0/0 .data @4948 */ @@ -1092,49 +1099,49 @@ static asm void e_yr_atack_move(e_yr_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5109 = 6.0f / 5.0f; -COMPILER_STRIP_GATE(80828938, &lit_5109); +COMPILER_STRIP_GATE(0x80828938, &lit_5109); #pragma pop /* 8082893C-80828940 0000EC 0004+00 0/3 0/0 0/0 .rodata @5110 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5110 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(8082893C, &lit_5110); +COMPILER_STRIP_GATE(0x8082893C, &lit_5110); #pragma pop /* 80828940-80828944 0000F0 0004+00 0/3 0/0 0/0 .rodata @5111 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5111 = 70.0f; -COMPILER_STRIP_GATE(80828940, &lit_5111); +COMPILER_STRIP_GATE(0x80828940, &lit_5111); #pragma pop /* 80828944-80828948 0000F4 0004+00 0/1 0/0 0/0 .rodata @5112 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5112 = 180.0f; -COMPILER_STRIP_GATE(80828944, &lit_5112); +COMPILER_STRIP_GATE(0x80828944, &lit_5112); #pragma pop /* 80828948-8082894C 0000F8 0004+00 0/1 0/0 0/0 .rodata @5113 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5113 = 19.0f / 20.0f; -COMPILER_STRIP_GATE(80828948, &lit_5113); +COMPILER_STRIP_GATE(0x80828948, &lit_5113); #pragma pop /* 8082894C-80828950 0000FC 0004+00 0/1 0/0 0/0 .rodata @5114 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5114 = 2.0f / 5.0f; -COMPILER_STRIP_GATE(8082894C, &lit_5114); +COMPILER_STRIP_GATE(0x8082894C, &lit_5114); #pragma pop /* 80828950-80828954 000100 0004+00 0/1 0/0 0/0 .rodata @5115 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5115 = -100.0f; -COMPILER_STRIP_GATE(80828950, &lit_5115); +COMPILER_STRIP_GATE(0x80828950, &lit_5115); #pragma pop /* 80824BBC-80825484 002A9C 08C8+00 1/1 0/0 0/0 .text e_yr_horse_move__FP10e_yr_class */ @@ -1227,42 +1234,42 @@ static asm void e_yr_su_wait_move(e_yr_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5216 = 1.5f; -COMPILER_STRIP_GATE(80828954, &lit_5216); +COMPILER_STRIP_GATE(0x80828954, &lit_5216); #pragma pop /* 80828958-8082895C 000108 0004+00 0/0 0/0 0/0 .rodata @5217 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5217 = 80.0f; -COMPILER_STRIP_GATE(80828958, &lit_5217); +COMPILER_STRIP_GATE(0x80828958, &lit_5217); #pragma pop /* 8082895C-80828960 00010C 0004+00 0/0 0/0 0/0 .rodata @5371 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5371 = -50.0f; -COMPILER_STRIP_GATE(8082895C, &lit_5371); +COMPILER_STRIP_GATE(0x8082895C, &lit_5371); #pragma pop /* 80828960-80828964 000110 0004+00 0/1 0/0 0/0 .rodata @5424 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5424 = -3.0f; -COMPILER_STRIP_GATE(80828960, &lit_5424); +COMPILER_STRIP_GATE(0x80828960, &lit_5424); #pragma pop /* 80828964-80828968 000114 0004+00 0/1 0/0 0/0 .rodata @5425 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5425 = 24.0f / 25.0f; -COMPILER_STRIP_GATE(80828964, &lit_5425); +COMPILER_STRIP_GATE(0x80828964, &lit_5425); #pragma pop /* 80828968-8082896C 000118 0004+00 0/1 0/0 0/0 .rodata @5426 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5426 = -30.0f; -COMPILER_STRIP_GATE(80828968, &lit_5426); +COMPILER_STRIP_GATE(0x80828968, &lit_5426); #pragma pop /* 808260E8-808264F4 003FC8 040C+00 1/1 0/0 0/0 .text e_yr_damage__FP10e_yr_class */ @@ -1290,14 +1297,14 @@ static asm void damage_check(e_yr_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5561 = -1000000000.0f; -COMPILER_STRIP_GATE(8082896C, &lit_5561); +COMPILER_STRIP_GATE(0x8082896C, &lit_5561); #pragma pop /* 80828970-80828974 000120 0004+00 0/1 0/0 0/0 .rodata @5562 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5562 = 75.0f; -COMPILER_STRIP_GATE(80828970, &lit_5562); +COMPILER_STRIP_GATE(0x80828970, &lit_5562); #pragma pop /* 808267C0-80826AFC 0046A0 033C+00 1/1 0/0 0/0 .text ground_angle_set__FP10e_yr_class */ @@ -1315,42 +1322,42 @@ static asm void ground_angle_set(e_yr_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6057 = 27.0f; -COMPILER_STRIP_GATE(80828974, &lit_6057); +COMPILER_STRIP_GATE(0x80828974, &lit_6057); #pragma pop /* 80828978-8082897C 000128 0004+00 0/1 0/0 0/0 .rodata @6058 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6058 = 11.0f; -COMPILER_STRIP_GATE(80828978, &lit_6058); +COMPILER_STRIP_GATE(0x80828978, &lit_6058); #pragma pop /* 8082897C-80828980 00012C 0004+00 0/2 0/0 0/0 .rodata @6059 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6059 = 10000.0f; -COMPILER_STRIP_GATE(8082897C, &lit_6059); +COMPILER_STRIP_GATE(0x8082897C, &lit_6059); #pragma pop /* 80828980-80828984 000130 0004+00 0/1 0/0 0/0 .rodata @6060 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6060 = 200000.0f; -COMPILER_STRIP_GATE(80828980, &lit_6060); +COMPILER_STRIP_GATE(0x80828980, &lit_6060); #pragma pop /* 80828984-80828988 000134 0004+00 0/1 0/0 0/0 .rodata @6061 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6061 = 3.0f / 10.0f; -COMPILER_STRIP_GATE(80828984, &lit_6061); +COMPILER_STRIP_GATE(0x80828984, &lit_6061); #pragma pop /* 80828988-8082898C 000138 0004+00 0/1 0/0 0/0 .rodata @6062 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6062 = 13.0f / 10.0f; -COMPILER_STRIP_GATE(80828988, &lit_6062); +COMPILER_STRIP_GATE(0x80828988, &lit_6062); #pragma pop /* 80828B98-80828BA8 0001E4 0010+00 0/0 0/0 0/0 .data wing_j$5339 */ @@ -1448,14 +1455,20 @@ static asm void useHeapInit(fopAc_ac_c* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6217 = -300.0f; -COMPILER_STRIP_GATE(8082898C, &lit_6217); +COMPILER_STRIP_GATE(0x8082898C, &lit_6217); #pragma pop /* 80828990-80828994 000140 0004+00 0/1 0/0 0/0 .rodata @6218 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6218 = -200.0f; -COMPILER_STRIP_GATE(80828990, &lit_6218); +COMPILER_STRIP_GATE(0x80828990, &lit_6218); +#pragma pop + +/* 808289A8-808289A8 000158 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_808289AD = "E_yr"; #pragma pop /* 80828BD0-80828C10 00021C 0040+00 0/1 0/0 0/0 .data at_sph_src$6145 */ @@ -1663,35 +1676,35 @@ asm cCcD_GStts::~cCcD_GStts() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6390 = 2500.0f; -COMPILER_STRIP_GATE(80828994, &lit_6390); +COMPILER_STRIP_GATE(0x80828994, &lit_6390); #pragma pop /* 80828998-8082899C 000148 0004+00 0/1 0/0 0/0 .rodata @6391 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6391 = 7.0f / 20.0f; -COMPILER_STRIP_GATE(80828998, &lit_6391); +COMPILER_STRIP_GATE(0x80828998, &lit_6391); #pragma pop /* 8082899C-808289A0 00014C 0004+00 0/1 0/0 0/0 .rodata @6392 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6392 = 3.5f; -COMPILER_STRIP_GATE(8082899C, &lit_6392); +COMPILER_STRIP_GATE(0x8082899C, &lit_6392); #pragma pop /* 808289A0-808289A4 000150 0004+00 0/1 0/0 0/0 .rodata @6393 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6393 = 8000.0f; -COMPILER_STRIP_GATE(808289A0, &lit_6393); +COMPILER_STRIP_GATE(0x808289A0, &lit_6393); #pragma pop /* 808289A4-808289A8 000154 0004+00 0/1 0/0 0/0 .rodata @6394 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6394 = 1500.0f; -COMPILER_STRIP_GATE(808289A4, &lit_6394); +COMPILER_STRIP_GATE(0x808289A4, &lit_6394); #pragma pop /* 80828D80-80828D8C 0003CC 000C+00 2/2 0/0 0/0 .data __vt__9e_yrHIO_c */ @@ -1727,7 +1740,7 @@ asm void __sinit_d_a_e_yr_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80828198 = (void*)__sinit_d_a_e_yr_cpp; +REGISTER_CTORS(0x80828198, __sinit_d_a_e_yr_cpp); #pragma pop /* 808282CC-80828338 0061AC 006C+00 2/1 0/0 0/0 .text __dt__9e_yrHIO_cFv */ @@ -1802,10 +1815,4 @@ asm cXyz::~cXyz() { } #pragma pop -/* 808289A8-808289B2 000158 000A+00 4/4 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_808289A8 = "E_Yr"; -SECTION_DEAD static char const* const stringBase_808289AD = "E_yr"; -#pragma pop +/* 808289A8-808289A8 000158 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/e/d_a_e_zh/d_a_e_zh.cpp b/rel/d/a/e/d_a_e_zh/d_a_e_zh.cpp index f5ae3f2a439..028596a41fc 100644 --- a/rel/d/a/e/d_a_e_zh/d_a_e_zh.cpp +++ b/rel/d/a/e/d_a_e_zh/d_a_e_zh.cpp @@ -36,16 +36,16 @@ struct mDoExt_baseAnm { /* 8000D428 */ void play(); }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; - struct J3DAnmTransform {}; +struct J3DModelData {}; + +struct Z2Creature {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -551,20 +551,20 @@ extern "C" void __register_global_object(); /* ############################################################################################## */ /* 8082F208-8082F20C 000000 0004+00 26/26 0/0 0/0 .rodata @3778 */ SECTION_RODATA static f32 const lit_3778 = 1.0f; -COMPILER_STRIP_GATE(8082F208, &lit_3778); +COMPILER_STRIP_GATE(0x8082F208, &lit_3778); /* 8082F20C-8082F210 000004 0004+00 0/9 0/0 0/0 .rodata @3779 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3779 = 10.0f; -COMPILER_STRIP_GATE(8082F20C, &lit_3779); +COMPILER_STRIP_GATE(0x8082F20C, &lit_3779); #pragma pop /* 8082F210-8082F214 000008 0004+00 0/2 0/0 0/0 .rodata @3780 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3780 = 500.0f; -COMPILER_STRIP_GATE(8082F210, &lit_3780); +COMPILER_STRIP_GATE(0x8082F210, &lit_3780); #pragma pop /* 8082F420-8082F42C 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ @@ -804,7 +804,7 @@ asm daE_ZH_HIO_c::daE_ZH_HIO_c() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3866 = 1200.0f; -COMPILER_STRIP_GATE(8082F214, &lit_3866); +COMPILER_STRIP_GATE(0x8082F214, &lit_3866); #pragma pop /* 8082F218-8082F21C 000010 0004+00 1/20 0/0 0/0 .rodata @3867 */ @@ -814,7 +814,7 @@ SECTION_RODATA static u8 const lit_3867[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(8082F218, &lit_3867); +COMPILER_STRIP_GATE(0x8082F218, &lit_3867); /* 8082F6E8-8082F6EC 000008 0001+03 2/2 0/0 0/0 .bss @1109 */ static u8 lit_1109[1 + 3 /* padding */]; @@ -950,7 +950,13 @@ static asm void daE_ZH_Draw(daE_ZH_c* param_0) { /* ############################################################################################## */ /* 8082F21C-8082F220 000014 0004+00 1/1 0/0 0/0 .rodata @3884 */ SECTION_RODATA static f32 const lit_3884 = -1.0f; -COMPILER_STRIP_GATE(8082F21C, &lit_3884); +COMPILER_STRIP_GATE(0x8082F21C, &lit_3884); + +/* 8082F410-8082F410 000208 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8082F410 = "E_ZH"; +#pragma pop /* 808293A8-80829454 000468 00AC+00 10/10 0/0 0/0 .text setBck__8daE_ZH_cFiUcff */ #pragma push @@ -1007,21 +1013,21 @@ asm void daE_ZH_c::startDemoCheck() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4031 = 50.0f; -COMPILER_STRIP_GATE(8082F220, &lit_4031); +COMPILER_STRIP_GATE(0x8082F220, &lit_4031); #pragma pop /* 8082F224-8082F228 00001C 0004+00 0/7 0/0 0/0 .rodata @4032 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4032 = 100.0f; -COMPILER_STRIP_GATE(8082F224, &lit_4032); +COMPILER_STRIP_GATE(0x8082F224, &lit_4032); #pragma pop /* 8082F228-8082F22C 000020 0004+00 0/1 0/0 0/0 .rodata @4033 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4033 = 180.0f; -COMPILER_STRIP_GATE(8082F228, &lit_4033); +COMPILER_STRIP_GATE(0x8082F228, &lit_4033); #pragma pop /* 80829658-808298BC 000718 0264+00 2/2 0/0 0/0 .text mBallBGCheck__8daE_ZH_cFv */ @@ -1039,35 +1045,35 @@ asm void daE_ZH_c::mBallBGCheck() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4053 = 255.0f; -COMPILER_STRIP_GATE(8082F22C, &lit_4053); +COMPILER_STRIP_GATE(0x8082F22C, &lit_4053); #pragma pop /* 8082F230-8082F234 000028 0004+00 0/1 0/0 0/0 .rodata @4054 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4054 = 0.5f; -COMPILER_STRIP_GATE(8082F230, &lit_4054); +COMPILER_STRIP_GATE(0x8082F230, &lit_4054); #pragma pop /* 8082F234-8082F238 00002C 0004+00 0/7 0/0 0/0 .rodata @4055 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4055 = 5.0f; -COMPILER_STRIP_GATE(8082F234, &lit_4055); +COMPILER_STRIP_GATE(0x8082F234, &lit_4055); #pragma pop /* 8082F238-8082F23C 000030 0004+00 0/1 0/0 0/0 .rodata @4056 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4056 = 80.0f; -COMPILER_STRIP_GATE(8082F238, &lit_4056); +COMPILER_STRIP_GATE(0x8082F238, &lit_4056); #pragma pop /* 8082F23C-8082F240 000034 0004+00 0/2 0/0 0/0 .rodata @4057 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4057 = 40.0f; -COMPILER_STRIP_GATE(8082F23C, &lit_4057); +COMPILER_STRIP_GATE(0x8082F23C, &lit_4057); #pragma pop /* 8082F240-8082F248 000038 0008+00 0/3 0/0 0/0 .rodata @4059 */ @@ -1076,7 +1082,7 @@ COMPILER_STRIP_GATE(8082F23C, &lit_4057); SECTION_RODATA static u8 const lit_4059[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8082F240, &lit_4059); +COMPILER_STRIP_GATE(0x8082F240, &lit_4059); #pragma pop /* 808298BC-808299F8 00097C 013C+00 3/3 0/0 0/0 .text mGateOpen__8daE_ZH_cFv */ @@ -1094,14 +1100,14 @@ asm void daE_ZH_c::mGateOpen() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4071 = 4.0f / 5.0f; -COMPILER_STRIP_GATE(8082F248, &lit_4071); +COMPILER_STRIP_GATE(0x8082F248, &lit_4071); #pragma pop /* 8082F24C-8082F250 000044 0004+00 0/2 0/0 0/0 .rodata @4072 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4072 = 253.0f; -COMPILER_STRIP_GATE(8082F24C, &lit_4072); +COMPILER_STRIP_GATE(0x8082F24C, &lit_4072); #pragma pop /* 808299F8-80829AD8 000AB8 00E0+00 4/4 0/0 0/0 .text mColorSet__8daE_ZH_cFbff */ @@ -1119,70 +1125,70 @@ asm void daE_ZH_c::mColorSet(bool param_0, f32 param_1, f32 param_2) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4172 = -3950.0f; -COMPILER_STRIP_GATE(8082F250, &lit_4172); +COMPILER_STRIP_GATE(0x8082F250, &lit_4172); #pragma pop /* 8082F254-8082F258 00004C 0004+00 0/1 0/0 0/0 .rodata @4173 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4173 = -500.0f; -COMPILER_STRIP_GATE(8082F254, &lit_4173); +COMPILER_STRIP_GATE(0x8082F254, &lit_4173); #pragma pop /* 8082F258-8082F25C 000050 0004+00 0/1 0/0 0/0 .rodata @4174 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4174 = 7612.0f; -COMPILER_STRIP_GATE(8082F258, &lit_4174); +COMPILER_STRIP_GATE(0x8082F258, &lit_4174); #pragma pop /* 8082F25C-8082F260 000054 0004+00 0/1 0/0 0/0 .rodata @4175 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4175 = -725.0f; -COMPILER_STRIP_GATE(8082F25C, &lit_4175); +COMPILER_STRIP_GATE(0x8082F25C, &lit_4175); #pragma pop /* 8082F260-8082F264 000058 0004+00 0/1 0/0 0/0 .rodata @4176 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4176 = 3950.0f; -COMPILER_STRIP_GATE(8082F260, &lit_4176); +COMPILER_STRIP_GATE(0x8082F260, &lit_4176); #pragma pop /* 8082F264-8082F268 00005C 0004+00 0/1 0/0 0/0 .rodata @4177 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4177 = 7442.0f; -COMPILER_STRIP_GATE(8082F264, &lit_4177); +COMPILER_STRIP_GATE(0x8082F264, &lit_4177); #pragma pop /* 8082F268-8082F26C 000060 0004+00 0/1 0/0 0/0 .rodata @4178 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4178 = 352.0f; -COMPILER_STRIP_GATE(8082F268, &lit_4178); +COMPILER_STRIP_GATE(0x8082F268, &lit_4178); #pragma pop /* 8082F26C-8082F270 000064 0004+00 0/1 0/0 0/0 .rodata @4179 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4179 = -800.0f; -COMPILER_STRIP_GATE(8082F26C, &lit_4179); +COMPILER_STRIP_GATE(0x8082F26C, &lit_4179); #pragma pop /* 8082F270-8082F274 000068 0004+00 0/9 0/0 0/0 .rodata @4180 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4180 = 7.0f / 10.0f; -COMPILER_STRIP_GATE(8082F270, &lit_4180); +COMPILER_STRIP_GATE(0x8082F270, &lit_4180); #pragma pop /* 8082F274-8082F278 00006C 0004+00 0/7 0/0 0/0 .rodata @4181 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4181 = 20.0f; -COMPILER_STRIP_GATE(8082F274, &lit_4181); +COMPILER_STRIP_GATE(0x8082F274, &lit_4181); #pragma pop /* 8082F754-8082F764 000074 000C+04 0/1 0/0 0/0 .bss @4079 */ @@ -1242,7 +1248,7 @@ asm void daE_ZH_c::mReturnLineMove() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4232 = 170.0f; -COMPILER_STRIP_GATE(8082F278, &lit_4232); +COMPILER_STRIP_GATE(0x8082F278, &lit_4232); #pragma pop /* 80829E44-8082A01C 000F04 01D8+00 2/2 0/0 0/0 .text mBallBgLineCheck__8daE_ZH_cFv */ @@ -1260,21 +1266,21 @@ asm void daE_ZH_c::mBallBgLineCheck() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4317 = -1000000000.0f; -COMPILER_STRIP_GATE(8082F27C, &lit_4317); +COMPILER_STRIP_GATE(0x8082F27C, &lit_4317); #pragma pop /* 8082F280-8082F284 000078 0004+00 0/3 0/0 0/0 .rodata @4318 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4318 = 600.0f; -COMPILER_STRIP_GATE(8082F280, &lit_4318); +COMPILER_STRIP_GATE(0x8082F280, &lit_4318); #pragma pop /* 8082F284-8082F288 00007C 0004+00 0/1 0/0 0/0 .rodata @4319 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4319 = 8.0f; -COMPILER_STRIP_GATE(8082F284, &lit_4319); +COMPILER_STRIP_GATE(0x8082F284, &lit_4319); #pragma pop /* 8082A01C-8082A390 0010DC 0374+00 2/2 0/0 0/0 .text mSearchMove__8daE_ZH_cFUc */ @@ -1299,14 +1305,14 @@ SECTION_RODATA static u8 const START_EFF_DT[88] = { 0x00, 0x00, 0x00, 0x04, 0x8A, 0x6A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x8A, 0x6B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x8A, 0x6C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, }; -COMPILER_STRIP_GATE(8082F288, &START_EFF_DT); +COMPILER_STRIP_GATE(0x8082F288, &START_EFF_DT); #pragma pop /* 8082F2E0-8082F2E4 0000D8 0004+00 0/7 0/0 0/0 .rodata @4360 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4360 = 3.0f; -COMPILER_STRIP_GATE(8082F2E0, &lit_4360); +COMPILER_STRIP_GATE(0x8082F2E0, &lit_4360); #pragma pop /* 8082A390-8082A4C8 001450 0138+00 1/1 0/0 0/0 .text mStartParticleSet__8daE_ZH_cFv */ @@ -1329,6 +1335,13 @@ asm void daE_ZH_c::mCutTypeCheck() { } #pragma pop +/* ############################################################################################## */ +/* 8082F410-8082F410 000208 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8082F415 = "T_ENE02"; +#pragma pop + /* 8082A534-8082A88C 0015F4 0358+00 1/1 0/0 0/0 .text damage_check__8daE_ZH_cFv */ #pragma push #pragma optimization_level 0 @@ -1344,161 +1357,161 @@ asm void daE_ZH_c::damage_check() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4539 = -30.0f; -COMPILER_STRIP_GATE(8082F2E4, &lit_4539); +COMPILER_STRIP_GATE(0x8082F2E4, &lit_4539); #pragma pop /* 8082F2E8-8082F2EC 0000E0 0004+00 0/1 0/0 0/0 .rodata @4540 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4540 = 650.0f; -COMPILER_STRIP_GATE(8082F2E8, &lit_4540); +COMPILER_STRIP_GATE(0x8082F2E8, &lit_4540); #pragma pop /* 8082F2EC-8082F2F0 0000E4 0004+00 0/1 0/0 0/0 .rodata @4541 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4541 = 1955.0f; -COMPILER_STRIP_GATE(8082F2EC, &lit_4541); +COMPILER_STRIP_GATE(0x8082F2EC, &lit_4541); #pragma pop /* 8082F2F0-8082F2F4 0000E8 0004+00 0/1 0/0 0/0 .rodata @4542 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4542 = -25.0f; -COMPILER_STRIP_GATE(8082F2F0, &lit_4542); +COMPILER_STRIP_GATE(0x8082F2F0, &lit_4542); #pragma pop /* 8082F2F4-8082F2F8 0000EC 0004+00 0/1 0/0 0/0 .rodata @4543 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4543 = 720.0f; -COMPILER_STRIP_GATE(8082F2F4, &lit_4543); +COMPILER_STRIP_GATE(0x8082F2F4, &lit_4543); #pragma pop /* 8082F2F8-8082F2FC 0000F0 0004+00 0/1 0/0 0/0 .rodata @4544 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4544 = 2330.0f; -COMPILER_STRIP_GATE(8082F2F8, &lit_4544); +COMPILER_STRIP_GATE(0x8082F2F8, &lit_4544); #pragma pop /* 8082F2FC-8082F300 0000F4 0004+00 0/1 0/0 0/0 .rodata @4545 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4545 = 435.0f; -COMPILER_STRIP_GATE(8082F2FC, &lit_4545); +COMPILER_STRIP_GATE(0x8082F2FC, &lit_4545); #pragma pop /* 8082F300-8082F304 0000F8 0004+00 0/1 0/0 0/0 .rodata @4546 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4546 = -3355.0f; -COMPILER_STRIP_GATE(8082F300, &lit_4546); +COMPILER_STRIP_GATE(0x8082F300, &lit_4546); #pragma pop /* 8082F304-8082F308 0000FC 0004+00 0/1 0/0 0/0 .rodata @4547 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4547 = 505.0f; -COMPILER_STRIP_GATE(8082F304, &lit_4547); +COMPILER_STRIP_GATE(0x8082F304, &lit_4547); #pragma pop /* 8082F308-8082F30C 000100 0004+00 0/1 0/0 0/0 .rodata @4548 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4548 = -3140.0f; -COMPILER_STRIP_GATE(8082F308, &lit_4548); +COMPILER_STRIP_GATE(0x8082F308, &lit_4548); #pragma pop /* 8082F30C-8082F310 000104 0004+00 0/1 0/0 0/0 .rodata @4549 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4549 = -10.0f; -COMPILER_STRIP_GATE(8082F30C, &lit_4549); +COMPILER_STRIP_GATE(0x8082F30C, &lit_4549); #pragma pop /* 8082F310-8082F314 000108 0004+00 0/1 0/0 0/0 .rodata @4550 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4550 = 280.0f; -COMPILER_STRIP_GATE(8082F310, &lit_4550); +COMPILER_STRIP_GATE(0x8082F310, &lit_4550); #pragma pop /* 8082F314-8082F318 00010C 0004+00 0/1 0/0 0/0 .rodata @4551 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4551 = -3835.0f; -COMPILER_STRIP_GATE(8082F314, &lit_4551); +COMPILER_STRIP_GATE(0x8082F314, &lit_4551); #pragma pop /* 8082F318-8082F31C 000110 0004+00 0/3 0/0 0/0 .rodata @4552 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4552 = 2.0f; -COMPILER_STRIP_GATE(8082F318, &lit_4552); +COMPILER_STRIP_GATE(0x8082F318, &lit_4552); #pragma pop /* 8082F31C-8082F320 000114 0004+00 0/1 0/0 0/0 .rodata @4553 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4553 = -15.0f; -COMPILER_STRIP_GATE(8082F31C, &lit_4553); +COMPILER_STRIP_GATE(0x8082F31C, &lit_4553); #pragma pop /* 8082F320-8082F324 000118 0004+00 0/1 0/0 0/0 .rodata @4554 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4554 = 350.0f; -COMPILER_STRIP_GATE(8082F320, &lit_4554); +COMPILER_STRIP_GATE(0x8082F320, &lit_4554); #pragma pop /* 8082F324-8082F328 00011C 0004+00 0/1 0/0 0/0 .rodata @4555 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4555 = -3620.0f; -COMPILER_STRIP_GATE(8082F324, &lit_4555); +COMPILER_STRIP_GATE(0x8082F324, &lit_4555); #pragma pop /* 8082F328-8082F32C 000120 0004+00 0/2 0/0 0/0 .rodata @4556 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4556 = 4.0f; -COMPILER_STRIP_GATE(8082F328, &lit_4556); +COMPILER_STRIP_GATE(0x8082F328, &lit_4556); #pragma pop /* 8082F32C-8082F330 000124 0004+00 0/2 0/0 0/0 .rodata @4557 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4557 = -5.0f; -COMPILER_STRIP_GATE(8082F32C, &lit_4557); +COMPILER_STRIP_GATE(0x8082F32C, &lit_4557); #pragma pop /* 8082F330-8082F334 000128 0004+00 0/1 0/0 0/0 .rodata @4558 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4558 = 590.0f; -COMPILER_STRIP_GATE(8082F330, &lit_4558); +COMPILER_STRIP_GATE(0x8082F330, &lit_4558); #pragma pop /* 8082F334-8082F338 00012C 0004+00 0/1 0/0 0/0 .rodata @4559 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4559 = 2130.0f; -COMPILER_STRIP_GATE(8082F334, &lit_4559); +COMPILER_STRIP_GATE(0x8082F334, &lit_4559); #pragma pop /* 8082F338-8082F33C 000130 0004+00 0/1 0/0 0/0 .rodata @4560 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4560 = 680.0f; -COMPILER_STRIP_GATE(8082F338, &lit_4560); +COMPILER_STRIP_GATE(0x8082F338, &lit_4560); #pragma pop /* 8082F33C-8082F340 000134 0004+00 0/1 0/0 0/0 .rodata @4561 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4561 = 2340.0f; -COMPILER_STRIP_GATE(8082F33C, &lit_4561); +COMPILER_STRIP_GATE(0x8082F33C, &lit_4561); #pragma pop /* 8082A88C-8082ABDC 00194C 0350+00 1/1 0/0 0/0 .text executeStartDemo__8daE_ZH_cFv */ @@ -1526,14 +1539,14 @@ asm void daE_ZH_c::executeWait() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4702 = 2000.0f; -COMPILER_STRIP_GATE(8082F340, &lit_4702); +COMPILER_STRIP_GATE(0x8082F340, &lit_4702); #pragma pop /* 8082F344-8082F348 00013C 0004+00 0/1 0/0 0/0 .rodata @4703 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4703 = -300.0f; -COMPILER_STRIP_GATE(8082F344, &lit_4703); +COMPILER_STRIP_GATE(0x8082F344, &lit_4703); #pragma pop /* 8082ACA8-8082B284 001D68 05DC+00 2/1 0/0 0/0 .text executeBallWait__8daE_ZH_cFv */ @@ -1561,126 +1574,126 @@ asm void daE_ZH_c::executeOpenStart() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4704 = 254.0f; -COMPILER_STRIP_GATE(8082F348, &lit_4704); +COMPILER_STRIP_GATE(0x8082F348, &lit_4704); #pragma pop /* 8082F34C-8082F350 000144 0004+00 0/0 0/0 0/0 .rodata @4705 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4705 = 7.0f / 5.0f; -COMPILER_STRIP_GATE(8082F34C, &lit_4705); +COMPILER_STRIP_GATE(0x8082F34C, &lit_4705); #pragma pop /* 8082F350-8082F354 000148 0004+00 0/3 0/0 0/0 .rodata @4706 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4706 = 200.0f; -COMPILER_STRIP_GATE(8082F350, &lit_4706); +COMPILER_STRIP_GATE(0x8082F350, &lit_4706); #pragma pop /* 8082F354-8082F358 00014C 0004+00 0/0 0/0 0/0 .rodata @4707 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4707 = -200.0f; -COMPILER_STRIP_GATE(8082F354, &lit_4707); +COMPILER_STRIP_GATE(0x8082F354, &lit_4707); #pragma pop /* 8082F358-8082F35C 000150 0004+00 0/1 0/0 0/0 .rodata @4708 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4708 = 62.0f; -COMPILER_STRIP_GATE(8082F358, &lit_4708); +COMPILER_STRIP_GATE(0x8082F358, &lit_4708); #pragma pop /* 8082F35C-8082F360 000154 0004+00 0/0 0/0 0/0 .rodata @4873 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4873 = 42.5f; -COMPILER_STRIP_GATE(8082F35C, &lit_4873); +COMPILER_STRIP_GATE(0x8082F35C, &lit_4873); #pragma pop /* 8082F360-8082F364 000158 0004+00 0/0 0/0 0/0 .rodata @4874 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4874 = 25.0f / 3.0f; -COMPILER_STRIP_GATE(8082F360, &lit_4874); +COMPILER_STRIP_GATE(0x8082F360, &lit_4874); #pragma pop /* 8082F364-8082F368 00015C 0004+00 0/0 0/0 0/0 .rodata @4875 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4875 = -60.0f; -COMPILER_STRIP_GATE(8082F364, &lit_4875); +COMPILER_STRIP_GATE(0x8082F364, &lit_4875); #pragma pop /* 8082F368-8082F36C 000160 0004+00 0/0 0/0 0/0 .rodata @4876 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4876 = -3875.0f; -COMPILER_STRIP_GATE(8082F368, &lit_4876); +COMPILER_STRIP_GATE(0x8082F368, &lit_4876); #pragma pop /* 8082F36C-8082F370 000164 0004+00 0/0 0/0 0/0 .rodata @4877 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4877 = -250.0f; -COMPILER_STRIP_GATE(8082F36C, &lit_4877); +COMPILER_STRIP_GATE(0x8082F36C, &lit_4877); #pragma pop /* 8082F370-8082F374 000168 0004+00 0/0 0/0 0/0 .rodata @4878 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4878 = -3515.0f; -COMPILER_STRIP_GATE(8082F370, &lit_4878); +COMPILER_STRIP_GATE(0x8082F370, &lit_4878); #pragma pop /* 8082F374-8082F378 00016C 0004+00 0/0 0/0 0/0 .rodata @4879 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4879 = 6.0f / 5.0f; -COMPILER_STRIP_GATE(8082F374, &lit_4879); +COMPILER_STRIP_GATE(0x8082F374, &lit_4879); #pragma pop /* 8082F378-8082F37C 000170 0004+00 0/0 0/0 0/0 .rodata @4880 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4880 = -280.0f; -COMPILER_STRIP_GATE(8082F378, &lit_4880); +COMPILER_STRIP_GATE(0x8082F378, &lit_4880); #pragma pop /* 8082F37C-8082F380 000174 0004+00 0/2 0/0 0/0 .rodata @4881 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4881 = 30.0f; -COMPILER_STRIP_GATE(8082F37C, &lit_4881); +COMPILER_STRIP_GATE(0x8082F37C, &lit_4881); #pragma pop /* 8082F380-8082F384 000178 0004+00 0/0 0/0 0/0 .rodata @4882 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4882 = -3460.0f; -COMPILER_STRIP_GATE(8082F380, &lit_4882); +COMPILER_STRIP_GATE(0x8082F380, &lit_4882); #pragma pop /* 8082F384-8082F388 00017C 0004+00 0/2 0/0 0/0 .rodata @4943 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4943 = 1000000000.0f; -COMPILER_STRIP_GATE(8082F384, &lit_4943); +COMPILER_STRIP_GATE(0x8082F384, &lit_4943); #pragma pop /* 8082F388-8082F38C 000180 0004+00 0/5 0/0 0/0 .rodata @4944 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4944 = 150.0f; -COMPILER_STRIP_GATE(8082F388, &lit_4944); +COMPILER_STRIP_GATE(0x8082F388, &lit_4944); #pragma pop /* 8082F38C-8082F390 000184 0004+00 0/2 0/0 0/0 .rodata @4945 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4945 = -150.0f; -COMPILER_STRIP_GATE(8082F38C, &lit_4945); +COMPILER_STRIP_GATE(0x8082F38C, &lit_4945); #pragma pop /* 8082B820-8082BA18 0028E0 01F8+00 1/1 0/0 0/0 .text executeSearchMove__8daE_ZH_cFv */ @@ -1700,7 +1713,7 @@ asm void daE_ZH_c::executeSearchMove() { SECTION_RODATA static u8 const lit_5024[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8082F390, &lit_5024); +COMPILER_STRIP_GATE(0x8082F390, &lit_5024); #pragma pop /* 8082F398-8082F3A0 000190 0008+00 0/4 0/0 0/0 .rodata @5025 */ @@ -1709,7 +1722,7 @@ COMPILER_STRIP_GATE(8082F390, &lit_5024); SECTION_RODATA static u8 const lit_5025[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8082F398, &lit_5025); +COMPILER_STRIP_GATE(0x8082F398, &lit_5025); #pragma pop /* 8082F3A0-8082F3A8 000198 0008+00 0/4 0/0 0/0 .rodata @5026 */ @@ -1718,14 +1731,14 @@ COMPILER_STRIP_GATE(8082F398, &lit_5025); SECTION_RODATA static u8 const lit_5026[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8082F3A0, &lit_5026); +COMPILER_STRIP_GATE(0x8082F3A0, &lit_5026); #pragma pop /* 8082F3A8-8082F3AC 0001A0 0004+00 0/1 0/0 0/0 .rodata @5027 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5027 = 16384.0f; -COMPILER_STRIP_GATE(8082F3A8, &lit_5027); +COMPILER_STRIP_GATE(0x8082F3A8, &lit_5027); #pragma pop /* 8082BA18-8082BE20 002AD8 0408+00 1/1 0/0 0/0 .text executeBgHitSHMove__8daE_ZH_cFv */ @@ -1743,21 +1756,21 @@ asm void daE_ZH_c::executeBgHitSHMove() { #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_5222 = 0x41FF0000; -COMPILER_STRIP_GATE(8082F3AC, &lit_5222); +COMPILER_STRIP_GATE(0x8082F3AC, &lit_5222); #pragma pop /* 8082F3B0-8082F3B4 0001A8 0004+00 0/2 0/0 0/0 .rodata @5223 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5223 = 6.25f; -COMPILER_STRIP_GATE(8082F3B0, &lit_5223); +COMPILER_STRIP_GATE(0x8082F3B0, &lit_5223); #pragma pop /* 8082F3B4-8082F3B8 0001AC 0004+00 0/1 0/0 0/0 .rodata @5224 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5224 = 270.0f; -COMPILER_STRIP_GATE(8082F3B4, &lit_5224); +COMPILER_STRIP_GATE(0x8082F3B4, &lit_5224); #pragma pop /* 8082BE20-8082C670 002EE0 0850+00 1/1 0/0 0/0 .text executeCatchMove__8daE_ZH_cFv */ @@ -1775,7 +1788,7 @@ asm void daE_ZH_c::executeCatchMove() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5388 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(8082F3B8, &lit_5388); +COMPILER_STRIP_GATE(0x8082F3B8, &lit_5388); #pragma pop /* 8082C670-8082CD34 003730 06C4+00 2/1 0/0 0/0 .text executeCatchFlyMove__8daE_ZH_cFv */ @@ -1793,21 +1806,21 @@ asm void daE_ZH_c::executeCatchFlyMove() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5389 = 400.0f; -COMPILER_STRIP_GATE(8082F3BC, &lit_5389); +COMPILER_STRIP_GATE(0x8082F3BC, &lit_5389); #pragma pop /* 8082F3C0-8082F3C4 0001B8 0004+00 0/2 0/0 0/0 .rodata @5482 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5482 = 300.0f; -COMPILER_STRIP_GATE(8082F3C0, &lit_5482); +COMPILER_STRIP_GATE(0x8082F3C0, &lit_5482); #pragma pop /* 8082F3C4-8082F3C8 0001BC 0004+00 0/1 0/0 0/0 .rodata @5483 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5483 = 420.0f; -COMPILER_STRIP_GATE(8082F3C4, &lit_5483); +COMPILER_STRIP_GATE(0x8082F3C4, &lit_5483); #pragma pop /* 8082CD34-8082D154 003DF4 0420+00 1/1 0/0 0/0 .text executeReturnDemo__8daE_ZH_cFv */ @@ -1835,7 +1848,7 @@ asm void daE_ZH_c::executeFlyDelete() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5661 = -40.0f; -COMPILER_STRIP_GATE(8082F3C8, &lit_5661); +COMPILER_STRIP_GATE(0x8082F3C8, &lit_5661); #pragma pop /* 8082D2F0-8082D97C 0043B0 068C+00 1/1 0/0 0/0 .text executeDamage__8daE_ZH_cFv */ @@ -1893,14 +1906,14 @@ asm void daE_ZH_c::action() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5819 = -100.0f; -COMPILER_STRIP_GATE(8082F3CC, &lit_5819); +COMPILER_STRIP_GATE(0x8082F3CC, &lit_5819); #pragma pop /* 8082F3D0-8082F3D4 0001C8 0004+00 0/1 0/0 0/0 .rodata @5820 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5820 = -105.0f; -COMPILER_STRIP_GATE(8082F3D0, &lit_5820); +COMPILER_STRIP_GATE(0x8082F3D0, &lit_5820); #pragma pop /* 8082DE18-8082DF44 004ED8 012C+00 1/1 0/0 0/0 .text mtx_set__8daE_ZH_cFv */ @@ -1918,56 +1931,56 @@ asm void daE_ZH_c::mtx_set() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5913 = 250.0f; -COMPILER_STRIP_GATE(8082F3D4, &lit_5913); +COMPILER_STRIP_GATE(0x8082F3D4, &lit_5913); #pragma pop /* 8082F3D8-8082F3DC 0001D0 0004+00 0/1 0/0 0/0 .rodata @5914 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5914 = 25.0f; -COMPILER_STRIP_GATE(8082F3D8, &lit_5914); +COMPILER_STRIP_GATE(0x8082F3D8, &lit_5914); #pragma pop /* 8082F3DC-8082F3E0 0001D4 0004+00 0/1 0/0 0/0 .rodata @5915 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5915 = 140.0f; -COMPILER_STRIP_GATE(8082F3DC, &lit_5915); +COMPILER_STRIP_GATE(0x8082F3DC, &lit_5915); #pragma pop /* 8082F3E0-8082F3E4 0001D8 0004+00 0/1 0/0 0/0 .rodata @5916 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5916 = -90.0f; -COMPILER_STRIP_GATE(8082F3E0, &lit_5916); +COMPILER_STRIP_GATE(0x8082F3E0, &lit_5916); #pragma pop /* 8082F3E4-8082F3E8 0001DC 0004+00 0/1 0/0 0/0 .rodata @5917 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5917 = 120.0f; -COMPILER_STRIP_GATE(8082F3E4, &lit_5917); +COMPILER_STRIP_GATE(0x8082F3E4, &lit_5917); #pragma pop /* 8082F3E8-8082F3EC 0001E0 0004+00 0/1 0/0 0/0 .rodata @5918 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5918 = 55.0f; -COMPILER_STRIP_GATE(8082F3E8, &lit_5918); +COMPILER_STRIP_GATE(0x8082F3E8, &lit_5918); #pragma pop /* 8082F3EC-8082F3F0 0001E4 0004+00 0/1 0/0 0/0 .rodata @5919 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5919 = -20.0f; -COMPILER_STRIP_GATE(8082F3EC, &lit_5919); +COMPILER_STRIP_GATE(0x8082F3EC, &lit_5919); #pragma pop /* 8082F3F0-8082F3F4 0001E8 0004+00 0/1 0/0 0/0 .rodata @5920 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5920 = 130.0f; -COMPILER_STRIP_GATE(8082F3F0, &lit_5920); +COMPILER_STRIP_GATE(0x8082F3F0, &lit_5920); #pragma pop /* 8082DF44-8082E2FC 005004 03B8+00 1/1 0/0 0/0 .text cc_set__8daE_ZH_cFv */ @@ -2060,21 +2073,21 @@ static asm void useHeapInit(fopAc_ac_c* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6222 = -2000.0f; -COMPILER_STRIP_GATE(8082F3F4, &lit_6222); +COMPILER_STRIP_GATE(0x8082F3F4, &lit_6222); #pragma pop /* 8082F3F8-8082F3FC 0001F0 0004+00 0/1 0/0 0/0 .rodata @6223 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6223 = -20000.0f; -COMPILER_STRIP_GATE(8082F3F8, &lit_6223); +COMPILER_STRIP_GATE(0x8082F3F8, &lit_6223); #pragma pop /* 8082F3FC-8082F400 0001F4 0004+00 0/1 0/0 0/0 .rodata @6224 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6224 = 20000.0f; -COMPILER_STRIP_GATE(8082F3FC, &lit_6224); +COMPILER_STRIP_GATE(0x8082F3FC, &lit_6224); #pragma pop /* 8082F400-8082F408 0001F8 0004+04 0/1 0/0 0/0 .rodata @6225 */ @@ -2085,7 +2098,7 @@ SECTION_RODATA static f32 const lit_6225[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(8082F400, &lit_6225); +COMPILER_STRIP_GATE(0x8082F400, &lit_6225); #pragma pop /* 8082F408-8082F410 000200 0008+00 0/1 0/0 0/0 .rodata @6227 */ @@ -2094,7 +2107,7 @@ COMPILER_STRIP_GATE(8082F400, &lit_6225); SECTION_RODATA static u8 const lit_6227[8] = { 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8082F408, &lit_6227); +COMPILER_STRIP_GATE(0x8082F408, &lit_6227); #pragma pop /* 8082E730-8082ECEC 0057F0 05BC+00 1/1 0/0 0/0 .text create__8daE_ZH_cFv */ @@ -2224,7 +2237,7 @@ asm void __sinit_d_a_e_zh_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_8082F1A8 = (void*)__sinit_d_a_e_zh_cpp; +REGISTER_CTORS(0x8082F1A8, __sinit_d_a_e_zh_cpp); #pragma pop /* 8082F1E4-8082F1EC 0062A4 0008+00 1/0 0/0 0/0 .text @36@__dt__12dBgS_ObjAcchFv */ @@ -2419,10 +2432,4 @@ static u8 data_8082F844[4]; static u8 data_8082F848[4]; #pragma pop -/* 8082F410-8082F41D 000208 000D+00 5/5 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_8082F410 = "E_ZH"; -SECTION_DEAD static char const* const stringBase_8082F415 = "T_ENE02"; -#pragma pop +/* 8082F410-8082F410 000208 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/e/d_a_e_zm/d_a_e_zm.cpp b/rel/d/a/e/d_a_e_zm/d_a_e_zm.cpp index 39f44b095e4..744c8e0be12 100644 --- a/rel/d/a/e/d_a_e_zm/d_a_e_zm.cpp +++ b/rel/d/a/e/d_a_e_zm/d_a_e_zm.cpp @@ -23,16 +23,16 @@ struct mDoMtx_stack_c { static u8 now[48]; }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; - struct J3DAnmTransform {}; +struct J3DModelData {}; + +struct Z2Creature {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -428,7 +428,7 @@ extern "C" void __register_global_object(); /* ############################################################################################## */ /* 80832CF8-80832CFC 000000 0004+00 12/12 0/0 0/0 .rodata @3789 */ SECTION_RODATA static f32 const lit_3789 = 100.0f; -COMPILER_STRIP_GATE(80832CF8, &lit_3789); +COMPILER_STRIP_GATE(0x80832CF8, &lit_3789); /* 80832CFC-80832D00 000004 0004+00 3/12 0/0 0/0 .rodata @3790 */ SECTION_RODATA static u8 const lit_3790[4] = { @@ -437,7 +437,7 @@ SECTION_RODATA static u8 const lit_3790[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80832CFC, &lit_3790); +COMPILER_STRIP_GATE(0x80832CFC, &lit_3790); /* 80832D00-80832D08 000008 0004+04 1/8 0/0 0/0 .rodata @3791 */ SECTION_RODATA static f32 const lit_3791[1 + 1 /* padding */] = { @@ -445,7 +445,7 @@ SECTION_RODATA static f32 const lit_3791[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80832D00, &lit_3791); +COMPILER_STRIP_GATE(0x80832D00, &lit_3791); /* 80832D08-80832D10 000010 0008+00 0/3 0/0 0/0 .rodata @3792 */ #pragma push @@ -453,7 +453,7 @@ COMPILER_STRIP_GATE(80832D00, &lit_3791); SECTION_RODATA static u8 const lit_3792[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80832D08, &lit_3792); +COMPILER_STRIP_GATE(0x80832D08, &lit_3792); #pragma pop /* 80832D10-80832D18 000018 0008+00 0/3 0/0 0/0 .rodata @3793 */ @@ -462,7 +462,7 @@ COMPILER_STRIP_GATE(80832D08, &lit_3792); SECTION_RODATA static u8 const lit_3793[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80832D10, &lit_3793); +COMPILER_STRIP_GATE(0x80832D10, &lit_3793); #pragma pop /* 80832D18-80832D20 000020 0008+00 0/3 0/0 0/0 .rodata @3794 */ @@ -471,35 +471,35 @@ COMPILER_STRIP_GATE(80832D10, &lit_3793); SECTION_RODATA static u8 const lit_3794[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80832D18, &lit_3794); +COMPILER_STRIP_GATE(0x80832D18, &lit_3794); #pragma pop /* 80832D20-80832D24 000028 0004+00 0/1 0/0 0/0 .rodata @3795 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3795 = 1.0f / 100.0f; -COMPILER_STRIP_GATE(80832D20, &lit_3795); +COMPILER_STRIP_GATE(0x80832D20, &lit_3795); #pragma pop /* 80832D24-80832D28 00002C 0004+00 0/4 0/0 0/0 .rodata @3810 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3810 = 2.0f; -COMPILER_STRIP_GATE(80832D24, &lit_3810); +COMPILER_STRIP_GATE(0x80832D24, &lit_3810); #pragma pop /* 80832D28-80832D2C 000030 0004+00 0/1 0/0 0/0 .rodata @3811 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3811 = 35.0f; -COMPILER_STRIP_GATE(80832D28, &lit_3811); +COMPILER_STRIP_GATE(0x80832D28, &lit_3811); #pragma pop /* 80832D2C-80832D30 000034 0004+00 0/2 0/0 0/0 .rodata @3812 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3812 = 300.0f; -COMPILER_STRIP_GATE(80832D2C, &lit_3812); +COMPILER_STRIP_GATE(0x80832D2C, &lit_3812); #pragma pop /* 80832DC4-80832DD0 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ @@ -703,14 +703,14 @@ asm daE_ZM_HIO_c::daE_ZM_HIO_c() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3885 = 10.0f; -COMPILER_STRIP_GATE(80832D30, &lit_3885); +COMPILER_STRIP_GATE(0x80832D30, &lit_3885); #pragma pop /* 80832D34-80832D38 00003C 0004+00 0/2 0/0 0/0 .rodata @3886 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3886 = 70.0f; -COMPILER_STRIP_GATE(80832D34, &lit_3886); +COMPILER_STRIP_GATE(0x80832D34, &lit_3886); #pragma pop /* 80832F80-80832F84 000008 0004+00 2/2 0/0 0/0 .bss None */ @@ -745,7 +745,13 @@ static asm void daE_ZM_Draw(daE_ZM_c* param_0) { /* ############################################################################################## */ /* 80832D38-80832D3C 000040 0004+00 1/3 0/0 0/0 .rodata @3900 */ SECTION_RODATA static f32 const lit_3900 = -1.0f; -COMPILER_STRIP_GATE(80832D38, &lit_3900); +COMPILER_STRIP_GATE(0x80832D38, &lit_3900); + +/* 80832DB8-80832DB8 0000C0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80832DB8 = "E_ZM"; +#pragma pop /* 8082FBD4-8082FC80 000374 00AC+00 6/6 0/0 0/0 .text setBck__8daE_ZM_cFiUcff */ #pragma push @@ -770,13 +776,13 @@ asm void daE_ZM_c::setActionMode(int param_0, int param_1) { /* ############################################################################################## */ /* 80832D3C-80832D40 000044 0004+00 1/6 0/0 0/0 .rodata @4050 */ SECTION_RODATA static f32 const lit_4050 = 3.0f; -COMPILER_STRIP_GATE(80832D3C, &lit_4050); +COMPILER_STRIP_GATE(0x80832D3C, &lit_4050); /* 80832D40-80832D44 000048 0004+00 0/3 0/0 0/0 .rodata @4051 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4051 = 200.0f; -COMPILER_STRIP_GATE(80832D40, &lit_4051); +COMPILER_STRIP_GATE(0x80832D40, &lit_4051); #pragma pop /* 8082FC8C-808301E0 00042C 0554+00 1/1 0/0 0/0 .text damage_check__8daE_ZM_cFv */ @@ -824,21 +830,21 @@ asm void daE_ZM_c::executeSearchPoint() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4251 = 5.0f; -COMPILER_STRIP_GATE(80832D44, &lit_4251); +COMPILER_STRIP_GATE(0x80832D44, &lit_4251); #pragma pop /* 80832D48-80832D4C 000050 0004+00 0/1 0/0 0/0 .rodata @4252 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4252 = 7.0f / 10.0f; -COMPILER_STRIP_GATE(80832D48, &lit_4252); +COMPILER_STRIP_GATE(0x80832D48, &lit_4252); #pragma pop /* 80832D4C-80832D50 000054 0004+00 0/3 0/0 0/0 .rodata @4253 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4253 = 4.0f / 5.0f; -COMPILER_STRIP_GATE(80832D4C, &lit_4253); +COMPILER_STRIP_GATE(0x80832D4C, &lit_4253); #pragma pop /* 80832D50-80832D58 000058 0004+04 0/1 0/0 0/0 .rodata @4254 */ @@ -849,7 +855,7 @@ SECTION_RODATA static f32 const lit_4254[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80832D50, &lit_4254); +COMPILER_STRIP_GATE(0x80832D50, &lit_4254); #pragma pop /* 80832D58-80832D60 000060 0008+00 0/3 0/0 0/0 .rodata @4256 */ @@ -858,7 +864,7 @@ COMPILER_STRIP_GATE(80832D50, &lit_4254); SECTION_RODATA static u8 const lit_4256[8] = { 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80832D58, &lit_4256); +COMPILER_STRIP_GATE(0x80832D58, &lit_4256); #pragma pop /* 80830398-808309DC 000B38 0644+00 1/1 0/0 0/0 .text executeWait__8daE_ZM_cFv */ @@ -886,7 +892,7 @@ asm void daE_ZM_c::executeMove() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4389 = 60.0f; -COMPILER_STRIP_GATE(80832D60, &lit_4389); +COMPILER_STRIP_GATE(0x80832D60, &lit_4389); #pragma pop /* 80830AB8-80830E28 001258 0370+00 1/1 0/0 0/0 .text executeAttack__8daE_ZM_cFv */ @@ -904,28 +910,28 @@ asm void daE_ZM_c::executeAttack() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4448 = 4000.0f; -COMPILER_STRIP_GATE(80832D64, &lit_4448); +COMPILER_STRIP_GATE(0x80832D64, &lit_4448); #pragma pop /* 80832D68-80832D6C 000070 0004+00 0/1 0/0 0/0 .rodata @4449 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4449 = 12000.0f; -COMPILER_STRIP_GATE(80832D68, &lit_4449); +COMPILER_STRIP_GATE(0x80832D68, &lit_4449); #pragma pop /* 80832D6C-80832D70 000074 0004+00 0/2 0/0 0/0 .rodata @4450 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4450 = 500.0f; -COMPILER_STRIP_GATE(80832D6C, &lit_4450); +COMPILER_STRIP_GATE(0x80832D6C, &lit_4450); #pragma pop /* 80832D70-80832D74 000078 0004+00 0/1 0/0 0/0 .rodata @4451 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4451 = -500.0f; -COMPILER_STRIP_GATE(80832D70, &lit_4451); +COMPILER_STRIP_GATE(0x80832D70, &lit_4451); #pragma pop /* 80830E28-808310C4 0015C8 029C+00 1/1 0/0 0/0 .text executeDamage__8daE_ZM_cFv */ @@ -943,42 +949,42 @@ asm void daE_ZM_c::executeDamage() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4528 = 40.0f; -COMPILER_STRIP_GATE(80832D74, &lit_4528); +COMPILER_STRIP_GATE(0x80832D74, &lit_4528); #pragma pop /* 80832D78-80832D7C 000080 0004+00 0/2 0/0 0/0 .rodata @4529 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4529 = -20.0f; -COMPILER_STRIP_GATE(80832D78, &lit_4529); +COMPILER_STRIP_GATE(0x80832D78, &lit_4529); #pragma pop /* 80832D7C-80832D80 000084 0004+00 0/1 0/0 0/0 .rodata @4530 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4530 = 3.0f / 10.0f; -COMPILER_STRIP_GATE(80832D7C, &lit_4530); +COMPILER_STRIP_GATE(0x80832D7C, &lit_4530); #pragma pop /* 80832D80-80832D84 000088 0004+00 0/1 0/0 0/0 .rodata @4531 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4531 = 9.0f / 10.0f; -COMPILER_STRIP_GATE(80832D80, &lit_4531); +COMPILER_STRIP_GATE(0x80832D80, &lit_4531); #pragma pop /* 80832D84-80832D88 00008C 0004+00 0/1 0/0 0/0 .rodata @4532 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4532 = 30.0f; -COMPILER_STRIP_GATE(80832D84, &lit_4532); +COMPILER_STRIP_GATE(0x80832D84, &lit_4532); #pragma pop /* 80832D88-80832D8C 000090 0004+00 0/1 0/0 0/0 .rodata @4533 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4533 = -6.0f; -COMPILER_STRIP_GATE(80832D88, &lit_4533); +COMPILER_STRIP_GATE(0x80832D88, &lit_4533); #pragma pop /* 808310C4-80831474 001864 03B0+00 1/1 0/0 0/0 .text executeDead__8daE_ZM_cFv */ @@ -996,28 +1002,28 @@ asm void daE_ZM_c::executeDead() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4677 = 20.0f; -COMPILER_STRIP_GATE(80832D8C, &lit_4677); +COMPILER_STRIP_GATE(0x80832D8C, &lit_4677); #pragma pop /* 80832D90-80832D94 000098 0004+00 0/1 0/0 0/0 .rodata @4678 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4678 = 250.0f; -COMPILER_STRIP_GATE(80832D90, &lit_4678); +COMPILER_STRIP_GATE(0x80832D90, &lit_4678); #pragma pop /* 80832D94-80832D98 00009C 0004+00 0/1 0/0 0/0 .rodata @4679 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4679 = 0.5f; -COMPILER_STRIP_GATE(80832D94, &lit_4679); +COMPILER_STRIP_GATE(0x80832D94, &lit_4679); #pragma pop /* 80832D98-80832D9C 0000A0 0004+00 0/1 0/0 0/0 .rodata @4680 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4680 = 1.5f; -COMPILER_STRIP_GATE(80832D98, &lit_4680); +COMPILER_STRIP_GATE(0x80832D98, &lit_4680); #pragma pop /* 80831474-80831930 001C14 04BC+00 1/1 0/0 0/0 .text executeBullet__8daE_ZM_cFv */ @@ -1055,7 +1061,7 @@ asm void daE_ZM_c::mtx_set() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4711 = 1000.0f; -COMPILER_STRIP_GATE(80832D9C, &lit_4711); +COMPILER_STRIP_GATE(0x80832D9C, &lit_4711); #pragma pop /* 80832DA0-80832DA8 0000A8 0008+00 0/0 0/0 0/0 .rodata @4714 */ @@ -1064,21 +1070,21 @@ COMPILER_STRIP_GATE(80832D9C, &lit_4711); SECTION_RODATA static u8 const lit_4714[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80832DA0, &lit_4714); +COMPILER_STRIP_GATE(0x80832DA0, &lit_4714); #pragma pop /* 80832DA8-80832DAC 0000B0 0004+00 0/1 0/0 0/0 .rodata @4772 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4772 = -60.0f; -COMPILER_STRIP_GATE(80832DA8, &lit_4772); +COMPILER_STRIP_GATE(0x80832DA8, &lit_4772); #pragma pop /* 80832DAC-80832DB0 0000B4 0004+00 0/1 0/0 0/0 .rodata @4773 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4773 = 140.0f; -COMPILER_STRIP_GATE(80832DAC, &lit_4773); +COMPILER_STRIP_GATE(0x80832DAC, &lit_4773); #pragma pop /* 80831B9C-80831D64 00233C 01C8+00 1/1 0/0 0/0 .text cc_set__8daE_ZM_cFv */ @@ -1161,14 +1167,20 @@ static asm void useHeapInit(fopAc_ac_c* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5031 = -400.0f; -COMPILER_STRIP_GATE(80832DB0, &lit_5031); +COMPILER_STRIP_GATE(0x80832DB0, &lit_5031); #pragma pop /* 80832DB4-80832DB8 0000BC 0004+00 0/1 0/0 0/0 .rodata @5032 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5032 = 400.0f; -COMPILER_STRIP_GATE(80832DB4, &lit_5032); +COMPILER_STRIP_GATE(0x80832DB4, &lit_5032); +#pragma pop + +/* 80832DB8-80832DB8 0000C0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80832DBD = "E_zm"; #pragma pop /* 80832064-80832580 002804 051C+00 1/1 0/0 0/0 .text create__8daE_ZM_cFv */ @@ -1288,7 +1300,7 @@ asm void __sinit_d_a_e_zm_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80832848 = (void*)__sinit_d_a_e_zm_cpp; +REGISTER_CTORS(0x80832848, __sinit_d_a_e_zm_cpp); #pragma pop /* 80832884-8083288C 003024 0008+00 1/0 0/0 0/0 .text @36@__dt__12dBgS_ObjAcchFv */ @@ -1333,10 +1345,4 @@ asm cXyz::~cXyz() { } #pragma pop -/* 80832DB8-80832DC2 0000C0 000A+00 4/4 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80832DB8 = "E_ZM"; -SECTION_DEAD static char const* const stringBase_80832DBD = "E_zm"; -#pragma pop +/* 80832DB8-80832DB8 0000C0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/e/d_a_e_zs/d_a_e_zs.cpp b/rel/d/a/e/d_a_e_zs/d_a_e_zs.cpp index 5d91b8805e1..79d70f3b5a5 100644 --- a/rel/d/a/e/d_a_e_zs/d_a_e_zs.cpp +++ b/rel/d/a/e/d_a_e_zs/d_a_e_zs.cpp @@ -23,16 +23,16 @@ struct mDoMtx_stack_c { static u8 now[48]; }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; - struct J3DAnmTransform {}; +struct J3DModelData {}; + +struct Z2Creature {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -347,7 +347,7 @@ extern "C" void __register_global_object(); /* ############################################################################################## */ /* 808352D0-808352D4 000000 0004+00 9/9 0/0 0/0 .rodata @3909 */ SECTION_RODATA static f32 const lit_3909 = 100.0f; -COMPILER_STRIP_GATE(808352D0, &lit_3909); +COMPILER_STRIP_GATE(0x808352D0, &lit_3909); /* 808352D4-808352D8 000004 0004+00 2/10 0/0 0/0 .rodata @3910 */ SECTION_RODATA static u8 const lit_3910[4] = { @@ -356,7 +356,7 @@ SECTION_RODATA static u8 const lit_3910[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(808352D4, &lit_3910); +COMPILER_STRIP_GATE(0x808352D4, &lit_3910); /* 808352D8-808352E0 000008 0004+04 2/7 0/0 0/0 .rodata @3911 */ SECTION_RODATA static f32 const lit_3911[1 + 1 /* padding */] = { @@ -364,7 +364,7 @@ SECTION_RODATA static f32 const lit_3911[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(808352D8, &lit_3911); +COMPILER_STRIP_GATE(0x808352D8, &lit_3911); /* 808352E0-808352E8 000010 0008+00 0/2 0/0 0/0 .rodata @3912 */ #pragma push @@ -372,7 +372,7 @@ COMPILER_STRIP_GATE(808352D8, &lit_3911); SECTION_RODATA static u8 const lit_3912[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(808352E0, &lit_3912); +COMPILER_STRIP_GATE(0x808352E0, &lit_3912); #pragma pop /* 808352E8-808352F0 000018 0008+00 0/2 0/0 0/0 .rodata @3913 */ @@ -381,7 +381,7 @@ COMPILER_STRIP_GATE(808352E0, &lit_3912); SECTION_RODATA static u8 const lit_3913[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(808352E8, &lit_3913); +COMPILER_STRIP_GATE(0x808352E8, &lit_3913); #pragma pop /* 808352F0-808352F8 000020 0008+00 0/2 0/0 0/0 .rodata @3914 */ @@ -390,23 +390,23 @@ COMPILER_STRIP_GATE(808352E8, &lit_3913); SECTION_RODATA static u8 const lit_3914[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(808352F0, &lit_3914); +COMPILER_STRIP_GATE(0x808352F0, &lit_3914); #pragma pop /* 808352F8-808352FC 000028 0004+00 0/1 0/0 0/0 .rodata @3915 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3915 = 1.0f / 100.0f; -COMPILER_STRIP_GATE(808352F8, &lit_3915); +COMPILER_STRIP_GATE(0x808352F8, &lit_3915); #pragma pop /* 808352FC-80835300 00002C 0004+00 1/1 0/0 0/0 .rodata @3930 */ SECTION_RODATA static f32 const lit_3930 = 7.0f / 5.0f; -COMPILER_STRIP_GATE(808352FC, &lit_3930); +COMPILER_STRIP_GATE(0x808352FC, &lit_3930); /* 80835300-80835304 000030 0004+00 1/1 0/0 0/0 .rodata @3931 */ SECTION_RODATA static f32 const lit_3931 = 1200.0f; -COMPILER_STRIP_GATE(80835300, &lit_3931); +COMPILER_STRIP_GATE(0x80835300, &lit_3931); /* 8083534C-80835358 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { @@ -586,14 +586,14 @@ asm daE_ZS_HIO_c::daE_ZS_HIO_c() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3960 = 10.0f; -COMPILER_STRIP_GATE(80835304, &lit_3960); +COMPILER_STRIP_GATE(0x80835304, &lit_3960); #pragma pop /* 80835308-8083530C 000038 0004+00 0/1 0/0 0/0 .rodata @3961 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3961 = 700.0f; -COMPILER_STRIP_GATE(80835308, &lit_3961); +COMPILER_STRIP_GATE(0x80835308, &lit_3961); #pragma pop /* 808330DC-808331C4 00011C 00E8+00 1/1 0/0 0/0 .text draw__8daE_ZS_cFv */ @@ -619,7 +619,13 @@ static asm void daE_ZS_Draw(daE_ZS_c* param_0) { /* ############################################################################################## */ /* 8083530C-80835310 00003C 0004+00 1/3 0/0 0/0 .rodata @3971 */ SECTION_RODATA static f32 const lit_3971 = -1.0f; -COMPILER_STRIP_GATE(8083530C, &lit_3971); +COMPILER_STRIP_GATE(0x8083530C, &lit_3971); + +/* 80835344-80835344 000074 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80835344 = "E_ZS"; +#pragma pop /* 808331E4-80833290 000224 00AC+00 4/4 0/0 0/0 .text setBck__8daE_ZS_cFiUcff */ #pragma push @@ -676,7 +682,7 @@ static asm void s_BossSearch(void* param_0, void* param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4183 = 400.0f; -COMPILER_STRIP_GATE(80835310, &lit_4183); +COMPILER_STRIP_GATE(0x80835310, &lit_4183); #pragma pop /* 80833698-80833964 0006D8 02CC+00 2/2 0/0 0/0 .text mBossHandCheck__8daE_ZS_cFv */ @@ -694,28 +700,28 @@ asm void daE_ZS_c::mBossHandCheck() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4276 = -240.0f; -COMPILER_STRIP_GATE(80835314, &lit_4276); +COMPILER_STRIP_GATE(0x80835314, &lit_4276); #pragma pop /* 80835318-8083531C 000048 0004+00 0/4 0/0 0/0 .rodata @4277 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4277 = 3.0f; -COMPILER_STRIP_GATE(80835318, &lit_4277); +COMPILER_STRIP_GATE(0x80835318, &lit_4277); #pragma pop /* 8083531C-80835320 00004C 0004+00 0/1 0/0 0/0 .rodata @4278 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4278 = 7.0f / 10.0f; -COMPILER_STRIP_GATE(8083531C, &lit_4278); +COMPILER_STRIP_GATE(0x8083531C, &lit_4278); #pragma pop /* 80835320-80835324 000050 0004+00 0/2 0/0 0/0 .rodata @4279 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4279 = -2.0f; -COMPILER_STRIP_GATE(80835320, &lit_4279); +COMPILER_STRIP_GATE(0x80835320, &lit_4279); #pragma pop /* 808354C0-808354C4 -00001 0004+00 3/3 0/0 0/0 .bss None */ @@ -738,14 +744,14 @@ asm void daE_ZS_c::executeAppear() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4318 = 0.5f; -COMPILER_STRIP_GATE(80835324, &lit_4318); +COMPILER_STRIP_GATE(0x80835324, &lit_4318); #pragma pop /* 80835328-8083532C 000058 0004+00 0/2 0/0 0/0 .rodata @4319 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4319 = 5.0f; -COMPILER_STRIP_GATE(80835328, &lit_4319); +COMPILER_STRIP_GATE(0x80835328, &lit_4319); #pragma pop /* 80833D30-80833F1C 000D70 01EC+00 1/2 0/0 0/0 .text executeWait__8daE_ZS_cFv */ @@ -803,21 +809,21 @@ asm void daE_ZS_c::mtx_set() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4498 = 25.0f; -COMPILER_STRIP_GATE(8083532C, &lit_4498); +COMPILER_STRIP_GATE(0x8083532C, &lit_4498); #pragma pop /* 80835330-80835334 000060 0004+00 0/1 0/0 0/0 .rodata @4499 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4499 = 280.0f; -COMPILER_STRIP_GATE(80835330, &lit_4499); +COMPILER_STRIP_GATE(0x80835330, &lit_4499); #pragma pop /* 80835334-80835338 000064 0004+00 0/1 0/0 0/0 .rodata @4500 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4500 = 50.0f; -COMPILER_STRIP_GATE(80835334, &lit_4500); +COMPILER_STRIP_GATE(0x80835334, &lit_4500); #pragma pop /* 80834518-80834650 001558 0138+00 1/1 0/0 0/0 .text cc_set__8daE_ZS_cFv */ @@ -900,21 +906,21 @@ static asm void useHeapInit(fopAc_ac_c* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4647 = -200.0f; -COMPILER_STRIP_GATE(80835338, &lit_4647); +COMPILER_STRIP_GATE(0x80835338, &lit_4647); #pragma pop /* 8083533C-80835340 00006C 0004+00 0/1 0/0 0/0 .rodata @4648 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4648 = 200.0f; -COMPILER_STRIP_GATE(8083533C, &lit_4648); +COMPILER_STRIP_GATE(0x8083533C, &lit_4648); #pragma pop /* 80835340-80835344 000070 0004+00 0/1 0/0 0/0 .rodata @4649 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4649 = 60.0f; -COMPILER_STRIP_GATE(80835340, &lit_4649); +COMPILER_STRIP_GATE(0x80835340, &lit_4649); #pragma pop /* 80834884-80834BA8 0018C4 0324+00 1/1 0/0 0/0 .text create__8daE_ZS_cFv */ @@ -1019,7 +1025,7 @@ asm void __sinit_d_a_e_zs_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80834E24 = (void*)__sinit_d_a_e_zs_cpp; +REGISTER_CTORS(0x80834E24, __sinit_d_a_e_zs_cpp); #pragma pop /* 80834E60-80834E68 001EA0 0008+00 1/0 0/0 0/0 .text @36@__dt__12dBgS_ObjAcchFv */ @@ -1074,9 +1080,4 @@ asm void daB_DS_c::getHandPosL() { } #pragma pop -/* 80835344-80835349 000074 0005+00 4/4 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80835344 = "E_ZS"; -#pragma pop +/* 80835344-80835344 000074 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/kytag/d_a_kytag00/d_a_kytag00.cpp b/rel/d/a/kytag/d_a_kytag00/d_a_kytag00.cpp index 00a750f5550..fdeed2e167e 100644 --- a/rel/d/a/kytag/d_a_kytag00/d_a_kytag00.cpp +++ b/rel/d/a/kytag/d_a_kytag00/d_a_kytag00.cpp @@ -21,10 +21,6 @@ struct dSv_info_c { /* 80035360 */ void isSwitch(int, int) const; }; -struct Z2EnvSeMgr { - /* 802C7FB4 */ void setSnowPower(s8); -}; - // // Forward References: // @@ -81,7 +77,7 @@ SECTION_RODATA static u8 const lit_3798[4 + 4 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(8046C980, &lit_3798); +COMPILER_STRIP_GATE(0x8046C980, &lit_3798); /* 8046C988-8046C990 000008 0008+00 0/3 0/0 0/0 .rodata @3799 */ #pragma push @@ -89,7 +85,7 @@ COMPILER_STRIP_GATE(8046C980, &lit_3798); SECTION_RODATA static u8 const lit_3799[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8046C988, &lit_3799); +COMPILER_STRIP_GATE(0x8046C988, &lit_3799); #pragma pop /* 8046C990-8046C998 000010 0008+00 0/3 0/0 0/0 .rodata @3800 */ @@ -98,7 +94,7 @@ COMPILER_STRIP_GATE(8046C988, &lit_3799); SECTION_RODATA static u8 const lit_3800[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8046C990, &lit_3800); +COMPILER_STRIP_GATE(0x8046C990, &lit_3800); #pragma pop /* 8046C998-8046C9A0 000018 0008+00 0/3 0/0 0/0 .rodata @3801 */ @@ -107,7 +103,7 @@ COMPILER_STRIP_GATE(8046C990, &lit_3800); SECTION_RODATA static u8 const lit_3801[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8046C998, &lit_3801); +COMPILER_STRIP_GATE(0x8046C998, &lit_3801); #pragma pop /* 8046B718-8046B9DC 000078 02C4+00 2/2 0/0 0/0 .text get_check_pos__FP13kytag00_class */ @@ -136,28 +132,28 @@ static asm void wether_tag_reset(kytag00_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3906 = 100.0f; -COMPILER_STRIP_GATE(8046C9A0, &lit_3906); +COMPILER_STRIP_GATE(0x8046C9A0, &lit_3906); #pragma pop /* 8046C9A4-8046C9A8 000024 0004+00 0/3 0/0 0/0 .rodata @3907 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3907 = 5000.0f; -COMPILER_STRIP_GATE(8046C9A4, &lit_3907); +COMPILER_STRIP_GATE(0x8046C9A4, &lit_3907); #pragma pop /* 8046C9A8-8046C9AC 000028 0004+00 0/4 0/0 0/0 .rodata @3908 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3908 = 1.0f; -COMPILER_STRIP_GATE(8046C9A8, &lit_3908); +COMPILER_STRIP_GATE(0x8046C9A8, &lit_3908); #pragma pop /* 8046C9AC-8046C9B0 00002C 0004+00 0/1 0/0 0/0 .rodata @3909 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3909 = 0.5f; -COMPILER_STRIP_GATE(8046C9AC, &lit_3909); +COMPILER_STRIP_GATE(0x8046C9AC, &lit_3909); #pragma pop /* 8046C9B0-8046C9B8 000030 0008+00 0/3 0/0 0/0 .rodata @3911 */ @@ -166,7 +162,7 @@ COMPILER_STRIP_GATE(8046C9AC, &lit_3909); SECTION_RODATA static u8 const lit_3911[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8046C9B0, &lit_3911); +COMPILER_STRIP_GATE(0x8046C9B0, &lit_3911); #pragma pop /* 8046BA10-8046BD60 000370 0350+00 1/1 0/0 0/0 .text wether_tag_move__FP13kytag00_class @@ -183,7 +179,7 @@ static asm void wether_tag_move(kytag00_class* param_0) { /* ############################################################################################## */ /* 8046C9B8-8046C9BC 000038 0004+00 1/1 0/0 0/0 .rodata @3918 */ SECTION_RODATA static f32 const lit_3918 = 250.0f; -COMPILER_STRIP_GATE(8046C9B8, &lit_3918); +COMPILER_STRIP_GATE(0x8046C9B8, &lit_3918); /* 8046BD60-8046BDA4 0006C0 0044+00 1/1 0/0 0/0 .text raincnt_set__Ff */ #pragma push @@ -289,63 +285,63 @@ static asm void daKytag00_Draw(kytag00_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4101 = 500.0f; -COMPILER_STRIP_GATE(8046C9BC, &lit_4101); +COMPILER_STRIP_GATE(0x8046C9BC, &lit_4101); #pragma pop /* 8046C9C0-8046C9C4 000040 0004+00 0/0 0/0 0/0 .rodata @4102 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4102 = 1.0f / 20.0f; -COMPILER_STRIP_GATE(8046C9C0, &lit_4102); +COMPILER_STRIP_GATE(0x8046C9C0, &lit_4102); #pragma pop /* 8046C9C4-8046C9C8 000044 0004+00 0/0 0/0 0/0 .rodata @4103 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4103 = 50.0f; -COMPILER_STRIP_GATE(8046C9C4, &lit_4103); +COMPILER_STRIP_GATE(0x8046C9C4, &lit_4103); #pragma pop /* 8046C9C8-8046C9CC 000048 0004+00 0/0 0/0 0/0 .rodata @4104 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4104 = 63.0f; -COMPILER_STRIP_GATE(8046C9C8, &lit_4104); +COMPILER_STRIP_GATE(0x8046C9C8, &lit_4104); #pragma pop /* 8046C9CC-8046C9D0 00004C 0004+00 0/0 0/0 0/0 .rodata @4105 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4105 = 300.0f; -COMPILER_STRIP_GATE(8046C9CC, &lit_4105); +COMPILER_STRIP_GATE(0x8046C9CC, &lit_4105); #pragma pop /* 8046C9D0-8046C9D4 000050 0004+00 0/0 0/0 0/0 .rodata @4106 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4106 = 127.0f; -COMPILER_STRIP_GATE(8046C9D0, &lit_4106); +COMPILER_STRIP_GATE(0x8046C9D0, &lit_4106); #pragma pop /* 8046C9D4-8046C9D8 000054 0004+00 0/1 0/0 0/0 .rodata @4145 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4145 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(8046C9D4, &lit_4145); +COMPILER_STRIP_GATE(0x8046C9D4, &lit_4145); #pragma pop /* 8046C9D8-8046C9DC 000058 0004+00 0/1 0/0 0/0 .rodata @4146 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4146 = 1.0f / 100.0f; -COMPILER_STRIP_GATE(8046C9D8, &lit_4146); +COMPILER_STRIP_GATE(0x8046C9D8, &lit_4146); #pragma pop /* 8046C9DC-8046C9E0 00005C 0004+00 0/1 0/0 0/0 .rodata @4147 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4147 = 0x38D1B717; -COMPILER_STRIP_GATE(8046C9DC, &lit_4147); +COMPILER_STRIP_GATE(0x8046C9DC, &lit_4147); #pragma pop /* 8046C684-8046C76C 000FE4 00E8+00 1/0 0/0 0/0 .text daKytag00_Execute__FP13kytag00_class */ diff --git a/rel/d/a/kytag/d_a_kytag01/d_a_kytag01.cpp b/rel/d/a/kytag/d_a_kytag01/d_a_kytag01.cpp index 15f32419604..7ce86c33678 100644 --- a/rel/d/a/kytag/d_a_kytag01/d_a_kytag01.cpp +++ b/rel/d/a/kytag/d_a_kytag01/d_a_kytag01.cpp @@ -84,7 +84,7 @@ SECTION_RODATA static u8 const lit_3796[4 + 4 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(8085598C, &lit_3796); +COMPILER_STRIP_GATE(0x8085598C, &lit_3796); /* 80855994-8085599C 000008 0008+00 0/2 0/0 0/0 .rodata @3797 */ #pragma push @@ -92,7 +92,7 @@ COMPILER_STRIP_GATE(8085598C, &lit_3796); SECTION_RODATA static u8 const lit_3797[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80855994, &lit_3797); +COMPILER_STRIP_GATE(0x80855994, &lit_3797); #pragma pop /* 8085599C-808559A4 000010 0008+00 0/2 0/0 0/0 .rodata @3798 */ @@ -101,7 +101,7 @@ COMPILER_STRIP_GATE(80855994, &lit_3797); SECTION_RODATA static u8 const lit_3798[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8085599C, &lit_3798); +COMPILER_STRIP_GATE(0x8085599C, &lit_3798); #pragma pop /* 808559A4-808559AC 000018 0008+00 0/2 0/0 0/0 .rodata @3799 */ @@ -110,7 +110,7 @@ COMPILER_STRIP_GATE(8085599C, &lit_3798); SECTION_RODATA static u8 const lit_3799[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(808559A4, &lit_3799); +COMPILER_STRIP_GATE(0x808559A4, &lit_3799); #pragma pop /* 80855058-80855320 000078 02C8+00 1/1 0/0 0/0 .text get_check_pos__FP13kytag01_class */ @@ -128,56 +128,56 @@ static asm void get_check_pos(kytag01_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3879 = 100.0f; -COMPILER_STRIP_GATE(808559AC, &lit_3879); +COMPILER_STRIP_GATE(0x808559AC, &lit_3879); #pragma pop /* 808559B0-808559B4 000024 0004+00 0/2 0/0 0/0 .rodata @3880 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3880 = 1.0f; -COMPILER_STRIP_GATE(808559B0, &lit_3880); +COMPILER_STRIP_GATE(0x808559B0, &lit_3880); #pragma pop /* 808559B4-808559B8 000028 0004+00 0/1 0/0 0/0 .rodata @3881 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3881 = 32768.0f; -COMPILER_STRIP_GATE(808559B4, &lit_3881); +COMPILER_STRIP_GATE(0x808559B4, &lit_3881); #pragma pop /* 808559B8-808559BC 00002C 0004+00 0/1 0/0 0/0 .rodata @3882 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3882 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(808559B8, &lit_3882); +COMPILER_STRIP_GATE(0x808559B8, &lit_3882); #pragma pop /* 808559BC-808559C0 000030 0004+00 0/1 0/0 0/0 .rodata @3883 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3883 = -2000.0f; -COMPILER_STRIP_GATE(808559BC, &lit_3883); +COMPILER_STRIP_GATE(0x808559BC, &lit_3883); #pragma pop /* 808559C0-808559C4 000034 0004+00 0/1 0/0 0/0 .rodata @3884 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3884 = 200.0f; -COMPILER_STRIP_GATE(808559C0, &lit_3884); +COMPILER_STRIP_GATE(0x808559C0, &lit_3884); #pragma pop /* 808559C4-808559C8 000038 0004+00 0/1 0/0 0/0 .rodata @3885 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3885 = 50.0f; -COMPILER_STRIP_GATE(808559C4, &lit_3885); +COMPILER_STRIP_GATE(0x808559C4, &lit_3885); #pragma pop /* 808559C8-808559CC 00003C 0004+00 0/1 0/0 0/0 .rodata @3886 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3886 = 0.5f; -COMPILER_STRIP_GATE(808559C8, &lit_3886); +COMPILER_STRIP_GATE(0x808559C8, &lit_3886); #pragma pop /* 808559CC-808559D4 000040 0008+00 0/2 0/0 0/0 .rodata @3888 */ @@ -186,7 +186,7 @@ COMPILER_STRIP_GATE(808559C8, &lit_3886); SECTION_RODATA static u8 const lit_3888[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(808559CC, &lit_3888); +COMPILER_STRIP_GATE(0x808559CC, &lit_3888); #pragma pop /* 80855320-80855638 000340 0318+00 1/1 0/0 0/0 .text mist_tag_move__FP13kytag01_class */ @@ -210,21 +210,21 @@ static bool daKytag01_Draw(kytag01_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3946 = 1.0f / 20.0f; -COMPILER_STRIP_GATE(808559D4, &lit_3946); +COMPILER_STRIP_GATE(0x808559D4, &lit_3946); #pragma pop /* 808559D8-808559DC 00004C 0004+00 0/1 0/0 0/0 .rodata @3947 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3947 = 1.0f / 50.0f; -COMPILER_STRIP_GATE(808559D8, &lit_3947); +COMPILER_STRIP_GATE(0x808559D8, &lit_3947); #pragma pop /* 808559DC-808559E0 000050 0004+00 0/1 0/0 0/0 .rodata @3948 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_3948 = 0x38D1B717; -COMPILER_STRIP_GATE(808559DC, &lit_3948); +COMPILER_STRIP_GATE(0x808559DC, &lit_3948); #pragma pop /* 80855640-808557DC 000660 019C+00 1/0 0/0 0/0 .text daKytag01_Execute__FP13kytag01_class */ @@ -253,14 +253,14 @@ static bool daKytag01_Delete(kytag01_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4016 = 255.0f; -COMPILER_STRIP_GATE(808559E0, &lit_4016); +COMPILER_STRIP_GATE(0x808559E0, &lit_4016); #pragma pop /* 808559E4-808559E8 000058 0004+00 0/1 0/0 0/0 .rodata @4017 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4017 = 10.0f; -COMPILER_STRIP_GATE(808559E4, &lit_4017); +COMPILER_STRIP_GATE(0x808559E4, &lit_4017); #pragma pop /* 808557EC-80855984 00080C 0198+00 1/0 0/0 0/0 .text daKytag01_Create__FP10fopAc_ac_c */ diff --git a/rel/d/a/kytag/d_a_kytag02/d_a_kytag02.cpp b/rel/d/a/kytag/d_a_kytag02/d_a_kytag02.cpp index a01ec909317..64cdfb542a0 100644 --- a/rel/d/a/kytag/d_a_kytag02/d_a_kytag02.cpp +++ b/rel/d/a/kytag/d_a_kytag02/d_a_kytag02.cpp @@ -75,13 +75,13 @@ static bool daKytag02_Draw(kytag02_class* param_0) { /* ############################################################################################## */ /* 80855DFC-80855E00 000000 0004+00 1/1 0/0 0/0 .rodata @3666 */ SECTION_RODATA static f32 const lit_3666 = 27.0f / 100.0f; -COMPILER_STRIP_GATE(80855DFC, &lit_3666); +COMPILER_STRIP_GATE(0x80855DFC, &lit_3666); /* 80855E00-80855E04 000004 0004+00 0/1 0/0 0/0 .rodata @3667 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_3667 = 0x3ECF5C28; -COMPILER_STRIP_GATE(80855E00, &lit_3667); +COMPILER_STRIP_GATE(0x80855E00, &lit_3667); #pragma pop /* 80855E04-80855E08 000008 0004+00 1/2 0/0 0/0 .rodata @3668 */ @@ -91,13 +91,13 @@ SECTION_RODATA static u8 const lit_3668[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80855E04, &lit_3668); +COMPILER_STRIP_GATE(0x80855E04, &lit_3668); /* 80855E08-80855E0C 00000C 0004+00 0/1 0/0 0/0 .rodata @3669 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3669 = 3.0f / 10.0f; -COMPILER_STRIP_GATE(80855E08, &lit_3669); +COMPILER_STRIP_GATE(0x80855E08, &lit_3669); #pragma pop /* 80855AC0-80855CC4 000080 0204+00 1/0 0/0 0/0 .text daKytag02_Execute__FP13kytag02_class */ diff --git a/rel/d/a/kytag/d_a_kytag03/d_a_kytag03.cpp b/rel/d/a/kytag/d_a_kytag03/d_a_kytag03.cpp index de662d61486..6e50eaf772e 100644 --- a/rel/d/a/kytag/d_a_kytag03/d_a_kytag03.cpp +++ b/rel/d/a/kytag/d_a_kytag03/d_a_kytag03.cpp @@ -25,13 +25,13 @@ struct dPath {}; struct dPa_levelEcallBack {}; -struct cXyz {}; - struct dKy_tevstr_c {}; +struct csXyz {}; + struct _GXColor {}; -struct csXyz {}; +struct cXyz {}; struct dPa_control_c { /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, @@ -128,7 +128,7 @@ extern "C" extern u8 struct_80450D64[4]; SECTION_RODATA static u8 const lit_3770[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80857650, &lit_3770); +COMPILER_STRIP_GATE(0x80857650, &lit_3770); /* 80857708-80857728 -00001 0020+00 1/0 0/0 0/0 .data l_daKytag03_Method */ SECTION_DATA static void* l_daKytag03_Method[8] = { @@ -188,7 +188,7 @@ SECTION_RODATA static u8 const lit_3870[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80857658, &lit_3870); +COMPILER_STRIP_GATE(0x80857658, &lit_3870); /* 80856124-80856238 0002C4 0114+00 1/1 0/0 0/0 .text get_rail_ratio_pos__FP5dPathifPsPs */ @@ -251,7 +251,7 @@ static asm void get_Extent_pos_end_get(kytag03_class* param_0, dPath* param_1, c #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4218 = 1000.0f; -COMPILER_STRIP_GATE(8085765C, &lit_4218); +COMPILER_STRIP_GATE(0x8085765C, &lit_4218); #pragma pop /* 80857660-80857668 000010 0004+04 0/3 0/0 0/0 .rodata @4219 */ @@ -262,7 +262,7 @@ SECTION_RODATA static f32 const lit_4219[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80857660, &lit_4219); +COMPILER_STRIP_GATE(0x80857660, &lit_4219); #pragma pop /* 80857668-80857670 000018 0008+00 0/2 0/0 0/0 .rodata @4220 */ @@ -271,7 +271,7 @@ COMPILER_STRIP_GATE(80857660, &lit_4219); SECTION_RODATA static u8 const lit_4220[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80857668, &lit_4220); +COMPILER_STRIP_GATE(0x80857668, &lit_4220); #pragma pop /* 80857670-80857678 000020 0008+00 0/2 0/0 0/0 .rodata @4221 */ @@ -280,7 +280,7 @@ COMPILER_STRIP_GATE(80857668, &lit_4220); SECTION_RODATA static u8 const lit_4221[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80857670, &lit_4221); +COMPILER_STRIP_GATE(0x80857670, &lit_4221); #pragma pop /* 80857678-80857680 000028 0008+00 0/2 0/0 0/0 .rodata @4222 */ @@ -289,126 +289,126 @@ COMPILER_STRIP_GATE(80857670, &lit_4221); SECTION_RODATA static u8 const lit_4222[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80857678, &lit_4222); +COMPILER_STRIP_GATE(0x80857678, &lit_4222); #pragma pop /* 80857680-80857684 000030 0004+00 0/1 0/0 0/0 .rodata @4223 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4223 = 55.0f; -COMPILER_STRIP_GATE(80857680, &lit_4223); +COMPILER_STRIP_GATE(0x80857680, &lit_4223); #pragma pop /* 80857684-80857688 000034 0004+00 0/2 0/0 0/0 .rodata @4224 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4224 = 1.5f; -COMPILER_STRIP_GATE(80857684, &lit_4224); +COMPILER_STRIP_GATE(0x80857684, &lit_4224); #pragma pop /* 80857688-8085768C 000038 0004+00 0/1 0/0 0/0 .rodata @4225 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4225 = 16.0f; -COMPILER_STRIP_GATE(80857688, &lit_4225); +COMPILER_STRIP_GATE(0x80857688, &lit_4225); #pragma pop /* 8085768C-80857690 00003C 0004+00 0/1 0/0 0/0 .rodata @4226 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4226 = 5000.0f; -COMPILER_STRIP_GATE(8085768C, &lit_4226); +COMPILER_STRIP_GATE(0x8085768C, &lit_4226); #pragma pop /* 80857690-80857694 000040 0004+00 0/1 0/0 0/0 .rodata @4227 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4227 = 4000.0f; -COMPILER_STRIP_GATE(80857690, &lit_4227); +COMPILER_STRIP_GATE(0x80857690, &lit_4227); #pragma pop /* 80857694-80857698 000044 0004+00 0/1 0/0 0/0 .rodata @4228 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4228 = 2000.0f; -COMPILER_STRIP_GATE(80857694, &lit_4228); +COMPILER_STRIP_GATE(0x80857694, &lit_4228); #pragma pop /* 80857698-8085769C 000048 0004+00 0/1 0/0 0/0 .rodata @4229 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4229 = 3000.0f; -COMPILER_STRIP_GATE(80857698, &lit_4229); +COMPILER_STRIP_GATE(0x80857698, &lit_4229); #pragma pop /* 8085769C-808576A0 00004C 0004+00 0/2 0/0 0/0 .rodata @4230 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4230 = 0.5f; -COMPILER_STRIP_GATE(8085769C, &lit_4230); +COMPILER_STRIP_GATE(0x8085769C, &lit_4230); #pragma pop /* 808576A0-808576A4 000050 0004+00 0/2 0/0 0/0 .rodata @4231 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4231 = 50.0f; -COMPILER_STRIP_GATE(808576A0, &lit_4231); +COMPILER_STRIP_GATE(0x808576A0, &lit_4231); #pragma pop /* 808576A4-808576A8 000054 0004+00 0/1 0/0 0/0 .rodata @4232 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4232 = 200.0f; -COMPILER_STRIP_GATE(808576A4, &lit_4232); +COMPILER_STRIP_GATE(0x808576A4, &lit_4232); #pragma pop /* 808576A8-808576AC 000058 0004+00 0/1 0/0 0/0 .rodata @4233 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4233 = 40.0f; -COMPILER_STRIP_GATE(808576A8, &lit_4233); +COMPILER_STRIP_GATE(0x808576A8, &lit_4233); #pragma pop /* 808576AC-808576B0 00005C 0004+00 0/1 0/0 0/0 .rodata @4234 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4234 = 4.0f / 5.0f; -COMPILER_STRIP_GATE(808576AC, &lit_4234); +COMPILER_STRIP_GATE(0x808576AC, &lit_4234); #pragma pop /* 808576B0-808576B4 000060 0004+00 0/1 0/0 0/0 .rodata @4235 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4235 = 2.0f; -COMPILER_STRIP_GATE(808576B0, &lit_4235); +COMPILER_STRIP_GATE(0x808576B0, &lit_4235); #pragma pop /* 808576B4-808576B8 000064 0004+00 0/1 0/0 0/0 .rodata @4236 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4236 = 14.0f / 5.0f; -COMPILER_STRIP_GATE(808576B4, &lit_4236); +COMPILER_STRIP_GATE(0x808576B4, &lit_4236); #pragma pop /* 808576B8-808576BC 000068 0004+00 0/1 0/0 0/0 .rodata @4237 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4237 = 45.0f; -COMPILER_STRIP_GATE(808576B8, &lit_4237); +COMPILER_STRIP_GATE(0x808576B8, &lit_4237); #pragma pop /* 808576BC-808576C0 00006C 0004+00 0/1 0/0 0/0 .rodata @4238 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4238 = 20.0f; -COMPILER_STRIP_GATE(808576BC, &lit_4238); +COMPILER_STRIP_GATE(0x808576BC, &lit_4238); #pragma pop /* 808576C0-808576C4 000070 0004+00 0/1 0/0 0/0 .rodata @4239 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4239 = 100.0f; -COMPILER_STRIP_GATE(808576C0, &lit_4239); +COMPILER_STRIP_GATE(0x808576C0, &lit_4239); #pragma pop /* 80856378-80856E24 000518 0AAC+00 1/1 0/0 0/0 .text odour_move__FP13kytag03_class */ @@ -432,84 +432,84 @@ static bool daKytag03_Draw(kytag03_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4485 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(808576C4, &lit_4485); +COMPILER_STRIP_GATE(0x808576C4, &lit_4485); #pragma pop /* 808576C8-808576CC 000078 0004+00 0/1 0/0 0/0 .rodata @4486 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4486 = 1.0f / 40.0f; -COMPILER_STRIP_GATE(808576C8, &lit_4486); +COMPILER_STRIP_GATE(0x808576C8, &lit_4486); #pragma pop /* 808576CC-808576D0 00007C 0004+00 0/1 0/0 0/0 .rodata @4487 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4487 = 0x358637BD; -COMPILER_STRIP_GATE(808576CC, &lit_4487); +COMPILER_STRIP_GATE(0x808576CC, &lit_4487); #pragma pop /* 808576D0-808576D4 000080 0004+00 0/1 0/0 0/0 .rodata @4488 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4488 = 7425.0f; -COMPILER_STRIP_GATE(808576D0, &lit_4488); +COMPILER_STRIP_GATE(0x808576D0, &lit_4488); #pragma pop /* 808576D4-808576D8 000084 0004+00 0/1 0/0 0/0 .rodata @4489 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4489 = 30.0f; -COMPILER_STRIP_GATE(808576D4, &lit_4489); +COMPILER_STRIP_GATE(0x808576D4, &lit_4489); #pragma pop /* 808576D8-808576DC 000088 0004+00 0/1 0/0 0/0 .rodata @4490 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4490 = 3.0f; -COMPILER_STRIP_GATE(808576D8, &lit_4490); +COMPILER_STRIP_GATE(0x808576D8, &lit_4490); #pragma pop /* 808576DC-808576E0 00008C 0004+00 0/1 0/0 0/0 .rodata @4491 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4491 = 4.0f; -COMPILER_STRIP_GATE(808576DC, &lit_4491); +COMPILER_STRIP_GATE(0x808576DC, &lit_4491); #pragma pop /* 808576E0-808576E4 000090 0004+00 0/1 0/0 0/0 .rodata @4492 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4492 = 2.5f; -COMPILER_STRIP_GATE(808576E0, &lit_4492); +COMPILER_STRIP_GATE(0x808576E0, &lit_4492); #pragma pop /* 808576E4-808576E8 000094 0004+00 0/1 0/0 0/0 .rodata @4493 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4493 = 11.0f / 5.0f; -COMPILER_STRIP_GATE(808576E4, &lit_4493); +COMPILER_STRIP_GATE(0x808576E4, &lit_4493); #pragma pop /* 808576E8-808576EC 000098 0004+00 0/1 0/0 0/0 .rodata @4494 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4494 = 0.75f; -COMPILER_STRIP_GATE(808576E8, &lit_4494); +COMPILER_STRIP_GATE(0x808576E8, &lit_4494); #pragma pop /* 808576EC-808576F0 00009C 0004+00 0/1 0/0 0/0 .rodata @4495 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4495 = 32.0f; -COMPILER_STRIP_GATE(808576EC, &lit_4495); +COMPILER_STRIP_GATE(0x808576EC, &lit_4495); #pragma pop /* 808576F0-808576F4 0000A0 0004+00 0/1 0/0 0/0 .rodata @4496 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4496 = 223.0f; -COMPILER_STRIP_GATE(808576F0, &lit_4496); +COMPILER_STRIP_GATE(0x808576F0, &lit_4496); #pragma pop /* 80857768-8085776C -00001 0004+00 1/1 0/0 0/0 .bss None */ @@ -548,7 +548,7 @@ static asm void daKytag03_Delete(kytag03_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4572 = 255.0f; -COMPILER_STRIP_GATE(808576F4, &lit_4572); +COMPILER_STRIP_GATE(0x808576F4, &lit_4572); #pragma pop /* 808576F8-80857700 0000A8 0004+04 0/1 0/0 0/0 .rodata @4573 */ @@ -559,7 +559,7 @@ SECTION_RODATA static f32 const lit_4573[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(808576F8, &lit_4573); +COMPILER_STRIP_GATE(0x808576F8, &lit_4573); #pragma pop /* 80857700-80857708 0000B0 0008+00 0/1 0/0 0/0 .rodata @4575 */ @@ -568,7 +568,7 @@ COMPILER_STRIP_GATE(808576F8, &lit_4573); SECTION_RODATA static u8 const lit_4575[8] = { 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80857700, &lit_4575); +COMPILER_STRIP_GATE(0x80857700, &lit_4575); #pragma pop /* 80857470-80857648 001610 01D8+00 1/0 0/0 0/0 .text daKytag03_Create__FP10fopAc_ac_c */ diff --git a/rel/d/a/kytag/d_a_kytag04/d_a_kytag04.cpp b/rel/d/a/kytag/d_a_kytag04/d_a_kytag04.cpp index 1188c496b8c..738838d570b 100644 --- a/rel/d/a/kytag/d_a_kytag04/d_a_kytag04.cpp +++ b/rel/d/a/kytag/d_a_kytag04/d_a_kytag04.cpp @@ -64,13 +64,13 @@ struct dRes_control_c { struct dPa_levelEcallBack {}; -struct cXyz {}; - struct dKy_tevstr_c {}; +struct csXyz {}; + struct _GXColor {}; -struct csXyz {}; +struct cXyz {}; struct dPa_control_c { /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, @@ -86,10 +86,10 @@ struct dComIfG_play_c { /* 8002C97C */ void getLayerNo(int); }; -struct Vec {}; - struct JAISoundID {}; +struct Vec {}; + struct Z2SeMgr { /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); }; @@ -178,13 +178,13 @@ extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; /* ############################################################################################## */ /* 8046DA18-8046DA1C 000000 0004+00 2/2 0/0 0/0 .rodata @3960 */ SECTION_RODATA static f32 const lit_3960 = 20.0f; -COMPILER_STRIP_GATE(8046DA18, &lit_3960); +COMPILER_STRIP_GATE(0x8046DA18, &lit_3960); /* 8046DA1C-8046DA20 000004 0004+00 0/1 0/0 0/0 .rodata @3961 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3961 = 6000.0f; -COMPILER_STRIP_GATE(8046DA1C, &lit_3961); +COMPILER_STRIP_GATE(0x8046DA1C, &lit_3961); #pragma pop /* 8046DA20-8046DA24 000008 0004+00 1/3 0/0 0/0 .rodata @3962 */ @@ -194,49 +194,49 @@ SECTION_RODATA static u8 const lit_3962[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(8046DA20, &lit_3962); +COMPILER_STRIP_GATE(0x8046DA20, &lit_3962); /* 8046DA24-8046DA28 00000C 0004+00 1/2 0/0 0/0 .rodata @3963 */ SECTION_RODATA static f32 const lit_3963 = 999.0f; -COMPILER_STRIP_GATE(8046DA24, &lit_3963); +COMPILER_STRIP_GATE(0x8046DA24, &lit_3963); /* 8046DA28-8046DA2C 000010 0004+00 1/3 0/0 0/0 .rodata @3964 */ SECTION_RODATA static f32 const lit_3964 = 1.0f; -COMPILER_STRIP_GATE(8046DA28, &lit_3964); +COMPILER_STRIP_GATE(0x8046DA28, &lit_3964); /* 8046DA2C-8046DA30 000014 0004+00 0/1 0/0 0/0 .rodata @3965 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3965 = 0.25f; -COMPILER_STRIP_GATE(8046DA2C, &lit_3965); +COMPILER_STRIP_GATE(0x8046DA2C, &lit_3965); #pragma pop /* 8046DA30-8046DA34 000018 0004+00 0/1 0/0 0/0 .rodata @3966 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3966 = 1.0f / 80.0f; -COMPILER_STRIP_GATE(8046DA30, &lit_3966); +COMPILER_STRIP_GATE(0x8046DA30, &lit_3966); #pragma pop /* 8046DA34-8046DA38 00001C 0004+00 0/1 0/0 0/0 .rodata @3967 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_3967 = 0x38D1B717; -COMPILER_STRIP_GATE(8046DA34, &lit_3967); +COMPILER_STRIP_GATE(0x8046DA34, &lit_3967); #pragma pop /* 8046DA38-8046DA3C 000020 0004+00 0/1 0/0 0/0 .rodata @3968 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3968 = 0.5f; -COMPILER_STRIP_GATE(8046DA38, &lit_3968); +COMPILER_STRIP_GATE(0x8046DA38, &lit_3968); #pragma pop /* 8046DA3C-8046DA40 000024 0004+00 0/1 0/0 0/0 .rodata @3969 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3969 = 1.0f / 50.0f; -COMPILER_STRIP_GATE(8046DA3C, &lit_3969); +COMPILER_STRIP_GATE(0x8046DA3C, &lit_3969); #pragma pop /* 8046CB58-8046CFE8 000078 0490+00 1/0 0/0 0/0 .text daKytag04_Draw__FP13kytag04_class @@ -259,7 +259,14 @@ SECTION_RODATA static f32 const lit_4066[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(8046DA40, &lit_4066); +COMPILER_STRIP_GATE(0x8046DA40, &lit_4066); +#pragma pop + +/* 8046DA50-8046DA50 000038 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8046DA50 = "WITHWARP_OPEN"; +SECTION_DEAD static char const* const stringBase_8046DA5E = "F_SP104"; #pragma pop /* 8046CFE8-8046D354 000508 036C+00 1/0 0/0 0/0 .text daKytag04_Execute__FP13kytag04_class */ @@ -277,6 +284,13 @@ static bool daKytag04_IsDelete(kytag04_class* param_0) { return true; } +/* ############################################################################################## */ +/* 8046DA50-8046DA50 000038 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8046DA66 = "Kytag04"; +#pragma pop + /* 8046D35C-8046D474 00087C 0118+00 1/0 0/0 0/0 .text daKytag04_Delete__FP13kytag04_class */ #pragma push @@ -303,7 +317,13 @@ static asm void useHeapInit(fopAc_ac_c* param_0) { SECTION_RODATA static u8 const lit_4326[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8046DA48, &lit_4326); +COMPILER_STRIP_GATE(0x8046DA48, &lit_4326); + +/* 8046DA50-8046DA50 000038 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8046DA6E = "F_SP110"; +#pragma pop /* 8046DA78-8046DA98 -00001 0020+00 1/0 0/0 0/0 .data l_daKytag04_Method */ SECTION_DATA static void* l_daKytag04_Method[8] = { @@ -354,12 +374,4 @@ asm J3DFrameCtrl::~J3DFrameCtrl() { } #pragma pop -/* 8046DA50-8046DA76 000038 0026+00 4/4 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_8046DA50 = "WITHWARP_OPEN"; -SECTION_DEAD static char const* const stringBase_8046DA5E = "F_SP104"; -SECTION_DEAD static char const* const stringBase_8046DA66 = "Kytag04"; -SECTION_DEAD static char const* const stringBase_8046DA6E = "F_SP110"; -#pragma pop +/* 8046DA50-8046DA50 000038 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/kytag/d_a_kytag05/d_a_kytag05.cpp b/rel/d/a/kytag/d_a_kytag05/d_a_kytag05.cpp index ee94fa38f15..7cb0988b000 100644 --- a/rel/d/a/kytag/d_a_kytag05/d_a_kytag05.cpp +++ b/rel/d/a/kytag/d_a_kytag05/d_a_kytag05.cpp @@ -65,7 +65,7 @@ static bool daKytag05_Delete(kytag05_class* param_0) { /* ############################################################################################## */ /* 80528B18-80528B1C 000000 0004+00 1/1 0/0 0/0 .rodata @3665 */ SECTION_RODATA static f32 const lit_3665 = 100.0f; -COMPILER_STRIP_GATE(80528B18, &lit_3665); +COMPILER_STRIP_GATE(0x80528B18, &lit_3665); /* 80528A78-80528B10 000098 0098+00 1/0 0/0 0/0 .text daKytag05_Create__FP10fopAc_ac_c */ #pragma push diff --git a/rel/d/a/kytag/d_a_kytag06/d_a_kytag06.cpp b/rel/d/a/kytag/d_a_kytag06/d_a_kytag06.cpp index 69ed6c377b2..1a6b2d7de01 100644 --- a/rel/d/a/kytag/d_a_kytag06/d_a_kytag06.cpp +++ b/rel/d/a/kytag/d_a_kytag06/d_a_kytag06.cpp @@ -28,15 +28,15 @@ struct dSv_event_c { struct dPa_levelEcallBack {}; -struct cXyz { - /* 808589A4 */ ~cXyz(); -}; - struct dKy_tevstr_c {}; +struct csXyz {}; + struct _GXColor {}; -struct csXyz {}; +struct cXyz { + /* 808589A4 */ ~cXyz(); +}; struct dPa_control_c { /* 8004D4CC */ void set(u32, u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, @@ -48,10 +48,6 @@ struct dComIfG_play_c { /* 8002C97C */ void getLayerNo(int); }; -struct Z2EnvSeMgr { - /* 802C7FB4 */ void setSnowPower(s8); -}; - // // Forward References: // @@ -142,7 +138,7 @@ extern "C" void __register_global_object(); /* ############################################################################################## */ /* 80859E78-80859E7C 000000 0004+00 11/11 0/0 0/0 .rodata @3740 */ SECTION_RODATA static f32 const lit_3740 = 360.0f; -COMPILER_STRIP_GATE(80859E78, &lit_3740); +COMPILER_STRIP_GATE(0x80859E78, &lit_3740); /* 8085786C-80857918 0000EC 00AC+00 1/1 0/0 0/0 .text dice_wether_init__FUcff */ #pragma push @@ -179,28 +175,28 @@ static asm void dice_rain_minus() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3877 = 15.0f; -COMPILER_STRIP_GATE(80859E7C, &lit_3877); +COMPILER_STRIP_GATE(0x80859E7C, &lit_3877); #pragma pop /* 80859E80-80859E84 000008 0004+00 0/1 0/0 0/0 .rodata @3878 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_3878 = 0x414FD70A; -COMPILER_STRIP_GATE(80859E80, &lit_3878); +COMPILER_STRIP_GATE(0x80859E80, &lit_3878); #pragma pop /* 80859E84-80859E88 00000C 0004+00 0/1 0/0 0/0 .rodata @3879 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3879 = 180.0f; -COMPILER_STRIP_GATE(80859E84, &lit_3879); +COMPILER_STRIP_GATE(0x80859E84, &lit_3879); #pragma pop /* 80859E88-80859E8C 000010 0004+00 0/1 0/0 0/0 .rodata @3880 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_3880 = 0x40FFAE14; -COMPILER_STRIP_GATE(80859E88, &lit_3880); +COMPILER_STRIP_GATE(0x80859E88, &lit_3880); #pragma pop /* 80859FA0-80859FAC 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ @@ -384,7 +380,7 @@ SECTION_RODATA static u8 const lit_3881[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80859E8C, &lit_3881); +COMPILER_STRIP_GATE(0x80859E8C, &lit_3881); /* 80859E90-80859E98 000018 0004+04 0/1 0/0 0/0 .rodata @3939 */ #pragma push @@ -394,7 +390,7 @@ SECTION_RODATA static f32 const lit_3939[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80859E90, &lit_3939); +COMPILER_STRIP_GATE(0x80859E90, &lit_3939); #pragma pop /* 80859E98-80859EA0 000020 0008+00 0/2 0/0 0/0 .rodata @3940 */ @@ -403,7 +399,7 @@ COMPILER_STRIP_GATE(80859E90, &lit_3939); SECTION_RODATA static u8 const lit_3940[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80859E98, &lit_3940); +COMPILER_STRIP_GATE(0x80859E98, &lit_3940); #pragma pop /* 80859EA0-80859EA8 000028 0008+00 0/2 0/0 0/0 .rodata @3941 */ @@ -412,7 +408,7 @@ COMPILER_STRIP_GATE(80859E98, &lit_3940); SECTION_RODATA static u8 const lit_3941[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80859EA0, &lit_3941); +COMPILER_STRIP_GATE(0x80859EA0, &lit_3941); #pragma pop /* 80859EA8-80859EB0 000030 0008+00 0/2 0/0 0/0 .rodata @3942 */ @@ -421,7 +417,7 @@ COMPILER_STRIP_GATE(80859EA0, &lit_3941); SECTION_RODATA static u8 const lit_3942[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80859EA8, &lit_3942); +COMPILER_STRIP_GATE(0x80859EA8, &lit_3942); #pragma pop /* 80857F8C-8085811C 00080C 0190+00 1/1 0/0 0/0 .text near_rail_get__FP13kytag06_classP4cXyz */ @@ -461,67 +457,67 @@ static asm void daKytag06_lv7_boss_wether_proc(kytag06_class* param_0, u8 param_ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4006 = 3.0f / 10.0f; -COMPILER_STRIP_GATE(80859EB0, &lit_4006); +COMPILER_STRIP_GATE(0x80859EB0, &lit_4006); #pragma pop /* 80859EB4-80859EB8 00003C 0004+00 0/1 0/0 0/0 .rodata @4007 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4007 = 0.25f; -COMPILER_STRIP_GATE(80859EB4, &lit_4007); +COMPILER_STRIP_GATE(0x80859EB4, &lit_4007); #pragma pop /* 80859EB8-80859EBC 000040 0004+00 0/6 0/0 0/0 .rodata @4008 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4008 = 1.0f / 100.0f; -COMPILER_STRIP_GATE(80859EB8, &lit_4008); +COMPILER_STRIP_GATE(0x80859EB8, &lit_4008); #pragma pop /* 80859EBC-80859EC0 000044 0004+00 0/1 0/0 0/0 .rodata @4009 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4009 = 0x3727C5AC; -COMPILER_STRIP_GATE(80859EBC, &lit_4009); +COMPILER_STRIP_GATE(0x80859EBC, &lit_4009); #pragma pop /* 80859EC0-80859EC4 000048 0004+00 0/1 0/0 0/0 .rodata @4010 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4010 = 7.0f / 10.0f; -COMPILER_STRIP_GATE(80859EC0, &lit_4010); +COMPILER_STRIP_GATE(0x80859EC0, &lit_4010); #pragma pop /* 80859EC4-80859EC8 00004C 0004+00 0/5 0/0 0/0 .rodata @4011 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4011 = 0.5f; -COMPILER_STRIP_GATE(80859EC4, &lit_4011); +COMPILER_STRIP_GATE(0x80859EC4, &lit_4011); #pragma pop /* 80859EC8-80859ECC 000050 0004+00 1/7 0/0 0/0 .rodata @4012 */ SECTION_RODATA static f32 const lit_4012 = 1.0f; -COMPILER_STRIP_GATE(80859EC8, &lit_4012); +COMPILER_STRIP_GATE(0x80859EC8, &lit_4012); /* 80859ECC-80859ED0 000054 0004+00 0/3 0/0 0/0 .rodata @4013 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4013 = 99.0f / 100.0f; -COMPILER_STRIP_GATE(80859ECC, &lit_4013); +COMPILER_STRIP_GATE(0x80859ECC, &lit_4013); #pragma pop /* 80859ED0-80859ED4 000058 0004+00 0/4 0/0 0/0 .rodata @4014 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4014 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(80859ED0, &lit_4014); +COMPILER_STRIP_GATE(0x80859ED0, &lit_4014); #pragma pop /* 80859ED4-80859ED8 00005C 0004+00 0/1 0/0 0/0 .rodata @4015 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4015 = 0x3C75C28F; -COMPILER_STRIP_GATE(80859ED4, &lit_4015); +COMPILER_STRIP_GATE(0x80859ED4, &lit_4015); #pragma pop /* 8085824C-808584B4 000ACC 0268+00 1/1 0/0 0/0 .text @@ -575,119 +571,119 @@ static asm void daKytag06_type_07_wether_Execute(kytag06_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4114 = 285.0f; -COMPILER_STRIP_GATE(80859ED8, &lit_4114); +COMPILER_STRIP_GATE(0x80859ED8, &lit_4114); #pragma pop /* 80859EDC-80859EE0 000064 0004+00 0/2 0/0 0/0 .rodata @4115 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4115 = 82.5f; -COMPILER_STRIP_GATE(80859EDC, &lit_4115); +COMPILER_STRIP_GATE(0x80859EDC, &lit_4115); #pragma pop /* 80859EE0-80859EE4 000068 0004+00 0/2 0/0 0/0 .rodata @4116 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4116 = 4.0f / 5.0f; -COMPILER_STRIP_GATE(80859EE0, &lit_4116); +COMPILER_STRIP_GATE(0x80859EE0, &lit_4116); #pragma pop /* 80859EE4-80859EE8 00006C 0004+00 0/3 0/0 0/0 .rodata @4117 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4117 = 0x38D1B717; -COMPILER_STRIP_GATE(80859EE4, &lit_4117); +COMPILER_STRIP_GATE(0x80859EE4, &lit_4117); #pragma pop /* 80859EE8-80859EEC 000070 0004+00 0/2 0/0 0/0 .rodata @4118 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4118 = 79.0f / 100.0f; -COMPILER_STRIP_GATE(80859EE8, &lit_4118); +COMPILER_STRIP_GATE(0x80859EE8, &lit_4118); #pragma pop /* 80859EEC-80859EF0 000074 0004+00 0/3 0/0 0/0 .rodata @4119 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4119 = 3.0f / 5.0f; -COMPILER_STRIP_GATE(80859EEC, &lit_4119); +COMPILER_STRIP_GATE(0x80859EEC, &lit_4119); #pragma pop /* 80859EF0-80859EF4 000078 0004+00 0/2 0/0 0/0 .rodata @4120 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4120 = 1.5f; -COMPILER_STRIP_GATE(80859EF0, &lit_4120); +COMPILER_STRIP_GATE(0x80859EF0, &lit_4120); #pragma pop /* 80859EF4-80859EF8 00007C 0004+00 0/2 0/0 0/0 .rodata @4121 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4121 = 61.0f / 100.0f; -COMPILER_STRIP_GATE(80859EF4, &lit_4121); +COMPILER_STRIP_GATE(0x80859EF4, &lit_4121); #pragma pop /* 80859EF8-80859EFC 000080 0004+00 0/1 0/0 0/0 .rodata @4122 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4122 = -273.0f; -COMPILER_STRIP_GATE(80859EF8, &lit_4122); +COMPILER_STRIP_GATE(0x80859EF8, &lit_4122); #pragma pop /* 80859EFC-80859F00 000084 0004+00 0/1 0/0 0/0 .rodata @4123 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4123 = 233.0f; -COMPILER_STRIP_GATE(80859EFC, &lit_4123); +COMPILER_STRIP_GATE(0x80859EFC, &lit_4123); #pragma pop /* 80859F00-80859F04 000088 0004+00 0/1 0/0 0/0 .rodata @4124 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4124 = 160.0f; -COMPILER_STRIP_GATE(80859F00, &lit_4124); +COMPILER_STRIP_GATE(0x80859F00, &lit_4124); #pragma pop /* 80859F04-80859F08 00008C 0004+00 0/1 0/0 0/0 .rodata @4125 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4125 = 2.0f; -COMPILER_STRIP_GATE(80859F04, &lit_4125); +COMPILER_STRIP_GATE(0x80859F04, &lit_4125); #pragma pop /* 80859F08-80859F0C 000090 0004+00 0/1 0/0 0/0 .rodata @4126 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4126 = 25.0f; -COMPILER_STRIP_GATE(80859F08, &lit_4126); +COMPILER_STRIP_GATE(0x80859F08, &lit_4126); #pragma pop /* 80859F0C-80859F10 000094 0004+00 0/1 0/0 0/0 .rodata @4127 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4127 = 230.0f; -COMPILER_STRIP_GATE(80859F0C, &lit_4127); +COMPILER_STRIP_GATE(0x80859F0C, &lit_4127); #pragma pop /* 80859F10-80859F14 000098 0004+00 0/1 0/0 0/0 .rodata @4128 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4128 = 30.0f; -COMPILER_STRIP_GATE(80859F10, &lit_4128); +COMPILER_STRIP_GATE(0x80859F10, &lit_4128); #pragma pop /* 80859F14-80859F18 00009C 0004+00 0/1 0/0 0/0 .rodata @4129 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4129 = 215.0f; -COMPILER_STRIP_GATE(80859F14, &lit_4129); +COMPILER_STRIP_GATE(0x80859F14, &lit_4129); #pragma pop /* 80859F18-80859F1C 0000A0 0004+00 0/1 0/0 0/0 .rodata @4130 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4130 = 155.0f; -COMPILER_STRIP_GATE(80859F18, &lit_4130); +COMPILER_STRIP_GATE(0x80859F18, &lit_4130); #pragma pop /* 808586F0-808589A4 000F70 02B4+00 1/1 0/0 0/0 .text daKytag06_type_07_Execute__FP13kytag06_class @@ -716,35 +712,35 @@ asm cXyz::~cXyz() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4205 = 10.0f; -COMPILER_STRIP_GATE(80859F1C, &lit_4205); +COMPILER_STRIP_GATE(0x80859F1C, &lit_4205); #pragma pop /* 80859F20-80859F24 0000A8 0004+00 0/1 0/0 0/0 .rodata @4206 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4206 = 245.0f; -COMPILER_STRIP_GATE(80859F20, &lit_4206); +COMPILER_STRIP_GATE(0x80859F20, &lit_4206); #pragma pop /* 80859F24-80859F28 0000AC 0004+00 0/1 0/0 0/0 .rodata @4207 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4207 = 185.0f; -COMPILER_STRIP_GATE(80859F24, &lit_4207); +COMPILER_STRIP_GATE(0x80859F24, &lit_4207); #pragma pop /* 80859F28-80859F2C 0000B0 0004+00 0/1 0/0 0/0 .rodata @4208 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4208 = 20.0f; -COMPILER_STRIP_GATE(80859F28, &lit_4208); +COMPILER_STRIP_GATE(0x80859F28, &lit_4208); #pragma pop /* 80859F2C-80859F30 0000B4 0004+00 0/1 0/0 0/0 .rodata @4209 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4209 = 130.0f; -COMPILER_STRIP_GATE(80859F2C, &lit_4209); +COMPILER_STRIP_GATE(0x80859F2C, &lit_4209); #pragma pop /* 8085A06C-8085A074 0000CC 0008+00 1/1 0/0 0/0 .data w_eff_name$4163 */ @@ -895,112 +891,112 @@ static asm void daKytag06_type_09_Execute(kytag06_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4336 = 2079.0f; -COMPILER_STRIP_GATE(80859F30, &lit_4336); +COMPILER_STRIP_GATE(0x80859F30, &lit_4336); #pragma pop /* 80859F34-80859F38 0000BC 0004+00 0/1 0/0 0/0 .rodata @4337 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4337 = 3013.0f; -COMPILER_STRIP_GATE(80859F34, &lit_4337); +COMPILER_STRIP_GATE(0x80859F34, &lit_4337); #pragma pop /* 80859F38-80859F3C 0000C0 0004+00 0/1 0/0 0/0 .rodata @4338 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4338 = 864.0f; -COMPILER_STRIP_GATE(80859F38, &lit_4338); +COMPILER_STRIP_GATE(0x80859F38, &lit_4338); #pragma pop /* 80859F3C-80859F40 0000C4 0004+00 0/1 0/0 0/0 .rodata @4339 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4339 = -6000.0f; -COMPILER_STRIP_GATE(80859F3C, &lit_4339); +COMPILER_STRIP_GATE(0x80859F3C, &lit_4339); #pragma pop /* 80859F40-80859F44 0000C8 0004+00 0/1 0/0 0/0 .rodata @4340 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4340 = -4145.0f; -COMPILER_STRIP_GATE(80859F40, &lit_4340); +COMPILER_STRIP_GATE(0x80859F40, &lit_4340); #pragma pop /* 80859F44-80859F48 0000CC 0004+00 0/1 0/0 0/0 .rodata @4341 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4341 = -2960.0f; -COMPILER_STRIP_GATE(80859F44, &lit_4341); +COMPILER_STRIP_GATE(0x80859F44, &lit_4341); #pragma pop /* 80859F48-80859F4C 0000D0 0004+00 0/1 0/0 0/0 .rodata @4342 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4342 = -880.0f; -COMPILER_STRIP_GATE(80859F48, &lit_4342); +COMPILER_STRIP_GATE(0x80859F48, &lit_4342); #pragma pop /* 80859F4C-80859F50 0000D4 0004+00 0/1 0/0 0/0 .rodata @4343 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4343 = -4920.0f; -COMPILER_STRIP_GATE(80859F4C, &lit_4343); +COMPILER_STRIP_GATE(0x80859F4C, &lit_4343); #pragma pop /* 80859F50-80859F54 0000D8 0004+00 0/1 0/0 0/0 .rodata @4344 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4344 = -2000.0f; -COMPILER_STRIP_GATE(80859F50, &lit_4344); +COMPILER_STRIP_GATE(0x80859F50, &lit_4344); #pragma pop /* 80859F54-80859F58 0000DC 0004+00 0/1 0/0 0/0 .rodata @4345 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4345 = 0x3A83126F; -COMPILER_STRIP_GATE(80859F54, &lit_4345); +COMPILER_STRIP_GATE(0x80859F54, &lit_4345); #pragma pop /* 80859F58-80859F5C 0000E0 0004+00 0/1 0/0 0/0 .rodata @4346 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4346 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(80859F58, &lit_4346); +COMPILER_STRIP_GATE(0x80859F58, &lit_4346); #pragma pop /* 80859F5C-80859F60 0000E4 0004+00 0/1 0/0 0/0 .rodata @4347 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4347 = 7.0f / 20.0f; -COMPILER_STRIP_GATE(80859F5C, &lit_4347); +COMPILER_STRIP_GATE(0x80859F5C, &lit_4347); #pragma pop /* 80859F60-80859F64 0000E8 0004+00 0/2 0/0 0/0 .rodata @4348 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4348 = 500.0f; -COMPILER_STRIP_GATE(80859F60, &lit_4348); +COMPILER_STRIP_GATE(0x80859F60, &lit_4348); #pragma pop /* 80859F64-80859F68 0000EC 0004+00 0/1 0/0 0/0 .rodata @4349 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4349 = 50.0f; -COMPILER_STRIP_GATE(80859F64, &lit_4349); +COMPILER_STRIP_GATE(0x80859F64, &lit_4349); #pragma pop /* 80859F68-80859F6C 0000F0 0004+00 0/1 0/0 0/0 .rodata @4350 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4350 = 63.0f; -COMPILER_STRIP_GATE(80859F68, &lit_4350); +COMPILER_STRIP_GATE(0x80859F68, &lit_4350); #pragma pop /* 80859F6C-80859F70 0000F4 0004+00 0/2 0/0 0/0 .rodata @4351 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4351 = 127.0f; -COMPILER_STRIP_GATE(80859F6C, &lit_4351); +COMPILER_STRIP_GATE(0x80859F6C, &lit_4351); #pragma pop /* 80858D2C-8085912C 0015AC 0400+00 1/1 0/0 0/0 .text daKytag06_type_10_Execute__FP13kytag06_class @@ -1030,7 +1026,7 @@ static asm void daKytag06_type_11_Execute(kytag06_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4406 = 5000.0f; -COMPILER_STRIP_GATE(80859F70, &lit_4406); +COMPILER_STRIP_GATE(0x80859F70, &lit_4406); #pragma pop /* 808591A4-8085931C 001A24 0178+00 1/1 0/0 0/0 .text daKytag06_type_05_Execute__FP13kytag06_class @@ -1060,7 +1056,7 @@ static asm void daKytag06_type_03_Execute(kytag06_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4609 = 255.0f; -COMPILER_STRIP_GATE(80859F74, &lit_4609); +COMPILER_STRIP_GATE(0x80859F74, &lit_4609); #pragma pop /* 80859F78-80859F80 000100 0004+04 0/1 0/0 0/0 .rodata @4610 */ @@ -1071,7 +1067,7 @@ SECTION_RODATA static f32 const lit_4610[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80859F78, &lit_4610); +COMPILER_STRIP_GATE(0x80859F78, &lit_4610); #pragma pop /* 80859F80-80859F88 000108 0008+00 0/1 0/0 0/0 .rodata @4613 */ @@ -1080,7 +1076,13 @@ COMPILER_STRIP_GATE(80859F78, &lit_4610); SECTION_RODATA static u8 const lit_4613[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80859F80, &lit_4613); +COMPILER_STRIP_GATE(0x80859F80, &lit_4613); +#pragma pop + +/* 80859F90-80859F90 000118 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80859F90 = "F_SP114"; #pragma pop /* 8085A074-8085A0A4 -00001 0030+00 1/1 0/0 0/0 .data @4611 */ @@ -1117,7 +1119,7 @@ static bool daKytag06_IsDelete(kytag06_class* param_0) { /* ############################################################################################## */ /* 80859F88-80859F8C 000110 0004+00 1/1 0/0 0/0 .rodata @4638 */ SECTION_RODATA static f32 const lit_4638 = 270.0f; -COMPILER_STRIP_GATE(80859F88, &lit_4638); +COMPILER_STRIP_GATE(0x80859F88, &lit_4638); /* 80859A90-80859AD0 002310 0040+00 1/0 0/0 0/0 .text daKytag06_Delete__FP13kytag06_class */ @@ -1173,7 +1175,13 @@ static asm void daKytag06_type03_init(fopAc_ac_c* param_0) { /* ############################################################################################## */ /* 80859F8C-80859F90 000114 0004+00 1/1 0/0 0/0 .rodata @4771 */ SECTION_RODATA static f32 const lit_4771 = 210.0f; -COMPILER_STRIP_GATE(80859F8C, &lit_4771); +COMPILER_STRIP_GATE(0x80859F8C, &lit_4771); + +/* 80859F90-80859F90 000118 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80859F98 = "T_MUKAO"; +#pragma pop /* 8085A0A4-8085A0D4 -00001 0030+00 1/1 0/0 0/0 .data @4772 */ SECTION_DATA static void* lit_4772[12] = { @@ -1395,10 +1403,4 @@ static u8 data_8085A1E8[4]; static u8 data_8085A1EC[4]; #pragma pop -/* 80859F90-80859FA0 000118 0010+00 2/2 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80859F90 = "F_SP114"; -SECTION_DEAD static char const* const stringBase_80859F98 = "T_MUKAO"; -#pragma pop +/* 80859F90-80859F90 000118 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/kytag/d_a_kytag07/d_a_kytag07.cpp b/rel/d/a/kytag/d_a_kytag07/d_a_kytag07.cpp index 345d2020855..4a484d75661 100644 --- a/rel/d/a/kytag/d_a_kytag07/d_a_kytag07.cpp +++ b/rel/d/a/kytag/d_a_kytag07/d_a_kytag07.cpp @@ -57,20 +57,20 @@ static bool daKytag07_Draw(kytag07_class* param_0) { /* ############################################################################################## */ /* 8085A484-8085A488 000000 0004+00 2/2 0/0 0/0 .rodata @3754 */ SECTION_RODATA static f32 const lit_3754 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(8085A484, &lit_3754); +COMPILER_STRIP_GATE(0x8085A484, &lit_3754); /* 8085A488-8085A48C 000004 0004+00 0/2 0/0 0/0 .rodata @3755 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3755 = 1000.0f; -COMPILER_STRIP_GATE(8085A488, &lit_3755); +COMPILER_STRIP_GATE(0x8085A488, &lit_3755); #pragma pop /* 8085A48C-8085A490 000008 0004+00 0/1 0/0 0/0 .rodata @3756 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_3756 = 0x3A83126F; -COMPILER_STRIP_GATE(8085A48C, &lit_3756); +COMPILER_STRIP_GATE(0x8085A48C, &lit_3756); #pragma pop /* 8085A490-8085A494 00000C 0004+00 0/1 0/0 0/0 .rodata @3757 */ @@ -82,33 +82,33 @@ SECTION_RODATA static u8 const lit_3757[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(8085A490, &lit_3757); +COMPILER_STRIP_GATE(0x8085A490, &lit_3757); #pragma pop /* 8085A494-8085A498 000010 0004+00 0/1 0/0 0/0 .rodata @3758 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3758 = 0.25f; -COMPILER_STRIP_GATE(8085A494, &lit_3758); +COMPILER_STRIP_GATE(0x8085A494, &lit_3758); #pragma pop /* 8085A498-8085A49C 000014 0004+00 0/1 0/0 0/0 .rodata @3759 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3759 = 10000.0f; -COMPILER_STRIP_GATE(8085A498, &lit_3759); +COMPILER_STRIP_GATE(0x8085A498, &lit_3759); #pragma pop /* 8085A49C-8085A4A0 000018 0004+00 0/2 0/0 0/0 .rodata @3760 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3760 = 1.0f; -COMPILER_STRIP_GATE(8085A49C, &lit_3760); +COMPILER_STRIP_GATE(0x8085A49C, &lit_3760); #pragma pop /* 8085A4A0-8085A4A4 00001C 0004+00 1/2 0/0 0/0 .rodata @3761 */ SECTION_RODATA static f32 const lit_3761 = 1.0f / 100.0f; -COMPILER_STRIP_GATE(8085A4A0, &lit_3761); +COMPILER_STRIP_GATE(0x8085A4A0, &lit_3761); /* 8085A280-8085A334 000080 00B4+00 1/0 0/0 0/0 .text daKytag07_Execute__FP13kytag07_class */ #pragma push @@ -146,7 +146,7 @@ static asm void daKytag07_Delete(kytag07_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_3807 = 0x2EDBE6FF; -COMPILER_STRIP_GATE(8085A4A4, &lit_3807); +COMPILER_STRIP_GATE(0x8085A4A4, &lit_3807); #pragma pop /* 8085A3B0-8085A47C 0001B0 00CC+00 1/0 0/0 0/0 .text daKytag07_Create__FP10fopAc_ac_c */ diff --git a/rel/d/a/kytag/d_a_kytag08/d_a_kytag08.cpp b/rel/d/a/kytag/d_a_kytag08/d_a_kytag08.cpp index 42be640af48..08dd11bfa8a 100644 --- a/rel/d/a/kytag/d_a_kytag08/d_a_kytag08.cpp +++ b/rel/d/a/kytag/d_a_kytag08/d_a_kytag08.cpp @@ -27,13 +27,13 @@ struct dRes_control_c { struct dPa_levelEcallBack {}; -struct cXyz {}; - struct dKy_tevstr_c {}; +struct csXyz {}; + struct _GXColor {}; -struct csXyz {}; +struct cXyz {}; struct dPa_control_c { /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, @@ -119,7 +119,7 @@ static bool daKytag08_Draw(kytag08_class* param_0) { /* ############################################################################################## */ /* 8085B28C-8085B290 000000 0004+00 2/2 0/0 0/0 .rodata @4012 */ SECTION_RODATA static f32 const lit_4012 = 100.0f; -COMPILER_STRIP_GATE(8085B28C, &lit_4012); +COMPILER_STRIP_GATE(0x8085B28C, &lit_4012); /* 8085B290-8085B294 000004 0004+00 0/2 0/0 0/0 .rodata @4013 */ #pragma push @@ -130,7 +130,7 @@ SECTION_RODATA static u8 const lit_4013[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(8085B290, &lit_4013); +COMPILER_STRIP_GATE(0x8085B290, &lit_4013); #pragma pop /* 8085B294-8085B29C 000008 0008+00 0/1 0/0 0/0 .rodata @4014 */ @@ -139,7 +139,7 @@ COMPILER_STRIP_GATE(8085B290, &lit_4013); SECTION_RODATA static u8 const lit_4014[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8085B294, &lit_4014); +COMPILER_STRIP_GATE(0x8085B294, &lit_4014); #pragma pop /* 8085B29C-8085B2A4 000010 0008+00 0/1 0/0 0/0 .rodata @4015 */ @@ -148,7 +148,7 @@ COMPILER_STRIP_GATE(8085B294, &lit_4014); SECTION_RODATA static u8 const lit_4015[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8085B29C, &lit_4015); +COMPILER_STRIP_GATE(0x8085B29C, &lit_4015); #pragma pop /* 8085B2A4-8085B2AC 000018 0008+00 0/1 0/0 0/0 .rodata @4016 */ @@ -157,182 +157,182 @@ COMPILER_STRIP_GATE(8085B29C, &lit_4015); SECTION_RODATA static u8 const lit_4016[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8085B2A4, &lit_4016); +COMPILER_STRIP_GATE(0x8085B2A4, &lit_4016); #pragma pop /* 8085B2AC-8085B2B0 000020 0004+00 0/1 0/0 0/0 .rodata @4017 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4017 = 2000.0f; -COMPILER_STRIP_GATE(8085B2AC, &lit_4017); +COMPILER_STRIP_GATE(0x8085B2AC, &lit_4017); #pragma pop /* 8085B2B0-8085B2B4 000024 0004+00 0/2 0/0 0/0 .rodata @4018 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4018 = 20.0f; -COMPILER_STRIP_GATE(8085B2B0, &lit_4018); +COMPILER_STRIP_GATE(0x8085B2B0, &lit_4018); #pragma pop /* 8085B2B4-8085B2B8 000028 0004+00 0/1 0/0 0/0 .rodata @4019 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4019 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(8085B2B4, &lit_4019); +COMPILER_STRIP_GATE(0x8085B2B4, &lit_4019); #pragma pop /* 8085B2B8-8085B2BC 00002C 0004+00 0/1 0/0 0/0 .rodata @4020 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4020 = 10.0f; -COMPILER_STRIP_GATE(8085B2B8, &lit_4020); +COMPILER_STRIP_GATE(0x8085B2B8, &lit_4020); #pragma pop /* 8085B2BC-8085B2C0 000030 0004+00 0/1 0/0 0/0 .rodata @4021 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4021 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(8085B2BC, &lit_4021); +COMPILER_STRIP_GATE(0x8085B2BC, &lit_4021); #pragma pop /* 8085B2C0-8085B2C4 000034 0004+00 0/1 0/0 0/0 .rodata @4022 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4022 = 0x3727C5AC; -COMPILER_STRIP_GATE(8085B2C0, &lit_4022); +COMPILER_STRIP_GATE(0x8085B2C0, &lit_4022); #pragma pop /* 8085B2C4-8085B2C8 000038 0004+00 0/1 0/0 0/0 .rodata @4023 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4023 = 5.0f; -COMPILER_STRIP_GATE(8085B2C4, &lit_4023); +COMPILER_STRIP_GATE(0x8085B2C4, &lit_4023); #pragma pop /* 8085B2C8-8085B2CC 00003C 0004+00 0/1 0/0 0/0 .rodata @4024 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4024 = 1.0f / 50.0f; -COMPILER_STRIP_GATE(8085B2C8, &lit_4024); +COMPILER_STRIP_GATE(0x8085B2C8, &lit_4024); #pragma pop /* 8085B2CC-8085B2D0 000040 0004+00 0/1 0/0 0/0 .rodata @4025 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4025 = 8.0f; -COMPILER_STRIP_GATE(8085B2CC, &lit_4025); +COMPILER_STRIP_GATE(0x8085B2CC, &lit_4025); #pragma pop /* 8085B2D0-8085B2D4 000044 0004+00 0/1 0/0 0/0 .rodata @4026 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4026 = 1.0f / 20.0f; -COMPILER_STRIP_GATE(8085B2D0, &lit_4026); +COMPILER_STRIP_GATE(0x8085B2D0, &lit_4026); #pragma pop /* 8085B2D4-8085B2D8 000048 0004+00 0/1 0/0 0/0 .rodata @4027 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4027 = 0x3BA3D70A; -COMPILER_STRIP_GATE(8085B2D4, &lit_4027); +COMPILER_STRIP_GATE(0x8085B2D4, &lit_4027); #pragma pop /* 8085B2D8-8085B2DC 00004C 0004+00 0/1 0/0 0/0 .rodata @4028 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4028 = 0x3A83126F; -COMPILER_STRIP_GATE(8085B2D8, &lit_4028); +COMPILER_STRIP_GATE(0x8085B2D8, &lit_4028); #pragma pop /* 8085B2DC-8085B2E0 000050 0004+00 0/2 0/0 0/0 .rodata @4029 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4029 = 1.0f; -COMPILER_STRIP_GATE(8085B2DC, &lit_4029); +COMPILER_STRIP_GATE(0x8085B2DC, &lit_4029); #pragma pop /* 8085B2E0-8085B2E4 000054 0004+00 0/1 0/0 0/0 .rodata @4030 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4030 = 0.5f; -COMPILER_STRIP_GATE(8085B2E0, &lit_4030); +COMPILER_STRIP_GATE(0x8085B2E0, &lit_4030); #pragma pop /* 8085B2E4-8085B2E8 000058 0004+00 0/1 0/0 0/0 .rodata @4031 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4031 = 1.0f / 100.0f; -COMPILER_STRIP_GATE(8085B2E4, &lit_4031); +COMPILER_STRIP_GATE(0x8085B2E4, &lit_4031); #pragma pop /* 8085B2E8-8085B2EC 00005C 0004+00 0/1 0/0 0/0 .rodata @4032 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4032 = 0.25f; -COMPILER_STRIP_GATE(8085B2E8, &lit_4032); +COMPILER_STRIP_GATE(0x8085B2E8, &lit_4032); #pragma pop /* 8085B2EC-8085B2F0 000060 0004+00 0/1 0/0 0/0 .rodata @4033 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4033 = 0x3B03126F; -COMPILER_STRIP_GATE(8085B2EC, &lit_4033); +COMPILER_STRIP_GATE(0x8085B2EC, &lit_4033); #pragma pop /* 8085B2F0-8085B2F4 000064 0004+00 0/1 0/0 0/0 .rodata @4034 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4034 = 37.5f; -COMPILER_STRIP_GATE(8085B2F0, &lit_4034); +COMPILER_STRIP_GATE(0x8085B2F0, &lit_4034); #pragma pop /* 8085B2F4-8085B2F8 000068 0004+00 0/1 0/0 0/0 .rodata @4035 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4035 = 4000.0f; -COMPILER_STRIP_GATE(8085B2F4, &lit_4035); +COMPILER_STRIP_GATE(0x8085B2F4, &lit_4035); #pragma pop /* 8085B2F8-8085B2FC 00006C 0004+00 0/1 0/0 0/0 .rodata @4036 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4036 = 4.0f; -COMPILER_STRIP_GATE(8085B2F8, &lit_4036); +COMPILER_STRIP_GATE(0x8085B2F8, &lit_4036); #pragma pop /* 8085B2FC-8085B300 000070 0004+00 0/1 0/0 0/0 .rodata @4037 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4037 = 1.0f / 40.0f; -COMPILER_STRIP_GATE(8085B2FC, &lit_4037); +COMPILER_STRIP_GATE(0x8085B2FC, &lit_4037); #pragma pop /* 8085B300-8085B304 000074 0004+00 0/1 0/0 0/0 .rodata @4038 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4038 = 50.0f; -COMPILER_STRIP_GATE(8085B300, &lit_4038); +COMPILER_STRIP_GATE(0x8085B300, &lit_4038); #pragma pop /* 8085B304-8085B308 000078 0004+00 0/1 0/0 0/0 .rodata @4039 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4039 = 56.0f; -COMPILER_STRIP_GATE(8085B304, &lit_4039); +COMPILER_STRIP_GATE(0x8085B304, &lit_4039); #pragma pop /* 8085B308-8085B30C 00007C 0004+00 0/1 0/0 0/0 .rodata @4040 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4040 = 45.0f; -COMPILER_STRIP_GATE(8085B308, &lit_4040); +COMPILER_STRIP_GATE(0x8085B308, &lit_4040); #pragma pop /* 8085B30C-8085B310 000080 0004+00 0/1 0/0 0/0 .rodata @4041 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4041 = 30.0f; -COMPILER_STRIP_GATE(8085B30C, &lit_4041); +COMPILER_STRIP_GATE(0x8085B30C, &lit_4041); #pragma pop /* 8085A580-8085AEA0 000080 0920+00 1/0 0/0 0/0 .text daKytag08_Execute__FP13kytag08_class */ @@ -350,6 +350,13 @@ static bool daKytag08_IsDelete(kytag08_class* param_0) { return true; } +/* ############################################################################################## */ +/* 8085B310-8085B310 000084 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8085B310 = "Kytag08"; +#pragma pop + /* 8085AEA8-8085AF74 0009A8 00CC+00 1/0 0/0 0/0 .text daKytag08_Delete__FP13kytag08_class */ #pragma push @@ -421,9 +428,4 @@ asm J3DFrameCtrl::~J3DFrameCtrl() { } #pragma pop -/* 8085B310-8085B318 000084 0008+00 3/3 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_8085B310 = "Kytag08"; -#pragma pop +/* 8085B310-8085B310 000084 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/kytag/d_a_kytag09/d_a_kytag09.cpp b/rel/d/a/kytag/d_a_kytag09/d_a_kytag09.cpp index 1c35e9df546..3105a9ad7c4 100644 --- a/rel/d/a/kytag/d_a_kytag09/d_a_kytag09.cpp +++ b/rel/d/a/kytag/d_a_kytag09/d_a_kytag09.cpp @@ -122,7 +122,7 @@ SECTION_RODATA static u8 const lit_3863[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(8085BA44, &lit_3863); +COMPILER_STRIP_GATE(0x8085BA44, &lit_3863); /* 8085B3F8-8085B5F4 000078 01FC+00 1/0 0/0 0/0 .text daKytag09_Draw__FP13kytag09_class */ @@ -145,6 +145,14 @@ static bool daKytag09_IsDelete(kytag09_class* param_0) { return true; } +/* ############################################################################################## */ +/* 8085BA4C-8085BA4C 000008 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8085BA4C = "Kytag09"; +SECTION_DEAD static char const* const stringBase_8085BA54 = "kytag09_2"; +#pragma pop + /* 8085B604-8085B658 000284 0054+00 1/0 0/0 0/0 .text daKytag09_Delete__FP13kytag09_class */ #pragma push @@ -159,7 +167,7 @@ static asm void daKytag09_Delete(kytag09_class* param_0) { /* ############################################################################################## */ /* 8085BA48-8085BA4C 000004 0004+00 2/2 0/0 0/0 .rodata @3906 */ SECTION_RODATA static f32 const lit_3906 = 1.0f; -COMPILER_STRIP_GATE(8085BA48, &lit_3906); +COMPILER_STRIP_GATE(0x8085BA48, &lit_3906); /* 8085BA60-8085BA80 -00001 0020+00 1/0 0/0 0/0 .data l_daKytag09_Method */ SECTION_DATA static void* l_daKytag09_Method[8] = { @@ -231,10 +239,4 @@ asm J3DFrameCtrl::~J3DFrameCtrl() { } #pragma pop -/* 8085BA4C-8085BA5E 000008 0012+00 4/4 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_8085BA4C = "Kytag09"; -SECTION_DEAD static char const* const stringBase_8085BA54 = "kytag09_2"; -#pragma pop +/* 8085BA4C-8085BA4C 000008 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/kytag/d_a_kytag10/d_a_kytag10.cpp b/rel/d/a/kytag/d_a_kytag10/d_a_kytag10.cpp index ce059b55a5e..dab2be8bace 100644 --- a/rel/d/a/kytag/d_a_kytag10/d_a_kytag10.cpp +++ b/rel/d/a/kytag/d_a_kytag10/d_a_kytag10.cpp @@ -21,13 +21,13 @@ struct dPath {}; struct dPa_levelEcallBack {}; -struct cXyz {}; - struct dKy_tevstr_c {}; +struct csXyz {}; + struct _GXColor {}; -struct csXyz {}; +struct cXyz {}; struct dPa_control_c { /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, @@ -89,7 +89,7 @@ SECTION_RODATA static u8 const lit_3788[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80529400, &lit_3788); +COMPILER_STRIP_GATE(0x80529400, &lit_3788); /* 80528BF8-80528D0C 000078 0114+00 1/1 0/0 0/0 .text get_rail_ratio_pos__FP5dPathifPsPs */ @@ -142,7 +142,7 @@ static asm void get_Extent_pos_end_get(kytag10_class* param_0, dPath* param_1, c #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3950 = 1000.0f; -COMPILER_STRIP_GATE(80529404, &lit_3950); +COMPILER_STRIP_GATE(0x80529404, &lit_3950); #pragma pop /* 80529408-80529410 000008 0004+04 0/2 0/0 0/0 .rodata @3951 */ @@ -153,7 +153,7 @@ SECTION_RODATA static f32 const lit_3951[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80529408, &lit_3951); +COMPILER_STRIP_GATE(0x80529408, &lit_3951); #pragma pop /* 80529410-80529418 000010 0008+00 0/1 0/0 0/0 .rodata @3952 */ @@ -162,7 +162,7 @@ COMPILER_STRIP_GATE(80529408, &lit_3951); SECTION_RODATA static u8 const lit_3952[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80529410, &lit_3952); +COMPILER_STRIP_GATE(0x80529410, &lit_3952); #pragma pop /* 80529418-80529420 000018 0008+00 0/1 0/0 0/0 .rodata @3953 */ @@ -171,7 +171,7 @@ COMPILER_STRIP_GATE(80529410, &lit_3952); SECTION_RODATA static u8 const lit_3953[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80529418, &lit_3953); +COMPILER_STRIP_GATE(0x80529418, &lit_3953); #pragma pop /* 80529420-80529428 000020 0008+00 0/1 0/0 0/0 .rodata @3954 */ @@ -180,21 +180,21 @@ COMPILER_STRIP_GATE(80529418, &lit_3953); SECTION_RODATA static u8 const lit_3954[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80529420, &lit_3954); +COMPILER_STRIP_GATE(0x80529420, &lit_3954); #pragma pop /* 80529428-8052942C 000028 0004+00 0/1 0/0 0/0 .rodata @3955 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3955 = 250.0f; -COMPILER_STRIP_GATE(80529428, &lit_3955); +COMPILER_STRIP_GATE(0x80529428, &lit_3955); #pragma pop /* 8052942C-80529430 00002C 0004+00 0/1 0/0 0/0 .rodata @3956 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3956 = 100.0f; -COMPILER_STRIP_GATE(8052942C, &lit_3956); +COMPILER_STRIP_GATE(0x8052942C, &lit_3956); #pragma pop /* 80529430-80529438 000030 0004+04 0/1 0/0 0/0 .rodata @3957 */ @@ -205,7 +205,7 @@ SECTION_RODATA static f32 const lit_3957[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80529430, &lit_3957); +COMPILER_STRIP_GATE(0x80529430, &lit_3957); #pragma pop /* 80529438-80529440 000038 0008+00 0/2 0/0 0/0 .rodata @3959 */ @@ -214,7 +214,7 @@ COMPILER_STRIP_GATE(80529430, &lit_3957); SECTION_RODATA static u8 const lit_3959[8] = { 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80529438, &lit_3959); +COMPILER_STRIP_GATE(0x80529438, &lit_3959); #pragma pop /* 80528D78-80529148 0001F8 03D0+00 1/1 0/0 0/0 .text sparks_move__FP13kytag10_class */ @@ -264,14 +264,14 @@ static asm void daKytag10_Delete(kytag10_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_3971 = 0xFFFFFFFF; -COMPILER_STRIP_GATE(80529440, &lit_3971); +COMPILER_STRIP_GATE(0x80529440, &lit_3971); #pragma pop /* 80529444-80529448 000044 0004+00 0/1 0/0 0/0 .rodata @4058 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4058 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(80529444, &lit_4058); +COMPILER_STRIP_GATE(0x80529444, &lit_4058); #pragma pop /* 80529248-805293F8 0006C8 01B0+00 1/0 0/0 0/0 .text daKytag10_Create__FP10fopAc_ac_c */ diff --git a/rel/d/a/kytag/d_a_kytag11/d_a_kytag11.cpp b/rel/d/a/kytag/d_a_kytag11/d_a_kytag11.cpp index 8a6364c5bfa..4d4585bd5ae 100644 --- a/rel/d/a/kytag/d_a_kytag11/d_a_kytag11.cpp +++ b/rel/d/a/kytag/d_a_kytag11/d_a_kytag11.cpp @@ -79,27 +79,27 @@ static bool daKytag11_Draw(kytag11_class* param_0) { /* ############################################################################################## */ /* 80529894-80529898 000000 0004+00 1/1 0/0 0/0 .rodata @3874 */ SECTION_RODATA static f32 const lit_3874 = 15.0f; -COMPILER_STRIP_GATE(80529894, &lit_3874); +COMPILER_STRIP_GATE(0x80529894, &lit_3874); /* 80529898-8052989C 000004 0004+00 0/1 0/0 0/0 .rodata @3875 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3875 = 0.5f; -COMPILER_STRIP_GATE(80529898, &lit_3875); +COMPILER_STRIP_GATE(0x80529898, &lit_3875); #pragma pop /* 8052989C-805298A0 000008 0004+00 0/1 0/0 0/0 .rodata @3876 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3876 = 255.0f; -COMPILER_STRIP_GATE(8052989C, &lit_3876); +COMPILER_STRIP_GATE(0x8052989C, &lit_3876); #pragma pop /* 805298A0-805298A4 00000C 0004+00 0/1 0/0 0/0 .rodata @3877 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3877 = 360.0f; -COMPILER_STRIP_GATE(805298A0, &lit_3877); +COMPILER_STRIP_GATE(0x805298A0, &lit_3877); #pragma pop /* 805298A4-805298AC 000010 0004+04 0/1 0/0 0/0 .rodata @3878 */ @@ -116,7 +116,7 @@ SECTION_RODATA static u8 const lit_3878[4 + 4 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(805298A4, &lit_3878); +COMPILER_STRIP_GATE(0x805298A4, &lit_3878); #pragma pop /* 805298AC-805298B4 000018 0008+00 0/1 0/0 0/0 .rodata @3880 */ @@ -125,7 +125,7 @@ COMPILER_STRIP_GATE(805298A4, &lit_3878); SECTION_RODATA static u8 const lit_3880[8] = { 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(805298AC, &lit_3880); +COMPILER_STRIP_GATE(0x805298AC, &lit_3880); #pragma pop /* 80529520-80529798 000080 0278+00 1/0 0/0 0/0 .text daKytag11_Execute__FP13kytag11_class */ diff --git a/rel/d/a/kytag/d_a_kytag12/d_a_kytag12.cpp b/rel/d/a/kytag/d_a_kytag12/d_a_kytag12.cpp index e2841a2ac8f..64b3d24543b 100644 --- a/rel/d/a/kytag/d_a_kytag12/d_a_kytag12.cpp +++ b/rel/d/a/kytag/d_a_kytag12/d_a_kytag12.cpp @@ -125,27 +125,27 @@ static bool daKytag12_Draw(kytag12_class* param_0) { /* ############################################################################################## */ /* 8085EF00-8085EF04 000000 0004+00 4/4 0/0 0/0 .rodata @3836 */ SECTION_RODATA static f32 const lit_3836 = 100.0f; -COMPILER_STRIP_GATE(8085EF00, &lit_3836); +COMPILER_STRIP_GATE(0x8085EF00, &lit_3836); /* 8085EF04-8085EF08 000004 0004+00 0/1 0/0 0/0 .rodata @3837 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3837 = 500.0f; -COMPILER_STRIP_GATE(8085EF04, &lit_3837); +COMPILER_STRIP_GATE(0x8085EF04, &lit_3837); #pragma pop /* 8085EF08-8085EF0C 000008 0004+00 0/1 0/0 0/0 .rodata @3838 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3838 = 2000.0f; -COMPILER_STRIP_GATE(8085EF08, &lit_3838); +COMPILER_STRIP_GATE(0x8085EF08, &lit_3838); #pragma pop /* 8085EF0C-8085EF10 00000C 0004+00 0/3 0/0 0/0 .rodata @3839 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3839 = 1.0f; -COMPILER_STRIP_GATE(8085EF0C, &lit_3839); +COMPILER_STRIP_GATE(0x8085EF0C, &lit_3839); #pragma pop /* 8085EF10-8085EF14 000010 0004+00 0/4 0/0 0/0 .rodata @3840 */ @@ -157,35 +157,35 @@ SECTION_RODATA static u8 const lit_3840[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(8085EF10, &lit_3840); +COMPILER_STRIP_GATE(0x8085EF10, &lit_3840); #pragma pop /* 8085EF14-8085EF18 000014 0004+00 0/1 0/0 0/0 .rodata @3841 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_3841 = 0x3C75C28F; -COMPILER_STRIP_GATE(8085EF14, &lit_3841); +COMPILER_STRIP_GATE(0x8085EF14, &lit_3841); #pragma pop /* 8085EF18-8085EF1C 000018 0004+00 0/1 0/0 0/0 .rodata @3842 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3842 = 300.0f; -COMPILER_STRIP_GATE(8085EF18, &lit_3842); +COMPILER_STRIP_GATE(0x8085EF18, &lit_3842); #pragma pop /* 8085EF1C-8085EF20 00001C 0004+00 0/2 0/0 0/0 .rodata @3843 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3843 = 150.0f; -COMPILER_STRIP_GATE(8085EF1C, &lit_3843); +COMPILER_STRIP_GATE(0x8085EF1C, &lit_3843); #pragma pop /* 8085EF20-8085EF24 000020 0004+00 0/1 0/0 0/0 .rodata @3844 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3844 = 3.0f / 10.0f; -COMPILER_STRIP_GATE(8085EF20, &lit_3844); +COMPILER_STRIP_GATE(0x8085EF20, &lit_3844); #pragma pop /* 8085BBC0-8085BCD0 000100 0110+00 3/3 0/0 0/0 .text @@ -214,147 +214,147 @@ asm cXyz::~cXyz() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4471 = -5200.0f; -COMPILER_STRIP_GATE(8085EF24, &lit_4471); +COMPILER_STRIP_GATE(0x8085EF24, &lit_4471); #pragma pop /* 8085EF28-8085EF2C 000028 0004+00 0/0 0/0 0/0 .rodata @4472 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4472 = 30.0f; -COMPILER_STRIP_GATE(8085EF28, &lit_4472); +COMPILER_STRIP_GATE(0x8085EF28, &lit_4472); #pragma pop /* 8085EF2C-8085EF30 00002C 0004+00 0/0 0/0 0/0 .rodata @4473 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4473 = -700.0f; -COMPILER_STRIP_GATE(8085EF2C, &lit_4473); +COMPILER_STRIP_GATE(0x8085EF2C, &lit_4473); #pragma pop /* 8085EF30-8085EF34 000030 0004+00 0/0 0/0 0/0 .rodata @4474 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4474 = 2100.0f; -COMPILER_STRIP_GATE(8085EF30, &lit_4474); +COMPILER_STRIP_GATE(0x8085EF30, &lit_4474); #pragma pop /* 8085EF34-8085EF38 000034 0004+00 0/0 0/0 0/0 .rodata @4475 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4475 = 5400.0f; -COMPILER_STRIP_GATE(8085EF34, &lit_4475); +COMPILER_STRIP_GATE(0x8085EF34, &lit_4475); #pragma pop /* 8085EF38-8085EF3C 000038 0004+00 0/1 0/0 0/0 .rodata @4476 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4476 = 200.0f; -COMPILER_STRIP_GATE(8085EF38, &lit_4476); +COMPILER_STRIP_GATE(0x8085EF38, &lit_4476); #pragma pop /* 8085EF3C-8085EF40 00003C 0004+00 0/2 0/0 0/0 .rodata @4477 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4477 = 50.0f; -COMPILER_STRIP_GATE(8085EF3C, &lit_4477); +COMPILER_STRIP_GATE(0x8085EF3C, &lit_4477); #pragma pop /* 8085EF40-8085EF44 000040 0004+00 0/0 0/0 0/0 .rodata @4478 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4478 = -2700.0f; -COMPILER_STRIP_GATE(8085EF40, &lit_4478); +COMPILER_STRIP_GATE(0x8085EF40, &lit_4478); #pragma pop /* 8085EF44-8085EF48 000044 0004+00 0/1 0/0 0/0 .rodata @4479 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4479 = -1100.0f; -COMPILER_STRIP_GATE(8085EF44, &lit_4479); +COMPILER_STRIP_GATE(0x8085EF44, &lit_4479); #pragma pop /* 8085EF48-8085EF4C 000048 0004+00 0/1 0/0 0/0 .rodata @4480 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4480 = 3200.0f; -COMPILER_STRIP_GATE(8085EF48, &lit_4480); +COMPILER_STRIP_GATE(0x8085EF48, &lit_4480); #pragma pop /* 8085EF4C-8085EF50 00004C 0004+00 0/2 0/0 0/0 .rodata @4481 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4481 = 1000.0f; -COMPILER_STRIP_GATE(8085EF4C, &lit_4481); +COMPILER_STRIP_GATE(0x8085EF4C, &lit_4481); #pragma pop /* 8085EF50-8085EF54 000050 0004+00 0/0 0/0 0/0 .rodata @4482 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4482 = -500.0f; -COMPILER_STRIP_GATE(8085EF50, &lit_4482); +COMPILER_STRIP_GATE(0x8085EF50, &lit_4482); #pragma pop /* 8085EF54-8085EF58 000054 0004+00 0/0 0/0 0/0 .rodata @4483 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4483 = 6700.0f; -COMPILER_STRIP_GATE(8085EF54, &lit_4483); +COMPILER_STRIP_GATE(0x8085EF54, &lit_4483); #pragma pop /* 8085EF58-8085EF5C 000058 0004+00 0/0 0/0 0/0 .rodata @4484 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4484 = -2828.0f; -COMPILER_STRIP_GATE(8085EF58, &lit_4484); +COMPILER_STRIP_GATE(0x8085EF58, &lit_4484); #pragma pop /* 8085EF5C-8085EF60 00005C 0004+00 0/2 0/0 0/0 .rodata @4485 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4485 = 10.0f; -COMPILER_STRIP_GATE(8085EF5C, &lit_4485); +COMPILER_STRIP_GATE(0x8085EF5C, &lit_4485); #pragma pop /* 8085EF60-8085EF64 000060 0004+00 0/0 0/0 0/0 .rodata @4486 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4486 = -23.0f / 10.0f; -COMPILER_STRIP_GATE(8085EF60, &lit_4486); +COMPILER_STRIP_GATE(0x8085EF60, &lit_4486); #pragma pop /* 8085EF64-8085EF68 000064 0004+00 0/0 0/0 0/0 .rodata @4487 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4487 = -0.5f; -COMPILER_STRIP_GATE(8085EF64, &lit_4487); +COMPILER_STRIP_GATE(0x8085EF64, &lit_4487); #pragma pop /* 8085EF68-8085EF6C 000068 0004+00 0/0 0/0 0/0 .rodata @4488 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4488 = 90.0f; -COMPILER_STRIP_GATE(8085EF68, &lit_4488); +COMPILER_STRIP_GATE(0x8085EF68, &lit_4488); #pragma pop /* 8085EF6C-8085EF70 00006C 0004+00 0/0 0/0 0/0 .rodata @4489 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4489 = -7.0f / 10.0f; -COMPILER_STRIP_GATE(8085EF6C, &lit_4489); +COMPILER_STRIP_GATE(0x8085EF6C, &lit_4489); #pragma pop /* 8085EF70-8085EF74 000070 0004+00 0/0 0/0 0/0 .rodata @4490 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4490 = -2.0f; -COMPILER_STRIP_GATE(8085EF70, &lit_4490); +COMPILER_STRIP_GATE(0x8085EF70, &lit_4490); #pragma pop /* 8085EF74-8085EF78 000074 0004+00 0/2 0/0 0/0 .rodata @4491 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4491 = -1.0f; -COMPILER_STRIP_GATE(8085EF74, &lit_4491); +COMPILER_STRIP_GATE(0x8085EF74, &lit_4491); #pragma pop /* 8085EF78-8085EF80 000078 0004+04 0/0 0/0 0/0 .rodata @4492 */ @@ -365,7 +365,7 @@ SECTION_RODATA static f32 const lit_4492[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(8085EF78, &lit_4492); +COMPILER_STRIP_GATE(0x8085EF78, &lit_4492); #pragma pop /* 8085EF80-8085EF88 000080 0008+00 0/2 0/0 0/0 .rodata @4493 */ @@ -374,21 +374,21 @@ COMPILER_STRIP_GATE(8085EF78, &lit_4492); SECTION_RODATA static u8 const lit_4493[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8085EF80, &lit_4493); +COMPILER_STRIP_GATE(0x8085EF80, &lit_4493); #pragma pop /* 8085EF88-8085EF8C 000088 0004+00 0/0 0/0 0/0 .rodata @4494 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4494 = 630.0f; -COMPILER_STRIP_GATE(8085EF88, &lit_4494); +COMPILER_STRIP_GATE(0x8085EF88, &lit_4494); #pragma pop /* 8085EF8C-8085EF90 00008C 0004+00 0/0 0/0 0/0 .rodata @4495 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4495 = 34.0f / 5.0f; -COMPILER_STRIP_GATE(8085EF8C, &lit_4495); +COMPILER_STRIP_GATE(0x8085EF8C, &lit_4495); #pragma pop /* 8085EF90-8085EF98 000090 0008+00 0/0 0/0 0/0 .rodata @4496 */ @@ -397,7 +397,7 @@ COMPILER_STRIP_GATE(8085EF8C, &lit_4495); SECTION_RODATA static u8 const lit_4496[8] = { 0x40, 0x81, 0x90, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8085EF90, &lit_4496); +COMPILER_STRIP_GATE(0x8085EF90, &lit_4496); #pragma pop /* 8085EF98-8085EFA0 000098 0008+00 0/0 0/0 0/0 .rodata @4497 */ @@ -406,119 +406,119 @@ COMPILER_STRIP_GATE(8085EF90, &lit_4496); SECTION_RODATA static u8 const lit_4497[8] = { 0x40, 0x13, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, }; -COMPILER_STRIP_GATE(8085EF98, &lit_4497); +COMPILER_STRIP_GATE(0x8085EF98, &lit_4497); #pragma pop /* 8085EFA0-8085EFA4 0000A0 0004+00 0/0 0/0 0/0 .rodata @4498 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4498 = 13.0f; -COMPILER_STRIP_GATE(8085EFA0, &lit_4498); +COMPILER_STRIP_GATE(0x8085EFA0, &lit_4498); #pragma pop /* 8085EFA4-8085EFA8 0000A4 0004+00 0/0 0/0 0/0 .rodata @4499 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4499 = 9.0f; -COMPILER_STRIP_GATE(8085EFA4, &lit_4499); +COMPILER_STRIP_GATE(0x8085EFA4, &lit_4499); #pragma pop /* 8085EFA8-8085EFAC 0000A8 0004+00 0/2 0/0 0/0 .rodata @4500 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4500 = 9000.0f; -COMPILER_STRIP_GATE(8085EFA8, &lit_4500); +COMPILER_STRIP_GATE(0x8085EFA8, &lit_4500); #pragma pop /* 8085EFAC-8085EFB0 0000AC 0004+00 0/2 0/0 0/0 .rodata @4501 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4501 = 85.0f; -COMPILER_STRIP_GATE(8085EFAC, &lit_4501); +COMPILER_STRIP_GATE(0x8085EFAC, &lit_4501); #pragma pop /* 8085EFB0-8085EFB4 0000B0 0004+00 0/1 0/0 0/0 .rodata @4502 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4502 = 1.5f; -COMPILER_STRIP_GATE(8085EFB0, &lit_4502); +COMPILER_STRIP_GATE(0x8085EFB0, &lit_4502); #pragma pop /* 8085EFB4-8085EFB8 0000B4 0004+00 0/1 0/0 0/0 .rodata @4503 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4503 = 3.0f / 5.0f; -COMPILER_STRIP_GATE(8085EFB4, &lit_4503); +COMPILER_STRIP_GATE(0x8085EFB4, &lit_4503); #pragma pop /* 8085EFB8-8085EFBC 0000B8 0004+00 0/2 0/0 0/0 .rodata @4504 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4504 = 0.5f; -COMPILER_STRIP_GATE(8085EFB8, &lit_4504); +COMPILER_STRIP_GATE(0x8085EFB8, &lit_4504); #pragma pop /* 8085EFBC-8085EFC0 0000BC 0004+00 0/1 0/0 0/0 .rodata @4505 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4505 = 25.0f; -COMPILER_STRIP_GATE(8085EFBC, &lit_4505); +COMPILER_STRIP_GATE(0x8085EFBC, &lit_4505); #pragma pop /* 8085EFC0-8085EFC4 0000C0 0004+00 0/2 0/0 0/0 .rodata @4506 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4506 = 4.0f; -COMPILER_STRIP_GATE(8085EFC0, &lit_4506); +COMPILER_STRIP_GATE(0x8085EFC0, &lit_4506); #pragma pop /* 8085EFC4-8085EFC8 0000C4 0004+00 0/0 0/0 0/0 .rodata @4507 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4507 = -8.0f; -COMPILER_STRIP_GATE(8085EFC4, &lit_4507); +COMPILER_STRIP_GATE(0x8085EFC4, &lit_4507); #pragma pop /* 8085EFC8-8085EFCC 0000C8 0004+00 0/0 0/0 0/0 .rodata @4508 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4508 = -1200.0f; -COMPILER_STRIP_GATE(8085EFC8, &lit_4508); +COMPILER_STRIP_GATE(0x8085EFC8, &lit_4508); #pragma pop /* 8085EFCC-8085EFD0 0000CC 0004+00 0/1 0/0 0/0 .rodata @4509 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4509 = 900.0f; -COMPILER_STRIP_GATE(8085EFCC, &lit_4509); +COMPILER_STRIP_GATE(0x8085EFCC, &lit_4509); #pragma pop /* 8085EFD0-8085EFD4 0000D0 0004+00 0/0 0/0 0/0 .rodata @4510 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4510 = -780.0f; -COMPILER_STRIP_GATE(8085EFD0, &lit_4510); +COMPILER_STRIP_GATE(0x8085EFD0, &lit_4510); #pragma pop /* 8085EFD4-8085EFD8 0000D4 0004+00 0/1 0/0 0/0 .rodata @4511 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4511 = 1400.0f; -COMPILER_STRIP_GATE(8085EFD4, &lit_4511); +COMPILER_STRIP_GATE(0x8085EFD4, &lit_4511); #pragma pop /* 8085EFD8-8085EFDC 0000D8 0004+00 0/0 0/0 0/0 .rodata @4512 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4512 = -10.0f; -COMPILER_STRIP_GATE(8085EFD8, &lit_4512); +COMPILER_STRIP_GATE(0x8085EFD8, &lit_4512); #pragma pop /* 8085EFDC-8085EFE0 0000DC 0004+00 0/0 0/0 0/0 .rodata @4513 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4513 = -5.0f; -COMPILER_STRIP_GATE(8085EFDC, &lit_4513); +COMPILER_STRIP_GATE(0x8085EFDC, &lit_4513); #pragma pop /* 8085EFE0-8085EFE8 0000E0 0004+04 0/0 0/0 0/0 .rodata @4514 */ @@ -529,7 +529,7 @@ SECTION_RODATA static f32 const lit_4514[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(8085EFE0, &lit_4514); +COMPILER_STRIP_GATE(0x8085EFE0, &lit_4514); #pragma pop /* 8085EFE8-8085EFF0 0000E8 0008+00 0/2 0/0 0/0 .rodata @4515 */ @@ -538,7 +538,7 @@ COMPILER_STRIP_GATE(8085EFE0, &lit_4514); SECTION_RODATA static u8 const lit_4515[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8085EFE8, &lit_4515); +COMPILER_STRIP_GATE(0x8085EFE8, &lit_4515); #pragma pop /* 8085EFF0-8085EFF8 0000F0 0008+00 0/2 0/0 0/0 .rodata @4516 */ @@ -547,42 +547,48 @@ COMPILER_STRIP_GATE(8085EFE8, &lit_4515); SECTION_RODATA static u8 const lit_4516[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8085EFF0, &lit_4516); +COMPILER_STRIP_GATE(0x8085EFF0, &lit_4516); #pragma pop /* 8085EFF8-8085EFFC 0000F8 0004+00 0/2 0/0 0/0 .rodata @4517 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4517 = 250.0f; -COMPILER_STRIP_GATE(8085EFF8, &lit_4517); +COMPILER_STRIP_GATE(0x8085EFF8, &lit_4517); #pragma pop /* 8085EFFC-8085F000 0000FC 0004+00 0/1 0/0 0/0 .rodata @4518 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4518 = 190.0f; -COMPILER_STRIP_GATE(8085EFFC, &lit_4518); +COMPILER_STRIP_GATE(0x8085EFFC, &lit_4518); #pragma pop /* 8085F000-8085F004 000100 0004+00 0/2 0/0 0/0 .rodata @4519 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4519 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(8085F000, &lit_4519); +COMPILER_STRIP_GATE(0x8085F000, &lit_4519); #pragma pop /* 8085F004-8085F008 000104 0004+00 0/0 0/0 0/0 .rodata @4520 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4520 = 165.0f; -COMPILER_STRIP_GATE(8085F004, &lit_4520); +COMPILER_STRIP_GATE(0x8085F004, &lit_4520); #pragma pop /* 8085F008-8085F00C 000108 0004+00 0/2 0/0 0/0 .rodata @4521 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4521 = 19.0f / 20.0f; -COMPILER_STRIP_GATE(8085F008, &lit_4521); +COMPILER_STRIP_GATE(0x8085F008, &lit_4521); +#pragma pop + +/* 8085F0EC-8085F0EC 0001EC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8085F0EC = "D_MN08"; #pragma pop /* 8085F0F4-8085F118 -00001 0024+00 1/1 0/0 0/0 .data @4529 */ @@ -614,49 +620,49 @@ static asm void daKytag12_Execute_standard(kytag12_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4522 = 0.25f; -COMPILER_STRIP_GATE(8085F00C, &lit_4522); +COMPILER_STRIP_GATE(0x8085F00C, &lit_4522); #pragma pop /* 8085F010-8085F014 000110 0004+00 0/2 0/0 0/0 .rodata @4523 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4523 = 7.0f / 100.0f; -COMPILER_STRIP_GATE(8085F010, &lit_4523); +COMPILER_STRIP_GATE(0x8085F010, &lit_4523); #pragma pop /* 8085F014-8085F018 000114 0004+00 0/2 0/0 0/0 .rodata @4524 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4524 = 0x38D1B717; -COMPILER_STRIP_GATE(8085F014, &lit_4524); +COMPILER_STRIP_GATE(0x8085F014, &lit_4524); #pragma pop /* 8085F018-8085F01C 000118 0004+00 0/0 0/0 0/0 .rodata @4525 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4525 = 1.0f / 25.0f; -COMPILER_STRIP_GATE(8085F018, &lit_4525); +COMPILER_STRIP_GATE(0x8085F018, &lit_4525); #pragma pop /* 8085F01C-8085F020 00011C 0004+00 0/2 0/0 0/0 .rodata @4526 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4526 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(8085F01C, &lit_4526); +COMPILER_STRIP_GATE(0x8085F01C, &lit_4526); #pragma pop /* 8085F020-8085F024 000120 0004+00 0/1 0/0 0/0 .rodata @4527 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4527 = 1.0f / 100.0f; -COMPILER_STRIP_GATE(8085F020, &lit_4527); +COMPILER_STRIP_GATE(0x8085F020, &lit_4527); #pragma pop /* 8085F024-8085F028 000124 0004+00 0/1 0/0 0/0 .rodata @4528 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4528 = 0x3A83126F; -COMPILER_STRIP_GATE(8085F024, &lit_4528); +COMPILER_STRIP_GATE(0x8085F024, &lit_4528); #pragma pop /* 8085F028-8085F030 000128 0008+00 0/2 0/0 0/0 .rodata @4531 */ @@ -665,7 +671,7 @@ COMPILER_STRIP_GATE(8085F024, &lit_4528); SECTION_RODATA static u8 const lit_4531[8] = { 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8085F028, &lit_4531); +COMPILER_STRIP_GATE(0x8085F028, &lit_4531); #pragma pop /* 8085F030-8085F038 000130 0008+00 0/2 0/0 0/0 .rodata @4533 */ @@ -674,7 +680,7 @@ COMPILER_STRIP_GATE(8085F028, &lit_4531); SECTION_RODATA static u8 const lit_4533[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8085F030, &lit_4533); +COMPILER_STRIP_GATE(0x8085F030, &lit_4533); #pragma pop /* 8085F038-8085F040 000138 0004+04 0/2 0/0 0/0 .rodata @4961 */ @@ -685,7 +691,7 @@ SECTION_RODATA static f32 const lit_4961[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(8085F038, &lit_4961); +COMPILER_STRIP_GATE(0x8085F038, &lit_4961); #pragma pop /* 8085F040-8085F048 000140 0008+00 0/2 0/0 0/0 .rodata @4962 */ @@ -694,63 +700,63 @@ COMPILER_STRIP_GATE(8085F038, &lit_4961); SECTION_RODATA static u8 const lit_4962[8] = { 0x40, 0x0E, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, }; -COMPILER_STRIP_GATE(8085F040, &lit_4962); +COMPILER_STRIP_GATE(0x8085F040, &lit_4962); #pragma pop /* 8085F048-8085F04C 000148 0004+00 0/1 0/0 0/0 .rodata @4963 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4963 = 4.0f / 5.0f; -COMPILER_STRIP_GATE(8085F048, &lit_4963); +COMPILER_STRIP_GATE(0x8085F048, &lit_4963); #pragma pop /* 8085F04C-8085F050 00014C 0004+00 0/1 0/0 0/0 .rodata @4964 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4964 = 65536.0f; -COMPILER_STRIP_GATE(8085F04C, &lit_4964); +COMPILER_STRIP_GATE(0x8085F04C, &lit_4964); #pragma pop /* 8085F050-8085F054 000150 0004+00 0/1 0/0 0/0 .rodata @4965 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4965 = 35.0f; -COMPILER_STRIP_GATE(8085F050, &lit_4965); +COMPILER_STRIP_GATE(0x8085F050, &lit_4965); #pragma pop /* 8085F054-8085F058 000154 0004+00 0/2 0/0 0/0 .rodata @4966 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4966 = 20.0f; -COMPILER_STRIP_GATE(8085F054, &lit_4966); +COMPILER_STRIP_GATE(0x8085F054, &lit_4966); #pragma pop /* 8085F058-8085F05C 000158 0004+00 0/1 0/0 0/0 .rodata @4967 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4967 = 32.0f; -COMPILER_STRIP_GATE(8085F058, &lit_4967); +COMPILER_STRIP_GATE(0x8085F058, &lit_4967); #pragma pop /* 8085F05C-8085F060 00015C 0004+00 0/1 0/0 0/0 .rodata @4968 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4968 = -4.0f; -COMPILER_STRIP_GATE(8085F05C, &lit_4968); +COMPILER_STRIP_GATE(0x8085F05C, &lit_4968); #pragma pop /* 8085F060-8085F064 000160 0004+00 0/2 0/0 0/0 .rodata @4969 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4969 = -680.0f; -COMPILER_STRIP_GATE(8085F060, &lit_4969); +COMPILER_STRIP_GATE(0x8085F060, &lit_4969); #pragma pop /* 8085F064-8085F068 000164 0004+00 0/2 0/0 0/0 .rodata @4970 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4970 = 40.0f; -COMPILER_STRIP_GATE(8085F064, &lit_4970); +COMPILER_STRIP_GATE(0x8085F064, &lit_4970); #pragma pop /* 8085D1DC-8085DFF0 00171C 0E14+00 1/1 0/0 0/0 .text daKytag12_Execute_arrival__FP13kytag12_class @@ -769,231 +775,231 @@ static asm void daKytag12_Execute_arrival(kytag12_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5266 = 550.0f; -COMPILER_STRIP_GATE(8085F068, &lit_5266); +COMPILER_STRIP_GATE(0x8085F068, &lit_5266); #pragma pop /* 8085F06C-8085F070 00016C 0004+00 0/1 0/0 0/0 .rodata @5267 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5267 = -3000.0f; -COMPILER_STRIP_GATE(8085F06C, &lit_5267); +COMPILER_STRIP_GATE(0x8085F06C, &lit_5267); #pragma pop /* 8085F070-8085F074 000170 0004+00 0/1 0/0 0/0 .rodata @5268 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5268 = 5900.0f; -COMPILER_STRIP_GATE(8085F070, &lit_5268); +COMPILER_STRIP_GATE(0x8085F070, &lit_5268); #pragma pop /* 8085F074-8085F078 000174 0004+00 0/1 0/0 0/0 .rodata @5269 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5269 = 80.0f; -COMPILER_STRIP_GATE(8085F074, &lit_5269); +COMPILER_STRIP_GATE(0x8085F074, &lit_5269); #pragma pop /* 8085F078-8085F07C 000178 0004+00 0/1 0/0 0/0 .rodata @5270 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5270 = 244.0f; -COMPILER_STRIP_GATE(8085F078, &lit_5270); +COMPILER_STRIP_GATE(0x8085F078, &lit_5270); #pragma pop /* 8085F07C-8085F080 00017C 0004+00 0/1 0/0 0/0 .rodata @5271 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5271 = 2951.0f; -COMPILER_STRIP_GATE(8085F07C, &lit_5271); +COMPILER_STRIP_GATE(0x8085F07C, &lit_5271); #pragma pop /* 8085F080-8085F084 000180 0004+00 0/1 0/0 0/0 .rodata @5272 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5272 = 4100.0f; -COMPILER_STRIP_GATE(8085F080, &lit_5272); +COMPILER_STRIP_GATE(0x8085F080, &lit_5272); #pragma pop /* 8085F084-8085F088 000184 0004+00 0/1 0/0 0/0 .rodata @5273 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5273 = 2206.0f; -COMPILER_STRIP_GATE(8085F084, &lit_5273); +COMPILER_STRIP_GATE(0x8085F084, &lit_5273); #pragma pop /* 8085F088-8085F08C 000188 0004+00 0/1 0/0 0/0 .rodata @5274 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5274 = -3200.0f; -COMPILER_STRIP_GATE(8085F088, &lit_5274); +COMPILER_STRIP_GATE(0x8085F088, &lit_5274); #pragma pop /* 8085F08C-8085F090 00018C 0004+00 0/1 0/0 0/0 .rodata @5275 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5275 = 6800.0f; -COMPILER_STRIP_GATE(8085F08C, &lit_5275); +COMPILER_STRIP_GATE(0x8085F08C, &lit_5275); #pragma pop /* 8085F090-8085F094 000190 0004+00 0/1 0/0 0/0 .rodata @5276 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5276 = 5350.0f; -COMPILER_STRIP_GATE(8085F090, &lit_5276); +COMPILER_STRIP_GATE(0x8085F090, &lit_5276); #pragma pop /* 8085F094-8085F098 000194 0004+00 0/1 0/0 0/0 .rodata @5277 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5277 = 480.0f; -COMPILER_STRIP_GATE(8085F094, &lit_5277); +COMPILER_STRIP_GATE(0x8085F094, &lit_5277); #pragma pop /* 8085F098-8085F09C 000198 0004+00 0/1 0/0 0/0 .rodata @5278 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5278 = -200.0f; -COMPILER_STRIP_GATE(8085F098, &lit_5278); +COMPILER_STRIP_GATE(0x8085F098, &lit_5278); #pragma pop /* 8085F09C-8085F0A0 00019C 0004+00 0/1 0/0 0/0 .rodata @5279 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5279 = 5300.0f; -COMPILER_STRIP_GATE(8085F09C, &lit_5279); +COMPILER_STRIP_GATE(0x8085F09C, &lit_5279); #pragma pop /* 8085F0A0-8085F0A4 0001A0 0004+00 0/1 0/0 0/0 .rodata @5280 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5280 = 510.0f; -COMPILER_STRIP_GATE(8085F0A0, &lit_5280); +COMPILER_STRIP_GATE(0x8085F0A0, &lit_5280); #pragma pop /* 8085F0A4-8085F0A8 0001A4 0004+00 0/1 0/0 0/0 .rodata @5281 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5281 = 3400.0f; -COMPILER_STRIP_GATE(8085F0A4, &lit_5281); +COMPILER_STRIP_GATE(0x8085F0A4, &lit_5281); #pragma pop /* 8085F0A8-8085F0AC 0001A8 0004+00 0/1 0/0 0/0 .rodata @5282 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5282 = 650.0f; -COMPILER_STRIP_GATE(8085F0A8, &lit_5282); +COMPILER_STRIP_GATE(0x8085F0A8, &lit_5282); #pragma pop /* 8085F0AC-8085F0B0 0001AC 0004+00 0/1 0/0 0/0 .rodata @5283 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5283 = 3000.0f; -COMPILER_STRIP_GATE(8085F0AC, &lit_5283); +COMPILER_STRIP_GATE(0x8085F0AC, &lit_5283); #pragma pop /* 8085F0B0-8085F0B4 0001B0 0004+00 0/1 0/0 0/0 .rodata @5284 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5284 = 15.0f; -COMPILER_STRIP_GATE(8085F0B0, &lit_5284); +COMPILER_STRIP_GATE(0x8085F0B0, &lit_5284); #pragma pop /* 8085F0B4-8085F0B8 0001B4 0004+00 0/1 0/0 0/0 .rodata @5285 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5285 = 2900.0f; -COMPILER_STRIP_GATE(8085F0B4, &lit_5285); +COMPILER_STRIP_GATE(0x8085F0B4, &lit_5285); #pragma pop /* 8085F0B8-8085F0BC 0001B8 0004+00 0/1 0/0 0/0 .rodata @5286 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5286 = 7000.0f; -COMPILER_STRIP_GATE(8085F0B8, &lit_5286); +COMPILER_STRIP_GATE(0x8085F0B8, &lit_5286); #pragma pop /* 8085F0BC-8085F0C0 0001BC 0004+00 0/1 0/0 0/0 .rodata @5287 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5287 = -3800.0f; -COMPILER_STRIP_GATE(8085F0BC, &lit_5287); +COMPILER_STRIP_GATE(0x8085F0BC, &lit_5287); #pragma pop /* 8085F0C0-8085F0C4 0001C0 0004+00 0/1 0/0 0/0 .rodata @5288 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5288 = 2800.0f; -COMPILER_STRIP_GATE(8085F0C0, &lit_5288); +COMPILER_STRIP_GATE(0x8085F0C0, &lit_5288); #pragma pop /* 8085F0C4-8085F0C8 0001C4 0004+00 0/1 0/0 0/0 .rodata @5289 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5289 = -2250.0f; -COMPILER_STRIP_GATE(8085F0C4, &lit_5289); +COMPILER_STRIP_GATE(0x8085F0C4, &lit_5289); #pragma pop /* 8085F0C8-8085F0CC 0001C8 0004+00 0/1 0/0 0/0 .rodata @5290 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5290 = -20.0f; -COMPILER_STRIP_GATE(8085F0C8, &lit_5290); +COMPILER_STRIP_GATE(0x8085F0C8, &lit_5290); #pragma pop /* 8085F0CC-8085F0D0 0001CC 0004+00 0/1 0/0 0/0 .rodata @5291 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5291 = -1160.0f; -COMPILER_STRIP_GATE(8085F0CC, &lit_5291); +COMPILER_STRIP_GATE(0x8085F0CC, &lit_5291); #pragma pop /* 8085F0D0-8085F0D4 0001D0 0004+00 0/1 0/0 0/0 .rodata @5292 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5292 = -380.0f; -COMPILER_STRIP_GATE(8085F0D0, &lit_5292); +COMPILER_STRIP_GATE(0x8085F0D0, &lit_5292); #pragma pop /* 8085F0D4-8085F0D8 0001D4 0004+00 0/1 0/0 0/0 .rodata @5293 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5293 = 2700.0f; -COMPILER_STRIP_GATE(8085F0D4, &lit_5293); +COMPILER_STRIP_GATE(0x8085F0D4, &lit_5293); #pragma pop /* 8085F0D8-8085F0DC 0001D8 0004+00 0/1 0/0 0/0 .rodata @5294 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5294 = -800.0f; -COMPILER_STRIP_GATE(8085F0D8, &lit_5294); +COMPILER_STRIP_GATE(0x8085F0D8, &lit_5294); #pragma pop /* 8085F0DC-8085F0E0 0001DC 0004+00 0/1 0/0 0/0 .rodata @5295 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5295 = -1060.0f; -COMPILER_STRIP_GATE(8085F0DC, &lit_5295); +COMPILER_STRIP_GATE(0x8085F0DC, &lit_5295); #pragma pop /* 8085F0E0-8085F0E4 0001E0 0004+00 0/1 0/0 0/0 .rodata @5296 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5296 = 2600.0f; -COMPILER_STRIP_GATE(8085F0E0, &lit_5296); +COMPILER_STRIP_GATE(0x8085F0E0, &lit_5296); #pragma pop /* 8085F0E4-8085F0E8 0001E4 0004+00 0/1 0/0 0/0 .rodata @5297 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5297 = 2650.0f; -COMPILER_STRIP_GATE(8085F0E4, &lit_5297); +COMPILER_STRIP_GATE(0x8085F0E4, &lit_5297); #pragma pop /* 8085F0E8-8085F0EC 0001E8 0004+00 0/1 0/0 0/0 .rodata @5298 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5298 = 600.0f; -COMPILER_STRIP_GATE(8085F0E8, &lit_5298); +COMPILER_STRIP_GATE(0x8085F0E8, &lit_5298); #pragma pop /* 8085DFF0-8085ED48 002530 0D58+00 1/1 0/0 0/0 .text daKytag12_Execute_R00__FP13kytag12_class */ @@ -1070,9 +1076,4 @@ SECTION_DATA extern void* g_profile_KYTAG12[12] = { (void*)0x00044000, (void*)NULL, }; -/* 8085F0EC-8085F0F3 0001EC 0007+00 2/2 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_8085F0EC = "D_MN08"; -#pragma pop +/* 8085F0EC-8085F0EC 0001EC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/kytag/d_a_kytag13/d_a_kytag13.cpp b/rel/d/a/kytag/d_a_kytag13/d_a_kytag13.cpp index a7cc8425383..8f0f4beb74e 100644 --- a/rel/d/a/kytag/d_a_kytag13/d_a_kytag13.cpp +++ b/rel/d/a/kytag/d_a_kytag13/d_a_kytag13.cpp @@ -131,7 +131,7 @@ static bool daKytag13_Draw(kytag13_class* param_0) { SECTION_RODATA static u8 const lit_3783[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80860470, &lit_3783); +COMPILER_STRIP_GATE(0x80860470, &lit_3783); /* 80860478-8086047C 000008 0004+00 1/2 0/0 0/0 .rodata @3784 */ SECTION_RODATA static u8 const lit_3784[4] = { @@ -140,7 +140,7 @@ SECTION_RODATA static u8 const lit_3784[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80860478, &lit_3784); +COMPILER_STRIP_GATE(0x80860478, &lit_3784); /* 8085F200-8085F2B0 000080 00B0+00 1/1 0/0 0/0 .text vectle_calc__FP10DOUBLE_POSP4cXyz */ @@ -158,161 +158,161 @@ static asm void vectle_calc(DOUBLE_POS* param_0, cXyz* param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4177 = 100.0f; -COMPILER_STRIP_GATE(8086047C, &lit_4177); +COMPILER_STRIP_GATE(0x8086047C, &lit_4177); #pragma pop /* 80860480-80860484 000010 0004+00 0/1 0/0 0/0 .rodata @4178 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4178 = 5.0f; -COMPILER_STRIP_GATE(80860480, &lit_4178); +COMPILER_STRIP_GATE(0x80860480, &lit_4178); #pragma pop /* 80860484-80860488 000014 0004+00 0/1 0/0 0/0 .rodata @4179 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4179 = 1000.0f; -COMPILER_STRIP_GATE(80860484, &lit_4179); +COMPILER_STRIP_GATE(0x80860484, &lit_4179); #pragma pop /* 80860488-8086048C 000018 0004+00 0/1 0/0 0/0 .rodata @4180 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4180 = 3.0f / 10.0f; -COMPILER_STRIP_GATE(80860488, &lit_4180); +COMPILER_STRIP_GATE(0x80860488, &lit_4180); #pragma pop /* 8086048C-80860490 00001C 0004+00 0/1 0/0 0/0 .rodata @4181 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4181 = 1.0f; -COMPILER_STRIP_GATE(8086048C, &lit_4181); +COMPILER_STRIP_GATE(0x8086048C, &lit_4181); #pragma pop /* 80860490-80860494 000020 0004+00 0/1 0/0 0/0 .rodata @4182 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4182 = -0.0f; -COMPILER_STRIP_GATE(80860490, &lit_4182); +COMPILER_STRIP_GATE(0x80860490, &lit_4182); #pragma pop /* 80860494-80860498 000024 0004+00 0/1 0/0 0/0 .rodata @4183 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4183 = -3.0f / 10.0f; -COMPILER_STRIP_GATE(80860494, &lit_4183); +COMPILER_STRIP_GATE(0x80860494, &lit_4183); #pragma pop /* 80860498-8086049C 000028 0004+00 0/1 0/0 0/0 .rodata @4184 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4184 = -2.0f / 5.0f; -COMPILER_STRIP_GATE(80860498, &lit_4184); +COMPILER_STRIP_GATE(0x80860498, &lit_4184); #pragma pop /* 8086049C-808604A0 00002C 0004+00 0/1 0/0 0/0 .rodata @4185 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4185 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(8086049C, &lit_4185); +COMPILER_STRIP_GATE(0x8086049C, &lit_4185); #pragma pop /* 808604A0-808604A4 000030 0004+00 0/1 0/0 0/0 .rodata @4186 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4186 = 4.0f; -COMPILER_STRIP_GATE(808604A0, &lit_4186); +COMPILER_STRIP_GATE(0x808604A0, &lit_4186); #pragma pop /* 808604A4-808604A8 000034 0004+00 0/1 0/0 0/0 .rodata @4187 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4187 = 6.0f; -COMPILER_STRIP_GATE(808604A4, &lit_4187); +COMPILER_STRIP_GATE(0x808604A4, &lit_4187); #pragma pop /* 808604A8-808604AC 000038 0004+00 0/1 0/0 0/0 .rodata @4188 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4188 = 500.0f; -COMPILER_STRIP_GATE(808604A8, &lit_4188); +COMPILER_STRIP_GATE(0x808604A8, &lit_4188); #pragma pop /* 808604AC-808604B0 00003C 0004+00 0/1 0/0 0/0 .rodata @4189 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4189 = 65536.0f; -COMPILER_STRIP_GATE(808604AC, &lit_4189); +COMPILER_STRIP_GATE(0x808604AC, &lit_4189); #pragma pop /* 808604B0-808604B4 000040 0004+00 0/1 0/0 0/0 .rodata @4190 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4190 = 1680.0f; -COMPILER_STRIP_GATE(808604B0, &lit_4190); +COMPILER_STRIP_GATE(0x808604B0, &lit_4190); #pragma pop /* 808604B4-808604B8 000044 0004+00 0/1 0/0 0/0 .rodata @4191 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4191 = 200.0f; -COMPILER_STRIP_GATE(808604B4, &lit_4191); +COMPILER_STRIP_GATE(0x808604B4, &lit_4191); #pragma pop /* 808604B8-808604BC 000048 0004+00 0/1 0/0 0/0 .rodata @4192 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4192 = 1630.0f; -COMPILER_STRIP_GATE(808604B8, &lit_4192); +COMPILER_STRIP_GATE(0x808604B8, &lit_4192); #pragma pop /* 808604BC-808604C0 00004C 0004+00 0/1 0/0 0/0 .rodata @4193 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4193 = 4280.0f; -COMPILER_STRIP_GATE(808604BC, &lit_4193); +COMPILER_STRIP_GATE(0x808604BC, &lit_4193); #pragma pop /* 808604C0-808604C4 000050 0004+00 0/1 0/0 0/0 .rodata @4194 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4194 = -1680.0f; -COMPILER_STRIP_GATE(808604C0, &lit_4194); +COMPILER_STRIP_GATE(0x808604C0, &lit_4194); #pragma pop /* 808604C4-808604C8 000054 0004+00 0/1 0/0 0/0 .rodata @4195 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4195 = 5000.0f; -COMPILER_STRIP_GATE(808604C4, &lit_4195); +COMPILER_STRIP_GATE(0x808604C4, &lit_4195); #pragma pop /* 808604C8-808604CC 000058 0004+00 0/1 0/0 0/0 .rodata @4196 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4196 = 750.0f; -COMPILER_STRIP_GATE(808604C8, &lit_4196); +COMPILER_STRIP_GATE(0x808604C8, &lit_4196); #pragma pop /* 808604CC-808604D0 00005C 0004+00 0/1 0/0 0/0 .rodata @4197 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4197 = 7110.0f; -COMPILER_STRIP_GATE(808604CC, &lit_4197); +COMPILER_STRIP_GATE(0x808604CC, &lit_4197); #pragma pop /* 808604D0-808604D4 000060 0004+00 0/1 0/0 0/0 .rodata @4198 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4198 = -22.0f; -COMPILER_STRIP_GATE(808604D0, &lit_4198); +COMPILER_STRIP_GATE(0x808604D0, &lit_4198); #pragma pop /* 808604D4-808604D8 000064 0004+00 0/1 0/0 0/0 .rodata @4199 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4199 = 950.0f; -COMPILER_STRIP_GATE(808604D4, &lit_4199); +COMPILER_STRIP_GATE(0x808604D4, &lit_4199); #pragma pop /* 808604D8-808604E0 000068 0004+04 0/1 0/0 0/0 .rodata @4200 */ @@ -323,7 +323,7 @@ SECTION_RODATA static f32 const lit_4200[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(808604D8, &lit_4200); +COMPILER_STRIP_GATE(0x808604D8, &lit_4200); #pragma pop /* 808604E0-808604E8 000070 0008+00 0/1 0/0 0/0 .rodata @4201 */ @@ -332,7 +332,7 @@ COMPILER_STRIP_GATE(808604D8, &lit_4200); SECTION_RODATA static u8 const lit_4201[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(808604E0, &lit_4201); +COMPILER_STRIP_GATE(0x808604E0, &lit_4201); #pragma pop /* 808604E8-808604F0 000078 0008+00 0/1 0/0 0/0 .rodata @4202 */ @@ -341,112 +341,118 @@ COMPILER_STRIP_GATE(808604E0, &lit_4201); SECTION_RODATA static u8 const lit_4202[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(808604E8, &lit_4202); +COMPILER_STRIP_GATE(0x808604E8, &lit_4202); #pragma pop /* 808604F0-808604F4 000080 0004+00 0/1 0/0 0/0 .rodata @4203 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4203 = 2.0f / 25.0f; -COMPILER_STRIP_GATE(808604F0, &lit_4203); +COMPILER_STRIP_GATE(0x808604F0, &lit_4203); #pragma pop /* 808604F4-808604F8 000084 0004+00 0/1 0/0 0/0 .rodata @4204 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4204 = 0.5f; -COMPILER_STRIP_GATE(808604F4, &lit_4204); +COMPILER_STRIP_GATE(0x808604F4, &lit_4204); #pragma pop /* 808604F8-808604FC 000088 0004+00 0/1 0/0 0/0 .rodata @4205 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4205 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(808604F8, &lit_4205); +COMPILER_STRIP_GATE(0x808604F8, &lit_4205); #pragma pop /* 808604FC-80860500 00008C 0004+00 0/1 0/0 0/0 .rodata @4206 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4206 = 1.0f / 100.0f; -COMPILER_STRIP_GATE(808604FC, &lit_4206); +COMPILER_STRIP_GATE(0x808604FC, &lit_4206); #pragma pop /* 80860500-80860504 000090 0004+00 0/1 0/0 0/0 .rodata @4207 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4207 = 37.0f / 10.0f; -COMPILER_STRIP_GATE(80860500, &lit_4207); +COMPILER_STRIP_GATE(0x80860500, &lit_4207); #pragma pop /* 80860504-80860508 000094 0004+00 0/1 0/0 0/0 .rodata @4208 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4208 = 3.0f; -COMPILER_STRIP_GATE(80860504, &lit_4208); +COMPILER_STRIP_GATE(0x80860504, &lit_4208); #pragma pop /* 80860508-8086050C 000098 0004+00 0/1 0/0 0/0 .rodata @4209 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4209 = 3000.0f; -COMPILER_STRIP_GATE(80860508, &lit_4209); +COMPILER_STRIP_GATE(0x80860508, &lit_4209); #pragma pop /* 8086050C-80860510 00009C 0004+00 0/1 0/0 0/0 .rodata @4210 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4210 = 0.25f; -COMPILER_STRIP_GATE(8086050C, &lit_4210); +COMPILER_STRIP_GATE(0x8086050C, &lit_4210); #pragma pop /* 80860510-80860514 0000A0 0004+00 0/1 0/0 0/0 .rodata @4211 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4211 = 1500.0f; -COMPILER_STRIP_GATE(80860510, &lit_4211); +COMPILER_STRIP_GATE(0x80860510, &lit_4211); #pragma pop /* 80860514-80860518 0000A4 0004+00 0/1 0/0 0/0 .rodata @4212 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4212 = 0x3A83126F; -COMPILER_STRIP_GATE(80860514, &lit_4212); +COMPILER_STRIP_GATE(0x80860514, &lit_4212); #pragma pop /* 80860518-8086051C 0000A8 0004+00 0/1 0/0 0/0 .rodata @4213 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4213 = 1.0f / 20.0f; -COMPILER_STRIP_GATE(80860518, &lit_4213); +COMPILER_STRIP_GATE(0x80860518, &lit_4213); #pragma pop /* 8086051C-80860520 0000AC 0004+00 0/1 0/0 0/0 .rodata @4214 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4214 = 0x38D1B717; -COMPILER_STRIP_GATE(8086051C, &lit_4214); +COMPILER_STRIP_GATE(0x8086051C, &lit_4214); #pragma pop /* 80860520-80860524 0000B0 0004+00 0/1 0/0 0/0 .rodata @4215 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4215 = 10.0f; -COMPILER_STRIP_GATE(80860520, &lit_4215); +COMPILER_STRIP_GATE(0x80860520, &lit_4215); #pragma pop /* 80860524-80860528 0000B4 0004+00 0/1 0/0 0/0 .rodata @4216 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4216 = -5560.0f; -COMPILER_STRIP_GATE(80860524, &lit_4216); +COMPILER_STRIP_GATE(0x80860524, &lit_4216); #pragma pop /* 80860528-8086052C 0000B8 0004+00 0/1 0/0 0/0 .rodata @4217 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4217 = 925.0f; -COMPILER_STRIP_GATE(80860528, &lit_4217); +COMPILER_STRIP_GATE(0x80860528, &lit_4217); +#pragma pop + +/* 80860538-80860538 0000C8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80860538 = "D_MN11"; #pragma pop /* 80860540-80860560 -00001 0020+00 1/0 0/0 0/0 .data l_daKytag13_Method */ @@ -532,13 +538,13 @@ static bool daKytag13_Delete(kytag13_class* param_0) { /* ############################################################################################## */ /* 8086052C-80860530 0000BC 0004+00 1/1 0/0 0/0 .rodata @4335 */ SECTION_RODATA static f32 const lit_4335 = 255.0f; -COMPILER_STRIP_GATE(8086052C, &lit_4335); +COMPILER_STRIP_GATE(0x8086052C, &lit_4335); /* 80860530-80860538 0000C0 0008+00 1/1 0/0 0/0 .rodata @4337 */ SECTION_RODATA static u8 const lit_4337[8] = { 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80860530, &lit_4337); +COMPILER_STRIP_GATE(0x80860530, &lit_4337); /* 80860210-80860450 001090 0240+00 1/0 0/0 0/0 .text daKytag13_Create__FP10fopAc_ac_c */ #pragma push @@ -580,9 +586,4 @@ static asm void func_80860460() { } #pragma pop -/* 80860538-8086053F 0000C8 0007+00 1/1 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80860538 = "D_MN11"; -#pragma pop +/* 80860538-80860538 0000C8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/kytag/d_a_kytag15/d_a_kytag15.cpp b/rel/d/a/kytag/d_a_kytag15/d_a_kytag15.cpp index 6fe6af8f953..f8db9b1861b 100644 --- a/rel/d/a/kytag/d_a_kytag15/d_a_kytag15.cpp +++ b/rel/d/a/kytag/d_a_kytag15/d_a_kytag15.cpp @@ -106,27 +106,27 @@ SECTION_RODATA static u8 const lit_3823[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80860B40, &lit_3823); +COMPILER_STRIP_GATE(0x80860B40, &lit_3823); /* 80860B44-80860B48 000004 0004+00 0/1 0/0 0/0 .rodata @3824 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_3824 = 0x3BABB44E; -COMPILER_STRIP_GATE(80860B44, &lit_3824); +COMPILER_STRIP_GATE(0x80860B44, &lit_3824); #pragma pop /* 80860B48-80860B4C 000008 0004+00 0/1 0/0 0/0 .rodata @3825 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3825 = -255.0f; -COMPILER_STRIP_GATE(80860B48, &lit_3825); +COMPILER_STRIP_GATE(0x80860B48, &lit_3825); #pragma pop /* 80860B4C-80860B50 00000C 0004+00 0/1 0/0 0/0 .rodata @3826 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3826 = 255.0f; -COMPILER_STRIP_GATE(80860B4C, &lit_3826); +COMPILER_STRIP_GATE(0x80860B4C, &lit_3826); #pragma pop /* 80860B50-80860B58 000010 0008+00 0/1 0/0 0/0 .rodata @3828 */ @@ -135,7 +135,7 @@ COMPILER_STRIP_GATE(80860B4C, &lit_3826); SECTION_RODATA static u8 const lit_3828[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80860B50, &lit_3828); +COMPILER_STRIP_GATE(0x80860B50, &lit_3828); #pragma pop /* 80860638-808607F8 000078 01C0+00 1/0 0/0 0/0 .text daKytag15_Draw__FP13kytag15_class @@ -152,27 +152,27 @@ static asm void daKytag15_Draw(kytag15_class* param_0) { /* ############################################################################################## */ /* 80860B58-80860B5C 000018 0004+00 2/3 0/0 0/0 .rodata @3845 */ SECTION_RODATA static f32 const lit_3845 = 1.0f; -COMPILER_STRIP_GATE(80860B58, &lit_3845); +COMPILER_STRIP_GATE(0x80860B58, &lit_3845); /* 80860B5C-80860B60 00001C 0004+00 0/1 0/0 0/0 .rodata @3846 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3846 = 1.0f / 20.0f; -COMPILER_STRIP_GATE(80860B5C, &lit_3846); +COMPILER_STRIP_GATE(0x80860B5C, &lit_3846); #pragma pop /* 80860B60-80860B64 000020 0004+00 0/1 0/0 0/0 .rodata @3847 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3847 = 1.0f / 100.0f; -COMPILER_STRIP_GATE(80860B60, &lit_3847); +COMPILER_STRIP_GATE(0x80860B60, &lit_3847); #pragma pop /* 80860B64-80860B68 000024 0004+00 0/1 0/0 0/0 .rodata @3848 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_3848 = 0x322BCC77; -COMPILER_STRIP_GATE(80860B64, &lit_3848); +COMPILER_STRIP_GATE(0x80860B64, &lit_3848); #pragma pop /* 808607F8-808608B0 000238 00B8+00 1/0 0/0 0/0 .text daKytag15_Execute__FP13kytag15_class */ @@ -190,6 +190,13 @@ static bool daKytag15_IsDelete(kytag15_class* param_0) { return true; } +/* ############################################################################################## */ +/* 80860B68-80860B68 000028 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80860B68 = "Kytag15"; +#pragma pop + /* 808608B8-808608E8 0002F8 0030+00 1/0 0/0 0/0 .text daKytag15_Delete__FP13kytag15_class */ #pragma push @@ -235,6 +242,12 @@ static asm void useHeapInit(fopAc_ac_c* param_0) { #pragma pop /* ############################################################################################## */ +/* 80860B68-80860B68 000028 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80860B70 = "F_SP118"; +#pragma pop + /* 80860BC8-80860BD4 000050 000C+00 2/2 0/0 0/0 .data __vt__12J3DFrameCtrl */ SECTION_DATA extern void* __vt__12J3DFrameCtrl[3] = { (void*)NULL /* RTTI */, @@ -262,10 +275,4 @@ asm J3DFrameCtrl::~J3DFrameCtrl() { } #pragma pop -/* 80860B68-80860B78 000028 0010+00 3/3 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80860B68 = "Kytag15"; -SECTION_DEAD static char const* const stringBase_80860B70 = "F_SP118"; -#pragma pop +/* 80860B68-80860B68 000028 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/kytag/d_a_kytag16/d_a_kytag16.cpp b/rel/d/a/kytag/d_a_kytag16/d_a_kytag16.cpp index d82a2df3894..02d16aef862 100644 --- a/rel/d/a/kytag/d_a_kytag16/d_a_kytag16.cpp +++ b/rel/d/a/kytag/d_a_kytag16/d_a_kytag16.cpp @@ -79,76 +79,82 @@ SECTION_RODATA static u8 const lit_3839[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80861134, &lit_3839); +COMPILER_STRIP_GATE(0x80861134, &lit_3839); /* 80861138-8086113C 000004 0004+00 0/2 0/0 0/0 .rodata @3840 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3840 = 1.0f; -COMPILER_STRIP_GATE(80861138, &lit_3840); +COMPILER_STRIP_GATE(0x80861138, &lit_3840); #pragma pop /* 8086113C-80861140 000008 0004+00 0/1 0/0 0/0 .rodata @3841 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3841 = 0.5f; -COMPILER_STRIP_GATE(8086113C, &lit_3841); +COMPILER_STRIP_GATE(0x8086113C, &lit_3841); #pragma pop /* 80861140-80861144 00000C 0004+00 0/1 0/0 0/0 .rodata @3842 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3842 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(80861140, &lit_3842); +COMPILER_STRIP_GATE(0x80861140, &lit_3842); #pragma pop /* 80861144-80861148 000010 0004+00 0/1 0/0 0/0 .rodata @3843 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_3843 = 0x38D1B717; -COMPILER_STRIP_GATE(80861144, &lit_3843); +COMPILER_STRIP_GATE(0x80861144, &lit_3843); #pragma pop /* 80861148-8086114C 000014 0004+00 0/1 0/0 0/0 .rodata @3844 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3844 = 9.0f / 10.0f; -COMPILER_STRIP_GATE(80861148, &lit_3844); +COMPILER_STRIP_GATE(0x80861148, &lit_3844); #pragma pop /* 8086114C-80861150 000018 0004+00 0/1 0/0 0/0 .rodata @3845 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3845 = 40.0f; -COMPILER_STRIP_GATE(8086114C, &lit_3845); +COMPILER_STRIP_GATE(0x8086114C, &lit_3845); #pragma pop /* 80861150-80861154 00001C 0004+00 0/1 0/0 0/0 .rodata @3846 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3846 = 1.0f / 20.0f; -COMPILER_STRIP_GATE(80861150, &lit_3846); +COMPILER_STRIP_GATE(0x80861150, &lit_3846); #pragma pop /* 80861154-80861158 000020 0004+00 0/1 0/0 0/0 .rodata @3847 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_3847 = 0x3A83126F; -COMPILER_STRIP_GATE(80861154, &lit_3847); +COMPILER_STRIP_GATE(0x80861154, &lit_3847); #pragma pop /* 80861158-8086115C 000024 0004+00 0/1 0/0 0/0 .rodata @3848 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3848 = 12.0f; -COMPILER_STRIP_GATE(80861158, &lit_3848); +COMPILER_STRIP_GATE(0x80861158, &lit_3848); #pragma pop /* 8086115C-80861160 000028 0004+00 0/1 0/0 0/0 .rodata @3849 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3849 = 50.0f; -COMPILER_STRIP_GATE(8086115C, &lit_3849); +COMPILER_STRIP_GATE(0x8086115C, &lit_3849); +#pragma pop + +/* 80861194-80861194 000060 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80861194 = "F_SP117"; #pragma pop /* 80860C60-80860E9C 000080 023C+00 1/0 0/0 0/0 .text daKytag16_Execute__FP13kytag16_class */ @@ -177,63 +183,63 @@ static bool daKytag16_Delete(kytag16_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3902 = 180.0f; -COMPILER_STRIP_GATE(80861160, &lit_3902); +COMPILER_STRIP_GATE(0x80861160, &lit_3902); #pragma pop /* 80861164-80861168 000030 0004+00 0/1 0/0 0/0 .rodata @3903 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3903 = 32767.0f; -COMPILER_STRIP_GATE(80861164, &lit_3903); +COMPILER_STRIP_GATE(0x80861164, &lit_3903); #pragma pop /* 80861168-8086116C 000034 0004+00 0/1 0/0 0/0 .rodata @3904 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3904 = 65535.0f; -COMPILER_STRIP_GATE(80861168, &lit_3904); +COMPILER_STRIP_GATE(0x80861168, &lit_3904); #pragma pop /* 8086116C-80861170 000038 0004+00 0/1 0/0 0/0 .rodata @3905 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3905 = 45.0f; -COMPILER_STRIP_GATE(8086116C, &lit_3905); +COMPILER_STRIP_GATE(0x8086116C, &lit_3905); #pragma pop /* 80861170-80861174 00003C 0004+00 0/0 0/0 0/0 .rodata @3906 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3906 = 5.0f; -COMPILER_STRIP_GATE(80861170, &lit_3906); +COMPILER_STRIP_GATE(0x80861170, &lit_3906); #pragma pop /* 80861174-80861178 000040 0004+00 0/0 0/0 0/0 .rodata @3907 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3907 = 10.0f; -COMPILER_STRIP_GATE(80861174, &lit_3907); +COMPILER_STRIP_GATE(0x80861174, &lit_3907); #pragma pop /* 80861178-8086117C 000044 0004+00 0/0 0/0 0/0 .rodata @3908 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3908 = 25.0f; -COMPILER_STRIP_GATE(80861178, &lit_3908); +COMPILER_STRIP_GATE(0x80861178, &lit_3908); #pragma pop /* 8086117C-80861180 000048 0004+00 0/0 0/0 0/0 .rodata @3909 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3909 = 70.0f; -COMPILER_STRIP_GATE(8086117C, &lit_3909); +COMPILER_STRIP_GATE(0x8086117C, &lit_3909); #pragma pop /* 80861180-80861184 00004C 0004+00 0/0 0/0 0/0 .rodata @3910 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3910 = 60.0f; -COMPILER_STRIP_GATE(80861180, &lit_3910); +COMPILER_STRIP_GATE(0x80861180, &lit_3910); #pragma pop /* 80861184-8086118C 000050 0004+04 0/0 0/0 0/0 .rodata @3911 */ @@ -244,7 +250,7 @@ SECTION_RODATA static f32 const lit_3911[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80861184, &lit_3911); +COMPILER_STRIP_GATE(0x80861184, &lit_3911); #pragma pop /* 8086118C-80861194 000058 0008+00 0/1 0/0 0/0 .rodata @3913 */ @@ -253,7 +259,7 @@ COMPILER_STRIP_GATE(80861184, &lit_3911); SECTION_RODATA static u8 const lit_3913[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8086118C, &lit_3913); +COMPILER_STRIP_GATE(0x8086118C, &lit_3913); #pragma pop /* 8086119C-808611BC -00001 0020+00 1/1 0/0 0/0 .data @3917 */ @@ -301,9 +307,4 @@ SECTION_DATA extern void* g_profile_KYTAG16[12] = { (void*)0x00060000, (void*)NULL, }; -/* 80861194-8086119C 000060 0008+00 1/1 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80861194 = "F_SP117"; -#pragma pop +/* 80861194-80861194 000060 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/npc/d_a_npc_aru/d_a_npc_aru.cpp b/rel/d/a/npc/d_a_npc_aru/d_a_npc_aru.cpp index 63451c06a2a..dedd7cd6d8e 100644 --- a/rel/d/a/npc/d_a_npc_aru/d_a_npc_aru.cpp +++ b/rel/d/a/npc/d_a_npc_aru/d_a_npc_aru.cpp @@ -15,12 +15,14 @@ struct mDoMtx_stack_c { static u8 now[48]; }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; +struct J3DAnmTransform {}; + +struct J3DModelData {}; + struct Vec {}; struct Z2Creature { @@ -29,8 +31,6 @@ struct Z2Creature { /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -55,6 +55,8 @@ struct daTag_EvtArea_c { /* 8048C94C */ void chkPointInArea(cXyz, cXyz); }; +struct daNpcT_faceMotionAnmData_c {}; + struct daNpcT_MotionSeqMngr_c { struct sequenceStepData_c {}; @@ -63,14 +65,12 @@ struct daNpcT_MotionSeqMngr_c { /* 80956DDC */ ~daNpcT_MotionSeqMngr_c(); }; +struct daNpcT_evtData_c {}; + struct daNpcT_motionAnmData_c {}; struct J3DJoint {}; -struct daNpcT_faceMotionAnmData_c {}; - -struct daNpcT_evtData_c {}; - struct daNpc_Aru_c { /* 8095178C */ ~daNpc_Aru_c(); /* 809518C4 */ void create(); @@ -149,15 +149,15 @@ struct dCcD_GObjInf { /* 800844F8 */ void GetTgHitObj(); }; -struct J3DModel {}; - -struct _GXColorS10 {}; - struct csXyz { /* 80956784 */ ~csXyz(); /* 80956CD8 */ csXyz(); }; +struct _GXColorS10 {}; + +struct J3DModel {}; + struct daNpcT_c { /* 80147FA4 */ void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*); /* 801483F8 */ void loadRes(s8 const*, char const**); @@ -539,8 +539,8 @@ extern "C" void changeAnm__8daNpcT_cFPiPi(); extern "C" void changeBck__8daNpcT_cFPiPi(); extern "C" void changeBtp__8daNpcT_cFPiPi(); extern "C" void changeBtk__8daNpcT_cFPiPi(); -extern "C" void func_80957394(int*); -extern "C" void func_809573B0(f32, f32); +extern "C" void func_80957394(void* _this, int*); +extern "C" void func_809573B0(void* _this, f32, f32); extern "C" void __sinit_d_a_npc_aru_cpp(); extern "C" void __ct__11daNpc_Aru_cFPC26daNpcT_faceMotionAnmData_cPC22daNpcT_motionAnmData_cPCQ222daNpcT_MotionSeqMngr_c18sequenceStepData_ciPCQ222daNpcT_MotionSeqMngr_c18sequenceStepData_ciPC16daNpcT_evtData_cPPc(); @@ -757,6 +757,25 @@ extern "C" void __register_global_object(); // /* ############################################################################################## */ +/* 8095781C-8095781C 00014C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8095781C = ""; +SECTION_DEAD static char const* const stringBase_8095781D = "DEFAULT_GETITEM"; +SECTION_DEAD static char const* const stringBase_8095782D = "NO_RESPONSE"; +SECTION_DEAD static char const* const stringBase_80957839 = "RIDEON_HORSE"; +SECTION_DEAD static char const* const stringBase_80957846 = "GOTO_BULLRUNNING_STAGE"; +SECTION_DEAD static char const* const stringBase_8095785D = "GOTO_BULLRUNNING_STAGE_VER2"; +SECTION_DEAD static char const* const stringBase_80957879 = "END_BULLRUNNING"; +SECTION_DEAD static char const* const stringBase_80957889 = "END_BULLRUNNING2"; +SECTION_DEAD static char const* const stringBase_8095789A = "END_BULLRUNNING3"; +SECTION_DEAD static char const* const stringBase_809578AB = "GOTO_SKIPFENCE_STAGE"; +SECTION_DEAD static char const* const stringBase_809578C0 = "SPEAKTO"; +SECTION_DEAD static char const* const stringBase_809578C8 = "NO_ENTRANCE"; +SECTION_DEAD static char const* const stringBase_809578D4 = "Aru"; +SECTION_DEAD static char const* const stringBase_809578D8 = "Aru1"; +#pragma pop + /* 809578E8-809578F4 000000 000C+00 3/3 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -1323,7 +1342,7 @@ SECTION_RODATA u8 const daNpc_Aru_Param_c::m[160] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x44, 0xBB, 0x80, 0x00, 0x41, 0xC0, 0x00, 0x00, 0x40, 0x80, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x14, 0x42, 0x34, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809576D0, &daNpc_Aru_Param_c::m); +COMPILER_STRIP_GATE(0x809576D0, &daNpc_Aru_Param_c::m); /* 80957770-80957788 0000A0 0018+00 0/1 0/0 0/0 .rodata heapSize$4024 */ #pragma push @@ -1332,35 +1351,35 @@ SECTION_RODATA static u8 const heapSize[24] = { 0x00, 0x00, 0x3D, 0x50, 0x00, 0x00, 0x3D, 0x50, 0x00, 0x00, 0x3D, 0x50, 0x00, 0x00, 0x3D, 0x50, 0x00, 0x00, 0x3D, 0x50, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80957770, &heapSize); +COMPILER_STRIP_GATE(0x80957770, &heapSize); #pragma pop /* 80957788-8095778C 0000B8 0004+00 0/1 0/0 0/0 .rodata @4096 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4096 = -200.0f; -COMPILER_STRIP_GATE(80957788, &lit_4096); +COMPILER_STRIP_GATE(0x80957788, &lit_4096); #pragma pop /* 8095778C-80957790 0000BC 0004+00 0/1 0/0 0/0 .rodata @4097 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4097 = -100.0f; -COMPILER_STRIP_GATE(8095778C, &lit_4097); +COMPILER_STRIP_GATE(0x8095778C, &lit_4097); #pragma pop /* 80957790-80957794 0000C0 0004+00 0/2 0/0 0/0 .rodata @4098 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4098 = 200.0f; -COMPILER_STRIP_GATE(80957790, &lit_4098); +COMPILER_STRIP_GATE(0x80957790, &lit_4098); #pragma pop /* 80957794-80957798 0000C4 0004+00 0/1 0/0 0/0 .rodata @4099 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4099 = 300.0f; -COMPILER_STRIP_GATE(80957794, &lit_4099); +COMPILER_STRIP_GATE(0x80957794, &lit_4099); #pragma pop /* 80957798-8095779C 0000C8 0004+00 13/21 0/0 0/0 .rodata @4100 */ @@ -1370,13 +1389,13 @@ SECTION_RODATA static u8 const lit_4100[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80957798, &lit_4100); +COMPILER_STRIP_GATE(0x80957798, &lit_4100); /* 8095779C-809577A0 0000CC 0004+00 0/1 0/0 0/0 .rodata @4101 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4101 = -1000000000.0f; -COMPILER_STRIP_GATE(8095779C, &lit_4101); +COMPILER_STRIP_GATE(0x8095779C, &lit_4101); #pragma pop /* 809518C4-80951BB0 000224 02EC+00 1/1 0/0 0/0 .text create__11daNpc_Aru_cFv */ @@ -1394,19 +1413,19 @@ asm void daNpc_Aru_c::create() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4256 = 65536.0f; -COMPILER_STRIP_GATE(809577A0, &lit_4256); +COMPILER_STRIP_GATE(0x809577A0, &lit_4256); #pragma pop /* 809577A4-809577A8 0000D4 0004+00 0/3 0/0 0/0 .rodata @4257 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4257 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(809577A4, &lit_4257); +COMPILER_STRIP_GATE(0x809577A4, &lit_4257); #pragma pop /* 809577A8-809577AC 0000D8 0004+00 2/4 0/0 0/0 .rodata @4399 */ SECTION_RODATA static f32 const lit_4399 = 1.0f; -COMPILER_STRIP_GATE(809577A8, &lit_4399); +COMPILER_STRIP_GATE(0x809577A8, &lit_4399); /* 80951BB0-80951E20 000510 0270+00 1/1 0/0 0/0 .text CreateHeap__11daNpc_Aru_cFv */ #pragma push @@ -1541,7 +1560,7 @@ asm void daNpc_Aru_c::Execute() { /* ############################################################################################## */ /* 809577AC-809577B0 0000DC 0004+00 1/2 0/0 0/0 .rodata @4448 */ SECTION_RODATA static f32 const lit_4448 = 100.0f; -COMPILER_STRIP_GATE(809577AC, &lit_4448); +COMPILER_STRIP_GATE(0x809577AC, &lit_4448); /* 80952030-809520C4 000990 0094+00 1/1 0/0 0/0 .text Draw__11daNpc_Aru_cFv */ #pragma push @@ -1618,7 +1637,7 @@ asm void daNpc_Aru_c::getCowP(int param_0) { /* ############################################################################################## */ /* 809577B0-809577B4 0000E0 0004+00 2/2 0/0 0/0 .rodata @4591 */ SECTION_RODATA static f32 const lit_4591 = 1000000000.0f; -COMPILER_STRIP_GATE(809577B0, &lit_4591); +COMPILER_STRIP_GATE(0x809577B0, &lit_4591); /* 8095253C-8095260C 000E9C 00D0+00 1/1 0/0 0/0 .text getUDoor_l_P__11daNpc_Aru_cFv */ #pragma push @@ -1660,6 +1679,13 @@ asm void daNpc_Aru_c::isDelete() { } #pragma pop +/* ############################################################################################## */ +/* 8095781C-8095781C 00014C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_809578DD = "F_SP00"; +#pragma pop + /* 809527CC-80952B00 00112C 0334+00 1/1 0/0 0/0 .text reset__11daNpc_Aru_cFv */ #pragma push #pragma optimization_level 0 @@ -1703,7 +1729,7 @@ asm void daNpc_Aru_c::checkChangeEvt() { /* ############################################################################################## */ /* 809577B4-809577B8 0000E4 0004+00 8/9 0/0 0/0 .rodata @4804 */ SECTION_RODATA static f32 const lit_4804 = -1.0f; -COMPILER_STRIP_GATE(809577B4, &lit_4804); +COMPILER_STRIP_GATE(0x809577B4, &lit_4804); /* 80952D9C-80952E64 0016FC 00C8+00 1/0 0/0 0/0 .text setAfterTalkMotion__11daNpc_Aru_cFv */ @@ -1721,28 +1747,28 @@ asm void daNpc_Aru_c::setAfterTalkMotion() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4844 = 210.0f; -COMPILER_STRIP_GATE(809577B8, &lit_4844); +COMPILER_STRIP_GATE(0x809577B8, &lit_4844); #pragma pop /* 809577BC-809577C0 0000EC 0004+00 0/1 0/0 0/0 .rodata @4845 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4845 = 410.0f; -COMPILER_STRIP_GATE(809577BC, &lit_4845); +COMPILER_STRIP_GATE(0x809577BC, &lit_4845); #pragma pop /* 809577C0-809577C4 0000F0 0004+00 0/1 0/0 0/0 .rodata @4846 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4846 = 32.0f; -COMPILER_STRIP_GATE(809577C0, &lit_4846); +COMPILER_STRIP_GATE(0x809577C0, &lit_4846); #pragma pop /* 809577C4-809577C8 0000F4 0004+00 0/1 0/0 0/0 .rodata @4847 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4847 = 419.0f; -COMPILER_STRIP_GATE(809577C4, &lit_4847); +COMPILER_STRIP_GATE(0x809577C4, &lit_4847); #pragma pop /* 80952E64-809530DC 0017C4 0278+00 1/1 0/0 0/0 .text srchActors__11daNpc_Aru_cFv */ @@ -1800,35 +1826,35 @@ asm void daNpc_Aru_c::beforeMove() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4990 = -30.0f; -COMPILER_STRIP_GATE(809577C8, &lit_4990); +COMPILER_STRIP_GATE(0x809577C8, &lit_4990); #pragma pop /* 809577CC-809577D0 0000FC 0004+00 0/1 0/0 0/0 .rodata @4991 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4991 = 10.0f; -COMPILER_STRIP_GATE(809577CC, &lit_4991); +COMPILER_STRIP_GATE(0x809577CC, &lit_4991); #pragma pop /* 809577D0-809577D4 000100 0004+00 0/1 0/0 0/0 .rodata @4992 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4992 = 0x38C90FDB; -COMPILER_STRIP_GATE(809577D0, &lit_4992); +COMPILER_STRIP_GATE(0x809577D0, &lit_4992); #pragma pop /* 809577D4-809577D8 000104 0004+00 0/1 0/0 0/0 .rodata @4993 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4993 = 20.0f; -COMPILER_STRIP_GATE(809577D4, &lit_4993); +COMPILER_STRIP_GATE(0x809577D4, &lit_4993); #pragma pop /* 809577D8-809577E0 000108 0008+00 1/4 0/0 0/0 .rodata @4995 */ SECTION_RODATA static u8 const lit_4995[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809577D8, &lit_4995); +COMPILER_STRIP_GATE(0x809577D8, &lit_4995); /* 80958120-80958124 000008 0001+03 1/1 0/0 0/0 .bss @1109 */ static u8 lit_1109[1 + 3 /* padding */]; @@ -1981,7 +2007,7 @@ asm void daNpc_Aru_c::selectAction() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpc_Aru_c::chkAction(int (daNpc_Aru_c::*)(void*)) { +asm void daNpc_Aru_c::chkAction(int (daNpc_Aru_c::*param_0)(void*)) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_aru/d_a_npc_aru/chkAction__11daNpc_Aru_cFM11daNpc_Aru_cFPCvPvPv_i.s" } @@ -1992,7 +2018,7 @@ asm void daNpc_Aru_c::chkAction(int (daNpc_Aru_c::*)(void*)) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpc_Aru_c::setAction(int (daNpc_Aru_c::*)(void*)) { +asm void daNpc_Aru_c::setAction(int (daNpc_Aru_c::*param_0)(void*)) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_aru/d_a_npc_aru/setAction__11daNpc_Aru_cFM11daNpc_Aru_cFPCvPvPv_i.s" } @@ -2026,7 +2052,7 @@ asm void daNpc_Aru_c::chkSkipFenceStage() { SECTION_RODATA static u8 const lit_5053[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809577E0, &lit_5053); +COMPILER_STRIP_GATE(0x809577E0, &lit_5053); #pragma pop /* 809577E8-809577F0 000118 0008+00 0/2 0/0 0/0 .rodata @5054 */ @@ -2035,7 +2061,7 @@ COMPILER_STRIP_GATE(809577E0, &lit_5053); SECTION_RODATA static u8 const lit_5054[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809577E8, &lit_5054); +COMPILER_STRIP_GATE(0x809577E8, &lit_5054); #pragma pop /* 809577F0-809577F8 000120 0008+00 0/2 0/0 0/0 .rodata @5055 */ @@ -2044,12 +2070,12 @@ COMPILER_STRIP_GATE(809577E8, &lit_5054); SECTION_RODATA static u8 const lit_5055[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809577F0, &lit_5055); +COMPILER_STRIP_GATE(0x809577F0, &lit_5055); #pragma pop /* 809577F8-809577FC 000128 0004+00 1/1 0/0 0/0 .rodata @5185 */ SECTION_RODATA static u32 const lit_5185 = 0x43360B61; -COMPILER_STRIP_GATE(809577F8, &lit_5185); +COMPILER_STRIP_GATE(0x809577F8, &lit_5185); /* 80953C84-80953D58 0025E4 00D4+00 1/1 0/0 0/0 .text * srchActorDirection__11daNpc_Aru_cFP10fopAc_ac_c */ @@ -2077,21 +2103,21 @@ SECTION_RODATA static u8 const lit_5190[6 + 2 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(809577FC, &lit_5190); +COMPILER_STRIP_GATE(0x809577FC, &lit_5190); #pragma pop /* 80957804-80957808 000134 0004+00 0/1 0/0 0/0 .rodata @5478 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5478 = 280.0f; -COMPILER_STRIP_GATE(80957804, &lit_5478); +COMPILER_STRIP_GATE(0x80957804, &lit_5478); #pragma pop /* 80957808-8095780C 000138 0004+00 0/1 0/0 0/0 .rodata @5479 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5479 = 400.0f; -COMPILER_STRIP_GATE(80957808, &lit_5479); +COMPILER_STRIP_GATE(0x80957808, &lit_5479); #pragma pop /* 80953D58-809543B0 0026B8 0658+00 1/1 0/0 0/0 .text adjustMoveDir__11daNpc_Aru_cFv */ @@ -2119,21 +2145,21 @@ asm cM3dGPla::~cM3dGPla() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5553 = 0.5f; -COMPILER_STRIP_GATE(8095780C, &lit_5553); +COMPILER_STRIP_GATE(0x8095780C, &lit_5553); #pragma pop /* 80957810-80957814 000140 0004+00 0/1 0/0 0/0 .rodata @5554 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5554 = 1.5f; -COMPILER_STRIP_GATE(80957810, &lit_5554); +COMPILER_STRIP_GATE(0x80957810, &lit_5554); #pragma pop /* 80957814-80957818 000144 0004+00 0/1 0/0 0/0 .rodata @5555 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5555 = 17.0f / 20.0f; -COMPILER_STRIP_GATE(80957814, &lit_5555); +COMPILER_STRIP_GATE(0x80957814, &lit_5555); #pragma pop /* 809543F8-80954744 002D58 034C+00 2/2 0/0 0/0 .text duck__11daNpc_Aru_cFi */ @@ -2156,6 +2182,13 @@ asm void daNpc_Aru_c::lookround(s16 param_0) { } #pragma pop +/* ############################################################################################## */ +/* 8095781C-8095781C 00014C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_809578E4 = "prm"; +#pragma pop + /* 80954894-80954A5C 0031F4 01C8+00 1/0 0/0 0/0 .text cutRideOnHorse__11daNpc_Aru_cFi */ #pragma push #pragma optimization_level 0 @@ -2212,7 +2245,7 @@ asm void daNpc_Aru_c::cutSpeakTo(int param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5926 = 500.0f; -COMPILER_STRIP_GATE(80957818, &lit_5926); +COMPILER_STRIP_GATE(0x80957818, &lit_5926); #pragma pop /* 8095533C-80955608 003C9C 02CC+00 1/0 0/0 0/0 .text cutNoEntrance__11daNpc_Aru_cFi */ @@ -2616,7 +2649,7 @@ void daNpcT_c::changeBtk(int* param_0, int* param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80957394(int* param_0) { +extern "C" asm void func_80957394(void* _this, int* param_0) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_aru/d_a_npc_aru/func_80957394.s" } @@ -2626,7 +2659,7 @@ extern "C" asm void func_80957394(int* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_809573B0(f32 param_0, f32 param_1) { +extern "C" asm void func_809573B0(void* _this, f32 param_0, f32 param_1) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_aru/d_a_npc_aru/func_809573B0.s" } @@ -2652,7 +2685,7 @@ asm void __sinit_d_a_npc_aru_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_809573EC = (void*)__sinit_d_a_npc_aru_cpp; +REGISTER_CTORS(0x809573EC, __sinit_d_a_npc_aru_cpp); #pragma pop /* 809574E8-809575B4 005E48 00CC+00 1/1 0/0 0/0 .text @@ -2936,24 +2969,4 @@ static u8 data_809581E8[4]; static u8 data_809581EC[4]; #pragma pop -/* 8095781C-809578E8 00014C 00CC+00 13/10 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_8095781C = ""; -SECTION_DEAD static char const* const stringBase_8095781D = "DEFAULT_GETITEM"; -SECTION_DEAD static char const* const stringBase_8095782D = "NO_RESPONSE"; -SECTION_DEAD static char const* const stringBase_80957839 = "RIDEON_HORSE"; -SECTION_DEAD static char const* const stringBase_80957846 = "GOTO_BULLRUNNING_STAGE"; -SECTION_DEAD static char const* const stringBase_8095785D = "GOTO_BULLRUNNING_STAGE_VER2"; -SECTION_DEAD static char const* const stringBase_80957879 = "END_BULLRUNNING"; -SECTION_DEAD static char const* const stringBase_80957889 = "END_BULLRUNNING2"; -SECTION_DEAD static char const* const stringBase_8095789A = "END_BULLRUNNING3"; -SECTION_DEAD static char const* const stringBase_809578AB = "GOTO_SKIPFENCE_STAGE"; -SECTION_DEAD static char const* const stringBase_809578C0 = "SPEAKTO"; -SECTION_DEAD static char const* const stringBase_809578C8 = "NO_ENTRANCE"; -SECTION_DEAD static char const* const stringBase_809578D4 = "Aru"; -SECTION_DEAD static char const* const stringBase_809578D8 = "Aru1"; -SECTION_DEAD static char const* const stringBase_809578DD = "F_SP00"; -SECTION_DEAD static char const* const stringBase_809578E4 = "prm"; -#pragma pop +/* 8095781C-8095781C 00014C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/npc/d_a_npc_ash/d_a_npc_ash.cpp b/rel/d/a/npc/d_a_npc_ash/d_a_npc_ash.cpp index 316b35ed94c..f3b9f8327e9 100644 --- a/rel/d/a/npc/d_a_npc_ash/d_a_npc_ash.cpp +++ b/rel/d/a/npc/d_a_npc_ash/d_a_npc_ash.cpp @@ -23,12 +23,12 @@ struct mDoExt_bckAnm { /* 8000D990 */ void changeBckOnly(J3DAnmTransform*); }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; +struct J3DModelData {}; + struct Vec {}; struct Z2Creature { @@ -61,16 +61,16 @@ struct daTag_EvtArea_c { /* 8048C94C */ void chkPointInArea(cXyz, cXyz); }; -struct J3DAnmTextureSRTKey {}; - -struct _GXColorS10 {}; - struct J3DAnmTexPattern { /* 8032AF50 */ void getTexNo(u16, u16*) const; }; +struct J3DAnmTextureSRTKey {}; + struct J3DAnmTransformKey {}; +struct _GXColorS10 {}; + struct daNpcF_c { struct daNpcF_anmPlayData {}; @@ -137,10 +137,10 @@ struct daNpcF_ActorMngr_c { /* 8095CDD4 */ daNpcF_ActorMngr_c(); }; -struct J3DJoint {}; - struct J3DModel {}; +struct J3DJoint {}; + struct daNpcAsh_c { /* 809582EC */ daNpcAsh_c(); /* 80958610 */ ~daNpcAsh_c(); @@ -210,7 +210,6 @@ struct dMsgFlow_c { struct dEvt_control_c { /* 80042468 */ void reset(); /* 800432EC */ void convPId(unsigned int); - /* 800436EC */ void setPtI_Id(unsigned int); }; struct dEvent_manager_c { @@ -322,7 +321,7 @@ struct JMath { struct TSinCosTable {}; /* TSinCosTable<13, f32> */ struct TSinCosTable__template0 { - /* 8095CC94 */ void func_8095CC94(s16) /* const */; + /* 8095CC94 */ void func_8095CC94(void* _this, s16) /* const */; }; static u8 sincosTable_[65536]; @@ -425,7 +424,7 @@ extern "C" void ctrlBtk__10daNpcAsh_cFv(); extern "C" void setAttnPos__10daNpcAsh_cFv(); extern "C" void lookat__10daNpcAsh_cFv(); extern "C" bool drawDbgInfo__10daNpcAsh_cFv(); -extern "C" void func_8095CC94(s16); +extern "C" void func_8095CC94(void* _this, s16); extern "C" void __sinit_d_a_npc_ash_cpp(); extern "C" void __dt__18daNpcF_ActorMngr_cFv(); extern "C" void __ct__18daNpcF_ActorMngr_cFv(); @@ -615,6 +614,20 @@ extern "C" void __register_global_object(); // /* ############################################################################################## */ +/* 8095D910-8095D910 0002D0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8095D910 = "Ash"; +SECTION_DEAD static char const* const stringBase_8095D914 = "Ash1"; +SECTION_DEAD static char const* const stringBase_8095D919 = "Ash2"; +SECTION_DEAD static char const* const stringBase_8095D91E = ""; +SECTION_DEAD static char const* const stringBase_8095D91F = "THE_INTRODUCTION"; +SECTION_DEAD static char const* const stringBase_8095D930 = "RESIST_MEETING"; +SECTION_DEAD static char const* const stringBase_8095D93F = "RESIST_WIRETAP_ASH"; +SECTION_DEAD static char const* const stringBase_8095D952 = "RESIST_WIRETAP_SHAD"; +SECTION_DEAD static char const* const stringBase_8095D966 = "RESIST_WIRETAP_RAFREL"; +#pragma pop + /* 8095D990-8095D99C 000000 000C+00 4/4 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -1059,34 +1072,41 @@ SECTION_RODATA u8 const daNpcAsh_Param_c::m[108] = { 0x42, 0xF0, 0x00, 0x00, 0x43, 0xFA, 0x00, 0x00, 0x43, 0x96, 0x00, 0x00, 0xC3, 0x96, 0x00, 0x00, 0x00, 0x3C, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8095D640, &daNpcAsh_Param_c::m); +COMPILER_STRIP_GATE(0x8095D640, &daNpcAsh_Param_c::m); /* 8095D6AC-8095D6B0 00006C 0004+00 0/1 0/0 0/0 .rodata @4224 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4224 = -100.0f; -COMPILER_STRIP_GATE(8095D6AC, &lit_4224); +COMPILER_STRIP_GATE(0x8095D6AC, &lit_4224); #pragma pop /* 8095D6B0-8095D6B4 000070 0004+00 0/1 0/0 0/0 .rodata @4225 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4225 = -50.0f; -COMPILER_STRIP_GATE(8095D6B0, &lit_4225); +COMPILER_STRIP_GATE(0x8095D6B0, &lit_4225); #pragma pop /* 8095D6B4-8095D6B8 000074 0004+00 0/1 0/0 0/0 .rodata @4226 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4226 = 100.0f; -COMPILER_STRIP_GATE(8095D6B4, &lit_4226); +COMPILER_STRIP_GATE(0x8095D6B4, &lit_4226); #pragma pop /* 8095D6B8-8095D6BC 000078 0004+00 0/1 0/0 0/0 .rodata @4227 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4227 = 220.0f; -COMPILER_STRIP_GATE(8095D6B8, &lit_4227); +COMPILER_STRIP_GATE(0x8095D6B8, &lit_4227); +#pragma pop + +/* 8095D910-8095D910 0002D0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8095D97C = "R_SP116"; +SECTION_DEAD static char const* const stringBase_8095D984 = "D_MN09"; #pragma pop /* 809587A0-80958B68 0005A0 03C8+00 1/1 0/0 0/0 .text Create__10daNpcAsh_cFv */ @@ -1102,7 +1122,7 @@ asm void daNpcAsh_c::Create() { /* ############################################################################################## */ /* 8095D6BC-8095D6C0 00007C 0004+00 4/4 0/0 0/0 .rodata @4300 */ SECTION_RODATA static f32 const lit_4300 = 1.0f; -COMPILER_STRIP_GATE(8095D6BC, &lit_4300); +COMPILER_STRIP_GATE(0x8095D6BC, &lit_4300); /* 8095D6C0-8095D6C4 000080 0004+00 3/9 0/0 0/0 .rodata @4301 */ SECTION_RODATA static u8 const lit_4301[4] = { @@ -1111,7 +1131,7 @@ SECTION_RODATA static u8 const lit_4301[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(8095D6C0, &lit_4301); +COMPILER_STRIP_GATE(0x8095D6C0, &lit_4301); /* 80958B68-80958F08 000968 03A0+00 1/1 0/0 0/0 .text CreateHeap__10daNpcAsh_cFv */ #pragma push @@ -1258,7 +1278,7 @@ asm void daNpcAsh_c::Draw() { SECTION_RODATA static u8 const lit_4385[12] = { 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x04, }; -COMPILER_STRIP_GATE(8095D6C4, &lit_4385); +COMPILER_STRIP_GATE(0x8095D6C4, &lit_4385); /* 80959238-80959458 001038 0220+00 1/1 0/0 0/0 .text ctrlJoint__10daNpcAsh_cFP8J3DJointP8J3DModel */ @@ -1339,7 +1359,7 @@ asm void daNpcAsh_c::reset() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpcAsh_c::setAction(bool (daNpcAsh_c::*)(void*)) { +asm void daNpcAsh_c::setAction(bool (daNpcAsh_c::*param_0)(void*)) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_ash/d_a_npc_ash/setAction__10daNpcAsh_cFM10daNpcAsh_cFPCvPvPv_b.s" } @@ -1362,7 +1382,7 @@ asm void daNpcAsh_c::isSneaking() { SECTION_RODATA static u8 const lit_4638[12] = { 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8095D6D0, &lit_4638); +COMPILER_STRIP_GATE(0x8095D6D0, &lit_4638); #pragma pop /* 8095D6DC-8095D6E0 00009C 0004+00 0/1 0/0 0/0 .rodata @4639 */ @@ -1374,7 +1394,7 @@ SECTION_RODATA static u8 const lit_4639[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(8095D6DC, &lit_4639); +COMPILER_STRIP_GATE(0x8095D6DC, &lit_4639); #pragma pop /* 8095D6E0-8095D6EC 0000A0 000C+00 0/1 0/0 0/0 .rodata @4640 */ @@ -1383,7 +1403,7 @@ COMPILER_STRIP_GATE(8095D6DC, &lit_4639); SECTION_RODATA static u8 const lit_4640[12] = { 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8095D6E0, &lit_4640); +COMPILER_STRIP_GATE(0x8095D6E0, &lit_4640); #pragma pop /* 8095D6EC-8095D6F0 0000AC 0004+00 0/1 0/0 0/0 .rodata @4641 */ @@ -1395,7 +1415,7 @@ SECTION_RODATA static u8 const lit_4641[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(8095D6EC, &lit_4641); +COMPILER_STRIP_GATE(0x8095D6EC, &lit_4641); #pragma pop /* 8095D6F0-8095D6FC 0000B0 000C+00 0/1 0/0 0/0 .rodata @4642 */ @@ -1404,7 +1424,7 @@ COMPILER_STRIP_GATE(8095D6EC, &lit_4641); SECTION_RODATA static u8 const lit_4642[12] = { 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8095D6F0, &lit_4642); +COMPILER_STRIP_GATE(0x8095D6F0, &lit_4642); #pragma pop /* 8095D6FC-8095D700 0000BC 0004+00 0/1 0/0 0/0 .rodata @4643 */ @@ -1416,7 +1436,7 @@ SECTION_RODATA static u8 const lit_4643[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(8095D6FC, &lit_4643); +COMPILER_STRIP_GATE(0x8095D6FC, &lit_4643); #pragma pop /* 8095D700-8095D70C 0000C0 000C+00 0/1 0/0 0/0 .rodata @4644 */ @@ -1425,7 +1445,7 @@ COMPILER_STRIP_GATE(8095D6FC, &lit_4643); SECTION_RODATA static u8 const lit_4644[12] = { 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8095D700, &lit_4644); +COMPILER_STRIP_GATE(0x8095D700, &lit_4644); #pragma pop /* 8095D70C-8095D710 0000CC 0004+00 0/1 0/0 0/0 .rodata @4645 */ @@ -1437,7 +1457,7 @@ SECTION_RODATA static u8 const lit_4645[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(8095D70C, &lit_4645); +COMPILER_STRIP_GATE(0x8095D70C, &lit_4645); #pragma pop /* 8095D710-8095D71C 0000D0 000C+00 0/1 0/0 0/0 .rodata @4646 */ @@ -1446,7 +1466,7 @@ COMPILER_STRIP_GATE(8095D70C, &lit_4645); SECTION_RODATA static u8 const lit_4646[12] = { 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8095D710, &lit_4646); +COMPILER_STRIP_GATE(0x8095D710, &lit_4646); #pragma pop /* 8095D71C-8095D720 0000DC 0004+00 0/1 0/0 0/0 .rodata @4647 */ @@ -1458,7 +1478,7 @@ SECTION_RODATA static u8 const lit_4647[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(8095D71C, &lit_4647); +COMPILER_STRIP_GATE(0x8095D71C, &lit_4647); #pragma pop /* 8095D720-8095D72C 0000E0 000C+00 0/1 0/0 0/0 .rodata @4648 */ @@ -1467,7 +1487,7 @@ COMPILER_STRIP_GATE(8095D71C, &lit_4647); SECTION_RODATA static u8 const lit_4648[12] = { 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8095D720, &lit_4648); +COMPILER_STRIP_GATE(0x8095D720, &lit_4648); #pragma pop /* 8095D72C-8095D730 0000EC 0004+00 0/1 0/0 0/0 .rodata @4649 */ @@ -1479,7 +1499,7 @@ SECTION_RODATA static u8 const lit_4649[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(8095D72C, &lit_4649); +COMPILER_STRIP_GATE(0x8095D72C, &lit_4649); #pragma pop /* 8095D730-8095D73C 0000F0 000C+00 0/1 0/0 0/0 .rodata @4650 */ @@ -1488,7 +1508,7 @@ COMPILER_STRIP_GATE(8095D72C, &lit_4649); SECTION_RODATA static u8 const lit_4650[12] = { 0x00, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8095D730, &lit_4650); +COMPILER_STRIP_GATE(0x8095D730, &lit_4650); #pragma pop /* 8095D73C-8095D740 0000FC 0004+00 0/1 0/0 0/0 .rodata @4651 */ @@ -1500,7 +1520,7 @@ SECTION_RODATA static u8 const lit_4651[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(8095D73C, &lit_4651); +COMPILER_STRIP_GATE(0x8095D73C, &lit_4651); #pragma pop /* 8095D740-8095D74C 000100 000C+00 0/1 0/0 0/0 .rodata @4652 */ @@ -1509,7 +1529,7 @@ COMPILER_STRIP_GATE(8095D73C, &lit_4651); SECTION_RODATA static u8 const lit_4652[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8095D740, &lit_4652); +COMPILER_STRIP_GATE(0x8095D740, &lit_4652); #pragma pop /* 8095D74C-8095D750 00010C 0004+00 0/1 0/0 0/0 .rodata @4653 */ @@ -1521,7 +1541,7 @@ SECTION_RODATA static u8 const lit_4653[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(8095D74C, &lit_4653); +COMPILER_STRIP_GATE(0x8095D74C, &lit_4653); #pragma pop /* 8095D750-8095D770 000110 0020+00 0/0 0/0 0/0 .rodata @4654 */ @@ -1531,7 +1551,7 @@ SECTION_RODATA static u8 const lit_4654[32] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8095D750, &lit_4654); +COMPILER_STRIP_GATE(0x8095D750, &lit_4654); #pragma pop /* 8095D770-8095D77C 000130 000C+00 0/1 0/0 0/0 .rodata @4658 */ @@ -1540,7 +1560,7 @@ COMPILER_STRIP_GATE(8095D750, &lit_4654); SECTION_RODATA static u8 const lit_4658[12] = { 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8095D770, &lit_4658); +COMPILER_STRIP_GATE(0x8095D770, &lit_4658); #pragma pop /* 8095D77C-8095D780 00013C 0004+00 0/1 0/0 0/0 .rodata @4659 */ @@ -1552,7 +1572,7 @@ SECTION_RODATA static u8 const lit_4659[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(8095D77C, &lit_4659); +COMPILER_STRIP_GATE(0x8095D77C, &lit_4659); #pragma pop /* 8095D780-8095D78C 000140 000C+00 0/1 0/0 0/0 .rodata @4660 */ @@ -1561,7 +1581,7 @@ COMPILER_STRIP_GATE(8095D77C, &lit_4659); SECTION_RODATA static u8 const lit_4660[12] = { 0x00, 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8095D780, &lit_4660); +COMPILER_STRIP_GATE(0x8095D780, &lit_4660); #pragma pop /* 8095D78C-8095D790 00014C 0004+00 0/1 0/0 0/0 .rodata @4661 */ @@ -1573,7 +1593,7 @@ SECTION_RODATA static u8 const lit_4661[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(8095D78C, &lit_4661); +COMPILER_STRIP_GATE(0x8095D78C, &lit_4661); #pragma pop /* 8095D790-8095D79C 000150 000C+00 0/1 0/0 0/0 .rodata @4662 */ @@ -1582,7 +1602,7 @@ COMPILER_STRIP_GATE(8095D78C, &lit_4661); SECTION_RODATA static u8 const lit_4662[12] = { 0x00, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8095D790, &lit_4662); +COMPILER_STRIP_GATE(0x8095D790, &lit_4662); #pragma pop /* 8095D79C-8095D7A0 00015C 0004+00 0/1 0/0 0/0 .rodata @4663 */ @@ -1594,7 +1614,7 @@ SECTION_RODATA static u8 const lit_4663[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(8095D79C, &lit_4663); +COMPILER_STRIP_GATE(0x8095D79C, &lit_4663); #pragma pop /* 8095D7A0-8095D7AC 000160 000C+00 0/1 0/0 0/0 .rodata @4664 */ @@ -1603,7 +1623,7 @@ COMPILER_STRIP_GATE(8095D79C, &lit_4663); SECTION_RODATA static u8 const lit_4664[12] = { 0x00, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(8095D7A0, &lit_4664); +COMPILER_STRIP_GATE(0x8095D7A0, &lit_4664); #pragma pop /* 8095D7AC-8095D7B8 00016C 000C+00 0/1 0/0 0/0 .rodata @4665 */ @@ -1612,7 +1632,7 @@ COMPILER_STRIP_GATE(8095D7A0, &lit_4664); SECTION_RODATA static u8 const lit_4665[12] = { 0x00, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8095D7AC, &lit_4665); +COMPILER_STRIP_GATE(0x8095D7AC, &lit_4665); #pragma pop /* 8095D7B8-8095D7C0 000178 0008+00 0/1 0/0 0/0 .rodata @4666 */ @@ -1621,7 +1641,7 @@ COMPILER_STRIP_GATE(8095D7AC, &lit_4665); SECTION_RODATA static u8 const lit_4666[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8095D7B8, &lit_4666); +COMPILER_STRIP_GATE(0x8095D7B8, &lit_4666); #pragma pop /* 8095D7C0-8095D7CC 000180 000C+00 0/1 0/0 0/0 .rodata @4667 */ @@ -1630,7 +1650,7 @@ COMPILER_STRIP_GATE(8095D7B8, &lit_4666); SECTION_RODATA static u8 const lit_4667[12] = { 0x00, 0x0D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(8095D7C0, &lit_4667); +COMPILER_STRIP_GATE(0x8095D7C0, &lit_4667); #pragma pop /* 8095D7CC-8095D7D8 00018C 000C+00 0/1 0/0 0/0 .rodata @4668 */ @@ -1639,7 +1659,7 @@ COMPILER_STRIP_GATE(8095D7C0, &lit_4667); SECTION_RODATA static u8 const lit_4668[12] = { 0x00, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8095D7CC, &lit_4668); +COMPILER_STRIP_GATE(0x8095D7CC, &lit_4668); #pragma pop /* 8095D7D8-8095D7E0 000198 0008+00 0/1 0/0 0/0 .rodata @4669 */ @@ -1648,7 +1668,7 @@ COMPILER_STRIP_GATE(8095D7CC, &lit_4668); SECTION_RODATA static u8 const lit_4669[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8095D7D8, &lit_4669); +COMPILER_STRIP_GATE(0x8095D7D8, &lit_4669); #pragma pop /* 8095D7E0-8095D7EC 0001A0 000C+00 0/1 0/0 0/0 .rodata @4670 */ @@ -1657,7 +1677,7 @@ COMPILER_STRIP_GATE(8095D7D8, &lit_4669); SECTION_RODATA static u8 const lit_4670[12] = { 0x00, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(8095D7E0, &lit_4670); +COMPILER_STRIP_GATE(0x8095D7E0, &lit_4670); #pragma pop /* 8095D7EC-8095D7F8 0001AC 000C+00 0/1 0/0 0/0 .rodata @4671 */ @@ -1666,7 +1686,7 @@ COMPILER_STRIP_GATE(8095D7E0, &lit_4670); SECTION_RODATA static u8 const lit_4671[12] = { 0x00, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8095D7EC, &lit_4671); +COMPILER_STRIP_GATE(0x8095D7EC, &lit_4671); #pragma pop /* 8095D7F8-8095D800 0001B8 0008+00 0/1 0/0 0/0 .rodata @4672 */ @@ -1675,7 +1695,7 @@ COMPILER_STRIP_GATE(8095D7EC, &lit_4671); SECTION_RODATA static u8 const lit_4672[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8095D7F8, &lit_4672); +COMPILER_STRIP_GATE(0x8095D7F8, &lit_4672); #pragma pop /* 8095D800-8095D80C 0001C0 000C+00 0/1 0/0 0/0 .rodata @4673 */ @@ -1684,7 +1704,7 @@ COMPILER_STRIP_GATE(8095D7F8, &lit_4672); SECTION_RODATA static u8 const lit_4673[12] = { 0x00, 0x0F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(8095D800, &lit_4673); +COMPILER_STRIP_GATE(0x8095D800, &lit_4673); #pragma pop /* 8095D80C-8095D818 0001CC 000C+00 0/1 0/0 0/0 .rodata @4674 */ @@ -1693,7 +1713,7 @@ COMPILER_STRIP_GATE(8095D800, &lit_4673); SECTION_RODATA static u8 const lit_4674[12] = { 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8095D80C, &lit_4674); +COMPILER_STRIP_GATE(0x8095D80C, &lit_4674); #pragma pop /* 8095D818-8095D820 0001D8 0008+00 0/1 0/0 0/0 .rodata @4675 */ @@ -1702,7 +1722,7 @@ COMPILER_STRIP_GATE(8095D80C, &lit_4674); SECTION_RODATA static u8 const lit_4675[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8095D818, &lit_4675); +COMPILER_STRIP_GATE(0x8095D818, &lit_4675); #pragma pop /* 8095D820-8095D82C 0001E0 000C+00 0/1 0/0 0/0 .rodata @4676 */ @@ -1711,7 +1731,7 @@ COMPILER_STRIP_GATE(8095D818, &lit_4675); SECTION_RODATA static u8 const lit_4676[12] = { 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8095D820, &lit_4676); +COMPILER_STRIP_GATE(0x8095D820, &lit_4676); #pragma pop /* 8095D82C-8095D830 0001EC 0004+00 0/1 0/0 0/0 .rodata @4677 */ @@ -1723,7 +1743,7 @@ SECTION_RODATA static u8 const lit_4677[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(8095D82C, &lit_4677); +COMPILER_STRIP_GATE(0x8095D82C, &lit_4677); #pragma pop /* 8095D830-8095D83C 0001F0 000C+00 0/1 0/0 0/0 .rodata @4678 */ @@ -1732,7 +1752,7 @@ COMPILER_STRIP_GATE(8095D82C, &lit_4677); SECTION_RODATA static u8 const lit_4678[12] = { 0x00, 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8095D830, &lit_4678); +COMPILER_STRIP_GATE(0x8095D830, &lit_4678); #pragma pop /* 8095D83C-8095D840 0001FC 0004+00 0/1 0/0 0/0 .rodata @4679 */ @@ -1744,7 +1764,7 @@ SECTION_RODATA static u8 const lit_4679[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(8095D83C, &lit_4679); +COMPILER_STRIP_GATE(0x8095D83C, &lit_4679); #pragma pop /* 8095D840-8095D84C 000200 000C+00 0/1 0/0 0/0 .rodata @4680 */ @@ -1753,7 +1773,7 @@ COMPILER_STRIP_GATE(8095D83C, &lit_4679); SECTION_RODATA static u8 const lit_4680[12] = { 0x00, 0x0B, 0x00, 0x00, 0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(8095D840, &lit_4680); +COMPILER_STRIP_GATE(0x8095D840, &lit_4680); #pragma pop /* 8095D84C-8095D850 00020C 0004+00 0/1 0/0 0/0 .rodata @4681 */ @@ -1765,7 +1785,7 @@ SECTION_RODATA static u8 const lit_4681[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(8095D84C, &lit_4681); +COMPILER_STRIP_GATE(0x8095D84C, &lit_4681); #pragma pop /* 8095D850-8095D878 000210 0028+00 0/0 0/0 0/0 .rodata @4682 */ @@ -1776,7 +1796,7 @@ SECTION_RODATA static u8 const lit_4682[40] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8095D850, &lit_4682); +COMPILER_STRIP_GATE(0x8095D850, &lit_4682); #pragma pop /* 8095D878-8095D884 000238 000C+00 0/1 0/0 0/0 .rodata @4697 */ @@ -1785,25 +1805,25 @@ COMPILER_STRIP_GATE(8095D850, &lit_4682); SECTION_RODATA static u8 const lit_4697[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8095D878, &lit_4697); +COMPILER_STRIP_GATE(0x8095D878, &lit_4697); #pragma pop /* 8095D884-8095D888 000244 0004+00 4/9 0/0 0/0 .rodata @4976 */ SECTION_RODATA static f32 const lit_4976 = -1.0f; -COMPILER_STRIP_GATE(8095D884, &lit_4976); +COMPILER_STRIP_GATE(0x8095D884, &lit_4976); /* 8095D888-8095D88C 000248 0004+00 0/3 0/0 0/0 .rodata @4977 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4977 = 0x3BB40000; -COMPILER_STRIP_GATE(8095D888, &lit_4977); +COMPILER_STRIP_GATE(0x8095D888, &lit_4977); #pragma pop /* 8095D88C-8095D890 00024C 0004+00 0/4 0/0 0/0 .rodata @4978 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4978 = 15.0f; -COMPILER_STRIP_GATE(8095D88C, &lit_4978); +COMPILER_STRIP_GATE(0x8095D88C, &lit_4978); #pragma pop /* 8095D890-8095D898 000250 0008+00 0/3 0/0 0/0 .rodata @4980 */ @@ -1812,7 +1832,7 @@ COMPILER_STRIP_GATE(8095D88C, &lit_4978); SECTION_RODATA static u8 const lit_4980[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8095D890, &lit_4980); +COMPILER_STRIP_GATE(0x8095D890, &lit_4980); #pragma pop /* 80959C40-8095A67C 001A40 0A3C+00 4/0 0/0 0/0 .text wait_type0__10daNpcAsh_cFPv */ @@ -1850,14 +1870,14 @@ asm void daNpcAsh_c::setExpression(int param_0, f32 param_1) { #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_5033 = 0xC5866001; -COMPILER_STRIP_GATE(8095D898, &lit_5033); +COMPILER_STRIP_GATE(0x8095D898, &lit_5033); #pragma pop /* 8095D89C-8095D8A0 00025C 0004+00 0/1 0/0 0/0 .rodata @5034 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_5034 = 0x4606CEA1; -COMPILER_STRIP_GATE(8095D89C, &lit_5034); +COMPILER_STRIP_GATE(0x8095D89C, &lit_5034); #pragma pop /* 8095A6EC-8095A8EC 0024EC 0200+00 3/0 0/0 0/0 .text wait_type1__10daNpcAsh_cFPv */ @@ -1895,14 +1915,14 @@ asm void daNpcAsh_c::demo(void* param_0) { #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_5227 = 0xC5C36B19; -COMPILER_STRIP_GATE(8095D8A0, &lit_5227); +COMPILER_STRIP_GATE(0x8095D8A0, &lit_5227); #pragma pop /* 8095D8A4-8095D8A8 000264 0004+00 0/1 0/0 0/0 .rodata @5228 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_5228 = 0x45C35E15; -COMPILER_STRIP_GATE(8095D8A4, &lit_5228); +COMPILER_STRIP_GATE(0x8095D8A4, &lit_5228); #pragma pop /* 8095D8A8-8095D8B0 000268 0008+00 0/2 0/0 0/0 .rodata @5229 */ @@ -1911,7 +1931,7 @@ COMPILER_STRIP_GATE(8095D8A4, &lit_5228); SECTION_RODATA static u8 const lit_5229[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8095D8A8, &lit_5229); +COMPILER_STRIP_GATE(0x8095D8A8, &lit_5229); #pragma pop /* 8095D8B0-8095D8B8 000270 0008+00 0/2 0/0 0/0 .rodata @5230 */ @@ -1920,7 +1940,7 @@ COMPILER_STRIP_GATE(8095D8A8, &lit_5229); SECTION_RODATA static u8 const lit_5230[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8095D8B0, &lit_5230); +COMPILER_STRIP_GATE(0x8095D8B0, &lit_5230); #pragma pop /* 8095D8B8-8095D8C0 000278 0008+00 0/2 0/0 0/0 .rodata @5231 */ @@ -1929,7 +1949,7 @@ COMPILER_STRIP_GATE(8095D8B0, &lit_5230); SECTION_RODATA static u8 const lit_5231[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8095D8B8, &lit_5231); +COMPILER_STRIP_GATE(0x8095D8B8, &lit_5231); #pragma pop /* 8095B164-8095B48C 002F64 0328+00 1/0 0/0 0/0 .text leave__10daNpcAsh_cFPv */ @@ -1942,6 +1962,13 @@ asm void daNpcAsh_c::leave(void* param_0) { } #pragma pop +/* ############################################################################################## */ +/* 8095D910-8095D910 0002D0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8095D98B = "prm"; +#pragma pop + /* 8095B48C-8095B58C 00328C 0100+00 1/0 0/0 0/0 .text EvCut_Introduction__10daNpcAsh_cFi */ #pragma push @@ -1958,7 +1985,7 @@ asm void daNpcAsh_c::EvCut_Introduction(int param_0) { SECTION_RODATA static u8 const lit_5254[16] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8095D8C0, &lit_5254); +COMPILER_STRIP_GATE(0x8095D8C0, &lit_5254); /* 8095B58C-8095B83C 00338C 02B0+00 1/0 0/0 0/0 .text EvCut_Meeting__10daNpcAsh_cFi */ #pragma push @@ -1975,7 +2002,7 @@ asm void daNpcAsh_c::EvCut_Meeting(int param_0) { SECTION_RODATA static u8 const lit_5295[16] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8095D8D0, &lit_5295); +COMPILER_STRIP_GATE(0x8095D8D0, &lit_5295); /* 8095B83C-8095BA80 00363C 0244+00 1/0 0/0 0/0 .text EvCut_WiretapSponsor__10daNpcAsh_cFi */ #pragma push @@ -2087,14 +2114,14 @@ asm void daNpcAsh_c::playMotion() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5492 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(8095D8E0, &lit_5492); +COMPILER_STRIP_GATE(0x8095D8E0, &lit_5492); #pragma pop /* 8095D8E4-8095D8E8 0002A4 0004+00 0/1 0/0 0/0 .rodata @5493 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5493 = 2.0f / 5.0f; -COMPILER_STRIP_GATE(8095D8E4, &lit_5493); +COMPILER_STRIP_GATE(0x8095D8E4, &lit_5493); #pragma pop /* 8095C520-8095C5C4 004320 00A4+00 1/0 0/0 0/0 .text ctrlBtk__10daNpcAsh_cFv */ @@ -2112,42 +2139,42 @@ asm void daNpcAsh_c::ctrlBtk() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5589 = 10.0f; -COMPILER_STRIP_GATE(8095D8E8, &lit_5589); +COMPILER_STRIP_GATE(0x8095D8E8, &lit_5589); #pragma pop /* 8095D8EC-8095D8F0 0002AC 0004+00 0/1 0/0 0/0 .rodata @5590 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5590 = 3070.0f; -COMPILER_STRIP_GATE(8095D8EC, &lit_5590); +COMPILER_STRIP_GATE(0x8095D8EC, &lit_5590); #pragma pop /* 8095D8F0-8095D8F4 0002B0 0004+00 0/1 0/0 0/0 .rodata @5591 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5591 = -1150.0f; -COMPILER_STRIP_GATE(8095D8F0, &lit_5591); +COMPILER_STRIP_GATE(0x8095D8F0, &lit_5591); #pragma pop /* 8095D8F4-8095D8F8 0002B4 0004+00 0/1 0/0 0/0 .rodata @5592 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5592 = 2446.0f; -COMPILER_STRIP_GATE(8095D8F4, &lit_5592); +COMPILER_STRIP_GATE(0x8095D8F4, &lit_5592); #pragma pop /* 8095D8F8-8095D8FC 0002B8 0004+00 0/1 0/0 0/0 .rodata @5593 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5593 = 170.0f; -COMPILER_STRIP_GATE(8095D8F8, &lit_5593); +COMPILER_STRIP_GATE(0x8095D8F8, &lit_5593); #pragma pop /* 8095D8FC-8095D900 0002BC 0004+00 0/1 0/0 0/0 .rodata @5594 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5594 = 60.0f; -COMPILER_STRIP_GATE(8095D8FC, &lit_5594); +COMPILER_STRIP_GATE(0x8095D8FC, &lit_5594); #pragma pop /* 8095C5C4-8095C9BC 0043C4 03F8+00 1/0 0/0 0/0 .text setAttnPos__10daNpcAsh_cFv */ @@ -2165,28 +2192,28 @@ asm void daNpcAsh_c::setAttnPos() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5649 = -15.0f; -COMPILER_STRIP_GATE(8095D900, &lit_5649); +COMPILER_STRIP_GATE(0x8095D900, &lit_5649); #pragma pop /* 8095D904-8095D908 0002C4 0004+00 0/1 0/0 0/0 .rodata @5650 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5650 = -30.0f; -COMPILER_STRIP_GATE(8095D904, &lit_5650); +COMPILER_STRIP_GATE(0x8095D904, &lit_5650); #pragma pop /* 8095D908-8095D90C 0002C8 0004+00 0/1 0/0 0/0 .rodata @5651 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5651 = 30.0f; -COMPILER_STRIP_GATE(8095D908, &lit_5651); +COMPILER_STRIP_GATE(0x8095D908, &lit_5651); #pragma pop /* 8095D90C-8095D910 0002CC 0004+00 0/1 0/0 0/0 .rodata @5652 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5652 = 40.0f; -COMPILER_STRIP_GATE(8095D90C, &lit_5652); +COMPILER_STRIP_GATE(0x8095D90C, &lit_5652); #pragma pop /* 8095C9BC-8095CC8C 0047BC 02D0+00 1/1 0/0 0/0 .text lookat__10daNpcAsh_cFv */ @@ -2208,7 +2235,7 @@ bool daNpcAsh_c::drawDbgInfo() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_8095CC94(s16 param_0) /* const */ { +extern "C" asm void func_8095CC94(void* _this, s16 param_0) /* const */ { nofralloc #include "asm/rel/d/a/npc/d_a_npc_ash/d_a_npc_ash/func_8095CC94.s" } @@ -2240,7 +2267,7 @@ asm void __sinit_d_a_npc_ash_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_8095CCA0 = (void*)__sinit_d_a_npc_ash_cpp; +REGISTER_CTORS(0x8095CCA0, __sinit_d_a_npc_ash_cpp); #pragma pop /* 8095CD8C-8095CDD4 004B8C 0048+00 5/4 0/0 0/0 .text __dt__18daNpcF_ActorMngr_cFv */ @@ -2428,20 +2455,4 @@ static asm void func_8095D624() { } #pragma pop -/* 8095D910-8095D98F 0002D0 007F+00 9/6 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_8095D910 = "Ash"; -SECTION_DEAD static char const* const stringBase_8095D914 = "Ash1"; -SECTION_DEAD static char const* const stringBase_8095D919 = "Ash2"; -SECTION_DEAD static char const* const stringBase_8095D91E = ""; -SECTION_DEAD static char const* const stringBase_8095D91F = "THE_INTRODUCTION"; -SECTION_DEAD static char const* const stringBase_8095D930 = "RESIST_MEETING"; -SECTION_DEAD static char const* const stringBase_8095D93F = "RESIST_WIRETAP_ASH"; -SECTION_DEAD static char const* const stringBase_8095D952 = "RESIST_WIRETAP_SHAD"; -SECTION_DEAD static char const* const stringBase_8095D966 = "RESIST_WIRETAP_RAFREL"; -SECTION_DEAD static char const* const stringBase_8095D97C = "R_SP116"; -SECTION_DEAD static char const* const stringBase_8095D984 = "D_MN09"; -SECTION_DEAD static char const* const stringBase_8095D98B = "prm"; -#pragma pop +/* 8095D910-8095D910 0002D0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/npc/d_a_npc_ashB/d_a_npc_ashB.cpp b/rel/d/a/npc/d_a_npc_ashB/d_a_npc_ashB.cpp index 879fc741a09..466816d599b 100644 --- a/rel/d/a/npc/d_a_npc_ashB/d_a_npc_ashB.cpp +++ b/rel/d/a/npc/d_a_npc_ashB/d_a_npc_ashB.cpp @@ -23,12 +23,12 @@ struct mDoExt_bckAnm { /* 8000D990 */ void changeBckOnly(J3DAnmTransform*); }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; +struct J3DModelData {}; + struct Vec {}; struct Z2Creature { @@ -50,16 +50,16 @@ struct fopAc_ac_c { /* 80018C8C */ ~fopAc_ac_c(); }; -struct J3DAnmTextureSRTKey {}; - -struct _GXColorS10 {}; - struct J3DAnmTexPattern { /* 8032AF50 */ void getTexNo(u16, u16*) const; }; +struct J3DAnmTextureSRTKey {}; + struct J3DAnmTransformKey {}; +struct _GXColorS10 {}; + struct daNpcF_c { struct daNpcF_anmPlayData {}; @@ -128,10 +128,10 @@ struct daNpcF_ActorMngr_c { /* 809618DC */ daNpcF_ActorMngr_c(); }; -struct J3DJoint {}; - struct J3DModel {}; +struct J3DJoint {}; + struct daNpcAshB_c { /* 8095DE4C */ daNpcAshB_c(); /* 8095E060 */ ~daNpcAshB_c(); @@ -193,7 +193,6 @@ struct dMsgFlow_c { struct dEvt_control_c { /* 80042468 */ void reset(); /* 80042518 */ void reset(void*); - /* 800436EC */ void setPtI_Id(unsigned int); }; struct dEvent_manager_c { @@ -299,7 +298,7 @@ struct JMath { struct TSinCosTable {}; /* TSinCosTable<13, f32> */ struct TSinCosTable__template0 { - /* 80961800 */ void func_80961800(s16) /* const */; + /* 80961800 */ void func_80961800(void* _this, s16) /* const */; }; static u8 sincosTable_[65536]; @@ -395,7 +394,7 @@ extern "C" void setAttnPos__11daNpcAshB_cFv(); extern "C" void lookat__11daNpcAshB_cFv(); extern "C" void drawOtherMdls__11daNpcAshB_cFv(); extern "C" bool drawDbgInfo__11daNpcAshB_cFv(); -extern "C" void func_80961800(s16); +extern "C" void func_80961800(void* _this, s16); extern "C" void __sinit_d_a_npc_ashB_cpp(); extern "C" void __dt__18daNpcF_ActorMngr_cFv(); extern "C" void __ct__18daNpcF_ActorMngr_cFv(); @@ -575,6 +574,13 @@ extern "C" void __register_global_object(); // /* ############################################################################################## */ +/* 809623E8-809623E8 000304 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_809623E8 = "AshB"; +SECTION_DEAD static char const* const stringBase_809623ED = "ASHB_APPEAR"; +#pragma pop + /* 80962418-80962424 000000 000C+00 3/3 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -927,34 +933,34 @@ SECTION_RODATA u8 const daNpcAshB_Param_c::m[112] = { 0x42, 0xA0, 0x00, 0x00, 0x43, 0xFA, 0x00, 0x00, 0x43, 0x96, 0x00, 0x00, 0xC3, 0x96, 0x00, 0x00, 0x00, 0x3C, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x43, 0xC8, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809620E4, &daNpcAshB_Param_c::m); +COMPILER_STRIP_GATE(0x809620E4, &daNpcAshB_Param_c::m); /* 80962154-80962158 000070 0004+00 0/1 0/0 0/0 .rodata @4179 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4179 = -100.0f; -COMPILER_STRIP_GATE(80962154, &lit_4179); +COMPILER_STRIP_GATE(0x80962154, &lit_4179); #pragma pop /* 80962158-8096215C 000074 0004+00 0/1 0/0 0/0 .rodata @4180 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4180 = -50.0f; -COMPILER_STRIP_GATE(80962158, &lit_4180); +COMPILER_STRIP_GATE(0x80962158, &lit_4180); #pragma pop /* 8096215C-80962160 000078 0004+00 0/1 0/0 0/0 .rodata @4181 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4181 = 100.0f; -COMPILER_STRIP_GATE(8096215C, &lit_4181); +COMPILER_STRIP_GATE(0x8096215C, &lit_4181); #pragma pop /* 80962160-80962164 00007C 0004+00 0/1 0/0 0/0 .rodata @4182 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4182 = 220.0f; -COMPILER_STRIP_GATE(80962160, &lit_4182); +COMPILER_STRIP_GATE(0x80962160, &lit_4182); #pragma pop /* 8095E224-8095E4A0 0004C4 027C+00 1/1 0/0 0/0 .text Create__11daNpcAshB_cFv */ @@ -970,7 +976,7 @@ asm void daNpcAshB_c::Create() { /* ############################################################################################## */ /* 80962164-80962168 000080 0004+00 4/4 0/0 0/0 .rodata @4237 */ SECTION_RODATA static f32 const lit_4237 = 1.0f; -COMPILER_STRIP_GATE(80962164, &lit_4237); +COMPILER_STRIP_GATE(0x80962164, &lit_4237); /* 80962168-8096216C 000084 0004+00 2/6 0/0 0/0 .rodata @4238 */ SECTION_RODATA static u8 const lit_4238[4] = { @@ -979,7 +985,7 @@ SECTION_RODATA static u8 const lit_4238[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80962168, &lit_4238); +COMPILER_STRIP_GATE(0x80962168, &lit_4238); /* 8095E4A0-8095E758 000740 02B8+00 1/1 0/0 0/0 .text CreateHeap__11daNpcAshB_cFv */ #pragma push @@ -1126,7 +1132,7 @@ asm void daNpcAshB_c::Draw() { SECTION_RODATA static u8 const lit_4286[12] = { 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x0A, }; -COMPILER_STRIP_GATE(8096216C, &lit_4286); +COMPILER_STRIP_GATE(0x8096216C, &lit_4286); /* 8095E9C8-8095EB94 000C68 01CC+00 1/1 0/0 0/0 .text * ctrlJoint__11daNpcAshB_cFP8J3DJointP8J3DModel */ @@ -1208,7 +1214,7 @@ asm void daNpcAshB_c::reset() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpcAshB_c::setAction(bool (daNpcAshB_c::*)(void*)) { +asm void daNpcAshB_c::setAction(bool (daNpcAshB_c::*param_0)(void*)) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_ashB/d_a_npc_ashB/setAction__11daNpcAshB_cFM11daNpcAshB_cFPCvPvPv_b.s" } @@ -1221,7 +1227,7 @@ asm void daNpcAshB_c::setAction(bool (daNpcAshB_c::*)(void*)) { SECTION_RODATA static u8 const lit_4521[12] = { 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80962178, &lit_4521); +COMPILER_STRIP_GATE(0x80962178, &lit_4521); #pragma pop /* 80962184-80962188 0000A0 0004+00 0/1 0/0 0/0 .rodata @4522 */ @@ -1233,7 +1239,7 @@ SECTION_RODATA static u8 const lit_4522[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80962184, &lit_4522); +COMPILER_STRIP_GATE(0x80962184, &lit_4522); #pragma pop /* 80962188-80962194 0000A4 000C+00 0/1 0/0 0/0 .rodata @4523 */ @@ -1242,7 +1248,7 @@ COMPILER_STRIP_GATE(80962184, &lit_4522); SECTION_RODATA static u8 const lit_4523[12] = { 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80962188, &lit_4523); +COMPILER_STRIP_GATE(0x80962188, &lit_4523); #pragma pop /* 80962194-80962198 0000B0 0004+00 0/1 0/0 0/0 .rodata @4524 */ @@ -1254,7 +1260,7 @@ SECTION_RODATA static u8 const lit_4524[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80962194, &lit_4524); +COMPILER_STRIP_GATE(0x80962194, &lit_4524); #pragma pop /* 80962198-809621A4 0000B4 000C+00 0/1 0/0 0/0 .rodata @4525 */ @@ -1263,7 +1269,7 @@ COMPILER_STRIP_GATE(80962194, &lit_4524); SECTION_RODATA static u8 const lit_4525[12] = { 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80962198, &lit_4525); +COMPILER_STRIP_GATE(0x80962198, &lit_4525); #pragma pop /* 809621A4-809621A8 0000C0 0004+00 0/1 0/0 0/0 .rodata @4526 */ @@ -1275,7 +1281,7 @@ SECTION_RODATA static u8 const lit_4526[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(809621A4, &lit_4526); +COMPILER_STRIP_GATE(0x809621A4, &lit_4526); #pragma pop /* 809621A8-809621B4 0000C4 000C+00 0/1 0/0 0/0 .rodata @4527 */ @@ -1284,7 +1290,7 @@ COMPILER_STRIP_GATE(809621A4, &lit_4526); SECTION_RODATA static u8 const lit_4527[12] = { 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809621A8, &lit_4527); +COMPILER_STRIP_GATE(0x809621A8, &lit_4527); #pragma pop /* 809621B4-809621B8 0000D0 0004+00 0/1 0/0 0/0 .rodata @4528 */ @@ -1296,7 +1302,7 @@ SECTION_RODATA static u8 const lit_4528[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(809621B4, &lit_4528); +COMPILER_STRIP_GATE(0x809621B4, &lit_4528); #pragma pop /* 809621B8-809621C4 0000D4 000C+00 0/1 0/0 0/0 .rodata @4529 */ @@ -1305,7 +1311,7 @@ COMPILER_STRIP_GATE(809621B4, &lit_4528); SECTION_RODATA static u8 const lit_4529[12] = { 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809621B8, &lit_4529); +COMPILER_STRIP_GATE(0x809621B8, &lit_4529); #pragma pop /* 809621C4-809621C8 0000E0 0004+00 0/1 0/0 0/0 .rodata @4530 */ @@ -1317,7 +1323,7 @@ SECTION_RODATA static u8 const lit_4530[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(809621C4, &lit_4530); +COMPILER_STRIP_GATE(0x809621C4, &lit_4530); #pragma pop /* 809621C8-809621D4 0000E4 000C+00 0/1 0/0 0/0 .rodata @4531 */ @@ -1326,7 +1332,7 @@ COMPILER_STRIP_GATE(809621C4, &lit_4530); SECTION_RODATA static u8 const lit_4531[12] = { 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809621C8, &lit_4531); +COMPILER_STRIP_GATE(0x809621C8, &lit_4531); #pragma pop /* 809621D4-809621D8 0000F0 0004+00 0/1 0/0 0/0 .rodata @4532 */ @@ -1338,7 +1344,7 @@ SECTION_RODATA static u8 const lit_4532[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(809621D4, &lit_4532); +COMPILER_STRIP_GATE(0x809621D4, &lit_4532); #pragma pop /* 809621D8-809621E4 0000F4 000C+00 0/1 0/0 0/0 .rodata @4533 */ @@ -1347,7 +1353,7 @@ COMPILER_STRIP_GATE(809621D4, &lit_4532); SECTION_RODATA static u8 const lit_4533[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809621D8, &lit_4533); +COMPILER_STRIP_GATE(0x809621D8, &lit_4533); #pragma pop /* 809621E4-809621E8 000100 0004+00 0/1 0/0 0/0 .rodata @4534 */ @@ -1359,7 +1365,7 @@ SECTION_RODATA static u8 const lit_4534[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(809621E4, &lit_4534); +COMPILER_STRIP_GATE(0x809621E4, &lit_4534); #pragma pop /* 809621E8-80962204 000104 001C+00 0/0 0/0 0/0 .rodata @4535 */ @@ -1369,7 +1375,7 @@ SECTION_RODATA static u8 const lit_4535[28] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809621E8, &lit_4535); +COMPILER_STRIP_GATE(0x809621E8, &lit_4535); #pragma pop /* 80962204-80962210 000120 000C+00 0/1 0/0 0/0 .rodata @4539 */ @@ -1378,7 +1384,7 @@ COMPILER_STRIP_GATE(809621E8, &lit_4535); SECTION_RODATA static u8 const lit_4539[12] = { 0x00, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80962204, &lit_4539); +COMPILER_STRIP_GATE(0x80962204, &lit_4539); #pragma pop /* 80962210-80962214 00012C 0004+00 0/1 0/0 0/0 .rodata @4540 */ @@ -1390,7 +1396,7 @@ SECTION_RODATA static u8 const lit_4540[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80962210, &lit_4540); +COMPILER_STRIP_GATE(0x80962210, &lit_4540); #pragma pop /* 80962214-80962220 000130 000C+00 0/1 0/0 0/0 .rodata @4541 */ @@ -1399,7 +1405,7 @@ COMPILER_STRIP_GATE(80962210, &lit_4540); SECTION_RODATA static u8 const lit_4541[12] = { 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80962214, &lit_4541); +COMPILER_STRIP_GATE(0x80962214, &lit_4541); #pragma pop /* 80962220-80962224 00013C 0004+00 0/1 0/0 0/0 .rodata @4542 */ @@ -1411,7 +1417,7 @@ SECTION_RODATA static u8 const lit_4542[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80962220, &lit_4542); +COMPILER_STRIP_GATE(0x80962220, &lit_4542); #pragma pop /* 80962224-80962230 000140 000C+00 0/1 0/0 0/0 .rodata @4543 */ @@ -1420,7 +1426,7 @@ COMPILER_STRIP_GATE(80962220, &lit_4542); SECTION_RODATA static u8 const lit_4543[12] = { 0x00, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80962224, &lit_4543); +COMPILER_STRIP_GATE(0x80962224, &lit_4543); #pragma pop /* 80962230-8096223C 00014C 000C+00 0/1 0/0 0/0 .rodata @4544 */ @@ -1429,7 +1435,7 @@ COMPILER_STRIP_GATE(80962224, &lit_4543); SECTION_RODATA static u8 const lit_4544[12] = { 0x00, 0x0D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80962230, &lit_4544); +COMPILER_STRIP_GATE(0x80962230, &lit_4544); #pragma pop /* 8096223C-80962248 000158 000C+00 0/1 0/0 0/0 .rodata @4545 */ @@ -1438,7 +1444,7 @@ COMPILER_STRIP_GATE(80962230, &lit_4544); SECTION_RODATA static u8 const lit_4545[12] = { 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8096223C, &lit_4545); +COMPILER_STRIP_GATE(0x8096223C, &lit_4545); #pragma pop /* 80962248-80962254 000164 000C+00 0/1 0/0 0/0 .rodata @4546 */ @@ -1447,7 +1453,7 @@ COMPILER_STRIP_GATE(8096223C, &lit_4545); SECTION_RODATA static u8 const lit_4546[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80962248, &lit_4546); +COMPILER_STRIP_GATE(0x80962248, &lit_4546); #pragma pop /* 80962254-80962260 000170 000C+00 0/1 0/0 0/0 .rodata @4547 */ @@ -1456,7 +1462,7 @@ COMPILER_STRIP_GATE(80962248, &lit_4546); SECTION_RODATA static u8 const lit_4547[12] = { 0x00, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80962254, &lit_4547); +COMPILER_STRIP_GATE(0x80962254, &lit_4547); #pragma pop /* 80962260-8096226C 00017C 000C+00 0/1 0/0 0/0 .rodata @4548 */ @@ -1465,7 +1471,7 @@ COMPILER_STRIP_GATE(80962254, &lit_4547); SECTION_RODATA static u8 const lit_4548[12] = { 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80962260, &lit_4548); +COMPILER_STRIP_GATE(0x80962260, &lit_4548); #pragma pop /* 8096226C-80962274 000188 0008+00 0/1 0/0 0/0 .rodata @4549 */ @@ -1474,7 +1480,7 @@ COMPILER_STRIP_GATE(80962260, &lit_4548); SECTION_RODATA static u8 const lit_4549[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8096226C, &lit_4549); +COMPILER_STRIP_GATE(0x8096226C, &lit_4549); #pragma pop /* 80962274-80962280 000190 000C+00 0/1 0/0 0/0 .rodata @4550 */ @@ -1483,7 +1489,7 @@ COMPILER_STRIP_GATE(8096226C, &lit_4549); SECTION_RODATA static u8 const lit_4550[12] = { 0x00, 0x0F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80962274, &lit_4550); +COMPILER_STRIP_GATE(0x80962274, &lit_4550); #pragma pop /* 80962280-8096228C 00019C 000C+00 0/1 0/0 0/0 .rodata @4551 */ @@ -1492,7 +1498,7 @@ COMPILER_STRIP_GATE(80962274, &lit_4550); SECTION_RODATA static u8 const lit_4551[12] = { 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80962280, &lit_4551); +COMPILER_STRIP_GATE(0x80962280, &lit_4551); #pragma pop /* 8096228C-80962294 0001A8 0008+00 0/1 0/0 0/0 .rodata @4552 */ @@ -1501,7 +1507,7 @@ COMPILER_STRIP_GATE(80962280, &lit_4551); SECTION_RODATA static u8 const lit_4552[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8096228C, &lit_4552); +COMPILER_STRIP_GATE(0x8096228C, &lit_4552); #pragma pop /* 80962294-809622A0 0001B0 000C+00 0/1 0/0 0/0 .rodata @4553 */ @@ -1510,7 +1516,7 @@ COMPILER_STRIP_GATE(8096228C, &lit_4552); SECTION_RODATA static u8 const lit_4553[12] = { 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80962294, &lit_4553); +COMPILER_STRIP_GATE(0x80962294, &lit_4553); #pragma pop /* 809622A0-809622AC 0001BC 000C+00 0/1 0/0 0/0 .rodata @4554 */ @@ -1519,7 +1525,7 @@ COMPILER_STRIP_GATE(80962294, &lit_4553); SECTION_RODATA static u8 const lit_4554[12] = { 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809622A0, &lit_4554); +COMPILER_STRIP_GATE(0x809622A0, &lit_4554); #pragma pop /* 809622AC-809622B4 0001C8 0008+00 0/1 0/0 0/0 .rodata @4555 */ @@ -1528,7 +1534,7 @@ COMPILER_STRIP_GATE(809622A0, &lit_4554); SECTION_RODATA static u8 const lit_4555[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809622AC, &lit_4555); +COMPILER_STRIP_GATE(0x809622AC, &lit_4555); #pragma pop /* 809622B4-809622C0 0001D0 000C+00 0/1 0/0 0/0 .rodata @4556 */ @@ -1537,7 +1543,7 @@ COMPILER_STRIP_GATE(809622AC, &lit_4555); SECTION_RODATA static u8 const lit_4556[12] = { 0x00, 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(809622B4, &lit_4556); +COMPILER_STRIP_GATE(0x809622B4, &lit_4556); #pragma pop /* 809622C0-809622CC 0001DC 000C+00 0/1 0/0 0/0 .rodata @4557 */ @@ -1546,7 +1552,7 @@ COMPILER_STRIP_GATE(809622B4, &lit_4556); SECTION_RODATA static u8 const lit_4557[12] = { 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809622C0, &lit_4557); +COMPILER_STRIP_GATE(0x809622C0, &lit_4557); #pragma pop /* 809622CC-809622D4 0001E8 0008+00 0/1 0/0 0/0 .rodata @4558 */ @@ -1555,7 +1561,7 @@ COMPILER_STRIP_GATE(809622C0, &lit_4557); SECTION_RODATA static u8 const lit_4558[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809622CC, &lit_4558); +COMPILER_STRIP_GATE(0x809622CC, &lit_4558); #pragma pop /* 809622D4-809622E0 0001F0 000C+00 0/1 0/0 0/0 .rodata @4559 */ @@ -1564,7 +1570,7 @@ COMPILER_STRIP_GATE(809622CC, &lit_4558); SECTION_RODATA static u8 const lit_4559[12] = { 0x00, 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(809622D4, &lit_4559); +COMPILER_STRIP_GATE(0x809622D4, &lit_4559); #pragma pop /* 809622E0-809622EC 0001FC 000C+00 0/1 0/0 0/0 .rodata @4560 */ @@ -1573,7 +1579,7 @@ COMPILER_STRIP_GATE(809622D4, &lit_4559); SECTION_RODATA static u8 const lit_4560[12] = { 0x00, 0x13, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809622E0, &lit_4560); +COMPILER_STRIP_GATE(0x809622E0, &lit_4560); #pragma pop /* 809622EC-809622F4 000208 0008+00 0/1 0/0 0/0 .rodata @4561 */ @@ -1582,7 +1588,7 @@ COMPILER_STRIP_GATE(809622E0, &lit_4560); SECTION_RODATA static u8 const lit_4561[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809622EC, &lit_4561); +COMPILER_STRIP_GATE(0x809622EC, &lit_4561); #pragma pop /* 809622F4-80962300 000210 000C+00 0/1 0/0 0/0 .rodata @4562 */ @@ -1591,7 +1597,7 @@ COMPILER_STRIP_GATE(809622EC, &lit_4561); SECTION_RODATA static u8 const lit_4562[12] = { 0x00, 0x13, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809622F4, &lit_4562); +COMPILER_STRIP_GATE(0x809622F4, &lit_4562); #pragma pop /* 80962300-80962304 00021C 0004+00 0/1 0/0 0/0 .rodata @4563 */ @@ -1603,7 +1609,7 @@ SECTION_RODATA static u8 const lit_4563[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80962300, &lit_4563); +COMPILER_STRIP_GATE(0x80962300, &lit_4563); #pragma pop /* 80962304-80962310 000220 000C+00 0/1 0/0 0/0 .rodata @4564 */ @@ -1612,7 +1618,7 @@ COMPILER_STRIP_GATE(80962300, &lit_4563); SECTION_RODATA static u8 const lit_4564[12] = { 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80962304, &lit_4564); +COMPILER_STRIP_GATE(0x80962304, &lit_4564); #pragma pop /* 80962310-8096231C 00022C 000C+00 0/1 0/0 0/0 .rodata @4565 */ @@ -1621,7 +1627,7 @@ COMPILER_STRIP_GATE(80962304, &lit_4564); SECTION_RODATA static u8 const lit_4565[12] = { 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80962310, &lit_4565); +COMPILER_STRIP_GATE(0x80962310, &lit_4565); #pragma pop /* 8096231C-80962324 000238 0008+00 0/1 0/0 0/0 .rodata @4566 */ @@ -1630,7 +1636,7 @@ COMPILER_STRIP_GATE(80962310, &lit_4565); SECTION_RODATA static u8 const lit_4566[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8096231C, &lit_4566); +COMPILER_STRIP_GATE(0x8096231C, &lit_4566); #pragma pop /* 80962324-80962330 000240 000C+00 0/1 0/0 0/0 .rodata @4567 */ @@ -1639,7 +1645,7 @@ COMPILER_STRIP_GATE(8096231C, &lit_4566); SECTION_RODATA static u8 const lit_4567[12] = { 0x00, 0x0A, 0x00, 0x00, 0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80962324, &lit_4567); +COMPILER_STRIP_GATE(0x80962324, &lit_4567); #pragma pop /* 80962330-80962338 00024C 0008+00 0/1 0/0 0/0 .rodata @4568 */ @@ -1648,7 +1654,7 @@ COMPILER_STRIP_GATE(80962324, &lit_4567); SECTION_RODATA static u8 const lit_4568[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80962330, &lit_4568); +COMPILER_STRIP_GATE(0x80962330, &lit_4568); #pragma pop /* 80962338-80962344 000254 000C+00 0/1 0/0 0/0 .rodata @4569 */ @@ -1657,7 +1663,7 @@ COMPILER_STRIP_GATE(80962330, &lit_4568); SECTION_RODATA static u8 const lit_4569[12] = { 0x00, 0x0B, 0x00, 0x00, 0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80962338, &lit_4569); +COMPILER_STRIP_GATE(0x80962338, &lit_4569); #pragma pop /* 80962344-8096234C 000260 0008+00 0/1 0/0 0/0 .rodata @4570 */ @@ -1666,7 +1672,7 @@ COMPILER_STRIP_GATE(80962338, &lit_4569); SECTION_RODATA static u8 const lit_4570[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80962344, &lit_4570); +COMPILER_STRIP_GATE(0x80962344, &lit_4570); #pragma pop /* 8096234C-8096237C 000268 0030+00 0/0 0/0 0/0 .rodata @4571 */ @@ -1677,7 +1683,7 @@ SECTION_RODATA static u8 const lit_4571[48] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8096234C, &lit_4571); +COMPILER_STRIP_GATE(0x8096234C, &lit_4571); #pragma pop /* 8096237C-80962388 000298 000C+00 0/1 0/0 0/0 .rodata @4585 */ @@ -1686,25 +1692,25 @@ COMPILER_STRIP_GATE(8096234C, &lit_4571); SECTION_RODATA static u8 const lit_4585[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8096237C, &lit_4585); +COMPILER_STRIP_GATE(0x8096237C, &lit_4585); #pragma pop /* 80962388-8096238C 0002A4 0004+00 2/4 0/0 0/0 .rodata @4837 */ SECTION_RODATA static f32 const lit_4837 = -1.0f; -COMPILER_STRIP_GATE(80962388, &lit_4837); +COMPILER_STRIP_GATE(0x80962388, &lit_4837); /* 8096238C-80962390 0002A8 0004+00 0/1 0/0 0/0 .rodata @4838 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4838 = 0x43360B61; -COMPILER_STRIP_GATE(8096238C, &lit_4838); +COMPILER_STRIP_GATE(0x8096238C, &lit_4838); #pragma pop /* 80962390-80962394 0002AC 0004+00 0/2 0/0 0/0 .rodata @4839 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4839 = 0x3BB40000; -COMPILER_STRIP_GATE(80962390, &lit_4839); +COMPILER_STRIP_GATE(0x80962390, &lit_4839); #pragma pop /* 80962394-8096239C 0002B0 0004+04 0/2 0/0 0/0 .rodata @4840 */ @@ -1715,7 +1721,7 @@ SECTION_RODATA static f32 const lit_4840[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80962394, &lit_4840); +COMPILER_STRIP_GATE(0x80962394, &lit_4840); #pragma pop /* 8096239C-809623A4 0002B8 0008+00 0/1 0/0 0/0 .rodata @4841 */ @@ -1724,7 +1730,7 @@ COMPILER_STRIP_GATE(80962394, &lit_4840); SECTION_RODATA static u8 const lit_4841[8] = { 0x40, 0x82, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8096239C, &lit_4841); +COMPILER_STRIP_GATE(0x8096239C, &lit_4841); #pragma pop /* 809623A4-809623AC 0002C0 0008+00 0/1 0/0 0/0 .rodata @4842 */ @@ -1733,7 +1739,7 @@ COMPILER_STRIP_GATE(8096239C, &lit_4841); SECTION_RODATA static u8 const lit_4842[8] = { 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809623A4, &lit_4842); +COMPILER_STRIP_GATE(0x809623A4, &lit_4842); #pragma pop /* 809623AC-809623B4 0002C8 0008+00 0/2 0/0 0/0 .rodata @4844 */ @@ -1742,7 +1748,13 @@ COMPILER_STRIP_GATE(809623A4, &lit_4842); SECTION_RODATA static u8 const lit_4844[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809623AC, &lit_4844); +COMPILER_STRIP_GATE(0x809623AC, &lit_4844); +#pragma pop + +/* 809623E8-809623E8 000304 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_809623F9 = "NO_RESPONSE"; #pragma pop /* 8095F2C4-8095FC70 001564 09AC+00 4/0 0/0 0/0 .text wait__11daNpcAshB_cFPv */ @@ -1775,6 +1787,13 @@ asm void daNpcAshB_c::setExpression(int param_0, f32 param_1) { } #pragma pop +/* ############################################################################################## */ +/* 809623E8-809623E8 000304 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80962405 = "DEFAULT_GETITEM"; +#pragma pop + /* 8095FD9C-809602E0 00203C 0544+00 2/0 0/0 0/0 .text talk__11daNpcAshB_cFPv */ #pragma push #pragma optimization_level 0 @@ -1895,12 +1914,12 @@ asm void daNpcAshB_c::playMotion() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5082 = 20.0f; -COMPILER_STRIP_GATE(809623B4, &lit_5082); +COMPILER_STRIP_GATE(0x809623B4, &lit_5082); #pragma pop /* 809623B8-809623BC 0002D4 0004+00 1/1 0/0 0/0 .rodata @5198 */ SECTION_RODATA static f32 const lit_5198 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(809623B8, &lit_5198); +COMPILER_STRIP_GATE(0x809623B8, &lit_5198); /* 80961188-80961264 003428 00DC+00 1/0 0/0 0/0 .text ctrlBtk__11daNpcAshB_cFv */ #pragma push @@ -1921,7 +1940,7 @@ SECTION_RODATA static f32 const lit_5270[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(809623BC, &lit_5270); +COMPILER_STRIP_GATE(0x809623BC, &lit_5270); #pragma pop /* 809623C4-809623CC 0002E0 0008+00 0/1 0/0 0/0 .rodata @5271 */ @@ -1930,7 +1949,7 @@ COMPILER_STRIP_GATE(809623BC, &lit_5270); SECTION_RODATA static u8 const lit_5271[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809623C4, &lit_5271); +COMPILER_STRIP_GATE(0x809623C4, &lit_5271); #pragma pop /* 809623CC-809623D4 0002E8 0008+00 0/1 0/0 0/0 .rodata @5272 */ @@ -1939,7 +1958,7 @@ COMPILER_STRIP_GATE(809623C4, &lit_5271); SECTION_RODATA static u8 const lit_5272[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809623CC, &lit_5272); +COMPILER_STRIP_GATE(0x809623CC, &lit_5272); #pragma pop /* 809623D4-809623DC 0002F0 0008+00 0/1 0/0 0/0 .rodata @5273 */ @@ -1948,7 +1967,7 @@ COMPILER_STRIP_GATE(809623CC, &lit_5272); SECTION_RODATA static u8 const lit_5273[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809623D4, &lit_5273); +COMPILER_STRIP_GATE(0x809623D4, &lit_5273); #pragma pop /* 80961264-80961574 003504 0310+00 1/0 0/0 0/0 .text setAttnPos__11daNpcAshB_cFv */ @@ -1966,21 +1985,21 @@ asm void daNpcAshB_c::setAttnPos() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5317 = -80.0f; -COMPILER_STRIP_GATE(809623DC, &lit_5317); +COMPILER_STRIP_GATE(0x809623DC, &lit_5317); #pragma pop /* 809623E0-809623E4 0002FC 0004+00 0/1 0/0 0/0 .rodata @5318 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5318 = 80.0f; -COMPILER_STRIP_GATE(809623E0, &lit_5318); +COMPILER_STRIP_GATE(0x809623E0, &lit_5318); #pragma pop /* 809623E4-809623E8 000300 0004+00 0/1 0/0 0/0 .rodata @5319 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5319 = 40.0f; -COMPILER_STRIP_GATE(809623E4, &lit_5319); +COMPILER_STRIP_GATE(0x809623E4, &lit_5319); #pragma pop /* 80961574-80961770 003814 01FC+00 1/1 0/0 0/0 .text lookat__11daNpcAshB_cFv */ @@ -2012,7 +2031,7 @@ bool daNpcAshB_c::drawDbgInfo() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80961800(s16 param_0) /* const */ { +extern "C" asm void func_80961800(void* _this, s16 param_0) /* const */ { nofralloc #include "asm/rel/d/a/npc/d_a_npc_ashB/d_a_npc_ashB/func_80961800.s" } @@ -2044,7 +2063,7 @@ asm void __sinit_d_a_npc_ashB_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_8096180C = (void*)__sinit_d_a_npc_ashB_cpp; +REGISTER_CTORS(0x8096180C, __sinit_d_a_npc_ashB_cpp); #pragma pop /* 80961894-809618DC 003B34 0048+00 5/4 0/0 0/0 .text __dt__18daNpcF_ActorMngr_cFv */ @@ -2217,12 +2236,4 @@ static asm void func_809620C8() { } #pragma pop -/* 809623E8-80962415 000304 002D+00 6/3 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_809623E8 = "AshB"; -SECTION_DEAD static char const* const stringBase_809623ED = "ASHB_APPEAR"; -SECTION_DEAD static char const* const stringBase_809623F9 = "NO_RESPONSE"; -SECTION_DEAD static char const* const stringBase_80962405 = "DEFAULT_GETITEM"; -#pragma pop +/* 809623E8-809623E8 000304 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/npc/d_a_npc_bans/d_a_npc_bans.cpp b/rel/d/a/npc/d_a_npc_bans/d_a_npc_bans.cpp index e6b1050bc1e..149dace1af6 100644 --- a/rel/d/a/npc/d_a_npc_bans/d_a_npc_bans.cpp +++ b/rel/d/a/npc/d_a_npc_bans/d_a_npc_bans.cpp @@ -27,19 +27,19 @@ struct mDoMtx_stack_c { static u8 now[48]; }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; +struct J3DAnmTransform {}; + +struct J3DModelData {}; + struct Z2Creature { /* 802C03C8 */ Z2Creature(); /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -64,6 +64,8 @@ struct daNpc_Len_c { /* 80A660D8 */ void checkStartDemo13StbEvt(fopAc_ac_c*, f32, f32, f32, f32, f32, f32, f32); }; +struct daNpcT_faceMotionAnmData_c {}; + struct daNpcT_MotionSeqMngr_c { struct sequenceStepData_c {}; @@ -72,14 +74,12 @@ struct daNpcT_MotionSeqMngr_c { /* 8096741C */ ~daNpcT_MotionSeqMngr_c(); }; +struct daNpcT_evtData_c {}; + struct daNpcT_motionAnmData_c {}; struct J3DJoint {}; -struct daNpcT_faceMotionAnmData_c {}; - -struct daNpcT_evtData_c {}; - struct daNpc_Bans_c { /* 809628CC */ ~daNpc_Bans_c(); /* 80962AA0 */ void create(); @@ -147,15 +147,15 @@ struct dCcD_GObjInf { /* 800844F8 */ void GetTgHitObj(); }; -struct J3DModel {}; - -struct _GXColorS10 {}; - struct csXyz { /* 80966ED8 */ ~csXyz(); /* 80967318 */ csXyz(); }; +struct _GXColorS10 {}; + +struct J3DModel {}; + struct daNpcT_c { /* 80147FA4 */ void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*); /* 80147FD4 */ void srchActor(void*, void*); @@ -560,8 +560,8 @@ extern "C" void changeAnm__8daNpcT_cFPiPi(); extern "C" void changeBck__8daNpcT_cFPiPi(); extern "C" void changeBtp__8daNpcT_cFPiPi(); extern "C" void changeBtk__8daNpcT_cFPiPi(); -extern "C" void func_809679D8(int*); -extern "C" void func_809679F4(u8*); +extern "C" void func_809679D8(void* _this, int*); +extern "C" void func_809679F4(void* _this, u8*); extern "C" void __sinit_d_a_npc_bans_cpp(); extern "C" void __ct__12daNpc_Bans_cFPC26daNpcT_faceMotionAnmData_cPC22daNpcT_motionAnmData_cPCQ222daNpcT_MotionSeqMngr_c18sequenceStepData_ciPCQ222daNpcT_MotionSeqMngr_c18sequenceStepData_ciPC16daNpcT_evtData_cPPc(); @@ -786,6 +786,27 @@ extern "C" void checkStartDemo13StbEvt__11daNpc_Len_cFP10fopAc_ac_cfffffff(); // /* ############################################################################################## */ +/* 80967F6C-80967F6C 00014C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80967F6C = ""; +SECTION_DEAD static char const* const stringBase_80967F6D = "DEFAULT_GETITEM"; +SECTION_DEAD static char const* const stringBase_80967F7D = "NO_RESPONSE"; +SECTION_DEAD static char const* const stringBase_80967F89 = "DEMO13_STB"; +SECTION_DEAD static char const* const stringBase_80967F94 = "ANGER"; +SECTION_DEAD static char const* const stringBase_80967F9A = "ANGER2"; +SECTION_DEAD static char const* const stringBase_80967FA1 = "ANGER_NEAR"; +SECTION_DEAD static char const* const stringBase_80967FAC = "ANGER_NEAR2"; +SECTION_DEAD static char const* const stringBase_80967FB8 = "GOBACK"; +SECTION_DEAD static char const* const stringBase_80967FBF = "Bans"; +SECTION_DEAD static char const* const stringBase_80967FC4 = "Bans_TW"; +SECTION_DEAD static char const* const stringBase_80967FCC = "Bans1"; +SECTION_DEAD static char const* const stringBase_80967FD2 = "Bans2"; +SECTION_DEAD static char const* const stringBase_80967FD8 = "Len1"; +SECTION_DEAD static char const* const stringBase_80967FDD = "PURCHASE"; +SECTION_DEAD static char const* const stringBase_80967FE6 = "GO_BACK"; +#pragma pop + /* 80968000-8096800C 000000 000C+00 3/3 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -1294,7 +1315,7 @@ SECTION_RODATA u8 const daNpc_Bans_Param_c::m[144] = { 0xC1, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC1, 0xA0, 0x00, 0x00, 0x41, 0xA0, 0x00, 0x00, 0x42, 0x20, 0x00, 0x00, 0x41, 0xA0, 0x00, 0x00, 0x42, 0xDC, 0x00, 0x00, 0x41, 0x20, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80967E20, &daNpc_Bans_Param_c::m); +COMPILER_STRIP_GATE(0x80967E20, &daNpc_Bans_Param_c::m); /* 80967EB0-80967EC8 000090 0018+00 0/1 0/0 0/0 .rodata heapSize$3924 */ #pragma push @@ -1303,39 +1324,39 @@ SECTION_RODATA static u8 const heapSize[24] = { 0x00, 0x00, 0x6C, 0x50, 0x00, 0x00, 0x4B, 0x40, 0x00, 0x00, 0x6C, 0x50, 0x00, 0x00, 0x75, 0x80, 0x00, 0x00, 0x64, 0x60, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80967EB0, &heapSize); +COMPILER_STRIP_GATE(0x80967EB0, &heapSize); #pragma pop /* 80967EC8-80967ECC 0000A8 0004+00 0/1 0/0 0/0 .rodata @3991 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3991 = -200.0f; -COMPILER_STRIP_GATE(80967EC8, &lit_3991); +COMPILER_STRIP_GATE(0x80967EC8, &lit_3991); #pragma pop /* 80967ECC-80967ED0 0000AC 0004+00 0/1 0/0 0/0 .rodata @3992 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3992 = -100.0f; -COMPILER_STRIP_GATE(80967ECC, &lit_3992); +COMPILER_STRIP_GATE(0x80967ECC, &lit_3992); #pragma pop /* 80967ED0-80967ED4 0000B0 0004+00 0/1 0/0 0/0 .rodata @3993 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3993 = 200.0f; -COMPILER_STRIP_GATE(80967ED0, &lit_3993); +COMPILER_STRIP_GATE(0x80967ED0, &lit_3993); #pragma pop /* 80967ED4-80967ED8 0000B4 0004+00 1/2 0/0 0/0 .rodata @3994 */ SECTION_RODATA static f32 const lit_3994 = 300.0f; -COMPILER_STRIP_GATE(80967ED4, &lit_3994); +COMPILER_STRIP_GATE(0x80967ED4, &lit_3994); /* 80967ED8-80967EDC 0000B8 0004+00 0/1 0/0 0/0 .rodata @3995 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3995 = -1000000000.0f; -COMPILER_STRIP_GATE(80967ED8, &lit_3995); +COMPILER_STRIP_GATE(0x80967ED8, &lit_3995); #pragma pop /* 80962AA0-80962D6C 0002C0 02CC+00 1/1 0/0 0/0 .text create__12daNpc_Bans_cFv */ @@ -1353,21 +1374,21 @@ asm void daNpc_Bans_c::create() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4100 = 0.25f; -COMPILER_STRIP_GATE(80967EDC, &lit_4100); +COMPILER_STRIP_GATE(0x80967EDC, &lit_4100); #pragma pop /* 80967EE0-80967EE4 0000C0 0004+00 0/1 0/0 0/0 .rodata @4101 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4101 = 20.0f; -COMPILER_STRIP_GATE(80967EE0, &lit_4101); +COMPILER_STRIP_GATE(0x80967EE0, &lit_4101); #pragma pop /* 80967EE4-80967EE8 0000C4 0004+00 0/1 0/0 0/0 .rodata @4102 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4102 = 5.0f; -COMPILER_STRIP_GATE(80967EE4, &lit_4102); +COMPILER_STRIP_GATE(0x80967EE4, &lit_4102); #pragma pop /* 80967EE8-80967EEC 0000C8 0004+00 8/18 0/0 0/0 .rodata @4103 */ @@ -1377,36 +1398,36 @@ SECTION_RODATA static u8 const lit_4103[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80967EE8, &lit_4103); +COMPILER_STRIP_GATE(0x80967EE8, &lit_4103); /* 80967EEC-80967EF0 0000CC 0004+00 1/3 0/0 0/0 .rodata @4104 */ SECTION_RODATA static f32 const lit_4104 = 100.0f; -COMPILER_STRIP_GATE(80967EEC, &lit_4104); +COMPILER_STRIP_GATE(0x80967EEC, &lit_4104); /* 80967EF0-80967EF4 0000D0 0004+00 0/1 0/0 0/0 .rodata @4105 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4105 = 60.0f; -COMPILER_STRIP_GATE(80967EF0, &lit_4105); +COMPILER_STRIP_GATE(0x80967EF0, &lit_4105); #pragma pop /* 80967EF4-80967EF8 0000D4 0004+00 0/2 0/0 0/0 .rodata @4326 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4326 = 65536.0f; -COMPILER_STRIP_GATE(80967EF4, &lit_4326); +COMPILER_STRIP_GATE(0x80967EF4, &lit_4326); #pragma pop /* 80967EF8-80967EFC 0000D8 0004+00 0/3 0/0 0/0 .rodata @4327 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4327 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(80967EF8, &lit_4327); +COMPILER_STRIP_GATE(0x80967EF8, &lit_4327); #pragma pop /* 80967EFC-80967F00 0000DC 0004+00 3/7 0/0 0/0 .rodata @4514 */ SECTION_RODATA static f32 const lit_4514 = 1.0f; -COMPILER_STRIP_GATE(80967EFC, &lit_4514); +COMPILER_STRIP_GATE(0x80967EFC, &lit_4514); /* 80962D6C-8096317C 00058C 0410+00 1/1 0/0 0/0 .text CreateHeap__12daNpc_Bans_cFv */ #pragma push @@ -1633,7 +1654,7 @@ asm void daNpc_Bans_c::checkChangeEvt() { /* ############################################################################################## */ /* 80967F00-80967F04 0000E0 0004+00 3/8 0/0 0/0 .rodata @4761 */ SECTION_RODATA static f32 const lit_4761 = -1.0f; -COMPILER_STRIP_GATE(80967F00, &lit_4761); +COMPILER_STRIP_GATE(0x80967F00, &lit_4761); /* 80963B30-80963BA8 001350 0078+00 1/0 0/0 0/0 .text setAfterTalkMotion__12daNpc_Bans_cFv */ #pragma push @@ -1700,49 +1721,49 @@ asm void daNpc_Bans_c::beforeMove() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5033 = 15.0f; -COMPILER_STRIP_GATE(80967F04, &lit_5033); +COMPILER_STRIP_GATE(0x80967F04, &lit_5033); #pragma pop /* 80967F08-80967F0C 0000E8 0004+00 0/1 0/0 0/0 .rodata @5034 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5034 = 30.0f; -COMPILER_STRIP_GATE(80967F08, &lit_5034); +COMPILER_STRIP_GATE(0x80967F08, &lit_5034); #pragma pop /* 80967F0C-80967F10 0000EC 0004+00 0/1 0/0 0/0 .rodata @5035 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_5035 = 0x38C90FDB; -COMPILER_STRIP_GATE(80967F0C, &lit_5035); +COMPILER_STRIP_GATE(0x80967F0C, &lit_5035); #pragma pop /* 80967F10-80967F14 0000F0 0004+00 0/2 0/0 0/0 .rodata @5036 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5036 = 8.0f; -COMPILER_STRIP_GATE(80967F10, &lit_5036); +COMPILER_STRIP_GATE(0x80967F10, &lit_5036); #pragma pop /* 80967F14-80967F18 0000F4 0004+00 0/1 0/0 0/0 .rodata @5037 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5037 = 34.0f; -COMPILER_STRIP_GATE(80967F14, &lit_5037); +COMPILER_STRIP_GATE(0x80967F14, &lit_5037); #pragma pop /* 80967F18-80967F1C 0000F8 0004+00 0/1 0/0 0/0 .rodata @5038 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5038 = 180.0f; -COMPILER_STRIP_GATE(80967F18, &lit_5038); +COMPILER_STRIP_GATE(0x80967F18, &lit_5038); #pragma pop /* 80967F1C-80967F20 0000FC 0004+00 0/2 0/0 0/0 .rodata @5039 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5039 = 10.0f; -COMPILER_STRIP_GATE(80967F1C, &lit_5039); +COMPILER_STRIP_GATE(0x80967F1C, &lit_5039); #pragma pop /* 80967F20-80967F28 000100 0004+04 0/1 0/0 0/0 .rodata @5040 */ @@ -1753,14 +1774,14 @@ SECTION_RODATA static f32 const lit_5040[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80967F20, &lit_5040); +COMPILER_STRIP_GATE(0x80967F20, &lit_5040); #pragma pop /* 80967F28-80967F30 000108 0008+00 1/3 0/0 0/0 .rodata @5042 */ SECTION_RODATA static u8 const lit_5042[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80967F28, &lit_5042); +COMPILER_STRIP_GATE(0x80967F28, &lit_5042); /* 80964228-809646E0 001A48 04B8+00 1/0 0/0 0/0 .text setAttnPos__12daNpc_Bans_cFv */ #pragma push @@ -1779,7 +1800,7 @@ asm void daNpc_Bans_c::setAttnPos() { SECTION_RODATA static u8 const lit_5100[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80967F30, &lit_5100); +COMPILER_STRIP_GATE(0x80967F30, &lit_5100); #pragma pop /* 80967F38-80967F40 000118 0008+00 0/1 0/0 0/0 .rodata @5101 */ @@ -1788,7 +1809,7 @@ COMPILER_STRIP_GATE(80967F30, &lit_5100); SECTION_RODATA static u8 const lit_5101[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80967F38, &lit_5101); +COMPILER_STRIP_GATE(0x80967F38, &lit_5101); #pragma pop /* 80967F40-80967F48 000120 0008+00 0/1 0/0 0/0 .rodata @5102 */ @@ -1797,35 +1818,35 @@ COMPILER_STRIP_GATE(80967F38, &lit_5101); SECTION_RODATA static u8 const lit_5102[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80967F40, &lit_5102); +COMPILER_STRIP_GATE(0x80967F40, &lit_5102); #pragma pop /* 80967F48-80967F4C 000128 0004+00 0/1 0/0 0/0 .rodata @5164 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5164 = 50.0f; -COMPILER_STRIP_GATE(80967F48, &lit_5164); +COMPILER_STRIP_GATE(0x80967F48, &lit_5164); #pragma pop /* 80967F4C-80967F50 00012C 0004+00 0/1 0/0 0/0 .rodata @5165 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5165 = -60.0f; -COMPILER_STRIP_GATE(80967F4C, &lit_5165); +COMPILER_STRIP_GATE(0x80967F4C, &lit_5165); #pragma pop /* 80967F50-80967F54 000130 0004+00 0/1 0/0 0/0 .rodata @5166 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5166 = 40.0f; -COMPILER_STRIP_GATE(80967F50, &lit_5166); +COMPILER_STRIP_GATE(0x80967F50, &lit_5166); #pragma pop /* 80967F54-80967F58 000134 0004+00 0/1 0/0 0/0 .rodata @5167 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5167 = 110.0f; -COMPILER_STRIP_GATE(80967F54, &lit_5167); +COMPILER_STRIP_GATE(0x80967F54, &lit_5167); #pragma pop /* 809646E0-80964994 001F00 02B4+00 1/0 0/0 0/0 .text setCollision__12daNpc_Bans_cFv */ @@ -1888,7 +1909,7 @@ asm void daNpc_Bans_c::selectAction() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpc_Bans_c::chkAction(int (daNpc_Bans_c::*)(void*)) { +asm void daNpc_Bans_c::chkAction(int (daNpc_Bans_c::*param_0)(void*)) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_bans/d_a_npc_bans/chkAction__12daNpc_Bans_cFM12daNpc_Bans_cFPCvPvPv_i.s" } @@ -1899,12 +1920,19 @@ asm void daNpc_Bans_c::chkAction(int (daNpc_Bans_c::*)(void*)) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpc_Bans_c::setAction(int (daNpc_Bans_c::*)(void*)) { +asm void daNpc_Bans_c::setAction(int (daNpc_Bans_c::*param_0)(void*)) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_bans/d_a_npc_bans/setAction__12daNpc_Bans_cFM12daNpc_Bans_cFPCvPvPv_i.s" } #pragma pop +/* ############################################################################################## */ +/* 80967F6C-80967F6C 00014C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80967FEE = "R_SP109"; +#pragma pop + /* 80964D20-80964DD0 002540 00B0+00 1/1 0/0 0/0 .text * checkPlayerIn2ndFloorOfBombShop__12daNpc_Bans_cFv */ #pragma push @@ -1941,7 +1969,7 @@ asm void daNpc_Bans_c::getKMsgTagP() { SECTION_RODATA static u8 const id[8] = { 0x86, 0x2C, 0x86, 0xA3, 0x86, 0x2D, 0x86, 0x2E, }; -COMPILER_STRIP_GATE(80967F58, &id); +COMPILER_STRIP_GATE(0x80967F58, &id); /* 80964F48-80964FEC 002768 00A4+00 1/1 0/0 0/0 .text setPrtcls__12daNpc_Bans_cFv */ #pragma push @@ -1958,21 +1986,28 @@ asm void daNpc_Bans_c::setPrtcls() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5654 = 450.0f; -COMPILER_STRIP_GATE(80967F60, &lit_5654); +COMPILER_STRIP_GATE(0x80967F60, &lit_5654); #pragma pop /* 80967F64-80967F68 000144 0004+00 0/1 0/0 0/0 .rodata @5655 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5655 = 16.0f; -COMPILER_STRIP_GATE(80967F64, &lit_5655); +COMPILER_STRIP_GATE(0x80967F64, &lit_5655); #pragma pop /* 80967F68-80967F6C 000148 0004+00 0/1 0/0 0/0 .rodata @5656 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5656 = 9.0f; -COMPILER_STRIP_GATE(80967F68, &lit_5656); +COMPILER_STRIP_GATE(0x80967F68, &lit_5656); +#pragma pop + +/* 80967F6C-80967F6C 00014C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80967FF6 = "prm"; +SECTION_DEAD static char const* const stringBase_80967FFA = "timer"; #pragma pop /* 80964FEC-809658F8 00280C 090C+00 1/0 0/0 0/0 .text cutAnger__12daNpc_Bans_cFi */ @@ -2385,7 +2420,7 @@ void daNpcT_c::changeBtk(int* param_0, int* param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_809679D8(int* param_0) { +extern "C" asm void func_809679D8(void* _this, int* param_0) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_bans/d_a_npc_bans/func_809679D8.s" } @@ -2395,7 +2430,7 @@ extern "C" asm void func_809679D8(int* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_809679F4(u8* param_0) { +extern "C" asm void func_809679F4(void* _this, u8* param_0) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_bans/d_a_npc_bans/func_809679F4.s" } @@ -2427,7 +2462,7 @@ asm void __sinit_d_a_npc_bans_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80967A10 = (void*)__sinit_d_a_npc_bans_cpp; +REGISTER_CTORS(0x80967A10, __sinit_d_a_npc_bans_cpp); #pragma pop /* 80967AC4-80967BE4 0052E4 0120+00 1/1 0/0 0/0 .text @@ -2563,27 +2598,4 @@ asm void daTag_EvtArea_c::chkPointInArea(cXyz param_0) { } #pragma pop -/* 80967F6C-80968000 00014C 0094+00 7/4 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80967F6C = ""; -SECTION_DEAD static char const* const stringBase_80967F6D = "DEFAULT_GETITEM"; -SECTION_DEAD static char const* const stringBase_80967F7D = "NO_RESPONSE"; -SECTION_DEAD static char const* const stringBase_80967F89 = "DEMO13_STB"; -SECTION_DEAD static char const* const stringBase_80967F94 = "ANGER"; -SECTION_DEAD static char const* const stringBase_80967F9A = "ANGER2"; -SECTION_DEAD static char const* const stringBase_80967FA1 = "ANGER_NEAR"; -SECTION_DEAD static char const* const stringBase_80967FAC = "ANGER_NEAR2"; -SECTION_DEAD static char const* const stringBase_80967FB8 = "GOBACK"; -SECTION_DEAD static char const* const stringBase_80967FBF = "Bans"; -SECTION_DEAD static char const* const stringBase_80967FC4 = "Bans_TW"; -SECTION_DEAD static char const* const stringBase_80967FCC = "Bans1"; -SECTION_DEAD static char const* const stringBase_80967FD2 = "Bans2"; -SECTION_DEAD static char const* const stringBase_80967FD8 = "Len1"; -SECTION_DEAD static char const* const stringBase_80967FDD = "PURCHASE"; -SECTION_DEAD static char const* const stringBase_80967FE6 = "GO_BACK"; -SECTION_DEAD static char const* const stringBase_80967FEE = "R_SP109"; -SECTION_DEAD static char const* const stringBase_80967FF6 = "prm"; -SECTION_DEAD static char const* const stringBase_80967FFA = "timer"; -#pragma pop +/* 80967F6C-80967F6C 00014C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/npc/d_a_npc_besu/d_a_npc_besu.cpp b/rel/d/a/npc/d_a_npc_besu/d_a_npc_besu.cpp index 0305fc660fc..7187b8845dd 100644 --- a/rel/d/a/npc/d_a_npc_besu/d_a_npc_besu.cpp +++ b/rel/d/a/npc/d_a_npc_besu/d_a_npc_besu.cpp @@ -15,12 +15,14 @@ struct mDoMtx_stack_c { static u8 now[48]; }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; +struct J3DAnmTransform {}; + +struct J3DModelData {}; + struct Vec {}; struct Z2Creature { @@ -29,8 +31,6 @@ struct Z2Creature { /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -51,6 +51,8 @@ struct daNpc_Len_c { /* 80A660D8 */ void checkStartDemo13StbEvt(fopAc_ac_c*, f32, f32, f32, f32, f32, f32, f32); }; +struct daNpcT_faceMotionAnmData_c {}; + struct daNpcT_MotionSeqMngr_c { struct sequenceStepData_c {}; @@ -59,14 +61,12 @@ struct daNpcT_MotionSeqMngr_c { /* 8053DDB8 */ ~daNpcT_MotionSeqMngr_c(); }; +struct daNpcT_evtData_c {}; + struct daNpcT_motionAnmData_c {}; struct J3DJoint {}; -struct daNpcT_faceMotionAnmData_c {}; - -struct daNpcT_evtData_c {}; - struct daNpc_Besu_c { /* 80536E4C */ ~daNpc_Besu_c(); /* 8053701C */ void create(); @@ -150,6 +150,13 @@ struct dCcD_GObjInf { /* 800840E4 */ ~dCcD_GObjInf(); }; +struct csXyz { + /* 8053D760 */ ~csXyz(); + /* 8053DCB4 */ csXyz(); +}; + +struct _GXColorS10 {}; + struct J3DModel {}; struct cXyz { @@ -159,13 +166,6 @@ struct cXyz { /* 8053DDB4 */ cXyz(); }; -struct _GXColorS10 {}; - -struct csXyz { - /* 8053D760 */ ~csXyz(); - /* 8053DCB4 */ csXyz(); -}; - struct daNpcT_c { /* 80147FA4 */ void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*); /* 80148094 */ void getTrnsfrmKeyAnmP(char const*, int); @@ -529,8 +529,8 @@ extern "C" void decTmr__8daNpcT_cFv(); extern "C" void drawGhost__8daNpcT_cFv(); extern "C" bool afterSetFaceMotionAnm__8daNpcT_cFiifi(); extern "C" void getMotionAnm__8daNpcT_cF22daNpcT_motionAnmData_c(); -extern "C" void func_8053E334(int*); -extern "C" void func_8053E350(int, int); +extern "C" void func_8053E334(void* _this, int*); +extern "C" void func_8053E350(void* _this, int, int); extern "C" void __sinit_d_a_npc_besu_cpp(); extern "C" void __ct__12daNpc_Besu_cFPC26daNpcT_faceMotionAnmData_cPC22daNpcT_motionAnmData_cPCQ222daNpcT_MotionSeqMngr_c18sequenceStepData_ciPCQ222daNpcT_MotionSeqMngr_c18sequenceStepData_ciPC16daNpcT_evtData_cPPc(); @@ -739,6 +739,45 @@ extern "C" void checkStartDemo13StbEvt__11daNpc_Len_cFP10fopAc_ac_cfffffff(); // /* ############################################################################################## */ +/* 8053E908-8053E908 0001B4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8053E908 = ""; +SECTION_DEAD static char const* const stringBase_8053E909 = "NO_RESPONSE"; +SECTION_DEAD static char const* const stringBase_8053E915 = "CONVERSATION_ABOUT_SARU01"; +SECTION_DEAD static char const* const stringBase_8053E92F = "CONVERSATION_ABOUT_SARU02"; +SECTION_DEAD static char const* const stringBase_8053E949 = "CONVERSATION_ABOUT_PACHINKO1"; +SECTION_DEAD static char const* const stringBase_8053E966 = "CONVERSATION_ABOUT_PACHINKO2"; +SECTION_DEAD static char const* const stringBase_8053E983 = "CONVERSATION_ABOUT_PACHINKO3"; +SECTION_DEAD static char const* const stringBase_8053E9A0 = "CACARICO_CONVERSATION"; +SECTION_DEAD static char const* const stringBase_8053E9B6 = "DEMO13_STB"; +SECTION_DEAD static char const* const stringBase_8053E9C1 = "SURPRISE"; +SECTION_DEAD static char const* const stringBase_8053E9CA = "CONVERSATION_ABOUT_DEATHMT"; +SECTION_DEAD static char const* const stringBase_8053E9E5 = "NURSE"; +SECTION_DEAD static char const* const stringBase_8053E9EB = "CONVERSATION_ABOUT_ZORA"; +SECTION_DEAD static char const* const stringBase_8053EA03 = "Besu"; +SECTION_DEAD static char const* const stringBase_8053EA08 = "Besu_TW"; +SECTION_DEAD static char const* const stringBase_8053EA10 = "Besu0"; +SECTION_DEAD static char const* const stringBase_8053EA16 = "Besu1"; +SECTION_DEAD static char const* const stringBase_8053EA1C = "Besu2"; +SECTION_DEAD static char const* const stringBase_8053EA22 = "Besu3"; +SECTION_DEAD static char const* const stringBase_8053EA28 = "Besu_p1"; +SECTION_DEAD static char const* const stringBase_8053EA30 = "Len1"; +SECTION_DEAD static char const* const stringBase_8053EA35 = "Taro1"; +SECTION_DEAD static char const* const stringBase_8053EA3B = "Lud2"; +SECTION_DEAD static char const* const stringBase_8053EA40 = "Sera"; +SECTION_DEAD static char const* const stringBase_8053EA45 = "CONVERSATION_ABOUT_SARU"; +SECTION_DEAD static char const* const stringBase_8053EA5D = "CONVERSATION_ABOUT_PACHINKO"; +SECTION_DEAD static char const* const stringBase_8053EA79 = "CONVERSATION_ABOUT_WOODSWD"; +SECTION_DEAD static char const* const stringBase_8053EA94 = "SWDTUTORIAL"; +SECTION_DEAD static char const* const stringBase_8053EAA0 = "FIND_MONKEY"; +SECTION_DEAD static char const* const stringBase_8053EAAC = "GET_WOODSWD"; +SECTION_DEAD static char const* const stringBase_8053EAB8 = "CONVERSATION_IN_HOTEL"; +SECTION_DEAD static char const* const stringBase_8053EACE = "CONVERSATION_ABOUT_GORON"; +SECTION_DEAD static char const* const stringBase_8053EAE7 = "CLOTH_TRY"; +SECTION_DEAD static char const* const stringBase_8053EAF1 = "THANK_YOU"; +#pragma pop + /* 8053EB5C-8053EB68 000000 000C+00 3/3 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -1724,7 +1763,7 @@ SECTION_RODATA u8 const daNpc_Besu_Param_c::m[144] = { 0xC1, 0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC1, 0x70, 0x00, 0x00, 0x41, 0x70, 0x00, 0x00, 0x41, 0xF0, 0x00, 0x00, 0x41, 0x70, 0x00, 0x00, 0x42, 0x8C, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8053E754, &daNpc_Besu_Param_c::m); +COMPILER_STRIP_GATE(0x8053E754, &daNpc_Besu_Param_c::m); /* 8053E7E4-8053E830 000090 004C+00 0/1 0/0 0/0 .rodata heapSize$4091 */ #pragma push @@ -1736,42 +1775,42 @@ SECTION_RODATA static u8 const heapSize[76] = { 0x00, 0x00, 0x35, 0xC0, 0x00, 0x00, 0x35, 0xC0, 0x00, 0x00, 0x35, 0xD0, 0x00, 0x00, 0x35, 0xC0, 0x00, 0x00, 0x35, 0xC0, 0x00, 0x00, 0x35, 0xC0, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8053E7E4, &heapSize); +COMPILER_STRIP_GATE(0x8053E7E4, &heapSize); #pragma pop /* 8053E830-8053E834 0000DC 0004+00 0/1 0/0 0/0 .rodata @4162 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4162 = -200.0f; -COMPILER_STRIP_GATE(8053E830, &lit_4162); +COMPILER_STRIP_GATE(0x8053E830, &lit_4162); #pragma pop /* 8053E834-8053E838 0000E0 0004+00 0/1 0/0 0/0 .rodata @4163 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4163 = -100.0f; -COMPILER_STRIP_GATE(8053E834, &lit_4163); +COMPILER_STRIP_GATE(0x8053E834, &lit_4163); #pragma pop /* 8053E838-8053E83C 0000E4 0004+00 0/1 0/0 0/0 .rodata @4164 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4164 = 200.0f; -COMPILER_STRIP_GATE(8053E838, &lit_4164); +COMPILER_STRIP_GATE(0x8053E838, &lit_4164); #pragma pop /* 8053E83C-8053E840 0000E8 0004+00 0/1 0/0 0/0 .rodata @4165 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4165 = 300.0f; -COMPILER_STRIP_GATE(8053E83C, &lit_4165); +COMPILER_STRIP_GATE(0x8053E83C, &lit_4165); #pragma pop /* 8053E840-8053E844 0000EC 0004+00 0/1 0/0 0/0 .rodata @4166 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4166 = -1000000000.0f; -COMPILER_STRIP_GATE(8053E840, &lit_4166); +COMPILER_STRIP_GATE(0x8053E840, &lit_4166); #pragma pop /* 8053701C-805372FC 0002BC 02E0+00 1/1 0/0 0/0 .text create__12daNpc_Besu_cFv */ @@ -1792,25 +1831,25 @@ SECTION_RODATA static u8 const lit_4337[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(8053E844, &lit_4337); +COMPILER_STRIP_GATE(0x8053E844, &lit_4337); /* 8053E848-8053E84C 0000F4 0004+00 0/2 0/0 0/0 .rodata @4338 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4338 = 65536.0f; -COMPILER_STRIP_GATE(8053E848, &lit_4338); +COMPILER_STRIP_GATE(0x8053E848, &lit_4338); #pragma pop /* 8053E84C-8053E850 0000F8 0004+00 0/3 0/0 0/0 .rodata @4339 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4339 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(8053E84C, &lit_4339); +COMPILER_STRIP_GATE(0x8053E84C, &lit_4339); #pragma pop /* 8053E850-8053E854 0000FC 0004+00 2/5 0/0 0/0 .rodata @4531 */ SECTION_RODATA static f32 const lit_4531 = 1.0f; -COMPILER_STRIP_GATE(8053E850, &lit_4531); +COMPILER_STRIP_GATE(0x8053E850, &lit_4531); /* 805372FC-80537758 00059C 045C+00 1/1 0/0 0/0 .text CreateHeap__12daNpc_Besu_cFv */ #pragma push @@ -1945,7 +1984,7 @@ asm void daNpc_Besu_c::Execute() { /* ############################################################################################## */ /* 8053E854-8053E858 000100 0004+00 1/2 0/0 0/0 .rodata @4580 */ SECTION_RODATA static f32 const lit_4580 = 100.0f; -COMPILER_STRIP_GATE(8053E854, &lit_4580); +COMPILER_STRIP_GATE(0x8053E854, &lit_4580); /* 80537968-805379FC 000C08 0094+00 1/1 0/0 0/0 .text Draw__12daNpc_Besu_cFv */ #pragma push @@ -2044,35 +2083,35 @@ asm void daNpc_Besu_c::afterJntAnm(int param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4818 = 110.0f; -COMPILER_STRIP_GATE(8053E858, &lit_4818); +COMPILER_STRIP_GATE(0x8053E858, &lit_4818); #pragma pop /* 8053E85C-8053E860 000108 0004+00 0/1 0/0 0/0 .rodata @4819 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4819 = 70.0f; -COMPILER_STRIP_GATE(8053E85C, &lit_4819); +COMPILER_STRIP_GATE(0x8053E85C, &lit_4819); #pragma pop /* 8053E860-8053E864 00010C 0004+00 0/2 0/0 0/0 .rodata @4820 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4820 = 60.0f; -COMPILER_STRIP_GATE(8053E860, &lit_4820); +COMPILER_STRIP_GATE(0x8053E860, &lit_4820); #pragma pop /* 8053E864-8053E868 000110 0004+00 0/1 0/0 0/0 .rodata @4821 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4821 = 180.0f; -COMPILER_STRIP_GATE(8053E864, &lit_4821); +COMPILER_STRIP_GATE(0x8053E864, &lit_4821); #pragma pop /* 8053E868-8053E86C 000114 0004+00 0/1 0/0 0/0 .rodata @4822 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4822 = 500.0f; -COMPILER_STRIP_GATE(8053E868, &lit_4822); +COMPILER_STRIP_GATE(0x8053E868, &lit_4822); #pragma pop /* 805380A4-805382D0 001344 022C+00 1/0 0/0 0/0 .text setParam__12daNpc_Besu_cFv */ @@ -2098,7 +2137,7 @@ asm void daNpc_Besu_c::checkChangeEvt() { /* ############################################################################################## */ /* 8053E86C-8053E870 000118 0004+00 8/12 0/0 0/0 .rodata @4894 */ SECTION_RODATA static f32 const lit_4894 = -1.0f; -COMPILER_STRIP_GATE(8053E86C, &lit_4894); +COMPILER_STRIP_GATE(0x8053E86C, &lit_4894); /* 80538490-8053853C 001730 00AC+00 2/0 0/0 0/0 .text setAfterTalkMotion__12daNpc_Besu_cFv */ #pragma push @@ -2165,63 +2204,63 @@ asm void daNpc_Besu_c::beforeMove() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5201 = 10.0f; -COMPILER_STRIP_GATE(8053E870, &lit_5201); +COMPILER_STRIP_GATE(0x8053E870, &lit_5201); #pragma pop /* 8053E874-8053E878 000120 0004+00 0/2 0/0 0/0 .rodata @5202 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5202 = 30.0f; -COMPILER_STRIP_GATE(8053E874, &lit_5202); +COMPILER_STRIP_GATE(0x8053E874, &lit_5202); #pragma pop /* 8053E878-8053E87C 000124 0004+00 0/1 0/0 0/0 .rodata @5203 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_5203 = 0x38C90FDB; -COMPILER_STRIP_GATE(8053E878, &lit_5203); +COMPILER_STRIP_GATE(0x8053E878, &lit_5203); #pragma pop /* 8053E87C-8053E880 000128 0004+00 0/1 0/0 0/0 .rodata @5204 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5204 = -10.0f; -COMPILER_STRIP_GATE(8053E87C, &lit_5204); +COMPILER_STRIP_GATE(0x8053E87C, &lit_5204); #pragma pop /* 8053E880-8053E884 00012C 0004+00 0/2 0/0 0/0 .rodata @5205 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5205 = 84.0f; -COMPILER_STRIP_GATE(8053E880, &lit_5205); +COMPILER_STRIP_GATE(0x8053E880, &lit_5205); #pragma pop /* 8053E884-8053E888 000130 0004+00 0/1 0/0 0/0 .rodata @5206 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5206 = 130.0f; -COMPILER_STRIP_GATE(8053E884, &lit_5206); +COMPILER_STRIP_GATE(0x8053E884, &lit_5206); #pragma pop /* 8053E888-8053E88C 000134 0004+00 0/1 0/0 0/0 .rodata @5207 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5207 = 75.0f; -COMPILER_STRIP_GATE(8053E888, &lit_5207); +COMPILER_STRIP_GATE(0x8053E888, &lit_5207); #pragma pop /* 8053E88C-8053E890 000138 0004+00 0/1 0/0 0/0 .rodata @5208 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5208 = 40.0f; -COMPILER_STRIP_GATE(8053E88C, &lit_5208); +COMPILER_STRIP_GATE(0x8053E88C, &lit_5208); #pragma pop /* 8053E890-8053E894 00013C 0004+00 0/1 0/0 0/0 .rodata @5209 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5209 = 80.0f; -COMPILER_STRIP_GATE(8053E890, &lit_5209); +COMPILER_STRIP_GATE(0x8053E890, &lit_5209); #pragma pop /* 8053E894-8053E89C 000140 0004+04 0/2 0/0 0/0 .rodata @5210 */ @@ -2232,14 +2271,14 @@ SECTION_RODATA static f32 const lit_5210[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(8053E894, &lit_5210); +COMPILER_STRIP_GATE(0x8053E894, &lit_5210); #pragma pop /* 8053E89C-8053E8A4 000148 0008+00 2/4 0/0 0/0 .rodata @5212 */ SECTION_RODATA static u8 const lit_5212[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8053E89C, &lit_5212); +COMPILER_STRIP_GATE(0x8053E89C, &lit_5212); /* 80538C18-805391B8 001EB8 05A0+00 1/0 0/0 0/0 .text setAttnPos__12daNpc_Besu_cFv */ #pragma push @@ -2258,7 +2297,7 @@ asm void daNpc_Besu_c::setAttnPos() { SECTION_RODATA static u8 const lit_5270[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8053E8A4, &lit_5270); +COMPILER_STRIP_GATE(0x8053E8A4, &lit_5270); #pragma pop /* 8053E8AC-8053E8B4 000158 0008+00 0/2 0/0 0/0 .rodata @5271 */ @@ -2267,7 +2306,7 @@ COMPILER_STRIP_GATE(8053E8A4, &lit_5270); SECTION_RODATA static u8 const lit_5271[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8053E8AC, &lit_5271); +COMPILER_STRIP_GATE(0x8053E8AC, &lit_5271); #pragma pop /* 8053E8B4-8053E8BC 000160 0008+00 0/2 0/0 0/0 .rodata @5272 */ @@ -2276,28 +2315,28 @@ COMPILER_STRIP_GATE(8053E8AC, &lit_5271); SECTION_RODATA static u8 const lit_5272[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8053E8B4, &lit_5272); +COMPILER_STRIP_GATE(0x8053E8B4, &lit_5272); #pragma pop /* 8053E8BC-8053E8C0 000168 0004+00 0/1 0/0 0/0 .rodata @5345 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_5345 = 0x427AE148; -COMPILER_STRIP_GATE(8053E8BC, &lit_5345); +COMPILER_STRIP_GATE(0x8053E8BC, &lit_5345); #pragma pop /* 8053E8C0-8053E8C4 00016C 0004+00 0/1 0/0 0/0 .rodata @5346 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5346 = 85.0f; -COMPILER_STRIP_GATE(8053E8C0, &lit_5346); +COMPILER_STRIP_GATE(0x8053E8C0, &lit_5346); #pragma pop /* 8053E8C4-8053E8C8 000170 0004+00 0/1 0/0 0/0 .rodata @5347 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5347 = 120.0f; -COMPILER_STRIP_GATE(8053E8C4, &lit_5347); +COMPILER_STRIP_GATE(0x8053E8C4, &lit_5347); #pragma pop /* 805391B8-80539494 002458 02DC+00 1/0 0/0 0/0 .text setCollision__12daNpc_Besu_cFv */ @@ -2323,7 +2362,7 @@ SECTION_RODATA static u8 const jointNo[4] = { 0x00, 0x0E, }; -COMPILER_STRIP_GATE(8053E8C8, &jointNo); +COMPILER_STRIP_GATE(0x8053E8C8, &jointNo); /* 8053949C-805395F4 00273C 0158+00 1/0 0/0 0/0 .text drawOtherMdl__12daNpc_Besu_cFv */ #pragma push @@ -2421,7 +2460,7 @@ asm void daNpc_Besu_c::selectAction() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpc_Besu_c::chkAction(int (daNpc_Besu_c::*)(void*)) { +asm void daNpc_Besu_c::chkAction(int (daNpc_Besu_c::*param_0)(void*)) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_besu/d_a_npc_besu/chkAction__12daNpc_Besu_cFM12daNpc_Besu_cFPCvPvPv_i.s" } @@ -2432,7 +2471,7 @@ asm void daNpc_Besu_c::chkAction(int (daNpc_Besu_c::*)(void*)) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpc_Besu_c::setAction(int (daNpc_Besu_c::*)(void*)) { +asm void daNpc_Besu_c::setAction(int (daNpc_Besu_c::*param_0)(void*)) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_besu/d_a_npc_besu/setAction__12daNpc_Besu_cFM12daNpc_Besu_cFPCvPvPv_i.s" } @@ -2441,7 +2480,7 @@ asm void daNpc_Besu_c::setAction(int (daNpc_Besu_c::*)(void*)) { /* ############################################################################################## */ /* 8053E8CC-8053E8D0 000178 0004+00 1/1 0/0 0/0 .rodata @5582 */ SECTION_RODATA static f32 const lit_5582 = 4.0f; -COMPILER_STRIP_GATE(8053E8CC, &lit_5582); +COMPILER_STRIP_GATE(0x8053E8CC, &lit_5582); /* 80539BA0-80539CF4 002E40 0154+00 1/1 0/0 0/0 .text mop__12daNpc_Besu_cFii */ #pragma push @@ -2453,6 +2492,13 @@ asm void daNpc_Besu_c::mop(int param_0, int param_1) { } #pragma pop +/* ############################################################################################## */ +/* 8053E908-8053E908 0001B4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8053EAFB = "prm"; +#pragma pop + /* 80539CF4-80539E48 002F94 0154+00 1/0 0/0 0/0 .text cutConversationAboutSaru__12daNpc_Besu_cFi */ #pragma push @@ -2471,7 +2517,7 @@ asm void daNpc_Besu_c::cutConversationAboutSaru(int param_0) { SECTION_RODATA static u8 const lit_5629[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8053E8D0, &lit_5629); +COMPILER_STRIP_GATE(0x8053E8D0, &lit_5629); #pragma pop /* 8053E8DC-8053E8E8 000188 000C+00 0/1 0/0 0/0 .rodata @5644 */ @@ -2480,7 +2526,15 @@ COMPILER_STRIP_GATE(8053E8D0, &lit_5629); SECTION_RODATA static u8 const lit_5644[12] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, }; -COMPILER_STRIP_GATE(8053E8DC, &lit_5644); +COMPILER_STRIP_GATE(0x8053E8DC, &lit_5644); +#pragma pop + +/* 8053E908-8053E908 0001B4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8053EAFF = "msgNo"; +SECTION_DEAD static char const* const stringBase_8053EB05 = "msgNo2"; +SECTION_DEAD static char const* const stringBase_8053EB0C = "timer"; #pragma pop /* 80539E48-8053A45C 0030E8 0614+00 3/0 0/0 0/0 .text @@ -2499,7 +2553,7 @@ asm void daNpc_Besu_c::cutConversationAboutPachinko(int param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5769 = -40.0f; -COMPILER_STRIP_GATE(8053E8E8, &lit_5769); +COMPILER_STRIP_GATE(0x8053E8E8, &lit_5769); #pragma pop /* 8053E8EC-8053E8F8 000198 000C+00 0/1 0/0 0/0 .rodata @5779 */ @@ -2508,7 +2562,7 @@ COMPILER_STRIP_GATE(8053E8E8, &lit_5769); SECTION_RODATA static u8 const lit_5779[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8053E8EC, &lit_5779); +COMPILER_STRIP_GATE(0x8053E8EC, &lit_5779); #pragma pop /* 8053A45C-8053A7A0 0036FC 0344+00 1/0 0/0 0/0 .text @@ -2527,7 +2581,7 @@ asm void daNpc_Besu_c::cutConversationAboutWoodSwd(int param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5930 = 50.0f; -COMPILER_STRIP_GATE(8053E8F8, &lit_5930); +COMPILER_STRIP_GATE(0x8053E8F8, &lit_5930); #pragma pop /* 8053A7A0-8053AA6C 003A40 02CC+00 1/0 0/0 0/0 .text cutSwdTutorial__12daNpc_Besu_cFi */ @@ -2545,7 +2599,7 @@ asm void daNpc_Besu_c::cutSwdTutorial(int param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6067 = 0.5f; -COMPILER_STRIP_GATE(8053E8FC, &lit_6067); +COMPILER_STRIP_GATE(0x8053E8FC, &lit_6067); #pragma pop /* 8053AA6C-8053AF5C 003D0C 04F0+00 1/0 0/0 0/0 .text cutFindMonkey__12daNpc_Besu_cFi */ @@ -2588,6 +2642,14 @@ asm void daNpc_Besu_c::cutSurprise(int param_0) { } #pragma pop +/* ############################################################################################## */ +/* 8053E908-8053E908 0001B4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8053EB12 = "timer1"; +SECTION_DEAD static char const* const stringBase_8053EB19 = "timer2"; +#pragma pop + /* 8053B530-8053B820 0047D0 02F0+00 1/0 0/0 0/0 .text cutConversationInHotel__12daNpc_Besu_cFi */ #pragma push #pragma optimization_level 0 @@ -2670,6 +2732,14 @@ asm void daNpc_Besu_c::swdTutorial(void* param_0) { } #pragma pop +/* ############################################################################################## */ +/* 8053E908-8053E908 0001B4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8053EB20 = "EVT_CONVERSATION_IN_HOTEL1_e"; +SECTION_DEAD static char const* const stringBase_8053EB3D = "EVT_CONVERSATION_IN_HOTEL2_e"; +#pragma pop + /* 8053CBB8-8053CF78 005E58 03C0+00 3/0 0/0 0/0 .text nurse__12daNpc_Besu_cFPv */ #pragma push #pragma optimization_level 0 @@ -3019,7 +3089,7 @@ asm void daNpcT_c::getMotionAnm(daNpcT_motionAnmData_c param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_8053E334(int* param_0) { +extern "C" asm void func_8053E334(void* _this, int* param_0) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_besu/d_a_npc_besu/func_8053E334.s" } @@ -3029,7 +3099,7 @@ extern "C" asm void func_8053E334(int* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_8053E350(int param_0, int param_1) { +extern "C" asm void func_8053E350(void* _this, int param_0, int param_1) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_besu/d_a_npc_besu/func_8053E350.s" } @@ -3061,7 +3131,7 @@ asm void __sinit_d_a_npc_besu_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_8053E3CC = (void*)__sinit_d_a_npc_besu_cpp; +REGISTER_CTORS(0x8053E3CC, __sinit_d_a_npc_besu_cpp); #pragma pop /* 8053E588-8053E6A8 007828 0120+00 1/1 0/0 0/0 .text @@ -3160,53 +3230,7 @@ static asm void func_8053E738() { SECTION_RODATA static u8 const lit_6105[8] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, }; -COMPILER_STRIP_GATE(8053E900, &lit_6105); +COMPILER_STRIP_GATE(0x8053E900, &lit_6105); #pragma pop -/* 8053E908-8053EB5A 0001B4 0252+00 19/16 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_8053E908 = ""; -SECTION_DEAD static char const* const stringBase_8053E909 = "NO_RESPONSE"; -SECTION_DEAD static char const* const stringBase_8053E915 = "CONVERSATION_ABOUT_SARU01"; -SECTION_DEAD static char const* const stringBase_8053E92F = "CONVERSATION_ABOUT_SARU02"; -SECTION_DEAD static char const* const stringBase_8053E949 = "CONVERSATION_ABOUT_PACHINKO1"; -SECTION_DEAD static char const* const stringBase_8053E966 = "CONVERSATION_ABOUT_PACHINKO2"; -SECTION_DEAD static char const* const stringBase_8053E983 = "CONVERSATION_ABOUT_PACHINKO3"; -SECTION_DEAD static char const* const stringBase_8053E9A0 = "CACARICO_CONVERSATION"; -SECTION_DEAD static char const* const stringBase_8053E9B6 = "DEMO13_STB"; -SECTION_DEAD static char const* const stringBase_8053E9C1 = "SURPRISE"; -SECTION_DEAD static char const* const stringBase_8053E9CA = "CONVERSATION_ABOUT_DEATHMT"; -SECTION_DEAD static char const* const stringBase_8053E9E5 = "NURSE"; -SECTION_DEAD static char const* const stringBase_8053E9EB = "CONVERSATION_ABOUT_ZORA"; -SECTION_DEAD static char const* const stringBase_8053EA03 = "Besu"; -SECTION_DEAD static char const* const stringBase_8053EA08 = "Besu_TW"; -SECTION_DEAD static char const* const stringBase_8053EA10 = "Besu0"; -SECTION_DEAD static char const* const stringBase_8053EA16 = "Besu1"; -SECTION_DEAD static char const* const stringBase_8053EA1C = "Besu2"; -SECTION_DEAD static char const* const stringBase_8053EA22 = "Besu3"; -SECTION_DEAD static char const* const stringBase_8053EA28 = "Besu_p1"; -SECTION_DEAD static char const* const stringBase_8053EA30 = "Len1"; -SECTION_DEAD static char const* const stringBase_8053EA35 = "Taro1"; -SECTION_DEAD static char const* const stringBase_8053EA3B = "Lud2"; -SECTION_DEAD static char const* const stringBase_8053EA40 = "Sera"; -SECTION_DEAD static char const* const stringBase_8053EA45 = "CONVERSATION_ABOUT_SARU"; -SECTION_DEAD static char const* const stringBase_8053EA5D = "CONVERSATION_ABOUT_PACHINKO"; -SECTION_DEAD static char const* const stringBase_8053EA79 = "CONVERSATION_ABOUT_WOODSWD"; -SECTION_DEAD static char const* const stringBase_8053EA94 = "SWDTUTORIAL"; -SECTION_DEAD static char const* const stringBase_8053EAA0 = "FIND_MONKEY"; -SECTION_DEAD static char const* const stringBase_8053EAAC = "GET_WOODSWD"; -SECTION_DEAD static char const* const stringBase_8053EAB8 = "CONVERSATION_IN_HOTEL"; -SECTION_DEAD static char const* const stringBase_8053EACE = "CONVERSATION_ABOUT_GORON"; -SECTION_DEAD static char const* const stringBase_8053EAE7 = "CLOTH_TRY"; -SECTION_DEAD static char const* const stringBase_8053EAF1 = "THANK_YOU"; -SECTION_DEAD static char const* const stringBase_8053EAFB = "prm"; -SECTION_DEAD static char const* const stringBase_8053EAFF = "msgNo"; -SECTION_DEAD static char const* const stringBase_8053EB05 = "msgNo2"; -SECTION_DEAD static char const* const stringBase_8053EB0C = "timer"; -SECTION_DEAD static char const* const stringBase_8053EB12 = "timer1"; -SECTION_DEAD static char const* const stringBase_8053EB19 = "timer2"; -SECTION_DEAD static char const* const stringBase_8053EB20 = "EVT_CONVERSATION_IN_HOTEL1_e"; -SECTION_DEAD static char const* const stringBase_8053EB3D = "EVT_CONVERSATION_IN_HOTEL2_e"; -#pragma pop +/* 8053E908-8053E908 0001B4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/npc/d_a_npc_blue_ns/d_a_npc_blue_ns.cpp b/rel/d/a/npc/d_a_npc_blue_ns/d_a_npc_blue_ns.cpp index 69a0d04b2cd..65d67e4c265 100644 --- a/rel/d/a/npc/d_a_npc_blue_ns/d_a_npc_blue_ns.cpp +++ b/rel/d/a/npc/d_a_npc_blue_ns/d_a_npc_blue_ns.cpp @@ -17,12 +17,14 @@ struct mDoMtx_stack_c { static u8 now[48]; }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; +struct J3DAnmTransform {}; + +struct J3DModelData {}; + struct Vec {}; struct Z2Creature { @@ -31,8 +33,6 @@ struct Z2Creature { /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -106,10 +106,10 @@ struct daNpcF_ActorMngr_c { /* 8096BFD8 */ daNpcF_ActorMngr_c(); }; -struct J3DJoint {}; - struct J3DModel {}; +struct J3DJoint {}; + struct daNpcBlueNS_c { /* 8096896C */ daNpcBlueNS_c(); /* 80968B80 */ ~daNpcBlueNS_c(); @@ -415,7 +415,7 @@ extern "C" bool setExpressionBtp__8daNpcF_cFi(); extern "C" void setExpression__8daNpcF_cFif(); extern "C" void drawOtherMdls__8daNpcF_cFv(); extern "C" void __dt__10cCcD_GSttsFv(); -extern "C" void func_8096C790(int*); +extern "C" void func_8096C790(void* _this, int*); extern "C" void __sinit_d_a_npc_blue_ns_cpp(); extern "C" void adjustShapeAngle__13daNpcBlueNS_cFv(); extern "C" void __dt__19daNpcBlueNS_Param_cFv(); @@ -569,6 +569,16 @@ extern "C" void __register_global_object(); // /* ############################################################################################## */ +/* 8096CB4C-8096CB4C 00022C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8096CB4C = "Blue_NS"; +SECTION_DEAD static char const* const stringBase_8096CB54 = "CHG_YAMI_CHIBI"; +SECTION_DEAD static char const* const stringBase_8096CB63 = "CHG_YAMI_DEBU"; +SECTION_DEAD static char const* const stringBase_8096CB71 = "CHG_YAMI_NOPPO"; +SECTION_DEAD static char const* const stringBase_8096CB80 = "CHG_YAMI_NOPPO_STOPPER"; +#pragma pop + /* 8096CBA0-8096CBAC 000000 000C+00 3/3 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -931,7 +941,7 @@ SECTION_RODATA static u8 const l_cyl_src[68] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8096C920, &l_cyl_src); +COMPILER_STRIP_GATE(0x8096C920, &l_cyl_src); /* 8096C964-8096C9D4 000044 0070+00 3/9 0/0 0/0 .rodata m__19daNpcBlueNS_Param_c */ SECTION_RODATA u8 const daNpcBlueNS_Param_c::m[112] = { @@ -943,41 +953,41 @@ SECTION_RODATA u8 const daNpcBlueNS_Param_c::m[112] = { 0x42, 0x70, 0x00, 0x00, 0x43, 0xFA, 0x00, 0x00, 0x43, 0x96, 0x00, 0x00, 0xC3, 0x96, 0x00, 0x00, 0x00, 0x3C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x43, 0x96, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8096C964, &daNpcBlueNS_Param_c::m); +COMPILER_STRIP_GATE(0x8096C964, &daNpcBlueNS_Param_c::m); /* 8096C9D4-8096C9D8 0000B4 0004+00 0/1 0/0 0/0 .rodata @4265 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4265 = 3.0f; -COMPILER_STRIP_GATE(8096C9D4, &lit_4265); +COMPILER_STRIP_GATE(0x8096C9D4, &lit_4265); #pragma pop /* 8096C9D8-8096C9DC 0000B8 0004+00 0/1 0/0 0/0 .rodata @4266 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4266 = -120.0f; -COMPILER_STRIP_GATE(8096C9D8, &lit_4266); +COMPILER_STRIP_GATE(0x8096C9D8, &lit_4266); #pragma pop /* 8096C9DC-8096C9E0 0000BC 0004+00 0/1 0/0 0/0 .rodata @4267 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4267 = -10.0f; -COMPILER_STRIP_GATE(8096C9DC, &lit_4267); +COMPILER_STRIP_GATE(0x8096C9DC, &lit_4267); #pragma pop /* 8096C9E0-8096C9E4 0000C0 0004+00 0/1 0/0 0/0 .rodata @4268 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4268 = 120.0f; -COMPILER_STRIP_GATE(8096C9E0, &lit_4268); +COMPILER_STRIP_GATE(0x8096C9E0, &lit_4268); #pragma pop /* 8096C9E4-8096C9E8 0000C4 0004+00 0/1 0/0 0/0 .rodata @4269 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4269 = 220.0f; -COMPILER_STRIP_GATE(8096C9E4, &lit_4269); +COMPILER_STRIP_GATE(0x8096C9E4, &lit_4269); #pragma pop /* 80968D44-80968FE4 0004C4 02A0+00 1/1 0/0 0/0 .text Create__13daNpcBlueNS_cFv */ @@ -993,11 +1003,11 @@ asm void daNpcBlueNS_c::Create() { /* ############################################################################################## */ /* 8096C9E8-8096C9EC 0000C8 0004+00 4/6 0/0 0/0 .rodata @4306 */ SECTION_RODATA static f32 const lit_4306 = 1.0f; -COMPILER_STRIP_GATE(8096C9E8, &lit_4306); +COMPILER_STRIP_GATE(0x8096C9E8, &lit_4306); /* 8096C9EC-8096C9F0 0000CC 0004+00 8/8 0/0 0/0 .rodata @4307 */ SECTION_RODATA static f32 const lit_4307 = -1.0f; -COMPILER_STRIP_GATE(8096C9EC, &lit_4307); +COMPILER_STRIP_GATE(0x8096C9EC, &lit_4307); /* 80968FE4-80969138 000764 0154+00 1/1 0/0 0/0 .text CreateHeap__13daNpcBlueNS_cFv */ #pragma push @@ -1044,7 +1054,7 @@ asm void daNpcBlueNS_c::Execute() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4392 = -1000000000.0f; -COMPILER_STRIP_GATE(8096C9F0, &lit_4392); +COMPILER_STRIP_GATE(0x8096C9F0, &lit_4392); #pragma pop /* 8096C9F4-8096C9F8 0000D4 0004+00 6/11 0/0 0/0 .rodata @4393 */ @@ -1054,7 +1064,7 @@ SECTION_RODATA static u8 const lit_4393[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(8096C9F4, &lit_4393); +COMPILER_STRIP_GATE(0x8096C9F4, &lit_4393); /* 80969200-80969468 000980 0268+00 1/1 0/0 0/0 .text _Execute__13daNpcBlueNS_cFv */ #pragma push @@ -1071,7 +1081,7 @@ asm void daNpcBlueNS_c::_Execute() { SECTION_RODATA static u8 const sCallEvtName[12] = { 0x00, 0x01, 0x00, 0x02, 0x00, 0x03, 0x00, 0x04, 0x00, 0x05, 0x00, 0x06, }; -COMPILER_STRIP_GATE(8096C9F8, &sCallEvtName); +COMPILER_STRIP_GATE(0x8096C9F8, &sCallEvtName); /* 80969468-80969504 000BE8 009C+00 1/1 0/0 0/0 .text callEvt_changeYami__13daNpcBlueNS_cFv */ #pragma push @@ -1096,7 +1106,7 @@ SECTION_RODATA static u8 const sNameYami[6 + 2 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(8096CA04, &sNameYami); +COMPILER_STRIP_GATE(0x8096CA04, &sNameYami); /* 80969504-809695F0 000C84 00EC+00 5/5 0/0 0/0 .text create_Yamijin__13daNpcBlueNS_cFi */ @@ -1124,21 +1134,21 @@ asm void daNpcBlueNS_c::col_check() { #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4524 = 0x4378C198; -COMPILER_STRIP_GATE(8096CA0C, &lit_4524); +COMPILER_STRIP_GATE(0x8096CA0C, &lit_4524); #pragma pop /* 8096CA10-8096CA14 0000F0 0004+00 0/1 0/0 0/0 .rodata @4525 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4525 = 800.0f; -COMPILER_STRIP_GATE(8096CA10, &lit_4525); +COMPILER_STRIP_GATE(0x8096CA10, &lit_4525); #pragma pop /* 8096CA14-8096CA18 0000F4 0004+00 0/1 0/0 0/0 .rodata @4526 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4526 = 0x45A7C1BD; -COMPILER_STRIP_GATE(8096CA14, &lit_4526); +COMPILER_STRIP_GATE(0x8096CA14, &lit_4526); #pragma pop /* 8096CA18-8096CA20 0000F8 0008+00 0/1 0/0 0/0 .rodata @4527 */ @@ -1147,7 +1157,7 @@ COMPILER_STRIP_GATE(8096CA14, &lit_4526); SECTION_RODATA static u8 const lit_4527[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8096CA18, &lit_4527); +COMPILER_STRIP_GATE(0x8096CA18, &lit_4527); #pragma pop /* 8096CA20-8096CA28 000100 0008+00 0/1 0/0 0/0 .rodata @4528 */ @@ -1156,7 +1166,7 @@ COMPILER_STRIP_GATE(8096CA18, &lit_4527); SECTION_RODATA static u8 const lit_4528[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8096CA20, &lit_4528); +COMPILER_STRIP_GATE(0x8096CA20, &lit_4528); #pragma pop /* 8096CA28-8096CA30 000108 0008+00 0/1 0/0 0/0 .rodata @4529 */ @@ -1165,21 +1175,21 @@ COMPILER_STRIP_GATE(8096CA20, &lit_4528); SECTION_RODATA static u8 const lit_4529[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8096CA28, &lit_4529); +COMPILER_STRIP_GATE(0x8096CA28, &lit_4529); #pragma pop /* 8096CA30-8096CA34 000110 0004+00 0/1 0/0 0/0 .rodata @4530 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4530 = 740.0f; -COMPILER_STRIP_GATE(8096CA30, &lit_4530); +COMPILER_STRIP_GATE(0x8096CA30, &lit_4530); #pragma pop /* 8096CA34-8096CA38 000114 0004+00 0/1 0/0 0/0 .rodata @4531 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4531 = 1000.0f; -COMPILER_STRIP_GATE(8096CA34, &lit_4531); +COMPILER_STRIP_GATE(0x8096CA34, &lit_4531); #pragma pop /* 80969698-80969870 000E18 01D8+00 1/1 0/0 0/0 .text @@ -1198,7 +1208,7 @@ asm void daNpcBlueNS_c::holyball_check_main(fopAc_ac_c* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4570 = 20.0f; -COMPILER_STRIP_GATE(8096CA38, &lit_4570); +COMPILER_STRIP_GATE(0x8096CA38, &lit_4570); #pragma pop /* 80969870-809699D0 000FF0 0160+00 1/1 0/0 0/0 .text Draw__13daNpcBlueNS_cFv */ @@ -1216,7 +1226,7 @@ asm void daNpcBlueNS_c::Draw() { SECTION_RODATA static u8 const lit_4574[12] = { 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x04, }; -COMPILER_STRIP_GATE(8096CA3C, &lit_4574); +COMPILER_STRIP_GATE(0x8096CA3C, &lit_4574); /* 809699D0-80969B68 001150 0198+00 1/1 0/0 0/0 .text * ctrlJoint__13daNpcBlueNS_cFP8J3DJointP8J3DModel */ @@ -1337,12 +1347,12 @@ asm void daNpcBlueNS_c::main() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4846 = 10.0f; -COMPILER_STRIP_GATE(8096CA48, &lit_4846); +COMPILER_STRIP_GATE(0x8096CA48, &lit_4846); #pragma pop /* 8096CA4C-8096CA50 00012C 0004+00 1/2 0/0 0/0 .rodata @4847 */ SECTION_RODATA static f32 const lit_4847 = 15.0f; -COMPILER_STRIP_GATE(8096CA4C, &lit_4847); +COMPILER_STRIP_GATE(0x8096CA4C, &lit_4847); /* 8096A090-8096A238 001810 01A8+00 1/0 0/0 0/0 .text setAttnPos__13daNpcBlueNS_cFv */ #pragma push @@ -1386,7 +1396,7 @@ bool daNpcBlueNS_c::drawDbgInfo() { SECTION_RODATA static u8 const sWaitAnm[12] = { 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, }; -COMPILER_STRIP_GATE(8096CA50, &sWaitAnm); +COMPILER_STRIP_GATE(0x8096CA50, &sWaitAnm); #pragma pop /* 8096CA5C-8096CA68 00013C 000C+00 0/1 0/0 0/0 .rodata sDamageAnm$4875 */ @@ -1395,7 +1405,7 @@ COMPILER_STRIP_GATE(8096CA50, &sWaitAnm); SECTION_RODATA static u8 const sDamageAnm[12] = { 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x05, }; -COMPILER_STRIP_GATE(8096CA5C, &sDamageAnm); +COMPILER_STRIP_GATE(0x8096CA5C, &sDamageAnm); #pragma pop /* 8096CA68-8096CA74 000148 000C+00 0/1 0/0 0/0 .rodata sAppearAnm$4876 */ @@ -1404,7 +1414,7 @@ COMPILER_STRIP_GATE(8096CA5C, &sDamageAnm); SECTION_RODATA static u8 const sAppearAnm[12] = { 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x08, }; -COMPILER_STRIP_GATE(8096CA68, &sAppearAnm); +COMPILER_STRIP_GATE(0x8096CA68, &sAppearAnm); #pragma pop /* 8096A358-8096A518 001AD8 01C0+00 1/1 0/0 0/0 .text reset__13daNpcBlueNS_cFv */ @@ -1424,7 +1434,7 @@ asm void daNpcBlueNS_c::reset() { SECTION_RODATA static u8 const lit_4908[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8096CA74, &lit_4908); +COMPILER_STRIP_GATE(0x8096CA74, &lit_4908); #pragma pop /* 8096CA80-8096CA84 000160 0004+00 0/1 0/0 0/0 .rodata @4909 */ @@ -1436,7 +1446,7 @@ SECTION_RODATA static u8 const lit_4909[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(8096CA80, &lit_4909); +COMPILER_STRIP_GATE(0x8096CA80, &lit_4909); #pragma pop /* 8096CA84-8096CA90 000164 000C+00 0/1 0/0 0/0 .rodata @4910 */ @@ -1445,7 +1455,7 @@ COMPILER_STRIP_GATE(8096CA80, &lit_4909); SECTION_RODATA static u8 const lit_4910[12] = { 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8096CA84, &lit_4910); +COMPILER_STRIP_GATE(0x8096CA84, &lit_4910); #pragma pop /* 8096CA90-8096CA94 000170 0004+00 0/1 0/0 0/0 .rodata @4911 */ @@ -1457,7 +1467,7 @@ SECTION_RODATA static u8 const lit_4911[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(8096CA90, &lit_4911); +COMPILER_STRIP_GATE(0x8096CA90, &lit_4911); #pragma pop /* 8096CA94-8096CAA0 000174 000C+00 0/1 0/0 0/0 .rodata @4912 */ @@ -1466,7 +1476,7 @@ COMPILER_STRIP_GATE(8096CA90, &lit_4911); SECTION_RODATA static u8 const lit_4912[12] = { 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8096CA94, &lit_4912); +COMPILER_STRIP_GATE(0x8096CA94, &lit_4912); #pragma pop /* 8096CAA0-8096CAA4 000180 0004+00 0/1 0/0 0/0 .rodata @4913 */ @@ -1478,7 +1488,7 @@ SECTION_RODATA static u8 const lit_4913[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(8096CAA0, &lit_4913); +COMPILER_STRIP_GATE(0x8096CAA0, &lit_4913); #pragma pop /* 8096CAA4-8096CAB0 000184 000C+00 0/1 0/0 0/0 .rodata @4914 */ @@ -1487,7 +1497,7 @@ COMPILER_STRIP_GATE(8096CAA0, &lit_4913); SECTION_RODATA static u8 const lit_4914[12] = { 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8096CAA4, &lit_4914); +COMPILER_STRIP_GATE(0x8096CAA4, &lit_4914); #pragma pop /* 8096CAB0-8096CAB4 000190 0004+00 0/1 0/0 0/0 .rodata @4915 */ @@ -1499,7 +1509,7 @@ SECTION_RODATA static u8 const lit_4915[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(8096CAB0, &lit_4915); +COMPILER_STRIP_GATE(0x8096CAB0, &lit_4915); #pragma pop /* 8096CAB4-8096CAC0 000194 000C+00 0/1 0/0 0/0 .rodata @4916 */ @@ -1508,7 +1518,7 @@ COMPILER_STRIP_GATE(8096CAB0, &lit_4915); SECTION_RODATA static u8 const lit_4916[12] = { 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8096CAB4, &lit_4916); +COMPILER_STRIP_GATE(0x8096CAB4, &lit_4916); #pragma pop /* 8096CAC0-8096CAC4 0001A0 0004+00 0/1 0/0 0/0 .rodata @4917 */ @@ -1520,7 +1530,7 @@ SECTION_RODATA static u8 const lit_4917[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(8096CAC0, &lit_4917); +COMPILER_STRIP_GATE(0x8096CAC0, &lit_4917); #pragma pop /* 8096CAC4-8096CAD0 0001A4 000C+00 0/1 0/0 0/0 .rodata @4918 */ @@ -1529,7 +1539,7 @@ COMPILER_STRIP_GATE(8096CAC0, &lit_4917); SECTION_RODATA static u8 const lit_4918[12] = { 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8096CAC4, &lit_4918); +COMPILER_STRIP_GATE(0x8096CAC4, &lit_4918); #pragma pop /* 8096CAD0-8096CAD4 0001B0 0004+00 0/1 0/0 0/0 .rodata @4919 */ @@ -1541,7 +1551,7 @@ SECTION_RODATA static u8 const lit_4919[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(8096CAD0, &lit_4919); +COMPILER_STRIP_GATE(0x8096CAD0, &lit_4919); #pragma pop /* 8096CAD4-8096CAE0 0001B4 000C+00 0/1 0/0 0/0 .rodata @4920 */ @@ -1550,7 +1560,7 @@ COMPILER_STRIP_GATE(8096CAD0, &lit_4919); SECTION_RODATA static u8 const lit_4920[12] = { 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8096CAD4, &lit_4920); +COMPILER_STRIP_GATE(0x8096CAD4, &lit_4920); #pragma pop /* 8096CAE0-8096CAE4 0001C0 0004+00 0/1 0/0 0/0 .rodata @4921 */ @@ -1562,7 +1572,7 @@ SECTION_RODATA static u8 const lit_4921[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(8096CAE0, &lit_4921); +COMPILER_STRIP_GATE(0x8096CAE0, &lit_4921); #pragma pop /* 8096CAE4-8096CAF0 0001C4 000C+00 0/1 0/0 0/0 .rodata @4922 */ @@ -1571,7 +1581,7 @@ COMPILER_STRIP_GATE(8096CAE0, &lit_4921); SECTION_RODATA static u8 const lit_4922[12] = { 0x00, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8096CAE4, &lit_4922); +COMPILER_STRIP_GATE(0x8096CAE4, &lit_4922); #pragma pop /* 8096CAF0-8096CAF4 0001D0 0004+00 0/1 0/0 0/0 .rodata @4923 */ @@ -1583,7 +1593,7 @@ SECTION_RODATA static u8 const lit_4923[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(8096CAF0, &lit_4923); +COMPILER_STRIP_GATE(0x8096CAF0, &lit_4923); #pragma pop /* 8096CAF4-8096CB00 0001D4 000C+00 0/1 0/0 0/0 .rodata @4924 */ @@ -1592,7 +1602,7 @@ COMPILER_STRIP_GATE(8096CAF0, &lit_4923); SECTION_RODATA static u8 const lit_4924[12] = { 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8096CAF4, &lit_4924); +COMPILER_STRIP_GATE(0x8096CAF4, &lit_4924); #pragma pop /* 8096CB00-8096CB04 0001E0 0004+00 0/1 0/0 0/0 .rodata @4925 */ @@ -1604,7 +1614,7 @@ SECTION_RODATA static u8 const lit_4925[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(8096CB00, &lit_4925); +COMPILER_STRIP_GATE(0x8096CB00, &lit_4925); #pragma pop /* 8096A518-8096A750 001C98 0238+00 1/1 0/0 0/0 .text playMotion__13daNpcBlueNS_cFv */ @@ -1622,7 +1632,7 @@ asm void daNpcBlueNS_c::playMotion() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpcBlueNS_c::setAction(int (daNpcBlueNS_c::*)(int)) { +asm void daNpcBlueNS_c::setAction(int (daNpcBlueNS_c::*param_0)(int)) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_blue_ns/d_a_npc_blue_ns/setAction__13daNpcBlueNS_cFM13daNpcBlueNS_cFPCvPvi_i.s" } @@ -1647,7 +1657,7 @@ SECTION_RODATA static u8 const lit_4926[36] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8096CB04, &lit_4926); +COMPILER_STRIP_GATE(0x8096CB04, &lit_4926); #pragma pop /* 8096CB28-8096CB34 000208 000C+00 0/1 0/0 0/0 .rodata @4956 */ @@ -1656,28 +1666,28 @@ COMPILER_STRIP_GATE(8096CB04, &lit_4926); SECTION_RODATA static u8 const lit_4956[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8096CB28, &lit_4956); +COMPILER_STRIP_GATE(0x8096CB28, &lit_4956); #pragma pop /* 8096CB34-8096CB38 000214 0004+00 0/1 0/0 0/0 .rodata @5004 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5004 = -80.0f; -COMPILER_STRIP_GATE(8096CB34, &lit_5004); +COMPILER_STRIP_GATE(0x8096CB34, &lit_5004); #pragma pop /* 8096CB38-8096CB3C 000218 0004+00 0/1 0/0 0/0 .rodata @5005 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5005 = 80.0f; -COMPILER_STRIP_GATE(8096CB38, &lit_5005); +COMPILER_STRIP_GATE(0x8096CB38, &lit_5005); #pragma pop /* 8096CB3C-8096CB40 00021C 0004+00 0/1 0/0 0/0 .rodata @5006 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5006 = 40.0f; -COMPILER_STRIP_GATE(8096CB3C, &lit_5006); +COMPILER_STRIP_GATE(0x8096CB3C, &lit_5006); #pragma pop /* 8096A81C-8096A9FC 001F9C 01E0+00 1/1 0/0 0/0 .text lookat__13daNpcBlueNS_cFv */ @@ -1755,7 +1765,7 @@ asm void daNpcBlueNS_c::demo(int param_0) { SECTION_RODATA static u8 const ptclOffsetY[12] = { 0x00, 0x00, 0x00, 0x00, 0x41, 0xA0, 0x00, 0x00, 0x42, 0x48, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8096CB40, &ptclOffsetY); +COMPILER_STRIP_GATE(0x8096CB40, &ptclOffsetY); /* 8096B204-8096B320 002984 011C+00 4/4 0/0 0/0 .text ChgPtclDisp__13daNpcBlueNS_cFv */ #pragma push @@ -1797,6 +1807,13 @@ asm void daNpcBlueNS_c::appearSE() { } #pragma pop +/* ############################################################################################## */ +/* 8096CB4C-8096CB4C 00022C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8096CB97 = "cutId"; +#pragma pop + /* 8096B548-8096B5F0 002CC8 00A8+00 1/0 0/0 0/0 .text _Evt_ChgYami_Chibi__13daNpcBlueNS_cFi */ #pragma push #pragma optimization_level 0 @@ -2134,7 +2151,7 @@ asm cCcD_GStts::~cCcD_GStts() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_8096C790(int* param_0) { +extern "C" asm void func_8096C790(void* _this, int* param_0) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_blue_ns/d_a_npc_blue_ns/func_8096C790.s" } @@ -2166,7 +2183,7 @@ asm void __sinit_d_a_npc_blue_ns_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_8096C7AC = (void*)__sinit_d_a_npc_blue_ns_cpp; +REGISTER_CTORS(0x8096C7AC, __sinit_d_a_npc_blue_ns_cpp); #pragma pop /* 8096C8B0-8096C8B4 004030 0004+00 1/0 0/0 0/0 .text adjustShapeAngle__13daNpcBlueNS_cFv @@ -2205,14 +2222,4 @@ static asm void func_8096C904() { } #pragma pop -/* 8096CB4C-8096CB9D 00022C 0051+00 7/4 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_8096CB4C = "Blue_NS"; -SECTION_DEAD static char const* const stringBase_8096CB54 = "CHG_YAMI_CHIBI"; -SECTION_DEAD static char const* const stringBase_8096CB63 = "CHG_YAMI_DEBU"; -SECTION_DEAD static char const* const stringBase_8096CB71 = "CHG_YAMI_NOPPO"; -SECTION_DEAD static char const* const stringBase_8096CB80 = "CHG_YAMI_NOPPO_STOPPER"; -SECTION_DEAD static char const* const stringBase_8096CB97 = "cutId"; -#pragma pop +/* 8096CB4C-8096CB4C 00022C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/npc/d_a_npc_bou/d_a_npc_bou.cpp b/rel/d/a/npc/d_a_npc_bou/d_a_npc_bou.cpp index 93908ed0c18..ac3d2ee2485 100644 --- a/rel/d/a/npc/d_a_npc_bou/d_a_npc_bou.cpp +++ b/rel/d/a/npc/d_a_npc_bou/d_a_npc_bou.cpp @@ -15,12 +15,14 @@ struct mDoMtx_stack_c { static u8 now[48]; }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; +struct J3DAnmTransform {}; + +struct J3DModelData {}; + struct Vec {}; struct Z2Creature { @@ -29,8 +31,6 @@ struct Z2Creature { /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -47,6 +47,8 @@ struct daNpc_Jagar_c { /* 80A150AC */ void getType(); }; +struct daNpcT_faceMotionAnmData_c {}; + struct daNpcT_MotionSeqMngr_c { struct sequenceStepData_c {}; @@ -54,14 +56,12 @@ struct daNpcT_MotionSeqMngr_c { /* 80971FD0 */ ~daNpcT_MotionSeqMngr_c(); }; +struct daNpcT_evtData_c {}; + struct daNpcT_motionAnmData_c {}; struct J3DJoint {}; -struct daNpcT_faceMotionAnmData_c {}; - -struct daNpcT_evtData_c {}; - struct daNpc_Bou_c { /* 8096CF8C */ ~daNpc_Bou_c(); /* 8096D0D8 */ void create(); @@ -131,6 +131,13 @@ struct dCcD_GObjInf { /* 800844F8 */ void GetTgHitObj(); }; +struct csXyz { + /* 80971930 */ ~csXyz(); + /* 80971ECC */ csXyz(); +}; + +struct _GXColorS10 {}; + struct J3DModel {}; struct cXyz { @@ -140,13 +147,6 @@ struct cXyz { /* 80971FCC */ cXyz(); }; -struct _GXColorS10 {}; - -struct csXyz { - /* 80971930 */ ~csXyz(); - /* 80971ECC */ csXyz(); -}; - struct daNpcT_c { /* 80147FA4 */ void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*); /* 801483F8 */ void loadRes(s8 const*, char const**); @@ -511,7 +511,7 @@ extern "C" void getMotionAnm__8daNpcT_cF22daNpcT_motionAnmData_c(); extern "C" void changeBck__8daNpcT_cFPiPi(); extern "C" void changeBtp__8daNpcT_cFPiPi(); extern "C" void changeBtk__8daNpcT_cFPiPi(); -extern "C" void func_8097258C(int*); +extern "C" void func_8097258C(void* _this, int*); extern "C" void __sinit_d_a_npc_bou_cpp(); extern "C" void __ct__11daNpc_Bou_cFPC26daNpcT_faceMotionAnmData_cPC22daNpcT_motionAnmData_cPCQ222daNpcT_MotionSeqMngr_c18sequenceStepData_ciPCQ222daNpcT_MotionSeqMngr_c18sequenceStepData_ciPC16daNpcT_evtData_cPPc(); @@ -715,6 +715,29 @@ extern "C" void getType__13daNpc_Jagar_cFv(); // /* ############################################################################################## */ +/* 8097299C-8097299C 00013C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8097299C = ""; +SECTION_DEAD static char const* const stringBase_8097299D = "NO_RESPONSE"; +SECTION_DEAD static char const* const stringBase_809729A9 = "WILDGOAT"; +SECTION_DEAD static char const* const stringBase_809729B2 = "WILDGOAT_SUCCESS"; +SECTION_DEAD static char const* const stringBase_809729C3 = "WILDGOAT_FAILURE"; +SECTION_DEAD static char const* const stringBase_809729D4 = "SPEAKTO"; +SECTION_DEAD static char const* const stringBase_809729DC = "CONFIDENTIAL_CONVERSATION"; +SECTION_DEAD static char const* const stringBase_809729F6 = "FIND_WOLF"; +SECTION_DEAD static char const* const stringBase_80972A00 = "MEETING_AGAIN"; +SECTION_DEAD static char const* const stringBase_80972A0E = "MEETING_AGAIN_PLAYER_ON_HORSE"; +SECTION_DEAD static char const* const stringBase_80972A2C = "MEETING_AGAIN_NEAR"; +SECTION_DEAD static char const* const stringBase_80972A3F = "Bou"; +SECTION_DEAD static char const* const stringBase_80972A43 = "Bou1"; +SECTION_DEAD static char const* const stringBase_80972A48 = "Bou2"; +SECTION_DEAD static char const* const stringBase_80972A4D = "Bou4"; +SECTION_DEAD static char const* const stringBase_80972A52 = "Bou_p1"; +SECTION_DEAD static char const* const stringBase_80972A59 = "Jagar2"; +SECTION_DEAD static char const* const stringBase_80972A60 = "CONVERSATION_WITH_BOU"; +#pragma pop + /* 80972A90-80972A9C 000000 000C+00 2/2 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -1290,7 +1313,7 @@ SECTION_RODATA u8 const daNpc_Bou_Param_c::m[156] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41, 0x80, 0x00, 0x00, 0x44, 0x7A, 0x00, 0x00, 0x43, 0xFA, 0x00, 0x00, 0xC3, 0xFA, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80972860, &daNpc_Bou_Param_c::m); +COMPILER_STRIP_GATE(0x80972860, &daNpc_Bou_Param_c::m); /* 809728FC-80972914 00009C 0018+00 0/1 0/0 0/0 .rodata heapSize$4096 */ #pragma push @@ -1299,42 +1322,42 @@ SECTION_RODATA static u8 const heapSize[24] = { 0x00, 0x00, 0x3D, 0x50, 0x00, 0x00, 0x3D, 0x50, 0x00, 0x00, 0x3D, 0x50, 0x00, 0x00, 0x3D, 0x50, 0x00, 0x00, 0x3D, 0x50, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809728FC, &heapSize); +COMPILER_STRIP_GATE(0x809728FC, &heapSize); #pragma pop /* 80972914-80972918 0000B4 0004+00 0/1 0/0 0/0 .rodata @4162 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4162 = -200.0f; -COMPILER_STRIP_GATE(80972914, &lit_4162); +COMPILER_STRIP_GATE(0x80972914, &lit_4162); #pragma pop /* 80972918-8097291C 0000B8 0004+00 0/1 0/0 0/0 .rodata @4163 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4163 = -100.0f; -COMPILER_STRIP_GATE(80972918, &lit_4163); +COMPILER_STRIP_GATE(0x80972918, &lit_4163); #pragma pop /* 8097291C-80972920 0000BC 0004+00 0/1 0/0 0/0 .rodata @4164 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4164 = 200.0f; -COMPILER_STRIP_GATE(8097291C, &lit_4164); +COMPILER_STRIP_GATE(0x8097291C, &lit_4164); #pragma pop /* 80972920-80972924 0000C0 0004+00 0/2 0/0 0/0 .rodata @4165 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4165 = 300.0f; -COMPILER_STRIP_GATE(80972920, &lit_4165); +COMPILER_STRIP_GATE(0x80972920, &lit_4165); #pragma pop /* 80972924-80972928 0000C4 0004+00 0/1 0/0 0/0 .rodata @4166 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4166 = -1000000000.0f; -COMPILER_STRIP_GATE(80972924, &lit_4166); +COMPILER_STRIP_GATE(0x80972924, &lit_4166); #pragma pop /* 8096D0D8-8096D38C 000238 02B4+00 1/1 0/0 0/0 .text create__11daNpc_Bou_cFv */ @@ -1355,25 +1378,25 @@ SECTION_RODATA static u8 const lit_4328[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80972928, &lit_4328); +COMPILER_STRIP_GATE(0x80972928, &lit_4328); /* 8097292C-80972930 0000CC 0004+00 0/2 0/0 0/0 .rodata @4329 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4329 = 65536.0f; -COMPILER_STRIP_GATE(8097292C, &lit_4329); +COMPILER_STRIP_GATE(0x8097292C, &lit_4329); #pragma pop /* 80972930-80972934 0000D0 0004+00 0/3 0/0 0/0 .rodata @4330 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4330 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(80972930, &lit_4330); +COMPILER_STRIP_GATE(0x80972930, &lit_4330); #pragma pop /* 80972934-80972938 0000D4 0004+00 2/4 0/0 0/0 .rodata @4472 */ SECTION_RODATA static f32 const lit_4472 = 1.0f; -COMPILER_STRIP_GATE(80972934, &lit_4472); +COMPILER_STRIP_GATE(0x80972934, &lit_4472); /* 8096D38C-8096D5FC 0004EC 0270+00 1/1 0/0 0/0 .text CreateHeap__11daNpc_Bou_cFv */ #pragma push @@ -1508,7 +1531,7 @@ asm void daNpc_Bou_c::Execute() { /* ############################################################################################## */ /* 80972938-8097293C 0000D8 0004+00 1/1 0/0 0/0 .rodata @4521 */ SECTION_RODATA static f32 const lit_4521 = 100.0f; -COMPILER_STRIP_GATE(80972938, &lit_4521); +COMPILER_STRIP_GATE(0x80972938, &lit_4521); /* 8096D80C-8096D8A0 00096C 0094+00 1/1 0/0 0/0 .text Draw__11daNpc_Bou_cFv */ #pragma push @@ -1555,7 +1578,7 @@ asm void daNpc_Bou_c::srchCow(void* param_0, void* param_1) { /* ############################################################################################## */ /* 8097293C-80972940 0000DC 0004+00 1/1 0/0 0/0 .rodata @4568 */ SECTION_RODATA static f32 const lit_4568 = 1000000000.0f; -COMPILER_STRIP_GATE(8097293C, &lit_4568); +COMPILER_STRIP_GATE(0x8097293C, &lit_4568); /* 8096D9B4-8096DA78 000B14 00C4+00 1/1 0/0 0/0 .text getCowP__11daNpc_Bou_cFv */ #pragma push @@ -1634,7 +1657,7 @@ SECTION_RODATA static f32 const lit_4758[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80972940, &lit_4758); +COMPILER_STRIP_GATE(0x80972940, &lit_4758); /* 8096E0EC-8096E18C 00124C 00A0+00 1/0 0/0 0/0 .text setAfterTalkMotion__11daNpc_Bou_cFv */ @@ -1689,7 +1712,7 @@ asm void daNpc_Bou_c::evtCutProc() { SECTION_RODATA static u8 const lit_4940[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80972948, &lit_4940); +COMPILER_STRIP_GATE(0x80972948, &lit_4940); #pragma pop /* 80972950-80972958 0000F0 0008+00 0/2 0/0 0/0 .rodata @4941 */ @@ -1698,7 +1721,7 @@ COMPILER_STRIP_GATE(80972948, &lit_4940); SECTION_RODATA static u8 const lit_4941[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80972950, &lit_4941); +COMPILER_STRIP_GATE(0x80972950, &lit_4941); #pragma pop /* 80972958-80972960 0000F8 0008+00 0/2 0/0 0/0 .rodata @4942 */ @@ -1707,7 +1730,7 @@ COMPILER_STRIP_GATE(80972950, &lit_4941); SECTION_RODATA static u8 const lit_4942[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80972958, &lit_4942); +COMPILER_STRIP_GATE(0x80972958, &lit_4942); #pragma pop /* 8096E3EC-8096E7E0 00154C 03F4+00 1/0 0/0 0/0 .text action__11daNpc_Bou_cFv */ @@ -1735,14 +1758,14 @@ asm void daNpc_Bou_c::beforeMove() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5018 = -30.0f; -COMPILER_STRIP_GATE(80972960, &lit_5018); +COMPILER_STRIP_GATE(0x80972960, &lit_5018); #pragma pop /* 80972964-80972968 000104 0004+00 0/1 0/0 0/0 .rodata @5019 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5019 = 10.0f; -COMPILER_STRIP_GATE(80972964, &lit_5019); +COMPILER_STRIP_GATE(0x80972964, &lit_5019); #pragma pop /* 80972968-80972970 000108 0004+04 0/1 0/0 0/0 .rodata @5020 */ @@ -1753,14 +1776,14 @@ SECTION_RODATA static u32 const lit_5020[1 + 1 /* padding */] = { /* padding */ 0x00000000, }; -COMPILER_STRIP_GATE(80972968, &lit_5020); +COMPILER_STRIP_GATE(0x80972968, &lit_5020); #pragma pop /* 80972970-80972978 000110 0008+00 1/3 0/0 0/0 .rodata @5022 */ SECTION_RODATA static u8 const lit_5022[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80972970, &lit_5022); +COMPILER_STRIP_GATE(0x80972970, &lit_5022); /* 8096E8A4-8096EB14 001A04 0270+00 1/0 0/0 0/0 .text setAttnPos__11daNpc_Bou_cFv */ #pragma push @@ -1812,7 +1835,7 @@ asm void daNpc_Bou_c::selectAction() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpc_Bou_c::chkAction(int (daNpc_Bou_c::*)(void*)) { +asm void daNpc_Bou_c::chkAction(int (daNpc_Bou_c::*param_0)(void*)) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_bou/d_a_npc_bou/chkAction__11daNpc_Bou_cFM11daNpc_Bou_cFPCvPvPv_i.s" } @@ -1823,7 +1846,7 @@ asm void daNpc_Bou_c::chkAction(int (daNpc_Bou_c::*)(void*)) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpc_Bou_c::setAction(int (daNpc_Bou_c::*)(void*)) { +asm void daNpc_Bou_c::setAction(int (daNpc_Bou_c::*param_0)(void*)) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_bou/d_a_npc_bou/setAction__11daNpc_Bou_cFM11daNpc_Bou_cFPCvPvPv_i.s" } @@ -1834,7 +1857,15 @@ asm void daNpc_Bou_c::setAction(int (daNpc_Bou_c::*)(void*)) { SECTION_RODATA static u8 const lit_5178[12] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, }; -COMPILER_STRIP_GATE(80972978, &lit_5178); +COMPILER_STRIP_GATE(0x80972978, &lit_5178); + +/* 8097299C-8097299C 00013C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80972A76 = "prm"; +SECTION_DEAD static char const* const stringBase_80972A7A = "msgNo"; +SECTION_DEAD static char const* const stringBase_80972A80 = "msgNo2"; +#pragma pop /* 8096EE10-8096F2E4 001F70 04D4+00 2/0 0/0 0/0 .text cutWildGoat__11daNpc_Bou_cFi */ #pragma push @@ -1883,7 +1914,7 @@ asm void daNpc_Bou_c::cutSpeakTo(int param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5515 = -40.0f; -COMPILER_STRIP_GATE(80972984, &lit_5515); +COMPILER_STRIP_GATE(0x80972984, &lit_5515); #pragma pop /* 8096F9A4-8096FB78 002B04 01D4+00 1/0 0/0 0/0 .text cutConversationWithBou__11daNpc_Bou_cFi */ @@ -1912,7 +1943,13 @@ asm void daNpc_Bou_c::cutConfidentialConversation(int param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5708 = 0.5f; -COMPILER_STRIP_GATE(80972988, &lit_5708); +COMPILER_STRIP_GATE(0x80972988, &lit_5708); +#pragma pop + +/* 8097299C-8097299C 00013C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80972A87 = "timer"; #pragma pop /* 8096FE40-80970278 002FA0 0438+00 1/0 0/0 0/0 .text cutFindWolf__11daNpc_Bou_cFi */ @@ -1930,21 +1967,21 @@ asm void daNpc_Bou_c::cutFindWolf(int param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5897 = 250.0f; -COMPILER_STRIP_GATE(8097298C, &lit_5897); +COMPILER_STRIP_GATE(0x8097298C, &lit_5897); #pragma pop /* 80972990-80972994 000130 0004+00 0/1 0/0 0/0 .rodata @5898 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5898 = -250.0f; -COMPILER_STRIP_GATE(80972990, &lit_5898); +COMPILER_STRIP_GATE(0x80972990, &lit_5898); #pragma pop /* 80972994-80972998 000134 0004+00 0/1 0/0 0/0 .rodata @5899 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5899 = 150.0f; -COMPILER_STRIP_GATE(80972994, &lit_5899); +COMPILER_STRIP_GATE(0x80972994, &lit_5899); #pragma pop /* 80970278-809709EC 0033D8 0774+00 1/0 0/0 0/0 .text cutMeetingAgain__11daNpc_Bou_cFi */ @@ -1982,7 +2019,7 @@ asm void daNpc_Bou_c::talkwithJagar(void* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6218 = -10.0f; -COMPILER_STRIP_GATE(80972998, &lit_6218); +COMPILER_STRIP_GATE(0x80972998, &lit_6218); #pragma pop /* 80970F9C-8097146C 0040FC 04D0+00 3/0 0/0 0/0 .text talk__11daNpc_Bou_cFPv */ @@ -2356,7 +2393,7 @@ void daNpcT_c::changeBtk(int* param_0, int* param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_8097258C(int* param_0) { +extern "C" asm void func_8097258C(void* _this, int* param_0) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_bou/d_a_npc_bou/func_8097258C.s" } @@ -2388,7 +2425,7 @@ asm void __sinit_d_a_npc_bou_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_809725A8 = (void*)__sinit_d_a_npc_bou_cpp; +REGISTER_CTORS(0x809725A8, __sinit_d_a_npc_bou_cpp); #pragma pop /* 809726D4-809727B4 005834 00E0+00 1/1 0/0 0/0 .text @@ -2480,30 +2517,4 @@ static asm void func_80972844() { } #pragma pop -/* 8097299C-80972A8D 00013C 00F1+00 12/9 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_8097299C = ""; -SECTION_DEAD static char const* const stringBase_8097299D = "NO_RESPONSE"; -SECTION_DEAD static char const* const stringBase_809729A9 = "WILDGOAT"; -SECTION_DEAD static char const* const stringBase_809729B2 = "WILDGOAT_SUCCESS"; -SECTION_DEAD static char const* const stringBase_809729C3 = "WILDGOAT_FAILURE"; -SECTION_DEAD static char const* const stringBase_809729D4 = "SPEAKTO"; -SECTION_DEAD static char const* const stringBase_809729DC = "CONFIDENTIAL_CONVERSATION"; -SECTION_DEAD static char const* const stringBase_809729F6 = "FIND_WOLF"; -SECTION_DEAD static char const* const stringBase_80972A00 = "MEETING_AGAIN"; -SECTION_DEAD static char const* const stringBase_80972A0E = "MEETING_AGAIN_PLAYER_ON_HORSE"; -SECTION_DEAD static char const* const stringBase_80972A2C = "MEETING_AGAIN_NEAR"; -SECTION_DEAD static char const* const stringBase_80972A3F = "Bou"; -SECTION_DEAD static char const* const stringBase_80972A43 = "Bou1"; -SECTION_DEAD static char const* const stringBase_80972A48 = "Bou2"; -SECTION_DEAD static char const* const stringBase_80972A4D = "Bou4"; -SECTION_DEAD static char const* const stringBase_80972A52 = "Bou_p1"; -SECTION_DEAD static char const* const stringBase_80972A59 = "Jagar2"; -SECTION_DEAD static char const* const stringBase_80972A60 = "CONVERSATION_WITH_BOU"; -SECTION_DEAD static char const* const stringBase_80972A76 = "prm"; -SECTION_DEAD static char const* const stringBase_80972A7A = "msgNo"; -SECTION_DEAD static char const* const stringBase_80972A80 = "msgNo2"; -SECTION_DEAD static char const* const stringBase_80972A87 = "timer"; -#pragma pop +/* 8097299C-8097299C 00013C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/npc/d_a_npc_bouS/d_a_npc_bouS.cpp b/rel/d/a/npc/d_a_npc_bouS/d_a_npc_bouS.cpp index ccf7d084b7d..fd26da3178d 100644 --- a/rel/d/a/npc/d_a_npc_bouS/d_a_npc_bouS.cpp +++ b/rel/d/a/npc/d_a_npc_bouS/d_a_npc_bouS.cpp @@ -37,12 +37,12 @@ struct mDoExt_bckAnm { /* 8000D990 */ void changeBckOnly(J3DAnmTransform*); }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; +struct J3DModelData {}; + struct Z2Creature { /* 802C03C8 */ Z2Creature(); /* 802C0420 */ ~Z2Creature(); @@ -65,16 +65,16 @@ struct daNpcWrestler_c { /* 80B301BC */ void checkStartUp(); }; -struct J3DAnmTextureSRTKey {}; - -struct _GXColorS10 {}; - struct J3DAnmTexPattern { /* 8032AF50 */ void getTexNo(u16, u16*) const; }; +struct J3DAnmTextureSRTKey {}; + struct J3DAnmTransformKey {}; +struct _GXColorS10 {}; + struct daNpcF_c { struct daNpcF_anmPlayData {}; @@ -137,10 +137,10 @@ struct daNpcF_ActorMngr_c { /* 80977C08 */ daNpcF_ActorMngr_c(); }; -struct J3DJoint {}; - struct J3DModel {}; +struct J3DJoint {}; + struct daNpcBouS_c { /* 8097354C */ daNpcBouS_c(); /* 80973760 */ ~daNpcBouS_c(); @@ -205,7 +205,6 @@ struct dMsgFlow_c { struct dEvt_control_c { /* 80042468 */ void reset(); - /* 800436EC */ void setPtI_Id(unsigned int); }; struct dEvent_manager_c { @@ -316,7 +315,7 @@ struct JMath { struct TSinCosTable {}; /* TSinCosTable<13, f32> */ struct TSinCosTable__template0 { - /* 80977AC4 */ void func_80977AC4(s16) /* const */; + /* 80977AC4 */ void func_80977AC4(void* _this, s16) /* const */; }; static u8 sincosTable_[65536]; @@ -418,7 +417,7 @@ extern "C" void setAttnPos__11daNpcBouS_cFv(); extern "C" void lookat__11daNpcBouS_cFv(); extern "C" bool drawDbgInfo__11daNpcBouS_cFv(); extern "C" void drawOtherMdls__11daNpcBouS_cFv(); -extern "C" void func_80977AC4(s16); +extern "C" void func_80977AC4(void* _this, s16); extern "C" void __sinit_d_a_npc_bouS_cpp(); extern "C" void __dt__18daNpcF_ActorMngr_cFv(); extern "C" void __ct__18daNpcF_ActorMngr_cFv(); @@ -610,6 +609,17 @@ extern "C" void checkStartUp__15daNpcWrestler_cFv(); // /* ############################################################################################## */ +/* 80978758-80978758 000348 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80978758 = "Bou"; +SECTION_DEAD static char const* const stringBase_8097875C = "Bou4"; +SECTION_DEAD static char const* const stringBase_80978761 = "BOUS_INTRO_SUMO1"; +SECTION_DEAD static char const* const stringBase_80978772 = "BOUS_INTRO_SUMO2"; +SECTION_DEAD static char const* const stringBase_80978783 = "BOUS_INTRO_SUMO3"; +SECTION_DEAD static char const* const stringBase_80978794 = "BouS"; +#pragma pop + /* 809787A4-809787B0 000000 000C+00 5/5 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -1012,34 +1022,34 @@ SECTION_RODATA u8 const daNpcBouS_Param_c::m[140] = { 0x43, 0x5C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0xC8, 0x00, 0x00, 0x42, 0xA0, 0x00, 0x00, 0x44, 0x23, 0xB2, 0x3D, 0xEB, 0x51, 0xA3, 0xC6, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80978410, &daNpcBouS_Param_c::m); +COMPILER_STRIP_GATE(0x80978410, &daNpcBouS_Param_c::m); /* 8097849C-809784A0 00008C 0004+00 0/1 0/0 0/0 .rodata @4394 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4394 = -160.0f; -COMPILER_STRIP_GATE(8097849C, &lit_4394); +COMPILER_STRIP_GATE(0x8097849C, &lit_4394); #pragma pop /* 809784A0-809784A4 000090 0004+00 0/1 0/0 0/0 .rodata @4395 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4395 = -50.0f; -COMPILER_STRIP_GATE(809784A0, &lit_4395); +COMPILER_STRIP_GATE(0x809784A0, &lit_4395); #pragma pop /* 809784A4-809784A8 000094 0004+00 0/1 0/0 0/0 .rodata @4396 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4396 = 160.0f; -COMPILER_STRIP_GATE(809784A4, &lit_4396); +COMPILER_STRIP_GATE(0x809784A4, &lit_4396); #pragma pop /* 809784A8-809784AC 000098 0004+00 0/2 0/0 0/0 .rodata @4397 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4397 = 220.0f; -COMPILER_STRIP_GATE(809784A8, &lit_4397); +COMPILER_STRIP_GATE(0x809784A8, &lit_4397); #pragma pop /* 80973948-80973B9C 0004E8 0254+00 1/1 0/0 0/0 .text Create__11daNpcBouS_cFv */ @@ -1055,7 +1065,7 @@ asm void daNpcBouS_c::Create() { /* ############################################################################################## */ /* 809784AC-809784B0 00009C 0004+00 4/4 0/0 0/0 .rodata @4446 */ SECTION_RODATA static f32 const lit_4446 = 1.0f; -COMPILER_STRIP_GATE(809784AC, &lit_4446); +COMPILER_STRIP_GATE(0x809784AC, &lit_4446); /* 809784B0-809784B4 0000A0 0004+00 2/8 0/0 0/0 .rodata @4447 */ SECTION_RODATA static u8 const lit_4447[4] = { @@ -1064,7 +1074,7 @@ SECTION_RODATA static u8 const lit_4447[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(809784B0, &lit_4447); +COMPILER_STRIP_GATE(0x809784B0, &lit_4447); /* 80973B9C-80973E0C 00073C 0270+00 1/1 0/0 0/0 .text CreateHeap__11daNpcBouS_cFv */ #pragma push @@ -1211,7 +1221,7 @@ asm void daNpcBouS_c::Draw() { SECTION_RODATA static u8 const lit_4497[12] = { 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x04, }; -COMPILER_STRIP_GATE(809784B4, &lit_4497); +COMPILER_STRIP_GATE(0x809784B4, &lit_4497); /* 80974090-809742BC 000C30 022C+00 1/1 0/0 0/0 .text * ctrlJoint__11daNpcBouS_cFP8J3DJointP8J3DModel */ @@ -1293,7 +1303,7 @@ asm void daNpcBouS_c::reset() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpcBouS_c::setAction(bool (daNpcBouS_c::*)(void*)) { +asm void daNpcBouS_c::setAction(bool (daNpcBouS_c::*param_0)(void*)) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_bouS/d_a_npc_bouS/setAction__11daNpcBouS_cFM11daNpcBouS_cFPCvPvPv_b.s" } @@ -1327,7 +1337,7 @@ asm void daNpcBouS_c::checkInstructionTag(fopAc_ac_c* param_0) { SECTION_RODATA static u8 const lit_4730[12] = { 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809784C0, &lit_4730); +COMPILER_STRIP_GATE(0x809784C0, &lit_4730); #pragma pop /* 809784CC-809784D0 0000BC 0004+00 0/1 0/0 0/0 .rodata @4731 */ @@ -1339,7 +1349,7 @@ SECTION_RODATA static u8 const lit_4731[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(809784CC, &lit_4731); +COMPILER_STRIP_GATE(0x809784CC, &lit_4731); #pragma pop /* 809784D0-809784DC 0000C0 000C+00 0/1 0/0 0/0 .rodata @4732 */ @@ -1348,7 +1358,7 @@ COMPILER_STRIP_GATE(809784CC, &lit_4731); SECTION_RODATA static u8 const lit_4732[12] = { 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809784D0, &lit_4732); +COMPILER_STRIP_GATE(0x809784D0, &lit_4732); #pragma pop /* 809784DC-809784E0 0000CC 0004+00 0/1 0/0 0/0 .rodata @4733 */ @@ -1360,7 +1370,7 @@ SECTION_RODATA static u8 const lit_4733[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(809784DC, &lit_4733); +COMPILER_STRIP_GATE(0x809784DC, &lit_4733); #pragma pop /* 809784E0-809784EC 0000D0 000C+00 0/1 0/0 0/0 .rodata @4734 */ @@ -1369,7 +1379,7 @@ COMPILER_STRIP_GATE(809784DC, &lit_4733); SECTION_RODATA static u8 const lit_4734[12] = { 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(809784E0, &lit_4734); +COMPILER_STRIP_GATE(0x809784E0, &lit_4734); #pragma pop /* 809784EC-809784F8 0000DC 000C+00 0/1 0/0 0/0 .rodata @4735 */ @@ -1378,7 +1388,7 @@ COMPILER_STRIP_GATE(809784E0, &lit_4734); SECTION_RODATA static u8 const lit_4735[12] = { 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809784EC, &lit_4735); +COMPILER_STRIP_GATE(0x809784EC, &lit_4735); #pragma pop /* 809784F8-80978500 0000E8 0008+00 0/1 0/0 0/0 .rodata @4736 */ @@ -1387,7 +1397,7 @@ COMPILER_STRIP_GATE(809784EC, &lit_4735); SECTION_RODATA static u8 const lit_4736[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809784F8, &lit_4736); +COMPILER_STRIP_GATE(0x809784F8, &lit_4736); #pragma pop /* 80978500-8097850C 0000F0 000C+00 0/1 0/0 0/0 .rodata @4737 */ @@ -1396,7 +1406,7 @@ COMPILER_STRIP_GATE(809784F8, &lit_4736); SECTION_RODATA static u8 const lit_4737[12] = { 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80978500, &lit_4737); +COMPILER_STRIP_GATE(0x80978500, &lit_4737); #pragma pop /* 8097850C-80978518 0000FC 000C+00 0/1 0/0 0/0 .rodata @4738 */ @@ -1405,7 +1415,7 @@ COMPILER_STRIP_GATE(80978500, &lit_4737); SECTION_RODATA static u8 const lit_4738[12] = { 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8097850C, &lit_4738); +COMPILER_STRIP_GATE(0x8097850C, &lit_4738); #pragma pop /* 80978518-80978520 000108 0008+00 0/1 0/0 0/0 .rodata @4739 */ @@ -1414,7 +1424,7 @@ COMPILER_STRIP_GATE(8097850C, &lit_4738); SECTION_RODATA static u8 const lit_4739[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80978518, &lit_4739); +COMPILER_STRIP_GATE(0x80978518, &lit_4739); #pragma pop /* 80978520-8097852C 000110 000C+00 0/1 0/0 0/0 .rodata @4740 */ @@ -1423,7 +1433,7 @@ COMPILER_STRIP_GATE(80978518, &lit_4739); SECTION_RODATA static u8 const lit_4740[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80978520, &lit_4740); +COMPILER_STRIP_GATE(0x80978520, &lit_4740); #pragma pop /* 8097852C-80978530 00011C 0004+00 0/1 0/0 0/0 .rodata @4741 */ @@ -1435,7 +1445,7 @@ SECTION_RODATA static u8 const lit_4741[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(8097852C, &lit_4741); +COMPILER_STRIP_GATE(0x8097852C, &lit_4741); #pragma pop /* 80978530-80978548 000120 0018+00 0/0 0/0 0/0 .rodata @4742 */ @@ -1445,7 +1455,7 @@ SECTION_RODATA static u8 const lit_4742[24] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80978530, &lit_4742); +COMPILER_STRIP_GATE(0x80978530, &lit_4742); #pragma pop /* 80978548-80978554 000138 000C+00 0/1 0/0 0/0 .rodata @4746 */ @@ -1454,7 +1464,7 @@ COMPILER_STRIP_GATE(80978530, &lit_4742); SECTION_RODATA static u8 const lit_4746[12] = { 0x00, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80978548, &lit_4746); +COMPILER_STRIP_GATE(0x80978548, &lit_4746); #pragma pop /* 80978554-80978558 000144 0004+00 0/1 0/0 0/0 .rodata @4747 */ @@ -1466,7 +1476,7 @@ SECTION_RODATA static u8 const lit_4747[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80978554, &lit_4747); +COMPILER_STRIP_GATE(0x80978554, &lit_4747); #pragma pop /* 80978558-80978564 000148 000C+00 0/1 0/0 0/0 .rodata @4748 */ @@ -1475,7 +1485,7 @@ COMPILER_STRIP_GATE(80978554, &lit_4747); SECTION_RODATA static u8 const lit_4748[12] = { 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80978558, &lit_4748); +COMPILER_STRIP_GATE(0x80978558, &lit_4748); #pragma pop /* 80978564-80978568 000154 0004+00 0/1 0/0 0/0 .rodata @4749 */ @@ -1487,7 +1497,7 @@ SECTION_RODATA static u8 const lit_4749[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80978564, &lit_4749); +COMPILER_STRIP_GATE(0x80978564, &lit_4749); #pragma pop /* 80978568-80978574 000158 000C+00 0/1 0/0 0/0 .rodata @4750 */ @@ -1496,7 +1506,7 @@ COMPILER_STRIP_GATE(80978564, &lit_4749); SECTION_RODATA static u8 const lit_4750[12] = { 0x00, 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80978568, &lit_4750); +COMPILER_STRIP_GATE(0x80978568, &lit_4750); #pragma pop /* 80978574-80978578 000164 0004+00 0/1 0/0 0/0 .rodata @4751 */ @@ -1508,7 +1518,7 @@ SECTION_RODATA static u8 const lit_4751[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80978574, &lit_4751); +COMPILER_STRIP_GATE(0x80978574, &lit_4751); #pragma pop /* 80978578-80978584 000168 000C+00 0/1 0/0 0/0 .rodata @4752 */ @@ -1517,7 +1527,7 @@ COMPILER_STRIP_GATE(80978574, &lit_4751); SECTION_RODATA static u8 const lit_4752[12] = { 0x00, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80978578, &lit_4752); +COMPILER_STRIP_GATE(0x80978578, &lit_4752); #pragma pop /* 80978584-80978590 000174 000C+00 0/1 0/0 0/0 .rodata @4753 */ @@ -1526,7 +1536,7 @@ COMPILER_STRIP_GATE(80978578, &lit_4752); SECTION_RODATA static u8 const lit_4753[12] = { 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80978584, &lit_4753); +COMPILER_STRIP_GATE(0x80978584, &lit_4753); #pragma pop /* 80978590-80978598 000180 0008+00 0/1 0/0 0/0 .rodata @4754 */ @@ -1535,7 +1545,7 @@ COMPILER_STRIP_GATE(80978584, &lit_4753); SECTION_RODATA static u8 const lit_4754[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80978590, &lit_4754); +COMPILER_STRIP_GATE(0x80978590, &lit_4754); #pragma pop /* 80978598-809785A4 000188 000C+00 0/1 0/0 0/0 .rodata @4755 */ @@ -1544,7 +1554,7 @@ COMPILER_STRIP_GATE(80978590, &lit_4754); SECTION_RODATA static u8 const lit_4755[12] = { 0x00, 0x0F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80978598, &lit_4755); +COMPILER_STRIP_GATE(0x80978598, &lit_4755); #pragma pop /* 809785A4-809785B0 000194 000C+00 0/1 0/0 0/0 .rodata @4756 */ @@ -1553,7 +1563,7 @@ COMPILER_STRIP_GATE(80978598, &lit_4755); SECTION_RODATA static u8 const lit_4756[12] = { 0x00, 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809785A4, &lit_4756); +COMPILER_STRIP_GATE(0x809785A4, &lit_4756); #pragma pop /* 809785B0-809785B8 0001A0 0008+00 0/1 0/0 0/0 .rodata @4757 */ @@ -1562,7 +1572,7 @@ COMPILER_STRIP_GATE(809785A4, &lit_4756); SECTION_RODATA static u8 const lit_4757[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809785B0, &lit_4757); +COMPILER_STRIP_GATE(0x809785B0, &lit_4757); #pragma pop /* 809785B8-809785C4 0001A8 000C+00 0/1 0/0 0/0 .rodata @4758 */ @@ -1571,7 +1581,7 @@ COMPILER_STRIP_GATE(809785B0, &lit_4757); SECTION_RODATA static u8 const lit_4758[12] = { 0x00, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(809785B8, &lit_4758); +COMPILER_STRIP_GATE(0x809785B8, &lit_4758); #pragma pop /* 809785C4-809785D0 0001B4 000C+00 0/1 0/0 0/0 .rodata @4759 */ @@ -1580,7 +1590,7 @@ COMPILER_STRIP_GATE(809785B8, &lit_4758); SECTION_RODATA static u8 const lit_4759[12] = { 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809785C4, &lit_4759); +COMPILER_STRIP_GATE(0x809785C4, &lit_4759); #pragma pop /* 809785D0-809785D8 0001C0 0008+00 0/1 0/0 0/0 .rodata @4760 */ @@ -1589,7 +1599,7 @@ COMPILER_STRIP_GATE(809785C4, &lit_4759); SECTION_RODATA static u8 const lit_4760[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809785D0, &lit_4760); +COMPILER_STRIP_GATE(0x809785D0, &lit_4760); #pragma pop /* 809785D8-809785E4 0001C8 000C+00 0/1 0/0 0/0 .rodata @4761 */ @@ -1598,7 +1608,7 @@ COMPILER_STRIP_GATE(809785D0, &lit_4760); SECTION_RODATA static u8 const lit_4761[12] = { 0x00, 0x0B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(809785D8, &lit_4761); +COMPILER_STRIP_GATE(0x809785D8, &lit_4761); #pragma pop /* 809785E4-809785F0 0001D4 000C+00 0/1 0/0 0/0 .rodata @4762 */ @@ -1607,7 +1617,7 @@ COMPILER_STRIP_GATE(809785D8, &lit_4761); SECTION_RODATA static u8 const lit_4762[12] = { 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809785E4, &lit_4762); +COMPILER_STRIP_GATE(0x809785E4, &lit_4762); #pragma pop /* 809785F0-809785F8 0001E0 0008+00 0/1 0/0 0/0 .rodata @4763 */ @@ -1616,7 +1626,7 @@ COMPILER_STRIP_GATE(809785E4, &lit_4762); SECTION_RODATA static u8 const lit_4763[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809785F0, &lit_4763); +COMPILER_STRIP_GATE(0x809785F0, &lit_4763); #pragma pop /* 809785F8-80978604 0001E8 000C+00 0/1 0/0 0/0 .rodata @4764 */ @@ -1625,7 +1635,7 @@ COMPILER_STRIP_GATE(809785F0, &lit_4763); SECTION_RODATA static u8 const lit_4764[12] = { 0x00, 0x0D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(809785F8, &lit_4764); +COMPILER_STRIP_GATE(0x809785F8, &lit_4764); #pragma pop /* 80978604-80978610 0001F4 000C+00 0/1 0/0 0/0 .rodata @4765 */ @@ -1634,7 +1644,7 @@ COMPILER_STRIP_GATE(809785F8, &lit_4764); SECTION_RODATA static u8 const lit_4765[12] = { 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80978604, &lit_4765); +COMPILER_STRIP_GATE(0x80978604, &lit_4765); #pragma pop /* 80978610-80978618 000200 0008+00 0/1 0/0 0/0 .rodata @4766 */ @@ -1643,7 +1653,7 @@ COMPILER_STRIP_GATE(80978604, &lit_4765); SECTION_RODATA static u8 const lit_4766[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80978610, &lit_4766); +COMPILER_STRIP_GATE(0x80978610, &lit_4766); #pragma pop /* 80978618-80978624 000208 000C+00 0/1 0/0 0/0 .rodata @4767 */ @@ -1652,7 +1662,7 @@ COMPILER_STRIP_GATE(80978610, &lit_4766); SECTION_RODATA static u8 const lit_4767[12] = { 0x00, 0x13, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80978618, &lit_4767); +COMPILER_STRIP_GATE(0x80978618, &lit_4767); #pragma pop /* 80978624-80978630 000214 000C+00 0/1 0/0 0/0 .rodata @4768 */ @@ -1661,7 +1671,7 @@ COMPILER_STRIP_GATE(80978618, &lit_4767); SECTION_RODATA static u8 const lit_4768[12] = { 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80978624, &lit_4768); +COMPILER_STRIP_GATE(0x80978624, &lit_4768); #pragma pop /* 80978630-80978638 000220 0008+00 0/1 0/0 0/0 .rodata @4769 */ @@ -1670,7 +1680,7 @@ COMPILER_STRIP_GATE(80978624, &lit_4768); SECTION_RODATA static u8 const lit_4769[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80978630, &lit_4769); +COMPILER_STRIP_GATE(0x80978630, &lit_4769); #pragma pop /* 80978638-80978644 000228 000C+00 0/1 0/0 0/0 .rodata @4770 */ @@ -1679,7 +1689,7 @@ COMPILER_STRIP_GATE(80978630, &lit_4769); SECTION_RODATA static u8 const lit_4770[12] = { 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80978638, &lit_4770); +COMPILER_STRIP_GATE(0x80978638, &lit_4770); #pragma pop /* 80978644-80978648 000234 0004+00 0/1 0/0 0/0 .rodata @4771 */ @@ -1691,7 +1701,7 @@ SECTION_RODATA static u8 const lit_4771[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80978644, &lit_4771); +COMPILER_STRIP_GATE(0x80978644, &lit_4771); #pragma pop /* 80978648-80978654 000238 000C+00 0/1 0/0 0/0 .rodata @4772 */ @@ -1700,7 +1710,7 @@ COMPILER_STRIP_GATE(80978644, &lit_4771); SECTION_RODATA static u8 const lit_4772[12] = { 0x00, 0x15, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80978648, &lit_4772); +COMPILER_STRIP_GATE(0x80978648, &lit_4772); #pragma pop /* 80978654-80978660 000244 000C+00 0/1 0/0 0/0 .rodata @4773 */ @@ -1709,7 +1719,7 @@ COMPILER_STRIP_GATE(80978648, &lit_4772); SECTION_RODATA static u8 const lit_4773[12] = { 0x00, 0x16, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80978654, &lit_4773); +COMPILER_STRIP_GATE(0x80978654, &lit_4773); #pragma pop /* 80978660-80978668 000250 0008+00 0/1 0/0 0/0 .rodata @4774 */ @@ -1718,7 +1728,7 @@ COMPILER_STRIP_GATE(80978654, &lit_4773); SECTION_RODATA static u8 const lit_4774[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80978660, &lit_4774); +COMPILER_STRIP_GATE(0x80978660, &lit_4774); #pragma pop /* 80978668-80978674 000258 000C+00 0/1 0/0 0/0 .rodata @4775 */ @@ -1727,7 +1737,7 @@ COMPILER_STRIP_GATE(80978660, &lit_4774); SECTION_RODATA static u8 const lit_4775[12] = { 0x00, 0x16, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80978668, &lit_4775); +COMPILER_STRIP_GATE(0x80978668, &lit_4775); #pragma pop /* 80978674-80978678 000264 0004+00 0/1 0/0 0/0 .rodata @4776 */ @@ -1739,7 +1749,7 @@ SECTION_RODATA static u8 const lit_4776[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80978674, &lit_4776); +COMPILER_STRIP_GATE(0x80978674, &lit_4776); #pragma pop /* 80978678-80978684 000268 000C+00 0/1 0/0 0/0 .rodata @4777 */ @@ -1748,7 +1758,7 @@ COMPILER_STRIP_GATE(80978674, &lit_4776); SECTION_RODATA static u8 const lit_4777[12] = { 0x00, 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80978678, &lit_4777); +COMPILER_STRIP_GATE(0x80978678, &lit_4777); #pragma pop /* 80978684-80978688 000274 0004+00 0/1 0/0 0/0 .rodata @4778 */ @@ -1760,7 +1770,7 @@ SECTION_RODATA static u8 const lit_4778[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80978684, &lit_4778); +COMPILER_STRIP_GATE(0x80978684, &lit_4778); #pragma pop /* 80978688-80978694 000278 000C+00 0/1 0/0 0/0 .rodata @4779 */ @@ -1769,7 +1779,7 @@ COMPILER_STRIP_GATE(80978684, &lit_4778); SECTION_RODATA static u8 const lit_4779[12] = { 0x00, 0x0C, 0x00, 0x00, 0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80978688, &lit_4779); +COMPILER_STRIP_GATE(0x80978688, &lit_4779); #pragma pop /* 80978694-80978698 000284 0004+00 0/1 0/0 0/0 .rodata @4780 */ @@ -1781,7 +1791,7 @@ SECTION_RODATA static u8 const lit_4780[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80978694, &lit_4780); +COMPILER_STRIP_GATE(0x80978694, &lit_4780); #pragma pop /* 80978698-809786E8 000288 0050+00 0/0 0/0 0/0 .rodata @4781 */ @@ -1794,7 +1804,7 @@ SECTION_RODATA static u8 const lit_4781[80] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80978698, &lit_4781); +COMPILER_STRIP_GATE(0x80978698, &lit_4781); #pragma pop /* 809786E8-809786F4 0002D8 000C+00 0/1 0/0 0/0 .rodata @4795 */ @@ -1803,25 +1813,25 @@ COMPILER_STRIP_GATE(80978698, &lit_4781); SECTION_RODATA static u8 const lit_4795[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809786E8, &lit_4795); +COMPILER_STRIP_GATE(0x809786E8, &lit_4795); #pragma pop /* 809786F4-809786F8 0002E4 0004+00 3/8 0/0 0/0 .rodata @4984 */ SECTION_RODATA static f32 const lit_4984 = -1.0f; -COMPILER_STRIP_GATE(809786F4, &lit_4984); +COMPILER_STRIP_GATE(0x809786F4, &lit_4984); /* 809786F8-809786FC 0002E8 0004+00 0/3 0/0 0/0 .rodata @4985 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4985 = 0x3BB40000; -COMPILER_STRIP_GATE(809786F8, &lit_4985); +COMPILER_STRIP_GATE(0x809786F8, &lit_4985); #pragma pop /* 809786FC-80978700 0002EC 0004+00 0/3 0/0 0/0 .rodata @4986 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4986 = 15.0f; -COMPILER_STRIP_GATE(809786FC, &lit_4986); +COMPILER_STRIP_GATE(0x809786FC, &lit_4986); #pragma pop /* 80978700-80978708 0002F0 0008+00 0/3 0/0 0/0 .rodata @4988 */ @@ -1830,7 +1840,7 @@ COMPILER_STRIP_GATE(809786FC, &lit_4986); SECTION_RODATA static u8 const lit_4988[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80978700, &lit_4988); +COMPILER_STRIP_GATE(0x80978700, &lit_4988); #pragma pop /* 80974A28-809750BC 0015C8 0694+00 6/0 0/0 0/0 .text wait__11daNpcBouS_cFPv */ @@ -1991,14 +2001,14 @@ asm void daNpcBouS_c::demo(void* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5270 = 1.0f / 20.0f; -COMPILER_STRIP_GATE(80978708, &lit_5270); +COMPILER_STRIP_GATE(0x80978708, &lit_5270); #pragma pop /* 8097870C-80978710 0002FC 0004+00 0/1 0/0 0/0 .rodata @5271 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5271 = -1.0f / 20.0f; -COMPILER_STRIP_GATE(8097870C, &lit_5271); +COMPILER_STRIP_GATE(0x8097870C, &lit_5271); #pragma pop /* 80975930-80975ED8 0024D0 05A8+00 2/0 0/0 0/0 .text instruction__11daNpcBouS_cFPv */ @@ -2011,6 +2021,13 @@ asm void daNpcBouS_c::instruction(void* param_0) { } #pragma pop +/* ############################################################################################## */ +/* 80978758-80978758 000348 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80978799 = "R_SP01"; +#pragma pop + /* 80975ED8-80975FDC 002A78 0104+00 1/1 0/0 0/0 .text checkIntroDemoStart__11daNpcBouS_cFv */ #pragma push #pragma optimization_level 0 @@ -2046,14 +2063,20 @@ asm void daNpcBouS_c::EvCut_BousIntroSumo2(int param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5465 = 6.0f / 5.0f; -COMPILER_STRIP_GATE(80978710, &lit_5465); +COMPILER_STRIP_GATE(0x80978710, &lit_5465); #pragma pop /* 80978714-80978718 000304 0004+00 0/1 0/0 0/0 .rodata @5466 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5466 = 2.5f; -COMPILER_STRIP_GATE(80978714, &lit_5466); +COMPILER_STRIP_GATE(0x80978714, &lit_5466); +#pragma pop + +/* 80978758-80978758 000348 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_809787A0 = "pos"; #pragma pop /* 80976654-80976B48 0031F4 04F4+00 1/0 0/0 0/0 .text EvCut_BousIntroSumo3__11daNpcBouS_cFi */ @@ -2154,7 +2177,7 @@ asm void daNpcBouS_c::playMotion() { /* ############################################################################################## */ /* 80978718-8097871C 000308 0004+00 1/1 0/0 0/0 .rodata @5583 */ SECTION_RODATA static f32 const lit_5583 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(80978718, &lit_5583); +COMPILER_STRIP_GATE(0x80978718, &lit_5583); /* 80977368-80977444 003F08 00DC+00 1/0 0/0 0/0 .text ctrlBtk__11daNpcBouS_cFv */ #pragma push @@ -2171,21 +2194,21 @@ asm void daNpcBouS_c::ctrlBtk() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5691 = -10.0f; -COMPILER_STRIP_GATE(8097871C, &lit_5691); +COMPILER_STRIP_GATE(0x8097871C, &lit_5691); #pragma pop /* 80978720-80978724 000310 0004+00 0/1 0/0 0/0 .rodata @5692 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5692 = 10.0f; -COMPILER_STRIP_GATE(80978720, &lit_5692); +COMPILER_STRIP_GATE(0x80978720, &lit_5692); #pragma pop /* 80978724-80978728 000314 0004+00 0/1 0/0 0/0 .rodata @5693 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5693 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(80978724, &lit_5693); +COMPILER_STRIP_GATE(0x80978724, &lit_5693); #pragma pop /* 80978728-80978730 000318 0004+04 0/1 0/0 0/0 .rodata @5694 */ @@ -2196,7 +2219,7 @@ SECTION_RODATA static f32 const lit_5694[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80978728, &lit_5694); +COMPILER_STRIP_GATE(0x80978728, &lit_5694); #pragma pop /* 80978730-80978738 000320 0008+00 0/1 0/0 0/0 .rodata @5695 */ @@ -2205,7 +2228,7 @@ COMPILER_STRIP_GATE(80978728, &lit_5694); SECTION_RODATA static u8 const lit_5695[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80978730, &lit_5695); +COMPILER_STRIP_GATE(0x80978730, &lit_5695); #pragma pop /* 80978738-80978740 000328 0008+00 0/1 0/0 0/0 .rodata @5696 */ @@ -2214,7 +2237,7 @@ COMPILER_STRIP_GATE(80978730, &lit_5695); SECTION_RODATA static u8 const lit_5696[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80978738, &lit_5696); +COMPILER_STRIP_GATE(0x80978738, &lit_5696); #pragma pop /* 80978740-80978748 000330 0008+00 0/1 0/0 0/0 .rodata @5697 */ @@ -2223,7 +2246,7 @@ COMPILER_STRIP_GATE(80978738, &lit_5696); SECTION_RODATA static u8 const lit_5697[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80978740, &lit_5697); +COMPILER_STRIP_GATE(0x80978740, &lit_5697); #pragma pop /* 80978BD0-80978BDC 000060 000C+00 0/1 0/0 0/0 .bss @4035 */ @@ -2434,21 +2457,21 @@ asm void daNpcBouS_c::setAttnPos() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5740 = -80.0f; -COMPILER_STRIP_GATE(80978748, &lit_5740); +COMPILER_STRIP_GATE(0x80978748, &lit_5740); #pragma pop /* 8097874C-80978750 00033C 0004+00 0/1 0/0 0/0 .rodata @5741 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5741 = 80.0f; -COMPILER_STRIP_GATE(8097874C, &lit_5741); +COMPILER_STRIP_GATE(0x8097874C, &lit_5741); #pragma pop /* 80978750-80978754 000340 0004+00 0/1 0/0 0/0 .rodata @5742 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5742 = 40.0f; -COMPILER_STRIP_GATE(80978750, &lit_5742); +COMPILER_STRIP_GATE(0x80978750, &lit_5742); #pragma pop /* 809778D8-80977AB8 004478 01E0+00 1/1 0/0 0/0 .text lookat__11daNpcBouS_cFv */ @@ -2475,7 +2498,7 @@ void daNpcBouS_c::drawOtherMdls() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80977AC4(s16 param_0) /* const */ { +extern "C" asm void func_80977AC4(void* _this, s16 param_0) /* const */ { nofralloc #include "asm/rel/d/a/npc/d_a_npc_bouS/d_a_npc_bouS/func_80977AC4.s" } @@ -2484,7 +2507,7 @@ extern "C" asm void func_80977AC4(s16 param_0) /* const */ { /* ############################################################################################## */ /* 80978754-80978758 000344 0004+00 1/1 0/0 0/0 .rodata @5753 */ SECTION_RODATA static f32 const lit_5753 = 1000000000.0f; -COMPILER_STRIP_GATE(80978754, &lit_5753); +COMPILER_STRIP_GATE(0x80978754, &lit_5753); /* 80978B64-80978B70 0003C0 000C+00 2/2 0/0 0/0 .data __vt__17daNpcBouS_Param_c */ SECTION_DATA extern void* __vt__17daNpcBouS_Param_c[3] = { @@ -2505,7 +2528,7 @@ asm void __sinit_d_a_npc_bouS_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80977AD0 = (void*)__sinit_d_a_npc_bouS_cpp; +REGISTER_CTORS(0x80977AD0, __sinit_d_a_npc_bouS_cpp); #pragma pop /* 80977BC0-80977C08 004760 0048+00 5/4 0/0 0/0 .text __dt__18daNpcF_ActorMngr_cFv */ @@ -2679,16 +2702,4 @@ static asm void func_809783F4() { } #pragma pop -/* 80978758-809787A4 000348 004C+00 8/5 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80978758 = "Bou"; -SECTION_DEAD static char const* const stringBase_8097875C = "Bou4"; -SECTION_DEAD static char const* const stringBase_80978761 = "BOUS_INTRO_SUMO1"; -SECTION_DEAD static char const* const stringBase_80978772 = "BOUS_INTRO_SUMO2"; -SECTION_DEAD static char const* const stringBase_80978783 = "BOUS_INTRO_SUMO3"; -SECTION_DEAD static char const* const stringBase_80978794 = "BouS"; -SECTION_DEAD static char const* const stringBase_80978799 = "R_SP01"; -SECTION_DEAD static char const* const stringBase_809787A0 = "pos"; -#pragma pop +/* 80978758-80978758 000348 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/npc/d_a_npc_cdn3/d_a_npc_cdn3.cpp b/rel/d/a/npc/d_a_npc_cdn3/d_a_npc_cdn3.cpp index 76515503dbd..a21bc3b347f 100644 --- a/rel/d/a/npc/d_a_npc_cdn3/d_a_npc_cdn3.cpp +++ b/rel/d/a/npc/d_a_npc_cdn3/d_a_npc_cdn3.cpp @@ -163,10 +163,10 @@ struct daNpcCdn3_c { static u8 m_seq43_funcTbl[36]; }; -struct J3DAnmTransformKey {}; - struct J3DModel {}; +struct J3DAnmTransformKey {}; + struct daNpcCd2_c { /* 80157D00 */ void NpcCreate(int); /* 80157F28 */ void ObjCreate(int); @@ -1013,7 +1013,7 @@ SECTION_RODATA static u8 const lit_4037[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(8097F540, &lit_4037); +COMPILER_STRIP_GATE(0x8097F540, &lit_4037); /* 8097F848-8097F8F8 -00001 00B0+00 5/5 0/0 0/0 .data m_funcTbl__11daNpcCdn3_c */ SECTION_DATA void* daNpcCdn3_c::m_funcTbl[44] = { @@ -2564,7 +2564,7 @@ asm void daNpcCdn3_c::executeWait() { /* ############################################################################################## */ /* 8097F544-8097F548 000004 0004+00 36/46 0/0 0/0 .rodata @4091 */ SECTION_RODATA static f32 const lit_4091 = 1.0f; -COMPILER_STRIP_GATE(8097F544, &lit_4091); +COMPILER_STRIP_GATE(0x8097F544, &lit_4091); /* 8097F548-8097F550 000008 0004+04 34/42 0/0 0/0 .rodata @4092 */ SECTION_RODATA static f32 const lit_4092[1 + 1 /* padding */] = { @@ -2572,7 +2572,7 @@ SECTION_RODATA static f32 const lit_4092[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(8097F548, &lit_4092); +COMPILER_STRIP_GATE(0x8097F548, &lit_4092); /* 80979080-80979144 000420 00C4+00 1/0 0/0 0/0 .text initPath__11daNpcCdn3_cFv */ #pragma push @@ -2591,7 +2591,7 @@ asm void daNpcCdn3_c::initPath() { SECTION_RODATA static u8 const lit_4280[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8097F550, &lit_4280); +COMPILER_STRIP_GATE(0x8097F550, &lit_4280); #pragma pop /* 8097F558-8097F560 000018 0008+00 0/2 0/0 0/0 .rodata @4281 */ @@ -2600,7 +2600,7 @@ COMPILER_STRIP_GATE(8097F550, &lit_4280); SECTION_RODATA static u8 const lit_4281[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8097F558, &lit_4281); +COMPILER_STRIP_GATE(0x8097F558, &lit_4281); #pragma pop /* 8097F560-8097F568 000020 0008+00 0/2 0/0 0/0 .rodata @4282 */ @@ -2609,14 +2609,21 @@ COMPILER_STRIP_GATE(8097F558, &lit_4281); SECTION_RODATA static u8 const lit_4282[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8097F560, &lit_4282); +COMPILER_STRIP_GATE(0x8097F560, &lit_4282); #pragma pop /* 8097F568-8097F56C 000028 0004+00 0/2 0/0 0/0 .rodata @4283 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4283 = 2.0f; -COMPILER_STRIP_GATE(8097F568, &lit_4283); +COMPILER_STRIP_GATE(0x8097F568, &lit_4283); +#pragma pop + +/* 8097F5AC-8097F5AC 00006C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8097F5AC = + "城下町の町人 パス点引数設定値異常 引数1モーションシーケンス=%dが異常です。\n"; #pragma pop /* 80980618-80980638 -00001 0020+00 1/1 0/0 0/0 .data @5488 */ @@ -2863,42 +2870,42 @@ asm void daNpcCdn3_c::executeFear2() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4583 = -40.0f; -COMPILER_STRIP_GATE(8097F56C, &lit_4583); +COMPILER_STRIP_GATE(0x8097F56C, &lit_4583); #pragma pop /* 8097F570-8097F574 000030 0004+00 0/2 0/0 0/0 .rodata @4584 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4584 = -10.0f; -COMPILER_STRIP_GATE(8097F570, &lit_4584); +COMPILER_STRIP_GATE(0x8097F570, &lit_4584); #pragma pop /* 8097F574-8097F578 000034 0004+00 0/1 0/0 0/0 .rodata @4585 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4585 = -80.0f; -COMPILER_STRIP_GATE(8097F574, &lit_4585); +COMPILER_STRIP_GATE(0x8097F574, &lit_4585); #pragma pop /* 8097F578-8097F57C 000038 0004+00 0/2 0/0 0/0 .rodata @4586 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4586 = 40.0f; -COMPILER_STRIP_GATE(8097F578, &lit_4586); +COMPILER_STRIP_GATE(0x8097F578, &lit_4586); #pragma pop /* 8097F57C-8097F580 00003C 0004+00 0/2 0/0 0/0 .rodata @4587 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4587 = 190.0f; -COMPILER_STRIP_GATE(8097F57C, &lit_4587); +COMPILER_STRIP_GATE(0x8097F57C, &lit_4587); #pragma pop /* 8097F580-8097F584 000040 0004+00 0/1 0/0 0/0 .rodata @4588 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4588 = 200.0f; -COMPILER_STRIP_GATE(8097F580, &lit_4588); +COMPILER_STRIP_GATE(0x8097F580, &lit_4588); #pragma pop /* 8097A724-8097A7E0 001AC4 00BC+00 1/0 0/0 0/0 .text initFight__11daNpcCdn3_cFv */ @@ -2956,42 +2963,42 @@ asm void daNpcCdn3_c::setAngle() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4752 = 4.0f / 5.0f; -COMPILER_STRIP_GATE(8097F584, &lit_4752); +COMPILER_STRIP_GATE(0x8097F584, &lit_4752); #pragma pop /* 8097F588-8097F58C 000048 0004+00 0/1 0/0 0/0 .rodata @4753 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4753 = 1.0f / 20.0f; -COMPILER_STRIP_GATE(8097F588, &lit_4753); +COMPILER_STRIP_GATE(0x8097F588, &lit_4753); #pragma pop /* 8097F58C-8097F590 00004C 0004+00 0/1 0/0 0/0 .rodata @4754 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4754 = 7.0f / 10.0f; -COMPILER_STRIP_GATE(8097F58C, &lit_4754); +COMPILER_STRIP_GATE(0x8097F58C, &lit_4754); #pragma pop /* 8097F590-8097F594 000050 0004+00 0/1 0/0 0/0 .rodata @4755 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4755 = 1.5f; -COMPILER_STRIP_GATE(8097F590, &lit_4755); +COMPILER_STRIP_GATE(0x8097F590, &lit_4755); #pragma pop /* 8097F594-8097F598 000054 0004+00 0/1 0/0 0/0 .rodata @4756 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4756 = 6.0f / 5.0f; -COMPILER_STRIP_GATE(8097F594, &lit_4756); +COMPILER_STRIP_GATE(0x8097F594, &lit_4756); #pragma pop /* 8097F598-8097F59C 000058 0004+00 0/1 0/0 0/0 .rodata @4757 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4757 = 3.0f / 5.0f; -COMPILER_STRIP_GATE(8097F598, &lit_4757); +COMPILER_STRIP_GATE(0x8097F598, &lit_4757); #pragma pop /* 8097ABE8-8097AF14 001F88 032C+00 2/2 0/0 0/0 .text pathMoveF__11daNpcCdn3_cFv */ @@ -3066,6 +3073,14 @@ asm void daNpcCdn3_c::checkSchedule() { } #pragma pop +/* ############################################################################################## */ +/* 8097F5AC-8097F5AC 00006C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8097F5F8 = + "城下町の町人 スケジュールタグ設定値異常 引数1モーションシーケンス=%dが異常です。\n"; +#pragma pop + /* 8097B38C-8097B5A8 00272C 021C+00 3/3 0/0 0/0 .text * setSchedule__11daNpcCdn3_cFP15daTagSchedule_c */ #pragma push @@ -3077,6 +3092,13 @@ asm void daNpcCdn3_c::setSchedule(daTagSchedule_c* param_0) { } #pragma pop +/* ############################################################################################## */ +/* 8097F5AC-8097F5AC 00006C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8097F64A = "R_SP160"; +#pragma pop + /* 8097B5A8-8097B60C 002948 0064+00 2/2 0/0 0/0 .text isInShop__11daNpcCdn3_cFv */ #pragma push #pragma optimization_level 0 @@ -3437,6 +3459,14 @@ static asm void daNpcCdn3_Create(void* param_0) { } #pragma pop +/* ############################################################################################## */ +/* 8097F5AC-8097F5AC 00006C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8097F652 = + "城下町の町人 マップツール設定値異常 引数1モーションシーケンス=%dが異常です。\n"; +#pragma pop + /* 8097C910-8097CC58 003CB0 0348+00 3/1 0/0 0/0 .text create__11daNpcCdn3_cFv */ #pragma push #pragma optimization_level 0 @@ -3452,7 +3482,13 @@ asm void daNpcCdn3_c::create() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5585 = -3.0f; -COMPILER_STRIP_GATE(8097F59C, &lit_5585); +COMPILER_STRIP_GATE(0x8097F59C, &lit_5585); +#pragma pop + +/* 8097F5AC-8097F5AC 00006C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8097F6A0 = "F_SP116"; #pragma pop /* 8097CC58-8097D078 003FF8 0420+00 1/1 0/0 0/0 .text create_init__11daNpcCdn3_cFv */ @@ -3528,11 +3564,11 @@ static asm void daNpcCdn3_Execute(void* param_0) { /* ############################################################################################## */ /* 8097F5A0-8097F5A4 000060 0004+00 1/1 0/0 0/0 .rodata @5944 */ SECTION_RODATA static f32 const lit_5944 = 2.0f / 5.0f; -COMPILER_STRIP_GATE(8097F5A0, &lit_5944); +COMPILER_STRIP_GATE(0x8097F5A0, &lit_5944); /* 8097F5A4-8097F5A8 000064 0004+00 1/1 0/0 0/0 .rodata @5945 */ SECTION_RODATA static f32 const lit_5945 = 25.0f; -COMPILER_STRIP_GATE(8097F5A4, &lit_5945); +COMPILER_STRIP_GATE(0x8097F5A4, &lit_5945); /* 8097D748-8097DABC 004AE8 0374+00 1/1 0/0 0/0 .text execute__11daNpcCdn3_cFv */ #pragma push @@ -3558,7 +3594,7 @@ asm void daNpcCdn3_c::checkTimeSchedule() { /* ############################################################################################## */ /* 8097F5A8-8097F5AC 000068 0004+00 1/1 0/0 0/0 .rodata @6103 */ SECTION_RODATA static f32 const lit_6103 = 60.0f; -COMPILER_STRIP_GATE(8097F5A8, &lit_6103); +COMPILER_STRIP_GATE(0x8097F5A8, &lit_6103); /* 8097DEF4-8097E000 005294 010C+00 1/0 0/0 0/0 .text daNpcCdn3_Draw__FPv */ #pragma push @@ -3597,7 +3633,7 @@ asm void __sinit_d_a_npc_cdn3_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_8097E050 = (void*)__sinit_d_a_npc_cdn3_cpp; +REGISTER_CTORS(0x8097E050, __sinit_d_a_npc_cdn3_cpp); #pragma pop /* 8097EFD8-8097EFE0 006378 0008+00 1/0 0/0 0/0 .text @36@__dt__12dBgS_ObjAcchFv */ @@ -3700,16 +3736,4 @@ asm dBgS_ObjAcch::~dBgS_ObjAcch() { } #pragma pop -/* 8097F5AC-8097F6A8 00006C 00FC+00 6/6 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_8097F5AC = - "城下町の町人 パス点引数設定値異常 引数1モーションシーケンス=%dが異常です。\n"; -SECTION_DEAD static char const* const stringBase_8097F5F8 = - "城下町の町人 スケジュールタグ設定値異常 引数1モーションシーケンス=%dが異常です。\n"; -SECTION_DEAD static char const* const stringBase_8097F64A = "R_SP160"; -SECTION_DEAD static char const* const stringBase_8097F652 = - "城下町の町人 マップツール設定値異常 引数1モーションシーケンス=%dが異常です。\n"; -SECTION_DEAD static char const* const stringBase_8097F6A0 = "F_SP116"; -#pragma pop +/* 8097F5AC-8097F5AC 00006C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/npc/d_a_npc_chat/d_a_npc_chat.cpp b/rel/d/a/npc/d_a_npc_chat/d_a_npc_chat.cpp index 40661288678..c66a4cc7ac8 100644 --- a/rel/d/a/npc/d_a_npc_chat/d_a_npc_chat.cpp +++ b/rel/d/a/npc/d_a_npc_chat/d_a_npc_chat.cpp @@ -38,12 +38,12 @@ struct mDoExt_morf_c { /* 8000FB7C */ void setMorf(f32); }; +struct J3DAnmTextureSRTKey {}; + struct J3DAnmTexPattern {}; struct J3DAnmTevRegKey {}; -struct J3DAnmTextureSRTKey {}; - struct J3DMaterialTable { /* 8032F6F8 */ void removeTexNoAnimator(J3DAnmTexPattern*); /* 8032F7B4 */ void removeTexMtxAnimator(J3DAnmTextureSRTKey*); @@ -62,16 +62,16 @@ struct mDoExt_brkAnm { /* 8000D7A8 */ void entry(J3DMaterialTable*, f32); }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; - struct J3DAnmTransform {}; +struct J3DModelData {}; + +struct Z2Creature {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -576,6 +576,204 @@ extern "C" void __register_global_object(); // /* ############################################################################################## */ +/* 80987740-80987746 000DA4 0006+00 2/1 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80987740; + +/* 80987746-8098774F 000DAA 0009+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80987746; + +/* 8098774F-80987758 000DB3 0009+00 17/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_8098774F; + +/* 80987758-80987761 000DBC 0009+00 17/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80987758; + +/* 80987761-80987768 000DC5 0007+00 31/1 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80987761; + +/* 80987768-80987771 000DCC 0009+00 31/1 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80987768; + +/* 80987771-80987777 000DD5 0006+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80987771; + +/* 80987777-80987780 000DDB 0009+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80987777; + +/* 80987780-80987786 000DE4 0006+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80987780; + +/* 80987786-8098778F 000DEA 0009+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80987786; + +/* 8098778F-80987795 000DF3 0006+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_8098778F; + +/* 80987795-8098779E 000DF9 0009+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80987795; + +/* 8098779E-809877A4 000E02 0006+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_8098779E; + +/* 809877A4-809877AD 000E08 0009+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_809877A4; + +/* 809877AD-809877B3 000E11 0006+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_809877AD; + +/* 809877B3-809877BC 000E17 0009+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_809877B3; + +/* 809877BC-809877C2 000E20 0006+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_809877BC; + +/* 809877C2-809877CB 000E26 0009+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_809877C2; + +/* 809877CB-809877D1 000E2F 0006+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_809877CB; + +/* 809877D1-809877DA 000E35 0009+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_809877D1; + +/* 809877DA-809877E1 000E3E 0007+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_809877DA; + +/* 809877E1-809877EB 000E45 000A+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_809877E1; + +/* 809877EB-809877F2 000E4F 0007+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_809877EB; + +/* 809877F2-809877FC 000E56 000A+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_809877F2; + +/* 809877FC-80987803 000E60 0007+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_809877FC; + +/* 80987803-8098780D 000E67 000A+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80987803; + +/* 8098780D-80987814 000E71 0007+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_8098780D; + +/* 80987814-8098781E 000E78 000A+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80987814; + +/* 8098781E-80987825 000E82 0007+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_8098781E; + +/* 80987825-8098782F 000E89 000A+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80987825; + +/* 8098782F-80987836 000E93 0007+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_8098782F; + +/* 80987836-80987840 000E9A 000A+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80987836; + +/* 80987840-80987847 000EA4 0007+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80987840; + +/* 80987847-80987851 000EAB 000A+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80987847; + +/* 80987851-80987858 000EB5 0007+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80987851; + +/* 80987858-80987862 000EBC 000A+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80987858; + +/* 80987862-80987868 000EC6 0006+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80987862; + +/* 80987868-80987871 000ECC 0009+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80987868; + +/* 80987871-8098787A 000ED5 0009+00 15/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80987871; + +/* 8098787A-80987883 000EDE 0009+00 15/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_8098787A; + +/* 80987883-80987889 000EE7 0006+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80987883; + +/* 80987889-80987892 000EED 0009+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80987889; + +/* 80987892-80987898 000EF6 0006+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80987892; + +/* 80987898-809878A1 000EFC 0009+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80987898; + +/* 809878A1-809878A7 000F05 0006+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_809878A1; + +/* 809878A7-809878B0 000F0B 0009+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_809878A7; + +/* 809878B0-809878B6 000F14 0006+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_809878B0; + +/* 809878B6-809878BF 000F1A 0009+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_809878B6; + +/* 809878BF-809878C5 000F23 0006+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_809878BF; + +/* 809878C5-809878CE 000F29 0009+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_809878C5; + +/* 809878CE-809878D4 000F32 0006+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_809878CE; + +/* 809878D4-809878DD 000F38 0009+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_809878D4; + +/* 809878DD-809878E4 000F41 0007+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_809878DD; + +/* 809878E4-809878EE 000F48 000A+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_809878E4; + +/* 809878EE-809878F5 000F52 0007+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_809878EE; + +/* 809878F5-809878FF 000F59 000A+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_809878F5; + +/* 809878FF-80987906 000F63 0007+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_809878FF; + +/* 80987906-80987910 000F6A 000A+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80987906; + +/* 80987910-80987917 000F74 0007+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80987910; + +/* 80987917-80987921 000F7B 000A+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80987917; + +/* 80987921-80987928 000F85 0007+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80987921; + +/* 80987928-80987932 000F8C 000A+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80987928; + +/* 80987932-80987939 000F96 0007+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80987932; + +/* 80987939-80987943 000F9D 000A+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80987939; + +/* 80987943-8098794A 000FA7 0007+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80987943; + +/* 8098794A-80987954 000FAE 000A+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_8098794A; + /* 8098699C-809869B4 -00001 0018+00 8/7 0/0 0/0 .rodata l_resMANa */ SECTION_RODATA static void* const l_resMANa[6] = { (void*)&d_a_npc_chat__stringBase0, @@ -585,7 +783,7 @@ SECTION_RODATA static void* const l_resMANa[6] = { (void*)(((char*)&d_a_npc_chat__stringBase0) + 0x21), (void*)(((char*)&d_a_npc_chat__stringBase0) + 0x28), }; -COMPILER_STRIP_GATE(8098699C, &l_resMANa); +COMPILER_STRIP_GATE(0x8098699C, &l_resMANa); /* 809869B4-809869CC -00001 0018+00 1/1 0/0 0/0 .rodata l_resMADa */ SECTION_RODATA static void* const l_resMADa[6] = { @@ -596,7 +794,7 @@ SECTION_RODATA static void* const l_resMADa[6] = { (void*)(((char*)&d_a_npc_chat__stringBase0) + 0x21), (void*)(((char*)&d_a_npc_chat__stringBase0) + 0x28), }; -COMPILER_STRIP_GATE(809869B4, &l_resMADa); +COMPILER_STRIP_GATE(0x809869B4, &l_resMADa); /* 809869CC-809869E4 -00001 0018+00 1/1 0/0 0/0 .rodata l_resMCNa */ SECTION_RODATA static void* const l_resMCNa[6] = { @@ -607,7 +805,7 @@ SECTION_RODATA static void* const l_resMCNa[6] = { (void*)(((char*)&d_a_npc_chat__stringBase0) + 0x21), (void*)(((char*)&d_a_npc_chat__stringBase0) + 0x28), }; -COMPILER_STRIP_GATE(809869CC, &l_resMCNa); +COMPILER_STRIP_GATE(0x809869CC, &l_resMCNa); /* 809869E4-809869FC -00001 0018+00 1/1 0/0 0/0 .rodata l_resMONa */ SECTION_RODATA static void* const l_resMONa[6] = { @@ -618,7 +816,7 @@ SECTION_RODATA static void* const l_resMONa[6] = { (void*)(((char*)&d_a_npc_chat__stringBase0) + 0x21), (void*)(((char*)&d_a_npc_chat__stringBase0) + 0x28), }; -COMPILER_STRIP_GATE(809869E4, &l_resMONa); +COMPILER_STRIP_GATE(0x809869E4, &l_resMONa); /* 809869FC-80986A14 -00001 0018+00 1/1 0/0 0/0 .rodata l_resMANb */ SECTION_RODATA static void* const l_resMANb[6] = { @@ -629,7 +827,7 @@ SECTION_RODATA static void* const l_resMANb[6] = { (void*)(((char*)&d_a_npc_chat__stringBase0) + 0x21), (void*)(((char*)&d_a_npc_chat__stringBase0) + 0x28), }; -COMPILER_STRIP_GATE(809869FC, &l_resMANb); +COMPILER_STRIP_GATE(0x809869FC, &l_resMANb); /* 80986A14-80986A2C -00001 0018+00 1/1 0/0 0/0 .rodata l_resMANc */ SECTION_RODATA static void* const l_resMANc[6] = { @@ -640,7 +838,7 @@ SECTION_RODATA static void* const l_resMANc[6] = { (void*)(((char*)&d_a_npc_chat__stringBase0) + 0x21), (void*)(((char*)&d_a_npc_chat__stringBase0) + 0x28), }; -COMPILER_STRIP_GATE(80986A14, &l_resMANc); +COMPILER_STRIP_GATE(0x80986A14, &l_resMANc); /* 80986A2C-80986A44 -00001 0018+00 1/1 0/0 0/0 .rodata l_resMASa */ SECTION_RODATA static void* const l_resMASa[6] = { @@ -651,7 +849,7 @@ SECTION_RODATA static void* const l_resMASa[6] = { (void*)(((char*)&d_a_npc_chat__stringBase0) + 0x21), (void*)(((char*)&d_a_npc_chat__stringBase0) + 0x28), }; -COMPILER_STRIP_GATE(80986A2C, &l_resMASa); +COMPILER_STRIP_GATE(0x80986A2C, &l_resMASa); /* 80986A44-80986A5C -00001 0018+00 1/1 0/0 0/0 .rodata l_resMBNa */ SECTION_RODATA static void* const l_resMBNa[6] = { @@ -662,7 +860,7 @@ SECTION_RODATA static void* const l_resMBNa[6] = { (void*)(((char*)&d_a_npc_chat__stringBase0) + 0x21), (void*)(((char*)&d_a_npc_chat__stringBase0) + 0x28), }; -COMPILER_STRIP_GATE(80986A44, &l_resMBNa); +COMPILER_STRIP_GATE(0x80986A44, &l_resMBNa); /* 80986A5C-80986A74 -00001 0018+00 1/1 0/0 0/0 .rodata l_resMANa2 */ SECTION_RODATA static void* const l_resMANa2[6] = { @@ -673,7 +871,7 @@ SECTION_RODATA static void* const l_resMANa2[6] = { (void*)(((char*)&d_a_npc_chat__stringBase0) + 0x21), (void*)(((char*)&d_a_npc_chat__stringBase0) + 0x28), }; -COMPILER_STRIP_GATE(80986A5C, &l_resMANa2); +COMPILER_STRIP_GATE(0x80986A5C, &l_resMANa2); /* 80986A74-80986A8C -00001 0018+00 1/1 0/0 0/0 .rodata l_resMADa2 */ SECTION_RODATA static void* const l_resMADa2[6] = { @@ -684,7 +882,7 @@ SECTION_RODATA static void* const l_resMADa2[6] = { (void*)(((char*)&d_a_npc_chat__stringBase0) + 0x21), (void*)(((char*)&d_a_npc_chat__stringBase0) + 0x28), }; -COMPILER_STRIP_GATE(80986A74, &l_resMADa2); +COMPILER_STRIP_GATE(0x80986A74, &l_resMADa2); /* 80986A8C-80986AA4 -00001 0018+00 1/1 0/0 0/0 .rodata l_resMCNa2 */ SECTION_RODATA static void* const l_resMCNa2[6] = { @@ -695,7 +893,7 @@ SECTION_RODATA static void* const l_resMCNa2[6] = { (void*)(((char*)&d_a_npc_chat__stringBase0) + 0x21), (void*)(((char*)&d_a_npc_chat__stringBase0) + 0x28), }; -COMPILER_STRIP_GATE(80986A8C, &l_resMCNa2); +COMPILER_STRIP_GATE(0x80986A8C, &l_resMCNa2); /* 80986AA4-80986ABC -00001 0018+00 1/1 0/0 0/0 .rodata l_resMONa2 */ SECTION_RODATA static void* const l_resMONa2[6] = { @@ -706,7 +904,7 @@ SECTION_RODATA static void* const l_resMONa2[6] = { (void*)(((char*)&d_a_npc_chat__stringBase0) + 0x21), (void*)(((char*)&d_a_npc_chat__stringBase0) + 0x28), }; -COMPILER_STRIP_GATE(80986AA4, &l_resMONa2); +COMPILER_STRIP_GATE(0x80986AA4, &l_resMONa2); /* 80986ABC-80986AD4 -00001 0018+00 1/1 0/0 0/0 .rodata l_resMANb2 */ SECTION_RODATA static void* const l_resMANb2[6] = { @@ -717,7 +915,7 @@ SECTION_RODATA static void* const l_resMANb2[6] = { (void*)(((char*)&d_a_npc_chat__stringBase0) + 0x21), (void*)(((char*)&d_a_npc_chat__stringBase0) + 0x28), }; -COMPILER_STRIP_GATE(80986ABC, &l_resMANb2); +COMPILER_STRIP_GATE(0x80986ABC, &l_resMANb2); /* 80986AD4-80986AEC -00001 0018+00 1/1 0/0 0/0 .rodata l_resMANc2 */ SECTION_RODATA static void* const l_resMANc2[6] = { @@ -728,7 +926,7 @@ SECTION_RODATA static void* const l_resMANc2[6] = { (void*)(((char*)&d_a_npc_chat__stringBase0) + 0x21), (void*)(((char*)&d_a_npc_chat__stringBase0) + 0x28), }; -COMPILER_STRIP_GATE(80986AD4, &l_resMANc2); +COMPILER_STRIP_GATE(0x80986AD4, &l_resMANc2); /* 80986AEC-80986B04 -00001 0018+00 1/1 0/0 0/0 .rodata l_resMASa2 */ SECTION_RODATA static void* const l_resMASa2[6] = { @@ -739,7 +937,7 @@ SECTION_RODATA static void* const l_resMASa2[6] = { (void*)(((char*)&d_a_npc_chat__stringBase0) + 0x21), (void*)(((char*)&d_a_npc_chat__stringBase0) + 0x28), }; -COMPILER_STRIP_GATE(80986AEC, &l_resMASa2); +COMPILER_STRIP_GATE(0x80986AEC, &l_resMASa2); /* 80986B04-80986B1C -00001 0018+00 1/1 0/0 0/0 .rodata l_resMBNa2 */ SECTION_RODATA static void* const l_resMBNa2[6] = { @@ -750,7 +948,7 @@ SECTION_RODATA static void* const l_resMBNa2[6] = { (void*)(((char*)&d_a_npc_chat__stringBase0) + 0x21), (void*)(((char*)&d_a_npc_chat__stringBase0) + 0x28), }; -COMPILER_STRIP_GATE(80986B04, &l_resMBNa2); +COMPILER_STRIP_GATE(0x80986B04, &l_resMBNa2); /* 80986B1C-80986B34 -00001 0018+00 1/1 0/0 0/0 .rodata l_resWANa */ SECTION_RODATA static void* const l_resWANa[6] = { @@ -761,7 +959,7 @@ SECTION_RODATA static void* const l_resWANa[6] = { (void*)(((char*)&d_a_npc_chat__stringBase0) + 0x21), (void*)(((char*)&d_a_npc_chat__stringBase0) + 0x28), }; -COMPILER_STRIP_GATE(80986B1C, &l_resWANa); +COMPILER_STRIP_GATE(0x80986B1C, &l_resWANa); /* 80986B34-80986B4C -00001 0018+00 1/1 0/0 0/0 .rodata l_resWADa */ SECTION_RODATA static void* const l_resWADa[6] = { @@ -772,7 +970,7 @@ SECTION_RODATA static void* const l_resWADa[6] = { (void*)(((char*)&d_a_npc_chat__stringBase0) + 0x21), (void*)(((char*)&d_a_npc_chat__stringBase0) + 0x28), }; -COMPILER_STRIP_GATE(80986B34, &l_resWADa); +COMPILER_STRIP_GATE(0x80986B34, &l_resWADa); /* 80986B4C-80986B64 -00001 0018+00 1/1 0/0 0/0 .rodata l_resMATa */ SECTION_RODATA static void* const l_resMATa[6] = { @@ -783,7 +981,7 @@ SECTION_RODATA static void* const l_resMATa[6] = { (void*)(((char*)&d_a_npc_chat__stringBase0) + 0x21), (void*)(((char*)&d_a_npc_chat__stringBase0) + 0x28), }; -COMPILER_STRIP_GATE(80986B4C, &l_resMATa); +COMPILER_STRIP_GATE(0x80986B4C, &l_resMATa); /* 80986B64-80986B7C -00001 0018+00 1/1 0/0 0/0 .rodata l_resWCNa */ SECTION_RODATA static void* const l_resWCNa[6] = { @@ -794,7 +992,7 @@ SECTION_RODATA static void* const l_resWCNa[6] = { (void*)(((char*)&d_a_npc_chat__stringBase0) + 0x21), (void*)(((char*)&d_a_npc_chat__stringBase0) + 0x28), }; -COMPILER_STRIP_GATE(80986B64, &l_resWCNa); +COMPILER_STRIP_GATE(0x80986B64, &l_resWCNa); /* 80986B7C-80986B94 -00001 0018+00 1/1 0/0 0/0 .rodata l_resWONa */ SECTION_RODATA static void* const l_resWONa[6] = { @@ -805,7 +1003,7 @@ SECTION_RODATA static void* const l_resWONa[6] = { (void*)(((char*)&d_a_npc_chat__stringBase0) + 0x21), (void*)(((char*)&d_a_npc_chat__stringBase0) + 0x28), }; -COMPILER_STRIP_GATE(80986B7C, &l_resWONa); +COMPILER_STRIP_GATE(0x80986B7C, &l_resWONa); /* 80986B94-80986BAC -00001 0018+00 1/1 0/0 0/0 .rodata l_resWGNa */ SECTION_RODATA static void* const l_resWGNa[6] = { @@ -816,7 +1014,7 @@ SECTION_RODATA static void* const l_resWGNa[6] = { (void*)(((char*)&d_a_npc_chat__stringBase0) + 0x21), (void*)(((char*)&d_a_npc_chat__stringBase0) + 0x28), }; -COMPILER_STRIP_GATE(80986B94, &l_resWGNa); +COMPILER_STRIP_GATE(0x80986B94, &l_resWGNa); /* 80986BAC-80986BC4 -00001 0018+00 1/1 0/0 0/0 .rodata l_resWANb */ SECTION_RODATA static void* const l_resWANb[6] = { @@ -827,7 +1025,7 @@ SECTION_RODATA static void* const l_resWANb[6] = { (void*)(((char*)&d_a_npc_chat__stringBase0) + 0x21), (void*)(((char*)&d_a_npc_chat__stringBase0) + 0x28), }; -COMPILER_STRIP_GATE(80986BAC, &l_resWANb); +COMPILER_STRIP_GATE(0x80986BAC, &l_resWANb); /* 80986BC4-80986BDC -00001 0018+00 1/1 0/0 0/0 .rodata l_resWANa2 */ SECTION_RODATA static void* const l_resWANa2[6] = { @@ -838,7 +1036,7 @@ SECTION_RODATA static void* const l_resWANa2[6] = { (void*)(((char*)&d_a_npc_chat__stringBase0) + 0x21), (void*)(((char*)&d_a_npc_chat__stringBase0) + 0x28), }; -COMPILER_STRIP_GATE(80986BC4, &l_resWANa2); +COMPILER_STRIP_GATE(0x80986BC4, &l_resWANa2); /* 80986BDC-80986BF4 -00001 0018+00 1/1 0/0 0/0 .rodata l_resWADa2 */ SECTION_RODATA static void* const l_resWADa2[6] = { @@ -849,7 +1047,7 @@ SECTION_RODATA static void* const l_resWADa2[6] = { (void*)(((char*)&d_a_npc_chat__stringBase0) + 0x21), (void*)(((char*)&d_a_npc_chat__stringBase0) + 0x28), }; -COMPILER_STRIP_GATE(80986BDC, &l_resWADa2); +COMPILER_STRIP_GATE(0x80986BDC, &l_resWADa2); /* 80986BF4-80986C0C -00001 0018+00 1/1 0/0 0/0 .rodata l_resMATa2 */ SECTION_RODATA static void* const l_resMATa2[6] = { @@ -860,7 +1058,7 @@ SECTION_RODATA static void* const l_resMATa2[6] = { (void*)(((char*)&d_a_npc_chat__stringBase0) + 0x21), (void*)(((char*)&d_a_npc_chat__stringBase0) + 0x28), }; -COMPILER_STRIP_GATE(80986BF4, &l_resMATa2); +COMPILER_STRIP_GATE(0x80986BF4, &l_resMATa2); /* 80986C0C-80986C24 -00001 0018+00 1/1 0/0 0/0 .rodata l_resWCNa2 */ SECTION_RODATA static void* const l_resWCNa2[6] = { @@ -871,7 +1069,7 @@ SECTION_RODATA static void* const l_resWCNa2[6] = { (void*)(((char*)&d_a_npc_chat__stringBase0) + 0x21), (void*)(((char*)&d_a_npc_chat__stringBase0) + 0x28), }; -COMPILER_STRIP_GATE(80986C0C, &l_resWCNa2); +COMPILER_STRIP_GATE(0x80986C0C, &l_resWCNa2); /* 80986C24-80986C3C -00001 0018+00 1/1 0/0 0/0 .rodata l_resWONa2 */ SECTION_RODATA static void* const l_resWONa2[6] = { @@ -882,7 +1080,7 @@ SECTION_RODATA static void* const l_resWONa2[6] = { (void*)(((char*)&d_a_npc_chat__stringBase0) + 0x21), (void*)(((char*)&d_a_npc_chat__stringBase0) + 0x28), }; -COMPILER_STRIP_GATE(80986C24, &l_resWONa2); +COMPILER_STRIP_GATE(0x80986C24, &l_resWONa2); /* 80986C3C-80986C54 -00001 0018+00 1/1 0/0 0/0 .rodata l_resWGNa2 */ SECTION_RODATA static void* const l_resWGNa2[6] = { @@ -893,7 +1091,7 @@ SECTION_RODATA static void* const l_resWGNa2[6] = { (void*)(((char*)&d_a_npc_chat__stringBase0) + 0x21), (void*)(((char*)&d_a_npc_chat__stringBase0) + 0x28), }; -COMPILER_STRIP_GATE(80986C3C, &l_resWGNa2); +COMPILER_STRIP_GATE(0x80986C3C, &l_resWGNa2); /* 80986C54-80986C6C -00001 0018+00 1/1 0/0 0/0 .rodata l_resWANb2 */ SECTION_RODATA static void* const l_resWANb2[6] = { @@ -904,7 +1102,79 @@ SECTION_RODATA static void* const l_resWANb2[6] = { (void*)(((char*)&d_a_npc_chat__stringBase0) + 0x21), (void*)(((char*)&d_a_npc_chat__stringBase0) + 0x28), }; -COMPILER_STRIP_GATE(80986C54, &l_resWANb2); +COMPILER_STRIP_GATE(0x80986C54, &l_resWANb2); + +/* 80987740-80987740 000DA4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80987740 = "MAN_a"; +SECTION_DEAD static char const* const stringBase_80987746 = "MAN_a_TW"; +SECTION_DEAD static char const* const stringBase_8098774F = "Mgeneral"; +SECTION_DEAD static char const* const stringBase_80987758 = "Mspecial"; +SECTION_DEAD static char const* const stringBase_80987761 = "object"; +SECTION_DEAD static char const* const stringBase_80987768 = "objectTW"; +SECTION_DEAD static char const* const stringBase_80987771 = "MAD_a"; +SECTION_DEAD static char const* const stringBase_80987777 = "MAD_a_TW"; +SECTION_DEAD static char const* const stringBase_80987780 = "MCN_a"; +SECTION_DEAD static char const* const stringBase_80987786 = "MCN_a_TW"; +SECTION_DEAD static char const* const stringBase_8098778F = "MON_a"; +SECTION_DEAD static char const* const stringBase_80987795 = "MON_a_TW"; +SECTION_DEAD static char const* const stringBase_8098779E = "MAN_b"; +SECTION_DEAD static char const* const stringBase_809877A4 = "MAN_b_TW"; +SECTION_DEAD static char const* const stringBase_809877AD = "MAN_c"; +SECTION_DEAD static char const* const stringBase_809877B3 = "MAN_c_TW"; +SECTION_DEAD static char const* const stringBase_809877BC = "MAS_a"; +SECTION_DEAD static char const* const stringBase_809877C2 = "MAS_a_TW"; +SECTION_DEAD static char const* const stringBase_809877CB = "MBN_a"; +SECTION_DEAD static char const* const stringBase_809877D1 = "MBN_a_TW"; +SECTION_DEAD static char const* const stringBase_809877DA = "MAN_a2"; +SECTION_DEAD static char const* const stringBase_809877E1 = "MAN_a2_TW"; +SECTION_DEAD static char const* const stringBase_809877EB = "MAD_a2"; +SECTION_DEAD static char const* const stringBase_809877F2 = "MAD_a2_TW"; +SECTION_DEAD static char const* const stringBase_809877FC = "MCN_a2"; +SECTION_DEAD static char const* const stringBase_80987803 = "MCN_a2_TW"; +SECTION_DEAD static char const* const stringBase_8098780D = "MON_a2"; +SECTION_DEAD static char const* const stringBase_80987814 = "MON_a2_TW"; +SECTION_DEAD static char const* const stringBase_8098781E = "MAN_b2"; +SECTION_DEAD static char const* const stringBase_80987825 = "MAN_b2_TW"; +SECTION_DEAD static char const* const stringBase_8098782F = "MAN_c2"; +SECTION_DEAD static char const* const stringBase_80987836 = "MAN_c2_TW"; +SECTION_DEAD static char const* const stringBase_80987840 = "MAS_a2"; +SECTION_DEAD static char const* const stringBase_80987847 = "MAS_a2_TW"; +SECTION_DEAD static char const* const stringBase_80987851 = "MBN_a2"; +SECTION_DEAD static char const* const stringBase_80987858 = "MBN_a2_TW"; +SECTION_DEAD static char const* const stringBase_80987862 = "WAN_a"; +SECTION_DEAD static char const* const stringBase_80987868 = "WAN_a_TW"; +SECTION_DEAD static char const* const stringBase_80987871 = "Wgeneral"; +SECTION_DEAD static char const* const stringBase_8098787A = "Wspecial"; +SECTION_DEAD static char const* const stringBase_80987883 = "WAD_a"; +SECTION_DEAD static char const* const stringBase_80987889 = "WAD_a_TW"; +SECTION_DEAD static char const* const stringBase_80987892 = "MAT_a"; +SECTION_DEAD static char const* const stringBase_80987898 = "MAT_a_TW"; +SECTION_DEAD static char const* const stringBase_809878A1 = "WCN_a"; +SECTION_DEAD static char const* const stringBase_809878A7 = "WCN_a_TW"; +SECTION_DEAD static char const* const stringBase_809878B0 = "WON_a"; +SECTION_DEAD static char const* const stringBase_809878B6 = "WON_a_TW"; +SECTION_DEAD static char const* const stringBase_809878BF = "WGN_a"; +SECTION_DEAD static char const* const stringBase_809878C5 = "WGN_a_TW"; +SECTION_DEAD static char const* const stringBase_809878CE = "WAN_b"; +SECTION_DEAD static char const* const stringBase_809878D4 = "WAN_b_TW"; +SECTION_DEAD static char const* const stringBase_809878DD = "WAN_a2"; +SECTION_DEAD static char const* const stringBase_809878E4 = "WAN_a2_TW"; +SECTION_DEAD static char const* const stringBase_809878EE = "WAD_a2"; +SECTION_DEAD static char const* const stringBase_809878F5 = "WAD_a2_TW"; +SECTION_DEAD static char const* const stringBase_809878FF = "MAT_a2"; +SECTION_DEAD static char const* const stringBase_80987906 = "MAT_a2_TW"; +SECTION_DEAD static char const* const stringBase_80987910 = "WCN_a2"; +SECTION_DEAD static char const* const stringBase_80987917 = "WCN_a2_TW"; +SECTION_DEAD static char const* const stringBase_80987921 = "WON_a2"; +SECTION_DEAD static char const* const stringBase_80987928 = "WON_a2_TW"; +SECTION_DEAD static char const* const stringBase_80987932 = "WGN_a2"; +SECTION_DEAD static char const* const stringBase_80987939 = "WGN_a2_TW"; +SECTION_DEAD static char const* const stringBase_80987943 = "WAN_b2"; +SECTION_DEAD static char const* const stringBase_8098794A = "WAN_b2_TW"; +SECTION_DEAD static char const* const stringBase_80987954 = "Chat"; +#pragma pop /* 8098795C-80987968 000000 000C+00 4/4 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { @@ -2397,7 +2667,7 @@ SECTION_RODATA static void* const l_objTbl[26] = { (void*)(((char*)&d_a_npc_chat__stringBase0) + 0x21), (void*)0x0000000F, (void*)(((char*)&d_a_npc_chat__stringBase0) + 0x21), (void*)0x00000010, }; -COMPILER_STRIP_GATE(80986C6C, &l_objTbl); +COMPILER_STRIP_GATE(0x80986C6C, &l_objTbl); /* 80986CD4-80986D3C -00001 0068+00 1/1 0/0 0/0 .rodata l_objTWTbl */ SECTION_RODATA static void* const l_objTWTbl[26] = { @@ -2415,7 +2685,7 @@ SECTION_RODATA static void* const l_objTWTbl[26] = { (void*)(((char*)&d_a_npc_chat__stringBase0) + 0x28), (void*)0xFFFFFFFF, (void*)(((char*)&d_a_npc_chat__stringBase0) + 0x28), (void*)0xFFFFFFFF, }; -COMPILER_STRIP_GATE(80986CD4, &l_objTWTbl); +COMPILER_STRIP_GATE(0x80986CD4, &l_objTWTbl); /* 80986D3C-80986DA8 0003A0 006C+00 1/3 0/0 0/0 .rodata m__17daNpcChat_Param_c */ SECTION_RODATA u8 const daNpcChat_Param_c::m[108] = { @@ -2427,7 +2697,7 @@ SECTION_RODATA u8 const daNpcChat_Param_c::m[108] = { 0x42, 0x70, 0x00, 0x00, 0x43, 0xFA, 0x00, 0x00, 0x43, 0x96, 0x00, 0x00, 0xC3, 0x96, 0x00, 0x00, 0x00, 0x3C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80986D3C, &daNpcChat_Param_c::m); +COMPILER_STRIP_GATE(0x80986D3C, &daNpcChat_Param_c::m); /* 80986DA8-80986F10 00040C 0168+00 0/1 0/0 0/0 .rodata a_transScaleTbl$4174 */ #pragma push @@ -2457,12 +2727,12 @@ SECTION_RODATA static u8 const a_transScaleTbl[360] = { 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x5C, 0xF2, 0x9A, 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x86, 0xC7, 0x2F, 0x3F, 0x80, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80986DA8, &a_transScaleTbl); +COMPILER_STRIP_GATE(0x80986DA8, &a_transScaleTbl); #pragma pop /* 80986F10-80986F14 000574 0004+00 3/5 0/0 0/0 .rodata @4247 */ SECTION_RODATA static f32 const lit_4247 = 1.0f; -COMPILER_STRIP_GATE(80986F10, &lit_4247); +COMPILER_STRIP_GATE(0x80986F10, &lit_4247); /* 80986F14-80986F18 000578 0004+00 3/7 0/0 0/0 .rodata @4248 */ SECTION_RODATA static u8 const lit_4248[4] = { @@ -2471,7 +2741,7 @@ SECTION_RODATA static u8 const lit_4248[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80986F14, &lit_4248); +COMPILER_STRIP_GATE(0x80986F14, &lit_4248); /* 80980C1C-80980E20 0004BC 0204+00 1/1 0/0 0/0 .text NpcCreate__11daNpcChat_cFi */ #pragma push @@ -2508,7 +2778,7 @@ asm void daNpcChat_c::ObjCreate(int param_0) { SECTION_RODATA static u8 const lit_4305[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80986F18, &lit_4305); +COMPILER_STRIP_GATE(0x80986F18, &lit_4305); /* 80980FC8-80981108 000868 0140+00 1/1 0/0 0/0 .text ChairCreate__11daNpcChat_cFf */ #pragma push @@ -2587,19 +2857,19 @@ SECTION_RODATA static f32 const lit_4766[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80986F24, &lit_4766); +COMPILER_STRIP_GATE(0x80986F24, &lit_4766); /* 80986F2C-80986F34 000590 0008+00 2/2 0/0 0/0 .rodata @4768 */ SECTION_RODATA static u8 const lit_4768[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80986F2C, &lit_4768); +COMPILER_STRIP_GATE(0x80986F2C, &lit_4768); /* 80986F34-80986F3C 000598 0008+00 1/1 0/0 0/0 .rodata @4769 */ SECTION_RODATA static u8 const lit_4769[8] = { 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80986F34, &lit_4769); +COMPILER_STRIP_GATE(0x80986F34, &lit_4769); /* 8098BA80-8098BA84 000008 0001+03 1/1 0/0 0/0 .bss @1109 */ static u8 lit_1109[1 + 3 /* padding */]; @@ -2901,42 +3171,42 @@ asm void daNpcChat_c::setAttention(int param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4892 = -40.0f; -COMPILER_STRIP_GATE(80986F3C, &lit_4892); +COMPILER_STRIP_GATE(0x80986F3C, &lit_4892); #pragma pop /* 80986F40-80986F44 0005A4 0004+00 0/1 0/0 0/0 .rodata @4893 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4893 = -10.0f; -COMPILER_STRIP_GATE(80986F40, &lit_4893); +COMPILER_STRIP_GATE(0x80986F40, &lit_4893); #pragma pop /* 80986F44-80986F48 0005A8 0004+00 0/1 0/0 0/0 .rodata @4894 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4894 = -30.0f; -COMPILER_STRIP_GATE(80986F44, &lit_4894); +COMPILER_STRIP_GATE(0x80986F44, &lit_4894); #pragma pop /* 80986F48-80986F4C 0005AC 0004+00 0/1 0/0 0/0 .rodata @4895 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4895 = 30.0f; -COMPILER_STRIP_GATE(80986F48, &lit_4895); +COMPILER_STRIP_GATE(0x80986F48, &lit_4895); #pragma pop /* 80986F4C-80986F50 0005B0 0004+00 0/1 0/0 0/0 .rodata @4896 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4896 = 190.0f; -COMPILER_STRIP_GATE(80986F4C, &lit_4896); +COMPILER_STRIP_GATE(0x80986F4C, &lit_4896); #pragma pop /* 80986F50-80986F54 0005B4 0004+00 0/1 0/0 0/0 .rodata @4897 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4897 = 40.0f; -COMPILER_STRIP_GATE(80986F50, &lit_4897); +COMPILER_STRIP_GATE(0x80986F50, &lit_4897); #pragma pop /* 80981E90-809822A0 001730 0410+00 1/1 0/0 0/0 .text Create__11daNpcChat_cFv */ @@ -2952,7 +3222,7 @@ asm void daNpcChat_c::Create() { /* ############################################################################################## */ /* 80986F54-80986F58 0005B8 0004+00 2/4 0/0 0/0 .rodata @4922 */ SECTION_RODATA static f32 const lit_4922 = -1.0f; -COMPILER_STRIP_GATE(80986F54, &lit_4922); +COMPILER_STRIP_GATE(0x80986F54, &lit_4922); /* 809822A0-809823B4 001B40 0114+00 1/1 0/0 0/0 .text CreateHeap__11daNpcChat_cFv */ #pragma push @@ -2997,7 +3267,7 @@ asm void daNpcChat_c::Draw() { /* ############################################################################################## */ /* 80986F58-80986F5C 0005BC 0004+00 1/1 0/0 0/0 .rodata @5078 */ SECTION_RODATA static f32 const lit_5078 = 60.0f; -COMPILER_STRIP_GATE(80986F58, &lit_5078); +COMPILER_STRIP_GATE(0x80986F58, &lit_5078); /* 8098250C-80982780 001DAC 0274+00 1/1 0/0 0/0 .text draw__11daNpcChat_cFiifP11_GXColorS10i */ #pragma push @@ -3013,7 +3283,7 @@ asm void daNpcChat_c::draw(int param_0, int param_1, f32 param_2, _GXColorS10* p /* ############################################################################################## */ /* 80986F5C-80986F60 0005C0 0004+00 1/1 0/0 0/0 .rodata @5146 */ SECTION_RODATA static u32 const lit_5146 = 0x43360B61; -COMPILER_STRIP_GATE(80986F5C, &lit_5146); +COMPILER_STRIP_GATE(0x80986F5C, &lit_5146); /* 80982780-80982A98 002020 0318+00 1/1 0/0 0/0 .text * ctrlJoint__11daNpcChat_cFP8J3DJointP8J3DModel */ @@ -3111,7 +3381,7 @@ asm void daNpcChat_c::main() { /* ############################################################################################## */ /* 80986F60-80986F64 0005C4 0004+00 1/2 0/0 0/0 .rodata @5348 */ SECTION_RODATA static f32 const lit_5348 = 15.0f; -COMPILER_STRIP_GATE(80986F60, &lit_5348); +COMPILER_STRIP_GATE(0x80986F60, &lit_5348); /* 80982FA4-809830EC 002844 0148+00 1/0 0/0 0/0 .text setAttnPos__11daNpcChat_cFv */ #pragma push @@ -3170,7 +3440,7 @@ SECTION_RODATA static u8 const a_jntNumTbl[104] = { 0x0A, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x0B, 0x00, 0x00, 0x00, 0x0A, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x0B, }; -COMPILER_STRIP_GATE(80986F64, &a_jntNumTbl); +COMPILER_STRIP_GATE(0x80986F64, &a_jntNumTbl); /* 809835D0-809837A4 002E70 01D4+00 1/0 0/0 0/0 .text drawOtherMdls__11daNpcChat_cFv */ #pragma push @@ -3220,7 +3490,7 @@ asm void daNpcChat_c::reset() { SECTION_RODATA static u8 const lit_5699[12] = { 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80986FCC, &lit_5699); +COMPILER_STRIP_GATE(0x80986FCC, &lit_5699); #pragma pop /* 80986FD8-80986FDC 00063C 0004+00 0/1 0/0 0/0 .rodata @5700 */ @@ -3232,7 +3502,7 @@ SECTION_RODATA static u8 const lit_5700[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80986FD8, &lit_5700); +COMPILER_STRIP_GATE(0x80986FD8, &lit_5700); #pragma pop /* 80986FDC-80986FE8 000640 000C+00 0/1 0/0 0/0 .rodata @5701 */ @@ -3241,7 +3511,7 @@ COMPILER_STRIP_GATE(80986FD8, &lit_5700); SECTION_RODATA static u8 const lit_5701[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80986FDC, &lit_5701); +COMPILER_STRIP_GATE(0x80986FDC, &lit_5701); #pragma pop /* 80986FE8-80986FEC 00064C 0004+00 0/1 0/0 0/0 .rodata @5702 */ @@ -3253,7 +3523,7 @@ SECTION_RODATA static u8 const lit_5702[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80986FE8, &lit_5702); +COMPILER_STRIP_GATE(0x80986FE8, &lit_5702); #pragma pop /* 80986FEC-80986FF8 000650 000C+00 0/1 0/0 0/0 .rodata @5703 */ @@ -3262,7 +3532,7 @@ COMPILER_STRIP_GATE(80986FE8, &lit_5702); SECTION_RODATA static u8 const lit_5703[12] = { 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80986FEC, &lit_5703); +COMPILER_STRIP_GATE(0x80986FEC, &lit_5703); #pragma pop /* 80986FF8-80986FFC 00065C 0004+00 0/1 0/0 0/0 .rodata @5704 */ @@ -3274,7 +3544,7 @@ SECTION_RODATA static u8 const lit_5704[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80986FF8, &lit_5704); +COMPILER_STRIP_GATE(0x80986FF8, &lit_5704); #pragma pop /* 80986FFC-80987008 000660 000C+00 0/1 0/0 0/0 .rodata @5705 */ @@ -3283,7 +3553,7 @@ COMPILER_STRIP_GATE(80986FF8, &lit_5704); SECTION_RODATA static u8 const lit_5705[12] = { 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80986FFC, &lit_5705); +COMPILER_STRIP_GATE(0x80986FFC, &lit_5705); #pragma pop /* 80987008-8098700C 00066C 0004+00 0/1 0/0 0/0 .rodata @5706 */ @@ -3295,7 +3565,7 @@ SECTION_RODATA static u8 const lit_5706[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80987008, &lit_5706); +COMPILER_STRIP_GATE(0x80987008, &lit_5706); #pragma pop /* 8098700C-80987018 000670 000C+00 0/1 0/0 0/0 .rodata @5707 */ @@ -3304,7 +3574,7 @@ COMPILER_STRIP_GATE(80987008, &lit_5706); SECTION_RODATA static u8 const lit_5707[12] = { 0x00, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8098700C, &lit_5707); +COMPILER_STRIP_GATE(0x8098700C, &lit_5707); #pragma pop /* 80987018-8098701C 00067C 0004+00 0/1 0/0 0/0 .rodata @5708 */ @@ -3316,7 +3586,7 @@ SECTION_RODATA static u8 const lit_5708[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80987018, &lit_5708); +COMPILER_STRIP_GATE(0x80987018, &lit_5708); #pragma pop /* 8098701C-80987028 000680 000C+00 0/1 0/0 0/0 .rodata @5709 */ @@ -3325,7 +3595,7 @@ COMPILER_STRIP_GATE(80987018, &lit_5708); SECTION_RODATA static u8 const lit_5709[12] = { 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(8098701C, &lit_5709); +COMPILER_STRIP_GATE(0x8098701C, &lit_5709); #pragma pop /* 80987028-80987034 00068C 000C+00 0/1 0/0 0/0 .rodata @5710 */ @@ -3334,7 +3604,7 @@ COMPILER_STRIP_GATE(8098701C, &lit_5709); SECTION_RODATA static u8 const lit_5710[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80987028, &lit_5710); +COMPILER_STRIP_GATE(0x80987028, &lit_5710); #pragma pop /* 80987034-80987040 000698 000C+00 0/1 0/0 0/0 .rodata @5711 */ @@ -3343,7 +3613,7 @@ COMPILER_STRIP_GATE(80987028, &lit_5710); SECTION_RODATA static u8 const lit_5711[12] = { 0x00, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80987034, &lit_5711); +COMPILER_STRIP_GATE(0x80987034, &lit_5711); #pragma pop /* 80987040-8098704C 0006A4 000C+00 0/1 0/0 0/0 .rodata @5712 */ @@ -3352,7 +3622,7 @@ COMPILER_STRIP_GATE(80987034, &lit_5711); SECTION_RODATA static u8 const lit_5712[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80987040, &lit_5712); +COMPILER_STRIP_GATE(0x80987040, &lit_5712); #pragma pop /* 8098704C-80987058 0006B0 000C+00 0/1 0/0 0/0 .rodata @5713 */ @@ -3361,7 +3631,7 @@ COMPILER_STRIP_GATE(80987040, &lit_5712); SECTION_RODATA static u8 const lit_5713[12] = { 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(8098704C, &lit_5713); +COMPILER_STRIP_GATE(0x8098704C, &lit_5713); #pragma pop /* 80987058-80987064 0006BC 000C+00 0/1 0/0 0/0 .rodata @5714 */ @@ -3370,7 +3640,7 @@ COMPILER_STRIP_GATE(8098704C, &lit_5713); SECTION_RODATA static u8 const lit_5714[12] = { 0x00, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80987058, &lit_5714); +COMPILER_STRIP_GATE(0x80987058, &lit_5714); #pragma pop /* 80987064-8098707C 0006C8 0018+00 0/0 0/0 0/0 .rodata @5715 */ @@ -3380,7 +3650,7 @@ SECTION_RODATA static u8 const lit_5715[24] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80987064, &lit_5715); +COMPILER_STRIP_GATE(0x80987064, &lit_5715); #pragma pop /* 8098707C-80987088 0006E0 000C+00 0/1 0/0 0/0 .rodata @5716 */ @@ -3389,7 +3659,7 @@ COMPILER_STRIP_GATE(80987064, &lit_5715); SECTION_RODATA static u8 const lit_5716[12] = { 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8098707C, &lit_5716); +COMPILER_STRIP_GATE(0x8098707C, &lit_5716); #pragma pop /* 80987088-8098708C 0006EC 0004+00 0/1 0/0 0/0 .rodata @5717 */ @@ -3401,7 +3671,7 @@ SECTION_RODATA static u8 const lit_5717[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80987088, &lit_5717); +COMPILER_STRIP_GATE(0x80987088, &lit_5717); #pragma pop /* 8098708C-80987098 0006F0 000C+00 0/1 0/0 0/0 .rodata @5718 */ @@ -3410,7 +3680,7 @@ COMPILER_STRIP_GATE(80987088, &lit_5717); SECTION_RODATA static u8 const lit_5718[12] = { 0x00, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(8098708C, &lit_5718); +COMPILER_STRIP_GATE(0x8098708C, &lit_5718); #pragma pop /* 80987098-809870A4 0006FC 000C+00 0/1 0/0 0/0 .rodata @5719 */ @@ -3419,7 +3689,7 @@ COMPILER_STRIP_GATE(8098708C, &lit_5718); SECTION_RODATA static u8 const lit_5719[12] = { 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80987098, &lit_5719); +COMPILER_STRIP_GATE(0x80987098, &lit_5719); #pragma pop /* 809870A4-809870B0 000708 000C+00 0/1 0/0 0/0 .rodata @5720 */ @@ -3428,7 +3698,7 @@ COMPILER_STRIP_GATE(80987098, &lit_5719); SECTION_RODATA static u8 const lit_5720[12] = { 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(809870A4, &lit_5720); +COMPILER_STRIP_GATE(0x809870A4, &lit_5720); #pragma pop /* 809870B0-809870BC 000714 000C+00 0/1 0/0 0/0 .rodata @5721 */ @@ -3437,7 +3707,7 @@ COMPILER_STRIP_GATE(809870A4, &lit_5720); SECTION_RODATA static u8 const lit_5721[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809870B0, &lit_5721); +COMPILER_STRIP_GATE(0x809870B0, &lit_5721); #pragma pop /* 809870BC-809870CC 000720 0010+00 0/1 0/0 0/0 .rodata @5722 */ @@ -3446,7 +3716,7 @@ COMPILER_STRIP_GATE(809870B0, &lit_5721); SECTION_RODATA static u8 const lit_5722[16] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809870BC, &lit_5722); +COMPILER_STRIP_GATE(0x809870BC, &lit_5722); #pragma pop /* 809870CC-809870D8 000730 000C+00 0/1 0/0 0/0 .rodata @5723 */ @@ -3455,7 +3725,7 @@ COMPILER_STRIP_GATE(809870BC, &lit_5722); SECTION_RODATA static u8 const lit_5723[12] = { 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(809870CC, &lit_5723); +COMPILER_STRIP_GATE(0x809870CC, &lit_5723); #pragma pop /* 809870D8-809870E4 00073C 000C+00 0/1 0/0 0/0 .rodata @5724 */ @@ -3464,7 +3734,7 @@ COMPILER_STRIP_GATE(809870CC, &lit_5723); SECTION_RODATA static u8 const lit_5724[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(809870D8, &lit_5724); +COMPILER_STRIP_GATE(0x809870D8, &lit_5724); #pragma pop /* 809870E4-809870F0 000748 000C+00 0/1 0/0 0/0 .rodata @5725 */ @@ -3473,7 +3743,7 @@ COMPILER_STRIP_GATE(809870D8, &lit_5724); SECTION_RODATA static u8 const lit_5725[12] = { 0x00, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(809870E4, &lit_5725); +COMPILER_STRIP_GATE(0x809870E4, &lit_5725); #pragma pop /* 809870F0-809870FC 000754 000C+00 0/1 0/0 0/0 .rodata @5726 */ @@ -3482,7 +3752,7 @@ COMPILER_STRIP_GATE(809870E4, &lit_5725); SECTION_RODATA static u8 const lit_5726[12] = { 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(809870F0, &lit_5726); +COMPILER_STRIP_GATE(0x809870F0, &lit_5726); #pragma pop /* 809870FC-80987108 000760 000C+00 0/1 0/0 0/0 .rodata @5727 */ @@ -3491,7 +3761,7 @@ COMPILER_STRIP_GATE(809870F0, &lit_5726); SECTION_RODATA static u8 const lit_5727[12] = { 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809870FC, &lit_5727); +COMPILER_STRIP_GATE(0x809870FC, &lit_5727); #pragma pop /* 80987108-8098711C 00076C 0014+00 0/0 0/0 0/0 .rodata @5728 */ @@ -3501,7 +3771,7 @@ SECTION_RODATA static u8 const lit_5728[20] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80987108, &lit_5728); +COMPILER_STRIP_GATE(0x80987108, &lit_5728); #pragma pop /* 8098711C-80987128 000780 000C+00 0/1 0/0 0/0 .rodata @5729 */ @@ -3510,7 +3780,7 @@ COMPILER_STRIP_GATE(80987108, &lit_5728); SECTION_RODATA static u8 const lit_5729[12] = { 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(8098711C, &lit_5729); +COMPILER_STRIP_GATE(0x8098711C, &lit_5729); #pragma pop /* 80987128-80987134 00078C 000C+00 0/1 0/0 0/0 .rodata @5730 */ @@ -3519,7 +3789,7 @@ COMPILER_STRIP_GATE(8098711C, &lit_5729); SECTION_RODATA static u8 const lit_5730[12] = { 0x00, 0x15, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80987128, &lit_5730); +COMPILER_STRIP_GATE(0x80987128, &lit_5730); #pragma pop /* 80987134-8098713C 000798 0008+00 0/1 0/0 0/0 .rodata @5731 */ @@ -3528,7 +3798,7 @@ COMPILER_STRIP_GATE(80987128, &lit_5730); SECTION_RODATA static u8 const lit_5731[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80987134, &lit_5731); +COMPILER_STRIP_GATE(0x80987134, &lit_5731); #pragma pop /* 8098713C-80987148 0007A0 000C+00 0/1 0/0 0/0 .rodata @5732 */ @@ -3537,7 +3807,7 @@ COMPILER_STRIP_GATE(80987134, &lit_5731); SECTION_RODATA static u8 const lit_5732[12] = { 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(8098713C, &lit_5732); +COMPILER_STRIP_GATE(0x8098713C, &lit_5732); #pragma pop /* 80987148-80987154 0007AC 000C+00 0/1 0/0 0/0 .rodata @5733 */ @@ -3546,7 +3816,7 @@ COMPILER_STRIP_GATE(8098713C, &lit_5732); SECTION_RODATA static u8 const lit_5733[12] = { 0x00, 0x15, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80987148, &lit_5733); +COMPILER_STRIP_GATE(0x80987148, &lit_5733); #pragma pop /* 80987154-80987160 0007B8 000C+00 0/1 0/0 0/0 .rodata @5734 */ @@ -3555,7 +3825,7 @@ COMPILER_STRIP_GATE(80987148, &lit_5733); SECTION_RODATA static u8 const lit_5734[12] = { 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80987154, &lit_5734); +COMPILER_STRIP_GATE(0x80987154, &lit_5734); #pragma pop /* 80987160-8098716C 0007C4 000C+00 0/1 0/0 0/0 .rodata @5735 */ @@ -3564,7 +3834,7 @@ COMPILER_STRIP_GATE(80987154, &lit_5734); SECTION_RODATA static u8 const lit_5735[12] = { 0x00, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80987160, &lit_5735); +COMPILER_STRIP_GATE(0x80987160, &lit_5735); #pragma pop /* 8098716C-80987178 0007D0 000C+00 0/1 0/0 0/0 .rodata @5736 */ @@ -3573,7 +3843,7 @@ COMPILER_STRIP_GATE(80987160, &lit_5735); SECTION_RODATA static u8 const lit_5736[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8098716C, &lit_5736); +COMPILER_STRIP_GATE(0x8098716C, &lit_5736); #pragma pop /* 80987178-8098718C 0007DC 0014+00 0/0 0/0 0/0 .rodata @5737 */ @@ -3583,7 +3853,7 @@ SECTION_RODATA static u8 const lit_5737[20] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80987178, &lit_5737); +COMPILER_STRIP_GATE(0x80987178, &lit_5737); #pragma pop /* 8098718C-80987198 0007F0 000C+00 0/1 0/0 0/0 .rodata @5738 */ @@ -3592,7 +3862,7 @@ COMPILER_STRIP_GATE(80987178, &lit_5737); SECTION_RODATA static u8 const lit_5738[12] = { 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(8098718C, &lit_5738); +COMPILER_STRIP_GATE(0x8098718C, &lit_5738); #pragma pop /* 80987198-809871A4 0007FC 000C+00 0/1 0/0 0/0 .rodata @5739 */ @@ -3601,7 +3871,7 @@ COMPILER_STRIP_GATE(8098718C, &lit_5738); SECTION_RODATA static u8 const lit_5739[12] = { 0x00, 0x15, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80987198, &lit_5739); +COMPILER_STRIP_GATE(0x80987198, &lit_5739); #pragma pop /* 809871A4-809871B0 000808 000C+00 0/1 0/0 0/0 .rodata @5740 */ @@ -3610,7 +3880,7 @@ COMPILER_STRIP_GATE(80987198, &lit_5739); SECTION_RODATA static u8 const lit_5740[12] = { 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(809871A4, &lit_5740); +COMPILER_STRIP_GATE(0x809871A4, &lit_5740); #pragma pop /* 809871B0-809871BC 000814 000C+00 0/1 0/0 0/0 .rodata @5741 */ @@ -3619,7 +3889,7 @@ COMPILER_STRIP_GATE(809871A4, &lit_5740); SECTION_RODATA static u8 const lit_5741[12] = { 0x00, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(809871B0, &lit_5741); +COMPILER_STRIP_GATE(0x809871B0, &lit_5741); #pragma pop /* 809871BC-809871C8 000820 000C+00 0/1 0/0 0/0 .rodata @5742 */ @@ -3628,7 +3898,7 @@ COMPILER_STRIP_GATE(809871B0, &lit_5741); SECTION_RODATA static u8 const lit_5742[12] = { 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(809871BC, &lit_5742); +COMPILER_STRIP_GATE(0x809871BC, &lit_5742); #pragma pop /* 809871C8-809871D4 00082C 000C+00 0/1 0/0 0/0 .rodata @5743 */ @@ -3637,7 +3907,7 @@ COMPILER_STRIP_GATE(809871BC, &lit_5742); SECTION_RODATA static u8 const lit_5743[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809871C8, &lit_5743); +COMPILER_STRIP_GATE(0x809871C8, &lit_5743); #pragma pop /* 809871D4-809871EC 000838 0018+00 0/0 0/0 0/0 .rodata @5744 */ @@ -3647,7 +3917,7 @@ SECTION_RODATA static u8 const lit_5744[24] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809871D4, &lit_5744); +COMPILER_STRIP_GATE(0x809871D4, &lit_5744); #pragma pop /* 809871EC-809871F8 000850 000C+00 0/1 0/0 0/0 .rodata @5745 */ @@ -3656,7 +3926,7 @@ COMPILER_STRIP_GATE(809871D4, &lit_5744); SECTION_RODATA static u8 const lit_5745[12] = { 0x00, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(809871EC, &lit_5745); +COMPILER_STRIP_GATE(0x809871EC, &lit_5745); #pragma pop /* 809871F8-80987204 00085C 000C+00 0/1 0/0 0/0 .rodata @5746 */ @@ -3665,7 +3935,7 @@ COMPILER_STRIP_GATE(809871EC, &lit_5745); SECTION_RODATA static u8 const lit_5746[12] = { 0x00, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809871F8, &lit_5746); +COMPILER_STRIP_GATE(0x809871F8, &lit_5746); #pragma pop /* 80987204-8098720C 000868 0008+00 0/1 0/0 0/0 .rodata @5747 */ @@ -3674,7 +3944,7 @@ COMPILER_STRIP_GATE(809871F8, &lit_5746); SECTION_RODATA static u8 const lit_5747[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80987204, &lit_5747); +COMPILER_STRIP_GATE(0x80987204, &lit_5747); #pragma pop /* 8098720C-80987218 000870 000C+00 0/1 0/0 0/0 .rodata @5748 */ @@ -3683,7 +3953,7 @@ COMPILER_STRIP_GATE(80987204, &lit_5747); SECTION_RODATA static u8 const lit_5748[12] = { 0x00, 0x31, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(8098720C, &lit_5748); +COMPILER_STRIP_GATE(0x8098720C, &lit_5748); #pragma pop /* 80987218-80987224 00087C 000C+00 0/1 0/0 0/0 .rodata @5749 */ @@ -3692,7 +3962,7 @@ COMPILER_STRIP_GATE(8098720C, &lit_5748); SECTION_RODATA static u8 const lit_5749[12] = { 0x00, 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80987218, &lit_5749); +COMPILER_STRIP_GATE(0x80987218, &lit_5749); #pragma pop /* 80987224-8098722C 000888 0008+00 0/1 0/0 0/0 .rodata @5750 */ @@ -3701,7 +3971,7 @@ COMPILER_STRIP_GATE(80987218, &lit_5749); SECTION_RODATA static u8 const lit_5750[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80987224, &lit_5750); +COMPILER_STRIP_GATE(0x80987224, &lit_5750); #pragma pop /* 8098722C-80987238 000890 000C+00 0/1 0/0 0/0 .rodata @5751 */ @@ -3710,7 +3980,7 @@ COMPILER_STRIP_GATE(80987224, &lit_5750); SECTION_RODATA static u8 const lit_5751[12] = { 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(8098722C, &lit_5751); +COMPILER_STRIP_GATE(0x8098722C, &lit_5751); #pragma pop /* 80987238-80987244 00089C 000C+00 0/1 0/0 0/0 .rodata @5752 */ @@ -3719,7 +3989,7 @@ COMPILER_STRIP_GATE(8098722C, &lit_5751); SECTION_RODATA static u8 const lit_5752[12] = { 0x00, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80987238, &lit_5752); +COMPILER_STRIP_GATE(0x80987238, &lit_5752); #pragma pop /* 80987244-80987250 0008A8 000C+00 0/1 0/0 0/0 .rodata @5753 */ @@ -3728,7 +3998,7 @@ COMPILER_STRIP_GATE(80987238, &lit_5752); SECTION_RODATA static u8 const lit_5753[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80987244, &lit_5753); +COMPILER_STRIP_GATE(0x80987244, &lit_5753); #pragma pop /* 80987250-8098725C 0008B4 000C+00 0/1 0/0 0/0 .rodata @5754 */ @@ -3737,7 +4007,7 @@ COMPILER_STRIP_GATE(80987244, &lit_5753); SECTION_RODATA static u8 const lit_5754[12] = { 0x00, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80987250, &lit_5754); +COMPILER_STRIP_GATE(0x80987250, &lit_5754); #pragma pop /* 8098725C-80987268 0008C0 000C+00 0/1 0/0 0/0 .rodata @5755 */ @@ -3746,7 +4016,7 @@ COMPILER_STRIP_GATE(80987250, &lit_5754); SECTION_RODATA static u8 const lit_5755[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8098725C, &lit_5755); +COMPILER_STRIP_GATE(0x8098725C, &lit_5755); #pragma pop /* 80987268-8098727C 0008CC 0014+00 0/0 0/0 0/0 .rodata @5756 */ @@ -3756,7 +4026,7 @@ SECTION_RODATA static u8 const lit_5756[20] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80987268, &lit_5756); +COMPILER_STRIP_GATE(0x80987268, &lit_5756); #pragma pop /* 8098727C-80987288 0008E0 000C+00 0/1 0/0 0/0 .rodata @5757 */ @@ -3765,7 +4035,7 @@ COMPILER_STRIP_GATE(80987268, &lit_5756); SECTION_RODATA static u8 const lit_5757[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(8098727C, &lit_5757); +COMPILER_STRIP_GATE(0x8098727C, &lit_5757); #pragma pop /* 80987288-80987294 0008EC 000C+00 0/1 0/0 0/0 .rodata @5758 */ @@ -3774,7 +4044,7 @@ COMPILER_STRIP_GATE(8098727C, &lit_5757); SECTION_RODATA static u8 const lit_5758[12] = { 0x00, 0x31, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80987288, &lit_5758); +COMPILER_STRIP_GATE(0x80987288, &lit_5758); #pragma pop /* 80987294-809872A0 0008F8 000C+00 0/1 0/0 0/0 .rodata @5759 */ @@ -3783,7 +4053,7 @@ COMPILER_STRIP_GATE(80987288, &lit_5758); SECTION_RODATA static u8 const lit_5759[12] = { 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80987294, &lit_5759); +COMPILER_STRIP_GATE(0x80987294, &lit_5759); #pragma pop /* 809872A0-809872AC 000904 000C+00 0/1 0/0 0/0 .rodata @5760 */ @@ -3792,7 +4062,7 @@ COMPILER_STRIP_GATE(80987294, &lit_5759); SECTION_RODATA static u8 const lit_5760[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(809872A0, &lit_5760); +COMPILER_STRIP_GATE(0x809872A0, &lit_5760); #pragma pop /* 809872AC-809872B8 000910 000C+00 0/1 0/0 0/0 .rodata @5761 */ @@ -3801,7 +4071,7 @@ COMPILER_STRIP_GATE(809872A0, &lit_5760); SECTION_RODATA static u8 const lit_5761[12] = { 0x00, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809872AC, &lit_5761); +COMPILER_STRIP_GATE(0x809872AC, &lit_5761); #pragma pop /* 809872B8-809872CC 00091C 0014+00 0/0 0/0 0/0 .rodata @5762 */ @@ -3811,7 +4081,7 @@ SECTION_RODATA static u8 const lit_5762[20] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809872B8, &lit_5762); +COMPILER_STRIP_GATE(0x809872B8, &lit_5762); #pragma pop /* 809872CC-809872D8 000930 000C+00 0/1 0/0 0/0 .rodata @5763 */ @@ -3820,7 +4090,7 @@ COMPILER_STRIP_GATE(809872B8, &lit_5762); SECTION_RODATA static u8 const lit_5763[12] = { 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(809872CC, &lit_5763); +COMPILER_STRIP_GATE(0x809872CC, &lit_5763); #pragma pop /* 809872D8-809872E4 00093C 000C+00 0/1 0/0 0/0 .rodata @5764 */ @@ -3829,7 +4099,7 @@ COMPILER_STRIP_GATE(809872CC, &lit_5763); SECTION_RODATA static u8 const lit_5764[12] = { 0x00, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(809872D8, &lit_5764); +COMPILER_STRIP_GATE(0x809872D8, &lit_5764); #pragma pop /* 809872E4-809872F0 000948 000C+00 0/1 0/0 0/0 .rodata @5765 */ @@ -3838,7 +4108,7 @@ COMPILER_STRIP_GATE(809872D8, &lit_5764); SECTION_RODATA static u8 const lit_5765[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(809872E4, &lit_5765); +COMPILER_STRIP_GATE(0x809872E4, &lit_5765); #pragma pop /* 809872F0-809872FC 000954 000C+00 0/1 0/0 0/0 .rodata @5766 */ @@ -3847,7 +4117,7 @@ COMPILER_STRIP_GATE(809872E4, &lit_5765); SECTION_RODATA static u8 const lit_5766[12] = { 0x00, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(809872F0, &lit_5766); +COMPILER_STRIP_GATE(0x809872F0, &lit_5766); #pragma pop /* 809872FC-80987308 000960 000C+00 0/1 0/0 0/0 .rodata @5767 */ @@ -3856,7 +4126,7 @@ COMPILER_STRIP_GATE(809872F0, &lit_5766); SECTION_RODATA static u8 const lit_5767[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(809872FC, &lit_5767); +COMPILER_STRIP_GATE(0x809872FC, &lit_5767); #pragma pop /* 80987308-80987314 00096C 000C+00 0/1 0/0 0/0 .rodata @5768 */ @@ -3865,7 +4135,7 @@ COMPILER_STRIP_GATE(809872FC, &lit_5767); SECTION_RODATA static u8 const lit_5768[12] = { 0x00, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80987308, &lit_5768); +COMPILER_STRIP_GATE(0x80987308, &lit_5768); #pragma pop /* 80987314-8098732C 000978 0018+00 0/0 0/0 0/0 .rodata @5769 */ @@ -3875,7 +4145,7 @@ SECTION_RODATA static u8 const lit_5769[24] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80987314, &lit_5769); +COMPILER_STRIP_GATE(0x80987314, &lit_5769); #pragma pop /* 8098732C-80987338 000990 000C+00 0/1 0/0 0/0 .rodata @5770 */ @@ -3884,7 +4154,7 @@ COMPILER_STRIP_GATE(80987314, &lit_5769); SECTION_RODATA static u8 const lit_5770[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(8098732C, &lit_5770); +COMPILER_STRIP_GATE(0x8098732C, &lit_5770); #pragma pop /* 80987338-80987344 00099C 000C+00 0/1 0/0 0/0 .rodata @5771 */ @@ -3893,7 +4163,7 @@ COMPILER_STRIP_GATE(8098732C, &lit_5770); SECTION_RODATA static u8 const lit_5771[12] = { 0x00, 0x31, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80987338, &lit_5771); +COMPILER_STRIP_GATE(0x80987338, &lit_5771); #pragma pop /* 80987344-80987350 0009A8 000C+00 0/1 0/0 0/0 .rodata @5772 */ @@ -3902,7 +4172,7 @@ COMPILER_STRIP_GATE(80987338, &lit_5771); SECTION_RODATA static u8 const lit_5772[12] = { 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80987344, &lit_5772); +COMPILER_STRIP_GATE(0x80987344, &lit_5772); #pragma pop /* 80987350-8098735C 0009B4 000C+00 0/1 0/0 0/0 .rodata @5773 */ @@ -3911,7 +4181,7 @@ COMPILER_STRIP_GATE(80987344, &lit_5772); SECTION_RODATA static u8 const lit_5773[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80987350, &lit_5773); +COMPILER_STRIP_GATE(0x80987350, &lit_5773); #pragma pop /* 8098735C-80987368 0009C0 000C+00 0/1 0/0 0/0 .rodata @5774 */ @@ -3920,7 +4190,7 @@ COMPILER_STRIP_GATE(80987350, &lit_5773); SECTION_RODATA static u8 const lit_5774[12] = { 0x00, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(8098735C, &lit_5774); +COMPILER_STRIP_GATE(0x8098735C, &lit_5774); #pragma pop /* 80987368-80987374 0009CC 000C+00 0/1 0/0 0/0 .rodata @5775 */ @@ -3929,7 +4199,7 @@ COMPILER_STRIP_GATE(8098735C, &lit_5774); SECTION_RODATA static u8 const lit_5775[12] = { 0x00, 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80987368, &lit_5775); +COMPILER_STRIP_GATE(0x80987368, &lit_5775); #pragma pop /* 80987374-8098738C 0009D8 0018+00 0/0 0/0 0/0 .rodata @5776 */ @@ -3939,7 +4209,7 @@ SECTION_RODATA static u8 const lit_5776[24] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80987374, &lit_5776); +COMPILER_STRIP_GATE(0x80987374, &lit_5776); #pragma pop /* 8098738C-80987398 0009F0 000C+00 0/1 0/0 0/0 .rodata @5777 */ @@ -3948,7 +4218,7 @@ COMPILER_STRIP_GATE(80987374, &lit_5776); SECTION_RODATA static u8 const lit_5777[12] = { 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(8098738C, &lit_5777); +COMPILER_STRIP_GATE(0x8098738C, &lit_5777); #pragma pop /* 80987398-809873A4 0009FC 000C+00 0/1 0/0 0/0 .rodata @5778 */ @@ -3957,7 +4227,7 @@ COMPILER_STRIP_GATE(8098738C, &lit_5777); SECTION_RODATA static u8 const lit_5778[12] = { 0x00, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80987398, &lit_5778); +COMPILER_STRIP_GATE(0x80987398, &lit_5778); #pragma pop /* 809873A4-809873B0 000A08 000C+00 0/1 0/0 0/0 .rodata @5779 */ @@ -3966,7 +4236,7 @@ COMPILER_STRIP_GATE(80987398, &lit_5778); SECTION_RODATA static u8 const lit_5779[12] = { 0x00, 0x31, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(809873A4, &lit_5779); +COMPILER_STRIP_GATE(0x809873A4, &lit_5779); #pragma pop /* 809873B0-809873BC 000A14 000C+00 0/1 0/0 0/0 .rodata @5780 */ @@ -3975,7 +4245,7 @@ COMPILER_STRIP_GATE(809873A4, &lit_5779); SECTION_RODATA static u8 const lit_5780[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(809873B0, &lit_5780); +COMPILER_STRIP_GATE(0x809873B0, &lit_5780); #pragma pop /* 809873BC-809873C8 000A20 000C+00 0/1 0/0 0/0 .rodata @5781 */ @@ -3984,7 +4254,7 @@ COMPILER_STRIP_GATE(809873B0, &lit_5780); SECTION_RODATA static u8 const lit_5781[12] = { 0x00, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(809873BC, &lit_5781); +COMPILER_STRIP_GATE(0x809873BC, &lit_5781); #pragma pop /* 809873C8-809873D4 000A2C 000C+00 0/1 0/0 0/0 .rodata @5782 */ @@ -3993,7 +4263,7 @@ COMPILER_STRIP_GATE(809873BC, &lit_5781); SECTION_RODATA static u8 const lit_5782[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(809873C8, &lit_5782); +COMPILER_STRIP_GATE(0x809873C8, &lit_5782); #pragma pop /* 809873D4-809873E0 000A38 000C+00 0/1 0/0 0/0 .rodata @5783 */ @@ -4002,7 +4272,7 @@ COMPILER_STRIP_GATE(809873C8, &lit_5782); SECTION_RODATA static u8 const lit_5783[12] = { 0x00, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(809873D4, &lit_5783); +COMPILER_STRIP_GATE(0x809873D4, &lit_5783); #pragma pop /* 809873E0-809873EC 000A44 000C+00 0/1 0/0 0/0 .rodata @5784 */ @@ -4011,7 +4281,7 @@ COMPILER_STRIP_GATE(809873D4, &lit_5783); SECTION_RODATA static u8 const lit_5784[12] = { 0x00, 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809873E0, &lit_5784); +COMPILER_STRIP_GATE(0x809873E0, &lit_5784); #pragma pop /* 809873EC-8098740C 000A50 0020+00 0/0 0/0 0/0 .rodata @5785 */ @@ -4021,7 +4291,7 @@ SECTION_RODATA static u8 const lit_5785[32] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809873EC, &lit_5785); +COMPILER_STRIP_GATE(0x809873EC, &lit_5785); #pragma pop /* 8098740C-80987418 000A70 000C+00 0/1 0/0 0/0 .rodata @5786 */ @@ -4030,7 +4300,7 @@ COMPILER_STRIP_GATE(809873EC, &lit_5785); SECTION_RODATA static u8 const lit_5786[12] = { 0x00, 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8098740C, &lit_5786); +COMPILER_STRIP_GATE(0x8098740C, &lit_5786); #pragma pop /* 80987418-8098741C 000A7C 0004+00 0/1 0/0 0/0 .rodata @5787 */ @@ -4042,7 +4312,7 @@ SECTION_RODATA static u8 const lit_5787[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80987418, &lit_5787); +COMPILER_STRIP_GATE(0x80987418, &lit_5787); #pragma pop /* 8098741C-80987428 000A80 000C+00 0/1 0/0 0/0 .rodata @5788 */ @@ -4051,7 +4321,7 @@ COMPILER_STRIP_GATE(80987418, &lit_5787); SECTION_RODATA static u8 const lit_5788[12] = { 0x00, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8098741C, &lit_5788); +COMPILER_STRIP_GATE(0x8098741C, &lit_5788); #pragma pop /* 80987428-8098742C 000A8C 0004+00 0/1 0/0 0/0 .rodata @5789 */ @@ -4063,7 +4333,7 @@ SECTION_RODATA static u8 const lit_5789[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80987428, &lit_5789); +COMPILER_STRIP_GATE(0x80987428, &lit_5789); #pragma pop /* 8098742C-80987438 000A90 000C+00 0/1 0/0 0/0 .rodata @5790 */ @@ -4072,7 +4342,7 @@ COMPILER_STRIP_GATE(80987428, &lit_5789); SECTION_RODATA static u8 const lit_5790[12] = { 0x00, 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(8098742C, &lit_5790); +COMPILER_STRIP_GATE(0x8098742C, &lit_5790); #pragma pop /* 80987438-80987444 000A9C 000C+00 0/1 0/0 0/0 .rodata @5791 */ @@ -4081,7 +4351,7 @@ COMPILER_STRIP_GATE(8098742C, &lit_5790); SECTION_RODATA static u8 const lit_5791[12] = { 0x00, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80987438, &lit_5791); +COMPILER_STRIP_GATE(0x80987438, &lit_5791); #pragma pop /* 80987444-80987450 000AA8 000C+00 0/1 0/0 0/0 .rodata @5792 */ @@ -4090,7 +4360,7 @@ COMPILER_STRIP_GATE(80987438, &lit_5791); SECTION_RODATA static u8 const lit_5792[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80987444, &lit_5792); +COMPILER_STRIP_GATE(0x80987444, &lit_5792); #pragma pop /* 80987450-8098745C 000AB4 000C+00 0/1 0/0 0/0 .rodata @5793 */ @@ -4099,7 +4369,7 @@ COMPILER_STRIP_GATE(80987444, &lit_5792); SECTION_RODATA static u8 const lit_5793[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80987450, &lit_5793); +COMPILER_STRIP_GATE(0x80987450, &lit_5793); #pragma pop /* 8098745C-80987468 000AC0 000C+00 0/1 0/0 0/0 .rodata @5794 */ @@ -4108,7 +4378,7 @@ COMPILER_STRIP_GATE(80987450, &lit_5793); SECTION_RODATA static u8 const lit_5794[12] = { 0x00, 0x0B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8098745C, &lit_5794); +COMPILER_STRIP_GATE(0x8098745C, &lit_5794); #pragma pop /* 80987468-8098746C 000ACC 0004+00 0/1 0/0 0/0 .rodata @5795 */ @@ -4120,7 +4390,7 @@ SECTION_RODATA static u8 const lit_5795[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80987468, &lit_5795); +COMPILER_STRIP_GATE(0x80987468, &lit_5795); #pragma pop /* 8098746C-80987478 000AD0 000C+00 0/1 0/0 0/0 .rodata @5796 */ @@ -4129,7 +4399,7 @@ COMPILER_STRIP_GATE(80987468, &lit_5795); SECTION_RODATA static u8 const lit_5796[12] = { 0x00, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(8098746C, &lit_5796); +COMPILER_STRIP_GATE(0x8098746C, &lit_5796); #pragma pop /* 80987478-80987484 000ADC 000C+00 0/1 0/0 0/0 .rodata @5797 */ @@ -4138,7 +4408,7 @@ COMPILER_STRIP_GATE(8098746C, &lit_5796); SECTION_RODATA static u8 const lit_5797[12] = { 0x00, 0x0B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80987478, &lit_5797); +COMPILER_STRIP_GATE(0x80987478, &lit_5797); #pragma pop /* 80987484-80987490 000AE8 000C+00 0/1 0/0 0/0 .rodata @5798 */ @@ -4147,7 +4417,7 @@ COMPILER_STRIP_GATE(80987478, &lit_5797); SECTION_RODATA static u8 const lit_5798[12] = { 0x00, 0x0D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80987484, &lit_5798); +COMPILER_STRIP_GATE(0x80987484, &lit_5798); #pragma pop /* 80987490-8098749C 000AF4 000C+00 0/1 0/0 0/0 .rodata @5799 */ @@ -4156,7 +4426,7 @@ COMPILER_STRIP_GATE(80987484, &lit_5798); SECTION_RODATA static u8 const lit_5799[12] = { 0x00, 0x0B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80987490, &lit_5799); +COMPILER_STRIP_GATE(0x80987490, &lit_5799); #pragma pop /* 8098749C-809874A8 000B00 000C+00 0/1 0/0 0/0 .rodata @5800 */ @@ -4165,7 +4435,7 @@ COMPILER_STRIP_GATE(80987490, &lit_5799); SECTION_RODATA static u8 const lit_5800[12] = { 0x00, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(8098749C, &lit_5800); +COMPILER_STRIP_GATE(0x8098749C, &lit_5800); #pragma pop /* 809874A8-809874B4 000B0C 000C+00 0/1 0/0 0/0 .rodata @5801 */ @@ -4174,7 +4444,7 @@ COMPILER_STRIP_GATE(8098749C, &lit_5800); SECTION_RODATA static u8 const lit_5801[12] = { 0x00, 0x0D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809874A8, &lit_5801); +COMPILER_STRIP_GATE(0x809874A8, &lit_5801); #pragma pop /* 809874B4-809874CC 000B18 0018+00 0/0 0/0 0/0 .rodata @5802 */ @@ -4184,7 +4454,7 @@ SECTION_RODATA static u8 const lit_5802[24] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809874B4, &lit_5802); +COMPILER_STRIP_GATE(0x809874B4, &lit_5802); #pragma pop /* 809874CC-809874D8 000B30 000C+00 0/1 0/0 0/0 .rodata @5803 */ @@ -4193,7 +4463,7 @@ COMPILER_STRIP_GATE(809874B4, &lit_5802); SECTION_RODATA static u8 const lit_5803[12] = { 0x00, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809874CC, &lit_5803); +COMPILER_STRIP_GATE(0x809874CC, &lit_5803); #pragma pop /* 809874D8-809874DC 000B3C 0004+00 0/1 0/0 0/0 .rodata @5804 */ @@ -4205,7 +4475,7 @@ SECTION_RODATA static u8 const lit_5804[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(809874D8, &lit_5804); +COMPILER_STRIP_GATE(0x809874D8, &lit_5804); #pragma pop /* 809874DC-809874E8 000B40 000C+00 0/1 0/0 0/0 .rodata @5805 */ @@ -4214,7 +4484,7 @@ COMPILER_STRIP_GATE(809874D8, &lit_5804); SECTION_RODATA static u8 const lit_5805[12] = { 0x00, 0x0F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(809874DC, &lit_5805); +COMPILER_STRIP_GATE(0x809874DC, &lit_5805); #pragma pop /* 809874E8-809874F4 000B4C 000C+00 0/1 0/0 0/0 .rodata @5806 */ @@ -4223,7 +4493,7 @@ COMPILER_STRIP_GATE(809874DC, &lit_5805); SECTION_RODATA static u8 const lit_5806[12] = { 0x00, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(809874E8, &lit_5806); +COMPILER_STRIP_GATE(0x809874E8, &lit_5806); #pragma pop /* 809874F4-80987500 000B58 000C+00 0/1 0/0 0/0 .rodata @5807 */ @@ -4232,7 +4502,7 @@ COMPILER_STRIP_GATE(809874E8, &lit_5806); SECTION_RODATA static u8 const lit_5807[12] = { 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(809874F4, &lit_5807); +COMPILER_STRIP_GATE(0x809874F4, &lit_5807); #pragma pop /* 80987500-8098750C 000B64 000C+00 0/1 0/0 0/0 .rodata @5808 */ @@ -4241,7 +4511,7 @@ COMPILER_STRIP_GATE(809874F4, &lit_5807); SECTION_RODATA static u8 const lit_5808[12] = { 0x00, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80987500, &lit_5808); +COMPILER_STRIP_GATE(0x80987500, &lit_5808); #pragma pop /* 8098750C-80987518 000B70 000C+00 0/1 0/0 0/0 .rodata @5809 */ @@ -4250,7 +4520,7 @@ COMPILER_STRIP_GATE(80987500, &lit_5808); SECTION_RODATA static u8 const lit_5809[12] = { 0x00, 0x0F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(8098750C, &lit_5809); +COMPILER_STRIP_GATE(0x8098750C, &lit_5809); #pragma pop /* 80987518-80987524 000B7C 000C+00 0/1 0/0 0/0 .rodata @5810 */ @@ -4259,7 +4529,7 @@ COMPILER_STRIP_GATE(8098750C, &lit_5809); SECTION_RODATA static u8 const lit_5810[12] = { 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80987518, &lit_5810); +COMPILER_STRIP_GATE(0x80987518, &lit_5810); #pragma pop /* 80987524-8098753C 000B88 0018+00 0/0 0/0 0/0 .rodata @5811 */ @@ -4269,7 +4539,7 @@ SECTION_RODATA static u8 const lit_5811[24] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80987524, &lit_5811); +COMPILER_STRIP_GATE(0x80987524, &lit_5811); #pragma pop /* 8098753C-80987548 000BA0 000C+00 0/1 0/0 0/0 .rodata @5812 */ @@ -4278,7 +4548,7 @@ COMPILER_STRIP_GATE(80987524, &lit_5811); SECTION_RODATA static u8 const lit_5812[12] = { 0x00, 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8098753C, &lit_5812); +COMPILER_STRIP_GATE(0x8098753C, &lit_5812); #pragma pop /* 80987548-8098754C 000BAC 0004+00 0/1 0/0 0/0 .rodata @5813 */ @@ -4290,7 +4560,7 @@ SECTION_RODATA static u8 const lit_5813[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80987548, &lit_5813); +COMPILER_STRIP_GATE(0x80987548, &lit_5813); #pragma pop /* 8098754C-80987558 000BB0 000C+00 0/1 0/0 0/0 .rodata @5814 */ @@ -4299,7 +4569,7 @@ COMPILER_STRIP_GATE(80987548, &lit_5813); SECTION_RODATA static u8 const lit_5814[12] = { 0x00, 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(8098754C, &lit_5814); +COMPILER_STRIP_GATE(0x8098754C, &lit_5814); #pragma pop /* 80987558-80987564 000BBC 000C+00 0/1 0/0 0/0 .rodata @5815 */ @@ -4308,7 +4578,7 @@ COMPILER_STRIP_GATE(8098754C, &lit_5814); SECTION_RODATA static u8 const lit_5815[12] = { 0x00, 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80987558, &lit_5815); +COMPILER_STRIP_GATE(0x80987558, &lit_5815); #pragma pop /* 80987564-80987570 000BC8 000C+00 0/1 0/0 0/0 .rodata @5816 */ @@ -4317,7 +4587,7 @@ COMPILER_STRIP_GATE(80987558, &lit_5815); SECTION_RODATA static u8 const lit_5816[12] = { 0x00, 0x13, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80987564, &lit_5816); +COMPILER_STRIP_GATE(0x80987564, &lit_5816); #pragma pop /* 80987570-8098757C 000BD4 000C+00 0/1 0/0 0/0 .rodata @5817 */ @@ -4326,7 +4596,7 @@ COMPILER_STRIP_GATE(80987564, &lit_5816); SECTION_RODATA static u8 const lit_5817[12] = { 0x00, 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80987570, &lit_5817); +COMPILER_STRIP_GATE(0x80987570, &lit_5817); #pragma pop /* 8098757C-80987588 000BE0 000C+00 0/1 0/0 0/0 .rodata @5818 */ @@ -4335,7 +4605,7 @@ COMPILER_STRIP_GATE(80987570, &lit_5817); SECTION_RODATA static u8 const lit_5818[12] = { 0x00, 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(8098757C, &lit_5818); +COMPILER_STRIP_GATE(0x8098757C, &lit_5818); #pragma pop /* 80987588-80987594 000BEC 000C+00 0/1 0/0 0/0 .rodata @5819 */ @@ -4344,7 +4614,7 @@ COMPILER_STRIP_GATE(8098757C, &lit_5818); SECTION_RODATA static u8 const lit_5819[12] = { 0x00, 0x13, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80987588, &lit_5819); +COMPILER_STRIP_GATE(0x80987588, &lit_5819); #pragma pop /* 80987594-809875AC 000BF8 0018+00 0/0 0/0 0/0 .rodata @5820 */ @@ -4354,7 +4624,7 @@ SECTION_RODATA static u8 const lit_5820[24] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80987594, &lit_5820); +COMPILER_STRIP_GATE(0x80987594, &lit_5820); #pragma pop /* 809875AC-809875B8 000C10 000C+00 0/1 0/0 0/0 .rodata @5821 */ @@ -4363,7 +4633,7 @@ COMPILER_STRIP_GATE(80987594, &lit_5820); SECTION_RODATA static u8 const lit_5821[12] = { 0x00, 0x35, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809875AC, &lit_5821); +COMPILER_STRIP_GATE(0x809875AC, &lit_5821); #pragma pop /* 809875B8-809875BC 000C1C 0004+00 0/1 0/0 0/0 .rodata @5822 */ @@ -4375,7 +4645,7 @@ SECTION_RODATA static u8 const lit_5822[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(809875B8, &lit_5822); +COMPILER_STRIP_GATE(0x809875B8, &lit_5822); #pragma pop /* 809875BC-809875C8 000C20 000C+00 0/1 0/0 0/0 .rodata @5823 */ @@ -4384,7 +4654,7 @@ COMPILER_STRIP_GATE(809875B8, &lit_5822); SECTION_RODATA static u8 const lit_5823[12] = { 0x00, 0x0F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809875BC, &lit_5823); +COMPILER_STRIP_GATE(0x809875BC, &lit_5823); #pragma pop /* 809875C8-809875CC 000C2C 0004+00 0/1 0/0 0/0 .rodata @5824 */ @@ -4396,7 +4666,7 @@ SECTION_RODATA static u8 const lit_5824[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(809875C8, &lit_5824); +COMPILER_STRIP_GATE(0x809875C8, &lit_5824); #pragma pop /* 809875CC-809875D8 000C30 000C+00 0/1 0/0 0/0 .rodata @5825 */ @@ -4405,7 +4675,7 @@ COMPILER_STRIP_GATE(809875C8, &lit_5824); SECTION_RODATA static u8 const lit_5825[12] = { 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809875CC, &lit_5825); +COMPILER_STRIP_GATE(0x809875CC, &lit_5825); #pragma pop /* 809875D8-809875DC 000C3C 0004+00 0/1 0/0 0/0 .rodata @5826 */ @@ -4417,7 +4687,7 @@ SECTION_RODATA static u8 const lit_5826[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(809875D8, &lit_5826); +COMPILER_STRIP_GATE(0x809875D8, &lit_5826); #pragma pop /* 809875DC-809875E8 000C40 000C+00 0/1 0/0 0/0 .rodata @5827 */ @@ -4426,7 +4696,7 @@ COMPILER_STRIP_GATE(809875D8, &lit_5826); SECTION_RODATA static u8 const lit_5827[12] = { 0x00, 0x0F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(809875DC, &lit_5827); +COMPILER_STRIP_GATE(0x809875DC, &lit_5827); #pragma pop /* 809875E8-809875F4 000C4C 000C+00 0/1 0/0 0/0 .rodata @5828 */ @@ -4435,7 +4705,7 @@ COMPILER_STRIP_GATE(809875DC, &lit_5827); SECTION_RODATA static u8 const lit_5828[12] = { 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809875E8, &lit_5828); +COMPILER_STRIP_GATE(0x809875E8, &lit_5828); #pragma pop /* 809875F4-809875FC 000C58 0008+00 0/1 0/0 0/0 .rodata @5829 */ @@ -4444,7 +4714,7 @@ COMPILER_STRIP_GATE(809875E8, &lit_5828); SECTION_RODATA static u8 const lit_5829[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809875F4, &lit_5829); +COMPILER_STRIP_GATE(0x809875F4, &lit_5829); #pragma pop /* 809875FC-80987608 000C60 000C+00 0/1 0/0 0/0 .rodata @5830 */ @@ -4453,7 +4723,7 @@ COMPILER_STRIP_GATE(809875F4, &lit_5829); SECTION_RODATA static u8 const lit_5830[12] = { 0x00, 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809875FC, &lit_5830); +COMPILER_STRIP_GATE(0x809875FC, &lit_5830); #pragma pop /* 80987608-8098760C 000C6C 0004+00 0/1 0/0 0/0 .rodata @5831 */ @@ -4465,7 +4735,7 @@ SECTION_RODATA static u8 const lit_5831[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80987608, &lit_5831); +COMPILER_STRIP_GATE(0x80987608, &lit_5831); #pragma pop /* 8098760C-80987618 000C70 000C+00 0/1 0/0 0/0 .rodata @5832 */ @@ -4474,7 +4744,7 @@ COMPILER_STRIP_GATE(80987608, &lit_5831); SECTION_RODATA static u8 const lit_5832[12] = { 0x00, 0x13, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8098760C, &lit_5832); +COMPILER_STRIP_GATE(0x8098760C, &lit_5832); #pragma pop /* 80987618-8098761C 000C7C 0004+00 0/1 0/0 0/0 .rodata @5833 */ @@ -4486,7 +4756,7 @@ SECTION_RODATA static u8 const lit_5833[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80987618, &lit_5833); +COMPILER_STRIP_GATE(0x80987618, &lit_5833); #pragma pop /* 8098761C-80987628 000C80 000C+00 0/1 0/0 0/0 .rodata @5834 */ @@ -4495,7 +4765,7 @@ COMPILER_STRIP_GATE(80987618, &lit_5833); SECTION_RODATA static u8 const lit_5834[12] = { 0x00, 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(8098761C, &lit_5834); +COMPILER_STRIP_GATE(0x8098761C, &lit_5834); #pragma pop /* 80987628-80987634 000C8C 000C+00 0/1 0/0 0/0 .rodata @5835 */ @@ -4504,7 +4774,7 @@ COMPILER_STRIP_GATE(8098761C, &lit_5834); SECTION_RODATA static u8 const lit_5835[12] = { 0x00, 0x13, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80987628, &lit_5835); +COMPILER_STRIP_GATE(0x80987628, &lit_5835); #pragma pop /* 80987634-8098763C 000C98 0008+00 0/1 0/0 0/0 .rodata @5836 */ @@ -4513,7 +4783,7 @@ COMPILER_STRIP_GATE(80987628, &lit_5835); SECTION_RODATA static u8 const lit_5836[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80987634, &lit_5836); +COMPILER_STRIP_GATE(0x80987634, &lit_5836); #pragma pop /* 8098763C-80987648 000CA0 000C+00 0/1 0/0 0/0 .rodata @5837 */ @@ -4522,7 +4792,7 @@ COMPILER_STRIP_GATE(80987634, &lit_5836); SECTION_RODATA static u8 const lit_5837[12] = { 0x00, 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8098763C, &lit_5837); +COMPILER_STRIP_GATE(0x8098763C, &lit_5837); #pragma pop /* 80987648-8098764C 000CAC 0004+00 0/1 0/0 0/0 .rodata @5838 */ @@ -4534,7 +4804,7 @@ SECTION_RODATA static u8 const lit_5838[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80987648, &lit_5838); +COMPILER_STRIP_GATE(0x80987648, &lit_5838); #pragma pop /* 8098764C-80987658 000CB0 000C+00 0/1 0/0 0/0 .rodata @5839 */ @@ -4543,7 +4813,7 @@ COMPILER_STRIP_GATE(80987648, &lit_5838); SECTION_RODATA static u8 const lit_5839[12] = { 0x00, 0x2E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8098764C, &lit_5839); +COMPILER_STRIP_GATE(0x8098764C, &lit_5839); #pragma pop /* 80987658-8098765C 000CBC 0004+00 0/1 0/0 0/0 .rodata @5840 */ @@ -4555,7 +4825,7 @@ SECTION_RODATA static u8 const lit_5840[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80987658, &lit_5840); +COMPILER_STRIP_GATE(0x80987658, &lit_5840); #pragma pop /* 8098765C-80987668 000CC0 000C+00 0/1 0/0 0/0 .rodata @5841 */ @@ -4564,7 +4834,7 @@ COMPILER_STRIP_GATE(80987658, &lit_5840); SECTION_RODATA static u8 const lit_5841[12] = { 0x00, 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8098765C, &lit_5841); +COMPILER_STRIP_GATE(0x8098765C, &lit_5841); #pragma pop /* 80987668-8098766C 000CCC 0004+00 0/1 0/0 0/0 .rodata @5842 */ @@ -4576,7 +4846,7 @@ SECTION_RODATA static u8 const lit_5842[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80987668, &lit_5842); +COMPILER_STRIP_GATE(0x80987668, &lit_5842); #pragma pop /* 8098766C-80987678 000CD0 000C+00 0/1 0/0 0/0 .rodata @5843 */ @@ -4585,7 +4855,7 @@ COMPILER_STRIP_GATE(80987668, &lit_5842); SECTION_RODATA static u8 const lit_5843[12] = { 0x00, 0x29, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8098766C, &lit_5843); +COMPILER_STRIP_GATE(0x8098766C, &lit_5843); #pragma pop /* 80987678-8098767C 000CDC 0004+00 0/1 0/0 0/0 .rodata @5844 */ @@ -4597,7 +4867,7 @@ SECTION_RODATA static u8 const lit_5844[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80987678, &lit_5844); +COMPILER_STRIP_GATE(0x80987678, &lit_5844); #pragma pop /* 8098767C-80987688 000CE0 000C+00 0/1 0/0 0/0 .rodata @5845 */ @@ -4606,7 +4876,7 @@ COMPILER_STRIP_GATE(80987678, &lit_5844); SECTION_RODATA static u8 const lit_5845[12] = { 0x00, 0x26, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8098767C, &lit_5845); +COMPILER_STRIP_GATE(0x8098767C, &lit_5845); #pragma pop /* 80987688-8098768C 000CEC 0004+00 0/1 0/0 0/0 .rodata @5846 */ @@ -4618,7 +4888,7 @@ SECTION_RODATA static u8 const lit_5846[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80987688, &lit_5846); +COMPILER_STRIP_GATE(0x80987688, &lit_5846); #pragma pop /* 809839E0-80984DD0 003280 13F0+00 1/1 0/0 0/0 .text playMotion__11daNpcChat_cFv */ @@ -4647,7 +4917,7 @@ asm void daNpcChat_c::playMotionAnmLoop(daNpcF_c::daNpcF_anmPlayData*** param_0) #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpcChat_c::setAction(bool (daNpcChat_c::*)(void*)) { +asm void daNpcChat_c::setAction(bool (daNpcChat_c::*param_0)(void*)) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_chat/d_a_npc_chat/setAction__11daNpcChat_cFM11daNpcChat_cFPCvPvPv_b.s" } @@ -4690,7 +4960,7 @@ SECTION_RODATA static u8 const lit_5847[160] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8098768C, &lit_5847); +COMPILER_STRIP_GATE(0x8098768C, &lit_5847); #pragma pop /* 8098772C-80987734 000D90 0008+00 0/1 0/0 0/0 .rodata @6167 */ @@ -4699,7 +4969,7 @@ COMPILER_STRIP_GATE(8098768C, &lit_5847); SECTION_RODATA static u8 const lit_6167[8] = { 0x40, 0x7F, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8098772C, &lit_6167); +COMPILER_STRIP_GATE(0x8098772C, &lit_6167); #pragma pop /* 80987734-8098773C 000D98 0008+00 0/1 0/0 0/0 .rodata @6168 */ @@ -4708,7 +4978,7 @@ COMPILER_STRIP_GATE(8098772C, &lit_6167); SECTION_RODATA static u8 const lit_6168[8] = { 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80987734, &lit_6168); +COMPILER_STRIP_GATE(0x80987734, &lit_6168); #pragma pop /* 80985104-8098552C 0049A4 0428+00 4/0 0/0 0/0 .text wait__11daNpcChat_cFPv */ @@ -4726,7 +4996,7 @@ asm void daNpcChat_c::wait(void* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6209 = 2.0f; -COMPILER_STRIP_GATE(8098773C, &lit_6209); +COMPILER_STRIP_GATE(0x8098773C, &lit_6209); #pragma pop /* 8098552C-809856C8 004DCC 019C+00 2/0 0/0 0/0 .text fear__11daNpcChat_cFPv */ @@ -4974,7 +5244,7 @@ asm void __sinit_d_a_npc_chat_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80986448 = (void*)__sinit_d_a_npc_chat_cpp; +REGISTER_CTORS(0x80986448, __sinit_d_a_npc_chat_cpp); #pragma pop /* 8098692C-80986930 0061CC 0004+00 1/0 0/0 0/0 .text adjustShapeAngle__11daNpcChat_cFv @@ -5185,75 +5455,4 @@ static u8 data_8098BE00[4]; static u8 data_8098BE04[4]; #pragma pop -/* 80987740-80987959 000DA4 0219+00 36/1 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80987740 = "MAN_a"; -SECTION_DEAD static char const* const stringBase_80987746 = "MAN_a_TW"; -SECTION_DEAD static char const* const stringBase_8098774F = "Mgeneral"; -SECTION_DEAD static char const* const stringBase_80987758 = "Mspecial"; -SECTION_DEAD static char const* const stringBase_80987761 = "object"; -SECTION_DEAD static char const* const stringBase_80987768 = "objectTW"; -SECTION_DEAD static char const* const stringBase_80987771 = "MAD_a"; -SECTION_DEAD static char const* const stringBase_80987777 = "MAD_a_TW"; -SECTION_DEAD static char const* const stringBase_80987780 = "MCN_a"; -SECTION_DEAD static char const* const stringBase_80987786 = "MCN_a_TW"; -SECTION_DEAD static char const* const stringBase_8098778F = "MON_a"; -SECTION_DEAD static char const* const stringBase_80987795 = "MON_a_TW"; -SECTION_DEAD static char const* const stringBase_8098779E = "MAN_b"; -SECTION_DEAD static char const* const stringBase_809877A4 = "MAN_b_TW"; -SECTION_DEAD static char const* const stringBase_809877AD = "MAN_c"; -SECTION_DEAD static char const* const stringBase_809877B3 = "MAN_c_TW"; -SECTION_DEAD static char const* const stringBase_809877BC = "MAS_a"; -SECTION_DEAD static char const* const stringBase_809877C2 = "MAS_a_TW"; -SECTION_DEAD static char const* const stringBase_809877CB = "MBN_a"; -SECTION_DEAD static char const* const stringBase_809877D1 = "MBN_a_TW"; -SECTION_DEAD static char const* const stringBase_809877DA = "MAN_a2"; -SECTION_DEAD static char const* const stringBase_809877E1 = "MAN_a2_TW"; -SECTION_DEAD static char const* const stringBase_809877EB = "MAD_a2"; -SECTION_DEAD static char const* const stringBase_809877F2 = "MAD_a2_TW"; -SECTION_DEAD static char const* const stringBase_809877FC = "MCN_a2"; -SECTION_DEAD static char const* const stringBase_80987803 = "MCN_a2_TW"; -SECTION_DEAD static char const* const stringBase_8098780D = "MON_a2"; -SECTION_DEAD static char const* const stringBase_80987814 = "MON_a2_TW"; -SECTION_DEAD static char const* const stringBase_8098781E = "MAN_b2"; -SECTION_DEAD static char const* const stringBase_80987825 = "MAN_b2_TW"; -SECTION_DEAD static char const* const stringBase_8098782F = "MAN_c2"; -SECTION_DEAD static char const* const stringBase_80987836 = "MAN_c2_TW"; -SECTION_DEAD static char const* const stringBase_80987840 = "MAS_a2"; -SECTION_DEAD static char const* const stringBase_80987847 = "MAS_a2_TW"; -SECTION_DEAD static char const* const stringBase_80987851 = "MBN_a2"; -SECTION_DEAD static char const* const stringBase_80987858 = "MBN_a2_TW"; -SECTION_DEAD static char const* const stringBase_80987862 = "WAN_a"; -SECTION_DEAD static char const* const stringBase_80987868 = "WAN_a_TW"; -SECTION_DEAD static char const* const stringBase_80987871 = "Wgeneral"; -SECTION_DEAD static char const* const stringBase_8098787A = "Wspecial"; -SECTION_DEAD static char const* const stringBase_80987883 = "WAD_a"; -SECTION_DEAD static char const* const stringBase_80987889 = "WAD_a_TW"; -SECTION_DEAD static char const* const stringBase_80987892 = "MAT_a"; -SECTION_DEAD static char const* const stringBase_80987898 = "MAT_a_TW"; -SECTION_DEAD static char const* const stringBase_809878A1 = "WCN_a"; -SECTION_DEAD static char const* const stringBase_809878A7 = "WCN_a_TW"; -SECTION_DEAD static char const* const stringBase_809878B0 = "WON_a"; -SECTION_DEAD static char const* const stringBase_809878B6 = "WON_a_TW"; -SECTION_DEAD static char const* const stringBase_809878BF = "WGN_a"; -SECTION_DEAD static char const* const stringBase_809878C5 = "WGN_a_TW"; -SECTION_DEAD static char const* const stringBase_809878CE = "WAN_b"; -SECTION_DEAD static char const* const stringBase_809878D4 = "WAN_b_TW"; -SECTION_DEAD static char const* const stringBase_809878DD = "WAN_a2"; -SECTION_DEAD static char const* const stringBase_809878E4 = "WAN_a2_TW"; -SECTION_DEAD static char const* const stringBase_809878EE = "WAD_a2"; -SECTION_DEAD static char const* const stringBase_809878F5 = "WAD_a2_TW"; -SECTION_DEAD static char const* const stringBase_809878FF = "MAT_a2"; -SECTION_DEAD static char const* const stringBase_80987906 = "MAT_a2_TW"; -SECTION_DEAD static char const* const stringBase_80987910 = "WCN_a2"; -SECTION_DEAD static char const* const stringBase_80987917 = "WCN_a2_TW"; -SECTION_DEAD static char const* const stringBase_80987921 = "WON_a2"; -SECTION_DEAD static char const* const stringBase_80987928 = "WON_a2_TW"; -SECTION_DEAD static char const* const stringBase_80987932 = "WGN_a2"; -SECTION_DEAD static char const* const stringBase_80987939 = "WGN_a2_TW"; -SECTION_DEAD static char const* const stringBase_80987943 = "WAN_b2"; -SECTION_DEAD static char const* const stringBase_8098794A = "WAN_b2_TW"; -SECTION_DEAD static char const* const stringBase_80987954 = "Chat"; -#pragma pop +/* 80987740-80987740 000DA4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/npc/d_a_npc_chin/d_a_npc_chin.cpp b/rel/d/a/npc/d_a_npc_chin/d_a_npc_chin.cpp index ac91b3e69e2..41c357b9e1b 100644 --- a/rel/d/a/npc/d_a_npc_chin/d_a_npc_chin.cpp +++ b/rel/d/a/npc/d_a_npc_chin/d_a_npc_chin.cpp @@ -55,12 +55,12 @@ struct mDoExt_baseAnm { /* 8000D428 */ void play(); }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; +struct J3DModelData {}; + struct Z2Creature { /* 802C03C8 */ Z2Creature(); /* 802C0420 */ ~Z2Creature(); @@ -80,14 +80,14 @@ struct fopAc_ac_c { /* 80018C8C */ ~fopAc_ac_c(); }; -struct _GXColorS10 {}; - struct J3DAnmTexPattern { /* 8032AF50 */ void getTexNo(u16, u16*) const; }; struct J3DAnmTransformKey {}; +struct _GXColorS10 {}; + struct daNpcF_c { struct daNpcF_anmPlayData {}; @@ -148,12 +148,12 @@ struct daNpcF_ActorMngr_c { /* 80990F14 */ daNpcF_ActorMngr_c(); }; +struct J3DModel {}; + struct dKy_tevstr_c {}; struct J3DJoint {}; -struct J3DModel {}; - struct daNpcChin_c { struct _SpotLight_c { /* 8098BF0C */ void loadModel(); @@ -259,7 +259,6 @@ struct dMsgFlow_c { struct dEvt_control_c { /* 80042468 */ void reset(); - /* 800436EC */ void setPtI_Id(unsigned int); }; struct dEvent_manager_c { @@ -722,7 +721,7 @@ extern "C" void SphSeProc__12_GlSph_Mng_cFv(); SECTION_RODATA static u8 const sLoadResPat_Normal[12] = { 0x00, 0x00, 0x00, 0x01, 0x00, 0x02, 0x00, 0x04, 0x00, 0x05, 0xFF, 0xFF, }; -COMPILER_STRIP_GATE(809918F8, &sLoadResPat_Normal); +COMPILER_STRIP_GATE(0x809918F8, &sLoadResPat_Normal); /* 80991904-8099190C 00000C 0006+02 1/0 0/0 0/0 .rodata sLoadResPat_Tw */ SECTION_RODATA static u8 const sLoadResPat_Tw[6 + 2 /* padding */] = { @@ -736,7 +735,7 @@ SECTION_RODATA static u8 const sLoadResPat_Tw[6 + 2 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80991904, &sLoadResPat_Tw); +COMPILER_STRIP_GATE(0x80991904, &sLoadResPat_Tw); /* 8099190C-80991978 000014 006C+00 4/9 0/0 0/0 .rodata m__17daNpcChin_Param_c */ SECTION_RODATA u8 const daNpcChin_Param_c::m[108] = { @@ -748,11 +747,11 @@ SECTION_RODATA u8 const daNpcChin_Param_c::m[108] = { 0x42, 0xA0, 0x00, 0x00, 0x43, 0xFA, 0x00, 0x00, 0x43, 0x96, 0x00, 0x00, 0xC3, 0x96, 0x00, 0x00, 0x00, 0x3C, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8099190C, &daNpcChin_Param_c::m); +COMPILER_STRIP_GATE(0x8099190C, &daNpcChin_Param_c::m); /* 80991978-8099197C 000080 0004+00 7/7 0/0 0/0 .rodata @3884 */ SECTION_RODATA static f32 const lit_3884 = 1.0f; -COMPILER_STRIP_GATE(80991978, &lit_3884); +COMPILER_STRIP_GATE(0x80991978, &lit_3884); /* 8099197C-80991980 000084 0004+00 5/8 0/0 0/0 .rodata @3885 */ SECTION_RODATA static u8 const lit_3885[4] = { @@ -761,7 +760,18 @@ SECTION_RODATA static u8 const lit_3885[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(8099197C, &lit_3885); +COMPILER_STRIP_GATE(0x8099197C, &lit_3885); + +/* 80991D40-80991D40 000448 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80991D40 = "Chin"; +SECTION_DEAD static char const* const stringBase_80991D45 = "chin1"; +SECTION_DEAD static char const* const stringBase_80991D4B = "chin_mdl"; +SECTION_DEAD static char const* const stringBase_80991D54 = "chin_tmdl"; +SECTION_DEAD static char const* const stringBase_80991D5E = "chin1_evt"; +SECTION_DEAD static char const* const stringBase_80991D68 = "SpotLight"; +#pragma pop /* 80991DDC-80991DE8 000000 000C+00 5/5 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { @@ -880,6 +890,19 @@ asm void daNpcChin_c::_SpotLight_c::draw(dKy_tevstr_c* param_0) { #pragma pop /* ############################################################################################## */ +/* 80991D40-80991D40 000448 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80991D72 = "GAME_START"; +SECTION_DEAD static char const* const stringBase_80991D7D = "GAME_FAILED"; +SECTION_DEAD static char const* const stringBase_80991D89 = "GAME_SUCCEED"; +SECTION_DEAD static char const* const stringBase_80991D96 = "SELECT_GAME_GIVEUP"; +SECTION_DEAD static char const* const stringBase_80991DA9 = "GAME_GIVEUP"; +SECTION_DEAD static char const* const stringBase_80991DB5 = "CHIN_APPEAR"; +SECTION_DEAD static char const* const stringBase_80991DC1 = "SPOTLIGHT_OFF"; +SECTION_DEAD static char const* const stringBase_80991DCF = "chin"; +#pragma pop + /* 809920C0-809920C8 -00001 0008+00 2/2 0/0 0/0 .data sLoadResInfo */ SECTION_DATA static void* sLoadResInfo[2] = { (void*)&sLoadResPat_Normal, @@ -1312,42 +1335,42 @@ asm daNpcChin_c::~daNpcChin_c() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4356 = -160.0f; -COMPILER_STRIP_GATE(80991980, &lit_4356); +COMPILER_STRIP_GATE(0x80991980, &lit_4356); #pragma pop /* 80991984-80991988 00008C 0004+00 0/1 0/0 0/0 .rodata @4357 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4357 = -1300.0f; -COMPILER_STRIP_GATE(80991984, &lit_4357); +COMPILER_STRIP_GATE(0x80991984, &lit_4357); #pragma pop /* 80991988-8099198C 000090 0004+00 0/1 0/0 0/0 .rodata @4358 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4358 = 160.0f; -COMPILER_STRIP_GATE(80991988, &lit_4358); +COMPILER_STRIP_GATE(0x80991988, &lit_4358); #pragma pop /* 8099198C-80991990 000094 0004+00 0/1 0/0 0/0 .rodata @4359 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4359 = 1300.0f; -COMPILER_STRIP_GATE(8099198C, &lit_4359); +COMPILER_STRIP_GATE(0x8099198C, &lit_4359); #pragma pop /* 80991990-80991994 000098 0004+00 0/1 0/0 0/0 .rodata @4360 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4360 = -50.0f; -COMPILER_STRIP_GATE(80991990, &lit_4360); +COMPILER_STRIP_GATE(0x80991990, &lit_4360); #pragma pop /* 80991994-80991998 00009C 0004+00 0/1 0/0 0/0 .rodata @4361 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4361 = 220.0f; -COMPILER_STRIP_GATE(80991994, &lit_4361); +COMPILER_STRIP_GATE(0x80991994, &lit_4361); #pragma pop /* 8098C510-8098C858 0006F0 0348+00 1/1 0/0 0/0 .text Create__11daNpcChin_cFv */ @@ -1505,7 +1528,7 @@ asm void daNpcChin_c::Draw() { SECTION_RODATA static u8 const lit_4473[12] = { 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x04, }; -COMPILER_STRIP_GATE(80991998, &lit_4473); +COMPILER_STRIP_GATE(0x80991998, &lit_4473); /* 8098CDE8-8098CFB8 000FC8 01D0+00 1/1 0/0 0/0 .text * ctrlJoint__11daNpcChin_cFP8J3DJointP8J3DModel */ @@ -1563,7 +1586,7 @@ asm void daNpcChin_c::main() { /* ############################################################################################## */ /* 809919A4-809919A8 0000AC 0004+00 18/18 0/0 0/0 .rodata @4627 */ SECTION_RODATA static f32 const lit_4627 = -1.0f; -COMPILER_STRIP_GATE(809919A4, &lit_4627); +COMPILER_STRIP_GATE(0x809919A4, &lit_4627); /* 8098D198-8098D26C 001378 00D4+00 1/0 0/0 0/0 .text ctrlBtk__11daNpcChin_cFv */ #pragma push @@ -1580,14 +1603,14 @@ asm void daNpcChin_c::ctrlBtk() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4709 = -30.0f; -COMPILER_STRIP_GATE(809919A8, &lit_4709); +COMPILER_STRIP_GATE(0x809919A8, &lit_4709); #pragma pop /* 809919AC-809919B0 0000B4 0004+00 0/1 0/0 0/0 .rodata @4710 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4710 = 10.0f; -COMPILER_STRIP_GATE(809919AC, &lit_4710); +COMPILER_STRIP_GATE(0x809919AC, &lit_4710); #pragma pop /* 809919B0-809919B8 0000B8 0008+00 0/1 0/0 0/0 .rodata @4711 */ @@ -1596,7 +1619,7 @@ COMPILER_STRIP_GATE(809919AC, &lit_4710); SECTION_RODATA static u8 const lit_4711[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809919B0, &lit_4711); +COMPILER_STRIP_GATE(0x809919B0, &lit_4711); #pragma pop /* 809919B8-809919C0 0000C0 0008+00 0/1 0/0 0/0 .rodata @4712 */ @@ -1605,7 +1628,7 @@ COMPILER_STRIP_GATE(809919B0, &lit_4711); SECTION_RODATA static u8 const lit_4712[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809919B8, &lit_4712); +COMPILER_STRIP_GATE(0x809919B8, &lit_4712); #pragma pop /* 809919C0-809919C8 0000C8 0008+00 0/1 0/0 0/0 .rodata @4713 */ @@ -1614,7 +1637,7 @@ COMPILER_STRIP_GATE(809919B8, &lit_4712); SECTION_RODATA static u8 const lit_4713[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809919C0, &lit_4713); +COMPILER_STRIP_GATE(0x809919C0, &lit_4713); #pragma pop /* 8098D26C-8098D58C 00144C 0320+00 1/0 0/0 0/0 .text setAttnPos__11daNpcChin_cFv */ @@ -1654,35 +1677,35 @@ asm void daNpcChin_c::setExpressionBtp(int param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4804 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(809919C8, &lit_4804); +COMPILER_STRIP_GATE(0x809919C8, &lit_4804); #pragma pop /* 809919CC-809919D0 0000D4 0004+00 0/1 0/0 0/0 .rodata @4805 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4805 = -1.0f / 20.0f; -COMPILER_STRIP_GATE(809919CC, &lit_4805); +COMPILER_STRIP_GATE(0x809919CC, &lit_4805); #pragma pop /* 809919D0-809919D4 0000D8 0004+00 0/0 0/0 0/0 .rodata @4806 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4806 = 3.0f / 20.0f; -COMPILER_STRIP_GATE(809919D0, &lit_4806); +COMPILER_STRIP_GATE(0x809919D0, &lit_4806); #pragma pop /* 809919D4-809919D8 0000DC 0004+00 0/0 0/0 0/0 .rodata @4807 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4807 = -1.0f / 5.0f; -COMPILER_STRIP_GATE(809919D4, &lit_4807); +COMPILER_STRIP_GATE(0x809919D4, &lit_4807); #pragma pop /* 809919D8-809919DC 0000E0 0004+00 0/1 0/0 0/0 .rodata @4808 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4808 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(809919D8, &lit_4808); +COMPILER_STRIP_GATE(0x809919D8, &lit_4808); #pragma pop /* 8098D938-8098DB44 001B18 020C+00 2/0 0/0 0/0 .text setMotionAnm__11daNpcChin_cFif */ @@ -1735,14 +1758,14 @@ asm void daNpcChin_c::reset() { #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4809 = 0x3FCCCCCC; -COMPILER_STRIP_GATE(809919DC, &lit_4809); +COMPILER_STRIP_GATE(0x809919DC, &lit_4809); #pragma pop /* 809919E0-809919E4 0000E8 0004+00 0/0 0/0 0/0 .rodata @4810 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4810 = -1.0f / 10.0f; -COMPILER_STRIP_GATE(809919E0, &lit_4810); +COMPILER_STRIP_GATE(0x809919E0, &lit_4810); #pragma pop /* 809919E4-809919F0 0000EC 000C+00 0/1 0/0 0/0 .rodata @4856 */ @@ -1751,7 +1774,7 @@ COMPILER_STRIP_GATE(809919E0, &lit_4810); SECTION_RODATA static u8 const lit_4856[12] = { 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809919E4, &lit_4856); +COMPILER_STRIP_GATE(0x809919E4, &lit_4856); #pragma pop /* 809919F0-809919F4 0000F8 0004+00 0/1 0/0 0/0 .rodata @4857 */ @@ -1763,7 +1786,7 @@ SECTION_RODATA static u8 const lit_4857[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(809919F0, &lit_4857); +COMPILER_STRIP_GATE(0x809919F0, &lit_4857); #pragma pop /* 809919F4-80991A00 0000FC 000C+00 0/1 0/0 0/0 .rodata @4858 */ @@ -1772,7 +1795,7 @@ COMPILER_STRIP_GATE(809919F0, &lit_4857); SECTION_RODATA static u8 const lit_4858[12] = { 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809919F4, &lit_4858); +COMPILER_STRIP_GATE(0x809919F4, &lit_4858); #pragma pop /* 80991A00-80991A04 000108 0004+00 0/1 0/0 0/0 .rodata @4859 */ @@ -1784,7 +1807,7 @@ SECTION_RODATA static u8 const lit_4859[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80991A00, &lit_4859); +COMPILER_STRIP_GATE(0x80991A00, &lit_4859); #pragma pop /* 80991A04-80991A10 00010C 000C+00 0/1 0/0 0/0 .rodata @4860 */ @@ -1793,7 +1816,7 @@ COMPILER_STRIP_GATE(80991A00, &lit_4859); SECTION_RODATA static u8 const lit_4860[12] = { 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80991A04, &lit_4860); +COMPILER_STRIP_GATE(0x80991A04, &lit_4860); #pragma pop /* 80991A10-80991A14 000118 0004+00 0/1 0/0 0/0 .rodata @4861 */ @@ -1805,7 +1828,7 @@ SECTION_RODATA static u8 const lit_4861[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80991A10, &lit_4861); +COMPILER_STRIP_GATE(0x80991A10, &lit_4861); #pragma pop /* 80991A14-80991A20 00011C 000C+00 0/1 0/0 0/0 .rodata @4862 */ @@ -1814,7 +1837,7 @@ COMPILER_STRIP_GATE(80991A10, &lit_4861); SECTION_RODATA static u8 const lit_4862[12] = { 0x00, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80991A14, &lit_4862); +COMPILER_STRIP_GATE(0x80991A14, &lit_4862); #pragma pop /* 80991A20-80991A24 000128 0004+00 0/1 0/0 0/0 .rodata @4863 */ @@ -1826,7 +1849,7 @@ SECTION_RODATA static u8 const lit_4863[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80991A20, &lit_4863); +COMPILER_STRIP_GATE(0x80991A20, &lit_4863); #pragma pop /* 80991A24-80991A30 00012C 000C+00 0/1 0/0 0/0 .rodata @4864 */ @@ -1835,7 +1858,7 @@ COMPILER_STRIP_GATE(80991A20, &lit_4863); SECTION_RODATA static u8 const lit_4864[12] = { 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80991A24, &lit_4864); +COMPILER_STRIP_GATE(0x80991A24, &lit_4864); #pragma pop /* 80991A30-80991A34 000138 0004+00 0/1 0/0 0/0 .rodata @4865 */ @@ -1847,7 +1870,7 @@ SECTION_RODATA static u8 const lit_4865[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80991A30, &lit_4865); +COMPILER_STRIP_GATE(0x80991A30, &lit_4865); #pragma pop /* 80991A34-80991A40 00013C 000C+00 0/1 0/0 0/0 .rodata @4866 */ @@ -1856,7 +1879,7 @@ COMPILER_STRIP_GATE(80991A30, &lit_4865); SECTION_RODATA static u8 const lit_4866[12] = { 0x00, 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80991A34, &lit_4866); +COMPILER_STRIP_GATE(0x80991A34, &lit_4866); #pragma pop /* 80991A40-80991A44 000148 0004+00 0/1 0/0 0/0 .rodata @4867 */ @@ -1868,7 +1891,7 @@ SECTION_RODATA static u8 const lit_4867[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80991A40, &lit_4867); +COMPILER_STRIP_GATE(0x80991A40, &lit_4867); #pragma pop /* 80991A44-80991A50 00014C 000C+00 0/1 0/0 0/0 .rodata @4868 */ @@ -1877,7 +1900,7 @@ COMPILER_STRIP_GATE(80991A40, &lit_4867); SECTION_RODATA static u8 const lit_4868[12] = { 0x00, 0x0B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80991A44, &lit_4868); +COMPILER_STRIP_GATE(0x80991A44, &lit_4868); #pragma pop /* 80991A50-80991A54 000158 0004+00 0/1 0/0 0/0 .rodata @4869 */ @@ -1889,7 +1912,7 @@ SECTION_RODATA static u8 const lit_4869[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80991A50, &lit_4869); +COMPILER_STRIP_GATE(0x80991A50, &lit_4869); #pragma pop /* 80991A54-80991A60 00015C 000C+00 0/1 0/0 0/0 .rodata @4870 */ @@ -1898,7 +1921,7 @@ COMPILER_STRIP_GATE(80991A50, &lit_4869); SECTION_RODATA static u8 const lit_4870[12] = { 0x00, 0x0D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80991A54, &lit_4870); +COMPILER_STRIP_GATE(0x80991A54, &lit_4870); #pragma pop /* 80991A60-80991A64 000168 0004+00 0/1 0/0 0/0 .rodata @4871 */ @@ -1910,7 +1933,7 @@ SECTION_RODATA static u8 const lit_4871[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80991A60, &lit_4871); +COMPILER_STRIP_GATE(0x80991A60, &lit_4871); #pragma pop /* 80991A64-80991A70 00016C 000C+00 0/1 0/0 0/0 .rodata @4872 */ @@ -1919,7 +1942,7 @@ COMPILER_STRIP_GATE(80991A60, &lit_4871); SECTION_RODATA static u8 const lit_4872[12] = { 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80991A64, &lit_4872); +COMPILER_STRIP_GATE(0x80991A64, &lit_4872); #pragma pop /* 80991A70-80991A74 000178 0004+00 0/1 0/0 0/0 .rodata @4873 */ @@ -1931,7 +1954,7 @@ SECTION_RODATA static u8 const lit_4873[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80991A70, &lit_4873); +COMPILER_STRIP_GATE(0x80991A70, &lit_4873); #pragma pop /* 80991A74-80991A80 00017C 000C+00 0/1 0/0 0/0 .rodata @4874 */ @@ -1940,7 +1963,7 @@ COMPILER_STRIP_GATE(80991A70, &lit_4873); SECTION_RODATA static u8 const lit_4874[12] = { 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80991A74, &lit_4874); +COMPILER_STRIP_GATE(0x80991A74, &lit_4874); #pragma pop /* 80991A80-80991A84 000188 0004+00 0/1 0/0 0/0 .rodata @4875 */ @@ -1952,7 +1975,7 @@ SECTION_RODATA static u8 const lit_4875[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80991A80, &lit_4875); +COMPILER_STRIP_GATE(0x80991A80, &lit_4875); #pragma pop /* 80991A84-80991A90 00018C 000C+00 0/1 0/0 0/0 .rodata @4876 */ @@ -1961,7 +1984,7 @@ COMPILER_STRIP_GATE(80991A80, &lit_4875); SECTION_RODATA static u8 const lit_4876[12] = { 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80991A84, &lit_4876); +COMPILER_STRIP_GATE(0x80991A84, &lit_4876); #pragma pop /* 80991A90-80991A94 000198 0004+00 0/1 0/0 0/0 .rodata @4877 */ @@ -1973,7 +1996,7 @@ SECTION_RODATA static u8 const lit_4877[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80991A90, &lit_4877); +COMPILER_STRIP_GATE(0x80991A90, &lit_4877); #pragma pop /* 80991A94-80991AA0 00019C 000C+00 0/1 0/0 0/0 .rodata @4878 */ @@ -1982,7 +2005,7 @@ COMPILER_STRIP_GATE(80991A90, &lit_4877); SECTION_RODATA static u8 const lit_4878[12] = { 0x00, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80991A94, &lit_4878); +COMPILER_STRIP_GATE(0x80991A94, &lit_4878); #pragma pop /* 80991AA0-80991AA4 0001A8 0004+00 0/1 0/0 0/0 .rodata @4879 */ @@ -1994,7 +2017,7 @@ SECTION_RODATA static u8 const lit_4879[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80991AA0, &lit_4879); +COMPILER_STRIP_GATE(0x80991AA0, &lit_4879); #pragma pop /* 80991AA4-80991AB0 0001AC 000C+00 0/1 0/0 0/0 .rodata @4880 */ @@ -2003,7 +2026,7 @@ COMPILER_STRIP_GATE(80991AA0, &lit_4879); SECTION_RODATA static u8 const lit_4880[12] = { 0x00, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80991AA4, &lit_4880); +COMPILER_STRIP_GATE(0x80991AA4, &lit_4880); #pragma pop /* 80991AB0-80991AB4 0001B8 0004+00 0/1 0/0 0/0 .rodata @4881 */ @@ -2015,7 +2038,7 @@ SECTION_RODATA static u8 const lit_4881[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80991AB0, &lit_4881); +COMPILER_STRIP_GATE(0x80991AB0, &lit_4881); #pragma pop /* 80991AB4-80991AC0 0001BC 000C+00 0/1 0/0 0/0 .rodata @4882 */ @@ -2024,7 +2047,7 @@ COMPILER_STRIP_GATE(80991AB0, &lit_4881); SECTION_RODATA static u8 const lit_4882[12] = { 0x00, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80991AB4, &lit_4882); +COMPILER_STRIP_GATE(0x80991AB4, &lit_4882); #pragma pop /* 80991AC0-80991AC4 0001C8 0004+00 0/1 0/0 0/0 .rodata @4883 */ @@ -2036,7 +2059,7 @@ SECTION_RODATA static u8 const lit_4883[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80991AC0, &lit_4883); +COMPILER_STRIP_GATE(0x80991AC0, &lit_4883); #pragma pop /* 80991AC4-80991AD0 0001CC 000C+00 0/1 0/0 0/0 .rodata @4884 */ @@ -2045,7 +2068,7 @@ COMPILER_STRIP_GATE(80991AC0, &lit_4883); SECTION_RODATA static u8 const lit_4884[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80991AC4, &lit_4884); +COMPILER_STRIP_GATE(0x80991AC4, &lit_4884); #pragma pop /* 80991AD0-80991AD4 0001D8 0004+00 0/1 0/0 0/0 .rodata @4885 */ @@ -2057,7 +2080,7 @@ SECTION_RODATA static u8 const lit_4885[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80991AD0, &lit_4885); +COMPILER_STRIP_GATE(0x80991AD0, &lit_4885); #pragma pop /* 8098DCD0-8098E04C 001EB0 037C+00 1/1 0/0 0/0 .text playExpression__11daNpcChin_cFv */ @@ -2080,7 +2103,7 @@ SECTION_RODATA static u8 const lit_4886[60] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80991AD4, &lit_4886); +COMPILER_STRIP_GATE(0x80991AD4, &lit_4886); #pragma pop /* 80991B10-80991B1C 000218 000C+00 0/1 0/0 0/0 .rodata @4910 */ @@ -2089,7 +2112,7 @@ COMPILER_STRIP_GATE(80991AD4, &lit_4886); SECTION_RODATA static u8 const lit_4910[12] = { 0x00, 0x0F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80991B10, &lit_4910); +COMPILER_STRIP_GATE(0x80991B10, &lit_4910); #pragma pop /* 80991B1C-80991B20 000224 0004+00 0/1 0/0 0/0 .rodata @4911 */ @@ -2101,7 +2124,7 @@ SECTION_RODATA static u8 const lit_4911[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80991B1C, &lit_4911); +COMPILER_STRIP_GATE(0x80991B1C, &lit_4911); #pragma pop /* 80991B20-80991B2C 000228 000C+00 0/1 0/0 0/0 .rodata @4912 */ @@ -2110,7 +2133,7 @@ COMPILER_STRIP_GATE(80991B1C, &lit_4911); SECTION_RODATA static u8 const lit_4912[12] = { 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80991B20, &lit_4912); +COMPILER_STRIP_GATE(0x80991B20, &lit_4912); #pragma pop /* 80991B2C-80991B38 000234 000C+00 0/1 0/0 0/0 .rodata @4913 */ @@ -2119,7 +2142,7 @@ COMPILER_STRIP_GATE(80991B20, &lit_4912); SECTION_RODATA static u8 const lit_4913[12] = { 0x00, 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80991B2C, &lit_4913); +COMPILER_STRIP_GATE(0x80991B2C, &lit_4913); #pragma pop /* 80991B38-80991B40 000240 0008+00 0/1 0/0 0/0 .rodata @4914 */ @@ -2128,7 +2151,7 @@ COMPILER_STRIP_GATE(80991B2C, &lit_4913); SECTION_RODATA static u8 const lit_4914[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80991B38, &lit_4914); +COMPILER_STRIP_GATE(0x80991B38, &lit_4914); #pragma pop /* 80991B40-80991B4C 000248 000C+00 0/1 0/0 0/0 .rodata @4915 */ @@ -2137,7 +2160,7 @@ COMPILER_STRIP_GATE(80991B38, &lit_4914); SECTION_RODATA static u8 const lit_4915[12] = { 0x00, 0x17, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80991B40, &lit_4915); +COMPILER_STRIP_GATE(0x80991B40, &lit_4915); #pragma pop /* 80991B4C-80991B58 000254 000C+00 0/1 0/0 0/0 .rodata @4916 */ @@ -2146,7 +2169,7 @@ COMPILER_STRIP_GATE(80991B40, &lit_4915); SECTION_RODATA static u8 const lit_4916[12] = { 0x00, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80991B4C, &lit_4916); +COMPILER_STRIP_GATE(0x80991B4C, &lit_4916); #pragma pop /* 80991B58-80991B60 000260 0008+00 0/1 0/0 0/0 .rodata @4917 */ @@ -2155,7 +2178,7 @@ COMPILER_STRIP_GATE(80991B4C, &lit_4916); SECTION_RODATA static u8 const lit_4917[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80991B58, &lit_4917); +COMPILER_STRIP_GATE(0x80991B58, &lit_4917); #pragma pop /* 80991B60-80991B6C 000268 000C+00 0/1 0/0 0/0 .rodata @4918 */ @@ -2164,7 +2187,7 @@ COMPILER_STRIP_GATE(80991B58, &lit_4917); SECTION_RODATA static u8 const lit_4918[12] = { 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80991B60, &lit_4918); +COMPILER_STRIP_GATE(0x80991B60, &lit_4918); #pragma pop /* 80991B6C-80991B78 000274 000C+00 0/1 0/0 0/0 .rodata @4919 */ @@ -2173,7 +2196,7 @@ COMPILER_STRIP_GATE(80991B60, &lit_4918); SECTION_RODATA static u8 const lit_4919[12] = { 0x00, 0x15, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80991B6C, &lit_4919); +COMPILER_STRIP_GATE(0x80991B6C, &lit_4919); #pragma pop /* 80991B78-80991B80 000280 0008+00 0/1 0/0 0/0 .rodata @4920 */ @@ -2182,7 +2205,7 @@ COMPILER_STRIP_GATE(80991B6C, &lit_4919); SECTION_RODATA static u8 const lit_4920[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80991B78, &lit_4920); +COMPILER_STRIP_GATE(0x80991B78, &lit_4920); #pragma pop /* 80991B80-80991B8C 000288 000C+00 0/1 0/0 0/0 .rodata @4921 */ @@ -2191,7 +2214,7 @@ COMPILER_STRIP_GATE(80991B78, &lit_4920); SECTION_RODATA static u8 const lit_4921[12] = { 0x00, 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80991B80, &lit_4921); +COMPILER_STRIP_GATE(0x80991B80, &lit_4921); #pragma pop /* 80991B8C-80991B98 000294 000C+00 0/1 0/0 0/0 .rodata @4922 */ @@ -2200,7 +2223,7 @@ COMPILER_STRIP_GATE(80991B80, &lit_4921); SECTION_RODATA static u8 const lit_4922[12] = { 0x00, 0x1C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80991B8C, &lit_4922); +COMPILER_STRIP_GATE(0x80991B8C, &lit_4922); #pragma pop /* 80991B98-80991BA0 0002A0 0008+00 0/1 0/0 0/0 .rodata @4923 */ @@ -2209,7 +2232,7 @@ COMPILER_STRIP_GATE(80991B8C, &lit_4922); SECTION_RODATA static u8 const lit_4923[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80991B98, &lit_4923); +COMPILER_STRIP_GATE(0x80991B98, &lit_4923); #pragma pop /* 80991BA0-80991BAC 0002A8 000C+00 0/1 0/0 0/0 .rodata @4924 */ @@ -2218,7 +2241,7 @@ COMPILER_STRIP_GATE(80991B98, &lit_4923); SECTION_RODATA static u8 const lit_4924[12] = { 0x00, 0x19, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80991BA0, &lit_4924); +COMPILER_STRIP_GATE(0x80991BA0, &lit_4924); #pragma pop /* 80991BAC-80991BB8 0002B4 000C+00 0/1 0/0 0/0 .rodata @4925 */ @@ -2227,7 +2250,7 @@ COMPILER_STRIP_GATE(80991BA0, &lit_4924); SECTION_RODATA static u8 const lit_4925[12] = { 0x00, 0x1A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80991BAC, &lit_4925); +COMPILER_STRIP_GATE(0x80991BAC, &lit_4925); #pragma pop /* 80991BB8-80991BC0 0002C0 0008+00 0/1 0/0 0/0 .rodata @4926 */ @@ -2236,7 +2259,7 @@ COMPILER_STRIP_GATE(80991BAC, &lit_4925); SECTION_RODATA static u8 const lit_4926[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80991BB8, &lit_4926); +COMPILER_STRIP_GATE(0x80991BB8, &lit_4926); #pragma pop /* 80991BC0-80991BCC 0002C8 000C+00 0/1 0/0 0/0 .rodata @4927 */ @@ -2245,7 +2268,7 @@ COMPILER_STRIP_GATE(80991BB8, &lit_4926); SECTION_RODATA static u8 const lit_4927[12] = { 0x00, 0x1D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80991BC0, &lit_4927); +COMPILER_STRIP_GATE(0x80991BC0, &lit_4927); #pragma pop /* 80991BCC-80991BD8 0002D4 000C+00 0/1 0/0 0/0 .rodata @4928 */ @@ -2254,7 +2277,7 @@ COMPILER_STRIP_GATE(80991BC0, &lit_4927); SECTION_RODATA static u8 const lit_4928[12] = { 0x00, 0x1E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80991BCC, &lit_4928); +COMPILER_STRIP_GATE(0x80991BCC, &lit_4928); #pragma pop /* 80991BD8-80991BE0 0002E0 0008+00 0/1 0/0 0/0 .rodata @4929 */ @@ -2263,7 +2286,7 @@ COMPILER_STRIP_GATE(80991BCC, &lit_4928); SECTION_RODATA static u8 const lit_4929[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80991BD8, &lit_4929); +COMPILER_STRIP_GATE(0x80991BD8, &lit_4929); #pragma pop /* 80991BE0-80991BEC 0002E8 000C+00 0/1 0/0 0/0 .rodata @4930 */ @@ -2272,7 +2295,7 @@ COMPILER_STRIP_GATE(80991BD8, &lit_4929); SECTION_RODATA static u8 const lit_4930[12] = { 0x00, 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80991BE0, &lit_4930); +COMPILER_STRIP_GATE(0x80991BE0, &lit_4930); #pragma pop /* 80991BEC-80991BF8 0002F4 000C+00 0/1 0/0 0/0 .rodata @4931 */ @@ -2281,7 +2304,7 @@ COMPILER_STRIP_GATE(80991BE0, &lit_4930); SECTION_RODATA static u8 const lit_4931[12] = { 0x00, 0x1A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80991BEC, &lit_4931); +COMPILER_STRIP_GATE(0x80991BEC, &lit_4931); #pragma pop /* 80991BF8-80991C00 000300 0008+00 0/1 0/0 0/0 .rodata @4932 */ @@ -2290,7 +2313,7 @@ COMPILER_STRIP_GATE(80991BEC, &lit_4931); SECTION_RODATA static u8 const lit_4932[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80991BF8, &lit_4932); +COMPILER_STRIP_GATE(0x80991BF8, &lit_4932); #pragma pop /* 80991C00-80991C0C 000308 000C+00 0/1 0/0 0/0 .rodata @4933 */ @@ -2299,7 +2322,7 @@ COMPILER_STRIP_GATE(80991BF8, &lit_4932); SECTION_RODATA static u8 const lit_4933[12] = { 0x00, 0x1F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80991C00, &lit_4933); +COMPILER_STRIP_GATE(0x80991C00, &lit_4933); #pragma pop /* 80991C0C-80991C18 000314 000C+00 0/1 0/0 0/0 .rodata @4934 */ @@ -2308,7 +2331,7 @@ COMPILER_STRIP_GATE(80991C00, &lit_4933); SECTION_RODATA static u8 const lit_4934[12] = { 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80991C0C, &lit_4934); +COMPILER_STRIP_GATE(0x80991C0C, &lit_4934); #pragma pop /* 80991C18-80991C20 000320 0008+00 0/1 0/0 0/0 .rodata @4935 */ @@ -2317,7 +2340,7 @@ COMPILER_STRIP_GATE(80991C0C, &lit_4934); SECTION_RODATA static u8 const lit_4935[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80991C18, &lit_4935); +COMPILER_STRIP_GATE(0x80991C18, &lit_4935); #pragma pop /* 80991C20-80991C2C 000328 000C+00 0/1 0/0 0/0 .rodata @4936 */ @@ -2326,7 +2349,7 @@ COMPILER_STRIP_GATE(80991C18, &lit_4935); SECTION_RODATA static u8 const lit_4936[12] = { 0x00, 0x13, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80991C20, &lit_4936); +COMPILER_STRIP_GATE(0x80991C20, &lit_4936); #pragma pop /* 80991C2C-80991C38 000334 000C+00 0/1 0/0 0/0 .rodata @4937 */ @@ -2335,7 +2358,7 @@ COMPILER_STRIP_GATE(80991C20, &lit_4936); SECTION_RODATA static u8 const lit_4937[12] = { 0x00, 0x0F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80991C2C, &lit_4937); +COMPILER_STRIP_GATE(0x80991C2C, &lit_4937); #pragma pop /* 80991C38-80991C40 000340 0008+00 0/1 0/0 0/0 .rodata @4938 */ @@ -2344,7 +2367,7 @@ COMPILER_STRIP_GATE(80991C2C, &lit_4937); SECTION_RODATA static u8 const lit_4938[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80991C38, &lit_4938); +COMPILER_STRIP_GATE(0x80991C38, &lit_4938); #pragma pop /* 80991C40-80991C4C 000348 000C+00 0/1 0/0 0/0 .rodata @4939 */ @@ -2353,7 +2376,7 @@ COMPILER_STRIP_GATE(80991C38, &lit_4938); SECTION_RODATA static u8 const lit_4939[12] = { 0x00, 0x15, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80991C40, &lit_4939); +COMPILER_STRIP_GATE(0x80991C40, &lit_4939); #pragma pop /* 80991C4C-80991C50 000354 0004+00 0/1 0/0 0/0 .rodata @4940 */ @@ -2365,7 +2388,7 @@ SECTION_RODATA static u8 const lit_4940[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80991C4C, &lit_4940); +COMPILER_STRIP_GATE(0x80991C4C, &lit_4940); #pragma pop /* 80991C50-80991C5C 000358 000C+00 0/1 0/0 0/0 .rodata @4941 */ @@ -2374,7 +2397,7 @@ COMPILER_STRIP_GATE(80991C4C, &lit_4940); SECTION_RODATA static u8 const lit_4941[12] = { 0x00, 0x1C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80991C50, &lit_4941); +COMPILER_STRIP_GATE(0x80991C50, &lit_4941); #pragma pop /* 80991C5C-80991C60 000364 0004+00 0/1 0/0 0/0 .rodata @4942 */ @@ -2386,7 +2409,7 @@ SECTION_RODATA static u8 const lit_4942[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80991C5C, &lit_4942); +COMPILER_STRIP_GATE(0x80991C5C, &lit_4942); #pragma pop /* 80991C60-80991C6C 000368 000C+00 0/1 0/0 0/0 .rodata @4943 */ @@ -2395,7 +2418,7 @@ COMPILER_STRIP_GATE(80991C5C, &lit_4942); SECTION_RODATA static u8 const lit_4943[12] = { 0x00, 0x1A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80991C60, &lit_4943); +COMPILER_STRIP_GATE(0x80991C60, &lit_4943); #pragma pop /* 80991C6C-80991C70 000374 0004+00 0/1 0/0 0/0 .rodata @4944 */ @@ -2407,7 +2430,7 @@ SECTION_RODATA static u8 const lit_4944[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80991C6C, &lit_4944); +COMPILER_STRIP_GATE(0x80991C6C, &lit_4944); #pragma pop /* 80991C70-80991C7C 000378 000C+00 0/1 0/0 0/0 .rodata @4945 */ @@ -2416,7 +2439,7 @@ COMPILER_STRIP_GATE(80991C6C, &lit_4944); SECTION_RODATA static u8 const lit_4945[12] = { 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80991C70, &lit_4945); +COMPILER_STRIP_GATE(0x80991C70, &lit_4945); #pragma pop /* 80991C7C-80991C80 000384 0004+00 0/1 0/0 0/0 .rodata @4946 */ @@ -2428,7 +2451,7 @@ SECTION_RODATA static u8 const lit_4946[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80991C7C, &lit_4946); +COMPILER_STRIP_GATE(0x80991C7C, &lit_4946); #pragma pop /* 80991C80-80991C8C 000388 000C+00 0/1 0/0 0/0 .rodata @4947 */ @@ -2437,7 +2460,7 @@ COMPILER_STRIP_GATE(80991C7C, &lit_4946); SECTION_RODATA static u8 const lit_4947[12] = { 0x00, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80991C80, &lit_4947); +COMPILER_STRIP_GATE(0x80991C80, &lit_4947); #pragma pop /* 80991C8C-80991C90 000394 0004+00 0/1 0/0 0/0 .rodata @4948 */ @@ -2449,7 +2472,7 @@ SECTION_RODATA static u8 const lit_4948[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80991C8C, &lit_4948); +COMPILER_STRIP_GATE(0x80991C8C, &lit_4948); #pragma pop /* 80991C90-80991C9C 000398 000C+00 0/1 0/0 0/0 .rodata @4949 */ @@ -2458,7 +2481,7 @@ COMPILER_STRIP_GATE(80991C8C, &lit_4948); SECTION_RODATA static u8 const lit_4949[12] = { 0x00, 0x1E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80991C90, &lit_4949); +COMPILER_STRIP_GATE(0x80991C90, &lit_4949); #pragma pop /* 80991C9C-80991CA0 0003A4 0004+00 0/1 0/0 0/0 .rodata @4950 */ @@ -2470,7 +2493,7 @@ SECTION_RODATA static u8 const lit_4950[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80991C9C, &lit_4950); +COMPILER_STRIP_GATE(0x80991C9C, &lit_4950); #pragma pop /* 80991CA0-80991CAC 0003A8 000C+00 0/1 0/0 0/0 .rodata @4951 */ @@ -2479,7 +2502,7 @@ COMPILER_STRIP_GATE(80991C9C, &lit_4950); SECTION_RODATA static u8 const lit_4951[12] = { 0x00, 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80991CA0, &lit_4951); +COMPILER_STRIP_GATE(0x80991CA0, &lit_4951); #pragma pop /* 80991CAC-80991CB0 0003B4 0004+00 0/1 0/0 0/0 .rodata @4952 */ @@ -2491,7 +2514,7 @@ SECTION_RODATA static u8 const lit_4952[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80991CAC, &lit_4952); +COMPILER_STRIP_GATE(0x80991CAC, &lit_4952); #pragma pop /* 80991CB0-80991CBC 0003B8 000C+00 0/1 0/0 0/0 .rodata @4953 */ @@ -2500,7 +2523,7 @@ COMPILER_STRIP_GATE(80991CAC, &lit_4952); SECTION_RODATA static u8 const lit_4953[12] = { 0x00, 0x16, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80991CB0, &lit_4953); +COMPILER_STRIP_GATE(0x80991CB0, &lit_4953); #pragma pop /* 80991CBC-80991CC0 0003C4 0004+00 0/1 0/0 0/0 .rodata @4954 */ @@ -2512,7 +2535,7 @@ SECTION_RODATA static u8 const lit_4954[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80991CBC, &lit_4954); +COMPILER_STRIP_GATE(0x80991CBC, &lit_4954); #pragma pop /* 8098E04C-8098E5C4 00222C 0578+00 1/1 0/0 0/0 .text playMotion__11daNpcChin_cFv */ @@ -2530,7 +2553,7 @@ asm void daNpcChin_c::playMotion() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpcChin_c::setAction(bool (daNpcChin_c::*)(void*)) { +asm void daNpcChin_c::setAction(bool (daNpcChin_c::*param_0)(void*)) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_chin/d_a_npc_chin/setAction__11daNpcChin_cFM11daNpcChin_cFPCvPvPv_b.s" } @@ -2557,7 +2580,7 @@ SECTION_RODATA static u8 const lit_4955[72] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80991CC0, &lit_4955); +COMPILER_STRIP_GATE(0x80991CC0, &lit_4955); #pragma pop /* 80991D08-80991D14 000410 000C+00 0/1 0/0 0/0 .rodata @4999 */ @@ -2566,28 +2589,28 @@ COMPILER_STRIP_GATE(80991CC0, &lit_4955); SECTION_RODATA static u8 const lit_4999[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80991D08, &lit_4999); +COMPILER_STRIP_GATE(0x80991D08, &lit_4999); #pragma pop /* 80991D14-80991D18 00041C 0004+00 0/1 0/0 0/0 .rodata @5047 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5047 = -80.0f; -COMPILER_STRIP_GATE(80991D14, &lit_5047); +COMPILER_STRIP_GATE(0x80991D14, &lit_5047); #pragma pop /* 80991D18-80991D1C 000420 0004+00 0/1 0/0 0/0 .rodata @5048 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5048 = 80.0f; -COMPILER_STRIP_GATE(80991D18, &lit_5048); +COMPILER_STRIP_GATE(0x80991D18, &lit_5048); #pragma pop /* 80991D1C-80991D20 000424 0004+00 0/1 0/0 0/0 .rodata @5049 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5049 = 40.0f; -COMPILER_STRIP_GATE(80991D1C, &lit_5049); +COMPILER_STRIP_GATE(0x80991D1C, &lit_5049); #pragma pop /* 8098E690-8098E870 002870 01E0+00 1/1 0/0 0/0 .text lookat__11daNpcChin_cFv */ @@ -2607,13 +2630,13 @@ SECTION_RODATA static u32 const lit_5074[1 + 1 /* padding */] = { /* padding */ 0x00000000, }; -COMPILER_STRIP_GATE(80991D20, &lit_5074); +COMPILER_STRIP_GATE(0x80991D20, &lit_5074); /* 80991D28-80991D30 000430 0008+00 1/1 0/0 0/0 .rodata @5076 */ SECTION_RODATA static u8 const lit_5076[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80991D28, &lit_5076); +COMPILER_STRIP_GATE(0x80991D28, &lit_5076); /* 8098E870-8098EA00 002A50 0190+00 2/2 0/0 0/0 .text step__11daNpcChin_cFsii */ #pragma push @@ -2735,6 +2758,13 @@ asm void daNpcChin_c::SphereReset() { } #pragma pop +/* ############################################################################################## */ +/* 80991D40-80991D40 000448 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80991DD4 = "cutId"; +#pragma pop + /* 8098FD80-8098FE28 003F60 00A8+00 1/0 0/0 0/0 .text _Evt_GameStart__11daNpcChin_cFi */ #pragma push #pragma optimization_level 0 @@ -2750,28 +2780,28 @@ asm void daNpcChin_c::_Evt_GameStart(int param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5540 = 210.0f; -COMPILER_STRIP_GATE(80991D30, &lit_5540); +COMPILER_STRIP_GATE(0x80991D30, &lit_5540); #pragma pop /* 80991D34-80991D38 00043C 0004+00 0/1 0/0 0/0 .rodata @5541 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5541 = 410.0f; -COMPILER_STRIP_GATE(80991D34, &lit_5541); +COMPILER_STRIP_GATE(0x80991D34, &lit_5541); #pragma pop /* 80991D38-80991D3C 000440 0004+00 0/1 0/0 0/0 .rodata @5542 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5542 = 32.0f; -COMPILER_STRIP_GATE(80991D38, &lit_5542); +COMPILER_STRIP_GATE(0x80991D38, &lit_5542); #pragma pop /* 80991D3C-80991D40 000444 0004+00 0/1 0/0 0/0 .rodata @5543 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5543 = 419.0f; -COMPILER_STRIP_GATE(80991D3C, &lit_5543); +COMPILER_STRIP_GATE(0x80991D3C, &lit_5543); #pragma pop /* 8098FE28-8098FF30 004008 0108+00 1/1 0/0 0/0 .text _Evt_GameStart_CutInit__11daNpcChin_cFRCi */ @@ -3203,7 +3233,7 @@ asm void __sinit_d_a_npc_chin_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_8099166C = (void*)__sinit_d_a_npc_chin_cpp; +REGISTER_CTORS(0x8099166C, __sinit_d_a_npc_chin_cpp); #pragma pop /* 80991780-809917C8 005960 0048+00 1/0 0/0 0/0 .text __dt__12J3DFrameCtrlFv */ @@ -3276,23 +3306,4 @@ static asm void func_809918DC() { } #pragma pop -/* 80991D40-80991DDA 000448 009A+00 11/8 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80991D40 = "Chin"; -SECTION_DEAD static char const* const stringBase_80991D45 = "chin1"; -SECTION_DEAD static char const* const stringBase_80991D4B = "chin_mdl"; -SECTION_DEAD static char const* const stringBase_80991D54 = "chin_tmdl"; -SECTION_DEAD static char const* const stringBase_80991D5E = "chin1_evt"; -SECTION_DEAD static char const* const stringBase_80991D68 = "SpotLight"; -SECTION_DEAD static char const* const stringBase_80991D72 = "GAME_START"; -SECTION_DEAD static char const* const stringBase_80991D7D = "GAME_FAILED"; -SECTION_DEAD static char const* const stringBase_80991D89 = "GAME_SUCCEED"; -SECTION_DEAD static char const* const stringBase_80991D96 = "SELECT_GAME_GIVEUP"; -SECTION_DEAD static char const* const stringBase_80991DA9 = "GAME_GIVEUP"; -SECTION_DEAD static char const* const stringBase_80991DB5 = "CHIN_APPEAR"; -SECTION_DEAD static char const* const stringBase_80991DC1 = "SPOTLIGHT_OFF"; -SECTION_DEAD static char const* const stringBase_80991DCF = "chin"; -SECTION_DEAD static char const* const stringBase_80991DD4 = "cutId"; -#pragma pop +/* 80991D40-80991D40 000448 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/npc/d_a_npc_clerka/d_a_npc_clerka.cpp b/rel/d/a/npc/d_a_npc_clerka/d_a_npc_clerka.cpp index f6dab730873..ff66e212ba5 100644 --- a/rel/d/a/npc/d_a_npc_clerka/d_a_npc_clerka.cpp +++ b/rel/d/a/npc/d_a_npc_clerka/d_a_npc_clerka.cpp @@ -25,19 +25,19 @@ struct mDoMtx_stack_c { static u8 now[48]; }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; +struct J3DAnmTransform {}; + +struct J3DModelData {}; + struct Z2Creature { /* 802C03C8 */ Z2Creature(); /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -49,6 +49,8 @@ struct fopAc_ac_c { /* 80018B64 */ fopAc_ac_c(); }; +struct daNpcT_faceMotionAnmData_c {}; + struct daNpcT_MotionSeqMngr_c { struct sequenceStepData_c {}; @@ -57,14 +59,12 @@ struct daNpcT_MotionSeqMngr_c { /* 80994F78 */ ~daNpcT_MotionSeqMngr_c(); }; +struct daNpcT_evtData_c {}; + struct daNpcT_motionAnmData_c {}; struct J3DJoint {}; -struct daNpcT_faceMotionAnmData_c {}; - -struct daNpcT_evtData_c {}; - struct daNpc_clerkA_c { /* 8099252C */ ~daNpc_clerkA_c(); /* 8099266C */ void create(); @@ -122,10 +122,10 @@ struct dCcD_GObjInf { /* 800840E4 */ ~dCcD_GObjInf(); }; -struct J3DModel {}; - struct _GXColorS10 {}; +struct J3DModel {}; + struct daNpcT_c { /* 80147FA4 */ void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*); /* 801483F8 */ void loadRes(s8 const*, char const**); @@ -297,13 +297,13 @@ struct dBgS_AcchCir { /* 80994FC0 */ ~dBgS_AcchCir(); }; -struct dBgS {}; - struct csXyz { /* 80994A34 */ ~csXyz(); /* 80994E74 */ csXyz(); }; +struct dBgS {}; + struct dBgS_Acch { /* 80075F94 */ ~dBgS_Acch(); /* 800760A0 */ dBgS_Acch(); @@ -480,7 +480,7 @@ extern "C" void changeAnm__8daNpcT_cFPiPi(); extern "C" void changeBck__8daNpcT_cFPiPi(); extern "C" void changeBtp__8daNpcT_cFPiPi(); extern "C" void changeBtk__8daNpcT_cFPiPi(); -extern "C" void func_80995544(int*); +extern "C" void func_80995544(void* _this, int*); extern "C" void __sinit_d_a_npc_clerka_cpp(); extern "C" void __ct__14daNpc_clerkA_cFPC26daNpcT_faceMotionAnmData_cPC22daNpcT_motionAnmData_cPCQ222daNpcT_MotionSeqMngr_c18sequenceStepData_ciPCQ222daNpcT_MotionSeqMngr_c18sequenceStepData_ciPC16daNpcT_evtData_cPPc(); @@ -661,6 +661,15 @@ extern "C" void __register_global_object(); // /* ############################################################################################## */ +/* 80995970-80995970 000100 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80995970 = ""; +SECTION_DEAD static char const* const stringBase_80995971 = "DEFAULT_GETITEM"; +SECTION_DEAD static char const* const stringBase_80995981 = "NO_RESPONSE"; +SECTION_DEAD static char const* const stringBase_8099598D = "clerkA"; +#pragma pop + /* 80995994-809959A0 000000 000C+00 2/2 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -1024,41 +1033,41 @@ SECTION_RODATA u8 const daNpc_clerkA_Param_c::m[144] = { 0xC1, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC1, 0xA0, 0x00, 0x00, 0x41, 0xA0, 0x00, 0x00, 0x42, 0x20, 0x00, 0x00, 0x41, 0xA0, 0x00, 0x00, 0x42, 0xDC, 0x00, 0x00, 0x00, 0x78, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80995870, &daNpc_clerkA_Param_c::m); +COMPILER_STRIP_GATE(0x80995870, &daNpc_clerkA_Param_c::m); /* 80995900-80995904 000090 0004+00 0/1 0/0 0/0 .rodata @4027 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4027 = -300.0f; -COMPILER_STRIP_GATE(80995900, &lit_4027); +COMPILER_STRIP_GATE(0x80995900, &lit_4027); #pragma pop /* 80995904-80995908 000094 0004+00 0/1 0/0 0/0 .rodata @4028 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4028 = -50.0f; -COMPILER_STRIP_GATE(80995904, &lit_4028); +COMPILER_STRIP_GATE(0x80995904, &lit_4028); #pragma pop /* 80995908-8099590C 000098 0004+00 0/1 0/0 0/0 .rodata @4029 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4029 = 300.0f; -COMPILER_STRIP_GATE(80995908, &lit_4029); +COMPILER_STRIP_GATE(0x80995908, &lit_4029); #pragma pop /* 8099590C-80995910 00009C 0004+00 0/1 0/0 0/0 .rodata @4030 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4030 = 450.0f; -COMPILER_STRIP_GATE(8099590C, &lit_4030); +COMPILER_STRIP_GATE(0x8099590C, &lit_4030); #pragma pop /* 80995910-80995914 0000A0 0004+00 0/1 0/0 0/0 .rodata @4031 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4031 = -1000000000.0f; -COMPILER_STRIP_GATE(80995910, &lit_4031); +COMPILER_STRIP_GATE(0x80995910, &lit_4031); #pragma pop /* 8099266C-80992914 00022C 02A8+00 1/1 0/0 0/0 .text create__14daNpc_clerkA_cFv */ @@ -1076,21 +1085,21 @@ asm void daNpc_clerkA_c::create() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4120 = 0.25f; -COMPILER_STRIP_GATE(80995914, &lit_4120); +COMPILER_STRIP_GATE(0x80995914, &lit_4120); #pragma pop /* 80995918-8099591C 0000A8 0004+00 0/1 0/0 0/0 .rodata @4121 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4121 = 20.0f; -COMPILER_STRIP_GATE(80995918, &lit_4121); +COMPILER_STRIP_GATE(0x80995918, &lit_4121); #pragma pop /* 8099591C-80995920 0000AC 0004+00 0/1 0/0 0/0 .rodata @4122 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4122 = 5.0f; -COMPILER_STRIP_GATE(8099591C, &lit_4122); +COMPILER_STRIP_GATE(0x8099591C, &lit_4122); #pragma pop /* 80995920-80995924 0000B0 0004+00 5/12 0/0 0/0 .rodata @4123 */ @@ -1100,36 +1109,36 @@ SECTION_RODATA static u8 const lit_4123[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80995920, &lit_4123); +COMPILER_STRIP_GATE(0x80995920, &lit_4123); /* 80995924-80995928 0000B4 0004+00 1/3 0/0 0/0 .rodata @4124 */ SECTION_RODATA static f32 const lit_4124 = 100.0f; -COMPILER_STRIP_GATE(80995924, &lit_4124); +COMPILER_STRIP_GATE(0x80995924, &lit_4124); /* 80995928-8099592C 0000B8 0004+00 0/2 0/0 0/0 .rodata @4125 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4125 = 60.0f; -COMPILER_STRIP_GATE(80995928, &lit_4125); +COMPILER_STRIP_GATE(0x80995928, &lit_4125); #pragma pop /* 8099592C-80995930 0000BC 0004+00 0/2 0/0 0/0 .rodata @4346 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4346 = 65536.0f; -COMPILER_STRIP_GATE(8099592C, &lit_4346); +COMPILER_STRIP_GATE(0x8099592C, &lit_4346); #pragma pop /* 80995930-80995934 0000C0 0004+00 0/3 0/0 0/0 .rodata @4347 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4347 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(80995930, &lit_4347); +COMPILER_STRIP_GATE(0x80995930, &lit_4347); #pragma pop /* 80995934-80995938 0000C4 0004+00 2/4 0/0 0/0 .rodata @4490 */ SECTION_RODATA static f32 const lit_4490 = 1.0f; -COMPILER_STRIP_GATE(80995934, &lit_4490); +COMPILER_STRIP_GATE(0x80995934, &lit_4490); /* 80992914-80992B94 0004D4 0280+00 1/1 0/0 0/0 .text CreateHeap__14daNpc_clerkA_cFv */ #pragma push @@ -1346,7 +1355,7 @@ asm void daNpc_clerkA_c::setParam() { /* ############################################################################################## */ /* 80995938-8099593C 0000C8 0004+00 2/3 0/0 0/0 .rodata @4679 */ SECTION_RODATA static f32 const lit_4679 = -1.0f; -COMPILER_STRIP_GATE(80995938, &lit_4679); +COMPILER_STRIP_GATE(0x80995938, &lit_4679); /* 809932A4-80993330 000E64 008C+00 1/0 0/0 0/0 .text setAfterTalkMotion__14daNpc_clerkA_cFv */ #pragma push @@ -1413,28 +1422,28 @@ asm void daNpc_clerkA_c::beforeMove() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4842 = -30.0f; -COMPILER_STRIP_GATE(8099593C, &lit_4842); +COMPILER_STRIP_GATE(0x8099593C, &lit_4842); #pragma pop /* 80995940-80995944 0000D0 0004+00 0/1 0/0 0/0 .rodata @4843 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4843 = 15.0f; -COMPILER_STRIP_GATE(80995940, &lit_4843); +COMPILER_STRIP_GATE(0x80995940, &lit_4843); #pragma pop /* 80995944-80995948 0000D4 0004+00 0/1 0/0 0/0 .rodata @4844 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4844 = 0x38C90FDB; -COMPILER_STRIP_GATE(80995944, &lit_4844); +COMPILER_STRIP_GATE(0x80995944, &lit_4844); #pragma pop /* 80995948-80995950 0000D8 0008+00 1/4 0/0 0/0 .rodata @4846 */ SECTION_RODATA static u8 const lit_4846[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80995948, &lit_4846); +COMPILER_STRIP_GATE(0x80995948, &lit_4846); /* 80993794-80993A40 001354 02AC+00 1/0 0/0 0/0 .text setAttnPos__14daNpc_clerkA_cFv */ #pragma push @@ -1486,7 +1495,7 @@ asm void daNpc_clerkA_c::selectAction() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpc_clerkA_c::chkAction(int (daNpc_clerkA_c::*)(void*)) { +asm void daNpc_clerkA_c::chkAction(int (daNpc_clerkA_c::*param_0)(void*)) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_clerka/d_a_npc_clerka/chkAction__14daNpc_clerkA_cFM14daNpc_clerkA_cFPCvPvPv_i.s" } @@ -1497,7 +1506,7 @@ asm void daNpc_clerkA_c::chkAction(int (daNpc_clerkA_c::*)(void*)) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpc_clerkA_c::setAction(int (daNpc_clerkA_c::*)(void*)) { +asm void daNpc_clerkA_c::setAction(int (daNpc_clerkA_c::*param_0)(void*)) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_clerka/d_a_npc_clerka/setAction__14daNpc_clerkA_cFM14daNpc_clerkA_cFPCvPvPv_i.s" } @@ -1520,7 +1529,7 @@ asm void daNpc_clerkA_c::wait(void* param_0) { SECTION_RODATA static u8 const lit_4904[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80995950, &lit_4904); +COMPILER_STRIP_GATE(0x80995950, &lit_4904); #pragma pop /* 80995958-80995960 0000E8 0008+00 0/1 0/0 0/0 .rodata @4905 */ @@ -1529,7 +1538,7 @@ COMPILER_STRIP_GATE(80995950, &lit_4904); SECTION_RODATA static u8 const lit_4905[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80995958, &lit_4905); +COMPILER_STRIP_GATE(0x80995958, &lit_4905); #pragma pop /* 80995960-80995968 0000F0 0008+00 0/1 0/0 0/0 .rodata @4906 */ @@ -1538,14 +1547,14 @@ COMPILER_STRIP_GATE(80995958, &lit_4905); SECTION_RODATA static u8 const lit_4906[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80995960, &lit_4906); +COMPILER_STRIP_GATE(0x80995960, &lit_4906); #pragma pop /* 80995968-8099596C 0000F8 0004+00 0/1 0/0 0/0 .rodata @5110 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5110 = 0.5f; -COMPILER_STRIP_GATE(80995968, &lit_5110); +COMPILER_STRIP_GATE(0x80995968, &lit_5110); #pragma pop /* 80993F84-809941B8 001B44 0234+00 1/0 0/0 0/0 .text tend__14daNpc_clerkA_cFPv */ @@ -1573,7 +1582,7 @@ asm void daNpc_clerkA_c::talk(void* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5303 = -110.0f; -COMPILER_STRIP_GATE(8099596C, &lit_5303); +COMPILER_STRIP_GATE(0x8099596C, &lit_5303); #pragma pop /* 809943B0-809947E4 001F70 0434+00 2/0 0/0 0/0 .text shop__14daNpc_clerkA_cFPv */ @@ -1937,7 +1946,7 @@ void daNpcT_c::changeBtk(int* param_0, int* param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80995544(int* param_0) { +extern "C" asm void func_80995544(void* _this, int* param_0) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_clerka/d_a_npc_clerka/func_80995544.s" } @@ -1969,7 +1978,7 @@ asm void __sinit_d_a_npc_clerka_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80995560 = (void*)__sinit_d_a_npc_clerka_cpp; +REGISTER_CTORS(0x80995560, __sinit_d_a_npc_clerka_cpp); #pragma pop /* 809955C8-80995694 003188 00CC+00 1/1 0/0 0/0 .text @@ -2095,12 +2104,4 @@ bool dShopSystem_c::beforeSelectSeqAction(dMsgFlow_c* param_0, int param_1) { return true; } -/* 80995970-80995994 000100 0024+00 4/1 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80995970 = ""; -SECTION_DEAD static char const* const stringBase_80995971 = "DEFAULT_GETITEM"; -SECTION_DEAD static char const* const stringBase_80995981 = "NO_RESPONSE"; -SECTION_DEAD static char const* const stringBase_8099598D = "clerkA"; -#pragma pop +/* 80995970-80995970 000100 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/npc/d_a_npc_clerkb/d_a_npc_clerkb.cpp b/rel/d/a/npc/d_a_npc_clerkb/d_a_npc_clerkb.cpp index e243249e696..b15879a56ca 100644 --- a/rel/d/a/npc/d_a_npc_clerkb/d_a_npc_clerkb.cpp +++ b/rel/d/a/npc/d_a_npc_clerkb/d_a_npc_clerkb.cpp @@ -41,19 +41,19 @@ struct mDoExt_baseAnm { /* 8000D428 */ void play(); }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; +struct J3DAnmTransform {}; + +struct J3DModelData {}; + struct Z2Creature { /* 802C03C8 */ Z2Creature(); /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -66,6 +66,8 @@ struct fopAc_ac_c { /* 80018B64 */ fopAc_ac_c(); }; +struct daNpcT_faceMotionAnmData_c {}; + struct daNpcT_MotionSeqMngr_c { struct sequenceStepData_c {}; @@ -73,19 +75,17 @@ struct daNpcT_MotionSeqMngr_c { /* 8099907C */ ~daNpcT_MotionSeqMngr_c(); }; +struct daNpcT_evtData_c {}; + struct daNpcT_motionAnmData_c {}; +struct J3DJoint {}; + struct dMsgFlow_c { /* 80249F00 */ dMsgFlow_c(); /* 80249F90 */ void init(fopAc_ac_c*, int, int, fopAc_ac_c**); }; -struct J3DJoint {}; - -struct daNpcT_faceMotionAnmData_c {}; - -struct daNpcT_evtData_c {}; - struct daNpc_clerkB_c { /* 80995F2C */ ~daNpc_clerkB_c(); /* 80996090 */ void create(); @@ -147,10 +147,10 @@ struct dCcD_GObjInf { /* 800840E4 */ ~dCcD_GObjInf(); }; -struct J3DModel {}; - struct _GXColorS10 {}; +struct J3DModel {}; + struct daNpcT_c { /* 80147FA4 */ void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*); /* 801483F8 */ void loadRes(s8 const*, char const**); @@ -323,13 +323,13 @@ struct dBgS_AcchCir { /* 809990C4 */ ~dBgS_AcchCir(); }; -struct dBgS {}; - struct csXyz { /* 80998F78 */ csXyz(); /* 80999770 */ ~csXyz(); }; +struct dBgS {}; + struct dBgS_Acch { /* 80075F94 */ ~dBgS_Acch(); /* 800760A0 */ dBgS_Acch(); @@ -508,7 +508,7 @@ extern "C" void changeAnm__8daNpcT_cFPiPi(); extern "C" void changeBck__8daNpcT_cFPiPi(); extern "C" void changeBtp__8daNpcT_cFPiPi(); extern "C" void changeBtk__8daNpcT_cFPiPi(); -extern "C" void func_809995FC(int*); +extern "C" void func_809995FC(void* _this, int*); extern "C" void __sinit_d_a_npc_clerkb_cpp(); extern "C" void __ct__14daNpc_clerkB_cFPC26daNpcT_faceMotionAnmData_cPC22daNpcT_motionAnmData_cPCQ222daNpcT_MotionSeqMngr_c18sequenceStepData_ciPCQ222daNpcT_MotionSeqMngr_c18sequenceStepData_ciPC16daNpcT_evtData_cPPc(); @@ -700,6 +700,15 @@ extern "C" void __register_global_object(); // /* ############################################################################################## */ +/* 80999A8C-80999A8C 000114 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80999A8C = ""; +SECTION_DEAD static char const* const stringBase_80999A8D = "DEFAULT_GETITEM"; +SECTION_DEAD static char const* const stringBase_80999A9D = "NO_RESPONSE"; +SECTION_DEAD static char const* const stringBase_80999AA9 = "clerkB"; +#pragma pop + /* 80999AB0-80999ABC 000000 000C+00 2/2 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -1077,41 +1086,41 @@ SECTION_RODATA u8 const daNpc_clerkB_Param_c::m[148] = { 0xC1, 0xA0, 0x00, 0x00, 0x41, 0xA0, 0x00, 0x00, 0x42, 0x20, 0x00, 0x00, 0x41, 0xA0, 0x00, 0x00, 0x42, 0xDC, 0x00, 0x00, 0x43, 0x2A, 0x00, 0x00, 0x00, 0x1E, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80999978, &daNpc_clerkB_Param_c::m); +COMPILER_STRIP_GATE(0x80999978, &daNpc_clerkB_Param_c::m); /* 80999A0C-80999A10 000094 0004+00 0/1 0/0 0/0 .rodata @4035 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4035 = -300.0f; -COMPILER_STRIP_GATE(80999A0C, &lit_4035); +COMPILER_STRIP_GATE(0x80999A0C, &lit_4035); #pragma pop /* 80999A10-80999A14 000098 0004+00 0/1 0/0 0/0 .rodata @4036 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4036 = -50.0f; -COMPILER_STRIP_GATE(80999A10, &lit_4036); +COMPILER_STRIP_GATE(0x80999A10, &lit_4036); #pragma pop /* 80999A14-80999A18 00009C 0004+00 0/1 0/0 0/0 .rodata @4037 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4037 = 300.0f; -COMPILER_STRIP_GATE(80999A14, &lit_4037); +COMPILER_STRIP_GATE(0x80999A14, &lit_4037); #pragma pop /* 80999A18-80999A1C 0000A0 0004+00 0/1 0/0 0/0 .rodata @4038 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4038 = 450.0f; -COMPILER_STRIP_GATE(80999A18, &lit_4038); +COMPILER_STRIP_GATE(0x80999A18, &lit_4038); #pragma pop /* 80999A1C-80999A20 0000A4 0004+00 0/1 0/0 0/0 .rodata @4039 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4039 = -1000000000.0f; -COMPILER_STRIP_GATE(80999A1C, &lit_4039); +COMPILER_STRIP_GATE(0x80999A1C, &lit_4039); #pragma pop /* 80996090-80996338 000250 02A8+00 1/1 0/0 0/0 .text create__14daNpc_clerkB_cFv */ @@ -1129,21 +1138,21 @@ asm void daNpc_clerkB_c::create() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4149 = 0.25f; -COMPILER_STRIP_GATE(80999A20, &lit_4149); +COMPILER_STRIP_GATE(0x80999A20, &lit_4149); #pragma pop /* 80999A24-80999A28 0000AC 0004+00 0/2 0/0 0/0 .rodata @4150 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4150 = 20.0f; -COMPILER_STRIP_GATE(80999A24, &lit_4150); +COMPILER_STRIP_GATE(0x80999A24, &lit_4150); #pragma pop /* 80999A28-80999A2C 0000B0 0004+00 0/1 0/0 0/0 .rodata @4151 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4151 = 5.0f; -COMPILER_STRIP_GATE(80999A28, &lit_4151); +COMPILER_STRIP_GATE(0x80999A28, &lit_4151); #pragma pop /* 80999A2C-80999A30 0000B4 0004+00 7/14 0/0 0/0 .rodata @4152 */ @@ -1153,39 +1162,39 @@ SECTION_RODATA static u8 const lit_4152[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80999A2C, &lit_4152); +COMPILER_STRIP_GATE(0x80999A2C, &lit_4152); /* 80999A30-80999A34 0000B8 0004+00 0/1 0/0 0/0 .rodata @4153 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4153 = 100.0f; -COMPILER_STRIP_GATE(80999A30, &lit_4153); +COMPILER_STRIP_GATE(0x80999A30, &lit_4153); #pragma pop /* 80999A34-80999A38 0000BC 0004+00 0/2 0/0 0/0 .rodata @4154 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4154 = 60.0f; -COMPILER_STRIP_GATE(80999A34, &lit_4154); +COMPILER_STRIP_GATE(0x80999A34, &lit_4154); #pragma pop /* 80999A38-80999A3C 0000C0 0004+00 0/2 0/0 0/0 .rodata @4373 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4373 = 65536.0f; -COMPILER_STRIP_GATE(80999A38, &lit_4373); +COMPILER_STRIP_GATE(0x80999A38, &lit_4373); #pragma pop /* 80999A3C-80999A40 0000C4 0004+00 0/3 0/0 0/0 .rodata @4374 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4374 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(80999A3C, &lit_4374); +COMPILER_STRIP_GATE(0x80999A3C, &lit_4374); #pragma pop /* 80999A40-80999A44 0000C8 0004+00 2/4 0/0 0/0 .rodata @4513 */ SECTION_RODATA static f32 const lit_4513 = 1.0f; -COMPILER_STRIP_GATE(80999A40, &lit_4513); +COMPILER_STRIP_GATE(0x80999A40, &lit_4513); /* 80996338-80996608 0004F8 02D0+00 1/1 0/0 0/0 .text CreateHeap__14daNpc_clerkB_cFv */ #pragma push @@ -1362,20 +1371,20 @@ asm void daNpc_clerkB_c::getType() { /* ############################################################################################## */ /* 80999A44-80999A48 0000CC 0004+00 3/5 0/0 0/0 .rodata @4683 */ SECTION_RODATA static f32 const lit_4683 = -1.0f; -COMPILER_STRIP_GATE(80999A44, &lit_4683); +COMPILER_STRIP_GATE(0x80999A44, &lit_4683); /* 80999A48-80999A4C 0000D0 0004+00 0/2 0/0 0/0 .rodata @4684 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4684 = 0.75f; -COMPILER_STRIP_GATE(80999A48, &lit_4684); +COMPILER_STRIP_GATE(0x80999A48, &lit_4684); #pragma pop /* 80999A4C-80999A50 0000D4 0004+00 0/1 0/0 0/0 .rodata @4685 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4685 = 13.0f; -COMPILER_STRIP_GATE(80999A4C, &lit_4685); +COMPILER_STRIP_GATE(0x80999A4C, &lit_4685); #pragma pop /* 80999A50-80999A58 0000D8 0004+04 0/1 0/0 0/0 .rodata @4686 */ @@ -1386,14 +1395,14 @@ SECTION_RODATA static f32 const lit_4686[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80999A50, &lit_4686); +COMPILER_STRIP_GATE(0x80999A50, &lit_4686); #pragma pop /* 80999A58-80999A60 0000E0 0008+00 1/5 0/0 0/0 .rodata @4688 */ SECTION_RODATA static u8 const lit_4688[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80999A58, &lit_4688); +COMPILER_STRIP_GATE(0x80999A58, &lit_4688); /* 809969FC-80996CCC 000BBC 02D0+00 1/0 0/0 0/0 .text * beforeStartSeqAction__14daNpc_clerkB_cFP10dMsgFlow_ci */ @@ -1522,14 +1531,14 @@ asm void daNpc_clerkB_c::beforeMove() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5029 = -30.0f; -COMPILER_STRIP_GATE(80999A60, &lit_5029); +COMPILER_STRIP_GATE(0x80999A60, &lit_5029); #pragma pop /* 80999A64-80999A68 0000EC 0004+00 0/1 0/0 0/0 .rodata @5030 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5030 = 15.0f; -COMPILER_STRIP_GATE(80999A64, &lit_5030); +COMPILER_STRIP_GATE(0x80999A64, &lit_5030); #pragma pop /* 80999A68-80999A70 0000F0 0004+04 0/1 0/0 0/0 .rodata @5031 */ @@ -1540,7 +1549,7 @@ SECTION_RODATA static u32 const lit_5031[1 + 1 /* padding */] = { /* padding */ 0x00000000, }; -COMPILER_STRIP_GATE(80999A68, &lit_5031); +COMPILER_STRIP_GATE(0x80999A68, &lit_5031); #pragma pop /* 809977C4-80997A1C 001984 0258+00 1/0 0/0 0/0 .text setAttnPos__14daNpc_clerkB_cFv */ @@ -1603,7 +1612,7 @@ asm void daNpc_clerkB_c::selectAction() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpc_clerkB_c::chkAction(int (daNpc_clerkB_c::*)(void*)) { +asm void daNpc_clerkB_c::chkAction(int (daNpc_clerkB_c::*param_0)(void*)) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_clerkb/d_a_npc_clerkb/chkAction__14daNpc_clerkB_cFM14daNpc_clerkB_cFPCvPvPv_i.s" } @@ -1614,7 +1623,7 @@ asm void daNpc_clerkB_c::chkAction(int (daNpc_clerkB_c::*)(void*)) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpc_clerkB_c::setAction(int (daNpc_clerkB_c::*)(void*)) { +asm void daNpc_clerkB_c::setAction(int (daNpc_clerkB_c::*param_0)(void*)) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_clerkb/d_a_npc_clerkb/setAction__14daNpc_clerkB_cFM14daNpc_clerkB_cFPCvPvPv_i.s" } @@ -1667,7 +1676,7 @@ asm void daNpc_clerkB_c::talk(void* param_0) { SECTION_RODATA static u8 const lit_5090[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80999A70, &lit_5090); +COMPILER_STRIP_GATE(0x80999A70, &lit_5090); #pragma pop /* 80999A78-80999A80 000100 0008+00 0/1 0/0 0/0 .rodata @5091 */ @@ -1676,7 +1685,7 @@ COMPILER_STRIP_GATE(80999A70, &lit_5090); SECTION_RODATA static u8 const lit_5091[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80999A78, &lit_5091); +COMPILER_STRIP_GATE(0x80999A78, &lit_5091); #pragma pop /* 80999A80-80999A88 000108 0008+00 0/1 0/0 0/0 .rodata @5092 */ @@ -1685,14 +1694,14 @@ COMPILER_STRIP_GATE(80999A78, &lit_5091); SECTION_RODATA static u8 const lit_5092[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80999A80, &lit_5092); +COMPILER_STRIP_GATE(0x80999A80, &lit_5092); #pragma pop /* 80999A88-80999A8C 000110 0004+00 0/1 0/0 0/0 .rodata @5506 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5506 = 150.0f; -COMPILER_STRIP_GATE(80999A88, &lit_5506); +COMPILER_STRIP_GATE(0x80999A88, &lit_5506); #pragma pop /* 80998520-809988DC 0026E0 03BC+00 2/0 0/0 0/0 .text shop__14daNpc_clerkB_cFPv */ @@ -2041,7 +2050,7 @@ void daNpcT_c::changeBtk(int* param_0, int* param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_809995FC(int* param_0) { +extern "C" asm void func_809995FC(void* _this, int* param_0) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_clerkb/d_a_npc_clerkb/func_809995FC.s" } @@ -2073,7 +2082,7 @@ asm void __sinit_d_a_npc_clerkb_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80999618 = (void*)__sinit_d_a_npc_clerkb_cpp; +REGISTER_CTORS(0x80999618, __sinit_d_a_npc_clerkb_cpp); #pragma pop /* 80999680-80999770 003840 00F0+00 1/1 0/0 0/0 .text @@ -2197,12 +2206,4 @@ bool dShopSystem_c::getResName2(int param_0) { return false; } -/* 80999A8C-80999AB0 000114 0024+00 4/1 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80999A8C = ""; -SECTION_DEAD static char const* const stringBase_80999A8D = "DEFAULT_GETITEM"; -SECTION_DEAD static char const* const stringBase_80999A9D = "NO_RESPONSE"; -SECTION_DEAD static char const* const stringBase_80999AA9 = "clerkB"; -#pragma pop +/* 80999A8C-80999A8C 000114 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/npc/d_a_npc_clerkt/d_a_npc_clerkt.cpp b/rel/d/a/npc/d_a_npc_clerkt/d_a_npc_clerkt.cpp index a22d5657392..ab9b54e8963 100644 --- a/rel/d/a/npc/d_a_npc_clerkt/d_a_npc_clerkt.cpp +++ b/rel/d/a/npc/d_a_npc_clerkt/d_a_npc_clerkt.cpp @@ -25,19 +25,19 @@ struct mDoMtx_stack_c { static u8 now[48]; }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; +struct J3DAnmTransform {}; + +struct J3DModelData {}; + struct Z2Creature { /* 802C03C8 */ Z2Creature(); /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -67,10 +67,10 @@ struct dCcD_GObjInf { /* 800840E4 */ ~dCcD_GObjInf(); }; -struct J3DModel {}; - struct _GXColorS10 {}; +struct J3DModel {}; + struct J3DJoint {}; struct daNpcT_c { @@ -293,13 +293,13 @@ struct dBgS_AcchCir { /* 8099C9B0 */ ~dBgS_AcchCir(); }; -struct dBgS {}; - struct csXyz { /* 8099C424 */ ~csXyz(); /* 8099C864 */ csXyz(); }; +struct dBgS {}; + struct dBgS_Acch { /* 80075F94 */ ~dBgS_Acch(); /* 800760A0 */ dBgS_Acch(); @@ -651,6 +651,14 @@ extern "C" void __register_global_object(); // /* ############################################################################################## */ +/* 8099D33C-8099D33C 0000F8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8099D33C = ""; +SECTION_DEAD static char const* const stringBase_8099D33D = "DEFAULT_GETITEM"; +SECTION_DEAD static char const* const stringBase_8099D34D = "Tkj"; +#pragma pop + /* 8099D358-8099D364 000000 000C+00 2/2 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -987,41 +995,41 @@ SECTION_RODATA u8 const daNpcClerkt_Param_c::m[140] = { 0xC1, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC1, 0xA0, 0x00, 0x00, 0x41, 0xA0, 0x00, 0x00, 0x42, 0x20, 0x00, 0x00, 0x41, 0xA0, 0x00, 0x00, 0x42, 0xDC, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8099D244, &daNpcClerkt_Param_c::m); +COMPILER_STRIP_GATE(0x8099D244, &daNpcClerkt_Param_c::m); /* 8099D2D0-8099D2D4 00008C 0004+00 0/1 0/0 0/0 .rodata @4027 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4027 = -300.0f; -COMPILER_STRIP_GATE(8099D2D0, &lit_4027); +COMPILER_STRIP_GATE(0x8099D2D0, &lit_4027); #pragma pop /* 8099D2D4-8099D2D8 000090 0004+00 0/1 0/0 0/0 .rodata @4028 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4028 = -50.0f; -COMPILER_STRIP_GATE(8099D2D4, &lit_4028); +COMPILER_STRIP_GATE(0x8099D2D4, &lit_4028); #pragma pop /* 8099D2D8-8099D2DC 000094 0004+00 0/1 0/0 0/0 .rodata @4029 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4029 = 300.0f; -COMPILER_STRIP_GATE(8099D2D8, &lit_4029); +COMPILER_STRIP_GATE(0x8099D2D8, &lit_4029); #pragma pop /* 8099D2DC-8099D2E0 000098 0004+00 0/1 0/0 0/0 .rodata @4030 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4030 = 450.0f; -COMPILER_STRIP_GATE(8099D2DC, &lit_4030); +COMPILER_STRIP_GATE(0x8099D2DC, &lit_4030); #pragma pop /* 8099D2E0-8099D2E4 00009C 0004+00 0/1 0/0 0/0 .rodata @4031 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4031 = -1000000000.0f; -COMPILER_STRIP_GATE(8099D2E0, &lit_4031); +COMPILER_STRIP_GATE(0x8099D2E0, &lit_4031); #pragma pop /* 8099A28C-8099A530 00022C 02A4+00 1/1 0/0 0/0 .text create__13daNpcClerkT_cFv */ @@ -1039,21 +1047,21 @@ asm void daNpcClerkT_c::create() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4120 = 0.25f; -COMPILER_STRIP_GATE(8099D2E4, &lit_4120); +COMPILER_STRIP_GATE(0x8099D2E4, &lit_4120); #pragma pop /* 8099D2E8-8099D2EC 0000A4 0004+00 0/1 0/0 0/0 .rodata @4121 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4121 = 20.0f; -COMPILER_STRIP_GATE(8099D2E8, &lit_4121); +COMPILER_STRIP_GATE(0x8099D2E8, &lit_4121); #pragma pop /* 8099D2EC-8099D2F0 0000A8 0004+00 0/1 0/0 0/0 .rodata @4122 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4122 = 5.0f; -COMPILER_STRIP_GATE(8099D2EC, &lit_4122); +COMPILER_STRIP_GATE(0x8099D2EC, &lit_4122); #pragma pop /* 8099D2F0-8099D2F4 0000AC 0004+00 6/12 0/0 0/0 .rodata @4123 */ @@ -1063,36 +1071,36 @@ SECTION_RODATA static u8 const lit_4123[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(8099D2F0, &lit_4123); +COMPILER_STRIP_GATE(0x8099D2F0, &lit_4123); /* 8099D2F4-8099D2F8 0000B0 0004+00 1/3 0/0 0/0 .rodata @4124 */ SECTION_RODATA static f32 const lit_4124 = 100.0f; -COMPILER_STRIP_GATE(8099D2F4, &lit_4124); +COMPILER_STRIP_GATE(0x8099D2F4, &lit_4124); /* 8099D2F8-8099D2FC 0000B4 0004+00 0/2 0/0 0/0 .rodata @4125 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4125 = 60.0f; -COMPILER_STRIP_GATE(8099D2F8, &lit_4125); +COMPILER_STRIP_GATE(0x8099D2F8, &lit_4125); #pragma pop /* 8099D2FC-8099D300 0000B8 0004+00 0/2 0/0 0/0 .rodata @4346 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4346 = 65536.0f; -COMPILER_STRIP_GATE(8099D2FC, &lit_4346); +COMPILER_STRIP_GATE(0x8099D2FC, &lit_4346); #pragma pop /* 8099D300-8099D304 0000BC 0004+00 0/3 0/0 0/0 .rodata @4347 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4347 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(8099D300, &lit_4347); +COMPILER_STRIP_GATE(0x8099D300, &lit_4347); #pragma pop /* 8099D304-8099D308 0000C0 0004+00 2/4 0/0 0/0 .rodata @4490 */ SECTION_RODATA static f32 const lit_4490 = 1.0f; -COMPILER_STRIP_GATE(8099D304, &lit_4490); +COMPILER_STRIP_GATE(0x8099D304, &lit_4490); /* 8099A530-8099A7B0 0004D0 0280+00 1/1 0/0 0/0 .text CreateHeap__13daNpcClerkT_cFv */ #pragma push @@ -1296,6 +1304,13 @@ asm void daNpcClerkT_c::evtTalk() { } #pragma pop +/* ############################################################################################## */ +/* 8099D33C-8099D33C 0000F8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8099D351 = "clerkt"; +#pragma pop + /* 8099AF18-8099AFE0 000EB8 00C8+00 1/0 0/0 0/0 .text evtCutProc__13daNpcClerkT_cFv */ #pragma push #pragma optimization_level 0 @@ -1346,7 +1361,7 @@ asm void daNpcClerkT_c::selectAction() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpcClerkT_c::chkAction(int (daNpcClerkT_c::*)(void*)) { +asm void daNpcClerkT_c::chkAction(int (daNpcClerkT_c::*param_0)(void*)) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_clerkt/d_a_npc_clerkt/chkAction__13daNpcClerkT_cFM13daNpcClerkT_cFPCvPvPv_i.s" } @@ -1357,7 +1372,7 @@ asm void daNpcClerkT_c::chkAction(int (daNpcClerkT_c::*)(void*)) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpcClerkT_c::setAction(int (daNpcClerkT_c::*)(void*)) { +asm void daNpcClerkT_c::setAction(int (daNpcClerkT_c::*param_0)(void*)) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_clerkt/d_a_npc_clerkt/setAction__13daNpcClerkT_cFM13daNpcClerkT_cFPCvPvPv_i.s" } @@ -1366,7 +1381,7 @@ asm void daNpcClerkT_c::setAction(int (daNpcClerkT_c::*)(void*)) { /* ############################################################################################## */ /* 8099D308-8099D30C 0000C4 0004+00 3/3 0/0 0/0 .rodata @4829 */ SECTION_RODATA static f32 const lit_4829 = -1.0f; -COMPILER_STRIP_GATE(8099D308, &lit_4829); +COMPILER_STRIP_GATE(0x8099D308, &lit_4829); /* 8099B284-8099B4DC 001224 0258+00 1/0 0/0 0/0 .text wait__13daNpcClerkT_cFPv */ #pragma push @@ -1508,35 +1523,35 @@ asm void daNpcClerkT_c::beforeMove() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5176 = 10.0f; -COMPILER_STRIP_GATE(8099D30C, &lit_5176); +COMPILER_STRIP_GATE(0x8099D30C, &lit_5176); #pragma pop /* 8099D310-8099D314 0000CC 0004+00 0/1 0/0 0/0 .rodata @5177 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5177 = -15.0f; -COMPILER_STRIP_GATE(8099D310, &lit_5177); +COMPILER_STRIP_GATE(0x8099D310, &lit_5177); #pragma pop /* 8099D314-8099D318 0000D0 0004+00 0/1 0/0 0/0 .rodata @5178 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5178 = 15.0f; -COMPILER_STRIP_GATE(8099D314, &lit_5178); +COMPILER_STRIP_GATE(0x8099D314, &lit_5178); #pragma pop /* 8099D318-8099D31C 0000D4 0004+00 0/1 0/0 0/0 .rodata @5179 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_5179 = 0x38C90FDB; -COMPILER_STRIP_GATE(8099D318, &lit_5179); +COMPILER_STRIP_GATE(0x8099D318, &lit_5179); #pragma pop /* 8099D31C-8099D324 0000D8 0008+00 1/3 0/0 0/0 .rodata @5181 */ SECTION_RODATA static u8 const lit_5181[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8099D31C, &lit_5181); +COMPILER_STRIP_GATE(0x8099D31C, &lit_5181); /* 8099BF20-8099C1A0 001EC0 0280+00 1/0 0/0 0/0 .text setAttnPos__13daNpcClerkT_cFv */ #pragma push @@ -1722,7 +1737,7 @@ asm void daNpcT_JntAnm_c::setEyeAngleY(cXyz param_0, s16 param_1, int param_2, f SECTION_RODATA static u8 const lit_5239[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8099D324, &lit_5239); +COMPILER_STRIP_GATE(0x8099D324, &lit_5239); #pragma pop /* 8099D32C-8099D334 0000E8 0008+00 0/1 0/0 0/0 .rodata @5240 */ @@ -1731,7 +1746,7 @@ COMPILER_STRIP_GATE(8099D324, &lit_5239); SECTION_RODATA static u8 const lit_5240[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8099D32C, &lit_5240); +COMPILER_STRIP_GATE(0x8099D32C, &lit_5240); #pragma pop /* 8099D334-8099D33C 0000F0 0008+00 0/1 0/0 0/0 .rodata @5241 */ @@ -1740,7 +1755,7 @@ COMPILER_STRIP_GATE(8099D32C, &lit_5240); SECTION_RODATA static u8 const lit_5241[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8099D334, &lit_5241); +COMPILER_STRIP_GATE(0x8099D334, &lit_5241); #pragma pop /* 8099CC50-8099CE58 002BF0 0208+00 1/1 0/0 0/0 .text setEyeAngleX__15daNpcT_JntAnm_cF4cXyzfs */ @@ -1894,7 +1909,7 @@ asm void __sinit_d_a_npc_clerkt_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_8099CF34 = (void*)__sinit_d_a_npc_clerkt_cpp; +REGISTER_CTORS(0x8099CF34, __sinit_d_a_npc_clerkt_cpp); #pragma pop /* 8099CF9C-8099D068 002F3C 00CC+00 1/1 0/0 0/0 .text @@ -2022,12 +2037,4 @@ bool dShopSystem_c::beforeSelectSeqAction(dMsgFlow_c* param_0, int param_1) { return true; } -/* 8099D33C-8099D358 0000F8 001C+00 4/1 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_8099D33C = ""; -SECTION_DEAD static char const* const stringBase_8099D33D = "DEFAULT_GETITEM"; -SECTION_DEAD static char const* const stringBase_8099D34D = "Tkj"; -SECTION_DEAD static char const* const stringBase_8099D351 = "clerkt"; -#pragma pop +/* 8099D33C-8099D33C 0000F8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/npc/d_a_npc_coach/d_a_npc_coach.cpp b/rel/d/a/npc/d_a_npc_coach/d_a_npc_coach.cpp index e19c20b35df..2ed408f7c79 100644 --- a/rel/d/a/npc/d_a_npc_coach/d_a_npc_coach.cpp +++ b/rel/d/a/npc/d_a_npc_coach/d_a_npc_coach.cpp @@ -57,12 +57,12 @@ struct mDoExt_baseAnm { /* 8000D428 */ void play(); }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; +struct J3DModelData {}; + struct Z2Creature { /* 802C03C8 */ Z2Creature(); /* 802C0420 */ ~Z2Creature(); @@ -97,11 +97,11 @@ struct mDoExt_3DlineMatSortPacket { /* 80014738 */ void setMat(mDoExt_3DlineMat_c*); }; -struct dKy_tevstr_c {}; +struct ResTIMG {}; struct _GXColor {}; -struct ResTIMG {}; +struct dKy_tevstr_c {}; struct mDoExt_3DlineMat1_c { /* 80013360 */ void init(u16, u16, ResTIMG*, int); @@ -686,7 +686,7 @@ SECTION_RODATA u8 const daNpcCoach_c::M_attr[160] = { 0xE0, 0x00, 0x40, 0x00, 0x00, 0x00, 0xFF, 0x50, 0x00, 0x03, 0x00, 0x00, 0x45, 0xBB, 0x80, 0x00, 0x41, 0x20, 0x00, 0x00, 0x41, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x19, }; -COMPILER_STRIP_GATE(809A4ED0, &daNpcCoach_c::M_attr); +COMPILER_STRIP_GATE(0x809A4ED0, &daNpcCoach_c::M_attr); /* 809A4F70-809A4F74 0000A0 0004+00 3/19 0/0 0/0 .rodata @4121 */ SECTION_RODATA static u8 const lit_4121[4] = { @@ -695,7 +695,7 @@ SECTION_RODATA static u8 const lit_4121[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(809A4F70, &lit_4121); +COMPILER_STRIP_GATE(0x809A4F70, &lit_4121); /* 8099D8EC-8099D9AC 00028C 00C0+00 1/1 0/0 0/0 .text jointCoachCallBack__FP8J3DJointi */ #pragma push @@ -788,7 +788,7 @@ asm void daNpcCoach_c::ctrlJointHorse(J3DJoint* param_0, J3DModel* param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4358 = 500.0f; -COMPILER_STRIP_GATE(809A4F74, &lit_4358); +COMPILER_STRIP_GATE(0x809A4F74, &lit_4358); #pragma pop /* 8099DE18-8099E0E0 0007B8 02C8+00 2/2 0/0 0/0 .text @@ -822,7 +822,7 @@ SECTION_RODATA static u8 const data_809A4F78[68] = { 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809A4F78, &data_809A4F78); +COMPILER_STRIP_GATE(0x809A4F78, &data_809A4F78); /* 809A4FBC-809A4FFC 0000EC 0040+00 1/1 0/0 0/0 .rodata * ccSphSrc$localstatic4$initCollision__12daNpcCoach_cFv */ @@ -832,13 +832,13 @@ SECTION_RODATA static u8 const data_809A4FBC[64] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0x48, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809A4FBC, &data_809A4FBC); +COMPILER_STRIP_GATE(0x809A4FBC, &data_809A4FBC); /* 809A4FFC-809A5000 00012C 0004+00 0/2 0/0 0/0 .rodata @4845 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4845 = 1000000000.0f; -COMPILER_STRIP_GATE(809A4FFC, &lit_4845); +COMPILER_STRIP_GATE(0x809A4FFC, &lit_4845); #pragma pop /* 809A5000-809A5008 000130 0008+00 0/7 0/0 0/0 .rodata @4846 */ @@ -847,7 +847,7 @@ COMPILER_STRIP_GATE(809A4FFC, &lit_4845); SECTION_RODATA static u8 const lit_4846[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809A5000, &lit_4846); +COMPILER_STRIP_GATE(0x809A5000, &lit_4846); #pragma pop /* 809A5008-809A5010 000138 0008+00 0/7 0/0 0/0 .rodata @4847 */ @@ -856,7 +856,7 @@ COMPILER_STRIP_GATE(809A5000, &lit_4846); SECTION_RODATA static u8 const lit_4847[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809A5008, &lit_4847); +COMPILER_STRIP_GATE(0x809A5008, &lit_4847); #pragma pop /* 809A5010-809A5018 000140 0008+00 0/7 0/0 0/0 .rodata @4848 */ @@ -865,7 +865,7 @@ COMPILER_STRIP_GATE(809A5008, &lit_4847); SECTION_RODATA static u8 const lit_4848[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809A5010, &lit_4848); +COMPILER_STRIP_GATE(0x809A5010, &lit_4848); #pragma pop /* 8099E138-8099E4A0 000AD8 0368+00 2/2 0/0 0/0 .text @@ -896,11 +896,17 @@ SECTION_RODATA static u8 const data_809A5018[20] = { 0x85, 0xF0, 0x85, 0xEF, 0x85, 0xE7, 0x85, 0xE8, 0x85, 0xE9, 0x85, 0xEA, 0x85, 0xEB, 0x85, 0xEC, 0x85, 0xED, 0x85, 0xEE, }; -COMPILER_STRIP_GATE(809A5018, &data_809A5018); +COMPILER_STRIP_GATE(0x809A5018, &data_809A5018); /* 809A502C-809A5030 00015C 0004+00 2/11 0/0 0/0 .rodata @5111 */ SECTION_RODATA static f32 const lit_5111 = 1.0f; -COMPILER_STRIP_GATE(809A502C, &lit_5111); +COMPILER_STRIP_GATE(0x809A502C, &lit_5111); + +/* 809A5120-809A5120 000250 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_809A5120 = "Coach"; +#pragma pop /* 809A5130-809A5134 -00001 0004+00 7/7 0/0 0/0 .data l_arcName */ SECTION_DATA static void* l_arcName = (void*)&d_a_npc_coach__stringBase0; @@ -1057,42 +1063,42 @@ static asm void daNpcCoach_Execute(daNpcCoach_c* param_0) { #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_5133 = 0x000000FF; -COMPILER_STRIP_GATE(809A5030, &lit_5133); +COMPILER_STRIP_GATE(0x809A5030, &lit_5133); #pragma pop /* 809A5034-809A5038 000164 0004+00 0/5 0/0 0/0 .rodata @5250 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5250 = 15.0f; -COMPILER_STRIP_GATE(809A5034, &lit_5250); +COMPILER_STRIP_GATE(0x809A5034, &lit_5250); #pragma pop /* 809A5038-809A503C 000168 0004+00 0/3 0/0 0/0 .rodata @5251 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5251 = -1.0f; -COMPILER_STRIP_GATE(809A5038, &lit_5251); +COMPILER_STRIP_GATE(0x809A5038, &lit_5251); #pragma pop /* 809A503C-809A5040 00016C 0004+00 0/1 0/0 0/0 .rodata @5252 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5252 = 20.0f; -COMPILER_STRIP_GATE(809A503C, &lit_5252); +COMPILER_STRIP_GATE(0x809A503C, &lit_5252); #pragma pop /* 809A5040-809A5044 000170 0004+00 0/3 0/0 0/0 .rodata @5253 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5253 = -90.0f; -COMPILER_STRIP_GATE(809A5040, &lit_5253); +COMPILER_STRIP_GATE(0x809A5040, &lit_5253); #pragma pop /* 809A5044-809A5048 000174 0004+00 0/1 0/0 0/0 .rodata @5254 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_5254 = 0x3B11A2B4; -COMPILER_STRIP_GATE(809A5044, &lit_5254); +COMPILER_STRIP_GATE(0x809A5044, &lit_5254); #pragma pop /* 809A5048-809A5050 000178 0008+00 0/9 0/0 0/0 .rodata @5256 */ @@ -1101,7 +1107,7 @@ COMPILER_STRIP_GATE(809A5044, &lit_5254); SECTION_RODATA static u8 const lit_5256[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809A5048, &lit_5256); +COMPILER_STRIP_GATE(0x809A5048, &lit_5256); #pragma pop /* 8099EB40-8099EEA0 0014E0 0360+00 1/1 0/0 0/0 .text execute__12daNpcCoach_cFv */ @@ -1119,7 +1125,7 @@ asm void daNpcCoach_c::execute() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5307 = 125.0f; -COMPILER_STRIP_GATE(809A5050, &lit_5307); +COMPILER_STRIP_GATE(0x809A5050, &lit_5307); #pragma pop /* 8099EEA0-8099F1B8 001840 0318+00 1/2 0/0 0/0 .text checkCoachDamage__12daNpcCoach_cFv @@ -1138,28 +1144,28 @@ asm void daNpcCoach_c::checkCoachDamage() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5397 = 1.5f; -COMPILER_STRIP_GATE(809A5054, &lit_5397); +COMPILER_STRIP_GATE(0x809A5054, &lit_5397); #pragma pop /* 809A5058-809A505C 000188 0004+00 0/1 0/0 0/0 .rodata @5398 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5398 = 2.0f / 5.0f; -COMPILER_STRIP_GATE(809A5058, &lit_5398); +COMPILER_STRIP_GATE(0x809A5058, &lit_5398); #pragma pop /* 809A505C-809A5060 00018C 0004+00 0/1 0/0 0/0 .rodata @5399 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5399 = 3.0f / 5.0f; -COMPILER_STRIP_GATE(809A505C, &lit_5399); +COMPILER_STRIP_GATE(0x809A505C, &lit_5399); #pragma pop /* 809A5060-809A5064 000190 0004+00 0/2 0/0 0/0 .rodata @5400 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5400 = 4.0f / 5.0f; -COMPILER_STRIP_GATE(809A5060, &lit_5400); +COMPILER_STRIP_GATE(0x809A5060, &lit_5400); #pragma pop /* 8099F1B8-8099F4BC 001B58 0304+00 1/1 0/0 0/0 .text setCoachBlazing__12daNpcCoach_cFUc @@ -1178,28 +1184,28 @@ asm void daNpcCoach_c::setCoachBlazing(u8 param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5600 = 63.0f; -COMPILER_STRIP_GATE(809A5064, &lit_5600); +COMPILER_STRIP_GATE(0x809A5064, &lit_5600); #pragma pop /* 809A5068-809A506C 000198 0004+00 0/2 0/0 0/0 .rodata @5601 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5601 = 17.0f; -COMPILER_STRIP_GATE(809A5068, &lit_5601); +COMPILER_STRIP_GATE(0x809A5068, &lit_5601); #pragma pop /* 809A506C-809A5070 00019C 0004+00 0/2 0/0 0/0 .rodata @5602 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5602 = 11.0f; -COMPILER_STRIP_GATE(809A506C, &lit_5602); +COMPILER_STRIP_GATE(0x809A506C, &lit_5602); #pragma pop /* 809A5070-809A5074 0001A0 0004+00 0/2 0/0 0/0 .rodata @5603 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5603 = -11.0f; -COMPILER_STRIP_GATE(809A5070, &lit_5603); +COMPILER_STRIP_GATE(0x809A5070, &lit_5603); #pragma pop /* 8099F4BC-8099F988 001E5C 04CC+00 1/1 0/0 0/0 .text reinsExecute__12daNpcCoach_cFv */ @@ -1217,14 +1223,14 @@ asm void daNpcCoach_c::reinsExecute() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5710 = 2.0f; -COMPILER_STRIP_GATE(809A5074, &lit_5710); +COMPILER_STRIP_GATE(0x809A5074, &lit_5710); #pragma pop /* 809A5078-809A507C 0001A8 0004+00 0/1 0/0 0/0 .rodata @5711 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5711 = 6.0f; -COMPILER_STRIP_GATE(809A5078, &lit_5711); +COMPILER_STRIP_GATE(0x809A5078, &lit_5711); #pragma pop /* 8099F988-8099FCF4 002328 036C+00 1/1 0/0 0/0 .text reinsInit__12daNpcCoach_cFv */ @@ -1242,49 +1248,49 @@ asm void daNpcCoach_c::reinsInit() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5928 = 1500.0f; -COMPILER_STRIP_GATE(809A507C, &lit_5928); +COMPILER_STRIP_GATE(0x809A507C, &lit_5928); #pragma pop /* 809A5080-809A5084 0001B0 0004+00 0/1 0/0 0/0 .rodata @5929 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5929 = 35.0f; -COMPILER_STRIP_GATE(809A5080, &lit_5929); +COMPILER_STRIP_GATE(0x809A5080, &lit_5929); #pragma pop /* 809A5084-809A5088 0001B4 0004+00 0/1 0/0 0/0 .rodata @5930 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5930 = 65.0f; -COMPILER_STRIP_GATE(809A5084, &lit_5930); +COMPILER_STRIP_GATE(0x809A5084, &lit_5930); #pragma pop /* 809A5088-809A508C 0001B8 0004+00 0/1 0/0 0/0 .rodata @5931 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5931 = -20.0f; -COMPILER_STRIP_GATE(809A5088, &lit_5931); +COMPILER_STRIP_GATE(0x809A5088, &lit_5931); #pragma pop /* 809A508C-809A5090 0001BC 0004+00 0/2 0/0 0/0 .rodata @5932 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5932 = 0.5f; -COMPILER_STRIP_GATE(809A508C, &lit_5932); +COMPILER_STRIP_GATE(0x809A508C, &lit_5932); #pragma pop /* 809A5090-809A5094 0001C0 0004+00 0/2 0/0 0/0 .rodata @5933 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5933 = 108.0f; -COMPILER_STRIP_GATE(809A5090, &lit_5933); +COMPILER_STRIP_GATE(0x809A5090, &lit_5933); #pragma pop /* 809A5094-809A5098 0001C4 0004+00 0/2 0/0 0/0 .rodata @5934 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5934 = 290.0f; -COMPILER_STRIP_GATE(809A5094, &lit_5934); +COMPILER_STRIP_GATE(0x809A5094, &lit_5934); #pragma pop /* 8099FCF4-809A0728 002694 0A34+00 1/1 0/0 0/0 .text calcCoachMotion__12daNpcCoach_cFv @@ -1303,28 +1309,28 @@ asm void daNpcCoach_c::calcCoachMotion() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6072 = 65535.0f; -COMPILER_STRIP_GATE(809A5098, &lit_6072); +COMPILER_STRIP_GATE(0x809A5098, &lit_6072); #pragma pop /* 809A509C-809A50A0 0001CC 0004+00 0/1 0/0 0/0 .rodata @6073 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_6073 = 0x43DBE958; -COMPILER_STRIP_GATE(809A509C, &lit_6073); +COMPILER_STRIP_GATE(0x809A509C, &lit_6073); #pragma pop /* 809A50A0-809A50A4 0001D0 0004+00 0/1 0/0 0/0 .rodata @6074 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_6074 = 0x4420A762; -COMPILER_STRIP_GATE(809A50A0, &lit_6074); +COMPILER_STRIP_GATE(0x809A50A0, &lit_6074); #pragma pop /* 809A50A4-809A50A8 0001D4 0004+00 0/2 0/0 0/0 .rodata @6075 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6075 = 128.0f; -COMPILER_STRIP_GATE(809A50A4, &lit_6075); +COMPILER_STRIP_GATE(0x809A50A4, &lit_6075); #pragma pop /* 809A0728-809A0DB8 0030C8 0690+00 1/1 0/0 0/0 .text calcRearWheelRotate__12daNpcCoach_cFv */ @@ -1352,7 +1358,7 @@ asm cM3dGPla::~cM3dGPla() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6173 = 160.0f; -COMPILER_STRIP_GATE(809A50A8, &lit_6173); +COMPILER_STRIP_GATE(0x809A50A8, &lit_6173); #pragma pop /* 809A0E00-809A1180 0037A0 0380+00 1/1 0/0 0/0 .text calcHarnessMotion__12daNpcCoach_cFv @@ -1371,14 +1377,14 @@ asm void daNpcCoach_c::calcHarnessMotion() { #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_6308 = 0x43ACC9A0; -COMPILER_STRIP_GATE(809A50AC, &lit_6308); +COMPILER_STRIP_GATE(0x809A50AC, &lit_6308); #pragma pop /* 809A50B0-809A50B4 0001E0 0004+00 0/1 0/0 0/0 .rodata @6309 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_6309 = 0x440B34A4; -COMPILER_STRIP_GATE(809A50B0, &lit_6309); +COMPILER_STRIP_GATE(0x809A50B0, &lit_6309); #pragma pop /* 809A1180-809A1810 003B20 0690+00 1/1 0/0 0/0 .text calcFrontWheelRotate__12daNpcCoach_cFv */ @@ -1396,49 +1402,49 @@ asm void daNpcCoach_c::calcFrontWheelRotate() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6420 = 16384.0f; -COMPILER_STRIP_GATE(809A50B4, &lit_6420); +COMPILER_STRIP_GATE(0x809A50B4, &lit_6420); #pragma pop /* 809A50B8-809A50BC 0001E8 0004+00 0/1 0/0 0/0 .rodata @6421 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6421 = 7.0f / 100.0f; -COMPILER_STRIP_GATE(809A50B8, &lit_6421); +COMPILER_STRIP_GATE(0x809A50B8, &lit_6421); #pragma pop /* 809A50BC-809A50C0 0001EC 0004+00 0/1 0/0 0/0 .rodata @6422 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6422 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(809A50BC, &lit_6422); +COMPILER_STRIP_GATE(0x809A50BC, &lit_6422); #pragma pop /* 809A50C0-809A50C4 0001F0 0004+00 0/1 0/0 0/0 .rodata @6423 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6423 = 1.0f / 100.0f; -COMPILER_STRIP_GATE(809A50C0, &lit_6423); +COMPILER_STRIP_GATE(0x809A50C0, &lit_6423); #pragma pop /* 809A50C4-809A50C8 0001F4 0004+00 0/1 0/0 0/0 .rodata @6424 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6424 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(809A50C4, &lit_6424); +COMPILER_STRIP_GATE(0x809A50C4, &lit_6424); #pragma pop /* 809A50C8-809A50CC 0001F8 0004+00 0/1 0/0 0/0 .rodata @6425 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6425 = 135.0f; -COMPILER_STRIP_GATE(809A50C8, &lit_6425); +COMPILER_STRIP_GATE(0x809A50C8, &lit_6425); #pragma pop /* 809A50CC-809A50D0 0001FC 0004+00 0/1 0/0 0/0 .rodata @6426 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6426 = 83.0f; -COMPILER_STRIP_GATE(809A50CC, &lit_6426); +COMPILER_STRIP_GATE(0x809A50CC, &lit_6426); #pragma pop /* 809A1810-809A1BE0 0041B0 03D0+00 1/1 0/0 0/0 .text calcHorseMotion__12daNpcCoach_cFv @@ -1457,14 +1463,14 @@ asm void daNpcCoach_c::calcHorseMotion() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6773 = 8.0f; -COMPILER_STRIP_GATE(809A50D0, &lit_6773); +COMPILER_STRIP_GATE(0x809A50D0, &lit_6773); #pragma pop /* 809A50D4-809A50D8 000204 0004+00 0/1 0/0 0/0 .rodata @6774 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6774 = 90.0f; -COMPILER_STRIP_GATE(809A50D4, &lit_6774); +COMPILER_STRIP_GATE(0x809A50D4, &lit_6774); #pragma pop /* 809A1BE0-809A2740 004580 0B60+00 1/1 0/0 0/0 .text calcHorseAnm__12daNpcCoach_cFv */ @@ -1482,28 +1488,28 @@ asm void daNpcCoach_c::calcHorseAnm() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6958 = 4096.0f; -COMPILER_STRIP_GATE(809A50D8, &lit_6958); +COMPILER_STRIP_GATE(0x809A50D8, &lit_6958); #pragma pop /* 809A50DC-809A50E0 00020C 0004+00 0/1 0/0 0/0 .rodata @6959 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6959 = -4096.0f; -COMPILER_STRIP_GATE(809A50DC, &lit_6959); +COMPILER_STRIP_GATE(0x809A50DC, &lit_6959); #pragma pop /* 809A50E0-809A50E4 000210 0004+00 0/1 0/0 0/0 .rodata @6960 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6960 = 30.0f; -COMPILER_STRIP_GATE(809A50E0, &lit_6960); +COMPILER_STRIP_GATE(0x809A50E0, &lit_6960); #pragma pop /* 809A50E4-809A50E8 000214 0004+00 0/1 0/0 0/0 .rodata @6961 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6961 = 10.0f; -COMPILER_STRIP_GATE(809A50E4, &lit_6961); +COMPILER_STRIP_GATE(0x809A50E4, &lit_6961); #pragma pop /* 809A2740-809A2E98 0050E0 0758+00 1/1 0/0 0/0 .text calcHorsePath__12daNpcCoach_cFv */ @@ -1532,28 +1538,28 @@ static asm void daNpcCoach_Draw(daNpcCoach_c* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7066 = 150.0f; -COMPILER_STRIP_GATE(809A50E8, &lit_7066); +COMPILER_STRIP_GATE(0x809A50E8, &lit_7066); #pragma pop /* 809A50EC-809A50F0 00021C 0004+00 0/1 0/0 0/0 .rodata @7067 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7067 = 1000.0f; -COMPILER_STRIP_GATE(809A50EC, &lit_7067); +COMPILER_STRIP_GATE(0x809A50EC, &lit_7067); #pragma pop /* 809A50F0-809A50F4 000220 0004+00 0/2 0/0 0/0 .rodata @7068 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7068 = 100.0f; -COMPILER_STRIP_GATE(809A50F0, &lit_7068); +COMPILER_STRIP_GATE(0x809A50F0, &lit_7068); #pragma pop /* 809A50F4-809A50F8 000224 0004+00 0/1 0/0 0/0 .rodata @7069 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7069 = 1400.0f; -COMPILER_STRIP_GATE(809A50F4, &lit_7069); +COMPILER_STRIP_GATE(0x809A50F4, &lit_7069); #pragma pop /* 809A2EB8-809A3300 005858 0448+00 1/1 0/0 0/0 .text draw__12daNpcCoach_cFv */ @@ -1648,35 +1654,41 @@ asm void daNpcCoach_c::create() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7443 = -180.0f; -COMPILER_STRIP_GATE(809A50F8, &lit_7443); +COMPILER_STRIP_GATE(0x809A50F8, &lit_7443); #pragma pop /* 809A50FC-809A5100 00022C 0004+00 0/1 0/0 0/0 .rodata @7444 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7444 = -750.0f; -COMPILER_STRIP_GATE(809A50FC, &lit_7444); +COMPILER_STRIP_GATE(0x809A50FC, &lit_7444); #pragma pop /* 809A5100-809A5104 000230 0004+00 0/1 0/0 0/0 .rodata @7445 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7445 = 180.0f; -COMPILER_STRIP_GATE(809A5100, &lit_7445); +COMPILER_STRIP_GATE(0x809A5100, &lit_7445); #pragma pop /* 809A5104-809A5108 000234 0004+00 0/1 0/0 0/0 .rodata @7446 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7446 = 450.0f; -COMPILER_STRIP_GATE(809A5104, &lit_7446); +COMPILER_STRIP_GATE(0x809A5104, &lit_7446); #pragma pop /* 809A5108-809A510C 000238 0004+00 0/1 0/0 0/0 .rodata @7447 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7447 = 200.0f; -COMPILER_STRIP_GATE(809A5108, &lit_7447); +COMPILER_STRIP_GATE(0x809A5108, &lit_7447); +#pragma pop + +/* 809A5120-809A5120 000250 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_809A5126 = "F_SP123"; #pragma pop /* 809A3928-809A4078 0062C8 0750+00 1/1 0/0 0/0 .text create_init__12daNpcCoach_cFv */ @@ -1694,35 +1706,35 @@ asm void daNpcCoach_c::create_init() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7496 = 45.0f; -COMPILER_STRIP_GATE(809A510C, &lit_7496); +COMPILER_STRIP_GATE(0x809A510C, &lit_7496); #pragma pop /* 809A5110-809A5114 000240 0004+00 0/1 0/0 0/0 .rodata @7497 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7497 = 50.0f; -COMPILER_STRIP_GATE(809A5110, &lit_7497); +COMPILER_STRIP_GATE(0x809A5110, &lit_7497); #pragma pop /* 809A5114-809A5118 000244 0004+00 0/1 0/0 0/0 .rodata @7498 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7498 = 250.0f; -COMPILER_STRIP_GATE(809A5114, &lit_7498); +COMPILER_STRIP_GATE(0x809A5114, &lit_7498); #pragma pop /* 809A5118-809A511C 000248 0004+00 0/1 0/0 0/0 .rodata @7499 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7499 = 85.0f; -COMPILER_STRIP_GATE(809A5118, &lit_7499); +COMPILER_STRIP_GATE(0x809A5118, &lit_7499); #pragma pop /* 809A511C-809A5120 00024C 0004+00 0/1 0/0 0/0 .rodata @7500 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7500 = 120.0f; -COMPILER_STRIP_GATE(809A511C, &lit_7500); +COMPILER_STRIP_GATE(0x809A511C, &lit_7500); #pragma pop /* 809A4078-809A43A0 006A18 0328+00 1/1 0/0 0/0 .text initCollision__12daNpcCoach_cFv */ @@ -1891,10 +1903,4 @@ static asm void func_809A4EC0() { } #pragma pop -/* 809A5120-809A512E 000250 000E+00 2/1 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_809A5120 = "Coach"; -SECTION_DEAD static char const* const stringBase_809A5126 = "F_SP123"; -#pragma pop +/* 809A5120-809A5120 000250 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/npc/d_a_npc_df/d_a_npc_df.cpp b/rel/d/a/npc/d_a_npc_df/d_a_npc_df.cpp index c3836d7f6b2..929260201a0 100644 --- a/rel/d/a/npc/d_a_npc_df/d_a_npc_df.cpp +++ b/rel/d/a/npc/d_a_npc_df/d_a_npc_df.cpp @@ -37,10 +37,10 @@ struct dRes_control_c { /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); }; -struct J3DModelData {}; - struct J3DModel {}; +struct J3DModelData {}; + struct dComIfG_play_c { /* 8002CAF0 */ void addSimpleModel(J3DModelData*, int, u8); /* 8002CB30 */ void removeSimpleModel(J3DModelData*, int); @@ -195,20 +195,20 @@ static asm void daNpc_Df_Draw(npc_df_class* param_0) { /* ############################################################################################## */ /* 809A68A4-809A68A8 000000 0004+00 3/3 0/0 0/0 .rodata @3748 */ SECTION_RODATA static f32 const lit_3748 = 100.0f; -COMPILER_STRIP_GATE(809A68A4, &lit_3748); +COMPILER_STRIP_GATE(0x809A68A4, &lit_3748); /* 809A68A8-809A68AC 000004 0004+00 0/2 0/0 0/0 .rodata @3749 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3749 = 10.0f; -COMPILER_STRIP_GATE(809A68A8, &lit_3749); +COMPILER_STRIP_GATE(0x809A68A8, &lit_3749); #pragma pop /* 809A68AC-809A68B0 000008 0004+00 0/1 0/0 0/0 .rodata @3750 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3750 = 40.0f; -COMPILER_STRIP_GATE(809A68AC, &lit_3750); +COMPILER_STRIP_GATE(0x809A68AC, &lit_3750); #pragma pop /* 809A68B0-809A68B4 00000C 0004+00 0/3 0/0 0/0 .rodata @3751 */ @@ -220,147 +220,147 @@ SECTION_RODATA static u8 const lit_3751[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(809A68B0, &lit_3751); +COMPILER_STRIP_GATE(0x809A68B0, &lit_3751); #pragma pop /* 809A68B4-809A68B8 000010 0004+00 0/1 0/0 0/0 .rodata @3752 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3752 = 32768.0f; -COMPILER_STRIP_GATE(809A68B4, &lit_3752); +COMPILER_STRIP_GATE(0x809A68B4, &lit_3752); #pragma pop /* 809A68B8-809A68BC 000014 0004+00 0/1 0/0 0/0 .rodata @3753 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3753 = 8000.0f; -COMPILER_STRIP_GATE(809A68B8, &lit_3753); +COMPILER_STRIP_GATE(0x809A68B8, &lit_3753); #pragma pop /* 809A68BC-809A68C0 000018 0004+00 0/2 0/0 0/0 .rodata @3754 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3754 = 80.0f; -COMPILER_STRIP_GATE(809A68BC, &lit_3754); +COMPILER_STRIP_GATE(0x809A68BC, &lit_3754); #pragma pop /* 809A68C0-809A68C4 00001C 0004+00 0/2 0/0 0/0 .rodata @3755 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3755 = 4.0f; -COMPILER_STRIP_GATE(809A68C0, &lit_3755); +COMPILER_STRIP_GATE(0x809A68C0, &lit_3755); #pragma pop /* 809A68C4-809A68C8 000020 0004+00 0/1 0/0 0/0 .rodata @3756 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3756 = 300.0f; -COMPILER_STRIP_GATE(809A68C4, &lit_3756); +COMPILER_STRIP_GATE(0x809A68C4, &lit_3756); #pragma pop /* 809A68C8-809A68CC 000024 0004+00 0/1 0/0 0/0 .rodata @3757 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3757 = 1000.0f; -COMPILER_STRIP_GATE(809A68C8, &lit_3757); +COMPILER_STRIP_GATE(0x809A68C8, &lit_3757); #pragma pop /* 809A68CC-809A68D0 000028 0004+00 0/1 0/0 0/0 .rodata @3758 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3758 = 1500.0f; -COMPILER_STRIP_GATE(809A68CC, &lit_3758); +COMPILER_STRIP_GATE(0x809A68CC, &lit_3758); #pragma pop /* 809A68D0-809A68D4 00002C 0004+00 0/2 0/0 0/0 .rodata @3759 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3759 = 50.0f; -COMPILER_STRIP_GATE(809A68D0, &lit_3759); +COMPILER_STRIP_GATE(0x809A68D0, &lit_3759); #pragma pop /* 809A68D4-809A68D8 000030 0004+00 0/1 0/0 0/0 .rodata @3760 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3760 = 700.0f; -COMPILER_STRIP_GATE(809A68D4, &lit_3760); +COMPILER_STRIP_GATE(0x809A68D4, &lit_3760); #pragma pop /* 809A68D8-809A68DC 000034 0004+00 0/2 0/0 0/0 .rodata @3761 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3761 = 60.0f; -COMPILER_STRIP_GATE(809A68D8, &lit_3761); +COMPILER_STRIP_GATE(0x809A68D8, &lit_3761); #pragma pop /* 809A68DC-809A68E0 000038 0004+00 0/3 0/0 0/0 .rodata @3762 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3762 = 3.0f; -COMPILER_STRIP_GATE(809A68DC, &lit_3762); +COMPILER_STRIP_GATE(0x809A68DC, &lit_3762); #pragma pop /* 809A68E0-809A68E4 00003C 0004+00 0/1 0/0 0/0 .rodata @3763 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3763 = 70.0f; -COMPILER_STRIP_GATE(809A68E0, &lit_3763); +COMPILER_STRIP_GATE(0x809A68E0, &lit_3763); #pragma pop /* 809A68E4-809A68E8 000040 0004+00 0/2 0/0 0/0 .rodata @3764 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3764 = 0.5f; -COMPILER_STRIP_GATE(809A68E4, &lit_3764); +COMPILER_STRIP_GATE(0x809A68E4, &lit_3764); #pragma pop /* 809A68E8-809A68EC 000044 0004+00 0/1 0/0 0/0 .rodata @3765 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3765 = 1.5f; -COMPILER_STRIP_GATE(809A68E8, &lit_3765); +COMPILER_STRIP_GATE(0x809A68E8, &lit_3765); #pragma pop /* 809A68EC-809A68F0 000048 0004+00 0/2 0/0 0/0 .rodata @3766 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3766 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(809A68EC, &lit_3766); +COMPILER_STRIP_GATE(0x809A68EC, &lit_3766); #pragma pop /* 809A68F0-809A68F4 00004C 0004+00 0/1 0/0 0/0 .rodata @3767 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3767 = 2.0f; -COMPILER_STRIP_GATE(809A68F0, &lit_3767); +COMPILER_STRIP_GATE(0x809A68F0, &lit_3767); #pragma pop /* 809A68F4-809A68F8 000050 0004+00 0/2 0/0 0/0 .rodata @3768 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3768 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(809A68F4, &lit_3768); +COMPILER_STRIP_GATE(0x809A68F4, &lit_3768); #pragma pop /* 809A68F8-809A68FC 000054 0004+00 0/1 0/0 0/0 .rodata @3769 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3769 = 3.0f / 10.0f; -COMPILER_STRIP_GATE(809A68F8, &lit_3769); +COMPILER_STRIP_GATE(0x809A68F8, &lit_3769); #pragma pop /* 809A68FC-809A6900 000058 0004+00 0/2 0/0 0/0 .rodata @3770 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3770 = 20.0f; -COMPILER_STRIP_GATE(809A68FC, &lit_3770); +COMPILER_STRIP_GATE(0x809A68FC, &lit_3770); #pragma pop /* 809A6900-809A6904 00005C 0004+00 0/2 0/0 0/0 .rodata @3771 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3771 = 30.0f; -COMPILER_STRIP_GATE(809A6900, &lit_3771); +COMPILER_STRIP_GATE(0x809A6900, &lit_3771); #pragma pop /* 809A6904-809A690C 000060 0004+04 0/2 0/0 0/0 .rodata @3772 */ @@ -371,7 +371,7 @@ SECTION_RODATA static f32 const lit_3772[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(809A6904, &lit_3772); +COMPILER_STRIP_GATE(0x809A6904, &lit_3772); #pragma pop /* 809A690C-809A6914 000068 0008+00 0/3 0/0 0/0 .rodata @3775 */ @@ -380,7 +380,7 @@ COMPILER_STRIP_GATE(809A6904, &lit_3772); SECTION_RODATA static u8 const lit_3775[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809A690C, &lit_3775); +COMPILER_STRIP_GATE(0x809A690C, &lit_3775); #pragma pop /* 809A6A10-809A6A14 000008 0001+03 2/2 0/0 0/0 .bss @1109 */ @@ -518,81 +518,81 @@ static asm void df_fly(npc_df_class* param_0, df_s* param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3888 = 8192.0f; -COMPILER_STRIP_GATE(809A6914, &lit_3888); +COMPILER_STRIP_GATE(0x809A6914, &lit_3888); #pragma pop /* 809A6918-809A691C 000074 0004+00 0/1 0/0 0/0 .rodata @3889 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3889 = -8192.0f; -COMPILER_STRIP_GATE(809A6918, &lit_3889); +COMPILER_STRIP_GATE(0x809A6918, &lit_3889); #pragma pop /* 809A691C-809A6920 000078 0004+00 0/1 0/0 0/0 .rodata @3890 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3890 = 4096.0f; -COMPILER_STRIP_GATE(809A691C, &lit_3890); +COMPILER_STRIP_GATE(0x809A691C, &lit_3890); #pragma pop /* 809A6920-809A6924 00007C 0004+00 1/3 0/0 0/0 .rodata @3891 */ SECTION_RODATA static f32 const lit_3891 = 1.0f; -COMPILER_STRIP_GATE(809A6920, &lit_3891); +COMPILER_STRIP_GATE(0x809A6920, &lit_3891); /* 809A6924-809A6928 000080 0004+00 0/1 0/0 0/0 .rodata @3892 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3892 = 7.0f; -COMPILER_STRIP_GATE(809A6924, &lit_3892); +COMPILER_STRIP_GATE(0x809A6924, &lit_3892); #pragma pop /* 809A6928-809A692C 000084 0004+00 0/1 0/0 0/0 .rodata @3893 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_3893 = 0x409FAE14; -COMPILER_STRIP_GATE(809A6928, &lit_3893); +COMPILER_STRIP_GATE(0x809A6928, &lit_3893); #pragma pop /* 809A692C-809A6930 000088 0004+00 0/1 0/0 0/0 .rodata @3894 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3894 = 9.0f; -COMPILER_STRIP_GATE(809A692C, &lit_3894); +COMPILER_STRIP_GATE(0x809A692C, &lit_3894); #pragma pop /* 809A6930-809A6934 00008C 0004+00 0/1 0/0 0/0 .rodata @3895 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_3895 = 0x403F5C29; -COMPILER_STRIP_GATE(809A6930, &lit_3895); +COMPILER_STRIP_GATE(0x809A6930, &lit_3895); #pragma pop /* 809A6934-809A6938 000090 0004+00 0/2 0/0 0/0 .rodata @3896 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3896 = 400.0f; -COMPILER_STRIP_GATE(809A6934, &lit_3896); +COMPILER_STRIP_GATE(0x809A6934, &lit_3896); #pragma pop /* 809A6938-809A693C 000094 0004+00 0/1 0/0 0/0 .rodata @3897 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3897 = 500.0f; -COMPILER_STRIP_GATE(809A6938, &lit_3897); +COMPILER_STRIP_GATE(0x809A6938, &lit_3897); #pragma pop /* 809A693C-809A6940 000098 0004+00 0/1 0/0 0/0 .rodata @3898 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3898 = 0.25f; -COMPILER_STRIP_GATE(809A693C, &lit_3898); +COMPILER_STRIP_GATE(0x809A693C, &lit_3898); #pragma pop /* 809A6940-809A6944 00009C 0004+00 0/1 0/0 0/0 .rodata @3899 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3899 = 101.0f / 10.0f; -COMPILER_STRIP_GATE(809A6940, &lit_3899); +COMPILER_STRIP_GATE(0x809A6940, &lit_3899); #pragma pop /* 809A6944-809A694C 0000A0 0008+00 0/1 0/0 0/0 .rodata @3900 */ @@ -601,7 +601,7 @@ COMPILER_STRIP_GATE(809A6940, &lit_3899); SECTION_RODATA static u8 const lit_3900[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809A6944, &lit_3900); +COMPILER_STRIP_GATE(0x809A6944, &lit_3900); #pragma pop /* 809A694C-809A6954 0000A8 0008+00 0/1 0/0 0/0 .rodata @3901 */ @@ -610,7 +610,7 @@ COMPILER_STRIP_GATE(809A6944, &lit_3900); SECTION_RODATA static u8 const lit_3901[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809A694C, &lit_3901); +COMPILER_STRIP_GATE(0x809A694C, &lit_3901); #pragma pop /* 809A6954-809A695C 0000B0 0008+00 0/1 0/0 0/0 .rodata @3902 */ @@ -619,63 +619,63 @@ COMPILER_STRIP_GATE(809A694C, &lit_3901); SECTION_RODATA static u8 const lit_3902[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809A6954, &lit_3902); +COMPILER_STRIP_GATE(0x809A6954, &lit_3902); #pragma pop /* 809A695C-809A6960 0000B8 0004+00 0/1 0/0 0/0 .rodata @3903 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3903 = 51.0f / 10.0f; -COMPILER_STRIP_GATE(809A695C, &lit_3903); +COMPILER_STRIP_GATE(0x809A695C, &lit_3903); #pragma pop /* 809A6960-809A6964 0000BC 0004+00 0/1 0/0 0/0 .rodata @3904 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3904 = 35.0f; -COMPILER_STRIP_GATE(809A6960, &lit_3904); +COMPILER_STRIP_GATE(0x809A6960, &lit_3904); #pragma pop /* 809A6964-809A6968 0000C0 0004+00 0/1 0/0 0/0 .rodata @3905 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3905 = 15.0f; -COMPILER_STRIP_GATE(809A6964, &lit_3905); +COMPILER_STRIP_GATE(0x809A6964, &lit_3905); #pragma pop /* 809A6968-809A696C 0000C4 0004+00 0/1 0/0 0/0 .rodata @3906 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3906 = -13.0f / 100.0f; -COMPILER_STRIP_GATE(809A6968, &lit_3906); +COMPILER_STRIP_GATE(0x809A6968, &lit_3906); #pragma pop /* 809A696C-809A6970 0000C8 0004+00 0/1 0/0 0/0 .rodata @3907 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3907 = -1.0f / 5.0f; -COMPILER_STRIP_GATE(809A696C, &lit_3907); +COMPILER_STRIP_GATE(0x809A696C, &lit_3907); #pragma pop /* 809A6970-809A6974 0000CC 0004+00 0/1 0/0 0/0 .rodata @3908 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3908 = -33.0f / 100.0f; -COMPILER_STRIP_GATE(809A6970, &lit_3908); +COMPILER_STRIP_GATE(0x809A6970, &lit_3908); #pragma pop /* 809A6974-809A6978 0000D0 0004+00 0/1 0/0 0/0 .rodata @3909 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3909 = -21.0f / 50.0f; -COMPILER_STRIP_GATE(809A6974, &lit_3909); +COMPILER_STRIP_GATE(0x809A6974, &lit_3909); #pragma pop /* 809A6978-809A697C 0000D4 0004+00 0/1 0/0 0/0 .rodata @3910 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3910 = 4.0f / 5.0f; -COMPILER_STRIP_GATE(809A6978, &lit_3910); +COMPILER_STRIP_GATE(0x809A6978, &lit_3910); #pragma pop /* 809A59DC-809A6100 00073C 0724+00 1/1 0/0 0/0 .text df_rod__FP12npc_df_classP4df_s */ @@ -725,6 +725,13 @@ static bool daNpc_Df_IsDelete(npc_df_class* param_0) { return true; } +/* ############################################################################################## */ +/* 809A697C-809A697C 0000D8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_809A697C = "Npc_df"; +#pragma pop + /* 809A63B4-809A6478 001114 00C4+00 1/0 0/0 0/0 .text daNpc_Df_Delete__FP12npc_df_class */ #pragma push @@ -822,7 +829,7 @@ asm void __sinit_d_a_npc_df_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_809A6768 = (void*)__sinit_d_a_npc_df_cpp; +REGISTER_CTORS(0x809A6768, __sinit_d_a_npc_df_cpp); #pragma pop /* 809A6800-809A6878 001560 0078+00 5/4 0/0 0/0 .text __dt__14dBgS_ObjGndChkFv */ @@ -1037,9 +1044,4 @@ static u8 data_809A6B8C[4]; static u8 data_809A6B90[4]; #pragma pop -/* 809A697C-809A6983 0000D8 0007+00 3/3 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_809A697C = "Npc_df"; -#pragma pop +/* 809A697C-809A697C 0000D8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/npc/d_a_npc_doc/d_a_npc_doc.cpp b/rel/d/a/npc/d_a_npc_doc/d_a_npc_doc.cpp index 349c6b4cd14..399237572ba 100644 --- a/rel/d/a/npc/d_a_npc_doc/d_a_npc_doc.cpp +++ b/rel/d/a/npc/d_a_npc_doc/d_a_npc_doc.cpp @@ -15,12 +15,14 @@ struct mDoMtx_stack_c { static u8 now[48]; }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; +struct J3DAnmTransform {}; + +struct J3DModelData {}; + struct Vec {}; struct Z2Creature { @@ -29,8 +31,6 @@ struct Z2Creature { /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -43,6 +43,8 @@ struct fopAc_ac_c { /* 80018C8C */ ~fopAc_ac_c(); }; +struct daNpcT_faceMotionAnmData_c {}; + struct daNpcT_MotionSeqMngr_c { struct sequenceStepData_c {}; @@ -51,14 +53,12 @@ struct daNpcT_MotionSeqMngr_c { /* 809A9B74 */ ~daNpcT_MotionSeqMngr_c(); }; +struct daNpcT_evtData_c {}; + struct daNpcT_motionAnmData_c {}; struct J3DJoint {}; -struct daNpcT_faceMotionAnmData_c {}; - -struct daNpcT_evtData_c {}; - struct daNpc_Doc_c { /* 809A6C8C */ ~daNpc_Doc_c(); /* 809A6DC0 */ void create(); @@ -119,6 +119,13 @@ struct dCcD_GObjInf { /* 800844F8 */ void GetTgHitObj(); }; +struct csXyz { + /* 809A9510 */ ~csXyz(); + /* 809A9A28 */ csXyz(); +}; + +struct _GXColorS10 {}; + struct J3DModel {}; struct cXyz { @@ -128,13 +135,6 @@ struct cXyz { /* 809A9B28 */ cXyz(); }; -struct _GXColorS10 {}; - -struct csXyz { - /* 809A9510 */ ~csXyz(); - /* 809A9A28 */ csXyz(); -}; - struct daNpcT_c { /* 80147FA4 */ void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*); /* 801483F8 */ void loadRes(s8 const*, char const**); @@ -633,6 +633,15 @@ extern "C" void __register_global_object(); // /* ############################################################################################## */ +/* 809AA428-809AA428 00010C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_809AA428 = ""; +SECTION_DEAD static char const* const stringBase_809AA429 = "NO_RESPONSE"; +SECTION_DEAD static char const* const stringBase_809AA435 = "Doc"; +SECTION_DEAD static char const* const stringBase_809AA439 = "Doc1"; +#pragma pop + /* 809AA440-809AA44C 000000 000C+00 2/2 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -1031,7 +1040,7 @@ SECTION_RODATA u8 const daNpc_Doc_Param_c::m[144] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809AA31C, &daNpc_Doc_Param_c::m); +COMPILER_STRIP_GATE(0x809AA31C, &daNpc_Doc_Param_c::m); /* 809AA3AC-809AA3B8 000090 000C+00 0/1 0/0 0/0 .rodata heapSize$3968 */ #pragma push @@ -1039,28 +1048,28 @@ COMPILER_STRIP_GATE(809AA31C, &daNpc_Doc_Param_c::m); SECTION_RODATA static u8 const heapSize[12] = { 0x00, 0x00, 0x48, 0x50, 0x00, 0x00, 0x48, 0x50, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809AA3AC, &heapSize); +COMPILER_STRIP_GATE(0x809AA3AC, &heapSize); #pragma pop /* 809AA3B8-809AA3BC 00009C 0004+00 0/1 0/0 0/0 .rodata @4034 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4034 = -200.0f; -COMPILER_STRIP_GATE(809AA3B8, &lit_4034); +COMPILER_STRIP_GATE(0x809AA3B8, &lit_4034); #pragma pop /* 809AA3BC-809AA3C0 0000A0 0004+00 0/1 0/0 0/0 .rodata @4035 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4035 = -100.0f; -COMPILER_STRIP_GATE(809AA3BC, &lit_4035); +COMPILER_STRIP_GATE(0x809AA3BC, &lit_4035); #pragma pop /* 809AA3C0-809AA3C4 0000A4 0004+00 0/1 0/0 0/0 .rodata @4036 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4036 = 200.0f; -COMPILER_STRIP_GATE(809AA3C0, &lit_4036); +COMPILER_STRIP_GATE(0x809AA3C0, &lit_4036); #pragma pop /* 809AA3C4-809AA3C8 0000A8 0004+00 4/11 0/0 0/0 .rodata @4037 */ @@ -1070,13 +1079,13 @@ SECTION_RODATA static u8 const lit_4037[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(809AA3C4, &lit_4037); +COMPILER_STRIP_GATE(0x809AA3C4, &lit_4037); /* 809AA3C8-809AA3CC 0000AC 0004+00 0/1 0/0 0/0 .rodata @4038 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4038 = -1000000000.0f; -COMPILER_STRIP_GATE(809AA3C8, &lit_4038); +COMPILER_STRIP_GATE(0x809AA3C8, &lit_4038); #pragma pop /* 809A6DC0-809A7088 000220 02C8+00 1/1 0/0 0/0 .text create__11daNpc_Doc_cFv */ @@ -1094,19 +1103,19 @@ asm void daNpc_Doc_c::create() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4199 = 65536.0f; -COMPILER_STRIP_GATE(809AA3CC, &lit_4199); +COMPILER_STRIP_GATE(0x809AA3CC, &lit_4199); #pragma pop /* 809AA3D0-809AA3D4 0000B4 0004+00 0/2 0/0 0/0 .rodata @4200 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4200 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(809AA3D0, &lit_4200); +COMPILER_STRIP_GATE(0x809AA3D0, &lit_4200); #pragma pop /* 809AA3D4-809AA3D8 0000B8 0004+00 2/4 0/0 0/0 .rodata @4348 */ SECTION_RODATA static f32 const lit_4348 = 1.0f; -COMPILER_STRIP_GATE(809AA3D4, &lit_4348); +COMPILER_STRIP_GATE(0x809AA3D4, &lit_4348); /* 809A7088-809A730C 0004E8 0284+00 1/1 0/0 0/0 .text CreateHeap__11daNpc_Doc_cFv */ #pragma push @@ -1241,7 +1250,7 @@ asm void daNpc_Doc_c::Execute() { /* ############################################################################################## */ /* 809AA3D8-809AA3DC 0000BC 0004+00 1/2 0/0 0/0 .rodata @4397 */ SECTION_RODATA static f32 const lit_4397 = 100.0f; -COMPILER_STRIP_GATE(809AA3D8, &lit_4397); +COMPILER_STRIP_GATE(0x809AA3D8, &lit_4397); /* 809A751C-809A75B0 00097C 0094+00 1/1 0/0 0/0 .text Draw__11daNpc_Doc_cFv */ #pragma push @@ -1338,7 +1347,7 @@ asm void daNpc_Doc_c::checkChangeEvt() { /* ############################################################################################## */ /* 809AA3DC-809AA3E0 0000C0 0004+00 3/4 0/0 0/0 .rodata @4588 */ SECTION_RODATA static f32 const lit_4588 = -1.0f; -COMPILER_STRIP_GATE(809AA3DC, &lit_4588); +COMPILER_STRIP_GATE(0x809AA3DC, &lit_4588); /* 809A7BC4-809A7C3C 001024 0078+00 1/0 0/0 0/0 .text setAfterTalkMotion__11daNpc_Doc_cFv */ @@ -1401,35 +1410,35 @@ asm void daNpc_Doc_c::beforeMove() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4768 = 30.0f; -COMPILER_STRIP_GATE(809AA3E0, &lit_4768); +COMPILER_STRIP_GATE(0x809AA3E0, &lit_4768); #pragma pop /* 809AA3E4-809AA3E8 0000C8 0004+00 0/1 0/0 0/0 .rodata @4769 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4769 = 0x38C90FDB; -COMPILER_STRIP_GATE(809AA3E4, &lit_4769); +COMPILER_STRIP_GATE(0x809AA3E4, &lit_4769); #pragma pop /* 809AA3E8-809AA3EC 0000CC 0004+00 0/1 0/0 0/0 .rodata @4770 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4770 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(809AA3E8, &lit_4770); +COMPILER_STRIP_GATE(0x809AA3E8, &lit_4770); #pragma pop /* 809AA3EC-809AA3F0 0000D0 0004+00 0/1 0/0 0/0 .rodata @4771 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4771 = 60.0f; -COMPILER_STRIP_GATE(809AA3EC, &lit_4771); +COMPILER_STRIP_GATE(0x809AA3EC, &lit_4771); #pragma pop /* 809AA3F0-809AA3F4 0000D4 0004+00 0/1 0/0 0/0 .rodata @4772 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4772 = 3.0f; -COMPILER_STRIP_GATE(809AA3F0, &lit_4772); +COMPILER_STRIP_GATE(0x809AA3F0, &lit_4772); #pragma pop /* 809AA3F4-809AA3FC 0000D8 0004+04 0/1 0/0 0/0 .rodata @4773 */ @@ -1440,14 +1449,14 @@ SECTION_RODATA static f32 const lit_4773[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(809AA3F4, &lit_4773); +COMPILER_STRIP_GATE(0x809AA3F4, &lit_4773); #pragma pop /* 809AA3FC-809AA404 0000E0 0008+00 1/3 0/0 0/0 .rodata @4775 */ SECTION_RODATA static u8 const lit_4775[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809AA3FC, &lit_4775); +COMPILER_STRIP_GATE(0x809AA3FC, &lit_4775); /* 809AAAD0-809AAAD4 000008 0001+03 1/1 0/0 0/0 .bss @1109 */ static u8 lit_1109[1 + 3 /* padding */]; @@ -1577,7 +1586,7 @@ asm void daNpc_Doc_c::setAttnPos() { SECTION_RODATA static u8 const lit_4833[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809AA404, &lit_4833); +COMPILER_STRIP_GATE(0x809AA404, &lit_4833); #pragma pop /* 809AA40C-809AA414 0000F0 0008+00 0/1 0/0 0/0 .rodata @4834 */ @@ -1586,7 +1595,7 @@ COMPILER_STRIP_GATE(809AA404, &lit_4833); SECTION_RODATA static u8 const lit_4834[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809AA40C, &lit_4834); +COMPILER_STRIP_GATE(0x809AA40C, &lit_4834); #pragma pop /* 809AA414-809AA41C 0000F8 0008+00 0/1 0/0 0/0 .rodata @4835 */ @@ -1595,14 +1604,14 @@ COMPILER_STRIP_GATE(809AA40C, &lit_4834); SECTION_RODATA static u8 const lit_4835[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809AA414, &lit_4835); +COMPILER_STRIP_GATE(0x809AA414, &lit_4835); #pragma pop /* 809AA41C-809AA420 000100 0004+00 0/1 0/0 0/0 .rodata @4877 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4877 = 20.0f; -COMPILER_STRIP_GATE(809AA41C, &lit_4877); +COMPILER_STRIP_GATE(0x809AA41C, &lit_4877); #pragma pop /* 809A83A8-809A8530 001808 0188+00 1/0 0/0 0/0 .text setCollision__11daNpc_Doc_cFv */ @@ -1635,7 +1644,7 @@ asm void daNpc_Doc_c::selectAction() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpc_Doc_c::chkAction(int (daNpc_Doc_c::*)(void*)) { +asm void daNpc_Doc_c::chkAction(int (daNpc_Doc_c::*param_0)(void*)) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_doc/d_a_npc_doc/chkAction__11daNpc_Doc_cFM11daNpc_Doc_cFPCvPvPv_i.s" } @@ -1646,7 +1655,7 @@ asm void daNpc_Doc_c::chkAction(int (daNpc_Doc_c::*)(void*)) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpc_Doc_c::setAction(int (daNpc_Doc_c::*)(void*)) { +asm void daNpc_Doc_c::setAction(int (daNpc_Doc_c::*param_0)(void*)) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_doc/d_a_npc_doc/setAction__11daNpc_Doc_cFM11daNpc_Doc_cFPCvPvPv_i.s" } @@ -1679,7 +1688,7 @@ asm void daNpc_Doc_c::walk(void* param_0) { SECTION_RODATA static u8 const lit_5113[8] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, }; -COMPILER_STRIP_GATE(809AA420, &lit_5113); +COMPILER_STRIP_GATE(0x809AA420, &lit_5113); #pragma pop /* 809A8C78-809A904C 0020D8 03D4+00 3/0 0/0 0/0 .text talk__11daNpc_Doc_cFPv */ @@ -2054,7 +2063,7 @@ asm void __sinit_d_a_npc_doc_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_809AA124 = (void*)__sinit_d_a_npc_doc_cpp; +REGISTER_CTORS(0x809AA124, __sinit_d_a_npc_doc_cpp); #pragma pop /* 809AA18C-809AA24C 0035EC 00C0+00 1/1 0/0 0/0 .text @@ -2338,12 +2347,4 @@ static u8 data_809AAB98[4]; static u8 data_809AAB9C[4]; #pragma pop -/* 809AA428-809AA43E 00010C 0016+00 4/1 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_809AA428 = ""; -SECTION_DEAD static char const* const stringBase_809AA429 = "NO_RESPONSE"; -SECTION_DEAD static char const* const stringBase_809AA435 = "Doc"; -SECTION_DEAD static char const* const stringBase_809AA439 = "Doc1"; -#pragma pop +/* 809AA428-809AA428 00010C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/npc/d_a_npc_doorboy/d_a_npc_doorboy.cpp b/rel/d/a/npc/d_a_npc_doorboy/d_a_npc_doorboy.cpp index c53aedb3f01..91a5a4e7169 100644 --- a/rel/d/a/npc/d_a_npc_doorboy/d_a_npc_doorboy.cpp +++ b/rel/d/a/npc/d_a_npc_doorboy/d_a_npc_doorboy.cpp @@ -17,16 +17,16 @@ struct mDoMtx_stack_c { static u8 now[48]; }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; - struct J3DAnmTransform {}; +struct J3DModelData {}; + +struct Z2Creature {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -39,10 +39,10 @@ struct fopAc_ac_c { /* 80018C8C */ ~fopAc_ac_c(); }; -struct _GXColorS10 {}; - struct J3DAnmTexPattern {}; +struct _GXColorS10 {}; + struct J3DAnmTransformKey {}; struct daNpcF_c { @@ -108,10 +108,10 @@ struct daNpcF_ActorMngr_c { /* 809AD118 */ daNpcF_ActorMngr_c(); }; -struct J3DJoint {}; - struct J3DModel {}; +struct J3DJoint {}; + struct daNpcDoorBoy_c { /* 809AAC8C */ daNpcDoorBoy_c(); /* 809AAEA0 */ ~daNpcDoorBoy_c(); @@ -502,6 +502,13 @@ extern "C" void __register_global_object(); // /* ############################################################################################## */ +/* 809ADB04-809ADB04 00015C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_809ADB04 = "DoorBoy"; +SECTION_DEAD static char const* const stringBase_809ADB0C = "Mgeneral"; +#pragma pop + /* 809ADB28-809ADB34 000000 000C+00 2/2 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -807,34 +814,34 @@ SECTION_RODATA u8 const daNpcDoorBoy_Param_c::m[108] = { 0x42, 0x70, 0x00, 0x00, 0x43, 0xFA, 0x00, 0x00, 0x43, 0x96, 0x00, 0x00, 0xC3, 0x96, 0x00, 0x00, 0x00, 0x3C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809AD9A8, &daNpcDoorBoy_Param_c::m); +COMPILER_STRIP_GATE(0x809AD9A8, &daNpcDoorBoy_Param_c::m); /* 809ADA14-809ADA18 00006C 0004+00 0/1 0/0 0/0 .rodata @4267 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4267 = -50.0f; -COMPILER_STRIP_GATE(809ADA14, &lit_4267); +COMPILER_STRIP_GATE(0x809ADA14, &lit_4267); #pragma pop /* 809ADA18-809ADA1C 000070 0004+00 0/1 0/0 0/0 .rodata @4268 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4268 = -10.0f; -COMPILER_STRIP_GATE(809ADA18, &lit_4268); +COMPILER_STRIP_GATE(0x809ADA18, &lit_4268); #pragma pop /* 809ADA1C-809ADA20 000074 0004+00 0/2 0/0 0/0 .rodata @4269 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4269 = 50.0f; -COMPILER_STRIP_GATE(809ADA1C, &lit_4269); +COMPILER_STRIP_GATE(0x809ADA1C, &lit_4269); #pragma pop /* 809ADA20-809ADA24 000078 0004+00 0/1 0/0 0/0 .rodata @4270 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4270 = 210.0f; -COMPILER_STRIP_GATE(809ADA20, &lit_4270); +COMPILER_STRIP_GATE(0x809ADA20, &lit_4270); #pragma pop /* 809AB088-809AB320 0004E8 0298+00 1/1 0/0 0/0 .text Create__14daNpcDoorBoy_cFv */ @@ -850,18 +857,18 @@ asm void daNpcDoorBoy_c::Create() { /* ############################################################################################## */ /* 809ADA24-809ADA28 00007C 0004+00 2/5 0/0 0/0 .rodata @4319 */ SECTION_RODATA static f32 const lit_4319 = 1.0f; -COMPILER_STRIP_GATE(809ADA24, &lit_4319); +COMPILER_STRIP_GATE(0x809ADA24, &lit_4319); /* 809ADA28-809ADA2C 000080 0004+00 0/1 0/0 0/0 .rodata @4320 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4320 = 0x3F8A8182; -COMPILER_STRIP_GATE(809ADA28, &lit_4320); +COMPILER_STRIP_GATE(0x809ADA28, &lit_4320); #pragma pop /* 809ADA2C-809ADA30 000084 0004+00 3/6 0/0 0/0 .rodata @4321 */ SECTION_RODATA static f32 const lit_4321 = -1.0f; -COMPILER_STRIP_GATE(809ADA2C, &lit_4321); +COMPILER_STRIP_GATE(0x809ADA2C, &lit_4321); /* 809AB320-809AB4A4 000780 0184+00 1/1 0/0 0/0 .text CreateHeap__14daNpcDoorBoy_cFv */ #pragma push @@ -908,7 +915,7 @@ asm void daNpcDoorBoy_c::Draw() { SECTION_RODATA static u8 const lit_4341[12] = { 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x03, }; -COMPILER_STRIP_GATE(809ADA30, &lit_4341); +COMPILER_STRIP_GATE(0x809ADA30, &lit_4341); /* 809AB578-809AB704 0009D8 018C+00 1/1 0/0 0/0 .text * ctrlJoint__14daNpcDoorBoy_cFP8J3DJointP8J3DModel */ @@ -961,7 +968,7 @@ SECTION_RODATA static u8 const lit_4477[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(809ADA3C, &lit_4477); +COMPILER_STRIP_GATE(0x809ADA3C, &lit_4477); /* 809AB7B8-809AB984 000C18 01CC+00 1/1 0/0 0/0 .text reset__14daNpcDoorBoy_cFv */ #pragma push @@ -978,7 +985,7 @@ asm void daNpcDoorBoy_c::reset() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpcDoorBoy_c::setAction(bool (daNpcDoorBoy_c::*)(void*)) { +asm void daNpcDoorBoy_c::setAction(bool (daNpcDoorBoy_c::*param_0)(void*)) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_doorboy/d_a_npc_doorboy/setAction__14daNpcDoorBoy_cFM14daNpcDoorBoy_cFPCvPvPv_b.s" } @@ -991,7 +998,7 @@ asm void daNpcDoorBoy_c::setAction(bool (daNpcDoorBoy_c::*)(void*)) { SECTION_RODATA static u8 const lit_4478[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809ADA40, &lit_4478); +COMPILER_STRIP_GATE(0x809ADA40, &lit_4478); #pragma pop /* 809ADA4C-809ADA50 0000A4 0004+00 0/1 0/0 0/0 .rodata @4479 */ @@ -1003,7 +1010,7 @@ SECTION_RODATA static u8 const lit_4479[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(809ADA4C, &lit_4479); +COMPILER_STRIP_GATE(0x809ADA4C, &lit_4479); #pragma pop /* 809ADA50-809ADA5C 0000A8 000C+00 0/1 0/0 0/0 .rodata @4480 */ @@ -1012,7 +1019,7 @@ COMPILER_STRIP_GATE(809ADA4C, &lit_4479); SECTION_RODATA static u8 const lit_4480[12] = { 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809ADA50, &lit_4480); +COMPILER_STRIP_GATE(0x809ADA50, &lit_4480); #pragma pop /* 809ADA5C-809ADA60 0000B4 0004+00 0/1 0/0 0/0 .rodata @4481 */ @@ -1024,7 +1031,7 @@ SECTION_RODATA static u8 const lit_4481[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(809ADA5C, &lit_4481); +COMPILER_STRIP_GATE(0x809ADA5C, &lit_4481); #pragma pop /* 809ADA60-809ADA6C 0000B8 000C+00 0/1 0/0 0/0 .rodata @4482 */ @@ -1033,7 +1040,7 @@ COMPILER_STRIP_GATE(809ADA5C, &lit_4481); SECTION_RODATA static u8 const lit_4482[12] = { 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809ADA60, &lit_4482); +COMPILER_STRIP_GATE(0x809ADA60, &lit_4482); #pragma pop /* 809ADA6C-809ADA70 0000C4 0004+00 0/1 0/0 0/0 .rodata @4483 */ @@ -1045,7 +1052,7 @@ SECTION_RODATA static u8 const lit_4483[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(809ADA6C, &lit_4483); +COMPILER_STRIP_GATE(0x809ADA6C, &lit_4483); #pragma pop /* 809ADA70-809ADA7C 0000C8 000C+00 0/1 0/0 0/0 .rodata @4484 */ @@ -1054,7 +1061,7 @@ COMPILER_STRIP_GATE(809ADA6C, &lit_4483); SECTION_RODATA static u8 const lit_4484[12] = { 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809ADA70, &lit_4484); +COMPILER_STRIP_GATE(0x809ADA70, &lit_4484); #pragma pop /* 809ADA7C-809ADA80 0000D4 0004+00 0/1 0/0 0/0 .rodata @4485 */ @@ -1066,7 +1073,7 @@ SECTION_RODATA static u8 const lit_4485[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(809ADA7C, &lit_4485); +COMPILER_STRIP_GATE(0x809ADA7C, &lit_4485); #pragma pop /* 809ADA80-809ADA8C 0000D8 000C+00 0/1 0/0 0/0 .rodata @4486 */ @@ -1075,7 +1082,7 @@ COMPILER_STRIP_GATE(809ADA7C, &lit_4485); SECTION_RODATA static u8 const lit_4486[12] = { 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809ADA80, &lit_4486); +COMPILER_STRIP_GATE(0x809ADA80, &lit_4486); #pragma pop /* 809ADA8C-809ADA90 0000E4 0004+00 0/1 0/0 0/0 .rodata @4487 */ @@ -1087,7 +1094,7 @@ SECTION_RODATA static u8 const lit_4487[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(809ADA8C, &lit_4487); +COMPILER_STRIP_GATE(0x809ADA8C, &lit_4487); #pragma pop /* 809ADA90-809ADA9C 0000E8 000C+00 0/1 0/0 0/0 .rodata @4488 */ @@ -1096,7 +1103,7 @@ COMPILER_STRIP_GATE(809ADA8C, &lit_4487); SECTION_RODATA static u8 const lit_4488[12] = { 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809ADA90, &lit_4488); +COMPILER_STRIP_GATE(0x809ADA90, &lit_4488); #pragma pop /* 809ADA9C-809ADAA0 0000F4 0004+00 0/1 0/0 0/0 .rodata @4489 */ @@ -1108,7 +1115,7 @@ SECTION_RODATA static u8 const lit_4489[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(809ADA9C, &lit_4489); +COMPILER_STRIP_GATE(0x809ADA9C, &lit_4489); #pragma pop /* 809ADAA0-809ADAD0 0000F8 0030+00 0/0 0/0 0/0 .rodata @4490 */ @@ -1119,7 +1126,7 @@ SECTION_RODATA static u8 const lit_4490[48] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809ADAA0, &lit_4490); +COMPILER_STRIP_GATE(0x809ADAA0, &lit_4490); #pragma pop /* 809ADAD0-809ADADC 000128 000C+00 0/1 0/0 0/0 .rodata @4504 */ @@ -1128,12 +1135,12 @@ COMPILER_STRIP_GATE(809ADAA0, &lit_4490); SECTION_RODATA static u8 const lit_4504[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809ADAD0, &lit_4504); +COMPILER_STRIP_GATE(0x809ADAD0, &lit_4504); #pragma pop /* 809ADADC-809ADAE0 000134 0004+00 2/4 0/0 0/0 .rodata @4678 */ SECTION_RODATA static f32 const lit_4678 = 15.0f; -COMPILER_STRIP_GATE(809ADADC, &lit_4678); +COMPILER_STRIP_GATE(0x809ADADC, &lit_4678); /* 809ADAE0-809ADAE8 000138 0008+00 0/1 0/0 0/0 .rodata @4679 */ #pragma push @@ -1141,7 +1148,7 @@ COMPILER_STRIP_GATE(809ADADC, &lit_4678); SECTION_RODATA static u8 const lit_4679[8] = { 0x40, 0x7F, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809ADAE0, &lit_4679); +COMPILER_STRIP_GATE(0x809ADAE0, &lit_4679); #pragma pop /* 809ADAE8-809ADAF0 000140 0008+00 0/1 0/0 0/0 .rodata @4680 */ @@ -1150,7 +1157,7 @@ COMPILER_STRIP_GATE(809ADAE0, &lit_4679); SECTION_RODATA static u8 const lit_4680[8] = { 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809ADAE8, &lit_4680); +COMPILER_STRIP_GATE(0x809ADAE8, &lit_4680); #pragma pop /* 809ABA2C-809AC064 000E8C 0638+00 5/0 0/0 0/0 .text wait__14daNpcDoorBoy_cFPv */ @@ -1173,6 +1180,13 @@ asm void daNpcDoorBoy_c::fear(void* param_0) { } #pragma pop +/* ############################################################################################## */ +/* 809ADB04-809ADB04 00015C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_809ADB15 = "DEFAULT_GETITEM"; +#pragma pop + /* 809AC114-809AC528 001574 0414+00 1/0 0/0 0/0 .text talk__14daNpcDoorBoy_cFPv */ #pragma push #pragma optimization_level 0 @@ -1273,14 +1287,14 @@ asm void daNpcDoorBoy_c::main() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4942 = 23.0f; -COMPILER_STRIP_GATE(809ADAF0, &lit_4942); +COMPILER_STRIP_GATE(0x809ADAF0, &lit_4942); #pragma pop /* 809ADAF4-809ADAF8 00014C 0004+00 0/1 0/0 0/0 .rodata @4943 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4943 = 55.0f; -COMPILER_STRIP_GATE(809ADAF4, &lit_4943); +COMPILER_STRIP_GATE(0x809ADAF4, &lit_4943); #pragma pop /* 809ACC5C-809ACE18 0020BC 01BC+00 1/0 0/0 0/0 .text setAttnPos__14daNpcDoorBoy_cFv */ @@ -1298,21 +1312,21 @@ asm void daNpcDoorBoy_c::setAttnPos() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4984 = -80.0f; -COMPILER_STRIP_GATE(809ADAF8, &lit_4984); +COMPILER_STRIP_GATE(0x809ADAF8, &lit_4984); #pragma pop /* 809ADAFC-809ADB00 000154 0004+00 0/1 0/0 0/0 .rodata @4985 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4985 = 80.0f; -COMPILER_STRIP_GATE(809ADAFC, &lit_4985); +COMPILER_STRIP_GATE(0x809ADAFC, &lit_4985); #pragma pop /* 809ADB00-809ADB04 000158 0004+00 0/1 0/0 0/0 .rodata @4986 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4986 = 40.0f; -COMPILER_STRIP_GATE(809ADB00, &lit_4986); +COMPILER_STRIP_GATE(0x809ADB00, &lit_4986); #pragma pop /* 809ACE18-809ACFF8 002278 01E0+00 1/1 0/0 0/0 .text lookat__14daNpcDoorBoy_cFv */ @@ -1527,7 +1541,7 @@ asm void __sinit_d_a_npc_doorboy_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_809AD8D0 = (void*)__sinit_d_a_npc_doorboy_cpp; +REGISTER_CTORS(0x809AD8D0, __sinit_d_a_npc_doorboy_cpp); #pragma pop /* 809AD938-809AD93C 002D98 0004+00 1/0 0/0 0/0 .text adjustShapeAngle__14daNpcDoorBoy_cFv */ @@ -1565,11 +1579,4 @@ static asm void func_809AD98C() { } #pragma pop -/* 809ADB04-809ADB25 00015C 0021+00 3/1 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_809ADB04 = "DoorBoy"; -SECTION_DEAD static char const* const stringBase_809ADB0C = "Mgeneral"; -SECTION_DEAD static char const* const stringBase_809ADB15 = "DEFAULT_GETITEM"; -#pragma pop +/* 809ADB04-809ADB04 00015C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/npc/d_a_npc_drainSol/d_a_npc_drainSol.cpp b/rel/d/a/npc/d_a_npc_drainSol/d_a_npc_drainSol.cpp index 57394479153..59becb768cb 100644 --- a/rel/d/a/npc/d_a_npc_drainSol/d_a_npc_drainSol.cpp +++ b/rel/d/a/npc/d_a_npc_drainSol/d_a_npc_drainSol.cpp @@ -17,12 +17,14 @@ struct mDoMtx_stack_c { static u8 now[48]; }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; +struct J3DAnmTransform {}; + +struct J3DModelData {}; + struct Vec {}; struct Z2Creature { @@ -31,8 +33,6 @@ struct Z2Creature { /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -49,10 +49,10 @@ struct daPy_py_c { /* 8015F424 */ void checkNowWolfEyeUp(); }; -struct _GXColorS10 {}; - struct J3DAnmTransformKey {}; +struct _GXColorS10 {}; + struct daNpcF_c { struct daNpcF_anmPlayData {}; @@ -197,13 +197,13 @@ struct dBgS_AcchCir { /* 809AF708 */ ~dBgS_AcchCir(); }; -struct dBgS {}; - struct csXyz { /* 809AF498 */ ~csXyz(); /* 809AF6C4 */ csXyz(); }; +struct dBgS {}; + struct dBgS_Acch { /* 80075F94 */ ~dBgS_Acch(); /* 800760A0 */ dBgS_Acch(); @@ -416,6 +416,13 @@ extern "C" void __register_global_object(); // /* ############################################################################################## */ +/* 809AFAB0-809AFAB0 00010C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_809AFAB0 = "DrainSol1"; +SECTION_DEAD static char const* const stringBase_809AFABA = "DrainSol2"; +#pragma pop + /* 809AFACC-809AFAD4 000000 0008+00 1/1 0/0 0/0 .data l_bmdGetParamList */ SECTION_DATA static u8 l_bmdGetParamList[8] = { 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x07, @@ -621,34 +628,34 @@ SECTION_RODATA u8 const daNpcDrSol_Param_c::m[108] = { 0x42, 0x70, 0x00, 0x00, 0x43, 0xFA, 0x00, 0x00, 0x43, 0x96, 0x00, 0x00, 0xC3, 0x96, 0x00, 0x00, 0x00, 0x3C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809AF9A4, &daNpcDrSol_Param_c::m); +COMPILER_STRIP_GATE(0x809AF9A4, &daNpcDrSol_Param_c::m); /* 809AFA10-809AFA14 00006C 0004+00 0/1 0/0 0/0 .rodata @4140 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4140 = -60.0f; -COMPILER_STRIP_GATE(809AFA10, &lit_4140); +COMPILER_STRIP_GATE(0x809AFA10, &lit_4140); #pragma pop /* 809AFA14-809AFA18 000070 0004+00 0/1 0/0 0/0 .rodata @4141 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4141 = -10.0f; -COMPILER_STRIP_GATE(809AFA14, &lit_4141); +COMPILER_STRIP_GATE(0x809AFA14, &lit_4141); #pragma pop /* 809AFA18-809AFA1C 000074 0004+00 0/1 0/0 0/0 .rodata @4142 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4142 = 60.0f; -COMPILER_STRIP_GATE(809AFA18, &lit_4142); +COMPILER_STRIP_GATE(0x809AFA18, &lit_4142); #pragma pop /* 809AFA1C-809AFA20 000078 0004+00 0/2 0/0 0/0 .rodata @4143 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4143 = 200.0f; -COMPILER_STRIP_GATE(809AFA1C, &lit_4143); +COMPILER_STRIP_GATE(0x809AFA1C, &lit_4143); #pragma pop /* 809AE10C-809AE354 00038C 0248+00 1/1 0/0 0/0 .text Create__12daNpcDrSol_cFv */ @@ -667,11 +674,11 @@ SECTION_RODATA static u8 const lit_4153[24] = { 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x99, 0x63, 0x54, 0x40, 0x0B, 0x18, 0x48, }; -COMPILER_STRIP_GATE(809AFA20, &lit_4153); +COMPILER_STRIP_GATE(0x809AFA20, &lit_4153); /* 809AFA38-809AFA3C 000094 0004+00 2/2 0/0 0/0 .rodata @4190 */ SECTION_RODATA static f32 const lit_4190 = 1.0f; -COMPILER_STRIP_GATE(809AFA38, &lit_4190); +COMPILER_STRIP_GATE(0x809AFA38, &lit_4190); /* 809AE354-809AE51C 0005D4 01C8+00 1/1 0/0 0/0 .text CreateHeap__12daNpcDrSol_cFv */ #pragma push @@ -741,7 +748,7 @@ asm void daNpcDrSol_c::createHeapCallBack(fopAc_ac_c* param_0) { SECTION_RODATA static u8 const lit_4273[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809AFA3C, &lit_4273); +COMPILER_STRIP_GATE(0x809AFA3C, &lit_4273); #pragma pop /* 809AFA48-809AFA4C 0000A4 0004+00 0/1 0/0 0/0 .rodata @4274 */ @@ -753,7 +760,7 @@ SECTION_RODATA static u8 const lit_4274[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(809AFA48, &lit_4274); +COMPILER_STRIP_GATE(0x809AFA48, &lit_4274); #pragma pop /* 809AFA4C-809AFA58 0000A8 000C+00 0/1 0/0 0/0 .rodata @4275 */ @@ -762,7 +769,7 @@ COMPILER_STRIP_GATE(809AFA48, &lit_4274); SECTION_RODATA static u8 const lit_4275[12] = { 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809AFA4C, &lit_4275); +COMPILER_STRIP_GATE(0x809AFA4C, &lit_4275); #pragma pop /* 809AFA58-809AFA5C 0000B4 0004+00 0/1 0/0 0/0 .rodata @4276 */ @@ -774,7 +781,7 @@ SECTION_RODATA static u8 const lit_4276[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(809AFA58, &lit_4276); +COMPILER_STRIP_GATE(0x809AFA58, &lit_4276); #pragma pop /* 809AFA5C-809AFA68 0000B8 000C+00 0/1 0/0 0/0 .rodata @4277 */ @@ -783,7 +790,7 @@ COMPILER_STRIP_GATE(809AFA58, &lit_4276); SECTION_RODATA static u8 const lit_4277[12] = { 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(809AFA5C, &lit_4277); +COMPILER_STRIP_GATE(0x809AFA5C, &lit_4277); #pragma pop /* 809AFA68-809AFA74 0000C4 000C+00 0/1 0/0 0/0 .rodata @4278 */ @@ -792,7 +799,7 @@ COMPILER_STRIP_GATE(809AFA5C, &lit_4277); SECTION_RODATA static u8 const lit_4278[12] = { 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809AFA68, &lit_4278); +COMPILER_STRIP_GATE(0x809AFA68, &lit_4278); #pragma pop /* 809AFA74-809AFA7C 0000D0 0008+00 0/1 0/0 0/0 .rodata @4279 */ @@ -801,7 +808,7 @@ COMPILER_STRIP_GATE(809AFA68, &lit_4278); SECTION_RODATA static u8 const lit_4279[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809AFA74, &lit_4279); +COMPILER_STRIP_GATE(0x809AFA74, &lit_4279); #pragma pop /* 809AFA7C-809AFA88 0000D8 000C+00 0/1 0/0 0/0 .rodata @4280 */ @@ -810,7 +817,7 @@ COMPILER_STRIP_GATE(809AFA74, &lit_4279); SECTION_RODATA static u8 const lit_4280[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809AFA7C, &lit_4280); +COMPILER_STRIP_GATE(0x809AFA7C, &lit_4280); #pragma pop /* 809AFA88-809AFA8C 0000E4 0004+00 0/1 0/0 0/0 .rodata @4281 */ @@ -822,7 +829,7 @@ SECTION_RODATA static u8 const lit_4281[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(809AFA88, &lit_4281); +COMPILER_STRIP_GATE(0x809AFA88, &lit_4281); #pragma pop /* 809AFA8C-809AFAA0 0000E8 0014+00 0/0 0/0 0/0 .rodata @4282 */ @@ -832,7 +839,7 @@ SECTION_RODATA static u8 const lit_4282[20] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809AFA8C, &lit_4282); +COMPILER_STRIP_GATE(0x809AFA8C, &lit_4282); #pragma pop /* 809AFAA0-809AFAA4 0000FC 0004+00 1/2 0/0 0/0 .rodata @4309 */ @@ -842,7 +849,7 @@ SECTION_RODATA static u8 const lit_4309[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(809AFAA0, &lit_4309); +COMPILER_STRIP_GATE(0x809AFAA0, &lit_4309); /* 809AE6BC-809AE844 00093C 0188+00 1/1 0/0 0/0 .text reset__12daNpcDrSol_cFv */ #pragma push @@ -859,7 +866,7 @@ asm void daNpcDrSol_c::reset() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpcDrSol_c::setAction(bool (daNpcDrSol_c::*)(void*)) { +asm void daNpcDrSol_c::setAction(bool (daNpcDrSol_c::*param_0)(void*)) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_drainSol/d_a_npc_drainSol/setAction__12daNpcDrSol_cFM12daNpcDrSol_cFPCvPvPv_b.s" } @@ -878,7 +885,7 @@ asm void daNpcDrSol_c::chkFindPlayer() { /* ############################################################################################## */ /* 809AFAA4-809AFAA8 000100 0004+00 2/2 0/0 0/0 .rodata @4369 */ SECTION_RODATA static f32 const lit_4369 = -1.0f; -COMPILER_STRIP_GATE(809AFAA4, &lit_4369); +COMPILER_STRIP_GATE(0x809AFAA4, &lit_4369); /* 809AE994-809AEB18 000C14 0184+00 2/0 0/0 0/0 .text wait__12daNpcDrSol_cFPv */ #pragma push @@ -980,14 +987,14 @@ asm void daNpcDrSol_c::main() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4499 = 10.0f; -COMPILER_STRIP_GATE(809AFAA8, &lit_4499); +COMPILER_STRIP_GATE(0x809AFAA8, &lit_4499); #pragma pop /* 809AFAAC-809AFAB0 000108 0004+00 0/1 0/0 0/0 .rodata @4500 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4500 = 15.0f; -COMPILER_STRIP_GATE(809AFAAC, &lit_4500); +COMPILER_STRIP_GATE(0x809AFAAC, &lit_4500); #pragma pop /* 809AEFDC-809AF12C 00125C 0150+00 1/0 0/0 0/0 .text setAttnPos__12daNpcDrSol_cFv */ @@ -1176,7 +1183,7 @@ asm void __sinit_d_a_npc_drainSol_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_809AF8F4 = (void*)__sinit_d_a_npc_drainSol_cpp; +REGISTER_CTORS(0x809AF8F4, __sinit_d_a_npc_drainSol_cpp); #pragma pop /* 809AF934-809AF938 001BB4 0004+00 1/0 0/0 0/0 .text adjustShapeAngle__12daNpcDrSol_cFv @@ -1215,11 +1222,11 @@ static asm void func_809AF988() { } #pragma pop -/* 809AFAB0-809AFAC9 00010C 0019+00 1/0 0/0 0/0 .rodata @stringBase0 */ +/* ############################################################################################## */ +/* 809AFAC4-809AFAC9 000120 0005+00 0/0 0/0 0/0 .rodata None */ #pragma push #pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_809AFAB0 = "DrainSol1"; -SECTION_DEAD static char const* const stringBase_809AFABA = "DrainSol2"; SECTION_DEAD static char const* const stringBase_809AFAC4 = "Shoe"; #pragma pop + +/* 809AFAB0-809AFAB0 00010C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/npc/d_a_npc_du/d_a_npc_du.cpp b/rel/d/a/npc/d_a_npc_du/d_a_npc_du.cpp index 97a6d6dbfb0..92f9bbdb8cf 100644 --- a/rel/d/a/npc/d_a_npc_du/d_a_npc_du.cpp +++ b/rel/d/a/npc/d_a_npc_du/d_a_npc_du.cpp @@ -36,10 +36,10 @@ struct mDoExt_McaMorfCallBack1_c {}; struct Vec {}; -struct J3DModelData {}; - struct J3DAnmTransform {}; +struct J3DModelData {}; + struct mDoExt_McaMorf { /* 8000FC4C */ mDoExt_McaMorf(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, int, @@ -126,10 +126,10 @@ struct dBgS_AcchCir { /* 80075F58 */ void SetWall(f32, f32); }; -struct dBgS {}; - struct csXyz {}; +struct dBgS {}; + struct dBgS_Acch { /* 80075F94 */ ~dBgS_Acch(); /* 800760A0 */ dBgS_Acch(); @@ -328,7 +328,7 @@ extern "C" void __register_global_object(); /* ############################################################################################## */ /* 809B1848-809B184C 000000 0004+00 10/10 0/0 0/0 .rodata @3762 */ SECTION_RODATA static f32 const lit_3762 = 1.0f; -COMPILER_STRIP_GATE(809B1848, &lit_3762); +COMPILER_STRIP_GATE(0x809B1848, &lit_3762); /* 809B18EC-809B18F4 000000 0008+00 1/1 0/0 0/0 .data walk_se$4161 */ SECTION_DATA static u8 walk_se[8] = { @@ -429,11 +429,17 @@ SECTION_RODATA static u8 const lit_3776[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(809B184C, &lit_3776); +COMPILER_STRIP_GATE(0x809B184C, &lit_3776); /* 809B1850-809B1854 000008 0004+00 1/3 0/0 0/0 .rodata @3777 */ SECTION_RODATA static f32 const lit_3777 = -1.0f; -COMPILER_STRIP_GATE(809B1850, &lit_3777); +COMPILER_STRIP_GATE(0x809B1850, &lit_3777); + +/* 809B18DC-809B18DC 000094 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_809B18DC = "Npc_du"; +#pragma pop /* 809AFD70-809AFE20 000110 00B0+00 4/4 0/0 0/0 .text anm_init__FP12npc_du_classifUcf */ #pragma push @@ -460,21 +466,21 @@ static asm void nodeCallBack(J3DJoint* param_0, int param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3864 = 100.0f; -COMPILER_STRIP_GATE(809B1854, &lit_3864); +COMPILER_STRIP_GATE(0x809B1854, &lit_3864); #pragma pop /* 809B1858-809B185C 000010 0004+00 0/1 0/0 0/0 .rodata @3865 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3865 = 400.0f; -COMPILER_STRIP_GATE(809B1858, &lit_3865); +COMPILER_STRIP_GATE(0x809B1858, &lit_3865); #pragma pop /* 809B185C-809B1860 000014 0004+00 0/1 0/0 0/0 .rodata @3866 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3866 = 40.0f; -COMPILER_STRIP_GATE(809B185C, &lit_3866); +COMPILER_STRIP_GATE(0x809B185C, &lit_3866); #pragma pop /* 809B0014-809B0114 0003B4 0100+00 1/0 0/0 0/0 .text daNpc_Du_Draw__FP12npc_du_class */ @@ -492,70 +498,70 @@ static asm void daNpc_Du_Draw(npc_du_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3905 = 50.0f; -COMPILER_STRIP_GATE(809B1860, &lit_3905); +COMPILER_STRIP_GATE(0x809B1860, &lit_3905); #pragma pop /* 809B1864-809B1868 00001C 0004+00 0/1 0/0 0/0 .rodata @3906 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3906 = 70.0f; -COMPILER_STRIP_GATE(809B1864, &lit_3906); +COMPILER_STRIP_GATE(0x809B1864, &lit_3906); #pragma pop /* 809B1868-809B186C 000020 0004+00 0/4 0/0 0/0 .rodata @3907 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3907 = 10.0f; -COMPILER_STRIP_GATE(809B1868, &lit_3907); +COMPILER_STRIP_GATE(0x809B1868, &lit_3907); #pragma pop /* 809B186C-809B1870 000024 0004+00 0/4 0/0 0/0 .rodata @3908 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3908 = 30.0f; -COMPILER_STRIP_GATE(809B186C, &lit_3908); +COMPILER_STRIP_GATE(0x809B186C, &lit_3908); #pragma pop /* 809B1870-809B1874 000028 0004+00 0/2 0/0 0/0 .rodata @3909 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3909 = 8000.0f; -COMPILER_STRIP_GATE(809B1870, &lit_3909); +COMPILER_STRIP_GATE(0x809B1870, &lit_3909); #pragma pop /* 809B1874-809B1878 00002C 0004+00 0/2 0/0 0/0 .rodata @3910 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3910 = 500.0f; -COMPILER_STRIP_GATE(809B1874, &lit_3910); +COMPILER_STRIP_GATE(0x809B1874, &lit_3910); #pragma pop /* 809B1878-809B187C 000030 0004+00 0/2 0/0 0/0 .rodata @3911 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3911 = 60.0f; -COMPILER_STRIP_GATE(809B1878, &lit_3911); +COMPILER_STRIP_GATE(0x809B1878, &lit_3911); #pragma pop /* 809B187C-809B1880 000034 0004+00 0/4 0/0 0/0 .rodata @3912 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3912 = 2.0f; -COMPILER_STRIP_GATE(809B187C, &lit_3912); +COMPILER_STRIP_GATE(0x809B187C, &lit_3912); #pragma pop /* 809B1880-809B1884 000038 0004+00 0/2 0/0 0/0 .rodata @3913 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3913 = 5.0f; -COMPILER_STRIP_GATE(809B1880, &lit_3913); +COMPILER_STRIP_GATE(0x809B1880, &lit_3913); #pragma pop /* 809B1884-809B1888 00003C 0004+00 0/1 0/0 0/0 .rodata @3914 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3914 = 200.0f; -COMPILER_STRIP_GATE(809B1884, &lit_3914); +COMPILER_STRIP_GATE(0x809B1884, &lit_3914); #pragma pop /* 809B0114-809B0360 0004B4 024C+00 1/1 0/0 0/0 .text npc_du_normal__FP12npc_du_class */ @@ -573,28 +579,28 @@ static asm void npc_du_normal(npc_du_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3944 = 2.5f; -COMPILER_STRIP_GATE(809B1888, &lit_3944); +COMPILER_STRIP_GATE(0x809B1888, &lit_3944); #pragma pop /* 809B188C-809B1890 000044 0004+00 0/1 0/0 0/0 .rodata @3945 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3945 = 8.0f; -COMPILER_STRIP_GATE(809B188C, &lit_3945); +COMPILER_STRIP_GATE(0x809B188C, &lit_3945); #pragma pop /* 809B1890-809B1894 000048 0004+00 0/1 0/0 0/0 .rodata @3946 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3946 = 300.0f; -COMPILER_STRIP_GATE(809B1890, &lit_3946); +COMPILER_STRIP_GATE(0x809B1890, &lit_3946); #pragma pop /* 809B1894-809B1898 00004C 0004+00 0/1 0/0 0/0 .rodata @3947 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3947 = 10000.0f; -COMPILER_STRIP_GATE(809B1894, &lit_3947); +COMPILER_STRIP_GATE(0x809B1894, &lit_3947); #pragma pop /* 809B0360-809B04E0 000700 0180+00 1/1 0/0 0/0 .text npc_du_away__FP12npc_du_class */ @@ -612,21 +618,21 @@ static asm void npc_du_away(npc_du_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3992 = 20.0f; -COMPILER_STRIP_GATE(809B1898, &lit_3992); +COMPILER_STRIP_GATE(0x809B1898, &lit_3992); #pragma pop /* 809B189C-809B18A0 000054 0004+00 0/1 0/0 0/0 .rodata @3993 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3993 = 3.0f; -COMPILER_STRIP_GATE(809B189C, &lit_3993); +COMPILER_STRIP_GATE(0x809B189C, &lit_3993); #pragma pop /* 809B18A0-809B18A4 000058 0004+00 0/1 0/0 0/0 .rodata @3994 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3994 = 1.5f; -COMPILER_STRIP_GATE(809B18A0, &lit_3994); +COMPILER_STRIP_GATE(0x809B18A0, &lit_3994); #pragma pop /* 809B04E0-809B0774 000880 0294+00 1/1 0/0 0/0 .text npc_du_swim__FP12npc_du_class */ @@ -644,14 +650,14 @@ static asm void npc_du_swim(npc_du_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4024 = 0.5f; -COMPILER_STRIP_GATE(809B18A4, &lit_4024); +COMPILER_STRIP_GATE(0x809B18A4, &lit_4024); #pragma pop /* 809B18A8-809B18AC 000060 0004+00 0/1 0/0 0/0 .rodata @4025 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4025 = 220.0f; -COMPILER_STRIP_GATE(809B18A8, &lit_4025); +COMPILER_STRIP_GATE(0x809B18A8, &lit_4025); #pragma pop /* 809B0774-809B08E0 000B14 016C+00 1/1 0/0 0/0 .text npc_du_message__FP12npc_du_class */ @@ -669,49 +675,49 @@ static asm void npc_du_message(npc_du_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4092 = 150.0f; -COMPILER_STRIP_GATE(809B18AC, &lit_4092); +COMPILER_STRIP_GATE(0x809B18AC, &lit_4092); #pragma pop /* 809B18B0-809B18B4 000068 0004+00 0/1 0/0 0/0 .rodata @4093 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4093 = -80.0f; -COMPILER_STRIP_GATE(809B18B0, &lit_4093); +COMPILER_STRIP_GATE(0x809B18B0, &lit_4093); #pragma pop /* 809B18B4-809B18B8 00006C 0004+00 0/1 0/0 0/0 .rodata @4094 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4094 = 15.0f; -COMPILER_STRIP_GATE(809B18B4, &lit_4094); +COMPILER_STRIP_GATE(0x809B18B4, &lit_4094); #pragma pop /* 809B18B8-809B18BC 000070 0004+00 0/1 0/0 0/0 .rodata @4095 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4095 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(809B18B8, &lit_4095); +COMPILER_STRIP_GATE(0x809B18B8, &lit_4095); #pragma pop /* 809B18BC-809B18C0 000074 0004+00 0/1 0/0 0/0 .rodata @4096 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4096 = 1.0f / 20.0f; -COMPILER_STRIP_GATE(809B18BC, &lit_4096); +COMPILER_STRIP_GATE(0x809B18BC, &lit_4096); #pragma pop /* 809B18C0-809B18C4 000078 0004+00 0/1 0/0 0/0 .rodata @4097 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4097 = 3.0f / 10.0f; -COMPILER_STRIP_GATE(809B18C0, &lit_4097); +COMPILER_STRIP_GATE(0x809B18C0, &lit_4097); #pragma pop /* 809B18C4-809B18C8 00007C 0004+00 0/1 0/0 0/0 .rodata @4098 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4098 = 5000.0f; -COMPILER_STRIP_GATE(809B18C4, &lit_4098); +COMPILER_STRIP_GATE(0x809B18C4, &lit_4098); #pragma pop /* 809B08E0-809B0CBC 000C80 03DC+00 1/1 0/0 0/0 .text action__FP12npc_du_class */ @@ -741,7 +747,7 @@ static asm void message(npc_du_class* param_0) { SECTION_RODATA static u8 const lit_4237[8] = { 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809B18C8, &lit_4237); +COMPILER_STRIP_GATE(0x809B18C8, &lit_4237); #pragma pop /* 809B19E8-809B19EC 000008 0004+00 2/2 0/0 0/0 .bss None */ @@ -770,6 +776,13 @@ static bool daNpc_Du_IsDelete(npc_du_class* param_0) { return true; } +/* ############################################################################################## */ +/* 809B18DC-809B18DC 000094 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_809B18E3 = "Npc_Du"; +#pragma pop + /* 809B1174-809B11E0 001514 006C+00 1/0 0/0 0/0 .text daNpc_Du_Delete__FP12npc_du_class */ #pragma push @@ -806,21 +819,21 @@ asm J3DFrameCtrl::~J3DFrameCtrl() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4408 = 25.0f; -COMPILER_STRIP_GATE(809B18D0, &lit_4408); +COMPILER_STRIP_GATE(0x809B18D0, &lit_4408); #pragma pop /* 809B18D4-809B18D8 00008C 0004+00 0/1 0/0 0/0 .rodata @4409 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4409 = 65536.0f; -COMPILER_STRIP_GATE(809B18D4, &lit_4409); +COMPILER_STRIP_GATE(0x809B18D4, &lit_4409); #pragma pop /* 809B18D8-809B18DC 000090 0004+00 0/1 0/0 0/0 .rodata @4410 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4410 = -5.0f; -COMPILER_STRIP_GATE(809B18D8, &lit_4410); +COMPILER_STRIP_GATE(0x809B18D8, &lit_4410); #pragma pop /* 809B1410-809B16A0 0017B0 0290+00 1/0 0/0 0/0 .text daNpc_Du_Create__FP10fopAc_ac_c */ @@ -885,7 +898,7 @@ asm void __sinit_d_a_npc_du_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_809B17E8 = (void*)__sinit_d_a_npc_du_cpp; +REGISTER_CTORS(0x809B17E8, __sinit_d_a_npc_du_cpp); #pragma pop /* 809B1824-809B182C 001BC4 0008+00 1/0 0/0 0/0 .text @36@__dt__12dBgS_ObjAcchFv */ @@ -908,10 +921,4 @@ static asm void func_809B182C() { } #pragma pop -/* 809B18DC-809B18EA 000094 000E+00 4/4 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_809B18DC = "Npc_du"; -SECTION_DEAD static char const* const stringBase_809B18E3 = "Npc_Du"; -#pragma pop +/* 809B18DC-809B18DC 000094 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/npc/d_a_npc_fairy/d_a_npc_fairy.cpp b/rel/d/a/npc/d_a_npc_fairy/d_a_npc_fairy.cpp index f891fd94a38..39d49a535b5 100644 --- a/rel/d/a/npc/d_a_npc_fairy/d_a_npc_fairy.cpp +++ b/rel/d/a/npc/d_a_npc_fairy/d_a_npc_fairy.cpp @@ -15,10 +15,10 @@ struct mDoMtx_stack_c { static u8 now[48]; }; -struct J3DAnmTevRegKey {}; - struct J3DAnmTextureSRTKey {}; +struct J3DAnmTevRegKey {}; + struct J3DMaterialTable { /* 8032F7B4 */ void removeTexMtxAnimator(J3DAnmTextureSRTKey*); /* 8032F880 */ void removeTevRegAnimator(J3DAnmTevRegKey*); @@ -38,12 +38,14 @@ struct mDoExt_baseAnm { /* 8000D428 */ void play(); }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; +struct J3DAnmTransform {}; + +struct J3DModelData {}; + struct Vec {}; struct Z2Creature { @@ -52,8 +54,6 @@ struct Z2Creature { /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -70,6 +70,8 @@ struct fopAc_ac_c { /* 80018C8C */ ~fopAc_ac_c(); }; +struct daNpcT_faceMotionAnmData_c {}; + struct daNpcT_MotionSeqMngr_c { struct sequenceStepData_c {}; @@ -77,14 +79,12 @@ struct daNpcT_MotionSeqMngr_c { /* 809B88E8 */ ~daNpcT_MotionSeqMngr_c(); }; +struct daNpcT_evtData_c {}; + struct daNpcT_motionAnmData_c {}; struct J3DJoint {}; -struct daNpcT_faceMotionAnmData_c {}; - -struct daNpcT_evtData_c {}; - struct daNpc_Fairy_c { /* 809B228C */ ~daNpc_Fairy_c(); /* 809B2430 */ void Create(); @@ -202,6 +202,10 @@ struct dCcD_GObjInf { /* 800840E4 */ ~dCcD_GObjInf(); }; +struct J3DAnmTransformKey {}; + +struct _GXColorS10 {}; + struct J3DModel {}; struct J3DAnmColor {}; @@ -212,10 +216,6 @@ struct cXyz { /* 809B889C */ cXyz(); }; -struct _GXColorS10 {}; - -struct J3DAnmTransformKey {}; - struct daNpcT_c { /* 80147FA4 */ void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*); /* 80148094 */ void getTrnsfrmKeyAnmP(char const*, int); @@ -322,13 +322,13 @@ struct dRes_control_c { struct dPa_levelEcallBack {}; -struct _GXColor {}; - struct csXyz { /* 809B835C */ ~csXyz(); /* 809B879C */ csXyz(); }; +struct _GXColor {}; + struct dPa_control_c { struct level_c { /* 8004B918 */ void getEmitter(u32); @@ -368,7 +368,6 @@ struct dMsgFlow_c { struct dEvt_control_c { /* 80042468 */ void reset(); - /* 800436EC */ void setPtI_Id(unsigned int); }; struct dEvent_manager_c { @@ -885,11 +884,18 @@ SECTION_RODATA u8 const daNpc_Fairy_Param_c::m[148] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0x70, 0x00, 0x00, 0x43, 0x48, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809B92E4, &daNpc_Fairy_Param_c::m); +COMPILER_STRIP_GATE(0x809B92E4, &daNpc_Fairy_Param_c::m); /* 809B9378-809B937C 000094 0004+00 9/15 0/0 0/0 .rodata @3916 */ SECTION_RODATA static f32 const lit_3916 = 1.0f; -COMPILER_STRIP_GATE(809B9378, &lit_3916); +COMPILER_STRIP_GATE(0x809B9378, &lit_3916); + +/* 809B94CC-809B94CC 0001E8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_809B94CC = ""; +SECTION_DEAD static char const* const stringBase_809B94CD = "fairy"; +#pragma pop /* 809B95D8-809B95E4 000000 000C+00 2/2 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { @@ -936,7 +942,7 @@ SECTION_RODATA static u8 const sBckPrm[72] = { 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x0F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(809B937C, &sBckPrm); +COMPILER_STRIP_GATE(0x809B937C, &sBckPrm); #pragma pop /* 809B93C4-809B93C8 0000E0 0004+00 5/12 0/0 0/0 .rodata @3943 */ @@ -946,18 +952,18 @@ SECTION_RODATA static u8 const lit_3943[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(809B93C4, &lit_3943); +COMPILER_STRIP_GATE(0x809B93C4, &lit_3943); /* 809B93C8-809B93CC 0000E4 0004+00 0/1 0/0 0/0 .rodata @3944 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3944 = 12.0f; -COMPILER_STRIP_GATE(809B93C8, &lit_3944); +COMPILER_STRIP_GATE(0x809B93C8, &lit_3944); #pragma pop /* 809B93CC-809B93D0 0000E8 0004+00 14/23 0/0 0/0 .rodata @3945 */ SECTION_RODATA static f32 const lit_3945 = -1.0f; -COMPILER_STRIP_GATE(809B93CC, &lit_3945); +COMPILER_STRIP_GATE(0x809B93CC, &lit_3945); /* 809B1CE4-809B1DEC 0002C4 0108+00 4/4 0/0 0/0 .text setAnm__16_Fairy_Feather_cFi */ #pragma push @@ -974,7 +980,7 @@ asm void _Fairy_Feather_c::setAnm(int param_0) { SECTION_RODATA static u8 const sBrkPrm[12] = { 0x00, 0x00, 0x00, 0x29, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(809B93D0, &sBrkPrm); +COMPILER_STRIP_GATE(0x809B93D0, &sBrkPrm); /* 809B1DEC-809B1EA8 0003CC 00BC+00 1/1 0/0 0/0 .text setBrk__16_Fairy_Feather_cFi */ #pragma push @@ -991,7 +997,7 @@ asm void _Fairy_Feather_c::setBrk(int param_0) { SECTION_RODATA static u8 const sBtkPrm[12] = { 0x00, 0x00, 0x00, 0x2D, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(809B93DC, &sBtkPrm); +COMPILER_STRIP_GATE(0x809B93DC, &sBtkPrm); /* 809B1EA8-809B1F64 000488 00BC+00 1/1 0/0 0/0 .text setBtk__16_Fairy_Feather_cFi */ #pragma push @@ -1041,6 +1047,28 @@ asm cXyz::~cXyz() { #pragma pop /* ############################################################################################## */ +/* 809B94CC-809B94CC 0001E8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_809B94D3 = "APPEAR_10F_01"; +SECTION_DEAD static char const* const stringBase_809B94E1 = "APPEAR_10F_02"; +SECTION_DEAD static char const* const stringBase_809B94EF = "APPEAR_20F_01"; +SECTION_DEAD static char const* const stringBase_809B94FD = "APPEAR_20F_02"; +SECTION_DEAD static char const* const stringBase_809B950B = "APPEAR_30F_01"; +SECTION_DEAD static char const* const stringBase_809B9519 = "APPEAR_30F_02"; +SECTION_DEAD static char const* const stringBase_809B9527 = "APPEAR_40F_01"; +SECTION_DEAD static char const* const stringBase_809B9535 = "APPEAR_40F_02"; +SECTION_DEAD static char const* const stringBase_809B9543 = "APPEAR_50F_01"; +SECTION_DEAD static char const* const stringBase_809B9551 = "APPEAR_50F_02"; +SECTION_DEAD static char const* const stringBase_809B955F = "APPEAR_50F_03"; +SECTION_DEAD static char const* const stringBase_809B956D = "APPEAR_50F_04"; +SECTION_DEAD static char const* const stringBase_809B957B = "APPEAR_50F_05"; +SECTION_DEAD static char const* const stringBase_809B9589 = "SELECT_RETURN1"; +SECTION_DEAD static char const* const stringBase_809B9598 = "SELECT_RETURN2"; +SECTION_DEAD static char const* const stringBase_809B95A7 = "SELECT_RETURN3"; +SECTION_DEAD static char const* const stringBase_809B95B6 = "RETURN_CANCEL"; +#pragma pop + /* 809B9600-809B9604 000028 0002+02 1/0 0/0 0/0 .data l_loadResPtrn0 */ SECTION_DATA static u16 l_loadResPtrn0[1 + 1 /* padding */] = { 0x01FF, @@ -2050,42 +2078,42 @@ asm daNpc_Fairy_c::~daNpc_Fairy_c() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4311 = -300.0f; -COMPILER_STRIP_GATE(809B93E8, &lit_4311); +COMPILER_STRIP_GATE(0x809B93E8, &lit_4311); #pragma pop /* 809B93EC-809B93F0 000108 0004+00 0/1 0/0 0/0 .rodata @4312 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4312 = -200.0f; -COMPILER_STRIP_GATE(809B93EC, &lit_4312); +COMPILER_STRIP_GATE(0x809B93EC, &lit_4312); #pragma pop /* 809B93F0-809B93F4 00010C 0004+00 0/1 0/0 0/0 .rodata @4313 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4313 = -400.0f; -COMPILER_STRIP_GATE(809B93F0, &lit_4313); +COMPILER_STRIP_GATE(0x809B93F0, &lit_4313); #pragma pop /* 809B93F4-809B93F8 000110 0004+00 0/1 0/0 0/0 .rodata @4314 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4314 = 300.0f; -COMPILER_STRIP_GATE(809B93F4, &lit_4314); +COMPILER_STRIP_GATE(0x809B93F4, &lit_4314); #pragma pop /* 809B93F8-809B93FC 000114 0004+00 0/1 0/0 0/0 .rodata @4315 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4315 = 200.0f; -COMPILER_STRIP_GATE(809B93F8, &lit_4315); +COMPILER_STRIP_GATE(0x809B93F8, &lit_4315); #pragma pop /* 809B93FC-809B9400 000118 0004+00 0/1 0/0 0/0 .rodata @4316 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4316 = -1000000000.0f; -COMPILER_STRIP_GATE(809B93FC, &lit_4316); +COMPILER_STRIP_GATE(0x809B93FC, &lit_4316); #pragma pop /* 809B2430-809B26E8 000A10 02B8+00 1/1 0/0 0/0 .text Create__13daNpc_Fairy_cFv */ @@ -2264,19 +2292,19 @@ asm void daNpc_Fairy_c::Execute() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4523 = 65536.0f; -COMPILER_STRIP_GATE(809B9400, &lit_4523); +COMPILER_STRIP_GATE(0x809B9400, &lit_4523); #pragma pop /* 809B9404-809B9408 000120 0004+00 0/3 0/0 0/0 .rodata @4524 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4524 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(809B9404, &lit_4524); +COMPILER_STRIP_GATE(0x809B9404, &lit_4524); #pragma pop /* 809B9408-809B940C 000124 0004+00 1/1 0/0 0/0 .rodata @4769 */ SECTION_RODATA static f32 const lit_4769 = 100.0f; -COMPILER_STRIP_GATE(809B9408, &lit_4769); +COMPILER_STRIP_GATE(0x809B9408, &lit_4769); /* 809B2F8C-809B3034 00156C 00A8+00 1/1 0/0 0/0 .text Draw__13daNpc_Fairy_cFv */ #pragma push @@ -2396,6 +2424,13 @@ asm void daNpc_Fairy_c::evtTalk() { } #pragma pop +/* ############################################################################################## */ +/* 809B94CC-809B94CC 0001E8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_809B95C4 = "Fairy"; +#pragma pop + /* 809B3630-809B36F8 001C10 00C8+00 1/0 0/0 0/0 .text evtCutProc__13daNpc_Fairy_cFv */ #pragma push #pragma optimization_level 0 @@ -2429,7 +2464,7 @@ asm void daNpc_Fairy_c::action() { /* ############################################################################################## */ /* 809B940C-809B9410 000128 0004+00 1/1 0/0 0/0 .rodata @4988 */ SECTION_RODATA static f32 const lit_4988 = 11.0f / 10.0f; -COMPILER_STRIP_GATE(809B940C, &lit_4988); +COMPILER_STRIP_GATE(0x809B940C, &lit_4988); /* 809B384C-809B38E8 001E2C 009C+00 1/1 0/0 0/0 .text ptcl_water__13daNpc_Fairy_cFv */ #pragma push @@ -2454,7 +2489,7 @@ SECTION_RODATA static u8 const id[6 + 2 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(809B9410, &id); +COMPILER_STRIP_GATE(0x809B9410, &id); /* 809B38E8-809B39FC 001EC8 0114+00 1/1 0/0 0/0 .text ptcl_sprit__13daNpc_Fairy_cFv */ #pragma push @@ -2476,7 +2511,7 @@ SECTION_RODATA static u8 const sFairyField[4] = { 0x02, 0x03, }; -COMPILER_STRIP_GATE(809B9418, &sFairyField); +COMPILER_STRIP_GATE(0x809B9418, &sFairyField); #pragma pop /* 809B39FC-809B3AB0 001FDC 00B4+00 1/1 0/0 0/0 .text _to_FairyField__13daNpc_Fairy_cFv @@ -2495,7 +2530,7 @@ asm void daNpc_Fairy_c::_to_FairyField() { SECTION_RODATA static u8 const sTempBit[16] = { 0x00, 0x00, 0x00, 0x79, 0x00, 0x00, 0x00, 0x7A, 0x00, 0x00, 0x00, 0x7B, 0x00, 0x00, 0x00, 0x7C, }; -COMPILER_STRIP_GATE(809B941C, &sTempBit); +COMPILER_STRIP_GATE(0x809B941C, &sTempBit); /* 809B3AB0-809B3B20 002090 0070+00 1/1 0/0 0/0 .text chk_tempbit__13daNpc_Fairy_cFv */ #pragma push @@ -2532,14 +2567,14 @@ asm void daNpc_Fairy_c::afterMoved() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5134 = -30.0f; -COMPILER_STRIP_GATE(809B942C, &lit_5134); +COMPILER_STRIP_GATE(0x809B942C, &lit_5134); #pragma pop /* 809B9430-809B9434 00014C 0004+00 0/1 0/0 0/0 .rodata @5135 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_5135 = 0x38C90FDB; -COMPILER_STRIP_GATE(809B9430, &lit_5135); +COMPILER_STRIP_GATE(0x809B9430, &lit_5135); #pragma pop /* 809B9434-809B943C 000150 0004+04 0/1 0/0 0/0 .rodata @5136 */ @@ -2550,14 +2585,14 @@ SECTION_RODATA static f32 const lit_5136[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(809B9434, &lit_5136); +COMPILER_STRIP_GATE(0x809B9434, &lit_5136); #pragma pop /* 809B943C-809B9444 000158 0008+00 1/3 0/0 0/0 .rodata @5138 */ SECTION_RODATA static u8 const lit_5138[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809B943C, &lit_5138); +COMPILER_STRIP_GATE(0x809B943C, &lit_5138); /* 809B3C64-809B3EA0 002244 023C+00 1/0 0/0 0/0 .text setAttnPos__13daNpc_Fairy_cFv */ #pragma push @@ -2589,7 +2624,7 @@ bool daNpc_Fairy_c::drawDbgInfo() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpc_Fairy_c::setAction(int (daNpc_Fairy_c::*)(int), int param_1) { +asm void daNpc_Fairy_c::setAction(int (daNpc_Fairy_c::*param_0)(int), int param_1) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_fairy/d_a_npc_fairy/setAction__13daNpc_Fairy_cFM13daNpc_Fairy_cFPCvPvi_ii.s" } @@ -2622,7 +2657,7 @@ asm void daNpc_Fairy_c::talk(int param_0) { SECTION_RODATA static u8 const lit_5196[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809B9444, &lit_5196); +COMPILER_STRIP_GATE(0x809B9444, &lit_5196); #pragma pop /* 809B944C-809B9454 000168 0008+00 0/1 0/0 0/0 .rodata @5197 */ @@ -2631,7 +2666,7 @@ COMPILER_STRIP_GATE(809B9444, &lit_5196); SECTION_RODATA static u8 const lit_5197[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809B944C, &lit_5197); +COMPILER_STRIP_GATE(0x809B944C, &lit_5197); #pragma pop /* 809B9454-809B945C 000170 0008+00 0/1 0/0 0/0 .rodata @5198 */ @@ -2640,7 +2675,7 @@ COMPILER_STRIP_GATE(809B944C, &lit_5197); SECTION_RODATA static u8 const lit_5198[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809B9454, &lit_5198); +COMPILER_STRIP_GATE(0x809B9454, &lit_5198); #pragma pop /* 809B945C-809B9468 000178 000A+02 0/1 0/0 0/0 .rodata sEvtType1$5356 */ @@ -2661,7 +2696,7 @@ SECTION_RODATA static u8 const sEvtType1[10 + 2 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(809B945C, &sEvtType1); +COMPILER_STRIP_GATE(0x809B945C, &sEvtType1); #pragma pop /* 809B9468-809B9474 000184 000A+02 0/1 0/0 0/0 .rodata sEvtType2$5357 */ @@ -2682,7 +2717,7 @@ SECTION_RODATA static u8 const sEvtType2[10 + 2 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(809B9468, &sEvtType2); +COMPILER_STRIP_GATE(0x809B9468, &sEvtType2); #pragma pop /* 809B9474-809B9480 000190 000A+02 0/1 0/0 0/0 .rodata sEvtBitNo$5358 */ @@ -2703,7 +2738,7 @@ SECTION_RODATA static u8 const sEvtBitNo[10 + 2 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(809B9474, &sEvtBitNo); +COMPILER_STRIP_GATE(0x809B9474, &sEvtBitNo); #pragma pop /* 809B4450-809B4588 002A30 0138+00 1/1 0/0 0/0 .text AppearDemoCall__13daNpc_Fairy_cFv @@ -2739,6 +2774,13 @@ asm void daNpc_Fairy_c::PresentDemoCall() { } #pragma pop +/* ############################################################################################## */ +/* 809B94CC-809B94CC 0001E8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_809B95CA = "cutId"; +#pragma pop + /* 809B464C-809B46E0 002C2C 0094+00 1/0 0/0 0/0 .text cutAppear_10F_01__13daNpc_Fairy_cFi */ #pragma push @@ -2755,7 +2797,7 @@ asm void daNpc_Fairy_c::cutAppear_10F_01(int param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5458 = 220.0f; -COMPILER_STRIP_GATE(809B9480, &lit_5458); +COMPILER_STRIP_GATE(0x809B9480, &lit_5458); #pragma pop /* 809B46E0-809B48C4 002CC0 01E4+00 1/1 0/0 0/0 .text _cutAppear_10F_01_Init__13daNpc_Fairy_cFRCi @@ -2774,14 +2816,14 @@ asm void daNpc_Fairy_c::_cutAppear_10F_01_Init(int const& param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5498 = 140.0f; -COMPILER_STRIP_GATE(809B9484, &lit_5498); +COMPILER_STRIP_GATE(0x809B9484, &lit_5498); #pragma pop /* 809B9488-809B948C 0001A4 0004+00 0/1 0/0 0/0 .rodata @5499 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5499 = 298.0f; -COMPILER_STRIP_GATE(809B9488, &lit_5499); +COMPILER_STRIP_GATE(0x809B9488, &lit_5499); #pragma pop /* 809B48C4-809B4A44 002EA4 0180+00 1/1 0/0 0/0 .text _cutAppear_10F_01_Main__13daNpc_Fairy_cFRCi @@ -3026,6 +3068,13 @@ asm void daNpc_Fairy_c::_cutAppear_40F_02_Main(int const& param_0) { } #pragma pop +/* ############################################################################################## */ +/* 809B94CC-809B94CC 0001E8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_809B95D0 = "msgNo"; +#pragma pop + /* 809B5D30-809B5E00 004310 00D0+00 1/0 0/0 0/0 .text cutAppear_50F_01__13daNpc_Fairy_cFi */ #pragma push @@ -3053,35 +3102,35 @@ asm void daNpc_Fairy_c::_cutAppear_50F_01_Init(int const& param_0, int const& pa #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5974 = 11.0f / 5.0f; -COMPILER_STRIP_GATE(809B948C, &lit_5974); +COMPILER_STRIP_GATE(0x809B948C, &lit_5974); #pragma pop /* 809B9490-809B9494 0001AC 0004+00 0/0 0/0 0/0 .rodata @5975 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_5975 = 0x3E9EB767; -COMPILER_STRIP_GATE(809B9490, &lit_5975); +COMPILER_STRIP_GATE(0x809B9490, &lit_5975); #pragma pop /* 809B9494-809B9498 0001B0 0004+00 0/0 0/0 0/0 .rodata @5976 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5976 = -61250.0f; -COMPILER_STRIP_GATE(809B9494, &lit_5976); +COMPILER_STRIP_GATE(0x809B9494, &lit_5976); #pragma pop /* 809B9498-809B949C 0001B4 0004+00 0/0 0/0 0/0 .rodata @5977 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_5977 = 0xC5696D1C; -COMPILER_STRIP_GATE(809B9498, &lit_5977); +COMPILER_STRIP_GATE(0x809B9498, &lit_5977); #pragma pop /* 809B949C-809B94A0 0001B8 0004+00 0/0 0/0 0/0 .rodata @5978 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5978 = 32.0f; -COMPILER_STRIP_GATE(809B949C, &lit_5978); +COMPILER_STRIP_GATE(0x809B949C, &lit_5978); #pragma pop /* 809B94A0-809B94A8 0001BC 0008+00 0/1 0/0 0/0 .rodata @5986 */ @@ -3090,7 +3139,7 @@ COMPILER_STRIP_GATE(809B949C, &lit_5978); SECTION_RODATA static u8 const lit_5986[8] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, }; -COMPILER_STRIP_GATE(809B94A0, &lit_5986); +COMPILER_STRIP_GATE(0x809B94A0, &lit_5986); #pragma pop /* 809B6084-809B631C 004664 0298+00 2/1 0/0 0/0 .text @@ -3131,7 +3180,7 @@ asm void daNpc_Fairy_c::_cutAppear_50F_02_Init(int const& param_0, int const& pa #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6037 = -4.0f; -COMPILER_STRIP_GATE(809B94A8, &lit_6037); +COMPILER_STRIP_GATE(0x809B94A8, &lit_6037); #pragma pop /* 809B94AC-809B94B4 0001C8 0008+00 0/1 0/0 0/0 .rodata @6123 */ @@ -3140,7 +3189,7 @@ COMPILER_STRIP_GATE(809B94A8, &lit_6037); SECTION_RODATA static u8 const lit_6123[8] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, }; -COMPILER_STRIP_GATE(809B94AC, &lit_6123); +COMPILER_STRIP_GATE(0x809B94AC, &lit_6123); #pragma pop /* 809B662C-809B6830 004C0C 0204+00 2/1 0/0 0/0 .text @@ -3216,7 +3265,7 @@ asm void daNpc_Fairy_c::_cutAppear_50F_04_Init(int const& param_0, int const& pa SECTION_RODATA static u8 const lit_6226[8] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, }; -COMPILER_STRIP_GATE(809B94B4, &lit_6226); +COMPILER_STRIP_GATE(0x809B94B4, &lit_6226); #pragma pop /* 809B94BC-809B94C4 0001D8 0008+00 0/1 0/0 0/0 .rodata @6338 */ @@ -3225,7 +3274,7 @@ COMPILER_STRIP_GATE(809B94B4, &lit_6226); SECTION_RODATA static u8 const lit_6338[8] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, }; -COMPILER_STRIP_GATE(809B94BC, &lit_6338); +COMPILER_STRIP_GATE(0x809B94BC, &lit_6338); #pragma pop /* 809B6F40-809B7168 005520 0228+00 2/1 0/0 0/0 .text @@ -3268,7 +3317,7 @@ asm void daNpc_Fairy_c::_cutAppear_50F_05_Init(int const& param_0, int const& pa SECTION_RODATA static u8 const lit_6462[8] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, }; -COMPILER_STRIP_GATE(809B94C4, &lit_6462); +COMPILER_STRIP_GATE(0x809B94C4, &lit_6462); #pragma pop /* 809B74AC-809B7718 005A8C 026C+00 2/1 0/0 0/0 .text @@ -3713,7 +3762,7 @@ asm void __sinit_d_a_npc_fairy_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_809B8E50 = (void*)__sinit_d_a_npc_fairy_cpp; +REGISTER_CTORS(0x809B8E50, __sinit_d_a_npc_fairy_cpp); #pragma pop /* 809B9054-809B9160 007634 010C+00 1/1 0/0 0/0 .text @@ -3837,30 +3886,4 @@ static asm void func_809B92C8() { } #pragma pop -/* 809B94CC-809B95D6 0001E8 010A+00 21/18 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_809B94CC = ""; -SECTION_DEAD static char const* const stringBase_809B94CD = "fairy"; -SECTION_DEAD static char const* const stringBase_809B94D3 = "APPEAR_10F_01"; -SECTION_DEAD static char const* const stringBase_809B94E1 = "APPEAR_10F_02"; -SECTION_DEAD static char const* const stringBase_809B94EF = "APPEAR_20F_01"; -SECTION_DEAD static char const* const stringBase_809B94FD = "APPEAR_20F_02"; -SECTION_DEAD static char const* const stringBase_809B950B = "APPEAR_30F_01"; -SECTION_DEAD static char const* const stringBase_809B9519 = "APPEAR_30F_02"; -SECTION_DEAD static char const* const stringBase_809B9527 = "APPEAR_40F_01"; -SECTION_DEAD static char const* const stringBase_809B9535 = "APPEAR_40F_02"; -SECTION_DEAD static char const* const stringBase_809B9543 = "APPEAR_50F_01"; -SECTION_DEAD static char const* const stringBase_809B9551 = "APPEAR_50F_02"; -SECTION_DEAD static char const* const stringBase_809B955F = "APPEAR_50F_03"; -SECTION_DEAD static char const* const stringBase_809B956D = "APPEAR_50F_04"; -SECTION_DEAD static char const* const stringBase_809B957B = "APPEAR_50F_05"; -SECTION_DEAD static char const* const stringBase_809B9589 = "SELECT_RETURN1"; -SECTION_DEAD static char const* const stringBase_809B9598 = "SELECT_RETURN2"; -SECTION_DEAD static char const* const stringBase_809B95A7 = "SELECT_RETURN3"; -SECTION_DEAD static char const* const stringBase_809B95B6 = "RETURN_CANCEL"; -SECTION_DEAD static char const* const stringBase_809B95C4 = "Fairy"; -SECTION_DEAD static char const* const stringBase_809B95CA = "cutId"; -SECTION_DEAD static char const* const stringBase_809B95D0 = "msgNo"; -#pragma pop +/* 809B94CC-809B94CC 0001E8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/npc/d_a_npc_fairy_seirei/d_a_npc_fairy_seirei.cpp b/rel/d/a/npc/d_a_npc_fairy_seirei/d_a_npc_fairy_seirei.cpp index 1c13f8e28ea..21dfc05779e 100644 --- a/rel/d/a/npc/d_a_npc_fairy_seirei/d_a_npc_fairy_seirei.cpp +++ b/rel/d/a/npc/d_a_npc_fairy_seirei/d_a_npc_fairy_seirei.cpp @@ -20,7 +20,7 @@ struct fopAc_ac_c { /* 80018C8C */ ~fopAc_ac_c(); }; -struct daNpcT_evtData_c {}; +struct daNpcT_faceMotionAnmData_c {}; struct daNpcT_MotionSeqMngr_c { struct sequenceStepData_c {}; @@ -29,7 +29,7 @@ struct daNpcT_MotionSeqMngr_c { /* 80541898 */ ~daNpcT_MotionSeqMngr_c(); }; -struct daNpcT_faceMotionAnmData_c {}; +struct daNpcT_evtData_c {}; struct daNpcT_motionAnmData_c {}; @@ -74,13 +74,13 @@ struct daNpc_FairySeirei_Param_c { struct J3DModel {}; +struct J3DJoint {}; + struct cXyz { /* 805412D0 */ ~cXyz(); /* 8054184C */ cXyz(); }; -struct J3DJoint {}; - struct daNpcT_c { /* 8014852C */ void execute(); /* 80148C70 */ void setEnvTevColor(); @@ -154,13 +154,13 @@ struct dPa_levelEcallBack {}; struct dKy_tevstr_c {}; -struct _GXColor {}; - struct csXyz { /* 8054130C */ ~csXyz(); /* 8054174C */ csXyz(); }; +struct _GXColor {}; + struct dPa_control_c { struct level_c { /* 8004B918 */ void getEmitter(u32); @@ -487,6 +487,12 @@ extern "C" void __register_global_object(); // /* ############################################################################################## */ +/* 80541E58-80541E58 0000CC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80541E58 = ""; +#pragma pop + /* 80541E60-80541E6C 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -780,11 +786,11 @@ SECTION_RODATA u8 const daNpc_FairySeirei_Param_c::m[148] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x44, 0x16, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80541D8C, &daNpc_FairySeirei_Param_c::m); +COMPILER_STRIP_GATE(0x80541D8C, &daNpc_FairySeirei_Param_c::m); /* 80541E20-80541E24 000094 0004+00 1/1 0/0 0/0 .rodata @4024 */ SECTION_RODATA static f32 const lit_4024 = -1000000000.0f; -COMPILER_STRIP_GATE(80541E20, &lit_4024); +COMPILER_STRIP_GATE(0x80541E20, &lit_4024); /* 8054006C-80540298 0001EC 022C+00 1/1 0/0 0/0 .text create__19daNpc_FairySeirei_cFv */ #pragma push @@ -840,27 +846,27 @@ SECTION_RODATA static u8 const lit_4178[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80541E24, &lit_4178); +COMPILER_STRIP_GATE(0x80541E24, &lit_4178); /* 80541E28-80541E2C 00009C 0004+00 0/2 0/0 0/0 .rodata @4179 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4179 = 65536.0f; -COMPILER_STRIP_GATE(80541E28, &lit_4179); +COMPILER_STRIP_GATE(0x80541E28, &lit_4179); #pragma pop /* 80541E2C-80541E30 0000A0 0004+00 0/2 0/0 0/0 .rodata @4180 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4180 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(80541E2C, &lit_4180); +COMPILER_STRIP_GATE(0x80541E2C, &lit_4180); #pragma pop /* 80541E30-80541E34 0000A4 0004+00 0/1 0/0 0/0 .rodata @4325 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4325 = -1.0f; -COMPILER_STRIP_GATE(80541E30, &lit_4325); +COMPILER_STRIP_GATE(0x80541E30, &lit_4325); #pragma pop /* 80540334-8054048C 0004B4 0158+00 1/1 0/0 0/0 .text reset__19daNpc_FairySeirei_cFv */ @@ -910,6 +916,13 @@ asm void daNpc_FairySeirei_c::evtTalk() { } #pragma pop +/* ############################################################################################## */ +/* 80541E58-80541E58 0000CC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80541E59 = "Seirei"; +#pragma pop + /* 805406BC-80540784 00083C 00C8+00 1/0 0/0 0/0 .text evtCutProc__19daNpc_FairySeirei_cFv */ #pragma push @@ -955,7 +968,7 @@ asm void daNpc_FairySeirei_c::setCollision() { /* ############################################################################################## */ /* 80541E34-80541E38 0000A8 0004+00 1/1 0/0 0/0 .rodata @4465 */ SECTION_RODATA static f32 const lit_4465 = 350.0f; -COMPILER_STRIP_GATE(80541E34, &lit_4465); +COMPILER_STRIP_GATE(0x80541E34, &lit_4465); /* 80540988-80540A30 000B08 00A8+00 1/0 0/0 0/0 .text setAttnPos__19daNpc_FairySeirei_cFv */ @@ -988,7 +1001,7 @@ asm void daNpc_FairySeirei_c::selectAction() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpc_FairySeirei_c::setAction(int (daNpc_FairySeirei_c::*)(int)) { +asm void daNpc_FairySeirei_c::setAction(int (daNpc_FairySeirei_c::*param_0)(int)) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_fairy_seirei/d_a_npc_fairy_seirei/func_80540A80.s" } @@ -1009,21 +1022,21 @@ SECTION_RODATA static u8 const id[6 + 2 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80541E38, &id); +COMPILER_STRIP_GATE(0x80541E38, &id); #pragma pop /* 80541E40-80541E44 0000B4 0004+00 0/1 0/0 0/0 .rodata @4530 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4530 = 1.0f; -COMPILER_STRIP_GATE(80541E40, &lit_4530); +COMPILER_STRIP_GATE(0x80541E40, &lit_4530); #pragma pop /* 80541E44-80541E48 0000B8 0004+00 0/1 0/0 0/0 .rodata @4531 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4531 = 200.0f; -COMPILER_STRIP_GATE(80541E44, &lit_4531); +COMPILER_STRIP_GATE(0x80541E44, &lit_4531); #pragma pop /* 80540B28-80540C54 000CA8 012C+00 1/1 0/0 0/0 .text setPrtcls__19daNpc_FairySeirei_cFv @@ -1062,7 +1075,7 @@ asm void daNpc_FairySeirei_c::talk(int param_0) { SECTION_RODATA static u8 const sTempBit[16] = { 0x00, 0x00, 0x00, 0x79, 0x00, 0x00, 0x00, 0x7A, 0x00, 0x00, 0x00, 0x7B, 0x00, 0x00, 0x00, 0x7C, }; -COMPILER_STRIP_GATE(80541E48, &sTempBit); +COMPILER_STRIP_GATE(0x80541E48, &sTempBit); /* 80540E10-80540E78 000F90 0068+00 1/1 0/0 0/0 .text _to_FairyCave__19daNpc_FairySeirei_cFv */ #pragma push @@ -1443,7 +1456,7 @@ asm void __sinit_d_a_npc_fairy_seirei_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80541B7C = (void*)__sinit_d_a_npc_fairy_seirei_cpp; +REGISTER_CTORS(0x80541B7C, __sinit_d_a_npc_fairy_seirei_cpp); #pragma pop /* 80541BE4-80541C90 001D64 00AC+00 1/1 0/0 0/0 .text @@ -1513,10 +1526,4 @@ static asm void func_80541D70() { } #pragma pop -/* 80541E58-80541E60 0000CC 0008+00 4/1 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80541E58 = ""; -SECTION_DEAD static char const* const stringBase_80541E59 = "Seirei"; -#pragma pop +/* 80541E58-80541E58 0000CC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/npc/d_a_npc_fguard/d_a_npc_fguard.cpp b/rel/d/a/npc/d_a_npc_fguard/d_a_npc_fguard.cpp index 5716b7dd957..83ff6a87647 100644 --- a/rel/d/a/npc/d_a_npc_fguard/d_a_npc_fguard.cpp +++ b/rel/d/a/npc/d_a_npc_fguard/d_a_npc_fguard.cpp @@ -38,10 +38,10 @@ struct daNpcFgd_c { /* 809BAA80 */ ~daNpcFgd_c(); }; -struct J3DAnmTransformKey {}; - struct J3DModel {}; +struct J3DAnmTransformKey {}; + struct daNpcCd2_c { /* 80157D00 */ void NpcCreate(int); /* 80157F28 */ void ObjCreate(int); @@ -101,14 +101,14 @@ struct dBgS_AcchCir { /* 809BB31C */ ~dBgS_AcchCir(); }; -struct cXyz { - /* 809BB2E0 */ ~cXyz(); +struct csXyz { + /* 809BB0D0 */ ~csXyz(); }; struct dBgS {}; -struct csXyz { - /* 809BB0D0 */ ~csXyz(); +struct cXyz { + /* 809BB2E0 */ ~cXyz(); }; struct dBgS_Acch { @@ -406,76 +406,76 @@ asm void daNpcFgd_c::create() { /* ############################################################################################## */ /* 809BB404-809BB408 000000 0004+00 1/1 0/0 0/0 .rodata @3979 */ SECTION_RODATA static f32 const lit_3979 = -3.0f; -COMPILER_STRIP_GATE(809BB404, &lit_3979); +COMPILER_STRIP_GATE(0x809BB404, &lit_3979); /* 809BB408-809BB40C 000004 0004+00 0/1 0/0 0/0 .rodata @3980 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3980 = -21.0f; -COMPILER_STRIP_GATE(809BB408, &lit_3980); +COMPILER_STRIP_GATE(0x809BB408, &lit_3980); #pragma pop /* 809BB40C-809BB410 000008 0004+00 0/1 0/0 0/0 .rodata @3981 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3981 = -50.0f; -COMPILER_STRIP_GATE(809BB40C, &lit_3981); +COMPILER_STRIP_GATE(0x809BB40C, &lit_3981); #pragma pop /* 809BB410-809BB414 00000C 0004+00 0/1 0/0 0/0 .rodata @3982 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3982 = -10.0f; -COMPILER_STRIP_GATE(809BB410, &lit_3982); +COMPILER_STRIP_GATE(0x809BB410, &lit_3982); #pragma pop /* 809BB414-809BB418 000010 0004+00 0/1 0/0 0/0 .rodata @3983 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3983 = -90.0f; -COMPILER_STRIP_GATE(809BB414, &lit_3983); +COMPILER_STRIP_GATE(0x809BB414, &lit_3983); #pragma pop /* 809BB418-809BB41C 000014 0004+00 0/1 0/0 0/0 .rodata @3984 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3984 = 50.0f; -COMPILER_STRIP_GATE(809BB418, &lit_3984); +COMPILER_STRIP_GATE(0x809BB418, &lit_3984); #pragma pop /* 809BB41C-809BB420 000018 0004+00 0/1 0/0 0/0 .rodata @3985 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3985 = 290.0f; -COMPILER_STRIP_GATE(809BB41C, &lit_3985); +COMPILER_STRIP_GATE(0x809BB41C, &lit_3985); #pragma pop /* 809BB420-809BB424 00001C 0004+00 0/1 0/0 0/0 .rodata @3986 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3986 = 60.0f; -COMPILER_STRIP_GATE(809BB420, &lit_3986); +COMPILER_STRIP_GATE(0x809BB420, &lit_3986); #pragma pop /* 809BB424-809BB428 000020 0004+00 0/1 0/0 0/0 .rodata @3987 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3987 = 1.0f; -COMPILER_STRIP_GATE(809BB424, &lit_3987); +COMPILER_STRIP_GATE(0x809BB424, &lit_3987); #pragma pop /* 809BB428-809BB42C 000024 0004+00 0/1 0/0 0/0 .rodata @3988 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3988 = 12.0f; -COMPILER_STRIP_GATE(809BB428, &lit_3988); +COMPILER_STRIP_GATE(0x809BB428, &lit_3988); #pragma pop /* 809BB42C-809BB430 000028 0004+00 0/1 0/0 0/0 .rodata @3989 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3989 = 5.0f; -COMPILER_STRIP_GATE(809BB42C, &lit_3989); +COMPILER_STRIP_GATE(0x809BB42C, &lit_3989); #pragma pop /* 809BB430-809BB434 00002C 0004+00 0/1 0/0 0/0 .rodata @3990 */ @@ -487,7 +487,7 @@ SECTION_RODATA static u8 const lit_3990[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(809BB430, &lit_3990); +COMPILER_STRIP_GATE(0x809BB430, &lit_3990); #pragma pop /* 809BA730-809BAA4C 0002F0 031C+00 1/1 0/0 0/0 .text create_init__10daNpcFgd_cFv */ @@ -523,11 +523,11 @@ asm daNpcFgd_c::~daNpcFgd_c() { /* ############################################################################################## */ /* 809BB434-809BB438 000030 0004+00 1/1 0/0 0/0 .rodata @4182 */ SECTION_RODATA static f32 const lit_4182 = 2.0f / 5.0f; -COMPILER_STRIP_GATE(809BB434, &lit_4182); +COMPILER_STRIP_GATE(0x809BB434, &lit_4182); /* 809BB438-809BB43C 000034 0004+00 1/1 0/0 0/0 .rodata @4183 */ SECTION_RODATA static f32 const lit_4183 = 25.0f; -COMPILER_STRIP_GATE(809BB438, &lit_4183); +COMPILER_STRIP_GATE(0x809BB438, &lit_4183); /* 809BAB04-809BAD3C 0006C4 0238+00 1/0 0/0 0/0 .text daNpcFgd_Execute__FPv */ #pragma push @@ -552,7 +552,7 @@ asm cM3dGPla::~cM3dGPla() { /* ############################################################################################## */ /* 809BB43C-809BB440 000038 0004+00 1/1 0/0 0/0 .rodata @4201 */ SECTION_RODATA static f32 const lit_4201 = 40.0f; -COMPILER_STRIP_GATE(809BB43C, &lit_4201); +COMPILER_STRIP_GATE(0x809BB43C, &lit_4201); /* 809BAD84-809BAE20 000944 009C+00 1/0 0/0 0/0 .text daNpcFgd_Draw__FPv */ #pragma push diff --git a/rel/d/a/npc/d_a_npc_fish/d_a_npc_fish.cpp b/rel/d/a/npc/d_a_npc_fish/d_a_npc_fish.cpp index 98f5859c392..bcd0ca23824 100644 --- a/rel/d/a/npc/d_a_npc_fish/d_a_npc_fish.cpp +++ b/rel/d/a/npc/d_a_npc_fish/d_a_npc_fish.cpp @@ -104,7 +104,7 @@ static asm void fish_set(fopAc_ac_c* param_0, fish_data_s* param_1) { /* ############################################################################################## */ /* 805424C0-805424C4 000000 0004+00 1/1 0/0 0/0 .rodata @3787 */ SECTION_RODATA static f32 const lit_3787 = -3382.0f; -COMPILER_STRIP_GATE(805424C0, &lit_3787); +COMPILER_STRIP_GATE(0x805424C0, &lit_3787); /* 805424C4-805424C8 000004 0004+00 0/1 0/0 0/0 .rodata @3788 */ #pragma push @@ -115,42 +115,48 @@ SECTION_RODATA static u8 const lit_3788[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(805424C4, &lit_3788); +COMPILER_STRIP_GATE(0x805424C4, &lit_3788); #pragma pop /* 805424C8-805424CC 000008 0004+00 0/1 0/0 0/0 .rodata @3789 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3789 = -7473.0f; -COMPILER_STRIP_GATE(805424C8, &lit_3789); +COMPILER_STRIP_GATE(0x805424C8, &lit_3789); #pragma pop /* 805424CC-805424D0 00000C 0004+00 0/1 0/0 0/0 .rodata @3790 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3790 = -7865.0f; -COMPILER_STRIP_GATE(805424CC, &lit_3790); +COMPILER_STRIP_GATE(0x805424CC, &lit_3790); #pragma pop /* 805424D0-805424D4 000010 0004+00 0/1 0/0 0/0 .rodata @3791 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3791 = 700.0f; -COMPILER_STRIP_GATE(805424D0, &lit_3791); +COMPILER_STRIP_GATE(0x805424D0, &lit_3791); #pragma pop /* 805424D4-805424D8 000014 0004+00 0/1 0/0 0/0 .rodata @3792 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3792 = -2936.0f; -COMPILER_STRIP_GATE(805424D4, &lit_3792); +COMPILER_STRIP_GATE(0x805424D4, &lit_3792); #pragma pop /* 805424D8-805424DC 000018 0004+00 0/1 0/0 0/0 .rodata @3793 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3793 = -180.0f; -COMPILER_STRIP_GATE(805424D8, &lit_3793); +COMPILER_STRIP_GATE(0x805424D8, &lit_3793); +#pragma pop + +/* 805424DC-805424DC 00001C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_805424DC = "F_SP127"; #pragma pop /* 805424E4-805424F0 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ @@ -367,9 +373,4 @@ SECTION_DATA extern void* g_profile_NPC_FISH[12] = { (void*)0x00040100, (void*)0x00060000, }; -/* 805424DC-805424E4 00001C 0008+00 1/1 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_805424DC = "F_SP127"; -#pragma pop +/* 805424DC-805424DC 00001C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/npc/d_a_npc_gnd/d_a_npc_gnd.cpp b/rel/d/a/npc/d_a_npc_gnd/d_a_npc_gnd.cpp index a01e30ff80e..8a1151cd324 100644 --- a/rel/d/a/npc/d_a_npc_gnd/d_a_npc_gnd.cpp +++ b/rel/d/a/npc/d_a_npc_gnd/d_a_npc_gnd.cpp @@ -15,12 +15,14 @@ struct mDoMtx_stack_c { static u8 now[48]; }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; +struct J3DAnmTransform {}; + +struct J3DModelData {}; + struct Vec {}; struct Z2Creature { @@ -29,8 +31,6 @@ struct Z2Creature { /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -43,6 +43,8 @@ struct fopAc_ac_c { /* 80018C8C */ ~fopAc_ac_c(); }; +struct daNpcT_faceMotionAnmData_c {}; + struct daNpcT_MotionSeqMngr_c { struct sequenceStepData_c {}; @@ -50,14 +52,12 @@ struct daNpcT_MotionSeqMngr_c { /* 809BDC98 */ ~daNpcT_MotionSeqMngr_c(); }; +struct daNpcT_evtData_c {}; + struct daNpcT_motionAnmData_c {}; struct J3DJoint {}; -struct daNpcT_faceMotionAnmData_c {}; - -struct daNpcT_evtData_c {}; - struct daNpc_Gnd_c { /* 809BB60C */ ~daNpc_Gnd_c(); /* 809BB730 */ void create(); @@ -114,20 +114,20 @@ struct dCcD_GObjInf { /* 800840E4 */ ~dCcD_GObjInf(); }; +struct _GXColorS10 {}; + struct J3DModel {}; +struct J3DAnmColor {}; + +struct J3DAnmTevRegKey {}; + struct cXyz { /* 80266B34 */ void operator-(Vec const&) const; /* 809BD6D0 */ ~cXyz(); /* 809BDC4C */ cXyz(); }; -struct J3DAnmColor {}; - -struct _GXColorS10 {}; - -struct J3DAnmTevRegKey {}; - struct daNpcT_c { /* 80147FA4 */ void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*); /* 80148148 */ void getTevRegKeyAnmP(char const*, int); @@ -274,13 +274,13 @@ struct dBgS_AcchCir { /* 809BDCE0 */ ~dBgS_AcchCir(); }; -struct dBgS {}; - struct csXyz { /* 809BD70C */ ~csXyz(); /* 809BDB4C */ csXyz(); }; +struct dBgS {}; + struct dBgS_Acch { /* 80075F94 */ ~dBgS_Acch(); /* 800760A0 */ dBgS_Acch(); @@ -611,6 +611,14 @@ extern "C" void __register_global_object(); // /* ############################################################################################## */ +/* 809BE588-809BE588 0000E8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_809BE588 = ""; +SECTION_DEAD static char const* const stringBase_809BE589 = "NO_RESPONSE"; +SECTION_DEAD static char const* const stringBase_809BE595 = "Gnd"; +#pragma pop + /* 809BE59C-809BE5A8 000000 000C+00 2/2 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -924,41 +932,41 @@ SECTION_RODATA u8 const daNpc_Gnd_Param_c::m[140] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809BE4A0, &daNpc_Gnd_Param_c::m); +COMPILER_STRIP_GATE(0x809BE4A0, &daNpc_Gnd_Param_c::m); /* 809BE52C-809BE530 00008C 0004+00 0/1 0/0 0/0 .rodata @4020 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4020 = -300.0f; -COMPILER_STRIP_GATE(809BE52C, &lit_4020); +COMPILER_STRIP_GATE(0x809BE52C, &lit_4020); #pragma pop /* 809BE530-809BE534 000090 0004+00 0/1 0/0 0/0 .rodata @4021 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4021 = -50.0f; -COMPILER_STRIP_GATE(809BE530, &lit_4021); +COMPILER_STRIP_GATE(0x809BE530, &lit_4021); #pragma pop /* 809BE534-809BE538 000094 0004+00 0/1 0/0 0/0 .rodata @4022 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4022 = 300.0f; -COMPILER_STRIP_GATE(809BE534, &lit_4022); +COMPILER_STRIP_GATE(0x809BE534, &lit_4022); #pragma pop /* 809BE538-809BE53C 000098 0004+00 0/1 0/0 0/0 .rodata @4023 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4023 = 450.0f; -COMPILER_STRIP_GATE(809BE538, &lit_4023); +COMPILER_STRIP_GATE(0x809BE538, &lit_4023); #pragma pop /* 809BE53C-809BE540 00009C 0004+00 0/1 0/0 0/0 .rodata @4024 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4024 = -1000000000.0f; -COMPILER_STRIP_GATE(809BE53C, &lit_4024); +COMPILER_STRIP_GATE(0x809BE53C, &lit_4024); #pragma pop /* 809BB730-809BB9D4 000210 02A4+00 1/1 0/0 0/0 .text create__11daNpc_Gnd_cFv */ @@ -979,22 +987,22 @@ SECTION_RODATA static u8 const lit_4178[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(809BE540, &lit_4178); +COMPILER_STRIP_GATE(0x809BE540, &lit_4178); /* 809BE544-809BE548 0000A4 0004+00 0/2 0/0 0/0 .rodata @4179 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4179 = 65536.0f; -COMPILER_STRIP_GATE(809BE544, &lit_4179); +COMPILER_STRIP_GATE(0x809BE544, &lit_4179); #pragma pop /* 809BE548-809BE54C 0000A8 0004+00 1/4 0/0 0/0 .rodata @4180 */ SECTION_RODATA static f32 const lit_4180 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(809BE548, &lit_4180); +COMPILER_STRIP_GATE(0x809BE548, &lit_4180); /* 809BE54C-809BE550 0000AC 0004+00 3/5 0/0 0/0 .rodata @4331 */ SECTION_RODATA static f32 const lit_4331 = 1.0f; -COMPILER_STRIP_GATE(809BE54C, &lit_4331); +COMPILER_STRIP_GATE(0x809BE54C, &lit_4331); /* 809BB9D4-809BBC70 0004B4 029C+00 1/1 0/0 0/0 .text CreateHeap__11daNpc_Gnd_cFv */ #pragma push @@ -1129,7 +1137,7 @@ asm void daNpc_Gnd_c::Execute() { /* ############################################################################################## */ /* 809BE550-809BE554 0000B0 0004+00 1/1 0/0 0/0 .rodata @4391 */ SECTION_RODATA static f32 const lit_4391 = 100.0f; -COMPILER_STRIP_GATE(809BE550, &lit_4391); +COMPILER_STRIP_GATE(0x809BE550, &lit_4391); /* 809BBE80-809BBF44 000960 00C4+00 1/1 0/0 0/0 .text Draw__11daNpc_Gnd_cFv */ #pragma push @@ -1216,7 +1224,7 @@ asm void daNpc_Gnd_c::afterJntAnm(int param_0) { /* ############################################################################################## */ /* 809BE554-809BE558 0000B4 0004+00 3/3 0/0 0/0 .rodata @4552 */ SECTION_RODATA static f32 const lit_4552 = -1.0f; -COMPILER_STRIP_GATE(809BE554, &lit_4552); +COMPILER_STRIP_GATE(0x809BE554, &lit_4552); /* 809BC1F4-809BC328 000CD4 0134+00 1/0 0/0 0/0 .text ctrlBtk__11daNpc_Gnd_cFv */ #pragma push @@ -1299,14 +1307,14 @@ asm void daNpc_Gnd_c::beforeMove() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4723 = 10.0f; -COMPILER_STRIP_GATE(809BE558, &lit_4723); +COMPILER_STRIP_GATE(0x809BE558, &lit_4723); #pragma pop /* 809BE55C-809BE560 0000BC 0004+00 0/1 0/0 0/0 .rodata @4724 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4724 = 30.0f; -COMPILER_STRIP_GATE(809BE55C, &lit_4724); +COMPILER_STRIP_GATE(0x809BE55C, &lit_4724); #pragma pop /* 809BE560-809BE568 0000C0 0004+04 0/1 0/0 0/0 .rodata @4725 */ @@ -1317,14 +1325,14 @@ SECTION_RODATA static u32 const lit_4725[1 + 1 /* padding */] = { /* padding */ 0x00000000, }; -COMPILER_STRIP_GATE(809BE560, &lit_4725); +COMPILER_STRIP_GATE(0x809BE560, &lit_4725); #pragma pop /* 809BE568-809BE570 0000C8 0008+00 1/3 0/0 0/0 .rodata @4727 */ SECTION_RODATA static u8 const lit_4727[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809BE568, &lit_4727); +COMPILER_STRIP_GATE(0x809BE568, &lit_4727); /* 809BC7D8-809BCA14 0012B8 023C+00 1/0 0/0 0/0 .text setAttnPos__11daNpc_Gnd_cFv */ #pragma push @@ -1376,7 +1384,7 @@ asm void daNpc_Gnd_c::selectAction() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpc_Gnd_c::chkAction(int (daNpc_Gnd_c::*)(void*)) { +asm void daNpc_Gnd_c::chkAction(int (daNpc_Gnd_c::*param_0)(void*)) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_gnd/d_a_npc_gnd/chkAction__11daNpc_Gnd_cFM11daNpc_Gnd_cFPCvPvPv_i.s" } @@ -1387,7 +1395,7 @@ asm void daNpc_Gnd_c::chkAction(int (daNpc_Gnd_c::*)(void*)) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpc_Gnd_c::setAction(int (daNpc_Gnd_c::*)(void*)) { +asm void daNpc_Gnd_c::setAction(int (daNpc_Gnd_c::*param_0)(void*)) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_gnd/d_a_npc_gnd/setAction__11daNpc_Gnd_cFM11daNpc_Gnd_cFPCvPvPv_i.s" } @@ -1622,7 +1630,7 @@ asm void daNpcT_JntAnm_c::setEyeAngleY(cXyz param_0, s16 param_1, int param_2, f SECTION_RODATA static u8 const lit_4785[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809BE570, &lit_4785); +COMPILER_STRIP_GATE(0x809BE570, &lit_4785); #pragma pop /* 809BE578-809BE580 0000D8 0008+00 0/1 0/0 0/0 .rodata @4786 */ @@ -1631,7 +1639,7 @@ COMPILER_STRIP_GATE(809BE570, &lit_4785); SECTION_RODATA static u8 const lit_4786[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809BE578, &lit_4786); +COMPILER_STRIP_GATE(0x809BE578, &lit_4786); #pragma pop /* 809BE580-809BE588 0000E0 0008+00 0/1 0/0 0/0 .rodata @4787 */ @@ -1640,7 +1648,7 @@ COMPILER_STRIP_GATE(809BE578, &lit_4786); SECTION_RODATA static u8 const lit_4787[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809BE580, &lit_4787); +COMPILER_STRIP_GATE(0x809BE580, &lit_4787); #pragma pop /* 809BDF80-809BE188 002A60 0208+00 1/1 0/0 0/0 .text setEyeAngleX__15daNpcT_JntAnm_cF4cXyzfs */ @@ -1797,7 +1805,7 @@ asm void __sinit_d_a_npc_gnd_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_809BE268 = (void*)__sinit_d_a_npc_gnd_cpp; +REGISTER_CTORS(0x809BE268, __sinit_d_a_npc_gnd_cpp); #pragma pop /* 809BE2D0-809BE37C 002DB0 00AC+00 1/1 0/0 0/0 .text @@ -1892,11 +1900,4 @@ static asm void func_809BE484() { } #pragma pop -/* 809BE588-809BE599 0000E8 0011+00 4/1 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_809BE588 = ""; -SECTION_DEAD static char const* const stringBase_809BE589 = "NO_RESPONSE"; -SECTION_DEAD static char const* const stringBase_809BE595 = "Gnd"; -#pragma pop +/* 809BE588-809BE588 0000E8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/npc/d_a_npc_gra/d_a_npc_gra.cpp b/rel/d/a/npc/d_a_npc_gra/d_a_npc_gra.cpp index 14d4b1a00da..3b0bcb046ea 100644 --- a/rel/d/a/npc/d_a_npc_gra/d_a_npc_gra.cpp +++ b/rel/d/a/npc/d_a_npc_gra/d_a_npc_gra.cpp @@ -41,12 +41,12 @@ struct mDoExt_bckAnm { /* 8000D990 */ void changeBckOnly(J3DAnmTransform*); }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; +struct J3DModelData {}; + struct Z2Creature { /* 802C03C8 */ Z2Creature(); /* 802C0420 */ ~Z2Creature(); @@ -76,10 +76,10 @@ struct daTagGra_c { /* 809C9D0C */ void getGraPos(); }; -struct J3DJoint {}; - struct J3DModel {}; +struct J3DJoint {}; + struct daNpc_grA_c { struct daNpc_GrA_prtclMngr_c { /* 809BEB24 */ ~daNpc_GrA_prtclMngr_c(); @@ -178,20 +178,20 @@ struct daNpcT_ActorMngr_c { /* 80145708 */ void getActorP(); }; +struct J3DAnmTexPattern {}; + struct J3DAnmTextureSRTKey {}; +struct J3DAnmTransformKey {}; + +struct _GXColorS10 {}; + struct dCcD_SrcCyl {}; struct dCcD_Cyl { /* 800848B4 */ void Set(dCcD_SrcCyl const&); }; -struct _GXColorS10 {}; - -struct J3DAnmTexPattern {}; - -struct J3DAnmTransformKey {}; - struct daNpcF_c { struct daNpcF_anmPlayData {}; @@ -341,7 +341,6 @@ struct dMeter2Info_c { struct dEvt_control_c { /* 80042468 */ void reset(); /* 80042518 */ void reset(void*); - /* 800436EC */ void setPtI_Id(unsigned int); }; struct dEvent_manager_c { @@ -561,9 +560,9 @@ extern "C" void __dt__12dBgS_ObjAcchFv(); extern "C" void __dt__12J3DFrameCtrlFv(); extern "C" void setCollisions__8daNpcF_cFv(); extern "C" void __dt__10cCcD_GSttsFv(); -extern "C" void func_809C9AC8(s16*); -extern "C" void func_809C9AE4(int*); -extern "C" void func_809C9B00(int, int); +extern "C" void func_809C9AC8(void* _this, s16*); +extern "C" void func_809C9AE4(void* _this, int*); +extern "C" void func_809C9B00(void* _this, int, int); extern "C" void __sinit_d_a_npc_gra_cpp(); extern "C" void getGraAngle__10daTagGra_cFv(); extern "C" void getGraPos__10daTagGra_cFv(); @@ -790,6 +789,42 @@ extern "C" void __register_global_object(); // /* ############################################################################################## */ +/* 809CA4B8-809CA4B8 000720 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_809CA4B8 = "TALK_SPA"; +SECTION_DEAD static char const* const stringBase_809CA4C1 = "TEACH_ELV"; +SECTION_DEAD static char const* const stringBase_809CA4CB = "KICK_OUT"; +SECTION_DEAD static char const* const stringBase_809CA4D4 = "KICK_OUT_BREAK"; +SECTION_DEAD static char const* const stringBase_809CA4E3 = "NONE_LOOK"; +SECTION_DEAD static char const* const stringBase_809CA4ED = "RESCUE_ROCK"; +SECTION_DEAD static char const* const stringBase_809CA4F9 = "CARRY_SPA_WATER"; +SECTION_DEAD static char const* const stringBase_809CA509 = "CARRY_SPA_WATER_FAILURE"; +SECTION_DEAD static char const* const stringBase_809CA521 = "TALK_SPA_WATER"; +SECTION_DEAD static char const* const stringBase_809CA530 = "ROLL_ROCK_CRASH"; +SECTION_DEAD static char const* const stringBase_809CA540 = "grA_base"; +SECTION_DEAD static char const* const stringBase_809CA549 = "grA_mdl"; +SECTION_DEAD static char const* const stringBase_809CA551 = "grA_TW"; +SECTION_DEAD static char const* const stringBase_809CA558 = "grA_SPA"; +SECTION_DEAD static char const* const stringBase_809CA560 = "grA_Sdemo"; +SECTION_DEAD static char const* const stringBase_809CA56A = "grA_Elv"; +SECTION_DEAD static char const* const stringBase_809CA572 = "grA_Kick"; +SECTION_DEAD static char const* const stringBase_809CA57B = "grA_Rock"; +SECTION_DEAD static char const* const stringBase_809CA584 = "grA_RockD"; +SECTION_DEAD static char const* const stringBase_809CA58E = "grA_SWD"; +SECTION_DEAD static char const* const stringBase_809CA596 = "grA_onsen"; +SECTION_DEAD static char const* const stringBase_809CA5A0 = "grA_onsn2"; +SECTION_DEAD static char const* const stringBase_809CA5AA = "maroTaru"; +SECTION_DEAD static char const* const stringBase_809CA5B3 = "grA_RCD"; +SECTION_DEAD static char const* const stringBase_809CA5BB = "grA_gate"; +SECTION_DEAD static char const* const stringBase_809CA5C4 = "grA_town"; +SECTION_DEAD static char const* const stringBase_809CA5CD = "grA"; +SECTION_DEAD static char const* const stringBase_809CA5D1 = "grA_spa"; +SECTION_DEAD static char const* const stringBase_809CA5D9 = ""; +SECTION_DEAD static char const* const stringBase_809CA5DA = "GRDS_ROLL"; +SECTION_DEAD static char const* const stringBase_809CA5E4 = "GRDS_GATE"; +#pragma pop + /* 809CA614-809CA620 000000 000C+00 6/6 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -1865,39 +1900,39 @@ SECTION_RODATA u8 const daNpc_grA_Param_c::m[132] = { 0x00, 0x00, 0x00, 0x00, 0x0F, 0x00, 0x00, 0x40, 0xC0, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, 0x3E, 0x2E, 0x14, 0x7B, 0x03, 0x00, 0x00, 0x04, 0x3F, 0xAC, 0xCC, 0xCD, }; -COMPILER_STRIP_GATE(809C9D98, &daNpc_grA_Param_c::m); +COMPILER_STRIP_GATE(0x809C9D98, &daNpc_grA_Param_c::m); /* 809C9E1C-809C9E20 000084 0004+00 0/2 0/0 0/0 .rodata @4523 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4523 = -300.0f; -COMPILER_STRIP_GATE(809C9E1C, &lit_4523); +COMPILER_STRIP_GATE(0x809C9E1C, &lit_4523); #pragma pop /* 809C9E20-809C9E24 000088 0004+00 0/1 0/0 0/0 .rodata @4524 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4524 = -50.0f; -COMPILER_STRIP_GATE(809C9E20, &lit_4524); +COMPILER_STRIP_GATE(0x809C9E20, &lit_4524); #pragma pop /* 809C9E24-809C9E28 00008C 0004+00 0/3 0/0 0/0 .rodata @4525 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4525 = 300.0f; -COMPILER_STRIP_GATE(809C9E24, &lit_4525); +COMPILER_STRIP_GATE(0x809C9E24, &lit_4525); #pragma pop /* 809C9E28-809C9E2C 000090 0004+00 0/1 0/0 0/0 .rodata @4526 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4526 = 450.0f; -COMPILER_STRIP_GATE(809C9E28, &lit_4526); +COMPILER_STRIP_GATE(0x809C9E28, &lit_4526); #pragma pop /* 809C9E2C-809C9E30 000094 0004+00 1/3 0/0 0/0 .rodata @4527 */ SECTION_RODATA static f32 const lit_4527 = 120.0f; -COMPILER_STRIP_GATE(809C9E2C, &lit_4527); +COMPILER_STRIP_GATE(0x809C9E2C, &lit_4527); /* 809BEDA4-809BF0A8 000544 0304+00 1/1 0/0 0/0 .text create__11daNpc_grA_cFv */ #pragma push @@ -1912,7 +1947,7 @@ asm void daNpc_grA_c::create() { /* ############################################################################################## */ /* 809C9E30-809C9E34 000098 0004+00 4/11 0/0 0/0 .rodata @4610 */ SECTION_RODATA static f32 const lit_4610 = 1.0f; -COMPILER_STRIP_GATE(809C9E30, &lit_4610); +COMPILER_STRIP_GATE(0x809C9E30, &lit_4610); /* 809C9E34-809C9E38 00009C 0004+00 10/25 0/0 0/0 .rodata @4611 */ SECTION_RODATA static u8 const lit_4611[4] = { @@ -1921,7 +1956,7 @@ SECTION_RODATA static u8 const lit_4611[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(809C9E34, &lit_4611); +COMPILER_STRIP_GATE(0x809C9E34, &lit_4611); /* 809BF0A8-809BF418 000848 0370+00 1/1 0/0 0/0 .text CreateHeap__11daNpc_grA_cFv */ #pragma push @@ -1968,7 +2003,7 @@ asm void daNpc_grA_c::Draw() { SECTION_RODATA static u8 const lit_4634[12] = { 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x04, }; -COMPILER_STRIP_GATE(809C9E38, &lit_4634); +COMPILER_STRIP_GATE(0x809C9E38, &lit_4634); /* 809BF504-809BF738 000CA4 0234+00 1/1 0/0 0/0 .text * ctrlJoint__11daNpc_grA_cFP8J3DJointP8J3DModel */ @@ -2166,21 +2201,21 @@ bool daNpc_grA_c::ctrlBtk() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5317 = 15.0f; -COMPILER_STRIP_GATE(809C9E44, &lit_5317); +COMPILER_STRIP_GATE(0x809C9E44, &lit_5317); #pragma pop /* 809C9E48-809C9E4C 0000B0 0004+00 0/1 0/0 0/0 .rodata @5318 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5318 = 25.0f; -COMPILER_STRIP_GATE(809C9E48, &lit_5318); +COMPILER_STRIP_GATE(0x809C9E48, &lit_5318); #pragma pop /* 809C9E4C-809C9E50 0000B4 0004+00 0/3 0/0 0/0 .rodata @5319 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5319 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(809C9E4C, &lit_5319); +COMPILER_STRIP_GATE(0x809C9E4C, &lit_5319); #pragma pop /* 809C9E50-809C9E58 0000B8 0004+04 0/1 0/0 0/0 .rodata @5320 */ @@ -2191,7 +2226,7 @@ SECTION_RODATA static f32 const lit_5320[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(809C9E50, &lit_5320); +COMPILER_STRIP_GATE(0x809C9E50, &lit_5320); #pragma pop /* 809C9E58-809C9E60 0000C0 0008+00 0/3 0/0 0/0 .rodata @5321 */ @@ -2200,7 +2235,7 @@ COMPILER_STRIP_GATE(809C9E50, &lit_5320); SECTION_RODATA static u8 const lit_5321[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809C9E58, &lit_5321); +COMPILER_STRIP_GATE(0x809C9E58, &lit_5321); #pragma pop /* 809C9E60-809C9E68 0000C8 0008+00 0/3 0/0 0/0 .rodata @5322 */ @@ -2209,7 +2244,7 @@ COMPILER_STRIP_GATE(809C9E58, &lit_5321); SECTION_RODATA static u8 const lit_5322[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809C9E60, &lit_5322); +COMPILER_STRIP_GATE(0x809C9E60, &lit_5322); #pragma pop /* 809C9E68-809C9E70 0000D0 0008+00 0/3 0/0 0/0 .rodata @5323 */ @@ -2218,28 +2253,28 @@ COMPILER_STRIP_GATE(809C9E60, &lit_5322); SECTION_RODATA static u8 const lit_5323[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809C9E68, &lit_5323); +COMPILER_STRIP_GATE(0x809C9E68, &lit_5323); #pragma pop /* 809C9E70-809C9E74 0000D8 0004+00 0/2 0/0 0/0 .rodata @5324 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5324 = 215.0f; -COMPILER_STRIP_GATE(809C9E70, &lit_5324); +COMPILER_STRIP_GATE(0x809C9E70, &lit_5324); #pragma pop /* 809C9E74-809C9E78 0000DC 0004+00 0/2 0/0 0/0 .rodata @5325 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5325 = -80.0f; -COMPILER_STRIP_GATE(809C9E74, &lit_5325); +COMPILER_STRIP_GATE(0x809C9E74, &lit_5325); #pragma pop /* 809C9E78-809C9E7C 0000E0 0004+00 0/2 0/0 0/0 .rodata @5326 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5326 = 150.0f; -COMPILER_STRIP_GATE(809C9E78, &lit_5326); +COMPILER_STRIP_GATE(0x809C9E78, &lit_5326); #pragma pop /* 809CB2F8-809CB2FC 000008 0001+03 1/1 0/0 0/0 .bss @1109 */ @@ -2471,6 +2506,13 @@ asm void daNpc_grA_c::getSwBit() { } #pragma pop +/* ############################################################################################## */ +/* 809CA4B8-809CA4B8 000720 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_809CA5EE = "F_SP109"; +#pragma pop + /* 809C1244-809C13D8 0029E4 0194+00 1/1 0/0 0/0 .text isDelete__11daNpc_grA_cFv */ #pragma push #pragma optimization_level 0 @@ -2486,14 +2528,20 @@ asm void daNpc_grA_c::isDelete() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5740 = 100.0f; -COMPILER_STRIP_GATE(809C9E7C, &lit_5740); +COMPILER_STRIP_GATE(0x809C9E7C, &lit_5740); #pragma pop /* 809C9E80-809C9E84 0000E8 0004+00 0/3 0/0 0/0 .rodata @5741 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5741 = -150.0f; -COMPILER_STRIP_GATE(809C9E80, &lit_5741); +COMPILER_STRIP_GATE(0x809C9E80, &lit_5741); +#pragma pop + +/* 809CA4B8-809CA4B8 000720 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_809CA5F6 = "F_SP121"; #pragma pop /* 809C13D8-809C1990 002B78 05B8+00 1/1 0/0 0/0 .text reset__11daNpc_grA_cFv */ @@ -2513,7 +2561,7 @@ asm void daNpc_grA_c::reset() { SECTION_RODATA static u8 const lit_5745[12] = { 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(809C9E84, &lit_5745); +COMPILER_STRIP_GATE(0x809C9E84, &lit_5745); #pragma pop /* 809C9E90-809C9E9C 0000F8 000C+00 0/1 0/0 0/0 .rodata @5746 */ @@ -2522,7 +2570,7 @@ COMPILER_STRIP_GATE(809C9E84, &lit_5745); SECTION_RODATA static u8 const lit_5746[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809C9E90, &lit_5746); +COMPILER_STRIP_GATE(0x809C9E90, &lit_5746); #pragma pop /* 809C9E9C-809C9EA4 000104 0008+00 0/1 0/0 0/0 .rodata @5747 */ @@ -2531,7 +2579,7 @@ COMPILER_STRIP_GATE(809C9E90, &lit_5746); SECTION_RODATA static u8 const lit_5747[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809C9E9C, &lit_5747); +COMPILER_STRIP_GATE(0x809C9E9C, &lit_5747); #pragma pop /* 809C9EA4-809C9EB0 00010C 000C+00 0/1 0/0 0/0 .rodata @5748 */ @@ -2540,7 +2588,7 @@ COMPILER_STRIP_GATE(809C9E9C, &lit_5747); SECTION_RODATA static u8 const lit_5748[12] = { 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(809C9EA4, &lit_5748); +COMPILER_STRIP_GATE(0x809C9EA4, &lit_5748); #pragma pop /* 809C9EB0-809C9EBC 000118 000C+00 0/1 0/0 0/0 .rodata @5749 */ @@ -2549,7 +2597,7 @@ COMPILER_STRIP_GATE(809C9EA4, &lit_5748); SECTION_RODATA static u8 const lit_5749[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809C9EB0, &lit_5749); +COMPILER_STRIP_GATE(0x809C9EB0, &lit_5749); #pragma pop /* 809C9EBC-809C9EC4 000124 0008+00 0/1 0/0 0/0 .rodata @5750 */ @@ -2558,7 +2606,7 @@ COMPILER_STRIP_GATE(809C9EB0, &lit_5749); SECTION_RODATA static u8 const lit_5750[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809C9EBC, &lit_5750); +COMPILER_STRIP_GATE(0x809C9EBC, &lit_5750); #pragma pop /* 809C9EC4-809C9ED0 00012C 000C+00 0/1 0/0 0/0 .rodata @5751 */ @@ -2567,7 +2615,7 @@ COMPILER_STRIP_GATE(809C9EBC, &lit_5750); SECTION_RODATA static u8 const lit_5751[12] = { 0x00, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(809C9EC4, &lit_5751); +COMPILER_STRIP_GATE(0x809C9EC4, &lit_5751); #pragma pop /* 809C9ED0-809C9EDC 000138 000C+00 0/1 0/0 0/0 .rodata @5752 */ @@ -2576,7 +2624,7 @@ COMPILER_STRIP_GATE(809C9EC4, &lit_5751); SECTION_RODATA static u8 const lit_5752[12] = { 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809C9ED0, &lit_5752); +COMPILER_STRIP_GATE(0x809C9ED0, &lit_5752); #pragma pop /* 809C9EDC-809C9EE4 000144 0008+00 0/1 0/0 0/0 .rodata @5753 */ @@ -2585,7 +2633,7 @@ COMPILER_STRIP_GATE(809C9ED0, &lit_5752); SECTION_RODATA static u8 const lit_5753[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809C9EDC, &lit_5753); +COMPILER_STRIP_GATE(0x809C9EDC, &lit_5753); #pragma pop /* 809C9EE4-809C9EF0 00014C 000C+00 0/1 0/0 0/0 .rodata @5754 */ @@ -2594,7 +2642,7 @@ COMPILER_STRIP_GATE(809C9EDC, &lit_5753); SECTION_RODATA static u8 const lit_5754[12] = { 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(809C9EE4, &lit_5754); +COMPILER_STRIP_GATE(0x809C9EE4, &lit_5754); #pragma pop /* 809C9EF0-809C9EFC 000158 000C+00 0/1 0/0 0/0 .rodata @5755 */ @@ -2603,7 +2651,7 @@ COMPILER_STRIP_GATE(809C9EE4, &lit_5754); SECTION_RODATA static u8 const lit_5755[12] = { 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809C9EF0, &lit_5755); +COMPILER_STRIP_GATE(0x809C9EF0, &lit_5755); #pragma pop /* 809C9EFC-809C9F04 000164 0008+00 0/1 0/0 0/0 .rodata @5756 */ @@ -2612,7 +2660,7 @@ COMPILER_STRIP_GATE(809C9EF0, &lit_5755); SECTION_RODATA static u8 const lit_5756[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809C9EFC, &lit_5756); +COMPILER_STRIP_GATE(0x809C9EFC, &lit_5756); #pragma pop /* 809C9F04-809C9F10 00016C 000C+00 0/1 0/0 0/0 .rodata @5757 */ @@ -2621,7 +2669,7 @@ COMPILER_STRIP_GATE(809C9EFC, &lit_5756); SECTION_RODATA static u8 const lit_5757[12] = { 0x00, 0x0F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(809C9F04, &lit_5757); +COMPILER_STRIP_GATE(0x809C9F04, &lit_5757); #pragma pop /* 809C9F10-809C9F1C 000178 000C+00 0/1 0/0 0/0 .rodata @5758 */ @@ -2630,7 +2678,7 @@ COMPILER_STRIP_GATE(809C9F04, &lit_5757); SECTION_RODATA static u8 const lit_5758[12] = { 0x00, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809C9F10, &lit_5758); +COMPILER_STRIP_GATE(0x809C9F10, &lit_5758); #pragma pop /* 809C9F1C-809C9F24 000184 0008+00 0/1 0/0 0/0 .rodata @5759 */ @@ -2639,7 +2687,7 @@ COMPILER_STRIP_GATE(809C9F10, &lit_5758); SECTION_RODATA static u8 const lit_5759[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809C9F1C, &lit_5759); +COMPILER_STRIP_GATE(0x809C9F1C, &lit_5759); #pragma pop /* 809C9F24-809C9F30 00018C 000C+00 0/1 0/0 0/0 .rodata @5760 */ @@ -2648,7 +2696,7 @@ COMPILER_STRIP_GATE(809C9F1C, &lit_5759); SECTION_RODATA static u8 const lit_5760[12] = { 0x00, 0x0D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(809C9F24, &lit_5760); +COMPILER_STRIP_GATE(0x809C9F24, &lit_5760); #pragma pop /* 809C9F30-809C9F3C 000198 000C+00 0/1 0/0 0/0 .rodata @5761 */ @@ -2657,7 +2705,7 @@ COMPILER_STRIP_GATE(809C9F24, &lit_5760); SECTION_RODATA static u8 const lit_5761[12] = { 0x00, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809C9F30, &lit_5761); +COMPILER_STRIP_GATE(0x809C9F30, &lit_5761); #pragma pop /* 809C9F3C-809C9F44 0001A4 0008+00 0/1 0/0 0/0 .rodata @5762 */ @@ -2666,7 +2714,7 @@ COMPILER_STRIP_GATE(809C9F30, &lit_5761); SECTION_RODATA static u8 const lit_5762[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809C9F3C, &lit_5762); +COMPILER_STRIP_GATE(0x809C9F3C, &lit_5762); #pragma pop /* 809C9F44-809C9F50 0001AC 000C+00 0/1 0/0 0/0 .rodata @5763 */ @@ -2675,7 +2723,7 @@ COMPILER_STRIP_GATE(809C9F3C, &lit_5762); SECTION_RODATA static u8 const lit_5763[12] = { 0x00, 0x13, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(809C9F44, &lit_5763); +COMPILER_STRIP_GATE(0x809C9F44, &lit_5763); #pragma pop /* 809C9F50-809C9F5C 0001B8 000C+00 0/1 0/0 0/0 .rodata @5764 */ @@ -2684,7 +2732,7 @@ COMPILER_STRIP_GATE(809C9F44, &lit_5763); SECTION_RODATA static u8 const lit_5764[12] = { 0x00, 0x17, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809C9F50, &lit_5764); +COMPILER_STRIP_GATE(0x809C9F50, &lit_5764); #pragma pop /* 809C9F5C-809C9F64 0001C4 0008+00 0/1 0/0 0/0 .rodata @5765 */ @@ -2693,7 +2741,7 @@ COMPILER_STRIP_GATE(809C9F50, &lit_5764); SECTION_RODATA static u8 const lit_5765[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809C9F5C, &lit_5765); +COMPILER_STRIP_GATE(0x809C9F5C, &lit_5765); #pragma pop /* 809C9F64-809C9F70 0001CC 000C+00 0/1 0/0 0/0 .rodata @5766 */ @@ -2702,7 +2750,7 @@ COMPILER_STRIP_GATE(809C9F5C, &lit_5765); SECTION_RODATA static u8 const lit_5766[12] = { 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(809C9F64, &lit_5766); +COMPILER_STRIP_GATE(0x809C9F64, &lit_5766); #pragma pop /* 809C9F70-809C9F7C 0001D8 000C+00 0/1 0/0 0/0 .rodata @5767 */ @@ -2711,7 +2759,7 @@ COMPILER_STRIP_GATE(809C9F64, &lit_5766); SECTION_RODATA static u8 const lit_5767[12] = { 0x00, 0x17, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809C9F70, &lit_5767); +COMPILER_STRIP_GATE(0x809C9F70, &lit_5767); #pragma pop /* 809C9F7C-809C9F84 0001E4 0008+00 0/1 0/0 0/0 .rodata @5768 */ @@ -2720,7 +2768,7 @@ COMPILER_STRIP_GATE(809C9F70, &lit_5767); SECTION_RODATA static u8 const lit_5768[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809C9F7C, &lit_5768); +COMPILER_STRIP_GATE(0x809C9F7C, &lit_5768); #pragma pop /* 809C9F84-809C9F90 0001EC 000C+00 0/1 0/0 0/0 .rodata @5769 */ @@ -2729,7 +2777,7 @@ COMPILER_STRIP_GATE(809C9F7C, &lit_5768); SECTION_RODATA static u8 const lit_5769[12] = { 0x00, 0x15, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(809C9F84, &lit_5769); +COMPILER_STRIP_GATE(0x809C9F84, &lit_5769); #pragma pop /* 809C9F90-809C9F9C 0001F8 000C+00 0/1 0/0 0/0 .rodata @5770 */ @@ -2738,7 +2786,7 @@ COMPILER_STRIP_GATE(809C9F84, &lit_5769); SECTION_RODATA static u8 const lit_5770[12] = { 0x00, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809C9F90, &lit_5770); +COMPILER_STRIP_GATE(0x809C9F90, &lit_5770); #pragma pop /* 809C9F9C-809C9FA4 000204 0008+00 0/1 0/0 0/0 .rodata @5771 */ @@ -2747,7 +2795,7 @@ COMPILER_STRIP_GATE(809C9F90, &lit_5770); SECTION_RODATA static u8 const lit_5771[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809C9F9C, &lit_5771); +COMPILER_STRIP_GATE(0x809C9F9C, &lit_5771); #pragma pop /* 809C9FA4-809C9FB0 00020C 000C+00 0/1 0/0 0/0 .rodata @5772 */ @@ -2756,7 +2804,7 @@ COMPILER_STRIP_GATE(809C9F9C, &lit_5771); SECTION_RODATA static u8 const lit_5772[12] = { 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809C9FA4, &lit_5772); +COMPILER_STRIP_GATE(0x809C9FA4, &lit_5772); #pragma pop /* 809C9FB0-809C9FB4 000218 0004+00 0/1 0/0 0/0 .rodata @5773 */ @@ -2768,7 +2816,7 @@ SECTION_RODATA static u8 const lit_5773[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(809C9FB0, &lit_5773); +COMPILER_STRIP_GATE(0x809C9FB0, &lit_5773); #pragma pop /* 809C9FB4-809C9FC0 00021C 000C+00 0/1 0/0 0/0 .rodata @5774 */ @@ -2777,7 +2825,7 @@ COMPILER_STRIP_GATE(809C9FB0, &lit_5773); SECTION_RODATA static u8 const lit_5774[12] = { 0x00, 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(809C9FB4, &lit_5774); +COMPILER_STRIP_GATE(0x809C9FB4, &lit_5774); #pragma pop /* 809C9FC0-809C9FCC 000228 000C+00 0/1 0/0 0/0 .rodata @5775 */ @@ -2786,7 +2834,7 @@ COMPILER_STRIP_GATE(809C9FB4, &lit_5774); SECTION_RODATA static u8 const lit_5775[12] = { 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809C9FC0, &lit_5775); +COMPILER_STRIP_GATE(0x809C9FC0, &lit_5775); #pragma pop /* 809C9FCC-809C9FD4 000234 0008+00 0/1 0/0 0/0 .rodata @5776 */ @@ -2795,7 +2843,7 @@ COMPILER_STRIP_GATE(809C9FC0, &lit_5775); SECTION_RODATA static u8 const lit_5776[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809C9FCC, &lit_5776); +COMPILER_STRIP_GATE(0x809C9FCC, &lit_5776); #pragma pop /* 809C9FD4-809C9FE0 00023C 000C+00 0/1 0/0 0/0 .rodata @5777 */ @@ -2804,7 +2852,7 @@ COMPILER_STRIP_GATE(809C9FCC, &lit_5776); SECTION_RODATA static u8 const lit_5777[12] = { 0x00, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809C9FD4, &lit_5777); +COMPILER_STRIP_GATE(0x809C9FD4, &lit_5777); #pragma pop /* 809C9FE0-809C9FE4 000248 0004+00 0/1 0/0 0/0 .rodata @5778 */ @@ -2816,7 +2864,7 @@ SECTION_RODATA static u8 const lit_5778[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(809C9FE0, &lit_5778); +COMPILER_STRIP_GATE(0x809C9FE0, &lit_5778); #pragma pop /* 809C9FE4-809C9FF0 00024C 000C+00 0/1 0/0 0/0 .rodata @5779 */ @@ -2825,7 +2873,7 @@ COMPILER_STRIP_GATE(809C9FE0, &lit_5778); SECTION_RODATA static u8 const lit_5779[12] = { 0x00, 0x0B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(809C9FE4, &lit_5779); +COMPILER_STRIP_GATE(0x809C9FE4, &lit_5779); #pragma pop /* 809C9FF0-809C9FFC 000258 000C+00 0/1 0/0 0/0 .rodata @5780 */ @@ -2834,7 +2882,7 @@ COMPILER_STRIP_GATE(809C9FE4, &lit_5779); SECTION_RODATA static u8 const lit_5780[12] = { 0x00, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809C9FF0, &lit_5780); +COMPILER_STRIP_GATE(0x809C9FF0, &lit_5780); #pragma pop /* 809C9FFC-809CA004 000264 0008+00 0/1 0/0 0/0 .rodata @5781 */ @@ -2843,7 +2891,7 @@ COMPILER_STRIP_GATE(809C9FF0, &lit_5780); SECTION_RODATA static u8 const lit_5781[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809C9FFC, &lit_5781); +COMPILER_STRIP_GATE(0x809C9FFC, &lit_5781); #pragma pop /* 809CA004-809CA010 00026C 000C+00 0/1 0/0 0/0 .rodata @5782 */ @@ -2852,7 +2900,7 @@ COMPILER_STRIP_GATE(809C9FFC, &lit_5781); SECTION_RODATA static u8 const lit_5782[12] = { 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809CA004, &lit_5782); +COMPILER_STRIP_GATE(0x809CA004, &lit_5782); #pragma pop /* 809CA010-809CA014 000278 0004+00 0/1 0/0 0/0 .rodata @5783 */ @@ -2864,7 +2912,7 @@ SECTION_RODATA static u8 const lit_5783[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(809CA010, &lit_5783); +COMPILER_STRIP_GATE(0x809CA010, &lit_5783); #pragma pop /* 809CA014-809CA020 00027C 000C+00 0/1 0/0 0/0 .rodata @5784 */ @@ -2873,7 +2921,7 @@ COMPILER_STRIP_GATE(809CA010, &lit_5783); SECTION_RODATA static u8 const lit_5784[12] = { 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809CA014, &lit_5784); +COMPILER_STRIP_GATE(0x809CA014, &lit_5784); #pragma pop /* 809CA020-809CA024 000288 0004+00 0/1 0/0 0/0 .rodata @5785 */ @@ -2885,7 +2933,7 @@ SECTION_RODATA static u8 const lit_5785[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(809CA020, &lit_5785); +COMPILER_STRIP_GATE(0x809CA020, &lit_5785); #pragma pop /* 809CA024-809CA030 00028C 000C+00 0/1 0/0 0/0 .rodata @5786 */ @@ -2894,7 +2942,7 @@ COMPILER_STRIP_GATE(809CA020, &lit_5785); SECTION_RODATA static u8 const lit_5786[12] = { 0x00, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809CA024, &lit_5786); +COMPILER_STRIP_GATE(0x809CA024, &lit_5786); #pragma pop /* 809CA030-809CA034 000298 0004+00 0/1 0/0 0/0 .rodata @5787 */ @@ -2906,7 +2954,7 @@ SECTION_RODATA static u8 const lit_5787[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(809CA030, &lit_5787); +COMPILER_STRIP_GATE(0x809CA030, &lit_5787); #pragma pop /* 809CA034-809CA040 00029C 000C+00 0/1 0/0 0/0 .rodata @5788 */ @@ -2915,7 +2963,7 @@ COMPILER_STRIP_GATE(809CA030, &lit_5787); SECTION_RODATA static u8 const lit_5788[12] = { 0x00, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809CA034, &lit_5788); +COMPILER_STRIP_GATE(0x809CA034, &lit_5788); #pragma pop /* 809CA040-809CA044 0002A8 0004+00 0/1 0/0 0/0 .rodata @5789 */ @@ -2927,7 +2975,7 @@ SECTION_RODATA static u8 const lit_5789[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(809CA040, &lit_5789); +COMPILER_STRIP_GATE(0x809CA040, &lit_5789); #pragma pop /* 809CA044-809CA050 0002AC 000C+00 0/1 0/0 0/0 .rodata @5790 */ @@ -2936,7 +2984,7 @@ COMPILER_STRIP_GATE(809CA040, &lit_5789); SECTION_RODATA static u8 const lit_5790[12] = { 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809CA044, &lit_5790); +COMPILER_STRIP_GATE(0x809CA044, &lit_5790); #pragma pop /* 809CA050-809CA054 0002B8 0004+00 0/1 0/0 0/0 .rodata @5791 */ @@ -2948,7 +2996,7 @@ SECTION_RODATA static u8 const lit_5791[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(809CA050, &lit_5791); +COMPILER_STRIP_GATE(0x809CA050, &lit_5791); #pragma pop /* 809CA054-809CA060 0002BC 000C+00 0/1 0/0 0/0 .rodata @5792 */ @@ -2957,7 +3005,7 @@ COMPILER_STRIP_GATE(809CA050, &lit_5791); SECTION_RODATA static u8 const lit_5792[12] = { 0x00, 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809CA054, &lit_5792); +COMPILER_STRIP_GATE(0x809CA054, &lit_5792); #pragma pop /* 809CA060-809CA064 0002C8 0004+00 0/1 0/0 0/0 .rodata @5793 */ @@ -2969,7 +3017,7 @@ SECTION_RODATA static u8 const lit_5793[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(809CA060, &lit_5793); +COMPILER_STRIP_GATE(0x809CA060, &lit_5793); #pragma pop /* 809CA064-809CA070 0002CC 000C+00 0/1 0/0 0/0 .rodata @5794 */ @@ -2978,7 +3026,7 @@ COMPILER_STRIP_GATE(809CA060, &lit_5793); SECTION_RODATA static u8 const lit_5794[12] = { 0x00, 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(809CA064, &lit_5794); +COMPILER_STRIP_GATE(0x809CA064, &lit_5794); #pragma pop /* 809CA070-809CA07C 0002D8 000C+00 0/1 0/0 0/0 .rodata @5795 */ @@ -2987,7 +3035,7 @@ COMPILER_STRIP_GATE(809CA064, &lit_5794); SECTION_RODATA static u8 const lit_5795[12] = { 0x00, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809CA070, &lit_5795); +COMPILER_STRIP_GATE(0x809CA070, &lit_5795); #pragma pop /* 809CA07C-809CA084 0002E4 0008+00 0/1 0/0 0/0 .rodata @5796 */ @@ -2996,7 +3044,7 @@ COMPILER_STRIP_GATE(809CA070, &lit_5795); SECTION_RODATA static u8 const lit_5796[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809CA07C, &lit_5796); +COMPILER_STRIP_GATE(0x809CA07C, &lit_5796); #pragma pop /* 809CA084-809CA090 0002EC 000C+00 0/1 0/0 0/0 .rodata @5797 */ @@ -3005,7 +3053,7 @@ COMPILER_STRIP_GATE(809CA07C, &lit_5796); SECTION_RODATA static u8 const lit_5797[12] = { 0x00, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809CA084, &lit_5797); +COMPILER_STRIP_GATE(0x809CA084, &lit_5797); #pragma pop /* 809CA090-809CA094 0002F8 0004+00 0/1 0/0 0/0 .rodata @5798 */ @@ -3017,7 +3065,7 @@ SECTION_RODATA static u8 const lit_5798[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(809CA090, &lit_5798); +COMPILER_STRIP_GATE(0x809CA090, &lit_5798); #pragma pop /* 809CA094-809CA0A0 0002FC 000C+00 0/1 0/0 0/0 .rodata @5799 */ @@ -3026,7 +3074,7 @@ COMPILER_STRIP_GATE(809CA090, &lit_5798); SECTION_RODATA static u8 const lit_5799[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809CA094, &lit_5799); +COMPILER_STRIP_GATE(0x809CA094, &lit_5799); #pragma pop /* 809CA0A0-809CA0A4 000308 0004+00 0/1 0/0 0/0 .rodata @5800 */ @@ -3038,7 +3086,7 @@ SECTION_RODATA static u8 const lit_5800[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(809CA0A0, &lit_5800); +COMPILER_STRIP_GATE(0x809CA0A0, &lit_5800); #pragma pop /* 809C1990-809C2080 003130 06F0+00 1/1 0/0 0/0 .text playExpression__11daNpc_grA_cFv */ @@ -3063,7 +3111,7 @@ SECTION_RODATA static u8 const lit_5801[96] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809CA0A4, &lit_5801); +COMPILER_STRIP_GATE(0x809CA0A4, &lit_5801); #pragma pop /* 809CA104-809CA110 00036C 000C+00 0/1 0/0 0/0 .rodata @5844 */ @@ -3072,7 +3120,7 @@ COMPILER_STRIP_GATE(809CA0A4, &lit_5801); SECTION_RODATA static u8 const lit_5844[12] = { 0x00, 0x16, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809CA104, &lit_5844); +COMPILER_STRIP_GATE(0x809CA104, &lit_5844); #pragma pop /* 809CA110-809CA114 000378 0004+00 0/1 0/0 0/0 .rodata @5845 */ @@ -3084,7 +3132,7 @@ SECTION_RODATA static u8 const lit_5845[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(809CA110, &lit_5845); +COMPILER_STRIP_GATE(0x809CA110, &lit_5845); #pragma pop /* 809CA114-809CA120 00037C 000C+00 0/1 0/0 0/0 .rodata @5846 */ @@ -3093,7 +3141,7 @@ COMPILER_STRIP_GATE(809CA110, &lit_5845); SECTION_RODATA static u8 const lit_5846[12] = { 0x00, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809CA114, &lit_5846); +COMPILER_STRIP_GATE(0x809CA114, &lit_5846); #pragma pop /* 809CA120-809CA124 000388 0004+00 0/1 0/0 0/0 .rodata @5847 */ @@ -3105,7 +3153,7 @@ SECTION_RODATA static u8 const lit_5847[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(809CA120, &lit_5847); +COMPILER_STRIP_GATE(0x809CA120, &lit_5847); #pragma pop /* 809CA124-809CA130 00038C 000C+00 0/1 0/0 0/0 .rodata @5848 */ @@ -3114,7 +3162,7 @@ COMPILER_STRIP_GATE(809CA120, &lit_5847); SECTION_RODATA static u8 const lit_5848[12] = { 0x00, 0x27, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809CA124, &lit_5848); +COMPILER_STRIP_GATE(0x809CA124, &lit_5848); #pragma pop /* 809CA130-809CA134 000398 0004+00 0/1 0/0 0/0 .rodata @5849 */ @@ -3126,7 +3174,7 @@ SECTION_RODATA static u8 const lit_5849[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(809CA130, &lit_5849); +COMPILER_STRIP_GATE(0x809CA130, &lit_5849); #pragma pop /* 809CA134-809CA140 00039C 000C+00 0/1 0/0 0/0 .rodata @5850 */ @@ -3135,7 +3183,7 @@ COMPILER_STRIP_GATE(809CA130, &lit_5849); SECTION_RODATA static u8 const lit_5850[12] = { 0x00, 0x1D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(809CA134, &lit_5850); +COMPILER_STRIP_GATE(0x809CA134, &lit_5850); #pragma pop /* 809CA140-809CA14C 0003A8 000C+00 0/1 0/0 0/0 .rodata @5851 */ @@ -3144,7 +3192,7 @@ COMPILER_STRIP_GATE(809CA134, &lit_5850); SECTION_RODATA static u8 const lit_5851[12] = { 0x00, 0x16, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809CA140, &lit_5851); +COMPILER_STRIP_GATE(0x809CA140, &lit_5851); #pragma pop /* 809CA14C-809CA154 0003B4 0008+00 0/1 0/0 0/0 .rodata @5852 */ @@ -3153,7 +3201,7 @@ COMPILER_STRIP_GATE(809CA140, &lit_5851); SECTION_RODATA static u8 const lit_5852[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809CA14C, &lit_5852); +COMPILER_STRIP_GATE(0x809CA14C, &lit_5852); #pragma pop /* 809CA154-809CA160 0003BC 000C+00 0/1 0/0 0/0 .rodata @5853 */ @@ -3162,7 +3210,7 @@ COMPILER_STRIP_GATE(809CA14C, &lit_5852); SECTION_RODATA static u8 const lit_5853[12] = { 0x00, 0x1E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(809CA154, &lit_5853); +COMPILER_STRIP_GATE(0x809CA154, &lit_5853); #pragma pop /* 809CA160-809CA16C 0003C8 000C+00 0/1 0/0 0/0 .rodata @5854 */ @@ -3171,7 +3219,7 @@ COMPILER_STRIP_GATE(809CA154, &lit_5853); SECTION_RODATA static u8 const lit_5854[12] = { 0x00, 0x16, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809CA160, &lit_5854); +COMPILER_STRIP_GATE(0x809CA160, &lit_5854); #pragma pop /* 809CA16C-809CA174 0003D4 0008+00 0/1 0/0 0/0 .rodata @5855 */ @@ -3180,7 +3228,7 @@ COMPILER_STRIP_GATE(809CA160, &lit_5854); SECTION_RODATA static u8 const lit_5855[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809CA16C, &lit_5855); +COMPILER_STRIP_GATE(0x809CA16C, &lit_5855); #pragma pop /* 809CA174-809CA180 0003DC 000C+00 0/1 0/0 0/0 .rodata @5856 */ @@ -3189,7 +3237,7 @@ COMPILER_STRIP_GATE(809CA16C, &lit_5855); SECTION_RODATA static u8 const lit_5856[12] = { 0x00, 0x17, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809CA174, &lit_5856); +COMPILER_STRIP_GATE(0x809CA174, &lit_5856); #pragma pop /* 809CA180-809CA184 0003E8 0004+00 0/1 0/0 0/0 .rodata @5857 */ @@ -3201,7 +3249,7 @@ SECTION_RODATA static u8 const lit_5857[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(809CA180, &lit_5857); +COMPILER_STRIP_GATE(0x809CA180, &lit_5857); #pragma pop /* 809CA184-809CA190 0003EC 000C+00 0/1 0/0 0/0 .rodata @5858 */ @@ -3210,7 +3258,7 @@ COMPILER_STRIP_GATE(809CA180, &lit_5857); SECTION_RODATA static u8 const lit_5858[12] = { 0x00, 0x28, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(809CA184, &lit_5858); +COMPILER_STRIP_GATE(0x809CA184, &lit_5858); #pragma pop /* 809CA190-809CA19C 0003F8 000C+00 0/1 0/0 0/0 .rodata @5859 */ @@ -3219,7 +3267,7 @@ COMPILER_STRIP_GATE(809CA184, &lit_5858); SECTION_RODATA static u8 const lit_5859[12] = { 0x00, 0x29, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809CA190, &lit_5859); +COMPILER_STRIP_GATE(0x809CA190, &lit_5859); #pragma pop /* 809CA19C-809CA1A4 000404 0008+00 0/1 0/0 0/0 .rodata @5860 */ @@ -3228,7 +3276,7 @@ COMPILER_STRIP_GATE(809CA190, &lit_5859); SECTION_RODATA static u8 const lit_5860[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809CA19C, &lit_5860); +COMPILER_STRIP_GATE(0x809CA19C, &lit_5860); #pragma pop /* 809CA1A4-809CA1B0 00040C 000C+00 0/1 0/0 0/0 .rodata @5861 */ @@ -3237,7 +3285,7 @@ COMPILER_STRIP_GATE(809CA19C, &lit_5860); SECTION_RODATA static u8 const lit_5861[12] = { 0x00, 0x29, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809CA1A4, &lit_5861); +COMPILER_STRIP_GATE(0x809CA1A4, &lit_5861); #pragma pop /* 809CA1B0-809CA1B4 000418 0004+00 0/1 0/0 0/0 .rodata @5862 */ @@ -3249,7 +3297,7 @@ SECTION_RODATA static u8 const lit_5862[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(809CA1B0, &lit_5862); +COMPILER_STRIP_GATE(0x809CA1B0, &lit_5862); #pragma pop /* 809CA1B4-809CA1C0 00041C 000C+00 0/1 0/0 0/0 .rodata @5863 */ @@ -3258,7 +3306,7 @@ COMPILER_STRIP_GATE(809CA1B0, &lit_5862); SECTION_RODATA static u8 const lit_5863[12] = { 0x00, 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(809CA1B4, &lit_5863); +COMPILER_STRIP_GATE(0x809CA1B4, &lit_5863); #pragma pop /* 809CA1C0-809CA1CC 000428 000C+00 0/1 0/0 0/0 .rodata @5864 */ @@ -3267,7 +3315,7 @@ COMPILER_STRIP_GATE(809CA1B4, &lit_5863); SECTION_RODATA static u8 const lit_5864[12] = { 0x00, 0x2B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809CA1C0, &lit_5864); +COMPILER_STRIP_GATE(0x809CA1C0, &lit_5864); #pragma pop /* 809CA1CC-809CA1D4 000434 0008+00 0/1 0/0 0/0 .rodata @5865 */ @@ -3276,7 +3324,7 @@ COMPILER_STRIP_GATE(809CA1C0, &lit_5864); SECTION_RODATA static u8 const lit_5865[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809CA1CC, &lit_5865); +COMPILER_STRIP_GATE(0x809CA1CC, &lit_5865); #pragma pop /* 809CA1D4-809CA1E0 00043C 000C+00 0/1 0/0 0/0 .rodata @5866 */ @@ -3285,7 +3333,7 @@ COMPILER_STRIP_GATE(809CA1CC, &lit_5865); SECTION_RODATA static u8 const lit_5866[12] = { 0x00, 0x2B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809CA1D4, &lit_5866); +COMPILER_STRIP_GATE(0x809CA1D4, &lit_5866); #pragma pop /* 809CA1E0-809CA1E4 000448 0004+00 0/1 0/0 0/0 .rodata @5867 */ @@ -3297,7 +3345,7 @@ SECTION_RODATA static u8 const lit_5867[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(809CA1E0, &lit_5867); +COMPILER_STRIP_GATE(0x809CA1E0, &lit_5867); #pragma pop /* 809CA1E4-809CA1F0 00044C 000C+00 0/1 0/0 0/0 .rodata @5868 */ @@ -3306,7 +3354,7 @@ COMPILER_STRIP_GATE(809CA1E0, &lit_5867); SECTION_RODATA static u8 const lit_5868[12] = { 0x00, 0x2F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(809CA1E4, &lit_5868); +COMPILER_STRIP_GATE(0x809CA1E4, &lit_5868); #pragma pop /* 809CA1F0-809CA1FC 000458 000C+00 0/1 0/0 0/0 .rodata @5869 */ @@ -3315,7 +3363,7 @@ COMPILER_STRIP_GATE(809CA1E4, &lit_5868); SECTION_RODATA static u8 const lit_5869[12] = { 0x00, 0x16, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809CA1F0, &lit_5869); +COMPILER_STRIP_GATE(0x809CA1F0, &lit_5869); #pragma pop /* 809CA1FC-809CA204 000464 0008+00 0/1 0/0 0/0 .rodata @5870 */ @@ -3324,7 +3372,7 @@ COMPILER_STRIP_GATE(809CA1F0, &lit_5869); SECTION_RODATA static u8 const lit_5870[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809CA1FC, &lit_5870); +COMPILER_STRIP_GATE(0x809CA1FC, &lit_5870); #pragma pop /* 809CA204-809CA210 00046C 000C+00 0/1 0/0 0/0 .rodata @5871 */ @@ -3333,7 +3381,7 @@ COMPILER_STRIP_GATE(809CA1FC, &lit_5870); SECTION_RODATA static u8 const lit_5871[12] = { 0x00, 0x22, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809CA204, &lit_5871); +COMPILER_STRIP_GATE(0x809CA204, &lit_5871); #pragma pop /* 809CA210-809CA214 000478 0004+00 0/1 0/0 0/0 .rodata @5872 */ @@ -3345,7 +3393,7 @@ SECTION_RODATA static u8 const lit_5872[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(809CA210, &lit_5872); +COMPILER_STRIP_GATE(0x809CA210, &lit_5872); #pragma pop /* 809CA214-809CA220 00047C 000C+00 0/1 0/0 0/0 .rodata @5873 */ @@ -3354,7 +3402,7 @@ COMPILER_STRIP_GATE(809CA210, &lit_5872); SECTION_RODATA static u8 const lit_5873[12] = { 0x00, 0x23, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(809CA214, &lit_5873); +COMPILER_STRIP_GATE(0x809CA214, &lit_5873); #pragma pop /* 809CA220-809CA22C 000488 000C+00 0/1 0/0 0/0 .rodata @5874 */ @@ -3363,7 +3411,7 @@ COMPILER_STRIP_GATE(809CA214, &lit_5873); SECTION_RODATA static u8 const lit_5874[12] = { 0x00, 0x22, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809CA220, &lit_5874); +COMPILER_STRIP_GATE(0x809CA220, &lit_5874); #pragma pop /* 809CA22C-809CA234 000494 0008+00 0/1 0/0 0/0 .rodata @5875 */ @@ -3372,7 +3420,7 @@ COMPILER_STRIP_GATE(809CA220, &lit_5874); SECTION_RODATA static u8 const lit_5875[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809CA22C, &lit_5875); +COMPILER_STRIP_GATE(0x809CA22C, &lit_5875); #pragma pop /* 809CA234-809CA240 00049C 000C+00 0/1 0/0 0/0 .rodata @5876 */ @@ -3381,7 +3429,7 @@ COMPILER_STRIP_GATE(809CA22C, &lit_5875); SECTION_RODATA static u8 const lit_5876[12] = { 0x00, 0x24, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809CA234, &lit_5876); +COMPILER_STRIP_GATE(0x809CA234, &lit_5876); #pragma pop /* 809CA240-809CA244 0004A8 0004+00 0/1 0/0 0/0 .rodata @5877 */ @@ -3393,7 +3441,7 @@ SECTION_RODATA static u8 const lit_5877[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(809CA240, &lit_5877); +COMPILER_STRIP_GATE(0x809CA240, &lit_5877); #pragma pop /* 809CA244-809CA250 0004AC 000C+00 0/1 0/0 0/0 .rodata @5878 */ @@ -3402,7 +3450,7 @@ COMPILER_STRIP_GATE(809CA240, &lit_5877); SECTION_RODATA static u8 const lit_5878[12] = { 0x00, 0x25, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(809CA244, &lit_5878); +COMPILER_STRIP_GATE(0x809CA244, &lit_5878); #pragma pop /* 809CA250-809CA25C 0004B8 000C+00 0/1 0/0 0/0 .rodata @5879 */ @@ -3411,7 +3459,7 @@ COMPILER_STRIP_GATE(809CA244, &lit_5878); SECTION_RODATA static u8 const lit_5879[12] = { 0x00, 0x24, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809CA250, &lit_5879); +COMPILER_STRIP_GATE(0x809CA250, &lit_5879); #pragma pop /* 809CA25C-809CA264 0004C4 0008+00 0/1 0/0 0/0 .rodata @5880 */ @@ -3420,7 +3468,7 @@ COMPILER_STRIP_GATE(809CA250, &lit_5879); SECTION_RODATA static u8 const lit_5880[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809CA25C, &lit_5880); +COMPILER_STRIP_GATE(0x809CA25C, &lit_5880); #pragma pop /* 809CA264-809CA270 0004CC 000C+00 0/1 0/0 0/0 .rodata @5881 */ @@ -3429,7 +3477,7 @@ COMPILER_STRIP_GATE(809CA25C, &lit_5880); SECTION_RODATA static u8 const lit_5881[12] = { 0x00, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(809CA264, &lit_5881); +COMPILER_STRIP_GATE(0x809CA264, &lit_5881); #pragma pop /* 809CA270-809CA27C 0004D8 000C+00 0/1 0/0 0/0 .rodata @5882 */ @@ -3438,7 +3486,7 @@ COMPILER_STRIP_GATE(809CA264, &lit_5881); SECTION_RODATA static u8 const lit_5882[12] = { 0x00, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809CA270, &lit_5882); +COMPILER_STRIP_GATE(0x809CA270, &lit_5882); #pragma pop /* 809CA27C-809CA284 0004E4 0008+00 0/1 0/0 0/0 .rodata @5883 */ @@ -3447,7 +3495,7 @@ COMPILER_STRIP_GATE(809CA270, &lit_5882); SECTION_RODATA static u8 const lit_5883[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809CA27C, &lit_5883); +COMPILER_STRIP_GATE(0x809CA27C, &lit_5883); #pragma pop /* 809CA284-809CA290 0004EC 000C+00 0/1 0/0 0/0 .rodata @5884 */ @@ -3456,7 +3504,7 @@ COMPILER_STRIP_GATE(809CA27C, &lit_5883); SECTION_RODATA static u8 const lit_5884[12] = { 0x00, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809CA284, &lit_5884); +COMPILER_STRIP_GATE(0x809CA284, &lit_5884); #pragma pop /* 809CA290-809CA294 0004F8 0004+00 0/1 0/0 0/0 .rodata @5885 */ @@ -3468,7 +3516,7 @@ SECTION_RODATA static u8 const lit_5885[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(809CA290, &lit_5885); +COMPILER_STRIP_GATE(0x809CA290, &lit_5885); #pragma pop /* 809CA294-809CA2A0 0004FC 000C+00 0/1 0/0 0/0 .rodata @5886 */ @@ -3477,7 +3525,7 @@ COMPILER_STRIP_GATE(809CA290, &lit_5885); SECTION_RODATA static u8 const lit_5886[12] = { 0x00, 0x31, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(809CA294, &lit_5886); +COMPILER_STRIP_GATE(0x809CA294, &lit_5886); #pragma pop /* 809CA2A0-809CA2AC 000508 000C+00 0/1 0/0 0/0 .rodata @5887 */ @@ -3486,7 +3534,7 @@ COMPILER_STRIP_GATE(809CA294, &lit_5886); SECTION_RODATA static u8 const lit_5887[12] = { 0x00, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809CA2A0, &lit_5887); +COMPILER_STRIP_GATE(0x809CA2A0, &lit_5887); #pragma pop /* 809CA2AC-809CA2B4 000514 0008+00 0/1 0/0 0/0 .rodata @5888 */ @@ -3495,7 +3543,7 @@ COMPILER_STRIP_GATE(809CA2A0, &lit_5887); SECTION_RODATA static u8 const lit_5888[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809CA2AC, &lit_5888); +COMPILER_STRIP_GATE(0x809CA2AC, &lit_5888); #pragma pop /* 809CA2B4-809CA2C0 00051C 000C+00 0/1 0/0 0/0 .rodata @5889 */ @@ -3504,7 +3552,7 @@ COMPILER_STRIP_GATE(809CA2AC, &lit_5888); SECTION_RODATA static u8 const lit_5889[12] = { 0x00, 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809CA2B4, &lit_5889); +COMPILER_STRIP_GATE(0x809CA2B4, &lit_5889); #pragma pop /* 809CA2C0-809CA2C4 000528 0004+00 0/1 0/0 0/0 .rodata @5890 */ @@ -3516,7 +3564,7 @@ SECTION_RODATA static u8 const lit_5890[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(809CA2C0, &lit_5890); +COMPILER_STRIP_GATE(0x809CA2C0, &lit_5890); #pragma pop /* 809CA2C4-809CA2D0 00052C 000C+00 0/1 0/0 0/0 .rodata @5891 */ @@ -3525,7 +3573,7 @@ COMPILER_STRIP_GATE(809CA2C0, &lit_5890); SECTION_RODATA static u8 const lit_5891[12] = { 0x00, 0x1A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809CA2C4, &lit_5891); +COMPILER_STRIP_GATE(0x809CA2C4, &lit_5891); #pragma pop /* 809CA2D0-809CA2D4 000538 0004+00 0/1 0/0 0/0 .rodata @5892 */ @@ -3537,7 +3585,7 @@ SECTION_RODATA static u8 const lit_5892[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(809CA2D0, &lit_5892); +COMPILER_STRIP_GATE(0x809CA2D0, &lit_5892); #pragma pop /* 809CA2D4-809CA2E0 00053C 000C+00 0/1 0/0 0/0 .rodata @5893 */ @@ -3546,7 +3594,7 @@ COMPILER_STRIP_GATE(809CA2D0, &lit_5892); SECTION_RODATA static u8 const lit_5893[12] = { 0x00, 0x19, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(809CA2D4, &lit_5893); +COMPILER_STRIP_GATE(0x809CA2D4, &lit_5893); #pragma pop /* 809CA2E0-809CA2EC 000548 000C+00 0/1 0/0 0/0 .rodata @5894 */ @@ -3555,7 +3603,7 @@ COMPILER_STRIP_GATE(809CA2D4, &lit_5893); SECTION_RODATA static u8 const lit_5894[12] = { 0x00, 0x16, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809CA2E0, &lit_5894); +COMPILER_STRIP_GATE(0x809CA2E0, &lit_5894); #pragma pop /* 809CA2EC-809CA2F4 000554 0008+00 0/1 0/0 0/0 .rodata @5895 */ @@ -3564,7 +3612,7 @@ COMPILER_STRIP_GATE(809CA2E0, &lit_5894); SECTION_RODATA static u8 const lit_5895[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809CA2EC, &lit_5895); +COMPILER_STRIP_GATE(0x809CA2EC, &lit_5895); #pragma pop /* 809CA2F4-809CA300 00055C 000C+00 0/1 0/0 0/0 .rodata @5896 */ @@ -3573,7 +3621,7 @@ COMPILER_STRIP_GATE(809CA2EC, &lit_5895); SECTION_RODATA static u8 const lit_5896[12] = { 0x00, 0x1F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(809CA2F4, &lit_5896); +COMPILER_STRIP_GATE(0x809CA2F4, &lit_5896); #pragma pop /* 809CA300-809CA30C 000568 000C+00 0/1 0/0 0/0 .rodata @5897 */ @@ -3582,7 +3630,7 @@ COMPILER_STRIP_GATE(809CA2F4, &lit_5896); SECTION_RODATA static u8 const lit_5897[12] = { 0x00, 0x16, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809CA300, &lit_5897); +COMPILER_STRIP_GATE(0x809CA300, &lit_5897); #pragma pop /* 809CA30C-809CA314 000574 0008+00 0/1 0/0 0/0 .rodata @5898 */ @@ -3591,7 +3639,7 @@ COMPILER_STRIP_GATE(809CA300, &lit_5897); SECTION_RODATA static u8 const lit_5898[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809CA30C, &lit_5898); +COMPILER_STRIP_GATE(0x809CA30C, &lit_5898); #pragma pop /* 809CA314-809CA320 00057C 000C+00 0/1 0/0 0/0 .rodata @5899 */ @@ -3600,7 +3648,7 @@ COMPILER_STRIP_GATE(809CA30C, &lit_5898); SECTION_RODATA static u8 const lit_5899[12] = { 0x00, 0x1C, 0x00, 0x00, 0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809CA314, &lit_5899); +COMPILER_STRIP_GATE(0x809CA314, &lit_5899); #pragma pop /* 809CA320-809CA324 000588 0004+00 0/1 0/0 0/0 .rodata @5900 */ @@ -3612,7 +3660,7 @@ SECTION_RODATA static u8 const lit_5900[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(809CA320, &lit_5900); +COMPILER_STRIP_GATE(0x809CA320, &lit_5900); #pragma pop /* 809CA324-809CA330 00058C 000C+00 0/1 0/0 0/0 .rodata @5901 */ @@ -3621,7 +3669,7 @@ COMPILER_STRIP_GATE(809CA320, &lit_5900); SECTION_RODATA static u8 const lit_5901[12] = { 0x00, 0x20, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809CA324, &lit_5901); +COMPILER_STRIP_GATE(0x809CA324, &lit_5901); #pragma pop /* 809CA330-809CA334 000598 0004+00 0/1 0/0 0/0 .rodata @5902 */ @@ -3633,7 +3681,7 @@ SECTION_RODATA static u8 const lit_5902[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(809CA330, &lit_5902); +COMPILER_STRIP_GATE(0x809CA330, &lit_5902); #pragma pop /* 809CA334-809CA340 00059C 000C+00 0/1 0/0 0/0 .rodata @5903 */ @@ -3642,7 +3690,7 @@ COMPILER_STRIP_GATE(809CA330, &lit_5902); SECTION_RODATA static u8 const lit_5903[12] = { 0x00, 0x21, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809CA334, &lit_5903); +COMPILER_STRIP_GATE(0x809CA334, &lit_5903); #pragma pop /* 809CA340-809CA344 0005A8 0004+00 0/1 0/0 0/0 .rodata @5904 */ @@ -3654,7 +3702,7 @@ SECTION_RODATA static u8 const lit_5904[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(809CA340, &lit_5904); +COMPILER_STRIP_GATE(0x809CA340, &lit_5904); #pragma pop /* 809CA344-809CA350 0005AC 000C+00 0/1 0/0 0/0 .rodata @5905 */ @@ -3663,7 +3711,7 @@ COMPILER_STRIP_GATE(809CA340, &lit_5904); SECTION_RODATA static u8 const lit_5905[12] = { 0x00, 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809CA344, &lit_5905); +COMPILER_STRIP_GATE(0x809CA344, &lit_5905); #pragma pop /* 809CA350-809CA354 0005B8 0004+00 0/1 0/0 0/0 .rodata @5906 */ @@ -3675,7 +3723,7 @@ SECTION_RODATA static u8 const lit_5906[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(809CA350, &lit_5906); +COMPILER_STRIP_GATE(0x809CA350, &lit_5906); #pragma pop /* 809CA354-809CA360 0005BC 000C+00 0/1 0/0 0/0 .rodata @5907 */ @@ -3684,7 +3732,7 @@ COMPILER_STRIP_GATE(809CA350, &lit_5906); SECTION_RODATA static u8 const lit_5907[12] = { 0x00, 0x2D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809CA354, &lit_5907); +COMPILER_STRIP_GATE(0x809CA354, &lit_5907); #pragma pop /* 809CA360-809CA364 0005C8 0004+00 0/1 0/0 0/0 .rodata @5908 */ @@ -3696,7 +3744,7 @@ SECTION_RODATA static u8 const lit_5908[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(809CA360, &lit_5908); +COMPILER_STRIP_GATE(0x809CA360, &lit_5908); #pragma pop /* 809CA364-809CA370 0005CC 000C+00 0/1 0/0 0/0 .rodata @5909 */ @@ -3705,7 +3753,7 @@ COMPILER_STRIP_GATE(809CA360, &lit_5908); SECTION_RODATA static u8 const lit_5909[12] = { 0x00, 0x2E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(809CA364, &lit_5909); +COMPILER_STRIP_GATE(0x809CA364, &lit_5909); #pragma pop /* 809CA370-809CA37C 0005D8 000C+00 0/1 0/0 0/0 .rodata @5910 */ @@ -3714,7 +3762,7 @@ COMPILER_STRIP_GATE(809CA364, &lit_5909); SECTION_RODATA static u8 const lit_5910[12] = { 0x00, 0x29, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809CA370, &lit_5910); +COMPILER_STRIP_GATE(0x809CA370, &lit_5910); #pragma pop /* 809CA37C-809CA384 0005E4 0008+00 0/1 0/0 0/0 .rodata @5911 */ @@ -3723,7 +3771,7 @@ COMPILER_STRIP_GATE(809CA370, &lit_5910); SECTION_RODATA static u8 const lit_5911[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809CA37C, &lit_5911); +COMPILER_STRIP_GATE(0x809CA37C, &lit_5911); #pragma pop /* 809CA384-809CA390 0005EC 000C+00 0/1 0/0 0/0 .rodata @5912 */ @@ -3732,7 +3780,7 @@ COMPILER_STRIP_GATE(809CA37C, &lit_5911); SECTION_RODATA static u8 const lit_5912[12] = { 0x00, 0x26, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809CA384, &lit_5912); +COMPILER_STRIP_GATE(0x809CA384, &lit_5912); #pragma pop /* 809CA390-809CA394 0005F8 0004+00 0/1 0/0 0/0 .rodata @5913 */ @@ -3744,7 +3792,7 @@ SECTION_RODATA static u8 const lit_5913[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(809CA390, &lit_5913); +COMPILER_STRIP_GATE(0x809CA390, &lit_5913); #pragma pop /* 809C2080-809C28BC 003820 083C+00 1/1 0/0 0/0 .text playMotion__11daNpc_grA_cFv */ @@ -3762,7 +3810,7 @@ asm void daNpc_grA_c::playMotion() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpc_grA_c::chkAction(int (daNpc_grA_c::*)(void*)) { +asm void daNpc_grA_c::chkAction(int (daNpc_grA_c::*param_0)(void*)) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_gra/d_a_npc_gra/chkAction__11daNpc_grA_cFM11daNpc_grA_cFPCvPvPv_i.s" } @@ -3773,7 +3821,7 @@ asm void daNpc_grA_c::chkAction(int (daNpc_grA_c::*)(void*)) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpc_grA_c::setAction(int (daNpc_grA_c::*)(void*)) { +asm void daNpc_grA_c::setAction(int (daNpc_grA_c::*param_0)(void*)) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_gra/d_a_npc_gra/setAction__11daNpc_grA_cFM11daNpc_grA_cFPCvPvPv_i.s" } @@ -3803,12 +3851,12 @@ SECTION_RODATA static u8 const lit_5914[116] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809CA394, &lit_5914); +COMPILER_STRIP_GATE(0x809CA394, &lit_5914); #pragma pop /* 809CA408-809CA40C 000670 0004+00 13/26 0/0 0/0 .rodata @6106 */ SECTION_RODATA static f32 const lit_6106 = -1.0f; -COMPILER_STRIP_GATE(809CA408, &lit_6106); +COMPILER_STRIP_GATE(0x809CA408, &lit_6106); /* 809C2C3C-809C3070 0043DC 0434+00 1/1 0/0 0/0 .text doEvent__11daNpc_grA_cFv */ #pragma push @@ -3837,28 +3885,28 @@ asm void daNpc_grA_c::setLookMode(int param_0) { SECTION_RODATA static u8 const lit_6118[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809CA40C, &lit_6118); +COMPILER_STRIP_GATE(0x809CA40C, &lit_6118); #pragma pop /* 809CA418-809CA41C 000680 0004+00 0/1 0/0 0/0 .rodata @6220 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6220 = 80.0f; -COMPILER_STRIP_GATE(809CA418, &lit_6220); +COMPILER_STRIP_GATE(0x809CA418, &lit_6220); #pragma pop /* 809CA41C-809CA420 000684 0004+00 0/1 0/0 0/0 .rodata @6221 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6221 = 40.0f; -COMPILER_STRIP_GATE(809CA41C, &lit_6221); +COMPILER_STRIP_GATE(0x809CA41C, &lit_6221); #pragma pop /* 809CA420-809CA424 000688 0004+00 0/1 0/0 0/0 .rodata @6222 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6222 = 160.0f; -COMPILER_STRIP_GATE(809CA420, &lit_6222); +COMPILER_STRIP_GATE(0x809CA420, &lit_6222); #pragma pop /* 809C3094-809C3424 004834 0390+00 1/1 0/0 0/0 .text lookat__11daNpc_grA_cFv */ @@ -3896,14 +3944,14 @@ asm void daNpc_grA_c::setExpressionTalkAfter() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6363 = 2.0f; -COMPILER_STRIP_GATE(809CA424, &lit_6363); +COMPILER_STRIP_GATE(0x809CA424, &lit_6363); #pragma pop /* 809CA428-809CA42C 000690 0004+00 0/2 0/0 0/0 .rodata @6364 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6364 = 3.0f; -COMPILER_STRIP_GATE(809CA428, &lit_6364); +COMPILER_STRIP_GATE(0x809CA428, &lit_6364); #pragma pop /* 809C36AC-809C389C 004E4C 01F0+00 1/1 0/0 0/0 .text setPrtcl__11daNpc_grA_cFv */ @@ -3931,14 +3979,14 @@ SECTION_RODATA static u8 const l_prticles_id[6 + 2 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(809CA42C, &l_prticles_id); +COMPILER_STRIP_GATE(0x809CA42C, &l_prticles_id); #pragma pop /* 809CA434-809CA438 00069C 0004+00 0/1 0/0 0/0 .rodata @6442 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6442 = 7.0f / 100.0f; -COMPILER_STRIP_GATE(809CA434, &lit_6442); +COMPILER_STRIP_GATE(0x809CA434, &lit_6442); #pragma pop /* 809C389C-809C3A54 00503C 01B8+00 5/5 0/0 0/0 .text setRollPrtcl__11daNpc_grA_cFRC4cXyzf */ @@ -3956,7 +4004,7 @@ asm void daNpc_grA_c::setRollPrtcl(cXyz const& param_0, f32 param_1) { SECTION_RODATA static u8 const lit_6463[8] = { 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809CA438, &lit_6463); +COMPILER_STRIP_GATE(0x809CA438, &lit_6463); /* 809C3A54-809C3B28 0051F4 00D4+00 1/1 0/0 0/0 .text setOtherObjMtx__11daNpc_grA_cFv */ #pragma push @@ -3973,7 +4021,13 @@ asm void daNpc_grA_c::setOtherObjMtx() { SECTION_RODATA static u8 const lit_6467[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809CA440, &lit_6467); +COMPILER_STRIP_GATE(0x809CA440, &lit_6467); + +/* 809CA4B8-809CA4B8 000720 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_809CA5FE = "prm"; +#pragma pop /* 809C3B28-809C3D78 0052C8 0250+00 1/0 0/0 0/0 .text ECut_talkSpa__11daNpc_grA_cFi */ #pragma push @@ -3990,63 +4044,63 @@ asm void daNpc_grA_c::ECut_talkSpa(int param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6810 = 14.0f; -COMPILER_STRIP_GATE(809CA448, &lit_6810); +COMPILER_STRIP_GATE(0x809CA448, &lit_6810); #pragma pop /* 809CA44C-809CA450 0006B4 0004+00 0/4 0/0 0/0 .rodata @6811 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6811 = 20.0f; -COMPILER_STRIP_GATE(809CA44C, &lit_6811); +COMPILER_STRIP_GATE(0x809CA44C, &lit_6811); #pragma pop /* 809CA450-809CA454 0006B8 0004+00 0/1 0/0 0/0 .rodata @6812 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6812 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(809CA450, &lit_6812); +COMPILER_STRIP_GATE(0x809CA450, &lit_6812); #pragma pop /* 809CA454-809CA458 0006BC 0004+00 0/1 0/0 0/0 .rodata @6813 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6813 = 0.25f; -COMPILER_STRIP_GATE(809CA454, &lit_6813); +COMPILER_STRIP_GATE(0x809CA454, &lit_6813); #pragma pop /* 809CA458-809CA45C 0006C0 0004+00 0/5 0/0 0/0 .rodata @6814 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6814 = 5.0f; -COMPILER_STRIP_GATE(809CA458, &lit_6814); +COMPILER_STRIP_GATE(0x809CA458, &lit_6814); #pragma pop /* 809CA45C-809CA460 0006C4 0004+00 0/1 0/0 0/0 .rodata @6815 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6815 = 12.0f; -COMPILER_STRIP_GATE(809CA45C, &lit_6815); +COMPILER_STRIP_GATE(0x809CA45C, &lit_6815); #pragma pop /* 809CA460-809CA464 0006C8 0004+00 0/3 0/0 0/0 .rodata @6816 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6816 = 10.0f; -COMPILER_STRIP_GATE(809CA460, &lit_6816); +COMPILER_STRIP_GATE(0x809CA460, &lit_6816); #pragma pop /* 809CA464-809CA468 0006CC 0004+00 0/1 0/0 0/0 .rodata @6817 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6817 = 11.0f; -COMPILER_STRIP_GATE(809CA464, &lit_6817); +COMPILER_STRIP_GATE(0x809CA464, &lit_6817); #pragma pop /* 809CA468-809CA46C 0006D0 0004+00 0/4 0/0 0/0 .rodata @6818 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6818 = 127.0f; -COMPILER_STRIP_GATE(809CA468, &lit_6818); +COMPILER_STRIP_GATE(0x809CA468, &lit_6818); #pragma pop /* 809C3D78-809C45B0 005518 0838+00 1/0 0/0 0/0 .text ECut_grDSRoll__11daNpc_grA_cFi */ @@ -4064,7 +4118,7 @@ asm void daNpc_grA_c::ECut_grDSRoll(int param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6865 = 30.0f / 11.0f; -COMPILER_STRIP_GATE(809CA46C, &lit_6865); +COMPILER_STRIP_GATE(0x809CA46C, &lit_6865); #pragma pop /* 809C45B0-809C47EC 005D50 023C+00 1/0 0/0 0/0 .text ECut_grDSGate__11daNpc_grA_cFi */ @@ -4113,28 +4167,28 @@ asm void daNpc_grA_c::ECut_noneLook(int param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7127 = 41.0f; -COMPILER_STRIP_GATE(809CA470, &lit_7127); +COMPILER_STRIP_GATE(0x809CA470, &lit_7127); #pragma pop /* 809CA474-809CA478 0006DC 0004+00 0/1 0/0 0/0 .rodata @7128 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7128 = -0.5f; -COMPILER_STRIP_GATE(809CA474, &lit_7128); +COMPILER_STRIP_GATE(0x809CA474, &lit_7128); #pragma pop /* 809CA478-809CA47C 0006E0 0004+00 0/1 0/0 0/0 .rodata @7129 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7129 = 3.0f / 100.0f; -COMPILER_STRIP_GATE(809CA478, &lit_7129); +COMPILER_STRIP_GATE(0x809CA478, &lit_7129); #pragma pop /* 809CA47C-809CA480 0006E4 0004+00 0/1 0/0 0/0 .rodata @7130 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7130 = 8.0f; -COMPILER_STRIP_GATE(809CA47C, &lit_7130); +COMPILER_STRIP_GATE(0x809CA47C, &lit_7130); #pragma pop /* 809C5088-809C5430 006828 03A8+00 1/0 0/0 0/0 .text ECut_rescueRock__11daNpc_grA_cFi */ @@ -4163,28 +4217,28 @@ asm void daNpc_grA_c::ECut_carrySpaWater(int param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7374 = 250.0f; -COMPILER_STRIP_GATE(809CA480, &lit_7374); +COMPILER_STRIP_GATE(0x809CA480, &lit_7374); #pragma pop /* 809CA484-809CA488 0006EC 0004+00 0/2 0/0 0/0 .rodata @7375 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7375 = 200.0f; -COMPILER_STRIP_GATE(809CA484, &lit_7375); +COMPILER_STRIP_GATE(0x809CA484, &lit_7375); #pragma pop /* 809CA488-809CA48C 0006F0 0004+00 0/0 0/0 0/0 .rodata @7376 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7376 = 18.0f; -COMPILER_STRIP_GATE(809CA488, &lit_7376); +COMPILER_STRIP_GATE(0x809CA488, &lit_7376); #pragma pop /* 809CA48C-809CA490 0006F4 0004+00 0/1 0/0 0/0 .rodata @7423 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7423 = 21.0f; -COMPILER_STRIP_GATE(809CA48C, &lit_7423); +COMPILER_STRIP_GATE(0x809CA48C, &lit_7423); #pragma pop /* 809C5D44-809C5F90 0074E4 024C+00 1/0 0/0 0/0 .text ECut_carrySpaWaterFailure__11daNpc_grA_cFi @@ -4203,28 +4257,28 @@ asm void daNpc_grA_c::ECut_carrySpaWaterFailure(int param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7576 = 79.0f; -COMPILER_STRIP_GATE(809CA490, &lit_7576); +COMPILER_STRIP_GATE(0x809CA490, &lit_7576); #pragma pop /* 809CA494-809CA498 0006FC 0004+00 0/1 0/0 0/0 .rodata @7577 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7577 = 7.0f; -COMPILER_STRIP_GATE(809CA494, &lit_7577); +COMPILER_STRIP_GATE(0x809CA494, &lit_7577); #pragma pop /* 809CA498-809CA49C 000700 0004+00 0/1 0/0 0/0 .rodata @7578 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7578 = 93.0f; -COMPILER_STRIP_GATE(809CA498, &lit_7578); +COMPILER_STRIP_GATE(0x809CA498, &lit_7578); #pragma pop /* 809CA49C-809CA4A0 000704 0004+00 0/1 0/0 0/0 .rodata @7579 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7579 = 94.0f; -COMPILER_STRIP_GATE(809CA49C, &lit_7579); +COMPILER_STRIP_GATE(0x809CA49C, &lit_7579); #pragma pop /* 809C5F90-809C6608 007730 0678+00 1/0 0/0 0/0 .text ECut_rollRockCrash__11daNpc_grA_cFi @@ -4241,7 +4295,7 @@ asm void daNpc_grA_c::ECut_rollRockCrash(int param_0) { /* ############################################################################################## */ /* 809CA4A0-809CA4A4 000708 0004+00 1/1 0/0 0/0 .rodata @7629 */ SECTION_RODATA static f32 const lit_7629 = 500.0f; -COMPILER_STRIP_GATE(809CA4A0, &lit_7629); +COMPILER_STRIP_GATE(0x809CA4A0, &lit_7629); /* 809C6608-809C681C 007DA8 0214+00 1/0 0/0 0/0 .text ECut_talkSpaWater__11daNpc_grA_cFi */ @@ -4329,7 +4383,7 @@ asm void daNpc_grA_c::spaWarm(void* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8136 = 1200.0f; -COMPILER_STRIP_GATE(809CA4A4, &lit_8136); +COMPILER_STRIP_GATE(0x809CA4A4, &lit_8136); #pragma pop /* 809C7ACC-809C7F24 00926C 0458+00 3/0 0/0 0/0 .text waitSpaWater__11daNpc_grA_cFPv */ @@ -4382,7 +4436,7 @@ SECTION_RODATA static f32 const lit_8269[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(809CA4A8, &lit_8269); +COMPILER_STRIP_GATE(0x809CA4A8, &lit_8269); #pragma pop /* 809C8514-809C8694 009CB4 0180+00 1/0 0/0 0/0 .text crashRoll__11daNpc_grA_cFPv */ @@ -4425,6 +4479,13 @@ asm void daNpc_grA_c::waitBuyer(void* param_0) { } #pragma pop +/* ############################################################################################## */ +/* 809CA4B8-809CA4B8 000720 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_809CA602 = "DEFAULT_GETITEM"; +#pragma pop + /* 809C8BD4-809C9044 00A374 0470+00 2/0 0/0 0/0 .text talk__11daNpc_grA_cFPv */ #pragma push #pragma optimization_level 0 @@ -4669,7 +4730,7 @@ asm cCcD_GStts::~cCcD_GStts() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_809C9AC8(s16* param_0) { +extern "C" asm void func_809C9AC8(void* _this, s16* param_0) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_gra/d_a_npc_gra/func_809C9AC8.s" } @@ -4679,7 +4740,7 @@ extern "C" asm void func_809C9AC8(s16* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_809C9AE4(int* param_0) { +extern "C" asm void func_809C9AE4(void* _this, int* param_0) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_gra/d_a_npc_gra/func_809C9AE4.s" } @@ -4690,13 +4751,13 @@ extern "C" asm void func_809C9AE4(int* param_0) { SECTION_RODATA static u8 const lit_8542[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809CA4B0, &lit_8542); +COMPILER_STRIP_GATE(0x809CA4B0, &lit_8542); /* 809C9B00-809C9B7C 00B2A0 007C+00 3/3 0/0 0/0 .text cLib_getRndValue__Fii */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_809C9B00(int param_0, int param_1) { +extern "C" asm void func_809C9B00(void* _this, int param_0, int param_1) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_gra/d_a_npc_gra/func_809C9B00.s" } @@ -4722,7 +4783,7 @@ asm void __sinit_d_a_npc_gra_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_809C9B7C = (void*)__sinit_d_a_npc_gra_cpp; +REGISTER_CTORS(0x809C9B7C, __sinit_d_a_npc_gra_cpp); #pragma pop /* 809C9CF8-809C9D0C 00B498 0014+00 2/2 0/0 0/0 .text getGraAngle__10daTagGra_cFv */ @@ -4953,43 +5014,4 @@ static u8 data_809CB3C0[4]; static u8 data_809CB3C4[4]; #pragma pop -/* 809CA4B8-809CA612 000720 015A+00 18/14 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_809CA4B8 = "TALK_SPA"; -SECTION_DEAD static char const* const stringBase_809CA4C1 = "TEACH_ELV"; -SECTION_DEAD static char const* const stringBase_809CA4CB = "KICK_OUT"; -SECTION_DEAD static char const* const stringBase_809CA4D4 = "KICK_OUT_BREAK"; -SECTION_DEAD static char const* const stringBase_809CA4E3 = "NONE_LOOK"; -SECTION_DEAD static char const* const stringBase_809CA4ED = "RESCUE_ROCK"; -SECTION_DEAD static char const* const stringBase_809CA4F9 = "CARRY_SPA_WATER"; -SECTION_DEAD static char const* const stringBase_809CA509 = "CARRY_SPA_WATER_FAILURE"; -SECTION_DEAD static char const* const stringBase_809CA521 = "TALK_SPA_WATER"; -SECTION_DEAD static char const* const stringBase_809CA530 = "ROLL_ROCK_CRASH"; -SECTION_DEAD static char const* const stringBase_809CA540 = "grA_base"; -SECTION_DEAD static char const* const stringBase_809CA549 = "grA_mdl"; -SECTION_DEAD static char const* const stringBase_809CA551 = "grA_TW"; -SECTION_DEAD static char const* const stringBase_809CA558 = "grA_SPA"; -SECTION_DEAD static char const* const stringBase_809CA560 = "grA_Sdemo"; -SECTION_DEAD static char const* const stringBase_809CA56A = "grA_Elv"; -SECTION_DEAD static char const* const stringBase_809CA572 = "grA_Kick"; -SECTION_DEAD static char const* const stringBase_809CA57B = "grA_Rock"; -SECTION_DEAD static char const* const stringBase_809CA584 = "grA_RockD"; -SECTION_DEAD static char const* const stringBase_809CA58E = "grA_SWD"; -SECTION_DEAD static char const* const stringBase_809CA596 = "grA_onsen"; -SECTION_DEAD static char const* const stringBase_809CA5A0 = "grA_onsn2"; -SECTION_DEAD static char const* const stringBase_809CA5AA = "maroTaru"; -SECTION_DEAD static char const* const stringBase_809CA5B3 = "grA_RCD"; -SECTION_DEAD static char const* const stringBase_809CA5BB = "grA_gate"; -SECTION_DEAD static char const* const stringBase_809CA5C4 = "grA_town"; -SECTION_DEAD static char const* const stringBase_809CA5CD = "grA"; -SECTION_DEAD static char const* const stringBase_809CA5D1 = "grA_spa"; -SECTION_DEAD static char const* const stringBase_809CA5D9 = ""; -SECTION_DEAD static char const* const stringBase_809CA5DA = "GRDS_ROLL"; -SECTION_DEAD static char const* const stringBase_809CA5E4 = "GRDS_GATE"; -SECTION_DEAD static char const* const stringBase_809CA5EE = "F_SP109"; -SECTION_DEAD static char const* const stringBase_809CA5F6 = "F_SP121"; -SECTION_DEAD static char const* const stringBase_809CA5FE = "prm"; -SECTION_DEAD static char const* const stringBase_809CA602 = "DEFAULT_GETITEM"; -#pragma pop +/* 809CA4B8-809CA4B8 000720 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/npc/d_a_npc_grc/d_a_npc_grc.cpp b/rel/d/a/npc/d_a_npc_grc/d_a_npc_grc.cpp index d4f0ff7074b..ea8cf7eb997 100644 --- a/rel/d/a/npc/d_a_npc_grc/d_a_npc_grc.cpp +++ b/rel/d/a/npc/d_a_npc_grc/d_a_npc_grc.cpp @@ -23,12 +23,12 @@ struct mDoExt_bckAnm { /* 8000D990 */ void changeBckOnly(J3DAnmTransform*); }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; +struct J3DModelData {}; + struct Vec {}; struct Z2Creature { @@ -49,10 +49,10 @@ struct fopAc_ac_c { /* 80018C8C */ ~fopAc_ac_c(); }; -struct J3DJoint {}; - struct J3DModel {}; +struct J3DJoint {}; + struct daNpc_grC_c { /* 809CB4CC */ daNpc_grC_c(); /* 809CB6E0 */ ~daNpc_grC_c(); @@ -113,20 +113,20 @@ struct dCcD_GObjInf { /* 800840E4 */ ~dCcD_GObjInf(); }; +struct J3DAnmTexPattern {}; + struct J3DAnmTextureSRTKey {}; +struct J3DAnmTransformKey {}; + +struct _GXColorS10 {}; + struct dCcD_SrcCyl {}; struct dCcD_Cyl { /* 800848B4 */ void Set(dCcD_SrcCyl const&); }; -struct _GXColorS10 {}; - -struct J3DAnmTexPattern {}; - -struct J3DAnmTransformKey {}; - struct daNpcF_c { struct daNpcF_anmPlayData {}; @@ -201,6 +201,8 @@ struct dRes_control_c { /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); }; +struct dKy_tevstr_c {}; + struct dBgS_AcchCir { /* 80075EAC */ dBgS_AcchCir(); /* 80075F40 */ void SetWallR(f32); @@ -217,8 +219,6 @@ struct dBgS_Acch { /* 80076AAC */ void CrrPos(dBgS&); }; -struct dKy_tevstr_c {}; - struct dPaPo_c { /* 80050C9C */ void init(dBgS_Acch*, f32, f32); /* 80051008 */ void setEffectCenter(dKy_tevstr_c const*, cXyz const*, u32, u32, cXyz const*, @@ -234,7 +234,6 @@ struct dMsgFlow_c { struct dEvt_control_c { /* 80042468 */ void reset(); /* 80042518 */ void reset(void*); - /* 800436EC */ void setPtI_Id(unsigned int); }; struct dEvent_manager_c { @@ -553,6 +552,15 @@ extern "C" void __register_global_object(); // /* ############################################################################################## */ +/* 809CF7F0-809CF7F0 0002D4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_809CF7F0 = "grC"; +SECTION_DEAD static char const* const stringBase_809CF7F4 = "grC_Mdl"; +SECTION_DEAD static char const* const stringBase_809CF7FC = "grC_TW"; +SECTION_DEAD static char const* const stringBase_809CF803 = ""; +#pragma pop + /* 809CF81C-809CF828 000000 000C+00 4/4 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -939,34 +947,34 @@ SECTION_RODATA u8 const daNpc_grC_Param_c::m[108] = { 0x43, 0x34, 0x00, 0x00, 0x43, 0xFA, 0x00, 0x00, 0x43, 0x96, 0x00, 0x00, 0xC3, 0x96, 0x00, 0x00, 0x00, 0x3C, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809CF51C, &daNpc_grC_Param_c::m); +COMPILER_STRIP_GATE(0x809CF51C, &daNpc_grC_Param_c::m); /* 809CF588-809CF58C 00006C 0004+00 0/1 0/0 0/0 .rodata @4397 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4397 = -300.0f; -COMPILER_STRIP_GATE(809CF588, &lit_4397); +COMPILER_STRIP_GATE(0x809CF588, &lit_4397); #pragma pop /* 809CF58C-809CF590 000070 0004+00 0/1 0/0 0/0 .rodata @4398 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4398 = -50.0f; -COMPILER_STRIP_GATE(809CF58C, &lit_4398); +COMPILER_STRIP_GATE(0x809CF58C, &lit_4398); #pragma pop /* 809CF590-809CF594 000074 0004+00 0/1 0/0 0/0 .rodata @4399 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4399 = 300.0f; -COMPILER_STRIP_GATE(809CF590, &lit_4399); +COMPILER_STRIP_GATE(0x809CF590, &lit_4399); #pragma pop /* 809CF594-809CF598 000078 0004+00 0/1 0/0 0/0 .rodata @4400 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4400 = 450.0f; -COMPILER_STRIP_GATE(809CF594, &lit_4400); +COMPILER_STRIP_GATE(0x809CF594, &lit_4400); #pragma pop /* 809CB8E0-809CBBD4 000500 02F4+00 1/1 0/0 0/0 .text create__11daNpc_grC_cFv */ @@ -982,7 +990,7 @@ asm void daNpc_grC_c::create() { /* ############################################################################################## */ /* 809CF598-809CF59C 00007C 0004+00 5/5 0/0 0/0 .rodata @4454 */ SECTION_RODATA static f32 const lit_4454 = 1.0f; -COMPILER_STRIP_GATE(809CF598, &lit_4454); +COMPILER_STRIP_GATE(0x809CF598, &lit_4454); /* 809CF59C-809CF5A0 000080 0004+00 4/6 0/0 0/0 .rodata @4455 */ SECTION_RODATA static u8 const lit_4455[4] = { @@ -991,7 +999,7 @@ SECTION_RODATA static u8 const lit_4455[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(809CF59C, &lit_4455); +COMPILER_STRIP_GATE(0x809CF59C, &lit_4455); /* 809CBBD4-809CBDC4 0007F4 01F0+00 1/1 0/0 0/0 .text CreateHeap__11daNpc_grC_cFv */ #pragma push @@ -1038,7 +1046,7 @@ asm void daNpc_grC_c::Draw() { SECTION_RODATA static u8 const lit_4478[12] = { 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x04, }; -COMPILER_STRIP_GATE(809CF5A0, &lit_4478); +COMPILER_STRIP_GATE(0x809CF5A0, &lit_4478); /* 809CBE8C-809CC0C0 000AAC 0234+00 1/1 0/0 0/0 .text * ctrlJoint__11daNpc_grC_cFP8J3DJointP8J3DModel */ @@ -1103,28 +1111,28 @@ bool daNpc_grC_c::ctrlBtk() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4839 = 16.0f; -COMPILER_STRIP_GATE(809CF5AC, &lit_4839); +COMPILER_STRIP_GATE(0x809CF5AC, &lit_4839); #pragma pop /* 809CF5B0-809CF5B4 000094 0004+00 0/1 0/0 0/0 .rodata @4840 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4840 = 60.0f; -COMPILER_STRIP_GATE(809CF5B0, &lit_4840); +COMPILER_STRIP_GATE(0x809CF5B0, &lit_4840); #pragma pop /* 809CF5B4-809CF5B8 000098 0004+00 0/1 0/0 0/0 .rodata @4841 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4841 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(809CF5B4, &lit_4841); +COMPILER_STRIP_GATE(0x809CF5B4, &lit_4841); #pragma pop /* 809CF5B8-809CF5BC 00009C 0004+00 0/1 0/0 0/0 .rodata @4842 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4842 = 125.0f; -COMPILER_STRIP_GATE(809CF5B8, &lit_4842); +COMPILER_STRIP_GATE(0x809CF5B8, &lit_4842); #pragma pop /* 809CF5BC-809CF5C4 0000A0 0008+00 0/1 0/0 0/0 .rodata @4843 */ @@ -1133,7 +1141,7 @@ COMPILER_STRIP_GATE(809CF5B8, &lit_4842); SECTION_RODATA static u8 const lit_4843[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809CF5BC, &lit_4843); +COMPILER_STRIP_GATE(0x809CF5BC, &lit_4843); #pragma pop /* 809CF5C4-809CF5CC 0000A8 0008+00 0/1 0/0 0/0 .rodata @4844 */ @@ -1142,7 +1150,7 @@ COMPILER_STRIP_GATE(809CF5BC, &lit_4843); SECTION_RODATA static u8 const lit_4844[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809CF5C4, &lit_4844); +COMPILER_STRIP_GATE(0x809CF5C4, &lit_4844); #pragma pop /* 809CF5CC-809CF5D4 0000B0 0008+00 0/1 0/0 0/0 .rodata @4845 */ @@ -1151,7 +1159,7 @@ COMPILER_STRIP_GATE(809CF5C4, &lit_4844); SECTION_RODATA static u8 const lit_4845[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809CF5CC, &lit_4845); +COMPILER_STRIP_GATE(0x809CF5CC, &lit_4845); #pragma pop /* 809CFB68-809CFB6C 000008 0001+03 1/1 0/0 0/0 .bss @1109 */ @@ -1361,7 +1369,7 @@ asm void daNpc_grC_c::isDelete() { /* ############################################################################################## */ /* 809CF5D4-809CF5D8 0000B8 0004+00 8/8 0/0 0/0 .rodata @5043 */ SECTION_RODATA static f32 const lit_5043 = -1.0f; -COMPILER_STRIP_GATE(809CF5D4, &lit_5043); +COMPILER_STRIP_GATE(0x809CF5D4, &lit_5043); /* 809CCFBC-809CD1B4 001BDC 01F8+00 1/1 0/0 0/0 .text reset__11daNpc_grC_cFv */ #pragma push @@ -1380,7 +1388,7 @@ asm void daNpc_grC_c::reset() { SECTION_RODATA static u8 const lit_5047[12] = { 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(809CF5D8, &lit_5047); +COMPILER_STRIP_GATE(0x809CF5D8, &lit_5047); #pragma pop /* 809CF5E4-809CF5F0 0000C8 000C+00 0/1 0/0 0/0 .rodata @5048 */ @@ -1389,7 +1397,7 @@ COMPILER_STRIP_GATE(809CF5D8, &lit_5047); SECTION_RODATA static u8 const lit_5048[12] = { 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809CF5E4, &lit_5048); +COMPILER_STRIP_GATE(0x809CF5E4, &lit_5048); #pragma pop /* 809CF5F0-809CF5F8 0000D4 0008+00 0/1 0/0 0/0 .rodata @5049 */ @@ -1398,7 +1406,7 @@ COMPILER_STRIP_GATE(809CF5E4, &lit_5048); SECTION_RODATA static u8 const lit_5049[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809CF5F0, &lit_5049); +COMPILER_STRIP_GATE(0x809CF5F0, &lit_5049); #pragma pop /* 809CF5F8-809CF604 0000DC 000C+00 0/1 0/0 0/0 .rodata @5050 */ @@ -1407,7 +1415,7 @@ COMPILER_STRIP_GATE(809CF5F0, &lit_5049); SECTION_RODATA static u8 const lit_5050[12] = { 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(809CF5F8, &lit_5050); +COMPILER_STRIP_GATE(0x809CF5F8, &lit_5050); #pragma pop /* 809CF604-809CF610 0000E8 000C+00 0/1 0/0 0/0 .rodata @5051 */ @@ -1416,7 +1424,7 @@ COMPILER_STRIP_GATE(809CF5F8, &lit_5050); SECTION_RODATA static u8 const lit_5051[12] = { 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809CF604, &lit_5051); +COMPILER_STRIP_GATE(0x809CF604, &lit_5051); #pragma pop /* 809CF610-809CF618 0000F4 0008+00 0/1 0/0 0/0 .rodata @5052 */ @@ -1425,7 +1433,7 @@ COMPILER_STRIP_GATE(809CF604, &lit_5051); SECTION_RODATA static u8 const lit_5052[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809CF610, &lit_5052); +COMPILER_STRIP_GATE(0x809CF610, &lit_5052); #pragma pop /* 809CF618-809CF624 0000FC 000C+00 0/1 0/0 0/0 .rodata @5053 */ @@ -1434,7 +1442,7 @@ COMPILER_STRIP_GATE(809CF610, &lit_5052); SECTION_RODATA static u8 const lit_5053[12] = { 0x00, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(809CF618, &lit_5053); +COMPILER_STRIP_GATE(0x809CF618, &lit_5053); #pragma pop /* 809CF624-809CF630 000108 000C+00 0/1 0/0 0/0 .rodata @5054 */ @@ -1443,7 +1451,7 @@ COMPILER_STRIP_GATE(809CF618, &lit_5053); SECTION_RODATA static u8 const lit_5054[12] = { 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809CF624, &lit_5054); +COMPILER_STRIP_GATE(0x809CF624, &lit_5054); #pragma pop /* 809CF630-809CF638 000114 0008+00 0/1 0/0 0/0 .rodata @5055 */ @@ -1452,7 +1460,7 @@ COMPILER_STRIP_GATE(809CF624, &lit_5054); SECTION_RODATA static u8 const lit_5055[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809CF630, &lit_5055); +COMPILER_STRIP_GATE(0x809CF630, &lit_5055); #pragma pop /* 809CF638-809CF644 00011C 000C+00 0/1 0/0 0/0 .rodata @5056 */ @@ -1461,7 +1469,7 @@ COMPILER_STRIP_GATE(809CF630, &lit_5055); SECTION_RODATA static u8 const lit_5056[12] = { 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(809CF638, &lit_5056); +COMPILER_STRIP_GATE(0x809CF638, &lit_5056); #pragma pop /* 809CF644-809CF650 000128 000C+00 0/1 0/0 0/0 .rodata @5057 */ @@ -1470,7 +1478,7 @@ COMPILER_STRIP_GATE(809CF638, &lit_5056); SECTION_RODATA static u8 const lit_5057[12] = { 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809CF644, &lit_5057); +COMPILER_STRIP_GATE(0x809CF644, &lit_5057); #pragma pop /* 809CF650-809CF658 000134 0008+00 0/1 0/0 0/0 .rodata @5058 */ @@ -1479,7 +1487,7 @@ COMPILER_STRIP_GATE(809CF644, &lit_5057); SECTION_RODATA static u8 const lit_5058[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809CF650, &lit_5058); +COMPILER_STRIP_GATE(0x809CF650, &lit_5058); #pragma pop /* 809CF658-809CF664 00013C 000C+00 0/1 0/0 0/0 .rodata @5059 */ @@ -1488,7 +1496,7 @@ COMPILER_STRIP_GATE(809CF650, &lit_5058); SECTION_RODATA static u8 const lit_5059[12] = { 0x00, 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809CF658, &lit_5059); +COMPILER_STRIP_GATE(0x809CF658, &lit_5059); #pragma pop /* 809CF664-809CF668 000148 0004+00 0/1 0/0 0/0 .rodata @5060 */ @@ -1500,7 +1508,7 @@ SECTION_RODATA static u8 const lit_5060[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(809CF664, &lit_5060); +COMPILER_STRIP_GATE(0x809CF664, &lit_5060); #pragma pop /* 809CF668-809CF674 00014C 000C+00 0/1 0/0 0/0 .rodata @5061 */ @@ -1509,7 +1517,7 @@ COMPILER_STRIP_GATE(809CF664, &lit_5060); SECTION_RODATA static u8 const lit_5061[12] = { 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809CF668, &lit_5061); +COMPILER_STRIP_GATE(0x809CF668, &lit_5061); #pragma pop /* 809CF674-809CF678 000158 0004+00 0/1 0/0 0/0 .rodata @5062 */ @@ -1521,7 +1529,7 @@ SECTION_RODATA static u8 const lit_5062[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(809CF674, &lit_5062); +COMPILER_STRIP_GATE(0x809CF674, &lit_5062); #pragma pop /* 809CF678-809CF684 00015C 000C+00 0/1 0/0 0/0 .rodata @5063 */ @@ -1530,7 +1538,7 @@ COMPILER_STRIP_GATE(809CF674, &lit_5062); SECTION_RODATA static u8 const lit_5063[12] = { 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809CF678, &lit_5063); +COMPILER_STRIP_GATE(0x809CF678, &lit_5063); #pragma pop /* 809CF684-809CF688 000168 0004+00 0/1 0/0 0/0 .rodata @5064 */ @@ -1542,7 +1550,7 @@ SECTION_RODATA static u8 const lit_5064[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(809CF684, &lit_5064); +COMPILER_STRIP_GATE(0x809CF684, &lit_5064); #pragma pop /* 809CF688-809CF694 00016C 000C+00 0/1 0/0 0/0 .rodata @5065 */ @@ -1551,7 +1559,7 @@ COMPILER_STRIP_GATE(809CF684, &lit_5064); SECTION_RODATA static u8 const lit_5065[12] = { 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809CF688, &lit_5065); +COMPILER_STRIP_GATE(0x809CF688, &lit_5065); #pragma pop /* 809CF694-809CF698 000178 0004+00 0/1 0/0 0/0 .rodata @5066 */ @@ -1563,7 +1571,7 @@ SECTION_RODATA static u8 const lit_5066[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(809CF694, &lit_5066); +COMPILER_STRIP_GATE(0x809CF694, &lit_5066); #pragma pop /* 809CF698-809CF6A4 00017C 000C+00 0/1 0/0 0/0 .rodata @5067 */ @@ -1572,7 +1580,7 @@ COMPILER_STRIP_GATE(809CF694, &lit_5066); SECTION_RODATA static u8 const lit_5067[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809CF698, &lit_5067); +COMPILER_STRIP_GATE(0x809CF698, &lit_5067); #pragma pop /* 809CF6A4-809CF6A8 000188 0004+00 0/1 0/0 0/0 .rodata @5068 */ @@ -1584,7 +1592,7 @@ SECTION_RODATA static u8 const lit_5068[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(809CF6A4, &lit_5068); +COMPILER_STRIP_GATE(0x809CF6A4, &lit_5068); #pragma pop /* 809CD1B4-809CD4AC 001DD4 02F8+00 1/1 0/0 0/0 .text playExpression__11daNpc_grC_cFv */ @@ -1607,7 +1615,7 @@ SECTION_RODATA static u8 const lit_5069[60] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809CF6A8, &lit_5069); +COMPILER_STRIP_GATE(0x809CF6A8, &lit_5069); #pragma pop /* 809CF6E4-809CF6F0 0001C8 000C+00 0/1 0/0 0/0 .rodata @5092 */ @@ -1616,7 +1624,7 @@ COMPILER_STRIP_GATE(809CF6A8, &lit_5069); SECTION_RODATA static u8 const lit_5092[12] = { 0x00, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809CF6E4, &lit_5092); +COMPILER_STRIP_GATE(0x809CF6E4, &lit_5092); #pragma pop /* 809CF6F0-809CF6F4 0001D4 0004+00 0/1 0/0 0/0 .rodata @5093 */ @@ -1628,7 +1636,7 @@ SECTION_RODATA static u8 const lit_5093[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(809CF6F0, &lit_5093); +COMPILER_STRIP_GATE(0x809CF6F0, &lit_5093); #pragma pop /* 809CF6F4-809CF700 0001D8 000C+00 0/1 0/0 0/0 .rodata @5094 */ @@ -1637,7 +1645,7 @@ COMPILER_STRIP_GATE(809CF6F0, &lit_5093); SECTION_RODATA static u8 const lit_5094[12] = { 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(809CF6F4, &lit_5094); +COMPILER_STRIP_GATE(0x809CF6F4, &lit_5094); #pragma pop /* 809CF700-809CF70C 0001E4 000C+00 0/1 0/0 0/0 .rodata @5095 */ @@ -1646,7 +1654,7 @@ COMPILER_STRIP_GATE(809CF6F4, &lit_5094); SECTION_RODATA static u8 const lit_5095[12] = { 0x00, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809CF700, &lit_5095); +COMPILER_STRIP_GATE(0x809CF700, &lit_5095); #pragma pop /* 809CF70C-809CF714 0001F0 0008+00 0/1 0/0 0/0 .rodata @5096 */ @@ -1655,7 +1663,7 @@ COMPILER_STRIP_GATE(809CF700, &lit_5095); SECTION_RODATA static u8 const lit_5096[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809CF70C, &lit_5096); +COMPILER_STRIP_GATE(0x809CF70C, &lit_5096); #pragma pop /* 809CF714-809CF720 0001F8 000C+00 0/1 0/0 0/0 .rodata @5097 */ @@ -1664,7 +1672,7 @@ COMPILER_STRIP_GATE(809CF70C, &lit_5096); SECTION_RODATA static u8 const lit_5097[12] = { 0x00, 0x0B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809CF714, &lit_5097); +COMPILER_STRIP_GATE(0x809CF714, &lit_5097); #pragma pop /* 809CF720-809CF724 000204 0004+00 0/1 0/0 0/0 .rodata @5098 */ @@ -1676,7 +1684,7 @@ SECTION_RODATA static u8 const lit_5098[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(809CF720, &lit_5098); +COMPILER_STRIP_GATE(0x809CF720, &lit_5098); #pragma pop /* 809CF724-809CF730 000208 000C+00 0/1 0/0 0/0 .rodata @5099 */ @@ -1685,7 +1693,7 @@ COMPILER_STRIP_GATE(809CF720, &lit_5098); SECTION_RODATA static u8 const lit_5099[12] = { 0x00, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(809CF724, &lit_5099); +COMPILER_STRIP_GATE(0x809CF724, &lit_5099); #pragma pop /* 809CF730-809CF73C 000214 000C+00 0/1 0/0 0/0 .rodata @5100 */ @@ -1694,7 +1702,7 @@ COMPILER_STRIP_GATE(809CF724, &lit_5099); SECTION_RODATA static u8 const lit_5100[12] = { 0x00, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809CF730, &lit_5100); +COMPILER_STRIP_GATE(0x809CF730, &lit_5100); #pragma pop /* 809CF73C-809CF744 000220 0008+00 0/1 0/0 0/0 .rodata @5101 */ @@ -1703,7 +1711,7 @@ COMPILER_STRIP_GATE(809CF730, &lit_5100); SECTION_RODATA static u8 const lit_5101[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809CF73C, &lit_5101); +COMPILER_STRIP_GATE(0x809CF73C, &lit_5101); #pragma pop /* 809CF744-809CF750 000228 000C+00 0/1 0/0 0/0 .rodata @5102 */ @@ -1712,7 +1720,7 @@ COMPILER_STRIP_GATE(809CF73C, &lit_5101); SECTION_RODATA static u8 const lit_5102[12] = { 0x00, 0x0F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(809CF744, &lit_5102); +COMPILER_STRIP_GATE(0x809CF744, &lit_5102); #pragma pop /* 809CF750-809CF75C 000234 000C+00 0/1 0/0 0/0 .rodata @5103 */ @@ -1721,7 +1729,7 @@ COMPILER_STRIP_GATE(809CF744, &lit_5102); SECTION_RODATA static u8 const lit_5103[12] = { 0x00, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809CF750, &lit_5103); +COMPILER_STRIP_GATE(0x809CF750, &lit_5103); #pragma pop /* 809CF75C-809CF764 000240 0008+00 0/1 0/0 0/0 .rodata @5104 */ @@ -1730,7 +1738,7 @@ COMPILER_STRIP_GATE(809CF750, &lit_5103); SECTION_RODATA static u8 const lit_5104[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809CF75C, &lit_5104); +COMPILER_STRIP_GATE(0x809CF75C, &lit_5104); #pragma pop /* 809CF764-809CF770 000248 000C+00 0/1 0/0 0/0 .rodata @5105 */ @@ -1739,7 +1747,7 @@ COMPILER_STRIP_GATE(809CF75C, &lit_5104); SECTION_RODATA static u8 const lit_5105[12] = { 0x00, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809CF764, &lit_5105); +COMPILER_STRIP_GATE(0x809CF764, &lit_5105); #pragma pop /* 809CF770-809CF774 000254 0004+00 0/1 0/0 0/0 .rodata @5106 */ @@ -1751,7 +1759,7 @@ SECTION_RODATA static u8 const lit_5106[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(809CF770, &lit_5106); +COMPILER_STRIP_GATE(0x809CF770, &lit_5106); #pragma pop /* 809CF774-809CF780 000258 000C+00 0/1 0/0 0/0 .rodata @5107 */ @@ -1760,7 +1768,7 @@ COMPILER_STRIP_GATE(809CF770, &lit_5106); SECTION_RODATA static u8 const lit_5107[12] = { 0x00, 0x0D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(809CF774, &lit_5107); +COMPILER_STRIP_GATE(0x809CF774, &lit_5107); #pragma pop /* 809CF780-809CF78C 000264 000C+00 0/1 0/0 0/0 .rodata @5108 */ @@ -1769,7 +1777,7 @@ COMPILER_STRIP_GATE(809CF774, &lit_5107); SECTION_RODATA static u8 const lit_5108[12] = { 0x00, 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809CF780, &lit_5108); +COMPILER_STRIP_GATE(0x809CF780, &lit_5108); #pragma pop /* 809CF78C-809CF794 000270 0008+00 0/1 0/0 0/0 .rodata @5109 */ @@ -1778,7 +1786,7 @@ COMPILER_STRIP_GATE(809CF780, &lit_5108); SECTION_RODATA static u8 const lit_5109[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809CF78C, &lit_5109); +COMPILER_STRIP_GATE(0x809CF78C, &lit_5109); #pragma pop /* 809CF794-809CF7A0 000278 000C+00 0/1 0/0 0/0 .rodata @5110 */ @@ -1787,7 +1795,7 @@ COMPILER_STRIP_GATE(809CF78C, &lit_5109); SECTION_RODATA static u8 const lit_5110[12] = { 0x00, 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809CF794, &lit_5110); +COMPILER_STRIP_GATE(0x809CF794, &lit_5110); #pragma pop /* 809CF7A0-809CF7A4 000284 0004+00 0/1 0/0 0/0 .rodata @5111 */ @@ -1799,7 +1807,7 @@ SECTION_RODATA static u8 const lit_5111[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(809CF7A0, &lit_5111); +COMPILER_STRIP_GATE(0x809CF7A0, &lit_5111); #pragma pop /* 809CF7A4-809CF7B0 000288 000C+00 0/1 0/0 0/0 .rodata @5112 */ @@ -1808,7 +1816,7 @@ COMPILER_STRIP_GATE(809CF7A0, &lit_5111); SECTION_RODATA static u8 const lit_5112[12] = { 0x00, 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809CF7A4, &lit_5112); +COMPILER_STRIP_GATE(0x809CF7A4, &lit_5112); #pragma pop /* 809CF7B0-809CF7B4 000294 0004+00 0/1 0/0 0/0 .rodata @5113 */ @@ -1820,7 +1828,7 @@ SECTION_RODATA static u8 const lit_5113[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(809CF7B0, &lit_5113); +COMPILER_STRIP_GATE(0x809CF7B0, &lit_5113); #pragma pop /* 809CD4AC-809CD794 0020CC 02E8+00 1/1 0/0 0/0 .text playMotion__11daNpc_grC_cFv */ @@ -1838,7 +1846,7 @@ asm void daNpc_grC_c::playMotion() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpc_grC_c::chkAction(int (daNpc_grC_c::*)(void*)) { +asm void daNpc_grC_c::chkAction(int (daNpc_grC_c::*param_0)(void*)) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_grc/d_a_npc_grc/chkAction__11daNpc_grC_cFM11daNpc_grC_cFPCvPvPv_i.s" } @@ -1849,7 +1857,7 @@ asm void daNpc_grC_c::chkAction(int (daNpc_grC_c::*)(void*)) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpc_grC_c::setAction(int (daNpc_grC_c::*)(void*)) { +asm void daNpc_grC_c::setAction(int (daNpc_grC_c::*param_0)(void*)) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_grc/d_a_npc_grc/setAction__11daNpc_grC_cFM11daNpc_grC_cFPCvPvPv_i.s" } @@ -1904,7 +1912,7 @@ SECTION_RODATA static u8 const lit_5114[36] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809CF7B4, &lit_5114); +COMPILER_STRIP_GATE(0x809CF7B4, &lit_5114); #pragma pop /* 809CF7D8-809CF7E4 0002BC 000C+00 0/1 0/0 0/0 .rodata @5264 */ @@ -1913,28 +1921,28 @@ COMPILER_STRIP_GATE(809CF7B4, &lit_5114); SECTION_RODATA static u8 const lit_5264[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809CF7D8, &lit_5264); +COMPILER_STRIP_GATE(0x809CF7D8, &lit_5264); #pragma pop /* 809CF7E4-809CF7E8 0002C8 0004+00 0/1 0/0 0/0 .rodata @5317 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5317 = -80.0f; -COMPILER_STRIP_GATE(809CF7E4, &lit_5317); +COMPILER_STRIP_GATE(0x809CF7E4, &lit_5317); #pragma pop /* 809CF7E8-809CF7EC 0002CC 0004+00 0/1 0/0 0/0 .rodata @5318 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5318 = 80.0f; -COMPILER_STRIP_GATE(809CF7E8, &lit_5318); +COMPILER_STRIP_GATE(0x809CF7E8, &lit_5318); #pragma pop /* 809CF7EC-809CF7F0 0002D0 0004+00 0/1 0/0 0/0 .rodata @5319 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5319 = 40.0f; -COMPILER_STRIP_GATE(809CF7EC, &lit_5319); +COMPILER_STRIP_GATE(0x809CF7EC, &lit_5319); #pragma pop /* 809CDD74-809CDFFC 002994 0288+00 1/1 0/0 0/0 .text lookat__11daNpc_grC_cFv */ @@ -1987,6 +1995,13 @@ asm void daNpc_grC_c::waitTW(void* param_0) { } #pragma pop +/* ############################################################################################## */ +/* 809CF7F0-809CF7F0 0002D4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_809CF804 = "F_SP110"; +#pragma pop + /* 809CE490-809CE688 0030B0 01F8+00 1/0 0/0 0/0 .text waitSpa__11daNpc_grC_cFPv */ #pragma push #pragma optimization_level 0 @@ -2007,6 +2022,13 @@ asm void daNpc_grC_c::waitBuyer(void* param_0) { } #pragma pop +/* ############################################################################################## */ +/* 809CF7F0-809CF7F0 0002D4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_809CF80C = "DEFAULT_GETITEM"; +#pragma pop + /* 809CE7C4-809CEA6C 0033E4 02A8+00 2/0 0/0 0/0 .text talk__11daNpc_grC_cFPv */ #pragma push #pragma optimization_level 0 @@ -2237,7 +2259,7 @@ asm void __sinit_d_a_npc_grc_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_809CF444 = (void*)__sinit_d_a_npc_grc_cpp; +REGISTER_CTORS(0x809CF444, __sinit_d_a_npc_grc_cpp); #pragma pop /* 809CF4AC-809CF4B0 0040CC 0004+00 1/0 0/0 0/0 .text adjustShapeAngle__11daNpc_grC_cFv @@ -2448,14 +2470,4 @@ static u8 data_809CFC30[4]; static u8 data_809CFC34[4]; #pragma pop -/* 809CF7F0-809CF81C 0002D4 002C+00 5/2 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_809CF7F0 = "grC"; -SECTION_DEAD static char const* const stringBase_809CF7F4 = "grC_Mdl"; -SECTION_DEAD static char const* const stringBase_809CF7FC = "grC_TW"; -SECTION_DEAD static char const* const stringBase_809CF803 = ""; -SECTION_DEAD static char const* const stringBase_809CF804 = "F_SP110"; -SECTION_DEAD static char const* const stringBase_809CF80C = "DEFAULT_GETITEM"; -#pragma pop +/* 809CF7F0-809CF7F0 0002D4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/npc/d_a_npc_grd/d_a_npc_grd.cpp b/rel/d/a/npc/d_a_npc_grd/d_a_npc_grd.cpp index bb6ad241b1b..8fd09cea583 100644 --- a/rel/d/a/npc/d_a_npc_grd/d_a_npc_grd.cpp +++ b/rel/d/a/npc/d_a_npc_grd/d_a_npc_grd.cpp @@ -33,12 +33,12 @@ struct mDoExt_bckAnm { /* 8000D990 */ void changeBckOnly(J3DAnmTransform*); }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; +struct J3DModelData {}; + struct Z2Creature { /* 802C03C8 */ Z2Creature(); /* 802C0420 */ ~Z2Creature(); @@ -57,10 +57,10 @@ struct fopAc_ac_c { /* 80018C8C */ ~fopAc_ac_c(); }; -struct J3DJoint {}; - struct J3DModel {}; +struct J3DJoint {}; + struct daNpc_Grd_c { /* 809CFD2C */ daNpc_Grd_c(); /* 809CFF40 */ ~daNpc_Grd_c(); @@ -117,22 +117,22 @@ struct dCcD_GObjInf { /* 800840E4 */ ~dCcD_GObjInf(); }; +struct J3DAnmTexPattern { + /* 8032AF50 */ void getTexNo(u16, u16*) const; +}; + struct J3DAnmTextureSRTKey {}; +struct J3DAnmTransformKey {}; + +struct _GXColorS10 {}; + struct dCcD_SrcCyl {}; struct dCcD_Cyl { /* 800848B4 */ void Set(dCcD_SrcCyl const&); }; -struct _GXColorS10 {}; - -struct J3DAnmTexPattern { - /* 8032AF50 */ void getTexNo(u16, u16*) const; -}; - -struct J3DAnmTransformKey {}; - struct daNpcF_c { struct daNpcF_anmPlayData {}; @@ -422,7 +422,7 @@ extern "C" void __dt__12dBgS_ObjAcchFv(); extern "C" void __dt__12J3DFrameCtrlFv(); extern "C" void setCollisions__8daNpcF_cFv(); extern "C" void __dt__10cCcD_GSttsFv(); -extern "C" void func_809D38F0(int*); +extern "C" void func_809D38F0(void* _this, int*); extern "C" void __sinit_d_a_npc_grd_cpp(); extern "C" void adjustShapeAngle__11daNpc_Grd_cFv(); extern "C" void __dt__17daNpc_Grd_Param_cFv(); @@ -588,6 +588,15 @@ extern "C" void __register_global_object(); // /* ############################################################################################## */ +/* 809D3BF4-809D3BF4 0001F0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_809D3BF4 = "grD"; +SECTION_DEAD static char const* const stringBase_809D3BF8 = "grD1"; +SECTION_DEAD static char const* const stringBase_809D3BFD = ""; +SECTION_DEAD static char const* const stringBase_809D3BFE = "NOD_TO_GRZ"; +#pragma pop + /* 809D3C14-809D3C20 000000 000C+00 3/3 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -919,34 +928,34 @@ SECTION_RODATA u8 const daNpc_Grd_Param_c::m[108] = { 0x43, 0x34, 0x00, 0x00, 0x43, 0xFA, 0x00, 0x00, 0x43, 0x96, 0x00, 0x00, 0xC3, 0x96, 0x00, 0x00, 0x00, 0x3C, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809D3A04, &daNpc_Grd_Param_c::m); +COMPILER_STRIP_GATE(0x809D3A04, &daNpc_Grd_Param_c::m); /* 809D3A70-809D3A74 00006C 0004+00 0/1 0/0 0/0 .rodata @4393 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4393 = -300.0f; -COMPILER_STRIP_GATE(809D3A70, &lit_4393); +COMPILER_STRIP_GATE(0x809D3A70, &lit_4393); #pragma pop /* 809D3A74-809D3A78 000070 0004+00 0/1 0/0 0/0 .rodata @4394 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4394 = -50.0f; -COMPILER_STRIP_GATE(809D3A74, &lit_4394); +COMPILER_STRIP_GATE(0x809D3A74, &lit_4394); #pragma pop /* 809D3A78-809D3A7C 000074 0004+00 0/1 0/0 0/0 .rodata @4395 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4395 = 300.0f; -COMPILER_STRIP_GATE(809D3A78, &lit_4395); +COMPILER_STRIP_GATE(0x809D3A78, &lit_4395); #pragma pop /* 809D3A7C-809D3A80 000078 0004+00 0/1 0/0 0/0 .rodata @4396 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4396 = 450.0f; -COMPILER_STRIP_GATE(809D3A7C, &lit_4396); +COMPILER_STRIP_GATE(0x809D3A7C, &lit_4396); #pragma pop /* 809D0140-809D0414 000500 02D4+00 1/1 0/0 0/0 .text create__11daNpc_Grd_cFv */ @@ -962,7 +971,7 @@ asm void daNpc_Grd_c::create() { /* ############################################################################################## */ /* 809D3A80-809D3A84 00007C 0004+00 4/4 0/0 0/0 .rodata @4450 */ SECTION_RODATA static f32 const lit_4450 = 1.0f; -COMPILER_STRIP_GATE(809D3A80, &lit_4450); +COMPILER_STRIP_GATE(0x809D3A80, &lit_4450); /* 809D3A84-809D3A88 000080 0004+00 5/7 0/0 0/0 .rodata @4451 */ SECTION_RODATA static u8 const lit_4451[4] = { @@ -971,7 +980,7 @@ SECTION_RODATA static u8 const lit_4451[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(809D3A84, &lit_4451); +COMPILER_STRIP_GATE(0x809D3A84, &lit_4451); /* 809D0414-809D069C 0007D4 0288+00 1/1 0/0 0/0 .text CreateHeap__11daNpc_Grd_cFv */ #pragma push @@ -1118,7 +1127,7 @@ asm void daNpc_Grd_c::Draw() { SECTION_RODATA static u8 const lit_4503[12] = { 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x04, }; -COMPILER_STRIP_GATE(809D3A88, &lit_4503); +COMPILER_STRIP_GATE(0x809D3A88, &lit_4503); /* 809D093C-809D0B70 000CFC 0234+00 1/1 0/0 0/0 .text * ctrlJoint__11daNpc_Grd_cFP8J3DJointP8J3DModel */ @@ -1176,11 +1185,11 @@ asm void daNpc_Grd_c::main() { /* ############################################################################################## */ /* 809D3A94-809D3A98 000090 0004+00 6/6 0/0 0/0 .rodata @4710 */ SECTION_RODATA static f32 const lit_4710 = -1.0f; -COMPILER_STRIP_GATE(809D3A94, &lit_4710); +COMPILER_STRIP_GATE(0x809D3A94, &lit_4710); /* 809D3A98-809D3A9C 000094 0004+00 1/1 0/0 0/0 .rodata @4711 */ SECTION_RODATA static f32 const lit_4711 = 1.0f / 50.0f; -COMPILER_STRIP_GATE(809D3A98, &lit_4711); +COMPILER_STRIP_GATE(0x809D3A98, &lit_4711); /* 809D0E9C-809D0F7C 00125C 00E0+00 1/0 0/0 0/0 .text ctrlBtk__11daNpc_Grd_cFv */ #pragma push @@ -1197,28 +1206,28 @@ asm void daNpc_Grd_c::ctrlBtk() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4861 = 20.0f; -COMPILER_STRIP_GATE(809D3A9C, &lit_4861); +COMPILER_STRIP_GATE(0x809D3A9C, &lit_4861); #pragma pop /* 809D3AA0-809D3AA4 00009C 0004+00 0/1 0/0 0/0 .rodata @4862 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4862 = 30.0f; -COMPILER_STRIP_GATE(809D3AA0, &lit_4862); +COMPILER_STRIP_GATE(0x809D3AA0, &lit_4862); #pragma pop /* 809D3AA4-809D3AA8 0000A0 0004+00 0/1 0/0 0/0 .rodata @4863 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4863 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(809D3AA4, &lit_4863); +COMPILER_STRIP_GATE(0x809D3AA4, &lit_4863); #pragma pop /* 809D3AA8-809D3AAC 0000A4 0004+00 0/1 0/0 0/0 .rodata @4864 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4864 = 125.0f; -COMPILER_STRIP_GATE(809D3AA8, &lit_4864); +COMPILER_STRIP_GATE(0x809D3AA8, &lit_4864); #pragma pop /* 809D3AAC-809D3AB4 0000A8 0008+00 0/1 0/0 0/0 .rodata @4865 */ @@ -1227,7 +1236,7 @@ COMPILER_STRIP_GATE(809D3AA8, &lit_4864); SECTION_RODATA static u8 const lit_4865[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809D3AAC, &lit_4865); +COMPILER_STRIP_GATE(0x809D3AAC, &lit_4865); #pragma pop /* 809D3AB4-809D3ABC 0000B0 0008+00 0/1 0/0 0/0 .rodata @4866 */ @@ -1236,7 +1245,7 @@ COMPILER_STRIP_GATE(809D3AAC, &lit_4865); SECTION_RODATA static u8 const lit_4866[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809D3AB4, &lit_4866); +COMPILER_STRIP_GATE(0x809D3AB4, &lit_4866); #pragma pop /* 809D3ABC-809D3AC4 0000B8 0008+00 0/1 0/0 0/0 .rodata @4867 */ @@ -1245,7 +1254,7 @@ COMPILER_STRIP_GATE(809D3AB4, &lit_4866); SECTION_RODATA static u8 const lit_4867[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809D3ABC, &lit_4867); +COMPILER_STRIP_GATE(0x809D3ABC, &lit_4867); #pragma pop /* 809D3EB0-809D3EB4 000008 0001+03 1/1 0/0 0/0 .bss @1109 */ @@ -1469,7 +1478,7 @@ asm void daNpc_Grd_c::reset() { SECTION_RODATA static u8 const lit_5031[12] = { 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809D3AC4, &lit_5031); +COMPILER_STRIP_GATE(0x809D3AC4, &lit_5031); #pragma pop /* 809D3AD0-809D3AD4 0000CC 0004+00 0/1 0/0 0/0 .rodata @5032 */ @@ -1481,7 +1490,7 @@ SECTION_RODATA static u8 const lit_5032[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(809D3AD0, &lit_5032); +COMPILER_STRIP_GATE(0x809D3AD0, &lit_5032); #pragma pop /* 809D3AD4-809D3AE0 0000D0 000C+00 0/1 0/0 0/0 .rodata @5033 */ @@ -1490,7 +1499,7 @@ COMPILER_STRIP_GATE(809D3AD0, &lit_5032); SECTION_RODATA static u8 const lit_5033[12] = { 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(809D3AD4, &lit_5033); +COMPILER_STRIP_GATE(0x809D3AD4, &lit_5033); #pragma pop /* 809D3AE0-809D3AEC 0000DC 000C+00 0/1 0/0 0/0 .rodata @5034 */ @@ -1499,7 +1508,7 @@ COMPILER_STRIP_GATE(809D3AD4, &lit_5033); SECTION_RODATA static u8 const lit_5034[12] = { 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809D3AE0, &lit_5034); +COMPILER_STRIP_GATE(0x809D3AE0, &lit_5034); #pragma pop /* 809D3AEC-809D3AF4 0000E8 0008+00 0/1 0/0 0/0 .rodata @5035 */ @@ -1508,7 +1517,7 @@ COMPILER_STRIP_GATE(809D3AE0, &lit_5034); SECTION_RODATA static u8 const lit_5035[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809D3AEC, &lit_5035); +COMPILER_STRIP_GATE(0x809D3AEC, &lit_5035); #pragma pop /* 809D3AF4-809D3B00 0000F0 000C+00 0/1 0/0 0/0 .rodata @5036 */ @@ -1517,7 +1526,7 @@ COMPILER_STRIP_GATE(809D3AEC, &lit_5035); SECTION_RODATA static u8 const lit_5036[12] = { 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809D3AF4, &lit_5036); +COMPILER_STRIP_GATE(0x809D3AF4, &lit_5036); #pragma pop /* 809D3B00-809D3B04 0000FC 0004+00 0/1 0/0 0/0 .rodata @5037 */ @@ -1529,7 +1538,7 @@ SECTION_RODATA static u8 const lit_5037[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(809D3B00, &lit_5037); +COMPILER_STRIP_GATE(0x809D3B00, &lit_5037); #pragma pop /* 809D3B04-809D3B10 000100 000C+00 0/1 0/0 0/0 .rodata @5038 */ @@ -1538,7 +1547,7 @@ COMPILER_STRIP_GATE(809D3B00, &lit_5037); SECTION_RODATA static u8 const lit_5038[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809D3B04, &lit_5038); +COMPILER_STRIP_GATE(0x809D3B04, &lit_5038); #pragma pop /* 809D3B10-809D3B14 00010C 0004+00 0/1 0/0 0/0 .rodata @5039 */ @@ -1550,7 +1559,7 @@ SECTION_RODATA static u8 const lit_5039[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(809D3B10, &lit_5039); +COMPILER_STRIP_GATE(0x809D3B10, &lit_5039); #pragma pop /* 809D3B14-809D3B24 000110 0010+00 0/1 0/0 0/0 .rodata @5040 */ @@ -1559,7 +1568,7 @@ COMPILER_STRIP_GATE(809D3B10, &lit_5039); SECTION_RODATA static u8 const lit_5040[16] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809D3B14, &lit_5040); +COMPILER_STRIP_GATE(0x809D3B14, &lit_5040); #pragma pop /* 809D1B9C-809D1D00 001F5C 0164+00 1/1 0/0 0/0 .text playExpression__11daNpc_Grd_cFv */ @@ -1579,7 +1588,7 @@ asm void daNpc_Grd_c::playExpression() { SECTION_RODATA static u8 const lit_5055[12] = { 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809D3B24, &lit_5055); +COMPILER_STRIP_GATE(0x809D3B24, &lit_5055); #pragma pop /* 809D3B30-809D3B34 00012C 0004+00 0/1 0/0 0/0 .rodata @5056 */ @@ -1591,7 +1600,7 @@ SECTION_RODATA static u8 const lit_5056[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(809D3B30, &lit_5056); +COMPILER_STRIP_GATE(0x809D3B30, &lit_5056); #pragma pop /* 809D3B34-809D3B40 000130 000C+00 0/1 0/0 0/0 .rodata @5057 */ @@ -1600,7 +1609,7 @@ COMPILER_STRIP_GATE(809D3B30, &lit_5056); SECTION_RODATA static u8 const lit_5057[12] = { 0x00, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(809D3B34, &lit_5057); +COMPILER_STRIP_GATE(0x809D3B34, &lit_5057); #pragma pop /* 809D3B40-809D3B4C 00013C 000C+00 0/1 0/0 0/0 .rodata @5058 */ @@ -1609,7 +1618,7 @@ COMPILER_STRIP_GATE(809D3B34, &lit_5057); SECTION_RODATA static u8 const lit_5058[12] = { 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809D3B40, &lit_5058); +COMPILER_STRIP_GATE(0x809D3B40, &lit_5058); #pragma pop /* 809D3B4C-809D3B54 000148 0008+00 0/1 0/0 0/0 .rodata @5059 */ @@ -1618,7 +1627,7 @@ COMPILER_STRIP_GATE(809D3B40, &lit_5058); SECTION_RODATA static u8 const lit_5059[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809D3B4C, &lit_5059); +COMPILER_STRIP_GATE(0x809D3B4C, &lit_5059); #pragma pop /* 809D3B54-809D3B60 000150 000C+00 0/1 0/0 0/0 .rodata @5060 */ @@ -1627,7 +1636,7 @@ COMPILER_STRIP_GATE(809D3B4C, &lit_5059); SECTION_RODATA static u8 const lit_5060[12] = { 0x00, 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(809D3B54, &lit_5060); +COMPILER_STRIP_GATE(0x809D3B54, &lit_5060); #pragma pop /* 809D3B60-809D3B6C 00015C 000C+00 0/1 0/0 0/0 .rodata @5061 */ @@ -1636,7 +1645,7 @@ COMPILER_STRIP_GATE(809D3B54, &lit_5060); SECTION_RODATA static u8 const lit_5061[12] = { 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809D3B60, &lit_5061); +COMPILER_STRIP_GATE(0x809D3B60, &lit_5061); #pragma pop /* 809D3B6C-809D3B74 000168 0008+00 0/1 0/0 0/0 .rodata @5062 */ @@ -1645,7 +1654,7 @@ COMPILER_STRIP_GATE(809D3B60, &lit_5061); SECTION_RODATA static u8 const lit_5062[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809D3B6C, &lit_5062); +COMPILER_STRIP_GATE(0x809D3B6C, &lit_5062); #pragma pop /* 809D3B74-809D3B80 000170 000C+00 0/1 0/0 0/0 .rodata @5063 */ @@ -1654,7 +1663,7 @@ COMPILER_STRIP_GATE(809D3B6C, &lit_5062); SECTION_RODATA static u8 const lit_5063[12] = { 0x00, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(809D3B74, &lit_5063); +COMPILER_STRIP_GATE(0x809D3B74, &lit_5063); #pragma pop /* 809D3B80-809D3B8C 00017C 000C+00 0/1 0/0 0/0 .rodata @5064 */ @@ -1663,7 +1672,7 @@ COMPILER_STRIP_GATE(809D3B74, &lit_5063); SECTION_RODATA static u8 const lit_5064[12] = { 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809D3B80, &lit_5064); +COMPILER_STRIP_GATE(0x809D3B80, &lit_5064); #pragma pop /* 809D3B8C-809D3B94 000188 0008+00 0/1 0/0 0/0 .rodata @5065 */ @@ -1672,7 +1681,7 @@ COMPILER_STRIP_GATE(809D3B80, &lit_5064); SECTION_RODATA static u8 const lit_5065[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809D3B8C, &lit_5065); +COMPILER_STRIP_GATE(0x809D3B8C, &lit_5065); #pragma pop /* 809D3B94-809D3BA0 000190 000C+00 0/1 0/0 0/0 .rodata @5066 */ @@ -1681,7 +1690,7 @@ COMPILER_STRIP_GATE(809D3B8C, &lit_5065); SECTION_RODATA static u8 const lit_5066[12] = { 0x00, 0x0B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(809D3B94, &lit_5066); +COMPILER_STRIP_GATE(0x809D3B94, &lit_5066); #pragma pop /* 809D3BA0-809D3BAC 00019C 000C+00 0/1 0/0 0/0 .rodata @5067 */ @@ -1690,7 +1699,7 @@ COMPILER_STRIP_GATE(809D3B94, &lit_5066); SECTION_RODATA static u8 const lit_5067[12] = { 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809D3BA0, &lit_5067); +COMPILER_STRIP_GATE(0x809D3BA0, &lit_5067); #pragma pop /* 809D3BAC-809D3BB4 0001A8 0008+00 0/1 0/0 0/0 .rodata @5068 */ @@ -1699,7 +1708,7 @@ COMPILER_STRIP_GATE(809D3BA0, &lit_5067); SECTION_RODATA static u8 const lit_5068[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809D3BAC, &lit_5068); +COMPILER_STRIP_GATE(0x809D3BAC, &lit_5068); #pragma pop /* 809D3BB4-809D3BC0 0001B0 000C+00 0/1 0/0 0/0 .rodata @5069 */ @@ -1708,7 +1717,7 @@ COMPILER_STRIP_GATE(809D3BAC, &lit_5068); SECTION_RODATA static u8 const lit_5069[12] = { 0x00, 0x06, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809D3BB4, &lit_5069); +COMPILER_STRIP_GATE(0x809D3BB4, &lit_5069); #pragma pop /* 809D3BC0-809D3BC4 0001BC 0004+00 0/1 0/0 0/0 .rodata @5070 */ @@ -1720,7 +1729,7 @@ SECTION_RODATA static u8 const lit_5070[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(809D3BC0, &lit_5070); +COMPILER_STRIP_GATE(0x809D3BC0, &lit_5070); #pragma pop /* 809D1D00-809D1F50 0020C0 0250+00 1/1 0/0 0/0 .text playMotion__11daNpc_Grd_cFv */ @@ -1738,7 +1747,7 @@ asm void daNpc_Grd_c::playMotion() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpc_Grd_c::chkAction(int (daNpc_Grd_c::*)(void*)) { +asm void daNpc_Grd_c::chkAction(int (daNpc_Grd_c::*param_0)(void*)) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_grd/d_a_npc_grd/chkAction__11daNpc_Grd_cFM11daNpc_Grd_cFPCvPvPv_i.s" } @@ -1749,7 +1758,7 @@ asm void daNpc_Grd_c::chkAction(int (daNpc_Grd_c::*)(void*)) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpc_Grd_c::setAction(int (daNpc_Grd_c::*)(void*)) { +asm void daNpc_Grd_c::setAction(int (daNpc_Grd_c::*param_0)(void*)) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_grd/d_a_npc_grd/setAction__11daNpc_Grd_cFM11daNpc_Grd_cFPCvPvPv_i.s" } @@ -1803,7 +1812,7 @@ SECTION_RODATA static u8 const lit_5071[24] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809D3BC4, &lit_5071); +COMPILER_STRIP_GATE(0x809D3BC4, &lit_5071); #pragma pop /* 809D3BDC-809D3BE8 0001D8 000C+00 0/1 0/0 0/0 .rodata @5211 */ @@ -1812,28 +1821,28 @@ COMPILER_STRIP_GATE(809D3BC4, &lit_5071); SECTION_RODATA static u8 const lit_5211[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809D3BDC, &lit_5211); +COMPILER_STRIP_GATE(0x809D3BDC, &lit_5211); #pragma pop /* 809D3BE8-809D3BEC 0001E4 0004+00 0/1 0/0 0/0 .rodata @5265 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5265 = -80.0f; -COMPILER_STRIP_GATE(809D3BE8, &lit_5265); +COMPILER_STRIP_GATE(0x809D3BE8, &lit_5265); #pragma pop /* 809D3BEC-809D3BF0 0001E8 0004+00 0/1 0/0 0/0 .rodata @5266 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5266 = 80.0f; -COMPILER_STRIP_GATE(809D3BEC, &lit_5266); +COMPILER_STRIP_GATE(0x809D3BEC, &lit_5266); #pragma pop /* 809D3BF0-809D3BF4 0001EC 0004+00 0/1 0/0 0/0 .rodata @5267 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5267 = 40.0f; -COMPILER_STRIP_GATE(809D3BF0, &lit_5267); +COMPILER_STRIP_GATE(0x809D3BF0, &lit_5267); #pragma pop /* 809D2494-809D2730 002854 029C+00 1/1 0/0 0/0 .text lookat__11daNpc_Grd_cFv */ @@ -1906,6 +1915,14 @@ static asm void s_sub2(void* param_0, void* param_1) { } #pragma pop +/* ############################################################################################## */ +/* 809D3BF4-809D3BF4 0001F0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_809D3C09 = "prm"; +SECTION_DEAD static char const* const stringBase_809D3C0D = "timer"; +#pragma pop + /* 809D2C9C-809D3058 00305C 03BC+00 1/0 0/0 0/0 .text ECut_nodToGrz__11daNpc_Grd_cFi */ #pragma push #pragma optimization_level 0 @@ -2110,7 +2127,7 @@ asm cCcD_GStts::~cCcD_GStts() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_809D38F0(int* param_0) { +extern "C" asm void func_809D38F0(void* _this, int* param_0) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_grd/d_a_npc_grd/func_809D38F0.s" } @@ -2136,7 +2153,7 @@ asm void __sinit_d_a_npc_grd_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_809D390C = (void*)__sinit_d_a_npc_grd_cpp; +REGISTER_CTORS(0x809D390C, __sinit_d_a_npc_grd_cpp); #pragma pop /* 809D3994-809D3998 003D54 0004+00 1/0 0/0 0/0 .text adjustShapeAngle__11daNpc_Grd_cFv @@ -2347,14 +2364,4 @@ static u8 data_809D3F78[4]; static u8 data_809D3F7C[4]; #pragma pop -/* 809D3BF4-809D3C13 0001F0 001F+00 4/1 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_809D3BF4 = "grD"; -SECTION_DEAD static char const* const stringBase_809D3BF8 = "grD1"; -SECTION_DEAD static char const* const stringBase_809D3BFD = ""; -SECTION_DEAD static char const* const stringBase_809D3BFE = "NOD_TO_GRZ"; -SECTION_DEAD static char const* const stringBase_809D3C09 = "prm"; -SECTION_DEAD static char const* const stringBase_809D3C0D = "timer"; -#pragma pop +/* 809D3BF4-809D3BF4 0001F0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/npc/d_a_npc_grm/d_a_npc_grm.cpp b/rel/d/a/npc/d_a_npc_grm/d_a_npc_grm.cpp index 9b335775aef..c75069b1087 100644 --- a/rel/d/a/npc/d_a_npc_grm/d_a_npc_grm.cpp +++ b/rel/d/a/npc/d_a_npc_grm/d_a_npc_grm.cpp @@ -15,12 +15,14 @@ struct mDoMtx_stack_c { static u8 now[48]; }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; +struct J3DAnmTransform {}; + +struct J3DModelData {}; + struct Vec {}; struct Z2Creature { @@ -28,8 +30,6 @@ struct Z2Creature { /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -41,6 +41,8 @@ struct fopAc_ac_c { /* 80018B64 */ fopAc_ac_c(); }; +struct daNpcT_faceMotionAnmData_c {}; + struct daNpcT_MotionSeqMngr_c { struct sequenceStepData_c {}; @@ -48,14 +50,12 @@ struct daNpcT_MotionSeqMngr_c { /* 809D66EC */ ~daNpcT_MotionSeqMngr_c(); }; +struct daNpcT_evtData_c {}; + struct daNpcT_motionAnmData_c {}; struct J3DJoint {}; -struct daNpcT_faceMotionAnmData_c {}; - -struct daNpcT_evtData_c {}; - struct daNpc_grM_c { /* 809D406C */ ~daNpc_grM_c(); /* 809D4194 */ void create(); @@ -116,6 +116,8 @@ struct dCcD_GObjInf { /* 800840E4 */ ~dCcD_GObjInf(); }; +struct _GXColorS10 {}; + struct J3DModel {}; struct cXyz { @@ -124,8 +126,6 @@ struct cXyz { /* 809D66A0 */ cXyz(); }; -struct _GXColorS10 {}; - struct daNpcT_c { /* 80147FA4 */ void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*); /* 801483F8 */ void loadRes(s8 const*, char const**); @@ -244,7 +244,6 @@ struct dRes_control_c { struct dEvt_control_c { /* 80042468 */ void reset(); /* 8004368C */ void setPtT(void*); - /* 800436EC */ void setPtI_Id(unsigned int); }; struct dEvent_manager_c { @@ -295,13 +294,13 @@ struct dBgS_AcchCir { /* 809D6734 */ ~dBgS_AcchCir(); }; -struct dBgS {}; - struct csXyz { /* 809D6160 */ ~csXyz(); /* 809D65A0 */ csXyz(); }; +struct dBgS {}; + struct dBgS_Acch { /* 80075F94 */ ~dBgS_Acch(); /* 800760A0 */ dBgS_Acch(); @@ -450,7 +449,7 @@ extern "C" void changeAnm__8daNpcT_cFPiPi(); extern "C" void changeBck__8daNpcT_cFPiPi(); extern "C" void changeBtp__8daNpcT_cFPiPi(); extern "C" void changeBtk__8daNpcT_cFPiPi(); -extern "C" void func_809D6CB8(int*); +extern "C" void func_809D6CB8(void* _this, int*); extern "C" void __sinit_d_a_npc_grm_cpp(); extern "C" u8 const m__17daNpc_grM_Param_c[140]; extern "C" extern char const* const d_a_npc_grm__stringBase0; @@ -608,6 +607,16 @@ extern "C" void __register_global_object(); // /* ############################################################################################## */ +/* 809D6E60-809D6E60 0000F0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_809D6E60 = ""; +SECTION_DEAD static char const* const stringBase_809D6E61 = "DEFAULT_GETITEM"; +SECTION_DEAD static char const* const stringBase_809D6E71 = "grA_base"; +SECTION_DEAD static char const* const stringBase_809D6E7A = "grA_mdl"; +SECTION_DEAD static char const* const stringBase_809D6E82 = "TALK_SPA"; +#pragma pop + /* 809D6E94-809D6EA0 000000 000C+00 2/2 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -971,34 +980,34 @@ SECTION_RODATA u8 const daNpc_grM_Param_c::m[140] = { 0xC1, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC1, 0xA0, 0x00, 0x00, 0x41, 0xA0, 0x00, 0x00, 0x42, 0x20, 0x00, 0x00, 0x41, 0xA0, 0x00, 0x00, 0x42, 0xDC, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809D6D70, &daNpc_grM_Param_c::m); +COMPILER_STRIP_GATE(0x809D6D70, &daNpc_grM_Param_c::m); /* 809D6DFC-809D6E00 00008C 0004+00 0/1 0/0 0/0 .rodata @3915 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3915 = -300.0f; -COMPILER_STRIP_GATE(809D6DFC, &lit_3915); +COMPILER_STRIP_GATE(0x809D6DFC, &lit_3915); #pragma pop /* 809D6E00-809D6E04 000090 0004+00 0/1 0/0 0/0 .rodata @3916 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3916 = -50.0f; -COMPILER_STRIP_GATE(809D6E00, &lit_3916); +COMPILER_STRIP_GATE(0x809D6E00, &lit_3916); #pragma pop /* 809D6E04-809D6E08 000094 0004+00 0/1 0/0 0/0 .rodata @3917 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3917 = 300.0f; -COMPILER_STRIP_GATE(809D6E04, &lit_3917); +COMPILER_STRIP_GATE(0x809D6E04, &lit_3917); #pragma pop /* 809D6E08-809D6E0C 000098 0004+00 0/1 0/0 0/0 .rodata @3918 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3918 = 450.0f; -COMPILER_STRIP_GATE(809D6E08, &lit_3918); +COMPILER_STRIP_GATE(0x809D6E08, &lit_3918); #pragma pop /* 809D4194-809D441C 000214 0288+00 1/1 0/0 0/0 .text create__11daNpc_grM_cFv */ @@ -1016,21 +1025,21 @@ asm void daNpc_grM_c::create() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4006 = 0.25f; -COMPILER_STRIP_GATE(809D6E0C, &lit_4006); +COMPILER_STRIP_GATE(0x809D6E0C, &lit_4006); #pragma pop /* 809D6E10-809D6E14 0000A0 0004+00 0/1 0/0 0/0 .rodata @4007 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4007 = 20.0f; -COMPILER_STRIP_GATE(809D6E10, &lit_4007); +COMPILER_STRIP_GATE(0x809D6E10, &lit_4007); #pragma pop /* 809D6E14-809D6E18 0000A4 0004+00 0/1 0/0 0/0 .rodata @4008 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4008 = 5.0f; -COMPILER_STRIP_GATE(809D6E14, &lit_4008); +COMPILER_STRIP_GATE(0x809D6E14, &lit_4008); #pragma pop /* 809D6E18-809D6E1C 0000A8 0004+00 7/12 0/0 0/0 .rodata @4009 */ @@ -1040,36 +1049,36 @@ SECTION_RODATA static u8 const lit_4009[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(809D6E18, &lit_4009); +COMPILER_STRIP_GATE(0x809D6E18, &lit_4009); /* 809D6E1C-809D6E20 0000AC 0004+00 1/2 0/0 0/0 .rodata @4010 */ SECTION_RODATA static f32 const lit_4010 = 100.0f; -COMPILER_STRIP_GATE(809D6E1C, &lit_4010); +COMPILER_STRIP_GATE(0x809D6E1C, &lit_4010); /* 809D6E20-809D6E24 0000B0 0004+00 0/1 0/0 0/0 .rodata @4011 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4011 = 60.0f; -COMPILER_STRIP_GATE(809D6E20, &lit_4011); +COMPILER_STRIP_GATE(0x809D6E20, &lit_4011); #pragma pop /* 809D6E24-809D6E28 0000B4 0004+00 0/2 0/0 0/0 .rodata @4233 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4233 = 65536.0f; -COMPILER_STRIP_GATE(809D6E24, &lit_4233); +COMPILER_STRIP_GATE(0x809D6E24, &lit_4233); #pragma pop /* 809D6E28-809D6E2C 0000B8 0004+00 0/3 0/0 0/0 .rodata @4234 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4234 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(809D6E28, &lit_4234); +COMPILER_STRIP_GATE(0x809D6E28, &lit_4234); #pragma pop /* 809D6E2C-809D6E30 0000BC 0004+00 2/4 0/0 0/0 .rodata @4373 */ SECTION_RODATA static f32 const lit_4373 = 1.0f; -COMPILER_STRIP_GATE(809D6E2C, &lit_4373); +COMPILER_STRIP_GATE(0x809D6E2C, &lit_4373); /* 809D441C-809D45C4 00049C 01A8+00 1/1 0/0 0/0 .text CreateHeap__11daNpc_grM_cFv */ #pragma push @@ -1201,7 +1210,7 @@ asm void daNpc_grM_c::setParam() { /* ############################################################################################## */ /* 809D6E30-809D6E34 0000C0 0004+00 3/3 0/0 0/0 .rodata @4560 */ SECTION_RODATA static f32 const lit_4560 = -1.0f; -COMPILER_STRIP_GATE(809D6E30, &lit_4560); +COMPILER_STRIP_GATE(0x809D6E30, &lit_4560); /* 809D4B24-809D4BB8 000BA4 0094+00 1/0 0/0 0/0 .text setAfterTalkMotion__11daNpc_grM_cFv */ @@ -1239,6 +1248,13 @@ asm void daNpc_grM_c::evtTalk() { } #pragma pop +/* ############################################################################################## */ +/* 809D6E60-809D6E60 0000F0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_809D6E8B = "grM"; +#pragma pop + /* 809D4FD0-809D5098 001050 00C8+00 1/0 0/0 0/0 .text evtCutProc__11daNpc_grM_cFv */ #pragma push #pragma optimization_level 0 @@ -1274,7 +1290,7 @@ asm void daNpc_grM_c::beforeMove() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4797 = 30.0f; -COMPILER_STRIP_GATE(809D6E34, &lit_4797); +COMPILER_STRIP_GATE(0x809D6E34, &lit_4797); #pragma pop /* 809D6E38-809D6E40 0000C8 0004+04 0/1 0/0 0/0 .rodata @4798 */ @@ -1285,14 +1301,14 @@ SECTION_RODATA static u32 const lit_4798[1 + 1 /* padding */] = { /* padding */ 0x00000000, }; -COMPILER_STRIP_GATE(809D6E38, &lit_4798); +COMPILER_STRIP_GATE(0x809D6E38, &lit_4798); #pragma pop /* 809D6E40-809D6E48 0000D0 0008+00 1/3 0/0 0/0 .rodata @4800 */ SECTION_RODATA static u8 const lit_4800[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809D6E40, &lit_4800); +COMPILER_STRIP_GATE(0x809D6E40, &lit_4800); /* 809D526C-809D54C8 0012EC 025C+00 1/0 0/0 0/0 .text setAttnPos__11daNpc_grM_cFv */ #pragma push @@ -1344,7 +1360,7 @@ asm void daNpc_grM_c::selectAction() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpc_grM_c::chkAction(int (daNpc_grM_c::*)(void*)) { +asm void daNpc_grM_c::chkAction(int (daNpc_grM_c::*param_0)(void*)) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_grm/d_a_npc_grm/chkAction__11daNpc_grM_cFM11daNpc_grM_cFPCvPvPv_i.s" } @@ -1355,12 +1371,19 @@ asm void daNpc_grM_c::chkAction(int (daNpc_grM_c::*)(void*)) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpc_grM_c::setAction(int (daNpc_grM_c::*)(void*)) { +asm void daNpc_grM_c::setAction(int (daNpc_grM_c::*param_0)(void*)) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_grm/d_a_npc_grm/setAction__11daNpc_grM_cFM11daNpc_grM_cFPCvPvPv_i.s" } #pragma pop +/* ############################################################################################## */ +/* 809D6E60-809D6E60 0000F0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_809D6E8F = "prm"; +#pragma pop + /* 809D577C-809D58F4 0017FC 0178+00 1/0 0/0 0/0 .text cutTalkSpa__11daNpc_grM_cFi */ #pragma push #pragma optimization_level 0 @@ -1751,7 +1774,7 @@ asm void daNpcT_JntAnm_c::setEyeAngleY(cXyz param_0, s16 param_1, int param_2, f SECTION_RODATA static u8 const lit_4858[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809D6E48, &lit_4858); +COMPILER_STRIP_GATE(0x809D6E48, &lit_4858); #pragma pop /* 809D6E50-809D6E58 0000E0 0008+00 0/1 0/0 0/0 .rodata @4859 */ @@ -1760,7 +1783,7 @@ COMPILER_STRIP_GATE(809D6E48, &lit_4858); SECTION_RODATA static u8 const lit_4859[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809D6E50, &lit_4859); +COMPILER_STRIP_GATE(0x809D6E50, &lit_4859); #pragma pop /* 809D6E58-809D6E60 0000E8 0008+00 0/1 0/0 0/0 .rodata @4860 */ @@ -1769,7 +1792,7 @@ COMPILER_STRIP_GATE(809D6E50, &lit_4859); SECTION_RODATA static u8 const lit_4860[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809D6E58, &lit_4860); +COMPILER_STRIP_GATE(0x809D6E58, &lit_4860); #pragma pop /* 809D69E4-809D6BEC 002A64 0208+00 1/1 0/0 0/0 .text setEyeAngleX__15daNpcT_JntAnm_cF4cXyzfs */ @@ -1891,7 +1914,7 @@ void daNpcT_c::changeBtk(int* param_0, int* param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_809D6CB8(int* param_0) { +extern "C" asm void func_809D6CB8(void* _this, int* param_0) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_grm/d_a_npc_grm/func_809D6CB8.s" } @@ -1916,18 +1939,7 @@ asm void __sinit_d_a_npc_grm_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_809D6CD4 = (void*)__sinit_d_a_npc_grm_cpp; +REGISTER_CTORS(0x809D6CD4, __sinit_d_a_npc_grm_cpp); #pragma pop -/* 809D6E60-809D6E93 0000F0 0033+00 6/3 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_809D6E60 = ""; -SECTION_DEAD static char const* const stringBase_809D6E61 = "DEFAULT_GETITEM"; -SECTION_DEAD static char const* const stringBase_809D6E71 = "grA_base"; -SECTION_DEAD static char const* const stringBase_809D6E7A = "grA_mdl"; -SECTION_DEAD static char const* const stringBase_809D6E82 = "TALK_SPA"; -SECTION_DEAD static char const* const stringBase_809D6E8B = "grM"; -SECTION_DEAD static char const* const stringBase_809D6E8F = "prm"; -#pragma pop +/* 809D6E60-809D6E60 0000F0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/npc/d_a_npc_grmc/d_a_npc_grmc.cpp b/rel/d/a/npc/d_a_npc_grmc/d_a_npc_grmc.cpp index dc684720422..630f632156a 100644 --- a/rel/d/a/npc/d_a_npc_grmc/d_a_npc_grmc.cpp +++ b/rel/d/a/npc/d_a_npc_grmc/d_a_npc_grmc.cpp @@ -15,12 +15,14 @@ struct mDoMtx_stack_c { static u8 now[48]; }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; +struct J3DAnmTransform {}; + +struct J3DModelData {}; + struct Vec {}; struct Z2Creature { @@ -28,8 +30,6 @@ struct Z2Creature { /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -41,6 +41,8 @@ struct fopAc_ac_c { /* 80018B64 */ fopAc_ac_c(); }; +struct daNpcT_faceMotionAnmData_c {}; + struct daNpcT_MotionSeqMngr_c { struct sequenceStepData_c {}; @@ -48,14 +50,12 @@ struct daNpcT_MotionSeqMngr_c { /* 809D9728 */ ~daNpcT_MotionSeqMngr_c(); }; +struct daNpcT_evtData_c {}; + struct daNpcT_motionAnmData_c {}; struct J3DJoint {}; -struct daNpcT_faceMotionAnmData_c {}; - -struct daNpcT_evtData_c {}; - struct daNpc_grMC_c { /* 809D740C */ ~daNpc_grMC_c(); /* 809D7534 */ void create(); @@ -114,6 +114,8 @@ struct dCcD_GObjInf { /* 800840E4 */ ~dCcD_GObjInf(); }; +struct _GXColorS10 {}; + struct J3DModel {}; struct cXyz { @@ -122,8 +124,6 @@ struct cXyz { /* 809D96DC */ cXyz(); }; -struct _GXColorS10 {}; - struct daNpcT_c { /* 80147FA4 */ void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*); /* 801483F8 */ void loadRes(s8 const*, char const**); @@ -283,13 +283,13 @@ struct dBgS_AcchCir { /* 809D9770 */ ~dBgS_AcchCir(); }; -struct dBgS {}; - struct csXyz { /* 809D919C */ ~csXyz(); /* 809D95DC */ csXyz(); }; +struct dBgS {}; + struct dBgS_Acch { /* 80075F94 */ ~dBgS_Acch(); /* 800760A0 */ dBgS_Acch(); @@ -585,6 +585,15 @@ extern "C" void __register_global_object(); // /* ############################################################################################## */ +/* 809D9E68-809D9E68 0000F8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_809D9E68 = ""; +SECTION_DEAD static char const* const stringBase_809D9E69 = "DEFAULT_GETITEM"; +SECTION_DEAD static char const* const stringBase_809D9E79 = "grC"; +SECTION_DEAD static char const* const stringBase_809D9E7D = "grC_Mdl"; +#pragma pop + /* 809D9E8C-809D9E98 000000 000C+00 2/2 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -960,34 +969,34 @@ SECTION_RODATA u8 const daNpc_grMC_Param_c::m[140] = { 0xC1, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC1, 0xA0, 0x00, 0x00, 0x41, 0xA0, 0x00, 0x00, 0x42, 0x20, 0x00, 0x00, 0x41, 0xA0, 0x00, 0x00, 0x42, 0xDC, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809D9D70, &daNpc_grMC_Param_c::m); +COMPILER_STRIP_GATE(0x809D9D70, &daNpc_grMC_Param_c::m); /* 809D9DFC-809D9E00 00008C 0004+00 0/1 0/0 0/0 .rodata @3914 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3914 = -300.0f; -COMPILER_STRIP_GATE(809D9DFC, &lit_3914); +COMPILER_STRIP_GATE(0x809D9DFC, &lit_3914); #pragma pop /* 809D9E00-809D9E04 000090 0004+00 0/1 0/0 0/0 .rodata @3915 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3915 = -50.0f; -COMPILER_STRIP_GATE(809D9E00, &lit_3915); +COMPILER_STRIP_GATE(0x809D9E00, &lit_3915); #pragma pop /* 809D9E04-809D9E08 000094 0004+00 0/1 0/0 0/0 .rodata @3916 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3916 = 300.0f; -COMPILER_STRIP_GATE(809D9E04, &lit_3916); +COMPILER_STRIP_GATE(0x809D9E04, &lit_3916); #pragma pop /* 809D9E08-809D9E0C 000098 0004+00 0/1 0/0 0/0 .rodata @3917 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3917 = 450.0f; -COMPILER_STRIP_GATE(809D9E08, &lit_3917); +COMPILER_STRIP_GATE(0x809D9E08, &lit_3917); #pragma pop /* 809D7534-809D77BC 000214 0288+00 1/1 0/0 0/0 .text create__12daNpc_grMC_cFv */ @@ -1005,21 +1014,21 @@ asm void daNpc_grMC_c::create() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4005 = 0.25f; -COMPILER_STRIP_GATE(809D9E0C, &lit_4005); +COMPILER_STRIP_GATE(0x809D9E0C, &lit_4005); #pragma pop /* 809D9E10-809D9E14 0000A0 0004+00 0/1 0/0 0/0 .rodata @4006 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4006 = 20.0f; -COMPILER_STRIP_GATE(809D9E10, &lit_4006); +COMPILER_STRIP_GATE(0x809D9E10, &lit_4006); #pragma pop /* 809D9E14-809D9E18 0000A4 0004+00 0/1 0/0 0/0 .rodata @4007 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4007 = 5.0f; -COMPILER_STRIP_GATE(809D9E14, &lit_4007); +COMPILER_STRIP_GATE(0x809D9E14, &lit_4007); #pragma pop /* 809D9E18-809D9E1C 0000A8 0004+00 5/11 0/0 0/0 .rodata @4008 */ @@ -1029,40 +1038,40 @@ SECTION_RODATA static u8 const lit_4008[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(809D9E18, &lit_4008); +COMPILER_STRIP_GATE(0x809D9E18, &lit_4008); /* 809D9E1C-809D9E20 0000AC 0004+00 1/2 0/0 0/0 .rodata @4009 */ SECTION_RODATA static f32 const lit_4009 = 100.0f; -COMPILER_STRIP_GATE(809D9E1C, &lit_4009); +COMPILER_STRIP_GATE(0x809D9E1C, &lit_4009); /* 809D9E20-809D9E24 0000B0 0004+00 0/1 0/0 0/0 .rodata @4010 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4010 = 60.0f; -COMPILER_STRIP_GATE(809D9E20, &lit_4010); +COMPILER_STRIP_GATE(0x809D9E20, &lit_4010); #pragma pop /* 809D9E24-809D9E28 0000B4 0004+00 0/2 0/0 0/0 .rodata @4232 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4232 = 65536.0f; -COMPILER_STRIP_GATE(809D9E24, &lit_4232); +COMPILER_STRIP_GATE(0x809D9E24, &lit_4232); #pragma pop /* 809D9E28-809D9E2C 0000B8 0004+00 0/3 0/0 0/0 .rodata @4233 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4233 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(809D9E28, &lit_4233); +COMPILER_STRIP_GATE(0x809D9E28, &lit_4233); #pragma pop /* 809D9E2C-809D9E30 0000BC 0004+00 1/4 0/0 0/0 .rodata @4384 */ SECTION_RODATA static f32 const lit_4384 = 1.0f; -COMPILER_STRIP_GATE(809D9E2C, &lit_4384); +COMPILER_STRIP_GATE(0x809D9E2C, &lit_4384); /* 809D9E30-809D9E34 0000C0 0004+00 2/3 0/0 0/0 .rodata @4385 */ SECTION_RODATA static f32 const lit_4385 = -1.0f; -COMPILER_STRIP_GATE(809D9E30, &lit_4385); +COMPILER_STRIP_GATE(0x809D9E30, &lit_4385); /* 809D77BC-809D79BC 00049C 0200+00 1/1 0/0 0/0 .text CreateHeap__12daNpc_grMC_cFv */ #pragma push @@ -1154,11 +1163,11 @@ asm void daNpc_grMC_c::getMaxNumItem() { /* ############################################################################################## */ /* 809D9E34-809D9E38 0000C4 0004+00 1/1 0/0 0/0 .rodata @4481 */ SECTION_RODATA static f32 const lit_4481 = 90.0f; -COMPILER_STRIP_GATE(809D9E34, &lit_4481); +COMPILER_STRIP_GATE(0x809D9E34, &lit_4481); /* 809D9E38-809D9E3C 0000C8 0004+00 1/1 0/0 0/0 .rodata @4482 */ SECTION_RODATA static f32 const lit_4482 = 270.0f; -COMPILER_STRIP_GATE(809D9E38, &lit_4482); +COMPILER_STRIP_GATE(0x809D9E38, &lit_4482); /* 809D7BC0-809D7C34 0008A0 0074+00 1/1 0/0 0/0 .text isDelete__12daNpc_grMC_cFv */ #pragma push @@ -1225,6 +1234,13 @@ asm void daNpc_grMC_c::evtTalk() { } #pragma pop +/* ############################################################################################## */ +/* 809D9E68-809D9E68 0000F8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_809D9E85 = "grMC"; +#pragma pop + /* 809D8174-809D823C 000E54 00C8+00 1/0 0/0 0/0 .text evtCutProc__12daNpc_grMC_cFv */ #pragma push #pragma optimization_level 0 @@ -1260,28 +1276,28 @@ asm void daNpc_grMC_c::beforeMove() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4734 = 18.0f; -COMPILER_STRIP_GATE(809D9E3C, &lit_4734); +COMPILER_STRIP_GATE(0x809D9E3C, &lit_4734); #pragma pop /* 809D9E40-809D9E44 0000D0 0004+00 0/1 0/0 0/0 .rodata @4735 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4735 = 30.0f; -COMPILER_STRIP_GATE(809D9E40, &lit_4735); +COMPILER_STRIP_GATE(0x809D9E40, &lit_4735); #pragma pop /* 809D9E44-809D9E48 0000D4 0004+00 0/1 0/0 0/0 .rodata @4736 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4736 = 0x38C90FDB; -COMPILER_STRIP_GATE(809D9E44, &lit_4736); +COMPILER_STRIP_GATE(0x809D9E44, &lit_4736); #pragma pop /* 809D9E48-809D9E50 0000D8 0008+00 1/3 0/0 0/0 .rodata @4738 */ SECTION_RODATA static u8 const lit_4738[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809D9E48, &lit_4738); +COMPILER_STRIP_GATE(0x809D9E48, &lit_4738); /* 809D8410-809D8670 0010F0 0260+00 1/0 0/0 0/0 .text setAttnPos__12daNpc_grMC_cFv */ #pragma push @@ -1333,7 +1349,7 @@ asm void daNpc_grMC_c::selectAction() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpc_grMC_c::chkAction(int (daNpc_grMC_c::*)(void*)) { +asm void daNpc_grMC_c::chkAction(int (daNpc_grMC_c::*param_0)(void*)) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_grmc/d_a_npc_grmc/chkAction__12daNpc_grMC_cFM12daNpc_grMC_cFPCvPvPv_i.s" } @@ -1344,7 +1360,7 @@ asm void daNpc_grMC_c::chkAction(int (daNpc_grMC_c::*)(void*)) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpc_grMC_c::setAction(int (daNpc_grMC_c::*)(void*)) { +asm void daNpc_grMC_c::setAction(int (daNpc_grMC_c::*param_0)(void*)) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_grmc/d_a_npc_grmc/setAction__12daNpc_grMC_cFM12daNpc_grMC_cFPCvPvPv_i.s" } @@ -1720,7 +1736,7 @@ asm void daNpcT_JntAnm_c::setEyeAngleY(cXyz param_0, s16 param_1, int param_2, f SECTION_RODATA static u8 const lit_4796[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809D9E50, &lit_4796); +COMPILER_STRIP_GATE(0x809D9E50, &lit_4796); #pragma pop /* 809D9E58-809D9E60 0000E8 0008+00 0/1 0/0 0/0 .rodata @4797 */ @@ -1729,7 +1745,7 @@ COMPILER_STRIP_GATE(809D9E50, &lit_4796); SECTION_RODATA static u8 const lit_4797[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809D9E58, &lit_4797); +COMPILER_STRIP_GATE(0x809D9E58, &lit_4797); #pragma pop /* 809D9E60-809D9E68 0000F0 0008+00 0/1 0/0 0/0 .rodata @4798 */ @@ -1738,7 +1754,7 @@ COMPILER_STRIP_GATE(809D9E58, &lit_4797); SECTION_RODATA static u8 const lit_4798[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809D9E60, &lit_4798); +COMPILER_STRIP_GATE(0x809D9E60, &lit_4798); #pragma pop /* 809D9A10-809D9C18 0026F0 0208+00 1/1 0/0 0/0 .text setEyeAngleX__15daNpcT_JntAnm_cF4cXyzfs */ @@ -1885,16 +1901,7 @@ asm void __sinit_d_a_npc_grmc_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_809D9CF4 = (void*)__sinit_d_a_npc_grmc_cpp; +REGISTER_CTORS(0x809D9CF4, __sinit_d_a_npc_grmc_cpp); #pragma pop -/* 809D9E68-809D9E8A 0000F8 0022+00 4/1 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_809D9E68 = ""; -SECTION_DEAD static char const* const stringBase_809D9E69 = "DEFAULT_GETITEM"; -SECTION_DEAD static char const* const stringBase_809D9E79 = "grC"; -SECTION_DEAD static char const* const stringBase_809D9E7D = "grC_Mdl"; -SECTION_DEAD static char const* const stringBase_809D9E85 = "grMC"; -#pragma pop +/* 809D9E68-809D9E68 0000F8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/npc/d_a_npc_gro/d_a_npc_gro.cpp b/rel/d/a/npc/d_a_npc_gro/d_a_npc_gro.cpp index 88567c2d8d6..67b04c998ee 100644 --- a/rel/d/a/npc/d_a_npc_gro/d_a_npc_gro.cpp +++ b/rel/d/a/npc/d_a_npc_gro/d_a_npc_gro.cpp @@ -34,12 +34,12 @@ struct mDoExt_bckAnm { /* 8000D990 */ void changeBckOnly(J3DAnmTransform*); }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; +struct J3DModelData {}; + struct Z2Creature { /* 802C03C8 */ Z2Creature(); /* 802C0420 */ ~Z2Creature(); @@ -58,10 +58,10 @@ struct fopAc_ac_c { /* 80018C8C */ ~fopAc_ac_c(); }; -struct J3DJoint {}; - struct J3DModel {}; +struct J3DJoint {}; + struct daNpc_grO_c { /* 809DA56C */ daNpc_grO_c(); /* 809DA780 */ ~daNpc_grO_c(); @@ -125,22 +125,22 @@ struct dCcD_GObjInf { /* 800840E4 */ ~dCcD_GObjInf(); }; +struct J3DAnmTexPattern { + /* 8032AF50 */ void getTexNo(u16, u16*) const; +}; + struct J3DAnmTextureSRTKey {}; +struct J3DAnmTransformKey {}; + +struct _GXColorS10 {}; + struct dCcD_SrcCyl {}; struct dCcD_Cyl { /* 800848B4 */ void Set(dCcD_SrcCyl const&); }; -struct _GXColorS10 {}; - -struct J3DAnmTexPattern { - /* 8032AF50 */ void getTexNo(u16, u16*) const; -}; - -struct J3DAnmTransformKey {}; - struct daNpcF_c { struct daNpcF_anmPlayData {}; @@ -230,7 +230,6 @@ struct dMsgFlow_c { struct dEvt_control_c { /* 80042468 */ void reset(); /* 80042518 */ void reset(void*); - /* 800436EC */ void setPtI_Id(unsigned int); }; struct dEvent_manager_c { @@ -630,6 +629,17 @@ extern "C" void __register_global_object(); // /* ############################################################################################## */ +/* 809DF2B8-809DF2B8 00033C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_809DF2B8 = "grO"; +SECTION_DEAD static char const* const stringBase_809DF2BC = "grO1"; +SECTION_DEAD static char const* const stringBase_809DF2C1 = "grO1D"; +SECTION_DEAD static char const* const stringBase_809DF2C7 = "BOKIN_FINISH"; +SECTION_DEAD static char const* const stringBase_809DF2D4 = "PUSHOUT"; +SECTION_DEAD static char const* const stringBase_809DF2DC = ""; +#pragma pop + /* 809DF2F8-809DF304 000000 000C+00 7/7 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -1082,7 +1092,7 @@ SECTION_RODATA u8 const daNpc_grO_Param_c::m[108] = { 0x43, 0x34, 0x00, 0x00, 0x43, 0xFA, 0x00, 0x00, 0x43, 0x96, 0x00, 0x00, 0xC3, 0x96, 0x00, 0x00, 0x00, 0x3C, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809DEF7C, &daNpc_grO_Param_c::m); +COMPILER_STRIP_GATE(0x809DEF7C, &daNpc_grO_Param_c::m); /* 809DEFE8-809DEFF8 00006C 0010+00 0/1 0/0 0/0 .rodata heapSize$4387 */ #pragma push @@ -1090,35 +1100,35 @@ COMPILER_STRIP_GATE(809DEF7C, &daNpc_grO_Param_c::m); SECTION_RODATA static u8 const heapSize[16] = { 0x00, 0x00, 0x3D, 0x50, 0x00, 0x00, 0x3D, 0x60, 0x00, 0x00, 0x35, 0x50, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809DEFE8, &heapSize); +COMPILER_STRIP_GATE(0x809DEFE8, &heapSize); #pragma pop /* 809DEFF8-809DEFFC 00007C 0004+00 0/1 0/0 0/0 .rodata @4474 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4474 = -300.0f; -COMPILER_STRIP_GATE(809DEFF8, &lit_4474); +COMPILER_STRIP_GATE(0x809DEFF8, &lit_4474); #pragma pop /* 809DEFFC-809DF000 000080 0004+00 0/1 0/0 0/0 .rodata @4475 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4475 = -50.0f; -COMPILER_STRIP_GATE(809DEFFC, &lit_4475); +COMPILER_STRIP_GATE(0x809DEFFC, &lit_4475); #pragma pop /* 809DF000-809DF004 000084 0004+00 0/1 0/0 0/0 .rodata @4476 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4476 = 300.0f; -COMPILER_STRIP_GATE(809DF000, &lit_4476); +COMPILER_STRIP_GATE(0x809DF000, &lit_4476); #pragma pop /* 809DF004-809DF008 000088 0004+00 0/1 0/0 0/0 .rodata @4477 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4477 = 450.0f; -COMPILER_STRIP_GATE(809DF004, &lit_4477); +COMPILER_STRIP_GATE(0x809DF004, &lit_4477); #pragma pop /* 809DA980-809DAC58 000500 02D8+00 1/1 0/0 0/0 .text create__11daNpc_grO_cFv */ @@ -1134,7 +1144,7 @@ asm void daNpc_grO_c::create() { /* ############################################################################################## */ /* 809DF008-809DF00C 00008C 0004+00 4/4 0/0 0/0 .rodata @4552 */ SECTION_RODATA static f32 const lit_4552 = 1.0f; -COMPILER_STRIP_GATE(809DF008, &lit_4552); +COMPILER_STRIP_GATE(0x809DF008, &lit_4552); /* 809DF00C-809DF010 000090 0004+00 5/7 0/0 0/0 .rodata @4553 */ SECTION_RODATA static u8 const lit_4553[4] = { @@ -1143,7 +1153,7 @@ SECTION_RODATA static u8 const lit_4553[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(809DF00C, &lit_4553); +COMPILER_STRIP_GATE(0x809DF00C, &lit_4553); /* 809DAC58-809DAF74 0007D8 031C+00 1/1 0/0 0/0 .text CreateHeap__11daNpc_grO_cFv */ #pragma push @@ -1290,7 +1300,7 @@ asm void daNpc_grO_c::Draw() { SECTION_RODATA static u8 const lit_4605[12] = { 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x04, }; -COMPILER_STRIP_GATE(809DF010, &lit_4605); +COMPILER_STRIP_GATE(0x809DF010, &lit_4605); /* 809DB214-809DB448 000D94 0234+00 1/1 0/0 0/0 .text * ctrlJoint__11daNpc_grO_cFP8J3DJointP8J3DModel */ @@ -1348,11 +1358,11 @@ asm void daNpc_grO_c::main() { /* ############################################################################################## */ /* 809DF01C-809DF020 0000A0 0004+00 7/7 0/0 0/0 .rodata @4812 */ SECTION_RODATA static f32 const lit_4812 = -1.0f; -COMPILER_STRIP_GATE(809DF01C, &lit_4812); +COMPILER_STRIP_GATE(0x809DF01C, &lit_4812); /* 809DF020-809DF024 0000A4 0004+00 1/1 0/0 0/0 .rodata @4813 */ SECTION_RODATA static f32 const lit_4813 = 1.0f / 50.0f; -COMPILER_STRIP_GATE(809DF020, &lit_4813); +COMPILER_STRIP_GATE(0x809DF020, &lit_4813); /* 809DB774-809DB854 0012F4 00E0+00 1/0 0/0 0/0 .text ctrlBtk__11daNpc_grO_cFv */ #pragma push @@ -1369,28 +1379,28 @@ asm void daNpc_grO_c::ctrlBtk() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4946 = 30.0f; -COMPILER_STRIP_GATE(809DF024, &lit_4946); +COMPILER_STRIP_GATE(0x809DF024, &lit_4946); #pragma pop /* 809DF028-809DF02C 0000AC 0004+00 0/1 0/0 0/0 .rodata @4947 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4947 = 10.0f; -COMPILER_STRIP_GATE(809DF028, &lit_4947); +COMPILER_STRIP_GATE(0x809DF028, &lit_4947); #pragma pop /* 809DF02C-809DF030 0000B0 0004+00 0/1 0/0 0/0 .rodata @4948 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4948 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(809DF02C, &lit_4948); +COMPILER_STRIP_GATE(0x809DF02C, &lit_4948); #pragma pop /* 809DF030-809DF034 0000B4 0004+00 0/1 0/0 0/0 .rodata @4949 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4949 = 125.0f; -COMPILER_STRIP_GATE(809DF030, &lit_4949); +COMPILER_STRIP_GATE(0x809DF030, &lit_4949); #pragma pop /* 809DF034-809DF03C 0000B8 0008+00 0/1 0/0 0/0 .rodata @4950 */ @@ -1399,7 +1409,7 @@ COMPILER_STRIP_GATE(809DF030, &lit_4949); SECTION_RODATA static u8 const lit_4950[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809DF034, &lit_4950); +COMPILER_STRIP_GATE(0x809DF034, &lit_4950); #pragma pop /* 809DF03C-809DF044 0000C0 0008+00 0/1 0/0 0/0 .rodata @4951 */ @@ -1408,7 +1418,7 @@ COMPILER_STRIP_GATE(809DF034, &lit_4950); SECTION_RODATA static u8 const lit_4951[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809DF03C, &lit_4951); +COMPILER_STRIP_GATE(0x809DF03C, &lit_4951); #pragma pop /* 809DF044-809DF04C 0000C8 0008+00 0/1 0/0 0/0 .rodata @4952 */ @@ -1417,14 +1427,14 @@ COMPILER_STRIP_GATE(809DF03C, &lit_4951); SECTION_RODATA static u8 const lit_4952[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809DF044, &lit_4952); +COMPILER_STRIP_GATE(0x809DF044, &lit_4952); #pragma pop /* 809DF04C-809DF050 0000D0 0004+00 0/1 0/0 0/0 .rodata @4953 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4953 = 60.0f; -COMPILER_STRIP_GATE(809DF04C, &lit_4953); +COMPILER_STRIP_GATE(0x809DF04C, &lit_4953); #pragma pop /* 809DF700-809DF704 000008 0001+03 1/1 0/0 0/0 .bss @1109 */ @@ -1626,6 +1636,13 @@ asm void daNpc_grO_c::getTypeFromParam() { } #pragma pop +/* ############################################################################################## */ +/* 809DF2B8-809DF2B8 00033C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_809DF2DD = "D_MN04"; +#pragma pop + /* 809DC43C-809DC4F4 001FBC 00B8+00 1/1 0/0 0/0 .text isDelete__11daNpc_grO_cFv */ #pragma push #pragma optimization_level 0 @@ -1653,7 +1670,7 @@ asm void daNpc_grO_c::reset() { SECTION_RODATA static u8 const lit_5164[12] = { 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(809DF050, &lit_5164); +COMPILER_STRIP_GATE(0x809DF050, &lit_5164); #pragma pop /* 809DF05C-809DF068 0000E0 000C+00 0/1 0/0 0/0 .rodata @5165 */ @@ -1662,7 +1679,7 @@ COMPILER_STRIP_GATE(809DF050, &lit_5164); SECTION_RODATA static u8 const lit_5165[12] = { 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809DF05C, &lit_5165); +COMPILER_STRIP_GATE(0x809DF05C, &lit_5165); #pragma pop /* 809DF068-809DF070 0000EC 0008+00 0/1 0/0 0/0 .rodata @5166 */ @@ -1671,7 +1688,7 @@ COMPILER_STRIP_GATE(809DF05C, &lit_5165); SECTION_RODATA static u8 const lit_5166[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809DF068, &lit_5166); +COMPILER_STRIP_GATE(0x809DF068, &lit_5166); #pragma pop /* 809DF070-809DF07C 0000F4 000C+00 0/1 0/0 0/0 .rodata @5167 */ @@ -1680,7 +1697,7 @@ COMPILER_STRIP_GATE(809DF068, &lit_5166); SECTION_RODATA static u8 const lit_5167[12] = { 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(809DF070, &lit_5167); +COMPILER_STRIP_GATE(0x809DF070, &lit_5167); #pragma pop /* 809DF07C-809DF088 000100 000C+00 0/1 0/0 0/0 .rodata @5168 */ @@ -1689,7 +1706,7 @@ COMPILER_STRIP_GATE(809DF070, &lit_5167); SECTION_RODATA static u8 const lit_5168[12] = { 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809DF07C, &lit_5168); +COMPILER_STRIP_GATE(0x809DF07C, &lit_5168); #pragma pop /* 809DF088-809DF090 00010C 0008+00 0/1 0/0 0/0 .rodata @5169 */ @@ -1698,7 +1715,7 @@ COMPILER_STRIP_GATE(809DF07C, &lit_5168); SECTION_RODATA static u8 const lit_5169[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809DF088, &lit_5169); +COMPILER_STRIP_GATE(0x809DF088, &lit_5169); #pragma pop /* 809DF090-809DF09C 000114 000C+00 0/1 0/0 0/0 .rodata @5170 */ @@ -1707,7 +1724,7 @@ COMPILER_STRIP_GATE(809DF088, &lit_5169); SECTION_RODATA static u8 const lit_5170[12] = { 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(809DF090, &lit_5170); +COMPILER_STRIP_GATE(0x809DF090, &lit_5170); #pragma pop /* 809DF09C-809DF0A8 000120 000C+00 0/1 0/0 0/0 .rodata @5171 */ @@ -1716,7 +1733,7 @@ COMPILER_STRIP_GATE(809DF090, &lit_5170); SECTION_RODATA static u8 const lit_5171[12] = { 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809DF09C, &lit_5171); +COMPILER_STRIP_GATE(0x809DF09C, &lit_5171); #pragma pop /* 809DF0A8-809DF0B0 00012C 0008+00 0/1 0/0 0/0 .rodata @5172 */ @@ -1725,7 +1742,7 @@ COMPILER_STRIP_GATE(809DF09C, &lit_5171); SECTION_RODATA static u8 const lit_5172[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809DF0A8, &lit_5172); +COMPILER_STRIP_GATE(0x809DF0A8, &lit_5172); #pragma pop /* 809DF0B0-809DF0BC 000134 000C+00 0/1 0/0 0/0 .rodata @5173 */ @@ -1734,7 +1751,7 @@ COMPILER_STRIP_GATE(809DF0A8, &lit_5172); SECTION_RODATA static u8 const lit_5173[12] = { 0x00, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(809DF0B0, &lit_5173); +COMPILER_STRIP_GATE(0x809DF0B0, &lit_5173); #pragma pop /* 809DF0BC-809DF0C8 000140 000C+00 0/1 0/0 0/0 .rodata @5174 */ @@ -1743,7 +1760,7 @@ COMPILER_STRIP_GATE(809DF0B0, &lit_5173); SECTION_RODATA static u8 const lit_5174[12] = { 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809DF0BC, &lit_5174); +COMPILER_STRIP_GATE(0x809DF0BC, &lit_5174); #pragma pop /* 809DF0C8-809DF0D0 00014C 0008+00 0/1 0/0 0/0 .rodata @5175 */ @@ -1752,7 +1769,7 @@ COMPILER_STRIP_GATE(809DF0BC, &lit_5174); SECTION_RODATA static u8 const lit_5175[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809DF0C8, &lit_5175); +COMPILER_STRIP_GATE(0x809DF0C8, &lit_5175); #pragma pop /* 809DF0D0-809DF0DC 000154 000C+00 0/1 0/0 0/0 .rodata @5176 */ @@ -1761,7 +1778,7 @@ COMPILER_STRIP_GATE(809DF0C8, &lit_5175); SECTION_RODATA static u8 const lit_5176[12] = { 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(809DF0D0, &lit_5176); +COMPILER_STRIP_GATE(0x809DF0D0, &lit_5176); #pragma pop /* 809DF0DC-809DF0E8 000160 000C+00 0/1 0/0 0/0 .rodata @5177 */ @@ -1770,7 +1787,7 @@ COMPILER_STRIP_GATE(809DF0D0, &lit_5176); SECTION_RODATA static u8 const lit_5177[12] = { 0x00, 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809DF0DC, &lit_5177); +COMPILER_STRIP_GATE(0x809DF0DC, &lit_5177); #pragma pop /* 809DF0E8-809DF0F0 00016C 0008+00 0/1 0/0 0/0 .rodata @5178 */ @@ -1779,7 +1796,7 @@ COMPILER_STRIP_GATE(809DF0DC, &lit_5177); SECTION_RODATA static u8 const lit_5178[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809DF0E8, &lit_5178); +COMPILER_STRIP_GATE(0x809DF0E8, &lit_5178); #pragma pop /* 809DF0F0-809DF0FC 000174 000C+00 0/1 0/0 0/0 .rodata @5179 */ @@ -1788,7 +1805,7 @@ COMPILER_STRIP_GATE(809DF0E8, &lit_5178); SECTION_RODATA static u8 const lit_5179[12] = { 0x00, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(809DF0F0, &lit_5179); +COMPILER_STRIP_GATE(0x809DF0F0, &lit_5179); #pragma pop /* 809DF0FC-809DF108 000180 000C+00 0/1 0/0 0/0 .rodata @5180 */ @@ -1797,7 +1814,7 @@ COMPILER_STRIP_GATE(809DF0F0, &lit_5179); SECTION_RODATA static u8 const lit_5180[12] = { 0x00, 0x0B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809DF0FC, &lit_5180); +COMPILER_STRIP_GATE(0x809DF0FC, &lit_5180); #pragma pop /* 809DF108-809DF110 00018C 0008+00 0/1 0/0 0/0 .rodata @5181 */ @@ -1806,7 +1823,7 @@ COMPILER_STRIP_GATE(809DF0FC, &lit_5180); SECTION_RODATA static u8 const lit_5181[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809DF108, &lit_5181); +COMPILER_STRIP_GATE(0x809DF108, &lit_5181); #pragma pop /* 809DF110-809DF11C 000194 000C+00 0/1 0/0 0/0 .rodata @5182 */ @@ -1815,7 +1832,7 @@ COMPILER_STRIP_GATE(809DF108, &lit_5181); SECTION_RODATA static u8 const lit_5182[12] = { 0x00, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809DF110, &lit_5182); +COMPILER_STRIP_GATE(0x809DF110, &lit_5182); #pragma pop /* 809DF11C-809DF120 0001A0 0004+00 0/1 0/0 0/0 .rodata @5183 */ @@ -1827,7 +1844,7 @@ SECTION_RODATA static u8 const lit_5183[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(809DF11C, &lit_5183); +COMPILER_STRIP_GATE(0x809DF11C, &lit_5183); #pragma pop /* 809DF120-809DF12C 0001A4 000C+00 0/1 0/0 0/0 .rodata @5184 */ @@ -1836,7 +1853,7 @@ COMPILER_STRIP_GATE(809DF11C, &lit_5183); SECTION_RODATA static u8 const lit_5184[12] = { 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809DF120, &lit_5184); +COMPILER_STRIP_GATE(0x809DF120, &lit_5184); #pragma pop /* 809DF12C-809DF130 0001B0 0004+00 0/1 0/0 0/0 .rodata @5185 */ @@ -1848,7 +1865,7 @@ SECTION_RODATA static u8 const lit_5185[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(809DF12C, &lit_5185); +COMPILER_STRIP_GATE(0x809DF12C, &lit_5185); #pragma pop /* 809DF130-809DF13C 0001B4 000C+00 0/1 0/0 0/0 .rodata @5186 */ @@ -1857,7 +1874,7 @@ COMPILER_STRIP_GATE(809DF12C, &lit_5185); SECTION_RODATA static u8 const lit_5186[12] = { 0x00, 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809DF130, &lit_5186); +COMPILER_STRIP_GATE(0x809DF130, &lit_5186); #pragma pop /* 809DF13C-809DF140 0001C0 0004+00 0/1 0/0 0/0 .rodata @5187 */ @@ -1869,7 +1886,7 @@ SECTION_RODATA static u8 const lit_5187[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(809DF13C, &lit_5187); +COMPILER_STRIP_GATE(0x809DF13C, &lit_5187); #pragma pop /* 809DF140-809DF14C 0001C4 000C+00 0/1 0/0 0/0 .rodata @5188 */ @@ -1878,7 +1895,7 @@ COMPILER_STRIP_GATE(809DF13C, &lit_5187); SECTION_RODATA static u8 const lit_5188[12] = { 0x00, 0x0B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809DF140, &lit_5188); +COMPILER_STRIP_GATE(0x809DF140, &lit_5188); #pragma pop /* 809DF14C-809DF150 0001D0 0004+00 0/1 0/0 0/0 .rodata @5189 */ @@ -1890,7 +1907,7 @@ SECTION_RODATA static u8 const lit_5189[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(809DF14C, &lit_5189); +COMPILER_STRIP_GATE(0x809DF14C, &lit_5189); #pragma pop /* 809DF150-809DF15C 0001D4 000C+00 0/1 0/0 0/0 .rodata @5190 */ @@ -1899,7 +1916,7 @@ COMPILER_STRIP_GATE(809DF14C, &lit_5189); SECTION_RODATA static u8 const lit_5190[12] = { 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809DF150, &lit_5190); +COMPILER_STRIP_GATE(0x809DF150, &lit_5190); #pragma pop /* 809DF15C-809DF160 0001E0 0004+00 0/1 0/0 0/0 .rodata @5191 */ @@ -1911,7 +1928,7 @@ SECTION_RODATA static u8 const lit_5191[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(809DF15C, &lit_5191); +COMPILER_STRIP_GATE(0x809DF15C, &lit_5191); #pragma pop /* 809DF160-809DF16C 0001E4 000C+00 0/1 0/0 0/0 .rodata @5192 */ @@ -1920,7 +1937,7 @@ COMPILER_STRIP_GATE(809DF15C, &lit_5191); SECTION_RODATA static u8 const lit_5192[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809DF160, &lit_5192); +COMPILER_STRIP_GATE(0x809DF160, &lit_5192); #pragma pop /* 809DF16C-809DF170 0001F0 0004+00 0/1 0/0 0/0 .rodata @5193 */ @@ -1932,7 +1949,7 @@ SECTION_RODATA static u8 const lit_5193[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(809DF16C, &lit_5193); +COMPILER_STRIP_GATE(0x809DF16C, &lit_5193); #pragma pop /* 809DC67C-809DCA68 0021FC 03EC+00 1/1 0/0 0/0 .text playExpression__11daNpc_grO_cFv */ @@ -1955,7 +1972,7 @@ SECTION_RODATA static u8 const lit_5194[52] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809DF170, &lit_5194); +COMPILER_STRIP_GATE(0x809DF170, &lit_5194); #pragma pop /* 809DF1A4-809DF1B0 000228 000C+00 0/1 0/0 0/0 .rodata @5222 */ @@ -1964,7 +1981,7 @@ COMPILER_STRIP_GATE(809DF170, &lit_5194); SECTION_RODATA static u8 const lit_5222[12] = { 0x00, 0x0D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809DF1A4, &lit_5222); +COMPILER_STRIP_GATE(0x809DF1A4, &lit_5222); #pragma pop /* 809DF1B0-809DF1B4 000234 0004+00 0/1 0/0 0/0 .rodata @5223 */ @@ -1976,7 +1993,7 @@ SECTION_RODATA static u8 const lit_5223[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(809DF1B0, &lit_5223); +COMPILER_STRIP_GATE(0x809DF1B0, &lit_5223); #pragma pop /* 809DF1B4-809DF1C0 000238 000C+00 0/1 0/0 0/0 .rodata @5224 */ @@ -1985,7 +2002,7 @@ COMPILER_STRIP_GATE(809DF1B0, &lit_5223); SECTION_RODATA static u8 const lit_5224[12] = { 0x00, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809DF1B4, &lit_5224); +COMPILER_STRIP_GATE(0x809DF1B4, &lit_5224); #pragma pop /* 809DF1C0-809DF1C4 000244 0004+00 0/1 0/0 0/0 .rodata @5225 */ @@ -1997,7 +2014,7 @@ SECTION_RODATA static u8 const lit_5225[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(809DF1C0, &lit_5225); +COMPILER_STRIP_GATE(0x809DF1C0, &lit_5225); #pragma pop /* 809DF1C4-809DF1D0 000248 000C+00 0/1 0/0 0/0 .rodata @5226 */ @@ -2006,7 +2023,7 @@ COMPILER_STRIP_GATE(809DF1C0, &lit_5225); SECTION_RODATA static u8 const lit_5226[12] = { 0x00, 0x0F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(809DF1C4, &lit_5226); +COMPILER_STRIP_GATE(0x809DF1C4, &lit_5226); #pragma pop /* 809DF1D0-809DF1DC 000254 000C+00 0/1 0/0 0/0 .rodata @5227 */ @@ -2015,7 +2032,7 @@ COMPILER_STRIP_GATE(809DF1C4, &lit_5226); SECTION_RODATA static u8 const lit_5227[12] = { 0x00, 0x0D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809DF1D0, &lit_5227); +COMPILER_STRIP_GATE(0x809DF1D0, &lit_5227); #pragma pop /* 809DF1DC-809DF1E4 000260 0008+00 0/1 0/0 0/0 .rodata @5228 */ @@ -2024,7 +2041,7 @@ COMPILER_STRIP_GATE(809DF1D0, &lit_5227); SECTION_RODATA static u8 const lit_5228[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809DF1DC, &lit_5228); +COMPILER_STRIP_GATE(0x809DF1DC, &lit_5228); #pragma pop /* 809DF1E4-809DF1F0 000268 000C+00 0/1 0/0 0/0 .rodata @5229 */ @@ -2033,7 +2050,7 @@ COMPILER_STRIP_GATE(809DF1DC, &lit_5228); SECTION_RODATA static u8 const lit_5229[12] = { 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(809DF1E4, &lit_5229); +COMPILER_STRIP_GATE(0x809DF1E4, &lit_5229); #pragma pop /* 809DF1F0-809DF1FC 000274 000C+00 0/1 0/0 0/0 .rodata @5230 */ @@ -2042,7 +2059,7 @@ COMPILER_STRIP_GATE(809DF1E4, &lit_5229); SECTION_RODATA static u8 const lit_5230[12] = { 0x00, 0x0D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809DF1F0, &lit_5230); +COMPILER_STRIP_GATE(0x809DF1F0, &lit_5230); #pragma pop /* 809DF1FC-809DF204 000280 0008+00 0/1 0/0 0/0 .rodata @5231 */ @@ -2051,7 +2068,7 @@ COMPILER_STRIP_GATE(809DF1F0, &lit_5230); SECTION_RODATA static u8 const lit_5231[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809DF1FC, &lit_5231); +COMPILER_STRIP_GATE(0x809DF1FC, &lit_5231); #pragma pop /* 809DF204-809DF210 000288 000C+00 0/1 0/0 0/0 .rodata @5232 */ @@ -2060,7 +2077,7 @@ COMPILER_STRIP_GATE(809DF1FC, &lit_5231); SECTION_RODATA static u8 const lit_5232[12] = { 0x00, 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809DF204, &lit_5232); +COMPILER_STRIP_GATE(0x809DF204, &lit_5232); #pragma pop /* 809DF210-809DF214 000294 0004+00 0/1 0/0 0/0 .rodata @5233 */ @@ -2072,7 +2089,7 @@ SECTION_RODATA static u8 const lit_5233[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(809DF210, &lit_5233); +COMPILER_STRIP_GATE(0x809DF210, &lit_5233); #pragma pop /* 809DF214-809DF220 000298 000C+00 0/1 0/0 0/0 .rodata @5234 */ @@ -2081,7 +2098,7 @@ COMPILER_STRIP_GATE(809DF210, &lit_5233); SECTION_RODATA static u8 const lit_5234[12] = { 0x00, 0x13, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(809DF214, &lit_5234); +COMPILER_STRIP_GATE(0x809DF214, &lit_5234); #pragma pop /* 809DF220-809DF22C 0002A4 000C+00 0/1 0/0 0/0 .rodata @5235 */ @@ -2090,7 +2107,7 @@ COMPILER_STRIP_GATE(809DF214, &lit_5234); SECTION_RODATA static u8 const lit_5235[12] = { 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809DF220, &lit_5235); +COMPILER_STRIP_GATE(0x809DF220, &lit_5235); #pragma pop /* 809DF22C-809DF234 0002B0 0008+00 0/1 0/0 0/0 .rodata @5236 */ @@ -2099,7 +2116,7 @@ COMPILER_STRIP_GATE(809DF220, &lit_5235); SECTION_RODATA static u8 const lit_5236[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809DF22C, &lit_5236); +COMPILER_STRIP_GATE(0x809DF22C, &lit_5236); #pragma pop /* 809DF234-809DF240 0002B8 000C+00 0/1 0/0 0/0 .rodata @5237 */ @@ -2108,7 +2125,7 @@ COMPILER_STRIP_GATE(809DF22C, &lit_5236); SECTION_RODATA static u8 const lit_5237[12] = { 0x00, 0x15, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(809DF234, &lit_5237); +COMPILER_STRIP_GATE(0x809DF234, &lit_5237); #pragma pop /* 809DF240-809DF24C 0002C4 000C+00 0/1 0/0 0/0 .rodata @5238 */ @@ -2117,7 +2134,7 @@ COMPILER_STRIP_GATE(809DF234, &lit_5237); SECTION_RODATA static u8 const lit_5238[12] = { 0x00, 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809DF240, &lit_5238); +COMPILER_STRIP_GATE(0x809DF240, &lit_5238); #pragma pop /* 809DF24C-809DF254 0002D0 0008+00 0/1 0/0 0/0 .rodata @5239 */ @@ -2126,7 +2143,7 @@ COMPILER_STRIP_GATE(809DF240, &lit_5238); SECTION_RODATA static u8 const lit_5239[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809DF24C, &lit_5239); +COMPILER_STRIP_GATE(0x809DF24C, &lit_5239); #pragma pop /* 809DF254-809DF260 0002D8 000C+00 0/1 0/0 0/0 .rodata @5240 */ @@ -2135,7 +2152,7 @@ COMPILER_STRIP_GATE(809DF24C, &lit_5239); SECTION_RODATA static u8 const lit_5240[12] = { 0x00, 0x16, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809DF254, &lit_5240); +COMPILER_STRIP_GATE(0x809DF254, &lit_5240); #pragma pop /* 809DF260-809DF264 0002E4 0004+00 0/1 0/0 0/0 .rodata @5241 */ @@ -2147,7 +2164,7 @@ SECTION_RODATA static u8 const lit_5241[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(809DF260, &lit_5241); +COMPILER_STRIP_GATE(0x809DF260, &lit_5241); #pragma pop /* 809DF264-809DF270 0002E8 000C+00 0/1 0/0 0/0 .rodata @5242 */ @@ -2156,7 +2173,7 @@ COMPILER_STRIP_GATE(809DF260, &lit_5241); SECTION_RODATA static u8 const lit_5242[12] = { 0x00, 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809DF264, &lit_5242); +COMPILER_STRIP_GATE(0x809DF264, &lit_5242); #pragma pop /* 809DF270-809DF274 0002F4 0004+00 0/1 0/0 0/0 .rodata @5243 */ @@ -2168,7 +2185,7 @@ SECTION_RODATA static u8 const lit_5243[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(809DF270, &lit_5243); +COMPILER_STRIP_GATE(0x809DF270, &lit_5243); #pragma pop /* 809DCA68-809DCDA4 0025E8 033C+00 1/1 0/0 0/0 .text playMotion__11daNpc_grO_cFv */ @@ -2186,7 +2203,7 @@ asm void daNpc_grO_c::playMotion() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpc_grO_c::chkAction(int (daNpc_grO_c::*)(void*)) { +asm void daNpc_grO_c::chkAction(int (daNpc_grO_c::*param_0)(void*)) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_gro/d_a_npc_gro/chkAction__11daNpc_grO_cFM11daNpc_grO_cFPCvPvPv_i.s" } @@ -2197,7 +2214,7 @@ asm void daNpc_grO_c::chkAction(int (daNpc_grO_c::*)(void*)) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpc_grO_c::setAction(int (daNpc_grO_c::*)(void*)) { +asm void daNpc_grO_c::setAction(int (daNpc_grO_c::*param_0)(void*)) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_gro/d_a_npc_gro/setAction__11daNpc_grO_cFM11daNpc_grO_cFPCvPvPv_i.s" } @@ -2252,7 +2269,7 @@ SECTION_RODATA static u8 const lit_5244[36] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809DF274, &lit_5244); +COMPILER_STRIP_GATE(0x809DF274, &lit_5244); #pragma pop /* 809DF298-809DF2A4 00031C 000C+00 0/1 0/0 0/0 .rodata @5421 */ @@ -2261,28 +2278,28 @@ COMPILER_STRIP_GATE(809DF274, &lit_5244); SECTION_RODATA static u8 const lit_5421[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809DF298, &lit_5421); +COMPILER_STRIP_GATE(0x809DF298, &lit_5421); #pragma pop /* 809DF2A4-809DF2A8 000328 0004+00 0/1 0/0 0/0 .rodata @5474 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5474 = -80.0f; -COMPILER_STRIP_GATE(809DF2A4, &lit_5474); +COMPILER_STRIP_GATE(0x809DF2A4, &lit_5474); #pragma pop /* 809DF2A8-809DF2AC 00032C 0004+00 0/1 0/0 0/0 .rodata @5475 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5475 = 80.0f; -COMPILER_STRIP_GATE(809DF2A8, &lit_5475); +COMPILER_STRIP_GATE(0x809DF2A8, &lit_5475); #pragma pop /* 809DF2AC-809DF2B0 000330 0004+00 0/1 0/0 0/0 .rodata @5476 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5476 = 40.0f; -COMPILER_STRIP_GATE(809DF2AC, &lit_5476); +COMPILER_STRIP_GATE(0x809DF2AC, &lit_5476); #pragma pop /* 809DD3FC-809DD684 002F7C 0288+00 1/1 0/0 0/0 .text lookat__11daNpc_grO_cFv */ @@ -2335,6 +2352,13 @@ asm void daNpc_grO_c::waitMaro(void* param_0) { } #pragma pop +/* ############################################################################################## */ +/* 809DF2B8-809DF2B8 00033C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_809DF2E4 = "DEFAULT_GETITEM"; +#pragma pop + /* 809DDCF8-809DE084 003878 038C+00 3/0 0/0 0/0 .text talk__11daNpc_grO_cFPv */ #pragma push #pragma optimization_level 0 @@ -2360,7 +2384,13 @@ static asm void s_sub(void* param_0, void* param_1) { SECTION_RODATA static u8 const lit_5690[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809DF2B0, &lit_5690); +COMPILER_STRIP_GATE(0x809DF2B0, &lit_5690); + +/* 809DF2B8-809DF2B8 00033C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_809DF2F4 = "prm"; +#pragma pop /* 809DE0D0-809DE30C 003C50 023C+00 1/0 0/0 0/0 .text ECut_bokinFinish__11daNpc_grO_cFi */ @@ -2603,7 +2633,7 @@ asm void __sinit_d_a_npc_gro_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_809DEE68 = (void*)__sinit_d_a_npc_gro_cpp; +REGISTER_CTORS(0x809DEE68, __sinit_d_a_npc_gro_cpp); #pragma pop /* 809DEF0C-809DEF10 004A8C 0004+00 1/0 0/0 0/0 .text adjustShapeAngle__11daNpc_grO_cFv @@ -2814,17 +2844,4 @@ static u8 data_809DF7C8[4]; static u8 data_809DF7CC[4]; #pragma pop -/* 809DF2B8-809DF2F8 00033C 0040+00 8/4 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_809DF2B8 = "grO"; -SECTION_DEAD static char const* const stringBase_809DF2BC = "grO1"; -SECTION_DEAD static char const* const stringBase_809DF2C1 = "grO1D"; -SECTION_DEAD static char const* const stringBase_809DF2C7 = "BOKIN_FINISH"; -SECTION_DEAD static char const* const stringBase_809DF2D4 = "PUSHOUT"; -SECTION_DEAD static char const* const stringBase_809DF2DC = ""; -SECTION_DEAD static char const* const stringBase_809DF2DD = "D_MN04"; -SECTION_DEAD static char const* const stringBase_809DF2E4 = "DEFAULT_GETITEM"; -SECTION_DEAD static char const* const stringBase_809DF2F4 = "prm"; -#pragma pop +/* 809DF2B8-809DF2B8 00033C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/npc/d_a_npc_grr/d_a_npc_grr.cpp b/rel/d/a/npc/d_a_npc_grr/d_a_npc_grr.cpp index 7bee3d9006e..85823bc0173 100644 --- a/rel/d/a/npc/d_a_npc_grr/d_a_npc_grr.cpp +++ b/rel/d/a/npc/d_a_npc_grr/d_a_npc_grr.cpp @@ -33,12 +33,12 @@ struct mDoExt_bckAnm { /* 8000D990 */ void changeBckOnly(J3DAnmTransform*); }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; +struct J3DModelData {}; + struct Z2Creature { /* 802C03C8 */ Z2Creature(); /* 802C0420 */ ~Z2Creature(); @@ -57,10 +57,10 @@ struct fopAc_ac_c { /* 80018C8C */ ~fopAc_ac_c(); }; -struct J3DJoint {}; - struct J3DModel {}; +struct J3DJoint {}; + struct daNpc_grR_c { /* 809DF8CC */ daNpc_grR_c(); /* 809DFAE0 */ ~daNpc_grR_c(); @@ -117,22 +117,22 @@ struct dCcD_GObjInf { /* 800840E4 */ ~dCcD_GObjInf(); }; +struct J3DAnmTexPattern { + /* 8032AF50 */ void getTexNo(u16, u16*) const; +}; + struct J3DAnmTextureSRTKey {}; +struct J3DAnmTransformKey {}; + +struct _GXColorS10 {}; + struct dCcD_SrcCyl {}; struct dCcD_Cyl { /* 800848B4 */ void Set(dCcD_SrcCyl const&); }; -struct _GXColorS10 {}; - -struct J3DAnmTexPattern { - /* 8032AF50 */ void getTexNo(u16, u16*) const; -}; - -struct J3DAnmTransformKey {}; - struct daNpcF_c { struct daNpcF_anmPlayData {}; @@ -211,7 +211,6 @@ struct dMsgFlow_c { struct dEvt_control_c { /* 80042468 */ void reset(); /* 80042518 */ void reset(void*); - /* 800436EC */ void setPtI_Id(unsigned int); }; struct dEvent_manager_c { @@ -585,6 +584,14 @@ extern "C" void __register_global_object(); // /* ############################################################################################## */ +/* 809E3BCC-809E3BCC 0002F4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_809E3BCC = "grR"; +SECTION_DEAD static char const* const stringBase_809E3BD0 = "grR1"; +SECTION_DEAD static char const* const stringBase_809E3BD5 = ""; +#pragma pop + /* 809E3BF0-809E3BFC 000000 000C+00 4/4 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -944,7 +951,7 @@ SECTION_RODATA u8 const daNpc_grR_Param_c::m[108] = { 0x43, 0x34, 0x00, 0x00, 0x43, 0xFA, 0x00, 0x00, 0x43, 0x96, 0x00, 0x00, 0xC3, 0x96, 0x00, 0x00, 0x00, 0x3C, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809E38D8, &daNpc_grR_Param_c::m); +COMPILER_STRIP_GATE(0x809E38D8, &daNpc_grR_Param_c::m); /* 809E3944-809E3954 00006C 0010+00 0/1 0/0 0/0 .rodata heapSize$4308 */ #pragma push @@ -952,35 +959,35 @@ COMPILER_STRIP_GATE(809E38D8, &daNpc_grR_Param_c::m); SECTION_RODATA static u8 const heapSize[16] = { 0x00, 0x00, 0x2D, 0x70, 0x00, 0x00, 0x2D, 0x60, 0x00, 0x00, 0x2D, 0x70, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809E3944, &heapSize); +COMPILER_STRIP_GATE(0x809E3944, &heapSize); #pragma pop /* 809E3954-809E3958 00007C 0004+00 0/1 0/0 0/0 .rodata @4395 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4395 = -300.0f; -COMPILER_STRIP_GATE(809E3954, &lit_4395); +COMPILER_STRIP_GATE(0x809E3954, &lit_4395); #pragma pop /* 809E3958-809E395C 000080 0004+00 0/1 0/0 0/0 .rodata @4396 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4396 = -50.0f; -COMPILER_STRIP_GATE(809E3958, &lit_4396); +COMPILER_STRIP_GATE(0x809E3958, &lit_4396); #pragma pop /* 809E395C-809E3960 000084 0004+00 0/1 0/0 0/0 .rodata @4397 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4397 = 300.0f; -COMPILER_STRIP_GATE(809E395C, &lit_4397); +COMPILER_STRIP_GATE(0x809E395C, &lit_4397); #pragma pop /* 809E3960-809E3964 000088 0004+00 0/1 0/0 0/0 .rodata @4398 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4398 = 450.0f; -COMPILER_STRIP_GATE(809E3960, &lit_4398); +COMPILER_STRIP_GATE(0x809E3960, &lit_4398); #pragma pop /* 809DFCE0-809DFFB8 000500 02D8+00 1/1 0/0 0/0 .text create__11daNpc_grR_cFv */ @@ -996,7 +1003,7 @@ asm void daNpc_grR_c::create() { /* ############################################################################################## */ /* 809E3964-809E3968 00008C 0004+00 4/4 0/0 0/0 .rodata @4452 */ SECTION_RODATA static f32 const lit_4452 = 1.0f; -COMPILER_STRIP_GATE(809E3964, &lit_4452); +COMPILER_STRIP_GATE(0x809E3964, &lit_4452); /* 809E3968-809E396C 000090 0004+00 5/7 0/0 0/0 .rodata @4453 */ SECTION_RODATA static u8 const lit_4453[4] = { @@ -1005,7 +1012,7 @@ SECTION_RODATA static u8 const lit_4453[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(809E3968, &lit_4453); +COMPILER_STRIP_GATE(0x809E3968, &lit_4453); /* 809DFFB8-809E0240 0007D8 0288+00 1/1 0/0 0/0 .text CreateHeap__11daNpc_grR_cFv */ #pragma push @@ -1152,7 +1159,7 @@ asm void daNpc_grR_c::Draw() { SECTION_RODATA static u8 const lit_4505[12] = { 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x04, }; -COMPILER_STRIP_GATE(809E396C, &lit_4505); +COMPILER_STRIP_GATE(0x809E396C, &lit_4505); /* 809E04E0-809E0714 000D00 0234+00 1/1 0/0 0/0 .text * ctrlJoint__11daNpc_grR_cFP8J3DJointP8J3DModel */ @@ -1210,11 +1217,11 @@ asm void daNpc_grR_c::main() { /* ############################################################################################## */ /* 809E3978-809E397C 0000A0 0004+00 7/7 0/0 0/0 .rodata @4718 */ SECTION_RODATA static f32 const lit_4718 = -1.0f; -COMPILER_STRIP_GATE(809E3978, &lit_4718); +COMPILER_STRIP_GATE(0x809E3978, &lit_4718); /* 809E397C-809E3980 0000A4 0004+00 1/1 0/0 0/0 .rodata @4719 */ SECTION_RODATA static f32 const lit_4719 = 1.0f / 50.0f; -COMPILER_STRIP_GATE(809E397C, &lit_4719); +COMPILER_STRIP_GATE(0x809E397C, &lit_4719); /* 809E0A7C-809E0B5C 00129C 00E0+00 1/0 0/0 0/0 .text ctrlBtk__11daNpc_grR_cFv */ #pragma push @@ -1231,28 +1238,28 @@ asm void daNpc_grR_c::ctrlBtk() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4852 = 24.0f; -COMPILER_STRIP_GATE(809E3980, &lit_4852); +COMPILER_STRIP_GATE(0x809E3980, &lit_4852); #pragma pop /* 809E3984-809E3988 0000AC 0004+00 0/1 0/0 0/0 .rodata @4853 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4853 = 30.0f; -COMPILER_STRIP_GATE(809E3984, &lit_4853); +COMPILER_STRIP_GATE(0x809E3984, &lit_4853); #pragma pop /* 809E3988-809E398C 0000B0 0004+00 0/1 0/0 0/0 .rodata @4854 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4854 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(809E3988, &lit_4854); +COMPILER_STRIP_GATE(0x809E3988, &lit_4854); #pragma pop /* 809E398C-809E3990 0000B4 0004+00 0/1 0/0 0/0 .rodata @4855 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4855 = 125.0f; -COMPILER_STRIP_GATE(809E398C, &lit_4855); +COMPILER_STRIP_GATE(0x809E398C, &lit_4855); #pragma pop /* 809E3990-809E3998 0000B8 0008+00 0/1 0/0 0/0 .rodata @4856 */ @@ -1261,7 +1268,7 @@ COMPILER_STRIP_GATE(809E398C, &lit_4855); SECTION_RODATA static u8 const lit_4856[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809E3990, &lit_4856); +COMPILER_STRIP_GATE(0x809E3990, &lit_4856); #pragma pop /* 809E3998-809E39A0 0000C0 0008+00 0/1 0/0 0/0 .rodata @4857 */ @@ -1270,7 +1277,7 @@ COMPILER_STRIP_GATE(809E3990, &lit_4856); SECTION_RODATA static u8 const lit_4857[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809E3998, &lit_4857); +COMPILER_STRIP_GATE(0x809E3998, &lit_4857); #pragma pop /* 809E39A0-809E39A8 0000C8 0008+00 0/1 0/0 0/0 .rodata @4858 */ @@ -1279,7 +1286,7 @@ COMPILER_STRIP_GATE(809E3998, &lit_4857); SECTION_RODATA static u8 const lit_4858[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809E39A0, &lit_4858); +COMPILER_STRIP_GATE(0x809E39A0, &lit_4858); #pragma pop /* 809E3EF8-809E3EFC 000008 0001+03 1/1 0/0 0/0 .bss @1109 */ @@ -1476,6 +1483,13 @@ asm void daNpc_grR_c::getTypeFromParam() { } #pragma pop +/* ############################################################################################## */ +/* 809E3BCC-809E3BCC 0002F4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_809E3BD6 = "D_MN04"; +#pragma pop + /* 809E15E4-809E16CC 001E04 00E8+00 1/1 0/0 0/0 .text isDelete__11daNpc_grR_cFv */ #pragma push #pragma optimization_level 0 @@ -1503,7 +1517,7 @@ asm void daNpc_grR_c::reset() { SECTION_RODATA static u8 const lit_5043[12] = { 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809E39A8, &lit_5043); +COMPILER_STRIP_GATE(0x809E39A8, &lit_5043); #pragma pop /* 809E39B4-809E39B8 0000DC 0004+00 0/1 0/0 0/0 .rodata @5044 */ @@ -1515,7 +1529,7 @@ SECTION_RODATA static u8 const lit_5044[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(809E39B4, &lit_5044); +COMPILER_STRIP_GATE(0x809E39B4, &lit_5044); #pragma pop /* 809E39B8-809E39C4 0000E0 000C+00 0/1 0/0 0/0 .rodata @5045 */ @@ -1524,7 +1538,7 @@ COMPILER_STRIP_GATE(809E39B4, &lit_5044); SECTION_RODATA static u8 const lit_5045[12] = { 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(809E39B8, &lit_5045); +COMPILER_STRIP_GATE(0x809E39B8, &lit_5045); #pragma pop /* 809E39C4-809E39D0 0000EC 000C+00 0/1 0/0 0/0 .rodata @5046 */ @@ -1533,7 +1547,7 @@ COMPILER_STRIP_GATE(809E39B8, &lit_5045); SECTION_RODATA static u8 const lit_5046[12] = { 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809E39C4, &lit_5046); +COMPILER_STRIP_GATE(0x809E39C4, &lit_5046); #pragma pop /* 809E39D0-809E39D8 0000F8 0008+00 0/1 0/0 0/0 .rodata @5047 */ @@ -1542,7 +1556,7 @@ COMPILER_STRIP_GATE(809E39C4, &lit_5046); SECTION_RODATA static u8 const lit_5047[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809E39D0, &lit_5047); +COMPILER_STRIP_GATE(0x809E39D0, &lit_5047); #pragma pop /* 809E39D8-809E39E4 000100 000C+00 0/1 0/0 0/0 .rodata @5048 */ @@ -1551,7 +1565,7 @@ COMPILER_STRIP_GATE(809E39D0, &lit_5047); SECTION_RODATA static u8 const lit_5048[12] = { 0x00, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809E39D8, &lit_5048); +COMPILER_STRIP_GATE(0x809E39D8, &lit_5048); #pragma pop /* 809E39E4-809E39E8 00010C 0004+00 0/1 0/0 0/0 .rodata @5049 */ @@ -1563,7 +1577,7 @@ SECTION_RODATA static u8 const lit_5049[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(809E39E4, &lit_5049); +COMPILER_STRIP_GATE(0x809E39E4, &lit_5049); #pragma pop /* 809E39E8-809E39F4 000110 000C+00 0/1 0/0 0/0 .rodata @5050 */ @@ -1572,7 +1586,7 @@ COMPILER_STRIP_GATE(809E39E4, &lit_5049); SECTION_RODATA static u8 const lit_5050[12] = { 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(809E39E8, &lit_5050); +COMPILER_STRIP_GATE(0x809E39E8, &lit_5050); #pragma pop /* 809E39F4-809E3A00 00011C 000C+00 0/1 0/0 0/0 .rodata @5051 */ @@ -1581,7 +1595,7 @@ COMPILER_STRIP_GATE(809E39E8, &lit_5050); SECTION_RODATA static u8 const lit_5051[12] = { 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809E39F4, &lit_5051); +COMPILER_STRIP_GATE(0x809E39F4, &lit_5051); #pragma pop /* 809E3A00-809E3A08 000128 0008+00 0/1 0/0 0/0 .rodata @5052 */ @@ -1590,7 +1604,7 @@ COMPILER_STRIP_GATE(809E39F4, &lit_5051); SECTION_RODATA static u8 const lit_5052[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809E3A00, &lit_5052); +COMPILER_STRIP_GATE(0x809E3A00, &lit_5052); #pragma pop /* 809E3A08-809E3A14 000130 000C+00 0/1 0/0 0/0 .rodata @5053 */ @@ -1599,7 +1613,7 @@ COMPILER_STRIP_GATE(809E3A00, &lit_5052); SECTION_RODATA static u8 const lit_5053[12] = { 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(809E3A08, &lit_5053); +COMPILER_STRIP_GATE(0x809E3A08, &lit_5053); #pragma pop /* 809E3A14-809E3A20 00013C 000C+00 0/1 0/0 0/0 .rodata @5054 */ @@ -1608,7 +1622,7 @@ COMPILER_STRIP_GATE(809E3A08, &lit_5053); SECTION_RODATA static u8 const lit_5054[12] = { 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809E3A14, &lit_5054); +COMPILER_STRIP_GATE(0x809E3A14, &lit_5054); #pragma pop /* 809E3A20-809E3A28 000148 0008+00 0/1 0/0 0/0 .rodata @5055 */ @@ -1617,7 +1631,7 @@ COMPILER_STRIP_GATE(809E3A14, &lit_5054); SECTION_RODATA static u8 const lit_5055[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809E3A20, &lit_5055); +COMPILER_STRIP_GATE(0x809E3A20, &lit_5055); #pragma pop /* 809E3A28-809E3A34 000150 000C+00 0/1 0/0 0/0 .rodata @5056 */ @@ -1626,7 +1640,7 @@ COMPILER_STRIP_GATE(809E3A20, &lit_5055); SECTION_RODATA static u8 const lit_5056[12] = { 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809E3A28, &lit_5056); +COMPILER_STRIP_GATE(0x809E3A28, &lit_5056); #pragma pop /* 809E3A34-809E3A38 00015C 0004+00 0/1 0/0 0/0 .rodata @5057 */ @@ -1638,7 +1652,7 @@ SECTION_RODATA static u8 const lit_5057[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(809E3A34, &lit_5057); +COMPILER_STRIP_GATE(0x809E3A34, &lit_5057); #pragma pop /* 809E3A38-809E3A44 000160 000C+00 0/1 0/0 0/0 .rodata @5058 */ @@ -1647,7 +1661,7 @@ COMPILER_STRIP_GATE(809E3A34, &lit_5057); SECTION_RODATA static u8 const lit_5058[12] = { 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809E3A38, &lit_5058); +COMPILER_STRIP_GATE(0x809E3A38, &lit_5058); #pragma pop /* 809E3A44-809E3A48 00016C 0004+00 0/1 0/0 0/0 .rodata @5059 */ @@ -1659,7 +1673,7 @@ SECTION_RODATA static u8 const lit_5059[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(809E3A44, &lit_5059); +COMPILER_STRIP_GATE(0x809E3A44, &lit_5059); #pragma pop /* 809E3A48-809E3A54 000170 000C+00 0/1 0/0 0/0 .rodata @5060 */ @@ -1668,7 +1682,7 @@ COMPILER_STRIP_GATE(809E3A44, &lit_5059); SECTION_RODATA static u8 const lit_5060[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809E3A48, &lit_5060); +COMPILER_STRIP_GATE(0x809E3A48, &lit_5060); #pragma pop /* 809E3A54-809E3A58 00017C 0004+00 0/1 0/0 0/0 .rodata @5061 */ @@ -1680,7 +1694,7 @@ SECTION_RODATA static u8 const lit_5061[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(809E3A54, &lit_5061); +COMPILER_STRIP_GATE(0x809E3A54, &lit_5061); #pragma pop /* 809E18A4-809E1B28 0020C4 0284+00 1/1 0/0 0/0 .text playExpression__11daNpc_grR_cFv */ @@ -1701,7 +1715,7 @@ SECTION_RODATA static u8 const lit_5062[32] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809E3A58, &lit_5062); +COMPILER_STRIP_GATE(0x809E3A58, &lit_5062); #pragma pop /* 809E3A78-809E3A84 0001A0 000C+00 0/1 0/0 0/0 .rodata @5080 */ @@ -1710,7 +1724,7 @@ COMPILER_STRIP_GATE(809E3A58, &lit_5062); SECTION_RODATA static u8 const lit_5080[12] = { 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809E3A78, &lit_5080); +COMPILER_STRIP_GATE(0x809E3A78, &lit_5080); #pragma pop /* 809E3A84-809E3A88 0001AC 0004+00 0/1 0/0 0/0 .rodata @5081 */ @@ -1722,7 +1736,7 @@ SECTION_RODATA static u8 const lit_5081[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(809E3A84, &lit_5081); +COMPILER_STRIP_GATE(0x809E3A84, &lit_5081); #pragma pop /* 809E3A88-809E3A94 0001B0 000C+00 0/1 0/0 0/0 .rodata @5082 */ @@ -1731,7 +1745,7 @@ COMPILER_STRIP_GATE(809E3A84, &lit_5081); SECTION_RODATA static u8 const lit_5082[12] = { 0x00, 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(809E3A88, &lit_5082); +COMPILER_STRIP_GATE(0x809E3A88, &lit_5082); #pragma pop /* 809E3A94-809E3AA0 0001BC 000C+00 0/1 0/0 0/0 .rodata @5083 */ @@ -1740,7 +1754,7 @@ COMPILER_STRIP_GATE(809E3A88, &lit_5082); SECTION_RODATA static u8 const lit_5083[12] = { 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809E3A94, &lit_5083); +COMPILER_STRIP_GATE(0x809E3A94, &lit_5083); #pragma pop /* 809E3AA0-809E3AA8 0001C8 0008+00 0/1 0/0 0/0 .rodata @5084 */ @@ -1749,7 +1763,7 @@ COMPILER_STRIP_GATE(809E3A94, &lit_5083); SECTION_RODATA static u8 const lit_5084[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809E3AA0, &lit_5084); +COMPILER_STRIP_GATE(0x809E3AA0, &lit_5084); #pragma pop /* 809E3AA8-809E3AB4 0001D0 000C+00 0/1 0/0 0/0 .rodata @5085 */ @@ -1758,7 +1772,7 @@ COMPILER_STRIP_GATE(809E3AA0, &lit_5084); SECTION_RODATA static u8 const lit_5085[12] = { 0x00, 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809E3AA8, &lit_5085); +COMPILER_STRIP_GATE(0x809E3AA8, &lit_5085); #pragma pop /* 809E3AB4-809E3AB8 0001DC 0004+00 0/1 0/0 0/0 .rodata @5086 */ @@ -1770,7 +1784,7 @@ SECTION_RODATA static u8 const lit_5086[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(809E3AB4, &lit_5086); +COMPILER_STRIP_GATE(0x809E3AB4, &lit_5086); #pragma pop /* 809E3AB8-809E3AC4 0001E0 000C+00 0/1 0/0 0/0 .rodata @5087 */ @@ -1779,7 +1793,7 @@ COMPILER_STRIP_GATE(809E3AB4, &lit_5086); SECTION_RODATA static u8 const lit_5087[12] = { 0x00, 0x0B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809E3AB8, &lit_5087); +COMPILER_STRIP_GATE(0x809E3AB8, &lit_5087); #pragma pop /* 809E3AC4-809E3AC8 0001EC 0004+00 0/1 0/0 0/0 .rodata @5088 */ @@ -1791,7 +1805,7 @@ SECTION_RODATA static u8 const lit_5088[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(809E3AC4, &lit_5088); +COMPILER_STRIP_GATE(0x809E3AC4, &lit_5088); #pragma pop /* 809E3AC8-809E3AD4 0001F0 000C+00 0/1 0/0 0/0 .rodata @5089 */ @@ -1800,7 +1814,7 @@ COMPILER_STRIP_GATE(809E3AC4, &lit_5088); SECTION_RODATA static u8 const lit_5089[12] = { 0x00, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(809E3AC8, &lit_5089); +COMPILER_STRIP_GATE(0x809E3AC8, &lit_5089); #pragma pop /* 809E3AD4-809E3AE0 0001FC 000C+00 0/1 0/0 0/0 .rodata @5090 */ @@ -1809,7 +1823,7 @@ COMPILER_STRIP_GATE(809E3AC8, &lit_5089); SECTION_RODATA static u8 const lit_5090[12] = { 0x00, 0x0B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809E3AD4, &lit_5090); +COMPILER_STRIP_GATE(0x809E3AD4, &lit_5090); #pragma pop /* 809E3AE0-809E3AE8 000208 0008+00 0/1 0/0 0/0 .rodata @5091 */ @@ -1818,7 +1832,7 @@ COMPILER_STRIP_GATE(809E3AD4, &lit_5090); SECTION_RODATA static u8 const lit_5091[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809E3AE0, &lit_5091); +COMPILER_STRIP_GATE(0x809E3AE0, &lit_5091); #pragma pop /* 809E3AE8-809E3AF4 000210 000C+00 0/1 0/0 0/0 .rodata @5092 */ @@ -1827,7 +1841,7 @@ COMPILER_STRIP_GATE(809E3AE0, &lit_5091); SECTION_RODATA static u8 const lit_5092[12] = { 0x00, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(809E3AE8, &lit_5092); +COMPILER_STRIP_GATE(0x809E3AE8, &lit_5092); #pragma pop /* 809E3AF4-809E3B00 00021C 000C+00 0/1 0/0 0/0 .rodata @5093 */ @@ -1836,7 +1850,7 @@ COMPILER_STRIP_GATE(809E3AE8, &lit_5092); SECTION_RODATA static u8 const lit_5093[12] = { 0x00, 0x0B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809E3AF4, &lit_5093); +COMPILER_STRIP_GATE(0x809E3AF4, &lit_5093); #pragma pop /* 809E3B00-809E3B08 000228 0008+00 0/1 0/0 0/0 .rodata @5094 */ @@ -1845,7 +1859,7 @@ COMPILER_STRIP_GATE(809E3AF4, &lit_5093); SECTION_RODATA static u8 const lit_5094[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809E3B00, &lit_5094); +COMPILER_STRIP_GATE(0x809E3B00, &lit_5094); #pragma pop /* 809E3B08-809E3B14 000230 000C+00 0/1 0/0 0/0 .rodata @5095 */ @@ -1854,7 +1868,7 @@ COMPILER_STRIP_GATE(809E3B00, &lit_5094); SECTION_RODATA static u8 const lit_5095[12] = { 0x00, 0x0D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(809E3B08, &lit_5095); +COMPILER_STRIP_GATE(0x809E3B08, &lit_5095); #pragma pop /* 809E3B14-809E3B20 00023C 000C+00 0/1 0/0 0/0 .rodata @5096 */ @@ -1863,7 +1877,7 @@ COMPILER_STRIP_GATE(809E3B08, &lit_5095); SECTION_RODATA static u8 const lit_5096[12] = { 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809E3B14, &lit_5096); +COMPILER_STRIP_GATE(0x809E3B14, &lit_5096); #pragma pop /* 809E3B20-809E3B28 000248 0008+00 0/1 0/0 0/0 .rodata @5097 */ @@ -1872,7 +1886,7 @@ COMPILER_STRIP_GATE(809E3B14, &lit_5096); SECTION_RODATA static u8 const lit_5097[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809E3B20, &lit_5097); +COMPILER_STRIP_GATE(0x809E3B20, &lit_5097); #pragma pop /* 809E3B28-809E3B34 000250 000C+00 0/1 0/0 0/0 .rodata @5098 */ @@ -1881,7 +1895,7 @@ COMPILER_STRIP_GATE(809E3B20, &lit_5097); SECTION_RODATA static u8 const lit_5098[12] = { 0x00, 0x0F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(809E3B28, &lit_5098); +COMPILER_STRIP_GATE(0x809E3B28, &lit_5098); #pragma pop /* 809E3B34-809E3B40 00025C 000C+00 0/1 0/0 0/0 .rodata @5099 */ @@ -1890,7 +1904,7 @@ COMPILER_STRIP_GATE(809E3B28, &lit_5098); SECTION_RODATA static u8 const lit_5099[12] = { 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809E3B34, &lit_5099); +COMPILER_STRIP_GATE(0x809E3B34, &lit_5099); #pragma pop /* 809E3B40-809E3B48 000268 0008+00 0/1 0/0 0/0 .rodata @5100 */ @@ -1899,7 +1913,7 @@ COMPILER_STRIP_GATE(809E3B34, &lit_5099); SECTION_RODATA static u8 const lit_5100[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809E3B40, &lit_5100); +COMPILER_STRIP_GATE(0x809E3B40, &lit_5100); #pragma pop /* 809E3B48-809E3B54 000270 000C+00 0/1 0/0 0/0 .rodata @5101 */ @@ -1908,7 +1922,7 @@ COMPILER_STRIP_GATE(809E3B40, &lit_5100); SECTION_RODATA static u8 const lit_5101[12] = { 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(809E3B48, &lit_5101); +COMPILER_STRIP_GATE(0x809E3B48, &lit_5101); #pragma pop /* 809E3B54-809E3B60 00027C 000C+00 0/1 0/0 0/0 .rodata @5102 */ @@ -1917,7 +1931,7 @@ COMPILER_STRIP_GATE(809E3B48, &lit_5101); SECTION_RODATA static u8 const lit_5102[12] = { 0x00, 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809E3B54, &lit_5102); +COMPILER_STRIP_GATE(0x809E3B54, &lit_5102); #pragma pop /* 809E3B60-809E3B68 000288 0008+00 0/1 0/0 0/0 .rodata @5103 */ @@ -1926,7 +1940,7 @@ COMPILER_STRIP_GATE(809E3B54, &lit_5102); SECTION_RODATA static u8 const lit_5103[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809E3B60, &lit_5103); +COMPILER_STRIP_GATE(0x809E3B60, &lit_5103); #pragma pop /* 809E3B68-809E3B74 000290 000C+00 0/1 0/0 0/0 .rodata @5104 */ @@ -1935,7 +1949,7 @@ COMPILER_STRIP_GATE(809E3B60, &lit_5103); SECTION_RODATA static u8 const lit_5104[12] = { 0x00, 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809E3B68, &lit_5104); +COMPILER_STRIP_GATE(0x809E3B68, &lit_5104); #pragma pop /* 809E3B74-809E3B78 00029C 0004+00 0/1 0/0 0/0 .rodata @5105 */ @@ -1947,7 +1961,7 @@ SECTION_RODATA static u8 const lit_5105[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(809E3B74, &lit_5105); +COMPILER_STRIP_GATE(0x809E3B74, &lit_5105); #pragma pop /* 809E3B78-809E3B84 0002A0 000C+00 0/1 0/0 0/0 .rodata @5106 */ @@ -1956,7 +1970,7 @@ COMPILER_STRIP_GATE(809E3B74, &lit_5105); SECTION_RODATA static u8 const lit_5106[12] = { 0x00, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809E3B78, &lit_5106); +COMPILER_STRIP_GATE(0x809E3B78, &lit_5106); #pragma pop /* 809E3B84-809E3B88 0002AC 0004+00 0/1 0/0 0/0 .rodata @5107 */ @@ -1968,7 +1982,7 @@ SECTION_RODATA static u8 const lit_5107[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(809E3B84, &lit_5107); +COMPILER_STRIP_GATE(0x809E3B84, &lit_5107); #pragma pop /* 809E1B28-809E1F10 002348 03E8+00 1/1 0/0 0/0 .text playMotion__11daNpc_grR_cFv */ @@ -1986,7 +2000,7 @@ asm void daNpc_grR_c::playMotion() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpc_grR_c::chkAction(int (daNpc_grR_c::*)(void*)) { +asm void daNpc_grR_c::chkAction(int (daNpc_grR_c::*param_0)(void*)) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_grr/d_a_npc_grr/chkAction__11daNpc_grR_cFM11daNpc_grR_cFPCvPvPv_i.s" } @@ -1997,7 +2011,7 @@ asm void daNpc_grR_c::chkAction(int (daNpc_grR_c::*)(void*)) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpc_grR_c::setAction(int (daNpc_grR_c::*)(void*)) { +asm void daNpc_grR_c::setAction(int (daNpc_grR_c::*param_0)(void*)) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_grr/d_a_npc_grr/setAction__11daNpc_grR_cFM11daNpc_grR_cFPCvPvPv_i.s" } @@ -2052,7 +2066,7 @@ SECTION_RODATA static u8 const lit_5108[44] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809E3B88, &lit_5108); +COMPILER_STRIP_GATE(0x809E3B88, &lit_5108); #pragma pop /* 809E3BB4-809E3BC0 0002DC 000C+00 0/1 0/0 0/0 .rodata @5264 */ @@ -2061,28 +2075,28 @@ COMPILER_STRIP_GATE(809E3B88, &lit_5108); SECTION_RODATA static u8 const lit_5264[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809E3BB4, &lit_5264); +COMPILER_STRIP_GATE(0x809E3BB4, &lit_5264); #pragma pop /* 809E3BC0-809E3BC4 0002E8 0004+00 0/1 0/0 0/0 .rodata @5317 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5317 = -80.0f; -COMPILER_STRIP_GATE(809E3BC0, &lit_5317); +COMPILER_STRIP_GATE(0x809E3BC0, &lit_5317); #pragma pop /* 809E3BC4-809E3BC8 0002EC 0004+00 0/1 0/0 0/0 .rodata @5318 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5318 = 80.0f; -COMPILER_STRIP_GATE(809E3BC4, &lit_5318); +COMPILER_STRIP_GATE(0x809E3BC4, &lit_5318); #pragma pop /* 809E3BC8-809E3BCC 0002F0 0004+00 0/1 0/0 0/0 .rodata @5319 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5319 = 40.0f; -COMPILER_STRIP_GATE(809E3BC8, &lit_5319); +COMPILER_STRIP_GATE(0x809E3BC8, &lit_5319); #pragma pop /* 809E24A4-809E272C 002CC4 0288+00 1/1 0/0 0/0 .text lookat__11daNpc_grR_cFv */ @@ -2125,6 +2139,13 @@ asm void daNpc_grR_c::waitMaro(void* param_0) { } #pragma pop +/* ############################################################################################## */ +/* 809E3BCC-809E3BCC 0002F4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_809E3BDD = "DEFAULT_GETITEM"; +#pragma pop + /* 809E2B48-809E2E84 003368 033C+00 2/0 0/0 0/0 .text talk__11daNpc_grR_cFPv */ #pragma push #pragma optimization_level 0 @@ -2355,7 +2376,7 @@ asm void __sinit_d_a_npc_grr_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_809E3800 = (void*)__sinit_d_a_npc_grr_cpp; +REGISTER_CTORS(0x809E3800, __sinit_d_a_npc_grr_cpp); #pragma pop /* 809E3868-809E386C 004088 0004+00 1/0 0/0 0/0 .text adjustShapeAngle__11daNpc_grR_cFv @@ -2566,13 +2587,4 @@ static u8 data_809E3FC0[4]; static u8 data_809E3FC4[4]; #pragma pop -/* 809E3BCC-809E3BED 0002F4 0021+00 5/2 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_809E3BCC = "grR"; -SECTION_DEAD static char const* const stringBase_809E3BD0 = "grR1"; -SECTION_DEAD static char const* const stringBase_809E3BD5 = ""; -SECTION_DEAD static char const* const stringBase_809E3BD6 = "D_MN04"; -SECTION_DEAD static char const* const stringBase_809E3BDD = "DEFAULT_GETITEM"; -#pragma pop +/* 809E3BCC-809E3BCC 0002F4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/npc/d_a_npc_grs/d_a_npc_grs.cpp b/rel/d/a/npc/d_a_npc_grs/d_a_npc_grs.cpp index 30891499809..c5458619391 100644 --- a/rel/d/a/npc/d_a_npc_grs/d_a_npc_grs.cpp +++ b/rel/d/a/npc/d_a_npc_grs/d_a_npc_grs.cpp @@ -33,12 +33,12 @@ struct mDoExt_bckAnm { /* 8000D990 */ void changeBckOnly(J3DAnmTransform*); }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; +struct J3DModelData {}; + struct Z2Creature { /* 802C03C8 */ Z2Creature(); /* 802C0420 */ ~Z2Creature(); @@ -57,10 +57,10 @@ struct fopAc_ac_c { /* 80018C8C */ ~fopAc_ac_c(); }; -struct J3DJoint {}; - struct J3DModel {}; +struct J3DJoint {}; + struct daNpc_grS_c { /* 809E40CC */ daNpc_grS_c(); /* 809E42E0 */ ~daNpc_grS_c(); @@ -118,22 +118,22 @@ struct dCcD_GObjInf { /* 800840E4 */ ~dCcD_GObjInf(); }; +struct J3DAnmTexPattern { + /* 8032AF50 */ void getTexNo(u16, u16*) const; +}; + struct J3DAnmTextureSRTKey {}; +struct J3DAnmTransformKey {}; + +struct _GXColorS10 {}; + struct dCcD_SrcCyl {}; struct dCcD_Cyl { /* 800848B4 */ void Set(dCcD_SrcCyl const&); }; -struct _GXColorS10 {}; - -struct J3DAnmTexPattern { - /* 8032AF50 */ void getTexNo(u16, u16*) const; -}; - -struct J3DAnmTransformKey {}; - struct daNpcF_c { struct daNpcF_anmPlayData {}; @@ -236,7 +236,6 @@ struct dMsgFlow_c { struct dEvt_control_c { /* 80042468 */ void reset(); /* 80042518 */ void reset(void*); - /* 800436EC */ void setPtI_Id(unsigned int); }; struct dEvent_manager_c { @@ -640,6 +639,14 @@ extern "C" void __register_global_object(); // /* ############################################################################################## */ +/* 809E7F9C-809E7F9C 0001D0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_809E7F9C = "grS"; +SECTION_DEAD static char const* const stringBase_809E7FA0 = "PUSHOUT"; +SECTION_DEAD static char const* const stringBase_809E7FA8 = ""; +#pragma pop + /* 809E7FC4-809E7FD0 000000 000C+00 3/3 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -958,34 +965,34 @@ SECTION_RODATA u8 const daNpc_grS_Param_c::m[108] = { 0x43, 0x34, 0x00, 0x00, 0x43, 0xFA, 0x00, 0x00, 0x43, 0x96, 0x00, 0x00, 0xC3, 0x96, 0x00, 0x00, 0x00, 0x3C, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809E7DCC, &daNpc_grS_Param_c::m); +COMPILER_STRIP_GATE(0x809E7DCC, &daNpc_grS_Param_c::m); /* 809E7E38-809E7E3C 00006C 0004+00 0/1 0/0 0/0 .rodata @4426 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4426 = -300.0f; -COMPILER_STRIP_GATE(809E7E38, &lit_4426); +COMPILER_STRIP_GATE(0x809E7E38, &lit_4426); #pragma pop /* 809E7E3C-809E7E40 000070 0004+00 0/1 0/0 0/0 .rodata @4427 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4427 = -50.0f; -COMPILER_STRIP_GATE(809E7E3C, &lit_4427); +COMPILER_STRIP_GATE(0x809E7E3C, &lit_4427); #pragma pop /* 809E7E40-809E7E44 000074 0004+00 0/1 0/0 0/0 .rodata @4428 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4428 = 300.0f; -COMPILER_STRIP_GATE(809E7E40, &lit_4428); +COMPILER_STRIP_GATE(0x809E7E40, &lit_4428); #pragma pop /* 809E7E44-809E7E48 000078 0004+00 0/1 0/0 0/0 .rodata @4429 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4429 = 450.0f; -COMPILER_STRIP_GATE(809E7E44, &lit_4429); +COMPILER_STRIP_GATE(0x809E7E44, &lit_4429); #pragma pop /* 809E44E0-809E47B4 000500 02D4+00 1/1 0/0 0/0 .text create__11daNpc_grS_cFv */ @@ -1001,7 +1008,7 @@ asm void daNpc_grS_c::create() { /* ############################################################################################## */ /* 809E7E48-809E7E4C 00007C 0004+00 4/5 0/0 0/0 .rodata @4490 */ SECTION_RODATA static f32 const lit_4490 = 1.0f; -COMPILER_STRIP_GATE(809E7E48, &lit_4490); +COMPILER_STRIP_GATE(0x809E7E48, &lit_4490); /* 809E7E4C-809E7E50 000080 0004+00 5/7 0/0 0/0 .rodata @4491 */ SECTION_RODATA static u8 const lit_4491[4] = { @@ -1010,7 +1017,7 @@ SECTION_RODATA static u8 const lit_4491[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(809E7E4C, &lit_4491); +COMPILER_STRIP_GATE(0x809E7E4C, &lit_4491); /* 809E47B4-809E4A9C 0007D4 02E8+00 1/1 0/0 0/0 .text CreateHeap__11daNpc_grS_cFv */ #pragma push @@ -1157,7 +1164,7 @@ asm void daNpc_grS_c::Draw() { SECTION_RODATA static u8 const lit_4543[12] = { 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x04, }; -COMPILER_STRIP_GATE(809E7E50, &lit_4543); +COMPILER_STRIP_GATE(0x809E7E50, &lit_4543); /* 809E4D3C-809E4F70 000D5C 0234+00 1/1 0/0 0/0 .text * ctrlJoint__11daNpc_grS_cFP8J3DJointP8J3DModel */ @@ -1215,11 +1222,11 @@ asm void daNpc_grS_c::main() { /* ############################################################################################## */ /* 809E7E5C-809E7E60 000090 0004+00 5/5 0/0 0/0 .rodata @4746 */ SECTION_RODATA static f32 const lit_4746 = -1.0f; -COMPILER_STRIP_GATE(809E7E5C, &lit_4746); +COMPILER_STRIP_GATE(0x809E7E5C, &lit_4746); /* 809E7E60-809E7E64 000094 0004+00 1/1 0/0 0/0 .rodata @4747 */ SECTION_RODATA static f32 const lit_4747 = 1.0f / 50.0f; -COMPILER_STRIP_GATE(809E7E60, &lit_4747); +COMPILER_STRIP_GATE(0x809E7E60, &lit_4747); /* 809E528C-809E536C 0012AC 00E0+00 1/0 0/0 0/0 .text ctrlBtk__11daNpc_grS_cFv */ #pragma push @@ -1236,28 +1243,28 @@ asm void daNpc_grS_c::ctrlBtk() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4880 = 16.0f; -COMPILER_STRIP_GATE(809E7E64, &lit_4880); +COMPILER_STRIP_GATE(0x809E7E64, &lit_4880); #pragma pop /* 809E7E68-809E7E6C 00009C 0004+00 0/1 0/0 0/0 .rodata @4881 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4881 = 20.0f; -COMPILER_STRIP_GATE(809E7E68, &lit_4881); +COMPILER_STRIP_GATE(0x809E7E68, &lit_4881); #pragma pop /* 809E7E6C-809E7E70 0000A0 0004+00 0/1 0/0 0/0 .rodata @4882 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4882 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(809E7E6C, &lit_4882); +COMPILER_STRIP_GATE(0x809E7E6C, &lit_4882); #pragma pop /* 809E7E70-809E7E74 0000A4 0004+00 0/1 0/0 0/0 .rodata @4883 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4883 = 125.0f; -COMPILER_STRIP_GATE(809E7E70, &lit_4883); +COMPILER_STRIP_GATE(0x809E7E70, &lit_4883); #pragma pop /* 809E7E74-809E7E7C 0000A8 0008+00 0/1 0/0 0/0 .rodata @4884 */ @@ -1266,7 +1273,7 @@ COMPILER_STRIP_GATE(809E7E70, &lit_4883); SECTION_RODATA static u8 const lit_4884[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809E7E74, &lit_4884); +COMPILER_STRIP_GATE(0x809E7E74, &lit_4884); #pragma pop /* 809E7E7C-809E7E84 0000B0 0008+00 0/1 0/0 0/0 .rodata @4885 */ @@ -1275,7 +1282,7 @@ COMPILER_STRIP_GATE(809E7E74, &lit_4884); SECTION_RODATA static u8 const lit_4885[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809E7E7C, &lit_4885); +COMPILER_STRIP_GATE(0x809E7E7C, &lit_4885); #pragma pop /* 809E7E84-809E7E8C 0000B8 0008+00 0/1 0/0 0/0 .rodata @4886 */ @@ -1284,7 +1291,7 @@ COMPILER_STRIP_GATE(809E7E7C, &lit_4885); SECTION_RODATA static u8 const lit_4886[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809E7E84, &lit_4886); +COMPILER_STRIP_GATE(0x809E7E84, &lit_4886); #pragma pop /* 809E8238-809E823C 000008 0001+03 1/1 0/0 0/0 .bss @1109 */ @@ -1486,6 +1493,13 @@ asm void daNpc_grS_c::getTypeFromParam() { } #pragma pop +/* ############################################################################################## */ +/* 809E7F9C-809E7F9C 0001D0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_809E7FA9 = "D_MN04"; +#pragma pop + /* 809E5DD4-809E5E58 001DF4 0084+00 1/1 0/0 0/0 .text isDelete__11daNpc_grS_cFv */ #pragma push #pragma optimization_level 0 @@ -1513,7 +1527,7 @@ asm void daNpc_grS_c::reset() { SECTION_RODATA static u8 const lit_5077[12] = { 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809E7E8C, &lit_5077); +COMPILER_STRIP_GATE(0x809E7E8C, &lit_5077); #pragma pop /* 809E7E98-809E7E9C 0000CC 0004+00 0/1 0/0 0/0 .rodata @5078 */ @@ -1525,7 +1539,7 @@ SECTION_RODATA static u8 const lit_5078[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(809E7E98, &lit_5078); +COMPILER_STRIP_GATE(0x809E7E98, &lit_5078); #pragma pop /* 809E7E9C-809E7EA8 0000D0 000C+00 0/1 0/0 0/0 .rodata @5079 */ @@ -1534,7 +1548,7 @@ COMPILER_STRIP_GATE(809E7E98, &lit_5078); SECTION_RODATA static u8 const lit_5079[12] = { 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(809E7E9C, &lit_5079); +COMPILER_STRIP_GATE(0x809E7E9C, &lit_5079); #pragma pop /* 809E7EA8-809E7EB4 0000DC 000C+00 0/1 0/0 0/0 .rodata @5080 */ @@ -1543,7 +1557,7 @@ COMPILER_STRIP_GATE(809E7E9C, &lit_5079); SECTION_RODATA static u8 const lit_5080[12] = { 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809E7EA8, &lit_5080); +COMPILER_STRIP_GATE(0x809E7EA8, &lit_5080); #pragma pop /* 809E7EB4-809E7EBC 0000E8 0008+00 0/1 0/0 0/0 .rodata @5081 */ @@ -1552,7 +1566,7 @@ COMPILER_STRIP_GATE(809E7EA8, &lit_5080); SECTION_RODATA static u8 const lit_5081[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809E7EB4, &lit_5081); +COMPILER_STRIP_GATE(0x809E7EB4, &lit_5081); #pragma pop /* 809E7EBC-809E7EC8 0000F0 000C+00 0/1 0/0 0/0 .rodata @5082 */ @@ -1561,7 +1575,7 @@ COMPILER_STRIP_GATE(809E7EB4, &lit_5081); SECTION_RODATA static u8 const lit_5082[12] = { 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809E7EBC, &lit_5082); +COMPILER_STRIP_GATE(0x809E7EBC, &lit_5082); #pragma pop /* 809E7EC8-809E7ECC 0000FC 0004+00 0/1 0/0 0/0 .rodata @5083 */ @@ -1573,7 +1587,7 @@ SECTION_RODATA static u8 const lit_5083[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(809E7EC8, &lit_5083); +COMPILER_STRIP_GATE(0x809E7EC8, &lit_5083); #pragma pop /* 809E7ECC-809E7ED8 000100 000C+00 0/1 0/0 0/0 .rodata @5084 */ @@ -1582,7 +1596,7 @@ COMPILER_STRIP_GATE(809E7EC8, &lit_5083); SECTION_RODATA static u8 const lit_5084[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809E7ECC, &lit_5084); +COMPILER_STRIP_GATE(0x809E7ECC, &lit_5084); #pragma pop /* 809E7ED8-809E7EDC 00010C 0004+00 0/1 0/0 0/0 .rodata @5085 */ @@ -1594,7 +1608,7 @@ SECTION_RODATA static u8 const lit_5085[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(809E7ED8, &lit_5085); +COMPILER_STRIP_GATE(0x809E7ED8, &lit_5085); #pragma pop /* 809E7EDC-809E7EEC 000110 0010+00 0/1 0/0 0/0 .rodata @5086 */ @@ -1603,7 +1617,7 @@ COMPILER_STRIP_GATE(809E7ED8, &lit_5085); SECTION_RODATA static u8 const lit_5086[16] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809E7EDC, &lit_5086); +COMPILER_STRIP_GATE(0x809E7EDC, &lit_5086); #pragma pop /* 809E6000-809E6164 002020 0164+00 1/1 0/0 0/0 .text playExpression__11daNpc_grS_cFv */ @@ -1623,7 +1637,7 @@ asm void daNpc_grS_c::playExpression() { SECTION_RODATA static u8 const lit_5101[12] = { 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809E7EEC, &lit_5101); +COMPILER_STRIP_GATE(0x809E7EEC, &lit_5101); #pragma pop /* 809E7EF8-809E7EFC 00012C 0004+00 0/1 0/0 0/0 .rodata @5102 */ @@ -1635,7 +1649,7 @@ SECTION_RODATA static u8 const lit_5102[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(809E7EF8, &lit_5102); +COMPILER_STRIP_GATE(0x809E7EF8, &lit_5102); #pragma pop /* 809E7EFC-809E7F08 000130 000C+00 0/1 0/0 0/0 .rodata @5103 */ @@ -1644,7 +1658,7 @@ COMPILER_STRIP_GATE(809E7EF8, &lit_5102); SECTION_RODATA static u8 const lit_5103[12] = { 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(809E7EFC, &lit_5103); +COMPILER_STRIP_GATE(0x809E7EFC, &lit_5103); #pragma pop /* 809E7F08-809E7F14 00013C 000C+00 0/1 0/0 0/0 .rodata @5104 */ @@ -1653,7 +1667,7 @@ COMPILER_STRIP_GATE(809E7EFC, &lit_5103); SECTION_RODATA static u8 const lit_5104[12] = { 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809E7F08, &lit_5104); +COMPILER_STRIP_GATE(0x809E7F08, &lit_5104); #pragma pop /* 809E7F14-809E7F1C 000148 0008+00 0/1 0/0 0/0 .rodata @5105 */ @@ -1662,7 +1676,7 @@ COMPILER_STRIP_GATE(809E7F08, &lit_5104); SECTION_RODATA static u8 const lit_5105[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809E7F14, &lit_5105); +COMPILER_STRIP_GATE(0x809E7F14, &lit_5105); #pragma pop /* 809E7F1C-809E7F28 000150 000C+00 0/1 0/0 0/0 .rodata @5106 */ @@ -1671,7 +1685,7 @@ COMPILER_STRIP_GATE(809E7F14, &lit_5105); SECTION_RODATA static u8 const lit_5106[12] = { 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(809E7F1C, &lit_5106); +COMPILER_STRIP_GATE(0x809E7F1C, &lit_5106); #pragma pop /* 809E7F28-809E7F34 00015C 000C+00 0/1 0/0 0/0 .rodata @5107 */ @@ -1680,7 +1694,7 @@ COMPILER_STRIP_GATE(809E7F1C, &lit_5106); SECTION_RODATA static u8 const lit_5107[12] = { 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809E7F28, &lit_5107); +COMPILER_STRIP_GATE(0x809E7F28, &lit_5107); #pragma pop /* 809E7F34-809E7F3C 000168 0008+00 0/1 0/0 0/0 .rodata @5108 */ @@ -1689,7 +1703,7 @@ COMPILER_STRIP_GATE(809E7F28, &lit_5107); SECTION_RODATA static u8 const lit_5108[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809E7F34, &lit_5108); +COMPILER_STRIP_GATE(0x809E7F34, &lit_5108); #pragma pop /* 809E7F3C-809E7F48 000170 000C+00 0/1 0/0 0/0 .rodata @5109 */ @@ -1698,7 +1712,7 @@ COMPILER_STRIP_GATE(809E7F34, &lit_5108); SECTION_RODATA static u8 const lit_5109[12] = { 0x00, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809E7F3C, &lit_5109); +COMPILER_STRIP_GATE(0x809E7F3C, &lit_5109); #pragma pop /* 809E7F48-809E7F4C 00017C 0004+00 0/1 0/0 0/0 .rodata @5110 */ @@ -1710,7 +1724,7 @@ SECTION_RODATA static u8 const lit_5110[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(809E7F48, &lit_5110); +COMPILER_STRIP_GATE(0x809E7F48, &lit_5110); #pragma pop /* 809E7F4C-809E7F5C 000180 0010+00 0/1 0/0 0/0 .rodata @5111 */ @@ -1719,7 +1733,7 @@ COMPILER_STRIP_GATE(809E7F48, &lit_5110); SECTION_RODATA static u8 const lit_5111[16] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809E7F4C, &lit_5111); +COMPILER_STRIP_GATE(0x809E7F4C, &lit_5111); #pragma pop /* 809E6164-809E62F0 002184 018C+00 1/1 0/0 0/0 .text playMotion__11daNpc_grS_cFv */ @@ -1737,7 +1751,7 @@ asm void daNpc_grS_c::playMotion() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpc_grS_c::chkAction(int (daNpc_grS_c::*)(void*)) { +asm void daNpc_grS_c::chkAction(int (daNpc_grS_c::*param_0)(void*)) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_grs/d_a_npc_grs/chkAction__11daNpc_grS_cFM11daNpc_grS_cFPCvPvPv_i.s" } @@ -1748,7 +1762,7 @@ asm void daNpc_grS_c::chkAction(int (daNpc_grS_c::*)(void*)) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpc_grS_c::setAction(int (daNpc_grS_c::*)(void*)) { +asm void daNpc_grS_c::setAction(int (daNpc_grS_c::*param_0)(void*)) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_grs/d_a_npc_grs/setAction__11daNpc_grS_cFM11daNpc_grS_cFPCvPvPv_i.s" } @@ -1801,28 +1815,28 @@ asm void daNpc_grS_c::setLookMode(int param_0) { SECTION_RODATA static u8 const lit_5257[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809E7F5C, &lit_5257); +COMPILER_STRIP_GATE(0x809E7F5C, &lit_5257); #pragma pop /* 809E7F68-809E7F6C 00019C 0004+00 0/1 0/0 0/0 .rodata @5310 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5310 = -80.0f; -COMPILER_STRIP_GATE(809E7F68, &lit_5310); +COMPILER_STRIP_GATE(0x809E7F68, &lit_5310); #pragma pop /* 809E7F6C-809E7F70 0001A0 0004+00 0/1 0/0 0/0 .rodata @5311 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5311 = 80.0f; -COMPILER_STRIP_GATE(809E7F6C, &lit_5311); +COMPILER_STRIP_GATE(0x809E7F6C, &lit_5311); #pragma pop /* 809E7F70-809E7F74 0001A4 0004+00 0/1 0/0 0/0 .rodata @5312 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5312 = 40.0f; -COMPILER_STRIP_GATE(809E7F70, &lit_5312); +COMPILER_STRIP_GATE(0x809E7F70, &lit_5312); #pragma pop /* 809E6878-809E6B00 002898 0288+00 1/1 0/0 0/0 .text lookat__11daNpc_grS_cFv */ @@ -1845,6 +1859,13 @@ asm void daNpc_grS_c::setExpressionTalkAfter() { } #pragma pop +/* ############################################################################################## */ +/* 809E7F9C-809E7F9C 0001D0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_809E7FB0 = "prm"; +#pragma pop + /* 809E6B74-809E6D54 002B94 01E0+00 1/0 0/0 0/0 .text cutPushOut__11daNpc_grS_cFi */ #pragma push #pragma optimization_level 0 @@ -1865,6 +1886,13 @@ asm void daNpc_grS_c::wait(void* param_0) { } #pragma pop +/* ############################################################################################## */ +/* 809E7F9C-809E7F9C 0001D0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_809E7FB4 = "DEFAULT_GETITEM"; +#pragma pop + /* 809E6F5C-809E721C 002F7C 02C0+00 2/0 0/0 0/0 .text talk__11daNpc_grS_cFPv */ #pragma push #pragma optimization_level 0 @@ -1892,7 +1920,7 @@ asm void daNpc_grS_c::test(void* param_0) { SECTION_RODATA static u8 const id[12] = { 0x83, 0x81, 0x83, 0x82, 0x83, 0x83, 0x83, 0x84, 0x83, 0x85, 0x83, 0x86, }; -COMPILER_STRIP_GATE(809E7F74, &id); +COMPILER_STRIP_GATE(0x809E7F74, &id); #pragma pop /* 809E7F80-809E7F98 0001B4 0018+00 0/1 0/0 0/0 .rodata jointNo$5517 */ @@ -1902,14 +1930,14 @@ SECTION_RODATA static u8 const jointNo[24] = { 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, }; -COMPILER_STRIP_GATE(809E7F80, &jointNo); +COMPILER_STRIP_GATE(0x809E7F80, &jointNo); #pragma pop /* 809E7F98-809E7F9C 0001CC 0004+00 0/1 0/0 0/0 .rodata @5571 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5571 = 7.0f / 10.0f; -COMPILER_STRIP_GATE(809E7F98, &lit_5571); +COMPILER_STRIP_GATE(0x809E7F98, &lit_5571); #pragma pop /* 809E7300-809E743C 003320 013C+00 1/1 0/0 0/0 .text setPrtcl__11daNpc_grS_cFv */ @@ -2132,7 +2160,7 @@ asm void __sinit_d_a_npc_grs_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_809E7CD4 = (void*)__sinit_d_a_npc_grs_cpp; +REGISTER_CTORS(0x809E7CD4, __sinit_d_a_npc_grs_cpp); #pragma pop /* 809E7D5C-809E7D60 003D7C 0004+00 1/0 0/0 0/0 .text adjustShapeAngle__11daNpc_grS_cFv @@ -2343,14 +2371,4 @@ static u8 data_809E8300[4]; static u8 data_809E8304[4]; #pragma pop -/* 809E7F9C-809E7FC4 0001D0 0028+00 7/3 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_809E7F9C = "grS"; -SECTION_DEAD static char const* const stringBase_809E7FA0 = "PUSHOUT"; -SECTION_DEAD static char const* const stringBase_809E7FA8 = ""; -SECTION_DEAD static char const* const stringBase_809E7FA9 = "D_MN04"; -SECTION_DEAD static char const* const stringBase_809E7FB0 = "prm"; -SECTION_DEAD static char const* const stringBase_809E7FB4 = "DEFAULT_GETITEM"; -#pragma pop +/* 809E7F9C-809E7F9C 0001D0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/npc/d_a_npc_grz/d_a_npc_grz.cpp b/rel/d/a/npc/d_a_npc_grz/d_a_npc_grz.cpp index 71cc57cd313..6cf92e0056a 100644 --- a/rel/d/a/npc/d_a_npc_grz/d_a_npc_grz.cpp +++ b/rel/d/a/npc/d_a_npc_grz/d_a_npc_grz.cpp @@ -29,14 +29,14 @@ struct mDoMtx_stack_c { static u8 now[48]; }; +struct J3DAnmTextureSRTKey {}; + struct J3DAnmTexPattern { /* 8032AF50 */ void getTexNo(u16, u16*) const; }; struct J3DAnmTevRegKey {}; -struct J3DAnmTextureSRTKey {}; - struct J3DMaterialTable { /* 8032F6F8 */ void removeTexNoAnimator(J3DAnmTexPattern*); /* 8032F7B4 */ void removeTexMtxAnimator(J3DAnmTextureSRTKey*); @@ -61,12 +61,12 @@ struct mDoExt_bckAnm { /* 8000D990 */ void changeBckOnly(J3DAnmTransform*); }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; +struct J3DModelData {}; + struct Z2Creature { /* 802C03C8 */ Z2Creature(); /* 802C0420 */ ~Z2Creature(); @@ -92,10 +92,10 @@ struct fopAcM_gc_c { static f32 mGroundY; }; -struct J3DJoint {}; - struct J3DModel {}; +struct J3DJoint {}; + struct daNpc_Grz_c { struct daNpc_GrZ_prtclMngr_c { /* 809E8658 */ ~daNpc_GrZ_prtclMngr_c(); @@ -169,14 +169,14 @@ struct dCcD_GObjInf { /* 800840E4 */ ~dCcD_GObjInf(); }; +struct J3DAnmTransformKey {}; + struct dCcD_SrcCyl {}; struct dCcD_Cyl { /* 800848B4 */ void Set(dCcD_SrcCyl const&); }; -struct J3DAnmTransformKey {}; - struct daNpcF_c { struct daNpcF_anmPlayData {}; @@ -576,7 +576,7 @@ extern "C" void __dt__12dBgS_ObjAcchFv(); extern "C" void __dt__12J3DFrameCtrlFv(); extern "C" void setCollisions__8daNpcF_cFv(); extern "C" void __dt__10cCcD_GSttsFv(); -extern "C" void func_809EF064(int*); +extern "C" void func_809EF064(void* _this, int*); extern "C" void __sinit_d_a_npc_grz_cpp(); extern "C" void adjustShapeAngle__11daNpc_Grz_cFv(); extern "C" void __dt__17daNpc_Grz_Param_cFv(); @@ -793,6 +793,24 @@ extern "C" void __register_global_object(); // /* ############################################################################################## */ +/* 809EF638-809EF638 000444 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_809EF638 = "TALK_STAND"; +SECTION_DEAD static char const* const stringBase_809EF643 = "STONE_SMASH"; +SECTION_DEAD static char const* const stringBase_809EF64F = "STONE_SMASH_SKIP"; +SECTION_DEAD static char const* const stringBase_809EF660 = "grZ"; +SECTION_DEAD static char const* const stringBase_809EF664 = "grZ1"; +SECTION_DEAD static char const* const stringBase_809EF669 = "grZ2"; +SECTION_DEAD static char const* const stringBase_809EF66E = "grZ3"; +SECTION_DEAD static char const* const stringBase_809EF673 = "grZD1"; +SECTION_DEAD static char const* const stringBase_809EF679 = "grZD3"; +SECTION_DEAD static char const* const stringBase_809EF67F = ""; +SECTION_DEAD static char const* const stringBase_809EF680 = "WAIT"; +SECTION_DEAD static char const* const stringBase_809EF685 = "REBIRTH"; +SECTION_DEAD static char const* const stringBase_809EF68D = "GO_OUT"; +#pragma pop + /* 809EF6A0-809EF6AC 000000 000C+00 5/5 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -1365,7 +1383,7 @@ SECTION_RODATA u8 const daNpc_Grz_Param_c::m[128] = { 0x00, 0x3C, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3C, 0xFF, 0xD8, 0xFF, 0xD8, 0xFF, 0xD8, 0x41, 0x30, 0x00, 0x00, 0x42, 0x0C, 0x00, 0x00, 0x43, 0xFA, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809EF1F4, &daNpc_Grz_Param_c::m); +COMPILER_STRIP_GATE(0x809EF1F4, &daNpc_Grz_Param_c::m); /* 809EF274-809EF288 000080 0014+00 0/1 0/0 0/0 .rodata heapSize$4217 */ #pragma push @@ -1374,35 +1392,35 @@ SECTION_RODATA static u8 const heapSize[20] = { 0x00, 0x00, 0x3A, 0xE0, 0x00, 0x00, 0x3A, 0xF0, 0x00, 0x00, 0x3A, 0xE0, 0x00, 0x00, 0x3A, 0xF0, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809EF274, &heapSize); +COMPILER_STRIP_GATE(0x809EF274, &heapSize); #pragma pop /* 809EF288-809EF28C 000094 0004+00 0/1 0/0 0/0 .rodata @4302 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4302 = -300.0f; -COMPILER_STRIP_GATE(809EF288, &lit_4302); +COMPILER_STRIP_GATE(0x809EF288, &lit_4302); #pragma pop /* 809EF28C-809EF290 000098 0004+00 0/1 0/0 0/0 .rodata @4303 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4303 = -50.0f; -COMPILER_STRIP_GATE(809EF28C, &lit_4303); +COMPILER_STRIP_GATE(0x809EF28C, &lit_4303); #pragma pop /* 809EF290-809EF294 00009C 0004+00 0/1 0/0 0/0 .rodata @4304 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4304 = 300.0f; -COMPILER_STRIP_GATE(809EF290, &lit_4304); +COMPILER_STRIP_GATE(0x809EF290, &lit_4304); #pragma pop /* 809EF294-809EF298 0000A0 0004+00 0/1 0/0 0/0 .rodata @4305 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4305 = 450.0f; -COMPILER_STRIP_GATE(809EF294, &lit_4305); +COMPILER_STRIP_GATE(0x809EF294, &lit_4305); #pragma pop /* 809E8BA0-809E8E68 000880 02C8+00 1/1 0/0 0/0 .text create__11daNpc_Grz_cFv */ @@ -1418,7 +1436,7 @@ asm void daNpc_Grz_c::create() { /* ############################################################################################## */ /* 809EF298-809EF29C 0000A4 0004+00 4/8 0/0 0/0 .rodata @4359 */ SECTION_RODATA static f32 const lit_4359 = 1.0f; -COMPILER_STRIP_GATE(809EF298, &lit_4359); +COMPILER_STRIP_GATE(0x809EF298, &lit_4359); /* 809EF29C-809EF2A0 0000A8 0004+00 5/12 0/0 0/0 .rodata @4360 */ SECTION_RODATA static u8 const lit_4360[4] = { @@ -1427,7 +1445,7 @@ SECTION_RODATA static u8 const lit_4360[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(809EF29C, &lit_4360); +COMPILER_STRIP_GATE(0x809EF29C, &lit_4360); /* 809E8E68-809E90F0 000B48 0288+00 1/1 0/0 0/0 .text CreateHeap__11daNpc_Grz_cFv */ #pragma push @@ -1564,7 +1582,7 @@ asm void daNpc_Grz_c::Execute() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4464 = 20.0f; -COMPILER_STRIP_GATE(809EF2A0, &lit_4464); +COMPILER_STRIP_GATE(0x809EF2A0, &lit_4464); #pragma pop /* 809E9324-809E9568 001004 0244+00 1/1 0/0 0/0 .text Draw__11daNpc_Grz_cFv */ @@ -1582,7 +1600,7 @@ asm void daNpc_Grz_c::Draw() { SECTION_RODATA static u8 const lit_4470[12] = { 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x04, }; -COMPILER_STRIP_GATE(809EF2A4, &lit_4470); +COMPILER_STRIP_GATE(0x809EF2A4, &lit_4470); /* 809E9568-809E979C 001248 0234+00 1/1 0/0 0/0 .text * ctrlJoint__11daNpc_Grz_cFP8J3DJointP8J3DModel */ @@ -1640,11 +1658,11 @@ asm void daNpc_Grz_c::main() { /* ############################################################################################## */ /* 809EF2B0-809EF2B4 0000BC 0004+00 9/13 0/0 0/0 .rodata @4685 */ SECTION_RODATA static f32 const lit_4685 = -1.0f; -COMPILER_STRIP_GATE(809EF2B0, &lit_4685); +COMPILER_STRIP_GATE(0x809EF2B0, &lit_4685); /* 809EF2B4-809EF2B8 0000C0 0004+00 1/1 0/0 0/0 .rodata @4686 */ SECTION_RODATA static f32 const lit_4686 = 1.0f / 50.0f; -COMPILER_STRIP_GATE(809EF2B4, &lit_4686); +COMPILER_STRIP_GATE(0x809EF2B4, &lit_4686); /* 809E9AD4-809E9BB4 0017B4 00E0+00 1/0 0/0 0/0 .text ctrlBtk__11daNpc_Grz_cFv */ #pragma push @@ -1661,21 +1679,21 @@ asm void daNpc_Grz_c::ctrlBtk() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4841 = 40.0f; -COMPILER_STRIP_GATE(809EF2B8, &lit_4841); +COMPILER_STRIP_GATE(0x809EF2B8, &lit_4841); #pragma pop /* 809EF2BC-809EF2C0 0000C8 0004+00 0/2 0/0 0/0 .rodata @4842 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4842 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(809EF2BC, &lit_4842); +COMPILER_STRIP_GATE(0x809EF2BC, &lit_4842); #pragma pop /* 809EF2C0-809EF2C4 0000CC 0004+00 0/1 0/0 0/0 .rodata @4843 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4843 = 125.0f; -COMPILER_STRIP_GATE(809EF2C0, &lit_4843); +COMPILER_STRIP_GATE(0x809EF2C0, &lit_4843); #pragma pop /* 809EF2C4-809EF2CC 0000D0 0008+00 0/4 0/0 0/0 .rodata @4844 */ @@ -1684,7 +1702,7 @@ COMPILER_STRIP_GATE(809EF2C0, &lit_4843); SECTION_RODATA static u8 const lit_4844[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809EF2C4, &lit_4844); +COMPILER_STRIP_GATE(0x809EF2C4, &lit_4844); #pragma pop /* 809EF2CC-809EF2D4 0000D8 0008+00 0/4 0/0 0/0 .rodata @4845 */ @@ -1693,7 +1711,7 @@ COMPILER_STRIP_GATE(809EF2C4, &lit_4844); SECTION_RODATA static u8 const lit_4845[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809EF2CC, &lit_4845); +COMPILER_STRIP_GATE(0x809EF2CC, &lit_4845); #pragma pop /* 809EF2D4-809EF2DC 0000E0 0008+00 0/4 0/0 0/0 .rodata @4846 */ @@ -1702,49 +1720,49 @@ COMPILER_STRIP_GATE(809EF2CC, &lit_4845); SECTION_RODATA static u8 const lit_4846[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809EF2D4, &lit_4846); +COMPILER_STRIP_GATE(0x809EF2D4, &lit_4846); #pragma pop /* 809EF2DC-809EF2E0 0000E8 0004+00 0/3 0/0 0/0 .rodata @4847 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4847 = 100.0f; -COMPILER_STRIP_GATE(809EF2DC, &lit_4847); +COMPILER_STRIP_GATE(0x809EF2DC, &lit_4847); #pragma pop /* 809EF2E0-809EF2E4 0000EC 0004+00 0/1 0/0 0/0 .rodata @4848 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4848 = 120.0f; -COMPILER_STRIP_GATE(809EF2E0, &lit_4848); +COMPILER_STRIP_GATE(0x809EF2E0, &lit_4848); #pragma pop /* 809EF2E4-809EF2E8 0000F0 0004+00 0/1 0/0 0/0 .rodata @4849 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4849 = 200.0f; -COMPILER_STRIP_GATE(809EF2E4, &lit_4849); +COMPILER_STRIP_GATE(0x809EF2E4, &lit_4849); #pragma pop /* 809EF2E8-809EF2EC 0000F4 0004+00 0/1 0/0 0/0 .rodata @4850 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4850 = 110.0f; -COMPILER_STRIP_GATE(809EF2E8, &lit_4850); +COMPILER_STRIP_GATE(0x809EF2E8, &lit_4850); #pragma pop /* 809EF2EC-809EF2F0 0000F8 0004+00 0/3 0/0 0/0 .rodata @4851 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4851 = 50.0f; -COMPILER_STRIP_GATE(809EF2EC, &lit_4851); +COMPILER_STRIP_GATE(0x809EF2EC, &lit_4851); #pragma pop /* 809EF2F0-809EF2F4 0000FC 0004+00 0/3 0/0 0/0 .rodata @4852 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4852 = 35.0f; -COMPILER_STRIP_GATE(809EF2F0, &lit_4852); +COMPILER_STRIP_GATE(0x809EF2F0, &lit_4852); #pragma pop /* 809EFC08-809EFC0C 000008 0001+03 1/1 0/0 0/0 .bss @1109 */ @@ -1873,105 +1891,105 @@ asm void daNpc_Grz_c::setAttnPos() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5018 = 15.0f; -COMPILER_STRIP_GATE(809EF2F4, &lit_5018); +COMPILER_STRIP_GATE(0x809EF2F4, &lit_5018); #pragma pop /* 809EF2F8-809EF2FC 000104 0004+00 0/1 0/0 0/0 .rodata @5019 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5019 = 16.0f; -COMPILER_STRIP_GATE(809EF2F8, &lit_5019); +COMPILER_STRIP_GATE(0x809EF2F8, &lit_5019); #pragma pop /* 809EF2FC-809EF300 000108 0004+00 0/1 0/0 0/0 .rodata @5020 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5020 = 36.0f; -COMPILER_STRIP_GATE(809EF2FC, &lit_5020); +COMPILER_STRIP_GATE(0x809EF2FC, &lit_5020); #pragma pop /* 809EF300-809EF304 00010C 0004+00 0/1 0/0 0/0 .rodata @5021 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5021 = 500.0f; -COMPILER_STRIP_GATE(809EF300, &lit_5021); +COMPILER_STRIP_GATE(0x809EF300, &lit_5021); #pragma pop /* 809EF304-809EF308 000110 0004+00 0/1 0/0 0/0 .rodata @5022 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5022 = 700.0f; -COMPILER_STRIP_GATE(809EF304, &lit_5022); +COMPILER_STRIP_GATE(0x809EF304, &lit_5022); #pragma pop /* 809EF308-809EF30C 000114 0004+00 0/1 0/0 0/0 .rodata @5023 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5023 = 900.0f; -COMPILER_STRIP_GATE(809EF308, &lit_5023); +COMPILER_STRIP_GATE(0x809EF308, &lit_5023); #pragma pop /* 809EF30C-809EF310 000118 0004+00 0/1 0/0 0/0 .rodata @5024 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5024 = 1100.0f; -COMPILER_STRIP_GATE(809EF30C, &lit_5024); +COMPILER_STRIP_GATE(0x809EF30C, &lit_5024); #pragma pop /* 809EF310-809EF314 00011C 0004+00 0/1 0/0 0/0 .rodata @5025 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5025 = 1300.0f; -COMPILER_STRIP_GATE(809EF310, &lit_5025); +COMPILER_STRIP_GATE(0x809EF310, &lit_5025); #pragma pop /* 809EF314-809EF318 000120 0004+00 0/1 0/0 0/0 .rodata @5026 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5026 = 1500.0f; -COMPILER_STRIP_GATE(809EF314, &lit_5026); +COMPILER_STRIP_GATE(0x809EF314, &lit_5026); #pragma pop /* 809EF318-809EF31C 000124 0004+00 0/3 0/0 0/0 .rodata @5027 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5027 = 10.0f; -COMPILER_STRIP_GATE(809EF318, &lit_5027); +COMPILER_STRIP_GATE(0x809EF318, &lit_5027); #pragma pop /* 809EF31C-809EF320 000128 0004+00 0/1 0/0 0/0 .rodata @5028 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5028 = 18.0f; -COMPILER_STRIP_GATE(809EF31C, &lit_5028); +COMPILER_STRIP_GATE(0x809EF31C, &lit_5028); #pragma pop /* 809EF320-809EF324 00012C 0004+00 0/1 0/0 0/0 .rodata @5029 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5029 = 2.0f; -COMPILER_STRIP_GATE(809EF320, &lit_5029); +COMPILER_STRIP_GATE(0x809EF320, &lit_5029); #pragma pop /* 809EF324-809EF328 000130 0004+00 0/3 0/0 0/0 .rodata @5030 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5030 = 29.0f; -COMPILER_STRIP_GATE(809EF324, &lit_5030); +COMPILER_STRIP_GATE(0x809EF324, &lit_5030); #pragma pop /* 809EF328-809EF32C 000134 0004+00 0/1 0/0 0/0 .rodata @5031 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5031 = 85.0f; -COMPILER_STRIP_GATE(809EF328, &lit_5031); +COMPILER_STRIP_GATE(0x809EF328, &lit_5031); #pragma pop /* 809EF32C-809EF330 000138 0004+00 0/1 0/0 0/0 .rodata @5032 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5032 = 245.0f; -COMPILER_STRIP_GATE(809EF32C, &lit_5032); +COMPILER_STRIP_GATE(0x809EF32C, &lit_5032); #pragma pop /* 809EA1DC-809EA734 001EBC 0558+00 1/1 0/0 0/0 .text setCollisionPunch__11daNpc_Grz_cFv @@ -2095,7 +2113,7 @@ asm void daNpc_Grz_c::resetCol() { SECTION_RODATA static u8 const lit_5305[12] = { 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(809EF330, &lit_5305); +COMPILER_STRIP_GATE(0x809EF330, &lit_5305); #pragma pop /* 809EF33C-809EF348 000148 000C+00 0/1 0/0 0/0 .rodata @5306 */ @@ -2104,7 +2122,7 @@ COMPILER_STRIP_GATE(809EF330, &lit_5305); SECTION_RODATA static u8 const lit_5306[12] = { 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809EF33C, &lit_5306); +COMPILER_STRIP_GATE(0x809EF33C, &lit_5306); #pragma pop /* 809EF348-809EF350 000154 0008+00 0/1 0/0 0/0 .rodata @5307 */ @@ -2113,7 +2131,7 @@ COMPILER_STRIP_GATE(809EF33C, &lit_5306); SECTION_RODATA static u8 const lit_5307[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809EF348, &lit_5307); +COMPILER_STRIP_GATE(0x809EF348, &lit_5307); #pragma pop /* 809EF350-809EF35C 00015C 000C+00 0/1 0/0 0/0 .rodata @5308 */ @@ -2122,7 +2140,7 @@ COMPILER_STRIP_GATE(809EF348, &lit_5307); SECTION_RODATA static u8 const lit_5308[12] = { 0x00, 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(809EF350, &lit_5308); +COMPILER_STRIP_GATE(0x809EF350, &lit_5308); #pragma pop /* 809EF35C-809EF368 000168 000C+00 0/1 0/0 0/0 .rodata @5309 */ @@ -2131,7 +2149,7 @@ COMPILER_STRIP_GATE(809EF350, &lit_5308); SECTION_RODATA static u8 const lit_5309[12] = { 0x00, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809EF35C, &lit_5309); +COMPILER_STRIP_GATE(0x809EF35C, &lit_5309); #pragma pop /* 809EF368-809EF370 000174 0008+00 0/1 0/0 0/0 .rodata @5310 */ @@ -2140,7 +2158,7 @@ COMPILER_STRIP_GATE(809EF35C, &lit_5309); SECTION_RODATA static u8 const lit_5310[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809EF368, &lit_5310); +COMPILER_STRIP_GATE(0x809EF368, &lit_5310); #pragma pop /* 809EF370-809EF37C 00017C 000C+00 0/1 0/0 0/0 .rodata @5311 */ @@ -2149,7 +2167,7 @@ COMPILER_STRIP_GATE(809EF368, &lit_5310); SECTION_RODATA static u8 const lit_5311[12] = { 0x00, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(809EF370, &lit_5311); +COMPILER_STRIP_GATE(0x809EF370, &lit_5311); #pragma pop /* 809EF37C-809EF388 000188 000C+00 0/1 0/0 0/0 .rodata @5312 */ @@ -2158,7 +2176,7 @@ COMPILER_STRIP_GATE(809EF370, &lit_5311); SECTION_RODATA static u8 const lit_5312[12] = { 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809EF37C, &lit_5312); +COMPILER_STRIP_GATE(0x809EF37C, &lit_5312); #pragma pop /* 809EF388-809EF390 000194 0008+00 0/1 0/0 0/0 .rodata @5313 */ @@ -2167,7 +2185,7 @@ COMPILER_STRIP_GATE(809EF37C, &lit_5312); SECTION_RODATA static u8 const lit_5313[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809EF388, &lit_5313); +COMPILER_STRIP_GATE(0x809EF388, &lit_5313); #pragma pop /* 809EF390-809EF39C 00019C 000C+00 0/1 0/0 0/0 .rodata @5314 */ @@ -2176,7 +2194,7 @@ COMPILER_STRIP_GATE(809EF388, &lit_5313); SECTION_RODATA static u8 const lit_5314[12] = { 0x00, 0x0B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(809EF390, &lit_5314); +COMPILER_STRIP_GATE(0x809EF390, &lit_5314); #pragma pop /* 809EF39C-809EF3A8 0001A8 000C+00 0/1 0/0 0/0 .rodata @5315 */ @@ -2185,7 +2203,7 @@ COMPILER_STRIP_GATE(809EF390, &lit_5314); SECTION_RODATA static u8 const lit_5315[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809EF39C, &lit_5315); +COMPILER_STRIP_GATE(0x809EF39C, &lit_5315); #pragma pop /* 809EF3A8-809EF3B0 0001B4 0008+00 0/1 0/0 0/0 .rodata @5316 */ @@ -2194,7 +2212,7 @@ COMPILER_STRIP_GATE(809EF39C, &lit_5315); SECTION_RODATA static u8 const lit_5316[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809EF3A8, &lit_5316); +COMPILER_STRIP_GATE(0x809EF3A8, &lit_5316); #pragma pop /* 809EF3B0-809EF3BC 0001BC 000C+00 0/1 0/0 0/0 .rodata @5317 */ @@ -2203,7 +2221,7 @@ COMPILER_STRIP_GATE(809EF3A8, &lit_5316); SECTION_RODATA static u8 const lit_5317[12] = { 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809EF3B0, &lit_5317); +COMPILER_STRIP_GATE(0x809EF3B0, &lit_5317); #pragma pop /* 809EF3BC-809EF3C0 0001C8 0004+00 0/1 0/0 0/0 .rodata @5318 */ @@ -2215,7 +2233,7 @@ SECTION_RODATA static u8 const lit_5318[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(809EF3BC, &lit_5318); +COMPILER_STRIP_GATE(0x809EF3BC, &lit_5318); #pragma pop /* 809EF3C0-809EF3CC 0001CC 000C+00 0/1 0/0 0/0 .rodata @5319 */ @@ -2224,7 +2242,7 @@ COMPILER_STRIP_GATE(809EF3BC, &lit_5318); SECTION_RODATA static u8 const lit_5319[12] = { 0x00, 0x0D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809EF3C0, &lit_5319); +COMPILER_STRIP_GATE(0x809EF3C0, &lit_5319); #pragma pop /* 809EF3CC-809EF3D0 0001D8 0004+00 0/1 0/0 0/0 .rodata @5320 */ @@ -2236,7 +2254,7 @@ SECTION_RODATA static u8 const lit_5320[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(809EF3CC, &lit_5320); +COMPILER_STRIP_GATE(0x809EF3CC, &lit_5320); #pragma pop /* 809EF3D0-809EF3DC 0001DC 000C+00 0/1 0/0 0/0 .rodata @5321 */ @@ -2245,7 +2263,7 @@ COMPILER_STRIP_GATE(809EF3CC, &lit_5320); SECTION_RODATA static u8 const lit_5321[12] = { 0x00, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(809EF3D0, &lit_5321); +COMPILER_STRIP_GATE(0x809EF3D0, &lit_5321); #pragma pop /* 809EF3DC-809EF3E8 0001E8 000C+00 0/1 0/0 0/0 .rodata @5322 */ @@ -2254,7 +2272,7 @@ COMPILER_STRIP_GATE(809EF3D0, &lit_5321); SECTION_RODATA static u8 const lit_5322[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809EF3DC, &lit_5322); +COMPILER_STRIP_GATE(0x809EF3DC, &lit_5322); #pragma pop /* 809EF3E8-809EF3F0 0001F4 0008+00 0/1 0/0 0/0 .rodata @5323 */ @@ -2263,7 +2281,7 @@ COMPILER_STRIP_GATE(809EF3DC, &lit_5322); SECTION_RODATA static u8 const lit_5323[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809EF3E8, &lit_5323); +COMPILER_STRIP_GATE(0x809EF3E8, &lit_5323); #pragma pop /* 809EF3F0-809EF3FC 0001FC 000C+00 0/1 0/0 0/0 .rodata @5324 */ @@ -2272,7 +2290,7 @@ COMPILER_STRIP_GATE(809EF3E8, &lit_5323); SECTION_RODATA static u8 const lit_5324[12] = { 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809EF3F0, &lit_5324); +COMPILER_STRIP_GATE(0x809EF3F0, &lit_5324); #pragma pop /* 809EF3FC-809EF400 000208 0004+00 0/1 0/0 0/0 .rodata @5325 */ @@ -2284,7 +2302,7 @@ SECTION_RODATA static u8 const lit_5325[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(809EF3FC, &lit_5325); +COMPILER_STRIP_GATE(0x809EF3FC, &lit_5325); #pragma pop /* 809EF400-809EF40C 00020C 000C+00 0/1 0/0 0/0 .rodata @5326 */ @@ -2293,7 +2311,7 @@ COMPILER_STRIP_GATE(809EF3FC, &lit_5325); SECTION_RODATA static u8 const lit_5326[12] = { 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(809EF400, &lit_5326); +COMPILER_STRIP_GATE(0x809EF400, &lit_5326); #pragma pop /* 809EF40C-809EF410 000218 0004+00 0/1 0/0 0/0 .rodata @5327 */ @@ -2305,7 +2323,7 @@ SECTION_RODATA static u8 const lit_5327[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(809EF40C, &lit_5327); +COMPILER_STRIP_GATE(0x809EF40C, &lit_5327); #pragma pop /* 809EF410-809EF41C 00021C 000C+00 0/1 0/0 0/0 .rodata @5328 */ @@ -2314,7 +2332,7 @@ COMPILER_STRIP_GATE(809EF40C, &lit_5327); SECTION_RODATA static u8 const lit_5328[12] = { 0x00, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809EF410, &lit_5328); +COMPILER_STRIP_GATE(0x809EF410, &lit_5328); #pragma pop /* 809EF41C-809EF420 000228 0004+00 0/1 0/0 0/0 .rodata @5329 */ @@ -2326,7 +2344,7 @@ SECTION_RODATA static u8 const lit_5329[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(809EF41C, &lit_5329); +COMPILER_STRIP_GATE(0x809EF41C, &lit_5329); #pragma pop /* 809EF420-809EF42C 00022C 000C+00 0/1 0/0 0/0 .rodata @5330 */ @@ -2335,7 +2353,7 @@ COMPILER_STRIP_GATE(809EF41C, &lit_5329); SECTION_RODATA static u8 const lit_5330[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809EF420, &lit_5330); +COMPILER_STRIP_GATE(0x809EF420, &lit_5330); #pragma pop /* 809EF42C-809EF430 000238 0004+00 0/1 0/0 0/0 .rodata @5331 */ @@ -2347,7 +2365,7 @@ SECTION_RODATA static u8 const lit_5331[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(809EF42C, &lit_5331); +COMPILER_STRIP_GATE(0x809EF42C, &lit_5331); #pragma pop /* 809EB234-809EB5C0 002F14 038C+00 1/1 0/0 0/0 .text playExpression__11daNpc_Grz_cFv */ @@ -2369,7 +2387,7 @@ SECTION_RODATA static u8 const lit_5332[44] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809EF430, &lit_5332); +COMPILER_STRIP_GATE(0x809EF430, &lit_5332); #pragma pop /* 809EF45C-809EF468 000268 000C+00 0/1 0/0 0/0 .rodata @5358 */ @@ -2378,7 +2396,7 @@ COMPILER_STRIP_GATE(809EF430, &lit_5332); SECTION_RODATA static u8 const lit_5358[12] = { 0x00, 0x0F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809EF45C, &lit_5358); +COMPILER_STRIP_GATE(0x809EF45C, &lit_5358); #pragma pop /* 809EF468-809EF46C 000274 0004+00 0/1 0/0 0/0 .rodata @5359 */ @@ -2390,7 +2408,7 @@ SECTION_RODATA static u8 const lit_5359[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(809EF468, &lit_5359); +COMPILER_STRIP_GATE(0x809EF468, &lit_5359); #pragma pop /* 809EF46C-809EF478 000278 000C+00 0/1 0/0 0/0 .rodata @5360 */ @@ -2399,7 +2417,7 @@ COMPILER_STRIP_GATE(809EF468, &lit_5359); SECTION_RODATA static u8 const lit_5360[12] = { 0x00, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809EF46C, &lit_5360); +COMPILER_STRIP_GATE(0x809EF46C, &lit_5360); #pragma pop /* 809EF478-809EF47C 000284 0004+00 0/1 0/0 0/0 .rodata @5361 */ @@ -2411,7 +2429,7 @@ SECTION_RODATA static u8 const lit_5361[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(809EF478, &lit_5361); +COMPILER_STRIP_GATE(0x809EF478, &lit_5361); #pragma pop /* 809EF47C-809EF488 000288 000C+00 0/1 0/0 0/0 .rodata @5362 */ @@ -2420,7 +2438,7 @@ COMPILER_STRIP_GATE(809EF478, &lit_5361); SECTION_RODATA static u8 const lit_5362[12] = { 0x00, 0x19, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(809EF47C, &lit_5362); +COMPILER_STRIP_GATE(0x809EF47C, &lit_5362); #pragma pop /* 809EF488-809EF494 000294 000C+00 0/1 0/0 0/0 .rodata @5363 */ @@ -2429,7 +2447,7 @@ COMPILER_STRIP_GATE(809EF47C, &lit_5362); SECTION_RODATA static u8 const lit_5363[12] = { 0x00, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809EF488, &lit_5363); +COMPILER_STRIP_GATE(0x809EF488, &lit_5363); #pragma pop /* 809EF494-809EF49C 0002A0 0008+00 0/1 0/0 0/0 .rodata @5364 */ @@ -2438,7 +2456,7 @@ COMPILER_STRIP_GATE(809EF488, &lit_5363); SECTION_RODATA static u8 const lit_5364[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809EF494, &lit_5364); +COMPILER_STRIP_GATE(0x809EF494, &lit_5364); #pragma pop /* 809EF49C-809EF4A8 0002A8 000C+00 0/1 0/0 0/0 .rodata @5365 */ @@ -2447,7 +2465,7 @@ COMPILER_STRIP_GATE(809EF494, &lit_5364); SECTION_RODATA static u8 const lit_5365[12] = { 0x00, 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809EF49C, &lit_5365); +COMPILER_STRIP_GATE(0x809EF49C, &lit_5365); #pragma pop /* 809EF4A8-809EF4AC 0002B4 0004+00 0/1 0/0 0/0 .rodata @5366 */ @@ -2459,7 +2477,7 @@ SECTION_RODATA static u8 const lit_5366[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(809EF4A8, &lit_5366); +COMPILER_STRIP_GATE(0x809EF4A8, &lit_5366); #pragma pop /* 809EF4AC-809EF4B8 0002B8 000C+00 0/1 0/0 0/0 .rodata @5367 */ @@ -2468,7 +2486,7 @@ COMPILER_STRIP_GATE(809EF4A8, &lit_5366); SECTION_RODATA static u8 const lit_5367[12] = { 0x00, 0x1C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(809EF4AC, &lit_5367); +COMPILER_STRIP_GATE(0x809EF4AC, &lit_5367); #pragma pop /* 809EF4B8-809EF4C4 0002C4 000C+00 0/1 0/0 0/0 .rodata @5368 */ @@ -2477,7 +2495,7 @@ COMPILER_STRIP_GATE(809EF4AC, &lit_5367); SECTION_RODATA static u8 const lit_5368[12] = { 0x00, 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809EF4B8, &lit_5368); +COMPILER_STRIP_GATE(0x809EF4B8, &lit_5368); #pragma pop /* 809EF4C4-809EF4CC 0002D0 0008+00 0/1 0/0 0/0 .rodata @5369 */ @@ -2486,7 +2504,7 @@ COMPILER_STRIP_GATE(809EF4B8, &lit_5368); SECTION_RODATA static u8 const lit_5369[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809EF4C4, &lit_5369); +COMPILER_STRIP_GATE(0x809EF4C4, &lit_5369); #pragma pop /* 809EF4CC-809EF4D8 0002D8 000C+00 0/1 0/0 0/0 .rodata @5370 */ @@ -2495,7 +2513,7 @@ COMPILER_STRIP_GATE(809EF4C4, &lit_5369); SECTION_RODATA static u8 const lit_5370[12] = { 0x00, 0x1D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(809EF4CC, &lit_5370); +COMPILER_STRIP_GATE(0x809EF4CC, &lit_5370); #pragma pop /* 809EF4D8-809EF4E4 0002E4 000C+00 0/1 0/0 0/0 .rodata @5371 */ @@ -2504,7 +2522,7 @@ COMPILER_STRIP_GATE(809EF4CC, &lit_5370); SECTION_RODATA static u8 const lit_5371[12] = { 0x00, 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809EF4D8, &lit_5371); +COMPILER_STRIP_GATE(0x809EF4D8, &lit_5371); #pragma pop /* 809EF4E4-809EF4EC 0002F0 0008+00 0/1 0/0 0/0 .rodata @5372 */ @@ -2513,7 +2531,7 @@ COMPILER_STRIP_GATE(809EF4D8, &lit_5371); SECTION_RODATA static u8 const lit_5372[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809EF4E4, &lit_5372); +COMPILER_STRIP_GATE(0x809EF4E4, &lit_5372); #pragma pop /* 809EF4EC-809EF4F8 0002F8 000C+00 0/1 0/0 0/0 .rodata @5373 */ @@ -2522,7 +2540,7 @@ COMPILER_STRIP_GATE(809EF4E4, &lit_5372); SECTION_RODATA static u8 const lit_5373[12] = { 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809EF4EC, &lit_5373); +COMPILER_STRIP_GATE(0x809EF4EC, &lit_5373); #pragma pop /* 809EF4F8-809EF4FC 000304 0004+00 0/1 0/0 0/0 .rodata @5374 */ @@ -2534,7 +2552,7 @@ SECTION_RODATA static u8 const lit_5374[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(809EF4F8, &lit_5374); +COMPILER_STRIP_GATE(0x809EF4F8, &lit_5374); #pragma pop /* 809EF4FC-809EF508 000308 000C+00 0/1 0/0 0/0 .rodata @5375 */ @@ -2543,7 +2561,7 @@ COMPILER_STRIP_GATE(809EF4F8, &lit_5374); SECTION_RODATA static u8 const lit_5375[12] = { 0x00, 0x21, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(809EF4FC, &lit_5375); +COMPILER_STRIP_GATE(0x809EF4FC, &lit_5375); #pragma pop /* 809EF508-809EF514 000314 000C+00 0/1 0/0 0/0 .rodata @5376 */ @@ -2552,7 +2570,7 @@ COMPILER_STRIP_GATE(809EF4FC, &lit_5375); SECTION_RODATA static u8 const lit_5376[12] = { 0x00, 0x0F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809EF508, &lit_5376); +COMPILER_STRIP_GATE(0x809EF508, &lit_5376); #pragma pop /* 809EF514-809EF51C 000320 0008+00 0/1 0/0 0/0 .rodata @5377 */ @@ -2561,7 +2579,7 @@ COMPILER_STRIP_GATE(809EF508, &lit_5376); SECTION_RODATA static u8 const lit_5377[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809EF514, &lit_5377); +COMPILER_STRIP_GATE(0x809EF514, &lit_5377); #pragma pop /* 809EF51C-809EF528 000328 000C+00 0/1 0/0 0/0 .rodata @5378 */ @@ -2570,7 +2588,7 @@ COMPILER_STRIP_GATE(809EF514, &lit_5377); SECTION_RODATA static u8 const lit_5378[12] = { 0x00, 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(809EF51C, &lit_5378); +COMPILER_STRIP_GATE(0x809EF51C, &lit_5378); #pragma pop /* 809EF528-809EF534 000334 000C+00 0/1 0/0 0/0 .rodata @5379 */ @@ -2579,7 +2597,7 @@ COMPILER_STRIP_GATE(809EF51C, &lit_5378); SECTION_RODATA static u8 const lit_5379[12] = { 0x00, 0x14, 0x00, 0x00, 0x40, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809EF528, &lit_5379); +COMPILER_STRIP_GATE(0x809EF528, &lit_5379); #pragma pop /* 809EF534-809EF53C 000340 0008+00 0/1 0/0 0/0 .rodata @5380 */ @@ -2588,7 +2606,7 @@ COMPILER_STRIP_GATE(809EF528, &lit_5379); SECTION_RODATA static u8 const lit_5380[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809EF534, &lit_5380); +COMPILER_STRIP_GATE(0x809EF534, &lit_5380); #pragma pop /* 809EF53C-809EF548 000348 000C+00 0/1 0/0 0/0 .rodata @5381 */ @@ -2597,7 +2615,7 @@ COMPILER_STRIP_GATE(809EF534, &lit_5380); SECTION_RODATA static u8 const lit_5381[12] = { 0x00, 0x1E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(809EF53C, &lit_5381); +COMPILER_STRIP_GATE(0x809EF53C, &lit_5381); #pragma pop /* 809EF548-809EF554 000354 000C+00 0/1 0/0 0/0 .rodata @5382 */ @@ -2606,7 +2624,7 @@ COMPILER_STRIP_GATE(809EF53C, &lit_5381); SECTION_RODATA static u8 const lit_5382[12] = { 0x00, 0x0F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809EF548, &lit_5382); +COMPILER_STRIP_GATE(0x809EF548, &lit_5382); #pragma pop /* 809EF554-809EF55C 000360 0008+00 0/1 0/0 0/0 .rodata @5383 */ @@ -2615,7 +2633,7 @@ COMPILER_STRIP_GATE(809EF548, &lit_5382); SECTION_RODATA static u8 const lit_5383[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809EF554, &lit_5383); +COMPILER_STRIP_GATE(0x809EF554, &lit_5383); #pragma pop /* 809EF55C-809EF568 000368 000C+00 0/1 0/0 0/0 .rodata @5384 */ @@ -2624,7 +2642,7 @@ COMPILER_STRIP_GATE(809EF554, &lit_5383); SECTION_RODATA static u8 const lit_5384[12] = { 0x00, 0x1F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809EF55C, &lit_5384); +COMPILER_STRIP_GATE(0x809EF55C, &lit_5384); #pragma pop /* 809EF568-809EF56C 000374 0004+00 0/1 0/0 0/0 .rodata @5385 */ @@ -2636,7 +2654,7 @@ SECTION_RODATA static u8 const lit_5385[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(809EF568, &lit_5385); +COMPILER_STRIP_GATE(0x809EF568, &lit_5385); #pragma pop /* 809EF56C-809EF578 000378 000C+00 0/1 0/0 0/0 .rodata @5386 */ @@ -2645,7 +2663,7 @@ COMPILER_STRIP_GATE(809EF568, &lit_5385); SECTION_RODATA static u8 const lit_5386[12] = { 0x00, 0x16, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809EF56C, &lit_5386); +COMPILER_STRIP_GATE(0x809EF56C, &lit_5386); #pragma pop /* 809EF578-809EF57C 000384 0004+00 0/1 0/0 0/0 .rodata @5387 */ @@ -2657,7 +2675,7 @@ SECTION_RODATA static u8 const lit_5387[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(809EF578, &lit_5387); +COMPILER_STRIP_GATE(0x809EF578, &lit_5387); #pragma pop /* 809EF57C-809EF588 000388 000C+00 0/1 0/0 0/0 .rodata @5388 */ @@ -2666,7 +2684,7 @@ COMPILER_STRIP_GATE(809EF578, &lit_5387); SECTION_RODATA static u8 const lit_5388[12] = { 0x00, 0x17, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809EF57C, &lit_5388); +COMPILER_STRIP_GATE(0x809EF57C, &lit_5388); #pragma pop /* 809EF588-809EF58C 000394 0004+00 0/1 0/0 0/0 .rodata @5389 */ @@ -2678,7 +2696,7 @@ SECTION_RODATA static u8 const lit_5389[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(809EF588, &lit_5389); +COMPILER_STRIP_GATE(0x809EF588, &lit_5389); #pragma pop /* 809EF58C-809EF598 000398 000C+00 0/1 0/0 0/0 .rodata @5390 */ @@ -2687,7 +2705,7 @@ COMPILER_STRIP_GATE(809EF588, &lit_5389); SECTION_RODATA static u8 const lit_5390[12] = { 0x00, 0x15, 0x00, 0x00, 0x40, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809EF58C, &lit_5390); +COMPILER_STRIP_GATE(0x809EF58C, &lit_5390); #pragma pop /* 809EF598-809EF59C 0003A4 0004+00 0/1 0/0 0/0 .rodata @5391 */ @@ -2699,7 +2717,7 @@ SECTION_RODATA static u8 const lit_5391[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(809EF598, &lit_5391); +COMPILER_STRIP_GATE(0x809EF598, &lit_5391); #pragma pop /* 809EF59C-809EF5A8 0003A8 000C+00 0/1 0/0 0/0 .rodata @5392 */ @@ -2708,7 +2726,7 @@ COMPILER_STRIP_GATE(809EF598, &lit_5391); SECTION_RODATA static u8 const lit_5392[12] = { 0x00, 0x1A, 0x00, 0x00, 0x40, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809EF59C, &lit_5392); +COMPILER_STRIP_GATE(0x809EF59C, &lit_5392); #pragma pop /* 809EF5A8-809EF5AC 0003B4 0004+00 0/1 0/0 0/0 .rodata @5393 */ @@ -2720,7 +2738,7 @@ SECTION_RODATA static u8 const lit_5393[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(809EF5A8, &lit_5393); +COMPILER_STRIP_GATE(0x809EF5A8, &lit_5393); #pragma pop /* 809EB5C0-809EBA3C 0032A0 047C+00 1/1 0/0 0/0 .text playMotion__11daNpc_Grz_cFv */ @@ -2738,7 +2756,7 @@ asm void daNpc_Grz_c::playMotion() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpc_Grz_c::chkAction(int (daNpc_Grz_c::*)(void*)) { +asm void daNpc_Grz_c::chkAction(int (daNpc_Grz_c::*param_0)(void*)) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_grz/d_a_npc_grz/chkAction__11daNpc_Grz_cFM11daNpc_Grz_cFPCvPvPv_i.s" } @@ -2749,7 +2767,7 @@ asm void daNpc_Grz_c::chkAction(int (daNpc_Grz_c::*)(void*)) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpc_Grz_c::setAction(int (daNpc_Grz_c::*)(void*)) { +asm void daNpc_Grz_c::setAction(int (daNpc_Grz_c::*param_0)(void*)) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_grz/d_a_npc_grz/setAction__11daNpc_Grz_cFM11daNpc_Grz_cFPCvPvPv_i.s" } @@ -2815,7 +2833,7 @@ SECTION_RODATA static u8 const lit_5394[60] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809EF5AC, &lit_5394); +COMPILER_STRIP_GATE(0x809EF5AC, &lit_5394); #pragma pop /* 809EF5E8-809EF5F4 0003F4 000C+00 0/1 0/0 0/0 .rodata @5582 */ @@ -2824,21 +2842,21 @@ COMPILER_STRIP_GATE(809EF5AC, &lit_5394); SECTION_RODATA static u8 const lit_5582[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809EF5E8, &lit_5582); +COMPILER_STRIP_GATE(0x809EF5E8, &lit_5582); #pragma pop /* 809EF5F4-809EF5F8 000400 0004+00 0/1 0/0 0/0 .rodata @5636 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5636 = -80.0f; -COMPILER_STRIP_GATE(809EF5F4, &lit_5636); +COMPILER_STRIP_GATE(0x809EF5F4, &lit_5636); #pragma pop /* 809EF5F8-809EF5FC 000404 0004+00 0/1 0/0 0/0 .rodata @5637 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5637 = 80.0f; -COMPILER_STRIP_GATE(809EF5F8, &lit_5637); +COMPILER_STRIP_GATE(0x809EF5F8, &lit_5637); #pragma pop /* 809EC188-809EC424 003E68 029C+00 1/1 0/0 0/0 .text lookat__11daNpc_Grz_cFv */ @@ -2906,21 +2924,21 @@ static asm void s_sub3(void* param_0, void* param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5836 = 11.0f; -COMPILER_STRIP_GATE(809EF5FC, &lit_5836); +COMPILER_STRIP_GATE(0x809EF5FC, &lit_5836); #pragma pop /* 809EF600-809EF604 00040C 0004+00 0/2 0/0 0/0 .rodata @5837 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5837 = 28.0f; -COMPILER_STRIP_GATE(809EF600, &lit_5837); +COMPILER_STRIP_GATE(0x809EF600, &lit_5837); #pragma pop /* 809EF604-809EF608 000410 0004+00 0/1 0/0 0/0 .rodata @5838 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5838 = 400.0f; -COMPILER_STRIP_GATE(809EF604, &lit_5838); +COMPILER_STRIP_GATE(0x809EF604, &lit_5838); #pragma pop /* 809EC854-809ECBF0 004534 039C+00 1/0 0/0 0/0 .text waitSmash__11daNpc_Grz_cFPv */ @@ -2976,7 +2994,7 @@ asm void daNpc_Grz_c::test(void* param_0) { /* ############################################################################################## */ /* 809EF608-809EF60C 000414 0004+00 1/1 0/0 0/0 .rodata @6013 */ SECTION_RODATA static f32 const lit_6013 = 4.0f; -COMPILER_STRIP_GATE(809EF608, &lit_6013); +COMPILER_STRIP_GATE(0x809EF608, &lit_6013); /* 809ED06C-809ED18C 004D4C 0120+00 1/1 0/0 0/0 .text setPrtcl__11daNpc_Grz_cFv */ #pragma push @@ -2988,6 +3006,13 @@ asm void daNpc_Grz_c::setPrtcl() { } #pragma pop +/* ############################################################################################## */ +/* 809EF638-809EF638 000444 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_809EF694 = "timer"; +#pragma pop + /* 809ED18C-809ED228 004E6C 009C+00 1/0 0/0 0/0 .text doWaitCut__11daNpc_Grz_cFi */ #pragma push #pragma optimization_level 0 @@ -3003,7 +3028,7 @@ asm void daNpc_Grz_c::doWaitCut(int param_0) { SECTION_RODATA static u8 const lit_6047[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809EF60C, &lit_6047); +COMPILER_STRIP_GATE(0x809EF60C, &lit_6047); /* 809ED228-809ED3D4 004F08 01AC+00 1/0 0/0 0/0 .text doRebirthCut__11daNpc_Grz_cFi */ #pragma push @@ -3015,6 +3040,13 @@ asm void daNpc_Grz_c::doRebirthCut(int param_0) { } #pragma pop +/* ############################################################################################## */ +/* 809EF638-809EF638 000444 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_809EF69A = "prm"; +#pragma pop + /* 809ED3D4-809ED5EC 0050B4 0218+00 1/0 0/0 0/0 .text doTalkStandCut__11daNpc_Grz_cFi */ #pragma push #pragma optimization_level 0 @@ -3030,14 +3062,14 @@ asm void daNpc_Grz_c::doTalkStandCut(int param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6205 = 150.0f; -COMPILER_STRIP_GATE(809EF614, &lit_6205); +COMPILER_STRIP_GATE(0x809EF614, &lit_6205); #pragma pop /* 809EF618-809EF61C 000424 0004+00 0/1 0/0 0/0 .rodata @6206 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6206 = 1020.0f; -COMPILER_STRIP_GATE(809EF618, &lit_6206); +COMPILER_STRIP_GATE(0x809EF618, &lit_6206); #pragma pop /* 809ED5EC-809EDBA4 0052CC 05B8+00 1/0 0/0 0/0 .text doGoOutCut__11daNpc_Grz_cFi */ @@ -3065,42 +3097,42 @@ SECTION_RODATA static u8 const l_prticles_id[6 + 2 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(809EF61C, &l_prticles_id); +COMPILER_STRIP_GATE(0x809EF61C, &l_prticles_id); #pragma pop /* 809EF624-809EF628 000430 0004+00 0/1 0/0 0/0 .rodata @6470 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6470 = -250.0f; -COMPILER_STRIP_GATE(809EF624, &lit_6470); +COMPILER_STRIP_GATE(0x809EF624, &lit_6470); #pragma pop /* 809EF628-809EF62C 000434 0004+00 0/1 0/0 0/0 .rodata @6471 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6471 = 17.0f; -COMPILER_STRIP_GATE(809EF628, &lit_6471); +COMPILER_STRIP_GATE(0x809EF628, &lit_6471); #pragma pop /* 809EF62C-809EF630 000438 0004+00 0/1 0/0 0/0 .rodata @6472 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6472 = 14.0f; -COMPILER_STRIP_GATE(809EF62C, &lit_6472); +COMPILER_STRIP_GATE(0x809EF62C, &lit_6472); #pragma pop /* 809EF630-809EF634 00043C 0004+00 0/1 0/0 0/0 .rodata @6473 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6473 = 0.5f; -COMPILER_STRIP_GATE(809EF630, &lit_6473); +COMPILER_STRIP_GATE(0x809EF630, &lit_6473); #pragma pop /* 809EF634-809EF638 000440 0004+00 0/1 0/0 0/0 .rodata @6474 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6474 = 6.0f / 5.0f; -COMPILER_STRIP_GATE(809EF634, &lit_6474); +COMPILER_STRIP_GATE(0x809EF634, &lit_6474); #pragma pop /* 809EDBA4-809EE5F0 005884 0A4C+00 1/0 0/0 0/0 .text doStoneSmashCut__11daNpc_Grz_cFi */ @@ -3337,7 +3369,7 @@ asm cCcD_GStts::~cCcD_GStts() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_809EF064(int* param_0) { +extern "C" asm void func_809EF064(void* _this, int* param_0) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_grz/d_a_npc_grz/func_809EF064.s" } @@ -3363,7 +3395,7 @@ asm void __sinit_d_a_npc_grz_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_809EF080 = (void*)__sinit_d_a_npc_grz_cpp; +REGISTER_CTORS(0x809EF080, __sinit_d_a_npc_grz_cpp); #pragma pop /* 809EF184-809EF188 006E64 0004+00 1/0 0/0 0/0 .text adjustShapeAngle__11daNpc_Grz_cFv @@ -3574,23 +3606,4 @@ static u8 data_809EFCD0[4]; static u8 data_809EFCD4[4]; #pragma pop -/* 809EF638-809EF69E 000444 0066+00 9/5 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_809EF638 = "TALK_STAND"; -SECTION_DEAD static char const* const stringBase_809EF643 = "STONE_SMASH"; -SECTION_DEAD static char const* const stringBase_809EF64F = "STONE_SMASH_SKIP"; -SECTION_DEAD static char const* const stringBase_809EF660 = "grZ"; -SECTION_DEAD static char const* const stringBase_809EF664 = "grZ1"; -SECTION_DEAD static char const* const stringBase_809EF669 = "grZ2"; -SECTION_DEAD static char const* const stringBase_809EF66E = "grZ3"; -SECTION_DEAD static char const* const stringBase_809EF673 = "grZD1"; -SECTION_DEAD static char const* const stringBase_809EF679 = "grZD3"; -SECTION_DEAD static char const* const stringBase_809EF67F = ""; -SECTION_DEAD static char const* const stringBase_809EF680 = "WAIT"; -SECTION_DEAD static char const* const stringBase_809EF685 = "REBIRTH"; -SECTION_DEAD static char const* const stringBase_809EF68D = "GO_OUT"; -SECTION_DEAD static char const* const stringBase_809EF694 = "timer"; -SECTION_DEAD static char const* const stringBase_809EF69A = "prm"; -#pragma pop +/* 809EF638-809EF638 000444 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/npc/d_a_npc_guard/d_a_npc_guard.cpp b/rel/d/a/npc/d_a_npc_guard/d_a_npc_guard.cpp index 57dc98eee52..533e22260e3 100644 --- a/rel/d/a/npc/d_a_npc_guard/d_a_npc_guard.cpp +++ b/rel/d/a/npc/d_a_npc_guard/d_a_npc_guard.cpp @@ -71,10 +71,10 @@ struct daNpcGuard_c { static u8 ActionTable[168]; }; -struct J3DAnmTransformKey {}; - struct J3DModel {}; +struct J3DAnmTransformKey {}; + struct daNpcCd2_c { /* 80157D00 */ void NpcCreate(int); /* 80157F28 */ void ObjCreate(int); @@ -288,9 +288,9 @@ extern "C" void execute__12daNpcGuard_cFv(); extern "C" static void daNpcGuard_Draw__FPv(); extern "C" static bool daNpcGuard_IsDelete__FPv(); extern "C" void __dt__10cCcD_GSttsFv(); -extern "C" void func_809F24B4(int*); -extern "C" void func_809F24D0(f32, f32); -extern "C" void func_809F250C(int, int); +extern "C" void func_809F24B4(void* _this, int*); +extern "C" void func_809F24D0(void* _this, f32, f32); +extern "C" void func_809F250C(void* _this, int, int); extern "C" void __sinit_d_a_npc_guard_cpp(); extern "C" static void func_809F26E8(); extern "C" static void func_809F26F0(); @@ -428,6 +428,13 @@ extern "C" extern u32 __float_nan; // Declarations: // +/* ############################################################################################## */ +/* 809F2D48-809F2D48 0000F8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_809F2D48 = "object"; +#pragma pop + /* 809EFD58-809EFE20 000078 00C8+00 1/1 0/0 0/0 .text createHeapCallBack__FP10fopAc_ac_c */ #pragma push @@ -647,11 +654,11 @@ asm void daNpcGuard_c::callExecute() { /* ############################################################################################## */ /* 809F2C50-809F2C54 000000 0004+00 15/15 0/0 0/0 .rodata @3900 */ SECTION_RODATA static f32 const lit_3900 = 1.0f; -COMPILER_STRIP_GATE(809F2C50, &lit_3900); +COMPILER_STRIP_GATE(0x809F2C50, &lit_3900); /* 809F2C54-809F2C58 000004 0004+00 3/6 0/0 0/0 .rodata @3901 */ SECTION_RODATA static f32 const lit_3901 = 12.0f; -COMPILER_STRIP_GATE(809F2C54, &lit_3901); +COMPILER_STRIP_GATE(0x809F2C54, &lit_3901); /* 809EFEB8-809EFF1C 0001D8 0064+00 1/0 0/0 0/0 .text initPath__12daNpcGuard_cFv */ #pragma push @@ -668,13 +675,13 @@ asm void daNpcGuard_c::initPath() { SECTION_RODATA static u8 const lit_3951[8] = { 0x40, 0x7F, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809F2C58, &lit_3951); +COMPILER_STRIP_GATE(0x809F2C58, &lit_3951); /* 809F2C60-809F2C68 000010 0008+00 2/5 0/0 0/0 .rodata @3952 */ SECTION_RODATA static u8 const lit_3952[8] = { 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809F2C60, &lit_3952); +COMPILER_STRIP_GATE(0x809F2C60, &lit_3952); /* 809F2EC0-809F2EE0 -00001 0020+00 1/0 0/0 0/0 .data daNpcGuard_METHODS */ SECTION_DATA static void* daNpcGuard_METHODS[8] = { @@ -833,14 +840,14 @@ asm void daNpcGuard_c::initRun() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4002 = 1.0f / 20.0f; -COMPILER_STRIP_GATE(809F2C68, &lit_4002); +COMPILER_STRIP_GATE(0x809F2C68, &lit_4002); #pragma pop /* 809F2C6C-809F2C70 00001C 0004+00 0/2 0/0 0/0 .rodata @4003 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4003 = 7.0f / 10.0f; -COMPILER_STRIP_GATE(809F2C6C, &lit_4003); +COMPILER_STRIP_GATE(0x809F2C6C, &lit_4003); #pragma pop /* 809F2C70-809F2C74 000020 0004+00 0/9 0/0 0/0 .rodata @4004 */ @@ -852,25 +859,25 @@ SECTION_RODATA static u8 const lit_4004[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(809F2C70, &lit_4004); +COMPILER_STRIP_GATE(0x809F2C70, &lit_4004); #pragma pop /* 809F2C74-809F2C78 000024 0004+00 0/2 0/0 0/0 .rodata @4005 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4005 = 6.0f / 5.0f; -COMPILER_STRIP_GATE(809F2C74, &lit_4005); +COMPILER_STRIP_GATE(0x809F2C74, &lit_4005); #pragma pop /* 809F2C78-809F2C7C 000028 0004+00 1/5 0/0 0/0 .rodata @4006 */ SECTION_RODATA static f32 const lit_4006 = 0.25f; -COMPILER_STRIP_GATE(809F2C78, &lit_4006); +COMPILER_STRIP_GATE(0x809F2C78, &lit_4006); /* 809F2C7C-809F2C80 00002C 0004+00 0/2 0/0 0/0 .rodata @4007 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4007 = 3.0f / 5.0f; -COMPILER_STRIP_GATE(809F2C7C, &lit_4007); +COMPILER_STRIP_GATE(0x809F2C7C, &lit_4007); #pragma pop /* 809F01E8-809F03FC 000508 0214+00 1/0 0/0 0/0 .text executeRun__12daNpcGuard_cFv */ @@ -888,14 +895,14 @@ asm void daNpcGuard_c::executeRun() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4016 = 300.0f; -COMPILER_STRIP_GATE(809F2C80, &lit_4016); +COMPILER_STRIP_GATE(0x809F2C80, &lit_4016); #pragma pop /* 809F2C84-809F2C88 000034 0004+00 0/2 0/0 0/0 .rodata @4017 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4017 = 200.0f; -COMPILER_STRIP_GATE(809F2C84, &lit_4017); +COMPILER_STRIP_GATE(0x809F2C84, &lit_4017); #pragma pop /* 809F03FC-809F04B4 00071C 00B8+00 1/0 0/0 0/0 .text initFightWait__12daNpcGuard_cFv */ @@ -913,21 +920,21 @@ asm void daNpcGuard_c::initFightWait() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4065 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(809F2C88, &lit_4065); +COMPILER_STRIP_GATE(0x809F2C88, &lit_4065); #pragma pop /* 809F2C8C-809F2C90 00003C 0004+00 0/1 0/0 0/0 .rodata @4066 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4066 = 10.0f; -COMPILER_STRIP_GATE(809F2C8C, &lit_4066); +COMPILER_STRIP_GATE(0x809F2C8C, &lit_4066); #pragma pop /* 809F2C90-809F2C94 000040 0004+00 0/1 0/0 0/0 .rodata @4067 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4067 = 500.0f; -COMPILER_STRIP_GATE(809F2C90, &lit_4067); +COMPILER_STRIP_GATE(0x809F2C90, &lit_4067); #pragma pop /* 809F04B4-809F06F4 0007D4 0240+00 1/0 0/0 0/0 .text executeFightWait__12daNpcGuard_cFv @@ -988,7 +995,7 @@ asm void daNpcGuard_c::executeFightMenace() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4111 = 4.0f; -COMPILER_STRIP_GATE(809F2C94, &lit_4111); +COMPILER_STRIP_GATE(0x809F2C94, &lit_4111); #pragma pop /* 809F08DC-809F0960 000BFC 0084+00 1/0 0/0 0/0 .text initFear__12daNpcGuard_cFv */ @@ -1016,14 +1023,14 @@ asm void daNpcGuard_c::executeFear() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4141 = 2.0f; -COMPILER_STRIP_GATE(809F2C98, &lit_4141); +COMPILER_STRIP_GATE(0x809F2C98, &lit_4141); #pragma pop /* 809F2C9C-809F2CA0 00004C 0004+00 0/1 0/0 0/0 .rodata @4142 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4142 = 8.0f; -COMPILER_STRIP_GATE(809F2C9C, &lit_4142); +COMPILER_STRIP_GATE(0x809F2C9C, &lit_4142); #pragma pop /* 809F2CA0-809F2CA8 000050 0004+04 0/2 0/0 0/0 .rodata @4143 */ @@ -1034,7 +1041,7 @@ SECTION_RODATA static f32 const lit_4143[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(809F2CA0, &lit_4143); +COMPILER_STRIP_GATE(0x809F2CA0, &lit_4143); #pragma pop /* 809F0A50-809F0B20 000D70 00D0+00 1/0 0/0 0/0 .text initEscape__12daNpcGuard_cFv */ @@ -1054,7 +1061,7 @@ asm void daNpcGuard_c::initEscape() { SECTION_RODATA static u8 const lit_4203[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809F2CA8, &lit_4203); +COMPILER_STRIP_GATE(0x809F2CA8, &lit_4203); #pragma pop /* 809F2CB0-809F2CB8 000060 0008+00 0/1 0/0 0/0 .rodata @4204 */ @@ -1063,7 +1070,7 @@ COMPILER_STRIP_GATE(809F2CA8, &lit_4203); SECTION_RODATA static u8 const lit_4204[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809F2CB0, &lit_4204); +COMPILER_STRIP_GATE(0x809F2CB0, &lit_4204); #pragma pop /* 809F2CB8-809F2CC0 000068 0008+00 0/1 0/0 0/0 .rodata @4205 */ @@ -1072,7 +1079,7 @@ COMPILER_STRIP_GATE(809F2CB0, &lit_4204); SECTION_RODATA static u8 const lit_4205[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809F2CB8, &lit_4205); +COMPILER_STRIP_GATE(0x809F2CB8, &lit_4205); #pragma pop /* 809F0B20-809F0DD4 000E40 02B4+00 1/0 0/0 0/0 .text executeEscape__12daNpcGuard_cFv */ @@ -1110,14 +1117,14 @@ asm void daNpcGuard_c::setSpeed(f32 param_0, f32 param_1, f32* param_2, int para #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4335 = 4.0f / 5.0f; -COMPILER_STRIP_GATE(809F2CC0, &lit_4335); +COMPILER_STRIP_GATE(0x809F2CC0, &lit_4335); #pragma pop /* 809F2CC4-809F2CC8 000074 0004+00 0/2 0/0 0/0 .rodata @4336 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4336 = 1.5f; -COMPILER_STRIP_GATE(809F2CC4, &lit_4336); +COMPILER_STRIP_GATE(0x809F2CC4, &lit_4336); #pragma pop /* 809F0ED4-809F12D0 0011F4 03FC+00 1/1 0/0 0/0 .text pathMoveF__12daNpcGuard_cFv */ @@ -1160,68 +1167,68 @@ SECTION_RODATA static u8 const lit_4351[64] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41, 0xF0, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809F2CC8, &lit_4351); +COMPILER_STRIP_GATE(0x809F2CC8, &lit_4351); #pragma pop /* 809F2D08-809F2D0C 0000B8 0004+00 0/1 0/0 0/0 .rodata @4480 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4480 = -3.0f; -COMPILER_STRIP_GATE(809F2D08, &lit_4480); +COMPILER_STRIP_GATE(0x809F2D08, &lit_4480); #pragma pop /* 809F2D0C-809F2D10 0000BC 0004+00 0/1 0/0 0/0 .rodata @4481 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4481 = -40.0f; -COMPILER_STRIP_GATE(809F2D0C, &lit_4481); +COMPILER_STRIP_GATE(0x809F2D0C, &lit_4481); #pragma pop /* 809F2D10-809F2D14 0000C0 0004+00 0/1 0/0 0/0 .rodata @4482 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4482 = -10.0f; -COMPILER_STRIP_GATE(809F2D10, &lit_4482); +COMPILER_STRIP_GATE(0x809F2D10, &lit_4482); #pragma pop /* 809F2D14-809F2D18 0000C4 0004+00 0/2 0/0 0/0 .rodata @4483 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4483 = -80.0f; -COMPILER_STRIP_GATE(809F2D14, &lit_4483); +COMPILER_STRIP_GATE(0x809F2D14, &lit_4483); #pragma pop /* 809F2D18-809F2D1C 0000C8 0004+00 0/1 0/0 0/0 .rodata @4484 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4484 = 40.0f; -COMPILER_STRIP_GATE(809F2D18, &lit_4484); +COMPILER_STRIP_GATE(0x809F2D18, &lit_4484); #pragma pop /* 809F2D1C-809F2D20 0000CC 0004+00 0/1 0/0 0/0 .rodata @4485 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4485 = 190.0f; -COMPILER_STRIP_GATE(809F2D1C, &lit_4485); +COMPILER_STRIP_GATE(0x809F2D1C, &lit_4485); #pragma pop /* 809F2D20-809F2D24 0000D0 0004+00 0/2 0/0 0/0 .rodata @4486 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4486 = 90.0f; -COMPILER_STRIP_GATE(809F2D20, &lit_4486); +COMPILER_STRIP_GATE(0x809F2D20, &lit_4486); #pragma pop /* 809F2D24-809F2D28 0000D4 0004+00 0/2 0/0 0/0 .rodata @4487 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4487 = 45.0f; -COMPILER_STRIP_GATE(809F2D24, &lit_4487); +COMPILER_STRIP_GATE(0x809F2D24, &lit_4487); #pragma pop /* 809F2D28-809F2D2C 0000D8 0004+00 1/2 0/0 0/0 .rodata @4488 */ SECTION_RODATA static f32 const lit_4488 = 60.0f; -COMPILER_STRIP_GATE(809F2D28, &lit_4488); +COMPILER_STRIP_GATE(0x809F2D28, &lit_4488); /* 809F14CC-809F17D0 0017EC 0304+00 1/1 0/0 0/0 .text create_init__12daNpcGuard_cFv */ #pragma push @@ -1328,21 +1335,21 @@ static asm void daNpcGuard_Execute(void* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4924 = 150.0f; -COMPILER_STRIP_GATE(809F2D2C, &lit_4924); +COMPILER_STRIP_GATE(0x809F2D2C, &lit_4924); #pragma pop /* 809F2D30-809F2D34 0000E0 0004+00 0/1 0/0 0/0 .rodata @4925 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4925 = 2.0f / 5.0f; -COMPILER_STRIP_GATE(809F2D30, &lit_4925); +COMPILER_STRIP_GATE(0x809F2D30, &lit_4925); #pragma pop /* 809F2D34-809F2D38 0000E4 0004+00 0/1 0/0 0/0 .rodata @4926 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4926 = 25.0f; -COMPILER_STRIP_GATE(809F2D34, &lit_4926); +COMPILER_STRIP_GATE(0x809F2D34, &lit_4926); #pragma pop /* 809F2D38-809F2D40 0000E8 0004+04 0/1 0/0 0/0 .rodata @4927 */ @@ -1353,7 +1360,7 @@ SECTION_RODATA static f32 const lit_4927[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(809F2D38, &lit_4927); +COMPILER_STRIP_GATE(0x809F2D38, &lit_4927); #pragma pop /* 809F2044-809F2374 002364 0330+00 1/1 0/0 0/0 .text execute__12daNpcGuard_cFv */ @@ -1395,7 +1402,7 @@ asm cCcD_GStts::~cCcD_GStts() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_809F24B4(int* param_0) { +extern "C" asm void func_809F24B4(void* _this, int* param_0) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_guard/d_a_npc_guard/func_809F24B4.s" } @@ -1405,7 +1412,7 @@ extern "C" asm void func_809F24B4(int* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_809F24D0(f32 param_0, f32 param_1) { +extern "C" asm void func_809F24D0(void* _this, f32 param_0, f32 param_1) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_guard/d_a_npc_guard/func_809F24D0.s" } @@ -1416,13 +1423,13 @@ extern "C" asm void func_809F24D0(f32 param_0, f32 param_1) { SECTION_RODATA static u8 const lit_4990[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809F2D40, &lit_4990); +COMPILER_STRIP_GATE(0x809F2D40, &lit_4990); /* 809F250C-809F2588 00282C 007C+00 4/4 0/0 0/0 .text cLib_getRndValue__Fii */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_809F250C(int param_0, int param_1) { +extern "C" asm void func_809F250C(void* _this, int param_0, int param_1) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_guard/d_a_npc_guard/func_809F250C.s" } @@ -1440,7 +1447,7 @@ asm void __sinit_d_a_npc_guard_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_809F2588 = (void*)__sinit_d_a_npc_guard_cpp; +REGISTER_CTORS(0x809F2588, __sinit_d_a_npc_guard_cpp); #pragma pop /* 809F26E8-809F26F0 002A08 0008+00 1/0 0/0 0/0 .text @36@__dt__12dBgS_ObjAcchFv */ @@ -1543,9 +1550,4 @@ asm dBgS_ObjAcch::~dBgS_ObjAcch() { } #pragma pop -/* 809F2D48-809F2D4F 0000F8 0007+00 1/1 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_809F2D48 = "object"; -#pragma pop +/* 809F2D48-809F2D48 0000F8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/npc/d_a_npc_gwolf/d_a_npc_gwolf.cpp b/rel/d/a/npc/d_a_npc_gwolf/d_a_npc_gwolf.cpp index ef9ff32a507..3870a07cf32 100644 --- a/rel/d/a/npc/d_a_npc_gwolf/d_a_npc_gwolf.cpp +++ b/rel/d/a/npc/d_a_npc_gwolf/d_a_npc_gwolf.cpp @@ -34,14 +34,14 @@ struct mDoMtx_stack_c { static u8 now[48]; }; +struct J3DAnmTextureSRTKey {}; + struct J3DAnmTexPattern { /* 8032AF50 */ void getTexNo(u16, u16*) const; }; struct J3DAnmTevRegKey {}; -struct J3DAnmTextureSRTKey {}; - struct J3DMaterialTable { /* 8032F6F8 */ void removeTexNoAnimator(J3DAnmTexPattern*); /* 8032F7B4 */ void removeTexMtxAnimator(J3DAnmTextureSRTKey*); @@ -66,12 +66,12 @@ struct mDoExt_bckAnm { /* 8000D990 */ void changeBckOnly(J3DAnmTransform*); }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; +struct J3DModelData {}; + struct Z2Creature { /* 802C03C8 */ Z2Creature(); /* 802C0420 */ ~Z2Creature(); @@ -99,14 +99,14 @@ struct fopAcM_gc_c { struct _GXColorS10 {}; -struct J3DModel {}; - -struct J3DJoint {}; - struct dBgS_ObjAcch { /* 809F828C */ ~dBgS_ObjAcch(); }; +struct J3DModel {}; + +struct J3DJoint {}; + struct daNpc_GWolf_c { /* 809F30AC */ daNpc_GWolf_c(); /* 809F32C0 */ ~daNpc_GWolf_c(); @@ -169,14 +169,14 @@ struct dCcD_GObjInf { /* 800840E4 */ ~dCcD_GObjInf(); }; +struct J3DAnmTransformKey {}; + struct dCcD_SrcCyl {}; struct dCcD_Cyl { /* 800848B4 */ void Set(dCcD_SrcCyl const&); }; -struct J3DAnmTransformKey {}; - struct daNpcF_c { struct daNpcF_anmPlayData {}; @@ -505,7 +505,7 @@ extern "C" void __dt__12J3DFrameCtrlFv(); extern "C" void setCollisions__8daNpcF_cFv(); extern "C" bool setExpressionBtp__8daNpcF_cFi(); extern "C" void __dt__10cCcD_GSttsFv(); -extern "C" void func_809F8398(int*); +extern "C" void func_809F8398(void* _this, int*); extern "C" void __sinit_d_a_npc_gwolf_cpp(); extern "C" void __dt__19daNpc_GWolf_Param_cFv(); extern "C" static void func_809F84D0(); @@ -706,6 +706,27 @@ extern "C" void __register_global_object(); // /* ############################################################################################## */ +/* 809F871C-809F871C 000228 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_809F871C = "ATTACK_WARP"; +SECTION_DEAD static char const* const stringBase_809F8728 = "ATTACK_WARP_HORSE"; +SECTION_DEAD static char const* const stringBase_809F873A = "HOWLING_SESSIONA"; +SECTION_DEAD static char const* const stringBase_809F874B = "HOWLING_SESSIONB"; +SECTION_DEAD static char const* const stringBase_809F875C = "HOWLING_SESSIONC"; +SECTION_DEAD static char const* const stringBase_809F876D = "HOWLING_SESSIOND"; +SECTION_DEAD static char const* const stringBase_809F877E = "HOWLING_SESSIONE"; +SECTION_DEAD static char const* const stringBase_809F878F = "HOWLING_SESSIONF"; +SECTION_DEAD static char const* const stringBase_809F87A0 = "MEET_GWOLFA"; +SECTION_DEAD static char const* const stringBase_809F87AC = "MEET_GWOLFB"; +SECTION_DEAD static char const* const stringBase_809F87B8 = "MEET_GWOLFC"; +SECTION_DEAD static char const* const stringBase_809F87C4 = "MEET_GWOLFD"; +SECTION_DEAD static char const* const stringBase_809F87D0 = "MEET_GWOLFE"; +SECTION_DEAD static char const* const stringBase_809F87DC = "MEET_GWOLFF"; +SECTION_DEAD static char const* const stringBase_809F87E8 = "GWolf"; +SECTION_DEAD static char const* const stringBase_809F87EE = ""; +#pragma pop + /* 809F87F4-809F8800 000000 000C+00 6/6 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -1427,34 +1448,34 @@ SECTION_RODATA u8 const daNpc_GWolf_Param_c::m[140] = { 0x42, 0x22, 0x00, 0x00, 0x41, 0x9C, 0x00, 0x00, 0x42, 0x1A, 0x00, 0x00, 0x43, 0xFA, 0x00, 0x00, 0x3F, 0x7D, 0x70, 0xA4, 0x3F, 0x66, 0x66, 0x66, 0x42, 0xF0, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809F84F4, &daNpc_GWolf_Param_c::m); +COMPILER_STRIP_GATE(0x809F84F4, &daNpc_GWolf_Param_c::m); /* 809F8580-809F8584 00008C 0004+00 0/1 0/0 0/0 .rodata @4401 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4401 = -300.0f; -COMPILER_STRIP_GATE(809F8580, &lit_4401); +COMPILER_STRIP_GATE(0x809F8580, &lit_4401); #pragma pop /* 809F8584-809F8588 000090 0004+00 0/1 0/0 0/0 .rodata @4402 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4402 = -50.0f; -COMPILER_STRIP_GATE(809F8584, &lit_4402); +COMPILER_STRIP_GATE(0x809F8584, &lit_4402); #pragma pop /* 809F8588-809F858C 000094 0004+00 0/2 0/0 0/0 .rodata @4403 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4403 = 300.0f; -COMPILER_STRIP_GATE(809F8588, &lit_4403); +COMPILER_STRIP_GATE(0x809F8588, &lit_4403); #pragma pop /* 809F858C-809F8590 000098 0004+00 0/1 0/0 0/0 .rodata @4404 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4404 = 450.0f; -COMPILER_STRIP_GATE(809F858C, &lit_4404); +COMPILER_STRIP_GATE(0x809F858C, &lit_4404); #pragma pop /* 809F34C0-809F37C0 000500 0300+00 1/1 0/0 0/0 .text create__13daNpc_GWolf_cFv */ @@ -1470,7 +1491,7 @@ asm void daNpc_GWolf_c::create() { /* ############################################################################################## */ /* 809F8590-809F8594 00009C 0004+00 2/4 0/0 0/0 .rodata @4456 */ SECTION_RODATA static f32 const lit_4456 = 1.0f; -COMPILER_STRIP_GATE(809F8590, &lit_4456); +COMPILER_STRIP_GATE(0x809F8590, &lit_4456); /* 809F8594-809F8598 0000A0 0004+00 4/11 0/0 0/0 .rodata @4457 */ SECTION_RODATA static u8 const lit_4457[4] = { @@ -1479,7 +1500,7 @@ SECTION_RODATA static u8 const lit_4457[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(809F8594, &lit_4457); +COMPILER_STRIP_GATE(0x809F8594, &lit_4457); /* 809F37C0-809F3A1C 000800 025C+00 1/1 0/0 0/0 .text CreateHeap__13daNpc_GWolf_cFv */ #pragma push @@ -1626,7 +1647,7 @@ asm void daNpc_GWolf_c::Draw() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4582 = 20.0f; -COMPILER_STRIP_GATE(809F8598, &lit_4582); +COMPILER_STRIP_GATE(0x809F8598, &lit_4582); #pragma pop /* 809F859C-809F85A4 0000A8 0008+00 0/1 0/0 0/0 .rodata @4584 */ @@ -1635,7 +1656,7 @@ COMPILER_STRIP_GATE(809F8598, &lit_4582); SECTION_RODATA static u8 const lit_4584[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809F859C, &lit_4584); +COMPILER_STRIP_GATE(0x809F859C, &lit_4584); #pragma pop /* 809F3CBC-809F3FB8 000CFC 02FC+00 1/1 0/0 0/0 .text draw__13daNpc_GWolf_cFiifP11_GXColorS10i */ @@ -1654,7 +1675,7 @@ asm void daNpc_GWolf_c::draw(int param_0, int param_1, f32 param_2, _GXColorS10* SECTION_RODATA static u8 const lit_4589[12] = { 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x04, }; -COMPILER_STRIP_GATE(809F85A4, &lit_4589); +COMPILER_STRIP_GATE(0x809F85A4, &lit_4589); /* 809F3FB8-809F41EC 000FF8 0234+00 1/1 0/0 0/0 .text * ctrlJoint__13daNpc_GWolf_cFP8J3DJointP8J3DModel */ @@ -1712,11 +1733,11 @@ asm void daNpc_GWolf_c::main() { /* ############################################################################################## */ /* 809F85B0-809F85B4 0000BC 0004+00 5/10 0/0 0/0 .rodata @4803 */ SECTION_RODATA static f32 const lit_4803 = -1.0f; -COMPILER_STRIP_GATE(809F85B0, &lit_4803); +COMPILER_STRIP_GATE(0x809F85B0, &lit_4803); /* 809F85B4-809F85B8 0000C0 0004+00 1/1 0/0 0/0 .rodata @4804 */ SECTION_RODATA static f32 const lit_4804 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(809F85B4, &lit_4804); +COMPILER_STRIP_GATE(0x809F85B4, &lit_4804); /* 809F4558-809F4638 001598 00E0+00 1/0 0/0 0/0 .text ctrlBtk__13daNpc_GWolf_cFv */ #pragma push @@ -1744,21 +1765,21 @@ asm void daNpc_GWolf_c::adjustShapeAngle() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4944 = 35.0f; -COMPILER_STRIP_GATE(809F85B8, &lit_4944); +COMPILER_STRIP_GATE(0x809F85B8, &lit_4944); #pragma pop /* 809F85BC-809F85C0 0000C8 0004+00 0/1 0/0 0/0 .rodata @4945 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4945 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(809F85BC, &lit_4945); +COMPILER_STRIP_GATE(0x809F85BC, &lit_4945); #pragma pop /* 809F85C0-809F85C4 0000CC 0004+00 0/1 0/0 0/0 .rodata @4946 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4946 = 125.0f; -COMPILER_STRIP_GATE(809F85C0, &lit_4946); +COMPILER_STRIP_GATE(0x809F85C0, &lit_4946); #pragma pop /* 809F85C4-809F85CC 0000D0 0008+00 0/2 0/0 0/0 .rodata @4947 */ @@ -1767,7 +1788,7 @@ COMPILER_STRIP_GATE(809F85C0, &lit_4946); SECTION_RODATA static u8 const lit_4947[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809F85C4, &lit_4947); +COMPILER_STRIP_GATE(0x809F85C4, &lit_4947); #pragma pop /* 809F85CC-809F85D4 0000D8 0008+00 0/2 0/0 0/0 .rodata @4948 */ @@ -1776,7 +1797,7 @@ COMPILER_STRIP_GATE(809F85C4, &lit_4947); SECTION_RODATA static u8 const lit_4948[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809F85CC, &lit_4948); +COMPILER_STRIP_GATE(0x809F85CC, &lit_4948); #pragma pop /* 809F85D4-809F85DC 0000E0 0008+00 0/2 0/0 0/0 .rodata @4949 */ @@ -1785,7 +1806,7 @@ COMPILER_STRIP_GATE(809F85CC, &lit_4948); SECTION_RODATA static u8 const lit_4949[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809F85D4, &lit_4949); +COMPILER_STRIP_GATE(0x809F85D4, &lit_4949); #pragma pop /* 809F8EC8-809F8ECC 000008 0001+03 1/1 0/0 0/0 .bss @1109 */ @@ -1999,7 +2020,7 @@ asm void daNpc_GWolf_c::reset() { SECTION_RODATA static u8 const lit_5156[12] = { 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809F85DC, &lit_5156); +COMPILER_STRIP_GATE(0x809F85DC, &lit_5156); #pragma pop /* 809F85E8-809F85EC 0000F4 0004+00 0/1 0/0 0/0 .rodata @5157 */ @@ -2011,7 +2032,7 @@ SECTION_RODATA static u8 const lit_5157[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(809F85E8, &lit_5157); +COMPILER_STRIP_GATE(0x809F85E8, &lit_5157); #pragma pop /* 809F85EC-809F85F8 0000F8 000C+00 0/1 0/0 0/0 .rodata @5158 */ @@ -2020,7 +2041,7 @@ COMPILER_STRIP_GATE(809F85E8, &lit_5157); SECTION_RODATA static u8 const lit_5158[12] = { 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809F85EC, &lit_5158); +COMPILER_STRIP_GATE(0x809F85EC, &lit_5158); #pragma pop /* 809F85F8-809F85FC 000104 0004+00 0/1 0/0 0/0 .rodata @5159 */ @@ -2032,7 +2053,7 @@ SECTION_RODATA static u8 const lit_5159[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(809F85F8, &lit_5159); +COMPILER_STRIP_GATE(0x809F85F8, &lit_5159); #pragma pop /* 809F85FC-809F8608 000108 000C+00 0/1 0/0 0/0 .rodata @5160 */ @@ -2041,7 +2062,7 @@ COMPILER_STRIP_GATE(809F85F8, &lit_5159); SECTION_RODATA static u8 const lit_5160[12] = { 0x00, 0x04, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(809F85FC, &lit_5160); +COMPILER_STRIP_GATE(0x809F85FC, &lit_5160); #pragma pop /* 809F8608-809F8614 000114 000C+00 0/1 0/0 0/0 .rodata @5161 */ @@ -2050,7 +2071,7 @@ COMPILER_STRIP_GATE(809F85FC, &lit_5160); SECTION_RODATA static u8 const lit_5161[12] = { 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809F8608, &lit_5161); +COMPILER_STRIP_GATE(0x809F8608, &lit_5161); #pragma pop /* 809F8614-809F861C 000120 0008+00 0/1 0/0 0/0 .rodata @5162 */ @@ -2059,7 +2080,7 @@ COMPILER_STRIP_GATE(809F8608, &lit_5161); SECTION_RODATA static u8 const lit_5162[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809F8614, &lit_5162); +COMPILER_STRIP_GATE(0x809F8614, &lit_5162); #pragma pop /* 809F861C-809F8628 000128 000C+00 0/1 0/0 0/0 .rodata @5163 */ @@ -2068,7 +2089,7 @@ COMPILER_STRIP_GATE(809F8614, &lit_5162); SECTION_RODATA static u8 const lit_5163[12] = { 0x00, 0x06, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(809F861C, &lit_5163); +COMPILER_STRIP_GATE(0x809F861C, &lit_5163); #pragma pop /* 809F8628-809F8634 000134 000C+00 0/1 0/0 0/0 .rodata @5164 */ @@ -2077,7 +2098,7 @@ COMPILER_STRIP_GATE(809F861C, &lit_5163); SECTION_RODATA static u8 const lit_5164[12] = { 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809F8628, &lit_5164); +COMPILER_STRIP_GATE(0x809F8628, &lit_5164); #pragma pop /* 809F8634-809F863C 000140 0008+00 0/1 0/0 0/0 .rodata @5165 */ @@ -2086,7 +2107,7 @@ COMPILER_STRIP_GATE(809F8628, &lit_5164); SECTION_RODATA static u8 const lit_5165[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809F8634, &lit_5165); +COMPILER_STRIP_GATE(0x809F8634, &lit_5165); #pragma pop /* 809F863C-809F8648 000148 000C+00 0/1 0/0 0/0 .rodata @5166 */ @@ -2095,7 +2116,7 @@ COMPILER_STRIP_GATE(809F8634, &lit_5165); SECTION_RODATA static u8 const lit_5166[12] = { 0x00, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809F863C, &lit_5166); +COMPILER_STRIP_GATE(0x809F863C, &lit_5166); #pragma pop /* 809F8648-809F864C 000154 0004+00 0/1 0/0 0/0 .rodata @5167 */ @@ -2107,7 +2128,7 @@ SECTION_RODATA static u8 const lit_5167[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(809F8648, &lit_5167); +COMPILER_STRIP_GATE(0x809F8648, &lit_5167); #pragma pop /* 809F864C-809F8658 000158 000C+00 0/1 0/0 0/0 .rodata @5168 */ @@ -2116,7 +2137,7 @@ COMPILER_STRIP_GATE(809F8648, &lit_5167); SECTION_RODATA static u8 const lit_5168[12] = { 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809F864C, &lit_5168); +COMPILER_STRIP_GATE(0x809F864C, &lit_5168); #pragma pop /* 809F8658-809F865C 000164 0004+00 0/1 0/0 0/0 .rodata @5169 */ @@ -2128,7 +2149,7 @@ SECTION_RODATA static u8 const lit_5169[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(809F8658, &lit_5169); +COMPILER_STRIP_GATE(0x809F8658, &lit_5169); #pragma pop /* 809F865C-809F8668 000168 000C+00 0/1 0/0 0/0 .rodata @5170 */ @@ -2137,7 +2158,7 @@ COMPILER_STRIP_GATE(809F8658, &lit_5169); SECTION_RODATA static u8 const lit_5170[12] = { 0x00, 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809F865C, &lit_5170); +COMPILER_STRIP_GATE(0x809F865C, &lit_5170); #pragma pop /* 809F8668-809F866C 000174 0004+00 0/1 0/0 0/0 .rodata @5171 */ @@ -2149,7 +2170,7 @@ SECTION_RODATA static u8 const lit_5171[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(809F8668, &lit_5171); +COMPILER_STRIP_GATE(0x809F8668, &lit_5171); #pragma pop /* 809F866C-809F8678 000178 000C+00 0/1 0/0 0/0 .rodata @5172 */ @@ -2158,7 +2179,7 @@ COMPILER_STRIP_GATE(809F8668, &lit_5171); SECTION_RODATA static u8 const lit_5172[12] = { 0x00, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809F866C, &lit_5172); +COMPILER_STRIP_GATE(0x809F866C, &lit_5172); #pragma pop /* 809F8678-809F867C 000184 0004+00 0/1 0/0 0/0 .rodata @5173 */ @@ -2170,7 +2191,7 @@ SECTION_RODATA static u8 const lit_5173[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(809F8678, &lit_5173); +COMPILER_STRIP_GATE(0x809F8678, &lit_5173); #pragma pop /* 809F867C-809F8688 000188 000C+00 0/1 0/0 0/0 .rodata @5174 */ @@ -2179,7 +2200,7 @@ COMPILER_STRIP_GATE(809F8678, &lit_5173); SECTION_RODATA static u8 const lit_5174[12] = { 0x00, 0x0B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809F867C, &lit_5174); +COMPILER_STRIP_GATE(0x809F867C, &lit_5174); #pragma pop /* 809F8688-809F868C 000194 0004+00 0/1 0/0 0/0 .rodata @5175 */ @@ -2191,7 +2212,7 @@ SECTION_RODATA static u8 const lit_5175[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(809F8688, &lit_5175); +COMPILER_STRIP_GATE(0x809F8688, &lit_5175); #pragma pop /* 809F868C-809F86B0 000198 0024+00 0/0 0/0 0/0 .rodata @5176 */ @@ -2202,14 +2223,14 @@ SECTION_RODATA static u8 const lit_5176[36] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809F868C, &lit_5176); +COMPILER_STRIP_GATE(0x809F868C, &lit_5176); #pragma pop /* 809F86B0-809F86B4 0001BC 0004+00 0/1 0/0 0/0 .rodata @5231 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5231 = 2.0f; -COMPILER_STRIP_GATE(809F86B0, &lit_5231); +COMPILER_STRIP_GATE(0x809F86B0, &lit_5231); #pragma pop /* 809F520C-809F55D0 00224C 03C4+00 1/1 0/0 0/0 .text playMotion__13daNpc_GWolf_cFv */ @@ -2227,7 +2248,7 @@ asm void daNpc_GWolf_c::playMotion() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpc_GWolf_c::chkAction(int (daNpc_GWolf_c::*)(void*)) { +asm void daNpc_GWolf_c::chkAction(int (daNpc_GWolf_c::*param_0)(void*)) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_gwolf/d_a_npc_gwolf/chkAction__13daNpc_GWolf_cFM13daNpc_GWolf_cFPCvPvPv_i.s" } @@ -2238,7 +2259,7 @@ asm void daNpc_GWolf_c::chkAction(int (daNpc_GWolf_c::*)(void*)) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpc_GWolf_c::setAction(int (daNpc_GWolf_c::*)(void*)) { +asm void daNpc_GWolf_c::setAction(int (daNpc_GWolf_c::*param_0)(void*)) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_gwolf/d_a_npc_gwolf/setAction__13daNpc_GWolf_cFM13daNpc_GWolf_cFPCvPvPv_i.s" } @@ -2292,28 +2313,28 @@ asm void daNpc_GWolf_c::setLookMode(int param_0) { SECTION_RODATA static u8 const lit_5374[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(809F86B4, &lit_5374); +COMPILER_STRIP_GATE(0x809F86B4, &lit_5374); #pragma pop /* 809F86C0-809F86C4 0001CC 0004+00 0/1 0/0 0/0 .rodata @5427 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5427 = -80.0f; -COMPILER_STRIP_GATE(809F86C0, &lit_5427); +COMPILER_STRIP_GATE(0x809F86C0, &lit_5427); #pragma pop /* 809F86C4-809F86C8 0001D0 0004+00 0/1 0/0 0/0 .rodata @5428 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5428 = 80.0f; -COMPILER_STRIP_GATE(809F86C4, &lit_5428); +COMPILER_STRIP_GATE(0x809F86C4, &lit_5428); #pragma pop /* 809F86C8-809F86CC 0001D4 0004+00 0/1 0/0 0/0 .rodata @5429 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5429 = 40.0f; -COMPILER_STRIP_GATE(809F86C8, &lit_5429); +COMPILER_STRIP_GATE(0x809F86C8, &lit_5429); #pragma pop /* 809F5B84-809F5E0C 002BC4 0288+00 1/1 0/0 0/0 .text lookat__13daNpc_GWolf_cFv */ @@ -2331,7 +2352,13 @@ asm void daNpc_GWolf_c::lookat() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5637 = 400.0f; -COMPILER_STRIP_GATE(809F86CC, &lit_5637); +COMPILER_STRIP_GATE(0x809F86CC, &lit_5637); +#pragma pop + +/* 809F871C-809F871C 000228 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_809F87EF = "prm"; #pragma pop /* 809F5E0C-809F6548 002E4C 073C+00 3/0 0/0 0/0 .text ECut_attackWarp__13daNpc_GWolf_cFi @@ -2360,77 +2387,77 @@ asm void daNpc_GWolf_c::ECut_attackWarpHorse(int param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5638 = 0.5f; -COMPILER_STRIP_GATE(809F86D0, &lit_5638); +COMPILER_STRIP_GATE(0x809F86D0, &lit_5638); #pragma pop /* 809F86D4-809F86D8 0001E0 0004+00 0/1 0/0 0/0 .rodata @5639 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5639 = 3.0f; -COMPILER_STRIP_GATE(809F86D4, &lit_5639); +COMPILER_STRIP_GATE(0x809F86D4, &lit_5639); #pragma pop /* 809F86D8-809F86DC 0001E4 0004+00 0/0 0/0 0/0 .rodata @5640 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5640 = 5.0f; -COMPILER_STRIP_GATE(809F86D8, &lit_5640); +COMPILER_STRIP_GATE(0x809F86D8, &lit_5640); #pragma pop /* 809F86DC-809F86E0 0001E8 0004+00 0/0 0/0 0/0 .rodata @5814 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5814 = 9.0f / 10.0f; -COMPILER_STRIP_GATE(809F86DC, &lit_5814); +COMPILER_STRIP_GATE(0x809F86DC, &lit_5814); #pragma pop /* 809F86E0-809F86E4 0001EC 0004+00 0/0 0/0 0/0 .rodata @5815 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5815 = 99.0f / 100.0f; -COMPILER_STRIP_GATE(809F86E0, &lit_5815); +COMPILER_STRIP_GATE(0x809F86E0, &lit_5815); #pragma pop /* 809F86E4-809F86E8 0001F0 0004+00 0/1 0/0 0/0 .rodata @5913 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5913 = 12.0f; -COMPILER_STRIP_GATE(809F86E4, &lit_5913); +COMPILER_STRIP_GATE(0x809F86E4, &lit_5913); #pragma pop /* 809F86E8-809F86EC 0001F4 0004+00 0/1 0/0 0/0 .rodata @5914 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5914 = 22.0f; -COMPILER_STRIP_GATE(809F86E8, &lit_5914); +COMPILER_STRIP_GATE(0x809F86E8, &lit_5914); #pragma pop /* 809F86EC-809F86F0 0001F8 0004+00 0/1 0/0 0/0 .rodata @5915 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5915 = -2.0f; -COMPILER_STRIP_GATE(809F86EC, &lit_5915); +COMPILER_STRIP_GATE(0x809F86EC, &lit_5915); #pragma pop /* 809F86F0-809F86F4 0001FC 0004+00 0/1 0/0 0/0 .rodata @5916 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5916 = 25.0f; -COMPILER_STRIP_GATE(809F86F0, &lit_5916); +COMPILER_STRIP_GATE(0x809F86F0, &lit_5916); #pragma pop /* 809F86F4-809F86F8 000200 0004+00 0/1 0/0 0/0 .rodata @5917 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5917 = 28.0f; -COMPILER_STRIP_GATE(809F86F4, &lit_5917); +COMPILER_STRIP_GATE(0x809F86F4, &lit_5917); #pragma pop /* 809F86F8-809F86FC 000204 0004+00 0/1 0/0 0/0 .rodata @5918 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5918 = 4.0f; -COMPILER_STRIP_GATE(809F86F8, &lit_5918); +COMPILER_STRIP_GATE(0x809F86F8, &lit_5918); #pragma pop /* 809F6BFC-809F7084 003C3C 0488+00 1/0 0/0 0/0 .text ECut_howlingSessionA__13daNpc_GWolf_cFi */ @@ -2479,14 +2506,14 @@ asm void daNpc_GWolf_c::ECut_meetGWolf(int param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6060 = 100.0f; -COMPILER_STRIP_GATE(809F86FC, &lit_6060); +COMPILER_STRIP_GATE(0x809F86FC, &lit_6060); #pragma pop /* 809F8700-809F8704 00020C 0004+00 0/1 0/0 0/0 .rodata @6061 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6061 = 200.0f; -COMPILER_STRIP_GATE(809F8700, &lit_6061); +COMPILER_STRIP_GATE(0x809F8700, &lit_6061); #pragma pop /* 809F71E0-809F75C0 004220 03E0+00 1/0 0/0 0/0 .text wait__13daNpc_GWolf_cFPv */ @@ -2506,7 +2533,7 @@ asm void daNpc_GWolf_c::wait(void* param_0) { SECTION_RODATA static u8 const lit_6071[12] = { 0x00, 0x09, 0x00, 0x0A, 0x00, 0x0B, 0x00, 0x0C, 0x00, 0x0D, 0x00, 0x0E, }; -COMPILER_STRIP_GATE(809F8704, &lit_6071); +COMPILER_STRIP_GATE(0x809F8704, &lit_6071); #pragma pop /* 809F8710-809F871C 00021C 000C+00 0/1 0/0 0/0 .rodata @6078 */ @@ -2515,7 +2542,7 @@ COMPILER_STRIP_GATE(809F8704, &lit_6071); SECTION_RODATA static u8 const lit_6078[12] = { 0x00, 0x03, 0x00, 0x04, 0x00, 0x05, 0x00, 0x06, 0x00, 0x07, 0x00, 0x08, }; -COMPILER_STRIP_GATE(809F8710, &lit_6078); +COMPILER_STRIP_GATE(0x809F8710, &lit_6078); #pragma pop /* 809F75C0-809F775C 004600 019C+00 1/0 0/0 0/0 .text waitHowling__13daNpc_GWolf_cFPv */ @@ -2778,7 +2805,7 @@ asm cCcD_GStts::~cCcD_GStts() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_809F8398(int* param_0) { +extern "C" asm void func_809F8398(void* _this, int* param_0) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_gwolf/d_a_npc_gwolf/func_809F8398.s" } @@ -2804,7 +2831,7 @@ asm void __sinit_d_a_npc_gwolf_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_809F83B4 = (void*)__sinit_d_a_npc_gwolf_cpp; +REGISTER_CTORS(0x809F83B4, __sinit_d_a_npc_gwolf_cpp); #pragma pop /* 809F8488-809F84D0 0054C8 0048+00 2/1 0/0 0/0 .text __dt__19daNpc_GWolf_Param_cFv */ @@ -3009,25 +3036,4 @@ static u8 data_809F8F90[4]; static u8 data_809F8F94[4]; #pragma pop -/* 809F871C-809F87F3 000228 00D7+00 8/4 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_809F871C = "ATTACK_WARP"; -SECTION_DEAD static char const* const stringBase_809F8728 = "ATTACK_WARP_HORSE"; -SECTION_DEAD static char const* const stringBase_809F873A = "HOWLING_SESSIONA"; -SECTION_DEAD static char const* const stringBase_809F874B = "HOWLING_SESSIONB"; -SECTION_DEAD static char const* const stringBase_809F875C = "HOWLING_SESSIONC"; -SECTION_DEAD static char const* const stringBase_809F876D = "HOWLING_SESSIOND"; -SECTION_DEAD static char const* const stringBase_809F877E = "HOWLING_SESSIONE"; -SECTION_DEAD static char const* const stringBase_809F878F = "HOWLING_SESSIONF"; -SECTION_DEAD static char const* const stringBase_809F87A0 = "MEET_GWOLFA"; -SECTION_DEAD static char const* const stringBase_809F87AC = "MEET_GWOLFB"; -SECTION_DEAD static char const* const stringBase_809F87B8 = "MEET_GWOLFC"; -SECTION_DEAD static char const* const stringBase_809F87C4 = "MEET_GWOLFD"; -SECTION_DEAD static char const* const stringBase_809F87D0 = "MEET_GWOLFE"; -SECTION_DEAD static char const* const stringBase_809F87DC = "MEET_GWOLFF"; -SECTION_DEAD static char const* const stringBase_809F87E8 = "GWolf"; -SECTION_DEAD static char const* const stringBase_809F87EE = ""; -SECTION_DEAD static char const* const stringBase_809F87EF = "prm"; -#pragma pop +/* 809F871C-809F871C 000228 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/npc/d_a_npc_hanjo/d_a_npc_hanjo.cpp b/rel/d/a/npc/d_a_npc_hanjo/d_a_npc_hanjo.cpp index 6e51d5d0759..7676929f50b 100644 --- a/rel/d/a/npc/d_a_npc_hanjo/d_a_npc_hanjo.cpp +++ b/rel/d/a/npc/d_a_npc_hanjo/d_a_npc_hanjo.cpp @@ -34,20 +34,20 @@ struct mDoMtx_stack_c { static u8 now[48]; }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; +struct J3DAnmTransform {}; + +struct J3DModelData {}; + struct Z2Creature { /* 802C03C8 */ Z2Creature(); /* 802C0420 */ ~Z2Creature(); /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -65,6 +65,8 @@ struct daTag_EvtArea_c { /* 8048C94C */ void chkPointInArea(cXyz, cXyz); }; +struct daNpcT_faceMotionAnmData_c {}; + struct daNpcT_MotionSeqMngr_c { struct sequenceStepData_c {}; @@ -73,14 +75,12 @@ struct daNpcT_MotionSeqMngr_c { /* 809FF8BC */ ~daNpcT_MotionSeqMngr_c(); }; +struct daNpcT_evtData_c {}; + struct daNpcT_motionAnmData_c {}; struct J3DJoint {}; -struct daNpcT_faceMotionAnmData_c {}; - -struct daNpcT_evtData_c {}; - struct daNpc_Hanjo_c { /* 809F908C */ ~daNpc_Hanjo_c(); /* 809F9278 */ void create(); @@ -168,10 +168,10 @@ struct dCcD_GObjInf { /* 800846F0 */ void GetCoHitObj(); }; -struct J3DModel {}; - struct _GXColorS10 {}; +struct J3DModel {}; + struct daNpcT_c { /* 80147FA4 */ void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*); /* 80148094 */ void getTrnsfrmKeyAnmP(char const*, int); @@ -591,8 +591,8 @@ extern "C" void changeAnm__8daNpcT_cFPiPi(); extern "C" void changeBck__8daNpcT_cFPiPi(); extern "C" void changeBtp__8daNpcT_cFPiPi(); extern "C" void changeBtk__8daNpcT_cFPiPi(); -extern "C" void func_809FFE6C(int*); -extern "C" void func_809FFE88(f32, f32); +extern "C" void func_809FFE6C(void* _this, int*); +extern "C" void func_809FFE88(void* _this, f32, f32); extern "C" void __sinit_d_a_npc_hanjo_cpp(); extern "C" void __dt__18daNpc_HanjoStone_cFv(); extern "C" void @@ -847,6 +847,29 @@ extern "C" void __register_global_object(); // /* ############################################################################################## */ +/* 80A007F8-80A007F8 0001F8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80A007F8 = ""; +SECTION_DEAD static char const* const stringBase_80A007F9 = "NO_RESPONSE"; +SECTION_DEAD static char const* const stringBase_80A00805 = "CONVERSATION_ABOUT_SARU01"; +SECTION_DEAD static char const* const stringBase_80A0081F = "CONVERSATION_ABOUT_SARU02"; +SECTION_DEAD static char const* const stringBase_80A00839 = "CONVERSATION_ABOUT_HONEYCOMB1"; +SECTION_DEAD static char const* const stringBase_80A00857 = "CONVERSATION_ABOUT_HONEYCOMB2"; +SECTION_DEAD static char const* const stringBase_80A00875 = "CONVERSATION_ABOUT_HONEYCOMB3"; +SECTION_DEAD static char const* const stringBase_80A00893 = "CONVERSATION_ABOUT_HONEYCOMB4"; +SECTION_DEAD static char const* const stringBase_80A008B1 = "PURSUIT_BEE"; +SECTION_DEAD static char const* const stringBase_80A008BD = "APPEAR_HAWKER"; +SECTION_DEAD static char const* const stringBase_80A008CB = "DIVE"; +SECTION_DEAD static char const* const stringBase_80A008D0 = "Hanjo"; +SECTION_DEAD static char const* const stringBase_80A008D6 = "Hanjo1"; +SECTION_DEAD static char const* const stringBase_80A008DD = "Hanjo2"; +SECTION_DEAD static char const* const stringBase_80A008E4 = "J_Tobi"; +SECTION_DEAD static char const* const stringBase_80A008EB = "Sera"; +SECTION_DEAD static char const* const stringBase_80A008F0 = "CONVERSATION_ABOUT_SARU"; +SECTION_DEAD static char const* const stringBase_80A00908 = "CONVERSATION"; +#pragma pop + /* 80A00940-80A0094C 000000 000C+00 3/3 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -1406,7 +1429,7 @@ SECTION_RODATA u8 const daNpc_Hanjo_Param_c::m[180] = { 0x00, 0x00, 0x42, 0xA0, 0x00, 0x00, 0x42, 0x82, 0x00, 0x00, 0x40, 0x80, 0x00, 0x00, 0x44, 0x16, 0x00, 0x00, 0x43, 0x08, 0x00, 0x00, 0x05, 0x00, 0x00, 0x5A, 0x00, 0x5A, 0x00, 0x02, }; -COMPILER_STRIP_GATE(80A00600, &daNpc_Hanjo_Param_c::m); +COMPILER_STRIP_GATE(0x80A00600, &daNpc_Hanjo_Param_c::m); /* 80A006B4-80A006E4 0000B4 0030+00 1/1 0/0 0/0 .rodata mStoneCcDObjInfo__13daNpc_Hanjo_c */ @@ -1415,7 +1438,7 @@ SECTION_RODATA u8 const daNpc_Hanjo_c::mStoneCcDObjInfo[48] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x79, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A006B4, &daNpc_Hanjo_c::mStoneCcDObjInfo); +COMPILER_STRIP_GATE(0x80A006B4, &daNpc_Hanjo_c::mStoneCcDObjInfo); /* 80A006E4-80A006F8 0000E4 0014+00 0/1 0/0 0/0 .rodata heapSize$4058 */ #pragma push @@ -1424,14 +1447,14 @@ SECTION_RODATA static u8 const heapSize[20] = { 0x00, 0x00, 0x61, 0xB0, 0x00, 0x00, 0x41, 0xD0, 0x00, 0x00, 0x39, 0xD0, 0x00, 0x00, 0x39, 0xC0, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A006E4, &heapSize); +COMPILER_STRIP_GATE(0x80A006E4, &heapSize); #pragma pop /* 80A006F8-80A006FC 0000F8 0004+00 0/1 0/0 0/0 .rodata @4140 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4140 = 60.0f; -COMPILER_STRIP_GATE(80A006F8, &lit_4140); +COMPILER_STRIP_GATE(0x80A006F8, &lit_4140); #pragma pop /* 80A006FC-80A00700 0000FC 0004+00 10/26 0/0 0/0 .rodata @4141 */ @@ -1441,13 +1464,13 @@ SECTION_RODATA static u8 const lit_4141[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A006FC, &lit_4141); +COMPILER_STRIP_GATE(0x80A006FC, &lit_4141); /* 80A00700-80A00704 000100 0004+00 0/1 0/0 0/0 .rodata @4142 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4142 = -1000000000.0f; -COMPILER_STRIP_GATE(80A00700, &lit_4142); +COMPILER_STRIP_GATE(0x80A00700, &lit_4142); #pragma pop /* 809F9278-809F9578 0002D8 0300+00 1/1 0/0 0/0 .text create__13daNpc_Hanjo_cFv */ @@ -1463,20 +1486,20 @@ asm void daNpc_Hanjo_c::create() { /* ############################################################################################## */ /* 80A00704-80A00708 000104 0004+00 3/5 0/0 0/0 .rodata @4212 */ SECTION_RODATA static f32 const lit_4212 = -3.0f; -COMPILER_STRIP_GATE(80A00704, &lit_4212); +COMPILER_STRIP_GATE(0x80A00704, &lit_4212); /* 80A00708-80A0070C 000108 0004+00 0/2 0/0 0/0 .rodata @4384 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4384 = 65536.0f; -COMPILER_STRIP_GATE(80A00708, &lit_4384); +COMPILER_STRIP_GATE(0x80A00708, &lit_4384); #pragma pop /* 80A0070C-80A00710 00010C 0004+00 0/3 0/0 0/0 .rodata @4385 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4385 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(80A0070C, &lit_4385); +COMPILER_STRIP_GATE(0x80A0070C, &lit_4385); #pragma pop /* 80A00710-80A00718 000110 0008+00 0/1 0/0 0/0 .rodata bmdTypeList$4495 */ @@ -1485,12 +1508,12 @@ COMPILER_STRIP_GATE(80A0070C, &lit_4385); SECTION_RODATA static u8 const bmdTypeList[8] = { 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x03, }; -COMPILER_STRIP_GATE(80A00710, &bmdTypeList); +COMPILER_STRIP_GATE(0x80A00710, &bmdTypeList); #pragma pop /* 80A00718-80A0071C 000118 0004+00 1/9 0/0 0/0 .rodata @4593 */ SECTION_RODATA static f32 const lit_4593 = 1.0f; -COMPILER_STRIP_GATE(80A00718, &lit_4593); +COMPILER_STRIP_GATE(0x80A00718, &lit_4593); /* 809F9578-809F997C 0005D8 0404+00 1/1 0/0 0/0 .text CreateHeap__13daNpc_Hanjo_cFv */ #pragma push @@ -1625,7 +1648,7 @@ asm void daNpc_Hanjo_c::Execute() { /* ############################################################################################## */ /* 80A0071C-80A00720 00011C 0004+00 1/1 0/0 0/0 .rodata @4642 */ SECTION_RODATA static f32 const lit_4642 = 100.0f; -COMPILER_STRIP_GATE(80A0071C, &lit_4642); +COMPILER_STRIP_GATE(0x80A0071C, &lit_4642); /* 809F9B8C-809F9C20 000BEC 0094+00 1/1 0/0 0/0 .text Draw__13daNpc_Hanjo_cFv */ #pragma push @@ -1723,7 +1746,7 @@ asm void daNpc_Hanjo_c::checkChangeEvt() { /* ############################################################################################## */ /* 80A00720-80A00724 000120 0004+00 5/13 0/0 0/0 .rodata @4869 */ SECTION_RODATA static f32 const lit_4869 = -1.0f; -COMPILER_STRIP_GATE(80A00720, &lit_4869); +COMPILER_STRIP_GATE(0x80A00720, &lit_4869); /* 809FA3B8-809FA45C 001418 00A4+00 1/0 0/0 0/0 .text setAfterTalkMotion__13daNpc_Hanjo_cFv */ #pragma push @@ -1800,70 +1823,70 @@ asm void daNpc_Hanjo_c::afterMoved() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5228 = -10.0f; -COMPILER_STRIP_GATE(80A00724, &lit_5228); +COMPILER_STRIP_GATE(0x80A00724, &lit_5228); #pragma pop /* 80A00728-80A0072C 000128 0004+00 0/1 0/0 0/0 .rodata @5229 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5229 = 10.0f; -COMPILER_STRIP_GATE(80A00728, &lit_5229); +COMPILER_STRIP_GATE(0x80A00728, &lit_5229); #pragma pop /* 80A0072C-80A00730 00012C 0004+00 0/1 0/0 0/0 .rodata @5230 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_5230 = 0x38C90FDB; -COMPILER_STRIP_GATE(80A0072C, &lit_5230); +COMPILER_STRIP_GATE(0x80A0072C, &lit_5230); #pragma pop /* 80A00730-80A00734 000130 0004+00 0/1 0/0 0/0 .rodata @5231 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5231 = 20.0f; -COMPILER_STRIP_GATE(80A00730, &lit_5231); +COMPILER_STRIP_GATE(0x80A00730, &lit_5231); #pragma pop /* 80A00734-80A00738 000134 0004+00 0/1 0/0 0/0 .rodata @5232 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5232 = 170.0f; -COMPILER_STRIP_GATE(80A00734, &lit_5232); +COMPILER_STRIP_GATE(0x80A00734, &lit_5232); #pragma pop /* 80A00738-80A0073C 000138 0004+00 0/2 0/0 0/0 .rodata @5233 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5233 = -20.0f; -COMPILER_STRIP_GATE(80A00738, &lit_5233); +COMPILER_STRIP_GATE(0x80A00738, &lit_5233); #pragma pop /* 80A0073C-80A00740 00013C 0004+00 0/2 0/0 0/0 .rodata @5234 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5234 = 3.0f; -COMPILER_STRIP_GATE(80A0073C, &lit_5234); +COMPILER_STRIP_GATE(0x80A0073C, &lit_5234); #pragma pop /* 80A00740-80A00744 000140 0004+00 0/1 0/0 0/0 .rodata @5235 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5235 = 17.0f; -COMPILER_STRIP_GATE(80A00740, &lit_5235); +COMPILER_STRIP_GATE(0x80A00740, &lit_5235); #pragma pop /* 80A00744-80A00748 000144 0004+00 0/2 0/0 0/0 .rodata @5236 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5236 = 2.0f; -COMPILER_STRIP_GATE(80A00744, &lit_5236); +COMPILER_STRIP_GATE(0x80A00744, &lit_5236); #pragma pop /* 80A00748-80A00750 000148 0008+00 1/5 0/0 0/0 .rodata @5238 */ SECTION_RODATA static u8 const lit_5238[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A00748, &lit_5238); +COMPILER_STRIP_GATE(0x80A00748, &lit_5238); /* 80A01288-80A0128C 000008 0001+03 1/1 0/0 0/0 .bss @1109 */ static u8 lit_1109[1 + 3 /* padding */]; @@ -1993,7 +2016,7 @@ asm void daNpc_Hanjo_c::setAttnPos() { SECTION_RODATA static u8 const lit_5296[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A00750, &lit_5296); +COMPILER_STRIP_GATE(0x80A00750, &lit_5296); #pragma pop /* 80A00758-80A00760 000158 0008+00 0/1 0/0 0/0 .rodata @5297 */ @@ -2002,7 +2025,7 @@ COMPILER_STRIP_GATE(80A00750, &lit_5296); SECTION_RODATA static u8 const lit_5297[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A00758, &lit_5297); +COMPILER_STRIP_GATE(0x80A00758, &lit_5297); #pragma pop /* 80A00760-80A00768 000160 0008+00 0/1 0/0 0/0 .rodata @5298 */ @@ -2011,42 +2034,42 @@ COMPILER_STRIP_GATE(80A00758, &lit_5297); SECTION_RODATA static u8 const lit_5298[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A00760, &lit_5298); +COMPILER_STRIP_GATE(0x80A00760, &lit_5298); #pragma pop /* 80A00768-80A0076C 000168 0004+00 0/1 0/0 0/0 .rodata @5386 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5386 = 320.0f; -COMPILER_STRIP_GATE(80A00768, &lit_5386); +COMPILER_STRIP_GATE(0x80A00768, &lit_5386); #pragma pop /* 80A0076C-80A00770 00016C 0004+00 0/1 0/0 0/0 .rodata @5387 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5387 = -140.0f; -COMPILER_STRIP_GATE(80A0076C, &lit_5387); +COMPILER_STRIP_GATE(0x80A0076C, &lit_5387); #pragma pop /* 80A00770-80A00774 000170 0004+00 0/2 0/0 0/0 .rodata @5388 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5388 = 40.0f; -COMPILER_STRIP_GATE(80A00770, &lit_5388); +COMPILER_STRIP_GATE(0x80A00770, &lit_5388); #pragma pop /* 80A00774-80A00778 000174 0004+00 0/1 0/0 0/0 .rodata @5389 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5389 = -240.0f; -COMPILER_STRIP_GATE(80A00774, &lit_5389); +COMPILER_STRIP_GATE(0x80A00774, &lit_5389); #pragma pop /* 80A00778-80A0077C 000178 0004+00 0/1 0/0 0/0 .rodata @5390 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5390 = -200.0f; -COMPILER_STRIP_GATE(80A00778, &lit_5390); +COMPILER_STRIP_GATE(0x80A00778, &lit_5390); #pragma pop /* 809FAF90-809FB2C4 001FF0 0334+00 1/0 0/0 0/0 .text setCollision__13daNpc_Hanjo_cFv */ @@ -2069,28 +2092,28 @@ bool daNpc_Hanjo_c::drawDbgInfo() { #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_5503 = 0x3C1374BC; -COMPILER_STRIP_GATE(80A0077C, &lit_5503); +COMPILER_STRIP_GATE(0x80A0077C, &lit_5503); #pragma pop /* 80A00780-80A00784 000180 0004+00 0/1 0/0 0/0 .rodata @5504 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5504 = -9.0f / 50.0f; -COMPILER_STRIP_GATE(80A00780, &lit_5504); +COMPILER_STRIP_GATE(0x80A00780, &lit_5504); #pragma pop /* 80A00784-80A00788 000184 0004+00 0/1 0/0 0/0 .rodata @5505 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_5505 = 0xBE147AE1; -COMPILER_STRIP_GATE(80A00784, &lit_5505); +COMPILER_STRIP_GATE(0x80A00784, &lit_5505); #pragma pop /* 80A00788-80A0078C 000188 0004+00 0/2 0/0 0/0 .rodata @5506 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5506 = 3.0f / 20.0f; -COMPILER_STRIP_GATE(80A00788, &lit_5506); +COMPILER_STRIP_GATE(0x80A00788, &lit_5506); #pragma pop /* 809FB2CC-809FB59C 00232C 02D0+00 1/0 0/0 0/0 .text drawOtherMdl__13daNpc_Hanjo_cFv */ @@ -2118,7 +2141,7 @@ asm void daNpc_Hanjo_c::selectAction() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpc_Hanjo_c::chkAction(int (daNpc_Hanjo_c::*)(void*)) { +asm void daNpc_Hanjo_c::chkAction(int (daNpc_Hanjo_c::*param_0)(void*)) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_hanjo/d_a_npc_hanjo/chkAction__13daNpc_Hanjo_cFM13daNpc_Hanjo_cFPCvPvPv_i.s" } @@ -2129,7 +2152,7 @@ asm void daNpc_Hanjo_c::chkAction(int (daNpc_Hanjo_c::*)(void*)) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpc_Hanjo_c::setAction(int (daNpc_Hanjo_c::*)(void*)) { +asm void daNpc_Hanjo_c::setAction(int (daNpc_Hanjo_c::*param_0)(void*)) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_hanjo/d_a_npc_hanjo/setAction__13daNpc_Hanjo_cFM13daNpc_Hanjo_cFPCvPvPv_i.s" } @@ -2150,42 +2173,42 @@ asm void daNpc_Hanjo_c::initShoot(int param_0) { #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_5666 = 0x43360B61; -COMPILER_STRIP_GATE(80A0078C, &lit_5666); +COMPILER_STRIP_GATE(0x80A0078C, &lit_5666); #pragma pop /* 80A00790-80A00794 000190 0004+00 0/1 0/0 0/0 .rodata @5667 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5667 = 36.0f; -COMPILER_STRIP_GATE(80A00790, &lit_5667); +COMPILER_STRIP_GATE(0x80A00790, &lit_5667); #pragma pop /* 80A00794-80A00798 000194 0004+00 0/1 0/0 0/0 .rodata @5668 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5668 = 21.0f; -COMPILER_STRIP_GATE(80A00794, &lit_5668); +COMPILER_STRIP_GATE(0x80A00794, &lit_5668); #pragma pop /* 80A00798-80A0079C 000198 0004+00 0/1 0/0 0/0 .rodata @5669 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5669 = 110.0f; -COMPILER_STRIP_GATE(80A00798, &lit_5669); +COMPILER_STRIP_GATE(0x80A00798, &lit_5669); #pragma pop /* 80A0079C-80A007A0 00019C 0004+00 0/2 0/0 0/0 .rodata @5670 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5670 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(80A0079C, &lit_5670); +COMPILER_STRIP_GATE(0x80A0079C, &lit_5670); #pragma pop /* 80A007A0-80A007A4 0001A0 0004+00 0/5 0/0 0/0 .rodata @5671 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5671 = 0.5f; -COMPILER_STRIP_GATE(80A007A0, &lit_5671); +COMPILER_STRIP_GATE(0x80A007A0, &lit_5671); #pragma pop /* 809FB90C-809FBB94 00296C 0288+00 2/2 0/0 0/0 .text shoot__13daNpc_Hanjo_cFi */ @@ -2213,28 +2236,28 @@ asm void daNpc_Hanjo_c::initDive() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5802 = 5.5f; -COMPILER_STRIP_GATE(80A007A4, &lit_5802); +COMPILER_STRIP_GATE(0x80A007A4, &lit_5802); #pragma pop /* 80A007A8-80A007AC 0001A8 0004+00 0/1 0/0 0/0 .rodata @5803 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5803 = 3.0f / 10.0f; -COMPILER_STRIP_GATE(80A007A8, &lit_5803); +COMPILER_STRIP_GATE(0x80A007A8, &lit_5803); #pragma pop /* 80A007AC-80A007B0 0001AC 0004+00 0/1 0/0 0/0 .rodata @5804 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5804 = 260.0f; -COMPILER_STRIP_GATE(80A007AC, &lit_5804); +COMPILER_STRIP_GATE(0x80A007AC, &lit_5804); #pragma pop /* 80A007B0-80A007B4 0001B0 0004+00 0/1 0/0 0/0 .rodata @5805 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5805 = 18.0f; -COMPILER_STRIP_GATE(80A007B0, &lit_5805); +COMPILER_STRIP_GATE(0x80A007B0, &lit_5805); #pragma pop /* 809FBC3C-809FC06C 002C9C 0430+00 1/1 0/0 0/0 .text dive__13daNpc_Hanjo_cFv */ @@ -2260,7 +2283,7 @@ asm void daNpc_Hanjo_c::lookround(s16 param_0) { /* ############################################################################################## */ /* 80A007B4-80A007B8 0001B4 0004+00 1/2 0/0 0/0 .rodata @5887 */ SECTION_RODATA static f32 const lit_5887 = 50.0f; -COMPILER_STRIP_GATE(80A007B4, &lit_5887); +COMPILER_STRIP_GATE(0x80A007B4, &lit_5887); /* 809FC1BC-809FC2E4 00321C 0128+00 1/1 0/0 0/0 .text commandToHawk__13daNpc_Hanjo_cFv */ #pragma push @@ -2272,6 +2295,13 @@ asm void daNpc_Hanjo_c::commandToHawk() { } #pragma pop +/* ############################################################################################## */ +/* 80A007F8-80A007F8 0001F8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80A00915 = "prm"; +#pragma pop + /* 809FC2E4-809FC438 003344 0154+00 1/0 0/0 0/0 .text cutConversationAboutSaru__13daNpc_Hanjo_cFi */ #pragma push @@ -2290,7 +2320,15 @@ asm void daNpc_Hanjo_c::cutConversationAboutSaru(int param_0) { SECTION_RODATA static u8 const lit_5944[8] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, }; -COMPILER_STRIP_GATE(80A007B8, &lit_5944); +COMPILER_STRIP_GATE(0x80A007B8, &lit_5944); +#pragma pop + +/* 80A007F8-80A007F8 0001F8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80A00919 = "prm0"; +SECTION_DEAD static char const* const stringBase_80A0091E = "prm1"; +SECTION_DEAD static char const* const stringBase_80A00923 = "msgNo"; #pragma pop /* 809FC438-809FC80C 003498 03D4+00 1/0 0/0 0/0 .text cutConversation__13daNpc_Hanjo_cFi @@ -2309,21 +2347,21 @@ asm void daNpc_Hanjo_c::cutConversation(int param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6200 = 1074.0f; -COMPILER_STRIP_GATE(80A007C0, &lit_6200); +COMPILER_STRIP_GATE(0x80A007C0, &lit_6200); #pragma pop /* 80A007C4-80A007C8 0001C4 0004+00 0/1 0/0 0/0 .rodata @6201 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6201 = -100.0f; -COMPILER_STRIP_GATE(80A007C4, &lit_6201); +COMPILER_STRIP_GATE(0x80A007C4, &lit_6201); #pragma pop /* 80A007C8-80A007CC 0001C8 0004+00 0/1 0/0 0/0 .rodata @6202 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6202 = -443.0f; -COMPILER_STRIP_GATE(80A007C8, &lit_6202); +COMPILER_STRIP_GATE(0x80A007C8, &lit_6202); #pragma pop /* 809FC80C-809FCDC4 00386C 05B8+00 1/0 0/0 0/0 .text cutPursuitBee__13daNpc_Hanjo_cFi */ @@ -2341,7 +2379,14 @@ asm void daNpc_Hanjo_c::cutPursuitBee(int param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6354 = 8.0f; -COMPILER_STRIP_GATE(80A007CC, &lit_6354); +COMPILER_STRIP_GATE(0x80A007CC, &lit_6354); +#pragma pop + +/* 80A007F8-80A007F8 0001F8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80A00929 = "timer"; +SECTION_DEAD static char const* const stringBase_80A0092F = "@"; #pragma pop /* 809FCDC4-809FD3C0 003E24 05FC+00 1/0 0/0 0/0 .text cutAppearHawker__13daNpc_Hanjo_cFi @@ -2360,28 +2405,28 @@ asm void daNpc_Hanjo_c::cutAppearHawker(int param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6468 = 1400.0f; -COMPILER_STRIP_GATE(80A007D0, &lit_6468); +COMPILER_STRIP_GATE(0x80A007D0, &lit_6468); #pragma pop /* 80A007D4-80A007D8 0001D4 0004+00 0/1 0/0 0/0 .rodata @6469 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6469 = 600.0f; -COMPILER_STRIP_GATE(80A007D4, &lit_6469); +COMPILER_STRIP_GATE(0x80A007D4, &lit_6469); #pragma pop /* 80A007D8-80A007DC 0001D8 0004+00 0/1 0/0 0/0 .rodata @6470 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6470 = 180.0f; -COMPILER_STRIP_GATE(80A007D8, &lit_6470); +COMPILER_STRIP_GATE(0x80A007D8, &lit_6470); #pragma pop /* 80A007DC-80A007E0 0001DC 0004+00 0/1 0/0 0/0 .rodata @6471 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6471 = 200.0f; -COMPILER_STRIP_GATE(80A007DC, &lit_6471); +COMPILER_STRIP_GATE(0x80A007DC, &lit_6471); #pragma pop /* 809FD3C0-809FD86C 004420 04AC+00 1/0 0/0 0/0 .text cutDive__13daNpc_Hanjo_cFi */ @@ -2399,21 +2444,21 @@ asm void daNpc_Hanjo_c::cutDive(int param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6683 = 150.0f; -COMPILER_STRIP_GATE(80A007E0, &lit_6683); +COMPILER_STRIP_GATE(0x80A007E0, &lit_6683); #pragma pop /* 80A007E4-80A007E8 0001E4 0004+00 0/1 0/0 0/0 .rodata @6684 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6684 = -150.0f; -COMPILER_STRIP_GATE(80A007E4, &lit_6684); +COMPILER_STRIP_GATE(0x80A007E4, &lit_6684); #pragma pop /* 80A007E8-80A007EC 0001E8 0004+00 0/1 0/0 0/0 .rodata @6685 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6685 = -40.0f; -COMPILER_STRIP_GATE(80A007E8, &lit_6685); +COMPILER_STRIP_GATE(0x80A007E8, &lit_6685); #pragma pop /* 809FD86C-809FDEFC 0048CC 0690+00 2/0 0/0 0/0 .text wait__13daNpc_Hanjo_cFPv */ @@ -2431,21 +2476,21 @@ asm void daNpc_Hanjo_c::wait(void* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6795 = 1.5f; -COMPILER_STRIP_GATE(80A007EC, &lit_6795); +COMPILER_STRIP_GATE(0x80A007EC, &lit_6795); #pragma pop /* 80A007F0-80A007F4 0001F0 0004+00 0/1 0/0 0/0 .rodata @6796 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6796 = 1000.0f; -COMPILER_STRIP_GATE(80A007F0, &lit_6796); +COMPILER_STRIP_GATE(0x80A007F0, &lit_6796); #pragma pop /* 80A007F4-80A007F8 0001F4 0004+00 0/1 0/0 0/0 .rodata @6797 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6797 = -1000.0f; -COMPILER_STRIP_GATE(80A007F4, &lit_6797); +COMPILER_STRIP_GATE(0x80A007F4, &lit_6797); #pragma pop /* 809FDEFC-809FE2E0 004F5C 03E4+00 1/0 0/0 0/0 .text throwStone__13daNpc_Hanjo_cFPv */ @@ -2458,6 +2503,13 @@ asm void daNpc_Hanjo_c::throwStone(void* param_0) { } #pragma pop +/* ############################################################################################## */ +/* 80A007F8-80A007F8 0001F8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80A00931 = "toal_enter01"; +#pragma pop + /* 809FE2E0-809FEAEC 005340 080C+00 1/0 0/0 0/0 .text takayose__13daNpc_Hanjo_cFPv */ #pragma push #pragma optimization_level 0 @@ -2829,7 +2881,7 @@ void daNpcT_c::changeBtk(int* param_0, int* param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_809FFE6C(int* param_0) { +extern "C" asm void func_809FFE6C(void* _this, int* param_0) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_hanjo/d_a_npc_hanjo/func_809FFE6C.s" } @@ -2839,7 +2891,7 @@ extern "C" asm void func_809FFE6C(int* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_809FFE88(f32 param_0, f32 param_1) { +extern "C" asm void func_809FFE88(void* _this, f32 param_0, f32 param_1) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_hanjo/d_a_npc_hanjo/func_809FFE88.s" } @@ -2865,7 +2917,7 @@ asm void __sinit_d_a_npc_hanjo_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_809FFEC4 = (void*)__sinit_d_a_npc_hanjo_cpp; +REGISTER_CTORS(0x809FFEC4, __sinit_d_a_npc_hanjo_cpp); #pragma pop /* 809FFFD4-80A000A8 007034 00D4+00 2/2 0/0 0/0 .text __dt__18daNpc_HanjoStone_cFv */ @@ -3235,33 +3287,4 @@ static u8 data_80A01350[4]; static u8 data_80A01354[4]; #pragma pop -/* 80A007F8-80A0093E 0001F8 0146+00 10/7 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80A007F8 = ""; -SECTION_DEAD static char const* const stringBase_80A007F9 = "NO_RESPONSE"; -SECTION_DEAD static char const* const stringBase_80A00805 = "CONVERSATION_ABOUT_SARU01"; -SECTION_DEAD static char const* const stringBase_80A0081F = "CONVERSATION_ABOUT_SARU02"; -SECTION_DEAD static char const* const stringBase_80A00839 = "CONVERSATION_ABOUT_HONEYCOMB1"; -SECTION_DEAD static char const* const stringBase_80A00857 = "CONVERSATION_ABOUT_HONEYCOMB2"; -SECTION_DEAD static char const* const stringBase_80A00875 = "CONVERSATION_ABOUT_HONEYCOMB3"; -SECTION_DEAD static char const* const stringBase_80A00893 = "CONVERSATION_ABOUT_HONEYCOMB4"; -SECTION_DEAD static char const* const stringBase_80A008B1 = "PURSUIT_BEE"; -SECTION_DEAD static char const* const stringBase_80A008BD = "APPEAR_HAWKER"; -SECTION_DEAD static char const* const stringBase_80A008CB = "DIVE"; -SECTION_DEAD static char const* const stringBase_80A008D0 = "Hanjo"; -SECTION_DEAD static char const* const stringBase_80A008D6 = "Hanjo1"; -SECTION_DEAD static char const* const stringBase_80A008DD = "Hanjo2"; -SECTION_DEAD static char const* const stringBase_80A008E4 = "J_Tobi"; -SECTION_DEAD static char const* const stringBase_80A008EB = "Sera"; -SECTION_DEAD static char const* const stringBase_80A008F0 = "CONVERSATION_ABOUT_SARU"; -SECTION_DEAD static char const* const stringBase_80A00908 = "CONVERSATION"; -SECTION_DEAD static char const* const stringBase_80A00915 = "prm"; -SECTION_DEAD static char const* const stringBase_80A00919 = "prm0"; -SECTION_DEAD static char const* const stringBase_80A0091E = "prm1"; -SECTION_DEAD static char const* const stringBase_80A00923 = "msgNo"; -SECTION_DEAD static char const* const stringBase_80A00929 = "timer"; -SECTION_DEAD static char const* const stringBase_80A0092F = "@"; -SECTION_DEAD static char const* const stringBase_80A00931 = "toal_enter01"; -#pragma pop +/* 80A007F8-80A007F8 0001F8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/npc/d_a_npc_henna/d_a_npc_henna.cpp b/rel/d/a/npc/d_a_npc_henna/d_a_npc_henna.cpp index 0a616d5bd61..e61860c3118 100644 --- a/rel/d/a/npc/d_a_npc_henna/d_a_npc_henna.cpp +++ b/rel/d/a/npc/d_a_npc_henna/d_a_npc_henna.cpp @@ -431,20 +431,20 @@ extern "C" void __register_global_object(); /* ############################################################################################## */ /* 8054A964-8054A968 000000 0004+00 17/17 0/0 0/0 .rodata @3905 */ SECTION_RODATA static f32 const lit_3905 = 1.0f; -COMPILER_STRIP_GATE(8054A964, &lit_3905); +COMPILER_STRIP_GATE(0x8054A964, &lit_3905); /* 8054A968-8054A96C 000004 0004+00 0/2 0/0 0/0 .rodata @3906 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3906 = 7.0f / 10.0f; -COMPILER_STRIP_GATE(8054A968, &lit_3906); +COMPILER_STRIP_GATE(0x8054A968, &lit_3906); #pragma pop /* 8054A96C-8054A970 000008 0004+00 0/1 0/0 0/0 .rodata @3907 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3907 = 9.0f / 10.0f; -COMPILER_STRIP_GATE(8054A96C, &lit_3907); +COMPILER_STRIP_GATE(0x8054A96C, &lit_3907); #pragma pop /* 8054AC88-8054AC94 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ @@ -705,11 +705,17 @@ SECTION_RODATA static u8 const lit_3921[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(8054A970, &lit_3921); +COMPILER_STRIP_GATE(0x8054A970, &lit_3921); /* 8054A974-8054A978 000010 0004+00 2/3 0/0 0/0 .rodata @3922 */ SECTION_RODATA static f32 const lit_3922 = -1.0f; -COMPILER_STRIP_GATE(8054A974, &lit_3922); +COMPILER_STRIP_GATE(0x8054A974, &lit_3922); + +/* 8054AC70-8054AC70 00030C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8054AC70 = "Henna"; +#pragma pop /* 80542F98-80543048 000178 00B0+00 4/4 0/0 0/0 .text anm_init__FP15npc_henna_classifUcf */ @@ -728,21 +734,21 @@ static asm void anm_init(npc_henna_class* param_0, int param_1, f32 param_2, u8 #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4026 = 3.0f / 20.0f; -COMPILER_STRIP_GATE(8054A978, &lit_4026); +COMPILER_STRIP_GATE(0x8054A978, &lit_4026); #pragma pop /* 8054A97C-8054A980 000018 0004+00 0/1 0/0 0/0 .rodata @4027 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4027 = 0.25f; -COMPILER_STRIP_GATE(8054A97C, &lit_4027); +COMPILER_STRIP_GATE(0x8054A97C, &lit_4027); #pragma pop /* 8054A980-8054A984 00001C 0004+00 0/2 0/0 0/0 .rodata @4028 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4028 = 0.5f; -COMPILER_STRIP_GATE(8054A980, &lit_4028); +COMPILER_STRIP_GATE(0x8054A980, &lit_4028); #pragma pop /* 8054A984-8054A98C 000020 0008+00 0/4 0/0 0/0 .rodata @4030 */ @@ -751,7 +757,7 @@ COMPILER_STRIP_GATE(8054A980, &lit_4028); SECTION_RODATA static u8 const lit_4030[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8054A984, &lit_4030); +COMPILER_STRIP_GATE(0x8054A984, &lit_4030); #pragma pop /* 80543048-80543350 000228 0308+00 1/1 0/0 0/0 .text nodeCallBack__FP8J3DJointi */ @@ -769,14 +775,14 @@ static asm void nodeCallBack(J3DJoint* param_0, int param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4071 = 190.0f; -COMPILER_STRIP_GATE(8054A98C, &lit_4071); +COMPILER_STRIP_GATE(0x8054A98C, &lit_4071); #pragma pop /* 8054A990-8054A994 00002C 0004+00 0/3 0/0 0/0 .rodata @4072 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4072 = 700.0f; -COMPILER_STRIP_GATE(8054A990, &lit_4072); +COMPILER_STRIP_GATE(0x8054A990, &lit_4072); #pragma pop /* 80543350-805434C0 000530 0170+00 1/0 0/0 0/0 .text daNpc_Henna_Draw__FP15npc_henna_class */ @@ -814,53 +820,53 @@ asm cM3dGPla::~cM3dGPla() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4112 = 100.0f; -COMPILER_STRIP_GATE(8054A994, &lit_4112); +COMPILER_STRIP_GATE(0x8054A994, &lit_4112); #pragma pop /* 8054A998-8054A99C 000034 0004+00 0/3 0/0 0/0 .rodata @4113 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4113 = 30.0f; -COMPILER_STRIP_GATE(8054A998, &lit_4113); +COMPILER_STRIP_GATE(0x8054A998, &lit_4113); #pragma pop /* 8054A99C-8054A9A0 000038 0004+00 0/0 0/0 0/0 .rodata @4114 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4114 = -30.0f; -COMPILER_STRIP_GATE(8054A99C, &lit_4114); +COMPILER_STRIP_GATE(0x8054A99C, &lit_4114); #pragma pop /* 8054A9A0-8054A9A4 00003C 0004+00 0/1 0/0 0/0 .rodata @4115 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4115 = -100.0f; -COMPILER_STRIP_GATE(8054A9A0, &lit_4115); +COMPILER_STRIP_GATE(0x8054A9A0, &lit_4115); #pragma pop /* 8054A9A4-8054A9A8 000040 0004+00 2/3 0/0 0/0 .rodata @4190 */ SECTION_RODATA static f32 const lit_4190 = 300.0f; -COMPILER_STRIP_GATE(8054A9A4, &lit_4190); +COMPILER_STRIP_GATE(0x8054A9A4, &lit_4190); /* 8054A9A8-8054A9AC 000044 0004+00 0/0 0/0 0/0 .rodata @4191 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4191 = -450.0f; -COMPILER_STRIP_GATE(8054A9A8, &lit_4191); +COMPILER_STRIP_GATE(0x8054A9A8, &lit_4191); #pragma pop /* 8054A9AC-8054A9B0 000048 0004+00 0/0 0/0 0/0 .rodata @4192 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4192 = 4.0f / 5.0f; -COMPILER_STRIP_GATE(8054A9AC, &lit_4192); +COMPILER_STRIP_GATE(0x8054A9AC, &lit_4192); #pragma pop /* 8054A9B0-8054A9B4 00004C 0004+00 0/0 0/0 0/0 .rodata @4193 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4193 = -300.0f; -COMPILER_STRIP_GATE(8054A9B0, &lit_4193); +COMPILER_STRIP_GATE(0x8054A9B0, &lit_4193); #pragma pop /* 8054A9B4-8054A9BC 000050 0008+00 0/3 0/0 0/0 .rodata @4242 */ @@ -869,7 +875,7 @@ COMPILER_STRIP_GATE(8054A9B0, &lit_4193); SECTION_RODATA static u8 const lit_4242[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8054A9B4, &lit_4242); +COMPILER_STRIP_GATE(0x8054A9B4, &lit_4242); #pragma pop /* 8054A9BC-8054A9C4 000058 0008+00 0/3 0/0 0/0 .rodata @4243 */ @@ -878,7 +884,7 @@ COMPILER_STRIP_GATE(8054A9B4, &lit_4242); SECTION_RODATA static u8 const lit_4243[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8054A9BC, &lit_4243); +COMPILER_STRIP_GATE(0x8054A9BC, &lit_4243); #pragma pop /* 8054A9C4-8054A9CC 000060 0008+00 0/3 0/0 0/0 .rodata @4244 */ @@ -887,7 +893,7 @@ COMPILER_STRIP_GATE(8054A9BC, &lit_4243); SECTION_RODATA static u8 const lit_4244[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8054A9C4, &lit_4244); +COMPILER_STRIP_GATE(0x8054A9C4, &lit_4244); #pragma pop /* 80543544-805436CC 000724 0188+00 1/1 0/0 0/0 .text s_npc_sub__FPvPv */ @@ -943,7 +949,7 @@ static asm void s_koro2ball_sub(void* param_0, void* param_1) { /* ############################################################################################## */ /* 8054A9CC-8054A9D0 000068 0004+00 1/1 0/0 0/0 .rodata @4330 */ SECTION_RODATA static f32 const lit_4330 = 270.0f; -COMPILER_STRIP_GATE(8054A9CC, &lit_4330); +COMPILER_STRIP_GATE(0x8054A9CC, &lit_4330); /* 80543844-8054395C 000A24 0118+00 1/1 0/0 0/0 .text message_shop__FP15npc_henna_class */ @@ -981,56 +987,56 @@ static asm void s_rod_sub(void* param_0, void* param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4430 = 10.0f; -COMPILER_STRIP_GATE(8054A9D0, &lit_4430); +COMPILER_STRIP_GATE(0x8054A9D0, &lit_4430); #pragma pop /* 8054A9D4-8054A9D8 000070 0004+00 0/1 0/0 0/0 .rodata @4431 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4431 = 1000.0f; -COMPILER_STRIP_GATE(8054A9D4, &lit_4431); +COMPILER_STRIP_GATE(0x8054A9D4, &lit_4431); #pragma pop /* 8054A9D8-8054A9DC 000074 0004+00 0/0 0/0 0/0 .rodata @4432 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4432 = 3.0f; -COMPILER_STRIP_GATE(8054A9D8, &lit_4432); +COMPILER_STRIP_GATE(0x8054A9D8, &lit_4432); #pragma pop /* 8054A9DC-8054A9E0 000078 0004+00 0/1 0/0 0/0 .rodata @4433 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4433 = 120.0f; -COMPILER_STRIP_GATE(8054A9DC, &lit_4433); +COMPILER_STRIP_GATE(0x8054A9DC, &lit_4433); #pragma pop /* 8054A9E0-8054A9E4 00007C 0004+00 0/0 0/0 0/0 .rodata @4434 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4434 = 60.0f; -COMPILER_STRIP_GATE(8054A9E0, &lit_4434); +COMPILER_STRIP_GATE(0x8054A9E0, &lit_4434); #pragma pop /* 8054A9E4-8054A9E8 000080 0004+00 0/0 0/0 0/0 .rodata @4435 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4435 = -661.0f; -COMPILER_STRIP_GATE(8054A9E4, &lit_4435); +COMPILER_STRIP_GATE(0x8054A9E4, &lit_4435); #pragma pop /* 8054A9E8-8054A9EC 000084 0004+00 0/0 0/0 0/0 .rodata @4436 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4436 = 376.0f; -COMPILER_STRIP_GATE(8054A9E8, &lit_4436); +COMPILER_STRIP_GATE(0x8054A9E8, &lit_4436); #pragma pop /* 8054A9EC-8054A9F0 000088 0004+00 0/2 0/0 0/0 .rodata @4491 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4491 = 500.0f; -COMPILER_STRIP_GATE(8054A9EC, &lit_4491); +COMPILER_STRIP_GATE(0x8054A9EC, &lit_4491); #pragma pop /* 80543EB4-8054403C 001094 0188+00 1/1 0/0 0/0 .text s_fish_sub__FPvPv */ @@ -1163,133 +1169,133 @@ static asm void henna_ride(npc_henna_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4740 = 12.0f; -COMPILER_STRIP_GATE(8054A9F0, &lit_4740); +COMPILER_STRIP_GATE(0x8054A9F0, &lit_4740); #pragma pop /* 8054A9F4-8054A9F8 000090 0004+00 0/3 0/0 0/0 .rodata @4741 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4741 = 5.0f; -COMPILER_STRIP_GATE(8054A9F4, &lit_4741); +COMPILER_STRIP_GATE(0x8054A9F4, &lit_4741); #pragma pop /* 8054A9F8-8054A9FC 000094 0004+00 0/1 0/0 0/0 .rodata @4742 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4742 = 90.0f; -COMPILER_STRIP_GATE(8054A9F8, &lit_4742); +COMPILER_STRIP_GATE(0x8054A9F8, &lit_4742); #pragma pop /* 8054A9FC-8054AA00 000098 0004+00 0/2 0/0 0/0 .rodata @4743 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4743 = 200.0f; -COMPILER_STRIP_GATE(8054A9FC, &lit_4743); +COMPILER_STRIP_GATE(0x8054A9FC, &lit_4743); #pragma pop /* 8054AA00-8054AA04 00009C 0004+00 0/0 0/0 0/0 .rodata @4744 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4744 = 2000.0f; -COMPILER_STRIP_GATE(8054AA00, &lit_4744); +COMPILER_STRIP_GATE(0x8054AA00, &lit_4744); #pragma pop /* 8054AA04-8054AA08 0000A0 0004+00 0/0 0/0 0/0 .rodata @4745 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4745 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(8054AA04, &lit_4745); +COMPILER_STRIP_GATE(0x8054AA04, &lit_4745); #pragma pop /* 8054AA08-8054AA0C 0000A4 0004+00 0/0 0/0 0/0 .rodata @4746 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4746 = -200.0f; -COMPILER_STRIP_GATE(8054AA08, &lit_4746); +COMPILER_STRIP_GATE(0x8054AA08, &lit_4746); #pragma pop /* 8054AA0C-8054AA10 0000A8 0004+00 0/1 0/0 0/0 .rodata @4747 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4747 = 1.5f; -COMPILER_STRIP_GATE(8054AA0C, &lit_4747); +COMPILER_STRIP_GATE(0x8054AA0C, &lit_4747); #pragma pop /* 8054AA10-8054AA14 0000AC 0004+00 0/0 0/0 0/0 .rodata @4748 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4748 = 22.0f; -COMPILER_STRIP_GATE(8054AA10, &lit_4748); +COMPILER_STRIP_GATE(0x8054AA10, &lit_4748); #pragma pop /* 8054AA14-8054AA18 0000B0 0004+00 0/2 0/0 0/0 .rodata @4749 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4749 = 2.0f; -COMPILER_STRIP_GATE(8054AA14, &lit_4749); +COMPILER_STRIP_GATE(0x8054AA14, &lit_4749); #pragma pop /* 8054AA18-8054AA1C 0000B4 0004+00 0/1 0/0 0/0 .rodata @4750 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4750 = 3.0f / 5.0f; -COMPILER_STRIP_GATE(8054AA18, &lit_4750); +COMPILER_STRIP_GATE(0x8054AA18, &lit_4750); #pragma pop /* 8054AA1C-8054AA20 0000B8 0004+00 0/1 0/0 0/0 .rodata @4751 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4751 = 40.0f; -COMPILER_STRIP_GATE(8054AA1C, &lit_4751); +COMPILER_STRIP_GATE(0x8054AA1C, &lit_4751); #pragma pop /* 8054AA20-8054AA24 0000BC 0004+00 0/0 0/0 0/0 .rodata @4752 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4752 = -80.0f; -COMPILER_STRIP_GATE(8054AA20, &lit_4752); +COMPILER_STRIP_GATE(0x8054AA20, &lit_4752); #pragma pop /* 8054AA24-8054AA28 0000C0 0004+00 0/1 0/0 0/0 .rodata @4908 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4908 = -0.75f; -COMPILER_STRIP_GATE(8054AA24, &lit_4908); +COMPILER_STRIP_GATE(0x8054AA24, &lit_4908); #pragma pop /* 8054AA28-8054AA2C 0000C4 0004+00 0/2 0/0 0/0 .rodata @4909 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4909 = 150.0f; -COMPILER_STRIP_GATE(8054AA28, &lit_4909); +COMPILER_STRIP_GATE(0x8054AA28, &lit_4909); #pragma pop /* 8054AA2C-8054AA30 0000C8 0004+00 0/1 0/0 0/0 .rodata @4910 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4910 = 20.0f; -COMPILER_STRIP_GATE(8054AA2C, &lit_4910); +COMPILER_STRIP_GATE(0x8054AA2C, &lit_4910); #pragma pop /* 8054AA30-8054AA34 0000CC 0004+00 0/1 0/0 0/0 .rodata @4911 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4911 = -150.0f; -COMPILER_STRIP_GATE(8054AA30, &lit_4911); +COMPILER_STRIP_GATE(0x8054AA30, &lit_4911); #pragma pop /* 8054AA34-8054AA38 0000D0 0004+00 0/1 0/0 0/0 .rodata @4912 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4912 = -0.5f; -COMPILER_STRIP_GATE(8054AA34, &lit_4912); +COMPILER_STRIP_GATE(0x8054AA34, &lit_4912); #pragma pop /* 8054AA38-8054AA3C 0000D4 0004+00 0/1 0/0 0/0 .rodata @4913 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4913 = -13.0f / 20.0f; -COMPILER_STRIP_GATE(8054AA38, &lit_4913); +COMPILER_STRIP_GATE(0x8054AA38, &lit_4913); #pragma pop /* 80544A4C-805450A8 001C2C 065C+00 1/1 0/0 0/0 .text action__FP15npc_henna_class */ @@ -1318,56 +1324,56 @@ static asm void cam_3d_morf(npc_henna_class* param_0, f32 param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5035 = -2815.0f; -COMPILER_STRIP_GATE(8054AA3C, &lit_5035); +COMPILER_STRIP_GATE(0x8054AA3C, &lit_5035); #pragma pop /* 8054AA40-8054AA44 0000DC 0004+00 0/1 0/0 0/0 .rodata @5036 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5036 = 66.0f; -COMPILER_STRIP_GATE(8054AA40, &lit_5036); +COMPILER_STRIP_GATE(0x8054AA40, &lit_5036); #pragma pop /* 8054AA44-8054AA48 0000E0 0004+00 0/1 0/0 0/0 .rodata @5037 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5037 = 4604.0f; -COMPILER_STRIP_GATE(8054AA44, &lit_5037); +COMPILER_STRIP_GATE(0x8054AA44, &lit_5037); #pragma pop /* 8054AA48-8054AA4C 0000E4 0004+00 0/1 0/0 0/0 .rodata @5038 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5038 = -2914.0f; -COMPILER_STRIP_GATE(8054AA48, &lit_5038); +COMPILER_STRIP_GATE(0x8054AA48, &lit_5038); #pragma pop /* 8054AA4C-8054AA50 0000E8 0004+00 0/1 0/0 0/0 .rodata @5039 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5039 = 144.0f; -COMPILER_STRIP_GATE(8054AA4C, &lit_5039); +COMPILER_STRIP_GATE(0x8054AA4C, &lit_5039); #pragma pop /* 8054AA50-8054AA54 0000EC 0004+00 0/1 0/0 0/0 .rodata @5040 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5040 = 5036.0f; -COMPILER_STRIP_GATE(8054AA50, &lit_5040); +COMPILER_STRIP_GATE(0x8054AA50, &lit_5040); #pragma pop /* 8054AA54-8054AA58 0000F0 0004+00 0/1 0/0 0/0 .rodata @5041 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5041 = 55.0f; -COMPILER_STRIP_GATE(8054AA54, &lit_5041); +COMPILER_STRIP_GATE(0x8054AA54, &lit_5041); #pragma pop /* 8054AA58-8054AA5C 0000F4 0004+00 0/1 0/0 0/0 .rodata @5042 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5042 = 4603.0f; -COMPILER_STRIP_GATE(8054AA58, &lit_5042); +COMPILER_STRIP_GATE(0x8054AA58, &lit_5042); #pragma pop /* 8054B008-8054B00C 000090 0004+00 1/3 0/0 0/0 .bss None */ @@ -1401,28 +1407,28 @@ SECTION_RODATA static u8 const lit_5533[32] = { 0x00, 0x01, 0xD4, 0xC0, 0x00, 0x01, 0x5F, 0x90, 0x00, 0x01, 0x38, 0x80, 0x00, 0x01, 0x11, 0x70, 0x00, 0x00, 0xEA, 0x60, 0x00, 0x00, 0xC3, 0x50, 0x00, 0x00, 0x9C, 0x40, 0x00, 0x00, 0x75, 0x30, }; -COMPILER_STRIP_GATE(8054AA5C, &lit_5533); +COMPILER_STRIP_GATE(0x8054AA5C, &lit_5533); #pragma pop /* 8054AA7C-8054AA80 000118 0004+00 0/0 0/0 0/0 .rodata @5678 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_5678 = 0x0002BF20; -COMPILER_STRIP_GATE(8054AA7C, &lit_5678); +COMPILER_STRIP_GATE(0x8054AA7C, &lit_5678); #pragma pop /* 8054AA80-8054AA84 00011C 0004+00 0/2 0/0 0/0 .rodata @5770 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5770 = 140.0f; -COMPILER_STRIP_GATE(8054AA80, &lit_5770); +COMPILER_STRIP_GATE(0x8054AA80, &lit_5770); #pragma pop /* 8054AA84-8054AA88 000120 0004+00 0/1 0/0 0/0 .rodata @5771 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5771 = 1500.0f; -COMPILER_STRIP_GATE(8054AA84, &lit_5771); +COMPILER_STRIP_GATE(0x8054AA84, &lit_5771); #pragma pop /* 8054B00C-8054B018 000094 000C+00 0/1 0/0 0/0 .bss @5112 */ @@ -1587,406 +1593,406 @@ static asm void s_boat_sub(void* param_0, void* param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5772 = 65.0f; -COMPILER_STRIP_GATE(8054AA88, &lit_5772); +COMPILER_STRIP_GATE(0x8054AA88, &lit_5772); #pragma pop /* 8054AA8C-8054AA90 000128 0004+00 0/1 0/0 0/0 .rodata @5773 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5773 = 70.0f; -COMPILER_STRIP_GATE(8054AA8C, &lit_5773); +COMPILER_STRIP_GATE(0x8054AA8C, &lit_5773); #pragma pop /* 8054AA90-8054AA94 00012C 0004+00 0/0 0/0 0/0 .rodata @5774 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5774 = 1.0f / 20.0f; -COMPILER_STRIP_GATE(8054AA90, &lit_5774); +COMPILER_STRIP_GATE(0x8054AA90, &lit_5774); #pragma pop /* 8054AA94-8054AA98 000130 0004+00 0/0 0/0 0/0 .rodata @5775 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5775 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(8054AA94, &lit_5775); +COMPILER_STRIP_GATE(0x8054AA94, &lit_5775); #pragma pop /* 8054AA98-8054AA9C 000134 0004+00 0/3 0/0 0/0 .rodata @5776 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5776 = 50.0f; -COMPILER_STRIP_GATE(8054AA98, &lit_5776); +COMPILER_STRIP_GATE(0x8054AA98, &lit_5776); #pragma pop /* 8054AA9C-8054AAA0 000138 0004+00 0/0 0/0 0/0 .rodata @5777 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5777 = -36.0f; -COMPILER_STRIP_GATE(8054AA9C, &lit_5777); +COMPILER_STRIP_GATE(0x8054AA9C, &lit_5777); #pragma pop /* 8054AAA0-8054AAA4 00013C 0004+00 0/0 0/0 0/0 .rodata @5778 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5778 = 155.0f; -COMPILER_STRIP_GATE(8054AAA0, &lit_5778); +COMPILER_STRIP_GATE(0x8054AAA0, &lit_5778); #pragma pop /* 8054AAA4-8054AAA8 000140 0004+00 0/0 0/0 0/0 .rodata @5779 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5779 = 407.0f; -COMPILER_STRIP_GATE(8054AAA4, &lit_5779); +COMPILER_STRIP_GATE(0x8054AAA4, &lit_5779); #pragma pop /* 8054AAA8-8054AAAC 000144 0004+00 0/0 0/0 0/0 .rodata @5780 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5780 = -45.0f; -COMPILER_STRIP_GATE(8054AAA8, &lit_5780); +COMPILER_STRIP_GATE(0x8054AAA8, &lit_5780); #pragma pop /* 8054AAAC-8054AAB0 000148 0004+00 0/2 0/0 0/0 .rodata @5781 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5781 = 153.0f; -COMPILER_STRIP_GATE(8054AAAC, &lit_5781); +COMPILER_STRIP_GATE(0x8054AAAC, &lit_5781); #pragma pop /* 8054AAB0-8054AAB4 00014C 0004+00 0/0 0/0 0/0 .rodata @5782 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5782 = 169.0f; -COMPILER_STRIP_GATE(8054AAB0, &lit_5782); +COMPILER_STRIP_GATE(0x8054AAB0, &lit_5782); #pragma pop /* 8054AAB4-8054AAB8 000150 0004+00 0/0 0/0 0/0 .rodata @5783 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5783 = -270.0f; -COMPILER_STRIP_GATE(8054AAB4, &lit_5783); +COMPILER_STRIP_GATE(0x8054AAB4, &lit_5783); #pragma pop /* 8054AAB8-8054AABC 000154 0004+00 0/0 0/0 0/0 .rodata @5784 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5784 = 103.0f; -COMPILER_STRIP_GATE(8054AAB8, &lit_5784); +COMPILER_STRIP_GATE(0x8054AAB8, &lit_5784); #pragma pop /* 8054AABC-8054AAC0 000158 0004+00 0/1 0/0 0/0 .rodata @5785 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5785 = 1.0f / 100.0f; -COMPILER_STRIP_GATE(8054AABC, &lit_5785); +COMPILER_STRIP_GATE(0x8054AABC, &lit_5785); #pragma pop /* 8054AAC0-8054AAC4 00015C 0004+00 0/0 0/0 0/0 .rodata @5786 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_5786 = 0x3A83126F; -COMPILER_STRIP_GATE(8054AAC0, &lit_5786); +COMPILER_STRIP_GATE(0x8054AAC0, &lit_5786); #pragma pop /* 8054AAC4-8054AAC8 000160 0004+00 0/0 0/0 0/0 .rodata @5787 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5787 = -67.0f; -COMPILER_STRIP_GATE(8054AAC4, &lit_5787); +COMPILER_STRIP_GATE(0x8054AAC4, &lit_5787); #pragma pop /* 8054AAC8-8054AACC 000164 0004+00 0/0 0/0 0/0 .rodata @5788 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5788 = 105.0f; -COMPILER_STRIP_GATE(8054AAC8, &lit_5788); +COMPILER_STRIP_GATE(0x8054AAC8, &lit_5788); #pragma pop /* 8054AACC-8054AAD0 000168 0004+00 0/1 0/0 0/0 .rodata @5789 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5789 = 160.0f; -COMPILER_STRIP_GATE(8054AACC, &lit_5789); +COMPILER_STRIP_GATE(0x8054AACC, &lit_5789); #pragma pop /* 8054AAD0-8054AAD4 00016C 0004+00 0/0 0/0 0/0 .rodata @5790 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5790 = -10.0f; -COMPILER_STRIP_GATE(8054AAD0, &lit_5790); +COMPILER_STRIP_GATE(0x8054AAD0, &lit_5790); #pragma pop /* 8054AAD4-8054AAD8 000170 0004+00 0/1 0/0 0/0 .rodata @5791 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5791 = 130.0f; -COMPILER_STRIP_GATE(8054AAD4, &lit_5791); +COMPILER_STRIP_GATE(0x8054AAD4, &lit_5791); #pragma pop /* 8054AAD8-8054AADC 000174 0004+00 0/0 0/0 0/0 .rodata @5792 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5792 = 2.0f / 5.0f; -COMPILER_STRIP_GATE(8054AAD8, &lit_5792); +COMPILER_STRIP_GATE(0x8054AAD8, &lit_5792); #pragma pop /* 8054AADC-8054AAE0 000178 0004+00 0/0 0/0 0/0 .rodata @5793 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5793 = 80.0f; -COMPILER_STRIP_GATE(8054AADC, &lit_5793); +COMPILER_STRIP_GATE(0x8054AADC, &lit_5793); #pragma pop /* 8054AAE0-8054AAE4 00017C 0004+00 0/0 0/0 0/0 .rodata @5794 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5794 = 15.0f; -COMPILER_STRIP_GATE(8054AAE0, &lit_5794); +COMPILER_STRIP_GATE(0x8054AAE0, &lit_5794); #pragma pop /* 8054AAE4-8054AAE8 000180 0004+00 0/0 0/0 0/0 .rodata @5795 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5795 = -440.0f; -COMPILER_STRIP_GATE(8054AAE4, &lit_5795); +COMPILER_STRIP_GATE(0x8054AAE4, &lit_5795); #pragma pop /* 8054AAE8-8054AAEC 000184 0004+00 0/1 0/0 0/0 .rodata @5796 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5796 = 380.0f; -COMPILER_STRIP_GATE(8054AAE8, &lit_5796); +COMPILER_STRIP_GATE(0x8054AAE8, &lit_5796); #pragma pop /* 8054AAEC-8054AAF0 000188 0004+00 0/0 0/0 0/0 .rodata @5797 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5797 = -263.0f; -COMPILER_STRIP_GATE(8054AAEC, &lit_5797); +COMPILER_STRIP_GATE(0x8054AAEC, &lit_5797); #pragma pop /* 8054AAF0-8054AAF4 00018C 0004+00 0/0 0/0 0/0 .rodata @5798 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5798 = 142.0f; -COMPILER_STRIP_GATE(8054AAF0, &lit_5798); +COMPILER_STRIP_GATE(0x8054AAF0, &lit_5798); #pragma pop /* 8054AAF4-8054AAF8 000190 0004+00 0/0 0/0 0/0 .rodata @5799 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5799 = 162.0f; -COMPILER_STRIP_GATE(8054AAF4, &lit_5799); +COMPILER_STRIP_GATE(0x8054AAF4, &lit_5799); #pragma pop /* 8054AAF8-8054AAFC 000194 0004+00 0/0 0/0 0/0 .rodata @5800 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5800 = -538.0f; -COMPILER_STRIP_GATE(8054AAF8, &lit_5800); +COMPILER_STRIP_GATE(0x8054AAF8, &lit_5800); #pragma pop /* 8054AAFC-8054AB00 000198 0004+00 0/0 0/0 0/0 .rodata @5801 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5801 = 116.0f; -COMPILER_STRIP_GATE(8054AAFC, &lit_5801); +COMPILER_STRIP_GATE(0x8054AAFC, &lit_5801); #pragma pop /* 8054AB00-8054AB04 00019C 0004+00 0/1 0/0 0/0 .rodata @5802 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5802 = 3.0f / 10.0f; -COMPILER_STRIP_GATE(8054AB00, &lit_5802); +COMPILER_STRIP_GATE(0x8054AB00, &lit_5802); #pragma pop /* 8054AB04-8054AB08 0001A0 0004+00 0/0 0/0 0/0 .rodata @5803 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5803 = 3.0f / 50.0f; -COMPILER_STRIP_GATE(8054AB04, &lit_5803); +COMPILER_STRIP_GATE(0x8054AB04, &lit_5803); #pragma pop /* 8054AB08-8054AB0C 0001A4 0004+00 0/0 0/0 0/0 .rodata @5804 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5804 = 1.0f / 50.0f; -COMPILER_STRIP_GATE(8054AB08, &lit_5804); +COMPILER_STRIP_GATE(0x8054AB08, &lit_5804); #pragma pop /* 8054AB0C-8054AB10 0001A8 0004+00 0/0 0/0 0/0 .rodata @5805 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5805 = 171.0f; -COMPILER_STRIP_GATE(8054AB0C, &lit_5805); +COMPILER_STRIP_GATE(0x8054AB0C, &lit_5805); #pragma pop /* 8054AB10-8054AB14 0001AC 0004+00 0/1 0/0 0/0 .rodata @5806 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5806 = 432.0f; -COMPILER_STRIP_GATE(8054AB10, &lit_5806); +COMPILER_STRIP_GATE(0x8054AB10, &lit_5806); #pragma pop /* 8054AB14-8054AB18 0001B0 0004+00 0/0 0/0 0/0 .rodata @5807 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5807 = -900.0f; -COMPILER_STRIP_GATE(8054AB14, &lit_5807); +COMPILER_STRIP_GATE(0x8054AB14, &lit_5807); #pragma pop /* 8054AB18-8054AB1C 0001B4 0004+00 0/0 0/0 0/0 .rodata @5808 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5808 = 1300.0f; -COMPILER_STRIP_GATE(8054AB18, &lit_5808); +COMPILER_STRIP_GATE(0x8054AB18, &lit_5808); #pragma pop /* 8054AB1C-8054AB20 0001B8 0004+00 0/1 0/0 0/0 .rodata @5809 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5809 = 210.0f; -COMPILER_STRIP_GATE(8054AB1C, &lit_5809); +COMPILER_STRIP_GATE(0x8054AB1C, &lit_5809); #pragma pop /* 8054AB20-8054AB24 0001BC 0004+00 0/0 0/0 0/0 .rodata @5810 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5810 = 410.0f; -COMPILER_STRIP_GATE(8054AB20, &lit_5810); +COMPILER_STRIP_GATE(0x8054AB20, &lit_5810); #pragma pop /* 8054AB24-8054AB28 0001C0 0004+00 0/0 0/0 0/0 .rodata @5811 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5811 = 32.0f; -COMPILER_STRIP_GATE(8054AB24, &lit_5811); +COMPILER_STRIP_GATE(0x8054AB24, &lit_5811); #pragma pop /* 8054AB28-8054AB2C 0001C4 0004+00 0/0 0/0 0/0 .rodata @5812 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5812 = 419.0f; -COMPILER_STRIP_GATE(8054AB28, &lit_5812); +COMPILER_STRIP_GATE(0x8054AB28, &lit_5812); #pragma pop /* 8054AB2C-8054AB30 0001C8 0004+00 0/1 0/0 0/0 .rodata @5813 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5813 = -500.0f; -COMPILER_STRIP_GATE(8054AB2C, &lit_5813); +COMPILER_STRIP_GATE(0x8054AB2C, &lit_5813); #pragma pop /* 8054AB30-8054AB34 0001CC 0004+00 0/1 0/0 0/0 .rodata @5814 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5814 = 600.0f; -COMPILER_STRIP_GATE(8054AB30, &lit_5814); +COMPILER_STRIP_GATE(0x8054AB30, &lit_5814); #pragma pop /* 8054AB34-8054AB38 0001D0 0004+00 0/0 0/0 0/0 .rodata @5815 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5815 = -16384.0f; -COMPILER_STRIP_GATE(8054AB34, &lit_5815); +COMPILER_STRIP_GATE(0x8054AB34, &lit_5815); #pragma pop /* 8054AB38-8054AB3C 0001D4 0004+00 0/0 0/0 0/0 .rodata @5816 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5816 = -4.0f / 5.0f; -COMPILER_STRIP_GATE(8054AB38, &lit_5816); +COMPILER_STRIP_GATE(0x8054AB38, &lit_5816); #pragma pop /* 8054AB3C-8054AB40 0001D8 0004+00 0/0 0/0 0/0 .rodata @5817 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5817 = -610.0f; -COMPILER_STRIP_GATE(8054AB3C, &lit_5817); +COMPILER_STRIP_GATE(0x8054AB3C, &lit_5817); #pragma pop /* 8054AB40-8054AB44 0001DC 0004+00 0/0 0/0 0/0 .rodata @5818 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5818 = 143.0f; -COMPILER_STRIP_GATE(8054AB40, &lit_5818); +COMPILER_STRIP_GATE(0x8054AB40, &lit_5818); #pragma pop /* 8054AB44-8054AB48 0001E0 0004+00 0/0 0/0 0/0 .rodata @5819 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5819 = -880.0f; -COMPILER_STRIP_GATE(8054AB44, &lit_5819); +COMPILER_STRIP_GATE(0x8054AB44, &lit_5819); #pragma pop /* 8054AB48-8054AB4C 0001E4 0004+00 0/0 0/0 0/0 .rodata @5820 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5820 = 146.0f; -COMPILER_STRIP_GATE(8054AB48, &lit_5820); +COMPILER_STRIP_GATE(0x8054AB48, &lit_5820); #pragma pop /* 8054AB4C-8054AB50 0001E8 0004+00 0/0 0/0 0/0 .rodata @5821 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5821 = 502.0f; -COMPILER_STRIP_GATE(8054AB4C, &lit_5821); +COMPILER_STRIP_GATE(0x8054AB4C, &lit_5821); #pragma pop /* 8054AB50-8054AB54 0001EC 0004+00 0/0 0/0 0/0 .rodata @5822 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5822 = 25.0f; -COMPILER_STRIP_GATE(8054AB50, &lit_5822); +COMPILER_STRIP_GATE(0x8054AB50, &lit_5822); #pragma pop /* 8054AB54-8054AB58 0001F0 0004+00 0/1 0/0 0/0 .rodata @5823 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5823 = -250.0f; -COMPILER_STRIP_GATE(8054AB54, &lit_5823); +COMPILER_STRIP_GATE(0x8054AB54, &lit_5823); #pragma pop /* 8054AB58-8054AB5C 0001F4 0004+00 0/1 0/0 0/0 .rodata @6059 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6059 = -2591.0f; -COMPILER_STRIP_GATE(8054AB58, &lit_6059); +COMPILER_STRIP_GATE(0x8054AB58, &lit_6059); #pragma pop /* 8054AB5C-8054AB60 0001F8 0004+00 0/1 0/0 0/0 .rodata @6060 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6060 = -6742.0f; -COMPILER_STRIP_GATE(8054AB5C, &lit_6060); +COMPILER_STRIP_GATE(0x8054AB5C, &lit_6060); #pragma pop /* 8054AB60-8054AB64 0001FC 0004+00 0/1 0/0 0/0 .rodata @6061 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6061 = 3500.0f; -COMPILER_STRIP_GATE(8054AB60, &lit_6061); +COMPILER_STRIP_GATE(0x8054AB60, &lit_6061); #pragma pop /* 8054AB64-8054AB68 000200 0004+00 0/1 0/0 0/0 .rodata @6062 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6062 = 180.0f; -COMPILER_STRIP_GATE(8054AB64, &lit_6062); +COMPILER_STRIP_GATE(0x8054AB64, &lit_6062); #pragma pop /* 8054AB68-8054AB6C 000204 0004+00 0/1 0/0 0/0 .rodata @6063 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_6063 = 0x3D3851EC; -COMPILER_STRIP_GATE(8054AB68, &lit_6063); +COMPILER_STRIP_GATE(0x8054AB68, &lit_6063); #pragma pop /* 8054AB6C-8054AB70 000208 0004+00 0/1 0/0 0/0 .rodata @6064 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6064 = 250.0f; -COMPILER_STRIP_GATE(8054AB6C, &lit_6064); +COMPILER_STRIP_GATE(0x8054AB6C, &lit_6064); #pragma pop /* 8054B1EC-8054B1F4 000274 0004+04 0/0 0/0 0/0 .bss koro2_reset */ @@ -2021,98 +2027,98 @@ static asm void env_control(npc_henna_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_6419 = 0xB8D1B717; -COMPILER_STRIP_GATE(8054AB70, &lit_6419); +COMPILER_STRIP_GATE(0x8054AB70, &lit_6419); #pragma pop /* 8054AB74-8054AB78 000210 0004+00 0/1 0/0 0/0 .rodata @6420 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_6420 = 0xBD872B02; -COMPILER_STRIP_GATE(8054AB74, &lit_6420); +COMPILER_STRIP_GATE(0x8054AB74, &lit_6420); #pragma pop /* 8054AB78-8054AB7C 000214 0004+00 0/1 0/0 0/0 .rodata @6421 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_6421 = 0x38D1B717; -COMPILER_STRIP_GATE(8054AB78, &lit_6421); +COMPILER_STRIP_GATE(0x8054AB78, &lit_6421); #pragma pop /* 8054AB7C-8054AB80 000218 0004+00 0/1 0/0 0/0 .rodata @6422 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_6422 = 0x3D872B02; -COMPILER_STRIP_GATE(8054AB7C, &lit_6422); +COMPILER_STRIP_GATE(0x8054AB7C, &lit_6422); #pragma pop /* 8054AB80-8054AB84 00021C 0004+00 0/1 0/0 0/0 .rodata @6423 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6423 = 9.5f; -COMPILER_STRIP_GATE(8054AB80, &lit_6423); +COMPILER_STRIP_GATE(0x8054AB80, &lit_6423); #pragma pop /* 8054AB84-8054AB88 000220 0004+00 0/1 0/0 0/0 .rodata @6424 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6424 = 17.5f; -COMPILER_STRIP_GATE(8054AB84, &lit_6424); +COMPILER_STRIP_GATE(0x8054AB84, &lit_6424); #pragma pop /* 8054AB88-8054AB8C 000224 0004+00 0/1 0/0 0/0 .rodata @6425 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6425 = 4.0f; -COMPILER_STRIP_GATE(8054AB88, &lit_6425); +COMPILER_STRIP_GATE(0x8054AB88, &lit_6425); #pragma pop /* 8054AB8C-8054AB90 000228 0004+00 0/1 0/0 0/0 .rodata @6426 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6426 = -60.0f; -COMPILER_STRIP_GATE(8054AB8C, &lit_6426); +COMPILER_STRIP_GATE(0x8054AB8C, &lit_6426); #pragma pop /* 8054AB90-8054AB94 00022C 0004+00 0/1 0/0 0/0 .rodata @6427 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6427 = -50.0f; -COMPILER_STRIP_GATE(8054AB90, &lit_6427); +COMPILER_STRIP_GATE(0x8054AB90, &lit_6427); #pragma pop /* 8054AB94-8054AB98 000230 0004+00 0/1 0/0 0/0 .rodata @6428 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6428 = -460.0f; -COMPILER_STRIP_GATE(8054AB94, &lit_6428); +COMPILER_STRIP_GATE(0x8054AB94, &lit_6428); #pragma pop /* 8054AB98-8054AB9C 000234 0004+00 0/1 0/0 0/0 .rodata @6429 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6429 = 51.0f; -COMPILER_STRIP_GATE(8054AB98, &lit_6429); +COMPILER_STRIP_GATE(0x8054AB98, &lit_6429); #pragma pop /* 8054AB9C-8054ABA0 000238 0004+00 0/1 0/0 0/0 .rodata @6430 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6430 = -240.0f; -COMPILER_STRIP_GATE(8054AB9C, &lit_6430); +COMPILER_STRIP_GATE(0x8054AB9C, &lit_6430); #pragma pop /* 8054ABA0-8054ABA4 00023C 0004+00 0/1 0/0 0/0 .rodata @6431 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6431 = -790.0f; -COMPILER_STRIP_GATE(8054ABA0, &lit_6431); +COMPILER_STRIP_GATE(0x8054ABA0, &lit_6431); #pragma pop /* 8054ABA4-8054ABA8 000240 0004+00 0/1 0/0 0/0 .rodata @6432 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6432 = 590.0f; -COMPILER_STRIP_GATE(8054ABA4, &lit_6432); +COMPILER_STRIP_GATE(0x8054ABA4, &lit_6432); #pragma pop /* 805488B8-805492A4 005A98 09EC+00 2/1 0/0 0/0 .text daNpc_Henna_Execute__FP15npc_henna_class */ @@ -2140,6 +2146,13 @@ static asm void daNpc_Henna_Delete(npc_henna_class* param_0) { } #pragma pop +/* ############################################################################################## */ +/* 8054AC70-8054AC70 00030C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8054AC76 = "F_SP127"; +#pragma pop + /* 80549300-805496DC 0064E0 03DC+00 1/1 0/0 0/0 .text useHeapInit__FP10fopAc_ac_c */ #pragma push #pragma optimization_level 0 @@ -2165,119 +2178,125 @@ asm J3DFrameCtrl::~J3DFrameCtrl() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6814 = -380.0f; -COMPILER_STRIP_GATE(8054ABA8, &lit_6814); +COMPILER_STRIP_GATE(0x8054ABA8, &lit_6814); #pragma pop /* 8054ABAC-8054ABB0 000248 0004+00 0/1 0/0 0/0 .rodata @6815 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6815 = 450.0f; -COMPILER_STRIP_GATE(8054ABAC, &lit_6815); +COMPILER_STRIP_GATE(0x8054ABAC, &lit_6815); #pragma pop /* 8054ABB0-8054ABB4 00024C 0004+00 0/1 0/0 0/0 .rodata @6816 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6816 = 33.0f / 100.0f; -COMPILER_STRIP_GATE(8054ABB0, &lit_6816); +COMPILER_STRIP_GATE(0x8054ABB0, &lit_6816); #pragma pop /* 8054ABB4-8054ABB8 000250 0004+00 0/1 0/0 0/0 .rodata @6817 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6817 = 4400.0f; -COMPILER_STRIP_GATE(8054ABB4, &lit_6817); +COMPILER_STRIP_GATE(0x8054ABB4, &lit_6817); #pragma pop /* 8054ABB8-8054ABBC 000254 0004+00 0/1 0/0 0/0 .rodata @6818 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6818 = 2122.0f; -COMPILER_STRIP_GATE(8054ABB8, &lit_6818); +COMPILER_STRIP_GATE(0x8054ABB8, &lit_6818); #pragma pop /* 8054ABBC-8054ABC0 000258 0004+00 0/1 0/0 0/0 .rodata @6819 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6819 = 33.0f / 50.0f; -COMPILER_STRIP_GATE(8054ABBC, &lit_6819); +COMPILER_STRIP_GATE(0x8054ABBC, &lit_6819); #pragma pop /* 8054ABC0-8054ABC4 00025C 0004+00 0/1 0/0 0/0 .rodata @6820 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6820 = -606.0f; -COMPILER_STRIP_GATE(8054ABC0, &lit_6820); +COMPILER_STRIP_GATE(0x8054ABC0, &lit_6820); #pragma pop /* 8054ABC4-8054ABC8 000260 0004+00 0/1 0/0 0/0 .rodata @6821 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6821 = 5210.0f; -COMPILER_STRIP_GATE(8054ABC4, &lit_6821); +COMPILER_STRIP_GATE(0x8054ABC4, &lit_6821); #pragma pop /* 8054ABC8-8054ABCC 000264 0004+00 0/1 0/0 0/0 .rodata @6822 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6822 = 2249.0f; -COMPILER_STRIP_GATE(8054ABC8, &lit_6822); +COMPILER_STRIP_GATE(0x8054ABC8, &lit_6822); #pragma pop /* 8054ABCC-8054ABD0 000268 0004+00 0/1 0/0 0/0 .rodata @6823 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6823 = -2218.0f; -COMPILER_STRIP_GATE(8054ABCC, &lit_6823); +COMPILER_STRIP_GATE(0x8054ABCC, &lit_6823); #pragma pop /* 8054ABD0-8054ABD4 00026C 0004+00 0/2 0/0 0/0 .rodata @6824 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6824 = 45.0f; -COMPILER_STRIP_GATE(8054ABD0, &lit_6824); +COMPILER_STRIP_GATE(0x8054ABD0, &lit_6824); #pragma pop /* 8054ABD4-8054ABD8 000270 0004+00 0/1 0/0 0/0 .rodata @6825 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6825 = 8000.0f; -COMPILER_STRIP_GATE(8054ABD4, &lit_6825); +COMPILER_STRIP_GATE(0x8054ABD4, &lit_6825); #pragma pop /* 8054ABD8-8054ABDC 000274 0004+00 0/1 0/0 0/0 .rodata @6826 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6826 = -1500.0f; -COMPILER_STRIP_GATE(8054ABD8, &lit_6826); +COMPILER_STRIP_GATE(0x8054ABD8, &lit_6826); #pragma pop /* 8054ABDC-8054ABE0 000278 0004+00 0/1 0/0 0/0 .rodata @6827 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6827 = 3000.0f; -COMPILER_STRIP_GATE(8054ABDC, &lit_6827); +COMPILER_STRIP_GATE(0x8054ABDC, &lit_6827); #pragma pop /* 8054ABE0-8054ABE4 00027C 0004+00 0/1 0/0 0/0 .rodata @6828 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6828 = 65536.0f; -COMPILER_STRIP_GATE(8054ABE0, &lit_6828); +COMPILER_STRIP_GATE(0x8054ABE0, &lit_6828); #pragma pop /* 8054ABE4-8054ABE8 000280 0004+00 0/1 0/0 0/0 .rodata @6829 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6829 = -160.0f; -COMPILER_STRIP_GATE(8054ABE4, &lit_6829); +COMPILER_STRIP_GATE(0x8054ABE4, &lit_6829); #pragma pop /* 8054ABE8-8054ABEC 000284 0004+00 0/1 0/0 0/0 .rodata @6830 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6830 = 2300.0f; -COMPILER_STRIP_GATE(8054ABE8, &lit_6830); +COMPILER_STRIP_GATE(0x8054ABE8, &lit_6830); +#pragma pop + +/* 8054AC70-8054AC70 00030C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8054AC7E = "T_MUKAO"; #pragma pop /* 80549724-80549E40 006904 071C+00 1/0 0/0 0/0 .text daNpc_Henna_Create__FP10fopAc_ac_c @@ -2306,231 +2325,231 @@ asm daNpc_Henna_HIO_c::~daNpc_Henna_HIO_c() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7004 = -720.0f; -COMPILER_STRIP_GATE(8054ABEC, &lit_7004); +COMPILER_STRIP_GATE(0x8054ABEC, &lit_7004); #pragma pop /* 8054ABF0-8054ABF4 00028C 0004+00 0/1 0/0 0/0 .rodata @7005 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7005 = 100000.0f; -COMPILER_STRIP_GATE(8054ABF0, &lit_7005); +COMPILER_STRIP_GATE(0x8054ABF0, &lit_7005); #pragma pop /* 8054ABF4-8054ABF8 000290 0004+00 0/1 0/0 0/0 .rodata @7006 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7006 = 176.0f; -COMPILER_STRIP_GATE(8054ABF4, &lit_7006); +COMPILER_STRIP_GATE(0x8054ABF4, &lit_7006); #pragma pop /* 8054ABF8-8054ABFC 000294 0004+00 0/1 0/0 0/0 .rodata @7007 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7007 = 595.0f; -COMPILER_STRIP_GATE(8054ABF8, &lit_7007); +COMPILER_STRIP_GATE(0x8054ABF8, &lit_7007); #pragma pop /* 8054ABFC-8054AC00 000298 0004+00 0/1 0/0 0/0 .rodata @7008 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7008 = -376.0f; -COMPILER_STRIP_GATE(8054ABFC, &lit_7008); +COMPILER_STRIP_GATE(0x8054ABFC, &lit_7008); #pragma pop /* 8054AC00-8054AC04 00029C 0004+00 0/1 0/0 0/0 .rodata @7009 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7009 = 135.0f; -COMPILER_STRIP_GATE(8054AC00, &lit_7009); +COMPILER_STRIP_GATE(0x8054AC00, &lit_7009); #pragma pop /* 8054AC04-8054AC08 0002A0 0004+00 0/1 0/0 0/0 .rodata @7010 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7010 = -464.0f; -COMPILER_STRIP_GATE(8054AC04, &lit_7010); +COMPILER_STRIP_GATE(0x8054AC04, &lit_7010); #pragma pop /* 8054AC08-8054AC0C 0002A4 0004+00 0/1 0/0 0/0 .rodata @7011 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7011 = -648.0f; -COMPILER_STRIP_GATE(8054AC08, &lit_7011); +COMPILER_STRIP_GATE(0x8054AC08, &lit_7011); #pragma pop /* 8054AC0C-8054AC10 0002A8 0004+00 0/1 0/0 0/0 .rodata @7012 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7012 = 312.0f; -COMPILER_STRIP_GATE(8054AC0C, &lit_7012); +COMPILER_STRIP_GATE(0x8054AC0C, &lit_7012); #pragma pop /* 8054AC10-8054AC14 0002AC 0004+00 0/1 0/0 0/0 .rodata @7013 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7013 = 545.0f; -COMPILER_STRIP_GATE(8054AC10, &lit_7013); +COMPILER_STRIP_GATE(0x8054AC10, &lit_7013); #pragma pop /* 8054AC14-8054AC18 0002B0 0004+00 0/1 0/0 0/0 .rodata @7014 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7014 = -262.0f; -COMPILER_STRIP_GATE(8054AC14, &lit_7014); +COMPILER_STRIP_GATE(0x8054AC14, &lit_7014); #pragma pop /* 8054AC18-8054AC1C 0002B4 0004+00 0/1 0/0 0/0 .rodata @7015 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7015 = 57.0f; -COMPILER_STRIP_GATE(8054AC18, &lit_7015); +COMPILER_STRIP_GATE(0x8054AC18, &lit_7015); #pragma pop /* 8054AC1C-8054AC20 0002B8 0004+00 0/1 0/0 0/0 .rodata @7016 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7016 = -387.0f; -COMPILER_STRIP_GATE(8054AC1C, &lit_7016); +COMPILER_STRIP_GATE(0x8054AC1C, &lit_7016); #pragma pop /* 8054AC20-8054AC24 0002BC 0004+00 0/1 0/0 0/0 .rodata @7017 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7017 = 215.0f; -COMPILER_STRIP_GATE(8054AC20, &lit_7017); +COMPILER_STRIP_GATE(0x8054AC20, &lit_7017); #pragma pop /* 8054AC24-8054AC28 0002C0 0004+00 0/1 0/0 0/0 .rodata @7018 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7018 = -274.0f; -COMPILER_STRIP_GATE(8054AC24, &lit_7018); +COMPILER_STRIP_GATE(0x8054AC24, &lit_7018); #pragma pop /* 8054AC28-8054AC2C 0002C4 0004+00 0/1 0/0 0/0 .rodata @7019 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7019 = 10335.0f; -COMPILER_STRIP_GATE(8054AC28, &lit_7019); +COMPILER_STRIP_GATE(0x8054AC28, &lit_7019); #pragma pop /* 8054AC2C-8054AC30 0002C8 0004+00 0/1 0/0 0/0 .rodata @7020 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7020 = 254.0f; -COMPILER_STRIP_GATE(8054AC2C, &lit_7020); +COMPILER_STRIP_GATE(0x8054AC2C, &lit_7020); #pragma pop /* 8054AC30-8054AC34 0002CC 0004+00 0/1 0/0 0/0 .rodata @7021 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7021 = 10025.0f; -COMPILER_STRIP_GATE(8054AC30, &lit_7021); +COMPILER_STRIP_GATE(0x8054AC30, &lit_7021); #pragma pop /* 8054AC34-8054AC38 0002D0 0004+00 0/1 0/0 0/0 .rodata @7022 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7022 = 240.0f; -COMPILER_STRIP_GATE(8054AC34, &lit_7022); +COMPILER_STRIP_GATE(0x8054AC34, &lit_7022); #pragma pop /* 8054AC38-8054AC3C 0002D4 0004+00 0/1 0/0 0/0 .rodata @7023 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7023 = -208.0f; -COMPILER_STRIP_GATE(8054AC38, &lit_7023); +COMPILER_STRIP_GATE(0x8054AC38, &lit_7023); #pragma pop /* 8054AC3C-8054AC40 0002D8 0004+00 0/1 0/0 0/0 .rodata @7024 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7024 = -110.0f; -COMPILER_STRIP_GATE(8054AC3C, &lit_7024); +COMPILER_STRIP_GATE(0x8054AC3C, &lit_7024); #pragma pop /* 8054AC40-8054AC44 0002DC 0004+00 0/1 0/0 0/0 .rodata @7025 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7025 = 248.0f; -COMPILER_STRIP_GATE(8054AC40, &lit_7025); +COMPILER_STRIP_GATE(0x8054AC40, &lit_7025); #pragma pop /* 8054AC44-8054AC48 0002E0 0004+00 0/1 0/0 0/0 .rodata @7026 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7026 = 234.0f; -COMPILER_STRIP_GATE(8054AC44, &lit_7026); +COMPILER_STRIP_GATE(0x8054AC44, &lit_7026); #pragma pop /* 8054AC48-8054AC4C 0002E4 0004+00 0/1 0/0 0/0 .rodata @7027 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7027 = 141.0f; -COMPILER_STRIP_GATE(8054AC48, &lit_7027); +COMPILER_STRIP_GATE(0x8054AC48, &lit_7027); #pragma pop /* 8054AC4C-8054AC50 0002E8 0004+00 0/1 0/0 0/0 .rodata @7028 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7028 = 34.0f; -COMPILER_STRIP_GATE(8054AC4C, &lit_7028); +COMPILER_STRIP_GATE(0x8054AC4C, &lit_7028); #pragma pop /* 8054AC50-8054AC54 0002EC 0004+00 0/1 0/0 0/0 .rodata @7029 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7029 = 149.0f; -COMPILER_STRIP_GATE(8054AC50, &lit_7029); +COMPILER_STRIP_GATE(0x8054AC50, &lit_7029); #pragma pop /* 8054AC54-8054AC58 0002F0 0004+00 0/1 0/0 0/0 .rodata @7030 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7030 = -64.0f; -COMPILER_STRIP_GATE(8054AC54, &lit_7030); +COMPILER_STRIP_GATE(0x8054AC54, &lit_7030); #pragma pop /* 8054AC58-8054AC5C 0002F4 0004+00 0/1 0/0 0/0 .rodata @7031 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7031 = -166.0f; -COMPILER_STRIP_GATE(8054AC58, &lit_7031); +COMPILER_STRIP_GATE(0x8054AC58, &lit_7031); #pragma pop /* 8054AC5C-8054AC60 0002F8 0004+00 0/1 0/0 0/0 .rodata @7032 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7032 = -131.0f; -COMPILER_STRIP_GATE(8054AC5C, &lit_7032); +COMPILER_STRIP_GATE(0x8054AC5C, &lit_7032); #pragma pop /* 8054AC60-8054AC64 0002FC 0004+00 0/1 0/0 0/0 .rodata @7033 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7033 = 566.0f; -COMPILER_STRIP_GATE(8054AC60, &lit_7033); +COMPILER_STRIP_GATE(0x8054AC60, &lit_7033); #pragma pop /* 8054AC64-8054AC68 000300 0004+00 0/1 0/0 0/0 .rodata @7034 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7034 = 323.0f; -COMPILER_STRIP_GATE(8054AC64, &lit_7034); +COMPILER_STRIP_GATE(0x8054AC64, &lit_7034); #pragma pop /* 8054AC68-8054AC6C 000304 0004+00 0/1 0/0 0/0 .rodata @7035 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7035 = 233.0f; -COMPILER_STRIP_GATE(8054AC68, &lit_7035); +COMPILER_STRIP_GATE(0x8054AC68, &lit_7035); #pragma pop /* 8054AC6C-8054AC70 000308 0004+00 0/1 0/0 0/0 .rodata @7036 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7036 = 284.0f; -COMPILER_STRIP_GATE(8054AC6C, &lit_7036); +COMPILER_STRIP_GATE(0x8054AC6C, &lit_7036); #pragma pop /* 80549E88-8054A384 007068 04FC+00 0/1 1/0 0/0 .text __sinit_d_a_npc_henna_cpp */ @@ -2545,7 +2564,7 @@ asm void __sinit_d_a_npc_henna_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80549E88 = (void*)__sinit_d_a_npc_henna_cpp; +REGISTER_CTORS(0x80549E88, __sinit_d_a_npc_henna_cpp); #pragma pop /* 8054A384-8054A398 007564 0014+00 1/1 0/0 0/0 .text cancelOriginalDemo__9daPy_py_cFv */ @@ -2653,7 +2672,7 @@ asm void mDoGph_gInf_c::fadeIn(f32 param_0, _GXColor& param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -static asm void fpcM_Search(void* (*)(void*, void*), void* param_1) { +static asm void fpcM_Search(void* (*param_0)(void*, void*), void* param_1) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_henna/d_a_npc_henna/fpcM_Search__FPFPvPv_PvPv.s" } @@ -3160,11 +3179,4 @@ static u8 data_8054B260[4]; static u8 data_8054B264[4]; #pragma pop -/* 8054AC70-8054AC86 00030C 0016+00 4/4 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_8054AC70 = "Henna"; -SECTION_DEAD static char const* const stringBase_8054AC76 = "F_SP127"; -SECTION_DEAD static char const* const stringBase_8054AC7E = "T_MUKAO"; -#pragma pop +/* 8054AC70-8054AC70 00030C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/npc/d_a_npc_hoz/d_a_npc_hoz.cpp b/rel/d/a/npc/d_a_npc_hoz/d_a_npc_hoz.cpp index 774456c3045..c72cebed6d3 100644 --- a/rel/d/a/npc/d_a_npc_hoz/d_a_npc_hoz.cpp +++ b/rel/d/a/npc/d_a_npc_hoz/d_a_npc_hoz.cpp @@ -15,12 +15,14 @@ struct mDoMtx_stack_c { static u8 now[48]; }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; +struct J3DAnmTransform {}; + +struct J3DModelData {}; + struct Vec {}; struct Z2Creature { @@ -29,8 +31,6 @@ struct Z2Creature { /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -52,6 +52,8 @@ struct daPy_py_c { /* 8015F424 */ void checkNowWolfEyeUp(); }; +struct daNpcT_faceMotionAnmData_c {}; + struct daNpcT_MotionSeqMngr_c { struct sequenceStepData_c {}; @@ -59,14 +61,12 @@ struct daNpcT_MotionSeqMngr_c { /* 80A05DF0 */ ~daNpcT_MotionSeqMngr_c(); }; +struct daNpcT_evtData_c {}; + struct daNpcT_motionAnmData_c {}; struct J3DJoint {}; -struct daNpcT_faceMotionAnmData_c {}; - -struct daNpcT_evtData_c {}; - struct daNpc_Hoz_c { /* 80A0150C */ ~daNpc_Hoz_c(); /* 80A01658 */ void create(); @@ -138,6 +138,8 @@ struct dCcD_GObjInf { /* 800840E4 */ ~dCcD_GObjInf(); }; +struct _GXColorS10 {}; + struct J3DModel {}; struct cXyz { @@ -146,8 +148,6 @@ struct cXyz { /* 80A05DEC */ cXyz(); }; -struct _GXColorS10 {}; - struct daNpcT_c { /* 80147FA4 */ void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*); /* 801483F8 */ void loadRes(s8 const*, char const**); @@ -253,7 +253,6 @@ struct dMeter2Info_c { struct dEvt_control_c { /* 80042468 */ void reset(); /* 8004368C */ void setPtT(void*); - /* 800436EC */ void setPtI_Id(unsigned int); }; struct dEvent_manager_c { @@ -308,13 +307,13 @@ struct dBgS_AcchCir { /* 80A05E38 */ ~dBgS_AcchCir(); }; -struct dBgS {}; - struct csXyz { /* 80A057D4 */ ~csXyz(); /* 80A05CEC */ csXyz(); }; +struct dBgS {}; + struct dBgS_Acch { /* 80075F94 */ ~dBgS_Acch(); /* 800760A0 */ dBgS_Acch(); @@ -500,7 +499,7 @@ extern "C" void changeAnm__8daNpcT_cFPiPi(); extern "C" void changeBck__8daNpcT_cFPiPi(); extern "C" void changeBtp__8daNpcT_cFPiPi(); extern "C" void changeBtk__8daNpcT_cFPiPi(); -extern "C" void func_80A063B4(int*); +extern "C" void func_80A063B4(void* _this, int*); extern "C" void __sinit_d_a_npc_hoz_cpp(); extern "C" void __ct__11daNpc_Hoz_cFPC26daNpcT_faceMotionAnmData_cPC22daNpcT_motionAnmData_cPCQ222daNpcT_MotionSeqMngr_c18sequenceStepData_ciPCQ222daNpcT_MotionSeqMngr_c18sequenceStepData_ciPC16daNpcT_evtData_cPPc(); @@ -680,6 +679,26 @@ extern "C" void isStartCheck__16daStartAndGoal_cFv(); // /* ############################################################################################## */ +/* 80A06764-80A06764 000114 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80A06764 = ""; +SECTION_DEAD static char const* const stringBase_80A06765 = "BOAT_RACE"; +SECTION_DEAD static char const* const stringBase_80A0676F = "BOAT_RACE_RETURN"; +SECTION_DEAD static char const* const stringBase_80A06780 = "BEFORE_BATTLE"; +SECTION_DEAD static char const* const stringBase_80A0678E = "AFTER_BATTLE"; +SECTION_DEAD static char const* const stringBase_80A0679B = "BEFORE_BLAST"; +SECTION_DEAD static char const* const stringBase_80A067A8 = "AFTER_BLAST"; +SECTION_DEAD static char const* const stringBase_80A067B4 = "Y_MUSHI"; +SECTION_DEAD static char const* const stringBase_80A067BC = "TALK_BREAK"; +SECTION_DEAD static char const* const stringBase_80A067C7 = "Hoz"; +SECTION_DEAD static char const* const stringBase_80A067CB = "Hoz_TW"; +SECTION_DEAD static char const* const stringBase_80A067D2 = "Hoz1"; +SECTION_DEAD static char const* const stringBase_80A067D7 = "Hoz2"; +SECTION_DEAD static char const* const stringBase_80A067DC = "Hoz3"; +SECTION_DEAD static char const* const stringBase_80A067E1 = "Hoz2_3"; +#pragma pop + /* 80A06804-80A06810 000000 000C+00 3/3 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -1381,7 +1400,7 @@ SECTION_RODATA u8 const daNpc_Hoz_Param_c::m[144] = { 0xC1, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC1, 0xA0, 0x00, 0x00, 0x41, 0xA0, 0x00, 0x00, 0x42, 0x20, 0x00, 0x00, 0x41, 0xA0, 0x00, 0x00, 0x42, 0xDC, 0x00, 0x00, 0x44, 0x16, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A06650, &daNpc_Hoz_Param_c::m); +COMPILER_STRIP_GATE(0x80A06650, &daNpc_Hoz_Param_c::m); /* 80A066E0-80A066FC 000090 001C+00 0/1 0/0 0/0 .rodata heapSize$4117 */ #pragma push @@ -1390,35 +1409,35 @@ SECTION_RODATA static u8 const heapSize[28] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x70, 0x00, 0x00, 0x3F, 0x70, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x3E, 0xC0, 0x00, 0x00, 0x3F, 0x70, 0x00, 0x00, 0x3E, 0xB0, }; -COMPILER_STRIP_GATE(80A066E0, &heapSize); +COMPILER_STRIP_GATE(0x80A066E0, &heapSize); #pragma pop /* 80A066FC-80A06700 0000AC 0004+00 0/1 0/0 0/0 .rodata @4176 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4176 = -300.0f; -COMPILER_STRIP_GATE(80A066FC, &lit_4176); +COMPILER_STRIP_GATE(0x80A066FC, &lit_4176); #pragma pop /* 80A06700-80A06704 0000B0 0004+00 0/1 0/0 0/0 .rodata @4177 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4177 = -50.0f; -COMPILER_STRIP_GATE(80A06700, &lit_4177); +COMPILER_STRIP_GATE(0x80A06700, &lit_4177); #pragma pop /* 80A06704-80A06708 0000B4 0004+00 0/1 0/0 0/0 .rodata @4178 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4178 = 300.0f; -COMPILER_STRIP_GATE(80A06704, &lit_4178); +COMPILER_STRIP_GATE(0x80A06704, &lit_4178); #pragma pop /* 80A06708-80A0670C 0000B8 0004+00 0/1 0/0 0/0 .rodata @4179 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4179 = 450.0f; -COMPILER_STRIP_GATE(80A06708, &lit_4179); +COMPILER_STRIP_GATE(0x80A06708, &lit_4179); #pragma pop /* 80A01658-80A01904 000238 02AC+00 1/1 0/0 0/0 .text create__11daNpc_Hoz_cFv */ @@ -1439,25 +1458,25 @@ SECTION_RODATA static u8 const lit_4337[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A0670C, &lit_4337); +COMPILER_STRIP_GATE(0x80A0670C, &lit_4337); /* 80A06710-80A06714 0000C0 0004+00 0/2 0/0 0/0 .rodata @4338 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4338 = 65536.0f; -COMPILER_STRIP_GATE(80A06710, &lit_4338); +COMPILER_STRIP_GATE(0x80A06710, &lit_4338); #pragma pop /* 80A06714-80A06718 0000C4 0004+00 0/3 0/0 0/0 .rodata @4339 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4339 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(80A06714, &lit_4339); +COMPILER_STRIP_GATE(0x80A06714, &lit_4339); #pragma pop /* 80A06718-80A0671C 0000C8 0004+00 2/4 0/0 0/0 .rodata @4486 */ SECTION_RODATA static f32 const lit_4486 = 1.0f; -COMPILER_STRIP_GATE(80A06718, &lit_4486); +COMPILER_STRIP_GATE(0x80A06718, &lit_4486); /* 80A01904-80A01B98 0004E4 0294+00 1/1 0/0 0/0 .text CreateHeap__11daNpc_Hoz_cFv */ #pragma push @@ -1592,7 +1611,7 @@ asm void daNpc_Hoz_c::Execute() { /* ############################################################################################## */ /* 80A0671C-80A06720 0000CC 0004+00 1/1 0/0 0/0 .rodata @4536 */ SECTION_RODATA static f32 const lit_4536 = 100.0f; -COMPILER_STRIP_GATE(80A0671C, &lit_4536); +COMPILER_STRIP_GATE(0x80A0671C, &lit_4536); /* 80A01DA8-80A01E44 000988 009C+00 1/1 0/0 0/0 .text Draw__11daNpc_Hoz_cFv */ #pragma push @@ -1755,7 +1774,13 @@ asm void daNpc_Hoz_c::evtCutProc() { /* ############################################################################################## */ /* 80A06720-80A06724 0000D0 0004+00 7/9 0/0 0/0 .rodata @4832 */ SECTION_RODATA static f32 const lit_4832 = -1.0f; -COMPILER_STRIP_GATE(80A06720, &lit_4832); +COMPILER_STRIP_GATE(0x80A06720, &lit_4832); + +/* 80A06764-80A06764 000114 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80A067E8 = "DEFAULT_GETITEM"; +#pragma pop /* 80A026D4-80A02918 0012B4 0244+00 1/0 0/0 0/0 .text evtProc__11daNpc_Hoz_cFv */ #pragma push @@ -1792,7 +1817,7 @@ asm void daNpc_Hoz_c::beforeMove() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4920 = -30.0f; -COMPILER_STRIP_GATE(80A06724, &lit_4920); +COMPILER_STRIP_GATE(0x80A06724, &lit_4920); #pragma pop /* 80A06728-80A06730 0000D8 0004+04 0/1 0/0 0/0 .rodata @4921 */ @@ -1803,14 +1828,14 @@ SECTION_RODATA static u32 const lit_4921[1 + 1 /* padding */] = { /* padding */ 0x00000000, }; -COMPILER_STRIP_GATE(80A06728, &lit_4921); +COMPILER_STRIP_GATE(0x80A06728, &lit_4921); #pragma pop /* 80A06730-80A06738 0000E0 0008+00 1/3 0/0 0/0 .rodata @4923 */ SECTION_RODATA static u8 const lit_4923[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A06730, &lit_4923); +COMPILER_STRIP_GATE(0x80A06730, &lit_4923); /* 80A02A18-80A02C50 0015F8 0238+00 1/0 0/0 0/0 .text setAttnPos__11daNpc_Hoz_cFv */ #pragma push @@ -1829,7 +1854,7 @@ asm void daNpc_Hoz_c::setAttnPos() { SECTION_RODATA static u8 const lit_4981[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A06738, &lit_4981); +COMPILER_STRIP_GATE(0x80A06738, &lit_4981); #pragma pop /* 80A06740-80A06748 0000F0 0008+00 0/2 0/0 0/0 .rodata @4982 */ @@ -1838,7 +1863,7 @@ COMPILER_STRIP_GATE(80A06738, &lit_4981); SECTION_RODATA static u8 const lit_4982[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A06740, &lit_4982); +COMPILER_STRIP_GATE(0x80A06740, &lit_4982); #pragma pop /* 80A06748-80A06750 0000F8 0008+00 0/2 0/0 0/0 .rodata @4983 */ @@ -1847,21 +1872,21 @@ COMPILER_STRIP_GATE(80A06740, &lit_4982); SECTION_RODATA static u8 const lit_4983[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A06748, &lit_4983); +COMPILER_STRIP_GATE(0x80A06748, &lit_4983); #pragma pop /* 80A06750-80A06754 000100 0004+00 0/1 0/0 0/0 .rodata @5031 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5031 = -15.0f; -COMPILER_STRIP_GATE(80A06750, &lit_5031); +COMPILER_STRIP_GATE(0x80A06750, &lit_5031); #pragma pop /* 80A06754-80A06758 000104 0004+00 0/1 0/0 0/0 .rodata @5032 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5032 = 30.0f; -COMPILER_STRIP_GATE(80A06754, &lit_5032); +COMPILER_STRIP_GATE(0x80A06754, &lit_5032); #pragma pop /* 80A02C50-80A02DD4 001830 0184+00 1/0 0/0 0/0 .text setCollision__11daNpc_Hoz_cFv */ @@ -1904,7 +1929,7 @@ asm void daNpc_Hoz_c::selectAction() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpc_Hoz_c::chkAction(int (daNpc_Hoz_c::*)(void*)) { +asm void daNpc_Hoz_c::chkAction(int (daNpc_Hoz_c::*param_0)(void*)) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_hoz/d_a_npc_hoz/chkAction__11daNpc_Hoz_cFM11daNpc_Hoz_cFPCvPvPv_i.s" } @@ -1915,7 +1940,7 @@ asm void daNpc_Hoz_c::chkAction(int (daNpc_Hoz_c::*)(void*)) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpc_Hoz_c::setAction(int (daNpc_Hoz_c::*)(void*)) { +asm void daNpc_Hoz_c::setAction(int (daNpc_Hoz_c::*param_0)(void*)) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_hoz/d_a_npc_hoz/setAction__11daNpc_Hoz_cFM11daNpc_Hoz_cFPCvPvPv_i.s" } @@ -1951,6 +1976,13 @@ asm void daNpc_Hoz_c::waitTwilightBattle(void* param_0) { } #pragma pop +/* ############################################################################################## */ +/* 80A06764-80A06764 000114 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80A067F8 = "F_SP112"; +#pragma pop + /* 80A037E4-80A03BDC 0023C4 03F8+00 1/0 0/0 0/0 .text waitBoat__11daNpc_Hoz_cFPv */ #pragma push #pragma optimization_level 0 @@ -2006,21 +2038,27 @@ asm void daNpc_Hoz_c::talk(void* param_0) { #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_5865 = 0xC59EDE14; -COMPILER_STRIP_GATE(80A06758, &lit_5865); +COMPILER_STRIP_GATE(0x80A06758, &lit_5865); #pragma pop /* 80A0675C-80A06760 00010C 0004+00 0/1 0/0 0/0 .rodata @5866 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5866 = 17082.0f; -COMPILER_STRIP_GATE(80A0675C, &lit_5866); +COMPILER_STRIP_GATE(0x80A0675C, &lit_5866); #pragma pop /* 80A06760-80A06764 000110 0004+00 0/1 0/0 0/0 .rodata @5867 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5867 = -89740.0f; -COMPILER_STRIP_GATE(80A06760, &lit_5867); +COMPILER_STRIP_GATE(0x80A06760, &lit_5867); +#pragma pop + +/* 80A06764-80A06764 000114 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80A06800 = "prm"; #pragma pop /* 80A0487C-80A04BE4 00345C 0368+00 1/0 0/0 0/0 .text ECut_boatRace__11daNpc_Hoz_cFi */ @@ -2447,7 +2485,7 @@ void daNpcT_c::changeBtk(int* param_0, int* param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80A063B4(int* param_0) { +extern "C" asm void func_80A063B4(void* _this, int* param_0) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_hoz/d_a_npc_hoz/func_80A063B4.s" } @@ -2479,7 +2517,7 @@ asm void __sinit_d_a_npc_hoz_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80A063D0 = (void*)__sinit_d_a_npc_hoz_cpp; +REGISTER_CTORS(0x80A063D0, __sinit_d_a_npc_hoz_cpp); #pragma pop /* 80A064E4-80A065A4 0050C4 00C0+00 1/1 0/0 0/0 .text @@ -2571,26 +2609,4 @@ static asm void func_80A06634() { } #pragma pop -/* 80A06764-80A06804 000114 00A0+00 13/10 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80A06764 = ""; -SECTION_DEAD static char const* const stringBase_80A06765 = "BOAT_RACE"; -SECTION_DEAD static char const* const stringBase_80A0676F = "BOAT_RACE_RETURN"; -SECTION_DEAD static char const* const stringBase_80A06780 = "BEFORE_BATTLE"; -SECTION_DEAD static char const* const stringBase_80A0678E = "AFTER_BATTLE"; -SECTION_DEAD static char const* const stringBase_80A0679B = "BEFORE_BLAST"; -SECTION_DEAD static char const* const stringBase_80A067A8 = "AFTER_BLAST"; -SECTION_DEAD static char const* const stringBase_80A067B4 = "Y_MUSHI"; -SECTION_DEAD static char const* const stringBase_80A067BC = "TALK_BREAK"; -SECTION_DEAD static char const* const stringBase_80A067C7 = "Hoz"; -SECTION_DEAD static char const* const stringBase_80A067CB = "Hoz_TW"; -SECTION_DEAD static char const* const stringBase_80A067D2 = "Hoz1"; -SECTION_DEAD static char const* const stringBase_80A067D7 = "Hoz2"; -SECTION_DEAD static char const* const stringBase_80A067DC = "Hoz3"; -SECTION_DEAD static char const* const stringBase_80A067E1 = "Hoz2_3"; -SECTION_DEAD static char const* const stringBase_80A067E8 = "DEFAULT_GETITEM"; -SECTION_DEAD static char const* const stringBase_80A067F8 = "F_SP112"; -SECTION_DEAD static char const* const stringBase_80A06800 = "prm"; -#pragma pop +/* 80A06764-80A06764 000114 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/npc/d_a_npc_impal/d_a_npc_impal.cpp b/rel/d/a/npc/d_a_npc_impal/d_a_npc_impal.cpp index 854c9973813..d23af29d5c3 100644 --- a/rel/d/a/npc/d_a_npc_impal/d_a_npc_impal.cpp +++ b/rel/d/a/npc/d_a_npc_impal/d_a_npc_impal.cpp @@ -33,12 +33,12 @@ struct mDoExt_bckAnm { /* 8000D990 */ void changeBckOnly(J3DAnmTransform*); }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; +struct J3DModelData {}; + struct Z2Creature { /* 802C03C8 */ Z2Creature(); /* 802C0420 */ ~Z2Creature(); @@ -64,10 +64,10 @@ struct fopAcM_gc_c { static f32 mGroundY; }; -struct J3DJoint {}; - struct J3DModel {}; +struct J3DJoint {}; + struct daNpcImpal_c { /* 80A079EC */ daNpcImpal_c(); /* 80A07C00 */ ~daNpcImpal_c(); @@ -108,16 +108,16 @@ struct daNpcImpal_Param_c { static u8 const m[112]; }; -struct J3DAnmTextureSRTKey {}; - -struct _GXColorS10 {}; - struct J3DAnmTexPattern { /* 8032AF50 */ void getTexNo(u16, u16*) const; }; +struct J3DAnmTextureSRTKey {}; + struct J3DAnmTransformKey {}; +struct _GXColorS10 {}; + struct daNpcF_c { struct daNpcF_anmPlayData {}; @@ -205,7 +205,6 @@ struct dMsgFlow_c { struct dEvt_control_c { /* 80042468 */ void reset(); /* 80042518 */ void reset(void*); - /* 800436EC */ void setPtI_Id(unsigned int); }; struct dEvent_manager_c { @@ -323,7 +322,7 @@ struct JMath { struct TSinCosTable {}; /* TSinCosTable<13, f32> */ struct TSinCosTable__template0 { - /* 80A0B954 */ void func_80A0B954(s16) /* const */; + /* 80A0B954 */ void func_80A0B954(void* _this, s16) /* const */; }; static u8 sincosTable_[65536]; @@ -420,7 +419,7 @@ extern "C" void ctrlBtk__12daNpcImpal_cFv(); extern "C" void setAttnPos__12daNpcImpal_cFv(); extern "C" void lookat__12daNpcImpal_cFv(); extern "C" bool drawDbgInfo__12daNpcImpal_cFv(); -extern "C" void func_80A0B954(s16); +extern "C" void func_80A0B954(void* _this, s16); extern "C" void __sinit_d_a_npc_impal_cpp(); extern "C" void __dt__18daNpcF_ActorMngr_cFv(); extern "C" void __ct__18daNpcF_ActorMngr_cFv(); @@ -609,6 +608,15 @@ extern "C" void __register_global_object(); // /* ############################################################################################## */ +/* 80A0C4C8-80A0C4C8 000258 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80A0C4C8 = "impal"; +SECTION_DEAD static char const* const stringBase_80A0C4CE = "IMPAL_APPEAR1"; +SECTION_DEAD static char const* const stringBase_80A0C4DC = "IMPAL_APPEAR2"; +SECTION_DEAD static char const* const stringBase_80A0C4EA = "IMPAL_COPYROD"; +#pragma pop + /* 80A0C524-80A0C530 000000 000C+00 4/4 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -978,34 +986,41 @@ SECTION_RODATA u8 const daNpcImpal_Param_c::m[112] = { 0x42, 0xA0, 0x00, 0x00, 0x43, 0xFA, 0x00, 0x00, 0x43, 0x96, 0x00, 0x00, 0xC3, 0x96, 0x00, 0x00, 0x00, 0x3C, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x43, 0x96, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A0C270, &daNpcImpal_Param_c::m); +COMPILER_STRIP_GATE(0x80A0C270, &daNpcImpal_Param_c::m); /* 80A0C2E0-80A0C2E4 000070 0004+00 0/1 0/0 0/0 .rodata @4196 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4196 = -160.0f; -COMPILER_STRIP_GATE(80A0C2E0, &lit_4196); +COMPILER_STRIP_GATE(0x80A0C2E0, &lit_4196); #pragma pop /* 80A0C2E4-80A0C2E8 000074 0004+00 0/1 0/0 0/0 .rodata @4197 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4197 = -50.0f; -COMPILER_STRIP_GATE(80A0C2E4, &lit_4197); +COMPILER_STRIP_GATE(0x80A0C2E4, &lit_4197); #pragma pop /* 80A0C2E8-80A0C2EC 000078 0004+00 0/1 0/0 0/0 .rodata @4198 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4198 = 160.0f; -COMPILER_STRIP_GATE(80A0C2E8, &lit_4198); +COMPILER_STRIP_GATE(0x80A0C2E8, &lit_4198); #pragma pop /* 80A0C2EC-80A0C2F0 00007C 0004+00 0/1 0/0 0/0 .rodata @4199 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4199 = 220.0f; -COMPILER_STRIP_GATE(80A0C2EC, &lit_4199); +COMPILER_STRIP_GATE(0x80A0C2EC, &lit_4199); +#pragma pop + +/* 80A0C4C8-80A0C4C8 000258 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80A0C4F8 = "F_SP128"; +SECTION_DEAD static char const* const stringBase_80A0C500 = "R_SP128"; #pragma pop /* 80A07DC4-80A080F8 0004C4 0334+00 1/1 0/0 0/0 .text Create__12daNpcImpal_cFv */ @@ -1021,7 +1036,7 @@ asm void daNpcImpal_c::Create() { /* ############################################################################################## */ /* 80A0C2F0-80A0C2F4 000080 0004+00 4/4 0/0 0/0 .rodata @4248 */ SECTION_RODATA static f32 const lit_4248 = 1.0f; -COMPILER_STRIP_GATE(80A0C2F0, &lit_4248); +COMPILER_STRIP_GATE(0x80A0C2F0, &lit_4248); /* 80A0C2F4-80A0C2F8 000084 0004+00 2/8 0/0 0/0 .rodata @4249 */ SECTION_RODATA static u8 const lit_4249[4] = { @@ -1030,7 +1045,7 @@ SECTION_RODATA static u8 const lit_4249[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A0C2F4, &lit_4249); +COMPILER_STRIP_GATE(0x80A0C2F4, &lit_4249); /* 80A080F8-80A08368 0007F8 0270+00 1/1 0/0 0/0 .text CreateHeap__12daNpcImpal_cFv */ #pragma push @@ -1177,7 +1192,7 @@ asm void daNpcImpal_c::Draw() { SECTION_RODATA static u8 const lit_4299[12] = { 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x04, }; -COMPILER_STRIP_GATE(80A0C2F8, &lit_4299); +COMPILER_STRIP_GATE(0x80A0C2F8, &lit_4299); /* 80A085EC-80A087BC 000CEC 01D0+00 1/1 0/0 0/0 .text * ctrlJoint__12daNpcImpal_cFP8J3DJointP8J3DModel */ @@ -1259,7 +1274,7 @@ asm void daNpcImpal_c::reset() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpcImpal_c::setAction(bool (daNpcImpal_c::*)(void*)) { +asm void daNpcImpal_c::setAction(bool (daNpcImpal_c::*param_0)(void*)) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_impal/d_a_npc_impal/setAction__12daNpcImpal_cFM12daNpcImpal_cFPCvPvPv_b.s" } @@ -1272,7 +1287,7 @@ asm void daNpcImpal_c::setAction(bool (daNpcImpal_c::*)(void*)) { SECTION_RODATA static u8 const lit_4538[12] = { 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80A0C304, &lit_4538); +COMPILER_STRIP_GATE(0x80A0C304, &lit_4538); #pragma pop /* 80A0C310-80A0C314 0000A0 0004+00 0/1 0/0 0/0 .rodata @4539 */ @@ -1284,7 +1299,7 @@ SECTION_RODATA static u8 const lit_4539[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A0C310, &lit_4539); +COMPILER_STRIP_GATE(0x80A0C310, &lit_4539); #pragma pop /* 80A0C314-80A0C320 0000A4 000C+00 0/1 0/0 0/0 .rodata @4540 */ @@ -1293,7 +1308,7 @@ COMPILER_STRIP_GATE(80A0C310, &lit_4539); SECTION_RODATA static u8 const lit_4540[12] = { 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80A0C314, &lit_4540); +COMPILER_STRIP_GATE(0x80A0C314, &lit_4540); #pragma pop /* 80A0C320-80A0C324 0000B0 0004+00 0/1 0/0 0/0 .rodata @4541 */ @@ -1305,7 +1320,7 @@ SECTION_RODATA static u8 const lit_4541[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A0C320, &lit_4541); +COMPILER_STRIP_GATE(0x80A0C320, &lit_4541); #pragma pop /* 80A0C324-80A0C330 0000B4 000C+00 0/1 0/0 0/0 .rodata @4542 */ @@ -1314,7 +1329,7 @@ COMPILER_STRIP_GATE(80A0C320, &lit_4541); SECTION_RODATA static u8 const lit_4542[12] = { 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80A0C324, &lit_4542); +COMPILER_STRIP_GATE(0x80A0C324, &lit_4542); #pragma pop /* 80A0C330-80A0C334 0000C0 0004+00 0/1 0/0 0/0 .rodata @4543 */ @@ -1326,7 +1341,7 @@ SECTION_RODATA static u8 const lit_4543[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A0C330, &lit_4543); +COMPILER_STRIP_GATE(0x80A0C330, &lit_4543); #pragma pop /* 80A0C334-80A0C340 0000C4 000C+00 0/1 0/0 0/0 .rodata @4544 */ @@ -1335,7 +1350,7 @@ COMPILER_STRIP_GATE(80A0C330, &lit_4543); SECTION_RODATA static u8 const lit_4544[12] = { 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80A0C334, &lit_4544); +COMPILER_STRIP_GATE(0x80A0C334, &lit_4544); #pragma pop /* 80A0C340-80A0C344 0000D0 0004+00 0/1 0/0 0/0 .rodata @4545 */ @@ -1347,7 +1362,7 @@ SECTION_RODATA static u8 const lit_4545[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A0C340, &lit_4545); +COMPILER_STRIP_GATE(0x80A0C340, &lit_4545); #pragma pop /* 80A0C344-80A0C350 0000D4 000C+00 0/1 0/0 0/0 .rodata @4546 */ @@ -1356,7 +1371,7 @@ COMPILER_STRIP_GATE(80A0C340, &lit_4545); SECTION_RODATA static u8 const lit_4546[12] = { 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A0C344, &lit_4546); +COMPILER_STRIP_GATE(0x80A0C344, &lit_4546); #pragma pop /* 80A0C350-80A0C354 0000E0 0004+00 0/1 0/0 0/0 .rodata @4547 */ @@ -1368,7 +1383,7 @@ SECTION_RODATA static u8 const lit_4547[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A0C350, &lit_4547); +COMPILER_STRIP_GATE(0x80A0C350, &lit_4547); #pragma pop /* 80A0C354-80A0C360 0000E4 000C+00 0/1 0/0 0/0 .rodata @4548 */ @@ -1377,7 +1392,7 @@ COMPILER_STRIP_GATE(80A0C350, &lit_4547); SECTION_RODATA static u8 const lit_4548[12] = { 0x00, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A0C354, &lit_4548); +COMPILER_STRIP_GATE(0x80A0C354, &lit_4548); #pragma pop /* 80A0C360-80A0C364 0000F0 0004+00 0/1 0/0 0/0 .rodata @4549 */ @@ -1389,7 +1404,7 @@ SECTION_RODATA static u8 const lit_4549[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A0C360, &lit_4549); +COMPILER_STRIP_GATE(0x80A0C360, &lit_4549); #pragma pop /* 80A0C364-80A0C370 0000F4 000C+00 0/1 0/0 0/0 .rodata @4550 */ @@ -1398,7 +1413,7 @@ COMPILER_STRIP_GATE(80A0C360, &lit_4549); SECTION_RODATA static u8 const lit_4550[12] = { 0x00, 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A0C364, &lit_4550); +COMPILER_STRIP_GATE(0x80A0C364, &lit_4550); #pragma pop /* 80A0C370-80A0C374 000100 0004+00 0/1 0/0 0/0 .rodata @4551 */ @@ -1410,7 +1425,7 @@ SECTION_RODATA static u8 const lit_4551[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A0C370, &lit_4551); +COMPILER_STRIP_GATE(0x80A0C370, &lit_4551); #pragma pop /* 80A0C374-80A0C380 000104 000C+00 0/1 0/0 0/0 .rodata @4552 */ @@ -1419,7 +1434,7 @@ COMPILER_STRIP_GATE(80A0C370, &lit_4551); SECTION_RODATA static u8 const lit_4552[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A0C374, &lit_4552); +COMPILER_STRIP_GATE(0x80A0C374, &lit_4552); #pragma pop /* 80A0C380-80A0C384 000110 0004+00 0/1 0/0 0/0 .rodata @4553 */ @@ -1431,7 +1446,7 @@ SECTION_RODATA static u8 const lit_4553[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A0C380, &lit_4553); +COMPILER_STRIP_GATE(0x80A0C380, &lit_4553); #pragma pop /* 80A0C384-80A0C3A4 000114 0020+00 0/0 0/0 0/0 .rodata @4554 */ @@ -1441,7 +1456,7 @@ SECTION_RODATA static u8 const lit_4554[32] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A0C384, &lit_4554); +COMPILER_STRIP_GATE(0x80A0C384, &lit_4554); #pragma pop /* 80A0C3A4-80A0C3B0 000134 000C+00 0/1 0/0 0/0 .rodata @4558 */ @@ -1450,7 +1465,7 @@ COMPILER_STRIP_GATE(80A0C384, &lit_4554); SECTION_RODATA static u8 const lit_4558[12] = { 0x00, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A0C3A4, &lit_4558); +COMPILER_STRIP_GATE(0x80A0C3A4, &lit_4558); #pragma pop /* 80A0C3B0-80A0C3B4 000140 0004+00 0/1 0/0 0/0 .rodata @4559 */ @@ -1462,7 +1477,7 @@ SECTION_RODATA static u8 const lit_4559[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A0C3B0, &lit_4559); +COMPILER_STRIP_GATE(0x80A0C3B0, &lit_4559); #pragma pop /* 80A0C3B4-80A0C3C0 000144 000C+00 0/1 0/0 0/0 .rodata @4560 */ @@ -1471,7 +1486,7 @@ COMPILER_STRIP_GATE(80A0C3B0, &lit_4559); SECTION_RODATA static u8 const lit_4560[12] = { 0x00, 0x0D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80A0C3B4, &lit_4560); +COMPILER_STRIP_GATE(0x80A0C3B4, &lit_4560); #pragma pop /* 80A0C3C0-80A0C3CC 000150 000C+00 0/1 0/0 0/0 .rodata @4561 */ @@ -1480,7 +1495,7 @@ COMPILER_STRIP_GATE(80A0C3B4, &lit_4560); SECTION_RODATA static u8 const lit_4561[12] = { 0x00, 0x0B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A0C3C0, &lit_4561); +COMPILER_STRIP_GATE(0x80A0C3C0, &lit_4561); #pragma pop /* 80A0C3CC-80A0C3D4 00015C 0008+00 0/1 0/0 0/0 .rodata @4562 */ @@ -1489,7 +1504,7 @@ COMPILER_STRIP_GATE(80A0C3C0, &lit_4561); SECTION_RODATA static u8 const lit_4562[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A0C3CC, &lit_4562); +COMPILER_STRIP_GATE(0x80A0C3CC, &lit_4562); #pragma pop /* 80A0C3D4-80A0C3E0 000164 000C+00 0/1 0/0 0/0 .rodata @4563 */ @@ -1498,7 +1513,7 @@ COMPILER_STRIP_GATE(80A0C3CC, &lit_4562); SECTION_RODATA static u8 const lit_4563[12] = { 0x00, 0x0B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A0C3D4, &lit_4563); +COMPILER_STRIP_GATE(0x80A0C3D4, &lit_4563); #pragma pop /* 80A0C3E0-80A0C3E4 000170 0004+00 0/1 0/0 0/0 .rodata @4564 */ @@ -1510,7 +1525,7 @@ SECTION_RODATA static u8 const lit_4564[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A0C3E0, &lit_4564); +COMPILER_STRIP_GATE(0x80A0C3E0, &lit_4564); #pragma pop /* 80A0C3E4-80A0C3F0 000174 000C+00 0/1 0/0 0/0 .rodata @4565 */ @@ -1519,7 +1534,7 @@ COMPILER_STRIP_GATE(80A0C3E0, &lit_4564); SECTION_RODATA static u8 const lit_4565[12] = { 0x00, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A0C3E4, &lit_4565); +COMPILER_STRIP_GATE(0x80A0C3E4, &lit_4565); #pragma pop /* 80A0C3F0-80A0C3F4 000180 0004+00 0/1 0/0 0/0 .rodata @4566 */ @@ -1531,7 +1546,7 @@ SECTION_RODATA static u8 const lit_4566[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A0C3F0, &lit_4566); +COMPILER_STRIP_GATE(0x80A0C3F0, &lit_4566); #pragma pop /* 80A0C3F4-80A0C400 000184 000C+00 0/1 0/0 0/0 .rodata @4567 */ @@ -1540,7 +1555,7 @@ COMPILER_STRIP_GATE(80A0C3F0, &lit_4566); SECTION_RODATA static u8 const lit_4567[12] = { 0x00, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80A0C3F4, &lit_4567); +COMPILER_STRIP_GATE(0x80A0C3F4, &lit_4567); #pragma pop /* 80A0C400-80A0C40C 000190 000C+00 0/1 0/0 0/0 .rodata @4568 */ @@ -1549,7 +1564,7 @@ COMPILER_STRIP_GATE(80A0C3F4, &lit_4567); SECTION_RODATA static u8 const lit_4568[12] = { 0x00, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A0C400, &lit_4568); +COMPILER_STRIP_GATE(0x80A0C400, &lit_4568); #pragma pop /* 80A0C40C-80A0C414 00019C 0008+00 0/1 0/0 0/0 .rodata @4569 */ @@ -1558,7 +1573,7 @@ COMPILER_STRIP_GATE(80A0C400, &lit_4568); SECTION_RODATA static u8 const lit_4569[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A0C40C, &lit_4569); +COMPILER_STRIP_GATE(0x80A0C40C, &lit_4569); #pragma pop /* 80A0C414-80A0C420 0001A4 000C+00 0/1 0/0 0/0 .rodata @4570 */ @@ -1567,7 +1582,7 @@ COMPILER_STRIP_GATE(80A0C40C, &lit_4569); SECTION_RODATA static u8 const lit_4570[12] = { 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80A0C414, &lit_4570); +COMPILER_STRIP_GATE(0x80A0C414, &lit_4570); #pragma pop /* 80A0C420-80A0C42C 0001B0 000C+00 0/1 0/0 0/0 .rodata @4571 */ @@ -1576,7 +1591,7 @@ COMPILER_STRIP_GATE(80A0C414, &lit_4570); SECTION_RODATA static u8 const lit_4571[12] = { 0x00, 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A0C420, &lit_4571); +COMPILER_STRIP_GATE(0x80A0C420, &lit_4571); #pragma pop /* 80A0C42C-80A0C434 0001BC 0008+00 0/1 0/0 0/0 .rodata @4572 */ @@ -1585,7 +1600,7 @@ COMPILER_STRIP_GATE(80A0C420, &lit_4571); SECTION_RODATA static u8 const lit_4572[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A0C42C, &lit_4572); +COMPILER_STRIP_GATE(0x80A0C42C, &lit_4572); #pragma pop /* 80A0C434-80A0C440 0001C4 000C+00 0/1 0/0 0/0 .rodata @4573 */ @@ -1594,7 +1609,7 @@ COMPILER_STRIP_GATE(80A0C42C, &lit_4572); SECTION_RODATA static u8 const lit_4573[12] = { 0x00, 0x0F, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A0C434, &lit_4573); +COMPILER_STRIP_GATE(0x80A0C434, &lit_4573); #pragma pop /* 80A0C440-80A0C444 0001D0 0004+00 0/1 0/0 0/0 .rodata @4574 */ @@ -1606,7 +1621,7 @@ SECTION_RODATA static u8 const lit_4574[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A0C440, &lit_4574); +COMPILER_STRIP_GATE(0x80A0C440, &lit_4574); #pragma pop /* 80A0C444-80A0C460 0001D4 001C+00 0/0 0/0 0/0 .rodata @4575 */ @@ -1616,7 +1631,7 @@ SECTION_RODATA static u8 const lit_4575[28] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A0C444, &lit_4575); +COMPILER_STRIP_GATE(0x80A0C444, &lit_4575); #pragma pop /* 80A0C460-80A0C470 0001F0 000C+04 0/1 0/0 0/0 .rodata @4589 */ @@ -1641,7 +1656,7 @@ SECTION_RODATA static u8 const lit_4589[12 + 4 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A0C460, &lit_4589); +COMPILER_STRIP_GATE(0x80A0C460, &lit_4589); #pragma pop /* 80A0C470-80A0C478 000200 0008+00 0/3 0/0 0/0 .rodata @4678 */ @@ -1650,7 +1665,7 @@ COMPILER_STRIP_GATE(80A0C460, &lit_4589); SECTION_RODATA static u8 const lit_4678[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A0C470, &lit_4678); +COMPILER_STRIP_GATE(0x80A0C470, &lit_4678); #pragma pop /* 80A0C478-80A0C480 000208 0008+00 0/3 0/0 0/0 .rodata @4679 */ @@ -1659,7 +1674,7 @@ COMPILER_STRIP_GATE(80A0C470, &lit_4678); SECTION_RODATA static u8 const lit_4679[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A0C478, &lit_4679); +COMPILER_STRIP_GATE(0x80A0C478, &lit_4679); #pragma pop /* 80A0C480-80A0C488 000210 0008+00 0/3 0/0 0/0 .rodata @4680 */ @@ -1668,14 +1683,14 @@ COMPILER_STRIP_GATE(80A0C478, &lit_4679); SECTION_RODATA static u8 const lit_4680[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A0C480, &lit_4680); +COMPILER_STRIP_GATE(0x80A0C480, &lit_4680); #pragma pop /* 80A0C488-80A0C48C 000218 0004+00 0/1 0/0 0/0 .rodata @4681 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4681 = 1000.0f; -COMPILER_STRIP_GATE(80A0C488, &lit_4681); +COMPILER_STRIP_GATE(0x80A0C488, &lit_4681); #pragma pop /* 80A08F60-80A090E8 001660 0188+00 1/1 0/0 0/0 .text s_sub1__FPvPv */ @@ -1691,20 +1706,20 @@ static asm void s_sub1(void* param_0, void* param_1) { /* ############################################################################################## */ /* 80A0C48C-80A0C490 00021C 0004+00 3/7 0/0 0/0 .rodata @4889 */ SECTION_RODATA static f32 const lit_4889 = -1.0f; -COMPILER_STRIP_GATE(80A0C48C, &lit_4889); +COMPILER_STRIP_GATE(0x80A0C48C, &lit_4889); /* 80A0C490-80A0C494 000220 0004+00 0/2 0/0 0/0 .rodata @4890 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4890 = 0x3BB40000; -COMPILER_STRIP_GATE(80A0C490, &lit_4890); +COMPILER_STRIP_GATE(0x80A0C490, &lit_4890); #pragma pop /* 80A0C494-80A0C498 000224 0004+00 0/2 0/0 0/0 .rodata @4891 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4891 = 15.0f; -COMPILER_STRIP_GATE(80A0C494, &lit_4891); +COMPILER_STRIP_GATE(0x80A0C494, &lit_4891); #pragma pop /* 80A0C498-80A0C4A0 000228 0008+00 0/2 0/0 0/0 .rodata @4893 */ @@ -1713,7 +1728,13 @@ COMPILER_STRIP_GATE(80A0C494, &lit_4891); SECTION_RODATA static u8 const lit_4893[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A0C498, &lit_4893); +COMPILER_STRIP_GATE(0x80A0C498, &lit_4893); +#pragma pop + +/* 80A0C4C8-80A0C4C8 000258 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80A0C508 = "NO_RESPONSE"; #pragma pop /* 80A090E8-80A099B4 0017E8 08CC+00 4/0 0/0 0/0 .text wait__12daNpcImpal_cFPv */ @@ -1746,6 +1767,13 @@ asm void daNpcImpal_c::setExpression(int param_0, f32 param_1) { } #pragma pop +/* ############################################################################################## */ +/* 80A0C4C8-80A0C4C8 000258 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80A0C514 = "DEFAULT_GETITEM"; +#pragma pop + /* 80A09A24-80A09F4C 002124 0528+00 2/0 0/0 0/0 .text talk__12daNpcImpal_cFPv */ #pragma push #pragma optimization_level 0 @@ -1771,21 +1799,21 @@ asm void daNpcImpal_c::demo(void* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5095 = 2360.0f; -COMPILER_STRIP_GATE(80A0C4A0, &lit_5095); +COMPILER_STRIP_GATE(0x80A0C4A0, &lit_5095); #pragma pop /* 80A0C4A4-80A0C4A8 000234 0004+00 0/1 0/0 0/0 .rodata @5096 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_5096 = 0x42C7FC73; -COMPILER_STRIP_GATE(80A0C4A4, &lit_5096); +COMPILER_STRIP_GATE(0x80A0C4A4, &lit_5096); #pragma pop /* 80A0C4A8-80A0C4AC 000238 0004+00 0/1 0/0 0/0 .rodata @5097 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5097 = -1150.0f; -COMPILER_STRIP_GATE(80A0C4A8, &lit_5097); +COMPILER_STRIP_GATE(0x80A0C4A8, &lit_5097); #pragma pop /* 80A0A1E0-80A0A680 0028E0 04A0+00 1/0 0/0 0/0 .text EvCut_ImpalAppear1__12daNpcImpal_cFi */ @@ -1813,14 +1841,14 @@ asm void daNpcImpal_c::EvCut_ImpalAppear2(int param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5195 = 150.0f; -COMPILER_STRIP_GATE(80A0C4AC, &lit_5195); +COMPILER_STRIP_GATE(0x80A0C4AC, &lit_5195); #pragma pop /* 80A0C4B0-80A0C4B4 000240 0004+00 0/1 0/0 0/0 .rodata @5196 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5196 = 500.0f; -COMPILER_STRIP_GATE(80A0C4B0, &lit_5196); +COMPILER_STRIP_GATE(0x80A0C4B0, &lit_5196); #pragma pop /* 80A0A950-80A0AD40 003050 03F0+00 1/0 0/0 0/0 .text EvCut_CopyRod__12daNpcImpal_cFi */ @@ -1911,7 +1939,7 @@ asm void daNpcImpal_c::main() { /* ############################################################################################## */ /* 80A0C4B4-80A0C4B8 000244 0004+00 1/1 0/0 0/0 .rodata @5328 */ SECTION_RODATA static f32 const lit_5328 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(80A0C4B4, &lit_5328); +COMPILER_STRIP_GATE(0x80A0C4B4, &lit_5328); /* 80A0B380-80A0B45C 003A80 00DC+00 1/0 0/0 0/0 .text ctrlBtk__12daNpcImpal_cFv */ #pragma push @@ -1928,7 +1956,7 @@ asm void daNpcImpal_c::ctrlBtk() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5401 = 10.0f; -COMPILER_STRIP_GATE(80A0C4B8, &lit_5401); +COMPILER_STRIP_GATE(0x80A0C4B8, &lit_5401); #pragma pop /* 80A0B45C-80A0B76C 003B5C 0310+00 1/0 0/0 0/0 .text setAttnPos__12daNpcImpal_cFv */ @@ -1946,21 +1974,21 @@ asm void daNpcImpal_c::setAttnPos() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5442 = -80.0f; -COMPILER_STRIP_GATE(80A0C4BC, &lit_5442); +COMPILER_STRIP_GATE(0x80A0C4BC, &lit_5442); #pragma pop /* 80A0C4C0-80A0C4C4 000250 0004+00 0/1 0/0 0/0 .rodata @5443 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5443 = 80.0f; -COMPILER_STRIP_GATE(80A0C4C0, &lit_5443); +COMPILER_STRIP_GATE(0x80A0C4C0, &lit_5443); #pragma pop /* 80A0C4C4-80A0C4C8 000254 0004+00 0/1 0/0 0/0 .rodata @5444 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5444 = 40.0f; -COMPILER_STRIP_GATE(80A0C4C4, &lit_5444); +COMPILER_STRIP_GATE(0x80A0C4C4, &lit_5444); #pragma pop /* 80A0B76C-80A0B94C 003E6C 01E0+00 1/1 0/0 0/0 .text lookat__12daNpcImpal_cFv */ @@ -1982,7 +2010,7 @@ bool daNpcImpal_c::drawDbgInfo() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80A0B954(s16 param_0) /* const */ { +extern "C" asm void func_80A0B954(void* _this, s16 param_0) /* const */ { nofralloc #include "asm/rel/d/a/npc/d_a_npc_impal/d_a_npc_impal/func_80A0B954.s" } @@ -2014,7 +2042,7 @@ asm void __sinit_d_a_npc_impal_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80A0B960 = (void*)__sinit_d_a_npc_impal_cpp; +REGISTER_CTORS(0x80A0B960, __sinit_d_a_npc_impal_cpp); #pragma pop /* 80A0BA1C-80A0BA64 00411C 0048+00 5/4 0/0 0/0 .text __dt__18daNpcF_ActorMngr_cFv */ @@ -2192,16 +2220,4 @@ static asm void func_80A0C254() { } #pragma pop -/* 80A0C4C8-80A0C524 000258 005C+00 9/6 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80A0C4C8 = "impal"; -SECTION_DEAD static char const* const stringBase_80A0C4CE = "IMPAL_APPEAR1"; -SECTION_DEAD static char const* const stringBase_80A0C4DC = "IMPAL_APPEAR2"; -SECTION_DEAD static char const* const stringBase_80A0C4EA = "IMPAL_COPYROD"; -SECTION_DEAD static char const* const stringBase_80A0C4F8 = "F_SP128"; -SECTION_DEAD static char const* const stringBase_80A0C500 = "R_SP128"; -SECTION_DEAD static char const* const stringBase_80A0C508 = "NO_RESPONSE"; -SECTION_DEAD static char const* const stringBase_80A0C514 = "DEFAULT_GETITEM"; -#pragma pop +/* 80A0C4C8-80A0C4C8 000258 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/npc/d_a_npc_inko/d_a_npc_inko.cpp b/rel/d/a/npc/d_a_npc_inko/d_a_npc_inko.cpp index 76d7297126d..ea8231e94fd 100644 --- a/rel/d/a/npc/d_a_npc_inko/d_a_npc_inko.cpp +++ b/rel/d/a/npc/d_a_npc_inko/d_a_npc_inko.cpp @@ -27,10 +27,10 @@ struct mDoExt_McaMorfCallBack1_c {}; struct Vec {}; -struct J3DModelData {}; - struct J3DAnmTransform {}; +struct J3DModelData {}; + struct mDoExt_McaMorf { /* 8000FC4C */ mDoExt_McaMorf(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, int, @@ -210,11 +210,17 @@ SECTION_RODATA static u8 const lit_3849[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A0E014, &lit_3849); +COMPILER_STRIP_GATE(0x80A0E014, &lit_3849); /* 80A0E018-80A0E01C 000004 0004+00 1/2 0/0 0/0 .rodata @3850 */ SECTION_RODATA static f32 const lit_3850 = -1.0f; -COMPILER_STRIP_GATE(80A0E018, &lit_3850); +COMPILER_STRIP_GATE(0x80A0E018, &lit_3850); + +/* 80A0E0CC-80A0E0CC 0000B8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80A0E0CC = "Npc_inko"; +#pragma pop /* 80A0CC18-80A0CCC8 0002F8 00B0+00 1/1 0/0 0/0 .text anm_init__FP14npc_inko_classifUcf */ @@ -233,179 +239,179 @@ static asm void anm_init(npc_inko_class* param_0, int param_1, f32 param_2, u8 p #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4329 = -78.0f; -COMPILER_STRIP_GATE(80A0E01C, &lit_4329); +COMPILER_STRIP_GATE(0x80A0E01C, &lit_4329); #pragma pop /* 80A0E020-80A0E024 00000C 0004+00 0/1 0/0 0/0 .rodata @4330 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4330 = -5.0f; -COMPILER_STRIP_GATE(80A0E020, &lit_4330); +COMPILER_STRIP_GATE(0x80A0E020, &lit_4330); #pragma pop /* 80A0E024-80A0E028 000010 0004+00 0/1 0/0 0/0 .rodata @4331 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4331 = 40.0f; -COMPILER_STRIP_GATE(80A0E024, &lit_4331); +COMPILER_STRIP_GATE(0x80A0E024, &lit_4331); #pragma pop /* 80A0E028-80A0E02C 000014 0004+00 0/1 0/0 0/0 .rodata @4332 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4332 = 30.0f; -COMPILER_STRIP_GATE(80A0E028, &lit_4332); +COMPILER_STRIP_GATE(0x80A0E028, &lit_4332); #pragma pop /* 80A0E02C-80A0E030 000018 0004+00 0/1 0/0 0/0 .rodata @4333 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4333 = 70.0f; -COMPILER_STRIP_GATE(80A0E02C, &lit_4333); +COMPILER_STRIP_GATE(0x80A0E02C, &lit_4333); #pragma pop /* 80A0E030-80A0E034 00001C 0004+00 0/1 0/0 0/0 .rodata @4334 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4334 = 10.0f; -COMPILER_STRIP_GATE(80A0E030, &lit_4334); +COMPILER_STRIP_GATE(0x80A0E030, &lit_4334); #pragma pop /* 80A0E034-80A0E038 000020 0004+00 1/2 0/0 0/0 .rodata @4335 */ SECTION_RODATA static f32 const lit_4335 = 1.0f; -COMPILER_STRIP_GATE(80A0E034, &lit_4335); +COMPILER_STRIP_GATE(0x80A0E034, &lit_4335); /* 80A0E038-80A0E03C 000024 0004+00 0/1 0/0 0/0 .rodata @4336 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4336 = 1.5f; -COMPILER_STRIP_GATE(80A0E038, &lit_4336); +COMPILER_STRIP_GATE(0x80A0E038, &lit_4336); #pragma pop /* 80A0E03C-80A0E040 000028 0004+00 0/1 0/0 0/0 .rodata @4337 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4337 = 2.0f; -COMPILER_STRIP_GATE(80A0E03C, &lit_4337); +COMPILER_STRIP_GATE(0x80A0E03C, &lit_4337); #pragma pop /* 80A0E040-80A0E044 00002C 0004+00 0/1 0/0 0/0 .rodata @4338 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4338 = 1300.0f; -COMPILER_STRIP_GATE(80A0E040, &lit_4338); +COMPILER_STRIP_GATE(0x80A0E040, &lit_4338); #pragma pop /* 80A0E044-80A0E048 000030 0004+00 0/1 0/0 0/0 .rodata @4339 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4339 = 1000.0f; -COMPILER_STRIP_GATE(80A0E044, &lit_4339); +COMPILER_STRIP_GATE(0x80A0E044, &lit_4339); #pragma pop /* 80A0E048-80A0E04C 000034 0004+00 0/1 0/0 0/0 .rodata @4340 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4340 = 3.0f / 10.0f; -COMPILER_STRIP_GATE(80A0E048, &lit_4340); +COMPILER_STRIP_GATE(0x80A0E048, &lit_4340); #pragma pop /* 80A0E04C-80A0E050 000038 0004+00 0/1 0/0 0/0 .rodata @4341 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4341 = 6.0f / 5.0f; -COMPILER_STRIP_GATE(80A0E04C, &lit_4341); +COMPILER_STRIP_GATE(0x80A0E04C, &lit_4341); #pragma pop /* 80A0E050-80A0E054 00003C 0004+00 0/1 0/0 0/0 .rodata @4342 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4342 = 3.0f; -COMPILER_STRIP_GATE(80A0E050, &lit_4342); +COMPILER_STRIP_GATE(0x80A0E050, &lit_4342); #pragma pop /* 80A0E054-80A0E058 000040 0004+00 0/1 0/0 0/0 .rodata @4343 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4343 = 100.0f; -COMPILER_STRIP_GATE(80A0E054, &lit_4343); +COMPILER_STRIP_GATE(0x80A0E054, &lit_4343); #pragma pop /* 80A0E058-80A0E05C 000044 0004+00 0/1 0/0 0/0 .rodata @4344 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4344 = 7000.0f; -COMPILER_STRIP_GATE(80A0E058, &lit_4344); +COMPILER_STRIP_GATE(0x80A0E058, &lit_4344); #pragma pop /* 80A0E05C-80A0E060 000048 0004+00 0/1 0/0 0/0 .rodata @4345 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4345 = 0.5f; -COMPILER_STRIP_GATE(80A0E05C, &lit_4345); +COMPILER_STRIP_GATE(0x80A0E05C, &lit_4345); #pragma pop /* 80A0E060-80A0E064 00004C 0004+00 0/1 0/0 0/0 .rodata @4346 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4346 = 8.0f; -COMPILER_STRIP_GATE(80A0E060, &lit_4346); +COMPILER_STRIP_GATE(0x80A0E060, &lit_4346); #pragma pop /* 80A0E064-80A0E068 000050 0004+00 0/1 0/0 0/0 .rodata @4347 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4347 = 41.0f; -COMPILER_STRIP_GATE(80A0E064, &lit_4347); +COMPILER_STRIP_GATE(0x80A0E064, &lit_4347); #pragma pop /* 80A0E068-80A0E06C 000054 0004+00 0/1 0/0 0/0 .rodata @4348 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4348 = 14.0f; -COMPILER_STRIP_GATE(80A0E068, &lit_4348); +COMPILER_STRIP_GATE(0x80A0E068, &lit_4348); #pragma pop /* 80A0E06C-80A0E070 000058 0004+00 0/1 0/0 0/0 .rodata @4349 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4349 = 1.0f / 100.0f; -COMPILER_STRIP_GATE(80A0E06C, &lit_4349); +COMPILER_STRIP_GATE(0x80A0E06C, &lit_4349); #pragma pop /* 80A0E070-80A0E074 00005C 0004+00 0/1 0/0 0/0 .rodata @4350 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4350 = 20.0f; -COMPILER_STRIP_GATE(80A0E070, &lit_4350); +COMPILER_STRIP_GATE(0x80A0E070, &lit_4350); #pragma pop /* 80A0E074-80A0E078 000060 0004+00 0/2 0/0 0/0 .rodata @4351 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4351 = 200.0f; -COMPILER_STRIP_GATE(80A0E074, &lit_4351); +COMPILER_STRIP_GATE(0x80A0E074, &lit_4351); #pragma pop /* 80A0E078-80A0E07C 000064 0004+00 0/1 0/0 0/0 .rodata @4352 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4352 = 32768.0f; -COMPILER_STRIP_GATE(80A0E078, &lit_4352); +COMPILER_STRIP_GATE(0x80A0E078, &lit_4352); #pragma pop /* 80A0E07C-80A0E080 000068 0004+00 0/1 0/0 0/0 .rodata @4353 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4353 = 4.0f / 5.0f; -COMPILER_STRIP_GATE(80A0E07C, &lit_4353); +COMPILER_STRIP_GATE(0x80A0E07C, &lit_4353); #pragma pop /* 80A0E080-80A0E084 00006C 0004+00 0/1 0/0 0/0 .rodata @4354 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4354 = 5.0f; -COMPILER_STRIP_GATE(80A0E080, &lit_4354); +COMPILER_STRIP_GATE(0x80A0E080, &lit_4354); #pragma pop /* 80A0E084-80A0E08C 000070 0008+00 0/1 0/0 0/0 .rodata @4355 */ @@ -414,7 +420,7 @@ COMPILER_STRIP_GATE(80A0E080, &lit_4354); SECTION_RODATA static u8 const lit_4355[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A0E084, &lit_4355); +COMPILER_STRIP_GATE(0x80A0E084, &lit_4355); #pragma pop /* 80A0E08C-80A0E094 000078 0008+00 0/1 0/0 0/0 .rodata @4356 */ @@ -423,7 +429,7 @@ COMPILER_STRIP_GATE(80A0E084, &lit_4355); SECTION_RODATA static u8 const lit_4356[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A0E08C, &lit_4356); +COMPILER_STRIP_GATE(0x80A0E08C, &lit_4356); #pragma pop /* 80A0E094-80A0E09C 000080 0008+00 0/1 0/0 0/0 .rodata @4357 */ @@ -432,77 +438,77 @@ COMPILER_STRIP_GATE(80A0E08C, &lit_4356); SECTION_RODATA static u8 const lit_4357[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A0E094, &lit_4357); +COMPILER_STRIP_GATE(0x80A0E094, &lit_4357); #pragma pop /* 80A0E09C-80A0E0A0 000088 0004+00 0/1 0/0 0/0 .rodata @4358 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4358 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(80A0E09C, &lit_4358); +COMPILER_STRIP_GATE(0x80A0E09C, &lit_4358); #pragma pop /* 80A0E0A0-80A0E0A4 00008C 0004+00 0/1 0/0 0/0 .rodata @4359 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4359 = 300.0f; -COMPILER_STRIP_GATE(80A0E0A0, &lit_4359); +COMPILER_STRIP_GATE(0x80A0E0A0, &lit_4359); #pragma pop /* 80A0E0A4-80A0E0A8 000090 0004+00 0/1 0/0 0/0 .rodata @4360 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4360 = 9.0f / 10.0f; -COMPILER_STRIP_GATE(80A0E0A4, &lit_4360); +COMPILER_STRIP_GATE(0x80A0E0A4, &lit_4360); #pragma pop /* 80A0E0A8-80A0E0AC 000094 0004+00 0/1 0/0 0/0 .rodata @4361 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4361 = 2.5f; -COMPILER_STRIP_GATE(80A0E0A8, &lit_4361); +COMPILER_STRIP_GATE(0x80A0E0A8, &lit_4361); #pragma pop /* 80A0E0AC-80A0E0B0 000098 0004+00 0/1 0/0 0/0 .rodata @4362 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4362 = 3000.0f; -COMPILER_STRIP_GATE(80A0E0AC, &lit_4362); +COMPILER_STRIP_GATE(0x80A0E0AC, &lit_4362); #pragma pop /* 80A0E0B0-80A0E0B4 00009C 0004+00 0/1 0/0 0/0 .rodata @4363 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4363 = 90.0f; -COMPILER_STRIP_GATE(80A0E0B0, &lit_4363); +COMPILER_STRIP_GATE(0x80A0E0B0, &lit_4363); #pragma pop /* 80A0E0B4-80A0E0B8 0000A0 0004+00 0/1 0/0 0/0 .rodata @4364 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4364 = 500.0f; -COMPILER_STRIP_GATE(80A0E0B4, &lit_4364); +COMPILER_STRIP_GATE(0x80A0E0B4, &lit_4364); #pragma pop /* 80A0E0B8-80A0E0BC 0000A4 0004+00 0/1 0/0 0/0 .rodata @4365 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4365 = -2.0f; -COMPILER_STRIP_GATE(80A0E0B8, &lit_4365); +COMPILER_STRIP_GATE(0x80A0E0B8, &lit_4365); #pragma pop /* 80A0E0BC-80A0E0C0 0000A8 0004+00 0/1 0/0 0/0 .rodata @4366 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4366 = 23000.0f; -COMPILER_STRIP_GATE(80A0E0BC, &lit_4366); +COMPILER_STRIP_GATE(0x80A0E0BC, &lit_4366); #pragma pop /* 80A0E0C0-80A0E0C4 0000AC 0004+00 0/1 0/0 0/0 .rodata @4367 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4367 = 150.0f; -COMPILER_STRIP_GATE(80A0E0C0, &lit_4367); +COMPILER_STRIP_GATE(0x80A0E0C0, &lit_4367); #pragma pop /* 80A0E0D8-80A0E0E8 000000 0010+00 1/1 0/0 0/0 .data mes_0$3966 */ @@ -555,14 +561,14 @@ static asm void useHeapInit(fopAc_ac_c* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4461 = 65536.0f; -COMPILER_STRIP_GATE(80A0E0C4, &lit_4461); +COMPILER_STRIP_GATE(0x80A0E0C4, &lit_4461); #pragma pop /* 80A0E0C8-80A0E0CC 0000B4 0004+00 0/1 0/0 0/0 .rodata @4462 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4462 = -200.0f; -COMPILER_STRIP_GATE(80A0E0C8, &lit_4462); +COMPILER_STRIP_GATE(0x80A0E0C8, &lit_4462); #pragma pop /* 80A0DF08-80A0E00C 0015E8 0104+00 1/0 0/0 0/0 .text daNpc_Inko_Create__FP10fopAc_ac_c @@ -599,9 +605,4 @@ SECTION_DATA extern void* g_profile_NPC_INKO[12] = { (void*)0x00040100, (void*)0x000E0000, }; -/* 80A0E0CC-80A0E0D5 0000B8 0009+00 4/4 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80A0E0CC = "Npc_inko"; -#pragma pop +/* 80A0E0CC-80A0E0CC 0000B8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/npc/d_a_npc_ins/d_a_npc_ins.cpp b/rel/d/a/npc/d_a_npc_ins/d_a_npc_ins.cpp index 76229c19c6a..e1764cb45ac 100644 --- a/rel/d/a/npc/d_a_npc_ins/d_a_npc_ins.cpp +++ b/rel/d/a/npc/d_a_npc_ins/d_a_npc_ins.cpp @@ -30,12 +30,12 @@ struct mDoExt_bckAnm { /* 8000D990 */ void changeBckOnly(J3DAnmTransform*); }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; +struct J3DModelData {}; + struct Vec {}; struct Z2Creature { @@ -59,13 +59,13 @@ struct fopAc_ac_c { struct J3DModel {}; +struct J3DJoint {}; + struct cXyz { /* 80A136EC */ ~cXyz(); /* 80A13728 */ cXyz(); }; -struct J3DJoint {}; - struct daNpcIns_c { /* 80A0E24C */ daNpcIns_c(); /* 80A0E460 */ ~daNpcIns_c(); @@ -116,16 +116,16 @@ struct daNpcIns_Param_c { static u8 const m[112]; }; -struct J3DAnmTextureSRTKey {}; - -struct _GXColorS10 {}; - struct J3DAnmTexPattern { /* 8032AF50 */ void getTexNo(u16, u16*) const; }; +struct J3DAnmTextureSRTKey {}; + struct J3DAnmTransformKey {}; +struct _GXColorS10 {}; + struct daNpcF_c { struct daNpcF_anmPlayData {}; @@ -211,7 +211,6 @@ struct dMsgFlow_c { struct dEvt_control_c { /* 80042468 */ void reset(); /* 80042518 */ void reset(void*); - /* 800436EC */ void setPtI_Id(unsigned int); }; struct dEvent_manager_c { @@ -327,7 +326,7 @@ struct JMath { struct TSinCosTable {}; /* TSinCosTable<13, f32> */ struct TSinCosTable__template0 { - /* 80A13468 */ void func_80A13468(s16) /* const */; + /* 80A13468 */ void func_80A13468(void* _this, s16) /* const */; }; static u8 sincosTable_[65536]; @@ -434,8 +433,8 @@ extern "C" void setAttnPos__10daNpcIns_cFv(); extern "C" void lookat__10daNpcIns_cFv(); extern "C" void setMtx__10daNpcIns_cFv(); extern "C" bool drawDbgInfo__10daNpcIns_cFv(); -extern "C" void func_80A13468(s16); -extern "C" void func_80A13474(int, int); +extern "C" void func_80A13468(void* _this, s16); +extern "C" void func_80A13474(void* _this, int, int); extern "C" void __sinit_d_a_npc_ins_cpp(); extern "C" void __dt__18daNpcF_ActorMngr_cFv(); extern "C" void __ct__18daNpcF_ActorMngr_cFv(); @@ -629,6 +628,15 @@ extern "C" void __register_global_object(); // /* ############################################################################################## */ +/* 80A14168-80A14168 0003BC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80A14168 = "Ins"; +SECTION_DEAD static char const* const stringBase_80A1416C = "Ins1"; +SECTION_DEAD static char const* const stringBase_80A14171 = "Ins2"; +SECTION_DEAD static char const* const stringBase_80A14176 = "ins"; +#pragma pop + /* 80A1419C-80A141A8 000000 000C+00 6/6 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -1056,7 +1064,7 @@ SECTION_RODATA static u8 const l_insectParams[192] = { 0x00, 0x00, 0x01, 0xA5, 0x07, 0x13, 0x00, 0x00, 0x00, 0x00, 0x01, 0xA6, 0x07, 0x13, 0x00, 0x00, 0x00, 0x00, 0x01, 0xA7, 0x07, 0x14, 0x00, 0x00, 0x00, 0x00, 0x01, 0xA8, 0x07, 0x14, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A13DAC, &l_insectParams); +COMPILER_STRIP_GATE(0x80A13DAC, &l_insectParams); /* 80A13E6C-80A13EDC 0000C0 0070+00 3/11 0/0 0/0 .rodata m__16daNpcIns_Param_c */ SECTION_RODATA u8 const daNpcIns_Param_c::m[112] = { @@ -1068,34 +1076,41 @@ SECTION_RODATA u8 const daNpcIns_Param_c::m[112] = { 0x42, 0xA0, 0x00, 0x00, 0x43, 0xFA, 0x00, 0x00, 0x43, 0x96, 0x00, 0x00, 0xC3, 0x96, 0x00, 0x00, 0x00, 0x3C, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3F, 0xC0, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A13E6C, &daNpcIns_Param_c::m); +COMPILER_STRIP_GATE(0x80A13E6C, &daNpcIns_Param_c::m); /* 80A13EDC-80A13EE0 000130 0004+00 0/1 0/0 0/0 .rodata @4341 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4341 = -160.0f; -COMPILER_STRIP_GATE(80A13EDC, &lit_4341); +COMPILER_STRIP_GATE(0x80A13EDC, &lit_4341); #pragma pop /* 80A13EE0-80A13EE4 000134 0004+00 0/1 0/0 0/0 .rodata @4342 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4342 = -50.0f; -COMPILER_STRIP_GATE(80A13EE0, &lit_4342); +COMPILER_STRIP_GATE(0x80A13EE0, &lit_4342); #pragma pop /* 80A13EE4-80A13EE8 000138 0004+00 0/1 0/0 0/0 .rodata @4343 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4343 = 160.0f; -COMPILER_STRIP_GATE(80A13EE4, &lit_4343); +COMPILER_STRIP_GATE(0x80A13EE4, &lit_4343); #pragma pop /* 80A13EE8-80A13EEC 00013C 0004+00 0/1 0/0 0/0 .rodata @4344 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4344 = 220.0f; -COMPILER_STRIP_GATE(80A13EE8, &lit_4344); +COMPILER_STRIP_GATE(0x80A13EE8, &lit_4344); +#pragma pop + +/* 80A14168-80A14168 0003BC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80A1417A = "R_SP160"; +SECTION_DEAD static char const* const stringBase_80A14182 = "F_SP122"; #pragma pop /* 80A0E660-80A0EA30 000500 03D0+00 1/1 0/0 0/0 .text Create__10daNpcIns_cFv */ @@ -1111,7 +1126,7 @@ asm void daNpcIns_c::Create() { /* ############################################################################################## */ /* 80A13EEC-80A13EF0 000140 0004+00 4/4 0/0 0/0 .rodata @4414 */ SECTION_RODATA static f32 const lit_4414 = 1.0f; -COMPILER_STRIP_GATE(80A13EEC, &lit_4414); +COMPILER_STRIP_GATE(0x80A13EEC, &lit_4414); /* 80A13EF0-80A13EF4 000144 0004+00 3/11 0/0 0/0 .rodata @4415 */ SECTION_RODATA static u8 const lit_4415[4] = { @@ -1120,7 +1135,7 @@ SECTION_RODATA static u8 const lit_4415[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A13EF0, &lit_4415); +COMPILER_STRIP_GATE(0x80A13EF0, &lit_4415); /* 80A0EA30-80A0ED80 0008D0 0350+00 1/1 0/0 0/0 .text CreateHeap__10daNpcIns_cFv */ #pragma push @@ -1267,7 +1282,7 @@ asm void daNpcIns_c::Draw() { SECTION_RODATA static u8 const lit_4507[12] = { 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x04, }; -COMPILER_STRIP_GATE(80A13EF4, &lit_4507); +COMPILER_STRIP_GATE(0x80A13EF4, &lit_4507); /* 80A0F0BC-80A0F28C 000F5C 01D0+00 1/1 0/0 0/0 .text ctrlJoint__10daNpcIns_cFP8J3DJointP8J3DModel */ @@ -1350,7 +1365,7 @@ asm void daNpcIns_c::reset() { SECTION_RODATA static u8 const lit_4746[12] = { 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A13F00, &lit_4746); +COMPILER_STRIP_GATE(0x80A13F00, &lit_4746); #pragma pop /* 80A13F0C-80A13F10 000160 0004+00 0/1 0/0 0/0 .rodata @4747 */ @@ -1362,7 +1377,7 @@ SECTION_RODATA static u8 const lit_4747[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A13F0C, &lit_4747); +COMPILER_STRIP_GATE(0x80A13F0C, &lit_4747); #pragma pop /* 80A13F10-80A13F1C 000164 000C+00 0/1 0/0 0/0 .rodata @4748 */ @@ -1371,7 +1386,7 @@ COMPILER_STRIP_GATE(80A13F0C, &lit_4747); SECTION_RODATA static u8 const lit_4748[12] = { 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A13F10, &lit_4748); +COMPILER_STRIP_GATE(0x80A13F10, &lit_4748); #pragma pop /* 80A13F1C-80A13F20 000170 0004+00 0/1 0/0 0/0 .rodata @4749 */ @@ -1383,7 +1398,7 @@ SECTION_RODATA static u8 const lit_4749[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A13F1C, &lit_4749); +COMPILER_STRIP_GATE(0x80A13F1C, &lit_4749); #pragma pop /* 80A13F20-80A13F2C 000174 000C+00 0/1 0/0 0/0 .rodata @4750 */ @@ -1392,7 +1407,7 @@ COMPILER_STRIP_GATE(80A13F1C, &lit_4749); SECTION_RODATA static u8 const lit_4750[12] = { 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A13F20, &lit_4750); +COMPILER_STRIP_GATE(0x80A13F20, &lit_4750); #pragma pop /* 80A13F2C-80A13F30 000180 0004+00 0/1 0/0 0/0 .rodata @4751 */ @@ -1404,7 +1419,7 @@ SECTION_RODATA static u8 const lit_4751[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A13F2C, &lit_4751); +COMPILER_STRIP_GATE(0x80A13F2C, &lit_4751); #pragma pop /* 80A13F30-80A13F3C 000184 000C+00 0/1 0/0 0/0 .rodata @4752 */ @@ -1413,7 +1428,7 @@ COMPILER_STRIP_GATE(80A13F2C, &lit_4751); SECTION_RODATA static u8 const lit_4752[12] = { 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A13F30, &lit_4752); +COMPILER_STRIP_GATE(0x80A13F30, &lit_4752); #pragma pop /* 80A13F3C-80A13F40 000190 0004+00 0/1 0/0 0/0 .rodata @4753 */ @@ -1425,7 +1440,7 @@ SECTION_RODATA static u8 const lit_4753[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A13F3C, &lit_4753); +COMPILER_STRIP_GATE(0x80A13F3C, &lit_4753); #pragma pop /* 80A13F40-80A13F4C 000194 000C+00 0/1 0/0 0/0 .rodata @4754 */ @@ -1434,7 +1449,7 @@ COMPILER_STRIP_GATE(80A13F3C, &lit_4753); SECTION_RODATA static u8 const lit_4754[12] = { 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A13F40, &lit_4754); +COMPILER_STRIP_GATE(0x80A13F40, &lit_4754); #pragma pop /* 80A13F4C-80A13F50 0001A0 0004+00 0/1 0/0 0/0 .rodata @4755 */ @@ -1446,7 +1461,7 @@ SECTION_RODATA static u8 const lit_4755[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A13F4C, &lit_4755); +COMPILER_STRIP_GATE(0x80A13F4C, &lit_4755); #pragma pop /* 80A13F50-80A13F5C 0001A4 000C+00 0/1 0/0 0/0 .rodata @4756 */ @@ -1455,7 +1470,7 @@ COMPILER_STRIP_GATE(80A13F4C, &lit_4755); SECTION_RODATA static u8 const lit_4756[12] = { 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A13F50, &lit_4756); +COMPILER_STRIP_GATE(0x80A13F50, &lit_4756); #pragma pop /* 80A13F5C-80A13F60 0001B0 0004+00 0/1 0/0 0/0 .rodata @4757 */ @@ -1467,7 +1482,7 @@ SECTION_RODATA static u8 const lit_4757[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A13F5C, &lit_4757); +COMPILER_STRIP_GATE(0x80A13F5C, &lit_4757); #pragma pop /* 80A13F60-80A13F6C 0001B4 000C+00 0/1 0/0 0/0 .rodata @4758 */ @@ -1476,7 +1491,7 @@ COMPILER_STRIP_GATE(80A13F5C, &lit_4757); SECTION_RODATA static u8 const lit_4758[12] = { 0x00, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A13F60, &lit_4758); +COMPILER_STRIP_GATE(0x80A13F60, &lit_4758); #pragma pop /* 80A13F6C-80A13F70 0001C0 0004+00 0/1 0/0 0/0 .rodata @4759 */ @@ -1488,7 +1503,7 @@ SECTION_RODATA static u8 const lit_4759[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A13F6C, &lit_4759); +COMPILER_STRIP_GATE(0x80A13F6C, &lit_4759); #pragma pop /* 80A13F70-80A13F7C 0001C4 000C+00 0/1 0/0 0/0 .rodata @4760 */ @@ -1497,7 +1512,7 @@ COMPILER_STRIP_GATE(80A13F6C, &lit_4759); SECTION_RODATA static u8 const lit_4760[12] = { 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A13F70, &lit_4760); +COMPILER_STRIP_GATE(0x80A13F70, &lit_4760); #pragma pop /* 80A13F7C-80A13F80 0001D0 0004+00 0/1 0/0 0/0 .rodata @4761 */ @@ -1509,7 +1524,7 @@ SECTION_RODATA static u8 const lit_4761[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A13F7C, &lit_4761); +COMPILER_STRIP_GATE(0x80A13F7C, &lit_4761); #pragma pop /* 80A13F80-80A13F8C 0001D4 000C+00 0/1 0/0 0/0 .rodata @4762 */ @@ -1518,7 +1533,7 @@ COMPILER_STRIP_GATE(80A13F7C, &lit_4761); SECTION_RODATA static u8 const lit_4762[12] = { 0x00, 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A13F80, &lit_4762); +COMPILER_STRIP_GATE(0x80A13F80, &lit_4762); #pragma pop /* 80A13F8C-80A13F90 0001E0 0004+00 0/1 0/0 0/0 .rodata @4763 */ @@ -1530,7 +1545,7 @@ SECTION_RODATA static u8 const lit_4763[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A13F8C, &lit_4763); +COMPILER_STRIP_GATE(0x80A13F8C, &lit_4763); #pragma pop /* 80A13F90-80A13F9C 0001E4 000C+00 0/1 0/0 0/0 .rodata @4764 */ @@ -1539,7 +1554,7 @@ COMPILER_STRIP_GATE(80A13F8C, &lit_4763); SECTION_RODATA static u8 const lit_4764[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A13F90, &lit_4764); +COMPILER_STRIP_GATE(0x80A13F90, &lit_4764); #pragma pop /* 80A13F9C-80A13FA0 0001F0 0004+00 0/1 0/0 0/0 .rodata @4765 */ @@ -1551,7 +1566,7 @@ SECTION_RODATA static u8 const lit_4765[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A13F9C, &lit_4765); +COMPILER_STRIP_GATE(0x80A13F9C, &lit_4765); #pragma pop /* 80A13FA0-80A13FC8 0001F4 0028+00 0/0 0/0 0/0 .rodata @4766 */ @@ -1562,7 +1577,7 @@ SECTION_RODATA static u8 const lit_4766[40] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A13FA0, &lit_4766); +COMPILER_STRIP_GATE(0x80A13FA0, &lit_4766); #pragma pop /* 80A13FC8-80A13FD4 00021C 000C+00 0/1 0/0 0/0 .rodata @4770 */ @@ -1571,7 +1586,7 @@ COMPILER_STRIP_GATE(80A13FA0, &lit_4766); SECTION_RODATA static u8 const lit_4770[12] = { 0x00, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A13FC8, &lit_4770); +COMPILER_STRIP_GATE(0x80A13FC8, &lit_4770); #pragma pop /* 80A13FD4-80A13FD8 000228 0004+00 0/1 0/0 0/0 .rodata @4771 */ @@ -1583,7 +1598,7 @@ SECTION_RODATA static u8 const lit_4771[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A13FD4, &lit_4771); +COMPILER_STRIP_GATE(0x80A13FD4, &lit_4771); #pragma pop /* 80A13FD8-80A13FE4 00022C 000C+00 0/1 0/0 0/0 .rodata @4772 */ @@ -1592,7 +1607,7 @@ COMPILER_STRIP_GATE(80A13FD4, &lit_4771); SECTION_RODATA static u8 const lit_4772[12] = { 0x00, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80A13FD8, &lit_4772); +COMPILER_STRIP_GATE(0x80A13FD8, &lit_4772); #pragma pop /* 80A13FE4-80A13FF0 000238 000C+00 0/1 0/0 0/0 .rodata @4773 */ @@ -1601,7 +1616,7 @@ COMPILER_STRIP_GATE(80A13FD8, &lit_4772); SECTION_RODATA static u8 const lit_4773[12] = { 0x00, 0x0B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A13FE4, &lit_4773); +COMPILER_STRIP_GATE(0x80A13FE4, &lit_4773); #pragma pop /* 80A13FF0-80A13FF8 000244 0008+00 0/1 0/0 0/0 .rodata @4774 */ @@ -1610,7 +1625,7 @@ COMPILER_STRIP_GATE(80A13FE4, &lit_4773); SECTION_RODATA static u8 const lit_4774[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A13FF0, &lit_4774); +COMPILER_STRIP_GATE(0x80A13FF0, &lit_4774); #pragma pop /* 80A13FF8-80A14004 00024C 000C+00 0/1 0/0 0/0 .rodata @4775 */ @@ -1619,7 +1634,7 @@ COMPILER_STRIP_GATE(80A13FF0, &lit_4774); SECTION_RODATA static u8 const lit_4775[12] = { 0x00, 0x0B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A13FF8, &lit_4775); +COMPILER_STRIP_GATE(0x80A13FF8, &lit_4775); #pragma pop /* 80A14004-80A14008 000258 0004+00 0/1 0/0 0/0 .rodata @4776 */ @@ -1631,7 +1646,7 @@ SECTION_RODATA static u8 const lit_4776[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A14004, &lit_4776); +COMPILER_STRIP_GATE(0x80A14004, &lit_4776); #pragma pop /* 80A14008-80A14014 00025C 000C+00 0/1 0/0 0/0 .rodata @4777 */ @@ -1640,7 +1655,7 @@ COMPILER_STRIP_GATE(80A14004, &lit_4776); SECTION_RODATA static u8 const lit_4777[12] = { 0x00, 0x0D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80A14008, &lit_4777); +COMPILER_STRIP_GATE(0x80A14008, &lit_4777); #pragma pop /* 80A14014-80A14020 000268 000C+00 0/1 0/0 0/0 .rodata @4778 */ @@ -1649,7 +1664,7 @@ COMPILER_STRIP_GATE(80A14008, &lit_4777); SECTION_RODATA static u8 const lit_4778[12] = { 0x00, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A14014, &lit_4778); +COMPILER_STRIP_GATE(0x80A14014, &lit_4778); #pragma pop /* 80A14020-80A14028 000274 0008+00 0/1 0/0 0/0 .rodata @4779 */ @@ -1658,7 +1673,7 @@ COMPILER_STRIP_GATE(80A14014, &lit_4778); SECTION_RODATA static u8 const lit_4779[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A14020, &lit_4779); +COMPILER_STRIP_GATE(0x80A14020, &lit_4779); #pragma pop /* 80A14028-80A14034 00027C 000C+00 0/1 0/0 0/0 .rodata @4780 */ @@ -1667,7 +1682,7 @@ COMPILER_STRIP_GATE(80A14020, &lit_4779); SECTION_RODATA static u8 const lit_4780[12] = { 0x00, 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A14028, &lit_4780); +COMPILER_STRIP_GATE(0x80A14028, &lit_4780); #pragma pop /* 80A14034-80A14038 000288 0004+00 0/1 0/0 0/0 .rodata @4781 */ @@ -1679,7 +1694,7 @@ SECTION_RODATA static u8 const lit_4781[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A14034, &lit_4781); +COMPILER_STRIP_GATE(0x80A14034, &lit_4781); #pragma pop /* 80A14038-80A14044 00028C 000C+00 0/1 0/0 0/0 .rodata @4782 */ @@ -1688,7 +1703,7 @@ COMPILER_STRIP_GATE(80A14034, &lit_4781); SECTION_RODATA static u8 const lit_4782[12] = { 0x00, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80A14038, &lit_4782); +COMPILER_STRIP_GATE(0x80A14038, &lit_4782); #pragma pop /* 80A14044-80A14050 000298 000C+00 0/1 0/0 0/0 .rodata @4783 */ @@ -1697,7 +1712,7 @@ COMPILER_STRIP_GATE(80A14038, &lit_4782); SECTION_RODATA static u8 const lit_4783[12] = { 0x00, 0x0F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A14044, &lit_4783); +COMPILER_STRIP_GATE(0x80A14044, &lit_4783); #pragma pop /* 80A14050-80A14058 0002A4 0008+00 0/1 0/0 0/0 .rodata @4784 */ @@ -1706,7 +1721,7 @@ COMPILER_STRIP_GATE(80A14044, &lit_4783); SECTION_RODATA static u8 const lit_4784[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A14050, &lit_4784); +COMPILER_STRIP_GATE(0x80A14050, &lit_4784); #pragma pop /* 80A14058-80A14064 0002AC 000C+00 0/1 0/0 0/0 .rodata @4785 */ @@ -1715,7 +1730,7 @@ COMPILER_STRIP_GATE(80A14050, &lit_4784); SECTION_RODATA static u8 const lit_4785[12] = { 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80A14058, &lit_4785); +COMPILER_STRIP_GATE(0x80A14058, &lit_4785); #pragma pop /* 80A14064-80A14070 0002B8 000C+00 0/1 0/0 0/0 .rodata @4786 */ @@ -1724,7 +1739,7 @@ COMPILER_STRIP_GATE(80A14058, &lit_4785); SECTION_RODATA static u8 const lit_4786[12] = { 0x00, 0x0B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A14064, &lit_4786); +COMPILER_STRIP_GATE(0x80A14064, &lit_4786); #pragma pop /* 80A14070-80A14078 0002C4 0008+00 0/1 0/0 0/0 .rodata @4787 */ @@ -1733,7 +1748,7 @@ COMPILER_STRIP_GATE(80A14064, &lit_4786); SECTION_RODATA static u8 const lit_4787[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A14070, &lit_4787); +COMPILER_STRIP_GATE(0x80A14070, &lit_4787); #pragma pop /* 80A14078-80A14084 0002CC 000C+00 0/1 0/0 0/0 .rodata @4788 */ @@ -1742,7 +1757,7 @@ COMPILER_STRIP_GATE(80A14070, &lit_4787); SECTION_RODATA static u8 const lit_4788[12] = { 0x00, 0x13, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A14078, &lit_4788); +COMPILER_STRIP_GATE(0x80A14078, &lit_4788); #pragma pop /* 80A14084-80A14088 0002D8 0004+00 0/1 0/0 0/0 .rodata @4789 */ @@ -1754,7 +1769,7 @@ SECTION_RODATA static u8 const lit_4789[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A14084, &lit_4789); +COMPILER_STRIP_GATE(0x80A14084, &lit_4789); #pragma pop /* 80A14088-80A14094 0002DC 000C+00 0/1 0/0 0/0 .rodata @4790 */ @@ -1763,7 +1778,7 @@ COMPILER_STRIP_GATE(80A14084, &lit_4789); SECTION_RODATA static u8 const lit_4790[12] = { 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A14088, &lit_4790); +COMPILER_STRIP_GATE(0x80A14088, &lit_4790); #pragma pop /* 80A14094-80A14098 0002E8 0004+00 0/1 0/0 0/0 .rodata @4791 */ @@ -1775,7 +1790,7 @@ SECTION_RODATA static u8 const lit_4791[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A14094, &lit_4791); +COMPILER_STRIP_GATE(0x80A14094, &lit_4791); #pragma pop /* 80A14098-80A140A4 0002EC 000C+00 0/1 0/0 0/0 .rodata @4792 */ @@ -1784,7 +1799,7 @@ COMPILER_STRIP_GATE(80A14094, &lit_4791); SECTION_RODATA static u8 const lit_4792[12] = { 0x00, 0x15, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A14098, &lit_4792); +COMPILER_STRIP_GATE(0x80A14098, &lit_4792); #pragma pop /* 80A140A4-80A140A8 0002F8 0004+00 0/1 0/0 0/0 .rodata @4793 */ @@ -1796,7 +1811,7 @@ SECTION_RODATA static u8 const lit_4793[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A140A4, &lit_4793); +COMPILER_STRIP_GATE(0x80A140A4, &lit_4793); #pragma pop /* 80A140A8-80A140B4 0002FC 000C+00 0/1 0/0 0/0 .rodata @4794 */ @@ -1805,7 +1820,7 @@ COMPILER_STRIP_GATE(80A140A4, &lit_4793); SECTION_RODATA static u8 const lit_4794[12] = { 0x00, 0x16, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A140A8, &lit_4794); +COMPILER_STRIP_GATE(0x80A140A8, &lit_4794); #pragma pop /* 80A140B4-80A140B8 000308 0004+00 0/1 0/0 0/0 .rodata @4795 */ @@ -1817,7 +1832,7 @@ SECTION_RODATA static u8 const lit_4795[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A140B4, &lit_4795); +COMPILER_STRIP_GATE(0x80A140B4, &lit_4795); #pragma pop /* 80A140B8-80A140C4 00030C 000C+00 0/1 0/0 0/0 .rodata @4796 */ @@ -1826,7 +1841,7 @@ COMPILER_STRIP_GATE(80A140B4, &lit_4795); SECTION_RODATA static u8 const lit_4796[12] = { 0x00, 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A140B8, &lit_4796); +COMPILER_STRIP_GATE(0x80A140B8, &lit_4796); #pragma pop /* 80A140C4-80A140C8 000318 0004+00 0/1 0/0 0/0 .rodata @4797 */ @@ -1838,7 +1853,7 @@ SECTION_RODATA static u8 const lit_4797[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A140C4, &lit_4797); +COMPILER_STRIP_GATE(0x80A140C4, &lit_4797); #pragma pop /* 80A140C8-80A140D4 00031C 000C+00 0/1 0/0 0/0 .rodata @4798 */ @@ -1847,7 +1862,7 @@ COMPILER_STRIP_GATE(80A140C4, &lit_4797); SECTION_RODATA static u8 const lit_4798[12] = { 0x00, 0x17, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A140C8, &lit_4798); +COMPILER_STRIP_GATE(0x80A140C8, &lit_4798); #pragma pop /* 80A140D4-80A140D8 000328 0004+00 0/1 0/0 0/0 .rodata @4799 */ @@ -1859,7 +1874,7 @@ SECTION_RODATA static u8 const lit_4799[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A140D4, &lit_4799); +COMPILER_STRIP_GATE(0x80A140D4, &lit_4799); #pragma pop /* 80A140D8-80A1410C 00032C 0034+00 0/0 0/0 0/0 .rodata @4800 */ @@ -1871,7 +1886,7 @@ SECTION_RODATA static u8 const lit_4800[52] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A140D8, &lit_4800); +COMPILER_STRIP_GATE(0x80A140D8, &lit_4800); #pragma pop /* 80A1410C-80A14118 000360 000C+00 0/1 0/0 0/0 .rodata @4812 */ @@ -1880,32 +1895,32 @@ COMPILER_STRIP_GATE(80A140D8, &lit_4800); SECTION_RODATA static u8 const lit_4812[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A1410C, &lit_4812); +COMPILER_STRIP_GATE(0x80A1410C, &lit_4812); #pragma pop /* 80A14118-80A1411C 00036C 0004+00 3/8 0/0 0/0 .rodata @4994 */ SECTION_RODATA static f32 const lit_4994 = -1.0f; -COMPILER_STRIP_GATE(80A14118, &lit_4994); +COMPILER_STRIP_GATE(0x80A14118, &lit_4994); /* 80A1411C-80A14120 000370 0004+00 0/4 0/0 0/0 .rodata @4995 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4995 = 0x3BB40000; -COMPILER_STRIP_GATE(80A1411C, &lit_4995); +COMPILER_STRIP_GATE(0x80A1411C, &lit_4995); #pragma pop /* 80A14120-80A14124 000374 0004+00 0/4 0/0 0/0 .rodata @4996 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4996 = 15.0f; -COMPILER_STRIP_GATE(80A14120, &lit_4996); +COMPILER_STRIP_GATE(0x80A14120, &lit_4996); #pragma pop /* 80A14124-80A1412C 000378 0008+00 1/5 0/0 0/0 .rodata @4998 */ SECTION_RODATA static u8 const lit_4998[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A14124, &lit_4998); +COMPILER_STRIP_GATE(0x80A14124, &lit_4998); /* 80A0F984-80A0FF40 001824 05BC+00 2/0 0/0 0/0 .text waitShop__10daNpcIns_cFPv */ #pragma push @@ -1972,14 +1987,14 @@ asm void daNpcIns_c::waitOutSide2(void* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5370 = 2.0f / 5.0f; -COMPILER_STRIP_GATE(80A1412C, &lit_5370); +COMPILER_STRIP_GATE(0x80A1412C, &lit_5370); #pragma pop /* 80A14130-80A14134 000384 0004+00 0/1 0/0 0/0 .rodata @5371 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5371 = 25.0f; -COMPILER_STRIP_GATE(80A14130, &lit_5371); +COMPILER_STRIP_GATE(0x80A14130, &lit_5371); #pragma pop /* 80A10CD8-80A11330 002B78 0658+00 3/0 0/0 0/0 .text goHome__10daNpcIns_cFPv */ @@ -2002,6 +2017,13 @@ asm cM3dGPla::~cM3dGPla() { } #pragma pop +/* ############################################################################################## */ +/* 80A14168-80A14168 0003BC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80A1418A = "DEFAULT_GETITEM"; +#pragma pop + /* 80A11378-80A11A7C 003218 0704+00 2/0 0/0 0/0 .text talk__10daNpcIns_cFPv */ #pragma push #pragma optimization_level 0 @@ -2060,7 +2082,7 @@ asm void daNpcIns_c::setWaitAction() { SECTION_RODATA static u8 const lit_5618[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A14134, &lit_5618); +COMPILER_STRIP_GATE(0x80A14134, &lit_5618); #pragma pop /* 80A1413C-80A14144 000390 0008+00 0/4 0/0 0/0 .rodata @5619 */ @@ -2069,7 +2091,7 @@ COMPILER_STRIP_GATE(80A14134, &lit_5618); SECTION_RODATA static u8 const lit_5619[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A1413C, &lit_5619); +COMPILER_STRIP_GATE(0x80A1413C, &lit_5619); #pragma pop /* 80A14144-80A1414C 000398 0008+00 0/4 0/0 0/0 .rodata @5620 */ @@ -2078,7 +2100,7 @@ COMPILER_STRIP_GATE(80A1413C, &lit_5619); SECTION_RODATA static u8 const lit_5620[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A14144, &lit_5620); +COMPILER_STRIP_GATE(0x80A14144, &lit_5620); #pragma pop /* 80A11F84-80A1211C 003E24 0198+00 1/1 0/0 0/0 .text setPath__10daNpcIns_cFi */ @@ -2096,7 +2118,7 @@ asm void daNpcIns_c::setPath(int param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5663 = 10.0f; -COMPILER_STRIP_GATE(80A1414C, &lit_5663); +COMPILER_STRIP_GATE(0x80A1414C, &lit_5663); #pragma pop /* 80A1211C-80A122D0 003FBC 01B4+00 1/1 0/0 0/0 .text checkPoint__10daNpcIns_cFR4cXyzf */ @@ -2228,7 +2250,7 @@ asm void daNpcIns_c::playMotion() { /* ############################################################################################## */ /* 80A14150-80A14154 0003A4 0004+00 1/1 0/0 0/0 .rodata @5847 */ SECTION_RODATA static f32 const lit_5847 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(80A14150, &lit_5847); +COMPILER_STRIP_GATE(0x80A14150, &lit_5847); /* 80A12DC8-80A12EA4 004C68 00DC+00 1/0 0/0 0/0 .text ctrlBtk__10daNpcIns_cFv */ #pragma push @@ -2245,7 +2267,7 @@ asm void daNpcIns_c::ctrlBtk() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5916 = 60.0f; -COMPILER_STRIP_GATE(80A14154, &lit_5916); +COMPILER_STRIP_GATE(0x80A14154, &lit_5916); #pragma pop /* 80A12EA4-80A131AC 004D44 0308+00 1/0 0/0 0/0 .text setAttnPos__10daNpcIns_cFv */ @@ -2263,28 +2285,28 @@ asm void daNpcIns_c::setAttnPos() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5958 = -80.0f; -COMPILER_STRIP_GATE(80A14158, &lit_5958); +COMPILER_STRIP_GATE(0x80A14158, &lit_5958); #pragma pop /* 80A1415C-80A14160 0003B0 0004+00 0/1 0/0 0/0 .rodata @5959 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5959 = 80.0f; -COMPILER_STRIP_GATE(80A1415C, &lit_5959); +COMPILER_STRIP_GATE(0x80A1415C, &lit_5959); #pragma pop /* 80A14160-80A14164 0003B4 0004+00 0/1 0/0 0/0 .rodata @5960 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5960 = 5.0f; -COMPILER_STRIP_GATE(80A14160, &lit_5960); +COMPILER_STRIP_GATE(0x80A14160, &lit_5960); #pragma pop /* 80A14164-80A14168 0003B8 0004+00 0/1 0/0 0/0 .rodata @5961 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5961 = 40.0f; -COMPILER_STRIP_GATE(80A14164, &lit_5961); +COMPILER_STRIP_GATE(0x80A14164, &lit_5961); #pragma pop /* 80A131AC-80A1339C 00504C 01F0+00 1/1 0/0 0/0 .text lookat__10daNpcIns_cFv */ @@ -2316,7 +2338,7 @@ bool daNpcIns_c::drawDbgInfo() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80A13468(s16 param_0) /* const */ { +extern "C" asm void func_80A13468(void* _this, s16 param_0) /* const */ { nofralloc #include "asm/rel/d/a/npc/d_a_npc_ins/d_a_npc_ins/func_80A13468.s" } @@ -2326,7 +2348,7 @@ extern "C" asm void func_80A13468(s16 param_0) /* const */ { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80A13474(int param_0, int param_1) { +extern "C" asm void func_80A13474(void* _this, int param_0, int param_1) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_ins/d_a_npc_ins/func_80A13474.s" } @@ -2358,7 +2380,7 @@ asm void __sinit_d_a_npc_ins_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80A134F0 = (void*)__sinit_d_a_npc_ins_cpp; +REGISTER_CTORS(0x80A134F0, __sinit_d_a_npc_ins_cpp); #pragma pop /* 80A13558-80A135A0 0053F8 0048+00 5/4 0/0 0/0 .text __dt__18daNpcF_ActorMngr_cFv */ @@ -2536,15 +2558,4 @@ static asm void func_80A13D90() { } #pragma pop -/* 80A14168-80A1419A 0003BC 0032+00 9/7 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80A14168 = "Ins"; -SECTION_DEAD static char const* const stringBase_80A1416C = "Ins1"; -SECTION_DEAD static char const* const stringBase_80A14171 = "Ins2"; -SECTION_DEAD static char const* const stringBase_80A14176 = "ins"; -SECTION_DEAD static char const* const stringBase_80A1417A = "R_SP160"; -SECTION_DEAD static char const* const stringBase_80A14182 = "F_SP122"; -SECTION_DEAD static char const* const stringBase_80A1418A = "DEFAULT_GETITEM"; -#pragma pop +/* 80A14168-80A14168 0003BC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/npc/d_a_npc_jagar/d_a_npc_jagar.cpp b/rel/d/a/npc/d_a_npc_jagar/d_a_npc_jagar.cpp index c5facd6c244..cd4427a9cbd 100644 --- a/rel/d/a/npc/d_a_npc_jagar/d_a_npc_jagar.cpp +++ b/rel/d/a/npc/d_a_npc_jagar/d_a_npc_jagar.cpp @@ -15,12 +15,14 @@ struct mDoMtx_stack_c { static u8 now[48]; }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; +struct J3DAnmTransform {}; + +struct J3DModelData {}; + struct Vec {}; struct Z2Creature { @@ -29,8 +31,6 @@ struct Z2Creature { /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -43,6 +43,8 @@ struct fopAc_ac_c { /* 80018C8C */ ~fopAc_ac_c(); }; +struct daNpcT_faceMotionAnmData_c {}; + struct daNpcT_MotionSeqMngr_c { struct sequenceStepData_c {}; @@ -50,14 +52,12 @@ struct daNpcT_MotionSeqMngr_c { /* 80A19A8C */ ~daNpcT_MotionSeqMngr_c(); }; +struct daNpcT_evtData_c {}; + struct daNpcT_motionAnmData_c {}; struct J3DJoint {}; -struct daNpcT_faceMotionAnmData_c {}; - -struct daNpcT_evtData_c {}; - struct daNpc_Jagar_c { /* 80A1470C */ ~daNpc_Jagar_c(); /* 80A14858 */ void create(); @@ -136,6 +136,13 @@ struct dCcD_GObjInf { /* 800844F8 */ void GetTgHitObj(); }; +struct csXyz { + /* 80A193EC */ ~csXyz(); + /* 80A19988 */ csXyz(); +}; + +struct _GXColorS10 {}; + struct J3DModel {}; struct cXyz { @@ -145,13 +152,6 @@ struct cXyz { /* 80A19A88 */ cXyz(); }; -struct _GXColorS10 {}; - -struct csXyz { - /* 80A193EC */ ~csXyz(); - /* 80A19988 */ csXyz(); -}; - struct daNpcT_c { /* 80147FA4 */ void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*); /* 801483F8 */ void loadRes(s8 const*, char const**); @@ -500,8 +500,8 @@ extern "C" void getMotionAnm__8daNpcT_cF22daNpcT_motionAnmData_c(); extern "C" void changeAnm__8daNpcT_cFPiPi(); extern "C" void changeBck__8daNpcT_cFPiPi(); extern "C" void changeBtk__8daNpcT_cFPiPi(); -extern "C" void func_80A1A040(int*); -extern "C" void func_80A1A05C(f32, f32); +extern "C" void func_80A1A040(void* _this, int*); +extern "C" void func_80A1A05C(void* _this, f32, f32); extern "C" void __sinit_d_a_npc_jagar_cpp(); extern "C" void __ct__13daNpc_Jagar_cFPC26daNpcT_faceMotionAnmData_cPC22daNpcT_motionAnmData_cPCQ222daNpcT_MotionSeqMngr_c18sequenceStepData_ciPCQ222daNpcT_MotionSeqMngr_c18sequenceStepData_ciPC16daNpcT_evtData_cPPc(); @@ -694,6 +694,24 @@ extern "C" void __register_global_object(); // /* ############################################################################################## */ +/* 80A1A49C-80A1A49C 00016C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80A1A49C = ""; +SECTION_DEAD static char const* const stringBase_80A1A49D = "NO_RESPONSE"; +SECTION_DEAD static char const* const stringBase_80A1A4A9 = "CLIMBUP"; +SECTION_DEAD static char const* const stringBase_80A1A4B1 = "NEED_YOUR_HELP"; +SECTION_DEAD static char const* const stringBase_80A1A4C0 = "ANGER"; +SECTION_DEAD static char const* const stringBase_80A1A4C6 = "CONVERSATION_WITH_BOU"; +SECTION_DEAD static char const* const stringBase_80A1A4DC = "CONFIDENTIAL_CONVERSATION"; +SECTION_DEAD static char const* const stringBase_80A1A4F6 = "FIND_WOLF"; +SECTION_DEAD static char const* const stringBase_80A1A500 = "FIND_WOLF_VER2"; +SECTION_DEAD static char const* const stringBase_80A1A50F = "Jagar"; +SECTION_DEAD static char const* const stringBase_80A1A515 = "Jagar1"; +SECTION_DEAD static char const* const stringBase_80A1A51C = "Jagar2"; +SECTION_DEAD static char const* const stringBase_80A1A523 = "Jagar3"; +#pragma pop + /* 80A1A548-80A1A554 000000 000C+00 2/2 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -1227,7 +1245,7 @@ SECTION_RODATA u8 const daNpc_Jagar_Param_c::m[160] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x44, 0xAF, 0x00, 0x00, 0x43, 0x48, 0x00, 0x00, 0xC4, 0x48, 0x00, 0x00, 0x41, 0x80, 0x00, 0x00, 0x44, 0xE1, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A1A330, &daNpc_Jagar_Param_c::m); +COMPILER_STRIP_GATE(0x80A1A330, &daNpc_Jagar_Param_c::m); /* 80A1A3D0-80A1A3E0 0000A0 0010+00 0/1 0/0 0/0 .rodata heapSize$4099 */ #pragma push @@ -1235,35 +1253,35 @@ COMPILER_STRIP_GATE(80A1A330, &daNpc_Jagar_Param_c::m); SECTION_RODATA static u8 const heapSize[16] = { 0x00, 0x00, 0x38, 0x50, 0x00, 0x00, 0x38, 0x70, 0x00, 0x00, 0x38, 0x70, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A1A3D0, &heapSize); +COMPILER_STRIP_GATE(0x80A1A3D0, &heapSize); #pragma pop /* 80A1A3E0-80A1A3E4 0000B0 0004+00 0/2 0/0 0/0 .rodata @4165 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4165 = -200.0f; -COMPILER_STRIP_GATE(80A1A3E0, &lit_4165); +COMPILER_STRIP_GATE(0x80A1A3E0, &lit_4165); #pragma pop /* 80A1A3E4-80A1A3E8 0000B4 0004+00 0/1 0/0 0/0 .rodata @4166 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4166 = -100.0f; -COMPILER_STRIP_GATE(80A1A3E4, &lit_4166); +COMPILER_STRIP_GATE(0x80A1A3E4, &lit_4166); #pragma pop /* 80A1A3E8-80A1A3EC 0000B8 0004+00 0/1 0/0 0/0 .rodata @4167 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4167 = 200.0f; -COMPILER_STRIP_GATE(80A1A3E8, &lit_4167); +COMPILER_STRIP_GATE(0x80A1A3E8, &lit_4167); #pragma pop /* 80A1A3EC-80A1A3F0 0000BC 0004+00 0/2 0/0 0/0 .rodata @4168 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4168 = 300.0f; -COMPILER_STRIP_GATE(80A1A3EC, &lit_4168); +COMPILER_STRIP_GATE(0x80A1A3EC, &lit_4168); #pragma pop /* 80A1A3F0-80A1A3F4 0000C0 0004+00 4/15 0/0 0/0 .rodata @4169 */ @@ -1273,13 +1291,13 @@ SECTION_RODATA static u8 const lit_4169[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A1A3F0, &lit_4169); +COMPILER_STRIP_GATE(0x80A1A3F0, &lit_4169); /* 80A1A3F4-80A1A3F8 0000C4 0004+00 0/1 0/0 0/0 .rodata @4170 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4170 = -1000000000.0f; -COMPILER_STRIP_GATE(80A1A3F4, &lit_4170); +COMPILER_STRIP_GATE(0x80A1A3F4, &lit_4170); #pragma pop /* 80A14858-80A14B20 000238 02C8+00 1/1 0/0 0/0 .text create__13daNpc_Jagar_cFv */ @@ -1297,19 +1315,19 @@ asm void daNpc_Jagar_c::create() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4332 = 65536.0f; -COMPILER_STRIP_GATE(80A1A3F8, &lit_4332); +COMPILER_STRIP_GATE(0x80A1A3F8, &lit_4332); #pragma pop /* 80A1A3FC-80A1A400 0000CC 0004+00 0/3 0/0 0/0 .rodata @4333 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4333 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(80A1A3FC, &lit_4333); +COMPILER_STRIP_GATE(0x80A1A3FC, &lit_4333); #pragma pop /* 80A1A400-80A1A404 0000D0 0004+00 2/5 0/0 0/0 .rodata @4475 */ SECTION_RODATA static f32 const lit_4475 = 1.0f; -COMPILER_STRIP_GATE(80A1A400, &lit_4475); +COMPILER_STRIP_GATE(0x80A1A400, &lit_4475); /* 80A14B20-80A14D90 000500 0270+00 1/1 0/0 0/0 .text CreateHeap__13daNpc_Jagar_cFv */ #pragma push @@ -1444,7 +1462,7 @@ asm void daNpc_Jagar_c::Execute() { /* ############################################################################################## */ /* 80A1A404-80A1A408 0000D4 0004+00 1/2 0/0 0/0 .rodata @4524 */ SECTION_RODATA static f32 const lit_4524 = 100.0f; -COMPILER_STRIP_GATE(80A1A404, &lit_4524); +COMPILER_STRIP_GATE(0x80A1A404, &lit_4524); /* 80A14FA0-80A15034 000980 0094+00 1/1 0/0 0/0 .text Draw__13daNpc_Jagar_cFv */ #pragma push @@ -1542,7 +1560,7 @@ asm void daNpc_Jagar_c::checkChangeEvt() { /* ############################################################################################## */ /* 80A1A408-80A1A40C 0000D8 0004+00 2/8 0/0 0/0 .rodata @4718 */ SECTION_RODATA static f32 const lit_4718 = -1.0f; -COMPILER_STRIP_GATE(80A1A408, &lit_4718); +COMPILER_STRIP_GATE(0x80A1A408, &lit_4718); /* 80A15714-80A157B4 0010F4 00A0+00 1/0 0/0 0/0 .text setAfterTalkMotion__13daNpc_Jagar_cFv */ #pragma push @@ -1609,35 +1627,35 @@ asm void daNpc_Jagar_c::beforeMove() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4932 = -10.0f; -COMPILER_STRIP_GATE(80A1A40C, &lit_4932); +COMPILER_STRIP_GATE(0x80A1A40C, &lit_4932); #pragma pop /* 80A1A410-80A1A414 0000E0 0004+00 0/2 0/0 0/0 .rodata @4933 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4933 = 10.0f; -COMPILER_STRIP_GATE(80A1A410, &lit_4933); +COMPILER_STRIP_GATE(0x80A1A410, &lit_4933); #pragma pop /* 80A1A414-80A1A418 0000E4 0004+00 0/1 0/0 0/0 .rodata @4934 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4934 = 0x38C90FDB; -COMPILER_STRIP_GATE(80A1A414, &lit_4934); +COMPILER_STRIP_GATE(0x80A1A414, &lit_4934); #pragma pop /* 80A1A418-80A1A41C 0000E8 0004+00 0/1 0/0 0/0 .rodata @4935 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4935 = -60.0f; -COMPILER_STRIP_GATE(80A1A418, &lit_4935); +COMPILER_STRIP_GATE(0x80A1A418, &lit_4935); #pragma pop /* 80A1A41C-80A1A420 0000EC 0004+00 0/1 0/0 0/0 .rodata @4936 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4936 = 3.0f; -COMPILER_STRIP_GATE(80A1A41C, &lit_4936); +COMPILER_STRIP_GATE(0x80A1A41C, &lit_4936); #pragma pop /* 80A1A420-80A1A428 0000F0 0004+04 0/1 0/0 0/0 .rodata @4937 */ @@ -1648,14 +1666,14 @@ SECTION_RODATA static f32 const lit_4937[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80A1A420, &lit_4937); +COMPILER_STRIP_GATE(0x80A1A420, &lit_4937); #pragma pop /* 80A1A428-80A1A430 0000F8 0008+00 1/3 0/0 0/0 .rodata @4939 */ SECTION_RODATA static u8 const lit_4939[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A1A428, &lit_4939); +COMPILER_STRIP_GATE(0x80A1A428, &lit_4939); /* 80A1ADE0-80A1ADE4 000008 0001+03 1/1 0/0 0/0 .bss @1109 */ static u8 lit_1109[1 + 3 /* padding */]; @@ -1785,7 +1803,7 @@ asm void daNpc_Jagar_c::setAttnPos() { SECTION_RODATA static u8 const lit_4997[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A1A430, &lit_4997); +COMPILER_STRIP_GATE(0x80A1A430, &lit_4997); #pragma pop /* 80A1A438-80A1A440 000108 0008+00 0/2 0/0 0/0 .rodata @4998 */ @@ -1794,7 +1812,7 @@ COMPILER_STRIP_GATE(80A1A430, &lit_4997); SECTION_RODATA static u8 const lit_4998[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A1A438, &lit_4998); +COMPILER_STRIP_GATE(0x80A1A438, &lit_4998); #pragma pop /* 80A1A440-80A1A448 000110 0008+00 0/2 0/0 0/0 .rodata @4999 */ @@ -1803,21 +1821,21 @@ COMPILER_STRIP_GATE(80A1A438, &lit_4998); SECTION_RODATA static u8 const lit_4999[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A1A440, &lit_4999); +COMPILER_STRIP_GATE(0x80A1A440, &lit_4999); #pragma pop /* 80A1A448-80A1A44C 000118 0004+00 0/1 0/0 0/0 .rodata @5039 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5039 = 70.0f; -COMPILER_STRIP_GATE(80A1A448, &lit_5039); +COMPILER_STRIP_GATE(0x80A1A448, &lit_5039); #pragma pop /* 80A1A44C-80A1A450 00011C 0004+00 0/1 0/0 0/0 .rodata @5040 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5040 = 90.0f; -COMPILER_STRIP_GATE(80A1A44C, &lit_5040); +COMPILER_STRIP_GATE(0x80A1A44C, &lit_5040); #pragma pop /* 80A1607C-80A161EC 001A5C 0170+00 1/0 0/0 0/0 .text setCollision__13daNpc_Jagar_cFv */ @@ -1860,7 +1878,7 @@ asm void daNpc_Jagar_c::selectAction() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpc_Jagar_c::chkAction(int (daNpc_Jagar_c::*)(void*)) { +asm void daNpc_Jagar_c::chkAction(int (daNpc_Jagar_c::*param_0)(void*)) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_jagar/d_a_npc_jagar/chkAction__13daNpc_Jagar_cFM13daNpc_Jagar_cFPCvPvPv_i.s" } @@ -1871,12 +1889,19 @@ asm void daNpc_Jagar_c::chkAction(int (daNpc_Jagar_c::*)(void*)) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpc_Jagar_c::setAction(int (daNpc_Jagar_c::*)(void*)) { +asm void daNpc_Jagar_c::setAction(int (daNpc_Jagar_c::*param_0)(void*)) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_jagar/d_a_npc_jagar/setAction__13daNpc_Jagar_cFM13daNpc_Jagar_cFPCvPvPv_i.s" } #pragma pop +/* ############################################################################################## */ +/* 80A1A49C-80A1A49C 00016C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80A1A52A = "prm"; +#pragma pop + /* 80A16384-80A16544 001D64 01C0+00 1/0 0/0 0/0 .text cutClimbUp__13daNpc_Jagar_cFi */ #pragma push #pragma optimization_level 0 @@ -1894,7 +1919,15 @@ asm void daNpc_Jagar_c::cutClimbUp(int param_0) { SECTION_RODATA static u8 const lit_5148[12] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, }; -COMPILER_STRIP_GATE(80A1A450, &lit_5148); +COMPILER_STRIP_GATE(0x80A1A450, &lit_5148); +#pragma pop + +/* 80A1A49C-80A1A49C 00016C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80A1A52E = "msgNo"; +SECTION_DEAD static char const* const stringBase_80A1A534 = "msgNo2"; +SECTION_DEAD static char const* const stringBase_80A1A53B = "send"; #pragma pop /* 80A16544-80A16CD8 001F24 0794+00 1/0 0/0 0/0 .text cutNeedYourHelp__13daNpc_Jagar_cFi @@ -1923,7 +1956,7 @@ asm void daNpc_Jagar_c::cutAnger(int param_0) { SECTION_RODATA static u8 const lit_5412[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A1A45C, &lit_5412); +COMPILER_STRIP_GATE(0x80A1A45C, &lit_5412); /* 80A16EFC-80A1705C 0028DC 0160+00 1/0 0/0 0/0 .text cutConversationWithBou__13daNpc_Jagar_cFi */ #pragma push @@ -1942,7 +1975,7 @@ asm void daNpc_Jagar_c::cutConversationWithBou(int param_0) { SECTION_RODATA static u8 const lit_5445[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A1A464, &lit_5445); +COMPILER_STRIP_GATE(0x80A1A464, &lit_5445); #pragma pop /* 80A1A46C-80A1A478 00013C 000C+00 0/1 0/0 0/0 .rodata @5455 */ @@ -1951,7 +1984,7 @@ COMPILER_STRIP_GATE(80A1A464, &lit_5445); SECTION_RODATA static u8 const lit_5455[12] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, }; -COMPILER_STRIP_GATE(80A1A46C, &lit_5455); +COMPILER_STRIP_GATE(0x80A1A46C, &lit_5455); #pragma pop /* 80A1705C-80A173D8 002A3C 037C+00 1/0 0/0 0/0 .text @@ -1965,6 +1998,13 @@ asm void daNpc_Jagar_c::cutConfidentialConversation(int param_0) { } #pragma pop +/* ############################################################################################## */ +/* 80A1A49C-80A1A49C 00016C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80A1A540 = "timer"; +#pragma pop + /* 80A173D8-80A17898 002DB8 04C0+00 3/0 0/0 0/0 .text cutFindWolf__13daNpc_Jagar_cFi */ #pragma push #pragma optimization_level 0 @@ -2020,21 +2060,21 @@ asm void daNpc_Jagar_c::chkToMotion() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5527 = -40.0f; -COMPILER_STRIP_GATE(80A1A478, &lit_5527); +COMPILER_STRIP_GATE(0x80A1A478, &lit_5527); #pragma pop /* 80A1A47C-80A1A480 00014C 0004+00 0/2 0/0 0/0 .rodata @5659 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5659 = 0.5f; -COMPILER_STRIP_GATE(80A1A47C, &lit_5659); +COMPILER_STRIP_GATE(0x80A1A47C, &lit_5659); #pragma pop /* 80A1A480-80A1A484 000150 0004+00 0/1 0/0 0/0 .rodata @6101 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6101 = 180.0f; -COMPILER_STRIP_GATE(80A1A480, &lit_6101); +COMPILER_STRIP_GATE(0x80A1A480, &lit_6101); #pragma pop /* 80A17A2C-80A1856C 00340C 0B40+00 1/0 0/0 0/0 .text wait__13daNpc_Jagar_cFPv */ @@ -2052,42 +2092,42 @@ asm void daNpc_Jagar_c::wait(void* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6301 = -300.0f; -COMPILER_STRIP_GATE(80A1A484, &lit_6301); +COMPILER_STRIP_GATE(0x80A1A484, &lit_6301); #pragma pop /* 80A1A488-80A1A48C 000158 0004+00 0/1 0/0 0/0 .rodata @6302 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6302 = -50.0f; -COMPILER_STRIP_GATE(80A1A488, &lit_6302); +COMPILER_STRIP_GATE(0x80A1A488, &lit_6302); #pragma pop /* 80A1A48C-80A1A490 00015C 0004+00 0/1 0/0 0/0 .rodata @6303 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6303 = 400.0f; -COMPILER_STRIP_GATE(80A1A48C, &lit_6303); +COMPILER_STRIP_GATE(0x80A1A48C, &lit_6303); #pragma pop /* 80A1A490-80A1A494 000160 0004+00 0/1 0/0 0/0 .rodata @6304 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6304 = 45.0f; -COMPILER_STRIP_GATE(80A1A490, &lit_6304); +COMPILER_STRIP_GATE(0x80A1A490, &lit_6304); #pragma pop /* 80A1A494-80A1A498 000164 0004+00 0/1 0/0 0/0 .rodata @6305 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6305 = 135.0f; -COMPILER_STRIP_GATE(80A1A494, &lit_6305); +COMPILER_STRIP_GATE(0x80A1A494, &lit_6305); #pragma pop /* 80A1A498-80A1A49C 000168 0004+00 0/1 0/0 0/0 .rodata @6306 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6306 = 450.0f; -COMPILER_STRIP_GATE(80A1A498, &lit_6306); +COMPILER_STRIP_GATE(0x80A1A498, &lit_6306); #pragma pop /* 80A1856C-80A18B74 003F4C 0608+00 1/0 0/0 0/0 .text talkwithBou__13daNpc_Jagar_cFPv */ @@ -2466,7 +2506,7 @@ void daNpcT_c::changeBtk(int* param_0, int* param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80A1A040(int* param_0) { +extern "C" asm void func_80A1A040(void* _this, int* param_0) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_jagar/d_a_npc_jagar/func_80A1A040.s" } @@ -2476,7 +2516,7 @@ extern "C" asm void func_80A1A040(int* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80A1A05C(f32 param_0, f32 param_1) { +extern "C" asm void func_80A1A05C(void* _this, f32 param_0, f32 param_1) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_jagar/d_a_npc_jagar/func_80A1A05C.s" } @@ -2502,7 +2542,7 @@ asm void __sinit_d_a_npc_jagar_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80A1A098 = (void*)__sinit_d_a_npc_jagar_cpp; +REGISTER_CTORS(0x80A1A098, __sinit_d_a_npc_jagar_cpp); #pragma pop /* 80A1A194-80A1A274 005B74 00E0+00 1/1 0/0 0/0 .text @@ -2780,26 +2820,4 @@ static u8 data_80A1AEA8[4]; static u8 data_80A1AEAC[4]; #pragma pop -/* 80A1A49C-80A1A546 00016C 00AA+00 10/7 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80A1A49C = ""; -SECTION_DEAD static char const* const stringBase_80A1A49D = "NO_RESPONSE"; -SECTION_DEAD static char const* const stringBase_80A1A4A9 = "CLIMBUP"; -SECTION_DEAD static char const* const stringBase_80A1A4B1 = "NEED_YOUR_HELP"; -SECTION_DEAD static char const* const stringBase_80A1A4C0 = "ANGER"; -SECTION_DEAD static char const* const stringBase_80A1A4C6 = "CONVERSATION_WITH_BOU"; -SECTION_DEAD static char const* const stringBase_80A1A4DC = "CONFIDENTIAL_CONVERSATION"; -SECTION_DEAD static char const* const stringBase_80A1A4F6 = "FIND_WOLF"; -SECTION_DEAD static char const* const stringBase_80A1A500 = "FIND_WOLF_VER2"; -SECTION_DEAD static char const* const stringBase_80A1A50F = "Jagar"; -SECTION_DEAD static char const* const stringBase_80A1A515 = "Jagar1"; -SECTION_DEAD static char const* const stringBase_80A1A51C = "Jagar2"; -SECTION_DEAD static char const* const stringBase_80A1A523 = "Jagar3"; -SECTION_DEAD static char const* const stringBase_80A1A52A = "prm"; -SECTION_DEAD static char const* const stringBase_80A1A52E = "msgNo"; -SECTION_DEAD static char const* const stringBase_80A1A534 = "msgNo2"; -SECTION_DEAD static char const* const stringBase_80A1A53B = "send"; -SECTION_DEAD static char const* const stringBase_80A1A540 = "timer"; -#pragma pop +/* 80A1A49C-80A1A49C 00016C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/npc/d_a_npc_kakashi/d_a_npc_kakashi.cpp b/rel/d/a/npc/d_a_npc_kakashi/d_a_npc_kakashi.cpp index 35d734eb18d..bd9ceb64297 100644 --- a/rel/d/a/npc/d_a_npc_kakashi/d_a_npc_kakashi.cpp +++ b/rel/d/a/npc/d_a_npc_kakashi/d_a_npc_kakashi.cpp @@ -17,19 +17,19 @@ struct mDoMtx_stack_c { static u8 now[48]; }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; +struct J3DAnmTransform {}; + +struct J3DModelData {}; + struct Z2Creature { /* 802C03C8 */ Z2Creature(); /* 802C0420 */ ~Z2Creature(); }; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -42,6 +42,8 @@ struct fopAc_ac_c { /* 80018C8C */ ~fopAc_ac_c(); }; +struct daNpcT_faceMotionAnmData_c {}; + struct daNpcT_MotionSeqMngr_c { struct sequenceStepData_c {}; @@ -49,16 +51,14 @@ struct daNpcT_MotionSeqMngr_c { /* 8054E460 */ ~daNpcT_MotionSeqMngr_c(); }; +struct daNpcT_evtData_c {}; + struct daNpcT_motionAnmData_c {}; struct J3DModel {}; struct J3DJoint {}; -struct daNpcT_faceMotionAnmData_c {}; - -struct daNpcT_evtData_c {}; - struct daNpc_Kakashi_c { /* 8054B36C */ ~daNpc_Kakashi_c(); /* 8054B4E8 */ void create(); @@ -119,16 +119,16 @@ struct dCcD_GObjInf { /* 800845B0 */ void getHitSeID(u8, int); }; -struct cXyz { - /* 8054DDD0 */ ~cXyz(); - /* 8054E414 */ cXyz(); +struct csXyz { + /* 8054DED8 */ ~csXyz(); + /* 8054E8F8 */ csXyz(); }; struct _GXColorS10 {}; -struct csXyz { - /* 8054DED8 */ ~csXyz(); - /* 8054E8F8 */ csXyz(); +struct cXyz { + /* 8054DDD0 */ ~cXyz(); + /* 8054E414 */ cXyz(); }; struct daNpcT_c { @@ -468,7 +468,7 @@ extern "C" void changeAnm__8daNpcT_cFPiPi(); extern "C" void changeBck__8daNpcT_cFPiPi(); extern "C" void changeBtp__8daNpcT_cFPiPi(); extern "C" void changeBtk__8daNpcT_cFPiPi(); -extern "C" void func_8054E734(s16*); +extern "C" void func_8054E734(void* _this, s16*); extern "C" void __sinit_d_a_npc_kakashi_cpp(); extern "C" void __ct__15daNpc_Kakashi_cFPC26daNpcT_faceMotionAnmData_cPC22daNpcT_motionAnmData_cPCQ222daNpcT_MotionSeqMngr_c18sequenceStepData_ciPCQ222daNpcT_MotionSeqMngr_c18sequenceStepData_ciPC16daNpcT_evtData_cPPc(); @@ -651,6 +651,31 @@ extern "C" void __register_global_object(); // /* ############################################################################################## */ +/* 8054EBD0-8054EBD0 00010C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8054EBD0 = ""; +SECTION_DEAD static char const* const stringBase_8054EBD1 = "NO_RESPONSE"; +SECTION_DEAD static char const* const stringBase_8054EBDD = "MAROS_WHISPER"; +SECTION_DEAD static char const* const stringBase_8054EBEB = "SWDTUTORIAL_DESCRIPTION"; +SECTION_DEAD static char const* const stringBase_8054EC03 = "SWDTUTORIAL_YOKOGIRI_FAILURE"; +SECTION_DEAD static char const* const stringBase_8054EC20 = "SWDTUTORIAL_YOKOGIRI_CLEAR"; +SECTION_DEAD static char const* const stringBase_8054EC3B = "SWDTUTORIAL_TATEGIRI_SUCCESS"; +SECTION_DEAD static char const* const stringBase_8054EC58 = "SWDTUTORIAL_TATEGIRI_FAILURE"; +SECTION_DEAD static char const* const stringBase_8054EC75 = "SWDTUTORIAL_TATEGIRI_FAILURE2"; +SECTION_DEAD static char const* const stringBase_8054EC93 = "SWDTUTORIAL_TATEGIRI_CLEAR"; +SECTION_DEAD static char const* const stringBase_8054ECAE = "SWDTUTORIAL_TUKI_FAILURE"; +SECTION_DEAD static char const* const stringBase_8054ECC7 = "SWDTUTORIAL_TUKI_CLEAR"; +SECTION_DEAD static char const* const stringBase_8054ECDE = "SWDTUTORIAL_KAITENGIRI_FAILURE"; +SECTION_DEAD static char const* const stringBase_8054ECFD = "SWDTUTORIAL_KAITENGIRI_CLEAR"; +SECTION_DEAD static char const* const stringBase_8054ED1A = "SWDTUTORIAL_JUMPGIRI_FAILURE"; +SECTION_DEAD static char const* const stringBase_8054ED37 = "SWDTUTORIAL_JUMPGIRI_CLEAR"; +SECTION_DEAD static char const* const stringBase_8054ED52 = "SWDTUTORIAL_JUMPGIRI_CLEAR2"; +SECTION_DEAD static char const* const stringBase_8054ED6E = "Kakashi"; +SECTION_DEAD static char const* const stringBase_8054ED76 = "SWDTUTORIAL"; +SECTION_DEAD static char const* const stringBase_8054ED82 = "GET_WOODSWD"; +#pragma pop + /* 8054ED9C-8054EDA8 000000 000C+00 3/3 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -1084,41 +1109,41 @@ SECTION_RODATA u8 const daNpc_Kakashi_Param_c::m[152] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41, 0xF0, 0x00, 0x00, 0x41, 0xF0, 0x00, 0x00, 0x41, 0xD8, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8054EAC4, &daNpc_Kakashi_Param_c::m); +COMPILER_STRIP_GATE(0x8054EAC4, &daNpc_Kakashi_Param_c::m); /* 8054EB5C-8054EB60 000098 0004+00 0/1 0/0 0/0 .rodata @4078 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4078 = -300.0f; -COMPILER_STRIP_GATE(8054EB5C, &lit_4078); +COMPILER_STRIP_GATE(0x8054EB5C, &lit_4078); #pragma pop /* 8054EB60-8054EB64 00009C 0004+00 0/1 0/0 0/0 .rodata @4079 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4079 = -50.0f; -COMPILER_STRIP_GATE(8054EB60, &lit_4079); +COMPILER_STRIP_GATE(0x8054EB60, &lit_4079); #pragma pop /* 8054EB64-8054EB68 0000A0 0004+00 0/1 0/0 0/0 .rodata @4080 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4080 = 300.0f; -COMPILER_STRIP_GATE(8054EB64, &lit_4080); +COMPILER_STRIP_GATE(0x8054EB64, &lit_4080); #pragma pop /* 8054EB68-8054EB6C 0000A4 0004+00 0/1 0/0 0/0 .rodata @4081 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4081 = 450.0f; -COMPILER_STRIP_GATE(8054EB68, &lit_4081); +COMPILER_STRIP_GATE(0x8054EB68, &lit_4081); #pragma pop /* 8054EB6C-8054EB70 0000A8 0004+00 0/1 0/0 0/0 .rodata @4082 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4082 = -1000000000.0f; -COMPILER_STRIP_GATE(8054EB6C, &lit_4082); +COMPILER_STRIP_GATE(0x8054EB6C, &lit_4082); #pragma pop /* 8054B4E8-8054B7D8 000268 02F0+00 1/1 0/0 0/0 .text create__15daNpc_Kakashi_cFv */ @@ -1139,25 +1164,25 @@ SECTION_RODATA static u8 const lit_4269[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(8054EB70, &lit_4269); +COMPILER_STRIP_GATE(0x8054EB70, &lit_4269); /* 8054EB74-8054EB78 0000B0 0004+00 0/2 0/0 0/0 .rodata @4270 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4270 = 65536.0f; -COMPILER_STRIP_GATE(8054EB74, &lit_4270); +COMPILER_STRIP_GATE(0x8054EB74, &lit_4270); #pragma pop /* 8054EB78-8054EB7C 0000B4 0004+00 0/2 0/0 0/0 .rodata @4271 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4271 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(8054EB78, &lit_4271); +COMPILER_STRIP_GATE(0x8054EB78, &lit_4271); #pragma pop /* 8054EB7C-8054EB80 0000B8 0004+00 2/3 0/0 0/0 .rodata @4400 */ SECTION_RODATA static f32 const lit_4400 = 1.0f; -COMPILER_STRIP_GATE(8054EB7C, &lit_4400); +COMPILER_STRIP_GATE(0x8054EB7C, &lit_4400); /* 8054B7D8-8054B908 000558 0130+00 1/1 0/0 0/0 .text CreateHeap__15daNpc_Kakashi_cFv */ #pragma push @@ -1192,7 +1217,7 @@ asm void daNpc_Kakashi_c::Execute() { /* ############################################################################################## */ /* 8054EB80-8054EB84 0000BC 0004+00 1/2 0/0 0/0 .rodata @4416 */ SECTION_RODATA static f32 const lit_4416 = 100.0f; -COMPILER_STRIP_GATE(8054EB80, &lit_4416); +COMPILER_STRIP_GATE(0x8054EB80, &lit_4416); /* 8054B994-8054B9D8 000714 0044+00 1/1 0/0 0/0 .text Draw__15daNpc_Kakashi_cFv */ #pragma push @@ -1257,6 +1282,13 @@ asm void daNpc_Kakashi_c::isDelete() { } #pragma pop +/* ############################################################################################## */ +/* 8054EBD0-8054EBD0 00010C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8054ED8E = "F_SP108"; +#pragma pop + /* 8054BC98-8054BEA8 000A18 0210+00 1/1 0/0 0/0 .text reset__15daNpc_Kakashi_cFv */ #pragma push #pragma optimization_level 0 @@ -1348,35 +1380,35 @@ asm void daNpc_Kakashi_c::beforeMove() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4725 = 3.0f / 40.0f; -COMPILER_STRIP_GATE(8054EB84, &lit_4725); +COMPILER_STRIP_GATE(0x8054EB84, &lit_4725); #pragma pop /* 8054EB88-8054EB8C 0000C4 0004+00 0/1 0/0 0/0 .rodata @4726 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4726 = 50.0f; -COMPILER_STRIP_GATE(8054EB88, &lit_4726); +COMPILER_STRIP_GATE(0x8054EB88, &lit_4726); #pragma pop /* 8054EB8C-8054EB90 0000C8 0004+00 0/1 0/0 0/0 .rodata @4727 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4727 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(8054EB8C, &lit_4727); +COMPILER_STRIP_GATE(0x8054EB8C, &lit_4727); #pragma pop /* 8054EB90-8054EB94 0000CC 0004+00 0/1 0/0 0/0 .rodata @4728 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4728 = 125.0f; -COMPILER_STRIP_GATE(8054EB90, &lit_4728); +COMPILER_STRIP_GATE(0x8054EB90, &lit_4728); #pragma pop /* 8054EB94-8054EB98 0000D0 0004+00 0/2 0/0 0/0 .rodata @4729 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4729 = 40.0f; -COMPILER_STRIP_GATE(8054EB94, &lit_4729); +COMPILER_STRIP_GATE(0x8054EB94, &lit_4729); #pragma pop /* 8054C2E0-8054C584 001060 02A4+00 1/0 0/0 0/0 .text setAttnPos__15daNpc_Kakashi_cFv */ @@ -1394,35 +1426,35 @@ asm void daNpc_Kakashi_c::setAttnPos() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4831 = 80.0f; -COMPILER_STRIP_GATE(8054EB98, &lit_4831); +COMPILER_STRIP_GATE(0x8054EB98, &lit_4831); #pragma pop /* 8054EB9C-8054EBA0 0000D8 0004+00 0/1 0/0 0/0 .rodata @4832 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4832 = -80.0f; -COMPILER_STRIP_GATE(8054EB9C, &lit_4832); +COMPILER_STRIP_GATE(0x8054EB9C, &lit_4832); #pragma pop /* 8054EBA0-8054EBA4 0000DC 0004+00 0/1 0/0 0/0 .rodata @4833 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4833 = 20.0f; -COMPILER_STRIP_GATE(8054EBA0, &lit_4833); +COMPILER_STRIP_GATE(0x8054EBA0, &lit_4833); #pragma pop /* 8054EBA4-8054EBA8 0000E0 0004+00 0/1 0/0 0/0 .rodata @4834 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4834 = 30.0f; -COMPILER_STRIP_GATE(8054EBA4, &lit_4834); +COMPILER_STRIP_GATE(0x8054EBA4, &lit_4834); #pragma pop /* 8054EBA8-8054EBAC 0000E4 0004+00 0/1 0/0 0/0 .rodata @4835 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4835 = -20.0f; -COMPILER_STRIP_GATE(8054EBA8, &lit_4835); +COMPILER_STRIP_GATE(0x8054EBA8, &lit_4835); #pragma pop /* 8054F1A0-8054F1A4 000008 0001+03 1/1 0/0 0/0 .bss @1109 */ @@ -1592,7 +1624,7 @@ asm void daNpc_Kakashi_c::selectAction() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpc_Kakashi_c::chkAction(int (daNpc_Kakashi_c::*)(void*)) { +asm void daNpc_Kakashi_c::chkAction(int (daNpc_Kakashi_c::*param_0)(void*)) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_kakashi/d_a_npc_kakashi/chkAction__15daNpc_Kakashi_cFM15daNpc_Kakashi_cFPCvPvPv_i.s" } @@ -1603,7 +1635,7 @@ asm void daNpc_Kakashi_c::chkAction(int (daNpc_Kakashi_c::*)(void*)) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpc_Kakashi_c::setAction(int (daNpc_Kakashi_c::*)(void*)) { +asm void daNpc_Kakashi_c::setAction(int (daNpc_Kakashi_c::*param_0)(void*)) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_kakashi/d_a_npc_kakashi/setAction__15daNpc_Kakashi_cFM15daNpc_Kakashi_cFPCvPvPv_i.s" } @@ -1626,14 +1658,14 @@ asm void daNpc_Kakashi_c::hitChk() { SECTION_RODATA static u8 const lit_5025[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8054EBAC, &lit_5025); +COMPILER_STRIP_GATE(0x8054EBAC, &lit_5025); #pragma pop /* 8054EBB8-8054EBBC 0000F4 0004+00 0/1 0/0 0/0 .rodata @5166 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5166 = 3.0f / 5.0f; -COMPILER_STRIP_GATE(8054EBB8, &lit_5166); +COMPILER_STRIP_GATE(0x8054EBB8, &lit_5166); #pragma pop /* 8054EBBC-8054EBC4 0000F8 0004+04 0/1 0/0 0/0 .rodata @5167 */ @@ -1644,7 +1676,7 @@ SECTION_RODATA static u32 const lit_5167[1 + 1 /* padding */] = { /* padding */ 0x00000000, }; -COMPILER_STRIP_GATE(8054EBBC, &lit_5167); +COMPILER_STRIP_GATE(0x8054EBBC, &lit_5167); #pragma pop /* 8054EBC4-8054EBCC 000100 0008+00 0/1 0/0 0/0 .rodata @5170 */ @@ -1653,7 +1685,7 @@ COMPILER_STRIP_GATE(8054EBBC, &lit_5167); SECTION_RODATA static u8 const lit_5170[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8054EBC4, &lit_5170); +COMPILER_STRIP_GATE(0x8054EBC4, &lit_5170); #pragma pop /* 8054CEA0-8054D26C 001C20 03CC+00 1/1 0/0 0/0 .text @@ -1675,7 +1707,7 @@ SECTION_RODATA static u8 const id[4] = { 0x82, 0x3E, }; -COMPILER_STRIP_GATE(8054EBCC, &id); +COMPILER_STRIP_GATE(0x8054EBCC, &id); /* 8054D26C-8054D374 001FEC 0108+00 1/1 0/0 0/0 .text setPrtcls__15daNpc_Kakashi_cFi */ #pragma push @@ -1697,6 +1729,13 @@ asm void daNpc_Kakashi_c::judgeSwdTutorial() { } #pragma pop +/* ############################################################################################## */ +/* 8054EBD0-8054EBD0 00010C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8054ED96 = "prm"; +#pragma pop + /* 8054D490-8054D57C 002210 00EC+00 1/0 0/0 0/0 .text cutSwdTutorial__15daNpc_Kakashi_cFi */ #pragma push @@ -2101,7 +2140,7 @@ void daNpcT_c::changeBtk(int* param_0, int* param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_8054E734(s16* param_0) { +extern "C" asm void func_8054E734(void* _this, s16* param_0) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_kakashi/d_a_npc_kakashi/func_8054E734.s" } @@ -2127,7 +2166,7 @@ asm void __sinit_d_a_npc_kakashi_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_8054E750 = (void*)__sinit_d_a_npc_kakashi_cpp; +REGISTER_CTORS(0x8054E750, __sinit_d_a_npc_kakashi_cpp); #pragma pop /* 8054E804-8054E8F8 003584 00F4+00 1/1 0/0 0/0 .text @@ -2394,30 +2433,4 @@ static u8 data_8054F2A0[4]; static u8 data_8054F2A4[4]; #pragma pop -/* 8054EBD0-8054ED9A 00010C 01CA+00 8/5 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_8054EBD0 = ""; -SECTION_DEAD static char const* const stringBase_8054EBD1 = "NO_RESPONSE"; -SECTION_DEAD static char const* const stringBase_8054EBDD = "MAROS_WHISPER"; -SECTION_DEAD static char const* const stringBase_8054EBEB = "SWDTUTORIAL_DESCRIPTION"; -SECTION_DEAD static char const* const stringBase_8054EC03 = "SWDTUTORIAL_YOKOGIRI_FAILURE"; -SECTION_DEAD static char const* const stringBase_8054EC20 = "SWDTUTORIAL_YOKOGIRI_CLEAR"; -SECTION_DEAD static char const* const stringBase_8054EC3B = "SWDTUTORIAL_TATEGIRI_SUCCESS"; -SECTION_DEAD static char const* const stringBase_8054EC58 = "SWDTUTORIAL_TATEGIRI_FAILURE"; -SECTION_DEAD static char const* const stringBase_8054EC75 = "SWDTUTORIAL_TATEGIRI_FAILURE2"; -SECTION_DEAD static char const* const stringBase_8054EC93 = "SWDTUTORIAL_TATEGIRI_CLEAR"; -SECTION_DEAD static char const* const stringBase_8054ECAE = "SWDTUTORIAL_TUKI_FAILURE"; -SECTION_DEAD static char const* const stringBase_8054ECC7 = "SWDTUTORIAL_TUKI_CLEAR"; -SECTION_DEAD static char const* const stringBase_8054ECDE = "SWDTUTORIAL_KAITENGIRI_FAILURE"; -SECTION_DEAD static char const* const stringBase_8054ECFD = "SWDTUTORIAL_KAITENGIRI_CLEAR"; -SECTION_DEAD static char const* const stringBase_8054ED1A = "SWDTUTORIAL_JUMPGIRI_FAILURE"; -SECTION_DEAD static char const* const stringBase_8054ED37 = "SWDTUTORIAL_JUMPGIRI_CLEAR"; -SECTION_DEAD static char const* const stringBase_8054ED52 = "SWDTUTORIAL_JUMPGIRI_CLEAR2"; -SECTION_DEAD static char const* const stringBase_8054ED6E = "Kakashi"; -SECTION_DEAD static char const* const stringBase_8054ED76 = "SWDTUTORIAL"; -SECTION_DEAD static char const* const stringBase_8054ED82 = "GET_WOODSWD"; -SECTION_DEAD static char const* const stringBase_8054ED8E = "F_SP108"; -SECTION_DEAD static char const* const stringBase_8054ED96 = "prm"; -#pragma pop +/* 8054EBD0-8054EBD0 00010C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/npc/d_a_npc_kasi_hana/d_a_npc_kasi_hana.cpp b/rel/d/a/npc/d_a_npc_kasi_hana/d_a_npc_kasi_hana.cpp index 9a6f5b17977..ef86daca8c7 100644 --- a/rel/d/a/npc/d_a_npc_kasi_hana/d_a_npc_kasi_hana.cpp +++ b/rel/d/a/npc/d_a_npc_kasi_hana/d_a_npc_kasi_hana.cpp @@ -29,16 +29,16 @@ struct mDoExt_morf_c { /* 8000FB7C */ void setMorf(f32); }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; - struct J3DAnmTransform {}; +struct J3DModelData {}; + +struct Z2Creature {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -85,14 +85,10 @@ struct daNpcKasi_Mng_c { /* 80A2065C */ void getCenterPos(); }; -struct J3DModel {}; - -struct J3DJoint {}; +struct J3DAnmTexPattern {}; struct _GXColorS10 {}; -struct J3DAnmTexPattern {}; - struct J3DAnmTransformKey {}; struct daNpcF_c { @@ -132,6 +128,10 @@ struct daNpcF_c { static u8 mCcDCyl[68]; }; +struct J3DModel {}; + +struct J3DJoint {}; + struct daNpcKasiHana_c { /* 80A1BE44 */ daNpcKasiHana_c(); /* 80A1C0A4 */ ~daNpcKasiHana_c(); @@ -495,7 +495,7 @@ extern "C" bool setExpressionBtp__8daNpcF_cFi(); extern "C" void setExpression__8daNpcF_cFif(); extern "C" void drawOtherMdls__8daNpcF_cFv(); extern "C" void __dt__10cCcD_GSttsFv(); -extern "C" void func_80A20F04(int, int); +extern "C" void func_80A20F04(void* _this, int, int); extern "C" void __sinit_d_a_npc_kasi_hana_cpp(); extern "C" u8 const m__21daNpcKasiHana_Param_c[124]; extern "C" extern char const* const d_a_npc_kasi_hana__stringBase0; @@ -668,20 +668,20 @@ SECTION_RODATA static u8 const lit_3908[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A21080, &lit_3908); +COMPILER_STRIP_GATE(0x80A21080, &lit_3908); /* 80A21084-80A21088 000004 0004+00 0/1 0/0 0/0 .rodata @3909 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3909 = -70.0f; -COMPILER_STRIP_GATE(80A21084, &lit_3909); +COMPILER_STRIP_GATE(0x80A21084, &lit_3909); #pragma pop /* 80A21088-80A2108C 000008 0004+00 0/1 0/0 0/0 .rodata @3910 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3910 = -140.0f; -COMPILER_STRIP_GATE(80A21088, &lit_3910); +COMPILER_STRIP_GATE(0x80A21088, &lit_3910); #pragma pop /* 80A1AFAC-80A1B09C 0000EC 00F0+00 1/1 0/0 0/0 .text calcEscapeForm__15daNpcKasi_Mng_cFv @@ -708,7 +708,7 @@ asm cXyz::~cXyz() { /* ############################################################################################## */ /* 80A2108C-80A21090 00000C 0004+00 1/1 0/0 0/0 .rodata @3944 */ SECTION_RODATA static f32 const lit_3944 = 3.0f; -COMPILER_STRIP_GATE(80A2108C, &lit_3944); +COMPILER_STRIP_GATE(0x80A2108C, &lit_3944); /* 80A1B0D8-80A1B1C8 000218 00F0+00 2/2 0/0 0/0 .text calcCenterPos__15daNpcKasi_Mng_cFv */ @@ -728,7 +728,7 @@ SECTION_RODATA static f32 const lit_3998[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80A21090, &lit_3998); +COMPILER_STRIP_GATE(0x80A21090, &lit_3998); /* 80A21098-80A210A0 000018 0008+00 0/1 0/0 0/0 .rodata @3999 */ #pragma push @@ -736,7 +736,7 @@ COMPILER_STRIP_GATE(80A21090, &lit_3998); SECTION_RODATA static u8 const lit_3999[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A21098, &lit_3999); +COMPILER_STRIP_GATE(0x80A21098, &lit_3999); #pragma pop /* 80A210A0-80A210A8 000020 0008+00 0/1 0/0 0/0 .rodata @4000 */ @@ -745,7 +745,7 @@ COMPILER_STRIP_GATE(80A21098, &lit_3999); SECTION_RODATA static u8 const lit_4000[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A210A0, &lit_4000); +COMPILER_STRIP_GATE(0x80A210A0, &lit_4000); #pragma pop /* 80A210A8-80A210B0 000028 0008+00 0/1 0/0 0/0 .rodata @4001 */ @@ -754,7 +754,7 @@ COMPILER_STRIP_GATE(80A210A0, &lit_4000); SECTION_RODATA static u8 const lit_4001[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A210A8, &lit_4001); +COMPILER_STRIP_GATE(0x80A210A8, &lit_4001); #pragma pop /* 80A1B1C8-80A1B35C 000308 0194+00 1/1 0/0 0/0 .text getDistFromCenter__15daNpcKasi_Mng_cFv */ @@ -877,25 +877,25 @@ asm void daNpcKasi_Mng_c::chkEscape() { SECTION_RODATA static u8 const lit_4181[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A210B0, &lit_4181); +COMPILER_STRIP_GATE(0x80A210B0, &lit_4181); #pragma pop /* 80A210BC-80A210C0 00003C 0004+00 0/1 0/0 0/0 .rodata @4210 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4210 = 30.0f; -COMPILER_STRIP_GATE(80A210BC, &lit_4210); +COMPILER_STRIP_GATE(0x80A210BC, &lit_4210); #pragma pop /* 80A210C0-80A210C4 000040 0004+00 3/8 0/0 0/0 .rodata @4211 */ SECTION_RODATA static f32 const lit_4211 = 1.0f; -COMPILER_STRIP_GATE(80A210C0, &lit_4211); +COMPILER_STRIP_GATE(0x80A210C0, &lit_4211); /* 80A210C4-80A210C8 000044 0004+00 0/1 0/0 0/0 .rodata @4212 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4212 = 115.0f; -COMPILER_STRIP_GATE(80A210C4, &lit_4212); +COMPILER_STRIP_GATE(0x80A210C4, &lit_4212); #pragma pop /* 80A1B920-80A1BAAC 000A60 018C+00 1/1 0/0 0/0 .text createHearts__15daNpcKasi_Mng_cFv @@ -995,6 +995,19 @@ asm void daNpcKasi_Mng_c::chgWeightLight() { #pragma pop /* ############################################################################################## */ +/* 80A21358-80A21358 0002D8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80A21358 = "kasi_hana"; +SECTION_DEAD static char const* const stringBase_80A21362 = "girls"; +SECTION_DEAD static char const* const stringBase_80A21368 = "Wgeneral"; +SECTION_DEAD static char const* const stringBase_80A21371 = "KASIMASI_APPEAR"; +SECTION_DEAD static char const* const stringBase_80A21381 = "KASIMASI_TALK"; +SECTION_DEAD static char const* const stringBase_80A2138F = "KASIMASI_HEART"; +SECTION_DEAD static char const* const stringBase_80A2139E = "KASIMASI_CHEER"; +SECTION_DEAD static char const* const stringBase_80A213AD = "KASIMASI_CHEER2"; +#pragma pop + /* 80A213D4-80A213E0 000000 000C+00 5/5 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -1544,34 +1557,34 @@ SECTION_RODATA u8 const daNpcKasiHana_Param_c::m[124] = { 0x00, 0x3C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x44, 0x48, 0x00, 0x00, 0x43, 0xC8, 0x00, 0x00, 0x41, 0x60, 0x00, 0x00, 0x41, 0x80, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A210C8, &daNpcKasiHana_Param_c::m); +COMPILER_STRIP_GATE(0x80A210C8, &daNpcKasiHana_Param_c::m); /* 80A21144-80A21148 0000C4 0004+00 0/1 0/0 0/0 .rodata @4768 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4768 = -60.0f; -COMPILER_STRIP_GATE(80A21144, &lit_4768); +COMPILER_STRIP_GATE(0x80A21144, &lit_4768); #pragma pop /* 80A21148-80A2114C 0000C8 0004+00 0/1 0/0 0/0 .rodata @4769 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4769 = -10.0f; -COMPILER_STRIP_GATE(80A21148, &lit_4769); +COMPILER_STRIP_GATE(0x80A21148, &lit_4769); #pragma pop /* 80A2114C-80A21150 0000CC 0004+00 0/1 0/0 0/0 .rodata @4770 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4770 = 60.0f; -COMPILER_STRIP_GATE(80A2114C, &lit_4770); +COMPILER_STRIP_GATE(0x80A2114C, &lit_4770); #pragma pop /* 80A21150-80A21154 0000D0 0004+00 0/1 0/0 0/0 .rodata @4771 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4771 = 160.0f; -COMPILER_STRIP_GATE(80A21150, &lit_4771); +COMPILER_STRIP_GATE(0x80A21150, &lit_4771); #pragma pop /* 80A1C334-80A1C5B0 001474 027C+00 1/1 0/0 0/0 .text Create__15daNpcKasiHana_cFv */ @@ -1589,7 +1602,7 @@ asm void daNpcKasiHana_c::Create() { #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4818 = 0x3F5CF29A; -COMPILER_STRIP_GATE(80A21154, &lit_4818); +COMPILER_STRIP_GATE(0x80A21154, &lit_4818); #pragma pop /* 80A1C5B0-80A1C734 0016F0 0184+00 1/1 0/0 0/0 .text CreateHeap__15daNpcKasiHana_cFv */ @@ -1637,7 +1650,7 @@ asm void daNpcKasiHana_c::Draw() { SECTION_RODATA static u8 const lit_4839[12] = { 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x03, }; -COMPILER_STRIP_GATE(80A21158, &lit_4839); +COMPILER_STRIP_GATE(0x80A21158, &lit_4839); /* 80A1C7D8-80A1C964 001918 018C+00 1/1 0/0 0/0 .text * ctrlJoint__15daNpcKasiHana_cFP8J3DJointP8J3DModel */ @@ -1697,12 +1710,12 @@ asm void daNpcKasiHana_c::main() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5044 = 10.0f; -COMPILER_STRIP_GATE(80A21164, &lit_5044); +COMPILER_STRIP_GATE(0x80A21164, &lit_5044); #pragma pop /* 80A21168-80A2116C 0000E8 0004+00 1/2 0/0 0/0 .rodata @5045 */ SECTION_RODATA static f32 const lit_5045 = 15.0f; -COMPILER_STRIP_GATE(80A21168, &lit_5045); +COMPILER_STRIP_GATE(0x80A21168, &lit_5045); /* 80A1CD28-80A1CED0 001E68 01A8+00 1/0 0/0 0/0 .text setAttnPos__15daNpcKasiHana_cFv */ #pragma push @@ -1757,7 +1770,7 @@ asm void daNpcKasiHana_c::reset() { SECTION_RODATA static u8 const lit_5120[12] = { 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A2116C, &lit_5120); +COMPILER_STRIP_GATE(0x80A2116C, &lit_5120); #pragma pop /* 80A21178-80A2117C 0000F8 0004+00 0/1 0/0 0/0 .rodata @5121 */ @@ -1769,7 +1782,7 @@ SECTION_RODATA static u8 const lit_5121[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A21178, &lit_5121); +COMPILER_STRIP_GATE(0x80A21178, &lit_5121); #pragma pop /* 80A2117C-80A21188 0000FC 000C+00 0/1 0/0 0/0 .rodata @5122 */ @@ -1778,7 +1791,7 @@ COMPILER_STRIP_GATE(80A21178, &lit_5121); SECTION_RODATA static u8 const lit_5122[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A2117C, &lit_5122); +COMPILER_STRIP_GATE(0x80A2117C, &lit_5122); #pragma pop /* 80A21188-80A2118C 000108 0004+00 0/1 0/0 0/0 .rodata @5123 */ @@ -1790,7 +1803,7 @@ SECTION_RODATA static u8 const lit_5123[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A21188, &lit_5123); +COMPILER_STRIP_GATE(0x80A21188, &lit_5123); #pragma pop /* 80A2118C-80A21198 00010C 000C+00 0/1 0/0 0/0 .rodata @5124 */ @@ -1799,7 +1812,7 @@ COMPILER_STRIP_GATE(80A21188, &lit_5123); SECTION_RODATA static u8 const lit_5124[12] = { 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A2118C, &lit_5124); +COMPILER_STRIP_GATE(0x80A2118C, &lit_5124); #pragma pop /* 80A21198-80A2119C 000118 0004+00 0/1 0/0 0/0 .rodata @5125 */ @@ -1811,7 +1824,7 @@ SECTION_RODATA static u8 const lit_5125[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A21198, &lit_5125); +COMPILER_STRIP_GATE(0x80A21198, &lit_5125); #pragma pop /* 80A2119C-80A211A8 00011C 000C+00 0/1 0/0 0/0 .rodata @5126 */ @@ -1820,7 +1833,7 @@ COMPILER_STRIP_GATE(80A21198, &lit_5125); SECTION_RODATA static u8 const lit_5126[12] = { 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A2119C, &lit_5126); +COMPILER_STRIP_GATE(0x80A2119C, &lit_5126); #pragma pop /* 80A211A8-80A211AC 000128 0004+00 0/1 0/0 0/0 .rodata @5127 */ @@ -1832,7 +1845,7 @@ SECTION_RODATA static u8 const lit_5127[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A211A8, &lit_5127); +COMPILER_STRIP_GATE(0x80A211A8, &lit_5127); #pragma pop /* 80A211AC-80A211B8 00012C 000C+00 0/1 0/0 0/0 .rodata @5128 */ @@ -1841,7 +1854,7 @@ COMPILER_STRIP_GATE(80A211A8, &lit_5127); SECTION_RODATA static u8 const lit_5128[12] = { 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A211AC, &lit_5128); +COMPILER_STRIP_GATE(0x80A211AC, &lit_5128); #pragma pop /* 80A211B8-80A211BC 000138 0004+00 0/1 0/0 0/0 .rodata @5129 */ @@ -1853,7 +1866,7 @@ SECTION_RODATA static u8 const lit_5129[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A211B8, &lit_5129); +COMPILER_STRIP_GATE(0x80A211B8, &lit_5129); #pragma pop /* 80A211BC-80A211C8 00013C 000C+00 0/1 0/0 0/0 .rodata @5130 */ @@ -1862,7 +1875,7 @@ COMPILER_STRIP_GATE(80A211B8, &lit_5129); SECTION_RODATA static u8 const lit_5130[12] = { 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A211BC, &lit_5130); +COMPILER_STRIP_GATE(0x80A211BC, &lit_5130); #pragma pop /* 80A211C8-80A211CC 000148 0004+00 0/1 0/0 0/0 .rodata @5131 */ @@ -1874,7 +1887,7 @@ SECTION_RODATA static u8 const lit_5131[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A211C8, &lit_5131); +COMPILER_STRIP_GATE(0x80A211C8, &lit_5131); #pragma pop /* 80A211CC-80A211D8 00014C 000C+00 0/1 0/0 0/0 .rodata @5132 */ @@ -1883,7 +1896,7 @@ COMPILER_STRIP_GATE(80A211C8, &lit_5131); SECTION_RODATA static u8 const lit_5132[12] = { 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A211CC, &lit_5132); +COMPILER_STRIP_GATE(0x80A211CC, &lit_5132); #pragma pop /* 80A211D8-80A211DC 000158 0004+00 0/1 0/0 0/0 .rodata @5133 */ @@ -1895,7 +1908,7 @@ SECTION_RODATA static u8 const lit_5133[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A211D8, &lit_5133); +COMPILER_STRIP_GATE(0x80A211D8, &lit_5133); #pragma pop /* 80A211DC-80A211E8 00015C 000C+00 0/1 0/0 0/0 .rodata @5134 */ @@ -1904,7 +1917,7 @@ COMPILER_STRIP_GATE(80A211D8, &lit_5133); SECTION_RODATA static u8 const lit_5134[12] = { 0x00, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A211DC, &lit_5134); +COMPILER_STRIP_GATE(0x80A211DC, &lit_5134); #pragma pop /* 80A211E8-80A211EC 000168 0004+00 0/1 0/0 0/0 .rodata @5135 */ @@ -1916,7 +1929,7 @@ SECTION_RODATA static u8 const lit_5135[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A211E8, &lit_5135); +COMPILER_STRIP_GATE(0x80A211E8, &lit_5135); #pragma pop /* 80A211EC-80A211F8 00016C 000C+00 0/1 0/0 0/0 .rodata @5136 */ @@ -1925,7 +1938,7 @@ COMPILER_STRIP_GATE(80A211E8, &lit_5135); SECTION_RODATA static u8 const lit_5136[12] = { 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A211EC, &lit_5136); +COMPILER_STRIP_GATE(0x80A211EC, &lit_5136); #pragma pop /* 80A211F8-80A211FC 000178 0004+00 0/1 0/0 0/0 .rodata @5137 */ @@ -1937,7 +1950,7 @@ SECTION_RODATA static u8 const lit_5137[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A211F8, &lit_5137); +COMPILER_STRIP_GATE(0x80A211F8, &lit_5137); #pragma pop /* 80A211FC-80A21208 00017C 000C+00 0/1 0/0 0/0 .rodata @5138 */ @@ -1946,7 +1959,7 @@ COMPILER_STRIP_GATE(80A211F8, &lit_5137); SECTION_RODATA static u8 const lit_5138[12] = { 0x00, 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A211FC, &lit_5138); +COMPILER_STRIP_GATE(0x80A211FC, &lit_5138); #pragma pop /* 80A21208-80A2120C 000188 0004+00 0/1 0/0 0/0 .rodata @5139 */ @@ -1958,7 +1971,7 @@ SECTION_RODATA static u8 const lit_5139[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A21208, &lit_5139); +COMPILER_STRIP_GATE(0x80A21208, &lit_5139); #pragma pop /* 80A2120C-80A21218 00018C 000C+00 0/1 0/0 0/0 .rodata @5140 */ @@ -1967,7 +1980,7 @@ COMPILER_STRIP_GATE(80A21208, &lit_5139); SECTION_RODATA static u8 const lit_5140[12] = { 0x00, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A2120C, &lit_5140); +COMPILER_STRIP_GATE(0x80A2120C, &lit_5140); #pragma pop /* 80A21218-80A2121C 000198 0004+00 0/1 0/0 0/0 .rodata @5141 */ @@ -1979,7 +1992,7 @@ SECTION_RODATA static u8 const lit_5141[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A21218, &lit_5141); +COMPILER_STRIP_GATE(0x80A21218, &lit_5141); #pragma pop /* 80A2121C-80A21228 00019C 000C+00 0/1 0/0 0/0 .rodata @5142 */ @@ -1988,7 +2001,7 @@ COMPILER_STRIP_GATE(80A21218, &lit_5141); SECTION_RODATA static u8 const lit_5142[12] = { 0x00, 0x0B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80A2121C, &lit_5142); +COMPILER_STRIP_GATE(0x80A2121C, &lit_5142); #pragma pop /* 80A21228-80A21234 0001A8 000C+00 0/1 0/0 0/0 .rodata @5143 */ @@ -1997,7 +2010,7 @@ COMPILER_STRIP_GATE(80A2121C, &lit_5142); SECTION_RODATA static u8 const lit_5143[12] = { 0x00, 0x0D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80A21228, &lit_5143); +COMPILER_STRIP_GATE(0x80A21228, &lit_5143); #pragma pop /* 80A21234-80A21240 0001B4 000C+00 0/1 0/0 0/0 .rodata @5144 */ @@ -2006,7 +2019,7 @@ COMPILER_STRIP_GATE(80A21228, &lit_5143); SECTION_RODATA static u8 const lit_5144[12] = { 0x00, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80A21234, &lit_5144); +COMPILER_STRIP_GATE(0x80A21234, &lit_5144); #pragma pop /* 80A21240-80A2124C 0001C0 000C+00 0/1 0/0 0/0 .rodata @5145 */ @@ -2015,7 +2028,7 @@ COMPILER_STRIP_GATE(80A21234, &lit_5144); SECTION_RODATA static u8 const lit_5145[12] = { 0x00, 0x0B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80A21240, &lit_5145); +COMPILER_STRIP_GATE(0x80A21240, &lit_5145); #pragma pop /* 80A2124C-80A21258 0001CC 000C+00 0/1 0/0 0/0 .rodata @5146 */ @@ -2024,7 +2037,7 @@ COMPILER_STRIP_GATE(80A21240, &lit_5145); SECTION_RODATA static u8 const lit_5146[12] = { 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80A2124C, &lit_5146); +COMPILER_STRIP_GATE(0x80A2124C, &lit_5146); #pragma pop /* 80A21258-80A21264 0001D8 000C+00 0/1 0/0 0/0 .rodata @5147 */ @@ -2033,7 +2046,7 @@ COMPILER_STRIP_GATE(80A2124C, &lit_5146); SECTION_RODATA static u8 const lit_5147[12] = { 0x00, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A21258, &lit_5147); +COMPILER_STRIP_GATE(0x80A21258, &lit_5147); #pragma pop /* 80A1D238-80A1D604 002378 03CC+00 1/1 0/0 0/0 .text playMotion__15daNpcKasiHana_cFv */ @@ -2062,7 +2075,7 @@ asm void daNpcKasiHana_c::playMotionAnmLoop(daNpcF_c::daNpcF_anmPlayData*** para #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpcKasiHana_c::setAction(int (daNpcKasiHana_c::*)(int)) { +asm void daNpcKasiHana_c::setAction(int (daNpcKasiHana_c::*param_0)(int)) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_kasi_hana/d_a_npc_kasi_hana/setAction__15daNpcKasiHana_cFM15daNpcKasiHana_cFPCvPvi_i.s" } @@ -2086,7 +2099,7 @@ SECTION_RODATA static u8 const lit_5148[24] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A21264, &lit_5148); +COMPILER_STRIP_GATE(0x80A21264, &lit_5148); #pragma pop /* 80A2127C-80A212AC 0001FC 0030+00 0/0 0/0 0/0 .rodata @5149 */ @@ -2097,7 +2110,7 @@ SECTION_RODATA static u8 const lit_5149[48] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A2127C, &lit_5149); +COMPILER_STRIP_GATE(0x80A2127C, &lit_5149); #pragma pop /* 80A212AC-80A212B8 00022C 000C+00 0/1 0/0 0/0 .rodata @5228 */ @@ -2106,28 +2119,28 @@ COMPILER_STRIP_GATE(80A2127C, &lit_5149); SECTION_RODATA static u8 const lit_5228[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A212AC, &lit_5228); +COMPILER_STRIP_GATE(0x80A212AC, &lit_5228); #pragma pop /* 80A212B8-80A212BC 000238 0004+00 0/1 0/0 0/0 .rodata @5276 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5276 = -80.0f; -COMPILER_STRIP_GATE(80A212B8, &lit_5276); +COMPILER_STRIP_GATE(0x80A212B8, &lit_5276); #pragma pop /* 80A212BC-80A212C0 00023C 0004+00 0/1 0/0 0/0 .rodata @5277 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5277 = 80.0f; -COMPILER_STRIP_GATE(80A212BC, &lit_5277); +COMPILER_STRIP_GATE(0x80A212BC, &lit_5277); #pragma pop /* 80A212C0-80A212C4 000240 0004+00 0/1 0/0 0/0 .rodata @5278 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5278 = 40.0f; -COMPILER_STRIP_GATE(80A212C0, &lit_5278); +COMPILER_STRIP_GATE(0x80A212C0, &lit_5278); #pragma pop /* 80A1D848-80A1DA28 002988 01E0+00 1/1 0/0 0/0 .text lookat__15daNpcKasiHana_cFv */ @@ -2166,21 +2179,21 @@ asm void daNpcKasiHana_c::chkFindPlayer() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5471 = 12.0f; -COMPILER_STRIP_GATE(80A212C4, &lit_5471); +COMPILER_STRIP_GATE(0x80A212C4, &lit_5471); #pragma pop /* 80A212C8-80A212CC 000248 0004+00 0/1 0/0 0/0 .rodata @5472 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5472 = 350.0f; -COMPILER_STRIP_GATE(80A212C8, &lit_5472); +COMPILER_STRIP_GATE(0x80A212C8, &lit_5472); #pragma pop /* 80A212CC-80A212D0 00024C 0004+00 0/1 0/0 0/0 .rodata @5473 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5473 = 50.0f; -COMPILER_STRIP_GATE(80A212CC, &lit_5473); +COMPILER_STRIP_GATE(0x80A212CC, &lit_5473); #pragma pop /* 80A212D0-80A212D8 000250 0008+00 0/1 0/0 0/0 .rodata @5474 */ @@ -2189,7 +2202,7 @@ COMPILER_STRIP_GATE(80A212CC, &lit_5473); SECTION_RODATA static u8 const lit_5474[8] = { 0x40, 0x7F, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A212D0, &lit_5474); +COMPILER_STRIP_GATE(0x80A212D0, &lit_5474); #pragma pop /* 80A212D8-80A212E0 000258 0008+00 0/1 0/0 0/0 .rodata @5475 */ @@ -2198,7 +2211,7 @@ COMPILER_STRIP_GATE(80A212D0, &lit_5474); SECTION_RODATA static u8 const lit_5475[8] = { 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A212D8, &lit_5475); +COMPILER_STRIP_GATE(0x80A212D8, &lit_5475); #pragma pop /* 80A1DC00-80A1E184 002D40 0584+00 10/0 0/0 0/0 .text wait__15daNpcKasiHana_cFi */ @@ -2429,14 +2442,14 @@ asm void daNpcKasiHana_c::demo(int param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5635 = 1.5f; -COMPILER_STRIP_GATE(80A212E0, &lit_5635); +COMPILER_STRIP_GATE(0x80A212E0, &lit_5635); #pragma pop /* 80A212E4-80A212E8 000264 0004+00 0/1 0/0 0/0 .rodata @5847 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5847 = 1.75f; -COMPILER_STRIP_GATE(80A212E4, &lit_5847); +COMPILER_STRIP_GATE(0x80A212E4, &lit_5847); #pragma pop /* 80A1EE38-80A1EF90 003F78 0158+00 1/0 0/0 0/0 .text escape__15daNpcKasiHana_cFi */ @@ -2502,6 +2515,13 @@ asm void daNpcKasiHana_c::_getOffset(cXyz const& param_0, cXyz& param_1) { } #pragma pop +/* ############################################################################################## */ +/* 80A21358-80A21358 0002D8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80A213BD = "cutId"; +#pragma pop + /* 80A1F384-80A1F42C 0044C4 00A8+00 1/0 0/0 0/0 .text _Evt_Kasi_Appear__15daNpcKasiHana_cFi */ #pragma push #pragma optimization_level 0 @@ -2528,7 +2548,7 @@ asm void daNpcKasiHana_c::_Evt_Kasi_Appear_CutInit(int const& param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5999 = 19.0f; -COMPILER_STRIP_GATE(80A212E8, &lit_5999); +COMPILER_STRIP_GATE(0x80A212E8, &lit_5999); #pragma pop /* 80A1F50C-80A1F638 00464C 012C+00 1/1 0/0 0/0 .text @@ -2542,6 +2562,14 @@ asm void daNpcKasiHana_c::_Evt_Kasi_Appear_CutMain(int const& param_0) { } #pragma pop +/* ############################################################################################## */ +/* 80A21358-80A21358 0002D8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80A213C3 = "mesNo2"; +SECTION_DEAD static char const* const stringBase_80A213CA = "mesNo1"; +#pragma pop + /* 80A1F638-80A1F740 004778 0108+00 1/0 0/0 0/0 .text _Evt_Kasi_Talk__15daNpcKasiHana_cFi */ #pragma push @@ -2558,7 +2586,7 @@ asm void daNpcKasiHana_c::_Evt_Kasi_Talk(int param_0) { SECTION_RODATA static u8 const lit_6026[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A212EC, &lit_6026); +COMPILER_STRIP_GATE(0x80A212EC, &lit_6026); /* 80A1F740-80A1F860 004880 0120+00 1/1 0/0 0/0 .text * _Evt_Kasi_Talk_CutInit__15daNpcKasiHana_cFRCi */ @@ -2578,7 +2606,7 @@ asm void daNpcKasiHana_c::_Evt_Kasi_Talk_CutInit(int const& param_0) { SECTION_RODATA static u8 const lit_6044[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A212F8, &lit_6044); +COMPILER_STRIP_GATE(0x80A212F8, &lit_6044); #pragma pop /* 80A21304-80A2130C 000284 0008+00 0/1 0/0 0/0 .rodata @6045 */ @@ -2587,7 +2615,7 @@ COMPILER_STRIP_GATE(80A212F8, &lit_6044); SECTION_RODATA static u8 const lit_6045[8] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, }; -COMPILER_STRIP_GATE(80A21304, &lit_6045); +COMPILER_STRIP_GATE(0x80A21304, &lit_6045); #pragma pop /* 80A1F860-80A1F9F4 0049A0 0194+00 1/1 0/0 0/0 .text @@ -2646,7 +2674,7 @@ asm void daNpcKasiHana_c::_Evt_Kasi_Cheer(int param_0) { SECTION_RODATA static u8 const lit_6169[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A2130C, &lit_6169); +COMPILER_STRIP_GATE(0x80A2130C, &lit_6169); /* 80A1FE6C-80A1FF78 004FAC 010C+00 1/1 0/0 0/0 .text * _Evt_Kasi_Cheer_CutInit__15daNpcKasiHana_cFRCi */ @@ -2666,7 +2694,7 @@ asm void daNpcKasiHana_c::_Evt_Kasi_Cheer_CutInit(int const& param_0) { SECTION_RODATA static u8 const lit_6185[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A21318, &lit_6185); +COMPILER_STRIP_GATE(0x80A21318, &lit_6185); #pragma pop /* 80A21324-80A2132C 0002A4 0008+00 0/1 0/0 0/0 .rodata @6186 */ @@ -2675,7 +2703,7 @@ COMPILER_STRIP_GATE(80A21318, &lit_6185); SECTION_RODATA static u8 const lit_6186[8] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, }; -COMPILER_STRIP_GATE(80A21324, &lit_6186); +COMPILER_STRIP_GATE(0x80A21324, &lit_6186); #pragma pop /* 80A1FF78-80A2016C 0050B8 01F4+00 1/1 0/0 0/0 .text @@ -2704,7 +2732,7 @@ asm void daNpcKasiHana_c::_Evt_Kasi_Cheer2(int param_0) { SECTION_RODATA static u8 const lit_6235[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A2132C, &lit_6235); +COMPILER_STRIP_GATE(0x80A2132C, &lit_6235); /* 80A20244-80A20350 005384 010C+00 1/1 0/0 0/0 .text * _Evt_Kasi_Cheer2_CutInit__15daNpcKasiHana_cFRCi */ @@ -2724,7 +2752,7 @@ asm void daNpcKasiHana_c::_Evt_Kasi_Cheer2_CutInit(int const& param_0) { SECTION_RODATA static u8 const lit_6251[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A21338, &lit_6251); +COMPILER_STRIP_GATE(0x80A21338, &lit_6251); #pragma pop /* 80A21344-80A21350 0002C4 0008+04 0/1 0/0 0/0 .rodata @6252 */ @@ -2745,7 +2773,7 @@ SECTION_RODATA static u8 const lit_6252[8 + 4 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A21344, &lit_6252); +COMPILER_STRIP_GATE(0x80A21344, &lit_6252); #pragma pop /* 80A20350-80A20544 005490 01F4+00 1/1 0/0 0/0 .text @@ -3043,13 +3071,13 @@ asm cCcD_GStts::~cCcD_GStts() { SECTION_RODATA static u8 const lit_6323[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A21350, &lit_6323); +COMPILER_STRIP_GATE(0x80A21350, &lit_6323); /* 80A20F04-80A20F80 006044 007C+00 1/1 0/0 0/0 .text cLib_getRndValue__Fii */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80A20F04(int param_0, int param_1) { +extern "C" asm void func_80A20F04(void* _this, int param_0, int param_1) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_kasi_hana/d_a_npc_kasi_hana/func_80A20F04.s" } @@ -3067,7 +3095,7 @@ asm void __sinit_d_a_npc_kasi_hana_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80A20F80 = (void*)__sinit_d_a_npc_kasi_hana_cpp; +REGISTER_CTORS(0x80A20F80, __sinit_d_a_npc_kasi_hana_cpp); #pragma pop /* ############################################################################################## */ @@ -3242,19 +3270,4 @@ static u8 data_80A218C0[4]; static u8 data_80A218C4[4]; #pragma pop -/* 80A21358-80A213D1 0002D8 0079+00 9/6 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80A21358 = "kasi_hana"; -SECTION_DEAD static char const* const stringBase_80A21362 = "girls"; -SECTION_DEAD static char const* const stringBase_80A21368 = "Wgeneral"; -SECTION_DEAD static char const* const stringBase_80A21371 = "KASIMASI_APPEAR"; -SECTION_DEAD static char const* const stringBase_80A21381 = "KASIMASI_TALK"; -SECTION_DEAD static char const* const stringBase_80A2138F = "KASIMASI_HEART"; -SECTION_DEAD static char const* const stringBase_80A2139E = "KASIMASI_CHEER"; -SECTION_DEAD static char const* const stringBase_80A213AD = "KASIMASI_CHEER2"; -SECTION_DEAD static char const* const stringBase_80A213BD = "cutId"; -SECTION_DEAD static char const* const stringBase_80A213C3 = "mesNo2"; -SECTION_DEAD static char const* const stringBase_80A213CA = "mesNo1"; -#pragma pop +/* 80A21358-80A21358 0002D8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/npc/d_a_npc_kasi_kyu/d_a_npc_kasi_kyu.cpp b/rel/d/a/npc/d_a_npc_kasi_kyu/d_a_npc_kasi_kyu.cpp index b5b666f28f6..c967df6d9d1 100644 --- a/rel/d/a/npc/d_a_npc_kasi_kyu/d_a_npc_kasi_kyu.cpp +++ b/rel/d/a/npc/d_a_npc_kasi_kyu/d_a_npc_kasi_kyu.cpp @@ -28,16 +28,16 @@ struct mDoExt_morf_c { /* 8000FB7C */ void setMorf(f32); }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; - struct J3DAnmTransform {}; +struct J3DModelData {}; + +struct Z2Creature {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -50,22 +50,10 @@ struct fopAc_ac_c { /* 80018C8C */ ~fopAc_ac_c(); }; -struct J3DModel {}; - -struct Vec {}; - -struct cXyz { - /* 80266B34 */ void operator-(Vec const&) const; - /* 80A25174 */ ~cXyz(); - /* 80A251B0 */ cXyz(); -}; - -struct J3DJoint {}; +struct J3DAnmTexPattern {}; struct _GXColorS10 {}; -struct J3DAnmTexPattern {}; - struct J3DAnmTransformKey {}; struct daNpcF_c { @@ -101,6 +89,18 @@ struct daNpcF_c { static u8 mCcDCyl[68]; }; +struct J3DModel {}; + +struct J3DJoint {}; + +struct Vec {}; + +struct cXyz { + /* 80266B34 */ void operator-(Vec const&) const; + /* 80A25174 */ ~cXyz(); + /* 80A251B0 */ cXyz(); +}; + struct daNpcKasiKyu_c { /* 80A219CC */ daNpcKasiKyu_c(); /* 80A21C14 */ ~daNpcKasiKyu_c(); @@ -544,6 +544,14 @@ extern "C" void __register_global_object(); // /* ############################################################################################## */ +/* 80A25B0C-80A25B0C 000254 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80A25B0C = "kasi_kyu"; +SECTION_DEAD static char const* const stringBase_80A25B15 = "girls"; +SECTION_DEAD static char const* const stringBase_80A25B1B = "Wgeneral"; +#pragma pop + /* 80A25B24-80A25B30 000000 000C+00 2/2 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -1133,34 +1141,34 @@ SECTION_RODATA u8 const daNpcKasiKyu_Param_c::m[116] = { 0x00, 0x00, 0xC3, 0x96, 0x00, 0x00, 0x00, 0x3C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x41, 0x80, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A258B8, &daNpcKasiKyu_Param_c::m); +COMPILER_STRIP_GATE(0x80A258B8, &daNpcKasiKyu_Param_c::m); /* 80A2592C-80A25930 000074 0004+00 0/1 0/0 0/0 .rodata @4197 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4197 = -60.0f; -COMPILER_STRIP_GATE(80A2592C, &lit_4197); +COMPILER_STRIP_GATE(0x80A2592C, &lit_4197); #pragma pop /* 80A25930-80A25934 000078 0004+00 0/1 0/0 0/0 .rodata @4198 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4198 = -10.0f; -COMPILER_STRIP_GATE(80A25930, &lit_4198); +COMPILER_STRIP_GATE(0x80A25930, &lit_4198); #pragma pop /* 80A25934-80A25938 00007C 0004+00 0/1 0/0 0/0 .rodata @4199 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4199 = 60.0f; -COMPILER_STRIP_GATE(80A25934, &lit_4199); +COMPILER_STRIP_GATE(0x80A25934, &lit_4199); #pragma pop /* 80A25938-80A2593C 000080 0004+00 0/1 0/0 0/0 .rodata @4200 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4200 = 220.0f; -COMPILER_STRIP_GATE(80A25938, &lit_4200); +COMPILER_STRIP_GATE(0x80A25938, &lit_4200); #pragma pop /* 80A21E24-80A220A0 000544 027C+00 1/1 0/0 0/0 .text Create__14daNpcKasiKyu_cFv */ @@ -1176,18 +1184,18 @@ asm void daNpcKasiKyu_c::Create() { /* ############################################################################################## */ /* 80A2593C-80A25940 000084 0004+00 4/8 0/0 0/0 .rodata @4247 */ SECTION_RODATA static f32 const lit_4247 = 1.0f; -COMPILER_STRIP_GATE(80A2593C, &lit_4247); +COMPILER_STRIP_GATE(0x80A2593C, &lit_4247); /* 80A25940-80A25944 000088 0004+00 0/1 0/0 0/0 .rodata @4248 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4248 = 0x3F5CF29A; -COMPILER_STRIP_GATE(80A25940, &lit_4248); +COMPILER_STRIP_GATE(0x80A25940, &lit_4248); #pragma pop /* 80A25944-80A25948 00008C 0004+00 7/16 0/0 0/0 .rodata @4249 */ SECTION_RODATA static f32 const lit_4249 = -1.0f; -COMPILER_STRIP_GATE(80A25944, &lit_4249); +COMPILER_STRIP_GATE(0x80A25944, &lit_4249); /* 80A220A0-80A22224 0007C0 0184+00 1/1 0/0 0/0 .text CreateHeap__14daNpcKasiKyu_cFv */ #pragma push @@ -1234,7 +1242,7 @@ asm void daNpcKasiKyu_c::Draw() { SECTION_RODATA static u8 const lit_4270[12] = { 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x03, }; -COMPILER_STRIP_GATE(80A25948, &lit_4270); +COMPILER_STRIP_GATE(0x80A25948, &lit_4270); /* 80A222D0-80A2245C 0009F0 018C+00 1/1 0/0 0/0 .text * ctrlJoint__14daNpcKasiKyu_cFP8J3DJointP8J3DModel */ @@ -1408,12 +1416,12 @@ asm void daNpcKasiKyu_c::main() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4447 = 10.0f; -COMPILER_STRIP_GATE(80A25954, &lit_4447); +COMPILER_STRIP_GATE(0x80A25954, &lit_4447); #pragma pop /* 80A25958-80A2595C 0000A0 0004+00 1/3 0/0 0/0 .rodata @4448 */ SECTION_RODATA static f32 const lit_4448 = 15.0f; -COMPILER_STRIP_GATE(80A25958, &lit_4448); +COMPILER_STRIP_GATE(0x80A25958, &lit_4448); /* 80A2595C-80A25960 0000A4 0004+00 12/22 0/0 0/0 .rodata @4449 */ SECTION_RODATA static u8 const lit_4449[4] = { @@ -1422,7 +1430,7 @@ SECTION_RODATA static u8 const lit_4449[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A2595C, &lit_4449); +COMPILER_STRIP_GATE(0x80A2595C, &lit_4449); /* 80A227DC-80A22984 000EFC 01A8+00 1/0 0/0 0/0 .text setAttnPos__14daNpcKasiKyu_cFv */ #pragma push @@ -1477,7 +1485,7 @@ asm void daNpcKasiKyu_c::reset() { SECTION_RODATA static u8 const lit_4534[12] = { 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A25960, &lit_4534); +COMPILER_STRIP_GATE(0x80A25960, &lit_4534); #pragma pop /* 80A2596C-80A25970 0000B4 0004+00 0/1 0/0 0/0 .rodata @4535 */ @@ -1489,7 +1497,7 @@ SECTION_RODATA static u8 const lit_4535[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A2596C, &lit_4535); +COMPILER_STRIP_GATE(0x80A2596C, &lit_4535); #pragma pop /* 80A25970-80A2597C 0000B8 000C+00 0/1 0/0 0/0 .rodata @4536 */ @@ -1498,7 +1506,7 @@ COMPILER_STRIP_GATE(80A2596C, &lit_4535); SECTION_RODATA static u8 const lit_4536[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A25970, &lit_4536); +COMPILER_STRIP_GATE(0x80A25970, &lit_4536); #pragma pop /* 80A2597C-80A25980 0000C4 0004+00 0/1 0/0 0/0 .rodata @4537 */ @@ -1510,7 +1518,7 @@ SECTION_RODATA static u8 const lit_4537[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A2597C, &lit_4537); +COMPILER_STRIP_GATE(0x80A2597C, &lit_4537); #pragma pop /* 80A25980-80A2598C 0000C8 000C+00 0/1 0/0 0/0 .rodata @4538 */ @@ -1519,7 +1527,7 @@ COMPILER_STRIP_GATE(80A2597C, &lit_4537); SECTION_RODATA static u8 const lit_4538[12] = { 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A25980, &lit_4538); +COMPILER_STRIP_GATE(0x80A25980, &lit_4538); #pragma pop /* 80A2598C-80A25990 0000D4 0004+00 0/1 0/0 0/0 .rodata @4539 */ @@ -1531,7 +1539,7 @@ SECTION_RODATA static u8 const lit_4539[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A2598C, &lit_4539); +COMPILER_STRIP_GATE(0x80A2598C, &lit_4539); #pragma pop /* 80A25990-80A2599C 0000D8 000C+00 0/1 0/0 0/0 .rodata @4540 */ @@ -1540,7 +1548,7 @@ COMPILER_STRIP_GATE(80A2598C, &lit_4539); SECTION_RODATA static u8 const lit_4540[12] = { 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A25990, &lit_4540); +COMPILER_STRIP_GATE(0x80A25990, &lit_4540); #pragma pop /* 80A2599C-80A259A0 0000E4 0004+00 0/1 0/0 0/0 .rodata @4541 */ @@ -1552,7 +1560,7 @@ SECTION_RODATA static u8 const lit_4541[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A2599C, &lit_4541); +COMPILER_STRIP_GATE(0x80A2599C, &lit_4541); #pragma pop /* 80A259A0-80A259AC 0000E8 000C+00 0/1 0/0 0/0 .rodata @4542 */ @@ -1561,7 +1569,7 @@ COMPILER_STRIP_GATE(80A2599C, &lit_4541); SECTION_RODATA static u8 const lit_4542[12] = { 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A259A0, &lit_4542); +COMPILER_STRIP_GATE(0x80A259A0, &lit_4542); #pragma pop /* 80A259AC-80A259B0 0000F4 0004+00 0/1 0/0 0/0 .rodata @4543 */ @@ -1573,7 +1581,7 @@ SECTION_RODATA static u8 const lit_4543[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A259AC, &lit_4543); +COMPILER_STRIP_GATE(0x80A259AC, &lit_4543); #pragma pop /* 80A259B0-80A259BC 0000F8 000C+00 0/1 0/0 0/0 .rodata @4544 */ @@ -1582,7 +1590,7 @@ COMPILER_STRIP_GATE(80A259AC, &lit_4543); SECTION_RODATA static u8 const lit_4544[12] = { 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A259B0, &lit_4544); +COMPILER_STRIP_GATE(0x80A259B0, &lit_4544); #pragma pop /* 80A259BC-80A259C0 000104 0004+00 0/1 0/0 0/0 .rodata @4545 */ @@ -1594,7 +1602,7 @@ SECTION_RODATA static u8 const lit_4545[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A259BC, &lit_4545); +COMPILER_STRIP_GATE(0x80A259BC, &lit_4545); #pragma pop /* 80A259C0-80A259CC 000108 000C+00 0/1 0/0 0/0 .rodata @4546 */ @@ -1603,7 +1611,7 @@ COMPILER_STRIP_GATE(80A259BC, &lit_4545); SECTION_RODATA static u8 const lit_4546[12] = { 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A259C0, &lit_4546); +COMPILER_STRIP_GATE(0x80A259C0, &lit_4546); #pragma pop /* 80A259CC-80A259D0 000114 0004+00 0/1 0/0 0/0 .rodata @4547 */ @@ -1615,7 +1623,7 @@ SECTION_RODATA static u8 const lit_4547[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A259CC, &lit_4547); +COMPILER_STRIP_GATE(0x80A259CC, &lit_4547); #pragma pop /* 80A259D0-80A259DC 000118 000C+00 0/1 0/0 0/0 .rodata @4548 */ @@ -1624,7 +1632,7 @@ COMPILER_STRIP_GATE(80A259CC, &lit_4547); SECTION_RODATA static u8 const lit_4548[12] = { 0x00, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A259D0, &lit_4548); +COMPILER_STRIP_GATE(0x80A259D0, &lit_4548); #pragma pop /* 80A259DC-80A259E0 000124 0004+00 0/1 0/0 0/0 .rodata @4549 */ @@ -1636,7 +1644,7 @@ SECTION_RODATA static u8 const lit_4549[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A259DC, &lit_4549); +COMPILER_STRIP_GATE(0x80A259DC, &lit_4549); #pragma pop /* 80A259E0-80A259EC 000128 000C+00 0/1 0/0 0/0 .rodata @4550 */ @@ -1645,7 +1653,7 @@ COMPILER_STRIP_GATE(80A259DC, &lit_4549); SECTION_RODATA static u8 const lit_4550[12] = { 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A259E0, &lit_4550); +COMPILER_STRIP_GATE(0x80A259E0, &lit_4550); #pragma pop /* 80A259EC-80A259F0 000134 0004+00 0/1 0/0 0/0 .rodata @4551 */ @@ -1657,7 +1665,7 @@ SECTION_RODATA static u8 const lit_4551[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A259EC, &lit_4551); +COMPILER_STRIP_GATE(0x80A259EC, &lit_4551); #pragma pop /* 80A259F0-80A259FC 000138 000C+00 0/1 0/0 0/0 .rodata @4552 */ @@ -1666,7 +1674,7 @@ COMPILER_STRIP_GATE(80A259EC, &lit_4551); SECTION_RODATA static u8 const lit_4552[12] = { 0x00, 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A259F0, &lit_4552); +COMPILER_STRIP_GATE(0x80A259F0, &lit_4552); #pragma pop /* 80A259FC-80A25A00 000144 0004+00 0/1 0/0 0/0 .rodata @4553 */ @@ -1678,7 +1686,7 @@ SECTION_RODATA static u8 const lit_4553[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A259FC, &lit_4553); +COMPILER_STRIP_GATE(0x80A259FC, &lit_4553); #pragma pop /* 80A25A00-80A25A0C 000148 000C+00 0/1 0/0 0/0 .rodata @4554 */ @@ -1687,7 +1695,7 @@ COMPILER_STRIP_GATE(80A259FC, &lit_4553); SECTION_RODATA static u8 const lit_4554[12] = { 0x00, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A25A00, &lit_4554); +COMPILER_STRIP_GATE(0x80A25A00, &lit_4554); #pragma pop /* 80A25A0C-80A25A10 000154 0004+00 0/1 0/0 0/0 .rodata @4555 */ @@ -1699,7 +1707,7 @@ SECTION_RODATA static u8 const lit_4555[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A25A0C, &lit_4555); +COMPILER_STRIP_GATE(0x80A25A0C, &lit_4555); #pragma pop /* 80A25A10-80A25A1C 000158 000C+00 0/1 0/0 0/0 .rodata @4556 */ @@ -1708,7 +1716,7 @@ COMPILER_STRIP_GATE(80A25A0C, &lit_4555); SECTION_RODATA static u8 const lit_4556[12] = { 0x00, 0x0B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80A25A10, &lit_4556); +COMPILER_STRIP_GATE(0x80A25A10, &lit_4556); #pragma pop /* 80A25A1C-80A25A28 000164 000C+00 0/1 0/0 0/0 .rodata @4557 */ @@ -1717,7 +1725,7 @@ COMPILER_STRIP_GATE(80A25A10, &lit_4556); SECTION_RODATA static u8 const lit_4557[12] = { 0x00, 0x0D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80A25A1C, &lit_4557); +COMPILER_STRIP_GATE(0x80A25A1C, &lit_4557); #pragma pop /* 80A25A28-80A25A34 000170 000C+00 0/1 0/0 0/0 .rodata @4558 */ @@ -1726,7 +1734,7 @@ COMPILER_STRIP_GATE(80A25A1C, &lit_4557); SECTION_RODATA static u8 const lit_4558[12] = { 0x00, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80A25A28, &lit_4558); +COMPILER_STRIP_GATE(0x80A25A28, &lit_4558); #pragma pop /* 80A25A34-80A25A40 00017C 000C+00 0/1 0/0 0/0 .rodata @4559 */ @@ -1735,7 +1743,7 @@ COMPILER_STRIP_GATE(80A25A28, &lit_4558); SECTION_RODATA static u8 const lit_4559[12] = { 0x00, 0x0B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80A25A34, &lit_4559); +COMPILER_STRIP_GATE(0x80A25A34, &lit_4559); #pragma pop /* 80A25A40-80A25A4C 000188 000C+00 0/1 0/0 0/0 .rodata @4560 */ @@ -1744,7 +1752,7 @@ COMPILER_STRIP_GATE(80A25A34, &lit_4559); SECTION_RODATA static u8 const lit_4560[12] = { 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80A25A40, &lit_4560); +COMPILER_STRIP_GATE(0x80A25A40, &lit_4560); #pragma pop /* 80A25A4C-80A25A58 000194 000C+00 0/1 0/0 0/0 .rodata @4561 */ @@ -1753,7 +1761,7 @@ COMPILER_STRIP_GATE(80A25A40, &lit_4560); SECTION_RODATA static u8 const lit_4561[12] = { 0x00, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A25A4C, &lit_4561); +COMPILER_STRIP_GATE(0x80A25A4C, &lit_4561); #pragma pop /* 80A25A58-80A25A70 0001A0 0018+00 0/0 0/0 0/0 .rodata @4562 */ @@ -1763,7 +1771,7 @@ SECTION_RODATA static u8 const lit_4562[24] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A25A58, &lit_4562); +COMPILER_STRIP_GATE(0x80A25A58, &lit_4562); #pragma pop /* 80A25A70-80A25A7C 0001B8 000C+00 0/1 0/0 0/0 .rodata @4563 */ @@ -1772,7 +1780,7 @@ COMPILER_STRIP_GATE(80A25A58, &lit_4562); SECTION_RODATA static u8 const lit_4563[12] = { 0x00, 0x0F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80A25A70, &lit_4563); +COMPILER_STRIP_GATE(0x80A25A70, &lit_4563); #pragma pop /* 80A25A7C-80A25A88 0001C4 000C+00 0/1 0/0 0/0 .rodata @4564 */ @@ -1781,7 +1789,7 @@ COMPILER_STRIP_GATE(80A25A70, &lit_4563); SECTION_RODATA static u8 const lit_4564[12] = { 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A25A7C, &lit_4564); +COMPILER_STRIP_GATE(0x80A25A7C, &lit_4564); #pragma pop /* 80A25A88-80A25A90 0001D0 0008+00 0/1 0/0 0/0 .rodata @4565 */ @@ -1790,7 +1798,7 @@ COMPILER_STRIP_GATE(80A25A7C, &lit_4564); SECTION_RODATA static u8 const lit_4565[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A25A88, &lit_4565); +COMPILER_STRIP_GATE(0x80A25A88, &lit_4565); #pragma pop /* 80A22CD8-80A2310C 0013F8 0434+00 1/1 0/0 0/0 .text playMotion__14daNpcKasiKyu_cFv */ @@ -1819,7 +1827,7 @@ asm void daNpcKasiKyu_c::playMotionAnmLoop(daNpcF_c::daNpcF_anmPlayData*** param #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpcKasiKyu_c::setAction(int (daNpcKasiKyu_c::*)(int)) { +asm void daNpcKasiKyu_c::setAction(int (daNpcKasiKyu_c::*param_0)(int)) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_kasi_kyu/d_a_npc_kasi_kyu/setAction__14daNpcKasiKyu_cFM14daNpcKasiKyu_cFPCvPvi_i.s" } @@ -1845,7 +1853,7 @@ SECTION_RODATA static u8 const lit_4566[52] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A25A90, &lit_4566); +COMPILER_STRIP_GATE(0x80A25A90, &lit_4566); #pragma pop /* 80A25AC4-80A25AD0 00020C 000C+00 0/1 0/0 0/0 .rodata @4647 */ @@ -1854,28 +1862,28 @@ COMPILER_STRIP_GATE(80A25A90, &lit_4566); SECTION_RODATA static u8 const lit_4647[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A25AC4, &lit_4647); +COMPILER_STRIP_GATE(0x80A25AC4, &lit_4647); #pragma pop /* 80A25AD0-80A25AD4 000218 0004+00 0/1 0/0 0/0 .rodata @4695 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4695 = -80.0f; -COMPILER_STRIP_GATE(80A25AD0, &lit_4695); +COMPILER_STRIP_GATE(0x80A25AD0, &lit_4695); #pragma pop /* 80A25AD4-80A25AD8 00021C 0004+00 0/1 0/0 0/0 .rodata @4696 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4696 = 80.0f; -COMPILER_STRIP_GATE(80A25AD4, &lit_4696); +COMPILER_STRIP_GATE(0x80A25AD4, &lit_4696); #pragma pop /* 80A25AD8-80A25ADC 000220 0004+00 0/1 0/0 0/0 .rodata @4697 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4697 = 40.0f; -COMPILER_STRIP_GATE(80A25AD8, &lit_4697); +COMPILER_STRIP_GATE(0x80A25AD8, &lit_4697); #pragma pop /* 80A23350-80A23530 001A70 01E0+00 1/1 0/0 0/0 .text lookat__14daNpcKasiKyu_cFv */ @@ -1914,7 +1922,7 @@ asm void daNpcKasiKyu_c::chkFindPlayer() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4830 = 450.0f; -COMPILER_STRIP_GATE(80A25ADC, &lit_4830); +COMPILER_STRIP_GATE(0x80A25ADC, &lit_4830); #pragma pop /* 80A25AE0-80A25AE8 000228 0008+00 0/1 0/0 0/0 .rodata @4831 */ @@ -1923,7 +1931,7 @@ COMPILER_STRIP_GATE(80A25ADC, &lit_4830); SECTION_RODATA static u8 const lit_4831[8] = { 0x40, 0x7F, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A25AE0, &lit_4831); +COMPILER_STRIP_GATE(0x80A25AE0, &lit_4831); #pragma pop /* 80A25AE8-80A25AF0 000230 0008+00 0/1 0/0 0/0 .rodata @4832 */ @@ -1932,7 +1940,7 @@ COMPILER_STRIP_GATE(80A25AE0, &lit_4831); SECTION_RODATA static u8 const lit_4832[8] = { 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A25AE8, &lit_4832); +COMPILER_STRIP_GATE(0x80A25AE8, &lit_4832); #pragma pop /* 80A23708-80A23AB4 001E28 03AC+00 8/0 0/0 0/0 .text wait__14daNpcKasiKyu_cFi */ @@ -1950,7 +1958,7 @@ asm void daNpcKasiKyu_c::wait(int param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4879 = 1.5f; -COMPILER_STRIP_GATE(80A25AF0, &lit_4879); +COMPILER_STRIP_GATE(0x80A25AF0, &lit_4879); #pragma pop /* 80A23AB4-80A23C90 0021D4 01DC+00 1/0 0/0 0/0 .text fear__14daNpcKasiKyu_cFi */ @@ -2008,14 +2016,14 @@ asm void daNpcKasiKyu_c::chace_st(int param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5067 = 14.0f; -COMPILER_STRIP_GATE(80A25AF4, &lit_5067); +COMPILER_STRIP_GATE(0x80A25AF4, &lit_5067); #pragma pop /* 80A25AF8-80A25AFC 000240 0004+00 0/1 0/0 0/0 .rodata @5068 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5068 = 400.0f; -COMPILER_STRIP_GATE(80A25AF8, &lit_5068); +COMPILER_STRIP_GATE(0x80A25AF8, &lit_5068); #pragma pop /* 80A23FA0-80A24110 0026C0 0170+00 4/0 0/0 0/0 .text chace__14daNpcKasiKyu_cFi */ @@ -2101,7 +2109,7 @@ asm void daNpcKasiKyu_c::kya2(int param_0) { /* ############################################################################################## */ /* 80A25AFC-80A25B00 000244 0004+00 1/1 0/0 0/0 .rodata @5219 */ SECTION_RODATA static f32 const lit_5219 = 19.0f; -COMPILER_STRIP_GATE(80A25AFC, &lit_5219); +COMPILER_STRIP_GATE(0x80A25AFC, &lit_5219); /* 80A24628-80A246FC 002D48 00D4+00 2/0 0/0 0/0 .text kya_stop__14daNpcKasiKyu_cFi */ #pragma push @@ -2138,14 +2146,14 @@ asm void daNpcKasiKyu_c::iyan_look(int param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5256 = -3200.0f; -COMPILER_STRIP_GATE(80A25B00, &lit_5256); +COMPILER_STRIP_GATE(0x80A25B00, &lit_5256); #pragma pop /* 80A25B04-80A25B08 00024C 0004+00 0/1 0/0 0/0 .rodata @5257 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5257 = 1500.0f; -COMPILER_STRIP_GATE(80A25B04, &lit_5257); +COMPILER_STRIP_GATE(0x80A25B04, &lit_5257); #pragma pop /* 80A2484C-80A2493C 002F6C 00F0+00 1/0 0/0 0/0 .text turn_hana__14daNpcKasiKyu_cFi */ @@ -2163,7 +2171,7 @@ asm void daNpcKasiKyu_c::turn_hana(int param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5281 = 1.75f; -COMPILER_STRIP_GATE(80A25B08, &lit_5281); +COMPILER_STRIP_GATE(0x80A25B08, &lit_5281); #pragma pop /* 80A2493C-80A24A54 00305C 0118+00 1/0 0/0 0/0 .text escape__14daNpcKasiKyu_cFi */ @@ -2484,7 +2492,7 @@ asm void __sinit_d_a_npc_kasi_kyu_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80A257E0 = (void*)__sinit_d_a_npc_kasi_kyu_cpp; +REGISTER_CTORS(0x80A257E0, __sinit_d_a_npc_kasi_kyu_cpp); #pragma pop /* 80A25848-80A2584C 003F68 0004+00 1/0 0/0 0/0 .text adjustShapeAngle__14daNpcKasiKyu_cFv */ @@ -2694,11 +2702,4 @@ static u8 data_80A260C8[4]; static u8 data_80A260CC[4]; #pragma pop -/* 80A25B0C-80A25B24 000254 0018+00 2/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80A25B0C = "kasi_kyu"; -SECTION_DEAD static char const* const stringBase_80A25B15 = "girls"; -SECTION_DEAD static char const* const stringBase_80A25B1B = "Wgeneral"; -#pragma pop +/* 80A25B0C-80A25B0C 000254 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/npc/d_a_npc_kasi_mich/d_a_npc_kasi_mich.cpp b/rel/d/a/npc/d_a_npc_kasi_mich/d_a_npc_kasi_mich.cpp index 428fdd1190f..52ceb12a724 100644 --- a/rel/d/a/npc/d_a_npc_kasi_mich/d_a_npc_kasi_mich.cpp +++ b/rel/d/a/npc/d_a_npc_kasi_mich/d_a_npc_kasi_mich.cpp @@ -28,16 +28,16 @@ struct mDoExt_morf_c { /* 8000FB7C */ void setMorf(f32); }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; - struct J3DAnmTransform {}; +struct J3DModelData {}; + +struct Z2Creature {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -50,22 +50,10 @@ struct fopAc_ac_c { /* 80018C8C */ ~fopAc_ac_c(); }; -struct J3DModel {}; - -struct Vec {}; - -struct cXyz { - /* 80266B34 */ void operator-(Vec const&) const; - /* 80A29908 */ ~cXyz(); - /* 80A29944 */ cXyz(); -}; - -struct J3DJoint {}; +struct J3DAnmTexPattern {}; struct _GXColorS10 {}; -struct J3DAnmTexPattern {}; - struct J3DAnmTransformKey {}; struct daNpcF_c { @@ -101,6 +89,18 @@ struct daNpcF_c { static u8 mCcDCyl[68]; }; +struct J3DModel {}; + +struct J3DJoint {}; + +struct Vec {}; + +struct cXyz { + /* 80266B34 */ void operator-(Vec const&) const; + /* 80A29908 */ ~cXyz(); + /* 80A29944 */ cXyz(); +}; + struct daNpcKasiMich_c { /* 80A261CC */ daNpcKasiMich_c(); /* 80A26414 */ ~daNpcKasiMich_c(); @@ -544,6 +544,14 @@ extern "C" void __register_global_object(); // /* ############################################################################################## */ +/* 80A2A298-80A2A298 00024C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80A2A298 = "kasi_mich"; +SECTION_DEAD static char const* const stringBase_80A2A2A2 = "girls"; +SECTION_DEAD static char const* const stringBase_80A2A2A8 = "Wgeneral"; +#pragma pop + /* 80A2A2B4-80A2A2C0 000000 000C+00 2/2 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -1133,34 +1141,34 @@ SECTION_RODATA u8 const daNpcKasiMich_Param_c::m[116] = { 0x00, 0x00, 0xC3, 0x96, 0x00, 0x00, 0x00, 0x3C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x41, 0x80, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A2A04C, &daNpcKasiMich_Param_c::m); +COMPILER_STRIP_GATE(0x80A2A04C, &daNpcKasiMich_Param_c::m); /* 80A2A0C0-80A2A0C4 000074 0004+00 0/1 0/0 0/0 .rodata @4197 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4197 = -60.0f; -COMPILER_STRIP_GATE(80A2A0C0, &lit_4197); +COMPILER_STRIP_GATE(0x80A2A0C0, &lit_4197); #pragma pop /* 80A2A0C4-80A2A0C8 000078 0004+00 0/1 0/0 0/0 .rodata @4198 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4198 = -10.0f; -COMPILER_STRIP_GATE(80A2A0C4, &lit_4198); +COMPILER_STRIP_GATE(0x80A2A0C4, &lit_4198); #pragma pop /* 80A2A0C8-80A2A0CC 00007C 0004+00 0/1 0/0 0/0 .rodata @4199 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4199 = 60.0f; -COMPILER_STRIP_GATE(80A2A0C8, &lit_4199); +COMPILER_STRIP_GATE(0x80A2A0C8, &lit_4199); #pragma pop /* 80A2A0CC-80A2A0D0 000080 0004+00 0/1 0/0 0/0 .rodata @4200 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4200 = 220.0f; -COMPILER_STRIP_GATE(80A2A0CC, &lit_4200); +COMPILER_STRIP_GATE(0x80A2A0CC, &lit_4200); #pragma pop /* 80A26624-80A268A0 000544 027C+00 1/1 0/0 0/0 .text Create__15daNpcKasiMich_cFv */ @@ -1176,18 +1184,18 @@ asm void daNpcKasiMich_c::Create() { /* ############################################################################################## */ /* 80A2A0D0-80A2A0D4 000084 0004+00 4/8 0/0 0/0 .rodata @4247 */ SECTION_RODATA static f32 const lit_4247 = 1.0f; -COMPILER_STRIP_GATE(80A2A0D0, &lit_4247); +COMPILER_STRIP_GATE(0x80A2A0D0, &lit_4247); /* 80A2A0D4-80A2A0D8 000088 0004+00 0/1 0/0 0/0 .rodata @4248 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4248 = 0x3F5CF29A; -COMPILER_STRIP_GATE(80A2A0D4, &lit_4248); +COMPILER_STRIP_GATE(0x80A2A0D4, &lit_4248); #pragma pop /* 80A2A0D8-80A2A0DC 00008C 0004+00 8/16 0/0 0/0 .rodata @4249 */ SECTION_RODATA static f32 const lit_4249 = -1.0f; -COMPILER_STRIP_GATE(80A2A0D8, &lit_4249); +COMPILER_STRIP_GATE(0x80A2A0D8, &lit_4249); /* 80A268A0-80A26A24 0007C0 0184+00 1/1 0/0 0/0 .text CreateHeap__15daNpcKasiMich_cFv */ #pragma push @@ -1234,7 +1242,7 @@ asm void daNpcKasiMich_c::Draw() { SECTION_RODATA static u8 const lit_4270[12] = { 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x03, }; -COMPILER_STRIP_GATE(80A2A0DC, &lit_4270); +COMPILER_STRIP_GATE(0x80A2A0DC, &lit_4270); /* 80A26AD0-80A26C5C 0009F0 018C+00 1/1 0/0 0/0 .text * ctrlJoint__15daNpcKasiMich_cFP8J3DJointP8J3DModel */ @@ -1409,12 +1417,12 @@ asm void daNpcKasiMich_c::main() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4447 = 10.0f; -COMPILER_STRIP_GATE(80A2A0E8, &lit_4447); +COMPILER_STRIP_GATE(0x80A2A0E8, &lit_4447); #pragma pop /* 80A2A0EC-80A2A0F0 0000A0 0004+00 1/3 0/0 0/0 .rodata @4448 */ SECTION_RODATA static f32 const lit_4448 = 15.0f; -COMPILER_STRIP_GATE(80A2A0EC, &lit_4448); +COMPILER_STRIP_GATE(0x80A2A0EC, &lit_4448); /* 80A2A0F0-80A2A0F4 0000A4 0004+00 13/22 0/0 0/0 .rodata @4449 */ SECTION_RODATA static u8 const lit_4449[4] = { @@ -1423,7 +1431,7 @@ SECTION_RODATA static u8 const lit_4449[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A2A0F0, &lit_4449); +COMPILER_STRIP_GATE(0x80A2A0F0, &lit_4449); /* 80A26FDC-80A27184 000EFC 01A8+00 1/0 0/0 0/0 .text setAttnPos__15daNpcKasiMich_cFv */ #pragma push @@ -1478,7 +1486,7 @@ asm void daNpcKasiMich_c::reset() { SECTION_RODATA static u8 const lit_4534[12] = { 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A2A0F4, &lit_4534); +COMPILER_STRIP_GATE(0x80A2A0F4, &lit_4534); #pragma pop /* 80A2A100-80A2A104 0000B4 0004+00 0/1 0/0 0/0 .rodata @4535 */ @@ -1490,7 +1498,7 @@ SECTION_RODATA static u8 const lit_4535[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A2A100, &lit_4535); +COMPILER_STRIP_GATE(0x80A2A100, &lit_4535); #pragma pop /* 80A2A104-80A2A110 0000B8 000C+00 0/1 0/0 0/0 .rodata @4536 */ @@ -1499,7 +1507,7 @@ COMPILER_STRIP_GATE(80A2A100, &lit_4535); SECTION_RODATA static u8 const lit_4536[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A2A104, &lit_4536); +COMPILER_STRIP_GATE(0x80A2A104, &lit_4536); #pragma pop /* 80A2A110-80A2A114 0000C4 0004+00 0/1 0/0 0/0 .rodata @4537 */ @@ -1511,7 +1519,7 @@ SECTION_RODATA static u8 const lit_4537[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A2A110, &lit_4537); +COMPILER_STRIP_GATE(0x80A2A110, &lit_4537); #pragma pop /* 80A2A114-80A2A120 0000C8 000C+00 0/1 0/0 0/0 .rodata @4538 */ @@ -1520,7 +1528,7 @@ COMPILER_STRIP_GATE(80A2A110, &lit_4537); SECTION_RODATA static u8 const lit_4538[12] = { 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A2A114, &lit_4538); +COMPILER_STRIP_GATE(0x80A2A114, &lit_4538); #pragma pop /* 80A2A120-80A2A124 0000D4 0004+00 0/1 0/0 0/0 .rodata @4539 */ @@ -1532,7 +1540,7 @@ SECTION_RODATA static u8 const lit_4539[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A2A120, &lit_4539); +COMPILER_STRIP_GATE(0x80A2A120, &lit_4539); #pragma pop /* 80A2A124-80A2A130 0000D8 000C+00 0/1 0/0 0/0 .rodata @4540 */ @@ -1541,7 +1549,7 @@ COMPILER_STRIP_GATE(80A2A120, &lit_4539); SECTION_RODATA static u8 const lit_4540[12] = { 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A2A124, &lit_4540); +COMPILER_STRIP_GATE(0x80A2A124, &lit_4540); #pragma pop /* 80A2A130-80A2A134 0000E4 0004+00 0/1 0/0 0/0 .rodata @4541 */ @@ -1553,7 +1561,7 @@ SECTION_RODATA static u8 const lit_4541[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A2A130, &lit_4541); +COMPILER_STRIP_GATE(0x80A2A130, &lit_4541); #pragma pop /* 80A2A134-80A2A140 0000E8 000C+00 0/1 0/0 0/0 .rodata @4542 */ @@ -1562,7 +1570,7 @@ COMPILER_STRIP_GATE(80A2A130, &lit_4541); SECTION_RODATA static u8 const lit_4542[12] = { 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A2A134, &lit_4542); +COMPILER_STRIP_GATE(0x80A2A134, &lit_4542); #pragma pop /* 80A2A140-80A2A144 0000F4 0004+00 0/1 0/0 0/0 .rodata @4543 */ @@ -1574,7 +1582,7 @@ SECTION_RODATA static u8 const lit_4543[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A2A140, &lit_4543); +COMPILER_STRIP_GATE(0x80A2A140, &lit_4543); #pragma pop /* 80A2A144-80A2A150 0000F8 000C+00 0/1 0/0 0/0 .rodata @4544 */ @@ -1583,7 +1591,7 @@ COMPILER_STRIP_GATE(80A2A140, &lit_4543); SECTION_RODATA static u8 const lit_4544[12] = { 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A2A144, &lit_4544); +COMPILER_STRIP_GATE(0x80A2A144, &lit_4544); #pragma pop /* 80A2A150-80A2A154 000104 0004+00 0/1 0/0 0/0 .rodata @4545 */ @@ -1595,7 +1603,7 @@ SECTION_RODATA static u8 const lit_4545[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A2A150, &lit_4545); +COMPILER_STRIP_GATE(0x80A2A150, &lit_4545); #pragma pop /* 80A2A154-80A2A160 000108 000C+00 0/1 0/0 0/0 .rodata @4546 */ @@ -1604,7 +1612,7 @@ COMPILER_STRIP_GATE(80A2A150, &lit_4545); SECTION_RODATA static u8 const lit_4546[12] = { 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A2A154, &lit_4546); +COMPILER_STRIP_GATE(0x80A2A154, &lit_4546); #pragma pop /* 80A2A160-80A2A164 000114 0004+00 0/1 0/0 0/0 .rodata @4547 */ @@ -1616,7 +1624,7 @@ SECTION_RODATA static u8 const lit_4547[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A2A160, &lit_4547); +COMPILER_STRIP_GATE(0x80A2A160, &lit_4547); #pragma pop /* 80A2A164-80A2A170 000118 000C+00 0/1 0/0 0/0 .rodata @4548 */ @@ -1625,7 +1633,7 @@ COMPILER_STRIP_GATE(80A2A160, &lit_4547); SECTION_RODATA static u8 const lit_4548[12] = { 0x00, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A2A164, &lit_4548); +COMPILER_STRIP_GATE(0x80A2A164, &lit_4548); #pragma pop /* 80A2A170-80A2A174 000124 0004+00 0/1 0/0 0/0 .rodata @4549 */ @@ -1637,7 +1645,7 @@ SECTION_RODATA static u8 const lit_4549[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A2A170, &lit_4549); +COMPILER_STRIP_GATE(0x80A2A170, &lit_4549); #pragma pop /* 80A2A174-80A2A180 000128 000C+00 0/1 0/0 0/0 .rodata @4550 */ @@ -1646,7 +1654,7 @@ COMPILER_STRIP_GATE(80A2A170, &lit_4549); SECTION_RODATA static u8 const lit_4550[12] = { 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A2A174, &lit_4550); +COMPILER_STRIP_GATE(0x80A2A174, &lit_4550); #pragma pop /* 80A2A180-80A2A184 000134 0004+00 0/1 0/0 0/0 .rodata @4551 */ @@ -1658,7 +1666,7 @@ SECTION_RODATA static u8 const lit_4551[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A2A180, &lit_4551); +COMPILER_STRIP_GATE(0x80A2A180, &lit_4551); #pragma pop /* 80A2A184-80A2A190 000138 000C+00 0/1 0/0 0/0 .rodata @4552 */ @@ -1667,7 +1675,7 @@ COMPILER_STRIP_GATE(80A2A180, &lit_4551); SECTION_RODATA static u8 const lit_4552[12] = { 0x00, 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A2A184, &lit_4552); +COMPILER_STRIP_GATE(0x80A2A184, &lit_4552); #pragma pop /* 80A2A190-80A2A194 000144 0004+00 0/1 0/0 0/0 .rodata @4553 */ @@ -1679,7 +1687,7 @@ SECTION_RODATA static u8 const lit_4553[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A2A190, &lit_4553); +COMPILER_STRIP_GATE(0x80A2A190, &lit_4553); #pragma pop /* 80A2A194-80A2A1A0 000148 000C+00 0/1 0/0 0/0 .rodata @4554 */ @@ -1688,7 +1696,7 @@ COMPILER_STRIP_GATE(80A2A190, &lit_4553); SECTION_RODATA static u8 const lit_4554[12] = { 0x00, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A2A194, &lit_4554); +COMPILER_STRIP_GATE(0x80A2A194, &lit_4554); #pragma pop /* 80A2A1A0-80A2A1A4 000154 0004+00 0/1 0/0 0/0 .rodata @4555 */ @@ -1700,7 +1708,7 @@ SECTION_RODATA static u8 const lit_4555[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A2A1A0, &lit_4555); +COMPILER_STRIP_GATE(0x80A2A1A0, &lit_4555); #pragma pop /* 80A2A1A4-80A2A1B0 000158 000C+00 0/1 0/0 0/0 .rodata @4556 */ @@ -1709,7 +1717,7 @@ COMPILER_STRIP_GATE(80A2A1A0, &lit_4555); SECTION_RODATA static u8 const lit_4556[12] = { 0x00, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80A2A1A4, &lit_4556); +COMPILER_STRIP_GATE(0x80A2A1A4, &lit_4556); #pragma pop /* 80A2A1B0-80A2A1BC 000164 000C+00 0/1 0/0 0/0 .rodata @4557 */ @@ -1718,7 +1726,7 @@ COMPILER_STRIP_GATE(80A2A1A4, &lit_4556); SECTION_RODATA static u8 const lit_4557[12] = { 0x00, 0x0D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80A2A1B0, &lit_4557); +COMPILER_STRIP_GATE(0x80A2A1B0, &lit_4557); #pragma pop /* 80A2A1BC-80A2A1C8 000170 000C+00 0/1 0/0 0/0 .rodata @4558 */ @@ -1727,7 +1735,7 @@ COMPILER_STRIP_GATE(80A2A1B0, &lit_4557); SECTION_RODATA static u8 const lit_4558[12] = { 0x00, 0x0B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80A2A1BC, &lit_4558); +COMPILER_STRIP_GATE(0x80A2A1BC, &lit_4558); #pragma pop /* 80A2A1C8-80A2A1D4 00017C 000C+00 0/1 0/0 0/0 .rodata @4559 */ @@ -1736,7 +1744,7 @@ COMPILER_STRIP_GATE(80A2A1BC, &lit_4558); SECTION_RODATA static u8 const lit_4559[12] = { 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80A2A1C8, &lit_4559); +COMPILER_STRIP_GATE(0x80A2A1C8, &lit_4559); #pragma pop /* 80A2A1D4-80A2A1E0 000188 000C+00 0/1 0/0 0/0 .rodata @4560 */ @@ -1745,7 +1753,7 @@ COMPILER_STRIP_GATE(80A2A1C8, &lit_4559); SECTION_RODATA static u8 const lit_4560[12] = { 0x00, 0x0B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80A2A1D4, &lit_4560); +COMPILER_STRIP_GATE(0x80A2A1D4, &lit_4560); #pragma pop /* 80A2A1E0-80A2A1EC 000194 000C+00 0/1 0/0 0/0 .rodata @4561 */ @@ -1754,7 +1762,7 @@ COMPILER_STRIP_GATE(80A2A1D4, &lit_4560); SECTION_RODATA static u8 const lit_4561[12] = { 0x00, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A2A1E0, &lit_4561); +COMPILER_STRIP_GATE(0x80A2A1E0, &lit_4561); #pragma pop /* 80A2A1EC-80A2A204 0001A0 0018+00 0/0 0/0 0/0 .rodata @4562 */ @@ -1764,7 +1772,7 @@ SECTION_RODATA static u8 const lit_4562[24] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A2A1EC, &lit_4562); +COMPILER_STRIP_GATE(0x80A2A1EC, &lit_4562); #pragma pop /* 80A2A204-80A2A210 0001B8 000C+00 0/1 0/0 0/0 .rodata @4563 */ @@ -1773,7 +1781,7 @@ COMPILER_STRIP_GATE(80A2A1EC, &lit_4562); SECTION_RODATA static u8 const lit_4563[12] = { 0x00, 0x0F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80A2A204, &lit_4563); +COMPILER_STRIP_GATE(0x80A2A204, &lit_4563); #pragma pop /* 80A2A210-80A2A21C 0001C4 000C+00 0/1 0/0 0/0 .rodata @4564 */ @@ -1782,7 +1790,7 @@ COMPILER_STRIP_GATE(80A2A204, &lit_4563); SECTION_RODATA static u8 const lit_4564[12] = { 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A2A210, &lit_4564); +COMPILER_STRIP_GATE(0x80A2A210, &lit_4564); #pragma pop /* 80A2A21C-80A2A224 0001D0 0008+00 0/1 0/0 0/0 .rodata @4565 */ @@ -1791,7 +1799,7 @@ COMPILER_STRIP_GATE(80A2A210, &lit_4564); SECTION_RODATA static u8 const lit_4565[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A2A21C, &lit_4565); +COMPILER_STRIP_GATE(0x80A2A21C, &lit_4565); #pragma pop /* 80A274D8-80A2790C 0013F8 0434+00 1/1 0/0 0/0 .text playMotion__15daNpcKasiMich_cFv */ @@ -1820,7 +1828,7 @@ asm void daNpcKasiMich_c::playMotionAnmLoop(daNpcF_c::daNpcF_anmPlayData*** para #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpcKasiMich_c::setAction(int (daNpcKasiMich_c::*)(int)) { +asm void daNpcKasiMich_c::setAction(int (daNpcKasiMich_c::*param_0)(int)) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_kasi_mich/d_a_npc_kasi_mich/setAction__15daNpcKasiMich_cFM15daNpcKasiMich_cFPCvPvi_i.s" } @@ -1846,7 +1854,7 @@ SECTION_RODATA static u8 const lit_4566[52] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A2A224, &lit_4566); +COMPILER_STRIP_GATE(0x80A2A224, &lit_4566); #pragma pop /* 80A2A258-80A2A264 00020C 000C+00 0/1 0/0 0/0 .rodata @4647 */ @@ -1855,28 +1863,28 @@ COMPILER_STRIP_GATE(80A2A224, &lit_4566); SECTION_RODATA static u8 const lit_4647[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A2A258, &lit_4647); +COMPILER_STRIP_GATE(0x80A2A258, &lit_4647); #pragma pop /* 80A2A264-80A2A268 000218 0004+00 0/1 0/0 0/0 .rodata @4695 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4695 = -80.0f; -COMPILER_STRIP_GATE(80A2A264, &lit_4695); +COMPILER_STRIP_GATE(0x80A2A264, &lit_4695); #pragma pop /* 80A2A268-80A2A26C 00021C 0004+00 0/1 0/0 0/0 .rodata @4696 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4696 = 80.0f; -COMPILER_STRIP_GATE(80A2A268, &lit_4696); +COMPILER_STRIP_GATE(0x80A2A268, &lit_4696); #pragma pop /* 80A2A26C-80A2A270 000220 0004+00 0/1 0/0 0/0 .rodata @4697 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4697 = 40.0f; -COMPILER_STRIP_GATE(80A2A26C, &lit_4697); +COMPILER_STRIP_GATE(0x80A2A26C, &lit_4697); #pragma pop /* 80A27B50-80A27D30 001A70 01E0+00 1/1 0/0 0/0 .text lookat__15daNpcKasiMich_cFv */ @@ -1915,7 +1923,7 @@ asm void daNpcKasiMich_c::chkFindPlayer() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4830 = 450.0f; -COMPILER_STRIP_GATE(80A2A270, &lit_4830); +COMPILER_STRIP_GATE(0x80A2A270, &lit_4830); #pragma pop /* 80A2A274-80A2A27C 000228 0008+00 0/1 0/0 0/0 .rodata @4831 */ @@ -1924,7 +1932,7 @@ COMPILER_STRIP_GATE(80A2A270, &lit_4830); SECTION_RODATA static u8 const lit_4831[8] = { 0x40, 0x7F, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A2A274, &lit_4831); +COMPILER_STRIP_GATE(0x80A2A274, &lit_4831); #pragma pop /* 80A2A27C-80A2A284 000230 0008+00 0/1 0/0 0/0 .rodata @4832 */ @@ -1933,7 +1941,7 @@ COMPILER_STRIP_GATE(80A2A274, &lit_4831); SECTION_RODATA static u8 const lit_4832[8] = { 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A2A27C, &lit_4832); +COMPILER_STRIP_GATE(0x80A2A27C, &lit_4832); #pragma pop /* 80A27F08-80A282B4 001E28 03AC+00 8/0 0/0 0/0 .text wait__15daNpcKasiMich_cFi */ @@ -1951,7 +1959,7 @@ asm void daNpcKasiMich_c::wait(int param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4879 = 1.5f; -COMPILER_STRIP_GATE(80A2A284, &lit_4879); +COMPILER_STRIP_GATE(0x80A2A284, &lit_4879); #pragma pop /* 80A282B4-80A28490 0021D4 01DC+00 1/0 0/0 0/0 .text fear__15daNpcKasiMich_cFi */ @@ -2009,14 +2017,14 @@ asm void daNpcKasiMich_c::chace_st(int param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5067 = 14.0f; -COMPILER_STRIP_GATE(80A2A288, &lit_5067); +COMPILER_STRIP_GATE(0x80A2A288, &lit_5067); #pragma pop /* 80A2A28C-80A2A290 000240 0004+00 0/1 0/0 0/0 .rodata @5068 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5068 = 400.0f; -COMPILER_STRIP_GATE(80A2A28C, &lit_5068); +COMPILER_STRIP_GATE(0x80A2A28C, &lit_5068); #pragma pop /* 80A287A0-80A28910 0026C0 0170+00 4/0 0/0 0/0 .text chace__15daNpcKasiMich_cFi */ @@ -2102,7 +2110,7 @@ asm void daNpcKasiMich_c::kya2(int param_0) { /* ############################################################################################## */ /* 80A2A290-80A2A294 000244 0004+00 1/1 0/0 0/0 .rodata @5219 */ SECTION_RODATA static f32 const lit_5219 = 19.0f; -COMPILER_STRIP_GATE(80A2A290, &lit_5219); +COMPILER_STRIP_GATE(0x80A2A290, &lit_5219); /* 80A28E28-80A28EFC 002D48 00D4+00 1/0 0/0 0/0 .text kya_stop__15daNpcKasiMich_cFi */ #pragma push @@ -2129,7 +2137,7 @@ asm void daNpcKasiMich_c::iyan(int param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5251 = 1.75f; -COMPILER_STRIP_GATE(80A2A294, &lit_5251); +COMPILER_STRIP_GATE(0x80A2A294, &lit_5251); #pragma pop /* 80A28F74-80A2908C 002E94 0118+00 1/0 0/0 0/0 .text escape__15daNpcKasiMich_cFi */ @@ -2470,7 +2478,7 @@ asm void __sinit_d_a_npc_kasi_mich_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80A29F74 = (void*)__sinit_d_a_npc_kasi_mich_cpp; +REGISTER_CTORS(0x80A29F74, __sinit_d_a_npc_kasi_mich_cpp); #pragma pop /* 80A29FDC-80A29FE0 003EFC 0004+00 1/0 0/0 0/0 .text adjustShapeAngle__15daNpcKasiMich_cFv */ @@ -2680,11 +2688,4 @@ static u8 data_80A2A858[4]; static u8 data_80A2A85C[4]; #pragma pop -/* 80A2A298-80A2A2B1 00024C 0019+00 2/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80A2A298 = "kasi_mich"; -SECTION_DEAD static char const* const stringBase_80A2A2A2 = "girls"; -SECTION_DEAD static char const* const stringBase_80A2A2A8 = "Wgeneral"; -#pragma pop +/* 80A2A298-80A2A298 00024C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/npc/d_a_npc_kkri/d_a_npc_kkri.cpp b/rel/d/a/npc/d_a_npc_kkri/d_a_npc_kkri.cpp index 62fae9d5cca..321571cf87d 100644 --- a/rel/d/a/npc/d_a_npc_kkri/d_a_npc_kkri.cpp +++ b/rel/d/a/npc/d_a_npc_kkri/d_a_npc_kkri.cpp @@ -15,12 +15,14 @@ struct mDoMtx_stack_c { static u8 now[48]; }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; +struct J3DAnmTransform {}; + +struct J3DModelData {}; + struct Vec {}; struct Z2Creature { @@ -29,8 +31,6 @@ struct Z2Creature { /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -43,6 +43,8 @@ struct fopAc_ac_c { /* 80018C8C */ ~fopAc_ac_c(); }; +struct daNpcT_faceMotionAnmData_c {}; + struct daNpcT_MotionSeqMngr_c { struct sequenceStepData_c {}; @@ -51,14 +53,12 @@ struct daNpcT_MotionSeqMngr_c { /* 80552C04 */ ~daNpcT_MotionSeqMngr_c(); }; +struct daNpcT_evtData_c {}; + struct daNpcT_motionAnmData_c {}; struct J3DJoint {}; -struct daNpcT_faceMotionAnmData_c {}; - -struct daNpcT_evtData_c {}; - struct daNpc_Kkri_c { /* 8054F3AC */ ~daNpc_Kkri_c(); /* 8054F4F8 */ void create(); @@ -119,6 +119,13 @@ struct dCcD_GObjInf { /* 800840E4 */ ~dCcD_GObjInf(); }; +struct csXyz { + /* 80552564 */ ~csXyz(); + /* 80552B00 */ csXyz(); +}; + +struct _GXColorS10 {}; + struct J3DModel {}; struct cXyz { @@ -128,13 +135,6 @@ struct cXyz { /* 80552C00 */ cXyz(); }; -struct _GXColorS10 {}; - -struct csXyz { - /* 80552564 */ ~csXyz(); - /* 80552B00 */ csXyz(); -}; - struct daNpcT_c { /* 80147FA4 */ void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*); /* 801483F8 */ void loadRes(s8 const*, char const**); @@ -472,8 +472,8 @@ extern "C" void changeAnm__8daNpcT_cFPiPi(); extern "C" void changeBck__8daNpcT_cFPiPi(); extern "C" void changeBtp__8daNpcT_cFPiPi(); extern "C" void changeBtk__8daNpcT_cFPiPi(); -extern "C" void func_805531D0(int*); -extern "C" void func_805531EC(int, int); +extern "C" void func_805531D0(void* _this, int*); +extern "C" void func_805531EC(void* _this, int, int); extern "C" void __sinit_d_a_npc_kkri_cpp(); extern "C" void __ct__12daNpc_Kkri_cFPC26daNpcT_faceMotionAnmData_cPC22daNpcT_motionAnmData_cPCQ222daNpcT_MotionSeqMngr_c18sequenceStepData_ciPCQ222daNpcT_MotionSeqMngr_c18sequenceStepData_ciPC16daNpcT_evtData_cPPc(); @@ -651,6 +651,18 @@ extern "C" void __register_global_object(); // /* ############################################################################################## */ +/* 805535A4-805535A4 000114 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_805535A4 = ""; +SECTION_DEAD static char const* const stringBase_805535A5 = "DEFAULT_GETITEM"; +SECTION_DEAD static char const* const stringBase_805535B5 = "NO_RESPONSE"; +SECTION_DEAD static char const* const stringBase_805535C1 = "CONVERSATION_ABOUT_SOUP"; +SECTION_DEAD static char const* const stringBase_805535D9 = "YM_LOOK"; +SECTION_DEAD static char const* const stringBase_805535E1 = "Kkri"; +SECTION_DEAD static char const* const stringBase_805535E6 = "Kkri_TW"; +#pragma pop + /* 805535F8-80553604 000000 000C+00 3/3 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -1120,7 +1132,7 @@ SECTION_RODATA u8 const daNpc_Kkri_Param_c::m[140] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80553490, &daNpc_Kkri_Param_c::m); +COMPILER_STRIP_GATE(0x80553490, &daNpc_Kkri_Param_c::m); /* 8055351C-80553528 00008C 000C+00 0/1 0/0 0/0 .rodata heapSize$4005 */ #pragma push @@ -1128,42 +1140,42 @@ COMPILER_STRIP_GATE(80553490, &daNpc_Kkri_Param_c::m); SECTION_RODATA static u8 const heapSize[12] = { 0x00, 0x00, 0x42, 0xD0, 0x00, 0x00, 0x42, 0x10, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8055351C, &heapSize); +COMPILER_STRIP_GATE(0x8055351C, &heapSize); #pragma pop /* 80553528-8055352C 000098 0004+00 0/1 0/0 0/0 .rodata @4077 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4077 = -200.0f; -COMPILER_STRIP_GATE(80553528, &lit_4077); +COMPILER_STRIP_GATE(0x80553528, &lit_4077); #pragma pop /* 8055352C-80553530 00009C 0004+00 0/1 0/0 0/0 .rodata @4078 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4078 = -100.0f; -COMPILER_STRIP_GATE(8055352C, &lit_4078); +COMPILER_STRIP_GATE(0x8055352C, &lit_4078); #pragma pop /* 80553530-80553534 0000A0 0004+00 0/1 0/0 0/0 .rodata @4079 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4079 = 200.0f; -COMPILER_STRIP_GATE(80553530, &lit_4079); +COMPILER_STRIP_GATE(0x80553530, &lit_4079); #pragma pop /* 80553534-80553538 0000A4 0004+00 0/1 0/0 0/0 .rodata @4080 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4080 = 300.0f; -COMPILER_STRIP_GATE(80553534, &lit_4080); +COMPILER_STRIP_GATE(0x80553534, &lit_4080); #pragma pop /* 80553538-8055353C 0000A8 0004+00 0/1 0/0 0/0 .rodata @4081 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4081 = -1000000000.0f; -COMPILER_STRIP_GATE(80553538, &lit_4081); +COMPILER_STRIP_GATE(0x80553538, &lit_4081); #pragma pop /* 8054F4F8-8054F7D0 000238 02D8+00 1/1 0/0 0/0 .text create__12daNpc_Kkri_cFv */ @@ -1184,25 +1196,25 @@ SECTION_RODATA static u8 const lit_4243[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(8055353C, &lit_4243); +COMPILER_STRIP_GATE(0x8055353C, &lit_4243); /* 80553540-80553544 0000B0 0004+00 0/2 0/0 0/0 .rodata @4244 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4244 = 65536.0f; -COMPILER_STRIP_GATE(80553540, &lit_4244); +COMPILER_STRIP_GATE(0x80553540, &lit_4244); #pragma pop /* 80553544-80553548 0000B4 0004+00 0/3 0/0 0/0 .rodata @4245 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4245 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(80553544, &lit_4245); +COMPILER_STRIP_GATE(0x80553544, &lit_4245); #pragma pop /* 80553548-8055354C 0000B8 0004+00 2/4 0/0 0/0 .rodata @4391 */ SECTION_RODATA static f32 const lit_4391 = 1.0f; -COMPILER_STRIP_GATE(80553548, &lit_4391); +COMPILER_STRIP_GATE(0x80553548, &lit_4391); /* 8054F7D0-8054FA54 000510 0284+00 1/1 0/0 0/0 .text CreateHeap__12daNpc_Kkri_cFv */ #pragma push @@ -1337,7 +1349,7 @@ asm void daNpc_Kkri_c::Execute() { /* ############################################################################################## */ /* 8055354C-80553550 0000BC 0004+00 1/1 0/0 0/0 .rodata @4441 */ SECTION_RODATA static f32 const lit_4441 = 100.0f; -COMPILER_STRIP_GATE(8055354C, &lit_4441); +COMPILER_STRIP_GATE(0x8055354C, &lit_4441); /* 8054FC64-8054FD00 0009A4 009C+00 1/1 0/0 0/0 .text Draw__12daNpc_Kkri_cFv */ #pragma push @@ -1434,7 +1446,7 @@ asm void daNpc_Kkri_c::setParam() { /* ############################################################################################## */ /* 80553550-80553554 0000C0 0004+00 3/5 0/0 0/0 .rodata @4621 */ SECTION_RODATA static f32 const lit_4621 = -1.0f; -COMPILER_STRIP_GATE(80553550, &lit_4621); +COMPILER_STRIP_GATE(0x80553550, &lit_4621); /* 80550270-8055032C 000FB0 00BC+00 1/0 0/0 0/0 .text setAfterTalkMotion__12daNpc_Kkri_cFv */ #pragma push @@ -1501,35 +1513,35 @@ asm void daNpc_Kkri_c::beforeMove() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4792 = -30.0f; -COMPILER_STRIP_GATE(80553554, &lit_4792); +COMPILER_STRIP_GATE(0x80553554, &lit_4792); #pragma pop /* 80553558-8055355C 0000C8 0004+00 0/1 0/0 0/0 .rodata @4793 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4793 = 0x38C90FDB; -COMPILER_STRIP_GATE(80553558, &lit_4793); +COMPILER_STRIP_GATE(0x80553558, &lit_4793); #pragma pop /* 8055355C-80553560 0000CC 0004+00 0/2 0/0 0/0 .rodata @4794 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4794 = 30.0f; -COMPILER_STRIP_GATE(8055355C, &lit_4794); +COMPILER_STRIP_GATE(0x8055355C, &lit_4794); #pragma pop /* 80553560-80553564 0000D0 0004+00 0/1 0/0 0/0 .rodata @4795 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4795 = 160.0f; -COMPILER_STRIP_GATE(80553560, &lit_4795); +COMPILER_STRIP_GATE(0x80553560, &lit_4795); #pragma pop /* 80553564-80553568 0000D4 0004+00 0/2 0/0 0/0 .rodata @4796 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4796 = -20.0f; -COMPILER_STRIP_GATE(80553564, &lit_4796); +COMPILER_STRIP_GATE(0x80553564, &lit_4796); #pragma pop /* 80553568-80553570 0000D8 0004+04 0/1 0/0 0/0 .rodata @4797 */ @@ -1540,14 +1552,14 @@ SECTION_RODATA static f32 const lit_4797[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80553568, &lit_4797); +COMPILER_STRIP_GATE(0x80553568, &lit_4797); #pragma pop /* 80553570-80553578 0000E0 0008+00 2/4 0/0 0/0 .rodata @4799 */ SECTION_RODATA static u8 const lit_4799[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80553570, &lit_4799); +COMPILER_STRIP_GATE(0x80553570, &lit_4799); /* 805506BC-80550ADC 0013FC 0420+00 1/0 0/0 0/0 .text setAttnPos__12daNpc_Kkri_cFv */ #pragma push @@ -1566,7 +1578,7 @@ asm void daNpc_Kkri_c::setAttnPos() { SECTION_RODATA static u8 const lit_4857[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80553578, &lit_4857); +COMPILER_STRIP_GATE(0x80553578, &lit_4857); #pragma pop /* 80553580-80553588 0000F0 0008+00 0/1 0/0 0/0 .rodata @4858 */ @@ -1575,7 +1587,7 @@ COMPILER_STRIP_GATE(80553578, &lit_4857); SECTION_RODATA static u8 const lit_4858[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80553580, &lit_4858); +COMPILER_STRIP_GATE(0x80553580, &lit_4858); #pragma pop /* 80553588-80553590 0000F8 0008+00 0/1 0/0 0/0 .rodata @4859 */ @@ -1584,35 +1596,35 @@ COMPILER_STRIP_GATE(80553580, &lit_4858); SECTION_RODATA static u8 const lit_4859[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80553588, &lit_4859); +COMPILER_STRIP_GATE(0x80553588, &lit_4859); #pragma pop /* 80553590-80553594 000100 0004+00 0/1 0/0 0/0 .rodata @4908 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4908 = 140.0f; -COMPILER_STRIP_GATE(80553590, &lit_4908); +COMPILER_STRIP_GATE(0x80553590, &lit_4908); #pragma pop /* 80553594-80553598 000104 0004+00 0/1 0/0 0/0 .rodata @4909 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4909 = 40.0f; -COMPILER_STRIP_GATE(80553594, &lit_4909); +COMPILER_STRIP_GATE(0x80553594, &lit_4909); #pragma pop /* 80553598-8055359C 000108 0004+00 0/1 0/0 0/0 .rodata @4910 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4910 = 20.0f; -COMPILER_STRIP_GATE(80553598, &lit_4910); +COMPILER_STRIP_GATE(0x80553598, &lit_4910); #pragma pop /* 8055359C-805535A0 00010C 0004+00 0/1 0/0 0/0 .rodata @4911 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4911 = 150.0f; -COMPILER_STRIP_GATE(8055359C, &lit_4911); +COMPILER_STRIP_GATE(0x8055359C, &lit_4911); #pragma pop /* 80550ADC-80550CA0 00181C 01C4+00 1/0 0/0 0/0 .text setCollision__12daNpc_Kkri_cFv */ @@ -1645,7 +1657,7 @@ asm void daNpc_Kkri_c::selectAction() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpc_Kkri_c::chkAction(int (daNpc_Kkri_c::*)(void*)) { +asm void daNpc_Kkri_c::chkAction(int (daNpc_Kkri_c::*param_0)(void*)) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_kkri/d_a_npc_kkri/chkAction__12daNpc_Kkri_cFM12daNpc_Kkri_cFPCvPvPv_i.s" } @@ -1656,12 +1668,20 @@ asm void daNpc_Kkri_c::chkAction(int (daNpc_Kkri_c::*)(void*)) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpc_Kkri_c::setAction(int (daNpc_Kkri_c::*)(void*)) { +asm void daNpc_Kkri_c::setAction(int (daNpc_Kkri_c::*param_0)(void*)) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_kkri/d_a_npc_kkri/setAction__12daNpc_Kkri_cFM12daNpc_Kkri_cFPCvPvPv_i.s" } #pragma pop +/* ############################################################################################## */ +/* 805535A4-805535A4 000114 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_805535EE = "prm"; +SECTION_DEAD static char const* const stringBase_805535F2 = "timer"; +#pragma pop + /* 80550E18-80550F70 001B58 0158+00 1/0 0/0 0/0 .text cutConversationAboutSoup__12daNpc_Kkri_cFi */ #pragma push @@ -1718,7 +1738,7 @@ asm void daNpc_Kkri_c::sitWait1(void* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5390 = 1000000000.0f; -COMPILER_STRIP_GATE(805535A0, &lit_5390); +COMPILER_STRIP_GATE(0x805535A0, &lit_5390); #pragma pop /* 80551A4C-80551DA4 00278C 0358+00 1/0 0/0 0/0 .text fearWait__12daNpc_Kkri_cFPv */ @@ -2117,7 +2137,7 @@ void daNpcT_c::changeBtk(int* param_0, int* param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_805531D0(int* param_0) { +extern "C" asm void func_805531D0(void* _this, int* param_0) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_kkri/d_a_npc_kkri/func_805531D0.s" } @@ -2127,7 +2147,7 @@ extern "C" asm void func_805531D0(int* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_805531EC(int param_0, int param_1) { +extern "C" asm void func_805531EC(void* _this, int param_0, int param_1) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_kkri/d_a_npc_kkri/func_805531EC.s" } @@ -2159,7 +2179,7 @@ asm void __sinit_d_a_npc_kkri_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80553268 = (void*)__sinit_d_a_npc_kkri_cpp; +REGISTER_CTORS(0x80553268, __sinit_d_a_npc_kkri_cpp); #pragma pop /* 80553304-805533E4 004044 00E0+00 1/1 0/0 0/0 .text @@ -2251,17 +2271,4 @@ static asm void func_80553474() { } #pragma pop -/* 805535A4-805535F8 000114 0054+00 6/3 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_805535A4 = ""; -SECTION_DEAD static char const* const stringBase_805535A5 = "DEFAULT_GETITEM"; -SECTION_DEAD static char const* const stringBase_805535B5 = "NO_RESPONSE"; -SECTION_DEAD static char const* const stringBase_805535C1 = "CONVERSATION_ABOUT_SOUP"; -SECTION_DEAD static char const* const stringBase_805535D9 = "YM_LOOK"; -SECTION_DEAD static char const* const stringBase_805535E1 = "Kkri"; -SECTION_DEAD static char const* const stringBase_805535E6 = "Kkri_TW"; -SECTION_DEAD static char const* const stringBase_805535EE = "prm"; -SECTION_DEAD static char const* const stringBase_805535F2 = "timer"; -#pragma pop +/* 805535A4-805535A4 000114 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/npc/d_a_npc_kn/d_a_npc_kn.cpp b/rel/d/a/npc/d_a_npc_kn/d_a_npc_kn.cpp index be617626f40..f4c49d551c6 100644 --- a/rel/d/a/npc/d_a_npc_kn/d_a_npc_kn.cpp +++ b/rel/d/a/npc/d_a_npc_kn/d_a_npc_kn.cpp @@ -50,13 +50,13 @@ struct mDoExt_invisibleModel { /* 8000E7C0 */ void entryDL(cXyz*); }; -struct J3DAnmColor {}; +struct J3DAnmTextureSRTKey {}; struct J3DAnmTexPattern {}; struct J3DAnmTevRegKey {}; -struct J3DAnmTextureSRTKey {}; +struct J3DAnmColor {}; struct J3DMaterialTable { /* 8032F64C */ void removeMatColorAnimator(J3DAnmColor*); @@ -133,6 +133,14 @@ struct daPy_py_c { /* 8015F3FC */ void getAttentionOffsetY(); }; +struct dCcD_GObjInf { + /* 80083A28 */ dCcD_GObjInf(); + /* 800840E4 */ ~dCcD_GObjInf(); + /* 800842C0 */ void ChkAtHit(); + /* 80084460 */ void ChkTgHit(); + /* 800844F8 */ void GetTgHitObj(); +}; + struct daNpcT_MotionSeqMngr_c { struct sequenceStepData_c {}; @@ -141,13 +149,11 @@ struct daNpcT_MotionSeqMngr_c { /* 80A3C4A8 */ ~daNpcT_MotionSeqMngr_c(); }; -struct dCcD_GObjInf { - /* 80083A28 */ dCcD_GObjInf(); - /* 800840E4 */ ~dCcD_GObjInf(); - /* 800842C0 */ void ChkAtHit(); - /* 80084460 */ void ChkTgHit(); - /* 800844F8 */ void GetTgHitObj(); -}; +struct J3DAnmTransformKey {}; + +struct daNpcT_motionAnmData_c {}; + +struct daNpcT_faceMotionAnmData_c {}; struct daNpcT_evtData_c {}; @@ -160,12 +166,6 @@ struct J3DFrameCtrl { struct J3DJoint {}; -struct daNpcT_motionAnmData_c {}; - -struct daNpcT_faceMotionAnmData_c {}; - -struct J3DAnmTransformKey {}; - struct daNpc_Kn_c { struct daNpc_Kn_prtclMngr_c { /* 80A2AF98 */ ~daNpc_Kn_prtclMngr_c(); @@ -479,7 +479,6 @@ struct dEvt_control_c { /* 80042518 */ void reset(void*); /* 800432EC */ void convPId(unsigned int); /* 8004368C */ void setPtT(void*); - /* 800436EC */ void setPtI_Id(unsigned int); }; struct dEvent_manager_c { @@ -822,10 +821,10 @@ __ct__10daNpc_Kn_cFPC26daNpcT_faceMotionAnmData_cPC22daNpcT_motionAnmData_cPCQ22 extern "C" bool getEyeballMaterialNo__10daNpc_Kn_cFv(); extern "C" bool getEyeballLMaterialNo__10daNpc_Kn_cFv(); extern "C" bool getEyeballRMaterialNo__10daNpc_Kn_cFv(); -extern "C" void func_80A3BD2C(s16*); -extern "C" void func_80A3BD48(int*); -extern "C" void func_80A3BD64(s16, s16); -extern "C" void func_80A3BDE8(int, int); +extern "C" void func_80A3BD2C(void* _this, s16*); +extern "C" void func_80A3BD48(void* _this, int*); +extern "C" void func_80A3BD64(void* _this, s16, s16); +extern "C" void func_80A3BDE8(void* _this, int, int); extern "C" void __sinit_d_a_npc_kn_cpp(); extern "C" void __dt__16daNpc_Kn_Param_cFv(); extern "C" static void func_80A3C16C(); @@ -1136,6 +1135,46 @@ extern "C" void __register_global_object(); // /* ############################################################################################## */ +/* 80A40AF8-80A40AF8 000230 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80A40AF8 = "DEFAULT_GETITEM"; +SECTION_DEAD static char const* const stringBase_80A40B08 = ""; +SECTION_DEAD static char const* const stringBase_80A40B09 = "NONE_EQUIP_CHANGE_TALK"; +SECTION_DEAD static char const* const stringBase_80A40B20 = "NONE_EQUIP_CHANGE_TALK_WAIT"; +SECTION_DEAD static char const* const stringBase_80A40B3C = "NO_EQ_CHNGE_TLK_STD"; +SECTION_DEAD static char const* const stringBase_80A40B50 = "LARGE_DAMAGE_TALK"; +SECTION_DEAD static char const* const stringBase_80A40B62 = "FIRST_ENCOUNT"; +SECTION_DEAD static char const* const stringBase_80A40B70 = "ATTACK_FAILED"; +SECTION_DEAD static char const* const stringBase_80A40B7E = "FIRST_SKILL_GET"; +SECTION_DEAD static char const* const stringBase_80A40B8E = "SECOND_ENCOUNT"; +SECTION_DEAD static char const* const stringBase_80A40B9D = "SECOND_SKILL_EXPLAIN"; +SECTION_DEAD static char const* const stringBase_80A40BB2 = "REFLECT_EXPLAIN"; +SECTION_DEAD static char const* const stringBase_80A40BC2 = "SECOND_SKILL_GET"; +SECTION_DEAD static char const* const stringBase_80A40BD3 = "THIRD_SKILL_EXPLAIN"; +SECTION_DEAD static char const* const stringBase_80A40BE7 = "THIRD_SKILL_FIRST"; +SECTION_DEAD static char const* const stringBase_80A40BF9 = "THIRD_SKILL_GET"; +SECTION_DEAD static char const* const stringBase_80A40C09 = "FOURTH_SKILL_EXPLAIN"; +SECTION_DEAD static char const* const stringBase_80A40C1E = "FOURTH_SKILL_GET"; +SECTION_DEAD static char const* const stringBase_80A40C2F = "FIFTH_SKILL_EXPLAIN"; +SECTION_DEAD static char const* const stringBase_80A40C43 = "FIFTH_SKILL_FIRST"; +SECTION_DEAD static char const* const stringBase_80A40C55 = "FIFTH_SKILL_GET"; +SECTION_DEAD static char const* const stringBase_80A40C65 = "SIXTH_SKILL_EXPLAIN"; +SECTION_DEAD static char const* const stringBase_80A40C79 = "SIXTH_SKILL_GET"; +SECTION_DEAD static char const* const stringBase_80A40C89 = "SIXTH_SKILL_GET_STAND"; +SECTION_DEAD static char const* const stringBase_80A40C9F = "SEVENTH_SKILL_EXPLAIN"; +SECTION_DEAD static char const* const stringBase_80A40CB5 = "SEVENTH_SKILL_GET"; +SECTION_DEAD static char const* const stringBase_80A40CC7 = "SEVENTH_SKILL_GET_STAND"; +SECTION_DEAD static char const* const stringBase_80A40CDF = "KN_a"; +SECTION_DEAD static char const* const stringBase_80A40CE4 = "KN_tch01D"; +SECTION_DEAD static char const* const stringBase_80A40CEE = "KN_tch02D"; +SECTION_DEAD static char const* const stringBase_80A40CF8 = "KN_tch03D"; +SECTION_DEAD static char const* const stringBase_80A40D02 = "KN_tch04D"; +SECTION_DEAD static char const* const stringBase_80A40D0C = "KN_tch05D"; +SECTION_DEAD static char const* const stringBase_80A40D16 = "KN_tch06D"; +SECTION_DEAD static char const* const stringBase_80A40D20 = "KN_tch07D"; +#pragma pop + /* 80A40D34-80A40D40 000000 000C+00 10/10 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -3896,13 +3935,13 @@ SECTION_RODATA u8 const daNpc_Kn_c::mCcDObjData[48] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x79, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A408C8, &daNpc_Kn_c::mCcDObjData); +COMPILER_STRIP_GATE(0x80A408C8, &daNpc_Kn_c::mCcDObjData); /* 80A408F8-80A40900 000030 0008+00 6/11 0/0 0/0 .rodata @4095 */ SECTION_RODATA static u8 const lit_4095[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A408F8, &lit_4095); +COMPILER_STRIP_GATE(0x80A408F8, &lit_4095); /* 80A40900-80A40904 000038 0004+00 26/59 0/0 0/0 .rodata @4204 */ SECTION_RODATA static u8 const lit_4204[4] = { @@ -3911,95 +3950,95 @@ SECTION_RODATA static u8 const lit_4204[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A40900, &lit_4204); +COMPILER_STRIP_GATE(0x80A40900, &lit_4204); /* 80A40904-80A40908 00003C 0004+00 2/2 0/0 0/0 .rodata @4205 */ SECTION_RODATA static f32 const lit_4205 = -1000000000.0f; -COMPILER_STRIP_GATE(80A40904, &lit_4205); +COMPILER_STRIP_GATE(0x80A40904, &lit_4205); /* 80A40908-80A4090C 000040 0004+00 2/5 0/0 0/0 .rodata @4326 */ SECTION_RODATA static f32 const lit_4326 = 20.0f; -COMPILER_STRIP_GATE(80A40908, &lit_4326); +COMPILER_STRIP_GATE(0x80A40908, &lit_4326); /* 80A4090C-80A40910 000044 0004+00 9/16 0/0 0/0 .rodata @4327 */ SECTION_RODATA static f32 const lit_4327 = 1.0f; -COMPILER_STRIP_GATE(80A4090C, &lit_4327); +COMPILER_STRIP_GATE(0x80A4090C, &lit_4327); /* 80A40910-80A40914 000048 0004+00 1/2 0/0 0/0 .rodata @4561 */ SECTION_RODATA static f32 const lit_4561 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(80A40910, &lit_4561); +COMPILER_STRIP_GATE(0x80A40910, &lit_4561); /* 80A40914-80A40918 00004C 0004+00 16/45 0/0 0/0 .rodata @4613 */ SECTION_RODATA static f32 const lit_4613 = -1.0f; -COMPILER_STRIP_GATE(80A40914, &lit_4613); +COMPILER_STRIP_GATE(0x80A40914, &lit_4613); /* 80A40918-80A4091C 000050 0004+00 1/3 0/0 0/0 .rodata @5160 */ SECTION_RODATA static f32 const lit_5160 = 500.0f; -COMPILER_STRIP_GATE(80A40918, &lit_5160); +COMPILER_STRIP_GATE(0x80A40918, &lit_5160); /* 80A4091C-80A40920 000054 0004+00 1/4 0/0 0/0 .rodata @5255 */ SECTION_RODATA static f32 const lit_5255 = 180.0f; -COMPILER_STRIP_GATE(80A4091C, &lit_5255); +COMPILER_STRIP_GATE(0x80A4091C, &lit_5255); /* 80A40920-80A40924 000058 0004+00 1/1 0/0 0/0 .rodata @5256 */ SECTION_RODATA static u32 const lit_5256 = 0x43360B61; -COMPILER_STRIP_GATE(80A40920, &lit_5256); +COMPILER_STRIP_GATE(0x80A40920, &lit_5256); /* 80A40924-80A40928 00005C 0004+00 0/4 0/0 0/0 .rodata @5390 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5390 = 30.0f; -COMPILER_STRIP_GATE(80A40924, &lit_5390); +COMPILER_STRIP_GATE(0x80A40924, &lit_5390); #pragma pop /* 80A40928-80A4092C 000060 0004+00 0/1 0/0 0/0 .rodata @5391 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5391 = 45.0f; -COMPILER_STRIP_GATE(80A40928, &lit_5391); +COMPILER_STRIP_GATE(0x80A40928, &lit_5391); #pragma pop /* 80A4092C-80A40930 000064 0004+00 0/1 0/0 0/0 .rodata @5392 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5392 = 60.0f; -COMPILER_STRIP_GATE(80A4092C, &lit_5392); +COMPILER_STRIP_GATE(0x80A4092C, &lit_5392); #pragma pop /* 80A40930-80A40934 000068 0004+00 0/1 0/0 0/0 .rodata @5393 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5393 = 90.0f; -COMPILER_STRIP_GATE(80A40930, &lit_5393); +COMPILER_STRIP_GATE(0x80A40930, &lit_5393); #pragma pop /* 80A40934-80A40938 00006C 0004+00 0/1 0/0 0/0 .rodata @5394 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5394 = 110.0f; -COMPILER_STRIP_GATE(80A40934, &lit_5394); +COMPILER_STRIP_GATE(0x80A40934, &lit_5394); #pragma pop /* 80A40938-80A4093C 000070 0004+00 5/6 0/0 0/0 .rodata @5395 */ SECTION_RODATA static f32 const lit_5395 = 135.0f; -COMPILER_STRIP_GATE(80A40938, &lit_5395); +COMPILER_STRIP_GATE(0x80A40938, &lit_5395); /* 80A4093C-80A40940 000074 0004+00 1/2 0/0 0/0 .rodata @5560 */ SECTION_RODATA static u32 const lit_5560 = 0x3BB40000; -COMPILER_STRIP_GATE(80A4093C, &lit_5560); +COMPILER_STRIP_GATE(0x80A4093C, &lit_5560); /* 80A40940-80A40944 000078 0004+00 0/1 0/0 0/0 .rodata @5561 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5561 = 8.0f; -COMPILER_STRIP_GATE(80A40940, &lit_5561); +COMPILER_STRIP_GATE(0x80A40940, &lit_5561); #pragma pop /* 80A40944-80A40948 00007C 0004+00 0/1 0/0 0/0 .rodata @5562 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5562 = 16384.0f; -COMPILER_STRIP_GATE(80A40944, &lit_5562); +COMPILER_STRIP_GATE(0x80A40944, &lit_5562); #pragma pop /* 80A40948-80A40950 000080 0008+00 0/5 0/0 0/0 .rodata @5687 */ @@ -4008,7 +4047,7 @@ COMPILER_STRIP_GATE(80A40944, &lit_5562); SECTION_RODATA static u8 const lit_5687[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A40948, &lit_5687); +COMPILER_STRIP_GATE(0x80A40948, &lit_5687); #pragma pop /* 80A40950-80A40958 000088 0008+00 0/5 0/0 0/0 .rodata @5688 */ @@ -4017,7 +4056,7 @@ COMPILER_STRIP_GATE(80A40948, &lit_5687); SECTION_RODATA static u8 const lit_5688[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A40950, &lit_5688); +COMPILER_STRIP_GATE(0x80A40950, &lit_5688); #pragma pop /* 80A40958-80A40960 000090 0008+00 0/5 0/0 0/0 .rodata @5689 */ @@ -4026,28 +4065,28 @@ COMPILER_STRIP_GATE(80A40950, &lit_5688); SECTION_RODATA static u8 const lit_5689[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A40958, &lit_5689); +COMPILER_STRIP_GATE(0x80A40958, &lit_5689); #pragma pop /* 80A40960-80A40964 000098 0004+00 0/0 0/0 0/0 .rodata @5690 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5690 = 17.0f / 20.0f; -COMPILER_STRIP_GATE(80A40960, &lit_5690); +COMPILER_STRIP_GATE(0x80A40960, &lit_5690); #pragma pop /* 80A40964-80A40968 00009C 0004+00 0/1 0/0 0/0 .rodata @5710 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5710 = 6.0f; -COMPILER_STRIP_GATE(80A40964, &lit_5710); +COMPILER_STRIP_GATE(0x80A40964, &lit_5710); #pragma pop /* 80A40968-80A4096C 0000A0 0004+00 0/0 0/0 0/0 .rodata @5787 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5787 = 1000000000.0f; -COMPILER_STRIP_GATE(80A40968, &lit_5787); +COMPILER_STRIP_GATE(0x80A40968, &lit_5787); #pragma pop /* 80A4096C-80A40970 0000A4 0004+00 1/1 0/0 0/0 .rodata id$5838 */ @@ -4057,7 +4096,7 @@ SECTION_RODATA static u8 const id[4] = { 0x84, 0x98, }; -COMPILER_STRIP_GATE(80A4096C, &id); +COMPILER_STRIP_GATE(0x80A4096C, &id); /* 80A40970-80A40A24 0000A8 00B4+00 8/29 0/0 0/0 .rodata m__16daNpc_Kn_Param_c */ SECTION_RODATA u8 const daNpc_Kn_Param_c::m[180] = { @@ -4074,7 +4113,7 @@ SECTION_RODATA u8 const daNpc_Kn_Param_c::m[180] = { 0x00, 0x00, 0x43, 0x70, 0x00, 0x00, 0x44, 0x89, 0x80, 0x00, 0x41, 0xD8, 0x00, 0x00, 0x42, 0x48, 0x00, 0x00, 0x00, 0x10, 0x02, 0x00, 0x00, 0x78, 0x00, 0x5A, 0x40, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A40970, &daNpc_Kn_Param_c::m); +COMPILER_STRIP_GATE(0x80A40970, &daNpc_Kn_Param_c::m); /* 80A40A24-80A40A44 00015C 0020+00 0/1 0/0 0/0 .rodata heapSize$6094 */ #pragma push @@ -4083,35 +4122,35 @@ SECTION_RODATA static u8 const heapSize[32] = { 0x00, 0x00, 0x4B, 0x10, 0x00, 0x00, 0x4B, 0x20, 0x00, 0x00, 0x4B, 0x10, 0x00, 0x00, 0x4B, 0x10, 0x00, 0x00, 0x5A, 0x00, 0x00, 0x00, 0x4B, 0x10, 0x00, 0x00, 0x4B, 0x20, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A40A24, &heapSize); +COMPILER_STRIP_GATE(0x80A40A24, &heapSize); #pragma pop /* 80A40A44-80A40A48 00017C 0004+00 0/1 0/0 0/0 .rodata @6139 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6139 = -300.0f; -COMPILER_STRIP_GATE(80A40A44, &lit_6139); +COMPILER_STRIP_GATE(0x80A40A44, &lit_6139); #pragma pop /* 80A40A48-80A40A4C 000180 0004+00 0/1 0/0 0/0 .rodata @6140 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6140 = -50.0f; -COMPILER_STRIP_GATE(80A40A48, &lit_6140); +COMPILER_STRIP_GATE(0x80A40A48, &lit_6140); #pragma pop /* 80A40A4C-80A40A50 000184 0004+00 0/1 0/0 0/0 .rodata @6141 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6141 = 300.0f; -COMPILER_STRIP_GATE(80A40A4C, &lit_6141); +COMPILER_STRIP_GATE(0x80A40A4C, &lit_6141); #pragma pop /* 80A40A50-80A40A54 000188 0004+00 0/1 0/0 0/0 .rodata @6142 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6142 = 450.0f; -COMPILER_STRIP_GATE(80A40A50, &lit_6142); +COMPILER_STRIP_GATE(0x80A40A50, &lit_6142); #pragma pop /* 80A2AFD4-80A2B278 0006B4 02A4+00 1/1 0/0 0/0 .text create__10daNpc_Kn_cFv */ @@ -4352,6 +4391,13 @@ asm void daNpc_Kn_c::evtTalk() { } #pragma pop +/* ############################################################################################## */ +/* 80A40AF8-80A40AF8 000230 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80A40D2A = "Kn"; +#pragma pop + /* 80A2C318-80A2C3FC 0019F8 00E4+00 1/1 0/0 0/0 .text evtCutProc__10daNpc_Kn_cFv */ #pragma push #pragma optimization_level 0 @@ -4397,7 +4443,7 @@ asm void daNpc_Kn_c::afterMoved() { #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_7002 = 0x38C90FDB; -COMPILER_STRIP_GATE(80A40A54, &lit_7002); +COMPILER_STRIP_GATE(0x80A40A54, &lit_7002); #pragma pop /* 80A2C56C-80A2C77C 001C4C 0210+00 1/1 0/0 0/0 .text setAttnPos__10daNpc_Kn_cFv */ @@ -4425,7 +4471,7 @@ asm void daNpc_Kn_c::setCollision() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7177 = 40.0f; -COMPILER_STRIP_GATE(80A40A58, &lit_7177); +COMPILER_STRIP_GATE(0x80A40A58, &lit_7177); #pragma pop /* 80A2C984-80A2CB30 002064 01AC+00 1/1 0/0 0/0 .text setCollisionSword__10daNpc_Kn_cFv @@ -4605,7 +4651,7 @@ asm void daNpc_Kn_c::teach07_selectAction() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpc_Kn_c::chkAction(int (daNpc_Kn_c::*)(void*)) { +asm void daNpc_Kn_c::chkAction(int (daNpc_Kn_c::*param_0)(void*)) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_kn/d_a_npc_kn/chkAction__10daNpc_Kn_cFM10daNpc_Kn_cFPCvPvPv_i.s" } @@ -4616,7 +4662,7 @@ asm void daNpc_Kn_c::chkAction(int (daNpc_Kn_c::*)(void*)) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpc_Kn_c::setAction(int (daNpc_Kn_c::*)(void*)) { +asm void daNpc_Kn_c::setAction(int (daNpc_Kn_c::*param_0)(void*)) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_kn/d_a_npc_kn/setAction__10daNpc_Kn_cFM10daNpc_Kn_cFPCvPvPv_i.s" } @@ -4662,6 +4708,13 @@ asm void daNpc_Kn_c::setSceneChange(int param_0) { } #pragma pop +/* ############################################################################################## */ +/* 80A40AF8-80A40AF8 000230 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80A40D2D = "prm"; +#pragma pop + /* 80A2DD70-80A2DF84 003450 0214+00 1/0 0/0 0/0 .text ECut_noneEquipChangeTalk__10daNpc_Kn_cFi */ #pragma push #pragma optimization_level 0 @@ -4730,14 +4783,14 @@ asm void daNpc_Kn_c::teach04_attackWait(void* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8270 = 10.0f; -COMPILER_STRIP_GATE(80A40A5C, &lit_8270); +COMPILER_STRIP_GATE(0x80A40A5C, &lit_8270); #pragma pop /* 80A40A60-80A40A64 000198 0004+00 0/1 0/0 0/0 .rodata @8271 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8271 = -10.0f; -COMPILER_STRIP_GATE(80A40A60, &lit_8271); +COMPILER_STRIP_GATE(0x80A40A60, &lit_8271); #pragma pop /* 80A2EF8C-80A2F24C 00466C 02C0+00 1/0 0/0 0/0 .text teach04_headBreakWait__10daNpc_Kn_cFPv */ @@ -4840,14 +4893,14 @@ asm void daNpc_Kn_c::teach06_superJumpWaitDivide(void* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9120 = 13.0f; -COMPILER_STRIP_GATE(80A40A64, &lit_9120); +COMPILER_STRIP_GATE(0x80A40A64, &lit_9120); #pragma pop /* 80A40A68-80A40A6C 0001A0 0004+00 0/3 0/0 0/0 .rodata @9121 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9121 = 14.0f; -COMPILER_STRIP_GATE(80A40A68, &lit_9121); +COMPILER_STRIP_GATE(0x80A40A68, &lit_9121); #pragma pop /* 80A30D44-80A30EDC 006424 0198+00 1/0 0/0 0/0 .text teach06_superJumpedDivide__10daNpc_Kn_cFPv @@ -4908,7 +4961,7 @@ asm void daNpc_Kn_c::teach07_superTurnAttackWait(void* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9374 = 375.0f; -COMPILER_STRIP_GATE(80A40A6C, &lit_9374); +COMPILER_STRIP_GATE(0x80A40A6C, &lit_9374); #pragma pop /* 80A315D0-80A317F8 006CB0 0228+00 1/0 0/0 0/0 .text teach07_divideMove__10daNpc_Kn_cFPv @@ -5086,70 +5139,70 @@ asm void daNpc_Kn_c::ECut_seventhSkillGet(int param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9980 = 4.0f; -COMPILER_STRIP_GATE(80A40A70, &lit_9980); +COMPILER_STRIP_GATE(0x80A40A70, &lit_9980); #pragma pop /* 80A40A74-80A40A78 0001AC 0004+00 0/0 0/0 0/0 .rodata @9981 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_9981 = 0x407147AE; -COMPILER_STRIP_GATE(80A40A74, &lit_9981); +COMPILER_STRIP_GATE(0x80A40A74, &lit_9981); #pragma pop /* 80A40A78-80A40A7C 0001B0 0004+00 0/0 0/0 0/0 .rodata @9982 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_9982 = 0x41986666; -COMPILER_STRIP_GATE(80A40A78, &lit_9982); +COMPILER_STRIP_GATE(0x80A40A78, &lit_9982); #pragma pop /* 80A40A7C-80A40A80 0001B4 0004+00 0/0 0/0 0/0 .rodata @9983 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_9983 = 0xC15A8F5C; -COMPILER_STRIP_GATE(80A40A7C, &lit_9983); +COMPILER_STRIP_GATE(0x80A40A7C, &lit_9983); #pragma pop /* 80A40A80-80A40A84 0001B8 0004+00 0/0 0/0 0/0 .rodata @10161 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10161 = 700.0f; -COMPILER_STRIP_GATE(80A40A80, &lit_10161); +COMPILER_STRIP_GATE(0x80A40A80, &lit_10161); #pragma pop /* 80A40A84-80A40A88 0001BC 0004+00 0/0 0/0 0/0 .rodata @10494 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10494 = 594.0f; -COMPILER_STRIP_GATE(80A40A84, &lit_10494); +COMPILER_STRIP_GATE(0x80A40A84, &lit_10494); #pragma pop /* 80A40A88-80A40A8C 0001C0 0004+00 0/0 0/0 0/0 .rodata @11020 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_11020 = 165.0f; -COMPILER_STRIP_GATE(80A40A88, &lit_11020); +COMPILER_STRIP_GATE(0x80A40A88, &lit_11020); #pragma pop /* 80A40A8C-80A40A90 0001C4 0004+00 0/0 0/0 0/0 .rodata @11021 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_11021 = 9.0f; -COMPILER_STRIP_GATE(80A40A8C, &lit_11021); +COMPILER_STRIP_GATE(0x80A40A8C, &lit_11021); #pragma pop /* 80A40A90-80A40A94 0001C8 0004+00 0/0 0/0 0/0 .rodata @11516 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_11516 = 0x430AA3D7; -COMPILER_STRIP_GATE(80A40A90, &lit_11516); +COMPILER_STRIP_GATE(0x80A40A90, &lit_11516); #pragma pop /* 80A40A94-80A40A98 0001CC 0004+00 0/1 0/0 0/0 .rodata @11694 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_11694 = 1000.0f; -COMPILER_STRIP_GATE(80A40A94, &lit_11694); +COMPILER_STRIP_GATE(0x80A40A94, &lit_11694); #pragma pop /* 80A40A98-80A40AA0 0001D0 0008+00 0/0 0/0 0/0 .rodata @11976 */ @@ -5158,14 +5211,14 @@ COMPILER_STRIP_GATE(80A40A94, &lit_11694); SECTION_RODATA static u8 const lit_11976[8] = { 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A40A98, &lit_11976); +COMPILER_STRIP_GATE(0x80A40A98, &lit_11976); #pragma pop /* 80A40AA0-80A40AA4 0001D8 0004+00 0/2 0/0 0/0 .rodata @12218 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_12218 = 2.0f; -COMPILER_STRIP_GATE(80A40AA0, &lit_12218); +COMPILER_STRIP_GATE(0x80A40AA0, &lit_12218); #pragma pop /* 80A372D0-80A37430 00C9B0 0160+00 1/1 0/0 0/0 .text setPrtcl__10daNpc_Kn_cFv */ @@ -5202,7 +5255,7 @@ asm void daNpc_Kn_c::setLandingPrtcl() { /* ############################################################################################## */ /* 80A40AA4-80A40AA8 0001DC 0004+00 1/2 0/0 0/0 .rodata @12304 */ SECTION_RODATA static f32 const lit_12304 = 150.0f; -COMPILER_STRIP_GATE(80A40AA4, &lit_12304); +COMPILER_STRIP_GATE(0x80A40AA4, &lit_12304); /* 80A37598-80A37670 00CC78 00D8+00 1/1 0/0 0/0 .text calcMagicBallPos__10daNpc_Kn_cFv */ #pragma push @@ -5219,49 +5272,49 @@ asm void daNpc_Kn_c::calcMagicBallPos() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_12497 = 17.0f; -COMPILER_STRIP_GATE(80A40AA8, &lit_12497); +COMPILER_STRIP_GATE(0x80A40AA8, &lit_12497); #pragma pop /* 80A40AAC-80A40AB0 0001E4 0004+00 0/1 0/0 0/0 .rodata @12498 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_12498 = 37.0f; -COMPILER_STRIP_GATE(80A40AAC, &lit_12498); +COMPILER_STRIP_GATE(0x80A40AAC, &lit_12498); #pragma pop /* 80A40AB0-80A40AB4 0001E8 0004+00 0/1 0/0 0/0 .rodata @12499 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_12499 = 0x3FC2DABA; -COMPILER_STRIP_GATE(80A40AB0, &lit_12499); +COMPILER_STRIP_GATE(0x80A40AB0, &lit_12499); #pragma pop /* 80A40AB4-80A40AB8 0001EC 0004+00 0/1 0/0 0/0 .rodata @12500 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_12500 = 13.0f / 10.0f; -COMPILER_STRIP_GATE(80A40AB4, &lit_12500); +COMPILER_STRIP_GATE(0x80A40AB4, &lit_12500); #pragma pop /* 80A40AB8-80A40ABC 0001F0 0004+00 0/1 0/0 0/0 .rodata @12501 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_12501 = 0x42B0CCCC; -COMPILER_STRIP_GATE(80A40AB8, &lit_12501); +COMPILER_STRIP_GATE(0x80A40AB8, &lit_12501); #pragma pop /* 80A40ABC-80A40AC0 0001F4 0004+00 0/1 0/0 0/0 .rodata @12502 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_12502 = 31.0f; -COMPILER_STRIP_GATE(80A40ABC, &lit_12502); +COMPILER_STRIP_GATE(0x80A40ABC, &lit_12502); #pragma pop /* 80A40AC0-80A40AC4 0001F8 0004+00 0/1 0/0 0/0 .rodata @12503 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_12503 = 52.0f / 5.0f; -COMPILER_STRIP_GATE(80A40AC0, &lit_12503); +COMPILER_STRIP_GATE(0x80A40AC0, &lit_12503); #pragma pop /* 80A432C0-80A432C4 000008 0001+03 1/1 0/0 0/0 .bss @1109 */ @@ -5417,21 +5470,21 @@ asm void daNpc_Kn_c::setSwordChargePtcl() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_12556 = 0.25f; -COMPILER_STRIP_GATE(80A40AC4, &lit_12556); +COMPILER_STRIP_GATE(0x80A40AC4, &lit_12556); #pragma pop /* 80A40AC8-80A40ACC 000200 0004+00 0/1 0/0 0/0 .rodata @12557 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_12557 = 25.0f; -COMPILER_STRIP_GATE(80A40AC8, &lit_12557); +COMPILER_STRIP_GATE(0x80A40AC8, &lit_12557); #pragma pop /* 80A40ACC-80A40AD0 000204 0004+00 0/1 0/0 0/0 .rodata @12558 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_12558 = 5.0f; -COMPILER_STRIP_GATE(80A40ACC, &lit_12558); +COMPILER_STRIP_GATE(0x80A40ACC, &lit_12558); #pragma pop /* 80A37B08-80A37D20 00D1E8 0218+00 13/13 0/0 0/0 .text calcSlip__10daNpc_Kn_cFv */ @@ -5449,7 +5502,7 @@ asm void daNpc_Kn_c::calcSlip() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_12656 = 250.0f; -COMPILER_STRIP_GATE(80A40AD0, &lit_12656); +COMPILER_STRIP_GATE(0x80A40AD0, &lit_12656); #pragma pop /* 80A37D20-80A3805C 00D400 033C+00 9/9 0/0 0/0 .text calcSwordAttackMove__10daNpc_Kn_cFi @@ -6149,7 +6202,7 @@ bool daNpc_Kn_c::getEyeballRMaterialNo() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80A3BD2C(s16* param_0) { +extern "C" asm void func_80A3BD2C(void* _this, s16* param_0) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_kn/d_a_npc_kn/func_80A3BD2C.s" } @@ -6159,7 +6212,7 @@ extern "C" asm void func_80A3BD2C(s16* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80A3BD48(int* param_0) { +extern "C" asm void func_80A3BD48(void* _this, int* param_0) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_kn/d_a_npc_kn/func_80A3BD48.s" } @@ -6169,7 +6222,7 @@ extern "C" asm void func_80A3BD48(int* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80A3BD64(s16 param_0, s16 param_1) { +extern "C" asm void func_80A3BD64(void* _this, s16 param_0, s16 param_1) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_kn/d_a_npc_kn/func_80A3BD64.s" } @@ -6179,7 +6232,7 @@ extern "C" asm void func_80A3BD64(s16 param_0, s16 param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80A3BDE8(int param_0, int param_1) { +extern "C" asm void func_80A3BDE8(void* _this, int param_0, int param_1) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_kn/d_a_npc_kn/func_80A3BDE8.s" } @@ -6205,7 +6258,7 @@ asm void __sinit_d_a_npc_kn_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80A3BE64 = (void*)__sinit_d_a_npc_kn_cpp; +REGISTER_CTORS(0x80A3BE64, __sinit_d_a_npc_kn_cpp); #pragma pop /* 80A3C124-80A3C16C 011804 0048+00 2/1 0/0 0/0 .text __dt__16daNpc_Kn_Param_cFv */ @@ -6482,28 +6535,28 @@ asm void daNpc_Kn_c::teach01_swordFinishWait(void* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_12826 = 27.0f; -COMPILER_STRIP_GATE(80A40AD4, &lit_12826); +COMPILER_STRIP_GATE(0x80A40AD4, &lit_12826); #pragma pop /* 80A40AD8-80A40ADC 000210 0004+00 0/0 0/0 0/0 .rodata @12827 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_12827 = 28.0f; -COMPILER_STRIP_GATE(80A40AD8, &lit_12827); +COMPILER_STRIP_GATE(0x80A40AD8, &lit_12827); #pragma pop /* 80A40ADC-80A40AE0 000214 0004+00 0/2 0/0 0/0 .rodata @13396 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_13396 = 600.0f; -COMPILER_STRIP_GATE(80A40ADC, &lit_13396); +COMPILER_STRIP_GATE(0x80A40ADC, &lit_13396); #pragma pop /* 80A40AE0-80A40AE4 000218 0004+00 0/1 0/0 0/0 .rodata @13397 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_13397 = 100.0f; -COMPILER_STRIP_GATE(80A40AE0, &lit_13397); +COMPILER_STRIP_GATE(0x80A40AE0, &lit_13397); #pragma pop /* 80A3D6D8-80A3DCEC 012DB8 0614+00 3/3 0/0 0/0 .text ctrlWarp__10daNpc_Kn_cFv */ @@ -6554,7 +6607,7 @@ asm void daNpc_Kn_c::ECut_firstSkillGet(int param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_13839 = 255.0f; -COMPILER_STRIP_GATE(80A40AE4, &lit_13839); +COMPILER_STRIP_GATE(0x80A40AE4, &lit_13839); #pragma pop /* 80A3EB84-80A3EE38 014264 02B4+00 1/1 0/0 0/0 .text setParamTeach02__10daNpc_Kn_cFv */ @@ -6614,21 +6667,21 @@ asm void daNpc_Kn_c::teach02_finishWait(void* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_14209 = 3.0f; -COMPILER_STRIP_GATE(80A40AE8, &lit_14209); +COMPILER_STRIP_GATE(0x80A40AE8, &lit_14209); #pragma pop /* 80A40AEC-80A40AF0 000224 0004+00 0/1 0/0 0/0 .rodata @14210 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_14210 = 34.0f; -COMPILER_STRIP_GATE(80A40AEC, &lit_14210); +COMPILER_STRIP_GATE(0x80A40AEC, &lit_14210); #pragma pop /* 80A40AF0-80A40AF4 000228 0004+00 0/1 0/0 0/0 .rodata @14211 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_14211 = 35.0f; -COMPILER_STRIP_GATE(80A40AF0, &lit_14211); +COMPILER_STRIP_GATE(0x80A40AF0, &lit_14211); #pragma pop /* 80A3F5A4-80A3F99C 014C84 03F8+00 1/0 0/0 0/0 .text teach02_shieldReflectWait__10daNpc_Kn_cFPv @@ -6679,7 +6732,7 @@ asm void daNpc_Kn_c::ECut_secondSkillGet(int param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_14385 = 15.0f; -COMPILER_STRIP_GATE(80A40AF4, &lit_14385); +COMPILER_STRIP_GATE(0x80A40AF4, &lit_14385); #pragma pop /* 80A43414-80A43418 00015C 0004+00 0/0 0/0 0/0 .bss @@ -6853,45 +6906,4 @@ static u8 data_80A43470[4]; static u8 data_80A43474[4]; #pragma pop -/* 80A40AF8-80A40D31 000230 0239+00 25/22 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80A40AF8 = "DEFAULT_GETITEM"; -SECTION_DEAD static char const* const stringBase_80A40B08 = ""; -SECTION_DEAD static char const* const stringBase_80A40B09 = "NONE_EQUIP_CHANGE_TALK"; -SECTION_DEAD static char const* const stringBase_80A40B20 = "NONE_EQUIP_CHANGE_TALK_WAIT"; -SECTION_DEAD static char const* const stringBase_80A40B3C = "NO_EQ_CHNGE_TLK_STD"; -SECTION_DEAD static char const* const stringBase_80A40B50 = "LARGE_DAMAGE_TALK"; -SECTION_DEAD static char const* const stringBase_80A40B62 = "FIRST_ENCOUNT"; -SECTION_DEAD static char const* const stringBase_80A40B70 = "ATTACK_FAILED"; -SECTION_DEAD static char const* const stringBase_80A40B7E = "FIRST_SKILL_GET"; -SECTION_DEAD static char const* const stringBase_80A40B8E = "SECOND_ENCOUNT"; -SECTION_DEAD static char const* const stringBase_80A40B9D = "SECOND_SKILL_EXPLAIN"; -SECTION_DEAD static char const* const stringBase_80A40BB2 = "REFLECT_EXPLAIN"; -SECTION_DEAD static char const* const stringBase_80A40BC2 = "SECOND_SKILL_GET"; -SECTION_DEAD static char const* const stringBase_80A40BD3 = "THIRD_SKILL_EXPLAIN"; -SECTION_DEAD static char const* const stringBase_80A40BE7 = "THIRD_SKILL_FIRST"; -SECTION_DEAD static char const* const stringBase_80A40BF9 = "THIRD_SKILL_GET"; -SECTION_DEAD static char const* const stringBase_80A40C09 = "FOURTH_SKILL_EXPLAIN"; -SECTION_DEAD static char const* const stringBase_80A40C1E = "FOURTH_SKILL_GET"; -SECTION_DEAD static char const* const stringBase_80A40C2F = "FIFTH_SKILL_EXPLAIN"; -SECTION_DEAD static char const* const stringBase_80A40C43 = "FIFTH_SKILL_FIRST"; -SECTION_DEAD static char const* const stringBase_80A40C55 = "FIFTH_SKILL_GET"; -SECTION_DEAD static char const* const stringBase_80A40C65 = "SIXTH_SKILL_EXPLAIN"; -SECTION_DEAD static char const* const stringBase_80A40C79 = "SIXTH_SKILL_GET"; -SECTION_DEAD static char const* const stringBase_80A40C89 = "SIXTH_SKILL_GET_STAND"; -SECTION_DEAD static char const* const stringBase_80A40C9F = "SEVENTH_SKILL_EXPLAIN"; -SECTION_DEAD static char const* const stringBase_80A40CB5 = "SEVENTH_SKILL_GET"; -SECTION_DEAD static char const* const stringBase_80A40CC7 = "SEVENTH_SKILL_GET_STAND"; -SECTION_DEAD static char const* const stringBase_80A40CDF = "KN_a"; -SECTION_DEAD static char const* const stringBase_80A40CE4 = "KN_tch01D"; -SECTION_DEAD static char const* const stringBase_80A40CEE = "KN_tch02D"; -SECTION_DEAD static char const* const stringBase_80A40CF8 = "KN_tch03D"; -SECTION_DEAD static char const* const stringBase_80A40D02 = "KN_tch04D"; -SECTION_DEAD static char const* const stringBase_80A40D0C = "KN_tch05D"; -SECTION_DEAD static char const* const stringBase_80A40D16 = "KN_tch06D"; -SECTION_DEAD static char const* const stringBase_80A40D20 = "KN_tch07D"; -SECTION_DEAD static char const* const stringBase_80A40D2A = "Kn"; -SECTION_DEAD static char const* const stringBase_80A40D2D = "prm"; -#pragma pop +/* 80A40AF8-80A40AF8 000230 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/npc/d_a_npc_knj/d_a_npc_knj.cpp b/rel/d/a/npc/d_a_npc_knj/d_a_npc_knj.cpp index b3fd774ab9d..623e549214a 100644 --- a/rel/d/a/npc/d_a_npc_knj/d_a_npc_knj.cpp +++ b/rel/d/a/npc/d_a_npc_knj/d_a_npc_knj.cpp @@ -11,12 +11,14 @@ // Types: // -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; +struct J3DAnmTransform {}; + +struct J3DModelData {}; + struct Vec {}; struct Z2Creature { @@ -25,8 +27,6 @@ struct Z2Creature { /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -40,6 +40,8 @@ struct fopAc_ac_c { /* 80018C8C */ ~fopAc_ac_c(); }; +struct daNpcT_faceMotionAnmData_c {}; + struct daNpcT_MotionSeqMngr_c { struct sequenceStepData_c {}; @@ -47,12 +49,10 @@ struct daNpcT_MotionSeqMngr_c { /* 80A4511C */ ~daNpcT_MotionSeqMngr_c(); }; -struct daNpcT_motionAnmData_c {}; - -struct daNpcT_faceMotionAnmData_c {}; - struct daNpcT_evtData_c {}; +struct daNpcT_motionAnmData_c {}; + struct daNpc_Knj_c { /* 80A4356C */ ~daNpc_Knj_c(); /* 80A43608 */ void create(); @@ -95,21 +95,21 @@ struct daNpc_Knj_Param_c { static u8 const m[140]; }; +struct J3DAnmTexPattern {}; + +struct _GXColorS10 {}; + struct J3DModel {}; +struct J3DJoint {}; + +struct J3DAnmTevRegKey {}; + struct cXyz { /* 80A44B54 */ ~cXyz(); /* 80A450D0 */ cXyz(); }; -struct _GXColorS10 {}; - -struct J3DJoint {}; - -struct J3DAnmTexPattern {}; - -struct J3DAnmTevRegKey {}; - struct daNpcT_c { /* 801480D0 */ void getTexPtrnAnmP(char const*, int); /* 80148148 */ void getTevRegKeyAnmP(char const*, int); @@ -251,13 +251,13 @@ struct dBgS_AcchCir { /* 80A45164 */ ~dBgS_AcchCir(); }; -struct dBgS {}; - struct csXyz { /* 80A44B90 */ ~csXyz(); /* 80A44FD0 */ csXyz(); }; +struct dBgS {}; + struct dBgS_Acch { /* 80075F94 */ ~dBgS_Acch(); /* 800760A0 */ dBgS_Acch(); @@ -484,6 +484,14 @@ extern "C" void __register_global_object(); // /* ############################################################################################## */ +/* 80A455BC-80A455BC 0000AC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80A455BC = ""; +SECTION_DEAD static char const* const stringBase_80A455BD = "NO_RESPONSE"; +SECTION_DEAD static char const* const stringBase_80A455C9 = "Knj"; +#pragma pop + /* 80A455D0-80A455DC 000000 000C+00 2/2 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -778,7 +786,7 @@ SECTION_RODATA u8 const daNpc_Knj_Param_c::m[140] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A45510, &daNpc_Knj_Param_c::m); +COMPILER_STRIP_GATE(0x80A45510, &daNpc_Knj_Param_c::m); /* 80A43608-80A43848 000188 0240+00 1/1 0/0 0/0 .text create__11daNpc_Knj_cFv */ #pragma push @@ -798,20 +806,20 @@ SECTION_RODATA static u8 const lit_4089[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A4559C, &lit_4089); +COMPILER_STRIP_GATE(0x80A4559C, &lit_4089); /* 80A455A0-80A455A4 000090 0004+00 0/2 0/0 0/0 .rodata @4090 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4090 = 65536.0f; -COMPILER_STRIP_GATE(80A455A0, &lit_4090); +COMPILER_STRIP_GATE(0x80A455A0, &lit_4090); #pragma pop /* 80A455A4-80A455A8 000094 0004+00 0/2 0/0 0/0 .rodata @4091 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4091 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(80A455A4, &lit_4091); +COMPILER_STRIP_GATE(0x80A455A4, &lit_4091); #pragma pop /* 80A455A8-80A455B0 000098 0004+04 2/2 0/0 0/0 .rodata @4215 */ @@ -820,7 +828,7 @@ SECTION_RODATA static f32 const lit_4215[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80A455A8, &lit_4215); +COMPILER_STRIP_GATE(0x80A455A8, &lit_4215); /* 80A43848-80A439A0 0003C8 0158+00 1/1 0/0 0/0 .text CreateHeap__11daNpc_Knj_cFv */ #pragma push @@ -983,7 +991,7 @@ bool daNpc_Knj_c::drawDbgInfo() { SECTION_RODATA static u8 const lit_4453[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A455B0, &lit_4453); +COMPILER_STRIP_GATE(0x80A455B0, &lit_4453); /* 80A44088-80A44264 000C08 01DC+00 1/0 0/0 0/0 .text afterSetMotionAnm__11daNpc_Knj_cFiifi */ #pragma push @@ -1020,7 +1028,7 @@ asm void daNpc_Knj_c::selectAction() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpc_Knj_c::chkAction(int (daNpc_Knj_c::*)(void*)) { +asm void daNpc_Knj_c::chkAction(int (daNpc_Knj_c::*param_0)(void*)) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_knj/d_a_npc_knj/chkAction__11daNpc_Knj_cFM11daNpc_Knj_cFPCvPvPv_i.s" } @@ -1031,7 +1039,7 @@ asm void daNpc_Knj_c::chkAction(int (daNpc_Knj_c::*)(void*)) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpc_Knj_c::setAction(int (daNpc_Knj_c::*)(void*)) { +asm void daNpc_Knj_c::setAction(int (daNpc_Knj_c::*param_0)(void*)) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_knj/d_a_npc_knj/setAction__11daNpc_Knj_cFM11daNpc_Knj_cFPCvPvPv_i.s" } @@ -1040,7 +1048,7 @@ asm void daNpc_Knj_c::setAction(int (daNpc_Knj_c::*)(void*)) { /* ############################################################################################## */ /* 80A455B8-80A455BC 0000A8 0004+00 1/1 0/0 0/0 .rodata @4529 */ SECTION_RODATA static f32 const lit_4529 = -1.0f; -COMPILER_STRIP_GATE(80A455B8, &lit_4529); +COMPILER_STRIP_GATE(0x80A455B8, &lit_4529); /* 80A443EC-80A44598 000F6C 01AC+00 1/0 0/0 0/0 .text wait__11daNpc_Knj_cFPv */ #pragma push @@ -1424,7 +1432,7 @@ asm void __sinit_d_a_npc_knj_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80A453F8 = (void*)__sinit_d_a_npc_knj_cpp; +REGISTER_CTORS(0x80A453F8, __sinit_d_a_npc_knj_cpp); #pragma pop /* 80A45460-80A454A4 001FE0 0044+00 1/1 0/0 0/0 .text @@ -1473,11 +1481,4 @@ static asm void func_80A454F4() { } #pragma pop -/* 80A455BC-80A455CD 0000AC 0011+00 4/1 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80A455BC = ""; -SECTION_DEAD static char const* const stringBase_80A455BD = "NO_RESPONSE"; -SECTION_DEAD static char const* const stringBase_80A455C9 = "Knj"; -#pragma pop +/* 80A455BC-80A455BC 0000AC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/npc/d_a_npc_kolin/d_a_npc_kolin.cpp b/rel/d/a/npc/d_a_npc_kolin/d_a_npc_kolin.cpp index a2f6e1a6215..f36c5e4fd55 100644 --- a/rel/d/a/npc/d_a_npc_kolin/d_a_npc_kolin.cpp +++ b/rel/d/a/npc/d_a_npc_kolin/d_a_npc_kolin.cpp @@ -26,20 +26,20 @@ struct mDoMtx_stack_c { static u8 now[48]; }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; +struct J3DAnmTransform {}; + +struct J3DModelData {}; + struct Z2Creature { /* 802C03C8 */ Z2Creature(); /* 802C0420 */ ~Z2Creature(); /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -61,6 +61,8 @@ struct daNpc_Len_c { /* 80A660D8 */ void checkStartDemo13StbEvt(fopAc_ac_c*, f32, f32, f32, f32, f32, f32, f32); }; +struct daNpcT_faceMotionAnmData_c {}; + struct daNpcT_MotionSeqMngr_c { struct sequenceStepData_c {}; @@ -69,14 +71,12 @@ struct daNpcT_MotionSeqMngr_c { /* 80559C18 */ ~daNpcT_MotionSeqMngr_c(); }; +struct daNpcT_evtData_c {}; + struct daNpcT_motionAnmData_c {}; struct J3DJoint {}; -struct daNpcT_faceMotionAnmData_c {}; - -struct daNpcT_evtData_c {}; - struct daNpc_Kolin_c { /* 80553FEC */ ~daNpc_Kolin_c(); /* 80554138 */ void create(); @@ -154,15 +154,15 @@ struct dCcD_GObjInf { /* 800844F8 */ void GetTgHitObj(); }; -struct J3DModel {}; - -struct _GXColorS10 {}; - struct csXyz { /* 80559578 */ ~csXyz(); /* 80559B14 */ csXyz(); }; +struct _GXColorS10 {}; + +struct J3DModel {}; + struct daNpcT_c { /* 80147FA4 */ void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*); /* 801483F8 */ void loadRes(s8 const*, char const**); @@ -542,8 +542,8 @@ extern "C" void getFaceMotionAnm__8daNpcT_cF26daNpcT_faceMotionAnmData_c(); extern "C" void getMotionAnm__8daNpcT_cF22daNpcT_motionAnmData_c(); extern "C" void changeBtp__8daNpcT_cFPiPi(); extern "C" void changeBtk__8daNpcT_cFPiPi(); -extern "C" void func_8055A1C4(int*); -extern "C" void func_8055A1E0(int, int); +extern "C" void func_8055A1C4(void* _this, int*); +extern "C" void func_8055A1E0(void* _this, int, int); extern "C" void __sinit_d_a_npc_kolin_cpp(); extern "C" void __ct__13daNpc_Kolin_cFPC26daNpcT_faceMotionAnmData_cPC22daNpcT_motionAnmData_cPCQ222daNpcT_MotionSeqMngr_c18sequenceStepData_ciPCQ222daNpcT_MotionSeqMngr_c18sequenceStepData_ciPC16daNpcT_evtData_cPPc(); @@ -755,6 +755,35 @@ extern "C" void checkStartDemo13StbEvt__11daNpc_Len_cFP10fopAc_ac_cfffffff(); // /* ############################################################################################## */ +/* 8055A77C-8055A77C 0001C8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8055A77C = ""; +SECTION_DEAD static char const* const stringBase_8055A77D = "NO_RESPONSE"; +SECTION_DEAD static char const* const stringBase_8055A789 = "NO_RIDE_L"; +SECTION_DEAD static char const* const stringBase_8055A793 = "NO_RIDE_R"; +SECTION_DEAD static char const* const stringBase_8055A79D = "HAIL"; +SECTION_DEAD static char const* const stringBase_8055A7A2 = "CONVERSATION_ABOUT_LOOPHOLE1"; +SECTION_DEAD static char const* const stringBase_8055A7BF = "CONVERSATION_ABOUT_LOOPHOLE2"; +SECTION_DEAD static char const* const stringBase_8055A7DC = "DEMO13_STB"; +SECTION_DEAD static char const* const stringBase_8055A7E7 = "CLOTH_TRY"; +SECTION_DEAD static char const* const stringBase_8055A7F1 = "Kolin"; +SECTION_DEAD static char const* const stringBase_8055A7F7 = "Kolin_TW"; +SECTION_DEAD static char const* const stringBase_8055A800 = "Kolin1"; +SECTION_DEAD static char const* const stringBase_8055A807 = "Kolin2"; +SECTION_DEAD static char const* const stringBase_8055A80E = "Kolin_p1"; +SECTION_DEAD static char const* const stringBase_8055A817 = "Len1"; +SECTION_DEAD static char const* const stringBase_8055A81C = "Taro1"; +SECTION_DEAD static char const* const stringBase_8055A822 = "NO_RIDE"; +SECTION_DEAD static char const* const stringBase_8055A82A = "GIVEME_WOODSWD"; +SECTION_DEAD static char const* const stringBase_8055A839 = "GET_WOODSWD"; +SECTION_DEAD static char const* const stringBase_8055A845 = "CONVERSATION_ABOUT_LOOPHOLE"; +SECTION_DEAD static char const* const stringBase_8055A861 = "CACARICO_CONVERSATION"; +SECTION_DEAD static char const* const stringBase_8055A877 = "CONVERSATION_ABOUT_DEATHMT"; +SECTION_DEAD static char const* const stringBase_8055A892 = "CONVERSATION_ABOUT_GORON"; +SECTION_DEAD static char const* const stringBase_8055A8AB = "THANK_YOU"; +#pragma pop + /* 8055A8C8-8055A8D4 000000 000C+00 3/3 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -1465,7 +1494,7 @@ SECTION_RODATA u8 const daNpc_Kolin_Param_c::m[160] = { 0x42, 0x20, 0x00, 0x00, 0x41, 0x70, 0x00, 0x00, 0x42, 0x70, 0x00, 0x00, 0x43, 0x7A, 0x00, 0x00, 0x43, 0x48, 0x00, 0x00, 0x41, 0x00, 0x00, 0x00, 0x01, 0x68, 0x00, 0xB4, 0x40, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8055A5B4, &daNpc_Kolin_Param_c::m); +COMPILER_STRIP_GATE(0x8055A5B4, &daNpc_Kolin_Param_c::m); /* 8055A654-8055A690 0000A0 003C+00 0/1 0/0 0/0 .rodata heapSize$4036 */ #pragma push @@ -1476,35 +1505,35 @@ SECTION_RODATA static u8 const heapSize[60] = { 0x39, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x39, 0xC0, 0x00, 0x00, 0x41, 0xD0, 0x00, 0x00, 0x39, 0xC0, 0x00, 0x00, 0x39, 0xC0, 0x00, 0x00, 0x39, 0xC0, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8055A654, &heapSize); +COMPILER_STRIP_GATE(0x8055A654, &heapSize); #pragma pop /* 8055A690-8055A694 0000DC 0004+00 0/1 0/0 0/0 .rodata @4106 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4106 = -200.0f; -COMPILER_STRIP_GATE(8055A690, &lit_4106); +COMPILER_STRIP_GATE(0x8055A690, &lit_4106); #pragma pop /* 8055A694-8055A698 0000E0 0004+00 0/2 0/0 0/0 .rodata @4107 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4107 = -100.0f; -COMPILER_STRIP_GATE(8055A694, &lit_4107); +COMPILER_STRIP_GATE(0x8055A694, &lit_4107); #pragma pop /* 8055A698-8055A69C 0000E4 0004+00 0/2 0/0 0/0 .rodata @4108 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4108 = 200.0f; -COMPILER_STRIP_GATE(8055A698, &lit_4108); +COMPILER_STRIP_GATE(0x8055A698, &lit_4108); #pragma pop /* 8055A69C-8055A6A0 0000E8 0004+00 0/2 0/0 0/0 .rodata @4109 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4109 = 300.0f; -COMPILER_STRIP_GATE(8055A69C, &lit_4109); +COMPILER_STRIP_GATE(0x8055A69C, &lit_4109); #pragma pop /* 8055A6A0-8055A6A4 0000EC 0004+00 8/24 0/0 0/0 .rodata @4110 */ @@ -1514,13 +1543,13 @@ SECTION_RODATA static u8 const lit_4110[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(8055A6A0, &lit_4110); +COMPILER_STRIP_GATE(0x8055A6A0, &lit_4110); /* 8055A6A4-8055A6A8 0000F0 0004+00 0/1 0/0 0/0 .rodata @4111 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4111 = -1000000000.0f; -COMPILER_STRIP_GATE(8055A6A4, &lit_4111); +COMPILER_STRIP_GATE(0x8055A6A4, &lit_4111); #pragma pop /* 80554138-80554414 000238 02DC+00 1/1 0/0 0/0 .text create__13daNpc_Kolin_cFv */ @@ -1538,19 +1567,19 @@ asm void daNpc_Kolin_c::create() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4274 = 65536.0f; -COMPILER_STRIP_GATE(8055A6A8, &lit_4274); +COMPILER_STRIP_GATE(0x8055A6A8, &lit_4274); #pragma pop /* 8055A6AC-8055A6B0 0000F8 0004+00 0/3 0/0 0/0 .rodata @4275 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4275 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(8055A6AC, &lit_4275); +COMPILER_STRIP_GATE(0x8055A6AC, &lit_4275); #pragma pop /* 8055A6B0-8055A6B4 0000FC 0004+00 2/6 0/0 0/0 .rodata @4442 */ SECTION_RODATA static f32 const lit_4442 = 1.0f; -COMPILER_STRIP_GATE(8055A6B0, &lit_4442); +COMPILER_STRIP_GATE(0x8055A6B0, &lit_4442); /* 80554414-80554774 000514 0360+00 1/1 0/0 0/0 .text CreateHeap__13daNpc_Kolin_cFv */ #pragma push @@ -1685,7 +1714,7 @@ asm void daNpc_Kolin_c::Execute() { /* ############################################################################################## */ /* 8055A6B4-8055A6B8 000100 0004+00 1/1 0/0 0/0 .rodata @4491 */ SECTION_RODATA static f32 const lit_4491 = 100.0f; -COMPILER_STRIP_GATE(8055A6B4, &lit_4491); +COMPILER_STRIP_GATE(0x8055A6B4, &lit_4491); /* 80554984-80554A18 000A84 0094+00 1/1 0/0 0/0 .text Draw__13daNpc_Kolin_cFv */ #pragma push @@ -1783,7 +1812,7 @@ asm void daNpc_Kolin_c::checkChangeEvt() { /* ############################################################################################## */ /* 8055A6B8-8055A6BC 000104 0004+00 4/9 0/0 0/0 .rodata @4742 */ SECTION_RODATA static f32 const lit_4742 = -1.0f; -COMPILER_STRIP_GATE(8055A6B8, &lit_4742); +COMPILER_STRIP_GATE(0x8055A6B8, &lit_4742); /* 8055523C-805552DC 00133C 00A0+00 1/0 0/0 0/0 .text setAfterTalkMotion__13daNpc_Kolin_cFv */ #pragma push @@ -1850,42 +1879,42 @@ asm void daNpc_Kolin_c::beforeMove() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4929 = 5.0f; -COMPILER_STRIP_GATE(8055A6BC, &lit_4929); +COMPILER_STRIP_GATE(0x8055A6BC, &lit_4929); #pragma pop /* 8055A6C0-8055A6C4 00010C 0004+00 0/2 0/0 0/0 .rodata @4930 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4930 = 30.0f; -COMPILER_STRIP_GATE(8055A6C0, &lit_4930); +COMPILER_STRIP_GATE(0x8055A6C0, &lit_4930); #pragma pop /* 8055A6C4-8055A6C8 000110 0004+00 0/1 0/0 0/0 .rodata @4931 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4931 = 0x38C90FDB; -COMPILER_STRIP_GATE(8055A6C4, &lit_4931); +COMPILER_STRIP_GATE(0x8055A6C4, &lit_4931); #pragma pop /* 8055A6C8-8055A6CC 000114 0004+00 0/2 0/0 0/0 .rodata @4932 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4932 = 0x41D451EC; -COMPILER_STRIP_GATE(8055A6C8, &lit_4932); +COMPILER_STRIP_GATE(0x8055A6C8, &lit_4932); #pragma pop /* 8055A6CC-8055A6D0 000118 0004+00 0/2 0/0 0/0 .rodata @4933 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4933 = 0xC2C38A3D; -COMPILER_STRIP_GATE(8055A6CC, &lit_4933); +COMPILER_STRIP_GATE(0x8055A6CC, &lit_4933); #pragma pop /* 8055A6D0-8055A6D4 00011C 0004+00 0/1 0/0 0/0 .rodata @4934 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4934 = 3.0f; -COMPILER_STRIP_GATE(8055A6D0, &lit_4934); +COMPILER_STRIP_GATE(0x8055A6D0, &lit_4934); #pragma pop /* 8055A6D4-8055A6DC 000120 0004+04 0/1 0/0 0/0 .rodata @4935 */ @@ -1896,14 +1925,14 @@ SECTION_RODATA static f32 const lit_4935[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(8055A6D4, &lit_4935); +COMPILER_STRIP_GATE(0x8055A6D4, &lit_4935); #pragma pop /* 8055A6DC-8055A6E4 000128 0008+00 2/5 0/0 0/0 .rodata @4937 */ SECTION_RODATA static u8 const lit_4937[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8055A6DC, &lit_4937); +COMPILER_STRIP_GATE(0x8055A6DC, &lit_4937); /* 8055B3D0-8055B3D4 000008 0001+03 1/1 0/0 0/0 .bss @1109 */ static u8 lit_1109[1 + 3 /* padding */]; @@ -2033,7 +2062,7 @@ asm void daNpc_Kolin_c::setAttnPos() { SECTION_RODATA static u8 const lit_4995[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8055A6E4, &lit_4995); +COMPILER_STRIP_GATE(0x8055A6E4, &lit_4995); #pragma pop /* 8055A6EC-8055A6F4 000138 0008+00 0/2 0/0 0/0 .rodata @4996 */ @@ -2042,7 +2071,7 @@ COMPILER_STRIP_GATE(8055A6E4, &lit_4995); SECTION_RODATA static u8 const lit_4996[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8055A6EC, &lit_4996); +COMPILER_STRIP_GATE(0x8055A6EC, &lit_4996); #pragma pop /* 8055A6F4-8055A6FC 000140 0008+00 0/2 0/0 0/0 .rodata @4997 */ @@ -2051,21 +2080,21 @@ COMPILER_STRIP_GATE(8055A6EC, &lit_4996); SECTION_RODATA static u8 const lit_4997[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8055A6F4, &lit_4997); +COMPILER_STRIP_GATE(0x8055A6F4, &lit_4997); #pragma pop /* 8055A6FC-8055A700 000148 0004+00 0/1 0/0 0/0 .rodata @5045 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_5045 = 0xC27DCCCD; -COMPILER_STRIP_GATE(8055A6FC, &lit_5045); +COMPILER_STRIP_GATE(0x8055A6FC, &lit_5045); #pragma pop /* 8055A700-8055A704 00014C 0004+00 0/1 0/0 0/0 .rodata @5046 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_5046 = 0x431D547B; -COMPILER_STRIP_GATE(8055A700, &lit_5046); +COMPILER_STRIP_GATE(0x8055A700, &lit_5046); #pragma pop /* 80555B48-80555CE4 001C48 019C+00 1/0 0/0 0/0 .text setCollision__13daNpc_Kolin_cFv */ @@ -2091,7 +2120,7 @@ SECTION_RODATA static u8 const jointNo[4] = { 0x00, 0x12, }; -COMPILER_STRIP_GATE(8055A704, &jointNo); +COMPILER_STRIP_GATE(0x8055A704, &jointNo); /* 80555CEC-80555DC4 001DEC 00D8+00 1/0 0/0 0/0 .text drawOtherMdl__13daNpc_Kolin_cFv */ #pragma push @@ -2138,7 +2167,7 @@ asm void daNpc_Kolin_c::selectAction() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpc_Kolin_c::chkAction(int (daNpc_Kolin_c::*)(void*)) { +asm void daNpc_Kolin_c::chkAction(int (daNpc_Kolin_c::*param_0)(void*)) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_kolin/d_a_npc_kolin/chkAction__13daNpc_Kolin_cFM13daNpc_Kolin_cFPCvPvPv_i.s" } @@ -2149,7 +2178,7 @@ asm void daNpc_Kolin_c::chkAction(int (daNpc_Kolin_c::*)(void*)) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpc_Kolin_c::setAction(int (daNpc_Kolin_c::*)(void*)) { +asm void daNpc_Kolin_c::setAction(int (daNpc_Kolin_c::*param_0)(void*)) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_kolin/d_a_npc_kolin/setAction__13daNpc_Kolin_cFM13daNpc_Kolin_cFPCvPvPv_i.s" } @@ -2160,14 +2189,14 @@ asm void daNpc_Kolin_c::setAction(int (daNpc_Kolin_c::*)(void*)) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5243 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(8055A708, &lit_5243); +COMPILER_STRIP_GATE(0x8055A708, &lit_5243); #pragma pop /* 8055A70C-8055A710 000158 0004+00 0/2 0/0 0/0 .rodata @5244 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5244 = 0.5f; -COMPILER_STRIP_GATE(8055A70C, &lit_5244); +COMPILER_STRIP_GATE(0x8055A70C, &lit_5244); #pragma pop /* 80555FFC-805563BC 0020FC 03C0+00 1/1 0/0 0/0 .text @@ -2186,14 +2215,14 @@ asm void daNpc_Kolin_c::calcFollowSpeedAndAngle(fopAc_ac_c* param_0, int param_1 #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5385 = 50.0f; -COMPILER_STRIP_GATE(8055A710, &lit_5385); +COMPILER_STRIP_GATE(0x8055A710, &lit_5385); #pragma pop /* 8055A714-8055A718 000160 0004+00 0/1 0/0 0/0 .rodata @5386 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5386 = 4.0f; -COMPILER_STRIP_GATE(8055A714, &lit_5386); +COMPILER_STRIP_GATE(0x8055A714, &lit_5386); #pragma pop /* 805563BC-80556798 0024BC 03DC+00 1/1 0/0 0/0 .text followPlayer__13daNpc_Kolin_cFi */ @@ -2226,6 +2255,13 @@ asm void daNpc_Kolin_c::lookup(u8 param_0) { } #pragma pop +/* ############################################################################################## */ +/* 8055A77C-8055A77C 0001C8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8055A8B5 = "prm"; +#pragma pop + /* 805568AC-80556A04 0029AC 0158+00 1/0 0/0 0/0 .text cutNoRide__13daNpc_Kolin_cFi */ #pragma push #pragma optimization_level 0 @@ -2243,21 +2279,27 @@ asm void daNpc_Kolin_c::cutNoRide(int param_0) { SECTION_RODATA static u8 const lit_5479[8] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, }; -COMPILER_STRIP_GATE(8055A718, &lit_5479); +COMPILER_STRIP_GATE(0x8055A718, &lit_5479); #pragma pop /* 8055A720-8055A724 00016C 0004+00 0/1 0/0 0/0 .rodata @5566 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5566 = 500.0f; -COMPILER_STRIP_GATE(8055A720, &lit_5566); +COMPILER_STRIP_GATE(0x8055A720, &lit_5566); #pragma pop /* 8055A724-8055A728 000170 0004+00 0/1 0/0 0/0 .rodata @5567 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5567 = 150.0f; -COMPILER_STRIP_GATE(8055A724, &lit_5567); +COMPILER_STRIP_GATE(0x8055A724, &lit_5567); +#pragma pop + +/* 8055A77C-8055A77C 0001C8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8055A8B9 = "msgNo"; #pragma pop /* 80556A04-80556DB4 002B04 03B0+00 1/0 0/0 0/0 .text cutHail__13daNpc_Kolin_cFi */ @@ -2275,42 +2317,42 @@ asm void daNpc_Kolin_c::cutHail(int param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5652 = -613.0f; -COMPILER_STRIP_GATE(8055A728, &lit_5652); +COMPILER_STRIP_GATE(0x8055A728, &lit_5652); #pragma pop /* 8055A72C-8055A730 000178 0004+00 0/2 0/0 0/0 .rodata @5653 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5653 = 1306.0f; -COMPILER_STRIP_GATE(8055A72C, &lit_5653); +COMPILER_STRIP_GATE(0x8055A72C, &lit_5653); #pragma pop /* 8055A730-8055A734 00017C 0004+00 0/2 0/0 0/0 .rodata @5654 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5654 = -2048.0f; -COMPILER_STRIP_GATE(8055A730, &lit_5654); +COMPILER_STRIP_GATE(0x8055A730, &lit_5654); #pragma pop /* 8055A734-8055A738 000180 0004+00 0/1 0/0 0/0 .rodata @5655 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5655 = 153.0f; -COMPILER_STRIP_GATE(8055A734, &lit_5655); +COMPILER_STRIP_GATE(0x8055A734, &lit_5655); #pragma pop /* 8055A738-8055A73C 000184 0004+00 0/1 0/0 0/0 .rodata @5656 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5656 = 1300.0f; -COMPILER_STRIP_GATE(8055A738, &lit_5656); +COMPILER_STRIP_GATE(0x8055A738, &lit_5656); #pragma pop /* 8055A73C-8055A740 000188 0004+00 0/1 0/0 0/0 .rodata @5657 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5657 = -1278.0f; -COMPILER_STRIP_GATE(8055A73C, &lit_5657); +COMPILER_STRIP_GATE(0x8055A73C, &lit_5657); #pragma pop /* 80556DB4-80557054 002EB4 02A0+00 1/0 0/0 0/0 .text cutGiveMeWoodSwd__13daNpc_Kolin_cFi @@ -2331,7 +2373,13 @@ asm void daNpc_Kolin_c::cutGiveMeWoodSwd(int param_0) { SECTION_RODATA static u8 const lit_5679[12] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, }; -COMPILER_STRIP_GATE(8055A740, &lit_5679); +COMPILER_STRIP_GATE(0x8055A740, &lit_5679); +#pragma pop + +/* 8055A77C-8055A77C 0001C8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8055A8BF = "timer"; #pragma pop /* 80557054-805576C4 003154 0670+00 3/0 0/0 0/0 .text cutGetWoodSwd__13daNpc_Kolin_cFi */ @@ -2349,14 +2397,14 @@ asm void daNpc_Kolin_c::cutGetWoodSwd(int param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5839 = 1600.0f; -COMPILER_STRIP_GATE(8055A74C, &lit_5839); +COMPILER_STRIP_GATE(0x8055A74C, &lit_5839); #pragma pop /* 8055A750-8055A754 00019C 0004+00 0/0 0/0 0/0 .rodata @5840 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5840 = 10.0f; -COMPILER_STRIP_GATE(8055A750, &lit_5840); +COMPILER_STRIP_GATE(0x8055A750, &lit_5840); #pragma pop /* 8055A754-8055A75C 0001A0 0008+00 0/1 0/0 0/0 .rodata @5852 */ @@ -2365,7 +2413,7 @@ COMPILER_STRIP_GATE(8055A750, &lit_5840); SECTION_RODATA static u8 const lit_5852[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8055A754, &lit_5852); +COMPILER_STRIP_GATE(0x8055A754, &lit_5852); #pragma pop /* 8055A75C-8055A768 0001A8 000C+00 0/1 0/0 0/0 .rodata @5862 */ @@ -2374,7 +2422,7 @@ COMPILER_STRIP_GATE(8055A754, &lit_5852); SECTION_RODATA static u8 const lit_5862[12] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, }; -COMPILER_STRIP_GATE(8055A75C, &lit_5862); +COMPILER_STRIP_GATE(0x8055A75C, &lit_5862); #pragma pop /* 805576C4-805579DC 0037C4 0318+00 1/0 0/0 0/0 .text @@ -2448,14 +2496,14 @@ asm void daNpc_Kolin_c::cutThankYou(int param_0) { SECTION_RODATA static u8 const lit_5929[8] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, }; -COMPILER_STRIP_GATE(8055A768, &lit_5929); +COMPILER_STRIP_GATE(0x8055A768, &lit_5929); #pragma pop /* 8055A770-8055A774 0001BC 0004+00 0/1 0/0 0/0 .rodata @6301 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6301 = 60.0f; -COMPILER_STRIP_GATE(8055A770, &lit_6301); +COMPILER_STRIP_GATE(0x8055A770, &lit_6301); #pragma pop /* 80557ED8-80558698 003FD8 07C0+00 1/0 0/0 0/0 .text wait__13daNpc_Kolin_cFPv */ @@ -2473,14 +2521,14 @@ asm void daNpc_Kolin_c::wait(void* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6437 = 8.0f; -COMPILER_STRIP_GATE(8055A774, &lit_6437); +COMPILER_STRIP_GATE(0x8055A774, &lit_6437); #pragma pop /* 8055A778-8055A77C 0001C4 0004+00 0/1 0/0 0/0 .rodata @6438 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6438 = 7.0f / 10.0f; -COMPILER_STRIP_GATE(8055A778, &lit_6438); +COMPILER_STRIP_GATE(0x8055A778, &lit_6438); #pragma pop /* 80558698-80558AF8 004798 0460+00 1/0 0/0 0/0 .text timidWalk__13daNpc_Kolin_cFPv */ @@ -2869,7 +2917,7 @@ void daNpcT_c::changeBtk(int* param_0, int* param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_8055A1C4(int* param_0) { +extern "C" asm void func_8055A1C4(void* _this, int* param_0) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_kolin/d_a_npc_kolin/func_8055A1C4.s" } @@ -2879,7 +2927,7 @@ extern "C" asm void func_8055A1C4(int* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_8055A1E0(int param_0, int param_1) { +extern "C" asm void func_8055A1E0(void* _this, int param_0, int param_1) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_kolin/d_a_npc_kolin/func_8055A1E0.s" } @@ -2905,7 +2953,7 @@ asm void __sinit_d_a_npc_kolin_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_8055A25C = (void*)__sinit_d_a_npc_kolin_cpp; +REGISTER_CTORS(0x8055A25C, __sinit_d_a_npc_kolin_cpp); #pragma pop /* 8055A3B8-8055A498 0064B8 00E0+00 1/1 0/0 0/0 .text @@ -3193,35 +3241,4 @@ static u8 data_8055B498[4]; static u8 data_8055B49C[4]; #pragma pop -/* 8055A77C-8055A8C5 0001C8 0149+00 14/11 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_8055A77C = ""; -SECTION_DEAD static char const* const stringBase_8055A77D = "NO_RESPONSE"; -SECTION_DEAD static char const* const stringBase_8055A789 = "NO_RIDE_L"; -SECTION_DEAD static char const* const stringBase_8055A793 = "NO_RIDE_R"; -SECTION_DEAD static char const* const stringBase_8055A79D = "HAIL"; -SECTION_DEAD static char const* const stringBase_8055A7A2 = "CONVERSATION_ABOUT_LOOPHOLE1"; -SECTION_DEAD static char const* const stringBase_8055A7BF = "CONVERSATION_ABOUT_LOOPHOLE2"; -SECTION_DEAD static char const* const stringBase_8055A7DC = "DEMO13_STB"; -SECTION_DEAD static char const* const stringBase_8055A7E7 = "CLOTH_TRY"; -SECTION_DEAD static char const* const stringBase_8055A7F1 = "Kolin"; -SECTION_DEAD static char const* const stringBase_8055A7F7 = "Kolin_TW"; -SECTION_DEAD static char const* const stringBase_8055A800 = "Kolin1"; -SECTION_DEAD static char const* const stringBase_8055A807 = "Kolin2"; -SECTION_DEAD static char const* const stringBase_8055A80E = "Kolin_p1"; -SECTION_DEAD static char const* const stringBase_8055A817 = "Len1"; -SECTION_DEAD static char const* const stringBase_8055A81C = "Taro1"; -SECTION_DEAD static char const* const stringBase_8055A822 = "NO_RIDE"; -SECTION_DEAD static char const* const stringBase_8055A82A = "GIVEME_WOODSWD"; -SECTION_DEAD static char const* const stringBase_8055A839 = "GET_WOODSWD"; -SECTION_DEAD static char const* const stringBase_8055A845 = "CONVERSATION_ABOUT_LOOPHOLE"; -SECTION_DEAD static char const* const stringBase_8055A861 = "CACARICO_CONVERSATION"; -SECTION_DEAD static char const* const stringBase_8055A877 = "CONVERSATION_ABOUT_DEATHMT"; -SECTION_DEAD static char const* const stringBase_8055A892 = "CONVERSATION_ABOUT_GORON"; -SECTION_DEAD static char const* const stringBase_8055A8AB = "THANK_YOU"; -SECTION_DEAD static char const* const stringBase_8055A8B5 = "prm"; -SECTION_DEAD static char const* const stringBase_8055A8B9 = "msgNo"; -SECTION_DEAD static char const* const stringBase_8055A8BF = "timer"; -#pragma pop +/* 8055A77C-8055A77C 0001C8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/npc/d_a_npc_kolinb/d_a_npc_kolinb.cpp b/rel/d/a/npc/d_a_npc_kolinb/d_a_npc_kolinb.cpp index a77c9cd6f4f..737faae10dc 100644 --- a/rel/d/a/npc/d_a_npc_kolinb/d_a_npc_kolinb.cpp +++ b/rel/d/a/npc/d_a_npc_kolinb/d_a_npc_kolinb.cpp @@ -15,12 +15,14 @@ struct mDoMtx_stack_c { static u8 now[48]; }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; +struct J3DAnmTransform {}; + +struct J3DModelData {}; + struct Vec {}; struct Z2Creature { @@ -29,8 +31,6 @@ struct Z2Creature { /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -43,6 +43,8 @@ struct fopAc_ac_c { /* 80018C8C */ ~fopAc_ac_c(); }; +struct daNpcT_faceMotionAnmData_c {}; + struct daNpcT_MotionSeqMngr_c { struct sequenceStepData_c {}; @@ -50,14 +52,12 @@ struct daNpcT_MotionSeqMngr_c { /* 80A48184 */ ~daNpcT_MotionSeqMngr_c(); }; +struct daNpcT_evtData_c {}; + struct daNpcT_motionAnmData_c {}; struct J3DJoint {}; -struct daNpcT_faceMotionAnmData_c {}; - -struct daNpcT_evtData_c {}; - struct daNpc_Kolinb_c { /* 80A4598C */ ~daNpc_Kolinb_c(); /* 80A45ADC */ void create(); @@ -117,6 +117,13 @@ struct dCcD_GObjInf { /* 800840E4 */ ~dCcD_GObjInf(); }; +struct csXyz { + /* 80A47B20 */ ~csXyz(); + /* 80A48038 */ csXyz(); +}; + +struct _GXColorS10 {}; + struct J3DModel {}; struct cXyz { @@ -125,13 +132,6 @@ struct cXyz { /* 80A48138 */ cXyz(); }; -struct _GXColorS10 {}; - -struct csXyz { - /* 80A47B20 */ ~csXyz(); - /* 80A48038 */ csXyz(); -}; - struct daNpcT_c { /* 80147FA4 */ void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*); /* 801483F8 */ void loadRes(s8 const*, char const**); @@ -408,7 +408,7 @@ extern "C" void changeAnm__8daNpcT_cFPiPi(); extern "C" void changeBck__8daNpcT_cFPiPi(); extern "C" void changeBtp__8daNpcT_cFPiPi(); extern "C" void changeBtk__8daNpcT_cFPiPi(); -extern "C" void func_80A48434(int*); +extern "C" void func_80A48434(void* _this, int*); extern "C" void __sinit_d_a_npc_kolinb_cpp(); extern "C" void __ct__14daNpc_Kolinb_cFPC26daNpcT_faceMotionAnmData_cPC22daNpcT_motionAnmData_cPCQ222daNpcT_MotionSeqMngr_c18sequenceStepData_ciPCQ222daNpcT_MotionSeqMngr_c18sequenceStepData_ciPC16daNpcT_evtData_cPPc(); @@ -549,6 +549,20 @@ extern "C" void __register_global_object(); // /* ############################################################################################## */ +/* 80A487DC-80A487DC 0000CC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80A487DC = ""; +SECTION_DEAD static char const* const stringBase_80A487DD = "Kolinb"; +SECTION_DEAD static char const* const stringBase_80A487E4 = "zrCb"; +SECTION_DEAD static char const* const stringBase_80A487E9 = "CONVERSATION_IN_HOTEL"; +SECTION_DEAD static char const* const stringBase_80A487FF = "CONVERSATION_ABOUT_DEATHMT"; +SECTION_DEAD static char const* const stringBase_80A4881A = "CONVERSATION_ABOUT_GORON"; +SECTION_DEAD static char const* const stringBase_80A48833 = "NURSE"; +SECTION_DEAD static char const* const stringBase_80A48839 = "CLOTH_TRY"; +SECTION_DEAD static char const* const stringBase_80A48843 = "THANK_YOU"; +#pragma pop + /* 80A48854-80A48860 000000 000C+00 2/2 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -983,7 +997,7 @@ SECTION_RODATA u8 const daNpc_Kolinb_Param_c::m[140] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A48710, &daNpc_Kolinb_Param_c::m); +COMPILER_STRIP_GATE(0x80A48710, &daNpc_Kolinb_Param_c::m); /* 80A4879C-80A487AC 00008C 0010+00 0/1 0/0 0/0 .rodata heapSize$3973 */ #pragma push @@ -991,35 +1005,35 @@ COMPILER_STRIP_GATE(80A48710, &daNpc_Kolinb_Param_c::m); SECTION_RODATA static u8 const heapSize[16] = { 0x00, 0x00, 0x47, 0xA0, 0x00, 0x00, 0x47, 0x90, 0x00, 0x00, 0x47, 0x10, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A4879C, &heapSize); +COMPILER_STRIP_GATE(0x80A4879C, &heapSize); #pragma pop /* 80A487AC-80A487B0 00009C 0004+00 0/1 0/0 0/0 .rodata @4048 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4048 = -200.0f; -COMPILER_STRIP_GATE(80A487AC, &lit_4048); +COMPILER_STRIP_GATE(0x80A487AC, &lit_4048); #pragma pop /* 80A487B0-80A487B4 0000A0 0004+00 0/1 0/0 0/0 .rodata @4049 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4049 = -100.0f; -COMPILER_STRIP_GATE(80A487B0, &lit_4049); +COMPILER_STRIP_GATE(0x80A487B0, &lit_4049); #pragma pop /* 80A487B4-80A487B8 0000A4 0004+00 0/1 0/0 0/0 .rodata @4050 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4050 = 200.0f; -COMPILER_STRIP_GATE(80A487B4, &lit_4050); +COMPILER_STRIP_GATE(0x80A487B4, &lit_4050); #pragma pop /* 80A487B8-80A487BC 0000A8 0004+00 0/1 0/0 0/0 .rodata @4051 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4051 = -1000000000.0f; -COMPILER_STRIP_GATE(80A487B8, &lit_4051); +COMPILER_STRIP_GATE(0x80A487B8, &lit_4051); #pragma pop /* 80A45ADC-80A45DC4 00023C 02E8+00 1/1 0/0 0/0 .text create__14daNpc_Kolinb_cFv */ @@ -1040,25 +1054,25 @@ SECTION_RODATA static u8 const lit_4212[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A487BC, &lit_4212); +COMPILER_STRIP_GATE(0x80A487BC, &lit_4212); /* 80A487C0-80A487C4 0000B0 0004+00 0/2 0/0 0/0 .rodata @4213 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4213 = 65536.0f; -COMPILER_STRIP_GATE(80A487C0, &lit_4213); +COMPILER_STRIP_GATE(0x80A487C0, &lit_4213); #pragma pop /* 80A487C4-80A487C8 0000B4 0004+00 0/2 0/0 0/0 .rodata @4214 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4214 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(80A487C4, &lit_4214); +COMPILER_STRIP_GATE(0x80A487C4, &lit_4214); #pragma pop /* 80A487C8-80A487CC 0000B8 0004+00 1/1 0/0 0/0 .rodata @4371 */ SECTION_RODATA static f32 const lit_4371 = 1.0f; -COMPILER_STRIP_GATE(80A487C8, &lit_4371); +COMPILER_STRIP_GATE(0x80A487C8, &lit_4371); /* 80A45DC4-80A4603C 000524 0278+00 1/1 0/0 0/0 .text CreateHeap__14daNpc_Kolinb_cFv */ #pragma push @@ -1093,7 +1107,7 @@ asm void daNpc_Kolinb_c::Execute() { /* ############################################################################################## */ /* 80A487CC-80A487D0 0000BC 0004+00 1/2 0/0 0/0 .rodata @4403 */ SECTION_RODATA static f32 const lit_4403 = 100.0f; -COMPILER_STRIP_GATE(80A487CC, &lit_4403); +COMPILER_STRIP_GATE(0x80A487CC, &lit_4403); /* 80A46090-80A46124 0007F0 0094+00 1/1 0/0 0/0 .text Draw__14daNpc_Kolinb_cFv */ #pragma push @@ -1181,7 +1195,7 @@ asm void daNpc_Kolinb_c::checkChangeEvt() { /* ############################################################################################## */ /* 80A487D0-80A487D4 0000C0 0004+00 5/5 0/0 0/0 .rodata @4542 */ SECTION_RODATA static f32 const lit_4542 = -1.0f; -COMPILER_STRIP_GATE(80A487D0, &lit_4542); +COMPILER_STRIP_GATE(0x80A487D0, &lit_4542); /* 80A465D0-80A46630 000D30 0060+00 1/0 0/0 0/0 .text setAfterTalkMotion__14daNpc_Kolinb_cFv */ #pragma push @@ -1243,14 +1257,14 @@ asm void daNpc_Kolinb_c::beforeMove() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4658 = 10.0f; -COMPILER_STRIP_GATE(80A487D4, &lit_4658); +COMPILER_STRIP_GATE(0x80A487D4, &lit_4658); #pragma pop /* 80A487D8-80A487DC 0000C8 0004+00 0/1 0/0 0/0 .rodata @4659 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4659 = 30.0f; -COMPILER_STRIP_GATE(80A487D8, &lit_4659); +COMPILER_STRIP_GATE(0x80A487D8, &lit_4659); #pragma pop /* 80A468E8-80A46A4C 001048 0164+00 1/0 0/0 0/0 .text setAttnPos__14daNpc_Kolinb_cFv */ @@ -1293,7 +1307,7 @@ asm void daNpc_Kolinb_c::selectAction() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpc_Kolinb_c::chkAction(int (daNpc_Kolinb_c::*)(void*)) { +asm void daNpc_Kolinb_c::chkAction(int (daNpc_Kolinb_c::*param_0)(void*)) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_kolinb/d_a_npc_kolinb/chkAction__14daNpc_Kolinb_cFM14daNpc_Kolinb_cFPCvPvPv_i.s" } @@ -1304,12 +1318,19 @@ asm void daNpc_Kolinb_c::chkAction(int (daNpc_Kolinb_c::*)(void*)) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpc_Kolinb_c::setAction(int (daNpc_Kolinb_c::*)(void*)) { +asm void daNpc_Kolinb_c::setAction(int (daNpc_Kolinb_c::*param_0)(void*)) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_kolinb/d_a_npc_kolinb/setAction__14daNpc_Kolinb_cFM14daNpc_Kolinb_cFPCvPvPv_i.s" } #pragma pop +/* ############################################################################################## */ +/* 80A487DC-80A487DC 0000CC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80A4884D = "prm"; +#pragma pop + /* 80A46BC0-80A46C48 001320 0088+00 1/0 0/0 0/0 .text cutConversationInHotel__14daNpc_Kolinb_cFi */ #pragma push @@ -1734,7 +1755,7 @@ void daNpcT_c::changeBtk(int* param_0, int* param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80A48434(int* param_0) { +extern "C" asm void func_80A48434(void* _this, int* param_0) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_kolinb/d_a_npc_kolinb/func_80A48434.s" } @@ -1766,7 +1787,7 @@ asm void __sinit_d_a_npc_kolinb_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80A48450 = (void*)__sinit_d_a_npc_kolinb_cpp; +REGISTER_CTORS(0x80A48450, __sinit_d_a_npc_kolinb_cpp); #pragma pop /* 80A4854C-80A4860C 002CAC 00C0+00 1/1 0/0 0/0 .text @@ -1868,18 +1889,4 @@ static asm void func_80A486F4() { } #pragma pop -/* 80A487DC-80A48851 0000CC 0075+00 10/7 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80A487DC = ""; -SECTION_DEAD static char const* const stringBase_80A487DD = "Kolinb"; -SECTION_DEAD static char const* const stringBase_80A487E4 = "zrCb"; -SECTION_DEAD static char const* const stringBase_80A487E9 = "CONVERSATION_IN_HOTEL"; -SECTION_DEAD static char const* const stringBase_80A487FF = "CONVERSATION_ABOUT_DEATHMT"; -SECTION_DEAD static char const* const stringBase_80A4881A = "CONVERSATION_ABOUT_GORON"; -SECTION_DEAD static char const* const stringBase_80A48833 = "NURSE"; -SECTION_DEAD static char const* const stringBase_80A48839 = "CLOTH_TRY"; -SECTION_DEAD static char const* const stringBase_80A48843 = "THANK_YOU"; -SECTION_DEAD static char const* const stringBase_80A4884D = "prm"; -#pragma pop +/* 80A487DC-80A487DC 0000CC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/npc/d_a_npc_ks/d_a_npc_ks.cpp b/rel/d/a/npc/d_a_npc_ks/d_a_npc_ks.cpp index 00d58db681f..9cb8d28914b 100644 --- a/rel/d/a/npc/d_a_npc_ks/d_a_npc_ks.cpp +++ b/rel/d/a/npc/d_a_npc_ks/d_a_npc_ks.cpp @@ -39,12 +39,14 @@ struct mDoExt_baseAnm { /* 8000D428 */ void play(); }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; +struct J3DAnmTransform {}; + +struct J3DModelData {}; + struct Vec {}; struct Z2Creature { @@ -52,8 +54,6 @@ struct Z2Creature { /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -150,10 +150,10 @@ struct dRes_control_c { struct dPa_levelEcallBack {}; -struct _GXColor {}; - struct csXyz {}; +struct _GXColor {}; + struct dPa_control_c { /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, @@ -643,55 +643,55 @@ extern "C" void __register_global_object(); /* ############################################################################################## */ /* 80A5DEFC-80A5DF00 000000 0004+00 44/44 0/0 0/0 .rodata @4030 */ SECTION_RODATA static f32 const lit_4030 = 4.0f / 5.0f; -COMPILER_STRIP_GATE(80A5DEFC, &lit_4030); +COMPILER_STRIP_GATE(0x80A5DEFC, &lit_4030); /* 80A5DF00-80A5DF04 000004 0004+00 0/10 0/0 0/0 .rodata @4031 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4031 = 200.0f; -COMPILER_STRIP_GATE(80A5DF00, &lit_4031); +COMPILER_STRIP_GATE(0x80A5DF00, &lit_4031); #pragma pop /* 80A5DF04-80A5DF08 000008 0004+00 0/10 0/0 0/0 .rodata @4032 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4032 = 10.0f; -COMPILER_STRIP_GATE(80A5DF04, &lit_4032); +COMPILER_STRIP_GATE(0x80A5DF04, &lit_4032); #pragma pop /* 80A5DF08-80A5DF0C 00000C 0004+00 0/3 0/0 0/0 .rodata @4033 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4033 = 25.0f; -COMPILER_STRIP_GATE(80A5DF08, &lit_4033); +COMPILER_STRIP_GATE(0x80A5DF08, &lit_4033); #pragma pop /* 80A5DF0C-80A5DF10 000010 0004+00 0/12 0/0 0/0 .rodata @4034 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4034 = 20.0f; -COMPILER_STRIP_GATE(80A5DF0C, &lit_4034); +COMPILER_STRIP_GATE(0x80A5DF0C, &lit_4034); #pragma pop /* 80A5DF10-80A5DF14 000014 0004+00 0/12 0/0 0/0 .rodata @4035 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4035 = 300.0f; -COMPILER_STRIP_GATE(80A5DF10, &lit_4035); +COMPILER_STRIP_GATE(0x80A5DF10, &lit_4035); #pragma pop /* 80A5DF14-80A5DF18 000018 0004+00 0/1 0/0 0/0 .rodata @4036 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4036 = 9.0f / 5.0f; -COMPILER_STRIP_GATE(80A5DF14, &lit_4036); +COMPILER_STRIP_GATE(0x80A5DF14, &lit_4036); #pragma pop /* 80A5DF18-80A5DF1C 00001C 0004+00 0/6 0/0 0/0 .rodata @4037 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4037 = 600.0f; -COMPILER_STRIP_GATE(80A5DF18, &lit_4037); +COMPILER_STRIP_GATE(0x80A5DF18, &lit_4037); #pragma pop /* 80A5E458-80A5E464 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ @@ -1561,11 +1561,11 @@ static asm void checkDoorDemo() { /* ############################################################################################## */ /* 80A5DF1C-80A5DF20 000020 0004+00 1/18 0/0 0/0 .rodata @4096 */ SECTION_RODATA static f32 const lit_4096 = 100.0f; -COMPILER_STRIP_GATE(80A5DF1C, &lit_4096); +COMPILER_STRIP_GATE(0x80A5DF1C, &lit_4096); /* 80A5DF20-80A5DF24 000024 0004+00 1/2 0/0 0/0 .rodata @4097 */ SECTION_RODATA static f32 const lit_4097 = 120.0f; -COMPILER_STRIP_GATE(80A5DF20, &lit_4097); +COMPILER_STRIP_GATE(0x80A5DF20, &lit_4097); /* 80A49088-80A49168 0001E8 00E0+00 1/1 0/0 0/0 .text otherBgCheck__FP10fopAc_ac_cP10fopAc_ac_c */ #pragma push @@ -1590,13 +1590,13 @@ asm cXyz::~cXyz() { /* ############################################################################################## */ /* 80A5DF24-80A5DF28 000028 0004+00 4/36 0/0 0/0 .rodata @4146 */ SECTION_RODATA static f32 const lit_4146 = 1.0f; -COMPILER_STRIP_GATE(80A5DF24, &lit_4146); +COMPILER_STRIP_GATE(0x80A5DF24, &lit_4146); /* 80A5DF28-80A5DF2C 00002C 0004+00 0/8 0/0 0/0 .rodata @4147 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4147 = 0.5f; -COMPILER_STRIP_GATE(80A5DF28, &lit_4147); +COMPILER_STRIP_GATE(0x80A5DF28, &lit_4147); #pragma pop /* 80A5DF2C-80A5DF30 000030 0004+00 1/38 0/0 0/0 .rodata @4148 */ @@ -1606,11 +1606,11 @@ SECTION_RODATA static u8 const lit_4148[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A5DF2C, &lit_4148); +COMPILER_STRIP_GATE(0x80A5DF2C, &lit_4148); /* 80A5DF30-80A5DF34 000034 0004+00 1/4 0/0 0/0 .rodata @4149 */ SECTION_RODATA static f32 const lit_4149 = -1.0f; -COMPILER_STRIP_GATE(80A5DF30, &lit_4149); +COMPILER_STRIP_GATE(0x80A5DF30, &lit_4149); /* 80A491A4-80A4932C 000304 0188+00 29/29 0/0 0/0 .text anm_init__FP12npc_ks_classifUcf */ @@ -1638,7 +1638,13 @@ static asm void nodeCallBack(J3DJoint* param_0, int param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4307 = 1000.0f; -COMPILER_STRIP_GATE(80A5DF34, &lit_4307); +COMPILER_STRIP_GATE(0x80A5DF34, &lit_4307); +#pragma pop + +/* 80A5E438-80A5E438 00053C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80A5E438 = "Npc_kst"; #pragma pop /* 80A49660-80A49848 0007C0 01E8+00 1/0 0/0 0/0 .text daNpc_Ks_Draw__FP12npc_ks_class */ @@ -1654,11 +1660,11 @@ static asm void daNpc_Ks_Draw(npc_ks_class* param_0) { /* ############################################################################################## */ /* 80A5DF38-80A5DF3C 00003C 0004+00 1/1 0/0 0/0 .rodata @4317 */ SECTION_RODATA static f32 const lit_4317 = 220.0f; -COMPILER_STRIP_GATE(80A5DF38, &lit_4317); +COMPILER_STRIP_GATE(0x80A5DF38, &lit_4317); /* 80A5DF3C-80A5DF40 000040 0004+00 1/10 0/0 0/0 .rodata @4318 */ SECTION_RODATA static f32 const lit_4318 = 50.0f; -COMPILER_STRIP_GATE(80A5DF3C, &lit_4318); +COMPILER_STRIP_GATE(0x80A5DF3C, &lit_4318); /* 80A49848-80A498B4 0009A8 006C+00 2/2 0/0 0/0 .text s_resq_sub__FPvPv */ #pragma push @@ -1812,7 +1818,7 @@ static asm void s_b_sub(void* param_0, void* param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4408 = 1500.0f; -COMPILER_STRIP_GATE(80A5DF40, &lit_4408); +COMPILER_STRIP_GATE(0x80A5DF40, &lit_4408); #pragma pop /* 80A5FF1C-80A5FF44 0000DC 0028+00 0/2 0/0 0/0 .bss target_bgc */ @@ -1871,7 +1877,7 @@ SECTION_RODATA static f32 const lit_4511[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80A5DF44, &lit_4511); +COMPILER_STRIP_GATE(0x80A5DF44, &lit_4511); #pragma pop /* 80A49C00-80A49E78 000D60 0278+00 2/2 0/0 0/0 .text search_enemy__FP12npc_ks_classif */ @@ -1922,7 +1928,7 @@ static asm void s_en_sub(void* param_0, void* param_1) { SECTION_RODATA static u8 const lit_4594[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A5DF4C, &lit_4594); +COMPILER_STRIP_GATE(0x80A5DF4C, &lit_4594); #pragma pop /* 80A5DF54-80A5DF5C 000058 0008+00 0/15 0/0 0/0 .rodata @4595 */ @@ -1931,7 +1937,7 @@ COMPILER_STRIP_GATE(80A5DF4C, &lit_4594); SECTION_RODATA static u8 const lit_4595[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A5DF54, &lit_4595); +COMPILER_STRIP_GATE(0x80A5DF54, &lit_4595); #pragma pop /* 80A5DF5C-80A5DF64 000060 0008+00 0/15 0/0 0/0 .rodata @4596 */ @@ -1940,14 +1946,14 @@ COMPILER_STRIP_GATE(80A5DF54, &lit_4595); SECTION_RODATA static u8 const lit_4596[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A5DF5C, &lit_4596); +COMPILER_STRIP_GATE(0x80A5DF5C, &lit_4596); #pragma pop /* 80A5DF64-80A5DF68 000068 0004+00 0/2 0/0 0/0 .rodata @4597 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4597 = 350.0f; -COMPILER_STRIP_GATE(80A5DF64, &lit_4597); +COMPILER_STRIP_GATE(0x80A5DF64, &lit_4597); #pragma pop /* 80A49F30-80A4A164 001090 0234+00 1/1 0/0 0/0 .text en_search_test__FP12npc_ks_class */ @@ -1975,35 +1981,35 @@ static asm void s_ori_sub(void* param_0, void* param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4687 = 5.0f; -COMPILER_STRIP_GATE(80A5DF68, &lit_4687); +COMPILER_STRIP_GATE(0x80A5DF68, &lit_4687); #pragma pop /* 80A5DF6C-80A5DF70 000070 0004+00 0/7 0/0 0/0 .rodata @4688 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4688 = 400.0f; -COMPILER_STRIP_GATE(80A5DF6C, &lit_4688); +COMPILER_STRIP_GATE(0x80A5DF6C, &lit_4688); #pragma pop /* 80A5DF70-80A5DF74 000074 0004+00 0/2 0/0 0/0 .rodata @4689 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4689 = 11497.0f; -COMPILER_STRIP_GATE(80A5DF70, &lit_4689); +COMPILER_STRIP_GATE(0x80A5DF70, &lit_4689); #pragma pop /* 80A5DF74-80A5DF78 000078 0004+00 0/2 0/0 0/0 .rodata @4690 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4690 = 3764.0f; -COMPILER_STRIP_GATE(80A5DF74, &lit_4690); +COMPILER_STRIP_GATE(0x80A5DF74, &lit_4690); #pragma pop /* 80A5DF78-80A5DF7C 00007C 0004+00 0/2 0/0 0/0 .rodata @4691 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4691 = 3810.0f; -COMPILER_STRIP_GATE(80A5DF78, &lit_4691); +COMPILER_STRIP_GATE(0x80A5DF78, &lit_4691); #pragma pop /* 80A4A1B0-80A4A544 001310 0394+00 1/1 0/0 0/0 .text npc_ks_pole_ori__FP12npc_ks_class @@ -2042,67 +2048,67 @@ static asm void shot_bo_sub(void* param_0, void* param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4799 = 99.0f; -COMPILER_STRIP_GATE(80A5DF7C, &lit_4799); +COMPILER_STRIP_GATE(0x80A5DF7C, &lit_4799); #pragma pop /* 80A5DF80-80A5DF84 000084 0004+00 0/8 0/0 0/0 .rodata @4800 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4800 = 40.0f; -COMPILER_STRIP_GATE(80A5DF80, &lit_4800); +COMPILER_STRIP_GATE(0x80A5DF80, &lit_4800); #pragma pop /* 80A5DF84-80A5DF88 000088 0004+00 0/3 0/0 0/0 .rodata @4801 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4801 = 60.0f; -COMPILER_STRIP_GATE(80A5DF84, &lit_4801); +COMPILER_STRIP_GATE(0x80A5DF84, &lit_4801); #pragma pop /* 80A5DF88-80A5DF8C 00008C 0004+00 0/0 0/0 0/0 .rodata @4802 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4802 = -20.0f; -COMPILER_STRIP_GATE(80A5DF88, &lit_4802); +COMPILER_STRIP_GATE(0x80A5DF88, &lit_4802); #pragma pop /* 80A5DF8C-80A5DF90 000090 0004+00 1/21 0/0 0/0 .rodata @4803 */ SECTION_RODATA static f32 const lit_4803 = 3.0f; -COMPILER_STRIP_GATE(80A5DF8C, &lit_4803); +COMPILER_STRIP_GATE(0x80A5DF8C, &lit_4803); /* 80A5DF90-80A5DF94 000094 0004+00 0/8 0/0 0/0 .rodata @4804 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4804 = 2.0f; -COMPILER_STRIP_GATE(80A5DF90, &lit_4804); +COMPILER_STRIP_GATE(0x80A5DF90, &lit_4804); #pragma pop /* 80A5DF94-80A5DF98 000098 0004+00 0/0 0/0 0/0 .rodata @4805 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4805 = 35.0f; -COMPILER_STRIP_GATE(80A5DF94, &lit_4805); +COMPILER_STRIP_GATE(0x80A5DF94, &lit_4805); #pragma pop /* 80A5DF98-80A5DF9C 00009C 0004+00 0/1 0/0 0/0 .rodata @4806 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4806 = -5.0f; -COMPILER_STRIP_GATE(80A5DF98, &lit_4806); +COMPILER_STRIP_GATE(0x80A5DF98, &lit_4806); #pragma pop /* 80A5DF9C-80A5DFA0 0000A0 0004+00 0/1 0/0 0/0 .rodata @4807 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4807 = -10.0f; -COMPILER_STRIP_GATE(80A5DF9C, &lit_4807); +COMPILER_STRIP_GATE(0x80A5DF9C, &lit_4807); #pragma pop /* 80A5DFA0-80A5DFA4 0000A4 0004+00 0/1 0/0 0/0 .rodata @5077 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5077 = 46.0f; -COMPILER_STRIP_GATE(80A5DFA0, &lit_5077); +COMPILER_STRIP_GATE(0x80A5DFA0, &lit_5077); #pragma pop /* 80A4AC68-80A4B7BC 001DC8 0B54+00 2/1 0/0 0/0 .text npc_ks_ori2__FP12npc_ks_class */ @@ -2120,28 +2126,28 @@ static asm void npc_ks_ori2(npc_ks_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5078 = -200.0f; -COMPILER_STRIP_GATE(80A5DFA4, &lit_5078); +COMPILER_STRIP_GATE(0x80A5DFA4, &lit_5078); #pragma pop /* 80A5DFA8-80A5DFAC 0000AC 0004+00 0/9 0/0 0/0 .rodata @5079 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5079 = 6.0f / 5.0f; -COMPILER_STRIP_GATE(80A5DFA8, &lit_5079); +COMPILER_STRIP_GATE(0x80A5DFA8, &lit_5079); #pragma pop /* 80A5DFAC-80A5DFB0 0000B0 0004+00 0/2 0/0 0/0 .rodata @5155 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5155 = -100.0f; -COMPILER_STRIP_GATE(80A5DFAC, &lit_5155); +COMPILER_STRIP_GATE(0x80A5DFAC, &lit_5155); #pragma pop /* 80A5DFB0-80A5DFB4 0000B4 0004+00 0/2 0/0 0/0 .rodata @5156 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5156 = -50.0f; -COMPILER_STRIP_GATE(80A5DFB0, &lit_5156); +COMPILER_STRIP_GATE(0x80A5DFB0, &lit_5156); #pragma pop /* 80A4B7BC-80A4BA14 00291C 0258+00 1/1 0/0 0/0 .text npc_ks_home__FP12npc_ks_class */ @@ -2189,42 +2195,42 @@ static asm void s_01_sub(void* param_0, void* param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5565 = 90.0f; -COMPILER_STRIP_GATE(80A5DFB4, &lit_5565); +COMPILER_STRIP_GATE(0x80A5DFB4, &lit_5565); #pragma pop /* 80A5DFB8-80A5DFBC 0000BC 0004+00 0/1 0/0 0/0 .rodata @5566 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5566 = 55.0f; -COMPILER_STRIP_GATE(80A5DFB8, &lit_5566); +COMPILER_STRIP_GATE(0x80A5DFB8, &lit_5566); #pragma pop /* 80A5DFBC-80A5DFC0 0000C0 0004+00 0/13 0/0 0/0 .rodata @5567 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5567 = 30.0f; -COMPILER_STRIP_GATE(80A5DFBC, &lit_5567); +COMPILER_STRIP_GATE(0x80A5DFBC, &lit_5567); #pragma pop /* 80A5DFC0-80A5DFC4 0000C4 0004+00 0/0 0/0 0/0 .rodata @5568 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5568 = 17.0f / 10.0f; -COMPILER_STRIP_GATE(80A5DFC0, &lit_5568); +COMPILER_STRIP_GATE(0x80A5DFC0, &lit_5568); #pragma pop /* 80A5DFC4-80A5DFC8 0000C8 0004+00 0/0 0/0 0/0 .rodata @5569 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5569 = -15.0f; -COMPILER_STRIP_GATE(80A5DFC4, &lit_5569); +COMPILER_STRIP_GATE(0x80A5DFC4, &lit_5569); #pragma pop /* 80A5DFC8-80A5DFCC 0000CC 0004+00 0/5 0/0 0/0 .rodata @5570 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5570 = 4.0f; -COMPILER_STRIP_GATE(80A5DFC8, &lit_5570); +COMPILER_STRIP_GATE(0x80A5DFC8, &lit_5570); #pragma pop /* 80A4BB34-80A4CA70 002C94 0F3C+00 2/1 0/0 0/0 .text npc_ks_demo_02__FP12npc_ks_class */ @@ -2273,14 +2279,14 @@ static asm void npc_ks_demo_04(npc_ks_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5571 = -8.0f; -COMPILER_STRIP_GATE(80A5DFCC, &lit_5571); +COMPILER_STRIP_GATE(0x80A5DFCC, &lit_5571); #pragma pop /* 80A5DFD0-80A5DFD4 0000D4 0004+00 0/8 0/0 0/0 .rodata @5675 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5675 = 80.0f; -COMPILER_STRIP_GATE(80A5DFD0, &lit_5675); +COMPILER_STRIP_GATE(0x80A5DFD0, &lit_5675); #pragma pop /* 80A5DFD4-80A5DFDC 0000D8 0004+04 0/2 0/0 0/0 .rodata @5676 */ @@ -2291,7 +2297,7 @@ SECTION_RODATA static f32 const lit_5676[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80A5DFD4, &lit_5676); +COMPILER_STRIP_GATE(0x80A5DFD4, &lit_5676); #pragma pop /* 80A5DFDC-80A5DFE4 0000E0 0008+00 0/0 0/0 0/0 .rodata @5679 */ @@ -2300,42 +2306,42 @@ COMPILER_STRIP_GATE(80A5DFD4, &lit_5676); SECTION_RODATA static u8 const lit_5679[8] = { 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A5DFDC, &lit_5679); +COMPILER_STRIP_GATE(0x80A5DFDC, &lit_5679); #pragma pop /* 80A5DFE4-80A5DFE8 0000E8 0004+00 0/1 0/0 0/0 .rodata @5768 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5768 = 3300.0f; -COMPILER_STRIP_GATE(80A5DFE4, &lit_5768); +COMPILER_STRIP_GATE(0x80A5DFE4, &lit_5768); #pragma pop /* 80A5DFE8-80A5DFEC 0000EC 0004+00 0/0 0/0 0/0 .rodata @5769 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5769 = 4393.0f; -COMPILER_STRIP_GATE(80A5DFE8, &lit_5769); +COMPILER_STRIP_GATE(0x80A5DFE8, &lit_5769); #pragma pop /* 80A5DFEC-80A5DFF0 0000F0 0004+00 0/0 0/0 0/0 .rodata @5770 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5770 = 37.0f; -COMPILER_STRIP_GATE(80A5DFEC, &lit_5770); +COMPILER_STRIP_GATE(0x80A5DFEC, &lit_5770); #pragma pop /* 80A5DFF0-80A5DFF4 0000F4 0004+00 0/0 0/0 0/0 .rodata @5771 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5771 = -2.0f; -COMPILER_STRIP_GATE(80A5DFF0, &lit_5771); +COMPILER_STRIP_GATE(0x80A5DFF0, &lit_5771); #pragma pop /* 80A5DFF4-80A5DFF8 0000F8 0004+00 0/1 0/0 0/0 .rodata @5956 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5956 = 11.0f / 10.0f; -COMPILER_STRIP_GATE(80A5DFF4, &lit_5956); +COMPILER_STRIP_GATE(0x80A5DFF4, &lit_5956); #pragma pop /* 80A4D438-80A4DBF8 004598 07C0+00 1/1 0/0 0/0 .text npc_ks_to_hang__FP12npc_ks_class */ @@ -2363,7 +2369,7 @@ static asm void s_next_do_sub(void* param_0, void* param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5986 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(80A5DFF8, &lit_5986); +COMPILER_STRIP_GATE(0x80A5DFF8, &lit_5986); #pragma pop /* 80A4DC80-80A4DD70 004DE0 00F0+00 1/1 0/0 0/0 .text s_next_get_sub__FPvPv */ @@ -2401,7 +2407,7 @@ static asm void all_carry_finish(int param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6069 = 2500.0f; -COMPILER_STRIP_GATE(80A5DFFC, &lit_6069); +COMPILER_STRIP_GATE(0x80A5DFFC, &lit_6069); #pragma pop /* 80A4DE34-80A4E000 004F94 01CC+00 2/2 0/0 0/0 .text hang_end_check__FP12npc_ks_class */ @@ -2419,56 +2425,56 @@ static asm void hang_end_check(npc_ks_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6221 = 2800.0f; -COMPILER_STRIP_GATE(80A5E000, &lit_6221); +COMPILER_STRIP_GATE(0x80A5E000, &lit_6221); #pragma pop /* 80A5E004-80A5E008 000108 0004+00 0/4 0/0 0/0 .rodata @6222 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6222 = 550.0f; -COMPILER_STRIP_GATE(80A5E004, &lit_6222); +COMPILER_STRIP_GATE(0x80A5E004, &lit_6222); #pragma pop /* 80A5E008-80A5E00C 00010C 0004+00 0/4 0/0 0/0 .rodata @6223 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6223 = 3.0f / 10.0f; -COMPILER_STRIP_GATE(80A5E008, &lit_6223); +COMPILER_STRIP_GATE(0x80A5E008, &lit_6223); #pragma pop /* 80A5E00C-80A5E010 000110 0004+00 0/11 0/0 0/0 .rodata @6224 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6224 = 150.0f; -COMPILER_STRIP_GATE(80A5E00C, &lit_6224); +COMPILER_STRIP_GATE(0x80A5E00C, &lit_6224); #pragma pop /* 80A5E010-80A5E014 000114 0004+00 0/3 0/0 0/0 .rodata @6225 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6225 = -150.0f; -COMPILER_STRIP_GATE(80A5E010, &lit_6225); +COMPILER_STRIP_GATE(0x80A5E010, &lit_6225); #pragma pop /* 80A5E014-80A5E018 000118 0004+00 0/3 0/0 0/0 .rodata @6226 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6226 = -400.0f; -COMPILER_STRIP_GATE(80A5E014, &lit_6226); +COMPILER_STRIP_GATE(0x80A5E014, &lit_6226); #pragma pop /* 80A5E018-80A5E01C 00011C 0004+00 0/2 0/0 0/0 .rodata @6227 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6227 = 3.0f / 40.0f; -COMPILER_STRIP_GATE(80A5E018, &lit_6227); +COMPILER_STRIP_GATE(0x80A5E018, &lit_6227); #pragma pop /* 80A5E01C-80A5E020 000120 0004+00 0/3 0/0 0/0 .rodata @6228 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6228 = 8000.0f; -COMPILER_STRIP_GATE(80A5E01C, &lit_6228); +COMPILER_STRIP_GATE(0x80A5E01C, &lit_6228); #pragma pop /* 80A5FF44-80A5FF48 000104 0002+02 0/1 0/0 0/0 .bss start_pya$6091 */ @@ -2502,14 +2508,14 @@ static asm void npc_ks_hang_s(npc_ks_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6371 = 4000.0f; -COMPILER_STRIP_GATE(80A5E020, &lit_6371); +COMPILER_STRIP_GATE(0x80A5E020, &lit_6371); #pragma pop /* 80A5E024-80A5E028 000128 0004+00 0/1 0/0 0/0 .rodata @6372 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6372 = 7.0f; -COMPILER_STRIP_GATE(80A5E024, &lit_6372); +COMPILER_STRIP_GATE(0x80A5E024, &lit_6372); #pragma pop /* 80A4EE18-80A4F170 005F78 0358+00 1/1 0/0 0/0 .text npc_ks_e_hang__FP12npc_ks_class */ @@ -2547,14 +2553,14 @@ static asm void go_jump_check(int param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6629 = 180.0f; -COMPILER_STRIP_GATE(80A5E028, &lit_6629); +COMPILER_STRIP_GATE(0x80A5E028, &lit_6629); #pragma pop /* 80A5E02C-80A5E030 000130 0004+00 0/1 0/0 0/0 .rodata @6630 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6630 = -180.0f; -COMPILER_STRIP_GATE(80A5E02C, &lit_6630); +COMPILER_STRIP_GATE(0x80A5E02C, &lit_6630); #pragma pop /* 80A4F228-80A4FD7C 006388 0B54+00 2/1 0/0 0/0 .text npc_ks_e_jump__FP12npc_ks_class */ @@ -2623,1190 +2629,1196 @@ static asm void s_fsdown_sub(void* param_0, void* param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6631 = -183.0f; -COMPILER_STRIP_GATE(80A5E030, &lit_6631); +COMPILER_STRIP_GATE(0x80A5E030, &lit_6631); #pragma pop /* 80A5E034-80A5E038 000138 0004+00 0/2 0/0 0/0 .rodata @6632 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6632 = 15.0f; -COMPILER_STRIP_GATE(80A5E034, &lit_6632); +COMPILER_STRIP_GATE(0x80A5E034, &lit_6632); #pragma pop /* 80A5E038-80A5E03C 00013C 0004+00 0/7 0/0 0/0 .rodata @7089 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7089 = 500.0f; -COMPILER_STRIP_GATE(80A5E038, &lit_7089); +COMPILER_STRIP_GATE(0x80A5E038, &lit_7089); #pragma pop /* 80A5E03C-80A5E040 000140 0004+00 0/2 0/0 0/0 .rodata @7090 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7090 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(80A5E03C, &lit_7090); +COMPILER_STRIP_GATE(0x80A5E03C, &lit_7090); #pragma pop /* 80A5E040-80A5E044 000144 0004+00 0/1 0/0 0/0 .rodata @7091 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7091 = 250.0f; -COMPILER_STRIP_GATE(80A5E040, &lit_7091); +COMPILER_STRIP_GATE(0x80A5E040, &lit_7091); #pragma pop /* 80A5E044-80A5E048 000148 0004+00 0/1 0/0 0/0 .rodata @7092 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7092 = 2.0f / 5.0f; -COMPILER_STRIP_GATE(80A5E044, &lit_7092); +COMPILER_STRIP_GATE(0x80A5E044, &lit_7092); #pragma pop /* 80A5E048-80A5E04C 00014C 0004+00 0/1 0/0 0/0 .rodata @7093 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_7093 = 0x3BA3D70A; -COMPILER_STRIP_GATE(80A5E048, &lit_7093); +COMPILER_STRIP_GATE(0x80A5E048, &lit_7093); #pragma pop /* 80A5E04C-80A5E050 000150 0004+00 0/1 0/0 0/0 .rodata @7094 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7094 = -250.0f; -COMPILER_STRIP_GATE(80A5E04C, &lit_7094); +COMPILER_STRIP_GATE(0x80A5E04C, &lit_7094); #pragma pop /* 80A5E050-80A5E054 000154 0004+00 0/3 0/0 0/0 .rodata @7095 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7095 = 10000.0f; -COMPILER_STRIP_GATE(80A5E050, &lit_7095); +COMPILER_STRIP_GATE(0x80A5E050, &lit_7095); #pragma pop /* 80A5E054-80A5E058 000158 0004+00 0/1 0/0 0/0 .rodata @7096 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7096 = 3150.0f; -COMPILER_STRIP_GATE(80A5E054, &lit_7096); +COMPILER_STRIP_GATE(0x80A5E054, &lit_7096); #pragma pop /* 80A5E058-80A5E05C 00015C 0004+00 0/1 0/0 0/0 .rodata @7097 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7097 = 65.0f; -COMPILER_STRIP_GATE(80A5E058, &lit_7097); +COMPILER_STRIP_GATE(0x80A5E058, &lit_7097); #pragma pop /* 80A5E05C-80A5E060 000160 0004+00 0/1 0/0 0/0 .rodata @7098 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7098 = -4786.0f; -COMPILER_STRIP_GATE(80A5E05C, &lit_7098); +COMPILER_STRIP_GATE(0x80A5E05C, &lit_7098); #pragma pop /* 80A5E060-80A5E064 000164 0004+00 0/1 0/0 0/0 .rodata @7099 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7099 = 3982.0f; -COMPILER_STRIP_GATE(80A5E060, &lit_7099); +COMPILER_STRIP_GATE(0x80A5E060, &lit_7099); #pragma pop /* 80A5E064-80A5E068 000168 0004+00 0/1 0/0 0/0 .rodata @7100 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7100 = -1843.0f; -COMPILER_STRIP_GATE(80A5E064, &lit_7100); +COMPILER_STRIP_GATE(0x80A5E064, &lit_7100); #pragma pop /* 80A5E068-80A5E06C 00016C 0004+00 0/1 0/0 0/0 .rodata @7101 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7101 = -3232.0f; -COMPILER_STRIP_GATE(80A5E068, &lit_7101); +COMPILER_STRIP_GATE(0x80A5E068, &lit_7101); #pragma pop /* 80A5E06C-80A5E070 000170 0004+00 0/1 0/0 0/0 .rodata @7102 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7102 = 4137.0f; -COMPILER_STRIP_GATE(80A5E06C, &lit_7102); +COMPILER_STRIP_GATE(0x80A5E06C, &lit_7102); #pragma pop /* 80A5E070-80A5E074 000174 0004+00 0/1 0/0 0/0 .rodata @7103 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7103 = -1425.0f; -COMPILER_STRIP_GATE(80A5E070, &lit_7103); +COMPILER_STRIP_GATE(0x80A5E070, &lit_7103); #pragma pop /* 80A5E074-80A5E078 000178 0004+00 0/1 0/0 0/0 .rodata @7104 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7104 = -2459.0f; -COMPILER_STRIP_GATE(80A5E074, &lit_7104); +COMPILER_STRIP_GATE(0x80A5E074, &lit_7104); #pragma pop /* 80A5E078-80A5E07C 00017C 0004+00 0/1 0/0 0/0 .rodata @7105 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7105 = 4199.0f; -COMPILER_STRIP_GATE(80A5E078, &lit_7105); +COMPILER_STRIP_GATE(0x80A5E078, &lit_7105); #pragma pop /* 80A5E07C-80A5E080 000180 0004+00 0/1 0/0 0/0 .rodata @7106 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7106 = -2752.0f; -COMPILER_STRIP_GATE(80A5E07C, &lit_7106); +COMPILER_STRIP_GATE(0x80A5E07C, &lit_7106); #pragma pop /* 80A5E080-80A5E084 000184 0004+00 0/1 0/0 0/0 .rodata @7107 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7107 = 103.0f; -COMPILER_STRIP_GATE(80A5E080, &lit_7107); +COMPILER_STRIP_GATE(0x80A5E080, &lit_7107); #pragma pop /* 80A5E084-80A5E088 000188 0004+00 0/1 0/0 0/0 .rodata @7108 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7108 = 4025.0f; -COMPILER_STRIP_GATE(80A5E084, &lit_7108); +COMPILER_STRIP_GATE(0x80A5E084, &lit_7108); #pragma pop /* 80A5E088-80A5E08C 00018C 0004+00 0/1 0/0 0/0 .rodata @7109 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7109 = -1930.0f; -COMPILER_STRIP_GATE(80A5E088, &lit_7109); +COMPILER_STRIP_GATE(0x80A5E088, &lit_7109); #pragma pop /* 80A5E08C-80A5E090 000190 0004+00 0/1 0/0 0/0 .rodata @7110 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7110 = -112.0f; -COMPILER_STRIP_GATE(80A5E08C, &lit_7110); +COMPILER_STRIP_GATE(0x80A5E08C, &lit_7110); #pragma pop /* 80A5E090-80A5E094 000194 0004+00 0/1 0/0 0/0 .rodata @7111 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7111 = 2420.0f; -COMPILER_STRIP_GATE(80A5E090, &lit_7111); +COMPILER_STRIP_GATE(0x80A5E090, &lit_7111); #pragma pop /* 80A5E094-80A5E098 000198 0004+00 0/1 0/0 0/0 .rodata @7112 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7112 = 13414.0f; -COMPILER_STRIP_GATE(80A5E094, &lit_7112); +COMPILER_STRIP_GATE(0x80A5E094, &lit_7112); #pragma pop /* 80A5E098-80A5E09C 00019C 0004+00 0/1 0/0 0/0 .rodata @7113 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7113 = 145.0f; -COMPILER_STRIP_GATE(80A5E098, &lit_7113); +COMPILER_STRIP_GATE(0x80A5E098, &lit_7113); #pragma pop /* 80A5E09C-80A5E0A0 0001A0 0004+00 0/1 0/0 0/0 .rodata @7114 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7114 = 2354.0f; -COMPILER_STRIP_GATE(80A5E09C, &lit_7114); +COMPILER_STRIP_GATE(0x80A5E09C, &lit_7114); #pragma pop /* 80A5E0A0-80A5E0A4 0001A4 0004+00 0/1 0/0 0/0 .rodata @7115 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7115 = 13179.0f; -COMPILER_STRIP_GATE(80A5E0A0, &lit_7115); +COMPILER_STRIP_GATE(0x80A5E0A0, &lit_7115); #pragma pop /* 80A5E0A4-80A5E0A8 0001A8 0004+00 0/1 0/0 0/0 .rodata @7116 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7116 = 3.0f / 25.0f; -COMPILER_STRIP_GATE(80A5E0A4, &lit_7116); +COMPILER_STRIP_GATE(0x80A5E0A4, &lit_7116); #pragma pop /* 80A5E0A8-80A5E0AC 0001AC 0004+00 0/1 0/0 0/0 .rodata @7117 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7117 = 8486.0f; -COMPILER_STRIP_GATE(80A5E0A8, &lit_7117); +COMPILER_STRIP_GATE(0x80A5E0A8, &lit_7117); #pragma pop /* 80A5E0AC-80A5E0B0 0001B0 0004+00 0/1 0/0 0/0 .rodata @7118 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7118 = 4143.0f; -COMPILER_STRIP_GATE(80A5E0AC, &lit_7118); +COMPILER_STRIP_GATE(0x80A5E0AC, &lit_7118); #pragma pop /* 80A5E0B0-80A5E0B4 0001B4 0004+00 0/1 0/0 0/0 .rodata @7119 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7119 = -10114.0f; -COMPILER_STRIP_GATE(80A5E0B0, &lit_7119); +COMPILER_STRIP_GATE(0x80A5E0B0, &lit_7119); #pragma pop /* 80A5E0B4-80A5E0B8 0001B8 0004+00 0/1 0/0 0/0 .rodata @7120 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7120 = 8364.0f; -COMPILER_STRIP_GATE(80A5E0B4, &lit_7120); +COMPILER_STRIP_GATE(0x80A5E0B4, &lit_7120); #pragma pop /* 80A5E0B8-80A5E0BC 0001BC 0004+00 0/1 0/0 0/0 .rodata @7121 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7121 = 4325.0f; -COMPILER_STRIP_GATE(80A5E0B8, &lit_7121); +COMPILER_STRIP_GATE(0x80A5E0B8, &lit_7121); #pragma pop /* 80A5E0BC-80A5E0C0 0001C0 0004+00 0/1 0/0 0/0 .rodata @7122 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7122 = -9756.0f; -COMPILER_STRIP_GATE(80A5E0BC, &lit_7122); +COMPILER_STRIP_GATE(0x80A5E0BC, &lit_7122); #pragma pop /* 80A5E0C0-80A5E0C4 0001C4 0004+00 0/1 0/0 0/0 .rodata @7123 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7123 = 1.0f / 20.0f; -COMPILER_STRIP_GATE(80A5E0C0, &lit_7123); +COMPILER_STRIP_GATE(0x80A5E0C0, &lit_7123); #pragma pop /* 80A5E0C4-80A5E0C8 0001C8 0004+00 0/1 0/0 0/0 .rodata @7124 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7124 = 6899.0f; -COMPILER_STRIP_GATE(80A5E0C4, &lit_7124); +COMPILER_STRIP_GATE(0x80A5E0C4, &lit_7124); #pragma pop /* 80A5E0C8-80A5E0CC 0001CC 0004+00 0/1 0/0 0/0 .rodata @7125 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7125 = 3867.0f; -COMPILER_STRIP_GATE(80A5E0C8, &lit_7125); +COMPILER_STRIP_GATE(0x80A5E0C8, &lit_7125); #pragma pop /* 80A5E0CC-80A5E0D0 0001D0 0004+00 0/1 0/0 0/0 .rodata @7126 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7126 = -8870.0f; -COMPILER_STRIP_GATE(80A5E0CC, &lit_7126); +COMPILER_STRIP_GATE(0x80A5E0CC, &lit_7126); #pragma pop /* 80A5E0D0-80A5E0D4 0001D4 0004+00 0/1 0/0 0/0 .rodata @7127 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7127 = 8222.0f; -COMPILER_STRIP_GATE(80A5E0D0, &lit_7127); +COMPILER_STRIP_GATE(0x80A5E0D0, &lit_7127); #pragma pop /* 80A5E0D4-80A5E0D8 0001D8 0004+00 0/1 0/0 0/0 .rodata @7128 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7128 = 3896.0f; -COMPILER_STRIP_GATE(80A5E0D4, &lit_7128); +COMPILER_STRIP_GATE(0x80A5E0D4, &lit_7128); #pragma pop /* 80A5E0D8-80A5E0DC 0001DC 0004+00 0/1 0/0 0/0 .rodata @7129 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7129 = -9579.0f; -COMPILER_STRIP_GATE(80A5E0D8, &lit_7129); +COMPILER_STRIP_GATE(0x80A5E0D8, &lit_7129); #pragma pop /* 80A5E0DC-80A5E0E0 0001E0 0004+00 0/3 0/0 0/0 .rodata @7130 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7130 = -500.0f; -COMPILER_STRIP_GATE(80A5E0DC, &lit_7130); +COMPILER_STRIP_GATE(0x80A5E0DC, &lit_7130); #pragma pop /* 80A5E0E0-80A5E0E4 0001E4 0004+00 0/1 0/0 0/0 .rodata @7131 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7131 = 3681.0f; -COMPILER_STRIP_GATE(80A5E0E0, &lit_7131); +COMPILER_STRIP_GATE(0x80A5E0E0, &lit_7131); #pragma pop /* 80A5E0E4-80A5E0E8 0001E8 0004+00 0/1 0/0 0/0 .rodata @7132 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7132 = 7485.0f; -COMPILER_STRIP_GATE(80A5E0E4, &lit_7132); +COMPILER_STRIP_GATE(0x80A5E0E4, &lit_7132); #pragma pop /* 80A5E0E8-80A5E0EC 0001EC 0004+00 0/1 0/0 0/0 .rodata @7133 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7133 = -333.0f; -COMPILER_STRIP_GATE(80A5E0E8, &lit_7133); +COMPILER_STRIP_GATE(0x80A5E0E8, &lit_7133); #pragma pop /* 80A5E0EC-80A5E0F0 0001F0 0004+00 0/1 0/0 0/0 .rodata @7134 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7134 = 3316.0f; -COMPILER_STRIP_GATE(80A5E0EC, &lit_7134); +COMPILER_STRIP_GATE(0x80A5E0EC, &lit_7134); #pragma pop /* 80A5E0F0-80A5E0F4 0001F4 0004+00 0/1 0/0 0/0 .rodata @7135 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7135 = 7149.0f; -COMPILER_STRIP_GATE(80A5E0F0, &lit_7135); +COMPILER_STRIP_GATE(0x80A5E0F0, &lit_7135); #pragma pop /* 80A5E0F4-80A5E0F8 0001F8 0004+00 0/1 0/0 0/0 .rodata @7136 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7136 = -531.0f; -COMPILER_STRIP_GATE(80A5E0F4, &lit_7136); +COMPILER_STRIP_GATE(0x80A5E0F4, &lit_7136); #pragma pop /* 80A5E0F8-80A5E0FC 0001FC 0004+00 0/1 0/0 0/0 .rodata @7137 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7137 = 3295.0f; -COMPILER_STRIP_GATE(80A5E0F8, &lit_7137); +COMPILER_STRIP_GATE(0x80A5E0F8, &lit_7137); #pragma pop /* 80A5E0FC-80A5E100 000200 0004+00 0/1 0/0 0/0 .rodata @7138 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7138 = 7381.0f; -COMPILER_STRIP_GATE(80A5E0FC, &lit_7138); +COMPILER_STRIP_GATE(0x80A5E0FC, &lit_7138); #pragma pop /* 80A5E100-80A5E104 000204 0004+00 0/1 0/0 0/0 .rodata @7139 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7139 = 162.0f; -COMPILER_STRIP_GATE(80A5E100, &lit_7139); +COMPILER_STRIP_GATE(0x80A5E100, &lit_7139); #pragma pop /* 80A5E104-80A5E108 000208 0004+00 0/1 0/0 0/0 .rodata @7140 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7140 = 3354.0f; -COMPILER_STRIP_GATE(80A5E104, &lit_7140); +COMPILER_STRIP_GATE(0x80A5E104, &lit_7140); #pragma pop /* 80A5E108-80A5E10C 00020C 0004+00 0/1 0/0 0/0 .rodata @7141 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7141 = 6881.0f; -COMPILER_STRIP_GATE(80A5E108, &lit_7141); +COMPILER_STRIP_GATE(0x80A5E108, &lit_7141); #pragma pop /* 80A5E10C-80A5E110 000210 0004+00 0/1 0/0 0/0 .rodata @7142 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7142 = 263.0f; -COMPILER_STRIP_GATE(80A5E10C, &lit_7142); +COMPILER_STRIP_GATE(0x80A5E10C, &lit_7142); #pragma pop /* 80A5E110-80A5E114 000214 0004+00 0/1 0/0 0/0 .rodata @7143 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7143 = 3374.0f; -COMPILER_STRIP_GATE(80A5E110, &lit_7143); +COMPILER_STRIP_GATE(0x80A5E110, &lit_7143); #pragma pop /* 80A5E114-80A5E118 000218 0004+00 0/1 0/0 0/0 .rodata @7144 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7144 = 7168.0f; -COMPILER_STRIP_GATE(80A5E114, &lit_7144); +COMPILER_STRIP_GATE(0x80A5E114, &lit_7144); #pragma pop /* 80A5E118-80A5E11C 00021C 0004+00 0/1 0/0 0/0 .rodata @7145 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7145 = 59.0f; -COMPILER_STRIP_GATE(80A5E118, &lit_7145); +COMPILER_STRIP_GATE(0x80A5E118, &lit_7145); #pragma pop /* 80A5E11C-80A5E120 000220 0004+00 0/1 0/0 0/0 .rodata @7146 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7146 = 12899.0f; -COMPILER_STRIP_GATE(80A5E11C, &lit_7146); +COMPILER_STRIP_GATE(0x80A5E11C, &lit_7146); #pragma pop /* 80A5E120-80A5E124 000224 0004+00 0/1 0/0 0/0 .rodata @7147 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7147 = 3767.0f; -COMPILER_STRIP_GATE(80A5E120, &lit_7147); +COMPILER_STRIP_GATE(0x80A5E120, &lit_7147); #pragma pop /* 80A5E124-80A5E128 000228 0004+00 0/1 0/0 0/0 .rodata @7148 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7148 = 3364.0f; -COMPILER_STRIP_GATE(80A5E124, &lit_7148); +COMPILER_STRIP_GATE(0x80A5E124, &lit_7148); #pragma pop /* 80A5E128-80A5E12C 00022C 0004+00 0/1 0/0 0/0 .rodata @7149 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7149 = 11821.0f; -COMPILER_STRIP_GATE(80A5E128, &lit_7149); +COMPILER_STRIP_GATE(0x80A5E128, &lit_7149); #pragma pop /* 80A5E12C-80A5E130 000230 0004+00 0/1 0/0 0/0 .rodata @7150 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7150 = 3889.0f; -COMPILER_STRIP_GATE(80A5E12C, &lit_7150); +COMPILER_STRIP_GATE(0x80A5E12C, &lit_7150); #pragma pop /* 80A5E130-80A5E134 000234 0004+00 0/1 0/0 0/0 .rodata @7151 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7151 = 4033.0f; -COMPILER_STRIP_GATE(80A5E130, &lit_7151); +COMPILER_STRIP_GATE(0x80A5E130, &lit_7151); #pragma pop /* 80A5E134-80A5E138 000238 0004+00 0/1 0/0 0/0 .rodata @7152 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7152 = 11710.0f; -COMPILER_STRIP_GATE(80A5E134, &lit_7152); +COMPILER_STRIP_GATE(0x80A5E134, &lit_7152); #pragma pop /* 80A5E138-80A5E13C 00023C 0004+00 0/1 0/0 0/0 .rodata @7153 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7153 = 3936.0f; -COMPILER_STRIP_GATE(80A5E138, &lit_7153); +COMPILER_STRIP_GATE(0x80A5E138, &lit_7153); #pragma pop /* 80A5E13C-80A5E140 000240 0004+00 0/1 0/0 0/0 .rodata @7154 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7154 = 4253.0f; -COMPILER_STRIP_GATE(80A5E13C, &lit_7154); +COMPILER_STRIP_GATE(0x80A5E13C, &lit_7154); #pragma pop /* 80A5E140-80A5E144 000244 0004+00 0/1 0/0 0/0 .rodata @7155 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7155 = 12772.0f; -COMPILER_STRIP_GATE(80A5E140, &lit_7155); +COMPILER_STRIP_GATE(0x80A5E140, &lit_7155); #pragma pop /* 80A5E144-80A5E148 000248 0004+00 0/1 0/0 0/0 .rodata @7156 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7156 = 3940.0f; -COMPILER_STRIP_GATE(80A5E144, &lit_7156); +COMPILER_STRIP_GATE(0x80A5E144, &lit_7156); #pragma pop /* 80A5E148-80A5E14C 00024C 0004+00 0/1 0/0 0/0 .rodata @7157 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7157 = 3565.0f; -COMPILER_STRIP_GATE(80A5E148, &lit_7157); +COMPILER_STRIP_GATE(0x80A5E148, &lit_7157); #pragma pop /* 80A5E14C-80A5E150 000250 0004+00 0/1 0/0 0/0 .rodata @7158 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7158 = 13003.0f; -COMPILER_STRIP_GATE(80A5E14C, &lit_7158); +COMPILER_STRIP_GATE(0x80A5E14C, &lit_7158); #pragma pop /* 80A5E150-80A5E154 000254 0004+00 0/1 0/0 0/0 .rodata @7159 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7159 = 4022.0f; -COMPILER_STRIP_GATE(80A5E150, &lit_7159); +COMPILER_STRIP_GATE(0x80A5E150, &lit_7159); #pragma pop /* 80A5E154-80A5E158 000258 0004+00 0/1 0/0 0/0 .rodata @7160 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7160 = 3613.0f; -COMPILER_STRIP_GATE(80A5E154, &lit_7160); +COMPILER_STRIP_GATE(0x80A5E154, &lit_7160); #pragma pop /* 80A5E158-80A5E15C 00025C 0004+00 0/1 0/0 0/0 .rodata @7161 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7161 = 1.0f / 25.0f; -COMPILER_STRIP_GATE(80A5E158, &lit_7161); +COMPILER_STRIP_GATE(0x80A5E158, &lit_7161); #pragma pop /* 80A5E15C-80A5E160 000260 0004+00 0/1 0/0 0/0 .rodata @7162 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_7162 = 0x3A83126F; -COMPILER_STRIP_GATE(80A5E15C, &lit_7162); +COMPILER_STRIP_GATE(0x80A5E15C, &lit_7162); #pragma pop /* 80A5E160-80A5E164 000264 0004+00 0/1 0/0 0/0 .rodata @7163 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7163 = 12626.0f; -COMPILER_STRIP_GATE(80A5E160, &lit_7163); +COMPILER_STRIP_GATE(0x80A5E160, &lit_7163); #pragma pop /* 80A5E164-80A5E168 000268 0004+00 0/1 0/0 0/0 .rodata @7164 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7164 = 12714.0f; -COMPILER_STRIP_GATE(80A5E164, &lit_7164); +COMPILER_STRIP_GATE(0x80A5E164, &lit_7164); #pragma pop /* 80A5E168-80A5E16C 00026C 0004+00 0/1 0/0 0/0 .rodata @7165 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7165 = -23451.0f; -COMPILER_STRIP_GATE(80A5E168, &lit_7165); +COMPILER_STRIP_GATE(0x80A5E168, &lit_7165); #pragma pop /* 80A5E16C-80A5E170 000270 0004+00 0/1 0/0 0/0 .rodata @7166 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7166 = 262.0f; -COMPILER_STRIP_GATE(80A5E16C, &lit_7166); +COMPILER_STRIP_GATE(0x80A5E16C, &lit_7166); #pragma pop /* 80A5E170-80A5E174 000274 0004+00 0/1 0/0 0/0 .rodata @7167 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7167 = -15980.0f; -COMPILER_STRIP_GATE(80A5E170, &lit_7167); +COMPILER_STRIP_GATE(0x80A5E170, &lit_7167); #pragma pop /* 80A5E174-80A5E178 000278 0004+00 0/1 0/0 0/0 .rodata @7168 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7168 = -22325.0f; -COMPILER_STRIP_GATE(80A5E174, &lit_7168); +COMPILER_STRIP_GATE(0x80A5E174, &lit_7168); #pragma pop /* 80A5E178-80A5E17C 00027C 0004+00 0/1 0/0 0/0 .rodata @7169 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7169 = 275.0f; -COMPILER_STRIP_GATE(80A5E178, &lit_7169); +COMPILER_STRIP_GATE(0x80A5E178, &lit_7169); #pragma pop /* 80A5E17C-80A5E180 000280 0004+00 0/1 0/0 0/0 .rodata @7170 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7170 = -15119.0f; -COMPILER_STRIP_GATE(80A5E17C, &lit_7170); +COMPILER_STRIP_GATE(0x80A5E17C, &lit_7170); #pragma pop /* 80A5E180-80A5E184 000284 0004+00 0/1 0/0 0/0 .rodata @7171 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7171 = -22672.0f; -COMPILER_STRIP_GATE(80A5E180, &lit_7171); +COMPILER_STRIP_GATE(0x80A5E180, &lit_7171); #pragma pop /* 80A5E184-80A5E188 000288 0004+00 0/1 0/0 0/0 .rodata @7172 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7172 = 311.0f; -COMPILER_STRIP_GATE(80A5E184, &lit_7172); +COMPILER_STRIP_GATE(0x80A5E184, &lit_7172); #pragma pop /* 80A5E188-80A5E18C 00028C 0004+00 0/1 0/0 0/0 .rodata @7173 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7173 = -15080.0f; -COMPILER_STRIP_GATE(80A5E188, &lit_7173); +COMPILER_STRIP_GATE(0x80A5E188, &lit_7173); #pragma pop /* 80A5E18C-80A5E190 000290 0004+00 0/1 0/0 0/0 .rodata @7174 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7174 = -22343.0f; -COMPILER_STRIP_GATE(80A5E18C, &lit_7174); +COMPILER_STRIP_GATE(0x80A5E18C, &lit_7174); #pragma pop /* 80A5E190-80A5E194 000294 0004+00 0/1 0/0 0/0 .rodata @7175 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7175 = 273.0f; -COMPILER_STRIP_GATE(80A5E190, &lit_7175); +COMPILER_STRIP_GATE(0x80A5E190, &lit_7175); #pragma pop /* 80A5E194-80A5E198 000298 0004+00 0/1 0/0 0/0 .rodata @7176 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7176 = -15017.0f; -COMPILER_STRIP_GATE(80A5E194, &lit_7176); +COMPILER_STRIP_GATE(0x80A5E194, &lit_7176); #pragma pop /* 80A5E198-80A5E19C 00029C 0004+00 0/1 0/0 0/0 .rodata @7177 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7177 = -22177.0f; -COMPILER_STRIP_GATE(80A5E198, &lit_7177); +COMPILER_STRIP_GATE(0x80A5E198, &lit_7177); #pragma pop /* 80A5E19C-80A5E1A0 0002A0 0004+00 0/1 0/0 0/0 .rodata @7178 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7178 = 213.0f; -COMPILER_STRIP_GATE(80A5E19C, &lit_7178); +COMPILER_STRIP_GATE(0x80A5E19C, &lit_7178); #pragma pop /* 80A5E1A0-80A5E1A4 0002A4 0004+00 0/1 0/0 0/0 .rodata @7179 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7179 = -14705.0f; -COMPILER_STRIP_GATE(80A5E1A0, &lit_7179); +COMPILER_STRIP_GATE(0x80A5E1A0, &lit_7179); #pragma pop /* 80A5E1A4-80A5E1A8 0002A8 0004+00 0/1 0/0 0/0 .rodata @7180 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7180 = 1.0f / 50.0f; -COMPILER_STRIP_GATE(80A5E1A4, &lit_7180); +COMPILER_STRIP_GATE(0x80A5E1A4, &lit_7180); #pragma pop /* 80A5E1A8-80A5E1AC 0002AC 0004+00 0/1 0/0 0/0 .rodata @7181 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_7181 = 0x38D1B717; -COMPILER_STRIP_GATE(80A5E1A8, &lit_7181); +COMPILER_STRIP_GATE(0x80A5E1A8, &lit_7181); #pragma pop /* 80A5E1AC-80A5E1B0 0002B0 0004+00 0/1 0/0 0/0 .rodata @7182 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7182 = -22613.0f; -COMPILER_STRIP_GATE(80A5E1AC, &lit_7182); +COMPILER_STRIP_GATE(0x80A5E1AC, &lit_7182); #pragma pop /* 80A5E1B0-80A5E1B4 0002B4 0004+00 0/1 0/0 0/0 .rodata @7183 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7183 = -15097.0f; -COMPILER_STRIP_GATE(80A5E1B0, &lit_7183); +COMPILER_STRIP_GATE(0x80A5E1B0, &lit_7183); #pragma pop /* 80A5E1B4-80A5E1B8 0002B8 0004+00 0/1 0/0 0/0 .rodata @7184 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7184 = -22275.0f; -COMPILER_STRIP_GATE(80A5E1B4, &lit_7184); +COMPILER_STRIP_GATE(0x80A5E1B4, &lit_7184); #pragma pop /* 80A5E1B8-80A5E1BC 0002BC 0004+00 0/1 0/0 0/0 .rodata @7185 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7185 = -15092.0f; -COMPILER_STRIP_GATE(80A5E1B8, &lit_7185); +COMPILER_STRIP_GATE(0x80A5E1B8, &lit_7185); #pragma pop /* 80A5E1BC-80A5E1C0 0002C0 0004+00 0/1 0/0 0/0 .rodata @7186 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7186 = -23371.0f; -COMPILER_STRIP_GATE(80A5E1BC, &lit_7186); +COMPILER_STRIP_GATE(0x80A5E1BC, &lit_7186); #pragma pop /* 80A5E1C0-80A5E1C4 0002C4 0004+00 0/1 0/0 0/0 .rodata @7187 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7187 = 380.0f; -COMPILER_STRIP_GATE(80A5E1C0, &lit_7187); +COMPILER_STRIP_GATE(0x80A5E1C0, &lit_7187); #pragma pop /* 80A5E1C4-80A5E1C8 0002C8 0004+00 0/1 0/0 0/0 .rodata @7188 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7188 = -15901.0f; -COMPILER_STRIP_GATE(80A5E1C4, &lit_7188); +COMPILER_STRIP_GATE(0x80A5E1C4, &lit_7188); #pragma pop /* 80A5E1C8-80A5E1CC 0002CC 0004+00 0/1 0/0 0/0 .rodata @7189 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7189 = -23163.0f; -COMPILER_STRIP_GATE(80A5E1C8, &lit_7189); +COMPILER_STRIP_GATE(0x80A5E1C8, &lit_7189); #pragma pop /* 80A5E1CC-80A5E1D0 0002D0 0004+00 0/1 0/0 0/0 .rodata @7190 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7190 = 474.0f; -COMPILER_STRIP_GATE(80A5E1CC, &lit_7190); +COMPILER_STRIP_GATE(0x80A5E1CC, &lit_7190); #pragma pop /* 80A5E1D0-80A5E1D4 0002D4 0004+00 0/1 0/0 0/0 .rodata @7191 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7191 = -15653.0f; -COMPILER_STRIP_GATE(80A5E1D0, &lit_7191); +COMPILER_STRIP_GATE(0x80A5E1D0, &lit_7191); #pragma pop /* 80A5E1D4-80A5E1D8 0002D8 0004+00 0/1 0/0 0/0 .rodata @7192 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7192 = -22650.0f; -COMPILER_STRIP_GATE(80A5E1D4, &lit_7192); +COMPILER_STRIP_GATE(0x80A5E1D4, &lit_7192); #pragma pop /* 80A5E1D8-80A5E1DC 0002DC 0004+00 0/1 0/0 0/0 .rodata @7193 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7193 = 334.0f; -COMPILER_STRIP_GATE(80A5E1D8, &lit_7193); +COMPILER_STRIP_GATE(0x80A5E1D8, &lit_7193); #pragma pop /* 80A5E1DC-80A5E1E0 0002E0 0004+00 0/1 0/0 0/0 .rodata @7194 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7194 = -15147.0f; -COMPILER_STRIP_GATE(80A5E1DC, &lit_7194); +COMPILER_STRIP_GATE(0x80A5E1DC, &lit_7194); #pragma pop /* 80A5E1E0-80A5E1E4 0002E4 0004+00 0/1 0/0 0/0 .rodata @7195 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7195 = -22277.0f; -COMPILER_STRIP_GATE(80A5E1E0, &lit_7195); +COMPILER_STRIP_GATE(0x80A5E1E0, &lit_7195); #pragma pop /* 80A5E1E4-80A5E1E8 0002E8 0004+00 0/1 0/0 0/0 .rodata @7196 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7196 = 355.0f; -COMPILER_STRIP_GATE(80A5E1E4, &lit_7196); +COMPILER_STRIP_GATE(0x80A5E1E4, &lit_7196); #pragma pop /* 80A5E1E8-80A5E1EC 0002EC 0004+00 0/1 0/0 0/0 .rodata @7197 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7197 = -15077.0f; -COMPILER_STRIP_GATE(80A5E1E8, &lit_7197); +COMPILER_STRIP_GATE(0x80A5E1E8, &lit_7197); #pragma pop /* 80A5E1EC-80A5E1F0 0002F0 0004+00 0/1 0/0 0/0 .rodata @7198 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7198 = -30827.0f; -COMPILER_STRIP_GATE(80A5E1EC, &lit_7198); +COMPILER_STRIP_GATE(0x80A5E1EC, &lit_7198); #pragma pop /* 80A5E1F0-80A5E1F4 0002F4 0004+00 0/1 0/0 0/0 .rodata @7199 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7199 = 411.0f; -COMPILER_STRIP_GATE(80A5E1F0, &lit_7199); +COMPILER_STRIP_GATE(0x80A5E1F0, &lit_7199); #pragma pop /* 80A5E1F4-80A5E1F8 0002F8 0004+00 0/2 0/0 0/0 .rodata @7200 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7200 = -17200.0f; -COMPILER_STRIP_GATE(80A5E1F4, &lit_7200); +COMPILER_STRIP_GATE(0x80A5E1F4, &lit_7200); #pragma pop /* 80A5E1F8-80A5E1FC 0002FC 0004+00 0/1 0/0 0/0 .rodata @7201 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7201 = -30601.0f; -COMPILER_STRIP_GATE(80A5E1F8, &lit_7201); +COMPILER_STRIP_GATE(0x80A5E1F8, &lit_7201); #pragma pop /* 80A5E1FC-80A5E200 000300 0004+00 0/1 0/0 0/0 .rodata @7202 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7202 = 388.0f; -COMPILER_STRIP_GATE(80A5E1FC, &lit_7202); +COMPILER_STRIP_GATE(0x80A5E1FC, &lit_7202); #pragma pop /* 80A5E200-80A5E204 000304 0004+00 0/1 0/0 0/0 .rodata @7203 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7203 = -17465.0f; -COMPILER_STRIP_GATE(80A5E200, &lit_7203); +COMPILER_STRIP_GATE(0x80A5E200, &lit_7203); #pragma pop /* 80A5E204-80A5E208 000308 0004+00 0/1 0/0 0/0 .rodata @7204 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7204 = -30496.0f; -COMPILER_STRIP_GATE(80A5E204, &lit_7204); +COMPILER_STRIP_GATE(0x80A5E204, &lit_7204); #pragma pop /* 80A5E208-80A5E20C 00030C 0004+00 0/1 0/0 0/0 .rodata @7205 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7205 = -17449.0f; -COMPILER_STRIP_GATE(80A5E208, &lit_7205); +COMPILER_STRIP_GATE(0x80A5E208, &lit_7205); #pragma pop /* 80A5E20C-80A5E210 000310 0004+00 0/1 0/0 0/0 .rodata @7206 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7206 = -30844.0f; -COMPILER_STRIP_GATE(80A5E20C, &lit_7206); +COMPILER_STRIP_GATE(0x80A5E20C, &lit_7206); #pragma pop /* 80A5E210-80A5E214 000314 0004+00 0/1 0/0 0/0 .rodata @7207 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7207 = 298.0f; -COMPILER_STRIP_GATE(80A5E210, &lit_7207); +COMPILER_STRIP_GATE(0x80A5E210, &lit_7207); #pragma pop /* 80A5E214-80A5E218 000318 0004+00 0/1 0/0 0/0 .rodata @7208 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7208 = -17007.0f; -COMPILER_STRIP_GATE(80A5E214, &lit_7208); +COMPILER_STRIP_GATE(0x80A5E214, &lit_7208); #pragma pop /* 80A5E218-80A5E21C 00031C 0004+00 0/1 0/0 0/0 .rodata @7209 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7209 = -30653.0f; -COMPILER_STRIP_GATE(80A5E218, &lit_7209); +COMPILER_STRIP_GATE(0x80A5E218, &lit_7209); #pragma pop /* 80A5E21C-80A5E220 000320 0004+00 0/1 0/0 0/0 .rodata @7210 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7210 = 357.0f; -COMPILER_STRIP_GATE(80A5E21C, &lit_7210); +COMPILER_STRIP_GATE(0x80A5E21C, &lit_7210); #pragma pop /* 80A5E220-80A5E224 000324 0004+00 0/1 0/0 0/0 .rodata @7211 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7211 = -17289.0f; -COMPILER_STRIP_GATE(80A5E220, &lit_7211); +COMPILER_STRIP_GATE(0x80A5E220, &lit_7211); #pragma pop /* 80A5E224-80A5E228 000328 0004+00 0/1 0/0 0/0 .rodata @7212 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7212 = -30887.0f; -COMPILER_STRIP_GATE(80A5E224, &lit_7212); +COMPILER_STRIP_GATE(0x80A5E224, &lit_7212); #pragma pop /* 80A5E228-80A5E22C 00032C 0004+00 0/1 0/0 0/0 .rodata @7213 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7213 = 429.0f; -COMPILER_STRIP_GATE(80A5E228, &lit_7213); +COMPILER_STRIP_GATE(0x80A5E228, &lit_7213); #pragma pop /* 80A5E22C-80A5E230 000330 0004+00 0/1 0/0 0/0 .rodata @7214 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7214 = -17181.0f; -COMPILER_STRIP_GATE(80A5E22C, &lit_7214); +COMPILER_STRIP_GATE(0x80A5E22C, &lit_7214); #pragma pop /* 80A5E230-80A5E234 000334 0004+00 0/1 0/0 0/0 .rodata @7215 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7215 = -30870.0f; -COMPILER_STRIP_GATE(80A5E230, &lit_7215); +COMPILER_STRIP_GATE(0x80A5E230, &lit_7215); #pragma pop /* 80A5E234-80A5E238 000338 0004+00 0/1 0/0 0/0 .rodata @7216 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7216 = 471.0f; -COMPILER_STRIP_GATE(80A5E234, &lit_7216); +COMPILER_STRIP_GATE(0x80A5E234, &lit_7216); #pragma pop /* 80A5E238-80A5E23C 00033C 0004+00 0/1 0/0 0/0 .rodata @7217 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7217 = -17527.0f; -COMPILER_STRIP_GATE(80A5E238, &lit_7217); +COMPILER_STRIP_GATE(0x80A5E238, &lit_7217); #pragma pop /* 80A5E23C-80A5E240 000340 0004+00 0/1 0/0 0/0 .rodata @7218 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7218 = -37509.0f; -COMPILER_STRIP_GATE(80A5E23C, &lit_7218); +COMPILER_STRIP_GATE(0x80A5E23C, &lit_7218); #pragma pop /* 80A5E240-80A5E244 000344 0004+00 0/1 0/0 0/0 .rodata @7219 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7219 = 805.0f; -COMPILER_STRIP_GATE(80A5E240, &lit_7219); +COMPILER_STRIP_GATE(0x80A5E240, &lit_7219); #pragma pop /* 80A5E244-80A5E248 000348 0004+00 0/1 0/0 0/0 .rodata @7220 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7220 = -22416.0f; -COMPILER_STRIP_GATE(80A5E244, &lit_7220); +COMPILER_STRIP_GATE(0x80A5E244, &lit_7220); #pragma pop /* 80A5E248-80A5E24C 00034C 0004+00 0/1 0/0 0/0 .rodata @7221 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7221 = -36523.0f; -COMPILER_STRIP_GATE(80A5E248, &lit_7221); +COMPILER_STRIP_GATE(0x80A5E248, &lit_7221); #pragma pop /* 80A5E24C-80A5E250 000350 0004+00 0/1 0/0 0/0 .rodata @7222 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7222 = 335.0f; -COMPILER_STRIP_GATE(80A5E24C, &lit_7222); +COMPILER_STRIP_GATE(0x80A5E24C, &lit_7222); #pragma pop /* 80A5E250-80A5E254 000354 0004+00 0/1 0/0 0/0 .rodata @7223 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7223 = -20500.0f; -COMPILER_STRIP_GATE(80A5E250, &lit_7223); +COMPILER_STRIP_GATE(0x80A5E250, &lit_7223); #pragma pop /* 80A5E254-80A5E258 000358 0004+00 0/1 0/0 0/0 .rodata @7224 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7224 = -37817.0f; -COMPILER_STRIP_GATE(80A5E254, &lit_7224); +COMPILER_STRIP_GATE(0x80A5E254, &lit_7224); #pragma pop /* 80A5E258-80A5E25C 00035C 0004+00 0/1 0/0 0/0 .rodata @7225 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7225 = -21442.0f; -COMPILER_STRIP_GATE(80A5E258, &lit_7225); +COMPILER_STRIP_GATE(0x80A5E258, &lit_7225); #pragma pop /* 80A5E25C-80A5E260 000360 0004+00 0/1 0/0 0/0 .rodata @7226 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7226 = -36666.0f; -COMPILER_STRIP_GATE(80A5E25C, &lit_7226); +COMPILER_STRIP_GATE(0x80A5E25C, &lit_7226); #pragma pop /* 80A5E260-80A5E264 000364 0004+00 0/1 0/0 0/0 .rodata @7227 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7227 = -22213.0f; -COMPILER_STRIP_GATE(80A5E260, &lit_7227); +COMPILER_STRIP_GATE(0x80A5E260, &lit_7227); #pragma pop /* 80A5E264-80A5E268 000368 0004+00 0/1 0/0 0/0 .rodata @7228 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7228 = -36489.0f; -COMPILER_STRIP_GATE(80A5E264, &lit_7228); +COMPILER_STRIP_GATE(0x80A5E264, &lit_7228); #pragma pop /* 80A5E268-80A5E26C 00036C 0004+00 0/1 0/0 0/0 .rodata @7229 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7229 = 399.0f; -COMPILER_STRIP_GATE(80A5E268, &lit_7229); +COMPILER_STRIP_GATE(0x80A5E268, &lit_7229); #pragma pop /* 80A5E26C-80A5E270 000370 0004+00 0/1 0/0 0/0 .rodata @7230 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7230 = -20932.0f; -COMPILER_STRIP_GATE(80A5E26C, &lit_7230); +COMPILER_STRIP_GATE(0x80A5E26C, &lit_7230); #pragma pop /* 80A5E270-80A5E274 000374 0004+00 0/1 0/0 0/0 .rodata @7231 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7231 = -36574.0f; -COMPILER_STRIP_GATE(80A5E270, &lit_7231); +COMPILER_STRIP_GATE(0x80A5E270, &lit_7231); #pragma pop /* 80A5E274-80A5E278 000378 0004+00 0/1 0/0 0/0 .rodata @7232 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7232 = 421.0f; -COMPILER_STRIP_GATE(80A5E274, &lit_7232); +COMPILER_STRIP_GATE(0x80A5E274, &lit_7232); #pragma pop /* 80A5E278-80A5E27C 00037C 0004+00 0/1 0/0 0/0 .rodata @7233 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7233 = -21554.0f; -COMPILER_STRIP_GATE(80A5E278, &lit_7233); +COMPILER_STRIP_GATE(0x80A5E278, &lit_7233); #pragma pop /* 80A5E27C-80A5E280 000380 0004+00 0/1 0/0 0/0 .rodata @7234 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7234 = -36397.0f; -COMPILER_STRIP_GATE(80A5E27C, &lit_7234); +COMPILER_STRIP_GATE(0x80A5E27C, &lit_7234); #pragma pop /* 80A5E280-80A5E284 000384 0004+00 0/1 0/0 0/0 .rodata @7235 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7235 = 374.0f; -COMPILER_STRIP_GATE(80A5E280, &lit_7235); +COMPILER_STRIP_GATE(0x80A5E280, &lit_7235); #pragma pop /* 80A5E284-80A5E288 000388 0004+00 0/1 0/0 0/0 .rodata @7236 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7236 = -20263.0f; -COMPILER_STRIP_GATE(80A5E284, &lit_7236); +COMPILER_STRIP_GATE(0x80A5E284, &lit_7236); #pragma pop /* 80A5E288-80A5E28C 00038C 0004+00 0/1 0/0 0/0 .rodata @7237 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7237 = -36581.0f; -COMPILER_STRIP_GATE(80A5E288, &lit_7237); +COMPILER_STRIP_GATE(0x80A5E288, &lit_7237); #pragma pop /* 80A5E28C-80A5E290 000390 0004+00 0/1 0/0 0/0 .rodata @7238 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7238 = 412.0f; -COMPILER_STRIP_GATE(80A5E28C, &lit_7238); +COMPILER_STRIP_GATE(0x80A5E28C, &lit_7238); #pragma pop /* 80A5E290-80A5E294 000394 0004+00 0/1 0/0 0/0 .rodata @7239 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7239 = -21418.0f; -COMPILER_STRIP_GATE(80A5E290, &lit_7239); +COMPILER_STRIP_GATE(0x80A5E290, &lit_7239); #pragma pop /* 80A5E294-80A5E298 000398 0004+00 0/1 0/0 0/0 .rodata @7240 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7240 = -36509.0f; -COMPILER_STRIP_GATE(80A5E294, &lit_7240); +COMPILER_STRIP_GATE(0x80A5E294, &lit_7240); #pragma pop /* 80A5E298-80A5E29C 00039C 0004+00 0/1 0/0 0/0 .rodata @7241 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7241 = -21127.0f; -COMPILER_STRIP_GATE(80A5E298, &lit_7241); +COMPILER_STRIP_GATE(0x80A5E298, &lit_7241); #pragma pop /* 80A5E29C-80A5E2A0 0003A0 0004+00 0/1 0/0 0/0 .rodata @7242 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7242 = -38113.0f; -COMPILER_STRIP_GATE(80A5E29C, &lit_7242); +COMPILER_STRIP_GATE(0x80A5E29C, &lit_7242); #pragma pop /* 80A5E2A0-80A5E2A4 0003A4 0004+00 0/1 0/0 0/0 .rodata @7243 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7243 = 1234.0f; -COMPILER_STRIP_GATE(80A5E2A0, &lit_7243); +COMPILER_STRIP_GATE(0x80A5E2A0, &lit_7243); #pragma pop /* 80A5E2A4-80A5E2A8 0003A8 0004+00 0/1 0/0 0/0 .rodata @7244 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7244 = -22897.0f; -COMPILER_STRIP_GATE(80A5E2A4, &lit_7244); +COMPILER_STRIP_GATE(0x80A5E2A4, &lit_7244); #pragma pop /* 80A5E2A8-80A5E2AC 0003AC 0004+00 0/1 0/0 0/0 .rodata @7245 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7245 = -37882.0f; -COMPILER_STRIP_GATE(80A5E2A8, &lit_7245); +COMPILER_STRIP_GATE(0x80A5E2A8, &lit_7245); #pragma pop /* 80A5E2AC-80A5E2B0 0003B0 0004+00 0/1 0/0 0/0 .rodata @7246 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7246 = 1182.0f; -COMPILER_STRIP_GATE(80A5E2AC, &lit_7246); +COMPILER_STRIP_GATE(0x80A5E2AC, &lit_7246); #pragma pop /* 80A5E2B0-80A5E2B4 0003B4 0004+00 0/1 0/0 0/0 .rodata @7247 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7247 = -22713.0f; -COMPILER_STRIP_GATE(80A5E2B0, &lit_7247); +COMPILER_STRIP_GATE(0x80A5E2B0, &lit_7247); #pragma pop /* 80A5E2B4-80A5E2B8 0003B8 0004+00 0/1 0/0 0/0 .rodata @7248 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7248 = -36540.0f; -COMPILER_STRIP_GATE(80A5E2B4, &lit_7248); +COMPILER_STRIP_GATE(0x80A5E2B4, &lit_7248); #pragma pop /* 80A5E2B8-80A5E2BC 0003BC 0004+00 0/1 0/0 0/0 .rodata @7249 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7249 = -20870.0f; -COMPILER_STRIP_GATE(80A5E2B8, &lit_7249); +COMPILER_STRIP_GATE(0x80A5E2B8, &lit_7249); #pragma pop /* 80A5E2BC-80A5E2C0 0003C0 0004+00 0/1 0/0 0/0 .rodata @7250 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7250 = 1.0f / 100.0f; -COMPILER_STRIP_GATE(80A5E2BC, &lit_7250); +COMPILER_STRIP_GATE(0x80A5E2BC, &lit_7250); #pragma pop /* 80A5E2C0-80A5E2C4 0003C4 0004+00 0/1 0/0 0/0 .rodata @7251 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7251 = -36467.0f; -COMPILER_STRIP_GATE(80A5E2C0, &lit_7251); +COMPILER_STRIP_GATE(0x80A5E2C0, &lit_7251); #pragma pop /* 80A5E2C4-80A5E2C8 0003C8 0004+00 0/1 0/0 0/0 .rodata @7252 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7252 = 426.0f; -COMPILER_STRIP_GATE(80A5E2C4, &lit_7252); +COMPILER_STRIP_GATE(0x80A5E2C4, &lit_7252); #pragma pop /* 80A5E2C8-80A5E2CC 0003CC 0004+00 0/1 0/0 0/0 .rodata @7253 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7253 = -20914.0f; -COMPILER_STRIP_GATE(80A5E2C8, &lit_7253); +COMPILER_STRIP_GATE(0x80A5E2C8, &lit_7253); #pragma pop /* 80A5E2CC-80A5E2D0 0003D0 0004+00 0/1 0/0 0/0 .rodata @7254 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7254 = -36244.0f; -COMPILER_STRIP_GATE(80A5E2CC, &lit_7254); +COMPILER_STRIP_GATE(0x80A5E2CC, &lit_7254); #pragma pop /* 80A5E2D0-80A5E2D4 0003D4 0004+00 0/1 0/0 0/0 .rodata @7255 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7255 = 409.0f; -COMPILER_STRIP_GATE(80A5E2D0, &lit_7255); +COMPILER_STRIP_GATE(0x80A5E2D0, &lit_7255); #pragma pop /* 80A5E2D4-80A5E2D8 0003D8 0004+00 0/1 0/0 0/0 .rodata @7256 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7256 = -20714.0f; -COMPILER_STRIP_GATE(80A5E2D4, &lit_7256); +COMPILER_STRIP_GATE(0x80A5E2D4, &lit_7256); +#pragma pop + +/* 80A5E438-80A5E438 00053C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80A5E440 = " PL IN %d"; #pragma pop /* 80A50094-80A5280C 0071F4 2778+00 1/1 0/0 0/0 .text demo_camera__FP12npc_ks_class */ @@ -3835,42 +3847,42 @@ static asm void saru_count_check(npc_ks_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7645 = 5274.0f; -COMPILER_STRIP_GATE(80A5E2D8, &lit_7645); +COMPILER_STRIP_GATE(0x80A5E2D8, &lit_7645); #pragma pop /* 80A5E2DC-80A5E2E0 0003E0 0004+00 0/1 0/0 0/0 .rodata @7646 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7646 = 3250.0f; -COMPILER_STRIP_GATE(80A5E2DC, &lit_7646); +COMPILER_STRIP_GATE(0x80A5E2DC, &lit_7646); #pragma pop /* 80A5E2E0-80A5E2E4 0003E4 0004+00 0/1 0/0 0/0 .rodata @7647 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7647 = 6500.0f; -COMPILER_STRIP_GATE(80A5E2E0, &lit_7647); +COMPILER_STRIP_GATE(0x80A5E2E0, &lit_7647); #pragma pop /* 80A5E2E4-80A5E2E8 0003E8 0004+00 0/2 0/0 0/0 .rodata @7648 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7648 = 3000.0f; -COMPILER_STRIP_GATE(80A5E2E4, &lit_7648); +COMPILER_STRIP_GATE(0x80A5E2E4, &lit_7648); #pragma pop /* 80A5E2E8-80A5E2EC 0003EC 0004+00 0/1 0/0 0/0 .rodata @7649 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7649 = 7211.0f; -COMPILER_STRIP_GATE(80A5E2E8, &lit_7649); +COMPILER_STRIP_GATE(0x80A5E2E8, &lit_7649); #pragma pop /* 80A5E2EC-80A5E2F0 0003F0 0004+00 0/3 0/0 0/0 .rodata @7650 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7650 = 450.0f; -COMPILER_STRIP_GATE(80A5E2EC, &lit_7650); +COMPILER_STRIP_GATE(0x80A5E2EC, &lit_7650); #pragma pop /* 80A52898-80A533B4 0099F8 0B1C+00 2/1 0/0 0/0 .text action_check__FP12npc_ks_class */ @@ -3899,56 +3911,56 @@ static asm void water_check(npc_ks_class* param_0, cXyz param_1, f32 param_2) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7651 = 5334.0f; -COMPILER_STRIP_GATE(80A5E2F0, &lit_7651); +COMPILER_STRIP_GATE(0x80A5E2F0, &lit_7651); #pragma pop /* 80A5E2F4-80A5E2F8 0003F8 0004+00 0/0 0/0 0/0 .rodata @7652 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7652 = 7609.0f; -COMPILER_STRIP_GATE(80A5E2F4, &lit_7652); +COMPILER_STRIP_GATE(0x80A5E2F4, &lit_7652); #pragma pop /* 80A5E2F8-80A5E2FC 0003FC 0004+00 0/8 0/0 0/0 .rodata @7653 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7653 = 700.0f; -COMPILER_STRIP_GATE(80A5E2F8, &lit_7653); +COMPILER_STRIP_GATE(0x80A5E2F8, &lit_7653); #pragma pop /* 80A5E2FC-80A5E300 000400 0004+00 0/0 0/0 0/0 .rodata @7654 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7654 = -3900.0f; -COMPILER_STRIP_GATE(80A5E2FC, &lit_7654); +COMPILER_STRIP_GATE(0x80A5E2FC, &lit_7654); #pragma pop /* 80A5E300-80A5E304 000404 0004+00 0/0 0/0 0/0 .rodata @7655 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7655 = 7275.0f; -COMPILER_STRIP_GATE(80A5E300, &lit_7655); +COMPILER_STRIP_GATE(0x80A5E300, &lit_7655); #pragma pop /* 80A5E304-80A5E308 000408 0004+00 0/0 0/0 0/0 .rodata @7656 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7656 = 3373.0f; -COMPILER_STRIP_GATE(80A5E304, &lit_7656); +COMPILER_STRIP_GATE(0x80A5E304, &lit_7656); #pragma pop /* 80A5E308-80A5E30C 00040C 0004+00 0/0 0/0 0/0 .rodata @7657 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7657 = -4790.0f; -COMPILER_STRIP_GATE(80A5E308, &lit_7657); +COMPILER_STRIP_GATE(0x80A5E308, &lit_7657); #pragma pop /* 80A5E30C-80A5E310 000410 0004+00 0/2 0/0 0/0 .rodata @8130 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8130 = 8.0f; -COMPILER_STRIP_GATE(80A5E30C, &lit_8130); +COMPILER_STRIP_GATE(0x80A5E30C, &lit_8130); #pragma pop /* 80A5352C-80A548E4 00A68C 13B8+00 2/1 0/0 0/0 .text npc_ks_option__FP12npc_ks_class */ @@ -3988,35 +4000,35 @@ static asm void npc_ks_guide_00(npc_ks_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8131 = 130.0f; -COMPILER_STRIP_GATE(80A5E310, &lit_8131); +COMPILER_STRIP_GATE(0x80A5E310, &lit_8131); #pragma pop /* 80A5E314-80A5E318 000418 0004+00 0/0 0/0 0/0 .rodata @8132 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8132 = 4096.0f; -COMPILER_STRIP_GATE(80A5E314, &lit_8132); +COMPILER_STRIP_GATE(0x80A5E314, &lit_8132); #pragma pop /* 80A5E318-80A5E31C 00041C 0004+00 0/0 0/0 0/0 .rodata @8133 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8133 = 1.5f; -COMPILER_STRIP_GATE(80A5E318, &lit_8133); +COMPILER_STRIP_GATE(0x80A5E318, &lit_8133); #pragma pop /* 80A5E31C-80A5E320 000420 0004+00 0/3 0/0 0/0 .rodata @8356 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8356 = 900.0f; -COMPILER_STRIP_GATE(80A5E31C, &lit_8356); +COMPILER_STRIP_GATE(0x80A5E31C, &lit_8356); #pragma pop /* 80A5E320-80A5E324 000424 0004+00 0/1 0/0 0/0 .rodata @8357 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8357 = 750.0f; -COMPILER_STRIP_GATE(80A5E320, &lit_8357); +COMPILER_STRIP_GATE(0x80A5E320, &lit_8357); #pragma pop /* 80A55174-80A5546C 00C2D4 02F8+00 1/1 0/0 0/0 .text npc_ks_guide_00_2__FP12npc_ks_class @@ -4046,14 +4058,14 @@ static asm void npc_ks_guide_00_3(npc_ks_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8644 = 9200.0f; -COMPILER_STRIP_GATE(80A5E324, &lit_8644); +COMPILER_STRIP_GATE(0x80A5E324, &lit_8644); #pragma pop /* 80A5E328-80A5E32C 00042C 0004+00 0/1 0/0 0/0 .rodata @8645 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8645 = 4839.0f; -COMPILER_STRIP_GATE(80A5E328, &lit_8645); +COMPILER_STRIP_GATE(0x80A5E328, &lit_8645); #pragma pop /* 80A559B4-80A562EC 00CB14 0938+00 1/1 0/0 0/0 .text npc_ks_guide_01__FP12npc_ks_class @@ -4083,7 +4095,7 @@ static asm void npc_ks_guide_02(npc_ks_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8912 = 110.0f; -COMPILER_STRIP_GATE(80A5E32C, &lit_8912); +COMPILER_STRIP_GATE(0x80A5E32C, &lit_8912); #pragma pop /* 80A56A1C-80A57124 00DB7C 0708+00 1/1 0/0 0/0 .text npc_ks_guide_22__FP12npc_ks_class @@ -4123,14 +4135,14 @@ static asm void npc_ks_demo_12(npc_ks_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9260 = 7280.0f; -COMPILER_STRIP_GATE(80A5E330, &lit_9260); +COMPILER_STRIP_GATE(0x80A5E330, &lit_9260); #pragma pop /* 80A5E334-80A5E338 000438 0004+00 0/1 0/0 0/0 .rodata @9261 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9261 = -2709.0f; -COMPILER_STRIP_GATE(80A5E334, &lit_9261); +COMPILER_STRIP_GATE(0x80A5E334, &lit_9261); #pragma pop /* 80A57ED4-80A58274 00F034 03A0+00 1/1 0/0 0/0 .text npc_ks_guide_0409__FP12npc_ks_class @@ -4159,70 +4171,70 @@ static asm void path_search(npc_ks_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9545 = -27426.0f; -COMPILER_STRIP_GATE(80A5E338, &lit_9545); +COMPILER_STRIP_GATE(0x80A5E338, &lit_9545); #pragma pop /* 80A5E33C-80A5E340 000440 0004+00 0/1 0/0 0/0 .rodata @9546 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9546 = -20000.0f; -COMPILER_STRIP_GATE(80A5E33C, &lit_9546); +COMPILER_STRIP_GATE(0x80A5E33C, &lit_9546); #pragma pop /* 80A5E340-80A5E344 000444 0004+00 0/1 0/0 0/0 .rodata @9547 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9547 = 7500.0f; -COMPILER_STRIP_GATE(80A5E340, &lit_9547); +COMPILER_STRIP_GATE(0x80A5E340, &lit_9547); #pragma pop /* 80A5E344-80A5E348 000448 0004+00 0/1 0/0 0/0 .rodata @9548 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9548 = 6.0f; -COMPILER_STRIP_GATE(80A5E344, &lit_9548); +COMPILER_STRIP_GATE(0x80A5E344, &lit_9548); #pragma pop /* 80A5E348-80A5E34C 00044C 0004+00 0/1 0/0 0/0 .rodata @9549 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9549 = 1.25f; -COMPILER_STRIP_GATE(80A5E348, &lit_9549); +COMPILER_STRIP_GATE(0x80A5E348, &lit_9549); #pragma pop /* 80A5E34C-80A5E350 000450 0004+00 0/1 0/0 0/0 .rodata @9550 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9550 = -30900.0f; -COMPILER_STRIP_GATE(80A5E34C, &lit_9550); +COMPILER_STRIP_GATE(0x80A5E34C, &lit_9550); #pragma pop /* 80A5E350-80A5E354 000454 0004+00 0/1 0/0 0/0 .rodata @9551 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9551 = -15756.0f; -COMPILER_STRIP_GATE(80A5E350, &lit_9551); +COMPILER_STRIP_GATE(0x80A5E350, &lit_9551); #pragma pop /* 80A5E354-80A5E358 000458 0004+00 0/1 0/0 0/0 .rodata @9552 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9552 = 1300.0f; -COMPILER_STRIP_GATE(80A5E354, &lit_9552); +COMPILER_STRIP_GATE(0x80A5E354, &lit_9552); #pragma pop /* 80A5E358-80A5E35C 00045C 0004+00 0/1 0/0 0/0 .rodata @9553 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9553 = -31872.0f; -COMPILER_STRIP_GATE(80A5E358, &lit_9553); +COMPILER_STRIP_GATE(0x80A5E358, &lit_9553); #pragma pop /* 80A5E35C-80A5E360 000460 0004+00 0/1 0/0 0/0 .rodata @9554 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9554 = -15490.0f; -COMPILER_STRIP_GATE(80A5E35C, &lit_9554); +COMPILER_STRIP_GATE(0x80A5E35C, &lit_9554); #pragma pop /* 80A58410-80A58FE0 00F570 0BD0+00 1/1 0/0 0/0 .text npc_ks_mori__FP12npc_ks_class */ @@ -4240,35 +4252,35 @@ static asm void npc_ks_mori(npc_ks_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9862 = -39906.0f; -COMPILER_STRIP_GATE(80A5E360, &lit_9862); +COMPILER_STRIP_GATE(0x80A5E360, &lit_9862); #pragma pop /* 80A5E364-80A5E368 000468 0004+00 0/1 0/0 0/0 .rodata @9863 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9863 = 21962.0f; -COMPILER_STRIP_GATE(80A5E364, &lit_9863); +COMPILER_STRIP_GATE(0x80A5E364, &lit_9863); #pragma pop /* 80A5E368-80A5E36C 00046C 0004+00 0/1 0/0 0/0 .rodata @9864 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9864 = -24243.0f; -COMPILER_STRIP_GATE(80A5E368, &lit_9864); +COMPILER_STRIP_GATE(0x80A5E368, &lit_9864); #pragma pop /* 80A5E36C-80A5E370 000470 0004+00 0/1 0/0 0/0 .rodata @9865 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9865 = -21000.0f; -COMPILER_STRIP_GATE(80A5E36C, &lit_9865); +COMPILER_STRIP_GATE(0x80A5E36C, &lit_9865); #pragma pop /* 80A5E370-80A5E374 000474 0004+00 0/1 0/0 0/0 .rodata @9866 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9866 = 1962.0f; -COMPILER_STRIP_GATE(80A5E370, &lit_9866); +COMPILER_STRIP_GATE(0x80A5E370, &lit_9866); #pragma pop /* 80A58FE0-80A599D8 010140 09F8+00 2/1 0/0 0/0 .text npc_ks_fsdemo__FP12npc_ks_class */ @@ -4296,133 +4308,133 @@ static asm void npc_ks_kago(npc_ks_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9867 = -37799.0f; -COMPILER_STRIP_GATE(80A5E374, &lit_9867); +COMPILER_STRIP_GATE(0x80A5E374, &lit_9867); #pragma pop /* 80A5E378-80A5E37C 00047C 0004+00 0/0 0/0 0/0 .rodata @9868 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9868 = 815.0f; -COMPILER_STRIP_GATE(80A5E378, &lit_9868); +COMPILER_STRIP_GATE(0x80A5E378, &lit_9868); #pragma pop /* 80A5E37C-80A5E380 000480 0004+00 0/0 0/0 0/0 .rodata @9869 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9869 = -22323.0f; -COMPILER_STRIP_GATE(80A5E37C, &lit_9869); +COMPILER_STRIP_GATE(0x80A5E37C, &lit_9869); #pragma pop /* 80A5E380-80A5E384 000484 0004+00 0/0 0/0 0/0 .rodata @9870 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9870 = 57.0f; -COMPILER_STRIP_GATE(80A5E380, &lit_9870); +COMPILER_STRIP_GATE(0x80A5E380, &lit_9870); #pragma pop /* 80A5E384-80A5E388 000488 0004+00 0/1 0/0 0/0 .rodata @10197 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10197 = 16.0f; -COMPILER_STRIP_GATE(80A5E384, &lit_10197); +COMPILER_STRIP_GATE(0x80A5E384, &lit_10197); #pragma pop /* 80A5E388-80A5E38C 00048C 0004+00 0/1 0/0 0/0 .rodata @10198 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10198 = 9.0f; -COMPILER_STRIP_GATE(80A5E388, &lit_10198); +COMPILER_STRIP_GATE(0x80A5E388, &lit_10198); #pragma pop /* 80A5E38C-80A5E390 000490 0004+00 0/1 0/0 0/0 .rodata @10199 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10199 = 24.0f; -COMPILER_STRIP_GATE(80A5E38C, &lit_10199); +COMPILER_STRIP_GATE(0x80A5E38C, &lit_10199); #pragma pop /* 80A5E390-80A5E394 000494 0004+00 0/2 0/0 0/0 .rodata @10200 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10200 = 11.0f; -COMPILER_STRIP_GATE(80A5E390, &lit_10200); +COMPILER_STRIP_GATE(0x80A5E390, &lit_10200); #pragma pop /* 80A5E394-80A5E398 000498 0004+00 0/1 0/0 0/0 .rodata @10201 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10201 = 19.0f; -COMPILER_STRIP_GATE(80A5E394, &lit_10201); +COMPILER_STRIP_GATE(0x80A5E394, &lit_10201); #pragma pop /* 80A5E398-80A5E39C 00049C 0004+00 0/1 0/0 0/0 .rodata @10202 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10202 = 36.0f; -COMPILER_STRIP_GATE(80A5E398, &lit_10202); +COMPILER_STRIP_GATE(0x80A5E398, &lit_10202); #pragma pop /* 80A5E39C-80A5E3A0 0004A0 0004+00 0/1 0/0 0/0 .rodata @10203 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10203 = 54.0f; -COMPILER_STRIP_GATE(80A5E39C, &lit_10203); +COMPILER_STRIP_GATE(0x80A5E39C, &lit_10203); #pragma pop /* 80A5E3A0-80A5E3A4 0004A4 0004+00 0/1 0/0 0/0 .rodata @10204 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10204 = 47.0f; -COMPILER_STRIP_GATE(80A5E3A0, &lit_10204); +COMPILER_STRIP_GATE(0x80A5E3A0, &lit_10204); #pragma pop /* 80A5E3A4-80A5E3A8 0004A8 0004+00 0/1 0/0 0/0 .rodata @10205 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10205 = 22.0f; -COMPILER_STRIP_GATE(80A5E3A4, &lit_10205); +COMPILER_STRIP_GATE(0x80A5E3A4, &lit_10205); #pragma pop /* 80A5E3A8-80A5E3AC 0004AC 0004+00 0/1 0/0 0/0 .rodata @10206 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10206 = 17.0f; -COMPILER_STRIP_GATE(80A5E3A8, &lit_10206); +COMPILER_STRIP_GATE(0x80A5E3A8, &lit_10206); #pragma pop /* 80A5E3AC-80A5E3B0 0004B0 0004+00 0/1 0/0 0/0 .rodata @10207 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10207 = 18.0f; -COMPILER_STRIP_GATE(80A5E3AC, &lit_10207); +COMPILER_STRIP_GATE(0x80A5E3AC, &lit_10207); #pragma pop /* 80A5E3B0-80A5E3B4 0004B4 0004+00 0/1 0/0 0/0 .rodata @10208 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10208 = 38.0f; -COMPILER_STRIP_GATE(80A5E3B0, &lit_10208); +COMPILER_STRIP_GATE(0x80A5E3B0, &lit_10208); #pragma pop /* 80A5E3B4-80A5E3B8 0004B8 0004+00 0/1 0/0 0/0 .rodata @10209 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10209 = 51.0f; -COMPILER_STRIP_GATE(80A5E3B4, &lit_10209); +COMPILER_STRIP_GATE(0x80A5E3B4, &lit_10209); #pragma pop /* 80A5E3B8-80A5E3BC 0004BC 0004+00 0/1 0/0 0/0 .rodata @10210 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_10210 = 0x3CB020C5; -COMPILER_STRIP_GATE(80A5E3B8, &lit_10210); +COMPILER_STRIP_GATE(0x80A5E3B8, &lit_10210); #pragma pop /* 80A5E3BC-80A5E3C0 0004C0 0004+00 0/1 0/0 0/0 .rodata @10211 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10211 = 127.0f; -COMPILER_STRIP_GATE(80A5E3BC, &lit_10211); +COMPILER_STRIP_GATE(0x80A5E3BC, &lit_10211); #pragma pop /* 80A59A90-80A5A7D8 010BF0 0D48+00 1/1 0/0 0/0 .text anm_se_set__FP12npc_ks_class */ @@ -4440,35 +4452,35 @@ static asm void anm_se_set(npc_ks_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10479 = -300.0f; -COMPILER_STRIP_GATE(80A5E3C0, &lit_10479); +COMPILER_STRIP_GATE(0x80A5E3C0, &lit_10479); #pragma pop /* 80A5E3C4-80A5E3C8 0004C8 0004+00 0/1 0/0 0/0 .rodata @10480 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10480 = -90.0f; -COMPILER_STRIP_GATE(80A5E3C4, &lit_10480); +COMPILER_STRIP_GATE(0x80A5E3C4, &lit_10480); #pragma pop /* 80A5E3C8-80A5E3CC 0004CC 0004+00 0/1 0/0 0/0 .rodata @10481 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10481 = 2000.0f; -COMPILER_STRIP_GATE(80A5E3C8, &lit_10481); +COMPILER_STRIP_GATE(0x80A5E3C8, &lit_10481); #pragma pop /* 80A5E3CC-80A5E3D0 0004D0 0004+00 0/1 0/0 0/0 .rodata @10482 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10482 = -70.0f; -COMPILER_STRIP_GATE(80A5E3CC, &lit_10482); +COMPILER_STRIP_GATE(0x80A5E3CC, &lit_10482); #pragma pop /* 80A5E3D0-80A5E3D4 0004D4 0004+00 0/1 0/0 0/0 .rodata @10483 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10483 = 0.75f; -COMPILER_STRIP_GATE(80A5E3D0, &lit_10483); +COMPILER_STRIP_GATE(0x80A5E3D0, &lit_10483); #pragma pop /* 80A5A7D8-80A5B544 011938 0D6C+00 1/1 0/0 0/0 .text action__FP12npc_ks_class */ @@ -4496,28 +4508,28 @@ static asm void s_kago_sub(void* param_0, void* param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10567 = 44.0f; -COMPILER_STRIP_GATE(80A5E3D4, &lit_10567); +COMPILER_STRIP_GATE(0x80A5E3D4, &lit_10567); #pragma pop /* 80A5E3D8-80A5E3DC 0004DC 0004+00 0/1 0/0 0/0 .rodata @10568 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10568 = 144.5f; -COMPILER_STRIP_GATE(80A5E3D8, &lit_10568); +COMPILER_STRIP_GATE(0x80A5E3D8, &lit_10568); #pragma pop /* 80A5E3DC-80A5E3E0 0004E0 0004+00 0/1 0/0 0/0 .rodata @10569 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10569 = -30715.0f; -COMPILER_STRIP_GATE(80A5E3DC, &lit_10569); +COMPILER_STRIP_GATE(0x80A5E3DC, &lit_10569); #pragma pop /* 80A5E3E0-80A5E3E4 0004E4 0004+00 0/1 0/0 0/0 .rodata @10570 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10570 = 338.0f; -COMPILER_STRIP_GATE(80A5E3E0, &lit_10570); +COMPILER_STRIP_GATE(0x80A5E3E0, &lit_10570); #pragma pop /* 80A5E3E4-80A5E3EC 0004E8 0004+04 0/1 0/0 0/0 .rodata @10571 */ @@ -4528,7 +4540,7 @@ SECTION_RODATA static f32 const lit_10571[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80A5E3E4, &lit_10571); +COMPILER_STRIP_GATE(0x80A5E3E4, &lit_10571); #pragma pop /* 80A5E3EC-80A5E3F4 0004F0 0008+00 0/2 0/0 0/0 .rodata @10573 */ @@ -4537,7 +4549,7 @@ COMPILER_STRIP_GATE(80A5E3E4, &lit_10571); SECTION_RODATA static u8 const lit_10573[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A5E3EC, &lit_10573); +COMPILER_STRIP_GATE(0x80A5E3EC, &lit_10573); #pragma pop /* 80A5B614-80A5B8FC 012774 02E8+00 1/1 0/0 0/0 .text kantera_sub__FP12npc_ks_class */ @@ -4555,28 +4567,28 @@ static asm void kantera_sub(npc_ks_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10878 = 32768.0f; -COMPILER_STRIP_GATE(80A5E3F4, &lit_10878); +COMPILER_STRIP_GATE(0x80A5E3F4, &lit_10878); #pragma pop /* 80A5E3F8-80A5E3FC 0004FC 0004+00 0/1 0/0 0/0 .rodata @10879 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10879 = -60.0f; -COMPILER_STRIP_GATE(80A5E3F8, &lit_10879); +COMPILER_STRIP_GATE(0x80A5E3F8, &lit_10879); #pragma pop /* 80A5E3FC-80A5E400 000500 0004+00 0/1 0/0 0/0 .rodata @10880 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10880 = -0.0f; -COMPILER_STRIP_GATE(80A5E3FC, &lit_10880); +COMPILER_STRIP_GATE(0x80A5E3FC, &lit_10880); #pragma pop /* 80A5E400-80A5E404 000504 0004+00 0/1 0/0 0/0 .rodata @10881 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10881 = -3.0f; -COMPILER_STRIP_GATE(80A5E400, &lit_10881); +COMPILER_STRIP_GATE(0x80A5E400, &lit_10881); #pragma pop /* 80A5FF48-80A5FF58 000108 000C+04 0/0 0/0 0/0 .bss @7870 */ @@ -4650,7 +4662,7 @@ asm J3DFrameCtrl::~J3DFrameCtrl() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_11370 = 4620.0f; -COMPILER_STRIP_GATE(80A5E404, &lit_11370); +COMPILER_STRIP_GATE(0x80A5E404, &lit_11370); #pragma pop /* 80A5C7B0-80A5D2BC 013910 0B0C+00 2/1 0/0 0/0 .text start_check__FP12npc_ks_class */ @@ -4678,84 +4690,91 @@ static asm void s_check_sub(void* param_0, void* param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_11371 = 6854.0f; -COMPILER_STRIP_GATE(80A5E408, &lit_11371); +COMPILER_STRIP_GATE(0x80A5E408, &lit_11371); #pragma pop /* 80A5E40C-80A5E410 000510 0004+00 0/0 0/0 0/0 .rodata @11372 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_11372 = 3458.0f; -COMPILER_STRIP_GATE(80A5E40C, &lit_11372); +COMPILER_STRIP_GATE(0x80A5E40C, &lit_11372); #pragma pop /* 80A5E410-80A5E414 000514 0004+00 0/0 0/0 0/0 .rodata @11373 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_11373 = 440.0f; -COMPILER_STRIP_GATE(80A5E410, &lit_11373); +COMPILER_STRIP_GATE(0x80A5E410, &lit_11373); #pragma pop /* 80A5E414-80A5E418 000518 0004+00 0/0 0/0 0/0 .rodata @11374 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_11374 = 6836.0f; -COMPILER_STRIP_GATE(80A5E414, &lit_11374); +COMPILER_STRIP_GATE(0x80A5E414, &lit_11374); #pragma pop /* 80A5E418-80A5E41C 00051C 0004+00 0/0 0/0 0/0 .rodata @11375 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_11375 = 3585.0f; -COMPILER_STRIP_GATE(80A5E418, &lit_11375); +COMPILER_STRIP_GATE(0x80A5E418, &lit_11375); #pragma pop /* 80A5E41C-80A5E420 000520 0004+00 0/0 0/0 0/0 .rodata @11376 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_11376 = 7025.0f; -COMPILER_STRIP_GATE(80A5E41C, &lit_11376); +COMPILER_STRIP_GATE(0x80A5E41C, &lit_11376); #pragma pop /* 80A5E420-80A5E424 000524 0004+00 0/0 0/0 0/0 .rodata @11377 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_11377 = 3355.0f; -COMPILER_STRIP_GATE(80A5E420, &lit_11377); +COMPILER_STRIP_GATE(0x80A5E420, &lit_11377); #pragma pop /* 80A5E424-80A5E428 000528 0004+00 0/0 0/0 0/0 .rodata @11378 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_11378 = 4500.0f; -COMPILER_STRIP_GATE(80A5E424, &lit_11378); +COMPILER_STRIP_GATE(0x80A5E424, &lit_11378); #pragma pop /* 80A5E428-80A5E42C 00052C 0004+00 0/1 0/0 0/0 .rodata @11581 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_11581 = -5370.0f; -COMPILER_STRIP_GATE(80A5E428, &lit_11581); +COMPILER_STRIP_GATE(0x80A5E428, &lit_11581); #pragma pop /* 80A5E42C-80A5E430 000530 0004+00 0/1 0/0 0/0 .rodata @11582 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_11582 = 3950.0f; -COMPILER_STRIP_GATE(80A5E42C, &lit_11582); +COMPILER_STRIP_GATE(0x80A5E42C, &lit_11582); #pragma pop /* 80A5E430-80A5E434 000534 0004+00 0/1 0/0 0/0 .rodata @11583 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_11583 = -2330.0f; -COMPILER_STRIP_GATE(80A5E430, &lit_11583); +COMPILER_STRIP_GATE(0x80A5E430, &lit_11583); #pragma pop /* 80A5E434-80A5E438 000538 0004+00 0/1 0/0 0/0 .rodata @11584 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_11584 = 65536.0f; -COMPILER_STRIP_GATE(80A5E434, &lit_11584); +COMPILER_STRIP_GATE(0x80A5E434, &lit_11584); +#pragma pop + +/* 80A5E438-80A5E438 00053C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80A5E44A = "Npc_ks"; +SECTION_DEAD static char const* const stringBase_80A5E451 = "D_MN05"; #pragma pop /* 80A5D354-80A5D87C 0144B4 0528+00 1/0 0/0 0/0 .text daNpc_Ks_Create__FP10fopAc_ac_c */ @@ -4850,7 +4869,7 @@ asm void __sinit_d_a_npc_ks_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80A5DAD8 = (void*)__sinit_d_a_npc_ks_cpp; +REGISTER_CTORS(0x80A5DAD8, __sinit_d_a_npc_ks_cpp); #pragma pop /* 80A5DB30-80A5DB38 014C90 0008+00 1/0 0/0 0/0 .text @36@__dt__12dBgS_ObjAcchFv */ @@ -4996,15 +5015,10 @@ asm void cXyz::operator=(cXyz const& param_0) { } #pragma pop -/* 80A5DCD0-80A5DCD8 014E30 0008+00 1/1 0/0 0/0 .text changeDemoParam0__9daPy_py_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daPy_py_c::changeDemoParam0(int param_0) { - nofralloc -#include "asm/rel/d/a/npc/d_a_npc_ks/d_a_npc_ks/changeDemoParam0__9daPy_py_cFi.s" +/* 80A5DCD0-80A5DCD8 -00001 0008+00 0/0 0/0 0/0 .text changeDemoParam0__9daPy_py_cFi */ +void daPy_py_c::changeDemoParam0(int param_0) { + *(u32*)(((u8*)this) + 1548) /* this->field_0x60c */ = (u32)(param_0); } -#pragma pop /* 80A5DCD8-80A5DCEC 014E38 0014+00 1/1 0/0 0/0 .text changeDemoMode__9daPy_py_cFUliis */ #pragma push @@ -5087,15 +5101,10 @@ asm void daMidna_c::checkShadowReturnEnd() const { } #pragma pop -/* 80A5DDC0-80A5DDC8 014F20 0008+00 1/1 0/0 0/0 .text changeDemoMode__9daMidna_cFUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daMidna_c::changeDemoMode(u32 param_0) { - nofralloc -#include "asm/rel/d/a/npc/d_a_npc_ks/d_a_npc_ks/changeDemoMode__9daMidna_cFUl.s" +/* 80A5DDC0-80A5DDC8 -00001 0008+00 0/0 0/0 0/0 .text changeDemoMode__9daMidna_cFUl */ +void daMidna_c::changeDemoMode(u32 param_0) { + *(u32*)(((u8*)this) + 2240) /* this->field_0x8c0 */ = (u32)(param_0); } -#pragma pop /* 80A5DDC8-80A5DDD4 014F28 000C+00 1/1 0/0 0/0 .text changeOriginalDemo__9daMidna_cFv */ #pragma push @@ -5158,15 +5167,10 @@ static asm void dComIfGs_setItem(int param_0, u8 param_1) { } #pragma pop -/* 80A5DE4C-80A5DE54 014FAC 0008+00 1/1 0/0 0/0 .text __ct__10JAISoundIDFUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm JAISoundID::JAISoundID(u32 param_0) { - nofralloc -#include "asm/rel/d/a/npc/d_a_npc_ks/d_a_npc_ks/__ct__10JAISoundIDFUl.s" +/* 80A5DE4C-80A5DE54 -00001 0008+00 0/0 0/0 0/0 .text __ct__10JAISoundIDFUl */ +JAISoundID::JAISoundID(u32 param_0) { + *(u32*)this = (u32)(param_0); } -#pragma pop /* 80A5DE54-80A5DEB8 014FB4 0064+00 1/1 0/0 0/0 .text mDoAud_seStart__FUlPC3VecUlSc */ #pragma push @@ -5360,12 +5364,4 @@ static u8 data_80A5FFC4[4]; static u8 data_80A5FFC8[4]; #pragma pop -/* 80A5E438-80A5E458 00053C 0020+00 3/3 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80A5E438 = "Npc_kst"; -SECTION_DEAD static char const* const stringBase_80A5E440 = " PL IN %d"; -SECTION_DEAD static char const* const stringBase_80A5E44A = "Npc_ks"; -SECTION_DEAD static char const* const stringBase_80A5E451 = "D_MN05"; -#pragma pop +/* 80A5E438-80A5E438 00053C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/npc/d_a_npc_kyury/d_a_npc_kyury.cpp b/rel/d/a/npc/d_a_npc_kyury/d_a_npc_kyury.cpp index b265fa2c506..7fe8df0ba8a 100644 --- a/rel/d/a/npc/d_a_npc_kyury/d_a_npc_kyury.cpp +++ b/rel/d/a/npc/d_a_npc_kyury/d_a_npc_kyury.cpp @@ -15,12 +15,14 @@ struct mDoMtx_stack_c { static u8 now[48]; }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; +struct J3DAnmTransform {}; + +struct J3DModelData {}; + struct Vec {}; struct Z2Creature { @@ -29,8 +31,6 @@ struct Z2Creature { /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -43,6 +43,8 @@ struct fopAc_ac_c { /* 80018C8C */ ~fopAc_ac_c(); }; +struct daNpcT_faceMotionAnmData_c {}; + struct daNpcT_MotionSeqMngr_c { struct sequenceStepData_c {}; @@ -50,14 +52,12 @@ struct daNpcT_MotionSeqMngr_c { /* 80A630D4 */ ~daNpcT_MotionSeqMngr_c(); }; +struct daNpcT_evtData_c {}; + struct daNpcT_motionAnmData_c {}; struct J3DJoint {}; -struct daNpcT_faceMotionAnmData_c {}; - -struct daNpcT_evtData_c {}; - struct daNpc_Kyury_c { /* 80A600CC */ ~daNpc_Kyury_c(); /* 80A60218 */ void create(); @@ -115,6 +115,8 @@ struct dCcD_GObjInf { /* 800840E4 */ ~dCcD_GObjInf(); }; +struct _GXColorS10 {}; + struct J3DModel {}; struct cXyz { @@ -124,8 +126,6 @@ struct cXyz { /* 80A630D0 */ cXyz(); }; -struct _GXColorS10 {}; - struct daNpcT_c { /* 80147FA4 */ void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*); /* 801483F8 */ void loadRes(s8 const*, char const**); @@ -288,13 +288,13 @@ struct dBgS_AcchCir { /* 80A6311C */ ~dBgS_AcchCir(); }; -struct dBgS {}; - struct csXyz { /* 80A62A34 */ ~csXyz(); /* 80A62FD0 */ csXyz(); }; +struct dBgS {}; + struct dBgS_Acch { /* 80075F94 */ ~dBgS_Acch(); /* 800760A0 */ dBgS_Acch(); @@ -635,6 +635,17 @@ extern "C" void __register_global_object(); // /* ############################################################################################## */ +/* 80A639C4-80A639C4 000118 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80A639C4 = ""; +SECTION_DEAD static char const* const stringBase_80A639C5 = "NO_RESPONSE"; +SECTION_DEAD static char const* const stringBase_80A639D1 = "FIRST_CONVERSATION"; +SECTION_DEAD static char const* const stringBase_80A639E4 = "Kyury"; +SECTION_DEAD static char const* const stringBase_80A639EA = "Kyury1"; +SECTION_DEAD static char const* const stringBase_80A639F1 = "CONVERSATION"; +#pragma pop + /* 80A63A14-80A63A20 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -1056,41 +1067,41 @@ SECTION_RODATA u8 const daNpc_Kyury_Param_c::m[140] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A638AC, &daNpc_Kyury_Param_c::m); +COMPILER_STRIP_GATE(0x80A638AC, &daNpc_Kyury_Param_c::m); /* 80A63938-80A6393C 00008C 0004+00 0/1 0/0 0/0 .rodata @4039 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4039 = -200.0f; -COMPILER_STRIP_GATE(80A63938, &lit_4039); +COMPILER_STRIP_GATE(0x80A63938, &lit_4039); #pragma pop /* 80A6393C-80A63940 000090 0004+00 0/1 0/0 0/0 .rodata @4040 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4040 = -100.0f; -COMPILER_STRIP_GATE(80A6393C, &lit_4040); +COMPILER_STRIP_GATE(0x80A6393C, &lit_4040); #pragma pop /* 80A63940-80A63944 000094 0004+00 0/1 0/0 0/0 .rodata @4041 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4041 = 200.0f; -COMPILER_STRIP_GATE(80A63940, &lit_4041); +COMPILER_STRIP_GATE(0x80A63940, &lit_4041); #pragma pop /* 80A63944-80A63948 000098 0004+00 0/1 0/0 0/0 .rodata @4042 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4042 = 300.0f; -COMPILER_STRIP_GATE(80A63944, &lit_4042); +COMPILER_STRIP_GATE(0x80A63944, &lit_4042); #pragma pop /* 80A63948-80A6394C 00009C 0004+00 0/1 0/0 0/0 .rodata @4043 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4043 = -1000000000.0f; -COMPILER_STRIP_GATE(80A63948, &lit_4043); +COMPILER_STRIP_GATE(0x80A63948, &lit_4043); #pragma pop /* 80A60218-80A604E4 000238 02CC+00 1/1 0/0 0/0 .text create__13daNpc_Kyury_cFv */ @@ -1111,20 +1122,20 @@ SECTION_RODATA static u8 const lit_4205[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A6394C, &lit_4205); +COMPILER_STRIP_GATE(0x80A6394C, &lit_4205); /* 80A63950-80A63954 0000A4 0004+00 0/2 0/0 0/0 .rodata @4206 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4206 = 65536.0f; -COMPILER_STRIP_GATE(80A63950, &lit_4206); +COMPILER_STRIP_GATE(0x80A63950, &lit_4206); #pragma pop /* 80A63954-80A63958 0000A8 0004+00 0/3 0/0 0/0 .rodata @4207 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4207 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(80A63954, &lit_4207); +COMPILER_STRIP_GATE(0x80A63954, &lit_4207); #pragma pop /* 80A63958-80A63960 0000AC 0008+00 0/1 0/0 0/0 .rodata bmdTypeList$4317 */ @@ -1133,12 +1144,12 @@ COMPILER_STRIP_GATE(80A63954, &lit_4207); SECTION_RODATA static u8 const bmdTypeList[8] = { 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, }; -COMPILER_STRIP_GATE(80A63958, &bmdTypeList); +COMPILER_STRIP_GATE(0x80A63958, &bmdTypeList); #pragma pop /* 80A63960-80A63964 0000B4 0004+00 1/4 0/0 0/0 .rodata @4370 */ SECTION_RODATA static f32 const lit_4370 = 1.0f; -COMPILER_STRIP_GATE(80A63960, &lit_4370); +COMPILER_STRIP_GATE(0x80A63960, &lit_4370); /* 80A604E4-80A607EC 000504 0308+00 1/1 0/0 0/0 .text CreateHeap__13daNpc_Kyury_cFv */ #pragma push @@ -1273,7 +1284,7 @@ asm void daNpc_Kyury_c::Execute() { /* ############################################################################################## */ /* 80A63964-80A63968 0000B8 0004+00 1/1 0/0 0/0 .rodata @4419 */ SECTION_RODATA static f32 const lit_4419 = 100.0f; -COMPILER_STRIP_GATE(80A63964, &lit_4419); +COMPILER_STRIP_GATE(0x80A63964, &lit_4419); /* 80A609FC-80A60A90 000A1C 0094+00 1/1 0/0 0/0 .text Draw__13daNpc_Kyury_cFv */ #pragma push @@ -1371,7 +1382,7 @@ asm void daNpc_Kyury_c::checkChangeEvt() { /* ############################################################################################## */ /* 80A63968-80A6396C 0000BC 0004+00 1/3 0/0 0/0 .rodata @4581 */ SECTION_RODATA static f32 const lit_4581 = -1.0f; -COMPILER_STRIP_GATE(80A63968, &lit_4581); +COMPILER_STRIP_GATE(0x80A63968, &lit_4581); /* 80A60FB0-80A61060 000FD0 00B0+00 1/0 0/0 0/0 .text setAfterTalkMotion__13daNpc_Kyury_cFv */ #pragma push @@ -1438,28 +1449,28 @@ asm void daNpc_Kyury_c::beforeMove() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4734 = 10.0f; -COMPILER_STRIP_GATE(80A6396C, &lit_4734); +COMPILER_STRIP_GATE(0x80A6396C, &lit_4734); #pragma pop /* 80A63970-80A63974 0000C4 0004+00 0/1 0/0 0/0 .rodata @4735 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4735 = 30.0f; -COMPILER_STRIP_GATE(80A63970, &lit_4735); +COMPILER_STRIP_GATE(0x80A63970, &lit_4735); #pragma pop /* 80A63974-80A63978 0000C8 0004+00 0/1 0/0 0/0 .rodata @4736 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4736 = 0x38C90FDB; -COMPILER_STRIP_GATE(80A63974, &lit_4736); +COMPILER_STRIP_GATE(0x80A63974, &lit_4736); #pragma pop /* 80A63978-80A6397C 0000CC 0004+00 0/1 0/0 0/0 .rodata @4737 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4737 = 14.0f; -COMPILER_STRIP_GATE(80A63978, &lit_4737); +COMPILER_STRIP_GATE(0x80A63978, &lit_4737); #pragma pop /* 80A6397C-80A63984 0000D0 0004+04 0/1 0/0 0/0 .rodata @4738 */ @@ -1470,14 +1481,14 @@ SECTION_RODATA static f32 const lit_4738[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80A6397C, &lit_4738); +COMPILER_STRIP_GATE(0x80A6397C, &lit_4738); #pragma pop /* 80A63984-80A6398C 0000D8 0008+00 1/3 0/0 0/0 .rodata @4740 */ SECTION_RODATA static u8 const lit_4740[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A63984, &lit_4740); +COMPILER_STRIP_GATE(0x80A63984, &lit_4740); /* 80A613E8-80A61730 001408 0348+00 1/0 0/0 0/0 .text setAttnPos__13daNpc_Kyury_cFv */ #pragma push @@ -1496,7 +1507,7 @@ asm void daNpc_Kyury_c::setAttnPos() { SECTION_RODATA static u8 const lit_4798[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A6398C, &lit_4798); +COMPILER_STRIP_GATE(0x80A6398C, &lit_4798); #pragma pop /* 80A63994-80A6399C 0000E8 0008+00 0/1 0/0 0/0 .rodata @4799 */ @@ -1505,7 +1516,7 @@ COMPILER_STRIP_GATE(80A6398C, &lit_4798); SECTION_RODATA static u8 const lit_4799[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A63994, &lit_4799); +COMPILER_STRIP_GATE(0x80A63994, &lit_4799); #pragma pop /* 80A6399C-80A639A4 0000F0 0008+00 0/1 0/0 0/0 .rodata @4800 */ @@ -1514,12 +1525,12 @@ COMPILER_STRIP_GATE(80A63994, &lit_4799); SECTION_RODATA static u8 const lit_4800[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A6399C, &lit_4800); +COMPILER_STRIP_GATE(0x80A6399C, &lit_4800); #pragma pop /* 80A639A4-80A639A8 0000F8 0004+00 1/1 0/0 0/0 .rodata @4843 */ SECTION_RODATA static f32 const lit_4843 = -10.0f; -COMPILER_STRIP_GATE(80A639A4, &lit_4843); +COMPILER_STRIP_GATE(0x80A639A4, &lit_4843); /* 80A61730-80A618A8 001750 0178+00 1/0 0/0 0/0 .text setCollision__13daNpc_Kyury_cFv */ #pragma push @@ -1541,7 +1552,7 @@ bool daNpc_Kyury_c::drawDbgInfo() { SECTION_RODATA static u8 const jointNo[8] = { 0x00, 0x00, 0x00, 0x13, 0x00, 0x00, 0x00, 0x0E, }; -COMPILER_STRIP_GATE(80A639A8, &jointNo); +COMPILER_STRIP_GATE(0x80A639A8, &jointNo); /* 80A618B0-80A619B8 0018D0 0108+00 1/0 0/0 0/0 .text drawOtherMdl__13daNpc_Kyury_cFv */ #pragma push @@ -1568,7 +1579,7 @@ asm void daNpc_Kyury_c::selectAction() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpc_Kyury_c::chkAction(int (daNpc_Kyury_c::*)(void*)) { +asm void daNpc_Kyury_c::chkAction(int (daNpc_Kyury_c::*param_0)(void*)) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_kyury/d_a_npc_kyury/chkAction__13daNpc_Kyury_cFM13daNpc_Kyury_cFPCvPvPv_i.s" } @@ -1579,7 +1590,7 @@ asm void daNpc_Kyury_c::chkAction(int (daNpc_Kyury_c::*)(void*)) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpc_Kyury_c::setAction(int (daNpc_Kyury_c::*)(void*)) { +asm void daNpc_Kyury_c::setAction(int (daNpc_Kyury_c::*param_0)(void*)) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_kyury/d_a_npc_kyury/setAction__13daNpc_Kyury_cFM13daNpc_Kyury_cFPCvPvPv_i.s" } @@ -1592,7 +1603,16 @@ asm void daNpc_Kyury_c::setAction(int (daNpc_Kyury_c::*)(void*)) { SECTION_RODATA static u8 const lit_4934[12] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, }; -COMPILER_STRIP_GATE(80A639B0, &lit_4934); +COMPILER_STRIP_GATE(0x80A639B0, &lit_4934); +#pragma pop + +/* 80A639C4-80A639C4 000118 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80A639FE = "prm"; +SECTION_DEAD static char const* const stringBase_80A63A02 = "msgNo"; +SECTION_DEAD static char const* const stringBase_80A63A08 = "msgNo2"; +SECTION_DEAD static char const* const stringBase_80A63A0F = "send"; #pragma pop /* 80A61AD4-80A61ED0 001AF4 03FC+00 1/0 0/0 0/0 .text cutConversation__13daNpc_Kyury_cFi @@ -1611,14 +1631,14 @@ asm void daNpc_Kyury_c::cutConversation(int param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5155 = 120.0f; -COMPILER_STRIP_GATE(80A639BC, &lit_5155); +COMPILER_STRIP_GATE(0x80A639BC, &lit_5155); #pragma pop /* 80A639C0-80A639C4 000114 0004+00 0/1 0/0 0/0 .rodata @5156 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5156 = 50.0f; -COMPILER_STRIP_GATE(80A639C0, &lit_5156); +COMPILER_STRIP_GATE(0x80A639C0, &lit_5156); #pragma pop /* 80A61ED0-80A62370 001EF0 04A0+00 1/0 0/0 0/0 .text wait__13daNpc_Kyury_cFPv */ @@ -2029,7 +2049,7 @@ asm void __sinit_d_a_npc_kyury_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80A63698 = (void*)__sinit_d_a_npc_kyury_cpp; +REGISTER_CTORS(0x80A63698, __sinit_d_a_npc_kyury_cpp); #pragma pop /* 80A63720-80A63800 003740 00E0+00 1/1 0/0 0/0 .text @@ -2123,18 +2143,4 @@ static asm void func_80A63890() { } #pragma pop -/* 80A639C4-80A63A14 000118 0050+00 5/2 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80A639C4 = ""; -SECTION_DEAD static char const* const stringBase_80A639C5 = "NO_RESPONSE"; -SECTION_DEAD static char const* const stringBase_80A639D1 = "FIRST_CONVERSATION"; -SECTION_DEAD static char const* const stringBase_80A639E4 = "Kyury"; -SECTION_DEAD static char const* const stringBase_80A639EA = "Kyury1"; -SECTION_DEAD static char const* const stringBase_80A639F1 = "CONVERSATION"; -SECTION_DEAD static char const* const stringBase_80A639FE = "prm"; -SECTION_DEAD static char const* const stringBase_80A63A02 = "msgNo"; -SECTION_DEAD static char const* const stringBase_80A63A08 = "msgNo2"; -SECTION_DEAD static char const* const stringBase_80A63A0F = "send"; -#pragma pop +/* 80A639C4-80A639C4 000118 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/npc/d_a_npc_len/d_a_npc_len.cpp b/rel/d/a/npc/d_a_npc_len/d_a_npc_len.cpp index 2763c6381e3..fac7ae5f645 100644 --- a/rel/d/a/npc/d_a_npc_len/d_a_npc_len.cpp +++ b/rel/d/a/npc/d_a_npc_len/d_a_npc_len.cpp @@ -15,12 +15,14 @@ struct mDoMtx_stack_c { static u8 now[48]; }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; +struct J3DAnmTransform {}; + +struct J3DModelData {}; + struct Vec {}; struct Z2Creature { @@ -29,8 +31,6 @@ struct Z2Creature { /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -47,6 +47,8 @@ struct daPy_py_c { /* 8015F424 */ void checkNowWolfEyeUp(); }; +struct daNpcT_faceMotionAnmData_c {}; + struct daNpcT_MotionSeqMngr_c { struct sequenceStepData_c {}; @@ -54,14 +56,12 @@ struct daNpcT_MotionSeqMngr_c { /* 80A68604 */ ~daNpcT_MotionSeqMngr_c(); }; +struct daNpcT_evtData_c {}; + struct daNpcT_motionAnmData_c {}; struct J3DJoint {}; -struct daNpcT_faceMotionAnmData_c {}; - -struct daNpcT_evtData_c {}; - struct daNpc_Len_c { /* 80A6432C */ ~daNpc_Len_c(); /* 80A64478 */ void create(); @@ -126,6 +126,13 @@ struct dCcD_GObjInf { /* 800844F8 */ void GetTgHitObj(); }; +struct csXyz { + /* 80A67F64 */ ~csXyz(); + /* 80A68500 */ csXyz(); +}; + +struct _GXColorS10 {}; + struct J3DModel {}; struct cXyz { @@ -135,13 +142,6 @@ struct cXyz { /* 80A68600 */ cXyz(); }; -struct _GXColorS10 {}; - -struct csXyz { - /* 80A67F64 */ ~csXyz(); - /* 80A68500 */ csXyz(); -}; - struct daNpcT_c { /* 80147FA4 */ void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*); /* 801483F8 */ void loadRes(s8 const*, char const**); @@ -478,8 +478,8 @@ extern "C" void changeAnm__8daNpcT_cFPiPi(); extern "C" void changeBck__8daNpcT_cFPiPi(); extern "C" void changeBtp__8daNpcT_cFPiPi(); extern "C" void changeBtk__8daNpcT_cFPiPi(); -extern "C" void func_80A68BB4(int*); -extern "C" void func_80A68BD0(int, int); +extern "C" void func_80A68BB4(void* _this, int*); +extern "C" void func_80A68BD0(void* _this, int, int); extern "C" void __sinit_d_a_npc_len_cpp(); extern "C" void __ct__11daNpc_Len_cFPC26daNpcT_faceMotionAnmData_cPC22daNpcT_motionAnmData_cPCQ222daNpcT_MotionSeqMngr_c18sequenceStepData_ciPCQ222daNpcT_MotionSeqMngr_c18sequenceStepData_ciPC16daNpcT_evtData_cPPc(); @@ -673,6 +673,23 @@ extern "C" void __register_global_object(); // /* ############################################################################################## */ +/* 80A68FDC-80A68FDC 000138 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80A68FDC = ""; +SECTION_DEAD static char const* const stringBase_80A68FDD = "DEFAULT_GETITEM"; +SECTION_DEAD static char const* const stringBase_80A68FED = "NO_RESPONSE"; +SECTION_DEAD static char const* const stringBase_80A68FF9 = "DEMO13_STB"; +SECTION_DEAD static char const* const stringBase_80A69004 = "HURRY"; +SECTION_DEAD static char const* const stringBase_80A6900A = "CONVERSATION_IN_HOTEL1"; +SECTION_DEAD static char const* const stringBase_80A69021 = "CONVERSATION_IN_HOTEL2"; +SECTION_DEAD static char const* const stringBase_80A69038 = "Len"; +SECTION_DEAD static char const* const stringBase_80A6903C = "Len_TW"; +SECTION_DEAD static char const* const stringBase_80A69043 = "Len1"; +SECTION_DEAD static char const* const stringBase_80A69048 = "CONVERSATION_IN_HOTEL"; +SECTION_DEAD static char const* const stringBase_80A6905E = "TAKE_WOODSTATUE"; +#pragma pop + /* 80A69088-80A69094 000000 000C+00 2/2 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -1182,7 +1199,7 @@ SECTION_RODATA u8 const daNpc_Len_Param_c::m[148] = { 0xC1, 0xA0, 0x00, 0x00, 0x41, 0xA0, 0x00, 0x00, 0x42, 0x48, 0x00, 0x00, 0x41, 0xA0, 0x00, 0x00, 0x42, 0xC8, 0x00, 0x00, 0x01, 0x68, 0x00, 0xB4, 0x40, 0x40, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A68EA4, &daNpc_Len_Param_c::m); +COMPILER_STRIP_GATE(0x80A68EA4, &daNpc_Len_Param_c::m); /* 80A68F38-80A68F60 000094 0028+00 0/1 0/0 0/0 .rodata heapSize$4002 */ #pragma push @@ -1192,35 +1209,35 @@ SECTION_RODATA static u8 const heapSize[40] = { 0x43, 0x80, 0x00, 0x00, 0x43, 0x80, 0x00, 0x00, 0x43, 0x80, 0x00, 0x00, 0x43, 0x80, 0x00, 0x00, 0x43, 0x80, 0x00, 0x00, 0x43, 0x80, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A68F38, &heapSize); +COMPILER_STRIP_GATE(0x80A68F38, &heapSize); #pragma pop /* 80A68F60-80A68F64 0000BC 0004+00 0/1 0/0 0/0 .rodata @4068 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4068 = -200.0f; -COMPILER_STRIP_GATE(80A68F60, &lit_4068); +COMPILER_STRIP_GATE(0x80A68F60, &lit_4068); #pragma pop /* 80A68F64-80A68F68 0000C0 0004+00 0/1 0/0 0/0 .rodata @4069 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4069 = -100.0f; -COMPILER_STRIP_GATE(80A68F64, &lit_4069); +COMPILER_STRIP_GATE(0x80A68F64, &lit_4069); #pragma pop /* 80A68F68-80A68F6C 0000C4 0004+00 0/1 0/0 0/0 .rodata @4070 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4070 = 200.0f; -COMPILER_STRIP_GATE(80A68F68, &lit_4070); +COMPILER_STRIP_GATE(0x80A68F68, &lit_4070); #pragma pop /* 80A68F6C-80A68F70 0000C8 0004+00 0/1 0/0 0/0 .rodata @4071 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4071 = 300.0f; -COMPILER_STRIP_GATE(80A68F6C, &lit_4071); +COMPILER_STRIP_GATE(0x80A68F6C, &lit_4071); #pragma pop /* 80A68F70-80A68F74 0000CC 0004+00 6/14 0/0 0/0 .rodata @4072 */ @@ -1230,13 +1247,13 @@ SECTION_RODATA static u8 const lit_4072[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A68F70, &lit_4072); +COMPILER_STRIP_GATE(0x80A68F70, &lit_4072); /* 80A68F74-80A68F78 0000D0 0004+00 0/1 0/0 0/0 .rodata @4073 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4073 = -1000000000.0f; -COMPILER_STRIP_GATE(80A68F74, &lit_4073); +COMPILER_STRIP_GATE(0x80A68F74, &lit_4073); #pragma pop /* 80A64478-80A64740 000238 02C8+00 1/1 0/0 0/0 .text create__11daNpc_Len_cFv */ @@ -1254,19 +1271,19 @@ asm void daNpc_Len_c::create() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4235 = 65536.0f; -COMPILER_STRIP_GATE(80A68F78, &lit_4235); +COMPILER_STRIP_GATE(0x80A68F78, &lit_4235); #pragma pop /* 80A68F7C-80A68F80 0000D8 0004+00 0/3 0/0 0/0 .rodata @4236 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4236 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(80A68F7C, &lit_4236); +COMPILER_STRIP_GATE(0x80A68F7C, &lit_4236); #pragma pop /* 80A68F80-80A68F84 0000DC 0004+00 3/5 0/0 0/0 .rodata @4388 */ SECTION_RODATA static f32 const lit_4388 = 1.0f; -COMPILER_STRIP_GATE(80A68F80, &lit_4388); +COMPILER_STRIP_GATE(0x80A68F80, &lit_4388); /* 80A64740-80A64A24 000500 02E4+00 1/1 0/0 0/0 .text CreateHeap__11daNpc_Len_cFv */ #pragma push @@ -1401,7 +1418,7 @@ asm void daNpc_Len_c::Execute() { /* ############################################################################################## */ /* 80A68F84-80A68F88 0000E0 0004+00 1/1 0/0 0/0 .rodata @4437 */ SECTION_RODATA static f32 const lit_4437 = 100.0f; -COMPILER_STRIP_GATE(80A68F84, &lit_4437); +COMPILER_STRIP_GATE(0x80A68F84, &lit_4437); /* 80A64C34-80A64CC8 0009F4 0094+00 1/1 0/0 0/0 .text Draw__11daNpc_Len_cFv */ #pragma push @@ -1468,13 +1485,13 @@ asm void daNpc_Len_c::reset() { /* ############################################################################################## */ /* 80A68F88-80A68F8C 0000E4 0004+00 1/1 0/0 0/0 .rodata @4585 */ SECTION_RODATA static f32 const lit_4585 = 3.0f / 5.0f; -COMPILER_STRIP_GATE(80A68F88, &lit_4585); +COMPILER_STRIP_GATE(0x80A68F88, &lit_4585); /* 80A68F8C-80A68F94 0000E8 0008+00 3/5 0/0 0/0 .rodata @4587 */ SECTION_RODATA static u8 const lit_4587[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A68F8C, &lit_4587); +COMPILER_STRIP_GATE(0x80A68F8C, &lit_4587); /* 80A6516C-80A65278 000F2C 010C+00 1/0 0/0 0/0 .text afterJntAnm__11daNpc_Len_cFi */ #pragma push @@ -1489,7 +1506,7 @@ asm void daNpc_Len_c::afterJntAnm(int param_0) { /* ############################################################################################## */ /* 80A68F94-80A68F98 0000F0 0004+00 1/1 0/0 0/0 .rodata @4637 */ SECTION_RODATA static f32 const lit_4637 = 160.0f; -COMPILER_STRIP_GATE(80A68F94, &lit_4637); +COMPILER_STRIP_GATE(0x80A68F94, &lit_4637); /* 80A65278-80A6546C 001038 01F4+00 1/0 0/0 0/0 .text setParam__11daNpc_Len_cFv */ #pragma push @@ -1514,7 +1531,7 @@ asm void daNpc_Len_c::checkChangeEvt() { /* ############################################################################################## */ /* 80A68F98-80A68F9C 0000F4 0004+00 3/6 0/0 0/0 .rodata @4695 */ SECTION_RODATA static f32 const lit_4695 = -1.0f; -COMPILER_STRIP_GATE(80A68F98, &lit_4695); +COMPILER_STRIP_GATE(0x80A68F98, &lit_4695); /* 80A6556C-80A65624 00132C 00B8+00 2/0 0/0 0/0 .text setAfterTalkMotion__11daNpc_Len_cFv */ @@ -1582,28 +1599,28 @@ asm void daNpc_Len_c::beforeMove() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4885 = -30.0f; -COMPILER_STRIP_GATE(80A68F9C, &lit_4885); +COMPILER_STRIP_GATE(0x80A68F9C, &lit_4885); #pragma pop /* 80A68FA0-80A68FA4 0000FC 0004+00 0/1 0/0 0/0 .rodata @4886 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4886 = 15.0f; -COMPILER_STRIP_GATE(80A68FA0, &lit_4886); +COMPILER_STRIP_GATE(0x80A68FA0, &lit_4886); #pragma pop /* 80A68FA4-80A68FA8 000100 0004+00 0/1 0/0 0/0 .rodata @4887 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4887 = 0x38C90FDB; -COMPILER_STRIP_GATE(80A68FA4, &lit_4887); +COMPILER_STRIP_GATE(0x80A68FA4, &lit_4887); #pragma pop /* 80A68FA8-80A68FAC 000104 0004+00 0/1 0/0 0/0 .rodata @4888 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4888 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(80A68FA8, &lit_4888); +COMPILER_STRIP_GATE(0x80A68FA8, &lit_4888); #pragma pop /* 80A68FAC-80A68FB4 000108 0004+04 0/1 0/0 0/0 .rodata @4889 */ @@ -1614,7 +1631,7 @@ SECTION_RODATA static f32 const lit_4889[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80A68FAC, &lit_4889); +COMPILER_STRIP_GATE(0x80A68FAC, &lit_4889); #pragma pop /* 80A65B24-80A65E28 0018E4 0304+00 1/0 0/0 0/0 .text setAttnPos__11daNpc_Len_cFv */ @@ -1657,7 +1674,7 @@ asm void daNpc_Len_c::selectAction() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpc_Len_c::chkAction(int (daNpc_Len_c::*)(void*)) { +asm void daNpc_Len_c::chkAction(int (daNpc_Len_c::*param_0)(void*)) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_len/d_a_npc_len/chkAction__11daNpc_Len_cFM11daNpc_Len_cFPCvPvPv_i.s" } @@ -1668,12 +1685,19 @@ asm void daNpc_Len_c::chkAction(int (daNpc_Len_c::*)(void*)) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpc_Len_c::setAction(int (daNpc_Len_c::*)(void*)) { +asm void daNpc_Len_c::setAction(int (daNpc_Len_c::*param_0)(void*)) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_len/d_a_npc_len/setAction__11daNpc_Len_cFM11daNpc_Len_cFPCvPvPv_i.s" } #pragma pop +/* ############################################################################################## */ +/* 80A68FDC-80A68FDC 000138 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80A6906E = "R_SP109"; +#pragma pop + /* 80A660D8-80A661B4 001E98 00DC+00 1/1 0/0 6/6 .text * checkStartDemo13StbEvt__11daNpc_Len_cFP10fopAc_ac_cfffffff */ #pragma push @@ -1694,7 +1718,7 @@ asm void daNpc_Len_c::checkStartDemo13StbEvt(fopAc_ac_c* param_0, f32 param_1, f SECTION_RODATA static u8 const lit_4948[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A68FB4, &lit_4948); +COMPILER_STRIP_GATE(0x80A68FB4, &lit_4948); #pragma pop /* 80A68FBC-80A68FC4 000118 0008+00 0/1 0/0 0/0 .rodata @4949 */ @@ -1703,7 +1727,7 @@ COMPILER_STRIP_GATE(80A68FB4, &lit_4948); SECTION_RODATA static u8 const lit_4949[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A68FBC, &lit_4949); +COMPILER_STRIP_GATE(0x80A68FBC, &lit_4949); #pragma pop /* 80A68FC4-80A68FCC 000120 0008+00 0/1 0/0 0/0 .rodata @4950 */ @@ -1712,7 +1736,7 @@ COMPILER_STRIP_GATE(80A68FBC, &lit_4949); SECTION_RODATA static u8 const lit_4950[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A68FC4, &lit_4950); +COMPILER_STRIP_GATE(0x80A68FC4, &lit_4950); #pragma pop /* 80A68FCC-80A68FD4 000128 0008+00 0/1 0/0 0/0 .rodata @5048 */ @@ -1721,14 +1745,22 @@ COMPILER_STRIP_GATE(80A68FC4, &lit_4950); SECTION_RODATA static u8 const lit_5048[8] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, }; -COMPILER_STRIP_GATE(80A68FCC, &lit_5048); +COMPILER_STRIP_GATE(0x80A68FCC, &lit_5048); #pragma pop /* 80A68FD4-80A68FD8 000130 0004+00 0/1 0/0 0/0 .rodata @5151 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5151 = -40.0f; -COMPILER_STRIP_GATE(80A68FD4, &lit_5151); +COMPILER_STRIP_GATE(0x80A68FD4, &lit_5151); +#pragma pop + +/* 80A68FDC-80A68FDC 000138 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80A69076 = "prm"; +SECTION_DEAD static char const* const stringBase_80A6907A = "timer"; +SECTION_DEAD static char const* const stringBase_80A69080 = "msgNo"; #pragma pop /* 80A661B4-80A66664 001F74 04B0+00 1/0 0/0 0/0 .text cutConversationInHotel__11daNpc_Len_cFi */ @@ -1777,7 +1809,7 @@ asm void daNpc_Len_c::wait(void* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5702 = 11.0f / 20.0f; -COMPILER_STRIP_GATE(80A68FD8, &lit_5702); +COMPILER_STRIP_GATE(0x80A68FD8, &lit_5702); #pragma pop /* 80A6736C-80A67794 00312C 0428+00 1/0 0/0 0/0 .text patrol__11daNpc_Len_cFPv */ @@ -2156,7 +2188,7 @@ void daNpcT_c::changeBtk(int* param_0, int* param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80A68BB4(int* param_0) { +extern "C" asm void func_80A68BB4(void* _this, int* param_0) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_len/d_a_npc_len/func_80A68BB4.s" } @@ -2166,7 +2198,7 @@ extern "C" asm void func_80A68BB4(int* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80A68BD0(int param_0, int param_1) { +extern "C" asm void func_80A68BD0(void* _this, int param_0, int param_1) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_len/d_a_npc_len/func_80A68BD0.s" } @@ -2198,7 +2230,7 @@ asm void __sinit_d_a_npc_len_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80A68C4C = (void*)__sinit_d_a_npc_len_cpp; +REGISTER_CTORS(0x80A68C4C, __sinit_d_a_npc_len_cpp); #pragma pop /* 80A68D00-80A68DE0 004AC0 00E0+00 1/1 0/0 0/0 .text @@ -2305,24 +2337,4 @@ static asm void func_80A68E88() { } #pragma pop -/* 80A68FDC-80A69086 000138 00AA+00 8/5 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80A68FDC = ""; -SECTION_DEAD static char const* const stringBase_80A68FDD = "DEFAULT_GETITEM"; -SECTION_DEAD static char const* const stringBase_80A68FED = "NO_RESPONSE"; -SECTION_DEAD static char const* const stringBase_80A68FF9 = "DEMO13_STB"; -SECTION_DEAD static char const* const stringBase_80A69004 = "HURRY"; -SECTION_DEAD static char const* const stringBase_80A6900A = "CONVERSATION_IN_HOTEL1"; -SECTION_DEAD static char const* const stringBase_80A69021 = "CONVERSATION_IN_HOTEL2"; -SECTION_DEAD static char const* const stringBase_80A69038 = "Len"; -SECTION_DEAD static char const* const stringBase_80A6903C = "Len_TW"; -SECTION_DEAD static char const* const stringBase_80A69043 = "Len1"; -SECTION_DEAD static char const* const stringBase_80A69048 = "CONVERSATION_IN_HOTEL"; -SECTION_DEAD static char const* const stringBase_80A6905E = "TAKE_WOODSTATUE"; -SECTION_DEAD static char const* const stringBase_80A6906E = "R_SP109"; -SECTION_DEAD static char const* const stringBase_80A69076 = "prm"; -SECTION_DEAD static char const* const stringBase_80A6907A = "timer"; -SECTION_DEAD static char const* const stringBase_80A69080 = "msgNo"; -#pragma pop +/* 80A68FDC-80A68FDC 000138 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/npc/d_a_npc_lf/d_a_npc_lf.cpp b/rel/d/a/npc/d_a_npc_lf/d_a_npc_lf.cpp index eda2cf3b130..ff3d5746b44 100644 --- a/rel/d/a/npc/d_a_npc_lf/d_a_npc_lf.cpp +++ b/rel/d/a/npc/d_a_npc_lf/d_a_npc_lf.cpp @@ -144,31 +144,31 @@ extern "C" void __register_global_object(); /* ############################################################################################## */ /* 80A6A97C-80A6A980 000000 0004+00 4/4 0/0 0/0 .rodata @3769 */ SECTION_RODATA static f32 const lit_3769 = 1.0f; -COMPILER_STRIP_GATE(80A6A97C, &lit_3769); +COMPILER_STRIP_GATE(0x80A6A97C, &lit_3769); /* 80A6A980-80A6A984 000004 0004+00 0/1 0/0 0/0 .rodata @3770 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3770 = 7.0f; -COMPILER_STRIP_GATE(80A6A980, &lit_3770); +COMPILER_STRIP_GATE(0x80A6A980, &lit_3770); #pragma pop /* 80A6A984-80A6A988 000008 0004+00 1/2 0/0 0/0 .rodata @3771 */ SECTION_RODATA static f32 const lit_3771 = 3.0f / 10.0f; -COMPILER_STRIP_GATE(80A6A984, &lit_3771); +COMPILER_STRIP_GATE(0x80A6A984, &lit_3771); /* 80A6A988-80A6A98C 00000C 0004+00 0/2 0/0 0/0 .rodata @3772 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3772 = 3.0f / 5.0f; -COMPILER_STRIP_GATE(80A6A988, &lit_3772); +COMPILER_STRIP_GATE(0x80A6A988, &lit_3772); #pragma pop /* 80A6A98C-80A6A990 000010 0004+00 0/2 0/0 0/0 .rodata @3773 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3773 = 250.0f; -COMPILER_STRIP_GATE(80A6A98C, &lit_3773); +COMPILER_STRIP_GATE(0x80A6A98C, &lit_3773); #pragma pop /* 80A6AA1C-80A6AA28 000000 000C+00 1/1 0/0 0/0 .data wp$3976 */ @@ -240,7 +240,7 @@ static asm void daNPC_LF_Draw(npc_lf_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3861 = 50.0f; -COMPILER_STRIP_GATE(80A6A990, &lit_3861); +COMPILER_STRIP_GATE(0x80A6A990, &lit_3861); #pragma pop /* 80A6A994-80A6A998 000018 0004+00 1/3 0/0 0/0 .rodata @3862 */ @@ -250,13 +250,13 @@ SECTION_RODATA static u8 const lit_3862[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A6A994, &lit_3862); +COMPILER_STRIP_GATE(0x80A6A994, &lit_3862); /* 80A6A998-80A6A99C 00001C 0004+00 0/1 0/0 0/0 .rodata @3947 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3947 = 500.0f; -COMPILER_STRIP_GATE(80A6A998, &lit_3947); +COMPILER_STRIP_GATE(0x80A6A998, &lit_3947); #pragma pop /* 80A6A99C-80A6A9A4 000020 0004+04 0/1 0/0 0/0 .rodata @3948 */ @@ -267,7 +267,7 @@ SECTION_RODATA static f32 const lit_3948[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80A6A99C, &lit_3948); +COMPILER_STRIP_GATE(0x80A6A99C, &lit_3948); #pragma pop /* 80A6A9A4-80A6A9AC 000028 0008+00 0/1 0/0 0/0 .rodata @3949 */ @@ -276,7 +276,7 @@ COMPILER_STRIP_GATE(80A6A99C, &lit_3948); SECTION_RODATA static u8 const lit_3949[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A6A9A4, &lit_3949); +COMPILER_STRIP_GATE(0x80A6A9A4, &lit_3949); #pragma pop /* 80A6A9AC-80A6A9B4 000030 0008+00 0/1 0/0 0/0 .rodata @3950 */ @@ -285,7 +285,7 @@ COMPILER_STRIP_GATE(80A6A9A4, &lit_3949); SECTION_RODATA static u8 const lit_3950[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A6A9AC, &lit_3950); +COMPILER_STRIP_GATE(0x80A6A9AC, &lit_3950); #pragma pop /* 80A6A9B4-80A6A9BC 000038 0008+00 0/1 0/0 0/0 .rodata @3951 */ @@ -294,77 +294,77 @@ COMPILER_STRIP_GATE(80A6A9AC, &lit_3950); SECTION_RODATA static u8 const lit_3951[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A6A9B4, &lit_3951); +COMPILER_STRIP_GATE(0x80A6A9B4, &lit_3951); #pragma pop /* 80A6A9BC-80A6A9C0 000040 0004+00 0/1 0/0 0/0 .rodata @3952 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3952 = 30.0f; -COMPILER_STRIP_GATE(80A6A9BC, &lit_3952); +COMPILER_STRIP_GATE(0x80A6A9BC, &lit_3952); #pragma pop /* 80A6A9C0-80A6A9C4 000044 0004+00 0/2 0/0 0/0 .rodata @3953 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3953 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(80A6A9C0, &lit_3953); +COMPILER_STRIP_GATE(0x80A6A9C0, &lit_3953); #pragma pop /* 80A6A9C4-80A6A9C8 000048 0004+00 0/1 0/0 0/0 .rodata @3954 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3954 = 1.0f / 20.0f; -COMPILER_STRIP_GATE(80A6A9C4, &lit_3954); +COMPILER_STRIP_GATE(0x80A6A9C4, &lit_3954); #pragma pop /* 80A6A9C8-80A6A9CC 00004C 0004+00 0/1 0/0 0/0 .rodata @3955 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3955 = 10.0f; -COMPILER_STRIP_GATE(80A6A9C8, &lit_3955); +COMPILER_STRIP_GATE(0x80A6A9C8, &lit_3955); #pragma pop /* 80A6A9CC-80A6A9D0 000050 0004+00 0/2 0/0 0/0 .rodata @3956 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3956 = 0.5f; -COMPILER_STRIP_GATE(80A6A9CC, &lit_3956); +COMPILER_STRIP_GATE(0x80A6A9CC, &lit_3956); #pragma pop /* 80A6A9D0-80A6A9D4 000054 0004+00 0/1 0/0 0/0 .rodata @3957 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3957 = 20.0f; -COMPILER_STRIP_GATE(80A6A9D0, &lit_3957); +COMPILER_STRIP_GATE(0x80A6A9D0, &lit_3957); #pragma pop /* 80A6A9D4-80A6A9D8 000058 0004+00 0/1 0/0 0/0 .rodata @3958 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3958 = 5.0f; -COMPILER_STRIP_GATE(80A6A9D4, &lit_3958); +COMPILER_STRIP_GATE(0x80A6A9D4, &lit_3958); #pragma pop /* 80A6A9D8-80A6A9DC 00005C 0004+00 0/1 0/0 0/0 .rodata @3959 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3959 = 4000.0f; -COMPILER_STRIP_GATE(80A6A9D8, &lit_3959); +COMPILER_STRIP_GATE(0x80A6A9D8, &lit_3959); #pragma pop /* 80A6A9DC-80A6A9E0 000060 0004+00 0/1 0/0 0/0 .rodata @3960 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3960 = -4000.0f; -COMPILER_STRIP_GATE(80A6A9DC, &lit_3960); +COMPILER_STRIP_GATE(0x80A6A9DC, &lit_3960); #pragma pop /* 80A6A9E0-80A6A9E4 000064 0004+00 0/1 0/0 0/0 .rodata @3961 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3961 = 1000.0f; -COMPILER_STRIP_GATE(80A6A9E0, &lit_3961); +COMPILER_STRIP_GATE(0x80A6A9E0, &lit_3961); #pragma pop /* 80A6A9E4-80A6A9EC 000068 0008+00 0/1 0/0 0/0 .rodata @3963 */ @@ -373,7 +373,7 @@ COMPILER_STRIP_GATE(80A6A9E0, &lit_3961); SECTION_RODATA static u8 const lit_3963[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A6A9E4, &lit_3963); +COMPILER_STRIP_GATE(0x80A6A9E4, &lit_3963); #pragma pop /* 80A6AA90-80A6AA94 000008 0004+00 2/2 0/0 0/0 .bss None */ @@ -401,35 +401,35 @@ static asm void npc_lf_move(fopAc_ac_c* param_0, lf_s* param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4026 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(80A6A9EC, &lit_4026); +COMPILER_STRIP_GATE(0x80A6A9EC, &lit_4026); #pragma pop /* 80A6A9F0-80A6A9F4 000074 0004+00 0/1 0/0 0/0 .rodata @4027 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4027 = 2000.0f; -COMPILER_STRIP_GATE(80A6A9F0, &lit_4027); +COMPILER_STRIP_GATE(0x80A6A9F0, &lit_4027); #pragma pop /* 80A6A9F4-80A6A9F8 000078 0004+00 0/1 0/0 0/0 .rodata @4028 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4028 = 200.0f; -COMPILER_STRIP_GATE(80A6A9F4, &lit_4028); +COMPILER_STRIP_GATE(0x80A6A9F4, &lit_4028); #pragma pop /* 80A6A9F8-80A6A9FC 00007C 0004+00 0/1 0/0 0/0 .rodata @4029 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4029 = 13000.0f; -COMPILER_STRIP_GATE(80A6A9F8, &lit_4029); +COMPILER_STRIP_GATE(0x80A6A9F8, &lit_4029); #pragma pop /* 80A6A9FC-80A6AA00 000080 0004+00 0/1 0/0 0/0 .rodata @4030 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4030 = -3.0f / 10.0f; -COMPILER_STRIP_GATE(80A6A9FC, &lit_4030); +COMPILER_STRIP_GATE(0x80A6A9FC, &lit_4030); #pragma pop /* 80A6A1B8-80A6A420 000738 0268+00 1/1 0/0 0/0 .text action__FP10fopAc_ac_cP4lf_s */ @@ -445,7 +445,7 @@ static asm void action(fopAc_ac_c* param_0, lf_s* param_1) { /* ############################################################################################## */ /* 80A6AA00-80A6AA04 000084 0004+00 1/1 0/0 0/0 .rodata @4060 */ SECTION_RODATA static f32 const lit_4060 = 1500.0f; -COMPILER_STRIP_GATE(80A6AA00, &lit_4060); +COMPILER_STRIP_GATE(0x80A6AA00, &lit_4060); /* 80A6A420-80A6A514 0009A0 00F4+00 2/1 0/0 0/0 .text daNPC_LF_Execute__FP12npc_lf_class */ @@ -464,6 +464,13 @@ static bool daNPC_LF_IsDelete(npc_lf_class* param_0) { return true; } +/* ############################################################################################## */ +/* 80A6AA14-80A6AA14 000098 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80A6AA14 = "NPC_LF"; +#pragma pop + /* 80A6A51C-80A6A570 000A9C 0054+00 1/0 0/0 0/0 .text daNPC_LF_Delete__FP12npc_lf_class */ #pragma push @@ -490,28 +497,28 @@ static asm void useHeapInit(fopAc_ac_c* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4173 = 6457.0f; -COMPILER_STRIP_GATE(80A6AA04, &lit_4173); +COMPILER_STRIP_GATE(0x80A6AA04, &lit_4173); #pragma pop /* 80A6AA08-80A6AA0C 00008C 0004+00 0/1 0/0 0/0 .rodata @4174 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4174 = -5188.0f; -COMPILER_STRIP_GATE(80A6AA08, &lit_4174); +COMPILER_STRIP_GATE(0x80A6AA08, &lit_4174); #pragma pop /* 80A6AA0C-80A6AA10 000090 0004+00 0/1 0/0 0/0 .rodata @4175 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4175 = 300.0f; -COMPILER_STRIP_GATE(80A6AA0C, &lit_4175); +COMPILER_STRIP_GATE(0x80A6AA0C, &lit_4175); #pragma pop /* 80A6AA10-80A6AA14 000094 0004+00 0/1 0/0 0/0 .rodata @4176 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4176 = 65536.0f; -COMPILER_STRIP_GATE(80A6AA10, &lit_4176); +COMPILER_STRIP_GATE(0x80A6AA10, &lit_4176); #pragma pop /* 80A6A650-80A6A8A4 000BD0 0254+00 1/0 0/0 0/0 .text daNPC_LF_Create__FP10fopAc_ac_c */ @@ -561,12 +568,7 @@ asm void __sinit_d_a_npc_lf_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80A6A92C = (void*)__sinit_d_a_npc_lf_cpp; +REGISTER_CTORS(0x80A6A92C, __sinit_d_a_npc_lf_cpp); #pragma pop -/* 80A6AA14-80A6AA1B 000098 0007+00 3/3 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80A6AA14 = "NPC_LF"; -#pragma pop +/* 80A6AA14-80A6AA14 000098 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/npc/d_a_npc_lud/d_a_npc_lud.cpp b/rel/d/a/npc/d_a_npc_lud/d_a_npc_lud.cpp index 1c36e668830..b85078218ef 100644 --- a/rel/d/a/npc/d_a_npc_lud/d_a_npc_lud.cpp +++ b/rel/d/a/npc/d_a_npc_lud/d_a_npc_lud.cpp @@ -15,12 +15,14 @@ struct mDoMtx_stack_c { static u8 now[48]; }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; +struct J3DAnmTransform {}; + +struct J3DModelData {}; + struct Vec {}; struct Z2Creature { @@ -29,8 +31,6 @@ struct Z2Creature { /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -47,6 +47,8 @@ struct fopAc_ac_c { /* 80018C8C */ ~fopAc_ac_c(); }; +struct daNpcT_faceMotionAnmData_c {}; + struct daNpcT_MotionSeqMngr_c { struct sequenceStepData_c {}; @@ -55,14 +57,12 @@ struct daNpcT_MotionSeqMngr_c { /* 80A6F518 */ ~daNpcT_MotionSeqMngr_c(); }; +struct daNpcT_evtData_c {}; + struct daNpcT_motionAnmData_c {}; struct J3DJoint {}; -struct daNpcT_faceMotionAnmData_c {}; - -struct daNpcT_evtData_c {}; - struct daNpc_Lud_c { /* 80A6ABAC */ ~daNpc_Lud_c(); /* 80A6ACF4 */ void create(); @@ -136,6 +136,13 @@ struct dCcD_GObjInf { /* 800844F8 */ void GetTgHitObj(); }; +struct csXyz { + /* 80A6EEC0 */ ~csXyz(); + /* 80A6F414 */ csXyz(); +}; + +struct _GXColorS10 {}; + struct J3DModel {}; struct cXyz { @@ -145,13 +152,6 @@ struct cXyz { /* 80A6F514 */ cXyz(); }; -struct _GXColorS10 {}; - -struct csXyz { - /* 80A6EEC0 */ ~csXyz(); - /* 80A6F414 */ csXyz(); -}; - struct daNpcT_c { /* 80147FA4 */ void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*); /* 80148094 */ void getTrnsfrmKeyAnmP(char const*, int); @@ -501,7 +501,7 @@ extern "C" void changeAnm__8daNpcT_cFPiPi(); extern "C" void changeBck__8daNpcT_cFPiPi(); extern "C" void changeBtp__8daNpcT_cFPiPi(); extern "C" void changeBtk__8daNpcT_cFPiPi(); -extern "C" void func_80A6FAD4(int*); +extern "C" void func_80A6FAD4(void* _this, int*); extern "C" void __sinit_d_a_npc_lud_cpp(); extern "C" void __ct__11daNpc_Lud_cFPC26daNpcT_faceMotionAnmData_cPC22daNpcT_motionAnmData_cPCQ222daNpcT_MotionSeqMngr_c18sequenceStepData_ciPCQ222daNpcT_MotionSeqMngr_c18sequenceStepData_ciPC16daNpcT_evtData_cPPc(); @@ -688,6 +688,27 @@ extern "C" void __register_global_object(); // /* ############################################################################################## */ +/* 80A6FECC-80A6FECC 000150 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80A6FECC = ""; +SECTION_DEAD static char const* const stringBase_80A6FECD = "NO_RESPONSE"; +SECTION_DEAD static char const* const stringBase_80A6FED9 = "DEMO13_STB"; +SECTION_DEAD static char const* const stringBase_80A6FEE4 = "CONVERSATION_ABOUT_GORON"; +SECTION_DEAD static char const* const stringBase_80A6FEFD = "NURSE"; +SECTION_DEAD static char const* const stringBase_80A6FF03 = "GO_AHEAD"; +SECTION_DEAD static char const* const stringBase_80A6FF0C = "Lud"; +SECTION_DEAD static char const* const stringBase_80A6FF10 = "Lud_TW"; +SECTION_DEAD static char const* const stringBase_80A6FF17 = "Lud1"; +SECTION_DEAD static char const* const stringBase_80A6FF1C = "Lud2"; +SECTION_DEAD static char const* const stringBase_80A6FF21 = "Len1"; +SECTION_DEAD static char const* const stringBase_80A6FF26 = "HURRY"; +SECTION_DEAD static char const* const stringBase_80A6FF2C = "CONVERSATION_IN_HOTEL"; +SECTION_DEAD static char const* const stringBase_80A6FF42 = "CONVERSATION_ABOUT_DEATHMT"; +SECTION_DEAD static char const* const stringBase_80A6FF5D = "CLOTH_TRY"; +SECTION_DEAD static char const* const stringBase_80A6FF67 = "THANK_YOU"; +#pragma pop + /* 80A6FFCC-80A6FFD8 000000 000C+00 3/3 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -1301,7 +1322,7 @@ SECTION_RODATA u8 const daNpc_Lud_Param_c::m[144] = { 0xC1, 0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC1, 0x70, 0x00, 0x00, 0x41, 0x70, 0x00, 0x00, 0x42, 0x20, 0x00, 0x00, 0x41, 0x70, 0x00, 0x00, 0x42, 0xB4, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A6FD7C, &daNpc_Lud_Param_c::m); +COMPILER_STRIP_GATE(0x80A6FD7C, &daNpc_Lud_Param_c::m); /* 80A6FE0C-80A6FE30 000090 0024+00 0/1 0/0 0/0 .rodata heapSize$3993 */ #pragma push @@ -1311,42 +1332,42 @@ SECTION_RODATA static u8 const heapSize[36] = { 0x00, 0x00, 0x3E, 0xF0, 0x00, 0x00, 0x46, 0xD0, 0x00, 0x00, 0x50, 0x00, 0x00, 0x00, 0x46, 0xE0, 0x00, 0x00, 0x3E, 0xF0, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A6FE0C, &heapSize); +COMPILER_STRIP_GATE(0x80A6FE0C, &heapSize); #pragma pop /* 80A6FE30-80A6FE34 0000B4 0004+00 0/1 0/0 0/0 .rodata @4059 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4059 = -200.0f; -COMPILER_STRIP_GATE(80A6FE30, &lit_4059); +COMPILER_STRIP_GATE(0x80A6FE30, &lit_4059); #pragma pop /* 80A6FE34-80A6FE38 0000B8 0004+00 0/1 0/0 0/0 .rodata @4060 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4060 = -100.0f; -COMPILER_STRIP_GATE(80A6FE34, &lit_4060); +COMPILER_STRIP_GATE(0x80A6FE34, &lit_4060); #pragma pop /* 80A6FE38-80A6FE3C 0000BC 0004+00 0/1 0/0 0/0 .rodata @4061 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4061 = 200.0f; -COMPILER_STRIP_GATE(80A6FE38, &lit_4061); +COMPILER_STRIP_GATE(0x80A6FE38, &lit_4061); #pragma pop /* 80A6FE3C-80A6FE40 0000C0 0004+00 0/1 0/0 0/0 .rodata @4062 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4062 = 300.0f; -COMPILER_STRIP_GATE(80A6FE3C, &lit_4062); +COMPILER_STRIP_GATE(0x80A6FE3C, &lit_4062); #pragma pop /* 80A6FE40-80A6FE44 0000C4 0004+00 0/1 0/0 0/0 .rodata @4063 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4063 = -1000000000.0f; -COMPILER_STRIP_GATE(80A6FE40, &lit_4063); +COMPILER_STRIP_GATE(0x80A6FE40, &lit_4063); #pragma pop /* 80A6ACF4-80A6AFA8 000234 02B4+00 1/1 0/0 0/0 .text create__11daNpc_Lud_cFv */ @@ -1367,25 +1388,25 @@ SECTION_RODATA static u8 const lit_4218[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A6FE44, &lit_4218); +COMPILER_STRIP_GATE(0x80A6FE44, &lit_4218); /* 80A6FE48-80A6FE4C 0000CC 0004+00 0/2 0/0 0/0 .rodata @4219 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4219 = 65536.0f; -COMPILER_STRIP_GATE(80A6FE48, &lit_4219); +COMPILER_STRIP_GATE(0x80A6FE48, &lit_4219); #pragma pop /* 80A6FE4C-80A6FE50 0000D0 0004+00 0/3 0/0 0/0 .rodata @4220 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4220 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(80A6FE4C, &lit_4220); +COMPILER_STRIP_GATE(0x80A6FE4C, &lit_4220); #pragma pop /* 80A6FE50-80A6FE54 0000D4 0004+00 2/5 0/0 0/0 .rodata @4421 */ SECTION_RODATA static f32 const lit_4421 = 1.0f; -COMPILER_STRIP_GATE(80A6FE50, &lit_4421); +COMPILER_STRIP_GATE(0x80A6FE50, &lit_4421); /* 80A6AFA8-80A6B440 0004E8 0498+00 1/1 0/0 0/0 .text CreateHeap__11daNpc_Lud_cFv */ #pragma push @@ -1520,7 +1541,7 @@ asm void daNpc_Lud_c::Execute() { /* ############################################################################################## */ /* 80A6FE54-80A6FE58 0000D8 0004+00 1/1 0/0 0/0 .rodata @4470 */ SECTION_RODATA static f32 const lit_4470 = 100.0f; -COMPILER_STRIP_GATE(80A6FE54, &lit_4470); +COMPILER_STRIP_GATE(0x80A6FE54, &lit_4470); /* 80A6B650-80A6B6E4 000B90 0094+00 1/1 0/0 0/0 .text Draw__11daNpc_Lud_cFv */ #pragma push @@ -1599,14 +1620,14 @@ asm void daNpc_Lud_c::afterJntAnm(int param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4633 = 120.0f; -COMPILER_STRIP_GATE(80A6FE58, &lit_4633); +COMPILER_STRIP_GATE(0x80A6FE58, &lit_4633); #pragma pop /* 80A6FE5C-80A6FE60 0000E0 0004+00 0/1 0/0 0/0 .rodata @4634 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4634 = 500.0f; -COMPILER_STRIP_GATE(80A6FE5C, &lit_4634); +COMPILER_STRIP_GATE(0x80A6FE5C, &lit_4634); #pragma pop /* 80A6BBA8-80A6BD44 0010E8 019C+00 1/0 0/0 0/0 .text setParam__11daNpc_Lud_cFv */ @@ -1632,7 +1653,7 @@ asm void daNpc_Lud_c::checkChangeEvt() { /* ############################################################################################## */ /* 80A6FE60-80A6FE64 0000E4 0004+00 6/9 0/0 0/0 .rodata @4680 */ SECTION_RODATA static f32 const lit_4680 = -1.0f; -COMPILER_STRIP_GATE(80A6FE60, &lit_4680); +COMPILER_STRIP_GATE(0x80A6FE60, &lit_4680); /* 80A6BE6C-80A6BEE4 0013AC 0078+00 1/0 0/0 0/0 .text setAfterTalkMotion__11daNpc_Lud_cFv */ @@ -1700,49 +1721,49 @@ asm void daNpc_Lud_c::beforeMove() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4927 = 5.0f; -COMPILER_STRIP_GATE(80A6FE64, &lit_4927); +COMPILER_STRIP_GATE(0x80A6FE64, &lit_4927); #pragma pop /* 80A6FE68-80A6FE6C 0000EC 0004+00 0/1 0/0 0/0 .rodata @4928 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4928 = 30.0f; -COMPILER_STRIP_GATE(80A6FE68, &lit_4928); +COMPILER_STRIP_GATE(0x80A6FE68, &lit_4928); #pragma pop /* 80A6FE6C-80A6FE70 0000F0 0004+00 0/1 0/0 0/0 .rodata @4929 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4929 = 0x38C90FDB; -COMPILER_STRIP_GATE(80A6FE6C, &lit_4929); +COMPILER_STRIP_GATE(0x80A6FE6C, &lit_4929); #pragma pop /* 80A6FE70-80A6FE74 0000F4 0004+00 0/2 0/0 0/0 .rodata @4930 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4930 = 94.0f; -COMPILER_STRIP_GATE(80A6FE70, &lit_4930); +COMPILER_STRIP_GATE(0x80A6FE70, &lit_4930); #pragma pop /* 80A6FE74-80A6FE78 0000F8 0004+00 0/1 0/0 0/0 .rodata @4931 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4931 = 160.0f; -COMPILER_STRIP_GATE(80A6FE74, &lit_4931); +COMPILER_STRIP_GATE(0x80A6FE74, &lit_4931); #pragma pop /* 80A6FE78-80A6FE7C 0000FC 0004+00 0/1 0/0 0/0 .rodata @4932 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4932 = -79.0f; -COMPILER_STRIP_GATE(80A6FE78, &lit_4932); +COMPILER_STRIP_GATE(0x80A6FE78, &lit_4932); #pragma pop /* 80A6FE7C-80A6FE84 000100 0008+00 1/3 0/0 0/0 .rodata @4934 */ SECTION_RODATA static u8 const lit_4934[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A6FE7C, &lit_4934); +COMPILER_STRIP_GATE(0x80A6FE7C, &lit_4934); /* 80A6C3A8-80A6C8EC 0018E8 0544+00 1/0 0/0 0/0 .text setAttnPos__11daNpc_Lud_cFv */ #pragma push @@ -1761,7 +1782,7 @@ asm void daNpc_Lud_c::setAttnPos() { SECTION_RODATA static u8 const lit_4994[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A6FE84, &lit_4994); +COMPILER_STRIP_GATE(0x80A6FE84, &lit_4994); #pragma pop /* 80A6FE8C-80A6FE94 000110 0008+00 0/1 0/0 0/0 .rodata @4995 */ @@ -1770,7 +1791,7 @@ COMPILER_STRIP_GATE(80A6FE84, &lit_4994); SECTION_RODATA static u8 const lit_4995[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A6FE8C, &lit_4995); +COMPILER_STRIP_GATE(0x80A6FE8C, &lit_4995); #pragma pop /* 80A6FE94-80A6FE9C 000118 0008+00 0/1 0/0 0/0 .rodata @4996 */ @@ -1779,28 +1800,28 @@ COMPILER_STRIP_GATE(80A6FE8C, &lit_4995); SECTION_RODATA static u8 const lit_4996[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A6FE94, &lit_4996); +COMPILER_STRIP_GATE(0x80A6FE94, &lit_4996); #pragma pop /* 80A6FE9C-80A6FEA0 000120 0004+00 0/1 0/0 0/0 .rodata @5046 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_5046 = 0x43050F5C; -COMPILER_STRIP_GATE(80A6FE9C, &lit_5046); +COMPILER_STRIP_GATE(0x80A6FE9C, &lit_5046); #pragma pop /* 80A6FEA0-80A6FEA4 000124 0004+00 0/1 0/0 0/0 .rodata @5047 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5047 = 66.0f / 25.0f; -COMPILER_STRIP_GATE(80A6FEA0, &lit_5047); +COMPILER_STRIP_GATE(0x80A6FEA0, &lit_5047); #pragma pop /* 80A6FEA4-80A6FEA8 000128 0004+00 0/1 0/0 0/0 .rodata @5048 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5048 = -89.0f; -COMPILER_STRIP_GATE(80A6FEA4, &lit_5048); +COMPILER_STRIP_GATE(0x80A6FEA4, &lit_5048); #pragma pop /* 80A6C8EC-80A6CA9C 001E2C 01B0+00 1/0 0/0 0/0 .text setCollision__11daNpc_Lud_cFv */ @@ -1823,7 +1844,7 @@ bool daNpc_Lud_c::drawDbgInfo() { SECTION_RODATA static u8 const jointNo[8] = { 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x14, }; -COMPILER_STRIP_GATE(80A6FEA8, &jointNo); +COMPILER_STRIP_GATE(0x80A6FEA8, &jointNo); /* 80A6CAA4-80A6CC2C 001FE4 0188+00 1/0 0/0 0/0 .text drawOtherMdl__11daNpc_Lud_cFv */ #pragma push @@ -1870,7 +1891,7 @@ asm void daNpc_Lud_c::selectAction() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpc_Lud_c::chkAction(int (daNpc_Lud_c::*)(void*)) { +asm void daNpc_Lud_c::chkAction(int (daNpc_Lud_c::*param_0)(void*)) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_lud/d_a_npc_lud/chkAction__11daNpc_Lud_cFM11daNpc_Lud_cFPCvPvPv_i.s" } @@ -1881,7 +1902,7 @@ asm void daNpc_Lud_c::chkAction(int (daNpc_Lud_c::*)(void*)) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpc_Lud_c::setAction(int (daNpc_Lud_c::*)(void*)) { +asm void daNpc_Lud_c::setAction(int (daNpc_Lud_c::*param_0)(void*)) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_lud/d_a_npc_lud/setAction__11daNpc_Lud_cFM11daNpc_Lud_cFPCvPvPv_i.s" } @@ -1890,7 +1911,7 @@ asm void daNpc_Lud_c::setAction(int (daNpc_Lud_c::*)(void*)) { /* ############################################################################################## */ /* 80A6FEB0-80A6FEB4 000134 0004+00 1/1 0/0 0/0 .rodata @5221 */ SECTION_RODATA static f32 const lit_5221 = 4.0f; -COMPILER_STRIP_GATE(80A6FEB0, &lit_5221); +COMPILER_STRIP_GATE(0x80A6FEB0, &lit_5221); /* 80A6CEC8-80A6D01C 002408 0154+00 1/1 0/0 0/0 .text mop__11daNpc_Lud_cFii */ #pragma push @@ -1902,6 +1923,13 @@ asm void daNpc_Lud_c::mop(int param_0, int param_1) { } #pragma pop +/* ############################################################################################## */ +/* 80A6FECC-80A6FECC 000150 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80A6FF71 = "prm"; +#pragma pop + /* 80A6D01C-80A6D160 00255C 0144+00 1/0 0/0 0/0 .text cutHurry__11daNpc_Lud_cFi */ #pragma push #pragma optimization_level 0 @@ -1912,6 +1940,15 @@ asm void daNpc_Lud_c::cutHurry(int param_0) { } #pragma pop +/* ############################################################################################## */ +/* 80A6FECC-80A6FECC 000150 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80A6FF75 = "timer"; +SECTION_DEAD static char const* const stringBase_80A6FF7B = "timer1"; +SECTION_DEAD static char const* const stringBase_80A6FF82 = "timer2"; +#pragma pop + /* 80A6D160-80A6D450 0026A0 02F0+00 1/0 0/0 0/0 .text cutConversationInHotel__11daNpc_Lud_cFi */ #pragma push #pragma optimization_level 0 @@ -1951,7 +1988,7 @@ asm void daNpc_Lud_c::cutConversationAboutGoron(int param_0) { SECTION_RODATA static u8 const lit_5494[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A6FEB4, &lit_5494); +COMPILER_STRIP_GATE(0x80A6FEB4, &lit_5494); #pragma pop /* 80A6FEC0-80A6FECC 000144 000C+00 0/1 0/0 0/0 .rodata @5502 */ @@ -1960,7 +1997,13 @@ COMPILER_STRIP_GATE(80A6FEB4, &lit_5494); SECTION_RODATA static u8 const lit_5502[12] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, }; -COMPILER_STRIP_GATE(80A6FEC0, &lit_5502); +COMPILER_STRIP_GATE(0x80A6FEC0, &lit_5502); +#pragma pop + +/* 80A6FECC-80A6FECC 000150 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80A6FF89 = "msgNo"; #pragma pop /* 80A6D998-80A6DC48 002ED8 02B0+00 1/0 0/0 0/0 .text cutNurse__11daNpc_Lud_cFi */ @@ -2003,6 +2046,14 @@ asm void daNpc_Lud_c::wait(void* param_0) { } #pragma pop +/* ############################################################################################## */ +/* 80A6FECC-80A6FECC 000150 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80A6FF8F = "EVT_CONVERSATION_IN_HOTEL1_e"; +SECTION_DEAD static char const* const stringBase_80A6FFAC = "EVT_CONVERSATION_IN_HOTEL2_e"; +#pragma pop + /* 80A6E32C-80A6E6EC 00386C 03C0+00 2/0 0/0 0/0 .text nurse__11daNpc_Lud_cFPv */ #pragma push #pragma optimization_level 0 @@ -2383,7 +2434,7 @@ void daNpcT_c::changeBtk(int* param_0, int* param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80A6FAD4(int* param_0) { +extern "C" asm void func_80A6FAD4(void* _this, int* param_0) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_lud/d_a_npc_lud/func_80A6FAD4.s" } @@ -2415,7 +2466,7 @@ asm void __sinit_d_a_npc_lud_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80A6FAF0 = (void*)__sinit_d_a_npc_lud_cpp; +REGISTER_CTORS(0x80A6FAF0, __sinit_d_a_npc_lud_cpp); #pragma pop /* 80A6FC04-80A6FCD0 005144 00CC+00 1/1 0/0 0/0 .text @@ -2507,31 +2558,4 @@ static asm void func_80A6FD60() { } #pragma pop -/* 80A6FECC-80A6FFC9 000150 00FD+00 12/9 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80A6FECC = ""; -SECTION_DEAD static char const* const stringBase_80A6FECD = "NO_RESPONSE"; -SECTION_DEAD static char const* const stringBase_80A6FED9 = "DEMO13_STB"; -SECTION_DEAD static char const* const stringBase_80A6FEE4 = "CONVERSATION_ABOUT_GORON"; -SECTION_DEAD static char const* const stringBase_80A6FEFD = "NURSE"; -SECTION_DEAD static char const* const stringBase_80A6FF03 = "GO_AHEAD"; -SECTION_DEAD static char const* const stringBase_80A6FF0C = "Lud"; -SECTION_DEAD static char const* const stringBase_80A6FF10 = "Lud_TW"; -SECTION_DEAD static char const* const stringBase_80A6FF17 = "Lud1"; -SECTION_DEAD static char const* const stringBase_80A6FF1C = "Lud2"; -SECTION_DEAD static char const* const stringBase_80A6FF21 = "Len1"; -SECTION_DEAD static char const* const stringBase_80A6FF26 = "HURRY"; -SECTION_DEAD static char const* const stringBase_80A6FF2C = "CONVERSATION_IN_HOTEL"; -SECTION_DEAD static char const* const stringBase_80A6FF42 = "CONVERSATION_ABOUT_DEATHMT"; -SECTION_DEAD static char const* const stringBase_80A6FF5D = "CLOTH_TRY"; -SECTION_DEAD static char const* const stringBase_80A6FF67 = "THANK_YOU"; -SECTION_DEAD static char const* const stringBase_80A6FF71 = "prm"; -SECTION_DEAD static char const* const stringBase_80A6FF75 = "timer"; -SECTION_DEAD static char const* const stringBase_80A6FF7B = "timer1"; -SECTION_DEAD static char const* const stringBase_80A6FF82 = "timer2"; -SECTION_DEAD static char const* const stringBase_80A6FF89 = "msgNo"; -SECTION_DEAD static char const* const stringBase_80A6FF8F = "EVT_CONVERSATION_IN_HOTEL1_e"; -SECTION_DEAD static char const* const stringBase_80A6FFAC = "EVT_CONVERSATION_IN_HOTEL2_e"; -#pragma pop +/* 80A6FECC-80A6FECC 000150 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/npc/d_a_npc_maro/d_a_npc_maro.cpp b/rel/d/a/npc/d_a_npc_maro/d_a_npc_maro.cpp index 85a42c9df2d..999460dec46 100644 --- a/rel/d/a/npc/d_a_npc_maro/d_a_npc_maro.cpp +++ b/rel/d/a/npc/d_a_npc_maro/d_a_npc_maro.cpp @@ -27,19 +27,19 @@ struct mDoMtx_stack_c { static u8 now[48]; }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; +struct J3DAnmTransform {}; + +struct J3DModelData {}; + struct Z2Creature { /* 802C03C8 */ Z2Creature(); /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -60,6 +60,8 @@ struct daTag_EvtArea_c { /* 8048C94C */ void chkPointInArea(cXyz, cXyz); }; +struct daNpcT_faceMotionAnmData_c {}; + struct daNpcT_MotionSeqMngr_c { struct sequenceStepData_c {}; @@ -67,14 +69,12 @@ struct daNpcT_MotionSeqMngr_c { /* 80563F14 */ ~daNpcT_MotionSeqMngr_c(); }; +struct daNpcT_evtData_c {}; + struct daNpcT_motionAnmData_c {}; struct J3DJoint {}; -struct daNpcT_faceMotionAnmData_c {}; - -struct daNpcT_evtData_c {}; - struct daNpc_Maro_c { /* 8055B58C */ ~daNpc_Maro_c(); /* 8055B6E0 */ void create(); @@ -164,15 +164,15 @@ struct dCcD_GObjInf { /* 800840E4 */ ~dCcD_GObjInf(); }; -struct J3DModel {}; - -struct _GXColorS10 {}; - struct csXyz { /* 805639D0 */ ~csXyz(); /* 80563E10 */ csXyz(); }; +struct _GXColorS10 {}; + +struct J3DModel {}; + struct daNpcT_c { /* 80147FA4 */ void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*); /* 801483F8 */ void loadRes(s8 const*, char const**); @@ -591,7 +591,7 @@ extern "C" void changeAnm__8daNpcT_cFPiPi(); extern "C" void changeBck__8daNpcT_cFPiPi(); extern "C" void changeBtp__8daNpcT_cFPiPi(); extern "C" void changeBtk__8daNpcT_cFPiPi(); -extern "C" void func_8056469C(int*); +extern "C" void func_8056469C(void* _this, int*); extern "C" void __sinit_d_a_npc_maro_cpp(); extern "C" void __ct__12daNpc_Maro_cFPC26daNpcT_faceMotionAnmData_cPC22daNpcT_motionAnmData_cPCQ222daNpcT_MotionSeqMngr_c18sequenceStepData_ciPCQ222daNpcT_MotionSeqMngr_c18sequenceStepData_ciPC16daNpcT_evtData_cPPc(); @@ -833,6 +833,49 @@ extern "C" void getSwitchBit1__16daTag_ShopItem_cFv(); // /* ############################################################################################## */ +/* 80564D58-80564D58 0001AC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80564D58 = ""; +SECTION_DEAD static char const* const stringBase_80564D59 = "DEFAULT_GETITEM"; +SECTION_DEAD static char const* const stringBase_80564D69 = "NO_RESPONSE"; +SECTION_DEAD static char const* const stringBase_80564D75 = "CONVERSATION_ABOUT_WOODSWD1"; +SECTION_DEAD static char const* const stringBase_80564D91 = "CONVERSATION_ABOUT_WOODSWD2"; +SECTION_DEAD static char const* const stringBase_80564DAD = "CONVERSATION_WITH_MARO1"; +SECTION_DEAD static char const* const stringBase_80564DC5 = "CONVERSATION_WITH_MARO2"; +SECTION_DEAD static char const* const stringBase_80564DDD = "DEMO13_STB"; +SECTION_DEAD static char const* const stringBase_80564DE8 = "SURPRISE"; +SECTION_DEAD static char const* const stringBase_80564DF1 = "BREAK_ARROWTUTORIAL"; +SECTION_DEAD static char const* const stringBase_80564E05 = "CONTINUE_ARROWTUTORIAL"; +SECTION_DEAD static char const* const stringBase_80564E1C = "END_ARROWTUTORIAL"; +SECTION_DEAD static char const* const stringBase_80564E2E = "CLEAR_ARROWTUTORIAL"; +SECTION_DEAD static char const* const stringBase_80564E42 = "NOT_GONNA_LET_3"; +SECTION_DEAD static char const* const stringBase_80564E52 = "TALK_TO_KAKASHI"; +SECTION_DEAD static char const* const stringBase_80564E62 = "Maro"; +SECTION_DEAD static char const* const stringBase_80564E67 = "Maro_TW"; +SECTION_DEAD static char const* const stringBase_80564E6F = "Maro1"; +SECTION_DEAD static char const* const stringBase_80564E75 = "Maro2"; +SECTION_DEAD static char const* const stringBase_80564E7B = "Maro3"; +SECTION_DEAD static char const* const stringBase_80564E81 = "Taro1"; +SECTION_DEAD static char const* const stringBase_80564E87 = "Taro2"; +SECTION_DEAD static char const* const stringBase_80564E8D = "Len1"; +SECTION_DEAD static char const* const stringBase_80564E92 = "Besu1"; +SECTION_DEAD static char const* const stringBase_80564E98 = "CONVERSATION_ABOUT_PACHINKO"; +SECTION_DEAD static char const* const stringBase_80564EB4 = "CONVERSATION_ABOUT_WOODSWD"; +SECTION_DEAD static char const* const stringBase_80564ECF = "SWDTUTORIAL"; +SECTION_DEAD static char const* const stringBase_80564EDB = "HAIL"; +SECTION_DEAD static char const* const stringBase_80564EE0 = "FIND_MONKEY"; +SECTION_DEAD static char const* const stringBase_80564EEC = "GIVEME_WOODSWD"; +SECTION_DEAD static char const* const stringBase_80564EFB = "GET_WOODSWD"; +SECTION_DEAD static char const* const stringBase_80564F07 = "CONVERSATION_WITH_MARO"; +SECTION_DEAD static char const* const stringBase_80564F1E = "CACARICO_CONVERSATION"; +SECTION_DEAD static char const* const stringBase_80564F34 = "ARROWTUTORIAL"; +SECTION_DEAD static char const* const stringBase_80564F42 = "BOKIN_TALK"; +SECTION_DEAD static char const* const stringBase_80564F4D = "MAROS_WHISPER"; +SECTION_DEAD static char const* const stringBase_80564F5B = "TAG_PUSH1"; +SECTION_DEAD static char const* const stringBase_80564F65 = "NOT_GONNA_LET"; +#pragma pop + /* 80564F90-80564F9C 000000 000C+00 5/5 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -1926,7 +1969,7 @@ SECTION_RODATA u8 const daNpc_Maro_Param_c::m[144] = { 0xC1, 0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC1, 0x70, 0x00, 0x00, 0x41, 0x70, 0x00, 0x00, 0x41, 0xF0, 0x00, 0x00, 0x41, 0x70, 0x00, 0x00, 0x41, 0xF0, 0x00, 0x00, 0x00, 0x78, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80564BAC, &daNpc_Maro_Param_c::m); +COMPILER_STRIP_GATE(0x80564BAC, &daNpc_Maro_Param_c::m); /* 80564C3C-80564C80 000090 0044+00 0/1 0/0 0/0 .rodata heapSize$4152 */ #pragma push @@ -1938,42 +1981,42 @@ SECTION_RODATA static u8 const heapSize[68] = { 0x33, 0x10, 0x00, 0x00, 0x33, 0x10, 0x00, 0x00, 0x33, 0x10, 0x00, 0x00, 0x33, 0x10, 0x00, 0x00, 0x33, 0x10, 0x00, 0x00, 0x33, 0x10, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80564C3C, &heapSize); +COMPILER_STRIP_GATE(0x80564C3C, &heapSize); #pragma pop /* 80564C80-80564C84 0000D4 0004+00 0/1 0/0 0/0 .rodata @4222 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4222 = -200.0f; -COMPILER_STRIP_GATE(80564C80, &lit_4222); +COMPILER_STRIP_GATE(0x80564C80, &lit_4222); #pragma pop /* 80564C84-80564C88 0000D8 0004+00 0/1 0/0 0/0 .rodata @4223 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4223 = -100.0f; -COMPILER_STRIP_GATE(80564C84, &lit_4223); +COMPILER_STRIP_GATE(0x80564C84, &lit_4223); #pragma pop /* 80564C88-80564C8C 0000DC 0004+00 0/1 0/0 0/0 .rodata @4224 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4224 = 200.0f; -COMPILER_STRIP_GATE(80564C88, &lit_4224); +COMPILER_STRIP_GATE(0x80564C88, &lit_4224); #pragma pop /* 80564C8C-80564C90 0000E0 0004+00 0/1 0/0 0/0 .rodata @4225 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4225 = 300.0f; -COMPILER_STRIP_GATE(80564C8C, &lit_4225); +COMPILER_STRIP_GATE(0x80564C8C, &lit_4225); #pragma pop /* 80564C90-80564C94 0000E4 0004+00 0/1 0/0 0/0 .rodata @4226 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4226 = -1000000000.0f; -COMPILER_STRIP_GATE(80564C90, &lit_4226); +COMPILER_STRIP_GATE(0x80564C90, &lit_4226); #pragma pop /* 8055B6E0-8055B9A8 000240 02C8+00 1/1 0/0 0/0 .text create__12daNpc_Maro_cFv */ @@ -1991,21 +2034,21 @@ asm void daNpc_Maro_c::create() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4315 = 0.25f; -COMPILER_STRIP_GATE(80564C94, &lit_4315); +COMPILER_STRIP_GATE(0x80564C94, &lit_4315); #pragma pop /* 80564C98-80564C9C 0000EC 0004+00 0/1 0/0 0/0 .rodata @4316 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4316 = 20.0f; -COMPILER_STRIP_GATE(80564C98, &lit_4316); +COMPILER_STRIP_GATE(0x80564C98, &lit_4316); #pragma pop /* 80564C9C-80564CA0 0000F0 0004+00 0/1 0/0 0/0 .rodata @4317 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4317 = 5.0f; -COMPILER_STRIP_GATE(80564C9C, &lit_4317); +COMPILER_STRIP_GATE(0x80564C9C, &lit_4317); #pragma pop /* 80564CA0-80564CA4 0000F4 0004+00 23/33 0/0 0/0 .rodata @4318 */ @@ -2015,36 +2058,36 @@ SECTION_RODATA static u8 const lit_4318[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80564CA0, &lit_4318); +COMPILER_STRIP_GATE(0x80564CA0, &lit_4318); /* 80564CA4-80564CA8 0000F8 0004+00 1/2 0/0 0/0 .rodata @4319 */ SECTION_RODATA static f32 const lit_4319 = 100.0f; -COMPILER_STRIP_GATE(80564CA4, &lit_4319); +COMPILER_STRIP_GATE(0x80564CA4, &lit_4319); /* 80564CA8-80564CAC 0000FC 0004+00 0/1 0/0 0/0 .rodata @4320 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4320 = 60.0f; -COMPILER_STRIP_GATE(80564CA8, &lit_4320); +COMPILER_STRIP_GATE(0x80564CA8, &lit_4320); #pragma pop /* 80564CAC-80564CB0 000100 0004+00 0/2 0/0 0/0 .rodata @4541 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4541 = 65536.0f; -COMPILER_STRIP_GATE(80564CAC, &lit_4541); +COMPILER_STRIP_GATE(0x80564CAC, &lit_4541); #pragma pop /* 80564CB0-80564CB4 000104 0004+00 0/3 0/0 0/0 .rodata @4542 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4542 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(80564CB0, &lit_4542); +COMPILER_STRIP_GATE(0x80564CB0, &lit_4542); #pragma pop /* 80564CB4-80564CB8 000108 0004+00 2/4 0/0 0/0 .rodata @4688 */ SECTION_RODATA static f32 const lit_4688 = 1.0f; -COMPILER_STRIP_GATE(80564CB4, &lit_4688); +COMPILER_STRIP_GATE(0x80564CB4, &lit_4688); /* 8055B9A8-8055BC2C 000508 0284+00 1/1 0/0 0/0 .text CreateHeap__12daNpc_Maro_cFv */ #pragma push @@ -2221,7 +2264,7 @@ asm void daNpc_Maro_c::srchArrow(void* param_0, void* param_1) { /* ############################################################################################## */ /* 80564CB8-80564CBC 00010C 0004+00 2/2 0/0 0/0 .rodata @4808 */ SECTION_RODATA static f32 const lit_4808 = 1000000000.0f; -COMPILER_STRIP_GATE(80564CB8, &lit_4808); +COMPILER_STRIP_GATE(0x80564CB8, &lit_4808); /* 8055C0B4-8055C1AC 000C14 00F8+00 1/1 0/0 0/0 .text getArrowP__12daNpc_Maro_cFv */ #pragma push @@ -2298,28 +2341,28 @@ asm void daNpc_Maro_c::afterJntAnm(int param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5050 = 210.0f; -COMPILER_STRIP_GATE(80564CBC, &lit_5050); +COMPILER_STRIP_GATE(0x80564CBC, &lit_5050); #pragma pop /* 80564CC0-80564CC4 000114 0004+00 0/1 0/0 0/0 .rodata @5051 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5051 = 410.0f; -COMPILER_STRIP_GATE(80564CC0, &lit_5051); +COMPILER_STRIP_GATE(0x80564CC0, &lit_5051); #pragma pop /* 80564CC4-80564CC8 000118 0004+00 0/1 0/0 0/0 .rodata @5052 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5052 = 32.0f; -COMPILER_STRIP_GATE(80564CC4, &lit_5052); +COMPILER_STRIP_GATE(0x80564CC4, &lit_5052); #pragma pop /* 80564CC8-80564CCC 00011C 0004+00 0/1 0/0 0/0 .rodata @5053 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5053 = 419.0f; -COMPILER_STRIP_GATE(80564CC8, &lit_5053); +COMPILER_STRIP_GATE(0x80564CC8, &lit_5053); #pragma pop /* 8055C8B0-8055CB14 001410 0264+00 1/0 0/0 0/0 .text setParam__12daNpc_Maro_cFv */ @@ -2355,7 +2398,7 @@ asm void daNpc_Maro_c::evtEndProc() { /* ############################################################################################## */ /* 80564CCC-80564CD0 000120 0004+00 10/14 0/0 0/0 .rodata @5128 */ SECTION_RODATA static f32 const lit_5128 = -1.0f; -COMPILER_STRIP_GATE(80564CCC, &lit_5128); +COMPILER_STRIP_GATE(0x80564CCC, &lit_5128); /* 8055CCD8-8055CD74 001838 009C+00 1/0 0/0 0/0 .text setAfterTalkMotion__12daNpc_Maro_cFv */ #pragma push @@ -2422,7 +2465,7 @@ asm void daNpc_Maro_c::beforeMove() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5395 = -30.0f; -COMPILER_STRIP_GATE(80564CD0, &lit_5395); +COMPILER_STRIP_GATE(0x80564CD0, &lit_5395); #pragma pop /* 80564CD4-80564CDC 000128 0004+04 0/1 0/0 0/0 .rodata @5396 */ @@ -2433,14 +2476,14 @@ SECTION_RODATA static u32 const lit_5396[1 + 1 /* padding */] = { /* padding */ 0x00000000, }; -COMPILER_STRIP_GATE(80564CD4, &lit_5396); +COMPILER_STRIP_GATE(0x80564CD4, &lit_5396); #pragma pop /* 80564CDC-80564CE4 000130 0008+00 1/3 0/0 0/0 .rodata @5398 */ SECTION_RODATA static u8 const lit_5398[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80564CDC, &lit_5398); +COMPILER_STRIP_GATE(0x80564CDC, &lit_5398); /* 8055D688-8055D918 0021E8 0290+00 1/0 0/0 0/0 .text setAttnPos__12daNpc_Maro_cFv */ #pragma push @@ -2514,7 +2557,7 @@ asm void daNpc_Maro_c::selectAction() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpc_Maro_c::chkAction(int (daNpc_Maro_c::*)(void*)) { +asm void daNpc_Maro_c::chkAction(int (daNpc_Maro_c::*param_0)(void*)) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_maro/d_a_npc_maro/chkAction__12daNpc_Maro_cFM12daNpc_Maro_cFPCvPvPv_i.s" } @@ -2525,12 +2568,19 @@ asm void daNpc_Maro_c::chkAction(int (daNpc_Maro_c::*)(void*)) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpc_Maro_c::setAction(int (daNpc_Maro_c::*)(void*)) { +asm void daNpc_Maro_c::setAction(int (daNpc_Maro_c::*param_0)(void*)) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_maro/d_a_npc_maro/setAction__12daNpc_Maro_cFM12daNpc_Maro_cFPCvPvPv_i.s" } #pragma pop +/* ############################################################################################## */ +/* 80564D58-80564D58 0001AC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80564F73 = "prm"; +#pragma pop + /* 8055DDDC-8055DF7C 00293C 01A0+00 1/0 0/0 0/0 .text * cutConversationAboutPachinko__12daNpc_Maro_cFi */ #pragma push @@ -2560,7 +2610,7 @@ asm void daNpc_Maro_c::cutConversationAboutWoodSwd(int param_0) { SECTION_RODATA static u8 const lit_5456[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80564CE4, &lit_5456); +COMPILER_STRIP_GATE(0x80564CE4, &lit_5456); #pragma pop /* 80564CEC-80564CF4 000140 0008+00 0/3 0/0 0/0 .rodata @5457 */ @@ -2569,7 +2619,7 @@ COMPILER_STRIP_GATE(80564CE4, &lit_5456); SECTION_RODATA static u8 const lit_5457[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80564CEC, &lit_5457); +COMPILER_STRIP_GATE(0x80564CEC, &lit_5457); #pragma pop /* 80564CF4-80564CFC 000148 0008+00 0/3 0/0 0/0 .rodata @5458 */ @@ -2578,12 +2628,12 @@ COMPILER_STRIP_GATE(80564CEC, &lit_5457); SECTION_RODATA static u8 const lit_5458[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80564CF4, &lit_5458); +COMPILER_STRIP_GATE(0x80564CF4, &lit_5458); #pragma pop /* 80564CFC-80564D00 000150 0004+00 1/1 0/0 0/0 .rodata @5731 */ SECTION_RODATA static f32 const lit_5731 = 30.0f; -COMPILER_STRIP_GATE(80564CFC, &lit_5731); +COMPILER_STRIP_GATE(0x80564CFC, &lit_5731); /* 8055E124-8055E414 002C84 02F0+00 1/0 0/0 0/0 .text cutSwdTutorial__12daNpc_Maro_cFi */ #pragma push @@ -2610,21 +2660,27 @@ asm void daNpc_Maro_c::cutHail(int param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5888 = 50.0f; -COMPILER_STRIP_GATE(80564D00, &lit_5888); +COMPILER_STRIP_GATE(0x80564D00, &lit_5888); #pragma pop /* 80564D04-80564D08 000158 0004+00 0/1 0/0 0/0 .rodata @5889 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5889 = 10.0f; -COMPILER_STRIP_GATE(80564D04, &lit_5889); +COMPILER_STRIP_GATE(0x80564D04, &lit_5889); #pragma pop /* 80564D08-80564D0C 00015C 0004+00 0/1 0/0 0/0 .rodata @5890 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5890 = 0.5f; -COMPILER_STRIP_GATE(80564D08, &lit_5890); +COMPILER_STRIP_GATE(0x80564D08, &lit_5890); +#pragma pop + +/* 80564D58-80564D58 0001AC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80564F77 = "timer"; #pragma pop /* 8055E578-8055E968 0030D8 03F0+00 1/0 0/0 0/0 .text cutFindMonkey__12daNpc_Maro_cFi */ @@ -2642,47 +2698,47 @@ asm void daNpc_Maro_c::cutFindMonkey(int param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5995 = -718.0f; -COMPILER_STRIP_GATE(80564D0C, &lit_5995); +COMPILER_STRIP_GATE(0x80564D0C, &lit_5995); #pragma pop /* 80564D10-80564D14 000164 0004+00 0/1 0/0 0/0 .rodata @5996 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5996 = 1331.0f; -COMPILER_STRIP_GATE(80564D10, &lit_5996); +COMPILER_STRIP_GATE(0x80564D10, &lit_5996); #pragma pop /* 80564D14-80564D18 000168 0004+00 0/1 0/0 0/0 .rodata @5997 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5997 = -2139.0f; -COMPILER_STRIP_GATE(80564D14, &lit_5997); +COMPILER_STRIP_GATE(0x80564D14, &lit_5997); #pragma pop /* 80564D18-80564D1C 00016C 0004+00 0/1 0/0 0/0 .rodata @5998 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5998 = -511.0f; -COMPILER_STRIP_GATE(80564D18, &lit_5998); +COMPILER_STRIP_GATE(0x80564D18, &lit_5998); #pragma pop /* 80564D1C-80564D20 000170 0004+00 0/1 0/0 0/0 .rodata @5999 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5999 = 1370.0f; -COMPILER_STRIP_GATE(80564D1C, &lit_5999); +COMPILER_STRIP_GATE(0x80564D1C, &lit_5999); #pragma pop /* 80564D20-80564D24 000174 0004+00 0/1 0/0 0/0 .rodata @6000 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6000 = -2153.0f; -COMPILER_STRIP_GATE(80564D20, &lit_6000); +COMPILER_STRIP_GATE(0x80564D20, &lit_6000); #pragma pop /* 80564D24-80564D28 000178 0004+00 1/4 0/0 0/0 .rodata @6001 */ SECTION_RODATA static f32 const lit_6001 = -40.0f; -COMPILER_STRIP_GATE(80564D24, &lit_6001); +COMPILER_STRIP_GATE(0x80564D24, &lit_6001); /* 8055E968-8055ECF4 0034C8 038C+00 1/0 0/0 0/0 .text cutGiveMeWoodSwd__12daNpc_Maro_cFi */ @@ -2740,7 +2796,7 @@ asm void daNpc_Maro_c::cutSurprise(int param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6226 = 1600.0f; -COMPILER_STRIP_GATE(80564D28, &lit_6226); +COMPILER_STRIP_GATE(0x80564D28, &lit_6226); #pragma pop /* 80564D2C-80564D34 000180 0008+00 0/0 0/0 0/0 .rodata @6272 */ @@ -2749,7 +2805,7 @@ COMPILER_STRIP_GATE(80564D28, &lit_6226); SECTION_RODATA static u8 const lit_6272[8] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, }; -COMPILER_STRIP_GATE(80564D2C, &lit_6272); +COMPILER_STRIP_GATE(0x80564D2C, &lit_6272); #pragma pop /* 80564D34-80564D3C 000188 0008+00 0/1 0/0 0/0 .rodata @6425 */ @@ -2758,7 +2814,7 @@ COMPILER_STRIP_GATE(80564D2C, &lit_6272); SECTION_RODATA static u8 const lit_6425[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80564D34, &lit_6425); +COMPILER_STRIP_GATE(0x80564D34, &lit_6425); #pragma pop /* 80564D3C-80564D48 000190 000C+00 0/1 0/0 0/0 .rodata @6485 */ @@ -2767,7 +2823,15 @@ COMPILER_STRIP_GATE(80564D34, &lit_6425); SECTION_RODATA static u8 const lit_6485[12] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, }; -COMPILER_STRIP_GATE(80564D3C, &lit_6485); +COMPILER_STRIP_GATE(0x80564D3C, &lit_6485); +#pragma pop + +/* 80564D58-80564D58 0001AC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80564F7D = "msgNo"; +SECTION_DEAD static char const* const stringBase_80564F83 = "msgNo2"; +SECTION_DEAD static char const* const stringBase_80564F8A = "send"; #pragma pop /* 8055FAF0-805611E0 004650 16F0+00 3/0 0/0 0/0 .text cutArrowTutorial__12daNpc_Maro_cFi @@ -2794,7 +2858,7 @@ asm void daNpc_Maro_c::cutBokinTalk(int param_0) { /* ############################################################################################## */ /* 80564D48-80564D4C 00019C 0004+00 1/1 0/0 0/0 .rodata @7191 */ SECTION_RODATA static f32 const lit_7191 = 40.0f; -COMPILER_STRIP_GATE(80564D48, &lit_7191); +COMPILER_STRIP_GATE(0x80564D48, &lit_7191); /* 80561328-80561614 005E88 02EC+00 1/0 0/0 0/0 .text cutMarosWhisper__12daNpc_Maro_cFi */ @@ -2832,21 +2896,21 @@ asm void daNpc_Maro_c::cutNotGonnaLet(int param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7496 = 70.0f; -COMPILER_STRIP_GATE(80564D4C, &lit_7496); +COMPILER_STRIP_GATE(0x80564D4C, &lit_7496); #pragma pop /* 80564D50-80564D54 0001A4 0004+00 0/1 0/0 0/0 .rodata @7497 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7497 = 500.0f; -COMPILER_STRIP_GATE(80564D50, &lit_7497); +COMPILER_STRIP_GATE(0x80564D50, &lit_7497); #pragma pop /* 80564D54-80564D58 0001A8 0004+00 0/1 0/0 0/0 .rodata @7498 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7498 = 150.0f; -COMPILER_STRIP_GATE(80564D54, &lit_7498); +COMPILER_STRIP_GATE(0x80564D54, &lit_7498); #pragma pop /* 80561E70-80562174 0069D0 0304+00 1/0 0/0 0/0 .text cutTalkToKakashi__12daNpc_Maro_cFi @@ -3280,7 +3344,7 @@ void daNpcT_c::changeBtk(int* param_0, int* param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_8056469C(int* param_0) { +extern "C" asm void func_8056469C(void* _this, int* param_0) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_maro/d_a_npc_maro/func_8056469C.s" } @@ -3312,7 +3376,7 @@ asm void __sinit_d_a_npc_maro_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_805646B8 = (void*)__sinit_d_a_npc_maro_cpp; +REGISTER_CTORS(0x805646B8, __sinit_d_a_npc_maro_cpp); #pragma pop /* 805648A4-80564970 009404 00CC+00 1/1 0/0 0/0 .text @@ -3448,51 +3512,4 @@ asm void daTag_EvtArea_c::chkPointInArea(cXyz param_0) { } #pragma pop -/* 80564D58-80564F8F 0001AC 0237+00 20/17 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80564D58 = ""; -SECTION_DEAD static char const* const stringBase_80564D59 = "DEFAULT_GETITEM"; -SECTION_DEAD static char const* const stringBase_80564D69 = "NO_RESPONSE"; -SECTION_DEAD static char const* const stringBase_80564D75 = "CONVERSATION_ABOUT_WOODSWD1"; -SECTION_DEAD static char const* const stringBase_80564D91 = "CONVERSATION_ABOUT_WOODSWD2"; -SECTION_DEAD static char const* const stringBase_80564DAD = "CONVERSATION_WITH_MARO1"; -SECTION_DEAD static char const* const stringBase_80564DC5 = "CONVERSATION_WITH_MARO2"; -SECTION_DEAD static char const* const stringBase_80564DDD = "DEMO13_STB"; -SECTION_DEAD static char const* const stringBase_80564DE8 = "SURPRISE"; -SECTION_DEAD static char const* const stringBase_80564DF1 = "BREAK_ARROWTUTORIAL"; -SECTION_DEAD static char const* const stringBase_80564E05 = "CONTINUE_ARROWTUTORIAL"; -SECTION_DEAD static char const* const stringBase_80564E1C = "END_ARROWTUTORIAL"; -SECTION_DEAD static char const* const stringBase_80564E2E = "CLEAR_ARROWTUTORIAL"; -SECTION_DEAD static char const* const stringBase_80564E42 = "NOT_GONNA_LET_3"; -SECTION_DEAD static char const* const stringBase_80564E52 = "TALK_TO_KAKASHI"; -SECTION_DEAD static char const* const stringBase_80564E62 = "Maro"; -SECTION_DEAD static char const* const stringBase_80564E67 = "Maro_TW"; -SECTION_DEAD static char const* const stringBase_80564E6F = "Maro1"; -SECTION_DEAD static char const* const stringBase_80564E75 = "Maro2"; -SECTION_DEAD static char const* const stringBase_80564E7B = "Maro3"; -SECTION_DEAD static char const* const stringBase_80564E81 = "Taro1"; -SECTION_DEAD static char const* const stringBase_80564E87 = "Taro2"; -SECTION_DEAD static char const* const stringBase_80564E8D = "Len1"; -SECTION_DEAD static char const* const stringBase_80564E92 = "Besu1"; -SECTION_DEAD static char const* const stringBase_80564E98 = "CONVERSATION_ABOUT_PACHINKO"; -SECTION_DEAD static char const* const stringBase_80564EB4 = "CONVERSATION_ABOUT_WOODSWD"; -SECTION_DEAD static char const* const stringBase_80564ECF = "SWDTUTORIAL"; -SECTION_DEAD static char const* const stringBase_80564EDB = "HAIL"; -SECTION_DEAD static char const* const stringBase_80564EE0 = "FIND_MONKEY"; -SECTION_DEAD static char const* const stringBase_80564EEC = "GIVEME_WOODSWD"; -SECTION_DEAD static char const* const stringBase_80564EFB = "GET_WOODSWD"; -SECTION_DEAD static char const* const stringBase_80564F07 = "CONVERSATION_WITH_MARO"; -SECTION_DEAD static char const* const stringBase_80564F1E = "CACARICO_CONVERSATION"; -SECTION_DEAD static char const* const stringBase_80564F34 = "ARROWTUTORIAL"; -SECTION_DEAD static char const* const stringBase_80564F42 = "BOKIN_TALK"; -SECTION_DEAD static char const* const stringBase_80564F4D = "MAROS_WHISPER"; -SECTION_DEAD static char const* const stringBase_80564F5B = "TAG_PUSH1"; -SECTION_DEAD static char const* const stringBase_80564F65 = "NOT_GONNA_LET"; -SECTION_DEAD static char const* const stringBase_80564F73 = "prm"; -SECTION_DEAD static char const* const stringBase_80564F77 = "timer"; -SECTION_DEAD static char const* const stringBase_80564F7D = "msgNo"; -SECTION_DEAD static char const* const stringBase_80564F83 = "msgNo2"; -SECTION_DEAD static char const* const stringBase_80564F8A = "send"; -#pragma pop +/* 80564D58-80564D58 0001AC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/npc/d_a_npc_midp/d_a_npc_midp.cpp b/rel/d/a/npc/d_a_npc_midp/d_a_npc_midp.cpp index b4b97236138..0acbfe03261 100644 --- a/rel/d/a/npc/d_a_npc_midp/d_a_npc_midp.cpp +++ b/rel/d/a/npc/d_a_npc_midp/d_a_npc_midp.cpp @@ -15,12 +15,14 @@ struct mDoMtx_stack_c { static u8 now[48]; }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; +struct J3DAnmTransform {}; + +struct J3DModelData {}; + struct Vec {}; struct Z2Creature { @@ -29,8 +31,6 @@ struct Z2Creature { /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -44,6 +44,8 @@ struct fopAc_ac_c { /* 80018C8C */ ~fopAc_ac_c(); }; +struct daNpcT_faceMotionAnmData_c {}; + struct daNpcT_MotionSeqMngr_c { struct sequenceStepData_c {}; @@ -51,14 +53,12 @@ struct daNpcT_MotionSeqMngr_c { /* 80A731A4 */ ~daNpcT_MotionSeqMngr_c(); }; +struct daNpcT_evtData_c {}; + struct daNpcT_motionAnmData_c {}; struct J3DJoint {}; -struct daNpcT_faceMotionAnmData_c {}; - -struct daNpcT_evtData_c {}; - struct daNpc_midP_c { /* 80A70C6C */ ~daNpc_midP_c(); /* 80A70D90 */ void create(); @@ -116,6 +116,8 @@ struct dCcD_GObjInf { /* 800840E4 */ ~dCcD_GObjInf(); }; +struct _GXColorS10 {}; + struct J3DModel {}; struct cXyz { @@ -124,8 +126,6 @@ struct cXyz { /* 80A73158 */ cXyz(); }; -struct _GXColorS10 {}; - struct daNpcT_c { /* 80147FA4 */ void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*); /* 801483F8 */ void loadRes(s8 const*, char const**); @@ -273,13 +273,13 @@ struct dBgS_AcchCir { /* 80A731EC */ ~dBgS_AcchCir(); }; -struct dBgS {}; - struct csXyz { /* 80A72C18 */ ~csXyz(); /* 80A73058 */ csXyz(); }; +struct dBgS {}; + struct dBgS_Acch { /* 80075F94 */ ~dBgS_Acch(); /* 800760A0 */ dBgS_Acch(); @@ -607,6 +607,14 @@ extern "C" void __register_global_object(); // /* ############################################################################################## */ +/* 80A73AA0-80A73AA0 0000E0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80A73AA0 = ""; +SECTION_DEAD static char const* const stringBase_80A73AA1 = "NO_RESPONSE"; +SECTION_DEAD static char const* const stringBase_80A73AAD = "midP"; +#pragma pop + /* 80A73AB4-80A73AC0 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -904,41 +912,41 @@ SECTION_RODATA u8 const daNpc_midP_Param_c::m[140] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A739C0, &daNpc_midP_Param_c::m); +COMPILER_STRIP_GATE(0x80A739C0, &daNpc_midP_Param_c::m); /* 80A73A4C-80A73A50 00008C 0004+00 0/1 0/0 0/0 .rodata @4028 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4028 = -300.0f; -COMPILER_STRIP_GATE(80A73A4C, &lit_4028); +COMPILER_STRIP_GATE(0x80A73A4C, &lit_4028); #pragma pop /* 80A73A50-80A73A54 000090 0004+00 0/1 0/0 0/0 .rodata @4029 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4029 = -50.0f; -COMPILER_STRIP_GATE(80A73A50, &lit_4029); +COMPILER_STRIP_GATE(0x80A73A50, &lit_4029); #pragma pop /* 80A73A54-80A73A58 000094 0004+00 0/1 0/0 0/0 .rodata @4030 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4030 = 300.0f; -COMPILER_STRIP_GATE(80A73A54, &lit_4030); +COMPILER_STRIP_GATE(0x80A73A54, &lit_4030); #pragma pop /* 80A73A58-80A73A5C 000098 0004+00 0/1 0/0 0/0 .rodata @4031 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4031 = 450.0f; -COMPILER_STRIP_GATE(80A73A58, &lit_4031); +COMPILER_STRIP_GATE(0x80A73A58, &lit_4031); #pragma pop /* 80A73A5C-80A73A60 00009C 0004+00 0/1 0/0 0/0 .rodata @4032 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4032 = -1000000000.0f; -COMPILER_STRIP_GATE(80A73A5C, &lit_4032); +COMPILER_STRIP_GATE(0x80A73A5C, &lit_4032); #pragma pop /* 80A70D90-80A71074 000210 02E4+00 1/1 0/0 0/0 .text create__12daNpc_midP_cFv */ @@ -959,25 +967,25 @@ SECTION_RODATA static u8 const lit_4186[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A73A60, &lit_4186); +COMPILER_STRIP_GATE(0x80A73A60, &lit_4186); /* 80A73A64-80A73A68 0000A4 0004+00 0/2 0/0 0/0 .rodata @4187 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4187 = 65536.0f; -COMPILER_STRIP_GATE(80A73A64, &lit_4187); +COMPILER_STRIP_GATE(0x80A73A64, &lit_4187); #pragma pop /* 80A73A68-80A73A6C 0000A8 0004+00 0/3 0/0 0/0 .rodata @4188 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4188 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(80A73A68, &lit_4188); +COMPILER_STRIP_GATE(0x80A73A68, &lit_4188); #pragma pop /* 80A73A6C-80A73A70 0000AC 0004+00 2/4 0/0 0/0 .rodata @4338 */ SECTION_RODATA static f32 const lit_4338 = 1.0f; -COMPILER_STRIP_GATE(80A73A6C, &lit_4338); +COMPILER_STRIP_GATE(0x80A73A6C, &lit_4338); /* 80A71074-80A71300 0004F4 028C+00 1/1 0/0 0/0 .text CreateHeap__12daNpc_midP_cFv */ #pragma push @@ -1184,7 +1192,7 @@ asm void daNpc_midP_c::afterJntAnm(int param_0) { /* ############################################################################################## */ /* 80A73A70-80A73A74 0000B0 0004+00 3/3 0/0 0/0 .rodata @4551 */ SECTION_RODATA static f32 const lit_4551 = -1.0f; -COMPILER_STRIP_GATE(80A73A70, &lit_4551); +COMPILER_STRIP_GATE(0x80A73A70, &lit_4551); /* 80A71860-80A7199C 000CE0 013C+00 1/0 0/0 0/0 .text ctrlBtk__12daNpc_midP_cFv */ #pragma push @@ -1266,28 +1274,28 @@ asm void daNpc_midP_c::beforeMove() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4720 = 10.0f; -COMPILER_STRIP_GATE(80A73A74, &lit_4720); +COMPILER_STRIP_GATE(0x80A73A74, &lit_4720); #pragma pop /* 80A73A78-80A73A7C 0000B8 0004+00 0/1 0/0 0/0 .rodata @4721 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4721 = -30.0f; -COMPILER_STRIP_GATE(80A73A78, &lit_4721); +COMPILER_STRIP_GATE(0x80A73A78, &lit_4721); #pragma pop /* 80A73A7C-80A73A80 0000BC 0004+00 0/1 0/0 0/0 .rodata @4722 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4722 = 0x38C90FDB; -COMPILER_STRIP_GATE(80A73A7C, &lit_4722); +COMPILER_STRIP_GATE(0x80A73A7C, &lit_4722); #pragma pop /* 80A73A80-80A73A88 0000C0 0008+00 1/3 0/0 0/0 .rodata @4724 */ SECTION_RODATA static u8 const lit_4724[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A73A80, &lit_4724); +COMPILER_STRIP_GATE(0x80A73A80, &lit_4724); /* 80A71E28-80A72064 0012A8 023C+00 1/0 0/0 0/0 .text setAttnPos__12daNpc_midP_cFv */ #pragma push @@ -1339,7 +1347,7 @@ asm void daNpc_midP_c::selectAction() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpc_midP_c::chkAction(int (daNpc_midP_c::*)(void*)) { +asm void daNpc_midP_c::chkAction(int (daNpc_midP_c::*param_0)(void*)) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_midp/d_a_npc_midp/chkAction__12daNpc_midP_cFM12daNpc_midP_cFPCvPvPv_i.s" } @@ -1350,7 +1358,7 @@ asm void daNpc_midP_c::chkAction(int (daNpc_midP_c::*)(void*)) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpc_midP_c::setAction(int (daNpc_midP_c::*)(void*)) { +asm void daNpc_midP_c::setAction(int (daNpc_midP_c::*param_0)(void*)) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_midp/d_a_npc_midp/setAction__12daNpc_midP_cFM12daNpc_midP_cFPCvPvPv_i.s" } @@ -1585,7 +1593,7 @@ asm void daNpcT_JntAnm_c::setEyeAngleY(cXyz param_0, s16 param_1, int param_2, f SECTION_RODATA static u8 const lit_4782[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A73A88, &lit_4782); +COMPILER_STRIP_GATE(0x80A73A88, &lit_4782); #pragma pop /* 80A73A90-80A73A98 0000D0 0008+00 0/1 0/0 0/0 .rodata @4783 */ @@ -1594,7 +1602,7 @@ COMPILER_STRIP_GATE(80A73A88, &lit_4782); SECTION_RODATA static u8 const lit_4783[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A73A90, &lit_4783); +COMPILER_STRIP_GATE(0x80A73A90, &lit_4783); #pragma pop /* 80A73A98-80A73AA0 0000D8 0008+00 0/1 0/0 0/0 .rodata @4784 */ @@ -1603,7 +1611,7 @@ COMPILER_STRIP_GATE(80A73A90, &lit_4783); SECTION_RODATA static u8 const lit_4784[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A73A98, &lit_4784); +COMPILER_STRIP_GATE(0x80A73A98, &lit_4784); #pragma pop /* 80A7348C-80A73694 00290C 0208+00 1/1 0/0 0/0 .text setEyeAngleX__15daNpcT_JntAnm_cF4cXyzfs */ @@ -1751,7 +1759,7 @@ asm void __sinit_d_a_npc_midp_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80A73768 = (void*)__sinit_d_a_npc_midp_cpp; +REGISTER_CTORS(0x80A73768, __sinit_d_a_npc_midp_cpp); #pragma pop /* 80A737D0-80A7387C 002C50 00AC+00 1/1 0/0 0/0 .text @@ -1868,11 +1876,4 @@ static asm void func_80A739A4() { } #pragma pop -/* 80A73AA0-80A73AB2 0000E0 0012+00 4/1 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80A73AA0 = ""; -SECTION_DEAD static char const* const stringBase_80A73AA1 = "NO_RESPONSE"; -SECTION_DEAD static char const* const stringBase_80A73AAD = "midP"; -#pragma pop +/* 80A73AA0-80A73AA0 0000E0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/npc/d_a_npc_moi/d_a_npc_moi.cpp b/rel/d/a/npc/d_a_npc_moi/d_a_npc_moi.cpp index fae374c6395..29736a35242 100644 --- a/rel/d/a/npc/d_a_npc_moi/d_a_npc_moi.cpp +++ b/rel/d/a/npc/d_a_npc_moi/d_a_npc_moi.cpp @@ -15,12 +15,14 @@ struct mDoMtx_stack_c { static u8 now[48]; }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; +struct J3DAnmTransform {}; + +struct J3DModelData {}; + struct Vec {}; struct Z2Creature { @@ -29,8 +31,6 @@ struct Z2Creature { /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -43,6 +43,8 @@ struct fopAc_ac_c { /* 80018C8C */ ~fopAc_ac_c(); }; +struct daNpcT_faceMotionAnmData_c {}; + struct daNpcT_MotionSeqMngr_c { struct sequenceStepData_c {}; @@ -51,8 +53,12 @@ struct daNpcT_MotionSeqMngr_c { /* 80A7A5C8 */ ~daNpcT_MotionSeqMngr_c(); }; +struct daNpcT_evtData_c {}; + struct daNpcT_motionAnmData_c {}; +struct J3DJoint {}; + struct cXyz { /* 80266AE4 */ void operator+(Vec const&) const; /* 80266B34 */ void operator-(Vec const&) const; @@ -60,12 +66,6 @@ struct cXyz { /* 80A7A5C4 */ cXyz(); }; -struct J3DJoint {}; - -struct daNpcT_faceMotionAnmData_c {}; - -struct daNpcT_evtData_c {}; - struct daNpc_Moi_c { /* 80A73F4C */ ~daNpc_Moi_c(); /* 80A74150 */ void create(); @@ -151,15 +151,15 @@ struct dCcD_GObjInf { /* 800844F8 */ void GetTgHitObj(); }; -struct J3DModel {}; - -struct _GXColorS10 {}; - struct csXyz { /* 80A79EA8 */ ~csXyz(); /* 80A7AE08 */ csXyz(); }; +struct _GXColorS10 {}; + +struct J3DModel {}; + struct daNpcT_c { /* 80147FA4 */ void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*); /* 80148058 */ void getTrnsfrmAnmP(char const*, int); @@ -570,8 +570,8 @@ extern "C" void drawGhost__8daNpcT_cFv(); extern "C" bool afterSetFaceMotionAnm__8daNpcT_cFiifi(); extern "C" void getFaceMotionAnm__8daNpcT_cF26daNpcT_faceMotionAnmData_c(); extern "C" void getMotionAnm__8daNpcT_cF22daNpcT_motionAnmData_c(); -extern "C" void func_80A7AB64(int*); -extern "C" void func_80A7AB80(f32, f32); +extern "C" void func_80A7AB64(void* _this, int*); +extern "C" void func_80A7AB80(void* _this, f32, f32); extern "C" void __sinit_d_a_npc_moi_cpp(); extern "C" void __ct__11daNpc_Moi_cFPC26daNpcT_faceMotionAnmData_cPC22daNpcT_motionAnmData_cPCQ222daNpcT_MotionSeqMngr_c18sequenceStepData_ciPCQ222daNpcT_MotionSeqMngr_c18sequenceStepData_ciPC16daNpcT_evtData_cPPc(); @@ -798,6 +798,23 @@ extern "C" void __register_global_object(); // /* ############################################################################################## */ +/* 80A7B0D8-80A7B0D8 0001E8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80A7B0D8 = ""; +SECTION_DEAD static char const* const stringBase_80A7B0D9 = "DEFAULT_GETITEM"; +SECTION_DEAD static char const* const stringBase_80A7B0E9 = "NO_RESPONSE"; +SECTION_DEAD static char const* const stringBase_80A7B0F5 = "DELIVERED_SW"; +SECTION_DEAD static char const* const stringBase_80A7B102 = "Moi"; +SECTION_DEAD static char const* const stringBase_80A7B106 = "Moi1"; +SECTION_DEAD static char const* const stringBase_80A7B10B = "Moi2"; +SECTION_DEAD static char const* const stringBase_80A7B110 = "Moi3"; +SECTION_DEAD static char const* const stringBase_80A7B115 = "Moi_p1"; +SECTION_DEAD static char const* const stringBase_80A7B11C = "APPEARANCE_MOI"; +SECTION_DEAD static char const* const stringBase_80A7B12B = "CONVERSATION_WITH_URI"; +SECTION_DEAD static char const* const stringBase_80A7B141 = "FIND_WOLF"; +#pragma pop + /* 80A7B15C-80A7B168 000000 000C+00 3/3 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -1449,7 +1466,7 @@ SECTION_RODATA u8 const daNpc_Moi_Param_c::m[188] = { 0x00, 0x00, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x44, 0x7A, 0x00, 0x00, 0x43, 0x96, 0x00, 0x00, 0xC3, 0x96, 0x00, 0x00, 0x41, 0xF0, 0x00, 0x00, 0x42, 0x70, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A7AEF0, &daNpc_Moi_Param_c::m); +COMPILER_STRIP_GATE(0x80A7AEF0, &daNpc_Moi_Param_c::m); /* 80A7AFAC-80A7AFC8 0000BC 001C+00 0/1 0/0 0/0 .rodata heapSize$4027 */ #pragma push @@ -1458,35 +1475,35 @@ SECTION_RODATA static u8 const heapSize[28] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5C, 0x70, 0x00, 0x00, 0x7C, 0xB0, 0x00, 0x00, 0x7C, 0xA0, 0x00, 0x00, 0x5C, 0x70, 0x00, 0x00, 0x5C, 0x80, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A7AFAC, &heapSize); +COMPILER_STRIP_GATE(0x80A7AFAC, &heapSize); #pragma pop /* 80A7AFC8-80A7AFCC 0000D8 0004+00 0/1 0/0 0/0 .rodata @4111 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4111 = -200.0f; -COMPILER_STRIP_GATE(80A7AFC8, &lit_4111); +COMPILER_STRIP_GATE(0x80A7AFC8, &lit_4111); #pragma pop /* 80A7AFCC-80A7AFD0 0000DC 0004+00 0/1 0/0 0/0 .rodata @4112 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4112 = -100.0f; -COMPILER_STRIP_GATE(80A7AFCC, &lit_4112); +COMPILER_STRIP_GATE(0x80A7AFCC, &lit_4112); #pragma pop /* 80A7AFD0-80A7AFD4 0000E0 0004+00 0/1 0/0 0/0 .rodata @4113 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4113 = 200.0f; -COMPILER_STRIP_GATE(80A7AFD0, &lit_4113); +COMPILER_STRIP_GATE(0x80A7AFD0, &lit_4113); #pragma pop /* 80A7AFD4-80A7AFD8 0000E4 0004+00 0/1 0/0 0/0 .rodata @4114 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4114 = 300.0f; -COMPILER_STRIP_GATE(80A7AFD4, &lit_4114); +COMPILER_STRIP_GATE(0x80A7AFD4, &lit_4114); #pragma pop /* 80A7AFD8-80A7AFDC 0000E8 0004+00 5/21 0/0 0/0 .rodata @4115 */ @@ -1496,13 +1513,13 @@ SECTION_RODATA static u8 const lit_4115[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A7AFD8, &lit_4115); +COMPILER_STRIP_GATE(0x80A7AFD8, &lit_4115); /* 80A7AFDC-80A7AFE0 0000EC 0004+00 0/1 0/0 0/0 .rodata @4116 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4116 = -1000000000.0f; -COMPILER_STRIP_GATE(80A7AFDC, &lit_4116); +COMPILER_STRIP_GATE(0x80A7AFDC, &lit_4116); #pragma pop /* 80A74150-80A74474 0002F0 0324+00 1/1 0/0 0/0 .text create__11daNpc_Moi_cFv */ @@ -1520,14 +1537,14 @@ asm void daNpc_Moi_c::create() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4323 = 65536.0f; -COMPILER_STRIP_GATE(80A7AFE0, &lit_4323); +COMPILER_STRIP_GATE(0x80A7AFE0, &lit_4323); #pragma pop /* 80A7AFE4-80A7AFE8 0000F4 0004+00 0/3 0/0 0/0 .rodata @4324 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4324 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(80A7AFE4, &lit_4324); +COMPILER_STRIP_GATE(0x80A7AFE4, &lit_4324); #pragma pop /* 80A7AFE8-80A7B000 0000F8 0018+00 0/1 0/0 0/0 .rodata bmdTypeList$4435 */ @@ -1537,12 +1554,12 @@ SECTION_RODATA static u8 const bmdTypeList[24] = { 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x05, }; -COMPILER_STRIP_GATE(80A7AFE8, &bmdTypeList); +COMPILER_STRIP_GATE(0x80A7AFE8, &bmdTypeList); #pragma pop /* 80A7B000-80A7B004 000110 0004+00 1/4 0/0 0/0 .rodata @4511 */ SECTION_RODATA static f32 const lit_4511 = 1.0f; -COMPILER_STRIP_GATE(80A7B000, &lit_4511); +COMPILER_STRIP_GATE(0x80A7B000, &lit_4511); /* 80A74474-80A7483C 000614 03C8+00 1/1 0/0 0/0 .text CreateHeap__11daNpc_Moi_cFv */ #pragma push @@ -1677,7 +1694,7 @@ asm void daNpc_Moi_c::Execute() { /* ############################################################################################## */ /* 80A7B004-80A7B008 000114 0004+00 1/1 0/0 0/0 .rodata @4573 */ SECTION_RODATA static f32 const lit_4573 = 100.0f; -COMPILER_STRIP_GATE(80A7B004, &lit_4573); +COMPILER_STRIP_GATE(0x80A7B004, &lit_4573); /* 80A74A4C-80A74B80 000BEC 0134+00 1/1 0/0 0/0 .text Draw__11daNpc_Moi_cFv */ #pragma push @@ -1766,21 +1783,21 @@ asm void daNpc_Moi_c::afterJntAnm(int param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4809 = 135.0f; -COMPILER_STRIP_GATE(80A7B008, &lit_4809); +COMPILER_STRIP_GATE(0x80A7B008, &lit_4809); #pragma pop /* 80A7B00C-80A7B010 00011C 0004+00 0/1 0/0 0/0 .rodata @4810 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4810 = 600.0f; -COMPILER_STRIP_GATE(80A7B00C, &lit_4810); +COMPILER_STRIP_GATE(0x80A7B00C, &lit_4810); #pragma pop /* 80A7B010-80A7B014 000120 0004+00 0/1 0/0 0/0 .rodata @4811 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4811 = 800.0f; -COMPILER_STRIP_GATE(80A7B010, &lit_4811); +COMPILER_STRIP_GATE(0x80A7B010, &lit_4811); #pragma pop /* 80A751E4-80A75460 001384 027C+00 1/0 0/0 0/0 .text setParam__11daNpc_Moi_cFv */ @@ -1806,7 +1823,7 @@ asm void daNpc_Moi_c::checkChangeEvt() { /* ############################################################################################## */ /* 80A7B014-80A7B018 000124 0004+00 3/9 0/0 0/0 .rodata @4862 */ SECTION_RODATA static f32 const lit_4862 = -1.0f; -COMPILER_STRIP_GATE(80A7B014, &lit_4862); +COMPILER_STRIP_GATE(0x80A7B014, &lit_4862); /* 80A75514-80A755C8 0016B4 00B4+00 2/0 0/0 0/0 .text setAfterTalkMotion__11daNpc_Moi_cFv */ @@ -1874,42 +1891,42 @@ asm void daNpc_Moi_c::beforeMove() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5053 = -30.0f; -COMPILER_STRIP_GATE(80A7B018, &lit_5053); +COMPILER_STRIP_GATE(0x80A7B018, &lit_5053); #pragma pop /* 80A7B01C-80A7B020 00012C 0004+00 0/2 0/0 0/0 .rodata @5054 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5054 = 10.0f; -COMPILER_STRIP_GATE(80A7B01C, &lit_5054); +COMPILER_STRIP_GATE(0x80A7B01C, &lit_5054); #pragma pop /* 80A7B020-80A7B024 000130 0004+00 0/1 0/0 0/0 .rodata @5055 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_5055 = 0x38C90FDB; -COMPILER_STRIP_GATE(80A7B020, &lit_5055); +COMPILER_STRIP_GATE(0x80A7B020, &lit_5055); #pragma pop /* 80A7B024-80A7B028 000134 0004+00 0/1 0/0 0/0 .rodata @5056 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5056 = 140.0f; -COMPILER_STRIP_GATE(80A7B024, &lit_5056); +COMPILER_STRIP_GATE(0x80A7B024, &lit_5056); #pragma pop /* 80A7B028-80A7B02C 000138 0004+00 0/1 0/0 0/0 .rodata @5057 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5057 = -60.0f; -COMPILER_STRIP_GATE(80A7B028, &lit_5057); +COMPILER_STRIP_GATE(0x80A7B028, &lit_5057); #pragma pop /* 80A7B02C-80A7B030 00013C 0004+00 0/2 0/0 0/0 .rodata @5058 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5058 = 40.0f; -COMPILER_STRIP_GATE(80A7B02C, &lit_5058); +COMPILER_STRIP_GATE(0x80A7B02C, &lit_5058); #pragma pop /* 80A7B030-80A7B038 000140 0004+04 0/1 0/0 0/0 .rodata @5059 */ @@ -1920,14 +1937,14 @@ SECTION_RODATA static f32 const lit_5059[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80A7B030, &lit_5059); +COMPILER_STRIP_GATE(0x80A7B030, &lit_5059); #pragma pop /* 80A7B038-80A7B040 000148 0008+00 1/6 0/0 0/0 .rodata @5061 */ SECTION_RODATA static u8 const lit_5061[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A7B038, &lit_5061); +COMPILER_STRIP_GATE(0x80A7B038, &lit_5061); /* 80A75AB8-80A75E68 001C58 03B0+00 1/0 0/0 0/0 .text setAttnPos__11daNpc_Moi_cFv */ #pragma push @@ -1946,7 +1963,7 @@ asm void daNpc_Moi_c::setAttnPos() { SECTION_RODATA static u8 const lit_5119[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A7B040, &lit_5119); +COMPILER_STRIP_GATE(0x80A7B040, &lit_5119); #pragma pop /* 80A7B048-80A7B050 000158 0008+00 0/2 0/0 0/0 .rodata @5120 */ @@ -1955,7 +1972,7 @@ COMPILER_STRIP_GATE(80A7B040, &lit_5119); SECTION_RODATA static u8 const lit_5120[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A7B048, &lit_5120); +COMPILER_STRIP_GATE(0x80A7B048, &lit_5120); #pragma pop /* 80A7B050-80A7B058 000160 0008+00 0/3 0/0 0/0 .rodata @5121 */ @@ -1964,35 +1981,35 @@ COMPILER_STRIP_GATE(80A7B048, &lit_5120); SECTION_RODATA static u8 const lit_5121[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A7B050, &lit_5121); +COMPILER_STRIP_GATE(0x80A7B050, &lit_5121); #pragma pop /* 80A7B058-80A7B05C 000168 0004+00 0/1 0/0 0/0 .rodata @5203 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5203 = 60.0f; -COMPILER_STRIP_GATE(80A7B058, &lit_5203); +COMPILER_STRIP_GATE(0x80A7B058, &lit_5203); #pragma pop /* 80A7B05C-80A7B060 00016C 0004+00 0/1 0/0 0/0 .rodata @5204 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5204 = 80.0f; -COMPILER_STRIP_GATE(80A7B05C, &lit_5204); +COMPILER_STRIP_GATE(0x80A7B05C, &lit_5204); #pragma pop /* 80A7B060-80A7B064 000170 0004+00 0/1 0/0 0/0 .rodata @5205 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5205 = 50.0f; -COMPILER_STRIP_GATE(80A7B060, &lit_5205); +COMPILER_STRIP_GATE(0x80A7B060, &lit_5205); #pragma pop /* 80A7B064-80A7B068 000174 0004+00 0/1 0/0 0/0 .rodata @5206 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5206 = -70.0f; -COMPILER_STRIP_GATE(80A7B064, &lit_5206); +COMPILER_STRIP_GATE(0x80A7B064, &lit_5206); #pragma pop /* 80A75E68-80A760E0 002008 0278+00 1/0 0/0 0/0 .text setCollision__11daNpc_Moi_cFv */ @@ -2016,7 +2033,7 @@ SECTION_RODATA static u8 const jointNo[24] = { 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x11, 0x00, 0x00, 0x00, 0x17, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x19, 0x00, 0x00, 0x00, 0x0C, }; -COMPILER_STRIP_GATE(80A7B068, &jointNo); +COMPILER_STRIP_GATE(0x80A7B068, &jointNo); /* 80A760E8-80A762A8 002288 01C0+00 1/0 0/0 0/0 .text drawOtherMdl__11daNpc_Moi_cFv */ #pragma push @@ -2031,7 +2048,7 @@ asm void daNpc_Moi_c::drawOtherMdl() { /* ############################################################################################## */ /* 80A7B080-80A7B084 000190 0004+00 1/1 0/0 0/0 .rodata @5309 */ SECTION_RODATA static f32 const lit_5309 = 2.0f; -COMPILER_STRIP_GATE(80A7B080, &lit_5309); +COMPILER_STRIP_GATE(0x80A7B080, &lit_5309); /* 80A762A8-80A762CC 002448 0024+00 1/0 0/0 0/0 .text afterSetMotionAnm__11daNpc_Moi_cFiifi */ #pragma push @@ -2098,7 +2115,7 @@ asm void daNpc_Moi_c::selectAction() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpc_Moi_c::chkAction(int (daNpc_Moi_c::*)(void*)) { +asm void daNpc_Moi_c::chkAction(int (daNpc_Moi_c::*param_0)(void*)) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_moi/d_a_npc_moi/chkAction__11daNpc_Moi_cFM11daNpc_Moi_cFPCvPvPv_i.s" } @@ -2109,7 +2126,7 @@ asm void daNpc_Moi_c::chkAction(int (daNpc_Moi_c::*)(void*)) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpc_Moi_c::setAction(int (daNpc_Moi_c::*)(void*)) { +asm void daNpc_Moi_c::setAction(int (daNpc_Moi_c::*param_0)(void*)) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_moi/d_a_npc_moi/setAction__11daNpc_Moi_cFM11daNpc_Moi_cFPCvPvPv_i.s" } @@ -2130,7 +2147,7 @@ asm void daNpc_Moi_c::chkPlayerGetWoodShield() { #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_5448 = 0x43360B61; -COMPILER_STRIP_GATE(80A7B084, &lit_5448); +COMPILER_STRIP_GATE(0x80A7B084, &lit_5448); #pragma pop /* 80A766DC-80A76888 00287C 01AC+00 2/2 0/0 0/0 .text setSSlash__11daNpc_Moi_cFi */ @@ -2156,7 +2173,7 @@ asm void daNpc_Moi_c::chkPullOutSw() { /* ############################################################################################## */ /* 80A7B088-80A7B08C 000198 0004+00 2/4 0/0 0/0 .rodata @5469 */ SECTION_RODATA static f32 const lit_5469 = 4.0f; -COMPILER_STRIP_GATE(80A7B088, &lit_5469); +COMPILER_STRIP_GATE(0x80A7B088, &lit_5469); /* 80A768FC-80A76954 002A9C 0058+00 1/1 0/0 0/0 .text pullOutSw__11daNpc_Moi_cFv */ #pragma push @@ -2181,7 +2198,7 @@ asm void daNpc_Moi_c::chkSetInSw() { /* ############################################################################################## */ /* 80A7B08C-80A7B090 00019C 0004+00 1/1 0/0 0/0 .rodata @5488 */ SECTION_RODATA static f32 const lit_5488 = 6.0f; -COMPILER_STRIP_GATE(80A7B08C, &lit_5488); +COMPILER_STRIP_GATE(0x80A7B08C, &lit_5488); /* 80A769C8-80A76A20 002B68 0058+00 1/1 0/0 0/0 .text setInSw__11daNpc_Moi_cFv */ #pragma push @@ -2198,28 +2215,28 @@ asm void daNpc_Moi_c::setInSw() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5521 = 5.0f; -COMPILER_STRIP_GATE(80A7B090, &lit_5521); +COMPILER_STRIP_GATE(0x80A7B090, &lit_5521); #pragma pop /* 80A7B094-80A7B098 0001A4 0004+00 0/1 0/0 0/0 .rodata @5522 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5522 = 7.0f; -COMPILER_STRIP_GATE(80A7B094, &lit_5522); +COMPILER_STRIP_GATE(0x80A7B094, &lit_5522); #pragma pop /* 80A7B098-80A7B09C 0001A8 0004+00 0/1 0/0 0/0 .rodata @5523 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5523 = 20.0f; -COMPILER_STRIP_GATE(80A7B098, &lit_5523); +COMPILER_STRIP_GATE(0x80A7B098, &lit_5523); #pragma pop /* 80A7B09C-80A7B0A0 0001AC 0004+00 0/1 0/0 0/0 .rodata @5524 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5524 = 22.0f; -COMPILER_STRIP_GATE(80A7B09C, &lit_5524); +COMPILER_STRIP_GATE(0x80A7B09C, &lit_5524); #pragma pop /* 80A76A20-80A76AFC 002BC0 00DC+00 1/1 0/0 0/0 .text setSwAT__11daNpc_Moi_cFv */ @@ -2359,14 +2376,14 @@ asm void daNpc_Moi_c::torch() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5623 = 0.5f; -COMPILER_STRIP_GATE(80A7B0A0, &lit_5623); +COMPILER_STRIP_GATE(0x80A7B0A0, &lit_5623); #pragma pop /* 80A7B0A4-80A7B0A8 0001B4 0004+00 0/1 0/0 0/0 .rodata @5624 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5624 = 0.25f; -COMPILER_STRIP_GATE(80A7B0A4, &lit_5624); +COMPILER_STRIP_GATE(0x80A7B0A4, &lit_5624); #pragma pop /* 80A76C7C-80A76E10 002E1C 0194+00 1/1 0/0 0/0 .text injuryCheck__11daNpc_Moi_cFv */ @@ -2404,14 +2421,14 @@ asm void daNpc_Moi_c::injuryWalk() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5888 = 150.0f; -COMPILER_STRIP_GATE(80A7B0A8, &lit_5888); +COMPILER_STRIP_GATE(0x80A7B0A8, &lit_5888); #pragma pop /* 80A7B0AC-80A7B0B0 0001BC 0004+00 0/3 0/0 0/0 .rodata @5889 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5889 = 1.5f; -COMPILER_STRIP_GATE(80A7B0AC, &lit_5889); +COMPILER_STRIP_GATE(0x80A7B0AC, &lit_5889); #pragma pop /* 80A770FC-80A7772C 00329C 0630+00 2/2 0/0 0/0 .text poise__11daNpc_Moi_cFv */ @@ -2439,21 +2456,28 @@ asm void dAttention_c::getDistTable(int param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6030 = 500.0f; -COMPILER_STRIP_GATE(80A7B0B0, &lit_6030); +COMPILER_STRIP_GATE(0x80A7B0B0, &lit_6030); #pragma pop /* 80A7B0B4-80A7B0B8 0001C4 0004+00 0/2 0/0 0/0 .rodata @6031 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6031 = 2500.0f; -COMPILER_STRIP_GATE(80A7B0B4, &lit_6031); +COMPILER_STRIP_GATE(0x80A7B0B4, &lit_6031); #pragma pop /* 80A7B0B8-80A7B0BC 0001C8 0004+00 0/2 0/0 0/0 .rodata @6032 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6032 = 11.0f / 20.0f; -COMPILER_STRIP_GATE(80A7B0B8, &lit_6032); +COMPILER_STRIP_GATE(0x80A7B0B8, &lit_6032); +#pragma pop + +/* 80A7B0D8-80A7B0D8 0001E8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80A7B14B = "prm"; +SECTION_DEAD static char const* const stringBase_80A7B14F = "timer"; #pragma pop /* 80A77740-80A77BA0 0038E0 0460+00 1/0 0/0 0/0 .text cutDeliveredSw__11daNpc_Moi_cFi */ @@ -2473,7 +2497,7 @@ asm void daNpc_Moi_c::cutDeliveredSw(int param_0) { SECTION_RODATA static u8 const lit_6042[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A7B0BC, &lit_6042); +COMPILER_STRIP_GATE(0x80A7B0BC, &lit_6042); #pragma pop /* 80A7B0C4-80A7B0CC 0001D4 0008+00 0/1 0/0 0/0 .rodata @6054 */ @@ -2482,7 +2506,13 @@ COMPILER_STRIP_GATE(80A7B0BC, &lit_6042); SECTION_RODATA static u8 const lit_6054[8] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, }; -COMPILER_STRIP_GATE(80A7B0C4, &lit_6054); +COMPILER_STRIP_GATE(0x80A7B0C4, &lit_6054); +#pragma pop + +/* 80A7B0D8-80A7B0D8 0001E8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80A7B155 = "msgNo"; #pragma pop /* 80A77BA0-80A7838C 003D40 07EC+00 2/0 0/0 0/0 .text cutAppearanceMoi__11daNpc_Moi_cFi @@ -2521,21 +2551,21 @@ asm void daNpc_Moi_c::cutFindWolf(int param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6558 = 13.0f; -COMPILER_STRIP_GATE(80A7B0CC, &lit_6558); +COMPILER_STRIP_GATE(0x80A7B0CC, &lit_6558); #pragma pop /* 80A7B0D0-80A7B0D4 0001E0 0004+00 0/1 0/0 0/0 .rodata @6559 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6559 = 29.0f; -COMPILER_STRIP_GATE(80A7B0D0, &lit_6559); +COMPILER_STRIP_GATE(0x80A7B0D0, &lit_6559); #pragma pop /* 80A7B0D4-80A7B0D8 0001E4 0004+00 0/1 0/0 0/0 .rodata @6560 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6560 = 35.0f; -COMPILER_STRIP_GATE(80A7B0D4, &lit_6560); +COMPILER_STRIP_GATE(0x80A7B0D4, &lit_6560); #pragma pop /* 80A789D8-80A78E0C 004B78 0434+00 2/0 0/0 0/0 .text wait__11daNpc_Moi_cFPv */ @@ -2943,7 +2973,7 @@ asm void daNpcT_c::getMotionAnm(daNpcT_motionAnmData_c param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80A7AB64(int* param_0) { +extern "C" asm void func_80A7AB64(void* _this, int* param_0) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_moi/d_a_npc_moi/func_80A7AB64.s" } @@ -2953,7 +2983,7 @@ extern "C" asm void func_80A7AB64(int* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80A7AB80(f32 param_0, f32 param_1) { +extern "C" asm void func_80A7AB80(void* _this, f32 param_0, f32 param_1) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_moi/d_a_npc_moi/func_80A7AB80.s" } @@ -2979,7 +3009,7 @@ asm void __sinit_d_a_npc_moi_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80A7ABBC = (void*)__sinit_d_a_npc_moi_cpp; +REGISTER_CTORS(0x80A7ABBC, __sinit_d_a_npc_moi_cpp); #pragma pop /* 80A7AC88-80A7AE08 006E28 0180+00 1/1 0/0 0/0 .text @@ -3263,23 +3293,4 @@ static u8 data_80A7C070[4]; static u8 data_80A7C074[4]; #pragma pop -/* 80A7B0D8-80A7B15B 0001E8 0083+00 8/5 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80A7B0D8 = ""; -SECTION_DEAD static char const* const stringBase_80A7B0D9 = "DEFAULT_GETITEM"; -SECTION_DEAD static char const* const stringBase_80A7B0E9 = "NO_RESPONSE"; -SECTION_DEAD static char const* const stringBase_80A7B0F5 = "DELIVERED_SW"; -SECTION_DEAD static char const* const stringBase_80A7B102 = "Moi"; -SECTION_DEAD static char const* const stringBase_80A7B106 = "Moi1"; -SECTION_DEAD static char const* const stringBase_80A7B10B = "Moi2"; -SECTION_DEAD static char const* const stringBase_80A7B110 = "Moi3"; -SECTION_DEAD static char const* const stringBase_80A7B115 = "Moi_p1"; -SECTION_DEAD static char const* const stringBase_80A7B11C = "APPEARANCE_MOI"; -SECTION_DEAD static char const* const stringBase_80A7B12B = "CONVERSATION_WITH_URI"; -SECTION_DEAD static char const* const stringBase_80A7B141 = "FIND_WOLF"; -SECTION_DEAD static char const* const stringBase_80A7B14B = "prm"; -SECTION_DEAD static char const* const stringBase_80A7B14F = "timer"; -SECTION_DEAD static char const* const stringBase_80A7B155 = "msgNo"; -#pragma pop +/* 80A7B0D8-80A7B0D8 0001E8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/npc/d_a_npc_moir/d_a_npc_moir.cpp b/rel/d/a/npc/d_a_npc_moir/d_a_npc_moir.cpp index 7a8445c6fad..1feb9496fb3 100644 --- a/rel/d/a/npc/d_a_npc_moir/d_a_npc_moir.cpp +++ b/rel/d/a/npc/d_a_npc_moir/d_a_npc_moir.cpp @@ -23,12 +23,12 @@ struct mDoExt_bckAnm { /* 8000D990 */ void changeBckOnly(J3DAnmTransform*); }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; +struct J3DModelData {}; + struct Vec {}; struct Z2Creature { @@ -50,10 +50,10 @@ struct fopAc_ac_c { /* 80018C8C */ ~fopAc_ac_c(); }; -struct J3DJoint {}; - struct J3DModel {}; +struct J3DJoint {}; + struct daNpcMoiR_c { /* 80A7C16C */ daNpcMoiR_c(); /* 80A7C380 */ ~daNpcMoiR_c(); @@ -102,16 +102,16 @@ struct daNpcMoiR_Param_c { static u8 const m[116]; }; -struct J3DAnmTextureSRTKey {}; - -struct _GXColorS10 {}; - struct J3DAnmTexPattern { /* 8032AF50 */ void getTexNo(u16, u16*) const; }; +struct J3DAnmTextureSRTKey {}; + struct J3DAnmTransformKey {}; +struct _GXColorS10 {}; + struct daNpcF_c { struct daNpcF_anmPlayData {}; @@ -207,7 +207,6 @@ struct dMsgFlow_c { struct dEvt_control_c { /* 80042468 */ void reset(); /* 80042518 */ void reset(void*); - /* 800436EC */ void setPtI_Id(unsigned int); }; struct dEvent_manager_c { @@ -442,8 +441,8 @@ extern "C" void __dt__12J3DFrameCtrlFv(); extern "C" void adjustShapeAngle__8daNpcF_cFv(); extern "C" void setCollisions__8daNpcF_cFv(); extern "C" void __dt__10cCcD_GSttsFv(); -extern "C" void func_80A830EC(int*); -extern "C" void func_80A83108(int, int); +extern "C" void func_80A830EC(void* _this, int*); +extern "C" void func_80A83108(void* _this, int, int); extern "C" void __sinit_d_a_npc_moir_cpp(); extern "C" void __dt__17daNpcMoiR_Param_cFv(); extern "C" static void func_80A83288(); @@ -624,6 +623,19 @@ extern "C" void __register_global_object(); // /* ############################################################################################## */ +/* 80A83840-80A83840 000594 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80A83840 = "MoiR"; +SECTION_DEAD static char const* const stringBase_80A83845 = "MoiR1"; +SECTION_DEAD static char const* const stringBase_80A8384B = "MoiR2"; +SECTION_DEAD static char const* const stringBase_80A83851 = "MoiR3"; +SECTION_DEAD static char const* const stringBase_80A83857 = ""; +SECTION_DEAD static char const* const stringBase_80A83858 = "THE_INTRODUCTION"; +SECTION_DEAD static char const* const stringBase_80A83869 = "MOIR_APPEAR"; +SECTION_DEAD static char const* const stringBase_80A83875 = "MOIR_APPEAR2"; +#pragma pop + /* 80A838B0-80A838BC 000000 000C+00 9/9 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -1082,34 +1094,42 @@ SECTION_RODATA u8 const daNpcMoiR_Param_c::m[116] = { 0x00, 0x00, 0xC3, 0x96, 0x00, 0x00, 0x00, 0x3C, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x43, 0x96, 0x00, 0x00, 0x15, 0xCD, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A832AC, &daNpcMoiR_Param_c::m); +COMPILER_STRIP_GATE(0x80A832AC, &daNpcMoiR_Param_c::m); /* 80A83320-80A83324 000074 0004+00 0/1 0/0 0/0 .rodata @4276 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4276 = -100.0f; -COMPILER_STRIP_GATE(80A83320, &lit_4276); +COMPILER_STRIP_GATE(0x80A83320, &lit_4276); #pragma pop /* 80A83324-80A83328 000078 0004+00 0/1 0/0 0/0 .rodata @4277 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4277 = -50.0f; -COMPILER_STRIP_GATE(80A83324, &lit_4277); +COMPILER_STRIP_GATE(0x80A83324, &lit_4277); #pragma pop /* 80A83328-80A8332C 00007C 0004+00 0/1 0/0 0/0 .rodata @4278 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4278 = 100.0f; -COMPILER_STRIP_GATE(80A83328, &lit_4278); +COMPILER_STRIP_GATE(0x80A83328, &lit_4278); #pragma pop /* 80A8332C-80A83330 000080 0004+00 0/1 0/0 0/0 .rodata @4279 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4279 = 220.0f; -COMPILER_STRIP_GATE(80A8332C, &lit_4279); +COMPILER_STRIP_GATE(0x80A8332C, &lit_4279); +#pragma pop + +/* 80A83840-80A83840 000594 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80A83882 = "R_SP116"; +SECTION_DEAD static char const* const stringBase_80A8388A = "F_SP108"; +SECTION_DEAD static char const* const stringBase_80A83892 = "D_MN09"; #pragma pop /* 80A7C580-80A7C978 000500 03F8+00 1/1 0/0 0/0 .text Create__11daNpcMoiR_cFv */ @@ -1125,7 +1145,7 @@ asm void daNpcMoiR_c::Create() { /* ############################################################################################## */ /* 80A83330-80A83334 000084 0004+00 4/5 0/0 0/0 .rodata @4337 */ SECTION_RODATA static f32 const lit_4337 = 1.0f; -COMPILER_STRIP_GATE(80A83330, &lit_4337); +COMPILER_STRIP_GATE(0x80A83330, &lit_4337); /* 80A83334-80A83338 000088 0004+00 2/10 0/0 0/0 .rodata @4338 */ SECTION_RODATA static u8 const lit_4338[4] = { @@ -1134,7 +1154,7 @@ SECTION_RODATA static u8 const lit_4338[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A83334, &lit_4338); +COMPILER_STRIP_GATE(0x80A83334, &lit_4338); /* 80A7C978-80A7CC8C 0008F8 0314+00 1/1 0/0 0/0 .text CreateHeap__11daNpcMoiR_cFv */ #pragma push @@ -1281,7 +1301,7 @@ asm void daNpcMoiR_c::Draw() { SECTION_RODATA static u8 const lit_4386[12] = { 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x04, }; -COMPILER_STRIP_GATE(80A83338, &lit_4386); +COMPILER_STRIP_GATE(0x80A83338, &lit_4386); /* 80A7CEFC-80A7D0CC 000E7C 01D0+00 1/1 0/0 0/0 .text * ctrlJoint__11daNpcMoiR_cFP8J3DJointP8J3DModel */ @@ -1375,7 +1395,7 @@ asm void daNpcMoiR_c::setWaitAction() { SECTION_RODATA static u8 const lit_4603[12] = { 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A83344, &lit_4603); +COMPILER_STRIP_GATE(0x80A83344, &lit_4603); #pragma pop /* 80A83350-80A83354 0000A4 0004+00 0/1 0/0 0/0 .rodata @4604 */ @@ -1387,7 +1407,7 @@ SECTION_RODATA static u8 const lit_4604[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A83350, &lit_4604); +COMPILER_STRIP_GATE(0x80A83350, &lit_4604); #pragma pop /* 80A83354-80A83360 0000A8 000C+00 0/1 0/0 0/0 .rodata @4605 */ @@ -1396,7 +1416,7 @@ COMPILER_STRIP_GATE(80A83350, &lit_4604); SECTION_RODATA static u8 const lit_4605[12] = { 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80A83354, &lit_4605); +COMPILER_STRIP_GATE(0x80A83354, &lit_4605); #pragma pop /* 80A83360-80A83364 0000B4 0004+00 0/1 0/0 0/0 .rodata @4606 */ @@ -1408,7 +1428,7 @@ SECTION_RODATA static u8 const lit_4606[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A83360, &lit_4606); +COMPILER_STRIP_GATE(0x80A83360, &lit_4606); #pragma pop /* 80A83364-80A83370 0000B8 000C+00 0/1 0/0 0/0 .rodata @4607 */ @@ -1417,7 +1437,7 @@ COMPILER_STRIP_GATE(80A83360, &lit_4606); SECTION_RODATA static u8 const lit_4607[12] = { 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80A83364, &lit_4607); +COMPILER_STRIP_GATE(0x80A83364, &lit_4607); #pragma pop /* 80A83370-80A83374 0000C4 0004+00 0/1 0/0 0/0 .rodata @4608 */ @@ -1429,7 +1449,7 @@ SECTION_RODATA static u8 const lit_4608[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A83370, &lit_4608); +COMPILER_STRIP_GATE(0x80A83370, &lit_4608); #pragma pop /* 80A83374-80A83380 0000C8 000C+00 0/1 0/0 0/0 .rodata @4609 */ @@ -1438,7 +1458,7 @@ COMPILER_STRIP_GATE(80A83370, &lit_4608); SECTION_RODATA static u8 const lit_4609[12] = { 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A83374, &lit_4609); +COMPILER_STRIP_GATE(0x80A83374, &lit_4609); #pragma pop /* 80A83380-80A83384 0000D4 0004+00 0/1 0/0 0/0 .rodata @4610 */ @@ -1450,7 +1470,7 @@ SECTION_RODATA static u8 const lit_4610[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A83380, &lit_4610); +COMPILER_STRIP_GATE(0x80A83380, &lit_4610); #pragma pop /* 80A83384-80A83390 0000D8 000C+00 0/1 0/0 0/0 .rodata @4611 */ @@ -1459,7 +1479,7 @@ COMPILER_STRIP_GATE(80A83380, &lit_4610); SECTION_RODATA static u8 const lit_4611[12] = { 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A83384, &lit_4611); +COMPILER_STRIP_GATE(0x80A83384, &lit_4611); #pragma pop /* 80A83390-80A83394 0000E4 0004+00 0/1 0/0 0/0 .rodata @4612 */ @@ -1471,7 +1491,7 @@ SECTION_RODATA static u8 const lit_4612[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A83390, &lit_4612); +COMPILER_STRIP_GATE(0x80A83390, &lit_4612); #pragma pop /* 80A83394-80A833A0 0000E8 000C+00 0/1 0/0 0/0 .rodata @4613 */ @@ -1480,7 +1500,7 @@ COMPILER_STRIP_GATE(80A83390, &lit_4612); SECTION_RODATA static u8 const lit_4613[12] = { 0x00, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A83394, &lit_4613); +COMPILER_STRIP_GATE(0x80A83394, &lit_4613); #pragma pop /* 80A833A0-80A833A4 0000F4 0004+00 0/1 0/0 0/0 .rodata @4614 */ @@ -1492,7 +1512,7 @@ SECTION_RODATA static u8 const lit_4614[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A833A0, &lit_4614); +COMPILER_STRIP_GATE(0x80A833A0, &lit_4614); #pragma pop /* 80A833A4-80A833B0 0000F8 000C+00 0/1 0/0 0/0 .rodata @4615 */ @@ -1501,7 +1521,7 @@ COMPILER_STRIP_GATE(80A833A0, &lit_4614); SECTION_RODATA static u8 const lit_4615[12] = { 0x00, 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A833A4, &lit_4615); +COMPILER_STRIP_GATE(0x80A833A4, &lit_4615); #pragma pop /* 80A833B0-80A833B4 000104 0004+00 0/1 0/0 0/0 .rodata @4616 */ @@ -1513,7 +1533,7 @@ SECTION_RODATA static u8 const lit_4616[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A833B0, &lit_4616); +COMPILER_STRIP_GATE(0x80A833B0, &lit_4616); #pragma pop /* 80A833B4-80A833C0 000108 000C+00 0/1 0/0 0/0 .rodata @4617 */ @@ -1522,7 +1542,7 @@ COMPILER_STRIP_GATE(80A833B0, &lit_4616); SECTION_RODATA static u8 const lit_4617[12] = { 0x00, 0x04, 0x00, 0x00, 0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A833B4, &lit_4617); +COMPILER_STRIP_GATE(0x80A833B4, &lit_4617); #pragma pop /* 80A833C0-80A833C4 000114 0004+00 0/1 0/0 0/0 .rodata @4618 */ @@ -1534,7 +1554,7 @@ SECTION_RODATA static u8 const lit_4618[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A833C0, &lit_4618); +COMPILER_STRIP_GATE(0x80A833C0, &lit_4618); #pragma pop /* 80A833C4-80A833D0 000118 000C+00 0/1 0/0 0/0 .rodata @4619 */ @@ -1543,7 +1563,7 @@ COMPILER_STRIP_GATE(80A833C0, &lit_4618); SECTION_RODATA static u8 const lit_4619[12] = { 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A833C4, &lit_4619); +COMPILER_STRIP_GATE(0x80A833C4, &lit_4619); #pragma pop /* 80A833D0-80A833D4 000124 0004+00 0/1 0/0 0/0 .rodata @4620 */ @@ -1555,7 +1575,7 @@ SECTION_RODATA static u8 const lit_4620[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A833D0, &lit_4620); +COMPILER_STRIP_GATE(0x80A833D0, &lit_4620); #pragma pop /* 80A833D4-80A833E0 000128 000C+00 0/1 0/0 0/0 .rodata @4621 */ @@ -1564,7 +1584,7 @@ COMPILER_STRIP_GATE(80A833D0, &lit_4620); SECTION_RODATA static u8 const lit_4621[12] = { 0x00, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A833D4, &lit_4621); +COMPILER_STRIP_GATE(0x80A833D4, &lit_4621); #pragma pop /* 80A833E0-80A833E4 000134 0004+00 0/1 0/0 0/0 .rodata @4622 */ @@ -1576,7 +1596,7 @@ SECTION_RODATA static u8 const lit_4622[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A833E0, &lit_4622); +COMPILER_STRIP_GATE(0x80A833E0, &lit_4622); #pragma pop /* 80A833E4-80A833F0 000138 000C+00 0/1 0/0 0/0 .rodata @4623 */ @@ -1585,7 +1605,7 @@ COMPILER_STRIP_GATE(80A833E0, &lit_4622); SECTION_RODATA static u8 const lit_4623[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A833E4, &lit_4623); +COMPILER_STRIP_GATE(0x80A833E4, &lit_4623); #pragma pop /* 80A833F0-80A833F4 000144 0004+00 0/1 0/0 0/0 .rodata @4624 */ @@ -1597,7 +1617,7 @@ SECTION_RODATA static u8 const lit_4624[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A833F0, &lit_4624); +COMPILER_STRIP_GATE(0x80A833F0, &lit_4624); #pragma pop /* 80A833F4-80A833F8 000148 0004+00 0/1 0/0 0/0 .rodata @4625 */ @@ -1609,7 +1629,7 @@ SECTION_RODATA static u8 const lit_4625[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A833F4, &lit_4625); +COMPILER_STRIP_GATE(0x80A833F4, &lit_4625); #pragma pop /* 80A833F8-80A83444 00014C 004C+00 0/0 0/0 0/0 .rodata @4626 */ @@ -1622,7 +1642,7 @@ SECTION_RODATA static u8 const lit_4626[76] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A833F8, &lit_4626); +COMPILER_STRIP_GATE(0x80A833F8, &lit_4626); #pragma pop /* 80A83444-80A83450 000198 000C+00 0/1 0/0 0/0 .rodata @4630 */ @@ -1631,7 +1651,7 @@ COMPILER_STRIP_GATE(80A833F8, &lit_4626); SECTION_RODATA static u8 const lit_4630[12] = { 0x00, 0x0B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A83444, &lit_4630); +COMPILER_STRIP_GATE(0x80A83444, &lit_4630); #pragma pop /* 80A83450-80A83454 0001A4 0004+00 0/1 0/0 0/0 .rodata @4631 */ @@ -1643,7 +1663,7 @@ SECTION_RODATA static u8 const lit_4631[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A83450, &lit_4631); +COMPILER_STRIP_GATE(0x80A83450, &lit_4631); #pragma pop /* 80A83454-80A83460 0001A8 000C+00 0/1 0/0 0/0 .rodata @4632 */ @@ -1652,7 +1672,7 @@ COMPILER_STRIP_GATE(80A83450, &lit_4631); SECTION_RODATA static u8 const lit_4632[12] = { 0x00, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80A83454, &lit_4632); +COMPILER_STRIP_GATE(0x80A83454, &lit_4632); #pragma pop /* 80A83460-80A8346C 0001B4 000C+00 0/1 0/0 0/0 .rodata @4633 */ @@ -1661,7 +1681,7 @@ COMPILER_STRIP_GATE(80A83454, &lit_4632); SECTION_RODATA static u8 const lit_4633[12] = { 0x00, 0x0D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A83460, &lit_4633); +COMPILER_STRIP_GATE(0x80A83460, &lit_4633); #pragma pop /* 80A8346C-80A83474 0001C0 0008+00 0/1 0/0 0/0 .rodata @4634 */ @@ -1670,7 +1690,7 @@ COMPILER_STRIP_GATE(80A83460, &lit_4633); SECTION_RODATA static u8 const lit_4634[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A8346C, &lit_4634); +COMPILER_STRIP_GATE(0x80A8346C, &lit_4634); #pragma pop /* 80A83474-80A83480 0001C8 000C+00 0/1 0/0 0/0 .rodata @4635 */ @@ -1679,7 +1699,7 @@ COMPILER_STRIP_GATE(80A8346C, &lit_4634); SECTION_RODATA static u8 const lit_4635[12] = { 0x00, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A83474, &lit_4635); +COMPILER_STRIP_GATE(0x80A83474, &lit_4635); #pragma pop /* 80A83480-80A83484 0001D4 0004+00 0/1 0/0 0/0 .rodata @4636 */ @@ -1691,7 +1711,7 @@ SECTION_RODATA static u8 const lit_4636[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A83480, &lit_4636); +COMPILER_STRIP_GATE(0x80A83480, &lit_4636); #pragma pop /* 80A83484-80A83490 0001D8 000C+00 0/1 0/0 0/0 .rodata @4637 */ @@ -1700,7 +1720,7 @@ COMPILER_STRIP_GATE(80A83480, &lit_4636); SECTION_RODATA static u8 const lit_4637[12] = { 0x00, 0x0D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A83484, &lit_4637); +COMPILER_STRIP_GATE(0x80A83484, &lit_4637); #pragma pop /* 80A83490-80A83494 0001E4 0004+00 0/1 0/0 0/0 .rodata @4638 */ @@ -1712,7 +1732,7 @@ SECTION_RODATA static u8 const lit_4638[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A83490, &lit_4638); +COMPILER_STRIP_GATE(0x80A83490, &lit_4638); #pragma pop /* 80A83494-80A834A0 0001E8 000C+00 0/1 0/0 0/0 .rodata @4639 */ @@ -1721,7 +1741,7 @@ COMPILER_STRIP_GATE(80A83490, &lit_4638); SECTION_RODATA static u8 const lit_4639[12] = { 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80A83494, &lit_4639); +COMPILER_STRIP_GATE(0x80A83494, &lit_4639); #pragma pop /* 80A834A0-80A834AC 0001F4 000C+00 0/1 0/0 0/0 .rodata @4640 */ @@ -1730,7 +1750,7 @@ COMPILER_STRIP_GATE(80A83494, &lit_4639); SECTION_RODATA static u8 const lit_4640[12] = { 0x00, 0x0D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A834A0, &lit_4640); +COMPILER_STRIP_GATE(0x80A834A0, &lit_4640); #pragma pop /* 80A834AC-80A834B4 000200 0008+00 0/1 0/0 0/0 .rodata @4641 */ @@ -1739,7 +1759,7 @@ COMPILER_STRIP_GATE(80A834A0, &lit_4640); SECTION_RODATA static u8 const lit_4641[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A834AC, &lit_4641); +COMPILER_STRIP_GATE(0x80A834AC, &lit_4641); #pragma pop /* 80A834B4-80A834C0 000208 000C+00 0/1 0/0 0/0 .rodata @4642 */ @@ -1748,7 +1768,7 @@ COMPILER_STRIP_GATE(80A834AC, &lit_4641); SECTION_RODATA static u8 const lit_4642[12] = { 0x00, 0x13, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A834B4, &lit_4642); +COMPILER_STRIP_GATE(0x80A834B4, &lit_4642); #pragma pop /* 80A834C0-80A834C4 000214 0004+00 0/1 0/0 0/0 .rodata @4643 */ @@ -1760,7 +1780,7 @@ SECTION_RODATA static u8 const lit_4643[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A834C0, &lit_4643); +COMPILER_STRIP_GATE(0x80A834C0, &lit_4643); #pragma pop /* 80A834C4-80A834D0 000218 000C+00 0/1 0/0 0/0 .rodata @4644 */ @@ -1769,7 +1789,7 @@ COMPILER_STRIP_GATE(80A834C0, &lit_4643); SECTION_RODATA static u8 const lit_4644[12] = { 0x00, 0x1C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A834C4, &lit_4644); +COMPILER_STRIP_GATE(0x80A834C4, &lit_4644); #pragma pop /* 80A834D0-80A834D4 000224 0004+00 0/1 0/0 0/0 .rodata @4645 */ @@ -1781,7 +1801,7 @@ SECTION_RODATA static u8 const lit_4645[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A834D0, &lit_4645); +COMPILER_STRIP_GATE(0x80A834D0, &lit_4645); #pragma pop /* 80A834D4-80A834E0 000228 000C+00 0/1 0/0 0/0 .rodata @4646 */ @@ -1790,7 +1810,7 @@ COMPILER_STRIP_GATE(80A834D0, &lit_4645); SECTION_RODATA static u8 const lit_4646[12] = { 0x00, 0x1D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80A834D4, &lit_4646); +COMPILER_STRIP_GATE(0x80A834D4, &lit_4646); #pragma pop /* 80A834E0-80A834EC 000234 000C+00 0/1 0/0 0/0 .rodata @4647 */ @@ -1799,7 +1819,7 @@ COMPILER_STRIP_GATE(80A834D4, &lit_4646); SECTION_RODATA static u8 const lit_4647[12] = { 0x00, 0x1C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A834E0, &lit_4647); +COMPILER_STRIP_GATE(0x80A834E0, &lit_4647); #pragma pop /* 80A834EC-80A834F4 000240 0008+00 0/1 0/0 0/0 .rodata @4648 */ @@ -1808,7 +1828,7 @@ COMPILER_STRIP_GATE(80A834E0, &lit_4647); SECTION_RODATA static u8 const lit_4648[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A834EC, &lit_4648); +COMPILER_STRIP_GATE(0x80A834EC, &lit_4648); #pragma pop /* 80A834F4-80A83500 000248 000C+00 0/1 0/0 0/0 .rodata @4649 */ @@ -1817,7 +1837,7 @@ COMPILER_STRIP_GATE(80A834EC, &lit_4648); SECTION_RODATA static u8 const lit_4649[12] = { 0x00, 0x15, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A834F4, &lit_4649); +COMPILER_STRIP_GATE(0x80A834F4, &lit_4649); #pragma pop /* 80A83500-80A83504 000254 0004+00 0/1 0/0 0/0 .rodata @4650 */ @@ -1829,7 +1849,7 @@ SECTION_RODATA static u8 const lit_4650[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A83500, &lit_4650); +COMPILER_STRIP_GATE(0x80A83500, &lit_4650); #pragma pop /* 80A83504-80A83510 000258 000C+00 0/1 0/0 0/0 .rodata @4651 */ @@ -1838,7 +1858,7 @@ COMPILER_STRIP_GATE(80A83500, &lit_4650); SECTION_RODATA static u8 const lit_4651[12] = { 0x00, 0x17, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80A83504, &lit_4651); +COMPILER_STRIP_GATE(0x80A83504, &lit_4651); #pragma pop /* 80A83510-80A8351C 000264 000C+00 0/1 0/0 0/0 .rodata @4652 */ @@ -1847,7 +1867,7 @@ COMPILER_STRIP_GATE(80A83504, &lit_4651); SECTION_RODATA static u8 const lit_4652[12] = { 0x00, 0x15, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A83510, &lit_4652); +COMPILER_STRIP_GATE(0x80A83510, &lit_4652); #pragma pop /* 80A8351C-80A83524 000270 0008+00 0/1 0/0 0/0 .rodata @4653 */ @@ -1856,7 +1876,7 @@ COMPILER_STRIP_GATE(80A83510, &lit_4652); SECTION_RODATA static u8 const lit_4653[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A8351C, &lit_4653); +COMPILER_STRIP_GATE(0x80A8351C, &lit_4653); #pragma pop /* 80A83524-80A83530 000278 000C+00 0/1 0/0 0/0 .rodata @4654 */ @@ -1865,7 +1885,7 @@ COMPILER_STRIP_GATE(80A8351C, &lit_4653); SECTION_RODATA static u8 const lit_4654[12] = { 0x00, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80A83524, &lit_4654); +COMPILER_STRIP_GATE(0x80A83524, &lit_4654); #pragma pop /* 80A83530-80A8353C 000284 000C+00 0/1 0/0 0/0 .rodata @4655 */ @@ -1874,7 +1894,7 @@ COMPILER_STRIP_GATE(80A83524, &lit_4654); SECTION_RODATA static u8 const lit_4655[12] = { 0x00, 0x19, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A83530, &lit_4655); +COMPILER_STRIP_GATE(0x80A83530, &lit_4655); #pragma pop /* 80A8353C-80A83544 000290 0008+00 0/1 0/0 0/0 .rodata @4656 */ @@ -1883,7 +1903,7 @@ COMPILER_STRIP_GATE(80A83530, &lit_4655); SECTION_RODATA static u8 const lit_4656[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A8353C, &lit_4656); +COMPILER_STRIP_GATE(0x80A8353C, &lit_4656); #pragma pop /* 80A83544-80A83550 000298 000C+00 0/1 0/0 0/0 .rodata @4657 */ @@ -1892,7 +1912,7 @@ COMPILER_STRIP_GATE(80A8353C, &lit_4656); SECTION_RODATA static u8 const lit_4657[12] = { 0x00, 0x19, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A83544, &lit_4657); +COMPILER_STRIP_GATE(0x80A83544, &lit_4657); #pragma pop /* 80A83550-80A83554 0002A4 0004+00 0/1 0/0 0/0 .rodata @4658 */ @@ -1904,7 +1924,7 @@ SECTION_RODATA static u8 const lit_4658[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A83550, &lit_4658); +COMPILER_STRIP_GATE(0x80A83550, &lit_4658); #pragma pop /* 80A83554-80A83560 0002A8 000C+00 0/1 0/0 0/0 .rodata @4659 */ @@ -1913,7 +1933,7 @@ COMPILER_STRIP_GATE(80A83550, &lit_4658); SECTION_RODATA static u8 const lit_4659[12] = { 0x00, 0x1A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80A83554, &lit_4659); +COMPILER_STRIP_GATE(0x80A83554, &lit_4659); #pragma pop /* 80A83560-80A8356C 0002B4 000C+00 0/1 0/0 0/0 .rodata @4660 */ @@ -1922,7 +1942,7 @@ COMPILER_STRIP_GATE(80A83554, &lit_4659); SECTION_RODATA static u8 const lit_4660[12] = { 0x00, 0x19, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A83560, &lit_4660); +COMPILER_STRIP_GATE(0x80A83560, &lit_4660); #pragma pop /* 80A8356C-80A83574 0002C0 0008+00 0/1 0/0 0/0 .rodata @4661 */ @@ -1931,7 +1951,7 @@ COMPILER_STRIP_GATE(80A83560, &lit_4660); SECTION_RODATA static u8 const lit_4661[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A8356C, &lit_4661); +COMPILER_STRIP_GATE(0x80A8356C, &lit_4661); #pragma pop /* 80A83574-80A83580 0002C8 000C+00 0/1 0/0 0/0 .rodata @4662 */ @@ -1940,7 +1960,7 @@ COMPILER_STRIP_GATE(80A8356C, &lit_4661); SECTION_RODATA static u8 const lit_4662[12] = { 0x00, 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80A83574, &lit_4662); +COMPILER_STRIP_GATE(0x80A83574, &lit_4662); #pragma pop /* 80A83580-80A8358C 0002D4 000C+00 0/1 0/0 0/0 .rodata @4663 */ @@ -1949,7 +1969,7 @@ COMPILER_STRIP_GATE(80A83574, &lit_4662); SECTION_RODATA static u8 const lit_4663[12] = { 0x00, 0x0D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A83580, &lit_4663); +COMPILER_STRIP_GATE(0x80A83580, &lit_4663); #pragma pop /* 80A8358C-80A83594 0002E0 0008+00 0/1 0/0 0/0 .rodata @4664 */ @@ -1958,7 +1978,7 @@ COMPILER_STRIP_GATE(80A83580, &lit_4663); SECTION_RODATA static u8 const lit_4664[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A8358C, &lit_4664); +COMPILER_STRIP_GATE(0x80A8358C, &lit_4664); #pragma pop /* 80A83594-80A835A0 0002E8 000C+00 0/1 0/0 0/0 .rodata @4665 */ @@ -1967,7 +1987,7 @@ COMPILER_STRIP_GATE(80A8358C, &lit_4664); SECTION_RODATA static u8 const lit_4665[12] = { 0x00, 0x1E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80A83594, &lit_4665); +COMPILER_STRIP_GATE(0x80A83594, &lit_4665); #pragma pop /* 80A835A0-80A835AC 0002F4 000C+00 0/1 0/0 0/0 .rodata @4666 */ @@ -1976,7 +1996,7 @@ COMPILER_STRIP_GATE(80A83594, &lit_4665); SECTION_RODATA static u8 const lit_4666[12] = { 0x00, 0x1F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A835A0, &lit_4666); +COMPILER_STRIP_GATE(0x80A835A0, &lit_4666); #pragma pop /* 80A835AC-80A835B4 000300 0008+00 0/1 0/0 0/0 .rodata @4667 */ @@ -1985,7 +2005,7 @@ COMPILER_STRIP_GATE(80A835A0, &lit_4666); SECTION_RODATA static u8 const lit_4667[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A835AC, &lit_4667); +COMPILER_STRIP_GATE(0x80A835AC, &lit_4667); #pragma pop /* 80A835B4-80A835C0 000308 000C+00 0/1 0/0 0/0 .rodata @4668 */ @@ -1994,7 +2014,7 @@ COMPILER_STRIP_GATE(80A835AC, &lit_4667); SECTION_RODATA static u8 const lit_4668[12] = { 0x00, 0x1F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A835B4, &lit_4668); +COMPILER_STRIP_GATE(0x80A835B4, &lit_4668); #pragma pop /* 80A835C0-80A835C4 000314 0004+00 0/1 0/0 0/0 .rodata @4669 */ @@ -2006,7 +2026,7 @@ SECTION_RODATA static u8 const lit_4669[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A835C0, &lit_4669); +COMPILER_STRIP_GATE(0x80A835C0, &lit_4669); #pragma pop /* 80A835C4-80A835D0 000318 000C+00 0/1 0/0 0/0 .rodata @4670 */ @@ -2015,7 +2035,7 @@ COMPILER_STRIP_GATE(80A835C0, &lit_4669); SECTION_RODATA static u8 const lit_4670[12] = { 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80A835C4, &lit_4670); +COMPILER_STRIP_GATE(0x80A835C4, &lit_4670); #pragma pop /* 80A835D0-80A835DC 000324 000C+00 0/1 0/0 0/0 .rodata @4671 */ @@ -2024,7 +2044,7 @@ COMPILER_STRIP_GATE(80A835C4, &lit_4670); SECTION_RODATA static u8 const lit_4671[12] = { 0x00, 0x1F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A835D0, &lit_4671); +COMPILER_STRIP_GATE(0x80A835D0, &lit_4671); #pragma pop /* 80A835DC-80A835E4 000330 0008+00 0/1 0/0 0/0 .rodata @4672 */ @@ -2033,7 +2053,7 @@ COMPILER_STRIP_GATE(80A835D0, &lit_4671); SECTION_RODATA static u8 const lit_4672[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A835DC, &lit_4672); +COMPILER_STRIP_GATE(0x80A835DC, &lit_4672); #pragma pop /* 80A835E4-80A835F0 000338 000C+00 0/1 0/0 0/0 .rodata @4673 */ @@ -2042,7 +2062,7 @@ COMPILER_STRIP_GATE(80A835DC, &lit_4672); SECTION_RODATA static u8 const lit_4673[12] = { 0x00, 0x21, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80A835E4, &lit_4673); +COMPILER_STRIP_GATE(0x80A835E4, &lit_4673); #pragma pop /* 80A835F0-80A835FC 000344 000C+00 0/1 0/0 0/0 .rodata @4674 */ @@ -2051,7 +2071,7 @@ COMPILER_STRIP_GATE(80A835E4, &lit_4673); SECTION_RODATA static u8 const lit_4674[12] = { 0x00, 0x1C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A835F0, &lit_4674); +COMPILER_STRIP_GATE(0x80A835F0, &lit_4674); #pragma pop /* 80A835FC-80A83604 000350 0008+00 0/1 0/0 0/0 .rodata @4675 */ @@ -2060,7 +2080,7 @@ COMPILER_STRIP_GATE(80A835F0, &lit_4674); SECTION_RODATA static u8 const lit_4675[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A835FC, &lit_4675); +COMPILER_STRIP_GATE(0x80A835FC, &lit_4675); #pragma pop /* 80A83604-80A83610 000358 000C+00 0/1 0/0 0/0 .rodata @4676 */ @@ -2069,7 +2089,7 @@ COMPILER_STRIP_GATE(80A835FC, &lit_4675); SECTION_RODATA static u8 const lit_4676[12] = { 0x00, 0x26, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A83604, &lit_4676); +COMPILER_STRIP_GATE(0x80A83604, &lit_4676); #pragma pop /* 80A83610-80A83614 000364 0004+00 0/1 0/0 0/0 .rodata @4677 */ @@ -2081,7 +2101,7 @@ SECTION_RODATA static u8 const lit_4677[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A83610, &lit_4677); +COMPILER_STRIP_GATE(0x80A83610, &lit_4677); #pragma pop /* 80A83614-80A83620 000368 000C+00 0/1 0/0 0/0 .rodata @4678 */ @@ -2090,7 +2110,7 @@ COMPILER_STRIP_GATE(80A83610, &lit_4677); SECTION_RODATA static u8 const lit_4678[12] = { 0x00, 0x25, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A83614, &lit_4678); +COMPILER_STRIP_GATE(0x80A83614, &lit_4678); #pragma pop /* 80A83620-80A83624 000374 0004+00 0/1 0/0 0/0 .rodata @4679 */ @@ -2102,7 +2122,7 @@ SECTION_RODATA static u8 const lit_4679[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A83620, &lit_4679); +COMPILER_STRIP_GATE(0x80A83620, &lit_4679); #pragma pop /* 80A83624-80A83630 000378 000C+00 0/1 0/0 0/0 .rodata @4680 */ @@ -2111,7 +2131,7 @@ COMPILER_STRIP_GATE(80A83620, &lit_4679); SECTION_RODATA static u8 const lit_4680[12] = { 0x00, 0x24, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80A83624, &lit_4680); +COMPILER_STRIP_GATE(0x80A83624, &lit_4680); #pragma pop /* 80A83630-80A8363C 000384 000C+00 0/1 0/0 0/0 .rodata @4681 */ @@ -2120,7 +2140,7 @@ COMPILER_STRIP_GATE(80A83624, &lit_4680); SECTION_RODATA static u8 const lit_4681[12] = { 0x00, 0x25, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A83630, &lit_4681); +COMPILER_STRIP_GATE(0x80A83630, &lit_4681); #pragma pop /* 80A8363C-80A83644 000390 0008+00 0/1 0/0 0/0 .rodata @4682 */ @@ -2129,7 +2149,7 @@ COMPILER_STRIP_GATE(80A83630, &lit_4681); SECTION_RODATA static u8 const lit_4682[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A8363C, &lit_4682); +COMPILER_STRIP_GATE(0x80A8363C, &lit_4682); #pragma pop /* 80A83644-80A83650 000398 000C+00 0/1 0/0 0/0 .rodata @4683 */ @@ -2138,7 +2158,7 @@ COMPILER_STRIP_GATE(80A8363C, &lit_4682); SECTION_RODATA static u8 const lit_4683[12] = { 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80A83644, &lit_4683); +COMPILER_STRIP_GATE(0x80A83644, &lit_4683); #pragma pop /* 80A83650-80A8365C 0003A4 000C+00 0/1 0/0 0/0 .rodata @4684 */ @@ -2147,7 +2167,7 @@ COMPILER_STRIP_GATE(80A83644, &lit_4683); SECTION_RODATA static u8 const lit_4684[12] = { 0x00, 0x15, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A83650, &lit_4684); +COMPILER_STRIP_GATE(0x80A83650, &lit_4684); #pragma pop /* 80A8365C-80A83664 0003B0 0008+00 0/1 0/0 0/0 .rodata @4685 */ @@ -2156,7 +2176,7 @@ COMPILER_STRIP_GATE(80A83650, &lit_4684); SECTION_RODATA static u8 const lit_4685[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A8365C, &lit_4685); +COMPILER_STRIP_GATE(0x80A8365C, &lit_4685); #pragma pop /* 80A83664-80A83670 0003B8 000C+00 0/1 0/0 0/0 .rodata @4686 */ @@ -2165,7 +2185,7 @@ COMPILER_STRIP_GATE(80A8365C, &lit_4685); SECTION_RODATA static u8 const lit_4686[12] = { 0x00, 0x16, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80A83664, &lit_4686); +COMPILER_STRIP_GATE(0x80A83664, &lit_4686); #pragma pop /* 80A83670-80A83674 0003C4 0004+00 0/1 0/0 0/0 .rodata @4687 */ @@ -2177,7 +2197,7 @@ SECTION_RODATA static u8 const lit_4687[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A83670, &lit_4687); +COMPILER_STRIP_GATE(0x80A83670, &lit_4687); #pragma pop /* 80A83674-80A83680 0003C8 000C+00 0/1 0/0 0/0 .rodata @4688 */ @@ -2186,7 +2206,7 @@ COMPILER_STRIP_GATE(80A83670, &lit_4687); SECTION_RODATA static u8 const lit_4688[12] = { 0x00, 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80A83674, &lit_4688); +COMPILER_STRIP_GATE(0x80A83674, &lit_4688); #pragma pop /* 80A83680-80A8368C 0003D4 000C+00 0/1 0/0 0/0 .rodata @4689 */ @@ -2195,7 +2215,7 @@ COMPILER_STRIP_GATE(80A83674, &lit_4688); SECTION_RODATA static u8 const lit_4689[12] = { 0x00, 0x13, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A83680, &lit_4689); +COMPILER_STRIP_GATE(0x80A83680, &lit_4689); #pragma pop /* 80A8368C-80A83694 0003E0 0008+00 0/1 0/0 0/0 .rodata @4690 */ @@ -2204,7 +2224,7 @@ COMPILER_STRIP_GATE(80A83680, &lit_4689); SECTION_RODATA static u8 const lit_4690[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A8368C, &lit_4690); +COMPILER_STRIP_GATE(0x80A8368C, &lit_4690); #pragma pop /* 80A83694-80A836A0 0003E8 000C+00 0/1 0/0 0/0 .rodata @4691 */ @@ -2213,7 +2233,7 @@ COMPILER_STRIP_GATE(80A8368C, &lit_4690); SECTION_RODATA static u8 const lit_4691[12] = { 0x00, 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80A83694, &lit_4691); +COMPILER_STRIP_GATE(0x80A83694, &lit_4691); #pragma pop /* 80A836A0-80A836A8 0003F4 0008+00 0/1 0/0 0/0 .rodata @4692 */ @@ -2222,7 +2242,7 @@ COMPILER_STRIP_GATE(80A83694, &lit_4691); SECTION_RODATA static u8 const lit_4692[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A836A0, &lit_4692); +COMPILER_STRIP_GATE(0x80A836A0, &lit_4692); #pragma pop /* 80A836A8-80A836B4 0003FC 000C+00 0/1 0/0 0/0 .rodata @4693 */ @@ -2231,7 +2251,7 @@ COMPILER_STRIP_GATE(80A836A0, &lit_4692); SECTION_RODATA static u8 const lit_4693[12] = { 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A836A8, &lit_4693); +COMPILER_STRIP_GATE(0x80A836A8, &lit_4693); #pragma pop /* 80A836B4-80A836B8 000408 0004+00 0/1 0/0 0/0 .rodata @4694 */ @@ -2243,7 +2263,7 @@ SECTION_RODATA static u8 const lit_4694[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A836B4, &lit_4694); +COMPILER_STRIP_GATE(0x80A836B4, &lit_4694); #pragma pop /* 80A836B8-80A836C4 00040C 000C+00 0/1 0/0 0/0 .rodata @4695 */ @@ -2252,7 +2272,7 @@ COMPILER_STRIP_GATE(80A836B4, &lit_4694); SECTION_RODATA static u8 const lit_4695[12] = { 0x00, 0x0F, 0x00, 0x00, 0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80A836B8, &lit_4695); +COMPILER_STRIP_GATE(0x80A836B8, &lit_4695); #pragma pop /* 80A836C4-80A836C8 000418 0004+00 0/1 0/0 0/0 .rodata @4696 */ @@ -2264,7 +2284,7 @@ SECTION_RODATA static u8 const lit_4696[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A836C4, &lit_4696); +COMPILER_STRIP_GATE(0x80A836C4, &lit_4696); #pragma pop /* 80A836C8-80A836D4 00041C 000C+00 0/1 0/0 0/0 .rodata @4697 */ @@ -2273,7 +2293,7 @@ COMPILER_STRIP_GATE(80A836C4, &lit_4696); SECTION_RODATA static u8 const lit_4697[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A836C8, &lit_4697); +COMPILER_STRIP_GATE(0x80A836C8, &lit_4697); #pragma pop /* 80A836D4-80A836D8 000428 0004+00 0/1 0/0 0/0 .rodata @4698 */ @@ -2285,7 +2305,7 @@ SECTION_RODATA static u8 const lit_4698[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A836D4, &lit_4698); +COMPILER_STRIP_GATE(0x80A836D4, &lit_4698); #pragma pop /* 80A836D8-80A83784 00042C 00AC+00 0/0 0/0 0/0 .rodata @4699 */ @@ -2304,7 +2324,7 @@ SECTION_RODATA static u8 const lit_4699[172] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A836D8, &lit_4699); +COMPILER_STRIP_GATE(0x80A836D8, &lit_4699); #pragma pop /* 80A83784-80A83790 0004D8 000C+00 0/1 0/0 0/0 .rodata @4735 */ @@ -2313,18 +2333,18 @@ COMPILER_STRIP_GATE(80A836D8, &lit_4699); SECTION_RODATA static u8 const lit_4735[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A83784, &lit_4735); +COMPILER_STRIP_GATE(0x80A83784, &lit_4735); #pragma pop /* 80A83790-80A83794 0004E4 0004+00 3/11 0/0 0/0 .rodata @4960 */ SECTION_RODATA static f32 const lit_4960 = -1.0f; -COMPILER_STRIP_GATE(80A83790, &lit_4960); +COMPILER_STRIP_GATE(0x80A83790, &lit_4960); /* 80A83794-80A83798 0004E8 0004+00 0/2 0/0 0/0 .rodata @4961 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4961 = 135.0f; -COMPILER_STRIP_GATE(80A83794, &lit_4961); +COMPILER_STRIP_GATE(0x80A83794, &lit_4961); #pragma pop /* 80A7D934-80A7DD94 0018B4 0460+00 1/0 0/0 0/0 .text wait_type0__11daNpcMoiR_cFPv */ @@ -2362,21 +2382,21 @@ asm void daNpcMoiR_c::setExpression(int param_0, f32 param_1) { #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_5160 = 0x3BB40000; -COMPILER_STRIP_GATE(80A83798, &lit_5160); +COMPILER_STRIP_GATE(0x80A83798, &lit_5160); #pragma pop /* 80A8379C-80A837A0 0004F0 0004+00 0/6 0/0 0/0 .rodata @5161 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5161 = 8.0f; -COMPILER_STRIP_GATE(80A8379C, &lit_5161); +COMPILER_STRIP_GATE(0x80A8379C, &lit_5161); #pragma pop /* 80A837A0-80A837A4 0004F4 0004+00 0/7 0/0 0/0 .rodata @5162 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5162 = 15.0f; -COMPILER_STRIP_GATE(80A837A0, &lit_5162); +COMPILER_STRIP_GATE(0x80A837A0, &lit_5162); #pragma pop /* 80A837A4-80A837AC 0004F8 0008+00 0/1 0/0 0/0 .rodata @5163 */ @@ -2385,7 +2405,7 @@ COMPILER_STRIP_GATE(80A837A0, &lit_5162); SECTION_RODATA static u8 const lit_5163[8] = { 0x40, 0x72, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A837A4, &lit_5163); +COMPILER_STRIP_GATE(0x80A837A4, &lit_5163); #pragma pop /* 80A837AC-80A837B4 000500 0008+00 0/2 0/0 0/0 .rodata @5164 */ @@ -2394,14 +2414,14 @@ COMPILER_STRIP_GATE(80A837A4, &lit_5163); SECTION_RODATA static u8 const lit_5164[8] = { 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A837AC, &lit_5164); +COMPILER_STRIP_GATE(0x80A837AC, &lit_5164); #pragma pop /* 80A837B4-80A837BC 000508 0008+00 1/7 0/0 0/0 .rodata @5166 */ SECTION_RODATA static u8 const lit_5166[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A837B4, &lit_5166); +COMPILER_STRIP_GATE(0x80A837B4, &lit_5166); /* 80A7DE04-80A7E668 001D84 0864+00 2/0 0/0 0/0 .text wait_type1__11daNpcMoiR_cFPv */ #pragma push @@ -2418,14 +2438,14 @@ asm void daNpcMoiR_c::wait_type1(void* param_0) { #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_5201 = 0xC57F0160; -COMPILER_STRIP_GATE(80A837BC, &lit_5201); +COMPILER_STRIP_GATE(0x80A837BC, &lit_5201); #pragma pop /* 80A837C0-80A837C4 000514 0004+00 0/1 0/0 0/0 .rodata @5202 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_5202 = 0x45FCF4EE; -COMPILER_STRIP_GATE(80A837C0, &lit_5202); +COMPILER_STRIP_GATE(0x80A837C0, &lit_5202); #pragma pop /* 80A7E668-80A7E8C0 0025E8 0258+00 1/0 0/0 0/0 .text wait_type2__11daNpcMoiR_cFPv */ @@ -2438,6 +2458,13 @@ asm void daNpcMoiR_c::wait_type2(void* param_0) { } #pragma pop +/* ############################################################################################## */ +/* 80A83840-80A83840 000594 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80A83899 = "DEFAULT_GETITEM"; +#pragma pop + /* 80A7E8C0-80A7EFBC 002840 06FC+00 2/0 0/0 0/0 .text talk__11daNpcMoiR_cFPv */ #pragma push #pragma optimization_level 0 @@ -2453,7 +2480,7 @@ asm void daNpcMoiR_c::talk(void* param_0) { SECTION_RODATA static u8 const lit_5306[16] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A837C4, &lit_5306); +COMPILER_STRIP_GATE(0x80A837C4, &lit_5306); /* 80A7EFBC-80A7F40C 002F3C 0450+00 2/0 0/0 0/0 .text multiTalk__11daNpcMoiR_cFPv */ #pragma push @@ -2470,14 +2497,14 @@ asm void daNpcMoiR_c::multiTalk(void* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5440 = 11.0f; -COMPILER_STRIP_GATE(80A837D4, &lit_5440); +COMPILER_STRIP_GATE(0x80A837D4, &lit_5440); #pragma pop /* 80A837D8-80A837DC 00052C 0004+00 0/1 0/0 0/0 .rodata @5441 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5441 = 36.0f; -COMPILER_STRIP_GATE(80A837D8, &lit_5441); +COMPILER_STRIP_GATE(0x80A837D8, &lit_5441); #pragma pop /* 80A837DC-80A837E4 000530 0008+00 0/1 0/0 0/0 .rodata @5442 */ @@ -2486,7 +2513,7 @@ COMPILER_STRIP_GATE(80A837D8, &lit_5441); SECTION_RODATA static u8 const lit_5442[8] = { 0x40, 0x85, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A837DC, &lit_5442); +COMPILER_STRIP_GATE(0x80A837DC, &lit_5442); #pragma pop /* 80A7F40C-80A7F9AC 00338C 05A0+00 2/0 0/0 0/0 .text fight__11daNpcMoiR_cFPv */ @@ -2514,14 +2541,14 @@ asm void daNpcMoiR_c::demo(void* param_0) { #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_5586 = 0xC5C36B19; -COMPILER_STRIP_GATE(80A837E4, &lit_5586); +COMPILER_STRIP_GATE(0x80A837E4, &lit_5586); #pragma pop /* 80A837E8-80A837EC 00053C 0004+00 0/1 0/0 0/0 .rodata @5587 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_5587 = 0x45C35E15; -COMPILER_STRIP_GATE(80A837E8, &lit_5587); +COMPILER_STRIP_GATE(0x80A837E8, &lit_5587); #pragma pop /* 80A837EC-80A837F4 000540 0004+04 0/1 0/0 0/0 .rodata @5588 */ @@ -2532,7 +2559,7 @@ SECTION_RODATA static f32 const lit_5588[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80A837EC, &lit_5588); +COMPILER_STRIP_GATE(0x80A837EC, &lit_5588); #pragma pop /* 80A837F4-80A837FC 000548 0008+00 0/2 0/0 0/0 .rodata @5589 */ @@ -2541,7 +2568,7 @@ COMPILER_STRIP_GATE(80A837EC, &lit_5588); SECTION_RODATA static u8 const lit_5589[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A837F4, &lit_5589); +COMPILER_STRIP_GATE(0x80A837F4, &lit_5589); #pragma pop /* 80A837FC-80A83804 000550 0008+00 0/2 0/0 0/0 .rodata @5590 */ @@ -2550,7 +2577,7 @@ COMPILER_STRIP_GATE(80A837F4, &lit_5589); SECTION_RODATA static u8 const lit_5590[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A837FC, &lit_5590); +COMPILER_STRIP_GATE(0x80A837FC, &lit_5590); #pragma pop /* 80A83804-80A8380C 000558 0008+00 0/2 0/0 0/0 .rodata @5591 */ @@ -2559,7 +2586,7 @@ COMPILER_STRIP_GATE(80A837FC, &lit_5590); SECTION_RODATA static u8 const lit_5591[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A83804, &lit_5591); +COMPILER_STRIP_GATE(0x80A83804, &lit_5591); #pragma pop /* 80A7FEE8-80A802C4 003E68 03DC+00 1/0 0/0 0/0 .text leave__11daNpcMoiR_cFPv */ @@ -2572,6 +2599,13 @@ asm void daNpcMoiR_c::leave(void* param_0) { } #pragma pop +/* ############################################################################################## */ +/* 80A83840-80A83840 000594 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80A838A9 = "prm"; +#pragma pop + /* 80A802C4-80A803A0 004244 00DC+00 1/0 0/0 0/0 .text EvCut_Introduction__11daNpcMoiR_cFi */ #pragma push @@ -2598,7 +2632,7 @@ asm void daNpcMoiR_c::EvCut_Appear(int param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5816 = 25.0f; -COMPILER_STRIP_GATE(80A8380C, &lit_5816); +COMPILER_STRIP_GATE(0x80A8380C, &lit_5816); #pragma pop /* 80A8081C-80A81044 00479C 0828+00 1/0 0/0 0/0 .text EvCut_Appear2__11daNpcMoiR_cFi */ @@ -2691,21 +2725,21 @@ asm void daNpcMoiR_c::main() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6020 = 14.0f; -COMPILER_STRIP_GATE(80A83810, &lit_6020); +COMPILER_STRIP_GATE(0x80A83810, &lit_6020); #pragma pop /* 80A83814-80A83818 000568 0004+00 0/1 0/0 0/0 .rodata @6021 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6021 = 24.0f; -COMPILER_STRIP_GATE(80A83814, &lit_6021); +COMPILER_STRIP_GATE(0x80A83814, &lit_6021); #pragma pop /* 80A83818-80A8381C 00056C 0004+00 0/1 0/0 0/0 .rodata @6022 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6022 = 33.0f; -COMPILER_STRIP_GATE(80A83818, &lit_6022); +COMPILER_STRIP_GATE(0x80A83818, &lit_6022); #pragma pop /* 80A815D4-80A818B4 005554 02E0+00 1/1 0/0 0/0 .text checkHeadGear__11daNpcMoiR_cFv */ @@ -2731,7 +2765,7 @@ asm void daNpcMoiR_c::playMotion() { /* ############################################################################################## */ /* 80A8381C-80A83820 000570 0004+00 1/1 0/0 0/0 .rodata @6069 */ SECTION_RODATA static f32 const lit_6069 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(80A8381C, &lit_6069); +COMPILER_STRIP_GATE(0x80A8381C, &lit_6069); /* 80A8210C-80A821E0 00608C 00D4+00 1/0 0/0 0/0 .text ctrlBtk__11daNpcMoiR_cFv */ #pragma push @@ -2748,42 +2782,42 @@ asm void daNpcMoiR_c::ctrlBtk() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6177 = -10.0f; -COMPILER_STRIP_GATE(80A83820, &lit_6177); +COMPILER_STRIP_GATE(0x80A83820, &lit_6177); #pragma pop /* 80A83824-80A83828 000578 0004+00 0/1 0/0 0/0 .rodata @6178 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6178 = -15.0f; -COMPILER_STRIP_GATE(80A83824, &lit_6178); +COMPILER_STRIP_GATE(0x80A83824, &lit_6178); #pragma pop /* 80A83828-80A8382C 00057C 0004+00 0/1 0/0 0/0 .rodata @6179 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6179 = -3.0f / 20.0f; -COMPILER_STRIP_GATE(80A83828, &lit_6179); +COMPILER_STRIP_GATE(0x80A83828, &lit_6179); #pragma pop /* 80A8382C-80A83830 000580 0004+00 0/1 0/0 0/0 .rodata @6180 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6180 = 10.0f; -COMPILER_STRIP_GATE(80A8382C, &lit_6180); +COMPILER_STRIP_GATE(0x80A8382C, &lit_6180); #pragma pop /* 80A83830-80A83834 000584 0004+00 0/1 0/0 0/0 .rodata @6181 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6181 = 2.0f; -COMPILER_STRIP_GATE(80A83830, &lit_6181); +COMPILER_STRIP_GATE(0x80A83830, &lit_6181); #pragma pop /* 80A83834-80A83838 000588 0004+00 0/2 0/0 0/0 .rodata @6182 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6182 = 40.0f; -COMPILER_STRIP_GATE(80A83834, &lit_6182); +COMPILER_STRIP_GATE(0x80A83834, &lit_6182); #pragma pop /* 80A821E0-80A825A0 006160 03C0+00 1/0 0/0 0/0 .text setAttnPos__11daNpcMoiR_cFv */ @@ -2801,14 +2835,14 @@ asm void daNpcMoiR_c::setAttnPos() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6230 = -80.0f; -COMPILER_STRIP_GATE(80A83838, &lit_6230); +COMPILER_STRIP_GATE(0x80A83838, &lit_6230); #pragma pop /* 80A8383C-80A83840 000590 0004+00 0/1 0/0 0/0 .rodata @6231 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6231 = 80.0f; -COMPILER_STRIP_GATE(80A8383C, &lit_6231); +COMPILER_STRIP_GATE(0x80A8383C, &lit_6231); #pragma pop /* 80A825A0-80A82878 006520 02D8+00 1/1 0/0 0/0 .text lookat__11daNpcMoiR_cFv */ @@ -2980,7 +3014,7 @@ asm cCcD_GStts::~cCcD_GStts() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80A830EC(int* param_0) { +extern "C" asm void func_80A830EC(void* _this, int* param_0) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_moir/d_a_npc_moir/func_80A830EC.s" } @@ -2990,7 +3024,7 @@ extern "C" asm void func_80A830EC(int* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80A83108(int param_0, int param_1) { +extern "C" asm void func_80A83108(void* _this, int param_0, int param_1) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_moir/d_a_npc_moir/func_80A83108.s" } @@ -3022,7 +3056,7 @@ asm void __sinit_d_a_npc_moir_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80A83184 = (void*)__sinit_d_a_npc_moir_cpp; +REGISTER_CTORS(0x80A83184, __sinit_d_a_npc_moir_cpp); #pragma pop /* 80A83240-80A83288 0071C0 0048+00 2/1 0/0 0/0 .text __dt__17daNpcMoiR_Param_cFv */ @@ -3055,21 +3089,4 @@ static asm void func_80A83290() { } #pragma pop -/* 80A83840-80A838AD 000594 006D+00 6/3 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80A83840 = "MoiR"; -SECTION_DEAD static char const* const stringBase_80A83845 = "MoiR1"; -SECTION_DEAD static char const* const stringBase_80A8384B = "MoiR2"; -SECTION_DEAD static char const* const stringBase_80A83851 = "MoiR3"; -SECTION_DEAD static char const* const stringBase_80A83857 = ""; -SECTION_DEAD static char const* const stringBase_80A83858 = "THE_INTRODUCTION"; -SECTION_DEAD static char const* const stringBase_80A83869 = "MOIR_APPEAR"; -SECTION_DEAD static char const* const stringBase_80A83875 = "MOIR_APPEAR2"; -SECTION_DEAD static char const* const stringBase_80A83882 = "R_SP116"; -SECTION_DEAD static char const* const stringBase_80A8388A = "F_SP108"; -SECTION_DEAD static char const* const stringBase_80A83892 = "D_MN09"; -SECTION_DEAD static char const* const stringBase_80A83899 = "DEFAULT_GETITEM"; -SECTION_DEAD static char const* const stringBase_80A838A9 = "prm"; -#pragma pop +/* 80A83840-80A83840 000594 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/npc/d_a_npc_myna2/d_a_npc_myna2.cpp b/rel/d/a/npc/d_a_npc_myna2/d_a_npc_myna2.cpp index 615abab2dfe..9684316c65a 100644 --- a/rel/d/a/npc/d_a_npc_myna2/d_a_npc_myna2.cpp +++ b/rel/d/a/npc/d_a_npc_myna2/d_a_npc_myna2.cpp @@ -28,19 +28,19 @@ struct mDoMtx_stack_c { static u8 now[48]; }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; +struct J3DAnmTransform {}; + +struct J3DModelData {}; + struct Z2Creature { /* 802C0420 */ ~Z2Creature(); /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -108,18 +108,18 @@ struct dCcD_GObjInf { /* 80084658 */ void ChkCoHit(); }; +struct J3DAnmTexPattern {}; + +struct J3DAnmTransformKey {}; + +struct _GXColorS10 {}; + struct dCcD_SrcCyl {}; struct dCcD_Cyl { /* 800848B4 */ void Set(dCcD_SrcCyl const&); }; -struct _GXColorS10 {}; - -struct J3DAnmTexPattern {}; - -struct J3DAnmTransformKey {}; - struct daNpcF_c { struct daNpcF_anmPlayData {}; @@ -185,7 +185,6 @@ struct dMsgFlow_c { struct dEvt_control_c { /* 80042468 */ void reset(); - /* 800436EC */ void setPtI_Id(unsigned int); }; struct dEvent_manager_c { @@ -232,13 +231,13 @@ struct dBgS_AcchCir { /* 80A88038 */ ~dBgS_AcchCir(); }; -struct dBgS {}; - struct csXyz { /* 80A87B7C */ ~csXyz(); /* 80A87BB8 */ csXyz(); }; +struct dBgS {}; + struct dBgS_Acch { /* 80075F94 */ ~dBgS_Acch(); /* 800760A0 */ dBgS_Acch(); @@ -362,9 +361,9 @@ extern "C" void setCollisions__8daNpcF_cFv(); extern "C" bool setExpressionAnm__8daNpcF_cFib(); extern "C" void setExpression__8daNpcF_cFif(); extern "C" void __dt__10cCcD_GSttsFv(); -extern "C" void func_80A88220(int*); -extern "C" void func_80A8823C(f32, f32); -extern "C" void func_80A88278(int, int); +extern "C" void func_80A88220(void* _this, int*); +extern "C" void func_80A8823C(void* _this, f32, f32); +extern "C" void func_80A88278(void* _this, int, int); extern "C" void __sinit_d_a_npc_myna2_cpp(); extern "C" void __dt__19daNpc_myna2_Param_cFv(); extern "C" static void func_80A88410(); @@ -526,6 +525,20 @@ extern "C" void __register_global_object(); // /* ############################################################################################## */ +/* 80A88654-80A88654 000220 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80A88654 = "FIRST_TALK"; +SECTION_DEAD static char const* const stringBase_80A8865F = "GAME_FAILURE"; +SECTION_DEAD static char const* const stringBase_80A8866C = "GAME_GOAL"; +SECTION_DEAD static char const* const stringBase_80A88676 = "GAME_GOAL_SUCCESS"; +SECTION_DEAD static char const* const stringBase_80A88688 = "MYNA_b"; +SECTION_DEAD static char const* const stringBase_80A8868F = "MYNA_b_f"; +SECTION_DEAD static char const* const stringBase_80A88698 = "MYNA_b_g"; +SECTION_DEAD static char const* const stringBase_80A886A1 = "myna2"; +SECTION_DEAD static char const* const stringBase_80A886A7 = ""; +#pragma pop + /* 80A886B4-80A886C0 000000 000C+00 4/4 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -1005,7 +1018,7 @@ SECTION_RODATA u8 const daNpc_myna2_Param_c::m[116] = { 0x00, 0x00, 0xC3, 0x96, 0x00, 0x00, 0x00, 0x3C, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x44, 0x2F, 0x00, 0x00, 0x45, 0x1C, 0x40, 0x00, }; -COMPILER_STRIP_GATE(80A88434, &daNpc_myna2_Param_c::m); +COMPILER_STRIP_GATE(0x80A88434, &daNpc_myna2_Param_c::m); /* 80A884A8-80A884BC 000074 0014+00 0/1 0/0 0/0 .rodata heapSize$4340 */ #pragma push @@ -1014,35 +1027,35 @@ SECTION_RODATA static u8 const heapSize[20] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x24, 0x50, 0x00, 0x00, 0x24, 0x40, 0x00, 0x00, 0x24, 0x50, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A884A8, &heapSize); +COMPILER_STRIP_GATE(0x80A884A8, &heapSize); #pragma pop /* 80A884BC-80A884C0 000088 0004+00 0/1 0/0 0/0 .rodata @4428 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4428 = -300.0f; -COMPILER_STRIP_GATE(80A884BC, &lit_4428); +COMPILER_STRIP_GATE(0x80A884BC, &lit_4428); #pragma pop /* 80A884C0-80A884C4 00008C 0004+00 0/1 0/0 0/0 .rodata @4429 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4429 = -50.0f; -COMPILER_STRIP_GATE(80A884C0, &lit_4429); +COMPILER_STRIP_GATE(0x80A884C0, &lit_4429); #pragma pop /* 80A884C4-80A884C8 000090 0004+00 0/1 0/0 0/0 .rodata @4430 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4430 = 300.0f; -COMPILER_STRIP_GATE(80A884C4, &lit_4430); +COMPILER_STRIP_GATE(0x80A884C4, &lit_4430); #pragma pop /* 80A884C8-80A884CC 000094 0004+00 0/1 0/0 0/0 .rodata @4431 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4431 = 450.0f; -COMPILER_STRIP_GATE(80A884C8, &lit_4431); +COMPILER_STRIP_GATE(0x80A884C8, &lit_4431); #pragma pop /* 80A842C8-80A845AC 000528 02E4+00 1/1 0/0 0/0 .text create__13daNpc_myna2_cFv */ @@ -1058,7 +1071,7 @@ asm void daNpc_myna2_c::create() { /* ############################################################################################## */ /* 80A884CC-80A884D0 000098 0004+00 4/5 0/0 0/0 .rodata @4462 */ SECTION_RODATA static f32 const lit_4462 = 1.0f; -COMPILER_STRIP_GATE(80A884CC, &lit_4462); +COMPILER_STRIP_GATE(0x80A884CC, &lit_4462); /* 80A884D0-80A884D4 00009C 0004+00 2/9 0/0 0/0 .rodata @4463 */ SECTION_RODATA static u8 const lit_4463[4] = { @@ -1067,7 +1080,7 @@ SECTION_RODATA static u8 const lit_4463[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A884D0, &lit_4463); +COMPILER_STRIP_GATE(0x80A884D0, &lit_4463); /* 80A845AC-80A846E0 00080C 0134+00 1/1 0/0 0/0 .text CreateHeap__13daNpc_myna2_cFv */ #pragma push @@ -1135,14 +1148,14 @@ asm void daNpc_myna2_c::setParam() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4577 = 3.0f / 20.0f; -COMPILER_STRIP_GATE(80A884D4, &lit_4577); +COMPILER_STRIP_GATE(0x80A884D4, &lit_4577); #pragma pop /* 80A884D8-80A884DC 0000A4 0004+00 0/1 0/0 0/0 .rodata @4578 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4578 = -1000000000.0f; -COMPILER_STRIP_GATE(80A884D8, &lit_4578); +COMPILER_STRIP_GATE(0x80A884D8, &lit_4578); #pragma pop /* 80A848B4-80A84B64 000B14 02B0+00 1/0 0/0 0/0 .text main__13daNpc_myna2_cFv */ @@ -1160,14 +1173,14 @@ asm void daNpc_myna2_c::main() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4644 = 30.0f; -COMPILER_STRIP_GATE(80A884DC, &lit_4644); +COMPILER_STRIP_GATE(0x80A884DC, &lit_4644); #pragma pop /* 80A884E0-80A884E4 0000AC 0004+00 0/1 0/0 0/0 .rodata @4645 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4645 = 10.0f; -COMPILER_STRIP_GATE(80A884E0, &lit_4645); +COMPILER_STRIP_GATE(0x80A884E0, &lit_4645); #pragma pop /* 80A88AF8-80A88AFC 000008 0001+03 1/1 0/0 0/0 .bss @1109 */ @@ -1343,6 +1356,13 @@ asm void daNpc_myna2_c::getTypeFromParam() { } #pragma pop +/* ############################################################################################## */ +/* 80A88654-80A88654 000220 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80A886A8 = "F_SP115"; +#pragma pop + /* 80A85094-80A85160 0012F4 00CC+00 1/1 0/0 0/0 .text isDelete__13daNpc_myna2_cFv */ #pragma push #pragma optimization_level 0 @@ -1358,21 +1378,21 @@ asm void daNpc_myna2_c::isDelete() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4806 = 3000.0f; -COMPILER_STRIP_GATE(80A884E4, &lit_4806); +COMPILER_STRIP_GATE(0x80A884E4, &lit_4806); #pragma pop /* 80A884E8-80A884EC 0000B4 0004+00 0/1 0/0 0/0 .rodata @4807 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4807 = 2000.0f; -COMPILER_STRIP_GATE(80A884E8, &lit_4807); +COMPILER_STRIP_GATE(0x80A884E8, &lit_4807); #pragma pop /* 80A884EC-80A884F0 0000B8 0004+00 0/2 0/0 0/0 .rodata @4808 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4808 = 50.0f; -COMPILER_STRIP_GATE(80A884EC, &lit_4808); +COMPILER_STRIP_GATE(0x80A884EC, &lit_4808); #pragma pop /* 80A85160-80A85358 0013C0 01F8+00 1/1 0/0 0/0 .text reset__13daNpc_myna2_cFv */ @@ -1392,7 +1412,7 @@ asm void daNpc_myna2_c::reset() { SECTION_RODATA static u8 const lit_4812[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A884F0, &lit_4812); +COMPILER_STRIP_GATE(0x80A884F0, &lit_4812); #pragma pop /* 80A884FC-80A88500 0000C8 0004+00 0/1 0/0 0/0 .rodata @4813 */ @@ -1404,7 +1424,7 @@ SECTION_RODATA static u8 const lit_4813[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A884FC, &lit_4813); +COMPILER_STRIP_GATE(0x80A884FC, &lit_4813); #pragma pop /* 80A88500-80A8850C 0000CC 000C+00 0/1 0/0 0/0 .rodata @4814 */ @@ -1413,7 +1433,7 @@ COMPILER_STRIP_GATE(80A884FC, &lit_4813); SECTION_RODATA static u8 const lit_4814[12] = { 0x00, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A88500, &lit_4814); +COMPILER_STRIP_GATE(0x80A88500, &lit_4814); #pragma pop /* 80A8850C-80A88510 0000D8 0004+00 0/1 0/0 0/0 .rodata @4815 */ @@ -1425,7 +1445,7 @@ SECTION_RODATA static u8 const lit_4815[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A8850C, &lit_4815); +COMPILER_STRIP_GATE(0x80A8850C, &lit_4815); #pragma pop /* 80A88510-80A8851C 0000DC 000C+00 0/1 0/0 0/0 .rodata @4816 */ @@ -1434,7 +1454,7 @@ COMPILER_STRIP_GATE(80A8850C, &lit_4815); SECTION_RODATA static u8 const lit_4816[12] = { 0x00, 0x0D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A88510, &lit_4816); +COMPILER_STRIP_GATE(0x80A88510, &lit_4816); #pragma pop /* 80A8851C-80A88520 0000E8 0004+00 0/1 0/0 0/0 .rodata @4817 */ @@ -1446,7 +1466,7 @@ SECTION_RODATA static u8 const lit_4817[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A8851C, &lit_4817); +COMPILER_STRIP_GATE(0x80A8851C, &lit_4817); #pragma pop /* 80A88520-80A8852C 0000EC 000C+00 0/1 0/0 0/0 .rodata @4818 */ @@ -1455,7 +1475,7 @@ COMPILER_STRIP_GATE(80A8851C, &lit_4817); SECTION_RODATA static u8 const lit_4818[12] = { 0x00, 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80A88520, &lit_4818); +COMPILER_STRIP_GATE(0x80A88520, &lit_4818); #pragma pop /* 80A8852C-80A88538 0000F8 000C+00 0/1 0/0 0/0 .rodata @4819 */ @@ -1464,7 +1484,7 @@ COMPILER_STRIP_GATE(80A88520, &lit_4818); SECTION_RODATA static u8 const lit_4819[12] = { 0x00, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A8852C, &lit_4819); +COMPILER_STRIP_GATE(0x80A8852C, &lit_4819); #pragma pop /* 80A88538-80A88540 000104 0008+00 0/1 0/0 0/0 .rodata @4820 */ @@ -1473,7 +1493,7 @@ COMPILER_STRIP_GATE(80A8852C, &lit_4819); SECTION_RODATA static u8 const lit_4820[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A88538, &lit_4820); +COMPILER_STRIP_GATE(0x80A88538, &lit_4820); #pragma pop /* 80A88540-80A8854C 00010C 000C+00 0/1 0/0 0/0 .rodata @4821 */ @@ -1482,7 +1502,7 @@ COMPILER_STRIP_GATE(80A88538, &lit_4820); SECTION_RODATA static u8 const lit_4821[12] = { 0x00, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80A88540, &lit_4821); +COMPILER_STRIP_GATE(0x80A88540, &lit_4821); #pragma pop /* 80A8854C-80A88558 000118 000C+00 0/1 0/0 0/0 .rodata @4822 */ @@ -1491,7 +1511,7 @@ COMPILER_STRIP_GATE(80A88540, &lit_4821); SECTION_RODATA static u8 const lit_4822[12] = { 0x00, 0x0D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A8854C, &lit_4822); +COMPILER_STRIP_GATE(0x80A8854C, &lit_4822); #pragma pop /* 80A88558-80A88560 000124 0008+00 0/1 0/0 0/0 .rodata @4823 */ @@ -1500,7 +1520,7 @@ COMPILER_STRIP_GATE(80A8854C, &lit_4822); SECTION_RODATA static u8 const lit_4823[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A88558, &lit_4823); +COMPILER_STRIP_GATE(0x80A88558, &lit_4823); #pragma pop /* 80A88560-80A8856C 00012C 000C+00 0/1 0/0 0/0 .rodata @4824 */ @@ -1509,7 +1529,7 @@ COMPILER_STRIP_GATE(80A88558, &lit_4823); SECTION_RODATA static u8 const lit_4824[12] = { 0x00, 0x0B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80A88560, &lit_4824); +COMPILER_STRIP_GATE(0x80A88560, &lit_4824); #pragma pop /* 80A8856C-80A88578 000138 000C+00 0/1 0/0 0/0 .rodata @4825 */ @@ -1518,7 +1538,7 @@ COMPILER_STRIP_GATE(80A88560, &lit_4824); SECTION_RODATA static u8 const lit_4825[12] = { 0x00, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A8856C, &lit_4825); +COMPILER_STRIP_GATE(0x80A8856C, &lit_4825); #pragma pop /* 80A88578-80A88580 000144 0008+00 0/1 0/0 0/0 .rodata @4826 */ @@ -1527,7 +1547,7 @@ COMPILER_STRIP_GATE(80A8856C, &lit_4825); SECTION_RODATA static u8 const lit_4826[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A88578, &lit_4826); +COMPILER_STRIP_GATE(0x80A88578, &lit_4826); #pragma pop /* 80A88580-80A8858C 00014C 000C+00 0/1 0/0 0/0 .rodata @4827 */ @@ -1536,7 +1556,7 @@ COMPILER_STRIP_GATE(80A88578, &lit_4826); SECTION_RODATA static u8 const lit_4827[12] = { 0x00, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A88580, &lit_4827); +COMPILER_STRIP_GATE(0x80A88580, &lit_4827); #pragma pop /* 80A8858C-80A88590 000158 0004+00 0/1 0/0 0/0 .rodata @4828 */ @@ -1548,7 +1568,7 @@ SECTION_RODATA static u8 const lit_4828[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A8858C, &lit_4828); +COMPILER_STRIP_GATE(0x80A8858C, &lit_4828); #pragma pop /* 80A88590-80A8859C 00015C 000C+00 0/1 0/0 0/0 .rodata @4829 */ @@ -1557,7 +1577,7 @@ COMPILER_STRIP_GATE(80A8858C, &lit_4828); SECTION_RODATA static u8 const lit_4829[12] = { 0x00, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A88590, &lit_4829); +COMPILER_STRIP_GATE(0x80A88590, &lit_4829); #pragma pop /* 80A8859C-80A885A0 000168 0004+00 0/1 0/0 0/0 .rodata @4830 */ @@ -1569,7 +1589,7 @@ SECTION_RODATA static u8 const lit_4830[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A8859C, &lit_4830); +COMPILER_STRIP_GATE(0x80A8859C, &lit_4830); #pragma pop /* 80A85358-80A855E8 0015B8 0290+00 1/1 0/0 0/0 .text playMotion__13daNpc_myna2_cFv */ @@ -1587,7 +1607,7 @@ asm void daNpc_myna2_c::playMotion() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpc_myna2_c::chkAction(int (daNpc_myna2_c::*)(void*)) { +asm void daNpc_myna2_c::chkAction(int (daNpc_myna2_c::*param_0)(void*)) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_myna2/d_a_npc_myna2/chkAction__13daNpc_myna2_cFM13daNpc_myna2_cFPCvPvPv_i.s" } @@ -1598,7 +1618,7 @@ asm void daNpc_myna2_c::chkAction(int (daNpc_myna2_c::*)(void*)) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpc_myna2_c::setAction(int (daNpc_myna2_c::*)(void*)) { +asm void daNpc_myna2_c::setAction(int (daNpc_myna2_c::*param_0)(void*)) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_myna2/d_a_npc_myna2/setAction__13daNpc_myna2_cFM13daNpc_myna2_cFPCvPvPv_i.s" } @@ -1633,12 +1653,12 @@ SECTION_RODATA static u8 const lit_4831[32] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A885A0, &lit_4831); +COMPILER_STRIP_GATE(0x80A885A0, &lit_4831); #pragma pop /* 80A885C0-80A885C4 00018C 0004+00 4/6 0/0 0/0 .rodata @4982 */ SECTION_RODATA static f32 const lit_4982 = -1.0f; -COMPILER_STRIP_GATE(80A885C0, &lit_4982); +COMPILER_STRIP_GATE(0x80A885C0, &lit_4982); /* 80A85894-80A85BA4 001AF4 0310+00 1/1 0/0 0/0 .text doEvent__13daNpc_myna2_cFv */ #pragma push @@ -1677,7 +1697,7 @@ asm void daNpc_myna2_c::wait(void* param_0) { SECTION_RODATA static u8 const lit_5186[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A885C4, &lit_5186); +COMPILER_STRIP_GATE(0x80A885C4, &lit_5186); #pragma pop /* 80A885CC-80A885D4 000198 0008+00 0/2 0/0 0/0 .rodata @5187 */ @@ -1686,7 +1706,7 @@ COMPILER_STRIP_GATE(80A885C4, &lit_5186); SECTION_RODATA static u8 const lit_5187[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A885CC, &lit_5187); +COMPILER_STRIP_GATE(0x80A885CC, &lit_5187); #pragma pop /* 80A885D4-80A885DC 0001A0 0008+00 0/2 0/0 0/0 .rodata @5188 */ @@ -1695,14 +1715,14 @@ COMPILER_STRIP_GATE(80A885CC, &lit_5187); SECTION_RODATA static u8 const lit_5188[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A885D4, &lit_5188); +COMPILER_STRIP_GATE(0x80A885D4, &lit_5188); #pragma pop /* 80A885DC-80A885E0 0001A8 0004+00 0/2 0/0 0/0 .rodata @5189 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5189 = 100.0f; -COMPILER_STRIP_GATE(80A885DC, &lit_5189); +COMPILER_STRIP_GATE(0x80A885DC, &lit_5189); #pragma pop /* 80A85C60-80A8613C 001EC0 04DC+00 1/0 0/0 0/0 .text waitHovering__13daNpc_myna2_cFPv */ @@ -1768,7 +1788,13 @@ asm void daNpc_myna2_c::test(void* param_0) { /* ############################################################################################## */ /* 80A885E0-80A885E4 0001AC 0004+00 1/2 0/0 0/0 .rodata @5358 */ SECTION_RODATA static f32 const lit_5358 = 160.0f; -COMPILER_STRIP_GATE(80A885E0, &lit_5358); +COMPILER_STRIP_GATE(0x80A885E0, &lit_5358); + +/* 80A88654-80A88654 000220 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80A886B0 = "prm"; +#pragma pop /* 80A866B0-80A8684C 002910 019C+00 1/0 0/0 0/0 .text ECut_firstTalk__13daNpc_myna2_cFi */ @@ -1786,7 +1812,7 @@ asm void daNpc_myna2_c::ECut_firstTalk(int param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5391 = 500.0f; -COMPILER_STRIP_GATE(80A885E4, &lit_5391); +COMPILER_STRIP_GATE(0x80A885E4, &lit_5391); #pragma pop /* 80A8684C-80A86A0C 002AAC 01C0+00 1/0 0/0 0/0 .text ECut_gameFailure__13daNpc_myna2_cFi @@ -1805,7 +1831,7 @@ asm void daNpc_myna2_c::ECut_gameFailure(int param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5440 = 150.0f; -COMPILER_STRIP_GATE(80A885E8, &lit_5440); +COMPILER_STRIP_GATE(0x80A885E8, &lit_5440); #pragma pop /* 80A86A0C-80A86BEC 002C6C 01E0+00 1/0 0/0 0/0 .text ECut_gameGoal__13daNpc_myna2_cFi */ @@ -1833,112 +1859,112 @@ asm void daNpc_myna2_c::ECut_gameGoalSuccess(int param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5799 = 5.0f; -COMPILER_STRIP_GATE(80A885EC, &lit_5799); +COMPILER_STRIP_GATE(0x80A885EC, &lit_5799); #pragma pop /* 80A885F0-80A885F4 0001BC 0004+00 0/1 0/0 0/0 .rodata @5800 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5800 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(80A885F0, &lit_5800); +COMPILER_STRIP_GATE(0x80A885F0, &lit_5800); #pragma pop /* 80A885F4-80A885F8 0001C0 0004+00 0/1 0/0 0/0 .rodata @5801 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5801 = 1.5f; -COMPILER_STRIP_GATE(80A885F4, &lit_5801); +COMPILER_STRIP_GATE(0x80A885F4, &lit_5801); #pragma pop /* 80A885F8-80A885FC 0001C4 0004+00 0/1 0/0 0/0 .rodata @5802 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5802 = -25.0f; -COMPILER_STRIP_GATE(80A885F8, &lit_5802); +COMPILER_STRIP_GATE(0x80A885F8, &lit_5802); #pragma pop /* 80A885FC-80A88600 0001C8 0004+00 0/1 0/0 0/0 .rodata @5803 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5803 = 0.5f; -COMPILER_STRIP_GATE(80A885FC, &lit_5803); +COMPILER_STRIP_GATE(0x80A885FC, &lit_5803); #pragma pop /* 80A88600-80A88604 0001CC 0004+00 0/1 0/0 0/0 .rodata @5804 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5804 = 120.0f; -COMPILER_STRIP_GATE(80A88600, &lit_5804); +COMPILER_STRIP_GATE(0x80A88600, &lit_5804); #pragma pop /* 80A88604-80A88608 0001D0 0004+00 0/1 0/0 0/0 .rodata @5805 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5805 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(80A88604, &lit_5805); +COMPILER_STRIP_GATE(0x80A88604, &lit_5805); #pragma pop /* 80A88608-80A8860C 0001D4 0004+00 0/1 0/0 0/0 .rodata @5806 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5806 = -1.0f / 5.0f; -COMPILER_STRIP_GATE(80A88608, &lit_5806); +COMPILER_STRIP_GATE(0x80A88608, &lit_5806); #pragma pop /* 80A8860C-80A88610 0001D8 0004+00 0/1 0/0 0/0 .rodata @5807 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5807 = 2.0f / 5.0f; -COMPILER_STRIP_GATE(80A8860C, &lit_5807); +COMPILER_STRIP_GATE(0x80A8860C, &lit_5807); #pragma pop /* 80A88610-80A88614 0001DC 0004+00 0/1 0/0 0/0 .rodata @5808 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5808 = -1.5f; -COMPILER_STRIP_GATE(80A88610, &lit_5808); +COMPILER_STRIP_GATE(0x80A88610, &lit_5808); #pragma pop /* 80A88614-80A88618 0001E0 0004+00 0/1 0/0 0/0 .rodata @5809 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5809 = 3.0f; -COMPILER_STRIP_GATE(80A88614, &lit_5809); +COMPILER_STRIP_GATE(0x80A88614, &lit_5809); #pragma pop /* 80A88618-80A8861C 0001E4 0004+00 0/1 0/0 0/0 .rodata @5810 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5810 = 40.0f; -COMPILER_STRIP_GATE(80A88618, &lit_5810); +COMPILER_STRIP_GATE(0x80A88618, &lit_5810); #pragma pop /* 80A8861C-80A88620 0001E8 0004+00 0/1 0/0 0/0 .rodata @5811 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5811 = 20.0f; -COMPILER_STRIP_GATE(80A8861C, &lit_5811); +COMPILER_STRIP_GATE(0x80A8861C, &lit_5811); #pragma pop /* 80A88620-80A88624 0001EC 0004+00 0/1 0/0 0/0 .rodata @5812 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5812 = 70.0f; -COMPILER_STRIP_GATE(80A88620, &lit_5812); +COMPILER_STRIP_GATE(0x80A88620, &lit_5812); #pragma pop /* 80A88624-80A88628 0001F0 0004+00 0/1 0/0 0/0 .rodata @5813 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5813 = -7.0f / 10.0f; -COMPILER_STRIP_GATE(80A88624, &lit_5813); +COMPILER_STRIP_GATE(0x80A88624, &lit_5813); #pragma pop /* 80A88628-80A8862C 0001F4 0004+00 0/1 0/0 0/0 .rodata @5814 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5814 = 7.0f / 5.0f; -COMPILER_STRIP_GATE(80A88628, &lit_5814); +COMPILER_STRIP_GATE(0x80A88628, &lit_5814); #pragma pop /* 80A8862C-80A88634 0001F8 0004+04 0/1 0/0 0/0 .rodata @5815 */ @@ -1949,7 +1975,7 @@ SECTION_RODATA static f32 const lit_5815[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80A8862C, &lit_5815); +COMPILER_STRIP_GATE(0x80A8862C, &lit_5815); #pragma pop /* 80A88634-80A8863C 000200 0008+00 0/1 0/0 0/0 .rodata @5816 */ @@ -1958,21 +1984,21 @@ COMPILER_STRIP_GATE(80A8862C, &lit_5815); SECTION_RODATA static u8 const lit_5816[8] = { 0x3F, 0xB9, 0x99, 0x99, 0x99, 0x99, 0x99, 0x9A, }; -COMPILER_STRIP_GATE(80A88634, &lit_5816); +COMPILER_STRIP_GATE(0x80A88634, &lit_5816); #pragma pop /* 80A8863C-80A88640 000208 0004+00 0/1 0/0 0/0 .rodata @5817 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5817 = 6.0f; -COMPILER_STRIP_GATE(80A8863C, &lit_5817); +COMPILER_STRIP_GATE(0x80A8863C, &lit_5817); #pragma pop /* 80A88640-80A88644 00020C 0004+00 0/1 0/0 0/0 .rodata @5818 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5818 = 4096.0f; -COMPILER_STRIP_GATE(80A88640, &lit_5818); +COMPILER_STRIP_GATE(0x80A88640, &lit_5818); #pragma pop /* 80A88644-80A8864C 000210 0004+04 0/1 0/0 0/0 .rodata @5819 */ @@ -1983,7 +2009,7 @@ SECTION_RODATA static f32 const lit_5819[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80A88644, &lit_5819); +COMPILER_STRIP_GATE(0x80A88644, &lit_5819); #pragma pop /* 80A86E8C-80A879A0 0030EC 0B14+00 6/6 0/0 0/0 .text calcHovering__13daNpc_myna2_cFii */ @@ -2200,7 +2226,7 @@ asm cCcD_GStts::~cCcD_GStts() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80A88220(int* param_0) { +extern "C" asm void func_80A88220(void* _this, int* param_0) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_myna2/d_a_npc_myna2/func_80A88220.s" } @@ -2210,7 +2236,7 @@ extern "C" asm void func_80A88220(int* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80A8823C(f32 param_0, f32 param_1) { +extern "C" asm void func_80A8823C(void* _this, f32 param_0, f32 param_1) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_myna2/d_a_npc_myna2/func_80A8823C.s" } @@ -2221,13 +2247,13 @@ extern "C" asm void func_80A8823C(f32 param_0, f32 param_1) { SECTION_RODATA static u8 const lit_5872[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A8864C, &lit_5872); +COMPILER_STRIP_GATE(0x80A8864C, &lit_5872); /* 80A88278-80A882F4 0044D8 007C+00 1/1 0/0 0/0 .text cLib_getRndValue__Fii */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80A88278(int param_0, int param_1) { +extern "C" asm void func_80A88278(void* _this, int param_0, int param_1) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_myna2/d_a_npc_myna2/func_80A88278.s" } @@ -2253,7 +2279,7 @@ asm void __sinit_d_a_npc_myna2_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80A882F4 = (void*)__sinit_d_a_npc_myna2_cpp; +REGISTER_CTORS(0x80A882F4, __sinit_d_a_npc_myna2_cpp); #pragma pop /* 80A883C8-80A88410 004628 0048+00 2/1 0/0 0/0 .text __dt__19daNpc_myna2_Param_cFv */ @@ -2458,19 +2484,4 @@ static u8 data_80A88BC0[4]; static u8 data_80A88BC4[4]; #pragma pop -/* 80A88654-80A886B4 000220 0060+00 9/5 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80A88654 = "FIRST_TALK"; -SECTION_DEAD static char const* const stringBase_80A8865F = "GAME_FAILURE"; -SECTION_DEAD static char const* const stringBase_80A8866C = "GAME_GOAL"; -SECTION_DEAD static char const* const stringBase_80A88676 = "GAME_GOAL_SUCCESS"; -SECTION_DEAD static char const* const stringBase_80A88688 = "MYNA_b"; -SECTION_DEAD static char const* const stringBase_80A8868F = "MYNA_b_f"; -SECTION_DEAD static char const* const stringBase_80A88698 = "MYNA_b_g"; -SECTION_DEAD static char const* const stringBase_80A886A1 = "myna2"; -SECTION_DEAD static char const* const stringBase_80A886A7 = ""; -SECTION_DEAD static char const* const stringBase_80A886A8 = "F_SP115"; -SECTION_DEAD static char const* const stringBase_80A886B0 = "prm"; -#pragma pop +/* 80A88654-80A88654 000220 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/npc/d_a_npc_ne/d_a_npc_ne.cpp b/rel/d/a/npc/d_a_npc_ne/d_a_npc_ne.cpp index aa68f141811..60ca0ac9a25 100644 --- a/rel/d/a/npc/d_a_npc_ne/d_a_npc_ne.cpp +++ b/rel/d/a/npc/d_a_npc_ne/d_a_npc_ne.cpp @@ -46,10 +46,10 @@ struct mDoExt_McaMorfCallBack1_c {}; struct Vec {}; -struct J3DModelData {}; - struct J3DAnmTransform {}; +struct J3DModelData {}; + struct mDoExt_McaMorf { /* 8000FC4C */ mDoExt_McaMorf(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, int, @@ -103,10 +103,10 @@ struct dRes_control_c { struct dPa_levelEcallBack {}; -struct _GXColor {}; - struct csXyz {}; +struct _GXColor {}; + struct dPa_control_c { struct level_c { /* 8004B918 */ void getEmitter(u32); @@ -493,27 +493,27 @@ extern "C" void __register_global_object(); /* ############################################################################################## */ /* 80A9241C-80A92420 000000 0004+00 36/36 0/0 0/0 .rodata @3990 */ SECTION_RODATA static f32 const lit_3990 = 1.0f; -COMPILER_STRIP_GATE(80A9241C, &lit_3990); +COMPILER_STRIP_GATE(0x80A9241C, &lit_3990); /* 80A92420-80A92424 000004 0004+00 0/4 0/0 0/0 .rodata @3991 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3991 = 2.5f; -COMPILER_STRIP_GATE(80A92420, &lit_3991); +COMPILER_STRIP_GATE(0x80A92420, &lit_3991); #pragma pop /* 80A92424-80A92428 000008 0004+00 0/2 0/0 0/0 .rodata @3992 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3992 = 12.0f; -COMPILER_STRIP_GATE(80A92424, &lit_3992); +COMPILER_STRIP_GATE(0x80A92424, &lit_3992); #pragma pop /* 80A92428-80A9242C 00000C 0004+00 0/17 0/0 0/0 .rodata @3993 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3993 = 2.0f; -COMPILER_STRIP_GATE(80A92428, &lit_3993); +COMPILER_STRIP_GATE(0x80A92428, &lit_3993); #pragma pop /* 80A925F0-80A92850 000000 0260+00 3/3 0/0 0/0 .data home_path */ @@ -752,11 +752,11 @@ SECTION_RODATA static u8 const lit_4018[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A9242C, &lit_4018); +COMPILER_STRIP_GATE(0x80A9242C, &lit_4018); /* 80A92430-80A92434 000014 0004+00 1/3 0/0 0/0 .rodata @4019 */ SECTION_RODATA static f32 const lit_4019 = -1.0f; -COMPILER_STRIP_GATE(80A92430, &lit_4019); +COMPILER_STRIP_GATE(0x80A92430, &lit_4019); /* 80A88D14-80A88DC0 000134 00AC+00 19/19 0/0 0/0 .text anm_init__FP12npc_ne_classifUcf */ @@ -782,13 +782,19 @@ static asm void nodeCallBack(J3DJoint* param_0, int param_1) { /* ############################################################################################## */ /* 80A92434-80A92438 000018 0004+00 1/18 0/0 0/0 .rodata @4139 */ SECTION_RODATA static f32 const lit_4139 = 100.0f; -COMPILER_STRIP_GATE(80A92434, &lit_4139); +COMPILER_STRIP_GATE(0x80A92434, &lit_4139); /* 80A92438-80A9243C 00001C 0004+00 0/3 0/0 0/0 .rodata @4140 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4140 = 400.0f; -COMPILER_STRIP_GATE(80A92438, &lit_4140); +COMPILER_STRIP_GATE(0x80A92438, &lit_4140); +#pragma pop + +/* 80A925D0-80A925D0 0001B4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80A925D0 = "Npc_net"; #pragma pop /* 80A88FC4-80A89160 0003E4 019C+00 1/0 0/0 0/0 .text daNpc_Ne_Draw__FP12npc_ne_class */ @@ -814,7 +820,7 @@ asm cXyz::~cXyz() { /* ############################################################################################## */ /* 80A9243C-80A92440 000020 0004+00 1/11 0/0 0/0 .rodata @4183 */ SECTION_RODATA static f32 const lit_4183 = 50.0f; -COMPILER_STRIP_GATE(80A9243C, &lit_4183); +COMPILER_STRIP_GATE(0x80A9243C, &lit_4183); /* 80A8919C-80A89298 0005BC 00FC+00 3/3 0/0 0/0 .text other_bg_check__FP10fopAc_ac_cP10fopAc_ac_c */ @@ -842,28 +848,28 @@ static asm void ne_carry_check(npc_ne_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4323 = 150.0f; -COMPILER_STRIP_GATE(80A92440, &lit_4323); +COMPILER_STRIP_GATE(0x80A92440, &lit_4323); #pragma pop /* 80A92444-80A92448 000028 0004+00 0/1 0/0 0/0 .rodata @4324 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4324 = 4.0f / 5.0f; -COMPILER_STRIP_GATE(80A92444, &lit_4324); +COMPILER_STRIP_GATE(0x80A92444, &lit_4324); #pragma pop /* 80A92448-80A9244C 00002C 0004+00 0/4 0/0 0/0 .rodata @4325 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4325 = 250.0f; -COMPILER_STRIP_GATE(80A92448, &lit_4325); +COMPILER_STRIP_GATE(0x80A92448, &lit_4325); #pragma pop /* 80A9244C-80A92450 000030 0004+00 0/13 0/0 0/0 .rodata @4326 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4326 = 200.0f; -COMPILER_STRIP_GATE(80A9244C, &lit_4326); +COMPILER_STRIP_GATE(0x80A9244C, &lit_4326); #pragma pop /* 80A892D4-80A895F8 0006F4 0324+00 2/2 0/0 0/0 .text way_bg_check__FP12npc_ne_classs */ @@ -891,14 +897,14 @@ asm cM3dGPla::~cM3dGPla() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4351 = 3000.0f; -COMPILER_STRIP_GATE(80A92450, &lit_4351); +COMPILER_STRIP_GATE(0x80A92450, &lit_4351); #pragma pop /* 80A92454-80A92458 000038 0004+00 0/9 0/0 0/0 .rodata @4352 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4352 = 10.0f; -COMPILER_STRIP_GATE(80A92454, &lit_4352); +COMPILER_STRIP_GATE(0x80A92454, &lit_4352); #pragma pop /* 80A89640-80A897C0 000A60 0180+00 1/1 0/0 0/0 .text water_check__FP12npc_ne_classf */ @@ -916,35 +922,35 @@ static asm void water_check(npc_ne_class* param_0, f32 param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4376 = 25.0f; -COMPILER_STRIP_GATE(80A92458, &lit_4376); +COMPILER_STRIP_GATE(0x80A92458, &lit_4376); #pragma pop /* 80A9245C-80A92460 000040 0004+00 0/0 0/0 0/0 .rodata @4377 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4377 = 60.0f; -COMPILER_STRIP_GATE(80A9245C, &lit_4377); +COMPILER_STRIP_GATE(0x80A9245C, &lit_4377); #pragma pop /* 80A92460-80A92464 000044 0004+00 0/13 0/0 0/0 .rodata @4378 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4378 = 5.0f; -COMPILER_STRIP_GATE(80A92460, &lit_4378); +COMPILER_STRIP_GATE(0x80A92460, &lit_4378); #pragma pop /* 80A92464-80A92468 000048 0004+00 0/2 0/0 0/0 .rodata @4454 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4454 = -100.0f; -COMPILER_STRIP_GATE(80A92464, &lit_4454); +COMPILER_STRIP_GATE(0x80A92464, &lit_4454); #pragma pop /* 80A92468-80A9246C 00004C 0004+00 0/12 0/0 0/0 .rodata @4455 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4455 = 20.0f; -COMPILER_STRIP_GATE(80A92468, &lit_4455); +COMPILER_STRIP_GATE(0x80A92468, &lit_4455); #pragma pop /* 80A897C0-80A899C0 000BE0 0200+00 1/1 0/0 0/0 .text climb_angle_get__FP12npc_ne_class @@ -1094,14 +1100,14 @@ static asm void s_ss_sub(void* param_0, void* param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4571 = 30.0f; -COMPILER_STRIP_GATE(80A9246C, &lit_4571); +COMPILER_STRIP_GATE(0x80A9246C, &lit_4571); #pragma pop /* 80A92470-80A92474 000054 0004+00 0/2 0/0 0/0 .rodata @4572 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4572 = 2000.0f; -COMPILER_STRIP_GATE(80A92470, &lit_4572); +COMPILER_STRIP_GATE(0x80A92470, &lit_4572); #pragma pop /* 80A89AB0-80A89D28 000ED0 0278+00 3/3 0/0 0/0 .text search_bird__FP12npc_ne_class */ @@ -1119,7 +1125,7 @@ static asm void search_bird(npc_ne_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4635 = 1000.0f; -COMPILER_STRIP_GATE(80A92474, &lit_4635); +COMPILER_STRIP_GATE(0x80A92474, &lit_4635); #pragma pop /* 80A89D28-80A89EF4 001148 01CC+00 2/2 0/0 0/0 .text way_check__FP12npc_ne_classs */ @@ -1137,56 +1143,56 @@ static asm void way_check(npc_ne_class* param_0, s16 param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4677 = 13.0f / 10.0f; -COMPILER_STRIP_GATE(80A92478, &lit_4677); +COMPILER_STRIP_GATE(0x80A92478, &lit_4677); #pragma pop /* 80A9247C-80A92480 000060 0004+00 0/2 0/0 0/0 .rodata @4678 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4678 = 65536.0f; -COMPILER_STRIP_GATE(80A9247C, &lit_4678); +COMPILER_STRIP_GATE(0x80A9247C, &lit_4678); #pragma pop /* 80A92480-80A92484 000064 0004+00 0/8 0/0 0/0 .rodata @4679 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4679 = 0.5f; -COMPILER_STRIP_GATE(80A92480, &lit_4679); +COMPILER_STRIP_GATE(0x80A92480, &lit_4679); #pragma pop /* 80A92484-80A92488 000068 0004+00 0/7 0/0 0/0 .rodata @4680 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4680 = 500.0f; -COMPILER_STRIP_GATE(80A92484, &lit_4680); +COMPILER_STRIP_GATE(0x80A92484, &lit_4680); #pragma pop /* 80A92488-80A9248C 00006C 0004+00 0/6 0/0 0/0 .rodata @4681 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4681 = 1.5f; -COMPILER_STRIP_GATE(80A92488, &lit_4681); +COMPILER_STRIP_GATE(0x80A92488, &lit_4681); #pragma pop /* 80A9248C-80A92490 000070 0004+00 0/8 0/0 0/0 .rodata @4682 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4682 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(80A9248C, &lit_4682); +COMPILER_STRIP_GATE(0x80A9248C, &lit_4682); #pragma pop /* 80A92490-80A92494 000074 0004+00 0/13 0/0 0/0 .rodata @4683 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4683 = 3.0f; -COMPILER_STRIP_GATE(80A92490, &lit_4683); +COMPILER_STRIP_GATE(0x80A92490, &lit_4683); #pragma pop /* 80A92494-80A92498 000078 0004+00 0/4 0/0 0/0 .rodata @4684 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4684 = 350.0f; -COMPILER_STRIP_GATE(80A92494, &lit_4684); +COMPILER_STRIP_GATE(0x80A92494, &lit_4684); #pragma pop /* 80A89EF4-80A8A234 001314 0340+00 1/1 0/0 0/0 .text npc_ne_wait__FP12npc_ne_class */ @@ -1204,49 +1210,49 @@ static asm void npc_ne_wait(npc_ne_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4771 = 4000.0f; -COMPILER_STRIP_GATE(80A92498, &lit_4771); +COMPILER_STRIP_GATE(0x80A92498, &lit_4771); #pragma pop /* 80A9249C-80A924A0 000080 0004+00 0/9 0/0 0/0 .rodata @4772 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4772 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(80A9249C, &lit_4772); +COMPILER_STRIP_GATE(0x80A9249C, &lit_4772); #pragma pop /* 80A924A0-80A924A4 000084 0004+00 0/5 0/0 0/0 .rodata @4773 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4773 = 40.0f; -COMPILER_STRIP_GATE(80A924A0, &lit_4773); +COMPILER_STRIP_GATE(0x80A924A0, &lit_4773); #pragma pop /* 80A924A4-80A924A8 000088 0004+00 0/6 0/0 0/0 .rodata @4774 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4774 = 1.0f / 20.0f; -COMPILER_STRIP_GATE(80A924A4, &lit_4774); +COMPILER_STRIP_GATE(0x80A924A4, &lit_4774); #pragma pop /* 80A924A8-80A924AC 00008C 0004+00 0/3 0/0 0/0 .rodata @4775 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4775 = 5000.0f; -COMPILER_STRIP_GATE(80A924A8, &lit_4775); +COMPILER_STRIP_GATE(0x80A924A8, &lit_4775); #pragma pop /* 80A924AC-80A924B0 000090 0004+00 0/2 0/0 0/0 .rodata @4776 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4776 = -0.5f; -COMPILER_STRIP_GATE(80A924AC, &lit_4776); +COMPILER_STRIP_GATE(0x80A924AC, &lit_4776); #pragma pop /* 80A924B0-80A924B4 000094 0004+00 0/1 0/0 0/0 .rodata @4777 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4777 = -4000.0f; -COMPILER_STRIP_GATE(80A924B0, &lit_4777); +COMPILER_STRIP_GATE(0x80A924B0, &lit_4777); #pragma pop /* 80A924B4-80A924BC 000098 0004+04 0/2 0/0 0/0 .rodata @4778 */ @@ -1257,7 +1263,7 @@ SECTION_RODATA static f32 const lit_4778[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80A924B4, &lit_4778); +COMPILER_STRIP_GATE(0x80A924B4, &lit_4778); #pragma pop /* 80A924BC-80A924C4 0000A0 0008+00 0/4 0/0 0/0 .rodata @4781 */ @@ -1266,7 +1272,7 @@ COMPILER_STRIP_GATE(80A924B4, &lit_4778); SECTION_RODATA static u8 const lit_4781[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A924BC, &lit_4781); +COMPILER_STRIP_GATE(0x80A924BC, &lit_4781); #pragma pop /* 80A8A234-80A8A8F4 001654 06C0+00 1/1 0/0 0/0 .text npc_ne_away__FP12npc_ne_class */ @@ -1284,14 +1290,14 @@ static asm void npc_ne_away(npc_ne_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4838 = -300.0f; -COMPILER_STRIP_GATE(80A924C4, &lit_4838); +COMPILER_STRIP_GATE(0x80A924C4, &lit_4838); #pragma pop /* 80A924C8-80A924CC 0000AC 0004+00 0/2 0/0 0/0 .rodata @4839 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4839 = 300.0f; -COMPILER_STRIP_GATE(80A924C8, &lit_4839); +COMPILER_STRIP_GATE(0x80A924C8, &lit_4839); #pragma pop /* 80A8A8F4-80A8AAE8 001D14 01F4+00 1/1 0/0 0/0 .text ground_search__FP12npc_ne_class */ @@ -1319,14 +1325,14 @@ static asm void s_fish_sub(void* param_0, void* param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5004 = 4.0f; -COMPILER_STRIP_GATE(80A924CC, &lit_5004); +COMPILER_STRIP_GATE(0x80A924CC, &lit_5004); #pragma pop /* 80A924D0-80A924D4 0000B4 0004+00 0/3 0/0 0/0 .rodata @5005 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5005 = 3.5f; -COMPILER_STRIP_GATE(80A924D0, &lit_5005); +COMPILER_STRIP_GATE(0x80A924D0, &lit_5005); #pragma pop /* 80A8AB70-80A8B530 001F90 09C0+00 2/1 0/0 0/0 .text npc_ne_tame__FP12npc_ne_class */ @@ -1354,28 +1360,28 @@ static asm void npc_ne_sanbasi(npc_ne_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5006 = 15.0f; -COMPILER_STRIP_GATE(80A924D4, &lit_5006); +COMPILER_STRIP_GATE(0x80A924D4, &lit_5006); #pragma pop /* 80A924D8-80A924DC 0000BC 0004+00 0/0 0/0 0/0 .rodata @5007 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5007 = 7.0f; -COMPILER_STRIP_GATE(80A924D8, &lit_5007); +COMPILER_STRIP_GATE(0x80A924D8, &lit_5007); #pragma pop /* 80A924DC-80A924E0 0000C0 0004+00 0/0 0/0 0/0 .rodata @5008 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5008 = -3.0f; -COMPILER_STRIP_GATE(80A924DC, &lit_5008); +COMPILER_STRIP_GATE(0x80A924DC, &lit_5008); #pragma pop /* 80A924E0-80A924E4 0000C4 0004+00 0/0 0/0 0/0 .rodata @5009 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5009 = -3.5f; -COMPILER_STRIP_GATE(80A924E0, &lit_5009); +COMPILER_STRIP_GATE(0x80A924E0, &lit_5009); #pragma pop /* 80A924E4-80A924EC 0000C8 0008+00 0/7 0/0 0/0 .rodata @5106 */ @@ -1384,7 +1390,7 @@ COMPILER_STRIP_GATE(80A924E0, &lit_5009); SECTION_RODATA static u8 const lit_5106[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A924E4, &lit_5106); +COMPILER_STRIP_GATE(0x80A924E4, &lit_5106); #pragma pop /* 80A924EC-80A924F4 0000D0 0008+00 0/7 0/0 0/0 .rodata @5107 */ @@ -1393,7 +1399,7 @@ COMPILER_STRIP_GATE(80A924E4, &lit_5106); SECTION_RODATA static u8 const lit_5107[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A924EC, &lit_5107); +COMPILER_STRIP_GATE(0x80A924EC, &lit_5107); #pragma pop /* 80A924F4-80A924FC 0000D8 0008+00 0/7 0/0 0/0 .rodata @5108 */ @@ -1402,14 +1408,14 @@ COMPILER_STRIP_GATE(80A924EC, &lit_5107); SECTION_RODATA static u8 const lit_5108[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A924F4, &lit_5108); +COMPILER_STRIP_GATE(0x80A924F4, &lit_5108); #pragma pop /* 80A924FC-80A92500 0000E0 0004+00 0/2 0/0 0/0 .rodata @5109 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5109 = 0.75f; -COMPILER_STRIP_GATE(80A924FC, &lit_5109); +COMPILER_STRIP_GATE(0x80A924FC, &lit_5109); #pragma pop /* 80A8B61C-80A8BAFC 002A3C 04E0+00 1/1 0/0 0/0 .text npc_ne_bird__FP12npc_ne_class */ @@ -1427,14 +1433,14 @@ static asm void npc_ne_bird(npc_ne_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5211 = 7.0f / 20.0f; -COMPILER_STRIP_GATE(80A92500, &lit_5211); +COMPILER_STRIP_GATE(0x80A92500, &lit_5211); #pragma pop /* 80A92504-80A92508 0000E8 0004+00 0/1 0/0 0/0 .rodata @5212 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5212 = 70.0f; -COMPILER_STRIP_GATE(80A92504, &lit_5212); +COMPILER_STRIP_GATE(0x80A92504, &lit_5212); #pragma pop /* 80A8BAFC-80A8C094 002F1C 0598+00 2/1 0/0 0/0 .text npc_ne_ball__FP12npc_ne_class */ @@ -1452,28 +1458,28 @@ static asm void npc_ne_ball(npc_ne_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5213 = 16.0f; -COMPILER_STRIP_GATE(80A92508, &lit_5213); +COMPILER_STRIP_GATE(0x80A92508, &lit_5213); #pragma pop /* 80A9250C-80A92510 0000F0 0004+00 0/0 0/0 0/0 .rodata @5214 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5214 = 80.0f; -COMPILER_STRIP_GATE(80A9250C, &lit_5214); +COMPILER_STRIP_GATE(0x80A9250C, &lit_5214); #pragma pop /* 80A92510-80A92514 0000F4 0004+00 0/1 0/0 0/0 .rodata @5297 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5297 = 9.0f / 10.0f; -COMPILER_STRIP_GATE(80A92510, &lit_5297); +COMPILER_STRIP_GATE(0x80A92510, &lit_5297); #pragma pop /* 80A92514-80A92518 0000F8 0004+00 0/1 0/0 0/0 .rodata @5298 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5298 = 37.0f / 5.0f; -COMPILER_STRIP_GATE(80A92514, &lit_5298); +COMPILER_STRIP_GATE(0x80A92514, &lit_5298); #pragma pop /* 80A8C094-80A8C508 0034B4 0474+00 1/1 0/0 0/0 .text npc_ne_pathwalk__FP12npc_ne_class @@ -1533,35 +1539,41 @@ static asm void home_path_search(npc_ne_class* param_0, int param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5653 = 10000.0f; -COMPILER_STRIP_GATE(80A92518, &lit_5653); +COMPILER_STRIP_GATE(0x80A92518, &lit_5653); #pragma pop /* 80A9251C-80A92520 000100 0004+00 0/1 0/0 0/0 .rodata @5654 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5654 = 6.0f / 5.0f; -COMPILER_STRIP_GATE(80A9251C, &lit_5654); +COMPILER_STRIP_GATE(0x80A9251C, &lit_5654); #pragma pop /* 80A92520-80A92524 000104 0004+00 0/1 0/0 0/0 .rodata @5655 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5655 = 236.0f; -COMPILER_STRIP_GATE(80A92520, &lit_5655); +COMPILER_STRIP_GATE(0x80A92520, &lit_5655); #pragma pop /* 80A92524-80A92528 000108 0004+00 0/1 0/0 0/0 .rodata @5656 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_5656 = 0x42BA999A; -COMPILER_STRIP_GATE(80A92524, &lit_5656); +COMPILER_STRIP_GATE(0x80A92524, &lit_5656); #pragma pop /* 80A92528-80A9252C 00010C 0004+00 0/1 0/0 0/0 .rodata @5657 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5657 = -777.5f; -COMPILER_STRIP_GATE(80A92528, &lit_5657); +COMPILER_STRIP_GATE(0x80A92528, &lit_5657); +#pragma pop + +/* 80A925D0-80A925D0 0001B4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80A925D8 = " PN %d"; #pragma pop /* 80A8CC64-80A8D608 004084 09A4+00 2/1 0/0 0/0 .text npc_ne_home__FP12npc_ne_class */ @@ -1579,7 +1591,7 @@ static asm void npc_ne_home(npc_ne_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5718 = -50.0f; -COMPILER_STRIP_GATE(80A9252C, &lit_5718); +COMPILER_STRIP_GATE(0x80A9252C, &lit_5718); #pragma pop /* 80A8D608-80A8D7C4 004A28 01BC+00 2/2 0/0 0/0 .text wall_angle_get__FP12npc_ne_class */ @@ -1592,6 +1604,13 @@ static asm void wall_angle_get(npc_ne_class* param_0) { } #pragma pop +/* ############################################################################################## */ +/* 80A925D0-80A925D0 0001B4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80A925DF = "F_SP103"; +#pragma pop + /* 80A8D7C4-80A8DD54 004BE4 0590+00 1/1 0/0 0/0 .text search_ground_1__FP12npc_ne_class */ #pragma push @@ -1613,7 +1632,7 @@ cXyz::cXyz() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5891 = 120.0f; -COMPILER_STRIP_GATE(80A92530, &lit_5891); +COMPILER_STRIP_GATE(0x80A92530, &lit_5891); #pragma pop /* 80A8DD58-80A8DEE0 005178 0188+00 1/1 0/0 0/0 .text search_ground_2__FP12npc_ne_classs @@ -1632,7 +1651,7 @@ static asm void search_ground_2(npc_ne_class* param_0, s16 param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5924 = 45.0f; -COMPILER_STRIP_GATE(80A92534, &lit_5924); +COMPILER_STRIP_GATE(0x80A92534, &lit_5924); #pragma pop /* 80A8DEE0-80A8E0E4 005300 0204+00 1/1 0/0 0/0 .text npc_ne_swim__FP12npc_ne_class */ @@ -1660,7 +1679,7 @@ static asm void npc_ne_outswim(npc_ne_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6108 = 35.0f; -COMPILER_STRIP_GATE(80A92538, &lit_6108); +COMPILER_STRIP_GATE(0x80A92538, &lit_6108); #pragma pop /* 80A8E428-80A8EA78 005848 0650+00 1/1 0/0 0/0 .text npc_ne_climb__FP12npc_ne_class */ @@ -1698,21 +1717,21 @@ static asm void npc_ne_s_drop(npc_ne_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6251 = 1300.0f; -COMPILER_STRIP_GATE(80A9253C, &lit_6251); +COMPILER_STRIP_GATE(0x80A9253C, &lit_6251); #pragma pop /* 80A92540-80A92544 000124 0004+00 0/2 0/0 0/0 .rodata @6252 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6252 = -10.0f; -COMPILER_STRIP_GATE(80A92540, &lit_6252); +COMPILER_STRIP_GATE(0x80A92540, &lit_6252); #pragma pop /* 80A92544-80A92548 000128 0004+00 0/1 0/0 0/0 .rodata @6253 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6253 = -1.0f / 10.0f; -COMPILER_STRIP_GATE(80A92544, &lit_6253); +COMPILER_STRIP_GATE(0x80A92544, &lit_6253); #pragma pop /* 80A8ED58-80A8F0FC 006178 03A4+00 1/1 0/0 0/0 .text npc_ne_carry__FP12npc_ne_class */ @@ -1730,7 +1749,7 @@ static asm void npc_ne_carry(npc_ne_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6270 = 20000.0f; -COMPILER_STRIP_GATE(80A92548, &lit_6270); +COMPILER_STRIP_GATE(0x80A92548, &lit_6270); #pragma pop /* 80A8F0FC-80A8F1B0 00651C 00B4+00 1/1 0/0 0/0 .text npc_ne_dish__FP12npc_ne_class */ @@ -1758,14 +1777,14 @@ static asm void npc_ne_message(npc_ne_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6811 = -7.0f; -COMPILER_STRIP_GATE(80A9254C, &lit_6811); +COMPILER_STRIP_GATE(0x80A9254C, &lit_6811); #pragma pop /* 80A92550-80A92554 000134 0004+00 0/1 0/0 0/0 .rodata @6812 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6812 = 7.0f / 10.0f; -COMPILER_STRIP_GATE(80A92550, &lit_6812); +COMPILER_STRIP_GATE(0x80A92550, &lit_6812); #pragma pop /* 80A8F278-80A903E8 006698 1170+00 2/1 0/0 0/0 .text action__FP12npc_ne_class */ @@ -1783,154 +1802,154 @@ static asm void action(npc_ne_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6813 = -2800.0f; -COMPILER_STRIP_GATE(80A92554, &lit_6813); +COMPILER_STRIP_GATE(0x80A92554, &lit_6813); #pragma pop /* 80A92558-80A9255C 00013C 0004+00 0/0 0/0 0/0 .rodata @6814 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6814 = 700.0f; -COMPILER_STRIP_GATE(80A92558, &lit_6814); +COMPILER_STRIP_GATE(0x80A92558, &lit_6814); #pragma pop /* 80A9255C-80A92560 000140 0004+00 0/1 0/0 0/0 .rodata @6815 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6815 = 3400.0f; -COMPILER_STRIP_GATE(80A9255C, &lit_6815); +COMPILER_STRIP_GATE(0x80A9255C, &lit_6815); #pragma pop /* 80A92560-80A92564 000144 0004+00 0/1 0/0 0/0 .rodata @6816 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_6816 = 0x42A8428F; -COMPILER_STRIP_GATE(80A92560, &lit_6816); +COMPILER_STRIP_GATE(0x80A92560, &lit_6816); #pragma pop /* 80A92564-80A92568 000148 0004+00 0/1 0/0 0/0 .rodata @6817 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6817 = 64.0f; -COMPILER_STRIP_GATE(80A92564, &lit_6817); +COMPILER_STRIP_GATE(0x80A92564, &lit_6817); #pragma pop /* 80A92568-80A9256C 00014C 0004+00 0/0 0/0 0/0 .rodata @6818 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6818 = -120.0f; -COMPILER_STRIP_GATE(80A92568, &lit_6818); +COMPILER_STRIP_GATE(0x80A92568, &lit_6818); #pragma pop /* 80A9256C-80A92570 000150 0004+00 0/0 0/0 0/0 .rodata @6819 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6819 = 6.0f; -COMPILER_STRIP_GATE(80A9256C, &lit_6819); +COMPILER_STRIP_GATE(0x80A9256C, &lit_6819); #pragma pop /* 80A92570-80A92574 000154 0004+00 0/0 0/0 0/0 .rodata @6820 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6820 = -25.0f; -COMPILER_STRIP_GATE(80A92570, &lit_6820); +COMPILER_STRIP_GATE(0x80A92570, &lit_6820); #pragma pop /* 80A92574-80A92578 000158 0004+00 0/1 0/0 0/0 .rodata @6821 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6821 = -30.0f; -COMPILER_STRIP_GATE(80A92574, &lit_6821); +COMPILER_STRIP_GATE(0x80A92574, &lit_6821); #pragma pop /* 80A92578-80A9257C 00015C 0004+00 0/0 0/0 0/0 .rodata @6822 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6822 = -40.0f; -COMPILER_STRIP_GATE(80A92578, &lit_6822); +COMPILER_STRIP_GATE(0x80A92578, &lit_6822); #pragma pop /* 80A9257C-80A92580 000160 0004+00 0/1 0/0 0/0 .rodata @6823 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6823 = 1500.0f; -COMPILER_STRIP_GATE(80A9257C, &lit_6823); +COMPILER_STRIP_GATE(0x80A9257C, &lit_6823); #pragma pop /* 80A92580-80A92584 000164 0004+00 0/1 0/0 0/0 .rodata @7051 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7051 = 55.0f; -COMPILER_STRIP_GATE(80A92580, &lit_7051); +COMPILER_STRIP_GATE(0x80A92580, &lit_7051); #pragma pop /* 80A92584-80A92588 000168 0004+00 0/1 0/0 0/0 .rodata @7052 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7052 = 387.0f; -COMPILER_STRIP_GATE(80A92584, &lit_7052); +COMPILER_STRIP_GATE(0x80A92584, &lit_7052); #pragma pop /* 80A92588-80A9258C 00016C 0004+00 0/1 0/0 0/0 .rodata @7053 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7053 = 133.0f; -COMPILER_STRIP_GATE(80A92588, &lit_7053); +COMPILER_STRIP_GATE(0x80A92588, &lit_7053); #pragma pop /* 80A9258C-80A92590 000170 0004+00 0/1 0/0 0/0 .rodata @7054 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7054 = -866.0f; -COMPILER_STRIP_GATE(80A9258C, &lit_7054); +COMPILER_STRIP_GATE(0x80A9258C, &lit_7054); #pragma pop /* 80A92590-80A92594 000174 0004+00 0/1 0/0 0/0 .rodata @7055 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7055 = 284.0f; -COMPILER_STRIP_GATE(80A92590, &lit_7055); +COMPILER_STRIP_GATE(0x80A92590, &lit_7055); #pragma pop /* 80A92594-80A92598 000178 0004+00 0/1 0/0 0/0 .rodata @7056 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7056 = 208.0f; -COMPILER_STRIP_GATE(80A92594, &lit_7056); +COMPILER_STRIP_GATE(0x80A92594, &lit_7056); #pragma pop /* 80A92598-80A9259C 00017C 0004+00 0/1 0/0 0/0 .rodata @7057 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7057 = -585.0f; -COMPILER_STRIP_GATE(80A92598, &lit_7057); +COMPILER_STRIP_GATE(0x80A92598, &lit_7057); #pragma pop /* 80A9259C-80A925A0 000180 0004+00 0/1 0/0 0/0 .rodata @7058 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7058 = 33.0f / 100.0f; -COMPILER_STRIP_GATE(80A9259C, &lit_7058); +COMPILER_STRIP_GATE(0x80A9259C, &lit_7058); #pragma pop /* 80A925A0-80A925A4 000184 0004+00 0/1 0/0 0/0 .rodata @7059 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7059 = 3.0f / 100.0f; -COMPILER_STRIP_GATE(80A925A0, &lit_7059); +COMPILER_STRIP_GATE(0x80A925A0, &lit_7059); #pragma pop /* 80A925A4-80A925A8 000188 0004+00 0/1 0/0 0/0 .rodata @7060 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7060 = 130.0f; -COMPILER_STRIP_GATE(80A925A4, &lit_7060); +COMPILER_STRIP_GATE(0x80A925A4, &lit_7060); #pragma pop /* 80A925A8-80A925AC 00018C 0004+00 0/1 0/0 0/0 .rodata @7061 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7061 = 170.0f; -COMPILER_STRIP_GATE(80A925A8, &lit_7061); +COMPILER_STRIP_GATE(0x80A925A8, &lit_7061); #pragma pop /* 80A903E8-80A90E28 007808 0A40+00 1/1 0/0 0/0 .text demo_camera__FP12npc_ne_class */ @@ -1958,28 +1977,28 @@ static asm void message(npc_ne_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7319 = 100000.0f; -COMPILER_STRIP_GATE(80A925AC, &lit_7319); +COMPILER_STRIP_GATE(0x80A925AC, &lit_7319); #pragma pop /* 80A925B0-80A925B4 000194 0004+00 0/1 0/0 0/0 .rodata @7320 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7320 = -20000.0f; -COMPILER_STRIP_GATE(80A925B0, &lit_7320); +COMPILER_STRIP_GATE(0x80A925B0, &lit_7320); #pragma pop /* 80A925B4-80A925B8 000198 0004+00 0/1 0/0 0/0 .rodata @7321 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7321 = 300000.0f; -COMPILER_STRIP_GATE(80A925B4, &lit_7321); +COMPILER_STRIP_GATE(0x80A925B4, &lit_7321); #pragma pop /* 80A925B8-80A925BC 00019C 0004+00 0/1 0/0 0/0 .rodata @7322 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7322 = -10000.0f; -COMPILER_STRIP_GATE(80A925B8, &lit_7322); +COMPILER_STRIP_GATE(0x80A925B8, &lit_7322); #pragma pop /* 80A91004-80A9172C 008424 0728+00 2/1 0/0 0/0 .text daNpc_Ne_Execute__FP12npc_ne_class @@ -2035,35 +2054,41 @@ asm J3DFrameCtrl::~J3DFrameCtrl() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7656 = 1005.0f; -COMPILER_STRIP_GATE(80A925BC, &lit_7656); +COMPILER_STRIP_GATE(0x80A925BC, &lit_7656); #pragma pop /* 80A925C0-80A925C4 0001A4 0004+00 0/1 0/0 0/0 .rodata @7657 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7657 = 766.0f; -COMPILER_STRIP_GATE(80A925C0, &lit_7657); +COMPILER_STRIP_GATE(0x80A925C0, &lit_7657); #pragma pop /* 80A925C4-80A925C8 0001A8 0004+00 0/1 0/0 0/0 .rodata @7658 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7658 = -1423.0f; -COMPILER_STRIP_GATE(80A925C4, &lit_7658); +COMPILER_STRIP_GATE(0x80A925C4, &lit_7658); #pragma pop /* 80A925C8-80A925CC 0001AC 0004+00 0/1 0/0 0/0 .rodata @7659 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_7659 = 0x407FEF9E; -COMPILER_STRIP_GATE(80A925C8, &lit_7659); +COMPILER_STRIP_GATE(0x80A925C8, &lit_7659); #pragma pop /* 80A925CC-80A925D0 0001B0 0004+00 0/1 0/0 0/0 .rodata @7660 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7660 = 0.625f; -COMPILER_STRIP_GATE(80A925CC, &lit_7660); +COMPILER_STRIP_GATE(0x80A925CC, &lit_7660); +#pragma pop + +/* 80A925D0-80A925D0 0001B4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80A925E7 = "Npc_ne"; #pragma pop /* 80A91B88-80A92118 008FA8 0590+00 1/0 0/0 0/0 .text daNpc_Ne_Create__FP10fopAc_ac_c */ @@ -2138,7 +2163,7 @@ asm void __sinit_d_a_npc_ne_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80A923BC = (void*)__sinit_d_a_npc_ne_cpp; +REGISTER_CTORS(0x80A923BC, __sinit_d_a_npc_ne_cpp); #pragma pop /* 80A923F8-80A92400 009818 0008+00 1/0 0/0 0/0 .text @36@__dt__12dBgS_ObjAcchFv */ @@ -2333,12 +2358,4 @@ static u8 data_80A92B78[4]; static u8 data_80A92B7C[4]; #pragma pop -/* 80A925D0-80A925EE 0001B4 001E+00 9/9 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80A925D0 = "Npc_net"; -SECTION_DEAD static char const* const stringBase_80A925D8 = " PN %d"; -SECTION_DEAD static char const* const stringBase_80A925DF = "F_SP103"; -SECTION_DEAD static char const* const stringBase_80A925E7 = "Npc_ne"; -#pragma pop +/* 80A925D0-80A925D0 0001B4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/npc/d_a_npc_pachi_besu/d_a_npc_pachi_besu.cpp b/rel/d/a/npc/d_a_npc_pachi_besu/d_a_npc_pachi_besu.cpp index d93a9a7345a..c96720bba72 100644 --- a/rel/d/a/npc/d_a_npc_pachi_besu/d_a_npc_pachi_besu.cpp +++ b/rel/d/a/npc/d_a_npc_pachi_besu/d_a_npc_pachi_besu.cpp @@ -15,12 +15,14 @@ struct mDoMtx_stack_c { static u8 now[48]; }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; +struct J3DAnmTransform {}; + +struct J3DModelData {}; + struct Vec {}; struct Z2Creature { @@ -29,8 +31,6 @@ struct Z2Creature { /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -43,6 +43,8 @@ struct fopAc_ac_c { /* 80018C8C */ ~fopAc_ac_c(); }; +struct daNpcT_faceMotionAnmData_c {}; + struct daNpcT_MotionSeqMngr_c { struct sequenceStepData_c {}; @@ -51,20 +53,18 @@ struct daNpcT_MotionSeqMngr_c { /* 80A961D4 */ ~daNpcT_MotionSeqMngr_c(); }; +struct daNpcT_evtData_c {}; + struct daNpcT_motionAnmData_c {}; +struct J3DJoint {}; + struct cXyz { /* 80266B34 */ void operator-(Vec const&) const; /* 80A95B40 */ ~cXyz(); /* 80A961D0 */ cXyz(); }; -struct J3DJoint {}; - -struct daNpcT_faceMotionAnmData_c {}; - -struct daNpcT_evtData_c {}; - struct daNpc_Pachi_Besu_c { /* 80A92D6C */ ~daNpc_Pachi_Besu_c(); /* 80A92EA4 */ void create(); @@ -155,10 +155,10 @@ struct dCcD_GObjInf { /* 800840E4 */ ~dCcD_GObjInf(); }; -struct J3DModel {}; - struct _GXColorS10 {}; +struct J3DModel {}; + struct daNpcT_c { /* 80147FA4 */ void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*); /* 801483F8 */ void loadRes(s8 const*, char const**); @@ -305,13 +305,13 @@ struct dBgS_AcchCir { /* 80A9621C */ ~dBgS_AcchCir(); }; -struct dBgS {}; - struct csXyz { /* 80A95B7C */ ~csXyz(); /* 80A960D0 */ csXyz(); }; +struct dBgS {}; + struct dBgS_Acch { /* 80075F94 */ ~dBgS_Acch(); /* 800760A0 */ dBgS_Acch(); @@ -673,6 +673,29 @@ extern "C" void __register_global_object(); // /* ############################################################################################## */ +/* 80A96B60-80A96B60 0000F4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80A96B60 = ""; +SECTION_DEAD static char const* const stringBase_80A96B61 = "TUTRIAL_TALK2"; +SECTION_DEAD static char const* const stringBase_80A96B6F = "Besu"; +SECTION_DEAD static char const* const stringBase_80A96B74 = "Besu_TW"; +SECTION_DEAD static char const* const stringBase_80A96B7C = "Besu0"; +SECTION_DEAD static char const* const stringBase_80A96B82 = "Besu1"; +SECTION_DEAD static char const* const stringBase_80A96B88 = "Besu2"; +SECTION_DEAD static char const* const stringBase_80A96B8E = "Besu3"; +SECTION_DEAD static char const* const stringBase_80A96B94 = "evt_pachi"; +SECTION_DEAD static char const* const stringBase_80A96B9E = "TUTRIAL_BEGIN"; +SECTION_DEAD static char const* const stringBase_80A96BAC = "TUTRIAL_BEGIN_SKIP"; +SECTION_DEAD static char const* const stringBase_80A96BBF = "TUTRIAL_CLEAR"; +SECTION_DEAD static char const* const stringBase_80A96BCD = "TUTRIAL_TALK"; +SECTION_DEAD static char const* const stringBase_80A96BDA = "HIT_KAKASI_BODY"; +SECTION_DEAD static char const* const stringBase_80A96BEA = "TUTRIAL_SELECT_GIVEUP"; +SECTION_DEAD static char const* const stringBase_80A96C00 = "TUTRIAL_GIVEUP"; +SECTION_DEAD static char const* const stringBase_80A96C0F = "TUTRIAL_CONTINUE"; +SECTION_DEAD static char const* const stringBase_80A96C20 = "TUTRIAL_CAUTION"; +#pragma pop + /* 80A96C40-80A96C4C 000000 000C+00 2/2 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -1341,41 +1364,41 @@ SECTION_RODATA u8 const daNpc_Pachi_Besu_Param_c::m[140] = { 0xC1, 0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC1, 0x70, 0x00, 0x00, 0x41, 0x70, 0x00, 0x00, 0x41, 0xF0, 0x00, 0x00, 0x41, 0x70, 0x00, 0x00, 0x42, 0x8C, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A96A6C, &daNpc_Pachi_Besu_Param_c::m); +COMPILER_STRIP_GATE(0x80A96A6C, &daNpc_Pachi_Besu_Param_c::m); /* 80A96AF8-80A96AFC 00008C 0004+00 0/1 0/0 0/0 .rodata @4186 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4186 = -300.0f; -COMPILER_STRIP_GATE(80A96AF8, &lit_4186); +COMPILER_STRIP_GATE(0x80A96AF8, &lit_4186); #pragma pop /* 80A96AFC-80A96B00 000090 0004+00 0/1 0/0 0/0 .rodata @4187 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4187 = -50.0f; -COMPILER_STRIP_GATE(80A96AFC, &lit_4187); +COMPILER_STRIP_GATE(0x80A96AFC, &lit_4187); #pragma pop /* 80A96B00-80A96B04 000094 0004+00 0/1 0/0 0/0 .rodata @4188 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4188 = 300.0f; -COMPILER_STRIP_GATE(80A96B00, &lit_4188); +COMPILER_STRIP_GATE(0x80A96B00, &lit_4188); #pragma pop /* 80A96B04-80A96B08 000098 0004+00 0/1 0/0 0/0 .rodata @4189 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4189 = 450.0f; -COMPILER_STRIP_GATE(80A96B04, &lit_4189); +COMPILER_STRIP_GATE(0x80A96B04, &lit_4189); #pragma pop /* 80A96B08-80A96B0C 00009C 0004+00 0/1 0/0 0/0 .rodata @4190 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4190 = -1000000000.0f; -COMPILER_STRIP_GATE(80A96B08, &lit_4190); +COMPILER_STRIP_GATE(0x80A96B08, &lit_4190); #pragma pop /* 80A92EA4-80A9317C 000224 02D8+00 1/1 0/0 0/0 .text create__18daNpc_Pachi_Besu_cFv */ @@ -1396,25 +1419,25 @@ SECTION_RODATA static u8 const lit_4347[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A96B0C, &lit_4347); +COMPILER_STRIP_GATE(0x80A96B0C, &lit_4347); /* 80A96B10-80A96B14 0000A4 0004+00 0/2 0/0 0/0 .rodata @4348 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4348 = 65536.0f; -COMPILER_STRIP_GATE(80A96B10, &lit_4348); +COMPILER_STRIP_GATE(0x80A96B10, &lit_4348); #pragma pop /* 80A96B14-80A96B18 0000A8 0004+00 0/3 0/0 0/0 .rodata @4349 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4349 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(80A96B14, &lit_4349); +COMPILER_STRIP_GATE(0x80A96B14, &lit_4349); #pragma pop /* 80A96B18-80A96B1C 0000AC 0004+00 2/4 0/0 0/0 .rodata @4497 */ SECTION_RODATA static f32 const lit_4497 = 1.0f; -COMPILER_STRIP_GATE(80A96B18, &lit_4497); +COMPILER_STRIP_GATE(0x80A96B18, &lit_4497); /* 80A9317C-80A9344C 0004FC 02D0+00 1/1 0/0 0/0 .text CreateHeap__18daNpc_Pachi_Besu_cFv */ @@ -1550,7 +1573,7 @@ asm void daNpc_Pachi_Besu_c::Execute() { /* ############################################################################################## */ /* 80A96B1C-80A96B20 0000B0 0004+00 1/2 0/0 0/0 .rodata @4546 */ SECTION_RODATA static f32 const lit_4546 = 100.0f; -COMPILER_STRIP_GATE(80A96B1C, &lit_4546); +COMPILER_STRIP_GATE(0x80A96B1C, &lit_4546); /* 80A9365C-80A936F0 0009DC 0094+00 1/1 0/0 0/0 .text Draw__18daNpc_Pachi_Besu_cFv */ #pragma push @@ -1638,7 +1661,7 @@ asm void daNpc_Pachi_Besu_c::setParam() { /* ############################################################################################## */ /* 80A96B20-80A96B24 0000B4 0004+00 3/4 0/0 0/0 .rodata @4732 */ SECTION_RODATA static f32 const lit_4732 = -1.0f; -COMPILER_STRIP_GATE(80A96B20, &lit_4732); +COMPILER_STRIP_GATE(0x80A96B20, &lit_4732); /* 80A97AC8-80A97ACC 000008 0001+03 1/1 0/0 0/0 .bss @1109 */ static u8 lit_1109[1 + 3 /* padding */]; @@ -1799,6 +1822,13 @@ asm void daNpc_Pachi_Besu_c::evtTalk() { } #pragma pop +/* ############################################################################################## */ +/* 80A96B60-80A96B60 0000F4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80A96C30 = "PA_Besu"; +#pragma pop + /* 80A93FB0-80A94078 001330 00C8+00 1/0 0/0 0/0 .text evtCutProc__18daNpc_Pachi_Besu_cFv */ #pragma push @@ -1836,14 +1866,14 @@ asm void daNpc_Pachi_Besu_c::beforeMove() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4908 = 10.0f; -COMPILER_STRIP_GATE(80A96B24, &lit_4908); +COMPILER_STRIP_GATE(0x80A96B24, &lit_4908); #pragma pop /* 80A96B28-80A96B2C 0000BC 0004+00 0/1 0/0 0/0 .rodata @4909 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4909 = 30.0f; -COMPILER_STRIP_GATE(80A96B28, &lit_4909); +COMPILER_STRIP_GATE(0x80A96B28, &lit_4909); #pragma pop /* 80A96B2C-80A96B34 0000C0 0004+04 0/1 0/0 0/0 .rodata @4910 */ @@ -1854,14 +1884,14 @@ SECTION_RODATA static u32 const lit_4910[1 + 1 /* padding */] = { /* padding */ 0x00000000, }; -COMPILER_STRIP_GATE(80A96B2C, &lit_4910); +COMPILER_STRIP_GATE(0x80A96B2C, &lit_4910); #pragma pop /* 80A96B34-80A96B3C 0000C8 0008+00 1/3 0/0 0/0 .rodata @4912 */ SECTION_RODATA static u8 const lit_4912[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A96B34, &lit_4912); +COMPILER_STRIP_GATE(0x80A96B34, &lit_4912); /* 80A94298-80A944F0 001618 0258+00 1/0 0/0 0/0 .text setAttnPos__18daNpc_Pachi_Besu_cFv */ @@ -1905,7 +1935,7 @@ asm void daNpc_Pachi_Besu_c::selectAction() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpc_Pachi_Besu_c::chkAction(int (daNpc_Pachi_Besu_c::*)(void*)) { +asm void daNpc_Pachi_Besu_c::chkAction(int (daNpc_Pachi_Besu_c::*param_0)(void*)) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_pachi_besu/d_a_npc_pachi_besu/chkAction__18daNpc_Pachi_Besu_cFM18daNpc_Pachi_Besu_cFPCvPvPv_i.s" } @@ -1916,7 +1946,7 @@ asm void daNpc_Pachi_Besu_c::chkAction(int (daNpc_Pachi_Besu_c::*)(void*)) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpc_Pachi_Besu_c::setAction(int (daNpc_Pachi_Besu_c::*)(void*)) { +asm void daNpc_Pachi_Besu_c::setAction(int (daNpc_Pachi_Besu_c::*param_0)(void*)) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_pachi_besu/d_a_npc_pachi_besu/setAction__18daNpc_Pachi_Besu_cFM18daNpc_Pachi_Besu_cFPCvPvPv_i.s" } @@ -1972,6 +2002,13 @@ asm void daNpc_Pachi_Besu_c::_turn_pos(cXyz const& param_0) { } #pragma pop +/* ############################################################################################## */ +/* 80A96B60-80A96B60 0000F4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80A96C38 = "cutId"; +#pragma pop + /* 80A94B64-80A94BF8 001EE4 0094+00 1/0 0/0 0/0 .text cutTutrialBegin__18daNpc_Pachi_Besu_cFi */ #pragma push #pragma optimization_level 0 @@ -2045,7 +2082,7 @@ asm void daNpc_Pachi_Besu_c::_cutTutrialClear_Init(int const& param_0) { SECTION_RODATA static u8 const lit_4970[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A96B3C, &lit_4970); +COMPILER_STRIP_GATE(0x80A96B3C, &lit_4970); #pragma pop /* 80A96B44-80A96B4C 0000D8 0008+00 0/1 0/0 0/0 .rodata @4971 */ @@ -2054,7 +2091,7 @@ COMPILER_STRIP_GATE(80A96B3C, &lit_4970); SECTION_RODATA static u8 const lit_4971[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A96B44, &lit_4971); +COMPILER_STRIP_GATE(0x80A96B44, &lit_4971); #pragma pop /* 80A96B4C-80A96B54 0000E0 0008+00 0/1 0/0 0/0 .rodata @4972 */ @@ -2063,28 +2100,28 @@ COMPILER_STRIP_GATE(80A96B44, &lit_4971); SECTION_RODATA static u8 const lit_4972[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A96B4C, &lit_4972); +COMPILER_STRIP_GATE(0x80A96B4C, &lit_4972); #pragma pop /* 80A96B54-80A96B58 0000E8 0004+00 0/2 0/0 0/0 .rodata @5270 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_5270 = 0x445FBAA0; -COMPILER_STRIP_GATE(80A96B54, &lit_5270); +COMPILER_STRIP_GATE(0x80A96B54, &lit_5270); #pragma pop /* 80A96B58-80A96B5C 0000EC 0004+00 0/2 0/0 0/0 .rodata @5271 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_5271 = 0x4461DA4E; -COMPILER_STRIP_GATE(80A96B58, &lit_5271); +COMPILER_STRIP_GATE(0x80A96B58, &lit_5271); #pragma pop /* 80A96B5C-80A96B60 0000F0 0004+00 0/2 0/0 0/0 .rodata @5272 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_5272 = 0xC4FF0B85; -COMPILER_STRIP_GATE(80A96B5C, &lit_5272); +COMPILER_STRIP_GATE(0x80A96B5C, &lit_5272); #pragma pop /* 80A94E38-80A94ECC 0021B8 0094+00 1/1 0/0 0/0 .text @@ -2663,7 +2700,7 @@ asm void __sinit_d_a_npc_pachi_besu_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80A96798 = (void*)__sinit_d_a_npc_pachi_besu_cpp; +REGISTER_CTORS(0x80A96798, __sinit_d_a_npc_pachi_besu_cpp); #pragma pop /* 80A968F4-80A969C0 003C74 00CC+00 1/1 0/0 0/0 .text @@ -2927,28 +2964,4 @@ static u8 data_80A97B90[4]; static u8 data_80A97B94[4]; #pragma pop -/* 80A96B60-80A96C3E 0000F4 00DE+00 14/11 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80A96B60 = ""; -SECTION_DEAD static char const* const stringBase_80A96B61 = "TUTRIAL_TALK2"; -SECTION_DEAD static char const* const stringBase_80A96B6F = "Besu"; -SECTION_DEAD static char const* const stringBase_80A96B74 = "Besu_TW"; -SECTION_DEAD static char const* const stringBase_80A96B7C = "Besu0"; -SECTION_DEAD static char const* const stringBase_80A96B82 = "Besu1"; -SECTION_DEAD static char const* const stringBase_80A96B88 = "Besu2"; -SECTION_DEAD static char const* const stringBase_80A96B8E = "Besu3"; -SECTION_DEAD static char const* const stringBase_80A96B94 = "evt_pachi"; -SECTION_DEAD static char const* const stringBase_80A96B9E = "TUTRIAL_BEGIN"; -SECTION_DEAD static char const* const stringBase_80A96BAC = "TUTRIAL_BEGIN_SKIP"; -SECTION_DEAD static char const* const stringBase_80A96BBF = "TUTRIAL_CLEAR"; -SECTION_DEAD static char const* const stringBase_80A96BCD = "TUTRIAL_TALK"; -SECTION_DEAD static char const* const stringBase_80A96BDA = "HIT_KAKASI_BODY"; -SECTION_DEAD static char const* const stringBase_80A96BEA = "TUTRIAL_SELECT_GIVEUP"; -SECTION_DEAD static char const* const stringBase_80A96C00 = "TUTRIAL_GIVEUP"; -SECTION_DEAD static char const* const stringBase_80A96C0F = "TUTRIAL_CONTINUE"; -SECTION_DEAD static char const* const stringBase_80A96C20 = "TUTRIAL_CAUTION"; -SECTION_DEAD static char const* const stringBase_80A96C30 = "PA_Besu"; -SECTION_DEAD static char const* const stringBase_80A96C38 = "cutId"; -#pragma pop +/* 80A96B60-80A96B60 0000F4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/npc/d_a_npc_pachi_maro/d_a_npc_pachi_maro.cpp b/rel/d/a/npc/d_a_npc_pachi_maro/d_a_npc_pachi_maro.cpp index f52167818d4..712bca1766b 100644 --- a/rel/d/a/npc/d_a_npc_pachi_maro/d_a_npc_pachi_maro.cpp +++ b/rel/d/a/npc/d_a_npc_pachi_maro/d_a_npc_pachi_maro.cpp @@ -15,12 +15,14 @@ struct mDoMtx_stack_c { static u8 now[48]; }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; +struct J3DAnmTransform {}; + +struct J3DModelData {}; + struct Vec {}; struct Z2Creature { @@ -29,8 +31,6 @@ struct Z2Creature { /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -43,6 +43,8 @@ struct fopAc_ac_c { /* 80018C8C */ ~fopAc_ac_c(); }; +struct daNpcT_faceMotionAnmData_c {}; + struct daNpcT_MotionSeqMngr_c { struct sequenceStepData_c {}; @@ -50,20 +52,18 @@ struct daNpcT_MotionSeqMngr_c { /* 80A9B054 */ ~daNpcT_MotionSeqMngr_c(); }; +struct daNpcT_evtData_c {}; + struct daNpcT_motionAnmData_c {}; +struct J3DJoint {}; + struct cXyz { /* 80266B34 */ void operator-(Vec const&) const; /* 80A9A9C0 */ ~cXyz(); /* 80A9B050 */ cXyz(); }; -struct J3DJoint {}; - -struct daNpcT_faceMotionAnmData_c {}; - -struct daNpcT_evtData_c {}; - struct daNpc_Pachi_Maro_c { /* 80A97C8C */ ~daNpc_Pachi_Maro_c(); /* 80A97DC4 */ void create(); @@ -156,10 +156,10 @@ struct dCcD_GObjInf { /* 800840E4 */ ~dCcD_GObjInf(); }; -struct J3DModel {}; - struct _GXColorS10 {}; +struct J3DModel {}; + struct daNpcT_c { /* 80147FA4 */ void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*); /* 801483F8 */ void loadRes(s8 const*, char const**); @@ -304,13 +304,13 @@ struct dBgS_AcchCir { /* 80A9B09C */ ~dBgS_AcchCir(); }; -struct dBgS {}; - struct csXyz { /* 80A9A9FC */ ~csXyz(); /* 80A9AF50 */ csXyz(); }; +struct dBgS {}; + struct dBgS_Acch { /* 80075F94 */ ~dBgS_Acch(); /* 800760A0 */ dBgS_Acch(); @@ -669,6 +669,32 @@ extern "C" void __register_global_object(); // /* ############################################################################################## */ +/* 80A9B988-80A9B988 0000FC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80A9B988 = ""; +SECTION_DEAD static char const* const stringBase_80A9B989 = "TUTRIAL_TALK"; +SECTION_DEAD static char const* const stringBase_80A9B996 = "Maro"; +SECTION_DEAD static char const* const stringBase_80A9B99B = "Maro_TW"; +SECTION_DEAD static char const* const stringBase_80A9B9A3 = "Maro1"; +SECTION_DEAD static char const* const stringBase_80A9B9A9 = "Maro2"; +SECTION_DEAD static char const* const stringBase_80A9B9AF = "Maro3"; +SECTION_DEAD static char const* const stringBase_80A9B9B5 = "Taro1"; +SECTION_DEAD static char const* const stringBase_80A9B9BB = "Taro2"; +SECTION_DEAD static char const* const stringBase_80A9B9C1 = "Len1"; +SECTION_DEAD static char const* const stringBase_80A9B9C6 = "Besu1"; +SECTION_DEAD static char const* const stringBase_80A9B9CC = "evt_pachi"; +SECTION_DEAD static char const* const stringBase_80A9B9D6 = "TUTRIAL_BEGIN"; +SECTION_DEAD static char const* const stringBase_80A9B9E4 = "TUTRIAL_BEGIN_SKIP"; +SECTION_DEAD static char const* const stringBase_80A9B9F7 = "TUTRIAL_CLEAR"; +SECTION_DEAD static char const* const stringBase_80A9BA05 = "TUTRIAL_TALK2"; +SECTION_DEAD static char const* const stringBase_80A9BA13 = "HIT_KAKASI_BODY"; +SECTION_DEAD static char const* const stringBase_80A9BA23 = "TUTRIAL_SELECT_GIVEUP"; +SECTION_DEAD static char const* const stringBase_80A9BA39 = "TUTRIAL_GIVEUP"; +SECTION_DEAD static char const* const stringBase_80A9BA48 = "TUTRIAL_CONTINUE"; +SECTION_DEAD static char const* const stringBase_80A9BA59 = "TUTRIAL_CAUTION"; +#pragma pop + /* 80A9BA78-80A9BA84 000000 000C+00 2/2 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -1195,41 +1221,41 @@ SECTION_RODATA u8 const daNpc_Pachi_Maro_Param_c::m[144] = { 0xC1, 0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC1, 0x70, 0x00, 0x00, 0x41, 0x70, 0x00, 0x00, 0x41, 0xF0, 0x00, 0x00, 0x41, 0x70, 0x00, 0x00, 0x41, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A9B88C, &daNpc_Pachi_Maro_Param_c::m); +COMPILER_STRIP_GATE(0x80A9B88C, &daNpc_Pachi_Maro_Param_c::m); /* 80A9B91C-80A9B920 000090 0004+00 0/1 0/0 0/0 .rodata @4185 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4185 = -300.0f; -COMPILER_STRIP_GATE(80A9B91C, &lit_4185); +COMPILER_STRIP_GATE(0x80A9B91C, &lit_4185); #pragma pop /* 80A9B920-80A9B924 000094 0004+00 0/1 0/0 0/0 .rodata @4186 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4186 = -50.0f; -COMPILER_STRIP_GATE(80A9B920, &lit_4186); +COMPILER_STRIP_GATE(0x80A9B920, &lit_4186); #pragma pop /* 80A9B924-80A9B928 000098 0004+00 0/1 0/0 0/0 .rodata @4187 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4187 = 300.0f; -COMPILER_STRIP_GATE(80A9B924, &lit_4187); +COMPILER_STRIP_GATE(0x80A9B924, &lit_4187); #pragma pop /* 80A9B928-80A9B92C 00009C 0004+00 0/1 0/0 0/0 .rodata @4188 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4188 = 450.0f; -COMPILER_STRIP_GATE(80A9B928, &lit_4188); +COMPILER_STRIP_GATE(0x80A9B928, &lit_4188); #pragma pop /* 80A9B92C-80A9B930 0000A0 0004+00 0/1 0/0 0/0 .rodata @4189 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4189 = -1000000000.0f; -COMPILER_STRIP_GATE(80A9B92C, &lit_4189); +COMPILER_STRIP_GATE(0x80A9B92C, &lit_4189); #pragma pop /* 80A97DC4-80A9809C 000224 02D8+00 1/1 0/0 0/0 .text create__18daNpc_Pachi_Maro_cFv */ @@ -1250,25 +1276,25 @@ SECTION_RODATA static u8 const lit_4346[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A9B930, &lit_4346); +COMPILER_STRIP_GATE(0x80A9B930, &lit_4346); /* 80A9B934-80A9B938 0000A8 0004+00 0/2 0/0 0/0 .rodata @4347 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4347 = 65536.0f; -COMPILER_STRIP_GATE(80A9B934, &lit_4347); +COMPILER_STRIP_GATE(0x80A9B934, &lit_4347); #pragma pop /* 80A9B938-80A9B93C 0000AC 0004+00 0/3 0/0 0/0 .rodata @4348 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4348 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(80A9B938, &lit_4348); +COMPILER_STRIP_GATE(0x80A9B938, &lit_4348); #pragma pop /* 80A9B93C-80A9B940 0000B0 0004+00 2/4 0/0 0/0 .rodata @4494 */ SECTION_RODATA static f32 const lit_4494 = 1.0f; -COMPILER_STRIP_GATE(80A9B93C, &lit_4494); +COMPILER_STRIP_GATE(0x80A9B93C, &lit_4494); /* 80A9809C-80A98320 0004FC 0284+00 1/1 0/0 0/0 .text CreateHeap__18daNpc_Pachi_Maro_cFv */ @@ -1404,7 +1430,7 @@ asm void daNpc_Pachi_Maro_c::Execute() { /* ############################################################################################## */ /* 80A9B940-80A9B944 0000B4 0004+00 1/1 0/0 0/0 .rodata @4543 */ SECTION_RODATA static f32 const lit_4543 = 100.0f; -COMPILER_STRIP_GATE(80A9B940, &lit_4543); +COMPILER_STRIP_GATE(0x80A9B940, &lit_4543); /* 80A98530-80A985C4 000990 0094+00 1/1 0/0 0/0 .text Draw__18daNpc_Pachi_Maro_cFv */ #pragma push @@ -1463,14 +1489,14 @@ asm void daNpc_Pachi_Maro_c::isDelete() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4596 = 7.0f / 100.0f; -COMPILER_STRIP_GATE(80A9B944, &lit_4596); +COMPILER_STRIP_GATE(0x80A9B944, &lit_4596); #pragma pop /* 80A9B948-80A9B94C 0000BC 0004+00 0/1 0/0 0/0 .rodata @4597 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4597 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(80A9B948, &lit_4597); +COMPILER_STRIP_GATE(0x80A9B948, &lit_4597); #pragma pop /* 80A9867C-80A987F4 000ADC 0178+00 1/1 0/0 0/0 .text reset__18daNpc_Pachi_Maro_cFv */ @@ -1512,7 +1538,7 @@ bool daNpc_Pachi_Maro_c::checkChangeEvt() { /* ############################################################################################## */ /* 80A9B94C-80A9B950 0000C0 0004+00 3/3 0/0 0/0 .rodata @4673 */ SECTION_RODATA static f32 const lit_4673 = -1.0f; -COMPILER_STRIP_GATE(80A9B94C, &lit_4673); +COMPILER_STRIP_GATE(0x80A9B94C, &lit_4673); /* 80A98974-80A98A10 000DD4 009C+00 1/0 0/0 0/0 .text setAfterTalkMotion__18daNpc_Pachi_Maro_cFv */ @@ -1546,6 +1572,13 @@ asm void daNpc_Pachi_Maro_c::evtTalk() { } #pragma pop +/* ############################################################################################## */ +/* 80A9B988-80A9B988 0000FC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80A9BA69 = "PA_Maro"; +#pragma pop + /* 80A98B9C-80A98C64 000FFC 00C8+00 1/0 0/0 0/0 .text evtCutProc__18daNpc_Pachi_Maro_cFv */ #pragma push @@ -1594,7 +1627,7 @@ asm void daNpc_Pachi_Maro_c::afterMoved() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4850 = -30.0f; -COMPILER_STRIP_GATE(80A9B950, &lit_4850); +COMPILER_STRIP_GATE(0x80A9B950, &lit_4850); #pragma pop /* 80A9B954-80A9B95C 0000C8 0004+04 0/1 0/0 0/0 .rodata @4851 */ @@ -1605,14 +1638,14 @@ SECTION_RODATA static u32 const lit_4851[1 + 1 /* padding */] = { /* padding */ 0x00000000, }; -COMPILER_STRIP_GATE(80A9B954, &lit_4851); +COMPILER_STRIP_GATE(0x80A9B954, &lit_4851); #pragma pop /* 80A9B95C-80A9B964 0000D0 0008+00 1/3 0/0 0/0 .rodata @4853 */ SECTION_RODATA static u8 const lit_4853[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A9B95C, &lit_4853); +COMPILER_STRIP_GATE(0x80A9B95C, &lit_4853); /* 80A98FB4-80A9928C 001414 02D8+00 1/0 0/0 0/0 .text setAttnPos__18daNpc_Pachi_Maro_cFv */ @@ -1678,7 +1711,7 @@ asm void daNpc_Pachi_Maro_c::selectAction() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpc_Pachi_Maro_c::chkAction(int (daNpc_Pachi_Maro_c::*)(void*)) { +asm void daNpc_Pachi_Maro_c::chkAction(int (daNpc_Pachi_Maro_c::*param_0)(void*)) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_pachi_maro/d_a_npc_pachi_maro/chkAction__18daNpc_Pachi_Maro_cFM18daNpc_Pachi_Maro_cFPCvPvPv_i.s" } @@ -1689,7 +1722,7 @@ asm void daNpc_Pachi_Maro_c::chkAction(int (daNpc_Pachi_Maro_c::*)(void*)) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpc_Pachi_Maro_c::setAction(int (daNpc_Pachi_Maro_c::*)(void*)) { +asm void daNpc_Pachi_Maro_c::setAction(int (daNpc_Pachi_Maro_c::*param_0)(void*)) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_pachi_maro/d_a_npc_pachi_maro/setAction__18daNpc_Pachi_Maro_cFM18daNpc_Pachi_Maro_cFPCvPvPv_i.s" } @@ -1745,6 +1778,13 @@ asm void daNpc_Pachi_Maro_c::_turn_pos(cXyz const& param_0) { } #pragma pop +/* ############################################################################################## */ +/* 80A9B988-80A9B988 0000FC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80A9BA71 = "cutId"; +#pragma pop + /* 80A999E4-80A99A78 001E44 0094+00 1/0 0/0 0/0 .text cutTutrialBegin__18daNpc_Pachi_Maro_cFi */ #pragma push #pragma optimization_level 0 @@ -1818,7 +1858,7 @@ asm void daNpc_Pachi_Maro_c::_cutTutrialClear_Init(int const& param_0) { SECTION_RODATA static u8 const lit_4911[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A9B964, &lit_4911); +COMPILER_STRIP_GATE(0x80A9B964, &lit_4911); #pragma pop /* 80A9B96C-80A9B974 0000E0 0008+00 0/1 0/0 0/0 .rodata @4912 */ @@ -1827,7 +1867,7 @@ COMPILER_STRIP_GATE(80A9B964, &lit_4911); SECTION_RODATA static u8 const lit_4912[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A9B96C, &lit_4912); +COMPILER_STRIP_GATE(0x80A9B96C, &lit_4912); #pragma pop /* 80A9B974-80A9B97C 0000E8 0008+00 0/1 0/0 0/0 .rodata @4913 */ @@ -1836,28 +1876,28 @@ COMPILER_STRIP_GATE(80A9B96C, &lit_4912); SECTION_RODATA static u8 const lit_4913[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80A9B974, &lit_4913); +COMPILER_STRIP_GATE(0x80A9B974, &lit_4913); #pragma pop /* 80A9B97C-80A9B980 0000F0 0004+00 0/2 0/0 0/0 .rodata @5222 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_5222 = 0x445FBAA0; -COMPILER_STRIP_GATE(80A9B97C, &lit_5222); +COMPILER_STRIP_GATE(0x80A9B97C, &lit_5222); #pragma pop /* 80A9B980-80A9B984 0000F4 0004+00 0/2 0/0 0/0 .rodata @5223 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_5223 = 0x4461DA4E; -COMPILER_STRIP_GATE(80A9B980, &lit_5223); +COMPILER_STRIP_GATE(0x80A9B980, &lit_5223); #pragma pop /* 80A9B984-80A9B988 0000F8 0004+00 0/2 0/0 0/0 .rodata @5224 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_5224 = 0xC4FF0B85; -COMPILER_STRIP_GATE(80A9B984, &lit_5224); +COMPILER_STRIP_GATE(0x80A9B984, &lit_5224); #pragma pop /* 80A99CB8-80A99D4C 002118 0094+00 1/1 0/0 0/0 .text @@ -2420,7 +2460,7 @@ asm void __sinit_d_a_npc_pachi_maro_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80A9B5B8 = (void*)__sinit_d_a_npc_pachi_maro_cpp; +REGISTER_CTORS(0x80A9B5B8, __sinit_d_a_npc_pachi_maro_cpp); #pragma pop /* 80A9B714-80A9B7E0 003B74 00CC+00 1/1 0/0 0/0 .text @@ -2512,31 +2552,4 @@ static asm void func_80A9B870() { } #pragma pop -/* 80A9B988-80A9BA77 0000FC 00EF+00 14/11 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80A9B988 = ""; -SECTION_DEAD static char const* const stringBase_80A9B989 = "TUTRIAL_TALK"; -SECTION_DEAD static char const* const stringBase_80A9B996 = "Maro"; -SECTION_DEAD static char const* const stringBase_80A9B99B = "Maro_TW"; -SECTION_DEAD static char const* const stringBase_80A9B9A3 = "Maro1"; -SECTION_DEAD static char const* const stringBase_80A9B9A9 = "Maro2"; -SECTION_DEAD static char const* const stringBase_80A9B9AF = "Maro3"; -SECTION_DEAD static char const* const stringBase_80A9B9B5 = "Taro1"; -SECTION_DEAD static char const* const stringBase_80A9B9BB = "Taro2"; -SECTION_DEAD static char const* const stringBase_80A9B9C1 = "Len1"; -SECTION_DEAD static char const* const stringBase_80A9B9C6 = "Besu1"; -SECTION_DEAD static char const* const stringBase_80A9B9CC = "evt_pachi"; -SECTION_DEAD static char const* const stringBase_80A9B9D6 = "TUTRIAL_BEGIN"; -SECTION_DEAD static char const* const stringBase_80A9B9E4 = "TUTRIAL_BEGIN_SKIP"; -SECTION_DEAD static char const* const stringBase_80A9B9F7 = "TUTRIAL_CLEAR"; -SECTION_DEAD static char const* const stringBase_80A9BA05 = "TUTRIAL_TALK2"; -SECTION_DEAD static char const* const stringBase_80A9BA13 = "HIT_KAKASI_BODY"; -SECTION_DEAD static char const* const stringBase_80A9BA23 = "TUTRIAL_SELECT_GIVEUP"; -SECTION_DEAD static char const* const stringBase_80A9BA39 = "TUTRIAL_GIVEUP"; -SECTION_DEAD static char const* const stringBase_80A9BA48 = "TUTRIAL_CONTINUE"; -SECTION_DEAD static char const* const stringBase_80A9BA59 = "TUTRIAL_CAUTION"; -SECTION_DEAD static char const* const stringBase_80A9BA69 = "PA_Maro"; -SECTION_DEAD static char const* const stringBase_80A9BA71 = "cutId"; -#pragma pop +/* 80A9B988-80A9B988 0000FC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/npc/d_a_npc_pachi_taro/d_a_npc_pachi_taro.cpp b/rel/d/a/npc/d_a_npc_pachi_taro/d_a_npc_pachi_taro.cpp index 1ea2d169c67..010bdfc1963 100644 --- a/rel/d/a/npc/d_a_npc_pachi_taro/d_a_npc_pachi_taro.cpp +++ b/rel/d/a/npc/d_a_npc_pachi_taro/d_a_npc_pachi_taro.cpp @@ -15,12 +15,14 @@ struct mDoMtx_stack_c { static u8 now[48]; }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; +struct J3DAnmTransform {}; + +struct J3DModelData {}; + struct Vec {}; struct Z2Creature { @@ -29,8 +31,6 @@ struct Z2Creature { /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -43,6 +43,8 @@ struct fopAc_ac_c { /* 80018C8C */ ~fopAc_ac_c(); }; +struct daNpcT_faceMotionAnmData_c {}; + struct daNpcT_MotionSeqMngr_c { struct sequenceStepData_c {}; @@ -51,20 +53,18 @@ struct daNpcT_MotionSeqMngr_c { /* 80AA0D74 */ ~daNpcT_MotionSeqMngr_c(); }; +struct daNpcT_evtData_c {}; + struct daNpcT_motionAnmData_c {}; +struct J3DJoint {}; + struct cXyz { /* 80266B34 */ void operator-(Vec const&) const; /* 80AA06E0 */ ~cXyz(); /* 80AA0D70 */ cXyz(); }; -struct J3DJoint {}; - -struct daNpcT_faceMotionAnmData_c {}; - -struct daNpcT_evtData_c {}; - struct daNpc_Pachi_Taro_c { /* 80A9C28C */ ~daNpc_Pachi_Taro_c(); /* 80A9C3C4 */ void create(); @@ -173,10 +173,10 @@ struct dCcD_GObjInf { /* 800840E4 */ ~dCcD_GObjInf(); }; -struct J3DModel {}; - struct _GXColorS10 {}; +struct J3DModel {}; + struct daNpcT_c { /* 80147FA4 */ void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*); /* 801483F8 */ void loadRes(s8 const*, char const**); @@ -347,13 +347,13 @@ struct dBgS_AcchCir { /* 80AA0DBC */ ~dBgS_AcchCir(); }; -struct dBgS {}; - struct csXyz { /* 80AA071C */ ~csXyz(); /* 80AA0C70 */ csXyz(); }; +struct dBgS {}; + struct dBgS_Acch { /* 80075F94 */ ~dBgS_Acch(); /* 800760A0 */ dBgS_Acch(); @@ -753,6 +753,33 @@ extern "C" void __register_global_object(); // /* ############################################################################################## */ +/* 80AA1814-80AA1814 000210 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80AA1814 = ""; +SECTION_DEAD static char const* const stringBase_80AA1815 = "TUTRIAL_BEGIN"; +SECTION_DEAD static char const* const stringBase_80AA1823 = "TUTRIAL_BEGIN_SKIP"; +SECTION_DEAD static char const* const stringBase_80AA1836 = "TUTRIAL_CLEAR"; +SECTION_DEAD static char const* const stringBase_80AA1844 = "TUTRIAL_TALK"; +SECTION_DEAD static char const* const stringBase_80AA1851 = "TUTRIAL_TALK2"; +SECTION_DEAD static char const* const stringBase_80AA185F = "HIT_KAKASI_BODY"; +SECTION_DEAD static char const* const stringBase_80AA186F = "TUTRIAL_SELECT_GIVEUP"; +SECTION_DEAD static char const* const stringBase_80AA1885 = "TUTRIAL_CONTINUE"; +SECTION_DEAD static char const* const stringBase_80AA1896 = "TUTRIAL_GIVEUP"; +SECTION_DEAD static char const* const stringBase_80AA18A5 = "TUTRIAL_CAUTION"; +SECTION_DEAD static char const* const stringBase_80AA18B5 = "Taro"; +SECTION_DEAD static char const* const stringBase_80AA18BA = "Taro_TW"; +SECTION_DEAD static char const* const stringBase_80AA18C2 = "Taro0"; +SECTION_DEAD static char const* const stringBase_80AA18C8 = "Taro1"; +SECTION_DEAD static char const* const stringBase_80AA18CE = "Taro2"; +SECTION_DEAD static char const* const stringBase_80AA18D4 = "Taro3"; +SECTION_DEAD static char const* const stringBase_80AA18DA = "Taro4"; +SECTION_DEAD static char const* const stringBase_80AA18E0 = "Taro5"; +SECTION_DEAD static char const* const stringBase_80AA18E6 = "TaroB"; +SECTION_DEAD static char const* const stringBase_80AA18EC = "Len1"; +SECTION_DEAD static char const* const stringBase_80AA18F1 = "evt_pachi"; +#pragma pop + /* 80AA192C-80AA1938 000000 000C+00 2/2 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -1564,41 +1591,41 @@ SECTION_RODATA u8 const daNpc_Pachi_Taro_Param_c::m[140] = { 0xC1, 0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC1, 0x20, 0x00, 0x00, 0x41, 0x70, 0x00, 0x00, 0x41, 0xF0, 0x00, 0x00, 0x41, 0x20, 0x00, 0x00, 0x42, 0x5C, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AA1604, &daNpc_Pachi_Taro_Param_c::m); +COMPILER_STRIP_GATE(0x80AA1604, &daNpc_Pachi_Taro_Param_c::m); /* 80AA1690-80AA1694 00008C 0004+00 0/1 0/0 0/0 .rodata @4212 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4212 = -300.0f; -COMPILER_STRIP_GATE(80AA1690, &lit_4212); +COMPILER_STRIP_GATE(0x80AA1690, &lit_4212); #pragma pop /* 80AA1694-80AA1698 000090 0004+00 0/1 0/0 0/0 .rodata @4213 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4213 = -50.0f; -COMPILER_STRIP_GATE(80AA1694, &lit_4213); +COMPILER_STRIP_GATE(0x80AA1694, &lit_4213); #pragma pop /* 80AA1698-80AA169C 000094 0004+00 0/1 0/0 0/0 .rodata @4214 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4214 = 300.0f; -COMPILER_STRIP_GATE(80AA1698, &lit_4214); +COMPILER_STRIP_GATE(0x80AA1698, &lit_4214); #pragma pop /* 80AA169C-80AA16A0 000098 0004+00 0/1 0/0 0/0 .rodata @4215 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4215 = 450.0f; -COMPILER_STRIP_GATE(80AA169C, &lit_4215); +COMPILER_STRIP_GATE(0x80AA169C, &lit_4215); #pragma pop /* 80AA16A0-80AA16A4 00009C 0004+00 0/1 0/0 0/0 .rodata @4216 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4216 = -1000000000.0f; -COMPILER_STRIP_GATE(80AA16A0, &lit_4216); +COMPILER_STRIP_GATE(0x80AA16A0, &lit_4216); #pragma pop /* 80A9C3C4-80A9C69C 000224 02D8+00 1/1 0/0 0/0 .text create__18daNpc_Pachi_Taro_cFv */ @@ -1619,20 +1646,20 @@ SECTION_RODATA static u8 const lit_4373[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AA16A4, &lit_4373); +COMPILER_STRIP_GATE(0x80AA16A4, &lit_4373); /* 80AA16A8-80AA16AC 0000A4 0004+00 0/2 0/0 0/0 .rodata @4374 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4374 = 65536.0f; -COMPILER_STRIP_GATE(80AA16A8, &lit_4374); +COMPILER_STRIP_GATE(0x80AA16A8, &lit_4374); #pragma pop /* 80AA16AC-80AA16B0 0000A8 0004+00 0/3 0/0 0/0 .rodata @4375 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4375 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(80AA16AC, &lit_4375); +COMPILER_STRIP_GATE(0x80AA16AC, &lit_4375); #pragma pop /* 80AA16B0-80AA16B8 0000AC 0008+00 0/1 0/0 0/0 .rodata bmdTypeList$4485 */ @@ -1641,12 +1668,12 @@ COMPILER_STRIP_GATE(80AA16AC, &lit_4375); SECTION_RODATA static u8 const bmdTypeList[8] = { 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, }; -COMPILER_STRIP_GATE(80AA16B0, &bmdTypeList); +COMPILER_STRIP_GATE(0x80AA16B0, &bmdTypeList); #pragma pop /* 80AA16B8-80AA16BC 0000B4 0004+00 1/4 0/0 0/0 .rodata @4548 */ SECTION_RODATA static f32 const lit_4548 = 1.0f; -COMPILER_STRIP_GATE(80AA16B8, &lit_4548); +COMPILER_STRIP_GATE(0x80AA16B8, &lit_4548); /* 80A9C69C-80A9CA1C 0004FC 0380+00 1/1 0/0 0/0 .text CreateHeap__18daNpc_Pachi_Taro_cFv */ @@ -1782,7 +1809,7 @@ asm void daNpc_Pachi_Taro_c::Execute() { /* ############################################################################################## */ /* 80AA16BC-80AA16C0 0000B8 0004+00 1/1 0/0 0/0 .rodata @4597 */ SECTION_RODATA static f32 const lit_4597 = 100.0f; -COMPILER_STRIP_GATE(80AA16BC, &lit_4597); +COMPILER_STRIP_GATE(0x80AA16BC, &lit_4597); /* 80A9CC2C-80A9CCC0 000A8C 0094+00 1/1 0/0 0/0 .text Draw__18daNpc_Pachi_Taro_cFv */ #pragma push @@ -1870,7 +1897,7 @@ bool daNpc_Pachi_Taro_c::checkChangeEvt() { /* ############################################################################################## */ /* 80AA16C0-80AA16C4 0000BC 0004+00 2/2 0/0 0/0 .rodata @4731 */ SECTION_RODATA static f32 const lit_4731 = -1.0f; -COMPILER_STRIP_GATE(80AA16C0, &lit_4731); +COMPILER_STRIP_GATE(0x80AA16C0, &lit_4731); /* 80A9D0A0-80A9D164 000F00 00C4+00 2/0 0/0 0/0 .text setAfterTalkMotion__18daNpc_Pachi_Taro_cFv */ @@ -1988,6 +2015,13 @@ asm void daNpc_Pachi_Taro_c::evtTalk() { } #pragma pop +/* ############################################################################################## */ +/* 80AA1814-80AA1814 000210 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80AA18FB = "PA_Taro"; +#pragma pop + /* 80A9D5D0-80A9D698 001430 00C8+00 1/0 0/0 0/0 .text evtCutProc__18daNpc_Pachi_Taro_cFv */ #pragma push @@ -2025,21 +2059,21 @@ asm void daNpc_Pachi_Taro_c::beforeMove() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4950 = 30.0f; -COMPILER_STRIP_GATE(80AA16C4, &lit_4950); +COMPILER_STRIP_GATE(0x80AA16C4, &lit_4950); #pragma pop /* 80AA16C8-80AA16CC 0000C4 0004+00 0/1 0/0 0/0 .rodata @4951 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4951 = 0x38C90FDB; -COMPILER_STRIP_GATE(80AA16C8, &lit_4951); +COMPILER_STRIP_GATE(0x80AA16C8, &lit_4951); #pragma pop /* 80AA16CC-80AA16D4 0000C8 0008+00 1/3 0/0 0/0 .rodata @4953 */ SECTION_RODATA static u8 const lit_4953[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AA16CC, &lit_4953); +COMPILER_STRIP_GATE(0x80AA16CC, &lit_4953); /* 80A9D8B8-80A9DB0C 001718 0254+00 1/0 0/0 0/0 .text setAttnPos__18daNpc_Pachi_Taro_cFv */ @@ -2075,7 +2109,7 @@ bool daNpc_Pachi_Taro_c::drawDbgInfo() { SECTION_RODATA static u8 const lit_5011[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AA16D4, &lit_5011); +COMPILER_STRIP_GATE(0x80AA16D4, &lit_5011); #pragma pop /* 80AA16DC-80AA16E4 0000D8 0008+00 0/1 0/0 0/0 .rodata @5012 */ @@ -2084,7 +2118,7 @@ COMPILER_STRIP_GATE(80AA16D4, &lit_5011); SECTION_RODATA static u8 const lit_5012[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AA16DC, &lit_5012); +COMPILER_STRIP_GATE(0x80AA16DC, &lit_5012); #pragma pop /* 80AA16E4-80AA16EC 0000E0 0008+00 0/1 0/0 0/0 .rodata @5013 */ @@ -2093,14 +2127,14 @@ COMPILER_STRIP_GATE(80AA16DC, &lit_5012); SECTION_RODATA static u8 const lit_5013[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AA16E4, &lit_5013); +COMPILER_STRIP_GATE(0x80AA16E4, &lit_5013); #pragma pop /* 80AA16EC-80AA16F4 0000E8 0008+00 1/1 0/0 0/0 .rodata jointNo$5051 */ SECTION_RODATA static u8 const jointNo[8] = { 0x00, 0x00, 0x00, 0x0F, 0x00, 0x00, 0x00, 0x0F, }; -COMPILER_STRIP_GATE(80AA16EC, &jointNo); +COMPILER_STRIP_GATE(0x80AA16EC, &jointNo); /* 80A9DC1C-80A9DD24 001A7C 0108+00 1/0 0/0 0/0 .text drawOtherMdl__18daNpc_Pachi_Taro_cFv */ #pragma push @@ -2127,7 +2161,7 @@ asm void daNpc_Pachi_Taro_c::selectAction() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpc_Pachi_Taro_c::chkAction(int (daNpc_Pachi_Taro_c::*)(void*)) { +asm void daNpc_Pachi_Taro_c::chkAction(int (daNpc_Pachi_Taro_c::*param_0)(void*)) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_pachi_taro/d_a_npc_pachi_taro/chkAction__18daNpc_Pachi_Taro_cFM18daNpc_Pachi_Taro_cFPCvPvPv_i.s" } @@ -2138,7 +2172,7 @@ asm void daNpc_Pachi_Taro_c::chkAction(int (daNpc_Pachi_Taro_c::*)(void*)) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpc_Pachi_Taro_c::setAction(int (daNpc_Pachi_Taro_c::*)(void*)) { +asm void daNpc_Pachi_Taro_c::setAction(int (daNpc_Pachi_Taro_c::*param_0)(void*)) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_pachi_taro/d_a_npc_pachi_taro/setAction__18daNpc_Pachi_Taro_cFM18daNpc_Pachi_Taro_cFPCvPvPv_i.s" } @@ -2232,70 +2266,70 @@ asm void daNpc_Pachi_Taro_c::chkDistTag() { #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_5339 = 0xC3D62635; -COMPILER_STRIP_GATE(80AA16F4, &lit_5339); +COMPILER_STRIP_GATE(0x80AA16F4, &lit_5339); #pragma pop /* 80AA16F8-80AA16FC 0000F4 0004+00 0/1 0/0 0/0 .rodata @5340 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5340 = 800.0f; -COMPILER_STRIP_GATE(80AA16F8, &lit_5340); +COMPILER_STRIP_GATE(0x80AA16F8, &lit_5340); #pragma pop /* 80AA16FC-80AA1700 0000F8 0004+00 0/1 0/0 0/0 .rodata @5341 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_5341 = 0xC4C8EB3B; -COMPILER_STRIP_GATE(80AA16FC, &lit_5341); +COMPILER_STRIP_GATE(0x80AA16FC, &lit_5341); #pragma pop /* 80AA1700-80AA1704 0000FC 0004+00 0/1 0/0 0/0 .rodata @5342 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_5342 = 0x442015ED; -COMPILER_STRIP_GATE(80AA1700, &lit_5342); +COMPILER_STRIP_GATE(0x80AA1700, &lit_5342); #pragma pop /* 80AA1704-80AA1708 000100 0004+00 0/1 0/0 0/0 .rodata @5343 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5343 = 900.0f; -COMPILER_STRIP_GATE(80AA1704, &lit_5343); +COMPILER_STRIP_GATE(0x80AA1704, &lit_5343); #pragma pop /* 80AA1708-80AA170C 000104 0004+00 0/1 0/0 0/0 .rodata @5344 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_5344 = 0xC4DEEE5A; -COMPILER_STRIP_GATE(80AA1708, &lit_5344); +COMPILER_STRIP_GATE(0x80AA1708, &lit_5344); #pragma pop /* 80AA170C-80AA1710 000108 0004+00 0/1 0/0 0/0 .rodata @5345 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_5345 = 0x44430AE1; -COMPILER_STRIP_GATE(80AA170C, &lit_5345); +COMPILER_STRIP_GATE(0x80AA170C, &lit_5345); #pragma pop /* 80AA1710-80AA1714 00010C 0004+00 0/1 0/0 0/0 .rodata @5346 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_5346 = 0xC521DC6D; -COMPILER_STRIP_GATE(80AA1710, &lit_5346); +COMPILER_STRIP_GATE(0x80AA1710, &lit_5346); #pragma pop /* 80AA1714-80AA1718 000110 0004+00 0/1 0/0 0/0 .rodata @5347 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_5347 = 0x44435FB2; -COMPILER_STRIP_GATE(80AA1714, &lit_5347); +COMPILER_STRIP_GATE(0x80AA1714, &lit_5347); #pragma pop /* 80AA1718-80AA171C 000114 0004+00 0/1 0/0 0/0 .rodata @5348 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_5348 = 0xC503799A; -COMPILER_STRIP_GATE(80AA1718, &lit_5348); +COMPILER_STRIP_GATE(0x80AA1718, &lit_5348); #pragma pop /* 80A9E458-80A9E56C 0022B8 0114+00 1/1 0/0 0/0 .text chkEscapeTag__18daNpc_Pachi_Taro_cFv */ @@ -2373,6 +2407,13 @@ asm void daNpc_Pachi_Taro_c::evtEndProc() { } #pragma pop +/* ############################################################################################## */ +/* 80AA1814-80AA1814 000210 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80AA1903 = "cutId"; +#pragma pop + /* 80A9E9E8-80A9EAA0 002848 00B8+00 1/0 0/0 0/0 .text cutTutrialBegin__18daNpc_Pachi_Taro_cFi */ #pragma push #pragma optimization_level 0 @@ -2388,7 +2429,7 @@ asm void daNpc_Pachi_Taro_c::cutTutrialBegin(int param_0) { SECTION_RODATA static u8 const lit_5498[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AA171C, &lit_5498); +COMPILER_STRIP_GATE(0x80AA171C, &lit_5498); /* 80A9EAA0-80A9EB3C 002900 009C+00 1/1 0/0 0/0 .text * _cutTutrialBegin_Init__18daNpc_Pachi_Taro_cFRCi */ @@ -2406,7 +2447,7 @@ asm void daNpc_Pachi_Taro_c::_cutTutrialBegin_Init(int const& param_0) { SECTION_RODATA static u8 const lit_5507[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AA1728, &lit_5507); +COMPILER_STRIP_GATE(0x80AA1728, &lit_5507); /* 80A9EB3C-80A9EC5C 00299C 0120+00 1/1 0/0 0/0 .text * _cutTutrialBegin_Main__18daNpc_Pachi_Taro_cFRCi */ @@ -2467,7 +2508,7 @@ asm void daNpc_Pachi_Taro_c::cutTutrialClear(int param_0) { SECTION_RODATA static u8 const lit_5574[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AA1734, &lit_5574); +COMPILER_STRIP_GATE(0x80AA1734, &lit_5574); /* 80A9EDD4-80A9EEBC 002C34 00E8+00 1/1 0/0 0/0 .text * _cutTutrialClear_Init__18daNpc_Pachi_Taro_cFRCi */ @@ -2487,28 +2528,28 @@ asm void daNpc_Pachi_Taro_c::_cutTutrialClear_Init(int const& param_0) { SECTION_RODATA static u8 const lit_5592[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AA1740, &lit_5592); +COMPILER_STRIP_GATE(0x80AA1740, &lit_5592); #pragma pop /* 80AA174C-80AA1750 000148 0004+00 0/2 0/0 0/0 .rodata @5606 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_5606 = 0x445FBAA0; -COMPILER_STRIP_GATE(80AA174C, &lit_5606); +COMPILER_STRIP_GATE(0x80AA174C, &lit_5606); #pragma pop /* 80AA1750-80AA1754 00014C 0004+00 0/2 0/0 0/0 .rodata @5607 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_5607 = 0x4461DA4E; -COMPILER_STRIP_GATE(80AA1750, &lit_5607); +COMPILER_STRIP_GATE(0x80AA1750, &lit_5607); #pragma pop /* 80AA1754-80AA1758 000150 0004+00 0/3 0/0 0/0 .rodata @5608 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_5608 = 0xC4FF0B85; -COMPILER_STRIP_GATE(80AA1754, &lit_5608); +COMPILER_STRIP_GATE(0x80AA1754, &lit_5608); #pragma pop /* 80A9EEBC-80A9EFC0 002D1C 0104+00 1/1 0/0 0/0 .text @@ -2523,6 +2564,21 @@ asm void daNpc_Pachi_Taro_c::_cutTutrialClear_Main(int const& param_0) { #pragma pop /* ############################################################################################## */ +/* 80AA1909-80AA1910 000305 0007+00 2/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80AA1909; + +/* 80AA1910-80AA1917 00030C 0007+00 2/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80AA1910; + +/* 80AA1917-80AA191E 000313 0007+00 2/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80AA1917; + +/* 80AA191E-80AA1925 00031A 0007+00 2/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80AA191E; + +/* 80AA1925-80AA192C 000321 0007+00 2/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80AA1925; + /* 80AA1758-80AA176C -00001 0014+00 1/1 0/0 0/0 .rodata @5615 */ SECTION_RODATA static void* const lit_5615[5] = { (void*)(((char*)&d_a_npc_pachi_taro__stringBase0) + 0xF5), @@ -2531,7 +2587,17 @@ SECTION_RODATA static void* const lit_5615[5] = { (void*)(((char*)&d_a_npc_pachi_taro__stringBase0) + 0x10A), (void*)(((char*)&d_a_npc_pachi_taro__stringBase0) + 0x111), }; -COMPILER_STRIP_GATE(80AA1758, &lit_5615); +COMPILER_STRIP_GATE(0x80AA1758, &lit_5615); + +/* 80AA1814-80AA1814 000210 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80AA1909 = "MesNo0"; +SECTION_DEAD static char const* const stringBase_80AA1910 = "MesNo1"; +SECTION_DEAD static char const* const stringBase_80AA1917 = "MesNo2"; +SECTION_DEAD static char const* const stringBase_80AA191E = "MesNo3"; +SECTION_DEAD static char const* const stringBase_80AA1925 = "MesNo4"; +#pragma pop /* 80A9EFC0-80A9F0DC 002E20 011C+00 1/0 0/0 0/0 .text cutTalk__18daNpc_Pachi_Taro_cFi */ #pragma push @@ -2548,7 +2614,7 @@ asm void daNpc_Pachi_Taro_c::cutTalk(int param_0) { SECTION_RODATA static u8 const lit_5634[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AA176C, &lit_5634); +COMPILER_STRIP_GATE(0x80AA176C, &lit_5634); /* 80A9F0DC-80A9F188 002F3C 00AC+00 2/1 0/0 0/0 .text _cutTalk_Init__18daNpc_Pachi_Taro_cFRCi */ #pragma push @@ -2565,13 +2631,13 @@ asm void daNpc_Pachi_Taro_c::_cutTalk_Init(int const& param_0) { SECTION_RODATA static u8 const lit_5647[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AA1778, &lit_5647); +COMPILER_STRIP_GATE(0x80AA1778, &lit_5647); /* 80AA1784-80AA178C 000180 0008+00 1/1 0/0 0/0 .rodata @5648 */ SECTION_RODATA static u8 const lit_5648[8] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, }; -COMPILER_STRIP_GATE(80AA1784, &lit_5648); +COMPILER_STRIP_GATE(0x80AA1784, &lit_5648); /* 80A9F188-80A9F324 002FE8 019C+00 2/1 0/0 0/0 .text _cutTalk_Main__18daNpc_Pachi_Taro_cFRCiRCi */ @@ -2593,7 +2659,7 @@ SECTION_RODATA static void* const lit_5681[5] = { (void*)(((char*)&d_a_npc_pachi_taro__stringBase0) + 0x10A), (void*)(((char*)&d_a_npc_pachi_taro__stringBase0) + 0x111), }; -COMPILER_STRIP_GATE(80AA178C, &lit_5681); +COMPILER_STRIP_GATE(0x80AA178C, &lit_5681); /* 80A9F324-80A9F440 003184 011C+00 1/0 0/0 0/0 .text cutTalk2__18daNpc_Pachi_Taro_cFi */ #pragma push @@ -2610,7 +2676,7 @@ asm void daNpc_Pachi_Taro_c::cutTalk2(int param_0) { SECTION_RODATA static u8 const lit_5700[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AA17A0, &lit_5700); +COMPILER_STRIP_GATE(0x80AA17A0, &lit_5700); /* 80A9F440-80A9F4EC 0032A0 00AC+00 2/1 0/0 0/0 .text _cutTalk2_Init__18daNpc_Pachi_Taro_cFRCi */ #pragma push @@ -2627,13 +2693,13 @@ asm void daNpc_Pachi_Taro_c::_cutTalk2_Init(int const& param_0) { SECTION_RODATA static u8 const lit_5713[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AA17AC, &lit_5713); +COMPILER_STRIP_GATE(0x80AA17AC, &lit_5713); /* 80AA17B8-80AA17C0 0001B4 0008+00 1/1 0/0 0/0 .rodata @5714 */ SECTION_RODATA static u8 const lit_5714[8] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, }; -COMPILER_STRIP_GATE(80AA17B8, &lit_5714); +COMPILER_STRIP_GATE(0x80AA17B8, &lit_5714); /* 80A9F4EC-80A9F688 00334C 019C+00 2/1 0/0 0/0 .text _cutTalk2_Main__18daNpc_Pachi_Taro_cFRCiRCi */ @@ -2664,7 +2730,7 @@ asm void daNpc_Pachi_Taro_c::cut1stHit_KakasiBody(int param_0) { SECTION_RODATA static u8 const lit_5757[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AA17C0, &lit_5757); +COMPILER_STRIP_GATE(0x80AA17C0, &lit_5757); #pragma pop /* 80AA17CC-80AA17D8 0001C8 000C+00 0/1 0/0 0/0 .rodata sHitMsg$5762 */ @@ -2673,7 +2739,7 @@ COMPILER_STRIP_GATE(80AA17C0, &lit_5757); SECTION_RODATA static u8 const sHitMsg[12] = { 0x00, 0x00, 0x00, 0x48, 0x00, 0x00, 0x00, 0x4A, 0x00, 0x00, 0x00, 0x49, }; -COMPILER_STRIP_GATE(80AA17CC, &sHitMsg); +COMPILER_STRIP_GATE(0x80AA17CC, &sHitMsg); #pragma pop /* 80A9F71C-80A9F83C 00357C 0120+00 1/1 0/0 0/0 .text @@ -2694,7 +2760,7 @@ asm void daNpc_Pachi_Taro_c::_cut1stHit_KakasiBody_Init(int const& param_0) { SECTION_RODATA static u8 const lit_5779[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AA17D8, &lit_5779); +COMPILER_STRIP_GATE(0x80AA17D8, &lit_5779); #pragma pop /* 80A9F83C-80A9F9C4 00369C 0188+00 1/1 0/0 0/0 .text @@ -2724,7 +2790,7 @@ asm void daNpc_Pachi_Taro_c::cutTutrialSelectGiveUp(int param_0) { SECTION_RODATA static u8 const lit_5826[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AA17E4, &lit_5826); +COMPILER_STRIP_GATE(0x80AA17E4, &lit_5826); /* 80A9FA58-80A9FB08 0038B8 00B0+00 1/1 0/0 0/0 .text * _cutTutrialSelectGiveUp_Init__18daNpc_Pachi_Taro_cFRCi */ @@ -2742,7 +2808,7 @@ asm void daNpc_Pachi_Taro_c::_cutTutrialSelectGiveUp_Init(int const& param_0) { SECTION_RODATA static u8 const lit_5837[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AA17F0, &lit_5837); +COMPILER_STRIP_GATE(0x80AA17F0, &lit_5837); /* 80A9FB08-80A9FCEC 003968 01E4+00 1/1 0/0 0/0 .text * _cutTutrialSelectGiveUp_Main__18daNpc_Pachi_Taro_cFRCi */ @@ -2770,7 +2836,7 @@ asm void daNpc_Pachi_Taro_c::cutTutrialGiveUp(int param_0) { SECTION_RODATA static u8 const lit_5892[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AA17FC, &lit_5892); +COMPILER_STRIP_GATE(0x80AA17FC, &lit_5892); /* 80A9FD80-80A9FE34 003BE0 00B4+00 1/1 0/0 0/0 .text * _cutTutrialGiveUp_Init__18daNpc_Pachi_Taro_cFRCi */ @@ -2788,7 +2854,7 @@ asm void daNpc_Pachi_Taro_c::_cutTutrialGiveUp_Init(int const& param_0) { SECTION_RODATA static u8 const lit_5903[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AA1808, &lit_5903); +COMPILER_STRIP_GATE(0x80AA1808, &lit_5903); /* 80A9FE34-80A9FFAC 003C94 0178+00 1/1 0/0 0/0 .text * _cutTutrialGiveUp_Main__18daNpc_Pachi_Taro_cFRCi */ @@ -3234,7 +3300,7 @@ asm void __sinit_d_a_npc_pachi_taro_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80AA1330 = (void*)__sinit_d_a_npc_pachi_taro_cpp; +REGISTER_CTORS(0x80AA1330, __sinit_d_a_npc_pachi_taro_cpp); #pragma pop /* 80AA148C-80AA1558 0052EC 00CC+00 1/1 0/0 0/0 .text @@ -3326,37 +3392,4 @@ static asm void func_80AA15E8() { } #pragma pop -/* 80AA1814-80AA192C 000210 0118+00 16/11 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80AA1814 = ""; -SECTION_DEAD static char const* const stringBase_80AA1815 = "TUTRIAL_BEGIN"; -SECTION_DEAD static char const* const stringBase_80AA1823 = "TUTRIAL_BEGIN_SKIP"; -SECTION_DEAD static char const* const stringBase_80AA1836 = "TUTRIAL_CLEAR"; -SECTION_DEAD static char const* const stringBase_80AA1844 = "TUTRIAL_TALK"; -SECTION_DEAD static char const* const stringBase_80AA1851 = "TUTRIAL_TALK2"; -SECTION_DEAD static char const* const stringBase_80AA185F = "HIT_KAKASI_BODY"; -SECTION_DEAD static char const* const stringBase_80AA186F = "TUTRIAL_SELECT_GIVEUP"; -SECTION_DEAD static char const* const stringBase_80AA1885 = "TUTRIAL_CONTINUE"; -SECTION_DEAD static char const* const stringBase_80AA1896 = "TUTRIAL_GIVEUP"; -SECTION_DEAD static char const* const stringBase_80AA18A5 = "TUTRIAL_CAUTION"; -SECTION_DEAD static char const* const stringBase_80AA18B5 = "Taro"; -SECTION_DEAD static char const* const stringBase_80AA18BA = "Taro_TW"; -SECTION_DEAD static char const* const stringBase_80AA18C2 = "Taro0"; -SECTION_DEAD static char const* const stringBase_80AA18C8 = "Taro1"; -SECTION_DEAD static char const* const stringBase_80AA18CE = "Taro2"; -SECTION_DEAD static char const* const stringBase_80AA18D4 = "Taro3"; -SECTION_DEAD static char const* const stringBase_80AA18DA = "Taro4"; -SECTION_DEAD static char const* const stringBase_80AA18E0 = "Taro5"; -SECTION_DEAD static char const* const stringBase_80AA18E6 = "TaroB"; -SECTION_DEAD static char const* const stringBase_80AA18EC = "Len1"; -SECTION_DEAD static char const* const stringBase_80AA18F1 = "evt_pachi"; -SECTION_DEAD static char const* const stringBase_80AA18FB = "PA_Taro"; -SECTION_DEAD static char const* const stringBase_80AA1903 = "cutId"; -SECTION_DEAD static char const* const stringBase_80AA1909 = "MesNo0"; -SECTION_DEAD static char const* const stringBase_80AA1910 = "MesNo1"; -SECTION_DEAD static char const* const stringBase_80AA1917 = "MesNo2"; -SECTION_DEAD static char const* const stringBase_80AA191E = "MesNo3"; -SECTION_DEAD static char const* const stringBase_80AA1925 = "MesNo4"; -#pragma pop +/* 80AA1814-80AA1814 000210 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/npc/d_a_npc_passer/d_a_npc_passer.cpp b/rel/d/a/npc/d_a_npc_passer/d_a_npc_passer.cpp index 4fe27244444..8dd04da0cfd 100644 --- a/rel/d/a/npc/d_a_npc_passer/d_a_npc_passer.cpp +++ b/rel/d/a/npc/d_a_npc_passer/d_a_npc_passer.cpp @@ -116,10 +116,10 @@ struct daNpcPasser_c { static u8 m_seq27_funcTbl[12]; }; -struct J3DAnmTransformKey {}; - struct J3DModel {}; +struct J3DAnmTransformKey {}; + struct daNpcCd2_c { /* 80157D00 */ void NpcCreate(int); /* 80157F28 */ void ObjCreate(int); @@ -186,14 +186,14 @@ struct dBgS_AcchCir { /* 80AA68A0 */ ~dBgS_AcchCir(); }; -struct cXyz { - /* 80AA6654 */ ~cXyz(); +struct csXyz { + /* 80AA6690 */ ~csXyz(); }; struct dBgS {}; -struct csXyz { - /* 80AA6690 */ ~csXyz(); +struct cXyz { + /* 80AA6654 */ ~cXyz(); }; struct dBgS_Acch { @@ -328,8 +328,8 @@ extern "C" static void daNpcPasser_Execute__FPv(); extern "C" static void daNpcPasser_Draw__FPv(); extern "C" static bool daNpcPasser_IsDelete__FPv(); extern "C" void __dt__10cCcD_GSttsFv(); -extern "C" void func_80AA59BC(f32, f32); -extern "C" void func_80AA59F8(int, int); +extern "C" void func_80AA59BC(void* _this, f32, f32); +extern "C" void func_80AA59F8(void* _this, int, int); extern "C" void __sinit_d_a_npc_passer_cpp(); extern "C" static void func_80AA63F4(); extern "C" static void func_80AA63FC(); @@ -1765,11 +1765,11 @@ asm void daNpcPasser_c::create() { /* ############################################################################################## */ /* 80AA698C-80AA6990 000000 0004+00 29/29 0/0 0/0 .rodata @4109 */ SECTION_RODATA static f32 const lit_4109 = 2.0f / 5.0f; -COMPILER_STRIP_GATE(80AA698C, &lit_4109); +COMPILER_STRIP_GATE(0x80AA698C, &lit_4109); /* 80AA6990-80AA6994 000004 0004+00 1/1 0/0 0/0 .rodata @4110 */ SECTION_RODATA static f32 const lit_4110 = 25.0f; -COMPILER_STRIP_GATE(80AA6990, &lit_4110); +COMPILER_STRIP_GATE(0x80AA6990, &lit_4110); /* 80AA2FD4-80AA315C 000434 0188+00 1/1 0/0 0/0 .text execute__13daNpcPasser_cFv */ #pragma push @@ -1784,7 +1784,7 @@ asm void daNpcPasser_c::execute() { /* ############################################################################################## */ /* 80AA6994-80AA6998 000008 0004+00 1/3 0/0 0/0 .rodata @4123 */ SECTION_RODATA static f32 const lit_4123 = 40.0f; -COMPILER_STRIP_GATE(80AA6994, &lit_4123); +COMPILER_STRIP_GATE(0x80AA6994, &lit_4123); /* 80AA315C-80AA31EC 0005BC 0090+00 1/1 0/0 0/0 .text draw__13daNpcPasser_cFv */ #pragma push @@ -1830,11 +1830,11 @@ asm void daNpcPasser_c::callExecute() { /* ############################################################################################## */ /* 80AA6998-80AA699C 00000C 0004+00 9/36 0/0 0/0 .rodata @4189 */ SECTION_RODATA static f32 const lit_4189 = 1.0f; -COMPILER_STRIP_GATE(80AA6998, &lit_4189); +COMPILER_STRIP_GATE(0x80AA6998, &lit_4189); /* 80AA699C-80AA69A0 000010 0004+00 7/32 0/0 0/0 .rodata @4190 */ SECTION_RODATA static f32 const lit_4190 = 12.0f; -COMPILER_STRIP_GATE(80AA699C, &lit_4190); +COMPILER_STRIP_GATE(0x80AA699C, &lit_4190); /* 80AA3284-80AA33F0 0006E4 016C+00 1/0 0/0 0/0 .text initPath__13daNpcPasser_cFv */ #pragma push @@ -1856,7 +1856,7 @@ SECTION_RODATA static u8 const lit_4289[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AA69A0, &lit_4289); +COMPILER_STRIP_GATE(0x80AA69A0, &lit_4289); #pragma pop /* 80AA69A4-80AA69AC 000018 0008+00 0/2 0/0 0/0 .rodata @4290 */ @@ -1865,7 +1865,7 @@ COMPILER_STRIP_GATE(80AA69A0, &lit_4289); SECTION_RODATA static u8 const lit_4290[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AA69A4, &lit_4290); +COMPILER_STRIP_GATE(0x80AA69A4, &lit_4290); #pragma pop /* 80AA69AC-80AA69B4 000020 0008+00 0/2 0/0 0/0 .rodata @4291 */ @@ -1874,7 +1874,7 @@ COMPILER_STRIP_GATE(80AA69A4, &lit_4290); SECTION_RODATA static u8 const lit_4291[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AA69AC, &lit_4291); +COMPILER_STRIP_GATE(0x80AA69AC, &lit_4291); #pragma pop /* 80AA69B4-80AA69BC 000028 0008+00 0/2 0/0 0/0 .rodata @4292 */ @@ -1883,14 +1883,14 @@ COMPILER_STRIP_GATE(80AA69AC, &lit_4291); SECTION_RODATA static u8 const lit_4292[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AA69B4, &lit_4292); +COMPILER_STRIP_GATE(0x80AA69B4, &lit_4292); #pragma pop /* 80AA69BC-80AA69C0 000030 0004+00 0/21 0/0 0/0 .rodata @4293 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4293 = 2.0f; -COMPILER_STRIP_GATE(80AA69BC, &lit_4293); +COMPILER_STRIP_GATE(0x80AA69BC, &lit_4293); #pragma pop /* 80AA33F0-80AA387C 000850 048C+00 1/0 0/0 0/0 .text executePath__13daNpcPasser_cFv */ @@ -1958,35 +1958,35 @@ asm void daNpcPasser_c::executeFear() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4418 = -40.0f; -COMPILER_STRIP_GATE(80AA69C0, &lit_4418); +COMPILER_STRIP_GATE(0x80AA69C0, &lit_4418); #pragma pop /* 80AA69C4-80AA69C8 000038 0004+00 0/2 0/0 0/0 .rodata @4419 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4419 = -10.0f; -COMPILER_STRIP_GATE(80AA69C4, &lit_4419); +COMPILER_STRIP_GATE(0x80AA69C4, &lit_4419); #pragma pop /* 80AA69C8-80AA69CC 00003C 0004+00 0/1 0/0 0/0 .rodata @4420 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4420 = -80.0f; -COMPILER_STRIP_GATE(80AA69C8, &lit_4420); +COMPILER_STRIP_GATE(0x80AA69C8, &lit_4420); #pragma pop /* 80AA69CC-80AA69D0 000040 0004+00 0/2 0/0 0/0 .rodata @4421 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4421 = 190.0f; -COMPILER_STRIP_GATE(80AA69CC, &lit_4421); +COMPILER_STRIP_GATE(0x80AA69CC, &lit_4421); #pragma pop /* 80AA69D0-80AA69D4 000044 0004+00 0/1 0/0 0/0 .rodata @4422 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4422 = 200.0f; -COMPILER_STRIP_GATE(80AA69D0, &lit_4422); +COMPILER_STRIP_GATE(0x80AA69D0, &lit_4422); #pragma pop /* 80AA3E5C-80AA3F10 0012BC 00B4+00 1/0 0/0 0/0 .text initFight__13daNpcPasser_cFv */ @@ -2034,21 +2034,21 @@ asm void daNpcPasser_c::executeRelief() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4514 = -3.0f; -COMPILER_STRIP_GATE(80AA69D4, &lit_4514); +COMPILER_STRIP_GATE(0x80AA69D4, &lit_4514); #pragma pop /* 80AA69D8-80AA69DC 00004C 0004+00 0/1 0/0 0/0 .rodata @4515 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4515 = -30.0f; -COMPILER_STRIP_GATE(80AA69D8, &lit_4515); +COMPILER_STRIP_GATE(0x80AA69D8, &lit_4515); #pragma pop /* 80AA69DC-80AA69E0 000050 0004+00 0/1 0/0 0/0 .rodata @4516 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4516 = 30.0f; -COMPILER_STRIP_GATE(80AA69DC, &lit_4516); +COMPILER_STRIP_GATE(0x80AA69DC, &lit_4516); #pragma pop /* 80AA41E4-80AA43A4 001644 01C0+00 1/1 0/0 0/0 .text create_init__13daNpcPasser_cFv */ @@ -2086,42 +2086,42 @@ asm void daNpcPasser_c::setSpeed(f32 param_0, f32 param_1, f32* param_2, int par #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4603 = 4.0f / 5.0f; -COMPILER_STRIP_GATE(80AA69E0, &lit_4603); +COMPILER_STRIP_GATE(0x80AA69E0, &lit_4603); #pragma pop /* 80AA69E4-80AA69E8 000058 0004+00 0/1 0/0 0/0 .rodata @4604 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4604 = 1.0f / 20.0f; -COMPILER_STRIP_GATE(80AA69E4, &lit_4604); +COMPILER_STRIP_GATE(0x80AA69E4, &lit_4604); #pragma pop /* 80AA69E8-80AA69EC 00005C 0004+00 0/1 0/0 0/0 .rodata @4605 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4605 = 7.0f / 10.0f; -COMPILER_STRIP_GATE(80AA69E8, &lit_4605); +COMPILER_STRIP_GATE(0x80AA69E8, &lit_4605); #pragma pop /* 80AA69EC-80AA69F0 000060 0004+00 0/1 0/0 0/0 .rodata @4606 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4606 = 1.5f; -COMPILER_STRIP_GATE(80AA69EC, &lit_4606); +COMPILER_STRIP_GATE(0x80AA69EC, &lit_4606); #pragma pop /* 80AA69F0-80AA69F4 000064 0004+00 0/1 0/0 0/0 .rodata @4607 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4607 = 6.0f / 5.0f; -COMPILER_STRIP_GATE(80AA69F0, &lit_4607); +COMPILER_STRIP_GATE(0x80AA69F0, &lit_4607); #pragma pop /* 80AA69F4-80AA69F8 000068 0004+00 0/1 0/0 0/0 .rodata @4608 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4608 = 3.0f / 5.0f; -COMPILER_STRIP_GATE(80AA69F4, &lit_4608); +COMPILER_STRIP_GATE(0x80AA69F4, &lit_4608); #pragma pop /* 80AA44A4-80AA4780 001904 02DC+00 2/2 0/0 0/0 .text pathMoveF__13daNpcPasser_cFv */ @@ -2169,7 +2169,7 @@ asm void daNpcPasser_c::setCollision() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4730 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(80AA69F8, &lit_4730); +COMPILER_STRIP_GATE(0x80AA69F8, &lit_4730); #pragma pop /* 80AA492C-80AA49D4 001D8C 00A8+00 10/0 0/0 0/0 .text waita__13daNpcPasser_cFPv */ @@ -2491,7 +2491,7 @@ asm cCcD_GStts::~cCcD_GStts() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80AA59BC(f32 param_0, f32 param_1) { +extern "C" asm void func_80AA59BC(void* _this, f32 param_0, f32 param_1) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_passer/d_a_npc_passer/func_80AA59BC.s" } @@ -2502,13 +2502,13 @@ extern "C" asm void func_80AA59BC(f32 param_0, f32 param_1) { SECTION_RODATA static u8 const lit_4975[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AA69FC, &lit_4975); +COMPILER_STRIP_GATE(0x80AA69FC, &lit_4975); /* 80AA59F8-80AA5A74 002E58 007C+00 1/1 0/0 0/0 .text cLib_getRndValue__Fii */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80AA59F8(int param_0, int param_1) { +extern "C" asm void func_80AA59F8(void* _this, int param_0, int param_1) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_passer/d_a_npc_passer/func_80AA59F8.s" } @@ -2526,7 +2526,7 @@ asm void __sinit_d_a_npc_passer_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80AA5A74 = (void*)__sinit_d_a_npc_passer_cpp; +REGISTER_CTORS(0x80AA5A74, __sinit_d_a_npc_passer_cpp); #pragma pop /* 80AA63F4-80AA63FC 003854 0008+00 1/0 0/0 0/0 .text @36@__dt__12dBgS_ObjAcchFv */ diff --git a/rel/d/a/npc/d_a_npc_passer2/d_a_npc_passer2.cpp b/rel/d/a/npc/d_a_npc_passer2/d_a_npc_passer2.cpp index cff6e0bbe69..5120ebce5dc 100644 --- a/rel/d/a/npc/d_a_npc_passer2/d_a_npc_passer2.cpp +++ b/rel/d/a/npc/d_a_npc_passer2/d_a_npc_passer2.cpp @@ -46,10 +46,10 @@ struct daNpcPasser2_c { static u8 ActionTable[24]; }; -struct J3DAnmTransformKey {}; - struct J3DModel {}; +struct J3DAnmTransformKey {}; + struct daNpcCd_c { /* 8015605C */ void NpcCreate(int); /* 801561E8 */ void ObjCreate(int); @@ -103,11 +103,11 @@ struct dBgS_AcchCir { /* 80AA892C */ ~dBgS_AcchCir(); }; -struct cXyz {}; +struct csXyz {}; struct dBgS {}; -struct csXyz {}; +struct cXyz {}; struct dBgS_Acch { /* 80075F94 */ ~dBgS_Acch(); @@ -194,7 +194,7 @@ extern "C" static void daNpcPasser2_Execute__FPv(); extern "C" static void daNpcPasser2_Draw__FPv(); extern "C" static bool daNpcPasser2_IsDelete__FPv(); extern "C" void __dt__10cCcD_GSttsFv(); -extern "C" void func_80AA85C8(int, int); +extern "C" void func_80AA85C8(void* _this, int, int); extern "C" void __sinit_d_a_npc_passer2_cpp(); extern "C" static void func_80AA8684(); extern "C" static void func_80AA868C(); @@ -389,11 +389,11 @@ asm void daNpcPasser2_c::callExecute() { /* ############################################################################################## */ /* 80AA8A18-80AA8A1C 000000 0004+00 3/3 0/0 0/0 .rodata @3963 */ SECTION_RODATA static f32 const lit_3963 = 1.0f; -COMPILER_STRIP_GATE(80AA8A18, &lit_3963); +COMPILER_STRIP_GATE(0x80AA8A18, &lit_3963); /* 80AA8A1C-80AA8A20 000004 0004+00 1/1 0/0 0/0 .rodata @3964 */ SECTION_RODATA static f32 const lit_3964 = 12.0f; -COMPILER_STRIP_GATE(80AA8A1C, &lit_3964); +COMPILER_STRIP_GATE(0x80AA8A1C, &lit_3964); /* 80AA75F4-80AA774C 000194 0158+00 1/0 0/0 0/0 .text initPath__14daNpcPasser2_cFv */ #pragma push @@ -537,42 +537,42 @@ SECTION_RODATA static u8 const lit_4127[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AA8A20, &lit_4127); +COMPILER_STRIP_GATE(0x80AA8A20, &lit_4127); #pragma pop /* 80AA8A24-80AA8A28 00000C 0004+00 0/1 0/0 0/0 .rodata @4128 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4128 = 4.0f / 5.0f; -COMPILER_STRIP_GATE(80AA8A24, &lit_4128); +COMPILER_STRIP_GATE(0x80AA8A24, &lit_4128); #pragma pop /* 80AA8A28-80AA8A2C 000010 0004+00 0/1 0/0 0/0 .rodata @4129 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4129 = 1.0f / 20.0f; -COMPILER_STRIP_GATE(80AA8A28, &lit_4129); +COMPILER_STRIP_GATE(0x80AA8A28, &lit_4129); #pragma pop /* 80AA8A2C-80AA8A30 000014 0004+00 0/1 0/0 0/0 .rodata @4130 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4130 = 7.0f / 10.0f; -COMPILER_STRIP_GATE(80AA8A2C, &lit_4130); +COMPILER_STRIP_GATE(0x80AA8A2C, &lit_4130); #pragma pop /* 80AA8A30-80AA8A34 000018 0004+00 0/1 0/0 0/0 .rodata @4131 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4131 = 6.0f / 5.0f; -COMPILER_STRIP_GATE(80AA8A30, &lit_4131); +COMPILER_STRIP_GATE(0x80AA8A30, &lit_4131); #pragma pop /* 80AA8A34-80AA8A38 00001C 0004+00 0/1 0/0 0/0 .rodata @4132 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4132 = 3.0f / 5.0f; -COMPILER_STRIP_GATE(80AA8A34, &lit_4132); +COMPILER_STRIP_GATE(0x80AA8A34, &lit_4132); #pragma pop /* 80AA7918-80AA7CB8 0004B8 03A0+00 1/1 0/0 0/0 .text pathMoveF__14daNpcPasser2_cFv */ @@ -610,49 +610,49 @@ asm void daNpcPasser2_c::create() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4273 = -3.0f; -COMPILER_STRIP_GATE(80AA8A38, &lit_4273); +COMPILER_STRIP_GATE(0x80AA8A38, &lit_4273); #pragma pop /* 80AA8A3C-80AA8A40 000024 0004+00 0/1 0/0 0/0 .rodata @4274 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4274 = -40.0f; -COMPILER_STRIP_GATE(80AA8A3C, &lit_4274); +COMPILER_STRIP_GATE(0x80AA8A3C, &lit_4274); #pragma pop /* 80AA8A40-80AA8A44 000028 0004+00 0/1 0/0 0/0 .rodata @4275 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4275 = -10.0f; -COMPILER_STRIP_GATE(80AA8A40, &lit_4275); +COMPILER_STRIP_GATE(0x80AA8A40, &lit_4275); #pragma pop /* 80AA8A44-80AA8A48 00002C 0004+00 0/1 0/0 0/0 .rodata @4276 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4276 = -30.0f; -COMPILER_STRIP_GATE(80AA8A44, &lit_4276); +COMPILER_STRIP_GATE(0x80AA8A44, &lit_4276); #pragma pop /* 80AA8A48-80AA8A4C 000030 0004+00 0/1 0/0 0/0 .rodata @4277 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4277 = 30.0f; -COMPILER_STRIP_GATE(80AA8A48, &lit_4277); +COMPILER_STRIP_GATE(0x80AA8A48, &lit_4277); #pragma pop /* 80AA8A4C-80AA8A50 000034 0004+00 0/1 0/0 0/0 .rodata @4278 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4278 = 190.0f; -COMPILER_STRIP_GATE(80AA8A4C, &lit_4278); +COMPILER_STRIP_GATE(0x80AA8A4C, &lit_4278); #pragma pop /* 80AA8A50-80AA8A54 000038 0004+00 0/1 0/0 0/0 .rodata @4279 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4279 = 40.0f; -COMPILER_STRIP_GATE(80AA8A50, &lit_4279); +COMPILER_STRIP_GATE(0x80AA8A50, &lit_4279); #pragma pop /* 80AA7F78-80AA823C 000B18 02C4+00 1/1 0/0 0/0 .text create_init__14daNpcPasser2_cFv */ @@ -688,7 +688,7 @@ asm daNpcPasser2_c::~daNpcPasser2_c() { /* ############################################################################################## */ /* 80AA8A54-80AA8A58 00003C 0004+00 1/1 0/0 0/0 .rodata @4450 */ SECTION_RODATA static f32 const lit_4450 = 2.0f / 5.0f; -COMPILER_STRIP_GATE(80AA8A54, &lit_4450); +COMPILER_STRIP_GATE(0x80AA8A54, &lit_4450); /* 80AA8A58-80AA8A60 000040 0004+04 1/1 0/0 0/0 .rodata @4451 */ SECTION_RODATA static f32 const lit_4451[1 + 1 /* padding */] = { @@ -696,7 +696,7 @@ SECTION_RODATA static f32 const lit_4451[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80AA8A58, &lit_4451); +COMPILER_STRIP_GATE(0x80AA8A58, &lit_4451); /* 80AA8304-80AA8500 000EA4 01FC+00 1/0 0/0 0/0 .text daNpcPasser2_Execute__FPv */ #pragma push @@ -738,13 +738,13 @@ asm cCcD_GStts::~cCcD_GStts() { SECTION_RODATA static u8 const lit_4481[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AA8A60, &lit_4481); +COMPILER_STRIP_GATE(0x80AA8A60, &lit_4481); /* 80AA85C8-80AA8644 001168 007C+00 1/1 0/0 0/0 .text cLib_getRndValue__Fii */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80AA85C8(int param_0, int param_1) { +extern "C" asm void func_80AA85C8(void* _this, int param_0, int param_1) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_passer2/d_a_npc_passer2/func_80AA85C8.s" } @@ -762,7 +762,7 @@ asm void __sinit_d_a_npc_passer2_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80AA8644 = (void*)__sinit_d_a_npc_passer2_cpp; +REGISTER_CTORS(0x80AA8644, __sinit_d_a_npc_passer2_cpp); #pragma pop /* 80AA8684-80AA868C 001224 0008+00 1/0 0/0 0/0 .text @36@__dt__12dBgS_ObjAcchFv */ diff --git a/rel/d/a/npc/d_a_npc_post/d_a_npc_post.cpp b/rel/d/a/npc/d_a_npc_post/d_a_npc_post.cpp index 7f4a6915f80..cc9b0811ff8 100644 --- a/rel/d/a/npc/d_a_npc_post/d_a_npc_post.cpp +++ b/rel/d/a/npc/d_a_npc_post/d_a_npc_post.cpp @@ -15,12 +15,14 @@ struct mDoMtx_stack_c { static u8 now[48]; }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; +struct J3DAnmTransform {}; + +struct J3DModelData {}; + struct Vec {}; struct Z2Creature { @@ -29,8 +31,6 @@ struct Z2Creature { /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -59,6 +59,8 @@ struct daTag_EvtArea_c { /* 8048C94C */ void chkPointInArea(cXyz, cXyz); }; +struct daNpcT_faceMotionAnmData_c {}; + struct daNpcT_MotionSeqMngr_c { struct sequenceStepData_c {}; @@ -67,14 +69,12 @@ struct daNpcT_MotionSeqMngr_c { /* 80AAC968 */ ~daNpcT_MotionSeqMngr_c(); }; +struct daNpcT_evtData_c {}; + struct daNpcT_motionAnmData_c {}; struct J3DJoint {}; -struct daNpcT_faceMotionAnmData_c {}; - -struct daNpcT_evtData_c {}; - struct daNpc_Post_c { /* 80AA8C8C */ ~daNpc_Post_c(); /* 80AA8DE8 */ void create(); @@ -140,15 +140,15 @@ struct dCcD_GObjInf { /* 800840E4 */ ~dCcD_GObjInf(); }; -struct J3DModel {}; - -struct _GXColorS10 {}; - struct csXyz { /* 80AAC2C8 */ ~csXyz(); /* 80AAC864 */ csXyz(); }; +struct _GXColorS10 {}; + +struct J3DModel {}; + struct daNpcT_c { /* 80147FA4 */ void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*); /* 80148058 */ void getTrnsfrmAnmP(char const*, int); @@ -511,8 +511,8 @@ extern "C" void changeAnm__8daNpcT_cFPiPi(); extern "C" void changeBck__8daNpcT_cFPiPi(); extern "C" void changeBtp__8daNpcT_cFPiPi(); extern "C" void changeBtk__8daNpcT_cFPiPi(); -extern "C" void func_80AACF10(int*); -extern "C" void func_80AACF2C(f32, f32); +extern "C" void func_80AACF10(void* _this, int*); +extern "C" void func_80AACF2C(void* _this, f32, f32); extern "C" void __sinit_d_a_npc_post_cpp(); extern "C" void __ct__12daNpc_Post_cFPC26daNpcT_faceMotionAnmData_cPC22daNpcT_motionAnmData_cPCQ222daNpcT_MotionSeqMngr_c18sequenceStepData_ciPCQ222daNpcT_MotionSeqMngr_c18sequenceStepData_ciPC16daNpcT_evtData_cPPc(); @@ -715,6 +715,19 @@ extern "C" void __register_global_object(); // /* ############################################################################################## */ +/* 80AAD34C-80AAD34C 000160 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80AAD34C = ""; +SECTION_DEAD static char const* const stringBase_80AAD34D = "NO_RESPONSE"; +SECTION_DEAD static char const* const stringBase_80AAD359 = "DELIVER"; +SECTION_DEAD static char const* const stringBase_80AAD361 = "DELIVERTO_PLAYER_ON_HORSE"; +SECTION_DEAD static char const* const stringBase_80AAD37B = "DELIVERTO_WOLF"; +SECTION_DEAD static char const* const stringBase_80AAD38A = "post"; +SECTION_DEAD static char const* const stringBase_80AAD38F = "post1"; +SECTION_DEAD static char const* const stringBase_80AAD395 = "post2"; +#pragma pop + /* 80AAD3AC-80AAD3B8 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -1175,7 +1188,7 @@ SECTION_RODATA u8 const daNpc_Post_Param_c::m[148] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41, 0x80, 0x00, 0x00, 0x00, 0x3C, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AAD1EC, &daNpc_Post_Param_c::m); +COMPILER_STRIP_GATE(0x80AAD1EC, &daNpc_Post_Param_c::m); /* 80AAD280-80AAD290 000094 0010+00 0/1 0/0 0/0 .rodata heapSize$4000 */ #pragma push @@ -1183,35 +1196,35 @@ COMPILER_STRIP_GATE(80AAD1EC, &daNpc_Post_Param_c::m); SECTION_RODATA static u8 const heapSize[16] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x50, 0x60, 0x00, 0x00, 0x4E, 0xC0, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AAD280, &heapSize); +COMPILER_STRIP_GATE(0x80AAD280, &heapSize); #pragma pop /* 80AAD290-80AAD294 0000A4 0004+00 0/1 0/0 0/0 .rodata @4066 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4066 = -200.0f; -COMPILER_STRIP_GATE(80AAD290, &lit_4066); +COMPILER_STRIP_GATE(0x80AAD290, &lit_4066); #pragma pop /* 80AAD294-80AAD298 0000A8 0004+00 0/1 0/0 0/0 .rodata @4067 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4067 = -100.0f; -COMPILER_STRIP_GATE(80AAD294, &lit_4067); +COMPILER_STRIP_GATE(0x80AAD294, &lit_4067); #pragma pop /* 80AAD298-80AAD29C 0000AC 0004+00 0/1 0/0 0/0 .rodata @4068 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4068 = 200.0f; -COMPILER_STRIP_GATE(80AAD298, &lit_4068); +COMPILER_STRIP_GATE(0x80AAD298, &lit_4068); #pragma pop /* 80AAD29C-80AAD2A0 0000B0 0004+00 0/3 0/0 0/0 .rodata @4069 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4069 = 300.0f; -COMPILER_STRIP_GATE(80AAD29C, &lit_4069); +COMPILER_STRIP_GATE(0x80AAD29C, &lit_4069); #pragma pop /* 80AAD2A0-80AAD2A4 0000B4 0004+00 4/14 0/0 0/0 .rodata @4070 */ @@ -1221,13 +1234,13 @@ SECTION_RODATA static u8 const lit_4070[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AAD2A0, &lit_4070); +COMPILER_STRIP_GATE(0x80AAD2A0, &lit_4070); /* 80AAD2A4-80AAD2A8 0000B8 0004+00 0/3 0/0 0/0 .rodata @4071 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4071 = -1000000000.0f; -COMPILER_STRIP_GATE(80AAD2A4, &lit_4071); +COMPILER_STRIP_GATE(0x80AAD2A4, &lit_4071); #pragma pop /* 80AA8DE8-80AA90B0 000248 02C8+00 1/1 0/0 0/0 .text create__12daNpc_Post_cFv */ @@ -1245,14 +1258,14 @@ asm void daNpc_Post_c::create() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4235 = 65536.0f; -COMPILER_STRIP_GATE(80AAD2A8, &lit_4235); +COMPILER_STRIP_GATE(0x80AAD2A8, &lit_4235); #pragma pop /* 80AAD2AC-80AAD2B0 0000C0 0004+00 0/3 0/0 0/0 .rodata @4236 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4236 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(80AAD2AC, &lit_4236); +COMPILER_STRIP_GATE(0x80AAD2AC, &lit_4236); #pragma pop /* 80AAD2B0-80AAD2B8 0000C4 0008+00 0/1 0/0 0/0 .rodata bmdTypeList$4354 */ @@ -1261,12 +1274,12 @@ COMPILER_STRIP_GATE(80AAD2AC, &lit_4236); SECTION_RODATA static u8 const bmdTypeList[8] = { 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x03, }; -COMPILER_STRIP_GATE(80AAD2B0, &bmdTypeList); +COMPILER_STRIP_GATE(0x80AAD2B0, &bmdTypeList); #pragma pop /* 80AAD2B8-80AAD2BC 0000CC 0004+00 1/5 0/0 0/0 .rodata @4418 */ SECTION_RODATA static f32 const lit_4418 = 1.0f; -COMPILER_STRIP_GATE(80AAD2B8, &lit_4418); +COMPILER_STRIP_GATE(0x80AAD2B8, &lit_4418); /* 80AA90B0-80AA9478 000510 03C8+00 1/1 0/0 0/0 .text CreateHeap__12daNpc_Post_cFv */ #pragma push @@ -1401,7 +1414,7 @@ asm void daNpc_Post_c::Execute() { /* ############################################################################################## */ /* 80AAD2BC-80AAD2C0 0000D0 0004+00 1/1 0/0 0/0 .rodata @4467 */ SECTION_RODATA static f32 const lit_4467 = 100.0f; -COMPILER_STRIP_GATE(80AAD2BC, &lit_4467); +COMPILER_STRIP_GATE(0x80AAD2BC, &lit_4467); /* 80AA9688-80AA971C 000AE8 0094+00 1/1 0/0 0/0 .text Draw__12daNpc_Post_cFv */ #pragma push @@ -1498,7 +1511,7 @@ asm void daNpc_Post_c::checkChangeEvt() { /* ############################################################################################## */ /* 80AAD2C0-80AAD2C4 0000D4 0004+00 1/3 0/0 0/0 .rodata @4632 */ SECTION_RODATA static f32 const lit_4632 = -1.0f; -COMPILER_STRIP_GATE(80AAD2C0, &lit_4632); +COMPILER_STRIP_GATE(0x80AAD2C0, &lit_4632); /* 80AA9C58-80AA9D04 0010B8 00AC+00 1/0 0/0 0/0 .text setAfterTalkMotion__12daNpc_Post_cFv */ #pragma push @@ -1530,6 +1543,13 @@ asm void daNpc_Post_c::evtTalk() { } #pragma pop +/* ############################################################################################## */ +/* 80AAD34C-80AAD34C 000160 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80AAD39B = "Post"; +#pragma pop + /* 80AA9E98-80AA9F60 0012F8 00C8+00 1/0 0/0 0/0 .text evtCutProc__12daNpc_Post_cFv */ #pragma push #pragma optimization_level 0 @@ -1575,56 +1595,56 @@ asm void daNpc_Post_c::afterMoved() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4835 = -30.0f; -COMPILER_STRIP_GATE(80AAD2C4, &lit_4835); +COMPILER_STRIP_GATE(0x80AAD2C4, &lit_4835); #pragma pop /* 80AAD2C8-80AAD2CC 0000DC 0004+00 0/2 0/0 0/0 .rodata @4836 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4836 = 10.0f; -COMPILER_STRIP_GATE(80AAD2C8, &lit_4836); +COMPILER_STRIP_GATE(0x80AAD2C8, &lit_4836); #pragma pop /* 80AAD2CC-80AAD2D0 0000E0 0004+00 0/1 0/0 0/0 .rodata @4837 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4837 = 0x38C90FDB; -COMPILER_STRIP_GATE(80AAD2CC, &lit_4837); +COMPILER_STRIP_GATE(0x80AAD2CC, &lit_4837); #pragma pop /* 80AAD2D0-80AAD2D4 0000E4 0004+00 0/1 0/0 0/0 .rodata @4838 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4838 = 3.0f / 10.0f; -COMPILER_STRIP_GATE(80AAD2D0, &lit_4838); +COMPILER_STRIP_GATE(0x80AAD2D0, &lit_4838); #pragma pop /* 80AAD2D4-80AAD2D8 0000E8 0004+00 0/1 0/0 0/0 .rodata @4839 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4839 = 16.0f; -COMPILER_STRIP_GATE(80AAD2D4, &lit_4839); +COMPILER_STRIP_GATE(0x80AAD2D4, &lit_4839); #pragma pop /* 80AAD2D8-80AAD2DC 0000EC 0004+00 0/1 0/0 0/0 .rodata @4840 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4840 = 110.0f; -COMPILER_STRIP_GATE(80AAD2D8, &lit_4840); +COMPILER_STRIP_GATE(0x80AAD2D8, &lit_4840); #pragma pop /* 80AAD2DC-80AAD2E0 0000F0 0004+00 0/1 0/0 0/0 .rodata @4841 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4841 = 40.0f; -COMPILER_STRIP_GATE(80AAD2DC, &lit_4841); +COMPILER_STRIP_GATE(0x80AAD2DC, &lit_4841); #pragma pop /* 80AAD2E0-80AAD2E4 0000F4 0004+00 0/1 0/0 0/0 .rodata @4842 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4842 = 3.0f; -COMPILER_STRIP_GATE(80AAD2E0, &lit_4842); +COMPILER_STRIP_GATE(0x80AAD2E0, &lit_4842); #pragma pop /* 80AAD2E4-80AAD2EC 0000F8 0004+04 0/1 0/0 0/0 .rodata @4843 */ @@ -1635,14 +1655,14 @@ SECTION_RODATA static f32 const lit_4843[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80AAD2E4, &lit_4843); +COMPILER_STRIP_GATE(0x80AAD2E4, &lit_4843); #pragma pop /* 80AAD2EC-80AAD2F4 000100 0008+00 1/4 0/0 0/0 .rodata @4845 */ SECTION_RODATA static u8 const lit_4845[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AAD2EC, &lit_4845); +COMPILER_STRIP_GATE(0x80AAD2EC, &lit_4845); /* 80AADBF0-80AADBF4 000008 0001+03 1/1 0/0 0/0 .bss @1109 */ static u8 lit_1109[1 + 3 /* padding */]; @@ -1772,7 +1792,7 @@ asm void daNpc_Post_c::setAttnPos() { SECTION_RODATA static u8 const lit_4903[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AAD2F4, &lit_4903); +COMPILER_STRIP_GATE(0x80AAD2F4, &lit_4903); #pragma pop /* 80AAD2FC-80AAD304 000110 0008+00 0/2 0/0 0/0 .rodata @4904 */ @@ -1781,7 +1801,7 @@ COMPILER_STRIP_GATE(80AAD2F4, &lit_4903); SECTION_RODATA static u8 const lit_4904[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AAD2FC, &lit_4904); +COMPILER_STRIP_GATE(0x80AAD2FC, &lit_4904); #pragma pop /* 80AAD304-80AAD30C 000118 0008+00 0/2 0/0 0/0 .rodata @4905 */ @@ -1790,28 +1810,28 @@ COMPILER_STRIP_GATE(80AAD2FC, &lit_4904); SECTION_RODATA static u8 const lit_4905[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AAD304, &lit_4905); +COMPILER_STRIP_GATE(0x80AAD304, &lit_4905); #pragma pop /* 80AAD30C-80AAD310 000120 0004+00 0/1 0/0 0/0 .rodata @4949 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4949 = 20.0f; -COMPILER_STRIP_GATE(80AAD30C, &lit_4949); +COMPILER_STRIP_GATE(0x80AAD30C, &lit_4949); #pragma pop /* 80AAD310-80AAD314 000124 0004+00 0/1 0/0 0/0 .rodata @4950 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4950 = 80.0f; -COMPILER_STRIP_GATE(80AAD310, &lit_4950); +COMPILER_STRIP_GATE(0x80AAD310, &lit_4950); #pragma pop /* 80AAD314-80AAD318 000128 0004+00 0/1 0/0 0/0 .rodata @4951 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4951 = 50.0f; -COMPILER_STRIP_GATE(80AAD314, &lit_4951); +COMPILER_STRIP_GATE(0x80AAD314, &lit_4951); #pragma pop /* 80AAA570-80AAA714 0019D0 01A4+00 1/0 0/0 0/0 .text setCollision__12daNpc_Post_cFv */ @@ -1834,7 +1854,7 @@ bool daNpc_Post_c::drawDbgInfo() { SECTION_RODATA static u8 const jointNo[8] = { 0x00, 0x00, 0x00, 0x13, 0x00, 0x00, 0x00, 0x12, }; -COMPILER_STRIP_GATE(80AAD318, &jointNo); +COMPILER_STRIP_GATE(0x80AAD318, &jointNo); /* 80AAA71C-80AAA8A4 001B7C 0188+00 1/0 0/0 0/0 .text drawOtherMdl__12daNpc_Post_cFv */ #pragma push @@ -1881,7 +1901,7 @@ asm void daNpc_Post_c::selectAction() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpc_Post_c::chkAction(int (daNpc_Post_c::*)(void*)) { +asm void daNpc_Post_c::chkAction(int (daNpc_Post_c::*param_0)(void*)) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_post/d_a_npc_post/chkAction__12daNpc_Post_cFM12daNpc_Post_cFPCvPvPv_i.s" } @@ -1892,7 +1912,7 @@ asm void daNpc_Post_c::chkAction(int (daNpc_Post_c::*)(void*)) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpc_Post_c::setAction(int (daNpc_Post_c::*)(void*)) { +asm void daNpc_Post_c::setAction(int (daNpc_Post_c::*param_0)(void*)) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_post/d_a_npc_post/setAction__12daNpc_Post_cFM12daNpc_Post_cFPCvPvPv_i.s" } @@ -1923,7 +1943,7 @@ asm void daNpc_Post_c::chkPullOutLetter2() { /* ############################################################################################## */ /* 80AAD320-80AAD324 000134 0004+00 1/1 0/0 0/0 .rodata @5115 */ SECTION_RODATA static f32 const lit_5115 = 37.0f; -COMPILER_STRIP_GATE(80AAD320, &lit_5115); +COMPILER_STRIP_GATE(0x80AAD320, &lit_5115); /* 80AAABA0-80AAAC64 002000 00C4+00 1/1 0/0 0/0 .text pullOutLetter__12daNpc_Post_cFv */ #pragma push @@ -1935,6 +1955,14 @@ asm void daNpc_Post_c::pullOutLetter() { } #pragma pop +/* ############################################################################################## */ +/* 80AAD34C-80AAD34C 000160 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80AAD3A0 = "prm"; +SECTION_DEAD static char const* const stringBase_80AAD3A4 = "timer"; +#pragma pop + /* 80AAAC64-80AAB61C 0020C4 09B8+00 3/0 0/0 0/0 .text cutDeliver__12daNpc_Post_cFi */ #pragma push #pragma optimization_level 0 @@ -1952,35 +1980,35 @@ asm void daNpc_Post_c::cutDeliver(int param_0) { SECTION_RODATA static u8 const lit_5155[8] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, }; -COMPILER_STRIP_GATE(80AAD324, &lit_5155); +COMPILER_STRIP_GATE(0x80AAD324, &lit_5155); #pragma pop /* 80AAD32C-80AAD330 000140 0004+00 0/0 0/0 0/0 .rodata @5411 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5411 = 1000.0f; -COMPILER_STRIP_GATE(80AAD32C, &lit_5411); +COMPILER_STRIP_GATE(0x80AAD32C, &lit_5411); #pragma pop /* 80AAD330-80AAD334 000144 0004+00 0/0 0/0 0/0 .rodata @5412 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5412 = 5.0f; -COMPILER_STRIP_GATE(80AAD330, &lit_5412); +COMPILER_STRIP_GATE(0x80AAD330, &lit_5412); #pragma pop /* 80AAD334-80AAD338 000148 0004+00 0/0 0/0 0/0 .rodata @5413 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5413 = 400.0f; -COMPILER_STRIP_GATE(80AAD334, &lit_5413); +COMPILER_STRIP_GATE(0x80AAD334, &lit_5413); #pragma pop /* 80AAD338-80AAD33C 00014C 0004+00 0/1 0/0 0/0 .rodata @5414 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5414 = 1.5f; -COMPILER_STRIP_GATE(80AAD338, &lit_5414); +COMPILER_STRIP_GATE(0x80AAD338, &lit_5414); #pragma pop /* 80AAD33C-80AAD344 000150 0008+00 0/0 0/0 0/0 .rodata @5417 */ @@ -1989,21 +2017,21 @@ COMPILER_STRIP_GATE(80AAD338, &lit_5414); SECTION_RODATA static u8 const lit_5417[8] = { 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AAD33C, &lit_5417); +COMPILER_STRIP_GATE(0x80AAD33C, &lit_5417); #pragma pop /* 80AAD344-80AAD348 000158 0004+00 0/1 0/0 0/0 .rodata @5626 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5626 = 0.5f; -COMPILER_STRIP_GATE(80AAD344, &lit_5626); +COMPILER_STRIP_GATE(0x80AAD344, &lit_5626); #pragma pop /* 80AAD348-80AAD34C 00015C 0004+00 0/1 0/0 0/0 .rodata @5627 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5627 = 700.0f; -COMPILER_STRIP_GATE(80AAD348, &lit_5627); +COMPILER_STRIP_GATE(0x80AAD348, &lit_5627); #pragma pop /* 80AAB61C-80AABC24 002A7C 0608+00 1/0 0/0 0/0 .text wait__12daNpc_Post_cFPv */ @@ -2371,7 +2399,7 @@ void daNpcT_c::changeBtk(int* param_0, int* param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80AACF10(int* param_0) { +extern "C" asm void func_80AACF10(void* _this, int* param_0) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_post/d_a_npc_post/func_80AACF10.s" } @@ -2381,7 +2409,7 @@ extern "C" asm void func_80AACF10(int* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80AACF2C(f32 param_0, f32 param_1) { +extern "C" asm void func_80AACF2C(void* _this, f32 param_0, f32 param_1) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_post/d_a_npc_post/func_80AACF2C.s" } @@ -2407,7 +2435,7 @@ asm void __sinit_d_a_npc_post_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80AACF68 = (void*)__sinit_d_a_npc_post_cpp; +REGISTER_CTORS(0x80AACF68, __sinit_d_a_npc_post_cpp); #pragma pop /* 80AACFF0-80AAD0D0 004450 00E0+00 1/1 0/0 0/0 .text @@ -2693,19 +2721,4 @@ static u8 data_80AADCB8[4]; static u8 data_80AADCBC[4]; #pragma pop -/* 80AAD34C-80AAD3AA 000160 005E+00 5/2 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80AAD34C = ""; -SECTION_DEAD static char const* const stringBase_80AAD34D = "NO_RESPONSE"; -SECTION_DEAD static char const* const stringBase_80AAD359 = "DELIVER"; -SECTION_DEAD static char const* const stringBase_80AAD361 = "DELIVERTO_PLAYER_ON_HORSE"; -SECTION_DEAD static char const* const stringBase_80AAD37B = "DELIVERTO_WOLF"; -SECTION_DEAD static char const* const stringBase_80AAD38A = "post"; -SECTION_DEAD static char const* const stringBase_80AAD38F = "post1"; -SECTION_DEAD static char const* const stringBase_80AAD395 = "post2"; -SECTION_DEAD static char const* const stringBase_80AAD39B = "Post"; -SECTION_DEAD static char const* const stringBase_80AAD3A0 = "prm"; -SECTION_DEAD static char const* const stringBase_80AAD3A4 = "timer"; -#pragma pop +/* 80AAD34C-80AAD34C 000160 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/npc/d_a_npc_pouya/d_a_npc_pouya.cpp b/rel/d/a/npc/d_a_npc_pouya/d_a_npc_pouya.cpp index da1bf2f6501..800cec5e48c 100644 --- a/rel/d/a/npc/d_a_npc_pouya/d_a_npc_pouya.cpp +++ b/rel/d/a/npc/d_a_npc_pouya/d_a_npc_pouya.cpp @@ -23,12 +23,14 @@ struct mDoGph_gInf_c { static f32 mFadeRate; }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; +struct J3DAnmTransform {}; + +struct J3DModelData {}; + struct Vec {}; struct Z2Creature { @@ -37,8 +39,6 @@ struct Z2Creature { /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -51,6 +51,8 @@ struct fopAc_ac_c { /* 80018C8C */ ~fopAc_ac_c(); }; +struct daNpcT_faceMotionAnmData_c {}; + struct daNpcT_MotionSeqMngr_c { struct sequenceStepData_c {}; @@ -58,14 +60,12 @@ struct daNpcT_MotionSeqMngr_c { /* 80AB1824 */ ~daNpcT_MotionSeqMngr_c(); }; +struct daNpcT_evtData_c {}; + struct daNpcT_motionAnmData_c {}; struct J3DJoint {}; -struct daNpcT_faceMotionAnmData_c {}; - -struct daNpcT_evtData_c {}; - struct daNpc_Pouya_c { /* 80AADDAC */ ~daNpc_Pouya_c(); /* 80AADEE0 */ void create(); @@ -127,8 +127,17 @@ struct dCcD_GObjInf { /* 800844F8 */ void GetTgHitObj(); }; +struct csXyz { + /* 80AB11C0 */ ~csXyz(); + /* 80AB16D8 */ csXyz(); +}; + +struct _GXColorS10 {}; + struct J3DModel {}; +struct J3DAnmTevRegKey {}; + struct cXyz { /* 80266AE4 */ void operator+(Vec const&) const; /* 80266B34 */ void operator-(Vec const&) const; @@ -136,15 +145,6 @@ struct cXyz { /* 80AB17D8 */ cXyz(); }; -struct _GXColorS10 {}; - -struct J3DAnmTevRegKey {}; - -struct csXyz { - /* 80AB11C0 */ ~csXyz(); - /* 80AB16D8 */ csXyz(); -}; - struct daNpcT_c { /* 80147FA4 */ void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*); /* 80148148 */ void getTevRegKeyAnmP(char const*, int); @@ -510,7 +510,7 @@ extern "C" void changeAnm__8daNpcT_cFPiPi(); extern "C" void changeBck__8daNpcT_cFPiPi(); extern "C" void changeBtp__8daNpcT_cFPiPi(); extern "C" void changeBtk__8daNpcT_cFPiPi(); -extern "C" void func_80AB1DDC(int*); +extern "C" void func_80AB1DDC(void* _this, int*); extern "C" void __sinit_d_a_npc_pouya_cpp(); extern "C" void __ct__13daNpc_Pouya_cFPC26daNpcT_faceMotionAnmData_cPC22daNpcT_motionAnmData_cPCQ222daNpcT_MotionSeqMngr_c18sequenceStepData_ciPCQ222daNpcT_MotionSeqMngr_c18sequenceStepData_ciPC16daNpcT_evtData_cPPc(); @@ -702,6 +702,24 @@ extern "C" void __register_global_object(); // /* ############################################################################################## */ +/* 80AB2120-80AB2120 000120 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80AB2120 = ""; +SECTION_DEAD static char const* const stringBase_80AB2121 = "DEFAULT_GETITEM"; +SECTION_DEAD static char const* const stringBase_80AB2131 = "NO_RESPONSE"; +SECTION_DEAD static char const* const stringBase_80AB213D = "HAVE_FAVORTO_ASK1"; +SECTION_DEAD static char const* const stringBase_80AB214F = "HAVE_FAVORTO_ASK2"; +SECTION_DEAD static char const* const stringBase_80AB2161 = "RETURN_FAVOR_1_01"; +SECTION_DEAD static char const* const stringBase_80AB2173 = "RETURN_FAVOR_1_02"; +SECTION_DEAD static char const* const stringBase_80AB2185 = "RETURN_FAVOR_2_01"; +SECTION_DEAD static char const* const stringBase_80AB2197 = "RETURN_FAVOR_2_02"; +SECTION_DEAD static char const* const stringBase_80AB21A9 = "pouyaA"; +SECTION_DEAD static char const* const stringBase_80AB21B0 = "pouyaB"; +SECTION_DEAD static char const* const stringBase_80AB21B7 = "HAVE_FAVORTO_ASK"; +SECTION_DEAD static char const* const stringBase_80AB21C8 = "RETURN_FAVOR"; +#pragma pop + /* 80AB21F0-80AB21FC 000000 000C+00 2/2 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -1281,7 +1299,7 @@ SECTION_RODATA u8 const daNpc_Pouya_Param_c::m[140] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AB2000, &daNpc_Pouya_Param_c::m); +COMPILER_STRIP_GATE(0x80AB2000, &daNpc_Pouya_Param_c::m); /* 80AB208C-80AB20A4 00008C 0018+00 0/1 0/0 0/0 .rodata heapSize$3971 */ #pragma push @@ -1290,42 +1308,42 @@ SECTION_RODATA static u8 const heapSize[24] = { 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x54, 0x40, 0x00, 0x00, 0x36, 0x80, 0x00, 0x00, 0x36, 0x80, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x80, 0x00, }; -COMPILER_STRIP_GATE(80AB208C, &heapSize); +COMPILER_STRIP_GATE(0x80AB208C, &heapSize); #pragma pop /* 80AB20A4-80AB20A8 0000A4 0004+00 0/1 0/0 0/0 .rodata @4039 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4039 = -150.0f; -COMPILER_STRIP_GATE(80AB20A4, &lit_4039); +COMPILER_STRIP_GATE(0x80AB20A4, &lit_4039); #pragma pop /* 80AB20A8-80AB20AC 0000A8 0004+00 0/1 0/0 0/0 .rodata @4040 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4040 = -100.0f; -COMPILER_STRIP_GATE(80AB20A8, &lit_4040); +COMPILER_STRIP_GATE(0x80AB20A8, &lit_4040); #pragma pop /* 80AB20AC-80AB20B0 0000AC 0004+00 0/1 0/0 0/0 .rodata @4041 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4041 = 150.0f; -COMPILER_STRIP_GATE(80AB20AC, &lit_4041); +COMPILER_STRIP_GATE(0x80AB20AC, &lit_4041); #pragma pop /* 80AB20B0-80AB20B4 0000B0 0004+00 0/1 0/0 0/0 .rodata @4042 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4042 = 300.0f; -COMPILER_STRIP_GATE(80AB20B0, &lit_4042); +COMPILER_STRIP_GATE(0x80AB20B0, &lit_4042); #pragma pop /* 80AB20B4-80AB20B8 0000B4 0004+00 0/1 0/0 0/0 .rodata @4043 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4043 = -1000000000.0f; -COMPILER_STRIP_GATE(80AB20B4, &lit_4043); +COMPILER_STRIP_GATE(0x80AB20B4, &lit_4043); #pragma pop /* 80AADEE0-80AAE1AC 000220 02CC+00 1/1 0/0 0/0 .text create__13daNpc_Pouya_cFv */ @@ -1346,20 +1364,20 @@ SECTION_RODATA static u8 const lit_4204[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AB20B8, &lit_4204); +COMPILER_STRIP_GATE(0x80AB20B8, &lit_4204); /* 80AB20BC-80AB20C0 0000BC 0004+00 0/2 0/0 0/0 .rodata @4205 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4205 = 65536.0f; -COMPILER_STRIP_GATE(80AB20BC, &lit_4205); +COMPILER_STRIP_GATE(0x80AB20BC, &lit_4205); #pragma pop /* 80AB20C0-80AB20C4 0000C0 0004+00 0/3 0/0 0/0 .rodata @4206 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4206 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(80AB20C0, &lit_4206); +COMPILER_STRIP_GATE(0x80AB20C0, &lit_4206); #pragma pop /* 80AB20C4-80AB20C8 0000C4 0004+00 0/1 0/0 0/0 .rodata bmdTypeList$4325 */ @@ -1371,12 +1389,12 @@ SECTION_RODATA static u8 const bmdTypeList[4] = { 0x00, 0x01, }; -COMPILER_STRIP_GATE(80AB20C4, &bmdTypeList); +COMPILER_STRIP_GATE(0x80AB20C4, &bmdTypeList); #pragma pop /* 80AB20C8-80AB20CC 0000C8 0004+00 3/6 0/0 0/0 .rodata @4414 */ SECTION_RODATA static f32 const lit_4414 = 1.0f; -COMPILER_STRIP_GATE(80AB20C8, &lit_4414); +COMPILER_STRIP_GATE(0x80AB20C8, &lit_4414); /* 80AAE1AC-80AAE5CC 0004EC 0420+00 1/1 0/0 0/0 .text CreateHeap__13daNpc_Pouya_cFv */ #pragma push @@ -1511,7 +1529,7 @@ asm void daNpc_Pouya_c::Execute() { /* ############################################################################################## */ /* 80AB20CC-80AB20D0 0000CC 0004+00 1/1 0/0 0/0 .rodata @4463 */ SECTION_RODATA static f32 const lit_4463 = 100.0f; -COMPILER_STRIP_GATE(80AB20CC, &lit_4463); +COMPILER_STRIP_GATE(0x80AB20CC, &lit_4463); /* 80AAE7DC-80AAE870 000B1C 0094+00 1/1 0/0 0/0 .text Draw__13daNpc_Pouya_cFv */ #pragma push @@ -1619,7 +1637,7 @@ asm void daNpc_Pouya_c::checkChangeEvt() { /* ############################################################################################## */ /* 80AB20D0-80AB20D4 0000D0 0004+00 3/3 0/0 0/0 .rodata @4742 */ SECTION_RODATA static f32 const lit_4742 = -1.0f; -COMPILER_STRIP_GATE(80AB20D0, &lit_4742); +COMPILER_STRIP_GATE(0x80AB20D0, &lit_4742); /* 80AAF148-80AAF1F0 001488 00A8+00 2/0 0/0 0/0 .text setAfterTalkMotion__13daNpc_Pouya_cFv */ #pragma push @@ -1646,6 +1664,13 @@ asm void daNpc_Pouya_c::evtTalk() { } #pragma pop +/* ############################################################################################## */ +/* 80AB2120-80AB2120 000120 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80AB21D5 = "Pouya"; +#pragma pop + /* 80AAF294-80AAF35C 0015D4 00C8+00 1/0 0/0 0/0 .text evtCutProc__13daNpc_Pouya_cFv */ #pragma push #pragma optimization_level 0 @@ -1681,35 +1706,35 @@ asm void daNpc_Pouya_c::beforeMove() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4911 = 20.0f; -COMPILER_STRIP_GATE(80AB20D4, &lit_4911); +COMPILER_STRIP_GATE(0x80AB20D4, &lit_4911); #pragma pop /* 80AB20D8-80AB20DC 0000D8 0004+00 0/1 0/0 0/0 .rodata @4912 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4912 = 30.0f; -COMPILER_STRIP_GATE(80AB20D8, &lit_4912); +COMPILER_STRIP_GATE(0x80AB20D8, &lit_4912); #pragma pop /* 80AB20DC-80AB20E0 0000DC 0004+00 0/1 0/0 0/0 .rodata @4913 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4913 = 0x38C90FDB; -COMPILER_STRIP_GATE(80AB20DC, &lit_4913); +COMPILER_STRIP_GATE(0x80AB20DC, &lit_4913); #pragma pop /* 80AB20E0-80AB20E4 0000E0 0004+00 0/1 0/0 0/0 .rodata @4914 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4914 = -10.0f; -COMPILER_STRIP_GATE(80AB20E0, &lit_4914); +COMPILER_STRIP_GATE(0x80AB20E0, &lit_4914); #pragma pop /* 80AB20E4-80AB20E8 0000E4 0004+00 0/1 0/0 0/0 .rodata @4915 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4915 = 120.0f; -COMPILER_STRIP_GATE(80AB20E4, &lit_4915); +COMPILER_STRIP_GATE(0x80AB20E4, &lit_4915); #pragma pop /* 80AB20E8-80AB20F0 0000E8 0004+04 0/1 0/0 0/0 .rodata @4916 */ @@ -1720,14 +1745,14 @@ SECTION_RODATA static f32 const lit_4916[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80AB20E8, &lit_4916); +COMPILER_STRIP_GATE(0x80AB20E8, &lit_4916); #pragma pop /* 80AB20F0-80AB20F8 0000F0 0008+00 2/4 0/0 0/0 .rodata @4918 */ SECTION_RODATA static u8 const lit_4918[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AB20F0, &lit_4918); +COMPILER_STRIP_GATE(0x80AB20F0, &lit_4918); /* 80AAF5BC-80AAF8E4 0018FC 0328+00 1/0 0/0 0/0 .text setAttnPos__13daNpc_Pouya_cFv */ #pragma push @@ -1761,7 +1786,7 @@ bool daNpc_Pouya_c::drawDbgInfo() { SECTION_RODATA static u8 const lit_4976[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AB20F8, &lit_4976); +COMPILER_STRIP_GATE(0x80AB20F8, &lit_4976); #pragma pop /* 80AB2100-80AB2108 000100 0008+00 0/1 0/0 0/0 .rodata @4977 */ @@ -1770,7 +1795,7 @@ COMPILER_STRIP_GATE(80AB20F8, &lit_4976); SECTION_RODATA static u8 const lit_4977[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AB2100, &lit_4977); +COMPILER_STRIP_GATE(0x80AB2100, &lit_4977); #pragma pop /* 80AB2108-80AB2110 000108 0008+00 0/1 0/0 0/0 .rodata @4978 */ @@ -1779,7 +1804,7 @@ COMPILER_STRIP_GATE(80AB2100, &lit_4977); SECTION_RODATA static u8 const lit_4978[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AB2108, &lit_4978); +COMPILER_STRIP_GATE(0x80AB2108, &lit_4978); #pragma pop /* 80AB2110-80AB2114 000110 0004+00 1/1 0/0 0/0 .rodata jointNo$5024 */ @@ -1789,7 +1814,7 @@ SECTION_RODATA static u8 const jointNo[4] = { 0x00, 0x04, }; -COMPILER_STRIP_GATE(80AB2110, &jointNo); +COMPILER_STRIP_GATE(0x80AB2110, &jointNo); /* 80AAFA64-80AAFB4C 001DA4 00E8+00 1/0 0/0 0/0 .text drawOtherMdl__13daNpc_Pouya_cFv */ #pragma push @@ -1826,7 +1851,7 @@ asm void daNpc_Pouya_c::selectAction() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpc_Pouya_c::chkAction(int (daNpc_Pouya_c::*)(void*)) { +asm void daNpc_Pouya_c::chkAction(int (daNpc_Pouya_c::*param_0)(void*)) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_pouya/d_a_npc_pouya/chkAction__13daNpc_Pouya_cFM13daNpc_Pouya_cFPCvPvPv_i.s" } @@ -1837,7 +1862,7 @@ asm void daNpc_Pouya_c::chkAction(int (daNpc_Pouya_c::*)(void*)) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpc_Pouya_c::setAction(int (daNpc_Pouya_c::*)(void*)) { +asm void daNpc_Pouya_c::setAction(int (daNpc_Pouya_c::*param_0)(void*)) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_pouya/d_a_npc_pouya/setAction__13daNpc_Pouya_cFM13daNpc_Pouya_cFPCvPvPv_i.s" } @@ -1860,7 +1885,16 @@ asm void daNpc_Pouya_c::setPrtcls() { SECTION_RODATA static u8 const lit_5191[8] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, }; -COMPILER_STRIP_GATE(80AB2114, &lit_5191); +COMPILER_STRIP_GATE(0x80AB2114, &lit_5191); +#pragma pop + +/* 80AB2120-80AB2120 000120 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80AB21DB = "prm"; +SECTION_DEAD static char const* const stringBase_80AB21DF = "timer"; +SECTION_DEAD static char const* const stringBase_80AB21E5 = "msgNo"; +SECTION_DEAD static char const* const stringBase_80AB21EB = "rate"; #pragma pop /* 80AAFE08-80AB04A8 002148 06A0+00 4/0 0/0 0/0 .text cutHaveFavorToAsk__13daNpc_Pouya_cFi */ @@ -2238,7 +2272,7 @@ void daNpcT_c::changeBtk(int* param_0, int* param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80AB1DDC(int* param_0) { +extern "C" asm void func_80AB1DDC(void* _this, int* param_0) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_pouya/d_a_npc_pouya/func_80AB1DDC.s" } @@ -2270,7 +2304,7 @@ asm void __sinit_d_a_npc_pouya_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80AB1DF8 = (void*)__sinit_d_a_npc_pouya_cpp; +REGISTER_CTORS(0x80AB1DF8, __sinit_d_a_npc_pouya_cpp); #pragma pop /* 80AB1E94-80AB1F54 0041D4 00C0+00 1/1 0/0 0/0 .text @@ -2369,29 +2403,7 @@ static asm void func_80AB1FE4() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5332 = 22.0f; -COMPILER_STRIP_GATE(80AB211C, &lit_5332); +COMPILER_STRIP_GATE(0x80AB211C, &lit_5332); #pragma pop -/* 80AB2120-80AB21F0 000120 00D0+00 5/2 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80AB2120 = ""; -SECTION_DEAD static char const* const stringBase_80AB2121 = "DEFAULT_GETITEM"; -SECTION_DEAD static char const* const stringBase_80AB2131 = "NO_RESPONSE"; -SECTION_DEAD static char const* const stringBase_80AB213D = "HAVE_FAVORTO_ASK1"; -SECTION_DEAD static char const* const stringBase_80AB214F = "HAVE_FAVORTO_ASK2"; -SECTION_DEAD static char const* const stringBase_80AB2161 = "RETURN_FAVOR_1_01"; -SECTION_DEAD static char const* const stringBase_80AB2173 = "RETURN_FAVOR_1_02"; -SECTION_DEAD static char const* const stringBase_80AB2185 = "RETURN_FAVOR_2_01"; -SECTION_DEAD static char const* const stringBase_80AB2197 = "RETURN_FAVOR_2_02"; -SECTION_DEAD static char const* const stringBase_80AB21A9 = "pouyaA"; -SECTION_DEAD static char const* const stringBase_80AB21B0 = "pouyaB"; -SECTION_DEAD static char const* const stringBase_80AB21B7 = "HAVE_FAVORTO_ASK"; -SECTION_DEAD static char const* const stringBase_80AB21C8 = "RETURN_FAVOR"; -SECTION_DEAD static char const* const stringBase_80AB21D5 = "Pouya"; -SECTION_DEAD static char const* const stringBase_80AB21DB = "prm"; -SECTION_DEAD static char const* const stringBase_80AB21DF = "timer"; -SECTION_DEAD static char const* const stringBase_80AB21E5 = "msgNo"; -SECTION_DEAD static char const* const stringBase_80AB21EB = "rate"; -#pragma pop +/* 80AB2120-80AB2120 000120 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/npc/d_a_npc_prayer/d_a_npc_prayer.cpp b/rel/d/a/npc/d_a_npc_prayer/d_a_npc_prayer.cpp index 3d485f837f4..f26eb48fda6 100644 --- a/rel/d/a/npc/d_a_npc_prayer/d_a_npc_prayer.cpp +++ b/rel/d/a/npc/d_a_npc_prayer/d_a_npc_prayer.cpp @@ -25,16 +25,16 @@ struct mDoMtx_stack_c { static u8 now[48]; }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; - struct J3DAnmTransform {}; +struct J3DModelData {}; + +struct Z2Creature {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -47,10 +47,10 @@ struct fopAc_ac_c { /* 80018C8C */ ~fopAc_ac_c(); }; -struct J3DJoint {}; - struct J3DModel {}; +struct J3DJoint {}; + struct daNpcPray_c { /* 80AB2DEC */ daNpcPray_c(); /* 80AB3000 */ ~daNpcPray_c(); @@ -94,10 +94,10 @@ struct daNpcPray_Param_c { static u8 const m[108]; }; -struct _GXColorS10 {}; - struct J3DAnmTransformKey {}; +struct _GXColorS10 {}; + struct daNpcF_c { struct daNpcF_anmPlayData {}; @@ -148,7 +148,6 @@ struct daNpcF_Lookat_c { struct daNpcF_ActorMngr_c { /* 801506B0 */ void initialize(); - /* 801506D8 */ void entry(unsigned int); /* 801506BC */ void entry(fopAc_ac_c*); /* 801506E0 */ void remove(); /* 801506EC */ void getActorP(); @@ -497,6 +496,14 @@ extern "C" void __register_global_object(); // /* ############################################################################################## */ +/* 80AB5964-80AB5964 00015C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80AB5964 = "Prayer"; +SECTION_DEAD static char const* const stringBase_80AB596B = "Wgeneral"; +SECTION_DEAD static char const* const stringBase_80AB5974 = "GET_HEART"; +#pragma pop + /* 80AB5984-80AB5990 000000 000C+00 3/3 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -789,34 +796,34 @@ SECTION_RODATA u8 const daNpcPray_Param_c::m[108] = { 0x42, 0x70, 0x00, 0x00, 0x43, 0xFA, 0x00, 0x00, 0x43, 0x96, 0x00, 0x00, 0xC3, 0x96, 0x00, 0x00, 0x00, 0x3C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AB5808, &daNpcPray_Param_c::m); +COMPILER_STRIP_GATE(0x80AB5808, &daNpcPray_Param_c::m); /* 80AB5874-80AB5878 00006C 0004+00 0/1 0/0 0/0 .rodata @4169 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4169 = -60.0f; -COMPILER_STRIP_GATE(80AB5874, &lit_4169); +COMPILER_STRIP_GATE(0x80AB5874, &lit_4169); #pragma pop /* 80AB5878-80AB587C 000070 0004+00 0/1 0/0 0/0 .rodata @4170 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4170 = -10.0f; -COMPILER_STRIP_GATE(80AB5878, &lit_4170); +COMPILER_STRIP_GATE(0x80AB5878, &lit_4170); #pragma pop /* 80AB587C-80AB5880 000074 0004+00 0/1 0/0 0/0 .rodata @4171 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4171 = 60.0f; -COMPILER_STRIP_GATE(80AB587C, &lit_4171); +COMPILER_STRIP_GATE(0x80AB587C, &lit_4171); #pragma pop /* 80AB5880-80AB5884 000078 0004+00 0/1 0/0 0/0 .rodata @4172 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4172 = 220.0f; -COMPILER_STRIP_GATE(80AB5880, &lit_4172); +COMPILER_STRIP_GATE(0x80AB5880, &lit_4172); #pragma pop /* 80AB3204-80AB348C 000504 0288+00 1/1 0/0 0/0 .text Create__11daNpcPray_cFv */ @@ -832,18 +839,18 @@ asm void daNpcPray_c::Create() { /* ############################################################################################## */ /* 80AB5884-80AB5888 00007C 0004+00 1/3 0/0 0/0 .rodata @4220 */ SECTION_RODATA static f32 const lit_4220 = 1.0f; -COMPILER_STRIP_GATE(80AB5884, &lit_4220); +COMPILER_STRIP_GATE(0x80AB5884, &lit_4220); /* 80AB5888-80AB588C 000080 0004+00 0/1 0/0 0/0 .rodata @4221 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4221 = 0x3F8CCCCC; -COMPILER_STRIP_GATE(80AB5888, &lit_4221); +COMPILER_STRIP_GATE(0x80AB5888, &lit_4221); #pragma pop /* 80AB588C-80AB5890 000084 0004+00 2/5 0/0 0/0 .rodata @4222 */ SECTION_RODATA static f32 const lit_4222 = -1.0f; -COMPILER_STRIP_GATE(80AB588C, &lit_4222); +COMPILER_STRIP_GATE(0x80AB588C, &lit_4222); /* 80AB348C-80AB3610 00078C 0184+00 1/1 0/0 0/0 .text CreateHeap__11daNpcPray_cFv */ #pragma push @@ -890,7 +897,7 @@ asm void daNpcPray_c::Draw() { SECTION_RODATA static u8 const lit_4241[12] = { 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x03, }; -COMPILER_STRIP_GATE(80AB5890, &lit_4241); +COMPILER_STRIP_GATE(0x80AB5890, &lit_4241); /* 80AB36A8-80AB3834 0009A8 018C+00 1/1 0/0 0/0 .text * ctrlJoint__11daNpcPray_cFP8J3DJointP8J3DModel */ @@ -950,12 +957,12 @@ asm void daNpcPray_c::main() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4391 = 10.0f; -COMPILER_STRIP_GATE(80AB589C, &lit_4391); +COMPILER_STRIP_GATE(0x80AB589C, &lit_4391); #pragma pop /* 80AB58A0-80AB58A4 000098 0004+00 1/2 0/0 0/0 .rodata @4392 */ SECTION_RODATA static f32 const lit_4392 = 15.0f; -COMPILER_STRIP_GATE(80AB58A0, &lit_4392); +COMPILER_STRIP_GATE(0x80AB58A0, &lit_4392); /* 80AB58A4-80AB58A8 00009C 0004+00 1/8 0/0 0/0 .rodata @4393 */ SECTION_RODATA static u8 const lit_4393[4] = { @@ -964,7 +971,7 @@ SECTION_RODATA static u8 const lit_4393[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AB58A4, &lit_4393); +COMPILER_STRIP_GATE(0x80AB58A4, &lit_4393); /* 80AB3964-80AB3B0C 000C64 01A8+00 1/0 0/0 0/0 .text setAttnPos__11daNpcPray_cFv */ #pragma push @@ -1018,7 +1025,7 @@ asm void daNpcPray_c::reset() { SECTION_RODATA static u8 const lit_4452[12] = { 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AB58A8, &lit_4452); +COMPILER_STRIP_GATE(0x80AB58A8, &lit_4452); #pragma pop /* 80AB58B4-80AB58B8 0000AC 0004+00 0/1 0/0 0/0 .rodata @4453 */ @@ -1030,7 +1037,7 @@ SECTION_RODATA static u8 const lit_4453[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AB58B4, &lit_4453); +COMPILER_STRIP_GATE(0x80AB58B4, &lit_4453); #pragma pop /* 80AB58B8-80AB58C4 0000B0 000C+00 0/1 0/0 0/0 .rodata @4454 */ @@ -1039,7 +1046,7 @@ COMPILER_STRIP_GATE(80AB58B4, &lit_4453); SECTION_RODATA static u8 const lit_4454[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80AB58B8, &lit_4454); +COMPILER_STRIP_GATE(0x80AB58B8, &lit_4454); #pragma pop /* 80AB58C4-80AB58D0 0000BC 000C+00 0/1 0/0 0/0 .rodata @4455 */ @@ -1048,7 +1055,7 @@ COMPILER_STRIP_GATE(80AB58B8, &lit_4454); SECTION_RODATA static u8 const lit_4455[12] = { 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AB58C4, &lit_4455); +COMPILER_STRIP_GATE(0x80AB58C4, &lit_4455); #pragma pop /* 80AB58D0-80AB58D8 0000C8 0008+00 0/1 0/0 0/0 .rodata @4456 */ @@ -1057,7 +1064,7 @@ COMPILER_STRIP_GATE(80AB58C4, &lit_4455); SECTION_RODATA static u8 const lit_4456[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AB58D0, &lit_4456); +COMPILER_STRIP_GATE(0x80AB58D0, &lit_4456); #pragma pop /* 80AB58D8-80AB58E4 0000D0 000C+00 0/1 0/0 0/0 .rodata @4457 */ @@ -1066,7 +1073,7 @@ COMPILER_STRIP_GATE(80AB58D0, &lit_4456); SECTION_RODATA static u8 const lit_4457[12] = { 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80AB58D8, &lit_4457); +COMPILER_STRIP_GATE(0x80AB58D8, &lit_4457); #pragma pop /* 80AB58E4-80AB58F0 0000DC 000C+00 0/1 0/0 0/0 .rodata @4458 */ @@ -1075,7 +1082,7 @@ COMPILER_STRIP_GATE(80AB58D8, &lit_4457); SECTION_RODATA static u8 const lit_4458[12] = { 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AB58E4, &lit_4458); +COMPILER_STRIP_GATE(0x80AB58E4, &lit_4458); #pragma pop /* 80AB58F0-80AB58F8 0000E8 0008+00 0/1 0/0 0/0 .rodata @4459 */ @@ -1084,7 +1091,7 @@ COMPILER_STRIP_GATE(80AB58E4, &lit_4458); SECTION_RODATA static u8 const lit_4459[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AB58F0, &lit_4459); +COMPILER_STRIP_GATE(0x80AB58F0, &lit_4459); #pragma pop /* 80AB58F8-80AB5904 0000F0 000C+00 0/1 0/0 0/0 .rodata @4460 */ @@ -1093,7 +1100,7 @@ COMPILER_STRIP_GATE(80AB58F0, &lit_4459); SECTION_RODATA static u8 const lit_4460[12] = { 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AB58F8, &lit_4460); +COMPILER_STRIP_GATE(0x80AB58F8, &lit_4460); #pragma pop /* 80AB5904-80AB5908 0000FC 0004+00 0/1 0/0 0/0 .rodata @4461 */ @@ -1105,7 +1112,7 @@ SECTION_RODATA static u8 const lit_4461[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AB5904, &lit_4461); +COMPILER_STRIP_GATE(0x80AB5904, &lit_4461); #pragma pop /* 80AB5908-80AB5918 000100 0010+00 0/1 0/0 0/0 .rodata @4462 */ @@ -1114,7 +1121,7 @@ COMPILER_STRIP_GATE(80AB5904, &lit_4461); SECTION_RODATA static u8 const lit_4462[16] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AB5908, &lit_4462); +COMPILER_STRIP_GATE(0x80AB5908, &lit_4462); #pragma pop /* 80AB3DBC-80AB3F54 0010BC 0198+00 1/1 0/0 0/0 .text playMotion__11daNpcPray_cFv */ @@ -1132,7 +1139,7 @@ asm void daNpcPray_c::playMotion() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpcPray_c::setAction(bool (daNpcPray_c::*)(void*)) { +asm void daNpcPray_c::setAction(bool (daNpcPray_c::*param_0)(void*)) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_prayer/d_a_npc_prayer/setAction__11daNpcPray_cFM11daNpcPray_cFPCvPvPv_b.s" } @@ -1155,28 +1162,28 @@ asm void daNpcPray_c::setLookMode(int param_0) { SECTION_RODATA static u8 const lit_4495[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AB5918, &lit_4495); +COMPILER_STRIP_GATE(0x80AB5918, &lit_4495); #pragma pop /* 80AB5924-80AB5928 00011C 0004+00 0/1 0/0 0/0 .rodata @4543 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4543 = -80.0f; -COMPILER_STRIP_GATE(80AB5924, &lit_4543); +COMPILER_STRIP_GATE(0x80AB5924, &lit_4543); #pragma pop /* 80AB5928-80AB592C 000120 0004+00 0/1 0/0 0/0 .rodata @4544 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4544 = 80.0f; -COMPILER_STRIP_GATE(80AB5928, &lit_4544); +COMPILER_STRIP_GATE(0x80AB5928, &lit_4544); #pragma pop /* 80AB592C-80AB5930 000124 0004+00 0/1 0/0 0/0 .rodata @4545 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4545 = 40.0f; -COMPILER_STRIP_GATE(80AB592C, &lit_4545); +COMPILER_STRIP_GATE(0x80AB592C, &lit_4545); #pragma pop /* 80AB4020-80AB4200 001320 01E0+00 1/1 0/0 0/0 .text lookat__11daNpcPray_cFv */ @@ -1216,7 +1223,7 @@ asm void daNpcPray_c::chkFindPlayer() { SECTION_RODATA static u8 const lit_4653[8] = { 0x40, 0x7F, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AB5930, &lit_4653); +COMPILER_STRIP_GATE(0x80AB5930, &lit_4653); #pragma pop /* 80AB5938-80AB5940 000130 0008+00 0/1 0/0 0/0 .rodata @4654 */ @@ -1225,7 +1232,7 @@ COMPILER_STRIP_GATE(80AB5930, &lit_4653); SECTION_RODATA static u8 const lit_4654[8] = { 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AB5938, &lit_4654); +COMPILER_STRIP_GATE(0x80AB5938, &lit_4654); #pragma pop /* 80AB43D8-80AB4674 0016D8 029C+00 3/0 0/0 0/0 .text wait__11daNpcPray_cFPv */ @@ -1273,35 +1280,35 @@ asm void daNpcPray_c::demo(void* param_0) { #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4765 = 0xC58175A1; -COMPILER_STRIP_GATE(80AB5940, &lit_4765); +COMPILER_STRIP_GATE(0x80AB5940, &lit_4765); #pragma pop /* 80AB5944-80AB5948 00013C 0004+00 0/1 0/0 0/0 .rodata @4766 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4766 = 850.0f; -COMPILER_STRIP_GATE(80AB5944, &lit_4766); +COMPILER_STRIP_GATE(0x80AB5944, &lit_4766); #pragma pop /* 80AB5948-80AB594C 000140 0004+00 0/1 0/0 0/0 .rodata @4767 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4767 = 0xC40E5807; -COMPILER_STRIP_GATE(80AB5948, &lit_4767); +COMPILER_STRIP_GATE(0x80AB5948, &lit_4767); #pragma pop /* 80AB594C-80AB5950 000144 0004+00 0/1 0/0 0/0 .rodata @4768 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4768 = 3.0f / 10.0f; -COMPILER_STRIP_GATE(80AB594C, &lit_4768); +COMPILER_STRIP_GATE(0x80AB594C, &lit_4768); #pragma pop /* 80AB5950-80AB5954 000148 0004+00 0/1 0/0 0/0 .rodata @4769 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4769 = 95.0f; -COMPILER_STRIP_GATE(80AB5950, &lit_4769); +COMPILER_STRIP_GATE(0x80AB5950, &lit_4769); #pragma pop /* 80AB4B20-80AB4BFC 001E20 00DC+00 1/1 0/0 0/0 .text createHeart__11daNpcPray_cFv */ @@ -1314,6 +1321,13 @@ asm void daNpcPray_c::createHeart() { } #pragma pop +/* ############################################################################################## */ +/* 80AB5964-80AB5964 00015C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80AB597E = "cutId"; +#pragma pop + /* 80AB4BFC-80AB4CA4 001EFC 00A8+00 1/0 0/0 0/0 .text _Evt_GetHeart__11daNpcPray_cFi */ #pragma push #pragma optimization_level 0 @@ -1329,14 +1343,14 @@ asm void daNpcPray_c::_Evt_GetHeart(int param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4800 = -3.0f; -COMPILER_STRIP_GATE(80AB5954, &lit_4800); +COMPILER_STRIP_GATE(0x80AB5954, &lit_4800); #pragma pop /* 80AB5958-80AB595C 000150 0004+00 0/2 0/0 0/0 .rodata @4801 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4801 = -4.0f; -COMPILER_STRIP_GATE(80AB5958, &lit_4801); +COMPILER_STRIP_GATE(0x80AB5958, &lit_4801); #pragma pop /* 80AB4CA4-80AB4D34 001FA4 0090+00 1/1 0/0 0/0 .text _Evt_GetHeart_CutInit__11daNpcPray_cFRCi */ @@ -1354,14 +1368,14 @@ asm void daNpcPray_c::_Evt_GetHeart_CutInit(int const& param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4840 = 110.0f; -COMPILER_STRIP_GATE(80AB595C, &lit_4840); +COMPILER_STRIP_GATE(0x80AB595C, &lit_4840); #pragma pop /* 80AB5960-80AB5964 000158 0004+00 0/1 0/0 0/0 .rodata @4841 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4841 = -300.0f; -COMPILER_STRIP_GATE(80AB5960, &lit_4841); +COMPILER_STRIP_GATE(0x80AB5960, &lit_4841); #pragma pop /* 80AB4D34-80AB4E88 002034 0154+00 1/1 0/0 0/0 .text _Evt_GetHeart_CutMain__11daNpcPray_cFRCi */ @@ -1605,7 +1619,7 @@ asm void __sinit_d_a_npc_prayer_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80AB5710 = (void*)__sinit_d_a_npc_prayer_cpp; +REGISTER_CTORS(0x80AB5710, __sinit_d_a_npc_prayer_cpp); #pragma pop /* 80AB5798-80AB579C 002A98 0004+00 1/0 0/0 0/0 .text adjustShapeAngle__11daNpcPray_cFv @@ -1644,12 +1658,4 @@ static asm void func_80AB57EC() { } #pragma pop -/* 80AB5964-80AB5984 00015C 0020+00 5/2 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80AB5964 = "Prayer"; -SECTION_DEAD static char const* const stringBase_80AB596B = "Wgeneral"; -SECTION_DEAD static char const* const stringBase_80AB5974 = "GET_HEART"; -SECTION_DEAD static char const* const stringBase_80AB597E = "cutId"; -#pragma pop +/* 80AB5964-80AB5964 00015C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/npc/d_a_npc_raca/d_a_npc_raca.cpp b/rel/d/a/npc/d_a_npc_raca/d_a_npc_raca.cpp index a3d7315d73c..d83ffdeee7f 100644 --- a/rel/d/a/npc/d_a_npc_raca/d_a_npc_raca.cpp +++ b/rel/d/a/npc/d_a_npc_raca/d_a_npc_raca.cpp @@ -15,12 +15,14 @@ struct mDoMtx_stack_c { static u8 now[48]; }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; +struct J3DAnmTransform {}; + +struct J3DModelData {}; + struct Vec {}; struct Z2Creature { @@ -29,8 +31,6 @@ struct Z2Creature { /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -54,6 +54,8 @@ struct daTag_EvtArea_c { /* 8048C94C */ void chkPointInArea(cXyz, cXyz); }; +struct daNpcT_faceMotionAnmData_c {}; + struct daNpcT_MotionSeqMngr_c { struct sequenceStepData_c {}; @@ -61,14 +63,12 @@ struct daNpcT_MotionSeqMngr_c { /* 80AB86A4 */ ~daNpcT_MotionSeqMngr_c(); }; +struct daNpcT_evtData_c {}; + struct daNpcT_motionAnmData_c {}; struct J3DJoint {}; -struct daNpcT_faceMotionAnmData_c {}; - -struct daNpcT_evtData_c {}; - struct daNpc_Raca_c { /* 80AB5CAC */ ~daNpc_Raca_c(); /* 80AB5DFC */ void create(); @@ -128,10 +128,10 @@ struct dCcD_GObjInf { /* 800840E4 */ ~dCcD_GObjInf(); }; -struct J3DModel {}; - struct _GXColorS10 {}; +struct J3DModel {}; + struct daNpcT_c { /* 80147FA4 */ void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*); /* 801483F8 */ void loadRes(s8 const*, char const**); @@ -234,6 +234,11 @@ struct dRes_control_c { /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); }; +struct csXyz { + /* 80AB8004 */ ~csXyz(); + /* 80AB85A0 */ csXyz(); +}; + struct dBgS_AcchCir { /* 80075EAC */ dBgS_AcchCir(); /* 80075F40 */ void SetWallR(f32); @@ -242,11 +247,6 @@ struct dBgS_AcchCir { struct dBgS {}; -struct csXyz { - /* 80AB8004 */ ~csXyz(); - /* 80AB85A0 */ csXyz(); -}; - struct dBgS_Acch { /* 80075F94 */ ~dBgS_Acch(); /* 800760A0 */ dBgS_Acch(); @@ -640,6 +640,14 @@ extern "C" void __register_global_object(); // /* ############################################################################################## */ +/* 80AB8FA8-80AB8FA8 0000E0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80AB8FA8 = ""; +SECTION_DEAD static char const* const stringBase_80AB8FA9 = "NO_RESPONSE"; +SECTION_DEAD static char const* const stringBase_80AB8FB5 = "Raca"; +#pragma pop + /* 80AB8FBC-80AB8FC8 000000 000C+00 2/2 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -1010,34 +1018,34 @@ SECTION_RODATA u8 const daNpc_Raca_Param_c::m[140] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AB8EC8, &daNpc_Raca_Param_c::m); +COMPILER_STRIP_GATE(0x80AB8EC8, &daNpc_Raca_Param_c::m); /* 80AB8F54-80AB8F58 00008C 0004+00 0/1 0/0 0/0 .rodata @4036 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4036 = -300.0f; -COMPILER_STRIP_GATE(80AB8F54, &lit_4036); +COMPILER_STRIP_GATE(0x80AB8F54, &lit_4036); #pragma pop /* 80AB8F58-80AB8F5C 000090 0004+00 0/1 0/0 0/0 .rodata @4037 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4037 = -50.0f; -COMPILER_STRIP_GATE(80AB8F58, &lit_4037); +COMPILER_STRIP_GATE(0x80AB8F58, &lit_4037); #pragma pop /* 80AB8F5C-80AB8F60 000094 0004+00 0/1 0/0 0/0 .rodata @4038 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4038 = 300.0f; -COMPILER_STRIP_GATE(80AB8F5C, &lit_4038); +COMPILER_STRIP_GATE(0x80AB8F5C, &lit_4038); #pragma pop /* 80AB8F60-80AB8F64 000098 0004+00 0/1 0/0 0/0 .rodata @4039 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4039 = 450.0f; -COMPILER_STRIP_GATE(80AB8F60, &lit_4039); +COMPILER_STRIP_GATE(0x80AB8F60, &lit_4039); #pragma pop /* 80AB8F64-80AB8F68 00009C 0004+00 6/11 0/0 0/0 .rodata @4040 */ @@ -1047,13 +1055,13 @@ SECTION_RODATA static u8 const lit_4040[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AB8F64, &lit_4040); +COMPILER_STRIP_GATE(0x80AB8F64, &lit_4040); /* 80AB8F68-80AB8F6C 0000A0 0004+00 0/1 0/0 0/0 .rodata @4041 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4041 = -1000000000.0f; -COMPILER_STRIP_GATE(80AB8F68, &lit_4041); +COMPILER_STRIP_GATE(0x80AB8F68, &lit_4041); #pragma pop /* 80AB5DFC-80AB60B8 00023C 02BC+00 1/1 0/0 0/0 .text create__12daNpc_Raca_cFv */ @@ -1071,19 +1079,19 @@ asm void daNpc_Raca_c::create() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4203 = 65536.0f; -COMPILER_STRIP_GATE(80AB8F6C, &lit_4203); +COMPILER_STRIP_GATE(0x80AB8F6C, &lit_4203); #pragma pop /* 80AB8F70-80AB8F74 0000A8 0004+00 0/3 0/0 0/0 .rodata @4204 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4204 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(80AB8F70, &lit_4204); +COMPILER_STRIP_GATE(0x80AB8F70, &lit_4204); #pragma pop /* 80AB8F74-80AB8F78 0000AC 0004+00 2/4 0/0 0/0 .rodata @4353 */ SECTION_RODATA static f32 const lit_4353 = 1.0f; -COMPILER_STRIP_GATE(80AB8F74, &lit_4353); +COMPILER_STRIP_GATE(0x80AB8F74, &lit_4353); /* 80AB60B8-80AB6358 0004F8 02A0+00 1/1 0/0 0/0 .text CreateHeap__12daNpc_Raca_cFv */ #pragma push @@ -1218,7 +1226,7 @@ asm void daNpc_Raca_c::Execute() { /* ############################################################################################## */ /* 80AB8F78-80AB8F7C 0000B0 0004+00 1/1 0/0 0/0 .rodata @4402 */ SECTION_RODATA static f32 const lit_4402 = 100.0f; -COMPILER_STRIP_GATE(80AB8F78, &lit_4402); +COMPILER_STRIP_GATE(0x80AB8F78, &lit_4402); /* 80AB6568-80AB65FC 0009A8 0094+00 1/1 0/0 0/0 .text Draw__12daNpc_Raca_cFv */ #pragma push @@ -1325,7 +1333,7 @@ asm void daNpc_Raca_c::setParam() { /* ############################################################################################## */ /* 80AB8F7C-80AB8F80 0000B4 0004+00 3/3 0/0 0/0 .rodata @4579 */ SECTION_RODATA static f32 const lit_4579 = -1.0f; -COMPILER_STRIP_GATE(80AB8F7C, &lit_4579); +COMPILER_STRIP_GATE(0x80AB8F7C, &lit_4579); /* 80AB6B0C-80AB6BB0 000F4C 00A4+00 1/0 0/0 0/0 .text setAfterTalkMotion__12daNpc_Raca_cFv */ #pragma push @@ -1392,21 +1400,21 @@ asm void daNpc_Raca_c::beforeMove() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4705 = 30.0f; -COMPILER_STRIP_GATE(80AB8F80, &lit_4705); +COMPILER_STRIP_GATE(0x80AB8F80, &lit_4705); #pragma pop /* 80AB8F84-80AB8F88 0000BC 0004+00 0/1 0/0 0/0 .rodata @4706 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4706 = 0x38C90FDB; -COMPILER_STRIP_GATE(80AB8F84, &lit_4706); +COMPILER_STRIP_GATE(0x80AB8F84, &lit_4706); #pragma pop /* 80AB8F88-80AB8F90 0000C0 0008+00 1/3 0/0 0/0 .rodata @4708 */ SECTION_RODATA static u8 const lit_4708[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AB8F88, &lit_4708); +COMPILER_STRIP_GATE(0x80AB8F88, &lit_4708); /* 80AB6F40-80AB7180 001380 0240+00 1/0 0/0 0/0 .text setAttnPos__12daNpc_Raca_cFv */ #pragma push @@ -1448,7 +1456,7 @@ asm void daNpc_Raca_c::selectAction() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpc_Raca_c::chkAction(int (daNpc_Raca_c::*)(void*)) { +asm void daNpc_Raca_c::chkAction(int (daNpc_Raca_c::*param_0)(void*)) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_raca/d_a_npc_raca/chkAction__12daNpc_Raca_cFM12daNpc_Raca_cFPCvPvPv_i.s" } @@ -1459,7 +1467,7 @@ asm void daNpc_Raca_c::chkAction(int (daNpc_Raca_c::*)(void*)) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpc_Raca_c::setAction(int (daNpc_Raca_c::*)(void*)) { +asm void daNpc_Raca_c::setAction(int (daNpc_Raca_c::*param_0)(void*)) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_raca/d_a_npc_raca/setAction__12daNpc_Raca_cFM12daNpc_Raca_cFPCvPvPv_i.s" } @@ -1744,7 +1752,7 @@ asm void daNpcT_JntAnm_c::setEyeAngleY(cXyz param_0, s16 param_1, int param_2, f SECTION_RODATA static u8 const lit_4766[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AB8F90, &lit_4766); +COMPILER_STRIP_GATE(0x80AB8F90, &lit_4766); #pragma pop /* 80AB8F98-80AB8FA0 0000D0 0008+00 0/1 0/0 0/0 .rodata @4767 */ @@ -1753,7 +1761,7 @@ COMPILER_STRIP_GATE(80AB8F90, &lit_4766); SECTION_RODATA static u8 const lit_4767[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AB8F98, &lit_4767); +COMPILER_STRIP_GATE(0x80AB8F98, &lit_4767); #pragma pop /* 80AB8FA0-80AB8FA8 0000D8 0008+00 0/1 0/0 0/0 .rodata @4768 */ @@ -1762,7 +1770,7 @@ COMPILER_STRIP_GATE(80AB8F98, &lit_4767); SECTION_RODATA static u8 const lit_4768[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AB8FA0, &lit_4768); +COMPILER_STRIP_GATE(0x80AB8FA0, &lit_4768); #pragma pop /* 80AB898C-80AB8B94 002DCC 0208+00 1/1 0/0 0/0 .text setEyeAngleX__15daNpcT_JntAnm_cF4cXyzfs */ @@ -1911,7 +1919,7 @@ asm void __sinit_d_a_npc_raca_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80AB8C64 = (void*)__sinit_d_a_npc_raca_cpp; +REGISTER_CTORS(0x80AB8C64, __sinit_d_a_npc_raca_cpp); #pragma pop /* 80AB8CCC-80AB8DAC 00310C 00E0+00 1/1 0/0 0/0 .text @@ -2025,11 +2033,4 @@ asm void daTag_EvtArea_c::chkPointInArea(cXyz param_0) { } #pragma pop -/* 80AB8FA8-80AB8FBA 0000E0 0012+00 4/1 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80AB8FA8 = ""; -SECTION_DEAD static char const* const stringBase_80AB8FA9 = "NO_RESPONSE"; -SECTION_DEAD static char const* const stringBase_80AB8FB5 = "Raca"; -#pragma pop +/* 80AB8FA8-80AB8FA8 0000E0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/npc/d_a_npc_rafrel/d_a_npc_rafrel.cpp b/rel/d/a/npc/d_a_npc_rafrel/d_a_npc_rafrel.cpp index bb855be5654..e3012eead3d 100644 --- a/rel/d/a/npc/d_a_npc_rafrel/d_a_npc_rafrel.cpp +++ b/rel/d/a/npc/d_a_npc_rafrel/d_a_npc_rafrel.cpp @@ -23,12 +23,12 @@ struct mDoExt_bckAnm { /* 8000D990 */ void changeBckOnly(J3DAnmTransform*); }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; +struct J3DModelData {}; + struct Vec {}; struct Z2Creature { @@ -50,10 +50,10 @@ struct fopAc_ac_c { /* 80018C8C */ ~fopAc_ac_c(); }; -struct J3DJoint {}; - struct J3DModel {}; +struct J3DJoint {}; + struct daNpcRafrel_c { /* 80AB962C */ daNpcRafrel_c(); /* 80AB9840 */ ~daNpcRafrel_c(); @@ -100,16 +100,16 @@ struct daNpcRafrel_Param_c { static u8 const m[116]; }; -struct J3DAnmTextureSRTKey {}; - -struct _GXColorS10 {}; - struct J3DAnmTexPattern { /* 8032AF50 */ void getTexNo(u16, u16*) const; }; +struct J3DAnmTextureSRTKey {}; + struct J3DAnmTransformKey {}; +struct _GXColorS10 {}; + struct daNpcF_c { struct daNpcF_anmPlayData {}; @@ -217,7 +217,6 @@ struct dEvt_control_c { /* 80042468 */ void reset(); /* 80042518 */ void reset(void*); /* 800432EC */ void convPId(unsigned int); - /* 800436EC */ void setPtI_Id(unsigned int); }; struct dEvent_manager_c { @@ -329,7 +328,7 @@ struct JMath { struct TSinCosTable {}; /* TSinCosTable<13, f32> */ struct TSinCosTable__template0 { - /* 80ABF07C */ void func_80ABF07C(s16) /* const */; + /* 80ABF07C */ void func_80ABF07C(void* _this, s16) /* const */; }; static u8 sincosTable_[65536]; @@ -438,7 +437,7 @@ extern "C" void ctrlBtk__13daNpcRafrel_cFv(); extern "C" void setAttnPos__13daNpcRafrel_cFv(); extern "C" void lookat__13daNpcRafrel_cFv(); extern "C" bool drawDbgInfo__13daNpcRafrel_cFv(); -extern "C" void func_80ABF07C(s16); +extern "C" void func_80ABF07C(void* _this, s16); extern "C" void __sinit_d_a_npc_rafrel_cpp(); extern "C" void __dt__18daNpcF_ActorMngr_cFv(); extern "C" void __ct__18daNpcF_ActorMngr_cFv(); @@ -635,6 +634,22 @@ extern "C" void __register_global_object(); // /* ############################################################################################## */ +/* 80ABFDBC-80ABFDBC 0003DC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80ABFDBC = "Rafrel"; +SECTION_DEAD static char const* const stringBase_80ABFDC3 = "Rafrel1"; +SECTION_DEAD static char const* const stringBase_80ABFDCB = "Rafrel2"; +SECTION_DEAD static char const* const stringBase_80ABFDD3 = "Rafrel3"; +SECTION_DEAD static char const* const stringBase_80ABFDDB = ""; +SECTION_DEAD static char const* const stringBase_80ABFDDC = "THE_INTRODUCTION"; +SECTION_DEAD static char const* const stringBase_80ABFDED = "RESIST_MEETING"; +SECTION_DEAD static char const* const stringBase_80ABFDFC = "RAFREL_APPEAR"; +SECTION_DEAD static char const* const stringBase_80ABFE0A = "RESIST_WIRETAP_ASH"; +SECTION_DEAD static char const* const stringBase_80ABFE1D = "RESIST_WIRETAP_SHAD"; +SECTION_DEAD static char const* const stringBase_80ABFE31 = "RESIST_WIRETAP_RAFREL"; +#pragma pop + /* 80ABFE80-80ABFE8C 000000 000C+00 6/6 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -1068,34 +1083,42 @@ SECTION_RODATA u8 const daNpcRafrel_Param_c::m[116] = { 0x00, 0x00, 0xC3, 0x96, 0x00, 0x00, 0x00, 0x3C, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x43, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80ABF9E0, &daNpcRafrel_Param_c::m); +COMPILER_STRIP_GATE(0x80ABF9E0, &daNpcRafrel_Param_c::m); /* 80ABFA54-80ABFA58 000074 0004+00 0/1 0/0 0/0 .rodata @4245 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4245 = -160.0f; -COMPILER_STRIP_GATE(80ABFA54, &lit_4245); +COMPILER_STRIP_GATE(0x80ABFA54, &lit_4245); #pragma pop /* 80ABFA58-80ABFA5C 000078 0004+00 0/1 0/0 0/0 .rodata @4246 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4246 = -50.0f; -COMPILER_STRIP_GATE(80ABFA58, &lit_4246); +COMPILER_STRIP_GATE(0x80ABFA58, &lit_4246); #pragma pop /* 80ABFA5C-80ABFA60 00007C 0004+00 0/2 0/0 0/0 .rodata @4247 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4247 = 160.0f; -COMPILER_STRIP_GATE(80ABFA5C, &lit_4247); +COMPILER_STRIP_GATE(0x80ABFA5C, &lit_4247); #pragma pop /* 80ABFA60-80ABFA64 000080 0004+00 0/2 0/0 0/0 .rodata @4248 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4248 = 220.0f; -COMPILER_STRIP_GATE(80ABFA60, &lit_4248); +COMPILER_STRIP_GATE(0x80ABFA60, &lit_4248); +#pragma pop + +/* 80ABFDBC-80ABFDBC 0003DC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80ABFE47 = "R_SP116"; +SECTION_DEAD static char const* const stringBase_80ABFE4F = "F_SP115"; +SECTION_DEAD static char const* const stringBase_80ABFE57 = "D_MN09"; #pragma pop /* 80AB9A40-80AB9E3C 000500 03FC+00 1/1 0/0 0/0 .text Create__13daNpcRafrel_cFv */ @@ -1111,7 +1134,7 @@ asm void daNpcRafrel_c::Create() { /* ############################################################################################## */ /* 80ABFA64-80ABFA68 000084 0004+00 4/5 0/0 0/0 .rodata @4320 */ SECTION_RODATA static f32 const lit_4320 = 1.0f; -COMPILER_STRIP_GATE(80ABFA64, &lit_4320); +COMPILER_STRIP_GATE(0x80ABFA64, &lit_4320); /* 80ABFA68-80ABFA6C 000088 0004+00 2/9 0/0 0/0 .rodata @4321 */ SECTION_RODATA static u8 const lit_4321[4] = { @@ -1120,7 +1143,7 @@ SECTION_RODATA static u8 const lit_4321[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80ABFA68, &lit_4321); +COMPILER_STRIP_GATE(0x80ABFA68, &lit_4321); /* 80AB9E3C-80ABA1C4 0008FC 0388+00 1/1 0/0 0/0 .text CreateHeap__13daNpcRafrel_cFv */ #pragma push @@ -1267,7 +1290,7 @@ asm void daNpcRafrel_c::Draw() { SECTION_RODATA static u8 const lit_4390[12] = { 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x04, }; -COMPILER_STRIP_GATE(80ABFA6C, &lit_4390); +COMPILER_STRIP_GATE(0x80ABFA6C, &lit_4390); /* 80ABA4A8-80ABA678 000F68 01D0+00 1/1 0/0 0/0 .text * ctrlJoint__13daNpcRafrel_cFP8J3DJointP8J3DModel */ @@ -1370,7 +1393,7 @@ asm void daNpcRafrel_c::isSneaking() { SECTION_RODATA static u8 const lit_4491[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80ABFA78, &lit_4491); +COMPILER_STRIP_GATE(0x80ABFA78, &lit_4491); #pragma pop /* 80ABFA84-80ABFA90 0000A4 000C+00 0/1 0/0 0/0 .rodata @4684 */ @@ -1379,7 +1402,7 @@ COMPILER_STRIP_GATE(80ABFA78, &lit_4491); SECTION_RODATA static u8 const lit_4684[12] = { 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80ABFA84, &lit_4684); +COMPILER_STRIP_GATE(0x80ABFA84, &lit_4684); #pragma pop /* 80ABFA90-80ABFA94 0000B0 0004+00 0/1 0/0 0/0 .rodata @4685 */ @@ -1391,7 +1414,7 @@ SECTION_RODATA static u8 const lit_4685[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80ABFA90, &lit_4685); +COMPILER_STRIP_GATE(0x80ABFA90, &lit_4685); #pragma pop /* 80ABFA94-80ABFAA0 0000B4 000C+00 0/1 0/0 0/0 .rodata @4686 */ @@ -1400,7 +1423,7 @@ COMPILER_STRIP_GATE(80ABFA90, &lit_4685); SECTION_RODATA static u8 const lit_4686[12] = { 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80ABFA94, &lit_4686); +COMPILER_STRIP_GATE(0x80ABFA94, &lit_4686); #pragma pop /* 80ABFAA0-80ABFAA4 0000C0 0004+00 0/1 0/0 0/0 .rodata @4687 */ @@ -1412,7 +1435,7 @@ SECTION_RODATA static u8 const lit_4687[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80ABFAA0, &lit_4687); +COMPILER_STRIP_GATE(0x80ABFAA0, &lit_4687); #pragma pop /* 80ABFAA4-80ABFAB0 0000C4 000C+00 0/1 0/0 0/0 .rodata @4688 */ @@ -1421,7 +1444,7 @@ COMPILER_STRIP_GATE(80ABFAA0, &lit_4687); SECTION_RODATA static u8 const lit_4688[12] = { 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80ABFAA4, &lit_4688); +COMPILER_STRIP_GATE(0x80ABFAA4, &lit_4688); #pragma pop /* 80ABFAB0-80ABFAB4 0000D0 0004+00 0/1 0/0 0/0 .rodata @4689 */ @@ -1433,7 +1456,7 @@ SECTION_RODATA static u8 const lit_4689[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80ABFAB0, &lit_4689); +COMPILER_STRIP_GATE(0x80ABFAB0, &lit_4689); #pragma pop /* 80ABFAB4-80ABFAC0 0000D4 000C+00 0/1 0/0 0/0 .rodata @4690 */ @@ -1442,7 +1465,7 @@ COMPILER_STRIP_GATE(80ABFAB0, &lit_4689); SECTION_RODATA static u8 const lit_4690[12] = { 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80ABFAB4, &lit_4690); +COMPILER_STRIP_GATE(0x80ABFAB4, &lit_4690); #pragma pop /* 80ABFAC0-80ABFAC4 0000E0 0004+00 0/1 0/0 0/0 .rodata @4691 */ @@ -1454,7 +1477,7 @@ SECTION_RODATA static u8 const lit_4691[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80ABFAC0, &lit_4691); +COMPILER_STRIP_GATE(0x80ABFAC0, &lit_4691); #pragma pop /* 80ABFAC4-80ABFAD0 0000E4 000C+00 0/1 0/0 0/0 .rodata @4692 */ @@ -1463,7 +1486,7 @@ COMPILER_STRIP_GATE(80ABFAC0, &lit_4691); SECTION_RODATA static u8 const lit_4692[12] = { 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80ABFAC4, &lit_4692); +COMPILER_STRIP_GATE(0x80ABFAC4, &lit_4692); #pragma pop /* 80ABFAD0-80ABFAD4 0000F0 0004+00 0/1 0/0 0/0 .rodata @4693 */ @@ -1475,7 +1498,7 @@ SECTION_RODATA static u8 const lit_4693[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80ABFAD0, &lit_4693); +COMPILER_STRIP_GATE(0x80ABFAD0, &lit_4693); #pragma pop /* 80ABFAD4-80ABFAE0 0000F4 000C+00 0/1 0/0 0/0 .rodata @4694 */ @@ -1484,7 +1507,7 @@ COMPILER_STRIP_GATE(80ABFAD0, &lit_4693); SECTION_RODATA static u8 const lit_4694[12] = { 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80ABFAD4, &lit_4694); +COMPILER_STRIP_GATE(0x80ABFAD4, &lit_4694); #pragma pop /* 80ABFAE0-80ABFAE4 000100 0004+00 0/1 0/0 0/0 .rodata @4695 */ @@ -1496,7 +1519,7 @@ SECTION_RODATA static u8 const lit_4695[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80ABFAE0, &lit_4695); +COMPILER_STRIP_GATE(0x80ABFAE0, &lit_4695); #pragma pop /* 80ABFAE4-80ABFAF0 000104 000C+00 0/1 0/0 0/0 .rodata @4696 */ @@ -1505,7 +1528,7 @@ COMPILER_STRIP_GATE(80ABFAE0, &lit_4695); SECTION_RODATA static u8 const lit_4696[12] = { 0x00, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80ABFAE4, &lit_4696); +COMPILER_STRIP_GATE(0x80ABFAE4, &lit_4696); #pragma pop /* 80ABFAF0-80ABFAF4 000110 0004+00 0/1 0/0 0/0 .rodata @4697 */ @@ -1517,7 +1540,7 @@ SECTION_RODATA static u8 const lit_4697[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80ABFAF0, &lit_4697); +COMPILER_STRIP_GATE(0x80ABFAF0, &lit_4697); #pragma pop /* 80ABFAF4-80ABFB00 000114 000C+00 0/1 0/0 0/0 .rodata @4698 */ @@ -1526,7 +1549,7 @@ COMPILER_STRIP_GATE(80ABFAF0, &lit_4697); SECTION_RODATA static u8 const lit_4698[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80ABFAF4, &lit_4698); +COMPILER_STRIP_GATE(0x80ABFAF4, &lit_4698); #pragma pop /* 80ABFB00-80ABFB04 000120 0004+00 0/1 0/0 0/0 .rodata @4699 */ @@ -1538,7 +1561,7 @@ SECTION_RODATA static u8 const lit_4699[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80ABFB00, &lit_4699); +COMPILER_STRIP_GATE(0x80ABFB00, &lit_4699); #pragma pop /* 80ABFB04-80ABFB24 000124 0020+00 0/0 0/0 0/0 .rodata @4700 */ @@ -1548,7 +1571,7 @@ SECTION_RODATA static u8 const lit_4700[32] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80ABFB04, &lit_4700); +COMPILER_STRIP_GATE(0x80ABFB04, &lit_4700); #pragma pop /* 80ABFB24-80ABFB30 000144 000C+00 0/1 0/0 0/0 .rodata @4704 */ @@ -1557,7 +1580,7 @@ COMPILER_STRIP_GATE(80ABFB04, &lit_4700); SECTION_RODATA static u8 const lit_4704[12] = { 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80ABFB24, &lit_4704); +COMPILER_STRIP_GATE(0x80ABFB24, &lit_4704); #pragma pop /* 80ABFB30-80ABFB34 000150 0004+00 0/1 0/0 0/0 .rodata @4705 */ @@ -1569,7 +1592,7 @@ SECTION_RODATA static u8 const lit_4705[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80ABFB30, &lit_4705); +COMPILER_STRIP_GATE(0x80ABFB30, &lit_4705); #pragma pop /* 80ABFB34-80ABFB40 000154 000C+00 0/1 0/0 0/0 .rodata @4706 */ @@ -1578,7 +1601,7 @@ COMPILER_STRIP_GATE(80ABFB30, &lit_4705); SECTION_RODATA static u8 const lit_4706[12] = { 0x00, 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80ABFB34, &lit_4706); +COMPILER_STRIP_GATE(0x80ABFB34, &lit_4706); #pragma pop /* 80ABFB40-80ABFB44 000160 0004+00 0/1 0/0 0/0 .rodata @4707 */ @@ -1590,7 +1613,7 @@ SECTION_RODATA static u8 const lit_4707[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80ABFB40, &lit_4707); +COMPILER_STRIP_GATE(0x80ABFB40, &lit_4707); #pragma pop /* 80ABFB44-80ABFB50 000164 000C+00 0/1 0/0 0/0 .rodata @4708 */ @@ -1599,7 +1622,7 @@ COMPILER_STRIP_GATE(80ABFB40, &lit_4707); SECTION_RODATA static u8 const lit_4708[12] = { 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80ABFB44, &lit_4708); +COMPILER_STRIP_GATE(0x80ABFB44, &lit_4708); #pragma pop /* 80ABFB50-80ABFB5C 000170 000C+00 0/1 0/0 0/0 .rodata @4709 */ @@ -1608,7 +1631,7 @@ COMPILER_STRIP_GATE(80ABFB44, &lit_4708); SECTION_RODATA static u8 const lit_4709[12] = { 0x00, 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80ABFB50, &lit_4709); +COMPILER_STRIP_GATE(0x80ABFB50, &lit_4709); #pragma pop /* 80ABFB5C-80ABFB64 00017C 0008+00 0/1 0/0 0/0 .rodata @4710 */ @@ -1617,7 +1640,7 @@ COMPILER_STRIP_GATE(80ABFB50, &lit_4709); SECTION_RODATA static u8 const lit_4710[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80ABFB5C, &lit_4710); +COMPILER_STRIP_GATE(0x80ABFB5C, &lit_4710); #pragma pop /* 80ABFB64-80ABFB70 000184 000C+00 0/1 0/0 0/0 .rodata @4711 */ @@ -1626,7 +1649,7 @@ COMPILER_STRIP_GATE(80ABFB5C, &lit_4710); SECTION_RODATA static u8 const lit_4711[12] = { 0x00, 0x15, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80ABFB64, &lit_4711); +COMPILER_STRIP_GATE(0x80ABFB64, &lit_4711); #pragma pop /* 80ABFB70-80ABFB74 000190 0004+00 0/1 0/0 0/0 .rodata @4712 */ @@ -1638,7 +1661,7 @@ SECTION_RODATA static u8 const lit_4712[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80ABFB70, &lit_4712); +COMPILER_STRIP_GATE(0x80ABFB70, &lit_4712); #pragma pop /* 80ABFB74-80ABFB80 000194 000C+00 0/1 0/0 0/0 .rodata @4713 */ @@ -1647,7 +1670,7 @@ COMPILER_STRIP_GATE(80ABFB70, &lit_4712); SECTION_RODATA static u8 const lit_4713[12] = { 0x00, 0x19, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80ABFB74, &lit_4713); +COMPILER_STRIP_GATE(0x80ABFB74, &lit_4713); #pragma pop /* 80ABFB80-80ABFB84 0001A0 0004+00 0/1 0/0 0/0 .rodata @4714 */ @@ -1659,7 +1682,7 @@ SECTION_RODATA static u8 const lit_4714[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80ABFB80, &lit_4714); +COMPILER_STRIP_GATE(0x80ABFB80, &lit_4714); #pragma pop /* 80ABFB84-80ABFB90 0001A4 000C+00 0/1 0/0 0/0 .rodata @4715 */ @@ -1668,7 +1691,7 @@ COMPILER_STRIP_GATE(80ABFB80, &lit_4714); SECTION_RODATA static u8 const lit_4715[12] = { 0x00, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80ABFB84, &lit_4715); +COMPILER_STRIP_GATE(0x80ABFB84, &lit_4715); #pragma pop /* 80ABFB90-80ABFB9C 0001B0 000C+00 0/1 0/0 0/0 .rodata @4716 */ @@ -1677,7 +1700,7 @@ COMPILER_STRIP_GATE(80ABFB84, &lit_4715); SECTION_RODATA static u8 const lit_4716[12] = { 0x00, 0x19, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80ABFB90, &lit_4716); +COMPILER_STRIP_GATE(0x80ABFB90, &lit_4716); #pragma pop /* 80ABFB9C-80ABFBA4 0001BC 0008+00 0/1 0/0 0/0 .rodata @4717 */ @@ -1686,7 +1709,7 @@ COMPILER_STRIP_GATE(80ABFB90, &lit_4716); SECTION_RODATA static u8 const lit_4717[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80ABFB9C, &lit_4717); +COMPILER_STRIP_GATE(0x80ABFB9C, &lit_4717); #pragma pop /* 80ABFBA4-80ABFBB0 0001C4 000C+00 0/1 0/0 0/0 .rodata @4718 */ @@ -1695,7 +1718,7 @@ COMPILER_STRIP_GATE(80ABFB9C, &lit_4717); SECTION_RODATA static u8 const lit_4718[12] = { 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80ABFBA4, &lit_4718); +COMPILER_STRIP_GATE(0x80ABFBA4, &lit_4718); #pragma pop /* 80ABFBB0-80ABFBBC 0001D0 000C+00 0/1 0/0 0/0 .rodata @4719 */ @@ -1704,7 +1727,7 @@ COMPILER_STRIP_GATE(80ABFBA4, &lit_4718); SECTION_RODATA static u8 const lit_4719[12] = { 0x00, 0x15, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80ABFBB0, &lit_4719); +COMPILER_STRIP_GATE(0x80ABFBB0, &lit_4719); #pragma pop /* 80ABFBBC-80ABFBC4 0001DC 0008+00 0/1 0/0 0/0 .rodata @4720 */ @@ -1713,7 +1736,7 @@ COMPILER_STRIP_GATE(80ABFBB0, &lit_4719); SECTION_RODATA static u8 const lit_4720[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80ABFBBC, &lit_4720); +COMPILER_STRIP_GATE(0x80ABFBBC, &lit_4720); #pragma pop /* 80ABFBC4-80ABFBD0 0001E4 000C+00 0/1 0/0 0/0 .rodata @4721 */ @@ -1722,7 +1745,7 @@ COMPILER_STRIP_GATE(80ABFBBC, &lit_4720); SECTION_RODATA static u8 const lit_4721[12] = { 0x00, 0x16, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80ABFBC4, &lit_4721); +COMPILER_STRIP_GATE(0x80ABFBC4, &lit_4721); #pragma pop /* 80ABFBD0-80ABFBDC 0001F0 000C+00 0/1 0/0 0/0 .rodata @4722 */ @@ -1731,7 +1754,7 @@ COMPILER_STRIP_GATE(80ABFBC4, &lit_4721); SECTION_RODATA static u8 const lit_4722[12] = { 0x00, 0x17, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80ABFBD0, &lit_4722); +COMPILER_STRIP_GATE(0x80ABFBD0, &lit_4722); #pragma pop /* 80ABFBDC-80ABFBE4 0001FC 0008+00 0/1 0/0 0/0 .rodata @4723 */ @@ -1740,7 +1763,7 @@ COMPILER_STRIP_GATE(80ABFBD0, &lit_4722); SECTION_RODATA static u8 const lit_4723[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80ABFBDC, &lit_4723); +COMPILER_STRIP_GATE(0x80ABFBDC, &lit_4723); #pragma pop /* 80ABFBE4-80ABFBF0 000204 000C+00 0/1 0/0 0/0 .rodata @4724 */ @@ -1749,7 +1772,7 @@ COMPILER_STRIP_GATE(80ABFBDC, &lit_4723); SECTION_RODATA static u8 const lit_4724[12] = { 0x00, 0x17, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80ABFBE4, &lit_4724); +COMPILER_STRIP_GATE(0x80ABFBE4, &lit_4724); #pragma pop /* 80ABFBF0-80ABFBF4 000210 0004+00 0/1 0/0 0/0 .rodata @4725 */ @@ -1761,7 +1784,7 @@ SECTION_RODATA static u8 const lit_4725[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80ABFBF0, &lit_4725); +COMPILER_STRIP_GATE(0x80ABFBF0, &lit_4725); #pragma pop /* 80ABFBF4-80ABFC00 000214 000C+00 0/1 0/0 0/0 .rodata @4726 */ @@ -1770,7 +1793,7 @@ COMPILER_STRIP_GATE(80ABFBF0, &lit_4725); SECTION_RODATA static u8 const lit_4726[12] = { 0x00, 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80ABFBF4, &lit_4726); +COMPILER_STRIP_GATE(0x80ABFBF4, &lit_4726); #pragma pop /* 80ABFC00-80ABFC04 000220 0004+00 0/1 0/0 0/0 .rodata @4727 */ @@ -1782,7 +1805,7 @@ SECTION_RODATA static u8 const lit_4727[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80ABFC00, &lit_4727); +COMPILER_STRIP_GATE(0x80ABFC00, &lit_4727); #pragma pop /* 80ABFC04-80ABFC10 000224 000C+00 0/1 0/0 0/0 .rodata @4728 */ @@ -1791,7 +1814,7 @@ COMPILER_STRIP_GATE(80ABFC00, &lit_4727); SECTION_RODATA static u8 const lit_4728[12] = { 0x00, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80ABFC04, &lit_4728); +COMPILER_STRIP_GATE(0x80ABFC04, &lit_4728); #pragma pop /* 80ABFC10-80ABFC1C 000230 000C+00 0/1 0/0 0/0 .rodata @4729 */ @@ -1800,7 +1823,7 @@ COMPILER_STRIP_GATE(80ABFC04, &lit_4728); SECTION_RODATA static u8 const lit_4729[12] = { 0x00, 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80ABFC10, &lit_4729); +COMPILER_STRIP_GATE(0x80ABFC10, &lit_4729); #pragma pop /* 80ABFC1C-80ABFC24 00023C 0008+00 0/1 0/0 0/0 .rodata @4730 */ @@ -1809,7 +1832,7 @@ COMPILER_STRIP_GATE(80ABFC10, &lit_4729); SECTION_RODATA static u8 const lit_4730[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80ABFC1C, &lit_4730); +COMPILER_STRIP_GATE(0x80ABFC1C, &lit_4730); #pragma pop /* 80ABFC24-80ABFC30 000244 000C+00 0/1 0/0 0/0 .rodata @4731 */ @@ -1818,7 +1841,7 @@ COMPILER_STRIP_GATE(80ABFC1C, &lit_4730); SECTION_RODATA static u8 const lit_4731[12] = { 0x00, 0x0B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80ABFC24, &lit_4731); +COMPILER_STRIP_GATE(0x80ABFC24, &lit_4731); #pragma pop /* 80ABFC30-80ABFC3C 000250 000C+00 0/1 0/0 0/0 .rodata @4732 */ @@ -1827,7 +1850,7 @@ COMPILER_STRIP_GATE(80ABFC24, &lit_4731); SECTION_RODATA static u8 const lit_4732[12] = { 0x00, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80ABFC30, &lit_4732); +COMPILER_STRIP_GATE(0x80ABFC30, &lit_4732); #pragma pop /* 80ABFC3C-80ABFC44 00025C 0008+00 0/1 0/0 0/0 .rodata @4733 */ @@ -1836,7 +1859,7 @@ COMPILER_STRIP_GATE(80ABFC30, &lit_4732); SECTION_RODATA static u8 const lit_4733[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80ABFC3C, &lit_4733); +COMPILER_STRIP_GATE(0x80ABFC3C, &lit_4733); #pragma pop /* 80ABFC44-80ABFC50 000264 000C+00 0/1 0/0 0/0 .rodata @4734 */ @@ -1845,7 +1868,7 @@ COMPILER_STRIP_GATE(80ABFC3C, &lit_4733); SECTION_RODATA static u8 const lit_4734[12] = { 0x00, 0x0F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80ABFC44, &lit_4734); +COMPILER_STRIP_GATE(0x80ABFC44, &lit_4734); #pragma pop /* 80ABFC50-80ABFC5C 000270 000C+00 0/1 0/0 0/0 .rodata @4735 */ @@ -1854,7 +1877,7 @@ COMPILER_STRIP_GATE(80ABFC44, &lit_4734); SECTION_RODATA static u8 const lit_4735[12] = { 0x00, 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80ABFC50, &lit_4735); +COMPILER_STRIP_GATE(0x80ABFC50, &lit_4735); #pragma pop /* 80ABFC5C-80ABFC64 00027C 0008+00 0/1 0/0 0/0 .rodata @4736 */ @@ -1863,7 +1886,7 @@ COMPILER_STRIP_GATE(80ABFC50, &lit_4735); SECTION_RODATA static u8 const lit_4736[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80ABFC5C, &lit_4736); +COMPILER_STRIP_GATE(0x80ABFC5C, &lit_4736); #pragma pop /* 80ABFC64-80ABFC70 000284 000C+00 0/1 0/0 0/0 .rodata @4737 */ @@ -1872,7 +1895,7 @@ COMPILER_STRIP_GATE(80ABFC5C, &lit_4736); SECTION_RODATA static u8 const lit_4737[12] = { 0x00, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80ABFC64, &lit_4737); +COMPILER_STRIP_GATE(0x80ABFC64, &lit_4737); #pragma pop /* 80ABFC70-80ABFC74 000290 0004+00 0/1 0/0 0/0 .rodata @4738 */ @@ -1884,7 +1907,7 @@ SECTION_RODATA static u8 const lit_4738[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80ABFC70, &lit_4738); +COMPILER_STRIP_GATE(0x80ABFC70, &lit_4738); #pragma pop /* 80ABFC74-80ABFC80 000294 000C+00 0/1 0/0 0/0 .rodata @4739 */ @@ -1893,7 +1916,7 @@ COMPILER_STRIP_GATE(80ABFC70, &lit_4738); SECTION_RODATA static u8 const lit_4739[12] = { 0x00, 0x1A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80ABFC74, &lit_4739); +COMPILER_STRIP_GATE(0x80ABFC74, &lit_4739); #pragma pop /* 80ABFC80-80ABFC84 0002A0 0004+00 0/1 0/0 0/0 .rodata @4740 */ @@ -1905,7 +1928,7 @@ SECTION_RODATA static u8 const lit_4740[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80ABFC80, &lit_4740); +COMPILER_STRIP_GATE(0x80ABFC80, &lit_4740); #pragma pop /* 80ABFC84-80ABFC90 0002A4 000C+00 0/1 0/0 0/0 .rodata @4741 */ @@ -1914,7 +1937,7 @@ COMPILER_STRIP_GATE(80ABFC80, &lit_4740); SECTION_RODATA static u8 const lit_4741[12] = { 0x00, 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80ABFC84, &lit_4741); +COMPILER_STRIP_GATE(0x80ABFC84, &lit_4741); #pragma pop /* 80ABFC90-80ABFC9C 0002B0 000C+00 0/1 0/0 0/0 .rodata @4742 */ @@ -1923,7 +1946,7 @@ COMPILER_STRIP_GATE(80ABFC84, &lit_4741); SECTION_RODATA static u8 const lit_4742[12] = { 0x00, 0x1C, 0x00, 0x00, 0x40, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80ABFC90, &lit_4742); +COMPILER_STRIP_GATE(0x80ABFC90, &lit_4742); #pragma pop /* 80ABFC9C-80ABFCA4 0002BC 0008+00 0/1 0/0 0/0 .rodata @4743 */ @@ -1932,7 +1955,7 @@ COMPILER_STRIP_GATE(80ABFC90, &lit_4742); SECTION_RODATA static u8 const lit_4743[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80ABFC9C, &lit_4743); +COMPILER_STRIP_GATE(0x80ABFC9C, &lit_4743); #pragma pop /* 80ABFCA4-80ABFCB0 0002C4 000C+00 0/1 0/0 0/0 .rodata @4744 */ @@ -1941,7 +1964,7 @@ COMPILER_STRIP_GATE(80ABFC9C, &lit_4743); SECTION_RODATA static u8 const lit_4744[12] = { 0x00, 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80ABFCA4, &lit_4744); +COMPILER_STRIP_GATE(0x80ABFCA4, &lit_4744); #pragma pop /* 80ABFCB0-80ABFCB8 0002D0 0008+00 0/1 0/0 0/0 .rodata @4745 */ @@ -1950,7 +1973,7 @@ COMPILER_STRIP_GATE(80ABFCA4, &lit_4744); SECTION_RODATA static u8 const lit_4745[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80ABFCB0, &lit_4745); +COMPILER_STRIP_GATE(0x80ABFCB0, &lit_4745); #pragma pop /* 80ABFCB8-80ABFCC4 0002D8 000C+00 0/1 0/0 0/0 .rodata @4746 */ @@ -1959,7 +1982,7 @@ COMPILER_STRIP_GATE(80ABFCB0, &lit_4745); SECTION_RODATA static u8 const lit_4746[12] = { 0x00, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80ABFCB8, &lit_4746); +COMPILER_STRIP_GATE(0x80ABFCB8, &lit_4746); #pragma pop /* 80ABFCC4-80ABFCC8 0002E4 0004+00 0/1 0/0 0/0 .rodata @4747 */ @@ -1971,7 +1994,7 @@ SECTION_RODATA static u8 const lit_4747[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80ABFCC4, &lit_4747); +COMPILER_STRIP_GATE(0x80ABFCC4, &lit_4747); #pragma pop /* 80ABFCC8-80ABFCD4 0002E8 000C+00 0/1 0/0 0/0 .rodata @4748 */ @@ -1980,7 +2003,7 @@ COMPILER_STRIP_GATE(80ABFCC4, &lit_4747); SECTION_RODATA static u8 const lit_4748[12] = { 0x00, 0x0D, 0x00, 0x00, 0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80ABFCC8, &lit_4748); +COMPILER_STRIP_GATE(0x80ABFCC8, &lit_4748); #pragma pop /* 80ABFCD4-80ABFCD8 0002F4 0004+00 0/1 0/0 0/0 .rodata @4749 */ @@ -1992,7 +2015,7 @@ SECTION_RODATA static u8 const lit_4749[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80ABFCD4, &lit_4749); +COMPILER_STRIP_GATE(0x80ABFCD4, &lit_4749); #pragma pop /* 80ABFCD8-80ABFD24 0002F8 004C+00 0/0 0/0 0/0 .rodata @4750 */ @@ -2005,7 +2028,7 @@ SECTION_RODATA static u8 const lit_4750[76] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80ABFCD8, &lit_4750); +COMPILER_STRIP_GATE(0x80ABFCD8, &lit_4750); #pragma pop /* 80ABFD24-80ABFD30 000344 000C+00 0/1 0/0 0/0 .rodata @4787 */ @@ -2014,46 +2037,46 @@ COMPILER_STRIP_GATE(80ABFCD8, &lit_4750); SECTION_RODATA static u8 const lit_4787[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80ABFD24, &lit_4787); +COMPILER_STRIP_GATE(0x80ABFD24, &lit_4787); #pragma pop /* 80ABFD30-80ABFD34 000350 0004+00 5/10 0/0 0/0 .rodata @5080 */ SECTION_RODATA static f32 const lit_5080 = -1.0f; -COMPILER_STRIP_GATE(80ABFD30, &lit_5080); +COMPILER_STRIP_GATE(0x80ABFD30, &lit_5080); /* 80ABFD34-80ABFD38 000354 0004+00 0/1 0/0 0/0 .rodata @5081 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_5081 = 0x43360B61; -COMPILER_STRIP_GATE(80ABFD34, &lit_5081); +COMPILER_STRIP_GATE(0x80ABFD34, &lit_5081); #pragma pop /* 80ABFD38-80ABFD3C 000358 0004+00 0/4 0/0 0/0 .rodata @5082 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_5082 = 0x3BB40000; -COMPILER_STRIP_GATE(80ABFD38, &lit_5082); +COMPILER_STRIP_GATE(0x80ABFD38, &lit_5082); #pragma pop /* 80ABFD3C-80ABFD40 00035C 0004+00 0/4 0/0 0/0 .rodata @5083 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5083 = 15.0f; -COMPILER_STRIP_GATE(80ABFD3C, &lit_5083); +COMPILER_STRIP_GATE(0x80ABFD3C, &lit_5083); #pragma pop /* 80ABFD40-80ABFD44 000360 0004+00 0/1 0/0 0/0 .rodata @5084 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5084 = -200.0f; -COMPILER_STRIP_GATE(80ABFD40, &lit_5084); +COMPILER_STRIP_GATE(0x80ABFD40, &lit_5084); #pragma pop /* 80ABFD44-80ABFD48 000364 0004+00 0/1 0/0 0/0 .rodata @5085 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5085 = 200.0f; -COMPILER_STRIP_GATE(80ABFD44, &lit_5085); +COMPILER_STRIP_GATE(0x80ABFD44, &lit_5085); #pragma pop /* 80ABFD48-80ABFD50 000368 0004+04 0/1 0/0 0/0 .rodata @5086 */ @@ -2064,7 +2087,7 @@ SECTION_RODATA static f32 const lit_5086[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80ABFD48, &lit_5086); +COMPILER_STRIP_GATE(0x80ABFD48, &lit_5086); #pragma pop /* 80ABFD50-80ABFD58 000370 0008+00 0/4 0/0 0/0 .rodata @5088 */ @@ -2073,7 +2096,13 @@ COMPILER_STRIP_GATE(80ABFD48, &lit_5086); SECTION_RODATA static u8 const lit_5088[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80ABFD50, &lit_5088); +COMPILER_STRIP_GATE(0x80ABFD50, &lit_5088); +#pragma pop + +/* 80ABFDBC-80ABFDBC 0003DC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80ABFE5E = "NO_RESPONSE"; #pragma pop /* 80ABB014-80ABBB10 001AD4 0AFC+00 2/0 0/0 0/0 .text wait_type01__13daNpcRafrel_cFPv */ @@ -2112,14 +2141,14 @@ asm void daNpcRafrel_c::setExpression(int param_0, f32 param_1) { #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_5157 = 0xC58569FB; -COMPILER_STRIP_GATE(80ABFD58, &lit_5157); +COMPILER_STRIP_GATE(0x80ABFD58, &lit_5157); #pragma pop /* 80ABFD5C-80ABFD60 00037C 0004+00 0/1 0/0 0/0 .rodata @5158 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_5158 = 0x4603F0F9; -COMPILER_STRIP_GATE(80ABFD5C, &lit_5158); +COMPILER_STRIP_GATE(0x80ABFD5C, &lit_5158); #pragma pop /* 80ABBBDC-80ABBE84 00269C 02A8+00 1/0 0/0 0/0 .text wait_type2__13daNpcRafrel_cFPv */ @@ -2132,6 +2161,13 @@ asm void daNpcRafrel_c::wait_type2(void* param_0) { } #pragma pop +/* ############################################################################################## */ +/* 80ABFDBC-80ABFDBC 0003DC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80ABFE6A = "DEFAULT_GETITEM"; +#pragma pop + /* 80ABBE84-80ABC50C 002944 0688+00 2/0 0/0 0/0 .text talk__13daNpcRafrel_cFPv */ #pragma push #pragma optimization_level 0 @@ -2157,14 +2193,14 @@ asm void daNpcRafrel_c::demo(void* param_0) { #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_5376 = 0xC5C36B19; -COMPILER_STRIP_GATE(80ABFD60, &lit_5376); +COMPILER_STRIP_GATE(0x80ABFD60, &lit_5376); #pragma pop /* 80ABFD64-80ABFD68 000384 0004+00 0/1 0/0 0/0 .rodata @5377 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_5377 = 0x45C35E15; -COMPILER_STRIP_GATE(80ABFD64, &lit_5377); +COMPILER_STRIP_GATE(0x80ABFD64, &lit_5377); #pragma pop /* 80ABFD68-80ABFD70 000388 0004+04 0/1 0/0 0/0 .rodata @5378 */ @@ -2175,7 +2211,7 @@ SECTION_RODATA static f32 const lit_5378[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80ABFD68, &lit_5378); +COMPILER_STRIP_GATE(0x80ABFD68, &lit_5378); #pragma pop /* 80ABFD70-80ABFD78 000390 0008+00 0/3 0/0 0/0 .rodata @5379 */ @@ -2184,7 +2220,7 @@ COMPILER_STRIP_GATE(80ABFD68, &lit_5378); SECTION_RODATA static u8 const lit_5379[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80ABFD70, &lit_5379); +COMPILER_STRIP_GATE(0x80ABFD70, &lit_5379); #pragma pop /* 80ABFD78-80ABFD80 000398 0008+00 0/3 0/0 0/0 .rodata @5380 */ @@ -2193,7 +2229,7 @@ COMPILER_STRIP_GATE(80ABFD70, &lit_5379); SECTION_RODATA static u8 const lit_5380[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80ABFD78, &lit_5380); +COMPILER_STRIP_GATE(0x80ABFD78, &lit_5380); #pragma pop /* 80ABFD80-80ABFD88 0003A0 0008+00 0/3 0/0 0/0 .rodata @5381 */ @@ -2202,7 +2238,7 @@ COMPILER_STRIP_GATE(80ABFD78, &lit_5380); SECTION_RODATA static u8 const lit_5381[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80ABFD80, &lit_5381); +COMPILER_STRIP_GATE(0x80ABFD80, &lit_5381); #pragma pop /* 80ABCA40-80ABCD74 003500 0334+00 1/0 0/0 0/0 .text leave__13daNpcRafrel_cFPv */ @@ -2215,6 +2251,13 @@ asm void daNpcRafrel_c::leave(void* param_0) { } #pragma pop +/* ############################################################################################## */ +/* 80ABFDBC-80ABFDBC 0003DC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80ABFE7A = "prm"; +#pragma pop + /* 80ABCD74-80ABCE74 003834 0100+00 1/0 0/0 0/0 .text EvCut_Introduction__13daNpcRafrel_cFi */ #pragma push #pragma optimization_level 0 @@ -2240,7 +2283,7 @@ asm void daNpcRafrel_c::EvCut_Meeting(int param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5580 = 30.0f; -COMPILER_STRIP_GATE(80ABFD88, &lit_5580); +COMPILER_STRIP_GATE(0x80ABFD88, &lit_5580); #pragma pop /* 80ABD124-80ABD8A0 003BE4 077C+00 1/0 0/0 0/0 .text EvCut_Appear__13daNpcRafrel_cFi */ @@ -2258,7 +2301,7 @@ asm void daNpcRafrel_c::EvCut_Appear(int param_0) { SECTION_RODATA static u8 const lit_5583[16] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80ABFD8C, &lit_5583); +COMPILER_STRIP_GATE(0x80ABFD8C, &lit_5583); /* 80ABD8A0-80ABDB7C 004360 02DC+00 1/0 0/0 0/0 .text EvCut_WiretapSponsor__13daNpcRafrel_cFi */ #pragma push @@ -2340,14 +2383,14 @@ asm void J3DTexNoAnm::calc(u16* param_0) const { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5742 = 150.0f; -COMPILER_STRIP_GATE(80ABFD9C, &lit_5742); +COMPILER_STRIP_GATE(0x80ABFD9C, &lit_5742); #pragma pop /* 80ABFDA0-80ABFDA4 0003C0 0004+00 0/1 0/0 0/0 .rodata @5743 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5743 = 100.0f; -COMPILER_STRIP_GATE(80ABFDA0, &lit_5743); +COMPILER_STRIP_GATE(0x80ABFDA0, &lit_5743); #pragma pop /* 80ABDE9C-80ABE1D0 00495C 0334+00 1/0 0/0 0/0 .text setParam__13daNpcRafrel_cFv */ @@ -2383,7 +2426,7 @@ asm void daNpcRafrel_c::playMotion() { /* ############################################################################################## */ /* 80ABFDA4-80ABFDA8 0003C4 0004+00 1/1 0/0 0/0 .rodata @5819 */ SECTION_RODATA static f32 const lit_5819 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(80ABFDA4, &lit_5819); +COMPILER_STRIP_GATE(0x80ABFDA4, &lit_5819); /* 80ABE9FC-80ABEAD8 0054BC 00DC+00 1/0 0/0 0/0 .text ctrlBtk__13daNpcRafrel_cFv */ #pragma push @@ -2400,28 +2443,28 @@ asm void daNpcRafrel_c::ctrlBtk() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5923 = -15.0f; -COMPILER_STRIP_GATE(80ABFDA8, &lit_5923); +COMPILER_STRIP_GATE(0x80ABFDA8, &lit_5923); #pragma pop /* 80ABFDAC-80ABFDB0 0003CC 0004+00 0/1 0/0 0/0 .rodata @5924 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5924 = 10.0f; -COMPILER_STRIP_GATE(80ABFDAC, &lit_5924); +COMPILER_STRIP_GATE(0x80ABFDAC, &lit_5924); #pragma pop /* 80ABFDB0-80ABFDB4 0003D0 0004+00 0/1 0/0 0/0 .rodata @5925 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5925 = 2.0f; -COMPILER_STRIP_GATE(80ABFDB0, &lit_5925); +COMPILER_STRIP_GATE(0x80ABFDB0, &lit_5925); #pragma pop /* 80ABFDB4-80ABFDB8 0003D4 0004+00 0/1 0/0 0/0 .rodata @5926 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5926 = 50.0f; -COMPILER_STRIP_GATE(80ABFDB4, &lit_5926); +COMPILER_STRIP_GATE(0x80ABFDB4, &lit_5926); #pragma pop /* 80ABEAD8-80ABEE98 005598 03C0+00 1/0 0/0 0/0 .text setAttnPos__13daNpcRafrel_cFv */ @@ -2439,7 +2482,7 @@ asm void daNpcRafrel_c::setAttnPos() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5967 = 40.0f; -COMPILER_STRIP_GATE(80ABFDB8, &lit_5967); +COMPILER_STRIP_GATE(0x80ABFDB8, &lit_5967); #pragma pop /* 80ABEE98-80ABF074 005958 01DC+00 1/1 0/0 0/0 .text lookat__13daNpcRafrel_cFv */ @@ -2461,7 +2504,7 @@ bool daNpcRafrel_c::drawDbgInfo() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80ABF07C(s16 param_0) /* const */ { +extern "C" asm void func_80ABF07C(void* _this, s16 param_0) /* const */ { nofralloc #include "asm/rel/d/a/npc/d_a_npc_rafrel/d_a_npc_rafrel/func_80ABF07C.s" } @@ -2493,7 +2536,7 @@ asm void __sinit_d_a_npc_rafrel_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80ABF088 = (void*)__sinit_d_a_npc_rafrel_cpp; +REGISTER_CTORS(0x80ABF088, __sinit_d_a_npc_rafrel_cpp); #pragma pop /* 80ABF18C-80ABF1D4 005C4C 0048+00 5/4 0/0 0/0 .text __dt__18daNpcF_ActorMngr_cFv */ @@ -2671,25 +2714,4 @@ static asm void func_80ABF9C4() { } #pragma pop -/* 80ABFDBC-80ABFE7E 0003DC 00C2+00 10/7 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80ABFDBC = "Rafrel"; -SECTION_DEAD static char const* const stringBase_80ABFDC3 = "Rafrel1"; -SECTION_DEAD static char const* const stringBase_80ABFDCB = "Rafrel2"; -SECTION_DEAD static char const* const stringBase_80ABFDD3 = "Rafrel3"; -SECTION_DEAD static char const* const stringBase_80ABFDDB = ""; -SECTION_DEAD static char const* const stringBase_80ABFDDC = "THE_INTRODUCTION"; -SECTION_DEAD static char const* const stringBase_80ABFDED = "RESIST_MEETING"; -SECTION_DEAD static char const* const stringBase_80ABFDFC = "RAFREL_APPEAR"; -SECTION_DEAD static char const* const stringBase_80ABFE0A = "RESIST_WIRETAP_ASH"; -SECTION_DEAD static char const* const stringBase_80ABFE1D = "RESIST_WIRETAP_SHAD"; -SECTION_DEAD static char const* const stringBase_80ABFE31 = "RESIST_WIRETAP_RAFREL"; -SECTION_DEAD static char const* const stringBase_80ABFE47 = "R_SP116"; -SECTION_DEAD static char const* const stringBase_80ABFE4F = "F_SP115"; -SECTION_DEAD static char const* const stringBase_80ABFE57 = "D_MN09"; -SECTION_DEAD static char const* const stringBase_80ABFE5E = "NO_RESPONSE"; -SECTION_DEAD static char const* const stringBase_80ABFE6A = "DEFAULT_GETITEM"; -SECTION_DEAD static char const* const stringBase_80ABFE7A = "prm"; -#pragma pop +/* 80ABFDBC-80ABFDBC 0003DC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/npc/d_a_npc_saru/d_a_npc_saru.cpp b/rel/d/a/npc/d_a_npc_saru/d_a_npc_saru.cpp index eba330b0be4..f40735e3348 100644 --- a/rel/d/a/npc/d_a_npc_saru/d_a_npc_saru.cpp +++ b/rel/d/a/npc/d_a_npc_saru/d_a_npc_saru.cpp @@ -15,12 +15,14 @@ struct mDoMtx_stack_c { static u8 now[48]; }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; +struct J3DAnmTransform {}; + +struct J3DModelData {}; + struct Vec {}; struct Z2Creature { @@ -29,8 +31,6 @@ struct Z2Creature { /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -43,6 +43,8 @@ struct fopAc_ac_c { /* 80018C8C */ ~fopAc_ac_c(); }; +struct daNpcT_faceMotionAnmData_c {}; + struct daNpcT_MotionSeqMngr_c { struct sequenceStepData_c {}; @@ -51,14 +53,12 @@ struct daNpcT_MotionSeqMngr_c { /* 80AC3CE8 */ ~daNpcT_MotionSeqMngr_c(); }; +struct daNpcT_evtData_c {}; + struct daNpcT_motionAnmData_c {}; struct J3DJoint {}; -struct daNpcT_faceMotionAnmData_c {}; - -struct daNpcT_evtData_c {}; - struct daNpc_Saru_c { /* 80AC042C */ ~daNpc_Saru_c(); /* 80AC0578 */ void create(); @@ -117,6 +117,13 @@ struct dCcD_GObjInf { /* 800840E4 */ ~dCcD_GObjInf(); }; +struct csXyz { + /* 80AC3648 */ ~csXyz(); + /* 80AC3BE4 */ csXyz(); +}; + +struct _GXColorS10 {}; + struct J3DModel {}; struct cXyz { @@ -126,13 +133,6 @@ struct cXyz { /* 80AC3CE4 */ cXyz(); }; -struct _GXColorS10 {}; - -struct csXyz { - /* 80AC3648 */ ~csXyz(); - /* 80AC3BE4 */ csXyz(); -}; - struct daNpcT_c { /* 80147FA4 */ void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*); /* 801483F8 */ void loadRes(s8 const*, char const**); @@ -440,7 +440,7 @@ extern "C" void changeAnm__8daNpcT_cFPiPi(); extern "C" void changeBck__8daNpcT_cFPiPi(); extern "C" void changeBtp__8daNpcT_cFPiPi(); extern "C" void changeBtk__8daNpcT_cFPiPi(); -extern "C" void func_80AC42C4(int*); +extern "C" void func_80AC42C4(void* _this, int*); extern "C" void __sinit_d_a_npc_saru_cpp(); extern "C" void __ct__12daNpc_Saru_cFPC26daNpcT_faceMotionAnmData_cPC22daNpcT_motionAnmData_cPCQ222daNpcT_MotionSeqMngr_c18sequenceStepData_ciPCQ222daNpcT_MotionSeqMngr_c18sequenceStepData_ciPC16daNpcT_evtData_cPPc(); @@ -628,6 +628,19 @@ extern "C" void __register_global_object(); // /* ############################################################################################## */ +/* 80AC4654-80AC4654 00015C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80AC4654 = ""; +SECTION_DEAD static char const* const stringBase_80AC4655 = "NO_RESPONSE"; +SECTION_DEAD static char const* const stringBase_80AC4661 = "YM_LOOK"; +SECTION_DEAD static char const* const stringBase_80AC4669 = "Npc_ks"; +SECTION_DEAD static char const* const stringBase_80AC4670 = "saru_TW"; +SECTION_DEAD static char const* const stringBase_80AC4678 = "saru"; +SECTION_DEAD static char const* const stringBase_80AC467D = "FIND_MONKEY"; +SECTION_DEAD static char const* const stringBase_80AC4689 = "HELP_ME"; +#pragma pop + /* 80AC46A4-80AC46B0 000000 000C+00 2/2 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -1064,7 +1077,7 @@ SECTION_RODATA u8 const daNpc_Saru_Param_c::m[144] = { 0xC1, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC1, 0xA0, 0x00, 0x00, 0x41, 0xA0, 0x00, 0x00, 0x42, 0x48, 0x00, 0x00, 0x41, 0xA0, 0x00, 0x00, 0x42, 0xC8, 0x00, 0x00, 0x00, 0xB4, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AC44F8, &daNpc_Saru_Param_c::m); +COMPILER_STRIP_GATE(0x80AC44F8, &daNpc_Saru_Param_c::m); /* 80AC4588-80AC4598 000090 0010+00 0/1 0/0 0/0 .rodata heapSize$3999 */ #pragma push @@ -1072,42 +1085,42 @@ COMPILER_STRIP_GATE(80AC44F8, &daNpc_Saru_Param_c::m); SECTION_RODATA static u8 const heapSize[16] = { 0x00, 0x00, 0x38, 0x90, 0x00, 0x00, 0x38, 0x90, 0x00, 0x00, 0x38, 0x80, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AC4588, &heapSize); +COMPILER_STRIP_GATE(0x80AC4588, &heapSize); #pragma pop /* 80AC4598-80AC459C 0000A0 0004+00 0/1 0/0 0/0 .rodata @4065 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4065 = -200.0f; -COMPILER_STRIP_GATE(80AC4598, &lit_4065); +COMPILER_STRIP_GATE(0x80AC4598, &lit_4065); #pragma pop /* 80AC459C-80AC45A0 0000A4 0004+00 0/1 0/0 0/0 .rodata @4066 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4066 = -100.0f; -COMPILER_STRIP_GATE(80AC459C, &lit_4066); +COMPILER_STRIP_GATE(0x80AC459C, &lit_4066); #pragma pop /* 80AC45A0-80AC45A4 0000A8 0004+00 0/1 0/0 0/0 .rodata @4067 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4067 = 200.0f; -COMPILER_STRIP_GATE(80AC45A0, &lit_4067); +COMPILER_STRIP_GATE(0x80AC45A0, &lit_4067); #pragma pop /* 80AC45A4-80AC45A8 0000AC 0004+00 0/1 0/0 0/0 .rodata @4068 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4068 = 300.0f; -COMPILER_STRIP_GATE(80AC45A4, &lit_4068); +COMPILER_STRIP_GATE(0x80AC45A4, &lit_4068); #pragma pop /* 80AC45A8-80AC45AC 0000B0 0004+00 0/1 0/0 0/0 .rodata @4069 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4069 = -1000000000.0f; -COMPILER_STRIP_GATE(80AC45A8, &lit_4069); +COMPILER_STRIP_GATE(0x80AC45A8, &lit_4069); #pragma pop /* 80AC0578-80AC082C 000238 02B4+00 1/1 0/0 0/0 .text create__12daNpc_Saru_cFv */ @@ -1128,20 +1141,20 @@ SECTION_RODATA static u8 const lit_4231[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AC45AC, &lit_4231); +COMPILER_STRIP_GATE(0x80AC45AC, &lit_4231); /* 80AC45B0-80AC45B4 0000B8 0004+00 0/2 0/0 0/0 .rodata @4232 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4232 = 65536.0f; -COMPILER_STRIP_GATE(80AC45B0, &lit_4232); +COMPILER_STRIP_GATE(0x80AC45B0, &lit_4232); #pragma pop /* 80AC45B4-80AC45B8 0000BC 0004+00 0/3 0/0 0/0 .rodata @4233 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4233 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(80AC45B4, &lit_4233); +COMPILER_STRIP_GATE(0x80AC45B4, &lit_4233); #pragma pop /* 80AC45B8-80AC45C0 0000C0 0008+00 0/1 0/0 0/0 .rodata bmdTypeList$4340 */ @@ -1150,12 +1163,12 @@ COMPILER_STRIP_GATE(80AC45B4, &lit_4233); SECTION_RODATA static u8 const bmdTypeList[8] = { 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x03, }; -COMPILER_STRIP_GATE(80AC45B8, &bmdTypeList); +COMPILER_STRIP_GATE(0x80AC45B8, &bmdTypeList); #pragma pop /* 80AC45C0-80AC45C4 0000C8 0004+00 1/4 0/0 0/0 .rodata @4393 */ SECTION_RODATA static f32 const lit_4393 = 1.0f; -COMPILER_STRIP_GATE(80AC45C0, &lit_4393); +COMPILER_STRIP_GATE(0x80AC45C0, &lit_4393); /* 80AC082C-80AC0A54 0004EC 0228+00 1/1 0/0 0/0 .text CreateHeap__12daNpc_Saru_cFv */ #pragma push @@ -1190,7 +1203,7 @@ asm void daNpc_Saru_c::Execute() { /* ############################################################################################## */ /* 80AC45C4-80AC45C8 0000CC 0004+00 1/1 0/0 0/0 .rodata @4408 */ SECTION_RODATA static f32 const lit_4408 = 100.0f; -COMPILER_STRIP_GATE(80AC45C4, &lit_4408); +COMPILER_STRIP_GATE(0x80AC45C4, &lit_4408); /* 80AC0AA8-80AC0AEC 000768 0044+00 1/1 0/0 0/0 .text Draw__12daNpc_Saru_cFv */ #pragma push @@ -1287,7 +1300,7 @@ asm void daNpc_Saru_c::checkChangeEvt() { /* ############################################################################################## */ /* 80AC45C8-80AC45CC 0000D0 0004+00 1/1 0/0 0/0 .rodata @4593 */ SECTION_RODATA static f32 const lit_4593 = 4.0f / 5.0f; -COMPILER_STRIP_GATE(80AC45C8, &lit_4593); +COMPILER_STRIP_GATE(0x80AC45C8, &lit_4593); /* 80AC0FDC-80AC1110 000C9C 0134+00 1/0 0/0 0/0 .text setParam__12daNpc_Saru_cFv */ #pragma push @@ -1302,7 +1315,7 @@ asm void daNpc_Saru_c::setParam() { /* ############################################################################################## */ /* 80AC45CC-80AC45D0 0000D4 0004+00 4/5 0/0 0/0 .rodata @4608 */ SECTION_RODATA static f32 const lit_4608 = -1.0f; -COMPILER_STRIP_GATE(80AC45CC, &lit_4608); +COMPILER_STRIP_GATE(0x80AC45CC, &lit_4608); /* 80AC1110-80AC1170 000DD0 0060+00 1/0 0/0 0/0 .text setAfterTalkMotion__12daNpc_Saru_cFv */ #pragma push @@ -1334,6 +1347,13 @@ asm void daNpc_Saru_c::evtTalk() { } #pragma pop +/* ############################################################################################## */ +/* 80AC4654-80AC4654 00015C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80AC4691 = "Saru"; +#pragma pop + /* 80AC1274-80AC133C 000F34 00C8+00 1/0 0/0 0/0 .text evtCutProc__12daNpc_Saru_cFv */ #pragma push #pragma optimization_level 0 @@ -1369,28 +1389,28 @@ asm void daNpc_Saru_c::beforeMove() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4771 = 30.0f; -COMPILER_STRIP_GATE(80AC45D0, &lit_4771); +COMPILER_STRIP_GATE(0x80AC45D0, &lit_4771); #pragma pop /* 80AC45D4-80AC45D8 0000DC 0004+00 0/1 0/0 0/0 .rodata @4772 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4772 = 0x38C90FDB; -COMPILER_STRIP_GATE(80AC45D4, &lit_4772); +COMPILER_STRIP_GATE(0x80AC45D4, &lit_4772); #pragma pop /* 80AC45D8-80AC45DC 0000E0 0004+00 0/1 0/0 0/0 .rodata @4773 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4773 = -30.0f; -COMPILER_STRIP_GATE(80AC45D8, &lit_4773); +COMPILER_STRIP_GATE(0x80AC45D8, &lit_4773); #pragma pop /* 80AC45DC-80AC45E0 0000E4 0004+00 0/1 0/0 0/0 .rodata @4774 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4774 = 10.0f; -COMPILER_STRIP_GATE(80AC45DC, &lit_4774); +COMPILER_STRIP_GATE(0x80AC45DC, &lit_4774); #pragma pop /* 80AC45E0-80AC45E8 0000E8 0004+04 0/1 0/0 0/0 .rodata @4775 */ @@ -1401,14 +1421,14 @@ SECTION_RODATA static f32 const lit_4775[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80AC45E0, &lit_4775); +COMPILER_STRIP_GATE(0x80AC45E0, &lit_4775); #pragma pop /* 80AC45E8-80AC45F0 0000F0 0008+00 1/3 0/0 0/0 .rodata @4777 */ SECTION_RODATA static u8 const lit_4777[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AC45E8, &lit_4777); +COMPILER_STRIP_GATE(0x80AC45E8, &lit_4777); /* 80AC15B4-80AC18A0 001274 02EC+00 1/0 0/0 0/0 .text setAttnPos__12daNpc_Saru_cFv */ #pragma push @@ -1427,7 +1447,7 @@ asm void daNpc_Saru_c::setAttnPos() { SECTION_RODATA static u8 const lit_4835[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AC45F0, &lit_4835); +COMPILER_STRIP_GATE(0x80AC45F0, &lit_4835); #pragma pop /* 80AC45F8-80AC4600 000100 0008+00 0/1 0/0 0/0 .rodata @4836 */ @@ -1436,7 +1456,7 @@ COMPILER_STRIP_GATE(80AC45F0, &lit_4835); SECTION_RODATA static u8 const lit_4836[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AC45F8, &lit_4836); +COMPILER_STRIP_GATE(0x80AC45F8, &lit_4836); #pragma pop /* 80AC4600-80AC4608 000108 0008+00 0/1 0/0 0/0 .rodata @4837 */ @@ -1445,12 +1465,12 @@ COMPILER_STRIP_GATE(80AC45F8, &lit_4836); SECTION_RODATA static u8 const lit_4837[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AC4600, &lit_4837); +COMPILER_STRIP_GATE(0x80AC4600, &lit_4837); #pragma pop /* 80AC4608-80AC460C 000110 0004+00 1/1 0/0 0/0 .rodata @4876 */ SECTION_RODATA static f32 const lit_4876 = 20.0f; -COMPILER_STRIP_GATE(80AC4608, &lit_4876); +COMPILER_STRIP_GATE(0x80AC4608, &lit_4876); /* 80AC18A0-80AC1A20 001560 0180+00 1/0 0/0 0/0 .text setCollision__12daNpc_Saru_cFv */ #pragma push @@ -1472,7 +1492,7 @@ bool daNpc_Saru_c::drawDbgInfo() { SECTION_RODATA static u8 const jointNo[8] = { 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x04, }; -COMPILER_STRIP_GATE(80AC460C, &jointNo); +COMPILER_STRIP_GATE(0x80AC460C, &jointNo); /* 80AC1A28-80AC1B30 0016E8 0108+00 1/0 0/0 0/0 .text drawOtherMdl__12daNpc_Saru_cFv */ #pragma push @@ -1499,7 +1519,7 @@ asm void daNpc_Saru_c::selectAction() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpc_Saru_c::chkAction(int (daNpc_Saru_c::*)(void*)) { +asm void daNpc_Saru_c::chkAction(int (daNpc_Saru_c::*param_0)(void*)) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_saru/d_a_npc_saru/chkAction__12daNpc_Saru_cFM12daNpc_Saru_cFPCvPvPv_i.s" } @@ -1510,7 +1530,7 @@ asm void daNpc_Saru_c::chkAction(int (daNpc_Saru_c::*)(void*)) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpc_Saru_c::setAction(int (daNpc_Saru_c::*)(void*)) { +asm void daNpc_Saru_c::setAction(int (daNpc_Saru_c::*param_0)(void*)) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_saru/d_a_npc_saru/setAction__12daNpc_Saru_cFM12daNpc_Saru_cFPCvPvPv_i.s" } @@ -1521,91 +1541,91 @@ asm void daNpc_Saru_c::setAction(int (daNpc_Saru_c::*)(void*)) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5082 = 12.0f; -COMPILER_STRIP_GATE(80AC4614, &lit_5082); +COMPILER_STRIP_GATE(0x80AC4614, &lit_5082); #pragma pop /* 80AC4618-80AC461C 000120 0004+00 0/1 0/0 0/0 .rodata @5083 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5083 = 19.0f; -COMPILER_STRIP_GATE(80AC4618, &lit_5083); +COMPILER_STRIP_GATE(0x80AC4618, &lit_5083); #pragma pop /* 80AC461C-80AC4620 000124 0004+00 0/1 0/0 0/0 .rodata @5084 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5084 = 42.0f; -COMPILER_STRIP_GATE(80AC461C, &lit_5084); +COMPILER_STRIP_GATE(0x80AC461C, &lit_5084); #pragma pop /* 80AC4620-80AC4624 000128 0004+00 0/1 0/0 0/0 .rodata @5085 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5085 = 75.0f; -COMPILER_STRIP_GATE(80AC4620, &lit_5085); +COMPILER_STRIP_GATE(0x80AC4620, &lit_5085); #pragma pop /* 80AC4624-80AC4628 00012C 0004+00 0/1 0/0 0/0 .rodata @5086 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5086 = 5.0f; -COMPILER_STRIP_GATE(80AC4624, &lit_5086); +COMPILER_STRIP_GATE(0x80AC4624, &lit_5086); #pragma pop /* 80AC4628-80AC462C 000130 0004+00 0/1 0/0 0/0 .rodata @5087 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5087 = 21.0f; -COMPILER_STRIP_GATE(80AC4628, &lit_5087); +COMPILER_STRIP_GATE(0x80AC4628, &lit_5087); #pragma pop /* 80AC462C-80AC4630 000134 0004+00 0/1 0/0 0/0 .rodata @5088 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5088 = 53.0f; -COMPILER_STRIP_GATE(80AC462C, &lit_5088); +COMPILER_STRIP_GATE(0x80AC462C, &lit_5088); #pragma pop /* 80AC4630-80AC4634 000138 0004+00 0/1 0/0 0/0 .rodata @5089 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5089 = 64.0f; -COMPILER_STRIP_GATE(80AC4630, &lit_5089); +COMPILER_STRIP_GATE(0x80AC4630, &lit_5089); #pragma pop /* 80AC4634-80AC4638 00013C 0004+00 0/1 0/0 0/0 .rodata @5090 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5090 = 4.0f; -COMPILER_STRIP_GATE(80AC4634, &lit_5090); +COMPILER_STRIP_GATE(0x80AC4634, &lit_5090); #pragma pop /* 80AC4638-80AC463C 000140 0004+00 0/1 0/0 0/0 .rodata @5091 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5091 = 11.0f; -COMPILER_STRIP_GATE(80AC4638, &lit_5091); +COMPILER_STRIP_GATE(0x80AC4638, &lit_5091); #pragma pop /* 80AC463C-80AC4640 000144 0004+00 0/1 0/0 0/0 .rodata @5092 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5092 = 23.0f; -COMPILER_STRIP_GATE(80AC463C, &lit_5092); +COMPILER_STRIP_GATE(0x80AC463C, &lit_5092); #pragma pop /* 80AC4640-80AC4644 000148 0004+00 0/1 0/0 0/0 .rodata @5093 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5093 = 9.0f; -COMPILER_STRIP_GATE(80AC4640, &lit_5093); +COMPILER_STRIP_GATE(0x80AC4640, &lit_5093); #pragma pop /* 80AC4644-80AC4648 00014C 0004+00 0/1 0/0 0/0 .rodata @5094 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5094 = 15.0f; -COMPILER_STRIP_GATE(80AC4644, &lit_5094); +COMPILER_STRIP_GATE(0x80AC4644, &lit_5094); #pragma pop /* 80AC1C4C-80AC216C 00190C 0520+00 1/1 0/0 0/0 .text setSe__12daNpc_Saru_cFv */ @@ -1623,21 +1643,28 @@ asm void daNpc_Saru_c::setSe() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5142 = 2500.0f; -COMPILER_STRIP_GATE(80AC4648, &lit_5142); +COMPILER_STRIP_GATE(0x80AC4648, &lit_5142); #pragma pop /* 80AC464C-80AC4650 000154 0004+00 0/1 0/0 0/0 .rodata @5143 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5143 = 18.0f; -COMPILER_STRIP_GATE(80AC464C, &lit_5143); +COMPILER_STRIP_GATE(0x80AC464C, &lit_5143); #pragma pop /* 80AC4650-80AC4654 000158 0004+00 0/1 0/0 0/0 .rodata @5144 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5144 = 0.5f; -COMPILER_STRIP_GATE(80AC4650, &lit_5144); +COMPILER_STRIP_GATE(0x80AC4650, &lit_5144); +#pragma pop + +/* 80AC4654-80AC4654 00015C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80AC4696 = "prm"; +SECTION_DEAD static char const* const stringBase_80AC469A = "timer"; #pragma pop /* 80AC216C-80AC2368 001E2C 01FC+00 1/0 0/0 0/0 .text cutFindMonkey__12daNpc_Saru_cFi */ @@ -1660,6 +1687,13 @@ asm void daNpc_Saru_c::cutHelpMe(int param_0) { } #pragma pop +/* ############################################################################################## */ +/* 80AC4654-80AC4654 00015C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80AC46A0 = "@"; +#pragma pop + /* 80AC2598-80AC28A4 002258 030C+00 1/0 0/0 0/0 .text cutYmLook__12daNpc_Saru_cFi */ #pragma push #pragma optimization_level 0 @@ -2062,7 +2096,7 @@ void daNpcT_c::changeBtk(int* param_0, int* param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80AC42C4(int* param_0) { +extern "C" asm void func_80AC42C4(void* _this, int* param_0) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_saru/d_a_npc_saru/func_80AC42C4.s" } @@ -2094,7 +2128,7 @@ asm void __sinit_d_a_npc_saru_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80AC42E0 = (void*)__sinit_d_a_npc_saru_cpp; +REGISTER_CTORS(0x80AC42E0, __sinit_d_a_npc_saru_cpp); #pragma pop /* 80AC4394-80AC4474 004054 00E0+00 1/1 0/0 0/0 .text @@ -2159,20 +2193,4 @@ static asm void func_80AC44DC() { } #pragma pop -/* 80AC4654-80AC46A2 00015C 004E+00 7/4 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80AC4654 = ""; -SECTION_DEAD static char const* const stringBase_80AC4655 = "NO_RESPONSE"; -SECTION_DEAD static char const* const stringBase_80AC4661 = "YM_LOOK"; -SECTION_DEAD static char const* const stringBase_80AC4669 = "Npc_ks"; -SECTION_DEAD static char const* const stringBase_80AC4670 = "saru_TW"; -SECTION_DEAD static char const* const stringBase_80AC4678 = "saru"; -SECTION_DEAD static char const* const stringBase_80AC467D = "FIND_MONKEY"; -SECTION_DEAD static char const* const stringBase_80AC4689 = "HELP_ME"; -SECTION_DEAD static char const* const stringBase_80AC4691 = "Saru"; -SECTION_DEAD static char const* const stringBase_80AC4696 = "prm"; -SECTION_DEAD static char const* const stringBase_80AC469A = "timer"; -SECTION_DEAD static char const* const stringBase_80AC46A0 = "@"; -#pragma pop +/* 80AC4654-80AC4654 00015C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/npc/d_a_npc_seib/d_a_npc_seib.cpp b/rel/d/a/npc/d_a_npc_seib/d_a_npc_seib.cpp index e78175a1a26..4dfbb9d4d58 100644 --- a/rel/d/a/npc/d_a_npc_seib/d_a_npc_seib.cpp +++ b/rel/d/a/npc/d_a_npc_seib/d_a_npc_seib.cpp @@ -11,12 +11,14 @@ // Types: // -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; +struct J3DAnmTransform {}; + +struct J3DModelData {}; + struct Vec {}; struct Z2Creature { @@ -25,8 +27,6 @@ struct Z2Creature { /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -39,6 +39,8 @@ struct fopAc_ac_c { /* 80018C8C */ ~fopAc_ac_c(); }; +struct daNpcT_faceMotionAnmData_c {}; + struct daNpcT_MotionSeqMngr_c { struct sequenceStepData_c {}; @@ -47,12 +49,10 @@ struct daNpcT_MotionSeqMngr_c { /* 80AC6C2C */ ~daNpcT_MotionSeqMngr_c(); }; -struct daNpcT_motionAnmData_c {}; - -struct daNpcT_faceMotionAnmData_c {}; - struct daNpcT_evtData_c {}; +struct daNpcT_motionAnmData_c {}; + struct daNpc_seiB_c { /* 80AC50EC */ ~daNpc_seiB_c(); /* 80AC5188 */ void create(); @@ -95,21 +95,21 @@ struct daNpc_seiB_Param_c { static u8 const m[148]; }; +struct J3DAnmTextureSRTKey {}; + +struct _GXColorS10 {}; + struct J3DModel {}; -struct J3DAnmTextureSRTKey {}; +struct J3DJoint {}; + +struct J3DAnmTevRegKey {}; struct cXyz { /* 80AC6664 */ ~cXyz(); /* 80AC6BE0 */ cXyz(); }; -struct _GXColorS10 {}; - -struct J3DJoint {}; - -struct J3DAnmTevRegKey {}; - struct daNpcT_c { /* 8014810C */ void getTexSRTKeyAnmP(char const*, int); /* 80148148 */ void getTevRegKeyAnmP(char const*, int); @@ -241,13 +241,13 @@ struct dBgS_AcchCir { /* 80AC6C74 */ ~dBgS_AcchCir(); }; -struct dBgS {}; - struct csXyz { /* 80AC66A0 */ ~csXyz(); /* 80AC6AE0 */ csXyz(); }; +struct dBgS {}; + struct dBgS_Acch { /* 80075F94 */ ~dBgS_Acch(); /* 800760A0 */ dBgS_Acch(); @@ -474,6 +474,15 @@ extern "C" void __register_global_object(); // /* ############################################################################################## */ +/* 80AC70D0-80AC70D0 0000AC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80AC70D0 = ""; +SECTION_DEAD static char const* const stringBase_80AC70D1 = "DEFAULT_GETITEM"; +SECTION_DEAD static char const* const stringBase_80AC70E1 = "NO_RESPONSE"; +SECTION_DEAD static char const* const stringBase_80AC70ED = "seiB"; +#pragma pop + /* 80AC70F8-80AC7104 000000 000C+00 2/2 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -779,7 +788,7 @@ SECTION_RODATA u8 const daNpc_seiB_Param_c::m[148] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x44, 0x96, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AC7024, &daNpc_seiB_Param_c::m); +COMPILER_STRIP_GATE(0x80AC7024, &daNpc_seiB_Param_c::m); /* 80AC5188-80AC53C8 000188 0240+00 1/1 0/0 0/0 .text create__12daNpc_seiB_cFv */ #pragma push @@ -799,25 +808,25 @@ SECTION_RODATA static u8 const lit_4089[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AC70B8, &lit_4089); +COMPILER_STRIP_GATE(0x80AC70B8, &lit_4089); /* 80AC70BC-80AC70C0 000098 0004+00 0/2 0/0 0/0 .rodata @4090 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4090 = 65536.0f; -COMPILER_STRIP_GATE(80AC70BC, &lit_4090); +COMPILER_STRIP_GATE(0x80AC70BC, &lit_4090); #pragma pop /* 80AC70C0-80AC70C4 00009C 0004+00 0/2 0/0 0/0 .rodata @4091 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4091 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(80AC70C0, &lit_4091); +COMPILER_STRIP_GATE(0x80AC70C0, &lit_4091); #pragma pop /* 80AC70C4-80AC70C8 0000A0 0004+00 2/2 0/0 0/0 .rodata @4215 */ SECTION_RODATA static f32 const lit_4215 = 1.0f; -COMPILER_STRIP_GATE(80AC70C4, &lit_4215); +COMPILER_STRIP_GATE(0x80AC70C4, &lit_4215); /* 80AC53C8-80AC5520 0003C8 0158+00 1/1 0/0 0/0 .text CreateHeap__12daNpc_seiB_cFv */ #pragma push @@ -852,7 +861,7 @@ asm void daNpc_seiB_c::Execute() { /* ############################################################################################## */ /* 80AC70C8-80AC70CC 0000A4 0004+00 1/1 0/0 0/0 .rodata @4247 */ SECTION_RODATA static f32 const lit_4247 = 100.0f; -COMPILER_STRIP_GATE(80AC70C8, &lit_4247); +COMPILER_STRIP_GATE(0x80AC70C8, &lit_4247); /* 80AC5574-80AC5608 000574 0094+00 1/1 0/0 0/0 .text Draw__12daNpc_seiB_cFv */ #pragma push @@ -903,7 +912,7 @@ bool daNpc_seiB_c::isDelete() { /* ############################################################################################## */ /* 80AC70CC-80AC70D0 0000A8 0004+00 1/2 0/0 0/0 .rodata @4292 */ SECTION_RODATA static f32 const lit_4292 = -1.0f; -COMPILER_STRIP_GATE(80AC70CC, &lit_4292); +COMPILER_STRIP_GATE(0x80AC70CC, &lit_4292); /* 80AC566C-80AC57C4 00066C 0158+00 1/1 0/0 0/0 .text reset__12daNpc_seiB_cFv */ #pragma push @@ -950,6 +959,13 @@ asm void daNpc_seiB_c::evtTalk() { } #pragma pop +/* ############################################################################################## */ +/* 80AC70D0-80AC70D0 0000AC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80AC70F2 = "Seib"; +#pragma pop + /* 80AC59F4-80AC5ABC 0009F4 00C8+00 1/0 0/0 0/0 .text evtCutProc__12daNpc_seiB_cFv */ #pragma push #pragma optimization_level 0 @@ -1020,7 +1036,7 @@ asm void daNpc_seiB_c::selectAction() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpc_seiB_c::chkAction(int (daNpc_seiB_c::*)(void*)) { +asm void daNpc_seiB_c::chkAction(int (daNpc_seiB_c::*param_0)(void*)) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_seib/d_a_npc_seib/chkAction__12daNpc_seiB_cFM12daNpc_seiB_cFPCvPvPv_i.s" } @@ -1031,7 +1047,7 @@ asm void daNpc_seiB_c::chkAction(int (daNpc_seiB_c::*)(void*)) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpc_seiB_c::setAction(int (daNpc_seiB_c::*)(void*)) { +asm void daNpc_seiB_c::setAction(int (daNpc_seiB_c::*param_0)(void*)) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_seib/d_a_npc_seib/setAction__12daNpc_seiB_cFM12daNpc_seiB_cFPCvPvPv_i.s" } @@ -1434,7 +1450,7 @@ asm void __sinit_d_a_npc_seib_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80AC6F0C = (void*)__sinit_d_a_npc_seib_cpp; +REGISTER_CTORS(0x80AC6F0C, __sinit_d_a_npc_seib_cpp); #pragma pop /* 80AC6F74-80AC6FB8 001F74 0044+00 1/1 0/0 0/0 .text @@ -1484,13 +1500,4 @@ static asm void func_80AC7008() { } #pragma pop -/* 80AC70D0-80AC70F7 0000AC 0027+00 4/1 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80AC70D0 = ""; -SECTION_DEAD static char const* const stringBase_80AC70D1 = "DEFAULT_GETITEM"; -SECTION_DEAD static char const* const stringBase_80AC70E1 = "NO_RESPONSE"; -SECTION_DEAD static char const* const stringBase_80AC70ED = "seiB"; -SECTION_DEAD static char const* const stringBase_80AC70F2 = "Seib"; -#pragma pop +/* 80AC70D0-80AC70D0 0000AC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/npc/d_a_npc_seic/d_a_npc_seic.cpp b/rel/d/a/npc/d_a_npc_seic/d_a_npc_seic.cpp index ebb138ded6e..874e4264a87 100644 --- a/rel/d/a/npc/d_a_npc_seic/d_a_npc_seic.cpp +++ b/rel/d/a/npc/d_a_npc_seic/d_a_npc_seic.cpp @@ -11,12 +11,14 @@ // Types: // -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; +struct J3DAnmTransform {}; + +struct J3DModelData {}; + struct Vec {}; struct Z2Creature { @@ -25,8 +27,6 @@ struct Z2Creature { /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -39,6 +39,8 @@ struct fopAc_ac_c { /* 80018C8C */ ~fopAc_ac_c(); }; +struct daNpcT_faceMotionAnmData_c {}; + struct daNpcT_MotionSeqMngr_c { struct sequenceStepData_c {}; @@ -46,12 +48,10 @@ struct daNpcT_MotionSeqMngr_c { /* 80AC8E24 */ ~daNpcT_MotionSeqMngr_c(); }; -struct daNpcT_motionAnmData_c {}; - -struct daNpcT_faceMotionAnmData_c {}; - struct daNpcT_evtData_c {}; +struct daNpcT_motionAnmData_c {}; + struct daNpc_seiC_c { /* 80AC754C */ ~daNpc_seiC_c(); /* 80AC75E8 */ void create(); @@ -94,21 +94,21 @@ struct daNpc_seiC_Param_c { static u8 const m[148]; }; +struct J3DAnmTextureSRTKey {}; + +struct _GXColorS10 {}; + struct J3DModel {}; -struct J3DAnmTextureSRTKey {}; +struct J3DJoint {}; + +struct J3DAnmTevRegKey {}; struct cXyz { /* 80AC885C */ ~cXyz(); /* 80AC8DD8 */ cXyz(); }; -struct _GXColorS10 {}; - -struct J3DJoint {}; - -struct J3DAnmTevRegKey {}; - struct daNpcT_c { /* 8014810C */ void getTexSRTKeyAnmP(char const*, int); /* 80148148 */ void getTevRegKeyAnmP(char const*, int); @@ -240,13 +240,13 @@ struct dBgS_AcchCir { /* 80AC8E6C */ ~dBgS_AcchCir(); }; -struct dBgS {}; - struct csXyz { /* 80AC8898 */ ~csXyz(); /* 80AC8CD8 */ csXyz(); }; +struct dBgS {}; + struct dBgS_Acch { /* 80075F94 */ ~dBgS_Acch(); /* 800760A0 */ dBgS_Acch(); @@ -472,6 +472,15 @@ extern "C" void __register_global_object(); // /* ############################################################################################## */ +/* 80AC92C8-80AC92C8 0000AC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80AC92C8 = ""; +SECTION_DEAD static char const* const stringBase_80AC92C9 = "DEFAULT_GETITEM"; +SECTION_DEAD static char const* const stringBase_80AC92D9 = "NO_RESPONSE"; +SECTION_DEAD static char const* const stringBase_80AC92E5 = "seiC"; +#pragma pop + /* 80AC92F0-80AC92FC 000000 000C+00 2/2 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -767,7 +776,7 @@ SECTION_RODATA u8 const daNpc_seiC_Param_c::m[148] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x44, 0x96, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AC921C, &daNpc_seiC_Param_c::m); +COMPILER_STRIP_GATE(0x80AC921C, &daNpc_seiC_Param_c::m); /* 80AC75E8-80AC7828 000188 0240+00 1/1 0/0 0/0 .text create__12daNpc_seiC_cFv */ #pragma push @@ -787,25 +796,25 @@ SECTION_RODATA static u8 const lit_4089[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AC92B0, &lit_4089); +COMPILER_STRIP_GATE(0x80AC92B0, &lit_4089); /* 80AC92B4-80AC92B8 000098 0004+00 0/2 0/0 0/0 .rodata @4090 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4090 = 65536.0f; -COMPILER_STRIP_GATE(80AC92B4, &lit_4090); +COMPILER_STRIP_GATE(0x80AC92B4, &lit_4090); #pragma pop /* 80AC92B8-80AC92BC 00009C 0004+00 0/2 0/0 0/0 .rodata @4091 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4091 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(80AC92B8, &lit_4091); +COMPILER_STRIP_GATE(0x80AC92B8, &lit_4091); #pragma pop /* 80AC92BC-80AC92C0 0000A0 0004+00 2/2 0/0 0/0 .rodata @4215 */ SECTION_RODATA static f32 const lit_4215 = 1.0f; -COMPILER_STRIP_GATE(80AC92BC, &lit_4215); +COMPILER_STRIP_GATE(0x80AC92BC, &lit_4215); /* 80AC7828-80AC7980 0003C8 0158+00 1/1 0/0 0/0 .text CreateHeap__12daNpc_seiC_cFv */ #pragma push @@ -840,7 +849,7 @@ asm void daNpc_seiC_c::Execute() { /* ############################################################################################## */ /* 80AC92C0-80AC92C4 0000A4 0004+00 1/1 0/0 0/0 .rodata @4247 */ SECTION_RODATA static f32 const lit_4247 = 100.0f; -COMPILER_STRIP_GATE(80AC92C0, &lit_4247); +COMPILER_STRIP_GATE(0x80AC92C0, &lit_4247); /* 80AC79D4-80AC7A68 000574 0094+00 1/1 0/0 0/0 .text Draw__12daNpc_seiC_cFv */ #pragma push @@ -893,7 +902,7 @@ bool daNpc_seiC_c::isDelete() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4292 = -1.0f; -COMPILER_STRIP_GATE(80AC92C4, &lit_4292); +COMPILER_STRIP_GATE(0x80AC92C4, &lit_4292); #pragma pop /* 80AC7ACC-80AC7C1C 00066C 0150+00 1/1 0/0 0/0 .text reset__12daNpc_seiC_cFv */ @@ -941,6 +950,13 @@ asm void daNpc_seiC_c::evtTalk() { } #pragma pop +/* ############################################################################################## */ +/* 80AC92C8-80AC92C8 0000AC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80AC92EA = "Seic"; +#pragma pop + /* 80AC7E4C-80AC7F14 0009EC 00C8+00 1/0 0/0 0/0 .text evtCutProc__12daNpc_seiC_cFv */ #pragma push #pragma optimization_level 0 @@ -1011,7 +1027,7 @@ asm void daNpc_seiC_c::selectAction() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpc_seiC_c::chkAction(int (daNpc_seiC_c::*)(void*)) { +asm void daNpc_seiC_c::chkAction(int (daNpc_seiC_c::*param_0)(void*)) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_seic/d_a_npc_seic/chkAction__12daNpc_seiC_cFM12daNpc_seiC_cFPCvPvPv_i.s" } @@ -1022,7 +1038,7 @@ asm void daNpc_seiC_c::chkAction(int (daNpc_seiC_c::*)(void*)) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpc_seiC_c::setAction(int (daNpc_seiC_c::*)(void*)) { +asm void daNpc_seiC_c::setAction(int (daNpc_seiC_c::*param_0)(void*)) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_seic/d_a_npc_seic/setAction__12daNpc_seiC_cFM12daNpc_seiC_cFPCvPvPv_i.s" } @@ -1420,7 +1436,7 @@ asm void __sinit_d_a_npc_seic_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80AC9104 = (void*)__sinit_d_a_npc_seic_cpp; +REGISTER_CTORS(0x80AC9104, __sinit_d_a_npc_seic_cpp); #pragma pop /* 80AC916C-80AC91B0 001D0C 0044+00 1/1 0/0 0/0 .text @@ -1470,13 +1486,4 @@ static asm void func_80AC9200() { } #pragma pop -/* 80AC92C8-80AC92EF 0000AC 0027+00 4/1 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80AC92C8 = ""; -SECTION_DEAD static char const* const stringBase_80AC92C9 = "DEFAULT_GETITEM"; -SECTION_DEAD static char const* const stringBase_80AC92D9 = "NO_RESPONSE"; -SECTION_DEAD static char const* const stringBase_80AC92E5 = "seiC"; -SECTION_DEAD static char const* const stringBase_80AC92EA = "Seic"; -#pragma pop +/* 80AC92C8-80AC92C8 0000AC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/npc/d_a_npc_seid/d_a_npc_seid.cpp b/rel/d/a/npc/d_a_npc_seid/d_a_npc_seid.cpp index d43535dae44..e677bb25b33 100644 --- a/rel/d/a/npc/d_a_npc_seid/d_a_npc_seid.cpp +++ b/rel/d/a/npc/d_a_npc_seid/d_a_npc_seid.cpp @@ -11,12 +11,14 @@ // Types: // -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; +struct J3DAnmTransform {}; + +struct J3DModelData {}; + struct Vec {}; struct Z2Creature { @@ -25,8 +27,6 @@ struct Z2Creature { /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -39,6 +39,8 @@ struct fopAc_ac_c { /* 80018C8C */ ~fopAc_ac_c(); }; +struct daNpcT_faceMotionAnmData_c {}; + struct daNpcT_MotionSeqMngr_c { struct sequenceStepData_c {}; @@ -46,12 +48,10 @@ struct daNpcT_MotionSeqMngr_c { /* 80ACAF64 */ ~daNpcT_MotionSeqMngr_c(); }; -struct daNpcT_motionAnmData_c {}; - -struct daNpcT_faceMotionAnmData_c {}; - struct daNpcT_evtData_c {}; +struct daNpcT_motionAnmData_c {}; + struct daNpc_seiD_c { /* 80AC968C */ ~daNpc_seiD_c(); /* 80AC9728 */ void create(); @@ -94,21 +94,21 @@ struct daNpc_seiD_Param_c { static u8 const m[148]; }; +struct J3DAnmTextureSRTKey {}; + +struct _GXColorS10 {}; + struct J3DModel {}; -struct J3DAnmTextureSRTKey {}; +struct J3DJoint {}; + +struct J3DAnmTevRegKey {}; struct cXyz { /* 80ACA99C */ ~cXyz(); /* 80ACAF18 */ cXyz(); }; -struct _GXColorS10 {}; - -struct J3DJoint {}; - -struct J3DAnmTevRegKey {}; - struct daNpcT_c { /* 8014810C */ void getTexSRTKeyAnmP(char const*, int); /* 80148148 */ void getTevRegKeyAnmP(char const*, int); @@ -240,13 +240,13 @@ struct dBgS_AcchCir { /* 80ACAFAC */ ~dBgS_AcchCir(); }; -struct dBgS {}; - struct csXyz { /* 80ACA9D8 */ ~csXyz(); /* 80ACAE18 */ csXyz(); }; +struct dBgS {}; + struct dBgS_Acch { /* 80075F94 */ ~dBgS_Acch(); /* 800760A0 */ dBgS_Acch(); @@ -472,6 +472,15 @@ extern "C" void __register_global_object(); // /* ############################################################################################## */ +/* 80ACB408-80ACB408 0000AC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80ACB408 = ""; +SECTION_DEAD static char const* const stringBase_80ACB409 = "DEFAULT_GETITEM"; +SECTION_DEAD static char const* const stringBase_80ACB419 = "NO_RESPONSE"; +SECTION_DEAD static char const* const stringBase_80ACB425 = "seiD"; +#pragma pop + /* 80ACB430-80ACB43C 000000 000C+00 2/2 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -767,7 +776,7 @@ SECTION_RODATA u8 const daNpc_seiD_Param_c::m[148] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x44, 0x96, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80ACB35C, &daNpc_seiD_Param_c::m); +COMPILER_STRIP_GATE(0x80ACB35C, &daNpc_seiD_Param_c::m); /* 80AC9728-80AC9968 000188 0240+00 1/1 0/0 0/0 .text create__12daNpc_seiD_cFv */ #pragma push @@ -787,25 +796,25 @@ SECTION_RODATA static u8 const lit_4089[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80ACB3F0, &lit_4089); +COMPILER_STRIP_GATE(0x80ACB3F0, &lit_4089); /* 80ACB3F4-80ACB3F8 000098 0004+00 0/2 0/0 0/0 .rodata @4090 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4090 = 65536.0f; -COMPILER_STRIP_GATE(80ACB3F4, &lit_4090); +COMPILER_STRIP_GATE(0x80ACB3F4, &lit_4090); #pragma pop /* 80ACB3F8-80ACB3FC 00009C 0004+00 0/2 0/0 0/0 .rodata @4091 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4091 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(80ACB3F8, &lit_4091); +COMPILER_STRIP_GATE(0x80ACB3F8, &lit_4091); #pragma pop /* 80ACB3FC-80ACB400 0000A0 0004+00 2/2 0/0 0/0 .rodata @4215 */ SECTION_RODATA static f32 const lit_4215 = 1.0f; -COMPILER_STRIP_GATE(80ACB3FC, &lit_4215); +COMPILER_STRIP_GATE(0x80ACB3FC, &lit_4215); /* 80AC9968-80AC9AC0 0003C8 0158+00 1/1 0/0 0/0 .text CreateHeap__12daNpc_seiD_cFv */ #pragma push @@ -840,7 +849,7 @@ asm void daNpc_seiD_c::Execute() { /* ############################################################################################## */ /* 80ACB400-80ACB404 0000A4 0004+00 1/1 0/0 0/0 .rodata @4247 */ SECTION_RODATA static f32 const lit_4247 = 100.0f; -COMPILER_STRIP_GATE(80ACB400, &lit_4247); +COMPILER_STRIP_GATE(0x80ACB400, &lit_4247); /* 80AC9B14-80AC9BA8 000574 0094+00 1/1 0/0 0/0 .text Draw__12daNpc_seiD_cFv */ #pragma push @@ -893,7 +902,7 @@ bool daNpc_seiD_c::isDelete() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4292 = -1.0f; -COMPILER_STRIP_GATE(80ACB404, &lit_4292); +COMPILER_STRIP_GATE(0x80ACB404, &lit_4292); #pragma pop /* 80AC9C0C-80AC9D5C 00066C 0150+00 1/1 0/0 0/0 .text reset__12daNpc_seiD_cFv */ @@ -941,6 +950,13 @@ asm void daNpc_seiD_c::evtTalk() { } #pragma pop +/* ############################################################################################## */ +/* 80ACB408-80ACB408 0000AC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80ACB42A = "Seid"; +#pragma pop + /* 80AC9F8C-80ACA054 0009EC 00C8+00 1/0 0/0 0/0 .text evtCutProc__12daNpc_seiD_cFv */ #pragma push #pragma optimization_level 0 @@ -1011,7 +1027,7 @@ asm void daNpc_seiD_c::selectAction() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpc_seiD_c::chkAction(int (daNpc_seiD_c::*)(void*)) { +asm void daNpc_seiD_c::chkAction(int (daNpc_seiD_c::*param_0)(void*)) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_seid/d_a_npc_seid/chkAction__12daNpc_seiD_cFM12daNpc_seiD_cFPCvPvPv_i.s" } @@ -1022,7 +1038,7 @@ asm void daNpc_seiD_c::chkAction(int (daNpc_seiD_c::*)(void*)) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpc_seiD_c::setAction(int (daNpc_seiD_c::*)(void*)) { +asm void daNpc_seiD_c::setAction(int (daNpc_seiD_c::*param_0)(void*)) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_seid/d_a_npc_seid/setAction__12daNpc_seiD_cFM12daNpc_seiD_cFPCvPvPv_i.s" } @@ -1420,7 +1436,7 @@ asm void __sinit_d_a_npc_seid_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80ACB244 = (void*)__sinit_d_a_npc_seid_cpp; +REGISTER_CTORS(0x80ACB244, __sinit_d_a_npc_seid_cpp); #pragma pop /* 80ACB2AC-80ACB2F0 001D0C 0044+00 1/1 0/0 0/0 .text @@ -1470,13 +1486,4 @@ static asm void func_80ACB340() { } #pragma pop -/* 80ACB408-80ACB42F 0000AC 0027+00 4/1 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80ACB408 = ""; -SECTION_DEAD static char const* const stringBase_80ACB409 = "DEFAULT_GETITEM"; -SECTION_DEAD static char const* const stringBase_80ACB419 = "NO_RESPONSE"; -SECTION_DEAD static char const* const stringBase_80ACB425 = "seiD"; -SECTION_DEAD static char const* const stringBase_80ACB42A = "Seid"; -#pragma pop +/* 80ACB408-80ACB408 0000AC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/npc/d_a_npc_seira/d_a_npc_seira.cpp b/rel/d/a/npc/d_a_npc_seira/d_a_npc_seira.cpp index bfdfc8fa405..7896186f9d0 100644 --- a/rel/d/a/npc/d_a_npc_seira/d_a_npc_seira.cpp +++ b/rel/d/a/npc/d_a_npc_seira/d_a_npc_seira.cpp @@ -15,12 +15,14 @@ struct mDoMtx_stack_c { static u8 now[48]; }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; +struct J3DAnmTransform {}; + +struct J3DModelData {}; + struct Vec {}; struct Z2Creature { @@ -28,8 +30,6 @@ struct Z2Creature { /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -45,6 +45,8 @@ struct fopAc_ac_c { /* 80018B64 */ fopAc_ac_c(); }; +struct daNpcT_faceMotionAnmData_c {}; + struct daNpcT_MotionSeqMngr_c { struct sequenceStepData_c {}; @@ -53,14 +55,12 @@ struct daNpcT_MotionSeqMngr_c { /* 80ACF47C */ ~daNpcT_MotionSeqMngr_c(); }; +struct daNpcT_evtData_c {}; + struct daNpcT_motionAnmData_c {}; struct J3DJoint {}; -struct daNpcT_faceMotionAnmData_c {}; - -struct daNpcT_evtData_c {}; - struct daNpc_Seira_c { /* 80ACB7CC */ ~daNpc_Seira_c(); /* 80ACB918 */ void create(); @@ -138,6 +138,8 @@ struct dCcD_GObjInf { /* 800844F8 */ void GetTgHitObj(); }; +struct _GXColorS10 {}; + struct J3DModel {}; struct cXyz { @@ -146,8 +148,6 @@ struct cXyz { /* 80ACF478 */ cXyz(); }; -struct _GXColorS10 {}; - struct daNpcT_c { /* 80147FA4 */ void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*); /* 80148094 */ void getTrnsfrmKeyAnmP(char const*, int); @@ -325,13 +325,13 @@ struct dBgS_AcchCir { /* 80ACF4C4 */ ~dBgS_AcchCir(); }; -struct dBgS {}; - struct csXyz { /* 80ACEF38 */ ~csXyz(); /* 80ACF378 */ csXyz(); }; +struct dBgS {}; + struct dBgS_Acch { /* 80075F94 */ ~dBgS_Acch(); /* 800760A0 */ dBgS_Acch(); @@ -525,8 +525,8 @@ extern "C" void drawGhost__8daNpcT_cFv(); extern "C" bool afterSetFaceMotionAnm__8daNpcT_cFiifi(); extern "C" void getFaceMotionAnm__8daNpcT_cF26daNpcT_faceMotionAnmData_c(); extern "C" void getMotionAnm__8daNpcT_cF22daNpcT_motionAnmData_c(); -extern "C" void func_80ACFA28(int*); -extern "C" void func_80ACFA44(int, int); +extern "C" void func_80ACFA28(void* _this, int*); +extern "C" void func_80ACFA44(void* _this, int, int); extern "C" void __sinit_d_a_npc_seira_cpp(); extern "C" void __ct__13daNpc_Seira_cFPC26daNpcT_faceMotionAnmData_cPC22daNpcT_motionAnmData_cPCQ222daNpcT_MotionSeqMngr_c18sequenceStepData_ciPCQ222daNpcT_MotionSeqMngr_c18sequenceStepData_ciPC16daNpcT_evtData_cPPc(); @@ -722,6 +722,20 @@ extern "C" void __register_global_object(); // /* ############################################################################################## */ +/* 80ACFF04-80ACFF04 000114 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80ACFF04 = ""; +SECTION_DEAD static char const* const stringBase_80ACFF05 = "DEFAULT_GETITEM"; +SECTION_DEAD static char const* const stringBase_80ACFF15 = "CONVERSATION_ABOUT_SARU01"; +SECTION_DEAD static char const* const stringBase_80ACFF2F = "CONVERSATION_ABOUT_SARU02"; +SECTION_DEAD static char const* const stringBase_80ACFF49 = "Seira"; +SECTION_DEAD static char const* const stringBase_80ACFF4F = "SeraBtl"; +SECTION_DEAD static char const* const stringBase_80ACFF57 = "Sera"; +SECTION_DEAD static char const* const stringBase_80ACFF5C = "Seira_p1"; +SECTION_DEAD static char const* const stringBase_80ACFF65 = "CONVERSATION_ABOUT_SARU"; +#pragma pop + /* 80ACFF90-80ACFF9C 000000 000C+00 4/4 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -1337,34 +1351,34 @@ SECTION_RODATA u8 const daNpc_Seira_Param_c::m[140] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80ACFDF0, &daNpc_Seira_Param_c::m); +COMPILER_STRIP_GATE(0x80ACFDF0, &daNpc_Seira_Param_c::m); /* 80ACFE7C-80ACFE80 00008C 0004+00 0/1 0/0 0/0 .rodata @3968 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3968 = -300.0f; -COMPILER_STRIP_GATE(80ACFE7C, &lit_3968); +COMPILER_STRIP_GATE(0x80ACFE7C, &lit_3968); #pragma pop /* 80ACFE80-80ACFE84 000090 0004+00 0/1 0/0 0/0 .rodata @3969 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3969 = -50.0f; -COMPILER_STRIP_GATE(80ACFE80, &lit_3969); +COMPILER_STRIP_GATE(0x80ACFE80, &lit_3969); #pragma pop /* 80ACFE84-80ACFE88 000094 0004+00 0/1 0/0 0/0 .rodata @3970 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3970 = 300.0f; -COMPILER_STRIP_GATE(80ACFE84, &lit_3970); +COMPILER_STRIP_GATE(0x80ACFE84, &lit_3970); #pragma pop /* 80ACFE88-80ACFE8C 000098 0004+00 0/1 0/0 0/0 .rodata @3971 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3971 = 450.0f; -COMPILER_STRIP_GATE(80ACFE88, &lit_3971); +COMPILER_STRIP_GATE(0x80ACFE88, &lit_3971); #pragma pop /* 80ACB918-80ACBBD4 000238 02BC+00 1/1 0/0 0/0 .text create__13daNpc_Seira_cFv */ @@ -1382,21 +1396,21 @@ asm void daNpc_Seira_c::create() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4060 = 0.25f; -COMPILER_STRIP_GATE(80ACFE8C, &lit_4060); +COMPILER_STRIP_GATE(0x80ACFE8C, &lit_4060); #pragma pop /* 80ACFE90-80ACFE94 0000A0 0004+00 0/2 0/0 0/0 .rodata @4061 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4061 = 20.0f; -COMPILER_STRIP_GATE(80ACFE90, &lit_4061); +COMPILER_STRIP_GATE(0x80ACFE90, &lit_4061); #pragma pop /* 80ACFE94-80ACFE98 0000A4 0004+00 0/1 0/0 0/0 .rodata @4062 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4062 = 5.0f; -COMPILER_STRIP_GATE(80ACFE94, &lit_4062); +COMPILER_STRIP_GATE(0x80ACFE94, &lit_4062); #pragma pop /* 80ACFE98-80ACFE9C 0000A8 0004+00 13/20 0/0 0/0 .rodata @4063 */ @@ -1406,36 +1420,36 @@ SECTION_RODATA static u8 const lit_4063[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80ACFE98, &lit_4063); +COMPILER_STRIP_GATE(0x80ACFE98, &lit_4063); /* 80ACFE9C-80ACFEA0 0000AC 0004+00 1/2 0/0 0/0 .rodata @4064 */ SECTION_RODATA static f32 const lit_4064 = 100.0f; -COMPILER_STRIP_GATE(80ACFE9C, &lit_4064); +COMPILER_STRIP_GATE(0x80ACFE9C, &lit_4064); /* 80ACFEA0-80ACFEA4 0000B0 0004+00 0/1 0/0 0/0 .rodata @4065 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4065 = 60.0f; -COMPILER_STRIP_GATE(80ACFEA0, &lit_4065); +COMPILER_STRIP_GATE(0x80ACFEA0, &lit_4065); #pragma pop /* 80ACFEA4-80ACFEA8 0000B4 0004+00 0/2 0/0 0/0 .rodata @4286 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4286 = 65536.0f; -COMPILER_STRIP_GATE(80ACFEA4, &lit_4286); +COMPILER_STRIP_GATE(0x80ACFEA4, &lit_4286); #pragma pop /* 80ACFEA8-80ACFEAC 0000B8 0004+00 0/3 0/0 0/0 .rodata @4287 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4287 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(80ACFEA8, &lit_4287); +COMPILER_STRIP_GATE(0x80ACFEA8, &lit_4287); #pragma pop /* 80ACFEAC-80ACFEB0 0000BC 0004+00 2/5 0/0 0/0 .rodata @4455 */ SECTION_RODATA static f32 const lit_4455 = 1.0f; -COMPILER_STRIP_GATE(80ACFEAC, &lit_4455); +COMPILER_STRIP_GATE(0x80ACFEAC, &lit_4455); /* 80ACBBD4-80ACBF40 0004F4 036C+00 1/1 0/0 0/0 .text CreateHeap__13daNpc_Seira_cFv */ #pragma push @@ -1688,7 +1702,7 @@ asm void daNpc_Seira_c::checkChangeEvt() { /* ############################################################################################## */ /* 80ACFEB0-80ACFEB4 0000C0 0004+00 10/11 0/0 0/0 .rodata @4716 */ SECTION_RODATA static f32 const lit_4716 = -1.0f; -COMPILER_STRIP_GATE(80ACFEB0, &lit_4716); +COMPILER_STRIP_GATE(0x80ACFEB0, &lit_4716); /* 80ACC8C0-80ACC980 0011E0 00C0+00 1/0 0/0 0/0 .text setAfterTalkMotion__13daNpc_Seira_cFv */ #pragma push @@ -1755,42 +1769,42 @@ asm void daNpc_Seira_c::beforeMove() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4920 = -30.0f; -COMPILER_STRIP_GATE(80ACFEB4, &lit_4920); +COMPILER_STRIP_GATE(0x80ACFEB4, &lit_4920); #pragma pop /* 80ACFEB8-80ACFEBC 0000C8 0004+00 0/1 0/0 0/0 .rodata @4921 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4921 = 10.0f; -COMPILER_STRIP_GATE(80ACFEB8, &lit_4921); +COMPILER_STRIP_GATE(0x80ACFEB8, &lit_4921); #pragma pop /* 80ACFEBC-80ACFEC0 0000CC 0004+00 0/1 0/0 0/0 .rodata @4922 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4922 = 0x38C90FDB; -COMPILER_STRIP_GATE(80ACFEBC, &lit_4922); +COMPILER_STRIP_GATE(0x80ACFEBC, &lit_4922); #pragma pop /* 80ACFEC0-80ACFEC4 0000D0 0004+00 0/1 0/0 0/0 .rodata @4923 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4923 = 170.0f; -COMPILER_STRIP_GATE(80ACFEC0, &lit_4923); +COMPILER_STRIP_GATE(0x80ACFEC0, &lit_4923); #pragma pop /* 80ACFEC4-80ACFEC8 0000D4 0004+00 0/1 0/0 0/0 .rodata @4924 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4924 = 80.0f; -COMPILER_STRIP_GATE(80ACFEC4, &lit_4924); +COMPILER_STRIP_GATE(0x80ACFEC4, &lit_4924); #pragma pop /* 80ACFEC8-80ACFED0 0000D8 0008+00 2/4 0/0 0/0 .rodata @4926 */ SECTION_RODATA static u8 const lit_4926[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80ACFEC8, &lit_4926); +COMPILER_STRIP_GATE(0x80ACFEC8, &lit_4926); /* 80ACCED0-80ACD1D0 0017F0 0300+00 1/0 0/0 0/0 .text setAttnPos__13daNpc_Seira_cFv */ #pragma push @@ -1895,7 +1909,7 @@ asm void daNpc_Seira_c::changeBtk(int* param_0, int* param_1) { SECTION_RODATA static u8 const lit_4984[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80ACFED0, &lit_4984); +COMPILER_STRIP_GATE(0x80ACFED0, &lit_4984); #pragma pop /* 80ACFED8-80ACFEE0 0000E8 0008+00 0/1 0/0 0/0 .rodata @4985 */ @@ -1904,7 +1918,7 @@ COMPILER_STRIP_GATE(80ACFED0, &lit_4984); SECTION_RODATA static u8 const lit_4985[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80ACFED8, &lit_4985); +COMPILER_STRIP_GATE(0x80ACFED8, &lit_4985); #pragma pop /* 80ACFEE0-80ACFEE8 0000F0 0008+00 0/1 0/0 0/0 .rodata @4986 */ @@ -1913,12 +1927,12 @@ COMPILER_STRIP_GATE(80ACFED8, &lit_4985); SECTION_RODATA static u8 const lit_4986[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80ACFEE0, &lit_4986); +COMPILER_STRIP_GATE(0x80ACFEE0, &lit_4986); #pragma pop /* 80ACFEE8-80ACFEEC 0000F8 0004+00 1/1 0/0 0/0 .rodata @5182 */ SECTION_RODATA static f32 const lit_5182 = 200.0f; -COMPILER_STRIP_GATE(80ACFEE8, &lit_5182); +COMPILER_STRIP_GATE(0x80ACFEE8, &lit_5182); /* 80ACD770-80ACD900 002090 0190+00 1/1 0/0 0/0 .text selectAction__13daNpc_Seira_cFv */ #pragma push @@ -1935,7 +1949,7 @@ asm void daNpc_Seira_c::selectAction() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpc_Seira_c::chkAction(int (daNpc_Seira_c::*)(void*)) { +asm void daNpc_Seira_c::chkAction(int (daNpc_Seira_c::*param_0)(void*)) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_seira/d_a_npc_seira/chkAction__13daNpc_Seira_cFM13daNpc_Seira_cFPCvPvPv_i.s" } @@ -1946,7 +1960,7 @@ asm void daNpc_Seira_c::chkAction(int (daNpc_Seira_c::*)(void*)) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpc_Seira_c::setAction(int (daNpc_Seira_c::*)(void*)) { +asm void daNpc_Seira_c::setAction(int (daNpc_Seira_c::*param_0)(void*)) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_seira/d_a_npc_seira/setAction__13daNpc_Seira_cFM13daNpc_Seira_cFPCvPvPv_i.s" } @@ -1959,7 +1973,7 @@ asm void daNpc_Seira_c::setAction(int (daNpc_Seira_c::*)(void*)) { SECTION_RODATA static u8 const lit_5204[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80ACFEEC, &lit_5204); +COMPILER_STRIP_GATE(0x80ACFEEC, &lit_5204); #pragma pop /* 80ACFEF8-80ACFF04 000108 000C+00 0/1 0/0 0/0 .rodata @5212 */ @@ -1968,7 +1982,14 @@ COMPILER_STRIP_GATE(80ACFEEC, &lit_5204); SECTION_RODATA static u8 const lit_5212[12] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, }; -COMPILER_STRIP_GATE(80ACFEF8, &lit_5212); +COMPILER_STRIP_GATE(0x80ACFEF8, &lit_5212); +#pragma pop + +/* 80ACFF04-80ACFF04 000114 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80ACFF7D = "prm"; +SECTION_DEAD static char const* const stringBase_80ACFF81 = "msgNo"; #pragma pop /* 80ACD9D4-80ACDC6C 0022F4 0298+00 1/0 0/0 0/0 .text cutConversationAboutSaru__13daNpc_Seira_cFi @@ -1982,6 +2003,13 @@ asm void daNpc_Seira_c::cutConversationAboutSaru(int param_0) { } #pragma pop +/* ############################################################################################## */ +/* 80ACFF04-80ACFF04 000114 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80ACFF87 = "R_SP01"; +#pragma pop + /* 80ACDC6C-80ACDCE4 00258C 0078+00 4/4 0/0 0/0 .text checkStageIsSeirasShop__13daNpc_Seira_cFv */ #pragma push #pragma optimization_level 0 @@ -2424,7 +2452,7 @@ asm void daNpcT_c::getMotionAnm(daNpcT_motionAnmData_c param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80ACFA28(int* param_0) { +extern "C" asm void func_80ACFA28(void* _this, int* param_0) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_seira/d_a_npc_seira/func_80ACFA28.s" } @@ -2434,7 +2462,7 @@ extern "C" asm void func_80ACFA28(int* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80ACFA44(int param_0, int param_1) { +extern "C" asm void func_80ACFA44(void* _this, int param_0, int param_1) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_seira/d_a_npc_seira/func_80ACFA44.s" } @@ -2466,7 +2494,7 @@ asm void __sinit_d_a_npc_seira_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80ACFAC0 = (void*)__sinit_d_a_npc_seira_cpp; +REGISTER_CTORS(0x80ACFAC0, __sinit_d_a_npc_seira_cpp); #pragma pop /* 80ACFB48-80ACFC14 004468 00CC+00 1/1 0/0 0/0 .text @@ -2594,20 +2622,4 @@ bool dShopSystem_c::beforeSelectSeqAction(dMsgFlow_c* param_0, int param_1) { return true; } -/* 80ACFF04-80ACFF8E 000114 008A+00 6/3 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80ACFF04 = ""; -SECTION_DEAD static char const* const stringBase_80ACFF05 = "DEFAULT_GETITEM"; -SECTION_DEAD static char const* const stringBase_80ACFF15 = "CONVERSATION_ABOUT_SARU01"; -SECTION_DEAD static char const* const stringBase_80ACFF2F = "CONVERSATION_ABOUT_SARU02"; -SECTION_DEAD static char const* const stringBase_80ACFF49 = "Seira"; -SECTION_DEAD static char const* const stringBase_80ACFF4F = "SeraBtl"; -SECTION_DEAD static char const* const stringBase_80ACFF57 = "Sera"; -SECTION_DEAD static char const* const stringBase_80ACFF5C = "Seira_p1"; -SECTION_DEAD static char const* const stringBase_80ACFF65 = "CONVERSATION_ABOUT_SARU"; -SECTION_DEAD static char const* const stringBase_80ACFF7D = "prm"; -SECTION_DEAD static char const* const stringBase_80ACFF81 = "msgNo"; -SECTION_DEAD static char const* const stringBase_80ACFF87 = "R_SP01"; -#pragma pop +/* 80ACFF04-80ACFF04 000114 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/npc/d_a_npc_seira2/d_a_npc_seira2.cpp b/rel/d/a/npc/d_a_npc_seira2/d_a_npc_seira2.cpp index cda3877b566..9275060d8a9 100644 --- a/rel/d/a/npc/d_a_npc_seira2/d_a_npc_seira2.cpp +++ b/rel/d/a/npc/d_a_npc_seira2/d_a_npc_seira2.cpp @@ -15,12 +15,14 @@ struct mDoMtx_stack_c { static u8 now[48]; }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; +struct J3DAnmTransform {}; + +struct J3DModelData {}; + struct Vec {}; struct Z2Creature { @@ -28,8 +30,6 @@ struct Z2Creature { /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -45,6 +45,8 @@ struct fopAc_ac_c { /* 80018B64 */ fopAc_ac_c(); }; +struct daNpcT_faceMotionAnmData_c {}; + struct daNpcT_MotionSeqMngr_c { struct sequenceStepData_c {}; @@ -53,14 +55,12 @@ struct daNpcT_MotionSeqMngr_c { /* 80AD40F4 */ ~daNpcT_MotionSeqMngr_c(); }; +struct daNpcT_evtData_c {}; + struct daNpcT_motionAnmData_c {}; struct J3DJoint {}; -struct daNpcT_faceMotionAnmData_c {}; - -struct daNpcT_evtData_c {}; - struct daNpc_Seira2_c { /* 80AD0C0C */ ~daNpc_Seira2_c(); /* 80AD0D58 */ void create(); @@ -129,6 +129,8 @@ struct dCcD_GObjInf { /* 800840E4 */ ~dCcD_GObjInf(); }; +struct _GXColorS10 {}; + struct J3DModel {}; struct cXyz { @@ -137,8 +139,6 @@ struct cXyz { /* 80AD40F0 */ cXyz(); }; -struct _GXColorS10 {}; - struct daNpcT_c { /* 80147FA4 */ void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*); /* 80148094 */ void getTrnsfrmKeyAnmP(char const*, int); @@ -319,13 +319,13 @@ struct dBgS_AcchCir { /* 80AD413C */ ~dBgS_AcchCir(); }; -struct dBgS {}; - struct csXyz { /* 80AD3BB0 */ ~csXyz(); /* 80AD3FF0 */ csXyz(); }; +struct dBgS {}; + struct dBgS_Acch { /* 80075F94 */ ~dBgS_Acch(); /* 800760A0 */ dBgS_Acch(); @@ -516,8 +516,8 @@ extern "C" void changeAnm__8daNpcT_cFPiPi(); extern "C" void changeBck__8daNpcT_cFPiPi(); extern "C" void changeBtp__8daNpcT_cFPiPi(); extern "C" void changeBtk__8daNpcT_cFPiPi(); -extern "C" void func_80AD46B8(int*); -extern "C" void func_80AD46D4(int, int); +extern "C" void func_80AD46B8(void* _this, int*); +extern "C" void func_80AD46D4(void* _this, int, int); extern "C" void __sinit_d_a_npc_seira2_cpp(); extern "C" void __ct__14daNpc_Seira2_cFPC26daNpcT_faceMotionAnmData_cPC22daNpcT_motionAnmData_cPCQ222daNpcT_MotionSeqMngr_c18sequenceStepData_ciPCQ222daNpcT_MotionSeqMngr_c18sequenceStepData_ciPC16daNpcT_evtData_cPPc(); @@ -706,6 +706,16 @@ extern "C" void __register_global_object(); // /* ############################################################################################## */ +/* 80AD4B5C-80AD4B5C 0000FC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80AD4B5C = ""; +SECTION_DEAD static char const* const stringBase_80AD4B5D = "DEFAULT_GETITEM"; +SECTION_DEAD static char const* const stringBase_80AD4B6D = "Seira"; +SECTION_DEAD static char const* const stringBase_80AD4B73 = "SeraBtl"; +SECTION_DEAD static char const* const stringBase_80AD4B7B = "Sera"; +#pragma pop + /* 80AD4B90-80AD4B9C 000000 000C+00 4/4 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -1243,34 +1253,34 @@ SECTION_RODATA u8 const daNpc_Seira2_Param_c::m[140] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AD4A60, &daNpc_Seira2_Param_c::m); +COMPILER_STRIP_GATE(0x80AD4A60, &daNpc_Seira2_Param_c::m); /* 80AD4AEC-80AD4AF0 00008C 0004+00 0/1 0/0 0/0 .rodata @3960 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3960 = -300.0f; -COMPILER_STRIP_GATE(80AD4AEC, &lit_3960); +COMPILER_STRIP_GATE(0x80AD4AEC, &lit_3960); #pragma pop /* 80AD4AF0-80AD4AF4 000090 0004+00 0/1 0/0 0/0 .rodata @3961 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3961 = -50.0f; -COMPILER_STRIP_GATE(80AD4AF0, &lit_3961); +COMPILER_STRIP_GATE(0x80AD4AF0, &lit_3961); #pragma pop /* 80AD4AF4-80AD4AF8 000094 0004+00 0/1 0/0 0/0 .rodata @3962 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3962 = 300.0f; -COMPILER_STRIP_GATE(80AD4AF4, &lit_3962); +COMPILER_STRIP_GATE(0x80AD4AF4, &lit_3962); #pragma pop /* 80AD4AF8-80AD4AFC 000098 0004+00 0/1 0/0 0/0 .rodata @3963 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3963 = 450.0f; -COMPILER_STRIP_GATE(80AD4AF8, &lit_3963); +COMPILER_STRIP_GATE(0x80AD4AF8, &lit_3963); #pragma pop /* 80AD0D58-80AD0FF8 000238 02A0+00 1/1 0/0 0/0 .text create__14daNpc_Seira2_cFv */ @@ -1288,21 +1298,21 @@ asm void daNpc_Seira2_c::create() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4052 = 0.25f; -COMPILER_STRIP_GATE(80AD4AFC, &lit_4052); +COMPILER_STRIP_GATE(0x80AD4AFC, &lit_4052); #pragma pop /* 80AD4B00-80AD4B04 0000A0 0004+00 0/2 0/0 0/0 .rodata @4053 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4053 = 20.0f; -COMPILER_STRIP_GATE(80AD4B00, &lit_4053); +COMPILER_STRIP_GATE(0x80AD4B00, &lit_4053); #pragma pop /* 80AD4B04-80AD4B08 0000A4 0004+00 0/1 0/0 0/0 .rodata @4054 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4054 = 5.0f; -COMPILER_STRIP_GATE(80AD4B04, &lit_4054); +COMPILER_STRIP_GATE(0x80AD4B04, &lit_4054); #pragma pop /* 80AD4B08-80AD4B0C 0000A8 0004+00 11/18 0/0 0/0 .rodata @4055 */ @@ -1312,36 +1322,36 @@ SECTION_RODATA static u8 const lit_4055[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AD4B08, &lit_4055); +COMPILER_STRIP_GATE(0x80AD4B08, &lit_4055); /* 80AD4B0C-80AD4B10 0000AC 0004+00 1/2 0/0 0/0 .rodata @4056 */ SECTION_RODATA static f32 const lit_4056 = 100.0f; -COMPILER_STRIP_GATE(80AD4B0C, &lit_4056); +COMPILER_STRIP_GATE(0x80AD4B0C, &lit_4056); /* 80AD4B10-80AD4B14 0000B0 0004+00 0/1 0/0 0/0 .rodata @4057 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4057 = 60.0f; -COMPILER_STRIP_GATE(80AD4B10, &lit_4057); +COMPILER_STRIP_GATE(0x80AD4B10, &lit_4057); #pragma pop /* 80AD4B14-80AD4B18 0000B4 0004+00 0/2 0/0 0/0 .rodata @4278 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4278 = 65536.0f; -COMPILER_STRIP_GATE(80AD4B14, &lit_4278); +COMPILER_STRIP_GATE(0x80AD4B14, &lit_4278); #pragma pop /* 80AD4B18-80AD4B1C 0000B8 0004+00 0/3 0/0 0/0 .rodata @4279 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4279 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(80AD4B18, &lit_4279); +COMPILER_STRIP_GATE(0x80AD4B18, &lit_4279); #pragma pop /* 80AD4B1C-80AD4B20 0000BC 0004+00 2/5 0/0 0/0 .rodata @4443 */ SECTION_RODATA static f32 const lit_4443 = 1.0f; -COMPILER_STRIP_GATE(80AD4B1C, &lit_4443); +COMPILER_STRIP_GATE(0x80AD4B1C, &lit_4443); /* 80AD0FF8-80AD134C 0004D8 0354+00 1/1 0/0 0/0 .text CreateHeap__14daNpc_Seira2_cFv */ #pragma push @@ -1585,7 +1595,7 @@ asm void daNpc_Seira2_c::setParam() { /* ############################################################################################## */ /* 80AD4B20-80AD4B24 0000C0 0004+00 7/9 0/0 0/0 .rodata @4661 */ SECTION_RODATA static f32 const lit_4661 = -1.0f; -COMPILER_STRIP_GATE(80AD4B20, &lit_4661); +COMPILER_STRIP_GATE(0x80AD4B20, &lit_4661); /* 80AD1B38-80AD1BF8 001018 00C0+00 1/0 0/0 0/0 .text setAfterTalkMotion__14daNpc_Seira2_cFv */ #pragma push @@ -1617,6 +1627,13 @@ asm void daNpc_Seira2_c::evtTalk() { } #pragma pop +/* ############################################################################################## */ +/* 80AD4B5C-80AD4B5C 0000FC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80AD4B80 = "Seira2"; +#pragma pop + /* 80AD1E04-80AD1ED4 0012E4 00D0+00 1/0 0/0 0/0 .text evtCutProc__14daNpc_Seira2_cFv */ #pragma push #pragma optimization_level 0 @@ -1652,42 +1669,42 @@ asm void daNpc_Seira2_c::beforeMove() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4854 = -30.0f; -COMPILER_STRIP_GATE(80AD4B24, &lit_4854); +COMPILER_STRIP_GATE(0x80AD4B24, &lit_4854); #pragma pop /* 80AD4B28-80AD4B2C 0000C8 0004+00 0/1 0/0 0/0 .rodata @4855 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4855 = 10.0f; -COMPILER_STRIP_GATE(80AD4B28, &lit_4855); +COMPILER_STRIP_GATE(0x80AD4B28, &lit_4855); #pragma pop /* 80AD4B2C-80AD4B30 0000CC 0004+00 0/1 0/0 0/0 .rodata @4856 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4856 = 0x38C90FDB; -COMPILER_STRIP_GATE(80AD4B2C, &lit_4856); +COMPILER_STRIP_GATE(0x80AD4B2C, &lit_4856); #pragma pop /* 80AD4B30-80AD4B34 0000D0 0004+00 0/1 0/0 0/0 .rodata @4857 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4857 = 170.0f; -COMPILER_STRIP_GATE(80AD4B30, &lit_4857); +COMPILER_STRIP_GATE(0x80AD4B30, &lit_4857); #pragma pop /* 80AD4B34-80AD4B38 0000D4 0004+00 0/1 0/0 0/0 .rodata @4858 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4858 = 80.0f; -COMPILER_STRIP_GATE(80AD4B34, &lit_4858); +COMPILER_STRIP_GATE(0x80AD4B34, &lit_4858); #pragma pop /* 80AD4B38-80AD4B40 0000D8 0008+00 2/4 0/0 0/0 .rodata @4860 */ SECTION_RODATA static u8 const lit_4860[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AD4B38, &lit_4860); +COMPILER_STRIP_GATE(0x80AD4B38, &lit_4860); /* 80AD20A8-80AD23A8 001588 0300+00 1/0 0/0 0/0 .text setAttnPos__14daNpc_Seira2_cFv */ #pragma push @@ -1760,7 +1777,7 @@ asm void daNpc_Seira2_c::selectAction() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpc_Seira2_c::chkAction(int (daNpc_Seira2_c::*)(void*)) { +asm void daNpc_Seira2_c::chkAction(int (daNpc_Seira2_c::*param_0)(void*)) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_seira2/d_a_npc_seira2/chkAction__14daNpc_Seira2_cFM14daNpc_Seira2_cFPCvPvPv_i.s" } @@ -1771,12 +1788,19 @@ asm void daNpc_Seira2_c::chkAction(int (daNpc_Seira2_c::*)(void*)) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpc_Seira2_c::setAction(int (daNpc_Seira2_c::*)(void*)) { +asm void daNpc_Seira2_c::setAction(int (daNpc_Seira2_c::*param_0)(void*)) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_seira2/d_a_npc_seira2/setAction__14daNpc_Seira2_cFM14daNpc_Seira2_cFPCvPvPv_i.s" } #pragma pop +/* ############################################################################################## */ +/* 80AD4B5C-80AD4B5C 0000FC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80AD4B87 = "R_SP01"; +#pragma pop + /* 80AD2944-80AD29BC 001E24 0078+00 2/2 0/0 0/0 .text checkStageIsSeira2sShop__14daNpc_Seira2_cFv */ #pragma push @@ -1835,7 +1859,7 @@ asm void daNpc_Seira2_c::worry(void* param_0) { SECTION_RODATA static u8 const lit_4918[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AD4B40, &lit_4918); +COMPILER_STRIP_GATE(0x80AD4B40, &lit_4918); #pragma pop /* 80AD4B48-80AD4B50 0000E8 0008+00 0/1 0/0 0/0 .rodata @4919 */ @@ -1844,7 +1868,7 @@ COMPILER_STRIP_GATE(80AD4B40, &lit_4918); SECTION_RODATA static u8 const lit_4919[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AD4B48, &lit_4919); +COMPILER_STRIP_GATE(0x80AD4B48, &lit_4919); #pragma pop /* 80AD4B50-80AD4B58 0000F0 0008+00 0/1 0/0 0/0 .rodata @4920 */ @@ -1853,14 +1877,14 @@ COMPILER_STRIP_GATE(80AD4B48, &lit_4919); SECTION_RODATA static u8 const lit_4920[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AD4B50, &lit_4920); +COMPILER_STRIP_GATE(0x80AD4B50, &lit_4920); #pragma pop /* 80AD4B58-80AD4B5C 0000F8 0004+00 0/1 0/0 0/0 .rodata @5421 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5421 = 350.0f; -COMPILER_STRIP_GATE(80AD4B58, &lit_5421); +COMPILER_STRIP_GATE(0x80AD4B58, &lit_5421); #pragma pop /* 80AD31F0-80AD3508 0026D0 0318+00 1/0 0/0 0/0 .text sad__14daNpc_Seira2_cFPv */ @@ -2258,7 +2282,7 @@ void daNpcT_c::changeBtk(int* param_0, int* param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80AD46B8(int* param_0) { +extern "C" asm void func_80AD46B8(void* _this, int* param_0) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_seira2/d_a_npc_seira2/func_80AD46B8.s" } @@ -2268,7 +2292,7 @@ extern "C" asm void func_80AD46B8(int* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80AD46D4(int param_0, int param_1) { +extern "C" asm void func_80AD46D4(void* _this, int param_0, int param_1) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_seira2/d_a_npc_seira2/func_80AD46D4.s" } @@ -2300,7 +2324,7 @@ asm void __sinit_d_a_npc_seira2_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80AD4750 = (void*)__sinit_d_a_npc_seira2_cpp; +REGISTER_CTORS(0x80AD4750, __sinit_d_a_npc_seira2_cpp); #pragma pop /* 80AD47B8-80AD4884 003C98 00CC+00 1/1 0/0 0/0 .text @@ -2426,15 +2450,4 @@ bool dShopSystem_c::beforeSelectSeqAction(dMsgFlow_c* param_0, int param_1) { return true; } -/* 80AD4B5C-80AD4B8E 0000FC 0032+00 5/2 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80AD4B5C = ""; -SECTION_DEAD static char const* const stringBase_80AD4B5D = "DEFAULT_GETITEM"; -SECTION_DEAD static char const* const stringBase_80AD4B6D = "Seira"; -SECTION_DEAD static char const* const stringBase_80AD4B73 = "SeraBtl"; -SECTION_DEAD static char const* const stringBase_80AD4B7B = "Sera"; -SECTION_DEAD static char const* const stringBase_80AD4B80 = "Seira2"; -SECTION_DEAD static char const* const stringBase_80AD4B87 = "R_SP01"; -#pragma pop +/* 80AD4B5C-80AD4B5C 0000FC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/npc/d_a_npc_seirei/d_a_npc_seirei.cpp b/rel/d/a/npc/d_a_npc_seirei/d_a_npc_seirei.cpp index 4c35518715f..66d1103cc47 100644 --- a/rel/d/a/npc/d_a_npc_seirei/d_a_npc_seirei.cpp +++ b/rel/d/a/npc/d_a_npc_seirei/d_a_npc_seirei.cpp @@ -15,12 +15,14 @@ struct mDoMtx_stack_c { static u8 now[48]; }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; +struct J3DAnmTransform {}; + +struct J3DModelData {}; + struct Vec {}; struct Z2Creature { @@ -29,8 +31,6 @@ struct Z2Creature { /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -43,6 +43,8 @@ struct fopAc_ac_c { /* 80018C8C */ ~fopAc_ac_c(); }; +struct daNpcT_faceMotionAnmData_c {}; + struct daNpcT_MotionSeqMngr_c { struct sequenceStepData_c {}; @@ -51,12 +53,10 @@ struct daNpcT_MotionSeqMngr_c { /* 80AD787C */ ~daNpcT_MotionSeqMngr_c(); }; -struct daNpcT_motionAnmData_c {}; - -struct daNpcT_faceMotionAnmData_c {}; - struct daNpcT_evtData_c {}; +struct daNpcT_motionAnmData_c {}; + struct daNpc_Seirei_c { /* 80AD572C */ ~daNpc_Seirei_c(); /* 80AD57C4 */ void create(); @@ -102,21 +102,21 @@ struct daNpc_Seirei_Param_c { static u8 const m[148]; }; +struct J3DAnmTextureSRTKey {}; + +struct _GXColorS10 {}; + struct J3DModel {}; -struct J3DAnmTextureSRTKey {}; +struct J3DJoint {}; + +struct J3DAnmTevRegKey {}; struct cXyz { /* 80AD72B4 */ ~cXyz(); /* 80AD7830 */ cXyz(); }; -struct _GXColorS10 {}; - -struct J3DJoint {}; - -struct J3DAnmTevRegKey {}; - struct daNpcT_c { /* 8014810C */ void getTexSRTKeyAnmP(char const*, int); /* 80148148 */ void getTevRegKeyAnmP(char const*, int); @@ -206,13 +206,13 @@ struct dPa_levelEcallBack {}; struct dKy_tevstr_c {}; -struct _GXColor {}; - struct csXyz { /* 80AD72F0 */ ~csXyz(); /* 80AD7730 */ csXyz(); }; +struct _GXColor {}; + struct dPa_control_c { struct level_c { /* 8004B918 */ void getEmitter(u32); @@ -403,7 +403,7 @@ extern "C" void changeAnm__8daNpcT_cFPiPi(); extern "C" void changeBck__8daNpcT_cFPiPi(); extern "C" void changeBtp__8daNpcT_cFPiPi(); extern "C" void changeBtk__8daNpcT_cFPiPi(); -extern "C" void func_80AD7B54(int*); +extern "C" void func_80AD7B54(void* _this, int*); extern "C" void __sinit_d_a_npc_seirei_cpp(); extern "C" void __ct__14daNpc_Seirei_cFPC26daNpcT_faceMotionAnmData_cPC22daNpcT_motionAnmData_cPCQ222daNpcT_MotionSeqMngr_c18sequenceStepData_ciPCQ222daNpcT_MotionSeqMngr_c18sequenceStepData_ciPC16daNpcT_evtData_cPPc(); @@ -540,6 +540,18 @@ extern "C" void __register_global_object(); // /* ############################################################################################## */ +/* 80AD7D88-80AD7D88 0000E0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80AD7D88 = ""; +SECTION_DEAD static char const* const stringBase_80AD7D89 = "CONVERSATION_ABOUT_YM"; +SECTION_DEAD static char const* const stringBase_80AD7D9F = "DEFAULT_GETITEM"; +SECTION_DEAD static char const* const stringBase_80AD7DAF = "NO_RESPONSE"; +SECTION_DEAD static char const* const stringBase_80AD7DBB = "Seirei"; +SECTION_DEAD static char const* const stringBase_80AD7DC2 = "Seirei1"; +SECTION_DEAD static char const* const stringBase_80AD7DCA = "CONVERSATION"; +#pragma pop + /* 80AD7DE4-80AD7DF0 000000 000C+00 2/2 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -862,11 +874,11 @@ SECTION_RODATA u8 const daNpc_Seirei_Param_c::m[148] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x44, 0x96, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AD7CA8, &daNpc_Seirei_Param_c::m); +COMPILER_STRIP_GATE(0x80AD7CA8, &daNpc_Seirei_Param_c::m); /* 80AD7D3C-80AD7D40 000094 0004+00 1/1 0/0 0/0 .rodata @4042 */ SECTION_RODATA static f32 const lit_4042 = -1000000000.0f; -COMPILER_STRIP_GATE(80AD7D3C, &lit_4042); +COMPILER_STRIP_GATE(0x80AD7D3C, &lit_4042); /* 80AD57C4-80AD5A7C 000184 02B8+00 1/1 0/0 0/0 .text create__14daNpc_Seirei_cFv */ #pragma push @@ -886,25 +898,25 @@ SECTION_RODATA static u8 const lit_4135[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AD7D40, &lit_4135); +COMPILER_STRIP_GATE(0x80AD7D40, &lit_4135); /* 80AD7D44-80AD7D48 00009C 0004+00 0/2 0/0 0/0 .rodata @4136 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4136 = 65536.0f; -COMPILER_STRIP_GATE(80AD7D44, &lit_4136); +COMPILER_STRIP_GATE(0x80AD7D44, &lit_4136); #pragma pop /* 80AD7D48-80AD7D4C 0000A0 0004+00 0/2 0/0 0/0 .rodata @4137 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4137 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(80AD7D48, &lit_4137); +COMPILER_STRIP_GATE(0x80AD7D48, &lit_4137); #pragma pop /* 80AD7D4C-80AD7D50 0000A4 0004+00 2/3 0/0 0/0 .rodata @4260 */ SECTION_RODATA static f32 const lit_4260 = 1.0f; -COMPILER_STRIP_GATE(80AD7D4C, &lit_4260); +COMPILER_STRIP_GATE(0x80AD7D4C, &lit_4260); /* 80AD5A7C-80AD5BC4 00043C 0148+00 1/1 0/0 0/0 .text CreateHeap__14daNpc_Seirei_cFv */ #pragma push @@ -939,7 +951,7 @@ asm void daNpc_Seirei_c::Execute() { /* ############################################################################################## */ /* 80AD7D50-80AD7D54 0000A8 0004+00 1/1 0/0 0/0 .rodata @4294 */ SECTION_RODATA static f32 const lit_4294 = 100.0f; -COMPILER_STRIP_GATE(80AD7D50, &lit_4294); +COMPILER_STRIP_GATE(0x80AD7D50, &lit_4294); /* 80AD5C18-80AD5CC0 0005D8 00A8+00 1/1 0/0 0/0 .text Draw__14daNpc_Seirei_cFv */ #pragma push @@ -980,7 +992,7 @@ bool daNpc_Seirei_c::isDelete() { /* ############################################################################################## */ /* 80AD7D54-80AD7D58 0000AC 0004+00 1/3 0/0 0/0 .rodata @4348 */ SECTION_RODATA static f32 const lit_4348 = -1.0f; -COMPILER_STRIP_GATE(80AD7D54, &lit_4348); +COMPILER_STRIP_GATE(0x80AD7D54, &lit_4348); /* 80AD5D34-80AD5EEC 0006F4 01B8+00 1/1 0/0 0/0 .text reset__14daNpc_Seirei_cFv */ #pragma push @@ -1068,28 +1080,28 @@ asm void daNpc_Seirei_c::beforeMove() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4513 = 300.0f; -COMPILER_STRIP_GATE(80AD7D58, &lit_4513); +COMPILER_STRIP_GATE(0x80AD7D58, &lit_4513); #pragma pop /* 80AD7D5C-80AD7D60 0000B4 0004+00 0/1 0/0 0/0 .rodata @4514 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4514 = 40.0f; -COMPILER_STRIP_GATE(80AD7D5C, &lit_4514); +COMPILER_STRIP_GATE(0x80AD7D5C, &lit_4514); #pragma pop /* 80AD7D60-80AD7D64 0000B8 0004+00 0/1 0/0 0/0 .rodata @4515 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4515 = 800.0f; -COMPILER_STRIP_GATE(80AD7D60, &lit_4515); +COMPILER_STRIP_GATE(0x80AD7D60, &lit_4515); #pragma pop /* 80AD7D64-80AD7D68 0000BC 0004+00 0/1 0/0 0/0 .rodata @4516 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4516 = 350.0f; -COMPILER_STRIP_GATE(80AD7D64, &lit_4516); +COMPILER_STRIP_GATE(0x80AD7D64, &lit_4516); #pragma pop /* 80AD6330-80AD6464 000CF0 0134+00 1/0 0/0 0/0 .text setAttnPos__14daNpc_Seirei_cFv */ @@ -1132,7 +1144,7 @@ asm void daNpc_Seirei_c::selectAction() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpc_Seirei_c::chkAction(int (daNpc_Seirei_c::*)(void*)) { +asm void daNpc_Seirei_c::chkAction(int (daNpc_Seirei_c::*param_0)(void*)) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_seirei/d_a_npc_seirei/chkAction__14daNpc_Seirei_cFM14daNpc_Seirei_cFPCvPvPv_i.s" } @@ -1143,7 +1155,7 @@ asm void daNpc_Seirei_c::chkAction(int (daNpc_Seirei_c::*)(void*)) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpc_Seirei_c::setAction(int (daNpc_Seirei_c::*)(void*)) { +asm void daNpc_Seirei_c::setAction(int (daNpc_Seirei_c::*param_0)(void*)) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_seirei/d_a_npc_seirei/setAction__14daNpc_Seirei_cFM14daNpc_Seirei_cFPCvPvPv_i.s" } @@ -1182,7 +1194,7 @@ SECTION_RODATA static u8 const id1[14 + 2 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AD7D68, &id1); +COMPILER_STRIP_GATE(0x80AD7D68, &id1); #pragma pop /* 80AD7D78-80AD7D88 0000D0 000E+02 0/1 0/0 0/0 .rodata id2$4628 */ @@ -1207,7 +1219,7 @@ SECTION_RODATA static u8 const id2[14 + 2 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AD7D78, &id2); +COMPILER_STRIP_GATE(0x80AD7D78, &id2); #pragma pop /* 80AD6808-80AD6A38 0011C8 0230+00 1/1 0/0 0/0 .text setPrtcls__14daNpc_Seirei_cFv */ @@ -1231,6 +1243,14 @@ asm void daNpc_Seirei_c::chkFirstMeeting() { } #pragma pop +/* ############################################################################################## */ +/* 80AD7D88-80AD7D88 0000E0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80AD7DD7 = "prm"; +SECTION_DEAD static char const* const stringBase_80AD7DDB = "timer"; +#pragma pop + /* 80AD6ABC-80AD6C58 00147C 019C+00 1/0 0/0 0/0 .text cutConversation__14daNpc_Seirei_cFi */ #pragma push @@ -1602,7 +1622,7 @@ void daNpcT_c::changeBtk(int* param_0, int* param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80AD7B54(int* param_0) { +extern "C" asm void func_80AD7B54(void* _this, int* param_0) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_seirei/d_a_npc_seirei/func_80AD7B54.s" } @@ -1634,7 +1654,7 @@ asm void __sinit_d_a_npc_seirei_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80AD7B70 = (void*)__sinit_d_a_npc_seirei_cpp; +REGISTER_CTORS(0x80AD7B70, __sinit_d_a_npc_seirei_cpp); #pragma pop /* 80AD7BF8-80AD7C3C 0025B8 0044+00 1/1 0/0 0/0 .text @@ -1684,17 +1704,4 @@ static asm void func_80AD7C8C() { } #pragma pop -/* 80AD7D88-80AD7DE1 0000E0 0059+00 5/2 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80AD7D88 = ""; -SECTION_DEAD static char const* const stringBase_80AD7D89 = "CONVERSATION_ABOUT_YM"; -SECTION_DEAD static char const* const stringBase_80AD7D9F = "DEFAULT_GETITEM"; -SECTION_DEAD static char const* const stringBase_80AD7DAF = "NO_RESPONSE"; -SECTION_DEAD static char const* const stringBase_80AD7DBB = "Seirei"; -SECTION_DEAD static char const* const stringBase_80AD7DC2 = "Seirei1"; -SECTION_DEAD static char const* const stringBase_80AD7DCA = "CONVERSATION"; -SECTION_DEAD static char const* const stringBase_80AD7DD7 = "prm"; -SECTION_DEAD static char const* const stringBase_80AD7DDB = "timer"; -#pragma pop +/* 80AD7D88-80AD7D88 0000E0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/npc/d_a_npc_shad/d_a_npc_shad.cpp b/rel/d/a/npc/d_a_npc_shad/d_a_npc_shad.cpp index 14d0d0d3e57..832ad018310 100644 --- a/rel/d/a/npc/d_a_npc_shad/d_a_npc_shad.cpp +++ b/rel/d/a/npc/d_a_npc_shad/d_a_npc_shad.cpp @@ -33,12 +33,12 @@ struct mDoExt_bckAnm { /* 8000D990 */ void changeBckOnly(J3DAnmTransform*); }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; +struct J3DModelData {}; + struct Z2Creature { /* 802C03C8 */ Z2Creature(); /* 802C0420 */ ~Z2Creature(); @@ -63,10 +63,10 @@ struct daTag_EvtArea_c { /* 8048C94C */ void chkPointInArea(cXyz, cXyz); }; -struct J3DJoint {}; - struct J3DModel {}; +struct J3DJoint {}; + struct daNpcShad_c { /* 80AD820C */ daNpcShad_c(); /* 80AD8420 */ ~daNpcShad_c(); @@ -123,16 +123,16 @@ struct daNpcShad_Param_c { static u8 const m[112]; }; -struct J3DAnmTextureSRTKey {}; - -struct _GXColorS10 {}; - struct J3DAnmTexPattern { /* 8032AF50 */ void getTexNo(u16, u16*) const; }; +struct J3DAnmTextureSRTKey {}; + struct J3DAnmTransformKey {}; +struct _GXColorS10 {}; + struct daNpcF_c { struct daNpcF_anmPlayData {}; @@ -238,7 +238,6 @@ struct dEvt_control_c { /* 80042914 */ void setSkipProc(void*, int (*)(void*, int), int); /* 800429A8 */ void onSkipFade(); /* 800432EC */ void convPId(unsigned int); - /* 800436EC */ void setPtI_Id(unsigned int); }; struct dEvent_manager_c { @@ -367,7 +366,7 @@ struct JMath { struct TSinCosTable {}; /* TSinCosTable<13, f32> */ struct TSinCosTable__template0 { - /* 80AE1544 */ void func_80AE1544(s16) /* const */; + /* 80AE1544 */ void func_80AE1544(void* _this, s16) /* const */; }; static u8 sincosTable_[65536]; @@ -479,7 +478,7 @@ extern "C" void ctrlBtk__11daNpcShad_cFv(); extern "C" void setAttnPos__11daNpcShad_cFv(); extern "C" void lookat__11daNpcShad_cFv(); extern "C" bool drawDbgInfo__11daNpcShad_cFv(); -extern "C" void func_80AE1544(s16); +extern "C" void func_80AE1544(void* _this, s16); extern "C" void __sinit_d_a_npc_shad_cpp(); extern "C" void __dt__18daNpcF_ActorMngr_cFv(); extern "C" void __ct__18daNpcF_ActorMngr_cFv(); @@ -695,6 +694,29 @@ extern "C" void __register_global_object(); // /* ############################################################################################## */ +/* 80AE24C4-80AE24C4 0004E8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80AE24C4 = "Shad"; +SECTION_DEAD static char const* const stringBase_80AE24C9 = "Shad1"; +SECTION_DEAD static char const* const stringBase_80AE24CF = "Shad2"; +SECTION_DEAD static char const* const stringBase_80AE24D5 = "Shad3"; +SECTION_DEAD static char const* const stringBase_80AE24DB = ""; +SECTION_DEAD static char const* const stringBase_80AE24DC = "THE_INTRODUCTION"; +SECTION_DEAD static char const* const stringBase_80AE24ED = "RESIST_MEETING"; +SECTION_DEAD static char const* const stringBase_80AE24FC = "SHAD_TO_CHANT_SPELL1"; +SECTION_DEAD static char const* const stringBase_80AE2511 = "SHAD_TO_CHANT_SPELL2"; +SECTION_DEAD static char const* const stringBase_80AE2526 = "SHAD_TO_CHANT_SPELL2_SKIP"; +SECTION_DEAD static char const* const stringBase_80AE2540 = "SHAD_DISCOVERY_CANNON"; +SECTION_DEAD static char const* const stringBase_80AE2556 = "SHAD_DISCOVERY_CANNON_SKIP"; +SECTION_DEAD static char const* const stringBase_80AE2571 = "SHAD_DISAPPEAR"; +SECTION_DEAD static char const* const stringBase_80AE2580 = "SHAD_DISAPPEAR_SKIP"; +SECTION_DEAD static char const* const stringBase_80AE2594 = "SHAD_CALLBACK"; +SECTION_DEAD static char const* const stringBase_80AE25A2 = "RESIST_WIRETAP_ASH"; +SECTION_DEAD static char const* const stringBase_80AE25B5 = "RESIST_WIRETAP_SHAD"; +SECTION_DEAD static char const* const stringBase_80AE25C9 = "RESIST_WIRETAP_RAFREL"; +#pragma pop + /* 80AE2620-80AE262C 000000 000C+00 7/7 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -1264,55 +1286,63 @@ SECTION_RODATA u8 const daNpcShad_Param_c::m[112] = { 0x42, 0xA0, 0x00, 0x00, 0x43, 0xFA, 0x00, 0x00, 0x43, 0x96, 0x00, 0x00, 0xC3, 0x96, 0x00, 0x00, 0x00, 0x3C, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41, 0x40, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AE1FDC, &daNpcShad_Param_c::m); +COMPILER_STRIP_GATE(0x80AE1FDC, &daNpcShad_Param_c::m); /* 80AE204C-80AE2050 000070 0004+00 0/1 0/0 0/0 .rodata @4402 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4402 = 0x4587B5BF; -COMPILER_STRIP_GATE(80AE204C, &lit_4402); +COMPILER_STRIP_GATE(0x80AE204C, &lit_4402); #pragma pop /* 80AE2050-80AE2054 000074 0004+00 0/1 0/0 0/0 .rodata @4403 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4403 = -1518.5f; -COMPILER_STRIP_GATE(80AE2050, &lit_4403); +COMPILER_STRIP_GATE(0x80AE2050, &lit_4403); #pragma pop /* 80AE2054-80AE2058 000078 0004+00 0/1 0/0 0/0 .rodata @4404 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4404 = 0xC576652C; -COMPILER_STRIP_GATE(80AE2054, &lit_4404); +COMPILER_STRIP_GATE(0x80AE2054, &lit_4404); #pragma pop /* 80AE2058-80AE205C 00007C 0004+00 0/1 0/0 0/0 .rodata @4405 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4405 = -100.0f; -COMPILER_STRIP_GATE(80AE2058, &lit_4405); +COMPILER_STRIP_GATE(0x80AE2058, &lit_4405); #pragma pop /* 80AE205C-80AE2060 000080 0004+00 0/1 0/0 0/0 .rodata @4406 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4406 = -50.0f; -COMPILER_STRIP_GATE(80AE205C, &lit_4406); +COMPILER_STRIP_GATE(0x80AE205C, &lit_4406); #pragma pop /* 80AE2060-80AE2064 000084 0004+00 0/1 0/0 0/0 .rodata @4407 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4407 = 100.0f; -COMPILER_STRIP_GATE(80AE2060, &lit_4407); +COMPILER_STRIP_GATE(0x80AE2060, &lit_4407); #pragma pop /* 80AE2064-80AE2068 000088 0004+00 0/1 0/0 0/0 .rodata @4408 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4408 = 220.0f; -COMPILER_STRIP_GATE(80AE2064, &lit_4408); +COMPILER_STRIP_GATE(0x80AE2064, &lit_4408); +#pragma pop + +/* 80AE24C4-80AE24C4 0004E8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80AE25DF = "R_SP116"; +SECTION_DEAD static char const* const stringBase_80AE25E7 = "R_SP209"; +SECTION_DEAD static char const* const stringBase_80AE25EF = "D_MN09"; #pragma pop /* 80AD8620-80AD8B60 000500 0540+00 1/1 0/0 0/0 .text Create__11daNpcShad_cFv */ @@ -1328,7 +1358,7 @@ asm void daNpcShad_c::Create() { /* ############################################################################################## */ /* 80AE2068-80AE206C 00008C 0004+00 4/6 0/0 0/0 .rodata @4497 */ SECTION_RODATA static f32 const lit_4497 = 1.0f; -COMPILER_STRIP_GATE(80AE2068, &lit_4497); +COMPILER_STRIP_GATE(0x80AE2068, &lit_4497); /* 80AE206C-80AE2070 000090 0004+00 5/15 0/0 0/0 .rodata @4498 */ SECTION_RODATA static u8 const lit_4498[4] = { @@ -1337,7 +1367,7 @@ SECTION_RODATA static u8 const lit_4498[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AE206C, &lit_4498); +COMPILER_STRIP_GATE(0x80AE206C, &lit_4498); /* 80AD8B60-80AD8F24 000A40 03C4+00 1/1 0/0 0/0 .text CreateHeap__11daNpcShad_cFv */ #pragma push @@ -1484,7 +1514,7 @@ asm void daNpcShad_c::Draw() { SECTION_RODATA static u8 const lit_4591[12] = { 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x05, }; -COMPILER_STRIP_GATE(80AE2070, &lit_4591); +COMPILER_STRIP_GATE(0x80AE2070, &lit_4591); /* 80AD9280-80AD944C 001160 01CC+00 1/1 0/0 0/0 .text * ctrlJoint__11daNpcShad_cFP8J3DJointP8J3DModel */ @@ -1598,7 +1628,7 @@ asm void daNpcShad_c::isSneaking() { SECTION_RODATA static u8 const lit_4825[12] = { 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AE207C, &lit_4825); +COMPILER_STRIP_GATE(0x80AE207C, &lit_4825); #pragma pop /* 80AE2088-80AE208C 0000AC 0004+00 0/1 0/0 0/0 .rodata @4826 */ @@ -1610,7 +1640,7 @@ SECTION_RODATA static u8 const lit_4826[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AE2088, &lit_4826); +COMPILER_STRIP_GATE(0x80AE2088, &lit_4826); #pragma pop /* 80AE208C-80AE2098 0000B0 000C+00 0/1 0/0 0/0 .rodata @4827 */ @@ -1619,7 +1649,7 @@ COMPILER_STRIP_GATE(80AE2088, &lit_4826); SECTION_RODATA static u8 const lit_4827[12] = { 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80AE208C, &lit_4827); +COMPILER_STRIP_GATE(0x80AE208C, &lit_4827); #pragma pop /* 80AE2098-80AE20A4 0000BC 000C+00 0/1 0/0 0/0 .rodata @4828 */ @@ -1628,7 +1658,7 @@ COMPILER_STRIP_GATE(80AE208C, &lit_4827); SECTION_RODATA static u8 const lit_4828[12] = { 0x00, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AE2098, &lit_4828); +COMPILER_STRIP_GATE(0x80AE2098, &lit_4828); #pragma pop /* 80AE20A4-80AE20AC 0000C8 0008+00 0/1 0/0 0/0 .rodata @4829 */ @@ -1637,7 +1667,7 @@ COMPILER_STRIP_GATE(80AE2098, &lit_4828); SECTION_RODATA static u8 const lit_4829[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AE20A4, &lit_4829); +COMPILER_STRIP_GATE(0x80AE20A4, &lit_4829); #pragma pop /* 80AE20AC-80AE20B8 0000D0 000C+00 0/1 0/0 0/0 .rodata @4830 */ @@ -1646,7 +1676,7 @@ COMPILER_STRIP_GATE(80AE20A4, &lit_4829); SECTION_RODATA static u8 const lit_4830[12] = { 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80AE20AC, &lit_4830); +COMPILER_STRIP_GATE(0x80AE20AC, &lit_4830); #pragma pop /* 80AE20B8-80AE20C4 0000DC 000C+00 0/1 0/0 0/0 .rodata @4831 */ @@ -1655,7 +1685,7 @@ COMPILER_STRIP_GATE(80AE20AC, &lit_4830); SECTION_RODATA static u8 const lit_4831[12] = { 0x00, 0x0B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AE20B8, &lit_4831); +COMPILER_STRIP_GATE(0x80AE20B8, &lit_4831); #pragma pop /* 80AE20C4-80AE20CC 0000E8 0008+00 0/1 0/0 0/0 .rodata @4832 */ @@ -1664,7 +1694,7 @@ COMPILER_STRIP_GATE(80AE20B8, &lit_4831); SECTION_RODATA static u8 const lit_4832[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AE20C4, &lit_4832); +COMPILER_STRIP_GATE(0x80AE20C4, &lit_4832); #pragma pop /* 80AE20CC-80AE20D8 0000F0 000C+00 0/1 0/0 0/0 .rodata @4833 */ @@ -1673,7 +1703,7 @@ COMPILER_STRIP_GATE(80AE20C4, &lit_4832); SECTION_RODATA static u8 const lit_4833[12] = { 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80AE20CC, &lit_4833); +COMPILER_STRIP_GATE(0x80AE20CC, &lit_4833); #pragma pop /* 80AE20D8-80AE20E4 0000FC 000C+00 0/1 0/0 0/0 .rodata @4834 */ @@ -1682,7 +1712,7 @@ COMPILER_STRIP_GATE(80AE20CC, &lit_4833); SECTION_RODATA static u8 const lit_4834[12] = { 0x00, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AE20D8, &lit_4834); +COMPILER_STRIP_GATE(0x80AE20D8, &lit_4834); #pragma pop /* 80AE20E4-80AE20EC 000108 0008+00 0/1 0/0 0/0 .rodata @4835 */ @@ -1691,7 +1721,7 @@ COMPILER_STRIP_GATE(80AE20D8, &lit_4834); SECTION_RODATA static u8 const lit_4835[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AE20E4, &lit_4835); +COMPILER_STRIP_GATE(0x80AE20E4, &lit_4835); #pragma pop /* 80AE20EC-80AE20F8 000110 000C+00 0/1 0/0 0/0 .rodata @4836 */ @@ -1700,7 +1730,7 @@ COMPILER_STRIP_GATE(80AE20E4, &lit_4835); SECTION_RODATA static u8 const lit_4836[12] = { 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AE20EC, &lit_4836); +COMPILER_STRIP_GATE(0x80AE20EC, &lit_4836); #pragma pop /* 80AE20F8-80AE20FC 00011C 0004+00 0/1 0/0 0/0 .rodata @4837 */ @@ -1712,7 +1742,7 @@ SECTION_RODATA static u8 const lit_4837[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AE20F8, &lit_4837); +COMPILER_STRIP_GATE(0x80AE20F8, &lit_4837); #pragma pop /* 80AE20FC-80AE2108 000120 000C+00 0/1 0/0 0/0 .rodata @4838 */ @@ -1721,7 +1751,7 @@ COMPILER_STRIP_GATE(80AE20F8, &lit_4837); SECTION_RODATA static u8 const lit_4838[12] = { 0x00, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AE20FC, &lit_4838); +COMPILER_STRIP_GATE(0x80AE20FC, &lit_4838); #pragma pop /* 80AE2108-80AE210C 00012C 0004+00 0/1 0/0 0/0 .rodata @4839 */ @@ -1733,7 +1763,7 @@ SECTION_RODATA static u8 const lit_4839[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AE2108, &lit_4839); +COMPILER_STRIP_GATE(0x80AE2108, &lit_4839); #pragma pop /* 80AE210C-80AE2118 000130 000C+00 0/1 0/0 0/0 .rodata @4840 */ @@ -1742,7 +1772,7 @@ COMPILER_STRIP_GATE(80AE2108, &lit_4839); SECTION_RODATA static u8 const lit_4840[12] = { 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AE210C, &lit_4840); +COMPILER_STRIP_GATE(0x80AE210C, &lit_4840); #pragma pop /* 80AE2118-80AE211C 00013C 0004+00 0/1 0/0 0/0 .rodata @4841 */ @@ -1754,7 +1784,7 @@ SECTION_RODATA static u8 const lit_4841[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AE2118, &lit_4841); +COMPILER_STRIP_GATE(0x80AE2118, &lit_4841); #pragma pop /* 80AE211C-80AE2128 000140 000C+00 0/1 0/0 0/0 .rodata @4842 */ @@ -1763,7 +1793,7 @@ COMPILER_STRIP_GATE(80AE2118, &lit_4841); SECTION_RODATA static u8 const lit_4842[12] = { 0x00, 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AE211C, &lit_4842); +COMPILER_STRIP_GATE(0x80AE211C, &lit_4842); #pragma pop /* 80AE2128-80AE212C 00014C 0004+00 0/1 0/0 0/0 .rodata @4843 */ @@ -1775,7 +1805,7 @@ SECTION_RODATA static u8 const lit_4843[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AE2128, &lit_4843); +COMPILER_STRIP_GATE(0x80AE2128, &lit_4843); #pragma pop /* 80AE212C-80AE2138 000150 000C+00 0/1 0/0 0/0 .rodata @4844 */ @@ -1784,7 +1814,7 @@ COMPILER_STRIP_GATE(80AE2128, &lit_4843); SECTION_RODATA static u8 const lit_4844[12] = { 0x00, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AE212C, &lit_4844); +COMPILER_STRIP_GATE(0x80AE212C, &lit_4844); #pragma pop /* 80AE2138-80AE213C 00015C 0004+00 0/1 0/0 0/0 .rodata @4845 */ @@ -1796,7 +1826,7 @@ SECTION_RODATA static u8 const lit_4845[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AE2138, &lit_4845); +COMPILER_STRIP_GATE(0x80AE2138, &lit_4845); #pragma pop /* 80AE213C-80AE2148 000160 000C+00 0/1 0/0 0/0 .rodata @4846 */ @@ -1805,7 +1835,7 @@ COMPILER_STRIP_GATE(80AE2138, &lit_4845); SECTION_RODATA static u8 const lit_4846[12] = { 0x00, 0x0B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AE213C, &lit_4846); +COMPILER_STRIP_GATE(0x80AE213C, &lit_4846); #pragma pop /* 80AE2148-80AE214C 00016C 0004+00 0/1 0/0 0/0 .rodata @4847 */ @@ -1817,7 +1847,7 @@ SECTION_RODATA static u8 const lit_4847[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AE2148, &lit_4847); +COMPILER_STRIP_GATE(0x80AE2148, &lit_4847); #pragma pop /* 80AE214C-80AE2158 000170 000C+00 0/1 0/0 0/0 .rodata @4848 */ @@ -1826,7 +1856,7 @@ COMPILER_STRIP_GATE(80AE2148, &lit_4847); SECTION_RODATA static u8 const lit_4848[12] = { 0x00, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AE214C, &lit_4848); +COMPILER_STRIP_GATE(0x80AE214C, &lit_4848); #pragma pop /* 80AE2158-80AE215C 00017C 0004+00 0/1 0/0 0/0 .rodata @4849 */ @@ -1838,7 +1868,7 @@ SECTION_RODATA static u8 const lit_4849[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AE2158, &lit_4849); +COMPILER_STRIP_GATE(0x80AE2158, &lit_4849); #pragma pop /* 80AE215C-80AE2168 000180 000C+00 0/1 0/0 0/0 .rodata @4850 */ @@ -1847,7 +1877,7 @@ COMPILER_STRIP_GATE(80AE2158, &lit_4849); SECTION_RODATA static u8 const lit_4850[12] = { 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AE215C, &lit_4850); +COMPILER_STRIP_GATE(0x80AE215C, &lit_4850); #pragma pop /* 80AE2168-80AE216C 00018C 0004+00 0/1 0/0 0/0 .rodata @4851 */ @@ -1859,7 +1889,7 @@ SECTION_RODATA static u8 const lit_4851[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AE2168, &lit_4851); +COMPILER_STRIP_GATE(0x80AE2168, &lit_4851); #pragma pop /* 80AE216C-80AE2178 000190 000C+00 0/1 0/0 0/0 .rodata @4852 */ @@ -1868,7 +1898,7 @@ COMPILER_STRIP_GATE(80AE2168, &lit_4851); SECTION_RODATA static u8 const lit_4852[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AE216C, &lit_4852); +COMPILER_STRIP_GATE(0x80AE216C, &lit_4852); #pragma pop /* 80AE2178-80AE217C 00019C 0004+00 0/1 0/0 0/0 .rodata @4853 */ @@ -1880,7 +1910,7 @@ SECTION_RODATA static u8 const lit_4853[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AE2178, &lit_4853); +COMPILER_STRIP_GATE(0x80AE2178, &lit_4853); #pragma pop /* 80AE217C-80AE21B0 0001A0 0034+00 0/0 0/0 0/0 .rodata @4854 */ @@ -1892,7 +1922,7 @@ SECTION_RODATA static u8 const lit_4854[52] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AE217C, &lit_4854); +COMPILER_STRIP_GATE(0x80AE217C, &lit_4854); #pragma pop /* 80AE21B0-80AE21BC 0001D4 000C+00 0/1 0/0 0/0 .rodata @4858 */ @@ -1901,7 +1931,7 @@ COMPILER_STRIP_GATE(80AE217C, &lit_4854); SECTION_RODATA static u8 const lit_4858[12] = { 0x00, 0x0D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AE21B0, &lit_4858); +COMPILER_STRIP_GATE(0x80AE21B0, &lit_4858); #pragma pop /* 80AE21BC-80AE21C0 0001E0 0004+00 0/1 0/0 0/0 .rodata @4859 */ @@ -1913,7 +1943,7 @@ SECTION_RODATA static u8 const lit_4859[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AE21BC, &lit_4859); +COMPILER_STRIP_GATE(0x80AE21BC, &lit_4859); #pragma pop /* 80AE21C0-80AE21CC 0001E4 000C+00 0/1 0/0 0/0 .rodata @4860 */ @@ -1922,7 +1952,7 @@ COMPILER_STRIP_GATE(80AE21BC, &lit_4859); SECTION_RODATA static u8 const lit_4860[12] = { 0x00, 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80AE21C0, &lit_4860); +COMPILER_STRIP_GATE(0x80AE21C0, &lit_4860); #pragma pop /* 80AE21CC-80AE21D8 0001F0 000C+00 0/1 0/0 0/0 .rodata @4861 */ @@ -1931,7 +1961,7 @@ COMPILER_STRIP_GATE(80AE21C0, &lit_4860); SECTION_RODATA static u8 const lit_4861[12] = { 0x00, 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AE21CC, &lit_4861); +COMPILER_STRIP_GATE(0x80AE21CC, &lit_4861); #pragma pop /* 80AE21D8-80AE21E0 0001FC 0008+00 0/1 0/0 0/0 .rodata @4862 */ @@ -1940,7 +1970,7 @@ COMPILER_STRIP_GATE(80AE21CC, &lit_4861); SECTION_RODATA static u8 const lit_4862[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AE21D8, &lit_4862); +COMPILER_STRIP_GATE(0x80AE21D8, &lit_4862); #pragma pop /* 80AE21E0-80AE21EC 000204 000C+00 0/1 0/0 0/0 .rodata @4863 */ @@ -1949,7 +1979,7 @@ COMPILER_STRIP_GATE(80AE21D8, &lit_4862); SECTION_RODATA static u8 const lit_4863[12] = { 0x00, 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AE21E0, &lit_4863); +COMPILER_STRIP_GATE(0x80AE21E0, &lit_4863); #pragma pop /* 80AE21EC-80AE21F0 000210 0004+00 0/1 0/0 0/0 .rodata @4864 */ @@ -1961,7 +1991,7 @@ SECTION_RODATA static u8 const lit_4864[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AE21EC, &lit_4864); +COMPILER_STRIP_GATE(0x80AE21EC, &lit_4864); #pragma pop /* 80AE21F0-80AE21FC 000214 000C+00 0/1 0/0 0/0 .rodata @4865 */ @@ -1970,7 +2000,7 @@ COMPILER_STRIP_GATE(80AE21EC, &lit_4864); SECTION_RODATA static u8 const lit_4865[12] = { 0x00, 0x13, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80AE21F0, &lit_4865); +COMPILER_STRIP_GATE(0x80AE21F0, &lit_4865); #pragma pop /* 80AE21FC-80AE2208 000220 000C+00 0/1 0/0 0/0 .rodata @4866 */ @@ -1979,7 +2009,7 @@ COMPILER_STRIP_GATE(80AE21F0, &lit_4865); SECTION_RODATA static u8 const lit_4866[12] = { 0x00, 0x0D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AE21FC, &lit_4866); +COMPILER_STRIP_GATE(0x80AE21FC, &lit_4866); #pragma pop /* 80AE2208-80AE2210 00022C 0008+00 0/1 0/0 0/0 .rodata @4867 */ @@ -1988,7 +2018,7 @@ COMPILER_STRIP_GATE(80AE21FC, &lit_4866); SECTION_RODATA static u8 const lit_4867[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AE2208, &lit_4867); +COMPILER_STRIP_GATE(0x80AE2208, &lit_4867); #pragma pop /* 80AE2210-80AE221C 000234 000C+00 0/1 0/0 0/0 .rodata @4868 */ @@ -1997,7 +2027,7 @@ COMPILER_STRIP_GATE(80AE2208, &lit_4867); SECTION_RODATA static u8 const lit_4868[12] = { 0x00, 0x16, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AE2210, &lit_4868); +COMPILER_STRIP_GATE(0x80AE2210, &lit_4868); #pragma pop /* 80AE221C-80AE2220 000240 0004+00 0/1 0/0 0/0 .rodata @4869 */ @@ -2009,7 +2039,7 @@ SECTION_RODATA static u8 const lit_4869[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AE221C, &lit_4869); +COMPILER_STRIP_GATE(0x80AE221C, &lit_4869); #pragma pop /* 80AE2220-80AE222C 000244 000C+00 0/1 0/0 0/0 .rodata @4870 */ @@ -2018,7 +2048,7 @@ COMPILER_STRIP_GATE(80AE221C, &lit_4869); SECTION_RODATA static u8 const lit_4870[12] = { 0x00, 0x17, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80AE2220, &lit_4870); +COMPILER_STRIP_GATE(0x80AE2220, &lit_4870); #pragma pop /* 80AE222C-80AE2238 000250 000C+00 0/1 0/0 0/0 .rodata @4871 */ @@ -2027,7 +2057,7 @@ COMPILER_STRIP_GATE(80AE2220, &lit_4870); SECTION_RODATA static u8 const lit_4871[12] = { 0x00, 0x0D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AE222C, &lit_4871); +COMPILER_STRIP_GATE(0x80AE222C, &lit_4871); #pragma pop /* 80AE2238-80AE2240 00025C 0008+00 0/1 0/0 0/0 .rodata @4872 */ @@ -2036,7 +2066,7 @@ COMPILER_STRIP_GATE(80AE222C, &lit_4871); SECTION_RODATA static u8 const lit_4872[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AE2238, &lit_4872); +COMPILER_STRIP_GATE(0x80AE2238, &lit_4872); #pragma pop /* 80AE2240-80AE224C 000264 000C+00 0/1 0/0 0/0 .rodata @4873 */ @@ -2045,7 +2075,7 @@ COMPILER_STRIP_GATE(80AE2238, &lit_4872); SECTION_RODATA static u8 const lit_4873[12] = { 0x00, 0x19, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80AE2240, &lit_4873); +COMPILER_STRIP_GATE(0x80AE2240, &lit_4873); #pragma pop /* 80AE224C-80AE2258 000270 000C+00 0/1 0/0 0/0 .rodata @4874 */ @@ -2054,7 +2084,7 @@ COMPILER_STRIP_GATE(80AE2240, &lit_4873); SECTION_RODATA static u8 const lit_4874[12] = { 0x00, 0x1A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AE224C, &lit_4874); +COMPILER_STRIP_GATE(0x80AE224C, &lit_4874); #pragma pop /* 80AE2258-80AE2260 00027C 0008+00 0/1 0/0 0/0 .rodata @4875 */ @@ -2063,7 +2093,7 @@ COMPILER_STRIP_GATE(80AE224C, &lit_4874); SECTION_RODATA static u8 const lit_4875[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AE2258, &lit_4875); +COMPILER_STRIP_GATE(0x80AE2258, &lit_4875); #pragma pop /* 80AE2260-80AE226C 000284 000C+00 0/1 0/0 0/0 .rodata @4876 */ @@ -2072,7 +2102,7 @@ COMPILER_STRIP_GATE(80AE2258, &lit_4875); SECTION_RODATA static u8 const lit_4876[12] = { 0x00, 0x1A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AE2260, &lit_4876); +COMPILER_STRIP_GATE(0x80AE2260, &lit_4876); #pragma pop /* 80AE226C-80AE2270 000290 0004+00 0/1 0/0 0/0 .rodata @4877 */ @@ -2084,7 +2114,7 @@ SECTION_RODATA static u8 const lit_4877[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AE226C, &lit_4877); +COMPILER_STRIP_GATE(0x80AE226C, &lit_4877); #pragma pop /* 80AE2270-80AE227C 000294 000C+00 0/1 0/0 0/0 .rodata @4878 */ @@ -2093,7 +2123,7 @@ COMPILER_STRIP_GATE(80AE226C, &lit_4877); SECTION_RODATA static u8 const lit_4878[12] = { 0x00, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80AE2270, &lit_4878); +COMPILER_STRIP_GATE(0x80AE2270, &lit_4878); #pragma pop /* 80AE227C-80AE2288 0002A0 000C+00 0/1 0/0 0/0 .rodata @4879 */ @@ -2102,7 +2132,7 @@ COMPILER_STRIP_GATE(80AE2270, &lit_4878); SECTION_RODATA static u8 const lit_4879[12] = { 0x00, 0x0D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AE227C, &lit_4879); +COMPILER_STRIP_GATE(0x80AE227C, &lit_4879); #pragma pop /* 80AE2288-80AE2290 0002AC 0008+00 0/1 0/0 0/0 .rodata @4880 */ @@ -2111,7 +2141,7 @@ COMPILER_STRIP_GATE(80AE227C, &lit_4879); SECTION_RODATA static u8 const lit_4880[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AE2288, &lit_4880); +COMPILER_STRIP_GATE(0x80AE2288, &lit_4880); #pragma pop /* 80AE2290-80AE229C 0002B4 000C+00 0/1 0/0 0/0 .rodata @4881 */ @@ -2120,7 +2150,7 @@ COMPILER_STRIP_GATE(80AE2288, &lit_4880); SECTION_RODATA static u8 const lit_4881[12] = { 0x00, 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80AE2290, &lit_4881); +COMPILER_STRIP_GATE(0x80AE2290, &lit_4881); #pragma pop /* 80AE229C-80AE22A8 0002C0 000C+00 0/1 0/0 0/0 .rodata @4882 */ @@ -2129,7 +2159,7 @@ COMPILER_STRIP_GATE(80AE2290, &lit_4881); SECTION_RODATA static u8 const lit_4882[12] = { 0x00, 0x16, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AE229C, &lit_4882); +COMPILER_STRIP_GATE(0x80AE229C, &lit_4882); #pragma pop /* 80AE22A8-80AE22B0 0002CC 0008+00 0/1 0/0 0/0 .rodata @4883 */ @@ -2138,7 +2168,7 @@ COMPILER_STRIP_GATE(80AE229C, &lit_4882); SECTION_RODATA static u8 const lit_4883[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AE22A8, &lit_4883); +COMPILER_STRIP_GATE(0x80AE22A8, &lit_4883); #pragma pop /* 80AE22B0-80AE22BC 0002D4 000C+00 0/1 0/0 0/0 .rodata @4884 */ @@ -2147,7 +2177,7 @@ COMPILER_STRIP_GATE(80AE22A8, &lit_4883); SECTION_RODATA static u8 const lit_4884[12] = { 0x00, 0x1C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80AE22B0, &lit_4884); +COMPILER_STRIP_GATE(0x80AE22B0, &lit_4884); #pragma pop /* 80AE22BC-80AE22C8 0002E0 000C+00 0/1 0/0 0/0 .rodata @4885 */ @@ -2156,7 +2186,7 @@ COMPILER_STRIP_GATE(80AE22B0, &lit_4884); SECTION_RODATA static u8 const lit_4885[12] = { 0x00, 0x1D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AE22BC, &lit_4885); +COMPILER_STRIP_GATE(0x80AE22BC, &lit_4885); #pragma pop /* 80AE22C8-80AE22D0 0002EC 0008+00 0/1 0/0 0/0 .rodata @4886 */ @@ -2165,7 +2195,7 @@ COMPILER_STRIP_GATE(80AE22BC, &lit_4885); SECTION_RODATA static u8 const lit_4886[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AE22C8, &lit_4886); +COMPILER_STRIP_GATE(0x80AE22C8, &lit_4886); #pragma pop /* 80AE22D0-80AE22DC 0002F4 000C+00 0/1 0/0 0/0 .rodata @4887 */ @@ -2174,7 +2204,7 @@ COMPILER_STRIP_GATE(80AE22C8, &lit_4886); SECTION_RODATA static u8 const lit_4887[12] = { 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80AE22D0, &lit_4887); +COMPILER_STRIP_GATE(0x80AE22D0, &lit_4887); #pragma pop /* 80AE22DC-80AE22E8 000300 000C+00 0/1 0/0 0/0 .rodata @4888 */ @@ -2183,7 +2213,7 @@ COMPILER_STRIP_GATE(80AE22D0, &lit_4887); SECTION_RODATA static u8 const lit_4888[12] = { 0x00, 0x21, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AE22DC, &lit_4888); +COMPILER_STRIP_GATE(0x80AE22DC, &lit_4888); #pragma pop /* 80AE22E8-80AE22F0 00030C 0008+00 0/1 0/0 0/0 .rodata @4889 */ @@ -2192,7 +2222,7 @@ COMPILER_STRIP_GATE(80AE22DC, &lit_4888); SECTION_RODATA static u8 const lit_4889[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AE22E8, &lit_4889); +COMPILER_STRIP_GATE(0x80AE22E8, &lit_4889); #pragma pop /* 80AE22F0-80AE22FC 000314 000C+00 0/1 0/0 0/0 .rodata @4890 */ @@ -2201,7 +2231,7 @@ COMPILER_STRIP_GATE(80AE22E8, &lit_4889); SECTION_RODATA static u8 const lit_4890[12] = { 0x00, 0x21, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AE22F0, &lit_4890); +COMPILER_STRIP_GATE(0x80AE22F0, &lit_4890); #pragma pop /* 80AE22FC-80AE2300 000320 0004+00 0/1 0/0 0/0 .rodata @4891 */ @@ -2213,7 +2243,7 @@ SECTION_RODATA static u8 const lit_4891[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AE22FC, &lit_4891); +COMPILER_STRIP_GATE(0x80AE22FC, &lit_4891); #pragma pop /* 80AE2300-80AE230C 000324 000C+00 0/1 0/0 0/0 .rodata @4892 */ @@ -2222,7 +2252,7 @@ COMPILER_STRIP_GATE(80AE22FC, &lit_4891); SECTION_RODATA static u8 const lit_4892[12] = { 0x00, 0x1D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AE2300, &lit_4892); +COMPILER_STRIP_GATE(0x80AE2300, &lit_4892); #pragma pop /* 80AE230C-80AE2310 000330 0004+00 0/1 0/0 0/0 .rodata @4893 */ @@ -2234,7 +2264,7 @@ SECTION_RODATA static u8 const lit_4893[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AE230C, &lit_4893); +COMPILER_STRIP_GATE(0x80AE230C, &lit_4893); #pragma pop /* 80AE2310-80AE231C 000334 000C+00 0/1 0/0 0/0 .rodata @4894 */ @@ -2243,7 +2273,7 @@ COMPILER_STRIP_GATE(80AE230C, &lit_4893); SECTION_RODATA static u8 const lit_4894[12] = { 0x00, 0x22, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80AE2310, &lit_4894); +COMPILER_STRIP_GATE(0x80AE2310, &lit_4894); #pragma pop /* 80AE231C-80AE2328 000340 000C+00 0/1 0/0 0/0 .rodata @4895 */ @@ -2252,7 +2282,7 @@ COMPILER_STRIP_GATE(80AE2310, &lit_4894); SECTION_RODATA static u8 const lit_4895[12] = { 0x00, 0x23, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AE231C, &lit_4895); +COMPILER_STRIP_GATE(0x80AE231C, &lit_4895); #pragma pop /* 80AE2328-80AE2330 00034C 0008+00 0/1 0/0 0/0 .rodata @4896 */ @@ -2261,7 +2291,7 @@ COMPILER_STRIP_GATE(80AE231C, &lit_4895); SECTION_RODATA static u8 const lit_4896[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AE2328, &lit_4896); +COMPILER_STRIP_GATE(0x80AE2328, &lit_4896); #pragma pop /* 80AE2330-80AE233C 000354 000C+00 0/1 0/0 0/0 .rodata @4897 */ @@ -2270,7 +2300,7 @@ COMPILER_STRIP_GATE(80AE2328, &lit_4896); SECTION_RODATA static u8 const lit_4897[12] = { 0x00, 0x23, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AE2330, &lit_4897); +COMPILER_STRIP_GATE(0x80AE2330, &lit_4897); #pragma pop /* 80AE233C-80AE2340 000360 0004+00 0/1 0/0 0/0 .rodata @4898 */ @@ -2282,7 +2312,7 @@ SECTION_RODATA static u8 const lit_4898[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AE233C, &lit_4898); +COMPILER_STRIP_GATE(0x80AE233C, &lit_4898); #pragma pop /* 80AE2340-80AE234C 000364 000C+00 0/1 0/0 0/0 .rodata @4899 */ @@ -2291,7 +2321,7 @@ COMPILER_STRIP_GATE(80AE233C, &lit_4898); SECTION_RODATA static u8 const lit_4899[12] = { 0x00, 0x1F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AE2340, &lit_4899); +COMPILER_STRIP_GATE(0x80AE2340, &lit_4899); #pragma pop /* 80AE234C-80AE2350 000370 0004+00 0/1 0/0 0/0 .rodata @4900 */ @@ -2303,7 +2333,7 @@ SECTION_RODATA static u8 const lit_4900[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AE234C, &lit_4900); +COMPILER_STRIP_GATE(0x80AE234C, &lit_4900); #pragma pop /* 80AE2350-80AE235C 000374 000C+00 0/1 0/0 0/0 .rodata @4901 */ @@ -2312,7 +2342,7 @@ COMPILER_STRIP_GATE(80AE234C, &lit_4900); SECTION_RODATA static u8 const lit_4901[12] = { 0x00, 0x1E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AE2350, &lit_4901); +COMPILER_STRIP_GATE(0x80AE2350, &lit_4901); #pragma pop /* 80AE235C-80AE2360 000380 0004+00 0/1 0/0 0/0 .rodata @4902 */ @@ -2324,7 +2354,7 @@ SECTION_RODATA static u8 const lit_4902[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AE235C, &lit_4902); +COMPILER_STRIP_GATE(0x80AE235C, &lit_4902); #pragma pop /* 80AE2360-80AE236C 000384 000C+00 0/1 0/0 0/0 .rodata @4903 */ @@ -2333,7 +2363,7 @@ COMPILER_STRIP_GATE(80AE235C, &lit_4902); SECTION_RODATA static u8 const lit_4903[12] = { 0x00, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AE2360, &lit_4903); +COMPILER_STRIP_GATE(0x80AE2360, &lit_4903); #pragma pop /* 80AE236C-80AE2370 000390 0004+00 0/1 0/0 0/0 .rodata @4904 */ @@ -2345,7 +2375,7 @@ SECTION_RODATA static u8 const lit_4904[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AE236C, &lit_4904); +COMPILER_STRIP_GATE(0x80AE236C, &lit_4904); #pragma pop /* 80AE2370-80AE237C 000394 000C+00 0/1 0/0 0/0 .rodata @4905 */ @@ -2354,7 +2384,7 @@ COMPILER_STRIP_GATE(80AE236C, &lit_4904); SECTION_RODATA static u8 const lit_4905[12] = { 0x00, 0x14, 0x00, 0x00, 0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AE2370, &lit_4905); +COMPILER_STRIP_GATE(0x80AE2370, &lit_4905); #pragma pop /* 80AE237C-80AE2380 0003A0 0004+00 0/1 0/0 0/0 .rodata @4906 */ @@ -2366,7 +2396,7 @@ SECTION_RODATA static u8 const lit_4906[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AE237C, &lit_4906); +COMPILER_STRIP_GATE(0x80AE237C, &lit_4906); #pragma pop /* 80AE2380-80AE238C 0003A4 000C+00 0/1 0/0 0/0 .rodata @4907 */ @@ -2375,7 +2405,7 @@ COMPILER_STRIP_GATE(80AE237C, &lit_4906); SECTION_RODATA static u8 const lit_4907[12] = { 0x00, 0x15, 0x00, 0x00, 0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AE2380, &lit_4907); +COMPILER_STRIP_GATE(0x80AE2380, &lit_4907); #pragma pop /* 80AE238C-80AE2390 0003B0 0004+00 0/1 0/0 0/0 .rodata @4908 */ @@ -2387,7 +2417,7 @@ SECTION_RODATA static u8 const lit_4908[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AE238C, &lit_4908); +COMPILER_STRIP_GATE(0x80AE238C, &lit_4908); #pragma pop /* 80AE2390-80AE239C 0003B4 000C+00 0/1 0/0 0/0 .rodata @4909 */ @@ -2396,7 +2426,7 @@ COMPILER_STRIP_GATE(80AE238C, &lit_4908); SECTION_RODATA static u8 const lit_4909[12] = { 0x00, 0x0F, 0x00, 0x00, 0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AE2390, &lit_4909); +COMPILER_STRIP_GATE(0x80AE2390, &lit_4909); #pragma pop /* 80AE239C-80AE23A0 0003C0 0004+00 0/1 0/0 0/0 .rodata @4910 */ @@ -2408,7 +2438,7 @@ SECTION_RODATA static u8 const lit_4910[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AE239C, &lit_4910); +COMPILER_STRIP_GATE(0x80AE239C, &lit_4910); #pragma pop /* 80AE23A0-80AE23AC 0003C4 000C+00 0/1 0/0 0/0 .rodata @4911 */ @@ -2417,7 +2447,7 @@ COMPILER_STRIP_GATE(80AE239C, &lit_4910); SECTION_RODATA static u8 const lit_4911[12] = { 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AE23A0, &lit_4911); +COMPILER_STRIP_GATE(0x80AE23A0, &lit_4911); #pragma pop /* 80AE23AC-80AE23B0 0003D0 0004+00 0/1 0/0 0/0 .rodata @4912 */ @@ -2429,7 +2459,7 @@ SECTION_RODATA static u8 const lit_4912[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AE23AC, &lit_4912); +COMPILER_STRIP_GATE(0x80AE23AC, &lit_4912); #pragma pop /* 80AE23B0-80AE240C 0003D4 005C+00 0/0 0/0 0/0 .rodata @4913 */ @@ -2443,7 +2473,7 @@ SECTION_RODATA static u8 const lit_4913[92] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AE23B0, &lit_4913); +COMPILER_STRIP_GATE(0x80AE23B0, &lit_4913); #pragma pop /* 80AE240C-80AE2418 000430 000C+00 0/1 0/0 0/0 .rodata @4955 */ @@ -2452,25 +2482,25 @@ COMPILER_STRIP_GATE(80AE23B0, &lit_4913); SECTION_RODATA static u8 const lit_4955[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AE240C, &lit_4955); +COMPILER_STRIP_GATE(0x80AE240C, &lit_4955); #pragma pop /* 80AE2418-80AE241C 00043C 0004+00 7/16 0/0 0/0 .rodata @5210 */ SECTION_RODATA static f32 const lit_5210 = -1.0f; -COMPILER_STRIP_GATE(80AE2418, &lit_5210); +COMPILER_STRIP_GATE(0x80AE2418, &lit_5210); /* 80AE241C-80AE2420 000440 0004+00 0/2 0/0 0/0 .rodata @5211 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5211 = 135.0f; -COMPILER_STRIP_GATE(80AE241C, &lit_5211); +COMPILER_STRIP_GATE(0x80AE241C, &lit_5211); #pragma pop /* 80AE2420-80AE2424 000444 0004+00 0/7 0/0 0/0 .rodata @5212 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_5212 = 0x3BB40000; -COMPILER_STRIP_GATE(80AE2420, &lit_5212); +COMPILER_STRIP_GATE(0x80AE2420, &lit_5212); #pragma pop /* 80AE2424-80AE242C 000448 0004+04 0/7 0/0 0/0 .rodata @5213 */ @@ -2481,7 +2511,7 @@ SECTION_RODATA static f32 const lit_5213[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80AE2424, &lit_5213); +COMPILER_STRIP_GATE(0x80AE2424, &lit_5213); #pragma pop /* 80AE242C-80AE2434 000450 0008+00 0/7 0/0 0/0 .rodata @5215 */ @@ -2490,7 +2520,7 @@ COMPILER_STRIP_GATE(80AE2424, &lit_5213); SECTION_RODATA static u8 const lit_5215[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AE242C, &lit_5215); +COMPILER_STRIP_GATE(0x80AE242C, &lit_5215); #pragma pop /* 80AD9F00-80ADA630 001DE0 0730+00 1/0 0/0 0/0 .text wait_type0__11daNpcShad_cFPv */ @@ -2528,28 +2558,34 @@ asm void daNpcShad_c::setExpression(int param_0, f32 param_1) { #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_5532 = 0x43360B61; -COMPILER_STRIP_GATE(80AE2434, &lit_5532); +COMPILER_STRIP_GATE(0x80AE2434, &lit_5532); #pragma pop /* 80AE2438-80AE243C 00045C 0004+00 0/2 0/0 0/0 .rodata @5533 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5533 = 30.0f; -COMPILER_STRIP_GATE(80AE2438, &lit_5533); +COMPILER_STRIP_GATE(0x80AE2438, &lit_5533); #pragma pop /* 80AE243C-80AE2440 000460 0004+00 0/1 0/0 0/0 .rodata @5534 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5534 = 3750.0f; -COMPILER_STRIP_GATE(80AE243C, &lit_5534); +COMPILER_STRIP_GATE(0x80AE243C, &lit_5534); #pragma pop /* 80AE2440-80AE2444 000464 0004+00 0/1 0/0 0/0 .rodata @5535 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5535 = 400.0f; -COMPILER_STRIP_GATE(80AE2440, &lit_5535); +COMPILER_STRIP_GATE(0x80AE2440, &lit_5535); +#pragma pop + +/* 80AE24C4-80AE24C4 0004E8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80AE25F6 = "NO_RESPONSE"; #pragma pop /* 80ADA6A0-80ADB428 002580 0D88+00 1/0 0/0 0/0 .text wait_type1__11daNpcShad_cFPv */ @@ -2567,14 +2603,14 @@ asm void daNpcShad_c::wait_type1(void* param_0) { #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_5586 = 0xC58DA0AD; -COMPILER_STRIP_GATE(80AE2444, &lit_5586); +COMPILER_STRIP_GATE(0x80AE2444, &lit_5586); #pragma pop /* 80AE2448-80AE244C 00046C 0004+00 0/1 0/0 0/0 .rodata @5587 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_5587 = 0x4605AD86; -COMPILER_STRIP_GATE(80AE2448, &lit_5587); +COMPILER_STRIP_GATE(0x80AE2448, &lit_5587); #pragma pop /* 80ADB428-80ADB628 003308 0200+00 1/0 0/0 0/0 .text wait_type2__11daNpcShad_cFPv */ @@ -2587,6 +2623,13 @@ asm void daNpcShad_c::wait_type2(void* param_0) { } #pragma pop +/* ############################################################################################## */ +/* 80AE24C4-80AE24C4 0004E8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80AE2602 = "DEFAULT_GETITEM"; +#pragma pop + /* 80ADB628-80ADBEA8 003508 0880+00 2/0 0/0 0/0 .text talk__11daNpcShad_cFPv */ #pragma push #pragma optimization_level 0 @@ -2612,14 +2655,14 @@ asm void daNpcShad_c::demo(void* param_0) { #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_5828 = 0xC5C36B19; -COMPILER_STRIP_GATE(80AE244C, &lit_5828); +COMPILER_STRIP_GATE(0x80AE244C, &lit_5828); #pragma pop /* 80AE2450-80AE2454 000474 0004+00 0/1 0/0 0/0 .rodata @5829 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_5829 = 0x45C35E15; -COMPILER_STRIP_GATE(80AE2450, &lit_5829); +COMPILER_STRIP_GATE(0x80AE2450, &lit_5829); #pragma pop /* 80AE2454-80AE245C 000478 0008+00 0/2 0/0 0/0 .rodata @5830 */ @@ -2628,7 +2671,7 @@ COMPILER_STRIP_GATE(80AE2450, &lit_5829); SECTION_RODATA static u8 const lit_5830[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AE2454, &lit_5830); +COMPILER_STRIP_GATE(0x80AE2454, &lit_5830); #pragma pop /* 80AE245C-80AE2464 000480 0008+00 0/2 0/0 0/0 .rodata @5831 */ @@ -2637,7 +2680,7 @@ COMPILER_STRIP_GATE(80AE2454, &lit_5830); SECTION_RODATA static u8 const lit_5831[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AE245C, &lit_5831); +COMPILER_STRIP_GATE(0x80AE245C, &lit_5831); #pragma pop /* 80AE2464-80AE246C 000488 0008+00 0/2 0/0 0/0 .rodata @5832 */ @@ -2646,7 +2689,7 @@ COMPILER_STRIP_GATE(80AE245C, &lit_5831); SECTION_RODATA static u8 const lit_5832[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AE2464, &lit_5832); +COMPILER_STRIP_GATE(0x80AE2464, &lit_5832); #pragma pop /* 80ADC3DC-80ADC700 0042BC 0324+00 1/0 0/0 0/0 .text leave__11daNpcShad_cFPv */ @@ -2659,6 +2702,13 @@ asm void daNpcShad_c::leave(void* param_0) { } #pragma pop +/* ############################################################################################## */ +/* 80AE24C4-80AE24C4 0004E8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80AE2612 = "prm"; +#pragma pop + /* 80ADC700-80ADC800 0045E0 0100+00 1/0 0/0 0/0 .text EvCut_Introduction__11daNpcShad_cFi */ #pragma push @@ -2685,28 +2735,28 @@ asm void daNpcShad_c::EvCut_Meeting(int param_0) { #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_6108 = 0xC3D6C338; -COMPILER_STRIP_GATE(80AE246C, &lit_6108); +COMPILER_STRIP_GATE(0x80AE246C, &lit_6108); #pragma pop /* 80AE2470-80AE2474 000494 0004+00 0/1 0/0 0/0 .rodata @6109 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6109 = -770.0f; -COMPILER_STRIP_GATE(80AE2470, &lit_6109); +COMPILER_STRIP_GATE(0x80AE2470, &lit_6109); #pragma pop /* 80AE2474-80AE2478 000498 0004+00 0/1 0/0 0/0 .rodata @6110 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_6110 = 0xC5216CD8; -COMPILER_STRIP_GATE(80AE2474, &lit_6110); +COMPILER_STRIP_GATE(0x80AE2474, &lit_6110); #pragma pop /* 80AE2478-80AE247C 00049C 0004+00 0/2 0/0 0/0 .rodata @6111 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6111 = 60.0f; -COMPILER_STRIP_GATE(80AE2478, &lit_6111); +COMPILER_STRIP_GATE(0x80AE2478, &lit_6111); #pragma pop /* 80AE247C-80AE2484 0004A0 0004+04 0/1 0/0 0/0 .rodata @6112 */ @@ -2717,7 +2767,7 @@ SECTION_RODATA static f32 const lit_6112[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80AE247C, &lit_6112); +COMPILER_STRIP_GATE(0x80AE247C, &lit_6112); #pragma pop /* 80AE2484-80AE248C 0004A8 0008+00 0/2 0/0 0/0 .rodata @6115 */ @@ -2726,7 +2776,7 @@ COMPILER_STRIP_GATE(80AE247C, &lit_6112); SECTION_RODATA static u8 const lit_6115[8] = { 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AE2484, &lit_6115); +COMPILER_STRIP_GATE(0x80AE2484, &lit_6115); #pragma pop /* 80ADCAD8-80ADD720 0049B8 0C48+00 1/0 0/0 0/0 .text EvCut_ToChantSpell1__11daNpcShad_cFi */ @@ -2744,7 +2794,7 @@ asm void daNpcShad_c::EvCut_ToChantSpell1(int param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6365 = 3.0f; -COMPILER_STRIP_GATE(80AE248C, &lit_6365); +COMPILER_STRIP_GATE(0x80AE248C, &lit_6365); #pragma pop /* 80ADD720-80ADE47C 005600 0D5C+00 1/0 0/0 0/0 .text EvCut_ToChantSpell2__11daNpcShad_cFi */ @@ -2767,6 +2817,14 @@ asm void daNpcShad_c::EvCut_ToChantSpell2Skip(int param_0) { } #pragma pop +/* ############################################################################################## */ +/* 80AE24C4-80AE24C4 0004E8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80AE2616 = "POS"; +SECTION_DEAD static char const* const stringBase_80AE261A = "ANGLE"; +#pragma pop + /* 80ADE5F8-80ADED68 0064D8 0770+00 3/0 0/0 0/0 .text EvCut_DiscoveryCannon__11daNpcShad_cFi */ #pragma push #pragma optimization_level 0 @@ -2813,28 +2871,28 @@ asm void daNpcShad_c::EvCut_DisappearSkip(int param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6549 = 5.0f; -COMPILER_STRIP_GATE(80AE2490, &lit_6549); +COMPILER_STRIP_GATE(0x80AE2490, &lit_6549); #pragma pop /* 80AE2494-80AE2498 0004B8 0004+00 0/1 0/0 0/0 .rodata @6779 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6779 = 4100.0f; -COMPILER_STRIP_GATE(80AE2494, &lit_6779); +COMPILER_STRIP_GATE(0x80AE2494, &lit_6779); #pragma pop /* 80AE2498-80AE249C 0004BC 0004+00 0/1 0/0 0/0 .rodata @6780 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6780 = -1520.0f; -COMPILER_STRIP_GATE(80AE2498, &lit_6780); +COMPILER_STRIP_GATE(0x80AE2498, &lit_6780); #pragma pop /* 80AE249C-80AE24A0 0004C0 0004+00 0/1 0/0 0/0 .rodata @6781 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_6781 = 0xC570FD00; -COMPILER_STRIP_GATE(80AE249C, &lit_6781); +COMPILER_STRIP_GATE(0x80AE249C, &lit_6781); #pragma pop /* 80ADF8DC-80ADFB70 0077BC 0294+00 1/0 0/0 0/0 .text EvCut_CallBack__11daNpcShad_cFi */ @@ -2852,7 +2910,7 @@ asm void daNpcShad_c::EvCut_CallBack(int param_0) { SECTION_RODATA static u8 const lit_6782[16] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AE24A0, &lit_6782); +COMPILER_STRIP_GATE(0x80AE24A0, &lit_6782); /* 80ADFB70-80ADFE74 007A50 0304+00 1/0 0/0 0/0 .text EvCut_WiretapSponsor__11daNpcShad_cFi */ #pragma push @@ -2972,7 +3030,7 @@ asm void daNpcShad_c::playExpression() { /* ############################################################################################## */ /* 80AE24B0-80AE24B4 0004D4 0004+00 1/1 0/0 0/0 .rodata @6995 */ SECTION_RODATA static f32 const lit_6995 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(80AE24B0, &lit_6995); +COMPILER_STRIP_GATE(0x80AE24B0, &lit_6995); /* 80AE0ED0-80AE0FAC 008DB0 00DC+00 1/0 0/0 0/0 .text ctrlBtk__11daNpcShad_cFv */ #pragma push @@ -2989,14 +3047,14 @@ asm void daNpcShad_c::ctrlBtk() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7090 = 10.0f; -COMPILER_STRIP_GATE(80AE24B4, &lit_7090); +COMPILER_STRIP_GATE(0x80AE24B4, &lit_7090); #pragma pop /* 80AE24B8-80AE24BC 0004DC 0004+00 0/1 0/0 0/0 .rodata @7091 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7091 = 45.0f; -COMPILER_STRIP_GATE(80AE24B8, &lit_7091); +COMPILER_STRIP_GATE(0x80AE24B8, &lit_7091); #pragma pop /* 80AE0FAC-80AE1320 008E8C 0374+00 1/0 0/0 0/0 .text setAttnPos__11daNpcShad_cFv */ @@ -3014,7 +3072,7 @@ asm void daNpcShad_c::setAttnPos() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7143 = -30.0f; -COMPILER_STRIP_GATE(80AE24BC, &lit_7143); +COMPILER_STRIP_GATE(0x80AE24BC, &lit_7143); #pragma pop /* 80AE1320-80AE153C 009200 021C+00 1/1 0/0 0/0 .text lookat__11daNpcShad_cFv */ @@ -3036,7 +3094,7 @@ bool daNpcShad_c::drawDbgInfo() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80AE1544(s16 param_0) /* const */ { +extern "C" asm void func_80AE1544(void* _this, s16 param_0) /* const */ { nofralloc #include "asm/rel/d/a/npc/d_a_npc_shad/d_a_npc_shad/func_80AE1544.s" } @@ -3068,7 +3126,7 @@ asm void __sinit_d_a_npc_shad_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80AE1550 = (void*)__sinit_d_a_npc_shad_cpp; +REGISTER_CTORS(0x80AE1550, __sinit_d_a_npc_shad_cpp); #pragma pop /* 80AE1728-80AE1770 009608 0048+00 5/4 0/0 0/0 .text __dt__18daNpcF_ActorMngr_cFv */ @@ -3261,37 +3319,7 @@ static asm void func_80AE1FC0() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7144 = 40.0f; -COMPILER_STRIP_GATE(80AE24C0, &lit_7144); +COMPILER_STRIP_GATE(0x80AE24C0, &lit_7144); #pragma pop -/* 80AE24C4-80AE2620 0004E8 015C+00 15/12 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80AE24C4 = "Shad"; -SECTION_DEAD static char const* const stringBase_80AE24C9 = "Shad1"; -SECTION_DEAD static char const* const stringBase_80AE24CF = "Shad2"; -SECTION_DEAD static char const* const stringBase_80AE24D5 = "Shad3"; -SECTION_DEAD static char const* const stringBase_80AE24DB = ""; -SECTION_DEAD static char const* const stringBase_80AE24DC = "THE_INTRODUCTION"; -SECTION_DEAD static char const* const stringBase_80AE24ED = "RESIST_MEETING"; -SECTION_DEAD static char const* const stringBase_80AE24FC = "SHAD_TO_CHANT_SPELL1"; -SECTION_DEAD static char const* const stringBase_80AE2511 = "SHAD_TO_CHANT_SPELL2"; -SECTION_DEAD static char const* const stringBase_80AE2526 = "SHAD_TO_CHANT_SPELL2_SKIP"; -SECTION_DEAD static char const* const stringBase_80AE2540 = "SHAD_DISCOVERY_CANNON"; -SECTION_DEAD static char const* const stringBase_80AE2556 = "SHAD_DISCOVERY_CANNON_SKIP"; -SECTION_DEAD static char const* const stringBase_80AE2571 = "SHAD_DISAPPEAR"; -SECTION_DEAD static char const* const stringBase_80AE2580 = "SHAD_DISAPPEAR_SKIP"; -SECTION_DEAD static char const* const stringBase_80AE2594 = "SHAD_CALLBACK"; -SECTION_DEAD static char const* const stringBase_80AE25A2 = "RESIST_WIRETAP_ASH"; -SECTION_DEAD static char const* const stringBase_80AE25B5 = "RESIST_WIRETAP_SHAD"; -SECTION_DEAD static char const* const stringBase_80AE25C9 = "RESIST_WIRETAP_RAFREL"; -SECTION_DEAD static char const* const stringBase_80AE25DF = "R_SP116"; -SECTION_DEAD static char const* const stringBase_80AE25E7 = "R_SP209"; -SECTION_DEAD static char const* const stringBase_80AE25EF = "D_MN09"; -SECTION_DEAD static char const* const stringBase_80AE25F6 = "NO_RESPONSE"; -SECTION_DEAD static char const* const stringBase_80AE2602 = "DEFAULT_GETITEM"; -SECTION_DEAD static char const* const stringBase_80AE2612 = "prm"; -SECTION_DEAD static char const* const stringBase_80AE2616 = "POS"; -SECTION_DEAD static char const* const stringBase_80AE261A = "ANGLE"; -#pragma pop +/* 80AE24C4-80AE24C4 0004E8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/npc/d_a_npc_shaman/d_a_npc_shaman.cpp b/rel/d/a/npc/d_a_npc_shaman/d_a_npc_shaman.cpp index eb68fab3cfe..f1f274ca6a3 100644 --- a/rel/d/a/npc/d_a_npc_shaman/d_a_npc_shaman.cpp +++ b/rel/d/a/npc/d_a_npc_shaman/d_a_npc_shaman.cpp @@ -15,12 +15,14 @@ struct mDoMtx_stack_c { static u8 now[48]; }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; +struct J3DAnmTransform {}; + +struct J3DModelData {}; + struct Vec {}; struct Z2Creature { @@ -29,8 +31,6 @@ struct Z2Creature { /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -43,6 +43,8 @@ struct fopAc_ac_c { /* 80018C8C */ ~fopAc_ac_c(); }; +struct daNpcT_faceMotionAnmData_c {}; + struct daNpcT_MotionSeqMngr_c { struct sequenceStepData_c {}; @@ -50,14 +52,12 @@ struct daNpcT_MotionSeqMngr_c { /* 80AE5E70 */ ~daNpcT_MotionSeqMngr_c(); }; +struct daNpcT_evtData_c {}; + struct daNpcT_motionAnmData_c {}; struct J3DJoint {}; -struct daNpcT_faceMotionAnmData_c {}; - -struct daNpcT_evtData_c {}; - struct daNpc_Sha_c { /* 80AE2DCC */ ~daNpc_Sha_c(); /* 80AE2EEC */ void create(); @@ -132,6 +132,13 @@ struct dCcD_GObjInf { /* 800844F8 */ void GetTgHitObj(); }; +struct csXyz { + /* 80AE58E4 */ ~csXyz(); + /* 80AE5D24 */ csXyz(); +}; + +struct _GXColorS10 {}; + struct J3DModel {}; struct cXyz { @@ -141,13 +148,6 @@ struct cXyz { /* 80AE5E24 */ cXyz(); }; -struct _GXColorS10 {}; - -struct csXyz { - /* 80AE58E4 */ ~csXyz(); - /* 80AE5D24 */ csXyz(); -}; - struct daNpcT_c { /* 80147FA4 */ void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*); /* 801483F8 */ void loadRes(s8 const*, char const**); @@ -494,8 +494,8 @@ extern "C" void changeAnm__8daNpcT_cFPiPi(); extern "C" void changeBck__8daNpcT_cFPiPi(); extern "C" void changeBtp__8daNpcT_cFPiPi(); extern "C" void changeBtk__8daNpcT_cFPiPi(); -extern "C" void func_80AE6438(int*); -extern "C" void func_80AE6454(int, int); +extern "C" void func_80AE6438(void* _this, int*); +extern "C" void func_80AE6454(void* _this, int, int); extern "C" void __sinit_d_a_npc_shaman_cpp(); extern "C" void __ct__11daNpc_Sha_cFPC26daNpcT_faceMotionAnmData_cPC22daNpcT_motionAnmData_cPCQ222daNpcT_MotionSeqMngr_c18sequenceStepData_ciPCQ222daNpcT_MotionSeqMngr_c18sequenceStepData_ciPC16daNpcT_evtData_cPPc(); @@ -681,6 +681,18 @@ extern "C" void __register_global_object(); // /* ############################################################################################## */ +/* 80AE6CCC-80AE6CCC 000104 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80AE6CCC = ""; +SECTION_DEAD static char const* const stringBase_80AE6CCD = "NO_RESPONSE"; +SECTION_DEAD static char const* const stringBase_80AE6CD9 = "PERFORM_AUGURY"; +SECTION_DEAD static char const* const stringBase_80AE6CE8 = "ALLGET"; +SECTION_DEAD static char const* const stringBase_80AE6CEF = "NOLOOK"; +SECTION_DEAD static char const* const stringBase_80AE6CF6 = "RETURN"; +SECTION_DEAD static char const* const stringBase_80AE6CFD = "Sha"; +#pragma pop + /* 80AE6D18-80AE6D24 000000 000C+00 2/2 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -1611,7 +1623,7 @@ SECTION_RODATA u8 const daNpc_Sha_Param_c::m[140] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AE6BC8, &daNpc_Sha_Param_c::m); +COMPILER_STRIP_GATE(0x80AE6BC8, &daNpc_Sha_Param_c::m); /* 80AE6C54-80AE6C60 00008C 000C+00 0/1 0/0 0/0 .rodata heapSize$3961 */ #pragma push @@ -1619,42 +1631,42 @@ COMPILER_STRIP_GATE(80AE6BC8, &daNpc_Sha_Param_c::m); SECTION_RODATA static u8 const heapSize[12] = { 0x00, 0x00, 0x3A, 0xF0, 0x00, 0x00, 0x3A, 0xF0, 0x00, 0x00, 0x3A, 0xF0, }; -COMPILER_STRIP_GATE(80AE6C54, &heapSize); +COMPILER_STRIP_GATE(0x80AE6C54, &heapSize); #pragma pop /* 80AE6C60-80AE6C64 000098 0004+00 0/1 0/0 0/0 .rodata @4027 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4027 = -200.0f; -COMPILER_STRIP_GATE(80AE6C60, &lit_4027); +COMPILER_STRIP_GATE(0x80AE6C60, &lit_4027); #pragma pop /* 80AE6C64-80AE6C68 00009C 0004+00 0/1 0/0 0/0 .rodata @4028 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4028 = -100.0f; -COMPILER_STRIP_GATE(80AE6C64, &lit_4028); +COMPILER_STRIP_GATE(0x80AE6C64, &lit_4028); #pragma pop /* 80AE6C68-80AE6C6C 0000A0 0004+00 0/1 0/0 0/0 .rodata @4029 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4029 = 200.0f; -COMPILER_STRIP_GATE(80AE6C68, &lit_4029); +COMPILER_STRIP_GATE(0x80AE6C68, &lit_4029); #pragma pop /* 80AE6C6C-80AE6C70 0000A4 0004+00 0/1 0/0 0/0 .rodata @4030 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4030 = 300.0f; -COMPILER_STRIP_GATE(80AE6C6C, &lit_4030); +COMPILER_STRIP_GATE(0x80AE6C6C, &lit_4030); #pragma pop /* 80AE6C70-80AE6C74 0000A8 0004+00 0/1 0/0 0/0 .rodata @4031 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4031 = -1000000000.0f; -COMPILER_STRIP_GATE(80AE6C70, &lit_4031); +COMPILER_STRIP_GATE(0x80AE6C70, &lit_4031); #pragma pop /* 80AE2EEC-80AE31A0 00020C 02B4+00 1/1 0/0 0/0 .text create__11daNpc_Sha_cFv */ @@ -1675,25 +1687,25 @@ SECTION_RODATA static u8 const lit_4185[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AE6C74, &lit_4185); +COMPILER_STRIP_GATE(0x80AE6C74, &lit_4185); /* 80AE6C78-80AE6C7C 0000B0 0004+00 0/2 0/0 0/0 .rodata @4186 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4186 = 65536.0f; -COMPILER_STRIP_GATE(80AE6C78, &lit_4186); +COMPILER_STRIP_GATE(0x80AE6C78, &lit_4186); #pragma pop /* 80AE6C7C-80AE6C80 0000B4 0004+00 0/3 0/0 0/0 .rodata @4187 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4187 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(80AE6C7C, &lit_4187); +COMPILER_STRIP_GATE(0x80AE6C7C, &lit_4187); #pragma pop /* 80AE6C80-80AE6C84 0000B8 0004+00 2/4 0/0 0/0 .rodata @4331 */ SECTION_RODATA static f32 const lit_4331 = 1.0f; -COMPILER_STRIP_GATE(80AE6C80, &lit_4331); +COMPILER_STRIP_GATE(0x80AE6C80, &lit_4331); /* 80AE31A0-80AE3410 0004C0 0270+00 1/1 0/0 0/0 .text CreateHeap__11daNpc_Sha_cFv */ #pragma push @@ -1828,7 +1840,7 @@ asm void daNpc_Sha_c::Execute() { /* ############################################################################################## */ /* 80AE6C84-80AE6C88 0000BC 0004+00 1/1 0/0 0/0 .rodata @4380 */ SECTION_RODATA static f32 const lit_4380 = 100.0f; -COMPILER_STRIP_GATE(80AE6C84, &lit_4380); +COMPILER_STRIP_GATE(0x80AE6C84, &lit_4380); /* 80AE3620-80AE36B4 000940 0094+00 1/1 0/0 0/0 .text Draw__11daNpc_Sha_cFv */ #pragma push @@ -1925,7 +1937,7 @@ asm void daNpc_Sha_c::checkChangeEvt() { /* ############################################################################################## */ /* 80AE6C88-80AE6C8C 0000C0 0004+00 2/3 0/0 0/0 .rodata @4537 */ SECTION_RODATA static f32 const lit_4537 = -1.0f; -COMPILER_STRIP_GATE(80AE6C88, &lit_4537); +COMPILER_STRIP_GATE(0x80AE6C88, &lit_4537); /* 80AE3B78-80AE3C24 000E98 00AC+00 1/0 0/0 0/0 .text setAfterTalkMotion__11daNpc_Sha_cFv */ @@ -1988,42 +2000,42 @@ asm void daNpc_Sha_c::beforeMove() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4710 = -30.0f; -COMPILER_STRIP_GATE(80AE6C8C, &lit_4710); +COMPILER_STRIP_GATE(0x80AE6C8C, &lit_4710); #pragma pop /* 80AE6C90-80AE6C94 0000C8 0004+00 0/1 0/0 0/0 .rodata @4711 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4711 = 10.0f; -COMPILER_STRIP_GATE(80AE6C90, &lit_4711); +COMPILER_STRIP_GATE(0x80AE6C90, &lit_4711); #pragma pop /* 80AE6C94-80AE6C98 0000CC 0004+00 0/1 0/0 0/0 .rodata @4712 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4712 = 0x38C90FDB; -COMPILER_STRIP_GATE(80AE6C94, &lit_4712); +COMPILER_STRIP_GATE(0x80AE6C94, &lit_4712); #pragma pop /* 80AE6C98-80AE6C9C 0000D0 0004+00 0/1 0/0 0/0 .rodata @4713 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4713 = 90.0f; -COMPILER_STRIP_GATE(80AE6C98, &lit_4713); +COMPILER_STRIP_GATE(0x80AE6C98, &lit_4713); #pragma pop /* 80AE6C9C-80AE6CA0 0000D4 0004+00 0/1 0/0 0/0 .rodata @4714 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4714 = 94.0f; -COMPILER_STRIP_GATE(80AE6C9C, &lit_4714); +COMPILER_STRIP_GATE(0x80AE6C9C, &lit_4714); #pragma pop /* 80AE6CA0-80AE6CA8 0000D8 0008+00 2/4 0/0 0/0 .rodata @4716 */ SECTION_RODATA static u8 const lit_4716[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AE6CA0, &lit_4716); +COMPILER_STRIP_GATE(0x80AE6CA0, &lit_4716); /* 80AE4044-80AE4360 001364 031C+00 1/0 0/0 0/0 .text setAttnPos__11daNpc_Sha_cFv */ #pragma push @@ -2065,7 +2077,7 @@ asm void daNpc_Sha_c::selectAction() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpc_Sha_c::chkAction(int (daNpc_Sha_c::*)(void*)) { +asm void daNpc_Sha_c::chkAction(int (daNpc_Sha_c::*param_0)(void*)) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_shaman/d_a_npc_shaman/chkAction__11daNpc_Sha_cFM11daNpc_Sha_cFPCvPvPv_i.s" } @@ -2076,7 +2088,7 @@ asm void daNpc_Sha_c::chkAction(int (daNpc_Sha_c::*)(void*)) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpc_Sha_c::setAction(int (daNpc_Sha_c::*)(void*)) { +asm void daNpc_Sha_c::setAction(int (daNpc_Sha_c::*param_0)(void*)) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_shaman/d_a_npc_shaman/setAction__11daNpc_Sha_cFM11daNpc_Sha_cFPCvPvPv_i.s" } @@ -2109,7 +2121,7 @@ asm void daNpc_Sha_c::setTempBit(int param_0) { SECTION_RODATA static u8 const lit_4774[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AE6CA8, &lit_4774); +COMPILER_STRIP_GATE(0x80AE6CA8, &lit_4774); #pragma pop /* 80AE6CB0-80AE6CB8 0000E8 0008+00 0/1 0/0 0/0 .rodata @4775 */ @@ -2118,7 +2130,7 @@ COMPILER_STRIP_GATE(80AE6CA8, &lit_4774); SECTION_RODATA static u8 const lit_4775[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AE6CB0, &lit_4775); +COMPILER_STRIP_GATE(0x80AE6CB0, &lit_4775); #pragma pop /* 80AE6CB8-80AE6CC0 0000F0 0008+00 0/1 0/0 0/0 .rodata @4776 */ @@ -2127,14 +2139,23 @@ COMPILER_STRIP_GATE(80AE6CB0, &lit_4775); SECTION_RODATA static u8 const lit_4776[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AE6CB8, &lit_4776); +COMPILER_STRIP_GATE(0x80AE6CB8, &lit_4776); #pragma pop /* 80AE6CC0-80AE6CCC 0000F8 000C+00 1/1 0/0 0/0 .rodata @4995 */ SECTION_RODATA static u8 const lit_4995[12] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, }; -COMPILER_STRIP_GATE(80AE6CC0, &lit_4995); +COMPILER_STRIP_GATE(0x80AE6CC0, &lit_4995); + +/* 80AE6CCC-80AE6CCC 000104 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80AE6D01 = "prm"; +SECTION_DEAD static char const* const stringBase_80AE6D05 = "msgNo"; +SECTION_DEAD static char const* const stringBase_80AE6D0B = "msgNo2"; +SECTION_DEAD static char const* const stringBase_80AE6D12 = "timer"; +#pragma pop /* 80AE4974-80AE4E24 001C94 04B0+00 2/0 0/0 0/0 .text cutPerformAugury__11daNpc_Sha_cFi */ @@ -2598,7 +2619,7 @@ void daNpcT_c::changeBtk(int* param_0, int* param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80AE6438(int* param_0) { +extern "C" asm void func_80AE6438(void* _this, int* param_0) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_shaman/d_a_npc_shaman/func_80AE6438.s" } @@ -2608,7 +2629,7 @@ extern "C" asm void func_80AE6438(int* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80AE6454(int param_0, int param_1) { +extern "C" asm void func_80AE6454(void* _this, int param_0, int param_1) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_shaman/d_a_npc_shaman/func_80AE6454.s" } @@ -2640,7 +2661,7 @@ asm void __sinit_d_a_npc_shaman_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80AE64D0 = (void*)__sinit_d_a_npc_shaman_cpp; +REGISTER_CTORS(0x80AE64D0, __sinit_d_a_npc_shaman_cpp); #pragma pop /* 80AE69E0-80AE6A8C 003D00 00AC+00 1/1 0/0 0/0 .text @@ -2752,19 +2773,4 @@ static asm void func_80AE6BAC() { } #pragma pop -/* 80AE6CCC-80AE6D18 000104 004C+00 5/2 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80AE6CCC = ""; -SECTION_DEAD static char const* const stringBase_80AE6CCD = "NO_RESPONSE"; -SECTION_DEAD static char const* const stringBase_80AE6CD9 = "PERFORM_AUGURY"; -SECTION_DEAD static char const* const stringBase_80AE6CE8 = "ALLGET"; -SECTION_DEAD static char const* const stringBase_80AE6CEF = "NOLOOK"; -SECTION_DEAD static char const* const stringBase_80AE6CF6 = "RETURN"; -SECTION_DEAD static char const* const stringBase_80AE6CFD = "Sha"; -SECTION_DEAD static char const* const stringBase_80AE6D01 = "prm"; -SECTION_DEAD static char const* const stringBase_80AE6D05 = "msgNo"; -SECTION_DEAD static char const* const stringBase_80AE6D0B = "msgNo2"; -SECTION_DEAD static char const* const stringBase_80AE6D12 = "timer"; -#pragma pop +/* 80AE6CCC-80AE6CCC 000104 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/npc/d_a_npc_shoe/d_a_npc_shoe.cpp b/rel/d/a/npc/d_a_npc_shoe/d_a_npc_shoe.cpp index 0a0b11ac326..1629119d9da 100644 --- a/rel/d/a/npc/d_a_npc_shoe/d_a_npc_shoe.cpp +++ b/rel/d/a/npc/d_a_npc_shoe/d_a_npc_shoe.cpp @@ -30,16 +30,16 @@ struct mDoMtx_stack_c { static u8 now[48]; }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; - struct J3DAnmTransform {}; +struct J3DModelData {}; + +struct Z2Creature {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -52,10 +52,10 @@ struct fopAc_ac_c { /* 80018C8C */ ~fopAc_ac_c(); }; -struct J3DJoint {}; - struct J3DModel {}; +struct J3DJoint {}; + struct daNpcShoe_c { /* 80AE794C */ daNpcShoe_c(); /* 80AE7B60 */ ~daNpcShoe_c(); @@ -91,10 +91,10 @@ struct daNpcShoe_Param_c { static u8 const m[108]; }; -struct _GXColorS10 {}; - struct J3DAnmTexPattern {}; +struct _GXColorS10 {}; + struct J3DAnmTransformKey {}; struct daNpcF_c { @@ -168,7 +168,6 @@ struct dMsgFlow_c { struct dEvt_control_c { /* 80042468 */ void reset(); - /* 800436EC */ void setPtI_Id(unsigned int); }; struct dEvent_manager_c { @@ -492,6 +491,15 @@ extern "C" void __register_global_object(); // /* ############################################################################################## */ +/* 80AEA51C-80AEA51C 00016C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80AEA51C = "shoe"; +SECTION_DEAD static char const* const stringBase_80AEA521 = "Mgeneral"; +SECTION_DEAD static char const* const stringBase_80AEA52A = "object"; +SECTION_DEAD static char const* const stringBase_80AEA531 = "Shoe"; +#pragma pop + /* 80AEA538-80AEA544 000000 000C+00 2/2 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -773,34 +781,34 @@ SECTION_RODATA u8 const daNpcShoe_Param_c::m[108] = { 0x42, 0x70, 0x00, 0x00, 0x43, 0xFA, 0x00, 0x00, 0x43, 0x96, 0x00, 0x00, 0xC3, 0x96, 0x00, 0x00, 0x00, 0x3C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AEA3B0, &daNpcShoe_Param_c::m); +COMPILER_STRIP_GATE(0x80AEA3B0, &daNpcShoe_Param_c::m); /* 80AEA41C-80AEA420 00006C 0004+00 0/1 0/0 0/0 .rodata @4166 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4166 = -50.0f; -COMPILER_STRIP_GATE(80AEA41C, &lit_4166); +COMPILER_STRIP_GATE(0x80AEA41C, &lit_4166); #pragma pop /* 80AEA420-80AEA424 000070 0004+00 0/1 0/0 0/0 .rodata @4167 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4167 = -10.0f; -COMPILER_STRIP_GATE(80AEA420, &lit_4167); +COMPILER_STRIP_GATE(0x80AEA420, &lit_4167); #pragma pop /* 80AEA424-80AEA428 000074 0004+00 0/2 0/0 0/0 .rodata @4168 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4168 = 50.0f; -COMPILER_STRIP_GATE(80AEA424, &lit_4168); +COMPILER_STRIP_GATE(0x80AEA424, &lit_4168); #pragma pop /* 80AEA428-80AEA42C 000078 0004+00 0/1 0/0 0/0 .rodata @4169 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4169 = 160.0f; -COMPILER_STRIP_GATE(80AEA428, &lit_4169); +COMPILER_STRIP_GATE(0x80AEA428, &lit_4169); #pragma pop /* 80AE7D48-80AE7FD8 0004E8 0290+00 1/1 0/0 0/0 .text Create__11daNpcShoe_cFv */ @@ -816,18 +824,18 @@ asm void daNpcShoe_c::Create() { /* ############################################################################################## */ /* 80AEA42C-80AEA430 00007C 0004+00 1/5 0/0 0/0 .rodata @4235 */ SECTION_RODATA static f32 const lit_4235 = 1.0f; -COMPILER_STRIP_GATE(80AEA42C, &lit_4235); +COMPILER_STRIP_GATE(0x80AEA42C, &lit_4235); /* 80AEA430-80AEA434 000080 0004+00 0/1 0/0 0/0 .rodata @4236 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4236 = 0x3F0EE0A7; -COMPILER_STRIP_GATE(80AEA430, &lit_4236); +COMPILER_STRIP_GATE(0x80AEA430, &lit_4236); #pragma pop /* 80AEA434-80AEA438 000084 0004+00 2/5 0/0 0/0 .rodata @4237 */ SECTION_RODATA static f32 const lit_4237 = -1.0f; -COMPILER_STRIP_GATE(80AEA434, &lit_4237); +COMPILER_STRIP_GATE(0x80AEA434, &lit_4237); /* 80AE7FD8-80AE81E8 000778 0210+00 1/1 0/0 0/0 .text CreateHeap__11daNpcShoe_cFv */ #pragma push @@ -874,7 +882,7 @@ asm void daNpcShoe_c::Draw() { SECTION_RODATA static u8 const lit_4302[12] = { 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x03, }; -COMPILER_STRIP_GATE(80AEA438, &lit_4302); +COMPILER_STRIP_GATE(0x80AEA438, &lit_4302); /* 80AE840C-80AE8598 000BAC 018C+00 1/1 0/0 0/0 .text * ctrlJoint__11daNpcShoe_cFP8J3DJointP8J3DModel */ @@ -926,7 +934,7 @@ asm void daNpcShoe_c::setMotion(int param_0, f32 param_1, int param_2) { SECTION_RODATA static u8 const lit_4423[12] = { 0x3F, 0x19, 0x99, 0x9A, 0x3F, 0x19, 0x99, 0x9A, 0x3F, 0x19, 0x99, 0x9A, }; -COMPILER_STRIP_GATE(80AEA444, &lit_4423); +COMPILER_STRIP_GATE(0x80AEA444, &lit_4423); #pragma pop /* 80AEA450-80AEA454 0000A0 0004+00 0/5 0/0 0/0 .rodata @4480 */ @@ -938,7 +946,7 @@ SECTION_RODATA static u8 const lit_4480[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AEA450, &lit_4480); +COMPILER_STRIP_GATE(0x80AEA450, &lit_4480); #pragma pop /* 80AE864C-80AE895C 000DEC 0310+00 1/1 0/0 0/0 .text reset__11daNpcShoe_cFv */ @@ -956,7 +964,7 @@ asm void daNpcShoe_c::reset() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpcShoe_c::setAction(bool (daNpcShoe_c::*)(void*)) { +asm void daNpcShoe_c::setAction(bool (daNpcShoe_c::*param_0)(void*)) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_shoe/d_a_npc_shoe/setAction__11daNpcShoe_cFM11daNpcShoe_cFPCvPvPv_b.s" } @@ -969,7 +977,7 @@ asm void daNpcShoe_c::setAction(bool (daNpcShoe_c::*)(void*)) { SECTION_RODATA static u8 const lit_4481[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AEA454, &lit_4481); +COMPILER_STRIP_GATE(0x80AEA454, &lit_4481); #pragma pop /* 80AEA460-80AEA464 0000B0 0004+00 0/1 0/0 0/0 .rodata @4482 */ @@ -981,7 +989,7 @@ SECTION_RODATA static u8 const lit_4482[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AEA460, &lit_4482); +COMPILER_STRIP_GATE(0x80AEA460, &lit_4482); #pragma pop /* 80AEA464-80AEA470 0000B4 000C+00 0/1 0/0 0/0 .rodata @4483 */ @@ -990,7 +998,7 @@ COMPILER_STRIP_GATE(80AEA460, &lit_4482); SECTION_RODATA static u8 const lit_4483[12] = { 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80AEA464, &lit_4483); +COMPILER_STRIP_GATE(0x80AEA464, &lit_4483); #pragma pop /* 80AEA470-80AEA47C 0000C0 000C+00 0/1 0/0 0/0 .rodata @4484 */ @@ -999,7 +1007,7 @@ COMPILER_STRIP_GATE(80AEA464, &lit_4483); SECTION_RODATA static u8 const lit_4484[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AEA470, &lit_4484); +COMPILER_STRIP_GATE(0x80AEA470, &lit_4484); #pragma pop /* 80AEA47C-80AEA484 0000CC 0008+00 0/1 0/0 0/0 .rodata @4485 */ @@ -1008,7 +1016,7 @@ COMPILER_STRIP_GATE(80AEA470, &lit_4484); SECTION_RODATA static u8 const lit_4485[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AEA47C, &lit_4485); +COMPILER_STRIP_GATE(0x80AEA47C, &lit_4485); #pragma pop /* 80AEA484-80AEA490 0000D4 000C+00 0/1 0/0 0/0 .rodata @4486 */ @@ -1017,7 +1025,7 @@ COMPILER_STRIP_GATE(80AEA47C, &lit_4485); SECTION_RODATA static u8 const lit_4486[12] = { 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80AEA484, &lit_4486); +COMPILER_STRIP_GATE(0x80AEA484, &lit_4486); #pragma pop /* 80AEA490-80AEA49C 0000E0 000C+00 0/1 0/0 0/0 .rodata @4487 */ @@ -1026,7 +1034,7 @@ COMPILER_STRIP_GATE(80AEA484, &lit_4486); SECTION_RODATA static u8 const lit_4487[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AEA490, &lit_4487); +COMPILER_STRIP_GATE(0x80AEA490, &lit_4487); #pragma pop /* 80AEA49C-80AEA4A4 0000EC 0008+00 0/1 0/0 0/0 .rodata @4488 */ @@ -1035,7 +1043,7 @@ COMPILER_STRIP_GATE(80AEA490, &lit_4487); SECTION_RODATA static u8 const lit_4488[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AEA49C, &lit_4488); +COMPILER_STRIP_GATE(0x80AEA49C, &lit_4488); #pragma pop /* 80AEA4A4-80AEA4B0 0000F4 000C+00 0/1 0/0 0/0 .rodata @4489 */ @@ -1044,7 +1052,7 @@ COMPILER_STRIP_GATE(80AEA49C, &lit_4488); SECTION_RODATA static u8 const lit_4489[12] = { 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80AEA4A4, &lit_4489); +COMPILER_STRIP_GATE(0x80AEA4A4, &lit_4489); #pragma pop /* 80AEA4B0-80AEA4BC 000100 000C+00 0/1 0/0 0/0 .rodata @4490 */ @@ -1053,7 +1061,7 @@ COMPILER_STRIP_GATE(80AEA4A4, &lit_4489); SECTION_RODATA static u8 const lit_4490[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AEA4B0, &lit_4490); +COMPILER_STRIP_GATE(0x80AEA4B0, &lit_4490); #pragma pop /* 80AEA4BC-80AEA4C4 00010C 0008+00 0/1 0/0 0/0 .rodata @4491 */ @@ -1062,7 +1070,7 @@ COMPILER_STRIP_GATE(80AEA4B0, &lit_4490); SECTION_RODATA static u8 const lit_4491[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AEA4BC, &lit_4491); +COMPILER_STRIP_GATE(0x80AEA4BC, &lit_4491); #pragma pop /* 80AEA4C4-80AEA4D0 000114 000C+00 0/1 0/0 0/0 .rodata @4492 */ @@ -1071,7 +1079,7 @@ COMPILER_STRIP_GATE(80AEA4BC, &lit_4491); SECTION_RODATA static u8 const lit_4492[12] = { 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AEA4C4, &lit_4492); +COMPILER_STRIP_GATE(0x80AEA4C4, &lit_4492); #pragma pop /* 80AEA4D0-80AEA4D4 000120 0004+00 0/1 0/0 0/0 .rodata @4493 */ @@ -1083,7 +1091,7 @@ SECTION_RODATA static u8 const lit_4493[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AEA4D0, &lit_4493); +COMPILER_STRIP_GATE(0x80AEA4D0, &lit_4493); #pragma pop /* 80AEA4D4-80AEA4E8 000124 0014+00 0/0 0/0 0/0 .rodata @4494 */ @@ -1093,7 +1101,7 @@ SECTION_RODATA static u8 const lit_4494[20] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AEA4D4, &lit_4494); +COMPILER_STRIP_GATE(0x80AEA4D4, &lit_4494); #pragma pop /* 80AEA4E8-80AEA4F8 000138 000C+04 0/1 0/0 0/0 .rodata @4508 */ @@ -1118,7 +1126,7 @@ SECTION_RODATA static u8 const lit_4508[12 + 4 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AEA4E8, &lit_4508); +COMPILER_STRIP_GATE(0x80AEA4E8, &lit_4508); #pragma pop /* 80AEA4F8-80AEA500 000148 0008+00 0/1 0/0 0/0 .rodata @4623 */ @@ -1127,7 +1135,7 @@ COMPILER_STRIP_GATE(80AEA4E8, &lit_4508); SECTION_RODATA static u8 const lit_4623[8] = { 0x40, 0x7F, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AEA4F8, &lit_4623); +COMPILER_STRIP_GATE(0x80AEA4F8, &lit_4623); #pragma pop /* 80AEA500-80AEA508 000150 0008+00 0/1 0/0 0/0 .rodata @4624 */ @@ -1136,7 +1144,7 @@ COMPILER_STRIP_GATE(80AEA4F8, &lit_4623); SECTION_RODATA static u8 const lit_4624[8] = { 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AEA500, &lit_4624); +COMPILER_STRIP_GATE(0x80AEA500, &lit_4624); #pragma pop /* 80AE8A04-80AE8E24 0011A4 0420+00 3/0 0/0 0/0 .text wait__11daNpcShoe_cFPv */ @@ -1249,14 +1257,14 @@ asm void daNpcShoe_c::main() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4841 = 10.0f; -COMPILER_STRIP_GATE(80AEA508, &lit_4841); +COMPILER_STRIP_GATE(0x80AEA508, &lit_4841); #pragma pop /* 80AEA50C-80AEA510 00015C 0004+00 0/1 0/0 0/0 .rodata @4842 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4842 = 15.0f; -COMPILER_STRIP_GATE(80AEA50C, &lit_4842); +COMPILER_STRIP_GATE(0x80AEA50C, &lit_4842); #pragma pop /* 80AE9624-80AE9820 001DC4 01FC+00 1/0 0/0 0/0 .text setAttnPos__11daNpcShoe_cFv */ @@ -1274,21 +1282,21 @@ asm void daNpcShoe_c::setAttnPos() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4883 = -80.0f; -COMPILER_STRIP_GATE(80AEA510, &lit_4883); +COMPILER_STRIP_GATE(0x80AEA510, &lit_4883); #pragma pop /* 80AEA514-80AEA518 000164 0004+00 0/1 0/0 0/0 .rodata @4884 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4884 = 80.0f; -COMPILER_STRIP_GATE(80AEA514, &lit_4884); +COMPILER_STRIP_GATE(0x80AEA514, &lit_4884); #pragma pop /* 80AEA518-80AEA51C 000168 0004+00 0/1 0/0 0/0 .rodata @4885 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4885 = 40.0f; -COMPILER_STRIP_GATE(80AEA518, &lit_4885); +COMPILER_STRIP_GATE(0x80AEA518, &lit_4885); #pragma pop /* 80AE9820-80AE9A00 001FC0 01E0+00 1/1 0/0 0/0 .text lookat__11daNpcShoe_cFv */ @@ -1502,7 +1510,7 @@ asm void __sinit_d_a_npc_shoe_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80AEA2D8 = (void*)__sinit_d_a_npc_shoe_cpp; +REGISTER_CTORS(0x80AEA2D8, __sinit_d_a_npc_shoe_cpp); #pragma pop /* 80AEA340-80AEA344 002AE0 0004+00 1/0 0/0 0/0 .text adjustShapeAngle__11daNpcShoe_cFv @@ -1541,12 +1549,4 @@ static asm void func_80AEA394() { } #pragma pop -/* 80AEA51C-80AEA536 00016C 001A+00 2/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80AEA51C = "shoe"; -SECTION_DEAD static char const* const stringBase_80AEA521 = "Mgeneral"; -SECTION_DEAD static char const* const stringBase_80AEA52A = "object"; -SECTION_DEAD static char const* const stringBase_80AEA531 = "Shoe"; -#pragma pop +/* 80AEA51C-80AEA51C 00016C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/npc/d_a_npc_shop0/d_a_npc_shop0.cpp b/rel/d/a/npc/d_a_npc_shop0/d_a_npc_shop0.cpp index f21ed248fd9..46e6de4649d 100644 --- a/rel/d/a/npc/d_a_npc_shop0/d_a_npc_shop0.cpp +++ b/rel/d/a/npc/d_a_npc_shop0/d_a_npc_shop0.cpp @@ -358,6 +358,14 @@ static asm void createHeapCallBack(fopAc_ac_c* param_0) { #pragma pop /* ############################################################################################## */ +/* 80AEBC54-80AEBC54 000080 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80AEBC54 = "Shop0"; +SECTION_DEAD static char const* const stringBase_80AEBC5A = "grA_a.bmd"; +SECTION_DEAD static char const* const stringBase_80AEBC64 = "grA_wait_a"; +#pragma pop + /* 80AEBC74-80AEBC78 -00001 0004+00 1/1 0/0 0/0 .data l_resName */ SECTION_DATA static void* l_resName = (void*)&d_a_npc_shop0__stringBase0; @@ -608,7 +616,7 @@ SECTION_RODATA u8 const daNpc_Shop0_c::mCylDat[68] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AEBBD4, &daNpc_Shop0_c::mCylDat); +COMPILER_STRIP_GATE(0x80AEBBD4, &daNpc_Shop0_c::mCylDat); /* 80AEBC18-80AEBC24 000044 000C+00 0/0 0/0 0/0 .rodata mParam__19daNpc_Shop0_Param_c */ #pragma push @@ -616,12 +624,12 @@ COMPILER_STRIP_GATE(80AEBBD4, &daNpc_Shop0_c::mCylDat); SECTION_RODATA u8 const daNpc_Shop0_Param_c::mParam[12] = { 0x44, 0x48, 0x00, 0x00, 0x44, 0x48, 0x00, 0x00, 0x41, 0xF0, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AEBC18, &daNpc_Shop0_Param_c::mParam); +COMPILER_STRIP_GATE(0x80AEBC18, &daNpc_Shop0_Param_c::mParam); #pragma pop /* 80AEBC24-80AEBC28 000050 0004+00 2/3 0/0 0/0 .rodata @4004 */ SECTION_RODATA static f32 const lit_4004 = 1.0f; -COMPILER_STRIP_GATE(80AEBC24, &lit_4004); +COMPILER_STRIP_GATE(0x80AEBC24, &lit_4004); /* 80AEAE9C-80AEAF8C 00073C 00F0+00 1/1 0/0 0/0 .text createHeap__13daNpc_Shop0_cFv */ #pragma push @@ -646,11 +654,11 @@ asm void daNpc_Shop0_c::destroy() { /* ############################################################################################## */ /* 80AEBC28-80AEBC2C 000054 0004+00 1/1 0/0 0/0 .rodata @4023 */ SECTION_RODATA static f32 const lit_4023 = -3.0f; -COMPILER_STRIP_GATE(80AEBC28, &lit_4023); +COMPILER_STRIP_GATE(0x80AEBC28, &lit_4023); /* 80AEBC2C-80AEBC30 000058 0004+00 3/3 0/0 0/0 .rodata @4024 */ SECTION_RODATA static f32 const lit_4024 = 40.0f; -COMPILER_STRIP_GATE(80AEBC2C, &lit_4024); +COMPILER_STRIP_GATE(0x80AEBC2C, &lit_4024); /* 80AEAFC0-80AEB078 000860 00B8+00 2/2 0/0 0/0 .text execute__13daNpc_Shop0_cFv */ #pragma push @@ -665,13 +673,13 @@ asm void daNpc_Shop0_c::execute() { /* ############################################################################################## */ /* 80AEBC30-80AEBC34 00005C 0004+00 1/2 0/0 0/0 .rodata @4051 */ SECTION_RODATA static f32 const lit_4051 = -1000000000.0f; -COMPILER_STRIP_GATE(80AEBC30, &lit_4051); +COMPILER_STRIP_GATE(0x80AEBC30, &lit_4051); /* 80AEBC34-80AEBC38 000060 0004+00 0/1 0/0 0/0 .rodata @4052 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4052 = 10.0f; -COMPILER_STRIP_GATE(80AEBC34, &lit_4052); +COMPILER_STRIP_GATE(0x80AEBC34, &lit_4052); #pragma pop /* 80AEB078-80AEB148 000918 00D0+00 1/1 0/0 0/0 .text draw__13daNpc_Shop0_cFv */ @@ -746,6 +754,12 @@ asm void daNpc_Shop0_c::init() { #pragma pop /* ############################################################################################## */ +/* 80AEBC54-80AEBC54 000080 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80AEBC6F = ".bck"; +#pragma pop + /* 80AEBDC0-80AEBDD8 000000 0015+03 1/1 0/0 0/0 .bss l_fileName */ static u8 l_fileName[21 + 3 /* padding */]; @@ -767,13 +781,13 @@ SECTION_RODATA static u8 const lit_4118[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AEBC38, &lit_4118); +COMPILER_STRIP_GATE(0x80AEBC38, &lit_4118); /* 80AEBC3C-80AEBC44 000068 0008+00 1/1 0/0 0/0 .rodata @4120 */ SECTION_RODATA static u8 const lit_4120[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AEBC3C, &lit_4120); +COMPILER_STRIP_GATE(0x80AEBC3C, &lit_4120); /* 80AEB3A8-80AEB45C 000C48 00B4+00 1/1 0/0 0/0 .text * setBckAnm__13daNpc_Shop0_cFP15J3DAnmTransformfiiib */ @@ -824,7 +838,7 @@ SECTION_RODATA static f32 const lit_4181[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80AEBC44, &lit_4181); +COMPILER_STRIP_GATE(0x80AEBC44, &lit_4181); /* 80AEB634-80AEB6DC 000ED4 00A8+00 1/1 0/0 0/0 .text setMtx__13daNpc_Shop0_cFv */ #pragma push @@ -861,7 +875,7 @@ asm void daNpc_Shop0_c::cut_alert(int param_0, int param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpc_Shop0_c::chkProcess(int (daNpc_Shop0_c::*)(void*)) { +asm void daNpc_Shop0_c::chkProcess(int (daNpc_Shop0_c::*param_0)(void*)) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_shop0/d_a_npc_shop0/chkProcess__13daNpc_Shop0_cFM13daNpc_Shop0_cFPCvPvPv_i.s" } @@ -872,7 +886,8 @@ asm void daNpc_Shop0_c::chkProcess(int (daNpc_Shop0_c::*)(void*)) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpc_Shop0_c::setProcess(int (daNpc_Shop0_c::*)(void*), void* param_1, int param_2) { +asm void daNpc_Shop0_c::setProcess(int (daNpc_Shop0_c::*param_0)(void*), void* param_1, + int param_2) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_shop0/d_a_npc_shop0/setProcess__13daNpc_Shop0_cFM13daNpc_Shop0_cFPCvPvPv_iPvi.s" } @@ -883,7 +898,7 @@ asm void daNpc_Shop0_c::setProcess(int (daNpc_Shop0_c::*)(void*), void* param_1, SECTION_RODATA static u8 const lit_4259[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AEBC4C, &lit_4259); +COMPILER_STRIP_GATE(0x80AEBC4C, &lit_4259); /* 80AEB920-80AEB9BC 0011C0 009C+00 2/0 0/0 0/0 .text wait__13daNpc_Shop0_cFPv */ #pragma push @@ -1020,12 +1035,4 @@ static asm void func_80AEBBC4() { } #pragma pop -/* 80AEBC54-80AEBC74 000080 0020+00 4/1 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80AEBC54 = "Shop0"; -SECTION_DEAD static char const* const stringBase_80AEBC5A = "grA_a.bmd"; -SECTION_DEAD static char const* const stringBase_80AEBC64 = "grA_wait_a"; -SECTION_DEAD static char const* const stringBase_80AEBC6F = ".bck"; -#pragma pop +/* 80AEBC54-80AEBC54 000080 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/npc/d_a_npc_shop_maro/d_a_npc_shop_maro.cpp b/rel/d/a/npc/d_a_npc_shop_maro/d_a_npc_shop_maro.cpp index c24438e44cd..41ddafb7128 100644 --- a/rel/d/a/npc/d_a_npc_shop_maro/d_a_npc_shop_maro.cpp +++ b/rel/d/a/npc/d_a_npc_shop_maro/d_a_npc_shop_maro.cpp @@ -36,13 +36,13 @@ struct daNpcT_MotionSeqMngr_c { struct J3DModel {}; +struct J3DJoint {}; + struct cXyz { /* 80AEC0DC */ ~cXyz(); /* 80AEC670 */ cXyz(); }; -struct J3DJoint {}; - struct daNpcT_c { /* 801490D4 */ void ctrlBtk(); /* 8014951C */ void ctrlJoint(J3DJoint*, J3DModel*); @@ -481,20 +481,20 @@ asm daNpc_shopMaro_c::~daNpc_shopMaro_c() { /* ############################################################################################## */ /* 80AEC918-80AEC91C 000000 0004+00 2/2 0/0 0/0 .rodata @4009 */ SECTION_RODATA static f32 const lit_4009 = 0.25f; -COMPILER_STRIP_GATE(80AEC918, &lit_4009); +COMPILER_STRIP_GATE(0x80AEC918, &lit_4009); /* 80AEC91C-80AEC920 000004 0004+00 0/1 0/0 0/0 .rodata @4010 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4010 = 20.0f; -COMPILER_STRIP_GATE(80AEC91C, &lit_4010); +COMPILER_STRIP_GATE(0x80AEC91C, &lit_4010); #pragma pop /* 80AEC920-80AEC924 000008 0004+00 0/1 0/0 0/0 .rodata @4011 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4011 = 5.0f; -COMPILER_STRIP_GATE(80AEC920, &lit_4011); +COMPILER_STRIP_GATE(0x80AEC920, &lit_4011); #pragma pop /* 80AEC924-80AEC928 00000C 0004+00 0/2 0/0 0/0 .rodata @4012 */ @@ -506,21 +506,21 @@ SECTION_RODATA static u8 const lit_4012[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AEC924, &lit_4012); +COMPILER_STRIP_GATE(0x80AEC924, &lit_4012); #pragma pop /* 80AEC928-80AEC92C 000010 0004+00 0/1 0/0 0/0 .rodata @4013 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4013 = 100.0f; -COMPILER_STRIP_GATE(80AEC928, &lit_4013); +COMPILER_STRIP_GATE(0x80AEC928, &lit_4013); #pragma pop /* 80AEC92C-80AEC930 000014 0004+00 0/1 0/0 0/0 .rodata @4014 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4014 = 60.0f; -COMPILER_STRIP_GATE(80AEC92C, &lit_4014); +COMPILER_STRIP_GATE(0x80AEC92C, &lit_4014); #pragma pop /* 80AEBFC4-80AEC0DC 0001E4 0118+00 1/1 0/0 0/0 .text @@ -582,14 +582,14 @@ asm csXyz::~csXyz() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4238 = 65536.0f; -COMPILER_STRIP_GATE(80AEC930, &lit_4238); +COMPILER_STRIP_GATE(0x80AEC930, &lit_4238); #pragma pop /* 80AEC934-80AEC938 00001C 0004+00 0/1 0/0 0/0 .rodata @4239 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4239 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(80AEC934, &lit_4239); +COMPILER_STRIP_GATE(0x80AEC934, &lit_4239); #pragma pop /* 80AEC16C-80AEC570 00038C 0404+00 1/1 0/0 0/0 .text diff --git a/rel/d/a/npc/d_a_npc_sola/d_a_npc_sola.cpp b/rel/d/a/npc/d_a_npc_sola/d_a_npc_sola.cpp index c9685633f59..4d70ae6bde3 100644 --- a/rel/d/a/npc/d_a_npc_sola/d_a_npc_sola.cpp +++ b/rel/d/a/npc/d_a_npc_sola/d_a_npc_sola.cpp @@ -15,12 +15,14 @@ struct mDoMtx_stack_c { static u8 now[48]; }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; +struct J3DAnmTransform {}; + +struct J3DModelData {}; + struct Vec {}; struct Z2Creature { @@ -29,8 +31,6 @@ struct Z2Creature { /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -43,6 +43,8 @@ struct fopAc_ac_c { /* 80018C8C */ ~fopAc_ac_c(); }; +struct daNpcT_faceMotionAnmData_c {}; + struct daNpcT_MotionSeqMngr_c { struct sequenceStepData_c {}; @@ -50,14 +52,12 @@ struct daNpcT_MotionSeqMngr_c { /* 80AEE8F0 */ ~daNpcT_MotionSeqMngr_c(); }; +struct daNpcT_evtData_c {}; + struct daNpcT_motionAnmData_c {}; struct J3DJoint {}; -struct daNpcT_faceMotionAnmData_c {}; - -struct daNpcT_evtData_c {}; - struct daNpc_solA_c { /* 80AECBAC */ ~daNpc_solA_c(); /* 80AECCD0 */ void create(); @@ -110,6 +110,8 @@ struct dCcD_GObjInf { /* 800840E4 */ ~dCcD_GObjInf(); }; +struct _GXColorS10 {}; + struct J3DModel {}; struct cXyz { @@ -118,8 +120,6 @@ struct cXyz { /* 80AEE8A4 */ cXyz(); }; -struct _GXColorS10 {}; - struct daNpcT_c { /* 80147FA4 */ void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*); /* 801483F8 */ void loadRes(s8 const*, char const**); @@ -260,13 +260,13 @@ struct dBgS_AcchCir { /* 80AEE938 */ ~dBgS_AcchCir(); }; -struct dBgS {}; - struct csXyz { /* 80AEE364 */ ~csXyz(); /* 80AEE7A4 */ csXyz(); }; +struct dBgS {}; + struct dBgS_Acch { /* 80075F94 */ ~dBgS_Acch(); /* 800760A0 */ dBgS_Acch(); @@ -532,6 +532,14 @@ extern "C" void __register_global_object(); // /* ############################################################################################## */ +/* 80AEF1E0-80AEF1E0 0000E0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80AEF1E0 = ""; +SECTION_DEAD static char const* const stringBase_80AEF1E1 = "NO_RESPONSE"; +SECTION_DEAD static char const* const stringBase_80AEF1ED = "solA"; +#pragma pop + /* 80AEF1F4-80AEF200 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -819,34 +827,34 @@ SECTION_RODATA u8 const daNpc_solA_Param_c::m[140] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AEF100, &daNpc_solA_Param_c::m); +COMPILER_STRIP_GATE(0x80AEF100, &daNpc_solA_Param_c::m); /* 80AEF18C-80AEF190 00008C 0004+00 0/1 0/0 0/0 .rodata @4138 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4138 = -300.0f; -COMPILER_STRIP_GATE(80AEF18C, &lit_4138); +COMPILER_STRIP_GATE(0x80AEF18C, &lit_4138); #pragma pop /* 80AEF190-80AEF194 000090 0004+00 0/1 0/0 0/0 .rodata @4139 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4139 = -50.0f; -COMPILER_STRIP_GATE(80AEF190, &lit_4139); +COMPILER_STRIP_GATE(0x80AEF190, &lit_4139); #pragma pop /* 80AEF194-80AEF198 000094 0004+00 0/1 0/0 0/0 .rodata @4140 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4140 = 300.0f; -COMPILER_STRIP_GATE(80AEF194, &lit_4140); +COMPILER_STRIP_GATE(0x80AEF194, &lit_4140); #pragma pop /* 80AEF198-80AEF19C 000098 0004+00 0/1 0/0 0/0 .rodata @4141 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4141 = 450.0f; -COMPILER_STRIP_GATE(80AEF198, &lit_4141); +COMPILER_STRIP_GATE(0x80AEF198, &lit_4141); #pragma pop /* 80AECCD0-80AECF58 000210 0288+00 1/1 0/0 0/0 .text create__12daNpc_solA_cFv */ @@ -867,25 +875,25 @@ SECTION_RODATA static u8 const lit_4295[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AEF19C, &lit_4295); +COMPILER_STRIP_GATE(0x80AEF19C, &lit_4295); /* 80AEF1A0-80AEF1A4 0000A0 0004+00 0/2 0/0 0/0 .rodata @4296 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4296 = 65536.0f; -COMPILER_STRIP_GATE(80AEF1A0, &lit_4296); +COMPILER_STRIP_GATE(0x80AEF1A0, &lit_4296); #pragma pop /* 80AEF1A4-80AEF1A8 0000A4 0004+00 0/3 0/0 0/0 .rodata @4297 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4297 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(80AEF1A4, &lit_4297); +COMPILER_STRIP_GATE(0x80AEF1A4, &lit_4297); #pragma pop /* 80AEF1A8-80AEF1AC 0000A8 0004+00 2/4 0/0 0/0 .rodata @4436 */ SECTION_RODATA static f32 const lit_4436 = 1.0f; -COMPILER_STRIP_GATE(80AEF1A8, &lit_4436); +COMPILER_STRIP_GATE(0x80AEF1A8, &lit_4436); /* 80AECF58-80AED0F8 000498 01A0+00 1/1 0/0 0/0 .text CreateHeap__12daNpc_solA_cFv */ #pragma push @@ -920,7 +928,7 @@ asm void daNpc_solA_c::Execute() { /* ############################################################################################## */ /* 80AEF1AC-80AEF1B0 0000AC 0004+00 1/1 0/0 0/0 .rodata @4469 */ SECTION_RODATA static f32 const lit_4469 = 100.0f; -COMPILER_STRIP_GATE(80AEF1AC, &lit_4469); +COMPILER_STRIP_GATE(0x80AEF1AC, &lit_4469); /* 80AED14C-80AED1E8 00068C 009C+00 1/1 0/0 0/0 .text Draw__12daNpc_solA_cFv */ #pragma push @@ -1002,7 +1010,7 @@ asm void daNpc_solA_c::setParam() { /* ############################################################################################## */ /* 80AEF1B0-80AEF1B4 0000B0 0004+00 2/2 0/0 0/0 .rodata @4568 */ SECTION_RODATA static f32 const lit_4568 = -1.0f; -COMPILER_STRIP_GATE(80AEF1B0, &lit_4568); +COMPILER_STRIP_GATE(0x80AEF1B0, &lit_4568); /* 80AED4A4-80AED504 0009E4 0060+00 1/0 0/0 0/0 .text setAfterTalkMotion__12daNpc_solA_cFv */ #pragma push @@ -1064,7 +1072,7 @@ asm void daNpc_solA_c::beforeMove() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4683 = 30.0f; -COMPILER_STRIP_GATE(80AEF1B4, &lit_4683); +COMPILER_STRIP_GATE(0x80AEF1B4, &lit_4683); #pragma pop /* 80AEF1B8-80AEF1C0 0000B8 0004+04 0/1 0/0 0/0 .rodata @4684 */ @@ -1075,14 +1083,14 @@ SECTION_RODATA static u32 const lit_4684[1 + 1 /* padding */] = { /* padding */ 0x00000000, }; -COMPILER_STRIP_GATE(80AEF1B8, &lit_4684); +COMPILER_STRIP_GATE(0x80AEF1B8, &lit_4684); #pragma pop /* 80AEF1C0-80AEF1C8 0000C0 0008+00 1/3 0/0 0/0 .rodata @4686 */ SECTION_RODATA static u8 const lit_4686[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AEF1C0, &lit_4686); +COMPILER_STRIP_GATE(0x80AEF1C0, &lit_4686); /* 80AED7D0-80AED9DC 000D10 020C+00 1/0 0/0 0/0 .text setAttnPos__12daNpc_solA_cFv */ #pragma push @@ -1129,7 +1137,7 @@ asm void daNpc_solA_c::selectAction() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpc_solA_c::chkAction(int (daNpc_solA_c::*)(void*)) { +asm void daNpc_solA_c::chkAction(int (daNpc_solA_c::*param_0)(void*)) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_sola/d_a_npc_sola/chkAction__12daNpc_solA_cFM12daNpc_solA_cFPCvPvPv_i.s" } @@ -1140,7 +1148,7 @@ asm void daNpc_solA_c::chkAction(int (daNpc_solA_c::*)(void*)) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpc_solA_c::setAction(int (daNpc_solA_c::*)(void*)) { +asm void daNpc_solA_c::setAction(int (daNpc_solA_c::*param_0)(void*)) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_sola/d_a_npc_sola/setAction__12daNpc_solA_cFM12daNpc_solA_cFPCvPvPv_i.s" } @@ -1371,7 +1379,7 @@ asm void daNpcT_JntAnm_c::setEyeAngleY(cXyz param_0, s16 param_1, int param_2, f SECTION_RODATA static u8 const lit_4744[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AEF1C8, &lit_4744); +COMPILER_STRIP_GATE(0x80AEF1C8, &lit_4744); #pragma pop /* 80AEF1D0-80AEF1D8 0000D0 0008+00 0/1 0/0 0/0 .rodata @4745 */ @@ -1380,7 +1388,7 @@ COMPILER_STRIP_GATE(80AEF1C8, &lit_4744); SECTION_RODATA static u8 const lit_4745[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AEF1D0, &lit_4745); +COMPILER_STRIP_GATE(0x80AEF1D0, &lit_4745); #pragma pop /* 80AEF1D8-80AEF1E0 0000D8 0008+00 0/1 0/0 0/0 .rodata @4746 */ @@ -1389,7 +1397,7 @@ COMPILER_STRIP_GATE(80AEF1D0, &lit_4745); SECTION_RODATA static u8 const lit_4746[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AEF1D8, &lit_4746); +COMPILER_STRIP_GATE(0x80AEF1D8, &lit_4746); #pragma pop /* 80AEEBE0-80AEEDE8 002120 0208+00 1/1 0/0 0/0 .text setEyeAngleX__15daNpcT_JntAnm_cF4cXyzfs */ @@ -1558,7 +1566,7 @@ asm void __sinit_d_a_npc_sola_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80AEEED8 = (void*)__sinit_d_a_npc_sola_cpp; +REGISTER_CTORS(0x80AEEED8, __sinit_d_a_npc_sola_cpp); #pragma pop /* 80AEEF40-80AEEFEC 002480 00AC+00 1/1 0/0 0/0 .text @@ -1643,11 +1651,4 @@ static asm void func_80AEF0E4() { } #pragma pop -/* 80AEF1E0-80AEF1F2 0000E0 0012+00 4/1 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80AEF1E0 = ""; -SECTION_DEAD static char const* const stringBase_80AEF1E1 = "NO_RESPONSE"; -SECTION_DEAD static char const* const stringBase_80AEF1ED = "solA"; -#pragma pop +/* 80AEF1E0-80AEF1E0 0000E0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/npc/d_a_npc_soldierA/d_a_npc_soldierA.cpp b/rel/d/a/npc/d_a_npc_soldierA/d_a_npc_soldierA.cpp index b7be407b7a3..17e1e0b7e3b 100644 --- a/rel/d/a/npc/d_a_npc_soldierA/d_a_npc_soldierA.cpp +++ b/rel/d/a/npc/d_a_npc_soldierA/d_a_npc_soldierA.cpp @@ -28,20 +28,20 @@ struct mDoMtx_stack_c { static u8 now[48]; }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; +struct J3DAnmTransform {}; + +struct J3DModelData {}; + struct Z2Creature { /* 802C03C8 */ Z2Creature(); /* 802C0420 */ ~Z2Creature(); /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -54,10 +54,10 @@ struct fopAc_ac_c { /* 80018C8C */ ~fopAc_ac_c(); }; -struct J3DJoint {}; - struct J3DModel {}; +struct J3DJoint {}; + struct daNpc_SoldierA_c { /* 80AEF58C */ daNpc_SoldierA_c(); /* 80AEF7A0 */ ~daNpc_SoldierA_c(); @@ -104,21 +104,21 @@ struct daNpc_SoldierA_Param_c { static u8 const m[108]; }; -struct _GXColorS10 {}; - struct dCcD_GObjInf { /* 80083A28 */ dCcD_GObjInf(); /* 800840E4 */ ~dCcD_GObjInf(); }; +struct _GXColorS10 {}; + +struct J3DAnmTransformKey {}; + struct dCcD_SrcCyl {}; struct dCcD_Cyl { /* 800848B4 */ void Set(dCcD_SrcCyl const&); }; -struct J3DAnmTransformKey {}; - struct daNpcF_c { struct daNpcF_anmPlayData {}; @@ -522,6 +522,15 @@ extern "C" void __register_global_object(); // /* ############################################################################################## */ +/* 80AF2864-80AF2864 00017C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80AF2864 = "TALK_LAKE"; +SECTION_DEAD static char const* const stringBase_80AF286E = "chtSolA"; +SECTION_DEAD static char const* const stringBase_80AF2876 = ""; +SECTION_DEAD static char const* const stringBase_80AF2877 = "LISTEN_LAKE"; +#pragma pop + /* 80AF2888-80AF2894 000000 000C+00 3/3 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -843,34 +852,34 @@ SECTION_RODATA u8 const daNpc_SoldierA_Param_c::m[108] = { 0x43, 0x34, 0x00, 0x00, 0x43, 0xFA, 0x00, 0x00, 0x43, 0x96, 0x00, 0x00, 0xC3, 0x96, 0x00, 0x00, 0x00, 0x3C, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AF26E8, &daNpc_SoldierA_Param_c::m); +COMPILER_STRIP_GATE(0x80AF26E8, &daNpc_SoldierA_Param_c::m); /* 80AF2754-80AF2758 00006C 0004+00 0/1 0/0 0/0 .rodata @4394 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4394 = -300.0f; -COMPILER_STRIP_GATE(80AF2754, &lit_4394); +COMPILER_STRIP_GATE(0x80AF2754, &lit_4394); #pragma pop /* 80AF2758-80AF275C 000070 0004+00 0/1 0/0 0/0 .rodata @4395 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4395 = -50.0f; -COMPILER_STRIP_GATE(80AF2758, &lit_4395); +COMPILER_STRIP_GATE(0x80AF2758, &lit_4395); #pragma pop /* 80AF275C-80AF2760 000074 0004+00 0/1 0/0 0/0 .rodata @4396 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4396 = 300.0f; -COMPILER_STRIP_GATE(80AF275C, &lit_4396); +COMPILER_STRIP_GATE(0x80AF275C, &lit_4396); #pragma pop /* 80AF2760-80AF2764 000078 0004+00 0/1 0/0 0/0 .rodata @4397 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4397 = 450.0f; -COMPILER_STRIP_GATE(80AF2760, &lit_4397); +COMPILER_STRIP_GATE(0x80AF2760, &lit_4397); #pragma pop /* 80AEF9A0-80AEFC80 000500 02E0+00 1/1 0/0 0/0 .text create__16daNpc_SoldierA_cFv */ @@ -886,7 +895,7 @@ asm void daNpc_SoldierA_c::create() { /* ############################################################################################## */ /* 80AF2764-80AF2768 00007C 0004+00 2/2 0/0 0/0 .rodata @4448 */ SECTION_RODATA static f32 const lit_4448 = 1.0f; -COMPILER_STRIP_GATE(80AF2764, &lit_4448); +COMPILER_STRIP_GATE(0x80AF2764, &lit_4448); /* 80AF2768-80AF276C 000080 0004+00 4/6 0/0 0/0 .rodata @4449 */ SECTION_RODATA static u8 const lit_4449[4] = { @@ -895,7 +904,7 @@ SECTION_RODATA static u8 const lit_4449[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AF2768, &lit_4449); +COMPILER_STRIP_GATE(0x80AF2768, &lit_4449); /* 80AEFC80-80AEFE4C 0007E0 01CC+00 1/1 0/0 0/0 .text CreateHeap__16daNpc_SoldierA_cFv */ #pragma push @@ -942,7 +951,7 @@ asm void daNpc_SoldierA_c::Draw() { SECTION_RODATA static u8 const lit_4472[12] = { 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x04, }; -COMPILER_STRIP_GATE(80AF276C, &lit_4472); +COMPILER_STRIP_GATE(0x80AF276C, &lit_4472); /* 80AEFF14-80AF0110 000A74 01FC+00 1/1 0/0 0/0 .text * ctrlJoint__16daNpc_SoldierA_cFP8J3DJointP8J3DModel */ @@ -1007,14 +1016,14 @@ bool daNpc_SoldierA_c::ctrlBtk() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4789 = 20.0f; -COMPILER_STRIP_GATE(80AF2778, &lit_4789); +COMPILER_STRIP_GATE(0x80AF2778, &lit_4789); #pragma pop /* 80AF277C-80AF2780 000094 0004+00 0/1 0/0 0/0 .rodata @4790 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4790 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(80AF277C, &lit_4790); +COMPILER_STRIP_GATE(0x80AF277C, &lit_4790); #pragma pop /* 80AF2780-80AF2788 000098 0004+04 0/1 0/0 0/0 .rodata @4791 */ @@ -1025,7 +1034,7 @@ SECTION_RODATA static f32 const lit_4791[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80AF2780, &lit_4791); +COMPILER_STRIP_GATE(0x80AF2780, &lit_4791); #pragma pop /* 80AF2788-80AF2790 0000A0 0008+00 0/1 0/0 0/0 .rodata @4792 */ @@ -1034,7 +1043,7 @@ COMPILER_STRIP_GATE(80AF2780, &lit_4791); SECTION_RODATA static u8 const lit_4792[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AF2788, &lit_4792); +COMPILER_STRIP_GATE(0x80AF2788, &lit_4792); #pragma pop /* 80AF2790-80AF2798 0000A8 0008+00 0/1 0/0 0/0 .rodata @4793 */ @@ -1043,7 +1052,7 @@ COMPILER_STRIP_GATE(80AF2788, &lit_4792); SECTION_RODATA static u8 const lit_4793[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AF2790, &lit_4793); +COMPILER_STRIP_GATE(0x80AF2790, &lit_4793); #pragma pop /* 80AF2798-80AF27A0 0000B0 0008+00 0/1 0/0 0/0 .rodata @4794 */ @@ -1052,7 +1061,7 @@ COMPILER_STRIP_GATE(80AF2790, &lit_4793); SECTION_RODATA static u8 const lit_4794[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AF2798, &lit_4794); +COMPILER_STRIP_GATE(0x80AF2798, &lit_4794); #pragma pop /* 80AF2AF0-80AF2AF4 000008 0001+03 1/1 0/0 0/0 .bss @1109 */ @@ -1252,7 +1261,7 @@ asm void daNpc_SoldierA_c::reset() { SECTION_RODATA static u8 const lit_4914[12] = { 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AF27A0, &lit_4914); +COMPILER_STRIP_GATE(0x80AF27A0, &lit_4914); #pragma pop /* 80AF27AC-80AF27B0 0000C4 0004+00 0/1 0/0 0/0 .rodata @4915 */ @@ -1264,7 +1273,7 @@ SECTION_RODATA static u8 const lit_4915[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AF27AC, &lit_4915); +COMPILER_STRIP_GATE(0x80AF27AC, &lit_4915); #pragma pop /* 80AF27B0-80AF27BC 0000C8 000C+00 0/1 0/0 0/0 .rodata @4916 */ @@ -1273,7 +1282,7 @@ COMPILER_STRIP_GATE(80AF27AC, &lit_4915); SECTION_RODATA static u8 const lit_4916[12] = { 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80AF27B0, &lit_4916); +COMPILER_STRIP_GATE(0x80AF27B0, &lit_4916); #pragma pop /* 80AF27BC-80AF27C8 0000D4 000C+00 0/1 0/0 0/0 .rodata @4917 */ @@ -1282,7 +1291,7 @@ COMPILER_STRIP_GATE(80AF27B0, &lit_4916); SECTION_RODATA static u8 const lit_4917[12] = { 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AF27BC, &lit_4917); +COMPILER_STRIP_GATE(0x80AF27BC, &lit_4917); #pragma pop /* 80AF27C8-80AF27D0 0000E0 0008+00 0/1 0/0 0/0 .rodata @4918 */ @@ -1291,7 +1300,7 @@ COMPILER_STRIP_GATE(80AF27BC, &lit_4917); SECTION_RODATA static u8 const lit_4918[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AF27C8, &lit_4918); +COMPILER_STRIP_GATE(0x80AF27C8, &lit_4918); #pragma pop /* 80AF27D0-80AF27DC 0000E8 000C+00 0/1 0/0 0/0 .rodata @4919 */ @@ -1300,7 +1309,7 @@ COMPILER_STRIP_GATE(80AF27C8, &lit_4918); SECTION_RODATA static u8 const lit_4919[12] = { 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80AF27D0, &lit_4919); +COMPILER_STRIP_GATE(0x80AF27D0, &lit_4919); #pragma pop /* 80AF27DC-80AF27E8 0000F4 000C+00 0/1 0/0 0/0 .rodata @4920 */ @@ -1309,7 +1318,7 @@ COMPILER_STRIP_GATE(80AF27D0, &lit_4919); SECTION_RODATA static u8 const lit_4920[12] = { 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AF27DC, &lit_4920); +COMPILER_STRIP_GATE(0x80AF27DC, &lit_4920); #pragma pop /* 80AF27E8-80AF27F0 000100 0008+00 0/1 0/0 0/0 .rodata @4921 */ @@ -1318,7 +1327,7 @@ COMPILER_STRIP_GATE(80AF27DC, &lit_4920); SECTION_RODATA static u8 const lit_4921[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AF27E8, &lit_4921); +COMPILER_STRIP_GATE(0x80AF27E8, &lit_4921); #pragma pop /* 80AF27F0-80AF27FC 000108 000C+00 0/1 0/0 0/0 .rodata @4922 */ @@ -1327,7 +1336,7 @@ COMPILER_STRIP_GATE(80AF27E8, &lit_4921); SECTION_RODATA static u8 const lit_4922[12] = { 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AF27F0, &lit_4922); +COMPILER_STRIP_GATE(0x80AF27F0, &lit_4922); #pragma pop /* 80AF27FC-80AF2800 000114 0004+00 0/1 0/0 0/0 .rodata @4923 */ @@ -1339,7 +1348,7 @@ SECTION_RODATA static u8 const lit_4923[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AF27FC, &lit_4923); +COMPILER_STRIP_GATE(0x80AF27FC, &lit_4923); #pragma pop /* 80AF2800-80AF280C 000118 000C+00 0/1 0/0 0/0 .rodata @4924 */ @@ -1348,7 +1357,7 @@ COMPILER_STRIP_GATE(80AF27FC, &lit_4923); SECTION_RODATA static u8 const lit_4924[12] = { 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80AF2800, &lit_4924); +COMPILER_STRIP_GATE(0x80AF2800, &lit_4924); #pragma pop /* 80AF280C-80AF2818 000124 000C+00 0/1 0/0 0/0 .rodata @4925 */ @@ -1357,7 +1366,7 @@ COMPILER_STRIP_GATE(80AF2800, &lit_4924); SECTION_RODATA static u8 const lit_4925[12] = { 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AF280C, &lit_4925); +COMPILER_STRIP_GATE(0x80AF280C, &lit_4925); #pragma pop /* 80AF2818-80AF2820 000130 0008+00 0/1 0/0 0/0 .rodata @4926 */ @@ -1366,7 +1375,7 @@ COMPILER_STRIP_GATE(80AF280C, &lit_4925); SECTION_RODATA static u8 const lit_4926[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AF2818, &lit_4926); +COMPILER_STRIP_GATE(0x80AF2818, &lit_4926); #pragma pop /* 80AF2820-80AF282C 000138 000C+00 0/1 0/0 0/0 .rodata @4927 */ @@ -1375,7 +1384,7 @@ COMPILER_STRIP_GATE(80AF2818, &lit_4926); SECTION_RODATA static u8 const lit_4927[12] = { 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AF2820, &lit_4927); +COMPILER_STRIP_GATE(0x80AF2820, &lit_4927); #pragma pop /* 80AF282C-80AF2830 000144 0004+00 0/1 0/0 0/0 .rodata @4928 */ @@ -1387,7 +1396,7 @@ SECTION_RODATA static u8 const lit_4928[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AF282C, &lit_4928); +COMPILER_STRIP_GATE(0x80AF282C, &lit_4928); #pragma pop /* 80AF0D34-80AF0F50 001894 021C+00 1/1 0/0 0/0 .text playMotion__16daNpc_SoldierA_cFv */ @@ -1405,7 +1414,7 @@ asm void daNpc_SoldierA_c::playMotion() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpc_SoldierA_c::chkAction(int (daNpc_SoldierA_c::*)(void*)) { +asm void daNpc_SoldierA_c::chkAction(int (daNpc_SoldierA_c::*param_0)(void*)) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_soldierA/d_a_npc_soldierA/chkAction__16daNpc_SoldierA_cFM16daNpc_SoldierA_cFPCvPvPv_i.s" } @@ -1416,7 +1425,7 @@ asm void daNpc_SoldierA_c::chkAction(int (daNpc_SoldierA_c::*)(void*)) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpc_SoldierA_c::setAction(int (daNpc_SoldierA_c::*)(void*)) { +asm void daNpc_SoldierA_c::setAction(int (daNpc_SoldierA_c::*param_0)(void*)) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_soldierA/d_a_npc_soldierA/setAction__16daNpc_SoldierA_cFM16daNpc_SoldierA_cFPCvPvPv_i.s" } @@ -1451,12 +1460,12 @@ SECTION_RODATA static u8 const lit_4929[24] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AF2830, &lit_4929); +COMPILER_STRIP_GATE(0x80AF2830, &lit_4929); #pragma pop /* 80AF2848-80AF284C 000160 0004+00 4/4 0/0 0/0 .rodata @5059 */ SECTION_RODATA static f32 const lit_5059 = -1.0f; -COMPILER_STRIP_GATE(80AF2848, &lit_5059); +COMPILER_STRIP_GATE(0x80AF2848, &lit_5059); /* 80AF11B8-80AF1488 001D18 02D0+00 1/1 0/0 0/0 .text doEvent__16daNpc_SoldierA_cFv */ #pragma push @@ -1486,28 +1495,28 @@ asm void daNpc_SoldierA_c::setLookMode(int param_0) { SECTION_RODATA static u8 const lit_5071[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AF284C, &lit_5071); +COMPILER_STRIP_GATE(0x80AF284C, &lit_5071); #pragma pop /* 80AF2858-80AF285C 000170 0004+00 0/1 0/0 0/0 .rodata @5124 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5124 = -80.0f; -COMPILER_STRIP_GATE(80AF2858, &lit_5124); +COMPILER_STRIP_GATE(0x80AF2858, &lit_5124); #pragma pop /* 80AF285C-80AF2860 000174 0004+00 0/1 0/0 0/0 .rodata @5125 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5125 = 80.0f; -COMPILER_STRIP_GATE(80AF285C, &lit_5125); +COMPILER_STRIP_GATE(0x80AF285C, &lit_5125); #pragma pop /* 80AF2860-80AF2864 000178 0004+00 0/1 0/0 0/0 .rodata @5126 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5126 = 40.0f; -COMPILER_STRIP_GATE(80AF2860, &lit_5126); +COMPILER_STRIP_GATE(0x80AF2860, &lit_5126); #pragma pop /* 80AF14AC-80AF1734 00200C 0288+00 1/1 0/0 0/0 .text lookat__16daNpc_SoldierA_cFv */ @@ -1540,6 +1549,13 @@ asm void daNpc_SoldierA_c::talk(void* param_0) { } #pragma pop +/* ############################################################################################## */ +/* 80AF2864-80AF2864 00017C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80AF2883 = "prm"; +#pragma pop + /* 80AF1A48-80AF1B8C 0025A8 0144+00 1/0 0/0 0/0 .text ECut_talkLake__16daNpc_SoldierA_cFi */ #pragma push @@ -1791,7 +1807,7 @@ asm void __sinit_d_a_npc_soldierA_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80AF25D8 = (void*)__sinit_d_a_npc_soldierA_cpp; +REGISTER_CTORS(0x80AF25D8, __sinit_d_a_npc_soldierA_cpp); #pragma pop /* 80AF267C-80AF26C4 0031DC 0048+00 2/1 0/0 0/0 .text __dt__22daNpc_SoldierA_Param_cFv */ @@ -1996,13 +2012,4 @@ static u8 data_80AF2BB8[4]; static u8 data_80AF2BBC[4]; #pragma pop -/* 80AF2864-80AF2887 00017C 0023+00 6/2 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80AF2864 = "TALK_LAKE"; -SECTION_DEAD static char const* const stringBase_80AF286E = "chtSolA"; -SECTION_DEAD static char const* const stringBase_80AF2876 = ""; -SECTION_DEAD static char const* const stringBase_80AF2877 = "LISTEN_LAKE"; -SECTION_DEAD static char const* const stringBase_80AF2883 = "prm"; -#pragma pop +/* 80AF2864-80AF2864 00017C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/npc/d_a_npc_soldierB/d_a_npc_soldierB.cpp b/rel/d/a/npc/d_a_npc_soldierB/d_a_npc_soldierB.cpp index 42ab793a019..3f2e3ce5cb1 100644 --- a/rel/d/a/npc/d_a_npc_soldierB/d_a_npc_soldierB.cpp +++ b/rel/d/a/npc/d_a_npc_soldierB/d_a_npc_soldierB.cpp @@ -28,20 +28,20 @@ struct mDoMtx_stack_c { static u8 now[48]; }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; +struct J3DAnmTransform {}; + +struct J3DModelData {}; + struct Z2Creature { /* 802C03C8 */ Z2Creature(); /* 802C0420 */ ~Z2Creature(); /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -54,10 +54,10 @@ struct fopAc_ac_c { /* 80018C8C */ ~fopAc_ac_c(); }; -struct J3DJoint {}; - struct J3DModel {}; +struct J3DJoint {}; + struct daNpc_SoldierB_c { /* 80AF2CAC */ daNpc_SoldierB_c(); /* 80AF2EC0 */ ~daNpc_SoldierB_c(); @@ -103,21 +103,21 @@ struct daNpc_SoldierB_Param_c { static u8 const m[108]; }; -struct _GXColorS10 {}; - struct dCcD_GObjInf { /* 80083A28 */ dCcD_GObjInf(); /* 800840E4 */ ~dCcD_GObjInf(); }; +struct _GXColorS10 {}; + +struct J3DAnmTransformKey {}; + struct dCcD_SrcCyl {}; struct dCcD_Cyl { /* 800848B4 */ void Set(dCcD_SrcCyl const&); }; -struct J3DAnmTransformKey {}; - struct daNpcF_c { struct daNpcF_anmPlayData {}; @@ -516,6 +516,14 @@ extern "C" void __register_global_object(); // /* ############################################################################################## */ +/* 80AF5BF4-80AF5BF4 000120 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80AF5BF4 = "chtSolB"; +SECTION_DEAD static char const* const stringBase_80AF5BFC = ""; +SECTION_DEAD static char const* const stringBase_80AF5BFD = "LISTEN_LAKE"; +#pragma pop + /* 80AF5C10-80AF5C1C 000000 000C+00 2/2 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -817,34 +825,34 @@ SECTION_RODATA u8 const daNpc_SoldierB_Param_c::m[108] = { 0x43, 0x34, 0x00, 0x00, 0x43, 0xFA, 0x00, 0x00, 0x43, 0x96, 0x00, 0x00, 0xC3, 0x96, 0x00, 0x00, 0x00, 0x3C, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AF5AD4, &daNpc_SoldierB_Param_c::m); +COMPILER_STRIP_GATE(0x80AF5AD4, &daNpc_SoldierB_Param_c::m); /* 80AF5B40-80AF5B44 00006C 0004+00 0/1 0/0 0/0 .rodata @4399 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4399 = -300.0f; -COMPILER_STRIP_GATE(80AF5B40, &lit_4399); +COMPILER_STRIP_GATE(0x80AF5B40, &lit_4399); #pragma pop /* 80AF5B44-80AF5B48 000070 0004+00 0/1 0/0 0/0 .rodata @4400 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4400 = -50.0f; -COMPILER_STRIP_GATE(80AF5B44, &lit_4400); +COMPILER_STRIP_GATE(0x80AF5B44, &lit_4400); #pragma pop /* 80AF5B48-80AF5B4C 000074 0004+00 0/1 0/0 0/0 .rodata @4401 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4401 = 300.0f; -COMPILER_STRIP_GATE(80AF5B48, &lit_4401); +COMPILER_STRIP_GATE(0x80AF5B48, &lit_4401); #pragma pop /* 80AF5B4C-80AF5B50 000078 0004+00 0/1 0/0 0/0 .rodata @4402 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4402 = 450.0f; -COMPILER_STRIP_GATE(80AF5B4C, &lit_4402); +COMPILER_STRIP_GATE(0x80AF5B4C, &lit_4402); #pragma pop /* 80AF30C0-80AF33A0 000500 02E0+00 1/1 0/0 0/0 .text create__16daNpc_SoldierB_cFv */ @@ -860,7 +868,7 @@ asm void daNpc_SoldierB_c::create() { /* ############################################################################################## */ /* 80AF5B50-80AF5B54 00007C 0004+00 2/2 0/0 0/0 .rodata @4453 */ SECTION_RODATA static f32 const lit_4453 = 1.0f; -COMPILER_STRIP_GATE(80AF5B50, &lit_4453); +COMPILER_STRIP_GATE(0x80AF5B50, &lit_4453); /* 80AF5B54-80AF5B58 000080 0004+00 4/6 0/0 0/0 .rodata @4454 */ SECTION_RODATA static u8 const lit_4454[4] = { @@ -869,7 +877,7 @@ SECTION_RODATA static u8 const lit_4454[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AF5B54, &lit_4454); +COMPILER_STRIP_GATE(0x80AF5B54, &lit_4454); /* 80AF33A0-80AF356C 0007E0 01CC+00 1/1 0/0 0/0 .text CreateHeap__16daNpc_SoldierB_cFv */ #pragma push @@ -916,7 +924,7 @@ asm void daNpc_SoldierB_c::Draw() { SECTION_RODATA static u8 const lit_4477[12] = { 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x04, }; -COMPILER_STRIP_GATE(80AF5B58, &lit_4477); +COMPILER_STRIP_GATE(0x80AF5B58, &lit_4477); /* 80AF3634-80AF3830 000A74 01FC+00 1/1 0/0 0/0 .text * ctrlJoint__16daNpc_SoldierB_cFP8J3DJointP8J3DModel */ @@ -981,14 +989,14 @@ bool daNpc_SoldierB_c::ctrlBtk() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4790 = 20.0f; -COMPILER_STRIP_GATE(80AF5B64, &lit_4790); +COMPILER_STRIP_GATE(0x80AF5B64, &lit_4790); #pragma pop /* 80AF5B68-80AF5B6C 000094 0004+00 0/1 0/0 0/0 .rodata @4791 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4791 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(80AF5B68, &lit_4791); +COMPILER_STRIP_GATE(0x80AF5B68, &lit_4791); #pragma pop /* 80AF5B6C-80AF5B74 000098 0004+04 0/1 0/0 0/0 .rodata @4792 */ @@ -999,7 +1007,7 @@ SECTION_RODATA static f32 const lit_4792[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80AF5B6C, &lit_4792); +COMPILER_STRIP_GATE(0x80AF5B6C, &lit_4792); #pragma pop /* 80AF5B74-80AF5B7C 0000A0 0008+00 0/1 0/0 0/0 .rodata @4793 */ @@ -1008,7 +1016,7 @@ COMPILER_STRIP_GATE(80AF5B6C, &lit_4792); SECTION_RODATA static u8 const lit_4793[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AF5B74, &lit_4793); +COMPILER_STRIP_GATE(0x80AF5B74, &lit_4793); #pragma pop /* 80AF5B7C-80AF5B84 0000A8 0008+00 0/1 0/0 0/0 .rodata @4794 */ @@ -1017,7 +1025,7 @@ COMPILER_STRIP_GATE(80AF5B74, &lit_4793); SECTION_RODATA static u8 const lit_4794[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AF5B7C, &lit_4794); +COMPILER_STRIP_GATE(0x80AF5B7C, &lit_4794); #pragma pop /* 80AF5B84-80AF5B8C 0000B0 0008+00 0/1 0/0 0/0 .rodata @4795 */ @@ -1026,7 +1034,7 @@ COMPILER_STRIP_GATE(80AF5B7C, &lit_4794); SECTION_RODATA static u8 const lit_4795[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AF5B84, &lit_4795); +COMPILER_STRIP_GATE(0x80AF5B84, &lit_4795); #pragma pop /* 80AF5E30-80AF5E34 000008 0001+03 1/1 0/0 0/0 .bss @1109 */ @@ -1226,7 +1234,7 @@ asm void daNpc_SoldierB_c::reset() { SECTION_RODATA static u8 const lit_4906[12] = { 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AF5B8C, &lit_4906); +COMPILER_STRIP_GATE(0x80AF5B8C, &lit_4906); #pragma pop /* 80AF5B98-80AF5B9C 0000C4 0004+00 0/1 0/0 0/0 .rodata @4907 */ @@ -1238,7 +1246,7 @@ SECTION_RODATA static u8 const lit_4907[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AF5B98, &lit_4907); +COMPILER_STRIP_GATE(0x80AF5B98, &lit_4907); #pragma pop /* 80AF5B9C-80AF5BA8 0000C8 000C+00 0/1 0/0 0/0 .rodata @4908 */ @@ -1247,7 +1255,7 @@ COMPILER_STRIP_GATE(80AF5B98, &lit_4907); SECTION_RODATA static u8 const lit_4908[12] = { 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80AF5B9C, &lit_4908); +COMPILER_STRIP_GATE(0x80AF5B9C, &lit_4908); #pragma pop /* 80AF5BA8-80AF5BB4 0000D4 000C+00 0/1 0/0 0/0 .rodata @4909 */ @@ -1256,7 +1264,7 @@ COMPILER_STRIP_GATE(80AF5B9C, &lit_4908); SECTION_RODATA static u8 const lit_4909[12] = { 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AF5BA8, &lit_4909); +COMPILER_STRIP_GATE(0x80AF5BA8, &lit_4909); #pragma pop /* 80AF5BB4-80AF5BBC 0000E0 0008+00 0/1 0/0 0/0 .rodata @4910 */ @@ -1265,7 +1273,7 @@ COMPILER_STRIP_GATE(80AF5BA8, &lit_4909); SECTION_RODATA static u8 const lit_4910[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AF5BB4, &lit_4910); +COMPILER_STRIP_GATE(0x80AF5BB4, &lit_4910); #pragma pop /* 80AF5BBC-80AF5BC8 0000E8 000C+00 0/1 0/0 0/0 .rodata @4911 */ @@ -1274,7 +1282,7 @@ COMPILER_STRIP_GATE(80AF5BB4, &lit_4910); SECTION_RODATA static u8 const lit_4911[12] = { 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AF5BBC, &lit_4911); +COMPILER_STRIP_GATE(0x80AF5BBC, &lit_4911); #pragma pop /* 80AF5BC8-80AF5BCC 0000F4 0004+00 0/1 0/0 0/0 .rodata @4912 */ @@ -1286,7 +1294,7 @@ SECTION_RODATA static u8 const lit_4912[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AF5BC8, &lit_4912); +COMPILER_STRIP_GATE(0x80AF5BC8, &lit_4912); #pragma pop /* 80AF5BCC-80AF5BD8 0000F8 000C+00 0/1 0/0 0/0 .rodata @4913 */ @@ -1295,7 +1303,7 @@ COMPILER_STRIP_GATE(80AF5BC8, &lit_4912); SECTION_RODATA static u8 const lit_4913[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AF5BCC, &lit_4913); +COMPILER_STRIP_GATE(0x80AF5BCC, &lit_4913); #pragma pop /* 80AF43E4-80AF4508 001824 0124+00 1/1 0/0 0/0 .text playMotion__16daNpc_SoldierB_cFv */ @@ -1313,7 +1321,7 @@ asm void daNpc_SoldierB_c::playMotion() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpc_SoldierB_c::chkAction(int (daNpc_SoldierB_c::*)(void*)) { +asm void daNpc_SoldierB_c::chkAction(int (daNpc_SoldierB_c::*param_0)(void*)) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_soldierB/d_a_npc_soldierB/chkAction__16daNpc_SoldierB_cFM16daNpc_SoldierB_cFPCvPvPv_i.s" } @@ -1324,7 +1332,7 @@ asm void daNpc_SoldierB_c::chkAction(int (daNpc_SoldierB_c::*)(void*)) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpc_SoldierB_c::setAction(int (daNpc_SoldierB_c::*)(void*)) { +asm void daNpc_SoldierB_c::setAction(int (daNpc_SoldierB_c::*param_0)(void*)) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_soldierB/d_a_npc_soldierB/setAction__16daNpc_SoldierB_cFM16daNpc_SoldierB_cFPCvPvPv_i.s" } @@ -1354,7 +1362,7 @@ asm void daNpc_SoldierB_c::doNormalAction(int param_0) { /* ############################################################################################## */ /* 80AF5BD8-80AF5BDC 000104 0004+00 4/4 0/0 0/0 .rodata @5036 */ SECTION_RODATA static f32 const lit_5036 = -1.0f; -COMPILER_STRIP_GATE(80AF5BD8, &lit_5036); +COMPILER_STRIP_GATE(0x80AF5BD8, &lit_5036); /* 80AF4770-80AF49E4 001BB0 0274+00 1/1 0/0 0/0 .text doEvent__16daNpc_SoldierB_cFv */ #pragma push @@ -1384,28 +1392,28 @@ asm void daNpc_SoldierB_c::setLookMode(int param_0) { SECTION_RODATA static u8 const lit_5048[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AF5BDC, &lit_5048); +COMPILER_STRIP_GATE(0x80AF5BDC, &lit_5048); #pragma pop /* 80AF5BE8-80AF5BEC 000114 0004+00 0/1 0/0 0/0 .rodata @5102 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5102 = -80.0f; -COMPILER_STRIP_GATE(80AF5BE8, &lit_5102); +COMPILER_STRIP_GATE(0x80AF5BE8, &lit_5102); #pragma pop /* 80AF5BEC-80AF5BF0 000118 0004+00 0/1 0/0 0/0 .rodata @5103 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5103 = 80.0f; -COMPILER_STRIP_GATE(80AF5BEC, &lit_5103); +COMPILER_STRIP_GATE(0x80AF5BEC, &lit_5103); #pragma pop /* 80AF5BF0-80AF5BF4 00011C 0004+00 0/1 0/0 0/0 .rodata @5104 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5104 = 40.0f; -COMPILER_STRIP_GATE(80AF5BF0, &lit_5104); +COMPILER_STRIP_GATE(0x80AF5BF0, &lit_5104); #pragma pop /* 80AF4A08-80AF4CA4 001E48 029C+00 1/1 0/0 0/0 .text lookat__16daNpc_SoldierB_cFv */ @@ -1448,6 +1456,13 @@ asm void daNpc_SoldierB_c::talk(void* param_0) { } #pragma pop +/* ############################################################################################## */ +/* 80AF5BF4-80AF5BF4 000120 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80AF5C09 = "prm"; +#pragma pop + /* 80AF4F54-80AF50AC 002394 0158+00 1/0 0/0 0/0 .text ECut_listenLake__16daNpc_SoldierB_cFi */ #pragma push #pragma optimization_level 0 @@ -1688,7 +1703,7 @@ asm void __sinit_d_a_npc_soldierB_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80AF59E0 = (void*)__sinit_d_a_npc_soldierB_cpp; +REGISTER_CTORS(0x80AF59E0, __sinit_d_a_npc_soldierB_cpp); #pragma pop /* 80AF5A68-80AF5AB0 002EA8 0048+00 2/1 0/0 0/0 .text __dt__22daNpc_SoldierB_Param_cFv */ @@ -1893,12 +1908,4 @@ static u8 data_80AF5EF8[4]; static u8 data_80AF5EFC[4]; #pragma pop -/* 80AF5BF4-80AF5C0D 000120 0019+00 4/1 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80AF5BF4 = "chtSolB"; -SECTION_DEAD static char const* const stringBase_80AF5BFC = ""; -SECTION_DEAD static char const* const stringBase_80AF5BFD = "LISTEN_LAKE"; -SECTION_DEAD static char const* const stringBase_80AF5C09 = "prm"; -#pragma pop +/* 80AF5BF4-80AF5BF4 000120 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/npc/d_a_npc_sq/d_a_npc_sq.cpp b/rel/d/a/npc/d_a_npc_sq/d_a_npc_sq.cpp index 8cec009f35b..4773c67986c 100644 --- a/rel/d/a/npc/d_a_npc_sq/d_a_npc_sq.cpp +++ b/rel/d/a/npc/d_a_npc_sq/d_a_npc_sq.cpp @@ -36,10 +36,10 @@ struct mDoExt_McaMorfCallBack1_c {}; struct Vec {}; -struct J3DModelData {}; - struct J3DAnmTransform {}; +struct J3DModelData {}; + struct mDoExt_McaMorf { /* 8000FC4C */ mDoExt_McaMorf(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, int, @@ -135,10 +135,10 @@ struct dBgS_AcchCir { /* 80075F58 */ void SetWall(f32, f32); }; -struct dBgS {}; - struct csXyz {}; +struct dBgS {}; + struct dBgS_Acch { /* 80075F94 */ ~dBgS_Acch(); /* 800760A0 */ dBgS_Acch(); @@ -294,7 +294,7 @@ extern "C" void __register_global_object(); /* ############################################################################################## */ /* 80AF7408-80AF740C 000000 0004+00 7/7 0/0 0/0 .rodata @3768 */ SECTION_RODATA static f32 const lit_3768 = 2.0f; -COMPILER_STRIP_GATE(80AF7408, &lit_3768); +COMPILER_STRIP_GATE(0x80AF7408, &lit_3768); /* 80AF74A8-80AF74D0 -00001 0028+00 1/1 0/0 0/0 .data @4052 */ SECTION_DATA static void* lit_4052[10] = { @@ -399,11 +399,17 @@ SECTION_RODATA static u8 const lit_3782[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AF740C, &lit_3782); +COMPILER_STRIP_GATE(0x80AF740C, &lit_3782); /* 80AF7410-80AF7414 000008 0004+00 1/1 0/0 0/0 .rodata @3783 */ SECTION_RODATA static f32 const lit_3783 = -1.0f; -COMPILER_STRIP_GATE(80AF7410, &lit_3783); +COMPILER_STRIP_GATE(0x80AF7410, &lit_3783); + +/* 80AF74A4-80AF74A4 00009C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80AF74A4 = "Sq"; +#pragma pop /* 80AF6010-80AF60B8 000110 00A8+00 2/2 0/0 0/0 .text anm_init__FP12npc_sq_classifUcf */ #pragma push @@ -420,26 +426,26 @@ static asm void anm_init(npc_sq_class* param_0, int param_1, f32 param_2, u8 par #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3810 = 100.0f; -COMPILER_STRIP_GATE(80AF7414, &lit_3810); +COMPILER_STRIP_GATE(0x80AF7414, &lit_3810); #pragma pop /* 80AF7418-80AF741C 000010 0004+00 0/1 0/0 0/0 .rodata @3811 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3811 = 600.0f; -COMPILER_STRIP_GATE(80AF7418, &lit_3811); +COMPILER_STRIP_GATE(0x80AF7418, &lit_3811); #pragma pop /* 80AF741C-80AF7420 000014 0004+00 0/2 0/0 0/0 .rodata @3812 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3812 = 10.0f; -COMPILER_STRIP_GATE(80AF741C, &lit_3812); +COMPILER_STRIP_GATE(0x80AF741C, &lit_3812); #pragma pop /* 80AF7420-80AF7424 000018 0004+00 1/3 0/0 0/0 .rodata @3813 */ SECTION_RODATA static f32 const lit_3813 = 1.0f; -COMPILER_STRIP_GATE(80AF7420, &lit_3813); +COMPILER_STRIP_GATE(0x80AF7420, &lit_3813); /* 80AF75C0-80AF75C4 000008 0004+00 2/2 0/0 0/0 .bss None */ static u8 data_80AF75C0[4]; @@ -465,35 +471,35 @@ static asm void daNpc_Sq_Draw(npc_sq_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3861 = 3.0f; -COMPILER_STRIP_GATE(80AF7424, &lit_3861); +COMPILER_STRIP_GATE(0x80AF7424, &lit_3861); #pragma pop /* 80AF7428-80AF742C 000020 0004+00 0/1 0/0 0/0 .rodata @3862 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3862 = 15.0f; -COMPILER_STRIP_GATE(80AF7428, &lit_3862); +COMPILER_STRIP_GATE(0x80AF7428, &lit_3862); #pragma pop /* 80AF742C-80AF7430 000024 0004+00 0/1 0/0 0/0 .rodata @3863 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3863 = 210.0f; -COMPILER_STRIP_GATE(80AF742C, &lit_3863); +COMPILER_STRIP_GATE(0x80AF742C, &lit_3863); #pragma pop /* 80AF7430-80AF7434 000028 0004+00 0/1 0/0 0/0 .rodata @3864 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3864 = 800.0f; -COMPILER_STRIP_GATE(80AF7430, &lit_3864); +COMPILER_STRIP_GATE(0x80AF7430, &lit_3864); #pragma pop /* 80AF7434-80AF7438 00002C 0004+00 0/1 0/0 0/0 .rodata @3865 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3865 = -375.0f; -COMPILER_STRIP_GATE(80AF7434, &lit_3865); +COMPILER_STRIP_GATE(0x80AF7434, &lit_3865); #pragma pop /* 80AF7438-80AF7440 000030 0008+00 0/1 0/0 0/0 .rodata @3866 */ @@ -502,7 +508,7 @@ COMPILER_STRIP_GATE(80AF7434, &lit_3865); SECTION_RODATA static u8 const lit_3866[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AF7438, &lit_3866); +COMPILER_STRIP_GATE(0x80AF7438, &lit_3866); #pragma pop /* 80AF7440-80AF7448 000038 0008+00 0/1 0/0 0/0 .rodata @3867 */ @@ -511,7 +517,7 @@ COMPILER_STRIP_GATE(80AF7438, &lit_3866); SECTION_RODATA static u8 const lit_3867[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AF7440, &lit_3867); +COMPILER_STRIP_GATE(0x80AF7440, &lit_3867); #pragma pop /* 80AF7448-80AF7450 000040 0008+00 0/1 0/0 0/0 .rodata @3868 */ @@ -520,14 +526,14 @@ COMPILER_STRIP_GATE(80AF7440, &lit_3867); SECTION_RODATA static u8 const lit_3868[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AF7448, &lit_3868); +COMPILER_STRIP_GATE(0x80AF7448, &lit_3868); #pragma pop /* 80AF7450-80AF7454 000048 0004+00 0/1 0/0 0/0 .rodata @3869 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3869 = 250.0f; -COMPILER_STRIP_GATE(80AF7450, &lit_3869); +COMPILER_STRIP_GATE(0x80AF7450, &lit_3869); #pragma pop /* 80AF61B0-80AF63C0 0002B0 0210+00 1/1 0/0 0/0 .text npc_sq_normal__FP12npc_sq_class */ @@ -545,14 +551,14 @@ static asm void npc_sq_normal(npc_sq_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3893 = -5.0f; -COMPILER_STRIP_GATE(80AF7454, &lit_3893); +COMPILER_STRIP_GATE(0x80AF7454, &lit_3893); #pragma pop /* 80AF7458-80AF745C 000050 0004+00 0/1 0/0 0/0 .rodata @3894 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3894 = -80.0f; -COMPILER_STRIP_GATE(80AF7458, &lit_3894); +COMPILER_STRIP_GATE(0x80AF7458, &lit_3894); #pragma pop /* 80AF63C0-80AF6518 0004C0 0158+00 1/1 0/0 0/0 .text action__FP12npc_sq_class */ @@ -580,28 +586,28 @@ static asm void cam_3d_morf(npc_sq_class* param_0, f32 param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4040 = 55.0f; -COMPILER_STRIP_GATE(80AF745C, &lit_4040); +COMPILER_STRIP_GATE(0x80AF745C, &lit_4040); #pragma pop /* 80AF7460-80AF7464 000058 0004+00 0/1 0/0 0/0 .rodata @4041 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4041 = -30.0f; -COMPILER_STRIP_GATE(80AF7460, &lit_4041); +COMPILER_STRIP_GATE(0x80AF7460, &lit_4041); #pragma pop /* 80AF7464-80AF7468 00005C 0004+00 0/1 0/0 0/0 .rodata @4042 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4042 = -150.0f; -COMPILER_STRIP_GATE(80AF7464, &lit_4042); +COMPILER_STRIP_GATE(0x80AF7464, &lit_4042); #pragma pop /* 80AF7468-80AF746C 000060 0004+00 0/1 0/0 0/0 .rodata @4043 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4043 = 63.0f; -COMPILER_STRIP_GATE(80AF7468, &lit_4043); +COMPILER_STRIP_GATE(0x80AF7468, &lit_4043); #pragma pop /* 80AF65FC-80AF6B74 0006FC 0578+00 2/1 0/0 0/0 .text demo_camera__FP12npc_sq_class */ @@ -619,49 +625,49 @@ static asm void demo_camera(npc_sq_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4044 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(80AF746C, &lit_4044); +COMPILER_STRIP_GATE(0x80AF746C, &lit_4044); #pragma pop /* 80AF7470-80AF7474 000068 0004+00 0/0 0/0 0/0 .rodata @4045 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4045 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(80AF7470, &lit_4045); +COMPILER_STRIP_GATE(0x80AF7470, &lit_4045); #pragma pop /* 80AF7474-80AF7478 00006C 0004+00 0/0 0/0 0/0 .rodata @4046 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4046 = 1.0f / 100.0f; -COMPILER_STRIP_GATE(80AF7474, &lit_4046); +COMPILER_STRIP_GATE(0x80AF7474, &lit_4046); #pragma pop /* 80AF7478-80AF747C 000070 0004+00 0/0 0/0 0/0 .rodata @4047 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4047 = 150.0f; -COMPILER_STRIP_GATE(80AF7478, &lit_4047); +COMPILER_STRIP_GATE(0x80AF7478, &lit_4047); #pragma pop /* 80AF747C-80AF7480 000074 0004+00 0/1 0/0 0/0 .rodata @4048 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4048 = 20.0f; -COMPILER_STRIP_GATE(80AF747C, &lit_4048); +COMPILER_STRIP_GATE(0x80AF747C, &lit_4048); #pragma pop /* 80AF7480-80AF7484 000078 0004+00 0/0 0/0 0/0 .rodata @4049 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4049 = 50.0f; -COMPILER_STRIP_GATE(80AF7480, &lit_4049); +COMPILER_STRIP_GATE(0x80AF7480, &lit_4049); #pragma pop /* 80AF7484-80AF7488 00007C 0004+00 0/0 0/0 0/0 .rodata @4050 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4050 = 35.0f; -COMPILER_STRIP_GATE(80AF7484, &lit_4050); +COMPILER_STRIP_GATE(0x80AF7484, &lit_4050); #pragma pop /* 80AF7488-80AF7490 000080 0004+04 0/0 0/0 0/0 .rodata @4051 */ @@ -672,7 +678,7 @@ SECTION_RODATA static f32 const lit_4051[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80AF7488, &lit_4051); +COMPILER_STRIP_GATE(0x80AF7488, &lit_4051); #pragma pop /* 80AF7490-80AF7498 000088 0008+00 0/1 0/0 0/0 .rodata @4097 */ @@ -681,7 +687,7 @@ COMPILER_STRIP_GATE(80AF7488, &lit_4051); SECTION_RODATA static u8 const lit_4097[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AF7490, &lit_4097); +COMPILER_STRIP_GATE(0x80AF7490, &lit_4097); #pragma pop /* 80AF6B74-80AF6D54 000C74 01E0+00 2/1 0/0 0/0 .text daNpc_Sq_Execute__FP12npc_sq_class @@ -737,21 +743,21 @@ asm J3DFrameCtrl::~J3DFrameCtrl() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4266 = 30.0f; -COMPILER_STRIP_GATE(80AF7498, &lit_4266); +COMPILER_STRIP_GATE(0x80AF7498, &lit_4266); #pragma pop /* 80AF749C-80AF74A0 000094 0004+00 0/1 0/0 0/0 .rodata @4267 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4267 = 40.0f; -COMPILER_STRIP_GATE(80AF749C, &lit_4267); +COMPILER_STRIP_GATE(0x80AF749C, &lit_4267); #pragma pop /* 80AF74A0-80AF74A4 000098 0004+00 0/1 0/0 0/0 .rodata @4268 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4268 = 0x407FEF9E; -COMPILER_STRIP_GATE(80AF74A0, &lit_4268); +COMPILER_STRIP_GATE(0x80AF74A0, &lit_4268); #pragma pop /* 80AF6F98-80AF7260 001098 02C8+00 1/0 0/0 0/0 .text daNpc_Sq_Create__FP10fopAc_ac_c */ @@ -816,7 +822,7 @@ asm void __sinit_d_a_npc_sq_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80AF73A8 = (void*)__sinit_d_a_npc_sq_cpp; +REGISTER_CTORS(0x80AF73A8, __sinit_d_a_npc_sq_cpp); #pragma pop /* 80AF73E4-80AF73EC 0014E4 0008+00 1/0 0/0 0/0 .text @36@__dt__12dBgS_ObjAcchFv */ @@ -839,9 +845,4 @@ static asm void func_80AF73EC() { } #pragma pop -/* 80AF74A4-80AF74A7 00009C 0003+00 4/4 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80AF74A4 = "Sq"; -#pragma pop +/* 80AF74A4-80AF74A4 00009C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/npc/d_a_npc_taro/d_a_npc_taro.cpp b/rel/d/a/npc/d_a_npc_taro/d_a_npc_taro.cpp index 9d7691453cd..6d6b8272a5c 100644 --- a/rel/d/a/npc/d_a_npc_taro/d_a_npc_taro.cpp +++ b/rel/d/a/npc/d_a_npc_taro/d_a_npc_taro.cpp @@ -15,12 +15,14 @@ struct mDoMtx_stack_c { static u8 now[48]; }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; +struct J3DAnmTransform {}; + +struct J3DModelData {}; + struct Vec {}; struct Z2Creature { @@ -29,8 +31,6 @@ struct Z2Creature { /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -55,6 +55,8 @@ struct daTag_EvtArea_c { /* 8048C94C */ void chkPointInArea(cXyz, cXyz); }; +struct daNpcT_faceMotionAnmData_c {}; + struct daNpcT_MotionSeqMngr_c { struct sequenceStepData_c {}; @@ -63,14 +65,12 @@ struct daNpcT_MotionSeqMngr_c { /* 80570C8C */ ~daNpcT_MotionSeqMngr_c(); }; +struct daNpcT_evtData_c {}; + struct daNpcT_motionAnmData_c {}; struct J3DJoint {}; -struct daNpcT_faceMotionAnmData_c {}; - -struct daNpcT_evtData_c {}; - struct daNpc_Taro_c { /* 80565E8C */ ~daNpc_Taro_c(); /* 8056604C */ void create(); @@ -163,15 +163,15 @@ struct dCcD_GObjInf { /* 800840E4 */ ~dCcD_GObjInf(); }; -struct J3DModel {}; - -struct _GXColorS10 {}; - struct csXyz { /* 80570634 */ ~csXyz(); /* 80570B88 */ csXyz(); }; +struct _GXColorS10 {}; + +struct J3DModel {}; + struct daNpcT_c { /* 80147FA4 */ void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*); /* 80148058 */ void getTrnsfrmAnmP(char const*, int); @@ -565,8 +565,8 @@ extern "C" void changeAnm__8daNpcT_cFPiPi(); extern "C" void changeBck__8daNpcT_cFPiPi(); extern "C" void changeBtp__8daNpcT_cFPiPi(); extern "C" void changeBtk__8daNpcT_cFPiPi(); -extern "C" void func_80571208(int*); -extern "C" void func_80571224(int, int); +extern "C" void func_80571208(void* _this, int*); +extern "C" void func_80571224(void* _this, int, int); extern "C" void __sinit_d_a_npc_taro_cpp(); extern "C" void __ct__12daNpc_Taro_cFPC26daNpcT_faceMotionAnmData_cPC22daNpcT_motionAnmData_cPCQ222daNpcT_MotionSeqMngr_c18sequenceStepData_ciPCQ222daNpcT_MotionSeqMngr_c18sequenceStepData_ciPC16daNpcT_evtData_cPPc(); @@ -799,6 +799,56 @@ extern "C" void checkStartDemo13StbEvt__11daNpc_Len_cFP10fopAc_ac_cfffffff(); // /* ############################################################################################## */ +/* 80571908-80571908 000240 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80571908 = ""; +SECTION_DEAD static char const* const stringBase_80571909 = "NO_RESPONSE"; +SECTION_DEAD static char const* const stringBase_80571915 = "HAIL"; +SECTION_DEAD static char const* const stringBase_8057191A = "FIND_MONKEY"; +SECTION_DEAD static char const* const stringBase_80571926 = "HELP_ME"; +SECTION_DEAD static char const* const stringBase_8057192E = "THANX_FOR_YOURHELP"; +SECTION_DEAD static char const* const stringBase_80571941 = "APPEARANCE_MOI"; +SECTION_DEAD static char const* const stringBase_80571950 = "GIVEME_WOODSWD1"; +SECTION_DEAD static char const* const stringBase_80571960 = "GIVEME_WOODSWD2"; +SECTION_DEAD static char const* const stringBase_80571970 = "GET_WOODSWD"; +SECTION_DEAD static char const* const stringBase_8057197C = "CONVERSATION_WITH_MARO1"; +SECTION_DEAD static char const* const stringBase_80571994 = "CONVERSATION_WITH_MARO2"; +SECTION_DEAD static char const* const stringBase_805719AC = "DEMO13_STB"; +SECTION_DEAD static char const* const stringBase_805719B7 = "BEGIN_ARROWTUTORIAL"; +SECTION_DEAD static char const* const stringBase_805719CB = "BEGIN_ARROWTUTORIAL_NO_ARROW"; +SECTION_DEAD static char const* const stringBase_805719E8 = "RETRY_ARROWTUTORIAL1"; +SECTION_DEAD static char const* const stringBase_805719FD = "RETRY_ARROWTUTORIAL1_NO_ARROW"; +SECTION_DEAD static char const* const stringBase_80571A1B = "RETRY_ARROWTUTORIAL2"; +SECTION_DEAD static char const* const stringBase_80571A30 = "RETRY_ARROWTUTORIAL2_NO_ARROW"; +SECTION_DEAD static char const* const stringBase_80571A4E = "RETRY_ARROWTUTORIAL3"; +SECTION_DEAD static char const* const stringBase_80571A63 = "RETRY_ARROWTUTORIAL3_NO_ARROW"; +SECTION_DEAD static char const* const stringBase_80571A81 = "CAUTION"; +SECTION_DEAD static char const* const stringBase_80571A89 = "TAG_PUSH1"; +SECTION_DEAD static char const* const stringBase_80571A93 = "NOT_GONNA_LET_1"; +SECTION_DEAD static char const* const stringBase_80571AA3 = "NOT_GONNA_LET_2"; +SECTION_DEAD static char const* const stringBase_80571AB3 = "NOT_GONNA_LET_3"; +SECTION_DEAD static char const* const stringBase_80571AC3 = "TAG_PUSH4"; +SECTION_DEAD static char const* const stringBase_80571ACD = "Taro"; +SECTION_DEAD static char const* const stringBase_80571AD2 = "Taro_TW"; +SECTION_DEAD static char const* const stringBase_80571ADA = "Taro0"; +SECTION_DEAD static char const* const stringBase_80571AE0 = "Taro1"; +SECTION_DEAD static char const* const stringBase_80571AE6 = "Taro2"; +SECTION_DEAD static char const* const stringBase_80571AEC = "Taro3"; +SECTION_DEAD static char const* const stringBase_80571AF2 = "Taro4"; +SECTION_DEAD static char const* const stringBase_80571AF8 = "Taro5"; +SECTION_DEAD static char const* const stringBase_80571AFE = "TaroB"; +SECTION_DEAD static char const* const stringBase_80571B04 = "Len1"; +SECTION_DEAD static char const* const stringBase_80571B09 = "CONVERSATION_ABOUT_PACHINKO"; +SECTION_DEAD static char const* const stringBase_80571B25 = "CONVERSATION_ABOUT_WOODSWD"; +SECTION_DEAD static char const* const stringBase_80571B40 = "SWDTUTORIAL"; +SECTION_DEAD static char const* const stringBase_80571B4C = "GIVEME_WOODSWD"; +SECTION_DEAD static char const* const stringBase_80571B5B = "CONVERSATION_WITH_MARO"; +SECTION_DEAD static char const* const stringBase_80571B72 = "CACARICO_CONVERSATION"; +SECTION_DEAD static char const* const stringBase_80571B88 = "ARROWTUTORIAL"; +SECTION_DEAD static char const* const stringBase_80571B96 = "NOT_GONNA_LET"; +#pragma pop + /* 80571BC8-80571BD4 000000 000C+00 4/4 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -2248,7 +2298,7 @@ SECTION_RODATA u8 const daNpc_Taro_Param_c::m[144] = { 0xC1, 0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC1, 0x20, 0x00, 0x00, 0x41, 0x70, 0x00, 0x00, 0x41, 0xF0, 0x00, 0x00, 0x41, 0x20, 0x00, 0x00, 0x42, 0x5C, 0x00, 0x00, 0x00, 0x78, 0x00, 0x5A, }; -COMPILER_STRIP_GATE(805716C8, &daNpc_Taro_Param_c::m); +COMPILER_STRIP_GATE(0x805716C8, &daNpc_Taro_Param_c::m); /* 80571758-8057179C 000090 0044+00 0/1 0/0 0/0 .rodata heapSize$4397 */ #pragma push @@ -2260,35 +2310,35 @@ SECTION_RODATA static u8 const heapSize[68] = { 0x39, 0x00, 0x00, 0x00, 0x39, 0x00, 0x00, 0x00, 0x40, 0xF0, 0x00, 0x00, 0x39, 0x00, 0x00, 0x00, 0x39, 0x00, 0x00, 0x00, 0x40, 0xF0, 0x00, 0x00, 0x48, 0xF0, }; -COMPILER_STRIP_GATE(80571758, &heapSize); +COMPILER_STRIP_GATE(0x80571758, &heapSize); #pragma pop /* 8057179C-805717A0 0000D4 0004+00 0/1 0/0 0/0 .rodata @4468 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4468 = -200.0f; -COMPILER_STRIP_GATE(8057179C, &lit_4468); +COMPILER_STRIP_GATE(0x8057179C, &lit_4468); #pragma pop /* 805717A0-805717A4 0000D8 0004+00 0/1 0/0 0/0 .rodata @4469 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4469 = -100.0f; -COMPILER_STRIP_GATE(805717A0, &lit_4469); +COMPILER_STRIP_GATE(0x805717A0, &lit_4469); #pragma pop /* 805717A4-805717A8 0000DC 0004+00 0/1 0/0 0/0 .rodata @4470 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4470 = 200.0f; -COMPILER_STRIP_GATE(805717A4, &lit_4470); +COMPILER_STRIP_GATE(0x805717A4, &lit_4470); #pragma pop /* 805717A8-805717AC 0000E0 0004+00 0/1 0/0 0/0 .rodata @4471 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4471 = 300.0f; -COMPILER_STRIP_GATE(805717A8, &lit_4471); +COMPILER_STRIP_GATE(0x805717A8, &lit_4471); #pragma pop /* 805717AC-805717B0 0000E4 0004+00 13/26 0/0 0/0 .rodata @4472 */ @@ -2298,13 +2348,13 @@ SECTION_RODATA static u8 const lit_4472[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(805717AC, &lit_4472); +COMPILER_STRIP_GATE(0x805717AC, &lit_4472); /* 805717B0-805717B4 0000E8 0004+00 0/1 0/0 0/0 .rodata @4473 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4473 = -1000000000.0f; -COMPILER_STRIP_GATE(805717B0, &lit_4473); +COMPILER_STRIP_GATE(0x805717B0, &lit_4473); #pragma pop /* 8056604C-80566340 0002AC 02F4+00 1/1 0/0 0/0 .text create__12daNpc_Taro_cFv */ @@ -2322,19 +2372,19 @@ asm void daNpc_Taro_c::create() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4644 = 65536.0f; -COMPILER_STRIP_GATE(805717B4, &lit_4644); +COMPILER_STRIP_GATE(0x805717B4, &lit_4644); #pragma pop /* 805717B8-805717BC 0000F0 0004+00 0/3 0/0 0/0 .rodata @4645 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4645 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(805717B8, &lit_4645); +COMPILER_STRIP_GATE(0x805717B8, &lit_4645); #pragma pop /* 805717BC-805717C0 0000F4 0004+00 2/4 0/0 0/0 .rodata @4835 */ SECTION_RODATA static f32 const lit_4835 = 1.0f; -COMPILER_STRIP_GATE(805717BC, &lit_4835); +COMPILER_STRIP_GATE(0x805717BC, &lit_4835); /* 80566340-80566754 0005A0 0414+00 1/1 0/0 0/0 .text CreateHeap__12daNpc_Taro_cFv */ #pragma push @@ -2469,7 +2519,7 @@ asm void daNpc_Taro_c::Execute() { /* ############################################################################################## */ /* 805717C0-805717C4 0000F8 0004+00 1/2 0/0 0/0 .rodata @4884 */ SECTION_RODATA static f32 const lit_4884 = 100.0f; -COMPILER_STRIP_GATE(805717C0, &lit_4884); +COMPILER_STRIP_GATE(0x805717C0, &lit_4884); /* 80566964-805669F8 000BC4 0094+00 1/1 0/0 0/0 .text Draw__12daNpc_Taro_cFv */ #pragma push @@ -2526,7 +2576,7 @@ asm void daNpc_Taro_c::srchNpc(void* param_0, void* param_1) { /* ############################################################################################## */ /* 805717C4-805717C8 0000FC 0004+00 1/1 0/0 0/0 .rodata @4965 */ SECTION_RODATA static f32 const lit_4965 = 1000000000.0f; -COMPILER_STRIP_GATE(805717C4, &lit_4965); +COMPILER_STRIP_GATE(0x805717C4, &lit_4965); /* 80566BD4-80566CCC 000E34 00F8+00 1/1 0/0 0/0 .text getArrowP__12daNpc_Taro_cFv */ #pragma push @@ -2583,14 +2633,14 @@ asm void daNpc_Taro_c::afterJntAnm(int param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5156 = 180.0f; -COMPILER_STRIP_GATE(805717C8, &lit_5156); +COMPILER_STRIP_GATE(0x805717C8, &lit_5156); #pragma pop /* 805717CC-805717D0 000104 0004+00 0/1 0/0 0/0 .rodata @5157 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5157 = 500.0f; -COMPILER_STRIP_GATE(805717CC, &lit_5157); +COMPILER_STRIP_GATE(0x805717CC, &lit_5157); #pragma pop /* 80567280-8056747C 0014E0 01FC+00 1/0 0/0 0/0 .text setParam__12daNpc_Taro_cFv */ @@ -2626,7 +2676,7 @@ asm void daNpc_Taro_c::evtEndProc() { /* ############################################################################################## */ /* 805717D0-805717D4 000108 0004+00 6/13 0/0 0/0 .rodata @5232 */ SECTION_RODATA static f32 const lit_5232 = -1.0f; -COMPILER_STRIP_GATE(805717D0, &lit_5232); +COMPILER_STRIP_GATE(0x805717D0, &lit_5232); /* 805675B8-8056767C 001818 00C4+00 2/0 0/0 0/0 .text setAfterTalkMotion__12daNpc_Taro_cFv */ #pragma push @@ -2693,28 +2743,28 @@ asm void daNpc_Taro_c::beforeMove() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5501 = 30.0f; -COMPILER_STRIP_GATE(805717D4, &lit_5501); +COMPILER_STRIP_GATE(0x805717D4, &lit_5501); #pragma pop /* 805717D8-805717DC 000110 0004+00 0/1 0/0 0/0 .rodata @5502 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_5502 = 0x38C90FDB; -COMPILER_STRIP_GATE(805717D8, &lit_5502); +COMPILER_STRIP_GATE(0x805717D8, &lit_5502); #pragma pop /* 805717DC-805717E0 000114 0004+00 0/1 0/0 0/0 .rodata @5503 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5503 = 10.0f; -COMPILER_STRIP_GATE(805717DC, &lit_5503); +COMPILER_STRIP_GATE(0x805717DC, &lit_5503); #pragma pop /* 805717E0-805717E8 000118 0008+00 2/4 0/0 0/0 .rodata @5505 */ SECTION_RODATA static u8 const lit_5505[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(805717E0, &lit_5505); +COMPILER_STRIP_GATE(0x805717E0, &lit_5505); /* 80573560-80573564 000008 0001+03 1/1 0/0 0/0 .bss @1109 */ static u8 lit_1109[1 + 3 /* padding */]; @@ -2844,7 +2894,7 @@ asm void daNpc_Taro_c::setAttnPos() { SECTION_RODATA static u8 const lit_5563[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(805717E8, &lit_5563); +COMPILER_STRIP_GATE(0x805717E8, &lit_5563); #pragma pop /* 805717F0-805717F8 000128 0008+00 0/1 0/0 0/0 .rodata @5564 */ @@ -2853,7 +2903,7 @@ COMPILER_STRIP_GATE(805717E8, &lit_5563); SECTION_RODATA static u8 const lit_5564[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(805717F0, &lit_5564); +COMPILER_STRIP_GATE(0x805717F0, &lit_5564); #pragma pop /* 805717F8-80571800 000130 0008+00 0/1 0/0 0/0 .rodata @5565 */ @@ -2862,42 +2912,42 @@ COMPILER_STRIP_GATE(805717F0, &lit_5564); SECTION_RODATA static u8 const lit_5565[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(805717F8, &lit_5565); +COMPILER_STRIP_GATE(0x805717F8, &lit_5565); #pragma pop /* 80571800-80571804 000138 0004+00 0/1 0/0 0/0 .rodata @5634 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_5634 = 0xC27D8F5C; -COMPILER_STRIP_GATE(80571800, &lit_5634); +COMPILER_STRIP_GATE(0x80571800, &lit_5634); #pragma pop /* 80571804-80571808 00013C 0004+00 0/1 0/0 0/0 .rodata @5635 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5635 = 140.0f; -COMPILER_STRIP_GATE(80571804, &lit_5635); +COMPILER_STRIP_GATE(0x80571804, &lit_5635); #pragma pop /* 80571808-8057180C 000140 0004+00 0/1 0/0 0/0 .rodata @5636 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5636 = 60.0f; -COMPILER_STRIP_GATE(80571808, &lit_5636); +COMPILER_STRIP_GATE(0x80571808, &lit_5636); #pragma pop /* 8057180C-80571810 000144 0004+00 0/1 0/0 0/0 .rodata @5637 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5637 = 40.0f; -COMPILER_STRIP_GATE(8057180C, &lit_5637); +COMPILER_STRIP_GATE(0x8057180C, &lit_5637); #pragma pop /* 80571810-80571814 000148 0004+00 0/1 0/0 0/0 .rodata @5638 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5638 = 80.0f; -COMPILER_STRIP_GATE(80571810, &lit_5638); +COMPILER_STRIP_GATE(0x80571810, &lit_5638); #pragma pop /* 805682E8-80568590 002548 02A8+00 1/0 0/0 0/0 .text setCollision__12daNpc_Taro_cFv */ @@ -2920,7 +2970,7 @@ bool daNpc_Taro_c::drawDbgInfo() { SECTION_RODATA static u8 const jointNo[8] = { 0x00, 0x00, 0x00, 0x0F, 0x00, 0x00, 0x00, 0x0F, }; -COMPILER_STRIP_GATE(80571814, &jointNo); +COMPILER_STRIP_GATE(0x80571814, &jointNo); /* 80568598-805686A0 0027F8 0108+00 1/0 0/0 0/0 .text drawOtherMdl__12daNpc_Taro_cFv */ #pragma push @@ -2958,7 +3008,7 @@ asm void daNpc_Taro_c::selectAction() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpc_Taro_c::chkAction(int (daNpc_Taro_c::*)(void*)) { +asm void daNpc_Taro_c::chkAction(int (daNpc_Taro_c::*param_0)(void*)) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_taro/d_a_npc_taro/chkAction__12daNpc_Taro_cFM12daNpc_Taro_cFPCvPvPv_i.s" } @@ -2969,7 +3019,7 @@ asm void daNpc_Taro_c::chkAction(int (daNpc_Taro_c::*)(void*)) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpc_Taro_c::setAction(int (daNpc_Taro_c::*)(void*)) { +asm void daNpc_Taro_c::setAction(int (daNpc_Taro_c::*param_0)(void*)) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_taro/d_a_npc_taro/setAction__12daNpc_Taro_cFM12daNpc_Taro_cFPCvPvPv_i.s" } @@ -2978,11 +3028,11 @@ asm void daNpc_Taro_c::setAction(int (daNpc_Taro_c::*)(void*)) { /* ############################################################################################## */ /* 8057181C-80571820 000154 0004+00 1/1 0/0 0/0 .rodata @5760 */ SECTION_RODATA static f32 const lit_5760 = 34.0f; -COMPILER_STRIP_GATE(8057181C, &lit_5760); +COMPILER_STRIP_GATE(0x8057181C, &lit_5760); /* 80571820-80571824 000158 0004+00 1/1 0/0 0/0 .rodata @5761 */ SECTION_RODATA static f32 const lit_5761 = 52.0f; -COMPILER_STRIP_GATE(80571820, &lit_5761); +COMPILER_STRIP_GATE(0x80571820, &lit_5761); /* 805688FC-80568A2C 002B5C 0130+00 1/1 0/0 0/0 .text setSwingVoice__12daNpc_Taro_cFv */ #pragma push @@ -2997,7 +3047,13 @@ asm void daNpc_Taro_c::setSwingVoice() { /* ############################################################################################## */ /* 80571824-80571828 00015C 0004+00 1/3 0/0 0/0 .rodata @5839 */ SECTION_RODATA static f32 const lit_5839 = -40.0f; -COMPILER_STRIP_GATE(80571824, &lit_5839); +COMPILER_STRIP_GATE(0x80571824, &lit_5839); + +/* 80571908-80571908 000240 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80571BA4 = "prm"; +#pragma pop /* 80568A2C-80568C58 002C8C 022C+00 1/0 0/0 0/0 .text * cutConversationAboutPachinko__12daNpc_Taro_cFi */ @@ -3028,7 +3084,7 @@ asm void daNpc_Taro_c::cutConversationAboutWoodSwd(int param_0) { SECTION_RODATA static u8 const lit_5896[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80571828, &lit_5896); +COMPILER_STRIP_GATE(0x80571828, &lit_5896); #pragma pop /* 80571834-8057183C 00016C 0008+00 0/1 0/0 0/0 .rodata @5920 */ @@ -3037,7 +3093,14 @@ COMPILER_STRIP_GATE(80571828, &lit_5896); SECTION_RODATA static u8 const lit_5920[8] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, }; -COMPILER_STRIP_GATE(80571834, &lit_5920); +COMPILER_STRIP_GATE(0x80571834, &lit_5920); +#pragma pop + +/* 80571908-80571908 000240 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80571BA8 = "timer"; +SECTION_DEAD static char const* const stringBase_80571BAE = "msgNo"; #pragma pop /* 80568E00-80569880 003060 0A80+00 3/0 0/0 0/0 .text cutSwdTutorial__12daNpc_Taro_cFi */ @@ -3065,14 +3128,14 @@ asm void daNpc_Taro_c::cutHail(int param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6197 = -50.0f; -COMPILER_STRIP_GATE(8057183C, &lit_6197); +COMPILER_STRIP_GATE(0x8057183C, &lit_6197); #pragma pop /* 80571840-80571844 000178 0004+00 0/0 0/0 0/0 .rodata @6198 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6198 = 8.0f; -COMPILER_STRIP_GATE(80571840, &lit_6198); +COMPILER_STRIP_GATE(0x80571840, &lit_6198); #pragma pop /* 80571844-80571850 00017C 000C+00 0/1 0/0 0/0 .rodata @6309 */ @@ -3081,7 +3144,7 @@ COMPILER_STRIP_GATE(80571840, &lit_6198); SECTION_RODATA static u8 const lit_6309[12] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, }; -COMPILER_STRIP_GATE(80571844, &lit_6309); +COMPILER_STRIP_GATE(0x80571844, &lit_6309); #pragma pop /* 80569AFC-8056A120 003D5C 0624+00 3/0 0/0 0/0 .text cutFindMonkey__12daNpc_Taro_cFi */ @@ -3109,21 +3172,21 @@ asm void daNpc_Taro_c::cutHelpMe(int param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6432 = 2500.0f; -COMPILER_STRIP_GATE(80571850, &lit_6432); +COMPILER_STRIP_GATE(0x80571850, &lit_6432); #pragma pop /* 80571854-80571858 00018C 0004+00 0/0 0/0 0/0 .rodata @6433 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6433 = 16.0f; -COMPILER_STRIP_GATE(80571854, &lit_6433); +COMPILER_STRIP_GATE(0x80571854, &lit_6433); #pragma pop /* 80571858-8057185C 000190 0004+00 0/1 0/0 0/0 .rodata @6434 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6434 = 0.5f; -COMPILER_STRIP_GATE(80571858, &lit_6434); +COMPILER_STRIP_GATE(0x80571858, &lit_6434); #pragma pop /* 8057185C-80571864 000194 0008+00 0/1 0/0 0/0 .rodata @6526 */ @@ -3132,14 +3195,14 @@ COMPILER_STRIP_GATE(80571858, &lit_6434); SECTION_RODATA static u8 const lit_6526[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8057185C, &lit_6526); +COMPILER_STRIP_GATE(0x8057185C, &lit_6526); #pragma pop /* 80571864-80571868 00019C 0004+00 0/1 0/0 0/0 .rodata @6873 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6873 = 400.0f; -COMPILER_STRIP_GATE(80571864, &lit_6873); +COMPILER_STRIP_GATE(0x80571864, &lit_6873); #pragma pop /* 8056A460-8056B000 0046C0 0BA0+00 3/0 0/0 0/0 .text cutAppearanceMoi__12daNpc_Taro_cFi @@ -3158,21 +3221,21 @@ asm void daNpc_Taro_c::cutAppearanceMoi(int param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6874 = 1600.0f; -COMPILER_STRIP_GATE(80571868, &lit_6874); +COMPILER_STRIP_GATE(0x80571868, &lit_6874); #pragma pop /* 8057186C-80571870 0001A4 0004+00 0/0 0/0 0/0 .rodata @6875 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6875 = 50.0f; -COMPILER_STRIP_GATE(8057186C, &lit_6875); +COMPILER_STRIP_GATE(0x8057186C, &lit_6875); #pragma pop /* 80571870-80571874 0001A8 0004+00 0/0 0/0 0/0 .rodata @6876 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6876 = 800.0f; -COMPILER_STRIP_GATE(80571870, &lit_6876); +COMPILER_STRIP_GATE(0x80571870, &lit_6876); #pragma pop /* 80571874-8057187C 0001AC 0008+00 0/1 0/0 0/0 .rodata @6890 */ @@ -3181,7 +3244,7 @@ COMPILER_STRIP_GATE(80571870, &lit_6876); SECTION_RODATA static u8 const lit_6890[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80571874, &lit_6890); +COMPILER_STRIP_GATE(0x80571874, &lit_6890); #pragma pop /* 8057187C-80571888 0001B4 000C+00 0/1 0/0 0/0 .rodata @6904 */ @@ -3190,7 +3253,13 @@ COMPILER_STRIP_GATE(80571874, &lit_6890); SECTION_RODATA static u8 const lit_6904[12] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, }; -COMPILER_STRIP_GATE(8057187C, &lit_6904); +COMPILER_STRIP_GATE(0x8057187C, &lit_6904); +#pragma pop + +/* 80571908-80571908 000240 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80571BB4 = "msgNo2"; #pragma pop /* 8056B000-8056B68C 005260 068C+00 2/0 0/0 0/0 .text cutGiveMeWoodSwd__12daNpc_Taro_cFi @@ -3209,42 +3278,42 @@ asm void daNpc_Taro_c::cutGiveMeWoodSwd(int param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7053 = -656.0f; -COMPILER_STRIP_GATE(80571888, &lit_7053); +COMPILER_STRIP_GATE(0x80571888, &lit_7053); #pragma pop /* 8057188C-80571890 0001C4 0004+00 0/0 0/0 0/0 .rodata @7054 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7054 = 1338.0f; -COMPILER_STRIP_GATE(8057188C, &lit_7054); +COMPILER_STRIP_GATE(0x8057188C, &lit_7054); #pragma pop /* 80571890-80571894 0001C8 0004+00 0/0 0/0 0/0 .rodata @7055 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7055 = -2237.0f; -COMPILER_STRIP_GATE(80571890, &lit_7055); +COMPILER_STRIP_GATE(0x80571890, &lit_7055); #pragma pop /* 80571894-80571898 0001CC 0004+00 0/0 0/0 0/0 .rodata @7056 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7056 = -419.0f; -COMPILER_STRIP_GATE(80571894, &lit_7056); +COMPILER_STRIP_GATE(0x80571894, &lit_7056); #pragma pop /* 80571898-8057189C 0001D0 0004+00 0/0 0/0 0/0 .rodata @7057 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7057 = 1375.0f; -COMPILER_STRIP_GATE(80571898, &lit_7057); +COMPILER_STRIP_GATE(0x80571898, &lit_7057); #pragma pop /* 8057189C-805718A0 0001D4 0004+00 0/0 0/0 0/0 .rodata @7058 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7058 = -2203.0f; -COMPILER_STRIP_GATE(8057189C, &lit_7058); +COMPILER_STRIP_GATE(0x8057189C, &lit_7058); #pragma pop /* 805718A0-805718A8 0001D8 0008+00 0/1 0/0 0/0 .rodata @7073 */ @@ -3253,7 +3322,7 @@ COMPILER_STRIP_GATE(8057189C, &lit_7058); SECTION_RODATA static u8 const lit_7073[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(805718A0, &lit_7073); +COMPILER_STRIP_GATE(0x805718A0, &lit_7073); #pragma pop /* 805718A8-805718B4 0001E0 000C+00 0/1 0/0 0/0 .rodata @7089 */ @@ -3262,7 +3331,13 @@ COMPILER_STRIP_GATE(805718A0, &lit_7073); SECTION_RODATA static u8 const lit_7089[12] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, }; -COMPILER_STRIP_GATE(805718A8, &lit_7089); +COMPILER_STRIP_GATE(0x805718A8, &lit_7089); +#pragma pop + +/* 80571908-80571908 000240 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80571BBB = "send"; #pragma pop /* 8056B68C-8056C14C 0058EC 0AC0+00 3/0 0/0 0/0 .text cutGetWoodSwd__12daNpc_Taro_cFi */ @@ -3280,14 +3355,14 @@ asm void daNpc_Taro_c::cutGetWoodSwd(int param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7366 = 45.0f; -COMPILER_STRIP_GATE(805718B4, &lit_7366); +COMPILER_STRIP_GATE(0x805718B4, &lit_7366); #pragma pop /* 805718B8-805718BC 0001F0 0004+00 0/0 0/0 0/0 .rodata @7367 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7367 = 63.0f; -COMPILER_STRIP_GATE(805718B8, &lit_7367); +COMPILER_STRIP_GATE(0x805718B8, &lit_7367); #pragma pop /* 805718BC-805718C4 0001F4 0008+00 0/1 0/0 0/0 .rodata @7379 */ @@ -3296,7 +3371,7 @@ COMPILER_STRIP_GATE(805718B8, &lit_7367); SECTION_RODATA static u8 const lit_7379[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(805718BC, &lit_7379); +COMPILER_STRIP_GATE(0x805718BC, &lit_7379); #pragma pop /* 805718C4-805718D0 0001FC 000C+00 0/1 0/0 0/0 .rodata @7389 */ @@ -3305,7 +3380,7 @@ COMPILER_STRIP_GATE(805718BC, &lit_7379); SECTION_RODATA static u8 const lit_7389[12] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, }; -COMPILER_STRIP_GATE(805718C4, &lit_7389); +COMPILER_STRIP_GATE(0x805718C4, &lit_7389); #pragma pop /* 8056C14C-8056C5B4 0063AC 0468+00 1/0 0/0 0/0 .text cutConversationWithMaro__12daNpc_Taro_cFi */ @@ -3325,7 +3400,7 @@ asm void daNpc_Taro_c::cutConversationWithMaro(int param_0) { SECTION_RODATA static u8 const lit_7494[16] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(805718D0, &lit_7494); +COMPILER_STRIP_GATE(0x805718D0, &lit_7494); #pragma pop /* 805718E0-805718E8 000218 0008+00 0/1 0/0 0/0 .rodata @7501 */ @@ -3334,7 +3409,7 @@ COMPILER_STRIP_GATE(805718D0, &lit_7494); SECTION_RODATA static u8 const lit_7501[8] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, }; -COMPILER_STRIP_GATE(805718E0, &lit_7501); +COMPILER_STRIP_GATE(0x805718E0, &lit_7501); #pragma pop /* 8056C5B4-8056C8CC 006814 0318+00 1/0 0/0 0/0 .text cutCacaricoConversation__12daNpc_Taro_cFi */ @@ -3368,6 +3443,13 @@ asm void daNpc_Taro_c::cutCaution(int param_0) { } #pragma pop +/* ############################################################################################## */ +/* 80571908-80571908 000240 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80571BC0 = "F_SP103"; +#pragma pop + /* 8056D310-8056D5C0 007570 02B0+00 1/0 0/0 0/0 .text cutTagPush1__12daNpc_Taro_cFi */ #pragma push #pragma optimization_level 0 @@ -3385,7 +3467,7 @@ asm void daNpc_Taro_c::cutTagPush1(int param_0) { SECTION_RODATA static u8 const lit_7945[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(805718E8, &lit_7945); +COMPILER_STRIP_GATE(0x805718E8, &lit_7945); #pragma pop /* 805718F0-805718F8 000228 0008+00 0/1 0/0 0/0 .rodata @7968 */ @@ -3394,7 +3476,7 @@ COMPILER_STRIP_GATE(805718E8, &lit_7945); SECTION_RODATA static u8 const lit_7968[8] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, }; -COMPILER_STRIP_GATE(805718F0, &lit_7968); +COMPILER_STRIP_GATE(0x805718F0, &lit_7968); #pragma pop /* 8056D5C0-8056DFAC 007820 09EC+00 3/0 0/0 0/0 .text cutNotGonnaLet__12daNpc_Taro_cFi */ @@ -3474,7 +3556,7 @@ asm void daNpc_Taro_c::nurse(void* param_0) { SECTION_RODATA static u8 const lit_9434[16] = { 0x00, 0x0D, 0x00, 0x0E, 0x00, 0x0F, 0x00, 0x10, 0x00, 0x11, 0x00, 0x12, 0x00, 0x13, 0x00, 0x14, }; -COMPILER_STRIP_GATE(805718F8, &lit_9434); +COMPILER_STRIP_GATE(0x805718F8, &lit_9434); #pragma pop /* 8056FDCC-80570170 00A02C 03A4+00 3/0 0/0 0/0 .text talk__12daNpc_Taro_cFPv */ @@ -3817,7 +3899,7 @@ void daNpcT_c::changeBtk(int* param_0, int* param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80571208(int* param_0) { +extern "C" asm void func_80571208(void* _this, int* param_0) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_taro/d_a_npc_taro/func_80571208.s" } @@ -3827,7 +3909,7 @@ extern "C" asm void func_80571208(int* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80571224(int param_0, int param_1) { +extern "C" asm void func_80571224(void* _this, int param_0, int param_1) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_taro/d_a_npc_taro/func_80571224.s" } @@ -3853,7 +3935,7 @@ asm void __sinit_d_a_npc_taro_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_805712A0 = (void*)__sinit_d_a_npc_taro_cpp; +REGISTER_CTORS(0x805712A0, __sinit_d_a_npc_taro_cpp); #pragma pop /* 8057148C-805715AC 00B6EC 0120+00 1/1 0/0 0/0 .text @@ -4139,59 +4221,4 @@ static u8 data_80573628[4]; static u8 data_8057362C[4]; #pragma pop -/* 80571908-80571BC8 000240 02C0+00 20/17 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80571908 = ""; -SECTION_DEAD static char const* const stringBase_80571909 = "NO_RESPONSE"; -SECTION_DEAD static char const* const stringBase_80571915 = "HAIL"; -SECTION_DEAD static char const* const stringBase_8057191A = "FIND_MONKEY"; -SECTION_DEAD static char const* const stringBase_80571926 = "HELP_ME"; -SECTION_DEAD static char const* const stringBase_8057192E = "THANX_FOR_YOURHELP"; -SECTION_DEAD static char const* const stringBase_80571941 = "APPEARANCE_MOI"; -SECTION_DEAD static char const* const stringBase_80571950 = "GIVEME_WOODSWD1"; -SECTION_DEAD static char const* const stringBase_80571960 = "GIVEME_WOODSWD2"; -SECTION_DEAD static char const* const stringBase_80571970 = "GET_WOODSWD"; -SECTION_DEAD static char const* const stringBase_8057197C = "CONVERSATION_WITH_MARO1"; -SECTION_DEAD static char const* const stringBase_80571994 = "CONVERSATION_WITH_MARO2"; -SECTION_DEAD static char const* const stringBase_805719AC = "DEMO13_STB"; -SECTION_DEAD static char const* const stringBase_805719B7 = "BEGIN_ARROWTUTORIAL"; -SECTION_DEAD static char const* const stringBase_805719CB = "BEGIN_ARROWTUTORIAL_NO_ARROW"; -SECTION_DEAD static char const* const stringBase_805719E8 = "RETRY_ARROWTUTORIAL1"; -SECTION_DEAD static char const* const stringBase_805719FD = "RETRY_ARROWTUTORIAL1_NO_ARROW"; -SECTION_DEAD static char const* const stringBase_80571A1B = "RETRY_ARROWTUTORIAL2"; -SECTION_DEAD static char const* const stringBase_80571A30 = "RETRY_ARROWTUTORIAL2_NO_ARROW"; -SECTION_DEAD static char const* const stringBase_80571A4E = "RETRY_ARROWTUTORIAL3"; -SECTION_DEAD static char const* const stringBase_80571A63 = "RETRY_ARROWTUTORIAL3_NO_ARROW"; -SECTION_DEAD static char const* const stringBase_80571A81 = "CAUTION"; -SECTION_DEAD static char const* const stringBase_80571A89 = "TAG_PUSH1"; -SECTION_DEAD static char const* const stringBase_80571A93 = "NOT_GONNA_LET_1"; -SECTION_DEAD static char const* const stringBase_80571AA3 = "NOT_GONNA_LET_2"; -SECTION_DEAD static char const* const stringBase_80571AB3 = "NOT_GONNA_LET_3"; -SECTION_DEAD static char const* const stringBase_80571AC3 = "TAG_PUSH4"; -SECTION_DEAD static char const* const stringBase_80571ACD = "Taro"; -SECTION_DEAD static char const* const stringBase_80571AD2 = "Taro_TW"; -SECTION_DEAD static char const* const stringBase_80571ADA = "Taro0"; -SECTION_DEAD static char const* const stringBase_80571AE0 = "Taro1"; -SECTION_DEAD static char const* const stringBase_80571AE6 = "Taro2"; -SECTION_DEAD static char const* const stringBase_80571AEC = "Taro3"; -SECTION_DEAD static char const* const stringBase_80571AF2 = "Taro4"; -SECTION_DEAD static char const* const stringBase_80571AF8 = "Taro5"; -SECTION_DEAD static char const* const stringBase_80571AFE = "TaroB"; -SECTION_DEAD static char const* const stringBase_80571B04 = "Len1"; -SECTION_DEAD static char const* const stringBase_80571B09 = "CONVERSATION_ABOUT_PACHINKO"; -SECTION_DEAD static char const* const stringBase_80571B25 = "CONVERSATION_ABOUT_WOODSWD"; -SECTION_DEAD static char const* const stringBase_80571B40 = "SWDTUTORIAL"; -SECTION_DEAD static char const* const stringBase_80571B4C = "GIVEME_WOODSWD"; -SECTION_DEAD static char const* const stringBase_80571B5B = "CONVERSATION_WITH_MARO"; -SECTION_DEAD static char const* const stringBase_80571B72 = "CACARICO_CONVERSATION"; -SECTION_DEAD static char const* const stringBase_80571B88 = "ARROWTUTORIAL"; -SECTION_DEAD static char const* const stringBase_80571B96 = "NOT_GONNA_LET"; -SECTION_DEAD static char const* const stringBase_80571BA4 = "prm"; -SECTION_DEAD static char const* const stringBase_80571BA8 = "timer"; -SECTION_DEAD static char const* const stringBase_80571BAE = "msgNo"; -SECTION_DEAD static char const* const stringBase_80571BB4 = "msgNo2"; -SECTION_DEAD static char const* const stringBase_80571BBB = "send"; -SECTION_DEAD static char const* const stringBase_80571BC0 = "F_SP103"; -#pragma pop +/* 80571908-80571908 000240 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/npc/d_a_npc_the/d_a_npc_the.cpp b/rel/d/a/npc/d_a_npc_the/d_a_npc_the.cpp index effbb839607..a1659cb50fb 100644 --- a/rel/d/a/npc/d_a_npc_the/d_a_npc_the.cpp +++ b/rel/d/a/npc/d_a_npc_the/d_a_npc_the.cpp @@ -23,12 +23,12 @@ struct mDoExt_bckAnm { /* 8000D990 */ void changeBckOnly(J3DAnmTransform*); }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; +struct J3DModelData {}; + struct Vec {}; struct Z2Creature { @@ -60,10 +60,10 @@ struct daTag_EvtArea_c { /* 8048C94C */ void chkPointInArea(cXyz, cXyz); }; -struct J3DJoint {}; - struct J3DModel {}; +struct J3DJoint {}; + struct daNpcThe_c { /* 80AF76CC */ daNpcThe_c(); /* 80AF78E0 */ ~daNpcThe_c(); @@ -104,16 +104,16 @@ struct daNpcThe_Param_c { static u8 const m[108]; }; -struct J3DAnmTextureSRTKey {}; - -struct _GXColorS10 {}; - struct J3DAnmTexPattern { /* 8032AF50 */ void getTexNo(u16, u16*) const; }; +struct J3DAnmTextureSRTKey {}; + struct J3DAnmTransformKey {}; +struct _GXColorS10 {}; + struct daNpcF_c { struct daNpcF_anmPlayData {}; @@ -202,7 +202,6 @@ struct dMsgFlow_c { struct dEvt_control_c { /* 80042468 */ void reset(); /* 80042518 */ void reset(void*); - /* 800436EC */ void setPtI_Id(unsigned int); }; struct dEvent_manager_c { @@ -314,7 +313,7 @@ struct JMath { struct TSinCosTable {}; /* TSinCosTable<13, f32> */ struct TSinCosTable__template0 { - /* 80AFB490 */ void func_80AFB490(s16) /* const */; + /* 80AFB490 */ void func_80AFB490(void* _this, s16) /* const */; }; static u8 sincosTable_[65536]; @@ -408,7 +407,7 @@ extern "C" void ctrlBtk__10daNpcThe_cFv(); extern "C" void setAttnPos__10daNpcThe_cFv(); extern "C" void lookat__10daNpcThe_cFv(); extern "C" bool drawDbgInfo__10daNpcThe_cFv(); -extern "C" void func_80AFB490(s16); +extern "C" void func_80AFB490(void* _this, s16); extern "C" void __sinit_d_a_npc_the_cpp(); extern "C" void __dt__18daNpcF_ActorMngr_cFv(); extern "C" void __ct__18daNpcF_ActorMngr_cFv(); @@ -596,6 +595,20 @@ extern "C" void __register_global_object(); // /* ############################################################################################## */ +/* 80AFC158-80AFC158 00034C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80AFC158 = "The"; +SECTION_DEAD static char const* const stringBase_80AFC15C = "The1"; +SECTION_DEAD static char const* const stringBase_80AFC161 = "The2"; +SECTION_DEAD static char const* const stringBase_80AFC166 = "yelB_TW"; +SECTION_DEAD static char const* const stringBase_80AFC16E = "TW_RESISTANCE1"; +SECTION_DEAD static char const* const stringBase_80AFC17D = "TW_RESISTANCE2"; +SECTION_DEAD static char const* const stringBase_80AFC18C = "THE_INTRODUCTION"; +SECTION_DEAD static char const* const stringBase_80AFC19D = ""; +SECTION_DEAD static char const* const stringBase_80AFC19E = "TW_RESISTANCE"; +#pragma pop + /* 80AFC1D0-80AFC1DC 000000 000C+00 5/5 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -1080,13 +1093,13 @@ SECTION_RODATA u8 const daNpcThe_Param_c::m[108] = { 0x42, 0xA0, 0x00, 0x00, 0x43, 0xFA, 0x00, 0x00, 0x43, 0x96, 0x00, 0x00, 0xC3, 0x96, 0x00, 0x00, 0x00, 0x3C, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AFBE0C, &daNpcThe_Param_c::m); +COMPILER_STRIP_GATE(0x80AFBE0C, &daNpcThe_Param_c::m); /* 80AFBE78-80AFBE84 00006C 000C+00 1/1 0/0 0/0 .rodata @4159 */ SECTION_RODATA static u8 const lit_4159[12] = { 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x04, }; -COMPILER_STRIP_GATE(80AFBE78, &lit_4159); +COMPILER_STRIP_GATE(0x80AFBE78, &lit_4159); /* 80AF7AE0-80AF7CB0 000500 01D0+00 1/1 0/0 0/0 .text ctrlJoint__10daNpcThe_cFP8J3DJointP8J3DModel */ @@ -1102,7 +1115,7 @@ asm void daNpcThe_c::ctrlJoint(J3DJoint* param_0, J3DModel* param_1) { /* ############################################################################################## */ /* 80AFBE84-80AFBE88 000078 0004+00 4/4 0/0 0/0 .rodata @4296 */ SECTION_RODATA static f32 const lit_4296 = 1.0f; -COMPILER_STRIP_GATE(80AFBE84, &lit_4296); +COMPILER_STRIP_GATE(0x80AFBE84, &lit_4296); /* 80AFBE88-80AFBE8C 00007C 0004+00 5/7 0/0 0/0 .rodata @4297 */ SECTION_RODATA static u8 const lit_4297[4] = { @@ -1111,7 +1124,7 @@ SECTION_RODATA static u8 const lit_4297[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AFBE88, &lit_4297); +COMPILER_STRIP_GATE(0x80AFBE88, &lit_4297); /* 80AF7CB0-80AF7F58 0006D0 02A8+00 1/1 0/0 0/0 .text * createHeapCallBack__10daNpcThe_cFP10fopAc_ac_c */ @@ -1273,7 +1286,7 @@ asm void daNpcThe_c::setMotionAnm(int param_0, f32 param_1) { SECTION_RODATA static u8 const lit_4507[12] = { 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80AFBE8C, &lit_4507); +COMPILER_STRIP_GATE(0x80AFBE8C, &lit_4507); #pragma pop /* 80AFBE98-80AFBEA0 00008C 0008+00 0/1 0/0 0/0 .rodata @4508 */ @@ -1282,7 +1295,7 @@ COMPILER_STRIP_GATE(80AFBE8C, &lit_4507); SECTION_RODATA static u8 const lit_4508[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AFBE98, &lit_4508); +COMPILER_STRIP_GATE(0x80AFBE98, &lit_4508); #pragma pop /* 80AFBEA0-80AFBEAC 000094 000C+00 0/1 0/0 0/0 .rodata @4509 */ @@ -1291,7 +1304,7 @@ COMPILER_STRIP_GATE(80AFBE98, &lit_4508); SECTION_RODATA static u8 const lit_4509[12] = { 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80AFBEA0, &lit_4509); +COMPILER_STRIP_GATE(0x80AFBEA0, &lit_4509); #pragma pop /* 80AFBEAC-80AFBEB4 0000A0 0008+00 0/1 0/0 0/0 .rodata @4510 */ @@ -1300,7 +1313,7 @@ COMPILER_STRIP_GATE(80AFBEA0, &lit_4509); SECTION_RODATA static u8 const lit_4510[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AFBEAC, &lit_4510); +COMPILER_STRIP_GATE(0x80AFBEAC, &lit_4510); #pragma pop /* 80AFBEB4-80AFBEC0 0000A8 000C+00 0/1 0/0 0/0 .rodata @4511 */ @@ -1309,7 +1322,7 @@ COMPILER_STRIP_GATE(80AFBEAC, &lit_4510); SECTION_RODATA static u8 const lit_4511[12] = { 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80AFBEB4, &lit_4511); +COMPILER_STRIP_GATE(0x80AFBEB4, &lit_4511); #pragma pop /* 80AFBEC0-80AFBEC8 0000B4 0008+00 0/1 0/0 0/0 .rodata @4512 */ @@ -1318,7 +1331,7 @@ COMPILER_STRIP_GATE(80AFBEB4, &lit_4511); SECTION_RODATA static u8 const lit_4512[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AFBEC0, &lit_4512); +COMPILER_STRIP_GATE(0x80AFBEC0, &lit_4512); #pragma pop /* 80AFBEC8-80AFBED4 0000BC 000C+00 0/1 0/0 0/0 .rodata @4513 */ @@ -1327,7 +1340,7 @@ COMPILER_STRIP_GATE(80AFBEC0, &lit_4512); SECTION_RODATA static u8 const lit_4513[12] = { 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80AFBEC8, &lit_4513); +COMPILER_STRIP_GATE(0x80AFBEC8, &lit_4513); #pragma pop /* 80AFBED4-80AFBEDC 0000C8 0008+00 0/1 0/0 0/0 .rodata @4514 */ @@ -1336,7 +1349,7 @@ COMPILER_STRIP_GATE(80AFBEC8, &lit_4513); SECTION_RODATA static u8 const lit_4514[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AFBED4, &lit_4514); +COMPILER_STRIP_GATE(0x80AFBED4, &lit_4514); #pragma pop /* 80AFBEDC-80AFBEE8 0000D0 000C+00 0/1 0/0 0/0 .rodata @4515 */ @@ -1345,7 +1358,7 @@ COMPILER_STRIP_GATE(80AFBED4, &lit_4514); SECTION_RODATA static u8 const lit_4515[12] = { 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80AFBEDC, &lit_4515); +COMPILER_STRIP_GATE(0x80AFBEDC, &lit_4515); #pragma pop /* 80AFBEE8-80AFBEF0 0000DC 0008+00 0/1 0/0 0/0 .rodata @4516 */ @@ -1354,7 +1367,7 @@ COMPILER_STRIP_GATE(80AFBEDC, &lit_4515); SECTION_RODATA static u8 const lit_4516[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AFBEE8, &lit_4516); +COMPILER_STRIP_GATE(0x80AFBEE8, &lit_4516); #pragma pop /* 80AFBEF0-80AFBEFC 0000E4 000C+00 0/1 0/0 0/0 .rodata @4517 */ @@ -1363,7 +1376,7 @@ COMPILER_STRIP_GATE(80AFBEE8, &lit_4516); SECTION_RODATA static u8 const lit_4517[12] = { 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80AFBEF0, &lit_4517); +COMPILER_STRIP_GATE(0x80AFBEF0, &lit_4517); #pragma pop /* 80AFBEFC-80AFBF04 0000F0 0008+00 0/1 0/0 0/0 .rodata @4518 */ @@ -1372,7 +1385,7 @@ COMPILER_STRIP_GATE(80AFBEF0, &lit_4517); SECTION_RODATA static u8 const lit_4518[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AFBEFC, &lit_4518); +COMPILER_STRIP_GATE(0x80AFBEFC, &lit_4518); #pragma pop /* 80AFBF04-80AFBF10 0000F8 000C+00 0/1 0/0 0/0 .rodata @4519 */ @@ -1381,7 +1394,7 @@ COMPILER_STRIP_GATE(80AFBEFC, &lit_4518); SECTION_RODATA static u8 const lit_4519[12] = { 0x00, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80AFBF04, &lit_4519); +COMPILER_STRIP_GATE(0x80AFBF04, &lit_4519); #pragma pop /* 80AFBF10-80AFBF18 000104 0008+00 0/1 0/0 0/0 .rodata @4520 */ @@ -1390,7 +1403,7 @@ COMPILER_STRIP_GATE(80AFBF04, &lit_4519); SECTION_RODATA static u8 const lit_4520[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AFBF10, &lit_4520); +COMPILER_STRIP_GATE(0x80AFBF10, &lit_4520); #pragma pop /* 80AFBF18-80AFBF24 00010C 000C+00 0/1 0/0 0/0 .rodata @4521 */ @@ -1399,7 +1412,7 @@ COMPILER_STRIP_GATE(80AFBF10, &lit_4520); SECTION_RODATA static u8 const lit_4521[12] = { 0x00, 0x0D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AFBF18, &lit_4521); +COMPILER_STRIP_GATE(0x80AFBF18, &lit_4521); #pragma pop /* 80AFBF24-80AFBF2C 000118 0008+00 0/1 0/0 0/0 .rodata @4522 */ @@ -1408,7 +1421,7 @@ COMPILER_STRIP_GATE(80AFBF18, &lit_4521); SECTION_RODATA static u8 const lit_4522[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AFBF24, &lit_4522); +COMPILER_STRIP_GATE(0x80AFBF24, &lit_4522); #pragma pop /* 80AFBF2C-80AFBF38 000120 000C+00 0/1 0/0 0/0 .rodata @4523 */ @@ -1417,7 +1430,7 @@ COMPILER_STRIP_GATE(80AFBF24, &lit_4522); SECTION_RODATA static u8 const lit_4523[12] = { 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AFBF2C, &lit_4523); +COMPILER_STRIP_GATE(0x80AFBF2C, &lit_4523); #pragma pop /* 80AFBF38-80AFBF40 00012C 0008+00 0/1 0/0 0/0 .rodata @4524 */ @@ -1426,7 +1439,7 @@ COMPILER_STRIP_GATE(80AFBF2C, &lit_4523); SECTION_RODATA static u8 const lit_4524[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AFBF38, &lit_4524); +COMPILER_STRIP_GATE(0x80AFBF38, &lit_4524); #pragma pop /* 80AFBF40-80AFBF4C 000134 000C+00 0/1 0/0 0/0 .rodata @4525 */ @@ -1435,7 +1448,7 @@ COMPILER_STRIP_GATE(80AFBF38, &lit_4524); SECTION_RODATA static u8 const lit_4525[12] = { 0x00, 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AFBF40, &lit_4525); +COMPILER_STRIP_GATE(0x80AFBF40, &lit_4525); #pragma pop /* 80AFBF4C-80AFBF54 000140 0008+00 0/1 0/0 0/0 .rodata @4526 */ @@ -1444,7 +1457,7 @@ COMPILER_STRIP_GATE(80AFBF40, &lit_4525); SECTION_RODATA static u8 const lit_4526[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AFBF4C, &lit_4526); +COMPILER_STRIP_GATE(0x80AFBF4C, &lit_4526); #pragma pop /* 80AFBF54-80AFBF60 000148 000C+00 0/1 0/0 0/0 .rodata @4527 */ @@ -1453,7 +1466,7 @@ COMPILER_STRIP_GATE(80AFBF4C, &lit_4526); SECTION_RODATA static u8 const lit_4527[12] = { 0x00, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AFBF54, &lit_4527); +COMPILER_STRIP_GATE(0x80AFBF54, &lit_4527); #pragma pop /* 80AFBF60-80AFBF68 000154 0008+00 0/1 0/0 0/0 .rodata @4528 */ @@ -1462,7 +1475,7 @@ COMPILER_STRIP_GATE(80AFBF54, &lit_4527); SECTION_RODATA static u8 const lit_4528[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AFBF60, &lit_4528); +COMPILER_STRIP_GATE(0x80AFBF60, &lit_4528); #pragma pop /* 80AFBF68-80AFBF74 00015C 000C+00 0/1 0/0 0/0 .rodata @4529 */ @@ -1471,7 +1484,7 @@ COMPILER_STRIP_GATE(80AFBF60, &lit_4528); SECTION_RODATA static u8 const lit_4529[12] = { 0x00, 0x0B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AFBF68, &lit_4529); +COMPILER_STRIP_GATE(0x80AFBF68, &lit_4529); #pragma pop /* 80AFBF74-80AFBF7C 000168 0008+00 0/1 0/0 0/0 .rodata @4530 */ @@ -1480,7 +1493,7 @@ COMPILER_STRIP_GATE(80AFBF68, &lit_4529); SECTION_RODATA static u8 const lit_4530[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AFBF74, &lit_4530); +COMPILER_STRIP_GATE(0x80AFBF74, &lit_4530); #pragma pop /* 80AFBF7C-80AFBF88 000170 000C+00 0/1 0/0 0/0 .rodata @4531 */ @@ -1489,7 +1502,7 @@ COMPILER_STRIP_GATE(80AFBF74, &lit_4530); SECTION_RODATA static u8 const lit_4531[12] = { 0x00, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AFBF7C, &lit_4531); +COMPILER_STRIP_GATE(0x80AFBF7C, &lit_4531); #pragma pop /* 80AFBF88-80AFBF90 00017C 0008+00 0/1 0/0 0/0 .rodata @4532 */ @@ -1498,7 +1511,7 @@ COMPILER_STRIP_GATE(80AFBF7C, &lit_4531); SECTION_RODATA static u8 const lit_4532[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AFBF88, &lit_4532); +COMPILER_STRIP_GATE(0x80AFBF88, &lit_4532); #pragma pop /* 80AFBF90-80AFBF9C 000184 000C+00 0/1 0/0 0/0 .rodata @4533 */ @@ -1507,7 +1520,7 @@ COMPILER_STRIP_GATE(80AFBF88, &lit_4532); SECTION_RODATA static u8 const lit_4533[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AFBF90, &lit_4533); +COMPILER_STRIP_GATE(0x80AFBF90, &lit_4533); #pragma pop /* 80AFBF9C-80AFBFA0 000190 0004+00 0/1 0/0 0/0 .rodata @4534 */ @@ -1519,7 +1532,7 @@ SECTION_RODATA static u8 const lit_4534[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AFBF9C, &lit_4534); +COMPILER_STRIP_GATE(0x80AFBF9C, &lit_4534); #pragma pop /* 80AFBFA0-80AFBFD8 000194 0038+00 0/0 0/0 0/0 .rodata @4535 */ @@ -1531,7 +1544,7 @@ SECTION_RODATA static u8 const lit_4535[56] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AFBFA0, &lit_4535); +COMPILER_STRIP_GATE(0x80AFBFA0, &lit_4535); #pragma pop /* 80AFBFD8-80AFBFE4 0001CC 000C+00 0/1 0/0 0/0 .rodata @4539 */ @@ -1540,7 +1553,7 @@ COMPILER_STRIP_GATE(80AFBFA0, &lit_4535); SECTION_RODATA static u8 const lit_4539[12] = { 0x00, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AFBFD8, &lit_4539); +COMPILER_STRIP_GATE(0x80AFBFD8, &lit_4539); #pragma pop /* 80AFBFE4-80AFBFE8 0001D8 0004+00 0/1 0/0 0/0 .rodata @4540 */ @@ -1552,7 +1565,7 @@ SECTION_RODATA static u8 const lit_4540[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AFBFE4, &lit_4540); +COMPILER_STRIP_GATE(0x80AFBFE4, &lit_4540); #pragma pop /* 80AFBFE8-80AFBFF4 0001DC 000C+00 0/1 0/0 0/0 .rodata @4541 */ @@ -1561,7 +1574,7 @@ COMPILER_STRIP_GATE(80AFBFE4, &lit_4540); SECTION_RODATA static u8 const lit_4541[12] = { 0x00, 0x15, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80AFBFE8, &lit_4541); +COMPILER_STRIP_GATE(0x80AFBFE8, &lit_4541); #pragma pop /* 80AFBFF4-80AFC000 0001E8 000C+00 0/1 0/0 0/0 .rodata @4542 */ @@ -1570,7 +1583,7 @@ COMPILER_STRIP_GATE(80AFBFE8, &lit_4541); SECTION_RODATA static u8 const lit_4542[12] = { 0x00, 0x0F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AFBFF4, &lit_4542); +COMPILER_STRIP_GATE(0x80AFBFF4, &lit_4542); #pragma pop /* 80AFC000-80AFC008 0001F4 0008+00 0/1 0/0 0/0 .rodata @4543 */ @@ -1579,7 +1592,7 @@ COMPILER_STRIP_GATE(80AFBFF4, &lit_4542); SECTION_RODATA static u8 const lit_4543[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AFC000, &lit_4543); +COMPILER_STRIP_GATE(0x80AFC000, &lit_4543); #pragma pop /* 80AFC008-80AFC014 0001FC 000C+00 0/1 0/0 0/0 .rodata @4544 */ @@ -1588,7 +1601,7 @@ COMPILER_STRIP_GATE(80AFC000, &lit_4543); SECTION_RODATA static u8 const lit_4544[12] = { 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80AFC008, &lit_4544); +COMPILER_STRIP_GATE(0x80AFC008, &lit_4544); #pragma pop /* 80AFC014-80AFC020 000208 000C+00 0/1 0/0 0/0 .rodata @4545 */ @@ -1597,7 +1610,7 @@ COMPILER_STRIP_GATE(80AFC008, &lit_4544); SECTION_RODATA static u8 const lit_4545[12] = { 0x00, 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AFC014, &lit_4545); +COMPILER_STRIP_GATE(0x80AFC014, &lit_4545); #pragma pop /* 80AFC020-80AFC028 000214 0008+00 0/1 0/0 0/0 .rodata @4546 */ @@ -1606,7 +1619,7 @@ COMPILER_STRIP_GATE(80AFC014, &lit_4545); SECTION_RODATA static u8 const lit_4546[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AFC020, &lit_4546); +COMPILER_STRIP_GATE(0x80AFC020, &lit_4546); #pragma pop /* 80AFC028-80AFC034 00021C 000C+00 0/1 0/0 0/0 .rodata @4547 */ @@ -1615,7 +1628,7 @@ COMPILER_STRIP_GATE(80AFC020, &lit_4546); SECTION_RODATA static u8 const lit_4547[12] = { 0x00, 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AFC028, &lit_4547); +COMPILER_STRIP_GATE(0x80AFC028, &lit_4547); #pragma pop /* 80AFC034-80AFC038 000228 0004+00 0/1 0/0 0/0 .rodata @4548 */ @@ -1627,7 +1640,7 @@ SECTION_RODATA static u8 const lit_4548[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AFC034, &lit_4548); +COMPILER_STRIP_GATE(0x80AFC034, &lit_4548); #pragma pop /* 80AFC038-80AFC044 00022C 000C+00 0/1 0/0 0/0 .rodata @4549 */ @@ -1636,7 +1649,7 @@ COMPILER_STRIP_GATE(80AFC034, &lit_4548); SECTION_RODATA static u8 const lit_4549[12] = { 0x00, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80AFC038, &lit_4549); +COMPILER_STRIP_GATE(0x80AFC038, &lit_4549); #pragma pop /* 80AFC044-80AFC050 000238 000C+00 0/1 0/0 0/0 .rodata @4550 */ @@ -1645,7 +1658,7 @@ COMPILER_STRIP_GATE(80AFC038, &lit_4549); SECTION_RODATA static u8 const lit_4550[12] = { 0x00, 0x19, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AFC044, &lit_4550); +COMPILER_STRIP_GATE(0x80AFC044, &lit_4550); #pragma pop /* 80AFC050-80AFC058 000244 0008+00 0/1 0/0 0/0 .rodata @4551 */ @@ -1654,7 +1667,7 @@ COMPILER_STRIP_GATE(80AFC044, &lit_4550); SECTION_RODATA static u8 const lit_4551[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AFC050, &lit_4551); +COMPILER_STRIP_GATE(0x80AFC050, &lit_4551); #pragma pop /* 80AFC058-80AFC064 00024C 000C+00 0/1 0/0 0/0 .rodata @4552 */ @@ -1663,7 +1676,7 @@ COMPILER_STRIP_GATE(80AFC050, &lit_4551); SECTION_RODATA static u8 const lit_4552[12] = { 0x00, 0x17, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AFC058, &lit_4552); +COMPILER_STRIP_GATE(0x80AFC058, &lit_4552); #pragma pop /* 80AFC064-80AFC068 000258 0004+00 0/1 0/0 0/0 .rodata @4553 */ @@ -1675,7 +1688,7 @@ SECTION_RODATA static u8 const lit_4553[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AFC064, &lit_4553); +COMPILER_STRIP_GATE(0x80AFC064, &lit_4553); #pragma pop /* 80AFC068-80AFC074 00025C 000C+00 0/1 0/0 0/0 .rodata @4554 */ @@ -1684,7 +1697,7 @@ COMPILER_STRIP_GATE(80AFC064, &lit_4553); SECTION_RODATA static u8 const lit_4554[12] = { 0x00, 0x1A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80AFC068, &lit_4554); +COMPILER_STRIP_GATE(0x80AFC068, &lit_4554); #pragma pop /* 80AFC074-80AFC080 000268 000C+00 0/1 0/0 0/0 .rodata @4555 */ @@ -1693,7 +1706,7 @@ COMPILER_STRIP_GATE(80AFC068, &lit_4554); SECTION_RODATA static u8 const lit_4555[12] = { 0x00, 0x17, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AFC074, &lit_4555); +COMPILER_STRIP_GATE(0x80AFC074, &lit_4555); #pragma pop /* 80AFC080-80AFC088 000274 0008+00 0/1 0/0 0/0 .rodata @4556 */ @@ -1702,7 +1715,7 @@ COMPILER_STRIP_GATE(80AFC074, &lit_4555); SECTION_RODATA static u8 const lit_4556[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AFC080, &lit_4556); +COMPILER_STRIP_GATE(0x80AFC080, &lit_4556); #pragma pop /* 80AFC088-80AFC094 00027C 000C+00 0/1 0/0 0/0 .rodata @4557 */ @@ -1711,7 +1724,7 @@ COMPILER_STRIP_GATE(80AFC080, &lit_4556); SECTION_RODATA static u8 const lit_4557[12] = { 0x00, 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AFC088, &lit_4557); +COMPILER_STRIP_GATE(0x80AFC088, &lit_4557); #pragma pop /* 80AFC094-80AFC098 000288 0004+00 0/1 0/0 0/0 .rodata @4558 */ @@ -1723,7 +1736,7 @@ SECTION_RODATA static u8 const lit_4558[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AFC094, &lit_4558); +COMPILER_STRIP_GATE(0x80AFC094, &lit_4558); #pragma pop /* 80AFC098-80AFC0A4 00028C 000C+00 0/1 0/0 0/0 .rodata @4559 */ @@ -1732,7 +1745,7 @@ COMPILER_STRIP_GATE(80AFC094, &lit_4558); SECTION_RODATA static u8 const lit_4559[12] = { 0x00, 0x19, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AFC098, &lit_4559); +COMPILER_STRIP_GATE(0x80AFC098, &lit_4559); #pragma pop /* 80AFC0A4-80AFC0A8 000298 0004+00 0/1 0/0 0/0 .rodata @4560 */ @@ -1744,7 +1757,7 @@ SECTION_RODATA static u8 const lit_4560[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AFC0A4, &lit_4560); +COMPILER_STRIP_GATE(0x80AFC0A4, &lit_4560); #pragma pop /* 80AFC0A8-80AFC0B4 00029C 000C+00 0/1 0/0 0/0 .rodata @4561 */ @@ -1753,7 +1766,7 @@ COMPILER_STRIP_GATE(80AFC0A4, &lit_4560); SECTION_RODATA static u8 const lit_4561[12] = { 0x00, 0x13, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80AFC0A8, &lit_4561); +COMPILER_STRIP_GATE(0x80AFC0A8, &lit_4561); #pragma pop /* 80AFC0B4-80AFC0C0 0002A8 000C+00 0/1 0/0 0/0 .rodata @4562 */ @@ -1762,7 +1775,7 @@ COMPILER_STRIP_GATE(80AFC0A8, &lit_4561); SECTION_RODATA static u8 const lit_4562[12] = { 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AFC0B4, &lit_4562); +COMPILER_STRIP_GATE(0x80AFC0B4, &lit_4562); #pragma pop /* 80AFC0C0-80AFC0C8 0002B4 0008+00 0/1 0/0 0/0 .rodata @4563 */ @@ -1771,7 +1784,7 @@ COMPILER_STRIP_GATE(80AFC0B4, &lit_4562); SECTION_RODATA static u8 const lit_4563[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AFC0C0, &lit_4563); +COMPILER_STRIP_GATE(0x80AFC0C0, &lit_4563); #pragma pop /* 80AFC0C8-80AFC0D4 0002BC 000C+00 0/1 0/0 0/0 .rodata @4564 */ @@ -1780,7 +1793,7 @@ COMPILER_STRIP_GATE(80AFC0C0, &lit_4563); SECTION_RODATA static u8 const lit_4564[12] = { 0x00, 0x16, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80AFC0C8, &lit_4564); +COMPILER_STRIP_GATE(0x80AFC0C8, &lit_4564); #pragma pop /* 80AFC0D4-80AFC0E0 0002C8 000C+00 0/1 0/0 0/0 .rodata @4565 */ @@ -1789,7 +1802,7 @@ COMPILER_STRIP_GATE(80AFC0C8, &lit_4564); SECTION_RODATA static u8 const lit_4565[12] = { 0x00, 0x0F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AFC0D4, &lit_4565); +COMPILER_STRIP_GATE(0x80AFC0D4, &lit_4565); #pragma pop /* 80AFC0E0-80AFC0E8 0002D4 0008+00 0/1 0/0 0/0 .rodata @4566 */ @@ -1798,7 +1811,7 @@ COMPILER_STRIP_GATE(80AFC0D4, &lit_4565); SECTION_RODATA static u8 const lit_4566[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AFC0E0, &lit_4566); +COMPILER_STRIP_GATE(0x80AFC0E0, &lit_4566); #pragma pop /* 80AFC0E8-80AFC114 0002DC 002C+00 0/0 0/0 0/0 .rodata @4567 */ @@ -1809,7 +1822,7 @@ SECTION_RODATA static u8 const lit_4567[44] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AFC0E8, &lit_4567); +COMPILER_STRIP_GATE(0x80AFC0E8, &lit_4567); #pragma pop /* 80AFC114-80AFC120 000308 000C+00 0/1 0/0 0/0 .rodata @4676 */ @@ -1818,12 +1831,18 @@ COMPILER_STRIP_GATE(80AFC0E8, &lit_4567); SECTION_RODATA static u8 const lit_4676[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AFC114, &lit_4676); +COMPILER_STRIP_GATE(0x80AFC114, &lit_4676); #pragma pop /* 80AFC120-80AFC124 000314 0004+00 4/4 0/0 0/0 .rodata @4781 */ SECTION_RODATA static f32 const lit_4781 = -1.0f; -COMPILER_STRIP_GATE(80AFC120, &lit_4781); +COMPILER_STRIP_GATE(0x80AFC120, &lit_4781); + +/* 80AFC158-80AFC158 00034C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80AFC1AC = "R_SP116"; +#pragma pop /* 80AF8744-80AF8B0C 001164 03C8+00 1/0 0/0 0/0 .text wait__10daNpcThe_cFPv */ #pragma push @@ -1870,7 +1889,13 @@ asm void daNpcThe_c::waitTW(void* param_0) { SECTION_RODATA static u8 const lit_4840[8] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, }; -COMPILER_STRIP_GATE(80AFC124, &lit_4840); +COMPILER_STRIP_GATE(0x80AFC124, &lit_4840); + +/* 80AFC158-80AFC158 00034C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80AFC1B4 = "DEFAULT_GETITEM"; +#pragma pop /* 80AF8CC4-80AF912C 0016E4 0468+00 6/0 0/0 0/0 .text talk__10daNpcThe_cFPv */ #pragma push @@ -2024,6 +2049,13 @@ asm void daNpcThe_c::playExpression() { } #pragma pop +/* ############################################################################################## */ +/* 80AFC158-80AFC158 00034C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80AFC1C4 = "NO_RESPONSE"; +#pragma pop + /* 80AFA6CC-80AFADEC 0030EC 0720+00 1/1 0/0 0/0 .text doEvent__10daNpcThe_cFv */ #pragma push #pragma optimization_level 0 @@ -2037,7 +2069,7 @@ asm void daNpcThe_c::doEvent() { /* ############################################################################################## */ /* 80AFC12C-80AFC130 000320 0004+00 1/1 0/0 0/0 .rodata @5324 */ SECTION_RODATA static f32 const lit_5324 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(80AFC12C, &lit_5324); +COMPILER_STRIP_GATE(0x80AFC12C, &lit_5324); /* 80AFADEC-80AFAEC8 00380C 00DC+00 1/0 0/0 0/0 .text ctrlBtk__10daNpcThe_cFv */ #pragma push @@ -2054,7 +2086,7 @@ asm void daNpcThe_c::ctrlBtk() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5398 = -10.0f; -COMPILER_STRIP_GATE(80AFC130, &lit_5398); +COMPILER_STRIP_GATE(0x80AFC130, &lit_5398); #pragma pop /* 80AFC134-80AFC13C 000328 0008+00 0/1 0/0 0/0 .rodata @5399 */ @@ -2063,7 +2095,7 @@ COMPILER_STRIP_GATE(80AFC130, &lit_5398); SECTION_RODATA static u8 const lit_5399[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AFC134, &lit_5399); +COMPILER_STRIP_GATE(0x80AFC134, &lit_5399); #pragma pop /* 80AFC13C-80AFC144 000330 0008+00 0/1 0/0 0/0 .rodata @5400 */ @@ -2072,7 +2104,7 @@ COMPILER_STRIP_GATE(80AFC134, &lit_5399); SECTION_RODATA static u8 const lit_5400[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AFC13C, &lit_5400); +COMPILER_STRIP_GATE(0x80AFC13C, &lit_5400); #pragma pop /* 80AFC144-80AFC14C 000338 0008+00 0/1 0/0 0/0 .rodata @5401 */ @@ -2081,7 +2113,7 @@ COMPILER_STRIP_GATE(80AFC13C, &lit_5400); SECTION_RODATA static u8 const lit_5401[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80AFC144, &lit_5401); +COMPILER_STRIP_GATE(0x80AFC144, &lit_5401); #pragma pop /* 80AFAEC8-80AFB1C4 0038E8 02FC+00 1/0 0/0 0/0 .text setAttnPos__10daNpcThe_cFv */ @@ -2099,21 +2131,21 @@ asm void daNpcThe_c::setAttnPos() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5449 = -80.0f; -COMPILER_STRIP_GATE(80AFC14C, &lit_5449); +COMPILER_STRIP_GATE(0x80AFC14C, &lit_5449); #pragma pop /* 80AFC150-80AFC154 000344 0004+00 0/1 0/0 0/0 .rodata @5450 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5450 = 80.0f; -COMPILER_STRIP_GATE(80AFC150, &lit_5450); +COMPILER_STRIP_GATE(0x80AFC150, &lit_5450); #pragma pop /* 80AFC154-80AFC158 000348 0004+00 0/1 0/0 0/0 .rodata @5451 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5451 = 40.0f; -COMPILER_STRIP_GATE(80AFC154, &lit_5451); +COMPILER_STRIP_GATE(0x80AFC154, &lit_5451); #pragma pop /* 80AFB1C4-80AFB488 003BE4 02C4+00 1/1 0/0 0/0 .text lookat__10daNpcThe_cFv */ @@ -2135,7 +2167,7 @@ bool daNpcThe_c::drawDbgInfo() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80AFB490(s16 param_0) /* const */ { +extern "C" asm void func_80AFB490(void* _this, s16 param_0) /* const */ { nofralloc #include "asm/rel/d/a/npc/d_a_npc_the/d_a_npc_the/func_80AFB490.s" } @@ -2167,7 +2199,7 @@ asm void __sinit_d_a_npc_the_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80AFB49C = (void*)__sinit_d_a_npc_the_cpp; +REGISTER_CTORS(0x80AFB49C, __sinit_d_a_npc_the_cpp); #pragma pop /* 80AFB558-80AFB5A0 003F78 0048+00 5/4 0/0 0/0 .text __dt__18daNpcF_ActorMngr_cFv */ @@ -2355,20 +2387,4 @@ static asm void func_80AFBDF0() { } #pragma pop -/* 80AFC158-80AFC1D0 00034C 0078+00 9/5 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80AFC158 = "The"; -SECTION_DEAD static char const* const stringBase_80AFC15C = "The1"; -SECTION_DEAD static char const* const stringBase_80AFC161 = "The2"; -SECTION_DEAD static char const* const stringBase_80AFC166 = "yelB_TW"; -SECTION_DEAD static char const* const stringBase_80AFC16E = "TW_RESISTANCE1"; -SECTION_DEAD static char const* const stringBase_80AFC17D = "TW_RESISTANCE2"; -SECTION_DEAD static char const* const stringBase_80AFC18C = "THE_INTRODUCTION"; -SECTION_DEAD static char const* const stringBase_80AFC19D = ""; -SECTION_DEAD static char const* const stringBase_80AFC19E = "TW_RESISTANCE"; -SECTION_DEAD static char const* const stringBase_80AFC1AC = "R_SP116"; -SECTION_DEAD static char const* const stringBase_80AFC1B4 = "DEFAULT_GETITEM"; -SECTION_DEAD static char const* const stringBase_80AFC1C4 = "NO_RESPONSE"; -#pragma pop +/* 80AFC158-80AFC158 00034C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/npc/d_a_npc_theB/d_a_npc_theB.cpp b/rel/d/a/npc/d_a_npc_theB/d_a_npc_theB.cpp index 0c8074996de..28eae924a63 100644 --- a/rel/d/a/npc/d_a_npc_theB/d_a_npc_theB.cpp +++ b/rel/d/a/npc/d_a_npc_theB/d_a_npc_theB.cpp @@ -34,12 +34,12 @@ struct mDoExt_bckAnm { /* 8000D990 */ void changeBckOnly(J3DAnmTransform*); }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; +struct J3DModelData {}; + struct Z2Creature { /* 802C03C8 */ Z2Creature(); /* 802C0420 */ ~Z2Creature(); @@ -70,10 +70,10 @@ struct daStartAndGoal_c { /* 80D4DBAC */ void isStartCheck(); }; -struct J3DJoint {}; - struct J3DModel {}; +struct J3DJoint {}; + struct daNpcTheB_c { /* 80AFC76C */ daNpcTheB_c(); /* 80AFC980 */ ~daNpcTheB_c(); @@ -122,16 +122,16 @@ struct daNpcTheB_Param_c { static u8 const m[108]; }; -struct J3DAnmTextureSRTKey {}; - -struct _GXColorS10 {}; - struct J3DAnmTexPattern { /* 8032AF50 */ void getTexNo(u16, u16*) const; }; +struct J3DAnmTextureSRTKey {}; + struct J3DAnmTransformKey {}; +struct _GXColorS10 {}; + struct daNpcF_c { struct daNpcF_anmPlayData {}; @@ -629,6 +629,18 @@ extern "C" void isStartCheck__16daStartAndGoal_cFv(); // /* ############################################################################################## */ +/* 80B00FA0-80B00FA0 000234 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80B00FA0 = "PERSONAL_COMBAT_INTRO"; +SECTION_DEAD static char const* const stringBase_80B00FB6 = "PERSONAL_COMBAT_REVENGE"; +SECTION_DEAD static char const* const stringBase_80B00FCE = "ANNULATION_FIELD_RACE"; +SECTION_DEAD static char const* const stringBase_80B00FE4 = "THEB_HINT"; +SECTION_DEAD static char const* const stringBase_80B00FEE = "COACH_GUARD_GAMEOVER"; +SECTION_DEAD static char const* const stringBase_80B01003 = "Coach"; +SECTION_DEAD static char const* const stringBase_80B01009 = "TheB"; +#pragma pop + /* 80B01028-80B01034 000000 000C+00 3/3 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -977,41 +989,41 @@ SECTION_RODATA u8 const daNpcTheB_Param_c::m[108] = { 0x42, 0xB4, 0x00, 0x00, 0x44, 0x48, 0x00, 0x00, 0x44, 0x16, 0x00, 0x00, 0xC3, 0xC8, 0x00, 0x00, 0x00, 0x3C, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B00D6C, &daNpcTheB_Param_c::m); +COMPILER_STRIP_GATE(0x80B00D6C, &daNpcTheB_Param_c::m); /* 80B00DD8-80B00DDC 00006C 0004+00 0/1 0/0 0/0 .rodata @4176 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4176 = -50.0f; -COMPILER_STRIP_GATE(80B00DD8, &lit_4176); +COMPILER_STRIP_GATE(0x80B00DD8, &lit_4176); #pragma pop /* 80B00DDC-80B00DE0 000070 0004+00 0/1 0/0 0/0 .rodata @4177 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4177 = -60.0f; -COMPILER_STRIP_GATE(80B00DDC, &lit_4177); +COMPILER_STRIP_GATE(0x80B00DDC, &lit_4177); #pragma pop /* 80B00DE0-80B00DE4 000074 0004+00 0/1 0/0 0/0 .rodata @4178 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4178 = 50.0f; -COMPILER_STRIP_GATE(80B00DE0, &lit_4178); +COMPILER_STRIP_GATE(0x80B00DE0, &lit_4178); #pragma pop /* 80B00DE4-80B00DE8 000078 0004+00 0/1 0/0 0/0 .rodata @4179 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4179 = 130.0f; -COMPILER_STRIP_GATE(80B00DE4, &lit_4179); +COMPILER_STRIP_GATE(0x80B00DE4, &lit_4179); #pragma pop /* 80B00DE8-80B00DEC 00007C 0004+00 0/1 0/0 0/0 .rodata @4180 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4180 = 70.0f; -COMPILER_STRIP_GATE(80B00DE8, &lit_4180); +COMPILER_STRIP_GATE(0x80B00DE8, &lit_4180); #pragma pop /* 80AFCB44-80AFCD98 0004C4 0254+00 1/1 0/0 0/0 .text create__11daNpcTheB_cFv */ @@ -1027,7 +1039,7 @@ asm void daNpcTheB_c::create() { /* ############################################################################################## */ /* 80B00DEC-80B00DF0 000080 0004+00 4/4 0/0 0/0 .rodata @4247 */ SECTION_RODATA static f32 const lit_4247 = 1.0f; -COMPILER_STRIP_GATE(80B00DEC, &lit_4247); +COMPILER_STRIP_GATE(0x80B00DEC, &lit_4247); /* 80B00DF0-80B00DF4 000084 0004+00 7/11 0/0 0/0 .rodata @4248 */ SECTION_RODATA static u8 const lit_4248[4] = { @@ -1036,7 +1048,7 @@ SECTION_RODATA static u8 const lit_4248[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B00DF0, &lit_4248); +COMPILER_STRIP_GATE(0x80B00DF0, &lit_4248); /* 80AFCD98-80AFD040 000718 02A8+00 1/1 0/0 0/0 .text CreateHeap__11daNpcTheB_cFv */ #pragma push @@ -1183,7 +1195,7 @@ asm void daNpcTheB_c::Draw() { SECTION_RODATA static u8 const lit_4298[12] = { 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x0A, }; -COMPILER_STRIP_GATE(80B00DF4, &lit_4298); +COMPILER_STRIP_GATE(0x80B00DF4, &lit_4298); /* 80AFD2A8-80AFD49C 000C28 01F4+00 1/1 0/0 0/0 .text * ctrlJoint__11daNpcTheB_cFP8J3DJointP8J3DModel */ @@ -1224,7 +1236,7 @@ SECTION_RODATA static u8 const lit_4396[24] = { 0x40, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B00E00, &lit_4396); +COMPILER_STRIP_GATE(0x80B00E00, &lit_4396); /* 80AFD508-80AFD5F0 000E88 00E8+00 0/0 0/0 2/2 .text getHandPos1__11daNpcTheB_cFi */ #pragma push @@ -1242,7 +1254,7 @@ SECTION_RODATA static u8 const lit_4424[24] = { 0x41, 0x20, 0x00, 0x00, 0xC0, 0x80, 0x00, 0x00, 0xC0, 0x90, 0x00, 0x00, 0x41, 0x20, 0x00, 0x00, 0xC0, 0x80, 0x00, 0x00, 0x40, 0x90, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B00E18, &lit_4424); +COMPILER_STRIP_GATE(0x80B00E18, &lit_4424); /* 80AFD5F0-80AFD6D8 000F70 00E8+00 0/0 0/0 2/2 .text getHandPos2__11daNpcTheB_cFi */ #pragma push @@ -1267,7 +1279,13 @@ asm void daNpcTheB_c::setHintEvent(s32 param_0, u16 param_1, int param_2) { /* ############################################################################################## */ /* 80B00E30-80B00E34 0000C4 0004+00 1/1 0/0 0/0 .rodata @4523 */ SECTION_RODATA static f32 const lit_4523 = 5.0f; -COMPILER_STRIP_GATE(80B00E30, &lit_4523); +COMPILER_STRIP_GATE(0x80B00E30, &lit_4523); + +/* 80B00FA0-80B00FA0 000234 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80B0100E = "F_SP121"; +#pragma pop /* 80AFD6F0-80AFD938 001070 0248+00 2/1 0/0 0/0 .text main__11daNpcTheB_cFv */ #pragma push @@ -1292,7 +1310,7 @@ asm void daNpcTheB_c::setParam() { /* ############################################################################################## */ /* 80B00E34-80B00E38 0000C8 0004+00 1/1 0/0 0/0 .rodata @4581 */ SECTION_RODATA static f32 const lit_4581 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(80B00E34, &lit_4581); +COMPILER_STRIP_GATE(0x80B00E34, &lit_4581); /* 80AFDAA4-80AFDB70 001424 00CC+00 1/0 0/0 0/0 .text ctrlBtk__11daNpcTheB_cFv */ #pragma push @@ -1309,7 +1327,7 @@ asm void daNpcTheB_c::ctrlBtk() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4673 = -18.0f; -COMPILER_STRIP_GATE(80B00E38, &lit_4673); +COMPILER_STRIP_GATE(0x80B00E38, &lit_4673); #pragma pop /* 80B00E3C-80B00E44 0000D0 0004+04 0/1 0/0 0/0 .rodata @4674 */ @@ -1320,7 +1338,7 @@ SECTION_RODATA static f32 const lit_4674[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80B00E3C, &lit_4674); +COMPILER_STRIP_GATE(0x80B00E3C, &lit_4674); #pragma pop /* 80B00E44-80B00E4C 0000D8 0008+00 0/1 0/0 0/0 .rodata @4675 */ @@ -1329,7 +1347,7 @@ COMPILER_STRIP_GATE(80B00E3C, &lit_4674); SECTION_RODATA static u8 const lit_4675[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B00E44, &lit_4675); +COMPILER_STRIP_GATE(0x80B00E44, &lit_4675); #pragma pop /* 80B00E4C-80B00E54 0000E0 0008+00 0/1 0/0 0/0 .rodata @4676 */ @@ -1338,7 +1356,7 @@ COMPILER_STRIP_GATE(80B00E44, &lit_4675); SECTION_RODATA static u8 const lit_4676[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B00E4C, &lit_4676); +COMPILER_STRIP_GATE(0x80B00E4C, &lit_4676); #pragma pop /* 80B00E54-80B00E5C 0000E8 0008+00 0/1 0/0 0/0 .rodata @4677 */ @@ -1347,7 +1365,7 @@ COMPILER_STRIP_GATE(80B00E4C, &lit_4676); SECTION_RODATA static u8 const lit_4677[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B00E54, &lit_4677); +COMPILER_STRIP_GATE(0x80B00E54, &lit_4677); #pragma pop /* 80AFDB70-80AFDEC0 0014F0 0350+00 1/0 0/0 0/0 .text setAttnPos__11daNpcTheB_cFv */ @@ -1397,6 +1415,13 @@ bool daNpcTheB_c::drawDbgInfo() { return false; } +/* ############################################################################################## */ +/* 80B00FA0-80B00FA0 000234 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80B01016 = "F_SP123"; +#pragma pop + /* 80AFE3A0-80AFE574 001D20 01D4+00 1/1 0/0 0/0 .text reset__11daNpcTheB_cFv */ #pragma push #pragma optimization_level 0 @@ -1414,7 +1439,7 @@ asm void daNpcTheB_c::reset() { SECTION_RODATA static u8 const lit_4791[12] = { 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80B00E5C, &lit_4791); +COMPILER_STRIP_GATE(0x80B00E5C, &lit_4791); #pragma pop /* 80B00E68-80B00E6C 0000FC 0004+00 0/1 0/0 0/0 .rodata @4792 */ @@ -1426,7 +1451,7 @@ SECTION_RODATA static u8 const lit_4792[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B00E68, &lit_4792); +COMPILER_STRIP_GATE(0x80B00E68, &lit_4792); #pragma pop /* 80B00E6C-80B00E78 000100 000C+00 0/1 0/0 0/0 .rodata @4793 */ @@ -1435,7 +1460,7 @@ COMPILER_STRIP_GATE(80B00E68, &lit_4792); SECTION_RODATA static u8 const lit_4793[12] = { 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80B00E6C, &lit_4793); +COMPILER_STRIP_GATE(0x80B00E6C, &lit_4793); #pragma pop /* 80B00E78-80B00E84 00010C 000C+00 0/1 0/0 0/0 .rodata @4794 */ @@ -1444,7 +1469,7 @@ COMPILER_STRIP_GATE(80B00E6C, &lit_4793); SECTION_RODATA static u8 const lit_4794[12] = { 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B00E78, &lit_4794); +COMPILER_STRIP_GATE(0x80B00E78, &lit_4794); #pragma pop /* 80B00E84-80B00E8C 000118 0008+00 0/1 0/0 0/0 .rodata @4795 */ @@ -1453,7 +1478,7 @@ COMPILER_STRIP_GATE(80B00E78, &lit_4794); SECTION_RODATA static u8 const lit_4795[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B00E84, &lit_4795); +COMPILER_STRIP_GATE(0x80B00E84, &lit_4795); #pragma pop /* 80B00E8C-80B00E98 000120 000C+00 0/1 0/0 0/0 .rodata @4796 */ @@ -1462,7 +1487,7 @@ COMPILER_STRIP_GATE(80B00E84, &lit_4795); SECTION_RODATA static u8 const lit_4796[12] = { 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80B00E8C, &lit_4796); +COMPILER_STRIP_GATE(0x80B00E8C, &lit_4796); #pragma pop /* 80B00E98-80B00EA4 00012C 000C+00 0/1 0/0 0/0 .rodata @4797 */ @@ -1471,7 +1496,7 @@ COMPILER_STRIP_GATE(80B00E8C, &lit_4796); SECTION_RODATA static u8 const lit_4797[12] = { 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B00E98, &lit_4797); +COMPILER_STRIP_GATE(0x80B00E98, &lit_4797); #pragma pop /* 80B00EA4-80B00EAC 000138 0008+00 0/1 0/0 0/0 .rodata @4798 */ @@ -1480,7 +1505,7 @@ COMPILER_STRIP_GATE(80B00E98, &lit_4797); SECTION_RODATA static u8 const lit_4798[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B00EA4, &lit_4798); +COMPILER_STRIP_GATE(0x80B00EA4, &lit_4798); #pragma pop /* 80B00EAC-80B00EB8 000140 000C+00 0/1 0/0 0/0 .rodata @4799 */ @@ -1489,7 +1514,7 @@ COMPILER_STRIP_GATE(80B00EA4, &lit_4798); SECTION_RODATA static u8 const lit_4799[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B00EAC, &lit_4799); +COMPILER_STRIP_GATE(0x80B00EAC, &lit_4799); #pragma pop /* 80B00EB8-80B00EBC 00014C 0004+00 0/1 0/0 0/0 .rodata @4800 */ @@ -1501,7 +1526,7 @@ SECTION_RODATA static u8 const lit_4800[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B00EB8, &lit_4800); +COMPILER_STRIP_GATE(0x80B00EB8, &lit_4800); #pragma pop /* 80B00EBC-80B00ECC 000150 0010+00 0/1 0/0 0/0 .rodata @4801 */ @@ -1510,7 +1535,7 @@ COMPILER_STRIP_GATE(80B00EB8, &lit_4800); SECTION_RODATA static u8 const lit_4801[16] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B00EBC, &lit_4801); +COMPILER_STRIP_GATE(0x80B00EBC, &lit_4801); #pragma pop /* 80AFE574-80AFE704 001EF4 0190+00 1/1 0/0 0/0 .text playExpression__11daNpcTheB_cFv */ @@ -1530,7 +1555,7 @@ asm void daNpcTheB_c::playExpression() { SECTION_RODATA static u8 const lit_4814[12] = { 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B00ECC, &lit_4814); +COMPILER_STRIP_GATE(0x80B00ECC, &lit_4814); #pragma pop /* 80B00ED8-80B00EDC 00016C 0004+00 0/1 0/0 0/0 .rodata @4815 */ @@ -1542,7 +1567,7 @@ SECTION_RODATA static u8 const lit_4815[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B00ED8, &lit_4815); +COMPILER_STRIP_GATE(0x80B00ED8, &lit_4815); #pragma pop /* 80B00EDC-80B00EE8 000170 000C+00 0/1 0/0 0/0 .rodata @4816 */ @@ -1551,7 +1576,7 @@ COMPILER_STRIP_GATE(80B00ED8, &lit_4815); SECTION_RODATA static u8 const lit_4816[12] = { 0x00, 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B00EDC, &lit_4816); +COMPILER_STRIP_GATE(0x80B00EDC, &lit_4816); #pragma pop /* 80B00EE8-80B00EEC 00017C 0004+00 0/1 0/0 0/0 .rodata @4817 */ @@ -1563,7 +1588,7 @@ SECTION_RODATA static u8 const lit_4817[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B00EE8, &lit_4817); +COMPILER_STRIP_GATE(0x80B00EE8, &lit_4817); #pragma pop /* 80B00EEC-80B00EF8 000180 000C+00 0/1 0/0 0/0 .rodata @4818 */ @@ -1572,7 +1597,7 @@ COMPILER_STRIP_GATE(80B00EE8, &lit_4817); SECTION_RODATA static u8 const lit_4818[12] = { 0x00, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B00EEC, &lit_4818); +COMPILER_STRIP_GATE(0x80B00EEC, &lit_4818); #pragma pop /* 80B00EF8-80B00EFC 00018C 0004+00 0/1 0/0 0/0 .rodata @4819 */ @@ -1584,7 +1609,7 @@ SECTION_RODATA static u8 const lit_4819[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B00EF8, &lit_4819); +COMPILER_STRIP_GATE(0x80B00EF8, &lit_4819); #pragma pop /* 80B00EFC-80B00F08 000190 000C+00 0/1 0/0 0/0 .rodata @4820 */ @@ -1593,7 +1618,7 @@ COMPILER_STRIP_GATE(80B00EF8, &lit_4819); SECTION_RODATA static u8 const lit_4820[12] = { 0x00, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80B00EFC, &lit_4820); +COMPILER_STRIP_GATE(0x80B00EFC, &lit_4820); #pragma pop /* 80B00F08-80B00F14 00019C 000C+00 0/1 0/0 0/0 .rodata @4821 */ @@ -1602,7 +1627,7 @@ COMPILER_STRIP_GATE(80B00EFC, &lit_4820); SECTION_RODATA static u8 const lit_4821[12] = { 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B00F08, &lit_4821); +COMPILER_STRIP_GATE(0x80B00F08, &lit_4821); #pragma pop /* 80B00F14-80B00F1C 0001A8 0008+00 0/1 0/0 0/0 .rodata @4822 */ @@ -1611,7 +1636,7 @@ COMPILER_STRIP_GATE(80B00F08, &lit_4821); SECTION_RODATA static u8 const lit_4822[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B00F14, &lit_4822); +COMPILER_STRIP_GATE(0x80B00F14, &lit_4822); #pragma pop /* 80B00F1C-80B00F28 0001B0 000C+00 0/1 0/0 0/0 .rodata @4823 */ @@ -1620,7 +1645,7 @@ COMPILER_STRIP_GATE(80B00F14, &lit_4822); SECTION_RODATA static u8 const lit_4823[12] = { 0x00, 0x0B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80B00F1C, &lit_4823); +COMPILER_STRIP_GATE(0x80B00F1C, &lit_4823); #pragma pop /* 80B00F28-80B00F34 0001BC 000C+00 0/1 0/0 0/0 .rodata @4824 */ @@ -1629,7 +1654,7 @@ COMPILER_STRIP_GATE(80B00F1C, &lit_4823); SECTION_RODATA static u8 const lit_4824[12] = { 0x00, 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B00F28, &lit_4824); +COMPILER_STRIP_GATE(0x80B00F28, &lit_4824); #pragma pop /* 80B00F34-80B00F3C 0001C8 0008+00 0/1 0/0 0/0 .rodata @4825 */ @@ -1638,7 +1663,7 @@ COMPILER_STRIP_GATE(80B00F28, &lit_4824); SECTION_RODATA static u8 const lit_4825[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B00F34, &lit_4825); +COMPILER_STRIP_GATE(0x80B00F34, &lit_4825); #pragma pop /* 80B00F3C-80B00F48 0001D0 000C+00 0/1 0/0 0/0 .rodata @4826 */ @@ -1647,7 +1672,7 @@ COMPILER_STRIP_GATE(80B00F34, &lit_4825); SECTION_RODATA static u8 const lit_4826[12] = { 0x00, 0x0D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80B00F3C, &lit_4826); +COMPILER_STRIP_GATE(0x80B00F3C, &lit_4826); #pragma pop /* 80B00F48-80B00F54 0001DC 000C+00 0/1 0/0 0/0 .rodata @4827 */ @@ -1656,7 +1681,7 @@ COMPILER_STRIP_GATE(80B00F3C, &lit_4826); SECTION_RODATA static u8 const lit_4827[12] = { 0x00, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B00F48, &lit_4827); +COMPILER_STRIP_GATE(0x80B00F48, &lit_4827); #pragma pop /* 80B00F54-80B00F5C 0001E8 0008+00 0/1 0/0 0/0 .rodata @4828 */ @@ -1665,7 +1690,7 @@ COMPILER_STRIP_GATE(80B00F48, &lit_4827); SECTION_RODATA static u8 const lit_4828[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B00F54, &lit_4828); +COMPILER_STRIP_GATE(0x80B00F54, &lit_4828); #pragma pop /* 80AFE704-80AFE920 002084 021C+00 1/1 0/0 0/0 .text playMotion__11daNpcTheB_cFv */ @@ -1706,7 +1731,7 @@ SECTION_RODATA static u8 const lit_4829[24] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B00F5C, &lit_4829); +COMPILER_STRIP_GATE(0x80B00F5C, &lit_4829); #pragma pop /* 80B00F74-80B00F80 000208 000C+00 0/1 0/0 0/0 .rodata @4932 */ @@ -1715,21 +1740,21 @@ COMPILER_STRIP_GATE(80B00F5C, &lit_4829); SECTION_RODATA static u8 const lit_4932[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B00F74, &lit_4932); +COMPILER_STRIP_GATE(0x80B00F74, &lit_4932); #pragma pop /* 80B00F80-80B00F84 000214 0004+00 0/1 0/0 0/0 .rodata @4972 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4972 = -80.0f; -COMPILER_STRIP_GATE(80B00F80, &lit_4972); +COMPILER_STRIP_GATE(0x80B00F80, &lit_4972); #pragma pop /* 80B00F84-80B00F88 000218 0004+00 0/1 0/0 0/0 .rodata @4973 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4973 = 80.0f; -COMPILER_STRIP_GATE(80B00F84, &lit_4973); +COMPILER_STRIP_GATE(0x80B00F84, &lit_4973); #pragma pop /* 80AFED24-80AFEECC 0026A4 01A8+00 1/1 0/0 0/0 .text lookat__11daNpcTheB_cFv */ @@ -1745,20 +1770,20 @@ asm void daNpcTheB_c::lookat() { /* ############################################################################################## */ /* 80B00F88-80B00F8C 00021C 0004+00 4/5 0/0 0/0 .rodata @5126 */ SECTION_RODATA static f32 const lit_5126 = -1.0f; -COMPILER_STRIP_GATE(80B00F88, &lit_5126); +COMPILER_STRIP_GATE(0x80B00F88, &lit_5126); /* 80B00F8C-80B00F90 000220 0004+00 0/1 0/0 0/0 .rodata @5127 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5127 = 3.0f; -COMPILER_STRIP_GATE(80B00F8C, &lit_5127); +COMPILER_STRIP_GATE(0x80B00F8C, &lit_5127); #pragma pop /* 80B00F90-80B00F94 000224 0004+00 0/2 0/0 0/0 .rodata @5128 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5128 = 20.0f; -COMPILER_STRIP_GATE(80B00F90, &lit_5128); +COMPILER_STRIP_GATE(0x80B00F90, &lit_5128); #pragma pop /* 80AFEECC-80AFF45C 00284C 0590+00 1/0 0/0 0/0 .text wait__11daNpcTheB_cFPv */ @@ -1812,6 +1837,14 @@ asm void daNpcTheB_c::EvCut_PersonalCombatIntro(int param_0) { } #pragma pop +/* ############################################################################################## */ +/* 80B00FA0-80B00FA0 000234 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80B0101E = "pos"; +SECTION_DEAD static char const* const stringBase_80B01022 = "angle"; +#pragma pop + /* 80AFF888-80AFFBB4 003208 032C+00 1/0 0/0 0/0 .text EvCut_PersonalCombatRevenge__11daNpcTheB_cFi */ #pragma push @@ -1828,14 +1861,14 @@ asm void daNpcTheB_c::EvCut_PersonalCombatRevenge(int param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5332 = -230.0f; -COMPILER_STRIP_GATE(80B00F94, &lit_5332); +COMPILER_STRIP_GATE(0x80B00F94, &lit_5332); #pragma pop /* 80B00F98-80B00F9C 00022C 0004+00 0/1 0/0 0/0 .rodata @5333 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5333 = -1000.0f; -COMPILER_STRIP_GATE(80B00F98, &lit_5333); +COMPILER_STRIP_GATE(0x80B00F98, &lit_5333); #pragma pop /* 80AFFBB4-80AFFEF4 003534 0340+00 2/1 0/0 0/0 .text EvCut_PersonalCombatAfter__11daNpcTheB_cFv @@ -1873,7 +1906,7 @@ asm void daNpcTheB_c::EvCut_TheBHint(int param_0) { /* ############################################################################################## */ /* 80B00F9C-80B00FA0 000230 0004+00 1/1 0/0 0/0 .rodata @5423 */ SECTION_RODATA static f32 const lit_5423 = -30000.0f; -COMPILER_STRIP_GATE(80B00F9C, &lit_5423); +COMPILER_STRIP_GATE(0x80B00F9C, &lit_5423); /* 80B00204-80B00374 003B84 0170+00 1/0 0/0 0/0 .text EvCut_CoachGuardGameOver__11daNpcTheB_cFi */ #pragma push @@ -2111,7 +2144,7 @@ asm void __sinit_d_a_npc_theB_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80B00C14 = (void*)__sinit_d_a_npc_theB_cpp; +REGISTER_CTORS(0x80B00C14, __sinit_d_a_npc_theB_cpp); #pragma pop /* 80B00D00-80B00D48 004680 0048+00 2/1 0/0 0/0 .text __dt__17daNpcTheB_Param_cFv */ @@ -2144,19 +2177,4 @@ static asm void func_80B00D50() { } #pragma pop -/* 80B00FA0-80B01028 000234 0088+00 7/4 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80B00FA0 = "PERSONAL_COMBAT_INTRO"; -SECTION_DEAD static char const* const stringBase_80B00FB6 = "PERSONAL_COMBAT_REVENGE"; -SECTION_DEAD static char const* const stringBase_80B00FCE = "ANNULATION_FIELD_RACE"; -SECTION_DEAD static char const* const stringBase_80B00FE4 = "THEB_HINT"; -SECTION_DEAD static char const* const stringBase_80B00FEE = "COACH_GUARD_GAMEOVER"; -SECTION_DEAD static char const* const stringBase_80B01003 = "Coach"; -SECTION_DEAD static char const* const stringBase_80B01009 = "TheB"; -SECTION_DEAD static char const* const stringBase_80B0100E = "F_SP121"; -SECTION_DEAD static char const* const stringBase_80B01016 = "F_SP123"; -SECTION_DEAD static char const* const stringBase_80B0101E = "pos"; -SECTION_DEAD static char const* const stringBase_80B01022 = "angle"; -#pragma pop +/* 80B00FA0-80B00FA0 000234 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/npc/d_a_npc_tk/d_a_npc_tk.cpp b/rel/d/a/npc/d_a_npc_tk/d_a_npc_tk.cpp index 82b63a9854c..ee8706c31d0 100644 --- a/rel/d/a/npc/d_a_npc_tk/d_a_npc_tk.cpp +++ b/rel/d/a/npc/d_a_npc_tk/d_a_npc_tk.cpp @@ -37,19 +37,19 @@ struct mDoMtx_stack_c { static u8 now[48]; }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; +struct J3DAnmTransform {}; + +struct J3DModelData {}; + struct Z2Creature { /* 802C03C8 */ Z2Creature(); /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -72,10 +72,10 @@ struct daNpc_Hanjo_c { /* 809F9C98 */ void getType(); }; -struct J3DJoint {}; - struct J3DModel {}; +struct J3DJoint {}; + struct daNPC_TK_c { /* 80B01498 */ void setBck(int, u8, f32, f32); /* 80B0153C */ void checkBck(int); @@ -607,77 +607,87 @@ extern "C" void __register_global_object(); /* ############################################################################################## */ /* 80B0C1C4-80B0C1C8 000000 0004+00 36/36 0/0 0/0 .rodata @3999 */ SECTION_RODATA static f32 const lit_3999 = 1.0f; -COMPILER_STRIP_GATE(80B0C1C4, &lit_3999); +COMPILER_STRIP_GATE(0x80B0C1C4, &lit_3999); /* 80B0C1C8-80B0C1CC 000004 0004+00 0/1 0/0 0/0 .rodata @4000 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4000 = 19.0f; -COMPILER_STRIP_GATE(80B0C1C8, &lit_4000); +COMPILER_STRIP_GATE(0x80B0C1C8, &lit_4000); #pragma pop /* 80B0C1CC-80B0C1D0 000008 0004+00 0/1 0/0 0/0 .rodata @4001 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4001 = 38.0f; -COMPILER_STRIP_GATE(80B0C1CC, &lit_4001); +COMPILER_STRIP_GATE(0x80B0C1CC, &lit_4001); #pragma pop /* 80B0C1D0-80B0C1D4 00000C 0004+00 0/1 0/0 0/0 .rodata @4002 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4002 = 91.0f; -COMPILER_STRIP_GATE(80B0C1D0, &lit_4002); +COMPILER_STRIP_GATE(0x80B0C1D0, &lit_4002); #pragma pop /* 80B0C1D4-80B0C1D8 000010 0004+00 0/1 0/0 0/0 .rodata @4003 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4003 = 90.0f; -COMPILER_STRIP_GATE(80B0C1D4, &lit_4003); +COMPILER_STRIP_GATE(0x80B0C1D4, &lit_4003); #pragma pop /* 80B0C1D8-80B0C1DC 000014 0004+00 2/12 0/0 0/0 .rodata @4004 */ SECTION_RODATA static f32 const lit_4004 = 30.0f; -COMPILER_STRIP_GATE(80B0C1D8, &lit_4004); +COMPILER_STRIP_GATE(0x80B0C1D8, &lit_4004); /* 80B0C1DC-80B0C1E0 000018 0004+00 1/9 0/0 0/0 .rodata @4005 */ SECTION_RODATA static f32 const lit_4005 = 20.0f; -COMPILER_STRIP_GATE(80B0C1DC, &lit_4005); +COMPILER_STRIP_GATE(0x80B0C1DC, &lit_4005); /* 80B0C1E0-80B0C1E4 00001C 0004+00 0/11 0/0 0/0 .rodata @4006 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4006 = 50.0f; -COMPILER_STRIP_GATE(80B0C1E0, &lit_4006); +COMPILER_STRIP_GATE(0x80B0C1E0, &lit_4006); #pragma pop /* 80B0C1E4-80B0C1E8 000020 0004+00 0/1 0/0 0/0 .rodata @4007 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4007 = 15.0f; -COMPILER_STRIP_GATE(80B0C1E4, &lit_4007); +COMPILER_STRIP_GATE(0x80B0C1E4, &lit_4007); #pragma pop /* 80B0C1E8-80B0C1EC 000024 0004+00 0/1 0/0 0/0 .rodata @4008 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4008 = 256.0f; -COMPILER_STRIP_GATE(80B0C1E8, &lit_4008); +COMPILER_STRIP_GATE(0x80B0C1E8, &lit_4008); #pragma pop /* 80B0C1EC-80B0C1F0 000028 0004+00 0/6 0/0 0/0 .rodata @4009 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4009 = 700.0f; -COMPILER_STRIP_GATE(80B0C1EC, &lit_4009); +COMPILER_STRIP_GATE(0x80B0C1EC, &lit_4009); #pragma pop /* 80B0C1F0-80B0C1F4 00002C 0004+00 0/2 0/0 0/0 .rodata @4010 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4010 = 4096.0f; -COMPILER_STRIP_GATE(80B0C1F0, &lit_4010); +COMPILER_STRIP_GATE(0x80B0C1F0, &lit_4010); +#pragma pop + +/* 80B0C3A0-80B0C3A0 0001DC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80B0C3A0 = "Npc_tk"; +SECTION_DEAD static char const* const stringBase_80B0C3A7 = "Wait"; +SECTION_DEAD static char const* const stringBase_80B0C3AC = "Circle"; +SECTION_DEAD static char const* const stringBase_80B0C3B3 = "Nearly"; +SECTION_DEAD static char const* const stringBase_80B0C3BA = "Land"; #pragma pop /* 80B0C3F4-80B0C404 -00001 0010+00 1/1 0/0 0/0 .data action_table$4814 */ @@ -842,11 +852,11 @@ SECTION_RODATA static u8 const lit_4024[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B0C1F4, &lit_4024); +COMPILER_STRIP_GATE(0x80B0C1F4, &lit_4024); /* 80B0C1F8-80B0C1FC 000034 0004+00 2/6 0/0 0/0 .rodata @4025 */ SECTION_RODATA static f32 const lit_4025 = -1.0f; -COMPILER_STRIP_GATE(80B0C1F8, &lit_4025); +COMPILER_STRIP_GATE(0x80B0C1F8, &lit_4025); /* 80B01498-80B0153C 000178 00A4+00 14/14 0/0 0/0 .text setBck__10daNPC_TK_cFiUcff */ #pragma push @@ -873,14 +883,14 @@ asm void daNPC_TK_c::checkBck(int param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4055 = 100.0f; -COMPILER_STRIP_GATE(80B0C1FC, &lit_4055); +COMPILER_STRIP_GATE(0x80B0C1FC, &lit_4055); #pragma pop /* 80B0C200-80B0C204 00003C 0004+00 0/6 0/0 0/0 .rodata @4056 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4056 = 400.0f; -COMPILER_STRIP_GATE(80B0C200, &lit_4056); +COMPILER_STRIP_GATE(0x80B0C200, &lit_4056); #pragma pop /* 80B01598-80B01678 000278 00E0+00 1/1 0/0 0/0 .text draw__10daNPC_TK_cFv */ @@ -918,14 +928,14 @@ static asm void daNPC_TK_Draw(daNPC_TK_c* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4107 = -1000000000.0f; -COMPILER_STRIP_GATE(80B0C204, &lit_4107); +COMPILER_STRIP_GATE(0x80B0C204, &lit_4107); #pragma pop /* 80B0C208-80B0C20C 000044 0004+00 0/4 0/0 0/0 .rodata @4108 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4108 = 300.0f; -COMPILER_STRIP_GATE(80B0C208, &lit_4108); +COMPILER_STRIP_GATE(0x80B0C208, &lit_4108); #pragma pop /* 80B016D4-80B01878 0003B4 01A4+00 1/1 0/0 0/0 .text checkBeforeBg__10daNPC_TK_cFv */ @@ -955,7 +965,7 @@ asm void daNPC_TK_c::setActionMode(int param_0) { SECTION_RODATA static u8 const lit_4214[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B0C20C, &lit_4214); +COMPILER_STRIP_GATE(0x80B0C20C, &lit_4214); #pragma pop /* 80B0C214-80B0C21C 000050 0008+00 0/11 0/0 0/0 .rodata @4215 */ @@ -964,7 +974,7 @@ COMPILER_STRIP_GATE(80B0C20C, &lit_4214); SECTION_RODATA static u8 const lit_4215[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B0C214, &lit_4215); +COMPILER_STRIP_GATE(0x80B0C214, &lit_4215); #pragma pop /* 80B0C21C-80B0C224 000058 0008+00 0/11 0/0 0/0 .rodata @4216 */ @@ -973,14 +983,14 @@ COMPILER_STRIP_GATE(80B0C214, &lit_4215); SECTION_RODATA static u8 const lit_4216[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B0C21C, &lit_4216); +COMPILER_STRIP_GATE(0x80B0C21C, &lit_4216); #pragma pop /* 80B0C224-80B0C228 000060 0004+00 0/1 0/0 0/0 .rodata @4217 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4217 = 0x2EAFEBFF; -COMPILER_STRIP_GATE(80B0C224, &lit_4217); +COMPILER_STRIP_GATE(0x80B0C224, &lit_4217); #pragma pop /* 80B018F4-80B01C84 0005D4 0390+00 1/1 0/0 0/0 .text @@ -1000,12 +1010,12 @@ asm void daNPC_TK_c::setAddCalcSpeedXZ(cXyz& param_0, cXyz const& param_1, f32 p #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4230 = 8.0f; -COMPILER_STRIP_GATE(80B0C228, &lit_4230); +COMPILER_STRIP_GATE(0x80B0C228, &lit_4230); #pragma pop /* 80B0C22C-80B0C230 000068 0004+00 1/18 0/0 0/0 .rodata @4231 */ SECTION_RODATA static f32 const lit_4231 = 3.0f; -COMPILER_STRIP_GATE(80B0C22C, &lit_4231); +COMPILER_STRIP_GATE(0x80B0C22C, &lit_4231); /* 80B01C84-80B01D84 000964 0100+00 2/2 0/0 0/0 .text chaseTargetPos__10daNPC_TK_cF4cXyzffs */ #pragma push @@ -1042,21 +1052,21 @@ asm void daNPC_TK_c::setMasterShoulder(cXyz* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4279 = 2.0f; -COMPILER_STRIP_GATE(80B0C230, &lit_4279); +COMPILER_STRIP_GATE(0x80B0C230, &lit_4279); #pragma pop /* 80B0C234-80B0C238 000070 0004+00 0/2 0/0 0/0 .rodata @4280 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4280 = -20.0f; -COMPILER_STRIP_GATE(80B0C234, &lit_4280); +COMPILER_STRIP_GATE(0x80B0C234, &lit_4280); #pragma pop /* 80B0C238-80B0C23C 000074 0004+00 0/11 0/0 0/0 .rodata @4281 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4281 = 10.0f; -COMPILER_STRIP_GATE(80B0C238, &lit_4281); +COMPILER_STRIP_GATE(0x80B0C238, &lit_4281); #pragma pop /* 80B01E48-80B01EF4 000B28 00AC+00 3/3 0/0 0/0 .text setAwayAction__10daNPC_TK_cFi */ @@ -1074,14 +1084,14 @@ asm void daNPC_TK_c::setAwayAction(int param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4314 = 5.0f; -COMPILER_STRIP_GATE(80B0C23C, &lit_4314); +COMPILER_STRIP_GATE(0x80B0C23C, &lit_4314); #pragma pop /* 80B0C240-80B0C244 00007C 0004+00 0/2 0/0 0/0 .rodata @4315 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4315 = 7.0f; -COMPILER_STRIP_GATE(80B0C240, &lit_4315); +COMPILER_STRIP_GATE(0x80B0C240, &lit_4315); #pragma pop /* 80B01EF4-80B0207C 000BD4 0188+00 1/1 0/0 0/0 .text setFlySE__10daNPC_TK_cFv */ @@ -1239,27 +1249,27 @@ static asm void s_hanjo(void* param_0, void* param_1) { /* ############################################################################################## */ /* 80B0C244-80B0C248 000080 0004+00 1/7 0/0 0/0 .rodata @4459 */ SECTION_RODATA static f32 const lit_4459 = 500.0f; -COMPILER_STRIP_GATE(80B0C244, &lit_4459); +COMPILER_STRIP_GATE(0x80B0C244, &lit_4459); /* 80B0C248-80B0C24C 000084 0004+00 0/12 0/0 0/0 .rodata @4460 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4460 = 200.0f; -COMPILER_STRIP_GATE(80B0C248, &lit_4460); +COMPILER_STRIP_GATE(0x80B0C248, &lit_4460); #pragma pop /* 80B0C24C-80B0C250 000088 0004+00 0/1 0/0 0/0 .rodata @4461 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4461 = 27.0f; -COMPILER_STRIP_GATE(80B0C24C, &lit_4461); +COMPILER_STRIP_GATE(0x80B0C24C, &lit_4461); #pragma pop /* 80B0C250-80B0C254 00008C 0004+00 0/3 0/0 0/0 .rodata @4462 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4462 = 2000.0f; -COMPILER_STRIP_GATE(80B0C250, &lit_4462); +COMPILER_STRIP_GATE(0x80B0C250, &lit_4462); #pragma pop /* 80B02254-80B026F8 000F34 04A4+00 1/1 0/0 0/0 .text executeFly__10daNPC_TK_cFv */ @@ -1277,49 +1287,49 @@ asm void daNPC_TK_c::executeFly() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4518 = 3000.0f; -COMPILER_STRIP_GATE(80B0C254, &lit_4518); +COMPILER_STRIP_GATE(0x80B0C254, &lit_4518); #pragma pop /* 80B0C258-80B0C25C 000094 0004+00 0/1 0/0 0/0 .rodata @4519 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4519 = -5000.0f; -COMPILER_STRIP_GATE(80B0C258, &lit_4519); +COMPILER_STRIP_GATE(0x80B0C258, &lit_4519); #pragma pop /* 80B0C25C-80B0C260 000098 0004+00 0/1 0/0 0/0 .rodata @4520 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4520 = -350.0f; -COMPILER_STRIP_GATE(80B0C25C, &lit_4520); +COMPILER_STRIP_GATE(0x80B0C25C, &lit_4520); #pragma pop /* 80B0C260-80B0C264 00009C 0004+00 0/1 0/0 0/0 .rodata @4521 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4521 = -600.0f; -COMPILER_STRIP_GATE(80B0C260, &lit_4521); +COMPILER_STRIP_GATE(0x80B0C260, &lit_4521); #pragma pop /* 80B0C264-80B0C268 0000A0 0004+00 0/2 0/0 0/0 .rodata @4522 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4522 = -32.0f; -COMPILER_STRIP_GATE(80B0C264, &lit_4522); +COMPILER_STRIP_GATE(0x80B0C264, &lit_4522); #pragma pop /* 80B0C268-80B0C26C 0000A4 0004+00 0/5 0/0 0/0 .rodata @4523 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4523 = 150.0f; -COMPILER_STRIP_GATE(80B0C268, &lit_4523); +COMPILER_STRIP_GATE(0x80B0C268, &lit_4523); #pragma pop /* 80B0C26C-80B0C274 0000A8 0008+00 1/3 0/0 0/0 .rodata @4525 */ SECTION_RODATA static u8 const lit_4525[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B0C26C, &lit_4525); +COMPILER_STRIP_GATE(0x80B0C26C, &lit_4525); /* 80B026F8-80B02B5C 0013D8 0464+00 1/1 0/0 0/0 .text initPerchDemo__10daNPC_TK_cFi */ #pragma push @@ -1336,49 +1346,49 @@ asm void daNPC_TK_c::initPerchDemo(int param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4803 = -5.0f; -COMPILER_STRIP_GATE(80B0C274, &lit_4803); +COMPILER_STRIP_GATE(0x80B0C274, &lit_4803); #pragma pop /* 80B0C278-80B0C27C 0000B4 0004+00 0/2 0/0 0/0 .rodata @4804 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4804 = 3.0f / 10.0f; -COMPILER_STRIP_GATE(80B0C278, &lit_4804); +COMPILER_STRIP_GATE(0x80B0C278, &lit_4804); #pragma pop /* 80B0C27C-80B0C280 0000B8 0004+00 0/1 0/0 0/0 .rodata @4805 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4805 = -3.0f; -COMPILER_STRIP_GATE(80B0C27C, &lit_4805); +COMPILER_STRIP_GATE(0x80B0C27C, &lit_4805); #pragma pop /* 80B0C280-80B0C284 0000BC 0004+00 0/3 0/0 0/0 .rodata @4806 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4806 = 60.0f; -COMPILER_STRIP_GATE(80B0C280, &lit_4806); +COMPILER_STRIP_GATE(0x80B0C280, &lit_4806); #pragma pop /* 80B0C284-80B0C288 0000C0 0004+00 0/1 0/0 0/0 .rodata @4807 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4807 = 13.0f / 10.0f; -COMPILER_STRIP_GATE(80B0C284, &lit_4807); +COMPILER_STRIP_GATE(0x80B0C284, &lit_4807); #pragma pop /* 80B0C288-80B0C28C 0000C4 0004+00 0/1 0/0 0/0 .rodata @4808 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4808 = 6.0f; -COMPILER_STRIP_GATE(80B0C288, &lit_4808); +COMPILER_STRIP_GATE(0x80B0C288, &lit_4808); #pragma pop /* 80B0C28C-80B0C290 0000C8 0004+00 0/1 0/0 0/0 .rodata @4809 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4809 = 4.0f; -COMPILER_STRIP_GATE(80B0C28C, &lit_4809); +COMPILER_STRIP_GATE(0x80B0C28C, &lit_4809); #pragma pop /* 80B02B5C-80B03658 00183C 0AFC+00 1/1 0/0 0/0 .text executePerchDemo__10daNPC_TK_cFi */ @@ -1391,6 +1401,13 @@ asm void daNPC_TK_c::executePerchDemo(int param_0) { } #pragma pop +/* ############################################################################################## */ +/* 80B0C3A0-80B0C3A0 0001DC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80B0C3BF = "NPC_TK"; +#pragma pop + /* 80B03658-80B03754 002338 00FC+00 3/3 0/0 0/0 .text executePerch__10daNPC_TK_cFv */ #pragma push #pragma optimization_level 0 @@ -1406,7 +1423,7 @@ asm void daNPC_TK_c::executePerch() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4883 = 0.5f; -COMPILER_STRIP_GATE(80B0C290, &lit_4883); +COMPILER_STRIP_GATE(0x80B0C290, &lit_4883); #pragma pop /* 80B03754-80B039A8 002434 0254+00 1/1 0/0 0/0 .text executeHandOn__10daNPC_TK_cFv */ @@ -1435,84 +1452,90 @@ asm void daNPC_TK_c::checkWaterSurface(f32 param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5277 = -50.0f; -COMPILER_STRIP_GATE(80B0C294, &lit_5277); +COMPILER_STRIP_GATE(0x80B0C294, &lit_5277); #pragma pop /* 80B0C298-80B0C29C 0000D4 0004+00 0/2 0/0 0/0 .rodata @5278 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5278 = -40.0f; -COMPILER_STRIP_GATE(80B0C298, &lit_5278); +COMPILER_STRIP_GATE(0x80B0C298, &lit_5278); #pragma pop /* 80B0C29C-80B0C2A0 0000D8 0004+00 0/1 0/0 0/0 .rodata @5279 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5279 = 2919.0f; -COMPILER_STRIP_GATE(80B0C29C, &lit_5279); +COMPILER_STRIP_GATE(0x80B0C29C, &lit_5279); #pragma pop /* 80B0C2A0-80B0C2A4 0000DC 0004+00 0/1 0/0 0/0 .rodata @5280 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5280 = 657.0f; -COMPILER_STRIP_GATE(80B0C2A0, &lit_5280); +COMPILER_STRIP_GATE(0x80B0C2A0, &lit_5280); #pragma pop /* 80B0C2A4-80B0C2A8 0000E0 0004+00 0/1 0/0 0/0 .rodata @5281 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5281 = -2095.0f; -COMPILER_STRIP_GATE(80B0C2A4, &lit_5281); +COMPILER_STRIP_GATE(0x80B0C2A4, &lit_5281); #pragma pop /* 80B0C2A8-80B0C2AC 0000E4 0004+00 0/1 0/0 0/0 .rodata @5282 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5282 = 1553.0f; -COMPILER_STRIP_GATE(80B0C2A8, &lit_5282); +COMPILER_STRIP_GATE(0x80B0C2A8, &lit_5282); #pragma pop /* 80B0C2AC-80B0C2B0 0000E8 0004+00 0/1 0/0 0/0 .rodata @5283 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5283 = 659.0f; -COMPILER_STRIP_GATE(80B0C2AC, &lit_5283); +COMPILER_STRIP_GATE(0x80B0C2AC, &lit_5283); #pragma pop /* 80B0C2B0-80B0C2B4 0000EC 0004+00 0/1 0/0 0/0 .rodata @5284 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5284 = -466.0f; -COMPILER_STRIP_GATE(80B0C2B0, &lit_5284); +COMPILER_STRIP_GATE(0x80B0C2B0, &lit_5284); #pragma pop /* 80B0C2B4-80B0C2B8 0000F0 0004+00 0/1 0/0 0/0 .rodata @5285 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5285 = 1750.0f; -COMPILER_STRIP_GATE(80B0C2B4, &lit_5285); +COMPILER_STRIP_GATE(0x80B0C2B4, &lit_5285); #pragma pop /* 80B0C2B8-80B0C2BC 0000F4 0004+00 0/1 0/0 0/0 .rodata @5286 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5286 = 5283.0f; -COMPILER_STRIP_GATE(80B0C2B8, &lit_5286); +COMPILER_STRIP_GATE(0x80B0C2B8, &lit_5286); #pragma pop /* 80B0C2BC-80B0C2C0 0000F8 0004+00 0/4 0/0 0/0 .rodata @5287 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5287 = 40.0f; -COMPILER_STRIP_GATE(80B0C2BC, &lit_5287); +COMPILER_STRIP_GATE(0x80B0C2BC, &lit_5287); #pragma pop /* 80B0C2C0-80B0C2C4 0000FC 0004+00 0/3 0/0 0/0 .rodata @5288 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5288 = 1.5f; -COMPILER_STRIP_GATE(80B0C2C0, &lit_5288); +COMPILER_STRIP_GATE(0x80B0C2C0, &lit_5288); +#pragma pop + +/* 80B0C3A0-80B0C3A0 0001DC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80B0C3C6 = "F_SP103"; #pragma pop /* 80B0C64C-80B0C65C 00009C 000C+04 0/1 0/0 0/0 .bss @5011 */ @@ -1552,35 +1575,35 @@ asm void daNPC_TK_c::executeAway() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5476 = 2048.0f; -COMPILER_STRIP_GATE(80B0C2C4, &lit_5476); +COMPILER_STRIP_GATE(0x80B0C2C4, &lit_5476); #pragma pop /* 80B0C2C8-80B0C2CC 000104 0004+00 0/2 0/0 0/0 .rodata @5477 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5477 = -60.0f; -COMPILER_STRIP_GATE(80B0C2C8, &lit_5477); +COMPILER_STRIP_GATE(0x80B0C2C8, &lit_5477); #pragma pop /* 80B0C2CC-80B0C2D0 000108 0004+00 0/1 0/0 0/0 .rodata @5478 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5478 = -85.0f; -COMPILER_STRIP_GATE(80B0C2CC, &lit_5478); +COMPILER_STRIP_GATE(0x80B0C2CC, &lit_5478); #pragma pop /* 80B0C2D0-80B0C2D4 00010C 0004+00 0/2 0/0 0/0 .rodata @5479 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5479 = -35.0f; -COMPILER_STRIP_GATE(80B0C2D0, &lit_5479); +COMPILER_STRIP_GATE(0x80B0C2D0, &lit_5479); #pragma pop /* 80B0C2D4-80B0C2D8 000110 0004+00 0/1 0/0 0/0 .rodata @5480 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5480 = -45.0f; -COMPILER_STRIP_GATE(80B0C2D4, &lit_5480); +COMPILER_STRIP_GATE(0x80B0C2D4, &lit_5480); #pragma pop /* 80B04BF8-80B04F64 0038D8 036C+00 1/1 0/0 0/0 .text setCarryActorMtx__10daNPC_TK_cFv */ @@ -1598,14 +1621,14 @@ asm void daNPC_TK_c::setCarryActorMtx() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5506 = 55.0f; -COMPILER_STRIP_GATE(80B0C2D8, &lit_5506); +COMPILER_STRIP_GATE(0x80B0C2D8, &lit_5506); #pragma pop /* 80B0C2DC-80B0C2E0 000118 0004+00 0/1 0/0 0/0 .rodata @5507 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5507 = 45.0f; -COMPILER_STRIP_GATE(80B0C2DC, &lit_5507); +COMPILER_STRIP_GATE(0x80B0C2DC, &lit_5507); #pragma pop /* 80B04F64-80B04FA8 003C44 0044+00 2/2 0/0 0/0 .text getTakePosY__10daNPC_TK_cFv */ @@ -1623,14 +1646,14 @@ asm void daNPC_TK_c::getTakePosY() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5532 = 210.0f; -COMPILER_STRIP_GATE(80B0C2E0, &lit_5532); +COMPILER_STRIP_GATE(0x80B0C2E0, &lit_5532); #pragma pop /* 80B0C2E4-80B0C2E8 000120 0004+00 0/1 0/0 0/0 .rodata @5533 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5533 = 250.0f; -COMPILER_STRIP_GATE(80B0C2E4, &lit_5533); +COMPILER_STRIP_GATE(0x80B0C2E4, &lit_5533); #pragma pop /* 80B04FA8-80B04FEC 003C88 0044+00 1/1 0/0 0/0 .text getTakeOffPosY__10daNPC_TK_cFv */ @@ -1648,7 +1671,7 @@ asm void daNPC_TK_c::getTakeOffPosY() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5823 = 18.0f; -COMPILER_STRIP_GATE(80B0C2E8, &lit_5823); +COMPILER_STRIP_GATE(0x80B0C2E8, &lit_5823); #pragma pop /* 80B04FEC-80B05BD0 003CCC 0BE4+00 1/1 0/0 0/0 .text executeBack__10daNPC_TK_cFv */ @@ -1666,7 +1689,7 @@ asm void daNPC_TK_c::executeBack() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5855 = 23.0f; -COMPILER_STRIP_GATE(80B0C2EC, &lit_5855); +COMPILER_STRIP_GATE(0x80B0C2EC, &lit_5855); #pragma pop /* 80B05BD0-80B05C7C 0048B0 00AC+00 5/5 0/0 0/0 .text getHanjoHandPos__10daNPC_TK_cFv */ @@ -1694,28 +1717,28 @@ asm void daNPC_TK_c::executeStayHanjo() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6171 = 35.0f; -COMPILER_STRIP_GATE(80B0C2F0, &lit_6171); +COMPILER_STRIP_GATE(0x80B0C2F0, &lit_6171); #pragma pop /* 80B0C2F4-80B0C2F8 000130 0004+00 0/1 0/0 0/0 .rodata @6172 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6172 = 1800.0f; -COMPILER_STRIP_GATE(80B0C2F4, &lit_6172); +COMPILER_STRIP_GATE(0x80B0C2F4, &lit_6172); #pragma pop /* 80B0C2F8-80B0C2FC 000134 0004+00 0/1 0/0 0/0 .rodata @6173 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6173 = 1500.0f; -COMPILER_STRIP_GATE(80B0C2F8, &lit_6173); +COMPILER_STRIP_GATE(0x80B0C2F8, &lit_6173); #pragma pop /* 80B0C2FC-80B0C300 000138 0004+00 0/1 0/0 0/0 .rodata @6174 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6174 = -10.0f; -COMPILER_STRIP_GATE(80B0C2FC, &lit_6174); +COMPILER_STRIP_GATE(0x80B0C2FC, &lit_6174); #pragma pop /* 80B05EC8-80B0686C 004BA8 09A4+00 1/1 0/0 0/0 .text executeAttackLink__10daNPC_TK_cFv @@ -1734,28 +1757,28 @@ asm void daNPC_TK_c::executeAttackLink() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6367 = 800.0f; -COMPILER_STRIP_GATE(80B0C300, &lit_6367); +COMPILER_STRIP_GATE(0x80B0C300, &lit_6367); #pragma pop /* 80B0C304-80B0C308 000140 0004+00 0/2 0/0 0/0 .rodata @6368 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6368 = -800.0f; -COMPILER_STRIP_GATE(80B0C304, &lit_6368); +COMPILER_STRIP_GATE(0x80B0C304, &lit_6368); #pragma pop /* 80B0C308-80B0C30C 000144 0004+00 0/3 0/0 0/0 .rodata @6369 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6369 = -150.0f; -COMPILER_STRIP_GATE(80B0C308, &lit_6369); +COMPILER_STRIP_GATE(0x80B0C308, &lit_6369); #pragma pop /* 80B0C30C-80B0C310 000148 0004+00 0/2 0/0 0/0 .rodata @6370 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6370 = -70.0f; -COMPILER_STRIP_GATE(80B0C30C, &lit_6370); +COMPILER_STRIP_GATE(0x80B0C30C, &lit_6370); #pragma pop /* 80B0686C-80B07114 00554C 08A8+00 1/1 0/0 0/0 .text executeBackHanjo__10daNPC_TK_cFv */ @@ -1773,21 +1796,21 @@ asm void daNPC_TK_c::executeBackHanjo() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6430 = 2500.0f; -COMPILER_STRIP_GATE(80B0C310, &lit_6430); +COMPILER_STRIP_GATE(0x80B0C310, &lit_6430); #pragma pop /* 80B0C314-80B0C318 000150 0004+00 0/1 0/0 0/0 .rodata @6431 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6431 = 1050.0f; -COMPILER_STRIP_GATE(80B0C314, &lit_6431); +COMPILER_STRIP_GATE(0x80B0C314, &lit_6431); #pragma pop /* 80B0C318-80B0C31C 000154 0004+00 0/2 0/0 0/0 .rodata @6432 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6432 = 1200.0f; -COMPILER_STRIP_GATE(80B0C318, &lit_6432); +COMPILER_STRIP_GATE(0x80B0C318, &lit_6432); #pragma pop /* 80B07114-80B072CC 005DF4 01B8+00 4/4 0/0 0/0 .text checkAttackDemo__10daNPC_TK_cFv */ @@ -1816,21 +1839,21 @@ asm void daNPC_TK_c::executeAttackDemo() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6789 = 3400.0f; -COMPILER_STRIP_GATE(80B0C31C, &lit_6789); +COMPILER_STRIP_GATE(0x80B0C31C, &lit_6789); #pragma pop /* 80B0C320-80B0C324 00015C 0004+00 0/1 0/0 0/0 .rodata @6790 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6790 = -2000.0f; -COMPILER_STRIP_GATE(80B0C320, &lit_6790); +COMPILER_STRIP_GATE(0x80B0C320, &lit_6790); #pragma pop /* 80B0C324-80B0C328 000160 0004+00 0/1 0/0 0/0 .rodata @6791 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6791 = 900.0f; -COMPILER_STRIP_GATE(80B0C324, &lit_6791); +COMPILER_STRIP_GATE(0x80B0C324, &lit_6791); #pragma pop /* 80B07610-80B08168 0062F0 0B58+00 1/1 0/0 0/0 .text executeBackHanjoDemo__10daNPC_TK_cFv */ @@ -1843,6 +1866,13 @@ asm void daNPC_TK_c::executeBackHanjoDemo() { } #pragma pop +/* ############################################################################################## */ +/* 80B0C3A0-80B0C3A0 0001DC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80B0C3CE = "TAKAYOSE2"; +#pragma pop + /* 80B08168-80B08208 006E48 00A0+00 1/1 0/0 0/0 .text executeWolfEvent__10daNPC_TK_cFv */ #pragma push #pragma optimization_level 0 @@ -1858,7 +1888,7 @@ asm void daNPC_TK_c::executeWolfEvent() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6841 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(80B0C328, &lit_6841); +COMPILER_STRIP_GATE(0x80B0C328, &lit_6841); #pragma pop /* 80B08208-80B082A4 006EE8 009C+00 1/1 0/0 0/0 .text calcWolfDemoCam__10daNPC_TK_cFv */ @@ -1876,7 +1906,7 @@ asm void daNPC_TK_c::calcWolfDemoCam() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6860 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(80B0C32C, &lit_6860); +COMPILER_STRIP_GATE(0x80B0C32C, &lit_6860); #pragma pop /* 80B082A4-80B0839C 006F84 00F8+00 1/1 0/0 0/0 .text calcWolfDemoCam2__10daNPC_TK_cFv */ @@ -1894,35 +1924,35 @@ asm void daNPC_TK_c::calcWolfDemoCam2() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7260 = -500.0f; -COMPILER_STRIP_GATE(80B0C330, &lit_7260); +COMPILER_STRIP_GATE(0x80B0C330, &lit_7260); #pragma pop /* 80B0C334-80B0C338 000170 0004+00 0/1 0/0 0/0 .rodata @7261 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7261 = 610.0f; -COMPILER_STRIP_GATE(80B0C334, &lit_7261); +COMPILER_STRIP_GATE(0x80B0C334, &lit_7261); #pragma pop /* 80B0C338-80B0C33C 000174 0004+00 0/1 0/0 0/0 .rodata @7262 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7262 = 850.0f; -COMPILER_STRIP_GATE(80B0C338, &lit_7262); +COMPILER_STRIP_GATE(0x80B0C338, &lit_7262); #pragma pop /* 80B0C33C-80B0C340 000178 0004+00 0/2 0/0 0/0 .rodata @7263 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7263 = -200.0f; -COMPILER_STRIP_GATE(80B0C33C, &lit_7263); +COMPILER_STRIP_GATE(0x80B0C33C, &lit_7263); #pragma pop /* 80B0C340-80B0C344 00017C 0004+00 0/2 0/0 0/0 .rodata @7264 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7264 = -100.0f; -COMPILER_STRIP_GATE(80B0C340, &lit_7264); +COMPILER_STRIP_GATE(0x80B0C340, &lit_7264); #pragma pop /* 80B0839C-80B09A3C 00707C 16A0+00 2/1 0/0 0/0 .text executeWolfPerch__10daNPC_TK_cFv */ @@ -1940,60 +1970,60 @@ asm void daNPC_TK_c::executeWolfPerch() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7265 = 120.0f; -COMPILER_STRIP_GATE(80B0C344, &lit_7265); +COMPILER_STRIP_GATE(0x80B0C344, &lit_7265); #pragma pop /* 80B0C348-80B0C34C 000184 0004+00 1/3 0/0 0/0 .rodata @7266 */ SECTION_RODATA static f32 const lit_7266 = 80.0f; -COMPILER_STRIP_GATE(80B0C348, &lit_7266); +COMPILER_STRIP_GATE(0x80B0C348, &lit_7266); /* 80B0C34C-80B0C350 000188 0004+00 0/0 0/0 0/0 .rodata @7267 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7267 = 3.0f / 20.0f; -COMPILER_STRIP_GATE(80B0C34C, &lit_7267); +COMPILER_STRIP_GATE(0x80B0C34C, &lit_7267); #pragma pop /* 80B0C350-80B0C354 00018C 0004+00 0/0 0/0 0/0 .rodata @7268 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7268 = 12.0f; -COMPILER_STRIP_GATE(80B0C350, &lit_7268); +COMPILER_STRIP_GATE(0x80B0C350, &lit_7268); #pragma pop /* 80B0C354-80B0C358 000190 0004+00 0/0 0/0 0/0 .rodata @7269 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7269 = 7.0f / 10.0f; -COMPILER_STRIP_GATE(80B0C354, &lit_7269); +COMPILER_STRIP_GATE(0x80B0C354, &lit_7269); #pragma pop /* 80B0C358-80B0C35C 000194 0004+00 0/1 0/0 0/0 .rodata @7270 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7270 = -30.0f; -COMPILER_STRIP_GATE(80B0C358, &lit_7270); +COMPILER_STRIP_GATE(0x80B0C358, &lit_7270); #pragma pop /* 80B0C35C-80B0C360 000198 0004+00 0/1 0/0 0/0 .rodata @7444 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7444 = -5191.0f; -COMPILER_STRIP_GATE(80B0C35C, &lit_7444); +COMPILER_STRIP_GATE(0x80B0C35C, &lit_7444); #pragma pop /* 80B0C360-80B0C364 00019C 0004+00 0/1 0/0 0/0 .rodata @7445 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7445 = 5246.0f; -COMPILER_STRIP_GATE(80B0C360, &lit_7445); +COMPILER_STRIP_GATE(0x80B0C360, &lit_7445); #pragma pop /* 80B0C364-80B0C368 0001A0 0004+00 0/1 0/0 0/0 .rodata @7446 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7446 = -700.0f; -COMPILER_STRIP_GATE(80B0C364, &lit_7446); +COMPILER_STRIP_GATE(0x80B0C364, &lit_7446); #pragma pop /* 80B09A3C-80B0A444 00871C 0A08+00 2/1 0/0 0/0 .text executeResistanceDemo__10daNPC_TK_cFv */ @@ -2011,63 +2041,63 @@ asm void daNPC_TK_c::executeResistanceDemo() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7447 = -4058.0f; -COMPILER_STRIP_GATE(80B0C368, &lit_7447); +COMPILER_STRIP_GATE(0x80B0C368, &lit_7447); #pragma pop /* 80B0C36C-80B0C370 0001A8 0004+00 0/0 0/0 0/0 .rodata @7448 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7448 = 549.0f; -COMPILER_STRIP_GATE(80B0C36C, &lit_7448); +COMPILER_STRIP_GATE(0x80B0C36C, &lit_7448); #pragma pop /* 80B0C370-80B0C374 0001AC 0004+00 0/0 0/0 0/0 .rodata @7449 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7449 = 7530.0f; -COMPILER_STRIP_GATE(80B0C370, &lit_7449); +COMPILER_STRIP_GATE(0x80B0C370, &lit_7449); #pragma pop /* 80B0C374-80B0C378 0001B0 0004+00 0/0 0/0 0/0 .rodata @7450 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7450 = -4107.0f; -COMPILER_STRIP_GATE(80B0C374, &lit_7450); +COMPILER_STRIP_GATE(0x80B0C374, &lit_7450); #pragma pop /* 80B0C378-80B0C37C 0001B4 0004+00 0/0 0/0 0/0 .rodata @7451 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7451 = 163.0f; -COMPILER_STRIP_GATE(80B0C378, &lit_7451); +COMPILER_STRIP_GATE(0x80B0C378, &lit_7451); #pragma pop /* 80B0C37C-80B0C380 0001B8 0004+00 0/0 0/0 0/0 .rodata @7452 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7452 = 8046.0f; -COMPILER_STRIP_GATE(80B0C37C, &lit_7452); +COMPILER_STRIP_GATE(0x80B0C37C, &lit_7452); #pragma pop /* 80B0C380-80B0C384 0001BC 0004+00 0/0 0/0 0/0 .rodata @7453 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7453 = 7.0f / 5.0f; -COMPILER_STRIP_GATE(80B0C380, &lit_7453); +COMPILER_STRIP_GATE(0x80B0C380, &lit_7453); #pragma pop /* 80B0C384-80B0C388 0001C0 0004+00 0/0 0/0 0/0 .rodata @7454 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7454 = -15.0f; -COMPILER_STRIP_GATE(80B0C384, &lit_7454); +COMPILER_STRIP_GATE(0x80B0C384, &lit_7454); #pragma pop /* 80B0C388-80B0C38C 0001C4 0004+00 0/2 0/0 0/0 .rodata @7470 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7470 = 600.0f; -COMPILER_STRIP_GATE(80B0C388, &lit_7470); +COMPILER_STRIP_GATE(0x80B0C388, &lit_7470); #pragma pop /* 80B0A444-80B0A500 009124 00BC+00 0/0 0/0 1/1 .text setHawkSideCamera__10daNPC_TK_cF4cXyz */ @@ -2095,7 +2125,7 @@ asm void daNPC_TK_c::setHawkCamera(fopAc_ac_c* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7498 = -300.0f; -COMPILER_STRIP_GATE(80B0C38C, &lit_7498); +COMPILER_STRIP_GATE(0x80B0C38C, &lit_7498); #pragma pop /* 80B0A568-80B0A614 009248 00AC+00 1/1 0/0 2/2 .text endHawkCamera__10daNPC_TK_cFv */ @@ -2113,14 +2143,14 @@ asm void daNPC_TK_c::endHawkCamera() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7762 = 1000.0f; -COMPILER_STRIP_GATE(80B0C390, &lit_7762); +COMPILER_STRIP_GATE(0x80B0C390, &lit_7762); #pragma pop /* 80B0C394-80B0C398 0001D0 0004+00 0/1 0/0 0/0 .rodata @7763 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7763 = 4.0f / 5.0f; -COMPILER_STRIP_GATE(80B0C394, &lit_7763); +COMPILER_STRIP_GATE(0x80B0C394, &lit_7763); #pragma pop /* 80B0A614-80B0B004 0092F4 09F0+00 1/1 0/0 0/0 .text calcDemoCamera__10daNPC_TK_cFv */ @@ -2143,6 +2173,14 @@ asm void daNPC_TK_c::checkActionSet() { } #pragma pop +/* ############################################################################################## */ +/* 80B0C3A0-80B0C3A0 0001DC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80B0C3D8 = "TAKAYOSE@"; +SECTION_DEAD static char const* const stringBase_80B0C3E2 = "TAKAYOSE"; +#pragma pop + /* 80B0B284-80B0B5CC 009F64 0348+00 2/1 0/0 0/0 .text action__10daNPC_TK_cFv */ #pragma push #pragma optimization_level 0 @@ -2158,14 +2196,14 @@ asm void daNPC_TK_c::action() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7905 = 33.0f; -COMPILER_STRIP_GATE(80B0C398, &lit_7905); +COMPILER_STRIP_GATE(0x80B0C398, &lit_7905); #pragma pop /* 80B0C39C-80B0C3A0 0001D8 0004+00 0/1 0/0 0/0 .rodata @7906 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7906 = -27.0f; -COMPILER_STRIP_GATE(80B0C39C, &lit_7906); +COMPILER_STRIP_GATE(0x80B0C39C, &lit_7906); #pragma pop /* 80B0B5CC-80B0B6DC 00A2AC 0110+00 1/1 0/0 0/0 .text mtx_set__10daNPC_TK_cFv */ @@ -2255,6 +2293,13 @@ asm void daNPC_TK_c::JointCallBack(J3DJoint* param_0, int param_1) { } #pragma pop +/* ############################################################################################## */ +/* 80B0C3A0-80B0C3A0 0001DC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80B0C3EB = "tk.bmd"; +#pragma pop + /* 80B0BBC8-80B0BD04 00A8A8 013C+00 1/1 0/0 0/0 .text CreateHeap__10daNPC_TK_cFv */ #pragma push #pragma optimization_level 0 @@ -2352,7 +2397,7 @@ asm void __sinit_d_a_npc_tk_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80B0C14C = (void*)__sinit_d_a_npc_tk_cpp; +REGISTER_CTORS(0x80B0C14C, __sinit_d_a_npc_tk_cpp); #pragma pop /* 80B0C188-80B0C190 00AE68 0008+00 1/0 0/0 0/0 .text @36@__dt__12dBgS_ObjAcchFv */ @@ -2557,19 +2602,4 @@ static u8 data_80B0C6C4[4]; static u8 data_80B0C6C8[4]; #pragma pop -/* 80B0C3A0-80B0C3F2 0001DC 0052+00 12/10 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80B0C3A0 = "Npc_tk"; -SECTION_DEAD static char const* const stringBase_80B0C3A7 = "Wait"; -SECTION_DEAD static char const* const stringBase_80B0C3AC = "Circle"; -SECTION_DEAD static char const* const stringBase_80B0C3B3 = "Nearly"; -SECTION_DEAD static char const* const stringBase_80B0C3BA = "Land"; -SECTION_DEAD static char const* const stringBase_80B0C3BF = "NPC_TK"; -SECTION_DEAD static char const* const stringBase_80B0C3C6 = "F_SP103"; -SECTION_DEAD static char const* const stringBase_80B0C3CE = "TAKAYOSE2"; -SECTION_DEAD static char const* const stringBase_80B0C3D8 = "TAKAYOSE@"; -SECTION_DEAD static char const* const stringBase_80B0C3E2 = "TAKAYOSE"; -SECTION_DEAD static char const* const stringBase_80B0C3EB = "tk.bmd"; -#pragma pop +/* 80B0C3A0-80B0C3A0 0001DC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/npc/d_a_npc_tkc/d_a_npc_tkc.cpp b/rel/d/a/npc/d_a_npc_tkc/d_a_npc_tkc.cpp index 2df762fe95d..6f832102f09 100644 --- a/rel/d/a/npc/d_a_npc_tkc/d_a_npc_tkc.cpp +++ b/rel/d/a/npc/d_a_npc_tkc/d_a_npc_tkc.cpp @@ -42,12 +42,12 @@ struct mDoExt_bckAnm { /* 8000D990 */ void changeBckOnly(J3DAnmTransform*); }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; +struct J3DModelData {}; + struct Z2Creature { /* 802C03C8 */ Z2Creature(); /* 802C0420 */ ~Z2Creature(); @@ -67,10 +67,10 @@ struct fopAc_ac_c { /* 80018C8C */ ~fopAc_ac_c(); }; -struct J3DJoint {}; - struct J3DModel {}; +struct J3DJoint {}; + struct daNpcTkc_c { /* 80B0C7CC */ daNpcTkc_c(); /* 80B0C964 */ ~daNpcTkc_c(); @@ -118,16 +118,16 @@ struct daNpcTkc_Param_c { static u8 const m[164]; }; -struct J3DAnmTextureSRTKey {}; - -struct _GXColorS10 {}; - struct J3DAnmTexPattern { /* 8032AF50 */ void getTexNo(u16, u16*) const; }; +struct J3DAnmTextureSRTKey {}; + struct J3DAnmTransformKey {}; +struct _GXColorS10 {}; + struct daNpcF_c { struct daNpcF_anmPlayData {}; @@ -411,9 +411,9 @@ extern "C" void adjustShapeAngle__8daNpcF_cFv(); extern "C" void setCollisions__8daNpcF_cFv(); extern "C" void drawOtherMdls__8daNpcF_cFv(); extern "C" void __dt__10cCcD_GSttsFv(); -extern "C" void func_80B106B8(int*); -extern "C" void func_80B106D4(f32, f32); -extern "C" void func_80B10710(int, int); +extern "C" void func_80B106B8(void* _this, int*); +extern "C" void func_80B106D4(void* _this, f32, f32); +extern "C" void func_80B10710(void* _this, int, int); extern "C" void __sinit_d_a_npc_tkc_cpp(); extern "C" void __dt__16daNpcTkc_Param_cFv(); extern "C" static void func_80B10890(); @@ -579,6 +579,16 @@ extern "C" void __register_global_object(); // /* ############################################################################################## */ +/* 80B10A2C-80B10A2C 000178 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80B10A2C = ""; +SECTION_DEAD static char const* const stringBase_80B10A2D = "TKS_SECRET"; +SECTION_DEAD static char const* const stringBase_80B10A38 = "TKS_WARP"; +SECTION_DEAD static char const* const stringBase_80B10A41 = "TKC_WARP"; +SECTION_DEAD static char const* const stringBase_80B10A4A = "Tkc"; +#pragma pop + /* 80B10A60-80B10A6C 000000 000C+00 5/5 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -970,27 +980,33 @@ SECTION_RODATA u8 const daNpcTkc_Param_c::m[164] = { 0x00, 0x42, 0xC8, 0x00, 0x00, 0x42, 0x70, 0x00, 0x00, 0x42, 0x70, 0x00, 0x00, 0x3E, 0x4C, 0xCC, 0xCD, 0x40, 0xA0, 0x00, 0x00, 0x04, 0x00, 0x3E, 0x80, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B108B4, &daNpcTkc_Param_c::m); +COMPILER_STRIP_GATE(0x80B108B4, &daNpcTkc_Param_c::m); /* 80B10958-80B1095C 0000A4 0004+00 0/1 0/0 0/0 .rodata @4307 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4307 = -15.0f; -COMPILER_STRIP_GATE(80B10958, &lit_4307); +COMPILER_STRIP_GATE(0x80B10958, &lit_4307); #pragma pop /* 80B1095C-80B10960 0000A8 0004+00 0/2 0/0 0/0 .rodata @4308 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4308 = 15.0f; -COMPILER_STRIP_GATE(80B1095C, &lit_4308); +COMPILER_STRIP_GATE(0x80B1095C, &lit_4308); #pragma pop /* 80B10960-80B10964 0000AC 0004+00 0/1 0/0 0/0 .rodata @4309 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4309 = -7.0f; -COMPILER_STRIP_GATE(80B10960, &lit_4309); +COMPILER_STRIP_GATE(0x80B10960, &lit_4309); +#pragma pop + +/* 80B10A2C-80B10A2C 000178 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80B10A4E = "D_MN07"; #pragma pop /* 80B0CA9C-80B0CD7C 0003BC 02E0+00 1/1 0/0 0/0 .text Create__10daNpcTkc_cFv */ @@ -1006,7 +1022,7 @@ asm void daNpcTkc_c::Create() { /* ############################################################################################## */ /* 80B10964-80B10968 0000B0 0004+00 4/7 0/0 0/0 .rodata @4358 */ SECTION_RODATA static f32 const lit_4358 = 1.0f; -COMPILER_STRIP_GATE(80B10964, &lit_4358); +COMPILER_STRIP_GATE(0x80B10964, &lit_4358); /* 80B0CD7C-80B0CFC4 00069C 0248+00 1/1 0/0 0/0 .text CreateHeap__10daNpcTkc_cFv */ #pragma push @@ -1242,7 +1258,7 @@ SECTION_RODATA static u8 const m_cameraItemNum[4] = { 0x00, 0x01, }; -COMPILER_STRIP_GATE(80B10968, &m_cameraItemNum); +COMPILER_STRIP_GATE(0x80B10968, &m_cameraItemNum); #pragma pop /* 80B1096C-80B10970 0000B8 0004+00 1/9 0/0 0/0 .rodata @4652 */ @@ -1252,34 +1268,40 @@ SECTION_RODATA static u8 const lit_4652[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B1096C, &lit_4652); +COMPILER_STRIP_GATE(0x80B1096C, &lit_4652); /* 80B10970-80B10974 0000BC 0004+00 0/1 0/0 0/0 .rodata @4653 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4653 = 112.0f; -COMPILER_STRIP_GATE(80B10970, &lit_4653); +COMPILER_STRIP_GATE(0x80B10970, &lit_4653); #pragma pop /* 80B10974-80B10978 0000C0 0004+00 0/1 0/0 0/0 .rodata @4654 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4654 = 3.0f / 10.0f; -COMPILER_STRIP_GATE(80B10974, &lit_4654); +COMPILER_STRIP_GATE(0x80B10974, &lit_4654); #pragma pop /* 80B10978-80B1097C 0000C4 0004+00 0/1 0/0 0/0 .rodata @4655 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4655 = 50.0f; -COMPILER_STRIP_GATE(80B10978, &lit_4655); +COMPILER_STRIP_GATE(0x80B10978, &lit_4655); #pragma pop /* 80B1097C-80B10980 0000C8 0004+00 0/1 0/0 0/0 .rodata @4656 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4656 = 0.75f; -COMPILER_STRIP_GATE(80B1097C, &lit_4656); +COMPILER_STRIP_GATE(0x80B1097C, &lit_4656); +#pragma pop + +/* 80B10A2C-80B10A2C 000178 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80B10A55 = "Type"; #pragma pop /* 80B0D678-80B0DA94 000F98 041C+00 1/1 0/0 0/0 .text reset__10daNpcTkc_cFv */ @@ -1307,7 +1329,7 @@ asm void daNpcTkc_c::setMotionAnm(int param_0, f32 param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpcTkc_c::setAction(void (daNpcTkc_c::*)()) { +asm void daNpcTkc_c::setAction(void (daNpcTkc_c::*param_0)()) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_tkc/d_a_npc_tkc/setAction__10daNpcTkc_cFM10daNpcTkc_cFPCvPv_v.s" } @@ -1330,7 +1352,7 @@ asm void daNpcTkc_c::wait() { SECTION_RODATA static u8 const lit_4674[12] = { 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B10980, &lit_4674); +COMPILER_STRIP_GATE(0x80B10980, &lit_4674); #pragma pop /* 80B1098C-80B10990 0000D8 0004+00 0/1 0/0 0/0 .rodata @4675 */ @@ -1342,7 +1364,7 @@ SECTION_RODATA static u8 const lit_4675[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B1098C, &lit_4675); +COMPILER_STRIP_GATE(0x80B1098C, &lit_4675); #pragma pop /* 80B10990-80B1099C 0000DC 000C+00 0/1 0/0 0/0 .rodata @4676 */ @@ -1351,7 +1373,7 @@ COMPILER_STRIP_GATE(80B1098C, &lit_4675); SECTION_RODATA static u8 const lit_4676[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B10990, &lit_4676); +COMPILER_STRIP_GATE(0x80B10990, &lit_4676); #pragma pop /* 80B1099C-80B109A0 0000E8 0004+00 0/1 0/0 0/0 .rodata @4677 */ @@ -1363,7 +1385,7 @@ SECTION_RODATA static u8 const lit_4677[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B1099C, &lit_4677); +COMPILER_STRIP_GATE(0x80B1099C, &lit_4677); #pragma pop /* 80B109A0-80B109A8 0000EC 0008+00 0/1 0/0 0/0 .rodata @4678 */ @@ -1372,7 +1394,7 @@ COMPILER_STRIP_GATE(80B1099C, &lit_4677); SECTION_RODATA static u8 const lit_4678[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B109A0, &lit_4678); +COMPILER_STRIP_GATE(0x80B109A0, &lit_4678); #pragma pop /* 80B109A8-80B109B4 0000F4 000C+00 0/1 0/0 0/0 .rodata @4682 */ @@ -1381,7 +1403,7 @@ COMPILER_STRIP_GATE(80B109A0, &lit_4678); SECTION_RODATA static u8 const lit_4682[12] = { 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B109A8, &lit_4682); +COMPILER_STRIP_GATE(0x80B109A8, &lit_4682); #pragma pop /* 80B109B4-80B109B8 000100 0004+00 0/1 0/0 0/0 .rodata @4683 */ @@ -1393,7 +1415,7 @@ SECTION_RODATA static u8 const lit_4683[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B109B4, &lit_4683); +COMPILER_STRIP_GATE(0x80B109B4, &lit_4683); #pragma pop /* 80B109B8-80B109C4 000104 0008+04 0/1 0/0 0/0 .rodata @4684 */ @@ -1414,7 +1436,7 @@ SECTION_RODATA static u8 const lit_4684[8 + 4 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B109B8, &lit_4684); +COMPILER_STRIP_GATE(0x80B109B8, &lit_4684); #pragma pop /* 80B109C4-80B109CC 000110 0008+00 0/1 0/0 0/0 .rodata @4887 */ @@ -1423,57 +1445,57 @@ COMPILER_STRIP_GATE(80B109B8, &lit_4684); SECTION_RODATA static u8 const lit_4887[8] = { 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B109C4, &lit_4887); +COMPILER_STRIP_GATE(0x80B109C4, &lit_4887); #pragma pop /* 80B109CC-80B109D0 000118 0004+00 0/2 0/0 0/0 .rodata @4888 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4888 = 2.0f; -COMPILER_STRIP_GATE(80B109CC, &lit_4888); +COMPILER_STRIP_GATE(0x80B109CC, &lit_4888); #pragma pop /* 80B109D0-80B109D4 00011C 0004+00 0/2 0/0 0/0 .rodata @4889 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4889 = -7.0f / 10.0f; -COMPILER_STRIP_GATE(80B109D0, &lit_4889); +COMPILER_STRIP_GATE(0x80B109D0, &lit_4889); #pragma pop /* 80B109D4-80B109D8 000120 0004+00 0/2 0/0 0/0 .rodata @4890 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4890 = 7.0f / 5.0f; -COMPILER_STRIP_GATE(80B109D4, &lit_4890); +COMPILER_STRIP_GATE(0x80B109D4, &lit_4890); #pragma pop /* 80B109D8-80B109DC 000124 0004+00 4/7 0/0 0/0 .rodata @4891 */ SECTION_RODATA static f32 const lit_4891 = -1.0f; -COMPILER_STRIP_GATE(80B109D8, &lit_4891); +COMPILER_STRIP_GATE(0x80B109D8, &lit_4891); /* 80B109DC-80B109E0 000128 0004+00 1/4 0/0 0/0 .rodata @4892 */ SECTION_RODATA static f32 const lit_4892 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(80B109DC, &lit_4892); +COMPILER_STRIP_GATE(0x80B109DC, &lit_4892); /* 80B109E0-80B109E4 00012C 0004+00 0/2 0/0 0/0 .rodata @4893 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4893 = 8.0f / 5.0f; -COMPILER_STRIP_GATE(80B109E0, &lit_4893); +COMPILER_STRIP_GATE(0x80B109E0, &lit_4893); #pragma pop /* 80B109E4-80B109E8 000130 0004+00 0/2 0/0 0/0 .rodata @4894 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4894 = -1.0f / 5.0f; -COMPILER_STRIP_GATE(80B109E4, &lit_4894); +COMPILER_STRIP_GATE(0x80B109E4, &lit_4894); #pragma pop /* 80B109E8-80B109EC 000134 0004+00 0/2 0/0 0/0 .rodata @4895 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4895 = 3.0f / 5.0f; -COMPILER_STRIP_GATE(80B109E8, &lit_4895); +COMPILER_STRIP_GATE(0x80B109E8, &lit_4895); #pragma pop /* 80B0DEF8-80B0E124 001818 022C+00 4/4 0/0 0/0 .text calcFly__10daNpcTkc_cFv */ @@ -1503,7 +1525,7 @@ asm void daNpcTkc_c::searchPlayer() { SECTION_RODATA static u8 const lit_5074[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B109EC, &lit_5074); +COMPILER_STRIP_GATE(0x80B109EC, &lit_5074); #pragma pop /* 80B109F4-80B109FC 000140 0008+00 0/1 0/0 0/0 .rodata @5075 */ @@ -1512,7 +1534,7 @@ COMPILER_STRIP_GATE(80B109EC, &lit_5074); SECTION_RODATA static u8 const lit_5075[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B109F4, &lit_5075); +COMPILER_STRIP_GATE(0x80B109F4, &lit_5075); #pragma pop /* 80B109FC-80B10A04 000148 0008+00 0/1 0/0 0/0 .rodata @5076 */ @@ -1521,14 +1543,14 @@ COMPILER_STRIP_GATE(80B109F4, &lit_5075); SECTION_RODATA static u8 const lit_5076[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B109FC, &lit_5076); +COMPILER_STRIP_GATE(0x80B109FC, &lit_5076); #pragma pop /* 80B10A04-80B10A08 000150 0004+00 0/2 0/0 0/0 .rodata @5077 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5077 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(80B10A04, &lit_5077); +COMPILER_STRIP_GATE(0x80B10A04, &lit_5077); #pragma pop /* 80B0E304-80B0E784 001C24 0480+00 2/0 0/0 0/0 .text follow__10daNpcTkc_cFv */ @@ -1546,21 +1568,21 @@ asm void daNpcTkc_c::follow() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5102 = 5.5f; -COMPILER_STRIP_GATE(80B10A08, &lit_5102); +COMPILER_STRIP_GATE(0x80B10A08, &lit_5102); #pragma pop /* 80B10A0C-80B10A10 000158 0004+00 0/1 0/0 0/0 .rodata @5103 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5103 = -37.0f / 10.0f; -COMPILER_STRIP_GATE(80B10A0C, &lit_5103); +COMPILER_STRIP_GATE(0x80B10A0C, &lit_5103); #pragma pop /* 80B10A10-80B10A14 00015C 0004+00 0/1 0/0 0/0 .rodata @5104 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5104 = 0.5f; -COMPILER_STRIP_GATE(80B10A10, &lit_5104); +COMPILER_STRIP_GATE(0x80B10A10, &lit_5104); #pragma pop /* 80B0E784-80B0E8EC 0020A4 0168+00 2/0 0/0 0/0 .text appear__10daNpcTkc_cFv */ @@ -1623,6 +1645,13 @@ asm void daNpcTkc_c::demo() { } #pragma pop +/* ############################################################################################## */ +/* 80B10A2C-80B10A2C 000178 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80B10A5A = "prm"; +#pragma pop + /* 80B0F00C-80B0F1F8 00292C 01EC+00 1/0 0/0 0/0 .text EvCut_TksSecretChild__10daNpcTkc_cFi */ #pragma push #pragma optimization_level 0 @@ -1649,14 +1678,14 @@ asm void daNpcTkc_c::EvCut_TksWarpExit(int param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5348 = 40.0f; -COMPILER_STRIP_GATE(80B10A14, &lit_5348); +COMPILER_STRIP_GATE(0x80B10A14, &lit_5348); #pragma pop /* 80B10A18-80B10A1C 000164 0004+00 0/1 0/0 0/0 .rodata @5349 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5349 = 4.0f / 5.0f; -COMPILER_STRIP_GATE(80B10A18, &lit_5349); +COMPILER_STRIP_GATE(0x80B10A18, &lit_5349); #pragma pop /* 80B0F5D4-80B0F9A4 002EF4 03D0+00 1/0 0/0 0/0 .text EvCut_TksWarpBack__10daNpcTkc_cFi @@ -1764,7 +1793,7 @@ SECTION_RODATA static f32 const lit_5559[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80B10A1C, &lit_5559); +COMPILER_STRIP_GATE(0x80B10A1C, &lit_5559); #pragma pop /* 80B0FDE4-80B0FFD4 003704 01F0+00 1/0 0/0 0/0 .text setAttnPos__10daNpcTkc_cFv */ @@ -1911,7 +1940,7 @@ asm cCcD_GStts::~cCcD_GStts() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80B106B8(int* param_0) { +extern "C" asm void func_80B106B8(void* _this, int* param_0) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_tkc/d_a_npc_tkc/func_80B106B8.s" } @@ -1921,7 +1950,7 @@ extern "C" asm void func_80B106B8(int* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80B106D4(f32 param_0, f32 param_1) { +extern "C" asm void func_80B106D4(void* _this, f32 param_0, f32 param_1) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_tkc/d_a_npc_tkc/func_80B106D4.s" } @@ -1932,13 +1961,13 @@ extern "C" asm void func_80B106D4(f32 param_0, f32 param_1) { SECTION_RODATA static u8 const lit_5581[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B10A24, &lit_5581); +COMPILER_STRIP_GATE(0x80B10A24, &lit_5581); /* 80B10710-80B1078C 004030 007C+00 2/2 0/0 0/0 .text cLib_getRndValue__Fii */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80B10710(int param_0, int param_1) { +extern "C" asm void func_80B10710(void* _this, int param_0, int param_1) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_tkc/d_a_npc_tkc/func_80B10710.s" } @@ -1970,7 +1999,7 @@ asm void __sinit_d_a_npc_tkc_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80B1078C = (void*)__sinit_d_a_npc_tkc_cpp; +REGISTER_CTORS(0x80B1078C, __sinit_d_a_npc_tkc_cpp); #pragma pop /* 80B10848-80B10890 004168 0048+00 2/1 0/0 0/0 .text __dt__16daNpcTkc_Param_cFv */ @@ -2003,16 +2032,4 @@ static asm void func_80B10898() { } #pragma pop -/* 80B10A2C-80B10A5E 000178 0032+00 10/7 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80B10A2C = ""; -SECTION_DEAD static char const* const stringBase_80B10A2D = "TKS_SECRET"; -SECTION_DEAD static char const* const stringBase_80B10A38 = "TKS_WARP"; -SECTION_DEAD static char const* const stringBase_80B10A41 = "TKC_WARP"; -SECTION_DEAD static char const* const stringBase_80B10A4A = "Tkc"; -SECTION_DEAD static char const* const stringBase_80B10A4E = "D_MN07"; -SECTION_DEAD static char const* const stringBase_80B10A55 = "Type"; -SECTION_DEAD static char const* const stringBase_80B10A5A = "prm"; -#pragma pop +/* 80B10A2C-80B10A2C 000178 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/npc/d_a_npc_tkj/d_a_npc_tkj.cpp b/rel/d/a/npc/d_a_npc_tkj/d_a_npc_tkj.cpp index 02ca907d847..b10b5cc20d1 100644 --- a/rel/d/a/npc/d_a_npc_tkj/d_a_npc_tkj.cpp +++ b/rel/d/a/npc/d_a_npc_tkj/d_a_npc_tkj.cpp @@ -15,12 +15,14 @@ struct mDoMtx_stack_c { static u8 now[48]; }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; +struct J3DAnmTransform {}; + +struct J3DModelData {}; + struct Vec {}; struct Z2Creature { @@ -29,8 +31,6 @@ struct Z2Creature { /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -49,6 +49,8 @@ struct daNpc_Tkj_Param_c { static u8 const m[140]; }; +struct daNpcT_faceMotionAnmData_c {}; + struct daNpcT_MotionSeqMngr_c { struct sequenceStepData_c {}; @@ -56,14 +58,12 @@ struct daNpcT_MotionSeqMngr_c { /* 80575D54 */ ~daNpcT_MotionSeqMngr_c(); }; +struct daNpcT_evtData_c {}; + struct daNpcT_motionAnmData_c {}; struct J3DJoint {}; -struct daNpcT_faceMotionAnmData_c {}; - -struct daNpcT_evtData_c {}; - struct daNpcTkj_c { /* 8057372C */ ~daNpcTkj_c(); /* 80573850 */ void create(); @@ -113,6 +113,8 @@ struct dCcD_GObjInf { /* 800840E4 */ ~dCcD_GObjInf(); }; +struct _GXColorS10 {}; + struct J3DModel {}; struct cXyz { @@ -121,8 +123,6 @@ struct cXyz { /* 80575D08 */ cXyz(); }; -struct _GXColorS10 {}; - struct daNpcT_c { /* 80147FA4 */ void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*); /* 801483F8 */ void loadRes(s8 const*, char const**); @@ -269,13 +269,13 @@ struct dBgS_AcchCir { /* 80575D9C */ ~dBgS_AcchCir(); }; -struct dBgS {}; - struct csXyz { /* 805757C8 */ ~csXyz(); /* 80575C08 */ csXyz(); }; +struct dBgS {}; + struct dBgS_Acch { /* 80075F94 */ ~dBgS_Acch(); /* 800760A0 */ dBgS_Acch(); @@ -605,6 +605,15 @@ extern "C" void __register_global_object(); // /* ############################################################################################## */ +/* 8057668C-8057668C 0000F4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8057668C = ""; +SECTION_DEAD static char const* const stringBase_8057668D = "DEFAULT_GETITEM"; +SECTION_DEAD static char const* const stringBase_8057669D = "Tkj"; +SECTION_DEAD static char const* const stringBase_805766A1 = "LV7_FIRST_START"; +#pragma pop + /* 805766B4-805766C0 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -919,34 +928,34 @@ SECTION_RODATA u8 const daNpc_Tkj_Param_c::m[140] = { 0xC1, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC1, 0xA0, 0x00, 0x00, 0x41, 0xA0, 0x00, 0x00, 0x42, 0x20, 0x00, 0x00, 0x41, 0xA0, 0x00, 0x00, 0x42, 0xDC, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80576598, &daNpc_Tkj_Param_c::m); +COMPILER_STRIP_GATE(0x80576598, &daNpc_Tkj_Param_c::m); /* 80576624-80576628 00008C 0004+00 0/1 0/0 0/0 .rodata @4129 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4129 = -300.0f; -COMPILER_STRIP_GATE(80576624, &lit_4129); +COMPILER_STRIP_GATE(0x80576624, &lit_4129); #pragma pop /* 80576628-8057662C 000090 0004+00 0/1 0/0 0/0 .rodata @4130 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4130 = -50.0f; -COMPILER_STRIP_GATE(80576628, &lit_4130); +COMPILER_STRIP_GATE(0x80576628, &lit_4130); #pragma pop /* 8057662C-80576630 000094 0004+00 0/1 0/0 0/0 .rodata @4131 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4131 = 300.0f; -COMPILER_STRIP_GATE(8057662C, &lit_4131); +COMPILER_STRIP_GATE(0x8057662C, &lit_4131); #pragma pop /* 80576630-80576634 000098 0004+00 0/1 0/0 0/0 .rodata @4132 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4132 = 450.0f; -COMPILER_STRIP_GATE(80576630, &lit_4132); +COMPILER_STRIP_GATE(0x80576630, &lit_4132); #pragma pop /* 80573850-80573B18 000210 02C8+00 1/1 0/0 0/0 .text create__10daNpcTkj_cFv */ @@ -967,25 +976,25 @@ SECTION_RODATA static u8 const lit_4286[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80576634, &lit_4286); +COMPILER_STRIP_GATE(0x80576634, &lit_4286); /* 80576638-8057663C 0000A0 0004+00 0/2 0/0 0/0 .rodata @4287 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4287 = 65536.0f; -COMPILER_STRIP_GATE(80576638, &lit_4287); +COMPILER_STRIP_GATE(0x80576638, &lit_4287); #pragma pop /* 8057663C-80576640 0000A4 0004+00 0/3 0/0 0/0 .rodata @4288 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4288 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(8057663C, &lit_4288); +COMPILER_STRIP_GATE(0x8057663C, &lit_4288); #pragma pop /* 80576640-80576644 0000A8 0004+00 2/4 0/0 0/0 .rodata @4437 */ SECTION_RODATA static f32 const lit_4437 = 1.0f; -COMPILER_STRIP_GATE(80576640, &lit_4437); +COMPILER_STRIP_GATE(0x80576640, &lit_4437); /* 80573B18-80573DAC 0004D8 0294+00 1/1 0/0 0/0 .text CreateHeap__10daNpcTkj_cFv */ #pragma push @@ -1120,7 +1129,7 @@ asm void daNpcTkj_c::Execute() { /* ############################################################################################## */ /* 80576644-80576648 0000AC 0004+00 1/1 0/0 0/0 .rodata @4487 */ SECTION_RODATA static f32 const lit_4487 = 100.0f; -COMPILER_STRIP_GATE(80576644, &lit_4487); +COMPILER_STRIP_GATE(0x80576644, &lit_4487); /* 80573FBC-80574058 00097C 009C+00 1/1 0/0 0/0 .text Draw__10daNpcTkj_cFv */ #pragma push @@ -1197,7 +1206,7 @@ asm void daNpcTkj_c::reset() { /* ############################################################################################## */ /* 80576648-8057664C 0000B0 0004+00 2/3 0/0 0/0 .rodata @4541 */ SECTION_RODATA static f32 const lit_4541 = -1.0f; -COMPILER_STRIP_GATE(80576648, &lit_4541); +COMPILER_STRIP_GATE(0x80576648, &lit_4541); /* 80574268-805742C8 000C28 0060+00 1/0 0/0 0/0 .text setAfterTalkMotion__10daNpcTkj_cFv */ @@ -1255,7 +1264,7 @@ asm void daNpcTkj_c::action() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4670 = -30.0f; -COMPILER_STRIP_GATE(8057664C, &lit_4670); +COMPILER_STRIP_GATE(0x8057664C, &lit_4670); #pragma pop /* 80576650-80576658 0000B8 0004+04 0/1 0/0 0/0 .rodata @4671 */ @@ -1266,14 +1275,14 @@ SECTION_RODATA static u32 const lit_4671[1 + 1 /* padding */] = { /* padding */ 0x00000000, }; -COMPILER_STRIP_GATE(80576650, &lit_4671); +COMPILER_STRIP_GATE(0x80576650, &lit_4671); #pragma pop /* 80576658-80576660 0000C0 0008+00 1/3 0/0 0/0 .rodata @4673 */ SECTION_RODATA static u8 const lit_4673[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80576658, &lit_4673); +COMPILER_STRIP_GATE(0x80576658, &lit_4673); /* 80574524-80574770 000EE4 024C+00 1/0 0/0 0/0 .text setAttnPos__10daNpcTkj_cFv */ #pragma push @@ -1315,7 +1324,7 @@ asm void daNpcTkj_c::selectAction() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpcTkj_c::chkAction(int (daNpcTkj_c::*)(void*)) { +asm void daNpcTkj_c::chkAction(int (daNpcTkj_c::*param_0)(void*)) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_tkj/d_a_npc_tkj/chkAction__10daNpcTkj_cFM10daNpcTkj_cFPCvPvPv_i.s" } @@ -1326,7 +1335,7 @@ asm void daNpcTkj_c::chkAction(int (daNpcTkj_c::*)(void*)) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpcTkj_c::setAction(int (daNpcTkj_c::*)(void*)) { +asm void daNpcTkj_c::setAction(int (daNpcTkj_c::*param_0)(void*)) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_tkj/d_a_npc_tkj/setAction__10daNpcTkj_cFM10daNpcTkj_cFPCvPvPv_i.s" } @@ -1359,7 +1368,7 @@ asm void daNpcTkj_c::talk(void* param_0) { SECTION_RODATA static u8 const lit_4731[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80576660, &lit_4731); +COMPILER_STRIP_GATE(0x80576660, &lit_4731); #pragma pop /* 80576668-80576670 0000D0 0008+00 0/2 0/0 0/0 .rodata @4732 */ @@ -1368,7 +1377,7 @@ COMPILER_STRIP_GATE(80576660, &lit_4731); SECTION_RODATA static u8 const lit_4732[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80576668, &lit_4732); +COMPILER_STRIP_GATE(0x80576668, &lit_4732); #pragma pop /* 80576670-80576678 0000D8 0008+00 0/2 0/0 0/0 .rodata @4733 */ @@ -1377,35 +1386,35 @@ COMPILER_STRIP_GATE(80576668, &lit_4732); SECTION_RODATA static u8 const lit_4733[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80576670, &lit_4733); +COMPILER_STRIP_GATE(0x80576670, &lit_4733); #pragma pop /* 80576678-8057667C 0000E0 0004+00 0/1 0/0 0/0 .rodata @4972 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4972 = 13.5f; -COMPILER_STRIP_GATE(80576678, &lit_4972); +COMPILER_STRIP_GATE(0x80576678, &lit_4972); #pragma pop /* 8057667C-80576680 0000E4 0004+00 0/1 0/0 0/0 .rodata @4973 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4973 = 0x44DB2DFC; -COMPILER_STRIP_GATE(8057667C, &lit_4973); +COMPILER_STRIP_GATE(0x8057667C, &lit_4973); #pragma pop /* 80576680-80576684 0000E8 0004+00 0/1 0/0 0/0 .rodata @4974 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4974 = -200.0f; -COMPILER_STRIP_GATE(80576680, &lit_4974); +COMPILER_STRIP_GATE(0x80576680, &lit_4974); #pragma pop /* 80576684-80576688 0000EC 0004+00 0/1 0/0 0/0 .rodata @4975 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4975 = 0x45AB6F61; -COMPILER_STRIP_GATE(80576684, &lit_4975); +COMPILER_STRIP_GATE(0x80576684, &lit_4975); #pragma pop /* 80574D28-80575180 0016E8 0458+00 1/0 0/0 0/0 .text cutLv7Start__10daNpcTkj_cFi */ @@ -1486,7 +1495,7 @@ asm cCcD_GStts::~cCcD_GStts() { /* ############################################################################################## */ /* 80576688-8057668C 0000F0 0004+00 1/1 0/0 0/0 .rodata @5035 */ SECTION_RODATA static f32 const lit_5035 = 7.0f / 10.0f; -COMPILER_STRIP_GATE(80576688, &lit_5035); +COMPILER_STRIP_GATE(0x80576688, &lit_5035); /* 80575280-8057538C 001C40 010C+00 1/0 0/0 0/0 .text setParam__10daNpcTkj_cFv */ #pragma push @@ -1806,7 +1815,7 @@ asm void __sinit_d_a_npc_tkj_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80576328 = (void*)__sinit_d_a_npc_tkj_cpp; +REGISTER_CTORS(0x80576328, __sinit_d_a_npc_tkj_cpp); #pragma pop /* 805763B0-8057645C 002D70 00AC+00 1/1 0/0 0/0 .text @@ -1916,12 +1925,4 @@ static asm void func_8057657C() { } #pragma pop -/* 8057668C-805766B1 0000F4 0025+00 4/1 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_8057668C = ""; -SECTION_DEAD static char const* const stringBase_8057668D = "DEFAULT_GETITEM"; -SECTION_DEAD static char const* const stringBase_8057669D = "Tkj"; -SECTION_DEAD static char const* const stringBase_805766A1 = "LV7_FIRST_START"; -#pragma pop +/* 8057668C-8057668C 0000F4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/npc/d_a_npc_tkj2/d_a_npc_tkj2.cpp b/rel/d/a/npc/d_a_npc_tkj2/d_a_npc_tkj2.cpp index 6188c2fb108..ac93c0cf3ad 100644 --- a/rel/d/a/npc/d_a_npc_tkj2/d_a_npc_tkj2.cpp +++ b/rel/d/a/npc/d_a_npc_tkj2/d_a_npc_tkj2.cpp @@ -48,16 +48,16 @@ struct mDoExt_btkAnm { /* 8000D6D8 */ void entry(J3DMaterialTable*, f32); }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; - struct J3DAnmTransform {}; +struct J3DModelData {}; + +struct Z2Creature {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -391,11 +391,11 @@ extern "C" void __register_global_object(); /* ############################################################################################## */ /* 80B142DC-80B142E0 000000 0004+00 16/16 0/0 0/0 .rodata @3648 */ SECTION_RODATA static f32 const lit_3648 = 1.0f; -COMPILER_STRIP_GATE(80B142DC, &lit_3648); +COMPILER_STRIP_GATE(0x80B142DC, &lit_3648); /* 80B142E0-80B142E4 000004 0004+00 1/6 0/0 0/0 .rodata @3649 */ SECTION_RODATA static f32 const lit_3649 = 2.0f; -COMPILER_STRIP_GATE(80B142E0, &lit_3649); +COMPILER_STRIP_GATE(0x80B142E0, &lit_3649); /* 80B143B8-80B143D4 -00001 001C+00 1/1 0/0 0/0 .data @4761 */ SECTION_DATA static void* lit_4761[7] = { @@ -520,11 +520,17 @@ SECTION_RODATA static u8 const lit_3663[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B142E4, &lit_3663); +COMPILER_STRIP_GATE(0x80B142E4, &lit_3663); /* 80B142E8-80B142EC 00000C 0004+00 1/2 0/0 0/0 .rodata @3664 */ SECTION_RODATA static f32 const lit_3664 = -1.0f; -COMPILER_STRIP_GATE(80B142E8, &lit_3664); +COMPILER_STRIP_GATE(0x80B142E8, &lit_3664); + +/* 80B143AC-80B143AC 0000D0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80B143AC = "Tkj2"; +#pragma pop /* 80B10E20-80B10ECC 000120 00AC+00 6/6 0/0 0/0 .text anm_init__FP14npc_tkj2_classifUcf */ @@ -551,20 +557,20 @@ static asm void nodeCallBack(J3DJoint* param_0, int param_1) { /* ############################################################################################## */ /* 80B142EC-80B142F0 000010 0004+00 1/8 0/0 0/0 .rodata @3740 */ SECTION_RODATA static f32 const lit_3740 = 100.0f; -COMPILER_STRIP_GATE(80B142EC, &lit_3740); +COMPILER_STRIP_GATE(0x80B142EC, &lit_3740); /* 80B142F0-80B142F4 000014 0004+00 0/1 0/0 0/0 .rodata @3741 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3741 = 400.0f; -COMPILER_STRIP_GATE(80B142F0, &lit_3741); +COMPILER_STRIP_GATE(0x80B142F0, &lit_3741); #pragma pop /* 80B142F4-80B142F8 000018 0004+00 0/2 0/0 0/0 .rodata @3742 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3742 = 40.0f; -COMPILER_STRIP_GATE(80B142F4, &lit_3742); +COMPILER_STRIP_GATE(0x80B142F4, &lit_3742); #pragma pop /* 80B1101C-80B11130 00031C 0114+00 1/0 0/0 0/0 .text daNpc_Tkj2_Draw__FP14npc_tkj2_class @@ -603,21 +609,21 @@ static asm void mode_init_boomCarry(npc_tkj2_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3804 = 5.0f; -COMPILER_STRIP_GATE(80B142F8, &lit_3804); +COMPILER_STRIP_GATE(0x80B142F8, &lit_3804); #pragma pop /* 80B142FC-80B14300 000020 0004+00 0/7 0/0 0/0 .rodata @3805 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3805 = 20.0f; -COMPILER_STRIP_GATE(80B142FC, &lit_3805); +COMPILER_STRIP_GATE(0x80B142FC, &lit_3805); #pragma pop /* 80B14300-80B14304 000024 0004+00 0/2 0/0 0/0 .rodata @3806 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3806 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(80B14300, &lit_3806); +COMPILER_STRIP_GATE(0x80B14300, &lit_3806); #pragma pop /* 80B111F4-80B1142C 0004F4 0238+00 1/1 0/0 0/0 .text Wind_effect__FP14npc_tkj2_class */ @@ -635,14 +641,14 @@ static asm void Wind_effect(npc_tkj2_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3878 = 50.0f; -COMPILER_STRIP_GATE(80B14304, &lit_3878); +COMPILER_STRIP_GATE(0x80B14304, &lit_3878); #pragma pop /* 80B14308-80B1430C 00002C 0004+00 0/1 0/0 0/0 .rodata @3879 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3879 = 1000.0f; -COMPILER_STRIP_GATE(80B14308, &lit_3879); +COMPILER_STRIP_GATE(0x80B14308, &lit_3879); #pragma pop /* 80B1430C-80B14314 000030 0008+00 0/3 0/0 0/0 .rodata @3880 */ @@ -651,7 +657,7 @@ COMPILER_STRIP_GATE(80B14308, &lit_3879); SECTION_RODATA static u8 const lit_3880[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B1430C, &lit_3880); +COMPILER_STRIP_GATE(0x80B1430C, &lit_3880); #pragma pop /* 80B14314-80B1431C 000038 0008+00 0/3 0/0 0/0 .rodata @3881 */ @@ -660,7 +666,7 @@ COMPILER_STRIP_GATE(80B1430C, &lit_3880); SECTION_RODATA static u8 const lit_3881[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B14314, &lit_3881); +COMPILER_STRIP_GATE(0x80B14314, &lit_3881); #pragma pop /* 80B1431C-80B14324 000040 0008+00 0/3 0/0 0/0 .rodata @3882 */ @@ -669,7 +675,7 @@ COMPILER_STRIP_GATE(80B14314, &lit_3881); SECTION_RODATA static u8 const lit_3882[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B1431C, &lit_3882); +COMPILER_STRIP_GATE(0x80B1431C, &lit_3882); #pragma pop /* 80B1142C-80B1169C 00072C 0270+00 1/1 0/0 0/0 .text CheckRoof__FP14npc_tkj2_class */ @@ -697,7 +703,7 @@ asm cM3dGPla::~cM3dGPla() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3988 = -100.0f; -COMPILER_STRIP_GATE(80B14324, &lit_3988); +COMPILER_STRIP_GATE(0x80B14324, &lit_3988); #pragma pop /* 80B116E4-80B11AB0 0009E4 03CC+00 1/1 0/0 0/0 .text CheckWall__FP14npc_tkj2_classs */ @@ -713,7 +719,7 @@ static asm void CheckWall(npc_tkj2_class* param_0, s16 param_1) { /* ############################################################################################## */ /* 80B14328-80B1432C 00004C 0004+00 1/1 0/0 0/0 .rodata @4015 */ SECTION_RODATA static f32 const lit_4015 = 500.0f; -COMPILER_STRIP_GATE(80B14328, &lit_4015); +COMPILER_STRIP_GATE(0x80B14328, &lit_4015); /* 80B11AB0-80B11BD0 000DB0 0120+00 3/3 0/0 0/0 .text GndCheck2__FP14npc_tkj2_class */ #pragma push @@ -738,7 +744,7 @@ asm dBgS_ObjGndChk::~dBgS_ObjGndChk() { /* ############################################################################################## */ /* 80B1432C-80B14330 000050 0004+00 1/1 0/0 0/0 .rodata @4035 */ SECTION_RODATA static f32 const lit_4035 = -500.0f; -COMPILER_STRIP_GATE(80B1432C, &lit_4035); +COMPILER_STRIP_GATE(0x80B1432C, &lit_4035); /* 80B11C48-80B11CCC 000F48 0084+00 2/2 0/0 0/0 .text GndCheck__FP14npc_tkj2_class4cXyz */ @@ -756,49 +762,49 @@ static asm void GndCheck(npc_tkj2_class* param_0, cXyz param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4107 = 70.0f; -COMPILER_STRIP_GATE(80B14330, &lit_4107); +COMPILER_STRIP_GATE(0x80B14330, &lit_4107); #pragma pop /* 80B14334-80B14338 000058 0004+00 0/2 0/0 0/0 .rodata @4108 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4108 = 3.0f; -COMPILER_STRIP_GATE(80B14334, &lit_4108); +COMPILER_STRIP_GATE(0x80B14334, &lit_4108); #pragma pop /* 80B14338-80B1433C 00005C 0004+00 0/3 0/0 0/0 .rodata @4109 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4109 = 200.0f; -COMPILER_STRIP_GATE(80B14338, &lit_4109); +COMPILER_STRIP_GATE(0x80B14338, &lit_4109); #pragma pop /* 80B1433C-80B14340 000060 0004+00 0/1 0/0 0/0 .rodata @4110 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4110 = 300.0f; -COMPILER_STRIP_GATE(80B1433C, &lit_4110); +COMPILER_STRIP_GATE(0x80B1433C, &lit_4110); #pragma pop /* 80B14340-80B14344 000064 0004+00 0/1 0/0 0/0 .rodata @4111 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4111 = 4000.0f; -COMPILER_STRIP_GATE(80B14340, &lit_4111); +COMPILER_STRIP_GATE(0x80B14340, &lit_4111); #pragma pop /* 80B14344-80B14348 000068 0004+00 0/2 0/0 0/0 .rodata @4112 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4112 = 30.0f; -COMPILER_STRIP_GATE(80B14344, &lit_4112); +COMPILER_STRIP_GATE(0x80B14344, &lit_4112); #pragma pop /* 80B14348-80B1434C 00006C 0004+00 0/1 0/0 0/0 .rodata @4113 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4113 = 60.0f; -COMPILER_STRIP_GATE(80B14348, &lit_4113); +COMPILER_STRIP_GATE(0x80B14348, &lit_4113); #pragma pop /* 80B11CCC-80B120DC 000FCC 0410+00 1/1 0/0 0/0 .text npc_tkj2_normal__FP14npc_tkj2_class @@ -828,7 +834,13 @@ static asm void return_pos_get(npc_tkj2_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4251 = 15.0f; -COMPILER_STRIP_GATE(80B1434C, &lit_4251); +COMPILER_STRIP_GATE(0x80B1434C, &lit_4251); +#pragma pop + +/* 80B143AC-80B143AC 0000D0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80B143B1 = "D_MN07"; #pragma pop /* 80B14500-80B14504 000008 0004+00 2/2 0/0 0/0 .bss None */ @@ -856,28 +868,28 @@ static asm void npc_tkj2_carry(npc_tkj2_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4281 = 3.0f / 10.0f; -COMPILER_STRIP_GATE(80B14350, &lit_4281); +COMPILER_STRIP_GATE(0x80B14350, &lit_4281); #pragma pop /* 80B14354-80B14358 000078 0004+00 0/5 0/0 0/0 .rodata @4282 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4282 = 10.0f; -COMPILER_STRIP_GATE(80B14354, &lit_4282); +COMPILER_STRIP_GATE(0x80B14354, &lit_4282); #pragma pop /* 80B14358-80B1435C 00007C 0004+00 0/4 0/0 0/0 .rodata @4283 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4283 = 0.5f; -COMPILER_STRIP_GATE(80B14358, &lit_4283); +COMPILER_STRIP_GATE(0x80B14358, &lit_4283); #pragma pop /* 80B1435C-80B14360 000080 0004+00 0/1 0/0 0/0 .rodata @4284 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4284 = -20.0f; -COMPILER_STRIP_GATE(80B1435C, &lit_4284); +COMPILER_STRIP_GATE(0x80B1435C, &lit_4284); #pragma pop /* 80B125D0-80B12750 0018D0 0180+00 1/1 0/0 0/0 .text npc_tkj2_fly__FP14npc_tkj2_class */ @@ -895,7 +907,7 @@ static asm void npc_tkj2_fly(npc_tkj2_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4296 = -2.0f; -COMPILER_STRIP_GATE(80B14360, &lit_4296); +COMPILER_STRIP_GATE(0x80B14360, &lit_4296); #pragma pop /* 80B12750-80B12810 001A50 00C0+00 1/1 0/0 0/0 .text npc_tkj2_drop__FP14npc_tkj2_class @@ -914,14 +926,14 @@ static asm void npc_tkj2_drop(npc_tkj2_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4429 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(80B14364, &lit_4429); +COMPILER_STRIP_GATE(0x80B14364, &lit_4429); #pragma pop /* 80B14368-80B1436C 00008C 0004+00 0/1 0/0 0/0 .rodata @4430 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4430 = 1.5f; -COMPILER_STRIP_GATE(80B14368, &lit_4430); +COMPILER_STRIP_GATE(0x80B14368, &lit_4430); #pragma pop /* 80B12810-80B12D20 001B10 0510+00 1/1 0/0 0/0 .text npc_tkj2_return__FP14npc_tkj2_class @@ -950,7 +962,7 @@ static asm void ObjHit(npc_tkj2_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4755 = -5.0f; -COMPILER_STRIP_GATE(80B1436C, &lit_4755); +COMPILER_STRIP_GATE(0x80B1436C, &lit_4755); #pragma pop /* 80B12E88-80B1376C 002188 08E4+00 2/1 0/0 0/0 .text action__FP14npc_tkj2_class */ @@ -968,35 +980,35 @@ static asm void action(npc_tkj2_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4756 = -15.0f; -COMPILER_STRIP_GATE(80B14370, &lit_4756); +COMPILER_STRIP_GATE(0x80B14370, &lit_4756); #pragma pop /* 80B14374-80B14378 000098 0004+00 0/0 0/0 0/0 .rodata @4757 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4757 = -80.0f; -COMPILER_STRIP_GATE(80B14374, &lit_4757); +COMPILER_STRIP_GATE(0x80B14374, &lit_4757); #pragma pop /* 80B14378-80B1437C 00009C 0004+00 0/0 0/0 0/0 .rodata @4758 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4758 = -110.0f; -COMPILER_STRIP_GATE(80B14378, &lit_4758); +COMPILER_STRIP_GATE(0x80B14378, &lit_4758); #pragma pop /* 80B1437C-80B14380 0000A0 0004+00 0/0 0/0 0/0 .rodata @4759 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4759 = 2000.0f; -COMPILER_STRIP_GATE(80B1437C, &lit_4759); +COMPILER_STRIP_GATE(0x80B1437C, &lit_4759); #pragma pop /* 80B14380-80B14384 0000A4 0004+00 0/0 0/0 0/0 .rodata @4760 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4760 = 250.0f; -COMPILER_STRIP_GATE(80B14380, &lit_4760); +COMPILER_STRIP_GATE(0x80B14380, &lit_4760); #pragma pop /* 80B14384-80B1438C 0000A8 0008+00 0/0 0/0 0/0 .rodata @4763 */ @@ -1005,56 +1017,56 @@ COMPILER_STRIP_GATE(80B14380, &lit_4760); SECTION_RODATA static u8 const lit_4763[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B14384, &lit_4763); +COMPILER_STRIP_GATE(0x80B14384, &lit_4763); #pragma pop /* 80B1438C-80B14390 0000B0 0004+00 0/1 0/0 0/0 .rodata @4858 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4858 = 7.0f; -COMPILER_STRIP_GATE(80B1438C, &lit_4858); +COMPILER_STRIP_GATE(0x80B1438C, &lit_4858); #pragma pop /* 80B14390-80B14394 0000B4 0004+00 0/1 0/0 0/0 .rodata @4859 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4859 = 13.0f; -COMPILER_STRIP_GATE(80B14390, &lit_4859); +COMPILER_STRIP_GATE(0x80B14390, &lit_4859); #pragma pop /* 80B14394-80B14398 0000B8 0004+00 0/1 0/0 0/0 .rodata @4860 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4860 = 6.0f; -COMPILER_STRIP_GATE(80B14394, &lit_4860); +COMPILER_STRIP_GATE(0x80B14394, &lit_4860); #pragma pop /* 80B14398-80B1439C 0000BC 0004+00 0/1 0/0 0/0 .rodata @4861 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4861 = 11.0f; -COMPILER_STRIP_GATE(80B14398, &lit_4861); +COMPILER_STRIP_GATE(0x80B14398, &lit_4861); #pragma pop /* 80B1439C-80B143A0 0000C0 0004+00 0/1 0/0 0/0 .rodata @4862 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4862 = 16.0f; -COMPILER_STRIP_GATE(80B1439C, &lit_4862); +COMPILER_STRIP_GATE(0x80B1439C, &lit_4862); #pragma pop /* 80B143A0-80B143A4 0000C4 0004+00 0/1 0/0 0/0 .rodata @4863 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4863 = 17.0f; -COMPILER_STRIP_GATE(80B143A0, &lit_4863); +COMPILER_STRIP_GATE(0x80B143A0, &lit_4863); #pragma pop /* 80B143A4-80B143A8 0000C8 0004+00 0/1 0/0 0/0 .rodata @4864 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4864 = 19.0f; -COMPILER_STRIP_GATE(80B143A4, &lit_4864); +COMPILER_STRIP_GATE(0x80B143A4, &lit_4864); #pragma pop /* 80B1376C-80B13B38 002A6C 03CC+00 2/1 0/0 0/0 .text daNpc_Tkj2_Execute__FP14npc_tkj2_class */ @@ -1107,7 +1119,7 @@ asm J3DFrameCtrl::~J3DFrameCtrl() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5080 = 80.0f; -COMPILER_STRIP_GATE(80B143A8, &lit_5080); +COMPILER_STRIP_GATE(0x80B143A8, &lit_5080); #pragma pop /* 80B13E68-80B1411C 003168 02B4+00 1/0 0/0 0/0 .text daNpc_Tkj2_Create__FP10fopAc_ac_c @@ -1173,7 +1185,7 @@ asm void __sinit_d_a_npc_tkj2_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80B14264 = (void*)__sinit_d_a_npc_tkj2_cpp; +REGISTER_CTORS(0x80B14264, __sinit_d_a_npc_tkj2_cpp); #pragma pop /* 80B142A0-80B142A8 0035A0 0008+00 1/0 0/0 0/0 .text @20@__dt__14dBgS_ObjGndChkFv */ @@ -1226,10 +1238,4 @@ static asm void func_80B142C0() { } #pragma pop -/* 80B143AC-80B143B8 0000D0 000C+00 5/5 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80B143AC = "Tkj2"; -SECTION_DEAD static char const* const stringBase_80B143B1 = "D_MN07"; -#pragma pop +/* 80B143AC-80B143AC 0000D0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/npc/d_a_npc_tks/d_a_npc_tks.cpp b/rel/d/a/npc/d_a_npc_tks/d_a_npc_tks.cpp index 2e99ae6e3df..47c928b93b8 100644 --- a/rel/d/a/npc/d_a_npc_tks/d_a_npc_tks.cpp +++ b/rel/d/a/npc/d_a_npc_tks/d_a_npc_tks.cpp @@ -41,12 +41,12 @@ struct mDoExt_bckAnm { /* 8000D990 */ void changeBckOnly(J3DAnmTransform*); }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; +struct J3DModelData {}; + struct Z2Creature { /* 802C03C8 */ Z2Creature(); /* 802C0420 */ ~Z2Creature(); @@ -74,10 +74,10 @@ struct daObj { /* 80037210 */ void make_eff_break_kotubo2(fopAc_ac_c*); }; -struct J3DJoint {}; - struct J3DModel {}; +struct J3DJoint {}; + struct daNpcTks_c { /* 80B1462C */ daNpcTks_c(); /* 80B14844 */ ~daNpcTks_c(); @@ -139,16 +139,16 @@ struct daNpcTkc_c { /* 80B0D37C */ void setActionFollow(); }; -struct J3DAnmTextureSRTKey {}; - -struct _GXColorS10 {}; - struct J3DAnmTexPattern { /* 8032AF50 */ void getTexNo(u16, u16*) const; }; +struct J3DAnmTextureSRTKey {}; + struct J3DAnmTransformKey {}; +struct _GXColorS10 {}; + struct daNpcF_c { struct daNpcF_anmPlayData {}; @@ -251,7 +251,6 @@ struct dEvt_control_c { /* 80042518 */ void reset(void*); /* 80042958 */ void setSkipZev(void*, char*); /* 8004368C */ void setPtT(void*); - /* 800436EC */ void setPtI_Id(unsigned int); }; struct dEvent_manager_c { @@ -381,7 +380,7 @@ struct JMath { struct TSinCosTable {}; /* TSinCosTable<13, f32> */ struct TSinCosTable__template0 { - /* 80B1D35C */ void func_80B1D35C(s16) /* const */; + /* 80B1D35C */ void func_80B1D35C(void* _this, s16) /* const */; }; static u8 sincosTable_[65536]; @@ -497,15 +496,15 @@ extern "C" static bool daNpcTks_IsDelete__FPv(); extern "C" void calc__11J3DTexNoAnmCFPUs(); extern "C" void setParam__10daNpcTks_cFv(); extern "C" void main__10daNpcTks_cFv(); -extern "C" void func_80B1CB4C(u32, u32); +extern "C" void func_80B1CB4C(void* _this, u32, u32); extern "C" void ctrlBtk__10daNpcTks_cFv(); extern "C" void setAttnPos__10daNpcTks_cFv(); extern "C" void lookat__10daNpcTks_cFv(); extern "C" bool drawDbgInfo__10daNpcTks_cFv(); extern "C" void drawOtherMdls__10daNpcTks_cFv(); -extern "C" void func_80B1D35C(s16); -extern "C" void func_80B1D368(int*); -extern "C" void func_80B1D384(int, int); +extern "C" void func_80B1D35C(void* _this, s16); +extern "C" void func_80B1D368(void* _this, int*); +extern "C" void func_80B1D384(void* _this, int, int); extern "C" void __sinit_d_a_npc_tks_cpp(); extern "C" void __dt__18daNpcF_ActorMngr_cFv(); extern "C" void __ct__18daNpcF_ActorMngr_cFv(); @@ -738,6 +737,16 @@ extern "C" void __register_global_object(); // /* ############################################################################################## */ +/* 80B1E048-80B1E048 0002F0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80B1E048 = "TKS"; +SECTION_DEAD static char const* const stringBase_80B1E04C = "J_tubo_00"; +SECTION_DEAD static char const* const stringBase_80B1E056 = "K_tubo02"; +SECTION_DEAD static char const* const stringBase_80B1E05F = "TKS_ENCOUNTER"; +SECTION_DEAD static char const* const stringBase_80B1E06D = "Tks"; +#pragma pop + /* 80B1E0E4-80B1E0F0 000000 000C+00 6/6 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -1360,48 +1369,48 @@ SECTION_RODATA u8 const daNpcTks_Param_c::m[152] = { 0x43, 0xFA, 0x00, 0x00, 0x42, 0x0C, 0x00, 0x00, 0x41, 0xC8, 0x00, 0x00, 0x40, 0xE0, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x40, 0xA0, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B1DD58, &daNpcTks_Param_c::m); +COMPILER_STRIP_GATE(0x80B1DD58, &daNpcTks_Param_c::m); /* 80B1DDF0-80B1DDF4 000098 0004+00 0/2 0/0 0/0 .rodata @4467 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4467 = -80.0f; -COMPILER_STRIP_GATE(80B1DDF0, &lit_4467); +COMPILER_STRIP_GATE(0x80B1DDF0, &lit_4467); #pragma pop /* 80B1DDF4-80B1DDF8 00009C 0004+00 0/1 0/0 0/0 .rodata @4468 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4468 = -30.0f; -COMPILER_STRIP_GATE(80B1DDF4, &lit_4468); +COMPILER_STRIP_GATE(0x80B1DDF4, &lit_4468); #pragma pop /* 80B1DDF8-80B1DDFC 0000A0 0004+00 0/3 0/0 0/0 .rodata @4469 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4469 = 80.0f; -COMPILER_STRIP_GATE(80B1DDF8, &lit_4469); +COMPILER_STRIP_GATE(0x80B1DDF8, &lit_4469); #pragma pop /* 80B1DDFC-80B1DE00 0000A4 0004+00 0/4 0/0 0/0 .rodata @4470 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4470 = 10.0f; -COMPILER_STRIP_GATE(80B1DDFC, &lit_4470); +COMPILER_STRIP_GATE(0x80B1DDFC, &lit_4470); #pragma pop /* 80B1DE00-80B1DE04 0000A8 0004+00 0/2 0/0 0/0 .rodata @4471 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4471 = 100.0f; -COMPILER_STRIP_GATE(80B1DE00, &lit_4471); +COMPILER_STRIP_GATE(0x80B1DE00, &lit_4471); #pragma pop /* 80B1DE04-80B1DE08 0000AC 0004+00 0/3 0/0 0/0 .rodata @4472 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4472 = 30.0f; -COMPILER_STRIP_GATE(80B1DE04, &lit_4472); +COMPILER_STRIP_GATE(0x80B1DE04, &lit_4472); #pragma pop /* 80B14AF8-80B14ED0 0005B8 03D8+00 1/1 0/0 0/0 .text Create__10daNpcTks_cFv */ @@ -1417,11 +1426,11 @@ asm void daNpcTks_c::Create() { /* ############################################################################################## */ /* 80B1DE08-80B1DE0C 0000B0 0004+00 3/12 0/0 0/0 .rodata @4537 */ SECTION_RODATA static f32 const lit_4537 = 1.0f; -COMPILER_STRIP_GATE(80B1DE08, &lit_4537); +COMPILER_STRIP_GATE(0x80B1DE08, &lit_4537); /* 80B1DE0C-80B1DE10 0000B4 0004+00 3/14 0/0 0/0 .rodata @4538 */ SECTION_RODATA static f32 const lit_4538 = -1.0f; -COMPILER_STRIP_GATE(80B1DE0C, &lit_4538); +COMPILER_STRIP_GATE(0x80B1DE0C, &lit_4538); /* 80B14ED0-80B1521C 000990 034C+00 1/1 0/0 0/0 .text CreateHeap__10daNpcTks_cFv */ #pragma push @@ -1568,7 +1577,7 @@ asm void daNpcTks_c::Draw() { SECTION_RODATA static u8 const lit_4586[12] = { 0x00, 0x00, 0x00, 0x0F, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x11, }; -COMPILER_STRIP_GATE(80B1DE10, &lit_4586); +COMPILER_STRIP_GATE(0x80B1DE10, &lit_4586); /* 80B1548C-80B15650 000F4C 01C4+00 1/1 0/0 0/0 .text ctrlJoint__10daNpcTks_cFP8J3DJointP8J3DModel */ @@ -1652,20 +1661,27 @@ SECTION_RODATA static u8 const lit_5011[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B1DE1C, &lit_5011); +COMPILER_STRIP_GATE(0x80B1DE1C, &lit_5011); /* 80B1DE20-80B1DE24 0000C8 0004+00 0/3 0/0 0/0 .rodata @5012 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5012 = 60.0f; -COMPILER_STRIP_GATE(80B1DE20, &lit_5012); +COMPILER_STRIP_GATE(0x80B1DE20, &lit_5012); #pragma pop /* 80B1DE24-80B1DE28 0000CC 0004+00 0/1 0/0 0/0 .rodata @5013 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5013 = 7500.0f; -COMPILER_STRIP_GATE(80B1DE24, &lit_5013); +COMPILER_STRIP_GATE(0x80B1DE24, &lit_5013); +#pragma pop + +/* 80B1E048-80B1E048 0002F0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80B1E071 = "D_MN11"; +SECTION_DEAD static char const* const stringBase_80B1E078 = "D_MN07"; #pragma pop /* 80B15A24-80B160A8 0014E4 0684+00 1/1 0/0 0/0 .text reset__10daNpcTks_cFv */ @@ -1683,7 +1699,7 @@ asm void daNpcTks_c::reset() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpcTks_c::setAction(void (daNpcTks_c::*)()) { +asm void daNpcTks_c::setAction(void (daNpcTks_c::*param_0)()) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_tks/d_a_npc_tks/setAction__10daNpcTks_cFM10daNpcTks_cFPCvPv_v.s" } @@ -1696,7 +1712,7 @@ asm void daNpcTks_c::setAction(void (daNpcTks_c::*)()) { SECTION_RODATA static u8 const lit_5014[12] = { 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B1DE28, &lit_5014); +COMPILER_STRIP_GATE(0x80B1DE28, &lit_5014); #pragma pop /* 80B1DE34-80B1DE38 0000DC 0004+00 0/1 0/0 0/0 .rodata @5015 */ @@ -1708,7 +1724,7 @@ SECTION_RODATA static u8 const lit_5015[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B1DE34, &lit_5015); +COMPILER_STRIP_GATE(0x80B1DE34, &lit_5015); #pragma pop /* 80B1DE38-80B1DE44 0000E0 000C+00 0/1 0/0 0/0 .rodata @5016 */ @@ -1717,7 +1733,7 @@ COMPILER_STRIP_GATE(80B1DE34, &lit_5015); SECTION_RODATA static u8 const lit_5016[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B1DE38, &lit_5016); +COMPILER_STRIP_GATE(0x80B1DE38, &lit_5016); #pragma pop /* 80B1DE44-80B1DE48 0000EC 0004+00 0/1 0/0 0/0 .rodata @5017 */ @@ -1729,7 +1745,7 @@ SECTION_RODATA static u8 const lit_5017[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B1DE44, &lit_5017); +COMPILER_STRIP_GATE(0x80B1DE44, &lit_5017); #pragma pop /* 80B1DE48-80B1DE50 0000F0 0008+00 0/1 0/0 0/0 .rodata @5018 */ @@ -1738,7 +1754,7 @@ COMPILER_STRIP_GATE(80B1DE44, &lit_5017); SECTION_RODATA static u8 const lit_5018[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B1DE48, &lit_5018); +COMPILER_STRIP_GATE(0x80B1DE48, &lit_5018); #pragma pop /* 80B1DE50-80B1DE5C 0000F8 000C+00 0/1 0/0 0/0 .rodata @5022 */ @@ -1747,7 +1763,7 @@ COMPILER_STRIP_GATE(80B1DE48, &lit_5018); SECTION_RODATA static u8 const lit_5022[12] = { 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B1DE50, &lit_5022); +COMPILER_STRIP_GATE(0x80B1DE50, &lit_5022); #pragma pop /* 80B1DE5C-80B1DE60 000104 0004+00 0/1 0/0 0/0 .rodata @5023 */ @@ -1759,7 +1775,7 @@ SECTION_RODATA static u8 const lit_5023[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B1DE5C, &lit_5023); +COMPILER_STRIP_GATE(0x80B1DE5C, &lit_5023); #pragma pop /* 80B1DE60-80B1DE6C 000108 000C+00 0/1 0/0 0/0 .rodata @5024 */ @@ -1768,7 +1784,7 @@ COMPILER_STRIP_GATE(80B1DE5C, &lit_5023); SECTION_RODATA static u8 const lit_5024[12] = { 0x00, 0x15, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B1DE60, &lit_5024); +COMPILER_STRIP_GATE(0x80B1DE60, &lit_5024); #pragma pop /* 80B1DE6C-80B1DE70 000114 0004+00 0/1 0/0 0/0 .rodata @5025 */ @@ -1780,7 +1796,7 @@ SECTION_RODATA static u8 const lit_5025[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B1DE6C, &lit_5025); +COMPILER_STRIP_GATE(0x80B1DE6C, &lit_5025); #pragma pop /* 80B1DE70-80B1DE7C 000118 000C+00 0/1 0/0 0/0 .rodata @5026 */ @@ -1789,7 +1805,7 @@ COMPILER_STRIP_GATE(80B1DE6C, &lit_5025); SECTION_RODATA static u8 const lit_5026[12] = { 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B1DE70, &lit_5026); +COMPILER_STRIP_GATE(0x80B1DE70, &lit_5026); #pragma pop /* 80B1DE7C-80B1DE80 000124 0004+00 0/1 0/0 0/0 .rodata @5027 */ @@ -1801,7 +1817,7 @@ SECTION_RODATA static u8 const lit_5027[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B1DE7C, &lit_5027); +COMPILER_STRIP_GATE(0x80B1DE7C, &lit_5027); #pragma pop /* 80B1DE80-80B1DE8C 000128 000C+00 0/1 0/0 0/0 .rodata @5028 */ @@ -1810,7 +1826,7 @@ COMPILER_STRIP_GATE(80B1DE7C, &lit_5027); SECTION_RODATA static u8 const lit_5028[12] = { 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B1DE80, &lit_5028); +COMPILER_STRIP_GATE(0x80B1DE80, &lit_5028); #pragma pop /* 80B1DE8C-80B1DE90 000134 0004+00 0/1 0/0 0/0 .rodata @5029 */ @@ -1822,7 +1838,7 @@ SECTION_RODATA static u8 const lit_5029[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B1DE8C, &lit_5029); +COMPILER_STRIP_GATE(0x80B1DE8C, &lit_5029); #pragma pop /* 80B1DE90-80B1DE9C 000138 000C+00 0/1 0/0 0/0 .rodata @5030 */ @@ -1831,7 +1847,7 @@ COMPILER_STRIP_GATE(80B1DE8C, &lit_5029); SECTION_RODATA static u8 const lit_5030[12] = { 0x00, 0x11, 0x00, 0x00, 0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80B1DE90, &lit_5030); +COMPILER_STRIP_GATE(0x80B1DE90, &lit_5030); #pragma pop /* 80B1DE9C-80B1DEA8 000144 000C+00 0/1 0/0 0/0 .rodata @5031 */ @@ -1840,7 +1856,7 @@ COMPILER_STRIP_GATE(80B1DE90, &lit_5030); SECTION_RODATA static u8 const lit_5031[12] = { 0x00, 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B1DE9C, &lit_5031); +COMPILER_STRIP_GATE(0x80B1DE9C, &lit_5031); #pragma pop /* 80B1DEA8-80B1DEB0 000150 0008+00 0/1 0/0 0/0 .rodata @5032 */ @@ -1849,7 +1865,7 @@ COMPILER_STRIP_GATE(80B1DE9C, &lit_5031); SECTION_RODATA static u8 const lit_5032[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B1DEA8, &lit_5032); +COMPILER_STRIP_GATE(0x80B1DEA8, &lit_5032); #pragma pop /* 80B1DEB0-80B1DEBC 000158 000C+00 0/1 0/0 0/0 .rodata @5033 */ @@ -1858,7 +1874,7 @@ COMPILER_STRIP_GATE(80B1DEA8, &lit_5032); SECTION_RODATA static u8 const lit_5033[12] = { 0x00, 0x13, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80B1DEB0, &lit_5033); +COMPILER_STRIP_GATE(0x80B1DEB0, &lit_5033); #pragma pop /* 80B1DEBC-80B1DEC0 000164 0004+00 0/1 0/0 0/0 .rodata @5034 */ @@ -1870,7 +1886,7 @@ SECTION_RODATA static u8 const lit_5034[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B1DEBC, &lit_5034); +COMPILER_STRIP_GATE(0x80B1DEBC, &lit_5034); #pragma pop /* 80B1DEC0-80B1DECC 000168 000C+00 0/1 0/0 0/0 .rodata @5035 */ @@ -1879,7 +1895,7 @@ COMPILER_STRIP_GATE(80B1DEBC, &lit_5034); SECTION_RODATA static u8 const lit_5035[12] = { 0x00, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80B1DEC0, &lit_5035); +COMPILER_STRIP_GATE(0x80B1DEC0, &lit_5035); #pragma pop /* 80B1DECC-80B1DED8 000174 000C+00 0/1 0/0 0/0 .rodata @5036 */ @@ -1888,7 +1904,7 @@ COMPILER_STRIP_GATE(80B1DEC0, &lit_5035); SECTION_RODATA static u8 const lit_5036[12] = { 0x00, 0x02, 0x00, 0x00, 0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B1DECC, &lit_5036); +COMPILER_STRIP_GATE(0x80B1DECC, &lit_5036); #pragma pop /* 80B1DED8-80B1DEE0 000180 0008+00 0/1 0/0 0/0 .rodata @5037 */ @@ -1897,7 +1913,7 @@ COMPILER_STRIP_GATE(80B1DECC, &lit_5036); SECTION_RODATA static u8 const lit_5037[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B1DED8, &lit_5037); +COMPILER_STRIP_GATE(0x80B1DED8, &lit_5037); #pragma pop /* 80B1DEE0-80B1DEEC 000188 000C+00 0/1 0/0 0/0 .rodata @5038 */ @@ -1906,7 +1922,7 @@ COMPILER_STRIP_GATE(80B1DED8, &lit_5037); SECTION_RODATA static u8 const lit_5038[12] = { 0x00, 0x03, 0x00, 0x00, 0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80B1DEE0, &lit_5038); +COMPILER_STRIP_GATE(0x80B1DEE0, &lit_5038); #pragma pop /* 80B1DEEC-80B1DEF0 000194 0004+00 0/1 0/0 0/0 .rodata @5039 */ @@ -1918,7 +1934,7 @@ SECTION_RODATA static u8 const lit_5039[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B1DEEC, &lit_5039); +COMPILER_STRIP_GATE(0x80B1DEEC, &lit_5039); #pragma pop /* 80B1DEF0-80B1DF10 000198 0020+00 0/0 0/0 0/0 .rodata @5040 */ @@ -1928,7 +1944,7 @@ SECTION_RODATA static u8 const lit_5040[32] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B1DEF0, &lit_5040); +COMPILER_STRIP_GATE(0x80B1DEF0, &lit_5040); #pragma pop /* 80B1DF10-80B1DF20 0001B8 000C+04 0/1 0/0 0/0 .rodata @5064 */ @@ -1953,7 +1969,7 @@ SECTION_RODATA static u8 const lit_5064[12 + 4 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B1DF10, &lit_5064); +COMPILER_STRIP_GATE(0x80B1DF10, &lit_5064); #pragma pop /* 80B1DF20-80B1DF28 0001C8 0008+00 0/3 0/0 0/0 .rodata @5165 */ @@ -1962,7 +1978,7 @@ COMPILER_STRIP_GATE(80B1DF10, &lit_5064); SECTION_RODATA static u8 const lit_5165[8] = { 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B1DF20, &lit_5165); +COMPILER_STRIP_GATE(0x80B1DF20, &lit_5165); #pragma pop /* 80B16148-80B16344 001C08 01FC+00 3/0 0/0 0/0 .text wait__10daNpcTks_cFv */ @@ -1990,21 +2006,21 @@ asm void daNpcTks_c::setMotionAnm(int param_0, f32 param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5263 = -200.0f; -COMPILER_STRIP_GATE(80B1DF28, &lit_5263); +COMPILER_STRIP_GATE(0x80B1DF28, &lit_5263); #pragma pop /* 80B1DF2C-80B1DF30 0001D4 0004+00 0/1 0/0 0/0 .rodata @5264 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5264 = 150.0f; -COMPILER_STRIP_GATE(80B1DF2C, &lit_5264); +COMPILER_STRIP_GATE(0x80B1DF2C, &lit_5264); #pragma pop /* 80B1DF30-80B1DF34 0001D8 0004+00 0/2 0/0 0/0 .rodata @5265 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5265 = 300.0f; -COMPILER_STRIP_GATE(80B1DF30, &lit_5265); +COMPILER_STRIP_GATE(0x80B1DF30, &lit_5265); #pragma pop /* 80B16634-80B1682C 0020F4 01F8+00 2/0 0/0 0/0 .text waitNude__10daNpcTks_cFv */ @@ -2022,7 +2038,7 @@ asm void daNpcTks_c::waitNude() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5356 = 400.0f; -COMPILER_STRIP_GATE(80B1DF34, &lit_5356); +COMPILER_STRIP_GATE(0x80B1DF34, &lit_5356); #pragma pop /* 80B1682C-80B16B74 0022EC 0348+00 1/0 0/0 0/0 .text waitLv6__10daNpcTks_cFv */ @@ -2040,21 +2056,28 @@ asm void daNpcTks_c::waitLv6() { #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_5430 = 0x3BB40000; -COMPILER_STRIP_GATE(80B1DF38, &lit_5430); +COMPILER_STRIP_GATE(0x80B1DF38, &lit_5430); #pragma pop /* 80B1DF3C-80B1DF40 0001E4 0004+00 0/6 0/0 0/0 .rodata @5431 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5431 = 15.0f; -COMPILER_STRIP_GATE(80B1DF3C, &lit_5431); +COMPILER_STRIP_GATE(0x80B1DF3C, &lit_5431); #pragma pop /* 80B1DF40-80B1DF48 0001E8 0008+00 1/5 0/0 0/0 .rodata @5433 */ SECTION_RODATA static u8 const lit_5433[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B1DF40, &lit_5433); +COMPILER_STRIP_GATE(0x80B1DF40, &lit_5433); + +/* 80B1E048-80B1E048 0002F0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80B1E07F = "WOLF_GET_TKS"; +SECTION_DEAD static char const* const stringBase_80B1E08C = "DEFAULT_GETITEM"; +#pragma pop /* 80B16B74-80B16FDC 002634 0468+00 2/0 0/0 0/0 .text talk__10daNpcTks_cFv */ #pragma push @@ -2173,7 +2196,7 @@ asm void daNpcTks_c::broken() { SECTION_RODATA static u8 const lit_5981[8] = { 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B1DF48, &lit_5981); +COMPILER_STRIP_GATE(0x80B1DF48, &lit_5981); #pragma pop /* 80B183E8-80B18D44 003EA8 095C+00 1/0 0/0 0/0 .text demo_appear__10daNpcTks_cFv */ @@ -2191,56 +2214,56 @@ asm void daNpcTks_c::demo_appear() { #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_6095 = 0xC7C05D9D; -COMPILER_STRIP_GATE(80B1DF50, &lit_6095); +COMPILER_STRIP_GATE(0x80B1DF50, &lit_6095); #pragma pop /* 80B1DF54-80B1DF58 0001FC 0004+00 0/1 0/0 0/0 .rodata @6096 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_6096 = 0xC68F5596; -COMPILER_STRIP_GATE(80B1DF54, &lit_6096); +COMPILER_STRIP_GATE(0x80B1DF54, &lit_6096); #pragma pop /* 80B1DF58-80B1DF5C 000200 0004+00 0/1 0/0 0/0 .rodata @6097 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_6097 = 0x474B5928; -COMPILER_STRIP_GATE(80B1DF58, &lit_6097); +COMPILER_STRIP_GATE(0x80B1DF58, &lit_6097); #pragma pop /* 80B1DF5C-80B1DF60 000204 0004+00 0/1 0/0 0/0 .rodata @6098 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6098 = 25.0f; -COMPILER_STRIP_GATE(80B1DF5C, &lit_6098); +COMPILER_STRIP_GATE(0x80B1DF5C, &lit_6098); #pragma pop /* 80B1DF60-80B1DF64 000208 0004+00 0/1 0/0 0/0 .rodata @6099 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_6099 = 0xC7C75B77; -COMPILER_STRIP_GATE(80B1DF60, &lit_6099); +COMPILER_STRIP_GATE(0x80B1DF60, &lit_6099); #pragma pop /* 80B1DF64-80B1DF68 00020C 0004+00 0/1 0/0 0/0 .rodata @6100 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6100 = -18470.0f; -COMPILER_STRIP_GATE(80B1DF64, &lit_6100); +COMPILER_STRIP_GATE(0x80B1DF64, &lit_6100); #pragma pop /* 80B1DF68-80B1DF6C 000210 0004+00 0/1 0/0 0/0 .rodata @6101 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_6101 = 0x4751289D; -COMPILER_STRIP_GATE(80B1DF68, &lit_6101); +COMPILER_STRIP_GATE(0x80B1DF68, &lit_6101); #pragma pop /* 80B1DF6C-80B1DF70 000214 0004+00 0/1 0/0 0/0 .rodata @6102 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6102 = 2.5f; -COMPILER_STRIP_GATE(80B1DF6C, &lit_6102); +COMPILER_STRIP_GATE(0x80B1DF6C, &lit_6102); #pragma pop /* 80B1DF70-80B1DF78 000218 0008+00 0/3 0/0 0/0 .rodata @6103 */ @@ -2249,7 +2272,7 @@ COMPILER_STRIP_GATE(80B1DF6C, &lit_6102); SECTION_RODATA static u8 const lit_6103[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B1DF70, &lit_6103); +COMPILER_STRIP_GATE(0x80B1DF70, &lit_6103); #pragma pop /* 80B1DF78-80B1DF80 000220 0008+00 0/3 0/0 0/0 .rodata @6104 */ @@ -2258,7 +2281,7 @@ COMPILER_STRIP_GATE(80B1DF70, &lit_6103); SECTION_RODATA static u8 const lit_6104[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B1DF78, &lit_6104); +COMPILER_STRIP_GATE(0x80B1DF78, &lit_6104); #pragma pop /* 80B1DF80-80B1DF88 000228 0008+00 0/3 0/0 0/0 .rodata @6105 */ @@ -2267,14 +2290,14 @@ COMPILER_STRIP_GATE(80B1DF78, &lit_6104); SECTION_RODATA static u8 const lit_6105[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B1DF80, &lit_6105); +COMPILER_STRIP_GATE(0x80B1DF80, &lit_6105); #pragma pop /* 80B1DF88-80B1DF8C 000230 0004+00 0/7 0/0 0/0 .rodata @6106 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6106 = 9.0f; -COMPILER_STRIP_GATE(80B1DF88, &lit_6106); +COMPILER_STRIP_GATE(0x80B1DF88, &lit_6106); #pragma pop /* 80B18D44-80B1926C 004804 0528+00 1/0 0/0 0/0 .text demo_scannon__10daNpcTks_cFv */ @@ -2290,7 +2313,7 @@ asm void daNpcTks_c::demo_scannon() { /* ############################################################################################## */ /* 80B1DF8C-80B1DF90 000234 0004+00 1/1 0/0 0/0 .rodata @6141 */ SECTION_RODATA static f32 const lit_6141 = 13.0f; -COMPILER_STRIP_GATE(80B1DF8C, &lit_6141); +COMPILER_STRIP_GATE(0x80B1DF8C, &lit_6141); /* 80B1926C-80B1946C 004D2C 0200+00 1/0 0/0 0/0 .text demo_Lv6Gate__10daNpcTks_cFv */ #pragma push @@ -2302,6 +2325,15 @@ asm void daNpcTks_c::demo_Lv6Gate() { } #pragma pop +/* ############################################################################################## */ +/* 80B1E048-80B1E048 0002F0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80B1E09C = "TKS_FAREWELL"; +SECTION_DEAD static char const* const stringBase_80B1E0A9 = "TKS_FAREWELL_SKIP"; +SECTION_DEAD static char const* const stringBase_80B1E0BB = "pos"; +#pragma pop + /* 80B1946C-80B19DAC 004F2C 0940+00 1/0 0/0 0/0 .text demo_farewell__10daNpcTks_cFv */ #pragma push #pragma optimization_level 0 @@ -2317,84 +2349,90 @@ asm void daNpcTks_c::demo_farewell() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6417 = 950.0f; -COMPILER_STRIP_GATE(80B1DF90, &lit_6417); +COMPILER_STRIP_GATE(0x80B1DF90, &lit_6417); #pragma pop /* 80B1DF94-80B1DF98 00023C 0004+00 0/1 0/0 0/0 .rodata @6418 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6418 = 3700.0f; -COMPILER_STRIP_GATE(80B1DF94, &lit_6418); +COMPILER_STRIP_GATE(0x80B1DF94, &lit_6418); #pragma pop /* 80B1DF98-80B1DF9C 000240 0004+00 0/1 0/0 0/0 .rodata @6419 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6419 = -4220.0f; -COMPILER_STRIP_GATE(80B1DF98, &lit_6419); +COMPILER_STRIP_GATE(0x80B1DF98, &lit_6419); #pragma pop /* 80B1DF9C-80B1DFA0 000244 0004+00 0/1 0/0 0/0 .rodata @6420 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6420 = 3500.0f; -COMPILER_STRIP_GATE(80B1DF9C, &lit_6420); +COMPILER_STRIP_GATE(0x80B1DF9C, &lit_6420); #pragma pop /* 80B1DFA0-80B1DFA4 000248 0004+00 0/1 0/0 0/0 .rodata @6421 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6421 = 3360.0f; -COMPILER_STRIP_GATE(80B1DFA0, &lit_6421); +COMPILER_STRIP_GATE(0x80B1DFA0, &lit_6421); #pragma pop /* 80B1DFA4-80B1DFA8 00024C 0004+00 0/1 0/0 0/0 .rodata @6422 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6422 = -2010.0f; -COMPILER_STRIP_GATE(80B1DFA4, &lit_6422); +COMPILER_STRIP_GATE(0x80B1DFA4, &lit_6422); #pragma pop /* 80B1DFA8-80B1DFAC 000250 0004+00 0/1 0/0 0/0 .rodata @6423 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6423 = -1810.0f; -COMPILER_STRIP_GATE(80B1DFA8, &lit_6423); +COMPILER_STRIP_GATE(0x80B1DFA8, &lit_6423); #pragma pop /* 80B1DFAC-80B1DFB0 000254 0004+00 0/2 0/0 0/0 .rodata @6424 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6424 = 12.0f; -COMPILER_STRIP_GATE(80B1DFAC, &lit_6424); +COMPILER_STRIP_GATE(0x80B1DFAC, &lit_6424); #pragma pop /* 80B1DFB0-80B1DFB4 000258 0004+00 0/2 0/0 0/0 .rodata @6425 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6425 = 33.0f; -COMPILER_STRIP_GATE(80B1DFB0, &lit_6425); +COMPILER_STRIP_GATE(0x80B1DFB0, &lit_6425); #pragma pop /* 80B1DFB4-80B1DFB8 00025C 0004+00 0/2 0/0 0/0 .rodata @6426 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6426 = 200.0f; -COMPILER_STRIP_GATE(80B1DFB4, &lit_6426); +COMPILER_STRIP_GATE(0x80B1DFB4, &lit_6426); #pragma pop /* 80B1DFB8-80B1DFBC 000260 0004+00 0/4 0/0 0/0 .rodata @6427 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6427 = 3.0f / 20.0f; -COMPILER_STRIP_GATE(80B1DFB8, &lit_6427); +COMPILER_STRIP_GATE(0x80B1DFB8, &lit_6427); #pragma pop /* 80B1DFBC-80B1DFC0 000264 0004+00 0/4 0/0 0/0 .rodata @6428 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6428 = 17.0f / 20.0f; -COMPILER_STRIP_GATE(80B1DFBC, &lit_6428); +COMPILER_STRIP_GATE(0x80B1DFBC, &lit_6428); +#pragma pop + +/* 80B1E048-80B1E048 0002F0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80B1E0BF = "TKS_WARPBACK"; #pragma pop /* 80B19DAC-80B1A30C 00586C 0560+00 1/0 0/0 0/0 .text demo_warpBack__10daNpcTks_cFv */ @@ -2412,35 +2450,35 @@ asm void daNpcTks_c::demo_warpBack() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6538 = -150.0f; -COMPILER_STRIP_GATE(80B1DFC0, &lit_6538); +COMPILER_STRIP_GATE(0x80B1DFC0, &lit_6538); #pragma pop /* 80B1DFC4-80B1DFC8 00026C 0004+00 0/1 0/0 0/0 .rodata @6539 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6539 = 6600.0f; -COMPILER_STRIP_GATE(80B1DFC4, &lit_6539); +COMPILER_STRIP_GATE(0x80B1DFC4, &lit_6539); #pragma pop /* 80B1DFC8-80B1DFCC 000270 0004+00 0/1 0/0 0/0 .rodata @6540 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6540 = 4955.0f; -COMPILER_STRIP_GATE(80B1DFC8, &lit_6540); +COMPILER_STRIP_GATE(0x80B1DFC8, &lit_6540); #pragma pop /* 80B1DFCC-80B1DFD0 000274 0004+00 0/1 0/0 0/0 .rodata @6541 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6541 = 5480.0f; -COMPILER_STRIP_GATE(80B1DFCC, &lit_6541); +COMPILER_STRIP_GATE(0x80B1DFCC, &lit_6541); #pragma pop /* 80B1DFD0-80B1DFD4 000278 0004+00 0/1 0/0 0/0 .rodata @6542 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6542 = 31.0f; -COMPILER_STRIP_GATE(80B1DFD0, &lit_6542); +COMPILER_STRIP_GATE(0x80B1DFD0, &lit_6542); #pragma pop /* 80B1A30C-80B1A888 005DCC 057C+00 1/0 0/0 0/0 .text demo_walkBack__10daNpcTks_cFv */ @@ -2460,28 +2498,28 @@ asm void daNpcTks_c::demo_walkBack() { SECTION_RODATA static u8 const lit_6632[8] = { 0x00, 0x00, 0x25, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, }; -COMPILER_STRIP_GATE(80B1DFD4, &lit_6632); +COMPILER_STRIP_GATE(0x80B1DFD4, &lit_6632); #pragma pop /* 80B1DFDC-80B1DFE0 000284 0004+00 0/1 0/0 0/0 .rodata @6820 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6820 = 120.0f; -COMPILER_STRIP_GATE(80B1DFDC, &lit_6820); +COMPILER_STRIP_GATE(0x80B1DFDC, &lit_6820); #pragma pop /* 80B1DFE0-80B1DFE4 000288 0004+00 0/1 0/0 0/0 .rodata @6821 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6821 = 3000.0f; -COMPILER_STRIP_GATE(80B1DFE0, &lit_6821); +COMPILER_STRIP_GATE(0x80B1DFE0, &lit_6821); #pragma pop /* 80B1DFE4-80B1DFE8 00028C 0004+00 0/1 0/0 0/0 .rodata @6822 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6822 = 5500.0f; -COMPILER_STRIP_GATE(80B1DFE4, &lit_6822); +COMPILER_STRIP_GATE(0x80B1DFE4, &lit_6822); #pragma pop /* 80B1DFE8-80B1DFF0 000290 0008+00 0/1 0/0 0/0 .rodata @6823 */ @@ -2490,63 +2528,63 @@ COMPILER_STRIP_GATE(80B1DFE4, &lit_6822); SECTION_RODATA static u8 const lit_6823[8] = { 0x3F, 0xE6, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, }; -COMPILER_STRIP_GATE(80B1DFE8, &lit_6823); +COMPILER_STRIP_GATE(0x80B1DFE8, &lit_6823); #pragma pop /* 80B1DFF0-80B1DFF4 000298 0004+00 0/1 0/0 0/0 .rodata @6824 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6824 = 7.0f / 10.0f; -COMPILER_STRIP_GATE(80B1DFF0, &lit_6824); +COMPILER_STRIP_GATE(0x80B1DFF0, &lit_6824); #pragma pop /* 80B1DFF4-80B1DFF8 00029C 0004+00 0/1 0/0 0/0 .rodata @6825 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6825 = 2.0f / 25.0f; -COMPILER_STRIP_GATE(80B1DFF4, &lit_6825); +COMPILER_STRIP_GATE(0x80B1DFF4, &lit_6825); #pragma pop /* 80B1DFF8-80B1DFFC 0002A0 0004+00 0/1 0/0 0/0 .rodata @6826 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_6826 = 0x44CB61E3; -COMPILER_STRIP_GATE(80B1DFF8, &lit_6826); +COMPILER_STRIP_GATE(0x80B1DFF8, &lit_6826); #pragma pop /* 80B1DFFC-80B1E000 0002A4 0004+00 0/2 0/0 0/0 .rodata @6827 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6827 = -250.0f; -COMPILER_STRIP_GATE(80B1DFFC, &lit_6827); +COMPILER_STRIP_GATE(0x80B1DFFC, &lit_6827); #pragma pop /* 80B1E000-80B1E004 0002A8 0004+00 0/1 0/0 0/0 .rodata @6828 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_6828 = 0x45AFAD5E; -COMPILER_STRIP_GATE(80B1E000, &lit_6828); +COMPILER_STRIP_GATE(0x80B1E000, &lit_6828); #pragma pop /* 80B1E004-80B1E008 0002AC 0004+00 0/1 0/0 0/0 .rodata @6829 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_6829 = 0x4557D315; -COMPILER_STRIP_GATE(80B1E004, &lit_6829); +COMPILER_STRIP_GATE(0x80B1E004, &lit_6829); #pragma pop /* 80B1E008-80B1E00C 0002B0 0004+00 0/1 0/0 0/0 .rodata @6830 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_6830 = 0x45AB6F61; -COMPILER_STRIP_GATE(80B1E008, &lit_6830); +COMPILER_STRIP_GATE(0x80B1E008, &lit_6830); #pragma pop /* 80B1E00C-80B1E010 0002B4 0004+00 0/1 0/0 0/0 .rodata @6831 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6831 = 8.0f; -COMPILER_STRIP_GATE(80B1E00C, &lit_6831); +COMPILER_STRIP_GATE(0x80B1E00C, &lit_6831); #pragma pop /* 80B1A888-80B1B6A0 006348 0E18+00 1/0 0/0 0/0 .text demo_Lv7Start__10daNpcTks_cFv */ @@ -2564,28 +2602,34 @@ asm void daNpcTks_c::demo_Lv7Start() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6974 = 1225.0f; -COMPILER_STRIP_GATE(80B1E010, &lit_6974); +COMPILER_STRIP_GATE(0x80B1E010, &lit_6974); #pragma pop /* 80B1E014-80B1E018 0002BC 0004+00 0/1 0/0 0/0 .rodata @6975 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_6975 = 0x4666452A; -COMPILER_STRIP_GATE(80B1E014, &lit_6975); +COMPILER_STRIP_GATE(0x80B1E014, &lit_6975); #pragma pop /* 80B1E018-80B1E01C 0002C0 0004+00 0/1 0/0 0/0 .rodata @6976 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_6976 = 0x4572DB97; -COMPILER_STRIP_GATE(80B1E018, &lit_6976); +COMPILER_STRIP_GATE(0x80B1E018, &lit_6976); #pragma pop /* 80B1E01C-80B1E020 0002C4 0004+00 0/1 0/0 0/0 .rodata @6977 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6977 = -2.0f; -COMPILER_STRIP_GATE(80B1E01C, &lit_6977); +COMPILER_STRIP_GATE(0x80B1E01C, &lit_6977); +#pragma pop + +/* 80B1E048-80B1E048 0002F0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80B1E0CC = "D_MN01"; #pragma pop /* 80B1B6A0-80B1BD64 007160 06C4+00 2/0 0/0 0/0 .text demo_Lv3PickUp__10daNpcTks_cFv */ @@ -2603,49 +2647,56 @@ asm void daNpcTks_c::demo_Lv3PickUp() { #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_7108 = 0xC133A190; -COMPILER_STRIP_GATE(80B1E020, &lit_7108); +COMPILER_STRIP_GATE(0x80B1E020, &lit_7108); #pragma pop /* 80B1E024-80B1E028 0002CC 0004+00 0/1 0/0 0/0 .rodata @7109 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_7109 = 0x4509C266; -COMPILER_STRIP_GATE(80B1E024, &lit_7109); +COMPILER_STRIP_GATE(0x80B1E024, &lit_7109); #pragma pop /* 80B1E028-80B1E02C 0002D0 0004+00 0/1 0/0 0/0 .rodata @7110 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_7110 = 0x46879A69; -COMPILER_STRIP_GATE(80B1E028, &lit_7110); +COMPILER_STRIP_GATE(0x80B1E028, &lit_7110); #pragma pop /* 80B1E02C-80B1E030 0002D4 0004+00 0/1 0/0 0/0 .rodata @7111 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7111 = -275.0f; -COMPILER_STRIP_GATE(80B1E02C, &lit_7111); +COMPILER_STRIP_GATE(0x80B1E02C, &lit_7111); #pragma pop /* 80B1E030-80B1E034 0002D8 0004+00 0/1 0/0 0/0 .rodata @7112 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7112 = 1900.0f; -COMPILER_STRIP_GATE(80B1E030, &lit_7112); +COMPILER_STRIP_GATE(0x80B1E030, &lit_7112); #pragma pop /* 80B1E034-80B1E038 0002DC 0004+00 0/1 0/0 0/0 .rodata @7113 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7113 = 16.0f; -COMPILER_STRIP_GATE(80B1E034, &lit_7113); +COMPILER_STRIP_GATE(0x80B1E034, &lit_7113); #pragma pop /* 80B1E038-80B1E03C 0002E0 0004+00 0/1 0/0 0/0 .rodata @7114 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7114 = 36.0f; -COMPILER_STRIP_GATE(80B1E038, &lit_7114); +COMPILER_STRIP_GATE(0x80B1E038, &lit_7114); +#pragma pop + +/* 80B1E048-80B1E048 0002F0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80B1E0D3 = "D_MN05"; +SECTION_DEAD static char const* const stringBase_80B1E0DA = "D_MN06"; #pragma pop /* 80B1BD64-80B1C3C8 007824 0664+00 1/0 0/0 0/0 .text demo_Lv6PickUp__10daNpcTks_cFv */ @@ -2718,7 +2769,7 @@ asm void J3DTexNoAnm::calc(u16* param_0) const { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7156 = -50.0f; -COMPILER_STRIP_GATE(80B1E03C, &lit_7156); +COMPILER_STRIP_GATE(0x80B1E03C, &lit_7156); #pragma pop /* 80B1C480-80B1C4F8 007F40 0078+00 1/0 0/0 0/0 .text setParam__10daNpcTks_cFv */ @@ -2745,7 +2796,7 @@ asm void daNpcTks_c::main() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80B1CB4C(u32 param_0, u32 param_1) { +extern "C" asm void func_80B1CB4C(void* _this, u32 param_0, u32 param_1) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_tks/d_a_npc_tks/func_80B1CB4C.s" } @@ -2754,7 +2805,7 @@ extern "C" asm void func_80B1CB4C(u32 param_0, u32 param_1) { /* ############################################################################################## */ /* 80B1E040-80B1E044 0002E8 0004+00 1/1 0/0 0/0 .rodata @7278 */ SECTION_RODATA static f32 const lit_7278 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(80B1E040, &lit_7278); +COMPILER_STRIP_GATE(0x80B1E040, &lit_7278); /* 80B1CB54-80B1CC28 008614 00D4+00 1/0 0/0 0/0 .text ctrlBtk__10daNpcTks_cFv */ #pragma push @@ -2805,7 +2856,7 @@ asm void daNpcTks_c::drawOtherMdls() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80B1D35C(s16 param_0) /* const */ { +extern "C" asm void func_80B1D35C(void* _this, s16 param_0) /* const */ { nofralloc #include "asm/rel/d/a/npc/d_a_npc_tks/d_a_npc_tks/func_80B1D35C.s" } @@ -2815,7 +2866,7 @@ extern "C" asm void func_80B1D35C(s16 param_0) /* const */ { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80B1D368(int* param_0) { +extern "C" asm void func_80B1D368(void* _this, int* param_0) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_tks/d_a_npc_tks/func_80B1D368.s" } @@ -2825,7 +2876,7 @@ extern "C" asm void func_80B1D368(int* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80B1D384(int param_0, int param_1) { +extern "C" asm void func_80B1D384(void* _this, int param_0, int param_1) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_tks/d_a_npc_tks/func_80B1D384.s" } @@ -2857,7 +2908,7 @@ asm void __sinit_d_a_npc_tks_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80B1D400 = (void*)__sinit_d_a_npc_tks_cpp; +REGISTER_CTORS(0x80B1D400, __sinit_d_a_npc_tks_cpp); #pragma pop /* 80B1D440-80B1D488 008F00 0048+00 5/4 0/0 0/0 .text __dt__18daNpcF_ActorMngr_cFv */ @@ -3065,27 +3116,7 @@ static asm void func_80B1DD3C() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7420 = 40.0f; -COMPILER_STRIP_GATE(80B1E044, &lit_7420); +COMPILER_STRIP_GATE(0x80B1E044, &lit_7420); #pragma pop -/* 80B1E048-80B1E0E1 0002F0 0099+00 12/8 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80B1E048 = "TKS"; -SECTION_DEAD static char const* const stringBase_80B1E04C = "J_tubo_00"; -SECTION_DEAD static char const* const stringBase_80B1E056 = "K_tubo02"; -SECTION_DEAD static char const* const stringBase_80B1E05F = "TKS_ENCOUNTER"; -SECTION_DEAD static char const* const stringBase_80B1E06D = "Tks"; -SECTION_DEAD static char const* const stringBase_80B1E071 = "D_MN11"; -SECTION_DEAD static char const* const stringBase_80B1E078 = "D_MN07"; -SECTION_DEAD static char const* const stringBase_80B1E07F = "WOLF_GET_TKS"; -SECTION_DEAD static char const* const stringBase_80B1E08C = "DEFAULT_GETITEM"; -SECTION_DEAD static char const* const stringBase_80B1E09C = "TKS_FAREWELL"; -SECTION_DEAD static char const* const stringBase_80B1E0A9 = "TKS_FAREWELL_SKIP"; -SECTION_DEAD static char const* const stringBase_80B1E0BB = "pos"; -SECTION_DEAD static char const* const stringBase_80B1E0BF = "TKS_WARPBACK"; -SECTION_DEAD static char const* const stringBase_80B1E0CC = "D_MN01"; -SECTION_DEAD static char const* const stringBase_80B1E0D3 = "D_MN05"; -SECTION_DEAD static char const* const stringBase_80B1E0DA = "D_MN06"; -#pragma pop +/* 80B1E048-80B1E048 0002F0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/npc/d_a_npc_toby/d_a_npc_toby.cpp b/rel/d/a/npc/d_a_npc_toby/d_a_npc_toby.cpp index 1db89a289cf..b00f0f3021a 100644 --- a/rel/d/a/npc/d_a_npc_toby/d_a_npc_toby.cpp +++ b/rel/d/a/npc/d_a_npc_toby/d_a_npc_toby.cpp @@ -15,12 +15,14 @@ struct mDoMtx_stack_c { static u8 now[48]; }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; +struct J3DAnmTransform {}; + +struct J3DModelData {}; + struct Vec {}; struct Z2Creature { @@ -29,8 +31,6 @@ struct Z2Creature { /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -51,6 +51,8 @@ struct daObj_AutoMata_c { /* 80BA6500 */ void setAnm(int, bool); }; +struct daNpcT_faceMotionAnmData_c {}; + struct daNpcT_MotionSeqMngr_c { struct sequenceStepData_c {}; @@ -59,14 +61,12 @@ struct daNpcT_MotionSeqMngr_c { /* 80B2418C */ ~daNpcT_MotionSeqMngr_c(); }; +struct daNpcT_evtData_c {}; + struct daNpcT_motionAnmData_c {}; struct J3DJoint {}; -struct daNpcT_faceMotionAnmData_c {}; - -struct daNpcT_evtData_c {}; - struct daNpc_Toby_c { /* 80B1E64C */ ~daNpc_Toby_c(); /* 80B1E798 */ void create(); @@ -140,6 +140,13 @@ struct dCcD_GObjInf { /* 800844F8 */ void GetTgHitObj(); }; +struct csXyz { + /* 80B23AEC */ ~csXyz(); + /* 80B24088 */ csXyz(); +}; + +struct _GXColorS10 {}; + struct J3DModel {}; struct cXyz { @@ -149,13 +156,6 @@ struct cXyz { /* 80B24188 */ cXyz(); }; -struct _GXColorS10 {}; - -struct csXyz { - /* 80B23AEC */ ~csXyz(); - /* 80B24088 */ csXyz(); -}; - struct daNpcT_c { /* 80147FA4 */ void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*); /* 801483F8 */ void loadRes(s8 const*, char const**); @@ -549,7 +549,7 @@ extern "C" void changeAnm__8daNpcT_cFPiPi(); extern "C" void changeBck__8daNpcT_cFPiPi(); extern "C" void changeBtp__8daNpcT_cFPiPi(); extern "C" void changeBtk__8daNpcT_cFPiPi(); -extern "C" void func_80B24728(int*); +extern "C" void func_80B24728(void* _this, int*); extern "C" void __sinit_d_a_npc_toby_cpp(); extern "C" void __ct__12daNpc_Toby_cFPC26daNpcT_faceMotionAnmData_cPC22daNpcT_motionAnmData_cPCQ222daNpcT_MotionSeqMngr_c18sequenceStepData_ciPCQ222daNpcT_MotionSeqMngr_c18sequenceStepData_ciPC16daNpcT_evtData_cPPc(); @@ -775,6 +775,27 @@ extern "C" void setCannonRepair__11daSCannon_cFv(); // /* ############################################################################################## */ +/* 80B24B8C-80B24B8C 0001A8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80B24B8C = ""; +SECTION_DEAD static char const* const stringBase_80B24B8D = "NO_RESPONSE"; +SECTION_DEAD static char const* const stringBase_80B24B99 = "TALKTO_ONESELF"; +SECTION_DEAD static char const* const stringBase_80B24BA8 = "REPAIR_SCANNON"; +SECTION_DEAD static char const* const stringBase_80B24BB7 = "SCANNON"; +SECTION_DEAD static char const* const stringBase_80B24BBF = "CONVERSATION_ABOUT_SCANNON"; +SECTION_DEAD static char const* const stringBase_80B24BDA = "CONVERSATION_ABOUT_ZRA"; +SECTION_DEAD static char const* const stringBase_80B24BF1 = "Toby"; +SECTION_DEAD static char const* const stringBase_80B24BF6 = "Toby_TW"; +SECTION_DEAD static char const* const stringBase_80B24BFE = "Toby0"; +SECTION_DEAD static char const* const stringBase_80B24C04 = "Toby1"; +SECTION_DEAD static char const* const stringBase_80B24C0A = "Toby2"; +SECTION_DEAD static char const* const stringBase_80B24C10 = "Toby3"; +SECTION_DEAD static char const* const stringBase_80B24C16 = "Toby4"; +SECTION_DEAD static char const* const stringBase_80B24C1C = "Toby5"; +SECTION_DEAD static char const* const stringBase_80B24C22 = "TOBY_HOUSE_FIRE"; +#pragma pop + /* 80B24C48-80B24C54 000000 000C+00 3/3 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -1456,7 +1477,7 @@ SECTION_RODATA u8 const daNpc_Toby_Param_c::m[156] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x80, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x40, 0x80, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B249E4, &daNpc_Toby_Param_c::m); +COMPILER_STRIP_GATE(0x80B249E4, &daNpc_Toby_Param_c::m); /* 80B24A80-80B24A9C 00009C 001C+00 0/1 0/0 0/0 .rodata heapSize$4089 */ #pragma push @@ -1465,35 +1486,35 @@ SECTION_RODATA static u8 const heapSize[28] = { 0x00, 0x00, 0x3B, 0xC0, 0x00, 0x00, 0x3B, 0x10, 0x00, 0x00, 0x3B, 0x10, 0x00, 0x00, 0x43, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3B, 0xD0, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B24A80, &heapSize); +COMPILER_STRIP_GATE(0x80B24A80, &heapSize); #pragma pop /* 80B24A9C-80B24AA0 0000B8 0004+00 0/1 0/0 0/0 .rodata @4155 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4155 = -200.0f; -COMPILER_STRIP_GATE(80B24A9C, &lit_4155); +COMPILER_STRIP_GATE(0x80B24A9C, &lit_4155); #pragma pop /* 80B24AA0-80B24AA4 0000BC 0004+00 0/1 0/0 0/0 .rodata @4156 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4156 = -100.0f; -COMPILER_STRIP_GATE(80B24AA0, &lit_4156); +COMPILER_STRIP_GATE(0x80B24AA0, &lit_4156); #pragma pop /* 80B24AA4-80B24AA8 0000C0 0004+00 0/1 0/0 0/0 .rodata @4157 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4157 = 200.0f; -COMPILER_STRIP_GATE(80B24AA4, &lit_4157); +COMPILER_STRIP_GATE(0x80B24AA4, &lit_4157); #pragma pop /* 80B24AA8-80B24AAC 0000C4 0004+00 0/2 0/0 0/0 .rodata @4158 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4158 = 300.0f; -COMPILER_STRIP_GATE(80B24AA8, &lit_4158); +COMPILER_STRIP_GATE(0x80B24AA8, &lit_4158); #pragma pop /* 80B24AAC-80B24AB0 0000C8 0004+00 6/18 0/0 0/0 .rodata @4159 */ @@ -1503,13 +1524,13 @@ SECTION_RODATA static u8 const lit_4159[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B24AAC, &lit_4159); +COMPILER_STRIP_GATE(0x80B24AAC, &lit_4159); /* 80B24AB0-80B24AB4 0000CC 0004+00 0/1 0/0 0/0 .rodata @4160 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4160 = -1000000000.0f; -COMPILER_STRIP_GATE(80B24AB0, &lit_4160); +COMPILER_STRIP_GATE(0x80B24AB0, &lit_4160); #pragma pop /* 80B1E798-80B1EA60 000238 02C8+00 1/1 0/0 0/0 .text create__12daNpc_Toby_cFv */ @@ -1527,14 +1548,14 @@ asm void daNpc_Toby_c::create() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4323 = 65536.0f; -COMPILER_STRIP_GATE(80B24AB4, &lit_4323); +COMPILER_STRIP_GATE(0x80B24AB4, &lit_4323); #pragma pop /* 80B24AB8-80B24ABC 0000D4 0004+00 0/3 0/0 0/0 .rodata @4324 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4324 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(80B24AB8, &lit_4324); +COMPILER_STRIP_GATE(0x80B24AB8, &lit_4324); #pragma pop /* 80B24ABC-80B24AC0 0000D8 0004+00 0/1 0/0 0/0 .rodata bmdTypeList$4437 */ @@ -1546,12 +1567,12 @@ SECTION_RODATA static u8 const bmdTypeList[4] = { 0x00, 0x02, }; -COMPILER_STRIP_GATE(80B24ABC, &bmdTypeList); +COMPILER_STRIP_GATE(0x80B24ABC, &bmdTypeList); #pragma pop /* 80B24AC0-80B24AC4 0000DC 0004+00 1/5 0/0 0/0 .rodata @4495 */ SECTION_RODATA static f32 const lit_4495 = 1.0f; -COMPILER_STRIP_GATE(80B24AC0, &lit_4495); +COMPILER_STRIP_GATE(0x80B24AC0, &lit_4495); /* 80B1EA60-80B1ED6C 000500 030C+00 1/1 0/0 0/0 .text CreateHeap__12daNpc_Toby_cFv */ #pragma push @@ -1686,7 +1707,7 @@ asm void daNpc_Toby_c::Execute() { /* ############################################################################################## */ /* 80B24AC4-80B24AC8 0000E0 0004+00 1/2 0/0 0/0 .rodata @4544 */ SECTION_RODATA static f32 const lit_4544 = 100.0f; -COMPILER_STRIP_GATE(80B24AC4, &lit_4544); +COMPILER_STRIP_GATE(0x80B24AC4, &lit_4544); /* 80B1EF7C-80B1F010 000A1C 0094+00 1/1 0/0 0/0 .text Draw__12daNpc_Toby_cFv */ #pragma push @@ -1733,7 +1754,7 @@ asm void daNpc_Toby_c::srchToby(void* param_0, void* param_1) { /* ############################################################################################## */ /* 80B24AC8-80B24ACC 0000E4 0004+00 1/1 0/0 0/0 .rodata @4593 */ SECTION_RODATA static f32 const lit_4593 = 1000000000.0f; -COMPILER_STRIP_GATE(80B24AC8, &lit_4593); +COMPILER_STRIP_GATE(0x80B24AC8, &lit_4593); /* 80B1F124-80B1F200 000BC4 00DC+00 1/1 0/0 0/0 .text getOtherTobyP__12daNpc_Toby_cFi */ #pragma push @@ -1788,7 +1809,7 @@ asm void daNpc_Toby_c::afterJntAnm(int param_0) { /* ############################################################################################## */ /* 80B24ACC-80B24AD0 0000E8 0004+00 1/1 0/0 0/0 .rodata @4735 */ SECTION_RODATA static f32 const lit_4735 = 600.0f; -COMPILER_STRIP_GATE(80B24ACC, &lit_4735); +COMPILER_STRIP_GATE(0x80B24ACC, &lit_4735); /* 80B1F638-80B1F784 0010D8 014C+00 1/0 0/0 0/0 .text setParam__12daNpc_Toby_cFv */ #pragma push @@ -1813,7 +1834,7 @@ asm void daNpc_Toby_c::checkChangeEvt() { /* ############################################################################################## */ /* 80B24AD0-80B24AD4 0000EC 0004+00 2/6 0/0 0/0 .rodata @4802 */ SECTION_RODATA static f32 const lit_4802 = -1.0f; -COMPILER_STRIP_GATE(80B24AD0, &lit_4802); +COMPILER_STRIP_GATE(0x80B24AD0, &lit_4802); /* 80B1F950-80B1FA08 0013F0 00B8+00 1/0 0/0 0/0 .text setAfterTalkMotion__12daNpc_Toby_cFv */ #pragma push @@ -1880,63 +1901,63 @@ asm void daNpc_Toby_c::beforeMove() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4983 = 30.0f; -COMPILER_STRIP_GATE(80B24AD4, &lit_4983); +COMPILER_STRIP_GATE(0x80B24AD4, &lit_4983); #pragma pop /* 80B24AD8-80B24ADC 0000F4 0004+00 0/1 0/0 0/0 .rodata @4984 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4984 = 0x38C90FDB; -COMPILER_STRIP_GATE(80B24AD8, &lit_4984); +COMPILER_STRIP_GATE(0x80B24AD8, &lit_4984); #pragma pop /* 80B24ADC-80B24AE0 0000F8 0004+00 0/2 0/0 0/0 .rodata @4985 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4985 = 20.0f; -COMPILER_STRIP_GATE(80B24ADC, &lit_4985); +COMPILER_STRIP_GATE(0x80B24ADC, &lit_4985); #pragma pop /* 80B24AE0-80B24AE4 0000FC 0004+00 0/1 0/0 0/0 .rodata @4986 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4986 = 140.0f; -COMPILER_STRIP_GATE(80B24AE0, &lit_4986); +COMPILER_STRIP_GATE(0x80B24AE0, &lit_4986); #pragma pop /* 80B24AE4-80B24AE8 000100 0004+00 0/1 0/0 0/0 .rodata @4987 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4987 = 120.0f; -COMPILER_STRIP_GATE(80B24AE4, &lit_4987); +COMPILER_STRIP_GATE(0x80B24AE4, &lit_4987); #pragma pop /* 80B24AE8-80B24AEC 000104 0004+00 0/1 0/0 0/0 .rodata @4988 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4988 = 40.0f; -COMPILER_STRIP_GATE(80B24AE8, &lit_4988); +COMPILER_STRIP_GATE(0x80B24AE8, &lit_4988); #pragma pop /* 80B24AEC-80B24AF0 000108 0004+00 0/1 0/0 0/0 .rodata @4989 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4989 = 3.0f; -COMPILER_STRIP_GATE(80B24AEC, &lit_4989); +COMPILER_STRIP_GATE(0x80B24AEC, &lit_4989); #pragma pop /* 80B24AF0-80B24AF4 00010C 0004+00 0/2 0/0 0/0 .rodata @4990 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4990 = 10.0f; -COMPILER_STRIP_GATE(80B24AF0, &lit_4990); +COMPILER_STRIP_GATE(0x80B24AF0, &lit_4990); #pragma pop /* 80B24AF4-80B24AFC 000110 0008+00 1/4 0/0 0/0 .rodata @4992 */ SECTION_RODATA static u8 const lit_4992[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B24AF4, &lit_4992); +COMPILER_STRIP_GATE(0x80B24AF4, &lit_4992); /* 80B25840-80B25844 000008 0001+03 1/1 0/0 0/0 .bss @1109 */ static u8 lit_1109[1 + 3 /* padding */]; @@ -2066,7 +2087,7 @@ asm void daNpc_Toby_c::setAttnPos() { SECTION_RODATA static u8 const lit_5050[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B24AFC, &lit_5050); +COMPILER_STRIP_GATE(0x80B24AFC, &lit_5050); #pragma pop /* 80B24B04-80B24B0C 000120 0008+00 0/1 0/0 0/0 .rodata @5051 */ @@ -2075,7 +2096,7 @@ COMPILER_STRIP_GATE(80B24AFC, &lit_5050); SECTION_RODATA static u8 const lit_5051[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B24B04, &lit_5051); +COMPILER_STRIP_GATE(0x80B24B04, &lit_5051); #pragma pop /* 80B24B0C-80B24B14 000128 0008+00 0/1 0/0 0/0 .rodata @5052 */ @@ -2084,21 +2105,21 @@ COMPILER_STRIP_GATE(80B24B04, &lit_5051); SECTION_RODATA static u8 const lit_5052[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B24B0C, &lit_5052); +COMPILER_STRIP_GATE(0x80B24B0C, &lit_5052); #pragma pop /* 80B24B14-80B24B18 000130 0004+00 0/1 0/0 0/0 .rodata @5098 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5098 = 110.0f; -COMPILER_STRIP_GATE(80B24B14, &lit_5098); +COMPILER_STRIP_GATE(0x80B24B14, &lit_5098); #pragma pop /* 80B24B18-80B24B1C 000134 0004+00 0/1 0/0 0/0 .rodata @5099 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5099 = 64.0f; -COMPILER_STRIP_GATE(80B24B18, &lit_5099); +COMPILER_STRIP_GATE(0x80B24B18, &lit_5099); #pragma pop /* 80B20278-80B2042C 001D18 01B4+00 1/0 0/0 0/0 .text setCollision__12daNpc_Toby_cFv */ @@ -2124,7 +2145,7 @@ SECTION_RODATA static u8 const jointNo[4] = { 0x00, 0x12, }; -COMPILER_STRIP_GATE(80B24B1C, &jointNo); +COMPILER_STRIP_GATE(0x80B24B1C, &jointNo); /* 80B20434-80B2050C 001ED4 00D8+00 1/0 0/0 0/0 .text drawOtherMdl__12daNpc_Toby_cFv */ #pragma push @@ -2172,7 +2193,7 @@ asm void daNpc_Toby_c::selectAction() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpc_Toby_c::chkAction(int (daNpc_Toby_c::*)(void*)) { +asm void daNpc_Toby_c::chkAction(int (daNpc_Toby_c::*param_0)(void*)) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_toby/d_a_npc_toby/chkAction__12daNpc_Toby_cFM12daNpc_Toby_cFPCvPvPv_i.s" } @@ -2183,12 +2204,20 @@ asm void daNpc_Toby_c::chkAction(int (daNpc_Toby_c::*)(void*)) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpc_Toby_c::setAction(int (daNpc_Toby_c::*)(void*)) { +asm void daNpc_Toby_c::setAction(int (daNpc_Toby_c::*param_0)(void*)) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_toby/d_a_npc_toby/setAction__12daNpc_Toby_cFM12daNpc_Toby_cFPCvPvPv_i.s" } #pragma pop +/* ############################################################################################## */ +/* 80B24B8C-80B24B8C 0001A8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80B24C32 = "prm"; +SECTION_DEAD static char const* const stringBase_80B24C36 = "timer"; +#pragma pop + /* 80B207E4-80B20AB0 002284 02CC+00 1/0 0/0 0/0 .text cutTobyHouseFire__12daNpc_Toby_cFi */ #pragma push @@ -2207,7 +2236,13 @@ asm void daNpc_Toby_c::cutTobyHouseFire(int param_0) { SECTION_RODATA static u8 const lit_5345[8] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, }; -COMPILER_STRIP_GATE(80B24B20, &lit_5345); +COMPILER_STRIP_GATE(0x80B24B20, &lit_5345); +#pragma pop + +/* 80B24B8C-80B24B8C 0001A8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80B24C3C = "msgNo"; #pragma pop /* 80B20AB0-80B20FC0 002550 0510+00 3/0 0/0 0/0 .text cutTalkToOneself__12daNpc_Toby_cFi @@ -2228,28 +2263,28 @@ asm void daNpc_Toby_c::cutTalkToOneself(int param_0) { SECTION_RODATA static u8 const lit_5499[8] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, }; -COMPILER_STRIP_GATE(80B24B28, &lit_5499); +COMPILER_STRIP_GATE(0x80B24B28, &lit_5499); #pragma pop /* 80B24B30-80B24B34 00014C 0004+00 0/1 0/0 0/0 .rodata @5630 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_5630 = 0x43360B61; -COMPILER_STRIP_GATE(80B24B30, &lit_5630); +COMPILER_STRIP_GATE(0x80B24B30, &lit_5630); #pragma pop /* 80B24B34-80B24B38 000150 0004+00 0/2 0/0 0/0 .rodata @5631 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5631 = 5.0f; -COMPILER_STRIP_GATE(80B24B34, &lit_5631); +COMPILER_STRIP_GATE(0x80B24B34, &lit_5631); #pragma pop /* 80B24B38-80B24B3C 000154 0004+00 0/2 0/0 0/0 .rodata @5632 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5632 = 4.0f; -COMPILER_STRIP_GATE(80B24B38, &lit_5632); +COMPILER_STRIP_GATE(0x80B24B38, &lit_5632); #pragma pop /* 80B24B3C-80B24B44 000158 0004+04 0/1 0/0 0/0 .rodata @5633 */ @@ -2260,7 +2295,7 @@ SECTION_RODATA static f32 const lit_5633[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80B24B3C, &lit_5633); +COMPILER_STRIP_GATE(0x80B24B3C, &lit_5633); #pragma pop /* 80B24B44-80B24B4C 000160 0008+00 0/1 0/0 0/0 .rodata @5636 */ @@ -2269,7 +2304,7 @@ COMPILER_STRIP_GATE(80B24B3C, &lit_5633); SECTION_RODATA static u8 const lit_5636[8] = { 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B24B44, &lit_5636); +COMPILER_STRIP_GATE(0x80B24B44, &lit_5636); #pragma pop /* 80B20FC0-80B215B4 002A60 05F4+00 1/0 0/0 0/0 .text cutRepairSCannon__12daNpc_Toby_cFi @@ -2290,28 +2325,28 @@ asm void daNpc_Toby_c::cutRepairSCannon(int param_0) { SECTION_RODATA static u8 const lit_5658[8] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, }; -COMPILER_STRIP_GATE(80B24B4C, &lit_5658); +COMPILER_STRIP_GATE(0x80B24B4C, &lit_5658); #pragma pop /* 80B24B54-80B24B58 000170 0004+00 0/2 0/0 0/0 .rodata @5751 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5751 = 1000.0f; -COMPILER_STRIP_GATE(80B24B54, &lit_5751); +COMPILER_STRIP_GATE(0x80B24B54, &lit_5751); #pragma pop /* 80B24B58-80B24B5C 000174 0004+00 0/1 0/0 0/0 .rodata @5752 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5752 = 1600.0f; -COMPILER_STRIP_GATE(80B24B58, &lit_5752); +COMPILER_STRIP_GATE(0x80B24B58, &lit_5752); #pragma pop /* 80B24B5C-80B24B60 000178 0004+00 0/1 0/0 0/0 .rodata @5753 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5753 = 11.0f / 20.0f; -COMPILER_STRIP_GATE(80B24B5C, &lit_5753); +COMPILER_STRIP_GATE(0x80B24B5C, &lit_5753); #pragma pop /* 80B215B4-80B219F4 003054 0440+00 1/0 0/0 0/0 .text cutSCannon__12daNpc_Toby_cFi */ @@ -2331,7 +2366,13 @@ asm void daNpc_Toby_c::cutSCannon(int param_0) { SECTION_RODATA static u8 const lit_5783[8] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, }; -COMPILER_STRIP_GATE(80B24B60, &lit_5783); +COMPILER_STRIP_GATE(0x80B24B60, &lit_5783); +#pragma pop + +/* 80B24B8C-80B24B8C 0001A8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80B24C42 = "send"; #pragma pop /* 80B219F4-80B22434 003494 0A40+00 3/0 0/0 0/0 .text @@ -2350,21 +2391,21 @@ asm void daNpc_Toby_c::cutConversationAboutSCannon(int param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6037 = -300.0f; -COMPILER_STRIP_GATE(80B24B68, &lit_6037); +COMPILER_STRIP_GATE(0x80B24B68, &lit_6037); #pragma pop /* 80B24B6C-80B24B70 000188 0004+00 0/0 0/0 0/0 .rodata @6038 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6038 = -1000.0f; -COMPILER_STRIP_GATE(80B24B6C, &lit_6038); +COMPILER_STRIP_GATE(0x80B24B6C, &lit_6038); #pragma pop /* 80B24B70-80B24B78 00018C 0008+00 1/1 0/0 0/0 .rodata @6056 */ SECTION_RODATA static u8 const lit_6056[8] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, }; -COMPILER_STRIP_GATE(80B24B70, &lit_6056); +COMPILER_STRIP_GATE(0x80B24B70, &lit_6056); /* 80B22434-80B22614 003ED4 01E0+00 1/0 0/0 0/0 .text cutConversationAboutZra__12daNpc_Toby_cFi */ #pragma push @@ -2391,14 +2432,14 @@ asm void daNpc_Toby_c::chkAttnZra() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6337 = 2000.0f; -COMPILER_STRIP_GATE(80B24B78, &lit_6337); +COMPILER_STRIP_GATE(0x80B24B78, &lit_6337); #pragma pop /* 80B24B7C-80B24B80 000198 0004+00 0/1 0/0 0/0 .rodata @6338 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6338 = 90.0f; -COMPILER_STRIP_GATE(80B24B7C, &lit_6338); +COMPILER_STRIP_GATE(0x80B24B7C, &lit_6338); #pragma pop /* 80B226B0-80B22D98 004150 06E8+00 2/0 0/0 0/0 .text wait__12daNpc_Toby_cFPv */ @@ -2438,7 +2479,7 @@ asm void daNpc_Toby_c::play(void* param_0) { SECTION_RODATA static u8 const lit_6541[12] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, }; -COMPILER_STRIP_GATE(80B24B80, &lit_6541); +COMPILER_STRIP_GATE(0x80B24B80, &lit_6541); #pragma pop /* 80B23344-80B23628 004DE4 02E4+00 3/0 0/0 0/0 .text talk__12daNpc_Toby_cFPv */ @@ -2791,7 +2832,7 @@ void daNpcT_c::changeBtk(int* param_0, int* param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80B24728(int* param_0) { +extern "C" asm void func_80B24728(void* _this, int* param_0) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_toby/d_a_npc_toby/func_80B24728.s" } @@ -2817,7 +2858,7 @@ asm void __sinit_d_a_npc_toby_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80B24744 = (void*)__sinit_d_a_npc_toby_cpp; +REGISTER_CTORS(0x80B24744, __sinit_d_a_npc_toby_cpp); #pragma pop /* 80B24840-80B24920 0062E0 00E0+00 1/1 0/0 0/0 .text @@ -3098,28 +3139,4 @@ static u8 data_80B25908[4]; static u8 data_80B2590C[4]; #pragma pop -/* 80B24B8C-80B24C47 0001A8 00BB+00 10/7 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80B24B8C = ""; -SECTION_DEAD static char const* const stringBase_80B24B8D = "NO_RESPONSE"; -SECTION_DEAD static char const* const stringBase_80B24B99 = "TALKTO_ONESELF"; -SECTION_DEAD static char const* const stringBase_80B24BA8 = "REPAIR_SCANNON"; -SECTION_DEAD static char const* const stringBase_80B24BB7 = "SCANNON"; -SECTION_DEAD static char const* const stringBase_80B24BBF = "CONVERSATION_ABOUT_SCANNON"; -SECTION_DEAD static char const* const stringBase_80B24BDA = "CONVERSATION_ABOUT_ZRA"; -SECTION_DEAD static char const* const stringBase_80B24BF1 = "Toby"; -SECTION_DEAD static char const* const stringBase_80B24BF6 = "Toby_TW"; -SECTION_DEAD static char const* const stringBase_80B24BFE = "Toby0"; -SECTION_DEAD static char const* const stringBase_80B24C04 = "Toby1"; -SECTION_DEAD static char const* const stringBase_80B24C0A = "Toby2"; -SECTION_DEAD static char const* const stringBase_80B24C10 = "Toby3"; -SECTION_DEAD static char const* const stringBase_80B24C16 = "Toby4"; -SECTION_DEAD static char const* const stringBase_80B24C1C = "Toby5"; -SECTION_DEAD static char const* const stringBase_80B24C22 = "TOBY_HOUSE_FIRE"; -SECTION_DEAD static char const* const stringBase_80B24C32 = "prm"; -SECTION_DEAD static char const* const stringBase_80B24C36 = "timer"; -SECTION_DEAD static char const* const stringBase_80B24C3C = "msgNo"; -SECTION_DEAD static char const* const stringBase_80B24C42 = "send"; -#pragma pop +/* 80B24B8C-80B24B8C 0001A8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/npc/d_a_npc_tr/d_a_npc_tr.cpp b/rel/d/a/npc/d_a_npc_tr/d_a_npc_tr.cpp index beef49eab28..18ba6149d6b 100644 --- a/rel/d/a/npc/d_a_npc_tr/d_a_npc_tr.cpp +++ b/rel/d/a/npc/d_a_npc_tr/d_a_npc_tr.cpp @@ -132,31 +132,31 @@ extern "C" void __register_global_object(); /* ############################################################################################## */ /* 80B2657C-80B26580 000000 0004+00 4/4 0/0 0/0 .rodata @3768 */ SECTION_RODATA static f32 const lit_3768 = 4.0f / 5.0f; -COMPILER_STRIP_GATE(80B2657C, &lit_3768); +COMPILER_STRIP_GATE(0x80B2657C, &lit_3768); /* 80B26580-80B26584 000004 0004+00 0/1 0/0 0/0 .rodata @3769 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3769 = 15.0f; -COMPILER_STRIP_GATE(80B26580, &lit_3769); +COMPILER_STRIP_GATE(0x80B26580, &lit_3769); #pragma pop /* 80B26584-80B26588 000008 0004+00 1/2 0/0 0/0 .rodata @3770 */ SECTION_RODATA static f32 const lit_3770 = 3.0f / 10.0f; -COMPILER_STRIP_GATE(80B26584, &lit_3770); +COMPILER_STRIP_GATE(0x80B26584, &lit_3770); /* 80B26588-80B2658C 00000C 0004+00 0/1 0/0 0/0 .rodata @3771 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3771 = 3.0f / 5.0f; -COMPILER_STRIP_GATE(80B26588, &lit_3771); +COMPILER_STRIP_GATE(0x80B26588, &lit_3771); #pragma pop /* 80B2658C-80B26590 000010 0004+00 0/1 0/0 0/0 .rodata @3772 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3772 = 250.0f; -COMPILER_STRIP_GATE(80B2658C, &lit_3772); +COMPILER_STRIP_GATE(0x80B2658C, &lit_3772); #pragma pop /* 80B26610-80B26630 -00001 0020+00 1/0 0/0 0/0 .data l_daNPC_TR_Method */ @@ -223,7 +223,7 @@ static asm void daNPC_TR_Draw(npc_tr_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3849 = 50.0f; -COMPILER_STRIP_GATE(80B26590, &lit_3849); +COMPILER_STRIP_GATE(0x80B26590, &lit_3849); #pragma pop /* 80B26594-80B26598 000018 0004+00 0/2 0/0 0/0 .rodata @3850 */ @@ -235,14 +235,14 @@ SECTION_RODATA static u8 const lit_3850[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B26594, &lit_3850); +COMPILER_STRIP_GATE(0x80B26594, &lit_3850); #pragma pop /* 80B26598-80B2659C 00001C 0004+00 0/1 0/0 0/0 .rodata @3931 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3931 = 1000.0f; -COMPILER_STRIP_GATE(80B26598, &lit_3931); +COMPILER_STRIP_GATE(0x80B26598, &lit_3931); #pragma pop /* 80B2659C-80B265A4 000020 0004+04 0/2 0/0 0/0 .rodata @3932 */ @@ -253,7 +253,7 @@ SECTION_RODATA static f32 const lit_3932[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80B2659C, &lit_3932); +COMPILER_STRIP_GATE(0x80B2659C, &lit_3932); #pragma pop /* 80B265A4-80B265AC 000028 0008+00 0/1 0/0 0/0 .rodata @3933 */ @@ -262,7 +262,7 @@ COMPILER_STRIP_GATE(80B2659C, &lit_3932); SECTION_RODATA static u8 const lit_3933[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B265A4, &lit_3933); +COMPILER_STRIP_GATE(0x80B265A4, &lit_3933); #pragma pop /* 80B265AC-80B265B4 000030 0008+00 0/1 0/0 0/0 .rodata @3934 */ @@ -271,7 +271,7 @@ COMPILER_STRIP_GATE(80B265A4, &lit_3933); SECTION_RODATA static u8 const lit_3934[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B265AC, &lit_3934); +COMPILER_STRIP_GATE(0x80B265AC, &lit_3934); #pragma pop /* 80B265B4-80B265BC 000038 0008+00 0/1 0/0 0/0 .rodata @3935 */ @@ -280,74 +280,74 @@ COMPILER_STRIP_GATE(80B265AC, &lit_3934); SECTION_RODATA static u8 const lit_3935[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B265B4, &lit_3935); +COMPILER_STRIP_GATE(0x80B265B4, &lit_3935); #pragma pop /* 80B265BC-80B265C0 000040 0004+00 0/1 0/0 0/0 .rodata @3936 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3936 = 500.0f; -COMPILER_STRIP_GATE(80B265BC, &lit_3936); +COMPILER_STRIP_GATE(0x80B265BC, &lit_3936); #pragma pop /* 80B265C0-80B265C4 000044 0004+00 0/1 0/0 0/0 .rodata @3937 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3937 = 30.0f; -COMPILER_STRIP_GATE(80B265C0, &lit_3937); +COMPILER_STRIP_GATE(0x80B265C0, &lit_3937); #pragma pop /* 80B265C4-80B265C8 000048 0004+00 1/2 0/0 0/0 .rodata @3938 */ SECTION_RODATA static f32 const lit_3938 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(80B265C4, &lit_3938); +COMPILER_STRIP_GATE(0x80B265C4, &lit_3938); /* 80B265C8-80B265CC 00004C 0004+00 0/1 0/0 0/0 .rodata @3939 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3939 = 1.0f / 20.0f; -COMPILER_STRIP_GATE(80B265C8, &lit_3939); +COMPILER_STRIP_GATE(0x80B265C8, &lit_3939); #pragma pop /* 80B265CC-80B265D0 000050 0004+00 0/2 0/0 0/0 .rodata @3940 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3940 = 0.5f; -COMPILER_STRIP_GATE(80B265CC, &lit_3940); +COMPILER_STRIP_GATE(0x80B265CC, &lit_3940); #pragma pop /* 80B265D0-80B265D4 000054 0004+00 0/1 0/0 0/0 .rodata @3941 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3941 = 20.0f; -COMPILER_STRIP_GATE(80B265D0, &lit_3941); +COMPILER_STRIP_GATE(0x80B265D0, &lit_3941); #pragma pop /* 80B265D4-80B265D8 000058 0004+00 0/1 0/0 0/0 .rodata @3942 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3942 = 5.0f; -COMPILER_STRIP_GATE(80B265D4, &lit_3942); +COMPILER_STRIP_GATE(0x80B265D4, &lit_3942); #pragma pop /* 80B265D8-80B265DC 00005C 0004+00 0/1 0/0 0/0 .rodata @3943 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3943 = 4000.0f; -COMPILER_STRIP_GATE(80B265D8, &lit_3943); +COMPILER_STRIP_GATE(0x80B265D8, &lit_3943); #pragma pop /* 80B265DC-80B265E0 000060 0004+00 0/1 0/0 0/0 .rodata @3944 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3944 = -4000.0f; -COMPILER_STRIP_GATE(80B265DC, &lit_3944); +COMPILER_STRIP_GATE(0x80B265DC, &lit_3944); #pragma pop /* 80B265E0-80B265E4 000064 0004+00 0/2 0/0 0/0 .rodata @3945 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3945 = 1.0f; -COMPILER_STRIP_GATE(80B265E0, &lit_3945); +COMPILER_STRIP_GATE(0x80B265E0, &lit_3945); #pragma pop /* 80B265E4-80B265EC 000068 0008+00 0/1 0/0 0/0 .rodata @3947 */ @@ -356,7 +356,7 @@ COMPILER_STRIP_GATE(80B265E0, &lit_3945); SECTION_RODATA static u8 const lit_3947[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B265E4, &lit_3947); +COMPILER_STRIP_GATE(0x80B265E4, &lit_3947); #pragma pop /* 80B26678-80B2667C 000008 0004+00 2/2 0/0 0/0 .bss None */ @@ -385,35 +385,35 @@ static asm void npc_tr_move(npc_tr_class* param_0) { SECTION_RODATA static u8 const lit_3953[12] = { 0x3F, 0x00, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x40, 0x20, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B265EC, &lit_3953); +COMPILER_STRIP_GATE(0x80B265EC, &lit_3953); #pragma pop /* 80B265F8-80B265FC 00007C 0004+00 0/1 0/0 0/0 .rodata @3983 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3983 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(80B265F8, &lit_3983); +COMPILER_STRIP_GATE(0x80B265F8, &lit_3983); #pragma pop /* 80B265FC-80B26600 000080 0004+00 0/1 0/0 0/0 .rodata @3984 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3984 = 2000.0f; -COMPILER_STRIP_GATE(80B265FC, &lit_3984); +COMPILER_STRIP_GATE(0x80B265FC, &lit_3984); #pragma pop /* 80B26600-80B26604 000084 0004+00 0/1 0/0 0/0 .rodata @3985 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3985 = 13000.0f; -COMPILER_STRIP_GATE(80B26600, &lit_3985); +COMPILER_STRIP_GATE(0x80B26600, &lit_3985); #pragma pop /* 80B26604-80B26608 000088 0004+00 0/1 0/0 0/0 .rodata @3986 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3986 = -3.0f / 10.0f; -COMPILER_STRIP_GATE(80B26604, &lit_3986); +COMPILER_STRIP_GATE(0x80B26604, &lit_3986); #pragma pop /* 80B25FE0-80B261D8 0006C0 01F8+00 1/1 0/0 0/0 .text action__FP12npc_tr_class */ @@ -443,6 +443,13 @@ static bool daNPC_TR_IsDelete(npc_tr_class* param_0) { return true; } +/* ############################################################################################## */ +/* 80B26608-80B26608 00008C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80B26608 = "NPC_TR"; +#pragma pop + /* 80B262D8-80B2632C 0009B8 0054+00 1/0 0/0 0/0 .text daNPC_TR_Delete__FP12npc_tr_class */ #pragma push @@ -496,12 +503,7 @@ asm void __sinit_d_a_npc_tr_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80B2652C = (void*)__sinit_d_a_npc_tr_cpp; +REGISTER_CTORS(0x80B2652C, __sinit_d_a_npc_tr_cpp); #pragma pop -/* 80B26608-80B2660F 00008C 0007+00 3/3 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80B26608 = "NPC_TR"; -#pragma pop +/* 80B26608-80B26608 00008C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/npc/d_a_npc_uri/d_a_npc_uri.cpp b/rel/d/a/npc/d_a_npc_uri/d_a_npc_uri.cpp index 0e956d3ce0e..ec10cf412ff 100644 --- a/rel/d/a/npc/d_a_npc_uri/d_a_npc_uri.cpp +++ b/rel/d/a/npc/d_a_npc_uri/d_a_npc_uri.cpp @@ -15,12 +15,14 @@ struct mDoMtx_stack_c { static u8 now[48]; }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; +struct J3DAnmTransform {}; + +struct J3DModelData {}; + struct Vec {}; struct Z2Creature { @@ -29,8 +31,6 @@ struct Z2Creature { /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -43,6 +43,8 @@ struct fopAc_ac_c { /* 80018C8C */ ~fopAc_ac_c(); }; +struct daNpcT_faceMotionAnmData_c {}; + struct daNpcT_MotionSeqMngr_c { struct sequenceStepData_c {}; @@ -51,8 +53,12 @@ struct daNpcT_MotionSeqMngr_c { /* 80B2C56C */ ~daNpcT_MotionSeqMngr_c(); }; +struct daNpcT_evtData_c {}; + struct daNpcT_motionAnmData_c {}; +struct J3DJoint {}; + struct cXyz { /* 80266AE4 */ void operator+(Vec const&) const; /* 80266B34 */ void operator-(Vec const&) const; @@ -60,12 +66,6 @@ struct cXyz { /* 80B2C568 */ cXyz(); }; -struct J3DJoint {}; - -struct daNpcT_faceMotionAnmData_c {}; - -struct daNpcT_evtData_c {}; - struct daNpc_Uri_c { /* 80B267AC */ ~daNpc_Uri_c(); /* 80B268F8 */ void create(); @@ -139,15 +139,15 @@ struct dCcD_GObjInf { /* 800840E4 */ ~dCcD_GObjInf(); }; -struct J3DModel {}; - -struct _GXColorS10 {}; - struct csXyz { /* 80B2BECC */ ~csXyz(); /* 80B2C468 */ csXyz(); }; +struct _GXColorS10 {}; + +struct J3DModel {}; + struct daNpcT_c { /* 80147FA4 */ void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*); /* 80148058 */ void getTrnsfrmAnmP(char const*, int); @@ -523,8 +523,8 @@ extern "C" void getFaceMotionAnm__8daNpcT_cF26daNpcT_faceMotionAnmData_c(); extern "C" void getMotionAnm__8daNpcT_cF22daNpcT_motionAnmData_c(); extern "C" void changeAnm__8daNpcT_cFPiPi(); extern "C" void changeBtk__8daNpcT_cFPiPi(); -extern "C" void func_80B2CB10(int*); -extern "C" void func_80B2CB2C(f32, f32); +extern "C" void func_80B2CB10(void* _this, int*); +extern "C" void func_80B2CB2C(void* _this, f32, f32); extern "C" void __sinit_d_a_npc_uri_cpp(); extern "C" void __ct__11daNpc_Uri_cFPC26daNpcT_faceMotionAnmData_cPC22daNpcT_motionAnmData_cPCQ222daNpcT_MotionSeqMngr_c18sequenceStepData_ciPCQ222daNpcT_MotionSeqMngr_c18sequenceStepData_ciPC16daNpcT_evtData_cPPc(); @@ -738,6 +738,27 @@ extern "C" void __register_global_object(); // /* ############################################################################################## */ +/* 80B2CF74-80B2CF74 000160 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80B2CF74 = ""; +SECTION_DEAD static char const* const stringBase_80B2CF75 = "DEFAULT_GETITEM"; +SECTION_DEAD static char const* const stringBase_80B2CF85 = "NO_RESPONSE"; +SECTION_DEAD static char const* const stringBase_80B2CF91 = "FIRST_CONVERSATION"; +SECTION_DEAD static char const* const stringBase_80B2CFA4 = "CONVERSATION"; +SECTION_DEAD static char const* const stringBase_80B2CFB1 = "START_CARRY_TUTORIAL"; +SECTION_DEAD static char const* const stringBase_80B2CFC6 = "END_CARRY_TUTORIAL"; +SECTION_DEAD static char const* const stringBase_80B2CFD9 = "FAILURE_CARRY_TUTORIAL"; +SECTION_DEAD static char const* const stringBase_80B2CFF0 = "CONVERSATION_WITH_MOI"; +SECTION_DEAD static char const* const stringBase_80B2D006 = "FIND_WOLF"; +SECTION_DEAD static char const* const stringBase_80B2D010 = "MEETING_AGAIN"; +SECTION_DEAD static char const* const stringBase_80B2D01E = "Uri"; +SECTION_DEAD static char const* const stringBase_80B2D022 = "Uri1"; +SECTION_DEAD static char const* const stringBase_80B2D027 = "Uri2"; +SECTION_DEAD static char const* const stringBase_80B2D02C = "Uri3"; +SECTION_DEAD static char const* const stringBase_80B2D031 = "Uri_P1"; +#pragma pop + /* 80B2D048-80B2D054 000000 000C+00 3/3 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -1401,7 +1422,7 @@ SECTION_RODATA u8 const daNpc_Uri_Param_c::m[172] = { 0x00, 0x3C, 0x00, 0xB4, 0x00, 0x0A, 0x00, 0x00, 0x43, 0xAF, 0x00, 0x00, 0x43, 0xC8, 0x00, 0x00, 0x45, 0x3B, 0x80, 0x00, 0x43, 0x48, 0x00, 0x00, 0x44, 0x16, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B2CE14, &daNpc_Uri_Param_c::m); +COMPILER_STRIP_GATE(0x80B2CE14, &daNpc_Uri_Param_c::m); /* 80B2CEC0-80B2CEDC 0000AC 001C+00 0/1 0/0 0/0 .rodata heapSize$3979 */ #pragma push @@ -1410,35 +1431,35 @@ SECTION_RODATA static u8 const heapSize[28] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x37, 0x40, 0x00, 0x00, 0x37, 0x40, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B2CEC0, &heapSize); +COMPILER_STRIP_GATE(0x80B2CEC0, &heapSize); #pragma pop /* 80B2CEDC-80B2CEE0 0000C8 0004+00 0/1 0/0 0/0 .rodata @4051 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4051 = -200.0f; -COMPILER_STRIP_GATE(80B2CEDC, &lit_4051); +COMPILER_STRIP_GATE(0x80B2CEDC, &lit_4051); #pragma pop /* 80B2CEE0-80B2CEE4 0000CC 0004+00 0/1 0/0 0/0 .rodata @4052 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4052 = -100.0f; -COMPILER_STRIP_GATE(80B2CEE0, &lit_4052); +COMPILER_STRIP_GATE(0x80B2CEE0, &lit_4052); #pragma pop /* 80B2CEE4-80B2CEE8 0000D0 0004+00 0/2 0/0 0/0 .rodata @4053 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4053 = 200.0f; -COMPILER_STRIP_GATE(80B2CEE4, &lit_4053); +COMPILER_STRIP_GATE(0x80B2CEE4, &lit_4053); #pragma pop /* 80B2CEE8-80B2CEEC 0000D4 0004+00 0/2 0/0 0/0 .rodata @4054 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4054 = 300.0f; -COMPILER_STRIP_GATE(80B2CEE8, &lit_4054); +COMPILER_STRIP_GATE(0x80B2CEE8, &lit_4054); #pragma pop /* 80B2CEEC-80B2CEF0 0000D8 0004+00 8/21 0/0 0/0 .rodata @4055 */ @@ -1448,13 +1469,13 @@ SECTION_RODATA static u8 const lit_4055[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B2CEEC, &lit_4055); +COMPILER_STRIP_GATE(0x80B2CEEC, &lit_4055); /* 80B2CEF0-80B2CEF4 0000DC 0004+00 0/1 0/0 0/0 .rodata @4056 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4056 = -1000000000.0f; -COMPILER_STRIP_GATE(80B2CEF0, &lit_4056); +COMPILER_STRIP_GATE(0x80B2CEF0, &lit_4056); #pragma pop /* 80B268F8-80B26BE4 000238 02EC+00 1/1 0/0 0/0 .text create__11daNpc_Uri_cFv */ @@ -1472,19 +1493,19 @@ asm void daNpc_Uri_c::create() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4220 = 65536.0f; -COMPILER_STRIP_GATE(80B2CEF4, &lit_4220); +COMPILER_STRIP_GATE(0x80B2CEF4, &lit_4220); #pragma pop /* 80B2CEF8-80B2CEFC 0000E4 0004+00 0/3 0/0 0/0 .rodata @4221 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4221 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(80B2CEF8, &lit_4221); +COMPILER_STRIP_GATE(0x80B2CEF8, &lit_4221); #pragma pop /* 80B2CEFC-80B2CF00 0000E8 0004+00 2/5 0/0 0/0 .rodata @4378 */ SECTION_RODATA static f32 const lit_4378 = 1.0f; -COMPILER_STRIP_GATE(80B2CEFC, &lit_4378); +COMPILER_STRIP_GATE(0x80B2CEFC, &lit_4378); /* 80B26BE4-80B26ED0 000524 02EC+00 1/1 0/0 0/0 .text CreateHeap__11daNpc_Uri_cFv */ #pragma push @@ -1619,7 +1640,7 @@ asm void daNpc_Uri_c::Execute() { /* ############################################################################################## */ /* 80B2CF00-80B2CF04 0000EC 0004+00 1/3 0/0 0/0 .rodata @4427 */ SECTION_RODATA static f32 const lit_4427 = 100.0f; -COMPILER_STRIP_GATE(80B2CF00, &lit_4427); +COMPILER_STRIP_GATE(0x80B2CF00, &lit_4427); /* 80B270E0-80B27174 000A20 0094+00 1/1 0/0 0/0 .text Draw__11daNpc_Uri_cFv */ #pragma push @@ -1716,7 +1737,7 @@ asm void daNpc_Uri_c::checkChangeEvt() { /* ############################################################################################## */ /* 80B2CF04-80B2CF08 0000F0 0004+00 2/6 0/0 0/0 .rodata @4713 */ SECTION_RODATA static f32 const lit_4713 = -1.0f; -COMPILER_STRIP_GATE(80B2CF04, &lit_4713); +COMPILER_STRIP_GATE(0x80B2CF04, &lit_4713); /* 80B27B3C-80B27BF0 00147C 00B4+00 2/0 0/0 0/0 .text setAfterTalkMotion__11daNpc_Uri_cFv */ @@ -1784,56 +1805,56 @@ asm void daNpc_Uri_c::beforeMove() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4875 = -30.0f; -COMPILER_STRIP_GATE(80B2CF08, &lit_4875); +COMPILER_STRIP_GATE(0x80B2CF08, &lit_4875); #pragma pop /* 80B2CF0C-80B2CF10 0000F8 0004+00 0/2 0/0 0/0 .rodata @4876 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4876 = 10.0f; -COMPILER_STRIP_GATE(80B2CF0C, &lit_4876); +COMPILER_STRIP_GATE(0x80B2CF0C, &lit_4876); #pragma pop /* 80B2CF10-80B2CF14 0000FC 0004+00 0/1 0/0 0/0 .rodata @4877 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4877 = 0x38C90FDB; -COMPILER_STRIP_GATE(80B2CF10, &lit_4877); +COMPILER_STRIP_GATE(0x80B2CF10, &lit_4877); #pragma pop /* 80B2CF14-80B2CF18 000100 0004+00 0/2 0/0 0/0 .rodata @4878 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4878 = -60.0f; -COMPILER_STRIP_GATE(80B2CF14, &lit_4878); +COMPILER_STRIP_GATE(0x80B2CF14, &lit_4878); #pragma pop /* 80B2CF18-80B2CF1C 000104 0004+00 0/2 0/0 0/0 .rodata @4879 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4879 = 20.0f; -COMPILER_STRIP_GATE(80B2CF18, &lit_4879); +COMPILER_STRIP_GATE(0x80B2CF18, &lit_4879); #pragma pop /* 80B2CF1C-80B2CF20 000108 0004+00 0/1 0/0 0/0 .rodata @4880 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4880 = 3.0f; -COMPILER_STRIP_GATE(80B2CF1C, &lit_4880); +COMPILER_STRIP_GATE(0x80B2CF1C, &lit_4880); #pragma pop /* 80B2CF20-80B2CF24 00010C 0004+00 0/1 0/0 0/0 .rodata @4881 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4881 = 11.0f; -COMPILER_STRIP_GATE(80B2CF20, &lit_4881); +COMPILER_STRIP_GATE(0x80B2CF20, &lit_4881); #pragma pop /* 80B2CF24-80B2CF2C 000110 0008+00 1/6 0/0 0/0 .rodata @4883 */ SECTION_RODATA static u8 const lit_4883[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B2CF24, &lit_4883); +COMPILER_STRIP_GATE(0x80B2CF24, &lit_4883); /* 80B2DD18-80B2DD1C 000008 0001+03 1/1 0/0 0/0 .bss @1109 */ static u8 lit_1109[1 + 3 /* padding */]; @@ -1978,7 +1999,7 @@ bool daNpc_Uri_c::drawDbgInfo() { SECTION_RODATA static u8 const lit_4941[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B2CF2C, &lit_4941); +COMPILER_STRIP_GATE(0x80B2CF2C, &lit_4941); #pragma pop /* 80B2CF34-80B2CF3C 000120 0008+00 0/2 0/0 0/0 .rodata @4942 */ @@ -1987,7 +2008,7 @@ COMPILER_STRIP_GATE(80B2CF2C, &lit_4941); SECTION_RODATA static u8 const lit_4942[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B2CF34, &lit_4942); +COMPILER_STRIP_GATE(0x80B2CF34, &lit_4942); #pragma pop /* 80B2CF3C-80B2CF44 000128 0008+00 0/2 0/0 0/0 .rodata @4943 */ @@ -1996,7 +2017,7 @@ COMPILER_STRIP_GATE(80B2CF34, &lit_4942); SECTION_RODATA static u8 const lit_4943[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B2CF3C, &lit_4943); +COMPILER_STRIP_GATE(0x80B2CF3C, &lit_4943); #pragma pop /* 80B2CF44-80B2CF48 000130 0004+00 1/1 0/0 0/0 .rodata jointNo$5001 */ @@ -2006,7 +2027,7 @@ SECTION_RODATA static u8 const jointNo[4] = { 0x00, 0x0C, }; -COMPILER_STRIP_GATE(80B2CF44, &jointNo); +COMPILER_STRIP_GATE(0x80B2CF44, &jointNo); /* 80B284DC-80B285B4 001E1C 00D8+00 1/0 0/0 0/0 .text drawOtherMdl__11daNpc_Uri_cFv */ #pragma push @@ -2063,7 +2084,7 @@ asm void daNpc_Uri_c::selectAction() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpc_Uri_c::chkAction(int (daNpc_Uri_c::*)(void*)) { +asm void daNpc_Uri_c::chkAction(int (daNpc_Uri_c::*param_0)(void*)) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_uri/d_a_npc_uri/chkAction__11daNpc_Uri_cFM11daNpc_Uri_cFPCvPvPv_i.s" } @@ -2074,7 +2095,7 @@ asm void daNpc_Uri_c::chkAction(int (daNpc_Uri_c::*)(void*)) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpc_Uri_c::setAction(int (daNpc_Uri_c::*)(void*)) { +asm void daNpc_Uri_c::setAction(int (daNpc_Uri_c::*param_0)(void*)) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_uri/d_a_npc_uri/setAction__11daNpc_Uri_cFM11daNpc_Uri_cFPCvPvPv_i.s" } @@ -2115,7 +2136,14 @@ asm void daNpc_Uri_c::getTutorialCond(cXyz param_0) { SECTION_RODATA static u8 const lit_5394[8] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, }; -COMPILER_STRIP_GATE(80B2CF48, &lit_5394); +COMPILER_STRIP_GATE(0x80B2CF48, &lit_5394); + +/* 80B2CF74-80B2CF74 000160 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80B2D038 = "prm"; +SECTION_DEAD static char const* const stringBase_80B2D03C = "msgNo"; +#pragma pop /* 80B28FB8-80B29198 0028F8 01E0+00 1/0 0/0 0/0 .text cutConversation__11daNpc_Uri_cFi */ #pragma push @@ -2152,13 +2180,13 @@ asm void daNpc_Uri_c::cutEndCarryTutorial(int param_0) { SECTION_RODATA static u8 const lit_5573[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B2CF50, &lit_5573); +COMPILER_STRIP_GATE(0x80B2CF50, &lit_5573); /* 80B2CF58-80B2CF60 000144 0008+00 1/1 0/0 0/0 .rodata @5580 */ SECTION_RODATA static u8 const lit_5580[8] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, }; -COMPILER_STRIP_GATE(80B2CF58, &lit_5580); +COMPILER_STRIP_GATE(0x80B2CF58, &lit_5580); /* 80B296B8-80B2985C 002FF8 01A4+00 1/0 0/0 0/0 .text cutConversationWithMoi__11daNpc_Uri_cFi */ #pragma push @@ -2175,7 +2203,13 @@ asm void daNpc_Uri_c::cutConversationWithMoi(int param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5699 = 150.0f; -COMPILER_STRIP_GATE(80B2CF60, &lit_5699); +COMPILER_STRIP_GATE(0x80B2CF60, &lit_5699); +#pragma pop + +/* 80B2CF74-80B2CF74 000160 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80B2D042 = "timer"; #pragma pop /* 80B2985C-80B29BA4 00319C 0348+00 1/0 0/0 0/0 .text cutFindWolf__11daNpc_Uri_cFi */ @@ -2203,21 +2237,21 @@ asm void daNpc_Uri_c::cutMeetingAgain(int param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5866 = 0.5f; -COMPILER_STRIP_GATE(80B2CF64, &lit_5866); +COMPILER_STRIP_GATE(0x80B2CF64, &lit_5866); #pragma pop /* 80B2CF68-80B2CF6C 000154 0004+00 0/3 0/0 0/0 .rodata @5867 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5867 = 1.5f; -COMPILER_STRIP_GATE(80B2CF68, &lit_5867); +COMPILER_STRIP_GATE(0x80B2CF68, &lit_5867); #pragma pop /* 80B2CF6C-80B2CF70 000158 0004+00 0/1 0/0 0/0 .rodata @5868 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5868 = 14.0f; -COMPILER_STRIP_GATE(80B2CF6C, &lit_5868); +COMPILER_STRIP_GATE(0x80B2CF6C, &lit_5868); #pragma pop /* 80B29EA0-80B2A1B4 0037E0 0314+00 1/0 0/0 0/0 .text krun__11daNpc_Uri_cFPv */ @@ -2255,7 +2289,7 @@ asm void daNpc_Uri_c::walk(void* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6565 = 4.0f; -COMPILER_STRIP_GATE(80B2CF70, &lit_6565); +COMPILER_STRIP_GATE(0x80B2CF70, &lit_6565); #pragma pop /* 80B2B24C-80B2B7C0 004B8C 0574+00 2/0 0/0 0/0 .text sitWait__11daNpc_Uri_cFPv */ @@ -2618,7 +2652,7 @@ void daNpcT_c::changeBtk(int* param_0, int* param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80B2CB10(int* param_0) { +extern "C" asm void func_80B2CB10(void* _this, int* param_0) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_uri/d_a_npc_uri/func_80B2CB10.s" } @@ -2628,7 +2662,7 @@ extern "C" asm void func_80B2CB10(int* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80B2CB2C(f32 param_0, f32 param_1) { +extern "C" asm void func_80B2CB2C(void* _this, f32 param_0, f32 param_1) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_uri/d_a_npc_uri/func_80B2CB2C.s" } @@ -2654,7 +2688,7 @@ asm void __sinit_d_a_npc_uri_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80B2CB68 = (void*)__sinit_d_a_npc_uri_cpp; +REGISTER_CTORS(0x80B2CB68, __sinit_d_a_npc_uri_cpp); #pragma pop /* 80B2CC64-80B2CD44 0065A4 00E0+00 1/1 0/0 0/0 .text @@ -2938,27 +2972,4 @@ static u8 data_80B2DDE0[4]; static u8 data_80B2DDE4[4]; #pragma pop -/* 80B2CF74-80B2D048 000160 00D4+00 10/7 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80B2CF74 = ""; -SECTION_DEAD static char const* const stringBase_80B2CF75 = "DEFAULT_GETITEM"; -SECTION_DEAD static char const* const stringBase_80B2CF85 = "NO_RESPONSE"; -SECTION_DEAD static char const* const stringBase_80B2CF91 = "FIRST_CONVERSATION"; -SECTION_DEAD static char const* const stringBase_80B2CFA4 = "CONVERSATION"; -SECTION_DEAD static char const* const stringBase_80B2CFB1 = "START_CARRY_TUTORIAL"; -SECTION_DEAD static char const* const stringBase_80B2CFC6 = "END_CARRY_TUTORIAL"; -SECTION_DEAD static char const* const stringBase_80B2CFD9 = "FAILURE_CARRY_TUTORIAL"; -SECTION_DEAD static char const* const stringBase_80B2CFF0 = "CONVERSATION_WITH_MOI"; -SECTION_DEAD static char const* const stringBase_80B2D006 = "FIND_WOLF"; -SECTION_DEAD static char const* const stringBase_80B2D010 = "MEETING_AGAIN"; -SECTION_DEAD static char const* const stringBase_80B2D01E = "Uri"; -SECTION_DEAD static char const* const stringBase_80B2D022 = "Uri1"; -SECTION_DEAD static char const* const stringBase_80B2D027 = "Uri2"; -SECTION_DEAD static char const* const stringBase_80B2D02C = "Uri3"; -SECTION_DEAD static char const* const stringBase_80B2D031 = "Uri_P1"; -SECTION_DEAD static char const* const stringBase_80B2D038 = "prm"; -SECTION_DEAD static char const* const stringBase_80B2D03C = "msgNo"; -SECTION_DEAD static char const* const stringBase_80B2D042 = "timer"; -#pragma pop +/* 80B2CF74-80B2CF74 000160 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/npc/d_a_npc_worm/d_a_npc_worm.cpp b/rel/d/a/npc/d_a_npc_worm/d_a_npc_worm.cpp index c2875d8d273..bcfd3a1d28f 100644 --- a/rel/d/a/npc/d_a_npc_worm/d_a_npc_worm.cpp +++ b/rel/d/a/npc/d_a_npc_worm/d_a_npc_worm.cpp @@ -192,7 +192,7 @@ static asm void nodeCallBack(J3DJoint* param_0, int param_1) { /* ############################################################################################## */ /* 80B2F080-80B2F084 000000 0004+00 7/7 0/0 0/0 .rodata @3717 */ SECTION_RODATA static f32 const lit_3717 = 1.0f / 100.0f; -COMPILER_STRIP_GATE(80B2F080, &lit_3717); +COMPILER_STRIP_GATE(0x80B2F080, &lit_3717); /* 80B2DF4C-80B2E044 00014C 00F8+00 1/0 0/0 0/0 .text daNPC_WORM_Draw__FP14npc_worm_class */ @@ -215,7 +215,7 @@ SECTION_RODATA static u8 const lit_3774[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B2F084, &lit_3774); +COMPILER_STRIP_GATE(0x80B2F084, &lit_3774); #pragma pop /* 80B2F088-80B2F090 000008 0008+00 0/1 0/0 0/0 .rodata @3775 */ @@ -224,7 +224,7 @@ COMPILER_STRIP_GATE(80B2F084, &lit_3774); SECTION_RODATA static u8 const lit_3775[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B2F088, &lit_3775); +COMPILER_STRIP_GATE(0x80B2F088, &lit_3775); #pragma pop /* 80B2F090-80B2F098 000010 0008+00 0/1 0/0 0/0 .rodata @3776 */ @@ -233,7 +233,7 @@ COMPILER_STRIP_GATE(80B2F088, &lit_3775); SECTION_RODATA static u8 const lit_3776[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B2F090, &lit_3776); +COMPILER_STRIP_GATE(0x80B2F090, &lit_3776); #pragma pop /* 80B2F098-80B2F0A0 000018 0008+00 0/1 0/0 0/0 .rodata @3777 */ @@ -242,35 +242,35 @@ COMPILER_STRIP_GATE(80B2F090, &lit_3776); SECTION_RODATA static u8 const lit_3777[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B2F098, &lit_3777); +COMPILER_STRIP_GATE(0x80B2F098, &lit_3777); #pragma pop /* 80B2F0A0-80B2F0A4 000020 0004+00 0/1 0/0 0/0 .rodata @3778 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3778 = 35.0f; -COMPILER_STRIP_GATE(80B2F0A0, &lit_3778); +COMPILER_STRIP_GATE(0x80B2F0A0, &lit_3778); #pragma pop /* 80B2F0A4-80B2F0A8 000024 0004+00 0/3 0/0 0/0 .rodata @3779 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3779 = 10.0f; -COMPILER_STRIP_GATE(80B2F0A4, &lit_3779); +COMPILER_STRIP_GATE(0x80B2F0A4, &lit_3779); #pragma pop /* 80B2F0A8-80B2F0AC 000028 0004+00 0/3 0/0 0/0 .rodata @3780 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3780 = 5.0f; -COMPILER_STRIP_GATE(80B2F0A8, &lit_3780); +COMPILER_STRIP_GATE(0x80B2F0A8, &lit_3780); #pragma pop /* 80B2F0AC-80B2F0B0 00002C 0004+00 0/1 0/0 0/0 .rodata @3781 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3781 = 20.0f; -COMPILER_STRIP_GATE(80B2F0AC, &lit_3781); +COMPILER_STRIP_GATE(0x80B2F0AC, &lit_3781); #pragma pop /* 80B2E044-80B2E2C4 000244 0280+00 1/1 0/0 0/0 .text npc_worm_ground__FP14npc_worm_class @@ -289,98 +289,98 @@ static asm void npc_worm_ground(npc_worm_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3812 = 65536.0f; -COMPILER_STRIP_GATE(80B2F0B0, &lit_3812); +COMPILER_STRIP_GATE(0x80B2F0B0, &lit_3812); #pragma pop /* 80B2F0B4-80B2F0B8 000034 0004+00 0/1 0/0 0/0 .rodata @3813 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3813 = 16000.0f; -COMPILER_STRIP_GATE(80B2F0B4, &lit_3813); +COMPILER_STRIP_GATE(0x80B2F0B4, &lit_3813); #pragma pop /* 80B2F0B8-80B2F0BC 000038 0004+00 0/1 0/0 0/0 .rodata @3814 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3814 = 130.0f; -COMPILER_STRIP_GATE(80B2F0B8, &lit_3814); +COMPILER_STRIP_GATE(0x80B2F0B8, &lit_3814); #pragma pop /* 80B2F0BC-80B2F0C0 00003C 0004+00 0/2 0/0 0/0 .rodata @3815 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3815 = 60.0f; -COMPILER_STRIP_GATE(80B2F0BC, &lit_3815); +COMPILER_STRIP_GATE(0x80B2F0BC, &lit_3815); #pragma pop /* 80B2F0C0-80B2F0C4 000040 0004+00 0/3 0/0 0/0 .rodata @3816 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3816 = 3.0f; -COMPILER_STRIP_GATE(80B2F0C0, &lit_3816); +COMPILER_STRIP_GATE(0x80B2F0C0, &lit_3816); #pragma pop /* 80B2F0C4-80B2F0C8 000044 0004+00 0/1 0/0 0/0 .rodata @3817 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3817 = 15.0f; -COMPILER_STRIP_GATE(80B2F0C4, &lit_3817); +COMPILER_STRIP_GATE(0x80B2F0C4, &lit_3817); #pragma pop /* 80B2F0C8-80B2F0CC 000048 0004+00 0/1 0/0 0/0 .rodata @3818 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3818 = 4.0f; -COMPILER_STRIP_GATE(80B2F0C8, &lit_3818); +COMPILER_STRIP_GATE(0x80B2F0C8, &lit_3818); #pragma pop /* 80B2F0CC-80B2F0D0 00004C 0004+00 0/1 0/0 0/0 .rodata @3819 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3819 = 2.0f; -COMPILER_STRIP_GATE(80B2F0CC, &lit_3819); +COMPILER_STRIP_GATE(0x80B2F0CC, &lit_3819); #pragma pop /* 80B2F0D0-80B2F0D4 000050 0004+00 0/1 0/0 0/0 .rodata @3820 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3820 = 20000.0f; -COMPILER_STRIP_GATE(80B2F0D0, &lit_3820); +COMPILER_STRIP_GATE(0x80B2F0D0, &lit_3820); #pragma pop /* 80B2F0D4-80B2F0D8 000054 0004+00 0/1 0/0 0/0 .rodata @3821 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3821 = 0.5f; -COMPILER_STRIP_GATE(80B2F0D4, &lit_3821); +COMPILER_STRIP_GATE(0x80B2F0D4, &lit_3821); #pragma pop /* 80B2F0D8-80B2F0DC 000058 0004+00 0/1 0/0 0/0 .rodata @3822 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3822 = 0.75f; -COMPILER_STRIP_GATE(80B2F0D8, &lit_3822); +COMPILER_STRIP_GATE(0x80B2F0D8, &lit_3822); #pragma pop /* 80B2F0DC-80B2F0E0 00005C 0004+00 0/2 0/0 0/0 .rodata @3823 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3823 = 200.0f; -COMPILER_STRIP_GATE(80B2F0DC, &lit_3823); +COMPILER_STRIP_GATE(0x80B2F0DC, &lit_3823); #pragma pop /* 80B2F0E0-80B2F0E4 000060 0004+00 0/2 0/0 0/0 .rodata @3824 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3824 = 100.0f; -COMPILER_STRIP_GATE(80B2F0E0, &lit_3824); +COMPILER_STRIP_GATE(0x80B2F0E0, &lit_3824); #pragma pop /* 80B2F0E4-80B2F0E8 000064 0004+00 0/1 0/0 0/0 .rodata @3825 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3825 = -150.0f; -COMPILER_STRIP_GATE(80B2F0E4, &lit_3825); +COMPILER_STRIP_GATE(0x80B2F0E4, &lit_3825); #pragma pop /* 80B2E2C4-80B2E544 0004C4 0280+00 1/1 0/0 0/0 .text npc_worm_normal__FP14npc_worm_class @@ -399,28 +399,28 @@ static asm void npc_worm_normal(npc_worm_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3850 = -1.0f; -COMPILER_STRIP_GATE(80B2F0E8, &lit_3850); +COMPILER_STRIP_GATE(0x80B2F0E8, &lit_3850); #pragma pop /* 80B2F0EC-80B2F0F0 00006C 0004+00 0/3 0/0 0/0 .rodata @3851 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3851 = 1.0f; -COMPILER_STRIP_GATE(80B2F0EC, &lit_3851); +COMPILER_STRIP_GATE(0x80B2F0EC, &lit_3851); #pragma pop /* 80B2F0F0-80B2F0F4 000070 0004+00 0/2 0/0 0/0 .rodata @3852 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3852 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(80B2F0F0, &lit_3852); +COMPILER_STRIP_GATE(0x80B2F0F0, &lit_3852); #pragma pop /* 80B2F0F4-80B2F0F8 000074 0004+00 0/1 0/0 0/0 .rodata @3853 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3853 = 1.0f / 50.0f; -COMPILER_STRIP_GATE(80B2F0F4, &lit_3853); +COMPILER_STRIP_GATE(0x80B2F0F4, &lit_3853); #pragma pop /* 80B2E544-80B2E678 000744 0134+00 1/1 0/0 0/0 .text npc_worm_dive__FP14npc_worm_class @@ -449,49 +449,49 @@ static asm void npc_worm_binwait(npc_worm_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3990 = 8000.0f; -COMPILER_STRIP_GATE(80B2F0F8, &lit_3990); +COMPILER_STRIP_GATE(0x80B2F0F8, &lit_3990); #pragma pop /* 80B2F0FC-80B2F100 00007C 0004+00 0/1 0/0 0/0 .rodata @3991 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3991 = 4000.0f; -COMPILER_STRIP_GATE(80B2F0FC, &lit_3991); +COMPILER_STRIP_GATE(0x80B2F0FC, &lit_3991); #pragma pop /* 80B2F100-80B2F104 000080 0004+00 0/1 0/0 0/0 .rodata @3992 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3992 = 2000.0f; -COMPILER_STRIP_GATE(80B2F100, &lit_3992); +COMPILER_STRIP_GATE(0x80B2F100, &lit_3992); #pragma pop /* 80B2F104-80B2F108 000084 0004+00 0/1 0/0 0/0 .rodata @3993 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3993 = 17.0f / 100.0f; -COMPILER_STRIP_GATE(80B2F104, &lit_3993); +COMPILER_STRIP_GATE(0x80B2F104, &lit_3993); #pragma pop /* 80B2F108-80B2F10C 000088 0004+00 0/1 0/0 0/0 .rodata @3994 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3994 = -50.0f; -COMPILER_STRIP_GATE(80B2F108, &lit_3994); +COMPILER_STRIP_GATE(0x80B2F108, &lit_3994); #pragma pop /* 80B2F10C-80B2F110 00008C 0004+00 0/1 0/0 0/0 .rodata @3995 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3995 = 50.0f; -COMPILER_STRIP_GATE(80B2F10C, &lit_3995); +COMPILER_STRIP_GATE(0x80B2F10C, &lit_3995); #pragma pop /* 80B2F110-80B2F114 000090 0004+00 0/1 0/0 0/0 .rodata @3996 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3996 = -10.0f; -COMPILER_STRIP_GATE(80B2F110, &lit_3996); +COMPILER_STRIP_GATE(0x80B2F110, &lit_3996); #pragma pop /* 80B2E6C4-80B2EBF4 0008C4 0530+00 1/1 0/0 0/0 .text action__FP14npc_worm_class */ @@ -509,21 +509,21 @@ static asm void action(npc_worm_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4054 = 2.5f; -COMPILER_STRIP_GATE(80B2F114, &lit_4054); +COMPILER_STRIP_GATE(0x80B2F114, &lit_4054); #pragma pop /* 80B2F118-80B2F11C 000098 0004+00 0/1 0/0 0/0 .rodata @4055 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4055 = 2.0f / 25.0f; -COMPILER_STRIP_GATE(80B2F118, &lit_4055); +COMPILER_STRIP_GATE(0x80B2F118, &lit_4055); #pragma pop /* 80B2F11C-80B2F120 00009C 0004+00 0/1 0/0 0/0 .rodata @4056 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4056 = 11.0f / 10.0f; -COMPILER_STRIP_GATE(80B2F11C, &lit_4056); +COMPILER_STRIP_GATE(0x80B2F11C, &lit_4056); #pragma pop /* 80B2EBF4-80B2EDD0 000DF4 01DC+00 2/1 0/0 0/0 .text daNPC_WORM_Execute__FP14npc_worm_class */ @@ -541,6 +541,13 @@ static bool daNPC_WORM_IsDelete(npc_worm_class* param_0) { return true; } +/* ############################################################################################## */ +/* 80B2F124-80B2F124 0000A4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80B2F124 = "Alink"; +#pragma pop + /* 80B2EDD8-80B2EE08 000FD8 0030+00 1/0 0/0 0/0 .text daNPC_WORM_Delete__FP14npc_worm_class */ #pragma push #pragma optimization_level 0 @@ -566,7 +573,7 @@ static asm void useHeapInit(fopAc_ac_c* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4126 = 65535.0f; -COMPILER_STRIP_GATE(80B2F120, &lit_4126); +COMPILER_STRIP_GATE(0x80B2F120, &lit_4126); #pragma pop /* 80B2F12C-80B2F14C -00001 0020+00 1/0 0/0 0/0 .data l_daNPC_WORM_Method */ @@ -629,9 +636,4 @@ asm void dInsect_c::Insect_Release() { } #pragma pop -/* 80B2F124-80B2F12A 0000A4 0006+00 3/3 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80B2F124 = "Alink"; -#pragma pop +/* 80B2F124-80B2F124 0000A4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/npc/d_a_npc_wrestler/d_a_npc_wrestler.cpp b/rel/d/a/npc/d_a_npc_wrestler/d_a_npc_wrestler.cpp index 7e0745a4d96..bb91ee57745 100644 --- a/rel/d/a/npc/d_a_npc_wrestler/d_a_npc_wrestler.cpp +++ b/rel/d/a/npc/d_a_npc_wrestler/d_a_npc_wrestler.cpp @@ -41,12 +41,12 @@ struct mDoExt_bckAnm { /* 8000D990 */ void changeBckOnly(J3DAnmTransform*); }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; +struct J3DModelData {}; + struct Z2Creature { /* 802C03C8 */ Z2Creature(); /* 802C0420 */ ~Z2Creature(); @@ -81,10 +81,10 @@ struct daNpc_grA_c { /* 809C1160 */ void getMode1(); }; -struct J3DJoint {}; - struct J3DModel {}; +struct J3DJoint {}; + struct daNpcWrestler_c { /* 80B2F28C */ daNpcWrestler_c(); /* 80B2F4A0 */ ~daNpcWrestler_c(); @@ -167,16 +167,16 @@ struct daNpcWrestler_Param_c { static u8 const m[404]; }; -struct J3DAnmTextureSRTKey {}; - -struct _GXColorS10 {}; - struct J3DAnmTexPattern { /* 8032AF50 */ void getTexNo(u16, u16*) const; }; +struct J3DAnmTextureSRTKey {}; + struct J3DAnmTransformKey {}; +struct _GXColorS10 {}; + struct daNpcF_c { struct daNpcF_anmPlayData {}; @@ -285,7 +285,6 @@ struct dEvt_control_c { /* 80042468 */ void reset(); /* 80042518 */ void reset(void*); /* 80042914 */ void setSkipProc(void*, int (*)(void*, int), int); - /* 800436EC */ void setPtI_Id(unsigned int); }; struct dEvent_manager_c { @@ -419,7 +418,7 @@ struct JMath { struct TSinCosTable {}; /* TSinCosTable<13, f32> */ struct TSinCosTable__template0 { - /* 80B40D28 */ void func_80B40D28(s16) /* const */; + /* 80B40D28 */ void func_80B40D28(void* _this, s16) /* const */; }; static u8 sincosTable_[65536]; @@ -566,7 +565,7 @@ extern "C" void setAttnPos__15daNpcWrestler_cFv(); extern "C" void lookat__15daNpcWrestler_cFv(); extern "C" bool drawDbgInfo__15daNpcWrestler_cFv(); extern "C" void drawOtherMdls__15daNpcWrestler_cFv(); -extern "C" void func_80B40D28(s16); +extern "C" void func_80B40D28(void* _this, s16); extern "C" void __sinit_d_a_npc_wrestler_cpp(); extern "C" void __dt__18daNpcF_ActorMngr_cFv(); extern "C" void __ct__18daNpcF_ActorMngr_cFv(); @@ -814,6 +813,21 @@ extern "C" void __register_global_object(); // /* ############################################################################################## */ +/* 80B41D7C-80B41D7C 0006A0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80B41D7C = "alSumou"; +SECTION_DEAD static char const* const stringBase_80B41D84 = "Bou3"; +SECTION_DEAD static char const* const stringBase_80B41D89 = "grDS"; +SECTION_DEAD static char const* const stringBase_80B41D8E = "GRDS_ENTRY"; +SECTION_DEAD static char const* const stringBase_80B41D99 = "GRDS_ENTRY2"; +SECTION_DEAD static char const* const stringBase_80B41DA5 = "GRDS_ENTRY3"; +SECTION_DEAD static char const* const stringBase_80B41DB1 = "GRDS_ENTRY4"; +SECTION_DEAD static char const* const stringBase_80B41DBD = "GRDS_ENTRY5"; +SECTION_DEAD static char const* const stringBase_80B41DC9 = "GRDS_LOSE"; +SECTION_DEAD static char const* const stringBase_80B41DD3 = "Wrestler"; +#pragma pop + /* 80B41DF8-80B41E04 000000 000C+00 20/20 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -2402,62 +2416,62 @@ SECTION_RODATA u8 const daNpcWrestler_Param_c::m[404] = { 0x00, 0x00, 0x00, 0x00, 0x41, 0xA0, 0x00, 0x00, 0x41, 0xA0, 0x00, 0x00, 0x42, 0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B416DC, &daNpcWrestler_Param_c::m); +COMPILER_STRIP_GATE(0x80B416DC, &daNpcWrestler_Param_c::m); /* 80B41870-80B41874 000194 0004+00 0/1 0/0 0/0 .rodata @4358 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4358 = -160.0f; -COMPILER_STRIP_GATE(80B41870, &lit_4358); +COMPILER_STRIP_GATE(0x80B41870, &lit_4358); #pragma pop /* 80B41874-80B41878 000198 0004+00 0/1 0/0 0/0 .rodata @4359 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4359 = -50.0f; -COMPILER_STRIP_GATE(80B41874, &lit_4359); +COMPILER_STRIP_GATE(0x80B41874, &lit_4359); #pragma pop /* 80B41878-80B4187C 00019C 0004+00 0/3 0/0 0/0 .rodata @4360 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4360 = 160.0f; -COMPILER_STRIP_GATE(80B41878, &lit_4360); +COMPILER_STRIP_GATE(0x80B41878, &lit_4360); #pragma pop /* 80B4187C-80B41880 0001A0 0004+00 0/1 0/0 0/0 .rodata @4361 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4361 = 220.0f; -COMPILER_STRIP_GATE(80B4187C, &lit_4361); +COMPILER_STRIP_GATE(0x80B4187C, &lit_4361); #pragma pop /* 80B41880-80B41884 0001A4 0004+00 0/1 0/0 0/0 .rodata @4362 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4362 = 210.0f; -COMPILER_STRIP_GATE(80B41880, &lit_4362); +COMPILER_STRIP_GATE(0x80B41880, &lit_4362); #pragma pop /* 80B41884-80B41888 0001A8 0004+00 0/1 0/0 0/0 .rodata @4363 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4363 = 410.0f; -COMPILER_STRIP_GATE(80B41884, &lit_4363); +COMPILER_STRIP_GATE(0x80B41884, &lit_4363); #pragma pop /* 80B41888-80B4188C 0001AC 0004+00 0/3 0/0 0/0 .rodata @4364 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4364 = 32.0f; -COMPILER_STRIP_GATE(80B41888, &lit_4364); +COMPILER_STRIP_GATE(0x80B41888, &lit_4364); #pragma pop /* 80B4188C-80B41890 0001B0 0004+00 0/1 0/0 0/0 .rodata @4365 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4365 = 419.0f; -COMPILER_STRIP_GATE(80B4188C, &lit_4365); +COMPILER_STRIP_GATE(0x80B4188C, &lit_4365); #pragma pop /* 80B2F688-80B2F974 0004E8 02EC+00 1/1 0/0 0/0 .text Create__15daNpcWrestler_cFv */ @@ -2473,7 +2487,7 @@ asm void daNpcWrestler_c::Create() { /* ############################################################################################## */ /* 80B41890-80B41894 0001B4 0004+00 5/19 0/0 0/0 .rodata @4417 */ SECTION_RODATA static f32 const lit_4417 = 1.0f; -COMPILER_STRIP_GATE(80B41890, &lit_4417); +COMPILER_STRIP_GATE(0x80B41890, &lit_4417); /* 80B41894-80B41898 0001B8 0004+00 8/36 0/0 0/0 .rodata @4418 */ SECTION_RODATA static u8 const lit_4418[4] = { @@ -2482,7 +2496,7 @@ SECTION_RODATA static u8 const lit_4418[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B41894, &lit_4418); +COMPILER_STRIP_GATE(0x80B41894, &lit_4418); /* 80B2F974-80B2FBF4 0007D4 0280+00 1/1 0/0 0/0 .text CreateHeap__15daNpcWrestler_cFv */ #pragma push @@ -2629,7 +2643,7 @@ asm void daNpcWrestler_c::Draw() { SECTION_RODATA static u8 const lit_4467[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B41898, &lit_4467); +COMPILER_STRIP_GATE(0x80B41898, &lit_4467); /* 80B2FE84-80B30150 000CE4 02CC+00 1/1 0/0 0/0 .text * ctrlJoint__15daNpcWrestler_cFP8J3DJointP8J3DModel */ @@ -2709,39 +2723,39 @@ asm void daNpcWrestler_c::setMotionAnm(int param_0, f32 param_1) { /* ############################################################################################## */ /* 80B418A4-80B418A8 0001C8 0004+00 5/29 0/0 0/0 .rodata @4799 */ SECTION_RODATA static f32 const lit_4799 = -1.0f; -COMPILER_STRIP_GATE(80B418A4, &lit_4799); +COMPILER_STRIP_GATE(0x80B418A4, &lit_4799); /* 80B418A8-80B418AC 0001CC 0004+00 0/1 0/0 0/0 .rodata @4800 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4800 = 0xC3583F62; -COMPILER_STRIP_GATE(80B418A8, &lit_4800); +COMPILER_STRIP_GATE(0x80B418A8, &lit_4800); #pragma pop /* 80B418AC-80B418B0 0001D0 0004+00 0/1 0/0 0/0 .rodata @4801 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4801 = 0xC32C199A; -COMPILER_STRIP_GATE(80B418AC, &lit_4801); +COMPILER_STRIP_GATE(0x80B418AC, &lit_4801); #pragma pop /* 80B418B0-80B418B4 0001D4 0004+00 0/1 0/0 0/0 .rodata @4802 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4802 = 0x444980DD; -COMPILER_STRIP_GATE(80B418B0, &lit_4802); +COMPILER_STRIP_GATE(0x80B418B0, &lit_4802); #pragma pop /* 80B418B4-80B418B8 0001D8 0004+00 0/1 0/0 0/0 .rodata @4803 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4803 = 0xC1C451EC; -COMPILER_STRIP_GATE(80B418B4, &lit_4803); +COMPILER_STRIP_GATE(0x80B418B4, &lit_4803); #pragma pop /* 80B418B8-80B418BC 0001DC 0004+00 1/10 0/0 0/0 .rodata @4804 */ SECTION_RODATA static f32 const lit_4804 = 100.0f; -COMPILER_STRIP_GATE(80B418B8, &lit_4804); +COMPILER_STRIP_GATE(0x80B418B8, &lit_4804); /* 80B308B0-80B30AD8 001710 0228+00 1/1 0/0 0/0 .text reset__15daNpcWrestler_cFv */ #pragma push @@ -2758,7 +2772,7 @@ asm void daNpcWrestler_c::reset() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpcWrestler_c::setAction(bool (daNpcWrestler_c::*)(void*)) { +asm void daNpcWrestler_c::setAction(bool (daNpcWrestler_c::*param_0)(void*)) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_wrestler/d_a_npc_wrestler/setAction__15daNpcWrestler_cFM15daNpcWrestler_cFPCvPvPv_b.s" } @@ -2824,7 +2838,7 @@ asm void daNpcWrestler_c::setOnToArena(f32 param_0) { SECTION_RODATA static u8 const lit_4805[12] = { 0x00, 0x13, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B418BC, &lit_4805); +COMPILER_STRIP_GATE(0x80B418BC, &lit_4805); #pragma pop /* 80B418C8-80B418CC 0001EC 0004+00 0/1 0/0 0/0 .rodata @4806 */ @@ -2836,7 +2850,7 @@ SECTION_RODATA static u8 const lit_4806[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B418C8, &lit_4806); +COMPILER_STRIP_GATE(0x80B418C8, &lit_4806); #pragma pop /* 80B418CC-80B418D8 0001F0 000C+00 0/1 0/0 0/0 .rodata @4807 */ @@ -2845,7 +2859,7 @@ COMPILER_STRIP_GATE(80B418C8, &lit_4806); SECTION_RODATA static u8 const lit_4807[12] = { 0x00, 0x17, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80B418CC, &lit_4807); +COMPILER_STRIP_GATE(0x80B418CC, &lit_4807); #pragma pop /* 80B418D8-80B418DC 0001FC 0004+00 0/1 0/0 0/0 .rodata @4808 */ @@ -2857,7 +2871,7 @@ SECTION_RODATA static u8 const lit_4808[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B418D8, &lit_4808); +COMPILER_STRIP_GATE(0x80B418D8, &lit_4808); #pragma pop /* 80B418DC-80B418E8 000200 000C+00 0/1 0/0 0/0 .rodata @4809 */ @@ -2866,7 +2880,7 @@ COMPILER_STRIP_GATE(80B418D8, &lit_4808); SECTION_RODATA static u8 const lit_4809[12] = { 0x00, 0x19, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80B418DC, &lit_4809); +COMPILER_STRIP_GATE(0x80B418DC, &lit_4809); #pragma pop /* 80B418E8-80B418F4 00020C 000C+00 0/1 0/0 0/0 .rodata @4810 */ @@ -2875,7 +2889,7 @@ COMPILER_STRIP_GATE(80B418DC, &lit_4809); SECTION_RODATA static u8 const lit_4810[12] = { 0x00, 0x1A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B418E8, &lit_4810); +COMPILER_STRIP_GATE(0x80B418E8, &lit_4810); #pragma pop /* 80B418F4-80B418FC 000218 0008+00 0/1 0/0 0/0 .rodata @4811 */ @@ -2884,7 +2898,7 @@ COMPILER_STRIP_GATE(80B418E8, &lit_4810); SECTION_RODATA static u8 const lit_4811[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B418F4, &lit_4811); +COMPILER_STRIP_GATE(0x80B418F4, &lit_4811); #pragma pop /* 80B418FC-80B41908 000220 000C+00 0/1 0/0 0/0 .rodata @4812 */ @@ -2893,7 +2907,7 @@ COMPILER_STRIP_GATE(80B418F4, &lit_4811); SECTION_RODATA static u8 const lit_4812[12] = { 0x00, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B418FC, &lit_4812); +COMPILER_STRIP_GATE(0x80B418FC, &lit_4812); #pragma pop /* 80B41908-80B4190C 00022C 0004+00 0/1 0/0 0/0 .rodata @4813 */ @@ -2905,7 +2919,7 @@ SECTION_RODATA static u8 const lit_4813[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B41908, &lit_4813); +COMPILER_STRIP_GATE(0x80B41908, &lit_4813); #pragma pop /* 80B4190C-80B41918 000230 000C+00 0/1 0/0 0/0 .rodata @4814 */ @@ -2914,7 +2928,7 @@ COMPILER_STRIP_GATE(80B41908, &lit_4813); SECTION_RODATA static u8 const lit_4814[12] = { 0x00, 0x1A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B4190C, &lit_4814); +COMPILER_STRIP_GATE(0x80B4190C, &lit_4814); #pragma pop /* 80B41918-80B4191C 00023C 0004+00 0/1 0/0 0/0 .rodata @4815 */ @@ -2926,7 +2940,7 @@ SECTION_RODATA static u8 const lit_4815[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B41918, &lit_4815); +COMPILER_STRIP_GATE(0x80B41918, &lit_4815); #pragma pop /* 80B4191C-80B41928 000240 000C+00 0/1 0/0 0/0 .rodata @4816 */ @@ -2935,7 +2949,7 @@ COMPILER_STRIP_GATE(80B41918, &lit_4815); SECTION_RODATA static u8 const lit_4816[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B4191C, &lit_4816); +COMPILER_STRIP_GATE(0x80B4191C, &lit_4816); #pragma pop /* 80B41928-80B4192C 00024C 0004+00 0/1 0/0 0/0 .rodata @4817 */ @@ -2947,7 +2961,7 @@ SECTION_RODATA static u8 const lit_4817[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B41928, &lit_4817); +COMPILER_STRIP_GATE(0x80B41928, &lit_4817); #pragma pop /* 80B4192C-80B41944 000250 0018+00 0/0 0/0 0/0 .rodata @4818 */ @@ -2957,7 +2971,7 @@ SECTION_RODATA static u8 const lit_4818[24] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B4192C, &lit_4818); +COMPILER_STRIP_GATE(0x80B4192C, &lit_4818); #pragma pop /* 80B41944-80B41950 000268 000C+00 0/1 0/0 0/0 .rodata @4822 */ @@ -2966,7 +2980,7 @@ COMPILER_STRIP_GATE(80B4192C, &lit_4818); SECTION_RODATA static u8 const lit_4822[12] = { 0x00, 0x39, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B41944, &lit_4822); +COMPILER_STRIP_GATE(0x80B41944, &lit_4822); #pragma pop /* 80B41950-80B41954 000274 0004+00 0/1 0/0 0/0 .rodata @4823 */ @@ -2978,7 +2992,7 @@ SECTION_RODATA static u8 const lit_4823[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B41950, &lit_4823); +COMPILER_STRIP_GATE(0x80B41950, &lit_4823); #pragma pop /* 80B41954-80B41960 000278 000C+00 0/1 0/0 0/0 .rodata @4824 */ @@ -2987,7 +3001,7 @@ COMPILER_STRIP_GATE(80B41950, &lit_4823); SECTION_RODATA static u8 const lit_4824[12] = { 0x00, 0x39, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B41954, &lit_4824); +COMPILER_STRIP_GATE(0x80B41954, &lit_4824); #pragma pop /* 80B41960-80B41964 000284 0004+00 0/1 0/0 0/0 .rodata @4825 */ @@ -2999,7 +3013,7 @@ SECTION_RODATA static u8 const lit_4825[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B41960, &lit_4825); +COMPILER_STRIP_GATE(0x80B41960, &lit_4825); #pragma pop /* 80B41964-80B41970 000288 000C+00 0/1 0/0 0/0 .rodata @4826 */ @@ -3008,7 +3022,7 @@ COMPILER_STRIP_GATE(80B41960, &lit_4825); SECTION_RODATA static u8 const lit_4826[12] = { 0x00, 0x3A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80B41964, &lit_4826); +COMPILER_STRIP_GATE(0x80B41964, &lit_4826); #pragma pop /* 80B41970-80B4197C 000294 000C+00 0/1 0/0 0/0 .rodata @4827 */ @@ -3017,7 +3031,7 @@ COMPILER_STRIP_GATE(80B41964, &lit_4826); SECTION_RODATA static u8 const lit_4827[12] = { 0x00, 0x3B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B41970, &lit_4827); +COMPILER_STRIP_GATE(0x80B41970, &lit_4827); #pragma pop /* 80B4197C-80B41984 0002A0 0008+00 0/1 0/0 0/0 .rodata @4828 */ @@ -3026,7 +3040,7 @@ COMPILER_STRIP_GATE(80B41970, &lit_4827); SECTION_RODATA static u8 const lit_4828[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B4197C, &lit_4828); +COMPILER_STRIP_GATE(0x80B4197C, &lit_4828); #pragma pop /* 80B41984-80B41990 0002A8 000C+00 0/1 0/0 0/0 .rodata @4829 */ @@ -3035,7 +3049,7 @@ COMPILER_STRIP_GATE(80B4197C, &lit_4828); SECTION_RODATA static u8 const lit_4829[12] = { 0x00, 0x3B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B41984, &lit_4829); +COMPILER_STRIP_GATE(0x80B41984, &lit_4829); #pragma pop /* 80B41990-80B41994 0002B4 0004+00 0/1 0/0 0/0 .rodata @4830 */ @@ -3047,7 +3061,7 @@ SECTION_RODATA static u8 const lit_4830[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B41990, &lit_4830); +COMPILER_STRIP_GATE(0x80B41990, &lit_4830); #pragma pop /* 80B41994-80B419A0 0002B8 000C+00 0/1 0/0 0/0 .rodata @4831 */ @@ -3056,7 +3070,7 @@ COMPILER_STRIP_GATE(80B41990, &lit_4830); SECTION_RODATA static u8 const lit_4831[12] = { 0x00, 0x3C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80B41994, &lit_4831); +COMPILER_STRIP_GATE(0x80B41994, &lit_4831); #pragma pop /* 80B419A0-80B419AC 0002C4 000C+00 0/1 0/0 0/0 .rodata @4832 */ @@ -3065,7 +3079,7 @@ COMPILER_STRIP_GATE(80B41994, &lit_4831); SECTION_RODATA static u8 const lit_4832[12] = { 0x00, 0x3B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B419A0, &lit_4832); +COMPILER_STRIP_GATE(0x80B419A0, &lit_4832); #pragma pop /* 80B419AC-80B419B4 0002D0 0008+00 0/1 0/0 0/0 .rodata @4833 */ @@ -3074,7 +3088,7 @@ COMPILER_STRIP_GATE(80B419A0, &lit_4832); SECTION_RODATA static u8 const lit_4833[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B419AC, &lit_4833); +COMPILER_STRIP_GATE(0x80B419AC, &lit_4833); #pragma pop /* 80B419B4-80B419C0 0002D8 000C+00 0/1 0/0 0/0 .rodata @4834 */ @@ -3083,7 +3097,7 @@ COMPILER_STRIP_GATE(80B419AC, &lit_4833); SECTION_RODATA static u8 const lit_4834[12] = { 0x00, 0x3D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80B419B4, &lit_4834); +COMPILER_STRIP_GATE(0x80B419B4, &lit_4834); #pragma pop /* 80B419C0-80B419CC 0002E4 000C+00 0/1 0/0 0/0 .rodata @4835 */ @@ -3092,7 +3106,7 @@ COMPILER_STRIP_GATE(80B419B4, &lit_4834); SECTION_RODATA static u8 const lit_4835[12] = { 0x00, 0x3B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B419C0, &lit_4835); +COMPILER_STRIP_GATE(0x80B419C0, &lit_4835); #pragma pop /* 80B419CC-80B419D4 0002F0 0008+00 0/1 0/0 0/0 .rodata @4836 */ @@ -3101,7 +3115,7 @@ COMPILER_STRIP_GATE(80B419C0, &lit_4835); SECTION_RODATA static u8 const lit_4836[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B419CC, &lit_4836); +COMPILER_STRIP_GATE(0x80B419CC, &lit_4836); #pragma pop /* 80B419D4-80B419E0 0002F8 000C+00 0/1 0/0 0/0 .rodata @4837 */ @@ -3110,7 +3124,7 @@ COMPILER_STRIP_GATE(80B419CC, &lit_4836); SECTION_RODATA static u8 const lit_4837[12] = { 0x00, 0x1D, 0x00, 0x00, 0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B419D4, &lit_4837); +COMPILER_STRIP_GATE(0x80B419D4, &lit_4837); #pragma pop /* 80B419E0-80B419E4 000304 0004+00 0/1 0/0 0/0 .rodata @4838 */ @@ -3122,7 +3136,7 @@ SECTION_RODATA static u8 const lit_4838[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B419E0, &lit_4838); +COMPILER_STRIP_GATE(0x80B419E0, &lit_4838); #pragma pop /* 80B419E4-80B419F0 000308 000C+00 0/1 0/0 0/0 .rodata @4839 */ @@ -3131,7 +3145,7 @@ COMPILER_STRIP_GATE(80B419E0, &lit_4838); SECTION_RODATA static u8 const lit_4839[12] = { 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80B419E4, &lit_4839); +COMPILER_STRIP_GATE(0x80B419E4, &lit_4839); #pragma pop /* 80B419F0-80B419FC 000314 000C+00 0/1 0/0 0/0 .rodata @4840 */ @@ -3140,7 +3154,7 @@ COMPILER_STRIP_GATE(80B419E4, &lit_4839); SECTION_RODATA static u8 const lit_4840[12] = { 0x00, 0x1E, 0x00, 0x00, 0x41, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B419F0, &lit_4840); +COMPILER_STRIP_GATE(0x80B419F0, &lit_4840); #pragma pop /* 80B419FC-80B41A08 000320 000C+00 0/1 0/0 0/0 .rodata @4841 */ @@ -3149,7 +3163,7 @@ COMPILER_STRIP_GATE(80B419F0, &lit_4840); SECTION_RODATA static u8 const lit_4841[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B419FC, &lit_4841); +COMPILER_STRIP_GATE(0x80B419FC, &lit_4841); #pragma pop /* 80B41A08-80B41A14 00032C 000C+00 0/1 0/0 0/0 .rodata @4842 */ @@ -3158,7 +3172,7 @@ COMPILER_STRIP_GATE(80B419FC, &lit_4841); SECTION_RODATA static u8 const lit_4842[12] = { 0x00, 0x21, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B41A08, &lit_4842); +COMPILER_STRIP_GATE(0x80B41A08, &lit_4842); #pragma pop /* 80B41A14-80B41A18 000338 0004+00 0/1 0/0 0/0 .rodata @4843 */ @@ -3170,7 +3184,7 @@ SECTION_RODATA static u8 const lit_4843[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B41A14, &lit_4843); +COMPILER_STRIP_GATE(0x80B41A14, &lit_4843); #pragma pop /* 80B41A18-80B41A24 00033C 000C+00 0/1 0/0 0/0 .rodata @4844 */ @@ -3179,7 +3193,7 @@ COMPILER_STRIP_GATE(80B41A14, &lit_4843); SECTION_RODATA static u8 const lit_4844[12] = { 0x00, 0x22, 0x00, 0x00, 0x40, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80B41A18, &lit_4844); +COMPILER_STRIP_GATE(0x80B41A18, &lit_4844); #pragma pop /* 80B41A24-80B41A2C 000348 0008+00 0/1 0/0 0/0 .rodata @4845 */ @@ -3188,7 +3202,7 @@ COMPILER_STRIP_GATE(80B41A18, &lit_4844); SECTION_RODATA static u8 const lit_4845[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B41A24, &lit_4845); +COMPILER_STRIP_GATE(0x80B41A24, &lit_4845); #pragma pop /* 80B41A2C-80B41A38 000350 000C+00 0/1 0/0 0/0 .rodata @4846 */ @@ -3197,7 +3211,7 @@ COMPILER_STRIP_GATE(80B41A24, &lit_4845); SECTION_RODATA static u8 const lit_4846[12] = { 0x00, 0x23, 0x00, 0x00, 0x40, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B41A2C, &lit_4846); +COMPILER_STRIP_GATE(0x80B41A2C, &lit_4846); #pragma pop /* 80B41A38-80B41A3C 00035C 0004+00 0/1 0/0 0/0 .rodata @4847 */ @@ -3209,7 +3223,7 @@ SECTION_RODATA static u8 const lit_4847[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B41A38, &lit_4847); +COMPILER_STRIP_GATE(0x80B41A38, &lit_4847); #pragma pop /* 80B41A3C-80B41A48 000360 000C+00 0/1 0/0 0/0 .rodata @4848 */ @@ -3218,7 +3232,7 @@ COMPILER_STRIP_GATE(80B41A38, &lit_4847); SECTION_RODATA static u8 const lit_4848[12] = { 0x00, 0x24, 0x00, 0x00, 0x40, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B41A3C, &lit_4848); +COMPILER_STRIP_GATE(0x80B41A3C, &lit_4848); #pragma pop /* 80B41A48-80B41A4C 00036C 0004+00 0/1 0/0 0/0 .rodata @4849 */ @@ -3230,7 +3244,7 @@ SECTION_RODATA static u8 const lit_4849[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B41A48, &lit_4849); +COMPILER_STRIP_GATE(0x80B41A48, &lit_4849); #pragma pop /* 80B41A4C-80B41A58 000370 000C+00 0/1 0/0 0/0 .rodata @4850 */ @@ -3239,7 +3253,7 @@ COMPILER_STRIP_GATE(80B41A48, &lit_4849); SECTION_RODATA static u8 const lit_4850[12] = { 0x00, 0x25, 0x00, 0x00, 0x40, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80B41A4C, &lit_4850); +COMPILER_STRIP_GATE(0x80B41A4C, &lit_4850); #pragma pop /* 80B41A58-80B41A60 00037C 0008+00 0/1 0/0 0/0 .rodata @4851 */ @@ -3248,7 +3262,7 @@ COMPILER_STRIP_GATE(80B41A4C, &lit_4850); SECTION_RODATA static u8 const lit_4851[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B41A58, &lit_4851); +COMPILER_STRIP_GATE(0x80B41A58, &lit_4851); #pragma pop /* 80B41A60-80B41A6C 000384 000C+00 0/1 0/0 0/0 .rodata @4852 */ @@ -3257,7 +3271,7 @@ COMPILER_STRIP_GATE(80B41A58, &lit_4851); SECTION_RODATA static u8 const lit_4852[12] = { 0x00, 0x29, 0x00, 0x00, 0x40, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80B41A60, &lit_4852); +COMPILER_STRIP_GATE(0x80B41A60, &lit_4852); #pragma pop /* 80B41A6C-80B41A74 000390 0008+00 0/1 0/0 0/0 .rodata @4853 */ @@ -3266,7 +3280,7 @@ COMPILER_STRIP_GATE(80B41A60, &lit_4852); SECTION_RODATA static u8 const lit_4853[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B41A6C, &lit_4853); +COMPILER_STRIP_GATE(0x80B41A6C, &lit_4853); #pragma pop /* 80B41A74-80B41A80 000398 000C+00 0/1 0/0 0/0 .rodata @4854 */ @@ -3275,7 +3289,7 @@ COMPILER_STRIP_GATE(80B41A6C, &lit_4853); SECTION_RODATA static u8 const lit_4854[12] = { 0x00, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B41A74, &lit_4854); +COMPILER_STRIP_GATE(0x80B41A74, &lit_4854); #pragma pop /* 80B41A80-80B41A84 0003A4 0004+00 0/1 0/0 0/0 .rodata @4855 */ @@ -3287,7 +3301,7 @@ SECTION_RODATA static u8 const lit_4855[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B41A80, &lit_4855); +COMPILER_STRIP_GATE(0x80B41A80, &lit_4855); #pragma pop /* 80B41A84-80B41A90 0003A8 000C+00 0/1 0/0 0/0 .rodata @4856 */ @@ -3296,7 +3310,7 @@ COMPILER_STRIP_GATE(80B41A80, &lit_4855); SECTION_RODATA static u8 const lit_4856[12] = { 0x00, 0x26, 0x00, 0x00, 0x40, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80B41A84, &lit_4856); +COMPILER_STRIP_GATE(0x80B41A84, &lit_4856); #pragma pop /* 80B41A90-80B41A98 0003B4 0008+00 0/1 0/0 0/0 .rodata @4857 */ @@ -3305,7 +3319,7 @@ COMPILER_STRIP_GATE(80B41A84, &lit_4856); SECTION_RODATA static u8 const lit_4857[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B41A90, &lit_4857); +COMPILER_STRIP_GATE(0x80B41A90, &lit_4857); #pragma pop /* 80B41A98-80B41AA4 0003BC 000C+00 0/1 0/0 0/0 .rodata @4858 */ @@ -3314,7 +3328,7 @@ COMPILER_STRIP_GATE(80B41A90, &lit_4857); SECTION_RODATA static u8 const lit_4858[12] = { 0x00, 0x27, 0x00, 0x00, 0x40, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80B41A98, &lit_4858); +COMPILER_STRIP_GATE(0x80B41A98, &lit_4858); #pragma pop /* 80B41AA4-80B41AAC 0003C8 0008+00 0/1 0/0 0/0 .rodata @4859 */ @@ -3323,7 +3337,7 @@ COMPILER_STRIP_GATE(80B41A98, &lit_4858); SECTION_RODATA static u8 const lit_4859[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B41AA4, &lit_4859); +COMPILER_STRIP_GATE(0x80B41AA4, &lit_4859); #pragma pop /* 80B41AAC-80B41AB8 0003D0 000C+00 0/1 0/0 0/0 .rodata @4860 */ @@ -3332,7 +3346,7 @@ COMPILER_STRIP_GATE(80B41AA4, &lit_4859); SECTION_RODATA static u8 const lit_4860[12] = { 0x00, 0x28, 0x00, 0x00, 0x40, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80B41AAC, &lit_4860); +COMPILER_STRIP_GATE(0x80B41AAC, &lit_4860); #pragma pop /* 80B41AB8-80B41AC0 0003DC 0008+00 0/1 0/0 0/0 .rodata @4861 */ @@ -3341,7 +3355,7 @@ COMPILER_STRIP_GATE(80B41AAC, &lit_4860); SECTION_RODATA static u8 const lit_4861[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B41AB8, &lit_4861); +COMPILER_STRIP_GATE(0x80B41AB8, &lit_4861); #pragma pop /* 80B41AC0-80B41ACC 0003E4 000C+00 0/1 0/0 0/0 .rodata @4862 */ @@ -3350,7 +3364,7 @@ COMPILER_STRIP_GATE(80B41AB8, &lit_4861); SECTION_RODATA static u8 const lit_4862[12] = { 0x00, 0x2B, 0x00, 0x00, 0x40, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80B41AC0, &lit_4862); +COMPILER_STRIP_GATE(0x80B41AC0, &lit_4862); #pragma pop /* 80B41ACC-80B41AD4 0003F0 0008+00 0/1 0/0 0/0 .rodata @4863 */ @@ -3359,7 +3373,7 @@ COMPILER_STRIP_GATE(80B41AC0, &lit_4862); SECTION_RODATA static u8 const lit_4863[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B41ACC, &lit_4863); +COMPILER_STRIP_GATE(0x80B41ACC, &lit_4863); #pragma pop /* 80B41AD4-80B41AE0 0003F8 000C+00 0/1 0/0 0/0 .rodata @4864 */ @@ -3368,7 +3382,7 @@ COMPILER_STRIP_GATE(80B41ACC, &lit_4863); SECTION_RODATA static u8 const lit_4864[12] = { 0x00, 0x2E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80B41AD4, &lit_4864); +COMPILER_STRIP_GATE(0x80B41AD4, &lit_4864); #pragma pop /* 80B41AE0-80B41AE8 000404 0008+00 0/1 0/0 0/0 .rodata @4865 */ @@ -3377,7 +3391,7 @@ COMPILER_STRIP_GATE(80B41AD4, &lit_4864); SECTION_RODATA static u8 const lit_4865[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B41AE0, &lit_4865); +COMPILER_STRIP_GATE(0x80B41AE0, &lit_4865); #pragma pop /* 80B41AE8-80B41AF4 00040C 000C+00 0/1 0/0 0/0 .rodata @4866 */ @@ -3386,7 +3400,7 @@ COMPILER_STRIP_GATE(80B41AE0, &lit_4865); SECTION_RODATA static u8 const lit_4866[12] = { 0x00, 0x2F, 0x00, 0x00, 0x40, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80B41AE8, &lit_4866); +COMPILER_STRIP_GATE(0x80B41AE8, &lit_4866); #pragma pop /* 80B41AF4-80B41AFC 000418 0008+00 0/1 0/0 0/0 .rodata @4867 */ @@ -3395,7 +3409,7 @@ COMPILER_STRIP_GATE(80B41AE8, &lit_4866); SECTION_RODATA static u8 const lit_4867[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B41AF4, &lit_4867); +COMPILER_STRIP_GATE(0x80B41AF4, &lit_4867); #pragma pop /* 80B41AFC-80B41B08 000420 000C+00 0/1 0/0 0/0 .rodata @4868 */ @@ -3404,7 +3418,7 @@ COMPILER_STRIP_GATE(80B41AF4, &lit_4867); SECTION_RODATA static u8 const lit_4868[12] = { 0x00, 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B41AFC, &lit_4868); +COMPILER_STRIP_GATE(0x80B41AFC, &lit_4868); #pragma pop /* 80B41B08-80B41B0C 00042C 0004+00 0/1 0/0 0/0 .rodata @4869 */ @@ -3416,7 +3430,7 @@ SECTION_RODATA static u8 const lit_4869[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B41B08, &lit_4869); +COMPILER_STRIP_GATE(0x80B41B08, &lit_4869); #pragma pop /* 80B41B0C-80B41B18 000430 000C+00 0/1 0/0 0/0 .rodata @4870 */ @@ -3425,7 +3439,7 @@ COMPILER_STRIP_GATE(80B41B08, &lit_4869); SECTION_RODATA static u8 const lit_4870[12] = { 0x00, 0x2D, 0x00, 0x00, 0x40, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B41B0C, &lit_4870); +COMPILER_STRIP_GATE(0x80B41B0C, &lit_4870); #pragma pop /* 80B41B18-80B41B1C 00043C 0004+00 0/1 0/0 0/0 .rodata @4871 */ @@ -3437,7 +3451,7 @@ SECTION_RODATA static u8 const lit_4871[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B41B18, &lit_4871); +COMPILER_STRIP_GATE(0x80B41B18, &lit_4871); #pragma pop /* 80B41B1C-80B41B28 000440 000C+00 0/1 0/0 0/0 .rodata @4872 */ @@ -3446,7 +3460,7 @@ COMPILER_STRIP_GATE(80B41B18, &lit_4871); SECTION_RODATA static u8 const lit_4872[12] = { 0x00, 0x31, 0x00, 0x00, 0x40, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B41B1C, &lit_4872); +COMPILER_STRIP_GATE(0x80B41B1C, &lit_4872); #pragma pop /* 80B41B28-80B41B2C 00044C 0004+00 0/1 0/0 0/0 .rodata @4873 */ @@ -3458,7 +3472,7 @@ SECTION_RODATA static u8 const lit_4873[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B41B28, &lit_4873); +COMPILER_STRIP_GATE(0x80B41B28, &lit_4873); #pragma pop /* 80B41B2C-80B41B38 000450 000C+00 0/1 0/0 0/0 .rodata @4874 */ @@ -3467,7 +3481,7 @@ COMPILER_STRIP_GATE(80B41B28, &lit_4873); SECTION_RODATA static u8 const lit_4874[12] = { 0x00, 0x32, 0x00, 0x00, 0x40, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B41B2C, &lit_4874); +COMPILER_STRIP_GATE(0x80B41B2C, &lit_4874); #pragma pop /* 80B41B38-80B41B3C 00045C 0004+00 0/1 0/0 0/0 .rodata @4875 */ @@ -3479,7 +3493,7 @@ SECTION_RODATA static u8 const lit_4875[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B41B38, &lit_4875); +COMPILER_STRIP_GATE(0x80B41B38, &lit_4875); #pragma pop /* 80B41B3C-80B41B48 000460 000C+00 0/1 0/0 0/0 .rodata @4876 */ @@ -3488,7 +3502,7 @@ COMPILER_STRIP_GATE(80B41B38, &lit_4875); SECTION_RODATA static u8 const lit_4876[12] = { 0x00, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80B41B3C, &lit_4876); +COMPILER_STRIP_GATE(0x80B41B3C, &lit_4876); #pragma pop /* 80B41B48-80B41B54 00046C 000C+00 0/1 0/0 0/0 .rodata @4877 */ @@ -3497,7 +3511,7 @@ COMPILER_STRIP_GATE(80B41B3C, &lit_4876); SECTION_RODATA static u8 const lit_4877[12] = { 0x00, 0x39, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B41B48, &lit_4877); +COMPILER_STRIP_GATE(0x80B41B48, &lit_4877); #pragma pop /* 80B41B54-80B41B60 000478 000C+00 0/1 0/0 0/0 .rodata @4878 */ @@ -3506,7 +3520,7 @@ COMPILER_STRIP_GATE(80B41B48, &lit_4877); SECTION_RODATA static u8 const lit_4878[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B41B54, &lit_4878); +COMPILER_STRIP_GATE(0x80B41B54, &lit_4878); #pragma pop /* 80B41B60-80B41B6C 000484 000C+00 0/1 0/0 0/0 .rodata @4879 */ @@ -3515,7 +3529,7 @@ COMPILER_STRIP_GATE(80B41B54, &lit_4878); SECTION_RODATA static u8 const lit_4879[12] = { 0x00, 0x34, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80B41B60, &lit_4879); +COMPILER_STRIP_GATE(0x80B41B60, &lit_4879); #pragma pop /* 80B41B6C-80B41B78 000490 000C+00 0/1 0/0 0/0 .rodata @4880 */ @@ -3524,7 +3538,7 @@ COMPILER_STRIP_GATE(80B41B60, &lit_4879); SECTION_RODATA static u8 const lit_4880[12] = { 0x00, 0x36, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B41B6C, &lit_4880); +COMPILER_STRIP_GATE(0x80B41B6C, &lit_4880); #pragma pop /* 80B41B78-80B41B84 00049C 000C+00 0/1 0/0 0/0 .rodata @4881 */ @@ -3533,7 +3547,7 @@ COMPILER_STRIP_GATE(80B41B6C, &lit_4880); SECTION_RODATA static u8 const lit_4881[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B41B78, &lit_4881); +COMPILER_STRIP_GATE(0x80B41B78, &lit_4881); #pragma pop /* 80B41B84-80B41B90 0004A8 000C+00 0/1 0/0 0/0 .rodata @4882 */ @@ -3542,7 +3556,7 @@ COMPILER_STRIP_GATE(80B41B78, &lit_4881); SECTION_RODATA static u8 const lit_4882[12] = { 0x00, 0x35, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80B41B84, &lit_4882); +COMPILER_STRIP_GATE(0x80B41B84, &lit_4882); #pragma pop /* 80B41B90-80B41B9C 0004B4 000C+00 0/1 0/0 0/0 .rodata @4883 */ @@ -3551,7 +3565,7 @@ COMPILER_STRIP_GATE(80B41B84, &lit_4882); SECTION_RODATA static u8 const lit_4883[12] = { 0x00, 0x36, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B41B90, &lit_4883); +COMPILER_STRIP_GATE(0x80B41B90, &lit_4883); #pragma pop /* 80B41B9C-80B41BA8 0004C0 000C+00 0/1 0/0 0/0 .rodata @4884 */ @@ -3560,7 +3574,7 @@ COMPILER_STRIP_GATE(80B41B90, &lit_4883); SECTION_RODATA static u8 const lit_4884[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B41B9C, &lit_4884); +COMPILER_STRIP_GATE(0x80B41B9C, &lit_4884); #pragma pop /* 80B41BA8-80B41BB4 0004CC 000C+00 0/1 0/0 0/0 .rodata @4885 */ @@ -3569,7 +3583,7 @@ COMPILER_STRIP_GATE(80B41B9C, &lit_4884); SECTION_RODATA static u8 const lit_4885[12] = { 0x00, 0x2A, 0x00, 0x00, 0x40, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80B41BA8, &lit_4885); +COMPILER_STRIP_GATE(0x80B41BA8, &lit_4885); #pragma pop /* 80B41BB4-80B41BBC 0004D8 0008+00 0/1 0/0 0/0 .rodata @4886 */ @@ -3578,7 +3592,7 @@ COMPILER_STRIP_GATE(80B41BA8, &lit_4885); SECTION_RODATA static u8 const lit_4886[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B41BB4, &lit_4886); +COMPILER_STRIP_GATE(0x80B41BB4, &lit_4886); #pragma pop /* 80B41BBC-80B41BC8 0004E0 000C+00 0/1 0/0 0/0 .rodata @4887 */ @@ -3587,7 +3601,7 @@ COMPILER_STRIP_GATE(80B41BB4, &lit_4886); SECTION_RODATA static u8 const lit_4887[12] = { 0x00, 0x37, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80B41BBC, &lit_4887); +COMPILER_STRIP_GATE(0x80B41BBC, &lit_4887); #pragma pop /* 80B41BC8-80B41BD4 0004EC 000C+00 0/1 0/0 0/0 .rodata @4888 */ @@ -3596,7 +3610,7 @@ COMPILER_STRIP_GATE(80B41BBC, &lit_4887); SECTION_RODATA static u8 const lit_4888[12] = { 0x00, 0x1B, 0x00, 0x00, 0x40, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B41BC8, &lit_4888); +COMPILER_STRIP_GATE(0x80B41BC8, &lit_4888); #pragma pop /* 80B41BD4-80B41BDC 0004F8 0008+00 0/1 0/0 0/0 .rodata @4889 */ @@ -3605,7 +3619,7 @@ COMPILER_STRIP_GATE(80B41BC8, &lit_4888); SECTION_RODATA static u8 const lit_4889[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B41BD4, &lit_4889); +COMPILER_STRIP_GATE(0x80B41BD4, &lit_4889); #pragma pop /* 80B41BDC-80B41C54 000500 0078+00 0/0 0/0 0/0 .rodata @4890 */ @@ -3621,7 +3635,7 @@ SECTION_RODATA static u8 const lit_4890[120] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B41BDC, &lit_4890); +COMPILER_STRIP_GATE(0x80B41BDC, &lit_4890); #pragma pop /* 80B41C54-80B41C60 000578 000C+00 0/1 0/0 0/0 .rodata @4911 */ @@ -3630,28 +3644,28 @@ COMPILER_STRIP_GATE(80B41BDC, &lit_4890); SECTION_RODATA static u8 const lit_4911[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B41C54, &lit_4911); +COMPILER_STRIP_GATE(0x80B41C54, &lit_4911); #pragma pop /* 80B41C60-80B41C64 000584 0004+00 0/7 0/0 0/0 .rodata @5608 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5608 = 200.0f; -COMPILER_STRIP_GATE(80B41C60, &lit_5608); +COMPILER_STRIP_GATE(0x80B41C60, &lit_5608); #pragma pop /* 80B41C64-80B41C68 000588 0004+00 0/4 0/0 0/0 .rodata @5609 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5609 = 0.5f; -COMPILER_STRIP_GATE(80B41C64, &lit_5609); +COMPILER_STRIP_GATE(0x80B41C64, &lit_5609); #pragma pop /* 80B41C68-80B41C6C 00058C 0004+00 0/5 0/0 0/0 .rodata @5610 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_5610 = 0x3BB40000; -COMPILER_STRIP_GATE(80B41C68, &lit_5610); +COMPILER_STRIP_GATE(0x80B41C68, &lit_5610); #pragma pop /* 80B41C6C-80B41C74 000590 0004+04 0/7 0/0 0/0 .rodata @5611 */ @@ -3662,7 +3676,7 @@ SECTION_RODATA static f32 const lit_5611[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80B41C6C, &lit_5611); +COMPILER_STRIP_GATE(0x80B41C6C, &lit_5611); #pragma pop /* 80B41C74-80B41C7C 000598 0008+00 0/8 0/0 0/0 .rodata @5613 */ @@ -3671,7 +3685,7 @@ COMPILER_STRIP_GATE(80B41C6C, &lit_5611); SECTION_RODATA static u8 const lit_5613[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B41C74, &lit_5613); +COMPILER_STRIP_GATE(0x80B41C74, &lit_5613); #pragma pop /* 80B30F00-80B31680 001D60 0780+00 13/1 0/0 0/0 .text wait__15daNpcWrestler_cFPv */ @@ -3705,6 +3719,13 @@ asm void daNpcWrestler_c::setExpression(int param_0, f32 param_1) { } #pragma pop +/* ############################################################################################## */ +/* 80B41D7C-80B41D7C 0006A0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80B41DDC = "DEFAULT_GETITEM"; +#pragma pop + /* 80B316F4-80B31EB0 002554 07BC+00 3/0 0/0 0/0 .text talk__15daNpcWrestler_cFPv */ #pragma push #pragma optimization_level 0 @@ -3718,7 +3739,7 @@ asm void daNpcWrestler_c::talk(void* param_0) { /* ############################################################################################## */ /* 80B41C7C-80B41C80 0005A0 0004+00 1/4 0/0 0/0 .rodata @5759 */ SECTION_RODATA static f32 const lit_5759 = 20.0f; -COMPILER_STRIP_GATE(80B41C7C, &lit_5759); +COMPILER_STRIP_GATE(0x80B41C7C, &lit_5759); /* 80B31EB0-80B32058 002D10 01A8+00 4/0 0/0 0/0 .text demo__15daNpcWrestler_cFPv */ #pragma push @@ -3745,7 +3766,7 @@ asm void daNpcWrestler_c::gotoArena(void* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5908 = 430.0f; -COMPILER_STRIP_GATE(80B41C80, &lit_5908); +COMPILER_STRIP_GATE(0x80B41C80, &lit_5908); #pragma pop /* 80B32444-80B32850 0032A4 040C+00 1/0 0/0 0/0 .text gotoLiving__15daNpcWrestler_cFPv */ @@ -3763,21 +3784,21 @@ asm void daNpcWrestler_c::gotoLiving(void* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6085 = 65535.0f; -COMPILER_STRIP_GATE(80B41C84, &lit_6085); +COMPILER_STRIP_GATE(0x80B41C84, &lit_6085); #pragma pop /* 80B41C88-80B41C8C 0005AC 0004+00 0/6 0/0 0/0 .rodata @6086 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6086 = 50.0f; -COMPILER_STRIP_GATE(80B41C88, &lit_6086); +COMPILER_STRIP_GATE(0x80B41C88, &lit_6086); #pragma pop /* 80B41C8C-80B41C90 0005B0 0004+00 0/1 0/0 0/0 .rodata @6087 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6087 = 45.0f; -COMPILER_STRIP_GATE(80B41C8C, &lit_6087); +COMPILER_STRIP_GATE(0x80B41C8C, &lit_6087); #pragma pop /* 80B32850-80B331CC 0036B0 097C+00 2/0 0/0 0/0 .text sumouReady__15daNpcWrestler_cFPv */ @@ -3795,7 +3816,7 @@ asm void daNpcWrestler_c::sumouReady(void* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6088 = 3.0f; -COMPILER_STRIP_GATE(80B41C90, &lit_6088); +COMPILER_STRIP_GATE(0x80B41C90, &lit_6088); #pragma pop /* 80B41C94-80B41C9C 0005B8 0004+04 0/1 0/0 0/0 .rodata @6245 */ @@ -3806,7 +3827,7 @@ SECTION_RODATA static f32 const lit_6245[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80B41C94, &lit_6245); +COMPILER_STRIP_GATE(0x80B41C94, &lit_6245); #pragma pop /* 80B331CC-80B339EC 00402C 0820+00 14/0 0/0 0/0 .text sumouWait__15daNpcWrestler_cFPv */ @@ -3824,7 +3845,7 @@ asm void daNpcWrestler_c::sumouWait(void* param_0) { SECTION_RODATA static u8 const lit_6299[8] = { 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B41C9C, &lit_6299); +COMPILER_STRIP_GATE(0x80B41C9C, &lit_6299); /* 80B339EC-80B33B3C 00484C 0150+00 13/13 0/0 0/0 .text checkOutOfArenaP__15daNpcWrestler_cFv */ #pragma push @@ -3852,14 +3873,14 @@ asm void daNpcWrestler_c::setNextAction() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6610 = 13.0f; -COMPILER_STRIP_GATE(80B41CA4, &lit_6610); +COMPILER_STRIP_GATE(0x80B41CA4, &lit_6610); #pragma pop /* 80B41CA8-80B41CAC 0005CC 0004+00 0/2 0/0 0/0 .rodata @6611 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6611 = -63.5f; -COMPILER_STRIP_GATE(80B41CA8, &lit_6611); +COMPILER_STRIP_GATE(0x80B41CA8, &lit_6611); #pragma pop /* 80B34654-80B34CD0 0054B4 067C+00 2/0 0/0 0/0 .text sumouPunchHit__15daNpcWrestler_cFPv @@ -3888,14 +3909,14 @@ asm void daNpcWrestler_c::sumouPunchChaseHit(void* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6942 = 34.0f; -COMPILER_STRIP_GATE(80B41CAC, &lit_6942); +COMPILER_STRIP_GATE(0x80B41CAC, &lit_6942); #pragma pop /* 80B41CB0-80B41CB4 0005D4 0004+00 0/2 0/0 0/0 .rodata @6943 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6943 = 35.0f; -COMPILER_STRIP_GATE(80B41CB0, &lit_6943); +COMPILER_STRIP_GATE(0x80B41CB0, &lit_6943); #pragma pop /* 80B35364-80B35780 0061C4 041C+00 1/0 0/0 0/0 .text sumouPunchMiss__15daNpcWrestler_cFPv */ @@ -3933,7 +3954,7 @@ asm void daNpcWrestler_c::getJointPos(int param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7233 = 18.0f; -COMPILER_STRIP_GATE(80B41CB4, &lit_7233); +COMPILER_STRIP_GATE(0x80B41CB4, &lit_7233); #pragma pop /* 80B35968-80B3606C 0067C8 0704+00 2/0 0/0 0/0 .text sumouPunchDraw__15daNpcWrestler_cFPv */ @@ -3951,14 +3972,14 @@ asm void daNpcWrestler_c::sumouPunchDraw(void* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7535 = 8.0f; -COMPILER_STRIP_GATE(80B41CB8, &lit_7535); +COMPILER_STRIP_GATE(0x80B41CB8, &lit_7535); #pragma pop /* 80B41CBC-80B41CC0 0005E0 0004+00 0/7 0/0 0/0 .rodata @7536 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7536 = 60.0f; -COMPILER_STRIP_GATE(80B41CBC, &lit_7536); +COMPILER_STRIP_GATE(0x80B41CBC, &lit_7536); #pragma pop /* 80B3606C-80B36908 006ECC 089C+00 5/0 0/0 0/0 .text sumouTackleHit__15daNpcWrestler_cFPv */ @@ -3986,14 +4007,14 @@ asm void daNpcWrestler_c::sumouTackleMiss(void* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7761 = 4.0f; -COMPILER_STRIP_GATE(80B41CC0, &lit_7761); +COMPILER_STRIP_GATE(0x80B41CC0, &lit_7761); #pragma pop /* 80B41CC4-80B41CC8 0005E8 0004+00 0/2 0/0 0/0 .rodata @7762 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7762 = 24.0f; -COMPILER_STRIP_GATE(80B41CC4, &lit_7762); +COMPILER_STRIP_GATE(0x80B41CC4, &lit_7762); #pragma pop /* 80B36C8C-80B37270 007AEC 05E4+00 2/0 0/0 0/0 .text sumouTackleDraw__15daNpcWrestler_cFPv */ @@ -4011,14 +4032,14 @@ asm void daNpcWrestler_c::sumouTackleDraw(void* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7963 = 12.0f / 5.0f; -COMPILER_STRIP_GATE(80B41CC8, &lit_7963); +COMPILER_STRIP_GATE(0x80B41CC8, &lit_7963); #pragma pop /* 80B41CCC-80B41CD0 0005F0 0004+00 0/1 0/0 0/0 .rodata @7964 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7964 = 4.0f / 5.0f; -COMPILER_STRIP_GATE(80B41CCC, &lit_7964); +COMPILER_STRIP_GATE(0x80B41CCC, &lit_7964); #pragma pop /* 80B37270-80B378F4 0080D0 0684+00 4/0 0/0 0/0 .text sumouSideStep__15daNpcWrestler_cFPv @@ -4078,7 +4099,7 @@ asm void daNpcWrestler_c::sumouPunchStagger(void* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8383 = 5.0f; -COMPILER_STRIP_GATE(80B41CD0, &lit_8383); +COMPILER_STRIP_GATE(0x80B41CD0, &lit_8383); #pragma pop /* 80B389A4-80B38C90 009804 02EC+00 4/0 0/0 0/0 .text sumouTackleShock__15daNpcWrestler_cFPv */ @@ -4100,7 +4121,7 @@ SECTION_RODATA static f32 const lit_8575[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80B41CD4, &lit_8575); +COMPILER_STRIP_GATE(0x80B41CD4, &lit_8575); #pragma pop /* 80B41CDC-80B41CE4 000600 0008+00 0/3 0/0 0/0 .rodata @8576 */ @@ -4109,7 +4130,7 @@ COMPILER_STRIP_GATE(80B41CD4, &lit_8575); SECTION_RODATA static u8 const lit_8576[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B41CDC, &lit_8576); +COMPILER_STRIP_GATE(0x80B41CDC, &lit_8576); #pragma pop /* 80B41CE4-80B41CEC 000608 0008+00 0/3 0/0 0/0 .rodata @8577 */ @@ -4118,7 +4139,7 @@ COMPILER_STRIP_GATE(80B41CDC, &lit_8576); SECTION_RODATA static u8 const lit_8577[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B41CE4, &lit_8577); +COMPILER_STRIP_GATE(0x80B41CE4, &lit_8577); #pragma pop /* 80B41CEC-80B41CF4 000610 0008+00 0/3 0/0 0/0 .rodata @8578 */ @@ -4127,7 +4148,7 @@ COMPILER_STRIP_GATE(80B41CE4, &lit_8577); SECTION_RODATA static u8 const lit_8578[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B41CEC, &lit_8578); +COMPILER_STRIP_GATE(0x80B41CEC, &lit_8578); #pragma pop /* 80B38C90-80B39334 009AF0 06A4+00 2/0 0/0 0/0 .text sumouTackleStagger__15daNpcWrestler_cFPv */ @@ -4166,7 +4187,7 @@ asm void daNpcWrestler_c::sumouTacklePush(void* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8935 = 23.0f; -COMPILER_STRIP_GATE(80B41CF4, &lit_8935); +COMPILER_STRIP_GATE(0x80B41CF4, &lit_8935); #pragma pop /* 80B39C18-80B39F88 00AA78 0370+00 1/0 0/0 0/0 .text sumouTackleRelease__15daNpcWrestler_cFPv */ @@ -4184,14 +4205,14 @@ asm void daNpcWrestler_c::sumouTackleRelease(void* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9266 = 1.0f / 100.0f; -COMPILER_STRIP_GATE(80B41CF8, &lit_9266); +COMPILER_STRIP_GATE(0x80B41CF8, &lit_9266); #pragma pop /* 80B41CFC-80B41D00 000620 0004+00 0/3 0/0 0/0 .rodata @9267 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9267 = 40.0f; -COMPILER_STRIP_GATE(80B41CFC, &lit_9267); +COMPILER_STRIP_GATE(0x80B41CFC, &lit_9267); #pragma pop /* 80B39F88-80B3AE24 00ADE8 0E9C+00 2/0 0/0 0/0 .text demoSumouReady__15daNpcWrestler_cFPv */ @@ -4209,67 +4230,67 @@ asm void daNpcWrestler_c::demoSumouReady(void* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9268 = -100.0f; -COMPILER_STRIP_GATE(80B41D00, &lit_9268); +COMPILER_STRIP_GATE(0x80B41D00, &lit_9268); #pragma pop /* 80B41D04-80B41D08 000628 0004+00 0/0 0/0 0/0 .rodata @9269 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9269 = 103.0f; -COMPILER_STRIP_GATE(80B41D04, &lit_9269); +COMPILER_STRIP_GATE(0x80B41D04, &lit_9269); #pragma pop /* 80B41D08-80B41D0C 00062C 0004+00 0/0 0/0 0/0 .rodata @9270 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9270 = 94.0f; -COMPILER_STRIP_GATE(80B41D08, &lit_9270); +COMPILER_STRIP_GATE(0x80B41D08, &lit_9270); #pragma pop /* 80B41D0C-80B41D10 000630 0004+00 0/0 0/0 0/0 .rodata @9271 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9271 = 3.0f / 20.0f; -COMPILER_STRIP_GATE(80B41D0C, &lit_9271); +COMPILER_STRIP_GATE(0x80B41D0C, &lit_9271); #pragma pop /* 80B41D10-80B41D14 000634 0004+00 0/0 0/0 0/0 .rodata @9272 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9272 = 126.0f; -COMPILER_STRIP_GATE(80B41D10, &lit_9272); +COMPILER_STRIP_GATE(0x80B41D10, &lit_9272); #pragma pop /* 80B41D14-80B41D18 000638 0004+00 0/4 0/0 0/0 .rodata @9387 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9387 = 80.0f; -COMPILER_STRIP_GATE(80B41D14, &lit_9387); +COMPILER_STRIP_GATE(0x80B41D14, &lit_9387); #pragma pop /* 80B41D18-80B41D1C 00063C 0004+00 0/5 0/0 0/0 .rodata @9388 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9388 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(80B41D18, &lit_9388); +COMPILER_STRIP_GATE(0x80B41D18, &lit_9388); #pragma pop /* 80B41D1C-80B41D20 000640 0004+00 1/6 0/0 0/0 .rodata @9389 */ SECTION_RODATA static f32 const lit_9389 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(80B41D1C, &lit_9389); +COMPILER_STRIP_GATE(0x80B41D1C, &lit_9389); /* 80B41D20-80B41D24 000644 0004+00 0/5 0/0 0/0 .rodata @9390 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9390 = 1.0f / 25.0f; -COMPILER_STRIP_GATE(80B41D20, &lit_9390); +COMPILER_STRIP_GATE(0x80B41D20, &lit_9390); #pragma pop /* 80B41D24-80B41D28 000648 0004+00 0/7 0/0 0/0 .rodata @9391 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9391 = 10.0f; -COMPILER_STRIP_GATE(80B41D24, &lit_9391); +COMPILER_STRIP_GATE(0x80B41D24, &lit_9391); #pragma pop /* 80B3AE24-80B3B4B4 00BC84 0690+00 2/0 0/0 0/0 .text demoSumouWin__15daNpcWrestler_cFPv @@ -4288,77 +4309,77 @@ asm void daNpcWrestler_c::demoSumouWin(void* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9571 = 180.0f; -COMPILER_STRIP_GATE(80B41D28, &lit_9571); +COMPILER_STRIP_GATE(0x80B41D28, &lit_9571); #pragma pop /* 80B41D2C-80B41D30 000650 0004+00 0/2 0/0 0/0 .rodata @9572 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9572 = 8.0f / 5.0f; -COMPILER_STRIP_GATE(80B41D2C, &lit_9572); +COMPILER_STRIP_GATE(0x80B41D2C, &lit_9572); #pragma pop /* 80B41D30-80B41D34 000654 0004+00 0/2 0/0 0/0 .rodata @9573 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_9573 = 0xC2AE28F6; -COMPILER_STRIP_GATE(80B41D30, &lit_9573); +COMPILER_STRIP_GATE(0x80B41D30, &lit_9573); #pragma pop /* 80B41D34-80B41D38 000658 0004+00 0/2 0/0 0/0 .rodata @9574 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_9574 = 0xC38570A4; -COMPILER_STRIP_GATE(80B41D34, &lit_9574); +COMPILER_STRIP_GATE(0x80B41D34, &lit_9574); #pragma pop /* 80B41D38-80B41D3C 00065C 0004+00 0/2 0/0 0/0 .rodata @9575 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_9575 = 0xC2B9851F; -COMPILER_STRIP_GATE(80B41D38, &lit_9575); +COMPILER_STRIP_GATE(0x80B41D38, &lit_9575); #pragma pop /* 80B41D3C-80B41D40 000660 0004+00 0/2 0/0 0/0 .rodata @9576 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_9576 = 0xC397147B; -COMPILER_STRIP_GATE(80B41D3C, &lit_9576); +COMPILER_STRIP_GATE(0x80B41D3C, &lit_9576); #pragma pop /* 80B41D40-80B41D44 000664 0004+00 0/2 0/0 0/0 .rodata @9577 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9577 = 1.0f / 20.0f; -COMPILER_STRIP_GATE(80B41D40, &lit_9577); +COMPILER_STRIP_GATE(0x80B41D40, &lit_9577); #pragma pop /* 80B41D44-80B41D48 000668 0004+00 0/2 0/0 0/0 .rodata @9578 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9578 = 30.0f; -COMPILER_STRIP_GATE(80B41D44, &lit_9578); +COMPILER_STRIP_GATE(0x80B41D44, &lit_9578); #pragma pop /* 80B41D48-80B41D4C 00066C 0004+00 0/2 0/0 0/0 .rodata @9579 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9579 = 2.0f / 25.0f; -COMPILER_STRIP_GATE(80B41D48, &lit_9579); +COMPILER_STRIP_GATE(0x80B41D48, &lit_9579); #pragma pop /* 80B41D4C-80B41D50 000670 0004+00 0/2 0/0 0/0 .rodata @9580 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9580 = 3.0f / 10.0f; -COMPILER_STRIP_GATE(80B41D4C, &lit_9580); +COMPILER_STRIP_GATE(0x80B41D4C, &lit_9580); #pragma pop /* 80B41D50-80B41D54 000674 0004+00 0/3 0/0 0/0 .rodata @9581 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9581 = 70.0f; -COMPILER_STRIP_GATE(80B41D50, &lit_9581); +COMPILER_STRIP_GATE(0x80B41D50, &lit_9581); #pragma pop /* 80B3B4B4-80B3BC84 00C314 07D0+00 3/0 0/0 0/0 .text demoSumouLose__15daNpcWrestler_cFPv @@ -4413,6 +4434,14 @@ asm void daNpcWrestler_c::demoTalkAfterLose(void* param_0) { } #pragma pop +/* ############################################################################################## */ +/* 80B41D7C-80B41D7C 0006A0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80B41DEC = "pos"; +SECTION_DEAD static char const* const stringBase_80B41DF0 = "angle"; +#pragma pop + /* 80B3D584-80B3DB50 00E3E4 05CC+00 3/0 0/0 0/0 .text EvCut_grDSEntry__15daNpcWrestler_cFi */ #pragma push #pragma optimization_level 0 @@ -4544,49 +4573,49 @@ asm void daNpcWrestler_c::main() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10142 = 3.5f; -COMPILER_STRIP_GATE(80B41D54, &lit_10142); +COMPILER_STRIP_GATE(0x80B41D54, &lit_10142); #pragma pop /* 80B41D58-80B41D5C 00067C 0004+00 0/1 0/0 0/0 .rodata @10652 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10652 = 11.0f; -COMPILER_STRIP_GATE(80B41D58, &lit_10652); +COMPILER_STRIP_GATE(0x80B41D58, &lit_10652); #pragma pop /* 80B41D5C-80B41D60 000680 0004+00 0/1 0/0 0/0 .rodata @10653 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10653 = 2.0f; -COMPILER_STRIP_GATE(80B41D5C, &lit_10653); +COMPILER_STRIP_GATE(0x80B41D5C, &lit_10653); #pragma pop /* 80B41D60-80B41D64 000684 0004+00 0/1 0/0 0/0 .rodata @10654 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10654 = 7.0f; -COMPILER_STRIP_GATE(80B41D60, &lit_10654); +COMPILER_STRIP_GATE(0x80B41D60, &lit_10654); #pragma pop /* 80B41D64-80B41D68 000688 0004+00 0/1 0/0 0/0 .rodata @10655 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10655 = 37.0f; -COMPILER_STRIP_GATE(80B41D64, &lit_10655); +COMPILER_STRIP_GATE(0x80B41D64, &lit_10655); #pragma pop /* 80B41D68-80B41D6C 00068C 0004+00 0/1 0/0 0/0 .rodata @10656 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10656 = 42.0f; -COMPILER_STRIP_GATE(80B41D68, &lit_10656); +COMPILER_STRIP_GATE(0x80B41D68, &lit_10656); #pragma pop /* 80B41D6C-80B41D70 000690 0004+00 0/1 0/0 0/0 .rodata @10657 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10657 = 12.0f; -COMPILER_STRIP_GATE(80B41D6C, &lit_10657); +COMPILER_STRIP_GATE(0x80B41D6C, &lit_10657); #pragma pop /* 80B3EF10-80B3FCE8 00FD70 0DD8+00 1/1 0/0 0/0 .text setWrestlerVoice__15daNpcWrestler_cFv */ @@ -4624,14 +4653,14 @@ asm void daNpcWrestler_c::ctrlBtk() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10804 = -10.0f; -COMPILER_STRIP_GATE(80B41D70, &lit_10804); +COMPILER_STRIP_GATE(0x80B41D70, &lit_10804); #pragma pop /* 80B41D74-80B41D78 000698 0004+00 0/1 0/0 0/0 .rodata @10805 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10805 = 125.0f; -COMPILER_STRIP_GATE(80B41D74, &lit_10805); +COMPILER_STRIP_GATE(0x80B41D74, &lit_10805); #pragma pop /* 80B42E18-80B42E24 000008 000C+00 1/1 0/0 0/0 .bss @3974 */ @@ -4665,7 +4694,7 @@ asm void daNpcWrestler_c::setAttnPos() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10841 = -80.0f; -COMPILER_STRIP_GATE(80B41D78, &lit_10841); +COMPILER_STRIP_GATE(0x80B41D78, &lit_10841); #pragma pop /* 80B40B3C-80B40D1C 01199C 01E0+00 1/1 0/0 0/0 .text lookat__15daNpcWrestler_cFv */ @@ -4693,7 +4722,7 @@ void daNpcWrestler_c::drawOtherMdls() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80B40D28(s16 param_0) /* const */ { +extern "C" asm void func_80B40D28(void* _this, s16 param_0) /* const */ { nofralloc #include "asm/rel/d/a/npc/d_a_npc_wrestler/d_a_npc_wrestler/func_80B40D28.s" } @@ -4719,7 +4748,7 @@ asm void __sinit_d_a_npc_wrestler_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80B40D34 = (void*)__sinit_d_a_npc_wrestler_cpp; +REGISTER_CTORS(0x80B40D34, __sinit_d_a_npc_wrestler_cpp); #pragma pop /* 80B40E38-80B40E80 011C98 0048+00 5/4 0/0 0/0 .text __dt__18daNpcF_ActorMngr_cFv */ @@ -4922,21 +4951,4 @@ static asm void func_80B416C0() { } #pragma pop -/* 80B41D7C-80B41DF6 0006A0 007A+00 7/3 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80B41D7C = "alSumou"; -SECTION_DEAD static char const* const stringBase_80B41D84 = "Bou3"; -SECTION_DEAD static char const* const stringBase_80B41D89 = "grDS"; -SECTION_DEAD static char const* const stringBase_80B41D8E = "GRDS_ENTRY"; -SECTION_DEAD static char const* const stringBase_80B41D99 = "GRDS_ENTRY2"; -SECTION_DEAD static char const* const stringBase_80B41DA5 = "GRDS_ENTRY3"; -SECTION_DEAD static char const* const stringBase_80B41DB1 = "GRDS_ENTRY4"; -SECTION_DEAD static char const* const stringBase_80B41DBD = "GRDS_ENTRY5"; -SECTION_DEAD static char const* const stringBase_80B41DC9 = "GRDS_LOSE"; -SECTION_DEAD static char const* const stringBase_80B41DD3 = "Wrestler"; -SECTION_DEAD static char const* const stringBase_80B41DDC = "DEFAULT_GETITEM"; -SECTION_DEAD static char const* const stringBase_80B41DEC = "pos"; -SECTION_DEAD static char const* const stringBase_80B41DF0 = "angle"; -#pragma pop +/* 80B41D7C-80B41D7C 0006A0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/npc/d_a_npc_yamid/d_a_npc_yamid.cpp b/rel/d/a/npc/d_a_npc_yamid/d_a_npc_yamid.cpp index f2df8d1988f..375e610a471 100644 --- a/rel/d/a/npc/d_a_npc_yamid/d_a_npc_yamid.cpp +++ b/rel/d/a/npc/d_a_npc_yamid/d_a_npc_yamid.cpp @@ -15,12 +15,14 @@ struct mDoMtx_stack_c { static u8 now[48]; }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; +struct J3DAnmTransform {}; + +struct J3DModelData {}; + struct Vec {}; struct Z2Creature { @@ -29,8 +31,6 @@ struct Z2Creature { /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -44,6 +44,8 @@ struct fopAc_ac_c { /* 80018C8C */ ~fopAc_ac_c(); }; +struct daNpcT_faceMotionAnmData_c {}; + struct daNpcT_MotionSeqMngr_c { struct sequenceStepData_c {}; @@ -51,14 +53,12 @@ struct daNpcT_MotionSeqMngr_c { /* 80B45828 */ ~daNpcT_MotionSeqMngr_c(); }; +struct daNpcT_evtData_c {}; + struct daNpcT_motionAnmData_c {}; struct J3DJoint {}; -struct daNpcT_faceMotionAnmData_c {}; - -struct daNpcT_evtData_c {}; - struct daNpc_yamiD_c { /* 80B42F4C */ ~daNpc_yamiD_c(); /* 80B43084 */ void create(); @@ -119,6 +119,8 @@ struct dCcD_GObjInf { /* 800840E4 */ ~dCcD_GObjInf(); }; +struct _GXColorS10 {}; + struct J3DModel {}; struct cXyz { @@ -127,8 +129,6 @@ struct cXyz { /* 80B457DC */ cXyz(); }; -struct _GXColorS10 {}; - struct daNpcT_c { /* 80147FA4 */ void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*); /* 801483F8 */ void loadRes(s8 const*, char const**); @@ -289,13 +289,13 @@ struct dBgS_AcchCir { /* 80B45870 */ ~dBgS_AcchCir(); }; -struct dBgS {}; - struct csXyz { /* 80B451C4 */ ~csXyz(); /* 80B456DC */ csXyz(); }; +struct dBgS {}; + struct dBgS_Acch { /* 80075F94 */ ~dBgS_Acch(); /* 800760A0 */ dBgS_Acch(); @@ -643,6 +643,14 @@ extern "C" void __register_global_object(); // /* ############################################################################################## */ +/* 80B4612C-80B4612C 0000E0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80B4612C = ""; +SECTION_DEAD static char const* const stringBase_80B4612D = "STOPPER"; +SECTION_DEAD static char const* const stringBase_80B46135 = "yamiD"; +#pragma pop + /* 80B46144-80B46150 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -972,48 +980,48 @@ SECTION_RODATA u8 const daNpc_yamiD_Param_c::m[140] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B4604C, &daNpc_yamiD_Param_c::m); +COMPILER_STRIP_GATE(0x80B4604C, &daNpc_yamiD_Param_c::m); /* 80B460D8-80B460DC 00008C 0004+00 0/1 0/0 0/0 .rodata @4028 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4028 = 3.0f; -COMPILER_STRIP_GATE(80B460D8, &lit_4028); +COMPILER_STRIP_GATE(0x80B460D8, &lit_4028); #pragma pop /* 80B460DC-80B460E0 000090 0004+00 0/1 0/0 0/0 .rodata @4029 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4029 = -300.0f; -COMPILER_STRIP_GATE(80B460DC, &lit_4029); +COMPILER_STRIP_GATE(0x80B460DC, &lit_4029); #pragma pop /* 80B460E0-80B460E4 000094 0004+00 0/1 0/0 0/0 .rodata @4030 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4030 = -50.0f; -COMPILER_STRIP_GATE(80B460E0, &lit_4030); +COMPILER_STRIP_GATE(0x80B460E0, &lit_4030); #pragma pop /* 80B460E4-80B460E8 000098 0004+00 0/1 0/0 0/0 .rodata @4031 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4031 = 300.0f; -COMPILER_STRIP_GATE(80B460E4, &lit_4031); +COMPILER_STRIP_GATE(0x80B460E4, &lit_4031); #pragma pop /* 80B460E8-80B460EC 00009C 0004+00 0/1 0/0 0/0 .rodata @4032 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4032 = 450.0f; -COMPILER_STRIP_GATE(80B460E8, &lit_4032); +COMPILER_STRIP_GATE(0x80B460E8, &lit_4032); #pragma pop /* 80B460EC-80B460F0 0000A0 0004+00 0/1 0/0 0/0 .rodata @4033 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4033 = -1000000000.0f; -COMPILER_STRIP_GATE(80B460EC, &lit_4033); +COMPILER_STRIP_GATE(0x80B460EC, &lit_4033); #pragma pop /* 80B43084-80B43338 000224 02B4+00 1/1 0/0 0/0 .text create__13daNpc_yamiD_cFv */ @@ -1034,25 +1042,25 @@ SECTION_RODATA static u8 const lit_4194[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B460F0, &lit_4194); +COMPILER_STRIP_GATE(0x80B460F0, &lit_4194); /* 80B460F4-80B460F8 0000A8 0004+00 0/2 0/0 0/0 .rodata @4195 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4195 = 65536.0f; -COMPILER_STRIP_GATE(80B460F4, &lit_4195); +COMPILER_STRIP_GATE(0x80B460F4, &lit_4195); #pragma pop /* 80B460F8-80B460FC 0000AC 0004+00 0/3 0/0 0/0 .rodata @4196 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4196 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(80B460F8, &lit_4196); +COMPILER_STRIP_GATE(0x80B460F8, &lit_4196); #pragma pop /* 80B460FC-80B46100 0000B0 0004+00 2/5 0/0 0/0 .rodata @4345 */ SECTION_RODATA static f32 const lit_4345 = 1.0f; -COMPILER_STRIP_GATE(80B460FC, &lit_4345); +COMPILER_STRIP_GATE(0x80B460FC, &lit_4345); /* 80B43338-80B435CC 0004D8 0294+00 1/1 0/0 0/0 .text CreateHeap__13daNpc_yamiD_cFv */ #pragma push @@ -1279,7 +1287,7 @@ asm void daNpc_yamiD_c::setParam() { /* ############################################################################################## */ /* 80B46100-80B46104 0000B4 0004+00 1/2 0/0 0/0 .rodata @4577 */ SECTION_RODATA static f32 const lit_4577 = -1.0f; -COMPILER_STRIP_GATE(80B46100, &lit_4577); +COMPILER_STRIP_GATE(0x80B46100, &lit_4577); /* 80B43DBC-80B43E1C 000F5C 0060+00 1/0 0/0 0/0 .text setAfterTalkMotion__13daNpc_yamiD_cFv */ #pragma push @@ -1346,21 +1354,21 @@ asm void daNpc_yamiD_c::beforeMove() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4697 = -30.0f; -COMPILER_STRIP_GATE(80B46104, &lit_4697); +COMPILER_STRIP_GATE(0x80B46104, &lit_4697); #pragma pop /* 80B46108-80B4610C 0000BC 0004+00 0/1 0/0 0/0 .rodata @4698 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4698 = 0x38C90FDB; -COMPILER_STRIP_GATE(80B46108, &lit_4698); +COMPILER_STRIP_GATE(0x80B46108, &lit_4698); #pragma pop /* 80B4610C-80B46114 0000C0 0008+00 1/3 0/0 0/0 .rodata @4700 */ SECTION_RODATA static u8 const lit_4700[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B4610C, &lit_4700); +COMPILER_STRIP_GATE(0x80B4610C, &lit_4700); /* 80B44138-80B44364 0012D8 022C+00 1/0 0/0 0/0 .text setAttnPos__13daNpc_yamiD_cFv */ #pragma push @@ -1412,7 +1420,7 @@ asm void daNpc_yamiD_c::selectAction() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpc_yamiD_c::chkAction(int (daNpc_yamiD_c::*)(void*)) { +asm void daNpc_yamiD_c::chkAction(int (daNpc_yamiD_c::*param_0)(void*)) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_yamid/d_a_npc_yamid/chkAction__13daNpc_yamiD_cFM13daNpc_yamiD_cFPCvPvPv_i.s" } @@ -1423,7 +1431,7 @@ asm void daNpc_yamiD_c::chkAction(int (daNpc_yamiD_c::*)(void*)) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpc_yamiD_c::setAction(int (daNpc_yamiD_c::*)(void*)) { +asm void daNpc_yamiD_c::setAction(int (daNpc_yamiD_c::*param_0)(void*)) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_yamid/d_a_npc_yamid/setAction__13daNpc_yamiD_cFM13daNpc_yamiD_cFPCvPvPv_i.s" } @@ -1449,6 +1457,13 @@ asm void daNpc_yamiD_c::talk(void* param_0) { } #pragma pop +/* ############################################################################################## */ +/* 80B4612C-80B4612C 0000E0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80B4613B = "cutId"; +#pragma pop + /* 80B44AF8-80B44B8C 001C98 0094+00 1/0 0/0 0/0 .text cutStopper__13daNpc_yamiD_cFi */ #pragma push #pragma optimization_level 0 @@ -1718,7 +1733,7 @@ asm void daNpcT_JntAnm_c::setEyeAngleY(cXyz param_0, s16 param_1, int param_2, f SECTION_RODATA static u8 const lit_4758[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B46114, &lit_4758); +COMPILER_STRIP_GATE(0x80B46114, &lit_4758); #pragma pop /* 80B4611C-80B46124 0000D0 0008+00 0/1 0/0 0/0 .rodata @4759 */ @@ -1727,7 +1742,7 @@ COMPILER_STRIP_GATE(80B46114, &lit_4758); SECTION_RODATA static u8 const lit_4759[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B4611C, &lit_4759); +COMPILER_STRIP_GATE(0x80B4611C, &lit_4759); #pragma pop /* 80B46124-80B4612C 0000D8 0008+00 0/1 0/0 0/0 .rodata @4760 */ @@ -1736,7 +1751,7 @@ COMPILER_STRIP_GATE(80B4611C, &lit_4759); SECTION_RODATA static u8 const lit_4760[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B46124, &lit_4760); +COMPILER_STRIP_GATE(0x80B46124, &lit_4760); #pragma pop /* 80B45B10-80B45D18 002CB0 0208+00 1/1 0/0 0/0 .text setEyeAngleX__15daNpcT_JntAnm_cF4cXyzfs */ @@ -1885,7 +1900,7 @@ asm void __sinit_d_a_npc_yamid_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80B45DEC = (void*)__sinit_d_a_npc_yamid_cpp; +REGISTER_CTORS(0x80B45DEC, __sinit_d_a_npc_yamid_cpp); #pragma pop /* 80B45E74-80B45F34 003014 00C0+00 1/1 0/0 0/0 .text @@ -1989,12 +2004,4 @@ static asm void func_80B46030() { } #pragma pop -/* 80B4612C-80B46141 0000E0 0015+00 5/2 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80B4612C = ""; -SECTION_DEAD static char const* const stringBase_80B4612D = "STOPPER"; -SECTION_DEAD static char const* const stringBase_80B46135 = "yamiD"; -SECTION_DEAD static char const* const stringBase_80B4613B = "cutId"; -#pragma pop +/* 80B4612C-80B4612C 0000E0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/npc/d_a_npc_yamis/d_a_npc_yamis.cpp b/rel/d/a/npc/d_a_npc_yamis/d_a_npc_yamis.cpp index a2118aa9bd8..d3c9fc8b8ff 100644 --- a/rel/d/a/npc/d_a_npc_yamis/d_a_npc_yamis.cpp +++ b/rel/d/a/npc/d_a_npc_yamis/d_a_npc_yamis.cpp @@ -15,12 +15,14 @@ struct mDoMtx_stack_c { static u8 now[48]; }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; +struct J3DAnmTransform {}; + +struct J3DModelData {}; + struct Vec {}; struct Z2Creature { @@ -29,8 +31,6 @@ struct Z2Creature { /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -44,6 +44,8 @@ struct fopAc_ac_c { /* 80018C8C */ ~fopAc_ac_c(); }; +struct daNpcT_faceMotionAnmData_c {}; + struct daNpcT_MotionSeqMngr_c { struct sequenceStepData_c {}; @@ -51,14 +53,12 @@ struct daNpcT_MotionSeqMngr_c { /* 80B48E8C */ ~daNpcT_MotionSeqMngr_c(); }; +struct daNpcT_evtData_c {}; + struct daNpcT_motionAnmData_c {}; struct J3DJoint {}; -struct daNpcT_faceMotionAnmData_c {}; - -struct daNpcT_evtData_c {}; - struct daNpc_yamiS_c { /* 80B4656C */ ~daNpc_yamiS_c(); /* 80B466A4 */ void create(); @@ -119,6 +119,8 @@ struct dCcD_GObjInf { /* 800840E4 */ ~dCcD_GObjInf(); }; +struct _GXColorS10 {}; + struct J3DModel {}; struct cXyz { @@ -127,8 +129,6 @@ struct cXyz { /* 80B48E40 */ cXyz(); }; -struct _GXColorS10 {}; - struct daNpcT_c { /* 80147FA4 */ void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*); /* 801483F8 */ void loadRes(s8 const*, char const**); @@ -289,13 +289,13 @@ struct dBgS_AcchCir { /* 80B48ED4 */ ~dBgS_AcchCir(); }; -struct dBgS {}; - struct csXyz { /* 80B48828 */ ~csXyz(); /* 80B48D40 */ csXyz(); }; +struct dBgS {}; + struct dBgS_Acch { /* 80075F94 */ ~dBgS_Acch(); /* 800760A0 */ dBgS_Acch(); @@ -643,6 +643,14 @@ extern "C" void __register_global_object(); // /* ############################################################################################## */ +/* 80B49790-80B49790 0000E0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80B49790 = ""; +SECTION_DEAD static char const* const stringBase_80B49791 = "STOPPER"; +SECTION_DEAD static char const* const stringBase_80B49799 = "yamiS"; +#pragma pop + /* 80B497A8-80B497B4 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -972,48 +980,48 @@ SECTION_RODATA u8 const daNpc_yamiS_Param_c::m[140] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B496B0, &daNpc_yamiS_Param_c::m); +COMPILER_STRIP_GATE(0x80B496B0, &daNpc_yamiS_Param_c::m); /* 80B4973C-80B49740 00008C 0004+00 0/1 0/0 0/0 .rodata @4028 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4028 = 3.0f; -COMPILER_STRIP_GATE(80B4973C, &lit_4028); +COMPILER_STRIP_GATE(0x80B4973C, &lit_4028); #pragma pop /* 80B49740-80B49744 000090 0004+00 0/1 0/0 0/0 .rodata @4029 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4029 = -300.0f; -COMPILER_STRIP_GATE(80B49740, &lit_4029); +COMPILER_STRIP_GATE(0x80B49740, &lit_4029); #pragma pop /* 80B49744-80B49748 000094 0004+00 0/1 0/0 0/0 .rodata @4030 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4030 = -50.0f; -COMPILER_STRIP_GATE(80B49744, &lit_4030); +COMPILER_STRIP_GATE(0x80B49744, &lit_4030); #pragma pop /* 80B49748-80B4974C 000098 0004+00 0/1 0/0 0/0 .rodata @4031 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4031 = 300.0f; -COMPILER_STRIP_GATE(80B49748, &lit_4031); +COMPILER_STRIP_GATE(0x80B49748, &lit_4031); #pragma pop /* 80B4974C-80B49750 00009C 0004+00 0/1 0/0 0/0 .rodata @4032 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4032 = 450.0f; -COMPILER_STRIP_GATE(80B4974C, &lit_4032); +COMPILER_STRIP_GATE(0x80B4974C, &lit_4032); #pragma pop /* 80B49750-80B49754 0000A0 0004+00 0/1 0/0 0/0 .rodata @4033 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4033 = -1000000000.0f; -COMPILER_STRIP_GATE(80B49750, &lit_4033); +COMPILER_STRIP_GATE(0x80B49750, &lit_4033); #pragma pop /* 80B466A4-80B46958 000224 02B4+00 1/1 0/0 0/0 .text create__13daNpc_yamiS_cFv */ @@ -1034,25 +1042,25 @@ SECTION_RODATA static u8 const lit_4194[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B49754, &lit_4194); +COMPILER_STRIP_GATE(0x80B49754, &lit_4194); /* 80B49758-80B4975C 0000A8 0004+00 0/2 0/0 0/0 .rodata @4195 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4195 = 65536.0f; -COMPILER_STRIP_GATE(80B49758, &lit_4195); +COMPILER_STRIP_GATE(0x80B49758, &lit_4195); #pragma pop /* 80B4975C-80B49760 0000AC 0004+00 0/3 0/0 0/0 .rodata @4196 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4196 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(80B4975C, &lit_4196); +COMPILER_STRIP_GATE(0x80B4975C, &lit_4196); #pragma pop /* 80B49760-80B49764 0000B0 0004+00 2/5 0/0 0/0 .rodata @4345 */ SECTION_RODATA static f32 const lit_4345 = 1.0f; -COMPILER_STRIP_GATE(80B49760, &lit_4345); +COMPILER_STRIP_GATE(0x80B49760, &lit_4345); /* 80B46958-80B46BEC 0004D8 0294+00 1/1 0/0 0/0 .text CreateHeap__13daNpc_yamiS_cFv */ #pragma push @@ -1279,7 +1287,7 @@ asm void daNpc_yamiS_c::setParam() { /* ############################################################################################## */ /* 80B49764-80B49768 0000B4 0004+00 1/2 0/0 0/0 .rodata @4577 */ SECTION_RODATA static f32 const lit_4577 = -1.0f; -COMPILER_STRIP_GATE(80B49764, &lit_4577); +COMPILER_STRIP_GATE(0x80B49764, &lit_4577); /* 80B473DC-80B4743C 000F5C 0060+00 1/0 0/0 0/0 .text setAfterTalkMotion__13daNpc_yamiS_cFv */ #pragma push @@ -1341,21 +1349,21 @@ asm void daNpc_yamiS_c::beforeMove() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4697 = -30.0f; -COMPILER_STRIP_GATE(80B49768, &lit_4697); +COMPILER_STRIP_GATE(0x80B49768, &lit_4697); #pragma pop /* 80B4976C-80B49770 0000BC 0004+00 0/1 0/0 0/0 .rodata @4698 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4698 = 0x38C90FDB; -COMPILER_STRIP_GATE(80B4976C, &lit_4698); +COMPILER_STRIP_GATE(0x80B4976C, &lit_4698); #pragma pop /* 80B49770-80B49778 0000C0 0008+00 1/3 0/0 0/0 .rodata @4700 */ SECTION_RODATA static u8 const lit_4700[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B49770, &lit_4700); +COMPILER_STRIP_GATE(0x80B49770, &lit_4700); /* 80B47750-80B4797C 0012D0 022C+00 1/0 0/0 0/0 .text setAttnPos__13daNpc_yamiS_cFv */ #pragma push @@ -1407,7 +1415,7 @@ asm void daNpc_yamiS_c::selectAction() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpc_yamiS_c::chkAction(int (daNpc_yamiS_c::*)(void*)) { +asm void daNpc_yamiS_c::chkAction(int (daNpc_yamiS_c::*param_0)(void*)) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_yamis/d_a_npc_yamis/chkAction__13daNpc_yamiS_cFM13daNpc_yamiS_cFPCvPvPv_i.s" } @@ -1418,7 +1426,7 @@ asm void daNpc_yamiS_c::chkAction(int (daNpc_yamiS_c::*)(void*)) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpc_yamiS_c::setAction(int (daNpc_yamiS_c::*)(void*)) { +asm void daNpc_yamiS_c::setAction(int (daNpc_yamiS_c::*param_0)(void*)) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_yamis/d_a_npc_yamis/setAction__13daNpc_yamiS_cFM13daNpc_yamiS_cFPCvPvPv_i.s" } @@ -1444,6 +1452,13 @@ asm void daNpc_yamiS_c::talk(void* param_0) { } #pragma pop +/* ############################################################################################## */ +/* 80B49790-80B49790 0000E0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80B4979F = "cutId"; +#pragma pop + /* 80B4815C-80B481F0 001CDC 0094+00 1/0 0/0 0/0 .text cutStopper__13daNpc_yamiS_cFi */ #pragma push #pragma optimization_level 0 @@ -1713,7 +1728,7 @@ asm void daNpcT_JntAnm_c::setEyeAngleY(cXyz param_0, s16 param_1, int param_2, f SECTION_RODATA static u8 const lit_4758[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B49778, &lit_4758); +COMPILER_STRIP_GATE(0x80B49778, &lit_4758); #pragma pop /* 80B49780-80B49788 0000D0 0008+00 0/1 0/0 0/0 .rodata @4759 */ @@ -1722,7 +1737,7 @@ COMPILER_STRIP_GATE(80B49778, &lit_4758); SECTION_RODATA static u8 const lit_4759[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B49780, &lit_4759); +COMPILER_STRIP_GATE(0x80B49780, &lit_4759); #pragma pop /* 80B49788-80B49790 0000D8 0008+00 0/1 0/0 0/0 .rodata @4760 */ @@ -1731,7 +1746,7 @@ COMPILER_STRIP_GATE(80B49780, &lit_4759); SECTION_RODATA static u8 const lit_4760[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B49788, &lit_4760); +COMPILER_STRIP_GATE(0x80B49788, &lit_4760); #pragma pop /* 80B49174-80B4937C 002CF4 0208+00 1/1 0/0 0/0 .text setEyeAngleX__15daNpcT_JntAnm_cF4cXyzfs */ @@ -1880,7 +1895,7 @@ asm void __sinit_d_a_npc_yamis_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80B49450 = (void*)__sinit_d_a_npc_yamis_cpp; +REGISTER_CTORS(0x80B49450, __sinit_d_a_npc_yamis_cpp); #pragma pop /* 80B494D8-80B49598 003058 00C0+00 1/1 0/0 0/0 .text @@ -1984,12 +1999,4 @@ static asm void func_80B49694() { } #pragma pop -/* 80B49790-80B497A5 0000E0 0015+00 5/2 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80B49790 = ""; -SECTION_DEAD static char const* const stringBase_80B49791 = "STOPPER"; -SECTION_DEAD static char const* const stringBase_80B49799 = "yamiS"; -SECTION_DEAD static char const* const stringBase_80B4979F = "cutId"; -#pragma pop +/* 80B49790-80B49790 0000E0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/npc/d_a_npc_yamit/d_a_npc_yamit.cpp b/rel/d/a/npc/d_a_npc_yamit/d_a_npc_yamit.cpp index 0addb42a7d5..4d852e98409 100644 --- a/rel/d/a/npc/d_a_npc_yamit/d_a_npc_yamit.cpp +++ b/rel/d/a/npc/d_a_npc_yamit/d_a_npc_yamit.cpp @@ -15,12 +15,14 @@ struct mDoMtx_stack_c { static u8 now[48]; }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; +struct J3DAnmTransform {}; + +struct J3DModelData {}; + struct Vec {}; struct Z2Creature { @@ -29,8 +31,6 @@ struct Z2Creature { /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -49,6 +49,8 @@ struct daTagYami_c { /* 80D65F24 */ void offMidnaTagSw2(); }; +struct daNpcT_faceMotionAnmData_c {}; + struct daNpcT_MotionSeqMngr_c { struct sequenceStepData_c {}; @@ -56,14 +58,12 @@ struct daNpcT_MotionSeqMngr_c { /* 80B4C5EC */ ~daNpcT_MotionSeqMngr_c(); }; +struct daNpcT_evtData_c {}; + struct daNpcT_motionAnmData_c {}; struct J3DJoint {}; -struct daNpcT_faceMotionAnmData_c {}; - -struct daNpcT_evtData_c {}; - struct daNpc_yamiT_c { /* 80B49BEC */ ~daNpc_yamiT_c(); /* 80B49D24 */ void create(); @@ -125,6 +125,8 @@ struct dCcD_GObjInf { /* 800840E4 */ ~dCcD_GObjInf(); }; +struct _GXColorS10 {}; + struct J3DModel {}; struct cXyz { @@ -133,8 +135,6 @@ struct cXyz { /* 80B4C5A0 */ cXyz(); }; -struct _GXColorS10 {}; - struct daNpcT_c { /* 80147FA4 */ void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*); /* 801483F8 */ void loadRes(s8 const*, char const**); @@ -294,13 +294,13 @@ struct dBgS_AcchCir { /* 80B4C634 */ ~dBgS_AcchCir(); }; -struct dBgS {}; - struct csXyz { /* 80B4BF88 */ ~csXyz(); /* 80B4C4A0 */ csXyz(); }; +struct dBgS {}; + struct dBgS_Acch { /* 80075F94 */ ~dBgS_Acch(); /* 800760A0 */ dBgS_Acch(); @@ -650,6 +650,14 @@ extern "C" void offMidnaTagSw2__11daTagYami_cFv(); // /* ############################################################################################## */ +/* 80B4CE84-80B4CE84 0000E0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80B4CE84 = ""; +SECTION_DEAD static char const* const stringBase_80B4CE85 = "STOPPER"; +SECTION_DEAD static char const* const stringBase_80B4CE8D = "yamiT"; +#pragma pop + /* 80B4CE9C-80B4CEA8 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -982,48 +990,48 @@ SECTION_RODATA u8 const daNpc_yamiT_Param_c::m[140] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B4CDA4, &daNpc_yamiT_Param_c::m); +COMPILER_STRIP_GATE(0x80B4CDA4, &daNpc_yamiT_Param_c::m); /* 80B4CE30-80B4CE34 00008C 0004+00 0/1 0/0 0/0 .rodata @4027 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4027 = 3.0f; -COMPILER_STRIP_GATE(80B4CE30, &lit_4027); +COMPILER_STRIP_GATE(0x80B4CE30, &lit_4027); #pragma pop /* 80B4CE34-80B4CE38 000090 0004+00 0/1 0/0 0/0 .rodata @4028 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4028 = -300.0f; -COMPILER_STRIP_GATE(80B4CE34, &lit_4028); +COMPILER_STRIP_GATE(0x80B4CE34, &lit_4028); #pragma pop /* 80B4CE38-80B4CE3C 000094 0004+00 0/1 0/0 0/0 .rodata @4029 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4029 = -50.0f; -COMPILER_STRIP_GATE(80B4CE38, &lit_4029); +COMPILER_STRIP_GATE(0x80B4CE38, &lit_4029); #pragma pop /* 80B4CE3C-80B4CE40 000098 0004+00 0/1 0/0 0/0 .rodata @4030 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4030 = 300.0f; -COMPILER_STRIP_GATE(80B4CE3C, &lit_4030); +COMPILER_STRIP_GATE(0x80B4CE3C, &lit_4030); #pragma pop /* 80B4CE40-80B4CE44 00009C 0004+00 0/1 0/0 0/0 .rodata @4031 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4031 = 450.0f; -COMPILER_STRIP_GATE(80B4CE40, &lit_4031); +COMPILER_STRIP_GATE(0x80B4CE40, &lit_4031); #pragma pop /* 80B4CE44-80B4CE48 0000A0 0004+00 0/1 0/0 0/0 .rodata @4032 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4032 = -1000000000.0f; -COMPILER_STRIP_GATE(80B4CE44, &lit_4032); +COMPILER_STRIP_GATE(0x80B4CE44, &lit_4032); #pragma pop /* 80B49D24-80B49FD8 000224 02B4+00 1/1 0/0 0/0 .text create__13daNpc_yamiT_cFv */ @@ -1044,25 +1052,25 @@ SECTION_RODATA static u8 const lit_4193[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B4CE48, &lit_4193); +COMPILER_STRIP_GATE(0x80B4CE48, &lit_4193); /* 80B4CE4C-80B4CE50 0000A8 0004+00 0/2 0/0 0/0 .rodata @4194 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4194 = 65536.0f; -COMPILER_STRIP_GATE(80B4CE4C, &lit_4194); +COMPILER_STRIP_GATE(0x80B4CE4C, &lit_4194); #pragma pop /* 80B4CE50-80B4CE54 0000AC 0004+00 0/3 0/0 0/0 .rodata @4195 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4195 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(80B4CE50, &lit_4195); +COMPILER_STRIP_GATE(0x80B4CE50, &lit_4195); #pragma pop /* 80B4CE54-80B4CE58 0000B0 0004+00 2/5 0/0 0/0 .rodata @4344 */ SECTION_RODATA static f32 const lit_4344 = 1.0f; -COMPILER_STRIP_GATE(80B4CE54, &lit_4344); +COMPILER_STRIP_GATE(0x80B4CE54, &lit_4344); /* 80B49FD8-80B4A26C 0004D8 0294+00 1/1 0/0 0/0 .text CreateHeap__13daNpc_yamiT_cFv */ #pragma push @@ -1300,7 +1308,7 @@ asm void daNpc_yamiT_c::setParam() { /* ############################################################################################## */ /* 80B4CE58-80B4CE5C 0000B4 0004+00 1/2 0/0 0/0 .rodata @4578 */ SECTION_RODATA static f32 const lit_4578 = -1.0f; -COMPILER_STRIP_GATE(80B4CE58, &lit_4578); +COMPILER_STRIP_GATE(0x80B4CE58, &lit_4578); /* 80B4AAD0-80B4AB30 000FD0 0060+00 1/0 0/0 0/0 .text setAfterTalkMotion__13daNpc_yamiT_cFv */ #pragma push @@ -1367,21 +1375,21 @@ asm void daNpc_yamiT_c::beforeMove() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4704 = -30.0f; -COMPILER_STRIP_GATE(80B4CE5C, &lit_4704); +COMPILER_STRIP_GATE(0x80B4CE5C, &lit_4704); #pragma pop /* 80B4CE60-80B4CE64 0000BC 0004+00 0/1 0/0 0/0 .rodata @4705 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4705 = 0x38C90FDB; -COMPILER_STRIP_GATE(80B4CE60, &lit_4705); +COMPILER_STRIP_GATE(0x80B4CE60, &lit_4705); #pragma pop /* 80B4CE64-80B4CE6C 0000C0 0008+00 1/3 0/0 0/0 .rodata @4707 */ SECTION_RODATA static u8 const lit_4707[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B4CE64, &lit_4707); +COMPILER_STRIP_GATE(0x80B4CE64, &lit_4707); /* 80B4AEB0-80B4B0DC 0013B0 022C+00 1/0 0/0 0/0 .text setAttnPos__13daNpc_yamiT_cFv */ #pragma push @@ -1443,7 +1451,7 @@ asm void daNpc_yamiT_c::selectAction() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpc_yamiT_c::chkAction(int (daNpc_yamiT_c::*)(void*)) { +asm void daNpc_yamiT_c::chkAction(int (daNpc_yamiT_c::*param_0)(void*)) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_yamit/d_a_npc_yamit/chkAction__13daNpc_yamiT_cFM13daNpc_yamiT_cFPCvPvPv_i.s" } @@ -1454,7 +1462,7 @@ asm void daNpc_yamiT_c::chkAction(int (daNpc_yamiT_c::*)(void*)) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpc_yamiT_c::setAction(int (daNpc_yamiT_c::*)(void*)) { +asm void daNpc_yamiT_c::setAction(int (daNpc_yamiT_c::*param_0)(void*)) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_yamit/d_a_npc_yamit/setAction__13daNpc_yamiT_cFM13daNpc_yamiT_cFPCvPvPv_i.s" } @@ -1480,6 +1488,13 @@ asm void daNpc_yamiT_c::talk(void* param_0) { } #pragma pop +/* ############################################################################################## */ +/* 80B4CE84-80B4CE84 0000E0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80B4CE93 = "cutId"; +#pragma pop + /* 80B4B9E0-80B4BA74 001EE0 0094+00 1/0 0/0 0/0 .text cutStopper__13daNpc_yamiT_cFi */ #pragma push #pragma optimization_level 0 @@ -1749,7 +1764,7 @@ asm void daNpcT_JntAnm_c::setEyeAngleY(cXyz param_0, s16 param_1, int param_2, f SECTION_RODATA static u8 const lit_4765[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B4CE6C, &lit_4765); +COMPILER_STRIP_GATE(0x80B4CE6C, &lit_4765); #pragma pop /* 80B4CE74-80B4CE7C 0000D0 0008+00 0/1 0/0 0/0 .rodata @4766 */ @@ -1758,7 +1773,7 @@ COMPILER_STRIP_GATE(80B4CE6C, &lit_4765); SECTION_RODATA static u8 const lit_4766[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B4CE74, &lit_4766); +COMPILER_STRIP_GATE(0x80B4CE74, &lit_4766); #pragma pop /* 80B4CE7C-80B4CE84 0000D8 0008+00 0/1 0/0 0/0 .rodata @4767 */ @@ -1767,7 +1782,7 @@ COMPILER_STRIP_GATE(80B4CE74, &lit_4766); SECTION_RODATA static u8 const lit_4767[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B4CE7C, &lit_4767); +COMPILER_STRIP_GATE(0x80B4CE7C, &lit_4767); #pragma pop /* 80B4C8D4-80B4CADC 002DD4 0208+00 1/1 0/0 0/0 .text setEyeAngleX__15daNpcT_JntAnm_cF4cXyzfs */ @@ -1916,7 +1931,7 @@ asm void __sinit_d_a_npc_yamit_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80B4CBB0 = (void*)__sinit_d_a_npc_yamit_cpp; +REGISTER_CTORS(0x80B4CBB0, __sinit_d_a_npc_yamit_cpp); #pragma pop /* 80B4CC38-80B4CCF8 003138 00C0+00 1/1 0/0 0/0 .text @@ -2010,12 +2025,4 @@ static asm void func_80B4CD88() { } #pragma pop -/* 80B4CE84-80B4CE99 0000E0 0015+00 5/2 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80B4CE84 = ""; -SECTION_DEAD static char const* const stringBase_80B4CE85 = "STOPPER"; -SECTION_DEAD static char const* const stringBase_80B4CE8D = "yamiT"; -SECTION_DEAD static char const* const stringBase_80B4CE93 = "cutId"; -#pragma pop +/* 80B4CE84-80B4CE84 0000E0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/npc/d_a_npc_yelia/d_a_npc_yelia.cpp b/rel/d/a/npc/d_a_npc_yelia/d_a_npc_yelia.cpp index 2fc60dbd1af..1b85ef6869b 100644 --- a/rel/d/a/npc/d_a_npc_yelia/d_a_npc_yelia.cpp +++ b/rel/d/a/npc/d_a_npc_yelia/d_a_npc_yelia.cpp @@ -15,12 +15,14 @@ struct mDoMtx_stack_c { static u8 now[48]; }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; +struct J3DAnmTransform {}; + +struct J3DModelData {}; + struct Vec {}; struct Z2Creature { @@ -29,8 +31,6 @@ struct Z2Creature { /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -43,6 +43,8 @@ struct fopAc_ac_c { /* 80018C8C */ ~fopAc_ac_c(); }; +struct daNpcT_faceMotionAnmData_c {}; + struct daNpcT_MotionSeqMngr_c { struct sequenceStepData_c {}; @@ -51,14 +53,12 @@ struct daNpcT_MotionSeqMngr_c { /* 80B51A44 */ ~daNpcT_MotionSeqMngr_c(); }; +struct daNpcT_evtData_c {}; + struct daNpcT_motionAnmData_c {}; struct J3DJoint {}; -struct daNpcT_faceMotionAnmData_c {}; - -struct daNpcT_evtData_c {}; - struct daNpc_Yelia_c { /* 80B4D30C */ ~daNpc_Yelia_c(); /* 80B4D458 */ void create(); @@ -122,6 +122,8 @@ struct dCcD_GObjInf { /* 800840E4 */ ~dCcD_GObjInf(); }; +struct _GXColorS10 {}; + struct J3DModel {}; struct cXyz { @@ -131,8 +133,6 @@ struct cXyz { /* 80B51A40 */ cXyz(); }; -struct _GXColorS10 {}; - struct daNpcT_c { /* 80147FA4 */ void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*); /* 801483F8 */ void loadRes(s8 const*, char const**); @@ -311,13 +311,13 @@ struct dBgS_AcchCir { /* 80B51A8C */ ~dBgS_AcchCir(); }; -struct dBgS {}; - struct csXyz { /* 80B513A4 */ ~csXyz(); /* 80B51940 */ csXyz(); }; +struct dBgS {}; + struct dBgS_Acch { /* 80075F94 */ ~dBgS_Acch(); /* 800760A0 */ dBgS_Acch(); @@ -496,7 +496,7 @@ extern "C" void changeAnm__8daNpcT_cFPiPi(); extern "C" void changeBck__8daNpcT_cFPiPi(); extern "C" void changeBtp__8daNpcT_cFPiPi(); extern "C" void changeBtk__8daNpcT_cFPiPi(); -extern "C" void func_80B52004(int*); +extern "C" void func_80B52004(void* _this, int*); extern "C" void __sinit_d_a_npc_yelia_cpp(); extern "C" void __ct__13daNpc_Yelia_cFPC26daNpcT_faceMotionAnmData_cPC22daNpcT_motionAnmData_cPCQ222daNpcT_MotionSeqMngr_c18sequenceStepData_ciPCQ222daNpcT_MotionSeqMngr_c18sequenceStepData_ciPC16daNpcT_evtData_cPPc(); @@ -690,6 +690,27 @@ extern "C" void __register_global_object(); // /* ############################################################################################## */ +/* 80B52408-80B52408 000154 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80B52408 = ""; +SECTION_DEAD static char const* const stringBase_80B52409 = "NO_RESPONSE"; +SECTION_DEAD static char const* const stringBase_80B52415 = "TW_RESISTANCE1"; +SECTION_DEAD static char const* const stringBase_80B52424 = "TW_RESISTANCE2"; +SECTION_DEAD static char const* const stringBase_80B52433 = "TAKE_WOODSTATUE"; +SECTION_DEAD static char const* const stringBase_80B52443 = "THANK_YOU"; +SECTION_DEAD static char const* const stringBase_80B5244D = "Yelia"; +SECTION_DEAD static char const* const stringBase_80B52453 = "Yelia0"; +SECTION_DEAD static char const* const stringBase_80B5245A = "Yelia1"; +SECTION_DEAD static char const* const stringBase_80B52461 = "Yelia2"; +SECTION_DEAD static char const* const stringBase_80B52468 = "Yelia3"; +SECTION_DEAD static char const* const stringBase_80B5246F = "Yelia4"; +SECTION_DEAD static char const* const stringBase_80B52476 = "yelB_TW"; +SECTION_DEAD static char const* const stringBase_80B5247E = "CONVERSATION_ABOUT_LOOPHOLE"; +SECTION_DEAD static char const* const stringBase_80B5249A = "TW_RESISTANCE"; +SECTION_DEAD static char const* const stringBase_80B524A8 = "CLOTH_TRY"; +#pragma pop + /* 80B524DC-80B524E8 000000 000C+00 4/4 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -1390,7 +1411,7 @@ SECTION_RODATA u8 const daNpc_Yelia_Param_c::m[140] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B522B4, &daNpc_Yelia_Param_c::m); +COMPILER_STRIP_GATE(0x80B522B4, &daNpc_Yelia_Param_c::m); /* 80B52340-80B52368 00008C 0028+00 0/1 0/0 0/0 .rodata heapSize$4085 */ #pragma push @@ -1400,42 +1421,42 @@ SECTION_RODATA static u8 const heapSize[40] = { 0x44, 0xD0, 0x00, 0x00, 0x44, 0x10, 0x00, 0x00, 0x44, 0xD0, 0x00, 0x00, 0x44, 0xD0, 0x00, 0x00, 0x44, 0xD0, 0x00, 0x00, 0x44, 0xD0, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B52340, &heapSize); +COMPILER_STRIP_GATE(0x80B52340, &heapSize); #pragma pop /* 80B52368-80B5236C 0000B4 0004+00 0/1 0/0 0/0 .rodata @4164 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4164 = -200.0f; -COMPILER_STRIP_GATE(80B52368, &lit_4164); +COMPILER_STRIP_GATE(0x80B52368, &lit_4164); #pragma pop /* 80B5236C-80B52370 0000B8 0004+00 0/1 0/0 0/0 .rodata @4165 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4165 = -100.0f; -COMPILER_STRIP_GATE(80B5236C, &lit_4165); +COMPILER_STRIP_GATE(0x80B5236C, &lit_4165); #pragma pop /* 80B52370-80B52374 0000BC 0004+00 0/1 0/0 0/0 .rodata @4166 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4166 = 200.0f; -COMPILER_STRIP_GATE(80B52370, &lit_4166); +COMPILER_STRIP_GATE(0x80B52370, &lit_4166); #pragma pop /* 80B52374-80B52378 0000C0 0004+00 0/1 0/0 0/0 .rodata @4167 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4167 = 300.0f; -COMPILER_STRIP_GATE(80B52374, &lit_4167); +COMPILER_STRIP_GATE(0x80B52374, &lit_4167); #pragma pop /* 80B52378-80B5237C 0000C4 0004+00 0/1 0/0 0/0 .rodata @4168 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4168 = -1000000000.0f; -COMPILER_STRIP_GATE(80B52378, &lit_4168); +COMPILER_STRIP_GATE(0x80B52378, &lit_4168); #pragma pop /* 80B4D458-80B4D754 000238 02FC+00 1/1 0/0 0/0 .text create__13daNpc_Yelia_cFv */ @@ -1456,25 +1477,25 @@ SECTION_RODATA static u8 const lit_4330[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B5237C, &lit_4330); +COMPILER_STRIP_GATE(0x80B5237C, &lit_4330); /* 80B52380-80B52384 0000CC 0004+00 0/2 0/0 0/0 .rodata @4331 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4331 = 65536.0f; -COMPILER_STRIP_GATE(80B52380, &lit_4331); +COMPILER_STRIP_GATE(0x80B52380, &lit_4331); #pragma pop /* 80B52384-80B52388 0000D0 0004+00 0/3 0/0 0/0 .rodata @4332 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4332 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(80B52384, &lit_4332); +COMPILER_STRIP_GATE(0x80B52384, &lit_4332); #pragma pop /* 80B52388-80B5238C 0000D4 0004+00 2/5 0/0 0/0 .rodata @4489 */ SECTION_RODATA static f32 const lit_4489 = 1.0f; -COMPILER_STRIP_GATE(80B52388, &lit_4489); +COMPILER_STRIP_GATE(0x80B52388, &lit_4489); /* 80B4D754-80B4DA64 000534 0310+00 1/1 0/0 0/0 .text CreateHeap__13daNpc_Yelia_cFv */ #pragma push @@ -1609,7 +1630,7 @@ asm void daNpc_Yelia_c::Execute() { /* ############################################################################################## */ /* 80B5238C-80B52390 0000D8 0004+00 1/1 0/0 0/0 .rodata @4538 */ SECTION_RODATA static f32 const lit_4538 = 100.0f; -COMPILER_STRIP_GATE(80B5238C, &lit_4538); +COMPILER_STRIP_GATE(0x80B5238C, &lit_4538); /* 80B4DC74-80B4DD08 000A54 0094+00 1/1 0/0 0/0 .text Draw__13daNpc_Yelia_cFv */ #pragma push @@ -1688,7 +1709,7 @@ asm void daNpc_Yelia_c::afterJntAnm(int param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4697 = 135.0f; -COMPILER_STRIP_GATE(80B52390, &lit_4697); +COMPILER_STRIP_GATE(0x80B52390, &lit_4697); #pragma pop /* 80B4E0F4-80B4E2C0 000ED4 01CC+00 1/0 0/0 0/0 .text setParam__13daNpc_Yelia_cFv */ @@ -1704,7 +1725,7 @@ asm void daNpc_Yelia_c::setParam() { /* ############################################################################################## */ /* 80B52394-80B52398 0000E0 0004+00 7/8 0/0 0/0 .rodata @4778 */ SECTION_RODATA static f32 const lit_4778 = -1.0f; -COMPILER_STRIP_GATE(80B52394, &lit_4778); +COMPILER_STRIP_GATE(0x80B52394, &lit_4778); /* 80B4E2C0-80B4E5BC 0010A0 02FC+00 1/0 0/0 0/0 .text checkChangeEvt__13daNpc_Yelia_cFv */ @@ -1782,35 +1803,35 @@ asm void daNpc_Yelia_c::beforeMove() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4977 = 30.0f; -COMPILER_STRIP_GATE(80B52398, &lit_4977); +COMPILER_STRIP_GATE(0x80B52398, &lit_4977); #pragma pop /* 80B5239C-80B523A0 0000E8 0004+00 0/1 0/0 0/0 .rodata @4978 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4978 = -5.0f; -COMPILER_STRIP_GATE(80B5239C, &lit_4978); +COMPILER_STRIP_GATE(0x80B5239C, &lit_4978); #pragma pop /* 80B523A0-80B523A4 0000EC 0004+00 0/1 0/0 0/0 .rodata @4979 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4979 = 0x38C90FDB; -COMPILER_STRIP_GATE(80B523A0, &lit_4979); +COMPILER_STRIP_GATE(0x80B523A0, &lit_4979); #pragma pop /* 80B523A4-80B523A8 0000F0 0004+00 0/1 0/0 0/0 .rodata @4980 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4980 = 150.0f; -COMPILER_STRIP_GATE(80B523A4, &lit_4980); +COMPILER_STRIP_GATE(0x80B523A4, &lit_4980); #pragma pop /* 80B523A8-80B523AC 0000F4 0004+00 0/1 0/0 0/0 .rodata @4981 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4981 = 20.0f; -COMPILER_STRIP_GATE(80B523A8, &lit_4981); +COMPILER_STRIP_GATE(0x80B523A8, &lit_4981); #pragma pop /* 80B523AC-80B523B4 0000F8 0004+04 0/1 0/0 0/0 .rodata @4982 */ @@ -1821,14 +1842,14 @@ SECTION_RODATA static f32 const lit_4982[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80B523AC, &lit_4982); +COMPILER_STRIP_GATE(0x80B523AC, &lit_4982); #pragma pop /* 80B523B4-80B523BC 000100 0008+00 1/3 0/0 0/0 .rodata @4984 */ SECTION_RODATA static u8 const lit_4984[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B523B4, &lit_4984); +COMPILER_STRIP_GATE(0x80B523B4, &lit_4984); /* 80B4EAEC-80B4EE4C 0018CC 0360+00 1/0 0/0 0/0 .text setAttnPos__13daNpc_Yelia_cFv */ #pragma push @@ -1870,7 +1891,7 @@ asm void daNpc_Yelia_c::selectAction() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpc_Yelia_c::chkAction(int (daNpc_Yelia_c::*)(void*)) { +asm void daNpc_Yelia_c::chkAction(int (daNpc_Yelia_c::*param_0)(void*)) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_yelia/d_a_npc_yelia/chkAction__13daNpc_Yelia_cFM13daNpc_Yelia_cFPCvPvPv_i.s" } @@ -1881,12 +1902,20 @@ asm void daNpc_Yelia_c::chkAction(int (daNpc_Yelia_c::*)(void*)) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpc_Yelia_c::setAction(int (daNpc_Yelia_c::*)(void*)) { +asm void daNpc_Yelia_c::setAction(int (daNpc_Yelia_c::*param_0)(void*)) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_yelia/d_a_npc_yelia/setAction__13daNpc_Yelia_cFM13daNpc_Yelia_cFPCvPvPv_i.s" } #pragma pop +/* ############################################################################################## */ +/* 80B52408-80B52408 000154 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80B524B2 = "prm"; +SECTION_DEAD static char const* const stringBase_80B524B6 = "msgNo"; +#pragma pop + /* 80B4F128-80B4F3E0 001F08 02B8+00 1/0 0/0 0/0 .text * cutConversationAboutLoopHole__13daNpc_Yelia_cFi */ #pragma push @@ -1905,7 +1934,7 @@ asm void daNpc_Yelia_c::cutConversationAboutLoopHole(int param_0) { SECTION_RODATA static u8 const lit_5042[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B523BC, &lit_5042); +COMPILER_STRIP_GATE(0x80B523BC, &lit_5042); #pragma pop /* 80B523C4-80B523CC 000110 0008+00 0/1 0/0 0/0 .rodata @5043 */ @@ -1914,7 +1943,7 @@ COMPILER_STRIP_GATE(80B523BC, &lit_5042); SECTION_RODATA static u8 const lit_5043[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B523C4, &lit_5043); +COMPILER_STRIP_GATE(0x80B523C4, &lit_5043); #pragma pop /* 80B523CC-80B523D4 000118 0008+00 0/1 0/0 0/0 .rodata @5044 */ @@ -1923,14 +1952,14 @@ COMPILER_STRIP_GATE(80B523C4, &lit_5043); SECTION_RODATA static u8 const lit_5044[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B523CC, &lit_5044); +COMPILER_STRIP_GATE(0x80B523CC, &lit_5044); #pragma pop /* 80B523D4-80B523DC 000120 0008+00 1/1 0/0 0/0 .rodata @5202 */ SECTION_RODATA static u8 const lit_5202[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B523D4, &lit_5202); +COMPILER_STRIP_GATE(0x80B523D4, &lit_5202); /* 80B4F3E0-80B4F534 0021C0 0154+00 1/0 0/0 0/0 .text cutTWResistance__13daNpc_Yelia_cFi */ @@ -1950,7 +1979,7 @@ asm void daNpc_Yelia_c::cutTWResistance(int param_0) { SECTION_RODATA static u8 const lit_5237[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B523DC, &lit_5237); +COMPILER_STRIP_GATE(0x80B523DC, &lit_5237); #pragma pop /* 80B523E4-80B523EC 000130 0008+00 0/1 0/0 0/0 .rodata @5277 */ @@ -1959,21 +1988,21 @@ COMPILER_STRIP_GATE(80B523DC, &lit_5237); SECTION_RODATA static u8 const lit_5277[8] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, }; -COMPILER_STRIP_GATE(80B523E4, &lit_5277); +COMPILER_STRIP_GATE(0x80B523E4, &lit_5277); #pragma pop /* 80B523EC-80B523F0 000138 0004+00 0/1 0/0 0/0 .rodata @5490 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5490 = 11.0f / 20.0f; -COMPILER_STRIP_GATE(80B523EC, &lit_5490); +COMPILER_STRIP_GATE(0x80B523EC, &lit_5490); #pragma pop /* 80B523F0-80B523F4 00013C 0004+00 0/1 0/0 0/0 .rodata @5491 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5491 = 110.0f; -COMPILER_STRIP_GATE(80B523F0, &lit_5491); +COMPILER_STRIP_GATE(0x80B523F0, &lit_5491); #pragma pop /* 80B523F4-80B523FC 000140 0008+00 0/1 0/0 0/0 .rodata @5493 */ @@ -1982,7 +2011,15 @@ COMPILER_STRIP_GATE(80B523F0, &lit_5491); SECTION_RODATA static u8 const lit_5493[8] = { 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B523F4, &lit_5493); +COMPILER_STRIP_GATE(0x80B523F4, &lit_5493); +#pragma pop + +/* 80B52408-80B52408 000154 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80B524BC = "timer"; +SECTION_DEAD static char const* const stringBase_80B524C2 = "send"; +SECTION_DEAD static char const* const stringBase_80B524C7 = "@"; #pragma pop /* 80B4F534-80B4FDD8 002314 08A4+00 1/0 0/0 0/0 .text cutTakeWoodStatue__13daNpc_Yelia_cFi */ @@ -2010,7 +2047,13 @@ asm void daNpc_Yelia_c::cutClothTry(int param_0) { SECTION_RODATA static u8 const lit_5534[12] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, }; -COMPILER_STRIP_GATE(80B523FC, &lit_5534); +COMPILER_STRIP_GATE(0x80B523FC, &lit_5534); + +/* 80B52408-80B52408 000154 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80B524C9 = "msgNo2"; +#pragma pop /* 80B4FE78-80B50084 002C58 020C+00 1/0 0/0 0/0 .text cutThankYou__13daNpc_Yelia_cFi */ #pragma push @@ -2042,6 +2085,13 @@ asm void daNpc_Yelia_c::horseWait(void* param_0) { } #pragma pop +/* ############################################################################################## */ +/* 80B52408-80B52408 000154 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80B524D0 = "SMELL_1st"; +#pragma pop + /* 80B50A0C-80B50B60 0037EC 0154+00 1/0 0/0 0/0 .text reminiscence__13daNpc_Yelia_cFPv */ #pragma push #pragma optimization_level 0 @@ -2428,7 +2478,7 @@ void daNpcT_c::changeBtk(int* param_0, int* param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80B52004(int* param_0) { +extern "C" asm void func_80B52004(void* _this, int* param_0) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_yelia/d_a_npc_yelia/func_80B52004.s" } @@ -2460,7 +2510,7 @@ asm void __sinit_d_a_npc_yelia_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80B52020 = (void*)__sinit_d_a_npc_yelia_cpp; +REGISTER_CTORS(0x80B52020, __sinit_d_a_npc_yelia_cpp); #pragma pop /* 80B52104-80B521E4 004EE4 00E0+00 1/1 0/0 0/0 .text @@ -2569,31 +2619,4 @@ asm void daDitem_c::setOffsetPos(cXyz param_0) { } #pragma pop -/* 80B52408-80B524DA 000154 00D2+00 10/7 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80B52408 = ""; -SECTION_DEAD static char const* const stringBase_80B52409 = "NO_RESPONSE"; -SECTION_DEAD static char const* const stringBase_80B52415 = "TW_RESISTANCE1"; -SECTION_DEAD static char const* const stringBase_80B52424 = "TW_RESISTANCE2"; -SECTION_DEAD static char const* const stringBase_80B52433 = "TAKE_WOODSTATUE"; -SECTION_DEAD static char const* const stringBase_80B52443 = "THANK_YOU"; -SECTION_DEAD static char const* const stringBase_80B5244D = "Yelia"; -SECTION_DEAD static char const* const stringBase_80B52453 = "Yelia0"; -SECTION_DEAD static char const* const stringBase_80B5245A = "Yelia1"; -SECTION_DEAD static char const* const stringBase_80B52461 = "Yelia2"; -SECTION_DEAD static char const* const stringBase_80B52468 = "Yelia3"; -SECTION_DEAD static char const* const stringBase_80B5246F = "Yelia4"; -SECTION_DEAD static char const* const stringBase_80B52476 = "yelB_TW"; -SECTION_DEAD static char const* const stringBase_80B5247E = "CONVERSATION_ABOUT_LOOPHOLE"; -SECTION_DEAD static char const* const stringBase_80B5249A = "TW_RESISTANCE"; -SECTION_DEAD static char const* const stringBase_80B524A8 = "CLOTH_TRY"; -SECTION_DEAD static char const* const stringBase_80B524B2 = "prm"; -SECTION_DEAD static char const* const stringBase_80B524B6 = "msgNo"; -SECTION_DEAD static char const* const stringBase_80B524BC = "timer"; -SECTION_DEAD static char const* const stringBase_80B524C2 = "send"; -SECTION_DEAD static char const* const stringBase_80B524C7 = "@"; -SECTION_DEAD static char const* const stringBase_80B524C9 = "msgNo2"; -SECTION_DEAD static char const* const stringBase_80B524D0 = "SMELL_1st"; -#pragma pop +/* 80B52408-80B52408 000154 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/npc/d_a_npc_ykm/d_a_npc_ykm.cpp b/rel/d/a/npc/d_a_npc_ykm/d_a_npc_ykm.cpp index 930005376f9..cd6c7f8434d 100644 --- a/rel/d/a/npc/d_a_npc_ykm/d_a_npc_ykm.cpp +++ b/rel/d/a/npc/d_a_npc_ykm/d_a_npc_ykm.cpp @@ -33,20 +33,20 @@ struct mDoMtx_stack_c { static u8 now[48]; }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; +struct J3DAnmTransform {}; + +struct J3DModelData {}; + struct Z2Creature { /* 802C03C8 */ Z2Creature(); /* 802C0420 */ ~Z2Creature(); /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -76,6 +76,8 @@ struct daNpc_ykW_c { /* 80B5FCC8 */ void getType(); }; +struct daNpcT_faceMotionAnmData_c {}; + struct daNpcT_MotionSeqMngr_c { struct sequenceStepData_c {}; @@ -84,14 +86,12 @@ struct daNpcT_MotionSeqMngr_c { /* 80B5CDC0 */ ~daNpcT_MotionSeqMngr_c(); }; +struct daNpcT_evtData_c {}; + struct daNpcT_motionAnmData_c {}; struct J3DJoint {}; -struct daNpcT_faceMotionAnmData_c {}; - -struct daNpcT_evtData_c {}; - struct daNpc_ykM_c { /* 80B534EC */ ~daNpc_ykM_c(); /* 80B53698 */ void create(); @@ -177,10 +177,10 @@ struct dCcD_GObjInf { /* 80084658 */ void ChkCoHit(); }; -struct J3DModel {}; - struct _GXColorS10 {}; +struct J3DModel {}; + struct daNpcT_c { /* 80147FA4 */ void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*); /* 80148094 */ void getTrnsfrmKeyAnmP(char const*, int); @@ -655,8 +655,8 @@ extern "C" void changeAnm__8daNpcT_cFPiPi(); extern "C" void changeBck__8daNpcT_cFPiPi(); extern "C" void changeBtp__8daNpcT_cFPiPi(); extern "C" void changeBtk__8daNpcT_cFPiPi(); -extern "C" void func_80B5D378(int*); -extern "C" void func_80B5D394(int, int); +extern "C" void func_80B5D378(void* _this, int*); +extern "C" void func_80B5D394(void* _this, int, int); extern "C" void __sinit_d_a_npc_ykm_cpp(); extern "C" void __ct__11daNpc_ykM_cFPC26daNpcT_faceMotionAnmData_cPC22daNpcT_motionAnmData_cPCQ222daNpcT_MotionSeqMngr_c18sequenceStepData_ciPCQ222daNpcT_MotionSeqMngr_c18sequenceStepData_ciPC16daNpcT_evtData_cPPc(); @@ -920,6 +920,26 @@ extern "C" void getType__11daNpc_ykW_cFv(); // /* ############################################################################################## */ +/* 80B5DA40-80B5DA40 0002AC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80B5DA40 = ""; +SECTION_DEAD static char const* const stringBase_80B5DA41 = "NO_RESPONSE"; +SECTION_DEAD static char const* const stringBase_80B5DA4D = "SLIDEDOWN"; +SECTION_DEAD static char const* const stringBase_80B5DA57 = "MEETING_AGAIN"; +SECTION_DEAD static char const* const stringBase_80B5DA65 = "GET_TOMATOPUREE"; +SECTION_DEAD static char const* const stringBase_80B5DA75 = "GET_TASTE"; +SECTION_DEAD static char const* const stringBase_80B5DA7F = "FIND_WOLF"; +SECTION_DEAD static char const* const stringBase_80B5DA89 = "START_SNOWBOARDRACE"; +SECTION_DEAD static char const* const stringBase_80B5DA9D = "END_SNOWBOARDRACE"; +SECTION_DEAD static char const* const stringBase_80B5DAAF = "HUG"; +SECTION_DEAD static char const* const stringBase_80B5DAB3 = "ykM"; +SECTION_DEAD static char const* const stringBase_80B5DAB7 = "ykM1"; +SECTION_DEAD static char const* const stringBase_80B5DABC = "ykM2"; +SECTION_DEAD static char const* const stringBase_80B5DAC1 = "ykM3"; +SECTION_DEAD static char const* const stringBase_80B5DAC6 = "LV5DUNGEON_CLEAR"; +#pragma pop + /* 80B5DAE8-80B5DAF4 000000 000C+00 3/3 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -1769,7 +1789,7 @@ SECTION_RODATA u8 const daNpc_ykM_Param_c::m[200] = { 0x3F, 0x4C, 0xCC, 0xCD, 0x42, 0x50, 0x00, 0x00, 0x00, 0x78, 0x00, 0x00, 0x41, 0xE0, 0x00, 0x00, 0x00, 0x01, 0x00, 0x05, 0x3F, 0x19, 0x99, 0x9A, }; -COMPILER_STRIP_GATE(80B5D794, &daNpc_ykM_Param_c::m); +COMPILER_STRIP_GATE(0x80B5D794, &daNpc_ykM_Param_c::m); /* 80B5D85C-80B5D87C 0000C8 0020+00 0/1 0/0 0/0 .rodata heapSize$4109 */ #pragma push @@ -1778,56 +1798,56 @@ SECTION_RODATA static u8 const heapSize[32] = { 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x54, 0x60, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x44, 0x60, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x80, 0x00, }; -COMPILER_STRIP_GATE(80B5D85C, &heapSize); +COMPILER_STRIP_GATE(0x80B5D85C, &heapSize); #pragma pop /* 80B5D87C-80B5D880 0000E8 0004+00 0/1 0/0 0/0 .rodata @4189 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4189 = -400.0f; -COMPILER_STRIP_GATE(80B5D87C, &lit_4189); +COMPILER_STRIP_GATE(0x80B5D87C, &lit_4189); #pragma pop /* 80B5D880-80B5D884 0000EC 0004+00 0/1 0/0 0/0 .rodata @4190 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4190 = -100.0f; -COMPILER_STRIP_GATE(80B5D880, &lit_4190); +COMPILER_STRIP_GATE(0x80B5D880, &lit_4190); #pragma pop /* 80B5D884-80B5D888 0000F0 0004+00 0/1 0/0 0/0 .rodata @4191 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4191 = -500.0f; -COMPILER_STRIP_GATE(80B5D884, &lit_4191); +COMPILER_STRIP_GATE(0x80B5D884, &lit_4191); #pragma pop /* 80B5D888-80B5D88C 0000F4 0004+00 0/1 0/0 0/0 .rodata @4192 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4192 = 400.0f; -COMPILER_STRIP_GATE(80B5D888, &lit_4192); +COMPILER_STRIP_GATE(0x80B5D888, &lit_4192); #pragma pop /* 80B5D88C-80B5D890 0000F8 0004+00 0/2 0/0 0/0 .rodata @4193 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4193 = 600.0f; -COMPILER_STRIP_GATE(80B5D88C, &lit_4193); +COMPILER_STRIP_GATE(0x80B5D88C, &lit_4193); #pragma pop /* 80B5D890-80B5D894 0000FC 0004+00 0/1 0/0 0/0 .rodata @4194 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4194 = 500.0f; -COMPILER_STRIP_GATE(80B5D890, &lit_4194); +COMPILER_STRIP_GATE(0x80B5D890, &lit_4194); #pragma pop /* 80B5D894-80B5D898 000100 0004+00 0/2 0/0 0/0 .rodata @4195 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4195 = -1000000000.0f; -COMPILER_STRIP_GATE(80B5D894, &lit_4195); +COMPILER_STRIP_GATE(0x80B5D894, &lit_4195); #pragma pop /* 80B53698-80B53990 000298 02F8+00 1/1 0/0 0/0 .text create__11daNpc_ykM_cFv */ @@ -1848,20 +1868,20 @@ SECTION_RODATA static u8 const lit_4392[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B5D898, &lit_4392); +COMPILER_STRIP_GATE(0x80B5D898, &lit_4392); /* 80B5D89C-80B5D8A0 000108 0004+00 0/2 0/0 0/0 .rodata @4393 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4393 = 65536.0f; -COMPILER_STRIP_GATE(80B5D89C, &lit_4393); +COMPILER_STRIP_GATE(0x80B5D89C, &lit_4393); #pragma pop /* 80B5D8A0-80B5D8A4 00010C 0004+00 0/3 0/0 0/0 .rodata @4394 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4394 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(80B5D8A0, &lit_4394); +COMPILER_STRIP_GATE(0x80B5D8A0, &lit_4394); #pragma pop /* 80B5D8A4-80B5D8B0 000110 000C+00 0/1 0/0 0/0 .rodata bmdTypeList$4504 */ @@ -1870,12 +1890,12 @@ COMPILER_STRIP_GATE(80B5D8A0, &lit_4394); SECTION_RODATA static u8 const bmdTypeList[12] = { 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x03, }; -COMPILER_STRIP_GATE(80B5D8A4, &bmdTypeList); +COMPILER_STRIP_GATE(0x80B5D8A4, &bmdTypeList); #pragma pop /* 80B5D8B0-80B5D8B4 00011C 0004+00 1/8 0/0 0/0 .rodata @4613 */ SECTION_RODATA static f32 const lit_4613 = 1.0f; -COMPILER_STRIP_GATE(80B5D8B0, &lit_4613); +COMPILER_STRIP_GATE(0x80B5D8B0, &lit_4613); /* 80B53990-80B53F00 000590 0570+00 1/1 0/0 0/0 .text CreateHeap__11daNpc_ykM_cFv */ #pragma push @@ -2052,7 +2072,7 @@ asm void daNpc_ykM_c::srchGadget(void* param_0, void* param_1) { /* ############################################################################################## */ /* 80B5D8B4-80B5D8B8 000120 0004+00 4/4 0/0 0/0 .rodata @4737 */ SECTION_RODATA static f32 const lit_4737 = 1000000000.0f; -COMPILER_STRIP_GATE(80B5D8B4, &lit_4737); +COMPILER_STRIP_GATE(0x80B5D8B4, &lit_4737); /* 80B5430C-80B543DC 000F0C 00D0+00 1/1 0/0 0/0 .text getTomatoPureeP__11daNpc_ykM_cFv */ #pragma push @@ -2139,7 +2159,7 @@ asm void daNpc_ykM_c::isDelete() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4914 = -20.0f; -COMPILER_STRIP_GATE(80B5D8B8, &lit_4914); +COMPILER_STRIP_GATE(0x80B5D8B8, &lit_4914); #pragma pop /* 80B548A8-80B54B44 0014A8 029C+00 1/1 0/0 0/0 .text reset__11daNpc_ykM_cFv */ @@ -2167,35 +2187,35 @@ asm void daNpc_ykM_c::afterJntAnm(int param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5022 = 350.0f; -COMPILER_STRIP_GATE(80B5D8BC, &lit_5022); +COMPILER_STRIP_GATE(0x80B5D8BC, &lit_5022); #pragma pop /* 80B5D8C0-80B5D8C4 00012C 0004+00 0/1 0/0 0/0 .rodata @5023 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5023 = 800.0f; -COMPILER_STRIP_GATE(80B5D8C0, &lit_5023); +COMPILER_STRIP_GATE(0x80B5D8C0, &lit_5023); #pragma pop /* 80B5D8C4-80B5D8C8 000130 0004+00 0/1 0/0 0/0 .rodata @5024 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5024 = 900.0f; -COMPILER_STRIP_GATE(80B5D8C4, &lit_5024); +COMPILER_STRIP_GATE(0x80B5D8C4, &lit_5024); #pragma pop /* 80B5D8C8-80B5D8CC 000134 0004+00 0/1 0/0 0/0 .rodata @5025 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5025 = 700.0f; -COMPILER_STRIP_GATE(80B5D8C8, &lit_5025); +COMPILER_STRIP_GATE(0x80B5D8C8, &lit_5025); #pragma pop /* 80B5D8CC-80B5D8D0 000138 0004+00 0/1 0/0 0/0 .rodata @5026 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5026 = 1800.0f; -COMPILER_STRIP_GATE(80B5D8CC, &lit_5026); +COMPILER_STRIP_GATE(0x80B5D8CC, &lit_5026); #pragma pop /* 80B54BD0-80B54E48 0017D0 0278+00 1/0 0/0 0/0 .text setParam__11daNpc_ykM_cFv */ @@ -2231,7 +2251,7 @@ asm void daNpc_ykM_c::checkChangeEvt() { /* ############################################################################################## */ /* 80B5D8D0-80B5D8D4 00013C 0004+00 1/11 0/0 0/0 .rodata @5084 */ SECTION_RODATA static f32 const lit_5084 = -1.0f; -COMPILER_STRIP_GATE(80B5D8D0, &lit_5084); +COMPILER_STRIP_GATE(0x80B5D8D0, &lit_5084); /* 80B55004-80B550A4 001C04 00A0+00 1/0 0/0 0/0 .text setAfterTalkMotion__11daNpc_ykM_cFv */ @@ -2299,56 +2319,56 @@ asm void daNpc_ykM_c::beforeMove() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5319 = 3.0f; -COMPILER_STRIP_GATE(80B5D8D4, &lit_5319); +COMPILER_STRIP_GATE(0x80B5D8D4, &lit_5319); #pragma pop /* 80B5D8D8-80B5D8DC 000144 0004+00 0/2 0/0 0/0 .rodata @5320 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5320 = 30.0f; -COMPILER_STRIP_GATE(80B5D8D8, &lit_5320); +COMPILER_STRIP_GATE(0x80B5D8D8, &lit_5320); #pragma pop /* 80B5D8DC-80B5D8E0 000148 0004+00 0/1 0/0 0/0 .rodata @5321 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5321 = 2.0f; -COMPILER_STRIP_GATE(80B5D8DC, &lit_5321); +COMPILER_STRIP_GATE(0x80B5D8DC, &lit_5321); #pragma pop /* 80B5D8E0-80B5D8E4 00014C 0004+00 0/2 0/0 0/0 .rodata @5322 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5322 = 4.0f; -COMPILER_STRIP_GATE(80B5D8E0, &lit_5322); +COMPILER_STRIP_GATE(0x80B5D8E0, &lit_5322); #pragma pop /* 80B5D8E4-80B5D8E8 000150 0004+00 0/1 0/0 0/0 .rodata @5323 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5323 = 7.0f / 10.0f; -COMPILER_STRIP_GATE(80B5D8E4, &lit_5323); +COMPILER_STRIP_GATE(0x80B5D8E4, &lit_5323); #pragma pop /* 80B5D8E8-80B5D8EC 000154 0004+00 0/1 0/0 0/0 .rodata @5324 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5324 = 3.0f / 10.0f; -COMPILER_STRIP_GATE(80B5D8E8, &lit_5324); +COMPILER_STRIP_GATE(0x80B5D8E8, &lit_5324); #pragma pop /* 80B5D8EC-80B5D8F0 000158 0004+00 0/2 0/0 0/0 .rodata @5325 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5325 = 50.0f; -COMPILER_STRIP_GATE(80B5D8EC, &lit_5325); +COMPILER_STRIP_GATE(0x80B5D8EC, &lit_5325); #pragma pop /* 80B5D8F0-80B5D8F4 00015C 0004+00 0/1 0/0 0/0 .rodata @5326 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5326 = 205.0f; -COMPILER_STRIP_GATE(80B5D8F0, &lit_5326); +COMPILER_STRIP_GATE(0x80B5D8F0, &lit_5326); #pragma pop /* 80B5D8F4-80B5D8FC 000160 0008+00 0/3 0/0 0/0 .rodata @5327 */ @@ -2357,7 +2377,7 @@ COMPILER_STRIP_GATE(80B5D8F0, &lit_5326); SECTION_RODATA static u8 const lit_5327[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B5D8F4, &lit_5327); +COMPILER_STRIP_GATE(0x80B5D8F4, &lit_5327); #pragma pop /* 80B5D8FC-80B5D904 000168 0008+00 0/3 0/0 0/0 .rodata @5328 */ @@ -2366,7 +2386,7 @@ COMPILER_STRIP_GATE(80B5D8F4, &lit_5327); SECTION_RODATA static u8 const lit_5328[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B5D8FC, &lit_5328); +COMPILER_STRIP_GATE(0x80B5D8FC, &lit_5328); #pragma pop /* 80B5D904-80B5D90C 000170 0008+00 0/3 0/0 0/0 .rodata @5329 */ @@ -2375,14 +2395,14 @@ COMPILER_STRIP_GATE(80B5D8FC, &lit_5328); SECTION_RODATA static u8 const lit_5329[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B5D904, &lit_5329); +COMPILER_STRIP_GATE(0x80B5D904, &lit_5329); #pragma pop /* 80B5D90C-80B5D910 000178 0004+00 0/1 0/0 0/0 .rodata @5330 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_5330 = 0x358637BD; -COMPILER_STRIP_GATE(80B5D90C, &lit_5330); +COMPILER_STRIP_GATE(0x80B5D90C, &lit_5330); #pragma pop /* 80B5571C-80B55A64 00231C 0348+00 1/0 0/0 0/0 .text afterMoved__11daNpc_ykM_cFv */ @@ -2400,35 +2420,35 @@ asm void daNpc_ykM_c::afterMoved() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5510 = 80.0f; -COMPILER_STRIP_GATE(80B5D910, &lit_5510); +COMPILER_STRIP_GATE(0x80B5D910, &lit_5510); #pragma pop /* 80B5D914-80B5D918 000180 0004+00 0/1 0/0 0/0 .rodata @5511 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_5511 = 0x38C90FDB; -COMPILER_STRIP_GATE(80B5D914, &lit_5511); +COMPILER_STRIP_GATE(0x80B5D914, &lit_5511); #pragma pop /* 80B5D918-80B5D91C 000184 0004+00 0/2 0/0 0/0 .rodata @5512 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5512 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(80B5D918, &lit_5512); +COMPILER_STRIP_GATE(0x80B5D918, &lit_5512); #pragma pop /* 80B5D91C-80B5D920 000188 0004+00 0/1 0/0 0/0 .rodata @5513 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5513 = 55.0f; -COMPILER_STRIP_GATE(80B5D91C, &lit_5513); +COMPILER_STRIP_GATE(0x80B5D91C, &lit_5513); #pragma pop /* 80B5D920-80B5D924 00018C 0004+00 0/1 0/0 0/0 .rodata @5514 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5514 = 440.0f; -COMPILER_STRIP_GATE(80B5D920, &lit_5514); +COMPILER_STRIP_GATE(0x80B5D920, &lit_5514); #pragma pop /* 80B5D924-80B5D92C 000190 0004+04 0/1 0/0 0/0 .rodata @5515 */ @@ -2439,14 +2459,14 @@ SECTION_RODATA static f32 const lit_5515[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80B5D924, &lit_5515); +COMPILER_STRIP_GATE(0x80B5D924, &lit_5515); #pragma pop /* 80B5D92C-80B5D934 000198 0008+00 2/5 0/0 0/0 .rodata @5517 */ SECTION_RODATA static u8 const lit_5517[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B5D92C, &lit_5517); +COMPILER_STRIP_GATE(0x80B5D92C, &lit_5517); /* 80B55A64-80B560B4 002664 0650+00 1/0 0/0 0/0 .text setAttnPos__11daNpc_ykM_cFv */ #pragma push @@ -2465,7 +2485,7 @@ asm void daNpc_ykM_c::setAttnPos() { SECTION_RODATA static u8 const lit_5599[16] = { 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x0D, 0x00, 0x00, 0x00, 0x13, 0x00, 0x00, 0x00, 0x1D, }; -COMPILER_STRIP_GATE(80B5D934, &lit_5599); +COMPILER_STRIP_GATE(0x80B5D934, &lit_5599); #pragma pop /* 80B5D944-80B5D954 0001B0 0010+00 0/1 0/0 0/0 .rodata @5600 */ @@ -2474,14 +2494,14 @@ COMPILER_STRIP_GATE(80B5D934, &lit_5599); SECTION_RODATA static u8 const lit_5600[16] = { 0x43, 0x0C, 0x00, 0x00, 0x42, 0x70, 0x00, 0x00, 0x42, 0x70, 0x00, 0x00, 0x43, 0x0C, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B5D944, &lit_5600); +COMPILER_STRIP_GATE(0x80B5D944, &lit_5600); #pragma pop /* 80B5D954-80B5D958 0001C0 0004+00 0/1 0/0 0/0 .rodata @5701 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5701 = 170.0f; -COMPILER_STRIP_GATE(80B5D954, &lit_5701); +COMPILER_STRIP_GATE(0x80B5D954, &lit_5701); #pragma pop /* 80B560B4-80B5641C 002CB4 0368+00 1/0 0/0 0/0 .text setCollision__11daNpc_ykM_cFv */ @@ -2504,7 +2524,7 @@ bool daNpc_ykM_c::drawDbgInfo() { SECTION_RODATA static u8 const jointNo[12] = { 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x1C, 0x00, 0x00, 0x00, 0x14, }; -COMPILER_STRIP_GATE(80B5D958, &jointNo); +COMPILER_STRIP_GATE(0x80B5D958, &jointNo); /* 80B56424-80B56624 003024 0200+00 1/0 0/0 0/0 .text drawOtherMdl__11daNpc_ykM_cFv */ #pragma push @@ -2539,7 +2559,7 @@ asm void daNpc_ykM_c::setLeafAnm(int param_0, f32 param_1) { /* ############################################################################################## */ /* 80B5D964-80B5D968 0001D0 0004+00 1/1 0/0 0/0 .rodata @5854 */ SECTION_RODATA static f32 const lit_5854 = 15.0f; -COMPILER_STRIP_GATE(80B5D964, &lit_5854); +COMPILER_STRIP_GATE(0x80B5D964, &lit_5854); /* 80B567B4-80B5680C 0033B4 0058+00 1/0 0/0 0/0 .text afterSetMotionAnm__11daNpc_ykM_cFiifi */ #pragma push @@ -2566,7 +2586,7 @@ asm void daNpc_ykM_c::selectAction() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpc_ykM_c::chkAction(int (daNpc_ykM_c::*)(void*)) { +asm void daNpc_ykM_c::chkAction(int (daNpc_ykM_c::*param_0)(void*)) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_ykm/d_a_npc_ykm/chkAction__11daNpc_ykM_cFM11daNpc_ykM_cFPCvPvPv_i.s" } @@ -2577,7 +2597,7 @@ asm void daNpc_ykM_c::chkAction(int (daNpc_ykM_c::*)(void*)) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpc_ykM_c::setAction(int (daNpc_ykM_c::*)(void*)) { +asm void daNpc_ykM_c::setAction(int (daNpc_ykM_c::*param_0)(void*)) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_ykm/d_a_npc_ykm/setAction__11daNpc_ykM_cFM11daNpc_ykM_cFPCvPvPv_i.s" } @@ -2596,7 +2616,7 @@ asm void daNpc_ykM_c::chkContinueAttnPlayer() { /* ############################################################################################## */ /* 80B5D968-80B5D96C 0001D4 0004+00 1/1 0/0 0/0 .rodata @5936 */ SECTION_RODATA static f32 const lit_5936 = 20.0f; -COMPILER_STRIP_GATE(80B5D968, &lit_5936); +COMPILER_STRIP_GATE(0x80B5D968, &lit_5936); /* 80B56AB4-80B56B84 0036B4 00D0+00 1/1 0/0 0/0 .text chkTouchPlayer__11daNpc_ykM_cFv */ #pragma push @@ -2608,6 +2628,14 @@ asm void daNpc_ykM_c::chkTouchPlayer() { } #pragma pop +/* ############################################################################################## */ +/* 80B5DA40-80B5DA40 0002AC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80B5DAD7 = "prm"; +SECTION_DEAD static char const* const stringBase_80B5DADB = "timer"; +#pragma pop + /* 80B56B84-80B572C8 003784 0744+00 3/0 0/0 0/0 .text cutSlideDown__11daNpc_ykM_cFi */ #pragma push #pragma optimization_level 0 @@ -2625,63 +2653,63 @@ asm void daNpc_ykM_c::cutSlideDown(int param_0) { SECTION_RODATA static u8 const lit_5955[8] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, }; -COMPILER_STRIP_GATE(80B5D96C, &lit_5955); +COMPILER_STRIP_GATE(0x80B5D96C, &lit_5955); #pragma pop /* 80B5D974-80B5D978 0001E0 0004+00 0/0 0/0 0/0 .rodata @6136 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6136 = -200.0f; -COMPILER_STRIP_GATE(80B5D974, &lit_6136); +COMPILER_STRIP_GATE(0x80B5D974, &lit_6136); #pragma pop /* 80B5D978-80B5D97C 0001E4 0004+00 0/0 0/0 0/0 .rodata @6137 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6137 = 65.0f; -COMPILER_STRIP_GATE(80B5D978, &lit_6137); +COMPILER_STRIP_GATE(0x80B5D978, &lit_6137); #pragma pop /* 80B5D97C-80B5D980 0001E8 0004+00 0/0 0/0 0/0 .rodata @6138 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6138 = 62.0f; -COMPILER_STRIP_GATE(80B5D97C, &lit_6138); +COMPILER_STRIP_GATE(0x80B5D97C, &lit_6138); #pragma pop /* 80B5D980-80B5D984 0001EC 0004+00 0/0 0/0 0/0 .rodata @6139 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6139 = -14483.0f; -COMPILER_STRIP_GATE(80B5D980, &lit_6139); +COMPILER_STRIP_GATE(0x80B5D980, &lit_6139); #pragma pop /* 80B5D984-80B5D988 0001F0 0004+00 0/0 0/0 0/0 .rodata @6140 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6140 = 2023.0f; -COMPILER_STRIP_GATE(80B5D984, &lit_6140); +COMPILER_STRIP_GATE(0x80B5D984, &lit_6140); #pragma pop /* 80B5D988-80B5D98C 0001F4 0004+00 0/0 0/0 0/0 .rodata @6141 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6141 = -9768.0f; -COMPILER_STRIP_GATE(80B5D988, &lit_6141); +COMPILER_STRIP_GATE(0x80B5D988, &lit_6141); #pragma pop /* 80B5D98C-80B5D990 0001F8 0004+00 0/0 0/0 0/0 .rodata @6142 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6142 = 22.0f; -COMPILER_STRIP_GATE(80B5D98C, &lit_6142); +COMPILER_STRIP_GATE(0x80B5D98C, &lit_6142); #pragma pop /* 80B5D990-80B5D994 0001FC 0004+00 0/0 0/0 0/0 .rodata @6143 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6143 = 27.0f; -COMPILER_STRIP_GATE(80B5D990, &lit_6143); +COMPILER_STRIP_GATE(0x80B5D990, &lit_6143); #pragma pop /* 80B5D994-80B5D99C 000200 0008+00 0/0 0/0 0/0 .rodata @6165 */ @@ -2690,14 +2718,20 @@ COMPILER_STRIP_GATE(80B5D990, &lit_6143); SECTION_RODATA static u8 const lit_6165[8] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, }; -COMPILER_STRIP_GATE(80B5D994, &lit_6165); +COMPILER_STRIP_GATE(0x80B5D994, &lit_6165); #pragma pop /* 80B5D99C-80B5D9A0 000208 0004+00 0/1 0/0 0/0 .rodata @6239 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6239 = 1000.0f; -COMPILER_STRIP_GATE(80B5D99C, &lit_6239); +COMPILER_STRIP_GATE(0x80B5D99C, &lit_6239); +#pragma pop + +/* 80B5DA40-80B5DA40 0002AC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80B5DAE1 = "msgNo"; #pragma pop /* 80B572C8-80B57638 003EC8 0370+00 1/0 0/0 0/0 .text cutMeetingAgain__11daNpc_ykM_cFi */ @@ -2717,21 +2751,21 @@ asm void daNpc_ykM_c::cutMeetingAgain(int param_0) { SECTION_RODATA static u8 const lit_6262[8] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, }; -COMPILER_STRIP_GATE(80B5D9A0, &lit_6262); +COMPILER_STRIP_GATE(0x80B5D9A0, &lit_6262); #pragma pop /* 80B5D9A8-80B5D9AC 000214 0004+00 0/3 0/0 0/0 .rodata @6549 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6549 = 200.0f; -COMPILER_STRIP_GATE(80B5D9A8, &lit_6549); +COMPILER_STRIP_GATE(0x80B5D9A8, &lit_6549); #pragma pop /* 80B5D9AC-80B5D9B0 000218 0004+00 0/3 0/0 0/0 .rodata @6550 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6550 = 450.0f; -COMPILER_STRIP_GATE(80B5D9AC, &lit_6550); +COMPILER_STRIP_GATE(0x80B5D9AC, &lit_6550); #pragma pop /* 80B57638-80B5806C 004238 0A34+00 3/0 0/0 0/0 .text cutGetTomatoPuree__11daNpc_ykM_cFi @@ -2750,21 +2784,21 @@ asm void daNpc_ykM_c::cutGetTomatoPuree(int param_0) { #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_6551 = 0x43360B61; -COMPILER_STRIP_GATE(80B5D9B0, &lit_6551); +COMPILER_STRIP_GATE(0x80B5D9B0, &lit_6551); #pragma pop /* 80B5D9B4-80B5D9B8 000220 0004+00 0/0 0/0 0/0 .rodata @6552 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6552 = 19.0f; -COMPILER_STRIP_GATE(80B5D9B4, &lit_6552); +COMPILER_STRIP_GATE(0x80B5D9B4, &lit_6552); #pragma pop /* 80B5D9B8-80B5D9BC 000224 0004+00 0/0 0/0 0/0 .rodata @6553 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6553 = 18.0f; -COMPILER_STRIP_GATE(80B5D9B8, &lit_6553); +COMPILER_STRIP_GATE(0x80B5D9B8, &lit_6553); #pragma pop /* 80B5D9BC-80B5D9C4 000228 0008+00 0/1 0/0 0/0 .rodata @6578 */ @@ -2773,7 +2807,7 @@ COMPILER_STRIP_GATE(80B5D9B8, &lit_6553); SECTION_RODATA static u8 const lit_6578[8] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, }; -COMPILER_STRIP_GATE(80B5D9BC, &lit_6578); +COMPILER_STRIP_GATE(0x80B5D9BC, &lit_6578); #pragma pop /* 80B5806C-80B58A38 004C6C 09CC+00 3/0 0/0 0/0 .text cutGetTaste__11daNpc_ykM_cFi */ @@ -2804,7 +2838,7 @@ asm void daNpc_ykM_c::cutLv5DungeonClear(int param_0) { SECTION_RODATA static u8 const lit_6889[8] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, }; -COMPILER_STRIP_GATE(80B5D9C4, &lit_6889); +COMPILER_STRIP_GATE(0x80B5D9C4, &lit_6889); #pragma pop /* 80B5D9CC-80B5D9D4 000238 0008+00 0/1 0/0 0/0 .rodata @7183 */ @@ -2813,7 +2847,7 @@ COMPILER_STRIP_GATE(80B5D9C4, &lit_6889); SECTION_RODATA static u8 const lit_7183[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B5D9CC, &lit_7183); +COMPILER_STRIP_GATE(0x80B5D9CC, &lit_7183); #pragma pop /* 80B59500-80B59748 006100 0248+00 1/0 0/0 0/0 .text cutFindWolf__11daNpc_ykM_cFi */ @@ -2833,56 +2867,56 @@ asm void daNpc_ykM_c::cutFindWolf(int param_0) { SECTION_RODATA static u8 const lit_7190[8] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, }; -COMPILER_STRIP_GATE(80B5D9D4, &lit_7190); +COMPILER_STRIP_GATE(0x80B5D9D4, &lit_7190); #pragma pop /* 80B5D9DC-80B5D9E0 000248 0004+00 0/1 0/0 0/0 .rodata @7353 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7353 = -72610.0f; -COMPILER_STRIP_GATE(80B5D9DC, &lit_7353); +COMPILER_STRIP_GATE(0x80B5D9DC, &lit_7353); #pragma pop /* 80B5D9E0-80B5D9E4 00024C 0004+00 0/1 0/0 0/0 .rodata @7354 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7354 = -54260.0f; -COMPILER_STRIP_GATE(80B5D9E0, &lit_7354); +COMPILER_STRIP_GATE(0x80B5D9E0, &lit_7354); #pragma pop /* 80B5D9E4-80B5D9E8 000250 0004+00 0/1 0/0 0/0 .rodata @7355 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7355 = 56590.0f; -COMPILER_STRIP_GATE(80B5D9E4, &lit_7355); +COMPILER_STRIP_GATE(0x80B5D9E4, &lit_7355); #pragma pop /* 80B5D9E8-80B5D9EC 000254 0004+00 0/1 0/0 0/0 .rodata @7356 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7356 = 210.0f; -COMPILER_STRIP_GATE(80B5D9E8, &lit_7356); +COMPILER_STRIP_GATE(0x80B5D9E8, &lit_7356); #pragma pop /* 80B5D9EC-80B5D9F0 000258 0004+00 0/1 0/0 0/0 .rodata @7357 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7357 = 410.0f; -COMPILER_STRIP_GATE(80B5D9EC, &lit_7357); +COMPILER_STRIP_GATE(0x80B5D9EC, &lit_7357); #pragma pop /* 80B5D9F0-80B5D9F4 00025C 0004+00 0/1 0/0 0/0 .rodata @7358 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7358 = 32.0f; -COMPILER_STRIP_GATE(80B5D9F0, &lit_7358); +COMPILER_STRIP_GATE(0x80B5D9F0, &lit_7358); #pragma pop /* 80B5D9F4-80B5D9F8 000260 0004+00 0/1 0/0 0/0 .rodata @7359 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7359 = 419.0f; -COMPILER_STRIP_GATE(80B5D9F4, &lit_7359); +COMPILER_STRIP_GATE(0x80B5D9F4, &lit_7359); #pragma pop /* 80B59748-80B59B90 006348 0448+00 1/0 0/0 0/0 .text cutStartSnowboardRace__11daNpc_ykM_cFi */ @@ -2922,7 +2956,7 @@ asm void daNpc_ykM_c::cutHug(int param_0) { SECTION_RODATA static u8 const lit_7385[8] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, }; -COMPILER_STRIP_GATE(80B5D9F8, &lit_7385); +COMPILER_STRIP_GATE(0x80B5D9F8, &lit_7385); #pragma pop /* 80B5DA00-80B5DA10 00026C 0010+00 0/1 0/0 0/0 .rodata motionTbl2$7522 */ @@ -2931,7 +2965,7 @@ COMPILER_STRIP_GATE(80B5D9F8, &lit_7385); SECTION_RODATA static u8 const motionTbl2[16] = { 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x02, }; -COMPILER_STRIP_GATE(80B5DA00, &motionTbl2); +COMPILER_STRIP_GATE(0x80B5DA00, &motionTbl2); #pragma pop /* 80B5DA10-80B5DA18 00027C 0008+00 0/1 0/0 0/0 .rodata motionTbl1$7524 */ @@ -2940,14 +2974,14 @@ COMPILER_STRIP_GATE(80B5DA00, &motionTbl2); SECTION_RODATA static u8 const motionTbl1[8] = { 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x0D, }; -COMPILER_STRIP_GATE(80B5DA10, &motionTbl1); +COMPILER_STRIP_GATE(0x80B5DA10, &motionTbl1); #pragma pop /* 80B5DA18-80B5DA1C 000284 0004+00 0/3 0/0 0/0 .rodata @7540 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7540 = 0.5f; -COMPILER_STRIP_GATE(80B5DA18, &lit_7540); +COMPILER_STRIP_GATE(0x80B5DA18, &lit_7540); #pragma pop /* 80B5A128-80B5A224 006D28 00FC+00 1/1 0/0 0/0 .text setDialogueMotion__11daNpc_ykM_cFv @@ -2976,7 +3010,7 @@ asm void daNpc_ykM_c::dialogue() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7841 = -40.0f; -COMPILER_STRIP_GATE(80B5DA1C, &lit_7841); +COMPILER_STRIP_GATE(0x80B5DA1C, &lit_7841); #pragma pop /* 80B5A3FC-80B5ABA8 006FFC 07AC+00 3/0 0/0 0/0 .text wait__11daNpc_ykM_cFPv */ @@ -2994,7 +3028,7 @@ asm void daNpc_ykM_c::wait(void* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8049 = 3.0f / 5.0f; -COMPILER_STRIP_GATE(80B5DA20, &lit_8049); +COMPILER_STRIP_GATE(0x80B5DA20, &lit_8049); #pragma pop /* 80B5ABA8-80B5B260 0077A8 06B8+00 1/0 0/0 0/0 .text cook__11daNpc_ykM_cFPv */ @@ -3014,42 +3048,42 @@ asm void daNpc_ykM_c::cook(void* param_0) { SECTION_RODATA static u8 const lit_8053[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B5DA24, &lit_8053); +COMPILER_STRIP_GATE(0x80B5DA24, &lit_8053); #pragma pop /* 80B5DA2C-80B5DA30 000298 0004+00 0/1 0/0 0/0 .rodata @8468 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8468 = 640000.0f; -COMPILER_STRIP_GATE(80B5DA2C, &lit_8468); +COMPILER_STRIP_GATE(0x80B5DA2C, &lit_8468); #pragma pop /* 80B5DA30-80B5DA34 00029C 0004+00 0/1 0/0 0/0 .rodata @8469 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8469 = 3.0f / 20.0f; -COMPILER_STRIP_GATE(80B5DA30, &lit_8469); +COMPILER_STRIP_GATE(0x80B5DA30, &lit_8469); #pragma pop /* 80B5DA34-80B5DA38 0002A0 0004+00 0/1 0/0 0/0 .rodata @8470 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_8470 = 0x3BB40000; -COMPILER_STRIP_GATE(80B5DA34, &lit_8470); +COMPILER_STRIP_GATE(0x80B5DA34, &lit_8470); #pragma pop /* 80B5DA38-80B5DA3C 0002A4 0004+00 0/1 0/0 0/0 .rodata @8471 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8471 = 24.0f; -COMPILER_STRIP_GATE(80B5DA38, &lit_8471); +COMPILER_STRIP_GATE(0x80B5DA38, &lit_8471); #pragma pop /* 80B5DA3C-80B5DA40 0002A8 0004+00 0/1 0/0 0/0 .rodata @8472 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8472 = -4.0f; -COMPILER_STRIP_GATE(80B5DA3C, &lit_8472); +COMPILER_STRIP_GATE(0x80B5DA3C, &lit_8472); #pragma pop /* 80B5B260-80B5BE08 007E60 0BA8+00 2/0 0/0 0/0 .text race__11daNpc_ykM_cFPv */ @@ -3457,7 +3491,7 @@ void daNpcT_c::changeBtk(int* param_0, int* param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80B5D378(int* param_0) { +extern "C" asm void func_80B5D378(void* _this, int* param_0) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_ykm/d_a_npc_ykm/func_80B5D378.s" } @@ -3467,7 +3501,7 @@ extern "C" asm void func_80B5D378(int* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80B5D394(int param_0, int param_1) { +extern "C" asm void func_80B5D394(void* _this, int param_0, int param_1) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_ykm/d_a_npc_ykm/func_80B5D394.s" } @@ -3622,7 +3656,7 @@ asm void __sinit_d_a_npc_ykm_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80B5D410 = (void*)__sinit_d_a_npc_ykm_cpp; +REGISTER_CTORS(0x80B5D410, __sinit_d_a_npc_ykm_cpp); #pragma pop /* 80B5D588-80B5D688 00A188 0100+00 1/1 0/0 0/0 .text @@ -3896,26 +3930,4 @@ static u8 data_80B5EE00[4]; static u8 data_80B5EE04[4]; #pragma pop -/* 80B5DA40-80B5DAE7 0002AC 00A7+00 13/10 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80B5DA40 = ""; -SECTION_DEAD static char const* const stringBase_80B5DA41 = "NO_RESPONSE"; -SECTION_DEAD static char const* const stringBase_80B5DA4D = "SLIDEDOWN"; -SECTION_DEAD static char const* const stringBase_80B5DA57 = "MEETING_AGAIN"; -SECTION_DEAD static char const* const stringBase_80B5DA65 = "GET_TOMATOPUREE"; -SECTION_DEAD static char const* const stringBase_80B5DA75 = "GET_TASTE"; -SECTION_DEAD static char const* const stringBase_80B5DA7F = "FIND_WOLF"; -SECTION_DEAD static char const* const stringBase_80B5DA89 = "START_SNOWBOARDRACE"; -SECTION_DEAD static char const* const stringBase_80B5DA9D = "END_SNOWBOARDRACE"; -SECTION_DEAD static char const* const stringBase_80B5DAAF = "HUG"; -SECTION_DEAD static char const* const stringBase_80B5DAB3 = "ykM"; -SECTION_DEAD static char const* const stringBase_80B5DAB7 = "ykM1"; -SECTION_DEAD static char const* const stringBase_80B5DABC = "ykM2"; -SECTION_DEAD static char const* const stringBase_80B5DAC1 = "ykM3"; -SECTION_DEAD static char const* const stringBase_80B5DAC6 = "LV5DUNGEON_CLEAR"; -SECTION_DEAD static char const* const stringBase_80B5DAD7 = "prm"; -SECTION_DEAD static char const* const stringBase_80B5DADB = "timer"; -SECTION_DEAD static char const* const stringBase_80B5DAE1 = "msgNo"; -#pragma pop +/* 80B5DA40-80B5DA40 0002AC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/npc/d_a_npc_ykw/d_a_npc_ykw.cpp b/rel/d/a/npc/d_a_npc_ykw/d_a_npc_ykw.cpp index 8cb590f7a4e..f67ddb23f38 100644 --- a/rel/d/a/npc/d_a_npc_ykw/d_a_npc_ykw.cpp +++ b/rel/d/a/npc/d_a_npc_ykw/d_a_npc_ykw.cpp @@ -26,20 +26,20 @@ struct mDoMtx_stack_c { static u8 now[48]; }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; +struct J3DAnmTransform {}; + +struct J3DModelData {}; + struct Z2Creature { /* 802C03C8 */ Z2Creature(); /* 802C0420 */ ~Z2Creature(); /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -57,6 +57,8 @@ struct daTag_EvtArea_c { /* 8048C94C */ void chkPointInArea(cXyz, cXyz); }; +struct daNpcT_faceMotionAnmData_c {}; + struct daNpcT_MotionSeqMngr_c { struct sequenceStepData_c {}; @@ -65,14 +67,12 @@ struct daNpcT_MotionSeqMngr_c { /* 80B672D8 */ ~daNpcT_MotionSeqMngr_c(); }; +struct daNpcT_evtData_c {}; + struct daNpcT_motionAnmData_c {}; struct J3DJoint {}; -struct daNpcT_faceMotionAnmData_c {}; - -struct daNpcT_evtData_c {}; - struct daNpc_ykW_c { /* 80B5EF0C */ ~daNpc_ykW_c(); /* 80B5F084 */ void create(); @@ -157,15 +157,15 @@ struct dCcD_GObjInf { /* 800840E4 */ ~dCcD_GObjInf(); }; -struct J3DModel {}; - -struct _GXColorS10 {}; - struct csXyz { /* 80B66C38 */ ~csXyz(); /* 80B671D4 */ csXyz(); }; +struct _GXColorS10 {}; + +struct J3DModel {}; + struct daNpcT_c { /* 80147FA4 */ void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*); /* 801483F8 */ void loadRes(s8 const*, char const**); @@ -613,8 +613,8 @@ extern "C" void changeAnm__8daNpcT_cFPiPi(); extern "C" void changeBck__8daNpcT_cFPiPi(); extern "C" void changeBtp__8daNpcT_cFPiPi(); extern "C" void changeBtk__8daNpcT_cFPiPi(); -extern "C" void func_80B678D0(int*); -extern "C" void func_80B678EC(f32, f32); +extern "C" void func_80B678D0(void* _this, int*); +extern "C" void func_80B678EC(void* _this, f32, f32); extern "C" void __sinit_d_a_npc_ykw_cpp(); extern "C" void __ct__11daNpc_ykW_cFPC26daNpcT_faceMotionAnmData_cPC22daNpcT_motionAnmData_cPCQ222daNpcT_MotionSeqMngr_c18sequenceStepData_ciPCQ222daNpcT_MotionSeqMngr_c18sequenceStepData_ciPC16daNpcT_evtData_cPPc(); @@ -877,6 +877,27 @@ extern "C" void __register_global_object(); // /* ############################################################################################## */ +/* 80B67E68-80B67E68 000230 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80B67E68 = ""; +SECTION_DEAD static char const* const stringBase_80B67E69 = "DEFAULT_GETITEM"; +SECTION_DEAD static char const* const stringBase_80B67E79 = "NO_RESPONSE"; +SECTION_DEAD static char const* const stringBase_80B67E85 = "SHOW_DOOR"; +SECTION_DEAD static char const* const stringBase_80B67E8F = "GO_INTO_BOSSROOM1"; +SECTION_DEAD static char const* const stringBase_80B67EA1 = "GO_INTO_BOSSROOM2"; +SECTION_DEAD static char const* const stringBase_80B67EB3 = "LV5DUNGEON_CLEAR"; +SECTION_DEAD static char const* const stringBase_80B67EC4 = "FIND_WOLF"; +SECTION_DEAD static char const* const stringBase_80B67ECE = "START_SNOWBOARDRACE"; +SECTION_DEAD static char const* const stringBase_80B67EE2 = "END_SNOWBOARDRACE"; +SECTION_DEAD static char const* const stringBase_80B67EF4 = "ykW"; +SECTION_DEAD static char const* const stringBase_80B67EF8 = "ykW1"; +SECTION_DEAD static char const* const stringBase_80B67EFD = "ykW2"; +SECTION_DEAD static char const* const stringBase_80B67F02 = "ykM2"; +SECTION_DEAD static char const* const stringBase_80B67F07 = "GO_INTO_BOSSROOM"; +SECTION_DEAD static char const* const stringBase_80B67F18 = "HUG"; +#pragma pop + /* 80B67F40-80B67F4C 000000 000C+00 4/4 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -1670,7 +1691,7 @@ SECTION_RODATA u8 const daNpc_ykW_Param_c::m[180] = { 0x00, 0x00, 0x42, 0x60, 0x00, 0x00, 0x3F, 0x33, 0x33, 0x33, 0x42, 0x68, 0x00, 0x00, 0x00, 0x03, 0x00, 0x05, 0x3F, 0x19, 0x99, 0x9A, 0x01, 0x68, 0x00, 0x00, 0x00, 0x1E, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B67C38, &daNpc_ykW_Param_c::m); +COMPILER_STRIP_GATE(0x80B67C38, &daNpc_ykW_Param_c::m); /* 80B67CEC-80B67D0C 0000B4 0020+00 0/1 0/0 0/0 .rodata heapSize$4289 */ #pragma push @@ -1679,28 +1700,28 @@ SECTION_RODATA static u8 const heapSize[32] = { 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x33, 0x10, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x33, 0x10, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x80, 0x00, }; -COMPILER_STRIP_GATE(80B67CEC, &heapSize); +COMPILER_STRIP_GATE(0x80B67CEC, &heapSize); #pragma pop /* 80B67D0C-80B67D10 0000D4 0004+00 0/1 0/0 0/0 .rodata @4355 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4355 = -300.0f; -COMPILER_STRIP_GATE(80B67D0C, &lit_4355); +COMPILER_STRIP_GATE(0x80B67D0C, &lit_4355); #pragma pop /* 80B67D10-80B67D14 0000D8 0004+00 0/1 0/0 0/0 .rodata @4356 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4356 = -100.0f; -COMPILER_STRIP_GATE(80B67D10, &lit_4356); +COMPILER_STRIP_GATE(0x80B67D10, &lit_4356); #pragma pop /* 80B67D14-80B67D18 0000DC 0004+00 0/1 0/0 0/0 .rodata @4357 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4357 = 300.0f; -COMPILER_STRIP_GATE(80B67D14, &lit_4357); +COMPILER_STRIP_GATE(0x80B67D14, &lit_4357); #pragma pop /* 80B67D18-80B67D1C 0000E0 0004+00 7/23 0/0 0/0 .rodata @4358 */ @@ -1710,13 +1731,13 @@ SECTION_RODATA static u8 const lit_4358[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B67D18, &lit_4358); +COMPILER_STRIP_GATE(0x80B67D18, &lit_4358); /* 80B67D1C-80B67D20 0000E4 0004+00 0/2 0/0 0/0 .rodata @4359 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4359 = -1000000000.0f; -COMPILER_STRIP_GATE(80B67D1C, &lit_4359); +COMPILER_STRIP_GATE(0x80B67D1C, &lit_4359); #pragma pop /* 80B5F084-80B5F34C 000264 02C8+00 1/1 0/0 0/0 .text create__11daNpc_ykW_cFv */ @@ -1734,19 +1755,19 @@ asm void daNpc_ykW_c::create() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4524 = 65536.0f; -COMPILER_STRIP_GATE(80B67D20, &lit_4524); +COMPILER_STRIP_GATE(0x80B67D20, &lit_4524); #pragma pop /* 80B67D24-80B67D28 0000EC 0004+00 0/3 0/0 0/0 .rodata @4525 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4525 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(80B67D24, &lit_4525); +COMPILER_STRIP_GATE(0x80B67D24, &lit_4525); #pragma pop /* 80B67D28-80B67D2C 0000F0 0004+00 2/8 0/0 0/0 .rodata @4669 */ SECTION_RODATA static f32 const lit_4669 = 1.0f; -COMPILER_STRIP_GATE(80B67D28, &lit_4669); +COMPILER_STRIP_GATE(0x80B67D28, &lit_4669); /* 80B5F34C-80B5F5C8 00052C 027C+00 1/1 0/0 0/0 .text CreateHeap__11daNpc_ykW_cFv */ #pragma push @@ -1881,7 +1902,7 @@ asm void daNpc_ykW_c::Execute() { /* ############################################################################################## */ /* 80B67D2C-80B67D30 0000F4 0004+00 1/2 0/0 0/0 .rodata @4729 */ SECTION_RODATA static f32 const lit_4729 = 100.0f; -COMPILER_STRIP_GATE(80B67D2C, &lit_4729); +COMPILER_STRIP_GATE(0x80B67D2C, &lit_4729); /* 80B5F7D8-80B5F8AC 0009B8 00D4+00 1/1 0/0 0/0 .text Draw__11daNpc_ykW_cFv */ #pragma push @@ -1939,7 +1960,7 @@ asm void daNpc_ykW_c::srchYkw(void* param_0, void* param_1) { /* ############################################################################################## */ /* 80B67D30-80B67D34 0000F8 0004+00 2/2 0/0 0/0 .rodata @4798 */ SECTION_RODATA static f32 const lit_4798 = 1000000000.0f; -COMPILER_STRIP_GATE(80B67D30, &lit_4798); +COMPILER_STRIP_GATE(0x80B67D30, &lit_4798); /* 80B5FA74-80B5FB50 000C54 00DC+00 2/2 0/0 0/0 .text getOtherYkwP__11daNpc_ykW_cFi */ #pragma push @@ -2014,7 +2035,7 @@ asm void daNpc_ykW_c::afterJntAnm(int param_0) { /* ############################################################################################## */ /* 80B67D34-80B67D38 0000FC 0004+00 1/1 0/0 0/0 .rodata @5051 */ SECTION_RODATA static f32 const lit_5051 = 1500.0f; -COMPILER_STRIP_GATE(80B67D34, &lit_5051); +COMPILER_STRIP_GATE(0x80B67D34, &lit_5051); /* 80B60290-80B6042C 001470 019C+00 1/0 0/0 0/0 .text setParam__11daNpc_ykW_cFv */ #pragma push @@ -2039,7 +2060,7 @@ asm void daNpc_ykW_c::checkChangeEvt() { /* ############################################################################################## */ /* 80B67D38-80B67D3C 000100 0004+00 4/10 0/0 0/0 .rodata @5096 */ SECTION_RODATA static f32 const lit_5096 = -1.0f; -COMPILER_STRIP_GATE(80B67D38, &lit_5096); +COMPILER_STRIP_GATE(0x80B67D38, &lit_5096); /* 80B60520-80B605C0 001700 00A0+00 1/0 0/0 0/0 .text setAfterTalkMotion__11daNpc_ykW_cFv */ @@ -2107,49 +2128,49 @@ asm void daNpc_ykW_c::beforeMove() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5332 = 3.0f; -COMPILER_STRIP_GATE(80B67D3C, &lit_5332); +COMPILER_STRIP_GATE(0x80B67D3C, &lit_5332); #pragma pop /* 80B67D40-80B67D44 000108 0004+00 0/1 0/0 0/0 .rodata @5333 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5333 = 30.0f; -COMPILER_STRIP_GATE(80B67D40, &lit_5333); +COMPILER_STRIP_GATE(0x80B67D40, &lit_5333); #pragma pop /* 80B67D44-80B67D48 00010C 0004+00 0/2 0/0 0/0 .rodata @5334 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5334 = 2.0f; -COMPILER_STRIP_GATE(80B67D44, &lit_5334); +COMPILER_STRIP_GATE(0x80B67D44, &lit_5334); #pragma pop /* 80B67D48-80B67D4C 000110 0004+00 0/2 0/0 0/0 .rodata @5335 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5335 = 4.0f; -COMPILER_STRIP_GATE(80B67D48, &lit_5335); +COMPILER_STRIP_GATE(0x80B67D48, &lit_5335); #pragma pop /* 80B67D4C-80B67D50 000114 0004+00 0/1 0/0 0/0 .rodata @5336 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5336 = 7.0f / 10.0f; -COMPILER_STRIP_GATE(80B67D4C, &lit_5336); +COMPILER_STRIP_GATE(0x80B67D4C, &lit_5336); #pragma pop /* 80B67D50-80B67D54 000118 0004+00 0/1 0/0 0/0 .rodata @5337 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5337 = 3.0f / 10.0f; -COMPILER_STRIP_GATE(80B67D50, &lit_5337); +COMPILER_STRIP_GATE(0x80B67D50, &lit_5337); #pragma pop /* 80B67D54-80B67D58 00011C 0004+00 0/2 0/0 0/0 .rodata @5338 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5338 = 50.0f; -COMPILER_STRIP_GATE(80B67D54, &lit_5338); +COMPILER_STRIP_GATE(0x80B67D54, &lit_5338); #pragma pop /* 80B67D58-80B67D60 000120 0004+04 0/1 0/0 0/0 .rodata @5339 */ @@ -2160,7 +2181,7 @@ SECTION_RODATA static f32 const lit_5339[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80B67D58, &lit_5339); +COMPILER_STRIP_GATE(0x80B67D58, &lit_5339); #pragma pop /* 80B67D60-80B67D68 000128 0008+00 0/4 0/0 0/0 .rodata @5340 */ @@ -2169,7 +2190,7 @@ COMPILER_STRIP_GATE(80B67D58, &lit_5339); SECTION_RODATA static u8 const lit_5340[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B67D60, &lit_5340); +COMPILER_STRIP_GATE(0x80B67D60, &lit_5340); #pragma pop /* 80B67D68-80B67D70 000130 0008+00 0/4 0/0 0/0 .rodata @5341 */ @@ -2178,7 +2199,7 @@ COMPILER_STRIP_GATE(80B67D60, &lit_5340); SECTION_RODATA static u8 const lit_5341[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B67D68, &lit_5341); +COMPILER_STRIP_GATE(0x80B67D68, &lit_5341); #pragma pop /* 80B67D70-80B67D78 000138 0008+00 0/4 0/0 0/0 .rodata @5342 */ @@ -2187,14 +2208,14 @@ COMPILER_STRIP_GATE(80B67D68, &lit_5341); SECTION_RODATA static u8 const lit_5342[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B67D70, &lit_5342); +COMPILER_STRIP_GATE(0x80B67D70, &lit_5342); #pragma pop /* 80B67D78-80B67D7C 000140 0004+00 0/1 0/0 0/0 .rodata @5343 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_5343 = 0x358637BD; -COMPILER_STRIP_GATE(80B67D78, &lit_5343); +COMPILER_STRIP_GATE(0x80B67D78, &lit_5343); #pragma pop /* 80B60BC0-80B60F08 001DA0 0348+00 1/0 0/0 0/0 .text afterMoved__11daNpc_ykW_cFv */ @@ -2212,21 +2233,21 @@ asm void daNpc_ykW_c::afterMoved() { #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_5467 = 0x38C90FDB; -COMPILER_STRIP_GATE(80B67D7C, &lit_5467); +COMPILER_STRIP_GATE(0x80B67D7C, &lit_5467); #pragma pop /* 80B67D80-80B67D84 000148 0004+00 0/1 0/0 0/0 .rodata @5468 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5468 = 55.0f; -COMPILER_STRIP_GATE(80B67D80, &lit_5468); +COMPILER_STRIP_GATE(0x80B67D80, &lit_5468); #pragma pop /* 80B67D84-80B67D88 00014C 0004+00 0/1 0/0 0/0 .rodata @5469 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5469 = 440.0f; -COMPILER_STRIP_GATE(80B67D84, &lit_5469); +COMPILER_STRIP_GATE(0x80B67D84, &lit_5469); #pragma pop /* 80B67D88-80B67D90 000150 0004+04 0/4 0/0 0/0 .rodata @5470 */ @@ -2237,14 +2258,14 @@ SECTION_RODATA static f32 const lit_5470[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80B67D88, &lit_5470); +COMPILER_STRIP_GATE(0x80B67D88, &lit_5470); #pragma pop /* 80B67D90-80B67D98 000158 0008+00 1/4 0/0 0/0 .rodata @5472 */ SECTION_RODATA static u8 const lit_5472[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B67D90, &lit_5472); +COMPILER_STRIP_GATE(0x80B67D90, &lit_5472); /* 80B68D68-80B68D6C 000008 0001+03 1/1 0/0 0/0 .bss @1109 */ static u8 lit_1109[1 + 3 /* padding */]; @@ -2372,21 +2393,21 @@ asm void daNpc_ykW_c::setAttnPos() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5587 = 180.0f; -COMPILER_STRIP_GATE(80B67D98, &lit_5587); +COMPILER_STRIP_GATE(0x80B67D98, &lit_5587); #pragma pop /* 80B67D9C-80B67DA0 000164 0004+00 0/1 0/0 0/0 .rodata @5588 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5588 = 70.0f; -COMPILER_STRIP_GATE(80B67D9C, &lit_5588); +COMPILER_STRIP_GATE(0x80B67D9C, &lit_5588); #pragma pop /* 80B67DA0-80B67DA4 000168 0004+00 0/1 0/0 0/0 .rodata @5589 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5589 = 120.0f; -COMPILER_STRIP_GATE(80B67DA0, &lit_5589); +COMPILER_STRIP_GATE(0x80B67DA0, &lit_5589); #pragma pop /* 80B614D0-80B61708 0026B0 0238+00 1/0 0/0 0/0 .text setCollision__11daNpc_ykW_cFv */ @@ -2419,7 +2440,7 @@ asm void daNpc_ykW_c::selectAction() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpc_ykW_c::chkAction(int (daNpc_ykW_c::*)(void*)) { +asm void daNpc_ykW_c::chkAction(int (daNpc_ykW_c::*param_0)(void*)) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_ykw/d_a_npc_ykw/chkAction__11daNpc_ykW_cFM11daNpc_ykW_cFPCvPvPv_i.s" } @@ -2430,7 +2451,7 @@ asm void daNpc_ykW_c::chkAction(int (daNpc_ykW_c::*)(void*)) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpc_ykW_c::setAction(int (daNpc_ykW_c::*)(void*)) { +asm void daNpc_ykW_c::setAction(int (daNpc_ykW_c::*param_0)(void*)) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_ykw/d_a_npc_ykw/setAction__11daNpc_ykW_cFM11daNpc_ykW_cFPCvPvPv_i.s" } @@ -2441,14 +2462,14 @@ asm void daNpc_ykW_c::setAction(int (daNpc_ykW_c::*)(void*)) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5652 = 0.5f; -COMPILER_STRIP_GATE(80B67DA4, &lit_5652); +COMPILER_STRIP_GATE(0x80B67DA4, &lit_5652); #pragma pop /* 80B67DA8-80B67DAC 000170 0004+00 0/1 0/0 0/0 .rodata @5653 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5653 = -1000.0f; -COMPILER_STRIP_GATE(80B67DA8, &lit_5653); +COMPILER_STRIP_GATE(0x80B67DA8, &lit_5653); #pragma pop /* 80B618FC-80B61A0C 002ADC 0110+00 1/1 0/0 0/0 .text getGoalPos__11daNpc_ykW_cFv */ @@ -2476,14 +2497,14 @@ asm void daNpc_ykW_c::orderGoIntoBossRoomEvt() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5738 = 211.0f; -COMPILER_STRIP_GATE(80B67DAC, &lit_5738); +COMPILER_STRIP_GATE(0x80B67DAC, &lit_5738); #pragma pop /* 80B67DB0-80B67DB4 000178 0004+00 0/1 0/0 0/0 .rodata @5739 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5739 = -900.0f; -COMPILER_STRIP_GATE(80B67DB0, &lit_5739); +COMPILER_STRIP_GATE(0x80B67DB0, &lit_5739); #pragma pop /* 80B61AA4-80B61C8C 002C84 01E8+00 2/2 0/0 0/0 .text putUtuwaHeart__11daNpc_ykW_cFP4cXyzffsP4cXyz @@ -2503,7 +2524,16 @@ asm void daNpc_ykW_c::putUtuwaHeart(cXyz* param_0, f32 param_1, f32 param_2, s16 SECTION_RODATA static u8 const lit_5758[8] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, }; -COMPILER_STRIP_GATE(80B67DB4, &lit_5758); +COMPILER_STRIP_GATE(0x80B67DB4, &lit_5758); + +/* 80B67E68-80B67E68 000230 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80B67F1C = "prm"; +SECTION_DEAD static char const* const stringBase_80B67F20 = "timer"; +SECTION_DEAD static char const* const stringBase_80B67F26 = "msgNo"; +SECTION_DEAD static char const* const stringBase_80B67F2C = "send"; +#pragma pop /* 80B61C8C-80B61E74 002E6C 01E8+00 1/0 0/0 0/0 .text cutShowDoor__11daNpc_ykW_cFi */ #pragma push @@ -2520,7 +2550,14 @@ asm void daNpc_ykW_c::cutShowDoor(int param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6160 = 250.0f; -COMPILER_STRIP_GATE(80B67DBC, &lit_6160); +COMPILER_STRIP_GATE(0x80B67DBC, &lit_6160); +#pragma pop + +/* 80B67E68-80B67E68 000230 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80B67F31 = "skip"; +SECTION_DEAD static char const* const stringBase_80B67F36 = "@"; #pragma pop /* 80B61E74-80B62AF8 003054 0C84+00 1/0 0/0 0/0 .text cutGoIntoBossRoom__11daNpc_ykW_cFi @@ -2541,7 +2578,7 @@ asm void daNpc_ykW_c::cutGoIntoBossRoom(int param_0) { SECTION_RODATA static u8 const lit_6174[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B67DC0, &lit_6174); +COMPILER_STRIP_GATE(0x80B67DC0, &lit_6174); #pragma pop /* 80B67DC8-80B67DD0 000190 0008+00 0/1 0/0 0/0 .rodata @6202 */ @@ -2550,7 +2587,7 @@ COMPILER_STRIP_GATE(80B67DC0, &lit_6174); SECTION_RODATA static u8 const lit_6202[8] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, }; -COMPILER_STRIP_GATE(80B67DC8, &lit_6202); +COMPILER_STRIP_GATE(0x80B67DC8, &lit_6202); #pragma pop /* 80B62AF8-80B63894 003CD8 0D9C+00 2/0 0/0 0/0 .text cutLv5DungeonClear__11daNpc_ykW_cFi @@ -2579,140 +2616,140 @@ asm void daNpc_ykW_c::cutFindWolf(int param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6511 = -196.0f; -COMPILER_STRIP_GATE(80B67DD0, &lit_6511); +COMPILER_STRIP_GATE(0x80B67DD0, &lit_6511); #pragma pop /* 80B67DD4-80B67DD8 00019C 0004+00 0/0 0/0 0/0 .rodata @6512 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6512 = -21.0f; -COMPILER_STRIP_GATE(80B67DD4, &lit_6512); +COMPILER_STRIP_GATE(0x80B67DD4, &lit_6512); #pragma pop /* 80B67DD8-80B67DDC 0001A0 0004+00 0/0 0/0 0/0 .rodata @6513 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6513 = -70.0f; -COMPILER_STRIP_GATE(80B67DD8, &lit_6513); +COMPILER_STRIP_GATE(0x80B67DD8, &lit_6513); #pragma pop /* 80B67DDC-80B67DE0 0001A4 0004+00 0/0 0/0 0/0 .rodata @6514 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6514 = -30.0f; -COMPILER_STRIP_GATE(80B67DDC, &lit_6514); +COMPILER_STRIP_GATE(0x80B67DDC, &lit_6514); #pragma pop /* 80B67DE0-80B67DE4 0001A8 0004+00 0/0 0/0 0/0 .rodata @6515 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6515 = 22.0f; -COMPILER_STRIP_GATE(80B67DE0, &lit_6515); +COMPILER_STRIP_GATE(0x80B67DE0, &lit_6515); #pragma pop /* 80B67DE4-80B67DE8 0001AC 0004+00 0/0 0/0 0/0 .rodata @6516 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6516 = 40.0f; -COMPILER_STRIP_GATE(80B67DE4, &lit_6516); +COMPILER_STRIP_GATE(0x80B67DE4, &lit_6516); #pragma pop /* 80B67DE8-80B67DEC 0001B0 0004+00 0/0 0/0 0/0 .rodata @6517 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6517 = 1.5f; -COMPILER_STRIP_GATE(80B67DE8, &lit_6517); +COMPILER_STRIP_GATE(0x80B67DE8, &lit_6517); #pragma pop /* 80B67DEC-80B67DF0 0001B4 0004+00 0/0 0/0 0/0 .rodata @6518 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6518 = -10.0f; -COMPILER_STRIP_GATE(80B67DEC, &lit_6518); +COMPILER_STRIP_GATE(0x80B67DEC, &lit_6518); #pragma pop /* 80B67DF0-80B67DF4 0001B8 0004+00 0/1 0/0 0/0 .rodata @6519 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6519 = 5.0f; -COMPILER_STRIP_GATE(80B67DF0, &lit_6519); +COMPILER_STRIP_GATE(0x80B67DF0, &lit_6519); #pragma pop /* 80B67DF4-80B67DF8 0001BC 0004+00 0/1 0/0 0/0 .rodata @6520 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_6520 = 0x43360B61; -COMPILER_STRIP_GATE(80B67DF4, &lit_6520); +COMPILER_STRIP_GATE(0x80B67DF4, &lit_6520); #pragma pop /* 80B67DF8-80B67DFC 0001C0 0004+00 0/0 0/0 0/0 .rodata @6521 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_6521 = 0x3FE66667; -COMPILER_STRIP_GATE(80B67DF8, &lit_6521); +COMPILER_STRIP_GATE(0x80B67DF8, &lit_6521); #pragma pop /* 80B67DFC-80B67E00 0001C4 0004+00 0/0 0/0 0/0 .rodata @6522 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6522 = 1.0f / 50.0f; -COMPILER_STRIP_GATE(80B67DFC, &lit_6522); +COMPILER_STRIP_GATE(0x80B67DFC, &lit_6522); #pragma pop /* 80B67E00-80B67E04 0001C8 0004+00 0/0 0/0 0/0 .rodata @6523 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6523 = 2.0f / 25.0f; -COMPILER_STRIP_GATE(80B67E00, &lit_6523); +COMPILER_STRIP_GATE(0x80B67E00, &lit_6523); #pragma pop /* 80B67E04-80B67E08 0001CC 0004+00 0/1 0/0 0/0 .rodata @6700 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6700 = -72610.0f; -COMPILER_STRIP_GATE(80B67E04, &lit_6700); +COMPILER_STRIP_GATE(0x80B67E04, &lit_6700); #pragma pop /* 80B67E08-80B67E0C 0001D0 0004+00 0/1 0/0 0/0 .rodata @6701 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6701 = -54260.0f; -COMPILER_STRIP_GATE(80B67E08, &lit_6701); +COMPILER_STRIP_GATE(0x80B67E08, &lit_6701); #pragma pop /* 80B67E0C-80B67E10 0001D4 0004+00 0/1 0/0 0/0 .rodata @6702 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6702 = 56590.0f; -COMPILER_STRIP_GATE(80B67E0C, &lit_6702); +COMPILER_STRIP_GATE(0x80B67E0C, &lit_6702); #pragma pop /* 80B67E10-80B67E14 0001D8 0004+00 0/1 0/0 0/0 .rodata @6703 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6703 = 210.0f; -COMPILER_STRIP_GATE(80B67E10, &lit_6703); +COMPILER_STRIP_GATE(0x80B67E10, &lit_6703); #pragma pop /* 80B67E14-80B67E18 0001DC 0004+00 0/1 0/0 0/0 .rodata @6704 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6704 = 410.0f; -COMPILER_STRIP_GATE(80B67E14, &lit_6704); +COMPILER_STRIP_GATE(0x80B67E14, &lit_6704); #pragma pop /* 80B67E18-80B67E1C 0001E0 0004+00 0/1 0/0 0/0 .rodata @6705 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6705 = 32.0f; -COMPILER_STRIP_GATE(80B67E18, &lit_6705); +COMPILER_STRIP_GATE(0x80B67E18, &lit_6705); #pragma pop /* 80B67E1C-80B67E20 0001E4 0004+00 0/1 0/0 0/0 .rodata @6706 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6706 = 419.0f; -COMPILER_STRIP_GATE(80B67E1C, &lit_6706); +COMPILER_STRIP_GATE(0x80B67E1C, &lit_6706); #pragma pop /* 80B63AA0-80B63EE0 004C80 0440+00 1/0 0/0 0/0 .text cutStartSnowboardRace__11daNpc_ykW_cFi */ @@ -2742,21 +2779,21 @@ asm void daNpc_ykW_c::cutEndSnowboardRace(int param_0) { SECTION_RODATA static u8 const lit_6867[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B67E20, &lit_6867); +COMPILER_STRIP_GATE(0x80B67E20, &lit_6867); #pragma pop /* 80B67E28-80B67E2C 0001F0 0004+00 0/1 0/0 0/0 .rodata @6929 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6929 = 20.0f; -COMPILER_STRIP_GATE(80B67E28, &lit_6929); +COMPILER_STRIP_GATE(0x80B67E28, &lit_6929); #pragma pop /* 80B67E2C-80B67E30 0001F4 0004+00 0/1 0/0 0/0 .rodata @6930 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6930 = 80.0f; -COMPILER_STRIP_GATE(80B67E2C, &lit_6930); +COMPILER_STRIP_GATE(0x80B67E2C, &lit_6930); #pragma pop /* 80B6450C-80B647E4 0056EC 02D8+00 1/0 0/0 0/0 .text cutHug__11daNpc_ykW_cFi */ @@ -2776,7 +2813,7 @@ asm void daNpc_ykW_c::cutHug(int param_0) { SECTION_RODATA static u8 const motionTbl1[8] = { 0x00, 0x00, 0x00, 0x1F, 0x00, 0x00, 0x00, 0x06, }; -COMPILER_STRIP_GATE(80B67E30, &motionTbl1); +COMPILER_STRIP_GATE(0x80B67E30, &motionTbl1); #pragma pop /* 80B67E38-80B67E40 000200 0008+00 0/1 0/0 0/0 .rodata motionTbl2$6949 */ @@ -2785,7 +2822,7 @@ COMPILER_STRIP_GATE(80B67E30, &motionTbl1); SECTION_RODATA static u8 const motionTbl2[8] = { 0x00, 0x00, 0x00, 0x1F, 0x00, 0x00, 0x00, 0x05, }; -COMPILER_STRIP_GATE(80B67E38, &motionTbl2); +COMPILER_STRIP_GATE(0x80B67E38, &motionTbl2); #pragma pop /* 80B647E4-80B6491C 0059C4 0138+00 1/1 0/0 0/0 .text setDialogueMotion__11daNpc_ykW_cFv @@ -2814,7 +2851,13 @@ asm void daNpc_ykW_c::dialogue() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7243 = -40.0f; -COMPILER_STRIP_GATE(80B67E40, &lit_7243); +COMPILER_STRIP_GATE(0x80B67E40, &lit_7243); +#pragma pop + +/* 80B67E68-80B67E68 000230 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80B67F38 = "D_MN11A"; #pragma pop /* 80B649A8-80B65278 005B88 08D0+00 3/0 0/0 0/0 .text wait__11daNpc_ykW_cFPv */ @@ -2854,56 +2897,56 @@ asm void daNpc_ykW_c::walk(void* param_0) { SECTION_RODATA static u8 const lit_7481[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B67E44, &lit_7481); +COMPILER_STRIP_GATE(0x80B67E44, &lit_7481); #pragma pop /* 80B67E4C-80B67E50 000214 0004+00 0/1 0/0 0/0 .rodata @7887 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7887 = 640000.0f; -COMPILER_STRIP_GATE(80B67E4C, &lit_7887); +COMPILER_STRIP_GATE(0x80B67E4C, &lit_7887); #pragma pop /* 80B67E50-80B67E54 000218 0004+00 0/1 0/0 0/0 .rodata @7888 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7888 = 3.0f / 20.0f; -COMPILER_STRIP_GATE(80B67E50, &lit_7888); +COMPILER_STRIP_GATE(0x80B67E50, &lit_7888); #pragma pop /* 80B67E54-80B67E58 00021C 0004+00 0/1 0/0 0/0 .rodata @7889 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7889 = 6.0f; -COMPILER_STRIP_GATE(80B67E54, &lit_7889); +COMPILER_STRIP_GATE(0x80B67E54, &lit_7889); #pragma pop /* 80B67E58-80B67E5C 000220 0004+00 0/1 0/0 0/0 .rodata @7890 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_7890 = 0x3BB40000; -COMPILER_STRIP_GATE(80B67E58, &lit_7890); +COMPILER_STRIP_GATE(0x80B67E58, &lit_7890); #pragma pop /* 80B67E5C-80B67E60 000224 0004+00 0/1 0/0 0/0 .rodata @7891 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7891 = 12.0f; -COMPILER_STRIP_GATE(80B67E5C, &lit_7891); +COMPILER_STRIP_GATE(0x80B67E5C, &lit_7891); #pragma pop /* 80B67E60-80B67E64 000228 0004+00 0/1 0/0 0/0 .rodata @7892 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7892 = -4.0f; -COMPILER_STRIP_GATE(80B67E60, &lit_7892); +COMPILER_STRIP_GATE(0x80B67E60, &lit_7892); #pragma pop /* 80B67E64-80B67E68 00022C 0004+00 0/1 0/0 0/0 .rodata @7893 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7893 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(80B67E64, &lit_7893); +COMPILER_STRIP_GATE(0x80B67E64, &lit_7893); #pragma pop /* 80B6591C-80B6640C 006AFC 0AF0+00 2/0 0/0 0/0 .text race__11daNpc_ykW_cFPv */ @@ -3292,7 +3335,7 @@ void daNpcT_c::changeBtk(int* param_0, int* param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80B678D0(int* param_0) { +extern "C" asm void func_80B678D0(void* _this, int* param_0) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_ykw/d_a_npc_ykw/func_80B678D0.s" } @@ -3302,7 +3345,7 @@ extern "C" asm void func_80B678D0(int* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80B678EC(f32 param_0, f32 param_1) { +extern "C" asm void func_80B678EC(void* _this, f32 param_0, f32 param_1) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_ykw/d_a_npc_ykw/func_80B678EC.s" } @@ -3328,7 +3371,7 @@ asm void __sinit_d_a_npc_ykw_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80B67928 = (void*)__sinit_d_a_npc_ykw_cpp; +REGISTER_CTORS(0x80B67928, __sinit_d_a_npc_ykw_cpp); #pragma pop /* 80B67A3C-80B67B1C 008C1C 00E0+00 1/1 0/0 0/0 .text @@ -3612,31 +3655,4 @@ static u8 data_80B68E30[4]; static u8 data_80B68E34[4]; #pragma pop -/* 80B67E68-80B67F40 000230 00D8+00 12/9 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80B67E68 = ""; -SECTION_DEAD static char const* const stringBase_80B67E69 = "DEFAULT_GETITEM"; -SECTION_DEAD static char const* const stringBase_80B67E79 = "NO_RESPONSE"; -SECTION_DEAD static char const* const stringBase_80B67E85 = "SHOW_DOOR"; -SECTION_DEAD static char const* const stringBase_80B67E8F = "GO_INTO_BOSSROOM1"; -SECTION_DEAD static char const* const stringBase_80B67EA1 = "GO_INTO_BOSSROOM2"; -SECTION_DEAD static char const* const stringBase_80B67EB3 = "LV5DUNGEON_CLEAR"; -SECTION_DEAD static char const* const stringBase_80B67EC4 = "FIND_WOLF"; -SECTION_DEAD static char const* const stringBase_80B67ECE = "START_SNOWBOARDRACE"; -SECTION_DEAD static char const* const stringBase_80B67EE2 = "END_SNOWBOARDRACE"; -SECTION_DEAD static char const* const stringBase_80B67EF4 = "ykW"; -SECTION_DEAD static char const* const stringBase_80B67EF8 = "ykW1"; -SECTION_DEAD static char const* const stringBase_80B67EFD = "ykW2"; -SECTION_DEAD static char const* const stringBase_80B67F02 = "ykM2"; -SECTION_DEAD static char const* const stringBase_80B67F07 = "GO_INTO_BOSSROOM"; -SECTION_DEAD static char const* const stringBase_80B67F18 = "HUG"; -SECTION_DEAD static char const* const stringBase_80B67F1C = "prm"; -SECTION_DEAD static char const* const stringBase_80B67F20 = "timer"; -SECTION_DEAD static char const* const stringBase_80B67F26 = "msgNo"; -SECTION_DEAD static char const* const stringBase_80B67F2C = "send"; -SECTION_DEAD static char const* const stringBase_80B67F31 = "skip"; -SECTION_DEAD static char const* const stringBase_80B67F36 = "@"; -SECTION_DEAD static char const* const stringBase_80B67F38 = "D_MN11A"; -#pragma pop +/* 80B67E68-80B67E68 000230 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/npc/d_a_npc_zanb/d_a_npc_zanb.cpp b/rel/d/a/npc/d_a_npc_zanb/d_a_npc_zanb.cpp index 7139f5a4647..1d10f8fc29b 100644 --- a/rel/d/a/npc/d_a_npc_zanb/d_a_npc_zanb.cpp +++ b/rel/d/a/npc/d_a_npc_zanb/d_a_npc_zanb.cpp @@ -15,12 +15,14 @@ struct mDoMtx_stack_c { static u8 now[48]; }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; +struct J3DAnmTransform {}; + +struct J3DModelData {}; + struct Vec {}; struct Z2Creature { @@ -29,8 +31,6 @@ struct Z2Creature { /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -44,6 +44,8 @@ struct fopAc_ac_c { /* 80018C8C */ ~fopAc_ac_c(); }; +struct daNpcT_faceMotionAnmData_c {}; + struct daNpcT_MotionSeqMngr_c { struct sequenceStepData_c {}; @@ -51,14 +53,12 @@ struct daNpcT_MotionSeqMngr_c { /* 80B6B4B0 */ ~daNpcT_MotionSeqMngr_c(); }; +struct daNpcT_evtData_c {}; + struct daNpcT_motionAnmData_c {}; struct J3DJoint {}; -struct daNpcT_faceMotionAnmData_c {}; - -struct daNpcT_evtData_c {}; - struct daNpc_zanB_c { /* 80B68F2C */ ~daNpc_zanB_c(); /* 80B6904C */ void create(); @@ -115,6 +115,13 @@ struct dCcD_GObjInf { /* 800840E4 */ ~dCcD_GObjInf(); }; +struct csXyz { + /* 80B6AF24 */ ~csXyz(); + /* 80B6B364 */ csXyz(); +}; + +struct _GXColorS10 {}; + struct J3DModel {}; struct cXyz { @@ -124,13 +131,6 @@ struct cXyz { /* 80B6B464 */ cXyz(); }; -struct _GXColorS10 {}; - -struct csXyz { - /* 80B6AF24 */ ~csXyz(); - /* 80B6B364 */ csXyz(); -}; - struct daNpcT_c { /* 80147FA4 */ void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*); /* 801483F8 */ void loadRes(s8 const*, char const**); @@ -609,6 +609,14 @@ extern "C" void __register_global_object(); // /* ############################################################################################## */ +/* 80B6BDBC-80B6BDBC 0000F8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80B6BDBC = ""; +SECTION_DEAD static char const* const stringBase_80B6BDBD = "NO_RESPONSE"; +SECTION_DEAD static char const* const stringBase_80B6BDC9 = "zanB"; +#pragma pop + /* 80B6BDD0-80B6BDDC 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -916,7 +924,7 @@ SECTION_RODATA u8 const daNpc_zanB_Param_c::m[140] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B6BCC4, &daNpc_zanB_Param_c::m); +COMPILER_STRIP_GATE(0x80B6BCC4, &daNpc_zanB_Param_c::m); /* 80B6BD50-80B6BD58 00008C 0008+00 0/1 0/0 0/0 .rodata heapSize$3959 */ #pragma push @@ -924,42 +932,42 @@ COMPILER_STRIP_GATE(80B6BCC4, &daNpc_zanB_Param_c::m); SECTION_RODATA static u8 const heapSize[8] = { 0x00, 0x00, 0x6E, 0x80, 0x00, 0x00, 0x6E, 0x80, }; -COMPILER_STRIP_GATE(80B6BD50, &heapSize); +COMPILER_STRIP_GATE(0x80B6BD50, &heapSize); #pragma pop /* 80B6BD58-80B6BD5C 000094 0004+00 0/1 0/0 0/0 .rodata @4032 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4032 = -200.0f; -COMPILER_STRIP_GATE(80B6BD58, &lit_4032); +COMPILER_STRIP_GATE(0x80B6BD58, &lit_4032); #pragma pop /* 80B6BD5C-80B6BD60 000098 0004+00 0/1 0/0 0/0 .rodata @4033 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4033 = -100.0f; -COMPILER_STRIP_GATE(80B6BD5C, &lit_4033); +COMPILER_STRIP_GATE(0x80B6BD5C, &lit_4033); #pragma pop /* 80B6BD60-80B6BD64 00009C 0004+00 0/2 0/0 0/0 .rodata @4034 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4034 = 200.0f; -COMPILER_STRIP_GATE(80B6BD60, &lit_4034); +COMPILER_STRIP_GATE(0x80B6BD60, &lit_4034); #pragma pop /* 80B6BD64-80B6BD68 0000A0 0004+00 0/1 0/0 0/0 .rodata @4035 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4035 = 300.0f; -COMPILER_STRIP_GATE(80B6BD64, &lit_4035); +COMPILER_STRIP_GATE(0x80B6BD64, &lit_4035); #pragma pop /* 80B6BD68-80B6BD6C 0000A4 0004+00 0/1 0/0 0/0 .rodata @4036 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4036 = -1000000000.0f; -COMPILER_STRIP_GATE(80B6BD68, &lit_4036); +COMPILER_STRIP_GATE(0x80B6BD68, &lit_4036); #pragma pop /* 80B6904C-80B69330 00020C 02E4+00 1/1 0/0 0/0 .text create__12daNpc_zanB_cFv */ @@ -980,25 +988,25 @@ SECTION_RODATA static u8 const lit_4190[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B6BD6C, &lit_4190); +COMPILER_STRIP_GATE(0x80B6BD6C, &lit_4190); /* 80B6BD70-80B6BD74 0000AC 0004+00 0/2 0/0 0/0 .rodata @4191 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4191 = 65536.0f; -COMPILER_STRIP_GATE(80B6BD70, &lit_4191); +COMPILER_STRIP_GATE(0x80B6BD70, &lit_4191); #pragma pop /* 80B6BD74-80B6BD78 0000B0 0004+00 0/3 0/0 0/0 .rodata @4192 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4192 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(80B6BD74, &lit_4192); +COMPILER_STRIP_GATE(0x80B6BD74, &lit_4192); #pragma pop /* 80B6BD78-80B6BD7C 0000B4 0004+00 2/4 0/0 0/0 .rodata @4336 */ SECTION_RODATA static f32 const lit_4336 = 1.0f; -COMPILER_STRIP_GATE(80B6BD78, &lit_4336); +COMPILER_STRIP_GATE(0x80B6BD78, &lit_4336); /* 80B69330-80B695A0 0004F0 0270+00 1/1 0/0 0/0 .text CreateHeap__12daNpc_zanB_cFv */ #pragma push @@ -1220,7 +1228,7 @@ asm void daNpc_zanB_c::setParam() { /* ############################################################################################## */ /* 80B6BD7C-80B6BD80 0000B8 0004+00 2/2 0/0 0/0 .rodata @4529 */ SECTION_RODATA static f32 const lit_4529 = -1.0f; -COMPILER_STRIP_GATE(80B6BD7C, &lit_4529); +COMPILER_STRIP_GATE(0x80B6BD7C, &lit_4529); /* 80B69CA8-80B69D08 000E68 0060+00 1/0 0/0 0/0 .text setAfterTalkMotion__12daNpc_zanB_cFv */ #pragma push @@ -1282,42 +1290,42 @@ asm void daNpc_zanB_c::beforeMove() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4653 = 20.0f; -COMPILER_STRIP_GATE(80B6BD80, &lit_4653); +COMPILER_STRIP_GATE(0x80B6BD80, &lit_4653); #pragma pop /* 80B6BD84-80B6BD88 0000C0 0004+00 0/1 0/0 0/0 .rodata @4654 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4654 = 30.0f; -COMPILER_STRIP_GATE(80B6BD84, &lit_4654); +COMPILER_STRIP_GATE(0x80B6BD84, &lit_4654); #pragma pop /* 80B6BD88-80B6BD8C 0000C4 0004+00 0/1 0/0 0/0 .rodata @4655 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4655 = 0x38C90FDB; -COMPILER_STRIP_GATE(80B6BD88, &lit_4655); +COMPILER_STRIP_GATE(0x80B6BD88, &lit_4655); #pragma pop /* 80B6BD8C-80B6BD90 0000C8 0004+00 0/1 0/0 0/0 .rodata @4656 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4656 = 220.0f; -COMPILER_STRIP_GATE(80B6BD8C, &lit_4656); +COMPILER_STRIP_GATE(0x80B6BD8C, &lit_4656); #pragma pop /* 80B6BD90-80B6BD94 0000CC 0004+00 0/1 0/0 0/0 .rodata @4657 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4657 = -40.0f; -COMPILER_STRIP_GATE(80B6BD90, &lit_4657); +COMPILER_STRIP_GATE(0x80B6BD90, &lit_4657); #pragma pop /* 80B6BD94-80B6BD9C 0000D0 0008+00 1/3 0/0 0/0 .rodata @4659 */ SECTION_RODATA static u8 const lit_4659[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B6BD94, &lit_4659); +COMPILER_STRIP_GATE(0x80B6BD94, &lit_4659); /* 80B69FD8-80B6A268 001198 0290+00 1/0 0/0 0/0 .text setAttnPos__12daNpc_zanB_cFv */ #pragma push @@ -1336,7 +1344,7 @@ asm void daNpc_zanB_c::setAttnPos() { SECTION_RODATA static u8 const lit_4717[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B6BD9C, &lit_4717); +COMPILER_STRIP_GATE(0x80B6BD9C, &lit_4717); #pragma pop /* 80B6BDA4-80B6BDAC 0000E0 0008+00 0/1 0/0 0/0 .rodata @4718 */ @@ -1345,7 +1353,7 @@ COMPILER_STRIP_GATE(80B6BD9C, &lit_4717); SECTION_RODATA static u8 const lit_4718[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B6BDA4, &lit_4718); +COMPILER_STRIP_GATE(0x80B6BDA4, &lit_4718); #pragma pop /* 80B6BDAC-80B6BDB4 0000E8 0008+00 0/1 0/0 0/0 .rodata @4719 */ @@ -1354,21 +1362,21 @@ COMPILER_STRIP_GATE(80B6BDA4, &lit_4718); SECTION_RODATA static u8 const lit_4719[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B6BDAC, &lit_4719); +COMPILER_STRIP_GATE(0x80B6BDAC, &lit_4719); #pragma pop /* 80B6BDB4-80B6BDB8 0000F0 0004+00 0/1 0/0 0/0 .rodata @4763 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4763 = -20.0f; -COMPILER_STRIP_GATE(80B6BDB4, &lit_4763); +COMPILER_STRIP_GATE(0x80B6BDB4, &lit_4763); #pragma pop /* 80B6BDB8-80B6BDBC 0000F4 0004+00 0/1 0/0 0/0 .rodata @4764 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4764 = 60.0f; -COMPILER_STRIP_GATE(80B6BDB8, &lit_4764); +COMPILER_STRIP_GATE(0x80B6BDB8, &lit_4764); #pragma pop /* 80B6A268-80B6A408 001428 01A0+00 1/0 0/0 0/0 .text setCollision__12daNpc_zanB_cFv */ @@ -1411,7 +1419,7 @@ asm void daNpc_zanB_c::selectAction() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpc_zanB_c::chkAction(int (daNpc_zanB_c::*)(void*)) { +asm void daNpc_zanB_c::chkAction(int (daNpc_zanB_c::*param_0)(void*)) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_zanb/d_a_npc_zanb/chkAction__12daNpc_zanB_cFM12daNpc_zanB_cFPCvPvPv_i.s" } @@ -1422,7 +1430,7 @@ asm void daNpc_zanB_c::chkAction(int (daNpc_zanB_c::*)(void*)) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpc_zanB_c::setAction(int (daNpc_zanB_c::*)(void*)) { +asm void daNpc_zanB_c::setAction(int (daNpc_zanB_c::*param_0)(void*)) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_zanb/d_a_npc_zanb/setAction__12daNpc_zanB_cFM12daNpc_zanB_cFPCvPvPv_i.s" } @@ -1796,7 +1804,7 @@ asm void __sinit_d_a_npc_zanb_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80B6BA74 = (void*)__sinit_d_a_npc_zanb_cpp; +REGISTER_CTORS(0x80B6BA74, __sinit_d_a_npc_zanb_cpp); #pragma pop /* 80B6BADC-80B6BB88 002C9C 00AC+00 1/1 0/0 0/0 .text @@ -1908,11 +1916,4 @@ static asm void func_80B6BCA8() { } #pragma pop -/* 80B6BDBC-80B6BDCE 0000F8 0012+00 4/1 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80B6BDBC = ""; -SECTION_DEAD static char const* const stringBase_80B6BDBD = "NO_RESPONSE"; -SECTION_DEAD static char const* const stringBase_80B6BDC9 = "zanB"; -#pragma pop +/* 80B6BDBC-80B6BDBC 0000F8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/npc/d_a_npc_zant/d_a_npc_zant.cpp b/rel/d/a/npc/d_a_npc_zant/d_a_npc_zant.cpp index 72bc46d0f86..3f0565e7241 100644 --- a/rel/d/a/npc/d_a_npc_zant/d_a_npc_zant.cpp +++ b/rel/d/a/npc/d_a_npc_zant/d_a_npc_zant.cpp @@ -11,12 +11,14 @@ // Types: // -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; +struct J3DAnmTransform {}; + +struct J3DModelData {}; + struct Vec {}; struct Z2Creature { @@ -25,8 +27,6 @@ struct Z2Creature { /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -40,6 +40,8 @@ struct fopAc_ac_c { /* 80018C8C */ ~fopAc_ac_c(); }; +struct daNpcT_faceMotionAnmData_c {}; + struct daNpcT_MotionSeqMngr_c { struct sequenceStepData_c {}; @@ -47,14 +49,12 @@ struct daNpcT_MotionSeqMngr_c { /* 80B6E19C */ ~daNpcT_MotionSeqMngr_c(); }; +struct daNpcT_evtData_c {}; + struct daNpcT_motionAnmData_c {}; struct J3DJoint {}; -struct daNpcT_faceMotionAnmData_c {}; - -struct daNpcT_evtData_c {}; - struct daNpc_Zant_c { /* 80B6C1AC */ ~daNpc_Zant_c(); /* 80B6C2D0 */ void create(); @@ -105,6 +105,8 @@ struct dCcD_GObjInf { /* 800840E4 */ ~dCcD_GObjInf(); }; +struct _GXColorS10 {}; + struct J3DModel {}; struct cXyz { @@ -113,8 +115,6 @@ struct cXyz { /* 80B6E150 */ cXyz(); }; -struct _GXColorS10 {}; - struct daNpcT_c { /* 80147FA4 */ void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*); /* 801483F8 */ void loadRes(s8 const*, char const**); @@ -270,13 +270,13 @@ struct dBgS_AcchCir { /* 80B6E1E4 */ ~dBgS_AcchCir(); }; -struct dBgS {}; - struct csXyz { /* 80B6DC10 */ ~csXyz(); /* 80B6E050 */ csXyz(); }; +struct dBgS {}; + struct dBgS_Acch { /* 80075F94 */ ~dBgS_Acch(); /* 800760A0 */ dBgS_Acch(); @@ -546,6 +546,14 @@ extern "C" void __register_global_object(); // /* ############################################################################################## */ +/* 80B6EA80-80B6EA80 0000D8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80B6EA80 = ""; +SECTION_DEAD static char const* const stringBase_80B6EA81 = "NO_RESPONSE"; +SECTION_DEAD static char const* const stringBase_80B6EA8D = "Zant"; +#pragma pop + /* 80B6EA94-80B6EAA0 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -836,41 +844,41 @@ SECTION_RODATA u8 const daNpc_Zant_Param_c::m[140] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B6E9A8, &daNpc_Zant_Param_c::m); +COMPILER_STRIP_GATE(0x80B6E9A8, &daNpc_Zant_Param_c::m); /* 80B6EA34-80B6EA38 00008C 0004+00 0/1 0/0 0/0 .rodata @4018 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4018 = -300.0f; -COMPILER_STRIP_GATE(80B6EA34, &lit_4018); +COMPILER_STRIP_GATE(0x80B6EA34, &lit_4018); #pragma pop /* 80B6EA38-80B6EA3C 000090 0004+00 0/1 0/0 0/0 .rodata @4019 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4019 = -50.0f; -COMPILER_STRIP_GATE(80B6EA38, &lit_4019); +COMPILER_STRIP_GATE(0x80B6EA38, &lit_4019); #pragma pop /* 80B6EA3C-80B6EA40 000094 0004+00 0/1 0/0 0/0 .rodata @4020 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4020 = 300.0f; -COMPILER_STRIP_GATE(80B6EA3C, &lit_4020); +COMPILER_STRIP_GATE(0x80B6EA3C, &lit_4020); #pragma pop /* 80B6EA40-80B6EA44 000098 0004+00 0/1 0/0 0/0 .rodata @4021 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4021 = 450.0f; -COMPILER_STRIP_GATE(80B6EA40, &lit_4021); +COMPILER_STRIP_GATE(0x80B6EA40, &lit_4021); #pragma pop /* 80B6EA44-80B6EA48 00009C 0004+00 0/1 0/0 0/0 .rodata @4022 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4022 = -1000000000.0f; -COMPILER_STRIP_GATE(80B6EA44, &lit_4022); +COMPILER_STRIP_GATE(0x80B6EA44, &lit_4022); #pragma pop /* 80B6C2D0-80B6C574 000210 02A4+00 1/1 0/0 0/0 .text create__12daNpc_Zant_cFv */ @@ -891,25 +899,25 @@ SECTION_RODATA static u8 const lit_4176[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B6EA48, &lit_4176); +COMPILER_STRIP_GATE(0x80B6EA48, &lit_4176); /* 80B6EA4C-80B6EA50 0000A4 0004+00 0/2 0/0 0/0 .rodata @4177 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4177 = 65536.0f; -COMPILER_STRIP_GATE(80B6EA4C, &lit_4177); +COMPILER_STRIP_GATE(0x80B6EA4C, &lit_4177); #pragma pop /* 80B6EA50-80B6EA54 0000A8 0004+00 0/3 0/0 0/0 .rodata @4178 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4178 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(80B6EA50, &lit_4178); +COMPILER_STRIP_GATE(0x80B6EA50, &lit_4178); #pragma pop /* 80B6EA54-80B6EA58 0000AC 0004+00 2/4 0/0 0/0 .rodata @4313 */ SECTION_RODATA static f32 const lit_4313 = 1.0f; -COMPILER_STRIP_GATE(80B6EA54, &lit_4313); +COMPILER_STRIP_GATE(0x80B6EA54, &lit_4313); /* 80B6C574-80B6C700 0004B4 018C+00 1/1 0/0 0/0 .text CreateHeap__12daNpc_Zant_cFv */ #pragma push @@ -1031,7 +1039,7 @@ asm void daNpc_Zant_c::setParam() { /* ############################################################################################## */ /* 80B6EA58-80B6EA5C 0000B0 0004+00 2/2 0/0 0/0 .rodata @4447 */ SECTION_RODATA static f32 const lit_4447 = -1.0f; -COMPILER_STRIP_GATE(80B6EA58, &lit_4447); +COMPILER_STRIP_GATE(0x80B6EA58, &lit_4447); /* 80B6CAF0-80B6CB50 000A30 0060+00 1/0 0/0 0/0 .text setAfterTalkMotion__12daNpc_Zant_cFv */ #pragma push @@ -1093,14 +1101,14 @@ asm void daNpc_Zant_c::beforeMove() { #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4559 = 0x38C90FDB; -COMPILER_STRIP_GATE(80B6EA5C, &lit_4559); +COMPILER_STRIP_GATE(0x80B6EA5C, &lit_4559); #pragma pop /* 80B6EA60-80B6EA68 0000B8 0008+00 1/3 0/0 0/0 .rodata @4561 */ SECTION_RODATA static u8 const lit_4561[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B6EA60, &lit_4561); +COMPILER_STRIP_GATE(0x80B6EA60, &lit_4561); /* 80B6CE80-80B6D074 000DC0 01F4+00 1/0 0/0 0/0 .text setAttnPos__12daNpc_Zant_cFv */ #pragma push @@ -1152,7 +1160,7 @@ asm void daNpc_Zant_c::selectAction() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpc_Zant_c::chkAction(int (daNpc_Zant_c::*)(void*)) { +asm void daNpc_Zant_c::chkAction(int (daNpc_Zant_c::*param_0)(void*)) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_zant/d_a_npc_zant/chkAction__12daNpc_Zant_cFM12daNpc_Zant_cFPCvPvPv_i.s" } @@ -1163,7 +1171,7 @@ asm void daNpc_Zant_c::chkAction(int (daNpc_Zant_c::*)(void*)) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpc_Zant_c::setAction(int (daNpc_Zant_c::*)(void*)) { +asm void daNpc_Zant_c::setAction(int (daNpc_Zant_c::*param_0)(void*)) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_zant/d_a_npc_zant/setAction__12daNpc_Zant_cFM12daNpc_Zant_cFPCvPvPv_i.s" } @@ -1394,7 +1402,7 @@ asm void daNpcT_JntAnm_c::setEyeAngleY(cXyz param_0, s16 param_1, int param_2, f SECTION_RODATA static u8 const lit_4619[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B6EA68, &lit_4619); +COMPILER_STRIP_GATE(0x80B6EA68, &lit_4619); #pragma pop /* 80B6EA70-80B6EA78 0000C8 0008+00 0/1 0/0 0/0 .rodata @4620 */ @@ -1403,7 +1411,7 @@ COMPILER_STRIP_GATE(80B6EA68, &lit_4619); SECTION_RODATA static u8 const lit_4620[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B6EA70, &lit_4620); +COMPILER_STRIP_GATE(0x80B6EA70, &lit_4620); #pragma pop /* 80B6EA78-80B6EA80 0000D0 0008+00 0/1 0/0 0/0 .rodata @4621 */ @@ -1412,7 +1420,7 @@ COMPILER_STRIP_GATE(80B6EA70, &lit_4620); SECTION_RODATA static u8 const lit_4621[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B6EA78, &lit_4621); +COMPILER_STRIP_GATE(0x80B6EA78, &lit_4621); #pragma pop /* 80B6E48C-80B6E694 0023CC 0208+00 1/1 0/0 0/0 .text setEyeAngleX__15daNpcT_JntAnm_cF4cXyzfs */ @@ -1591,7 +1599,7 @@ asm void __sinit_d_a_npc_zant_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80B6E798 = (void*)__sinit_d_a_npc_zant_cpp; +REGISTER_CTORS(0x80B6E798, __sinit_d_a_npc_zant_cpp); #pragma pop /* 80B6E800-80B6E8AC 002740 00AC+00 1/1 0/0 0/0 .text @@ -1661,11 +1669,4 @@ static asm void func_80B6E98C() { } #pragma pop -/* 80B6EA80-80B6EA92 0000D8 0012+00 4/1 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80B6EA80 = ""; -SECTION_DEAD static char const* const stringBase_80B6EA81 = "NO_RESPONSE"; -SECTION_DEAD static char const* const stringBase_80B6EA8D = "Zant"; -#pragma pop +/* 80B6EA80-80B6EA80 0000D8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/npc/d_a_npc_zelR/d_a_npc_zelR.cpp b/rel/d/a/npc/d_a_npc_zelR/d_a_npc_zelR.cpp index 7dac2d17151..39cb4eb9879 100644 --- a/rel/d/a/npc/d_a_npc_zelR/d_a_npc_zelR.cpp +++ b/rel/d/a/npc/d_a_npc_zelR/d_a_npc_zelR.cpp @@ -15,12 +15,14 @@ struct mDoMtx_stack_c { static u8 now[48]; }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; +struct J3DAnmTransform {}; + +struct J3DModelData {}; + struct Vec {}; struct Z2Creature { @@ -29,8 +31,6 @@ struct Z2Creature { /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -43,6 +43,8 @@ struct fopAc_ac_c { /* 80018C8C */ ~fopAc_ac_c(); }; +struct daNpcT_faceMotionAnmData_c {}; + struct daNpcT_MotionSeqMngr_c { struct sequenceStepData_c {}; @@ -50,14 +52,12 @@ struct daNpcT_MotionSeqMngr_c { /* 80B7133C */ ~daNpcT_MotionSeqMngr_c(); }; +struct daNpcT_evtData_c {}; + struct daNpcT_motionAnmData_c {}; struct J3DJoint {}; -struct daNpcT_faceMotionAnmData_c {}; - -struct daNpcT_evtData_c {}; - struct daNpc_ZelR_c { /* 80B6EE2C */ ~daNpc_ZelR_c(); /* 80B6EF64 */ void create(); @@ -115,6 +115,8 @@ struct dCcD_GObjInf { /* 800840E4 */ ~dCcD_GObjInf(); }; +struct _GXColorS10 {}; + struct J3DModel {}; struct cXyz { @@ -123,8 +125,6 @@ struct cXyz { /* 80B712F0 */ cXyz(); }; -struct _GXColorS10 {}; - struct daNpcT_c { /* 80147FA4 */ void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*); /* 801483F8 */ void loadRes(s8 const*, char const**); @@ -274,13 +274,13 @@ struct dBgS_AcchCir { /* 80B71384 */ ~dBgS_AcchCir(); }; -struct dBgS {}; - struct csXyz { /* 80B70CD8 */ ~csXyz(); /* 80B711F0 */ csXyz(); }; +struct dBgS {}; + struct dBgS_Acch { /* 80075F94 */ ~dBgS_Acch(); /* 800760A0 */ dBgS_Acch(); @@ -611,6 +611,14 @@ extern "C" void __register_global_object(); // /* ############################################################################################## */ +/* 80B71BC0-80B71BC0 0000E0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80B71BC0 = ""; +SECTION_DEAD static char const* const stringBase_80B71BC1 = "NO_RESPONSE"; +SECTION_DEAD static char const* const stringBase_80B71BCD = "zelRf"; +#pragma pop + /* 80B71BD8-80B71BE4 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -918,34 +926,34 @@ SECTION_RODATA u8 const daNpc_ZelR_Param_c::m[140] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B71AE0, &daNpc_ZelR_Param_c::m); +COMPILER_STRIP_GATE(0x80B71AE0, &daNpc_ZelR_Param_c::m); /* 80B71B6C-80B71B70 00008C 0004+00 0/1 0/0 0/0 .rodata @4018 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4018 = -300.0f; -COMPILER_STRIP_GATE(80B71B6C, &lit_4018); +COMPILER_STRIP_GATE(0x80B71B6C, &lit_4018); #pragma pop /* 80B71B70-80B71B74 000090 0004+00 0/1 0/0 0/0 .rodata @4019 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4019 = -50.0f; -COMPILER_STRIP_GATE(80B71B70, &lit_4019); +COMPILER_STRIP_GATE(0x80B71B70, &lit_4019); #pragma pop /* 80B71B74-80B71B78 000094 0004+00 0/1 0/0 0/0 .rodata @4020 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4020 = 300.0f; -COMPILER_STRIP_GATE(80B71B74, &lit_4020); +COMPILER_STRIP_GATE(0x80B71B74, &lit_4020); #pragma pop /* 80B71B78-80B71B7C 000098 0004+00 0/1 0/0 0/0 .rodata @4021 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4021 = 450.0f; -COMPILER_STRIP_GATE(80B71B78, &lit_4021); +COMPILER_STRIP_GATE(0x80B71B78, &lit_4021); #pragma pop /* 80B6EF64-80B6F1F8 000224 0294+00 1/1 0/0 0/0 .text create__12daNpc_ZelR_cFv */ @@ -966,22 +974,22 @@ SECTION_RODATA static u8 const lit_4182[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B71B7C, &lit_4182); +COMPILER_STRIP_GATE(0x80B71B7C, &lit_4182); /* 80B71B80-80B71B84 0000A0 0004+00 0/2 0/0 0/0 .rodata @4183 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4183 = 65536.0f; -COMPILER_STRIP_GATE(80B71B80, &lit_4183); +COMPILER_STRIP_GATE(0x80B71B80, &lit_4183); #pragma pop /* 80B71B84-80B71B88 0000A4 0004+00 1/4 0/0 0/0 .rodata @4184 */ SECTION_RODATA static f32 const lit_4184 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(80B71B84, &lit_4184); +COMPILER_STRIP_GATE(0x80B71B84, &lit_4184); /* 80B71B88-80B71B8C 0000A8 0004+00 2/4 0/0 0/0 .rodata @4339 */ SECTION_RODATA static f32 const lit_4339 = 1.0f; -COMPILER_STRIP_GATE(80B71B88, &lit_4339); +COMPILER_STRIP_GATE(0x80B71B88, &lit_4339); /* 80B6F1F8-80B6F4A8 0004B8 02B0+00 1/1 0/0 0/0 .text CreateHeap__12daNpc_ZelR_cFv */ #pragma push @@ -1116,7 +1124,7 @@ asm void daNpc_ZelR_c::Execute() { /* ############################################################################################## */ /* 80B71B8C-80B71B90 0000AC 0004+00 1/1 0/0 0/0 .rodata @4399 */ SECTION_RODATA static f32 const lit_4399 = 100.0f; -COMPILER_STRIP_GATE(80B71B8C, &lit_4399); +COMPILER_STRIP_GATE(0x80B71B8C, &lit_4399); /* 80B6F6B8-80B6F77C 000978 00C4+00 1/1 0/0 0/0 .text Draw__12daNpc_ZelR_cFv */ #pragma push @@ -1213,7 +1221,7 @@ asm void daNpc_ZelR_c::afterJntAnm(int param_0) { /* ############################################################################################## */ /* 80B71B90-80B71B94 0000B0 0004+00 3/3 0/0 0/0 .rodata @4557 */ SECTION_RODATA static f32 const lit_4557 = -1.0f; -COMPILER_STRIP_GATE(80B71B90, &lit_4557); +COMPILER_STRIP_GATE(0x80B71B90, &lit_4557); /* 80B6FA9C-80B6FBA8 000D5C 010C+00 1/0 0/0 0/0 .text ctrlBtk__12daNpc_ZelR_cFv */ #pragma push @@ -1260,6 +1268,13 @@ asm void daNpc_ZelR_c::evtTalk() { } #pragma pop +/* ############################################################################################## */ +/* 80B71BC0-80B71BC0 0000E0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80B71BD3 = "ZelR"; +#pragma pop + /* 80B6FE00-80B6FEC8 0010C0 00C8+00 1/0 0/0 0/0 .text evtCutProc__12daNpc_ZelR_cFv */ #pragma push #pragma optimization_level 0 @@ -1295,28 +1310,28 @@ asm void daNpc_ZelR_c::beforeMove() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4728 = 10.0f; -COMPILER_STRIP_GATE(80B71B94, &lit_4728); +COMPILER_STRIP_GATE(0x80B71B94, &lit_4728); #pragma pop /* 80B71B98-80B71B9C 0000B8 0004+00 0/1 0/0 0/0 .rodata @4729 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4729 = -30.0f; -COMPILER_STRIP_GATE(80B71B98, &lit_4729); +COMPILER_STRIP_GATE(0x80B71B98, &lit_4729); #pragma pop /* 80B71B9C-80B71BA0 0000BC 0004+00 0/1 0/0 0/0 .rodata @4730 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4730 = 0x38C90FDB; -COMPILER_STRIP_GATE(80B71B9C, &lit_4730); +COMPILER_STRIP_GATE(0x80B71B9C, &lit_4730); #pragma pop /* 80B71BA0-80B71BA8 0000C0 0008+00 1/3 0/0 0/0 .rodata @4732 */ SECTION_RODATA static u8 const lit_4732[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B71BA0, &lit_4732); +COMPILER_STRIP_GATE(0x80B71BA0, &lit_4732); /* 80B70090-80B702B0 001350 0220+00 1/0 0/0 0/0 .text setAttnPos__12daNpc_ZelR_cFv */ #pragma push @@ -1358,7 +1373,7 @@ asm void daNpc_ZelR_c::selectAction() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpc_ZelR_c::chkAction(int (daNpc_ZelR_c::*)(void*)) { +asm void daNpc_ZelR_c::chkAction(int (daNpc_ZelR_c::*param_0)(void*)) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_zelR/d_a_npc_zelR/chkAction__12daNpc_ZelR_cFM12daNpc_ZelR_cFPCvPvPv_i.s" } @@ -1369,7 +1384,7 @@ asm void daNpc_ZelR_c::chkAction(int (daNpc_ZelR_c::*)(void*)) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpc_ZelR_c::setAction(int (daNpc_ZelR_c::*)(void*)) { +asm void daNpc_ZelR_c::setAction(int (daNpc_ZelR_c::*param_0)(void*)) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_zelR/d_a_npc_zelR/setAction__12daNpc_ZelR_cFM12daNpc_ZelR_cFPCvPvPv_i.s" } @@ -1634,7 +1649,7 @@ asm void daNpcT_JntAnm_c::setEyeAngleY(cXyz param_0, s16 param_1, int param_2, f SECTION_RODATA static u8 const lit_4790[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B71BA8, &lit_4790); +COMPILER_STRIP_GATE(0x80B71BA8, &lit_4790); #pragma pop /* 80B71BB0-80B71BB8 0000D0 0008+00 0/1 0/0 0/0 .rodata @4791 */ @@ -1643,7 +1658,7 @@ COMPILER_STRIP_GATE(80B71BA8, &lit_4790); SECTION_RODATA static u8 const lit_4791[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B71BB0, &lit_4791); +COMPILER_STRIP_GATE(0x80B71BB0, &lit_4791); #pragma pop /* 80B71BB8-80B71BC0 0000D8 0008+00 0/1 0/0 0/0 .rodata @4792 */ @@ -1652,7 +1667,7 @@ COMPILER_STRIP_GATE(80B71BB0, &lit_4791); SECTION_RODATA static u8 const lit_4792[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B71BB8, &lit_4792); +COMPILER_STRIP_GATE(0x80B71BB8, &lit_4792); #pragma pop /* 80B71624-80B7182C 0028E4 0208+00 1/1 0/0 0/0 .text setEyeAngleX__15daNpcT_JntAnm_cF4cXyzfs */ @@ -1810,7 +1825,7 @@ asm void __sinit_d_a_npc_zelR_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80B7190C = (void*)__sinit_d_a_npc_zelR_cpp; +REGISTER_CTORS(0x80B7190C, __sinit_d_a_npc_zelR_cpp); #pragma pop /* 80B71974-80B71A34 002C34 00C0+00 1/1 0/0 0/0 .text @@ -1902,12 +1917,4 @@ static asm void func_80B71AC4() { } #pragma pop -/* 80B71BC0-80B71BD8 0000E0 0018+00 4/1 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80B71BC0 = ""; -SECTION_DEAD static char const* const stringBase_80B71BC1 = "NO_RESPONSE"; -SECTION_DEAD static char const* const stringBase_80B71BCD = "zelRf"; -SECTION_DEAD static char const* const stringBase_80B71BD3 = "ZelR"; -#pragma pop +/* 80B71BC0-80B71BC0 0000E0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/npc/d_a_npc_zelRo/d_a_npc_zelRo.cpp b/rel/d/a/npc/d_a_npc_zelRo/d_a_npc_zelRo.cpp index 8e1e8e58dfa..92a8a279a68 100644 --- a/rel/d/a/npc/d_a_npc_zelRo/d_a_npc_zelRo.cpp +++ b/rel/d/a/npc/d_a_npc_zelRo/d_a_npc_zelRo.cpp @@ -15,12 +15,14 @@ struct mDoMtx_stack_c { static u8 now[48]; }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; +struct J3DAnmTransform {}; + +struct J3DModelData {}; + struct Vec {}; struct Z2Creature { @@ -29,8 +31,6 @@ struct Z2Creature { /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -43,6 +43,8 @@ struct fopAc_ac_c { /* 80018C8C */ ~fopAc_ac_c(); }; +struct daNpcT_faceMotionAnmData_c {}; + struct daNpcT_MotionSeqMngr_c { struct sequenceStepData_c {}; @@ -50,14 +52,12 @@ struct daNpcT_MotionSeqMngr_c { /* 80B744B8 */ ~daNpcT_MotionSeqMngr_c(); }; +struct daNpcT_evtData_c {}; + struct daNpcT_motionAnmData_c {}; struct J3DJoint {}; -struct daNpcT_faceMotionAnmData_c {}; - -struct daNpcT_evtData_c {}; - struct daNpc_ZelRo_c { /* 80B71FAC */ ~daNpc_ZelRo_c(); /* 80B720E4 */ void create(); @@ -116,6 +116,8 @@ struct dCcD_GObjInf { /* 800840E4 */ ~dCcD_GObjInf(); }; +struct _GXColorS10 {}; + struct J3DModel {}; struct cXyz { @@ -124,8 +126,6 @@ struct cXyz { /* 80B7446C */ cXyz(); }; -struct _GXColorS10 {}; - struct daNpcT_c { /* 80147FA4 */ void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*); /* 801483F8 */ void loadRes(s8 const*, char const**); @@ -274,13 +274,13 @@ struct dBgS_AcchCir { /* 80B74500 */ ~dBgS_AcchCir(); }; -struct dBgS {}; - struct csXyz { /* 80B73E54 */ ~csXyz(); /* 80B7436C */ csXyz(); }; +struct dBgS {}; + struct dBgS_Acch { /* 80075F94 */ ~dBgS_Acch(); /* 800760A0 */ dBgS_Acch(); @@ -611,6 +611,14 @@ extern "C" void __register_global_object(); // /* ############################################################################################## */ +/* 80B74D3C-80B74D3C 0000E0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80B74D3C = ""; +SECTION_DEAD static char const* const stringBase_80B74D3D = "NO_RESPONSE"; +SECTION_DEAD static char const* const stringBase_80B74D49 = "zelRo"; +#pragma pop + /* 80B74D58-80B74D64 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -918,34 +926,34 @@ SECTION_RODATA u8 const daNpc_ZelRo_Param_c::m[140] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B74C5C, &daNpc_ZelRo_Param_c::m); +COMPILER_STRIP_GATE(0x80B74C5C, &daNpc_ZelRo_Param_c::m); /* 80B74CE8-80B74CEC 00008C 0004+00 0/1 0/0 0/0 .rodata @4018 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4018 = -300.0f; -COMPILER_STRIP_GATE(80B74CE8, &lit_4018); +COMPILER_STRIP_GATE(0x80B74CE8, &lit_4018); #pragma pop /* 80B74CEC-80B74CF0 000090 0004+00 0/1 0/0 0/0 .rodata @4019 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4019 = -50.0f; -COMPILER_STRIP_GATE(80B74CEC, &lit_4019); +COMPILER_STRIP_GATE(0x80B74CEC, &lit_4019); #pragma pop /* 80B74CF0-80B74CF4 000094 0004+00 0/1 0/0 0/0 .rodata @4020 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4020 = 300.0f; -COMPILER_STRIP_GATE(80B74CF0, &lit_4020); +COMPILER_STRIP_GATE(0x80B74CF0, &lit_4020); #pragma pop /* 80B74CF4-80B74CF8 000098 0004+00 0/1 0/0 0/0 .rodata @4021 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4021 = 450.0f; -COMPILER_STRIP_GATE(80B74CF4, &lit_4021); +COMPILER_STRIP_GATE(0x80B74CF4, &lit_4021); #pragma pop /* 80B720E4-80B72378 000224 0294+00 1/1 0/0 0/0 .text create__13daNpc_ZelRo_cFv */ @@ -966,22 +974,22 @@ SECTION_RODATA static u8 const lit_4182[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B74CF8, &lit_4182); +COMPILER_STRIP_GATE(0x80B74CF8, &lit_4182); /* 80B74CFC-80B74D00 0000A0 0004+00 0/2 0/0 0/0 .rodata @4183 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4183 = 65536.0f; -COMPILER_STRIP_GATE(80B74CFC, &lit_4183); +COMPILER_STRIP_GATE(0x80B74CFC, &lit_4183); #pragma pop /* 80B74D00-80B74D04 0000A4 0004+00 1/4 0/0 0/0 .rodata @4184 */ SECTION_RODATA static f32 const lit_4184 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(80B74D00, &lit_4184); +COMPILER_STRIP_GATE(0x80B74D00, &lit_4184); /* 80B74D04-80B74D08 0000A8 0004+00 2/4 0/0 0/0 .rodata @4339 */ SECTION_RODATA static f32 const lit_4339 = 1.0f; -COMPILER_STRIP_GATE(80B74D04, &lit_4339); +COMPILER_STRIP_GATE(0x80B74D04, &lit_4339); /* 80B72378-80B72628 0004B8 02B0+00 1/1 0/0 0/0 .text CreateHeap__13daNpc_ZelRo_cFv */ #pragma push @@ -1116,7 +1124,7 @@ asm void daNpc_ZelRo_c::Execute() { /* ############################################################################################## */ /* 80B74D08-80B74D0C 0000AC 0004+00 1/1 0/0 0/0 .rodata @4399 */ SECTION_RODATA static f32 const lit_4399 = 100.0f; -COMPILER_STRIP_GATE(80B74D08, &lit_4399); +COMPILER_STRIP_GATE(0x80B74D08, &lit_4399); /* 80B72838-80B728FC 000978 00C4+00 1/1 0/0 0/0 .text Draw__13daNpc_ZelRo_cFv */ #pragma push @@ -1213,7 +1221,7 @@ asm void daNpc_ZelRo_c::afterJntAnm(int param_0) { /* ############################################################################################## */ /* 80B74D0C-80B74D10 0000B0 0004+00 3/3 0/0 0/0 .rodata @4557 */ SECTION_RODATA static f32 const lit_4557 = -1.0f; -COMPILER_STRIP_GATE(80B74D0C, &lit_4557); +COMPILER_STRIP_GATE(0x80B74D0C, &lit_4557); /* 80B72C18-80B72D24 000D58 010C+00 1/0 0/0 0/0 .text ctrlBtk__13daNpc_ZelRo_cFv */ #pragma push @@ -1260,6 +1268,13 @@ asm void daNpc_ZelRo_c::evtTalk() { } #pragma pop +/* ############################################################################################## */ +/* 80B74D3C-80B74D3C 0000E0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80B74D4F = "ZelRo"; +#pragma pop + /* 80B72F7C-80B73044 0010BC 00C8+00 1/0 0/0 0/0 .text evtCutProc__13daNpc_ZelRo_cFv */ #pragma push #pragma optimization_level 0 @@ -1295,28 +1310,28 @@ asm void daNpc_ZelRo_c::beforeMove() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4728 = 10.0f; -COMPILER_STRIP_GATE(80B74D10, &lit_4728); +COMPILER_STRIP_GATE(0x80B74D10, &lit_4728); #pragma pop /* 80B74D14-80B74D18 0000B8 0004+00 0/1 0/0 0/0 .rodata @4729 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4729 = -30.0f; -COMPILER_STRIP_GATE(80B74D14, &lit_4729); +COMPILER_STRIP_GATE(0x80B74D14, &lit_4729); #pragma pop /* 80B74D18-80B74D1C 0000BC 0004+00 0/1 0/0 0/0 .rodata @4730 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4730 = 0x38C90FDB; -COMPILER_STRIP_GATE(80B74D18, &lit_4730); +COMPILER_STRIP_GATE(0x80B74D18, &lit_4730); #pragma pop /* 80B74D1C-80B74D24 0000C0 0008+00 1/3 0/0 0/0 .rodata @4732 */ SECTION_RODATA static u8 const lit_4732[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B74D1C, &lit_4732); +COMPILER_STRIP_GATE(0x80B74D1C, &lit_4732); /* 80B7320C-80B7342C 00134C 0220+00 1/0 0/0 0/0 .text setAttnPos__13daNpc_ZelRo_cFv */ #pragma push @@ -1358,7 +1373,7 @@ asm void daNpc_ZelRo_c::selectAction() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpc_ZelRo_c::chkAction(int (daNpc_ZelRo_c::*)(void*)) { +asm void daNpc_ZelRo_c::chkAction(int (daNpc_ZelRo_c::*param_0)(void*)) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_zelRo/d_a_npc_zelRo/chkAction__13daNpc_ZelRo_cFM13daNpc_ZelRo_cFPCvPvPv_i.s" } @@ -1369,7 +1384,7 @@ asm void daNpc_ZelRo_c::chkAction(int (daNpc_ZelRo_c::*)(void*)) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpc_ZelRo_c::setAction(int (daNpc_ZelRo_c::*)(void*)) { +asm void daNpc_ZelRo_c::setAction(int (daNpc_ZelRo_c::*param_0)(void*)) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_zelRo/d_a_npc_zelRo/setAction__13daNpc_ZelRo_cFM13daNpc_ZelRo_cFPCvPvPv_i.s" } @@ -1634,7 +1649,7 @@ asm void daNpcT_JntAnm_c::setEyeAngleY(cXyz param_0, s16 param_1, int param_2, f SECTION_RODATA static u8 const lit_4790[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B74D24, &lit_4790); +COMPILER_STRIP_GATE(0x80B74D24, &lit_4790); #pragma pop /* 80B74D2C-80B74D34 0000D0 0008+00 0/1 0/0 0/0 .rodata @4791 */ @@ -1643,7 +1658,7 @@ COMPILER_STRIP_GATE(80B74D24, &lit_4790); SECTION_RODATA static u8 const lit_4791[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B74D2C, &lit_4791); +COMPILER_STRIP_GATE(0x80B74D2C, &lit_4791); #pragma pop /* 80B74D34-80B74D3C 0000D8 0008+00 0/1 0/0 0/0 .rodata @4792 */ @@ -1652,7 +1667,7 @@ COMPILER_STRIP_GATE(80B74D2C, &lit_4791); SECTION_RODATA static u8 const lit_4792[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B74D34, &lit_4792); +COMPILER_STRIP_GATE(0x80B74D34, &lit_4792); #pragma pop /* 80B747A0-80B749A8 0028E0 0208+00 1/1 0/0 0/0 .text setEyeAngleX__15daNpcT_JntAnm_cF4cXyzfs */ @@ -1805,7 +1820,7 @@ asm void __sinit_d_a_npc_zelRo_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80B74A80 = (void*)__sinit_d_a_npc_zelRo_cpp; +REGISTER_CTORS(0x80B74A80, __sinit_d_a_npc_zelRo_cpp); #pragma pop /* 80B74AE8-80B74BA8 002C28 00C0+00 1/1 0/0 0/0 .text @@ -1904,12 +1919,4 @@ static asm void func_80B74C40() { } #pragma pop -/* 80B74D3C-80B74D55 0000E0 0019+00 4/1 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80B74D3C = ""; -SECTION_DEAD static char const* const stringBase_80B74D3D = "NO_RESPONSE"; -SECTION_DEAD static char const* const stringBase_80B74D49 = "zelRo"; -SECTION_DEAD static char const* const stringBase_80B74D4F = "ZelRo"; -#pragma pop +/* 80B74D3C-80B74D3C 0000E0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/npc/d_a_npc_zelda/d_a_npc_zelda.cpp b/rel/d/a/npc/d_a_npc_zelda/d_a_npc_zelda.cpp index dfb1cfc86eb..55f7bcc868c 100644 --- a/rel/d/a/npc/d_a_npc_zelda/d_a_npc_zelda.cpp +++ b/rel/d/a/npc/d_a_npc_zelda/d_a_npc_zelda.cpp @@ -15,12 +15,14 @@ struct mDoMtx_stack_c { static u8 now[48]; }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; +struct J3DAnmTransform {}; + +struct J3DModelData {}; + struct Vec {}; struct Z2Creature { @@ -29,8 +31,6 @@ struct Z2Creature { /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -43,6 +43,8 @@ struct fopAc_ac_c { /* 80018C8C */ ~fopAc_ac_c(); }; +struct daNpcT_faceMotionAnmData_c {}; + struct daNpcT_MotionSeqMngr_c { struct sequenceStepData_c {}; @@ -50,14 +52,12 @@ struct daNpcT_MotionSeqMngr_c { /* 80B777B0 */ ~daNpcT_MotionSeqMngr_c(); }; +struct daNpcT_evtData_c {}; + struct daNpcT_motionAnmData_c {}; struct J3DJoint {}; -struct daNpcT_faceMotionAnmData_c {}; - -struct daNpcT_evtData_c {}; - struct daNpc_Zelda_c { /* 80B7512C */ ~daNpc_Zelda_c(); /* 80B7524C */ void create(); @@ -115,6 +115,13 @@ struct dCcD_GObjInf { /* 800840E4 */ ~dCcD_GObjInf(); }; +struct csXyz { + /* 80B77224 */ ~csXyz(); + /* 80B77664 */ csXyz(); +}; + +struct _GXColorS10 {}; + struct J3DModel {}; struct cXyz { @@ -124,13 +131,6 @@ struct cXyz { /* 80B77764 */ cXyz(); }; -struct _GXColorS10 {}; - -struct csXyz { - /* 80B77224 */ ~csXyz(); - /* 80B77664 */ csXyz(); -}; - struct daNpcT_c { /* 80147FA4 */ void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*); /* 801483F8 */ void loadRes(s8 const*, char const**); @@ -602,6 +602,14 @@ extern "C" void __register_global_object(); // /* ############################################################################################## */ +/* 80B780C4-80B780C4 0000FC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80B780C4 = ""; +SECTION_DEAD static char const* const stringBase_80B780C5 = "NO_RESPONSE"; +SECTION_DEAD static char const* const stringBase_80B780D1 = "Zelda"; +#pragma pop + /* 80B780D8-80B780E4 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -915,7 +923,7 @@ SECTION_RODATA u8 const daNpc_Zelda_Param_c::m[140] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B77FC8, &daNpc_Zelda_Param_c::m); +COMPILER_STRIP_GATE(0x80B77FC8, &daNpc_Zelda_Param_c::m); /* 80B78054-80B7805C 00008C 0008+00 0/1 0/0 0/0 .rodata heapSize$3959 */ #pragma push @@ -923,42 +931,42 @@ COMPILER_STRIP_GATE(80B77FC8, &daNpc_Zelda_Param_c::m); SECTION_RODATA static u8 const heapSize[8] = { 0x00, 0x00, 0x8F, 0xE0, 0x00, 0x00, 0x8F, 0xE0, }; -COMPILER_STRIP_GATE(80B78054, &heapSize); +COMPILER_STRIP_GATE(0x80B78054, &heapSize); #pragma pop /* 80B7805C-80B78060 000094 0004+00 0/1 0/0 0/0 .rodata @4032 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4032 = -200.0f; -COMPILER_STRIP_GATE(80B7805C, &lit_4032); +COMPILER_STRIP_GATE(0x80B7805C, &lit_4032); #pragma pop /* 80B78060-80B78064 000098 0004+00 0/1 0/0 0/0 .rodata @4033 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4033 = -100.0f; -COMPILER_STRIP_GATE(80B78060, &lit_4033); +COMPILER_STRIP_GATE(0x80B78060, &lit_4033); #pragma pop /* 80B78064-80B78068 00009C 0004+00 0/1 0/0 0/0 .rodata @4034 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4034 = 200.0f; -COMPILER_STRIP_GATE(80B78064, &lit_4034); +COMPILER_STRIP_GATE(0x80B78064, &lit_4034); #pragma pop /* 80B78068-80B7806C 0000A0 0004+00 0/1 0/0 0/0 .rodata @4035 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4035 = 300.0f; -COMPILER_STRIP_GATE(80B78068, &lit_4035); +COMPILER_STRIP_GATE(0x80B78068, &lit_4035); #pragma pop /* 80B7806C-80B78070 0000A4 0004+00 0/1 0/0 0/0 .rodata @4036 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4036 = -1000000000.0f; -COMPILER_STRIP_GATE(80B7806C, &lit_4036); +COMPILER_STRIP_GATE(0x80B7806C, &lit_4036); #pragma pop /* 80B7524C-80B75530 00020C 02E4+00 1/1 0/0 0/0 .text create__13daNpc_Zelda_cFv */ @@ -979,22 +987,22 @@ SECTION_RODATA static u8 const lit_4190[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B78070, &lit_4190); +COMPILER_STRIP_GATE(0x80B78070, &lit_4190); /* 80B78074-80B78078 0000AC 0004+00 0/2 0/0 0/0 .rodata @4191 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4191 = 65536.0f; -COMPILER_STRIP_GATE(80B78074, &lit_4191); +COMPILER_STRIP_GATE(0x80B78074, &lit_4191); #pragma pop /* 80B78078-80B7807C 0000B0 0004+00 1/4 0/0 0/0 .rodata @4192 */ SECTION_RODATA static f32 const lit_4192 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(80B78078, &lit_4192); +COMPILER_STRIP_GATE(0x80B78078, &lit_4192); /* 80B7807C-80B78080 0000B4 0004+00 2/4 0/0 0/0 .rodata @4342 */ SECTION_RODATA static f32 const lit_4342 = 1.0f; -COMPILER_STRIP_GATE(80B7807C, &lit_4342); +COMPILER_STRIP_GATE(0x80B7807C, &lit_4342); /* 80B75530-80B757BC 0004F0 028C+00 1/1 0/0 0/0 .text CreateHeap__13daNpc_Zelda_cFv */ #pragma push @@ -1129,7 +1137,7 @@ asm void daNpc_Zelda_c::Execute() { /* ############################################################################################## */ /* 80B78080-80B78084 0000B8 0004+00 1/1 0/0 0/0 .rodata @4402 */ SECTION_RODATA static f32 const lit_4402 = 100.0f; -COMPILER_STRIP_GATE(80B78080, &lit_4402); +COMPILER_STRIP_GATE(0x80B78080, &lit_4402); /* 80B759CC-80B75A90 00098C 00C4+00 1/1 0/0 0/0 .text Draw__13daNpc_Zelda_cFv */ #pragma push @@ -1201,7 +1209,7 @@ asm void daNpc_Zelda_c::afterJntAnm(int param_0) { /* ############################################################################################## */ /* 80B78084-80B78088 0000BC 0004+00 3/3 0/0 0/0 .rodata @4551 */ SECTION_RODATA static f32 const lit_4551 = -1.0f; -COMPILER_STRIP_GATE(80B78084, &lit_4551); +COMPILER_STRIP_GATE(0x80B78084, &lit_4551); /* 80B75D28-80B75E34 000CE8 010C+00 1/0 0/0 0/0 .text ctrlBtk__13daNpc_Zelda_cFv */ #pragma push @@ -1294,35 +1302,35 @@ asm void daNpc_Zelda_c::beforeMove() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4744 = 10.0f; -COMPILER_STRIP_GATE(80B78088, &lit_4744); +COMPILER_STRIP_GATE(0x80B78088, &lit_4744); #pragma pop /* 80B7808C-80B78090 0000C4 0004+00 0/1 0/0 0/0 .rodata @4745 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4745 = -30.0f; -COMPILER_STRIP_GATE(80B7808C, &lit_4745); +COMPILER_STRIP_GATE(0x80B7808C, &lit_4745); #pragma pop /* 80B78090-80B78094 0000C8 0004+00 0/1 0/0 0/0 .rodata @4746 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4746 = 0x38C90FDB; -COMPILER_STRIP_GATE(80B78090, &lit_4746); +COMPILER_STRIP_GATE(0x80B78090, &lit_4746); #pragma pop /* 80B78094-80B78098 0000CC 0004+00 0/1 0/0 0/0 .rodata @4747 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4747 = 170.0f; -COMPILER_STRIP_GATE(80B78094, &lit_4747); +COMPILER_STRIP_GATE(0x80B78094, &lit_4747); #pragma pop /* 80B78098-80B780A0 0000D0 0008+00 1/3 0/0 0/0 .rodata @4749 */ SECTION_RODATA static u8 const lit_4749[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B78098, &lit_4749); +COMPILER_STRIP_GATE(0x80B78098, &lit_4749); /* 80B76344-80B765D4 001304 0290+00 1/0 0/0 0/0 .text setAttnPos__13daNpc_Zelda_cFv */ #pragma push @@ -1341,7 +1349,7 @@ asm void daNpc_Zelda_c::setAttnPos() { SECTION_RODATA static u8 const lit_4807[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B780A0, &lit_4807); +COMPILER_STRIP_GATE(0x80B780A0, &lit_4807); #pragma pop /* 80B780A8-80B780B0 0000E0 0008+00 0/1 0/0 0/0 .rodata @4808 */ @@ -1350,7 +1358,7 @@ COMPILER_STRIP_GATE(80B780A0, &lit_4807); SECTION_RODATA static u8 const lit_4808[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B780A8, &lit_4808); +COMPILER_STRIP_GATE(0x80B780A8, &lit_4808); #pragma pop /* 80B780B0-80B780B8 0000E8 0008+00 0/1 0/0 0/0 .rodata @4809 */ @@ -1359,28 +1367,28 @@ COMPILER_STRIP_GATE(80B780A8, &lit_4808); SECTION_RODATA static u8 const lit_4809[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B780B0, &lit_4809); +COMPILER_STRIP_GATE(0x80B780B0, &lit_4809); #pragma pop /* 80B780B8-80B780BC 0000F0 0004+00 0/1 0/0 0/0 .rodata @4853 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4853 = 20.0f; -COMPILER_STRIP_GATE(80B780B8, &lit_4853); +COMPILER_STRIP_GATE(0x80B780B8, &lit_4853); #pragma pop /* 80B780BC-80B780C0 0000F4 0004+00 0/1 0/0 0/0 .rodata @4854 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4854 = 160.0f; -COMPILER_STRIP_GATE(80B780BC, &lit_4854); +COMPILER_STRIP_GATE(0x80B780BC, &lit_4854); #pragma pop /* 80B780C0-80B780C4 0000F8 0004+00 0/1 0/0 0/0 .rodata @4855 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4855 = 44.0f; -COMPILER_STRIP_GATE(80B780C0, &lit_4855); +COMPILER_STRIP_GATE(0x80B780C0, &lit_4855); #pragma pop /* 80B765D4-80B76774 001594 01A0+00 1/0 0/0 0/0 .text setCollision__13daNpc_Zelda_cFv */ @@ -1413,7 +1421,7 @@ asm void daNpc_Zelda_c::selectAction() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpc_Zelda_c::chkAction(int (daNpc_Zelda_c::*)(void*)) { +asm void daNpc_Zelda_c::chkAction(int (daNpc_Zelda_c::*param_0)(void*)) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_zelda/d_a_npc_zelda/chkAction__13daNpc_Zelda_cFM13daNpc_Zelda_cFPCvPvPv_i.s" } @@ -1424,7 +1432,7 @@ asm void daNpc_Zelda_c::chkAction(int (daNpc_Zelda_c::*)(void*)) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpc_Zelda_c::setAction(int (daNpc_Zelda_c::*)(void*)) { +asm void daNpc_Zelda_c::setAction(int (daNpc_Zelda_c::*param_0)(void*)) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_zelda/d_a_npc_zelda/setAction__13daNpc_Zelda_cFM13daNpc_Zelda_cFPCvPvPv_i.s" } @@ -1797,7 +1805,7 @@ asm void __sinit_d_a_npc_zelda_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80B77D70 = (void*)__sinit_d_a_npc_zelda_cpp; +REGISTER_CTORS(0x80B77D70, __sinit_d_a_npc_zelda_cpp); #pragma pop /* 80B77DD8-80B77E84 002D98 00AC+00 1/1 0/0 0/0 .text @@ -1916,11 +1924,4 @@ static asm void func_80B77FAC() { } #pragma pop -/* 80B780C4-80B780D7 0000FC 0013+00 4/1 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80B780C4 = ""; -SECTION_DEAD static char const* const stringBase_80B780C5 = "NO_RESPONSE"; -SECTION_DEAD static char const* const stringBase_80B780D1 = "Zelda"; -#pragma pop +/* 80B780C4-80B780C4 0000FC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/npc/d_a_npc_zra/d_a_npc_zra.cpp b/rel/d/a/npc/d_a_npc_zra/d_a_npc_zra.cpp index d198eb0d576..3c4891dd94a 100644 --- a/rel/d/a/npc/d_a_npc_zra/d_a_npc_zra.cpp +++ b/rel/d/a/npc/d_a_npc_zra/d_a_npc_zra.cpp @@ -44,7 +44,7 @@ struct mDoExt_morf_c { /* 8000FB7C */ void setMorf(f32); }; -struct J3DAnmColor {}; +struct J3DAnmTextureSRTKey {}; struct J3DAnmTexPattern { /* 8032AF50 */ void getTexNo(u16, u16*) const; @@ -52,7 +52,7 @@ struct J3DAnmTexPattern { struct J3DAnmTevRegKey {}; -struct J3DAnmTextureSRTKey {}; +struct J3DAnmColor {}; struct J3DMaterialTable { /* 8032F64C */ void removeMatColorAnimator(J3DAnmColor*); @@ -89,12 +89,12 @@ struct mDoExt_baseAnm { /* 8000D428 */ void play(); }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; +struct J3DModelData {}; + struct Z2Creature { /* 802C03C8 */ Z2Creature(); /* 802C0420 */ ~Z2Creature(); @@ -403,7 +403,6 @@ struct dEvt_control_c { /* 80042518 */ void reset(void*); /* 80042914 */ void setSkipProc(void*, int (*)(void*, int), int); /* 80042958 */ void setSkipZev(void*, char*); - /* 800436EC */ void setPtI_Id(unsigned int); }; struct dEvent_manager_c { @@ -641,9 +640,9 @@ extern "C" void __dt__10dCcD_GSttsFv(); extern "C" void __dt__12dBgS_ObjAcchFv(); extern "C" void setCollisions__8daNpcF_cFv(); extern "C" void __dt__10cCcD_GSttsFv(); -extern "C" void func_80B7F6AC(int*); -extern "C" void func_80B7F6C8(u8*); -extern "C" void func_80B7F6E4(int, int); +extern "C" void func_80B7F6AC(void* _this, int*); +extern "C" void func_80B7F6C8(void* _this, u8*); +extern "C" void func_80B7F6E4(void* _this, int, int); extern "C" void __sinit_d_a_npc_zra_cpp(); extern "C" void wait__11daNpc_zrA_cFPv(); extern "C" void walkCalc__11daNpc_zrA_cFv(); @@ -988,7 +987,7 @@ SECTION_RODATA u8 const daNpc_zrA_Param_c::m[176] = { 0x41, 0xA0, 0x00, 0x00, 0x40, 0x80, 0x00, 0x00, 0x08, 0x00, 0x00, 0x02, 0x40, 0xC0, 0x00, 0x00, 0x43, 0x0C, 0x00, 0x00, 0x43, 0xAF, 0x00, 0x00, 0x45, 0x9C, 0x40, 0x00, 0x45, 0x3B, 0x80, 0x00, }; -COMPILER_STRIP_GATE(80B8C458, &daNpc_zrA_Param_c::m); +COMPILER_STRIP_GATE(0x80B8C458, &daNpc_zrA_Param_c::m); /* 80B8C508-80B8C510 0000B0 0004+04 9/48 0/0 0/0 .rodata @3939 */ SECTION_RODATA static u8 const lit_3939[4 + 4 /* padding */] = { @@ -1002,7 +1001,7 @@ SECTION_RODATA static u8 const lit_3939[4 + 4 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B8C508, &lit_3939); +COMPILER_STRIP_GATE(0x80B8C508, &lit_3939); /* 80B8C510-80B8C518 0000B8 0008+00 0/17 0/0 0/0 .rodata @3940 */ #pragma push @@ -1010,7 +1009,7 @@ COMPILER_STRIP_GATE(80B8C508, &lit_3939); SECTION_RODATA static u8 const lit_3940[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B8C510, &lit_3940); +COMPILER_STRIP_GATE(0x80B8C510, &lit_3940); #pragma pop /* 80B8C518-80B8C520 0000C0 0008+00 0/17 0/0 0/0 .rodata @3941 */ @@ -1019,7 +1018,7 @@ COMPILER_STRIP_GATE(80B8C510, &lit_3940); SECTION_RODATA static u8 const lit_3941[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B8C518, &lit_3941); +COMPILER_STRIP_GATE(0x80B8C518, &lit_3941); #pragma pop /* 80B8C520-80B8C528 0000C8 0008+00 0/17 0/0 0/0 .rodata @3942 */ @@ -1028,7 +1027,7 @@ COMPILER_STRIP_GATE(80B8C518, &lit_3941); SECTION_RODATA static u8 const lit_3942[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B8C520, &lit_3942); +COMPILER_STRIP_GATE(0x80B8C520, &lit_3942); #pragma pop /* 80B7850C-80B78730 0000EC 0224+00 8/8 0/0 0/0 .text @@ -1108,27 +1107,27 @@ asm void daNpc_zrA_Path_c::getDstPosChase(u16 param_0, cXyz param_1, cXyz& param /* ############################################################################################## */ /* 80B8C528-80B8C52C 0000D0 0004+00 10/33 0/0 0/0 .rodata @4437 */ SECTION_RODATA static f32 const lit_4437 = -1.0f; -COMPILER_STRIP_GATE(80B8C528, &lit_4437); +COMPILER_STRIP_GATE(0x80B8C528, &lit_4437); /* 80B8C52C-80B8C530 0000D4 0004+00 0/8 0/0 0/0 .rodata @4438 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4438 = 2.0f; -COMPILER_STRIP_GATE(80B8C52C, &lit_4438); +COMPILER_STRIP_GATE(0x80B8C52C, &lit_4438); #pragma pop /* 80B8C530-80B8C534 0000D8 0004+00 0/1 0/0 0/0 .rodata @4439 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4439 = -2.0f; -COMPILER_STRIP_GATE(80B8C530, &lit_4439); +COMPILER_STRIP_GATE(0x80B8C530, &lit_4439); #pragma pop /* 80B8C534-80B8C538 0000DC 0004+00 0/1 0/0 0/0 .rodata @4440 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4440 = -1000000000.0f; -COMPILER_STRIP_GATE(80B8C534, &lit_4440); +COMPILER_STRIP_GATE(0x80B8C534, &lit_4440); #pragma pop /* 80B78E08-80B7956C 0009E8 0764+00 1/1 0/0 0/0 .text chkPassDst__16daNpc_zrA_Path_cFUs4cXyz */ @@ -1142,6 +1141,40 @@ asm void daNpc_zrA_Path_c::chkPassDst(u16 param_0, cXyz param_1) { #pragma pop /* ############################################################################################## */ +/* 80B8CD30-80B8CD30 0008D8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80B8CD30 = "TALK_SWIM"; +SECTION_DEAD static char const* const stringBase_80B8CD3A = "BEFORE_BLAST_ZRR"; +SECTION_DEAD static char const* const stringBase_80B8CD4B = "AFTER_BLAST_ZRR"; +SECTION_DEAD static char const* const stringBase_80B8CD5B = "THANKS_BLAST"; +SECTION_DEAD static char const* const stringBase_80B8CD68 = "RESULT_ANNOUNCE"; +SECTION_DEAD static char const* const stringBase_80B8CD78 = "CARRY_WATERFALL"; +SECTION_DEAD static char const* const stringBase_80B8CD88 = "CARRY_WATERFALL_NIGHT"; +SECTION_DEAD static char const* const stringBase_80B8CD9E = "CARRY_WATERFALL_SKIP"; +SECTION_DEAD static char const* const stringBase_80B8CDB3 = "CARRY_WATERFALL_NIGHT_SKIP"; +SECTION_DEAD static char const* const stringBase_80B8CDCE = "SEARCH_PRINCE"; +SECTION_DEAD static char const* const stringBase_80B8CDDC = "TALK_MULTI"; +SECTION_DEAD static char const* const stringBase_80B8CDE7 = "TALK_MULTI2"; +SECTION_DEAD static char const* const stringBase_80B8CDF3 = "zrA"; +SECTION_DEAD static char const* const stringBase_80B8CDF7 = "zrA_nml"; +SECTION_DEAD static char const* const stringBase_80B8CDFF = "zrA_nml2"; +SECTION_DEAD static char const* const stringBase_80B8CE08 = "zrA_sp"; +SECTION_DEAD static char const* const stringBase_80B8CE0F = "zrA_MDL"; +SECTION_DEAD static char const* const stringBase_80B8CE17 = "zrA_TW"; +SECTION_DEAD static char const* const stringBase_80B8CE1E = "zrA_sad"; +SECTION_DEAD static char const* const stringBase_80B8CE26 = "zrA_obj"; +SECTION_DEAD static char const* const stringBase_80B8CE2E = "zrA_tobi"; +SECTION_DEAD static char const* const stringBase_80B8CE37 = "zrA2"; +SECTION_DEAD static char const* const stringBase_80B8CE3C = "zrA_objTW"; +SECTION_DEAD static char const* const stringBase_80B8CE46 = "zrA_talk"; +SECTION_DEAD static char const* const stringBase_80B8CE4F = "zrR"; +SECTION_DEAD static char const* const stringBase_80B8CE53 = "zrWF"; +SECTION_DEAD static char const* const stringBase_80B8CE58 = ""; +SECTION_DEAD static char const* const stringBase_80B8CE59 = "SEARCH_PRINCE1"; +SECTION_DEAD static char const* const stringBase_80B8CE68 = "SEARCH_PRINCE2"; +#pragma pop + /* 80B8CE90-80B8CE9C 000000 000C+00 10/10 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -2313,28 +2346,28 @@ asm daNpc_zrA_c::~daNpc_zrA_c() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4964 = -300.0f; -COMPILER_STRIP_GATE(80B8C538, &lit_4964); +COMPILER_STRIP_GATE(0x80B8C538, &lit_4964); #pragma pop /* 80B8C53C-80B8C540 0000E4 0004+00 0/1 0/0 0/0 .rodata @4965 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4965 = -50.0f; -COMPILER_STRIP_GATE(80B8C53C, &lit_4965); +COMPILER_STRIP_GATE(0x80B8C53C, &lit_4965); #pragma pop /* 80B8C540-80B8C544 0000E8 0004+00 0/1 0/0 0/0 .rodata @4966 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4966 = 300.0f; -COMPILER_STRIP_GATE(80B8C540, &lit_4966); +COMPILER_STRIP_GATE(0x80B8C540, &lit_4966); #pragma pop /* 80B8C544-80B8C548 0000EC 0004+00 0/3 0/0 0/0 .rodata @4967 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4967 = 450.0f; -COMPILER_STRIP_GATE(80B8C544, &lit_4967); +COMPILER_STRIP_GATE(0x80B8C544, &lit_4967); #pragma pop /* 80B79B58-80B79F38 001738 03E0+00 1/1 0/0 0/0 .text create__11daNpc_zrA_cFv */ @@ -2350,7 +2383,7 @@ asm void daNpc_zrA_c::create() { /* ############################################################################################## */ /* 80B8C548-80B8C54C 0000F0 0004+00 7/28 0/0 0/0 .rodata @5070 */ SECTION_RODATA static f32 const lit_5070 = 1.0f; -COMPILER_STRIP_GATE(80B8C548, &lit_5070); +COMPILER_STRIP_GATE(0x80B8C548, &lit_5070); /* 80B79F38-80B7A360 001B18 0428+00 1/1 0/0 0/0 .text CreateHeap__11daNpc_zrA_cFv */ #pragma push @@ -2487,7 +2520,7 @@ asm void daNpc_zrA_c::Execute() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5218 = 20.0f; -COMPILER_STRIP_GATE(80B8C54C, &lit_5218); +COMPILER_STRIP_GATE(0x80B8C54C, &lit_5218); #pragma pop /* 80B7A570-80B7A864 002150 02F4+00 1/1 0/0 0/0 .text Draw__11daNpc_zrA_cFv */ @@ -2507,7 +2540,7 @@ asm void daNpc_zrA_c::Draw() { SECTION_RODATA static u8 const lit_5227[12] = { 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x04, }; -COMPILER_STRIP_GATE(80B8C550, &lit_5227); +COMPILER_STRIP_GATE(0x80B8C550, &lit_5227); #pragma pop /* 80B7A864-80B7AB9C 002444 0338+00 1/1 0/0 0/0 .text @@ -2568,14 +2601,14 @@ asm void daNpc_zrA_c::main() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5527 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(80B8C55C, &lit_5527); +COMPILER_STRIP_GATE(0x80B8C55C, &lit_5527); #pragma pop /* 80B8C560-80B8C564 000108 0004+00 0/1 0/0 0/0 .rodata @5528 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5528 = 3.0f / 25.0f; -COMPILER_STRIP_GATE(80B8C560, &lit_5528); +COMPILER_STRIP_GATE(0x80B8C560, &lit_5528); #pragma pop /* 80B7B0A4-80B7B1DC 002C84 0138+00 1/0 0/0 0/0 .text ctrlBtk__11daNpc_zrA_cFv */ @@ -2593,63 +2626,63 @@ asm void daNpc_zrA_c::ctrlBtk() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5769 = -20.0f; -COMPILER_STRIP_GATE(80B8C564, &lit_5769); +COMPILER_STRIP_GATE(0x80B8C564, &lit_5769); #pragma pop /* 80B8C568-80B8C56C 000110 0004+00 0/5 0/0 0/0 .rodata @5770 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5770 = 10.0f; -COMPILER_STRIP_GATE(80B8C568, &lit_5770); +COMPILER_STRIP_GATE(0x80B8C568, &lit_5770); #pragma pop /* 80B8C56C-80B8C570 000114 0004+00 0/9 0/0 0/0 .rodata @5771 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5771 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(80B8C56C, &lit_5771); +COMPILER_STRIP_GATE(0x80B8C56C, &lit_5771); #pragma pop /* 80B8C570-80B8C574 000118 0004+00 0/1 0/0 0/0 .rodata @5772 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5772 = 125.0f; -COMPILER_STRIP_GATE(80B8C570, &lit_5772); +COMPILER_STRIP_GATE(0x80B8C570, &lit_5772); #pragma pop /* 80B8C574-80B8C578 00011C 0004+00 0/1 0/0 0/0 .rodata @5773 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5773 = 70.0f; -COMPILER_STRIP_GATE(80B8C574, &lit_5773); +COMPILER_STRIP_GATE(0x80B8C574, &lit_5773); #pragma pop /* 80B8C578-80B8C57C 000120 0004+00 0/4 0/0 0/0 .rodata @5774 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5774 = 40.0f; -COMPILER_STRIP_GATE(80B8C578, &lit_5774); +COMPILER_STRIP_GATE(0x80B8C578, &lit_5774); #pragma pop /* 80B8C57C-80B8C580 000124 0004+00 0/1 0/0 0/0 .rodata @5775 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5775 = 700.0f; -COMPILER_STRIP_GATE(80B8C57C, &lit_5775); +COMPILER_STRIP_GATE(0x80B8C57C, &lit_5775); #pragma pop /* 80B8C580-80B8C584 000128 0004+00 0/1 0/0 0/0 .rodata @5776 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5776 = 800.0f; -COMPILER_STRIP_GATE(80B8C580, &lit_5776); +COMPILER_STRIP_GATE(0x80B8C580, &lit_5776); #pragma pop /* 80B8C584-80B8C588 00012C 0004+00 0/1 0/0 0/0 .rodata @5777 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5777 = -150.0f; -COMPILER_STRIP_GATE(80B8C584, &lit_5777); +COMPILER_STRIP_GATE(0x80B8C584, &lit_5777); #pragma pop /* 80B8DA48-80B8DA4C 000008 0001+03 1/1 0/0 0/0 .bss @1109 */ @@ -2858,7 +2891,7 @@ SECTION_RODATA static u8 const l_jntNumTbl[36] = { 0x00, 0x00, 0x00, 0x04, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, }; -COMPILER_STRIP_GATE(80B8C588, &l_jntNumTbl); +COMPILER_STRIP_GATE(0x80B8C588, &l_jntNumTbl); /* 80B7C354-80B7C44C 003F34 00F8+00 1/0 0/0 0/0 .text drawOtherMdls__11daNpc_zrA_cFv */ #pragma push @@ -2930,6 +2963,13 @@ asm void daNpc_zrA_c::getMultiNoFromParam() { } #pragma pop +/* ############################################################################################## */ +/* 80B8CD30-80B8CD30 0008D8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80B8CE77 = "F_SP115"; +#pragma pop + /* 80B7C644-80B7C71C 004224 00D8+00 1/1 0/0 0/0 .text isDelete__11daNpc_zrA_cFv */ #pragma push #pragma optimization_level 0 @@ -2945,7 +2985,7 @@ asm void daNpc_zrA_c::isDelete() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6278 = 100.0f; -COMPILER_STRIP_GATE(80B8C5AC, &lit_6278); +COMPILER_STRIP_GATE(0x80B8C5AC, &lit_6278); #pragma pop /* 80B7C71C-80B7CA8C 0042FC 0370+00 1/1 0/0 0/0 .text reset__11daNpc_zrA_cFv */ @@ -2965,7 +3005,7 @@ asm void daNpc_zrA_c::reset() { SECTION_RODATA static u8 const lit_6282[12] = { 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80B8C5B0, &lit_6282); +COMPILER_STRIP_GATE(0x80B8C5B0, &lit_6282); #pragma pop /* 80B8C5BC-80B8C5C8 000164 000C+00 0/1 0/0 0/0 .rodata @6283 */ @@ -2974,7 +3014,7 @@ COMPILER_STRIP_GATE(80B8C5B0, &lit_6282); SECTION_RODATA static u8 const lit_6283[12] = { 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B8C5BC, &lit_6283); +COMPILER_STRIP_GATE(0x80B8C5BC, &lit_6283); #pragma pop /* 80B8C5C8-80B8C5D0 000170 0008+00 0/1 0/0 0/0 .rodata @6284 */ @@ -2983,7 +3023,7 @@ COMPILER_STRIP_GATE(80B8C5BC, &lit_6283); SECTION_RODATA static u8 const lit_6284[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B8C5C8, &lit_6284); +COMPILER_STRIP_GATE(0x80B8C5C8, &lit_6284); #pragma pop /* 80B8C5D0-80B8C5DC 000178 000C+00 0/1 0/0 0/0 .rodata @6285 */ @@ -2992,7 +3032,7 @@ COMPILER_STRIP_GATE(80B8C5C8, &lit_6284); SECTION_RODATA static u8 const lit_6285[12] = { 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B8C5D0, &lit_6285); +COMPILER_STRIP_GATE(0x80B8C5D0, &lit_6285); #pragma pop /* 80B8C5DC-80B8C5E0 000184 0004+00 0/1 0/0 0/0 .rodata @6286 */ @@ -3004,7 +3044,7 @@ SECTION_RODATA static u8 const lit_6286[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B8C5DC, &lit_6286); +COMPILER_STRIP_GATE(0x80B8C5DC, &lit_6286); #pragma pop /* 80B8C5E0-80B8C5EC 000188 000C+00 0/1 0/0 0/0 .rodata @6287 */ @@ -3013,7 +3053,7 @@ COMPILER_STRIP_GATE(80B8C5DC, &lit_6286); SECTION_RODATA static u8 const lit_6287[12] = { 0x00, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B8C5E0, &lit_6287); +COMPILER_STRIP_GATE(0x80B8C5E0, &lit_6287); #pragma pop /* 80B8C5EC-80B8C5F0 000194 0004+00 0/1 0/0 0/0 .rodata @6288 */ @@ -3025,7 +3065,7 @@ SECTION_RODATA static u8 const lit_6288[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B8C5EC, &lit_6288); +COMPILER_STRIP_GATE(0x80B8C5EC, &lit_6288); #pragma pop /* 80B8C5F0-80B8C5FC 000198 000C+00 0/1 0/0 0/0 .rodata @6289 */ @@ -3034,7 +3074,7 @@ COMPILER_STRIP_GATE(80B8C5EC, &lit_6288); SECTION_RODATA static u8 const lit_6289[12] = { 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B8C5F0, &lit_6289); +COMPILER_STRIP_GATE(0x80B8C5F0, &lit_6289); #pragma pop /* 80B8C5FC-80B8C600 0001A4 0004+00 0/1 0/0 0/0 .rodata @6290 */ @@ -3046,7 +3086,7 @@ SECTION_RODATA static u8 const lit_6290[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B8C5FC, &lit_6290); +COMPILER_STRIP_GATE(0x80B8C5FC, &lit_6290); #pragma pop /* 80B8C600-80B8C60C 0001A8 000C+00 0/1 0/0 0/0 .rodata @6291 */ @@ -3055,7 +3095,7 @@ COMPILER_STRIP_GATE(80B8C5FC, &lit_6290); SECTION_RODATA static u8 const lit_6291[12] = { 0x00, 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B8C600, &lit_6291); +COMPILER_STRIP_GATE(0x80B8C600, &lit_6291); #pragma pop /* 80B8C60C-80B8C610 0001B4 0004+00 0/1 0/0 0/0 .rodata @6292 */ @@ -3067,7 +3107,7 @@ SECTION_RODATA static u8 const lit_6292[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B8C60C, &lit_6292); +COMPILER_STRIP_GATE(0x80B8C60C, &lit_6292); #pragma pop /* 80B8C610-80B8C61C 0001B8 000C+00 0/1 0/0 0/0 .rodata @6293 */ @@ -3076,7 +3116,7 @@ COMPILER_STRIP_GATE(80B8C60C, &lit_6292); SECTION_RODATA static u8 const lit_6293[12] = { 0x00, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B8C610, &lit_6293); +COMPILER_STRIP_GATE(0x80B8C610, &lit_6293); #pragma pop /* 80B8C61C-80B8C620 0001C4 0004+00 0/1 0/0 0/0 .rodata @6294 */ @@ -3088,7 +3128,7 @@ SECTION_RODATA static u8 const lit_6294[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B8C61C, &lit_6294); +COMPILER_STRIP_GATE(0x80B8C61C, &lit_6294); #pragma pop /* 80B8C620-80B8C62C 0001C8 000C+00 0/1 0/0 0/0 .rodata @6295 */ @@ -3097,7 +3137,7 @@ COMPILER_STRIP_GATE(80B8C61C, &lit_6294); SECTION_RODATA static u8 const lit_6295[12] = { 0x00, 0x0B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80B8C620, &lit_6295); +COMPILER_STRIP_GATE(0x80B8C620, &lit_6295); #pragma pop /* 80B8C62C-80B8C638 0001D4 000C+00 0/1 0/0 0/0 .rodata @6296 */ @@ -3106,7 +3146,7 @@ COMPILER_STRIP_GATE(80B8C620, &lit_6295); SECTION_RODATA static u8 const lit_6296[12] = { 0x00, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B8C62C, &lit_6296); +COMPILER_STRIP_GATE(0x80B8C62C, &lit_6296); #pragma pop /* 80B8C638-80B8C640 0001E0 0008+00 0/1 0/0 0/0 .rodata @6297 */ @@ -3115,7 +3155,7 @@ COMPILER_STRIP_GATE(80B8C62C, &lit_6296); SECTION_RODATA static u8 const lit_6297[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B8C638, &lit_6297); +COMPILER_STRIP_GATE(0x80B8C638, &lit_6297); #pragma pop /* 80B8C640-80B8C64C 0001E8 000C+00 0/1 0/0 0/0 .rodata @6298 */ @@ -3124,7 +3164,7 @@ COMPILER_STRIP_GATE(80B8C638, &lit_6297); SECTION_RODATA static u8 const lit_6298[12] = { 0x00, 0x0D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80B8C640, &lit_6298); +COMPILER_STRIP_GATE(0x80B8C640, &lit_6298); #pragma pop /* 80B8C64C-80B8C658 0001F4 000C+00 0/1 0/0 0/0 .rodata @6299 */ @@ -3133,7 +3173,7 @@ COMPILER_STRIP_GATE(80B8C640, &lit_6298); SECTION_RODATA static u8 const lit_6299[12] = { 0x00, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B8C64C, &lit_6299); +COMPILER_STRIP_GATE(0x80B8C64C, &lit_6299); #pragma pop /* 80B8C658-80B8C660 000200 0008+00 0/1 0/0 0/0 .rodata @6300 */ @@ -3142,7 +3182,7 @@ COMPILER_STRIP_GATE(80B8C64C, &lit_6299); SECTION_RODATA static u8 const lit_6300[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B8C658, &lit_6300); +COMPILER_STRIP_GATE(0x80B8C658, &lit_6300); #pragma pop /* 80B8C660-80B8C66C 000208 000C+00 0/1 0/0 0/0 .rodata @6301 */ @@ -3151,7 +3191,7 @@ COMPILER_STRIP_GATE(80B8C658, &lit_6300); SECTION_RODATA static u8 const lit_6301[12] = { 0x00, 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80B8C660, &lit_6301); +COMPILER_STRIP_GATE(0x80B8C660, &lit_6301); #pragma pop /* 80B8C66C-80B8C678 000214 000C+00 0/1 0/0 0/0 .rodata @6302 */ @@ -3160,7 +3200,7 @@ COMPILER_STRIP_GATE(80B8C660, &lit_6301); SECTION_RODATA static u8 const lit_6302[12] = { 0x00, 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B8C66C, &lit_6302); +COMPILER_STRIP_GATE(0x80B8C66C, &lit_6302); #pragma pop /* 80B8C678-80B8C680 000220 0008+00 0/1 0/0 0/0 .rodata @6303 */ @@ -3169,7 +3209,7 @@ COMPILER_STRIP_GATE(80B8C66C, &lit_6302); SECTION_RODATA static u8 const lit_6303[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B8C678, &lit_6303); +COMPILER_STRIP_GATE(0x80B8C678, &lit_6303); #pragma pop /* 80B8C680-80B8C68C 000228 000C+00 0/1 0/0 0/0 .rodata @6304 */ @@ -3178,7 +3218,7 @@ COMPILER_STRIP_GATE(80B8C678, &lit_6303); SECTION_RODATA static u8 const lit_6304[12] = { 0x00, 0x13, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80B8C680, &lit_6304); +COMPILER_STRIP_GATE(0x80B8C680, &lit_6304); #pragma pop /* 80B8C68C-80B8C698 000234 000C+00 0/1 0/0 0/0 .rodata @6305 */ @@ -3187,7 +3227,7 @@ COMPILER_STRIP_GATE(80B8C680, &lit_6304); SECTION_RODATA static u8 const lit_6305[12] = { 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B8C68C, &lit_6305); +COMPILER_STRIP_GATE(0x80B8C68C, &lit_6305); #pragma pop /* 80B8C698-80B8C6A0 000240 0008+00 0/1 0/0 0/0 .rodata @6306 */ @@ -3196,7 +3236,7 @@ COMPILER_STRIP_GATE(80B8C68C, &lit_6305); SECTION_RODATA static u8 const lit_6306[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B8C698, &lit_6306); +COMPILER_STRIP_GATE(0x80B8C698, &lit_6306); #pragma pop /* 80B8C6A0-80B8C6AC 000248 000C+00 0/1 0/0 0/0 .rodata @6307 */ @@ -3205,7 +3245,7 @@ COMPILER_STRIP_GATE(80B8C698, &lit_6306); SECTION_RODATA static u8 const lit_6307[12] = { 0x00, 0x0F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80B8C6A0, &lit_6307); +COMPILER_STRIP_GATE(0x80B8C6A0, &lit_6307); #pragma pop /* 80B8C6AC-80B8C6B8 000254 000C+00 0/1 0/0 0/0 .rodata @6308 */ @@ -3214,7 +3254,7 @@ COMPILER_STRIP_GATE(80B8C6A0, &lit_6307); SECTION_RODATA static u8 const lit_6308[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B8C6AC, &lit_6308); +COMPILER_STRIP_GATE(0x80B8C6AC, &lit_6308); #pragma pop /* 80B8C6B8-80B8C6C0 000260 0008+00 0/1 0/0 0/0 .rodata @6309 */ @@ -3223,7 +3263,7 @@ COMPILER_STRIP_GATE(80B8C6AC, &lit_6308); SECTION_RODATA static u8 const lit_6309[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B8C6B8, &lit_6309); +COMPILER_STRIP_GATE(0x80B8C6B8, &lit_6309); #pragma pop /* 80B8C6C0-80B8C6CC 000268 000C+00 0/1 0/0 0/0 .rodata @6310 */ @@ -3232,7 +3272,7 @@ COMPILER_STRIP_GATE(80B8C6B8, &lit_6309); SECTION_RODATA static u8 const lit_6310[12] = { 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80B8C6C0, &lit_6310); +COMPILER_STRIP_GATE(0x80B8C6C0, &lit_6310); #pragma pop /* 80B8C6CC-80B8C6D8 000274 000C+00 0/1 0/0 0/0 .rodata @6311 */ @@ -3241,7 +3281,7 @@ COMPILER_STRIP_GATE(80B8C6C0, &lit_6310); SECTION_RODATA static u8 const lit_6311[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B8C6CC, &lit_6311); +COMPILER_STRIP_GATE(0x80B8C6CC, &lit_6311); #pragma pop /* 80B8C6D8-80B8C6E0 000280 0008+00 0/1 0/0 0/0 .rodata @6312 */ @@ -3250,7 +3290,7 @@ COMPILER_STRIP_GATE(80B8C6CC, &lit_6311); SECTION_RODATA static u8 const lit_6312[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B8C6D8, &lit_6312); +COMPILER_STRIP_GATE(0x80B8C6D8, &lit_6312); #pragma pop /* 80B8C6E0-80B8C6EC 000288 000C+00 0/1 0/0 0/0 .rodata @6313 */ @@ -3259,7 +3299,7 @@ COMPILER_STRIP_GATE(80B8C6D8, &lit_6312); SECTION_RODATA static u8 const lit_6313[12] = { 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80B8C6E0, &lit_6313); +COMPILER_STRIP_GATE(0x80B8C6E0, &lit_6313); #pragma pop /* 80B8C6EC-80B8C6F8 000294 000C+00 0/1 0/0 0/0 .rodata @6314 */ @@ -3268,7 +3308,7 @@ COMPILER_STRIP_GATE(80B8C6E0, &lit_6313); SECTION_RODATA static u8 const lit_6314[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B8C6EC, &lit_6314); +COMPILER_STRIP_GATE(0x80B8C6EC, &lit_6314); #pragma pop /* 80B8C6F8-80B8C700 0002A0 0008+00 0/1 0/0 0/0 .rodata @6315 */ @@ -3277,7 +3317,7 @@ COMPILER_STRIP_GATE(80B8C6EC, &lit_6314); SECTION_RODATA static u8 const lit_6315[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B8C6F8, &lit_6315); +COMPILER_STRIP_GATE(0x80B8C6F8, &lit_6315); #pragma pop /* 80B8C700-80B8C70C 0002A8 000C+00 0/1 0/0 0/0 .rodata @6316 */ @@ -3286,7 +3326,7 @@ COMPILER_STRIP_GATE(80B8C6F8, &lit_6315); SECTION_RODATA static u8 const lit_6316[12] = { 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80B8C700, &lit_6316); +COMPILER_STRIP_GATE(0x80B8C700, &lit_6316); #pragma pop /* 80B8C70C-80B8C718 0002B4 000C+00 0/1 0/0 0/0 .rodata @6317 */ @@ -3295,7 +3335,7 @@ COMPILER_STRIP_GATE(80B8C700, &lit_6316); SECTION_RODATA static u8 const lit_6317[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B8C70C, &lit_6317); +COMPILER_STRIP_GATE(0x80B8C70C, &lit_6317); #pragma pop /* 80B8C718-80B8C720 0002C0 0008+00 0/1 0/0 0/0 .rodata @6318 */ @@ -3304,7 +3344,7 @@ COMPILER_STRIP_GATE(80B8C70C, &lit_6317); SECTION_RODATA static u8 const lit_6318[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B8C718, &lit_6318); +COMPILER_STRIP_GATE(0x80B8C718, &lit_6318); #pragma pop /* 80B8C720-80B8C72C 0002C8 000C+00 0/1 0/0 0/0 .rodata @6319 */ @@ -3313,7 +3353,7 @@ COMPILER_STRIP_GATE(80B8C718, &lit_6318); SECTION_RODATA static u8 const lit_6319[12] = { 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80B8C720, &lit_6319); +COMPILER_STRIP_GATE(0x80B8C720, &lit_6319); #pragma pop /* 80B8C72C-80B8C738 0002D4 000C+00 0/1 0/0 0/0 .rodata @6320 */ @@ -3322,7 +3362,7 @@ COMPILER_STRIP_GATE(80B8C720, &lit_6319); SECTION_RODATA static u8 const lit_6320[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B8C72C, &lit_6320); +COMPILER_STRIP_GATE(0x80B8C72C, &lit_6320); #pragma pop /* 80B8C738-80B8C740 0002E0 0008+00 0/1 0/0 0/0 .rodata @6321 */ @@ -3331,7 +3371,7 @@ COMPILER_STRIP_GATE(80B8C72C, &lit_6320); SECTION_RODATA static u8 const lit_6321[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B8C738, &lit_6321); +COMPILER_STRIP_GATE(0x80B8C738, &lit_6321); #pragma pop /* 80B8C740-80B8C74C 0002E8 000C+00 0/1 0/0 0/0 .rodata @6322 */ @@ -3340,7 +3380,7 @@ COMPILER_STRIP_GATE(80B8C738, &lit_6321); SECTION_RODATA static u8 const lit_6322[12] = { 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B8C740, &lit_6322); +COMPILER_STRIP_GATE(0x80B8C740, &lit_6322); #pragma pop /* 80B8C74C-80B8C750 0002F4 0004+00 0/1 0/0 0/0 .rodata @6323 */ @@ -3352,7 +3392,7 @@ SECTION_RODATA static u8 const lit_6323[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B8C74C, &lit_6323); +COMPILER_STRIP_GATE(0x80B8C74C, &lit_6323); #pragma pop /* 80B8C750-80B8C75C 0002F8 000C+00 0/1 0/0 0/0 .rodata @6324 */ @@ -3361,7 +3401,7 @@ COMPILER_STRIP_GATE(80B8C74C, &lit_6323); SECTION_RODATA static u8 const lit_6324[12] = { 0x00, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B8C750, &lit_6324); +COMPILER_STRIP_GATE(0x80B8C750, &lit_6324); #pragma pop /* 80B8C75C-80B8C760 000304 0004+00 0/1 0/0 0/0 .rodata @6325 */ @@ -3373,7 +3413,7 @@ SECTION_RODATA static u8 const lit_6325[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B8C75C, &lit_6325); +COMPILER_STRIP_GATE(0x80B8C75C, &lit_6325); #pragma pop /* 80B8C760-80B8C76C 000308 000C+00 0/1 0/0 0/0 .rodata @6326 */ @@ -3382,7 +3422,7 @@ COMPILER_STRIP_GATE(80B8C75C, &lit_6325); SECTION_RODATA static u8 const lit_6326[12] = { 0x00, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B8C760, &lit_6326); +COMPILER_STRIP_GATE(0x80B8C760, &lit_6326); #pragma pop /* 80B8C76C-80B8C770 000314 0004+00 0/1 0/0 0/0 .rodata @6327 */ @@ -3394,7 +3434,7 @@ SECTION_RODATA static u8 const lit_6327[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B8C76C, &lit_6327); +COMPILER_STRIP_GATE(0x80B8C76C, &lit_6327); #pragma pop /* 80B8C770-80B8C77C 000318 000C+00 0/1 0/0 0/0 .rodata @6328 */ @@ -3403,7 +3443,7 @@ COMPILER_STRIP_GATE(80B8C76C, &lit_6327); SECTION_RODATA static u8 const lit_6328[12] = { 0x00, 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B8C770, &lit_6328); +COMPILER_STRIP_GATE(0x80B8C770, &lit_6328); #pragma pop /* 80B8C77C-80B8C780 000324 0004+00 0/1 0/0 0/0 .rodata @6329 */ @@ -3415,7 +3455,7 @@ SECTION_RODATA static u8 const lit_6329[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B8C77C, &lit_6329); +COMPILER_STRIP_GATE(0x80B8C77C, &lit_6329); #pragma pop /* 80B8C780-80B8C78C 000328 000C+00 0/1 0/0 0/0 .rodata @6330 */ @@ -3424,7 +3464,7 @@ COMPILER_STRIP_GATE(80B8C77C, &lit_6329); SECTION_RODATA static u8 const lit_6330[12] = { 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B8C780, &lit_6330); +COMPILER_STRIP_GATE(0x80B8C780, &lit_6330); #pragma pop /* 80B8C78C-80B8C790 000334 0004+00 0/1 0/0 0/0 .rodata @6331 */ @@ -3436,7 +3476,7 @@ SECTION_RODATA static u8 const lit_6331[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B8C78C, &lit_6331); +COMPILER_STRIP_GATE(0x80B8C78C, &lit_6331); #pragma pop /* 80B8C790-80B8C79C 000338 000C+00 0/1 0/0 0/0 .rodata @6332 */ @@ -3445,7 +3485,7 @@ COMPILER_STRIP_GATE(80B8C78C, &lit_6331); SECTION_RODATA static u8 const lit_6332[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B8C790, &lit_6332); +COMPILER_STRIP_GATE(0x80B8C790, &lit_6332); #pragma pop /* 80B8C79C-80B8C7A0 000344 0004+00 0/1 0/0 0/0 .rodata @6333 */ @@ -3457,7 +3497,7 @@ SECTION_RODATA static u8 const lit_6333[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B8C79C, &lit_6333); +COMPILER_STRIP_GATE(0x80B8C79C, &lit_6333); #pragma pop /* 80B7CA8C-80B7D0FC 00466C 0670+00 1/1 0/0 0/0 .text playExpression__11daNpc_zrA_cFv */ @@ -3482,7 +3522,7 @@ SECTION_RODATA static u8 const lit_6334[84] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B8C7A0, &lit_6334); +COMPILER_STRIP_GATE(0x80B8C7A0, &lit_6334); #pragma pop /* 80B8C7F4-80B8C800 00039C 000C+00 0/1 0/0 0/0 .rodata @6375 */ @@ -3491,7 +3531,7 @@ COMPILER_STRIP_GATE(80B8C7A0, &lit_6334); SECTION_RODATA static u8 const lit_6375[12] = { 0x00, 0x29, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B8C7F4, &lit_6375); +COMPILER_STRIP_GATE(0x80B8C7F4, &lit_6375); #pragma pop /* 80B8C800-80B8C804 0003A8 0004+00 0/1 0/0 0/0 .rodata @6376 */ @@ -3503,7 +3543,7 @@ SECTION_RODATA static u8 const lit_6376[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B8C800, &lit_6376); +COMPILER_STRIP_GATE(0x80B8C800, &lit_6376); #pragma pop /* 80B8C804-80B8C810 0003AC 000C+00 0/1 0/0 0/0 .rodata @6377 */ @@ -3512,7 +3552,7 @@ COMPILER_STRIP_GATE(80B8C800, &lit_6376); SECTION_RODATA static u8 const lit_6377[12] = { 0x00, 0x2E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B8C804, &lit_6377); +COMPILER_STRIP_GATE(0x80B8C804, &lit_6377); #pragma pop /* 80B8C810-80B8C814 0003B8 0004+00 0/1 0/0 0/0 .rodata @6378 */ @@ -3524,7 +3564,7 @@ SECTION_RODATA static u8 const lit_6378[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B8C810, &lit_6378); +COMPILER_STRIP_GATE(0x80B8C810, &lit_6378); #pragma pop /* 80B8C814-80B8C820 0003BC 000C+00 0/1 0/0 0/0 .rodata @6379 */ @@ -3533,7 +3573,7 @@ COMPILER_STRIP_GATE(80B8C810, &lit_6378); SECTION_RODATA static u8 const lit_6379[12] = { 0x00, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80B8C814, &lit_6379); +COMPILER_STRIP_GATE(0x80B8C814, &lit_6379); #pragma pop /* 80B8C820-80B8C82C 0003C8 000C+00 0/1 0/0 0/0 .rodata @6380 */ @@ -3542,7 +3582,7 @@ COMPILER_STRIP_GATE(80B8C814, &lit_6379); SECTION_RODATA static u8 const lit_6380[12] = { 0x00, 0x2E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B8C820, &lit_6380); +COMPILER_STRIP_GATE(0x80B8C820, &lit_6380); #pragma pop /* 80B8C82C-80B8C834 0003D4 0008+00 0/1 0/0 0/0 .rodata @6381 */ @@ -3551,7 +3591,7 @@ COMPILER_STRIP_GATE(80B8C820, &lit_6380); SECTION_RODATA static u8 const lit_6381[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B8C82C, &lit_6381); +COMPILER_STRIP_GATE(0x80B8C82C, &lit_6381); #pragma pop /* 80B8C834-80B8C840 0003DC 000C+00 0/1 0/0 0/0 .rodata @6382 */ @@ -3560,7 +3600,7 @@ COMPILER_STRIP_GATE(80B8C82C, &lit_6381); SECTION_RODATA static u8 const lit_6382[12] = { 0x00, 0x29, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B8C834, &lit_6382); +COMPILER_STRIP_GATE(0x80B8C834, &lit_6382); #pragma pop /* 80B8C840-80B8C844 0003E8 0004+00 0/1 0/0 0/0 .rodata @6383 */ @@ -3572,7 +3612,7 @@ SECTION_RODATA static u8 const lit_6383[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B8C840, &lit_6383); +COMPILER_STRIP_GATE(0x80B8C840, &lit_6383); #pragma pop /* 80B8C844-80B8C850 0003EC 000C+00 0/1 0/0 0/0 .rodata @6384 */ @@ -3581,7 +3621,7 @@ COMPILER_STRIP_GATE(80B8C840, &lit_6383); SECTION_RODATA static u8 const lit_6384[12] = { 0x00, 0x2E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B8C844, &lit_6384); +COMPILER_STRIP_GATE(0x80B8C844, &lit_6384); #pragma pop /* 80B8C850-80B8C854 0003F8 0004+00 0/1 0/0 0/0 .rodata @6385 */ @@ -3593,7 +3633,7 @@ SECTION_RODATA static u8 const lit_6385[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B8C850, &lit_6385); +COMPILER_STRIP_GATE(0x80B8C850, &lit_6385); #pragma pop /* 80B8C854-80B8C860 0003FC 000C+00 0/1 0/0 0/0 .rodata @6386 */ @@ -3602,7 +3642,7 @@ COMPILER_STRIP_GATE(80B8C850, &lit_6385); SECTION_RODATA static u8 const lit_6386[12] = { 0x00, 0x2B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80B8C854, &lit_6386); +COMPILER_STRIP_GATE(0x80B8C854, &lit_6386); #pragma pop /* 80B8C860-80B8C86C 000408 000C+00 0/1 0/0 0/0 .rodata @6387 */ @@ -3611,7 +3651,7 @@ COMPILER_STRIP_GATE(80B8C854, &lit_6386); SECTION_RODATA static u8 const lit_6387[12] = { 0x00, 0x29, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B8C860, &lit_6387); +COMPILER_STRIP_GATE(0x80B8C860, &lit_6387); #pragma pop /* 80B8C86C-80B8C874 000414 0008+00 0/1 0/0 0/0 .rodata @6388 */ @@ -3620,7 +3660,7 @@ COMPILER_STRIP_GATE(80B8C860, &lit_6387); SECTION_RODATA static u8 const lit_6388[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B8C86C, &lit_6388); +COMPILER_STRIP_GATE(0x80B8C86C, &lit_6388); #pragma pop /* 80B8C874-80B8C880 00041C 000C+00 0/1 0/0 0/0 .rodata @6389 */ @@ -3629,7 +3669,7 @@ COMPILER_STRIP_GATE(80B8C86C, &lit_6388); SECTION_RODATA static u8 const lit_6389[12] = { 0x00, 0x19, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B8C874, &lit_6389); +COMPILER_STRIP_GATE(0x80B8C874, &lit_6389); #pragma pop /* 80B8C880-80B8C884 000428 0004+00 0/1 0/0 0/0 .rodata @6390 */ @@ -3641,7 +3681,7 @@ SECTION_RODATA static u8 const lit_6390[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B8C880, &lit_6390); +COMPILER_STRIP_GATE(0x80B8C880, &lit_6390); #pragma pop /* 80B8C884-80B8C890 00042C 000C+00 0/1 0/0 0/0 .rodata @6391 */ @@ -3650,7 +3690,7 @@ COMPILER_STRIP_GATE(80B8C880, &lit_6390); SECTION_RODATA static u8 const lit_6391[12] = { 0x00, 0x1A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B8C884, &lit_6391); +COMPILER_STRIP_GATE(0x80B8C884, &lit_6391); #pragma pop /* 80B8C890-80B8C894 000438 0004+00 0/1 0/0 0/0 .rodata @6392 */ @@ -3662,7 +3702,7 @@ SECTION_RODATA static u8 const lit_6392[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B8C890, &lit_6392); +COMPILER_STRIP_GATE(0x80B8C890, &lit_6392); #pragma pop /* 80B8C894-80B8C8A0 00043C 000C+00 0/1 0/0 0/0 .rodata @6393 */ @@ -3671,7 +3711,7 @@ COMPILER_STRIP_GATE(80B8C890, &lit_6392); SECTION_RODATA static u8 const lit_6393[12] = { 0x00, 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B8C894, &lit_6393); +COMPILER_STRIP_GATE(0x80B8C894, &lit_6393); #pragma pop /* 80B8C8A0-80B8C8A4 000448 0004+00 0/1 0/0 0/0 .rodata @6394 */ @@ -3683,7 +3723,7 @@ SECTION_RODATA static u8 const lit_6394[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B8C8A0, &lit_6394); +COMPILER_STRIP_GATE(0x80B8C8A0, &lit_6394); #pragma pop /* 80B8C8A4-80B8C8B0 00044C 000C+00 0/1 0/0 0/0 .rodata @6395 */ @@ -3692,7 +3732,7 @@ COMPILER_STRIP_GATE(80B8C8A0, &lit_6394); SECTION_RODATA static u8 const lit_6395[12] = { 0x00, 0x1C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B8C8A4, &lit_6395); +COMPILER_STRIP_GATE(0x80B8C8A4, &lit_6395); #pragma pop /* 80B8C8B0-80B8C8B4 000458 0004+00 0/1 0/0 0/0 .rodata @6396 */ @@ -3704,7 +3744,7 @@ SECTION_RODATA static u8 const lit_6396[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B8C8B0, &lit_6396); +COMPILER_STRIP_GATE(0x80B8C8B0, &lit_6396); #pragma pop /* 80B8C8B4-80B8C8C0 00045C 000C+00 0/1 0/0 0/0 .rodata @6397 */ @@ -3713,7 +3753,7 @@ COMPILER_STRIP_GATE(80B8C8B0, &lit_6396); SECTION_RODATA static u8 const lit_6397[12] = { 0x00, 0x1D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B8C8B4, &lit_6397); +COMPILER_STRIP_GATE(0x80B8C8B4, &lit_6397); #pragma pop /* 80B8C8C0-80B8C8C4 000468 0004+00 0/1 0/0 0/0 .rodata @6398 */ @@ -3725,7 +3765,7 @@ SECTION_RODATA static u8 const lit_6398[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B8C8C0, &lit_6398); +COMPILER_STRIP_GATE(0x80B8C8C0, &lit_6398); #pragma pop /* 80B8C8C4-80B8C8D0 00046C 000C+00 0/1 0/0 0/0 .rodata @6399 */ @@ -3734,7 +3774,7 @@ COMPILER_STRIP_GATE(80B8C8C0, &lit_6398); SECTION_RODATA static u8 const lit_6399[12] = { 0x00, 0x21, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B8C8C4, &lit_6399); +COMPILER_STRIP_GATE(0x80B8C8C4, &lit_6399); #pragma pop /* 80B8C8D0-80B8C8D4 000478 0004+00 0/1 0/0 0/0 .rodata @6400 */ @@ -3746,7 +3786,7 @@ SECTION_RODATA static u8 const lit_6400[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B8C8D0, &lit_6400); +COMPILER_STRIP_GATE(0x80B8C8D0, &lit_6400); #pragma pop /* 80B8C8D4-80B8C8E0 00047C 000C+00 0/1 0/0 0/0 .rodata @6401 */ @@ -3755,7 +3795,7 @@ COMPILER_STRIP_GATE(80B8C8D0, &lit_6400); SECTION_RODATA static u8 const lit_6401[12] = { 0x00, 0x24, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B8C8D4, &lit_6401); +COMPILER_STRIP_GATE(0x80B8C8D4, &lit_6401); #pragma pop /* 80B8C8E0-80B8C8E4 000488 0004+00 0/1 0/0 0/0 .rodata @6402 */ @@ -3767,7 +3807,7 @@ SECTION_RODATA static u8 const lit_6402[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B8C8E0, &lit_6402); +COMPILER_STRIP_GATE(0x80B8C8E0, &lit_6402); #pragma pop /* 80B8C8E4-80B8C8F0 00048C 000C+00 0/1 0/0 0/0 .rodata @6403 */ @@ -3776,7 +3816,7 @@ COMPILER_STRIP_GATE(80B8C8E0, &lit_6402); SECTION_RODATA static u8 const lit_6403[12] = { 0x00, 0x28, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80B8C8E4, &lit_6403); +COMPILER_STRIP_GATE(0x80B8C8E4, &lit_6403); #pragma pop /* 80B8C8F0-80B8C8FC 000498 000C+00 0/1 0/0 0/0 .rodata @6404 */ @@ -3785,7 +3825,7 @@ COMPILER_STRIP_GATE(80B8C8E4, &lit_6403); SECTION_RODATA static u8 const lit_6404[12] = { 0x00, 0x27, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B8C8F0, &lit_6404); +COMPILER_STRIP_GATE(0x80B8C8F0, &lit_6404); #pragma pop /* 80B8C8FC-80B8C904 0004A4 0008+00 0/1 0/0 0/0 .rodata @6405 */ @@ -3794,7 +3834,7 @@ COMPILER_STRIP_GATE(80B8C8F0, &lit_6404); SECTION_RODATA static u8 const lit_6405[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B8C8FC, &lit_6405); +COMPILER_STRIP_GATE(0x80B8C8FC, &lit_6405); #pragma pop /* 80B8C904-80B8C910 0004AC 000C+00 0/1 0/0 0/0 .rodata @6406 */ @@ -3803,7 +3843,7 @@ COMPILER_STRIP_GATE(80B8C8FC, &lit_6405); SECTION_RODATA static u8 const lit_6406[12] = { 0x00, 0x26, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80B8C904, &lit_6406); +COMPILER_STRIP_GATE(0x80B8C904, &lit_6406); #pragma pop /* 80B8C910-80B8C91C 0004B8 000C+00 0/1 0/0 0/0 .rodata @6407 */ @@ -3812,7 +3852,7 @@ COMPILER_STRIP_GATE(80B8C904, &lit_6406); SECTION_RODATA static u8 const lit_6407[12] = { 0x00, 0x25, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B8C910, &lit_6407); +COMPILER_STRIP_GATE(0x80B8C910, &lit_6407); #pragma pop /* 80B8C91C-80B8C924 0004C4 0008+00 0/1 0/0 0/0 .rodata @6408 */ @@ -3821,7 +3861,7 @@ COMPILER_STRIP_GATE(80B8C910, &lit_6407); SECTION_RODATA static u8 const lit_6408[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B8C91C, &lit_6408); +COMPILER_STRIP_GATE(0x80B8C91C, &lit_6408); #pragma pop /* 80B8C924-80B8C930 0004CC 000C+00 0/1 0/0 0/0 .rodata @6409 */ @@ -3830,7 +3870,7 @@ COMPILER_STRIP_GATE(80B8C91C, &lit_6408); SECTION_RODATA static u8 const lit_6409[12] = { 0x00, 0x22, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80B8C924, &lit_6409); +COMPILER_STRIP_GATE(0x80B8C924, &lit_6409); #pragma pop /* 80B8C930-80B8C93C 0004D8 000C+00 0/1 0/0 0/0 .rodata @6410 */ @@ -3839,7 +3879,7 @@ COMPILER_STRIP_GATE(80B8C924, &lit_6409); SECTION_RODATA static u8 const lit_6410[12] = { 0x00, 0x39, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B8C930, &lit_6410); +COMPILER_STRIP_GATE(0x80B8C930, &lit_6410); #pragma pop /* 80B8C93C-80B8C944 0004E4 0008+00 0/1 0/0 0/0 .rodata @6411 */ @@ -3848,7 +3888,7 @@ COMPILER_STRIP_GATE(80B8C930, &lit_6410); SECTION_RODATA static u8 const lit_6411[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B8C93C, &lit_6411); +COMPILER_STRIP_GATE(0x80B8C93C, &lit_6411); #pragma pop /* 80B8C944-80B8C950 0004EC 000C+00 0/1 0/0 0/0 .rodata @6412 */ @@ -3857,7 +3897,7 @@ COMPILER_STRIP_GATE(80B8C93C, &lit_6411); SECTION_RODATA static u8 const lit_6412[12] = { 0x00, 0x23, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80B8C944, &lit_6412); +COMPILER_STRIP_GATE(0x80B8C944, &lit_6412); #pragma pop /* 80B8C950-80B8C95C 0004F8 000C+00 0/1 0/0 0/0 .rodata @6413 */ @@ -3866,7 +3906,7 @@ COMPILER_STRIP_GATE(80B8C944, &lit_6412); SECTION_RODATA static u8 const lit_6413[12] = { 0x00, 0x34, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B8C950, &lit_6413); +COMPILER_STRIP_GATE(0x80B8C950, &lit_6413); #pragma pop /* 80B8C95C-80B8C964 000504 0008+00 0/1 0/0 0/0 .rodata @6414 */ @@ -3875,7 +3915,7 @@ COMPILER_STRIP_GATE(80B8C950, &lit_6413); SECTION_RODATA static u8 const lit_6414[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B8C95C, &lit_6414); +COMPILER_STRIP_GATE(0x80B8C95C, &lit_6414); #pragma pop /* 80B8C964-80B8C970 00050C 000C+00 0/1 0/0 0/0 .rodata @6415 */ @@ -3884,7 +3924,7 @@ COMPILER_STRIP_GATE(80B8C95C, &lit_6414); SECTION_RODATA static u8 const lit_6415[12] = { 0x00, 0x2B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80B8C964, &lit_6415); +COMPILER_STRIP_GATE(0x80B8C964, &lit_6415); #pragma pop /* 80B8C970-80B8C97C 000518 000C+00 0/1 0/0 0/0 .rodata @6416 */ @@ -3893,7 +3933,7 @@ COMPILER_STRIP_GATE(80B8C964, &lit_6415); SECTION_RODATA static u8 const lit_6416[12] = { 0x00, 0x29, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B8C970, &lit_6416); +COMPILER_STRIP_GATE(0x80B8C970, &lit_6416); #pragma pop /* 80B8C97C-80B8C984 000524 0008+00 0/1 0/0 0/0 .rodata @6417 */ @@ -3902,7 +3942,7 @@ COMPILER_STRIP_GATE(80B8C970, &lit_6416); SECTION_RODATA static u8 const lit_6417[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B8C97C, &lit_6417); +COMPILER_STRIP_GATE(0x80B8C97C, &lit_6417); #pragma pop /* 80B8C984-80B8C990 00052C 000C+00 0/1 0/0 0/0 .rodata @6418 */ @@ -3911,7 +3951,7 @@ COMPILER_STRIP_GATE(80B8C97C, &lit_6417); SECTION_RODATA static u8 const lit_6418[12] = { 0x00, 0x27, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B8C984, &lit_6418); +COMPILER_STRIP_GATE(0x80B8C984, &lit_6418); #pragma pop /* 80B8C990-80B8C994 000538 0004+00 0/1 0/0 0/0 .rodata @6419 */ @@ -3923,7 +3963,7 @@ SECTION_RODATA static u8 const lit_6419[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B8C990, &lit_6419); +COMPILER_STRIP_GATE(0x80B8C990, &lit_6419); #pragma pop /* 80B8C994-80B8C9A0 00053C 000C+00 0/1 0/0 0/0 .rodata @6420 */ @@ -3932,7 +3972,7 @@ COMPILER_STRIP_GATE(80B8C990, &lit_6419); SECTION_RODATA static u8 const lit_6420[12] = { 0x00, 0x25, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B8C994, &lit_6420); +COMPILER_STRIP_GATE(0x80B8C994, &lit_6420); #pragma pop /* 80B8C9A0-80B8C9A4 000548 0004+00 0/1 0/0 0/0 .rodata @6421 */ @@ -3944,7 +3984,7 @@ SECTION_RODATA static u8 const lit_6421[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B8C9A0, &lit_6421); +COMPILER_STRIP_GATE(0x80B8C9A0, &lit_6421); #pragma pop /* 80B8C9A4-80B8C9B0 00054C 000C+00 0/1 0/0 0/0 .rodata @6422 */ @@ -3953,7 +3993,7 @@ COMPILER_STRIP_GATE(80B8C9A0, &lit_6421); SECTION_RODATA static u8 const lit_6422[12] = { 0x00, 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B8C9A4, &lit_6422); +COMPILER_STRIP_GATE(0x80B8C9A4, &lit_6422); #pragma pop /* 80B8C9B0-80B8C9B4 000558 0004+00 0/1 0/0 0/0 .rodata @6423 */ @@ -3965,7 +4005,7 @@ SECTION_RODATA static u8 const lit_6423[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B8C9B0, &lit_6423); +COMPILER_STRIP_GATE(0x80B8C9B0, &lit_6423); #pragma pop /* 80B8C9B4-80B8C9C0 00055C 000C+00 0/1 0/0 0/0 .rodata @6424 */ @@ -3974,7 +4014,7 @@ COMPILER_STRIP_GATE(80B8C9B0, &lit_6423); SECTION_RODATA static u8 const lit_6424[12] = { 0x00, 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B8C9B4, &lit_6424); +COMPILER_STRIP_GATE(0x80B8C9B4, &lit_6424); #pragma pop /* 80B8C9C0-80B8C9C4 000568 0004+00 0/1 0/0 0/0 .rodata @6425 */ @@ -3986,7 +4026,7 @@ SECTION_RODATA static u8 const lit_6425[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B8C9C0, &lit_6425); +COMPILER_STRIP_GATE(0x80B8C9C0, &lit_6425); #pragma pop /* 80B8C9C4-80B8C9D0 00056C 000C+00 0/1 0/0 0/0 .rodata @6426 */ @@ -3995,7 +4035,7 @@ COMPILER_STRIP_GATE(80B8C9C0, &lit_6425); SECTION_RODATA static u8 const lit_6426[12] = { 0x00, 0x2D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B8C9C4, &lit_6426); +COMPILER_STRIP_GATE(0x80B8C9C4, &lit_6426); #pragma pop /* 80B8C9D0-80B8C9D4 000578 0004+00 0/1 0/0 0/0 .rodata @6427 */ @@ -4007,7 +4047,7 @@ SECTION_RODATA static u8 const lit_6427[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B8C9D0, &lit_6427); +COMPILER_STRIP_GATE(0x80B8C9D0, &lit_6427); #pragma pop /* 80B8C9D4-80B8C9E0 00057C 000C+00 0/1 0/0 0/0 .rodata @6428 */ @@ -4016,7 +4056,7 @@ COMPILER_STRIP_GATE(80B8C9D0, &lit_6427); SECTION_RODATA static u8 const lit_6428[12] = { 0x00, 0x2F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80B8C9D4, &lit_6428); +COMPILER_STRIP_GATE(0x80B8C9D4, &lit_6428); #pragma pop /* 80B8C9E0-80B8C9EC 000588 000C+00 0/1 0/0 0/0 .rodata @6429 */ @@ -4025,7 +4065,7 @@ COMPILER_STRIP_GATE(80B8C9D4, &lit_6428); SECTION_RODATA static u8 const lit_6429[12] = { 0x00, 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B8C9E0, &lit_6429); +COMPILER_STRIP_GATE(0x80B8C9E0, &lit_6429); #pragma pop /* 80B8C9EC-80B8C9F4 000594 0008+00 0/1 0/0 0/0 .rodata @6430 */ @@ -4034,7 +4074,7 @@ COMPILER_STRIP_GATE(80B8C9E0, &lit_6429); SECTION_RODATA static u8 const lit_6430[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B8C9EC, &lit_6430); +COMPILER_STRIP_GATE(0x80B8C9EC, &lit_6430); #pragma pop /* 80B8C9F4-80B8CA00 00059C 000C+00 0/1 0/0 0/0 .rodata @6431 */ @@ -4043,7 +4083,7 @@ COMPILER_STRIP_GATE(80B8C9EC, &lit_6430); SECTION_RODATA static u8 const lit_6431[12] = { 0x00, 0x30, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80B8C9F4, &lit_6431); +COMPILER_STRIP_GATE(0x80B8C9F4, &lit_6431); #pragma pop /* 80B8CA00-80B8CA0C 0005A8 000C+00 0/1 0/0 0/0 .rodata @6432 */ @@ -4052,7 +4092,7 @@ COMPILER_STRIP_GATE(80B8C9F4, &lit_6431); SECTION_RODATA static u8 const lit_6432[12] = { 0x00, 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B8CA00, &lit_6432); +COMPILER_STRIP_GATE(0x80B8CA00, &lit_6432); #pragma pop /* 80B8CA0C-80B8CA14 0005B4 0008+00 0/1 0/0 0/0 .rodata @6433 */ @@ -4061,7 +4101,7 @@ COMPILER_STRIP_GATE(80B8CA00, &lit_6432); SECTION_RODATA static u8 const lit_6433[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B8CA0C, &lit_6433); +COMPILER_STRIP_GATE(0x80B8CA0C, &lit_6433); #pragma pop /* 80B8CA14-80B8CA20 0005BC 000C+00 0/1 0/0 0/0 .rodata @6434 */ @@ -4070,7 +4110,7 @@ COMPILER_STRIP_GATE(80B8CA0C, &lit_6433); SECTION_RODATA static u8 const lit_6434[12] = { 0x00, 0x2F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80B8CA14, &lit_6434); +COMPILER_STRIP_GATE(0x80B8CA14, &lit_6434); #pragma pop /* 80B8CA20-80B8CA2C 0005C8 000C+00 0/1 0/0 0/0 .rodata @6435 */ @@ -4079,7 +4119,7 @@ COMPILER_STRIP_GATE(80B8CA14, &lit_6434); SECTION_RODATA static u8 const lit_6435[12] = { 0x00, 0x2D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B8CA20, &lit_6435); +COMPILER_STRIP_GATE(0x80B8CA20, &lit_6435); #pragma pop /* 80B8CA2C-80B8CA34 0005D4 0008+00 0/1 0/0 0/0 .rodata @6436 */ @@ -4088,7 +4128,7 @@ COMPILER_STRIP_GATE(80B8CA20, &lit_6435); SECTION_RODATA static u8 const lit_6436[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B8CA2C, &lit_6436); +COMPILER_STRIP_GATE(0x80B8CA2C, &lit_6436); #pragma pop /* 80B8CA34-80B8CA40 0005DC 000C+00 0/1 0/0 0/0 .rodata @6437 */ @@ -4097,7 +4137,7 @@ COMPILER_STRIP_GATE(80B8CA2C, &lit_6436); SECTION_RODATA static u8 const lit_6437[12] = { 0x00, 0x30, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80B8CA34, &lit_6437); +COMPILER_STRIP_GATE(0x80B8CA34, &lit_6437); #pragma pop /* 80B8CA40-80B8CA4C 0005E8 000C+00 0/1 0/0 0/0 .rodata @6438 */ @@ -4106,7 +4146,7 @@ COMPILER_STRIP_GATE(80B8CA34, &lit_6437); SECTION_RODATA static u8 const lit_6438[12] = { 0x00, 0x2D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B8CA40, &lit_6438); +COMPILER_STRIP_GATE(0x80B8CA40, &lit_6438); #pragma pop /* 80B8CA4C-80B8CA54 0005F4 0008+00 0/1 0/0 0/0 .rodata @6439 */ @@ -4115,7 +4155,7 @@ COMPILER_STRIP_GATE(80B8CA40, &lit_6438); SECTION_RODATA static u8 const lit_6439[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B8CA4C, &lit_6439); +COMPILER_STRIP_GATE(0x80B8CA4C, &lit_6439); #pragma pop /* 80B8CA54-80B8CA60 0005FC 000C+00 0/1 0/0 0/0 .rodata @6440 */ @@ -4124,7 +4164,7 @@ COMPILER_STRIP_GATE(80B8CA4C, &lit_6439); SECTION_RODATA static u8 const lit_6440[12] = { 0x00, 0x33, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B8CA54, &lit_6440); +COMPILER_STRIP_GATE(0x80B8CA54, &lit_6440); #pragma pop /* 80B8CA60-80B8CA64 000608 0004+00 0/1 0/0 0/0 .rodata @6441 */ @@ -4136,7 +4176,7 @@ SECTION_RODATA static u8 const lit_6441[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B8CA60, &lit_6441); +COMPILER_STRIP_GATE(0x80B8CA60, &lit_6441); #pragma pop /* 80B8CA64-80B8CA70 00060C 000C+00 0/1 0/0 0/0 .rodata @6442 */ @@ -4145,7 +4185,7 @@ COMPILER_STRIP_GATE(80B8CA60, &lit_6441); SECTION_RODATA static u8 const lit_6442[12] = { 0x00, 0x31, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80B8CA64, &lit_6442); +COMPILER_STRIP_GATE(0x80B8CA64, &lit_6442); #pragma pop /* 80B8CA70-80B8CA7C 000618 000C+00 0/1 0/0 0/0 .rodata @6443 */ @@ -4154,7 +4194,7 @@ COMPILER_STRIP_GATE(80B8CA64, &lit_6442); SECTION_RODATA static u8 const lit_6443[12] = { 0x00, 0x2E, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B8CA70, &lit_6443); +COMPILER_STRIP_GATE(0x80B8CA70, &lit_6443); #pragma pop /* 80B8CA7C-80B8CA84 000624 0008+00 0/1 0/0 0/0 .rodata @6444 */ @@ -4163,7 +4203,7 @@ COMPILER_STRIP_GATE(80B8CA70, &lit_6443); SECTION_RODATA static u8 const lit_6444[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B8CA7C, &lit_6444); +COMPILER_STRIP_GATE(0x80B8CA7C, &lit_6444); #pragma pop /* 80B8CA84-80B8CA90 00062C 000C+00 0/1 0/0 0/0 .rodata @6445 */ @@ -4172,7 +4212,7 @@ COMPILER_STRIP_GATE(80B8CA7C, &lit_6444); SECTION_RODATA static u8 const lit_6445[12] = { 0x00, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80B8CA84, &lit_6445); +COMPILER_STRIP_GATE(0x80B8CA84, &lit_6445); #pragma pop /* 80B8CA90-80B8CA9C 000638 000C+00 0/1 0/0 0/0 .rodata @6446 */ @@ -4181,7 +4221,7 @@ COMPILER_STRIP_GATE(80B8CA84, &lit_6445); SECTION_RODATA static u8 const lit_6446[12] = { 0x00, 0x2E, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B8CA90, &lit_6446); +COMPILER_STRIP_GATE(0x80B8CA90, &lit_6446); #pragma pop /* 80B8CA9C-80B8CAA4 000644 0008+00 0/1 0/0 0/0 .rodata @6447 */ @@ -4190,7 +4230,7 @@ COMPILER_STRIP_GATE(80B8CA90, &lit_6446); SECTION_RODATA static u8 const lit_6447[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B8CA9C, &lit_6447); +COMPILER_STRIP_GATE(0x80B8CA9C, &lit_6447); #pragma pop /* 80B8CAA4-80B8CAB0 00064C 000C+00 0/1 0/0 0/0 .rodata @6448 */ @@ -4199,7 +4239,7 @@ COMPILER_STRIP_GATE(80B8CA9C, &lit_6447); SECTION_RODATA static u8 const lit_6448[12] = { 0x00, 0x15, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80B8CAA4, &lit_6448); +COMPILER_STRIP_GATE(0x80B8CAA4, &lit_6448); #pragma pop /* 80B8CAB0-80B8CABC 000658 000C+00 0/1 0/0 0/0 .rodata @6449 */ @@ -4208,7 +4248,7 @@ COMPILER_STRIP_GATE(80B8CAA4, &lit_6448); SECTION_RODATA static u8 const lit_6449[12] = { 0x00, 0x16, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B8CAB0, &lit_6449); +COMPILER_STRIP_GATE(0x80B8CAB0, &lit_6449); #pragma pop /* 80B8CABC-80B8CAC4 000664 0008+00 0/1 0/0 0/0 .rodata @6450 */ @@ -4217,7 +4257,7 @@ COMPILER_STRIP_GATE(80B8CAB0, &lit_6449); SECTION_RODATA static u8 const lit_6450[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B8CABC, &lit_6450); +COMPILER_STRIP_GATE(0x80B8CABC, &lit_6450); #pragma pop /* 80B8CAC4-80B8CAD0 00066C 000C+00 0/1 0/0 0/0 .rodata @6451 */ @@ -4226,7 +4266,7 @@ COMPILER_STRIP_GATE(80B8CABC, &lit_6450); SECTION_RODATA static u8 const lit_6451[12] = { 0x00, 0x1E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B8CAC4, &lit_6451); +COMPILER_STRIP_GATE(0x80B8CAC4, &lit_6451); #pragma pop /* 80B8CAD0-80B8CAD4 000678 0004+00 0/1 0/0 0/0 .rodata @6452 */ @@ -4238,7 +4278,7 @@ SECTION_RODATA static u8 const lit_6452[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B8CAD0, &lit_6452); +COMPILER_STRIP_GATE(0x80B8CAD0, &lit_6452); #pragma pop /* 80B8CAD4-80B8CAE0 00067C 000C+00 0/1 0/0 0/0 .rodata @6453 */ @@ -4247,7 +4287,7 @@ COMPILER_STRIP_GATE(80B8CAD0, &lit_6452); SECTION_RODATA static u8 const lit_6453[12] = { 0x00, 0x1F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B8CAD4, &lit_6453); +COMPILER_STRIP_GATE(0x80B8CAD4, &lit_6453); #pragma pop /* 80B8CAE0-80B8CAE4 000688 0004+00 0/1 0/0 0/0 .rodata @6454 */ @@ -4259,7 +4299,7 @@ SECTION_RODATA static u8 const lit_6454[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B8CAE0, &lit_6454); +COMPILER_STRIP_GATE(0x80B8CAE0, &lit_6454); #pragma pop /* 80B8CAE4-80B8CAF0 00068C 000C+00 0/1 0/0 0/0 .rodata @6455 */ @@ -4268,7 +4308,7 @@ COMPILER_STRIP_GATE(80B8CAE0, &lit_6454); SECTION_RODATA static u8 const lit_6455[12] = { 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80B8CAE4, &lit_6455); +COMPILER_STRIP_GATE(0x80B8CAE4, &lit_6455); #pragma pop /* 80B8CAF0-80B8CAFC 000698 000C+00 0/1 0/0 0/0 .rodata @6456 */ @@ -4277,7 +4317,7 @@ COMPILER_STRIP_GATE(80B8CAE4, &lit_6455); SECTION_RODATA static u8 const lit_6456[12] = { 0x00, 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B8CAF0, &lit_6456); +COMPILER_STRIP_GATE(0x80B8CAF0, &lit_6456); #pragma pop /* 80B8CAFC-80B8CB04 0006A4 0008+00 0/1 0/0 0/0 .rodata @6457 */ @@ -4286,7 +4326,7 @@ COMPILER_STRIP_GATE(80B8CAF0, &lit_6456); SECTION_RODATA static u8 const lit_6457[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B8CAFC, &lit_6457); +COMPILER_STRIP_GATE(0x80B8CAFC, &lit_6457); #pragma pop /* 80B8CB04-80B8CB10 0006AC 000C+00 0/1 0/0 0/0 .rodata @6458 */ @@ -4295,7 +4335,7 @@ COMPILER_STRIP_GATE(80B8CAFC, &lit_6457); SECTION_RODATA static u8 const lit_6458[12] = { 0x00, 0x17, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B8CB04, &lit_6458); +COMPILER_STRIP_GATE(0x80B8CB04, &lit_6458); #pragma pop /* 80B8CB10-80B8CB14 0006B8 0004+00 0/1 0/0 0/0 .rodata @6459 */ @@ -4307,7 +4347,7 @@ SECTION_RODATA static u8 const lit_6459[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B8CB10, &lit_6459); +COMPILER_STRIP_GATE(0x80B8CB10, &lit_6459); #pragma pop /* 80B8CB14-80B8CBA4 0006BC 0090+00 0/0 0/0 0/0 .rodata @6460 */ @@ -4324,12 +4364,12 @@ SECTION_RODATA static u8 const lit_6460[144] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B8CB14, &lit_6460); +COMPILER_STRIP_GATE(0x80B8CB14, &lit_6460); #pragma pop /* 80B8CBA4-80B8CBA8 00074C 0004+00 1/6 0/0 0/0 .rodata @6507 */ SECTION_RODATA static f32 const lit_6507 = 0.5f; -COMPILER_STRIP_GATE(80B8CBA4, &lit_6507); +COMPILER_STRIP_GATE(0x80B8CBA4, &lit_6507); /* 80B7D0FC-80B7DAF4 004CDC 09F8+00 1/1 0/0 0/0 .text playMotion__11daNpc_zrA_cFv */ #pragma push @@ -4346,7 +4386,7 @@ asm void daNpc_zrA_c::playMotion() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpc_zrA_c::chkAction(int (daNpc_zrA_c::*)(void*)) { +asm void daNpc_zrA_c::chkAction(int (daNpc_zrA_c::*param_0)(void*)) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_zra/d_a_npc_zra/chkAction__11daNpc_zrA_cFM11daNpc_zrA_cFPCvPvPv_i.s" } @@ -4357,7 +4397,7 @@ asm void daNpc_zrA_c::chkAction(int (daNpc_zrA_c::*)(void*)) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpc_zrA_c::setAction(int (daNpc_zrA_c::*)(void*)) { +asm void daNpc_zrA_c::setAction(int (daNpc_zrA_c::*param_0)(void*)) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_zra/d_a_npc_zra/setAction__11daNpc_zrA_cFM11daNpc_zrA_cFPCvPvPv_i.s" } @@ -4373,6 +4413,13 @@ asm void daNpc_zrA_c::selectAction() { } #pragma pop +/* ############################################################################################## */ +/* 80B8CD30-80B8CD30 0008D8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80B8CE7F = "NO_RESPONSE"; +#pragma pop + /* 80B7DF40-80B7E668 005B20 0728+00 1/1 0/0 0/0 .text doEvent__11daNpc_zrA_cFv */ #pragma push #pragma optimization_level 0 @@ -4410,21 +4457,21 @@ asm void daNpc_zrA_c::setLookMode(int param_0) { SECTION_RODATA static u8 const lit_6771[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B8CBA8, &lit_6771); +COMPILER_STRIP_GATE(0x80B8CBA8, &lit_6771); #pragma pop /* 80B8CBB4-80B8CBB8 00075C 0004+00 0/1 0/0 0/0 .rodata @6831 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6831 = -80.0f; -COMPILER_STRIP_GATE(80B8CBB4, &lit_6831); +COMPILER_STRIP_GATE(0x80B8CBB4, &lit_6831); #pragma pop /* 80B8CBB8-80B8CBBC 000760 0004+00 0/1 0/0 0/0 .rodata @6832 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6832 = 80.0f; -COMPILER_STRIP_GATE(80B8CBB8, &lit_6832); +COMPILER_STRIP_GATE(0x80B8CBB8, &lit_6832); #pragma pop /* 80B7E718-80B7E9E0 0062F8 02C8+00 1/1 0/0 0/0 .text lookat__11daNpc_zrA_cFv */ @@ -4460,7 +4507,7 @@ asm void daNpc_zrA_c::setExpressionTalkAfter() { /* ############################################################################################## */ /* 80B8CBBC-80B8CBC0 000764 0004+00 1/7 0/0 0/0 .rodata @6920 */ SECTION_RODATA static f32 const lit_6920 = 1.5f; -COMPILER_STRIP_GATE(80B8CBBC, &lit_6920); +COMPILER_STRIP_GATE(0x80B8CBBC, &lit_6920); /* 80B7EBA0-80B7EC54 006780 00B4+00 1/1 0/0 0/0 .text setPrtcl__11daNpc_zrA_cFv */ #pragma push @@ -4696,7 +4743,7 @@ asm cCcD_GStts::~cCcD_GStts() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80B7F6AC(int* param_0) { +extern "C" asm void func_80B7F6AC(void* _this, int* param_0) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_zra/d_a_npc_zra/func_80B7F6AC.s" } @@ -4706,7 +4753,7 @@ extern "C" asm void func_80B7F6AC(int* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80B7F6C8(u8* param_0) { +extern "C" asm void func_80B7F6C8(void* _this, u8* param_0) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_zra/d_a_npc_zra/func_80B7F6C8.s" } @@ -4717,187 +4764,187 @@ extern "C" asm void func_80B7F6C8(u8* param_0) { SECTION_RODATA static u8 const lit_7164[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B8CBC0, &lit_7164); +COMPILER_STRIP_GATE(0x80B8CBC0, &lit_7164); /* 80B8CBC8-80B8CBCC 000770 0004+00 0/2 0/0 0/0 .rodata @7224 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7224 = 60.0f; -COMPILER_STRIP_GATE(80B8CBC8, &lit_7224); +COMPILER_STRIP_GATE(0x80B8CBC8, &lit_7224); #pragma pop /* 80B8CBCC-80B8CBD0 000774 0004+00 0/7 0/0 0/0 .rodata @7597 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7597 = 13.0f; -COMPILER_STRIP_GATE(80B8CBCC, &lit_7597); +COMPILER_STRIP_GATE(0x80B8CBCC, &lit_7597); #pragma pop /* 80B8CBD0-80B8CBD4 000778 0004+00 0/1 0/0 0/0 .rodata @7598 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7598 = 21.0f; -COMPILER_STRIP_GATE(80B8CBD0, &lit_7598); +COMPILER_STRIP_GATE(0x80B8CBD0, &lit_7598); #pragma pop /* 80B8CBD4-80B8CBD8 00077C 0004+00 0/4 0/0 0/0 .rodata @7599 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7599 = 3.0f / 10.0f; -COMPILER_STRIP_GATE(80B8CBD4, &lit_7599); +COMPILER_STRIP_GATE(0x80B8CBD4, &lit_7599); #pragma pop /* 80B8CBD8-80B8CBDC 000780 0004+00 0/5 0/0 0/0 .rodata @7600 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7600 = 7.0f / 10.0f; -COMPILER_STRIP_GATE(80B8CBD8, &lit_7600); +COMPILER_STRIP_GATE(0x80B8CBD8, &lit_7600); #pragma pop /* 80B8CBDC-80B8CBE0 000784 0004+00 0/1 0/0 0/0 .rodata @7601 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7601 = 11.0f / 5.0f; -COMPILER_STRIP_GATE(80B8CBDC, &lit_7601); +COMPILER_STRIP_GATE(0x80B8CBDC, &lit_7601); #pragma pop /* 80B8CBE0-80B8CBE4 000788 0004+00 0/9 0/0 0/0 .rodata @7602 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7602 = 2.5f; -COMPILER_STRIP_GATE(80B8CBE0, &lit_7602); +COMPILER_STRIP_GATE(0x80B8CBE0, &lit_7602); #pragma pop /* 80B8CBE4-80B8CBE8 00078C 0004+00 0/3 0/0 0/0 .rodata @7603 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7603 = 17.0f; -COMPILER_STRIP_GATE(80B8CBE4, &lit_7603); +COMPILER_STRIP_GATE(0x80B8CBE4, &lit_7603); #pragma pop /* 80B8CBE8-80B8CBEC 000790 0004+00 0/6 0/0 0/0 .rodata @7604 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7604 = 6.0f / 5.0f; -COMPILER_STRIP_GATE(80B8CBE8, &lit_7604); +COMPILER_STRIP_GATE(0x80B8CBE8, &lit_7604); #pragma pop /* 80B8CBEC-80B8CBF0 000794 0004+00 0/4 0/0 0/0 .rodata @7605 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7605 = 14.0f; -COMPILER_STRIP_GATE(80B8CBEC, &lit_7605); +COMPILER_STRIP_GATE(0x80B8CBEC, &lit_7605); #pragma pop /* 80B8CBF0-80B8CBF4 000798 0004+00 0/7 0/0 0/0 .rodata @7606 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7606 = 4.0f; -COMPILER_STRIP_GATE(80B8CBF0, &lit_7606); +COMPILER_STRIP_GATE(0x80B8CBF0, &lit_7606); #pragma pop /* 80B8CBF4-80B8CBF8 00079C 0004+00 0/3 0/0 0/0 .rodata @7607 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7607 = 16.0f; -COMPILER_STRIP_GATE(80B8CBF4, &lit_7607); +COMPILER_STRIP_GATE(0x80B8CBF4, &lit_7607); #pragma pop /* 80B8CBF8-80B8CBFC 0007A0 0004+00 0/3 0/0 0/0 .rodata @7608 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7608 = 18.0f; -COMPILER_STRIP_GATE(80B8CBF8, &lit_7608); +COMPILER_STRIP_GATE(0x80B8CBF8, &lit_7608); #pragma pop /* 80B8CBFC-80B8CC00 0007A4 0004+00 0/1 0/0 0/0 .rodata @7609 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7609 = 9.0f / 10.0f; -COMPILER_STRIP_GATE(80B8CBFC, &lit_7609); +COMPILER_STRIP_GATE(0x80B8CBFC, &lit_7609); #pragma pop /* 80B8CC00-80B8CC04 0007A8 0004+00 0/3 0/0 0/0 .rodata @7735 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7735 = 4.0f / 5.0f; -COMPILER_STRIP_GATE(80B8CC00, &lit_7735); +COMPILER_STRIP_GATE(0x80B8CC00, &lit_7735); #pragma pop /* 80B8CC04-80B8CC08 0007AC 0004+00 0/2 0/0 0/0 .rodata @7804 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7804 = 10000.0f; -COMPILER_STRIP_GATE(80B8CC04, &lit_7804); +COMPILER_STRIP_GATE(0x80B8CC04, &lit_7804); #pragma pop /* 80B8CC08-80B8CC0C 0007B0 0004+00 0/2 0/0 0/0 .rodata @7805 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7805 = 500.0f; -COMPILER_STRIP_GATE(80B8CC08, &lit_7805); +COMPILER_STRIP_GATE(0x80B8CC08, &lit_7805); #pragma pop /* 80B8CC0C-80B8CC10 0007B4 0004+00 0/1 0/0 0/0 .rodata @7914 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7914 = 220.0f; -COMPILER_STRIP_GATE(80B8CC0C, &lit_7914); +COMPILER_STRIP_GATE(0x80B8CC0C, &lit_7914); #pragma pop /* 80B8CC10-80B8CC14 0007B8 0004+00 0/4 0/0 0/0 .rodata @7915 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7915 = 5.0f; -COMPILER_STRIP_GATE(80B8CC10, &lit_7915); +COMPILER_STRIP_GATE(0x80B8CC10, &lit_7915); #pragma pop /* 80B8CC14-80B8CC18 0007BC 0004+00 0/1 0/0 0/0 .rodata @7916 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7916 = 8.0f; -COMPILER_STRIP_GATE(80B8CC14, &lit_7916); +COMPILER_STRIP_GATE(0x80B8CC14, &lit_7916); #pragma pop /* 80B8CC18-80B8CC1C 0007C0 0004+00 0/9 0/0 0/0 .rodata @7959 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7959 = 30.0f; -COMPILER_STRIP_GATE(80B8CC18, &lit_7959); +COMPILER_STRIP_GATE(0x80B8CC18, &lit_7959); #pragma pop /* 80B8CC1C-80B8CC20 0007C4 0004+00 0/1 0/0 0/0 .rodata @8074 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8074 = 21.0f / 20.0f; -COMPILER_STRIP_GATE(80B8CC1C, &lit_8074); +COMPILER_STRIP_GATE(0x80B8CC1C, &lit_8074); #pragma pop /* 80B8CC20-80B8CC24 0007C8 0004+00 0/2 0/0 0/0 .rodata @8075 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8075 = 50.0f; -COMPILER_STRIP_GATE(80B8CC20, &lit_8075); +COMPILER_STRIP_GATE(0x80B8CC20, &lit_8075); #pragma pop /* 80B8CC24-80B8CC28 0007CC 0004+00 0/11 0/0 0/0 .rodata @8287 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8287 = 3.0f; -COMPILER_STRIP_GATE(80B8CC24, &lit_8287); +COMPILER_STRIP_GATE(0x80B8CC24, &lit_8287); #pragma pop /* 80B8CC28-80B8CC30 0007D0 0008+00 1/2 0/0 0/0 .rodata @8289 */ SECTION_RODATA static u8 const lit_8289[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B8CC28, &lit_8289); +COMPILER_STRIP_GATE(0x80B8CC28, &lit_8289); /* 80B7F6E4-80B7F760 0072C4 007C+00 3/3 0/0 0/0 .text cLib_getRndValue__Fii */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80B7F6E4(int param_0, int param_1) { +extern "C" asm void func_80B7F6E4(void* _this, int param_0, int param_1) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_zra/d_a_npc_zra/func_80B7F6E4.s" } @@ -4923,7 +4970,7 @@ asm void __sinit_d_a_npc_zra_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80B7F760 = (void*)__sinit_d_a_npc_zra_cpp; +REGISTER_CTORS(0x80B7F760, __sinit_d_a_npc_zra_cpp); #pragma pop /* 80B7F8C4-80B7FD10 0074A4 044C+00 3/0 0/0 0/0 .text wait__11daNpc_zrA_cFPv */ @@ -4996,6 +5043,13 @@ static asm void s_subMulti(void* param_0, void* param_1) { } #pragma pop +/* ############################################################################################## */ +/* 80B8CD30-80B8CD30 0008D8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80B8CE8B = "prm"; +#pragma pop + /* 80B806FC-80B80860 0082DC 0164+00 1/0 0/0 0/0 .text ECut_talkMulti__11daNpc_zrA_cFi */ #pragma push #pragma optimization_level 0 @@ -5265,63 +5319,63 @@ asm void daNpc_zrA_c::ECut_carryWaterfallSkip(int param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8591 = -6.0f; -COMPILER_STRIP_GATE(80B8CC30, &lit_8591); +COMPILER_STRIP_GATE(0x80B8CC30, &lit_8591); #pragma pop /* 80B8CC34-80B8CC38 0007DC 0004+00 0/4 0/0 0/0 .rodata @8592 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8592 = 6.0f; -COMPILER_STRIP_GATE(80B8CC34, &lit_8592); +COMPILER_STRIP_GATE(0x80B8CC34, &lit_8592); #pragma pop /* 80B8CC38-80B8CC3C 0007E0 0004+00 0/1 0/0 0/0 .rodata @8593 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8593 = -9.0f; -COMPILER_STRIP_GATE(80B8CC38, &lit_8593); +COMPILER_STRIP_GATE(0x80B8CC38, &lit_8593); #pragma pop /* 80B8CC3C-80B8CC40 0007E4 0004+00 0/4 0/0 0/0 .rodata @8594 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8594 = 9.0f; -COMPILER_STRIP_GATE(80B8CC3C, &lit_8594); +COMPILER_STRIP_GATE(0x80B8CC3C, &lit_8594); #pragma pop /* 80B8CC40-80B8CC44 0007E8 0004+00 0/4 0/0 0/0 .rodata @8595 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8595 = 8.5f; -COMPILER_STRIP_GATE(80B8CC40, &lit_8595); +COMPILER_STRIP_GATE(0x80B8CC40, &lit_8595); #pragma pop /* 80B8CC44-80B8CC48 0007EC 0004+00 0/1 0/0 0/0 .rodata @8596 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8596 = 57.0f / 10.0f; -COMPILER_STRIP_GATE(80B8CC44, &lit_8596); +COMPILER_STRIP_GATE(0x80B8CC44, &lit_8596); #pragma pop /* 80B8CC48-80B8CC4C 0007F0 0004+00 0/1 0/0 0/0 .rodata @8597 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8597 = 12.0f / 5.0f; -COMPILER_STRIP_GATE(80B8CC48, &lit_8597); +COMPILER_STRIP_GATE(0x80B8CC48, &lit_8597); #pragma pop /* 80B8CC4C-80B8CC50 0007F4 0004+00 0/2 0/0 0/0 .rodata @8598 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8598 = 36.0f; -COMPILER_STRIP_GATE(80B8CC4C, &lit_8598); +COMPILER_STRIP_GATE(0x80B8CC4C, &lit_8598); #pragma pop /* 80B8CC50-80B8CC54 0007F8 0004+00 0/1 0/0 0/0 .rodata @8599 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8599 = 6.5f; -COMPILER_STRIP_GATE(80B8CC50, &lit_8599); +COMPILER_STRIP_GATE(0x80B8CC50, &lit_8599); #pragma pop /* 80B83FA4-80B84200 00BB84 025C+00 1/1 0/0 0/0 .text diveCalc__11daNpc_zrA_cFssi */ @@ -5359,28 +5413,28 @@ static asm void s_sub(void* param_0, void* param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8871 = 1000.0f; -COMPILER_STRIP_GATE(80B8CC54, &lit_8871); +COMPILER_STRIP_GATE(0x80B8CC54, &lit_8871); #pragma pop /* 80B8CC58-80B8CC5C 000800 0004+00 0/3 0/0 0/0 .rodata @8872 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_8872 = 0x4705FD72; -COMPILER_STRIP_GATE(80B8CC58, &lit_8872); +COMPILER_STRIP_GATE(0x80B8CC58, &lit_8872); #pragma pop /* 80B8CC5C-80B8CC60 000804 0004+00 0/3 0/0 0/0 .rodata @8873 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_8873 = 0xC5CC6EE9; -COMPILER_STRIP_GATE(80B8CC5C, &lit_8873); +COMPILER_STRIP_GATE(0x80B8CC5C, &lit_8873); #pragma pop /* 80B8CC60-80B8CC64 000808 0004+00 0/3 0/0 0/0 .rodata @8874 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_8874 = 0xC6BD673C; -COMPILER_STRIP_GATE(80B8CC60, &lit_8874); +COMPILER_STRIP_GATE(0x80B8CC60, &lit_8874); #pragma pop /* 80B84298-80B84B74 00BE78 08DC+00 4/0 0/0 0/0 .text waitRiverDescend__11daNpc_zrA_cFPv @@ -5399,77 +5453,77 @@ asm void daNpc_zrA_c::waitRiverDescend(void* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9323 = 9.0f / 5.0f; -COMPILER_STRIP_GATE(80B8CC64, &lit_9323); +COMPILER_STRIP_GATE(0x80B8CC64, &lit_9323); #pragma pop /* 80B8CC68-80B8CC6C 000810 0004+00 0/1 0/0 0/0 .rodata @9324 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9324 = 7.0f / 5.0f; -COMPILER_STRIP_GATE(80B8CC68, &lit_9324); +COMPILER_STRIP_GATE(0x80B8CC68, &lit_9324); #pragma pop /* 80B8CC6C-80B8CC70 000814 0004+00 0/1 0/0 0/0 .rodata @9325 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9325 = 5000.0f; -COMPILER_STRIP_GATE(80B8CC6C, &lit_9325); +COMPILER_STRIP_GATE(0x80B8CC6C, &lit_9325); #pragma pop /* 80B8CC70-80B8CC74 000818 0004+00 0/1 0/0 0/0 .rodata @9326 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9326 = 3500.0f; -COMPILER_STRIP_GATE(80B8CC70, &lit_9326); +COMPILER_STRIP_GATE(0x80B8CC70, &lit_9326); #pragma pop /* 80B8CC74-80B8CC78 00081C 0004+00 0/1 0/0 0/0 .rodata @9327 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9327 = 2.0f / 5.0f; -COMPILER_STRIP_GATE(80B8CC74, &lit_9327); +COMPILER_STRIP_GATE(0x80B8CC74, &lit_9327); #pragma pop /* 80B8CC78-80B8CC7C 000820 0004+00 0/1 0/0 0/0 .rodata @9328 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9328 = 3000.0f; -COMPILER_STRIP_GATE(80B8CC78, &lit_9328); +COMPILER_STRIP_GATE(0x80B8CC78, &lit_9328); #pragma pop /* 80B8CC7C-80B8CC80 000824 0004+00 0/2 0/0 0/0 .rodata @9329 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9329 = 0.25f; -COMPILER_STRIP_GATE(80B8CC7C, &lit_9329); +COMPILER_STRIP_GATE(0x80B8CC7C, &lit_9329); #pragma pop /* 80B8CC80-80B8CC84 000828 0004+00 0/5 0/0 0/0 .rodata @9330 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9330 = 25.0f; -COMPILER_STRIP_GATE(80B8CC80, &lit_9330); +COMPILER_STRIP_GATE(0x80B8CC80, &lit_9330); #pragma pop /* 80B8CC84-80B8CC88 00082C 0004+00 0/2 0/0 0/0 .rodata @9331 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9331 = 13.0f / 10.0f; -COMPILER_STRIP_GATE(80B8CC84, &lit_9331); +COMPILER_STRIP_GATE(0x80B8CC84, &lit_9331); #pragma pop /* 80B8CC88-80B8CC8C 000830 0004+00 0/2 0/0 0/0 .rodata @9332 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9332 = 1.0f / 20.0f; -COMPILER_STRIP_GATE(80B8CC88, &lit_9332); +COMPILER_STRIP_GATE(0x80B8CC88, &lit_9332); #pragma pop /* 80B8CC8C-80B8CC90 000834 0004+00 0/2 0/0 0/0 .rodata @9333 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9333 = 17.0f / 10.0f; -COMPILER_STRIP_GATE(80B8CC8C, &lit_9333); +COMPILER_STRIP_GATE(0x80B8CC8C, &lit_9333); #pragma pop /* 80B84B74-80B85B14 00C754 0FA0+00 2/2 0/0 0/0 .text swimRiverDescend__11daNpc_zrA_cFPv @@ -5499,28 +5553,28 @@ asm void daNpc_zrA_c::swimRiverDescend2(void* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9558 = -9.25f; -COMPILER_STRIP_GATE(80B8CC90, &lit_9558); +COMPILER_STRIP_GATE(0x80B8CC90, &lit_9558); #pragma pop /* 80B8CC94-80B8CC98 00083C 0004+00 0/3 0/0 0/0 .rodata @9559 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9559 = 4.5f; -COMPILER_STRIP_GATE(80B8CC94, &lit_9559); +COMPILER_STRIP_GATE(0x80B8CC94, &lit_9559); #pragma pop /* 80B8CC98-80B8CC9C 000840 0004+00 0/3 0/0 0/0 .rodata @9560 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9560 = -14.0f; -COMPILER_STRIP_GATE(80B8CC98, &lit_9560); +COMPILER_STRIP_GATE(0x80B8CC98, &lit_9560); #pragma pop /* 80B8CC9C-80B8CCA0 000844 0004+00 0/3 0/0 0/0 .rodata @9561 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9561 = 6.25f; -COMPILER_STRIP_GATE(80B8CC9C, &lit_9561); +COMPILER_STRIP_GATE(0x80B8CC9C, &lit_9561); #pragma pop /* 80B8601C-80B86440 00DBFC 0424+00 4/0 0/0 0/0 .text diveRiverDescend__11daNpc_zrA_cFPv @@ -5539,7 +5593,7 @@ asm void daNpc_zrA_c::diveRiverDescend(void* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9719 = -14100.0f; -COMPILER_STRIP_GATE(80B8CCA0, &lit_9719); +COMPILER_STRIP_GATE(0x80B8CCA0, &lit_9719); #pragma pop /* 80B86440-80B86A2C 00E020 05EC+00 2/0 0/0 0/0 .text swimGoalRiverDescend__11daNpc_zrA_cFPv */ @@ -5565,7 +5619,7 @@ asm void daNpc_zrA_c::returnRiverDescend(void* param_0) { /* ############################################################################################## */ /* 80B8CCA4-80B8CCA8 00084C 0004+00 1/1 0/0 0/0 .rodata @9834 */ SECTION_RODATA static f32 const lit_9834 = 130.0f; -COMPILER_STRIP_GATE(80B8CCA4, &lit_9834); +COMPILER_STRIP_GATE(0x80B8CCA4, &lit_9834); /* 80B86D9C-80B86E78 00E97C 00DC+00 3/3 0/0 0/0 .text moveRiverPosCalc__11daNpc_zrA_cFR4cXyz */ #pragma push @@ -5582,7 +5636,7 @@ asm void daNpc_zrA_c::moveRiverPosCalc(cXyz& param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9860 = -100.0f; -COMPILER_STRIP_GATE(80B8CCA8, &lit_9860); +COMPILER_STRIP_GATE(0x80B8CCA8, &lit_9860); #pragma pop /* 80B86E78-80B86FAC 00EA58 0134+00 1/1 0/0 0/0 .text createRuppi__11daNpc_zrA_cFv */ @@ -5600,21 +5654,21 @@ asm void daNpc_zrA_c::createRuppi() { #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_9933 = 0x472310EB; -COMPILER_STRIP_GATE(80B8CCAC, &lit_9933); +COMPILER_STRIP_GATE(0x80B8CCAC, &lit_9933); #pragma pop /* 80B8CCB0-80B8CCB4 000858 0004+00 0/2 0/0 0/0 .rodata @9934 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_9934 = 0xC5CB15B8; -COMPILER_STRIP_GATE(80B8CCB0, &lit_9934); +COMPILER_STRIP_GATE(0x80B8CCB0, &lit_9934); #pragma pop /* 80B8CCB4-80B8CCB8 00085C 0004+00 0/2 0/0 0/0 .rodata @9935 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_9935 = 0xC6915348; -COMPILER_STRIP_GATE(80B8CCB4, &lit_9935); +COMPILER_STRIP_GATE(0x80B8CCB4, &lit_9935); #pragma pop /* 80B86FAC-80B872F0 00EB8C 0344+00 3/0 0/0 0/0 .text ECut_beforeBlastzrR__11daNpc_zrA_cFi */ @@ -5632,49 +5686,49 @@ asm void daNpc_zrA_c::ECut_beforeBlastzrR(int param_0) { #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_9936 = 0x46F15F1E; -COMPILER_STRIP_GATE(80B8CCB8, &lit_9936); +COMPILER_STRIP_GATE(0x80B8CCB8, &lit_9936); #pragma pop /* 80B8CCBC-80B8CCC0 000864 0004+00 0/0 0/0 0/0 .rodata @9937 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_9937 = 0xC5CE06CC; -COMPILER_STRIP_GATE(80B8CCBC, &lit_9937); +COMPILER_STRIP_GATE(0x80B8CCBC, &lit_9937); #pragma pop /* 80B8CCC0-80B8CCC4 000868 0004+00 0/0 0/0 0/0 .rodata @9938 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_9938 = 0xC6B50464; -COMPILER_STRIP_GATE(80B8CCC0, &lit_9938); +COMPILER_STRIP_GATE(0x80B8CCC0, &lit_9938); #pragma pop /* 80B8CCC4-80B8CCC8 00086C 0004+00 0/1 0/0 0/0 .rodata @9988 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_9988 = 0x471FF0EB; -COMPILER_STRIP_GATE(80B8CCC4, &lit_9988); +COMPILER_STRIP_GATE(0x80B8CCC4, &lit_9988); #pragma pop /* 80B8CCC8-80B8CCCC 000870 0004+00 0/1 0/0 0/0 .rodata @9989 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_9989 = 0x46FF16FF; -COMPILER_STRIP_GATE(80B8CCC8, &lit_9989); +COMPILER_STRIP_GATE(0x80B8CCC8, &lit_9989); #pragma pop /* 80B8CCCC-80B8CCD0 000874 0004+00 0/1 0/0 0/0 .rodata @9990 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_9990 = 0xC5B861C1; -COMPILER_STRIP_GATE(80B8CCCC, &lit_9990); +COMPILER_STRIP_GATE(0x80B8CCCC, &lit_9990); #pragma pop /* 80B8CCD0-80B8CCD4 000878 0004+00 0/1 0/0 0/0 .rodata @9991 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_9991 = 0xC6AF810D; -COMPILER_STRIP_GATE(80B8CCD0, &lit_9991); +COMPILER_STRIP_GATE(0x80B8CCD0, &lit_9991); #pragma pop /* 80B872F0-80B87510 00EED0 0220+00 1/0 0/0 0/0 .text ECut_afterBlastzrR__11daNpc_zrA_cFi @@ -5693,70 +5747,70 @@ asm void daNpc_zrA_c::ECut_afterBlastzrR(int param_0) { #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_10576 = 0xC7983ADA; -COMPILER_STRIP_GATE(80B8CCD4, &lit_10576); +COMPILER_STRIP_GATE(0x80B8CCD4, &lit_10576); #pragma pop /* 80B8CCD8-80B8CCDC 000880 0004+00 0/2 0/0 0/0 .rodata @10577 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10577 = -18800.0f; -COMPILER_STRIP_GATE(80B8CCD8, &lit_10577); +COMPILER_STRIP_GATE(0x80B8CCD8, &lit_10577); #pragma pop /* 80B8CCDC-80B8CCE0 000884 0004+00 0/2 0/0 0/0 .rodata @10578 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_10578 = 0x471ADD4D; -COMPILER_STRIP_GATE(80B8CCDC, &lit_10578); +COMPILER_STRIP_GATE(0x80B8CCDC, &lit_10578); #pragma pop /* 80B8CCE0-80B8CCE4 000888 0004+00 0/2 0/0 0/0 .rodata @10579 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_10579 = 0xC79A2EDA; -COMPILER_STRIP_GATE(80B8CCE0, &lit_10579); +COMPILER_STRIP_GATE(0x80B8CCE0, &lit_10579); #pragma pop /* 80B8CCE4-80B8CCE8 00088C 0004+00 0/2 0/0 0/0 .rodata @10580 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10580 = -18640.0f; -COMPILER_STRIP_GATE(80B8CCE4, &lit_10580); +COMPILER_STRIP_GATE(0x80B8CCE4, &lit_10580); #pragma pop /* 80B8CCE8-80B8CCEC 000890 0004+00 0/2 0/0 0/0 .rodata @10581 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10581 = 350.0f; -COMPILER_STRIP_GATE(80B8CCE8, &lit_10581); +COMPILER_STRIP_GATE(0x80B8CCE8, &lit_10581); #pragma pop /* 80B8CCEC-80B8CCF0 000894 0004+00 0/2 0/0 0/0 .rodata @10582 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10582 = 15.0f; -COMPILER_STRIP_GATE(80B8CCEC, &lit_10582); +COMPILER_STRIP_GATE(0x80B8CCEC, &lit_10582); #pragma pop /* 80B8CCF0-80B8CCF4 000898 0004+00 0/2 0/0 0/0 .rodata @10583 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10583 = 3.0f / 100.0f; -COMPILER_STRIP_GATE(80B8CCF0, &lit_10583); +COMPILER_STRIP_GATE(0x80B8CCF0, &lit_10583); #pragma pop /* 80B8CCF4-80B8CCF8 00089C 0004+00 0/2 0/0 0/0 .rodata @10584 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10584 = 400.0f; -COMPILER_STRIP_GATE(80B8CCF4, &lit_10584); +COMPILER_STRIP_GATE(0x80B8CCF4, &lit_10584); #pragma pop /* 80B8CCF8-80B8CCFC 0008A0 0004+00 0/2 0/0 0/0 .rodata @10585 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10585 = 22.0f; -COMPILER_STRIP_GATE(80B8CCF8, &lit_10585); +COMPILER_STRIP_GATE(0x80B8CCF8, &lit_10585); #pragma pop /* 80B87510-80B88B04 00F0F0 15F4+00 1/0 0/0 0/0 .text ECut_thanksBlast__11daNpc_zrA_cFi @@ -5825,21 +5879,21 @@ asm void daNpc_zrA_c::tobiWait(void* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_11359 = -42.0f / 25.0f; -COMPILER_STRIP_GATE(80B8CCFC, &lit_11359); +COMPILER_STRIP_GATE(0x80B8CCFC, &lit_11359); #pragma pop /* 80B8CD00-80B8CD04 0008A8 0004+00 0/1 0/0 0/0 .rodata @11360 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_11360 = 0xC0FFAE14; -COMPILER_STRIP_GATE(80B8CD00, &lit_11360); +COMPILER_STRIP_GATE(0x80B8CD00, &lit_11360); #pragma pop /* 80B8CD04-80B8CD08 0008AC 0004+00 0/1 0/0 0/0 .rodata @11361 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_11361 = 0x434E5EB8; -COMPILER_STRIP_GATE(80B8CD04, &lit_11361); +COMPILER_STRIP_GATE(0x80B8CD04, &lit_11361); #pragma pop /* 80B8A648-80B8A7F8 012228 01B0+00 2/0 0/0 0/0 .text tobikomi1__11daNpc_zrA_cFPv */ @@ -5857,7 +5911,7 @@ asm void daNpc_zrA_c::tobikomi1(void* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_11409 = -47.0f; -COMPILER_STRIP_GATE(80B8CD08, &lit_11409); +COMPILER_STRIP_GATE(0x80B8CD08, &lit_11409); #pragma pop /* 80B8A7F8-80B8AA1C 0123D8 0224+00 2/0 0/0 0/0 .text tobikomi2__11daNpc_zrA_cFPv */ @@ -5927,56 +5981,56 @@ asm void daNpc_zrA_c::waitSearch(void* param_0) { SECTION_RODATA static u8 const lit_11740[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B8CD0C, &lit_11740); +COMPILER_STRIP_GATE(0x80B8CD0C, &lit_11740); #pragma pop /* 80B8CD14-80B8CD18 0008BC 0004+00 0/2 0/0 0/0 .rodata @11931 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_11931 = 0xC1F9999A; -COMPILER_STRIP_GATE(80B8CD14, &lit_11931); +COMPILER_STRIP_GATE(0x80B8CD14, &lit_11931); #pragma pop /* 80B8CD18-80B8CD1C 0008C0 0004+00 0/2 0/0 0/0 .rodata @11932 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_11932 = 0x416B3333; -COMPILER_STRIP_GATE(80B8CD18, &lit_11932); +COMPILER_STRIP_GATE(0x80B8CD18, &lit_11932); #pragma pop /* 80B8CD1C-80B8CD20 0008C4 0004+00 0/2 0/0 0/0 .rodata @11933 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_11933 = -30.0f; -COMPILER_STRIP_GATE(80B8CD1C, &lit_11933); +COMPILER_STRIP_GATE(0x80B8CD1C, &lit_11933); #pragma pop /* 80B8CD20-80B8CD24 0008C8 0004+00 0/2 0/0 0/0 .rodata @11934 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_11934 = 0x43525EB8; -COMPILER_STRIP_GATE(80B8CD20, &lit_11934); +COMPILER_STRIP_GATE(0x80B8CD20, &lit_11934); #pragma pop /* 80B8CD24-80B8CD28 0008CC 0004+00 0/2 0/0 0/0 .rodata @11935 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_11935 = 0xC5963D9A; -COMPILER_STRIP_GATE(80B8CD24, &lit_11935); +COMPILER_STRIP_GATE(0x80B8CD24, &lit_11935); #pragma pop /* 80B8CD28-80B8CD2C 0008D0 0004+00 0/2 0/0 0/0 .rodata @11936 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_11936 = 0xC34F71AA; -COMPILER_STRIP_GATE(80B8CD28, &lit_11936); +COMPILER_STRIP_GATE(0x80B8CD28, &lit_11936); #pragma pop /* 80B8CD2C-80B8CD30 0008D4 0004+00 0/2 0/0 0/0 .rodata @11937 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_11937 = 0x459FAED5; -COMPILER_STRIP_GATE(80B8CD2C, &lit_11937); +COMPILER_STRIP_GATE(0x80B8CD2C, &lit_11937); #pragma pop /* 80B8B530-80B8BCE8 013110 07B8+00 1/0 0/0 0/0 .text ECut_searchPrince1__11daNpc_zrA_cFi @@ -6209,40 +6263,4 @@ static u8 data_80B8DB10[4]; static u8 data_80B8DB14[4]; #pragma pop -/* 80B8CD30-80B8CE8F 0008D8 015F+00 16/12 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80B8CD30 = "TALK_SWIM"; -SECTION_DEAD static char const* const stringBase_80B8CD3A = "BEFORE_BLAST_ZRR"; -SECTION_DEAD static char const* const stringBase_80B8CD4B = "AFTER_BLAST_ZRR"; -SECTION_DEAD static char const* const stringBase_80B8CD5B = "THANKS_BLAST"; -SECTION_DEAD static char const* const stringBase_80B8CD68 = "RESULT_ANNOUNCE"; -SECTION_DEAD static char const* const stringBase_80B8CD78 = "CARRY_WATERFALL"; -SECTION_DEAD static char const* const stringBase_80B8CD88 = "CARRY_WATERFALL_NIGHT"; -SECTION_DEAD static char const* const stringBase_80B8CD9E = "CARRY_WATERFALL_SKIP"; -SECTION_DEAD static char const* const stringBase_80B8CDB3 = "CARRY_WATERFALL_NIGHT_SKIP"; -SECTION_DEAD static char const* const stringBase_80B8CDCE = "SEARCH_PRINCE"; -SECTION_DEAD static char const* const stringBase_80B8CDDC = "TALK_MULTI"; -SECTION_DEAD static char const* const stringBase_80B8CDE7 = "TALK_MULTI2"; -SECTION_DEAD static char const* const stringBase_80B8CDF3 = "zrA"; -SECTION_DEAD static char const* const stringBase_80B8CDF7 = "zrA_nml"; -SECTION_DEAD static char const* const stringBase_80B8CDFF = "zrA_nml2"; -SECTION_DEAD static char const* const stringBase_80B8CE08 = "zrA_sp"; -SECTION_DEAD static char const* const stringBase_80B8CE0F = "zrA_MDL"; -SECTION_DEAD static char const* const stringBase_80B8CE17 = "zrA_TW"; -SECTION_DEAD static char const* const stringBase_80B8CE1E = "zrA_sad"; -SECTION_DEAD static char const* const stringBase_80B8CE26 = "zrA_obj"; -SECTION_DEAD static char const* const stringBase_80B8CE2E = "zrA_tobi"; -SECTION_DEAD static char const* const stringBase_80B8CE37 = "zrA2"; -SECTION_DEAD static char const* const stringBase_80B8CE3C = "zrA_objTW"; -SECTION_DEAD static char const* const stringBase_80B8CE46 = "zrA_talk"; -SECTION_DEAD static char const* const stringBase_80B8CE4F = "zrR"; -SECTION_DEAD static char const* const stringBase_80B8CE53 = "zrWF"; -SECTION_DEAD static char const* const stringBase_80B8CE58 = ""; -SECTION_DEAD static char const* const stringBase_80B8CE59 = "SEARCH_PRINCE1"; -SECTION_DEAD static char const* const stringBase_80B8CE68 = "SEARCH_PRINCE2"; -SECTION_DEAD static char const* const stringBase_80B8CE77 = "F_SP115"; -SECTION_DEAD static char const* const stringBase_80B8CE7F = "NO_RESPONSE"; -SECTION_DEAD static char const* const stringBase_80B8CE8B = "prm"; -#pragma pop +/* 80B8CD30-80B8CD30 0008D8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/npc/d_a_npc_zrc/d_a_npc_zrc.cpp b/rel/d/a/npc/d_a_npc_zrc/d_a_npc_zrc.cpp index bbe5f002ddd..3f766ec661e 100644 --- a/rel/d/a/npc/d_a_npc_zrc/d_a_npc_zrc.cpp +++ b/rel/d/a/npc/d_a_npc_zrc/d_a_npc_zrc.cpp @@ -27,12 +27,12 @@ struct mDoExt_bckAnm { /* 8000D990 */ void changeBckOnly(J3DAnmTransform*); }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; +struct J3DModelData {}; + struct Vec {}; struct Z2Creature { @@ -73,31 +73,31 @@ struct daPy_py_c { /* 8015F424 */ void checkNowWolfEyeUp(); }; -struct J3DJoint {}; - struct J3DModel {}; +struct J3DJoint {}; + struct dCcD_GObjInf { /* 80083A28 */ dCcD_GObjInf(); /* 800840E4 */ ~dCcD_GObjInf(); }; +struct J3DAnmTexPattern { + /* 8032AF50 */ void getTexNo(u16, u16*) const; +}; + struct J3DAnmTextureSRTKey {}; +struct J3DAnmTransformKey {}; + +struct _GXColorS10 {}; + struct dCcD_SrcCyl {}; struct dCcD_Cyl { /* 800848B4 */ void Set(dCcD_SrcCyl const&); }; -struct _GXColorS10 {}; - -struct J3DAnmTexPattern { - /* 8032AF50 */ void getTexNo(u16, u16*) const; -}; - -struct J3DAnmTransformKey {}; - struct daNpcF_c { struct daNpcF_anmPlayData {}; @@ -235,7 +235,6 @@ struct dMsgFlow_c { struct dEvt_control_c { /* 80042468 */ void reset(); /* 80042518 */ void reset(void*); - /* 800436EC */ void setPtI_Id(unsigned int); }; struct dEvent_manager_c { @@ -635,6 +634,20 @@ extern "C" void __register_global_object(); // /* ############################################################################################## */ +/* 80B9369C-80B9369C 0004A0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80B9369C = "EARRING_GET"; +SECTION_DEAD static char const* const stringBase_80B936A8 = "zrC"; +SECTION_DEAD static char const* const stringBase_80B936AC = "zrC1"; +SECTION_DEAD static char const* const stringBase_80B936B1 = "zrC2"; +SECTION_DEAD static char const* const stringBase_80B936B6 = "zrC_MDL"; +SECTION_DEAD static char const* const stringBase_80B936BE = "zrC_TW"; +SECTION_DEAD static char const* const stringBase_80B936C5 = "zrC_Sick"; +SECTION_DEAD static char const* const stringBase_80B936CE = "zrC_EGD"; +SECTION_DEAD static char const* const stringBase_80B936D6 = ""; +#pragma pop + /* 80B936E8-80B936F4 000000 000C+00 4/4 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -1110,7 +1123,7 @@ SECTION_RODATA u8 const daNpc_zrC_Param_c::m[116] = { 0x00, 0x00, 0xC3, 0x96, 0x00, 0x00, 0x00, 0x3C, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x43, 0xAF, 0x00, 0x00, 0x45, 0x0F, 0xC0, 0x00, }; -COMPILER_STRIP_GATE(80B931FC, &daNpc_zrC_Param_c::m); +COMPILER_STRIP_GATE(0x80B931FC, &daNpc_zrC_Param_c::m); /* 80B93270-80B93284 000074 0014+00 0/1 0/0 0/0 .rodata heapSize$4316 */ #pragma push @@ -1119,35 +1132,35 @@ SECTION_RODATA static u8 const heapSize[20] = { 0x00, 0x00, 0x60, 0x10, 0x00, 0x00, 0x46, 0x90, 0x00, 0x00, 0x60, 0x10, 0x00, 0x00, 0x60, 0x10, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B93270, &heapSize); +COMPILER_STRIP_GATE(0x80B93270, &heapSize); #pragma pop /* 80B93284-80B93288 000088 0004+00 0/1 0/0 0/0 .rodata @4411 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4411 = -300.0f; -COMPILER_STRIP_GATE(80B93284, &lit_4411); +COMPILER_STRIP_GATE(0x80B93284, &lit_4411); #pragma pop /* 80B93288-80B9328C 00008C 0004+00 0/1 0/0 0/0 .rodata @4412 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4412 = -50.0f; -COMPILER_STRIP_GATE(80B93288, &lit_4412); +COMPILER_STRIP_GATE(0x80B93288, &lit_4412); #pragma pop /* 80B9328C-80B93290 000090 0004+00 0/1 0/0 0/0 .rodata @4413 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4413 = 300.0f; -COMPILER_STRIP_GATE(80B9328C, &lit_4413); +COMPILER_STRIP_GATE(0x80B9328C, &lit_4413); #pragma pop /* 80B93290-80B93294 000094 0004+00 0/1 0/0 0/0 .rodata @4414 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4414 = 450.0f; -COMPILER_STRIP_GATE(80B93290, &lit_4414); +COMPILER_STRIP_GATE(0x80B93290, &lit_4414); #pragma pop /* 80B8E03C-80B8E338 00051C 02FC+00 1/1 0/0 0/0 .text create__11daNpc_zrC_cFv */ @@ -1163,7 +1176,7 @@ asm void daNpc_zrC_c::create() { /* ############################################################################################## */ /* 80B93294-80B93298 000098 0004+00 4/4 0/0 0/0 .rodata @4483 */ SECTION_RODATA static f32 const lit_4483 = 1.0f; -COMPILER_STRIP_GATE(80B93294, &lit_4483); +COMPILER_STRIP_GATE(0x80B93294, &lit_4483); /* 80B93298-80B9329C 00009C 0004+00 6/9 0/0 0/0 .rodata @4484 */ SECTION_RODATA static u8 const lit_4484[4] = { @@ -1172,7 +1185,7 @@ SECTION_RODATA static u8 const lit_4484[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B93298, &lit_4484); +COMPILER_STRIP_GATE(0x80B93298, &lit_4484); /* 80B8E338-80B8E674 000818 033C+00 1/1 0/0 0/0 .text CreateHeap__11daNpc_zrC_cFv */ #pragma push @@ -1319,7 +1332,7 @@ asm void daNpc_zrC_c::Draw() { SECTION_RODATA static u8 const lit_4538[12] = { 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x04, }; -COMPILER_STRIP_GATE(80B9329C, &lit_4538); +COMPILER_STRIP_GATE(0x80B9329C, &lit_4538); /* 80B8E914-80B8EB48 000DF4 0234+00 1/1 0/0 0/0 .text * ctrlJoint__11daNpc_zrC_cFP8J3DJointP8J3DModel */ @@ -1377,11 +1390,11 @@ asm void daNpc_zrC_c::main() { /* ############################################################################################## */ /* 80B932A8-80B932AC 0000AC 0004+00 8/10 0/0 0/0 .rodata @4767 */ SECTION_RODATA static f32 const lit_4767 = -1.0f; -COMPILER_STRIP_GATE(80B932A8, &lit_4767); +COMPILER_STRIP_GATE(0x80B932A8, &lit_4767); /* 80B932AC-80B932B0 0000B0 0004+00 1/1 0/0 0/0 .rodata @4768 */ SECTION_RODATA static f32 const lit_4768 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(80B932AC, &lit_4768); +COMPILER_STRIP_GATE(0x80B932AC, &lit_4768); /* 80B8EF2C-80B8F00C 00140C 00E0+00 1/0 0/0 0/0 .text ctrlBtk__11daNpc_zrC_cFv */ #pragma push @@ -1398,21 +1411,21 @@ asm void daNpc_zrC_c::ctrlBtk() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4919 = 10.0f; -COMPILER_STRIP_GATE(80B932B0, &lit_4919); +COMPILER_STRIP_GATE(0x80B932B0, &lit_4919); #pragma pop /* 80B932B4-80B932B8 0000B8 0004+00 0/1 0/0 0/0 .rodata @4920 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4920 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(80B932B4, &lit_4920); +COMPILER_STRIP_GATE(0x80B932B4, &lit_4920); #pragma pop /* 80B932B8-80B932BC 0000BC 0004+00 0/1 0/0 0/0 .rodata @4921 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4921 = 125.0f; -COMPILER_STRIP_GATE(80B932B8, &lit_4921); +COMPILER_STRIP_GATE(0x80B932B8, &lit_4921); #pragma pop /* 80B932BC-80B932C4 0000C0 0008+00 0/2 0/0 0/0 .rodata @4922 */ @@ -1421,7 +1434,7 @@ COMPILER_STRIP_GATE(80B932B8, &lit_4921); SECTION_RODATA static u8 const lit_4922[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B932BC, &lit_4922); +COMPILER_STRIP_GATE(0x80B932BC, &lit_4922); #pragma pop /* 80B932C4-80B932CC 0000C8 0008+00 0/2 0/0 0/0 .rodata @4923 */ @@ -1430,7 +1443,7 @@ COMPILER_STRIP_GATE(80B932BC, &lit_4922); SECTION_RODATA static u8 const lit_4923[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B932C4, &lit_4923); +COMPILER_STRIP_GATE(0x80B932C4, &lit_4923); #pragma pop /* 80B932CC-80B932D4 0000D0 0008+00 0/2 0/0 0/0 .rodata @4924 */ @@ -1439,21 +1452,21 @@ COMPILER_STRIP_GATE(80B932C4, &lit_4923); SECTION_RODATA static u8 const lit_4924[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B932CC, &lit_4924); +COMPILER_STRIP_GATE(0x80B932CC, &lit_4924); #pragma pop /* 80B932D4-80B932D8 0000D8 0004+00 0/1 0/0 0/0 .rodata @4925 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4925 = -20.0f; -COMPILER_STRIP_GATE(80B932D4, &lit_4925); +COMPILER_STRIP_GATE(0x80B932D4, &lit_4925); #pragma pop /* 80B932D8-80B932DC 0000DC 0004+00 0/1 0/0 0/0 .rodata @4926 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4926 = 15.0f; -COMPILER_STRIP_GATE(80B932D8, &lit_4926); +COMPILER_STRIP_GATE(0x80B932D8, &lit_4926); #pragma pop /* 80B93C10-80B93C14 000008 0001+03 1/1 0/0 0/0 .bss @1109 */ @@ -1677,7 +1690,7 @@ asm void daNpc_zrC_c::reset() { SECTION_RODATA static u8 const lit_5139[12] = { 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80B932DC, &lit_5139); +COMPILER_STRIP_GATE(0x80B932DC, &lit_5139); #pragma pop /* 80B932E8-80B932F4 0000EC 000C+00 0/1 0/0 0/0 .rodata @5140 */ @@ -1686,7 +1699,7 @@ COMPILER_STRIP_GATE(80B932DC, &lit_5139); SECTION_RODATA static u8 const lit_5140[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B932E8, &lit_5140); +COMPILER_STRIP_GATE(0x80B932E8, &lit_5140); #pragma pop /* 80B932F4-80B932FC 0000F8 0008+00 0/1 0/0 0/0 .rodata @5141 */ @@ -1695,7 +1708,7 @@ COMPILER_STRIP_GATE(80B932E8, &lit_5140); SECTION_RODATA static u8 const lit_5141[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B932F4, &lit_5141); +COMPILER_STRIP_GATE(0x80B932F4, &lit_5141); #pragma pop /* 80B932FC-80B93308 000100 000C+00 0/1 0/0 0/0 .rodata @5142 */ @@ -1704,7 +1717,7 @@ COMPILER_STRIP_GATE(80B932F4, &lit_5141); SECTION_RODATA static u8 const lit_5142[12] = { 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80B932FC, &lit_5142); +COMPILER_STRIP_GATE(0x80B932FC, &lit_5142); #pragma pop /* 80B93308-80B93314 00010C 000C+00 0/1 0/0 0/0 .rodata @5143 */ @@ -1713,7 +1726,7 @@ COMPILER_STRIP_GATE(80B932FC, &lit_5142); SECTION_RODATA static u8 const lit_5143[12] = { 0x00, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B93308, &lit_5143); +COMPILER_STRIP_GATE(0x80B93308, &lit_5143); #pragma pop /* 80B93314-80B9331C 000118 0008+00 0/1 0/0 0/0 .rodata @5144 */ @@ -1722,7 +1735,7 @@ COMPILER_STRIP_GATE(80B93308, &lit_5143); SECTION_RODATA static u8 const lit_5144[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B93314, &lit_5144); +COMPILER_STRIP_GATE(0x80B93314, &lit_5144); #pragma pop /* 80B9331C-80B93328 000120 000C+00 0/1 0/0 0/0 .rodata @5145 */ @@ -1731,7 +1744,7 @@ COMPILER_STRIP_GATE(80B93314, &lit_5144); SECTION_RODATA static u8 const lit_5145[12] = { 0x00, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B9331C, &lit_5145); +COMPILER_STRIP_GATE(0x80B9331C, &lit_5145); #pragma pop /* 80B93328-80B9332C 00012C 0004+00 0/1 0/0 0/0 .rodata @5146 */ @@ -1743,7 +1756,7 @@ SECTION_RODATA static u8 const lit_5146[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B93328, &lit_5146); +COMPILER_STRIP_GATE(0x80B93328, &lit_5146); #pragma pop /* 80B9332C-80B93338 000130 000C+00 0/1 0/0 0/0 .rodata @5147 */ @@ -1752,7 +1765,7 @@ COMPILER_STRIP_GATE(80B93328, &lit_5146); SECTION_RODATA static u8 const lit_5147[12] = { 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80B9332C, &lit_5147); +COMPILER_STRIP_GATE(0x80B9332C, &lit_5147); #pragma pop /* 80B93338-80B93344 00013C 000C+00 0/1 0/0 0/0 .rodata @5148 */ @@ -1761,7 +1774,7 @@ COMPILER_STRIP_GATE(80B9332C, &lit_5147); SECTION_RODATA static u8 const lit_5148[12] = { 0x00, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B93338, &lit_5148); +COMPILER_STRIP_GATE(0x80B93338, &lit_5148); #pragma pop /* 80B93344-80B9334C 000148 0008+00 0/1 0/0 0/0 .rodata @5149 */ @@ -1770,7 +1783,7 @@ COMPILER_STRIP_GATE(80B93338, &lit_5148); SECTION_RODATA static u8 const lit_5149[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B93344, &lit_5149); +COMPILER_STRIP_GATE(0x80B93344, &lit_5149); #pragma pop /* 80B9334C-80B93358 000150 000C+00 0/1 0/0 0/0 .rodata @5150 */ @@ -1779,7 +1792,7 @@ COMPILER_STRIP_GATE(80B93344, &lit_5149); SECTION_RODATA static u8 const lit_5150[12] = { 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80B9334C, &lit_5150); +COMPILER_STRIP_GATE(0x80B9334C, &lit_5150); #pragma pop /* 80B93358-80B93364 00015C 000C+00 0/1 0/0 0/0 .rodata @5151 */ @@ -1788,7 +1801,7 @@ COMPILER_STRIP_GATE(80B9334C, &lit_5150); SECTION_RODATA static u8 const lit_5151[12] = { 0x00, 0x0F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B93358, &lit_5151); +COMPILER_STRIP_GATE(0x80B93358, &lit_5151); #pragma pop /* 80B93364-80B9336C 000168 0008+00 0/1 0/0 0/0 .rodata @5152 */ @@ -1797,7 +1810,7 @@ COMPILER_STRIP_GATE(80B93358, &lit_5151); SECTION_RODATA static u8 const lit_5152[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B93364, &lit_5152); +COMPILER_STRIP_GATE(0x80B93364, &lit_5152); #pragma pop /* 80B9336C-80B93378 000170 000C+00 0/1 0/0 0/0 .rodata @5153 */ @@ -1806,7 +1819,7 @@ COMPILER_STRIP_GATE(80B93364, &lit_5152); SECTION_RODATA static u8 const lit_5153[12] = { 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80B9336C, &lit_5153); +COMPILER_STRIP_GATE(0x80B9336C, &lit_5153); #pragma pop /* 80B93378-80B93384 00017C 000C+00 0/1 0/0 0/0 .rodata @5154 */ @@ -1815,7 +1828,7 @@ COMPILER_STRIP_GATE(80B9336C, &lit_5153); SECTION_RODATA static u8 const lit_5154[12] = { 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B93378, &lit_5154); +COMPILER_STRIP_GATE(0x80B93378, &lit_5154); #pragma pop /* 80B93384-80B9338C 000188 0008+00 0/1 0/0 0/0 .rodata @5155 */ @@ -1824,7 +1837,7 @@ COMPILER_STRIP_GATE(80B93378, &lit_5154); SECTION_RODATA static u8 const lit_5155[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B93384, &lit_5155); +COMPILER_STRIP_GATE(0x80B93384, &lit_5155); #pragma pop /* 80B9338C-80B93398 000190 000C+00 0/1 0/0 0/0 .rodata @5156 */ @@ -1833,7 +1846,7 @@ COMPILER_STRIP_GATE(80B93384, &lit_5155); SECTION_RODATA static u8 const lit_5156[12] = { 0x00, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80B9338C, &lit_5156); +COMPILER_STRIP_GATE(0x80B9338C, &lit_5156); #pragma pop /* 80B93398-80B933A4 00019C 000C+00 0/1 0/0 0/0 .rodata @5157 */ @@ -1842,7 +1855,7 @@ COMPILER_STRIP_GATE(80B9338C, &lit_5156); SECTION_RODATA static u8 const lit_5157[12] = { 0x00, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B93398, &lit_5157); +COMPILER_STRIP_GATE(0x80B93398, &lit_5157); #pragma pop /* 80B933A4-80B933AC 0001A8 0008+00 0/1 0/0 0/0 .rodata @5158 */ @@ -1851,7 +1864,7 @@ COMPILER_STRIP_GATE(80B93398, &lit_5157); SECTION_RODATA static u8 const lit_5158[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B933A4, &lit_5158); +COMPILER_STRIP_GATE(0x80B933A4, &lit_5158); #pragma pop /* 80B933AC-80B933B8 0001B0 000C+00 0/1 0/0 0/0 .rodata @5159 */ @@ -1860,7 +1873,7 @@ COMPILER_STRIP_GATE(80B933A4, &lit_5158); SECTION_RODATA static u8 const lit_5159[12] = { 0x00, 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80B933AC, &lit_5159); +COMPILER_STRIP_GATE(0x80B933AC, &lit_5159); #pragma pop /* 80B933B8-80B933C4 0001BC 000C+00 0/1 0/0 0/0 .rodata @5160 */ @@ -1869,7 +1882,7 @@ COMPILER_STRIP_GATE(80B933AC, &lit_5159); SECTION_RODATA static u8 const lit_5160[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B933B8, &lit_5160); +COMPILER_STRIP_GATE(0x80B933B8, &lit_5160); #pragma pop /* 80B933C4-80B933CC 0001C8 0008+00 0/1 0/0 0/0 .rodata @5161 */ @@ -1878,7 +1891,7 @@ COMPILER_STRIP_GATE(80B933B8, &lit_5160); SECTION_RODATA static u8 const lit_5161[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B933C4, &lit_5161); +COMPILER_STRIP_GATE(0x80B933C4, &lit_5161); #pragma pop /* 80B933CC-80B933D8 0001D0 000C+00 0/1 0/0 0/0 .rodata @5162 */ @@ -1887,7 +1900,7 @@ COMPILER_STRIP_GATE(80B933C4, &lit_5161); SECTION_RODATA static u8 const lit_5162[12] = { 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80B933CC, &lit_5162); +COMPILER_STRIP_GATE(0x80B933CC, &lit_5162); #pragma pop /* 80B933D8-80B933E4 0001DC 000C+00 0/1 0/0 0/0 .rodata @5163 */ @@ -1896,7 +1909,7 @@ COMPILER_STRIP_GATE(80B933CC, &lit_5162); SECTION_RODATA static u8 const lit_5163[12] = { 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B933D8, &lit_5163); +COMPILER_STRIP_GATE(0x80B933D8, &lit_5163); #pragma pop /* 80B933E4-80B933EC 0001E8 0008+00 0/1 0/0 0/0 .rodata @5164 */ @@ -1905,7 +1918,7 @@ COMPILER_STRIP_GATE(80B933D8, &lit_5163); SECTION_RODATA static u8 const lit_5164[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B933E4, &lit_5164); +COMPILER_STRIP_GATE(0x80B933E4, &lit_5164); #pragma pop /* 80B933EC-80B933F8 0001F0 000C+00 0/1 0/0 0/0 .rodata @5165 */ @@ -1914,7 +1927,7 @@ COMPILER_STRIP_GATE(80B933E4, &lit_5164); SECTION_RODATA static u8 const lit_5165[12] = { 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B933EC, &lit_5165); +COMPILER_STRIP_GATE(0x80B933EC, &lit_5165); #pragma pop /* 80B933F8-80B933FC 0001FC 0004+00 0/1 0/0 0/0 .rodata @5166 */ @@ -1926,7 +1939,7 @@ SECTION_RODATA static u8 const lit_5166[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B933F8, &lit_5166); +COMPILER_STRIP_GATE(0x80B933F8, &lit_5166); #pragma pop /* 80B933FC-80B93408 000200 000C+00 0/1 0/0 0/0 .rodata @5167 */ @@ -1935,7 +1948,7 @@ COMPILER_STRIP_GATE(80B933F8, &lit_5166); SECTION_RODATA static u8 const lit_5167[12] = { 0x00, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B933FC, &lit_5167); +COMPILER_STRIP_GATE(0x80B933FC, &lit_5167); #pragma pop /* 80B93408-80B9340C 00020C 0004+00 0/1 0/0 0/0 .rodata @5168 */ @@ -1947,7 +1960,7 @@ SECTION_RODATA static u8 const lit_5168[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B93408, &lit_5168); +COMPILER_STRIP_GATE(0x80B93408, &lit_5168); #pragma pop /* 80B9340C-80B93418 000210 000C+00 0/1 0/0 0/0 .rodata @5169 */ @@ -1956,7 +1969,7 @@ COMPILER_STRIP_GATE(80B93408, &lit_5168); SECTION_RODATA static u8 const lit_5169[12] = { 0x00, 0x0F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B9340C, &lit_5169); +COMPILER_STRIP_GATE(0x80B9340C, &lit_5169); #pragma pop /* 80B93418-80B9341C 00021C 0004+00 0/1 0/0 0/0 .rodata @5170 */ @@ -1968,7 +1981,7 @@ SECTION_RODATA static u8 const lit_5170[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B93418, &lit_5170); +COMPILER_STRIP_GATE(0x80B93418, &lit_5170); #pragma pop /* 80B9341C-80B93428 000220 000C+00 0/1 0/0 0/0 .rodata @5171 */ @@ -1977,7 +1990,7 @@ COMPILER_STRIP_GATE(80B93418, &lit_5170); SECTION_RODATA static u8 const lit_5171[12] = { 0x00, 0x0D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B9341C, &lit_5171); +COMPILER_STRIP_GATE(0x80B9341C, &lit_5171); #pragma pop /* 80B93428-80B9342C 00022C 0004+00 0/1 0/0 0/0 .rodata @5172 */ @@ -1989,7 +2002,7 @@ SECTION_RODATA static u8 const lit_5172[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B93428, &lit_5172); +COMPILER_STRIP_GATE(0x80B93428, &lit_5172); #pragma pop /* 80B9342C-80B93438 000230 000C+00 0/1 0/0 0/0 .rodata @5173 */ @@ -1998,7 +2011,7 @@ COMPILER_STRIP_GATE(80B93428, &lit_5172); SECTION_RODATA static u8 const lit_5173[12] = { 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80B9342C, &lit_5173); +COMPILER_STRIP_GATE(0x80B9342C, &lit_5173); #pragma pop /* 80B93438-80B93444 00023C 000C+00 0/1 0/0 0/0 .rodata @5174 */ @@ -2007,7 +2020,7 @@ COMPILER_STRIP_GATE(80B9342C, &lit_5173); SECTION_RODATA static u8 const lit_5174[12] = { 0x00, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B93438, &lit_5174); +COMPILER_STRIP_GATE(0x80B93438, &lit_5174); #pragma pop /* 80B93444-80B9344C 000248 0008+00 0/1 0/0 0/0 .rodata @5175 */ @@ -2016,7 +2029,7 @@ COMPILER_STRIP_GATE(80B93438, &lit_5174); SECTION_RODATA static u8 const lit_5175[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B93444, &lit_5175); +COMPILER_STRIP_GATE(0x80B93444, &lit_5175); #pragma pop /* 80B9344C-80B93458 000250 000C+00 0/1 0/0 0/0 .rodata @5176 */ @@ -2025,7 +2038,7 @@ COMPILER_STRIP_GATE(80B93444, &lit_5175); SECTION_RODATA static u8 const lit_5176[12] = { 0x00, 0x0B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80B9344C, &lit_5176); +COMPILER_STRIP_GATE(0x80B9344C, &lit_5176); #pragma pop /* 80B93458-80B93464 00025C 000C+00 0/1 0/0 0/0 .rodata @5177 */ @@ -2034,7 +2047,7 @@ COMPILER_STRIP_GATE(80B9344C, &lit_5176); SECTION_RODATA static u8 const lit_5177[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B93458, &lit_5177); +COMPILER_STRIP_GATE(0x80B93458, &lit_5177); #pragma pop /* 80B93464-80B9346C 000268 0008+00 0/1 0/0 0/0 .rodata @5178 */ @@ -2043,7 +2056,7 @@ COMPILER_STRIP_GATE(80B93458, &lit_5177); SECTION_RODATA static u8 const lit_5178[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B93464, &lit_5178); +COMPILER_STRIP_GATE(0x80B93464, &lit_5178); #pragma pop /* 80B9346C-80B93478 000270 000C+00 0/1 0/0 0/0 .rodata @5179 */ @@ -2052,7 +2065,7 @@ COMPILER_STRIP_GATE(80B93464, &lit_5178); SECTION_RODATA static u8 const lit_5179[12] = { 0x00, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B9346C, &lit_5179); +COMPILER_STRIP_GATE(0x80B9346C, &lit_5179); #pragma pop /* 80B93478-80B9347C 00027C 0004+00 0/1 0/0 0/0 .rodata @5180 */ @@ -2064,7 +2077,7 @@ SECTION_RODATA static u8 const lit_5180[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B93478, &lit_5180); +COMPILER_STRIP_GATE(0x80B93478, &lit_5180); #pragma pop /* 80B9347C-80B93488 000280 000C+00 0/1 0/0 0/0 .rodata @5181 */ @@ -2073,7 +2086,7 @@ COMPILER_STRIP_GATE(80B93478, &lit_5180); SECTION_RODATA static u8 const lit_5181[12] = { 0x00, 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B9347C, &lit_5181); +COMPILER_STRIP_GATE(0x80B9347C, &lit_5181); #pragma pop /* 80B93488-80B9348C 00028C 0004+00 0/1 0/0 0/0 .rodata @5182 */ @@ -2085,7 +2098,7 @@ SECTION_RODATA static u8 const lit_5182[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B93488, &lit_5182); +COMPILER_STRIP_GATE(0x80B93488, &lit_5182); #pragma pop /* 80B9348C-80B93498 000290 000C+00 0/1 0/0 0/0 .rodata @5183 */ @@ -2094,7 +2107,7 @@ COMPILER_STRIP_GATE(80B93488, &lit_5182); SECTION_RODATA static u8 const lit_5183[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B9348C, &lit_5183); +COMPILER_STRIP_GATE(0x80B9348C, &lit_5183); #pragma pop /* 80B93498-80B9349C 00029C 0004+00 0/1 0/0 0/0 .rodata @5184 */ @@ -2106,7 +2119,7 @@ SECTION_RODATA static u8 const lit_5184[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B93498, &lit_5184); +COMPILER_STRIP_GATE(0x80B93498, &lit_5184); #pragma pop /* 80B8FF14-80B904DC 0023F4 05C8+00 1/1 0/0 0/0 .text playExpression__11daNpc_zrC_cFv */ @@ -2130,7 +2143,7 @@ SECTION_RODATA static u8 const lit_5185[72] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B9349C, &lit_5185); +COMPILER_STRIP_GATE(0x80B9349C, &lit_5185); #pragma pop /* 80B934E4-80B934F0 0002E8 000C+00 0/1 0/0 0/0 .rodata @5222 */ @@ -2139,7 +2152,7 @@ COMPILER_STRIP_GATE(80B9349C, &lit_5185); SECTION_RODATA static u8 const lit_5222[12] = { 0x00, 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B934E4, &lit_5222); +COMPILER_STRIP_GATE(0x80B934E4, &lit_5222); #pragma pop /* 80B934F0-80B934F4 0002F4 0004+00 0/1 0/0 0/0 .rodata @5223 */ @@ -2151,7 +2164,7 @@ SECTION_RODATA static u8 const lit_5223[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B934F0, &lit_5223); +COMPILER_STRIP_GATE(0x80B934F0, &lit_5223); #pragma pop /* 80B934F4-80B93500 0002F8 000C+00 0/1 0/0 0/0 .rodata @5224 */ @@ -2160,7 +2173,7 @@ COMPILER_STRIP_GATE(80B934F0, &lit_5223); SECTION_RODATA static u8 const lit_5224[12] = { 0x00, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80B934F4, &lit_5224); +COMPILER_STRIP_GATE(0x80B934F4, &lit_5224); #pragma pop /* 80B93500-80B9350C 000304 000C+00 0/1 0/0 0/0 .rodata @5225 */ @@ -2169,7 +2182,7 @@ COMPILER_STRIP_GATE(80B934F4, &lit_5224); SECTION_RODATA static u8 const lit_5225[12] = { 0x00, 0x17, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B93500, &lit_5225); +COMPILER_STRIP_GATE(0x80B93500, &lit_5225); #pragma pop /* 80B9350C-80B93514 000310 0008+00 0/1 0/0 0/0 .rodata @5226 */ @@ -2178,7 +2191,7 @@ COMPILER_STRIP_GATE(80B93500, &lit_5225); SECTION_RODATA static u8 const lit_5226[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B9350C, &lit_5226); +COMPILER_STRIP_GATE(0x80B9350C, &lit_5226); #pragma pop /* 80B93514-80B93520 000318 000C+00 0/1 0/0 0/0 .rodata @5227 */ @@ -2187,7 +2200,7 @@ COMPILER_STRIP_GATE(80B9350C, &lit_5226); SECTION_RODATA static u8 const lit_5227[12] = { 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B93514, &lit_5227); +COMPILER_STRIP_GATE(0x80B93514, &lit_5227); #pragma pop /* 80B93520-80B93524 000324 0004+00 0/1 0/0 0/0 .rodata @5228 */ @@ -2199,7 +2212,7 @@ SECTION_RODATA static u8 const lit_5228[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B93520, &lit_5228); +COMPILER_STRIP_GATE(0x80B93520, &lit_5228); #pragma pop /* 80B93524-80B93530 000328 000C+00 0/1 0/0 0/0 .rodata @5229 */ @@ -2208,7 +2221,7 @@ COMPILER_STRIP_GATE(80B93520, &lit_5228); SECTION_RODATA static u8 const lit_5229[12] = { 0x00, 0x17, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B93524, &lit_5229); +COMPILER_STRIP_GATE(0x80B93524, &lit_5229); #pragma pop /* 80B93530-80B93534 000334 0004+00 0/1 0/0 0/0 .rodata @5230 */ @@ -2220,7 +2233,7 @@ SECTION_RODATA static u8 const lit_5230[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B93530, &lit_5230); +COMPILER_STRIP_GATE(0x80B93530, &lit_5230); #pragma pop /* 80B93534-80B93540 000338 000C+00 0/1 0/0 0/0 .rodata @5231 */ @@ -2229,7 +2242,7 @@ COMPILER_STRIP_GATE(80B93530, &lit_5230); SECTION_RODATA static u8 const lit_5231[12] = { 0x00, 0x19, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80B93534, &lit_5231); +COMPILER_STRIP_GATE(0x80B93534, &lit_5231); #pragma pop /* 80B93540-80B9354C 000344 000C+00 0/1 0/0 0/0 .rodata @5232 */ @@ -2238,7 +2251,7 @@ COMPILER_STRIP_GATE(80B93534, &lit_5231); SECTION_RODATA static u8 const lit_5232[12] = { 0x00, 0x1A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B93540, &lit_5232); +COMPILER_STRIP_GATE(0x80B93540, &lit_5232); #pragma pop /* 80B9354C-80B93554 000350 0008+00 0/1 0/0 0/0 .rodata @5233 */ @@ -2247,7 +2260,7 @@ COMPILER_STRIP_GATE(80B93540, &lit_5232); SECTION_RODATA static u8 const lit_5233[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B9354C, &lit_5233); +COMPILER_STRIP_GATE(0x80B9354C, &lit_5233); #pragma pop /* 80B93554-80B93560 000358 000C+00 0/1 0/0 0/0 .rodata @5234 */ @@ -2256,7 +2269,7 @@ COMPILER_STRIP_GATE(80B9354C, &lit_5233); SECTION_RODATA static u8 const lit_5234[12] = { 0x00, 0x1A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B93554, &lit_5234); +COMPILER_STRIP_GATE(0x80B93554, &lit_5234); #pragma pop /* 80B93560-80B93564 000364 0004+00 0/1 0/0 0/0 .rodata @5235 */ @@ -2268,7 +2281,7 @@ SECTION_RODATA static u8 const lit_5235[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B93560, &lit_5235); +COMPILER_STRIP_GATE(0x80B93560, &lit_5235); #pragma pop /* 80B93564-80B93570 000368 000C+00 0/1 0/0 0/0 .rodata @5236 */ @@ -2277,7 +2290,7 @@ COMPILER_STRIP_GATE(80B93560, &lit_5235); SECTION_RODATA static u8 const lit_5236[12] = { 0x00, 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80B93564, &lit_5236); +COMPILER_STRIP_GATE(0x80B93564, &lit_5236); #pragma pop /* 80B93570-80B9357C 000374 000C+00 0/1 0/0 0/0 .rodata @5237 */ @@ -2286,7 +2299,7 @@ COMPILER_STRIP_GATE(80B93564, &lit_5236); SECTION_RODATA static u8 const lit_5237[12] = { 0x00, 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B93570, &lit_5237); +COMPILER_STRIP_GATE(0x80B93570, &lit_5237); #pragma pop /* 80B9357C-80B93584 000380 0008+00 0/1 0/0 0/0 .rodata @5238 */ @@ -2295,7 +2308,7 @@ COMPILER_STRIP_GATE(80B93570, &lit_5237); SECTION_RODATA static u8 const lit_5238[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B9357C, &lit_5238); +COMPILER_STRIP_GATE(0x80B9357C, &lit_5238); #pragma pop /* 80B93584-80B93590 000388 000C+00 0/1 0/0 0/0 .rodata @5239 */ @@ -2304,7 +2317,7 @@ COMPILER_STRIP_GATE(80B9357C, &lit_5238); SECTION_RODATA static u8 const lit_5239[12] = { 0x00, 0x1C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80B93584, &lit_5239); +COMPILER_STRIP_GATE(0x80B93584, &lit_5239); #pragma pop /* 80B93590-80B9359C 000394 000C+00 0/1 0/0 0/0 .rodata @5240 */ @@ -2313,7 +2326,7 @@ COMPILER_STRIP_GATE(80B93584, &lit_5239); SECTION_RODATA static u8 const lit_5240[12] = { 0x00, 0x1D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B93590, &lit_5240); +COMPILER_STRIP_GATE(0x80B93590, &lit_5240); #pragma pop /* 80B9359C-80B935A4 0003A0 0008+00 0/1 0/0 0/0 .rodata @5241 */ @@ -2322,7 +2335,7 @@ COMPILER_STRIP_GATE(80B93590, &lit_5240); SECTION_RODATA static u8 const lit_5241[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B9359C, &lit_5241); +COMPILER_STRIP_GATE(0x80B9359C, &lit_5241); #pragma pop /* 80B935A4-80B935B0 0003A8 000C+00 0/1 0/0 0/0 .rodata @5242 */ @@ -2331,7 +2344,7 @@ COMPILER_STRIP_GATE(80B9359C, &lit_5241); SECTION_RODATA static u8 const lit_5242[12] = { 0x00, 0x1D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B935A4, &lit_5242); +COMPILER_STRIP_GATE(0x80B935A4, &lit_5242); #pragma pop /* 80B935B0-80B935B4 0003B4 0004+00 0/1 0/0 0/0 .rodata @5243 */ @@ -2343,7 +2356,7 @@ SECTION_RODATA static u8 const lit_5243[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B935B0, &lit_5243); +COMPILER_STRIP_GATE(0x80B935B0, &lit_5243); #pragma pop /* 80B935B4-80B935C0 0003B8 000C+00 0/1 0/0 0/0 .rodata @5244 */ @@ -2352,7 +2365,7 @@ COMPILER_STRIP_GATE(80B935B0, &lit_5243); SECTION_RODATA static u8 const lit_5244[12] = { 0x00, 0x1E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80B935B4, &lit_5244); +COMPILER_STRIP_GATE(0x80B935B4, &lit_5244); #pragma pop /* 80B935C0-80B935CC 0003C4 000C+00 0/1 0/0 0/0 .rodata @5245 */ @@ -2361,7 +2374,7 @@ COMPILER_STRIP_GATE(80B935B4, &lit_5244); SECTION_RODATA static u8 const lit_5245[12] = { 0x00, 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B935C0, &lit_5245); +COMPILER_STRIP_GATE(0x80B935C0, &lit_5245); #pragma pop /* 80B935CC-80B935D4 0003D0 0008+00 0/1 0/0 0/0 .rodata @5246 */ @@ -2370,7 +2383,7 @@ COMPILER_STRIP_GATE(80B935C0, &lit_5245); SECTION_RODATA static u8 const lit_5246[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B935CC, &lit_5246); +COMPILER_STRIP_GATE(0x80B935CC, &lit_5246); #pragma pop /* 80B935D4-80B935E0 0003D8 000C+00 0/1 0/0 0/0 .rodata @5247 */ @@ -2379,7 +2392,7 @@ COMPILER_STRIP_GATE(80B935CC, &lit_5246); SECTION_RODATA static u8 const lit_5247[12] = { 0x00, 0x13, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80B935D4, &lit_5247); +COMPILER_STRIP_GATE(0x80B935D4, &lit_5247); #pragma pop /* 80B935E0-80B935EC 0003E4 000C+00 0/1 0/0 0/0 .rodata @5248 */ @@ -2388,7 +2401,7 @@ COMPILER_STRIP_GATE(80B935D4, &lit_5247); SECTION_RODATA static u8 const lit_5248[12] = { 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B935E0, &lit_5248); +COMPILER_STRIP_GATE(0x80B935E0, &lit_5248); #pragma pop /* 80B935EC-80B935F4 0003F0 0008+00 0/1 0/0 0/0 .rodata @5249 */ @@ -2397,7 +2410,7 @@ COMPILER_STRIP_GATE(80B935E0, &lit_5248); SECTION_RODATA static u8 const lit_5249[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B935EC, &lit_5249); +COMPILER_STRIP_GATE(0x80B935EC, &lit_5249); #pragma pop /* 80B935F4-80B93600 0003F8 000C+00 0/1 0/0 0/0 .rodata @5250 */ @@ -2406,7 +2419,7 @@ COMPILER_STRIP_GATE(80B935EC, &lit_5249); SECTION_RODATA static u8 const lit_5250[12] = { 0x00, 0x15, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80B935F4, &lit_5250); +COMPILER_STRIP_GATE(0x80B935F4, &lit_5250); #pragma pop /* 80B93600-80B9360C 000404 000C+00 0/1 0/0 0/0 .rodata @5251 */ @@ -2415,7 +2428,7 @@ COMPILER_STRIP_GATE(80B935F4, &lit_5250); SECTION_RODATA static u8 const lit_5251[12] = { 0x00, 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B93600, &lit_5251); +COMPILER_STRIP_GATE(0x80B93600, &lit_5251); #pragma pop /* 80B9360C-80B93614 000410 0008+00 0/1 0/0 0/0 .rodata @5252 */ @@ -2424,7 +2437,7 @@ COMPILER_STRIP_GATE(80B93600, &lit_5251); SECTION_RODATA static u8 const lit_5252[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B9360C, &lit_5252); +COMPILER_STRIP_GATE(0x80B9360C, &lit_5252); #pragma pop /* 80B93614-80B93620 000418 000C+00 0/1 0/0 0/0 .rodata @5253 */ @@ -2433,7 +2446,7 @@ COMPILER_STRIP_GATE(80B9360C, &lit_5252); SECTION_RODATA static u8 const lit_5253[12] = { 0x00, 0x16, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B93614, &lit_5253); +COMPILER_STRIP_GATE(0x80B93614, &lit_5253); #pragma pop /* 80B93620-80B93624 000424 0004+00 0/1 0/0 0/0 .rodata @5254 */ @@ -2445,7 +2458,7 @@ SECTION_RODATA static u8 const lit_5254[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B93620, &lit_5254); +COMPILER_STRIP_GATE(0x80B93620, &lit_5254); #pragma pop /* 80B93624-80B93630 000428 000C+00 0/1 0/0 0/0 .rodata @5255 */ @@ -2454,7 +2467,7 @@ COMPILER_STRIP_GATE(80B93620, &lit_5254); SECTION_RODATA static u8 const lit_5255[12] = { 0x00, 0x1F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B93624, &lit_5255); +COMPILER_STRIP_GATE(0x80B93624, &lit_5255); #pragma pop /* 80B93630-80B93634 000434 0004+00 0/1 0/0 0/0 .rodata @5256 */ @@ -2466,7 +2479,7 @@ SECTION_RODATA static u8 const lit_5256[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B93630, &lit_5256); +COMPILER_STRIP_GATE(0x80B93630, &lit_5256); #pragma pop /* 80B904DC-80B90940 0029BC 0464+00 1/1 0/0 0/0 .text playMotion__11daNpc_zrC_cFv */ @@ -2495,7 +2508,7 @@ asm void daNpc_zrC_c::playMotionAnm2(daNpcF_c::daNpcF_anmPlayData*** param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpc_zrC_c::chkAction(int (daNpc_zrC_c::*)(void*)) { +asm void daNpc_zrC_c::chkAction(int (daNpc_zrC_c::*param_0)(void*)) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_zrc/d_a_npc_zrc/chkAction__11daNpc_zrC_cFM11daNpc_zrC_cFPCvPvPv_i.s" } @@ -2506,7 +2519,7 @@ asm void daNpc_zrC_c::chkAction(int (daNpc_zrC_c::*)(void*)) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpc_zrC_c::setAction(int (daNpc_zrC_c::*)(void*)) { +asm void daNpc_zrC_c::setAction(int (daNpc_zrC_c::*param_0)(void*)) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_zrc/d_a_npc_zrc/setAction__11daNpc_zrC_cFM11daNpc_zrC_cFPCvPvPv_i.s" } @@ -2532,6 +2545,13 @@ asm void daNpc_zrC_c::doNormalAction(int param_0) { } #pragma pop +/* ############################################################################################## */ +/* 80B9369C-80B9369C 0004A0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80B936D7 = "NO_RESPONSE"; +#pragma pop + /* 80B90D48-80B9113C 003228 03F4+00 1/1 0/0 0/0 .text doEvent__11daNpc_zrC_cFv */ #pragma push #pragma optimization_level 0 @@ -2562,7 +2582,7 @@ SECTION_RODATA static u8 const lit_5257[56] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B93634, &lit_5257); +COMPILER_STRIP_GATE(0x80B93634, &lit_5257); #pragma pop /* 80B9366C-80B93678 000470 000C+00 0/1 0/0 0/0 .rodata @5460 */ @@ -2571,35 +2591,35 @@ COMPILER_STRIP_GATE(80B93634, &lit_5257); SECTION_RODATA static u8 const lit_5460[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B9366C, &lit_5460); +COMPILER_STRIP_GATE(0x80B9366C, &lit_5460); #pragma pop /* 80B93678-80B9367C 00047C 0004+00 0/1 0/0 0/0 .rodata @5517 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5517 = -80.0f; -COMPILER_STRIP_GATE(80B93678, &lit_5517); +COMPILER_STRIP_GATE(0x80B93678, &lit_5517); #pragma pop /* 80B9367C-80B93680 000480 0004+00 0/1 0/0 0/0 .rodata @5518 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5518 = 80.0f; -COMPILER_STRIP_GATE(80B9367C, &lit_5518); +COMPILER_STRIP_GATE(0x80B9367C, &lit_5518); #pragma pop /* 80B93680-80B93684 000484 0004+00 0/1 0/0 0/0 .rodata @5519 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5519 = 400.0f; -COMPILER_STRIP_GATE(80B93680, &lit_5519); +COMPILER_STRIP_GATE(0x80B93680, &lit_5519); #pragma pop /* 80B93684-80B93688 000488 0004+00 0/1 0/0 0/0 .rodata @5520 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5520 = 40.0f; -COMPILER_STRIP_GATE(80B93684, &lit_5520); +COMPILER_STRIP_GATE(0x80B93684, &lit_5520); #pragma pop /* 80B91160-80B91418 003640 02B8+00 1/1 0/0 0/0 .text lookat__11daNpc_zrC_cFv */ @@ -2647,14 +2667,14 @@ asm void daNpc_zrC_c::waitSick(void* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5766 = 100.0f; -COMPILER_STRIP_GATE(80B93688, &lit_5766); +COMPILER_STRIP_GATE(0x80B93688, &lit_5766); #pragma pop /* 80B9368C-80B93690 000490 0004+00 0/1 0/0 0/0 .rodata @5767 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_5767 = 0x43360B61; -COMPILER_STRIP_GATE(80B9368C, &lit_5767); +COMPILER_STRIP_GATE(0x80B9368C, &lit_5767); #pragma pop /* 80B91808-80B91F78 003CE8 0770+00 1/0 0/0 0/0 .text waitPray__11daNpc_zrC_cFPv */ @@ -2702,21 +2722,27 @@ asm void daNpc_zrC_c::test(void* param_0) { #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_5926 = 0x46A49CB0; -COMPILER_STRIP_GATE(80B93690, &lit_5926); +COMPILER_STRIP_GATE(0x80B93690, &lit_5926); #pragma pop /* 80B93694-80B93698 000498 0004+00 0/1 0/0 0/0 .rodata @5927 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5927 = 700.0f; -COMPILER_STRIP_GATE(80B93694, &lit_5927); +COMPILER_STRIP_GATE(0x80B93694, &lit_5927); #pragma pop /* 80B93698-80B9369C 00049C 0004+00 0/1 0/0 0/0 .rodata @5928 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_5928 = 0x43348ED1; -COMPILER_STRIP_GATE(80B93698, &lit_5928); +COMPILER_STRIP_GATE(0x80B93698, &lit_5928); +#pragma pop + +/* 80B9369C-80B9369C 0004A0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80B936E3 = "prm"; #pragma pop /* 80B923BC-80B9286C 00489C 04B0+00 1/0 0/0 0/0 .text ECut_earringGet__11daNpc_zrC_cFi */ @@ -2939,7 +2965,7 @@ asm void __sinit_d_a_npc_zrc_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80B93104 = (void*)__sinit_d_a_npc_zrc_cpp; +REGISTER_CTORS(0x80B93104, __sinit_d_a_npc_zrc_cpp); #pragma pop /* 80B9318C-80B93190 00566C 0004+00 1/0 0/0 0/0 .text adjustShapeAngle__11daNpc_zrC_cFv @@ -3150,19 +3176,4 @@ static u8 data_80B93CD8[4]; static u8 data_80B93CDC[4]; #pragma pop -/* 80B9369C-80B936E7 0004A0 004B+00 6/2 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80B9369C = "EARRING_GET"; -SECTION_DEAD static char const* const stringBase_80B936A8 = "zrC"; -SECTION_DEAD static char const* const stringBase_80B936AC = "zrC1"; -SECTION_DEAD static char const* const stringBase_80B936B1 = "zrC2"; -SECTION_DEAD static char const* const stringBase_80B936B6 = "zrC_MDL"; -SECTION_DEAD static char const* const stringBase_80B936BE = "zrC_TW"; -SECTION_DEAD static char const* const stringBase_80B936C5 = "zrC_Sick"; -SECTION_DEAD static char const* const stringBase_80B936CE = "zrC_EGD"; -SECTION_DEAD static char const* const stringBase_80B936D6 = ""; -SECTION_DEAD static char const* const stringBase_80B936D7 = "NO_RESPONSE"; -SECTION_DEAD static char const* const stringBase_80B936E3 = "prm"; -#pragma pop +/* 80B9369C-80B9369C 0004A0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/npc/d_a_npc_zrz/d_a_npc_zrz.cpp b/rel/d/a/npc/d_a_npc_zrz/d_a_npc_zrz.cpp index e76ed83cf18..d0532b3bd90 100644 --- a/rel/d/a/npc/d_a_npc_zrz/d_a_npc_zrz.cpp +++ b/rel/d/a/npc/d_a_npc_zrz/d_a_npc_zrz.cpp @@ -47,14 +47,14 @@ struct mDoExt_invisibleModel { /* 8000E7C0 */ void entryDL(cXyz*); }; +struct J3DAnmTextureSRTKey {}; + struct J3DAnmTexPattern { /* 8032AF50 */ void getTexNo(u16, u16*) const; }; struct J3DAnmTevRegKey {}; -struct J3DAnmTextureSRTKey {}; - struct J3DMaterialTable { /* 8032F6F8 */ void removeTexNoAnimator(J3DAnmTexPattern*); /* 8032F7B4 */ void removeTexMtxAnimator(J3DAnmTextureSRTKey*); @@ -79,12 +79,12 @@ struct mDoExt_bckAnm { /* 8000D990 */ void changeBckOnly(J3DAnmTransform*); }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; +struct J3DModelData {}; + struct Z2Creature { /* 802C03C8 */ Z2Creature(); /* 802C0420 */ ~Z2Creature(); @@ -110,10 +110,10 @@ struct fopAcM_gc_c { static f32 mGroundY; }; -struct _GXColorS10 {}; - struct J3DJoint {}; +struct _GXColorS10 {}; + struct daNpc_zrZ_c { /* 80B93DCC */ daNpc_zrZ_c(); /* 80B94014 */ ~daNpc_zrZ_c(); @@ -187,14 +187,14 @@ struct dCcD_GObjInf { /* 800840E4 */ ~dCcD_GObjInf(); }; +struct J3DAnmTransformKey {}; + struct dCcD_SrcCyl {}; struct dCcD_Cyl { /* 800848B4 */ void Set(dCcD_SrcCyl const&); }; -struct J3DAnmTransformKey {}; - struct daNpcF_c { struct daNpcF_anmPlayData {}; @@ -304,7 +304,6 @@ struct dEvt_control_c { /* 800429A8 */ void onSkipFade(); /* 8004365C */ void setPt2(void*); /* 8004368C */ void setPtT(void*); - /* 800436EC */ void setPtI_Id(unsigned int); }; struct dEvent_manager_c { @@ -557,7 +556,7 @@ extern "C" void __dt__12dBgS_ObjAcchFv(); extern "C" void __dt__12J3DFrameCtrlFv(); extern "C" void setCollisions__8daNpcF_cFv(); extern "C" void __dt__10cCcD_GSttsFv(); -extern "C" void func_80B9AE44(int*); +extern "C" void func_80B9AE44(void* _this, int*); extern "C" void __sinit_d_a_npc_zrz_cpp(); extern "C" void adjustShapeAngle__11daNpc_zrZ_cFv(); extern "C" void __dt__17daNpc_zrZ_Param_cFv(); @@ -790,6 +789,21 @@ extern "C" void __register_global_object(); // /* ############################################################################################## */ +/* 80B9B220-80B9B220 000234 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80B9B220 = "zrZ"; +SECTION_DEAD static char const* const stringBase_80B9B224 = "zrZ_GT"; +SECTION_DEAD static char const* const stringBase_80B9B22B = "HELP_PRINCE"; +SECTION_DEAD static char const* const stringBase_80B9B237 = "COME_HERE"; +SECTION_DEAD static char const* const stringBase_80B9B241 = "RESTORE_LINK"; +SECTION_DEAD static char const* const stringBase_80B9B24E = "CLOTHES_GET"; +SECTION_DEAD static char const* const stringBase_80B9B25A = "GET_AFTER"; +SECTION_DEAD static char const* const stringBase_80B9B264 = "SEAL_RELEASE"; +SECTION_DEAD static char const* const stringBase_80B9B271 = "SR_SKIP"; +SECTION_DEAD static char const* const stringBase_80B9B279 = ""; +#pragma pop + /* 80B9B284-80B9B290 000000 000C+00 9/9 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -1440,34 +1454,34 @@ SECTION_RODATA u8 const daNpc_zrZ_Param_c::m[132] = { 0x00, 0x00, 0x00, 0x44, 0x96, 0x00, 0x00, 0x44, 0x7A, 0x00, 0x00, 0x45, 0x3B, 0x80, 0x00, 0x41, 0xC8, 0x00, 0x00, 0x43, 0xC8, 0x00, 0x00, 0x43, 0x48, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B9AFEC, &daNpc_zrZ_Param_c::m); +COMPILER_STRIP_GATE(0x80B9AFEC, &daNpc_zrZ_Param_c::m); /* 80B9B070-80B9B074 000084 0004+00 0/1 0/0 0/0 .rodata @4449 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4449 = -300.0f; -COMPILER_STRIP_GATE(80B9B070, &lit_4449); +COMPILER_STRIP_GATE(0x80B9B070, &lit_4449); #pragma pop /* 80B9B074-80B9B078 000088 0004+00 0/1 0/0 0/0 .rodata @4450 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4450 = -50.0f; -COMPILER_STRIP_GATE(80B9B074, &lit_4450); +COMPILER_STRIP_GATE(0x80B9B074, &lit_4450); #pragma pop /* 80B9B078-80B9B07C 00008C 0004+00 0/1 0/0 0/0 .rodata @4451 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4451 = 300.0f; -COMPILER_STRIP_GATE(80B9B078, &lit_4451); +COMPILER_STRIP_GATE(0x80B9B078, &lit_4451); #pragma pop /* 80B9B07C-80B9B080 000090 0004+00 0/1 0/0 0/0 .rodata @4452 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4452 = 800.0f; -COMPILER_STRIP_GATE(80B9B07C, &lit_4452); +COMPILER_STRIP_GATE(0x80B9B07C, &lit_4452); #pragma pop /* 80B9423C-80B9453C 00055C 0300+00 1/1 0/0 0/0 .text create__11daNpc_zrZ_cFv */ @@ -1483,7 +1497,7 @@ asm void daNpc_zrZ_c::create() { /* ############################################################################################## */ /* 80B9B080-80B9B084 000094 0004+00 5/10 0/0 0/0 .rodata @4521 */ SECTION_RODATA static f32 const lit_4521 = 1.0f; -COMPILER_STRIP_GATE(80B9B080, &lit_4521); +COMPILER_STRIP_GATE(0x80B9B080, &lit_4521); /* 80B9B084-80B9B088 000098 0004+00 6/15 0/0 0/0 .rodata @4522 */ SECTION_RODATA static u8 const lit_4522[4] = { @@ -1492,7 +1506,7 @@ SECTION_RODATA static u8 const lit_4522[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B9B084, &lit_4522); +COMPILER_STRIP_GATE(0x80B9B084, &lit_4522); /* 80B9453C-80B94838 00085C 02FC+00 1/1 0/0 0/0 .text CreateHeap__11daNpc_zrZ_cFv */ #pragma push @@ -1637,13 +1651,13 @@ asm void daNpc_zrZ_c::Draw() { /* ############################################################################################## */ /* 80B9B088-80B9B08C 00009C 0004+00 1/1 0/0 0/0 .rodata @4675 */ SECTION_RODATA static f32 const lit_4675 = 20.0f; -COMPILER_STRIP_GATE(80B9B088, &lit_4675); +COMPILER_STRIP_GATE(0x80B9B088, &lit_4675); /* 80B9B08C-80B9B094 0000A0 0008+00 3/4 0/0 0/0 .rodata @4677 */ SECTION_RODATA static u8 const lit_4677[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B9B08C, &lit_4677); +COMPILER_STRIP_GATE(0x80B9B08C, &lit_4677); /* 80B94B34-80B94E18 000E54 02E4+00 1/1 0/0 0/0 .text draw__11daNpc_zrZ_cFiifP11_GXColorS10i */ #pragma push @@ -1663,7 +1677,7 @@ asm void daNpc_zrZ_c::draw(int param_0, int param_1, f32 param_2, _GXColorS10* p SECTION_RODATA static u8 const lit_4682[12] = { 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x04, }; -COMPILER_STRIP_GATE(80B9B094, &lit_4682); +COMPILER_STRIP_GATE(0x80B9B094, &lit_4682); #pragma pop /* 80B94E18-80B950F4 001138 02DC+00 2/1 0/0 0/0 .text @@ -1744,7 +1758,7 @@ asm void daNpc_zrZ_c::setParam() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4945 = 8.5f; -COMPILER_STRIP_GATE(80B9B0A0, &lit_4945); +COMPILER_STRIP_GATE(0x80B9B0A0, &lit_4945); #pragma pop /* 80B953CC-80B95598 0016EC 01CC+00 1/0 0/0 0/0 .text main__11daNpc_zrZ_cFv */ @@ -1760,11 +1774,11 @@ asm void daNpc_zrZ_c::main() { /* ############################################################################################## */ /* 80B9B0A4-80B9B0A8 0000B8 0004+00 5/9 0/0 0/0 .rodata @4991 */ SECTION_RODATA static f32 const lit_4991 = -1.0f; -COMPILER_STRIP_GATE(80B9B0A4, &lit_4991); +COMPILER_STRIP_GATE(0x80B9B0A4, &lit_4991); /* 80B9B0A8-80B9B0AC 0000BC 0004+00 1/2 0/0 0/0 .rodata @4992 */ SECTION_RODATA static f32 const lit_4992 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(80B9B0A8, &lit_4992); +COMPILER_STRIP_GATE(0x80B9B0A8, &lit_4992); /* 80B95598-80B956B4 0018B8 011C+00 1/1 0/0 0/0 .text ctrlBtk__11daNpc_zrZ_cFv */ #pragma push @@ -1781,28 +1795,28 @@ asm void daNpc_zrZ_c::ctrlBtk() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5127 = -10.0f; -COMPILER_STRIP_GATE(80B9B0AC, &lit_5127); +COMPILER_STRIP_GATE(0x80B9B0AC, &lit_5127); #pragma pop /* 80B9B0B0-80B9B0B4 0000C4 0004+00 0/1 0/0 0/0 .rodata @5128 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5128 = 10.0f; -COMPILER_STRIP_GATE(80B9B0B0, &lit_5128); +COMPILER_STRIP_GATE(0x80B9B0B0, &lit_5128); #pragma pop /* 80B9B0B4-80B9B0B8 0000C8 0004+00 0/4 0/0 0/0 .rodata @5129 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5129 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(80B9B0B4, &lit_5129); +COMPILER_STRIP_GATE(0x80B9B0B4, &lit_5129); #pragma pop /* 80B9B0B8-80B9B0BC 0000CC 0004+00 0/1 0/0 0/0 .rodata @5130 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5130 = 125.0f; -COMPILER_STRIP_GATE(80B9B0B8, &lit_5130); +COMPILER_STRIP_GATE(0x80B9B0B8, &lit_5130); #pragma pop /* 80B9B0BC-80B9B0C4 0000D0 0008+00 0/3 0/0 0/0 .rodata @5131 */ @@ -1811,7 +1825,7 @@ COMPILER_STRIP_GATE(80B9B0B8, &lit_5130); SECTION_RODATA static u8 const lit_5131[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B9B0BC, &lit_5131); +COMPILER_STRIP_GATE(0x80B9B0BC, &lit_5131); #pragma pop /* 80B9B0C4-80B9B0CC 0000D8 0008+00 0/3 0/0 0/0 .rodata @5132 */ @@ -1820,7 +1834,7 @@ COMPILER_STRIP_GATE(80B9B0BC, &lit_5131); SECTION_RODATA static u8 const lit_5132[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B9B0C4, &lit_5132); +COMPILER_STRIP_GATE(0x80B9B0C4, &lit_5132); #pragma pop /* 80B9B0CC-80B9B0D4 0000E0 0008+00 0/3 0/0 0/0 .rodata @5133 */ @@ -1829,7 +1843,7 @@ COMPILER_STRIP_GATE(80B9B0C4, &lit_5132); SECTION_RODATA static u8 const lit_5133[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B9B0CC, &lit_5133); +COMPILER_STRIP_GATE(0x80B9B0CC, &lit_5133); #pragma pop /* 80B9B868-80B9B86C 000008 0001+03 1/1 0/0 0/0 .bss @1109 */ @@ -2051,7 +2065,7 @@ asm void daNpc_zrZ_c::isDelete() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5371 = 100.0f; -COMPILER_STRIP_GATE(80B9B0D4, &lit_5371); +COMPILER_STRIP_GATE(0x80B9B0D4, &lit_5371); #pragma pop /* 80B96268-80B9652C 002588 02C4+00 1/1 0/0 0/0 .text reset__11daNpc_zrZ_cFv */ @@ -2071,7 +2085,7 @@ asm void daNpc_zrZ_c::reset() { SECTION_RODATA static u8 const lit_5375[12] = { 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80B9B0D8, &lit_5375); +COMPILER_STRIP_GATE(0x80B9B0D8, &lit_5375); #pragma pop /* 80B9B0E4-80B9B0F0 0000F8 000C+00 0/1 0/0 0/0 .rodata @5376 */ @@ -2080,7 +2094,7 @@ COMPILER_STRIP_GATE(80B9B0D8, &lit_5375); SECTION_RODATA static u8 const lit_5376[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B9B0E4, &lit_5376); +COMPILER_STRIP_GATE(0x80B9B0E4, &lit_5376); #pragma pop /* 80B9B0F0-80B9B0F8 000104 0008+00 0/1 0/0 0/0 .rodata @5377 */ @@ -2089,7 +2103,7 @@ COMPILER_STRIP_GATE(80B9B0E4, &lit_5376); SECTION_RODATA static u8 const lit_5377[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B9B0F0, &lit_5377); +COMPILER_STRIP_GATE(0x80B9B0F0, &lit_5377); #pragma pop /* 80B9B0F8-80B9B104 00010C 000C+00 0/1 0/0 0/0 .rodata @5378 */ @@ -2098,7 +2112,7 @@ COMPILER_STRIP_GATE(80B9B0F0, &lit_5377); SECTION_RODATA static u8 const lit_5378[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B9B0F8, &lit_5378); +COMPILER_STRIP_GATE(0x80B9B0F8, &lit_5378); #pragma pop /* 80B9B104-80B9B108 000118 0004+00 0/1 0/0 0/0 .rodata @5379 */ @@ -2110,7 +2124,7 @@ SECTION_RODATA static u8 const lit_5379[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B9B104, &lit_5379); +COMPILER_STRIP_GATE(0x80B9B104, &lit_5379); #pragma pop /* 80B9B108-80B9B110 00011C 0008+00 0/1 0/0 0/0 .rodata @5380 */ @@ -2119,7 +2133,7 @@ COMPILER_STRIP_GATE(80B9B104, &lit_5379); SECTION_RODATA static u8 const lit_5380[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B9B108, &lit_5380); +COMPILER_STRIP_GATE(0x80B9B108, &lit_5380); #pragma pop /* 80B9652C-80B96618 00284C 00EC+00 1/1 0/0 0/0 .text playExpression__11daNpc_zrZ_cFv */ @@ -2139,7 +2153,7 @@ asm void daNpc_zrZ_c::playExpression() { SECTION_RODATA static u8 const lit_5393[12] = { 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B9B110, &lit_5393); +COMPILER_STRIP_GATE(0x80B9B110, &lit_5393); #pragma pop /* 80B9B11C-80B9B120 000130 0004+00 0/1 0/0 0/0 .rodata @5394 */ @@ -2151,7 +2165,7 @@ SECTION_RODATA static u8 const lit_5394[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B9B11C, &lit_5394); +COMPILER_STRIP_GATE(0x80B9B11C, &lit_5394); #pragma pop /* 80B9B120-80B9B12C 000134 000C+00 0/1 0/0 0/0 .rodata @5395 */ @@ -2160,7 +2174,7 @@ COMPILER_STRIP_GATE(80B9B11C, &lit_5394); SECTION_RODATA static u8 const lit_5395[12] = { 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80B9B120, &lit_5395); +COMPILER_STRIP_GATE(0x80B9B120, &lit_5395); #pragma pop /* 80B9B12C-80B9B138 000140 000C+00 0/1 0/0 0/0 .rodata @5396 */ @@ -2169,7 +2183,7 @@ COMPILER_STRIP_GATE(80B9B120, &lit_5395); SECTION_RODATA static u8 const lit_5396[12] = { 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B9B12C, &lit_5396); +COMPILER_STRIP_GATE(0x80B9B12C, &lit_5396); #pragma pop /* 80B9B138-80B9B140 00014C 0008+00 0/1 0/0 0/0 .rodata @5397 */ @@ -2178,7 +2192,7 @@ COMPILER_STRIP_GATE(80B9B12C, &lit_5396); SECTION_RODATA static u8 const lit_5397[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B9B138, &lit_5397); +COMPILER_STRIP_GATE(0x80B9B138, &lit_5397); #pragma pop /* 80B9B140-80B9B14C 000154 000C+00 0/1 0/0 0/0 .rodata @5398 */ @@ -2187,7 +2201,7 @@ COMPILER_STRIP_GATE(80B9B138, &lit_5397); SECTION_RODATA static u8 const lit_5398[12] = { 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B9B140, &lit_5398); +COMPILER_STRIP_GATE(0x80B9B140, &lit_5398); #pragma pop /* 80B9B14C-80B9B150 000160 0004+00 0/1 0/0 0/0 .rodata @5399 */ @@ -2199,7 +2213,7 @@ SECTION_RODATA static u8 const lit_5399[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B9B14C, &lit_5399); +COMPILER_STRIP_GATE(0x80B9B14C, &lit_5399); #pragma pop /* 80B9B150-80B9B15C 000164 000C+00 0/1 0/0 0/0 .rodata @5400 */ @@ -2208,7 +2222,7 @@ COMPILER_STRIP_GATE(80B9B14C, &lit_5399); SECTION_RODATA static u8 const lit_5400[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B9B150, &lit_5400); +COMPILER_STRIP_GATE(0x80B9B150, &lit_5400); #pragma pop /* 80B96618-80B96740 002938 0128+00 1/1 0/0 0/0 .text playMotion__11daNpc_zrZ_cFv */ @@ -2226,7 +2240,7 @@ asm void daNpc_zrZ_c::playMotion() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpc_zrZ_c::chkAction(int (daNpc_zrZ_c::*)(void*)) { +asm void daNpc_zrZ_c::chkAction(int (daNpc_zrZ_c::*param_0)(void*)) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_zrz/d_a_npc_zrz/chkAction__11daNpc_zrZ_cFM11daNpc_zrZ_cFPCvPvPv_i.s" } @@ -2237,7 +2251,7 @@ asm void daNpc_zrZ_c::chkAction(int (daNpc_zrZ_c::*)(void*)) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpc_zrZ_c::setAction(int (daNpc_zrZ_c::*)(void*)) { +asm void daNpc_zrZ_c::setAction(int (daNpc_zrZ_c::*param_0)(void*)) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_zrz/d_a_npc_zrz/setAction__11daNpc_zrZ_cFM11daNpc_zrZ_cFPCvPvPv_i.s" } @@ -2300,28 +2314,28 @@ asm void daNpc_zrZ_c::setLookMode(int param_0) { SECTION_RODATA static u8 const lit_5576[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B9B15C, &lit_5576); +COMPILER_STRIP_GATE(0x80B9B15C, &lit_5576); #pragma pop /* 80B9B168-80B9B16C 00017C 0004+00 0/1 0/0 0/0 .rodata @5629 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5629 = -80.0f; -COMPILER_STRIP_GATE(80B9B168, &lit_5629); +COMPILER_STRIP_GATE(0x80B9B168, &lit_5629); #pragma pop /* 80B9B16C-80B9B170 000180 0004+00 0/1 0/0 0/0 .rodata @5630 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5630 = 80.0f; -COMPILER_STRIP_GATE(80B9B16C, &lit_5630); +COMPILER_STRIP_GATE(0x80B9B16C, &lit_5630); #pragma pop /* 80B9B170-80B9B174 000184 0004+00 0/1 0/0 0/0 .rodata @5631 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5631 = 40.0f; -COMPILER_STRIP_GATE(80B9B170, &lit_5631); +COMPILER_STRIP_GATE(0x80B9B170, &lit_5631); #pragma pop /* 80B96EA0-80B97128 0031C0 0288+00 1/1 0/0 0/0 .text lookat__11daNpc_zrZ_cFv */ @@ -2369,35 +2383,35 @@ asm void daNpc_zrZ_c::setLightPos() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5697 = 70.0f; -COMPILER_STRIP_GATE(80B9B174, &lit_5697); +COMPILER_STRIP_GATE(0x80B9B174, &lit_5697); #pragma pop /* 80B9B178-80B9B17C 00018C 0004+00 0/1 0/0 0/0 .rodata @5698 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5698 = 50.0f; -COMPILER_STRIP_GATE(80B9B178, &lit_5698); +COMPILER_STRIP_GATE(0x80B9B178, &lit_5698); #pragma pop /* 80B9B17C-80B9B180 000190 0004+00 0/1 0/0 0/0 .rodata @5699 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5699 = 1.0f / 20.0f; -COMPILER_STRIP_GATE(80B9B17C, &lit_5699); +COMPILER_STRIP_GATE(0x80B9B17C, &lit_5699); #pragma pop /* 80B9B180-80B9B184 000194 0004+00 0/1 0/0 0/0 .rodata @5700 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5700 = 5.0f; -COMPILER_STRIP_GATE(80B9B180, &lit_5700); +COMPILER_STRIP_GATE(0x80B9B180, &lit_5700); #pragma pop /* 80B9B184-80B9B188 000198 0004+00 0/1 0/0 0/0 .rodata @5701 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5701 = 14.0f; -COMPILER_STRIP_GATE(80B9B184, &lit_5701); +COMPILER_STRIP_GATE(0x80B9B184, &lit_5701); #pragma pop /* 80B9723C-80B972EC 00355C 00B0+00 1/1 0/0 0/0 .text lightPowerCalc__11daNpc_zrZ_cFi */ @@ -2415,14 +2429,14 @@ asm void daNpc_zrZ_c::lightPowerCalc(int param_0) { SECTION_RODATA static u8 const key_frame[16] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x32, 0x00, 0x00, 0x00, 0xBE, 0x00, 0x00, 0x00, 0xDC, }; -COMPILER_STRIP_GATE(80B9B188, &key_frame); +COMPILER_STRIP_GATE(0x80B9B188, &key_frame); /* 80B9B198-80B9B1B8 0001AC 0020+00 1/1 0/0 0/0 .rodata key_color$5707 */ SECTION_RODATA static u8 const key_color[32] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0x00, 0xFF, 0x00, 0xC3, 0x00, 0x8A, 0x00, 0xFF, 0x00, 0xFF, 0x00, 0xC3, 0x00, 0x8A, 0x00, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, }; -COMPILER_STRIP_GATE(80B9B198, &key_color); +COMPILER_STRIP_GATE(0x80B9B198, &key_color); /* 80B972EC-80B974BC 00360C 01D0+00 1/1 0/0 0/0 .text lightColorProc__11daNpc_zrZ_cFv */ #pragma push @@ -2441,39 +2455,39 @@ asm void daNpc_zrZ_c::lightColorProc() { SECTION_RODATA static u8 const lit_5782[8] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, }; -COMPILER_STRIP_GATE(80B9B1B8, &lit_5782); +COMPILER_STRIP_GATE(0x80B9B1B8, &lit_5782); #pragma pop /* 80B9B1C0-80B9B1C4 0001D4 0004+00 0/1 0/0 0/0 .rodata @5900 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_5900 = 0xC4608148; -COMPILER_STRIP_GATE(80B9B1C0, &lit_5900); +COMPILER_STRIP_GATE(0x80B9B1C0, &lit_5900); #pragma pop /* 80B9B1C4-80B9B1C8 0001D8 0004+00 0/1 0/0 0/0 .rodata @5901 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_5901 = 0x41690A3D; -COMPILER_STRIP_GATE(80B9B1C4, &lit_5901); +COMPILER_STRIP_GATE(0x80B9B1C4, &lit_5901); #pragma pop /* 80B9B1C8-80B9B1CC 0001DC 0004+00 0/1 0/0 0/0 .rodata @5902 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_5902 = 0xC47AA117; -COMPILER_STRIP_GATE(80B9B1C8, &lit_5902); +COMPILER_STRIP_GATE(0x80B9B1C8, &lit_5902); #pragma pop /* 80B9B1CC-80B9B1D0 0001E0 0004+00 1/1 0/0 0/0 .rodata @5903 */ SECTION_RODATA static f32 const lit_5903 = 255.0f; -COMPILER_STRIP_GATE(80B9B1CC, &lit_5903); +COMPILER_STRIP_GATE(0x80B9B1CC, &lit_5903); /* 80B9B1D0-80B9B1D4 0001E4 0004+00 0/0 0/0 0/0 .rodata @5904 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5904 = 60.0f; -COMPILER_STRIP_GATE(80B9B1D0, &lit_5904); +COMPILER_STRIP_GATE(0x80B9B1D0, &lit_5904); #pragma pop /* 80B9B1D4-80B9B1DC 0001E8 0004+04 0/0 0/0 0/0 .rodata @5905 */ @@ -2484,7 +2498,7 @@ SECTION_RODATA static f32 const lit_5905[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80B9B1D4, &lit_5905); +COMPILER_STRIP_GATE(0x80B9B1D4, &lit_5905); #pragma pop /* 80B9B1DC-80B9B1E4 0001F0 0008+00 0/1 0/0 0/0 .rodata @5907 */ @@ -2493,7 +2507,14 @@ COMPILER_STRIP_GATE(80B9B1D4, &lit_5905); SECTION_RODATA static u8 const lit_5907[8] = { 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B9B1DC, &lit_5907); +COMPILER_STRIP_GATE(0x80B9B1DC, &lit_5907); +#pragma pop + +/* 80B9B220-80B9B220 000234 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80B9B27A = "prm"; +SECTION_DEAD static char const* const stringBase_80B9B27E = "timer"; #pragma pop /* 80B974BC-80B97B78 0037DC 06BC+00 2/0 0/0 0/0 .text ECut_helpPrince__11daNpc_zrZ_cFi */ @@ -2519,7 +2540,7 @@ asm void daNpc_zrZ_c::ECut_comeHere(int param_0) { /* ############################################################################################## */ /* 80B9B1E4-80B9B1E8 0001F8 0004+00 1/1 0/0 0/0 .rodata @5984 */ SECTION_RODATA static f32 const lit_5984 = 500.0f; -COMPILER_STRIP_GATE(80B9B1E4, &lit_5984); +COMPILER_STRIP_GATE(0x80B9B1E4, &lit_5984); /* 80B97D7C-80B97EB4 00409C 0138+00 1/0 0/0 0/0 .text ECut_restoreLink__11daNpc_zrZ_cFi */ @@ -2537,14 +2558,14 @@ asm void daNpc_zrZ_c::ECut_restoreLink(int param_0) { #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_6066 = 0xFFC38AFF; -COMPILER_STRIP_GATE(80B9B1E8, &lit_6066); +COMPILER_STRIP_GATE(0x80B9B1E8, &lit_6066); #pragma pop /* 80B9B1EC-80B9B1F0 000200 0004+00 0/1 0/0 0/0 .rodata @6098 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6098 = -2.0f; -COMPILER_STRIP_GATE(80B9B1EC, &lit_6098); +COMPILER_STRIP_GATE(0x80B9B1EC, &lit_6098); #pragma pop /* 80B97EB4-80B98540 0041D4 068C+00 1/0 0/0 0/0 .text ECut_clothesGet__11daNpc_zrZ_cFi */ @@ -2562,19 +2583,19 @@ asm void daNpc_zrZ_c::ECut_clothesGet(int param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6099 = 11.0f / 20.0f; -COMPILER_STRIP_GATE(80B9B1F0, &lit_6099); +COMPILER_STRIP_GATE(0x80B9B1F0, &lit_6099); #pragma pop /* 80B9B1F4-80B9B1F8 000208 0004+00 0/0 0/0 0/0 .rodata @6100 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6100 = 9.0f / 20.0f; -COMPILER_STRIP_GATE(80B9B1F4, &lit_6100); +COMPILER_STRIP_GATE(0x80B9B1F4, &lit_6100); #pragma pop /* 80B9B1F8-80B9B1FC 00020C 0004+00 1/1 0/0 0/0 .rodata @6101 */ SECTION_RODATA static f32 const lit_6101 = 120.0f; -COMPILER_STRIP_GATE(80B9B1F8, &lit_6101); +COMPILER_STRIP_GATE(0x80B9B1F8, &lit_6101); /* 80B98540-80B9877C 004860 023C+00 1/0 0/0 0/0 .text ECut_getAfter__11daNpc_zrZ_cFi */ #pragma push @@ -2591,28 +2612,28 @@ asm void daNpc_zrZ_c::ECut_getAfter(int param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6102 = 21105.0f; -COMPILER_STRIP_GATE(80B9B1FC, &lit_6102); +COMPILER_STRIP_GATE(0x80B9B1FC, &lit_6102); #pragma pop /* 80B9B200-80B9B204 000214 0004+00 0/0 0/0 0/0 .rodata @6103 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6103 = 750.0f; -COMPILER_STRIP_GATE(80B9B200, &lit_6103); +COMPILER_STRIP_GATE(0x80B9B200, &lit_6103); #pragma pop /* 80B9B204-80B9B208 000218 0004+00 0/0 0/0 0/0 .rodata @6104 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6104 = 1.5f; -COMPILER_STRIP_GATE(80B9B204, &lit_6104); +COMPILER_STRIP_GATE(0x80B9B204, &lit_6104); #pragma pop /* 80B9B208-80B9B20C 00021C 0004+00 0/3 0/0 0/0 .rodata @6231 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6231 = 3.0f; -COMPILER_STRIP_GATE(80B9B208, &lit_6231); +COMPILER_STRIP_GATE(0x80B9B208, &lit_6231); #pragma pop /* 80B9877C-80B98ACC 004A9C 0350+00 1/0 0/0 0/0 .text ECut_sealRelease__11daNpc_zrZ_cFi @@ -2639,7 +2660,7 @@ asm void daNpc_zrZ_c::ECut_srSkip(int param_0) { /* ############################################################################################## */ /* 80B9B20C-80B9B210 000220 0004+00 1/1 0/0 0/0 .rodata @6287 */ SECTION_RODATA static f32 const lit_6287 = 1000.0f; -COMPILER_STRIP_GATE(80B9B20C, &lit_6287); +COMPILER_STRIP_GATE(0x80B9B20C, &lit_6287); /* 80B98C34-80B98D04 004F54 00D0+00 1/1 0/0 0/0 .text pullbackPlayer__11daNpc_zrZ_cFf */ #pragma push @@ -2656,7 +2677,7 @@ asm void daNpc_zrZ_c::pullbackPlayer(f32 param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6342 = -120.0f; -COMPILER_STRIP_GATE(80B9B210, &lit_6342); +COMPILER_STRIP_GATE(0x80B9B210, &lit_6342); #pragma pop /* 80B98D04-80B98F84 005024 0280+00 2/0 0/0 0/0 .text wait__11daNpc_zrZ_cFPv */ @@ -2684,7 +2705,7 @@ asm void daNpc_zrZ_c::comeHere(void* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6785 = 450.0f; -COMPILER_STRIP_GATE(80B9B214, &lit_6785); +COMPILER_STRIP_GATE(0x80B9B214, &lit_6785); #pragma pop /* 80B998BC-80B9A0EC 005BDC 0830+00 1/0 0/0 0/0 .text comeHere2__11daNpc_zrZ_cFPv */ @@ -2722,14 +2743,14 @@ asm void daNpc_zrZ_c::test(void* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6891 = 470.0f; -COMPILER_STRIP_GATE(80B9B218, &lit_6891); +COMPILER_STRIP_GATE(0x80B9B218, &lit_6891); #pragma pop /* 80B9B21C-80B9B220 000230 0004+00 0/1 0/0 0/0 .rodata @6892 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6892 = 25.0f; -COMPILER_STRIP_GATE(80B9B21C, &lit_6892); +COMPILER_STRIP_GATE(0x80B9B21C, &lit_6892); #pragma pop /* 80B9A380-80B9A504 0066A0 0184+00 1/1 0/0 0/0 .text himoCalc__11daNpc_zrZ_cFv */ @@ -2956,7 +2977,7 @@ asm cCcD_GStts::~cCcD_GStts() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80B9AE44(int* param_0) { +extern "C" asm void func_80B9AE44(void* _this, int* param_0) { nofralloc #include "asm/rel/d/a/npc/d_a_npc_zrz/d_a_npc_zrz/func_80B9AE44.s" } @@ -2982,7 +3003,7 @@ asm void __sinit_d_a_npc_zrz_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80B9AE60 = (void*)__sinit_d_a_npc_zrz_cpp; +REGISTER_CTORS(0x80B9AE60, __sinit_d_a_npc_zrz_cpp); #pragma pop /* 80B9AF7C-80B9AF80 00729C 0004+00 1/0 0/0 0/0 .text adjustShapeAngle__11daNpc_zrZ_cFv @@ -3193,20 +3214,4 @@ static u8 data_80B9B930[4]; static u8 data_80B9B934[4]; #pragma pop -/* 80B9B220-80B9B284 000234 0064+00 11/7 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80B9B220 = "zrZ"; -SECTION_DEAD static char const* const stringBase_80B9B224 = "zrZ_GT"; -SECTION_DEAD static char const* const stringBase_80B9B22B = "HELP_PRINCE"; -SECTION_DEAD static char const* const stringBase_80B9B237 = "COME_HERE"; -SECTION_DEAD static char const* const stringBase_80B9B241 = "RESTORE_LINK"; -SECTION_DEAD static char const* const stringBase_80B9B24E = "CLOTHES_GET"; -SECTION_DEAD static char const* const stringBase_80B9B25A = "GET_AFTER"; -SECTION_DEAD static char const* const stringBase_80B9B264 = "SEAL_RELEASE"; -SECTION_DEAD static char const* const stringBase_80B9B271 = "SR_SKIP"; -SECTION_DEAD static char const* const stringBase_80B9B279 = ""; -SECTION_DEAD static char const* const stringBase_80B9B27A = "prm"; -SECTION_DEAD static char const* const stringBase_80B9B27E = "timer"; -#pragma pop +/* 80B9B220-80B9B220 000234 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key.cpp b/rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key.cpp index a8cedf6b609..71fec5520f1 100644 --- a/rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key.cpp +++ b/rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key.cpp @@ -255,7 +255,13 @@ extern "C" extern u8 j3dSys[284]; /* ############################################################################################## */ /* 80B9C920-80B9C924 000000 0004+00 6/6 0/0 0/0 .rodata @3755 */ SECTION_RODATA static f32 const lit_3755 = 1.0f; -COMPILER_STRIP_GATE(80B9C920, &lit_3755); +COMPILER_STRIP_GATE(0x80B9C920, &lit_3755); + +/* 80B9C9AC-80B9C9AC 00008C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80B9C9AC = "Lv5_KEY"; +#pragma pop /* 80B9C9B4-80B9C9B8 -00001 0004+00 3/3 0/0 0/0 .data l_arcName */ SECTION_DATA static void* l_arcName = (void*)&d_a_obj_Lv5Key__stringBase0; @@ -275,39 +281,39 @@ asm void daObjLv5Key_c::CreateHeap() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3767 = -50.0f; -COMPILER_STRIP_GATE(80B9C924, &lit_3767); +COMPILER_STRIP_GATE(0x80B9C924, &lit_3767); #pragma pop /* 80B9C928-80B9C92C 000008 0004+00 1/2 0/0 0/0 .rodata @3768 */ SECTION_RODATA static f32 const lit_3768 = 30.0f; -COMPILER_STRIP_GATE(80B9C928, &lit_3768); +COMPILER_STRIP_GATE(0x80B9C928, &lit_3768); /* 80B9C92C-80B9C930 00000C 0004+00 0/1 0/0 0/0 .rodata @3769 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3769 = -20.0f; -COMPILER_STRIP_GATE(80B9C92C, &lit_3769); +COMPILER_STRIP_GATE(0x80B9C92C, &lit_3769); #pragma pop /* 80B9C930-80B9C934 000010 0004+00 0/1 0/0 0/0 .rodata @3770 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3770 = 50.0f; -COMPILER_STRIP_GATE(80B9C930, &lit_3770); +COMPILER_STRIP_GATE(0x80B9C930, &lit_3770); #pragma pop /* 80B9C934-80B9C938 000014 0004+00 0/1 0/0 0/0 .rodata @3771 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3771 = -90.0f; -COMPILER_STRIP_GATE(80B9C934, &lit_3771); +COMPILER_STRIP_GATE(0x80B9C934, &lit_3771); #pragma pop /* 80B9C938-80B9C93C 000018 0004+00 0/1 0/0 0/0 .rodata @3772 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3772 = 20.0f; -COMPILER_STRIP_GATE(80B9C938, &lit_3772); +COMPILER_STRIP_GATE(0x80B9C938, &lit_3772); #pragma pop /* 80B9C93C-80B9C940 00001C 0004+00 3/7 0/0 0/0 .rodata @3773 */ @@ -317,7 +323,7 @@ SECTION_RODATA static u8 const lit_3773[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B9C93C, &lit_3773); +COMPILER_STRIP_GATE(0x80B9C93C, &lit_3773); /* 80B9C9B8-80B9C9C4 -00001 000C+00 1/1 0/0 0/0 .data @3759 */ SECTION_DATA static void* lit_3759[3] = { @@ -354,7 +360,7 @@ SECTION_RODATA static u8 const ccShpSrc[64] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC1, 0x8E, 0x66, 0x66, 0x00, 0x00, 0x00, 0x00, 0x42, 0x0C, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B9C940, &ccShpSrc); +COMPILER_STRIP_GATE(0x80B9C940, &ccShpSrc); /* 80B9BBCC-80B9BC2C 00028C 0060+00 1/1 0/0 0/0 .text initCcSph__13daObjLv5Key_cFv */ #pragma push @@ -371,14 +377,14 @@ asm void daObjLv5Key_c::initCcSph() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3797 = -17.5f; -COMPILER_STRIP_GATE(80B9C980, &lit_3797); +COMPILER_STRIP_GATE(0x80B9C980, &lit_3797); #pragma pop /* 80B9C984-80B9C988 000064 0004+00 0/1 0/0 0/0 .rodata @3798 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3798 = 35.0f; -COMPILER_STRIP_GATE(80B9C984, &lit_3798); +COMPILER_STRIP_GATE(0x80B9C984, &lit_3798); #pragma pop /* 80B9BC2C-80B9BCEC 0002EC 00C0+00 1/1 0/0 0/0 .text setCcSph__13daObjLv5Key_cFv */ @@ -417,7 +423,7 @@ static asm void daObjLv5Key_Delete(daObjLv5Key_c* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daObjLv5Key_c::setAction(void (daObjLv5Key_c::*)(int), int param_1) { +asm void daObjLv5Key_c::setAction(void (daObjLv5Key_c::*param_0)(int), int param_1) { nofralloc #include "asm/rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key/setAction__13daObjLv5Key_cFM13daObjLv5Key_cFPCvPvi_vi.s" } @@ -481,35 +487,35 @@ asm void daObjLv5Key_c::Open(int param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3907 = -6.0f; -COMPILER_STRIP_GATE(80B9C988, &lit_3907); +COMPILER_STRIP_GATE(0x80B9C988, &lit_3907); #pragma pop /* 80B9C98C-80B9C990 00006C 0004+00 0/1 0/0 0/0 .rodata @3908 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3908 = 88.0f; -COMPILER_STRIP_GATE(80B9C98C, &lit_3908); +COMPILER_STRIP_GATE(0x80B9C98C, &lit_3908); #pragma pop /* 80B9C990-80B9C994 000070 0004+00 0/1 0/0 0/0 .rodata @3909 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3909 = 4.0f; -COMPILER_STRIP_GATE(80B9C990, &lit_3909); +COMPILER_STRIP_GATE(0x80B9C990, &lit_3909); #pragma pop /* 80B9C994-80B9C998 000074 0004+00 0/1 0/0 0/0 .rodata @3910 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3910 = 22.0f; -COMPILER_STRIP_GATE(80B9C994, &lit_3910); +COMPILER_STRIP_GATE(0x80B9C994, &lit_3910); #pragma pop /* 80B9C998-80B9C99C 000078 0004+00 0/1 0/0 0/0 .rodata @3911 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3911 = 87.0f; -COMPILER_STRIP_GATE(80B9C998, &lit_3911); +COMPILER_STRIP_GATE(0x80B9C998, &lit_3911); #pragma pop /* 80B9C9E8-80B9C9F4 -00001 000C+00 1/1 0/0 0/0 .data @3891 */ @@ -534,28 +540,28 @@ asm void daObjLv5Key_c::Fall(int param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3929 = 92.0f / 5.0f; -COMPILER_STRIP_GATE(80B9C99C, &lit_3929); +COMPILER_STRIP_GATE(0x80B9C99C, &lit_3929); #pragma pop /* 80B9C9A0-80B9C9A4 000080 0004+00 0/1 0/0 0/0 .rodata @3930 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3930 = -87.0f / 5.0f; -COMPILER_STRIP_GATE(80B9C9A0, &lit_3930); +COMPILER_STRIP_GATE(0x80B9C9A0, &lit_3930); #pragma pop /* 80B9C9A4-80B9C9A8 000084 0004+00 0/1 0/0 0/0 .rodata @3931 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_3931 = 0xC2956666; -COMPILER_STRIP_GATE(80B9C9A4, &lit_3931); +COMPILER_STRIP_GATE(0x80B9C9A4, &lit_3931); #pragma pop /* 80B9C9A8-80B9C9AC 000088 0004+00 0/1 0/0 0/0 .rodata @3932 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3932 = 87.0f / 10.0f; -COMPILER_STRIP_GATE(80B9C9A8, &lit_3932); +COMPILER_STRIP_GATE(0x80B9C9A8, &lit_3932); #pragma pop /* 80B9C17C-80B9C268 00083C 00EC+00 1/0 0/0 0/0 .text Land__13daObjLv5Key_cFi */ @@ -799,9 +805,4 @@ static asm void func_80B9C910() { } #pragma pop -/* 80B9C9AC-80B9C9B4 00008C 0008+00 1/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80B9C9AC = "Lv5_KEY"; -#pragma pop +/* 80B9C9AC-80B9C9AC 00008C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_Turara/d_a_obj_Turara.cpp b/rel/d/a/obj/d_a_obj_Turara/d_a_obj_Turara.cpp index afcef033d04..9dcc8ba33e9 100644 --- a/rel/d/a/obj/d_a_obj_Turara/d_a_obj_Turara.cpp +++ b/rel/d/a/obj/d_a_obj_Turara/d_a_obj_Turara.cpp @@ -91,12 +91,12 @@ struct dRes_control_c { struct dPa_levelEcallBack {}; -struct _GXColor {}; - struct csXyz { /* 802673F4 */ csXyz(s16, s16, s16); }; +struct _GXColor {}; + struct dPa_control_c { /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, @@ -224,10 +224,10 @@ struct cBgS { /* 80074250 */ void Release(dBgW_Base*); }; -struct Vec {}; - struct JAISoundID {}; +struct Vec {}; + struct Z2SeMgr { /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); }; @@ -396,34 +396,34 @@ extern "C" void __register_global_object(); /* ############################################################################################## */ /* 80B9E8F4-80B9E8F8 000000 0004+00 6/6 0/0 0/0 .rodata @3661 */ SECTION_RODATA static f32 const lit_3661 = 450.0f; -COMPILER_STRIP_GATE(80B9E8F4, &lit_3661); +COMPILER_STRIP_GATE(0x80B9E8F4, &lit_3661); /* 80B9E8F8-80B9E8FC 000004 0004+00 0/2 0/0 0/0 .rodata @3662 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3662 = 10.0f; -COMPILER_STRIP_GATE(80B9E8F8, &lit_3662); +COMPILER_STRIP_GATE(0x80B9E8F8, &lit_3662); #pragma pop /* 80B9E8FC-80B9E900 000008 0004+00 0/1 0/0 0/0 .rodata @3663 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3663 = 200.0f; -COMPILER_STRIP_GATE(80B9E8FC, &lit_3663); +COMPILER_STRIP_GATE(0x80B9E8FC, &lit_3663); #pragma pop /* 80B9E900-80B9E904 00000C 0004+00 0/1 0/0 0/0 .rodata @3664 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3664 = 5.0f; -COMPILER_STRIP_GATE(80B9E900, &lit_3664); +COMPILER_STRIP_GATE(0x80B9E900, &lit_3664); #pragma pop /* 80B9E904-80B9E908 000010 0004+00 0/2 0/0 0/0 .rodata @3665 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3665 = 3.0f; -COMPILER_STRIP_GATE(80B9E904, &lit_3665); +COMPILER_STRIP_GATE(0x80B9E904, &lit_3665); #pragma pop /* 80B9E97C-80B9E988 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ @@ -684,13 +684,19 @@ SECTION_RODATA u8 const daTurara_c::mCcDObjInfo[48] = { 0xF8, 0x40, 0x00, 0x22, 0x00, 0x00, 0x00, 0x11, 0x00, 0x00, 0x00, 0x79, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B9E908, &daTurara_c::mCcDObjInfo); +COMPILER_STRIP_GATE(0x80B9E908, &daTurara_c::mCcDObjInfo); /* 80B9E938-80B9E940 000044 0008+00 1/1 0/0 0/0 .rodata l_bmdIdx */ SECTION_RODATA static u8 const l_bmdIdx[8] = { 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x08, }; -COMPILER_STRIP_GATE(80B9E938, &l_bmdIdx); +COMPILER_STRIP_GATE(0x80B9E938, &l_bmdIdx); + +/* 80B9E970-80B9E970 00007C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80B9E970 = "M_Turara"; +#pragma pop /* 80B9CD74-80B9CED8 0002D4 0164+00 1/0 0/0 0/0 .text CreateHeap__10daTurara_cFv */ #pragma push @@ -707,14 +713,14 @@ asm void daTurara_c::CreateHeap() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3823 = 150.0f; -COMPILER_STRIP_GATE(80B9E940, &lit_3823); +COMPILER_STRIP_GATE(0x80B9E940, &lit_3823); #pragma pop /* 80B9E944-80B9E948 000050 0004+00 0/1 0/0 0/0 .rodata @3824 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3824 = 10000.0f; -COMPILER_STRIP_GATE(80B9E944, &lit_3824); +COMPILER_STRIP_GATE(0x80B9E944, &lit_3824); #pragma pop /* 80B9E948-80B9E94C 000054 0004+00 1/5 0/0 0/0 .rodata @3825 */ @@ -724,7 +730,7 @@ SECTION_RODATA static u8 const lit_3825[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B9E948, &lit_3825); +COMPILER_STRIP_GATE(0x80B9E948, &lit_3825); /* 80B9CED8-80B9D29C 000438 03C4+00 1/1 0/0 0/0 .text create__10daTurara_cFv */ #pragma push @@ -811,35 +817,35 @@ asm void daTurara_c::Execute(f32 (**param_0)[3][4]) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3949 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(80B9E94C, &lit_3949); +COMPILER_STRIP_GATE(0x80B9E94C, &lit_3949); #pragma pop /* 80B9E950-80B9E954 00005C 0004+00 0/1 0/0 0/0 .rodata @3950 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3950 = 170.0f; -COMPILER_STRIP_GATE(80B9E950, &lit_3950); +COMPILER_STRIP_GATE(0x80B9E950, &lit_3950); #pragma pop /* 80B9E954-80B9E958 000060 0004+00 0/1 0/0 0/0 .rodata @3951 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3951 = 130.0f; -COMPILER_STRIP_GATE(80B9E954, &lit_3951); +COMPILER_STRIP_GATE(0x80B9E954, &lit_3951); #pragma pop /* 80B9E958-80B9E95C 000064 0004+00 0/1 0/0 0/0 .rodata @3952 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3952 = 510.0f; -COMPILER_STRIP_GATE(80B9E958, &lit_3952); +COMPILER_STRIP_GATE(0x80B9E958, &lit_3952); #pragma pop /* 80B9E95C-80B9E960 000068 0004+00 0/1 0/0 0/0 .rodata @3953 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3953 = 50.0f; -COMPILER_STRIP_GATE(80B9E95C, &lit_3953); +COMPILER_STRIP_GATE(0x80B9E95C, &lit_3953); #pragma pop /* 80B9EB98-80B9EBA4 000008 000C+00 1/1 0/0 0/0 .bss @3653 */ @@ -874,11 +880,11 @@ asm void daTurara_c::init_modeWait() { /* ############################################################################################## */ /* 80B9E960-80B9E964 00006C 0004+00 2/5 0/0 0/0 .rodata @4027 */ SECTION_RODATA static f32 const lit_4027 = 1.0f; -COMPILER_STRIP_GATE(80B9E960, &lit_4027); +COMPILER_STRIP_GATE(0x80B9E960, &lit_4027); /* 80B9E964-80B9E968 000070 0004+00 2/5 0/0 0/0 .rodata @4028 */ SECTION_RODATA static f32 const lit_4028 = -1.0f; -COMPILER_STRIP_GATE(80B9E964, &lit_4028); +COMPILER_STRIP_GATE(0x80B9E964, &lit_4028); /* 80B9D738-80B9D998 000C98 0260+00 1/0 0/0 0/0 .text modeWait__10daTurara_cFv */ #pragma push @@ -976,14 +982,14 @@ asm void daTurara_c::modeDropEnd() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4263 = 100.0f; -COMPILER_STRIP_GATE(80B9E968, &lit_4263); +COMPILER_STRIP_GATE(0x80B9E968, &lit_4263); #pragma pop /* 80B9E96C-80B9E970 000078 0004+00 0/1 0/0 0/0 .rodata @4264 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4264 = 7.0f / 10.0f; -COMPILER_STRIP_GATE(80B9E96C, &lit_4264); +COMPILER_STRIP_GATE(0x80B9E96C, &lit_4264); #pragma pop /* 80B9E078-80B9E338 0015D8 02C0+00 1/1 0/0 0/0 .text init_modeDropEnd2__10daTurara_cFv @@ -1099,7 +1105,7 @@ asm void __sinit_d_a_obj_Turara_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80B9E620 = (void*)__sinit_d_a_obj_Turara_cpp; +REGISTER_CTORS(0x80B9E620, __sinit_d_a_obj_Turara_cpp); #pragma pop /* 80B9E690-80B9E698 001BF0 0008+00 1/0 0/0 0/0 .text @1448@eventStart__10daTurara_cFv */ @@ -1178,9 +1184,4 @@ asm daTurara_c::~daTurara_c() { } #pragma pop -/* 80B9E970-80B9E979 00007C 0009+00 3/3 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80B9E970 = "M_Turara"; -#pragma pop +/* 80B9E970-80B9E970 00007C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_TvCdlst/d_a_obj_TvCdlst.cpp b/rel/d/a/obj/d_a_obj_TvCdlst/d_a_obj_TvCdlst.cpp index 0ba9e770c5c..c6ebc9408c7 100644 --- a/rel/d/a/obj/d_a_obj_TvCdlst/d_a_obj_TvCdlst.cpp +++ b/rel/d/a/obj/d_a_obj_TvCdlst/d_a_obj_TvCdlst.cpp @@ -123,10 +123,10 @@ struct Z2SoundObjBase { /* 802BE4A4 */ void startCollisionSE(u32, u32, Z2SoundObjBase*); }; -struct Vec {}; - struct JAISoundID {}; +struct Vec {}; + struct Z2SeMgr { /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); /* 802AC50C */ void seStartLevel(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); @@ -322,6 +322,13 @@ asm void daTvCdlst_c::setBaseMtx() { } #pragma pop +/* ############################################################################################## */ +/* 80B9F8F4-80B9F8F4 000064 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80B9F8F4 = "HShokudai"; +#pragma pop + /* 80B9EDC8-80B9EE34 0001E8 006C+00 1/1 0/0 0/0 .text CreateHeap__11daTvCdlst_cFv */ #pragma push #pragma optimization_level 0 @@ -339,11 +346,11 @@ SECTION_RODATA u8 const daTvCdlst_c::mCcDObjInfo[48] = { 0xD8, 0xFB, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x1F, 0x00, 0x00, 0x00, 0x79, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B9F890, &daTvCdlst_c::mCcDObjInfo); +COMPILER_STRIP_GATE(0x80B9F890, &daTvCdlst_c::mCcDObjInfo); /* 80B9F8C0-80B9F8C4 000030 0004+00 1/1 0/0 0/0 .rodata @3750 */ SECTION_RODATA static f32 const lit_3750 = 155.0f; -COMPILER_STRIP_GATE(80B9F8C0, &lit_3750); +COMPILER_STRIP_GATE(0x80B9F8C0, &lit_3750); /* 80B9EE34-80B9F0B4 000254 0280+00 1/1 0/0 0/0 .text create__11daTvCdlst_cFv */ #pragma push @@ -391,21 +398,21 @@ asm void daTvCdlst_c::createHeapCallBack(fopAc_ac_c* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3840 = 10.0f; -COMPILER_STRIP_GATE(80B9F8C4, &lit_3840); +COMPILER_STRIP_GATE(0x80B9F8C4, &lit_3840); #pragma pop /* 80B9F8C8-80B9F8CC 000038 0004+00 0/1 0/0 0/0 .rodata @3841 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3841 = 500.0f; -COMPILER_STRIP_GATE(80B9F8C8, &lit_3841); +COMPILER_STRIP_GATE(0x80B9F8C8, &lit_3841); #pragma pop /* 80B9F8CC-80B9F8D0 00003C 0004+00 0/3 0/0 0/0 .rodata @3842 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3842 = 1.0f; -COMPILER_STRIP_GATE(80B9F8CC, &lit_3842); +COMPILER_STRIP_GATE(0x80B9F8CC, &lit_3842); #pragma pop /* 80B9F8D0-80B9F8D4 000040 0004+00 0/3 0/0 0/0 .rodata @3843 */ @@ -417,7 +424,7 @@ SECTION_RODATA static u8 const lit_3843[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80B9F8D0, &lit_3843); +COMPILER_STRIP_GATE(0x80B9F8D0, &lit_3843); #pragma pop /* 80B9F164-80B9F1F0 000584 008C+00 1/1 0/0 0/0 .text lightInit__11daTvCdlst_cFv */ @@ -455,35 +462,35 @@ asm void daTvCdlst_c::cutLight() { #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_3861 = 0xBC6642FF; -COMPILER_STRIP_GATE(80B9F8D4, &lit_3861); +COMPILER_STRIP_GATE(0x80B9F8D4, &lit_3861); #pragma pop /* 80B9F8D8-80B9F8DC 000048 0004+00 0/1 0/0 0/0 .rodata @3869 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3869 = 0.5f; -COMPILER_STRIP_GATE(80B9F8D8, &lit_3869); +COMPILER_STRIP_GATE(0x80B9F8D8, &lit_3869); #pragma pop /* 80B9F8DC-80B9F8E0 00004C 0004+00 0/1 0/0 0/0 .rodata @3870 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3870 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(80B9F8DC, &lit_3870); +COMPILER_STRIP_GATE(0x80B9F8DC, &lit_3870); #pragma pop /* 80B9F8E0-80B9F8E4 000050 0004+00 0/1 0/0 0/0 .rodata @3871 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_3871 = 0x38D1B717; -COMPILER_STRIP_GATE(80B9F8E0, &lit_3871); +COMPILER_STRIP_GATE(0x80B9F8E0, &lit_3871); #pragma pop /* 80B9F8E4-80B9F8E8 000054 0004+00 0/1 0/0 0/0 .rodata @3872 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_3872 = 0x358637BD; -COMPILER_STRIP_GATE(80B9F8E4, &lit_3872); +COMPILER_STRIP_GATE(0x80B9F8E4, &lit_3872); #pragma pop /* 80B9F250-80B9F300 000670 00B0+00 1/1 0/0 0/0 .text pointLightProc__11daTvCdlst_cFv */ @@ -501,21 +508,21 @@ asm void daTvCdlst_c::pointLightProc() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3937 = -1.0f; -COMPILER_STRIP_GATE(80B9F8E8, &lit_3937); +COMPILER_STRIP_GATE(0x80B9F8E8, &lit_3937); #pragma pop /* 80B9F8EC-80B9F8F0 00005C 0004+00 0/1 0/0 0/0 .rodata @3938 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3938 = 25.0f; -COMPILER_STRIP_GATE(80B9F8EC, &lit_3938); +COMPILER_STRIP_GATE(0x80B9F8EC, &lit_3938); #pragma pop /* 80B9F8F0-80B9F8F4 000060 0004+00 0/1 0/0 0/0 .rodata @3939 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3939 = 140.0f; -COMPILER_STRIP_GATE(80B9F8F0, &lit_3939); +COMPILER_STRIP_GATE(0x80B9F8F0, &lit_3939); #pragma pop /* 80B9F300-80B9F634 000720 0334+00 1/1 0/0 0/0 .text Execute__11daTvCdlst_cFv */ @@ -619,12 +626,7 @@ asm void __sinit_d_a_obj_TvCdlst_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80B9F80C = (void*)__sinit_d_a_obj_TvCdlst_cpp; +REGISTER_CTORS(0x80B9F80C, __sinit_d_a_obj_TvCdlst_cpp); #pragma pop -/* 80B9F8F4-80B9F8FE 000064 000A+00 3/4 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80B9F8F4 = "HShokudai"; -#pragma pop +/* 80B9F8F4-80B9F8F4 000064 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_Y_taihou/d_a_obj_Y_taihou.cpp b/rel/d/a/obj/d_a_obj_Y_taihou/d_a_obj_Y_taihou.cpp index 853b3cb21a4..d0f9166e3a6 100644 --- a/rel/d/a/obj/d_a_obj_Y_taihou/d_a_obj_Y_taihou.cpp +++ b/rel/d/a/obj/d_a_obj_Y_taihou/d_a_obj_Y_taihou.cpp @@ -78,10 +78,10 @@ struct dRes_control_c { struct dPa_levelEcallBack {}; -struct _GXColor {}; - struct csXyz {}; +struct _GXColor {}; + struct dPa_control_c { /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, @@ -213,7 +213,7 @@ extern "C" bool eventStart__17dEvLib_callback_cFv(); extern "C" bool eventRun__17dEvLib_callback_cFv(); extern "C" bool eventEnd__17dEvLib_callback_cFv(); extern "C" void __dt__14daObjYtaihou_cFv(); -extern "C" void func_80BA1118(s16*); +extern "C" void func_80BA1118(void* _this, s16*); extern "C" static void func_80BA1134(); extern "C" static void func_80BA113C(); extern "C" extern char const* const d_a_obj_Y_taihou__stringBase0; @@ -304,27 +304,27 @@ extern "C" void __register_global_object(); /* ############################################################################################## */ /* 80BA1154-80BA1158 000000 0004+00 4/4 0/0 0/0 .rodata @3695 */ SECTION_RODATA static f32 const lit_3695 = 150.0f; -COMPILER_STRIP_GATE(80BA1154, &lit_3695); +COMPILER_STRIP_GATE(0x80BA1154, &lit_3695); /* 80BA1158-80BA115C 000004 0004+00 0/1 0/0 0/0 .rodata @3696 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3696 = 200.0f; -COMPILER_STRIP_GATE(80BA1158, &lit_3696); +COMPILER_STRIP_GATE(0x80BA1158, &lit_3696); #pragma pop /* 80BA115C-80BA1160 000008 0004+00 0/3 0/0 0/0 .rodata @3697 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3697 = 1.0f; -COMPILER_STRIP_GATE(80BA115C, &lit_3697); +COMPILER_STRIP_GATE(0x80BA115C, &lit_3697); #pragma pop /* 80BA1160-80BA1164 00000C 0004+00 0/3 0/0 0/0 .rodata @3698 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3698 = -1.0f; -COMPILER_STRIP_GATE(80BA1160, &lit_3698); +COMPILER_STRIP_GATE(0x80BA1160, &lit_3698); #pragma pop /* 80B9FAEC-80B9FC40 0000EC 0154+00 1/1 0/0 0/0 .text @@ -347,7 +347,7 @@ SECTION_RODATA static u8 const lit_3733[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BA1164, &lit_3733); +COMPILER_STRIP_GATE(0x80BA1164, &lit_3733); /* 80B9FC40-80B9FD20 000240 00E0+00 1/1 0/0 0/0 .text * pushPullcallBack__FP10fopAc_ac_cP10fopAc_ac_csQ29dBgW_Base13PushPullLabel */ @@ -374,7 +374,7 @@ asm cXyz::~cXyz() { /* ############################################################################################## */ /* 80BA1168-80BA116C 000014 0004+00 1/1 0/0 0/0 .rodata @3749 */ SECTION_RODATA static f32 const lit_3749 = 40000.0f; -COMPILER_STRIP_GATE(80BA1168, &lit_3749); +COMPILER_STRIP_GATE(0x80BA1168, &lit_3749); /* 80B9FD5C-80B9FDE8 00035C 008C+00 1/1 0/0 0/0 .text searchIronBallCallback__FPvPv */ #pragma push @@ -387,6 +387,12 @@ static asm void searchIronBallCallback(void* param_0, void* param_1) { #pragma pop /* ############################################################################################## */ +/* 80BA11D4-80BA11D4 000080 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80BA11D4 = "Y_taihou"; +#pragma pop + /* 80BA11E0-80BA11E4 -00001 0004+00 3/3 0/0 0/0 .data l_arcName */ SECTION_DATA static void* l_arcName = (void*)&d_a_obj_Y_taihou__stringBase0; @@ -471,28 +477,28 @@ asm void daObjYtaihou_c::setNextAngle() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3852 = 4.0f / 5.0f; -COMPILER_STRIP_GATE(80BA116C, &lit_3852); +COMPILER_STRIP_GATE(0x80BA116C, &lit_3852); #pragma pop /* 80BA1170-80BA1174 00001C 0004+00 0/1 0/0 0/0 .rodata @3853 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3853 = 60.0f; -COMPILER_STRIP_GATE(80BA1170, &lit_3853); +COMPILER_STRIP_GATE(0x80BA1170, &lit_3853); #pragma pop /* 80BA1174-80BA1178 000020 0004+00 0/1 0/0 0/0 .rodata @3854 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3854 = 59.0f; -COMPILER_STRIP_GATE(80BA1174, &lit_3854); +COMPILER_STRIP_GATE(0x80BA1174, &lit_3854); #pragma pop /* 80BA1178-80BA117C 000024 0004+00 0/1 0/0 0/0 .rodata @3855 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3855 = 3.0f / 5.0f; -COMPILER_STRIP_GATE(80BA1178, &lit_3855); +COMPILER_STRIP_GATE(0x80BA1178, &lit_3855); #pragma pop /* 80BA117C-80BA1184 000028 0004+04 0/1 0/0 0/0 .rodata @3856 */ @@ -503,7 +509,7 @@ SECTION_RODATA static f32 const lit_3856[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80BA117C, &lit_3856); +COMPILER_STRIP_GATE(0x80BA117C, &lit_3856); #pragma pop /* 80BA1184-80BA118C 000030 0008+00 0/1 0/0 0/0 .rodata @3858 */ @@ -512,7 +518,7 @@ COMPILER_STRIP_GATE(80BA117C, &lit_3856); SECTION_RODATA static u8 const lit_3858[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BA1184, &lit_3858); +COMPILER_STRIP_GATE(0x80BA1184, &lit_3858); #pragma pop /* 80BA1318-80BA131C 000008 0001+03 1/1 0/0 0/0 .bss @1109 */ @@ -629,7 +635,7 @@ asm void daObjYtaihou_c::setMtx() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3915 = 10.0f; -COMPILER_STRIP_GATE(80BA118C, &lit_3915); +COMPILER_STRIP_GATE(0x80BA118C, &lit_3915); #pragma pop /* 80BA0208-80BA045C 000808 0254+00 1/1 0/0 0/0 .text rotateCheck__14daObjYtaihou_cFv */ @@ -649,7 +655,7 @@ asm void daObjYtaihou_c::rotateCheck() { SECTION_RODATA static u8 const l_hibanaOffset[12] = { 0x00, 0x00, 0x00, 0x00, 0x43, 0x16, 0x00, 0x00, 0x42, 0x48, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BA1190, &l_hibanaOffset); +COMPILER_STRIP_GATE(0x80BA1190, &l_hibanaOffset); #pragma pop /* 80BA119C-80BA11A8 000048 000C+00 0/1 0/0 0/0 .rodata l_shotOffset$3961 */ @@ -658,7 +664,7 @@ COMPILER_STRIP_GATE(80BA1190, &l_hibanaOffset); SECTION_RODATA static u8 const l_shotOffset[12] = { 0x00, 0x00, 0x00, 0x00, 0x43, 0x02, 0x00, 0x00, 0xC2, 0xC8, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BA119C, &l_shotOffset); +COMPILER_STRIP_GATE(0x80BA119C, &l_shotOffset); #pragma pop /* 80BA11A8-80BA11B4 000054 000C+00 0/1 0/0 0/0 .rodata l_shotSmokeOffset$3962 */ @@ -667,42 +673,42 @@ COMPILER_STRIP_GATE(80BA119C, &l_shotOffset); SECTION_RODATA static u8 const l_shotSmokeOffset[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BA11A8, &l_shotSmokeOffset); +COMPILER_STRIP_GATE(0x80BA11A8, &l_shotSmokeOffset); #pragma pop /* 80BA11B4-80BA11B8 000060 0004+00 0/1 0/0 0/0 .rodata @4105 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4105 = 55.0f; -COMPILER_STRIP_GATE(80BA11B4, &lit_4105); +COMPILER_STRIP_GATE(0x80BA11B4, &lit_4105); #pragma pop /* 80BA11B8-80BA11BC 000064 0004+00 0/1 0/0 0/0 .rodata @4106 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4106 = 95.0f; -COMPILER_STRIP_GATE(80BA11B8, &lit_4106); +COMPILER_STRIP_GATE(0x80BA11B8, &lit_4106); #pragma pop /* 80BA11BC-80BA11C0 000068 0004+00 0/1 0/0 0/0 .rodata @4107 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4107 = 9.0f / 5.0f; -COMPILER_STRIP_GATE(80BA11BC, &lit_4107); +COMPILER_STRIP_GATE(0x80BA11BC, &lit_4107); #pragma pop /* 80BA11C0-80BA11C4 00006C 0004+00 0/1 0/0 0/0 .rodata @4108 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4108 = 210.0f; -COMPILER_STRIP_GATE(80BA11C0, &lit_4108); +COMPILER_STRIP_GATE(0x80BA11C0, &lit_4108); #pragma pop /* 80BA11C4-80BA11C8 000070 0004+00 0/1 0/0 0/0 .rodata @4109 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4109 = 40.0f; -COMPILER_STRIP_GATE(80BA11C4, &lit_4109); +COMPILER_STRIP_GATE(0x80BA11C4, &lit_4109); #pragma pop /* 80BA1360-80BA1370 000050 000C+04 0/1 0/0 0/0 .bss @3951 */ @@ -762,7 +768,7 @@ asm void daObjYtaihou_c::Create() { SECTION_RODATA static u8 const l_cc_offset[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC2, 0x48, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BA11C8, &l_cc_offset); +COMPILER_STRIP_GATE(0x80BA11C8, &l_cc_offset); /* 80BA0A94-80BA0B4C 001094 00B8+00 1/0 0/0 0/0 .text Execute__14daObjYtaihou_cFPPA3_A4_f */ @@ -1002,7 +1008,7 @@ asm daObjYtaihou_c::~daObjYtaihou_c() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80BA1118(s16* param_0) { +extern "C" asm void func_80BA1118(void* _this, s16* param_0) { nofralloc #include "asm/rel/d/a/obj/d_a_obj_Y_taihou/d_a_obj_Y_taihou/func_80BA1118.s" } @@ -1200,9 +1206,4 @@ static u8 data_80BA13D8[4]; static u8 data_80BA13DC[4]; #pragma pop -/* 80BA11D4-80BA11DD 000080 0009+00 1/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80BA11D4 = "Y_taihou"; -#pragma pop +/* 80BA11D4-80BA11D4 000080 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_amiShutter/d_a_obj_amiShutter.cpp b/rel/d/a/obj/d_a_obj_amiShutter/d_a_obj_amiShutter.cpp index 8dda4107c8c..29dd115abf5 100644 --- a/rel/d/a/obj/d_a_obj_amiShutter/d_a_obj_amiShutter.cpp +++ b/rel/d/a/obj/d_a_obj_amiShutter/d_a_obj_amiShutter.cpp @@ -220,11 +220,11 @@ extern "C" void __register_global_object(); /* ############################################################################################## */ /* 80BA2390-80BA2394 000000 0004+00 5/5 0/0 0/0 .rodata @3655 */ SECTION_RODATA static f32 const lit_3655 = 70.0f; -COMPILER_STRIP_GATE(80BA2390, &lit_3655); +COMPILER_STRIP_GATE(0x80BA2390, &lit_3655); /* 80BA2394-80BA2398 000004 0004+00 1/1 0/0 0/0 .rodata @3656 */ SECTION_RODATA static f32 const lit_3656 = 400.0f; -COMPILER_STRIP_GATE(80BA2394, &lit_3656); +COMPILER_STRIP_GATE(0x80BA2394, &lit_3656); /* 80BA23DC-80BA23E8 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { @@ -414,6 +414,13 @@ asm void daAmiShutter_c::setBaseMtx() { } #pragma pop +/* ############################################################################################## */ +/* 80BA23D4-80BA23D4 000044 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80BA23D4 = "S_Zami"; +#pragma pop + /* 80BA15E4-80BA1650 000204 006C+00 1/0 0/0 0/0 .text CreateHeap__14daAmiShutter_cFv */ #pragma push #pragma optimization_level 0 @@ -427,11 +434,11 @@ asm void daAmiShutter_c::CreateHeap() { /* ############################################################################################## */ /* 80BA2398-80BA239C 000008 0004+00 1/1 0/0 0/0 .rodata @3739 */ SECTION_RODATA static f32 const lit_3739 = -800.0f; -COMPILER_STRIP_GATE(80BA2398, &lit_3739); +COMPILER_STRIP_GATE(0x80BA2398, &lit_3739); /* 80BA239C-80BA23A0 00000C 0004+00 1/2 0/0 0/0 .rodata @3740 */ SECTION_RODATA static f32 const lit_3740 = 600.0f; -COMPILER_STRIP_GATE(80BA239C, &lit_3740); +COMPILER_STRIP_GATE(0x80BA239C, &lit_3740); /* 80BA1650-80BA182C 000270 01DC+00 1/1 0/0 0/0 .text create__14daAmiShutter_cFv */ #pragma push @@ -489,7 +496,7 @@ SECTION_RODATA static u8 const lit_3822[4 + 4 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BA23A0, &lit_3822); +COMPILER_STRIP_GATE(0x80BA23A0, &lit_3822); #pragma pop /* 80BA23A8-80BA23B0 000018 0008+00 0/1 0/0 0/0 .rodata @3823 */ @@ -498,7 +505,7 @@ COMPILER_STRIP_GATE(80BA23A0, &lit_3822); SECTION_RODATA static u8 const lit_3823[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BA23A8, &lit_3823); +COMPILER_STRIP_GATE(0x80BA23A8, &lit_3823); #pragma pop /* 80BA23B0-80BA23B8 000020 0008+00 0/1 0/0 0/0 .rodata @3824 */ @@ -507,7 +514,7 @@ COMPILER_STRIP_GATE(80BA23A8, &lit_3823); SECTION_RODATA static u8 const lit_3824[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BA23B0, &lit_3824); +COMPILER_STRIP_GATE(0x80BA23B0, &lit_3824); #pragma pop /* 80BA23B8-80BA23C0 000028 0008+00 0/1 0/0 0/0 .rodata @3825 */ @@ -516,14 +523,14 @@ COMPILER_STRIP_GATE(80BA23B0, &lit_3824); SECTION_RODATA static u8 const lit_3825[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BA23B8, &lit_3825); +COMPILER_STRIP_GATE(0x80BA23B8, &lit_3825); #pragma pop /* 80BA23C0-80BA23C4 000030 0004+00 0/1 0/0 0/0 .rodata @3826 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3826 = 50.0f; -COMPILER_STRIP_GATE(80BA23C0, &lit_3826); +COMPILER_STRIP_GATE(0x80BA23C0, &lit_3826); #pragma pop /* 80BA1974-80BA1B4C 000594 01D8+00 1/1 0/0 0/0 .text playerAreaCheck__14daAmiShutter_cFv @@ -592,11 +599,11 @@ asm void daAmiShutter_c::eventStart() { /* ############################################################################################## */ /* 80BA23C4-80BA23C8 000034 0004+00 3/6 0/0 0/0 .rodata @3890 */ SECTION_RODATA static f32 const lit_3890 = 1.0f; -COMPILER_STRIP_GATE(80BA23C4, &lit_3890); +COMPILER_STRIP_GATE(0x80BA23C4, &lit_3890); /* 80BA23C8-80BA23CC 000038 0004+00 3/3 0/0 0/0 .rodata @3891 */ SECTION_RODATA static f32 const lit_3891 = -1.0f; -COMPILER_STRIP_GATE(80BA23C8, &lit_3891); +COMPILER_STRIP_GATE(0x80BA23C8, &lit_3891); /* 80BA1CB4-80BA1D48 0008D4 0094+00 1/1 0/0 0/0 .text init_modeClose__14daAmiShutter_cFv */ @@ -614,7 +621,7 @@ asm void daAmiShutter_c::init_modeClose() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3900 = 0.5f; -COMPILER_STRIP_GATE(80BA23CC, &lit_3900); +COMPILER_STRIP_GATE(0x80BA23CC, &lit_3900); #pragma pop /* 80BA1D48-80BA1DCC 000968 0084+00 1/0 0/0 0/0 .text modeClose__14daAmiShutter_cFv */ @@ -642,7 +649,7 @@ asm void daAmiShutter_c::init_modeCloseEvent() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3919 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(80BA23D0, &lit_3919); +COMPILER_STRIP_GATE(0x80BA23D0, &lit_3919); #pragma pop /* 80BA1E60-80BA1EEC 000A80 008C+00 1/0 0/0 0/0 .text modeCloseEvent__14daAmiShutter_cFv @@ -775,7 +782,7 @@ asm void __sinit_d_a_obj_amiShutter_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80BA223C = (void*)__sinit_d_a_obj_amiShutter_cpp; +REGISTER_CTORS(0x80BA223C, __sinit_d_a_obj_amiShutter_cpp); #pragma pop /* 80BA2278-80BA2280 000E98 0008+00 1/0 0/0 0/0 .text @1448@eventStart__14daAmiShutter_cFv */ @@ -834,9 +841,4 @@ asm daAmiShutter_c::~daAmiShutter_c() { } #pragma pop -/* 80BA23D4-80BA23DB 000044 0007+00 3/3 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80BA23D4 = "S_Zami"; -#pragma pop +/* 80BA23D4-80BA23D4 000044 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_ari/d_a_obj_ari.cpp b/rel/d/a/obj/d_a_obj_ari/d_a_obj_ari.cpp index 99691c79d3f..0e5cb09161f 100644 --- a/rel/d/a/obj/d_a_obj_ari/d_a_obj_ari.cpp +++ b/rel/d/a/obj/d_a_obj_ari/d_a_obj_ari.cpp @@ -49,19 +49,19 @@ struct mDoExt_baseAnm { /* 8000D428 */ void play(); }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; +struct J3DAnmTransform {}; + +struct J3DModelData {}; + struct Z2Creature { /* 802C03C8 */ Z2Creature(); /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -85,10 +85,10 @@ struct daObj_AriHIO_c { /* 80BA5360 */ ~daObj_AriHIO_c(); }; -struct J3DJoint {}; - struct J3DModel {}; +struct J3DJoint {}; + struct daObjARI_c { /* 80BA26BC */ void InitCcSph(); /* 80BA2728 */ void SetCcSph(); @@ -414,11 +414,11 @@ extern "C" void __register_global_object(); /* ############################################################################################## */ /* 80BA5408-80BA540C 000000 0004+00 8/8 0/0 0/0 .rodata @3776 */ SECTION_RODATA static f32 const lit_3776 = 1.5f; -COMPILER_STRIP_GATE(80BA5408, &lit_3776); +COMPILER_STRIP_GATE(0x80BA5408, &lit_3776); /* 80BA540C-80BA5410 000004 0004+00 1/2 0/0 0/0 .rodata @3777 */ SECTION_RODATA static f32 const lit_3777 = 2.0f; -COMPILER_STRIP_GATE(80BA540C, &lit_3777); +COMPILER_STRIP_GATE(0x80BA540C, &lit_3777); /* 80BA551C-80BA553C -00001 0020+00 1/0 0/0 0/0 .data l_daObjARI_Method */ SECTION_DATA static void* l_daObjARI_Method[8] = { @@ -514,7 +514,7 @@ SECTION_RODATA static u16 const l_ari_itemno[1 + 1 /* padding */] = { /* padding */ 0x0000, }; -COMPILER_STRIP_GATE(80BA5410, &l_ari_itemno); +COMPILER_STRIP_GATE(0x80BA5410, &l_ari_itemno); /* 80BA5414-80BA5454 00000C 0040+00 1/1 0/0 0/0 .rodata ccSphSrc$3781 */ SECTION_RODATA static u8 const ccSphSrc[64] = { @@ -523,7 +523,7 @@ SECTION_RODATA static u8 const ccSphSrc[64] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41, 0xA0, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BA5414, &ccSphSrc); +COMPILER_STRIP_GATE(0x80BA5414, &ccSphSrc); /* 80BA26BC-80BA2728 00011C 006C+00 1/1 0/0 0/0 .text InitCcSph__10daObjARI_cFv */ #pragma push @@ -538,7 +538,7 @@ asm void daObjARI_c::InitCcSph() { /* ############################################################################################## */ /* 80BA5454-80BA5458 00004C 0004+00 1/1 0/0 0/0 .rodata @3790 */ SECTION_RODATA static f32 const lit_3790 = 40.0f; -COMPILER_STRIP_GATE(80BA5454, &lit_3790); +COMPILER_STRIP_GATE(0x80BA5454, &lit_3790); /* 80BA2728-80BA2780 000188 0058+00 1/1 0/0 0/0 .text SetCcSph__10daObjARI_cFv */ #pragma push @@ -557,13 +557,13 @@ SECTION_RODATA static f32 const lit_3814[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80BA5458, &lit_3814); +COMPILER_STRIP_GATE(0x80BA5458, &lit_3814); /* 80BA5460-80BA5468 000058 0008+00 1/2 0/0 0/0 .rodata @3816 */ SECTION_RODATA static u8 const lit_3816[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BA5460, &lit_3816); +COMPILER_STRIP_GATE(0x80BA5460, &lit_3816); /* 80BA2780-80BA2854 0001E0 00D4+00 1/1 0/0 0/0 .text ctrlJoint__10daObjARI_cFP8J3DJointP8J3DModel */ @@ -599,11 +599,17 @@ static asm void useHeapInit(fopAc_ac_c* param_0) { /* ############################################################################################## */ /* 80BA5468-80BA546C 000060 0004+00 1/2 0/0 0/0 .rodata @3933 */ SECTION_RODATA static f32 const lit_3933 = 0.5f; -COMPILER_STRIP_GATE(80BA5468, &lit_3933); +COMPILER_STRIP_GATE(0x80BA5468, &lit_3933); /* 80BA546C-80BA5470 000064 0004+00 2/5 0/0 0/0 .rodata @3934 */ SECTION_RODATA static f32 const lit_3934 = 1.0f; -COMPILER_STRIP_GATE(80BA546C, &lit_3934); +COMPILER_STRIP_GATE(0x80BA546C, &lit_3934); + +/* 80BA550C-80BA550C 000104 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80BA550C = "I_Ari"; +#pragma pop /* 80BA28C0-80BA2C18 000320 0358+00 1/1 0/0 0/0 .text CreateHeap__10daObjARI_cFv */ #pragma push @@ -650,7 +656,7 @@ static asm void daObjARI_Delete(daObjARI_c* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3968 = 4.0f / 5.0f; -COMPILER_STRIP_GATE(80BA5470, &lit_3968); +COMPILER_STRIP_GATE(0x80BA5470, &lit_3968); #pragma pop /* 80BA5474-80BA5478 00006C 0004+00 2/8 0/0 0/0 .rodata @3969 */ @@ -660,48 +666,48 @@ SECTION_RODATA static u8 const lit_3969[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BA5474, &lit_3969); +COMPILER_STRIP_GATE(0x80BA5474, &lit_3969); /* 80BA5478-80BA547C 000070 0004+00 0/0 0/0 0/0 .rodata @3970 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3970 = 2.0f / 5.0f; -COMPILER_STRIP_GATE(80BA5478, &lit_3970); +COMPILER_STRIP_GATE(0x80BA5478, &lit_3970); #pragma pop /* 80BA547C-80BA5480 000074 0004+00 0/1 0/0 0/0 .rodata @3971 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3971 = 10.0f; -COMPILER_STRIP_GATE(80BA547C, &lit_3971); +COMPILER_STRIP_GATE(0x80BA547C, &lit_3971); #pragma pop /* 80BA5480-80BA5484 000078 0004+00 0/0 0/0 0/0 .rodata @3972 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3972 = 1.0f / 50.0f; -COMPILER_STRIP_GATE(80BA5480, &lit_3972); +COMPILER_STRIP_GATE(0x80BA5480, &lit_3972); #pragma pop /* 80BA5484-80BA5488 00007C 0004+00 0/2 0/0 0/0 .rodata @4110 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4110 = -50.0f; -COMPILER_STRIP_GATE(80BA5484, &lit_4110); +COMPILER_STRIP_GATE(0x80BA5484, &lit_4110); #pragma pop /* 80BA5488-80BA548C 000080 0004+00 0/3 0/0 0/0 .rodata @4111 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4111 = 50.0f; -COMPILER_STRIP_GATE(80BA5488, &lit_4111); +COMPILER_STRIP_GATE(0x80BA5488, &lit_4111); #pragma pop /* 80BA548C-80BA5490 000084 0004+00 0/1 0/0 0/0 .rodata @4112 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4112 = 3.0f / 10.0f; -COMPILER_STRIP_GATE(80BA548C, &lit_4112); +COMPILER_STRIP_GATE(0x80BA548C, &lit_4112); #pragma pop /* 80BA5490-80BA5498 000088 0008+00 0/5 0/0 0/0 .rodata @4113 */ @@ -710,7 +716,7 @@ COMPILER_STRIP_GATE(80BA548C, &lit_4112); SECTION_RODATA static u8 const lit_4113[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BA5490, &lit_4113); +COMPILER_STRIP_GATE(0x80BA5490, &lit_4113); #pragma pop /* 80BA5498-80BA54A0 000090 0008+00 0/5 0/0 0/0 .rodata @4114 */ @@ -719,7 +725,7 @@ COMPILER_STRIP_GATE(80BA5490, &lit_4113); SECTION_RODATA static u8 const lit_4114[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BA5498, &lit_4114); +COMPILER_STRIP_GATE(0x80BA5498, &lit_4114); #pragma pop /* 80BA54A0-80BA54A8 000098 0008+00 0/5 0/0 0/0 .rodata @4115 */ @@ -728,7 +734,7 @@ COMPILER_STRIP_GATE(80BA5498, &lit_4114); SECTION_RODATA static u8 const lit_4115[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BA54A0, &lit_4115); +COMPILER_STRIP_GATE(0x80BA54A0, &lit_4115); #pragma pop /* 80BA2CA4-80BA3228 000704 0584+00 1/1 0/0 0/0 .text WallWalk__10daObjARI_cFv */ @@ -756,21 +762,21 @@ asm cM3dGPla::~cM3dGPla() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4138 = 1050.0f; -COMPILER_STRIP_GATE(80BA54A8, &lit_4138); +COMPILER_STRIP_GATE(0x80BA54A8, &lit_4138); #pragma pop /* 80BA54AC-80BA54B0 0000A4 0004+00 0/1 0/0 0/0 .rodata @4139 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4139 = 400.0f; -COMPILER_STRIP_GATE(80BA54AC, &lit_4139); +COMPILER_STRIP_GATE(0x80BA54AC, &lit_4139); #pragma pop /* 80BA54B0-80BA54B4 0000A8 0004+00 0/1 0/0 0/0 .rodata @4140 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4140 = 3.0f / 5.0f; -COMPILER_STRIP_GATE(80BA54B0, &lit_4140); +COMPILER_STRIP_GATE(0x80BA54B0, &lit_4140); #pragma pop /* 80BA3270-80BA337C 000CD0 010C+00 2/2 0/0 0/0 .text MoveAction__10daObjARI_cFv */ @@ -786,7 +792,7 @@ asm void daObjARI_c::MoveAction() { /* ############################################################################################## */ /* 80BA54B4-80BA54B8 0000AC 0004+00 1/1 0/0 0/0 .rodata @4152 */ SECTION_RODATA static f32 const lit_4152 = 1500.0f; -COMPILER_STRIP_GATE(80BA54B4, &lit_4152); +COMPILER_STRIP_GATE(0x80BA54B4, &lit_4152); /* 80BA337C-80BA33F8 000DDC 007C+00 1/1 0/0 0/0 .text Action__10daObjARI_cFv */ #pragma push @@ -825,7 +831,7 @@ SECTION_RODATA static f32 const lit_4215[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80BA54B8, &lit_4215); +COMPILER_STRIP_GATE(0x80BA54B8, &lit_4215); /* 80BA3638-80BA36CC 001098 0094+00 1/1 0/0 0/0 .text B_MoveAction__10daObjARI_cFv */ #pragma push @@ -852,7 +858,7 @@ asm void daObjARI_c::FallAction() { SECTION_RODATA static u8 const lit_4257[8] = { 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BA54C0, &lit_4257); +COMPILER_STRIP_GATE(0x80BA54C0, &lit_4257); /* 80BA3700-80BA3824 001160 0124+00 1/1 0/0 0/0 .text ParticleSet__10daObjARI_cFv */ #pragma push @@ -869,14 +875,14 @@ asm void daObjARI_c::ParticleSet() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4287 = 100.0f; -COMPILER_STRIP_GATE(80BA54C8, &lit_4287); +COMPILER_STRIP_GATE(0x80BA54C8, &lit_4287); #pragma pop /* 80BA54CC-80BA54D0 0000C4 0004+00 0/1 0/0 0/0 .rodata @4360 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4360 = 150.0f; -COMPILER_STRIP_GATE(80BA54CC, &lit_4360); +COMPILER_STRIP_GATE(0x80BA54CC, &lit_4360); #pragma pop /* 80BA3824-80BA3B38 001284 0314+00 1/1 0/0 0/0 .text BoomChk__10daObjARI_cFv */ @@ -904,28 +910,28 @@ asm void daObjARI_c::ObjHit() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4583 = 10000.0f; -COMPILER_STRIP_GATE(80BA54D0, &lit_4583); +COMPILER_STRIP_GATE(0x80BA54D0, &lit_4583); #pragma pop /* 80BA54D4-80BA54D8 0000CC 0004+00 0/1 0/0 0/0 .rodata @4584 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4584 = 200.0f; -COMPILER_STRIP_GATE(80BA54D4, &lit_4584); +COMPILER_STRIP_GATE(0x80BA54D4, &lit_4584); #pragma pop /* 80BA54D8-80BA54DC 0000D0 0004+00 0/1 0/0 0/0 .rodata @4585 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4585 = 4000.0f; -COMPILER_STRIP_GATE(80BA54D8, &lit_4585); +COMPILER_STRIP_GATE(0x80BA54D8, &lit_4585); #pragma pop /* 80BA54DC-80BA54E0 0000D4 0004+00 0/1 0/0 0/0 .rodata @4586 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4586 = 160000.0f; -COMPILER_STRIP_GATE(80BA54DC, &lit_4586); +COMPILER_STRIP_GATE(0x80BA54DC, &lit_4586); #pragma pop /* 80BA3C38-80BA44F0 001698 08B8+00 1/1 0/0 0/0 .text Execute__10daObjARI_cFv */ @@ -943,28 +949,28 @@ asm void daObjARI_c::Execute() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4625 = 20.0f; -COMPILER_STRIP_GATE(80BA54E0, &lit_4625); +COMPILER_STRIP_GATE(0x80BA54E0, &lit_4625); #pragma pop /* 80BA54E4-80BA54E8 0000DC 0004+00 0/1 0/0 0/0 .rodata @4626 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4626 = 608.0f; -COMPILER_STRIP_GATE(80BA54E4, &lit_4626); +COMPILER_STRIP_GATE(0x80BA54E4, &lit_4626); #pragma pop /* 80BA54E8-80BA54EC 0000E0 0004+00 0/1 0/0 0/0 .rodata @4627 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4627 = 448.0f; -COMPILER_STRIP_GATE(80BA54E8, &lit_4627); +COMPILER_STRIP_GATE(0x80BA54E8, &lit_4627); #pragma pop /* 80BA54EC-80BA54F0 0000E4 0004+00 0/1 0/0 0/0 .rodata @4628 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4628 = 16777215.0f; -COMPILER_STRIP_GATE(80BA54EC, &lit_4628); +COMPILER_STRIP_GATE(0x80BA54EC, &lit_4628); #pragma pop /* 80BA44F0-80BA466C 001F50 017C+00 1/1 0/0 0/0 .text Z_BufferChk__10daObjARI_cFv */ @@ -1004,11 +1010,11 @@ asm void daObjARI_c::setBaseMtx() { /* ############################################################################################## */ /* 80BA54F0-80BA54F4 0000E8 0004+00 1/1 0/0 0/0 .rodata @4693 */ SECTION_RODATA static f32 const lit_4693 = 15.0f; -COMPILER_STRIP_GATE(80BA54F0, &lit_4693); +COMPILER_STRIP_GATE(0x80BA54F0, &lit_4693); /* 80BA54F4-80BA54F8 0000EC 0004+00 1/1 0/0 0/0 .rodata @4694 */ SECTION_RODATA static f32 const lit_4694 = -3.0f / 5.0f; -COMPILER_STRIP_GATE(80BA54F4, &lit_4694); +COMPILER_STRIP_GATE(0x80BA54F4, &lit_4694); /* 80BA473C-80BA481C 00219C 00E0+00 1/0 0/0 0/0 .text daObjARI_Draw__FP10daObjARI_c */ #pragma push @@ -1033,7 +1039,13 @@ static asm void daObjARI_Execute(daObjARI_c* param_0) { /* ############################################################################################## */ /* 80BA54F8-80BA54FC 0000F0 0004+00 1/2 0/0 0/0 .rodata l_musiya_num */ SECTION_RODATA static u32 const l_musiya_num = 0x01A501A6; -COMPILER_STRIP_GATE(80BA54F8, &l_musiya_num); +COMPILER_STRIP_GATE(0x80BA54F8, &l_musiya_num); + +/* 80BA550C-80BA550C 000104 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80BA5512 = "R_SP160"; +#pragma pop /* 80BA483C-80BA49E8 00229C 01AC+00 1/1 0/0 0/0 .text CreateChk__10daObjARI_cFv */ #pragma push @@ -1050,28 +1062,28 @@ asm void daObjARI_c::CreateChk() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4999 = 11.0f / 10.0f; -COMPILER_STRIP_GATE(80BA54FC, &lit_4999); +COMPILER_STRIP_GATE(0x80BA54FC, &lit_4999); #pragma pop /* 80BA5500-80BA5504 0000F8 0004+00 0/1 0/0 0/0 .rodata @5000 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5000 = 500.0f; -COMPILER_STRIP_GATE(80BA5500, &lit_5000); +COMPILER_STRIP_GATE(0x80BA5500, &lit_5000); #pragma pop /* 80BA5504-80BA5508 0000FC 0004+00 0/1 0/0 0/0 .rodata @5001 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5001 = -200.0f; -COMPILER_STRIP_GATE(80BA5504, &lit_5001); +COMPILER_STRIP_GATE(0x80BA5504, &lit_5001); #pragma pop /* 80BA5508-80BA550C 000100 0004+00 0/1 0/0 0/0 .rodata @5002 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5002 = -1000.0f; -COMPILER_STRIP_GATE(80BA5508, &lit_5002); +COMPILER_STRIP_GATE(0x80BA5508, &lit_5002); #pragma pop /* 80BA55E4-80BA55F0 00000C 000C+00 1/1 0/0 0/0 .bss @3771 */ @@ -1148,7 +1160,7 @@ asm void __sinit_d_a_obj_ari_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80BA53A8 = (void*)__sinit_d_a_obj_ari_cpp; +REGISTER_CTORS(0x80BA53A8, __sinit_d_a_obj_ari_cpp); #pragma pop /* 80BA53E4-80BA53EC 002E44 0008+00 1/0 0/0 0/0 .text @36@__dt__12dBgS_ObjAcchFv */ @@ -1171,10 +1183,4 @@ static asm void func_80BA53EC() { } #pragma pop -/* 80BA550C-80BA551A 000104 000E+00 4/4 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80BA550C = "I_Ari"; -SECTION_DEAD static char const* const stringBase_80BA5512 = "R_SP160"; -#pragma pop +/* 80BA550C-80BA550C 000104 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_automata/d_a_obj_automata.cpp b/rel/d/a/obj/d_a_obj_automata/d_a_obj_automata.cpp index 84fb55c6289..2c134e1910a 100644 --- a/rel/d/a/obj/d_a_obj_automata/d_a_obj_automata.cpp +++ b/rel/d/a/obj/d_a_obj_automata/d_a_obj_automata.cpp @@ -39,12 +39,14 @@ struct mDoExt_baseAnm { /* 8000D428 */ void play(); }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; +struct J3DAnmTransform {}; + +struct J3DModelData {}; + struct Vec {}; struct Z2Creature { @@ -53,8 +55,6 @@ struct Z2Creature { /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -358,6 +358,13 @@ extern "C" void __register_global_object(); // /* ############################################################################################## */ +/* 80BA6CA4-80BA6CA4 000094 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80BA6CA4 = ""; +SECTION_DEAD static char const* const stringBase_80BA6CA5 = "AutoMata"; +#pragma pop + /* 80BA6CB0-80BA6CBC 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -510,7 +517,7 @@ asm daObj_AutoMata_c::~daObj_AutoMata_c() { SECTION_RODATA u8 const daObj_AutoMata_Param_c::m[12] = { 0x43, 0x5C, 0x00, 0x00, 0x42, 0xA0, 0x00, 0x00, 0x42, 0x20, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BA6C10, &daObj_AutoMata_Param_c::m); +COMPILER_STRIP_GATE(0x80BA6C10, &daObj_AutoMata_Param_c::m); /* 80BA6C1C-80BA6C4C 00000C 0030+00 1/1 0/0 0/0 .rodata l_ccDObjData */ SECTION_RODATA static u8 const l_ccDObjData[48] = { @@ -518,41 +525,41 @@ SECTION_RODATA static u8 const l_ccDObjData[48] = { 0xD8, 0xFB, 0xFD, 0xFF, 0x00, 0x00, 0x00, 0x1F, 0x00, 0x00, 0x00, 0x79, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BA6C1C, &l_ccDObjData); +COMPILER_STRIP_GATE(0x80BA6C1C, &l_ccDObjData); /* 80BA6C4C-80BA6C50 00003C 0004+00 0/1 0/0 0/0 .rodata @3962 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3962 = -200.0f; -COMPILER_STRIP_GATE(80BA6C4C, &lit_3962); +COMPILER_STRIP_GATE(0x80BA6C4C, &lit_3962); #pragma pop /* 80BA6C50-80BA6C54 000040 0004+00 0/1 0/0 0/0 .rodata @3963 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3963 = -100.0f; -COMPILER_STRIP_GATE(80BA6C50, &lit_3963); +COMPILER_STRIP_GATE(0x80BA6C50, &lit_3963); #pragma pop /* 80BA6C54-80BA6C58 000044 0004+00 0/1 0/0 0/0 .rodata @3964 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3964 = 200.0f; -COMPILER_STRIP_GATE(80BA6C54, &lit_3964); +COMPILER_STRIP_GATE(0x80BA6C54, &lit_3964); #pragma pop /* 80BA6C58-80BA6C5C 000048 0004+00 0/1 0/0 0/0 .rodata @3965 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3965 = 300.0f; -COMPILER_STRIP_GATE(80BA6C58, &lit_3965); +COMPILER_STRIP_GATE(0x80BA6C58, &lit_3965); #pragma pop /* 80BA6C5C-80BA6C60 00004C 0004+00 0/3 0/0 0/0 .rodata @3966 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3966 = -1000000000.0f; -COMPILER_STRIP_GATE(80BA6C5C, &lit_3966); +COMPILER_STRIP_GATE(0x80BA6C5C, &lit_3966); #pragma pop /* 80BA5990-80BA5D2C 000390 039C+00 1/1 0/0 0/0 .text create__16daObj_AutoMata_cFv */ @@ -638,7 +645,7 @@ asm J3DFrameCtrl::~J3DFrameCtrl() { /* ############################################################################################## */ /* 80BA6C60-80BA6C64 000050 0004+00 1/3 0/0 0/0 .rodata @4108 */ SECTION_RODATA static f32 const lit_4108 = 1.0f; -COMPILER_STRIP_GATE(80BA6C60, &lit_4108); +COMPILER_STRIP_GATE(0x80BA6C60, &lit_4108); /* 80BA5F88-80BA60A0 000988 0118+00 1/1 0/0 0/0 .text CreateHeap__16daObj_AutoMata_cFv */ #pragma push @@ -670,21 +677,21 @@ SECTION_RODATA static u8 const lit_4173[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BA6C64, &lit_4173); +COMPILER_STRIP_GATE(0x80BA6C64, &lit_4173); #pragma pop /* 80BA6C68-80BA6C6C 000058 0004+00 0/1 0/0 0/0 .rodata @4174 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4174 = -4.0f; -COMPILER_STRIP_GATE(80BA6C68, &lit_4174); +COMPILER_STRIP_GATE(0x80BA6C68, &lit_4174); #pragma pop /* 80BA6C6C-80BA6C70 00005C 0004+00 0/1 0/0 0/0 .rodata @4175 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4175 = 40.0f; -COMPILER_STRIP_GATE(80BA6C6C, &lit_4175); +COMPILER_STRIP_GATE(0x80BA6C6C, &lit_4175); #pragma pop /* 80BA60D4-80BA639C 000AD4 02C8+00 2/2 0/0 0/0 .text Execute__16daObj_AutoMata_cFv */ @@ -702,14 +709,14 @@ asm void daObj_AutoMata_c::Execute() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4197 = 600.0f; -COMPILER_STRIP_GATE(80BA6C70, &lit_4197); +COMPILER_STRIP_GATE(0x80BA6C70, &lit_4197); #pragma pop /* 80BA6C74-80BA6C78 000064 0004+00 0/1 0/0 0/0 .rodata @4198 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4198 = 20.0f; -COMPILER_STRIP_GATE(80BA6C74, &lit_4198); +COMPILER_STRIP_GATE(0x80BA6C74, &lit_4198); #pragma pop /* 80BA639C-80BA6480 000D9C 00E4+00 1/1 0/0 0/0 .text Draw__16daObj_AutoMata_cFv */ @@ -751,7 +758,7 @@ asm void daObj_AutoMata_c::srchTHouse(fopAc_ac_c* param_0, void* param_1) { SECTION_RODATA static u8 const bckArcIx[8] = { 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x06, }; -COMPILER_STRIP_GATE(80BA6C78, &bckArcIx); +COMPILER_STRIP_GATE(0x80BA6C78, &bckArcIx); #pragma pop /* 80BA6C80-80BA6C88 000070 0008+00 0/1 0/0 0/0 .rodata btkArcIx$4221 */ @@ -760,7 +767,7 @@ COMPILER_STRIP_GATE(80BA6C78, &bckArcIx); SECTION_RODATA static u8 const btkArcIx[8] = { 0x00, 0x00, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x0D, }; -COMPILER_STRIP_GATE(80BA6C80, &btkArcIx); +COMPILER_STRIP_GATE(0x80BA6C80, &btkArcIx); #pragma pop /* 80BA6C88-80BA6C90 000078 0008+00 0/1 0/0 0/0 .rodata playMode$4222 */ @@ -769,14 +776,14 @@ COMPILER_STRIP_GATE(80BA6C80, &btkArcIx); SECTION_RODATA static u8 const playMode[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, }; -COMPILER_STRIP_GATE(80BA6C88, &playMode); +COMPILER_STRIP_GATE(0x80BA6C88, &playMode); #pragma pop /* 80BA6C90-80BA6C94 000080 0004+00 0/2 0/0 0/0 .rodata @4252 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4252 = -1.0f; -COMPILER_STRIP_GATE(80BA6C90, &lit_4252); +COMPILER_STRIP_GATE(0x80BA6C90, &lit_4252); #pragma pop /* 80BA6500-80BA6634 000F00 0134+00 1/1 0/0 1/1 .text setAnm__16daObj_AutoMata_cFib */ @@ -824,28 +831,28 @@ asm void daObj_AutoMata_c::setMtx() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4349 = 17.0f; -COMPILER_STRIP_GATE(80BA6C94, &lit_4349); +COMPILER_STRIP_GATE(0x80BA6C94, &lit_4349); #pragma pop /* 80BA6C98-80BA6C9C 000088 0004+00 0/1 0/0 0/0 .rodata @4350 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4350 = 100.0f; -COMPILER_STRIP_GATE(80BA6C98, &lit_4350); +COMPILER_STRIP_GATE(0x80BA6C98, &lit_4350); #pragma pop /* 80BA6C9C-80BA6CA0 00008C 0004+00 0/1 0/0 0/0 .rodata @4351 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4351 = 7.0f; -COMPILER_STRIP_GATE(80BA6C9C, &lit_4351); +COMPILER_STRIP_GATE(0x80BA6C9C, &lit_4351); #pragma pop /* 80BA6CA0-80BA6CA4 000090 0004+00 0/1 0/0 0/0 .rodata @4352 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4352 = 67.0f; -COMPILER_STRIP_GATE(80BA6CA0, &lit_4352); +COMPILER_STRIP_GATE(0x80BA6CA0, &lit_4352); #pragma pop /* 80BA674C-80BA6A10 00114C 02C4+00 1/1 0/0 0/0 .text setSe__16daObj_AutoMata_cFv */ @@ -939,7 +946,7 @@ asm void __sinit_d_a_obj_automata_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80BA6AE0 = (void*)__sinit_d_a_obj_automata_cpp; +REGISTER_CTORS(0x80BA6AE0, __sinit_d_a_obj_automata_cpp); #pragma pop /* 80BA6BA4-80BA6BEC 0015A4 0048+00 2/1 0/0 0/0 .text __dt__22daObj_AutoMata_Param_cFv */ @@ -972,10 +979,4 @@ static asm void func_80BA6BF4() { } #pragma pop -/* 80BA6CA4-80BA6CAE 000094 000A+00 1/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80BA6CA4 = ""; -SECTION_DEAD static char const* const stringBase_80BA6CA5 = "AutoMata"; -#pragma pop +/* 80BA6CA4-80BA6CA4 000094 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_avalanche/d_a_obj_avalanche.cpp b/rel/d/a/obj/d_a_obj_avalanche/d_a_obj_avalanche.cpp index 60f0d04fe8a..228cae91cf9 100644 --- a/rel/d/a/obj/d_a_obj_avalanche/d_a_obj_avalanche.cpp +++ b/rel/d/a/obj/d_a_obj_avalanche/d_a_obj_avalanche.cpp @@ -78,12 +78,12 @@ struct dRes_control_c { struct dPa_levelEcallBack {}; -struct _GXColor {}; - struct csXyz { /* 802673F4 */ csXyz(s16, s16, s16); }; +struct _GXColor {}; + struct dPa_control_c { /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, @@ -187,7 +187,7 @@ extern "C" static void daObjAvalanche_create1st__FP16daObjAvalanche_c(); extern "C" static void daObjAvalanche_MoveBGDelete__FP16daObjAvalanche_c(); extern "C" static void daObjAvalanche_MoveBGExecute__FP16daObjAvalanche_c(); extern "C" static void daObjAvalanche_MoveBGDraw__FP16daObjAvalanche_c(); -extern "C" void func_80BA7CD8(u8*); +extern "C" void func_80BA7CD8(void* _this, u8*); extern "C" extern char const* const d_a_obj_avalanche__stringBase0; // @@ -279,14 +279,14 @@ asm void daObjAvalanche_c::initBaseMtx() { SECTION_RODATA static u8 const l_dzb[8] = { 0x00, 0x00, 0x00, 0x0D, 0x00, 0x00, 0x00, 0x0C, }; -COMPILER_STRIP_GATE(80BA7CFC, &l_dzb); +COMPILER_STRIP_GATE(0x80BA7CFC, &l_dzb); /* 80BA7D04-80BA7D1C 000008 0018+00 1/1 0/0 0/0 .rodata l_check_pos */ SECTION_RODATA static u8 const l_check_pos[24] = { 0xC3, 0x96, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x43, 0x96, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x43, 0x96, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BA7D04, &l_check_pos); +COMPILER_STRIP_GATE(0x80BA7D04, &l_check_pos); /* 80BA7D1C-80BA7D20 000020 0004+00 4/5 0/0 0/0 .rodata @3663 */ SECTION_RODATA static u8 const lit_3663[4] = { @@ -295,7 +295,7 @@ SECTION_RODATA static u8 const lit_3663[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BA7D1C, &lit_3663); +COMPILER_STRIP_GATE(0x80BA7D1C, &lit_3663); /* 80BA6F14-80BA6FC8 0000B4 00B4+00 3/3 0/0 0/0 .text setBaseMtx__16daObjAvalanche_cFv */ #pragma push @@ -310,13 +310,21 @@ asm void daObjAvalanche_c::setBaseMtx() { /* ############################################################################################## */ /* 80BA7D20-80BA7D24 000024 0004+00 1/1 0/0 0/0 .rodata @3716 */ SECTION_RODATA static f32 const lit_3716 = -400.0f; -COMPILER_STRIP_GATE(80BA7D20, &lit_3716); +COMPILER_STRIP_GATE(0x80BA7D20, &lit_3716); /* 80BA7D24-80BA7D2C 000028 0008+00 1/1 0/0 0/0 .rodata @3718 */ SECTION_RODATA static u8 const lit_3718[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BA7D24, &lit_3718); +COMPILER_STRIP_GATE(0x80BA7D24, &lit_3718); + +/* 80BA7D3C-80BA7D3C 000040 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80BA7D3C = "V_Yuki"; +SECTION_DEAD static char const* const stringBase_80BA7D43 = "SNOW_COLLAPSE"; +SECTION_DEAD static char const* const stringBase_80BA7D51 = "Obj_ava"; +#pragma pop /* 80BA7D70-80BA7D7C 000000 000C+00 2/2 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { @@ -370,7 +378,14 @@ asm void daObjAvalanche_c::Create() { /* ############################################################################################## */ /* 80BA7D2C-80BA7D30 000030 0004+00 2/3 0/0 0/0 .rodata @3762 */ SECTION_RODATA static f32 const lit_3762 = 1.0f; -COMPILER_STRIP_GATE(80BA7D2C, &lit_3762); +COMPILER_STRIP_GATE(0x80BA7D2C, &lit_3762); + +/* 80BA7D3C-80BA7D3C 000040 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80BA7D59 = "WAIT"; +SECTION_DEAD static char const* const stringBase_80BA7D5E = "COLLAPSE"; +#pragma pop /* 80BA7DB4-80BA7DC0 -00001 000C+00 0/1 0/0 0/0 .data @3851 */ #pragma push @@ -500,7 +515,7 @@ asm void daObjAvalanche_c::Execute(f32 (**param_0)[3][4]) { /* ############################################################################################## */ /* 80BA7D30-80BA7D34 000034 0004+00 1/1 0/0 0/0 .rodata @3834 */ SECTION_RODATA static f32 const lit_3834 = 300.0f; -COMPILER_STRIP_GATE(80BA7D30, &lit_3834); +COMPILER_STRIP_GATE(0x80BA7D30, &lit_3834); /* 80BA7440-80BA75A4 0005E0 0164+00 1/1 0/0 0/0 .text checkCollapse__16daObjAvalanche_cFv */ @@ -516,7 +531,7 @@ asm void daObjAvalanche_c::checkCollapse() { /* ############################################################################################## */ /* 80BA7D34-80BA7D38 000038 0004+00 1/1 0/0 0/0 .rodata @3846 */ SECTION_RODATA static f32 const lit_3846 = 40.0f; -COMPILER_STRIP_GATE(80BA7D34, &lit_3846); +COMPILER_STRIP_GATE(0x80BA7D34, &lit_3846); /* 80BA75A4-80BA7618 000744 0074+00 1/1 0/0 0/0 .text move__16daObjAvalanche_cFv */ #pragma push @@ -577,7 +592,13 @@ void daObjAvalanche_c::actionDead() { /* ############################################################################################## */ /* 80BA7D38-80BA7D3C 00003C 0004+00 1/1 0/0 0/0 .rodata @3964 */ SECTION_RODATA static f32 const lit_3964 = -1.0f; -COMPILER_STRIP_GATE(80BA7D38, &lit_3964); +COMPILER_STRIP_GATE(0x80BA7D38, &lit_3964); + +/* 80BA7D3C-80BA7D3C 000040 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80BA7D67 = "Timer"; +#pragma pop /* 80BA788C-80BA7A50 000A2C 01C4+00 2/2 0/0 0/0 .text demoProc__16daObjAvalanche_cFv */ #pragma push @@ -682,20 +703,10 @@ static asm void daObjAvalanche_MoveBGDraw(daObjAvalanche_c* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80BA7CD8(u8* param_0) { +extern "C" asm void func_80BA7CD8(void* _this, u8* param_0) { nofralloc #include "asm/rel/d/a/obj/d_a_obj_avalanche/d_a_obj_avalanche/func_80BA7CD8.s" } #pragma pop -/* 80BA7D3C-80BA7D6D 000040 0031+00 5/1 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80BA7D3C = "V_Yuki"; -SECTION_DEAD static char const* const stringBase_80BA7D43 = "SNOW_COLLAPSE"; -SECTION_DEAD static char const* const stringBase_80BA7D51 = "Obj_ava"; -SECTION_DEAD static char const* const stringBase_80BA7D59 = "WAIT"; -SECTION_DEAD static char const* const stringBase_80BA7D5E = "COLLAPSE"; -SECTION_DEAD static char const* const stringBase_80BA7D67 = "Timer"; -#pragma pop +/* 80BA7D3C-80BA7D3C 000040 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_balloon/d_a_obj_balloon.cpp b/rel/d/a/obj/d_a_obj_balloon/d_a_obj_balloon.cpp index 7eefe2b1cd4..cb97575fee2 100644 --- a/rel/d/a/obj/d_a_obj_balloon/d_a_obj_balloon.cpp +++ b/rel/d/a/obj/d_a_obj_balloon/d_a_obj_balloon.cpp @@ -289,27 +289,27 @@ extern "C" void __register_global_object(); /* ############################################################################################## */ /* 80BA8E0C-80BA8E10 000000 0004+00 4/4 0/0 0/0 .rodata @3656 */ SECTION_RODATA static f32 const lit_3656 = 1.0f; -COMPILER_STRIP_GATE(80BA8E0C, &lit_3656); +COMPILER_STRIP_GATE(0x80BA8E0C, &lit_3656); /* 80BA8E10-80BA8E14 000004 0004+00 0/1 0/0 0/0 .rodata @3657 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3657 = 1.5f; -COMPILER_STRIP_GATE(80BA8E10, &lit_3657); +COMPILER_STRIP_GATE(0x80BA8E10, &lit_3657); #pragma pop /* 80BA8E14-80BA8E18 000008 0004+00 0/1 0/0 0/0 .rodata @3658 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3658 = 3.0f; -COMPILER_STRIP_GATE(80BA8E14, &lit_3658); +COMPILER_STRIP_GATE(0x80BA8E14, &lit_3658); #pragma pop /* 80BA8E18-80BA8E1C 00000C 0004+00 0/1 0/0 0/0 .rodata @3659 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3659 = 10.0f; -COMPILER_STRIP_GATE(80BA8E18, &lit_3659); +COMPILER_STRIP_GATE(0x80BA8E18, &lit_3659); #pragma pop /* 80BA8E5C-80BA8E68 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ @@ -469,14 +469,14 @@ asm daObj_Balloon_HIO_c::daObj_Balloon_HIO_c() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3687 = 100.0f; -COMPILER_STRIP_GATE(80BA8E1C, &lit_3687); +COMPILER_STRIP_GATE(0x80BA8E1C, &lit_3687); #pragma pop /* 80BA8E20-80BA8E24 000014 0004+00 0/1 0/0 0/0 .rodata @3688 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3688 = 400.0f; -COMPILER_STRIP_GATE(80BA8E20, &lit_3688); +COMPILER_STRIP_GATE(0x80BA8E20, &lit_3688); #pragma pop /* 80BA8E24-80BA8E28 000018 0004+00 0/3 0/0 0/0 .rodata @3689 */ @@ -488,7 +488,7 @@ SECTION_RODATA static u8 const lit_3689[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BA8E24, &lit_3689); +COMPILER_STRIP_GATE(0x80BA8E24, &lit_3689); #pragma pop /* 80BA7FF4-80BA80D4 000134 00E0+00 1/1 0/0 0/0 .text draw__15daObj_Balloon_cFv */ @@ -659,63 +659,63 @@ asm void daObj_Balloon_c::cc_set() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3809 = -3.0f; -COMPILER_STRIP_GATE(80BA8E28, &lit_3809); +COMPILER_STRIP_GATE(0x80BA8E28, &lit_3809); #pragma pop /* 80BA8E2C-80BA8E30 000020 0004+00 0/1 0/0 0/0 .rodata @3810 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3810 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(80BA8E2C, &lit_3810); +COMPILER_STRIP_GATE(0x80BA8E2C, &lit_3810); #pragma pop /* 80BA8E30-80BA8E34 000024 0004+00 0/1 0/0 0/0 .rodata @3811 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3811 = 30.0f; -COMPILER_STRIP_GATE(80BA8E30, &lit_3811); +COMPILER_STRIP_GATE(0x80BA8E30, &lit_3811); #pragma pop /* 80BA8E34-80BA8E38 000028 0004+00 0/1 0/0 0/0 .rodata @3812 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3812 = 60.0f; -COMPILER_STRIP_GATE(80BA8E34, &lit_3812); +COMPILER_STRIP_GATE(0x80BA8E34, &lit_3812); #pragma pop /* 80BA8E38-80BA8E3C 00002C 0004+00 0/1 0/0 0/0 .rodata @3813 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3813 = 512.0f; -COMPILER_STRIP_GATE(80BA8E38, &lit_3813); +COMPILER_STRIP_GATE(0x80BA8E38, &lit_3813); #pragma pop /* 80BA8E3C-80BA8E40 000030 0004+00 0/1 0/0 0/0 .rodata @3814 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3814 = 5.0f; -COMPILER_STRIP_GATE(80BA8E3C, &lit_3814); +COMPILER_STRIP_GATE(0x80BA8E3C, &lit_3814); #pragma pop /* 80BA8E40-80BA8E44 000034 0004+00 0/1 0/0 0/0 .rodata @3815 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3815 = 128.0f; -COMPILER_STRIP_GATE(80BA8E40, &lit_3815); +COMPILER_STRIP_GATE(0x80BA8E40, &lit_3815); #pragma pop /* 80BA8E44-80BA8E48 000038 0004+00 0/2 0/0 0/0 .rodata @3816 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3816 = 2.0f; -COMPILER_STRIP_GATE(80BA8E44, &lit_3816); +COMPILER_STRIP_GATE(0x80BA8E44, &lit_3816); #pragma pop /* 80BA8E48-80BA8E4C 00003C 0004+00 0/1 0/0 0/0 .rodata @3817 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3817 = -1.0f; -COMPILER_STRIP_GATE(80BA8E48, &lit_3817); +COMPILER_STRIP_GATE(0x80BA8E48, &lit_3817); #pragma pop /* 80BA81B8-80BA865C 0002F8 04A4+00 1/1 0/0 0/0 .text action__15daObj_Balloon_cFv */ @@ -765,6 +765,13 @@ static bool daObj_Balloon_IsDelete(daObj_Balloon_c* param_0) { return true; } +/* ############################################################################################## */ +/* 80BA8E54-80BA8E54 000048 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80BA8E54 = "Obj_bal"; +#pragma pop + /* 80BA8734-80BA87AC 000874 0078+00 1/1 0/0 0/0 .text _delete__15daObj_Balloon_cFv */ #pragma push #pragma optimization_level 0 @@ -810,14 +817,14 @@ static asm void useHeapInit(fopAc_ac_c* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3946 = -1000.0f; -COMPILER_STRIP_GATE(80BA8E4C, &lit_3946); +COMPILER_STRIP_GATE(0x80BA8E4C, &lit_3946); #pragma pop /* 80BA8E50-80BA8E54 000044 0004+00 0/1 0/0 0/0 .rodata @3947 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3947 = 1000.0f; -COMPILER_STRIP_GATE(80BA8E50, &lit_3947); +COMPILER_STRIP_GATE(0x80BA8E50, &lit_3947); #pragma pop /* 80BA88C4-80BA8B30 000A04 026C+00 1/1 0/0 0/0 .text create__15daObj_Balloon_cFv */ @@ -922,7 +929,7 @@ asm void __sinit_d_a_obj_balloon_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80BA8DAC = (void*)__sinit_d_a_obj_balloon_cpp; +REGISTER_CTORS(0x80BA8DAC, __sinit_d_a_obj_balloon_cpp); #pragma pop /* 80BA8DE8-80BA8DF0 000F28 0008+00 1/0 0/0 0/0 .text @36@__dt__12dBgS_ObjAcchFv */ @@ -1117,9 +1124,4 @@ static u8 data_80BA9088[4]; static u8 data_80BA908C[4]; #pragma pop -/* 80BA8E54-80BA8E5C 000048 0008+00 3/3 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80BA8E54 = "Obj_bal"; -#pragma pop +/* 80BA8E54-80BA8E54 000048 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_barDesk/d_a_obj_barDesk.cpp b/rel/d/a/obj/d_a_obj_barDesk/d_a_obj_barDesk.cpp index bf034a08b59..38dd1e5284d 100644 --- a/rel/d/a/obj/d_a_obj_barDesk/d_a_obj_barDesk.cpp +++ b/rel/d/a/obj/d_a_obj_barDesk/d_a_obj_barDesk.cpp @@ -74,10 +74,10 @@ struct dRes_control_c { struct dPa_levelEcallBack {}; -struct _GXColor {}; - struct csXyz {}; +struct _GXColor {}; + struct dPa_control_c { /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, @@ -149,10 +149,10 @@ struct cBgS { /* 80074250 */ void Release(dBgW_Base*); }; -struct Vec {}; - struct JAISoundID {}; +struct Vec {}; + struct Z2SeMgr { /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); }; @@ -425,6 +425,13 @@ asm void daBarDesk_c::setBaseMtx() { } #pragma pop +/* ############################################################################################## */ +/* 80BA9BB4-80BA9BB4 000044 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80BA9BB4 = "KHdesk"; +#pragma pop + /* 80BA9288-80BA92F4 0001E8 006C+00 1/0 0/0 0/0 .text CreateHeap__11daBarDesk_cFv */ #pragma push #pragma optimization_level 0 @@ -522,11 +529,11 @@ SECTION_RODATA u8 const daBarDesk_c::mCcDObjInfo[48] = { 0xD8, 0xFA, 0xFD, 0xBF, 0x00, 0x00, 0x00, 0x11, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BA9B70, &daBarDesk_c::mCcDObjInfo); +COMPILER_STRIP_GATE(0x80BA9B70, &daBarDesk_c::mCcDObjInfo); /* 80BA9BA0-80BA9BA4 000030 0004+00 1/1 0/0 0/0 .rodata @3839 */ SECTION_RODATA static f32 const lit_3839 = 90.0f; -COMPILER_STRIP_GATE(80BA9BA0, &lit_3839); +COMPILER_STRIP_GATE(0x80BA9BA0, &lit_3839); /* 80BA968C-80BA973C 0005EC 00B0+00 1/0 0/0 0/0 .text modeWait__11daBarDesk_cFv */ #pragma push @@ -541,13 +548,13 @@ asm void daBarDesk_c::modeWait() { /* ############################################################################################## */ /* 80BA9BA4-80BA9BA8 000034 0004+00 1/2 0/0 0/0 .rodata @3861 */ SECTION_RODATA static f32 const lit_3861 = 1.0f; -COMPILER_STRIP_GATE(80BA9BA4, &lit_3861); +COMPILER_STRIP_GATE(0x80BA9BA4, &lit_3861); /* 80BA9BA8-80BA9BAC 000038 0004+00 0/1 0/0 0/0 .rodata @3862 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3862 = -1.0f; -COMPILER_STRIP_GATE(80BA9BA8, &lit_3862); +COMPILER_STRIP_GATE(0x80BA9BA8, &lit_3862); #pragma pop /* 80BA9BAC-80BA9BB0 00003C 0004+00 0/1 0/0 0/0 .rodata @3863 */ @@ -559,7 +566,7 @@ SECTION_RODATA static u8 const lit_3863[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BA9BAC, &lit_3863); +COMPILER_STRIP_GATE(0x80BA9BAC, &lit_3863); #pragma pop /* 80BA973C-80BA9824 00069C 00E8+00 1/1 0/0 0/0 .text init_modeBreak__11daBarDesk_cFv */ @@ -590,7 +597,7 @@ SECTION_RODATA static u8 const particle_id[4] = { 0x85, 0xF5, }; -COMPILER_STRIP_GATE(80BA9BB0, &particle_id); +COMPILER_STRIP_GATE(0x80BA9BB0, &particle_id); /* 80BA9844-80BA98E8 0007A4 00A4+00 1/1 0/0 0/0 .text setBreakEffect__11daBarDesk_cFv */ #pragma push @@ -696,12 +703,7 @@ asm void __sinit_d_a_obj_barDesk_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80BA9AEC = (void*)__sinit_d_a_obj_barDesk_cpp; +REGISTER_CTORS(0x80BA9AEC, __sinit_d_a_obj_barDesk_cpp); #pragma pop -/* 80BA9BB4-80BA9BBB 000044 0007+00 3/3 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80BA9BB4 = "KHdesk"; -#pragma pop +/* 80BA9BB4-80BA9BB4 000044 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_batta/d_a_obj_batta.cpp b/rel/d/a/obj/d_a_obj_batta/d_a_obj_batta.cpp index 4f2e46f5f82..b23da57e705 100644 --- a/rel/d/a/obj/d_a_obj_batta/d_a_obj_batta.cpp +++ b/rel/d/a/obj/d_a_obj_batta/d_a_obj_batta.cpp @@ -44,12 +44,14 @@ struct mDoExt_baseAnm { /* 8000D428 */ void play(); }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; +struct J3DAnmTransform {}; + +struct J3DModelData {}; + struct Vec {}; struct Z2Creature { @@ -57,8 +59,6 @@ struct Z2Creature { /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -387,11 +387,11 @@ extern "C" void __register_global_object(); /* ############################################################################################## */ /* 80BAC970-80BAC974 000000 0004+00 12/12 0/0 0/0 .rodata @3774 */ SECTION_RODATA static f32 const lit_3774 = 1.0f; -COMPILER_STRIP_GATE(80BAC970, &lit_3774); +COMPILER_STRIP_GATE(0x80BAC970, &lit_3774); /* 80BAC974-80BAC978 000004 0004+00 1/1 0/0 0/0 .rodata @3775 */ SECTION_RODATA static f32 const lit_3775 = 7.0f / 5.0f; -COMPILER_STRIP_GATE(80BAC974, &lit_3775); +COMPILER_STRIP_GATE(0x80BAC974, &lit_3775); /* 80BACA70-80BACA7C 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { @@ -660,7 +660,7 @@ asm daObj_BattaHIO_c::daObj_BattaHIO_c() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daObjBATTA_c::setAction(void (daObjBATTA_c::*)()) { +asm void daObjBATTA_c::setAction(void (daObjBATTA_c::*param_0)()) { nofralloc #include "asm/rel/d/a/obj/d_a_obj_batta/d_a_obj_batta/setAction__12daObjBATTA_cFM12daObjBATTA_cFPCvPv_v.s" } @@ -673,7 +673,7 @@ asm void daObjBATTA_c::setAction(void (daObjBATTA_c::*)()) { SECTION_RODATA static u8 const l_batta_brk_index[8] = { 0x00, 0x00, 0x00, 0x0F, 0x00, 0x00, 0x00, 0x0E, }; -COMPILER_STRIP_GATE(80BAC978, &l_batta_brk_index); +COMPILER_STRIP_GATE(0x80BAC978, &l_batta_brk_index); #pragma pop /* 80BAC980-80BAC988 000010 0008+00 0/1 0/0 0/0 .rodata l_batta_btk_index */ @@ -682,7 +682,13 @@ COMPILER_STRIP_GATE(80BAC978, &l_batta_brk_index); SECTION_RODATA static u8 const l_batta_btk_index[8] = { 0x00, 0x00, 0x00, 0x13, 0x00, 0x00, 0x00, 0x12, }; -COMPILER_STRIP_GATE(80BAC980, &l_batta_btk_index); +COMPILER_STRIP_GATE(0x80BAC980, &l_batta_btk_index); +#pragma pop + +/* 80BACA64-80BACA64 0000F4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80BACA64 = "Bat"; #pragma pop /* 80BA9F00-80BAA13C 0001C0 023C+00 1/1 0/0 0/0 .text useHeapInit__FP10fopAc_ac_c */ @@ -732,7 +738,7 @@ static asm void daObjBATTA_Delete(daObjBATTA_c* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3955 = 4.0f; -COMPILER_STRIP_GATE(80BAC988, &lit_3955); +COMPILER_STRIP_GATE(0x80BAC988, &lit_3955); #pragma pop /* 80BAC98C-80BAC990 00001C 0004+00 3/11 0/0 0/0 .rodata @3956 */ @@ -742,34 +748,34 @@ SECTION_RODATA static u8 const lit_3956[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BAC98C, &lit_3956); +COMPILER_STRIP_GATE(0x80BAC98C, &lit_3956); /* 80BAC990-80BAC994 000020 0004+00 0/5 0/0 0/0 .rodata @3957 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3957 = -1.0f; -COMPILER_STRIP_GATE(80BAC990, &lit_3957); +COMPILER_STRIP_GATE(0x80BAC990, &lit_3957); #pragma pop /* 80BAC994-80BAC998 000024 0004+00 0/3 0/0 0/0 .rodata @3958 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3958 = -5.0f; -COMPILER_STRIP_GATE(80BAC994, &lit_3958); +COMPILER_STRIP_GATE(0x80BAC994, &lit_3958); #pragma pop /* 80BAC998-80BAC99C 000028 0004+00 0/4 0/0 0/0 .rodata @3959 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3959 = -20.0f; -COMPILER_STRIP_GATE(80BAC998, &lit_3959); +COMPILER_STRIP_GATE(0x80BAC998, &lit_3959); #pragma pop /* 80BAC99C-80BAC9A0 00002C 0004+00 0/1 0/0 0/0 .rodata @3960 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3960 = 90.0f; -COMPILER_STRIP_GATE(80BAC99C, &lit_3960); +COMPILER_STRIP_GATE(0x80BAC99C, &lit_3960); #pragma pop /* 80BAC9A0-80BAC9A8 000030 0004+04 0/1 0/0 0/0 .rodata @3961 */ @@ -780,7 +786,7 @@ SECTION_RODATA static f32 const lit_3961[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80BAC9A0, &lit_3961); +COMPILER_STRIP_GATE(0x80BAC9A0, &lit_3961); #pragma pop /* 80BAC9A8-80BAC9B0 000038 0008+00 0/5 0/0 0/0 .rodata @3962 */ @@ -789,7 +795,7 @@ COMPILER_STRIP_GATE(80BAC9A0, &lit_3961); SECTION_RODATA static u8 const lit_3962[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BAC9A8, &lit_3962); +COMPILER_STRIP_GATE(0x80BAC9A8, &lit_3962); #pragma pop /* 80BAC9B0-80BAC9B8 000040 0008+00 0/5 0/0 0/0 .rodata @3963 */ @@ -798,7 +804,7 @@ COMPILER_STRIP_GATE(80BAC9A8, &lit_3962); SECTION_RODATA static u8 const lit_3963[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BAC9B0, &lit_3963); +COMPILER_STRIP_GATE(0x80BAC9B0, &lit_3963); #pragma pop /* 80BAC9B8-80BAC9C0 000048 0008+00 0/5 0/0 0/0 .rodata @3964 */ @@ -807,21 +813,21 @@ COMPILER_STRIP_GATE(80BAC9B0, &lit_3963); SECTION_RODATA static u8 const lit_3964[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BAC9B8, &lit_3964); +COMPILER_STRIP_GATE(0x80BAC9B8, &lit_3964); #pragma pop /* 80BAC9C0-80BAC9C4 000050 0004+00 0/2 0/0 0/0 .rodata @3965 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3965 = 200.0f; -COMPILER_STRIP_GATE(80BAC9C0, &lit_3965); +COMPILER_STRIP_GATE(0x80BAC9C0, &lit_3965); #pragma pop /* 80BAC9C4-80BAC9C8 000054 0004+00 0/2 0/0 0/0 .rodata @3966 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3966 = 19.0f; -COMPILER_STRIP_GATE(80BAC9C4, &lit_3966); +COMPILER_STRIP_GATE(0x80BAC9C4, &lit_3966); #pragma pop /* 80BAA1C8-80BAA47C 000488 02B4+00 6/0 0/0 0/0 .text wait__12daObjBATTA_cFv */ @@ -839,28 +845,28 @@ asm void daObjBATTA_c::wait() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4117 = 1800.0f; -COMPILER_STRIP_GATE(80BAC9C8, &lit_4117); +COMPILER_STRIP_GATE(0x80BAC9C8, &lit_4117); #pragma pop /* 80BAC9CC-80BAC9D0 00005C 0004+00 0/1 0/0 0/0 .rodata @4118 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4118 = 12288.0f; -COMPILER_STRIP_GATE(80BAC9CC, &lit_4118); +COMPILER_STRIP_GATE(0x80BAC9CC, &lit_4118); #pragma pop /* 80BAC9D0-80BAC9D4 000060 0004+00 0/2 0/0 0/0 .rodata @4119 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4119 = 1000.0f; -COMPILER_STRIP_GATE(80BAC9D0, &lit_4119); +COMPILER_STRIP_GATE(0x80BAC9D0, &lit_4119); #pragma pop /* 80BAC9D4-80BAC9D8 000064 0004+00 0/4 0/0 0/0 .rodata @4120 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4120 = 32768.0f; -COMPILER_STRIP_GATE(80BAC9D4, &lit_4120); +COMPILER_STRIP_GATE(0x80BAC9D4, &lit_4120); #pragma pop /* 80BAC9D8-80BAC9E0 000068 0004+04 0/3 0/0 0/0 .rodata @4121 */ @@ -871,7 +877,7 @@ SECTION_RODATA static f32 const lit_4121[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80BAC9D8, &lit_4121); +COMPILER_STRIP_GATE(0x80BAC9D8, &lit_4121); #pragma pop /* 80BAC9E0-80BAC9E8 000070 0008+00 0/3 0/0 0/0 .rodata @4123 */ @@ -880,7 +886,7 @@ COMPILER_STRIP_GATE(80BAC9D8, &lit_4121); SECTION_RODATA static u8 const lit_4123[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BAC9E0, &lit_4123); +COMPILER_STRIP_GATE(0x80BAC9E0, &lit_4123); #pragma pop /* 80BAA47C-80BAAA18 00073C 059C+00 1/0 0/0 0/0 .text turn__12daObjBATTA_cFv */ @@ -898,39 +904,39 @@ asm void daObjBATTA_c::turn() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4210 = 2.0f; -COMPILER_STRIP_GATE(80BAC9E8, &lit_4210); +COMPILER_STRIP_GATE(0x80BAC9E8, &lit_4210); #pragma pop /* 80BAC9EC-80BAC9F0 00007C 0004+00 0/1 0/0 0/0 .rodata @4211 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4211 = 25.0f; -COMPILER_STRIP_GATE(80BAC9EC, &lit_4211); +COMPILER_STRIP_GATE(0x80BAC9EC, &lit_4211); #pragma pop /* 80BAC9F0-80BAC9F4 000080 0004+00 0/1 0/0 0/0 .rodata @4212 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4212 = 5.0f; -COMPILER_STRIP_GATE(80BAC9F0, &lit_4212); +COMPILER_STRIP_GATE(0x80BAC9F0, &lit_4212); #pragma pop /* 80BAC9F4-80BAC9F8 000084 0004+00 1/3 0/0 0/0 .rodata @4213 */ SECTION_RODATA static f32 const lit_4213 = 20.0f; -COMPILER_STRIP_GATE(80BAC9F4, &lit_4213); +COMPILER_STRIP_GATE(0x80BAC9F4, &lit_4213); /* 80BAC9F8-80BAC9FC 000088 0004+00 0/1 0/0 0/0 .rodata @4214 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4214 = 800.0f; -COMPILER_STRIP_GATE(80BAC9F8, &lit_4214); +COMPILER_STRIP_GATE(0x80BAC9F8, &lit_4214); #pragma pop /* 80BAC9FC-80BACA00 00008C 0004+00 0/1 0/0 0/0 .rodata @4215 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4215 = -2.5f; -COMPILER_STRIP_GATE(80BAC9FC, &lit_4215); +COMPILER_STRIP_GATE(0x80BAC9FC, &lit_4215); #pragma pop /* 80BAAA18-80BAAD30 000CD8 0318+00 3/0 0/0 0/0 .text jump__12daObjBATTA_cFv */ @@ -948,35 +954,35 @@ asm void daObjBATTA_c::jump() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4329 = 0.5f; -COMPILER_STRIP_GATE(80BACA00, &lit_4329); +COMPILER_STRIP_GATE(0x80BACA00, &lit_4329); #pragma pop /* 80BACA04-80BACA08 000094 0004+00 0/2 0/0 0/0 .rodata @4330 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4330 = 40.0f; -COMPILER_STRIP_GATE(80BACA04, &lit_4330); +COMPILER_STRIP_GATE(0x80BACA04, &lit_4330); #pragma pop /* 80BACA08-80BACA0C 000098 0004+00 0/1 0/0 0/0 .rodata @4331 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4331 = 3.0f / 10.0f; -COMPILER_STRIP_GATE(80BACA08, &lit_4331); +COMPILER_STRIP_GATE(0x80BACA08, &lit_4331); #pragma pop /* 80BACA0C-80BACA10 00009C 0004+00 0/1 0/0 0/0 .rodata @4332 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4332 = 6.0f; -COMPILER_STRIP_GATE(80BACA0C, &lit_4332); +COMPILER_STRIP_GATE(0x80BACA0C, &lit_4332); #pragma pop /* 80BACA10-80BACA14 0000A0 0004+00 0/2 0/0 0/0 .rodata @4333 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4333 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(80BACA10, &lit_4333); +COMPILER_STRIP_GATE(0x80BACA10, &lit_4333); #pragma pop /* 80BAAD30-80BAB234 000FF0 0504+00 1/0 0/0 0/0 .text fly_up__12daObjBATTA_cFv */ @@ -1004,7 +1010,13 @@ asm void daObjBATTA_c::fly_down() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4435 = 10.0f; -COMPILER_STRIP_GATE(80BACA14, &lit_4435); +COMPILER_STRIP_GATE(0x80BACA14, &lit_4435); +#pragma pop + +/* 80BACA64-80BACA64 0000F4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80BACA68 = "R_SP160"; #pragma pop /* 80BAB500-80BAB6C8 0017C0 01C8+00 1/0 0/0 0/0 .text bin_wait__12daObjBATTA_cFv */ @@ -1022,42 +1034,42 @@ asm void daObjBATTA_c::bin_wait() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4465 = -2.0f; -COMPILER_STRIP_GATE(80BACA18, &lit_4465); +COMPILER_STRIP_GATE(0x80BACA18, &lit_4465); #pragma pop /* 80BACA1C-80BACA20 0000AC 0004+00 0/1 0/0 0/0 .rodata @4466 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4466 = 2.0f / 5.0f; -COMPILER_STRIP_GATE(80BACA1C, &lit_4466); +COMPILER_STRIP_GATE(0x80BACA1C, &lit_4466); #pragma pop /* 80BACA20-80BACA24 0000B0 0004+00 0/1 0/0 0/0 .rodata @4467 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4467 = 3.0f / 5.0f; -COMPILER_STRIP_GATE(80BACA20, &lit_4467); +COMPILER_STRIP_GATE(0x80BACA20, &lit_4467); #pragma pop /* 80BACA24-80BACA28 0000B4 0004+00 0/1 0/0 0/0 .rodata @4468 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4468 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(80BACA24, &lit_4468); +COMPILER_STRIP_GATE(0x80BACA24, &lit_4468); #pragma pop /* 80BACA28-80BACA2C 0000B8 0004+00 0/1 0/0 0/0 .rodata @4469 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4469 = 62.0f; -COMPILER_STRIP_GATE(80BACA28, &lit_4469); +COMPILER_STRIP_GATE(0x80BACA28, &lit_4469); #pragma pop /* 80BACA2C-80BACA30 0000BC 0004+00 0/1 0/0 0/0 .rodata @4470 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4470 = 1.0f / 20.0f; -COMPILER_STRIP_GATE(80BACA2C, &lit_4470); +COMPILER_STRIP_GATE(0x80BACA2C, &lit_4470); #pragma pop /* 80BACA30-80BACA38 0000C0 0008+00 0/1 0/0 0/0 .rodata @4471 */ @@ -1066,7 +1078,7 @@ COMPILER_STRIP_GATE(80BACA2C, &lit_4470); SECTION_RODATA static u8 const lit_4471[8] = { 0x3F, 0xB9, 0x99, 0x99, 0x99, 0x99, 0x99, 0x9A, }; -COMPILER_STRIP_GATE(80BACA30, &lit_4471); +COMPILER_STRIP_GATE(0x80BACA30, &lit_4471); #pragma pop /* 80BAB6C8-80BAB820 001988 0158+00 1/0 0/0 0/0 .text bin_action__12daObjBATTA_cFv */ @@ -1082,7 +1094,7 @@ asm void daObjBATTA_c::bin_action() { /* ############################################################################################## */ /* 80BACA38-80BACA3C 0000C8 0004+00 1/1 0/0 0/0 .rodata @4506 */ SECTION_RODATA static f32 const lit_4506 = -10.0f; -COMPILER_STRIP_GATE(80BACA38, &lit_4506); +COMPILER_STRIP_GATE(0x80BACA38, &lit_4506); /* 80BAB820-80BAB934 001AE0 0114+00 1/0 0/0 0/0 .text hook__12daObjBATTA_cFv */ #pragma push @@ -1097,7 +1109,7 @@ asm void daObjBATTA_c::hook() { /* ############################################################################################## */ /* 80BACA3C-80BACA40 0000CC 0004+00 1/1 0/0 0/0 .rodata @4552 */ SECTION_RODATA static f32 const lit_4552 = 100.0f; -COMPILER_STRIP_GATE(80BACA3C, &lit_4552); +COMPILER_STRIP_GATE(0x80BACA3C, &lit_4552); /* 80BAB934-80BABA98 001BF4 0164+00 2/0 0/0 0/0 .text boomerang__12daObjBATTA_cFv */ #pragma push @@ -1149,18 +1161,18 @@ SECTION_RODATA static u16 const l_batta_sex[1 + 1 /* padding */] = { /* padding */ 0x0000, }; -COMPILER_STRIP_GATE(80BACA40, &l_batta_sex); +COMPILER_STRIP_GATE(0x80BACA40, &l_batta_sex); #pragma pop /* 80BACA44-80BACA48 0000D4 0004+00 1/1 0/0 0/0 .rodata @4698 */ SECTION_RODATA static f32 const lit_4698 = 10000.0f; -COMPILER_STRIP_GATE(80BACA44, &lit_4698); +COMPILER_STRIP_GATE(0x80BACA44, &lit_4698); /* 80BACA48-80BACA50 0000D8 0008+00 1/1 0/0 0/0 .rodata @4700 */ SECTION_RODATA static u8 const lit_4700[8] = { 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BACA48, &lit_4700); +COMPILER_STRIP_GATE(0x80BACA48, &lit_4700); /* 80BABE20-80BABFA4 0020E0 0184+00 1/1 0/0 0/0 .text execute__12daObjBATTA_cFv */ #pragma push @@ -1201,21 +1213,21 @@ asm void daObjBATTA_c::mtx_set() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4767 = 50.0f; -COMPILER_STRIP_GATE(80BACA50, &lit_4767); +COMPILER_STRIP_GATE(0x80BACA50, &lit_4767); #pragma pop /* 80BACA54-80BACA58 0000E4 0004+00 0/1 0/0 0/0 .rodata @4768 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4768 = 15.0f; -COMPILER_STRIP_GATE(80BACA54, &lit_4768); +COMPILER_STRIP_GATE(0x80BACA54, &lit_4768); #pragma pop /* 80BACA58-80BACA5C 0000E8 0004+00 0/1 0/0 0/0 .rodata @4769 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4769 = -3.0f / 5.0f; -COMPILER_STRIP_GATE(80BACA58, &lit_4769); +COMPILER_STRIP_GATE(0x80BACA58, &lit_4769); #pragma pop /* 80BAC084-80BAC174 002344 00F0+00 1/0 0/0 0/0 .text daObjBATTA_Draw__FP12daObjBATTA_c @@ -1244,14 +1256,14 @@ static asm void daObjBATTA_Execute(daObjBATTA_c* param_0) { #pragma push #pragma force_active on SECTION_RODATA static u32 const l_musiya_num = 0x01970198; -COMPILER_STRIP_GATE(80BACA5C, &l_musiya_num); +COMPILER_STRIP_GATE(0x80BACA5C, &l_musiya_num); #pragma pop /* 80BACA60-80BACA64 0000F0 0004+00 0/1 0/0 0/0 .rodata @4979 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4979 = -50.0f; -COMPILER_STRIP_GATE(80BACA60, &lit_4979); +COMPILER_STRIP_GATE(0x80BACA60, &lit_4979); #pragma pop /* 80BACC8C-80BACC98 00000C 000C+00 1/1 0/0 0/0 .bss @3769 */ @@ -1347,7 +1359,7 @@ asm void __sinit_d_a_obj_batta_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80BAC8BC = (void*)__sinit_d_a_obj_batta_cpp; +REGISTER_CTORS(0x80BAC8BC, __sinit_d_a_obj_batta_cpp); #pragma pop /* 80BAC8F8-80BAC900 002BB8 0008+00 1/0 0/0 0/0 .text @36@__dt__12dBgS_ObjAcchFv */ @@ -1390,10 +1402,4 @@ asm cCcD_GStts::~cCcD_GStts() { } #pragma pop -/* 80BACA64-80BACA70 0000F4 000C+00 9/9 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80BACA64 = "Bat"; -SECTION_DEAD static char const* const stringBase_80BACA68 = "R_SP160"; -#pragma pop +/* 80BACA64-80BACA64 0000F4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_bbox/d_a_obj_bbox.cpp b/rel/d/a/obj/d_a_obj_bbox/d_a_obj_bbox.cpp index e35dc801a7b..3d056f7d402 100644 --- a/rel/d/a/obj/d_a_obj_bbox/d_a_obj_bbox.cpp +++ b/rel/d/a/obj/d_a_obj_bbox/d_a_obj_bbox.cpp @@ -56,10 +56,10 @@ struct dRes_control_c { struct dPa_levelEcallBack {}; -struct _GXColor {}; - struct csXyz {}; +struct _GXColor {}; + struct dPa_control_c { /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, @@ -118,10 +118,10 @@ struct cCcS { /* 80264BA8 */ void Set(cCcD_Obj*); }; -struct Vec {}; - struct JAISoundID {}; +struct Vec {}; + struct Z2SeMgr { /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); }; @@ -239,7 +239,7 @@ SECTION_RODATA static u8 const l_cyl_src[68] = { 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0xB4, 0x00, 0x00, 0x42, 0xC8, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BAD474, &l_cyl_src); +COMPILER_STRIP_GATE(0x80BAD474, &l_cyl_src); /* 80BACDD8-80BACE50 000118 0078+00 1/0 0/0 0/0 .text Create__11daObjBBox_cFv */ #pragma push @@ -252,6 +252,12 @@ asm void daObjBBox_c::Create() { #pragma pop /* ############################################################################################## */ +/* 80BAD4CC-80BAD4CC 000058 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80BAD4CC = "M_BBox"; +#pragma pop + /* 80BAD4D4-80BAD4D8 -00001 0004+00 3/3 0/0 0/0 .data l_arcName */ SECTION_DATA static void* l_arcName = (void*)&d_a_obj_bbox__stringBase0; @@ -365,21 +371,21 @@ SECTION_RODATA static u8 const particle_id[10 + 2 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BAD4B8, &particle_id); +COMPILER_STRIP_GATE(0x80BAD4B8, &particle_id); #pragma pop /* 80BAD4C4-80BAD4C8 000050 0004+00 0/1 0/0 0/0 .rodata @3821 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3821 = 1.0f; -COMPILER_STRIP_GATE(80BAD4C4, &lit_3821); +COMPILER_STRIP_GATE(0x80BAD4C4, &lit_3821); #pragma pop /* 80BAD4C8-80BAD4CC 000054 0004+00 0/1 0/0 0/0 .rodata @3822 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3822 = -1.0f; -COMPILER_STRIP_GATE(80BAD4C8, &lit_3822); +COMPILER_STRIP_GATE(0x80BAD4C8, &lit_3822); #pragma pop /* 80BAD0C0-80BAD234 000400 0174+00 1/0 0/0 0/0 .text Execute__11daObjBBox_cFPPA3_A4_f */ @@ -452,9 +458,4 @@ static asm void daObjBBox_MoveBGDraw(daObjBBox_c* param_0) { } #pragma pop -/* 80BAD4CC-80BAD4D3 000058 0007+00 1/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80BAD4CC = "M_BBox"; -#pragma pop +/* 80BAD4CC-80BAD4CC 000058 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_bed/d_a_obj_bed.cpp b/rel/d/a/obj/d_a_obj_bed/d_a_obj_bed.cpp index 4ef69157529..8ae108850a7 100644 --- a/rel/d/a/obj/d_a_obj_bed/d_a_obj_bed.cpp +++ b/rel/d/a/obj/d_a_obj_bed/d_a_obj_bed.cpp @@ -228,6 +228,12 @@ extern "C" void __register_global_object(); // /* ############################################################################################## */ +/* 80BAE190-80BAE190 000028 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80BAE190 = "KH_Bed"; +#pragma pop + /* 80BAE198-80BAE19C -00001 0004+00 1/1 0/0 0/0 .data l_resName */ SECTION_DATA static void* l_resName = (void*)&d_a_obj_bed__stringBase0; @@ -309,32 +315,32 @@ asm daObj_Bed_c::~daObj_Bed_c() { SECTION_RODATA u8 const daObj_Bed_Param_c::m[16] = { 0x00, 0x00, 0x00, 0x00, 0xC0, 0x40, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x44, 0x16, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BAE168, &daObj_Bed_Param_c::m); +COMPILER_STRIP_GATE(0x80BAE168, &daObj_Bed_Param_c::m); /* 80BAE178-80BAE17C 000010 0004+00 0/1 0/0 0/0 .rodata @3902 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3902 = -200.0f; -COMPILER_STRIP_GATE(80BAE178, &lit_3902); +COMPILER_STRIP_GATE(0x80BAE178, &lit_3902); #pragma pop /* 80BAE17C-80BAE180 000014 0004+00 0/1 0/0 0/0 .rodata @3903 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3903 = -100.0f; -COMPILER_STRIP_GATE(80BAE17C, &lit_3903); +COMPILER_STRIP_GATE(0x80BAE17C, &lit_3903); #pragma pop /* 80BAE180-80BAE184 000018 0004+00 0/1 0/0 0/0 .rodata @3904 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3904 = 200.0f; -COMPILER_STRIP_GATE(80BAE180, &lit_3904); +COMPILER_STRIP_GATE(0x80BAE180, &lit_3904); #pragma pop /* 80BAE184-80BAE188 00001C 0004+00 1/3 0/0 0/0 .rodata @3905 */ SECTION_RODATA static f32 const lit_3905 = -1000000000.0f; -COMPILER_STRIP_GATE(80BAE184, &lit_3905); +COMPILER_STRIP_GATE(0x80BAE184, &lit_3905); /* 80BAD790-80BADA00 000210 0270+00 1/1 0/0 0/0 .text create__11daObj_Bed_cFv */ #pragma push @@ -421,14 +427,14 @@ asm void daObj_Bed_c::Execute() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3985 = 20.0f; -COMPILER_STRIP_GATE(80BAE188, &lit_3985); +COMPILER_STRIP_GATE(0x80BAE188, &lit_3985); #pragma pop /* 80BAE18C-80BAE190 000024 0004+00 0/1 0/0 0/0 .rodata @3986 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3986 = 1.0f; -COMPILER_STRIP_GATE(80BAE18C, &lit_3986); +COMPILER_STRIP_GATE(0x80BAE18C, &lit_3986); #pragma pop /* 80BADDF4-80BADEB8 000874 00C4+00 1/1 0/0 0/0 .text Draw__11daObj_Bed_cFv */ @@ -578,7 +584,7 @@ asm void __sinit_d_a_obj_bed_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80BAE0BC = (void*)__sinit_d_a_obj_bed_cpp; +REGISTER_CTORS(0x80BAE0BC, __sinit_d_a_obj_bed_cpp); #pragma pop /* 80BAE0FC-80BAE144 000B7C 0048+00 2/1 0/0 0/0 .text __dt__17daObj_Bed_Param_cFv */ @@ -611,9 +617,4 @@ static asm void func_80BAE14C() { } #pragma pop -/* 80BAE190-80BAE197 000028 0007+00 1/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80BAE190 = "KH_Bed"; -#pragma pop +/* 80BAE190-80BAE190 000028 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_bemos/d_a_obj_bemos.cpp b/rel/d/a/obj/d_a_obj_bemos/d_a_obj_bemos.cpp index a5a25c10104..1076c765ec7 100644 --- a/rel/d/a/obj/d_a_obj_bemos/d_a_obj_bemos.cpp +++ b/rel/d/a/obj/d_a_obj_bemos/d_a_obj_bemos.cpp @@ -444,8 +444,8 @@ extern "C" static void daObjBm_MoveBGDelete__FP9daObjBm_c(); extern "C" static void daObjBm_MoveBGExecute__FP9daObjBm_c(); extern "C" static void daObjBm_MoveBGDraw__FP9daObjBm_c(); extern "C" void __dt__10cCcD_GSttsFv(); -extern "C" void func_80BB3490(u16*); -extern "C" void func_80BB34AC(u8*); +extern "C" void func_80BB3490(void* _this, u16*); +extern "C" void func_80BB34AC(void* _this, u8*); extern "C" void __sinit_d_a_obj_bemos_cpp(); extern "C" void func_80BB35A8(); extern "C" void __dt__11dBgS_WtrChkFv(); @@ -656,7 +656,7 @@ static asm void nodeCallBack(J3DJoint* param_0, int param_1) { SECTION_RODATA static u8 const l_eye_offset[12] = { 0x00, 0x00, 0x00, 0x00, 0x43, 0xA5, 0x00, 0x00, 0x42, 0x96, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BB37B8, &l_eye_offset); +COMPILER_STRIP_GATE(0x80BB37B8, &l_eye_offset); /* 80BB37C4-80BB37D0 00000C 000C+00 0/1 0/0 0/0 .rodata l_high_beam_offset */ #pragma push @@ -664,7 +664,7 @@ COMPILER_STRIP_GATE(80BB37B8, &l_eye_offset); SECTION_RODATA static u8 const l_high_beam_offset[12] = { 0x00, 0x00, 0x00, 0x00, 0x43, 0x7F, 0x00, 0x00, 0x42, 0x82, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BB37C4, &l_high_beam_offset); +COMPILER_STRIP_GATE(0x80BB37C4, &l_high_beam_offset); #pragma pop /* 80BB37D0-80BB37DC 000018 000C+00 0/1 0/0 0/0 .rodata l_mid_beam_offset */ @@ -673,7 +673,7 @@ COMPILER_STRIP_GATE(80BB37C4, &l_high_beam_offset); SECTION_RODATA static u8 const l_mid_beam_offset[12] = { 0x00, 0x00, 0x00, 0x00, 0x43, 0x4D, 0x00, 0x00, 0x42, 0x82, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BB37D0, &l_mid_beam_offset); +COMPILER_STRIP_GATE(0x80BB37D0, &l_mid_beam_offset); #pragma pop /* 80BB37DC-80BB37E8 000024 000C+00 0/1 0/0 0/0 .rodata l_low_beam_offset */ @@ -682,7 +682,7 @@ COMPILER_STRIP_GATE(80BB37D0, &l_mid_beam_offset); SECTION_RODATA static u8 const l_low_beam_offset[12] = { 0x00, 0x00, 0x00, 0x00, 0x43, 0x20, 0x00, 0x00, 0x42, 0x82, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BB37DC, &l_low_beam_offset); +COMPILER_STRIP_GATE(0x80BB37DC, &l_low_beam_offset); #pragma pop /* 80BB37E8-80BB3818 000030 0030+00 1/1 0/0 0/0 .rodata l_craw_offset */ @@ -691,21 +691,21 @@ SECTION_RODATA static u8 const l_craw_offset[48] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC2, 0xBE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0xBE, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BB37E8, &l_craw_offset); +COMPILER_STRIP_GATE(0x80BB37E8, &l_craw_offset); /* 80BB3818-80BB3820 000060 0008+00 1/2 0/0 0/0 .rodata M_dir_base__9daObjBm_c */ SECTION_RODATA u8 const daObjBm_c::M_dir_base[8] = { 0x00, 0x00, 0x40, 0x00, 0x80, 0x00, 0xC0, 0x00, }; -COMPILER_STRIP_GATE(80BB3818, &daObjBm_c::M_dir_base); +COMPILER_STRIP_GATE(0x80BB3818, &daObjBm_c::M_dir_base); /* 80BB3820-80BB3824 000068 0004+00 1/3 0/0 0/0 .rodata @3933 */ SECTION_RODATA static f32 const lit_3933 = 0.5f; -COMPILER_STRIP_GATE(80BB3820, &lit_3933); +COMPILER_STRIP_GATE(0x80BB3820, &lit_3933); /* 80BB3824-80BB3828 00006C 0004+00 8/16 0/0 0/0 .rodata @3934 */ SECTION_RODATA static f32 const lit_3934 = 1.0f; -COMPILER_STRIP_GATE(80BB3824, &lit_3934); +COMPILER_STRIP_GATE(0x80BB3824, &lit_3934); /* 80BAE5FC-80BAE68C 00037C 0090+00 1/1 0/0 0/0 .text initBaseMtx__9daObjBm_cFv */ #pragma push @@ -732,7 +732,19 @@ asm void daObjBm_c::setBaseMtx() { SECTION_RODATA static u8 const lit_4106[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BB3828, &lit_4106); +COMPILER_STRIP_GATE(0x80BB3828, &lit_4106); + +/* 80BB3A40-80BB3A40 000288 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80BB3A40 = "Obj_bm"; +SECTION_DEAD static char const* const stringBase_80BB3A47 = "bmEye"; +SECTION_DEAD static char const* const stringBase_80BB3A4D = "head"; +SECTION_DEAD static char const* const stringBase_80BB3A52 = "cogRed"; +SECTION_DEAD static char const* const stringBase_80BB3A59 = "cogBlue"; +SECTION_DEAD static char const* const stringBase_80BB3A61 = "cogGreen"; +SECTION_DEAD static char const* const stringBase_80BB3A6A = "cogYellow"; +#pragma pop /* 80BB3A74-80BB3A80 000000 000C+00 6/6 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { @@ -862,7 +874,7 @@ SECTION_RODATA static u8 const lit_4250[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BB3830, &lit_4250); +COMPILER_STRIP_GATE(0x80BB3830, &lit_4250); /* 80BB3BAC-80BB3BB8 -00001 000C+00 0/1 0/0 0/0 .data @4298 */ #pragma push @@ -1201,18 +1213,18 @@ asm void daObjBm_c::create1st() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4291 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(80BB3834, &lit_4291); +COMPILER_STRIP_GATE(0x80BB3834, &lit_4291); #pragma pop /* 80BB3838-80BB383C 000080 0004+00 2/3 0/0 0/0 .rodata @4292 */ SECTION_RODATA static f32 const lit_4292 = 50.0f; -COMPILER_STRIP_GATE(80BB3838, &lit_4292); +COMPILER_STRIP_GATE(0x80BB3838, &lit_4292); /* 80BB383C-80BB3840 000084 0004+00 0/1 0/0 0/0 .rodata @4293 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4293 = 10.0f; -COMPILER_STRIP_GATE(80BB383C, &lit_4293); +COMPILER_STRIP_GATE(0x80BB383C, &lit_4293); #pragma pop /* 80BAF09C-80BAF29C 000E1C 0200+00 1/0 0/0 0/0 .text Execute__9daObjBm_cFPPA3_A4_f */ @@ -1353,7 +1365,7 @@ asm void daObjBm_c::initActionObjBemos() { /* ############################################################################################## */ /* 80BB3840-80BB3844 000088 0004+00 3/5 0/0 0/0 .rodata @4402 */ SECTION_RODATA static f32 const lit_4402 = -1.0f; -COMPILER_STRIP_GATE(80BB3840, &lit_4402); +COMPILER_STRIP_GATE(0x80BB3840, &lit_4402); /* 80BAF46C-80BAF750 0011EC 02E4+00 1/0 0/0 0/0 .text actionEnBemos__9daObjBm_cFv */ #pragma push @@ -1400,18 +1412,18 @@ asm cXyz::~cXyz() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4515 = 600.0f; -COMPILER_STRIP_GATE(80BB3844, &lit_4515); +COMPILER_STRIP_GATE(0x80BB3844, &lit_4515); #pragma pop /* 80BB3848-80BB384C 000090 0004+00 1/2 0/0 0/0 .rodata @4516 */ SECTION_RODATA static f32 const lit_4516 = 300.0f; -COMPILER_STRIP_GATE(80BB3848, &lit_4516); +COMPILER_STRIP_GATE(0x80BB3848, &lit_4516); /* 80BB384C-80BB3850 000094 0004+00 0/2 0/0 0/0 .rodata @4517 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4517 = 5.0f; -COMPILER_STRIP_GATE(80BB384C, &lit_4517); +COMPILER_STRIP_GATE(0x80BB384C, &lit_4517); #pragma pop /* 80BB3850-80BB3858 000098 0008+00 0/2 0/0 0/0 .rodata @4518 */ @@ -1420,7 +1432,7 @@ COMPILER_STRIP_GATE(80BB384C, &lit_4517); SECTION_RODATA static u8 const lit_4518[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BB3850, &lit_4518); +COMPILER_STRIP_GATE(0x80BB3850, &lit_4518); #pragma pop /* 80BB3858-80BB3860 0000A0 0008+00 0/2 0/0 0/0 .rodata @4519 */ @@ -1429,7 +1441,7 @@ COMPILER_STRIP_GATE(80BB3850, &lit_4518); SECTION_RODATA static u8 const lit_4519[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BB3858, &lit_4519); +COMPILER_STRIP_GATE(0x80BB3858, &lit_4519); #pragma pop /* 80BB3860-80BB3868 0000A8 0008+00 0/2 0/0 0/0 .rodata @4520 */ @@ -1438,7 +1450,7 @@ COMPILER_STRIP_GATE(80BB3858, &lit_4519); SECTION_RODATA static u8 const lit_4520[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BB3860, &lit_4520); +COMPILER_STRIP_GATE(0x80BB3860, &lit_4520); #pragma pop /* 80BAF8F8-80BAFC08 001678 0310+00 1/1 0/0 0/0 .text calcBeamPos__9daObjBm_cFv */ @@ -1456,21 +1468,21 @@ asm void daObjBm_c::calcBeamPos() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4628 = 1200.0f; -COMPILER_STRIP_GATE(80BB3868, &lit_4628); +COMPILER_STRIP_GATE(0x80BB3868, &lit_4628); #pragma pop /* 80BB386C-80BB3870 0000B4 0004+00 0/1 0/0 0/0 .rodata @4629 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4629 = 20.0f; -COMPILER_STRIP_GATE(80BB386C, &lit_4629); +COMPILER_STRIP_GATE(0x80BB386C, &lit_4629); #pragma pop /* 80BB3870-80BB3874 0000B8 0004+00 0/1 0/0 0/0 .rodata @4630 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4630 = 60.0f; -COMPILER_STRIP_GATE(80BB3870, &lit_4630); +COMPILER_STRIP_GATE(0x80BB3870, &lit_4630); #pragma pop /* 80BAFC08-80BAFF60 001988 0358+00 1/1 0/0 0/0 .text calcBeamLenAndAt__9daObjBm_cFv */ @@ -1516,13 +1528,13 @@ asm void daObjBm_c::checkSearchPlayer() { /* ############################################################################################## */ /* 80BB3874-80BB3878 0000BC 0004+00 2/2 0/0 0/0 .rodata @4714 */ SECTION_RODATA static f32 const lit_4714 = 1000.0f; -COMPILER_STRIP_GATE(80BB3874, &lit_4714); +COMPILER_STRIP_GATE(0x80BB3874, &lit_4714); /* 80BB3878-80BB3880 0000C0 0008+00 2/2 0/0 0/0 .rodata @4716 */ SECTION_RODATA static u8 const lit_4716[8] = { 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BB3878, &lit_4716); +COMPILER_STRIP_GATE(0x80BB3878, &lit_4716); /* 80BB0260-80BB02B8 001FE0 0058+00 2/2 0/0 0/0 .text getSearchDistance__9daObjBm_cFv */ #pragma push @@ -1574,7 +1586,7 @@ SECTION_RODATA static u8 const eff_id_f[4] = { 0x84, 0x51, }; -COMPILER_STRIP_GATE(80BB3880, &eff_id_f); +COMPILER_STRIP_GATE(0x80BB3880, &eff_id_f); #pragma pop /* 80BB3884-80BB388C 0000CC 0008+00 0/1 0/0 0/0 .rodata hit_eff_id$4819 */ @@ -1583,7 +1595,7 @@ COMPILER_STRIP_GATE(80BB3880, &eff_id_f); SECTION_RODATA static u8 const hit_eff_id[8] = { 0x85, 0xA2, 0x85, 0xA3, 0x85, 0xA4, 0x85, 0xA5, }; -COMPILER_STRIP_GATE(80BB3884, &hit_eff_id); +COMPILER_STRIP_GATE(0x80BB3884, &hit_eff_id); #pragma pop /* 80BB0584-80BB0718 002304 0194+00 1/1 0/0 0/0 .text initEffectSet0__9daObjBm_cFv */ @@ -1624,7 +1636,7 @@ asm void daObjBm_c::check_to_walk() { /* ############################################################################################## */ /* 80BB388C-80BB3890 0000D4 0004+00 1/1 0/0 0/0 .rodata @4936 */ SECTION_RODATA static f32 const lit_4936 = -4.0f; -COMPILER_STRIP_GATE(80BB388C, &lit_4936); +COMPILER_STRIP_GATE(0x80BB388C, &lit_4936); /* 80BB0824-80BB0888 0025A4 0064+00 1/1 0/0 0/0 .text mode_wait_init__9daObjBm_cFv */ #pragma push @@ -1641,14 +1653,14 @@ asm void daObjBm_c::mode_wait_init() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4960 = 75.0f; -COMPILER_STRIP_GATE(80BB3890, &lit_4960); +COMPILER_STRIP_GATE(0x80BB3890, &lit_4960); #pragma pop /* 80BB3894-80BB3898 0000DC 0004+00 0/1 0/0 0/0 .rodata @4961 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4961 = 0x451D89D9; -COMPILER_STRIP_GATE(80BB3894, &lit_4961); +COMPILER_STRIP_GATE(0x80BB3894, &lit_4961); #pragma pop /* 80BB0888-80BB09C8 002608 0140+00 2/1 0/0 0/0 .text mode_wait__9daObjBm_cFv */ @@ -1791,35 +1803,35 @@ SECTION_RODATA u8 const daObjBm_c::Bgc_c::M_lin20[368] = { 0xBF, 0x40, 0x00, 0x00, 0x3E, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xBF, 0x40, 0x00, 0x00, 0xBE, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BB3898, &daObjBm_c::Bgc_c::M_lin20); +COMPILER_STRIP_GATE(0x80BB3898, &daObjBm_c::Bgc_c::M_lin20); #pragma pop /* 80BB3A08-80BB3A0C 000250 0004+00 0/0 0/0 0/0 .rodata @5157 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5157 = -1000000000.0f; -COMPILER_STRIP_GATE(80BB3A08, &lit_5157); +COMPILER_STRIP_GATE(0x80BB3A08, &lit_5157); #pragma pop /* 80BB3A0C-80BB3A10 000254 0004+00 0/2 0/0 0/0 .rodata @5158 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5158 = 200.0f; -COMPILER_STRIP_GATE(80BB3A0C, &lit_5158); +COMPILER_STRIP_GATE(0x80BB3A0C, &lit_5158); #pragma pop /* 80BB3A10-80BB3A14 000258 0004+00 0/1 0/0 0/0 .rodata @5234 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5234 = 100.0f; -COMPILER_STRIP_GATE(80BB3A10, &lit_5234); +COMPILER_STRIP_GATE(0x80BB3A10, &lit_5234); #pragma pop /* 80BB3A14-80BB3A18 00025C 0004+00 0/1 0/0 0/0 .rodata @5235 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5235 = 400.0f; -COMPILER_STRIP_GATE(80BB3A14, &lit_5235); +COMPILER_STRIP_GATE(0x80BB3A14, &lit_5235); #pragma pop /* 80BB3F90-80BB3F9C 0000B0 000C+00 0/1 0/0 0/0 .bss @5101 */ @@ -1867,7 +1879,7 @@ asm void daObjBm_c::Bgc_c::wall_pos(fopAc_ac_c const* param_0, daObjBm_c::BgcSrc /* ############################################################################################## */ /* 80BB3A18-80BB3A1C 000260 0004+00 1/1 0/0 0/0 .rodata @5242 */ SECTION_RODATA static f32 const lit_5242 = 76.0f; -COMPILER_STRIP_GATE(80BB3A18, &lit_5242); +COMPILER_STRIP_GATE(0x80BB3A18, &lit_5242); /* 80BB1154-80BB1194 002ED4 0040+00 2/2 0/0 0/0 .text * chk_wall_pre__Q29daObjBm_c5Bgc_cFPC10fopAc_ac_cPCQ29daObjBm_c8BgcSrc_cis */ @@ -1948,7 +1960,7 @@ asm void daObjBm_c::actionFindPlayer() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5299 = 110.0f; -COMPILER_STRIP_GATE(80BB3A1C, &lit_5299); +COMPILER_STRIP_GATE(0x80BB3A1C, &lit_5299); #pragma pop /* 80BB3A20-80BB3A24 000268 0004+00 0/1 0/0 0/0 .rodata l_eff_id$5506 */ @@ -1960,21 +1972,21 @@ SECTION_RODATA static u8 const l_eff_id_5506[4] = { 0x84, 0x68, }; -COMPILER_STRIP_GATE(80BB3A20, &l_eff_id_5506); +COMPILER_STRIP_GATE(0x80BB3A20, &l_eff_id_5506); #pragma pop /* 80BB3A24-80BB3A28 00026C 0004+00 0/1 0/0 0/0 .rodata @5564 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5564 = 6.5f; -COMPILER_STRIP_GATE(80BB3A24, &lit_5564); +COMPILER_STRIP_GATE(0x80BB3A24, &lit_5564); #pragma pop /* 80BB3A28-80BB3A2C 000270 0004+00 0/1 0/0 0/0 .rodata @5565 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5565 = 32.0f; -COMPILER_STRIP_GATE(80BB3A28, &lit_5565); +COMPILER_STRIP_GATE(0x80BB3A28, &lit_5565); #pragma pop /* 80BB1960-80BB1BD0 0036E0 0270+00 1/1 0/0 0/0 .text initActionAttack__9daObjBm_cFv */ @@ -1997,7 +2009,7 @@ SECTION_RODATA static u8 const l_eff_id_5631[4] = { 0x84, 0x63, }; -COMPILER_STRIP_GATE(80BB3A2C, &l_eff_id_5631); +COMPILER_STRIP_GATE(0x80BB3A2C, &l_eff_id_5631); #pragma pop /* 80BB3A30-80BB3A38 000278 0006+02 0/1 0/0 0/0 .rodata l_eff_id2$5639 */ @@ -2014,21 +2026,21 @@ SECTION_RODATA static u8 const l_eff_id2[6 + 2 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BB3A30, &l_eff_id2); +COMPILER_STRIP_GATE(0x80BB3A30, &l_eff_id2); #pragma pop /* 80BB3A38-80BB3A3C 000280 0004+00 0/1 0/0 0/0 .rodata @5875 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5875 = 15.0f; -COMPILER_STRIP_GATE(80BB3A38, &lit_5875); +COMPILER_STRIP_GATE(0x80BB3A38, &lit_5875); #pragma pop /* 80BB3A3C-80BB3A40 000284 0004+00 0/1 0/0 0/0 .rodata @5876 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5876 = 2.0f; -COMPILER_STRIP_GATE(80BB3A3C, &lit_5876); +COMPILER_STRIP_GATE(0x80BB3A3C, &lit_5876); #pragma pop /* 80BB1BD0-80BB248C 003950 08BC+00 1/0 0/0 0/0 .text actionAttack__9daObjBm_cFv */ @@ -2232,7 +2244,7 @@ asm cCcD_GStts::~cCcD_GStts() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80BB3490(u16* param_0) { +extern "C" asm void func_80BB3490(void* _this, u16* param_0) { nofralloc #include "asm/rel/d/a/obj/d_a_obj_bemos/d_a_obj_bemos/func_80BB3490.s" } @@ -2242,7 +2254,7 @@ extern "C" asm void func_80BB3490(u16* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80BB34AC(u8* param_0) { +extern "C" asm void func_80BB34AC(void* _this, u8* param_0) { nofralloc #include "asm/rel/d/a/obj/d_a_obj_bemos/d_a_obj_bemos/func_80BB34AC.s" } @@ -2260,7 +2272,7 @@ asm void __sinit_d_a_obj_bemos_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80BB34C8 = (void*)__sinit_d_a_obj_bemos_cpp; +REGISTER_CTORS(0x80BB34C8, __sinit_d_a_obj_bemos_cpp); #pragma pop /* 80BB35A8-80BB35E0 005328 0038+00 1/1 0/0 0/0 .text __arraydtor$5103 */ @@ -2610,15 +2622,4 @@ static u8 data_80BB5280[4]; static u8 data_80BB5284[4]; #pragma pop -/* 80BB3A40-80BB3A74 000288 0034+00 7/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80BB3A40 = "Obj_bm"; -SECTION_DEAD static char const* const stringBase_80BB3A47 = "bmEye"; -SECTION_DEAD static char const* const stringBase_80BB3A4D = "head"; -SECTION_DEAD static char const* const stringBase_80BB3A52 = "cogRed"; -SECTION_DEAD static char const* const stringBase_80BB3A59 = "cogBlue"; -SECTION_DEAD static char const* const stringBase_80BB3A61 = "cogGreen"; -SECTION_DEAD static char const* const stringBase_80BB3A6A = "cogYellow"; -#pragma pop +/* 80BB3A40-80BB3A40 000288 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_bhashi/d_a_obj_bhashi.cpp b/rel/d/a/obj/d_a_obj_bhashi/d_a_obj_bhashi.cpp index 23146e7c5bc..55457bc62d4 100644 --- a/rel/d/a/obj/d_a_obj_bhashi/d_a_obj_bhashi.cpp +++ b/rel/d/a/obj/d_a_obj_bhashi/d_a_obj_bhashi.cpp @@ -171,10 +171,10 @@ struct cBgS { /* 800743B4 */ void LineCross(cBgS_LinChk*); }; -struct Vec {}; - struct JAISoundID {}; +struct Vec {}; + struct Z2SeMgr { /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); }; @@ -337,7 +337,7 @@ SECTION_RODATA static u8 const ccCylSrc[68] = { 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x43, 0x96, 0x00, 0x00, 0x45, 0x09, 0x80, 0x00, }; -COMPILER_STRIP_GATE(80578A88, &ccCylSrc); +COMPILER_STRIP_GATE(0x80578A88, &ccCylSrc); /* 80576A58-80576AC4 000078 006C+00 1/1 0/0 0/0 .text initCcCylinder__13daObjBHASHI_cFv */ @@ -353,7 +353,7 @@ asm void daObjBHASHI_c::initCcCylinder() { /* ############################################################################################## */ /* 80578ACC-80578AD0 000044 0004+00 2/2 0/0 0/0 .rodata @3795 */ SECTION_RODATA static f32 const lit_3795 = -1100.0f; -COMPILER_STRIP_GATE(80578ACC, &lit_3795); +COMPILER_STRIP_GATE(0x80578ACC, &lit_3795); /* 80576AC4-80576B34 0000E4 0070+00 1/1 0/0 0/0 .text setCcCylinder__13daObjBHASHI_cFv */ #pragma push @@ -389,11 +389,11 @@ static asm void daObjBHASHI_Delete(daObjBHASHI_c* param_0) { /* ############################################################################################## */ /* 80578AD0-80578AD4 000048 0004+00 1/5 0/0 0/0 .rodata @3829 */ SECTION_RODATA static f32 const lit_3829 = 1100.0f; -COMPILER_STRIP_GATE(80578AD0, &lit_3829); +COMPILER_STRIP_GATE(0x80578AD0, &lit_3829); /* 80578AD4-80578AD8 00004C 0004+00 1/1 0/0 0/0 .rodata @3830 */ SECTION_RODATA static f32 const lit_3830 = 50.0f; -COMPILER_STRIP_GATE(80578AD4, &lit_3830); +COMPILER_STRIP_GATE(0x80578AD4, &lit_3830); /* 80576B78-80576C50 000198 00D8+00 2/2 0/0 0/0 .text Set_Hahen__13daObjBHASHI_cFv */ #pragma push @@ -410,63 +410,63 @@ asm void daObjBHASHI_c::Set_Hahen() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3922 = 80.0f; -COMPILER_STRIP_GATE(80578AD8, &lit_3922); +COMPILER_STRIP_GATE(0x80578AD8, &lit_3922); #pragma pop /* 80578ADC-80578AE0 000054 0004+00 0/1 0/0 0/0 .rodata @3923 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3923 = 350.0f; -COMPILER_STRIP_GATE(80578ADC, &lit_3923); +COMPILER_STRIP_GATE(0x80578ADC, &lit_3923); #pragma pop /* 80578AE0-80578AE4 000058 0004+00 0/1 0/0 0/0 .rodata @3924 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3924 = 2.5f; -COMPILER_STRIP_GATE(80578AE0, &lit_3924); +COMPILER_STRIP_GATE(0x80578AE0, &lit_3924); #pragma pop /* 80578AE4-80578AE8 00005C 0004+00 0/1 0/0 0/0 .rodata @3925 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3925 = 5.5f; -COMPILER_STRIP_GATE(80578AE4, &lit_3925); +COMPILER_STRIP_GATE(0x80578AE4, &lit_3925); #pragma pop /* 80578AE8-80578AEC 000060 0004+00 0/1 0/0 0/0 .rodata @3926 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3926 = 31.0f / 10.0f; -COMPILER_STRIP_GATE(80578AE8, &lit_3926); +COMPILER_STRIP_GATE(0x80578AE8, &lit_3926); #pragma pop /* 80578AEC-80578AF0 000064 0004+00 0/1 0/0 0/0 .rodata @3927 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3927 = 4.5f; -COMPILER_STRIP_GATE(80578AEC, &lit_3927); +COMPILER_STRIP_GATE(0x80578AEC, &lit_3927); #pragma pop /* 80578AF0-80578AF4 000068 0004+00 0/2 0/0 0/0 .rodata @3928 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3928 = 2.0f; -COMPILER_STRIP_GATE(80578AF0, &lit_3928); +COMPILER_STRIP_GATE(0x80578AF0, &lit_3928); #pragma pop /* 80578AF4-80578AF8 00006C 0004+00 0/1 0/0 0/0 .rodata @3929 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3929 = 30.0f; -COMPILER_STRIP_GATE(80578AF4, &lit_3929); +COMPILER_STRIP_GATE(0x80578AF4, &lit_3929); #pragma pop /* 80578AF8-80578AFC 000070 0004+00 0/1 0/0 0/0 .rodata @3930 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3930 = 8192.0f; -COMPILER_STRIP_GATE(80578AF8, &lit_3930); +COMPILER_STRIP_GATE(0x80578AF8, &lit_3930); #pragma pop /* 80578AFC-80578B00 000074 0004+00 1/9 0/0 0/0 .rodata @3931 */ @@ -476,62 +476,62 @@ SECTION_RODATA static u8 const lit_3931[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80578AFC, &lit_3931); +COMPILER_STRIP_GATE(0x80578AFC, &lit_3931); /* 80578B00-80578B04 000078 0004+00 0/1 0/0 0/0 .rodata @3932 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3932 = 15000.0f; -COMPILER_STRIP_GATE(80578B00, &lit_3932); +COMPILER_STRIP_GATE(0x80578B00, &lit_3932); #pragma pop /* 80578B04-80578B08 00007C 0004+00 0/1 0/0 0/0 .rodata @3933 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3933 = 65536.0f; -COMPILER_STRIP_GATE(80578B04, &lit_3933); +COMPILER_STRIP_GATE(0x80578B04, &lit_3933); #pragma pop /* 80578B08-80578B0C 000080 0004+00 0/1 0/0 0/0 .rodata @3934 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3934 = 1050.0f; -COMPILER_STRIP_GATE(80578B08, &lit_3934); +COMPILER_STRIP_GATE(0x80578B08, &lit_3934); #pragma pop /* 80578B0C-80578B10 000084 0004+00 0/1 0/0 0/0 .rodata @3935 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3935 = 60.0f; -COMPILER_STRIP_GATE(80578B0C, &lit_3935); +COMPILER_STRIP_GATE(0x80578B0C, &lit_3935); #pragma pop /* 80578B10-80578B14 000088 0004+00 0/1 0/0 0/0 .rodata @3936 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3936 = 10.0f; -COMPILER_STRIP_GATE(80578B10, &lit_3936); +COMPILER_STRIP_GATE(0x80578B10, &lit_3936); #pragma pop /* 80578B14-80578B18 00008C 0004+00 0/1 0/0 0/0 .rodata @3937 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3937 = 20.0f; -COMPILER_STRIP_GATE(80578B14, &lit_3937); +COMPILER_STRIP_GATE(0x80578B14, &lit_3937); #pragma pop /* 80578B18-80578B1C 000090 0004+00 0/1 0/0 0/0 .rodata @3938 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3938 = 1750.0f; -COMPILER_STRIP_GATE(80578B18, &lit_3938); +COMPILER_STRIP_GATE(0x80578B18, &lit_3938); #pragma pop /* 80578B1C-80578B20 000094 0004+00 0/1 0/0 0/0 .rodata @3939 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3939 = 32000.0f; -COMPILER_STRIP_GATE(80578B1C, &lit_3939); +COMPILER_STRIP_GATE(0x80578B1C, &lit_3939); #pragma pop /* 80578B20-80578B28 000098 0008+00 0/3 0/0 0/0 .rodata @3942 */ @@ -540,7 +540,7 @@ COMPILER_STRIP_GATE(80578B1C, &lit_3939); SECTION_RODATA static u8 const lit_3942[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80578B20, &lit_3942); +COMPILER_STRIP_GATE(0x80578B20, &lit_3942); #pragma pop /* 80576C50-805771EC 000270 059C+00 1/1 0/0 0/0 .text Set_Speed__13daObjBHASHI_cFssff */ @@ -558,14 +558,14 @@ asm void daObjBHASHI_c::Set_Speed(s16 param_0, s16 param_1, f32 param_2, f32 par #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4028 = 1.0f; -COMPILER_STRIP_GATE(80578B28, &lit_4028); +COMPILER_STRIP_GATE(0x80578B28, &lit_4028); #pragma pop /* 80578B2C-80578B30 0000A4 0004+00 0/3 0/0 0/0 .rodata @4029 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4029 = -1.0f; -COMPILER_STRIP_GATE(80578B2C, &lit_4029); +COMPILER_STRIP_GATE(0x80578B2C, &lit_4029); #pragma pop /* 805771EC-80577500 00080C 0314+00 1/1 0/0 0/0 .text Obj_Damage__13daObjBHASHI_cFv */ @@ -602,7 +602,7 @@ asm Hahen_c::Hahen_c() { /* ############################################################################################## */ /* 80578B30-80578B34 0000A8 0004+00 1/1 0/0 0/0 .rodata @4114 */ SECTION_RODATA static f32 const lit_4114 = -1.0f / 20.0f; -COMPILER_STRIP_GATE(80578B30, &lit_4114); +COMPILER_STRIP_GATE(0x80578B30, &lit_4114); /* 805777A4-80577868 000DC4 00C4+00 1/1 0/0 0/0 .text Wall_Check__7Hahen_cFv */ #pragma push @@ -619,7 +619,7 @@ asm void Hahen_c::Wall_Check() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4185 = 15.0f; -COMPILER_STRIP_GATE(80578B34, &lit_4185); +COMPILER_STRIP_GATE(0x80578B34, &lit_4185); #pragma pop /* 80578B38-80578B40 0000B0 0004+04 0/2 0/0 0/0 .rodata @4186 */ @@ -630,7 +630,7 @@ SECTION_RODATA static f32 const lit_4186[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80578B38, &lit_4186); +COMPILER_STRIP_GATE(0x80578B38, &lit_4186); #pragma pop /* 80578B40-80578B48 0000B8 0008+00 0/4 0/0 0/0 .rodata @4187 */ @@ -639,7 +639,7 @@ COMPILER_STRIP_GATE(80578B38, &lit_4186); SECTION_RODATA static u8 const lit_4187[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80578B40, &lit_4187); +COMPILER_STRIP_GATE(0x80578B40, &lit_4187); #pragma pop /* 80578B48-80578B50 0000C0 0008+00 0/4 0/0 0/0 .rodata @4188 */ @@ -648,7 +648,7 @@ COMPILER_STRIP_GATE(80578B40, &lit_4187); SECTION_RODATA static u8 const lit_4188[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80578B48, &lit_4188); +COMPILER_STRIP_GATE(0x80578B48, &lit_4188); #pragma pop /* 80578B50-80578B58 0000C8 0008+00 0/4 0/0 0/0 .rodata @4189 */ @@ -657,49 +657,49 @@ COMPILER_STRIP_GATE(80578B48, &lit_4188); SECTION_RODATA static u8 const lit_4189[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80578B50, &lit_4189); +COMPILER_STRIP_GATE(0x80578B50, &lit_4189); #pragma pop /* 80578B58-80578B5C 0000D0 0004+00 0/1 0/0 0/0 .rodata @4190 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4190 = 7.0f / 10.0f; -COMPILER_STRIP_GATE(80578B58, &lit_4190); +COMPILER_STRIP_GATE(0x80578B58, &lit_4190); #pragma pop /* 80578B5C-80578B60 0000D4 0004+00 0/1 0/0 0/0 .rodata @4191 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4191 = 3.0f / 10.0f; -COMPILER_STRIP_GATE(80578B5C, &lit_4191); +COMPILER_STRIP_GATE(0x80578B5C, &lit_4191); #pragma pop /* 80578B60-80578B64 0000D8 0004+00 0/1 0/0 0/0 .rodata @4192 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4192 = 4.0f; -COMPILER_STRIP_GATE(80578B60, &lit_4192); +COMPILER_STRIP_GATE(0x80578B60, &lit_4192); #pragma pop /* 80578B64-80578B68 0000DC 0004+00 0/2 0/0 0/0 .rodata @4193 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4193 = 5000.0f; -COMPILER_STRIP_GATE(80578B64, &lit_4193); +COMPILER_STRIP_GATE(0x80578B64, &lit_4193); #pragma pop /* 80578B68-80578B6C 0000E0 0004+00 0/1 0/0 0/0 .rodata @4194 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4194 = 8.0f; -COMPILER_STRIP_GATE(80578B68, &lit_4194); +COMPILER_STRIP_GATE(0x80578B68, &lit_4194); #pragma pop /* 80578B6C-80578B70 0000E4 0004+00 0/1 0/0 0/0 .rodata @4195 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4195 = 3.0f / 5.0f; -COMPILER_STRIP_GATE(80578B6C, &lit_4195); +COMPILER_STRIP_GATE(0x80578B6C, &lit_4195); #pragma pop /* 80577868-80577C1C 000E88 03B4+00 1/1 0/0 0/0 .text HahenMotion__7Hahen_cFv */ @@ -717,7 +717,7 @@ asm void Hahen_c::HahenMotion() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4258 = 1000.0f; -COMPILER_STRIP_GATE(80578B70, &lit_4258); +COMPILER_STRIP_GATE(0x80578B70, &lit_4258); #pragma pop /* 80577C1C-80577DA4 00123C 0188+00 1/1 0/0 0/0 .text CheckCull__7Hahen_cFv */ @@ -735,21 +735,21 @@ asm void Hahen_c::CheckCull() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4271 = -50.0f; -COMPILER_STRIP_GATE(80578B74, &lit_4271); +COMPILER_STRIP_GATE(0x80578B74, &lit_4271); #pragma pop /* 80578B78-80578B7C 0000F0 0004+00 0/1 0/0 0/0 .rodata @4272 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4272 = 658.0f; -COMPILER_STRIP_GATE(80578B78, &lit_4272); +COMPILER_STRIP_GATE(0x80578B78, &lit_4272); #pragma pop /* 80578B7C-80578B80 0000F4 0004+00 0/1 0/0 0/0 .rodata @4273 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4273 = 498.0f; -COMPILER_STRIP_GATE(80578B7C, &lit_4273); +COMPILER_STRIP_GATE(0x80578B7C, &lit_4273); #pragma pop /* 80577DA4-80577E24 0013C4 0080+00 1/1 0/0 0/0 .text checkViewArea__7Hahen_cFv */ @@ -778,21 +778,21 @@ asm void daObjBHASHI_c::Rolling(cXyz* param_0, f32 param_1, f32 param_2) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4345 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(80578B80, &lit_4345); +COMPILER_STRIP_GATE(0x80578B80, &lit_4345); #pragma pop /* 80578B84-80578B88 0000FC 0004+00 0/1 0/0 0/0 .rodata @4346 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4346 = 3.0f; -COMPILER_STRIP_GATE(80578B84, &lit_4346); +COMPILER_STRIP_GATE(0x80578B84, &lit_4346); #pragma pop /* 80578B88-80578B8C 000100 0004+00 0/1 0/0 0/0 .rodata @4347 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4347 = 9.0f; -COMPILER_STRIP_GATE(80578B88, &lit_4347); +COMPILER_STRIP_GATE(0x80578B88, &lit_4347); #pragma pop /* 80577FE0-805781FC 001600 021C+00 1/1 0/0 0/0 .text Roll_Set__7Hahen_cFP4cXyzfs */ @@ -837,6 +837,14 @@ static asm void daObjBHASHI_Execute(daObjBHASHI_c* param_0) { #pragma pop /* ############################################################################################## */ +/* 80578BA8-80578BA8 000120 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80578BA8 = "B_Hashi"; +SECTION_DEAD static char const* const stringBase_80578BB0 = "Lv9_R07_pillar.bmd"; +SECTION_DEAD static char const* const stringBase_80578BC3 = "Lv9_R07_pillar_hahen.bmd"; +#pragma pop + /* 80578BF0-80578BF4 -00001 0004+00 3/3 0/0 0/0 .data l_arcName */ SECTION_DATA static void* l_arcName = (void*)&d_a_obj_bhashi__stringBase0; @@ -855,28 +863,34 @@ asm void daObjBHASHI_c::CreateHeap() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4515 = 100.0f; -COMPILER_STRIP_GATE(80578B8C, &lit_4515); +COMPILER_STRIP_GATE(0x80578B8C, &lit_4515); #pragma pop /* 80578B90-80578B94 000108 0004+00 0/2 0/0 0/0 .rodata @4516 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4516 = -500.0f; -COMPILER_STRIP_GATE(80578B90, &lit_4516); +COMPILER_STRIP_GATE(0x80578B90, &lit_4516); #pragma pop /* 80578B94-80578B98 00010C 0004+00 0/2 0/0 0/0 .rodata @4517 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4517 = 500.0f; -COMPILER_STRIP_GATE(80578B94, &lit_4517); +COMPILER_STRIP_GATE(0x80578B94, &lit_4517); #pragma pop /* 80578B98-80578B9C 000110 0004+00 0/1 0/0 0/0 .rodata @4518 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4518 = 3000.0f; -COMPILER_STRIP_GATE(80578B98, &lit_4518); +COMPILER_STRIP_GATE(0x80578B98, &lit_4518); +#pragma pop + +/* 80578BA8-80578BA8 000120 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80578BDC = "Lv9_R07_pillar.dzb"; #pragma pop /* 80578BF4-80578C14 -00001 0020+00 1/0 0/0 0/0 .data l_daObjBHASHI_Method */ @@ -979,7 +993,7 @@ static bool daObjBHASHI_IsDelete(daObjBHASHI_c* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4606 = -1000.0f; -COMPILER_STRIP_GATE(80578B9C, &lit_4606); +COMPILER_STRIP_GATE(0x80578B9C, &lit_4606); #pragma pop /* 80578788-805787CC 001DA8 0044+00 1/0 0/0 0/0 .text Create__13daObjBHASHI_cFv */ @@ -995,11 +1009,11 @@ asm void daObjBHASHI_c::Create() { /* ############################################################################################## */ /* 80578BA0-80578BA4 000118 0004+00 1/1 0/0 0/0 .rodata @4626 */ SECTION_RODATA static f32 const lit_4626 = 400.0f; -COMPILER_STRIP_GATE(80578BA0, &lit_4626); +COMPILER_STRIP_GATE(0x80578BA0, &lit_4626); /* 80578BA4-80578BA8 00011C 0004+00 1/1 0/0 0/0 .rodata @4627 */ SECTION_RODATA static f32 const lit_4627 = 90.0f; -COMPILER_STRIP_GATE(80578BA4, &lit_4627); +COMPILER_STRIP_GATE(0x80578BA4, &lit_4627); /* 805787CC-805788EC 001DEC 0120+00 1/0 0/0 0/0 .text Execute__13daObjBHASHI_cFPPA3_A4_f */ @@ -1032,12 +1046,4 @@ asm void daObjBHASHI_c::Delete() { } #pragma pop -/* 80578BA8-80578BEF 000120 0047+00 4/3 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80578BA8 = "B_Hashi"; -SECTION_DEAD static char const* const stringBase_80578BB0 = "Lv9_R07_pillar.bmd"; -SECTION_DEAD static char const* const stringBase_80578BC3 = "Lv9_R07_pillar_hahen.bmd"; -SECTION_DEAD static char const* const stringBase_80578BDC = "Lv9_R07_pillar.dzb"; -#pragma pop +/* 80578BA8-80578BA8 000120 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_bhbridge/d_a_obj_bhbridge.cpp b/rel/d/a/obj/d_a_obj_bhbridge/d_a_obj_bhbridge.cpp index 96264c5a516..c8782625681 100644 --- a/rel/d/a/obj/d_a_obj_bhbridge/d_a_obj_bhbridge.cpp +++ b/rel/d/a/obj/d_a_obj_bhbridge/d_a_obj_bhbridge.cpp @@ -111,10 +111,10 @@ struct cBgS { /* 800744A0 */ void GroundCross(cBgS_GndChk*); }; -struct Vec {}; - struct JAISoundID {}; +struct Vec {}; + struct Z2SeMgr { /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); /* 802AC50C */ void seStartLevel(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); @@ -223,7 +223,7 @@ extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; SECTION_RODATA static u8 const lit_3655[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BB5F00, &lit_3655); +COMPILER_STRIP_GATE(0x80BB5F00, &lit_3655); /* 80BB5318-80BB5380 000078 0068+00 1/1 0/0 0/0 .text RideOn_Angle__15daObjBhbridge_cFRsfsf */ #pragma push @@ -250,7 +250,7 @@ SECTION_RODATA static u8 const lit_3703[4 + 4 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BB5F08, &lit_3703); +COMPILER_STRIP_GATE(0x80BB5F08, &lit_3703); #pragma pop /* 80BB5F10-80BB5F18 000010 0008+00 0/1 0/0 0/0 .rodata @3704 */ @@ -259,7 +259,7 @@ COMPILER_STRIP_GATE(80BB5F08, &lit_3703); SECTION_RODATA static u8 const lit_3704[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BB5F10, &lit_3704); +COMPILER_STRIP_GATE(0x80BB5F10, &lit_3704); #pragma pop /* 80BB5F18-80BB5F20 000018 0008+00 0/1 0/0 0/0 .rodata @3705 */ @@ -268,7 +268,7 @@ COMPILER_STRIP_GATE(80BB5F10, &lit_3704); SECTION_RODATA static u8 const lit_3705[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BB5F18, &lit_3705); +COMPILER_STRIP_GATE(0x80BB5F18, &lit_3705); #pragma pop /* 80BB5F20-80BB5F28 000020 0008+00 0/1 0/0 0/0 .rodata @3706 */ @@ -277,28 +277,28 @@ COMPILER_STRIP_GATE(80BB5F18, &lit_3705); SECTION_RODATA static u8 const lit_3706[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BB5F20, &lit_3706); +COMPILER_STRIP_GATE(0x80BB5F20, &lit_3706); #pragma pop /* 80BB5F28-80BB5F2C 000028 0004+00 0/1 0/0 0/0 .rodata @3707 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3707 = 180.0f; -COMPILER_STRIP_GATE(80BB5F28, &lit_3707); +COMPILER_STRIP_GATE(0x80BB5F28, &lit_3707); #pragma pop /* 80BB5F2C-80BB5F30 00002C 0004+00 0/2 0/0 0/0 .rodata @3708 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3708 = 1.0f / 20.0f; -COMPILER_STRIP_GATE(80BB5F2C, &lit_3708); +COMPILER_STRIP_GATE(0x80BB5F2C, &lit_3708); #pragma pop /* 80BB5F30-80BB5F34 000030 0004+00 0/3 0/0 0/0 .rodata @3709 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3709 = 100.0f; -COMPILER_STRIP_GATE(80BB5F30, &lit_3709); +COMPILER_STRIP_GATE(0x80BB5F30, &lit_3709); #pragma pop /* 80BB5380-80BB558C 0000E0 020C+00 1/1 0/0 0/0 .text Check_RideOn__15daObjBhbridge_cFv @@ -335,11 +335,11 @@ asm void daObjBhbridge_c::setBaseMtx() { /* ############################################################################################## */ /* 80BB5F34-80BB5F38 000034 0004+00 1/2 0/0 0/0 .rodata @3758 */ SECTION_RODATA static f32 const lit_3758 = -1.0f; -COMPILER_STRIP_GATE(80BB5F34, &lit_3758); +COMPILER_STRIP_GATE(0x80BB5F34, &lit_3758); /* 80BB5F38-80BB5F3C 000038 0004+00 1/1 0/0 0/0 .rodata @3759 */ SECTION_RODATA static f32 const lit_3759 = -6.0f; -COMPILER_STRIP_GATE(80BB5F38, &lit_3759); +COMPILER_STRIP_GATE(0x80BB5F38, &lit_3759); /* 80BB5614-80BB5678 000374 0064+00 1/1 0/0 0/0 .text * rideCallBack__FP4dBgWP10fopAc_ac_cP10fopAc_ac_c */ @@ -394,14 +394,21 @@ static asm void daObjBhbridge_Delete(daObjBhbridge_c* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3833 = 300.0f; -COMPILER_STRIP_GATE(80BB5F3C, &lit_3833); +COMPILER_STRIP_GATE(0x80BB5F3C, &lit_3833); #pragma pop /* 80BB5F40-80BB5F44 000040 0004+00 0/1 0/0 0/0 .rodata @3834 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3834 = -1000000000.0f; -COMPILER_STRIP_GATE(80BB5F40, &lit_3834); +COMPILER_STRIP_GATE(0x80BB5F40, &lit_3834); +#pragma pop + +/* 80BB5F84-80BB5F84 000084 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80BB5F84 = "BHBridge"; +SECTION_DEAD static char const* const stringBase_80BB5F8D = "M_BHbridge.dzb"; #pragma pop /* 80BB5FAC-80BB5FB0 -00001 0004+00 3/3 0/0 0/0 .data l_arcName */ @@ -476,6 +483,13 @@ asm dBgS_ObjAcch::~dBgS_ObjAcch() { } #pragma pop +/* ############################################################################################## */ +/* 80BB5F84-80BB5F84 000084 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80BB5F9C = "M_BHbridge.bmd"; +#pragma pop + /* 80BB5934-80BB59AC 000694 0078+00 1/0 0/0 0/0 .text CreateHeap__15daObjBhbridge_cFv */ #pragma push #pragma optimization_level 0 @@ -491,35 +505,35 @@ asm void daObjBhbridge_c::CreateHeap() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3853 = -400.0f; -COMPILER_STRIP_GATE(80BB5F44, &lit_3853); +COMPILER_STRIP_GATE(0x80BB5F44, &lit_3853); #pragma pop /* 80BB5F48-80BB5F4C 000048 0004+00 0/1 0/0 0/0 .rodata @3854 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3854 = -800.0f; -COMPILER_STRIP_GATE(80BB5F48, &lit_3854); +COMPILER_STRIP_GATE(0x80BB5F48, &lit_3854); #pragma pop /* 80BB5F4C-80BB5F50 00004C 0004+00 0/1 0/0 0/0 .rodata @3855 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3855 = -1000.0f; -COMPILER_STRIP_GATE(80BB5F4C, &lit_3855); +COMPILER_STRIP_GATE(0x80BB5F4C, &lit_3855); #pragma pop /* 80BB5F50-80BB5F54 000050 0004+00 0/1 0/0 0/0 .rodata @3856 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3856 = 400.0f; -COMPILER_STRIP_GATE(80BB5F50, &lit_3856); +COMPILER_STRIP_GATE(0x80BB5F50, &lit_3856); #pragma pop /* 80BB5F54-80BB5F58 000054 0004+00 0/1 0/0 0/0 .rodata @3857 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3857 = 1000.0f; -COMPILER_STRIP_GATE(80BB5F54, &lit_3857); +COMPILER_STRIP_GATE(0x80BB5F54, &lit_3857); #pragma pop /* 80BB59AC-80BB5A14 00070C 0068+00 1/0 0/0 0/0 .text Create__15daObjBhbridge_cFv */ @@ -537,77 +551,77 @@ asm void daObjBhbridge_c::Create() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3891 = 1.0f; -COMPILER_STRIP_GATE(80BB5F58, &lit_3891); +COMPILER_STRIP_GATE(0x80BB5F58, &lit_3891); #pragma pop /* 80BB5F5C-80BB5F60 00005C 0004+00 0/1 0/0 0/0 .rodata @3892 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3892 = 848.0f; -COMPILER_STRIP_GATE(80BB5F5C, &lit_3892); +COMPILER_STRIP_GATE(0x80BB5F5C, &lit_3892); #pragma pop /* 80BB5F60-80BB5F64 000060 0004+00 0/1 0/0 0/0 .rodata @3893 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3893 = 2.0f; -COMPILER_STRIP_GATE(80BB5F60, &lit_3893); +COMPILER_STRIP_GATE(0x80BB5F60, &lit_3893); #pragma pop /* 80BB5F64-80BB5F68 000064 0004+00 0/1 0/0 0/0 .rodata @3894 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3894 = 512.0f; -COMPILER_STRIP_GATE(80BB5F64, &lit_3894); +COMPILER_STRIP_GATE(0x80BB5F64, &lit_3894); #pragma pop /* 80BB5F68-80BB5F6C 000068 0004+00 0/1 0/0 0/0 .rodata @3895 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3895 = 256.0f; -COMPILER_STRIP_GATE(80BB5F68, &lit_3895); +COMPILER_STRIP_GATE(0x80BB5F68, &lit_3895); #pragma pop /* 80BB5F6C-80BB5F70 00006C 0004+00 0/1 0/0 0/0 .rodata @3896 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3896 = 11.0f; -COMPILER_STRIP_GATE(80BB5F6C, &lit_3896); +COMPILER_STRIP_GATE(0x80BB5F6C, &lit_3896); #pragma pop /* 80BB5F70-80BB5F74 000070 0004+00 0/1 0/0 0/0 .rodata @3897 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3897 = 5.0f; -COMPILER_STRIP_GATE(80BB5F70, &lit_3897); +COMPILER_STRIP_GATE(0x80BB5F70, &lit_3897); #pragma pop /* 80BB5F74-80BB5F78 000074 0004+00 0/1 0/0 0/0 .rodata @3898 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3898 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(80BB5F74, &lit_3898); +COMPILER_STRIP_GATE(0x80BB5F74, &lit_3898); #pragma pop /* 80BB5F78-80BB5F7C 000078 0004+00 0/1 0/0 0/0 .rodata @3899 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3899 = 15.0f; -COMPILER_STRIP_GATE(80BB5F78, &lit_3899); +COMPILER_STRIP_GATE(0x80BB5F78, &lit_3899); #pragma pop /* 80BB5F7C-80BB5F80 00007C 0004+00 0/1 0/0 0/0 .rodata @3900 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3900 = 0.5f; -COMPILER_STRIP_GATE(80BB5F7C, &lit_3900); +COMPILER_STRIP_GATE(0x80BB5F7C, &lit_3900); #pragma pop /* 80BB5F80-80BB5F84 000080 0004+00 0/1 0/0 0/0 .rodata @3901 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3901 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(80BB5F80, &lit_3901); +COMPILER_STRIP_GATE(0x80BB5F80, &lit_3901); #pragma pop /* 80BB5A14-80BB5E10 000774 03FC+00 1/0 0/0 0/0 .text Execute__15daObjBhbridge_cFPPA3_A4_f */ @@ -660,11 +674,4 @@ static asm void func_80BB5EF0() { } #pragma pop -/* 80BB5F84-80BB5FAB 000084 0027+00 3/2 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80BB5F84 = "BHBridge"; -SECTION_DEAD static char const* const stringBase_80BB5F8D = "M_BHbridge.dzb"; -SECTION_DEAD static char const* const stringBase_80BB5F9C = "M_BHbridge.bmd"; -#pragma pop +/* 80BB5F84-80BB5F84 000084 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_bk_leaf/d_a_obj_bk_leaf.cpp b/rel/d/a/obj/d_a_obj_bk_leaf/d_a_obj_bk_leaf.cpp index 1ee405014ce..f7de8f2cdc5 100644 --- a/rel/d/a/obj/d_a_obj_bk_leaf/d_a_obj_bk_leaf.cpp +++ b/rel/d/a/obj/d_a_obj_bk_leaf/d_a_obj_bk_leaf.cpp @@ -179,7 +179,15 @@ asm void daBkLeaf_c::Create() { /* ############################################################################################## */ /* 80BB6710-80BB6714 000000 0004+00 2/2 0/0 0/0 .rodata @3742 */ SECTION_RODATA static f32 const lit_3742 = 1.0f; -COMPILER_STRIP_GATE(80BB6710, &lit_3742); +COMPILER_STRIP_GATE(0x80BB6710, &lit_3742); + +/* 80BB6718-80BB6718 000008 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80BB6718 = "Obj_bkl"; +SECTION_DEAD static char const* const stringBase_80BB6720 = "hl.bmd"; +SECTION_DEAD static char const* const stringBase_80BB6727 = "hl_shake1.bck"; +#pragma pop /* 80BB6738-80BB6744 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { @@ -281,7 +289,7 @@ SECTION_RODATA static u8 const lit_3811[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BB6714, &lit_3811); +COMPILER_STRIP_GATE(0x80BB6714, &lit_3811); /* 80BB64A8-80BB65C4 000448 011C+00 1/1 0/0 0/0 .text execute__10daBkLeaf_cFv */ #pragma push @@ -353,11 +361,4 @@ static asm void daBkLeaf_Create(fopAc_ac_c* param_0) { } #pragma pop -/* 80BB6718-80BB6735 000008 001D+00 3/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80BB6718 = "Obj_bkl"; -SECTION_DEAD static char const* const stringBase_80BB6720 = "hl.bmd"; -SECTION_DEAD static char const* const stringBase_80BB6727 = "hl_shake1.bck"; -#pragma pop +/* 80BB6718-80BB6718 000008 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_bkdoor/d_a_obj_bkdoor.cpp b/rel/d/a/obj/d_a_obj_bkdoor/d_a_obj_bkdoor.cpp index 4b2b3f6ad4e..41305057cea 100644 --- a/rel/d/a/obj/d_a_obj_bkdoor/d_a_obj_bkdoor.cpp +++ b/rel/d/a/obj/d_a_obj_bkdoor/d_a_obj_bkdoor.cpp @@ -75,10 +75,10 @@ struct dBgS_MoveBgActor { /* 80078950 */ void MoveBGExecute(); }; -struct Vec {}; - struct JAISoundID {}; +struct Vec {}; + struct Z2SeMgr { /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); }; @@ -195,13 +195,13 @@ asm void daObjBkDoor_c::setBaseMtx() { SECTION_RODATA static u8 const l_bmd[8] = { 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x05, }; -COMPILER_STRIP_GATE(80579490, &l_bmd); +COMPILER_STRIP_GATE(0x80579490, &l_bmd); /* 80579498-805794A0 000008 0008+00 1/1 0/0 0/0 .rodata l_dzb */ SECTION_RODATA static u8 const l_dzb[8] = { 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x09, }; -COMPILER_STRIP_GATE(80579498, &l_dzb); +COMPILER_STRIP_GATE(0x80579498, &l_dzb); /* 805794A0-805794B4 000010 0014+00 0/0 0/0 0/0 .rodata l_col_offsetX */ #pragma push @@ -210,7 +210,7 @@ SECTION_RODATA static u8 const l_col_offsetX[20] = { 0x42, 0xA0, 0x00, 0x00, 0x43, 0x20, 0x00, 0x00, 0x43, 0x70, 0x00, 0x00, 0x43, 0xA0, 0x00, 0x00, 0x43, 0xC8, 0x00, 0x00, }; -COMPILER_STRIP_GATE(805794A0, &l_col_offsetX); +COMPILER_STRIP_GATE(0x805794A0, &l_col_offsetX); #pragma pop /* 805794B4-805794E4 000024 0030+00 0/1 0/0 0/0 .rodata l_roll_crash_check_areaL */ @@ -221,7 +221,7 @@ SECTION_RODATA static u8 const l_roll_crash_check_areaL[48] = { 0x00, 0x00, 0x00, 0x00, 0xC3, 0x0C, 0x00, 0x00, 0x44, 0x89, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x43, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x43, 0x0C, 0x00, 0x00, }; -COMPILER_STRIP_GATE(805794B4, &l_roll_crash_check_areaL); +COMPILER_STRIP_GATE(0x805794B4, &l_roll_crash_check_areaL); #pragma pop /* 805794E4-80579514 000054 0030+00 0/1 0/0 0/0 .rodata l_roll_crash_check_areaR */ @@ -232,12 +232,12 @@ SECTION_RODATA static u8 const l_roll_crash_check_areaR[48] = { 0x00, 0x00, 0x00, 0x00, 0xC3, 0x0C, 0x00, 0x00, 0xC4, 0x89, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x43, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x43, 0x0C, 0x00, 0x00, }; -COMPILER_STRIP_GATE(805794E4, &l_roll_crash_check_areaR); +COMPILER_STRIP_GATE(0x805794E4, &l_roll_crash_check_areaR); #pragma pop /* 80579514-80579518 000084 0004+00 1/1 0/0 0/0 .rodata @3702 */ SECTION_RODATA static f32 const lit_3702 = 2.0f; -COMPILER_STRIP_GATE(80579514, &lit_3702); +COMPILER_STRIP_GATE(0x80579514, &lit_3702); /* 80578E14-80578EA0 000174 008C+00 1/0 0/0 0/0 .text Create__13daObjBkDoor_cFv */ #pragma push @@ -250,6 +250,12 @@ asm void daObjBkDoor_c::Create() { #pragma pop /* ############################################################################################## */ +/* 80579538-80579538 0000A8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80579538 = "A_BkDoor"; +#pragma pop + /* 80579544-80579548 -00001 0004+00 3/3 0/0 0/0 .data l_arcName */ SECTION_DATA static void* l_arcName = (void*)&d_a_obj_bkdoor__stringBase0; @@ -288,56 +294,56 @@ asm void daObjBkDoor_c::openCheck() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3817 = -600.0f; -COMPILER_STRIP_GATE(80579518, &lit_3817); +COMPILER_STRIP_GATE(0x80579518, &lit_3817); #pragma pop /* 8057951C-80579520 00008C 0004+00 0/1 0/0 0/0 .rodata @3818 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3818 = 600.0f; -COMPILER_STRIP_GATE(8057951C, &lit_3818); +COMPILER_STRIP_GATE(0x8057951C, &lit_3818); #pragma pop /* 80579520-80579524 000090 0004+00 0/1 0/0 0/0 .rodata @3819 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3819 = 700.0f; -COMPILER_STRIP_GATE(80579520, &lit_3819); +COMPILER_STRIP_GATE(0x80579520, &lit_3819); #pragma pop /* 80579524-80579528 000094 0004+00 0/1 0/0 0/0 .rodata @3820 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3820 = 1.0f; -COMPILER_STRIP_GATE(80579524, &lit_3820); +COMPILER_STRIP_GATE(0x80579524, &lit_3820); #pragma pop /* 80579528-8057952C 000098 0004+00 0/1 0/0 0/0 .rodata @3821 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3821 = -1.0f; -COMPILER_STRIP_GATE(80579528, &lit_3821); +COMPILER_STRIP_GATE(0x80579528, &lit_3821); #pragma pop /* 8057952C-80579530 00009C 0004+00 0/1 0/0 0/0 .rodata @3822 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3822 = -700.0f; -COMPILER_STRIP_GATE(8057952C, &lit_3822); +COMPILER_STRIP_GATE(0x8057952C, &lit_3822); #pragma pop /* 80579530-80579534 0000A0 0004+00 0/1 0/0 0/0 .rodata @3823 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3823 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(80579530, &lit_3823); +COMPILER_STRIP_GATE(0x80579530, &lit_3823); #pragma pop /* 80579534-80579538 0000A4 0004+00 0/1 0/0 0/0 .rodata @3824 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3824 = 20.0f; -COMPILER_STRIP_GATE(80579534, &lit_3824); +COMPILER_STRIP_GATE(0x80579534, &lit_3824); #pragma pop /* 8057902C-805792E4 00038C 02B8+00 1/0 0/0 0/0 .text Execute__13daObjBkDoor_cFPPA3_A4_f @@ -450,9 +456,4 @@ static asm void daObjBkDoor_MoveBGDraw(daObjBkDoor_c* param_0) { } #pragma pop -/* 80579538-80579541 0000A8 0009+00 1/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80579538 = "A_BkDoor"; -#pragma pop +/* 80579538-80579538 0000A8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_bky_rock/d_a_obj_bky_rock.cpp b/rel/d/a/obj/d_a_obj_bky_rock/d_a_obj_bky_rock.cpp index 8186c67c173..f113dc645d7 100644 --- a/rel/d/a/obj/d_a_obj_bky_rock/d_a_obj_bky_rock.cpp +++ b/rel/d/a/obj/d_a_obj_bky_rock/d_a_obj_bky_rock.cpp @@ -89,12 +89,12 @@ struct dRes_control_c { struct dPa_levelEcallBack {}; -struct _GXColor {}; - struct csXyz { /* 802673F4 */ csXyz(s16, s16, s16); }; +struct _GXColor {}; + struct dPa_control_c { /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, @@ -180,10 +180,10 @@ struct cBgS { /* 80074250 */ void Release(dBgW_Base*); }; -struct Vec {}; - struct JAISoundID {}; +struct Vec {}; + struct Z2SeMgr { /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); }; @@ -333,6 +333,12 @@ static asm void daBkyRock_c_createHeap(fopAc_ac_c* param_0) { #pragma pop /* ############################################################################################## */ +/* 80BB8014-80BB8014 000164 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80BB8014 = "BYRock"; +#pragma pop + /* 80BB801C-80BB8028 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -585,7 +591,7 @@ asm void daBkyRock_c::setModelMtx() { SECTION_RODATA static u8 const VIBMODE_POWER[12] = { 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x03, }; -COMPILER_STRIP_GATE(80BB7EB0, &VIBMODE_POWER); +COMPILER_STRIP_GATE(0x80BB7EB0, &VIBMODE_POWER); /* 80BB7EBC-80BB7EC4 00000C 0008+00 0/1 0/0 0/0 .rodata PARTICLE_SCALE */ #pragma push @@ -593,7 +599,7 @@ COMPILER_STRIP_GATE(80BB7EB0, &VIBMODE_POWER); SECTION_RODATA static u8 const PARTICLE_SCALE[8] = { 0x00, 0x00, 0x06, 0xD6, 0x00, 0x00, 0x08, 0xE3, }; -COMPILER_STRIP_GATE(80BB7EBC, &PARTICLE_SCALE); +COMPILER_STRIP_GATE(0x80BB7EBC, &PARTICLE_SCALE); #pragma pop /* 80BB7EC4-80BB7ECC 000014 0008+00 0/1 0/0 0/0 .rodata PARTICLE_OFFSET_POS_Y */ @@ -602,7 +608,7 @@ COMPILER_STRIP_GATE(80BB7EBC, &PARTICLE_SCALE); SECTION_RODATA static u8 const PARTICLE_OFFSET_POS_Y[8] = { 0x00, 0x00, 0x01, 0x68, 0x00, 0x00, 0x01, 0x2C, }; -COMPILER_STRIP_GATE(80BB7EC4, &PARTICLE_OFFSET_POS_Y); +COMPILER_STRIP_GATE(0x80BB7EC4, &PARTICLE_OFFSET_POS_Y); #pragma pop /* 80BB7ECC-80BB7ED4 00001C 0008+00 0/1 0/0 0/0 .rodata FIRST_PARTICLE_NAME */ @@ -611,7 +617,7 @@ COMPILER_STRIP_GATE(80BB7EC4, &PARTICLE_OFFSET_POS_Y); SECTION_RODATA static u8 const FIRST_PARTICLE_NAME[8] = { 0x89, 0xC4, 0x89, 0xC5, 0x89, 0xC6, 0x89, 0xC7, }; -COMPILER_STRIP_GATE(80BB7ECC, &FIRST_PARTICLE_NAME); +COMPILER_STRIP_GATE(0x80BB7ECC, &FIRST_PARTICLE_NAME); #pragma pop /* 80BB7ED4-80BB7EE0 000024 000C+00 0/1 0/0 0/0 .rodata SECOND_PARTICLE_NAME */ @@ -620,7 +626,7 @@ COMPILER_STRIP_GATE(80BB7ECC, &FIRST_PARTICLE_NAME); SECTION_RODATA static u8 const SECOND_PARTICLE_NAME[12] = { 0x89, 0xC2, 0x89, 0xC3, 0x89, 0xC4, 0x89, 0xC5, 0x89, 0xC6, 0x89, 0xC7, }; -COMPILER_STRIP_GATE(80BB7ED4, &SECOND_PARTICLE_NAME); +COMPILER_STRIP_GATE(0x80BB7ED4, &SECOND_PARTICLE_NAME); #pragma pop /* 80BB7EE0-80BB7F24 000030 0044+00 0/1 0/0 0/0 .rodata s_CcDCyl__11daBkyRock_c */ @@ -633,7 +639,7 @@ SECTION_RODATA u8 const daBkyRock_c::s_CcDCyl[68] = { 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BB7EE0, &daBkyRock_c::s_CcDCyl); +COMPILER_STRIP_GATE(0x80BB7EE0, &daBkyRock_c::s_CcDCyl); #pragma pop /* 80BB7F24-80BB7F3C 000074 0018+00 1/1 0/0 0/0 .rodata BMD_IDX$3845 */ @@ -641,7 +647,7 @@ SECTION_RODATA static u8 const BMD_IDX[24] = { 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x08, }; -COMPILER_STRIP_GATE(80BB7F24, &BMD_IDX); +COMPILER_STRIP_GATE(0x80BB7F24, &BMD_IDX); /* 80BB6FD4-80BB7144 000814 0170+00 1/1 0/0 0/0 .text createHeap__11daBkyRock_cFv */ #pragma push @@ -662,7 +668,7 @@ SECTION_RODATA static u8 const COL_OFFSET_POS[48] = { 0xC3, 0x7A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BB7F3C, &COL_OFFSET_POS); +COMPILER_STRIP_GATE(0x80BB7F3C, &COL_OFFSET_POS); #pragma pop /* 80BB7F6C-80BB7F7C 0000BC 0010+00 0/1 0/0 0/0 .rodata COL_INIT_HEIGHT$3889 */ @@ -671,7 +677,7 @@ COMPILER_STRIP_GATE(80BB7F3C, &COL_OFFSET_POS); SECTION_RODATA static u8 const COL_INIT_HEIGHT[16] = { 0x00, 0x00, 0x01, 0x90, 0x00, 0x00, 0x02, 0x8A, 0x00, 0x00, 0x03, 0x84, 0x00, 0x00, 0x03, 0x84, }; -COMPILER_STRIP_GATE(80BB7F6C, &COL_INIT_HEIGHT); +COMPILER_STRIP_GATE(0x80BB7F6C, &COL_INIT_HEIGHT); #pragma pop /* 80BB7F7C-80BB7F8C 0000CC 0010+00 0/1 0/0 0/0 .rodata COL_INIT_RADIUS$3890 */ @@ -680,42 +686,42 @@ COMPILER_STRIP_GATE(80BB7F6C, &COL_INIT_HEIGHT); SECTION_RODATA static u8 const COL_INIT_RADIUS[16] = { 0x00, 0x00, 0x00, 0xFA, 0x00, 0x00, 0x02, 0x26, 0x00, 0x00, 0x02, 0x8A, 0x00, 0x00, 0x03, 0x20, }; -COMPILER_STRIP_GATE(80BB7F7C, &COL_INIT_RADIUS); +COMPILER_STRIP_GATE(0x80BB7F7C, &COL_INIT_RADIUS); #pragma pop /* 80BB7F8C-80BB7F90 0000DC 0004+00 0/1 0/0 0/0 .rodata @3925 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3925 = 1.5f; -COMPILER_STRIP_GATE(80BB7F8C, &lit_3925); +COMPILER_STRIP_GATE(0x80BB7F8C, &lit_3925); #pragma pop /* 80BB7F90-80BB7F94 0000E0 0004+00 0/1 0/0 0/0 .rodata @3926 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3926 = -800.0f; -COMPILER_STRIP_GATE(80BB7F90, &lit_3926); +COMPILER_STRIP_GATE(0x80BB7F90, &lit_3926); #pragma pop /* 80BB7F94-80BB7F98 0000E4 0004+00 0/1 0/0 0/0 .rodata @3927 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3927 = -500.0f; -COMPILER_STRIP_GATE(80BB7F94, &lit_3927); +COMPILER_STRIP_GATE(0x80BB7F94, &lit_3927); #pragma pop /* 80BB7F98-80BB7F9C 0000E8 0004+00 0/2 0/0 0/0 .rodata @3928 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3928 = 800.0f; -COMPILER_STRIP_GATE(80BB7F98, &lit_3928); +COMPILER_STRIP_GATE(0x80BB7F98, &lit_3928); #pragma pop /* 80BB7F9C-80BB7FA0 0000EC 0004+00 0/1 0/0 0/0 .rodata @3929 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3929 = 1000.0f; -COMPILER_STRIP_GATE(80BB7F9C, &lit_3929); +COMPILER_STRIP_GATE(0x80BB7F9C, &lit_3929); #pragma pop /* 80BB7FA0-80BB7FA8 0000F0 0008+00 0/3 0/0 0/0 .rodata @3931 */ @@ -724,7 +730,7 @@ COMPILER_STRIP_GATE(80BB7F9C, &lit_3929); SECTION_RODATA static u8 const lit_3931[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BB7FA0, &lit_3931); +COMPILER_STRIP_GATE(0x80BB7FA0, &lit_3931); #pragma pop /* 80BB7144-80BB72FC 000984 01B8+00 1/1 0/0 0/0 .text init__11daBkyRock_cFv */ @@ -752,14 +758,14 @@ asm void daBkyRock_c::middleExe() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3961 = 1.0f; -COMPILER_STRIP_GATE(80BB7FA8, &lit_3961); +COMPILER_STRIP_GATE(0x80BB7FA8, &lit_3961); #pragma pop /* 80BB7FAC-80BB7FB0 0000FC 0004+00 0/2 0/0 0/0 .rodata @3962 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3962 = -1.0f; -COMPILER_STRIP_GATE(80BB7FAC, &lit_3962); +COMPILER_STRIP_GATE(0x80BB7FAC, &lit_3962); #pragma pop /* 80BB7364-80BB7458 000BA4 00F4+00 1/0 0/0 0/0 .text exeModeNoDamage__11daBkyRock_cFv */ @@ -792,7 +798,7 @@ SECTION_RODATA static u8 const lit_4018[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BB7FB0, &lit_4018); +COMPILER_STRIP_GATE(0x80BB7FB0, &lit_4018); #pragma pop /* 80BB75D8-80BB7690 000E18 00B8+00 1/0 0/0 0/0 .text exeModePiece__11daBkyRock_cFv */ @@ -822,7 +828,7 @@ asm void daBkyRock_c::chkHitBombArrow() { SECTION_RODATA static u8 const VIBMODE_TIMER[8] = { 0x00, 0x00, 0x00, 0x1E, 0x00, 0x00, 0x00, 0x28, }; -COMPILER_STRIP_GATE(80BB7FB4, &VIBMODE_TIMER); +COMPILER_STRIP_GATE(0x80BB7FB4, &VIBMODE_TIMER); #pragma pop /* 80BB776C-80BB77FC 000FAC 0090+00 2/2 0/0 0/0 .text initChangeModeBefore__11daBkyRock_cFv */ @@ -850,49 +856,49 @@ asm void daBkyRock_c::initChangeModeAfter() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4086 = 150.0f; -COMPILER_STRIP_GATE(80BB7FBC, &lit_4086); +COMPILER_STRIP_GATE(0x80BB7FBC, &lit_4086); #pragma pop /* 80BB7FC0-80BB7FC4 000110 0004+00 0/1 0/0 0/0 .rodata @4087 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4087 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(80BB7FC0, &lit_4087); +COMPILER_STRIP_GATE(0x80BB7FC0, &lit_4087); #pragma pop /* 80BB7FC4-80BB7FC8 000114 0004+00 0/1 0/0 0/0 .rodata @4088 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4088 = 15.0f; -COMPILER_STRIP_GATE(80BB7FC4, &lit_4088); +COMPILER_STRIP_GATE(0x80BB7FC4, &lit_4088); #pragma pop /* 80BB7FC8-80BB7FCC 000118 0004+00 0/1 0/0 0/0 .rodata @4089 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4089 = 2.0f; -COMPILER_STRIP_GATE(80BB7FC8, &lit_4089); +COMPILER_STRIP_GATE(0x80BB7FC8, &lit_4089); #pragma pop /* 80BB7FCC-80BB7FD0 00011C 0004+00 0/1 0/0 0/0 .rodata @4090 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4090 = 8.0f; -COMPILER_STRIP_GATE(80BB7FCC, &lit_4090); +COMPILER_STRIP_GATE(0x80BB7FCC, &lit_4090); #pragma pop /* 80BB7FD0-80BB7FD4 000120 0004+00 0/1 0/0 0/0 .rodata @4091 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4091 = 9.0f / 10.0f; -COMPILER_STRIP_GATE(80BB7FD0, &lit_4091); +COMPILER_STRIP_GATE(0x80BB7FD0, &lit_4091); #pragma pop /* 80BB7FD4-80BB7FD8 000124 0004+00 0/1 0/0 0/0 .rodata @4092 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4092 = 1.0f / 20.0f; -COMPILER_STRIP_GATE(80BB7FD4, &lit_4092); +COMPILER_STRIP_GATE(0x80BB7FD4, &lit_4092); #pragma pop /* 80BB7818-80BB7988 001058 0170+00 2/2 0/0 0/0 .text pieceMove__11daBkyRock_cFv */ @@ -912,7 +918,7 @@ asm void daBkyRock_c::pieceMove() { SECTION_RODATA static u8 const DROP_OFFSET_POS[8] = { 0x00, 0x00, 0x01, 0x5E, 0x00, 0x00, 0x0D, 0xAC, }; -COMPILER_STRIP_GATE(80BB7FD8, &DROP_OFFSET_POS); +COMPILER_STRIP_GATE(0x80BB7FD8, &DROP_OFFSET_POS); #pragma pop /* 80BB7FE0-80BB7FE8 000130 0008+00 0/1 0/0 0/0 .rodata INIT_SPEED_Y_BASE$4097 */ @@ -921,7 +927,7 @@ COMPILER_STRIP_GATE(80BB7FD8, &DROP_OFFSET_POS); SECTION_RODATA static u8 const INIT_SPEED_Y_BASE[8] = { 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x28, }; -COMPILER_STRIP_GATE(80BB7FE0, &INIT_SPEED_Y_BASE); +COMPILER_STRIP_GATE(0x80BB7FE0, &INIT_SPEED_Y_BASE); #pragma pop /* 80BB7FE8-80BB7FF0 000138 0008+00 0/1 0/0 0/0 .rodata INIT_SPEED_Y_RANGE$4098 */ @@ -930,7 +936,7 @@ COMPILER_STRIP_GATE(80BB7FE0, &INIT_SPEED_Y_BASE); SECTION_RODATA static u8 const INIT_SPEED_Y_RANGE[8] = { 0x00, 0x00, 0x00, 0x3C, 0x00, 0x00, 0x00, 0x78, }; -COMPILER_STRIP_GATE(80BB7FE8, &INIT_SPEED_Y_RANGE); +COMPILER_STRIP_GATE(0x80BB7FE8, &INIT_SPEED_Y_RANGE); #pragma pop /* 80BB7FF0-80BB7FF8 000140 0008+00 0/1 0/0 0/0 .rodata PIECE_SCALE_RANGE$4099 */ @@ -939,7 +945,7 @@ COMPILER_STRIP_GATE(80BB7FE8, &INIT_SPEED_Y_RANGE); SECTION_RODATA static u8 const PIECE_SCALE_RANGE[8] = { 0x00, 0x00, 0x00, 0x19, 0x00, 0x00, 0x00, 0x23, }; -COMPILER_STRIP_GATE(80BB7FF0, &PIECE_SCALE_RANGE); +COMPILER_STRIP_GATE(0x80BB7FF0, &PIECE_SCALE_RANGE); #pragma pop /* 80BB7FF8-80BB8000 000148 0008+00 0/1 0/0 0/0 .rodata PIECE_SCALE_BASE$4100 */ @@ -948,35 +954,35 @@ COMPILER_STRIP_GATE(80BB7FF0, &PIECE_SCALE_RANGE); SECTION_RODATA static u8 const PIECE_SCALE_BASE[8] = { 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x14, }; -COMPILER_STRIP_GATE(80BB7FF8, &PIECE_SCALE_BASE); +COMPILER_STRIP_GATE(0x80BB7FF8, &PIECE_SCALE_BASE); #pragma pop /* 80BB8000-80BB8004 000150 0004+00 0/1 0/0 0/0 .rodata @4120 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4120 = 500.0f; -COMPILER_STRIP_GATE(80BB8000, &lit_4120); +COMPILER_STRIP_GATE(0x80BB8000, &lit_4120); #pragma pop /* 80BB8004-80BB8008 000154 0004+00 0/1 0/0 0/0 .rodata @4121 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4121 = 1.0f / 100.0f; -COMPILER_STRIP_GATE(80BB8004, &lit_4121); +COMPILER_STRIP_GATE(0x80BB8004, &lit_4121); #pragma pop /* 80BB8008-80BB800C 000158 0004+00 0/1 0/0 0/0 .rodata @4122 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4122 = 65535.0f; -COMPILER_STRIP_GATE(80BB8008, &lit_4122); +COMPILER_STRIP_GATE(0x80BB8008, &lit_4122); #pragma pop /* 80BB800C-80BB8010 00015C 0004+00 0/1 0/0 0/0 .rodata @4123 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4123 = 4096.0f; -COMPILER_STRIP_GATE(80BB800C, &lit_4123); +COMPILER_STRIP_GATE(0x80BB800C, &lit_4123); #pragma pop /* 80BB7988-80BB7C18 0011C8 0290+00 1/1 0/0 0/0 .text pieceMoveInit__11daBkyRock_cFv */ @@ -994,7 +1000,7 @@ asm void daBkyRock_c::pieceMoveInit() { #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4165 = 0x3A83126F; -COMPILER_STRIP_GATE(80BB8010, &lit_4165); +COMPILER_STRIP_GATE(0x80BB8010, &lit_4165); #pragma pop /* 80BB7C18-80BB7D50 001458 0138+00 2/2 0/0 0/0 .text callBombEmt__11daBkyRock_cFiPCUs */ @@ -1072,12 +1078,7 @@ asm void __sinit_d_a_obj_bky_rock_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80BB7E4C = (void*)__sinit_d_a_obj_bky_rock_cpp; +REGISTER_CTORS(0x80BB7E4C, __sinit_d_a_obj_bky_rock_cpp); #pragma pop -/* 80BB8014-80BB801B 000164 0007+00 1/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80BB8014 = "BYRock"; -#pragma pop +/* 80BB8014-80BB8014 000164 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_bmWindow/d_a_obj_bmWindow.cpp b/rel/d/a/obj/d_a_obj_bmWindow/d_a_obj_bmWindow.cpp index 9bb0f651d8e..1badf40ba1a 100644 --- a/rel/d/a/obj/d_a_obj_bmWindow/d_a_obj_bmWindow.cpp +++ b/rel/d/a/obj/d_a_obj_bmWindow/d_a_obj_bmWindow.cpp @@ -87,10 +87,10 @@ struct dRes_control_c { struct dPa_levelEcallBack {}; -struct _GXColor {}; - struct csXyz {}; +struct _GXColor {}; + struct dPa_control_c { /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, @@ -305,62 +305,62 @@ extern "C" void __register_global_object(); /* ############################################################################################## */ /* 80BB973C-80BB9740 000000 0004+00 5/5 0/0 0/0 .rodata @3653 */ SECTION_RODATA static f32 const lit_3653 = 90.0f; -COMPILER_STRIP_GATE(80BB973C, &lit_3653); +COMPILER_STRIP_GATE(0x80BB973C, &lit_3653); /* 80BB9740-80BB9744 000004 0004+00 0/1 0/0 0/0 .rodata @3654 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3654 = 45.0f; -COMPILER_STRIP_GATE(80BB9740, &lit_3654); +COMPILER_STRIP_GATE(0x80BB9740, &lit_3654); #pragma pop /* 80BB9744-80BB9748 000008 0004+00 0/1 0/0 0/0 .rodata @3655 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3655 = 100.0f; -COMPILER_STRIP_GATE(80BB9744, &lit_3655); +COMPILER_STRIP_GATE(0x80BB9744, &lit_3655); #pragma pop /* 80BB9748-80BB974C 00000C 0004+00 0/1 0/0 0/0 .rodata @3656 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3656 = 1.0f / 20.0f; -COMPILER_STRIP_GATE(80BB9748, &lit_3656); +COMPILER_STRIP_GATE(0x80BB9748, &lit_3656); #pragma pop /* 80BB974C-80BB9750 000010 0004+00 0/1 0/0 0/0 .rodata @3657 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3657 = 5.0f; -COMPILER_STRIP_GATE(80BB974C, &lit_3657); +COMPILER_STRIP_GATE(0x80BB974C, &lit_3657); #pragma pop /* 80BB9750-80BB9754 000014 0004+00 0/1 0/0 0/0 .rodata @3658 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3658 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(80BB9750, &lit_3658); +COMPILER_STRIP_GATE(0x80BB9750, &lit_3658); #pragma pop /* 80BB9754-80BB9758 000018 0004+00 0/1 0/0 0/0 .rodata @3659 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3659 = 3.0f; -COMPILER_STRIP_GATE(80BB9754, &lit_3659); +COMPILER_STRIP_GATE(0x80BB9754, &lit_3659); #pragma pop /* 80BB9758-80BB975C 00001C 0004+00 0/1 0/0 0/0 .rodata @3660 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3660 = 1.0f / 100.0f; -COMPILER_STRIP_GATE(80BB9758, &lit_3660); +COMPILER_STRIP_GATE(0x80BB9758, &lit_3660); #pragma pop /* 80BB975C-80BB9760 000020 0004+00 0/6 0/0 0/0 .rodata @3661 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3661 = 1.0f; -COMPILER_STRIP_GATE(80BB975C, &lit_3661); +COMPILER_STRIP_GATE(0x80BB975C, &lit_3661); #pragma pop /* 80BB980C-80BB9818 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ @@ -555,6 +555,13 @@ asm void daBmWindow_c::setBaseMtx() { } #pragma pop +/* ############################################################################################## */ +/* 80BB9800-80BB9800 0000C4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80BB9800 = "H_Window"; +#pragma pop + /* 80BB8400-80BB846C 0002E0 006C+00 1/0 0/0 0/0 .text CreateHeap__12daBmWindow_cFv */ #pragma push #pragma optimization_level 0 @@ -572,7 +579,7 @@ SECTION_RODATA u8 const daBmWindow_c::mCcDObjInfo[48] = { 0xD8, 0xFA, 0xFD, 0xBF, 0x00, 0x00, 0x00, 0x11, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA6, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BB9760, &daBmWindow_c::mCcDObjInfo); +COMPILER_STRIP_GATE(0x80BB9760, &daBmWindow_c::mCcDObjInfo); /* 80BB9790-80BB97C0 000054 0030+00 0/1 0/0 0/0 .rodata l_check_area */ #pragma push @@ -582,7 +589,7 @@ SECTION_RODATA static u8 const l_check_area[48] = { 0x43, 0x91, 0x00, 0x00, 0xC3, 0x48, 0x00, 0x00, 0x42, 0xC8, 0x00, 0x00, 0x43, 0x91, 0x00, 0x00, 0x43, 0x48, 0x00, 0x00, 0x42, 0xC8, 0x00, 0x00, 0xC2, 0x48, 0x00, 0x00, 0x43, 0x48, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BB9790, &l_check_area); +COMPILER_STRIP_GATE(0x80BB9790, &l_check_area); #pragma pop /* 80BB97C0-80BB97C4 000084 0004+00 2/5 0/0 0/0 .rodata @3769 */ @@ -592,7 +599,7 @@ SECTION_RODATA static u8 const lit_3769[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BB97C0, &lit_3769); +COMPILER_STRIP_GATE(0x80BB97C0, &lit_3769); /* 80BB846C-80BB869C 00034C 0230+00 1/1 0/0 0/0 .text create__12daBmWindow_cFv */ #pragma push @@ -668,7 +675,7 @@ asm void daBmWindow_c::Execute(f32 (**param_0)[3][4]) { /* ############################################################################################## */ /* 80BB97C4-80BB97C8 000088 0004+00 1/1 0/0 0/0 .rodata @3897 */ SECTION_RODATA static u32 const lit_3897 = 0x43360B61; -COMPILER_STRIP_GATE(80BB97C4, &lit_3897); +COMPILER_STRIP_GATE(0x80BB97C4, &lit_3897); /* 80BB9990-80BB999C 000008 000C+00 1/1 0/0 0/0 .bss @3645 */ static u8 lit_3645[12]; @@ -704,49 +711,49 @@ asm void daBmWindow_c::init_modeWait() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3997 = 200.0f; -COMPILER_STRIP_GATE(80BB97C8, &lit_3997); +COMPILER_STRIP_GATE(0x80BB97C8, &lit_3997); #pragma pop /* 80BB97CC-80BB97D0 000090 0004+00 0/3 0/0 0/0 .rodata @3998 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3998 = -1.0f; -COMPILER_STRIP_GATE(80BB97CC, &lit_3998); +COMPILER_STRIP_GATE(0x80BB97CC, &lit_3998); #pragma pop /* 80BB97D0-80BB97D4 000094 0004+00 0/1 0/0 0/0 .rodata @3999 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3999 = 30.0f; -COMPILER_STRIP_GATE(80BB97D0, &lit_3999); +COMPILER_STRIP_GATE(0x80BB97D0, &lit_3999); #pragma pop /* 80BB97D4-80BB97D8 000098 0004+00 0/1 0/0 0/0 .rodata @4000 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4000 = 10.0f; -COMPILER_STRIP_GATE(80BB97D4, &lit_4000); +COMPILER_STRIP_GATE(0x80BB97D4, &lit_4000); #pragma pop /* 80BB97D8-80BB97DC 00009C 0004+00 0/1 0/0 0/0 .rodata @4001 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4001 = 43.0f; -COMPILER_STRIP_GATE(80BB97D8, &lit_4001); +COMPILER_STRIP_GATE(0x80BB97D8, &lit_4001); #pragma pop /* 80BB97DC-80BB97E0 0000A0 0004+00 0/1 0/0 0/0 .rodata @4002 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4002 = 128.0f; -COMPILER_STRIP_GATE(80BB97DC, &lit_4002); +COMPILER_STRIP_GATE(0x80BB97DC, &lit_4002); #pragma pop /* 80BB97E0-80BB97E4 0000A4 0004+00 0/1 0/0 0/0 .rodata @4003 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4003 = 300.0f; -COMPILER_STRIP_GATE(80BB97E0, &lit_4003); +COMPILER_STRIP_GATE(0x80BB97E0, &lit_4003); #pragma pop /* 80BB97E4-80BB97EC 0000A8 0008+00 0/1 0/0 0/0 .rodata @4005 */ @@ -755,7 +762,7 @@ COMPILER_STRIP_GATE(80BB97E0, &lit_4003); SECTION_RODATA static u8 const lit_4005[8] = { 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BB97E4, &lit_4005); +COMPILER_STRIP_GATE(0x80BB97E4, &lit_4005); #pragma pop /* 80BB97EC-80BB97F4 0000B0 0008+00 0/1 0/0 0/0 .rodata @4007 */ @@ -764,7 +771,7 @@ COMPILER_STRIP_GATE(80BB97E4, &lit_4005); SECTION_RODATA static u8 const lit_4007[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BB97EC, &lit_4007); +COMPILER_STRIP_GATE(0x80BB97EC, &lit_4007); #pragma pop /* 80BB8B48-80BB8FDC 000A28 0494+00 1/0 0/0 0/0 .text modeWait__12daBmWindow_cFv */ @@ -837,7 +844,7 @@ asm void daBmWindow_c::modeBreakEff() { SECTION_RODATA static u8 const particle_id[12] = { 0x85, 0x06, 0x85, 0x07, 0x85, 0x08, 0x85, 0x09, 0x85, 0x0A, 0x85, 0x0B, }; -COMPILER_STRIP_GATE(80BB97F4, &particle_id); +COMPILER_STRIP_GATE(0x80BB97F4, &particle_id); #pragma pop /* 80BB9324-80BB9494 001204 0170+00 2/2 0/0 0/0 .text setBreakEffect__12daBmWindow_cFi */ @@ -945,12 +952,7 @@ asm void __sinit_d_a_obj_bmWindow_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80BB96B8 = (void*)__sinit_d_a_obj_bmWindow_cpp; +REGISTER_CTORS(0x80BB96B8, __sinit_d_a_obj_bmWindow_cpp); #pragma pop -/* 80BB9800-80BB9809 0000C4 0009+00 3/3 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80BB9800 = "H_Window"; -#pragma pop +/* 80BB9800-80BB9800 0000C4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_bmshutter/d_a_obj_bmshutter.cpp b/rel/d/a/obj/d_a_obj_bmshutter/d_a_obj_bmshutter.cpp index 7e496bce428..c10a565bdd5 100644 --- a/rel/d/a/obj/d_a_obj_bmshutter/d_a_obj_bmshutter.cpp +++ b/rel/d/a/obj/d_a_obj_bmshutter/d_a_obj_bmshutter.cpp @@ -94,10 +94,10 @@ struct dBgS_MoveBgActor { /* 80078950 */ void MoveBGExecute(); }; -struct Vec {}; - struct JAISoundID {}; +struct Vec {}; + struct Z2SeMgr { /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); }; @@ -205,7 +205,7 @@ SECTION_RODATA static u8 const l_cull_box[24] = { 0xC3, 0x48, 0x00, 0x00, 0xC2, 0xC8, 0x00, 0x00, 0xC3, 0x48, 0x00, 0x00, 0x43, 0x48, 0x00, 0x00, 0x42, 0xC8, 0x00, 0x00, 0x43, 0x48, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BBA7B0, &l_cull_box); +COMPILER_STRIP_GATE(0x80BBA7B0, &l_cull_box); /* 80BBA7C8-80BBA7F8 000018 0030+00 0/1 0/0 0/0 .rodata l_check_area */ #pragma push @@ -215,12 +215,12 @@ SECTION_RODATA static u8 const l_check_area[48] = { 0x00, 0x00, 0x00, 0x00, 0xC2, 0xC8, 0x00, 0x00, 0x43, 0x48, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0xC8, 0x00, 0x00, 0xC3, 0x7A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0xC8, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BBA7C8, &l_check_area); +COMPILER_STRIP_GATE(0x80BBA7C8, &l_check_area); #pragma pop /* 80BBA7F8-80BBA7FC 000048 0004+00 1/3 0/0 0/0 .rodata @3663 */ SECTION_RODATA static f32 const lit_3663 = 400.0f; -COMPILER_STRIP_GATE(80BBA7F8, &lit_3663); +COMPILER_STRIP_GATE(0x80BBA7F8, &lit_3663); /* 80BBA7FC-80BBA800 00004C 0004+00 2/5 0/0 0/0 .rodata @3664 */ SECTION_RODATA static u8 const lit_3664[4] = { @@ -229,7 +229,7 @@ SECTION_RODATA static u8 const lit_3664[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BBA7FC, &lit_3664); +COMPILER_STRIP_GATE(0x80BBA7FC, &lit_3664); /* 80BB9A58-80BB9AE4 000078 008C+00 1/1 0/0 0/0 .text initBaseMtx__11daObjBmSh_cFv */ #pragma push @@ -262,6 +262,12 @@ asm void daObjBmSh_c::Create() { #pragma pop /* ############################################################################################## */ +/* 80BBA820-80BBA820 000070 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80BBA820 = "K_saku00"; +#pragma pop + /* 80BBA82C-80BBA838 000000 000C+00 2/2 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -435,28 +441,28 @@ asm void daObjBmSh_c::create() { #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_3793 = 0x42F00001; -COMPILER_STRIP_GATE(80BBA800, &lit_3793); +COMPILER_STRIP_GATE(0x80BBA800, &lit_3793); #pragma pop /* 80BBA804-80BBA808 000054 0004+00 0/2 0/0 0/0 .rodata @3794 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3794 = 150.0f; -COMPILER_STRIP_GATE(80BBA804, &lit_3794); +COMPILER_STRIP_GATE(0x80BBA804, &lit_3794); #pragma pop /* 80BBA808-80BBA80C 000058 0004+00 0/2 0/0 0/0 .rodata @3795 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3795 = 1.0f; -COMPILER_STRIP_GATE(80BBA808, &lit_3795); +COMPILER_STRIP_GATE(0x80BBA808, &lit_3795); #pragma pop /* 80BBA80C-80BBA810 00005C 0004+00 0/2 0/0 0/0 .rodata @3796 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3796 = -1.0f; -COMPILER_STRIP_GATE(80BBA80C, &lit_3796); +COMPILER_STRIP_GATE(0x80BBA80C, &lit_3796); #pragma pop /* 80BB9DB4-80BB9F34 0003D4 0180+00 1/0 0/0 0/0 .text Execute__11daObjBmSh_cFPPA3_A4_f */ @@ -548,11 +554,11 @@ void daObjBmSh_c::actionDead() { /* ############################################################################################## */ /* 80BBA810-80BBA814 000060 0004+00 1/2 0/0 0/0 .rodata @3908 */ SECTION_RODATA static f32 const lit_3908 = 1.0f / 20.0f; -COMPILER_STRIP_GATE(80BBA810, &lit_3908); +COMPILER_STRIP_GATE(0x80BBA810, &lit_3908); /* 80BBA814-80BBA818 000064 0004+00 1/2 0/0 0/0 .rodata @3909 */ SECTION_RODATA static f32 const lit_3909 = 10.0f; -COMPILER_STRIP_GATE(80BBA814, &lit_3909); +COMPILER_STRIP_GATE(0x80BBA814, &lit_3909); /* 80BBA26C-80BBA394 00088C 0128+00 1/1 0/0 0/0 .text mode_proc_call__11daObjBmSh_cFv */ #pragma push @@ -569,7 +575,7 @@ asm void daObjBmSh_c::mode_proc_call() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3973 = -220.0f; -COMPILER_STRIP_GATE(80BBA818, &lit_3973); +COMPILER_STRIP_GATE(0x80BBA818, &lit_3973); #pragma pop /* 80BBA394-80BBA5B4 0009B4 0220+00 1/0 0/0 0/0 .text modeWait__11daObjBmSh_cFv */ @@ -587,7 +593,7 @@ asm void daObjBmSh_c::modeWait() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3981 = 2.0f; -COMPILER_STRIP_GATE(80BBA81C, &lit_3981); +COMPILER_STRIP_GATE(0x80BBA81C, &lit_3981); #pragma pop /* 80BBA5B4-80BBA640 000BD4 008C+00 1/0 0/0 0/0 .text modeMove__11daObjBmSh_cFv */ @@ -667,9 +673,4 @@ static asm void daObjBmSh_Create(fopAc_ac_c* param_0) { } #pragma pop -/* 80BBA820-80BBA829 000070 0009+00 1/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80BBA820 = "K_saku00"; -#pragma pop +/* 80BBA820-80BBA820 000070 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_bombf/d_a_obj_bombf.cpp b/rel/d/a/obj/d_a_obj_bombf/d_a_obj_bombf.cpp index 260d7d47eac..db851312472 100644 --- a/rel/d/a/obj/d_a_obj_bombf/d_a_obj_bombf.cpp +++ b/rel/d/a/obj/d_a_obj_bombf/d_a_obj_bombf.cpp @@ -123,7 +123,7 @@ SECTION_RODATA static u8 const l_arcName[6 + 2 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BBAE84, &l_arcName); +COMPILER_STRIP_GATE(0x80BBAE84, &l_arcName); /* 80BBA9F8-80BBAA64 000078 006C+00 1/1 0/0 0/0 .text createHeap__12daObjBombf_cFv */ #pragma push @@ -150,7 +150,7 @@ static asm void daObjBombf_createHeap(fopAc_ac_c* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3687 = -75.0f; -COMPILER_STRIP_GATE(80BBAE8C, &lit_3687); +COMPILER_STRIP_GATE(0x80BBAE8C, &lit_3687); #pragma pop /* 80BBAE90-80BBAE94 00000C 0004+00 0/1 0/0 0/0 .rodata @3688 */ @@ -162,21 +162,21 @@ SECTION_RODATA static u8 const lit_3688[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BBAE90, &lit_3688); +COMPILER_STRIP_GATE(0x80BBAE90, &lit_3688); #pragma pop /* 80BBAE94-80BBAE98 000010 0004+00 0/1 0/0 0/0 .rodata @3689 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3689 = 75.0f; -COMPILER_STRIP_GATE(80BBAE94, &lit_3689); +COMPILER_STRIP_GATE(0x80BBAE94, &lit_3689); #pragma pop /* 80BBAE98-80BBAE9C 000014 0004+00 0/1 0/0 0/0 .rodata @3690 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3690 = 30.0f; -COMPILER_STRIP_GATE(80BBAE98, &lit_3690); +COMPILER_STRIP_GATE(0x80BBAE98, &lit_3690); #pragma pop /* 80BBAA84-80BBAB9C 000104 0118+00 1/1 0/0 0/0 .text create__12daObjBombf_cFv */ @@ -236,7 +236,7 @@ asm void daObjBombf_c::setMatrix() { SECTION_RODATA static u8 const bombOffset[12] = { 0x00, 0x00, 0x00, 0x00, 0x40, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BBAE9C, &bombOffset); +COMPILER_STRIP_GATE(0x80BBAE9C, &bombOffset); /* 80BBACC0-80BBADD8 000340 0118+00 1/1 0/0 0/0 .text execute__12daObjBombf_cFv */ #pragma push diff --git a/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp.cpp b/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp.cpp index d66585ce067..581b7ea68d9 100644 --- a/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp.cpp +++ b/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp.cpp @@ -131,10 +131,10 @@ struct dRes_control_c { struct dPa_levelEcallBack {}; -struct _GXColor {}; - struct csXyz {}; +struct _GXColor {}; + struct dPa_control_c { /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, @@ -219,7 +219,7 @@ extern "C" static void daObjBossWarp_Draw__FP15daObjBossWarp_c(); extern "C" static void daObjBossWarp_Execute__FP15daObjBossWarp_c(); extern "C" static void daObjBossWarp_Delete__FP15daObjBossWarp_c(); extern "C" static void daObjBossWarp_Create__FP10fopAc_ac_c(); -extern "C" void func_8057B304(int*); +extern "C" void func_8057B304(void* _this, int*); extern "C" void setPos__11daObjLife_cF4cXyz(); extern "C" void setCurrentPos__16obj_ystone_classF4cXyz(); extern "C" extern char const* const d_a_obj_bosswarp__stringBase0; @@ -326,6 +326,30 @@ static asm void CheckCreateHeap(fopAc_ac_c* param_0) { #pragma pop /* ############################################################################################## */ +/* 8057B555-8057B55D 0001F5 0008+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_8057B555; + +/* 8057B55D-8057B565 0001FD 0008+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_8057B55D; + +/* 8057B565-8057B56D 000205 0008+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_8057B565; + +/* 8057B56D-8057B575 00020D 0008+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_8057B56D; + +/* 8057B575-8057B57D 000215 0008+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_8057B575; + +/* 8057B57D-8057B585 00021D 0008+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_8057B57D; + +/* 8057B585-8057B58D 000225 0008+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_8057B585; + +/* 8057B58D-8057B595 00022D 0008+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_8057B58D; + /* 8057B360-8057B3B4 000000 0054+00 5/5 0/0 0/0 .rodata l_hair_offset */ SECTION_RODATA static u8 const l_hair_offset[84] = { 0x42, 0x44, 0x00, 0x00, 0xC2, 0x08, 0x00, 0x00, 0xC0, 0x40, 0x00, 0x00, 0x42, 0x38, @@ -335,7 +359,7 @@ SECTION_RODATA static u8 const l_hair_offset[84] = { 0x00, 0x00, 0x00, 0x00, 0x42, 0x48, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0x48, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8057B360, &l_hair_offset); +COMPILER_STRIP_GATE(0x8057B360, &l_hair_offset); /* 8057B3B4-8057B408 000054 0054+00 0/1 0/0 0/0 .rodata l_hair_rotate */ #pragma push @@ -348,7 +372,7 @@ SECTION_RODATA static u8 const l_hair_rotate[84] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0xB4, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0xB4, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8057B3B4, &l_hair_rotate); +COMPILER_STRIP_GATE(0x8057B3B4, &l_hair_rotate); #pragma pop /* 8057B408-8057B42C -00001 0024+00 1/1 0/0 0/0 .rodata @3683 */ @@ -363,7 +387,29 @@ SECTION_RODATA static void* const lit_3683[9] = { (void*)(((char*)&d_a_obj_bosswarp__stringBase0) + 0xA1), (void*)(((char*)&d_a_obj_bosswarp__stringBase0) + 0x79), }; -COMPILER_STRIP_GATE(8057B408, &lit_3683); +COMPILER_STRIP_GATE(0x8057B408, &lit_3683); + +/* 8057B4EC-8057B4EC 00018C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8057B4EC = "ef_Portal"; +SECTION_DEAD static char const* const stringBase_8057B4F6 = "BOSSCLEAR01"; +SECTION_DEAD static char const* const stringBase_8057B502 = "BOSSCLEAR02"; +SECTION_DEAD static char const* const stringBase_8057B50E = "BOSSCLEAR03"; +SECTION_DEAD static char const* const stringBase_8057B51A = "BOSSCLEAR05"; +SECTION_DEAD static char const* const stringBase_8057B526 = "BOSSCLEAR06"; +SECTION_DEAD static char const* const stringBase_8057B532 = "BOSSCLEAR07"; +SECTION_DEAD static char const* const stringBase_8057B53E = "WARP_CHECK"; +SECTION_DEAD static char const* const stringBase_8057B549 = "WARP_CANCEL"; +SECTION_DEAD static char const* const stringBase_8057B555 = "D_MN05A"; +SECTION_DEAD static char const* const stringBase_8057B55D = "D_MN04A"; +SECTION_DEAD static char const* const stringBase_8057B565 = "D_MN01A"; +SECTION_DEAD static char const* const stringBase_8057B56D = "D_MN10A"; +SECTION_DEAD static char const* const stringBase_8057B575 = "D_MN11A"; +SECTION_DEAD static char const* const stringBase_8057B57D = "D_MN06A"; +SECTION_DEAD static char const* const stringBase_8057B585 = "D_MN07A"; +SECTION_DEAD static char const* const stringBase_8057B58D = "D_MN08A"; +#pragma pop /* 80579658-80579700 000098 00A8+00 3/3 0/0 0/0 .text getNowLevel__Fv */ #pragma push @@ -378,7 +424,7 @@ static asm void getNowLevel() { /* ############################################################################################## */ /* 8057B42C-8057B430 0000CC 0004+00 1/1 0/0 0/0 .rodata @3701 */ SECTION_RODATA static f32 const lit_3701 = 3.0f / 20.0f; -COMPILER_STRIP_GATE(8057B42C, &lit_3701); +COMPILER_STRIP_GATE(0x8057B42C, &lit_3701); /* 80579700-80579748 000140 0048+00 1/1 0/0 0/0 .text initBaseMtx__15daObjBossWarp_cFv */ #pragma push @@ -393,7 +439,7 @@ asm void daObjBossWarp_c::initBaseMtx() { /* ############################################################################################## */ /* 8057B430-8057B434 0000D0 0004+00 1/2 0/0 0/0 .rodata @3715 */ SECTION_RODATA static f32 const lit_3715 = 2.0f; -COMPILER_STRIP_GATE(8057B430, &lit_3715); +COMPILER_STRIP_GATE(0x8057B430, &lit_3715); /* 80579748-805797B8 000188 0070+00 2/2 0/0 0/0 .text setBaseMtx__15daObjBossWarp_cFv */ #pragma push @@ -408,7 +454,14 @@ asm void daObjBossWarp_c::setBaseMtx() { /* ############################################################################################## */ /* 8057B434-8057B438 0000D4 0004+00 1/4 0/0 0/0 .rodata @3740 */ SECTION_RODATA static f32 const lit_3740 = 1.0f; -COMPILER_STRIP_GATE(8057B434, &lit_3740); +COMPILER_STRIP_GATE(0x8057B434, &lit_3740); + +/* 8057B4EC-8057B4EC 00018C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8057B595 = "BOSS_WARPIN"; +SECTION_DEAD static char const* const stringBase_8057B5A1 = "BOSS_WARPIN_M"; +#pragma pop /* 8057B658-8057B664 000000 000C+00 2/2 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { @@ -478,7 +531,7 @@ asm void daObjBossWarp_c::Create() { SECTION_RODATA static u8 const l_btk_idx[8] = { 0x00, 0x00, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x0D, }; -COMPILER_STRIP_GATE(8057B438, &l_btk_idx); +COMPILER_STRIP_GATE(0x8057B438, &l_btk_idx); #pragma pop /* 8057B440-8057B448 0000E0 0008+00 0/1 0/0 0/0 .rodata l_play_mode$3755 */ @@ -487,7 +540,7 @@ COMPILER_STRIP_GATE(8057B438, &l_btk_idx); SECTION_RODATA static u8 const l_play_mode[8] = { 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8057B440, &l_play_mode); +COMPILER_STRIP_GATE(0x8057B440, &l_play_mode); #pragma pop /* 8057B448-8057B44C 0000E8 0004+00 0/4 0/0 0/0 .rodata @3807 */ @@ -499,7 +552,28 @@ SECTION_RODATA static u8 const lit_3807[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(8057B448, &lit_3807); +COMPILER_STRIP_GATE(0x8057B448, &lit_3807); +#pragma pop + +/* 8057B4EC-8057B4EC 00018C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8057B5AF = "WARPHOLE"; +SECTION_DEAD static char const* const stringBase_8057B5B8 = "WAIT"; +SECTION_DEAD static char const* const stringBase_8057B5BD = "APPEAR"; +SECTION_DEAD static char const* const stringBase_8057B5C4 = "DISAPPEAR"; +SECTION_DEAD static char const* const stringBase_8057B5CE = "SCENE_CHG"; +SECTION_DEAD static char const* const stringBase_8057B5D8 = "STONE_FALL"; +SECTION_DEAD static char const* const stringBase_8057B5E3 = "STONE_MIDNA"; +SECTION_DEAD static char const* const stringBase_8057B5EF = "WALK_TARGET1"; +SECTION_DEAD static char const* const stringBase_8057B5FC = "APPEAR_END"; +SECTION_DEAD static char const* const stringBase_8057B607 = "STONE_DELETE"; +SECTION_DEAD static char const* const stringBase_8057B614 = "STONE_PUTAWAY"; +SECTION_DEAD static char const* const stringBase_8057B622 = "WCHECK"; +SECTION_DEAD static char const* const stringBase_8057B629 = "SETPOS"; +SECTION_DEAD static char const* const stringBase_8057B630 = "SCALING"; +SECTION_DEAD static char const* const stringBase_8057B638 = "STONE_SCALE"; +SECTION_DEAD static char const* const stringBase_8057B644 = "HEART_MOVE"; #pragma pop /* 8057B6A8-8057B6B4 -00001 000C+00 0/1 0/0 0/0 .data @4131 */ @@ -770,7 +844,7 @@ SECTION_RODATA static u8 const l_eff_id[8 + 4 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(8057B44C, &l_eff_id); +COMPILER_STRIP_GATE(0x8057B44C, &l_eff_id); #pragma pop /* 80579C30-80579D98 000670 0168+00 3/3 0/0 0/0 .text appear__15daObjBossWarp_cFi */ @@ -788,7 +862,7 @@ asm void daObjBossWarp_c::appear(int param_0) { SECTION_RODATA static u8 const lit_3918[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8057B458, &lit_3918); +COMPILER_STRIP_GATE(0x8057B458, &lit_3918); /* 80579D98-80579E08 0007D8 0070+00 1/1 0/0 0/0 .text set_appear__15daObjBossWarp_cFv */ #pragma push @@ -817,7 +891,7 @@ asm void daObjBossWarp_c::disappear(int param_0) { SECTION_RODATA static u8 const lit_3986[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8057B460, &lit_3986); +COMPILER_STRIP_GATE(0x8057B460, &lit_3986); #pragma pop /* 8057B468-8057B470 000108 0008+00 0/1 0/0 0/0 .rodata @3987 */ @@ -826,7 +900,7 @@ COMPILER_STRIP_GATE(8057B460, &lit_3986); SECTION_RODATA static u8 const lit_3987[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8057B468, &lit_3987); +COMPILER_STRIP_GATE(0x8057B468, &lit_3987); #pragma pop /* 8057B470-8057B478 000110 0008+00 0/1 0/0 0/0 .rodata @3988 */ @@ -835,28 +909,28 @@ COMPILER_STRIP_GATE(8057B468, &lit_3987); SECTION_RODATA static u8 const lit_3988[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8057B470, &lit_3988); +COMPILER_STRIP_GATE(0x8057B470, &lit_3988); #pragma pop /* 8057B478-8057B47C 000118 0004+00 0/1 0/0 0/0 .rodata @3989 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3989 = 150.0f; -COMPILER_STRIP_GATE(8057B478, &lit_3989); +COMPILER_STRIP_GATE(0x8057B478, &lit_3989); #pragma pop /* 8057B47C-8057B480 00011C 0004+00 0/1 0/0 0/0 .rodata @3990 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3990 = 200.0f; -COMPILER_STRIP_GATE(8057B47C, &lit_3990); +COMPILER_STRIP_GATE(0x8057B47C, &lit_3990); #pragma pop /* 8057B480-8057B484 000120 0004+00 0/2 0/0 0/0 .rodata @3991 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3991 = -1.0f; -COMPILER_STRIP_GATE(8057B480, &lit_3991); +COMPILER_STRIP_GATE(0x8057B480, &lit_3991); #pragma pop /* 80579E5C-80579FF8 00089C 019C+00 2/2 0/0 0/0 .text checkDistance__15daObjBossWarp_cFv @@ -875,14 +949,14 @@ asm void daObjBossWarp_c::checkDistance() { #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4118 = 0x43360B61; -COMPILER_STRIP_GATE(8057B484, &lit_4118); +COMPILER_STRIP_GATE(0x8057B484, &lit_4118); #pragma pop /* 8057B488-8057B48C 000128 0004+00 0/1 0/0 0/0 .rodata @4119 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4119 = 2.0f / 125.0f; -COMPILER_STRIP_GATE(8057B488, &lit_4119); +COMPILER_STRIP_GATE(0x8057B488, &lit_4119); #pragma pop /* 80579FF8-8057A390 000A38 0398+00 2/2 0/0 0/0 .text execute__15daObjBossWarp_cFv */ @@ -974,7 +1048,7 @@ void daObjBossWarp_c::actionDead() { /* ############################################################################################## */ /* 8057B48C-8057B490 00012C 0004+00 1/1 0/0 0/0 .rodata @4227 */ SECTION_RODATA static f32 const lit_4227 = 100.0f; -COMPILER_STRIP_GATE(8057B48C, &lit_4227); +COMPILER_STRIP_GATE(0x8057B48C, &lit_4227); /* 8057A7C8-8057A8B4 001208 00EC+00 1/0 0/0 0/0 .text actionOrderChkEvent__15daObjBossWarp_cFv */ #pragma push @@ -1027,21 +1101,27 @@ SECTION_RODATA static u8 const l_dangeon_clr_bitNo[36] = { 0x00, 0x00, 0x01, 0x09, 0x00, 0x00, 0x01, 0x0A, 0x00, 0x00, 0x01, 0x0B, 0x00, 0x00, 0x01, 0x0C, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, }; -COMPILER_STRIP_GATE(8057B490, &l_dangeon_clr_bitNo); +COMPILER_STRIP_GATE(0x8057B490, &l_dangeon_clr_bitNo); #pragma pop /* 8057B4B4-8057B4B8 000154 0004+00 0/1 0/0 0/0 .rodata @4489 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4489 = 100000.0f; -COMPILER_STRIP_GATE(8057B4B4, &lit_4489); +COMPILER_STRIP_GATE(0x8057B4B4, &lit_4489); #pragma pop /* 8057B4B8-8057B4BC 000158 0004+00 0/1 0/0 0/0 .rodata @4490 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4490 = 900.0f; -COMPILER_STRIP_GATE(8057B4B8, &lit_4490); +COMPILER_STRIP_GATE(0x8057B4B8, &lit_4490); +#pragma pop + +/* 8057B4EC-8057B4EC 00018C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8057B64F = "Timer"; #pragma pop /* 8057AA94-8057B0D8 0014D4 0644+00 11/8 0/0 0/0 .text demoProc__15daObjBossWarp_cFv */ @@ -1059,82 +1139,82 @@ asm void daObjBossWarp_c::demoProc() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4491 = 50.0f; -COMPILER_STRIP_GATE(8057B4BC, &lit_4491); +COMPILER_STRIP_GATE(0x8057B4BC, &lit_4491); #pragma pop /* 8057B4C0-8057B4C4 000160 0004+00 0/0 0/0 0/0 .rodata @4492 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4492 = 120.0f; -COMPILER_STRIP_GATE(8057B4C0, &lit_4492); +COMPILER_STRIP_GATE(0x8057B4C0, &lit_4492); #pragma pop /* 8057B4C4-8057B4C8 000164 0004+00 0/0 0/0 0/0 .rodata @4493 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4493 = 270.0f; -COMPILER_STRIP_GATE(8057B4C4, &lit_4493); +COMPILER_STRIP_GATE(0x8057B4C4, &lit_4493); #pragma pop /* 8057B4C8-8057B4CC 000168 0004+00 0/0 0/0 0/0 .rodata @4494 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4494 = 145.0f; -COMPILER_STRIP_GATE(8057B4C8, &lit_4494); +COMPILER_STRIP_GATE(0x8057B4C8, &lit_4494); #pragma pop /* 8057B4CC-8057B4D0 00016C 0004+00 0/0 0/0 0/0 .rodata @4495 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4495 = 74.0f; -COMPILER_STRIP_GATE(8057B4CC, &lit_4495); +COMPILER_STRIP_GATE(0x8057B4CC, &lit_4495); #pragma pop /* 8057B4D0-8057B4D4 000170 0004+00 0/0 0/0 0/0 .rodata @4496 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4496 = 175.0f; -COMPILER_STRIP_GATE(8057B4D0, &lit_4496); +COMPILER_STRIP_GATE(0x8057B4D0, &lit_4496); #pragma pop /* 8057B4D4-8057B4D8 000174 0004+00 0/0 0/0 0/0 .rodata @4497 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4497 = 54.0f; -COMPILER_STRIP_GATE(8057B4D4, &lit_4497); +COMPILER_STRIP_GATE(0x8057B4D4, &lit_4497); #pragma pop /* 8057B4D8-8057B4DC 000178 0004+00 0/0 0/0 0/0 .rodata @4498 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4498 = 1.0f / 20.0f; -COMPILER_STRIP_GATE(8057B4D8, &lit_4498); +COMPILER_STRIP_GATE(0x8057B4D8, &lit_4498); #pragma pop /* 8057B4DC-8057B4E0 00017C 0004+00 0/0 0/0 0/0 .rodata @4499 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4499 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(8057B4DC, &lit_4499); +COMPILER_STRIP_GATE(0x8057B4DC, &lit_4499); #pragma pop /* 8057B4E0-8057B4E4 000180 0004+00 0/0 0/0 0/0 .rodata @4500 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4500 = 40.0f; -COMPILER_STRIP_GATE(8057B4E0, &lit_4500); +COMPILER_STRIP_GATE(0x8057B4E0, &lit_4500); #pragma pop /* 8057B4E4-8057B4E8 000184 0004+00 0/0 0/0 0/0 .rodata @4501 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4501 = 0x3D072B02; -COMPILER_STRIP_GATE(8057B4E4, &lit_4501); +COMPILER_STRIP_GATE(0x8057B4E4, &lit_4501); #pragma pop /* 8057B4E8-8057B4EC 000188 0004+00 1/1 0/0 0/0 .rodata @4541 */ SECTION_RODATA static f32 const lit_4541 = 250.0f; -COMPILER_STRIP_GATE(8057B4E8, &lit_4541); +COMPILER_STRIP_GATE(0x8057B4E8, &lit_4541); /* 8057B0D8-8057B190 001B18 00B8+00 1/1 0/0 0/0 .text setGoal__15daObjBossWarp_cFv */ #pragma push @@ -1211,7 +1291,7 @@ static asm void daObjBossWarp_Create(fopAc_ac_c* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_8057B304(int* param_0) { +extern "C" asm void func_8057B304(void* _this, int* param_0) { nofralloc #include "asm/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp/func_8057B304.s" } @@ -1237,44 +1317,4 @@ asm void obj_ystone_class::setCurrentPos(cXyz param_0) { } #pragma pop -/* 8057B4EC-8057B655 00018C 0169+00 12/6 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_8057B4EC = "ef_Portal"; -SECTION_DEAD static char const* const stringBase_8057B4F6 = "BOSSCLEAR01"; -SECTION_DEAD static char const* const stringBase_8057B502 = "BOSSCLEAR02"; -SECTION_DEAD static char const* const stringBase_8057B50E = "BOSSCLEAR03"; -SECTION_DEAD static char const* const stringBase_8057B51A = "BOSSCLEAR05"; -SECTION_DEAD static char const* const stringBase_8057B526 = "BOSSCLEAR06"; -SECTION_DEAD static char const* const stringBase_8057B532 = "BOSSCLEAR07"; -SECTION_DEAD static char const* const stringBase_8057B53E = "WARP_CHECK"; -SECTION_DEAD static char const* const stringBase_8057B549 = "WARP_CANCEL"; -SECTION_DEAD static char const* const stringBase_8057B555 = "D_MN05A"; -SECTION_DEAD static char const* const stringBase_8057B55D = "D_MN04A"; -SECTION_DEAD static char const* const stringBase_8057B565 = "D_MN01A"; -SECTION_DEAD static char const* const stringBase_8057B56D = "D_MN10A"; -SECTION_DEAD static char const* const stringBase_8057B575 = "D_MN11A"; -SECTION_DEAD static char const* const stringBase_8057B57D = "D_MN06A"; -SECTION_DEAD static char const* const stringBase_8057B585 = "D_MN07A"; -SECTION_DEAD static char const* const stringBase_8057B58D = "D_MN08A"; -SECTION_DEAD static char const* const stringBase_8057B595 = "BOSS_WARPIN"; -SECTION_DEAD static char const* const stringBase_8057B5A1 = "BOSS_WARPIN_M"; -SECTION_DEAD static char const* const stringBase_8057B5AF = "WARPHOLE"; -SECTION_DEAD static char const* const stringBase_8057B5B8 = "WAIT"; -SECTION_DEAD static char const* const stringBase_8057B5BD = "APPEAR"; -SECTION_DEAD static char const* const stringBase_8057B5C4 = "DISAPPEAR"; -SECTION_DEAD static char const* const stringBase_8057B5CE = "SCENE_CHG"; -SECTION_DEAD static char const* const stringBase_8057B5D8 = "STONE_FALL"; -SECTION_DEAD static char const* const stringBase_8057B5E3 = "STONE_MIDNA"; -SECTION_DEAD static char const* const stringBase_8057B5EF = "WALK_TARGET1"; -SECTION_DEAD static char const* const stringBase_8057B5FC = "APPEAR_END"; -SECTION_DEAD static char const* const stringBase_8057B607 = "STONE_DELETE"; -SECTION_DEAD static char const* const stringBase_8057B614 = "STONE_PUTAWAY"; -SECTION_DEAD static char const* const stringBase_8057B622 = "WCHECK"; -SECTION_DEAD static char const* const stringBase_8057B629 = "SETPOS"; -SECTION_DEAD static char const* const stringBase_8057B630 = "SCALING"; -SECTION_DEAD static char const* const stringBase_8057B638 = "STONE_SCALE"; -SECTION_DEAD static char const* const stringBase_8057B644 = "HEART_MOVE"; -SECTION_DEAD static char const* const stringBase_8057B64F = "Timer"; -#pragma pop +/* 8057B4EC-8057B4EC 00018C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_boumato/d_a_obj_boumato.cpp b/rel/d/a/obj/d_a_obj_boumato/d_a_obj_boumato.cpp index dded6c4c81d..6d4f31dd293 100644 --- a/rel/d/a/obj/d_a_obj_boumato/d_a_obj_boumato.cpp +++ b/rel/d/a/obj/d_a_obj_boumato/d_a_obj_boumato.cpp @@ -83,10 +83,10 @@ struct dRes_control_c { /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); }; -struct dJntColData_c {}; - struct J3DModel {}; +struct dJntColData_c {}; + struct dJntCol_c { /* 80035C8C */ dJntCol_c(); /* 80035CA0 */ void init(fopAc_ac_c*, dJntColData_c const*, J3DModel*, int); @@ -196,10 +196,10 @@ struct cBgS_GndChk { struct _GXTexObj {}; -struct Vec {}; - struct JAISoundID {}; +struct Vec {}; + struct Z2SeMgr { /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); }; @@ -354,6 +354,13 @@ extern "C" void __register_global_object(); // /* ############################################################################################## */ +/* 80BBC518-80BBC518 0000A8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80BBC518 = ""; +SECTION_DEAD static char const* const stringBase_80BBC519 = "H_BouMato"; +#pragma pop + /* 80BBC52C-80BBC570 000000 0044+00 2/2 0/0 0/0 .data l_ccDCyl */ SECTION_DATA static u8 l_ccDCyl[68] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -489,7 +496,7 @@ SECTION_RODATA u8 const daObj_BouMato_Param_c::m[28] = { 0x00, 0x00, 0x00, 0x00, 0xC0, 0x40, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x43, 0xC8, 0x00, 0x00, 0x43, 0x96, 0x00, 0x00, 0x40, 0x80, 0x00, 0x00, 0x41, 0xA0, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BBC470, &daObj_BouMato_Param_c::m); +COMPILER_STRIP_GATE(0x80BBC470, &daObj_BouMato_Param_c::m); /* 80BBC48C-80BBC4BC 00001C 0030+00 1/1 0/0 0/0 .rodata l_ccDObjData */ SECTION_RODATA static u8 const l_ccDObjData[48] = { @@ -497,34 +504,34 @@ SECTION_RODATA static u8 const l_ccDObjData[48] = { 0xD8, 0xFB, 0xFD, 0xFF, 0x00, 0x00, 0x00, 0x1F, 0x00, 0x00, 0x00, 0x79, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BBC48C, &l_ccDObjData); +COMPILER_STRIP_GATE(0x80BBC48C, &l_ccDObjData); /* 80BBC4BC-80BBC4C0 00004C 0004+00 0/1 0/0 0/0 .rodata @3956 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3956 = -300.0f; -COMPILER_STRIP_GATE(80BBC4BC, &lit_3956); +COMPILER_STRIP_GATE(0x80BBC4BC, &lit_3956); #pragma pop /* 80BBC4C0-80BBC4C4 000050 0004+00 0/1 0/0 0/0 .rodata @3957 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3957 = -50.0f; -COMPILER_STRIP_GATE(80BBC4C0, &lit_3957); +COMPILER_STRIP_GATE(0x80BBC4C0, &lit_3957); #pragma pop /* 80BBC4C4-80BBC4C8 000054 0004+00 0/1 0/0 0/0 .rodata @3958 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3958 = 300.0f; -COMPILER_STRIP_GATE(80BBC4C4, &lit_3958); +COMPILER_STRIP_GATE(0x80BBC4C4, &lit_3958); #pragma pop /* 80BBC4C8-80BBC4CC 000058 0004+00 0/1 0/0 0/0 .rodata @3959 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3959 = 450.0f; -COMPILER_STRIP_GATE(80BBC4C8, &lit_3959); +COMPILER_STRIP_GATE(0x80BBC4C8, &lit_3959); #pragma pop /* 80BBB230-80BBB558 000330 0328+00 1/1 0/0 0/0 .text create__15daObj_BouMato_cFv */ @@ -627,21 +634,21 @@ asm void daObj_BouMato_c::Delete() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4241 = 1.0f; -COMPILER_STRIP_GATE(80BBC4CC, &lit_4241); +COMPILER_STRIP_GATE(0x80BBC4CC, &lit_4241); #pragma pop /* 80BBC4D0-80BBC4D4 000060 0004+00 0/1 0/0 0/0 .rodata @4242 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4242 = -1.0f; -COMPILER_STRIP_GATE(80BBC4D0, &lit_4242); +COMPILER_STRIP_GATE(0x80BBC4D0, &lit_4242); #pragma pop /* 80BBC4D4-80BBC4D8 000064 0004+00 0/2 0/0 0/0 .rodata @4243 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4243 = -1000000000.0f; -COMPILER_STRIP_GATE(80BBC4D4, &lit_4243); +COMPILER_STRIP_GATE(0x80BBC4D4, &lit_4243); #pragma pop /* 80BBC4D8-80BBC4DC 000068 0004+00 0/1 0/0 0/0 .rodata @4244 */ @@ -653,49 +660,55 @@ SECTION_RODATA static u8 const lit_4244[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BBC4D8, &lit_4244); +COMPILER_STRIP_GATE(0x80BBC4D8, &lit_4244); #pragma pop /* 80BBC4DC-80BBC4E0 00006C 0004+00 0/1 0/0 0/0 .rodata @4245 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4245 = 3.0f / 40.0f; -COMPILER_STRIP_GATE(80BBC4DC, &lit_4245); +COMPILER_STRIP_GATE(0x80BBC4DC, &lit_4245); #pragma pop /* 80BBC4E0-80BBC4E4 000070 0004+00 0/1 0/0 0/0 .rodata @4246 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4246 = 50.0f; -COMPILER_STRIP_GATE(80BBC4E0, &lit_4246); +COMPILER_STRIP_GATE(0x80BBC4E0, &lit_4246); #pragma pop /* 80BBC4E4-80BBC4E8 000074 0004+00 0/1 0/0 0/0 .rodata @4247 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4247 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(80BBC4E4, &lit_4247); +COMPILER_STRIP_GATE(0x80BBC4E4, &lit_4247); #pragma pop /* 80BBC4E8-80BBC4EC 000078 0004+00 0/1 0/0 0/0 .rodata @4248 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4248 = 100.0f; -COMPILER_STRIP_GATE(80BBC4E8, &lit_4248); +COMPILER_STRIP_GATE(0x80BBC4E8, &lit_4248); #pragma pop /* 80BBC4EC-80BBC4F0 00007C 0004+00 0/1 0/0 0/0 .rodata @4249 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4249 = 0.125f; -COMPILER_STRIP_GATE(80BBC4EC, &lit_4249); +COMPILER_STRIP_GATE(0x80BBC4EC, &lit_4249); #pragma pop /* 80BBC4F0-80BBC4F4 000080 0004+00 0/1 0/0 0/0 .rodata @4250 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4250 = 125.0f; -COMPILER_STRIP_GATE(80BBC4F0, &lit_4250); +COMPILER_STRIP_GATE(0x80BBC4F0, &lit_4250); +#pragma pop + +/* 80BBC518-80BBC518 0000A8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80BBC523 = "BouMato"; #pragma pop /* 80BBB834-80BBBD80 000934 054C+00 2/2 0/0 0/0 .text Execute__15daObj_BouMato_cFv */ @@ -713,7 +726,7 @@ asm void daObj_BouMato_c::Execute() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4266 = 20.0f; -COMPILER_STRIP_GATE(80BBC4F4, &lit_4266); +COMPILER_STRIP_GATE(0x80BBC4F4, &lit_4266); #pragma pop /* 80BBBD80-80BBBE50 000E80 00D0+00 1/1 0/0 0/0 .text Draw__15daObj_BouMato_cFv */ @@ -794,14 +807,14 @@ asm void daObj_BouMato_c::getResName() { SECTION_RODATA static u8 const lit_4327[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BBC4F8, &lit_4327); +COMPILER_STRIP_GATE(0x80BBC4F8, &lit_4327); #pragma pop /* 80BBC504-80BBC508 000094 0004+00 0/1 0/0 0/0 .rodata @4355 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4355 = 3.0f / 5.0f; -COMPILER_STRIP_GATE(80BBC504, &lit_4355); +COMPILER_STRIP_GATE(0x80BBC504, &lit_4355); #pragma pop /* 80BBC508-80BBC510 000098 0004+04 0/1 0/0 0/0 .rodata @4356 */ @@ -812,7 +825,7 @@ SECTION_RODATA static u32 const lit_4356[1 + 1 /* padding */] = { /* padding */ 0x00000000, }; -COMPILER_STRIP_GATE(80BBC508, &lit_4356); +COMPILER_STRIP_GATE(0x80BBC508, &lit_4356); #pragma pop /* 80BBC510-80BBC518 0000A0 0008+00 0/1 0/0 0/0 .rodata @4359 */ @@ -821,7 +834,7 @@ COMPILER_STRIP_GATE(80BBC508, &lit_4356); SECTION_RODATA static u8 const lit_4359[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BBC510, &lit_4359); +COMPILER_STRIP_GATE(0x80BBC510, &lit_4359); #pragma pop /* 80BBC008-80BBC19C 001108 0194+00 1/1 0/0 0/0 .text @@ -947,7 +960,7 @@ asm void __sinit_d_a_obj_boumato_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80BBC390 = (void*)__sinit_d_a_obj_boumato_cpp; +REGISTER_CTORS(0x80BBC390, __sinit_d_a_obj_boumato_cpp); #pragma pop /* 80BBC404-80BBC44C 001504 0048+00 2/1 0/0 0/0 .text __dt__21daObj_BouMato_Param_cFv */ @@ -980,11 +993,4 @@ static asm void func_80BBC454() { } #pragma pop -/* 80BBC518-80BBC52B 0000A8 0013+00 2/2 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80BBC518 = ""; -SECTION_DEAD static char const* const stringBase_80BBC519 = "H_BouMato"; -SECTION_DEAD static char const* const stringBase_80BBC523 = "BouMato"; -#pragma pop +/* 80BBC518-80BBC518 0000A8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_brakeeff/d_a_obj_brakeeff.cpp b/rel/d/a/obj/d_a_obj_brakeeff/d_a_obj_brakeeff.cpp index 06dabfe861b..b71d79bfd3d 100644 --- a/rel/d/a/obj/d_a_obj_brakeeff/d_a_obj_brakeeff.cpp +++ b/rel/d/a/obj/d_a_obj_brakeeff/d_a_obj_brakeeff.cpp @@ -59,10 +59,10 @@ struct dRes_control_c { struct dPa_levelEcallBack {}; -struct _GXColor {}; - struct csXyz {}; +struct _GXColor {}; + struct dPa_control_c { /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, @@ -235,27 +235,27 @@ static asm void daObj_Brakeeff_Draw(obj_brakeeff_class* param_0) { /* ############################################################################################## */ /* 8046E528-8046E52C 000000 0004+00 2/2 0/0 0/0 .rodata @3879 */ SECTION_RODATA static f32 const lit_3879 = 1.0f; -COMPILER_STRIP_GATE(8046E528, &lit_3879); +COMPILER_STRIP_GATE(0x8046E528, &lit_3879); /* 8046E52C-8046E530 000004 0004+00 0/1 0/0 0/0 .rodata @3880 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3880 = 75.0f; -COMPILER_STRIP_GATE(8046E52C, &lit_3880); +COMPILER_STRIP_GATE(0x8046E52C, &lit_3880); #pragma pop /* 8046E530-8046E534 000008 0004+00 0/1 0/0 0/0 .rodata @3881 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3881 = 50.0f; -COMPILER_STRIP_GATE(8046E530, &lit_3881); +COMPILER_STRIP_GATE(0x8046E530, &lit_3881); #pragma pop /* 8046E534-8046E538 00000C 0004+00 0/1 0/0 0/0 .rodata @3882 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3882 = 14.0f / 25.0f; -COMPILER_STRIP_GATE(8046E534, &lit_3882); +COMPILER_STRIP_GATE(0x8046E534, &lit_3882); #pragma pop /* 8046E540-8046E54C 000000 000A+02 1/1 0/0 0/0 .data e_name */ @@ -312,6 +312,13 @@ static bool daObj_Brakeeff_IsDelete(obj_brakeeff_class* param_0) { return true; } +/* ############################################################################################## */ +/* 8046E538-8046E538 000010 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8046E538 = "Obj_Bef"; +#pragma pop + /* 8046E0A0-8046E0F0 000460 0050+00 1/0 0/0 0/0 .text * daObj_Brakeeff_Delete__FP18obj_brakeeff_class */ #pragma push @@ -435,9 +442,4 @@ asm cM3dGAab::~cM3dGAab() { } #pragma pop -/* 8046E538-8046E540 000010 0008+00 3/3 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_8046E538 = "Obj_Bef"; -#pragma pop +/* 8046E538-8046E538 000010 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_brg/d_a_obj_brg.cpp b/rel/d/a/obj/d_a_obj_brg/d_a_obj_brg.cpp index eb05531428e..b4170fbee08 100644 --- a/rel/d/a/obj/d_a_obj_brg/d_a_obj_brg.cpp +++ b/rel/d/a/obj/d_a_obj_brg/d_a_obj_brg.cpp @@ -25,11 +25,11 @@ struct mDoExt_3DlineMatSortPacket { /* 80014738 */ void setMat(mDoExt_3DlineMat_c*); }; -struct dKy_tevstr_c {}; +struct ResTIMG {}; struct _GXColor {}; -struct ResTIMG {}; +struct dKy_tevstr_c {}; struct mDoExt_3DlineMat1_c { /* 80013360 */ void init(u16, u16, ResTIMG*, int); @@ -326,97 +326,97 @@ SECTION_RODATA static u8 const lit_3896[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BC2148, &lit_3896); +COMPILER_STRIP_GATE(0x80BC2148, &lit_3896); /* 80BC214C-80BC2150 000004 0004+00 0/1 0/0 0/0 .rodata @3897 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3897 = 51.0f; -COMPILER_STRIP_GATE(80BC214C, &lit_3897); +COMPILER_STRIP_GATE(0x80BC214C, &lit_3897); #pragma pop /* 80BC2150-80BC2154 000008 0004+00 0/1 0/0 0/0 .rodata @3898 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3898 = -0.5f; -COMPILER_STRIP_GATE(80BC2150, &lit_3898); +COMPILER_STRIP_GATE(0x80BC2150, &lit_3898); #pragma pop /* 80BC2154-80BC2158 00000C 0004+00 0/1 0/0 0/0 .rodata @3899 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3899 = 17.0f / 20.0f; -COMPILER_STRIP_GATE(80BC2154, &lit_3899); +COMPILER_STRIP_GATE(0x80BC2154, &lit_3899); #pragma pop /* 80BC2158-80BC215C 000010 0004+00 0/5 0/0 0/0 .rodata @3900 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3900 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(80BC2158, &lit_3900); +COMPILER_STRIP_GATE(0x80BC2158, &lit_3900); #pragma pop /* 80BC215C-80BC2160 000014 0004+00 0/7 0/0 0/0 .rodata @3901 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3901 = 1.0f; -COMPILER_STRIP_GATE(80BC215C, &lit_3901); +COMPILER_STRIP_GATE(0x80BC215C, &lit_3901); #pragma pop /* 80BC2160-80BC2164 000018 0004+00 0/1 0/0 0/0 .rodata @3902 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3902 = -5.0f; -COMPILER_STRIP_GATE(80BC2160, &lit_3902); +COMPILER_STRIP_GATE(0x80BC2160, &lit_3902); #pragma pop /* 80BC2164-80BC2168 00001C 0004+00 0/2 0/0 0/0 .rodata @3903 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3903 = 100.0f; -COMPILER_STRIP_GATE(80BC2164, &lit_3903); +COMPILER_STRIP_GATE(0x80BC2164, &lit_3903); #pragma pop /* 80BC2168-80BC216C 000020 0004+00 0/2 0/0 0/0 .rodata @3904 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3904 = -31.0f; -COMPILER_STRIP_GATE(80BC2168, &lit_3904); +COMPILER_STRIP_GATE(0x80BC2168, &lit_3904); #pragma pop /* 80BC216C-80BC2170 000024 0004+00 0/1 0/0 0/0 .rodata @3905 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3905 = 70.0f; -COMPILER_STRIP_GATE(80BC216C, &lit_3905); +COMPILER_STRIP_GATE(0x80BC216C, &lit_3905); #pragma pop /* 80BC2170-80BC2174 000028 0004+00 0/1 0/0 0/0 .rodata @3906 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3906 = -20.0f; -COMPILER_STRIP_GATE(80BC2170, &lit_3906); +COMPILER_STRIP_GATE(0x80BC2170, &lit_3906); #pragma pop /* 80BC2174-80BC2178 00002C 0004+00 0/7 0/0 0/0 .rodata @3907 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3907 = 50.0f; -COMPILER_STRIP_GATE(80BC2174, &lit_3907); +COMPILER_STRIP_GATE(0x80BC2174, &lit_3907); #pragma pop /* 80BC2178-80BC217C 000030 0004+00 0/1 0/0 0/0 .rodata @3908 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3908 = -10.0f; -COMPILER_STRIP_GATE(80BC2178, &lit_3908); +COMPILER_STRIP_GATE(0x80BC2178, &lit_3908); #pragma pop /* 80BC217C-80BC2180 000034 0004+00 0/2 0/0 0/0 .rodata @3909 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3909 = 3.0f / 100.0f; -COMPILER_STRIP_GATE(80BC217C, &lit_3909); +COMPILER_STRIP_GATE(0x80BC217C, &lit_3909); #pragma pop /* 80BC2180-80BC2188 000038 0008+00 0/3 0/0 0/0 .rodata @3910 */ @@ -425,7 +425,7 @@ COMPILER_STRIP_GATE(80BC217C, &lit_3909); SECTION_RODATA static u8 const lit_3910[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BC2180, &lit_3910); +COMPILER_STRIP_GATE(0x80BC2180, &lit_3910); #pragma pop /* 80BC2188-80BC2190 000040 0008+00 0/3 0/0 0/0 .rodata @3911 */ @@ -434,7 +434,7 @@ COMPILER_STRIP_GATE(80BC2180, &lit_3910); SECTION_RODATA static u8 const lit_3911[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BC2188, &lit_3911); +COMPILER_STRIP_GATE(0x80BC2188, &lit_3911); #pragma pop /* 80BC2190-80BC2198 000048 0008+00 0/3 0/0 0/0 .rodata @3912 */ @@ -443,28 +443,28 @@ COMPILER_STRIP_GATE(80BC2188, &lit_3911); SECTION_RODATA static u8 const lit_3912[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BC2190, &lit_3912); +COMPILER_STRIP_GATE(0x80BC2190, &lit_3912); #pragma pop /* 80BC2198-80BC219C 000050 0004+00 0/2 0/0 0/0 .rodata @3913 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3913 = 3.0f / 10.0f; -COMPILER_STRIP_GATE(80BC2198, &lit_3913); +COMPILER_STRIP_GATE(0x80BC2198, &lit_3913); #pragma pop /* 80BC219C-80BC21A0 000054 0004+00 0/1 0/0 0/0 .rodata @3914 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3914 = 20.0f; -COMPILER_STRIP_GATE(80BC219C, &lit_3914); +COMPILER_STRIP_GATE(0x80BC219C, &lit_3914); #pragma pop /* 80BC21A0-80BC21A4 000058 0004+00 0/5 0/0 0/0 .rodata @3915 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3915 = 0.5f; -COMPILER_STRIP_GATE(80BC21A0, &lit_3915); +COMPILER_STRIP_GATE(0x80BC21A0, &lit_3915); #pragma pop /* 80BBC90C-80BBCCFC 0000EC 03F0+00 1/1 0/0 0/0 .text @@ -493,147 +493,147 @@ asm cXyz::~cXyz() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4200 = 5.0f; -COMPILER_STRIP_GATE(80BC21A4, &lit_4200); +COMPILER_STRIP_GATE(0x80BC21A4, &lit_4200); #pragma pop /* 80BC21A8-80BC21AC 000060 0004+00 0/4 0/0 0/0 .rodata @4201 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4201 = 3.0f; -COMPILER_STRIP_GATE(80BC21A8, &lit_4201); +COMPILER_STRIP_GATE(0x80BC21A8, &lit_4201); #pragma pop /* 80BC21AC-80BC21B0 000064 0004+00 0/1 0/0 0/0 .rodata @4202 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4202 = 0.25f; -COMPILER_STRIP_GATE(80BC21AC, &lit_4202); +COMPILER_STRIP_GATE(0x80BC21AC, &lit_4202); #pragma pop /* 80BC21B0-80BC21B4 000068 0004+00 0/1 0/0 0/0 .rodata @4203 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4203 = 7.0f / 10.0f; -COMPILER_STRIP_GATE(80BC21B0, &lit_4203); +COMPILER_STRIP_GATE(0x80BC21B0, &lit_4203); #pragma pop /* 80BC21B4-80BC21B8 00006C 0004+00 0/2 0/0 0/0 .rodata @4204 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4204 = -150.0f; -COMPILER_STRIP_GATE(80BC21B4, &lit_4204); +COMPILER_STRIP_GATE(0x80BC21B4, &lit_4204); #pragma pop /* 80BC21B8-80BC21BC 000070 0004+00 0/1 0/0 0/0 .rodata @4205 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4205 = 430.0f; -COMPILER_STRIP_GATE(80BC21B8, &lit_4205); +COMPILER_STRIP_GATE(0x80BC21B8, &lit_4205); #pragma pop /* 80BC21BC-80BC21C0 000074 0004+00 0/1 0/0 0/0 .rodata @4206 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4206 = -250.0f; -COMPILER_STRIP_GATE(80BC21BC, &lit_4206); +COMPILER_STRIP_GATE(0x80BC21BC, &lit_4206); #pragma pop /* 80BC21C0-80BC21C4 000078 0004+00 0/1 0/0 0/0 .rodata @4207 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4207 = -650.0f; -COMPILER_STRIP_GATE(80BC21C0, &lit_4207); +COMPILER_STRIP_GATE(0x80BC21C0, &lit_4207); #pragma pop /* 80BC21C4-80BC21C8 00007C 0004+00 0/1 0/0 0/0 .rodata @4208 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4208 = 1330.0f; -COMPILER_STRIP_GATE(80BC21C4, &lit_4208); +COMPILER_STRIP_GATE(0x80BC21C4, &lit_4208); #pragma pop /* 80BC21C8-80BC21CC 000080 0004+00 0/1 0/0 0/0 .rodata @4209 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4209 = -950.0f; -COMPILER_STRIP_GATE(80BC21C8, &lit_4209); +COMPILER_STRIP_GATE(0x80BC21C8, &lit_4209); #pragma pop /* 80BC21CC-80BC21D0 000084 0004+00 0/1 0/0 0/0 .rodata @4210 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4210 = -120.0f; -COMPILER_STRIP_GATE(80BC21CC, &lit_4210); +COMPILER_STRIP_GATE(0x80BC21CC, &lit_4210); #pragma pop /* 80BC21D0-80BC21D4 000088 0004+00 0/2 0/0 0/0 .rodata @4211 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4211 = 350.0f; -COMPILER_STRIP_GATE(80BC21D0, &lit_4211); +COMPILER_STRIP_GATE(0x80BC21D0, &lit_4211); #pragma pop /* 80BC21D4-80BC21D8 00008C 0004+00 0/2 0/0 0/0 .rodata @4212 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4212 = -80.0f; -COMPILER_STRIP_GATE(80BC21D4, &lit_4212); +COMPILER_STRIP_GATE(0x80BC21D4, &lit_4212); #pragma pop /* 80BC21D8-80BC21DC 000090 0004+00 0/1 0/0 0/0 .rodata @4213 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4213 = 450.0f; -COMPILER_STRIP_GATE(80BC21D8, &lit_4213); +COMPILER_STRIP_GATE(0x80BC21D8, &lit_4213); #pragma pop /* 80BC21DC-80BC21E0 000094 0004+00 0/1 0/0 0/0 .rodata @4214 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4214 = 1350.0f; -COMPILER_STRIP_GATE(80BC21DC, &lit_4214); +COMPILER_STRIP_GATE(0x80BC21DC, &lit_4214); #pragma pop /* 80BC21E0-80BC21E4 000098 0004+00 0/1 0/0 0/0 .rodata @4215 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4215 = 1050.0f; -COMPILER_STRIP_GATE(80BC21E0, &lit_4215); +COMPILER_STRIP_GATE(0x80BC21E0, &lit_4215); #pragma pop /* 80BC21E4-80BC21E8 00009C 0004+00 0/2 0/0 0/0 .rodata @4216 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4216 = 110.0f; -COMPILER_STRIP_GATE(80BC21E4, &lit_4216); +COMPILER_STRIP_GATE(0x80BC21E4, &lit_4216); #pragma pop /* 80BC21E8-80BC21EC 0000A0 0004+00 0/1 0/0 0/0 .rodata @4217 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4217 = 370.0f; -COMPILER_STRIP_GATE(80BC21E8, &lit_4217); +COMPILER_STRIP_GATE(0x80BC21E8, &lit_4217); #pragma pop /* 80BC21EC-80BC21F0 0000A4 0004+00 0/4 0/0 0/0 .rodata @4218 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4218 = -1.0f; -COMPILER_STRIP_GATE(80BC21EC, &lit_4218); +COMPILER_STRIP_GATE(0x80BC21EC, &lit_4218); #pragma pop /* 80BC21F0-80BC21F4 0000A8 0004+00 0/3 0/0 0/0 .rodata @4219 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4219 = 10.0f; -COMPILER_STRIP_GATE(80BC21F0, &lit_4219); +COMPILER_STRIP_GATE(0x80BC21F0, &lit_4219); #pragma pop /* 80BC21F4-80BC21F8 0000AC 0004+00 0/1 0/0 0/0 .rodata @4220 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4220 = 6.5f; -COMPILER_STRIP_GATE(80BC21F4, &lit_4220); +COMPILER_STRIP_GATE(0x80BC21F4, &lit_4220); #pragma pop /* 80BC21F8-80BC2200 0000B0 0008+00 0/5 0/0 0/0 .rodata @4222 */ @@ -642,7 +642,7 @@ COMPILER_STRIP_GATE(80BC21F4, &lit_4220); SECTION_RODATA static u8 const lit_4222[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BC21F8, &lit_4222); +COMPILER_STRIP_GATE(0x80BC21F8, &lit_4222); #pragma pop /* 80BC23A4-80BC23A8 000000 0004+00 1/1 0/0 0/0 .data l_color$4002 */ @@ -803,21 +803,21 @@ static asm void control3(obj_brg_class* param_0, br_s* param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4391 = 1.0f / 20.0f; -COMPILER_STRIP_GATE(80BC2200, &lit_4391); +COMPILER_STRIP_GATE(0x80BC2200, &lit_4391); #pragma pop /* 80BC2204-80BC2208 0000BC 0004+00 0/2 0/0 0/0 .rodata @4392 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4392 = 3000.0f; -COMPILER_STRIP_GATE(80BC2204, &lit_4392); +COMPILER_STRIP_GATE(0x80BC2204, &lit_4392); #pragma pop /* 80BC2208-80BC220C 0000C0 0004+00 0/3 0/0 0/0 .rodata @4393 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4393 = 30.0f; -COMPILER_STRIP_GATE(80BC2208, &lit_4393); +COMPILER_STRIP_GATE(0x80BC2208, &lit_4393); #pragma pop /* 80BBDCE8-80BBE008 0014C8 0320+00 1/1 0/0 0/0 .text cut_control1__FP13obj_brg_classP4br_s */ @@ -845,7 +845,7 @@ static asm void cut_control2(obj_brg_class* param_0, br_s* param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4499 = 7.0f; -COMPILER_STRIP_GATE(80BC220C, &lit_4499); +COMPILER_STRIP_GATE(0x80BC220C, &lit_4499); #pragma pop /* 80BBE338-80BBE578 001B18 0240+00 1/1 0/0 0/0 .text himo_cut_control1__FP13obj_brg_classP4cXyzf @@ -864,119 +864,119 @@ static asm void himo_cut_control1(obj_brg_class* param_0, cXyz* param_1, f32 par #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4903 = 0x40490FDB; -COMPILER_STRIP_GATE(80BC2210, &lit_4903); +COMPILER_STRIP_GATE(0x80BC2210, &lit_4903); #pragma pop /* 80BC2214-80BC2218 0000CC 0004+00 0/1 0/0 0/0 .rodata @4904 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4904 = -2.0f; -COMPILER_STRIP_GATE(80BC2214, &lit_4904); +COMPILER_STRIP_GATE(0x80BC2214, &lit_4904); #pragma pop /* 80BC2218-80BC221C 0000D0 0004+00 0/1 0/0 0/0 .rodata @4905 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4905 = 0.75f; -COMPILER_STRIP_GATE(80BC2218, &lit_4905); +COMPILER_STRIP_GATE(0x80BC2218, &lit_4905); #pragma pop /* 80BC221C-80BC2220 0000D4 0004+00 0/1 0/0 0/0 .rodata @4906 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4906 = 7000.0f; -COMPILER_STRIP_GATE(80BC221C, &lit_4906); +COMPILER_STRIP_GATE(0x80BC221C, &lit_4906); #pragma pop /* 80BC2220-80BC2224 0000D8 0004+00 0/2 0/0 0/0 .rodata @4907 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4907 = -30.0f; -COMPILER_STRIP_GATE(80BC2220, &lit_4907); +COMPILER_STRIP_GATE(0x80BC2220, &lit_4907); #pragma pop /* 80BC2224-80BC2228 0000DC 0004+00 0/1 0/0 0/0 .rodata @4908 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4908 = -7000.0f; -COMPILER_STRIP_GATE(80BC2224, &lit_4908); +COMPILER_STRIP_GATE(0x80BC2224, &lit_4908); #pragma pop /* 80BC2228-80BC222C 0000E0 0004+00 0/1 0/0 0/0 .rodata @4909 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4909 = 15.0f; -COMPILER_STRIP_GATE(80BC2228, &lit_4909); +COMPILER_STRIP_GATE(0x80BC2228, &lit_4909); #pragma pop /* 80BC222C-80BC2230 0000E4 0004+00 0/1 0/0 0/0 .rodata @4910 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4910 = -200.0f; -COMPILER_STRIP_GATE(80BC222C, &lit_4910); +COMPILER_STRIP_GATE(0x80BC222C, &lit_4910); #pragma pop /* 80BC2230-80BC2234 0000E8 0004+00 0/2 0/0 0/0 .rodata @4911 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4911 = 150.0f; -COMPILER_STRIP_GATE(80BC2230, &lit_4911); +COMPILER_STRIP_GATE(0x80BC2230, &lit_4911); #pragma pop /* 80BC2234-80BC2238 0000EC 0004+00 0/1 0/0 0/0 .rodata @4912 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4912 = -15.0f; -COMPILER_STRIP_GATE(80BC2234, &lit_4912); +COMPILER_STRIP_GATE(0x80BC2234, &lit_4912); #pragma pop /* 80BC2238-80BC223C 0000F0 0004+00 0/2 0/0 0/0 .rodata @4913 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4913 = 4000.0f; -COMPILER_STRIP_GATE(80BC2238, &lit_4913); +COMPILER_STRIP_GATE(0x80BC2238, &lit_4913); #pragma pop /* 80BC223C-80BC2240 0000F4 0004+00 0/2 0/0 0/0 .rodata @4914 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4914 = -50.0f; -COMPILER_STRIP_GATE(80BC223C, &lit_4914); +COMPILER_STRIP_GATE(0x80BC223C, &lit_4914); #pragma pop /* 80BC2240-80BC2244 0000F8 0004+00 0/1 0/0 0/0 .rodata @4915 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4915 = -10000.0f; -COMPILER_STRIP_GATE(80BC2240, &lit_4915); +COMPILER_STRIP_GATE(0x80BC2240, &lit_4915); #pragma pop /* 80BC2244-80BC2248 0000FC 0004+00 0/1 0/0 0/0 .rodata @4916 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4916 = 80.0f; -COMPILER_STRIP_GATE(80BC2244, &lit_4916); +COMPILER_STRIP_GATE(0x80BC2244, &lit_4916); #pragma pop /* 80BC2248-80BC224C 000100 0004+00 0/1 0/0 0/0 .rodata @4917 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4917 = 3200.0f; -COMPILER_STRIP_GATE(80BC2248, &lit_4917); +COMPILER_STRIP_GATE(0x80BC2248, &lit_4917); #pragma pop /* 80BC224C-80BC2250 000104 0004+00 0/1 0/0 0/0 .rodata @4918 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4918 = 60.0f; -COMPILER_STRIP_GATE(80BC224C, &lit_4918); +COMPILER_STRIP_GATE(0x80BC224C, &lit_4918); #pragma pop /* 80BC2250-80BC2254 000108 0004+00 0/1 0/0 0/0 .rodata @4919 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4919 = 1600.0f; -COMPILER_STRIP_GATE(80BC2250, &lit_4919); +COMPILER_STRIP_GATE(0x80BC2250, &lit_4919); #pragma pop /* 80BC23AC-80BC23D8 000008 002C+00 1/1 0/0 0/0 .data ita_z_p */ @@ -1001,133 +1001,133 @@ static asm void obj_brg_move(obj_brg_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5486 = 5500.0f; -COMPILER_STRIP_GATE(80BC2254, &lit_5486); +COMPILER_STRIP_GATE(0x80BC2254, &lit_5486); #pragma pop /* 80BC2258-80BC225C 000110 0004+00 0/1 0/0 0/0 .rodata @5487 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5487 = 2000.0f; -COMPILER_STRIP_GATE(80BC2258, &lit_5487); +COMPILER_STRIP_GATE(0x80BC2258, &lit_5487); #pragma pop /* 80BC225C-80BC2260 000114 0004+00 0/1 0/0 0/0 .rodata @5488 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5488 = 3.0f / 5.0f; -COMPILER_STRIP_GATE(80BC225C, &lit_5488); +COMPILER_STRIP_GATE(0x80BC225C, &lit_5488); #pragma pop /* 80BC2260-80BC2264 000118 0004+00 0/1 0/0 0/0 .rodata @5489 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5489 = 1000.0f; -COMPILER_STRIP_GATE(80BC2260, &lit_5489); +COMPILER_STRIP_GATE(0x80BC2260, &lit_5489); #pragma pop /* 80BC2264-80BC2268 00011C 0004+00 0/1 0/0 0/0 .rodata @5490 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5490 = 250.0f; -COMPILER_STRIP_GATE(80BC2264, &lit_5490); +COMPILER_STRIP_GATE(0x80BC2264, &lit_5490); #pragma pop /* 80BC2268-80BC226C 000120 0004+00 0/1 0/0 0/0 .rodata @5491 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5491 = 600.0f; -COMPILER_STRIP_GATE(80BC2268, &lit_5491); +COMPILER_STRIP_GATE(0x80BC2268, &lit_5491); #pragma pop /* 80BC226C-80BC2270 000124 0004+00 0/2 0/0 0/0 .rodata @5492 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5492 = 200.0f; -COMPILER_STRIP_GATE(80BC226C, &lit_5492); +COMPILER_STRIP_GATE(0x80BC226C, &lit_5492); #pragma pop /* 80BC2270-80BC2274 000128 0004+00 0/1 0/0 0/0 .rodata @5493 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5493 = -300.0f; -COMPILER_STRIP_GATE(80BC2270, &lit_5493); +COMPILER_STRIP_GATE(0x80BC2270, &lit_5493); #pragma pop /* 80BC2274-80BC2278 00012C 0004+00 0/1 0/0 0/0 .rodata @5494 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5494 = -100.0f; -COMPILER_STRIP_GATE(80BC2274, &lit_5494); +COMPILER_STRIP_GATE(0x80BC2274, &lit_5494); #pragma pop /* 80BC2278-80BC227C 000130 0004+00 0/1 0/0 0/0 .rodata @5495 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5495 = 99.0f; -COMPILER_STRIP_GATE(80BC2278, &lit_5495); +COMPILER_STRIP_GATE(0x80BC2278, &lit_5495); #pragma pop /* 80BC227C-80BC2280 000134 0004+00 0/1 0/0 0/0 .rodata @5496 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5496 = 66.0f; -COMPILER_STRIP_GATE(80BC227C, &lit_5496); +COMPILER_STRIP_GATE(0x80BC227C, &lit_5496); #pragma pop /* 80BC2280-80BC2284 000138 0004+00 0/2 0/0 0/0 .rodata @5497 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5497 = 2.0f; -COMPILER_STRIP_GATE(80BC2280, &lit_5497); +COMPILER_STRIP_GATE(0x80BC2280, &lit_5497); #pragma pop /* 80BC2284-80BC2288 00013C 0004+00 0/1 0/0 0/0 .rodata @5498 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5498 = 10000.0f; -COMPILER_STRIP_GATE(80BC2284, &lit_5498); +COMPILER_STRIP_GATE(0x80BC2284, &lit_5498); #pragma pop /* 80BC2288-80BC228C 000140 0004+00 0/1 0/0 0/0 .rodata @5499 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5499 = 2.0f / 5.0f; -COMPILER_STRIP_GATE(80BC2288, &lit_5499); +COMPILER_STRIP_GATE(0x80BC2288, &lit_5499); #pragma pop /* 80BC228C-80BC2290 000144 0004+00 0/1 0/0 0/0 .rodata @5500 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5500 = -3.0f; -COMPILER_STRIP_GATE(80BC228C, &lit_5500); +COMPILER_STRIP_GATE(0x80BC228C, &lit_5500); #pragma pop /* 80BC2290-80BC2294 000148 0004+00 0/1 0/0 0/0 .rodata @5501 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5501 = 3.0f / 20.0f; -COMPILER_STRIP_GATE(80BC2290, &lit_5501); +COMPILER_STRIP_GATE(0x80BC2290, &lit_5501); #pragma pop /* 80BC2294-80BC2298 00014C 0004+00 0/1 0/0 0/0 .rodata @5502 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5502 = 25.0f; -COMPILER_STRIP_GATE(80BC2294, &lit_5502); +COMPILER_STRIP_GATE(0x80BC2294, &lit_5502); #pragma pop /* 80BC2298-80BC229C 000150 0004+00 0/1 0/0 0/0 .rodata @5503 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5503 = 16.0f; -COMPILER_STRIP_GATE(80BC2298, &lit_5503); +COMPILER_STRIP_GATE(0x80BC2298, &lit_5503); #pragma pop /* 80BC229C-80BC22A0 000154 0004+00 0/1 0/0 0/0 .rodata @5504 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5504 = -40.0f; -COMPILER_STRIP_GATE(80BC229C, &lit_5504); +COMPILER_STRIP_GATE(0x80BC229C, &lit_5504); #pragma pop /* 80BBF21C-80BC0834 0029FC 1618+00 2/1 0/0 0/0 .text daObj_Brg_Execute__FP13obj_brg_class */ @@ -1150,6 +1150,13 @@ static asm void daObj_Brg_IsDelete(obj_brg_class* param_0) { } #pragma pop +/* ############################################################################################## */ +/* 80BC238C-80BC238C 000244 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80BC238C = "Obj_brg"; +#pragma pop + /* 80BC0854-80BC08B0 004034 005C+00 1/0 0/0 0/0 .text daObj_Brg_Delete__FP13obj_brg_class */ #pragma push @@ -1166,14 +1173,14 @@ static asm void daObj_Brg_Delete(obj_brg_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5566 = 400.0f; -COMPILER_STRIP_GATE(80BC22A0, &lit_5566); +COMPILER_STRIP_GATE(0x80BC22A0, &lit_5566); #pragma pop /* 80BC22A4-80BC22A8 00015C 0004+00 0/1 0/0 0/0 .rodata @5567 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5567 = 500.0f; -COMPILER_STRIP_GATE(80BC22A4, &lit_5567); +COMPILER_STRIP_GATE(0x80BC22A4, &lit_5567); #pragma pop /* 80BC23D8-80BC241C 000034 0044+00 1/1 0/0 0/0 .data himo_cyl_src$5532 */ @@ -1211,21 +1218,21 @@ static asm void CreateInit(fopAc_ac_c* param_0) { SECTION_RODATA static u8 const obj_brg_bmd[12] = { 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x07, }; -COMPILER_STRIP_GATE(80BC22A8, &obj_brg_bmd); +COMPILER_STRIP_GATE(0x80BC22A8, &obj_brg_bmd); #pragma pop /* 80BC22B4-80BC22B8 00016C 0004+00 0/2 0/0 0/0 .rodata @5716 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5716 = 1.5f; -COMPILER_STRIP_GATE(80BC22B4, &lit_5716); +COMPILER_STRIP_GATE(0x80BC22B4, &lit_5716); #pragma pop /* 80BC22B8-80BC22BC 000170 0004+00 0/1 0/0 0/0 .rodata @5717 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5717 = 2.5f; -COMPILER_STRIP_GATE(80BC22B8, &lit_5717); +COMPILER_STRIP_GATE(0x80BC22B8, &lit_5717); #pragma pop /* 80BC0A40-80BC1050 004220 0610+00 1/1 0/0 0/0 .text CallbackCreateHeap__FP10fopAc_ac_c @@ -1244,364 +1251,371 @@ static asm void CallbackCreateHeap(fopAc_ac_c* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6206 = 11741.0f; -COMPILER_STRIP_GATE(80BC22BC, &lit_6206); +COMPILER_STRIP_GATE(0x80BC22BC, &lit_6206); #pragma pop /* 80BC22C0-80BC22C4 000178 0004+00 0/1 0/0 0/0 .rodata @6207 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6207 = 3742.0f; -COMPILER_STRIP_GATE(80BC22C0, &lit_6207); +COMPILER_STRIP_GATE(0x80BC22C0, &lit_6207); #pragma pop /* 80BC22C4-80BC22C8 00017C 0004+00 0/1 0/0 0/0 .rodata @6208 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6208 = 3735.0f; -COMPILER_STRIP_GATE(80BC22C4, &lit_6208); +COMPILER_STRIP_GATE(0x80BC22C4, &lit_6208); #pragma pop /* 80BC22C8-80BC22CC 000180 0004+00 0/1 0/0 0/0 .rodata @6209 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6209 = 12656.0f; -COMPILER_STRIP_GATE(80BC22C8, &lit_6209); +COMPILER_STRIP_GATE(0x80BC22C8, &lit_6209); #pragma pop /* 80BC22CC-80BC22D0 000184 0004+00 0/1 0/0 0/0 .rodata @6210 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6210 = 3732.0f; -COMPILER_STRIP_GATE(80BC22CC, &lit_6210); +COMPILER_STRIP_GATE(0x80BC22CC, &lit_6210); #pragma pop /* 80BC22D0-80BC22D4 000188 0004+00 0/1 0/0 0/0 .rodata @6211 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6211 = 3425.0f; -COMPILER_STRIP_GATE(80BC22D0, &lit_6211); +COMPILER_STRIP_GATE(0x80BC22D0, &lit_6211); #pragma pop /* 80BC22D4-80BC22D8 00018C 0004+00 0/1 0/0 0/0 .rodata @6212 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6212 = 3285.0f; -COMPILER_STRIP_GATE(80BC22D4, &lit_6212); +COMPILER_STRIP_GATE(0x80BC22D4, &lit_6212); #pragma pop /* 80BC22D8-80BC22DC 000190 0004+00 0/1 0/0 0/0 .rodata @6213 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6213 = 3270.0f; -COMPILER_STRIP_GATE(80BC22D8, &lit_6213); +COMPILER_STRIP_GATE(0x80BC22D8, &lit_6213); #pragma pop /* 80BC22DC-80BC22E0 000194 0004+00 0/1 0/0 0/0 .rodata @6214 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6214 = 1095.0f; -COMPILER_STRIP_GATE(80BC22DC, &lit_6214); +COMPILER_STRIP_GATE(0x80BC22DC, &lit_6214); #pragma pop /* 80BC22E0-80BC22E4 000198 0004+00 0/1 0/0 0/0 .rodata @6215 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6215 = 1300.0f; -COMPILER_STRIP_GATE(80BC22E0, &lit_6215); +COMPILER_STRIP_GATE(0x80BC22E0, &lit_6215); #pragma pop /* 80BC22E4-80BC22E8 00019C 0004+00 0/1 0/0 0/0 .rodata @6216 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6216 = 47.0f; -COMPILER_STRIP_GATE(80BC22E4, &lit_6216); +COMPILER_STRIP_GATE(0x80BC22E4, &lit_6216); #pragma pop /* 80BC22E8-80BC22EC 0001A0 0004+00 0/1 0/0 0/0 .rodata @6217 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6217 = 334.0f; -COMPILER_STRIP_GATE(80BC22E8, &lit_6217); +COMPILER_STRIP_GATE(0x80BC22E8, &lit_6217); #pragma pop /* 80BC22EC-80BC22F0 0001A4 0004+00 0/1 0/0 0/0 .rodata @6218 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6218 = 249.0f; -COMPILER_STRIP_GATE(80BC22EC, &lit_6218); +COMPILER_STRIP_GATE(0x80BC22EC, &lit_6218); #pragma pop /* 80BC22F0-80BC22F4 0001A8 0004+00 0/1 0/0 0/0 .rodata @6219 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6219 = -11868.0f; -COMPILER_STRIP_GATE(80BC22F0, &lit_6219); +COMPILER_STRIP_GATE(0x80BC22F0, &lit_6219); #pragma pop /* 80BC22F4-80BC22F8 0001AC 0004+00 0/1 0/0 0/0 .rodata @6220 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6220 = 180.0f; -COMPILER_STRIP_GATE(80BC22F4, &lit_6220); +COMPILER_STRIP_GATE(0x80BC22F4, &lit_6220); #pragma pop /* 80BC22F8-80BC22FC 0001B0 0004+00 0/1 0/0 0/0 .rodata @6221 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6221 = -12082.0f; -COMPILER_STRIP_GATE(80BC22F8, &lit_6221); +COMPILER_STRIP_GATE(0x80BC22F8, &lit_6221); #pragma pop /* 80BC22FC-80BC2300 0001B4 0004+00 0/1 0/0 0/0 .rodata @6222 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6222 = 114.0f; -COMPILER_STRIP_GATE(80BC22FC, &lit_6222); +COMPILER_STRIP_GATE(0x80BC22FC, &lit_6222); #pragma pop /* 80BC2300-80BC2304 0001B8 0004+00 0/1 0/0 0/0 .rodata @6223 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6223 = -12297.0f; -COMPILER_STRIP_GATE(80BC2300, &lit_6223); +COMPILER_STRIP_GATE(0x80BC2300, &lit_6223); #pragma pop /* 80BC2304-80BC2308 0001BC 0004+00 0/1 0/0 0/0 .rodata @6224 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6224 = -12512.0f; -COMPILER_STRIP_GATE(80BC2304, &lit_6224); +COMPILER_STRIP_GATE(0x80BC2304, &lit_6224); #pragma pop /* 80BC2308-80BC230C 0001C0 0004+00 0/1 0/0 0/0 .rodata @6225 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6225 = -9.0f; -COMPILER_STRIP_GATE(80BC2308, &lit_6225); +COMPILER_STRIP_GATE(0x80BC2308, &lit_6225); #pragma pop /* 80BC230C-80BC2310 0001C4 0004+00 0/1 0/0 0/0 .rodata @6226 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6226 = -12729.0f; -COMPILER_STRIP_GATE(80BC230C, &lit_6226); +COMPILER_STRIP_GATE(0x80BC230C, &lit_6226); #pragma pop /* 80BC2310-80BC2314 0001C8 0004+00 0/1 0/0 0/0 .rodata @6227 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6227 = -63.0f; -COMPILER_STRIP_GATE(80BC2310, &lit_6227); +COMPILER_STRIP_GATE(0x80BC2310, &lit_6227); #pragma pop /* 80BC2314-80BC2318 0001CC 0004+00 0/1 0/0 0/0 .rodata @6228 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6228 = -12948.0f; -COMPILER_STRIP_GATE(80BC2314, &lit_6228); +COMPILER_STRIP_GATE(0x80BC2314, &lit_6228); #pragma pop /* 80BC2318-80BC231C 0001D0 0004+00 0/1 0/0 0/0 .rodata @6229 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6229 = -111.0f; -COMPILER_STRIP_GATE(80BC2318, &lit_6229); +COMPILER_STRIP_GATE(0x80BC2318, &lit_6229); #pragma pop /* 80BC231C-80BC2320 0001D4 0004+00 0/1 0/0 0/0 .rodata @6230 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6230 = -13168.0f; -COMPILER_STRIP_GATE(80BC231C, &lit_6230); +COMPILER_STRIP_GATE(0x80BC231C, &lit_6230); #pragma pop /* 80BC2320-80BC2324 0001D8 0004+00 0/1 0/0 0/0 .rodata @6231 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6231 = -13389.0f; -COMPILER_STRIP_GATE(80BC2320, &lit_6231); +COMPILER_STRIP_GATE(0x80BC2320, &lit_6231); #pragma pop /* 80BC2324-80BC2328 0001DC 0004+00 0/1 0/0 0/0 .rodata @6232 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6232 = -181.0f; -COMPILER_STRIP_GATE(80BC2324, &lit_6232); +COMPILER_STRIP_GATE(0x80BC2324, &lit_6232); #pragma pop /* 80BC2328-80BC232C 0001E0 0004+00 0/1 0/0 0/0 .rodata @6233 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6233 = -13612.0f; -COMPILER_STRIP_GATE(80BC2328, &lit_6233); +COMPILER_STRIP_GATE(0x80BC2328, &lit_6233); #pragma pop /* 80BC232C-80BC2330 0001E4 0004+00 0/1 0/0 0/0 .rodata @6234 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6234 = -203.0f; -COMPILER_STRIP_GATE(80BC232C, &lit_6234); +COMPILER_STRIP_GATE(0x80BC232C, &lit_6234); #pragma pop /* 80BC2330-80BC2334 0001E8 0004+00 0/1 0/0 0/0 .rodata @6235 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6235 = -13836.0f; -COMPILER_STRIP_GATE(80BC2330, &lit_6235); +COMPILER_STRIP_GATE(0x80BC2330, &lit_6235); #pragma pop /* 80BC2334-80BC2338 0001EC 0004+00 0/1 0/0 0/0 .rodata @6236 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6236 = -215.0f; -COMPILER_STRIP_GATE(80BC2334, &lit_6236); +COMPILER_STRIP_GATE(0x80BC2334, &lit_6236); #pragma pop /* 80BC2338-80BC233C 0001F0 0004+00 0/1 0/0 0/0 .rodata @6237 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6237 = -14061.0f; -COMPILER_STRIP_GATE(80BC2338, &lit_6237); +COMPILER_STRIP_GATE(0x80BC2338, &lit_6237); #pragma pop /* 80BC233C-80BC2340 0001F4 0004+00 0/1 0/0 0/0 .rodata @6238 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6238 = -217.0f; -COMPILER_STRIP_GATE(80BC233C, &lit_6238); +COMPILER_STRIP_GATE(0x80BC233C, &lit_6238); #pragma pop /* 80BC2340-80BC2344 0001F8 0004+00 0/1 0/0 0/0 .rodata @6239 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6239 = -14286.0f; -COMPILER_STRIP_GATE(80BC2340, &lit_6239); +COMPILER_STRIP_GATE(0x80BC2340, &lit_6239); #pragma pop /* 80BC2344-80BC2348 0001FC 0004+00 0/1 0/0 0/0 .rodata @6240 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6240 = -208.0f; -COMPILER_STRIP_GATE(80BC2344, &lit_6240); +COMPILER_STRIP_GATE(0x80BC2344, &lit_6240); #pragma pop /* 80BC2348-80BC234C 000200 0004+00 0/1 0/0 0/0 .rodata @6241 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6241 = -14511.0f; -COMPILER_STRIP_GATE(80BC2348, &lit_6241); +COMPILER_STRIP_GATE(0x80BC2348, &lit_6241); #pragma pop /* 80BC234C-80BC2350 000204 0004+00 0/1 0/0 0/0 .rodata @6242 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6242 = -190.0f; -COMPILER_STRIP_GATE(80BC234C, &lit_6242); +COMPILER_STRIP_GATE(0x80BC234C, &lit_6242); #pragma pop /* 80BC2350-80BC2354 000208 0004+00 0/1 0/0 0/0 .rodata @6243 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6243 = -14735.0f; -COMPILER_STRIP_GATE(80BC2350, &lit_6243); +COMPILER_STRIP_GATE(0x80BC2350, &lit_6243); #pragma pop /* 80BC2354-80BC2358 00020C 0004+00 0/1 0/0 0/0 .rodata @6244 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6244 = -162.0f; -COMPILER_STRIP_GATE(80BC2354, &lit_6244); +COMPILER_STRIP_GATE(0x80BC2354, &lit_6244); #pragma pop /* 80BC2358-80BC235C 000210 0004+00 0/1 0/0 0/0 .rodata @6245 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6245 = -14958.0f; -COMPILER_STRIP_GATE(80BC2358, &lit_6245); +COMPILER_STRIP_GATE(0x80BC2358, &lit_6245); #pragma pop /* 80BC235C-80BC2360 000214 0004+00 0/1 0/0 0/0 .rodata @6246 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6246 = -126.0f; -COMPILER_STRIP_GATE(80BC235C, &lit_6246); +COMPILER_STRIP_GATE(0x80BC235C, &lit_6246); #pragma pop /* 80BC2360-80BC2364 000218 0004+00 0/1 0/0 0/0 .rodata @6247 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6247 = -15180.0f; -COMPILER_STRIP_GATE(80BC2360, &lit_6247); +COMPILER_STRIP_GATE(0x80BC2360, &lit_6247); #pragma pop /* 80BC2364-80BC2368 00021C 0004+00 0/1 0/0 0/0 .rodata @6248 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6248 = -82.0f; -COMPILER_STRIP_GATE(80BC2364, &lit_6248); +COMPILER_STRIP_GATE(0x80BC2364, &lit_6248); #pragma pop /* 80BC2368-80BC236C 000220 0004+00 0/1 0/0 0/0 .rodata @6249 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6249 = -15401.0f; -COMPILER_STRIP_GATE(80BC2368, &lit_6249); +COMPILER_STRIP_GATE(0x80BC2368, &lit_6249); #pragma pop /* 80BC236C-80BC2370 000224 0004+00 0/1 0/0 0/0 .rodata @6250 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6250 = -15620.0f; -COMPILER_STRIP_GATE(80BC236C, &lit_6250); +COMPILER_STRIP_GATE(0x80BC236C, &lit_6250); #pragma pop /* 80BC2370-80BC2374 000228 0004+00 0/1 0/0 0/0 .rodata @6251 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6251 = 24.0f; -COMPILER_STRIP_GATE(80BC2370, &lit_6251); +COMPILER_STRIP_GATE(0x80BC2370, &lit_6251); #pragma pop /* 80BC2374-80BC2378 00022C 0004+00 0/1 0/0 0/0 .rodata @6252 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6252 = -15838.0f; -COMPILER_STRIP_GATE(80BC2374, &lit_6252); +COMPILER_STRIP_GATE(0x80BC2374, &lit_6252); #pragma pop /* 80BC2378-80BC237C 000230 0004+00 0/1 0/0 0/0 .rodata @6253 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6253 = 85.0f; -COMPILER_STRIP_GATE(80BC2378, &lit_6253); +COMPILER_STRIP_GATE(0x80BC2378, &lit_6253); #pragma pop /* 80BC237C-80BC2380 000234 0004+00 0/1 0/0 0/0 .rodata @6254 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6254 = -16054.0f; -COMPILER_STRIP_GATE(80BC237C, &lit_6254); +COMPILER_STRIP_GATE(0x80BC237C, &lit_6254); #pragma pop /* 80BC2380-80BC2384 000238 0004+00 0/1 0/0 0/0 .rodata @6255 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6255 = -16270.0f; -COMPILER_STRIP_GATE(80BC2380, &lit_6255); +COMPILER_STRIP_GATE(0x80BC2380, &lit_6255); #pragma pop /* 80BC2384-80BC2388 00023C 0004+00 0/1 0/0 0/0 .rodata @6256 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6256 = 216.0f; -COMPILER_STRIP_GATE(80BC2384, &lit_6256); +COMPILER_STRIP_GATE(0x80BC2384, &lit_6256); #pragma pop /* 80BC2388-80BC238C 000240 0004+00 0/1 0/0 0/0 .rodata @6257 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6257 = -16485.0f; -COMPILER_STRIP_GATE(80BC2388, &lit_6257); +COMPILER_STRIP_GATE(0x80BC2388, &lit_6257); +#pragma pop + +/* 80BC238C-80BC238C 000244 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80BC2394 = "F_SP104"; +SECTION_DEAD static char const* const stringBase_80BC239C = "D_MN05"; #pragma pop /* 80BC2460-80BC2480 -00001 0020+00 1/0 0/0 0/0 .data l_daObj_Brg_Method */ @@ -2040,11 +2054,4 @@ static u8 data_80BC2798[4]; static u8 data_80BC279C[4]; #pragma pop -/* 80BC238C-80BC23A3 000244 0017+00 3/3 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80BC238C = "Obj_brg"; -SECTION_DEAD static char const* const stringBase_80BC2394 = "F_SP104"; -SECTION_DEAD static char const* const stringBase_80BC239C = "D_MN05"; -#pragma pop +/* 80BC238C-80BC238C 000244 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_bsGate/d_a_obj_bsGate.cpp b/rel/d/a/obj/d_a_obj_bsGate/d_a_obj_bsGate.cpp index 9d8ba8c8835..98ae502aa07 100644 --- a/rel/d/a/obj/d_a_obj_bsGate/d_a_obj_bsGate.cpp +++ b/rel/d/a/obj/d_a_obj_bsGate/d_a_obj_bsGate.cpp @@ -91,10 +91,10 @@ struct dBgS_MoveBgActor { /* 80078950 */ void MoveBGExecute(); }; -struct Vec {}; - struct JAISoundID {}; +struct Vec {}; + struct Z2SeMgr { /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); /* 802AC50C */ void seStartLevel(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); @@ -185,11 +185,11 @@ extern "C" void __register_global_object(); /* ############################################################################################## */ /* 80BC31A0-80BC31A4 000000 0004+00 3/3 0/0 0/0 .rodata @3625 */ SECTION_RODATA static f32 const lit_3625 = 2.0f; -COMPILER_STRIP_GATE(80BC31A0, &lit_3625); +COMPILER_STRIP_GATE(0x80BC31A0, &lit_3625); /* 80BC31A4-80BC31A8 000004 0004+00 1/1 0/0 0/0 .rodata @3626 */ SECTION_RODATA static f32 const lit_3626 = 12.0f; -COMPILER_STRIP_GATE(80BC31A4, &lit_3626); +COMPILER_STRIP_GATE(0x80BC31A4, &lit_3626); /* 80BC31CC-80BC31D8 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { @@ -327,7 +327,7 @@ SECTION_RODATA static u8 const lit_3647[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BC31A8, &lit_3647); +COMPILER_STRIP_GATE(0x80BC31A8, &lit_3647); /* 80BC2910-80BC29AC 000170 009C+00 2/2 0/0 0/0 .text setBaseMtx__10daBsGate_cFv */ #pragma push @@ -339,6 +339,13 @@ asm void daBsGate_c::setBaseMtx() { } #pragma pop +/* ############################################################################################## */ +/* 80BC31C4-80BC31C4 000024 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80BC31C4 = "S_Zgate"; +#pragma pop + /* 80BC29AC-80BC2A18 00020C 006C+00 1/0 0/0 0/0 .text CreateHeap__10daBsGate_cFv */ #pragma push #pragma optimization_level 0 @@ -352,7 +359,7 @@ asm void daBsGate_c::CreateHeap() { /* ############################################################################################## */ /* 80BC31AC-80BC31B0 00000C 0004+00 1/1 0/0 0/0 .rodata @3710 */ SECTION_RODATA static f32 const lit_3710 = -250.0f; -COMPILER_STRIP_GATE(80BC31AC, &lit_3710); +COMPILER_STRIP_GATE(0x80BC31AC, &lit_3710); /* 80BC2A18-80BC2B6C 000278 0154+00 1/1 0/0 0/0 .text create__10daBsGate_cFv */ #pragma push @@ -424,28 +431,28 @@ asm void daBsGate_c::init_modeOpen() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3783 = 1.0f; -COMPILER_STRIP_GATE(80BC31B0, &lit_3783); +COMPILER_STRIP_GATE(0x80BC31B0, &lit_3783); #pragma pop /* 80BC31B4-80BC31B8 000014 0004+00 0/2 0/0 0/0 .rodata @3784 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3784 = -1.0f; -COMPILER_STRIP_GATE(80BC31B4, &lit_3784); +COMPILER_STRIP_GATE(0x80BC31B4, &lit_3784); #pragma pop /* 80BC31B8-80BC31BC 000018 0004+00 0/1 0/0 0/0 .rodata @3785 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3785 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(80BC31B8, &lit_3785); +COMPILER_STRIP_GATE(0x80BC31B8, &lit_3785); #pragma pop /* 80BC31BC-80BC31C0 00001C 0004+00 0/2 0/0 0/0 .rodata @3786 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3786 = 0.5f; -COMPILER_STRIP_GATE(80BC31BC, &lit_3786); +COMPILER_STRIP_GATE(0x80BC31BC, &lit_3786); #pragma pop /* 80BC2CE0-80BC2E34 000540 0154+00 1/0 0/0 0/0 .text modeOpen__10daBsGate_cFv */ @@ -473,7 +480,7 @@ asm void daBsGate_c::init_modeClose() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3820 = 2.0f / 5.0f; -COMPILER_STRIP_GATE(80BC31C0, &lit_3820); +COMPILER_STRIP_GATE(0x80BC31C0, &lit_3820); #pragma pop /* 80BC2E40-80BC2F94 0006A0 0154+00 1/0 0/0 0/0 .text modeClose__10daBsGate_cFv */ @@ -568,12 +575,7 @@ asm void __sinit_d_a_obj_bsGate_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80BC3150 = (void*)__sinit_d_a_obj_bsGate_cpp; +REGISTER_CTORS(0x80BC3150, __sinit_d_a_obj_bsGate_cpp); #pragma pop -/* 80BC31C4-80BC31CC 000024 0008+00 3/3 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80BC31C4 = "S_Zgate"; -#pragma pop +/* 80BC31C4-80BC31C4 000024 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_bubblePilar/d_a_obj_bubblePilar.cpp b/rel/d/a/obj/d_a_obj_bubblePilar/d_a_obj_bubblePilar.cpp index 36acc9b8e43..457061c0fa7 100644 --- a/rel/d/a/obj/d_a_obj_bubblePilar/d_a_obj_bubblePilar.cpp +++ b/rel/d/a/obj/d_a_obj_bubblePilar/d_a_obj_bubblePilar.cpp @@ -70,10 +70,10 @@ struct dRes_control_c { struct dPa_levelEcallBack {}; -struct _GXColor {}; - struct csXyz {}; +struct _GXColor {}; + struct dPa_control_c { struct level_c { /* 8004B918 */ void getEmitter(u32); @@ -150,10 +150,10 @@ struct cBgS { /* 80074250 */ void Release(dBgW_Base*); }; -struct Vec {}; - struct JAISoundID {}; +struct Vec {}; + struct Z2SeMgr { /* 802AC50C */ void seStartLevel(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); }; @@ -428,11 +428,11 @@ SECTION_RODATA u8 const daBubbPilar_c::mCcDObjInfo[48] = { 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BC4070, &daBubbPilar_c::mCcDObjInfo); +COMPILER_STRIP_GATE(0x80BC4070, &daBubbPilar_c::mCcDObjInfo); /* 80BC40A0-80BC40A4 000030 0004+00 1/3 0/0 0/0 .rodata @3654 */ SECTION_RODATA static f32 const lit_3654 = 1.0f; -COMPILER_STRIP_GATE(80BC40A0, &lit_3654); +COMPILER_STRIP_GATE(0x80BC40A0, &lit_3654); /* 80BC3460-80BC3518 000160 00B8+00 2/2 0/0 0/0 .text setBaseMtx__13daBubbPilar_cFv */ #pragma push @@ -444,6 +444,13 @@ asm void daBubbPilar_c::setBaseMtx() { } #pragma pop +/* ############################################################################################## */ +/* 80BC40B4-80BC40B4 000044 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80BC40B4 = "M_Crack"; +#pragma pop + /* 80BC3518-80BC35D0 000218 00B8+00 1/0 0/0 0/0 .text CreateHeap__13daBubbPilar_cFv */ #pragma push #pragma optimization_level 0 @@ -530,14 +537,14 @@ asm void daBubbPilar_c::initModeWait() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3939 = -1.0f; -COMPILER_STRIP_GATE(80BC40A4, &lit_3939); +COMPILER_STRIP_GATE(0x80BC40A4, &lit_3939); #pragma pop /* 80BC40A8-80BC40AC 000038 0004+00 0/1 0/0 0/0 .rodata @3940 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3940 = 100.0f; -COMPILER_STRIP_GATE(80BC40A8, &lit_3940); +COMPILER_STRIP_GATE(0x80BC40A8, &lit_3940); #pragma pop /* 80BC3AC4-80BC3C74 0007C4 01B0+00 1/0 0/0 0/0 .text modeWait__13daBubbPilar_cFv */ @@ -575,7 +582,7 @@ SECTION_RODATA static u8 const particle_id[6 + 2 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BC40AC, &particle_id); +COMPILER_STRIP_GATE(0x80BC40AC, &particle_id); #pragma pop /* 80BC3C98-80BC3DB0 000998 0118+00 1/0 0/0 0/0 .text modeEffOn__13daBubbPilar_cFv */ @@ -682,12 +689,7 @@ asm void __sinit_d_a_obj_bubblePilar_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80BC3FEC = (void*)__sinit_d_a_obj_bubblePilar_cpp; +REGISTER_CTORS(0x80BC3FEC, __sinit_d_a_obj_bubblePilar_cpp); #pragma pop -/* 80BC40B4-80BC40BC 000044 0008+00 3/3 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80BC40B4 = "M_Crack"; -#pragma pop +/* 80BC40B4-80BC40B4 000044 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_burnbox/d_a_obj_burnbox.cpp b/rel/d/a/obj/d_a_obj_burnbox/d_a_obj_burnbox.cpp index c55e249626a..00fc7b9ffaa 100644 --- a/rel/d/a/obj/d_a_obj_burnbox/d_a_obj_burnbox.cpp +++ b/rel/d/a/obj/d_a_obj_burnbox/d_a_obj_burnbox.cpp @@ -51,10 +51,10 @@ struct dRes_control_c { struct dPa_levelEcallBack {}; -struct _GXColor {}; - struct csXyz {}; +struct _GXColor {}; + struct dPa_control_c { /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, @@ -212,13 +212,13 @@ asm void daObjBurnBox_c::setBaseMtx() { SECTION_RODATA static u8 const l_bmd[12] = { 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x03, }; -COMPILER_STRIP_GATE(8046EE48, &l_bmd); +COMPILER_STRIP_GATE(0x8046EE48, &l_bmd); /* 8046EE54-8046EE60 00000C 000C+00 1/1 0/0 0/0 .rodata l_heap_size */ SECTION_RODATA static u8 const l_heap_size[12] = { 0x00, 0x00, 0x08, 0x20, 0x00, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x08, 0x20, }; -COMPILER_STRIP_GATE(8046EE54, &l_heap_size); +COMPILER_STRIP_GATE(0x8046EE54, &l_heap_size); /* 8046EE60-8046EEA4 000018 0044+00 0/1 0/0 0/0 .rodata l_cyl_src */ #pragma push @@ -230,7 +230,7 @@ SECTION_RODATA static u8 const l_cyl_src[68] = { 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0x20, 0x00, 0x00, 0x42, 0xC8, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8046EE60, &l_cyl_src); +COMPILER_STRIP_GATE(0x8046EE60, &l_cyl_src); #pragma pop /* 8046EEA4-8046EEB0 00005C 000A+02 0/1 0/0 0/0 .rodata particle_id$3649 */ @@ -251,35 +251,35 @@ SECTION_RODATA static u8 const particle_id[10 + 2 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(8046EEA4, &particle_id); +COMPILER_STRIP_GATE(0x8046EEA4, &particle_id); #pragma pop /* 8046EEB0-8046EEB4 000068 0004+00 0/1 0/0 0/0 .rodata @3684 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3684 = 37.5f; -COMPILER_STRIP_GATE(8046EEB0, &lit_3684); +COMPILER_STRIP_GATE(0x8046EEB0, &lit_3684); #pragma pop /* 8046EEB4-8046EEB8 00006C 0004+00 0/1 0/0 0/0 .rodata @3685 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3685 = 0.5f; -COMPILER_STRIP_GATE(8046EEB4, &lit_3685); +COMPILER_STRIP_GATE(0x8046EEB4, &lit_3685); #pragma pop /* 8046EEB8-8046EEBC 000070 0004+00 0/1 0/0 0/0 .rodata @3686 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3686 = 75.0f; -COMPILER_STRIP_GATE(8046EEB8, &lit_3686); +COMPILER_STRIP_GATE(0x8046EEB8, &lit_3686); #pragma pop /* 8046EEBC-8046EEC0 000074 0004+00 0/1 0/0 0/0 .rodata @3687 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3687 = 1.0f; -COMPILER_STRIP_GATE(8046EEBC, &lit_3687); +COMPILER_STRIP_GATE(0x8046EEBC, &lit_3687); #pragma pop /* 8046E738-8046E8BC 000118 0184+00 1/0 0/0 0/0 .text Create__14daObjBurnBox_cFv */ @@ -293,6 +293,13 @@ asm void daObjBurnBox_c::Create() { #pragma pop /* ############################################################################################## */ +/* 8046EEC0-8046EEC0 000078 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8046EEC0 = "Kkiba_00"; +SECTION_DEAD static char const* const stringBase_8046EEC9 = "J_taru00"; +#pragma pop + /* 8046EED4-8046EEE0 -00001 000C+00 3/3 0/0 0/0 .data l_arcName */ SECTION_DATA static void* l_arcName[3] = { (void*)&d_a_obj_burnbox__stringBase0, @@ -466,10 +473,4 @@ static asm void daObjBurnBox_MoveBGDraw(daObjBurnBox_c* param_0) { } #pragma pop -/* 8046EEC0-8046EED2 000078 0012+00 1/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_8046EEC0 = "Kkiba_00"; -SECTION_DEAD static char const* const stringBase_8046EEC9 = "J_taru00"; -#pragma pop +/* 8046EEC0-8046EEC0 000078 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_carry/d_a_obj_carry.cpp b/rel/d/a/obj/d_a_obj_carry/d_a_obj_carry.cpp index 0c6b0844ed2..86c07b80e76 100644 --- a/rel/d/a/obj/d_a_obj_carry/d_a_obj_carry.cpp +++ b/rel/d/a/obj/d_a_obj_carry/d_a_obj_carry.cpp @@ -13,12 +13,12 @@ struct request_of_phase_process_class {}; -struct Quaternion {}; - struct csXyz { /* 802673F4 */ csXyz(s16, s16, s16); }; +struct Quaternion {}; + struct mDoMtx_stack_c { /* 8000CD9C */ void transM(f32, f32, f32); /* 8000CF44 */ void ZXYrotM(csXyz const&); @@ -647,7 +647,7 @@ extern "C" static void daObjCarry_Execute__FP12daObjCarry_c(); extern "C" static void daObjCarry_Delete__FP12daObjCarry_c(); extern "C" static void daObjCarry_Create__FP10fopAc_ac_c(); extern "C" void __dt__10cCcD_GSttsFv(); -extern "C" void func_804798D8(s8*); +extern "C" void func_804798D8(void* _this, s8*); extern "C" static void func_804798F4(); extern "C" static void func_804798FC(); extern "C" u8 const mData__12daObjCarry_c[2072]; @@ -880,7 +880,7 @@ SECTION_RODATA static u8 const l_cyl_info[280] = { 0x42, 0xC8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0x48, 0x00, 0x00, 0x42, 0xC8, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8047990C, &l_cyl_info); +COMPILER_STRIP_GATE(0x8047990C, &l_cyl_info); /* 80479A24-8047A23C 000118 0818+00 1/1 0/0 0/0 .rodata mData__12daObjCarry_c */ SECTION_RODATA u8 const daObjCarry_c::mData[2072] = { @@ -1015,7 +1015,7 @@ SECTION_RODATA u8 const daObjCarry_c::mData[2072] = { 0x00, 0x14, 0x00, 0x00, 0x41, 0x20, 0x00, 0x00, 0x3D, 0xCC, 0xCC, 0xCD, 0x3F, 0xC0, 0x00, 0x00, 0x3F, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x0A, 0x00, }; -COMPILER_STRIP_GATE(80479A24, &daObjCarry_c::mData); +COMPILER_STRIP_GATE(0x80479A24, &daObjCarry_c::mData); /* 8047A23C-8047A280 000930 0044+00 0/1 0/0 0/0 .rodata l_cyl_src */ #pragma push @@ -1027,7 +1027,7 @@ SECTION_RODATA static u8 const l_cyl_src[68] = { 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41, 0x20, 0x00, 0x00, 0x42, 0x48, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8047A23C, &l_cyl_src); +COMPILER_STRIP_GATE(0x8047A23C, &l_cyl_src); #pragma pop /* 8047A280-8047A2C0 000974 0040+00 0/1 0/0 0/0 .rodata l_light_at_sph_src */ @@ -1039,7 +1039,7 @@ SECTION_RODATA static u8 const l_light_at_sph_src[64] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x43, 0xFA, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8047A280, &l_light_at_sph_src); +COMPILER_STRIP_GATE(0x8047A280, &l_light_at_sph_src); #pragma pop /* 8047A2C0-8047A30C 0009B4 004C+00 0/1 0/0 0/0 .rodata l_atCpsSrc */ @@ -1052,7 +1052,7 @@ SECTION_RODATA static u8 const l_atCpsSrc[76] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0x20, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8047A2C0, &l_atCpsSrc); +COMPILER_STRIP_GATE(0x8047A2C0, &l_atCpsSrc); #pragma pop /* 8047A30C-8047A350 000A00 0044+00 0/1 0/0 0/0 .rodata l_tg_cyl */ @@ -1065,14 +1065,14 @@ SECTION_RODATA static u8 const l_tg_cyl[68] = { 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0x20, 0x00, 0x00, 0x42, 0x70, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8047A30C, &l_tg_cyl); +COMPILER_STRIP_GATE(0x8047A30C, &l_tg_cyl); #pragma pop /* 8047A350-8047A354 000A44 0004+00 0/0 0/0 0/0 .rodata l_light_color */ #pragma push #pragma force_active on SECTION_RODATA static u32 const l_light_color = 0xFFFFFFFF; -COMPILER_STRIP_GATE(8047A350, &l_light_color); +COMPILER_STRIP_GATE(0x8047A350, &l_light_color); #pragma pop /* 8047A354-8047A35C 000A48 0004+04 7/28 0/0 0/0 .rodata @3899 */ @@ -1087,7 +1087,7 @@ SECTION_RODATA static u8 const lit_3899[4 + 4 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(8047A354, &lit_3899); +COMPILER_STRIP_GATE(0x8047A354, &lit_3899); /* 8047A35C-8047A364 000A50 0008+00 0/7 0/0 0/0 .rodata @3900 */ #pragma push @@ -1095,7 +1095,7 @@ COMPILER_STRIP_GATE(8047A354, &lit_3899); SECTION_RODATA static u8 const lit_3900[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8047A35C, &lit_3900); +COMPILER_STRIP_GATE(0x8047A35C, &lit_3900); #pragma pop /* 8047A364-8047A36C 000A58 0008+00 0/7 0/0 0/0 .rodata @3901 */ @@ -1104,7 +1104,7 @@ COMPILER_STRIP_GATE(8047A35C, &lit_3900); SECTION_RODATA static u8 const lit_3901[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8047A364, &lit_3901); +COMPILER_STRIP_GATE(0x8047A364, &lit_3901); #pragma pop /* 8047A36C-8047A374 000A60 0008+00 0/7 0/0 0/0 .rodata @3902 */ @@ -1113,7 +1113,38 @@ COMPILER_STRIP_GATE(8047A364, &lit_3901); SECTION_RODATA static u8 const lit_3902[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8047A36C, &lit_3902); +COMPILER_STRIP_GATE(0x8047A36C, &lit_3902); +#pragma pop + +/* 8047A4BC-8047A4BC 000BB0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8047A4BC = "J_tubo_00"; +SECTION_DEAD static char const* const stringBase_8047A4C6 = "J_tubo_01"; +SECTION_DEAD static char const* const stringBase_8047A4D0 = "Kkiba_00"; +SECTION_DEAD static char const* const stringBase_8047A4D9 = "Y_ironbal"; +SECTION_DEAD static char const* const stringBase_8047A4E3 = "J_taru00"; +SECTION_DEAD static char const* const stringBase_8047A4EC = "J_doku00"; +SECTION_DEAD static char const* const stringBase_8047A4F5 = "Obj_bkl"; +SECTION_DEAD static char const* const stringBase_8047A4FD = "K_tubo02"; +SECTION_DEAD static char const* const stringBase_8047A506 = "Obj_ballS"; +SECTION_DEAD static char const* const stringBase_8047A510 = "D_aotubo0"; +SECTION_DEAD static char const* const stringBase_8047A51A = "Obj_tama"; +SECTION_DEAD static char const* const stringBase_8047A523 = "O_tuboS"; +SECTION_DEAD static char const* const stringBase_8047A52B = "O_tuboB"; +SECTION_DEAD static char const* const stringBase_8047A533 = "J_tubo_00.bmd"; +SECTION_DEAD static char const* const stringBase_8047A541 = "J_tubo_01.bmd"; +SECTION_DEAD static char const* const stringBase_8047A54F = "J_hako_00.bmd"; +SECTION_DEAD static char const* const stringBase_8047A55D = "Yironball.bmd"; +SECTION_DEAD static char const* const stringBase_8047A56B = "J_taru_00.bmd"; +SECTION_DEAD static char const* const stringBase_8047A579 = "J_doku_00.bmd"; +SECTION_DEAD static char const* const stringBase_8047A587 = "K_hb00.bmd"; +SECTION_DEAD static char const* const stringBase_8047A592 = "K_tubo02.bmd"; +SECTION_DEAD static char const* const stringBase_8047A59F = "LV8_OBJ_HikariS.bmd"; +SECTION_DEAD static char const* const stringBase_8047A5B3 = "D_aotubo00.bmd"; +SECTION_DEAD static char const* const stringBase_8047A5C2 = "LV8_tama.bmd"; +SECTION_DEAD static char const* const stringBase_8047A5CF = "O_tuboS_LV8.bmd"; +SECTION_DEAD static char const* const stringBase_8047A5DF = "O_tuboB_LV8.bmd"; #pragma pop /* 8047A650-8047A65C 000000 000C+00 7/7 0/0 0/0 .data cNullVec__6Z2Calc */ @@ -2486,28 +2517,28 @@ static void TgHitCallBackBase(fopAc_ac_c* param_0, dCcD_GObjInf* param_1, fopAc_ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3927 = 6000.0f; -COMPILER_STRIP_GATE(8047A374, &lit_3927); +COMPILER_STRIP_GATE(0x8047A374, &lit_3927); #pragma pop /* 8047A378-8047A37C 000A6C 0004+00 0/1 0/0 0/0 .rodata @3928 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3928 = 2000.0f; -COMPILER_STRIP_GATE(8047A378, &lit_3928); +COMPILER_STRIP_GATE(0x8047A378, &lit_3928); #pragma pop /* 8047A37C-8047A380 000A70 0004+00 0/3 0/0 0/0 .rodata @3929 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3929 = 4000.0f; -COMPILER_STRIP_GATE(8047A37C, &lit_3929); +COMPILER_STRIP_GATE(0x8047A37C, &lit_3929); #pragma pop /* 8047A380-8047A384 000A74 0004+00 0/1 0/0 0/0 .rodata @3930 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3930 = 1500.0f; -COMPILER_STRIP_GATE(8047A380, &lit_3930); +COMPILER_STRIP_GATE(0x8047A380, &lit_3930); #pragma pop /* 8046F340-8046F3E0 0003C0 00A0+00 1/0 0/0 0/0 .text @@ -2532,34 +2563,34 @@ static void CoHitCallBackBase(fopAc_ac_c* param_0, dCcD_GObjInf* param_1, fopAc_ /* ############################################################################################## */ /* 8047A384-8047A388 000A78 0004+00 2/7 0/0 0/0 .rodata @3958 */ SECTION_RODATA static f32 const lit_3958 = 0.5f; -COMPILER_STRIP_GATE(8047A384, &lit_3958); +COMPILER_STRIP_GATE(0x8047A384, &lit_3958); /* 8047A388-8047A38C 000A7C 0004+00 0/2 0/0 0/0 .rodata @3959 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3959 = 800.0f; -COMPILER_STRIP_GATE(8047A388, &lit_3959); +COMPILER_STRIP_GATE(0x8047A388, &lit_3959); #pragma pop /* 8047A38C-8047A390 000A80 0004+00 0/1 0/0 0/0 .rodata @3960 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3960 = 400.0f; -COMPILER_STRIP_GATE(8047A38C, &lit_3960); +COMPILER_STRIP_GATE(0x8047A38C, &lit_3960); #pragma pop /* 8047A390-8047A394 000A84 0004+00 0/4 0/0 0/0 .rodata @3961 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3961 = 500.0f; -COMPILER_STRIP_GATE(8047A390, &lit_3961); +COMPILER_STRIP_GATE(0x8047A390, &lit_3961); #pragma pop /* 8047A394-8047A398 000A88 0004+00 0/1 0/0 0/0 .rodata @3962 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3962 = 300.0f; -COMPILER_STRIP_GATE(8047A394, &lit_3962); +COMPILER_STRIP_GATE(0x8047A394, &lit_3962); #pragma pop /* 8046F3E4-8046F4AC 000464 00C8+00 1/0 0/0 0/0 .text @@ -2683,21 +2714,21 @@ asm void daObjCarry_c::initBaseMtx() { #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4166 = 0x38C90FDB; -COMPILER_STRIP_GATE(8047A398, &lit_4166); +COMPILER_STRIP_GATE(0x8047A398, &lit_4166); #pragma pop /* 8047A39C-8047A3A0 000A90 0004+00 0/1 0/0 0/0 .rodata @4167 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4167 = 35.0f; -COMPILER_STRIP_GATE(8047A39C, &lit_4167); +COMPILER_STRIP_GATE(0x8047A39C, &lit_4167); #pragma pop /* 8047A3A0-8047A3A4 000A94 0004+00 0/1 0/0 0/0 .rodata @4168 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4168 = -25.0f; -COMPILER_STRIP_GATE(8047A3A0, &lit_4168); +COMPILER_STRIP_GATE(0x8047A3A0, &lit_4168); #pragma pop /* 8047A3A4-8047A3AC 000A98 0004+04 0/1 0/0 0/0 .rodata @4169 */ @@ -2708,14 +2739,14 @@ SECTION_RODATA static f32 const lit_4169[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(8047A3A4, &lit_4169); +COMPILER_STRIP_GATE(0x8047A3A4, &lit_4169); #pragma pop /* 8047A3AC-8047A3B4 000AA0 0008+00 2/8 0/0 0/0 .rodata @4171 */ SECTION_RODATA static u8 const lit_4171[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8047A3AC, &lit_4171); +COMPILER_STRIP_GATE(0x8047A3AC, &lit_4171); /* 8046F7AC-8046FACC 00082C 0320+00 3/4 0/0 0/0 .text setBaseMtx__12daObjCarry_cFv */ #pragma push @@ -2863,25 +2894,25 @@ asm void daObjCarry_c::checkCarryOneHand() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4594 = 80.0f; -COMPILER_STRIP_GATE(8047A3B4, &lit_4594); +COMPILER_STRIP_GATE(0x8047A3B4, &lit_4594); #pragma pop /* 8047A3B8-8047A3BC 000AAC 0004+00 1/6 0/0 0/0 .rodata @4595 */ SECTION_RODATA static f32 const lit_4595 = 100.0f; -COMPILER_STRIP_GATE(8047A3B8, &lit_4595); +COMPILER_STRIP_GATE(0x8047A3B8, &lit_4595); /* 8047A3BC-8047A3C0 000AB0 0004+00 0/4 0/0 0/0 .rodata @4596 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4596 = 10.0f; -COMPILER_STRIP_GATE(8047A3BC, &lit_4596); +COMPILER_STRIP_GATE(0x8047A3BC, &lit_4596); #pragma pop /* 8047A3C0-8047A3C4 000AB4 0004+00 0/3 0/0 0/0 .rodata @4597 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4597 = 30.0f; -COMPILER_STRIP_GATE(8047A3C0, &lit_4597); +COMPILER_STRIP_GATE(0x8047A3C0, &lit_4597); #pragma pop /* 804700F0-804705DC 001170 04EC+00 1/1 0/0 0/0 .text Create__12daObjCarry_cFv */ @@ -2894,6 +2925,13 @@ asm void daObjCarry_c::Create() { } #pragma pop +/* ############################################################################################## */ +/* 8047A4BC-8047A4BC 000BB0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8047A5EF = "D_MN05A"; +#pragma pop + /* 804705DC-80470650 00165C 0074+00 3/0 0/0 0/0 .text CreateInit_tsubo__12daObjCarry_cFv */ #pragma push @@ -2964,19 +3002,19 @@ asm void daObjCarry_c::CreateInit_dokuro() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4683 = 15.0f; -COMPILER_STRIP_GATE(8047A3C4, &lit_4683); +COMPILER_STRIP_GATE(0x8047A3C4, &lit_4683); #pragma pop /* 8047A3C8-8047A3CC 000ABC 0004+00 0/2 0/0 0/0 .rodata @4684 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4684 = 20.0f; -COMPILER_STRIP_GATE(8047A3C8, &lit_4684); +COMPILER_STRIP_GATE(0x8047A3C8, &lit_4684); #pragma pop /* 8047A3CC-8047A3D0 000AC0 0004+00 13/24 0/0 0/0 .rodata @4685 */ SECTION_RODATA static f32 const lit_4685 = 1.0f; -COMPILER_STRIP_GATE(8047A3CC, &lit_4685); +COMPILER_STRIP_GATE(0x8047A3CC, &lit_4685); /* 80470890-804709DC 001910 014C+00 1/0 0/0 0/0 .text CreateInit_bokkuri__12daObjCarry_cFv */ #pragma push @@ -2991,7 +3029,7 @@ asm void daObjCarry_c::CreateInit_bokkuri() { /* ############################################################################################## */ /* 8047A3D0-8047A3D4 000AC4 0004+00 1/1 0/0 0/0 .rodata @4707 */ SECTION_RODATA static f32 const lit_4707 = 750.0f; -COMPILER_STRIP_GATE(8047A3D0, &lit_4707); +COMPILER_STRIP_GATE(0x8047A3D0, &lit_4707); /* 804709DC-80470AB4 001A5C 00D8+00 2/0 0/0 0/0 .text CreateInit_LightBall__12daObjCarry_cFv */ #pragma push @@ -3038,7 +3076,7 @@ asm void daObjCarry_c::create() { SECTION_RODATA static u8 const l_event_bitA[12] = { 0x43, 0x04, 0x43, 0x02, 0x43, 0x01, 0x44, 0x80, 0x44, 0x40, 0x44, 0x20, }; -COMPILER_STRIP_GATE(8047A3D4, &l_event_bitA); +COMPILER_STRIP_GATE(0x8047A3D4, &l_event_bitA); /* 80470CF0-8047114C 001D70 045C+00 1/1 0/0 0/0 .text checkCreate_LightBallA__12daObjCarry_cFv */ #pragma push @@ -3055,7 +3093,7 @@ asm void daObjCarry_c::checkCreate_LightBallA() { SECTION_RODATA static u8 const l_event_bitB[12] = { 0x44, 0x10, 0x44, 0x08, 0x44, 0x04, 0x44, 0x02, 0x44, 0x01, 0x45, 0x80, }; -COMPILER_STRIP_GATE(8047A3E0, &l_event_bitB); +COMPILER_STRIP_GATE(0x8047A3E0, &l_event_bitB); /* 8047114C-804715A8 0021CC 045C+00 1/1 0/0 0/0 .text checkCreate_LightBallB__12daObjCarry_cFv */ #pragma push @@ -3082,7 +3120,7 @@ asm void daObjCarry_c::checkCreate_Lv8Ball() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5096 = -3930.0f; -COMPILER_STRIP_GATE(8047A3EC, &lit_5096); +COMPILER_STRIP_GATE(0x8047A3EC, &lit_5096); #pragma pop /* 80471680-804716D4 002700 0054+00 1/1 0/0 0/0 .text resetIconPosForLightBallA__12daObjCarry_cFv @@ -3101,35 +3139,35 @@ asm void daObjCarry_c::resetIconPosForLightBallA() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5121 = -210.0f; -COMPILER_STRIP_GATE(8047A3F0, &lit_5121); +COMPILER_STRIP_GATE(0x8047A3F0, &lit_5121); #pragma pop /* 8047A3F4-8047A3F8 000AE8 0004+00 0/2 0/0 0/0 .rodata @5122 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5122 = 11000.0f; -COMPILER_STRIP_GATE(8047A3F4, &lit_5122); +COMPILER_STRIP_GATE(0x8047A3F4, &lit_5122); #pragma pop /* 8047A3F8-8047A3FC 000AEC 0004+00 0/1 0/0 0/0 .rodata @5123 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5123 = -4700.0f; -COMPILER_STRIP_GATE(8047A3F8, &lit_5123); +COMPILER_STRIP_GATE(0x8047A3F8, &lit_5123); #pragma pop /* 8047A3FC-8047A400 000AF0 0004+00 0/2 0/0 0/0 .rodata @5124 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5124 = -590.0f; -COMPILER_STRIP_GATE(8047A3FC, &lit_5124); +COMPILER_STRIP_GATE(0x8047A3FC, &lit_5124); #pragma pop /* 8047A400-8047A404 000AF4 0004+00 0/2 0/0 0/0 .rodata @5125 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5125 = 11600.0f; -COMPILER_STRIP_GATE(8047A400, &lit_5125); +COMPILER_STRIP_GATE(0x8047A400, &lit_5125); #pragma pop /* 804716D4-804717B4 002754 00E0+00 1/1 0/0 0/0 .text @@ -3148,7 +3186,7 @@ asm void daObjCarry_c::setIconPosForLightBallAAtR00() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5150 = 5100.0f; -COMPILER_STRIP_GATE(8047A404, &lit_5150); +COMPILER_STRIP_GATE(0x8047A404, &lit_5150); #pragma pop /* 804717B4-80471894 002834 00E0+00 1/1 0/0 0/0 .text @@ -3178,26 +3216,26 @@ asm void daObjCarry_c::resetIconPosForLightBallB() { #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_5174 = 0x5F5F5FFF; -COMPILER_STRIP_GATE(8047A408, &lit_5174); +COMPILER_STRIP_GATE(0x8047A408, &lit_5174); #pragma pop /* 8047A40C-8047A410 000B00 0004+00 5/9 0/0 0/0 .rodata @5550 */ SECTION_RODATA static f32 const lit_5550 = -1.0f; -COMPILER_STRIP_GATE(8047A40C, &lit_5550); +COMPILER_STRIP_GATE(0x8047A40C, &lit_5550); /* 8047A410-8047A414 000B04 0004+00 1/6 0/0 0/0 .rodata @5551 */ SECTION_RODATA static f32 const lit_5551 = 1.0f / 20.0f; -COMPILER_STRIP_GATE(8047A410, &lit_5551); +COMPILER_STRIP_GATE(0x8047A410, &lit_5551); /* 8047A414-8047A418 000B08 0004+00 1/6 0/0 0/0 .rodata @5552 */ SECTION_RODATA static f32 const lit_5552 = 2.0f; -COMPILER_STRIP_GATE(8047A414, &lit_5552); +COMPILER_STRIP_GATE(0x8047A414, &lit_5552); /* 8047A418-8047A41C 000B0C 0004+00 0/1 0/0 0/0 .rodata @5553 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5553 = 10000.0f; -COMPILER_STRIP_GATE(8047A418, &lit_5553); +COMPILER_STRIP_GATE(0x8047A418, &lit_5553); #pragma pop /* 804718E8-8047233C 002968 0A54+00 1/1 0/0 0/0 .text execute__12daObjCarry_cFv */ @@ -3220,6 +3258,14 @@ asm void daObjCarry_c::checkCulling() { } #pragma pop +/* ############################################################################################## */ +/* 8047A4BC-8047A4BC 000BB0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8047A5F7 = "cc_ball"; +SECTION_DEAD static char const* const stringBase_8047A5FF = "aa_hikari"; +#pragma pop + /* 80472460-80472730 0034E0 02D0+00 1/1 0/0 0/0 .text draw__12daObjCarry_cFv */ #pragma push #pragma optimization_level 0 @@ -3238,7 +3284,13 @@ void daObjCarry_c::debugDraw() { /* ############################################################################################## */ /* 8047A41C-8047A420 000B10 0004+00 1/4 0/0 0/0 .rodata @5812 */ SECTION_RODATA static f32 const lit_5812 = -1000000000.0f; -COMPILER_STRIP_GATE(8047A41C, &lit_5812); +COMPILER_STRIP_GATE(0x8047A41C, &lit_5812); + +/* 8047A4BC-8047A4BC 000BB0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8047A609 = "ミドナヒント用スイッチ立てました！\n"; +#pragma pop /* 80472734-80472B54 0037B4 0420+00 1/1 0/0 0/0 .text _delete__12daObjCarry_cFv */ #pragma push @@ -3255,14 +3307,14 @@ asm void daObjCarry_c::_delete() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5875 = 5000.0f; -COMPILER_STRIP_GATE(8047A420, &lit_5875); +COMPILER_STRIP_GATE(0x8047A420, &lit_5875); #pragma pop /* 8047A424-8047A428 000B18 0004+00 0/2 0/0 0/0 .rodata @5876 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5876 = -20.0f; -COMPILER_STRIP_GATE(8047A424, &lit_5876); +COMPILER_STRIP_GATE(0x8047A424, &lit_5876); #pragma pop /* 80472B54-80472D8C 003BD4 0238+00 1/1 0/0 0/0 .text crr_pos__12daObjCarry_cFv */ @@ -3300,14 +3352,14 @@ asm void daObjCarry_c::calc_gravity() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5949 = 50.0f; -COMPILER_STRIP_GATE(8047A428, &lit_5949); +COMPILER_STRIP_GATE(0x8047A428, &lit_5949); #pragma pop /* 8047A42C-8047A430 000B20 0004+00 0/2 0/0 0/0 .rodata @5950 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_5950 = 0x43360B61; -COMPILER_STRIP_GATE(8047A42C, &lit_5950); +COMPILER_STRIP_GATE(0x8047A42C, &lit_5950); #pragma pop /* 80472EF0-80473050 003F70 0160+00 1/1 0/0 0/0 .text checkRollAngle__12daObjCarry_cFv */ @@ -3323,7 +3375,7 @@ asm void daObjCarry_c::checkRollAngle() { /* ############################################################################################## */ /* 8047A430-8047A434 000B24 0004+00 1/1 0/0 0/0 .rodata @6023 */ SECTION_RODATA static f32 const lit_6023 = 250.0f; -COMPILER_STRIP_GATE(8047A430, &lit_6023); +COMPILER_STRIP_GATE(0x8047A430, &lit_6023); /* 8047B1DC-8047B1E0 -00001 0004+00 4/4 0/0 0/0 .bss None */ /* 8047B1DC 0001+00 data_8047B1DC None */ @@ -3345,7 +3397,7 @@ asm void daObjCarry_c::mode_proc_call() { /* ############################################################################################## */ /* 8047A434-8047A438 000B28 0004+00 8/9 0/0 0/0 .rodata @6043 */ SECTION_RODATA static f32 const lit_6043 = -100.0f; -COMPILER_STRIP_GATE(8047A434, &lit_6043); +COMPILER_STRIP_GATE(0x8047A434, &lit_6043); /* 804733E8-804734B0 004468 00C8+00 15/15 0/0 0/0 .text mode_init_wait__12daObjCarry_cFv */ @@ -3384,35 +3436,35 @@ asm void daObjCarry_c::mode_init_walk(u8 param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6324 = 25.0f; -COMPILER_STRIP_GATE(8047A438, &lit_6324); +COMPILER_STRIP_GATE(0x8047A438, &lit_6324); #pragma pop /* 8047A43C-8047A440 000B30 0004+00 0/3 0/0 0/0 .rodata @6325 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6325 = 4.0f / 5.0f; -COMPILER_STRIP_GATE(8047A43C, &lit_6325); +COMPILER_STRIP_GATE(0x8047A43C, &lit_6325); #pragma pop /* 8047A440-8047A444 000B34 0004+00 0/5 0/0 0/0 .rodata @6326 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6326 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(8047A440, &lit_6326); +COMPILER_STRIP_GATE(0x8047A440, &lit_6326); #pragma pop /* 8047A444-8047A448 000B38 0004+00 0/3 0/0 0/0 .rodata @6327 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6327 = 9.0f / 10.0f; -COMPILER_STRIP_GATE(8047A444, &lit_6327); +COMPILER_STRIP_GATE(0x8047A444, &lit_6327); #pragma pop /* 8047A448-8047A44C 000B3C 0004+00 0/1 0/0 0/0 .rodata @6328 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_6328 = 0x3C23D70B; -COMPILER_STRIP_GATE(8047A448, &lit_6328); +COMPILER_STRIP_GATE(0x8047A448, &lit_6328); #pragma pop /* 804737CC-80473ED8 00484C 070C+00 1/0 0/0 0/0 .text mode_proc_walk__12daObjCarry_cFv */ @@ -3450,7 +3502,7 @@ asm void daObjCarry_c::mode_proc_carry() { /* ############################################################################################## */ /* 8047A44C-8047A450 000B40 0004+00 2/2 0/0 0/0 .rodata @6496 */ SECTION_RODATA static f32 const lit_6496 = -2.0f; -COMPILER_STRIP_GATE(8047A44C, &lit_6496); +COMPILER_STRIP_GATE(0x8047A44C, &lit_6496); /* 80474448-80474540 0054C8 00F8+00 3/3 0/0 1/1 .text mode_init_drop__12daObjCarry_cFUc */ @@ -3466,7 +3518,7 @@ asm void daObjCarry_c::mode_init_drop(u8 param_0) { /* ############################################################################################## */ /* 8047A450-8047A454 000B44 0004+00 1/1 0/0 0/0 .rodata @6526 */ SECTION_RODATA static f32 const lit_6526 = 40.0f; -COMPILER_STRIP_GATE(8047A450, &lit_6526); +COMPILER_STRIP_GATE(0x8047A450, &lit_6526); /* 80474540-80474618 0055C0 00D8+00 1/0 0/0 0/0 .text mode_proc_drop__12daObjCarry_cFv */ #pragma push @@ -3483,21 +3535,21 @@ asm void daObjCarry_c::mode_proc_drop() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6564 = 3000.0f; -COMPILER_STRIP_GATE(8047A454, &lit_6564); +COMPILER_STRIP_GATE(0x8047A454, &lit_6564); #pragma pop /* 8047A458-8047A45C 000B4C 0004+00 0/1 0/0 0/0 .rodata @6565 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6565 = -12.0f; -COMPILER_STRIP_GATE(8047A458, &lit_6565); +COMPILER_STRIP_GATE(0x8047A458, &lit_6565); #pragma pop /* 8047A45C-8047A460 000B50 0004+00 0/1 0/0 0/0 .rodata @6566 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6566 = -10.0f; -COMPILER_STRIP_GATE(8047A45C, &lit_6566); +COMPILER_STRIP_GATE(0x8047A45C, &lit_6566); #pragma pop /* 80474618-80474734 005698 011C+00 2/2 0/0 0/0 .text mode_init_float__12daObjCarry_cFv @@ -3516,28 +3568,28 @@ asm void daObjCarry_c::mode_init_float() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6619 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(8047A460, &lit_6619); +COMPILER_STRIP_GATE(0x8047A460, &lit_6619); #pragma pop /* 8047A464-8047A468 000B58 0004+00 0/3 0/0 0/0 .rodata @6620 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6620 = 1.0f / 100.0f; -COMPILER_STRIP_GATE(8047A464, &lit_6620); +COMPILER_STRIP_GATE(0x8047A464, &lit_6620); #pragma pop /* 8047A468-8047A46C 000B5C 0004+00 0/1 0/0 0/0 .rodata @6621 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6621 = 1200.0f; -COMPILER_STRIP_GATE(8047A468, &lit_6621); +COMPILER_STRIP_GATE(0x8047A468, &lit_6621); #pragma pop /* 8047A46C-8047A470 000B60 0004+00 0/1 0/0 0/0 .rodata @6622 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6622 = 3.0f / 100.0f; -COMPILER_STRIP_GATE(8047A46C, &lit_6622); +COMPILER_STRIP_GATE(0x8047A46C, &lit_6622); #pragma pop /* 80474734-80474A08 0057B4 02D4+00 1/0 0/0 0/0 .text mode_proc_float__12daObjCarry_cFv @@ -3556,35 +3608,35 @@ asm void daObjCarry_c::mode_proc_float() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6683 = -5.0f; -COMPILER_STRIP_GATE(8047A470, &lit_6683); +COMPILER_STRIP_GATE(0x8047A470, &lit_6683); #pragma pop /* 8047A474-8047A478 000B68 0004+00 0/2 0/0 0/0 .rodata @6684 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6684 = 5.0f; -COMPILER_STRIP_GATE(8047A474, &lit_6684); +COMPILER_STRIP_GATE(0x8047A474, &lit_6684); #pragma pop /* 8047A478-8047A47C 000B6C 0004+00 0/3 0/0 0/0 .rodata @6685 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6685 = -15.0f; -COMPILER_STRIP_GATE(8047A478, &lit_6685); +COMPILER_STRIP_GATE(0x8047A478, &lit_6685); #pragma pop /* 8047A47C-8047A480 000B70 0004+00 0/2 0/0 0/0 .rodata @6686 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6686 = 13.0f; -COMPILER_STRIP_GATE(8047A47C, &lit_6686); +COMPILER_STRIP_GATE(0x8047A47C, &lit_6686); #pragma pop /* 8047A480-8047A484 000B74 0004+00 0/2 0/0 0/0 .rodata @6687 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6687 = -0.25f; -COMPILER_STRIP_GATE(8047A480, &lit_6687); +COMPILER_STRIP_GATE(0x8047A480, &lit_6687); #pragma pop /* 80474A08-80474B8C 005A88 0184+00 2/2 0/0 0/0 .text mode_init_sink__12daObjCarry_cFv */ @@ -3610,7 +3662,7 @@ asm void daObjCarry_c::mode_proc_sink() { /* ############################################################################################## */ /* 8047A484-8047A488 000B78 0004+00 1/1 0/0 0/0 .rodata @6757 */ SECTION_RODATA static f32 const lit_6757 = -6.0f; -COMPILER_STRIP_GATE(8047A484, &lit_6757); +COMPILER_STRIP_GATE(0x8047A484, &lit_6757); /* 80474D64-80474E08 005DE4 00A4+00 1/1 0/0 0/0 .text mode_init_yogan__12daObjCarry_cFv */ @@ -3626,11 +3678,11 @@ asm void daObjCarry_c::mode_init_yogan() { /* ############################################################################################## */ /* 8047A488-8047A48C 000B7C 0004+00 1/1 0/0 0/0 .rodata @6767 */ SECTION_RODATA static f32 const lit_6767 = 200.0f; -COMPILER_STRIP_GATE(8047A488, &lit_6767); +COMPILER_STRIP_GATE(0x8047A488, &lit_6767); /* 8047A48C-8047A490 000B80 0004+00 1/1 0/0 0/0 .rodata @6768 */ SECTION_RODATA static f32 const lit_6768 = 13.0f / 20.0f; -COMPILER_STRIP_GATE(8047A48C, &lit_6768); +COMPILER_STRIP_GATE(0x8047A48C, &lit_6768); /* 80474E08-80474E98 005E88 0090+00 1/0 0/0 0/0 .text mode_proc_yogan__12daObjCarry_cFv */ @@ -3830,21 +3882,21 @@ asm void daObjCarry_c::chkSinkObj() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7451 = 8.0f; -COMPILER_STRIP_GATE(8047A490, &lit_7451); +COMPILER_STRIP_GATE(0x8047A490, &lit_7451); #pragma pop /* 8047A494-8047A498 000B88 0004+00 0/1 0/0 0/0 .rodata @7452 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7452 = 1000.0f; -COMPILER_STRIP_GATE(8047A494, &lit_7452); +COMPILER_STRIP_GATE(0x8047A494, &lit_7452); #pragma pop /* 8047A498-8047A49C 000B8C 0004+00 0/1 0/0 0/0 .rodata @7453 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7453 = 900.0f; -COMPILER_STRIP_GATE(8047A498, &lit_7453); +COMPILER_STRIP_GATE(0x8047A498, &lit_7453); #pragma pop /* 8047573C-80476618 0067BC 0EDC+00 1/1 0/0 0/0 .text bg_check__12daObjCarry_cFv */ @@ -3857,6 +3909,13 @@ asm void daObjCarry_c::bg_check() { } #pragma pop +/* ############################################################################################## */ +/* 8047A4BC-8047A4BC 000BB0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8047A62D = "R_SP160"; +#pragma pop + /* 80476618-80476764 007698 014C+00 2/2 0/0 0/0 .text check_bg_damage_proc_base__12daObjCarry_cFv */ #pragma push @@ -4046,6 +4105,13 @@ bool daObjCarry_c::cc_damage_proc_Lv8Ball() { return false; } +/* ############################################################################################## */ +/* 8047A4BC-8047A4BC 000BB0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8047A635 = "Always"; +#pragma pop + /* 804771C0-8047731C 008240 015C+00 7/7 0/0 0/0 .text eff_break_tuboBmd__12daObjCarry_cFUs4cXyz */ #pragma push #pragma optimization_level 0 @@ -4069,7 +4135,13 @@ SECTION_RODATA static u8 const particle_id_7795[6 + 2 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(8047A49C, &particle_id_7795); +COMPILER_STRIP_GATE(0x8047A49C, &particle_id_7795); + +/* 8047A4BC-8047A4BC 000BB0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8047A63C = "BreakWoodBox.bmd"; +#pragma pop /* 8047731C-8047747C 00839C 0160+00 2/2 0/0 0/0 .text eff_break_kibakoBmd__12daObjCarry_cF4cXyz */ #pragma push @@ -4095,7 +4167,7 @@ asm void daObjCarry_c::eff_break_tsubo() { /* ############################################################################################## */ /* 8047A4A4-8047A4A8 000B98 0004+00 3/3 0/0 0/0 .rodata @7860 */ SECTION_RODATA static f32 const lit_7860 = 1.5f; -COMPILER_STRIP_GATE(8047A4A4, &lit_7860); +COMPILER_STRIP_GATE(0x8047A4A4, &lit_7860); /* 804774D4-8047752C 008554 0058+00 1/0 0/0 0/0 .text eff_break_ootubo__12daObjCarry_cFv */ @@ -4127,7 +4199,7 @@ void daObjCarry_c::eff_break_ironball() { /* ############################################################################################## */ /* 8047A4A8-8047A4AC 000B9C 0004+00 1/1 0/0 0/0 .rodata @7891 */ SECTION_RODATA static f32 const lit_7891 = 0.75f; -COMPILER_STRIP_GATE(8047A4A8, &lit_7891); +COMPILER_STRIP_GATE(0x8047A4A8, &lit_7891); /* 80477578-804775BC 0085F8 0044+00 1/0 0/0 0/0 .text eff_break_taru__12daObjCarry_cFv */ #pragma push @@ -4165,7 +4237,7 @@ SECTION_RODATA static u8 const particle_id_7914[6 + 2 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(8047A4AC, &particle_id_7914); +COMPILER_STRIP_GATE(0x8047A4AC, &particle_id_7914); #pragma pop /* 80477614-80477798 008694 0184+00 1/0 0/0 0/0 .text eff_break_bokkuri__12daObjCarry_cFv @@ -4278,7 +4350,7 @@ asm void daObjCarry_c::se_fall_water() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8198 = 0.25f; -COMPILER_STRIP_GATE(8047A4B4, &lit_8198); +COMPILER_STRIP_GATE(0x8047A4B4, &lit_8198); #pragma pop /* 80477B1C-80477FE0 008B9C 04C4+00 7/7 0/0 0/0 .text calc_rot_axis_base__12daObjCarry_cFUc */ @@ -4628,7 +4700,7 @@ asm cCcD_GStts::~cCcD_GStts() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_804798D8(s8* param_0) { +extern "C" asm void func_804798D8(void* _this, s8* param_0) { nofralloc #include "asm/rel/d/a/obj/d_a_obj_carry/d_a_obj_carry/func_804798D8.s" } @@ -4659,44 +4731,7 @@ static asm void func_804798FC() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8553 = 1.0f / 25.0f; -COMPILER_STRIP_GATE(8047A4B8, &lit_8553); +COMPILER_STRIP_GATE(0x8047A4B8, &lit_8553); #pragma pop -/* 8047A4BC-8047A64D 000BB0 0191+00 9/7 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_8047A4BC = "J_tubo_00"; -SECTION_DEAD static char const* const stringBase_8047A4C6 = "J_tubo_01"; -SECTION_DEAD static char const* const stringBase_8047A4D0 = "Kkiba_00"; -SECTION_DEAD static char const* const stringBase_8047A4D9 = "Y_ironbal"; -SECTION_DEAD static char const* const stringBase_8047A4E3 = "J_taru00"; -SECTION_DEAD static char const* const stringBase_8047A4EC = "J_doku00"; -SECTION_DEAD static char const* const stringBase_8047A4F5 = "Obj_bkl"; -SECTION_DEAD static char const* const stringBase_8047A4FD = "K_tubo02"; -SECTION_DEAD static char const* const stringBase_8047A506 = "Obj_ballS"; -SECTION_DEAD static char const* const stringBase_8047A510 = "D_aotubo0"; -SECTION_DEAD static char const* const stringBase_8047A51A = "Obj_tama"; -SECTION_DEAD static char const* const stringBase_8047A523 = "O_tuboS"; -SECTION_DEAD static char const* const stringBase_8047A52B = "O_tuboB"; -SECTION_DEAD static char const* const stringBase_8047A533 = "J_tubo_00.bmd"; -SECTION_DEAD static char const* const stringBase_8047A541 = "J_tubo_01.bmd"; -SECTION_DEAD static char const* const stringBase_8047A54F = "J_hako_00.bmd"; -SECTION_DEAD static char const* const stringBase_8047A55D = "Yironball.bmd"; -SECTION_DEAD static char const* const stringBase_8047A56B = "J_taru_00.bmd"; -SECTION_DEAD static char const* const stringBase_8047A579 = "J_doku_00.bmd"; -SECTION_DEAD static char const* const stringBase_8047A587 = "K_hb00.bmd"; -SECTION_DEAD static char const* const stringBase_8047A592 = "K_tubo02.bmd"; -SECTION_DEAD static char const* const stringBase_8047A59F = "LV8_OBJ_HikariS.bmd"; -SECTION_DEAD static char const* const stringBase_8047A5B3 = "D_aotubo00.bmd"; -SECTION_DEAD static char const* const stringBase_8047A5C2 = "LV8_tama.bmd"; -SECTION_DEAD static char const* const stringBase_8047A5CF = "O_tuboS_LV8.bmd"; -SECTION_DEAD static char const* const stringBase_8047A5DF = "O_tuboB_LV8.bmd"; -SECTION_DEAD static char const* const stringBase_8047A5EF = "D_MN05A"; -SECTION_DEAD static char const* const stringBase_8047A5F7 = "cc_ball"; -SECTION_DEAD static char const* const stringBase_8047A5FF = "aa_hikari"; -SECTION_DEAD static char const* const stringBase_8047A609 = "ミドナヒント用スイッチ立てました！\n"; -SECTION_DEAD static char const* const stringBase_8047A62D = "R_SP160"; -SECTION_DEAD static char const* const stringBase_8047A635 = "Always"; -SECTION_DEAD static char const* const stringBase_8047A63C = "BreakWoodBox.bmd"; -#pragma pop +/* 8047A4BC-8047A4BC 000BB0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_catdoor/d_a_obj_catdoor.cpp b/rel/d/a/obj/d_a_obj_catdoor/d_a_obj_catdoor.cpp index 64dac4ef3c0..12ebca70150 100644 --- a/rel/d/a/obj/d_a_obj_catdoor/d_a_obj_catdoor.cpp +++ b/rel/d/a/obj/d_a_obj_catdoor/d_a_obj_catdoor.cpp @@ -154,7 +154,7 @@ extern "C" extern u8 j3dSys[284]; /* ############################################################################################## */ /* 80BC49B4-80BC49B8 000000 0004+00 3/3 0/0 0/0 .rodata M_attr__14daObjCatDoor_c */ SECTION_RODATA u32 const daObjCatDoor_c::M_attr = 0x001E0578; -COMPILER_STRIP_GATE(80BC49B4, &daObjCatDoor_c::M_attr); +COMPILER_STRIP_GATE(0x80BC49B4, &daObjCatDoor_c::M_attr); /* 80BC42B8-80BC42C4 000078 000C+00 1/1 0/0 1/1 .text attr__14daObjCatDoor_cCFv */ #pragma push @@ -167,6 +167,12 @@ asm void daObjCatDoor_c::attr() const { #pragma pop /* ############################################################################################## */ +/* 80BC49D8-80BC49D8 000024 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80BC49D8 = "CatDoor"; +#pragma pop + /* 80BC49E0-80BC49E4 -00001 0004+00 3/3 0/0 0/0 .data l_arcName */ SECTION_DATA static void* l_arcName = (void*)&d_a_obj_catdoor__stringBase0; @@ -195,14 +201,14 @@ asm void daObjCatDoor_c::initBaseMtx() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3712 = -97.0f; -COMPILER_STRIP_GATE(80BC49B8, &lit_3712); +COMPILER_STRIP_GATE(0x80BC49B8, &lit_3712); #pragma pop /* 80BC49BC-80BC49C0 000008 0004+00 0/1 0/0 0/0 .rodata @3713 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3713 = 97.0f; -COMPILER_STRIP_GATE(80BC49BC, &lit_3713); +COMPILER_STRIP_GATE(0x80BC49BC, &lit_3713); #pragma pop /* 80BC49C0-80BC49C4 00000C 0004+00 0/2 0/0 0/0 .rodata @3714 */ @@ -214,7 +220,7 @@ SECTION_RODATA static u8 const lit_3714[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BC49C0, &lit_3714); +COMPILER_STRIP_GATE(0x80BC49C0, &lit_3714); #pragma pop /* 80BC4454-80BC4560 000214 010C+00 2/2 0/0 1/1 .text setBaseMtx__14daObjCatDoor_cFv */ @@ -277,35 +283,35 @@ static asm void daObjCatDoor_Delete(daObjCatDoor_c* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3860 = -200.0f; -COMPILER_STRIP_GATE(80BC49C4, &lit_3860); +COMPILER_STRIP_GATE(0x80BC49C4, &lit_3860); #pragma pop /* 80BC49C8-80BC49CC 000014 0004+00 0/1 0/0 0/0 .rodata @3861 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3861 = -20.0f; -COMPILER_STRIP_GATE(80BC49C8, &lit_3861); +COMPILER_STRIP_GATE(0x80BC49C8, &lit_3861); #pragma pop /* 80BC49CC-80BC49D0 000018 0004+00 0/1 0/0 0/0 .rodata @3862 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3862 = 200.0f; -COMPILER_STRIP_GATE(80BC49CC, &lit_3862); +COMPILER_STRIP_GATE(0x80BC49CC, &lit_3862); #pragma pop /* 80BC49D0-80BC49D4 00001C 0004+00 0/1 0/0 0/0 .rodata @3863 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3863 = 260.0f; -COMPILER_STRIP_GATE(80BC49D0, &lit_3863); +COMPILER_STRIP_GATE(0x80BC49D0, &lit_3863); #pragma pop /* 80BC49D4-80BC49D8 000020 0004+00 0/1 0/0 0/0 .rodata @3864 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3864 = 100.0f; -COMPILER_STRIP_GATE(80BC49D4, &lit_3864); +COMPILER_STRIP_GATE(0x80BC49D4, &lit_3864); #pragma pop /* 80BC4848-80BC49AC 000608 0164+00 1/0 0/0 0/0 .text daObjCatDoor_Create__FP10fopAc_ac_c @@ -342,9 +348,4 @@ SECTION_DATA extern void* g_profile_Obj_CatDoor[12] = { (void*)0x00044100, (void*)0x000E0000, }; -/* 80BC49D8-80BC49E0 000024 0008+00 1/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80BC49D8 = "CatDoor"; -#pragma pop +/* 80BC49D8-80BC49D8 000024 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_cb/d_a_obj_cb.cpp b/rel/d/a/obj/d_a_obj_cb/d_a_obj_cb.cpp index 0d0bd07976f..0861deda84f 100644 --- a/rel/d/a/obj/d_a_obj_cb/d_a_obj_cb.cpp +++ b/rel/d/a/obj/d_a_obj_cb/d_a_obj_cb.cpp @@ -79,12 +79,12 @@ struct dBgS_AcchCir { /* 80075F58 */ void SetWall(f32, f32); }; +struct csXyz {}; + struct dBgS { /* 80074A08 */ void Regist(dBgW_Base*, fopAc_ac_c*); }; -struct csXyz {}; - struct dBgS_Acch { /* 80075F94 */ ~dBgS_Acch(); /* 800760A0 */ dBgS_Acch(); @@ -328,7 +328,7 @@ SECTION_RODATA static u8 const lit_3882[4 + 4 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BC57E4, &lit_3882); +COMPILER_STRIP_GATE(0x80BC57E4, &lit_3882); /* 80BC57EC-80BC57F4 000008 0008+00 0/1 0/0 0/0 .rodata @3883 */ #pragma push @@ -336,7 +336,7 @@ COMPILER_STRIP_GATE(80BC57E4, &lit_3882); SECTION_RODATA static u8 const lit_3883[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BC57EC, &lit_3883); +COMPILER_STRIP_GATE(0x80BC57EC, &lit_3883); #pragma pop /* 80BC57F4-80BC57FC 000010 0008+00 0/1 0/0 0/0 .rodata @3884 */ @@ -345,7 +345,7 @@ COMPILER_STRIP_GATE(80BC57EC, &lit_3883); SECTION_RODATA static u8 const lit_3884[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BC57F4, &lit_3884); +COMPILER_STRIP_GATE(0x80BC57F4, &lit_3884); #pragma pop /* 80BC57FC-80BC5804 000018 0008+00 0/1 0/0 0/0 .rodata @3885 */ @@ -354,126 +354,126 @@ COMPILER_STRIP_GATE(80BC57F4, &lit_3884); SECTION_RODATA static u8 const lit_3885[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BC57FC, &lit_3885); +COMPILER_STRIP_GATE(0x80BC57FC, &lit_3885); #pragma pop /* 80BC5804-80BC5808 000020 0004+00 0/1 0/0 0/0 .rodata @3886 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3886 = 30.0f; -COMPILER_STRIP_GATE(80BC5804, &lit_3886); +COMPILER_STRIP_GATE(0x80BC5804, &lit_3886); #pragma pop /* 80BC5808-80BC580C 000024 0004+00 0/1 0/0 0/0 .rodata @3887 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3887 = 5.0f; -COMPILER_STRIP_GATE(80BC5808, &lit_3887); +COMPILER_STRIP_GATE(0x80BC5808, &lit_3887); #pragma pop /* 80BC580C-80BC5810 000028 0004+00 0/1 0/0 0/0 .rodata @3888 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3888 = 1.0f; -COMPILER_STRIP_GATE(80BC580C, &lit_3888); +COMPILER_STRIP_GATE(0x80BC580C, &lit_3888); #pragma pop /* 80BC5810-80BC5814 00002C 0004+00 0/1 0/0 0/0 .rodata @3889 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3889 = 0.5f; -COMPILER_STRIP_GATE(80BC5810, &lit_3889); +COMPILER_STRIP_GATE(0x80BC5810, &lit_3889); #pragma pop /* 80BC5814-80BC5818 000030 0004+00 0/1 0/0 0/0 .rodata @3890 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3890 = 60.0f; -COMPILER_STRIP_GATE(80BC5814, &lit_3890); +COMPILER_STRIP_GATE(0x80BC5814, &lit_3890); #pragma pop /* 80BC5818-80BC581C 000034 0004+00 0/1 0/0 0/0 .rodata @3891 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3891 = -1.0f; -COMPILER_STRIP_GATE(80BC5818, &lit_3891); +COMPILER_STRIP_GATE(0x80BC5818, &lit_3891); #pragma pop /* 80BC581C-80BC5820 000038 0004+00 0/1 0/0 0/0 .rodata @3892 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3892 = 90.0f; -COMPILER_STRIP_GATE(80BC581C, &lit_3892); +COMPILER_STRIP_GATE(0x80BC581C, &lit_3892); #pragma pop /* 80BC5820-80BC5824 00003C 0004+00 0/1 0/0 0/0 .rodata @3893 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3893 = 20.0f; -COMPILER_STRIP_GATE(80BC5820, &lit_3893); +COMPILER_STRIP_GATE(0x80BC5820, &lit_3893); #pragma pop /* 80BC5824-80BC5828 000040 0004+00 0/1 0/0 0/0 .rodata @3894 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3894 = -5.0f; -COMPILER_STRIP_GATE(80BC5824, &lit_3894); +COMPILER_STRIP_GATE(0x80BC5824, &lit_3894); #pragma pop /* 80BC5828-80BC582C 000044 0004+00 0/1 0/0 0/0 .rodata @3895 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3895 = -30.0f; -COMPILER_STRIP_GATE(80BC5828, &lit_3895); +COMPILER_STRIP_GATE(0x80BC5828, &lit_3895); #pragma pop /* 80BC582C-80BC5830 000048 0004+00 0/1 0/0 0/0 .rodata @3896 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3896 = 5000.0f; -COMPILER_STRIP_GATE(80BC582C, &lit_3896); +COMPILER_STRIP_GATE(0x80BC582C, &lit_3896); #pragma pop /* 80BC5830-80BC5834 00004C 0004+00 0/1 0/0 0/0 .rodata @3897 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3897 = 7000.0f; -COMPILER_STRIP_GATE(80BC5830, &lit_3897); +COMPILER_STRIP_GATE(0x80BC5830, &lit_3897); #pragma pop /* 80BC5834-80BC5838 000050 0004+00 0/1 0/0 0/0 .rodata @3898 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3898 = 15.0f; -COMPILER_STRIP_GATE(80BC5834, &lit_3898); +COMPILER_STRIP_GATE(0x80BC5834, &lit_3898); #pragma pop /* 80BC5838-80BC583C 000054 0004+00 0/1 0/0 0/0 .rodata @3899 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3899 = 10.0f; -COMPILER_STRIP_GATE(80BC5838, &lit_3899); +COMPILER_STRIP_GATE(0x80BC5838, &lit_3899); #pragma pop /* 80BC583C-80BC5840 000058 0004+00 0/1 0/0 0/0 .rodata @3900 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3900 = -3.0f / 10.0f; -COMPILER_STRIP_GATE(80BC583C, &lit_3900); +COMPILER_STRIP_GATE(0x80BC583C, &lit_3900); #pragma pop /* 80BC5840-80BC5844 00005C 0004+00 0/1 0/0 0/0 .rodata @3901 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3901 = 2.0f; -COMPILER_STRIP_GATE(80BC5840, &lit_3901); +COMPILER_STRIP_GATE(0x80BC5840, &lit_3901); #pragma pop /* 80BC5844-80BC5848 000060 0004+00 0/1 0/0 0/0 .rodata @3902 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3902 = -25.0f; -COMPILER_STRIP_GATE(80BC5844, &lit_3902); +COMPILER_STRIP_GATE(0x80BC5844, &lit_3902); #pragma pop /* 80BC4BB4-80BC51B8 000174 0604+00 1/1 0/0 0/0 .text action__FP12obj_cb_class */ @@ -504,6 +504,12 @@ static bool daObj_Cb_IsDelete(obj_cb_class* param_0) { } /* ############################################################################################## */ +/* 80BC584C-80BC584C 000068 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80BC584C = "Obj_cb"; +#pragma pop + /* 80BC58F8-80BC58FC 000008 0004+00 2/2 0/0 0/0 .bss None */ static u8 data_80BC58F8[4]; @@ -531,7 +537,7 @@ static asm void useHeapInit(fopAc_ac_c* param_0) { /* ############################################################################################## */ /* 80BC5848-80BC584C 000064 0004+00 1/1 0/0 0/0 .rodata @4038 */ SECTION_RODATA static f32 const lit_4038 = 50.0f; -COMPILER_STRIP_GATE(80BC5848, &lit_4038); +COMPILER_STRIP_GATE(0x80BC5848, &lit_4038); /* 80BC58FC-80BC5908 00000C 000C+00 1/1 0/0 0/0 .bss @3763 */ static u8 lit_3763[12]; @@ -601,7 +607,7 @@ asm void __sinit_d_a_obj_cb_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80BC5784 = (void*)__sinit_d_a_obj_cb_cpp; +REGISTER_CTORS(0x80BC5784, __sinit_d_a_obj_cb_cpp); #pragma pop /* 80BC57C0-80BC57C8 000D80 0008+00 1/0 0/0 0/0 .text @36@__dt__12dBgS_ObjAcchFv */ @@ -624,9 +630,4 @@ static asm void func_80BC57C8() { } #pragma pop -/* 80BC584C-80BC5853 000068 0007+00 3/3 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80BC584C = "Obj_cb"; -#pragma pop +/* 80BC584C-80BC584C 000068 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_cblock/d_a_obj_cblock.cpp b/rel/d/a/obj/d_a_obj_cblock/d_a_obj_cblock.cpp index 1acea2292fc..683db849664 100644 --- a/rel/d/a/obj/d_a_obj_cblock/d_a_obj_cblock.cpp +++ b/rel/d/a/obj/d_a_obj_cblock/d_a_obj_cblock.cpp @@ -172,7 +172,7 @@ extern "C" static void daObjCBlk_Execute__FP11daObjCBlk_c(); extern "C" static void daObjCBlk_Delete__FP11daObjCBlk_c(); extern "C" static void daObjCBlk_Create__FP10fopAc_ac_c(); extern "C" void __dt__10cCcD_GSttsFv(); -extern "C" void func_80BC6978(s16*); +extern "C" void func_80BC6978(void* _this, s16*); extern "C" void __sinit_d_a_obj_cblock_cpp(); extern "C" extern char const* const d_a_obj_cblock__stringBase0; @@ -272,7 +272,7 @@ SECTION_RODATA static u8 const l_cull_box[24] = { 0xC3, 0x7A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC3, 0xE1, 0x00, 0x00, 0x43, 0x7A, 0x00, 0x00, 0x43, 0x7A, 0x00, 0x00, 0x43, 0xC8, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BC6A38, &l_cull_box); +COMPILER_STRIP_GATE(0x80BC6A38, &l_cull_box); /* 80BC6A50-80BC6A54 000018 0004+00 0/5 0/0 0/0 .rodata @3731 */ #pragma push @@ -283,14 +283,20 @@ SECTION_RODATA static u8 const lit_3731[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BC6A50, &lit_3731); +COMPILER_STRIP_GATE(0x80BC6A50, &lit_3731); #pragma pop /* 80BC6A54-80BC6A58 00001C 0004+00 0/3 0/0 0/0 .rodata @3732 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3732 = 50.0f; -COMPILER_STRIP_GATE(80BC6A54, &lit_3732); +COMPILER_STRIP_GATE(0x80BC6A54, &lit_3732); +#pragma pop + +/* 80BC6AC8-80BC6AC8 000090 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80BC6AC8 = "P_Cblock"; #pragma pop /* 80BC6AD4-80BC6AE0 000000 000C+00 0/0 0/0 0/0 .data cNullVec__6Z2Calc */ @@ -565,28 +571,28 @@ asm void daObjCBlk_c::initWait() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3977 = 1.0f; -COMPILER_STRIP_GATE(80BC6A58, &lit_3977); +COMPILER_STRIP_GATE(0x80BC6A58, &lit_3977); #pragma pop /* 80BC6A5C-80BC6A60 000024 0004+00 0/1 0/0 0/0 .rodata @3978 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_3978 = 0x3F733334; -COMPILER_STRIP_GATE(80BC6A5C, &lit_3978); +COMPILER_STRIP_GATE(0x80BC6A5C, &lit_3978); #pragma pop /* 80BC6A60-80BC6A64 000028 0004+00 0/1 0/0 0/0 .rodata @3979 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3979 = 6.0f; -COMPILER_STRIP_GATE(80BC6A60, &lit_3979); +COMPILER_STRIP_GATE(0x80BC6A60, &lit_3979); #pragma pop /* 80BC6A64-80BC6A68 00002C 0004+00 0/1 0/0 0/0 .rodata @3980 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3980 = 8.0f; -COMPILER_STRIP_GATE(80BC6A64, &lit_3980); +COMPILER_STRIP_GATE(0x80BC6A64, &lit_3980); #pragma pop /* 80BC627C-80BC6414 00095C 0198+00 1/0 0/0 0/0 .text modeWait__11daObjCBlk_cFv */ @@ -614,14 +620,14 @@ asm void daObjCBlk_c::initWalk() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4012 = 0.5f; -COMPILER_STRIP_GATE(80BC6A68, &lit_4012); +COMPILER_STRIP_GATE(0x80BC6A68, &lit_4012); #pragma pop /* 80BC6A6C-80BC6A70 000034 0004+00 0/1 0/0 0/0 .rodata @4013 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4013 = -1.0f; -COMPILER_STRIP_GATE(80BC6A6C, &lit_4013); +COMPILER_STRIP_GATE(0x80BC6A6C, &lit_4013); #pragma pop /* 80BC6A70-80BC6A78 000038 0008+00 0/1 0/0 0/0 .rodata @4015 */ @@ -630,7 +636,7 @@ COMPILER_STRIP_GATE(80BC6A6C, &lit_4013); SECTION_RODATA static u8 const lit_4015[8] = { 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BC6A70, &lit_4015); +COMPILER_STRIP_GATE(0x80BC6A70, &lit_4015); #pragma pop /* 80BC6430-80BC65CC 000B10 019C+00 1/0 0/0 0/0 .text modeWalk__11daObjCBlk_cFv */ @@ -771,28 +777,28 @@ asm void daObjCBlk_c::setPower(f32 param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4103 = -6.0f; -COMPILER_STRIP_GATE(80BC6A78, &lit_4103); +COMPILER_STRIP_GATE(0x80BC6A78, &lit_4103); #pragma pop /* 80BC6A7C-80BC6A80 000044 0004+00 0/0 0/0 0/0 .rodata @4104 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4104 = 3.0f / 40.0f; -COMPILER_STRIP_GATE(80BC6A7C, &lit_4104); +COMPILER_STRIP_GATE(0x80BC6A7C, &lit_4104); #pragma pop /* 80BC6A80-80BC6A84 000048 0004+00 0/0 0/0 0/0 .rodata @4105 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4105 = 100.0f; -COMPILER_STRIP_GATE(80BC6A80, &lit_4105); +COMPILER_STRIP_GATE(0x80BC6A80, &lit_4105); #pragma pop /* 80BC6A84-80BC6A88 00004C 0004+00 0/0 0/0 0/0 .rodata @4106 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4106 = 15.0f; -COMPILER_STRIP_GATE(80BC6A84, &lit_4106); +COMPILER_STRIP_GATE(0x80BC6A84, &lit_4106); #pragma pop /* 80BC6A88-80BC6A90 000050 0004+04 0/0 0/0 0/0 .rodata @4107 */ @@ -803,7 +809,7 @@ SECTION_RODATA static f32 const lit_4107[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80BC6A88, &lit_4107); +COMPILER_STRIP_GATE(0x80BC6A88, &lit_4107); #pragma pop /* 80BC6A90-80BC6A98 000058 0008+00 0/0 0/0 0/0 .rodata @4310 */ @@ -812,7 +818,7 @@ COMPILER_STRIP_GATE(80BC6A88, &lit_4107); SECTION_RODATA static u8 const lit_4310[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BC6A90, &lit_4310); +COMPILER_STRIP_GATE(0x80BC6A90, &lit_4310); #pragma pop /* 80BC6A98-80BC6AA0 000060 0008+00 0/0 0/0 0/0 .rodata @4311 */ @@ -821,7 +827,7 @@ COMPILER_STRIP_GATE(80BC6A90, &lit_4310); SECTION_RODATA static u8 const lit_4311[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BC6A98, &lit_4311); +COMPILER_STRIP_GATE(0x80BC6A98, &lit_4311); #pragma pop /* 80BC6AA0-80BC6AA8 000068 0008+00 0/0 0/0 0/0 .rodata @4312 */ @@ -830,42 +836,42 @@ COMPILER_STRIP_GATE(80BC6A98, &lit_4311); SECTION_RODATA static u8 const lit_4312[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BC6AA0, &lit_4312); +COMPILER_STRIP_GATE(0x80BC6AA0, &lit_4312); #pragma pop /* 80BC6AA8-80BC6AAC 000070 0004+00 0/0 0/0 0/0 .rodata @4313 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4313 = 195.0f; -COMPILER_STRIP_GATE(80BC6AA8, &lit_4313); +COMPILER_STRIP_GATE(0x80BC6AA8, &lit_4313); #pragma pop /* 80BC6AAC-80BC6AB0 000074 0004+00 0/0 0/0 0/0 .rodata @4314 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4314 = 210.0f; -COMPILER_STRIP_GATE(80BC6AAC, &lit_4314); +COMPILER_STRIP_GATE(0x80BC6AAC, &lit_4314); #pragma pop /* 80BC6AB0-80BC6AB4 000078 0004+00 0/1 0/0 0/0 .rodata @4389 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4389 = -95.0f; -COMPILER_STRIP_GATE(80BC6AB0, &lit_4389); +COMPILER_STRIP_GATE(0x80BC6AB0, &lit_4389); #pragma pop /* 80BC6AB4-80BC6AB8 00007C 0004+00 0/1 0/0 0/0 .rodata @4390 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4390 = 5.0f; -COMPILER_STRIP_GATE(80BC6AB4, &lit_4390); +COMPILER_STRIP_GATE(0x80BC6AB4, &lit_4390); #pragma pop /* 80BC6AB8-80BC6ABC 000080 0004+00 0/1 0/0 0/0 .rodata @4391 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4391 = 95.0f; -COMPILER_STRIP_GATE(80BC6AB8, &lit_4391); +COMPILER_STRIP_GATE(0x80BC6AB8, &lit_4391); #pragma pop /* 80BC66DC-80BC6868 000DBC 018C+00 1/1 0/0 0/0 .text checkWall__11daObjCBlk_cFv */ @@ -949,7 +955,7 @@ asm cCcD_GStts::~cCcD_GStts() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80BC6978(s16* param_0) { +extern "C" asm void func_80BC6978(void* _this, s16* param_0) { nofralloc #include "asm/rel/d/a/obj/d_a_obj_cblock/d_a_obj_cblock/func_80BC6978.s" } @@ -960,21 +966,21 @@ extern "C" asm void func_80BC6978(s16* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4440 = 105.0f; -COMPILER_STRIP_GATE(80BC6ABC, &lit_4440); +COMPILER_STRIP_GATE(0x80BC6ABC, &lit_4440); #pragma pop /* 80BC6AC0-80BC6AC4 000088 0004+00 0/1 0/0 0/0 .rodata @4441 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4441 = 30.0f; -COMPILER_STRIP_GATE(80BC6AC0, &lit_4441); +COMPILER_STRIP_GATE(0x80BC6AC0, &lit_4441); #pragma pop /* 80BC6AC4-80BC6AC8 00008C 0004+00 0/1 0/0 0/0 .rodata @4442 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4442 = -200.0f; -COMPILER_STRIP_GATE(80BC6AC4, &lit_4442); +COMPILER_STRIP_GATE(0x80BC6AC4, &lit_4442); #pragma pop /* 80BC6CA8-80BC6CB4 000060 000C+00 0/1 0/0 0/0 .bss @3645 */ @@ -1001,7 +1007,7 @@ asm void __sinit_d_a_obj_cblock_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80BC6994 = (void*)__sinit_d_a_obj_cblock_cpp; +REGISTER_CTORS(0x80BC6994, __sinit_d_a_obj_cblock_cpp); #pragma pop /* ############################################################################################## */ @@ -1176,9 +1182,4 @@ static u8 data_80BC6D20[4]; static u8 data_80BC6D24[4]; #pragma pop -/* 80BC6AC8-80BC6AD1 000090 0009+00 1/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80BC6AC8 = "P_Cblock"; -#pragma pop +/* 80BC6AC8-80BC6AC8 000090 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_cboard/d_a_obj_cboard.cpp b/rel/d/a/obj/d_a_obj_cboard/d_a_obj_cboard.cpp index 83a32813848..648b20e00c0 100644 --- a/rel/d/a/obj/d_a_obj_cboard/d_a_obj_cboard.cpp +++ b/rel/d/a/obj/d_a_obj_cboard/d_a_obj_cboard.cpp @@ -151,7 +151,18 @@ asm void daObjBoard_c::setBaseMtx() { /* ############################################################################################## */ /* 8057BDD0-8057BDD4 000000 0004+00 1/1 0/0 0/0 .rodata @3636 */ SECTION_RODATA static f32 const lit_3636 = 10.0f; -COMPILER_STRIP_GATE(8057BDD0, &lit_3636); +COMPILER_STRIP_GATE(0x8057BDD0, &lit_3636); + +/* 8057BDD4-8057BDD4 000004 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8057BDD4 = "Obj_Board"; +SECTION_DEAD static char const* const stringBase_8057BDDE = "ClearB00.dzb"; +SECTION_DEAD static char const* const stringBase_8057BDEB = "ClearB01.dzb"; +SECTION_DEAD static char const* const stringBase_8057BDF8 = "ClearB02.dzb"; +SECTION_DEAD static char const* const stringBase_8057BE05 = "ClearB03.dzb"; +SECTION_DEAD static char const* const stringBase_8057BE12 = "ClearB04.dzb"; +#pragma pop /* 8057BE20-8057BE24 -00001 0004+00 2/2 0/0 0/0 .data l_arcName */ SECTION_DATA static void* l_arcName = (void*)&d_a_obj_cboard__stringBase0; @@ -321,14 +332,4 @@ static asm void daObjBoard_MoveBGDraw(daObjBoard_c* param_0) { } #pragma pop -/* 8057BDD4-8057BE1F 000004 004B+00 2/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_8057BDD4 = "Obj_Board"; -SECTION_DEAD static char const* const stringBase_8057BDDE = "ClearB00.dzb"; -SECTION_DEAD static char const* const stringBase_8057BDEB = "ClearB01.dzb"; -SECTION_DEAD static char const* const stringBase_8057BDF8 = "ClearB02.dzb"; -SECTION_DEAD static char const* const stringBase_8057BE05 = "ClearB03.dzb"; -SECTION_DEAD static char const* const stringBase_8057BE12 = "ClearB04.dzb"; -#pragma pop +/* 8057BDD4-8057BDD4 000004 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_cdoor/d_a_obj_cdoor.cpp b/rel/d/a/obj/d_a_obj_cdoor/d_a_obj_cdoor.cpp index 0535926204f..adc98d35da7 100644 --- a/rel/d/a/obj/d_a_obj_cdoor/d_a_obj_cdoor.cpp +++ b/rel/d/a/obj/d_a_obj_cdoor/d_a_obj_cdoor.cpp @@ -110,10 +110,10 @@ struct dBgS_MoveBgActor { /* 80078950 */ void MoveBGExecute(); }; -struct Vec {}; - struct JAISoundID {}; +struct Vec {}; + struct Z2SeMgr { /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); /* 802AC50C */ void seStartLevel(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); @@ -234,19 +234,19 @@ extern "C" extern u8 struct_80BC7EB8[4]; SECTION_RODATA static u8 const l_bmdIdx[8] = { 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x09, }; -COMPILER_STRIP_GATE(80BC7D18, &l_bmdIdx); +COMPILER_STRIP_GATE(0x80BC7D18, &l_bmdIdx); /* 80BC7D20-80BC7D28 000008 0008+00 1/1 0/0 0/0 .rodata l_dzbIdx */ SECTION_RODATA static u8 const l_dzbIdx[8] = { 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x0C, }; -COMPILER_STRIP_GATE(80BC7D20, &l_dzbIdx); +COMPILER_STRIP_GATE(0x80BC7D20, &l_dzbIdx); /* 80BC7D28-80BC7D30 000010 0008+00 1/1 0/0 0/0 .rodata l_attentionOffsetY */ SECTION_RODATA static u8 const l_attentionOffsetY[8] = { 0x42, 0x96, 0x00, 0x00, 0x42, 0x96, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BC7D28, &l_attentionOffsetY); +COMPILER_STRIP_GATE(0x80BC7D28, &l_attentionOffsetY); /* 80BC7D30-80BC7D38 000018 0004+04 5/6 0/0 0/0 .rodata @3783 */ SECTION_RODATA static f32 const lit_3783[1 + 1 /* padding */] = { @@ -254,7 +254,14 @@ SECTION_RODATA static f32 const lit_3783[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80BC7D30, &lit_3783); +COMPILER_STRIP_GATE(0x80BC7D30, &lit_3783); + +/* 80BC7D48-80BC7D48 000030 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80BC7D48 = "Cdoor"; +SECTION_DEAD static char const* const stringBase_80BC7D4E = "J_Suimon"; +#pragma pop /* 80BC7D58-80BC7D64 000000 000C+00 2/2 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { @@ -305,7 +312,7 @@ static asm void daObjCdoor_searchChain(fopAc_ac_c* param_0, void* param_1) { SECTION_RODATA static u8 const lit_3909[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BC7D38, &lit_3909); +COMPILER_STRIP_GATE(0x80BC7D38, &lit_3909); /* 80BC7D80-80BC7D88 000028 0008+00 2/2 0/0 0/0 .data l_moveOffsetY */ SECTION_DATA static u8 l_moveOffsetY[8] = { @@ -522,13 +529,13 @@ asm void daObjCdoor_c::Execute(f32 (**param_0)[3][4]) { /* ############################################################################################## */ /* 80BC7D40-80BC7D44 000028 0004+00 2/3 0/0 0/0 .rodata @4014 */ SECTION_RODATA static f32 const lit_4014 = -1.0f; -COMPILER_STRIP_GATE(80BC7D40, &lit_4014); +COMPILER_STRIP_GATE(0x80BC7D40, &lit_4014); /* 80BC7D44-80BC7D48 00002C 0004+00 0/1 0/0 0/0 .rodata @4015 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4015 = 1.0f / 100.0f; -COMPILER_STRIP_GATE(80BC7D44, &lit_4015); +COMPILER_STRIP_GATE(0x80BC7D44, &lit_4015); #pragma pop /* 80BC7478-80BC7630 000738 01B8+00 1/1 0/0 0/0 .text execCdoor__12daObjCdoor_cFv */ @@ -689,10 +696,4 @@ static asm void daObjCdoor_Draw(daObjCdoor_c* param_0) { } #pragma pop -/* 80BC7D48-80BC7D57 000030 000F+00 1/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80BC7D48 = "Cdoor"; -SECTION_DEAD static char const* const stringBase_80BC7D4E = "J_Suimon"; -#pragma pop +/* 80BC7D48-80BC7D48 000030 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_chandelier/d_a_obj_chandelier.cpp b/rel/d/a/obj/d_a_obj_chandelier/d_a_obj_chandelier.cpp index 067d4382e2c..3e23605f012 100644 --- a/rel/d/a/obj/d_a_obj_chandelier/d_a_obj_chandelier.cpp +++ b/rel/d/a/obj/d_a_obj_chandelier/d_a_obj_chandelier.cpp @@ -196,6 +196,12 @@ extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; // /* ############################################################################################## */ +/* 80BC8D3C-80BC8D3C 000060 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80BC8D3C = "L9Chand"; +#pragma pop + /* 80BC8D44-80BC8D50 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -392,7 +398,7 @@ asm void daObjChandelier_c::Execute(f32 (**param_0)[3][4]) { /* ############################################################################################## */ /* 80BC8CDC-80BC8CE0 000000 0004+00 7/7 0/0 0/0 .rodata @3731 */ SECTION_RODATA static f32 const lit_3731 = 0.5f; -COMPILER_STRIP_GATE(80BC8CDC, &lit_3731); +COMPILER_STRIP_GATE(0x80BC8CDC, &lit_3731); /* 80BC8CE0-80BC8CE4 000004 0004+00 0/4 0/0 0/0 .rodata @3732 */ #pragma push @@ -403,14 +409,14 @@ SECTION_RODATA static u8 const lit_3732[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BC8CE0, &lit_3732); +COMPILER_STRIP_GATE(0x80BC8CE0, &lit_3732); #pragma pop /* 80BC8CE4-80BC8CE8 000008 0004+00 0/2 0/0 0/0 .rodata @3733 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3733 = 20.0f; -COMPILER_STRIP_GATE(80BC8CE4, &lit_3733); +COMPILER_STRIP_GATE(0x80BC8CE4, &lit_3733); #pragma pop /* 80BC82C0-80BC834C 000400 008C+00 1/0 0/0 0/0 .text exeModeWait__17daObjChandelier_cFv @@ -429,21 +435,21 @@ asm void daObjChandelier_c::exeModeWait() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3742 = 300.0f; -COMPILER_STRIP_GATE(80BC8CE8, &lit_3742); +COMPILER_STRIP_GATE(0x80BC8CE8, &lit_3742); #pragma pop /* 80BC8CEC-80BC8CF0 000010 0004+00 0/2 0/0 0/0 .rodata @3743 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3743 = 50.0f; -COMPILER_STRIP_GATE(80BC8CEC, &lit_3743); +COMPILER_STRIP_GATE(0x80BC8CEC, &lit_3743); #pragma pop /* 80BC8CF0-80BC8CF4 000014 0004+00 0/1 0/0 0/0 .rodata @3744 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3744 = 3.0f / 10.0f; -COMPILER_STRIP_GATE(80BC8CF0, &lit_3744); +COMPILER_STRIP_GATE(0x80BC8CF0, &lit_3744); #pragma pop /* 80BC834C-80BC83E4 00048C 0098+00 1/0 0/0 0/0 .text exeModeStartSwg__17daObjChandelier_cFv */ @@ -459,11 +465,11 @@ asm void daObjChandelier_c::exeModeStartSwg() { /* ############################################################################################## */ /* 80BC8CF4-80BC8CF8 000018 0004+00 1/2 0/0 0/0 .rodata @3760 */ SECTION_RODATA static f32 const lit_3760 = 1.0f; -COMPILER_STRIP_GATE(80BC8CF4, &lit_3760); +COMPILER_STRIP_GATE(0x80BC8CF4, &lit_3760); /* 80BC8CF8-80BC8CFC 00001C 0004+00 1/3 0/0 0/0 .rodata @3761 */ SECTION_RODATA static f32 const lit_3761 = -1.0f; -COMPILER_STRIP_GATE(80BC8CF8, &lit_3761); +COMPILER_STRIP_GATE(0x80BC8CF8, &lit_3761); /* 80BC83E4-80BC84C0 000524 00DC+00 1/0 0/0 0/0 .text exeModeDown__17daObjChandelier_cFv */ @@ -491,35 +497,35 @@ asm void daObjChandelier_c::exeModeEndSwg() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3785 = 10.0f; -COMPILER_STRIP_GATE(80BC8CFC, &lit_3785); +COMPILER_STRIP_GATE(0x80BC8CFC, &lit_3785); #pragma pop /* 80BC8D00-80BC8D04 000024 0004+00 0/1 0/0 0/0 .rodata @3786 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3786 = 250.0f; -COMPILER_STRIP_GATE(80BC8D00, &lit_3786); +COMPILER_STRIP_GATE(0x80BC8D00, &lit_3786); #pragma pop /* 80BC8D04-80BC8D08 000028 0004+00 0/1 0/0 0/0 .rodata @3787 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3787 = 5000.0f; -COMPILER_STRIP_GATE(80BC8D04, &lit_3787); +COMPILER_STRIP_GATE(0x80BC8D04, &lit_3787); #pragma pop /* 80BC8D08-80BC8D0C 00002C 0004+00 0/1 0/0 0/0 .rodata @3788 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3788 = 15.0f; -COMPILER_STRIP_GATE(80BC8D08, &lit_3788); +COMPILER_STRIP_GATE(0x80BC8D08, &lit_3788); #pragma pop /* 80BC8D0C-80BC8D10 000030 0004+00 0/1 0/0 0/0 .rodata @3789 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3789 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(80BC8D0C, &lit_3789); +COMPILER_STRIP_GATE(0x80BC8D0C, &lit_3789); #pragma pop /* 80BC851C-80BC85E4 00065C 00C8+00 2/1 0/0 0/0 .text exeModeHookSwg__17daObjChandelier_cFv */ @@ -537,14 +543,14 @@ asm void daObjChandelier_c::exeModeHookSwg() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3815 = -3.0f; -COMPILER_STRIP_GATE(80BC8D10, &lit_3815); +COMPILER_STRIP_GATE(0x80BC8D10, &lit_3815); #pragma pop /* 80BC8D14-80BC8D18 000038 0004+00 0/1 0/0 0/0 .rodata @3816 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3816 = 800.0f; -COMPILER_STRIP_GATE(80BC8D14, &lit_3816); +COMPILER_STRIP_GATE(0x80BC8D14, &lit_3816); #pragma pop /* 80BC85E4-80BC86FC 000724 0118+00 1/1 0/0 0/0 .text init__17daObjChandelier_cFv */ @@ -573,21 +579,21 @@ asm void daObjChandelier_c::setModelMtx() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3857 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(80BC8D18, &lit_3857); +COMPILER_STRIP_GATE(0x80BC8D18, &lit_3857); #pragma pop /* 80BC8D1C-80BC8D20 000040 0004+00 0/1 0/0 0/0 .rodata @3858 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3858 = 3.0f; -COMPILER_STRIP_GATE(80BC8D1C, &lit_3858); +COMPILER_STRIP_GATE(0x80BC8D1C, &lit_3858); #pragma pop /* 80BC8D20-80BC8D24 000044 0004+00 0/1 0/0 0/0 .rodata @3859 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3859 = 127.0f; -COMPILER_STRIP_GATE(80BC8D20, &lit_3859); +COMPILER_STRIP_GATE(0x80BC8D20, &lit_3859); #pragma pop /* 80BC8D24-80BC8D2C 000048 0008+00 0/2 0/0 0/0 .rodata @3861 */ @@ -596,7 +602,7 @@ COMPILER_STRIP_GATE(80BC8D20, &lit_3859); SECTION_RODATA static u8 const lit_3861[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BC8D24, &lit_3861); +COMPILER_STRIP_GATE(0x80BC8D24, &lit_3861); #pragma pop /* 80BC8780-80BC89B0 0008C0 0230+00 2/2 0/0 0/0 .text moveSwing__17daObjChandelier_cFffff @@ -615,7 +621,7 @@ asm void daObjChandelier_c::moveSwing(f32 param_0, f32 param_1, f32 param_2, f32 #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3895 = 1.0f / 25.0f; -COMPILER_STRIP_GATE(80BC8D2C, &lit_3895); +COMPILER_STRIP_GATE(0x80BC8D2C, &lit_3895); #pragma pop /* 80BC89B0-80BC8B20 000AF0 0170+00 1/1 0/0 0/0 .text moveSwingFall__17daObjChandelier_cFv */ @@ -633,21 +639,21 @@ asm void daObjChandelier_c::moveSwingFall() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3905 = 6.0f / 5.0f; -COMPILER_STRIP_GATE(80BC8D30, &lit_3905); +COMPILER_STRIP_GATE(0x80BC8D30, &lit_3905); #pragma pop /* 80BC8D34-80BC8D38 000058 0004+00 0/1 0/0 0/0 .rodata @3906 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3906 = 7.0f / 10.0f; -COMPILER_STRIP_GATE(80BC8D34, &lit_3906); +COMPILER_STRIP_GATE(0x80BC8D34, &lit_3906); #pragma pop /* 80BC8D38-80BC8D3C 00005C 0004+00 0/1 0/0 0/0 .rodata @3907 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3907 = 5.0f; -COMPILER_STRIP_GATE(80BC8D38, &lit_3907); +COMPILER_STRIP_GATE(0x80BC8D38, &lit_3907); #pragma pop /* 80BC8B20-80BC8B7C 000C60 005C+00 3/3 0/0 0/0 .text hookSwingInitParm__17daObjChandelier_cFv */ @@ -716,12 +722,7 @@ asm void __sinit_d_a_obj_chandelier_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80BC8C48 = (void*)__sinit_d_a_obj_chandelier_cpp; +REGISTER_CTORS(0x80BC8C48, __sinit_d_a_obj_chandelier_cpp); #pragma pop -/* 80BC8D3C-80BC8D44 000060 0008+00 1/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80BC8D3C = "L9Chand"; -#pragma pop +/* 80BC8D3C-80BC8D3C 000060 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_chest/d_a_obj_chest.cpp b/rel/d/a/obj/d_a_obj_chest/d_a_obj_chest.cpp index 7d6ca2cb75b..16ff0798541 100644 --- a/rel/d/a/obj/d_a_obj_chest/d_a_obj_chest.cpp +++ b/rel/d/a/obj/d_a_obj_chest/d_a_obj_chest.cpp @@ -151,10 +151,10 @@ struct cCcD_GStts { /* 80BC9F64 */ ~cCcD_GStts(); }; -struct Vec {}; - struct JAISoundID {}; +struct Vec {}; + struct Z2SeMgr { /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); }; @@ -193,8 +193,8 @@ extern "C" static void daObjChest_Execute__FP12daObjChest_c(); extern "C" static void daObjChest_Delete__FP12daObjChest_c(); extern "C" static void daObjChest_Create__FP10fopAc_ac_c(); extern "C" void __dt__10cCcD_GSttsFv(); -extern "C" void func_80BC9FAC(u8*); -extern "C" void func_80BC9FC8(u16*); +extern "C" void func_80BC9FAC(void* _this, u8*); +extern "C" void func_80BC9FC8(void* _this, u16*); extern "C" static void func_80BC9FE4(); extern "C" static void func_80BC9FEC(); extern "C" extern char const* const d_a_obj_chest__stringBase0; @@ -301,17 +301,17 @@ SECTION_RODATA static u8 const l_cyl_src[68] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0x20, 0x00, 0x00, 0x43, 0x82, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BC9FFC, &l_cyl_src); +COMPILER_STRIP_GATE(0x80BC9FFC, &l_cyl_src); /* 80BCA040-80BCA044 000044 0004+00 1/4 0/0 0/0 .rodata @3679 */ SECTION_RODATA static f32 const lit_3679 = 1.0f; -COMPILER_STRIP_GATE(80BCA040, &lit_3679); +COMPILER_STRIP_GATE(0x80BCA040, &lit_3679); /* 80BCA044-80BCA04C 000048 0008+00 1/2 0/0 0/0 .rodata @3681 */ SECTION_RODATA static u8 const lit_3681[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BCA044, &lit_3681); +COMPILER_STRIP_GATE(0x80BCA044, &lit_3681); /* 80BC8F34-80BC9088 0000B4 0154+00 2/2 0/0 0/0 .text setBaseMtx__12daObjChest_cFv */ #pragma push @@ -328,7 +328,7 @@ asm void daObjChest_c::setBaseMtx() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3730 = 5.0f; -COMPILER_STRIP_GATE(80BCA04C, &lit_3730); +COMPILER_STRIP_GATE(0x80BCA04C, &lit_3730); #pragma pop /* 80BCA050-80BCA054 000054 0004+00 0/3 0/0 0/0 .rodata @3731 */ @@ -340,21 +340,21 @@ SECTION_RODATA static u8 const lit_3731[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BCA050, &lit_3731); +COMPILER_STRIP_GATE(0x80BCA050, &lit_3731); #pragma pop /* 80BCA054-80BCA058 000058 0004+00 0/2 0/0 0/0 .rodata @3732 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3732 = 150.0f; -COMPILER_STRIP_GATE(80BCA054, &lit_3732); +COMPILER_STRIP_GATE(0x80BCA054, &lit_3732); #pragma pop /* 80BCA058-80BCA05C 00005C 0004+00 0/1 0/0 0/0 .rodata @3733 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3733 = 30.0f; -COMPILER_STRIP_GATE(80BCA058, &lit_3733); +COMPILER_STRIP_GATE(0x80BCA058, &lit_3733); #pragma pop /* 80BC9088-80BC9240 000208 01B8+00 1/0 0/0 0/0 .text Create__12daObjChest_cFv */ @@ -368,6 +368,12 @@ asm void daObjChest_c::Create() { #pragma pop /* ############################################################################################## */ +/* 80BCA0B0-80BCA0B0 0000B4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80BCA0B0 = "H_Tansu"; +#pragma pop + /* 80BCA0B8-80BCA0C4 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -630,56 +636,56 @@ asm void daObjChest_c::action() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4015 = 70.0f; -COMPILER_STRIP_GATE(80BCA05C, &lit_4015); +COMPILER_STRIP_GATE(0x80BCA05C, &lit_4015); #pragma pop /* 80BCA060-80BCA064 000064 0004+00 0/1 0/0 0/0 .rodata @4016 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4016 = 90.0f; -COMPILER_STRIP_GATE(80BCA060, &lit_4016); +COMPILER_STRIP_GATE(0x80BCA060, &lit_4016); #pragma pop /* 80BCA064-80BCA068 000068 0004+00 0/1 0/0 0/0 .rodata @4017 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4017 = 450.0f; -COMPILER_STRIP_GATE(80BCA064, &lit_4017); +COMPILER_STRIP_GATE(0x80BCA064, &lit_4017); #pragma pop /* 80BCA068-80BCA06C 00006C 0004+00 0/1 0/0 0/0 .rodata @4018 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4018 = 100.0f; -COMPILER_STRIP_GATE(80BCA068, &lit_4018); +COMPILER_STRIP_GATE(0x80BCA068, &lit_4018); #pragma pop /* 80BCA06C-80BCA070 000070 0004+00 0/1 0/0 0/0 .rodata @4019 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4019 = 0.5f; -COMPILER_STRIP_GATE(80BCA06C, &lit_4019); +COMPILER_STRIP_GATE(0x80BCA06C, &lit_4019); #pragma pop /* 80BCA070-80BCA074 000074 0004+00 0/1 0/0 0/0 .rodata @4020 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4020 = 7.0f / 10.0f; -COMPILER_STRIP_GATE(80BCA070, &lit_4020); +COMPILER_STRIP_GATE(0x80BCA070, &lit_4020); #pragma pop /* 80BCA074-80BCA078 000078 0004+00 0/2 0/0 0/0 .rodata @4021 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4021 = -1.0f; -COMPILER_STRIP_GATE(80BCA074, &lit_4021); +COMPILER_STRIP_GATE(0x80BCA074, &lit_4021); #pragma pop /* 80BCA078-80BCA07C 00007C 0004+00 0/1 0/0 0/0 .rodata @4022 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4022 = 50.0f; -COMPILER_STRIP_GATE(80BCA078, &lit_4022); +COMPILER_STRIP_GATE(0x80BCA078, &lit_4022); #pragma pop /* 80BCA07C-80BCA084 000080 0004+04 0/1 0/0 0/0 .rodata @4023 */ @@ -690,7 +696,7 @@ SECTION_RODATA static f32 const lit_4023[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80BCA07C, &lit_4023); +COMPILER_STRIP_GATE(0x80BCA07C, &lit_4023); #pragma pop /* 80BCA084-80BCA08C 000088 0008+00 0/1 0/0 0/0 .rodata @4024 */ @@ -699,7 +705,7 @@ COMPILER_STRIP_GATE(80BCA07C, &lit_4023); SECTION_RODATA static u8 const lit_4024[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BCA084, &lit_4024); +COMPILER_STRIP_GATE(0x80BCA084, &lit_4024); #pragma pop /* 80BCA08C-80BCA094 000090 0008+00 0/1 0/0 0/0 .rodata @4025 */ @@ -708,7 +714,7 @@ COMPILER_STRIP_GATE(80BCA084, &lit_4024); SECTION_RODATA static u8 const lit_4025[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BCA08C, &lit_4025); +COMPILER_STRIP_GATE(0x80BCA08C, &lit_4025); #pragma pop /* 80BCA094-80BCA09C 000098 0008+00 0/1 0/0 0/0 .rodata @4026 */ @@ -717,14 +723,14 @@ COMPILER_STRIP_GATE(80BCA08C, &lit_4025); SECTION_RODATA static u8 const lit_4026[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BCA094, &lit_4026); +COMPILER_STRIP_GATE(0x80BCA094, &lit_4026); #pragma pop /* 80BCA09C-80BCA0A0 0000A0 0004+00 0/1 0/0 0/0 .rodata @4027 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4027 = 260.0f; -COMPILER_STRIP_GATE(80BCA09C, &lit_4027); +COMPILER_STRIP_GATE(0x80BCA09C, &lit_4027); #pragma pop /* 80BC9808-80BC9BF0 000988 03E8+00 1/0 0/0 0/0 .text actionWait__12daObjChest_cFv */ @@ -742,28 +748,28 @@ asm void daObjChest_c::actionWait() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4070 = 16384.0f; -COMPILER_STRIP_GATE(80BCA0A0, &lit_4070); +COMPILER_STRIP_GATE(0x80BCA0A0, &lit_4070); #pragma pop /* 80BCA0A4-80BCA0A8 0000A8 0004+00 0/1 0/0 0/0 .rodata @4071 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4071 = -4.0f; -COMPILER_STRIP_GATE(80BCA0A4, &lit_4071); +COMPILER_STRIP_GATE(0x80BCA0A4, &lit_4071); #pragma pop /* 80BCA0A8-80BCA0AC 0000AC 0004+00 0/1 0/0 0/0 .rodata @4072 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4072 = 2.5f; -COMPILER_STRIP_GATE(80BCA0A8, &lit_4072); +COMPILER_STRIP_GATE(0x80BCA0A8, &lit_4072); #pragma pop /* 80BCA0AC-80BCA0B0 0000B0 0004+00 0/1 0/0 0/0 .rodata @4073 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4073 = 5.0f / 3.0f; -COMPILER_STRIP_GATE(80BCA0AC, &lit_4073); +COMPILER_STRIP_GATE(0x80BCA0AC, &lit_4073); #pragma pop /* 80BC9BF0-80BC9DFC 000D70 020C+00 1/0 0/0 0/0 .text actionMove__12daObjChest_cFv */ @@ -858,7 +864,7 @@ asm cCcD_GStts::~cCcD_GStts() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80BC9FAC(u8* param_0) { +extern "C" asm void func_80BC9FAC(void* _this, u8* param_0) { nofralloc #include "asm/rel/d/a/obj/d_a_obj_chest/d_a_obj_chest/func_80BC9FAC.s" } @@ -868,7 +874,7 @@ extern "C" asm void func_80BC9FAC(u8* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80BC9FC8(u16* param_0) { +extern "C" asm void func_80BC9FC8(void* _this, u16* param_0) { nofralloc #include "asm/rel/d/a/obj/d_a_obj_chest/d_a_obj_chest/func_80BC9FC8.s" } @@ -894,9 +900,4 @@ static asm void func_80BC9FEC() { } #pragma pop -/* 80BCA0B0-80BCA0B8 0000B4 0008+00 1/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80BCA0B0 = "H_Tansu"; -#pragma pop +/* 80BCA0B0-80BCA0B0 0000B4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_cho/d_a_obj_cho.cpp b/rel/d/a/obj/d_a_obj_cho/d_a_obj_cho.cpp index 7ff8972fd1a..8a2f28aeff4 100644 --- a/rel/d/a/obj/d_a_obj_cho/d_a_obj_cho.cpp +++ b/rel/d/a/obj/d_a_obj_cho/d_a_obj_cho.cpp @@ -49,19 +49,19 @@ struct mDoExt_baseAnm { /* 8000D428 */ void play(); }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; +struct J3DAnmTransform {}; + +struct J3DModelData {}; + struct Z2Creature { /* 802C03C8 */ Z2Creature(); /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -412,7 +412,7 @@ extern "C" void __register_global_object(); /* ############################################################################################## */ /* 80BCC578-80BCC57C 000000 0004+00 10/10 0/0 0/0 .rodata @3775 */ SECTION_RODATA static f32 const lit_3775 = 4.0f / 5.0f; -COMPILER_STRIP_GATE(80BCC578, &lit_3775); +COMPILER_STRIP_GATE(0x80BCC578, &lit_3775); /* 80BCC688-80BCC6A8 -00001 0020+00 1/0 0/0 0/0 .data l_daObjCHO_Method */ SECTION_DATA static void* l_daObjCHO_Method[8] = { @@ -509,7 +509,7 @@ SECTION_RODATA static u8 const ccSphSrc[64] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0x20, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BCC57C, &ccSphSrc); +COMPILER_STRIP_GATE(0x80BCC57C, &ccSphSrc); /* 80BCA334-80BCA3A0 000114 006C+00 1/1 0/0 0/0 .text InitCcSph__10daObjCHO_cFv */ #pragma push @@ -524,7 +524,7 @@ asm void daObjCHO_c::InitCcSph() { /* ############################################################################################## */ /* 80BCC5BC-80BCC5C0 000044 0004+00 1/2 0/0 0/0 .rodata @3788 */ SECTION_RODATA static f32 const lit_3788 = 20.0f; -COMPILER_STRIP_GATE(80BCC5BC, &lit_3788); +COMPILER_STRIP_GATE(0x80BCC5BC, &lit_3788); /* 80BCA3A0-80BCA3F8 000180 0058+00 1/1 0/0 0/0 .text SetCcSph__10daObjCHO_cFv */ #pragma push @@ -549,7 +549,13 @@ static asm void useHeapInit(fopAc_ac_c* param_0) { /* ############################################################################################## */ /* 80BCC5C0-80BCC5C4 000048 0004+00 2/7 0/0 0/0 .rodata @3889 */ SECTION_RODATA static f32 const lit_3889 = 1.0f; -COMPILER_STRIP_GATE(80BCC5C0, &lit_3889); +COMPILER_STRIP_GATE(0x80BCC5C0, &lit_3889); + +/* 80BCC678-80BCC678 000100 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80BCC678 = "I_Cho"; +#pragma pop /* 80BCA418-80BCA700 0001F8 02E8+00 1/1 0/0 0/0 .text CreateHeap__10daObjCHO_cFv */ #pragma push @@ -599,20 +605,20 @@ SECTION_RODATA static u8 const lit_3927[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BCC5C4, &lit_3927); +COMPILER_STRIP_GATE(0x80BCC5C4, &lit_3927); /* 80BCC5C8-80BCC5CC 000050 0004+00 0/1 0/0 0/0 .rodata @3928 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3928 = 2.0f / 5.0f; -COMPILER_STRIP_GATE(80BCC5C8, &lit_3928); +COMPILER_STRIP_GATE(0x80BCC5C8, &lit_3928); #pragma pop /* 80BCC5CC-80BCC5D0 000054 0004+00 0/4 0/0 0/0 .rodata @3929 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3929 = 10.0f; -COMPILER_STRIP_GATE(80BCC5CC, &lit_3929); +COMPILER_STRIP_GATE(0x80BCC5CC, &lit_3929); #pragma pop /* 80BCC5D0-80BCC5D8 000058 0004+04 0/1 0/0 0/0 .rodata @3930 */ @@ -623,7 +629,7 @@ SECTION_RODATA static f32 const lit_3930[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80BCC5D0, &lit_3930); +COMPILER_STRIP_GATE(0x80BCC5D0, &lit_3930); #pragma pop /* 80BCA78C-80BCA88C 00056C 0100+00 1/1 0/0 0/0 .text SpeedSet__10daObjCHO_cFv */ @@ -653,7 +659,7 @@ asm void daObjCHO_c::WallCheck() { SECTION_RODATA static u8 const lit_3999[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BCC5D8, &lit_3999); +COMPILER_STRIP_GATE(0x80BCC5D8, &lit_3999); #pragma pop /* 80BCC5E0-80BCC5E8 000068 0008+00 0/3 0/0 0/0 .rodata @4000 */ @@ -662,7 +668,7 @@ COMPILER_STRIP_GATE(80BCC5D8, &lit_3999); SECTION_RODATA static u8 const lit_4000[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BCC5E0, &lit_4000); +COMPILER_STRIP_GATE(0x80BCC5E0, &lit_4000); #pragma pop /* 80BCC5E8-80BCC5F0 000070 0008+00 0/3 0/0 0/0 .rodata @4001 */ @@ -671,35 +677,35 @@ COMPILER_STRIP_GATE(80BCC5E0, &lit_4000); SECTION_RODATA static u8 const lit_4001[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BCC5E8, &lit_4001); +COMPILER_STRIP_GATE(0x80BCC5E8, &lit_4001); #pragma pop /* 80BCC5F0-80BCC5F4 000078 0004+00 0/1 0/0 0/0 .rodata @4002 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4002 = 200.0f; -COMPILER_STRIP_GATE(80BCC5F0, &lit_4002); +COMPILER_STRIP_GATE(0x80BCC5F0, &lit_4002); #pragma pop /* 80BCC5F4-80BCC5F8 00007C 0004+00 0/3 0/0 0/0 .rodata @4003 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4003 = 100.0f; -COMPILER_STRIP_GATE(80BCC5F4, &lit_4003); +COMPILER_STRIP_GATE(0x80BCC5F4, &lit_4003); #pragma pop /* 80BCC5F8-80BCC5FC 000080 0004+00 0/2 0/0 0/0 .rodata @4004 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4004 = 30.0f; -COMPILER_STRIP_GATE(80BCC5F8, &lit_4004); +COMPILER_STRIP_GATE(0x80BCC5F8, &lit_4004); #pragma pop /* 80BCC5FC-80BCC600 000084 0004+00 0/2 0/0 0/0 .rodata @4005 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4005 = 70.0f; -COMPILER_STRIP_GATE(80BCC5FC, &lit_4005); +COMPILER_STRIP_GATE(0x80BCC5FC, &lit_4005); #pragma pop /* 80BCA924-80BCAB50 000704 022C+00 1/1 0/0 0/0 .text SearchLink__10daObjCHO_cFv */ @@ -717,28 +723,28 @@ asm void daObjCHO_c::SearchLink() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4064 = 1.0f / 20.0f; -COMPILER_STRIP_GATE(80BCC600, &lit_4064); +COMPILER_STRIP_GATE(0x80BCC600, &lit_4064); #pragma pop /* 80BCC604-80BCC608 00008C 0004+00 0/3 0/0 0/0 .rodata @4065 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4065 = 5.0f; -COMPILER_STRIP_GATE(80BCC604, &lit_4065); +COMPILER_STRIP_GATE(0x80BCC604, &lit_4065); #pragma pop /* 80BCC608-80BCC60C 000090 0004+00 0/3 0/0 0/0 .rodata @4066 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4066 = -1.0f; -COMPILER_STRIP_GATE(80BCC608, &lit_4066); +COMPILER_STRIP_GATE(0x80BCC608, &lit_4066); #pragma pop /* 80BCC60C-80BCC610 000094 0004+00 0/2 0/0 0/0 .rodata @4067 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4067 = 3.0f; -COMPILER_STRIP_GATE(80BCC60C, &lit_4067); +COMPILER_STRIP_GATE(0x80BCC60C, &lit_4067); #pragma pop /* 80BCAB50-80BCAEDC 000930 038C+00 2/2 0/0 0/0 .text WaitAction__10daObjCHO_cFv */ @@ -756,56 +762,56 @@ asm void daObjCHO_c::WaitAction() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4136 = 3.5f; -COMPILER_STRIP_GATE(80BCC610, &lit_4136); +COMPILER_STRIP_GATE(0x80BCC610, &lit_4136); #pragma pop /* 80BCC614-80BCC618 00009C 0004+00 0/1 0/0 0/0 .rodata @4137 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4137 = 2.0f; -COMPILER_STRIP_GATE(80BCC614, &lit_4137); +COMPILER_STRIP_GATE(0x80BCC614, &lit_4137); #pragma pop /* 80BCC618-80BCC61C 0000A0 0004+00 0/3 0/0 0/0 .rodata @4138 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4138 = 50.0f; -COMPILER_STRIP_GATE(80BCC618, &lit_4138); +COMPILER_STRIP_GATE(0x80BCC618, &lit_4138); #pragma pop /* 80BCC61C-80BCC620 0000A4 0004+00 0/1 0/0 0/0 .rodata @4139 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4139 = 150.0f; -COMPILER_STRIP_GATE(80BCC61C, &lit_4139); +COMPILER_STRIP_GATE(0x80BCC61C, &lit_4139); #pragma pop /* 80BCC620-80BCC624 0000A8 0004+00 0/1 0/0 0/0 .rodata @4140 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4140 = 4096.0f; -COMPILER_STRIP_GATE(80BCC620, &lit_4140); +COMPILER_STRIP_GATE(0x80BCC620, &lit_4140); #pragma pop /* 80BCC624-80BCC628 0000AC 0004+00 0/2 0/0 0/0 .rodata @4141 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4141 = 0.5f; -COMPILER_STRIP_GATE(80BCC624, &lit_4141); +COMPILER_STRIP_GATE(0x80BCC624, &lit_4141); #pragma pop /* 80BCC628-80BCC62C 0000B0 0004+00 0/1 0/0 0/0 .rodata @4142 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4142 = 7.0f / 10.0f; -COMPILER_STRIP_GATE(80BCC628, &lit_4142); +COMPILER_STRIP_GATE(0x80BCC628, &lit_4142); #pragma pop /* 80BCC62C-80BCC630 0000B4 0004+00 0/1 0/0 0/0 .rodata @4143 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4143 = 0.25f; -COMPILER_STRIP_GATE(80BCC62C, &lit_4143); +COMPILER_STRIP_GATE(0x80BCC62C, &lit_4143); #pragma pop /* 80BCAEDC-80BCB210 000CBC 0334+00 2/2 0/0 0/0 .text MoveAction__10daObjCHO_cFv */ @@ -865,13 +871,13 @@ SECTION_RODATA static u16 const l_cho_itemno[1 + 1 /* padding */] = { /* padding */ 0x0000, }; -COMPILER_STRIP_GATE(80BCC630, &l_cho_itemno); +COMPILER_STRIP_GATE(0x80BCC630, &l_cho_itemno); /* 80BCC634-80BCC638 0000BC 0004+00 0/0 0/0 0/0 .rodata @4226 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4226 = 4000.0f; -COMPILER_STRIP_GATE(80BCC634, &lit_4226); +COMPILER_STRIP_GATE(0x80BCC634, &lit_4226); #pragma pop /* 80BCC638-80BCC640 0000C0 0004+04 0/1 0/0 0/0 .rodata @4227 */ @@ -882,7 +888,7 @@ SECTION_RODATA static f32 const lit_4227[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80BCC638, &lit_4227); +COMPILER_STRIP_GATE(0x80BCC638, &lit_4227); #pragma pop /* 80BCC640-80BCC648 0000C8 0008+00 0/0 0/0 0/0 .rodata @4229 */ @@ -891,21 +897,21 @@ COMPILER_STRIP_GATE(80BCC638, &lit_4227); SECTION_RODATA static u8 const lit_4229[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BCC640, &lit_4229); +COMPILER_STRIP_GATE(0x80BCC640, &lit_4229); #pragma pop /* 80BCC648-80BCC64C 0000D0 0004+00 0/1 0/0 0/0 .rodata @4268 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4268 = 608.0f; -COMPILER_STRIP_GATE(80BCC648, &lit_4268); +COMPILER_STRIP_GATE(0x80BCC648, &lit_4268); #pragma pop /* 80BCC64C-80BCC650 0000D4 0004+00 0/1 0/0 0/0 .rodata @4269 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4269 = 448.0f; -COMPILER_STRIP_GATE(80BCC64C, &lit_4269); +COMPILER_STRIP_GATE(0x80BCC64C, &lit_4269); #pragma pop /* 80BCC650-80BCC658 0000D8 0004+04 0/1 0/0 0/0 .rodata @4270 */ @@ -916,7 +922,7 @@ SECTION_RODATA static f32 const lit_4270[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80BCC650, &lit_4270); +COMPILER_STRIP_GATE(0x80BCC650, &lit_4270); #pragma pop /* 80BCB320-80BCB49C 001100 017C+00 1/1 0/0 0/0 .text Z_BufferChk__10daObjCHO_cFv */ @@ -934,7 +940,7 @@ asm void daObjCHO_c::Z_BufferChk() { SECTION_RODATA static u8 const lit_4300[8] = { 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BCC658, &lit_4300); +COMPILER_STRIP_GATE(0x80BCC658, &lit_4300); /* 80BCB49C-80BCB5C0 00127C 0124+00 1/1 0/0 0/0 .text ParticleSet__10daObjCHO_cFv */ #pragma push @@ -971,7 +977,7 @@ asm cM3dGPla::~cM3dGPla() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4421 = 10000.0f; -COMPILER_STRIP_GATE(80BCC660, &lit_4421); +COMPILER_STRIP_GATE(0x80BCC660, &lit_4421); #pragma pop /* 80BCB87C-80BCBB40 00165C 02C4+00 1/1 0/0 0/0 .text Execute__10daObjCHO_cFv */ @@ -989,7 +995,7 @@ asm void daObjCHO_c::Execute() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4452 = 8.0f; -COMPILER_STRIP_GATE(80BCC664, &lit_4452); +COMPILER_STRIP_GATE(0x80BCC664, &lit_4452); #pragma pop /* 80BCBB40-80BCBCA8 001920 0168+00 1/1 0/0 0/0 .text ObjHit__10daObjCHO_cFv */ @@ -1029,11 +1035,11 @@ asm void daObjCHO_c::setBaseMtx() { /* ############################################################################################## */ /* 80BCC668-80BCC66C 0000F0 0004+00 1/1 0/0 0/0 .rodata @4516 */ SECTION_RODATA static f32 const lit_4516 = 15.0f; -COMPILER_STRIP_GATE(80BCC668, &lit_4516); +COMPILER_STRIP_GATE(0x80BCC668, &lit_4516); /* 80BCC66C-80BCC670 0000F4 0004+00 1/1 0/0 0/0 .rodata @4517 */ SECTION_RODATA static f32 const lit_4517 = -3.0f / 5.0f; -COMPILER_STRIP_GATE(80BCC66C, &lit_4517); +COMPILER_STRIP_GATE(0x80BCC66C, &lit_4517); /* 80BCBD70-80BCBE50 001B50 00E0+00 1/0 0/0 0/0 .text daObjCHO_Draw__FP10daObjCHO_c */ #pragma push @@ -1058,7 +1064,13 @@ static asm void daObjCHO_Execute(daObjCHO_c* param_0) { /* ############################################################################################## */ /* 80BCC670-80BCC674 0000F8 0004+00 1/2 0/0 0/0 .rodata l_musiya_num */ SECTION_RODATA static u32 const l_musiya_num = 0x01930194; -COMPILER_STRIP_GATE(80BCC670, &l_musiya_num); +COMPILER_STRIP_GATE(0x80BCC670, &l_musiya_num); + +/* 80BCC678-80BCC678 000100 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80BCC67E = "R_SP160"; +#pragma pop /* 80BCBE70-80BCC01C 001C50 01AC+00 1/1 0/0 0/0 .text CreateChk__10daObjCHO_cFv */ #pragma push @@ -1075,7 +1087,7 @@ asm void daObjCHO_c::CreateChk() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4670 = -50.0f; -COMPILER_STRIP_GATE(80BCC674, &lit_4670); +COMPILER_STRIP_GATE(0x80BCC674, &lit_4670); #pragma pop /* 80BCC754-80BCC760 00000C 000C+00 1/1 0/0 0/0 .bss @3770 */ @@ -1152,7 +1164,7 @@ asm void __sinit_d_a_obj_cho_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80BCC518 = (void*)__sinit_d_a_obj_cho_cpp; +REGISTER_CTORS(0x80BCC518, __sinit_d_a_obj_cho_cpp); #pragma pop /* 80BCC554-80BCC55C 002334 0008+00 1/0 0/0 0/0 .text @36@__dt__12dBgS_ObjAcchFv */ @@ -1175,10 +1187,4 @@ static asm void func_80BCC55C() { } #pragma pop -/* 80BCC678-80BCC686 000100 000E+00 7/7 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80BCC678 = "I_Cho"; -SECTION_DEAD static char const* const stringBase_80BCC67E = "R_SP160"; -#pragma pop +/* 80BCC678-80BCC678 000100 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_cowdoor/d_a_obj_cowdoor.cpp b/rel/d/a/obj/d_a_obj_cowdoor/d_a_obj_cowdoor.cpp index 9eee8adc464..781c759f4de 100644 --- a/rel/d/a/obj/d_a_obj_cowdoor/d_a_obj_cowdoor.cpp +++ b/rel/d/a/obj/d_a_obj_cowdoor/d_a_obj_cowdoor.cpp @@ -134,7 +134,7 @@ asm void daCowdoor_c::setBaseMtx() { /* ############################################################################################## */ /* 80BCCBB4-80BCCBB8 000000 0004+00 1/1 0/0 0/0 .rodata @3648 */ SECTION_RODATA static f32 const lit_3648 = 5.0f; -COMPILER_STRIP_GATE(80BCCBB4, &lit_3648); +COMPILER_STRIP_GATE(0x80BCCBB4, &lit_3648); /* 80BCC86C-80BCC8C4 0000EC 0058+00 1/0 0/0 0/0 .text Create__11daCowdoor_cFv */ #pragma push @@ -147,6 +147,13 @@ asm void daCowdoor_c::Create() { #pragma pop /* ############################################################################################## */ +/* 80BCCBB8-80BCCBB8 000004 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80BCCBB8 = "A_UHDoor"; +SECTION_DEAD static char const* const stringBase_80BCCBC1 = "A_UHDoor.bmd"; +#pragma pop + /* 80BCCBDC-80BCCBE0 -00001 0004+00 3/3 0/0 0/0 .data l_arcName */ SECTION_DATA static void* l_arcName = (void*)&d_a_obj_cowdoor__stringBase0; @@ -164,6 +171,12 @@ asm void daCowdoor_c::CreateHeap() { #pragma pop /* ############################################################################################## */ +/* 80BCCBB8-80BCCBB8 000004 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80BCCBCE = "A_UHDoor.dzb"; +#pragma pop + /* 80BCCBE4-80BCCBE8 -00001 0004+00 1/1 0/0 0/0 .data l_dzbName */ SECTION_DATA static void* l_dzbName = (void*)(((char*)&d_a_obj_cowdoor__stringBase0) + 0x16); @@ -285,11 +298,4 @@ static asm void daCowdoor_Create(fopAc_ac_c* param_0) { } #pragma pop -/* 80BCCBB8-80BCCBDB 000004 0023+00 3/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80BCCBB8 = "A_UHDoor"; -SECTION_DEAD static char const* const stringBase_80BCCBC1 = "A_UHDoor.bmd"; -SECTION_DEAD static char const* const stringBase_80BCCBCE = "A_UHDoor.dzb"; -#pragma pop +/* 80BCCBB8-80BCCBB8 000004 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_crope/d_a_obj_crope.cpp b/rel/d/a/obj/d_a_obj_crope/d_a_obj_crope.cpp index f863c707b0c..0a14ccc9c86 100644 --- a/rel/d/a/obj/d_a_obj_crope/d_a_obj_crope.cpp +++ b/rel/d/a/obj/d_a_obj_crope/d_a_obj_crope.cpp @@ -19,11 +19,11 @@ struct mDoExt_3DlineMatSortPacket { /* 80014738 */ void setMat(mDoExt_3DlineMat_c*); }; -struct dKy_tevstr_c {}; +struct ResTIMG {}; struct _GXColor {}; -struct ResTIMG {}; +struct dKy_tevstr_c {}; struct mDoExt_3DlineMat1_c { /* 80013360 */ void init(u16, u16, ResTIMG*, int); @@ -214,7 +214,7 @@ SECTION_RODATA static u8 const l_arcName[6 + 2 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BCEACC, &l_arcName); +COMPILER_STRIP_GATE(0x80BCEACC, &l_arcName); /* 80BCCCD8-80BCCD44 000078 006C+00 1/1 0/0 0/0 .text createHeap__12daObjCrope_cFv */ #pragma push @@ -241,21 +241,21 @@ static asm void daObjCrope_createHeap(fopAc_ac_c* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3870 = -5.0f; -COMPILER_STRIP_GATE(80BCEAD4, &lit_3870); +COMPILER_STRIP_GATE(0x80BCEAD4, &lit_3870); #pragma pop /* 80BCEAD8-80BCEADC 00000C 0004+00 0/1 0/0 0/0 .rodata @3871 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3871 = 0.5f; -COMPILER_STRIP_GATE(80BCEAD8, &lit_3871); +COMPILER_STRIP_GATE(0x80BCEAD8, &lit_3871); #pragma pop /* 80BCEADC-80BCEAE0 000010 0004+00 0/2 0/0 0/0 .rodata @3872 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3872 = 1.0f; -COMPILER_STRIP_GATE(80BCEADC, &lit_3872); +COMPILER_STRIP_GATE(0x80BCEADC, &lit_3872); #pragma pop /* 80BCEAE0-80BCEAE4 000014 0004+00 0/4 0/0 0/0 .rodata @3873 */ @@ -267,7 +267,7 @@ SECTION_RODATA static u8 const lit_3873[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BCEAE0, &lit_3873); +COMPILER_STRIP_GATE(0x80BCEAE0, &lit_3873); #pragma pop /* 80BCEAE4-80BCEAEC 000018 0008+00 0/3 0/0 0/0 .rodata @3874 */ @@ -276,7 +276,7 @@ COMPILER_STRIP_GATE(80BCEAE0, &lit_3873); SECTION_RODATA static u8 const lit_3874[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BCEAE4, &lit_3874); +COMPILER_STRIP_GATE(0x80BCEAE4, &lit_3874); #pragma pop /* 80BCEAEC-80BCEAF4 000020 0008+00 0/3 0/0 0/0 .rodata @3875 */ @@ -285,7 +285,7 @@ COMPILER_STRIP_GATE(80BCEAE4, &lit_3874); SECTION_RODATA static u8 const lit_3875[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BCEAEC, &lit_3875); +COMPILER_STRIP_GATE(0x80BCEAEC, &lit_3875); #pragma pop /* 80BCEAF4-80BCEAFC 000028 0008+00 0/3 0/0 0/0 .rodata @3876 */ @@ -294,49 +294,49 @@ COMPILER_STRIP_GATE(80BCEAEC, &lit_3875); SECTION_RODATA static u8 const lit_3876[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BCEAF4, &lit_3876); +COMPILER_STRIP_GATE(0x80BCEAF4, &lit_3876); #pragma pop /* 80BCEAFC-80BCEB00 000030 0004+00 0/1 0/0 0/0 .rodata @3877 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3877 = 3.0f; -COMPILER_STRIP_GATE(80BCEAFC, &lit_3877); +COMPILER_STRIP_GATE(0x80BCEAFC, &lit_3877); #pragma pop /* 80BCEB00-80BCEB04 000034 0004+00 0/1 0/0 0/0 .rodata @3878 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3878 = 75.0f; -COMPILER_STRIP_GATE(80BCEB00, &lit_3878); +COMPILER_STRIP_GATE(0x80BCEB00, &lit_3878); #pragma pop /* 80BCEB04-80BCEB08 000038 0004+00 0/1 0/0 0/0 .rodata @3879 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3879 = 50.0f; -COMPILER_STRIP_GATE(80BCEB04, &lit_3879); +COMPILER_STRIP_GATE(0x80BCEB04, &lit_3879); #pragma pop /* 80BCEB08-80BCEB0C 00003C 0004+00 0/1 0/0 0/0 .rodata @3880 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3880 = -75.0f; -COMPILER_STRIP_GATE(80BCEB08, &lit_3880); +COMPILER_STRIP_GATE(0x80BCEB08, &lit_3880); #pragma pop /* 80BCEB0C-80BCEB10 000040 0004+00 0/1 0/0 0/0 .rodata @3881 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3881 = -200.0f; -COMPILER_STRIP_GATE(80BCEB0C, &lit_3881); +COMPILER_STRIP_GATE(0x80BCEB0C, &lit_3881); #pragma pop /* 80BCEB10-80BCEB14 000044 0004+00 0/1 0/0 0/0 .rodata @3882 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3882 = 1.0f / 99.0f; -COMPILER_STRIP_GATE(80BCEB10, &lit_3882); +COMPILER_STRIP_GATE(0x80BCEB10, &lit_3882); #pragma pop /* 80BCEB3C-80BCEB7C 000000 0040+00 1/1 0/0 0/0 .data l_sphSrc */ @@ -509,35 +509,35 @@ static asm void daObjCrope_Delete(daObjCrope_c* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4115 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(80BCEB14, &lit_4115); +COMPILER_STRIP_GATE(0x80BCEB14, &lit_4115); #pragma pop /* 80BCEB18-80BCEB1C 00004C 0004+00 0/1 0/0 0/0 .rodata @4116 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4116 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(80BCEB18, &lit_4116); +COMPILER_STRIP_GATE(0x80BCEB18, &lit_4116); #pragma pop /* 80BCEB1C-80BCEB20 000050 0004+00 0/1 0/0 0/0 .rodata @4117 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4117 = 3.0f / 5.0f; -COMPILER_STRIP_GATE(80BCEB1C, &lit_4117); +COMPILER_STRIP_GATE(0x80BCEB1C, &lit_4117); #pragma pop /* 80BCEB20-80BCEB24 000054 0004+00 0/2 0/0 0/0 .rodata @4118 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4118 = 49.0f / 100.0f; -COMPILER_STRIP_GATE(80BCEB20, &lit_4118); +COMPILER_STRIP_GATE(0x80BCEB20, &lit_4118); #pragma pop /* 80BCEB24-80BCEB28 000058 0004+00 0/1 0/0 0/0 .rodata @4119 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4119 = 4.0f / 5.0f; -COMPILER_STRIP_GATE(80BCEB24, &lit_4119); +COMPILER_STRIP_GATE(0x80BCEB24, &lit_4119); #pragma pop /* 80BCD6C4-80BCD9EC 000A64 0328+00 3/3 0/0 0/0 .text setNormalRopePos__12daObjCrope_cFv @@ -554,7 +554,7 @@ asm void daObjCrope_c::setNormalRopePos() { /* ############################################################################################## */ /* 80BCEB28-80BCEB2C 00005C 0004+00 1/2 0/0 0/0 .rodata @4407 */ SECTION_RODATA static f32 const lit_4407 = 5.0f; -COMPILER_STRIP_GATE(80BCEB28, &lit_4407); +COMPILER_STRIP_GATE(0x80BCEB28, &lit_4407); /* 80BCEB2C-80BCEB34 000060 0004+04 0/1 0/0 0/0 .rodata @4408 */ #pragma push @@ -564,7 +564,7 @@ SECTION_RODATA static u32 const lit_4408[1 + 1 /* padding */] = { /* padding */ 0x00000000, }; -COMPILER_STRIP_GATE(80BCEB2C, &lit_4408); +COMPILER_STRIP_GATE(0x80BCEB2C, &lit_4408); #pragma pop /* 80BCEB34-80BCEB3C 000068 0008+00 0/1 0/0 0/0 .rodata @4410 */ @@ -573,7 +573,7 @@ COMPILER_STRIP_GATE(80BCEB2C, &lit_4408); SECTION_RODATA static u8 const lit_4410[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BCEB34, &lit_4410); +COMPILER_STRIP_GATE(0x80BCEB34, &lit_4410); #pragma pop /* 80BCD9EC-80BCE4FC 000D8C 0B10+00 1/1 0/0 0/0 .text setRideRopePos__12daObjCrope_cFv */ diff --git a/rel/d/a/obj/d_a_obj_crvfence/d_a_obj_crvfence.cpp b/rel/d/a/obj/d_a_obj_crvfence/d_a_obj_crvfence.cpp index 5141ffb462e..8cc8f95aa43 100644 --- a/rel/d/a/obj/d_a_obj_crvfence/d_a_obj_crvfence.cpp +++ b/rel/d/a/obj/d_a_obj_crvfence/d_a_obj_crvfence.cpp @@ -168,10 +168,10 @@ struct cBgS { /* 800743B4 */ void LineCross(cBgS_LinChk*); }; -struct Vec {}; - struct JAISoundID {}; +struct Vec {}; + struct Z2SeMgr { /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); }; @@ -314,7 +314,7 @@ SECTION_RODATA static u8 const lit_3685[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BD0188, &lit_3685); +COMPILER_STRIP_GATE(0x80BD0188, &lit_3685); /* 80BCEC98-80BCED24 000078 008C+00 2/2 0/0 0/0 .text CheckVec__15daObjCRVFENCE_cFv */ #pragma push @@ -366,6 +366,14 @@ static asm void daObjCRVFENCE_Delete(daObjCRVFENCE_c* param_0) { } #pragma pop +/* ############################################################################################## */ +/* 80BD020C-80BD020C 000084 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80BD020C = "CrvFence"; +SECTION_DEAD static char const* const stringBase_80BD0215 = "Release Error\n"; +#pragma pop + /* 80BCEE60-80BCEED0 000240 0070+00 1/1 0/0 0/0 .text BgRelease__15daObjCRVFENCE_cFv */ #pragma push #pragma optimization_level 0 @@ -391,42 +399,42 @@ asm void daObjCRVFENCE_c::PosSet(cXyz* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3761 = 20.0f; -COMPILER_STRIP_GATE(80BD018C, &lit_3761); +COMPILER_STRIP_GATE(0x80BD018C, &lit_3761); #pragma pop /* 80BD0190-80BD0194 000008 0004+00 0/2 0/0 0/0 .rodata @3762 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3762 = -9.0f; -COMPILER_STRIP_GATE(80BD0190, &lit_3762); +COMPILER_STRIP_GATE(0x80BD0190, &lit_3762); #pragma pop /* 80BD0194-80BD0198 00000C 0004+00 0/1 0/0 0/0 .rodata @3763 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3763 = -0.5f; -COMPILER_STRIP_GATE(80BD0194, &lit_3763); +COMPILER_STRIP_GATE(0x80BD0194, &lit_3763); #pragma pop /* 80BD0198-80BD019C 000010 0004+00 0/2 0/0 0/0 .rodata @3764 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3764 = 100.0f; -COMPILER_STRIP_GATE(80BD0198, &lit_3764); +COMPILER_STRIP_GATE(0x80BD0198, &lit_3764); #pragma pop /* 80BD019C-80BD01A0 000014 0004+00 0/1 0/0 0/0 .rodata @3765 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3765 = -7.0f / 10.0f; -COMPILER_STRIP_GATE(80BD019C, &lit_3765); +COMPILER_STRIP_GATE(0x80BD019C, &lit_3765); #pragma pop /* 80BD01A0-80BD01A4 000018 0004+00 0/1 0/0 0/0 .rodata @3766 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3766 = 7.0f / 10.0f; -COMPILER_STRIP_GATE(80BD01A0, &lit_3766); +COMPILER_STRIP_GATE(0x80BD01A0, &lit_3766); #pragma pop /* 80BCEF30-80BCF0B0 000310 0180+00 1/1 0/0 0/0 .text @@ -446,63 +454,63 @@ asm void daObjCRVFENCE_c::FenceMove(u8& param_0, cXyz* param_1, csXyz* param_2, #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3825 = 180.0f; -COMPILER_STRIP_GATE(80BD01A4, &lit_3825); +COMPILER_STRIP_GATE(0x80BD01A4, &lit_3825); #pragma pop /* 80BD01A8-80BD01AC 000020 0004+00 0/1 0/0 0/0 .rodata @3826 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3826 = -180.0f; -COMPILER_STRIP_GATE(80BD01A8, &lit_3826); +COMPILER_STRIP_GATE(0x80BD01A8, &lit_3826); #pragma pop /* 80BD01AC-80BD01B0 000024 0004+00 0/1 0/0 0/0 .rodata @3827 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3827 = 15.0f; -COMPILER_STRIP_GATE(80BD01AC, &lit_3827); +COMPILER_STRIP_GATE(0x80BD01AC, &lit_3827); #pragma pop /* 80BD01B0-80BD01B4 000028 0004+00 0/2 0/0 0/0 .rodata @3828 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3828 = 30.0f; -COMPILER_STRIP_GATE(80BD01B0, &lit_3828); +COMPILER_STRIP_GATE(0x80BD01B0, &lit_3828); #pragma pop /* 80BD01B4-80BD01B8 00002C 0004+00 0/1 0/0 0/0 .rodata @3829 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3829 = -25.0f; -COMPILER_STRIP_GATE(80BD01B4, &lit_3829); +COMPILER_STRIP_GATE(0x80BD01B4, &lit_3829); #pragma pop /* 80BD01B8-80BD01BC 000030 0004+00 0/1 0/0 0/0 .rodata @3830 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3830 = 40.0f; -COMPILER_STRIP_GATE(80BD01B8, &lit_3830); +COMPILER_STRIP_GATE(0x80BD01B8, &lit_3830); #pragma pop /* 80BD01BC-80BD01C0 000034 0004+00 0/2 0/0 0/0 .rodata @3831 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3831 = 25.0f; -COMPILER_STRIP_GATE(80BD01BC, &lit_3831); +COMPILER_STRIP_GATE(0x80BD01BC, &lit_3831); #pragma pop /* 80BD01C0-80BD01C4 000038 0004+00 0/1 0/0 0/0 .rodata @3832 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3832 = -15.0f; -COMPILER_STRIP_GATE(80BD01C0, &lit_3832); +COMPILER_STRIP_GATE(0x80BD01C0, &lit_3832); #pragma pop /* 80BD01C4-80BD01C8 00003C 0004+00 0/2 0/0 0/0 .rodata @3833 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3833 = 1000.0f; -COMPILER_STRIP_GATE(80BD01C4, &lit_3833); +COMPILER_STRIP_GATE(0x80BD01C4, &lit_3833); #pragma pop /* 80BCF0B0-80BCF390 000490 02E0+00 1/1 0/0 0/0 .text BrokenAction__15daObjCRVFENCE_cFv @@ -519,7 +527,7 @@ asm void daObjCRVFENCE_c::BrokenAction() { /* ############################################################################################## */ /* 80BD01C8-80BD01CC 000040 0004+00 1/1 0/0 0/0 .rodata @3845 */ SECTION_RODATA static f32 const lit_3845 = 600.0f; -COMPILER_STRIP_GATE(80BD01C8, &lit_3845); +COMPILER_STRIP_GATE(0x80BD01C8, &lit_3845); /* 80BCF390-80BCF404 000770 0074+00 1/1 0/0 0/0 .text s_obj_sub__FPvPv */ #pragma push @@ -534,55 +542,55 @@ static asm void s_obj_sub(void* param_0, void* param_1) { /* ############################################################################################## */ /* 80BD01CC-80BD01D0 000044 0004+00 1/2 0/0 0/0 .rodata @3953 */ SECTION_RODATA static f32 const lit_3953 = 1.0f; -COMPILER_STRIP_GATE(80BD01CC, &lit_3953); +COMPILER_STRIP_GATE(0x80BD01CC, &lit_3953); /* 80BD01D0-80BD01D4 000048 0004+00 0/1 0/0 0/0 .rodata @3954 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3954 = -1.0f; -COMPILER_STRIP_GATE(80BD01D0, &lit_3954); +COMPILER_STRIP_GATE(0x80BD01D0, &lit_3954); #pragma pop /* 80BD01D4-80BD01D8 00004C 0004+00 0/1 0/0 0/0 .rodata @3955 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3955 = 150.0f; -COMPILER_STRIP_GATE(80BD01D4, &lit_3955); +COMPILER_STRIP_GATE(0x80BD01D4, &lit_3955); #pragma pop /* 80BD01D8-80BD01DC 000050 0004+00 0/1 0/0 0/0 .rodata @3956 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3956 = 300.0f; -COMPILER_STRIP_GATE(80BD01D8, &lit_3956); +COMPILER_STRIP_GATE(0x80BD01D8, &lit_3956); #pragma pop /* 80BD01DC-80BD01E0 000054 0004+00 0/1 0/0 0/0 .rodata @3957 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3957 = -200.0f; -COMPILER_STRIP_GATE(80BD01DC, &lit_3957); +COMPILER_STRIP_GATE(0x80BD01DC, &lit_3957); #pragma pop /* 80BD01E0-80BD01E4 000058 0004+00 0/1 0/0 0/0 .rodata @3958 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3958 = 50.0f; -COMPILER_STRIP_GATE(80BD01E0, &lit_3958); +COMPILER_STRIP_GATE(0x80BD01E0, &lit_3958); #pragma pop /* 80BD01E4-80BD01E8 00005C 0004+00 0/1 0/0 0/0 .rodata @3959 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3959 = 120.0f; -COMPILER_STRIP_GATE(80BD01E4, &lit_3959); +COMPILER_STRIP_GATE(0x80BD01E4, &lit_3959); #pragma pop /* 80BD01E8-80BD01EC 000060 0004+00 0/1 0/0 0/0 .rodata @3960 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3960 = 200.0f; -COMPILER_STRIP_GATE(80BD01E8, &lit_3960); +COMPILER_STRIP_GATE(0x80BD01E8, &lit_3960); #pragma pop /* 80BCF404-80BCF7DC 0007E4 03D8+00 1/1 0/0 0/0 .text NormalAction__15daObjCRVFENCE_cFv @@ -601,14 +609,14 @@ asm void daObjCRVFENCE_c::NormalAction() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3975 = 608.0f; -COMPILER_STRIP_GATE(80BD01EC, &lit_3975); +COMPILER_STRIP_GATE(0x80BD01EC, &lit_3975); #pragma pop /* 80BD01F0-80BD01F4 000068 0004+00 0/1 0/0 0/0 .rodata @3976 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3976 = 448.0f; -COMPILER_STRIP_GATE(80BD01F0, &lit_3976); +COMPILER_STRIP_GATE(0x80BD01F0, &lit_3976); #pragma pop /* 80BCF7DC-80BCF860 000BBC 0084+00 1/1 0/0 0/0 .text checkViewArea__15daObjCRVFENCE_cFP4cXyz */ @@ -634,7 +642,7 @@ asm void daObjCRVFENCE_c::Action() { /* ############################################################################################## */ /* 80BD01F4-80BD01F8 00006C 0004+00 1/1 0/0 0/0 .rodata @4010 */ SECTION_RODATA static f32 const lit_4010 = 6.0f / 5.0f; -COMPILER_STRIP_GATE(80BD01F4, &lit_4010); +COMPILER_STRIP_GATE(0x80BD01F4, &lit_4010); /* 80BCF8A4-80BCF998 000C84 00F4+00 1/1 0/0 0/0 .text setBaseMtx__15daObjCRVFENCE_cFv */ #pragma push @@ -668,6 +676,13 @@ static asm void daObjCRVFENCE_Execute(daObjCRVFENCE_c* param_0) { #pragma pop /* ############################################################################################## */ +/* 80BD020C-80BD020C 000084 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80BD0224 = "CaravanFence.bmd"; +SECTION_DEAD static char const* const stringBase_80BD0235 = "U_CaravanGate_PieceB.bmd"; +#pragma pop + /* 80BD0260-80BD0264 -00001 0004+00 3/3 0/0 0/0 .data l_arcName */ SECTION_DATA static void* l_arcName = (void*)&d_a_obj_crvfence__stringBase0; @@ -686,28 +701,34 @@ asm void daObjCRVFENCE_c::CreateHeap() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4119 = 3.0f; -COMPILER_STRIP_GATE(80BD01F8, &lit_4119); +COMPILER_STRIP_GATE(0x80BD01F8, &lit_4119); #pragma pop /* 80BD01FC-80BD0200 000074 0004+00 0/2 0/0 0/0 .rodata @4120 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4120 = -500.0f; -COMPILER_STRIP_GATE(80BD01FC, &lit_4120); +COMPILER_STRIP_GATE(0x80BD01FC, &lit_4120); #pragma pop /* 80BD0200-80BD0204 000078 0004+00 0/2 0/0 0/0 .rodata @4121 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4121 = 500.0f; -COMPILER_STRIP_GATE(80BD0200, &lit_4121); +COMPILER_STRIP_GATE(0x80BD0200, &lit_4121); #pragma pop /* 80BD0204-80BD0208 00007C 0004+00 0/1 0/0 0/0 .rodata @4122 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4122 = 450.0f; -COMPILER_STRIP_GATE(80BD0204, &lit_4122); +COMPILER_STRIP_GATE(0x80BD0204, &lit_4122); +#pragma pop + +/* 80BD020C-80BD020C 000084 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80BD024E = "CaravanFence.dzb"; #pragma pop /* 80BD0264-80BD0284 -00001 0020+00 1/0 0/0 0/0 .data l_daObjCRVFENCE_Method */ @@ -849,7 +870,7 @@ static bool daObjCRVFENCE_IsDelete(daObjCRVFENCE_c* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4219 = -1000.0f; -COMPILER_STRIP_GATE(80BD0208, &lit_4219); +COMPILER_STRIP_GATE(0x80BD0208, &lit_4219); #pragma pop /* 80BCFFC8-80BD000C 0013A8 0044+00 1/0 0/0 0/0 .text Create__15daObjCRVFENCE_cFv */ @@ -912,13 +933,4 @@ static asm void func_80BD0178() { } #pragma pop -/* 80BD020C-80BD025F 000084 0053+00 4/3 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80BD020C = "CrvFence"; -SECTION_DEAD static char const* const stringBase_80BD0215 = "Release Error\n"; -SECTION_DEAD static char const* const stringBase_80BD0224 = "CaravanFence.bmd"; -SECTION_DEAD static char const* const stringBase_80BD0235 = "U_CaravanGate_PieceB.bmd"; -SECTION_DEAD static char const* const stringBase_80BD024E = "CaravanFence.dzb"; -#pragma pop +/* 80BD020C-80BD020C 000084 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_crvgate/d_a_obj_crvgate.cpp b/rel/d/a/obj/d_a_obj_crvgate/d_a_obj_crvgate.cpp index 82ca0b01ff1..0c0efeeb11b 100644 --- a/rel/d/a/obj/d_a_obj_crvgate/d_a_obj_crvgate.cpp +++ b/rel/d/a/obj/d_a_obj_crvgate/d_a_obj_crvgate.cpp @@ -187,10 +187,10 @@ struct Z2SoundObjSimple { /* 802BE844 */ Z2SoundObjSimple(); }; -struct Vec {}; - struct JAISoundID {}; +struct Vec {}; + struct Z2SeMgr { /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); }; @@ -372,20 +372,20 @@ SECTION_RODATA static u8 const ccCylSrc[64] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0xC8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0x70, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BD30C0, &ccCylSrc); +COMPILER_STRIP_GATE(0x80BD30C0, &ccCylSrc); /* 80BD3100-80BD3104 000040 0004+00 0/2 0/0 0/0 .rodata @3792 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3792 = 100.0f; -COMPILER_STRIP_GATE(80BD3100, &lit_3792); +COMPILER_STRIP_GATE(0x80BD3100, &lit_3792); #pragma pop /* 80BD3104-80BD3108 000044 0004+00 0/2 0/0 0/0 .rodata @3793 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3793 = 95.0f; -COMPILER_STRIP_GATE(80BD3104, &lit_3793); +COMPILER_STRIP_GATE(0x80BD3104, &lit_3793); #pragma pop /* 80BD3108-80BD3110 000048 0004+04 1/9 0/0 0/0 .rodata @3794 */ @@ -400,13 +400,13 @@ SECTION_RODATA static u8 const lit_3794[4 + 4 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BD3108, &lit_3794); +COMPILER_STRIP_GATE(0x80BD3108, &lit_3794); /* 80BD3110-80BD3118 000050 0008+00 2/6 0/0 0/0 .rodata @3796 */ SECTION_RODATA static u8 const lit_3796[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BD3110, &lit_3796); +COMPILER_STRIP_GATE(0x80BD3110, &lit_3796); /* 80BD0398-80BD0500 000078 0168+00 1/1 0/0 0/0 .text initCcCylinder__14daObjCRVGATE_cFv */ @@ -424,14 +424,14 @@ asm void daObjCRVGATE_c::initCcCylinder() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3817 = 80.0f; -COMPILER_STRIP_GATE(80BD3118, &lit_3817); +COMPILER_STRIP_GATE(0x80BD3118, &lit_3817); #pragma pop /* 80BD311C-80BD3120 00005C 0004+00 0/1 0/0 0/0 .rodata @3818 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3818 = 130.0f; -COMPILER_STRIP_GATE(80BD311C, &lit_3818); +COMPILER_STRIP_GATE(0x80BD311C, &lit_3818); #pragma pop /* 80BD0500-80BD0658 0001E0 0158+00 1/1 0/0 0/0 .text setCcCylinder__14daObjCRVGATE_cFv @@ -473,7 +473,7 @@ static asm void daObjCRVGATE_Delete(daObjCRVGATE_c* param_0) { SECTION_RODATA static u8 const lit_3881[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BD3120, &lit_3881); +COMPILER_STRIP_GATE(0x80BD3120, &lit_3881); #pragma pop /* 80BD3128-80BD3130 000068 0008+00 0/3 0/0 0/0 .rodata @3882 */ @@ -482,7 +482,7 @@ COMPILER_STRIP_GATE(80BD3120, &lit_3881); SECTION_RODATA static u8 const lit_3882[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BD3128, &lit_3882); +COMPILER_STRIP_GATE(0x80BD3128, &lit_3882); #pragma pop /* 80BD3130-80BD3138 000070 0008+00 0/4 0/0 0/0 .rodata @3883 */ @@ -491,14 +491,14 @@ COMPILER_STRIP_GATE(80BD3128, &lit_3882); SECTION_RODATA static u8 const lit_3883[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BD3130, &lit_3883); +COMPILER_STRIP_GATE(0x80BD3130, &lit_3883); #pragma pop /* 80BD3138-80BD313C 000078 0004+00 0/3 0/0 0/0 .rodata @3884 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3884 = 200.0f; -COMPILER_STRIP_GATE(80BD3138, &lit_3884); +COMPILER_STRIP_GATE(0x80BD3138, &lit_3884); #pragma pop /* 80BD069C-80BD0844 00037C 01A8+00 1/1 0/0 0/0 .text checkOpen__14daObjCRVGATE_cFv */ @@ -534,11 +534,11 @@ asm void daObjCRVGATE_c::actionStartEvent() { /* ############################################################################################## */ /* 80BD313C-80BD3140 00007C 0004+00 2/5 0/0 0/0 .rodata @3937 */ SECTION_RODATA static f32 const lit_3937 = 1.0f; -COMPILER_STRIP_GATE(80BD313C, &lit_3937); +COMPILER_STRIP_GATE(0x80BD313C, &lit_3937); /* 80BD3140-80BD3144 000080 0004+00 2/5 0/0 0/0 .rodata @3938 */ SECTION_RODATA static f32 const lit_3938 = -1.0f; -COMPILER_STRIP_GATE(80BD3140, &lit_3938); +COMPILER_STRIP_GATE(0x80BD3140, &lit_3938); /* 80BD0978-80BD0A64 000658 00EC+00 1/1 0/0 0/0 .text actionWaitEvent__14daObjCRVGATE_cFv */ @@ -556,14 +556,14 @@ asm void daObjCRVGATE_c::actionWaitEvent() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3990 = 300.0f; -COMPILER_STRIP_GATE(80BD3144, &lit_3990); +COMPILER_STRIP_GATE(0x80BD3144, &lit_3990); #pragma pop /* 80BD3148-80BD314C 000088 0004+00 0/3 0/0 0/0 .rodata @3991 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3991 = 500.0f; -COMPILER_STRIP_GATE(80BD3148, &lit_3991); +COMPILER_STRIP_GATE(0x80BD3148, &lit_3991); #pragma pop /* 80BD0A64-80BD0B7C 000744 0118+00 1/1 0/0 0/0 .text Demo_Set__14daObjCRVGATE_cFv */ @@ -591,28 +591,28 @@ asm void daObjCRVGATE_c::SetOpen() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4030 = -5.0f; -COMPILER_STRIP_GATE(80BD314C, &lit_4030); +COMPILER_STRIP_GATE(0x80BD314C, &lit_4030); #pragma pop /* 80BD3150-80BD3154 000090 0004+00 0/2 0/0 0/0 .rodata @4031 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4031 = 55.0f; -COMPILER_STRIP_GATE(80BD3150, &lit_4031); +COMPILER_STRIP_GATE(0x80BD3150, &lit_4031); #pragma pop /* 80BD3154-80BD3158 000094 0004+00 0/1 0/0 0/0 .rodata @4032 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4032 = 0.5f; -COMPILER_STRIP_GATE(80BD3154, &lit_4032); +COMPILER_STRIP_GATE(0x80BD3154, &lit_4032); #pragma pop /* 80BD3158-80BD315C 000098 0004+00 0/1 0/0 0/0 .rodata @4033 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4033 = 5.0f / 3.0f; -COMPILER_STRIP_GATE(80BD3158, &lit_4033); +COMPILER_STRIP_GATE(0x80BD3158, &lit_4033); #pragma pop /* 80BD0B88-80BD0D28 000868 01A0+00 1/1 0/0 0/0 .text actionDemoEvent__14daObjCRVGATE_cFv @@ -693,42 +693,42 @@ asm void daObjCRVGATE_c::CloseVibration() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4086 = 350.0f; -COMPILER_STRIP_GATE(80BD315C, &lit_4086); +COMPILER_STRIP_GATE(0x80BD315C, &lit_4086); #pragma pop /* 80BD3160-80BD3164 0000A0 0004+00 0/2 0/0 0/0 .rodata @4087 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4087 = 120.0f; -COMPILER_STRIP_GATE(80BD3160, &lit_4087); +COMPILER_STRIP_GATE(0x80BD3160, &lit_4087); #pragma pop /* 80BD3164-80BD3168 0000A4 0004+00 0/1 0/0 0/0 .rodata @4430 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4430 = 490.0f; -COMPILER_STRIP_GATE(80BD3164, &lit_4430); +COMPILER_STRIP_GATE(0x80BD3164, &lit_4430); #pragma pop /* 80BD3168-80BD316C 0000A8 0004+00 0/1 0/0 0/0 .rodata @4431 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4431 = 10.0f; -COMPILER_STRIP_GATE(80BD3168, &lit_4431); +COMPILER_STRIP_GATE(0x80BD3168, &lit_4431); #pragma pop /* 80BD316C-80BD3170 0000AC 0004+00 0/1 0/0 0/0 .rodata @4432 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4432 = 70.0f; -COMPILER_STRIP_GATE(80BD316C, &lit_4432); +COMPILER_STRIP_GATE(0x80BD316C, &lit_4432); #pragma pop /* 80BD3170-80BD3174 0000B0 0004+00 0/1 0/0 0/0 .rodata @4433 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4433 = -30.0f; -COMPILER_STRIP_GATE(80BD3170, &lit_4433); +COMPILER_STRIP_GATE(0x80BD3170, &lit_4433); #pragma pop /* 80BD1110-80BD18E0 000DF0 07D0+00 2/2 0/0 0/0 .text CloseAction__14daObjCRVGATE_cFv */ @@ -746,14 +746,14 @@ asm void daObjCRVGATE_c::CloseAction() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4648 = 288.0f; -COMPILER_STRIP_GATE(80BD3174, &lit_4648); +COMPILER_STRIP_GATE(0x80BD3174, &lit_4648); #pragma pop /* 80BD3178-80BD317C 0000B8 0004+00 0/1 0/0 0/0 .rodata @4649 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4649 = 112.0f; -COMPILER_STRIP_GATE(80BD3178, &lit_4649); +COMPILER_STRIP_GATE(0x80BD3178, &lit_4649); #pragma pop /* 80BD18E0-80BD21E4 0015C0 0904+00 1/1 0/0 0/0 .text OpenAction__14daObjCRVGATE_cFv */ @@ -769,7 +769,7 @@ asm void daObjCRVGATE_c::OpenAction() { /* ############################################################################################## */ /* 80BD317C-80BD3180 0000BC 0004+00 1/1 0/0 0/0 .rodata @4663 */ SECTION_RODATA static f32 const lit_4663 = -2.0f / 5.0f; -COMPILER_STRIP_GATE(80BD317C, &lit_4663); +COMPILER_STRIP_GATE(0x80BD317C, &lit_4663); /* 80BD21E4-80BD22C8 001EC4 00E4+00 1/1 0/0 0/0 .text HakaiMotion__14daObjCRVGATE_cFv */ #pragma push @@ -796,14 +796,14 @@ asm void daObjCRVGATE_c::DoorAction() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4671 = 50.0f; -COMPILER_STRIP_GATE(80BD3180, &lit_4671); +COMPILER_STRIP_GATE(0x80BD3180, &lit_4671); #pragma pop /* 80BD3184-80BD3188 0000C4 0004+00 0/0 0/0 0/0 .rodata @4672 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4672 = -10.0f; -COMPILER_STRIP_GATE(80BD3184, &lit_4672); +COMPILER_STRIP_GATE(0x80BD3184, &lit_4672); #pragma pop /* 80BD3188-80BD3190 0000C8 0004+04 0/1 0/0 0/0 .rodata @4700 */ @@ -814,7 +814,7 @@ SECTION_RODATA static f32 const lit_4700[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80BD3188, &lit_4700); +COMPILER_STRIP_GATE(0x80BD3188, &lit_4700); #pragma pop /* 80BD3190-80BD3198 0000D0 0008+00 0/1 0/0 0/0 .rodata @4701 */ @@ -823,7 +823,7 @@ COMPILER_STRIP_GATE(80BD3188, &lit_4700); SECTION_RODATA static u8 const lit_4701[8] = { 0xBF, 0xE6, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, }; -COMPILER_STRIP_GATE(80BD3190, &lit_4701); +COMPILER_STRIP_GATE(0x80BD3190, &lit_4701); #pragma pop /* 80BD2338-80BD245C 002018 0124+00 1/1 0/0 0/0 .text B_CloseAction__14daObjCRVGATE_cFv @@ -852,14 +852,14 @@ asm void daObjCRVGATE_c::SetB_Close() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4757 = 35.0f; -COMPILER_STRIP_GATE(80BD3198, &lit_4757); +COMPILER_STRIP_GATE(0x80BD3198, &lit_4757); #pragma pop /* 80BD319C-80BD31A0 0000DC 0004+00 0/1 0/0 0/0 .rodata @4758 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4758 = -55.0f; -COMPILER_STRIP_GATE(80BD319C, &lit_4758); +COMPILER_STRIP_GATE(0x80BD319C, &lit_4758); #pragma pop /* 80BD2528-80BD2624 002208 00FC+00 1/1 0/0 0/0 .text setBaseMtx__14daObjCRVGATE_cFv */ @@ -893,6 +893,14 @@ static asm void daObjCRVGATE_Execute(daObjCRVGATE_c* param_0) { #pragma pop /* ############################################################################################## */ +/* 80BD31BC-80BD31BC 0000FC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80BD31BC = "CrvGate"; +SECTION_DEAD static char const* const stringBase_80BD31C4 = "CaravanGate.bmd"; +SECTION_DEAD static char const* const stringBase_80BD31D4 = "CaravanKey.bmd"; +#pragma pop + /* 80BD31F4-80BD31F8 -00001 0004+00 3/3 0/0 0/0 .data l_arcName */ SECTION_DATA static void* l_arcName = (void*)&d_a_obj_crvgate__stringBase0; @@ -911,7 +919,7 @@ asm void daObjCRVGATE_c::CreateHeap() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4833 = 700.0f; -COMPILER_STRIP_GATE(80BD31A0, &lit_4833); +COMPILER_STRIP_GATE(0x80BD31A0, &lit_4833); #pragma pop /* 80BD2758-80BD28C0 002438 0168+00 1/1 0/0 0/0 .text SetDoor__14daObjCRVGATE_cFv */ @@ -929,21 +937,27 @@ asm void daObjCRVGATE_c::SetDoor() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4928 = -9.0f; -COMPILER_STRIP_GATE(80BD31A4, &lit_4928); +COMPILER_STRIP_GATE(0x80BD31A4, &lit_4928); #pragma pop /* 80BD31A8-80BD31AC 0000E8 0004+00 0/1 0/0 0/0 .rodata @4929 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4929 = -100.0f; -COMPILER_STRIP_GATE(80BD31A8, &lit_4929); +COMPILER_STRIP_GATE(0x80BD31A8, &lit_4929); #pragma pop /* 80BD31AC-80BD31B0 0000EC 0004+00 0/1 0/0 0/0 .rodata @4930 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4930 = -200.0f; -COMPILER_STRIP_GATE(80BD31AC, &lit_4930); +COMPILER_STRIP_GATE(0x80BD31AC, &lit_4930); +#pragma pop + +/* 80BD31BC-80BD31BC 0000FC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80BD31E3 = "CaravanGate.dzb"; #pragma pop /* 80BD31F8-80BD3218 -00001 0020+00 1/0 0/0 0/0 .data l_daObjCRVGATE_Method */ @@ -1101,21 +1115,21 @@ static bool daObjCRVGATE_IsDelete(daObjCRVGATE_c* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5063 = -1000.0f; -COMPILER_STRIP_GATE(80BD31B0, &lit_5063); +COMPILER_STRIP_GATE(0x80BD31B0, &lit_5063); #pragma pop /* 80BD31B4-80BD31B8 0000F4 0004+00 0/1 0/0 0/0 .rodata @5064 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5064 = -500.0f; -COMPILER_STRIP_GATE(80BD31B4, &lit_5064); +COMPILER_STRIP_GATE(0x80BD31B4, &lit_5064); #pragma pop /* 80BD31B8-80BD31BC 0000F8 0004+00 0/1 0/0 0/0 .rodata @5065 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5065 = 1000.0f; -COMPILER_STRIP_GATE(80BD31B8, &lit_5065); +COMPILER_STRIP_GATE(0x80BD31B8, &lit_5065); #pragma pop /* 80BD2E88-80BD2ECC 002B68 0044+00 1/0 0/0 0/0 .text Create__14daObjCRVGATE_cFv */ @@ -1183,12 +1197,4 @@ static asm void func_80BD30B0() { } #pragma pop -/* 80BD31BC-80BD31F3 0000FC 0037+00 3/2 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80BD31BC = "CrvGate"; -SECTION_DEAD static char const* const stringBase_80BD31C4 = "CaravanGate.bmd"; -SECTION_DEAD static char const* const stringBase_80BD31D4 = "CaravanKey.bmd"; -SECTION_DEAD static char const* const stringBase_80BD31E3 = "CaravanGate.dzb"; -#pragma pop +/* 80BD31BC-80BD31BC 0000FC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_crvhahen/d_a_obj_crvhahen.cpp b/rel/d/a/obj/d_a_obj_crvhahen/d_a_obj_crvhahen.cpp index 56e96d9a78b..748cc87e66e 100644 --- a/rel/d/a/obj/d_a_obj_crvhahen/d_a_obj_crvhahen.cpp +++ b/rel/d/a/obj/d_a_obj_crvhahen/d_a_obj_crvhahen.cpp @@ -167,6 +167,13 @@ extern "C" extern u32 __float_nan; // /* ############################################################################################## */ +/* 80BD4048-80BD4048 000058 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80BD4048 = "CrvFence"; +SECTION_DEAD static char const* const stringBase_80BD4051 = "CaravanPiece.bmd"; +#pragma pop + /* 80BD4064-80BD4068 -00001 0004+00 3/3 0/0 0/0 .data l_arcName */ SECTION_DATA static void* l_arcName = (void*)&d_a_obj_crvhahen__stringBase0; @@ -203,27 +210,27 @@ static asm void daObjCRVHAHEN_Delete(daObjCRVHAHEN_c* param_0) { /* ############################################################################################## */ /* 80BD3FF0-80BD3FF4 000000 0004+00 5/5 0/0 0/0 .rodata @3703 */ SECTION_RODATA static f32 const lit_3703 = 0.5f; -COMPILER_STRIP_GATE(80BD3FF0, &lit_3703); +COMPILER_STRIP_GATE(0x80BD3FF0, &lit_3703); /* 80BD3FF4-80BD3FF8 000004 0004+00 0/1 0/0 0/0 .rodata @3704 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3704 = 1.0f; -COMPILER_STRIP_GATE(80BD3FF4, &lit_3704); +COMPILER_STRIP_GATE(0x80BD3FF4, &lit_3704); #pragma pop /* 80BD3FF8-80BD3FFC 000008 0004+00 0/1 0/0 0/0 .rodata @3705 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3705 = 5000.0f; -COMPILER_STRIP_GATE(80BD3FF8, &lit_3705); +COMPILER_STRIP_GATE(0x80BD3FF8, &lit_3705); #pragma pop /* 80BD3FFC-80BD4000 00000C 0004+00 0/1 0/0 0/0 .rodata @3706 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3706 = 65536.0f; -COMPILER_STRIP_GATE(80BD3FFC, &lit_3706); +COMPILER_STRIP_GATE(0x80BD3FFC, &lit_3706); #pragma pop /* 80BD342C-80BD3628 00016C 01FC+00 0/0 0/0 2/2 .text @@ -263,28 +270,28 @@ asm cXyz::~cXyz() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3773 = -9.0f; -COMPILER_STRIP_GATE(80BD4000, &lit_3773); +COMPILER_STRIP_GATE(0x80BD4000, &lit_3773); #pragma pop /* 80BD4004-80BD4008 000014 0004+00 0/1 0/0 0/0 .rodata @3774 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3774 = 13.0f; -COMPILER_STRIP_GATE(80BD4004, &lit_3774); +COMPILER_STRIP_GATE(0x80BD4004, &lit_3774); #pragma pop /* 80BD4008-80BD400C 000018 0004+00 0/1 0/0 0/0 .rodata @3775 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3775 = -3.0f / 5.0f; -COMPILER_STRIP_GATE(80BD4008, &lit_3775); +COMPILER_STRIP_GATE(0x80BD4008, &lit_3775); #pragma pop /* 80BD400C-80BD4010 00001C 0004+00 0/1 0/0 0/0 .rodata @3776 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3776 = 4.0f / 5.0f; -COMPILER_STRIP_GATE(80BD400C, &lit_3776); +COMPILER_STRIP_GATE(0x80BD400C, &lit_3776); #pragma pop /* 80BD3720-80BD38DC 000460 01BC+00 1/1 0/0 0/0 .text Hahen_Hakai__15daObjCRVHAHEN_cFii @@ -313,7 +320,7 @@ SECTION_RODATA static u8 const lit_3836[4 + 4 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BD4010, &lit_3836); +COMPILER_STRIP_GATE(0x80BD4010, &lit_3836); #pragma pop /* 80BD4018-80BD4020 000028 0008+00 0/1 0/0 0/0 .rodata @3837 */ @@ -322,7 +329,7 @@ COMPILER_STRIP_GATE(80BD4010, &lit_3836); SECTION_RODATA static u8 const lit_3837[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BD4018, &lit_3837); +COMPILER_STRIP_GATE(0x80BD4018, &lit_3837); #pragma pop /* 80BD4020-80BD4028 000030 0008+00 0/1 0/0 0/0 .rodata @3838 */ @@ -331,7 +338,7 @@ COMPILER_STRIP_GATE(80BD4018, &lit_3837); SECTION_RODATA static u8 const lit_3838[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BD4020, &lit_3838); +COMPILER_STRIP_GATE(0x80BD4020, &lit_3838); #pragma pop /* 80BD4028-80BD4030 000038 0008+00 0/1 0/0 0/0 .rodata @3839 */ @@ -340,7 +347,7 @@ COMPILER_STRIP_GATE(80BD4020, &lit_3838); SECTION_RODATA static u8 const lit_3839[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BD4028, &lit_3839); +COMPILER_STRIP_GATE(0x80BD4028, &lit_3839); #pragma pop /* 80BD38DC-80BD3A9C 00061C 01C0+00 1/1 0/0 0/0 .text CheckCull__15daObjCRVHAHEN_cFv */ @@ -358,14 +365,14 @@ asm void daObjCRVHAHEN_c::CheckCull() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3852 = 608.0f; -COMPILER_STRIP_GATE(80BD4030, &lit_3852); +COMPILER_STRIP_GATE(0x80BD4030, &lit_3852); #pragma pop /* 80BD4034-80BD4038 000044 0004+00 0/1 0/0 0/0 .rodata @3853 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3853 = 448.0f; -COMPILER_STRIP_GATE(80BD4034, &lit_3853); +COMPILER_STRIP_GATE(0x80BD4034, &lit_3853); #pragma pop /* 80BD3A9C-80BD3B20 0007DC 0084+00 1/1 0/0 0/0 .text checkViewArea__15daObjCRVHAHEN_cFP4cXyz */ @@ -434,28 +441,28 @@ static asm void daObjCRVHAHEN_Execute(daObjCRVHAHEN_c* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3993 = -1000.0f; -COMPILER_STRIP_GATE(80BD4038, &lit_3993); +COMPILER_STRIP_GATE(0x80BD4038, &lit_3993); #pragma pop /* 80BD403C-80BD4040 00004C 0004+00 0/1 0/0 0/0 .rodata @3994 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3994 = -500.0f; -COMPILER_STRIP_GATE(80BD403C, &lit_3994); +COMPILER_STRIP_GATE(0x80BD403C, &lit_3994); #pragma pop /* 80BD4040-80BD4044 000050 0004+00 0/1 0/0 0/0 .rodata @3995 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3995 = 1000.0f; -COMPILER_STRIP_GATE(80BD4040, &lit_3995); +COMPILER_STRIP_GATE(0x80BD4040, &lit_3995); #pragma pop /* 80BD4044-80BD4048 000054 0004+00 0/1 0/0 0/0 .rodata @3996 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3996 = 500.0f; -COMPILER_STRIP_GATE(80BD4044, &lit_3996); +COMPILER_STRIP_GATE(0x80BD4044, &lit_3996); #pragma pop /* 80BD3DBC-80BD3F9C 000AFC 01E0+00 1/1 0/0 0/0 .text create__15daObjCRVHAHEN_cFv */ @@ -517,10 +524,4 @@ SECTION_DATA extern void* g_profile_Obj_CRVHAHEN[12] = { (void*)0x00040000, (void*)0x000E0000, }; -/* 80BD4048-80BD4062 000058 001A+00 4/3 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80BD4048 = "CrvFence"; -SECTION_DEAD static char const* const stringBase_80BD4051 = "CaravanPiece.bmd"; -#pragma pop +/* 80BD4048-80BD4048 000058 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_crvlh_down/d_a_obj_crvlh_down.cpp b/rel/d/a/obj/d_a_obj_crvlh_down/d_a_obj_crvlh_down.cpp index 60a8ccc8c1b..cc2e48ca864 100644 --- a/rel/d/a/obj/d_a_obj_crvlh_down/d_a_obj_crvlh_down.cpp +++ b/rel/d/a/obj/d_a_obj_crvlh_down/d_a_obj_crvlh_down.cpp @@ -159,10 +159,10 @@ struct cBgS { /* 80074250 */ void Release(dBgW_Base*); }; -struct Vec {}; - struct JAISoundID {}; +struct Vec {}; + struct Z2SeMgr { /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); }; @@ -283,7 +283,7 @@ SECTION_RODATA static u8 const ccCylSrc[68] = { 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x43, 0x7A, 0x00, 0x00, 0x43, 0xC8, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BD4D04, &ccCylSrc); +COMPILER_STRIP_GATE(0x80BD4D04, &ccCylSrc); /* 80BD4138-80BD41A4 000078 006C+00 1/1 0/0 0/0 .text initCcCylinder__15daObjCRVLH_DW_cFv */ @@ -299,11 +299,11 @@ asm void daObjCRVLH_DW_c::initCcCylinder() { /* ############################################################################################## */ /* 80BD4D48-80BD4D4C 000044 0004+00 1/3 0/0 0/0 .rodata @3670 */ SECTION_RODATA static f32 const lit_3670 = 100.0f; -COMPILER_STRIP_GATE(80BD4D48, &lit_3670); +COMPILER_STRIP_GATE(0x80BD4D48, &lit_3670); /* 80BD4D4C-80BD4D50 000048 0004+00 1/1 0/0 0/0 .rodata @3671 */ SECTION_RODATA static f32 const lit_3671 = 200.0f; -COMPILER_STRIP_GATE(80BD4D4C, &lit_3671); +COMPILER_STRIP_GATE(0x80BD4D4C, &lit_3671); /* 80BD41A4-80BD4224 0000E4 0080+00 1/1 0/0 0/0 .text SetCcSyl__15daObjCRVLH_DW_cFv */ #pragma push @@ -335,6 +335,14 @@ static asm void daObjCRVLH_DW_Delete(daObjCRVLH_DW_c* param_0) { } #pragma pop +/* ############################################################################################## */ +/* 80BD4D88-80BD4D88 000084 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80BD4D88 = "CrvLH_Dw"; +SECTION_DEAD static char const* const stringBase_80BD4D91 = "Release Error\n"; +#pragma pop + /* 80BD4268-80BD42D8 0001A8 0070+00 1/1 0/0 0/0 .text BgRelease__15daObjCRVLH_DW_cFv */ #pragma push #pragma optimization_level 0 @@ -350,7 +358,7 @@ asm void daObjCRVLH_DW_c::BgRelease() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3754 = 1.0f; -COMPILER_STRIP_GATE(80BD4D50, &lit_3754); +COMPILER_STRIP_GATE(0x80BD4D50, &lit_3754); #pragma pop /* 80BD4D54-80BD4D58 000050 0004+00 0/2 0/0 0/0 .rodata @3755 */ @@ -362,14 +370,14 @@ SECTION_RODATA static u8 const lit_3755[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BD4D54, &lit_3755); +COMPILER_STRIP_GATE(0x80BD4D54, &lit_3755); #pragma pop /* 80BD4D58-80BD4D5C 000054 0004+00 0/1 0/0 0/0 .rodata @3756 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3756 = -1.0f; -COMPILER_STRIP_GATE(80BD4D58, &lit_3756); +COMPILER_STRIP_GATE(0x80BD4D58, &lit_3756); #pragma pop /* 80BD42D8-80BD45A4 000218 02CC+00 1/1 0/0 0/0 .text Break__15daObjCRVLH_DW_cFv */ @@ -424,6 +432,12 @@ static asm void daObjCRVLH_DW_Execute(daObjCRVLH_DW_c* param_0) { #pragma pop /* ############################################################################################## */ +/* 80BD4D88-80BD4D88 000084 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80BD4DA0 = "U_CrvLH_Down.bmd"; +#pragma pop + /* 80BD4DC4-80BD4DC8 -00001 0004+00 3/3 0/0 0/0 .data l_arcName */ SECTION_DATA static void* l_arcName = (void*)&d_a_obj_crvlh_down__stringBase0; @@ -442,28 +456,34 @@ asm void daObjCRVLH_DW_c::CreateHeap() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3911 = -9.0f; -COMPILER_STRIP_GATE(80BD4D5C, &lit_3911); +COMPILER_STRIP_GATE(0x80BD4D5C, &lit_3911); #pragma pop /* 80BD4D60-80BD4D64 00005C 0004+00 0/2 0/0 0/0 .rodata @3912 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3912 = -500.0f; -COMPILER_STRIP_GATE(80BD4D60, &lit_3912); +COMPILER_STRIP_GATE(0x80BD4D60, &lit_3912); #pragma pop /* 80BD4D64-80BD4D68 000060 0004+00 0/2 0/0 0/0 .rodata @3913 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3913 = 500.0f; -COMPILER_STRIP_GATE(80BD4D64, &lit_3913); +COMPILER_STRIP_GATE(0x80BD4D64, &lit_3913); #pragma pop /* 80BD4D68-80BD4D6C 000064 0004+00 0/2 0/0 0/0 .rodata @3914 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3914 = 1000.0f; -COMPILER_STRIP_GATE(80BD4D68, &lit_3914); +COMPILER_STRIP_GATE(0x80BD4D68, &lit_3914); +#pragma pop + +/* 80BD4D88-80BD4D88 000084 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80BD4DB1 = "U_CrvLH_Down.dzb"; #pragma pop /* 80BD4DC8-80BD4DE8 -00001 0020+00 1/0 0/0 0/0 .data l_daObjCRVLH_DW_Method */ @@ -557,7 +577,7 @@ static bool daObjCRVLH_DW_IsDelete(daObjCRVLH_DW_c* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3990 = -1000.0f; -COMPILER_STRIP_GATE(80BD4D6C, &lit_3990); +COMPILER_STRIP_GATE(0x80BD4D6C, &lit_3990); #pragma pop /* 80BD4A84-80BD4AC8 0009C4 0044+00 1/0 0/0 0/0 .text Create__15daObjCRVLH_DW_cFv */ @@ -575,42 +595,42 @@ asm void daObjCRVLH_DW_c::Create() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4039 = 250.0f; -COMPILER_STRIP_GATE(80BD4D70, &lit_4039); +COMPILER_STRIP_GATE(0x80BD4D70, &lit_4039); #pragma pop /* 80BD4D74-80BD4D78 000070 0004+00 0/1 0/0 0/0 .rodata @4040 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4040 = 80.0f; -COMPILER_STRIP_GATE(80BD4D74, &lit_4040); +COMPILER_STRIP_GATE(0x80BD4D74, &lit_4040); #pragma pop /* 80BD4D78-80BD4D7C 000074 0004+00 0/1 0/0 0/0 .rodata @4041 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4041 = 10.0f; -COMPILER_STRIP_GATE(80BD4D78, &lit_4041); +COMPILER_STRIP_GATE(0x80BD4D78, &lit_4041); #pragma pop /* 80BD4D7C-80BD4D80 000078 0004+00 0/1 0/0 0/0 .rodata @4042 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4042 = 30.0f; -COMPILER_STRIP_GATE(80BD4D7C, &lit_4042); +COMPILER_STRIP_GATE(0x80BD4D7C, &lit_4042); #pragma pop /* 80BD4D80-80BD4D84 00007C 0004+00 0/1 0/0 0/0 .rodata @4043 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4043 = 20.0f; -COMPILER_STRIP_GATE(80BD4D80, &lit_4043); +COMPILER_STRIP_GATE(0x80BD4D80, &lit_4043); #pragma pop /* 80BD4D84-80BD4D88 000080 0004+00 0/1 0/0 0/0 .rodata @4044 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4044 = 3000.0f; -COMPILER_STRIP_GATE(80BD4D84, &lit_4044); +COMPILER_STRIP_GATE(0x80BD4D84, &lit_4044); #pragma pop /* 80BD4AC8-80BD4C44 000A08 017C+00 1/0 0/0 0/0 .text Execute__15daObjCRVLH_DW_cFPPA3_A4_f */ @@ -643,12 +663,4 @@ asm void daObjCRVLH_DW_c::Delete() { } #pragma pop -/* 80BD4D88-80BD4DC2 000084 003A+00 4/3 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80BD4D88 = "CrvLH_Dw"; -SECTION_DEAD static char const* const stringBase_80BD4D91 = "Release Error\n"; -SECTION_DEAD static char const* const stringBase_80BD4DA0 = "U_CrvLH_Down.bmd"; -SECTION_DEAD static char const* const stringBase_80BD4DB1 = "U_CrvLH_Down.dzb"; -#pragma pop +/* 80BD4D88-80BD4D88 000084 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_crvlh_up/d_a_obj_crvlh_up.cpp b/rel/d/a/obj/d_a_obj_crvlh_up/d_a_obj_crvlh_up.cpp index d345bf89dd8..0980fd2c357 100644 --- a/rel/d/a/obj/d_a_obj_crvlh_up/d_a_obj_crvlh_up.cpp +++ b/rel/d/a/obj/d_a_obj_crvlh_up/d_a_obj_crvlh_up.cpp @@ -118,10 +118,10 @@ struct cBgS { /* 80074250 */ void Release(dBgW_Base*); }; -struct Vec {}; - struct JAISoundID {}; +struct Vec {}; + struct Z2SeMgr { /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); }; @@ -248,7 +248,14 @@ static asm void daObjCRVLH_UP_Delete(daObjCRVLH_UP_c* param_0) { /* ############################################################################################## */ /* 80BD59FC-80BD5A00 000000 0004+00 6/6 0/0 0/0 .rodata @3672 */ SECTION_RODATA static f32 const lit_3672 = 16000.0f; -COMPILER_STRIP_GATE(80BD59FC, &lit_3672); +COMPILER_STRIP_GATE(0x80BD59FC, &lit_3672); + +/* 80BD5A64-80BD5A64 000068 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80BD5A64 = "CrvLH_Up"; +SECTION_DEAD static char const* const stringBase_80BD5A6D = "Release Error\n"; +#pragma pop /* 80BD4F1C-80BD4FB0 0000BC 0094+00 0/0 0/0 1/1 .text HakaiSet__15daObjCRVLH_UP_cFv */ #pragma push @@ -263,11 +270,11 @@ asm void daObjCRVLH_UP_c::HakaiSet() { /* ############################################################################################## */ /* 80BD5A00-80BD5A04 000004 0004+00 1/1 0/0 0/0 .rodata @3681 */ SECTION_RODATA static f32 const lit_3681 = -120.0f; -COMPILER_STRIP_GATE(80BD5A00, &lit_3681); +COMPILER_STRIP_GATE(0x80BD5A00, &lit_3681); /* 80BD5A04-80BD5A08 000008 0004+00 1/1 0/0 0/0 .rodata @3682 */ SECTION_RODATA static f32 const lit_3682 = -5.0f; -COMPILER_STRIP_GATE(80BD5A04, &lit_3682); +COMPILER_STRIP_GATE(0x80BD5A04, &lit_3682); /* 80BD4FB0-80BD4FD8 000150 0028+00 1/1 0/0 0/0 .text UpMotion__15daObjCRVLH_UP_cFv */ #pragma push @@ -284,14 +291,14 @@ asm void daObjCRVLH_UP_c::UpMotion() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3723 = 1.0f; -COMPILER_STRIP_GATE(80BD5A08, &lit_3723); +COMPILER_STRIP_GATE(0x80BD5A08, &lit_3723); #pragma pop /* 80BD5A0C-80BD5A10 000010 0004+00 0/1 0/0 0/0 .rodata @3724 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3724 = -1.0f; -COMPILER_STRIP_GATE(80BD5A0C, &lit_3724); +COMPILER_STRIP_GATE(0x80BD5A0C, &lit_3724); #pragma pop /* 80BD5A10-80BD5A14 000014 0004+00 0/4 0/0 0/0 .rodata @3725 */ @@ -303,21 +310,21 @@ SECTION_RODATA static u8 const lit_3725[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BD5A10, &lit_3725); +COMPILER_STRIP_GATE(0x80BD5A10, &lit_3725); #pragma pop /* 80BD5A14-80BD5A18 000018 0004+00 0/2 0/0 0/0 .rodata @3726 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3726 = 150.0f; -COMPILER_STRIP_GATE(80BD5A14, &lit_3726); +COMPILER_STRIP_GATE(0x80BD5A14, &lit_3726); #pragma pop /* 80BD5A18-80BD5A1C 00001C 0004+00 0/1 0/0 0/0 .rodata @3727 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3727 = 350.0f; -COMPILER_STRIP_GATE(80BD5A18, &lit_3727); +COMPILER_STRIP_GATE(0x80BD5A18, &lit_3727); #pragma pop /* 80BD5A1C-80BD5A24 000020 0004+04 0/1 0/0 0/0 .rodata @3728 */ @@ -328,7 +335,7 @@ SECTION_RODATA static f32 const lit_3728[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80BD5A1C, &lit_3728); +COMPILER_STRIP_GATE(0x80BD5A1C, &lit_3728); #pragma pop /* 80BD5A24-80BD5A2C 000028 0008+00 0/1 0/0 0/0 .rodata @3730 */ @@ -337,7 +344,7 @@ COMPILER_STRIP_GATE(80BD5A1C, &lit_3728); SECTION_RODATA static u8 const lit_3730[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BD5A24, &lit_3730); +COMPILER_STRIP_GATE(0x80BD5A24, &lit_3730); #pragma pop /* 80BD4FD8-80BD5254 000178 027C+00 1/1 0/0 0/0 .text Hakai__15daObjCRVLH_UP_cFv */ @@ -355,7 +362,7 @@ asm void daObjCRVLH_UP_c::Hakai() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3769 = -150.0f; -COMPILER_STRIP_GATE(80BD5A2C, &lit_3769); +COMPILER_STRIP_GATE(0x80BD5A2C, &lit_3769); #pragma pop /* 80BD5254-80BD532C 0003F4 00D8+00 1/1 0/0 0/0 .text setBaseMtx__15daObjCRVLH_UP_cFv */ @@ -390,6 +397,12 @@ static asm void daObjCRVLH_UP_Execute(daObjCRVLH_UP_c* param_0) { #pragma pop /* ############################################################################################## */ +/* 80BD5A64-80BD5A64 000068 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80BD5A7C = "U_CrvLH_UP.bmd"; +#pragma pop + /* 80BD5A9C-80BD5AA0 -00001 0004+00 3/3 0/0 0/0 .data l_arcName */ SECTION_DATA static void* l_arcName = (void*)&d_a_obj_crvlh_up__stringBase0; @@ -408,35 +421,41 @@ asm void daObjCRVLH_UP_c::CreateHeap() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3857 = -9.0f; -COMPILER_STRIP_GATE(80BD5A30, &lit_3857); +COMPILER_STRIP_GATE(0x80BD5A30, &lit_3857); #pragma pop /* 80BD5A34-80BD5A38 000038 0004+00 0/2 0/0 0/0 .rodata @3858 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3858 = 100.0f; -COMPILER_STRIP_GATE(80BD5A34, &lit_3858); +COMPILER_STRIP_GATE(0x80BD5A34, &lit_3858); #pragma pop /* 80BD5A38-80BD5A3C 00003C 0004+00 0/2 0/0 0/0 .rodata @3859 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3859 = -500.0f; -COMPILER_STRIP_GATE(80BD5A38, &lit_3859); +COMPILER_STRIP_GATE(0x80BD5A38, &lit_3859); #pragma pop /* 80BD5A3C-80BD5A40 000040 0004+00 0/2 0/0 0/0 .rodata @3860 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3860 = 500.0f; -COMPILER_STRIP_GATE(80BD5A3C, &lit_3860); +COMPILER_STRIP_GATE(0x80BD5A3C, &lit_3860); #pragma pop /* 80BD5A40-80BD5A44 000044 0004+00 0/1 0/0 0/0 .rodata @3861 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3861 = 2000.0f; -COMPILER_STRIP_GATE(80BD5A40, &lit_3861); +COMPILER_STRIP_GATE(0x80BD5A40, &lit_3861); +#pragma pop + +/* 80BD5A64-80BD5A64 000068 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80BD5A8B = "U_CrvLH_Up.dzb"; #pragma pop /* 80BD5AA0-80BD5AC0 -00001 0020+00 1/0 0/0 0/0 .data l_daObjCRVLH_UP_Method */ @@ -545,14 +564,14 @@ static bool daObjCRVLH_UP_IsDelete(daObjCRVLH_UP_c* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3940 = -1000.0f; -COMPILER_STRIP_GATE(80BD5A44, &lit_3940); +COMPILER_STRIP_GATE(0x80BD5A44, &lit_3940); #pragma pop /* 80BD5A48-80BD5A4C 00004C 0004+00 0/1 0/0 0/0 .rodata @3941 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3941 = 1000.0f; -COMPILER_STRIP_GATE(80BD5A48, &lit_3941); +COMPILER_STRIP_GATE(0x80BD5A48, &lit_3941); #pragma pop /* 80BD56EC-80BD5730 00088C 0044+00 1/0 0/0 0/0 .text Create__15daObjCRVLH_UP_cFv */ @@ -570,42 +589,42 @@ asm void daObjCRVLH_UP_c::Create() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3997 = 250.0f; -COMPILER_STRIP_GATE(80BD5A4C, &lit_3997); +COMPILER_STRIP_GATE(0x80BD5A4C, &lit_3997); #pragma pop /* 80BD5A50-80BD5A54 000054 0004+00 0/1 0/0 0/0 .rodata @3998 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3998 = 80.0f; -COMPILER_STRIP_GATE(80BD5A50, &lit_3998); +COMPILER_STRIP_GATE(0x80BD5A50, &lit_3998); #pragma pop /* 80BD5A54-80BD5A58 000058 0004+00 0/1 0/0 0/0 .rodata @3999 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3999 = 60.0f; -COMPILER_STRIP_GATE(80BD5A54, &lit_3999); +COMPILER_STRIP_GATE(0x80BD5A54, &lit_3999); #pragma pop /* 80BD5A58-80BD5A5C 00005C 0004+00 0/1 0/0 0/0 .rodata @4000 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4000 = 10.0f; -COMPILER_STRIP_GATE(80BD5A58, &lit_4000); +COMPILER_STRIP_GATE(0x80BD5A58, &lit_4000); #pragma pop /* 80BD5A5C-80BD5A60 000060 0004+00 0/1 0/0 0/0 .rodata @4001 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4001 = 20.0f; -COMPILER_STRIP_GATE(80BD5A5C, &lit_4001); +COMPILER_STRIP_GATE(0x80BD5A5C, &lit_4001); #pragma pop /* 80BD5A60-80BD5A64 000064 0004+00 0/1 0/0 0/0 .rodata @4002 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4002 = 3000.0f; -COMPILER_STRIP_GATE(80BD5A60, &lit_4002); +COMPILER_STRIP_GATE(0x80BD5A60, &lit_4002); #pragma pop /* 80BD5730-80BD593C 0008D0 020C+00 1/0 0/0 0/0 .text Execute__15daObjCRVLH_UP_cFPPA3_A4_f */ @@ -638,12 +657,4 @@ asm void daObjCRVLH_UP_c::Delete() { } #pragma pop -/* 80BD5A64-80BD5A9A 000068 0036+00 4/3 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80BD5A64 = "CrvLH_Up"; -SECTION_DEAD static char const* const stringBase_80BD5A6D = "Release Error\n"; -SECTION_DEAD static char const* const stringBase_80BD5A7C = "U_CrvLH_UP.bmd"; -SECTION_DEAD static char const* const stringBase_80BD5A8B = "U_CrvLH_Up.dzb"; -#pragma pop +/* 80BD5A64-80BD5A64 000068 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_crvsteel/d_a_obj_crvsteel.cpp b/rel/d/a/obj/d_a_obj_crvsteel/d_a_obj_crvsteel.cpp index 531f7a77f03..03560b2d356 100644 --- a/rel/d/a/obj/d_a_obj_crvsteel/d_a_obj_crvsteel.cpp +++ b/rel/d/a/obj/d_a_obj_crvsteel/d_a_obj_crvsteel.cpp @@ -223,7 +223,7 @@ asm void daObjCRVSTEEL_c::CloseSet(f32 param_0) { /* ############################################################################################## */ /* 80BD6208-80BD620C 000000 0004+00 3/3 0/0 0/0 .rodata @3789 */ SECTION_RODATA static f32 const lit_3789 = 5.0f; -COMPILER_STRIP_GATE(80BD6208, &lit_3789); +COMPILER_STRIP_GATE(0x80BD6208, &lit_3789); /* 80BD5C28-80BD5CA0 0000E8 0078+00 1/1 0/0 0/0 .text CloseExecute__15daObjCRVSTEEL_cFv */ @@ -288,6 +288,13 @@ static asm void daObjCRVSTEEL_Execute(daObjCRVSTEEL_c* param_0) { #pragma pop /* ############################################################################################## */ +/* 80BD623C-80BD623C 000034 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80BD623C = "CrvSteel"; +SECTION_DEAD static char const* const stringBase_80BD6245 = "U_CrvSteelGate.bmd"; +#pragma pop + /* 80BD626C-80BD6270 -00001 0004+00 3/3 0/0 0/0 .data l_arcName */ SECTION_DATA static void* l_arcName = (void*)&d_a_obj_crvsteel__stringBase0; @@ -306,21 +313,21 @@ asm void daObjCRVSTEEL_c::CreateHeap() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3900 = -9.0f; -COMPILER_STRIP_GATE(80BD620C, &lit_3900); +COMPILER_STRIP_GATE(0x80BD620C, &lit_3900); #pragma pop /* 80BD6210-80BD6214 000008 0004+00 0/1 0/0 0/0 .rodata @3901 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3901 = 100.0f; -COMPILER_STRIP_GATE(80BD6210, &lit_3901); +COMPILER_STRIP_GATE(0x80BD6210, &lit_3901); #pragma pop /* 80BD6214-80BD6218 00000C 0004+00 0/1 0/0 0/0 .rodata @3902 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3902 = -400.0f; -COMPILER_STRIP_GATE(80BD6214, &lit_3902); +COMPILER_STRIP_GATE(0x80BD6214, &lit_3902); #pragma pop /* 80BD6218-80BD621C 000010 0004+00 0/1 0/0 0/0 .rodata @3903 */ @@ -332,35 +339,41 @@ SECTION_RODATA static u8 const lit_3903[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BD6218, &lit_3903); +COMPILER_STRIP_GATE(0x80BD6218, &lit_3903); #pragma pop /* 80BD621C-80BD6220 000014 0004+00 0/1 0/0 0/0 .rodata @3904 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3904 = -50.0f; -COMPILER_STRIP_GATE(80BD621C, &lit_3904); +COMPILER_STRIP_GATE(0x80BD621C, &lit_3904); #pragma pop /* 80BD6220-80BD6224 000018 0004+00 0/1 0/0 0/0 .rodata @3905 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3905 = 400.0f; -COMPILER_STRIP_GATE(80BD6220, &lit_3905); +COMPILER_STRIP_GATE(0x80BD6220, &lit_3905); #pragma pop /* 80BD6224-80BD6228 00001C 0004+00 0/1 0/0 0/0 .rodata @3906 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3906 = 900.0f; -COMPILER_STRIP_GATE(80BD6224, &lit_3906); +COMPILER_STRIP_GATE(0x80BD6224, &lit_3906); #pragma pop /* 80BD6228-80BD622C 000020 0004+00 0/1 0/0 0/0 .rodata @3907 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3907 = 50.0f; -COMPILER_STRIP_GATE(80BD6228, &lit_3907); +COMPILER_STRIP_GATE(0x80BD6228, &lit_3907); +#pragma pop + +/* 80BD623C-80BD623C 000034 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80BD6258 = "U_CrvSteelGate.dzb"; #pragma pop /* 80BD6270-80BD6290 -00001 0020+00 1/0 0/0 0/0 .data l_daObjCRVSTEEL_Method */ @@ -443,28 +456,28 @@ static bool daObjCRVSTEEL_IsDelete(daObjCRVSTEEL_c* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3947 = -1000.0f; -COMPILER_STRIP_GATE(80BD622C, &lit_3947); +COMPILER_STRIP_GATE(0x80BD622C, &lit_3947); #pragma pop /* 80BD6230-80BD6234 000028 0004+00 0/1 0/0 0/0 .rodata @3948 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3948 = -500.0f; -COMPILER_STRIP_GATE(80BD6230, &lit_3948); +COMPILER_STRIP_GATE(0x80BD6230, &lit_3948); #pragma pop /* 80BD6234-80BD6238 00002C 0004+00 0/1 0/0 0/0 .rodata @3949 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3949 = 1000.0f; -COMPILER_STRIP_GATE(80BD6234, &lit_3949); +COMPILER_STRIP_GATE(0x80BD6234, &lit_3949); #pragma pop /* 80BD6238-80BD623C 000030 0004+00 0/1 0/0 0/0 .rodata @3950 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3950 = 500.0f; -COMPILER_STRIP_GATE(80BD6238, &lit_3950); +COMPILER_STRIP_GATE(0x80BD6238, &lit_3950); #pragma pop /* 80BD60A8-80BD60EC 000568 0044+00 1/0 0/0 0/0 .text Create__15daObjCRVSTEEL_cFv */ @@ -527,11 +540,4 @@ static asm void func_80BD61F8() { } #pragma pop -/* 80BD623C-80BD626B 000034 002F+00 3/2 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80BD623C = "CrvSteel"; -SECTION_DEAD static char const* const stringBase_80BD6245 = "U_CrvSteelGate.bmd"; -SECTION_DEAD static char const* const stringBase_80BD6258 = "U_CrvSteelGate.dzb"; -#pragma pop +/* 80BD623C-80BD623C 000034 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_crystal/d_a_obj_crystal.cpp b/rel/d/a/obj/d_a_obj_crystal/d_a_obj_crystal.cpp index 776c0d8ce5a..b8354cabaa7 100644 --- a/rel/d/a/obj/d_a_obj_crystal/d_a_obj_crystal.cpp +++ b/rel/d/a/obj/d_a_obj_crystal/d_a_obj_crystal.cpp @@ -167,7 +167,14 @@ asm void daObjCrystal_c::setBaseMtx() { /* ############################################################################################## */ /* 80BD68BC-80BD68C0 000000 0004+00 2/2 0/0 0/0 .rodata @3693 */ SECTION_RODATA static f32 const lit_3693 = 1.0f; -COMPILER_STRIP_GATE(80BD68BC, &lit_3693); +COMPILER_STRIP_GATE(0x80BD68BC, &lit_3693); + +/* 80BD68D8-80BD68D8 00001C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80BD68D8 = "H_Suisho"; +SECTION_DEAD static char const* const stringBase_80BD68E1 = "polySurface1"; +#pragma pop /* 80BD6470-80BD65B0 000150 0140+00 1/1 0/0 0/0 .text Create__14daObjCrystal_cFv */ #pragma push @@ -186,7 +193,7 @@ asm void daObjCrystal_c::Create() { SECTION_RODATA static u8 const l_bmd[8] = { 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x07, }; -COMPILER_STRIP_GATE(80BD68C0, &l_bmd); +COMPILER_STRIP_GATE(0x80BD68C0, &l_bmd); #pragma pop /* 80BD68C8-80BD68D0 00000C 0008+00 0/1 0/0 0/0 .rodata l_diff_flag$3698 */ @@ -195,7 +202,7 @@ COMPILER_STRIP_GATE(80BD68C0, &l_bmd); SECTION_RODATA static u8 const l_diff_flag[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BD68C8, &l_diff_flag); +COMPILER_STRIP_GATE(0x80BD68C8, &l_diff_flag); #pragma pop /* 80BD68D0-80BD68D8 000014 0008+00 0/1 0/0 0/0 .rodata l_flag$3699 */ @@ -204,7 +211,7 @@ COMPILER_STRIP_GATE(80BD68C8, &l_diff_flag); SECTION_RODATA static u8 const l_flag[8] = { 0x19, 0x00, 0x00, 0x84, 0x11, 0x00, 0x00, 0x84, }; -COMPILER_STRIP_GATE(80BD68D0, &l_flag); +COMPILER_STRIP_GATE(0x80BD68D0, &l_flag); #pragma pop /* 80BD68F0-80BD68F4 -00001 0004+00 3/3 0/0 0/0 .data l_arcName */ @@ -323,10 +330,4 @@ SECTION_DATA extern void* g_profile_Obj_Crystal[12] = { (void*)0x00040000, (void*)0x000E0000, }; -/* 80BD68D8-80BD68EE 00001C 0016+00 2/1 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80BD68D8 = "H_Suisho"; -SECTION_DEAD static char const* const stringBase_80BD68E1 = "polySurface1"; -#pragma pop +/* 80BD68D8-80BD68D8 00001C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_cwall/d_a_obj_cwall.cpp b/rel/d/a/obj/d_a_obj_cwall/d_a_obj_cwall.cpp index b1e8ff95600..637dc9863bc 100644 --- a/rel/d/a/obj/d_a_obj_cwall/d_a_obj_cwall.cpp +++ b/rel/d/a/obj/d_a_obj_cwall/d_a_obj_cwall.cpp @@ -239,8 +239,8 @@ extern "C" static void daObjCwall_MoveBGDelete__FP12daObjCwall_c(); extern "C" static void daObjCwall_MoveBGExecute__FP12daObjCwall_c(); extern "C" static void daObjCwall_MoveBGDraw__FP12daObjCwall_c(); extern "C" void __dt__10cCcD_GSttsFv(); -extern "C" void func_80BD9EAC(s16*); -extern "C" void func_80BD9EC8(u8*); +extern "C" void func_80BD9EAC(void* _this, s16*); +extern "C" void func_80BD9EC8(void* _this, u8*); extern "C" void __sinit_d_a_obj_cwall_cpp(); extern "C" void getRightHandPos__9daPy_py_cCFv(); extern "C" extern char const* const d_a_obj_cwall__stringBase0; @@ -368,7 +368,7 @@ asm void daObjCwall_c::setBaseMtx() { SECTION_RODATA static u8 const l_wallBmd[8] = { 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x05, }; -COMPILER_STRIP_GATE(80BD9FA4, &l_wallBmd); +COMPILER_STRIP_GATE(0x80BD9FA4, &l_wallBmd); /* 80BD9FAC-80BD9FB4 000008 0008+00 0/1 0/0 0/0 .rodata l_chainBmd */ #pragma push @@ -376,7 +376,7 @@ COMPILER_STRIP_GATE(80BD9FA4, &l_wallBmd); SECTION_RODATA static u8 const l_chainBmd[8] = { 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x04, }; -COMPILER_STRIP_GATE(80BD9FAC, &l_chainBmd); +COMPILER_STRIP_GATE(0x80BD9FAC, &l_chainBmd); #pragma pop /* 80BD9FB4-80BD9FBC 000010 0008+00 0/1 0/0 0/0 .rodata l_handleBmd */ @@ -385,20 +385,20 @@ COMPILER_STRIP_GATE(80BD9FAC, &l_chainBmd); SECTION_RODATA static u8 const l_handleBmd[8] = { 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x06, }; -COMPILER_STRIP_GATE(80BD9FB4, &l_handleBmd); +COMPILER_STRIP_GATE(0x80BD9FB4, &l_handleBmd); #pragma pop /* 80BD9FBC-80BD9FC4 000018 0008+00 1/1 0/0 0/0 .rodata l_dzb */ SECTION_RODATA static u8 const l_dzb[8] = { 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x09, }; -COMPILER_STRIP_GATE(80BD9FBC, &l_dzb); +COMPILER_STRIP_GATE(0x80BD9FBC, &l_dzb); /* 80BD9FC4-80BD9FCC 000020 0008+00 1/1 0/0 0/0 .rodata l_heap_size */ SECTION_RODATA static u8 const l_heap_size[8] = { 0x00, 0x00, 0x46, 0x00, 0x00, 0x00, 0x5F, 0x00, }; -COMPILER_STRIP_GATE(80BD9FC4, &l_heap_size); +COMPILER_STRIP_GATE(0x80BD9FC4, &l_heap_size); /* 80BD9FCC-80BD9FD8 000028 000C+00 0/1 0/0 0/0 .rodata l_top_co_offset */ #pragma push @@ -406,7 +406,7 @@ COMPILER_STRIP_GATE(80BD9FC4, &l_heap_size); SECTION_RODATA static u8 const l_top_co_offset[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC4, 0x16, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BD9FCC, &l_top_co_offset); +COMPILER_STRIP_GATE(0x80BD9FCC, &l_top_co_offset); #pragma pop /* 80BD9FD8-80BD9FE4 000034 000C+00 0/1 0/0 0/0 .rodata l_check_min */ @@ -415,7 +415,7 @@ COMPILER_STRIP_GATE(80BD9FCC, &l_top_co_offset); SECTION_RODATA static u8 const l_check_min[12] = { 0xC2, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC1, 0xA0, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BD9FD8, &l_check_min); +COMPILER_STRIP_GATE(0x80BD9FD8, &l_check_min); #pragma pop /* 80BD9FE4-80BD9FF0 000040 000C+00 0/1 0/0 0/0 .rodata l_check_max */ @@ -424,7 +424,7 @@ COMPILER_STRIP_GATE(80BD9FD8, &l_check_min); SECTION_RODATA static u8 const l_check_max[12] = { 0x42, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0xA0, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BD9FE4, &l_check_max); +COMPILER_STRIP_GATE(0x80BD9FE4, &l_check_max); #pragma pop /* 80BD9FF0-80BD9FFC 00004C 000C+00 0/1 0/0 0/0 .rodata l_check_min_wolf */ @@ -433,7 +433,7 @@ COMPILER_STRIP_GATE(80BD9FE4, &l_check_max); SECTION_RODATA static u8 const l_check_min_wolf[12] = { 0xC2, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0x48, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BD9FF0, &l_check_min_wolf); +COMPILER_STRIP_GATE(0x80BD9FF0, &l_check_min_wolf); #pragma pop /* 80BD9FFC-80BDA008 000058 000C+00 0/1 0/0 0/0 .rodata l_check_max_wolf */ @@ -442,7 +442,7 @@ COMPILER_STRIP_GATE(80BD9FF0, &l_check_min_wolf); SECTION_RODATA static u8 const l_check_max_wolf[12] = { 0x42, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x43, 0x20, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BD9FFC, &l_check_max_wolf); +COMPILER_STRIP_GATE(0x80BD9FFC, &l_check_max_wolf); #pragma pop /* 80BDA008-80BDA00C 000064 0004+00 7/17 0/0 0/0 .rodata @3829 */ @@ -452,7 +452,7 @@ SECTION_RODATA static u8 const lit_3829[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BDA008, &lit_3829); +COMPILER_STRIP_GATE(0x80BDA008, &lit_3829); /* 80BDA00C-80BDA014 000068 0004+04 1/1 0/0 0/0 .rodata @3830 */ SECTION_RODATA static f32 const lit_3830[1 + 1 /* padding */] = { @@ -460,7 +460,14 @@ SECTION_RODATA static f32 const lit_3830[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80BDA00C, &lit_3830); +COMPILER_STRIP_GATE(0x80BDA00C, &lit_3830); + +/* 80BDA0AC-80BDA0AC 000108 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80BDA0AC = "P_Cwall"; +SECTION_DEAD static char const* const stringBase_80BDA0B4 = "P_L4Cwall"; +#pragma pop /* 80BDA0C0-80BDA0CC 000000 000C+00 2/2 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { @@ -610,7 +617,7 @@ asm void daObjCwall_c::Execute(f32 (**param_0)[3][4]) { SECTION_RODATA static u8 const lit_4114[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BDA014, &lit_4114); +COMPILER_STRIP_GATE(0x80BDA014, &lit_4114); #pragma pop /* 80BDA01C-80BDA024 000078 0008+00 0/6 0/0 0/0 .rodata @4115 */ @@ -619,7 +626,7 @@ COMPILER_STRIP_GATE(80BDA014, &lit_4114); SECTION_RODATA static u8 const lit_4115[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BDA01C, &lit_4115); +COMPILER_STRIP_GATE(0x80BDA01C, &lit_4115); #pragma pop /* 80BDA024-80BDA02C 000080 0008+00 0/6 0/0 0/0 .rodata @4116 */ @@ -628,28 +635,28 @@ COMPILER_STRIP_GATE(80BDA01C, &lit_4115); SECTION_RODATA static u8 const lit_4116[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BDA024, &lit_4116); +COMPILER_STRIP_GATE(0x80BDA024, &lit_4116); #pragma pop /* 80BDA02C-80BDA030 000088 0004+00 0/1 0/0 0/0 .rodata @4117 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4117 = 338.0f; -COMPILER_STRIP_GATE(80BDA02C, &lit_4117); +COMPILER_STRIP_GATE(0x80BDA02C, &lit_4117); #pragma pop /* 80BDA030-80BDA034 00008C 0004+00 0/1 0/0 0/0 .rodata @4118 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4118 = 208.0f; -COMPILER_STRIP_GATE(80BDA030, &lit_4118); +COMPILER_STRIP_GATE(0x80BDA030, &lit_4118); #pragma pop /* 80BDA034-80BDA038 000090 0004+00 0/1 0/0 0/0 .rodata @4119 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4119 = 168.0f; -COMPILER_STRIP_GATE(80BDA034, &lit_4119); +COMPILER_STRIP_GATE(0x80BDA034, &lit_4119); #pragma pop /* 80BD7288-80BD7718 000928 0490+00 1/1 0/0 0/0 .text setTension__12daObjCwall_cFv */ @@ -665,7 +672,7 @@ asm void daObjCwall_c::setTension() { /* ############################################################################################## */ /* 80BDA038-80BDA03C 000094 0004+00 1/1 0/0 0/0 .rodata @4130 */ SECTION_RODATA static f32 const lit_4130 = 300.0f; -COMPILER_STRIP_GATE(80BDA038, &lit_4130); +COMPILER_STRIP_GATE(0x80BDA038, &lit_4130); /* 80BD7718-80BD7788 000DB8 0070+00 2/2 0/0 0/0 .text calcSePos__12daObjCwall_cFv */ #pragma push @@ -805,56 +812,56 @@ asm void daObjCwall_c::setChainMtx() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4316 = -6.0f; -COMPILER_STRIP_GATE(80BDA03C, &lit_4316); +COMPILER_STRIP_GATE(0x80BDA03C, &lit_4316); #pragma pop /* 80BDA040-80BDA044 00009C 0004+00 0/3 0/0 0/0 .rodata @4317 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4317 = 5.0f; -COMPILER_STRIP_GATE(80BDA040, &lit_4317); +COMPILER_STRIP_GATE(0x80BDA040, &lit_4317); #pragma pop /* 80BDA044-80BDA048 0000A0 0004+00 0/1 0/0 0/0 .rodata @4318 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4318 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(80BDA044, &lit_4318); +COMPILER_STRIP_GATE(0x80BDA044, &lit_4318); #pragma pop /* 80BDA048-80BDA04C 0000A4 0004+00 0/2 0/0 0/0 .rodata @4319 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4319 = 100.0f; -COMPILER_STRIP_GATE(80BDA048, &lit_4319); +COMPILER_STRIP_GATE(0x80BDA048, &lit_4319); #pragma pop /* 80BDA04C-80BDA050 0000A8 0004+00 0/2 0/0 0/0 .rodata @4320 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4320 = 15.0f; -COMPILER_STRIP_GATE(80BDA04C, &lit_4320); +COMPILER_STRIP_GATE(0x80BDA04C, &lit_4320); #pragma pop /* 80BDA050-80BDA054 0000AC 0004+00 0/2 0/0 0/0 .rodata @4321 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4321 = 38.0f; -COMPILER_STRIP_GATE(80BDA050, &lit_4321); +COMPILER_STRIP_GATE(0x80BDA050, &lit_4321); #pragma pop /* 80BDA054-80BDA058 0000B0 0004+00 0/2 0/0 0/0 .rodata @4322 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4322 = 8.0f; -COMPILER_STRIP_GATE(80BDA054, &lit_4322); +COMPILER_STRIP_GATE(0x80BDA054, &lit_4322); #pragma pop /* 80BDA058-80BDA05C 0000B4 0004+00 0/3 0/0 0/0 .rodata @4323 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4323 = 0.5f; -COMPILER_STRIP_GATE(80BDA058, &lit_4323); +COMPILER_STRIP_GATE(0x80BDA058, &lit_4323); #pragma pop /* 80BD7AD4-80BD7ED8 001174 0404+00 1/1 0/0 0/0 .text chain_control__12daObjCwall_cFv */ @@ -872,42 +879,42 @@ asm void daObjCwall_c::chain_control() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4486 = 60.0f; -COMPILER_STRIP_GATE(80BDA05C, &lit_4486); +COMPILER_STRIP_GATE(0x80BDA05C, &lit_4486); #pragma pop /* 80BDA060-80BDA064 0000BC 0004+00 0/1 0/0 0/0 .rodata @4487 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4487 = -10.0f; -COMPILER_STRIP_GATE(80BDA060, &lit_4487); +COMPILER_STRIP_GATE(0x80BDA060, &lit_4487); #pragma pop /* 80BDA064-80BDA068 0000C0 0004+00 0/1 0/0 0/0 .rodata @4488 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4488 = 25.0f; -COMPILER_STRIP_GATE(80BDA064, &lit_4488); +COMPILER_STRIP_GATE(0x80BDA064, &lit_4488); #pragma pop /* 80BDA068-80BDA06C 0000C4 0004+00 0/1 0/0 0/0 .rodata @4489 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4489 = 10.0f; -COMPILER_STRIP_GATE(80BDA068, &lit_4489); +COMPILER_STRIP_GATE(0x80BDA068, &lit_4489); #pragma pop /* 80BDA06C-80BDA070 0000C8 0004+00 0/2 0/0 0/0 .rodata @4490 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4490 = 188.0f; -COMPILER_STRIP_GATE(80BDA06C, &lit_4490); +COMPILER_STRIP_GATE(0x80BDA06C, &lit_4490); #pragma pop /* 80BDA070-80BDA074 0000CC 0004+00 0/2 0/0 0/0 .rodata @4491 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4491 = 6.0f; -COMPILER_STRIP_GATE(80BDA070, &lit_4491); +COMPILER_STRIP_GATE(0x80BDA070, &lit_4491); #pragma pop /* 80BD7ED8-80BD84C0 001578 05E8+00 1/1 0/0 0/0 .text chain_control2__12daObjCwall_cFv */ @@ -1021,14 +1028,14 @@ asm void daObjCwall_c::initWalk() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4665 = 1.0f; -COMPILER_STRIP_GATE(80BDA074, &lit_4665); +COMPILER_STRIP_GATE(0x80BDA074, &lit_4665); #pragma pop /* 80BDA078-80BDA07C 0000D4 0004+00 0/2 0/0 0/0 .rodata @4666 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4666 = 75.0f; -COMPILER_STRIP_GATE(80BDA078, &lit_4666); +COMPILER_STRIP_GATE(0x80BDA078, &lit_4666); #pragma pop /* 80BDA07C-80BDA084 0000D8 0004+04 0/2 0/0 0/0 .rodata @4667 */ @@ -1039,7 +1046,7 @@ SECTION_RODATA static f32 const lit_4667[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80BDA07C, &lit_4667); +COMPILER_STRIP_GATE(0x80BDA07C, &lit_4667); #pragma pop /* 80BDA084-80BDA08C 0000E0 0008+00 0/1 0/0 0/0 .rodata @4669 */ @@ -1048,7 +1055,7 @@ COMPILER_STRIP_GATE(80BDA07C, &lit_4667); SECTION_RODATA static u8 const lit_4669[8] = { 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BDA084, &lit_4669); +COMPILER_STRIP_GATE(0x80BDA084, &lit_4669); #pragma pop /* 80BD8778-80BD8BC8 001E18 0450+00 1/0 0/0 0/0 .text modeWalk__12daObjCwall_cFv */ @@ -1076,14 +1083,14 @@ asm void daObjCwall_c::initClose() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4884 = 1.0f / 100.0f; -COMPILER_STRIP_GATE(80BDA08C, &lit_4884); +COMPILER_STRIP_GATE(0x80BDA08C, &lit_4884); #pragma pop /* 80BDA090-80BDA094 0000EC 0004+00 0/1 0/0 0/0 .rodata @4885 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4885 = 1.5f; -COMPILER_STRIP_GATE(80BDA090, &lit_4885); +COMPILER_STRIP_GATE(0x80BDA090, &lit_4885); #pragma pop /* 80BD8BF0-80BD935C 002290 076C+00 1/0 0/0 0/0 .text modeClose__12daObjCwall_cFv */ @@ -1111,14 +1118,14 @@ asm void daObjCwall_c::setPower(f32 param_0, s16* param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4961 = -95.0f; -COMPILER_STRIP_GATE(80BDA094, &lit_4961); +COMPILER_STRIP_GATE(0x80BDA094, &lit_4961); #pragma pop /* 80BDA098-80BDA09C 0000F4 0004+00 0/1 0/0 0/0 .rodata @4962 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4962 = 95.0f; -COMPILER_STRIP_GATE(80BDA098, &lit_4962); +COMPILER_STRIP_GATE(0x80BDA098, &lit_4962); #pragma pop /* 80BD9414-80BD95A0 002AB4 018C+00 1/1 0/0 0/0 .text checkWall__12daObjCwall_cFv */ @@ -1136,7 +1143,7 @@ asm void daObjCwall_c::checkWall() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5019 = 290.0f; -COMPILER_STRIP_GATE(80BDA09C, &lit_5019); +COMPILER_STRIP_GATE(0x80BDA09C, &lit_5019); #pragma pop /* 80BD95A0-80BD977C 002C40 01DC+00 2/2 0/0 0/0 .text checkPullNow__12daObjCwall_cFv */ @@ -1371,7 +1378,7 @@ asm cCcD_GStts::~cCcD_GStts() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80BD9EAC(s16* param_0) { +extern "C" asm void func_80BD9EAC(void* _this, s16* param_0) { nofralloc #include "asm/rel/d/a/obj/d_a_obj_cwall/d_a_obj_cwall/func_80BD9EAC.s" } @@ -1381,7 +1388,7 @@ extern "C" asm void func_80BD9EAC(s16* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80BD9EC8(u8* param_0) { +extern "C" asm void func_80BD9EC8(void* _this, u8* param_0) { nofralloc #include "asm/rel/d/a/obj/d_a_obj_cwall/d_a_obj_cwall/func_80BD9EC8.s" } @@ -1392,21 +1399,21 @@ extern "C" asm void func_80BD9EC8(u8* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5316 = 105.0f; -COMPILER_STRIP_GATE(80BDA0A0, &lit_5316); +COMPILER_STRIP_GATE(0x80BDA0A0, &lit_5316); #pragma pop /* 80BDA0A4-80BDA0A8 000100 0004+00 0/1 0/0 0/0 .rodata @5317 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5317 = 30.0f; -COMPILER_STRIP_GATE(80BDA0A4, &lit_5317); +COMPILER_STRIP_GATE(0x80BDA0A4, &lit_5317); #pragma pop /* 80BDA0A8-80BDA0AC 000104 0004+00 0/1 0/0 0/0 .rodata @5318 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5318 = -200.0f; -COMPILER_STRIP_GATE(80BDA0A8, &lit_5318); +COMPILER_STRIP_GATE(0x80BDA0A8, &lit_5318); #pragma pop /* 80BD9EE4-80BD9F74 003584 0090+00 0/0 1/0 0/0 .text __sinit_d_a_obj_cwall_cpp */ @@ -1421,7 +1428,7 @@ asm void __sinit_d_a_obj_cwall_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80BD9EE4 = (void*)__sinit_d_a_obj_cwall_cpp; +REGISTER_CTORS(0x80BD9EE4, __sinit_d_a_obj_cwall_cpp); #pragma pop /* 80BD9F74-80BD9F90 003614 001C+00 1/1 0/0 0/0 .text getRightHandPos__9daPy_py_cCFv */ @@ -1606,10 +1613,4 @@ static u8 data_80BDA3D0[4]; static u8 data_80BDA3D4[4]; #pragma pop -/* 80BDA0AC-80BDA0BE 000108 0012+00 1/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80BDA0AC = "P_Cwall"; -SECTION_DEAD static char const* const stringBase_80BDA0B4 = "P_L4Cwall"; -#pragma pop +/* 80BDA0AC-80BDA0AC 000108 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_dan/d_a_obj_dan.cpp b/rel/d/a/obj/d_a_obj_dan/d_a_obj_dan.cpp index db12d3b0a19..c2bb15d0d4b 100644 --- a/rel/d/a/obj/d_a_obj_dan/d_a_obj_dan.cpp +++ b/rel/d/a/obj/d_a_obj_dan/d_a_obj_dan.cpp @@ -49,19 +49,19 @@ struct mDoExt_baseAnm { /* 8000D428 */ void play(); }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; +struct J3DAnmTransform {}; + +struct J3DModelData {}; + struct Z2Creature { /* 802C03C8 */ Z2Creature(); /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -397,7 +397,7 @@ extern "C" void __register_global_object(); /* ############################################################################################## */ /* 80BDC3B0-80BDC3B4 000000 0004+00 9/9 0/0 0/0 .rodata @3775 */ SECTION_RODATA static f32 const lit_3775 = 1.0f; -COMPILER_STRIP_GATE(80BDC3B0, &lit_3775); +COMPILER_STRIP_GATE(0x80BDC3B0, &lit_3775); /* 80BDC47C-80BDC49C -00001 0020+00 1/0 0/0 0/0 .data l_daObjDAN_Method */ SECTION_DATA static void* l_daObjDAN_Method[8] = { @@ -503,7 +503,7 @@ SECTION_RODATA static u8 const ccSphSrc[64] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0x20, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BDC3B4, &ccSphSrc); +COMPILER_STRIP_GATE(0x80BDC3B4, &ccSphSrc); /* 80BDA5B4-80BDA620 000114 006C+00 1/1 0/0 0/0 .text InitCcSph__10daObjDAN_cFv */ #pragma push @@ -518,7 +518,7 @@ asm void daObjDAN_c::InitCcSph() { /* ############################################################################################## */ /* 80BDC3F4-80BDC3F8 000044 0004+00 1/2 0/0 0/0 .rodata @3788 */ SECTION_RODATA static f32 const lit_3788 = 20.0f; -COMPILER_STRIP_GATE(80BDC3F4, &lit_3788); +COMPILER_STRIP_GATE(0x80BDC3F4, &lit_3788); /* 80BDA620-80BDA678 000180 0058+00 1/1 0/0 0/0 .text SetCcSph__10daObjDAN_cFv */ #pragma push @@ -540,6 +540,13 @@ static asm void useHeapInit(fopAc_ac_c* param_0) { } #pragma pop +/* ############################################################################################## */ +/* 80BDC46C-80BDC46C 0000BC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80BDC46C = "I_Dan"; +#pragma pop + /* 80BDA698-80BDA9B0 0001F8 0318+00 1/1 0/0 0/0 .text CreateHeap__10daObjDAN_cFv */ #pragma push #pragma optimization_level 0 @@ -583,11 +590,11 @@ static asm void daObjDAN_Delete(daObjDAN_c* param_0) { /* ############################################################################################## */ /* 80BDC3F8-80BDC3FC 000048 0004+00 1/1 0/0 0/0 .rodata @3923 */ SECTION_RODATA static f32 const lit_3923 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(80BDC3F8, &lit_3923); +COMPILER_STRIP_GATE(0x80BDC3F8, &lit_3923); /* 80BDC3FC-80BDC400 00004C 0004+00 1/3 0/0 0/0 .rodata @3924 */ SECTION_RODATA static f32 const lit_3924 = 10.0f; -COMPILER_STRIP_GATE(80BDC3FC, &lit_3924); +COMPILER_STRIP_GATE(0x80BDC3FC, &lit_3924); /* 80BDAA3C-80BDAA9C 00059C 0060+00 2/2 0/0 0/0 .text SpeedSet__10daObjDAN_cFv */ #pragma push @@ -602,7 +609,7 @@ asm void daObjDAN_c::SpeedSet() { /* ############################################################################################## */ /* 80BDC400-80BDC404 000050 0004+00 2/5 0/0 0/0 .rodata @3938 */ SECTION_RODATA static f32 const lit_3938 = 50.0f; -COMPILER_STRIP_GATE(80BDC400, &lit_3938); +COMPILER_STRIP_GATE(0x80BDC400, &lit_3938); /* 80BDC404-80BDC408 000054 0004+00 3/9 0/0 0/0 .rodata @3939 */ SECTION_RODATA static u8 const lit_3939[4] = { @@ -611,7 +618,7 @@ SECTION_RODATA static u8 const lit_3939[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BDC404, &lit_3939); +COMPILER_STRIP_GATE(0x80BDC404, &lit_3939); /* 80BDAA9C-80BDAB14 0005FC 0078+00 1/1 0/0 0/0 .text LinkChk__10daObjDAN_cFv */ #pragma push @@ -626,7 +633,7 @@ asm void daObjDAN_c::LinkChk() { /* ############################################################################################## */ /* 80BDC408-80BDC40C 000058 0004+00 1/1 0/0 0/0 .rodata @3960 */ SECTION_RODATA static f32 const lit_3960 = 550.0f; -COMPILER_STRIP_GATE(80BDC408, &lit_3960); +COMPILER_STRIP_GATE(0x80BDC408, &lit_3960); /* 80BDAB14-80BDAC10 000674 00FC+00 2/2 0/0 0/0 .text MoveAction__10daObjDAN_cFv */ #pragma push @@ -643,53 +650,53 @@ asm void daObjDAN_c::MoveAction() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4045 = 1.5f; -COMPILER_STRIP_GATE(80BDC40C, &lit_4045); +COMPILER_STRIP_GATE(0x80BDC40C, &lit_4045); #pragma pop /* 80BDC410-80BDC414 000060 0004+00 0/4 0/0 0/0 .rodata @4046 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4046 = 5.0f; -COMPILER_STRIP_GATE(80BDC410, &lit_4046); +COMPILER_STRIP_GATE(0x80BDC410, &lit_4046); #pragma pop /* 80BDC414-80BDC418 000064 0004+00 0/4 0/0 0/0 .rodata @4047 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4047 = -1.0f; -COMPILER_STRIP_GATE(80BDC414, &lit_4047); +COMPILER_STRIP_GATE(0x80BDC414, &lit_4047); #pragma pop /* 80BDC418-80BDC41C 000068 0004+00 0/3 0/0 0/0 .rodata @4048 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4048 = -3.0f; -COMPILER_STRIP_GATE(80BDC418, &lit_4048); +COMPILER_STRIP_GATE(0x80BDC418, &lit_4048); #pragma pop /* 80BDC41C-80BDC420 00006C 0004+00 0/3 0/0 0/0 .rodata @4049 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4049 = 0.5f; -COMPILER_STRIP_GATE(80BDC41C, &lit_4049); +COMPILER_STRIP_GATE(0x80BDC41C, &lit_4049); #pragma pop /* 80BDC420-80BDC424 000070 0004+00 1/2 0/0 0/0 .rodata @4050 */ SECTION_RODATA static f32 const lit_4050 = 15.0f; -COMPILER_STRIP_GATE(80BDC420, &lit_4050); +COMPILER_STRIP_GATE(0x80BDC420, &lit_4050); /* 80BDC424-80BDC428 000074 0004+00 0/1 0/0 0/0 .rodata @4051 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4051 = -0.5f; -COMPILER_STRIP_GATE(80BDC424, &lit_4051); +COMPILER_STRIP_GATE(0x80BDC424, &lit_4051); #pragma pop /* 80BDC428-80BDC42C 000078 0004+00 0/1 0/0 0/0 .rodata @4052 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4052 = 2.0f; -COMPILER_STRIP_GATE(80BDC428, &lit_4052); +COMPILER_STRIP_GATE(0x80BDC428, &lit_4052); #pragma pop /* 80BDAC10-80BDAFDC 000770 03CC+00 2/2 0/0 0/0 .text DamageAction__10daObjDAN_cFv */ @@ -739,20 +746,20 @@ SECTION_RODATA static u16 const l_dan_itemno[1 + 1 /* padding */] = { /* padding */ 0x0000, }; -COMPILER_STRIP_GATE(80BDC42C, &l_dan_itemno); +COMPILER_STRIP_GATE(0x80BDC42C, &l_dan_itemno); /* 80BDC430-80BDC434 000080 0004+00 0/1 0/0 0/0 .rodata @4126 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4126 = 608.0f; -COMPILER_STRIP_GATE(80BDC430, &lit_4126); +COMPILER_STRIP_GATE(0x80BDC430, &lit_4126); #pragma pop /* 80BDC434-80BDC438 000084 0004+00 0/1 0/0 0/0 .rodata @4127 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4127 = 448.0f; -COMPILER_STRIP_GATE(80BDC434, &lit_4127); +COMPILER_STRIP_GATE(0x80BDC434, &lit_4127); #pragma pop /* 80BDC438-80BDC440 000088 0004+04 0/1 0/0 0/0 .rodata @4128 */ @@ -763,7 +770,7 @@ SECTION_RODATA static f32 const lit_4128[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80BDC438, &lit_4128); +COMPILER_STRIP_GATE(0x80BDC438, &lit_4128); #pragma pop /* 80BDB0E8-80BDB264 000C48 017C+00 1/1 0/0 0/0 .text Z_BufferChk__10daObjDAN_cFv */ @@ -781,7 +788,7 @@ asm void daObjDAN_c::Z_BufferChk() { SECTION_RODATA static u8 const lit_4158[8] = { 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BDC440, &lit_4158); +COMPILER_STRIP_GATE(0x80BDC440, &lit_4158); /* 80BDB264-80BDB388 000DC4 0124+00 1/1 0/0 0/0 .text ParticleSet__10daObjDAN_cFv */ #pragma push @@ -808,21 +815,21 @@ asm void daObjDAN_c::ObjHit() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4188 = 100.0f; -COMPILER_STRIP_GATE(80BDC448, &lit_4188); +COMPILER_STRIP_GATE(0x80BDC448, &lit_4188); #pragma pop /* 80BDC44C-80BDC450 00009C 0004+00 0/2 0/0 0/0 .rodata @4236 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4236 = 30.0f; -COMPILER_STRIP_GATE(80BDC44C, &lit_4236); +COMPILER_STRIP_GATE(0x80BDC44C, &lit_4236); #pragma pop /* 80BDC450-80BDC454 0000A0 0004+00 0/1 0/0 0/0 .rodata @4237 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4237 = 150.0f; -COMPILER_STRIP_GATE(80BDC450, &lit_4237); +COMPILER_STRIP_GATE(0x80BDC450, &lit_4237); #pragma pop /* 80BDB4E0-80BDB62C 001040 014C+00 1/1 0/0 0/0 .text BoomChk__10daObjDAN_cFv */ @@ -840,7 +847,7 @@ asm void daObjDAN_c::BoomChk() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4286 = 10000.0f; -COMPILER_STRIP_GATE(80BDC454, &lit_4286); +COMPILER_STRIP_GATE(0x80BDC454, &lit_4286); #pragma pop /* 80BDB62C-80BDB928 00118C 02FC+00 1/1 0/0 0/0 .text Execute__10daObjDAN_cFv */ @@ -870,7 +877,7 @@ asm void daObjDAN_c::Delete() { /* ############################################################################################## */ /* 80BDC458-80BDC45C 0000A8 0004+00 1/1 0/0 0/0 .rodata @4311 */ SECTION_RODATA static f32 const lit_4311 = -4.0f; -COMPILER_STRIP_GATE(80BDC458, &lit_4311); +COMPILER_STRIP_GATE(0x80BDC458, &lit_4311); /* 80BDB990-80BDBA0C 0014F0 007C+00 1/1 0/0 0/0 .text setBaseMtx__10daObjDAN_cFv */ #pragma push @@ -885,7 +892,7 @@ asm void daObjDAN_c::setBaseMtx() { /* ############################################################################################## */ /* 80BDC45C-80BDC460 0000AC 0004+00 1/1 0/0 0/0 .rodata @4354 */ SECTION_RODATA static f32 const lit_4354 = -3.0f / 5.0f; -COMPILER_STRIP_GATE(80BDC45C, &lit_4354); +COMPILER_STRIP_GATE(0x80BDC45C, &lit_4354); /* 80BDBA0C-80BDBAEC 00156C 00E0+00 1/0 0/0 0/0 .text daObjDAN_Draw__FP10daObjDAN_c */ #pragma push @@ -910,7 +917,13 @@ static asm void daObjDAN_Execute(daObjDAN_c* param_0) { /* ############################################################################################## */ /* 80BDC460-80BDC464 0000B0 0004+00 1/2 0/0 0/0 .rodata l_musiya_num */ SECTION_RODATA static u32 const l_musiya_num = 0x019B019C; -COMPILER_STRIP_GATE(80BDC460, &l_musiya_num); +COMPILER_STRIP_GATE(0x80BDC460, &l_musiya_num); + +/* 80BDC46C-80BDC46C 0000BC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80BDC472 = "R_SP160"; +#pragma pop /* 80BDBB0C-80BDBCB8 00166C 01AC+00 1/1 0/0 0/0 .text CreateChk__10daObjDAN_cFv */ #pragma push @@ -927,14 +940,14 @@ asm void daObjDAN_c::CreateChk() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4521 = -1000000000.0f; -COMPILER_STRIP_GATE(80BDC464, &lit_4521); +COMPILER_STRIP_GATE(0x80BDC464, &lit_4521); #pragma pop /* 80BDC468-80BDC46C 0000B8 0004+00 0/1 0/0 0/0 .rodata @4522 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4522 = -50.0f; -COMPILER_STRIP_GATE(80BDC468, &lit_4522); +COMPILER_STRIP_GATE(0x80BDC468, &lit_4522); #pragma pop /* 80BDC56C-80BDC578 00000C 000C+00 1/1 0/0 0/0 .bss @3770 */ @@ -1021,7 +1034,7 @@ asm void __sinit_d_a_obj_dan_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80BDC338 = (void*)__sinit_d_a_obj_dan_cpp; +REGISTER_CTORS(0x80BDC338, __sinit_d_a_obj_dan_cpp); #pragma pop /* 80BDC374-80BDC37C 001ED4 0008+00 1/0 0/0 0/0 .text @36@__dt__12dBgS_ObjAcchFv */ @@ -1074,10 +1087,4 @@ static asm void func_80BDC394() { } #pragma pop -/* 80BDC46C-80BDC47A 0000BC 000E+00 7/7 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80BDC46C = "I_Dan"; -SECTION_DEAD static char const* const stringBase_80BDC472 = "R_SP160"; -#pragma pop +/* 80BDC46C-80BDC46C 0000BC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_digholl/d_a_obj_digholl.cpp b/rel/d/a/obj/d_a_obj_digholl/d_a_obj_digholl.cpp index d996e3ad3aa..d7b8dff5274 100644 --- a/rel/d/a/obj/d_a_obj_digholl/d_a_obj_digholl.cpp +++ b/rel/d/a/obj/d_a_obj_digholl/d_a_obj_digholl.cpp @@ -87,7 +87,7 @@ extern "C" extern u32 __float_nan; /* ############################################################################################## */ /* 80BDCB3C-80BDCB40 000000 0004+00 2/2 0/0 0/0 .rodata @3678 */ SECTION_RODATA static f32 const lit_3678 = -60.0f; -COMPILER_STRIP_GATE(80BDCB3C, &lit_3678); +COMPILER_STRIP_GATE(0x80BDCB3C, &lit_3678); /* 80BDCB40-80BDCB44 000004 0004+00 0/2 0/0 0/0 .rodata @3679 */ #pragma push @@ -98,35 +98,35 @@ SECTION_RODATA static u8 const lit_3679[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BDCB40, &lit_3679); +COMPILER_STRIP_GATE(0x80BDCB40, &lit_3679); #pragma pop /* 80BDCB44-80BDCB48 000008 0004+00 0/1 0/0 0/0 .rodata @3680 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3680 = -100.0f; -COMPILER_STRIP_GATE(80BDCB44, &lit_3680); +COMPILER_STRIP_GATE(0x80BDCB44, &lit_3680); #pragma pop /* 80BDCB48-80BDCB4C 00000C 0004+00 0/1 0/0 0/0 .rodata @3681 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3681 = 60.0f; -COMPILER_STRIP_GATE(80BDCB48, &lit_3681); +COMPILER_STRIP_GATE(0x80BDCB48, &lit_3681); #pragma pop /* 80BDCB4C-80BDCB50 000010 0004+00 0/1 0/0 0/0 .rodata @3682 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3682 = 10.0f; -COMPILER_STRIP_GATE(80BDCB4C, &lit_3682); +COMPILER_STRIP_GATE(0x80BDCB4C, &lit_3682); #pragma pop /* 80BDCB50-80BDCB54 000014 0004+00 0/1 0/0 0/0 .rodata @3683 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3683 = 100.0f; -COMPILER_STRIP_GATE(80BDCB50, &lit_3683); +COMPILER_STRIP_GATE(0x80BDCB50, &lit_3683); #pragma pop /* 80BDC618-80BDC73C 000078 0124+00 1/1 0/0 0/0 .text create__14daObjDigholl_cFv */ @@ -175,28 +175,28 @@ static asm void daObjDigholl_Delete(daObjDigholl_c* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3793 = 40.0f; -COMPILER_STRIP_GATE(80BDCB54, &lit_3793); +COMPILER_STRIP_GATE(0x80BDCB54, &lit_3793); #pragma pop /* 80BDCB58-80BDCB5C 00001C 0004+00 0/1 0/0 0/0 .rodata @3794 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3794 = 35.0f; -COMPILER_STRIP_GATE(80BDCB58, &lit_3794); +COMPILER_STRIP_GATE(0x80BDCB58, &lit_3794); #pragma pop /* 80BDCB5C-80BDCB60 000020 0004+00 0/1 0/0 0/0 .rodata @3795 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3795 = 250000.0f; -COMPILER_STRIP_GATE(80BDCB5C, &lit_3795); +COMPILER_STRIP_GATE(0x80BDCB5C, &lit_3795); #pragma pop /* 80BDCB60-80BDCB64 000024 0004+00 0/1 0/0 0/0 .rodata @3796 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3796 = 200.0f; -COMPILER_STRIP_GATE(80BDCB60, &lit_3796); +COMPILER_STRIP_GATE(0x80BDCB60, &lit_3796); #pragma pop /* 80BDCB64-80BDCB6C 000028 0008+00 0/1 0/0 0/0 .rodata @3797 */ @@ -205,7 +205,7 @@ COMPILER_STRIP_GATE(80BDCB60, &lit_3796); SECTION_RODATA static u8 const lit_3797[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BDCB64, &lit_3797); +COMPILER_STRIP_GATE(0x80BDCB64, &lit_3797); #pragma pop /* 80BDCB6C-80BDCB74 000030 0008+00 0/1 0/0 0/0 .rodata @3798 */ @@ -214,7 +214,7 @@ COMPILER_STRIP_GATE(80BDCB64, &lit_3797); SECTION_RODATA static u8 const lit_3798[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BDCB6C, &lit_3798); +COMPILER_STRIP_GATE(0x80BDCB6C, &lit_3798); #pragma pop /* 80BDCB74-80BDCB7C 000038 0008+00 0/1 0/0 0/0 .rodata @3799 */ @@ -223,14 +223,14 @@ COMPILER_STRIP_GATE(80BDCB6C, &lit_3798); SECTION_RODATA static u8 const lit_3799[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BDCB74, &lit_3799); +COMPILER_STRIP_GATE(0x80BDCB74, &lit_3799); #pragma pop /* 80BDCB7C-80BDCB80 000040 0004+00 0/1 0/0 0/0 .rodata @3800 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3800 = 1000.0f; -COMPILER_STRIP_GATE(80BDCB7C, &lit_3800); +COMPILER_STRIP_GATE(0x80BDCB7C, &lit_3800); #pragma pop /* 80BDC7D8-80BDCAEC 000238 0314+00 1/1 0/0 0/0 .text execute__14daObjDigholl_cFv */ diff --git a/rel/d/a/obj/d_a_obj_digplace/d_a_obj_digplace.cpp b/rel/d/a/obj/d_a_obj_digplace/d_a_obj_digplace.cpp index 16692c152a8..36ffc5dac2e 100644 --- a/rel/d/a/obj/d_a_obj_digplace/d_a_obj_digplace.cpp +++ b/rel/d/a/obj/d_a_obj_digplace/d_a_obj_digplace.cpp @@ -101,27 +101,27 @@ extern "C" extern u8 struct_80450D64[4]; /* ############################################################################################## */ /* 8057C8B0-8057C8B4 000000 0004+00 2/2 0/0 0/0 .rodata @3822 */ SECTION_RODATA static f32 const lit_3822 = -550.0f; -COMPILER_STRIP_GATE(8057C8B0, &lit_3822); +COMPILER_STRIP_GATE(0x8057C8B0, &lit_3822); /* 8057C8B4-8057C8B8 000004 0004+00 0/1 0/0 0/0 .rodata @3823 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3823 = -250.0f; -COMPILER_STRIP_GATE(8057C8B4, &lit_3823); +COMPILER_STRIP_GATE(0x8057C8B4, &lit_3823); #pragma pop /* 8057C8B8-8057C8BC 000008 0004+00 0/1 0/0 0/0 .rodata @3824 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3824 = 550.0f; -COMPILER_STRIP_GATE(8057C8B8, &lit_3824); +COMPILER_STRIP_GATE(0x8057C8B8, &lit_3824); #pragma pop /* 8057C8BC-8057C8C0 00000C 0004+00 0/1 0/0 0/0 .rodata @3825 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3825 = 250.0f; -COMPILER_STRIP_GATE(8057C8BC, &lit_3825); +COMPILER_STRIP_GATE(0x8057C8BC, &lit_3825); #pragma pop /* 8057C8F8-8057C918 -00001 0020+00 1/0 0/0 0/0 .data l_daObjDigpl_Method */ @@ -200,14 +200,14 @@ static asm void daObjDigpl_Delete(daObjDigpl_c* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4023 = 30.0f; -COMPILER_STRIP_GATE(8057C8C0, &lit_4023); +COMPILER_STRIP_GATE(0x8057C8C0, &lit_4023); #pragma pop /* 8057C8C4-8057C8C8 000014 0004+00 0/1 0/0 0/0 .rodata @4024 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4024 = 100000.0f; -COMPILER_STRIP_GATE(8057C8C4, &lit_4024); +COMPILER_STRIP_GATE(0x8057C8C4, &lit_4024); #pragma pop /* 8057C8C8-8057C8D0 000018 0004+04 0/1 0/0 0/0 .rodata @4025 */ @@ -224,7 +224,7 @@ SECTION_RODATA static u8 const lit_4025[4 + 4 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(8057C8C8, &lit_4025); +COMPILER_STRIP_GATE(0x8057C8C8, &lit_4025); #pragma pop /* 8057C8D0-8057C8D8 000020 0008+00 0/1 0/0 0/0 .rodata @4026 */ @@ -233,7 +233,7 @@ COMPILER_STRIP_GATE(8057C8C8, &lit_4025); SECTION_RODATA static u8 const lit_4026[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8057C8D0, &lit_4026); +COMPILER_STRIP_GATE(0x8057C8D0, &lit_4026); #pragma pop /* 8057C8D8-8057C8E0 000028 0008+00 0/1 0/0 0/0 .rodata @4027 */ @@ -242,7 +242,7 @@ COMPILER_STRIP_GATE(8057C8D0, &lit_4026); SECTION_RODATA static u8 const lit_4027[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8057C8D8, &lit_4027); +COMPILER_STRIP_GATE(0x8057C8D8, &lit_4027); #pragma pop /* 8057C8E0-8057C8E8 000030 0008+00 0/1 0/0 0/0 .rodata @4028 */ @@ -251,35 +251,35 @@ COMPILER_STRIP_GATE(8057C8D8, &lit_4027); SECTION_RODATA static u8 const lit_4028[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8057C8E0, &lit_4028); +COMPILER_STRIP_GATE(0x8057C8E0, &lit_4028); #pragma pop /* 8057C8E8-8057C8EC 000038 0004+00 0/1 0/0 0/0 .rodata @4029 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4029 = 1000.0f; -COMPILER_STRIP_GATE(8057C8E8, &lit_4029); +COMPILER_STRIP_GATE(0x8057C8E8, &lit_4029); #pragma pop /* 8057C8EC-8057C8F0 00003C 0004+00 0/1 0/0 0/0 .rodata @4030 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4030 = 200.0f; -COMPILER_STRIP_GATE(8057C8EC, &lit_4030); +COMPILER_STRIP_GATE(0x8057C8EC, &lit_4030); #pragma pop /* 8057C8F0-8057C8F4 000040 0004+00 0/1 0/0 0/0 .rodata @4031 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4031 = 1600.0f; -COMPILER_STRIP_GATE(8057C8F0, &lit_4031); +COMPILER_STRIP_GATE(0x8057C8F0, &lit_4031); #pragma pop /* 8057C8F4-8057C8F8 000044 0004+00 0/1 0/0 0/0 .rodata @4032 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4032 = 250000.0f; -COMPILER_STRIP_GATE(8057C8F4, &lit_4032); +COMPILER_STRIP_GATE(0x8057C8F4, &lit_4032); #pragma pop /* 8057C1EC-8057C880 0002CC 0694+00 1/1 0/0 0/0 .text execute__12daObjDigpl_cFv */ diff --git a/rel/d/a/obj/d_a_obj_digsnow/d_a_obj_digsnow.cpp b/rel/d/a/obj/d_a_obj_digsnow/d_a_obj_digsnow.cpp index 7634bdd8ce9..20b11279b33 100644 --- a/rel/d/a/obj/d_a_obj_digsnow/d_a_obj_digsnow.cpp +++ b/rel/d/a/obj/d_a_obj_digsnow/d_a_obj_digsnow.cpp @@ -273,6 +273,12 @@ asm void daObjDigSnow_c::Create() { #pragma pop /* ############################################################################################## */ +/* 80BDD6DC-80BDD6DC 000014 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80BDD6DC = "Y_horiyuk"; +#pragma pop + /* 80BDD6E8-80BDD6F4 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -400,7 +406,7 @@ asm void daObjDigSnow_c::mode_wait() { /* ############################################################################################## */ /* 80BDD6C8-80BDD6CC 000000 0004+00 2/2 0/0 0/0 .rodata @3744 */ SECTION_RODATA static f32 const lit_3744 = -1000000000.0f; -COMPILER_STRIP_GATE(80BDD6C8, &lit_3744); +COMPILER_STRIP_GATE(0x80BDD6C8, &lit_3744); /* 80BDD754-80BDD774 -00001 0020+00 1/0 0/0 0/0 .data daObjDigSnow_METHODS */ SECTION_DATA static void* daObjDigSnow_METHODS[8] = { @@ -514,28 +520,28 @@ asm dBgS_ObjGndChk::~dBgS_ObjGndChk() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3761 = 10.0f; -COMPILER_STRIP_GATE(80BDD6CC, &lit_3761); +COMPILER_STRIP_GATE(0x80BDD6CC, &lit_3761); #pragma pop /* 80BDD6D0-80BDD6D4 000008 0004+00 0/1 0/0 0/0 .rodata @3762 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3762 = 35.0f; -COMPILER_STRIP_GATE(80BDD6D0, &lit_3762); +COMPILER_STRIP_GATE(0x80BDD6D0, &lit_3762); #pragma pop /* 80BDD6D4-80BDD6D8 00000C 0004+00 0/1 0/0 0/0 .rodata @3763 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3763 = 1.0f; -COMPILER_STRIP_GATE(80BDD6D4, &lit_3763); +COMPILER_STRIP_GATE(0x80BDD6D4, &lit_3763); #pragma pop /* 80BDD6D8-80BDD6DC 000010 0004+00 0/1 0/0 0/0 .rodata @3764 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3764 = 30.0f; -COMPILER_STRIP_GATE(80BDD6D8, &lit_3764); +COMPILER_STRIP_GATE(0x80BDD6D8, &lit_3764); #pragma pop /* 80BDD124-80BDD1BC 000544 0098+00 1/0 0/0 0/0 .text mode_dig__14daObjDigSnow_cFv */ @@ -753,9 +759,4 @@ static asm void func_80BDD6B8() { } #pragma pop -/* 80BDD6DC-80BDD6E6 000014 000A+00 1/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80BDD6DC = "Y_horiyuk"; -#pragma pop +/* 80BDD6DC-80BDD6DC 000014 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_dmelevator/d_a_obj_dmelevator.cpp b/rel/d/a/obj/d_a_obj_dmelevator/d_a_obj_dmelevator.cpp index 11c87d7bffa..f792582f079 100644 --- a/rel/d/a/obj/d_a_obj_dmelevator/d_a_obj_dmelevator.cpp +++ b/rel/d/a/obj/d_a_obj_dmelevator/d_a_obj_dmelevator.cpp @@ -222,7 +222,7 @@ extern "C" static void daObjDmElevator_create1st__FP17daObjDmElevator_c(); extern "C" static void daObjDmElevator_MoveBGDelete__FP17daObjDmElevator_c(); extern "C" static void daObjDmElevator_MoveBGExecute__FP17daObjDmElevator_c(); extern "C" static void daObjDmElevator_MoveBGDraw__FP17daObjDmElevator_c(); -extern "C" void func_80BDF844(u8*); +extern "C" void func_80BDF844(void* _this, u8*); extern "C" extern char const* const d_a_obj_dmelevator__stringBase0; // @@ -312,13 +312,13 @@ extern "C" void __register_global_object(); SECTION_RODATA static u8 const l_swOffset[12] = { 0x00, 0x00, 0x00, 0x00, 0x43, 0x22, 0x00, 0x00, 0xC2, 0x9A, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BDF870, &l_swOffset); +COMPILER_STRIP_GATE(0x80BDF870, &l_swOffset); /* 80BDF87C-80BDF880 00000C 0004+00 0/2 0/0 0/0 .rodata @3718 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3718 = -50.0f; -COMPILER_STRIP_GATE(80BDF87C, &lit_3718); +COMPILER_STRIP_GATE(0x80BDF87C, &lit_3718); #pragma pop /* 80BDF880-80BDF884 000010 0004+00 5/13 0/0 0/0 .rodata @3719 */ @@ -328,13 +328,13 @@ SECTION_RODATA static u8 const lit_3719[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BDF880, &lit_3719); +COMPILER_STRIP_GATE(0x80BDF880, &lit_3719); /* 80BDF884-80BDF888 000014 0004+00 0/1 0/0 0/0 .rodata @3720 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3720 = 50.0f; -COMPILER_STRIP_GATE(80BDF884, &lit_3720); +COMPILER_STRIP_GATE(0x80BDF884, &lit_3720); #pragma pop /* 80BDFB38-80BDFB3C 000008 0001+03 1/1 0/0 0/0 .bss @1109 */ @@ -515,7 +515,7 @@ asm void daObjDmElevator_c::initBaseMtx() { /* ############################################################################################## */ /* 80BDF888-80BDF88C 000018 0004+00 1/1 0/0 0/0 .rodata @3821 */ SECTION_RODATA static f32 const lit_3821 = -17.0f; -COMPILER_STRIP_GATE(80BDF888, &lit_3821); +COMPILER_STRIP_GATE(0x80BDF888, &lit_3821); /* 80BDDD90-80BDDEFC 000510 016C+00 2/2 0/0 0/0 .text setBaseMtx__17daObjDmElevator_cFv */ @@ -533,35 +533,35 @@ asm void daObjDmElevator_c::setBaseMtx() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3875 = -24.0f; -COMPILER_STRIP_GATE(80BDF88C, &lit_3875); +COMPILER_STRIP_GATE(0x80BDF88C, &lit_3875); #pragma pop /* 80BDF890-80BDF894 000020 0004+00 0/1 0/0 0/0 .rodata @3876 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3876 = -250.0f; -COMPILER_STRIP_GATE(80BDF890, &lit_3876); +COMPILER_STRIP_GATE(0x80BDF890, &lit_3876); #pragma pop /* 80BDF894-80BDF898 000024 0004+00 0/1 0/0 0/0 .rodata @3877 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3877 = -350.0f; -COMPILER_STRIP_GATE(80BDF894, &lit_3877); +COMPILER_STRIP_GATE(0x80BDF894, &lit_3877); #pragma pop /* 80BDF898-80BDF89C 000028 0004+00 0/1 0/0 0/0 .rodata @3878 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3878 = 250.0f; -COMPILER_STRIP_GATE(80BDF898, &lit_3878); +COMPILER_STRIP_GATE(0x80BDF898, &lit_3878); #pragma pop /* 80BDF89C-80BDF8A0 00002C 0004+00 0/1 0/0 0/0 .rodata @3879 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3879 = 450.0f; -COMPILER_STRIP_GATE(80BDF89C, &lit_3879); +COMPILER_STRIP_GATE(0x80BDF89C, &lit_3879); #pragma pop /* 80BDF8A0-80BDF8A8 000030 0004+04 0/1 0/0 0/0 .rodata @3880 */ @@ -572,7 +572,19 @@ SECTION_RODATA static f32 const lit_3880[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80BDF8A0, &lit_3880); +COMPILER_STRIP_GATE(0x80BDF8A0, &lit_3880); +#pragma pop + +/* 80BDF8EC-80BDF8EC 00007C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80BDF8EC = "H_Elevato"; +SECTION_DEAD static char const* const stringBase_80BDF8F6 = "D_Hfsw00"; +SECTION_DEAD static char const* const stringBase_80BDF8FF = "ELEVATOR_MOVE"; +SECTION_DEAD static char const* const stringBase_80BDF90D = "ELEVATOR_MOVE2"; +SECTION_DEAD static char const* const stringBase_80BDF91C = "dmele"; +SECTION_DEAD static char const* const stringBase_80BDF922 = "F_SP110"; +SECTION_DEAD static char const* const stringBase_80BDF92A = "R_SP110"; #pragma pop /* 80BDF944-80BDF950 000000 000C+00 4/4 0/0 0/0 .data cNullVec__6Z2Calc */ @@ -628,7 +640,7 @@ asm void daObjDmElevator_c::Create() { SECTION_RODATA static u8 const lit_3936[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BDF8A8, &lit_3936); +COMPILER_STRIP_GATE(0x80BDF8A8, &lit_3936); #pragma pop /* 80BDF8B0-80BDF8B8 000040 0008+00 0/2 0/0 0/0 .rodata @3937 */ @@ -637,7 +649,7 @@ COMPILER_STRIP_GATE(80BDF8A8, &lit_3936); SECTION_RODATA static u8 const lit_3937[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BDF8B0, &lit_3937); +COMPILER_STRIP_GATE(0x80BDF8B0, &lit_3937); #pragma pop /* 80BDF8B8-80BDF8C0 000048 0008+00 0/2 0/0 0/0 .rodata @3938 */ @@ -646,21 +658,21 @@ COMPILER_STRIP_GATE(80BDF8B0, &lit_3937); SECTION_RODATA static u8 const lit_3938[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BDF8B8, &lit_3938); +COMPILER_STRIP_GATE(0x80BDF8B8, &lit_3938); #pragma pop /* 80BDF8C0-80BDF8C4 000050 0004+00 0/1 0/0 0/0 .rodata @3939 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3939 = 100.0f; -COMPILER_STRIP_GATE(80BDF8C0, &lit_3939); +COMPILER_STRIP_GATE(0x80BDF8C0, &lit_3939); #pragma pop /* 80BDF8C4-80BDF8C8 000054 0004+00 0/2 0/0 0/0 .rodata @3940 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3940 = 200.0f; -COMPILER_STRIP_GATE(80BDF8C4, &lit_3940); +COMPILER_STRIP_GATE(0x80BDF8C4, &lit_3940); #pragma pop /* 80BDE0A4-80BDE2F8 000824 0254+00 1/1 0/0 0/0 .text init__17daObjDmElevator_cFv */ @@ -697,11 +709,11 @@ asm void daObjDmElevator_c::create1st() { /* ############################################################################################## */ /* 80BDF8C8-80BDF8CC 000058 0004+00 1/1 0/0 0/0 .rodata @3987 */ SECTION_RODATA static f32 const lit_3987 = 65535.0f; -COMPILER_STRIP_GATE(80BDF8C8, &lit_3987); +COMPILER_STRIP_GATE(0x80BDF8C8, &lit_3987); /* 80BDF8CC-80BDF8D0 00005C 0004+00 1/1 0/0 0/0 .rodata @3988 */ SECTION_RODATA static u32 const lit_3988 = 0x43FB53D2; -COMPILER_STRIP_GATE(80BDF8CC, &lit_3988); +COMPILER_STRIP_GATE(0x80BDF8CC, &lit_3988); /* 80BDE500-80BDE5F8 000C80 00F8+00 1/0 0/0 0/0 .text Execute__17daObjDmElevator_cFPPA3_A4_f */ #pragma push @@ -845,19 +857,19 @@ asm void daObjDmElevator_c::actionSwPause() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4090 = 9.0f / 10.0f; -COMPILER_STRIP_GATE(80BDF8D0, &lit_4090); +COMPILER_STRIP_GATE(0x80BDF8D0, &lit_4090); #pragma pop /* 80BDF8D4-80BDF8D8 000064 0004+00 0/1 0/0 0/0 .rodata @4091 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4091 = 0.5f; -COMPILER_STRIP_GATE(80BDF8D4, &lit_4091); +COMPILER_STRIP_GATE(0x80BDF8D4, &lit_4091); #pragma pop /* 80BDF8D8-80BDF8DC 000068 0004+00 3/10 0/0 0/0 .rodata @4092 */ SECTION_RODATA static f32 const lit_4092 = 1.0f; -COMPILER_STRIP_GATE(80BDF8D8, &lit_4092); +COMPILER_STRIP_GATE(0x80BDF8D8, &lit_4092); /* 80BDE8D0-80BDE960 001050 0090+00 1/1 0/0 0/0 .text calc_top_pos__17daObjDmElevator_cFv */ @@ -945,13 +957,13 @@ asm void daObjDmElevator_c::modeSwWaitLowerInit() { /* ############################################################################################## */ /* 80BDF8DC-80BDF8E0 00006C 0004+00 1/5 0/0 0/0 .rodata @4141 */ SECTION_RODATA static f32 const lit_4141 = -1.0f; -COMPILER_STRIP_GATE(80BDF8DC, &lit_4141); +COMPILER_STRIP_GATE(0x80BDF8DC, &lit_4141); /* 80BDF8E0-80BDF8E4 000070 0004+00 0/1 0/0 0/0 .rodata @4142 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4142 = 4.0f / 5.0f; -COMPILER_STRIP_GATE(80BDF8E0, &lit_4142); +COMPILER_STRIP_GATE(0x80BDF8E0, &lit_4142); #pragma pop /* 80BDEA44-80BDEB88 0011C4 0144+00 1/0 0/0 0/0 .text modeSwWaitLower__17daObjDmElevator_cFv */ @@ -1169,6 +1181,14 @@ void daObjDmElevator_c::actionDead() { } /* ############################################################################################## */ +/* 80BDF8EC-80BDF8EC 00007C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80BDF932 = "WAIT"; +SECTION_DEAD static char const* const stringBase_80BDF937 = "MOVE"; +SECTION_DEAD static char const* const stringBase_80BDF93C = "Timer"; +#pragma pop + /* 80BDFAB0-80BDFAB8 -00001 0008+00 1/1 0/0 0/0 .data action_table$4279 */ SECTION_DATA static void* action_table[2] = { (void*)(((char*)&d_a_obj_dmelevator__stringBase0) + 0x46), @@ -1200,14 +1220,14 @@ asm void daObjDmElevator_c::moveInit() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4399 = 10.0f; -COMPILER_STRIP_GATE(80BDF8E4, &lit_4399); +COMPILER_STRIP_GATE(0x80BDF8E4, &lit_4399); #pragma pop /* 80BDF8E8-80BDF8EC 000078 0004+00 0/1 0/0 0/0 .rodata @4400 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4400 = -10.0f; -COMPILER_STRIP_GATE(80BDF8E8, &lit_4400); +COMPILER_STRIP_GATE(0x80BDF8E8, &lit_4400); #pragma pop /* 80BDF3B8-80BDF618 001B38 0260+00 2/2 0/0 0/0 .text moveProc__17daObjDmElevator_cFv */ @@ -1325,7 +1345,7 @@ static asm void daObjDmElevator_MoveBGDraw(daObjDmElevator_c* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80BDF844(u8* param_0) { +extern "C" asm void func_80BDF844(void* _this, u8* param_0) { nofralloc #include "asm/rel/d/a/obj/d_a_obj_dmelevator/d_a_obj_dmelevator/func_80BDF844.s" } @@ -1503,18 +1523,4 @@ static u8 data_80BDFC3C[4]; static u8 data_80BDFC40[4]; #pragma pop -/* 80BDF8EC-80BDF942 00007C 0056+00 8/2 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80BDF8EC = "H_Elevato"; -SECTION_DEAD static char const* const stringBase_80BDF8F6 = "D_Hfsw00"; -SECTION_DEAD static char const* const stringBase_80BDF8FF = "ELEVATOR_MOVE"; -SECTION_DEAD static char const* const stringBase_80BDF90D = "ELEVATOR_MOVE2"; -SECTION_DEAD static char const* const stringBase_80BDF91C = "dmele"; -SECTION_DEAD static char const* const stringBase_80BDF922 = "F_SP110"; -SECTION_DEAD static char const* const stringBase_80BDF92A = "R_SP110"; -SECTION_DEAD static char const* const stringBase_80BDF932 = "WAIT"; -SECTION_DEAD static char const* const stringBase_80BDF937 = "MOVE"; -SECTION_DEAD static char const* const stringBase_80BDF93C = "Timer"; -#pragma pop +/* 80BDF8EC-80BDF8EC 00007C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_drop/d_a_obj_drop.cpp b/rel/d/a/obj/d_a_obj_drop/d_a_obj_drop.cpp index 5c7a6a1e0d0..5a756c09b22 100644 --- a/rel/d/a/obj/d_a_obj_drop/d_a_obj_drop.cpp +++ b/rel/d/a/obj/d_a_obj_drop/d_a_obj_drop.cpp @@ -89,14 +89,6 @@ struct dPa_followEcallBack { /* 80BE02B0 */ void __defctor(); }; -struct cXyz { - /* 802670AC */ void isZero() const; - /* 80BE0318 */ ~cXyz(); - /* 80BE0354 */ cXyz(); - - static f32 Zero[3]; -}; - struct dKy_tevstr_c {}; struct csXyz { @@ -106,6 +98,14 @@ struct csXyz { static u8 Zero[4]; }; +struct cXyz { + /* 802670AC */ void isZero() const; + /* 80BE0318 */ ~cXyz(); + /* 80BE0354 */ cXyz(); + + static f32 Zero[3]; +}; + struct dPa_control_c { /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, @@ -114,7 +114,6 @@ struct dPa_control_c { struct dEvt_control_c { /* 80042468 */ void reset(); - /* 800436EC */ void setPtI_Id(unsigned int); }; struct dEvent_manager_c { @@ -266,8 +265,8 @@ extern "C" void executeAfter__18JPAEmitterCallBackFP14JPABaseEmitter(); extern "C" void draw__18JPAEmitterCallBackFP14JPABaseEmitter(); extern "C" void drawAfter__18JPAEmitterCallBackFP14JPABaseEmitter(); extern "C" void __dt__10cCcD_GSttsFv(); -extern "C" void func_80BE1F38(u8*); -extern "C" void func_80BE1F54(s8*); +extern "C" void func_80BE1F38(void* _this, u8*); +extern "C" void func_80BE1F54(void* _this, s8*); extern "C" static void func_80BE1F70(); extern "C" static void func_80BE1F78(); extern "C" extern char const* const d_a_obj_drop__stringBase0; @@ -381,13 +380,13 @@ static asm void searchParentSub(void* param_0, void* param_1) { SECTION_RODATA static u8 const l_sizuku_body_effect_list[12] = { 0x83, 0x8B, 0x83, 0x8C, 0x83, 0x8D, 0x83, 0x8E, 0x83, 0x8F, 0x84, 0x2B, }; -COMPILER_STRIP_GATE(80BE1F88, &l_sizuku_body_effect_list); +COMPILER_STRIP_GATE(0x80BE1F88, &l_sizuku_body_effect_list); /* 80BE1F94-80BE1F98 00000C 0004+00 0/1 0/0 0/0 .rodata l_sizuku_app_effect_list */ #pragma push #pragma force_active on SECTION_RODATA static u32 const l_sizuku_app_effect_list = 0x83888389; -COMPILER_STRIP_GATE(80BE1F94, &l_sizuku_app_effect_list); +COMPILER_STRIP_GATE(0x80BE1F94, &l_sizuku_app_effect_list); #pragma pop /* 80BE1F98-80BE1FD8 000010 0040+00 1/1 0/0 0/0 .rodata l_sph_src */ @@ -397,11 +396,11 @@ SECTION_RODATA static u8 const l_sph_src[64] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41, 0xF0, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BE1F98, &l_sph_src); +COMPILER_STRIP_GATE(0x80BE1F98, &l_sph_src); /* 80BE1FD8-80BE1FDC 000050 0004+00 1/2 0/0 0/0 .rodata @3825 */ SECTION_RODATA static f32 const lit_3825 = 50.0f; -COMPILER_STRIP_GATE(80BE1FD8, &lit_3825); +COMPILER_STRIP_GATE(0x80BE1FD8, &lit_3825); /* 80BDFD8C-80BDFE58 00012C 00CC+00 1/1 0/0 0/0 .text Create__11daObjDrop_cFv */ #pragma push @@ -764,7 +763,7 @@ asm void daObjDrop_c::dropGet() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4037 = -4.0f; -COMPILER_STRIP_GATE(80BE1FDC, &lit_4037); +COMPILER_STRIP_GATE(0x80BE1FDC, &lit_4037); #pragma pop /* 80BE1FE0-80BE1FE8 000058 0004+04 0/2 0/0 0/0 .rodata @4082 */ @@ -781,7 +780,7 @@ SECTION_RODATA static u8 const lit_4082[4 + 4 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BE1FE0, &lit_4082); +COMPILER_STRIP_GATE(0x80BE1FE0, &lit_4082); #pragma pop /* 80BE1FE8-80BE1FF0 000060 0008+00 0/2 0/0 0/0 .rodata @4083 */ @@ -790,7 +789,7 @@ COMPILER_STRIP_GATE(80BE1FE0, &lit_4082); SECTION_RODATA static u8 const lit_4083[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BE1FE8, &lit_4083); +COMPILER_STRIP_GATE(0x80BE1FE8, &lit_4083); #pragma pop /* 80BE1FF0-80BE1FF8 000068 0008+00 0/2 0/0 0/0 .rodata @4084 */ @@ -799,7 +798,7 @@ COMPILER_STRIP_GATE(80BE1FE8, &lit_4083); SECTION_RODATA static u8 const lit_4084[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BE1FF0, &lit_4084); +COMPILER_STRIP_GATE(0x80BE1FF0, &lit_4084); #pragma pop /* 80BE1FF8-80BE2000 000070 0008+00 0/2 0/0 0/0 .rodata @4085 */ @@ -808,14 +807,20 @@ COMPILER_STRIP_GATE(80BE1FF0, &lit_4084); SECTION_RODATA static u8 const lit_4085[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BE1FF8, &lit_4085); +COMPILER_STRIP_GATE(0x80BE1FF8, &lit_4085); #pragma pop /* 80BE2000-80BE2004 000078 0004+00 0/2 0/0 0/0 .rodata @4086 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4086 = 250.0f; -COMPILER_STRIP_GATE(80BE2000, &lit_4086); +COMPILER_STRIP_GATE(0x80BE2000, &lit_4086); +#pragma pop + +/* 80BE2048-80BE2048 0000C0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80BE2048 = "F_SP112"; #pragma pop /* 80BE0430-80BE05DC 0007D0 01AC+00 1/1 0/0 0/0 .text checkGetArea__11daObjDrop_cFv */ @@ -842,7 +847,7 @@ asm void daObjDrop_c::checkCompleteDemo() { /* ############################################################################################## */ /* 80BE2004-80BE2008 00007C 0004+00 2/4 0/0 0/0 .rodata @4119 */ SECTION_RODATA static f32 const lit_4119 = 1.0f; -COMPILER_STRIP_GATE(80BE2004, &lit_4119); +COMPILER_STRIP_GATE(0x80BE2004, &lit_4119); /* 80BE0658-80BE071C 0009F8 00C4+00 1/1 0/0 0/0 .text createLineEffect__11daObjDrop_cFv */ @@ -891,7 +896,7 @@ asm void daObjDrop_c::removeBodyEffect() { /* ############################################################################################## */ /* 80BE2008-80BE200C 000080 0004+00 1/1 0/0 0/0 .rodata @4183 */ SECTION_RODATA static f32 const lit_4183 = 75.0f; -COMPILER_STRIP_GATE(80BE2008, &lit_4183); +COMPILER_STRIP_GATE(0x80BE2008, &lit_4183); /* 80BE08A0-80BE0994 000C40 00F4+00 2/1 0/0 0/0 .text modeInit__11daObjDrop_cFv */ #pragma push @@ -918,7 +923,7 @@ asm void daObjDrop_c::modeNoParent() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4252 = 300.0f; -COMPILER_STRIP_GATE(80BE200C, &lit_4252); +COMPILER_STRIP_GATE(0x80BE200C, &lit_4252); #pragma pop /* 80BE09F4-80BE0C08 000D94 0214+00 1/0 0/0 0/0 .text modeParentWait__11daObjDrop_cFv */ @@ -946,7 +951,7 @@ SECTION_RODATA static u8 const target_rel_angle[6 + 2 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BE2010, &target_rel_angle); +COMPILER_STRIP_GATE(0x80BE2010, &target_rel_angle); #pragma pop /* 80BE2018-80BE2020 000090 0006+02 0/1 0/0 0/0 .rodata target_angle_x$4297 */ @@ -963,70 +968,70 @@ SECTION_RODATA static u8 const target_angle_x[6 + 2 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BE2018, &target_angle_x); +COMPILER_STRIP_GATE(0x80BE2018, &target_angle_x); #pragma pop /* 80BE2020-80BE2024 000098 0004+00 0/1 0/0 0/0 .rodata @4722 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4722 = 7.5f; -COMPILER_STRIP_GATE(80BE2020, &lit_4722); +COMPILER_STRIP_GATE(0x80BE2020, &lit_4722); #pragma pop /* 80BE2024-80BE2028 00009C 0004+00 0/1 0/0 0/0 .rodata @4723 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4723 = 2.0f / 5.0f; -COMPILER_STRIP_GATE(80BE2024, &lit_4723); +COMPILER_STRIP_GATE(0x80BE2024, &lit_4723); #pragma pop /* 80BE2028-80BE202C 0000A0 0004+00 0/1 0/0 0/0 .rodata @4724 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4724 = 2.5f; -COMPILER_STRIP_GATE(80BE2028, &lit_4724); +COMPILER_STRIP_GATE(0x80BE2028, &lit_4724); #pragma pop /* 80BE202C-80BE2030 0000A4 0004+00 0/1 0/0 0/0 .rodata @4725 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4725 = 30.0f; -COMPILER_STRIP_GATE(80BE202C, &lit_4725); +COMPILER_STRIP_GATE(0x80BE202C, &lit_4725); #pragma pop /* 80BE2030-80BE2034 0000A8 0004+00 0/1 0/0 0/0 .rodata @4726 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4726 = 60.0f; -COMPILER_STRIP_GATE(80BE2030, &lit_4726); +COMPILER_STRIP_GATE(0x80BE2030, &lit_4726); #pragma pop /* 80BE2034-80BE2038 0000AC 0004+00 0/1 0/0 0/0 .rodata @4727 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4727 = 0.5f; -COMPILER_STRIP_GATE(80BE2034, &lit_4727); +COMPILER_STRIP_GATE(0x80BE2034, &lit_4727); #pragma pop /* 80BE2038-80BE203C 0000B0 0004+00 0/1 0/0 0/0 .rodata @4728 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4728 = 5.0f; -COMPILER_STRIP_GATE(80BE2038, &lit_4728); +COMPILER_STRIP_GATE(0x80BE2038, &lit_4728); #pragma pop /* 80BE203C-80BE2040 0000B4 0004+00 0/1 0/0 0/0 .rodata @4729 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4729 = 500.0f; -COMPILER_STRIP_GATE(80BE203C, &lit_4729); +COMPILER_STRIP_GATE(0x80BE203C, &lit_4729); #pragma pop /* 80BE2040-80BE2044 0000B8 0004+00 0/1 0/0 0/0 .rodata @4730 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4730 = 10.0f; -COMPILER_STRIP_GATE(80BE2040, &lit_4730); +COMPILER_STRIP_GATE(0x80BE2040, &lit_4730); #pragma pop /* 80BE0C08-80BE18E0 000FA8 0CD8+00 1/0 0/0 0/0 .text modeWait__11daObjDrop_cFv */ @@ -1068,7 +1073,7 @@ asm void daObjDrop_c::actionOrderCompleteDemo() { /* ############################################################################################## */ /* 80BE2044-80BE2048 0000BC 0004+00 1/1 0/0 0/0 .rodata @4787 */ SECTION_RODATA static f32 const lit_4787 = 1.0f / 30.0f; -COMPILER_STRIP_GATE(80BE2044, &lit_4787); +COMPILER_STRIP_GATE(0x80BE2044, &lit_4787); /* 80BE19D0-80BE1ACC 001D70 00FC+00 1/0 0/0 0/0 .text actionCompleateDemo__11daObjDrop_cFv */ #pragma push @@ -1091,6 +1096,13 @@ asm void daObjDrop_c::actionWaitCompleteGetDemo() { } #pragma pop +/* ############################################################################################## */ +/* 80BE2048-80BE2048 0000C0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80BE2050 = "DEFAULT_GETITEM"; +#pragma pop + /* 80BE1B5C-80BE1BC4 001EFC 0068+00 1/0 0/0 0/0 .text actionCompleteGetDemo__11daObjDrop_cFv */ #pragma push #pragma optimization_level 0 @@ -1201,7 +1213,7 @@ asm cCcD_GStts::~cCcD_GStts() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80BE1F38(u8* param_0) { +extern "C" asm void func_80BE1F38(void* _this, u8* param_0) { nofralloc #include "asm/rel/d/a/obj/d_a_obj_drop/d_a_obj_drop/func_80BE1F38.s" } @@ -1211,7 +1223,7 @@ extern "C" asm void func_80BE1F38(u8* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80BE1F54(s8* param_0) { +extern "C" asm void func_80BE1F54(void* _this, s8* param_0) { nofralloc #include "asm/rel/d/a/obj/d_a_obj_drop/d_a_obj_drop/func_80BE1F54.s" } @@ -1237,10 +1249,4 @@ static asm void func_80BE1F78() { } #pragma pop -/* 80BE2048-80BE2060 0000C0 0018+00 2/2 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80BE2048 = "F_SP112"; -SECTION_DEAD static char const* const stringBase_80BE2050 = "DEFAULT_GETITEM"; -#pragma pop +/* 80BE2048-80BE2048 0000C0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_dust/d_a_obj_dust.cpp b/rel/d/a/obj/d_a_obj_dust/d_a_obj_dust.cpp index 3bd89a6d1ff..906f88862a5 100644 --- a/rel/d/a/obj/d_a_obj_dust/d_a_obj_dust.cpp +++ b/rel/d/a/obj/d_a_obj_dust/d_a_obj_dust.cpp @@ -104,10 +104,10 @@ struct dBgS_Acch { /* 80076AAC */ void CrrPos(dBgS&); }; -struct Vec {}; - struct JAISoundID {}; +struct Vec {}; + struct Z2SeMgr { /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); /* 802AC50C */ void seStartLevel(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); @@ -122,7 +122,7 @@ struct JMath { struct TSinCosTable {}; /* TSinCosTable<13, f32> */ struct TSinCosTable__template0 { - /* 80BE2F74 */ void func_80BE2F74(s16) /* const */; + /* 80BE2F74 */ void func_80BE2F74(void* _this, s16) /* const */; }; static u8 sincosTable_[65536]; @@ -151,7 +151,7 @@ extern "C" void Create__11daObjDust_cFv(); extern "C" void Execute__11daObjDust_cFPPA3_A4_f(); extern "C" void Draw__11daObjDust_cFv(); extern "C" void Delete__11daObjDust_cFv(); -extern "C" void func_80BE2F74(s16); +extern "C" void func_80BE2F74(void* _this, s16); extern "C" static void func_80BE2F80(); extern "C" static void func_80BE2F88(); extern "C" extern char const* const d_a_obj_dust__stringBase0; @@ -234,117 +234,117 @@ SECTION_RODATA static u8 const lit_3673[4 + 4 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BE2F98, &lit_3673); +COMPILER_STRIP_GATE(0x80BE2F98, &lit_3673); /* 80BE2FA0-80BE2FA8 000008 0008+00 1/3 0/0 0/0 .rodata @3675 */ SECTION_RODATA static u8 const lit_3675[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BE2FA0, &lit_3675); +COMPILER_STRIP_GATE(0x80BE2FA0, &lit_3675); /* 80BE2FA8-80BE2FAC 000010 0004+00 0/2 0/0 0/0 .rodata @3723 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3723 = 750.0f; -COMPILER_STRIP_GATE(80BE2FA8, &lit_3723); +COMPILER_STRIP_GATE(0x80BE2FA8, &lit_3723); #pragma pop /* 80BE2FAC-80BE2FB0 000014 0004+00 0/2 0/0 0/0 .rodata @3724 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3724 = -750.0f; -COMPILER_STRIP_GATE(80BE2FAC, &lit_3724); +COMPILER_STRIP_GATE(0x80BE2FAC, &lit_3724); #pragma pop /* 80BE2FB0-80BE2FB4 000018 0004+00 0/2 0/0 0/0 .rodata @3725 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3725 = 450.0f; -COMPILER_STRIP_GATE(80BE2FB0, &lit_3725); +COMPILER_STRIP_GATE(0x80BE2FB0, &lit_3725); #pragma pop /* 80BE2FB4-80BE2FB8 00001C 0004+00 0/2 0/0 0/0 .rodata @3726 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3726 = -450.0f; -COMPILER_STRIP_GATE(80BE2FB4, &lit_3726); +COMPILER_STRIP_GATE(0x80BE2FB4, &lit_3726); #pragma pop /* 80BE2FB8-80BE2FBC 000020 0004+00 0/1 0/0 0/0 .rodata @3727 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3727 = 600.0f; -COMPILER_STRIP_GATE(80BE2FB8, &lit_3727); +COMPILER_STRIP_GATE(0x80BE2FB8, &lit_3727); #pragma pop /* 80BE2FBC-80BE2FC0 000024 0004+00 0/1 0/0 0/0 .rodata @3728 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3728 = 256.0f; -COMPILER_STRIP_GATE(80BE2FBC, &lit_3728); +COMPILER_STRIP_GATE(0x80BE2FBC, &lit_3728); #pragma pop /* 80BE2FC0-80BE2FC4 000028 0004+00 0/1 0/0 0/0 .rodata @3729 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3729 = 16.0f; -COMPILER_STRIP_GATE(80BE2FC0, &lit_3729); +COMPILER_STRIP_GATE(0x80BE2FC0, &lit_3729); #pragma pop /* 80BE2FC4-80BE2FC8 00002C 0004+00 0/1 0/0 0/0 .rodata @3730 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3730 = 31.0f; -COMPILER_STRIP_GATE(80BE2FC4, &lit_3730); +COMPILER_STRIP_GATE(0x80BE2FC4, &lit_3730); #pragma pop /* 80BE2FC8-80BE2FCC 000030 0004+00 0/1 0/0 0/0 .rodata @3731 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3731 = -100.0f; -COMPILER_STRIP_GATE(80BE2FC8, &lit_3731); +COMPILER_STRIP_GATE(0x80BE2FC8, &lit_3731); #pragma pop /* 80BE2FCC-80BE2FD0 000034 0004+00 0/1 0/0 0/0 .rodata @3732 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3732 = 0.5f; -COMPILER_STRIP_GATE(80BE2FCC, &lit_3732); +COMPILER_STRIP_GATE(0x80BE2FCC, &lit_3732); #pragma pop /* 80BE2FD0-80BE2FD4 000038 0004+00 0/4 0/0 0/0 .rodata @3733 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3733 = 100.0f; -COMPILER_STRIP_GATE(80BE2FD0, &lit_3733); +COMPILER_STRIP_GATE(0x80BE2FD0, &lit_3733); #pragma pop /* 80BE2FD4-80BE2FD8 00003C 0004+00 0/2 0/0 0/0 .rodata @3734 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3734 = 300.0f; -COMPILER_STRIP_GATE(80BE2FD4, &lit_3734); +COMPILER_STRIP_GATE(0x80BE2FD4, &lit_3734); #pragma pop /* 80BE2FD8-80BE2FDC 000040 0004+00 0/1 0/0 0/0 .rodata @3735 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3735 = 1900.0f; -COMPILER_STRIP_GATE(80BE2FD8, &lit_3735); +COMPILER_STRIP_GATE(0x80BE2FD8, &lit_3735); #pragma pop /* 80BE2FDC-80BE2FE0 000044 0004+00 0/2 0/0 0/0 .rodata @3736 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3736 = 1.0f; -COMPILER_STRIP_GATE(80BE2FDC, &lit_3736); +COMPILER_STRIP_GATE(0x80BE2FDC, &lit_3736); #pragma pop /* 80BE2FE0-80BE2FE4 000048 0004+00 0/2 0/0 0/0 .rodata @3737 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3737 = -1.0f; -COMPILER_STRIP_GATE(80BE2FE0, &lit_3737); +COMPILER_STRIP_GATE(0x80BE2FE0, &lit_3737); #pragma pop /* 80BE30F8-80BE30FC 000000 0004+00 2/2 0/0 0/0 .bss e_ymb__26@unnamed@d_a_obj_dust_cpp@ @@ -380,7 +380,7 @@ asm void daObjDust_c::RideOn_Angle(s16& param_0, f32 param_1, s16 param_2, f32 p #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3775 = 1.0f / 20.0f; -COMPILER_STRIP_GATE(80BE2FE4, &lit_3775); +COMPILER_STRIP_GATE(0x80BE2FE4, &lit_3775); #pragma pop /* 80BE24F8-80BE2708 0002B8 0210+00 1/1 0/0 0/0 .text Check_RideOn__11daObjDust_cFv */ @@ -416,7 +416,7 @@ asm void daObjDust_c::setBaseMtx() { /* ############################################################################################## */ /* 80BE2FE8-80BE2FEC 000050 0004+00 1/1 0/0 0/0 .rodata @3817 */ SECTION_RODATA static f32 const lit_3817 = 30.0f; -COMPILER_STRIP_GATE(80BE2FE8, &lit_3817); +COMPILER_STRIP_GATE(0x80BE2FE8, &lit_3817); /* 80BE2790-80BE27BC 000550 002C+00 1/1 0/0 0/0 .text * rideCallBack__FP4dBgWP10fopAc_ac_cP10fopAc_ac_c */ @@ -472,35 +472,42 @@ static asm void daObjDust_Delete(daObjDust_c* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3885 = -200.0f; -COMPILER_STRIP_GATE(80BE2FEC, &lit_3885); +COMPILER_STRIP_GATE(0x80BE2FEC, &lit_3885); #pragma pop /* 80BE2FF0-80BE2FF4 000058 0004+00 0/1 0/0 0/0 .rodata @3886 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3886 = -50.0f; -COMPILER_STRIP_GATE(80BE2FF0, &lit_3886); +COMPILER_STRIP_GATE(0x80BE2FF0, &lit_3886); #pragma pop /* 80BE2FF4-80BE2FF8 00005C 0004+00 0/1 0/0 0/0 .rodata @3887 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3887 = 200.0f; -COMPILER_STRIP_GATE(80BE2FF4, &lit_3887); +COMPILER_STRIP_GATE(0x80BE2FF4, &lit_3887); #pragma pop /* 80BE2FF8-80BE2FFC 000060 0004+00 0/1 0/0 0/0 .rodata @3888 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3888 = 50.0f; -COMPILER_STRIP_GATE(80BE2FF8, &lit_3888); +COMPILER_STRIP_GATE(0x80BE2FF8, &lit_3888); #pragma pop /* 80BE2FFC-80BE3000 000064 0004+00 0/1 0/0 0/0 .rodata @3889 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3889 = -18850.0f; -COMPILER_STRIP_GATE(80BE2FFC, &lit_3889); +COMPILER_STRIP_GATE(0x80BE2FFC, &lit_3889); +#pragma pop + +/* 80BE3020-80BE3020 000088 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80BE3020 = "M_Dust"; +SECTION_DEAD static char const* const stringBase_80BE3027 = "M_FloatingDust01.dzb"; #pragma pop /* 80BE3054-80BE3058 -00001 0004+00 3/3 0/0 0/0 .data l_arcName */ @@ -575,6 +582,13 @@ asm dBgS_ObjAcch::~dBgS_ObjAcch() { } #pragma pop +/* ############################################################################################## */ +/* 80BE3020-80BE3020 000088 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80BE303C = "M_FloatingDust01.bmd"; +#pragma pop + /* 80BE2A70-80BE2AE8 000830 0078+00 1/0 0/0 0/0 .text CreateHeap__11daObjDust_cFv */ #pragma push #pragma optimization_level 0 @@ -600,56 +614,56 @@ asm void daObjDust_c::Create() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3963 = 768.0f; -COMPILER_STRIP_GATE(80BE3000, &lit_3963); +COMPILER_STRIP_GATE(0x80BE3000, &lit_3963); #pragma pop /* 80BE3004-80BE3008 00006C 0004+00 0/1 0/0 0/0 .rodata @3964 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3964 = 2.0f; -COMPILER_STRIP_GATE(80BE3004, &lit_3964); +COMPILER_STRIP_GATE(0x80BE3004, &lit_3964); #pragma pop /* 80BE3008-80BE300C 000070 0004+00 0/1 0/0 0/0 .rodata @3965 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3965 = 40.0f; -COMPILER_STRIP_GATE(80BE3008, &lit_3965); +COMPILER_STRIP_GATE(0x80BE3008, &lit_3965); #pragma pop /* 80BE300C-80BE3010 000074 0004+00 0/1 0/0 0/0 .rodata @3966 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3966 = 80.0f; -COMPILER_STRIP_GATE(80BE300C, &lit_3966); +COMPILER_STRIP_GATE(0x80BE300C, &lit_3966); #pragma pop /* 80BE3010-80BE3014 000078 0004+00 0/1 0/0 0/0 .rodata @3967 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3967 = 20.0f; -COMPILER_STRIP_GATE(80BE3010, &lit_3967); +COMPILER_STRIP_GATE(0x80BE3010, &lit_3967); #pragma pop /* 80BE3014-80BE3018 00007C 0004+00 0/1 0/0 0/0 .rodata @3968 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3968 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(80BE3014, &lit_3968); +COMPILER_STRIP_GATE(0x80BE3014, &lit_3968); #pragma pop /* 80BE3018-80BE301C 000080 0004+00 0/1 0/0 0/0 .rodata @3969 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3969 = 15.0f; -COMPILER_STRIP_GATE(80BE3018, &lit_3969); +COMPILER_STRIP_GATE(0x80BE3018, &lit_3969); #pragma pop /* 80BE301C-80BE3020 000084 0004+00 0/1 0/0 0/0 .rodata @3970 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3970 = 1.0f / 100.0f; -COMPILER_STRIP_GATE(80BE301C, &lit_3970); +COMPILER_STRIP_GATE(0x80BE301C, &lit_3970); #pragma pop /* 80BE2B30-80BE2E9C 0008F0 036C+00 1/0 0/0 0/0 .text Execute__11daObjDust_cFPPA3_A4_f */ @@ -686,7 +700,7 @@ asm void daObjDust_c::Delete() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80BE2F74(s16 param_0) /* const */ { +extern "C" asm void func_80BE2F74(void* _this, s16 param_0) /* const */ { nofralloc #include "asm/rel/d/a/obj/d_a_obj_dust/d_a_obj_dust/func_80BE2F74.s" } @@ -712,11 +726,4 @@ static asm void func_80BE2F88() { } #pragma pop -/* 80BE3020-80BE3051 000088 0031+00 3/2 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80BE3020 = "M_Dust"; -SECTION_DEAD static char const* const stringBase_80BE3027 = "M_FloatingDust01.dzb"; -SECTION_DEAD static char const* const stringBase_80BE303C = "M_FloatingDust01.bmd"; -#pragma pop +/* 80BE3020-80BE3020 000088 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_eff/d_a_obj_eff.cpp b/rel/d/a/obj/d_a_obj_eff/d_a_obj_eff.cpp index 79d25c3b2db..744da441a2f 100644 --- a/rel/d/a/obj/d_a_obj_eff/d_a_obj_eff.cpp +++ b/rel/d/a/obj/d_a_obj_eff/d_a_obj_eff.cpp @@ -27,18 +27,19 @@ struct daObj { template void PrmAbstract(/* ... */); /* 8057CAD4 */ /* daObj::PrmAbstract */ - void func_8057CAD4(fopAc_ac_c const*, daObjEff::Act_c::Prm_e, daObjEff::Act_c::Prm_e); + void func_8057CAD4(void* _this, fopAc_ac_c const*, daObjEff::Act_c::Prm_e, + daObjEff::Act_c::Prm_e); }; struct dPa_levelEcallBack {}; -struct cXyz {}; - struct dKy_tevstr_c {}; +struct csXyz {}; + struct _GXColor {}; -struct csXyz {}; +struct cXyz {}; struct dPa_control_c { /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, @@ -56,7 +57,8 @@ extern "C" static bool func_8057CAB4(); extern "C" static bool func_8057CABC(); extern "C" static bool func_8057CAC4(); extern "C" static bool func_8057CACC(); -extern "C" void func_8057CAD4(fopAc_ac_c const*, daObjEff::Act_c::Prm_e, daObjEff::Act_c::Prm_e); +extern "C" void func_8057CAD4(void* _this, fopAc_ac_c const*, daObjEff::Act_c::Prm_e, + daObjEff::Act_c::Prm_e); extern "C" extern void* g_profile_Obj_Eff[12]; // @@ -82,7 +84,7 @@ SECTION_RODATA static u8 const lit_3648[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(8057CAF8, &lit_3648); +COMPILER_STRIP_GATE(0x8057CAF8, &lit_3648); /* 8057C9D8-8057CA94 000078 00BC+00 1/1 0/0 0/0 .text _create__Q28daObjEff5Act_cFv */ #pragma push @@ -135,8 +137,8 @@ static bool func_8057CACC() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_8057CAD4(fopAc_ac_c const* param_0, daObjEff::Act_c::Prm_e param_1, - daObjEff::Act_c::Prm_e param_2) { +extern "C" asm void func_8057CAD4(void* _this, fopAc_ac_c const* param_0, + daObjEff::Act_c::Prm_e param_1, daObjEff::Act_c::Prm_e param_2) { nofralloc #include "asm/rel/d/a/obj/d_a_obj_eff/d_a_obj_eff/func_8057CAD4.s" } diff --git a/rel/d/a/obj/d_a_obj_enemy_create/d_a_obj_enemy_create.cpp b/rel/d/a/obj/d_a_obj_enemy_create/d_a_obj_enemy_create.cpp index db35fc330de..3576c1b03fa 100644 --- a/rel/d/a/obj/d_a_obj_enemy_create/d_a_obj_enemy_create.cpp +++ b/rel/d/a/obj/d_a_obj_enemy_create/d_a_obj_enemy_create.cpp @@ -105,13 +105,13 @@ SECTION_RODATA static u8 const lit_3720[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BE3888, &lit_3720); +COMPILER_STRIP_GATE(0x80BE3888, &lit_3720); /* 80BE388C-80BE3890 000004 0004+00 0/1 0/0 0/0 .rodata @3721 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3721 = 100.0f; -COMPILER_STRIP_GATE(80BE388C, &lit_3721); +COMPILER_STRIP_GATE(0x80BE388C, &lit_3721); #pragma pop /* 80BE3890-80BE3898 000008 0004+04 0/1 0/0 0/0 .rodata @3722 */ @@ -122,7 +122,7 @@ SECTION_RODATA static f32 const lit_3722[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80BE3890, &lit_3722); +COMPILER_STRIP_GATE(0x80BE3890, &lit_3722); #pragma pop /* 80BE3898-80BE38A0 000010 0008+00 0/1 0/0 0/0 .rodata @3724 */ @@ -131,7 +131,7 @@ COMPILER_STRIP_GATE(80BE3890, &lit_3722); SECTION_RODATA static u8 const lit_3724[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BE3898, &lit_3724); +COMPILER_STRIP_GATE(0x80BE3898, &lit_3724); #pragma pop /* 80BE31BC-80BE345C 0000BC 02A0+00 3/3 0/0 0/0 .text NormalAction__15daObjE_CREATE_cFv diff --git a/rel/d/a/obj/d_a_obj_fallobj/d_a_obj_fallobj.cpp b/rel/d/a/obj/d_a_obj_fallobj/d_a_obj_fallobj.cpp index 0f50b944bd7..48a44f7d776 100644 --- a/rel/d/a/obj/d_a_obj_fallobj/d_a_obj_fallobj.cpp +++ b/rel/d/a/obj/d_a_obj_fallobj/d_a_obj_fallobj.cpp @@ -139,8 +139,8 @@ extern "C" static void daObjFallObj_create1st__FP14daObjFallObj_c(); extern "C" static void daObjFallObj_MoveBGDelete__FP14daObjFallObj_c(); extern "C" static void daObjFallObj_MoveBGExecute__FP14daObjFallObj_c(); extern "C" static void daObjFallObj_MoveBGDraw__FP14daObjFallObj_c(); -extern "C" void func_80BE4A70(s16*); -extern "C" void func_80BE4A8C(u8*); +extern "C" void func_80BE4A70(void* _this, s16*); +extern "C" void func_80BE4A8C(void* _this, u8*); extern "C" extern char const* const d_a_obj_fallobj__stringBase0; // @@ -231,20 +231,26 @@ SECTION_RODATA static u8 const lit_3677[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BE4AB0, &lit_3677); +COMPILER_STRIP_GATE(0x80BE4AB0, &lit_3677); /* 80BE4AB4-80BE4AB8 000004 0004+00 0/1 0/0 0/0 .rodata @3678 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3678 = -300.0f; -COMPILER_STRIP_GATE(80BE4AB4, &lit_3678); +COMPILER_STRIP_GATE(0x80BE4AB4, &lit_3678); #pragma pop /* 80BE4AB8-80BE4ABC 000008 0004+00 0/1 0/0 0/0 .rodata @3679 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3679 = -6.0f; -COMPILER_STRIP_GATE(80BE4AB8, &lit_3679); +COMPILER_STRIP_GATE(0x80BE4AB8, &lit_3679); +#pragma pop + +/* 80BE4B14-80BE4B14 000064 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80BE4B14 = "K_drock00"; #pragma pop /* 80BE4B20-80BE4B24 -00001 0004+00 3/3 0/0 0/0 .data l_arcName */ @@ -281,19 +287,19 @@ asm void daObjFallObj_c::getFallTime() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3705 = 450.0f; -COMPILER_STRIP_GATE(80BE4ABC, &lit_3705); +COMPILER_STRIP_GATE(0x80BE4ABC, &lit_3705); #pragma pop /* 80BE4AC0-80BE4AC4 000010 0004+00 0/2 0/0 0/0 .rodata @3706 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3706 = 300.0f; -COMPILER_STRIP_GATE(80BE4AC0, &lit_3706); +COMPILER_STRIP_GATE(0x80BE4AC0, &lit_3706); #pragma pop /* 80BE4AC4-80BE4AC8 000014 0004+00 1/2 0/0 0/0 .rodata @3707 */ SECTION_RODATA static f32 const lit_3707 = 50.0f; -COMPILER_STRIP_GATE(80BE4AC4, &lit_3707); +COMPILER_STRIP_GATE(0x80BE4AC4, &lit_3707); /* 80BE4AC8-80BE4AD0 000018 0008+00 0/1 0/0 0/0 .rodata @3709 */ #pragma push @@ -301,7 +307,7 @@ COMPILER_STRIP_GATE(80BE4AC4, &lit_3707); SECTION_RODATA static u8 const lit_3709[8] = { 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BE4AC8, &lit_3709); +COMPILER_STRIP_GATE(0x80BE4AC8, &lit_3709); #pragma pop /* 80BE3BD4-80BE3C28 000294 0054+00 1/1 0/0 0/0 .text getFallHeight__14daObjFallObj_cFv @@ -340,14 +346,14 @@ asm void daObjFallObj_c::create1st() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3818 = 150.0f; -COMPILER_STRIP_GATE(80BE4AD0, &lit_3818); +COMPILER_STRIP_GATE(0x80BE4AD0, &lit_3818); #pragma pop /* 80BE4AD4-80BE4AD8 000024 0004+00 0/1 0/0 0/0 .rodata @3819 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3819 = 160.0f; -COMPILER_STRIP_GATE(80BE4AD4, &lit_3819); +COMPILER_STRIP_GATE(0x80BE4AD4, &lit_3819); #pragma pop /* 80BE4AD8-80BE4AE0 000028 0008+00 0/1 0/0 0/0 .rodata @3820 */ @@ -356,7 +362,7 @@ COMPILER_STRIP_GATE(80BE4AD4, &lit_3819); SECTION_RODATA static u8 const lit_3820[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BE4AD8, &lit_3820); +COMPILER_STRIP_GATE(0x80BE4AD8, &lit_3820); #pragma pop /* 80BE4AE0-80BE4AE8 000030 0008+00 0/1 0/0 0/0 .rodata @3821 */ @@ -365,7 +371,7 @@ COMPILER_STRIP_GATE(80BE4AD8, &lit_3820); SECTION_RODATA static u8 const lit_3821[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BE4AE0, &lit_3821); +COMPILER_STRIP_GATE(0x80BE4AE0, &lit_3821); #pragma pop /* 80BE4AE8-80BE4AF0 000038 0008+00 0/1 0/0 0/0 .rodata @3822 */ @@ -374,14 +380,14 @@ COMPILER_STRIP_GATE(80BE4AE0, &lit_3821); SECTION_RODATA static u8 const lit_3822[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BE4AE8, &lit_3822); +COMPILER_STRIP_GATE(0x80BE4AE8, &lit_3822); #pragma pop /* 80BE4AF0-80BE4AF4 000040 0004+00 0/1 0/0 0/0 .rodata @3823 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3823 = 2150.0f; -COMPILER_STRIP_GATE(80BE4AF0, &lit_3823); +COMPILER_STRIP_GATE(0x80BE4AF0, &lit_3823); #pragma pop /* 80BE3D24-80BE4138 0003E4 0414+00 1/0 0/0 0/0 .text Execute__14daObjFallObj_cFPPA3_A4_f @@ -420,7 +426,7 @@ asm void daObjFallObj_c::action_wait(bool param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3882 = -25.0f; -COMPILER_STRIP_GATE(80BE4AF4, &lit_3882); +COMPILER_STRIP_GATE(0x80BE4AF4, &lit_3882); #pragma pop /* 80BE4AF8-80BE4B00 000048 0004+04 0/1 0/0 0/0 .rodata @3883 */ @@ -431,7 +437,7 @@ SECTION_RODATA static f32 const lit_3883[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80BE4AF8, &lit_3883); +COMPILER_STRIP_GATE(0x80BE4AF8, &lit_3883); #pragma pop /* 80BE42C0-80BE43E4 000980 0124+00 1/1 0/0 0/0 .text action_fallStart__14daObjFallObj_cFv */ @@ -449,7 +455,7 @@ asm void daObjFallObj_c::action_fallStart() { SECTION_RODATA static u8 const lit_3930[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BE4B00, &lit_3930); +COMPILER_STRIP_GATE(0x80BE4B00, &lit_3930); /* 80BE43E4-80BE45F4 000AA4 0210+00 1/1 0/0 0/0 .text action_countdown__14daObjFallObj_cFv */ #pragma push @@ -464,7 +470,7 @@ asm void daObjFallObj_c::action_countdown() { /* ############################################################################################## */ /* 80BE4B08-80BE4B0C 000058 0004+00 2/2 0/0 0/0 .rodata @3949 */ SECTION_RODATA static f32 const lit_3949 = 10000.0f; -COMPILER_STRIP_GATE(80BE4B08, &lit_3949); +COMPILER_STRIP_GATE(0x80BE4B08, &lit_3949); /* 80BE45F4-80BE466C 000CB4 0078+00 1/1 0/0 0/0 .text action_fall__14daObjFallObj_cFv */ #pragma push @@ -496,14 +502,14 @@ asm void daObjFallObj_c::action_follow_fall() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3990 = 250.0f; -COMPILER_STRIP_GATE(80BE4B0C, &lit_3990); +COMPILER_STRIP_GATE(0x80BE4B0C, &lit_3990); #pragma pop /* 80BE4B10-80BE4B14 000060 0004+00 0/1 0/0 0/0 .rodata @3991 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3991 = 100.0f; -COMPILER_STRIP_GATE(80BE4B10, &lit_3991); +COMPILER_STRIP_GATE(0x80BE4B10, &lit_3991); #pragma pop /* 80BE4700-80BE47A0 000DC0 00A0+00 2/2 0/0 0/0 .text checkHang__14daObjFallObj_cFv */ @@ -631,7 +637,7 @@ static asm void daObjFallObj_MoveBGDraw(daObjFallObj_c* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80BE4A70(s16* param_0) { +extern "C" asm void func_80BE4A70(void* _this, s16* param_0) { nofralloc #include "asm/rel/d/a/obj/d_a_obj_fallobj/d_a_obj_fallobj/func_80BE4A70.s" } @@ -641,15 +647,10 @@ extern "C" asm void func_80BE4A70(s16* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80BE4A8C(u8* param_0) { +extern "C" asm void func_80BE4A8C(void* _this, u8* param_0) { nofralloc #include "asm/rel/d/a/obj/d_a_obj_fallobj/d_a_obj_fallobj/func_80BE4A8C.s" } #pragma pop -/* 80BE4B14-80BE4B1E 000064 000A+00 1/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80BE4B14 = "K_drock00"; -#pragma pop +/* 80BE4B14-80BE4B14 000064 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_fan/d_a_obj_fan.cpp b/rel/d/a/obj/d_a_obj_fan/d_a_obj_fan.cpp index ba9ca41d6bc..f007e8b1e08 100644 --- a/rel/d/a/obj/d_a_obj_fan/d_a_obj_fan.cpp +++ b/rel/d/a/obj/d_a_obj_fan/d_a_obj_fan.cpp @@ -133,10 +133,10 @@ struct cBgS { /* 80074250 */ void Release(dBgW_Base*); }; -struct Vec {}; - struct JAISoundID {}; +struct Vec {}; + struct Z2SeMgr { /* 802AC50C */ void seStartLevel(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); }; @@ -255,19 +255,19 @@ extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; SECTION_RODATA static u8 const l_bmd[12] = { 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x04, }; -COMPILER_STRIP_GATE(80BE5D80, &l_bmd); +COMPILER_STRIP_GATE(0x80BE5D80, &l_bmd); /* 80BE5D8C-80BE5D98 00000C 000C+00 1/1 0/0 0/0 .rodata l_dzb2 */ SECTION_RODATA static u8 const l_dzb2[12] = { 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x08, }; -COMPILER_STRIP_GATE(80BE5D8C, &l_dzb2); +COMPILER_STRIP_GATE(0x80BE5D8C, &l_dzb2); /* 80BE5D98-80BE5DA4 000018 000C+00 1/1 0/0 0/0 .rodata l_dzb3 */ SECTION_RODATA static u8 const l_dzb3[12] = { 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x09, }; -COMPILER_STRIP_GATE(80BE5D98, &l_dzb3); +COMPILER_STRIP_GATE(0x80BE5D98, &l_dzb3); /* 80BE5DA4-80BE5DB0 000024 000C+00 0/1 0/0 0/0 .rodata l_se */ #pragma push @@ -275,7 +275,7 @@ COMPILER_STRIP_GATE(80BE5D98, &l_dzb3); SECTION_RODATA static u8 const l_se[12] = { 0x00, 0x08, 0x02, 0x61, 0x00, 0x08, 0x02, 0x62, 0x00, 0x08, 0x02, 0x63, }; -COMPILER_STRIP_GATE(80BE5DA4, &l_se); +COMPILER_STRIP_GATE(0x80BE5DA4, &l_se); #pragma pop /* 80BE5DB0-80BE5DBC 000030 000C+00 0/1 0/0 0/0 .rodata l_wind_se */ @@ -284,7 +284,7 @@ COMPILER_STRIP_GATE(80BE5DA4, &l_se); SECTION_RODATA static u8 const l_wind_se[12] = { 0x00, 0x08, 0x02, 0x64, 0x00, 0x08, 0x02, 0x65, 0x00, 0x08, 0x02, 0x66, }; -COMPILER_STRIP_GATE(80BE5DB0, &l_wind_se); +COMPILER_STRIP_GATE(0x80BE5DB0, &l_wind_se); #pragma pop /* 80BE5DBC-80BE5DC4 00003C 0006+02 1/2 0/0 0/0 .rodata l_max_rotspeed */ @@ -299,13 +299,13 @@ SECTION_RODATA static u8 const l_max_rotspeed[6 + 2 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BE5DBC, &l_max_rotspeed); +COMPILER_STRIP_GATE(0x80BE5DBC, &l_max_rotspeed); /* 80BE5DC4-80BE5DD0 000044 000C+00 1/1 0/0 0/0 .rodata l_heap_size */ SECTION_RODATA static u8 const l_heap_size[12] = { 0x00, 0x00, 0x16, 0x80, 0x00, 0x00, 0x9A, 0xA0, 0x00, 0x00, 0x7E, 0x80, }; -COMPILER_STRIP_GATE(80BE5DC4, &l_heap_size); +COMPILER_STRIP_GATE(0x80BE5DC4, &l_heap_size); /* 80BE5DD0-80BE5E10 000050 0040+00 1/1 0/0 0/0 .rodata l_sph_src */ SECTION_RODATA static u8 const l_sph_src[64] = { @@ -314,7 +314,7 @@ SECTION_RODATA static u8 const l_sph_src[64] = { 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x43, 0x16, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BE5DD0, &l_sph_src); +COMPILER_STRIP_GATE(0x80BE5DD0, &l_sph_src); /* 80BE5E10-80BE5E18 000090 0004+04 0/2 0/0 0/0 .rodata @3682 */ #pragma push @@ -330,7 +330,7 @@ SECTION_RODATA static u8 const lit_3682[4 + 4 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BE5E10, &lit_3682); +COMPILER_STRIP_GATE(0x80BE5E10, &lit_3682); #pragma pop /* 80BE5E18-80BE5E20 000098 0008+00 0/1 0/0 0/0 .rodata @3683 */ @@ -339,7 +339,7 @@ COMPILER_STRIP_GATE(80BE5E10, &lit_3682); SECTION_RODATA static u8 const lit_3683[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BE5E18, &lit_3683); +COMPILER_STRIP_GATE(0x80BE5E18, &lit_3683); #pragma pop /* 80BE5E20-80BE5E28 0000A0 0008+00 0/1 0/0 0/0 .rodata @3684 */ @@ -348,7 +348,7 @@ COMPILER_STRIP_GATE(80BE5E18, &lit_3683); SECTION_RODATA static u8 const lit_3684[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BE5E20, &lit_3684); +COMPILER_STRIP_GATE(0x80BE5E20, &lit_3684); #pragma pop /* 80BE5E28-80BE5E30 0000A8 0008+00 0/1 0/0 0/0 .rodata @3685 */ @@ -357,14 +357,14 @@ COMPILER_STRIP_GATE(80BE5E20, &lit_3684); SECTION_RODATA static u8 const lit_3685[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BE5E28, &lit_3685); +COMPILER_STRIP_GATE(0x80BE5E28, &lit_3685); #pragma pop /* 80BE5E30-80BE5E34 0000B0 0004+00 0/1 0/0 0/0 .rodata @3686 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3686 = 100.0f; -COMPILER_STRIP_GATE(80BE5E30, &lit_3686); +COMPILER_STRIP_GATE(0x80BE5E30, &lit_3686); #pragma pop /* 80BE4C38-80BE4D98 000078 0160+00 1/1 0/0 0/0 .text searchTornado2__FPvPv */ @@ -418,6 +418,14 @@ asm void daObjFan_c::Create() { #pragma pop /* ############################################################################################## */ +/* 80BE5E58-80BE5E58 0000D8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80BE5E58 = "Obj_prop1"; +SECTION_DEAD static char const* const stringBase_80BE5E62 = "Obj_prop0"; +SECTION_DEAD static char const* const stringBase_80BE5E6C = "Obj_prop2"; +#pragma pop + /* 80BE5E78-80BE5E84 -00001 000C+00 3/3 0/0 0/0 .data l_arcName */ SECTION_DATA static void* l_arcName[3] = { (void*)&d_a_obj_fan__stringBase0, @@ -448,13 +456,13 @@ asm void daObjFan_c::create1st() { /* ############################################################################################## */ /* 80BE5E34-80BE5E38 0000B4 0004+00 1/1 0/0 0/0 .rodata @3813 */ SECTION_RODATA static f32 const lit_3813 = 0.5f; -COMPILER_STRIP_GATE(80BE5E34, &lit_3813); +COMPILER_STRIP_GATE(0x80BE5E34, &lit_3813); /* 80BE5E38-80BE5E40 0000B8 0008+00 1/2 0/0 0/0 .rodata @3815 */ SECTION_RODATA static u8 const lit_3815[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BE5E38, &lit_3815); +COMPILER_STRIP_GATE(0x80BE5E38, &lit_3815); /* 80BE519C-80BE538C 0005DC 01F0+00 1/0 0/0 0/0 .text Execute__10daObjFan_cFPPA3_A4_f */ #pragma push @@ -471,28 +479,28 @@ asm void daObjFan_c::Execute(f32 (**param_0)[3][4]) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3929 = 1.0f / 50.0f; -COMPILER_STRIP_GATE(80BE5E40, &lit_3929); +COMPILER_STRIP_GATE(0x80BE5E40, &lit_3929); #pragma pop /* 80BE5E44-80BE5E48 0000C4 0004+00 0/1 0/0 0/0 .rodata @3930 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3930 = 127.0f; -COMPILER_STRIP_GATE(80BE5E44, &lit_3930); +COMPILER_STRIP_GATE(0x80BE5E44, &lit_3930); #pragma pop /* 80BE5E48-80BE5E4C 0000C8 0004+00 0/1 0/0 0/0 .rodata @3931 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3931 = 1.0f; -COMPILER_STRIP_GATE(80BE5E48, &lit_3931); +COMPILER_STRIP_GATE(0x80BE5E48, &lit_3931); #pragma pop /* 80BE5E4C-80BE5E50 0000CC 0004+00 0/1 0/0 0/0 .rodata @3932 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3932 = -1.0f; -COMPILER_STRIP_GATE(80BE5E4C, &lit_3932); +COMPILER_STRIP_GATE(0x80BE5E4C, &lit_3932); #pragma pop /* 80BE538C-80BE583C 0007CC 04B0+00 1/1 0/0 0/0 .text action__10daObjFan_cFv */ @@ -508,11 +516,11 @@ asm void daObjFan_c::action() { /* ############################################################################################## */ /* 80BE5E50-80BE5E54 0000D0 0004+00 1/1 0/0 0/0 .rodata @3964 */ SECTION_RODATA static f32 const lit_3964 = 150.0f; -COMPILER_STRIP_GATE(80BE5E50, &lit_3964); +COMPILER_STRIP_GATE(0x80BE5E50, &lit_3964); /* 80BE5E54-80BE5E58 0000D4 0004+00 1/1 0/0 0/0 .rodata @3965 */ SECTION_RODATA static f32 const lit_3965 = 300.0f; -COMPILER_STRIP_GATE(80BE5E54, &lit_3965); +COMPILER_STRIP_GATE(0x80BE5E54, &lit_3965); /* 80BE5E84-80BE5EB4 00000C 0030+00 1/1 0/0 0/0 .data l_offset_posM$3940 */ SECTION_DATA static u8 l_offset_posM[48] = { @@ -691,11 +699,4 @@ static asm void daObjFan_MoveBGDraw(daObjFan_c* param_0) { } #pragma pop -/* 80BE5E58-80BE5E76 0000D8 001E+00 1/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80BE5E58 = "Obj_prop1"; -SECTION_DEAD static char const* const stringBase_80BE5E62 = "Obj_prop0"; -SECTION_DEAD static char const* const stringBase_80BE5E6C = "Obj_prop2"; -#pragma pop +/* 80BE5E58-80BE5E58 0000D8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_fchain/d_a_obj_fchain.cpp b/rel/d/a/obj/d_a_obj_fchain/d_a_obj_fchain.cpp index f97707372de..05458adde88 100644 --- a/rel/d/a/obj/d_a_obj_fchain/d_a_obj_fchain.cpp +++ b/rel/d/a/obj/d_a_obj_fchain/d_a_obj_fchain.cpp @@ -203,7 +203,7 @@ SECTION_RODATA static u8 const l_arcName[7 + 1 /* padding */] = { /* padding */ 0x00, }; -COMPILER_STRIP_GATE(80BE7438, &l_arcName); +COMPILER_STRIP_GATE(0x80BE7438, &l_arcName); /* 80BE5FF8-80BE6054 000078 005C+00 1/1 0/0 0/0 .text createHeap__13daObjFchain_cFv */ #pragma push @@ -232,70 +232,70 @@ static asm void daObjFchain_createHeap(fopAc_ac_c* param_0) { SECTION_RODATA static u8 const localVec[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC1, 0x10, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BE7440, &localVec); +COMPILER_STRIP_GATE(0x80BE7440, &localVec); #pragma pop /* 80BE744C-80BE7450 000014 0004+00 0/2 0/0 0/0 .rodata @3710 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3710 = 3.0f; -COMPILER_STRIP_GATE(80BE744C, &lit_3710); +COMPILER_STRIP_GATE(0x80BE744C, &lit_3710); #pragma pop /* 80BE7450-80BE7454 000018 0004+00 0/2 0/0 0/0 .rodata @3711 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3711 = 4096.0f; -COMPILER_STRIP_GATE(80BE7450, &lit_3711); +COMPILER_STRIP_GATE(0x80BE7450, &lit_3711); #pragma pop /* 80BE7454-80BE7458 00001C 0004+00 0/2 0/0 0/0 .rodata @3712 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3712 = 2048.0f; -COMPILER_STRIP_GATE(80BE7454, &lit_3712); +COMPILER_STRIP_GATE(0x80BE7454, &lit_3712); #pragma pop /* 80BE7458-80BE745C 000020 0004+00 0/2 0/0 0/0 .rodata @3713 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3713 = -4096.0f; -COMPILER_STRIP_GATE(80BE7458, &lit_3713); +COMPILER_STRIP_GATE(0x80BE7458, &lit_3713); #pragma pop /* 80BE745C-80BE7460 000024 0004+00 0/3 0/0 0/0 .rodata @3714 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3714 = 1.0f; -COMPILER_STRIP_GATE(80BE745C, &lit_3714); +COMPILER_STRIP_GATE(0x80BE745C, &lit_3714); #pragma pop /* 80BE7460-80BE7464 000028 0004+00 0/2 0/0 0/0 .rodata @3715 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3715 = -1.0f; -COMPILER_STRIP_GATE(80BE7460, &lit_3715); +COMPILER_STRIP_GATE(0x80BE7460, &lit_3715); #pragma pop /* 80BE7464-80BE7468 00002C 0004+00 0/2 0/0 0/0 .rodata @3716 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3716 = 0.5f; -COMPILER_STRIP_GATE(80BE7464, &lit_3716); +COMPILER_STRIP_GATE(0x80BE7464, &lit_3716); #pragma pop /* 80BE7468-80BE746C 000030 0004+00 0/1 0/0 0/0 .rodata @3717 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3717 = 1024.0f; -COMPILER_STRIP_GATE(80BE7468, &lit_3717); +COMPILER_STRIP_GATE(0x80BE7468, &lit_3717); #pragma pop /* 80BE746C-80BE7470 000034 0004+00 0/1 0/0 0/0 .rodata @3718 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3718 = 3072.0f; -COMPILER_STRIP_GATE(80BE746C, &lit_3718); +COMPILER_STRIP_GATE(0x80BE746C, &lit_3718); #pragma pop /* 80BE7470-80BE7478 000038 0008+00 0/2 0/0 0/0 .rodata @3720 */ @@ -304,7 +304,7 @@ COMPILER_STRIP_GATE(80BE746C, &lit_3718); SECTION_RODATA static u8 const lit_3720[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BE7470, &lit_3720); +COMPILER_STRIP_GATE(0x80BE7470, &lit_3720); #pragma pop /* 80BE74D8-80BE74F8 -00001 0020+00 1/0 0/0 0/0 .data l_daObjFchain_Method */ @@ -424,7 +424,7 @@ SECTION_RODATA static u8 const lit_3809[4 + 4 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BE7478, &lit_3809); +COMPILER_STRIP_GATE(0x80BE7478, &lit_3809); #pragma pop /* 80BE7480-80BE7488 000048 0008+00 0/3 0/0 0/0 .rodata @3810 */ @@ -433,7 +433,7 @@ COMPILER_STRIP_GATE(80BE7478, &lit_3809); SECTION_RODATA static u8 const lit_3810[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BE7480, &lit_3810); +COMPILER_STRIP_GATE(0x80BE7480, &lit_3810); #pragma pop /* 80BE7488-80BE7490 000050 0008+00 0/3 0/0 0/0 .rodata @3811 */ @@ -442,7 +442,7 @@ COMPILER_STRIP_GATE(80BE7480, &lit_3810); SECTION_RODATA static u8 const lit_3811[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BE7488, &lit_3811); +COMPILER_STRIP_GATE(0x80BE7488, &lit_3811); #pragma pop /* 80BE7490-80BE7498 000058 0008+00 0/3 0/0 0/0 .rodata @3812 */ @@ -451,21 +451,21 @@ COMPILER_STRIP_GATE(80BE7488, &lit_3811); SECTION_RODATA static u8 const lit_3812[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BE7490, &lit_3812); +COMPILER_STRIP_GATE(0x80BE7490, &lit_3812); #pragma pop /* 80BE7498-80BE749C 000060 0004+00 0/1 0/0 0/0 .rodata @3813 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3813 = 5.0f; -COMPILER_STRIP_GATE(80BE7498, &lit_3813); +COMPILER_STRIP_GATE(0x80BE7498, &lit_3813); #pragma pop /* 80BE749C-80BE74A0 000064 0004+00 0/1 0/0 0/0 .rodata @3814 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3814 = 20.0f; -COMPILER_STRIP_GATE(80BE749C, &lit_3814); +COMPILER_STRIP_GATE(0x80BE749C, &lit_3814); #pragma pop /* 80BE64E0-80BE66B4 000560 01D4+00 1/1 0/0 0/0 .text @@ -484,7 +484,7 @@ asm void daObjFchain_c::checkPlayerFoot(cXyz const* param_0, cXyz const* param_1 #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3857 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(80BE74A0, &lit_3857); +COMPILER_STRIP_GATE(0x80BE74A0, &lit_3857); #pragma pop /* 80BE66B4-80BE6868 000734 01B4+00 1/1 0/0 0/0 .text setGroundVec__13daObjFchain_cFP4cXyzf */ @@ -504,56 +504,62 @@ asm void daObjFchain_c::setGroundVec(cXyz* param_0, f32 param_1) { SECTION_RODATA static u8 const wolfChainBaseOffset[12] = { 0x41, 0xB0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC1, 0x40, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BE74A4, &wolfChainBaseOffset); +COMPILER_STRIP_GATE(0x80BE74A4, &wolfChainBaseOffset); #pragma pop /* 80BE74B0-80BE74B4 000078 0004+00 0/1 0/0 0/0 .rodata @4159 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4159 = -1.5f; -COMPILER_STRIP_GATE(80BE74B0, &lit_4159); +COMPILER_STRIP_GATE(0x80BE74B0, &lit_4159); #pragma pop /* 80BE74B4-80BE74B8 00007C 0004+00 0/1 0/0 0/0 .rodata @4160 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4160 = 9.0f; -COMPILER_STRIP_GATE(80BE74B4, &lit_4160); +COMPILER_STRIP_GATE(0x80BE74B4, &lit_4160); #pragma pop /* 80BE74B8-80BE74BC 000080 0004+00 0/1 0/0 0/0 .rodata @4161 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4161 = 198.0f; -COMPILER_STRIP_GATE(80BE74B8, &lit_4161); +COMPILER_STRIP_GATE(0x80BE74B8, &lit_4161); #pragma pop /* 80BE74BC-80BE74C0 000084 0004+00 0/1 0/0 0/0 .rodata @4162 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4162 = 3.0f / 10.0f; -COMPILER_STRIP_GATE(80BE74BC, &lit_4162); +COMPILER_STRIP_GATE(0x80BE74BC, &lit_4162); #pragma pop /* 80BE74C0-80BE74C4 000088 0004+00 0/1 0/0 0/0 .rodata @4163 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4163 = 3.5f; -COMPILER_STRIP_GATE(80BE74C0, &lit_4163); +COMPILER_STRIP_GATE(0x80BE74C0, &lit_4163); #pragma pop /* 80BE74C4-80BE74C8 00008C 0004+00 0/1 0/0 0/0 .rodata @4164 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4164 = 1536.0f; -COMPILER_STRIP_GATE(80BE74C4, &lit_4164); +COMPILER_STRIP_GATE(0x80BE74C4, &lit_4164); #pragma pop /* 80BE74C8-80BE74CC 000090 0004+00 0/1 0/0 0/0 .rodata @4165 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4165 = 2.0f; -COMPILER_STRIP_GATE(80BE74C8, &lit_4165); +COMPILER_STRIP_GATE(0x80BE74C8, &lit_4165); +#pragma pop + +/* 80BE74CC-80BE74CC 000094 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80BE74CC = "demo06_01"; #pragma pop /* 80BE6868-80BE7174 0008E8 090C+00 1/1 0/0 0/0 .text execute__13daObjFchain_cFv */ @@ -617,9 +623,4 @@ asm daObjFchain_shape_c::~daObjFchain_shape_c() { } #pragma pop -/* 80BE74CC-80BE74D6 000094 000A+00 1/1 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80BE74CC = "demo06_01"; -#pragma pop +/* 80BE74CC-80BE74CC 000094 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_fireWood/d_a_obj_fireWood.cpp b/rel/d/a/obj/d_a_obj_fireWood/d_a_obj_fireWood.cpp index 7764635c1bc..662a7bd2940 100644 --- a/rel/d/a/obj/d_a_obj_fireWood/d_a_obj_fireWood.cpp +++ b/rel/d/a/obj/d_a_obj_fireWood/d_a_obj_fireWood.cpp @@ -48,13 +48,13 @@ struct dSv_info_c { struct dPa_levelEcallBack {}; -struct cXyz {}; - struct dKy_tevstr_c {}; +struct csXyz {}; + struct _GXColor {}; -struct csXyz {}; +struct cXyz {}; struct dPa_control_c { /* 8004D4CC */ void set(u32, u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, @@ -99,10 +99,10 @@ struct cCcS { /* 80264BA8 */ void Set(cCcD_Obj*); }; -struct Vec {}; - struct JAISoundID {}; +struct Vec {}; + struct Z2SeMgr { /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); /* 802AC50C */ void seStartLevel(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); @@ -192,11 +192,11 @@ SECTION_RODATA static u8 const lit_3625[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BE8004, &lit_3625); +COMPILER_STRIP_GATE(0x80BE8004, &lit_3625); /* 80BE8008-80BE800C 000004 0004+00 1/2 0/0 0/0 .rodata @3626 */ SECTION_RODATA static f32 const lit_3626 = 60.0f; -COMPILER_STRIP_GATE(80BE8008, &lit_3626); +COMPILER_STRIP_GATE(0x80BE8008, &lit_3626); /* 80BE8050-80BE8094 000000 0044+00 2/2 0/0 0/0 .data mCcDCyl__12daFireWood_c */ SECTION_DATA u8 daFireWood_c::mCcDCyl[68] = { @@ -337,27 +337,27 @@ SECTION_RODATA u8 const daFireWood_c::mCcDObjInfo[48] = { 0xD8, 0xFB, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x1F, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BE800C, &daFireWood_c::mCcDObjInfo); +COMPILER_STRIP_GATE(0x80BE800C, &daFireWood_c::mCcDObjInfo); /* 80BE803C-80BE8040 000038 0004+00 0/1 0/0 0/0 .rodata @3806 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3806 = 10.0f; -COMPILER_STRIP_GATE(80BE803C, &lit_3806); +COMPILER_STRIP_GATE(0x80BE803C, &lit_3806); #pragma pop /* 80BE8040-80BE8044 00003C 0004+00 0/1 0/0 0/0 .rodata @3807 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3807 = 500.0f; -COMPILER_STRIP_GATE(80BE8040, &lit_3807); +COMPILER_STRIP_GATE(0x80BE8040, &lit_3807); #pragma pop /* 80BE8044-80BE8048 000040 0004+00 0/2 0/0 0/0 .rodata @3808 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3808 = 1.0f; -COMPILER_STRIP_GATE(80BE8044, &lit_3808); +COMPILER_STRIP_GATE(0x80BE8044, &lit_3808); #pragma pop /* 80BE79A0-80BE7A14 000460 0074+00 1/1 0/0 0/0 .text lightInit__12daFireWood_cFv */ @@ -385,14 +385,14 @@ asm void daFireWood_c::setLight() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3919 = -1.0f; -COMPILER_STRIP_GATE(80BE8048, &lit_3919); +COMPILER_STRIP_GATE(0x80BE8048, &lit_3919); #pragma pop /* 80BE804C-80BE8050 000048 0004+00 0/2 0/0 0/0 .rodata @3920 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3920 = 100.0f; -COMPILER_STRIP_GATE(80BE804C, &lit_3920); +COMPILER_STRIP_GATE(0x80BE804C, &lit_3920); #pragma pop /* 80BE7A38-80BE7E74 0004F8 043C+00 1/1 0/0 0/0 .text Execute__12daFireWood_cFv */ @@ -485,5 +485,5 @@ asm void __sinit_d_a_obj_fireWood_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80BE7F80 = (void*)__sinit_d_a_obj_fireWood_cpp; +REGISTER_CTORS(0x80BE7F80, __sinit_d_a_obj_fireWood_cpp); #pragma pop diff --git a/rel/d/a/obj/d_a_obj_fireWood2/d_a_obj_fireWood2.cpp b/rel/d/a/obj/d_a_obj_fireWood2/d_a_obj_fireWood2.cpp index 5d0c4f6d03c..504855344f3 100644 --- a/rel/d/a/obj/d_a_obj_fireWood2/d_a_obj_fireWood2.cpp +++ b/rel/d/a/obj/d_a_obj_fireWood2/d_a_obj_fireWood2.cpp @@ -51,13 +51,13 @@ struct dSv_info_c { struct dPa_levelEcallBack {}; -struct cXyz {}; - struct dKy_tevstr_c {}; +struct csXyz {}; + struct _GXColor {}; -struct csXyz {}; +struct cXyz {}; struct dPa_control_c { /* 8004D4CC */ void set(u32, u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, @@ -102,10 +102,10 @@ struct cCcS { /* 80264BA8 */ void Set(cCcD_Obj*); }; -struct Vec {}; - struct JAISoundID {}; +struct Vec {}; + struct Z2SeMgr { /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); /* 802AC50C */ void seStartLevel(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); @@ -193,20 +193,20 @@ extern "C" void __register_global_object(); /* ############################################################################################## */ /* 80BE8F34-80BE8F38 000000 0004+00 3/3 0/0 0/0 .rodata @3625 */ SECTION_RODATA static f32 const lit_3625 = 15.0f; -COMPILER_STRIP_GATE(80BE8F34, &lit_3625); +COMPILER_STRIP_GATE(0x80BE8F34, &lit_3625); /* 80BE8F38-80BE8F3C 000004 0004+00 0/1 0/0 0/0 .rodata @3626 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3626 = 25.0f; -COMPILER_STRIP_GATE(80BE8F38, &lit_3626); +COMPILER_STRIP_GATE(0x80BE8F38, &lit_3626); #pragma pop /* 80BE8F3C-80BE8F40 000008 0004+00 0/2 0/0 0/0 .rodata @3627 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3627 = 50.0f; -COMPILER_STRIP_GATE(80BE8F3C, &lit_3627); +COMPILER_STRIP_GATE(0x80BE8F3C, &lit_3627); #pragma pop /* 80BE8F98-80BE8FDC 000000 0044+00 2/2 0/0 0/0 .data mCcDCyl__13daFireWood2_c */ @@ -348,25 +348,25 @@ SECTION_RODATA u8 const daFireWood2_c::mCcDObjInfo[48] = { 0xD8, 0xFB, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x1F, 0x00, 0x00, 0x00, 0x79, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BE8F40, &daFireWood2_c::mCcDObjInfo); +COMPILER_STRIP_GATE(0x80BE8F40, &daFireWood2_c::mCcDObjInfo); /* 80BE8F70-80BE8F74 00003C 0004+00 0/1 0/0 0/0 .rodata @3834 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3834 = 10.0f; -COMPILER_STRIP_GATE(80BE8F70, &lit_3834); +COMPILER_STRIP_GATE(0x80BE8F70, &lit_3834); #pragma pop /* 80BE8F74-80BE8F78 000040 0004+00 0/1 0/0 0/0 .rodata @3835 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3835 = 500.0f; -COMPILER_STRIP_GATE(80BE8F74, &lit_3835); +COMPILER_STRIP_GATE(0x80BE8F74, &lit_3835); #pragma pop /* 80BE8F78-80BE8F7C 000044 0004+00 1/3 0/0 0/0 .rodata @3836 */ SECTION_RODATA static f32 const lit_3836 = 1.0f; -COMPILER_STRIP_GATE(80BE8F78, &lit_3836); +COMPILER_STRIP_GATE(0x80BE8F78, &lit_3836); /* 80BE8F7C-80BE8F80 000048 0004+00 0/2 0/0 0/0 .rodata @3837 */ #pragma push @@ -377,7 +377,7 @@ SECTION_RODATA static u8 const lit_3837[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BE8F7C, &lit_3837); +COMPILER_STRIP_GATE(0x80BE8F7C, &lit_3837); #pragma pop /* 80BE8640-80BE86CC 0004E0 008C+00 1/1 0/0 0/0 .text lightInit__13daFireWood2_cFv */ @@ -415,35 +415,35 @@ asm void daFireWood2_c::cutLight() { #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_3855 = 0xBC6642FF; -COMPILER_STRIP_GATE(80BE8F80, &lit_3855); +COMPILER_STRIP_GATE(0x80BE8F80, &lit_3855); #pragma pop /* 80BE8F84-80BE8F88 000050 0004+00 0/1 0/0 0/0 .rodata @3863 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3863 = 0.5f; -COMPILER_STRIP_GATE(80BE8F84, &lit_3863); +COMPILER_STRIP_GATE(0x80BE8F84, &lit_3863); #pragma pop /* 80BE8F88-80BE8F8C 000054 0004+00 0/1 0/0 0/0 .rodata @3864 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3864 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(80BE8F88, &lit_3864); +COMPILER_STRIP_GATE(0x80BE8F88, &lit_3864); #pragma pop /* 80BE8F8C-80BE8F90 000058 0004+00 0/1 0/0 0/0 .rodata @3865 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_3865 = 0x38D1B717; -COMPILER_STRIP_GATE(80BE8F8C, &lit_3865); +COMPILER_STRIP_GATE(0x80BE8F8C, &lit_3865); #pragma pop /* 80BE8F90-80BE8F94 00005C 0004+00 0/1 0/0 0/0 .rodata @3866 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_3866 = 0x358637BD; -COMPILER_STRIP_GATE(80BE8F90, &lit_3866); +COMPILER_STRIP_GATE(0x80BE8F90, &lit_3866); #pragma pop /* 80BE872C-80BE87DC 0005CC 00B0+00 1/1 0/0 0/0 .text pointLightProc__13daFireWood2_cFv @@ -460,7 +460,7 @@ asm void daFireWood2_c::pointLightProc() { /* ############################################################################################## */ /* 80BE8F94-80BE8F98 000060 0004+00 1/2 0/0 0/0 .rodata @4018 */ SECTION_RODATA static f32 const lit_4018 = -1.0f; -COMPILER_STRIP_GATE(80BE8F94, &lit_4018); +COMPILER_STRIP_GATE(0x80BE8F94, &lit_4018); /* 80BE87DC-80BE8D98 00067C 05BC+00 1/1 0/0 0/0 .text Execute__13daFireWood2_cFv */ #pragma push @@ -551,5 +551,5 @@ asm void __sinit_d_a_obj_fireWood2_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80BE8EB0 = (void*)__sinit_d_a_obj_fireWood2_cpp; +REGISTER_CTORS(0x80BE8EB0, __sinit_d_a_obj_fireWood2_cpp); #pragma pop diff --git a/rel/d/a/obj/d_a_obj_firepillar/d_a_obj_firepillar.cpp b/rel/d/a/obj/d_a_obj_firepillar/d_a_obj_firepillar.cpp index 04d62f378da..8cf9ea3486b 100644 --- a/rel/d/a/obj/d_a_obj_firepillar/d_a_obj_firepillar.cpp +++ b/rel/d/a/obj/d_a_obj_firepillar/d_a_obj_firepillar.cpp @@ -416,32 +416,32 @@ SECTION_RODATA static u8 const lit_3780[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BE9AA0, &lit_3780); +COMPILER_STRIP_GATE(0x80BE9AA0, &lit_3780); /* 80BE9AA4-80BE9AA8 000004 0004+00 0/1 0/0 0/0 .rodata @3781 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3781 = 1.0f; -COMPILER_STRIP_GATE(80BE9AA4, &lit_3781); +COMPILER_STRIP_GATE(0x80BE9AA4, &lit_3781); #pragma pop /* 80BE9AA8-80BE9AAC 000008 0004+00 0/1 0/0 0/0 .rodata @3782 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3782 = 100.0f; -COMPILER_STRIP_GATE(80BE9AA8, &lit_3782); +COMPILER_STRIP_GATE(0x80BE9AA8, &lit_3782); #pragma pop /* 80BE9AAC-80BE9AB0 00000C 0004+00 0/1 0/0 0/0 .rodata @3783 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3783 = 50.0f; -COMPILER_STRIP_GATE(80BE9AAC, &lit_3783); +COMPILER_STRIP_GATE(0x80BE9AAC, &lit_3783); #pragma pop /* 80BE9AB0-80BE9AB4 000010 0004+00 3/4 0/0 0/0 .rodata @3784 */ SECTION_RODATA static f32 const lit_3784 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(80BE9AB0, &lit_3784); +COMPILER_STRIP_GATE(0x80BE9AB0, &lit_3784); /* 80BE94E4-80BE9610 000444 012C+00 1/1 0/0 0/0 .text execute__14daObjFPillar_cFv */ #pragma push @@ -497,7 +497,7 @@ asm void daObjFPillar_c::actionOnWaitInit() { /* ############################################################################################## */ /* 80BE9AB4-80BE9AB8 000014 0004+00 1/1 0/0 0/0 .rodata @3853 */ SECTION_RODATA static f32 const lit_3853 = 1.0f / 50.0f; -COMPILER_STRIP_GATE(80BE9AB4, &lit_3853); +COMPILER_STRIP_GATE(0x80BE9AB4, &lit_3853); /* 80BE97B8-80BE986C 000718 00B4+00 1/0 0/0 0/0 .text actionOnWait__14daObjFPillar_cFv */ #pragma push @@ -626,5 +626,5 @@ static asm void func_80BE9A90() { #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_3895 = 0xFF000060; -COMPILER_STRIP_GATE(80BE9AB8, &lit_3895); +COMPILER_STRIP_GATE(0x80BE9AB8, &lit_3895); #pragma pop diff --git a/rel/d/a/obj/d_a_obj_firepillar2/d_a_obj_firepillar2.cpp b/rel/d/a/obj/d_a_obj_firepillar2/d_a_obj_firepillar2.cpp index 845f61a0ed0..567f4cb6aec 100644 --- a/rel/d/a/obj/d_a_obj_firepillar2/d_a_obj_firepillar2.cpp +++ b/rel/d/a/obj/d_a_obj_firepillar2/d_a_obj_firepillar2.cpp @@ -230,7 +230,7 @@ extern "C" static void daObjFPillar2_Execute__FP15daObjFPillar2_c(); extern "C" static void daObjFPillar2_Delete__FP15daObjFPillar2_c(); extern "C" static void daObjFPillar2_Create__FP10fopAc_ac_c(); extern "C" void __dt__10cCcD_GSttsFv(); -extern "C" void func_80BEB490(u8*); +extern "C" void func_80BEB490(void* _this, u8*); extern "C" static void func_80BEB4AC(); extern "C" static void func_80BEB4B4(); extern "C" extern char const* const d_a_obj_firepillar2__stringBase0; @@ -339,7 +339,7 @@ asm void daObjFPillar2_c::initBaseMtx() { /* ############################################################################################## */ /* 80BEB4C4-80BEB4C8 000000 0004+00 9/9 0/0 0/0 .rodata @3656 */ SECTION_RODATA static f32 const lit_3656 = 1.0f; -COMPILER_STRIP_GATE(80BEB4C4, &lit_3656); +COMPILER_STRIP_GATE(0x80BEB4C4, &lit_3656); /* 80BE9D5C-80BE9DDC 00011C 0080+00 2/2 0/0 0/0 .text setBaseMtx__15daObjFPillar2_cFv */ #pragma push @@ -356,42 +356,48 @@ asm void daObjFPillar2_c::setBaseMtx() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3712 = 4.0f / 5.0f; -COMPILER_STRIP_GATE(80BEB4C8, &lit_3712); +COMPILER_STRIP_GATE(0x80BEB4C8, &lit_3712); #pragma pop /* 80BEB4CC-80BEB4D0 000008 0004+00 0/1 0/0 0/0 .rodata @3713 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3713 = 1.5f; -COMPILER_STRIP_GATE(80BEB4CC, &lit_3713); +COMPILER_STRIP_GATE(0x80BEB4CC, &lit_3713); #pragma pop /* 80BEB4D0-80BEB4D4 00000C 0004+00 0/1 0/0 0/0 .rodata @3714 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3714 = 7.5f; -COMPILER_STRIP_GATE(80BEB4D0, &lit_3714); +COMPILER_STRIP_GATE(0x80BEB4D0, &lit_3714); #pragma pop /* 80BEB4D4-80BEB4D8 000010 0004+00 0/2 0/0 0/0 .rodata @3715 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3715 = 50.0f; -COMPILER_STRIP_GATE(80BEB4D4, &lit_3715); +COMPILER_STRIP_GATE(0x80BEB4D4, &lit_3715); #pragma pop /* 80BEB4D8-80BEB4DC 000014 0004+00 0/1 0/0 0/0 .rodata @3716 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3716 = 11.0f; -COMPILER_STRIP_GATE(80BEB4D8, &lit_3716); +COMPILER_STRIP_GATE(0x80BEB4D8, &lit_3716); #pragma pop /* 80BEB4DC-80BEB4E0 000018 0004+00 0/1 0/0 0/0 .rodata @3717 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3717 = 2.0f; -COMPILER_STRIP_GATE(80BEB4DC, &lit_3717); +COMPILER_STRIP_GATE(0x80BEB4DC, &lit_3717); +#pragma pop + +/* 80BEB51C-80BEB51C 000058 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80BEB51C = "Obj_yogan"; #pragma pop /* 80BEB528-80BEB534 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ @@ -698,14 +704,14 @@ asm dBgS_ObjAcch::~dBgS_ObjAcch() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3928 = 100.0f; -COMPILER_STRIP_GATE(80BEB4E0, &lit_3928); +COMPILER_STRIP_GATE(0x80BEB4E0, &lit_3928); #pragma pop /* 80BEB4E4-80BEB4E8 000020 0004+00 0/4 0/0 0/0 .rodata @3929 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3929 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(80BEB4E4, &lit_3929); +COMPILER_STRIP_GATE(0x80BEB4E4, &lit_3929); #pragma pop /* 80BEA584-80BEA734 000944 01B0+00 1/1 0/0 0/0 .text execute__15daObjFPillar2_cFv */ @@ -736,7 +742,7 @@ SECTION_RODATA static u8 const lit_3961[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BEB4E8, &lit_3961); +COMPILER_STRIP_GATE(0x80BEB4E8, &lit_3961); /* 80BEA808-80BEA854 000BC8 004C+00 3/3 0/0 0/0 .text actionOffInit__15daObjFPillar2_cFv */ @@ -754,7 +760,7 @@ asm void daObjFPillar2_c::actionOffInit() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3999 = -1.0f; -COMPILER_STRIP_GATE(80BEB4EC, &lit_3999); +COMPILER_STRIP_GATE(0x80BEB4EC, &lit_3999); #pragma pop /* 80BEA854-80BEA98C 000C14 0138+00 1/0 0/0 0/0 .text actionOff__15daObjFPillar2_cFv */ @@ -782,7 +788,7 @@ asm void daObjFPillar2_c::actionOnWaitInit() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4086 = 1.0f / 50.0f; -COMPILER_STRIP_GATE(80BEB4F0, &lit_4086); +COMPILER_STRIP_GATE(0x80BEB4F0, &lit_4086); #pragma pop /* 80BEAAE4-80BEAC68 000EA4 0184+00 1/0 0/0 0/0 .text actionOnWait__15daObjFPillar2_cFv @@ -801,14 +807,14 @@ asm void daObjFPillar2_c::actionOnWait() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4142 = 30.0f; -COMPILER_STRIP_GATE(80BEB4F4, &lit_4142); +COMPILER_STRIP_GATE(0x80BEB4F4, &lit_4142); #pragma pop /* 80BEB4F8-80BEB4FC 000034 0004+00 0/1 0/0 0/0 .rodata @4143 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4143 = 80.0f; -COMPILER_STRIP_GATE(80BEB4F8, &lit_4143); +COMPILER_STRIP_GATE(0x80BEB4F8, &lit_4143); #pragma pop /* 80BEAC68-80BEADD0 001028 0168+00 1/1 0/0 0/0 .text actionOnInit__15daObjFPillar2_cFv @@ -827,56 +833,56 @@ asm void daObjFPillar2_c::actionOnInit() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4288 = 1.0f / 25.0f; -COMPILER_STRIP_GATE(80BEB4FC, &lit_4288); +COMPILER_STRIP_GATE(0x80BEB4FC, &lit_4288); #pragma pop /* 80BEB500-80BEB504 00003C 0004+00 0/1 0/0 0/0 .rodata @4289 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4289 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(80BEB500, &lit_4289); +COMPILER_STRIP_GATE(0x80BEB500, &lit_4289); #pragma pop /* 80BEB504-80BEB508 000040 0004+00 0/1 0/0 0/0 .rodata @4290 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4290 = 2.0f / 125.0f; -COMPILER_STRIP_GATE(80BEB504, &lit_4290); +COMPILER_STRIP_GATE(0x80BEB504, &lit_4290); #pragma pop /* 80BEB508-80BEB50C 000044 0004+00 0/1 0/0 0/0 .rodata @4291 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4291 = 15.0f; -COMPILER_STRIP_GATE(80BEB508, &lit_4291); +COMPILER_STRIP_GATE(0x80BEB508, &lit_4291); #pragma pop /* 80BEB50C-80BEB510 000048 0004+00 0/1 0/0 0/0 .rodata @4292 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4292 = 3.0f / 10.0f; -COMPILER_STRIP_GATE(80BEB50C, &lit_4292); +COMPILER_STRIP_GATE(0x80BEB50C, &lit_4292); #pragma pop /* 80BEB510-80BEB514 00004C 0004+00 0/1 0/0 0/0 .rodata @4293 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4293 = 8.0f / 5.0f; -COMPILER_STRIP_GATE(80BEB510, &lit_4293); +COMPILER_STRIP_GATE(0x80BEB510, &lit_4293); #pragma pop /* 80BEB514-80BEB518 000050 0004+00 0/1 0/0 0/0 .rodata @4294 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4294 = 0x3B83126E; -COMPILER_STRIP_GATE(80BEB514, &lit_4294); +COMPILER_STRIP_GATE(0x80BEB514, &lit_4294); #pragma pop /* 80BEB518-80BEB51C 000054 0004+00 0/1 0/0 0/0 .rodata @4295 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4295 = 60.0f; -COMPILER_STRIP_GATE(80BEB518, &lit_4295); +COMPILER_STRIP_GATE(0x80BEB518, &lit_4295); #pragma pop /* 80BEADD0-80BEB1B4 001190 03E4+00 1/0 0/0 0/0 .text actionOn__15daObjFPillar2_cFv */ @@ -964,7 +970,7 @@ asm cCcD_GStts::~cCcD_GStts() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80BEB490(u8* param_0) { +extern "C" asm void func_80BEB490(void* _this, u8* param_0) { nofralloc #include "asm/rel/d/a/obj/d_a_obj_firepillar2/d_a_obj_firepillar2/func_80BEB490.s" } @@ -990,9 +996,4 @@ static asm void func_80BEB4B4() { } #pragma pop -/* 80BEB51C-80BEB526 000058 000A+00 1/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80BEB51C = "Obj_yogan"; -#pragma pop +/* 80BEB51C-80BEB51C 000058 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_flag/d_a_obj_flag.cpp b/rel/d/a/obj/d_a_obj_flag/d_a_obj_flag.cpp index d8098057a5c..ec0f4473f73 100644 --- a/rel/d/a/obj/d_a_obj_flag/d_a_obj_flag.cpp +++ b/rel/d/a/obj/d_a_obj_flag/d_a_obj_flag.cpp @@ -68,10 +68,10 @@ struct dRes_control_c { /* 8003C37C */ void getRes(char const*, char const*, dRes_info_c*, int); }; -struct Vec {}; - struct JAISoundID {}; +struct Vec {}; + struct Z2SeMgr { /* 802AC50C */ void seStartLevel(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); }; @@ -174,17 +174,23 @@ SECTION_RODATA u8 const daObjFlag_c::M_attr[52] = { 0x03, 0xE8, 0x01, 0x90, 0x00, 0x00, 0x00, 0x00, 0x01, 0x2C, 0x01, 0x01, 0x00, 0x00, 0x46, 0x3B, 0x80, 0x00, 0x45, 0x3B, 0x80, 0x00, 0x46, 0x3B, 0x80, 0x00, }; -COMPILER_STRIP_GATE(80BEC4EC, &daObjFlag_c::M_attr); +COMPILER_STRIP_GATE(0x80BEC4EC, &daObjFlag_c::M_attr); /* 80BEC520-80BEC524 000034 0004+00 1/1 0/0 0/0 .rodata @3637 */ SECTION_RODATA static f32 const lit_3637 = 65535.0f; -COMPILER_STRIP_GATE(80BEC520, &lit_3637); +COMPILER_STRIP_GATE(0x80BEC520, &lit_3637); /* 80BEC524-80BEC52C 000038 0008+00 1/1 0/0 0/0 .rodata @3639 */ SECTION_RODATA static u8 const lit_3639[8] = { 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BEC524, &lit_3639); +COMPILER_STRIP_GATE(0x80BEC524, &lit_3639); + +/* 80BEC554-80BEC554 000068 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80BEC554 = "spec.dat"; +#pragma pop /* 80BEB778-80BEB8F0 000078 0178+00 1/1 0/0 0/0 .text create_init__11daObjFlag_cFv */ #pragma push @@ -226,35 +232,35 @@ SECTION_RODATA static u8 const lit_3759[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BEC52C, &lit_3759); +COMPILER_STRIP_GATE(0x80BEC52C, &lit_3759); #pragma pop /* 80BEC530-80BEC534 000044 0004+00 0/1 0/0 0/0 .rodata @3760 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3760 = 127.0f; -COMPILER_STRIP_GATE(80BEC530, &lit_3760); +COMPILER_STRIP_GATE(0x80BEC530, &lit_3760); #pragma pop /* 80BEC534-80BEC538 000048 0004+00 0/1 0/0 0/0 .rodata @3761 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3761 = 1.0f; -COMPILER_STRIP_GATE(80BEC534, &lit_3761); +COMPILER_STRIP_GATE(0x80BEC534, &lit_3761); #pragma pop /* 80BEC538-80BEC53C 00004C 0004+00 0/1 0/0 0/0 .rodata @3762 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3762 = -1.0f; -COMPILER_STRIP_GATE(80BEC538, &lit_3762); +COMPILER_STRIP_GATE(0x80BEC538, &lit_3762); #pragma pop /* 80BEC53C-80BEC544 000050 0008+00 1/4 0/0 0/0 .rodata @3764 */ SECTION_RODATA static u8 const lit_3764[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BEC53C, &lit_3764); +COMPILER_STRIP_GATE(0x80BEC53C, &lit_3764); /* 80BEB9AC-80BEBC58 0002AC 02AC+00 1/1 0/0 0/0 .text calcJointAngle__11daObjFlag_cFv */ #pragma push @@ -269,7 +275,7 @@ asm void daObjFlag_c::calcJointAngle() { /* ############################################################################################## */ /* 80BEC544-80BEC548 000058 0004+00 1/1 0/0 0/0 .rodata @3791 */ SECTION_RODATA static f32 const lit_3791 = 7.0f / 10.0f; -COMPILER_STRIP_GATE(80BEC544, &lit_3791); +COMPILER_STRIP_GATE(0x80BEC544, &lit_3791); /* 80BEBC58-80BEBDAC 000558 0154+00 1/1 0/0 0/0 .text * calcAngleSwingZ__11daObjFlag_cFP11FlagJoint_cf */ @@ -287,7 +293,7 @@ asm void daObjFlag_c::calcAngleSwingZ(FlagJoint_c* param_0, f32 param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3803 = 16384.0f; -COMPILER_STRIP_GATE(80BEC548, &lit_3803); +COMPILER_STRIP_GATE(0x80BEC548, &lit_3803); #pragma pop /* 80BEBDAC-80BEBE64 0006AC 00B8+00 1/1 0/0 0/0 .text @@ -306,14 +312,14 @@ asm void daObjFlag_c::calcAngleSwingX(FlagJoint_c* param_0, f32 param_1) { #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_3832 = 0x45D05555; -COMPILER_STRIP_GATE(80BEC54C, &lit_3832); +COMPILER_STRIP_GATE(0x80BEC54C, &lit_3832); #pragma pop /* 80BEC550-80BEC554 000064 0004+00 0/1 0/0 0/0 .rodata @3833 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3833 = 4000.0f; -COMPILER_STRIP_GATE(80BEC550, &lit_3833); +COMPILER_STRIP_GATE(0x80BEC550, &lit_3833); #pragma pop /* 80BEBE64-80BEBFC8 000764 0164+00 1/1 0/0 0/0 .text getSwingY__11daObjFlag_cFf */ @@ -336,6 +342,15 @@ static asm void nodeCallBack(J3DJoint* param_0, int param_1) { } #pragma pop +/* ############################################################################################## */ +/* 80BEC554-80BEC554 000068 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80BEC55D = "flag%02d.bmd"; +SECTION_DEAD static char const* const stringBase_80BEC56A = "FlagObj"; +SECTION_DEAD static char const* const stringBase_80BEC572 = "model0.bmd"; +#pragma pop + /* 80BEC0B8-80BEC234 0009B8 017C+00 1/1 0/0 0/0 .text createSolidHeap__FP10fopAc_ac_c */ #pragma push #pragma optimization_level 0 @@ -432,12 +447,4 @@ SECTION_DATA extern void* g_profile_Obj_Flag[12] = { (void*)0x00040000, (void*)0x000E0000, }; -/* 80BEC554-80BEC57D 000068 0029+00 4/4 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80BEC554 = "spec.dat"; -SECTION_DEAD static char const* const stringBase_80BEC55D = "flag%02d.bmd"; -SECTION_DEAD static char const* const stringBase_80BEC56A = "FlagObj"; -SECTION_DEAD static char const* const stringBase_80BEC572 = "model0.bmd"; -#pragma pop +/* 80BEC554-80BEC554 000068 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_flag2/d_a_obj_flag2.cpp b/rel/d/a/obj/d_a_obj_flag2/d_a_obj_flag2.cpp index 23e40847cad..64a036747cd 100644 --- a/rel/d/a/obj/d_a_obj_flag2/d_a_obj_flag2.cpp +++ b/rel/d/a/obj/d_a_obj_flag2/d_a_obj_flag2.cpp @@ -346,11 +346,11 @@ SECTION_RODATA u8 const daObjFlag2_c::M_attr[20] = { 0xC0, 0x00, 0x00, 0x00, 0x3F, 0x3D, 0x70, 0xA4, 0x3F, 0x2E, 0x14, 0x7B, 0x42, 0x20, 0x00, 0x00, 0x42, 0xC8, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BEE0DC, &daObjFlag2_c::M_attr); +COMPILER_STRIP_GATE(0x80BEE0DC, &daObjFlag2_c::M_attr); /* 80BEE0F0-80BEE0F4 000014 0004+00 1/1 0/0 0/0 .rodata @3643 */ SECTION_RODATA static f32 const lit_3643 = 10.0f; -COMPILER_STRIP_GATE(80BEE0F0, &lit_3643); +COMPILER_STRIP_GATE(0x80BEE0F0, &lit_3643); /* 80BEE220-80BEE31C 000000 00FC+00 1/1 0/0 0/0 .data l_pennant_flag_pos */ SECTION_DATA static u8 l_pennant_flag_pos[252] = { @@ -401,13 +401,13 @@ SECTION_RODATA static u8 const lit_3685[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BEE0F4, &lit_3685); +COMPILER_STRIP_GATE(0x80BEE0F4, &lit_3685); /* 80BEE0F8-80BEE0FC 00001C 0004+00 0/1 0/0 0/0 .rodata @3686 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_3686 = 0x42D0CE5F; -COMPILER_STRIP_GATE(80BEE0F8, &lit_3686); +COMPILER_STRIP_GATE(0x80BEE0F8, &lit_3686); #pragma pop /* 80BEE0FC-80BEE104 000020 0004+04 0/1 0/0 0/0 .rodata @3687 */ @@ -418,7 +418,7 @@ SECTION_RODATA static f32 const lit_3687[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80BEE0FC, &lit_3687); +COMPILER_STRIP_GATE(0x80BEE0FC, &lit_3687); #pragma pop /* 80BEE31C-80BEE3C4 0000FC 00A8+00 1/1 0/0 0/0 .data l_texCoord_64x64 */ @@ -697,7 +697,7 @@ asm void FlagCloth_c::calcFlagFactor(cXyz* param_0, cXyz* param_1, cXyz* param_2 SECTION_RODATA static u8 const lit_3728[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BEE104, &lit_3728); +COMPILER_STRIP_GATE(0x80BEE104, &lit_3728); #pragma pop /* 80BEE10C-80BEE114 000030 0008+00 0/1 0/0 0/0 .rodata @3729 */ @@ -706,7 +706,7 @@ COMPILER_STRIP_GATE(80BEE104, &lit_3728); SECTION_RODATA static u8 const lit_3729[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BEE10C, &lit_3729); +COMPILER_STRIP_GATE(0x80BEE10C, &lit_3729); #pragma pop /* 80BEE114-80BEE11C 000038 0008+00 0/1 0/0 0/0 .rodata @3730 */ @@ -715,7 +715,7 @@ COMPILER_STRIP_GATE(80BEE10C, &lit_3729); SECTION_RODATA static u8 const lit_3730[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BEE114, &lit_3730); +COMPILER_STRIP_GATE(0x80BEE114, &lit_3730); #pragma pop /* 80BEC928-80BECAE0 000348 01B8+00 1/1 0/0 0/0 .text @@ -800,7 +800,7 @@ SECTION_RODATA static u8 const ccSphSrc[64] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0xC8, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BEE11C, &ccSphSrc); +COMPILER_STRIP_GATE(0x80BEE11C, &ccSphSrc); /* 80BECC78-80BECCE4 000698 006C+00 1/1 0/0 0/0 .text initCcSphere__11FlagCloth_cFP10fopAc_ac_c */ #pragma push @@ -835,11 +835,11 @@ asm void FlagCloth_c::execute() { /* ############################################################################################## */ /* 80BEE15C-80BEE160 000080 0004+00 1/1 0/0 0/0 .rodata @3907 */ SECTION_RODATA static u32 const lit_3907 = 0x000000FF; -COMPILER_STRIP_GATE(80BEE15C, &lit_3907); +COMPILER_STRIP_GATE(0x80BEE15C, &lit_3907); /* 80BEE160-80BEE164 000084 0004+00 1/1 0/0 0/0 .rodata @3910 */ SECTION_RODATA static u32 const lit_3910 = 0x000000FF; -COMPILER_STRIP_GATE(80BEE160, &lit_3910); +COMPILER_STRIP_GATE(0x80BEE160, &lit_3910); /* 80BECF30-80BED22C 000950 02FC+00 1/0 0/0 0/0 .text draw__11FlagCloth_cFv */ #pragma push @@ -856,14 +856,14 @@ asm void FlagCloth_c::draw() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3959 = -600.0f; -COMPILER_STRIP_GATE(80BEE164, &lit_3959); +COMPILER_STRIP_GATE(0x80BEE164, &lit_3959); #pragma pop /* 80BEE168-80BEE16C 00008C 0004+00 0/1 0/0 0/0 .rodata @3960 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3960 = 600.0f; -COMPILER_STRIP_GATE(80BEE168, &lit_3960); +COMPILER_STRIP_GATE(0x80BEE168, &lit_3960); #pragma pop /* 80BEE16C-80BEE174 000090 0004+04 0/1 0/0 0/0 .rodata @3961 */ @@ -874,7 +874,7 @@ SECTION_RODATA static f32 const lit_3961[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80BEE16C, &lit_3961); +COMPILER_STRIP_GATE(0x80BEE16C, &lit_3961); #pragma pop /* 80BEE174-80BEE17C 000098 0008+00 0/1 0/0 0/0 .rodata @3963 */ @@ -883,7 +883,13 @@ COMPILER_STRIP_GATE(80BEE16C, &lit_3961); SECTION_RODATA static u8 const lit_3963[8] = { 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BEE174, &lit_3963); +COMPILER_STRIP_GATE(0x80BEE174, &lit_3963); +#pragma pop + +/* 80BEE1E8-80BEE1E8 00010C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80BEE1E8 = "spec.dat"; #pragma pop /* 80BED22C-80BED368 000C4C 013C+00 1/1 0/0 0/0 .text create_init__12daObjFlag2_cFv */ @@ -917,21 +923,21 @@ SECTION_RODATA static u8 const ccCylSrc[68] = { 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41, 0x70, 0x00, 0x00, 0x41, 0xF0, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BEE17C, &ccCylSrc); +COMPILER_STRIP_GATE(0x80BEE17C, &ccCylSrc); #pragma pop /* 80BEE1C0-80BEE1C4 0000E4 0004+00 0/1 0/0 0/0 .rodata @3982 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3982 = 15.0f; -COMPILER_STRIP_GATE(80BEE1C0, &lit_3982); +COMPILER_STRIP_GATE(0x80BEE1C0, &lit_3982); #pragma pop /* 80BEE1C4-80BEE1C8 0000E8 0004+00 0/1 0/0 0/0 .rodata @3983 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3983 = 200.0f; -COMPILER_STRIP_GATE(80BEE1C4, &lit_3983); +COMPILER_STRIP_GATE(0x80BEE1C4, &lit_3983); #pragma pop /* 80BED3B8-80BED44C 000DD8 0094+00 1/1 0/0 0/0 .text initCollision__12daObjFlag2_cFv */ @@ -957,7 +963,7 @@ asm void daObjFlag2_c::setCollision() { /* ############################################################################################## */ /* 80BEE1C8-80BEE1CC 0000EC 0004+00 1/1 0/0 0/0 .rodata @4020 */ SECTION_RODATA static f32 const lit_4020 = 0.125f; -COMPILER_STRIP_GATE(80BEE1C8, &lit_4020); +COMPILER_STRIP_GATE(0x80BEE1C8, &lit_4020); /* 80BEE1CC-80BEE1D4 0000F0 0004+04 1/1 0/0 0/0 .rodata @4021 */ SECTION_RODATA static f32 const lit_4021[1 + 1 /* padding */] = { @@ -965,13 +971,21 @@ SECTION_RODATA static f32 const lit_4021[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80BEE1CC, &lit_4021); +COMPILER_STRIP_GATE(0x80BEE1CC, &lit_4021); /* 80BEE1D4-80BEE1DC 0000F8 0008+00 1/1 0/0 0/0 .rodata @4023 */ SECTION_RODATA static u8 const lit_4023[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BEE1D4, &lit_4023); +COMPILER_STRIP_GATE(0x80BEE1D4, &lit_4023); + +/* 80BEE1E8-80BEE1E8 00010C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80BEE1F1 = "flag%02d.bti"; +SECTION_DEAD static char const* const stringBase_80BEE1FE = "flag.bti"; +SECTION_DEAD static char const* const stringBase_80BEE207 = "model0.bmd"; +#pragma pop /* 80BED480-80BED680 000EA0 0200+00 1/1 0/0 0/0 .text createHeap__12daObjFlag2_cFv */ #pragma push @@ -993,6 +1007,13 @@ static asm void createSolidHeap(fopAc_ac_c* param_0) { } #pragma pop +/* ############################################################################################## */ +/* 80BEE1E8-80BEE1E8 00010C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80BEE212 = "FlagObj%02d"; +#pragma pop + /* 80BED6A0-80BED7A4 0010C0 0104+00 1/1 0/0 0/0 .text create__12daObjFlag2_cFv */ #pragma push #pragma optimization_level 0 @@ -1171,21 +1192,21 @@ static asm void daObjFlag2_Draw(daObjFlag2_c* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4334 = 127.0f; -COMPILER_STRIP_GATE(80BEE1DC, &lit_4334); +COMPILER_STRIP_GATE(0x80BEE1DC, &lit_4334); #pragma pop /* 80BEE1E0-80BEE1E4 000104 0004+00 0/1 0/0 0/0 .rodata @4335 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4335 = 1.0f; -COMPILER_STRIP_GATE(80BEE1E0, &lit_4335); +COMPILER_STRIP_GATE(0x80BEE1E0, &lit_4335); #pragma pop /* 80BEE1E4-80BEE1E8 000108 0004+00 0/1 0/0 0/0 .rodata @4336 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4336 = -1.0f; -COMPILER_STRIP_GATE(80BEE1E4, &lit_4336); +COMPILER_STRIP_GATE(0x80BEE1E4, &lit_4336); #pragma pop /* 80BEDDC0-80BEDEB0 0017E0 00F0+00 1/0 0/0 0/0 .text daObjFlag2_Execute__FP12daObjFlag2_c */ @@ -1255,13 +1276,4 @@ asm void FlagCloth_c::getTargetPos() { } #pragma pop -/* 80BEE1E8-80BEE21E 00010C 0036+00 3/3 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80BEE1E8 = "spec.dat"; -SECTION_DEAD static char const* const stringBase_80BEE1F1 = "flag%02d.bti"; -SECTION_DEAD static char const* const stringBase_80BEE1FE = "flag.bti"; -SECTION_DEAD static char const* const stringBase_80BEE207 = "model0.bmd"; -SECTION_DEAD static char const* const stringBase_80BEE212 = "FlagObj%02d"; -#pragma pop +/* 80BEE1E8-80BEE1E8 00010C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_flag3/d_a_obj_flag3.cpp b/rel/d/a/obj/d_a_obj_flag3/d_a_obj_flag3.cpp index c1fefa1e9d1..2bf6f52358f 100644 --- a/rel/d/a/obj/d_a_obj_flag3/d_a_obj_flag3.cpp +++ b/rel/d/a/obj/d_a_obj_flag3/d_a_obj_flag3.cpp @@ -273,7 +273,7 @@ SECTION_RODATA u8 const daObjFlag3_c::M_attr[20] = { 0xC0, 0x00, 0x00, 0x00, 0x3F, 0x19, 0x99, 0x9A, 0x3F, 0x2E, 0x14, 0x7B, 0x42, 0x20, 0x00, 0x00, 0x42, 0xC8, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BF0458, &daObjFlag3_c::M_attr); +COMPILER_STRIP_GATE(0x80BF0458, &daObjFlag3_c::M_attr); /* 80BF046C-80BF048C 000014 0020+00 0/0 0/0 0/0 .rodata @3637 */ #pragma push @@ -282,7 +282,7 @@ SECTION_RODATA static u8 const lit_3637[32] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, }; -COMPILER_STRIP_GATE(80BF046C, &lit_3637); +COMPILER_STRIP_GATE(0x80BF046C, &lit_3637); #pragma pop /* 80BF048C-80BF04B0 000034 0024+00 1/1 0/0 0/0 .rodata @3672 */ @@ -291,7 +291,7 @@ SECTION_RODATA static u8 const lit_3672[36] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, }; -COMPILER_STRIP_GATE(80BF048C, &lit_3672); +COMPILER_STRIP_GATE(0x80BF048C, &lit_3672); /* 80BF04B0-80BF04F0 000058 0040+00 0/0 0/0 0/0 .rodata * ccSphSrc$localstatic3$initCcSphere__12FlagCloth2_cFP10fopAc_ac_c */ @@ -303,30 +303,38 @@ SECTION_RODATA static u8 const data_80BF04B0[64] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0xC8, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BF04B0, &data_80BF04B0); +COMPILER_STRIP_GATE(0x80BF04B0, &data_80BF04B0); #pragma pop /* 80BF04F0-80BF04F4 000098 0004+00 1/1 0/0 0/0 .rodata @3757 */ SECTION_RODATA static u32 const lit_3757 = 0x000000FF; -COMPILER_STRIP_GATE(80BF04F0, &lit_3757); +COMPILER_STRIP_GATE(0x80BF04F0, &lit_3757); /* 80BF04F4-80BF04F8 00009C 0004+00 1/1 0/0 0/0 .rodata @3760 */ SECTION_RODATA static u32 const lit_3760 = 0x000000FF; -COMPILER_STRIP_GATE(80BF04F4, &lit_3760); +COMPILER_STRIP_GATE(0x80BF04F4, &lit_3760); /* 80BF04F8-80BF04FC 0000A0 0004+00 1/1 0/0 0/0 .rodata @3813 */ SECTION_RODATA static f32 const lit_3813 = 0.125f; -COMPILER_STRIP_GATE(80BF04F8, &lit_3813); +COMPILER_STRIP_GATE(0x80BF04F8, &lit_3813); /* 80BF04FC-80BF0500 0000A4 0004+00 1/1 0/0 0/0 .rodata @3814 */ SECTION_RODATA static f32 const lit_3814 = 1.0f / 100.0f; -COMPILER_STRIP_GATE(80BF04FC, &lit_3814); +COMPILER_STRIP_GATE(0x80BF04FC, &lit_3814); /* 80BF0500-80BF0508 0000A8 0008+00 1/2 0/0 0/0 .rodata @3816 */ SECTION_RODATA static u8 const lit_3816[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BF0500, &lit_3816); +COMPILER_STRIP_GATE(0x80BF0500, &lit_3816); + +/* 80BF0554-80BF0554 0000FC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80BF0554 = "flag%02d.bti"; +SECTION_DEAD static char const* const stringBase_80BF0561 = "flag.bti"; +SECTION_DEAD static char const* const stringBase_80BF056A = "model0.bmd"; +#pragma pop /* 80BEEA78-80BEEC3C 000078 01C4+00 1/1 0/0 0/0 .text createHeap__12daObjFlag3_cFv */ #pragma push @@ -407,7 +415,7 @@ SECTION_RODATA static u8 const lit_4012[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BF0508, &lit_4012); +COMPILER_STRIP_GATE(0x80BF0508, &lit_4012); /* 80BEEF74-80BEF278 000574 0304+00 2/2 0/0 0/0 .text calcFlagNormal__12FlagCloth2_cFP4cXyzi */ #pragma push @@ -424,7 +432,7 @@ asm void FlagCloth2_c::calcFlagNormal(cXyz* param_0, int param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4104 = 60.0f; -COMPILER_STRIP_GATE(80BF050C, &lit_4104); +COMPILER_STRIP_GATE(0x80BF050C, &lit_4104); #pragma pop /* 80BF0510-80BF0518 0000B8 0004+04 0/1 0/0 0/0 .rodata @4105 */ @@ -435,7 +443,7 @@ SECTION_RODATA static u32 const lit_4105[1 + 1 /* padding */] = { /* padding */ 0x00000000, }; -COMPILER_STRIP_GATE(80BF0510, &lit_4105); +COMPILER_STRIP_GATE(0x80BF0510, &lit_4105); #pragma pop /* 80BF0518-80BF0520 0000C0 0008+00 0/1 0/0 0/0 .rodata @4106 */ @@ -444,7 +452,7 @@ COMPILER_STRIP_GATE(80BF0510, &lit_4105); SECTION_RODATA static u8 const lit_4106[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BF0518, &lit_4106); +COMPILER_STRIP_GATE(0x80BF0518, &lit_4106); #pragma pop /* 80BF0520-80BF0528 0000C8 0008+00 0/1 0/0 0/0 .rodata @4107 */ @@ -453,7 +461,7 @@ COMPILER_STRIP_GATE(80BF0518, &lit_4106); SECTION_RODATA static u8 const lit_4107[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BF0520, &lit_4107); +COMPILER_STRIP_GATE(0x80BF0520, &lit_4107); #pragma pop /* 80BF0528-80BF0530 0000D0 0008+00 0/1 0/0 0/0 .rodata @4108 */ @@ -462,7 +470,7 @@ COMPILER_STRIP_GATE(80BF0520, &lit_4107); SECTION_RODATA static u8 const lit_4108[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BF0528, &lit_4108); +COMPILER_STRIP_GATE(0x80BF0528, &lit_4108); #pragma pop /* 80BEF278-80BEF6D0 000878 0458+00 1/1 0/0 0/0 .text @@ -583,6 +591,13 @@ static asm void daObjFlag3_Create(fopAc_ac_c* param_0) { } #pragma pop +/* ############################################################################################## */ +/* 80BF0554-80BF0554 0000FC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80BF0575 = "FlagObj%02d"; +#pragma pop + /* 80BEF95C-80BEFBC4 000F5C 0268+00 1/1 0/0 0/0 .text create__12daObjFlag3_cFv */ #pragma push #pragma optimization_level 0 @@ -598,14 +613,14 @@ asm void daObjFlag3_c::create() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4242 = -600.0f; -COMPILER_STRIP_GATE(80BF0530, &lit_4242); +COMPILER_STRIP_GATE(0x80BF0530, &lit_4242); #pragma pop /* 80BF0534-80BF0538 0000DC 0004+00 0/1 0/0 0/0 .rodata @4243 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4243 = 600.0f; -COMPILER_STRIP_GATE(80BF0534, &lit_4243); +COMPILER_STRIP_GATE(0x80BF0534, &lit_4243); #pragma pop /* 80BF0538-80BF0540 0000E0 0004+04 0/1 0/0 0/0 .rodata @4244 */ @@ -616,7 +631,7 @@ SECTION_RODATA static f32 const lit_4244[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80BF0538, &lit_4244); +COMPILER_STRIP_GATE(0x80BF0538, &lit_4244); #pragma pop /* 80BF0540-80BF0548 0000E8 0008+00 0/1 0/0 0/0 .rodata @4246 */ @@ -625,7 +640,13 @@ COMPILER_STRIP_GATE(80BF0538, &lit_4244); SECTION_RODATA static u8 const lit_4246[8] = { 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BF0540, &lit_4246); +COMPILER_STRIP_GATE(0x80BF0540, &lit_4246); +#pragma pop + +/* 80BF0554-80BF0554 0000FC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80BF0581 = "spec.dat"; #pragma pop /* 80BEFBC4-80BEFD08 0011C4 0144+00 1/1 0/0 0/0 .text create_init__12daObjFlag3_cFv */ @@ -643,21 +664,21 @@ asm void daObjFlag3_c::create_init() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4287 = -150.0f; -COMPILER_STRIP_GATE(80BF0548, &lit_4287); +COMPILER_STRIP_GATE(0x80BF0548, &lit_4287); #pragma pop /* 80BF054C-80BF0550 0000F4 0004+00 0/1 0/0 0/0 .rodata @4288 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4288 = 10.0f; -COMPILER_STRIP_GATE(80BF054C, &lit_4288); +COMPILER_STRIP_GATE(0x80BF054C, &lit_4288); #pragma pop /* 80BF0550-80BF0554 0000F8 0004+00 0/1 0/0 0/0 .rodata @4289 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4289 = 5.0f; -COMPILER_STRIP_GATE(80BF0550, &lit_4289); +COMPILER_STRIP_GATE(0x80BF0550, &lit_4289); #pragma pop /* 80BEFD08-80BEFF30 001308 0228+00 1/1 0/0 0/0 .text @@ -746,13 +767,4 @@ asm void FlagCloth2_c::getTargetPos() { } #pragma pop -/* 80BF0554-80BF058A 0000FC 0036+00 3/3 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80BF0554 = "flag%02d.bti"; -SECTION_DEAD static char const* const stringBase_80BF0561 = "flag.bti"; -SECTION_DEAD static char const* const stringBase_80BF056A = "model0.bmd"; -SECTION_DEAD static char const* const stringBase_80BF0575 = "FlagObj%02d"; -SECTION_DEAD static char const* const stringBase_80BF0581 = "spec.dat"; -#pragma pop +/* 80BF0554-80BF0554 0000FC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_fmobj/d_a_obj_fmobj.cpp b/rel/d/a/obj/d_a_obj_fmobj/d_a_obj_fmobj.cpp index fcfe8c48fdf..0b595ea442d 100644 --- a/rel/d/a/obj/d_a_obj_fmobj/d_a_obj_fmobj.cpp +++ b/rel/d/a/obj/d_a_obj_fmobj/d_a_obj_fmobj.cpp @@ -149,6 +149,13 @@ static bool daObj_Fmobj_IsDelete(obj_fmobj_class* param_0) { return true; } +/* ############################################################################################## */ +/* 8057CF74-8057CF74 00000C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8057CF74 = "Obj_Fmobj"; +#pragma pop + /* 8057CC8C-8057CCDC 00012C 0050+00 1/0 0/0 0/0 .text daObj_Fmobj_Delete__FP15obj_fmobj_class */ #pragma push #pragma optimization_level 0 @@ -172,7 +179,7 @@ static asm void useHeapInit(fopAc_ac_c* param_0) { /* ############################################################################################## */ /* 8057CF68-8057CF6C 000000 0004+00 1/1 0/0 0/0 .rodata @3743 */ SECTION_RODATA static f32 const lit_3743 = 65536.0f; -COMPILER_STRIP_GATE(8057CF68, &lit_3743); +COMPILER_STRIP_GATE(0x8057CF68, &lit_3743); /* 8057CF6C-8057CF70 000004 0004+00 0/1 0/0 0/0 .rodata @3744 */ #pragma push @@ -183,14 +190,14 @@ SECTION_RODATA static u8 const lit_3744[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(8057CF6C, &lit_3744); +COMPILER_STRIP_GATE(0x8057CF6C, &lit_3744); #pragma pop /* 8057CF70-8057CF74 000008 0004+00 0/1 0/0 0/0 .rodata @3745 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3745 = -30.0f; -COMPILER_STRIP_GATE(8057CF70, &lit_3745); +COMPILER_STRIP_GATE(0x8057CF70, &lit_3745); #pragma pop /* 8057CDE0-8057CF60 000280 0180+00 1/0 0/0 0/0 .text daObj_Fmobj_Create__FP10fopAc_ac_c @@ -227,9 +234,4 @@ SECTION_DATA extern void* g_profile_OBJ_FMOBJ[12] = { (void*)0x00040100, (void*)0x00070000, }; -/* 8057CF74-8057CF7E 00000C 000A+00 3/3 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_8057CF74 = "Obj_Fmobj"; -#pragma pop +/* 8057CF74-8057CF74 00000C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_food/d_a_obj_food.cpp b/rel/d/a/obj/d_a_obj_food/d_a_obj_food.cpp index b9ef161a5e6..61d9d7486dc 100644 --- a/rel/d/a/obj/d_a_obj_food/d_a_obj_food.cpp +++ b/rel/d/a/obj/d_a_obj_food/d_a_obj_food.cpp @@ -59,10 +59,10 @@ struct dRes_control_c { struct dPa_levelEcallBack {}; -struct _GXColor {}; - struct csXyz {}; +struct _GXColor {}; + struct dPa_control_c { /* 8004D4CC */ void set(u32, u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, @@ -315,7 +315,7 @@ extern "C" void __register_global_object(); /* ############################################################################################## */ /* 80BF1D90-80BF1D94 000000 0004+00 9/9 0/0 0/0 .rodata @3647 */ SECTION_RODATA static f32 const lit_3647 = 1.0f; -COMPILER_STRIP_GATE(80BF1D90, &lit_3647); +COMPILER_STRIP_GATE(0x80BF1D90, &lit_3647); /* 80BF1E18-80BF1E20 000000 0008+00 1/1 0/0 0/0 .data w_eff_id$3948 */ SECTION_DATA static u8 w_eff_id[8] = { @@ -409,14 +409,14 @@ asm daObj_Food_HIO_c::daObj_Food_HIO_c() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3679 = 50.0f; -COMPILER_STRIP_GATE(80BF1D94, &lit_3679); +COMPILER_STRIP_GATE(0x80BF1D94, &lit_3679); #pragma pop /* 80BF1D98-80BF1D9C 000008 0004+00 0/1 0/0 0/0 .rodata @3680 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3680 = 200.0f; -COMPILER_STRIP_GATE(80BF1D98, &lit_3680); +COMPILER_STRIP_GATE(0x80BF1D98, &lit_3680); #pragma pop /* 80BF1D9C-80BF1DA0 00000C 0004+00 0/5 0/0 0/0 .rodata @3681 */ @@ -428,14 +428,14 @@ SECTION_RODATA static u8 const lit_3681[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BF1D9C, &lit_3681); +COMPILER_STRIP_GATE(0x80BF1D9C, &lit_3681); #pragma pop /* 80BF1DA0-80BF1DA4 000010 0004+00 0/1 0/0 0/0 .rodata @3682 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3682 = 19.0f; -COMPILER_STRIP_GATE(80BF1DA0, &lit_3682); +COMPILER_STRIP_GATE(0x80BF1DA0, &lit_3682); #pragma pop /* 80BF0730-80BF0854 000110 0124+00 1/0 0/0 0/0 .text daObj_Food_Draw__FP14obj_food_class @@ -454,14 +454,14 @@ static asm void daObj_Food_Draw(obj_food_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3707 = 10.0f; -COMPILER_STRIP_GATE(80BF1DA4, &lit_3707); +COMPILER_STRIP_GATE(0x80BF1DA4, &lit_3707); #pragma pop /* 80BF1DA8-80BF1DAC 000018 0004+00 0/1 0/0 0/0 .rodata @3708 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3708 = -1000000000.0f; -COMPILER_STRIP_GATE(80BF1DA8, &lit_3708); +COMPILER_STRIP_GATE(0x80BF1DA8, &lit_3708); #pragma pop /* 80BF0854-80BF09A4 000234 0150+00 1/1 0/0 0/0 .text ground_ang_set__FP14obj_food_class @@ -480,14 +480,14 @@ static asm void ground_ang_set(obj_food_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3727 = 70.0f; -COMPILER_STRIP_GATE(80BF1DAC, &lit_3727); +COMPILER_STRIP_GATE(0x80BF1DAC, &lit_3727); #pragma pop /* 80BF1DB0-80BF1DB4 000020 0004+00 0/4 0/0 0/0 .rodata @3728 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3728 = -1.0f; -COMPILER_STRIP_GATE(80BF1DB0, &lit_3728); +COMPILER_STRIP_GATE(0x80BF1DB0, &lit_3728); #pragma pop /* 80BF09A4-80BF0AD0 000384 012C+00 1/1 0/0 0/0 .text food_carry__FP14obj_food_class */ @@ -505,28 +505,28 @@ static asm void food_carry(obj_food_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3782 = 2.0f; -COMPILER_STRIP_GATE(80BF1DB4, &lit_3782); +COMPILER_STRIP_GATE(0x80BF1DB4, &lit_3782); #pragma pop /* 80BF1DB8-80BF1DBC 000028 0004+00 0/2 0/0 0/0 .rodata @3783 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3783 = -20.0f; -COMPILER_STRIP_GATE(80BF1DB8, &lit_3783); +COMPILER_STRIP_GATE(0x80BF1DB8, &lit_3783); #pragma pop /* 80BF1DBC-80BF1DC0 00002C 0004+00 0/2 0/0 0/0 .rodata @3784 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3784 = 15.0f; -COMPILER_STRIP_GATE(80BF1DBC, &lit_3784); +COMPILER_STRIP_GATE(0x80BF1DBC, &lit_3784); #pragma pop /* 80BF1DC0-80BF1DC4 000030 0004+00 0/2 0/0 0/0 .rodata @3785 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3785 = 100.0f; -COMPILER_STRIP_GATE(80BF1DC0, &lit_3785); +COMPILER_STRIP_GATE(0x80BF1DC0, &lit_3785); #pragma pop /* 80BF0AD0-80BF0C74 0004B0 01A4+00 2/2 0/0 0/0 .text wall_angle_get__FP14obj_food_class @@ -545,63 +545,63 @@ static asm void wall_angle_get(obj_food_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3875 = 3.0f / 5.0f; -COMPILER_STRIP_GATE(80BF1DC4, &lit_3875); +COMPILER_STRIP_GATE(0x80BF1DC4, &lit_3875); #pragma pop /* 80BF1DC8-80BF1DCC 000038 0004+00 0/1 0/0 0/0 .rodata @3876 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3876 = -40.0f; -COMPILER_STRIP_GATE(80BF1DC8, &lit_3876); +COMPILER_STRIP_GATE(0x80BF1DC8, &lit_3876); #pragma pop /* 80BF1DCC-80BF1DD0 00003C 0004+00 0/2 0/0 0/0 .rodata @3877 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3877 = -0.5f; -COMPILER_STRIP_GATE(80BF1DCC, &lit_3877); +COMPILER_STRIP_GATE(0x80BF1DCC, &lit_3877); #pragma pop /* 80BF1DD0-80BF1DD4 000040 0004+00 0/2 0/0 0/0 .rodata @3878 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3878 = 8000.0f; -COMPILER_STRIP_GATE(80BF1DD0, &lit_3878); +COMPILER_STRIP_GATE(0x80BF1DD0, &lit_3878); #pragma pop /* 80BF1DD4-80BF1DD8 000044 0004+00 0/2 0/0 0/0 .rodata @3879 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3879 = 0.5f; -COMPILER_STRIP_GATE(80BF1DD4, &lit_3879); +COMPILER_STRIP_GATE(0x80BF1DD4, &lit_3879); #pragma pop /* 80BF1DD8-80BF1DDC 000048 0004+00 0/1 0/0 0/0 .rodata @3880 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3880 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(80BF1DD8, &lit_3880); +COMPILER_STRIP_GATE(0x80BF1DD8, &lit_3880); #pragma pop /* 80BF1DDC-80BF1DE0 00004C 0004+00 0/2 0/0 0/0 .rodata @3881 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3881 = 20.0f; -COMPILER_STRIP_GATE(80BF1DDC, &lit_3881); +COMPILER_STRIP_GATE(0x80BF1DDC, &lit_3881); #pragma pop /* 80BF1DE0-80BF1DE4 000050 0004+00 0/1 0/0 0/0 .rodata @3882 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3882 = 20000.0f; -COMPILER_STRIP_GATE(80BF1DE0, &lit_3882); +COMPILER_STRIP_GATE(0x80BF1DE0, &lit_3882); #pragma pop /* 80BF1DE4-80BF1DE8 000054 0004+00 0/2 0/0 0/0 .rodata @3883 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3883 = 30.0f; -COMPILER_STRIP_GATE(80BF1DE4, &lit_3883); +COMPILER_STRIP_GATE(0x80BF1DE4, &lit_3883); #pragma pop /* 80BF0C74-80BF0FC0 000654 034C+00 1/1 0/0 0/0 .text food_normal__FP14obj_food_class */ @@ -619,21 +619,21 @@ static asm void food_normal(obj_food_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3922 = 3.0f; -COMPILER_STRIP_GATE(80BF1DE8, &lit_3922); +COMPILER_STRIP_GATE(0x80BF1DE8, &lit_3922); #pragma pop /* 80BF1DEC-80BF1DF0 00005C 0004+00 0/2 0/0 0/0 .rodata @3923 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3923 = 6.0f; -COMPILER_STRIP_GATE(80BF1DEC, &lit_3923); +COMPILER_STRIP_GATE(0x80BF1DEC, &lit_3923); #pragma pop /* 80BF1DF0-80BF1DF4 000060 0004+00 0/1 0/0 0/0 .rodata @3924 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3924 = 2.5f; -COMPILER_STRIP_GATE(80BF1DF0, &lit_3924); +COMPILER_STRIP_GATE(0x80BF1DF0, &lit_3924); #pragma pop /* 80BF0FC0-80BF1168 0009A0 01A8+00 1/1 0/0 0/0 .text ball_move__FP14obj_food_class */ @@ -651,49 +651,49 @@ static asm void ball_move(obj_food_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4085 = 700.0f; -COMPILER_STRIP_GATE(80BF1DF4, &lit_4085); +COMPILER_STRIP_GATE(0x80BF1DF4, &lit_4085); #pragma pop /* 80BF1DF8-80BF1DFC 000068 0004+00 0/1 0/0 0/0 .rodata @4086 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4086 = 12.0f; -COMPILER_STRIP_GATE(80BF1DF8, &lit_4086); +COMPILER_STRIP_GATE(0x80BF1DF8, &lit_4086); #pragma pop /* 80BF1DFC-80BF1E00 00006C 0004+00 0/1 0/0 0/0 .rodata @4087 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4087 = 7.0f / 10.0f; -COMPILER_STRIP_GATE(80BF1DFC, &lit_4087); +COMPILER_STRIP_GATE(0x80BF1DFC, &lit_4087); #pragma pop /* 80BF1E00-80BF1E04 000070 0004+00 0/1 0/0 0/0 .rodata @4088 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4088 = -8.0f; -COMPILER_STRIP_GATE(80BF1E00, &lit_4088); +COMPILER_STRIP_GATE(0x80BF1E00, &lit_4088); #pragma pop /* 80BF1E04-80BF1E08 000074 0004+00 0/2 0/0 0/0 .rodata @4089 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4089 = -5.0f; -COMPILER_STRIP_GATE(80BF1E04, &lit_4089); +COMPILER_STRIP_GATE(0x80BF1E04, &lit_4089); #pragma pop /* 80BF1E08-80BF1E0C 000078 0004+00 0/2 0/0 0/0 .rodata @4090 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4090 = -90.0f; -COMPILER_STRIP_GATE(80BF1E08, &lit_4090); +COMPILER_STRIP_GATE(0x80BF1E08, &lit_4090); #pragma pop /* 80BF1E0C-80BF1E10 00007C 0004+00 0/1 0/0 0/0 .rodata @4091 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4091 = 5.0f; -COMPILER_STRIP_GATE(80BF1E0C, &lit_4091); +COMPILER_STRIP_GATE(0x80BF1E0C, &lit_4091); #pragma pop /* 80BF1F40-80BF1F44 000008 0004+00 2/2 0/0 0/0 .bss None */ @@ -730,6 +730,13 @@ static bool daObj_Food_IsDelete(obj_food_class* param_0) { return true; } +/* ############################################################################################## */ +/* 80BF1E10-80BF1E10 000080 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80BF1E10 = "Obj_fd"; +#pragma pop + /* 80BF179C-80BF1804 00117C 0068+00 1/0 0/0 0/0 .text daObj_Food_Delete__FP14obj_food_class */ #pragma push #pragma optimization_level 0 @@ -813,7 +820,7 @@ asm void __sinit_d_a_obj_food_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80BF1D30 = (void*)__sinit_d_a_obj_food_cpp; +REGISTER_CTORS(0x80BF1D30, __sinit_d_a_obj_food_cpp); #pragma pop /* 80BF1D6C-80BF1D74 00174C 0008+00 1/0 0/0 0/0 .text @36@__dt__12dBgS_ObjAcchFv */ @@ -836,9 +843,4 @@ static asm void func_80BF1D74() { } #pragma pop -/* 80BF1E10-80BF1E17 000080 0007+00 3/3 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80BF1E10 = "Obj_fd"; -#pragma pop +/* 80BF1E10-80BF1E10 000080 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_fw/d_a_obj_fw.cpp b/rel/d/a/obj/d_a_obj_fw/d_a_obj_fw.cpp index 3862d67d2ff..a028f2945c5 100644 --- a/rel/d/a/obj/d_a_obj_fw/d_a_obj_fw.cpp +++ b/rel/d/a/obj/d_a_obj_fw/d_a_obj_fw.cpp @@ -183,7 +183,7 @@ extern "C" void __register_global_object(); /* ############################################################################################## */ /* 80BF2B48-80BF2B4C 000000 0004+00 5/5 0/0 0/0 .rodata @3647 */ SECTION_RODATA static f32 const lit_3647 = 1.0f; -COMPILER_STRIP_GATE(80BF2B48, &lit_3647); +COMPILER_STRIP_GATE(0x80BF2B48, &lit_3647); /* 80BF2BAC-80BF2BB4 000000 0008+00 1/1 0/0 0/0 .data bmdd$3836 */ SECTION_DATA static u8 bmdd[8] = { @@ -239,7 +239,7 @@ asm daObj_Fw_HIO_c::daObj_Fw_HIO_c() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3667 = -50.0f; -COMPILER_STRIP_GATE(80BF2B4C, &lit_3667); +COMPILER_STRIP_GATE(0x80BF2B4C, &lit_3667); #pragma pop /* 80BF2B50-80BF2B54 000008 0004+00 0/3 0/0 0/0 .rodata @3668 */ @@ -251,14 +251,14 @@ SECTION_RODATA static u8 const lit_3668[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BF2B50, &lit_3668); +COMPILER_STRIP_GATE(0x80BF2B50, &lit_3668); #pragma pop /* 80BF2B54-80BF2B58 00000C 0004+00 0/2 0/0 0/0 .rodata @3669 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3669 = 10.0f; -COMPILER_STRIP_GATE(80BF2B54, &lit_3669); +COMPILER_STRIP_GATE(0x80BF2B54, &lit_3669); #pragma pop /* 80BF2C20-80BF2C24 000008 0004+00 2/2 0/0 0/0 .bss None */ @@ -294,7 +294,7 @@ static asm void daObj_Fw_Draw(obj_fw_class* param_0) { /* ############################################################################################## */ /* 80BF2B58-80BF2B5C 000010 0004+00 1/1 0/0 0/0 .rodata @3694 */ SECTION_RODATA static f32 const lit_3694 = 500.0f; -COMPILER_STRIP_GATE(80BF2B58, &lit_3694); +COMPILER_STRIP_GATE(0x80BF2B58, &lit_3694); /* 80BF2200-80BF22AC 0002A0 00AC+00 1/1 0/0 0/0 .text water_check__FP12obj_fw_class */ #pragma push @@ -311,84 +311,84 @@ static asm void water_check(obj_fw_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3740 = 0.25f; -COMPILER_STRIP_GATE(80BF2B5C, &lit_3740); +COMPILER_STRIP_GATE(0x80BF2B5C, &lit_3740); #pragma pop /* 80BF2B60-80BF2B64 000018 0004+00 0/1 0/0 0/0 .rodata @3741 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3741 = 3.5f; -COMPILER_STRIP_GATE(80BF2B60, &lit_3741); +COMPILER_STRIP_GATE(0x80BF2B60, &lit_3741); #pragma pop /* 80BF2B64-80BF2B68 00001C 0004+00 0/1 0/0 0/0 .rodata @3742 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3742 = 1.0f / 20.0f; -COMPILER_STRIP_GATE(80BF2B64, &lit_3742); +COMPILER_STRIP_GATE(0x80BF2B64, &lit_3742); #pragma pop /* 80BF2B68-80BF2B6C 000020 0004+00 0/1 0/0 0/0 .rodata @3743 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3743 = -300.0f; -COMPILER_STRIP_GATE(80BF2B68, &lit_3743); +COMPILER_STRIP_GATE(0x80BF2B68, &lit_3743); #pragma pop /* 80BF2B6C-80BF2B70 000024 0004+00 0/1 0/0 0/0 .rodata @3744 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3744 = 3.0f / 100.0f; -COMPILER_STRIP_GATE(80BF2B6C, &lit_3744); +COMPILER_STRIP_GATE(0x80BF2B6C, &lit_3744); #pragma pop /* 80BF2B70-80BF2B74 000028 0004+00 0/1 0/0 0/0 .rodata @3745 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3745 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(80BF2B70, &lit_3745); +COMPILER_STRIP_GATE(0x80BF2B70, &lit_3745); #pragma pop /* 80BF2B74-80BF2B78 00002C 0004+00 0/1 0/0 0/0 .rodata @3746 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3746 = 300.0f; -COMPILER_STRIP_GATE(80BF2B74, &lit_3746); +COMPILER_STRIP_GATE(0x80BF2B74, &lit_3746); #pragma pop /* 80BF2B78-80BF2B7C 000030 0004+00 0/1 0/0 0/0 .rodata @3747 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3747 = 2.0f; -COMPILER_STRIP_GATE(80BF2B78, &lit_3747); +COMPILER_STRIP_GATE(0x80BF2B78, &lit_3747); #pragma pop /* 80BF2B7C-80BF2B80 000034 0004+00 0/1 0/0 0/0 .rodata @3748 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3748 = 20.0f; -COMPILER_STRIP_GATE(80BF2B7C, &lit_3748); +COMPILER_STRIP_GATE(0x80BF2B7C, &lit_3748); #pragma pop /* 80BF2B80-80BF2B84 000038 0004+00 0/1 0/0 0/0 .rodata @3749 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3749 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(80BF2B80, &lit_3749); +COMPILER_STRIP_GATE(0x80BF2B80, &lit_3749); #pragma pop /* 80BF2B84-80BF2B88 00003C 0004+00 0/1 0/0 0/0 .rodata @3750 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3750 = -20.0f; -COMPILER_STRIP_GATE(80BF2B84, &lit_3750); +COMPILER_STRIP_GATE(0x80BF2B84, &lit_3750); #pragma pop /* 80BF2B88-80BF2B8C 000040 0004+00 0/1 0/0 0/0 .rodata @3751 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3751 = 3.0f; -COMPILER_STRIP_GATE(80BF2B88, &lit_3751); +COMPILER_STRIP_GATE(0x80BF2B88, &lit_3751); #pragma pop /* 80BF22AC-80BF24C4 00034C 0218+00 1/1 0/0 0/0 .text fw_float__FP12obj_fw_class */ @@ -406,7 +406,7 @@ static asm void fw_float(obj_fw_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3802 = 15.0f; -COMPILER_STRIP_GATE(80BF2B8C, &lit_3802); +COMPILER_STRIP_GATE(0x80BF2B8C, &lit_3802); #pragma pop /* 80BF24C4-80BF2670 000564 01AC+00 1/1 0/0 0/0 .text action__FP12obj_fw_class */ @@ -436,6 +436,13 @@ static bool daObj_Fw_IsDelete(obj_fw_class* param_0) { return true; } +/* ############################################################################################## */ +/* 80BF2BA4-80BF2BA4 00005C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80BF2BA4 = "RYUW00"; +#pragma pop + /* 80BF2720-80BF279C 0007C0 007C+00 1/0 0/0 0/0 .text daObj_Fw_Delete__FP12obj_fw_class */ #pragma push @@ -462,35 +469,35 @@ static asm void useHeapInit(fopAc_ac_c* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3918 = -1000.0f; -COMPILER_STRIP_GATE(80BF2B90, &lit_3918); +COMPILER_STRIP_GATE(0x80BF2B90, &lit_3918); #pragma pop /* 80BF2B94-80BF2B98 00004C 0004+00 0/1 0/0 0/0 .rodata @3919 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3919 = -600.0f; -COMPILER_STRIP_GATE(80BF2B94, &lit_3919); +COMPILER_STRIP_GATE(0x80BF2B94, &lit_3919); #pragma pop /* 80BF2B98-80BF2B9C 000050 0004+00 0/1 0/0 0/0 .rodata @3920 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3920 = 1000.0f; -COMPILER_STRIP_GATE(80BF2B98, &lit_3920); +COMPILER_STRIP_GATE(0x80BF2B98, &lit_3920); #pragma pop /* 80BF2B9C-80BF2BA0 000054 0004+00 0/1 0/0 0/0 .rodata @3921 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3921 = 600.0f; -COMPILER_STRIP_GATE(80BF2B9C, &lit_3921); +COMPILER_STRIP_GATE(0x80BF2B9C, &lit_3921); #pragma pop /* 80BF2BA0-80BF2BA4 000058 0004+00 0/1 0/0 0/0 .rodata @3922 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3922 = 65536.0f; -COMPILER_STRIP_GATE(80BF2BA0, &lit_3922); +COMPILER_STRIP_GATE(0x80BF2BA0, &lit_3922); #pragma pop /* 80BF28D0-80BF2AB0 000970 01E0+00 1/0 0/0 0/0 .text daObj_Fw_Create__FP10fopAc_ac_c */ @@ -525,12 +532,7 @@ asm void __sinit_d_a_obj_fw_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80BF2AF8 = (void*)__sinit_d_a_obj_fw_cpp; +REGISTER_CTORS(0x80BF2AF8, __sinit_d_a_obj_fw_cpp); #pragma pop -/* 80BF2BA4-80BF2BAB 00005C 0007+00 3/3 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80BF2BA4 = "RYUW00"; -#pragma pop +/* 80BF2BA4-80BF2BA4 00005C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_gadget/d_a_obj_gadget.cpp b/rel/d/a/obj/d_a_obj_gadget/d_a_obj_gadget.cpp index c725f2a6722..293827575dd 100644 --- a/rel/d/a/obj/d_a_obj_gadget/d_a_obj_gadget.cpp +++ b/rel/d/a/obj/d_a_obj_gadget/d_a_obj_gadget.cpp @@ -238,7 +238,7 @@ extern "C" static void daObj_Gadget_Execute__FPv(); extern "C" static void daObj_Gadget_Draw__FPv(); extern "C" static bool daObj_Gadget_IsDelete__FPv(); extern "C" void __dt__10cCcD_GSttsFv(); -extern "C" void func_80BF4848(int*); +extern "C" void func_80BF4848(void* _this, int*); extern "C" void __sinit_d_a_obj_gadget_cpp(); extern "C" void __dt__20daObj_Gadget_Param_cFv(); extern "C" static void func_80BF4920(); @@ -351,6 +351,13 @@ extern "C" void __register_global_object(); // /* ############################################################################################## */ +/* 80BF4A24-80BF4A24 0000E0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80BF4A24 = ""; +SECTION_DEAD static char const* const stringBase_80BF4A25 = "ykM1"; +#pragma pop + /* 80BF4A2C-80BF4A38 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -502,7 +509,7 @@ SECTION_RODATA u8 const daObj_Gadget_Param_c::m[44] = { 0x00, 0x42, 0x14, 0x00, 0x00, 0x41, 0xD0, 0x00, 0x00, 0x41, 0x50, 0x00, 0x00, 0x41, 0x60, 0x00, 0x00, 0x42, 0x14, 0x00, 0x00, 0x42, 0x48, 0x00, 0x00, 0x41, 0x90, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BF4944, &daObj_Gadget_Param_c::m); +COMPILER_STRIP_GATE(0x80BF4944, &daObj_Gadget_Param_c::m); /* 80BF4970-80BF49A0 00002C 0030+00 1/1 0/0 0/0 .rodata l_ccDObjData */ SECTION_RODATA static u8 const l_ccDObjData[48] = { @@ -510,41 +517,41 @@ SECTION_RODATA static u8 const l_ccDObjData[48] = { 0xD8, 0xFB, 0xFD, 0xFF, 0x00, 0x00, 0x00, 0x1F, 0x00, 0x00, 0x00, 0x79, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BF4970, &l_ccDObjData); +COMPILER_STRIP_GATE(0x80BF4970, &l_ccDObjData); /* 80BF49A0-80BF49A4 00005C 0004+00 0/1 0/0 0/0 .rodata @3935 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3935 = -300.0f; -COMPILER_STRIP_GATE(80BF49A0, &lit_3935); +COMPILER_STRIP_GATE(0x80BF49A0, &lit_3935); #pragma pop /* 80BF49A4-80BF49A8 000060 0004+00 0/2 0/0 0/0 .rodata @3936 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3936 = -50.0f; -COMPILER_STRIP_GATE(80BF49A4, &lit_3936); +COMPILER_STRIP_GATE(0x80BF49A4, &lit_3936); #pragma pop /* 80BF49A8-80BF49AC 000064 0004+00 0/1 0/0 0/0 .rodata @3937 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3937 = 300.0f; -COMPILER_STRIP_GATE(80BF49A8, &lit_3937); +COMPILER_STRIP_GATE(0x80BF49A8, &lit_3937); #pragma pop /* 80BF49AC-80BF49B0 000068 0004+00 0/1 0/0 0/0 .rodata @3938 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3938 = 450.0f; -COMPILER_STRIP_GATE(80BF49AC, &lit_3938); +COMPILER_STRIP_GATE(0x80BF49AC, &lit_3938); #pragma pop /* 80BF49B0-80BF49B4 00006C 0004+00 0/3 0/0 0/0 .rodata @3939 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3939 = -1000000000.0f; -COMPILER_STRIP_GATE(80BF49B0, &lit_3939); +COMPILER_STRIP_GATE(0x80BF49B0, &lit_3939); #pragma pop /* 80BF2F28-80BF3228 0002E8 0300+00 1/1 0/0 0/0 .text create__14daObj_Gadget_cFv */ @@ -657,120 +664,120 @@ SECTION_RODATA static u8 const lit_4350[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BF49B4, &lit_4350); +COMPILER_STRIP_GATE(0x80BF49B4, &lit_4350); #pragma pop /* 80BF49B8-80BF49BC 000074 0004+00 0/1 0/0 0/0 .rodata @4351 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4351 = 0x43360B61; -COMPILER_STRIP_GATE(80BF49B8, &lit_4351); +COMPILER_STRIP_GATE(0x80BF49B8, &lit_4351); #pragma pop /* 80BF49BC-80BF49C0 000078 0004+00 0/1 0/0 0/0 .rodata @4352 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4352 = 3000.0f; -COMPILER_STRIP_GATE(80BF49BC, &lit_4352); +COMPILER_STRIP_GATE(0x80BF49BC, &lit_4352); #pragma pop /* 80BF49C0-80BF49C4 00007C 0004+00 0/1 0/0 0/0 .rodata @4353 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4353 = 3.0f / 10.0f; -COMPILER_STRIP_GATE(80BF49C0, &lit_4353); +COMPILER_STRIP_GATE(0x80BF49C0, &lit_4353); #pragma pop /* 80BF49C4-80BF49C8 000080 0004+00 0/1 0/0 0/0 .rodata @4354 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4354 = 0.5f; -COMPILER_STRIP_GATE(80BF49C4, &lit_4354); +COMPILER_STRIP_GATE(0x80BF49C4, &lit_4354); #pragma pop /* 80BF49C8-80BF49CC 000084 0004+00 0/1 0/0 0/0 .rodata @4355 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4355 = 2.0f; -COMPILER_STRIP_GATE(80BF49C8, &lit_4355); +COMPILER_STRIP_GATE(0x80BF49C8, &lit_4355); #pragma pop /* 80BF49CC-80BF49D0 000088 0004+00 0/1 0/0 0/0 .rodata @4356 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4356 = 5.5f; -COMPILER_STRIP_GATE(80BF49CC, &lit_4356); +COMPILER_STRIP_GATE(0x80BF49CC, &lit_4356); #pragma pop /* 80BF49D0-80BF49D4 00008C 0004+00 0/1 0/0 0/0 .rodata @4357 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4357 = 0.75f; -COMPILER_STRIP_GATE(80BF49D0, &lit_4357); +COMPILER_STRIP_GATE(0x80BF49D0, &lit_4357); #pragma pop /* 80BF49D4-80BF49D8 000090 0004+00 0/1 0/0 0/0 .rodata @4358 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4358 = 0.25f; -COMPILER_STRIP_GATE(80BF49D4, &lit_4358); +COMPILER_STRIP_GATE(0x80BF49D4, &lit_4358); #pragma pop /* 80BF49D8-80BF49DC 000094 0004+00 1/3 0/0 0/0 .rodata @4359 */ SECTION_RODATA static f32 const lit_4359 = 1.0f; -COMPILER_STRIP_GATE(80BF49D8, &lit_4359); +COMPILER_STRIP_GATE(0x80BF49D8, &lit_4359); /* 80BF49DC-80BF49E0 000098 0004+00 0/1 0/0 0/0 .rodata @4360 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4360 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(80BF49DC, &lit_4360); +COMPILER_STRIP_GATE(0x80BF49DC, &lit_4360); #pragma pop /* 80BF49E0-80BF49E4 00009C 0004+00 0/1 0/0 0/0 .rodata @4361 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4361 = 2000.0f; -COMPILER_STRIP_GATE(80BF49E0, &lit_4361); +COMPILER_STRIP_GATE(0x80BF49E0, &lit_4361); #pragma pop /* 80BF49E4-80BF49E8 0000A0 0004+00 0/1 0/0 0/0 .rodata @4362 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4362 = 1000.0f; -COMPILER_STRIP_GATE(80BF49E4, &lit_4362); +COMPILER_STRIP_GATE(0x80BF49E4, &lit_4362); #pragma pop /* 80BF49E8-80BF49EC 0000A4 0004+00 0/1 0/0 0/0 .rodata @4363 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4363 = 1200.0f; -COMPILER_STRIP_GATE(80BF49E8, &lit_4363); +COMPILER_STRIP_GATE(0x80BF49E8, &lit_4363); #pragma pop /* 80BF49EC-80BF49F0 0000A8 0004+00 0/1 0/0 0/0 .rodata @4364 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4364 = 900.0f; -COMPILER_STRIP_GATE(80BF49EC, &lit_4364); +COMPILER_STRIP_GATE(0x80BF49EC, &lit_4364); #pragma pop /* 80BF49F0-80BF49F4 0000AC 0004+00 1/2 0/0 0/0 .rodata @4365 */ SECTION_RODATA static f32 const lit_4365 = 1.0f / 20.0f; -COMPILER_STRIP_GATE(80BF49F0, &lit_4365); +COMPILER_STRIP_GATE(0x80BF49F0, &lit_4365); /* 80BF49F4-80BF49F8 0000B0 0004+00 0/1 0/0 0/0 .rodata @4366 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4366 = 100.0f; -COMPILER_STRIP_GATE(80BF49F4, &lit_4366); +COMPILER_STRIP_GATE(0x80BF49F4, &lit_4366); #pragma pop /* 80BF49F8-80BF49FC 0000B4 0004+00 0/1 0/0 0/0 .rodata @4367 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4367 = 9.0f / 20.0f; -COMPILER_STRIP_GATE(80BF49F8, &lit_4367); +COMPILER_STRIP_GATE(0x80BF49F8, &lit_4367); #pragma pop /* 80BF49FC-80BF4A04 0000B8 0004+04 0/1 0/0 0/0 .rodata @4368 */ @@ -781,14 +788,14 @@ SECTION_RODATA static f32 const lit_4368[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80BF49FC, &lit_4368); +COMPILER_STRIP_GATE(0x80BF49FC, &lit_4368); #pragma pop /* 80BF4A04-80BF4A0C 0000C0 0008+00 1/2 0/0 0/0 .rodata @4370 */ SECTION_RODATA static u8 const lit_4370[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BF4A04, &lit_4370); +COMPILER_STRIP_GATE(0x80BF4A04, &lit_4370); /* 80BF3538-80BF3FAC 0008F8 0A74+00 2/2 0/0 0/0 .text Execute__14daObj_Gadget_cFv */ #pragma push @@ -805,7 +812,7 @@ asm void daObj_Gadget_c::Execute() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4402 = 20.0f; -COMPILER_STRIP_GATE(80BF4A0C, &lit_4402); +COMPILER_STRIP_GATE(0x80BF4A0C, &lit_4402); #pragma pop /* 80BF3FAC-80BF40E8 00136C 013C+00 1/1 0/0 0/0 .text Draw__14daObj_Gadget_cFv */ @@ -896,21 +903,21 @@ asm void daObj_Gadget_c::calcRollAngle(s16 param_0, int param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4527 = 5.0f; -COMPILER_STRIP_GATE(80BF4A10, &lit_4527); +COMPILER_STRIP_GATE(0x80BF4A10, &lit_4527); #pragma pop /* 80BF4A14-80BF4A18 0000D0 0004+00 0/1 0/0 0/0 .rodata @4528 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4528 = 200.0f; -COMPILER_STRIP_GATE(80BF4A14, &lit_4528); +COMPILER_STRIP_GATE(0x80BF4A14, &lit_4528); #pragma pop /* 80BF4A18-80BF4A1C 0000D4 0004+00 0/1 0/0 0/0 .rodata @4529 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4529 = -1.0f; -COMPILER_STRIP_GATE(80BF4A18, &lit_4529); +COMPILER_STRIP_GATE(0x80BF4A18, &lit_4529); #pragma pop /* 80BF43F4-80BF4584 0017B4 0190+00 1/1 0/0 0/0 .text getWallAngle__14daObj_Gadget_cFsPs @@ -927,7 +934,7 @@ asm void daObj_Gadget_c::getWallAngle(s16 param_0, s16* param_1) { /* ############################################################################################## */ /* 80BF4A1C-80BF4A20 0000D8 0004+00 2/2 0/0 0/0 .rodata @4545 */ SECTION_RODATA static f32 const lit_4545 = 2.0f / 5.0f; -COMPILER_STRIP_GATE(80BF4A1C, &lit_4545); +COMPILER_STRIP_GATE(0x80BF4A1C, &lit_4545); /* 80BF4584-80BF4600 001944 007C+00 1/1 0/0 0/0 .text setSmokePrtcl__14daObj_Gadget_cFv */ @@ -1066,7 +1073,7 @@ asm void daObj_Gadget_c::setWaterPrtcl() { /* ############################################################################################## */ /* 80BF4A20-80BF4A24 0000DC 0004+00 1/1 0/0 0/0 .rodata @4592 */ SECTION_RODATA static f32 const lit_4592 = 7.0f / 10.0f; -COMPILER_STRIP_GATE(80BF4A20, &lit_4592); +COMPILER_STRIP_GATE(0x80BF4A20, &lit_4592); /* 80BF4728-80BF4778 001AE8 0050+00 1/1 0/0 0/0 .text setHamonPrtcl__14daObj_Gadget_cFv */ @@ -1138,7 +1145,7 @@ asm cCcD_GStts::~cCcD_GStts() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80BF4848(int* param_0) { +extern "C" asm void func_80BF4848(void* _this, int* param_0) { nofralloc #include "asm/rel/d/a/obj/d_a_obj_gadget/d_a_obj_gadget/func_80BF4848.s" } @@ -1164,7 +1171,7 @@ asm void __sinit_d_a_obj_gadget_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80BF4864 = (void*)__sinit_d_a_obj_gadget_cpp; +REGISTER_CTORS(0x80BF4864, __sinit_d_a_obj_gadget_cpp); #pragma pop /* 80BF48D8-80BF4920 001C98 0048+00 2/1 0/0 0/0 .text __dt__20daObj_Gadget_Param_cFv */ @@ -1369,10 +1376,4 @@ static u8 data_80BF4C60[4]; static u8 data_80BF4C64[4]; #pragma pop -/* 80BF4A24-80BF4A2A 0000E0 0006+00 1/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80BF4A24 = ""; -SECTION_DEAD static char const* const stringBase_80BF4A25 = "ykM1"; -#pragma pop +/* 80BF4A24-80BF4A24 0000E0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_ganonwall/d_a_obj_ganonwall.cpp b/rel/d/a/obj/d_a_obj_ganonwall/d_a_obj_ganonwall.cpp index a2730953c7f..6ab4cadf258 100644 --- a/rel/d/a/obj/d_a_obj_ganonwall/d_a_obj_ganonwall.cpp +++ b/rel/d/a/obj/d_a_obj_ganonwall/d_a_obj_ganonwall.cpp @@ -186,7 +186,7 @@ SECTION_RODATA static u8 const l_idx[96] = { 0x0B, 0x11, 0x06, 0x05, 0x11, 0x13, 0x02, 0x00, 0x11, 0x13, 0x02, 0x01, 0x13, 0x17, 0x04, 0x00, 0x13, 0x17, 0x04, 0x01, 0x13, 0x17, 0x04, 0x02, 0x13, 0x17, 0x04, 0x03, 0x17, 0x05, 0x06, 0x00, }; -COMPILER_STRIP_GATE(80BF55EC, &l_idx); +COMPILER_STRIP_GATE(0x80BF55EC, &l_idx); /* 80BF564C-80BF56AC 000060 0060+00 0/1 0/0 0/0 .rodata l_color */ #pragma push @@ -199,12 +199,19 @@ SECTION_RODATA static u8 const l_color[96] = { 0xFF, 0xFF, 0xFF, 0xFF, 0x64, 0x64, 0x64, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x78, 0x78, 0x78, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xB4, 0xB4, 0xB4, 0xFF, }; -COMPILER_STRIP_GATE(80BF564C, &l_color); +COMPILER_STRIP_GATE(0x80BF564C, &l_color); #pragma pop /* 80BF56AC-80BF56B0 0000C0 0004+00 1/1 0/0 0/0 .rodata @3681 */ SECTION_RODATA static f32 const lit_3681 = 1000000.0f; -COMPILER_STRIP_GATE(80BF56AC, &lit_3681); +COMPILER_STRIP_GATE(0x80BF56AC, &lit_3681); + +/* 80BF56D4-80BF56D4 0000E8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80BF56D4 = "Y_gwall"; +SECTION_DEAD static char const* const stringBase_80BF56DC = "mat00"; +#pragma pop /* 80BF56E4-80BF56E8 -00001 0004+00 3/3 0/0 0/0 .data l_arcName */ SECTION_DATA static void* l_arcName = (void*)&d_a_obj_ganonwall__stringBase0; @@ -225,7 +232,7 @@ asm void daObjGWall_c::Create() { /* ############################################################################################## */ /* 80BF56B0-80BF56B4 0000C4 0004+00 1/1 0/0 0/0 .rodata @3711 */ SECTION_RODATA static f32 const lit_3711 = 1.0f; -COMPILER_STRIP_GATE(80BF56B0, &lit_3711); +COMPILER_STRIP_GATE(0x80BF56B0, &lit_3711); /* 80BF56EC-80BF570C -00001 0020+00 1/0 0/0 0/0 .data l_daObjGWall_Method */ SECTION_DATA static void* l_daObjGWall_Method[8] = { @@ -311,14 +318,14 @@ asm void daObjGWall_c::checkDraw() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3836 = 1000.0f; -COMPILER_STRIP_GATE(80BF56B4, &lit_3836); +COMPILER_STRIP_GATE(0x80BF56B4, &lit_3836); #pragma pop /* 80BF56B8-80BF56BC 0000CC 0004+00 0/1 0/0 0/0 .rodata @3837 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3837 = 250000.0f; -COMPILER_STRIP_GATE(80BF56B8, &lit_3837); +COMPILER_STRIP_GATE(0x80BF56B8, &lit_3837); #pragma pop /* 80BF56BC-80BF56C4 0000D0 0004+04 0/1 0/0 0/0 .rodata @3838 */ @@ -329,7 +336,7 @@ SECTION_RODATA static f32 const lit_3838[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80BF56BC, &lit_3838); +COMPILER_STRIP_GATE(0x80BF56BC, &lit_3838); #pragma pop /* 80BF56C4-80BF56CC 0000D8 0008+00 0/1 0/0 0/0 .rodata @3840 */ @@ -338,7 +345,7 @@ COMPILER_STRIP_GATE(80BF56BC, &lit_3838); SECTION_RODATA static u8 const lit_3840[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BF56C4, &lit_3840); +COMPILER_STRIP_GATE(0x80BF56C4, &lit_3840); #pragma pop /* 80BF56CC-80BF56D4 0000E0 0008+00 0/1 0/0 0/0 .rodata @3842 */ @@ -347,7 +354,7 @@ COMPILER_STRIP_GATE(80BF56C4, &lit_3840); SECTION_RODATA static u8 const lit_3842[8] = { 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BF56CC, &lit_3842); +COMPILER_STRIP_GATE(0x80BF56CC, &lit_3842); #pragma pop /* 80BF5168-80BF5530 0004E8 03C8+00 1/1 0/0 0/0 .text draw__12daObjGWall_cFv */ @@ -413,10 +420,4 @@ static asm void daObjGWall_Create(daObjGWall_c* param_0) { } #pragma pop -/* 80BF56D4-80BF56E2 0000E8 000E+00 2/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80BF56D4 = "Y_gwall"; -SECTION_DEAD static char const* const stringBase_80BF56DC = "mat00"; -#pragma pop +/* 80BF56D4-80BF56D4 0000E8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_ganonwall2/d_a_obj_ganonwall2.cpp b/rel/d/a/obj/d_a_obj_ganonwall2/d_a_obj_ganonwall2.cpp index 93b71c575b4..a69c6824bdf 100644 --- a/rel/d/a/obj/d_a_obj_ganonwall2/d_a_obj_ganonwall2.cpp +++ b/rel/d/a/obj/d_a_obj_ganonwall2/d_a_obj_ganonwall2.cpp @@ -89,10 +89,10 @@ struct dBgS_MoveBgActor { /* 80078950 */ void MoveBGExecute(); }; -struct Vec {}; - struct JAISoundID {}; +struct Vec {}; + struct Z2SeMgr { /* 802AC50C */ void seStartLevel(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); }; @@ -214,7 +214,7 @@ SECTION_RODATA static u8 const l_idx[96] = { 0x0B, 0x11, 0x06, 0x05, 0x11, 0x13, 0x02, 0x00, 0x11, 0x13, 0x02, 0x01, 0x13, 0x17, 0x04, 0x00, 0x13, 0x17, 0x04, 0x01, 0x13, 0x17, 0x04, 0x02, 0x13, 0x17, 0x04, 0x03, 0x17, 0x05, 0x06, 0x00, }; -COMPILER_STRIP_GATE(80BF610C, &l_idx); +COMPILER_STRIP_GATE(0x80BF610C, &l_idx); /* 80BF616C-80BF61CC 000060 0060+00 0/1 0/0 0/0 .rodata l_color */ #pragma push @@ -227,7 +227,7 @@ SECTION_RODATA static u8 const l_color[96] = { 0xFF, 0xFF, 0xFF, 0xFF, 0x64, 0x64, 0x64, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x78, 0x78, 0x78, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xB4, 0xB4, 0xB4, 0xFF, }; -COMPILER_STRIP_GATE(80BF616C, &l_color); +COMPILER_STRIP_GATE(0x80BF616C, &l_color); #pragma pop /* 80BF61CC-80BF61D0 0000C0 0004+00 0/1 0/0 0/0 .rodata @3670 */ @@ -239,21 +239,28 @@ SECTION_RODATA static u8 const lit_3670[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BF61CC, &lit_3670); +COMPILER_STRIP_GATE(0x80BF61CC, &lit_3670); #pragma pop /* 80BF61D0-80BF61D4 0000C4 0004+00 0/1 0/0 0/0 .rodata @3671 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3671 = 800.0f; -COMPILER_STRIP_GATE(80BF61D0, &lit_3671); +COMPILER_STRIP_GATE(0x80BF61D0, &lit_3671); #pragma pop /* 80BF61D4-80BF61D8 0000C8 0004+00 0/1 0/0 0/0 .rodata @3672 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3672 = -10372.5f; -COMPILER_STRIP_GATE(80BF61D4, &lit_3672); +COMPILER_STRIP_GATE(0x80BF61D4, &lit_3672); +#pragma pop + +/* 80BF61FC-80BF61FC 0000F0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80BF61FC = "V_CTGWall"; +SECTION_DEAD static char const* const stringBase_80BF6206 = "mat00"; #pragma pop /* 80BF620C-80BF6210 -00001 0004+00 3/3 0/0 0/0 .data l_arcName */ @@ -275,7 +282,7 @@ asm void daObjGWall2_c::Create() { /* ############################################################################################## */ /* 80BF61D8-80BF61DC 0000CC 0004+00 2/2 0/0 0/0 .rodata @3702 */ SECTION_RODATA static f32 const lit_3702 = 1.0f; -COMPILER_STRIP_GATE(80BF61D8, &lit_3702); +COMPILER_STRIP_GATE(0x80BF61D8, &lit_3702); /* 80BF6214-80BF6234 -00001 0020+00 1/0 0/0 0/0 .data daObjGWall2_METHODS */ SECTION_DATA static void* daObjGWall2_METHODS[8] = { @@ -339,7 +346,7 @@ asm void daObjGWall2_c::create1st() { /* ############################################################################################## */ /* 80BF61DC-80BF61E0 0000D0 0004+00 1/1 0/0 0/0 .rodata @3737 */ SECTION_RODATA static f32 const lit_3737 = -1.0f; -COMPILER_STRIP_GATE(80BF61DC, &lit_3737); +COMPILER_STRIP_GATE(0x80BF61DC, &lit_3737); /* 80BF5B74-80BF5C0C 000414 0098+00 1/0 0/0 0/0 .text Execute__13daObjGWall2_cFPPA3_A4_f */ @@ -357,21 +364,21 @@ asm void daObjGWall2_c::Execute(f32 (**param_0)[3][4]) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3827 = 1000.0f; -COMPILER_STRIP_GATE(80BF61E0, &lit_3827); +COMPILER_STRIP_GATE(0x80BF61E0, &lit_3827); #pragma pop /* 80BF61E4-80BF61E8 0000D8 0004+00 0/1 0/0 0/0 .rodata @3828 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3828 = 250000.0f; -COMPILER_STRIP_GATE(80BF61E4, &lit_3828); +COMPILER_STRIP_GATE(0x80BF61E4, &lit_3828); #pragma pop /* 80BF61E8-80BF61EC 0000DC 0004+00 0/1 0/0 0/0 .rodata @3829 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3829 = 60.0f; -COMPILER_STRIP_GATE(80BF61E8, &lit_3829); +COMPILER_STRIP_GATE(0x80BF61E8, &lit_3829); #pragma pop /* 80BF61EC-80BF61F4 0000E0 0008+00 0/1 0/0 0/0 .rodata @3831 */ @@ -380,7 +387,7 @@ COMPILER_STRIP_GATE(80BF61E8, &lit_3829); SECTION_RODATA static u8 const lit_3831[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BF61EC, &lit_3831); +COMPILER_STRIP_GATE(0x80BF61EC, &lit_3831); #pragma pop /* 80BF61F4-80BF61FC 0000E8 0008+00 0/1 0/0 0/0 .rodata @3833 */ @@ -389,7 +396,7 @@ COMPILER_STRIP_GATE(80BF61EC, &lit_3831); SECTION_RODATA static u8 const lit_3833[8] = { 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BF61F4, &lit_3833); +COMPILER_STRIP_GATE(0x80BF61F4, &lit_3833); #pragma pop /* 80BF5C0C-80BF6004 0004AC 03F8+00 1/0 0/0 0/0 .text Draw__13daObjGWall2_cFv */ @@ -469,10 +476,4 @@ static asm void daObjGWall2_MoveBGDraw(daObjGWall2_c* param_0) { } #pragma pop -/* 80BF61FC-80BF620C 0000F0 0010+00 2/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80BF61FC = "V_CTGWall"; -SECTION_DEAD static char const* const stringBase_80BF6206 = "mat00"; -#pragma pop +/* 80BF61FC-80BF61FC 0000F0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_gb/d_a_obj_gb.cpp b/rel/d/a/obj/d_a_obj_gb/d_a_obj_gb.cpp index 9523834642c..4a5e6c132be 100644 --- a/rel/d/a/obj/d_a_obj_gb/d_a_obj_gb.cpp +++ b/rel/d/a/obj/d_a_obj_gb/d_a_obj_gb.cpp @@ -91,10 +91,10 @@ struct cBgS { /* 80074250 */ void Release(dBgW_Base*); }; -struct Vec {}; - struct JAISoundID {}; +struct Vec {}; + struct Z2SeMgr { /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); /* 802AC50C */ void seStartLevel(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); @@ -201,24 +201,24 @@ static asm void daObj_Gb_Draw(obj_gb_class* param_0) { /* ############################################################################################## */ /* 80BF6DBC-80BF6DC0 000000 0004+00 2/2 0/0 0/0 .rodata @3890 */ SECTION_RODATA static f32 const lit_3890 = 0.5f; -COMPILER_STRIP_GATE(80BF6DBC, &lit_3890); +COMPILER_STRIP_GATE(0x80BF6DBC, &lit_3890); /* 80BF6DC0-80BF6DC4 000004 0004+00 1/2 0/0 0/0 .rodata @3891 */ SECTION_RODATA static f32 const lit_3891 = 1.0f; -COMPILER_STRIP_GATE(80BF6DC0, &lit_3891); +COMPILER_STRIP_GATE(0x80BF6DC0, &lit_3891); /* 80BF6DC4-80BF6DC8 000008 0004+00 0/1 0/0 0/0 .rodata @3892 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3892 = -1.0f; -COMPILER_STRIP_GATE(80BF6DC4, &lit_3892); +COMPILER_STRIP_GATE(0x80BF6DC4, &lit_3892); #pragma pop /* 80BF6DC8-80BF6DCC 00000C 0004+00 0/1 0/0 0/0 .rodata @3893 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3893 = 29.0f; -COMPILER_STRIP_GATE(80BF6DC8, &lit_3893); +COMPILER_STRIP_GATE(0x80BF6DC8, &lit_3893); #pragma pop /* 80BF6DCC-80BF6DD0 000010 0004+00 1/3 0/0 0/0 .rodata @3894 */ @@ -228,13 +228,19 @@ SECTION_RODATA static u8 const lit_3894[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BF6DCC, &lit_3894); +COMPILER_STRIP_GATE(0x80BF6DCC, &lit_3894); /* 80BF6DD0-80BF6DD4 000014 0004+00 0/1 0/0 0/0 .rodata @3895 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3895 = -200.0f; -COMPILER_STRIP_GATE(80BF6DD0, &lit_3895); +COMPILER_STRIP_GATE(0x80BF6DD0, &lit_3895); +#pragma pop + +/* 80BF6DEC-80BF6DEC 000030 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80BF6DEC = "D_MN09B"; #pragma pop /* 80BF63F8-80BF678C 000158 0394+00 2/1 0/0 0/0 .text daObj_Gb_Execute__FP12obj_gb_class @@ -264,6 +270,13 @@ static bool daObj_Gb_IsDelete(obj_gb_class* param_0) { return true; } +/* ############################################################################################## */ +/* 80BF6DEC-80BF6DEC 000030 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80BF6DF4 = "Obj_gb"; +#pragma pop + /* 80BF67D0-80BF682C 000530 005C+00 1/0 0/0 0/0 .text daObj_Gb_Delete__FP12obj_gb_class */ #pragma push @@ -380,28 +393,28 @@ asm J3DFrameCtrl::~J3DFrameCtrl() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4083 = 1.0f / 100.0f; -COMPILER_STRIP_GATE(80BF6DD4, &lit_4083); +COMPILER_STRIP_GATE(0x80BF6DD4, &lit_4083); #pragma pop /* 80BF6DD8-80BF6DDC 00001C 0004+00 0/1 0/0 0/0 .rodata @4084 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4084 = 0x3EAAAA9F; -COMPILER_STRIP_GATE(80BF6DD8, &lit_4084); +COMPILER_STRIP_GATE(0x80BF6DD8, &lit_4084); #pragma pop /* 80BF6DDC-80BF6DE0 000020 0004+00 0/1 0/0 0/0 .rodata @4085 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4085 = 65536.0f; -COMPILER_STRIP_GATE(80BF6DDC, &lit_4085); +COMPILER_STRIP_GATE(0x80BF6DDC, &lit_4085); #pragma pop /* 80BF6DE0-80BF6DE4 000024 0004+00 0/1 0/0 0/0 .rodata @4086 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4086 = 1000.0f; -COMPILER_STRIP_GATE(80BF6DE0, &lit_4086); +COMPILER_STRIP_GATE(0x80BF6DE0, &lit_4086); #pragma pop /* 80BF6DE4-80BF6DEC 000028 0008+00 0/1 0/0 0/0 .rodata @4088 */ @@ -410,7 +423,7 @@ COMPILER_STRIP_GATE(80BF6DE0, &lit_4086); SECTION_RODATA static u8 const lit_4088[8] = { 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BF6DE4, &lit_4088); +COMPILER_STRIP_GATE(0x80BF6DE4, &lit_4088); #pragma pop /* 80BF6AE0-80BF6DB0 000840 02D0+00 1/0 0/0 0/0 .text daObj_Gb_Create__FP10fopAc_ac_c */ @@ -428,10 +441,4 @@ cXyz::cXyz() { /* empty function */ } -/* 80BF6DEC-80BF6DFB 000030 000F+00 4/4 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80BF6DEC = "D_MN09B"; -SECTION_DEAD static char const* const stringBase_80BF6DF4 = "Obj_gb"; -#pragma pop +/* 80BF6DEC-80BF6DEC 000030 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_geyser/d_a_obj_geyser.cpp b/rel/d/a/obj/d_a_obj_geyser/d_a_obj_geyser.cpp index 75d0835032d..73bcc17c6ed 100644 --- a/rel/d/a/obj/d_a_obj_geyser/d_a_obj_geyser.cpp +++ b/rel/d/a/obj/d_a_obj_geyser/d_a_obj_geyser.cpp @@ -324,6 +324,12 @@ asm void daObjGeyser_c::setBaseMtx() { #pragma pop /* ############################################################################################## */ +/* 80BF905C-80BF905C 000074 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80BF905C = "H_knktsn"; +#pragma pop + /* 80BF9068-80BF9074 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -385,7 +391,7 @@ asm void daObjGeyser_c::CreateHeap() { SECTION_RODATA static u8 const l_dzb[8] = { 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x08, }; -COMPILER_STRIP_GATE(80BF8FE8, &l_dzb); +COMPILER_STRIP_GATE(0x80BF8FE8, &l_dzb); /* 80BF7174-80BF7288 0002D4 0114+00 1/1 0/0 0/0 .text create1st__13daObjGeyser_cFv */ #pragma push @@ -405,14 +411,14 @@ SECTION_RODATA static u8 const l_scale[24] = { 0x3F, 0x33, 0x33, 0x33, 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x3E, 0x99, 0x99, 0x9A, 0x3F, 0x4C, 0xCC, 0xCD, 0x3F, 0x80, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BF8FF0, &l_scale); +COMPILER_STRIP_GATE(0x80BF8FF0, &l_scale); #pragma pop /* 80BF9008-80BF900C 000020 0004+00 0/1 0/0 0/0 .rodata @3758 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3758 = 5000.0f; -COMPILER_STRIP_GATE(80BF9008, &lit_3758); +COMPILER_STRIP_GATE(0x80BF9008, &lit_3758); #pragma pop /* 80BF900C-80BF9010 000024 0004+00 1/7 0/0 0/0 .rodata @3759 */ @@ -422,24 +428,24 @@ SECTION_RODATA static u8 const lit_3759[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BF900C, &lit_3759); +COMPILER_STRIP_GATE(0x80BF900C, &lit_3759); /* 80BF9010-80BF9014 000028 0004+00 6/11 0/0 0/0 .rodata @3760 */ SECTION_RODATA static f32 const lit_3760 = 1.0f; -COMPILER_STRIP_GATE(80BF9010, &lit_3760); +COMPILER_STRIP_GATE(0x80BF9010, &lit_3760); /* 80BF9014-80BF9018 00002C 0004+00 0/3 0/0 0/0 .rodata @3761 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3761 = 500.0f; -COMPILER_STRIP_GATE(80BF9014, &lit_3761); +COMPILER_STRIP_GATE(0x80BF9014, &lit_3761); #pragma pop /* 80BF9018-80BF901C 000030 0004+00 0/2 0/0 0/0 .rodata @3762 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3762 = 100.0f; -COMPILER_STRIP_GATE(80BF9018, &lit_3762); +COMPILER_STRIP_GATE(0x80BF9018, &lit_3762); #pragma pop /* 80BF7288-80BF744C 0003E8 01C4+00 1/0 0/0 0/0 .text Execute__13daObjGeyser_cFPPA3_A4_f @@ -570,21 +576,21 @@ asm void daObjGeyser_c::actionOff2Init() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3855 = 1000.0f; -COMPILER_STRIP_GATE(80BF901C, &lit_3855); +COMPILER_STRIP_GATE(0x80BF901C, &lit_3855); #pragma pop /* 80BF9020-80BF9024 000038 0004+00 0/3 0/0 0/0 .rodata @3856 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3856 = -50.0f; -COMPILER_STRIP_GATE(80BF9020, &lit_3856); +COMPILER_STRIP_GATE(0x80BF9020, &lit_3856); #pragma pop /* 80BF9024-80BF9028 00003C 0004+00 0/3 0/0 0/0 .rodata @3857 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3857 = 1200.0f; -COMPILER_STRIP_GATE(80BF9024, &lit_3857); +COMPILER_STRIP_GATE(0x80BF9024, &lit_3857); #pragma pop /* 80BF9028-80BF9030 000040 0008+00 0/4 0/0 0/0 .rodata @3858 */ @@ -593,7 +599,7 @@ COMPILER_STRIP_GATE(80BF9024, &lit_3857); SECTION_RODATA static u8 const lit_3858[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BF9028, &lit_3858); +COMPILER_STRIP_GATE(0x80BF9028, &lit_3858); #pragma pop /* 80BF9030-80BF9038 000048 0008+00 0/4 0/0 0/0 .rodata @3859 */ @@ -602,7 +608,7 @@ COMPILER_STRIP_GATE(80BF9028, &lit_3858); SECTION_RODATA static u8 const lit_3859[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BF9030, &lit_3859); +COMPILER_STRIP_GATE(0x80BF9030, &lit_3859); #pragma pop /* 80BF9038-80BF9040 000050 0008+00 0/4 0/0 0/0 .rodata @3860 */ @@ -611,12 +617,12 @@ COMPILER_STRIP_GATE(80BF9030, &lit_3859); SECTION_RODATA static u8 const lit_3860[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BF9038, &lit_3860); +COMPILER_STRIP_GATE(0x80BF9038, &lit_3860); #pragma pop /* 80BF9040-80BF9044 000058 0004+00 1/4 0/0 0/0 .rodata @3861 */ SECTION_RODATA static f32 const lit_3861 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(80BF9040, &lit_3861); +COMPILER_STRIP_GATE(0x80BF9040, &lit_3861); /* 80BF9198-80BF91B8 -00001 0020+00 1/0 0/0 0/0 .data daObjGeyser_METHODS */ SECTION_DATA static void* daObjGeyser_METHODS[8] = { @@ -703,12 +709,12 @@ asm void daObjGeyser_c::actionOnWait2Init() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3969 = 600.0f; -COMPILER_STRIP_GATE(80BF9044, &lit_3969); +COMPILER_STRIP_GATE(0x80BF9044, &lit_3969); #pragma pop /* 80BF9048-80BF904C 000060 0004+00 1/4 0/0 0/0 .rodata @3970 */ SECTION_RODATA static f32 const lit_3970 = -1.0f; -COMPILER_STRIP_GATE(80BF9048, &lit_3970); +COMPILER_STRIP_GATE(0x80BF9048, &lit_3970); /* 80BF787C-80BF7C54 0009DC 03D8+00 1/0 0/0 0/0 .text actionOnWait2__13daObjGeyser_cFv */ #pragma push @@ -735,7 +741,7 @@ asm void daObjGeyser_c::actionOn2Init() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4096 = 1.0f / 20.0f; -COMPILER_STRIP_GATE(80BF904C, &lit_4096); +COMPILER_STRIP_GATE(0x80BF904C, &lit_4096); #pragma pop /* 80BF7CA0-80BF8158 000E00 04B8+00 1/0 0/0 0/0 .text actionOn2__13daObjGeyser_cFv */ @@ -835,7 +841,7 @@ asm void daObjGeyser_c::actionOn() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4232 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(80BF9050, &lit_4232); +COMPILER_STRIP_GATE(0x80BF9050, &lit_4232); #pragma pop /* 80BF8584-80BF863C 0016E4 00B8+00 2/2 0/0 0/0 .text setPntWind__13daObjGeyser_cFv */ @@ -863,14 +869,14 @@ asm void daObjGeyser_c::cutPntWind() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4280 = 2.0f; -COMPILER_STRIP_GATE(80BF9054, &lit_4280); +COMPILER_STRIP_GATE(0x80BF9054, &lit_4280); #pragma pop /* 80BF9058-80BF905C 000070 0004+00 0/1 0/0 0/0 .rodata @4281 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4281 = 0.5f; -COMPILER_STRIP_GATE(80BF9058, &lit_4281); +COMPILER_STRIP_GATE(0x80BF9058, &lit_4281); #pragma pop /* 80BF8660-80BF8870 0017C0 0210+00 1/1 0/0 0/0 .text movePntWind__13daObjGeyser_cFv */ @@ -1113,9 +1119,4 @@ asm cCcD_GStts::~cCcD_GStts() { } #pragma pop -/* 80BF905C-80BF9065 000074 0009+00 1/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80BF905C = "H_knktsn"; -#pragma pop +/* 80BF905C-80BF905C 000074 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_glowSphere/d_a_obj_glowSphere.cpp b/rel/d/a/obj/d_a_obj_glowSphere/d_a_obj_glowSphere.cpp index 9f6ef80b6b6..6f4764247c9 100644 --- a/rel/d/a/obj/d_a_obj_glowSphere/d_a_obj_glowSphere.cpp +++ b/rel/d/a/obj/d_a_obj_glowSphere/d_a_obj_glowSphere.cpp @@ -112,10 +112,10 @@ struct dRes_control_c { struct dPa_levelEcallBack {}; -struct _GXColor {}; - struct csXyz {}; +struct _GXColor {}; + struct dPa_control_c { struct level_c { /* 8004B8B4 */ void forceOnEventMove(u32); @@ -395,11 +395,11 @@ extern "C" void __register_global_object(); /* ############################################################################################## */ /* 80BFA970-80BFA974 000000 0004+00 3/3 0/0 0/0 .rodata @3665 */ SECTION_RODATA static f32 const lit_3665 = 50.0f; -COMPILER_STRIP_GATE(80BFA970, &lit_3665); +COMPILER_STRIP_GATE(0x80BFA970, &lit_3665); /* 80BFA974-80BFA978 000004 0004+00 1/2 0/0 0/0 .rodata @3666 */ SECTION_RODATA static f32 const lit_3666 = 4.0f; -COMPILER_STRIP_GATE(80BFA974, &lit_3666); +COMPILER_STRIP_GATE(0x80BFA974, &lit_3666); /* 80BFA9D0-80BFA9DC 000000 000C+00 3/3 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { @@ -836,11 +836,17 @@ SECTION_RODATA u8 const daGlwSph_c::mCcDObjInfo[48] = { 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x11, 0x00, 0x00, 0x00, 0x19, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BFA978, &daGlwSph_c::mCcDObjInfo); +COMPILER_STRIP_GATE(0x80BFA978, &daGlwSph_c::mCcDObjInfo); /* 80BFA9A8-80BFA9AC 000038 0004+00 3/4 0/0 0/0 .rodata @3714 */ SECTION_RODATA static f32 const lit_3714 = 1.0f; -COMPILER_STRIP_GATE(80BFA9A8, &lit_3714); +COMPILER_STRIP_GATE(0x80BFA9A8, &lit_3714); + +/* 80BFA9C4-80BFA9C4 000054 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80BFA9C4 = "glwSphere"; +#pragma pop /* 80BF94CC-80BF95D4 00026C 0108+00 1/1 0/0 0/0 .text CreateHeap__10daGlwSph_cFv */ #pragma push @@ -855,7 +861,7 @@ asm void daGlwSph_c::CreateHeap() { /* ############################################################################################## */ /* 80BFA9AC-80BFA9B0 00003C 0004+00 1/1 0/0 0/0 .rodata @3826 */ SECTION_RODATA static f32 const lit_3826 = 25.0f; -COMPILER_STRIP_GATE(80BFA9AC, &lit_3826); +COMPILER_STRIP_GATE(0x80BFA9AC, &lit_3826); /* 80BF95D4-80BF9908 000374 0334+00 1/1 0/0 0/0 .text create__10daGlwSph_cFv */ #pragma push @@ -940,11 +946,11 @@ asm void daGlwSph_c::execute() { /* ############################################################################################## */ /* 80BFA9B0-80BFA9B4 000040 0004+00 1/1 0/0 0/0 .rodata @3968 */ SECTION_RODATA static f32 const lit_3968 = 400.0f; -COMPILER_STRIP_GATE(80BFA9B0, &lit_3968); +COMPILER_STRIP_GATE(0x80BFA9B0, &lit_3968); /* 80BFA9B4-80BFA9B8 000044 0004+00 1/2 0/0 0/0 .rodata @3969 */ SECTION_RODATA static f32 const lit_3969 = 0.5f; -COMPILER_STRIP_GATE(80BFA9B4, &lit_3969); +COMPILER_STRIP_GATE(0x80BFA9B4, &lit_3969); /* 80BFAFD0-80BFAFD4 -00001 0004+00 2/2 0/0 0/0 .bss None */ /* 80BFAFD0 0001+00 data_80BFAFD0 None */ @@ -969,7 +975,7 @@ SECTION_RODATA static u8 const lit_4012[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BFA9B8, &lit_4012); +COMPILER_STRIP_GATE(0x80BFA9B8, &lit_4012); /* 80BF9DF0-80BF9F30 000B90 0140+00 1/1 0/0 0/0 .text effectSet__10daGlwSph_cFv */ #pragma push @@ -984,7 +990,7 @@ asm void daGlwSph_c::effectSet() { /* ############################################################################################## */ /* 80BFA9BC-80BFA9C0 00004C 0004+00 1/1 0/0 0/0 .rodata @4031 */ SECTION_RODATA static f32 const lit_4031 = -1.0f; -COMPILER_STRIP_GATE(80BFA9BC, &lit_4031); +COMPILER_STRIP_GATE(0x80BFA9BC, &lit_4031); /* 80BFAFD4-80BFAFE8 000434 0014+00 1/1 0/0 0/0 .bss sSeId$4016 */ static u8 sSeId[20]; @@ -1059,7 +1065,7 @@ asm void daGlwSph_c::actionMoveInit() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4103 = 10.0f; -COMPILER_STRIP_GATE(80BFA9C0, &lit_4103); +COMPILER_STRIP_GATE(0x80BFA9C0, &lit_4103); #pragma pop /* 80BFA204-80BFA2A4 000FA4 00A0+00 1/0 0/0 0/0 .text actionMove__10daGlwSph_cFv */ @@ -1262,7 +1268,7 @@ asm void __sinit_d_a_obj_glowSphere_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80BFA7D8 = (void*)__sinit_d_a_obj_glowSphere_cpp; +REGISTER_CTORS(0x80BFA7D8, __sinit_d_a_obj_glowSphere_cpp); #pragma pop /* 80BFA890-80BFA900 001630 0070+00 1/1 0/0 0/0 .text __dt__12_GlSph_Mng_cFv */ @@ -1487,9 +1493,4 @@ static u8 data_80BFB048[4]; static u8 data_80BFB04C[4]; #pragma pop -/* 80BFA9C4-80BFA9CE 000054 000A+00 3/3 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80BFA9C4 = "glwSphere"; -#pragma pop +/* 80BFA9C4-80BFA9C4 000054 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_gm/d_a_obj_gm.cpp b/rel/d/a/obj/d_a_obj_gm/d_a_obj_gm.cpp index a7c18de2697..0d99995df7a 100644 --- a/rel/d/a/obj/d_a_obj_gm/d_a_obj_gm.cpp +++ b/rel/d/a/obj/d_a_obj_gm/d_a_obj_gm.cpp @@ -108,10 +108,10 @@ struct dBgS_AcchCir { /* 80BFD1C8 */ ~dBgS_AcchCir(); }; -struct dBgS {}; - struct csXyz {}; +struct dBgS {}; + struct dBgS_Acch { /* 80075F94 */ ~dBgS_Acch(); /* 800760A0 */ dBgS_Acch(); @@ -502,7 +502,7 @@ asm daObj_Gm_HIO_c::daObj_Gm_HIO_c() { /* ############################################################################################## */ /* 80BFD32C-80BFD330 000000 0004+00 8/8 0/0 0/0 .rodata @3686 */ SECTION_RODATA static f32 const lit_3686 = 1.0f; -COMPILER_STRIP_GATE(80BFD32C, &lit_3686); +COMPILER_STRIP_GATE(0x80BFD32C, &lit_3686); /* 80BFB164-80BFB218 000104 00B4+00 1/0 0/0 0/0 .text daObj_Gm_Draw__FP12obj_gm_class */ #pragma push @@ -524,35 +524,35 @@ SECTION_RODATA static u8 const lit_3740[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BFD330, &lit_3740); +COMPILER_STRIP_GATE(0x80BFD330, &lit_3740); #pragma pop /* 80BFD334-80BFD338 000008 0004+00 0/2 0/0 0/0 .rodata @3741 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3741 = -50.0f; -COMPILER_STRIP_GATE(80BFD334, &lit_3741); +COMPILER_STRIP_GATE(0x80BFD334, &lit_3741); #pragma pop /* 80BFD338-80BFD33C 00000C 0004+00 0/2 0/0 0/0 .rodata @3742 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3742 = 5.0f; -COMPILER_STRIP_GATE(80BFD338, &lit_3742); +COMPILER_STRIP_GATE(0x80BFD338, &lit_3742); #pragma pop /* 80BFD33C-80BFD340 000010 0004+00 0/1 0/0 0/0 .rodata @3743 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3743 = 100.0f; -COMPILER_STRIP_GATE(80BFD33C, &lit_3743); +COMPILER_STRIP_GATE(0x80BFD33C, &lit_3743); #pragma pop /* 80BFD340-80BFD344 000014 0004+00 0/1 0/0 0/0 .rodata @3744 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3744 = -1.0f; -COMPILER_STRIP_GATE(80BFD340, &lit_3744); +COMPILER_STRIP_GATE(0x80BFD340, &lit_3744); #pragma pop /* 80BFB218-80BFB3D4 0001B8 01BC+00 1/1 0/0 0/0 .text wall_angle_get__FP12obj_gm_class */ @@ -580,14 +580,14 @@ asm cXyz::~cXyz() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3763 = 15.0f; -COMPILER_STRIP_GATE(80BFD344, &lit_3763); +COMPILER_STRIP_GATE(0x80BFD344, &lit_3763); #pragma pop /* 80BFD348-80BFD34C 00001C 0004+00 0/2 0/0 0/0 .rodata @3764 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3764 = 7.0f / 10.0f; -COMPILER_STRIP_GATE(80BFD348, &lit_3764); +COMPILER_STRIP_GATE(0x80BFD348, &lit_3764); #pragma pop /* 80BFB410-80BFB508 0003B0 00F8+00 3/3 0/0 0/0 .text ito_pos_set__FP12obj_gm_class */ @@ -605,56 +605,56 @@ static asm void ito_pos_set(obj_gm_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3927 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(80BFD34C, &lit_3927); +COMPILER_STRIP_GATE(0x80BFD34C, &lit_3927); #pragma pop /* 80BFD350-80BFD354 000024 0004+00 0/2 0/0 0/0 .rodata @3928 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3928 = 1.0f / 20.0f; -COMPILER_STRIP_GATE(80BFD350, &lit_3928); +COMPILER_STRIP_GATE(0x80BFD350, &lit_3928); #pragma pop /* 80BFD354-80BFD358 000028 0004+00 0/1 0/0 0/0 .rodata @3929 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3929 = 12300.0f; -COMPILER_STRIP_GATE(80BFD354, &lit_3929); +COMPILER_STRIP_GATE(0x80BFD354, &lit_3929); #pragma pop /* 80BFD358-80BFD35C 00002C 0004+00 0/3 0/0 0/0 .rodata @3930 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3930 = 40.0f; -COMPILER_STRIP_GATE(80BFD358, &lit_3930); +COMPILER_STRIP_GATE(0x80BFD358, &lit_3930); #pragma pop /* 80BFD35C-80BFD360 000030 0004+00 0/1 0/0 0/0 .rodata @3931 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3931 = 20.0f; -COMPILER_STRIP_GATE(80BFD35C, &lit_3931); +COMPILER_STRIP_GATE(0x80BFD35C, &lit_3931); #pragma pop /* 80BFD360-80BFD364 000034 0004+00 0/3 0/0 0/0 .rodata @3932 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3932 = 10000.0f; -COMPILER_STRIP_GATE(80BFD360, &lit_3932); +COMPILER_STRIP_GATE(0x80BFD360, &lit_3932); #pragma pop /* 80BFD364-80BFD368 000038 0004+00 0/3 0/0 0/0 .rodata @3933 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3933 = 10.0f; -COMPILER_STRIP_GATE(80BFD364, &lit_3933); +COMPILER_STRIP_GATE(0x80BFD364, &lit_3933); #pragma pop /* 80BFD368-80BFD36C 00003C 0004+00 0/1 0/0 0/0 .rodata @3934 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3934 = 5000.0f; -COMPILER_STRIP_GATE(80BFD368, &lit_3934); +COMPILER_STRIP_GATE(0x80BFD368, &lit_3934); #pragma pop /* 80BFB508-80BFBA14 0004A8 050C+00 1/1 0/0 0/0 .text bg_fix__FP12obj_gm_class */ @@ -674,7 +674,7 @@ static asm void bg_fix(obj_gm_class* param_0) { SECTION_RODATA static u8 const lit_4091[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BFD36C, &lit_4091); +COMPILER_STRIP_GATE(0x80BFD36C, &lit_4091); #pragma pop /* 80BFD374-80BFD37C 000048 0008+00 0/1 0/0 0/0 .rodata @4092 */ @@ -683,7 +683,7 @@ COMPILER_STRIP_GATE(80BFD36C, &lit_4091); SECTION_RODATA static u8 const lit_4092[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BFD374, &lit_4092); +COMPILER_STRIP_GATE(0x80BFD374, &lit_4092); #pragma pop /* 80BFD37C-80BFD384 000050 0008+00 0/1 0/0 0/0 .rodata @4093 */ @@ -692,21 +692,21 @@ COMPILER_STRIP_GATE(80BFD374, &lit_4092); SECTION_RODATA static u8 const lit_4093[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BFD37C, &lit_4093); +COMPILER_STRIP_GATE(0x80BFD37C, &lit_4093); #pragma pop /* 80BFD384-80BFD388 000058 0004+00 0/1 0/0 0/0 .rodata @4094 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4094 = 1500.0f; -COMPILER_STRIP_GATE(80BFD384, &lit_4094); +COMPILER_STRIP_GATE(0x80BFD384, &lit_4094); #pragma pop /* 80BFD388-80BFD38C 00005C 0004+00 0/2 0/0 0/0 .rodata @4095 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4095 = 2000.0f; -COMPILER_STRIP_GATE(80BFD388, &lit_4095); +COMPILER_STRIP_GATE(0x80BFD388, &lit_4095); #pragma pop /* 80BFD38C-80BFD394 000060 0004+04 0/2 0/0 0/0 .rodata @4096 */ @@ -717,7 +717,7 @@ SECTION_RODATA static f32 const lit_4096[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80BFD38C, &lit_4096); +COMPILER_STRIP_GATE(0x80BFD38C, &lit_4096); #pragma pop /* 80BFD394-80BFD39C 000068 0008+00 0/1 0/0 0/0 .rodata @4098 */ @@ -726,7 +726,7 @@ COMPILER_STRIP_GATE(80BFD38C, &lit_4096); SECTION_RODATA static u8 const lit_4098[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BFD394, &lit_4098); +COMPILER_STRIP_GATE(0x80BFD394, &lit_4098); #pragma pop /* 80BFBA14-80BFC168 0009B4 0754+00 1/1 0/0 0/0 .text swing__FP12obj_gm_class */ @@ -744,21 +744,21 @@ static asm void swing(obj_gm_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4189 = -3.0f / 10.0f; -COMPILER_STRIP_GATE(80BFD39C, &lit_4189); +COMPILER_STRIP_GATE(0x80BFD39C, &lit_4189); #pragma pop /* 80BFD3A0-80BFD3A4 000074 0004+00 0/1 0/0 0/0 .rodata @4190 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4190 = 7.0f / 20.0f; -COMPILER_STRIP_GATE(80BFD3A0, &lit_4190); +COMPILER_STRIP_GATE(0x80BFD3A0, &lit_4190); #pragma pop /* 80BFD3A4-80BFD3A8 000078 0004+00 0/1 0/0 0/0 .rodata @4191 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4191 = 9.0f / 10.0f; -COMPILER_STRIP_GATE(80BFD3A4, &lit_4191); +COMPILER_STRIP_GATE(0x80BFD3A4, &lit_4191); #pragma pop /* 80BFC168-80BFC664 001108 04FC+00 1/1 0/0 0/0 .text drop__FP12obj_gm_class */ @@ -784,7 +784,7 @@ static asm void action(obj_gm_class* param_0) { /* ############################################################################################## */ /* 80BFD3A8-80BFD3AC 00007C 0004+00 1/1 0/0 0/0 .rodata @4229 */ SECTION_RODATA static f32 const lit_4229 = 40000.0f; -COMPILER_STRIP_GATE(80BFD3A8, &lit_4229); +COMPILER_STRIP_GATE(0x80BFD3A8, &lit_4229); /* 80BFC7D0-80BFC85C 001770 008C+00 1/1 0/0 0/0 .text s_tbox_sub__FPvPv */ #pragma push @@ -809,7 +809,7 @@ static asm void s_so_sub(void* param_0, void* param_1) { /* ############################################################################################## */ /* 80BFD3AC-80BFD3B0 000080 0004+00 1/1 0/0 0/0 .rodata @4291 */ SECTION_RODATA static f32 const lit_4291 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(80BFD3AC, &lit_4291); +COMPILER_STRIP_GATE(0x80BFD3AC, &lit_4291); /* 80BFC8A8-80BFCAF8 001848 0250+00 2/1 0/0 0/0 .text daObj_Gm_Execute__FP12obj_gm_class */ @@ -829,6 +829,12 @@ static bool daObj_Gm_IsDelete(obj_gm_class* param_0) { } /* ############################################################################################## */ +/* 80BFD3C0-80BFD3C0 000094 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80BFD3C0 = "OBJ_GM"; +#pragma pop + /* 80BFD598-80BFD59C 000008 0004+00 2/2 0/0 0/0 .bss None */ static u8 data_80BFD598[4]; @@ -858,28 +864,28 @@ static asm void useHeapInit(fopAc_ac_c* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4423 = -300.0f; -COMPILER_STRIP_GATE(80BFD3B0, &lit_4423); +COMPILER_STRIP_GATE(0x80BFD3B0, &lit_4423); #pragma pop /* 80BFD3B4-80BFD3B8 000088 0004+00 0/1 0/0 0/0 .rodata @4424 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4424 = 300.0f; -COMPILER_STRIP_GATE(80BFD3B4, &lit_4424); +COMPILER_STRIP_GATE(0x80BFD3B4, &lit_4424); #pragma pop /* 80BFD3B8-80BFD3BC 00008C 0004+00 0/1 0/0 0/0 .rodata @4425 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4425 = 65536.0f; -COMPILER_STRIP_GATE(80BFD3B8, &lit_4425); +COMPILER_STRIP_GATE(0x80BFD3B8, &lit_4425); #pragma pop /* 80BFD3BC-80BFD3C0 000090 0004+00 0/1 0/0 0/0 .rodata @4426 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4426 = 50.0f; -COMPILER_STRIP_GATE(80BFD3BC, &lit_4426); +COMPILER_STRIP_GATE(0x80BFD3BC, &lit_4426); #pragma pop /* 80BFD59C-80BFD5A8 00000C 000C+00 1/1 0/0 0/0 .bss @3661 */ @@ -985,7 +991,7 @@ asm void __sinit_d_a_obj_gm_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80BFD2CC = (void*)__sinit_d_a_obj_gm_cpp; +REGISTER_CTORS(0x80BFD2CC, __sinit_d_a_obj_gm_cpp); #pragma pop /* 80BFD308-80BFD310 0022A8 0008+00 1/0 0/0 0/0 .text @36@__dt__12dBgS_ObjAcchFv */ @@ -1008,9 +1014,4 @@ static asm void func_80BFD310() { } #pragma pop -/* 80BFD3C0-80BFD3C7 000094 0007+00 3/3 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80BFD3C0 = "OBJ_GM"; -#pragma pop +/* 80BFD3C0-80BFD3C0 000094 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_goGate/d_a_obj_goGate.cpp b/rel/d/a/obj/d_a_obj_goGate/d_a_obj_goGate.cpp index 206a6bdb6a0..3b6fa581b53 100644 --- a/rel/d/a/obj/d_a_obj_goGate/d_a_obj_goGate.cpp +++ b/rel/d/a/obj/d_a_obj_goGate/d_a_obj_goGate.cpp @@ -92,10 +92,10 @@ struct dBgS_MoveBgActor { /* 80078950 */ void MoveBGExecute(); }; -struct Vec {}; - struct JAISoundID {}; +struct Vec {}; + struct Z2SeMgr { /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); /* 802AC50C */ void seStartLevel(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); @@ -190,7 +190,7 @@ extern "C" void __register_global_object(); /* ############################################################################################## */ /* 80BFDFE8-80BFDFEC 000000 0004+00 5/5 0/0 0/0 .rodata @3627 */ SECTION_RODATA static f32 const lit_3627 = 2.0f; -COMPILER_STRIP_GATE(80BFDFE8, &lit_3627); +COMPILER_STRIP_GATE(0x80BFDFE8, &lit_3627); /* 80BFE010-80BFE01C 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { @@ -328,7 +328,7 @@ SECTION_RODATA static u8 const lit_3648[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BFDFEC, &lit_3648); +COMPILER_STRIP_GATE(0x80BFDFEC, &lit_3648); /* 80BFD724-80BFD7C0 000164 009C+00 2/2 0/0 0/0 .text setBaseMtx__10daGoGate_cFv */ #pragma push @@ -340,6 +340,13 @@ asm void daGoGate_c::setBaseMtx() { } #pragma pop +/* ############################################################################################## */ +/* 80BFE008-80BFE008 000020 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80BFE008 = "P_Ggate"; +#pragma pop + /* 80BFD7C0-80BFD82C 000200 006C+00 1/0 0/0 0/0 .text CreateHeap__10daGoGate_cFv */ #pragma push #pragma optimization_level 0 @@ -355,14 +362,14 @@ asm void daGoGate_c::CreateHeap() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3712 = -250.0f; -COMPILER_STRIP_GATE(80BFDFF0, &lit_3712); +COMPILER_STRIP_GATE(0x80BFDFF0, &lit_3712); #pragma pop /* 80BFDFF4-80BFDFF8 00000C 0004+00 0/1 0/0 0/0 .rodata @3713 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3713 = 250.0f; -COMPILER_STRIP_GATE(80BFDFF4, &lit_3713); +COMPILER_STRIP_GATE(0x80BFDFF4, &lit_3713); #pragma pop /* 80BFD82C-80BFD984 00026C 0158+00 1/1 0/0 0/0 .text create__10daGoGate_cFv */ @@ -436,28 +443,28 @@ asm void daGoGate_c::init_modeMoveOpen() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3780 = 1.0f; -COMPILER_STRIP_GATE(80BFDFF8, &lit_3780); +COMPILER_STRIP_GATE(0x80BFDFF8, &lit_3780); #pragma pop /* 80BFDFFC-80BFE000 000014 0004+00 0/3 0/0 0/0 .rodata @3781 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3781 = -1.0f; -COMPILER_STRIP_GATE(80BFDFFC, &lit_3781); +COMPILER_STRIP_GATE(0x80BFDFFC, &lit_3781); #pragma pop /* 80BFE000-80BFE004 000018 0004+00 0/2 0/0 0/0 .rodata @3782 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3782 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(80BFE000, &lit_3782); +COMPILER_STRIP_GATE(0x80BFE000, &lit_3782); #pragma pop /* 80BFE004-80BFE008 00001C 0004+00 0/2 0/0 0/0 .rodata @3783 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3783 = 0.5f; -COMPILER_STRIP_GATE(80BFE004, &lit_3783); +COMPILER_STRIP_GATE(0x80BFE004, &lit_3783); #pragma pop /* 80BFDAF4-80BFDC04 000534 0110+00 1/0 0/0 0/0 .text modeMoveOpen__10daGoGate_cFv */ @@ -583,12 +590,7 @@ asm void __sinit_d_a_obj_goGate_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80BFDF98 = (void*)__sinit_d_a_obj_goGate_cpp; +REGISTER_CTORS(0x80BFDF98, __sinit_d_a_obj_goGate_cpp); #pragma pop -/* 80BFE008-80BFE010 000020 0008+00 3/3 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80BFE008 = "P_Ggate"; -#pragma pop +/* 80BFE008-80BFE008 000020 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_gomikabe/d_a_obj_gomikabe.cpp b/rel/d/a/obj/d_a_obj_gomikabe/d_a_obj_gomikabe.cpp index 8bc36884720..e1d9529e092 100644 --- a/rel/d/a/obj/d_a_obj_gomikabe/d_a_obj_gomikabe.cpp +++ b/rel/d/a/obj/d_a_obj_gomikabe/d_a_obj_gomikabe.cpp @@ -191,10 +191,10 @@ struct cBgS { /* 80074250 */ void Release(dBgW_Base*); }; -struct Vec {}; - struct JAISoundID {}; +struct Vec {}; + struct Z2SeMgr { /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); }; @@ -351,6 +351,12 @@ extern "C" void __register_global_object(); // /* ############################################################################################## */ +/* 80BFFCF4-80BFFCF4 0000D8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80BFFCF4 = "GomiKabe"; +#pragma pop + /* 80BFFD30-80BFFD34 -00001 0004+00 3/3 0/0 0/0 .data l_arcName */ SECTION_DATA static void* l_arcName = (void*)&d_a_obj_gomikabe__stringBase0; @@ -449,7 +455,7 @@ SECTION_RODATA static u8 const ccSphSrc[64] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x43, 0x48, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BFFC1C, &ccSphSrc); +COMPILER_STRIP_GATE(0x80BFFC1C, &ccSphSrc); /* 80BFE244-80BFE2CC 000104 0088+00 1/1 0/0 0/0 .text initCcCylinder__15daObjGOMIKABE_cFv */ @@ -467,7 +473,7 @@ asm void daObjGOMIKABE_c::initCcCylinder() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3801 = -200.0f; -COMPILER_STRIP_GATE(80BFFC5C, &lit_3801); +COMPILER_STRIP_GATE(0x80BFFC5C, &lit_3801); #pragma pop /* 80BFFC60-80BFFC64 000044 0004+00 0/4 0/0 0/0 .rodata @3802 */ @@ -479,7 +485,7 @@ SECTION_RODATA static u8 const lit_3802[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BFFC60, &lit_3802); +COMPILER_STRIP_GATE(0x80BFFC60, &lit_3802); #pragma pop /* 80BFFC64-80BFFC6C 000048 0004+04 0/1 0/0 0/0 .rodata @3803 */ @@ -490,14 +496,14 @@ SECTION_RODATA static f32 const lit_3803[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80BFFC64, &lit_3803); +COMPILER_STRIP_GATE(0x80BFFC64, &lit_3803); #pragma pop /* 80BFFC6C-80BFFC74 000050 0008+00 1/3 0/0 0/0 .rodata @3805 */ SECTION_RODATA static u8 const lit_3805[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BFFC6C, &lit_3805); +COMPILER_STRIP_GATE(0x80BFFC6C, &lit_3805); /* 80BFE2CC-80BFE3FC 00018C 0130+00 1/1 0/0 0/0 .text SetCcCyl__15daObjGOMIKABE_cFv */ #pragma push @@ -542,7 +548,7 @@ static asm void daObjGOMIKABE_Delete(daObjGOMIKABE_c* param_0) { /* ############################################################################################## */ /* 80BFFC74-80BFFC78 000058 0004+00 1/2 0/0 0/0 .rodata @3842 */ SECTION_RODATA static f32 const lit_3842 = 300.0f; -COMPILER_STRIP_GATE(80BFFC74, &lit_3842); +COMPILER_STRIP_GATE(0x80BFFC74, &lit_3842); /* 80BFE47C-80BFE4C4 00033C 0048+00 1/1 0/0 0/0 .text WaitAction__15daObjGOMIKABE_cFv */ #pragma push @@ -569,63 +575,63 @@ asm void daObjGOMIKABE_c::BreakChk() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3977 = 50.0f; -COMPILER_STRIP_GATE(80BFFC78, &lit_3977); +COMPILER_STRIP_GATE(0x80BFFC78, &lit_3977); #pragma pop /* 80BFFC7C-80BFFC80 000060 0004+00 0/1 0/0 0/0 .rodata @3978 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3978 = 15.0f; -COMPILER_STRIP_GATE(80BFFC7C, &lit_3978); +COMPILER_STRIP_GATE(0x80BFFC7C, &lit_3978); #pragma pop /* 80BFFC80-80BFFC84 000064 0004+00 0/1 0/0 0/0 .rodata @3979 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3979 = 10.0f; -COMPILER_STRIP_GATE(80BFFC80, &lit_3979); +COMPILER_STRIP_GATE(0x80BFFC80, &lit_3979); #pragma pop /* 80BFFC84-80BFFC88 000068 0004+00 0/3 0/0 0/0 .rodata @3980 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3980 = 1000.0f; -COMPILER_STRIP_GATE(80BFFC84, &lit_3980); +COMPILER_STRIP_GATE(0x80BFFC84, &lit_3980); #pragma pop /* 80BFFC88-80BFFC8C 00006C 0004+00 0/1 0/0 0/0 .rodata @3981 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3981 = 32000.0f; -COMPILER_STRIP_GATE(80BFFC88, &lit_3981); +COMPILER_STRIP_GATE(0x80BFFC88, &lit_3981); #pragma pop /* 80BFFC8C-80BFFC90 000070 0004+00 0/1 0/0 0/0 .rodata @3982 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3982 = -50.0f; -COMPILER_STRIP_GATE(80BFFC8C, &lit_3982); +COMPILER_STRIP_GATE(0x80BFFC8C, &lit_3982); #pragma pop /* 80BFFC90-80BFFC94 000074 0004+00 0/1 0/0 0/0 .rodata @3983 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3983 = 5.0f; -COMPILER_STRIP_GATE(80BFFC90, &lit_3983); +COMPILER_STRIP_GATE(0x80BFFC90, &lit_3983); #pragma pop /* 80BFFC94-80BFFC98 000078 0004+00 0/2 0/0 0/0 .rodata @3984 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3984 = 1.0f; -COMPILER_STRIP_GATE(80BFFC94, &lit_3984); +COMPILER_STRIP_GATE(0x80BFFC94, &lit_3984); #pragma pop /* 80BFFC98-80BFFC9C 00007C 0004+00 0/1 0/0 0/0 .rodata @3985 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3985 = -1.0f; -COMPILER_STRIP_GATE(80BFFC98, &lit_3985); +COMPILER_STRIP_GATE(0x80BFFC98, &lit_3985); #pragma pop /* 80BFE52C-80BFEA24 0003EC 04F8+00 1/1 0/0 1/1 .text BreakSet__15daObjGOMIKABE_cFv */ @@ -651,11 +657,11 @@ asm csXyz::~csXyz() { /* ############################################################################################## */ /* 80BFFC9C-80BFFCA0 000080 0004+00 1/1 0/0 0/0 .rodata @4011 */ SECTION_RODATA static f32 const lit_4011 = 7.0f / 10.0f; -COMPILER_STRIP_GATE(80BFFC9C, &lit_4011); +COMPILER_STRIP_GATE(0x80BFFC9C, &lit_4011); /* 80BFFCA0-80BFFCA4 000084 0004+00 1/1 0/0 0/0 .rodata @4012 */ SECTION_RODATA static f32 const lit_4012 = 0.5f; -COMPILER_STRIP_GATE(80BFFCA0, &lit_4012); +COMPILER_STRIP_GATE(0x80BFFCA0, &lit_4012); /* 80BFEA60-80BFEB90 000920 0130+00 1/1 0/0 0/0 .text * getWaterStream__15daObjGOMIKABE_cFR4cXyzR4cXyzf */ @@ -675,7 +681,7 @@ asm void daObjGOMIKABE_c::getWaterStream(cXyz& param_0, cXyz& param_1, f32 param SECTION_RODATA static u8 const lit_4156[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BFFCA4, &lit_4156); +COMPILER_STRIP_GATE(0x80BFFCA4, &lit_4156); #pragma pop /* 80BFFCAC-80BFFCB4 000090 0008+00 0/0 0/0 0/0 .rodata @4157 */ @@ -684,7 +690,7 @@ COMPILER_STRIP_GATE(80BFFCA4, &lit_4156); SECTION_RODATA static u8 const lit_4157[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BFFCAC, &lit_4157); +COMPILER_STRIP_GATE(0x80BFFCAC, &lit_4157); #pragma pop /* 80BFFCB4-80BFFCBC 000098 0008+00 0/0 0/0 0/0 .rodata @4158 */ @@ -693,28 +699,28 @@ COMPILER_STRIP_GATE(80BFFCAC, &lit_4157); SECTION_RODATA static u8 const lit_4158[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BFFCB4, &lit_4158); +COMPILER_STRIP_GATE(0x80BFFCB4, &lit_4158); #pragma pop /* 80BFFCBC-80BFFCC0 0000A0 0004+00 0/0 0/0 0/0 .rodata @4159 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4159 = 2.0f; -COMPILER_STRIP_GATE(80BFFCBC, &lit_4159); +COMPILER_STRIP_GATE(0x80BFFCBC, &lit_4159); #pragma pop /* 80BFFCC0-80BFFCC4 0000A4 0004+00 0/0 0/0 0/0 .rodata @4160 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4160 = 3000.0f; -COMPILER_STRIP_GATE(80BFFCC0, &lit_4160); +COMPILER_STRIP_GATE(0x80BFFCC0, &lit_4160); #pragma pop /* 80BFFCC4-80BFFCC8 0000A8 0004+00 0/2 0/0 0/0 .rodata @4278 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4278 = 100.0f; -COMPILER_STRIP_GATE(80BFFCC4, &lit_4278); +COMPILER_STRIP_GATE(0x80BFFCC4, &lit_4278); #pragma pop /* 80BFEB90-80BFED54 000A50 01C4+00 1/1 0/0 0/0 .text SpeedSet__15daObjGOMIKABE_cFv */ @@ -740,7 +746,7 @@ asm void daObjGOMIKABE_c::BreakAction() { /* ############################################################################################## */ /* 80BFFCC8-80BFFCCC 0000AC 0004+00 1/1 0/0 0/0 .rodata @4308 */ SECTION_RODATA static f32 const lit_4308 = 7000.0f; -COMPILER_STRIP_GATE(80BFFCC8, &lit_4308); +COMPILER_STRIP_GATE(0x80BFFCC8, &lit_4308); /* 80BFED74-80BFEE24 000C34 00B0+00 1/1 0/0 0/0 .text CheckCull__15daObjGOMIKABE_cFv */ #pragma push @@ -757,14 +763,14 @@ asm void daObjGOMIKABE_c::CheckCull() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4321 = 608.0f; -COMPILER_STRIP_GATE(80BFFCCC, &lit_4321); +COMPILER_STRIP_GATE(0x80BFFCCC, &lit_4321); #pragma pop /* 80BFFCD0-80BFFCD4 0000B4 0004+00 0/1 0/0 0/0 .rodata @4322 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4322 = 448.0f; -COMPILER_STRIP_GATE(80BFFCD0, &lit_4322); +COMPILER_STRIP_GATE(0x80BFFCD0, &lit_4322); #pragma pop /* 80BFEE24-80BFEEA8 000CE4 0084+00 1/1 0/0 0/0 .text checkViewArea__15daObjGOMIKABE_cF4cXyz */ @@ -828,6 +834,14 @@ static asm void daObjGOMIKABE_Execute(daObjGOMIKABE_c* param_0) { } #pragma pop +/* ############################################################################################## */ +/* 80BFFCF4-80BFFCF4 0000D8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80BFFCFD = "M_Gomikabe.bmd"; +SECTION_DEAD static char const* const stringBase_80BFFD0C = "M_Gomikabe_Hahen.bmd"; +#pragma pop + /* 80BFF064-80BFF164 000F24 0100+00 1/0 0/0 0/0 .text CreateHeap__15daObjGOMIKABE_cFv */ #pragma push #pragma optimization_level 0 @@ -843,28 +857,28 @@ asm void daObjGOMIKABE_c::CreateHeap() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4498 = 1.0f / 20.0f; -COMPILER_STRIP_GATE(80BFFCD4, &lit_4498); +COMPILER_STRIP_GATE(0x80BFFCD4, &lit_4498); #pragma pop /* 80BFFCD8-80BFFCDC 0000BC 0004+00 0/1 0/0 0/0 .rodata @4499 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4499 = 30.0f; -COMPILER_STRIP_GATE(80BFFCD8, &lit_4499); +COMPILER_STRIP_GATE(0x80BFFCD8, &lit_4499); #pragma pop /* 80BFFCDC-80BFFCE0 0000C0 0004+00 0/2 0/0 0/0 .rodata @4500 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4500 = -1000.0f; -COMPILER_STRIP_GATE(80BFFCDC, &lit_4500); +COMPILER_STRIP_GATE(0x80BFFCDC, &lit_4500); #pragma pop /* 80BFFCE0-80BFFCE4 0000C4 0004+00 0/2 0/0 0/0 .rodata @4501 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4501 = -500.0f; -COMPILER_STRIP_GATE(80BFFCE0, &lit_4501); +COMPILER_STRIP_GATE(0x80BFFCE0, &lit_4501); #pragma pop /* 80BFFCE4-80BFFCEC 0000C8 0008+00 0/1 0/0 0/0 .rodata @4503 */ @@ -873,7 +887,13 @@ COMPILER_STRIP_GATE(80BFFCE0, &lit_4501); SECTION_RODATA static u8 const lit_4503[8] = { 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80BFFCE4, &lit_4503); +COMPILER_STRIP_GATE(0x80BFFCE4, &lit_4503); +#pragma pop + +/* 80BFFCF4-80BFFCF4 0000D8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80BFFD21 = "M_Gomikabe.dzb"; #pragma pop /* 80BFFE08-80BFFE0C 000008 0004+00 2/2 0/0 0/0 .bss None */ @@ -986,7 +1006,7 @@ static bool daObjGOMIKABE_IsDelete(daObjGOMIKABE_c* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4607 = 500.0f; -COMPILER_STRIP_GATE(80BFFCEC, &lit_4607); +COMPILER_STRIP_GATE(0x80BFFCEC, &lit_4607); #pragma pop /* 80BFF8D8-80BFF938 001798 0060+00 1/0 0/0 0/0 .text Create__15daObjGOMIKABE_cFv */ @@ -1002,7 +1022,7 @@ asm void daObjGOMIKABE_c::Create() { /* ############################################################################################## */ /* 80BFFCF0-80BFFCF4 0000D4 0004+00 1/1 0/0 0/0 .rodata @4620 */ SECTION_RODATA static f32 const lit_4620 = -5.0f; -COMPILER_STRIP_GATE(80BFFCF0, &lit_4620); +COMPILER_STRIP_GATE(0x80BFFCF0, &lit_4620); /* 80BFF938-80BFFA00 0017F8 00C8+00 1/0 0/0 0/0 .text Execute__15daObjGOMIKABE_cFPPA3_A4_f */ #pragma push @@ -1056,7 +1076,7 @@ asm void __sinit_d_a_obj_gomikabe_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80BFFBBC = (void*)__sinit_d_a_obj_gomikabe_cpp; +REGISTER_CTORS(0x80BFFBBC, __sinit_d_a_obj_gomikabe_cpp); #pragma pop /* 80BFFBF8-80BFFC00 001AB8 0008+00 1/0 0/0 0/0 .text @36@__dt__12dBgS_ObjAcchFv */ @@ -1079,12 +1099,4 @@ static asm void func_80BFFC00() { } #pragma pop -/* 80BFFCF4-80BFFD30 0000D8 003C+00 3/2 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80BFFCF4 = "GomiKabe"; -SECTION_DEAD static char const* const stringBase_80BFFCFD = "M_Gomikabe.bmd"; -SECTION_DEAD static char const* const stringBase_80BFFD0C = "M_Gomikabe_Hahen.bmd"; -SECTION_DEAD static char const* const stringBase_80BFFD21 = "M_Gomikabe.dzb"; -#pragma pop +/* 80BFFCF4-80BFFCF4 0000D8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_gptaru/d_a_obj_gpTaru.cpp b/rel/d/a/obj/d_a_obj_gptaru/d_a_obj_gpTaru.cpp index 895b8b317b0..1fb14c4ef1c 100644 --- a/rel/d/a/obj/d_a_obj_gptaru/d_a_obj_gpTaru.cpp +++ b/rel/d/a/obj/d_a_obj_gptaru/d_a_obj_gpTaru.cpp @@ -117,10 +117,10 @@ struct dPa_modelEcallBack { struct dPa_levelEcallBack {}; -struct _GXColor {}; - struct csXyz {}; +struct _GXColor {}; + struct dPa_control_c { /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, @@ -418,32 +418,32 @@ extern "C" void __register_global_object(); /* ############################################################################################## */ /* 8057F570-8057F574 000000 0004+00 10/10 0/0 0/0 .rodata @3656 */ SECTION_RODATA static f32 const lit_3656 = 200.0f; -COMPILER_STRIP_GATE(8057F570, &lit_3656); +COMPILER_STRIP_GATE(0x8057F570, &lit_3656); /* 8057F574-8057F578 000004 0004+00 0/1 0/0 0/0 .rodata @3657 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3657 = 3.0f; -COMPILER_STRIP_GATE(8057F574, &lit_3657); +COMPILER_STRIP_GATE(0x8057F574, &lit_3657); #pragma pop /* 8057F578-8057F57C 000008 0004+00 0/1 0/0 0/0 .rodata @3658 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3658 = 6.0f; -COMPILER_STRIP_GATE(8057F578, &lit_3658); +COMPILER_STRIP_GATE(0x8057F578, &lit_3658); #pragma pop /* 8057F57C-8057F580 00000C 0004+00 0/1 0/0 0/0 .rodata @3659 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3659 = 8.0f / 5.0f; -COMPILER_STRIP_GATE(8057F57C, &lit_3659); +COMPILER_STRIP_GATE(0x8057F57C, &lit_3659); #pragma pop /* 8057F580-8057F584 000010 0004+00 2/10 0/0 0/0 .rodata @3660 */ SECTION_RODATA static f32 const lit_3660 = 1.0f; -COMPILER_STRIP_GATE(8057F580, &lit_3660); +COMPILER_STRIP_GATE(0x8057F580, &lit_3660); /* 8057F688-8057F694 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { @@ -731,6 +731,13 @@ asm void daGpTaru_c::setBaseMtx() { } #pragma pop +/* ############################################################################################## */ +/* 8057F664-8057F664 0000F4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8057F664 = "K_ktar00"; +#pragma pop + /* 8057D2D0-8057D33C 0002F0 006C+00 1/0 0/0 0/0 .text CreateHeap__10daGpTaru_cFv */ #pragma push #pragma optimization_level 0 @@ -748,31 +755,31 @@ SECTION_RODATA u8 const daGpTaru_c::mCcDObjInfo[48] = { 0xD8, 0xFA, 0xFD, 0xBF, 0x00, 0x00, 0x00, 0x11, 0x00, 0x00, 0x00, 0x79, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8057F584, &daGpTaru_c::mCcDObjInfo); +COMPILER_STRIP_GATE(0x8057F584, &daGpTaru_c::mCcDObjInfo); /* 8057F5B4-8057F5B8 000044 0004+00 0/1 0/0 0/0 .rodata @3803 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3803 = 160.0f; -COMPILER_STRIP_GATE(8057F5B4, &lit_3803); +COMPILER_STRIP_GATE(0x8057F5B4, &lit_3803); #pragma pop /* 8057F5B8-8057F5BC 000048 0004+00 0/1 0/0 0/0 .rodata @3804 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3804 = 80.0f; -COMPILER_STRIP_GATE(8057F5B8, &lit_3804); +COMPILER_STRIP_GATE(0x8057F5B8, &lit_3804); #pragma pop /* 8057F5BC-8057F5C0 00004C 0004+00 1/2 0/0 0/0 .rodata @3805 */ SECTION_RODATA static f32 const lit_3805 = -7.0f; -COMPILER_STRIP_GATE(8057F5BC, &lit_3805); +COMPILER_STRIP_GATE(0x8057F5BC, &lit_3805); /* 8057F5C0-8057F5C4 000050 0004+00 0/1 0/0 0/0 .rodata @3806 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3806 = -100.0f; -COMPILER_STRIP_GATE(8057F5C0, &lit_3806); +COMPILER_STRIP_GATE(0x8057F5C0, &lit_3806); #pragma pop /* 8057F5C4-8057F5C8 000054 0004+00 3/10 0/0 0/0 .rodata @3807 */ @@ -782,7 +789,7 @@ SECTION_RODATA static u8 const lit_3807[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(8057F5C4, &lit_3807); +COMPILER_STRIP_GATE(0x8057F5C4, &lit_3807); /* 8057D33C-8057D600 00035C 02C4+00 1/1 0/0 0/0 .text create__10daGpTaru_cFv */ #pragma push @@ -862,7 +869,7 @@ asm void daGpTaru_c::createHeapCallBack(fopAc_ac_c* param_0) { SECTION_RODATA static u8 const lit_3992[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8057F5C8, &lit_3992); +COMPILER_STRIP_GATE(0x8057F5C8, &lit_3992); #pragma pop /* 8057F5D0-8057F5D8 000060 0008+00 0/3 0/0 0/0 .rodata @3993 */ @@ -871,7 +878,7 @@ COMPILER_STRIP_GATE(8057F5C8, &lit_3992); SECTION_RODATA static u8 const lit_3993[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8057F5D0, &lit_3993); +COMPILER_STRIP_GATE(0x8057F5D0, &lit_3993); #pragma pop /* 8057F5D8-8057F5E0 000068 0008+00 0/3 0/0 0/0 .rodata @3994 */ @@ -880,7 +887,7 @@ COMPILER_STRIP_GATE(8057F5D0, &lit_3993); SECTION_RODATA static u8 const lit_3994[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8057F5D8, &lit_3994); +COMPILER_STRIP_GATE(0x8057F5D8, &lit_3994); #pragma pop /* 8057D7F8-8057DAF4 000818 02FC+00 1/1 0/0 0/0 .text bound__FP4cXyzRC13cBgS_PolyInfof */ @@ -906,7 +913,7 @@ asm cM3dGPla::~cM3dGPla() { /* ############################################################################################## */ /* 8057F5E0-8057F5E4 000070 0004+00 1/2 0/0 0/0 .rodata @4078 */ SECTION_RODATA static f32 const lit_4078 = 100.0f; -COMPILER_STRIP_GATE(8057F5E0, &lit_4078); +COMPILER_STRIP_GATE(0x8057F5E0, &lit_4078); /* 8057DB3C-8057DB60 000B5C 0024+00 1/1 0/0 0/0 .text chkSinkAll__10daGpTaru_cFv */ #pragma push @@ -921,7 +928,7 @@ asm void daGpTaru_c::chkSinkAll() { /* ############################################################################################## */ /* 8057F5E4-8057F5E8 000074 0004+00 1/1 0/0 0/0 .rodata @4084 */ SECTION_RODATA static f32 const lit_4084 = 40.0f; -COMPILER_STRIP_GATE(8057F5E4, &lit_4084); +COMPILER_STRIP_GATE(0x8057F5E4, &lit_4084); /* 8057DB60-8057DB84 000B80 0024+00 3/3 0/0 0/0 .text chkWaterLineIn__10daGpTaru_cFv */ #pragma push @@ -938,56 +945,56 @@ asm void daGpTaru_c::chkWaterLineIn() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4268 = 8.0f; -COMPILER_STRIP_GATE(8057F5E8, &lit_4268); +COMPILER_STRIP_GATE(0x8057F5E8, &lit_4268); #pragma pop /* 8057F5EC-8057F5F0 00007C 0004+00 0/1 0/0 0/0 .rodata @4269 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4269 = 3.0f / 5.0f; -COMPILER_STRIP_GATE(8057F5EC, &lit_4269); +COMPILER_STRIP_GATE(0x8057F5EC, &lit_4269); #pragma pop /* 8057F5F0-8057F5F4 000080 0004+00 0/1 0/0 0/0 .rodata @4270 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4270 = 5.0f; -COMPILER_STRIP_GATE(8057F5F0, &lit_4270); +COMPILER_STRIP_GATE(0x8057F5F0, &lit_4270); #pragma pop /* 8057F5F4-8057F5F8 000084 0004+00 0/2 0/0 0/0 .rodata @4271 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4271 = -15.0f; -COMPILER_STRIP_GATE(8057F5F4, &lit_4271); +COMPILER_STRIP_GATE(0x8057F5F4, &lit_4271); #pragma pop /* 8057F5F8-8057F5FC 000088 0004+00 0/1 0/0 0/0 .rodata @4272 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4272 = 2.0f; -COMPILER_STRIP_GATE(8057F5F8, &lit_4272); +COMPILER_STRIP_GATE(0x8057F5F8, &lit_4272); #pragma pop /* 8057F5FC-8057F600 00008C 0004+00 0/4 0/0 0/0 .rodata @4273 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4273 = -1.0f; -COMPILER_STRIP_GATE(8057F5FC, &lit_4273); +COMPILER_STRIP_GATE(0x8057F5FC, &lit_4273); #pragma pop /* 8057F600-8057F604 000090 0004+00 0/1 0/0 0/0 .rodata @4274 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4274 = 5.0f / 3.0f; -COMPILER_STRIP_GATE(8057F600, &lit_4274); +COMPILER_STRIP_GATE(0x8057F600, &lit_4274); #pragma pop /* 8057F604-8057F608 000094 0004+00 0/3 0/0 0/0 .rodata @4275 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4275 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(8057F604, &lit_4275); +COMPILER_STRIP_GATE(0x8057F604, &lit_4275); #pragma pop /* 8057DB84-8057E224 000BA4 06A0+00 1/1 0/0 0/0 .text bgCheck__10daGpTaru_cFv */ @@ -1005,21 +1012,21 @@ asm void daGpTaru_c::bgCheck() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4331 = 50.0f; -COMPILER_STRIP_GATE(8057F608, &lit_4331); +COMPILER_STRIP_GATE(0x8057F608, &lit_4331); #pragma pop /* 8057F60C-8057F610 00009C 0004+00 0/1 0/0 0/0 .rodata @4332 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4332 = 7.0f; -COMPILER_STRIP_GATE(8057F60C, &lit_4332); +COMPILER_STRIP_GATE(0x8057F60C, &lit_4332); #pragma pop /* 8057F610-8057F614 0000A0 0004+00 0/1 0/0 0/0 .rodata @4333 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4333 = 170.0f; -COMPILER_STRIP_GATE(8057F610, &lit_4333); +COMPILER_STRIP_GATE(0x8057F610, &lit_4333); #pragma pop /* 8057E224-8057E494 001244 0270+00 1/0 0/0 0/0 .text Execute__10daGpTaru_cFv */ @@ -1121,49 +1128,49 @@ asm void daGpTaru_c::mode_init_roll() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4521 = 4.0f; -COMPILER_STRIP_GATE(8057F614, &lit_4521); +COMPILER_STRIP_GATE(0x8057F614, &lit_4521); #pragma pop /* 8057F618-8057F61C 0000A8 0004+00 0/1 0/0 0/0 .rodata @4522 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4522 = -1000000000.0f; -COMPILER_STRIP_GATE(8057F618, &lit_4522); +COMPILER_STRIP_GATE(0x8057F618, &lit_4522); #pragma pop /* 8057F61C-8057F620 0000AC 0004+00 0/1 0/0 0/0 .rodata @4523 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4523 = 0x4645B05B; -COMPILER_STRIP_GATE(8057F61C, &lit_4523); +COMPILER_STRIP_GATE(0x8057F61C, &lit_4523); #pragma pop /* 8057F620-8057F624 0000B0 0004+00 0/1 0/0 0/0 .rodata @4524 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4524 = 10.0f; -COMPILER_STRIP_GATE(8057F620, &lit_4524); +COMPILER_STRIP_GATE(0x8057F620, &lit_4524); #pragma pop /* 8057F624-8057F628 0000B4 0004+00 0/1 0/0 0/0 .rodata @4525 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4525 = 0x3C23D70B; -COMPILER_STRIP_GATE(8057F624, &lit_4525); +COMPILER_STRIP_GATE(0x8057F624, &lit_4525); #pragma pop /* 8057F628-8057F62C 0000B8 0004+00 0/2 0/0 0/0 .rodata @4526 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4526 = 9.0f / 10.0f; -COMPILER_STRIP_GATE(8057F628, &lit_4526); +COMPILER_STRIP_GATE(0x8057F628, &lit_4526); #pragma pop /* 8057F62C-8057F630 0000BC 0004+00 0/1 0/0 0/0 .rodata @4527 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4527 = 3.0f / 10.0f; -COMPILER_STRIP_GATE(8057F62C, &lit_4527); +COMPILER_STRIP_GATE(0x8057F62C, &lit_4527); #pragma pop /* 8057E768-8057EB2C 001788 03C4+00 1/0 0/0 0/0 .text mode_proc_roll__10daGpTaru_cFv */ @@ -1191,14 +1198,14 @@ asm dBgS_ObjGndChk::~dBgS_ObjGndChk() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4538 = 500.0f; -COMPILER_STRIP_GATE(8057F630, &lit_4538); +COMPILER_STRIP_GATE(0x8057F630, &lit_4538); #pragma pop /* 8057F634-8057F638 0000C4 0004+00 0/2 0/0 0/0 .rodata @4539 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4539 = 0.5f; -COMPILER_STRIP_GATE(8057F634, &lit_4539); +COMPILER_STRIP_GATE(0x8057F634, &lit_4539); #pragma pop /* 8057EBA4-8057EC60 001BC4 00BC+00 1/1 0/0 0/0 .text mode_init_exploInit__10daGpTaru_cFv @@ -1217,7 +1224,7 @@ asm void daGpTaru_c::mode_init_exploInit() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4574 = 20.0f; -COMPILER_STRIP_GATE(8057F638, &lit_4574); +COMPILER_STRIP_GATE(0x8057F638, &lit_4574); #pragma pop /* 8057EC60-8057EE2C 001C80 01CC+00 1/0 0/0 0/0 .text mode_proc_exploInit__10daGpTaru_cFv @@ -1236,42 +1243,42 @@ asm void daGpTaru_c::mode_proc_exploInit() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4604 = 2.0f / 5.0f; -COMPILER_STRIP_GATE(8057F63C, &lit_4604); +COMPILER_STRIP_GATE(0x8057F63C, &lit_4604); #pragma pop /* 8057F640-8057F644 0000D0 0004+00 0/2 0/0 0/0 .rodata @4605 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4605 = 1.0f / 100.0f; -COMPILER_STRIP_GATE(8057F640, &lit_4605); +COMPILER_STRIP_GATE(0x8057F640, &lit_4605); #pragma pop /* 8057F644-8057F648 0000D4 0004+00 0/1 0/0 0/0 .rodata @4606 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4606 = 99.0f / 100.0f; -COMPILER_STRIP_GATE(8057F644, &lit_4606); +COMPILER_STRIP_GATE(0x8057F644, &lit_4606); #pragma pop /* 8057F648-8057F64C 0000D8 0004+00 0/2 0/0 0/0 .rodata @4607 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4607 = 1.0f / 20.0f; -COMPILER_STRIP_GATE(8057F648, &lit_4607); +COMPILER_STRIP_GATE(0x8057F648, &lit_4607); #pragma pop /* 8057F64C-8057F650 0000DC 0004+00 0/1 0/0 0/0 .rodata @4608 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4608 = 1.0f / 25.0f; -COMPILER_STRIP_GATE(8057F64C, &lit_4608); +COMPILER_STRIP_GATE(0x8057F64C, &lit_4608); #pragma pop /* 8057F650-8057F654 0000E0 0004+00 0/1 0/0 0/0 .rodata @4609 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4609 = 0x3A83126F; -COMPILER_STRIP_GATE(8057F650, &lit_4609); +COMPILER_STRIP_GATE(0x8057F650, &lit_4609); #pragma pop /* 8057EE2C-8057EFB0 001E4C 0184+00 2/2 0/0 0/0 .text mode_init_explosion__10daGpTaru_cFv @@ -1311,21 +1318,21 @@ asm void daGpTaru_c::mode_init_sink() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4660 = 13.0f; -COMPILER_STRIP_GATE(8057F654, &lit_4660); +COMPILER_STRIP_GATE(0x8057F654, &lit_4660); #pragma pop /* 8057F658-8057F65C 0000E8 0004+00 0/1 0/0 0/0 .rodata @4661 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4661 = -10.0f; -COMPILER_STRIP_GATE(8057F658, &lit_4661); +COMPILER_STRIP_GATE(0x8057F658, &lit_4661); #pragma pop /* 8057F65C-8057F660 0000EC 0004+00 0/1 0/0 0/0 .rodata @4662 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4662 = -20.0f; -COMPILER_STRIP_GATE(8057F65C, &lit_4662); +COMPILER_STRIP_GATE(0x8057F65C, &lit_4662); #pragma pop /* 8057F014-8057F104 002034 00F0+00 1/0 0/0 0/0 .text mode_proc_sink__10daGpTaru_cFv */ @@ -1341,7 +1348,14 @@ asm void daGpTaru_c::mode_proc_sink() { /* ############################################################################################## */ /* 8057F660-8057F664 0000F0 0004+00 1/1 0/0 0/0 .rodata @4697 */ SECTION_RODATA static f32 const lit_4697 = 0.75f; -COMPILER_STRIP_GATE(8057F660, &lit_4697); +COMPILER_STRIP_GATE(0x8057F660, &lit_4697); + +/* 8057F664-8057F664 0000F4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8057F66D = "Always"; +SECTION_DEAD static char const* const stringBase_8057F674 = "BreakWoodBox.bmd"; +#pragma pop /* 8057F104-8057F284 002124 0180+00 1/1 0/0 0/0 .text breakEffSet__10daGpTaru_cFv */ #pragma push @@ -1445,7 +1459,7 @@ asm void __sinit_d_a_obj_gpTaru_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_8057F4C4 = (void*)__sinit_d_a_obj_gpTaru_cpp; +REGISTER_CTORS(0x8057F4C4, __sinit_d_a_obj_gpTaru_cpp); #pragma pop /* 8057F534-8057F53C 002554 0008+00 1/0 0/0 0/0 .text @36@__dt__12dBgS_ObjAcchFv */ @@ -1498,11 +1512,4 @@ static asm void func_8057F554() { } #pragma pop -/* 8057F664-8057F685 0000F4 0021+00 4/4 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_8057F664 = "K_ktar00"; -SECTION_DEAD static char const* const stringBase_8057F66D = "Always"; -SECTION_DEAD static char const* const stringBase_8057F674 = "BreakWoodBox.bmd"; -#pragma pop +/* 8057F664-8057F664 0000F4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_gra2/d_a_obj_gra2.cpp b/rel/d/a/obj/d_a_obj_gra2/d_a_obj_gra2.cpp index 3158a91a4b2..728409175c6 100644 --- a/rel/d/a/obj/d_a_obj_gra2/d_a_obj_gra2.cpp +++ b/rel/d/a/obj/d_a_obj_gra2/d_a_obj_gra2.cpp @@ -46,12 +46,12 @@ struct mDoExt_bckAnm { /* 8000D990 */ void changeBckOnly(J3DAnmTransform*); }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; +struct J3DModelData {}; + struct Z2Creature { /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; @@ -78,12 +78,12 @@ struct daPy_py_c { /* 8015F3FC */ void getAttentionOffsetY(); }; +struct dBgW {}; + struct J3DModel {}; struct J3DJoint {}; -struct dBgW {}; - struct daObj_GrA_c { struct daObj_GrA_prtclMngr_c { /* 80C04E14 */ ~daObj_GrA_prtclMngr_c(); @@ -237,7 +237,6 @@ struct daBaseNpc_path_c { /* 8014DA64 */ void chkPnt(cXyz); /* 8014DAC4 */ void setNextPnt(); /* 8014DB04 */ void getIdx(); - /* 8014DB0C */ void setIdx(u16); /* 8014DB14 */ void getPntPos(u16); /* 80C04B64 */ ~daBaseNpc_path_c(); }; @@ -640,8 +639,8 @@ extern "C" bool ToBack__23daBaseNpc_moveBgActor_cFv(); extern "C" bool CreateHeap__23daBaseNpc_moveBgActor_cFv(); extern "C" bool Execute__23daBaseNpc_moveBgActor_cFPPA3_A4_f(); extern "C" bool Delete__23daBaseNpc_moveBgActor_cFv(); -extern "C" void func_80C04F3C(int*); -extern "C" void func_80C04F58(s16*); +extern "C" void func_80C04F3C(void* _this, int*); +extern "C" void func_80C04F58(void* _this, s16*); extern "C" void __sinit_d_a_obj_gra2_cpp(); extern "C" void getSrchCircleR__11daObj_GrA_cFv(); extern "C" void standWait__11daObj_GrA_cFPv(); @@ -951,6 +950,17 @@ asm void daObj_GrA_c::rideCallBack(dBgW* param_0, fopAc_ac_c* param_1, fopAc_ac_ #pragma pop /* ############################################################################################## */ +/* 80C0FE14-80C0FE14 000398 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80C0FE14 = "grA"; +SECTION_DEAD static char const* const stringBase_80C0FE18 = "grA_base"; +SECTION_DEAD static char const* const stringBase_80C0FE21 = "grA_mdl"; +SECTION_DEAD static char const* const stringBase_80C0FE29 = "grA_demo"; +SECTION_DEAD static char const* const stringBase_80C0FE32 = "grA_Look"; +SECTION_DEAD static char const* const stringBase_80C0FE3B = "GRA_THROWN"; +#pragma pop + /* 80C0FE68-80C0FE74 000000 000C+00 9/9 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -2146,6 +2156,13 @@ asm daObj_GrA_c::~daObj_GrA_c() { } #pragma pop +/* ############################################################################################## */ +/* 80C0FE14-80C0FE14 000398 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80C0FE46 = "grA_stone_col.dzb"; +#pragma pop + /* 80C003CC-80C00614 0005AC 0248+00 1/1 0/0 0/0 .text create__11daObj_GrA_cFv */ #pragma push #pragma optimization_level 0 @@ -2172,7 +2189,7 @@ SECTION_RODATA u8 const daObj_GrA_Param_c::m[192] = { 0x41, 0xC8, 0x00, 0x00, 0x00, 0x64, 0x00, 0x00, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x0A, 0x00, 0x1E, 0x00, 0x28, 0x00, 0x14, 0x00, 0x00, 0x42, 0x70, 0x00, 0x00, 0x41, 0xF0, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C0FA7C, &daObj_GrA_Param_c::m); +COMPILER_STRIP_GATE(0x80C0FA7C, &daObj_GrA_Param_c::m); /* 80C0FB3C-80C0FB8C 0000C0 0050+00 0/0 0/0 0/0 .rodata l_bgcParam */ #pragma push @@ -2184,7 +2201,7 @@ SECTION_RODATA static u8 const l_bgcParam[80] = { 0x3F, 0x00, 0x00, 0x00, 0xBF, 0x80, 0x00, 0x00, 0x3F, 0x00, 0x00, 0x00, 0xBF, 0x80, 0x00, 0x00, 0xBF, 0x00, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x00, 0x00, 0x00, 0xBF, 0x80, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C0FB3C, &l_bgcParam); +COMPILER_STRIP_GATE(0x80C0FB3C, &l_bgcParam); #pragma pop /* 80C0FB8C-80C0FB94 000110 0008+00 0/0 0/0 0/0 .rodata l_dirToAngleTBL */ @@ -2193,12 +2210,12 @@ COMPILER_STRIP_GATE(80C0FB3C, &l_bgcParam); SECTION_RODATA static u8 const l_dirToAngleTBL[8] = { 0x00, 0x00, 0x40, 0x00, 0x80, 0x00, 0xC0, 0x00, }; -COMPILER_STRIP_GATE(80C0FB8C, &l_dirToAngleTBL); +COMPILER_STRIP_GATE(0x80C0FB8C, &l_dirToAngleTBL); #pragma pop /* 80C0FB94-80C0FB98 000118 0004+00 4/18 0/0 0/0 .rodata @4332 */ SECTION_RODATA static f32 const lit_4332 = 1.0f; -COMPILER_STRIP_GATE(80C0FB94, &lit_4332); +COMPILER_STRIP_GATE(0x80C0FB94, &lit_4332); /* 80C0FB98-80C0FB9C 00011C 0004+00 13/45 0/0 0/0 .rodata @4333 */ SECTION_RODATA static u8 const lit_4333[4] = { @@ -2207,7 +2224,7 @@ SECTION_RODATA static u8 const lit_4333[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C0FB98, &lit_4333); +COMPILER_STRIP_GATE(0x80C0FB98, &lit_4333); /* 80C00614-80C00790 0007F4 017C+00 1/0 0/0 0/0 .text CreateHeap__11daObj_GrA_cFv */ #pragma push @@ -2232,7 +2249,7 @@ asm void daObj_GrA_c::Delete() { /* ############################################################################################## */ /* 80C0FB9C-80C0FBA0 000120 0004+00 2/2 0/0 0/0 .rodata @4399 */ SECTION_RODATA static f32 const lit_4399 = -1000000000.0f; -COMPILER_STRIP_GATE(80C0FB9C, &lit_4399); +COMPILER_STRIP_GATE(0x80C0FB9C, &lit_4399); /* 80C00804-80C00A44 0009E4 0240+00 1/0 0/0 0/0 .text Execute__11daObj_GrA_cFPPA3_A4_f */ #pragma push @@ -2247,7 +2264,7 @@ asm void daObj_GrA_c::Execute(f32 (**param_0)[3][4]) { /* ############################################################################################## */ /* 80C0FBA0-80C0FBA4 000124 0004+00 1/2 0/0 0/0 .rodata @4409 */ SECTION_RODATA static f32 const lit_4409 = 800.0f; -COMPILER_STRIP_GATE(80C0FBA0, &lit_4409); +COMPILER_STRIP_GATE(0x80C0FBA0, &lit_4409); /* 80C0FBA4-80C0FBAC 000128 0004+04 1/1 0/0 0/0 .rodata @4410 */ SECTION_RODATA static f32 const lit_4410[1 + 1 /* padding */] = { @@ -2255,7 +2272,7 @@ SECTION_RODATA static f32 const lit_4410[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80C0FBA4, &lit_4410); +COMPILER_STRIP_GATE(0x80C0FBA4, &lit_4410); /* 80C00A44-80C00ACC 000C24 0088+00 1/0 0/0 0/0 .text Draw__11daObj_GrA_cFv */ #pragma push @@ -2272,7 +2289,7 @@ asm void daObj_GrA_c::Draw() { SECTION_RODATA static u8 const lit_4501[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C0FBAC, &lit_4501); +COMPILER_STRIP_GATE(0x80C0FBAC, &lit_4501); /* 80C00ACC-80C00D5C 000CAC 0290+00 1/1 0/0 0/0 .text * jointCtrl__11daObj_GrA_cFP8J3DJointP8J3DModel */ @@ -2295,6 +2312,13 @@ asm void daObj_GrA_c::getResName() { } #pragma pop +/* ############################################################################################## */ +/* 80C0FE14-80C0FE14 000398 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80C0FE58 = "Obj_grA"; +#pragma pop + /* 80C00D74-80C00DF8 000F54 0084+00 1/1 0/0 0/0 .text getMode__11daObj_GrA_cFv */ #pragma push #pragma optimization_level 0 @@ -2348,7 +2372,7 @@ asm void daObj_GrA_c::isDelete() { /* ############################################################################################## */ /* 80C0FBB4-80C0FBB8 000138 0004+00 8/19 0/0 0/0 .rodata @4618 */ SECTION_RODATA static f32 const lit_4618 = -1.0f; -COMPILER_STRIP_GATE(80C0FBB4, &lit_4618); +COMPILER_STRIP_GATE(0x80C0FBB4, &lit_4618); /* 80C00EFC-80C010D4 0010DC 01D8+00 1/1 0/0 0/0 .text restart__11daObj_GrA_cFv */ #pragma push @@ -2552,7 +2576,7 @@ asm void daObj_GrA_c::calcMotion() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daObj_GrA_c::checkProcess(int (daObj_GrA_c::*)(void*)) { +asm void daObj_GrA_c::checkProcess(int (daObj_GrA_c::*param_0)(void*)) { nofralloc #include "asm/rel/d/a/obj/d_a_obj_gra2/d_a_obj_gra2/checkProcess__11daObj_GrA_cFM11daObj_GrA_cFPCvPvPv_i.s" } @@ -2563,7 +2587,7 @@ asm void daObj_GrA_c::checkProcess(int (daObj_GrA_c::*)(void*)) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daObj_GrA_c::setProcess(int (daObj_GrA_c::*)(void*)) { +asm void daObj_GrA_c::setProcess(int (daObj_GrA_c::*param_0)(void*)) { nofralloc #include "asm/rel/d/a/obj/d_a_obj_gra2/d_a_obj_gra2/setProcess__11daObj_GrA_cFM11daObj_GrA_cFPCvPvPv_i.s" } @@ -2604,21 +2628,21 @@ asm void daObj_GrA_c::checkEvent() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5022 = -160.0f; -COMPILER_STRIP_GATE(80C0FBB8, &lit_5022); +COMPILER_STRIP_GATE(0x80C0FBB8, &lit_5022); #pragma pop /* 80C0FBBC-80C0FBC0 000140 0004+00 0/1 0/0 0/0 .rodata @5023 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5023 = -100.0f; -COMPILER_STRIP_GATE(80C0FBBC, &lit_5023); +COMPILER_STRIP_GATE(0x80C0FBBC, &lit_5023); #pragma pop /* 80C0FBC0-80C0FBC4 000144 0004+00 0/1 0/0 0/0 .rodata @5024 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5024 = 160.0f; -COMPILER_STRIP_GATE(80C0FBC0, &lit_5024); +COMPILER_STRIP_GATE(0x80C0FBC0, &lit_5024); #pragma pop /* 80C0FBC4-80C0FBCC 000148 0004+04 0/1 0/0 0/0 .rodata @5025 */ @@ -2629,7 +2653,7 @@ SECTION_RODATA static f32 const lit_5025[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80C0FBC4, &lit_5025); +COMPILER_STRIP_GATE(0x80C0FBC4, &lit_5025); #pragma pop /* 80C0FBCC-80C0FBD4 000150 0008+00 0/13 0/0 0/0 .rodata @5026 */ @@ -2638,7 +2662,7 @@ COMPILER_STRIP_GATE(80C0FBC4, &lit_5025); SECTION_RODATA static u8 const lit_5026[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C0FBCC, &lit_5026); +COMPILER_STRIP_GATE(0x80C0FBCC, &lit_5026); #pragma pop /* 80C0FBD4-80C0FBDC 000158 0008+00 0/13 0/0 0/0 .rodata @5027 */ @@ -2647,7 +2671,7 @@ COMPILER_STRIP_GATE(80C0FBCC, &lit_5026); SECTION_RODATA static u8 const lit_5027[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C0FBD4, &lit_5027); +COMPILER_STRIP_GATE(0x80C0FBD4, &lit_5027); #pragma pop /* 80C0FBDC-80C0FBE4 000160 0008+00 0/13 0/0 0/0 .rodata @5028 */ @@ -2656,7 +2680,7 @@ COMPILER_STRIP_GATE(80C0FBD4, &lit_5027); SECTION_RODATA static u8 const lit_5028[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C0FBDC, &lit_5028); +COMPILER_STRIP_GATE(0x80C0FBDC, &lit_5028); #pragma pop /* 80C01D7C-80C01FE4 001F5C 0268+00 1/0 0/0 0/0 .text mainProc__11daObj_GrA_cFv */ @@ -2680,294 +2704,294 @@ void daObj_GrA_c::adjustShapeAngle() { #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_5241 = 0x3F93C86D; -COMPILER_STRIP_GATE(80C0FBE4, &lit_5241); +COMPILER_STRIP_GATE(0x80C0FBE4, &lit_5241); #pragma pop /* 80C0FBE8-80C0FBEC 00016C 0004+00 0/1 0/0 0/0 .rodata @5242 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_5242 = 0xBD57EFE1; -COMPILER_STRIP_GATE(80C0FBE8, &lit_5242); +COMPILER_STRIP_GATE(0x80C0FBE8, &lit_5242); #pragma pop /* 80C0FBEC-80C0FBF0 000170 0004+00 0/1 0/0 0/0 .rodata @5243 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_5243 = 0x3F826D0D; -COMPILER_STRIP_GATE(80C0FBEC, &lit_5243); +COMPILER_STRIP_GATE(0x80C0FBEC, &lit_5243); #pragma pop /* 80C0FBF0-80C0FBF4 000174 0004+00 0/1 0/0 0/0 .rodata @5244 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_5244 = 0x3F38E2A0; -COMPILER_STRIP_GATE(80C0FBF0, &lit_5244); +COMPILER_STRIP_GATE(0x80C0FBF0, &lit_5244); #pragma pop /* 80C0FBF4-80C0FBF8 000178 0004+00 0/1 0/0 0/0 .rodata @5245 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_5245 = 0xBE0F6406; -COMPILER_STRIP_GATE(80C0FBF4, &lit_5245); +COMPILER_STRIP_GATE(0x80C0FBF4, &lit_5245); #pragma pop /* 80C0FBF8-80C0FBFC 00017C 0004+00 0/1 0/0 0/0 .rodata @5246 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_5246 = 0x3FAAA68F; -COMPILER_STRIP_GATE(80C0FBF8, &lit_5246); +COMPILER_STRIP_GATE(0x80C0FBF8, &lit_5246); #pragma pop /* 80C0FBFC-80C0FC00 000180 0004+00 0/1 0/0 0/0 .rodata @5247 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_5247 = 0xBFAF2D4D; -COMPILER_STRIP_GATE(80C0FBFC, &lit_5247); +COMPILER_STRIP_GATE(0x80C0FBFC, &lit_5247); #pragma pop /* 80C0FC00-80C0FC04 000184 0004+00 0/1 0/0 0/0 .rodata @5248 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_5248 = 0xBE7F6901; -COMPILER_STRIP_GATE(80C0FC00, &lit_5248); +COMPILER_STRIP_GATE(0x80C0FC00, &lit_5248); #pragma pop /* 80C0FC04-80C0FC08 000188 0004+00 0/1 0/0 0/0 .rodata @5249 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_5249 = 0x3DBC31DF; -COMPILER_STRIP_GATE(80C0FC04, &lit_5249); +COMPILER_STRIP_GATE(0x80C0FC04, &lit_5249); #pragma pop /* 80C0FC08-80C0FC0C 00018C 0004+00 0/1 0/0 0/0 .rodata @5250 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_5250 = 0x3EFC15F4; -COMPILER_STRIP_GATE(80C0FC08, &lit_5250); +COMPILER_STRIP_GATE(0x80C0FC08, &lit_5250); #pragma pop /* 80C0FC0C-80C0FC10 000190 0004+00 0/1 0/0 0/0 .rodata @5251 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_5251 = 0xBEBC9E88; -COMPILER_STRIP_GATE(80C0FC0C, &lit_5251); +COMPILER_STRIP_GATE(0x80C0FC0C, &lit_5251); #pragma pop /* 80C0FC10-80C0FC14 000194 0004+00 0/1 0/0 0/0 .rodata @5252 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_5252 = 0xBF932064; -COMPILER_STRIP_GATE(80C0FC10, &lit_5252); +COMPILER_STRIP_GATE(0x80C0FC10, &lit_5252); #pragma pop /* 80C0FC14-80C0FC18 000198 0004+00 0/1 0/0 0/0 .rodata @5253 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_5253 = 0x3EE0F8E8; -COMPILER_STRIP_GATE(80C0FC14, &lit_5253); +COMPILER_STRIP_GATE(0x80C0FC14, &lit_5253); #pragma pop /* 80C0FC18-80C0FC1C 00019C 0004+00 0/1 0/0 0/0 .rodata @5254 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_5254 = 0xBEF809F6; -COMPILER_STRIP_GATE(80C0FC18, &lit_5254); +COMPILER_STRIP_GATE(0x80C0FC18, &lit_5254); #pragma pop /* 80C0FC1C-80C0FC20 0001A0 0004+00 0/1 0/0 0/0 .rodata @5255 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_5255 = 0x3FEB5F4E; -COMPILER_STRIP_GATE(80C0FC1C, &lit_5255); +COMPILER_STRIP_GATE(0x80C0FC1C, &lit_5255); #pragma pop /* 80C0FC20-80C0FC24 0001A4 0004+00 0/1 0/0 0/0 .rodata @5256 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_5256 = 0xBFC9527E; -COMPILER_STRIP_GATE(80C0FC20, &lit_5256); +COMPILER_STRIP_GATE(0x80C0FC20, &lit_5256); #pragma pop /* 80C0FC24-80C0FC28 0001A8 0004+00 0/1 0/0 0/0 .rodata @5257 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_5257 = 0xBF15C7BD; -COMPILER_STRIP_GATE(80C0FC24, &lit_5257); +COMPILER_STRIP_GATE(0x80C0FC24, &lit_5257); #pragma pop /* 80C0FC28-80C0FC2C 0001AC 0004+00 0/1 0/0 0/0 .rodata @5258 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_5258 = 0x3EDF3472; -COMPILER_STRIP_GATE(80C0FC28, &lit_5258); +COMPILER_STRIP_GATE(0x80C0FC28, &lit_5258); #pragma pop /* 80C0FC2C-80C0FC30 0001B0 0004+00 0/1 0/0 0/0 .rodata @5259 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_5259 = 0x3F96655A; -COMPILER_STRIP_GATE(80C0FC2C, &lit_5259); +COMPILER_STRIP_GATE(0x80C0FC2C, &lit_5259); #pragma pop /* 80C0FC30-80C0FC34 0001B4 0004+00 0/1 0/0 0/0 .rodata @5260 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_5260 = 0xBF2863BF; -COMPILER_STRIP_GATE(80C0FC30, &lit_5260); +COMPILER_STRIP_GATE(0x80C0FC30, &lit_5260); #pragma pop /* 80C0FC34-80C0FC38 0001B8 0004+00 0/1 0/0 0/0 .rodata @5261 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_5261 = 0xBF93F783; -COMPILER_STRIP_GATE(80C0FC34, &lit_5261); +COMPILER_STRIP_GATE(0x80C0FC34, &lit_5261); #pragma pop /* 80C0FC38-80C0FC3C 0001BC 0004+00 0/1 0/0 0/0 .rodata @5262 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_5262 = 0x3FAB3355; -COMPILER_STRIP_GATE(80C0FC38, &lit_5262); +COMPILER_STRIP_GATE(0x80C0FC38, &lit_5262); #pragma pop /* 80C0FC3C-80C0FC40 0001C0 0004+00 0/1 0/0 0/0 .rodata @5263 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_5263 = 0xBF30A601; -COMPILER_STRIP_GATE(80C0FC3C, &lit_5263); +COMPILER_STRIP_GATE(0x80C0FC3C, &lit_5263); #pragma pop /* 80C0FC40-80C0FC44 0001C4 0004+00 0/1 0/0 0/0 .rodata @5264 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_5264 = 0x3F89BE7F; -COMPILER_STRIP_GATE(80C0FC40, &lit_5264); +COMPILER_STRIP_GATE(0x80C0FC40, &lit_5264); #pragma pop /* 80C0FC44-80C0FC48 0001C8 0004+00 0/1 0/0 0/0 .rodata @5265 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_5265 = 0xBF7226F6; -COMPILER_STRIP_GATE(80C0FC44, &lit_5265); +COMPILER_STRIP_GATE(0x80C0FC44, &lit_5265); #pragma pop /* 80C0FC48-80C0FC4C 0001CC 0004+00 0/1 0/0 0/0 .rodata @5266 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_5266 = 0xBF2B5AFB; -COMPILER_STRIP_GATE(80C0FC48, &lit_5266); +COMPILER_STRIP_GATE(0x80C0FC48, &lit_5266); #pragma pop /* 80C0FC4C-80C0FC50 0001D0 0004+00 0/1 0/0 0/0 .rodata @5267 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_5267 = 0xBCF7A4E8; -COMPILER_STRIP_GATE(80C0FC4C, &lit_5267); +COMPILER_STRIP_GATE(0x80C0FC4C, &lit_5267); #pragma pop /* 80C0FC50-80C0FC54 0001D4 0004+00 0/1 0/0 0/0 .rodata @5268 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_5268 = 0x3D86809D; -COMPILER_STRIP_GATE(80C0FC50, &lit_5268); +COMPILER_STRIP_GATE(0x80C0FC50, &lit_5268); #pragma pop /* 80C0FC54-80C0FC58 0001D8 0004+00 0/1 0/0 0/0 .rodata @5269 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_5269 = 0xBF154F05; -COMPILER_STRIP_GATE(80C0FC54, &lit_5269); +COMPILER_STRIP_GATE(0x80C0FC54, &lit_5269); #pragma pop /* 80C0FC58-80C0FC5C 0001DC 0004+00 0/1 0/0 0/0 .rodata @5270 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_5270 = 0xBF917B8D; -COMPILER_STRIP_GATE(80C0FC58, &lit_5270); +COMPILER_STRIP_GATE(0x80C0FC58, &lit_5270); #pragma pop /* 80C0FC5C-80C0FC60 0001E0 0004+00 0/1 0/0 0/0 .rodata @5271 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_5271 = 0x3F89E397; -COMPILER_STRIP_GATE(80C0FC5C, &lit_5271); +COMPILER_STRIP_GATE(0x80C0FC5C, &lit_5271); #pragma pop /* 80C0FC60-80C0FC64 0001E4 0004+00 0/1 0/0 0/0 .rodata @5272 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_5272 = 0xBEE0B0F2; -COMPILER_STRIP_GATE(80C0FC60, &lit_5272); +COMPILER_STRIP_GATE(0x80C0FC60, &lit_5272); #pragma pop /* 80C0FC64-80C0FC68 0001E8 0004+00 0/1 0/0 0/0 .rodata @5273 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_5273 = 0x3E3D7A9A; -COMPILER_STRIP_GATE(80C0FC64, &lit_5273); +COMPILER_STRIP_GATE(0x80C0FC64, &lit_5273); #pragma pop /* 80C0FC68-80C0FC6C 0001EC 0004+00 0/1 0/0 0/0 .rodata @5274 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_5274 = 0xBBC77DD8; -COMPILER_STRIP_GATE(80C0FC68, &lit_5274); +COMPILER_STRIP_GATE(0x80C0FC68, &lit_5274); #pragma pop /* 80C0FC6C-80C0FC70 0001F0 0004+00 0/1 0/0 0/0 .rodata @5275 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_5275 = 0xBE8C79F6; -COMPILER_STRIP_GATE(80C0FC6C, &lit_5275); +COMPILER_STRIP_GATE(0x80C0FC6C, &lit_5275); #pragma pop /* 80C0FC70-80C0FC74 0001F4 0004+00 0/1 0/0 0/0 .rodata @5276 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_5276 = 0x3FBAC122; -COMPILER_STRIP_GATE(80C0FC70, &lit_5276); +COMPILER_STRIP_GATE(0x80C0FC70, &lit_5276); #pragma pop /* 80C0FC74-80C0FC78 0001F8 0004+00 0/1 0/0 0/0 .rodata @5277 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_5277 = 0xBF9D1740; -COMPILER_STRIP_GATE(80C0FC74, &lit_5277); +COMPILER_STRIP_GATE(0x80C0FC74, &lit_5277); #pragma pop /* 80C0FC78-80C0FC7C 0001FC 0004+00 0/1 0/0 0/0 .rodata @5278 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_5278 = 0xBDFD701E; -COMPILER_STRIP_GATE(80C0FC78, &lit_5278); +COMPILER_STRIP_GATE(0x80C0FC78, &lit_5278); #pragma pop /* 80C0FC7C-80C0FC80 000200 0004+00 0/1 0/0 0/0 .rodata @5279 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_5279 = 0x3E3ADFF8; -COMPILER_STRIP_GATE(80C0FC7C, &lit_5279); +COMPILER_STRIP_GATE(0x80C0FC7C, &lit_5279); #pragma pop /* 80C0FC80-80C0FC84 000204 0004+00 0/1 0/0 0/0 .rodata @5280 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_5280 = 0xBF445D10; -COMPILER_STRIP_GATE(80C0FC80, &lit_5280); +COMPILER_STRIP_GATE(0x80C0FC80, &lit_5280); #pragma pop /* 80C0FC84-80C0FC88 000208 0004+00 0/1 0/0 0/0 .rodata @5281 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_5281 = 0xBCABCF92; -COMPILER_STRIP_GATE(80C0FC84, &lit_5281); +COMPILER_STRIP_GATE(0x80C0FC84, &lit_5281); #pragma pop /* 80C0FC88-80C0FC8C 00020C 0004+00 0/1 0/0 0/0 .rodata @5282 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_5282 = 0xBF914092; -COMPILER_STRIP_GATE(80C0FC88, &lit_5282); +COMPILER_STRIP_GATE(0x80C0FC88, &lit_5282); #pragma pop /* 80C10908-80C10918 000070 000C+04 0/1 0/0 0/0 .bss @5037 */ @@ -3081,21 +3105,21 @@ asm void daObj_GrA_c::setMtx(int param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5397 = 20.0f; -COMPILER_STRIP_GATE(80C0FC8C, &lit_5397); +COMPILER_STRIP_GATE(0x80C0FC8C, &lit_5397); #pragma pop /* 80C0FC90-80C0FC94 000214 0004+00 0/3 0/0 0/0 .rodata @5398 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5398 = 200.0f; -COMPILER_STRIP_GATE(80C0FC90, &lit_5398); +COMPILER_STRIP_GATE(0x80C0FC90, &lit_5398); #pragma pop /* 80C0FC94-80C0FC98 000218 0004+00 0/4 0/0 0/0 .rodata @5399 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5399 = 40.0f; -COMPILER_STRIP_GATE(80C0FC94, &lit_5399); +COMPILER_STRIP_GATE(0x80C0FC94, &lit_5399); #pragma pop /* 80C10A74-80C10A84 0001DC 000C+04 0/1 0/0 0/0 .bss @5298 */ @@ -3125,14 +3149,14 @@ asm void daObj_GrA_c::setCollisions() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5431 = 15.0f; -COMPILER_STRIP_GATE(80C0FC98, &lit_5431); +COMPILER_STRIP_GATE(0x80C0FC98, &lit_5431); #pragma pop /* 80C0FC9C-80C0FCA0 000220 0004+00 0/6 0/0 0/0 .rodata @5432 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5432 = 25.0f; -COMPILER_STRIP_GATE(80C0FC9C, &lit_5432); +COMPILER_STRIP_GATE(0x80C0FC9C, &lit_5432); #pragma pop /* 80C10A90-80C10AA0 0001F8 000C+04 0/1 0/0 0/0 .bss @5404 */ @@ -3190,32 +3214,32 @@ asm void daObj_GrA_c::setLookMode(int param_0) { /* ############################################################################################## */ /* 80C0FCA0-80C0FCA4 000224 0004+00 1/8 0/0 0/0 .rodata @5568 */ SECTION_RODATA static f32 const lit_5568 = 0.5f; -COMPILER_STRIP_GATE(80C0FCA0, &lit_5568); +COMPILER_STRIP_GATE(0x80C0FCA0, &lit_5568); /* 80C0FCA4-80C0FCA8 000228 0004+00 0/0 0/0 0/0 .rodata @5582 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5582 = 149.0f; -COMPILER_STRIP_GATE(80C0FCA4, &lit_5582); +COMPILER_STRIP_GATE(0x80C0FCA4, &lit_5582); #pragma pop /* 80C0FCA8-80C0FCAC 00022C 0004+00 0/0 0/0 0/0 .rodata @5583 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5583 = 74.0f; -COMPILER_STRIP_GATE(80C0FCA8, &lit_5583); +COMPILER_STRIP_GATE(0x80C0FCA8, &lit_5583); #pragma pop /* 80C0FCAC-80C0FCB0 000230 0004+00 0/0 0/0 0/0 .rodata @5725 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5725 = 75.0f; -COMPILER_STRIP_GATE(80C0FCAC, &lit_5725); +COMPILER_STRIP_GATE(0x80C0FCAC, &lit_5725); #pragma pop /* 80C0FCB0-80C0FCB4 000234 0004+00 2/11 0/0 0/0 .rodata @5726 */ SECTION_RODATA static f32 const lit_5726 = 100.0f; -COMPILER_STRIP_GATE(80C0FCB0, &lit_5726); +COMPILER_STRIP_GATE(0x80C0FCB0, &lit_5726); /* 80C0FCB4-80C0FCC0 000238 000C+00 0/0 0/0 0/0 .rodata @5756 */ #pragma push @@ -3223,18 +3247,18 @@ COMPILER_STRIP_GATE(80C0FCB0, &lit_5726); SECTION_RODATA static u8 const lit_5756[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C0FCB4, &lit_5756); +COMPILER_STRIP_GATE(0x80C0FCB4, &lit_5756); #pragma pop /* 80C0FCC0-80C0FCC4 000244 0004+00 1/4 0/0 0/0 .rodata @5966 */ SECTION_RODATA static u32 const lit_5966 = 0x43360B61; -COMPILER_STRIP_GATE(80C0FCC0, &lit_5966); +COMPILER_STRIP_GATE(0x80C0FCC0, &lit_5966); /* 80C0FCC4-80C0FCC8 000248 0004+00 0/1 0/0 0/0 .rodata @5967 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5967 = 32.0f; -COMPILER_STRIP_GATE(80C0FCC4, &lit_5967); +COMPILER_STRIP_GATE(0x80C0FCC4, &lit_5967); #pragma pop /* 80C02AE8-80C0308C 002CC8 05A4+00 1/1 0/0 0/0 .text lookat__11daObj_GrA_cFv */ @@ -3324,14 +3348,14 @@ asm void daObj_GrA_c::fallAbyssCheck() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6054 = 0.25f; -COMPILER_STRIP_GATE(80C0FCC8, &lit_6054); +COMPILER_STRIP_GATE(0x80C0FCC8, &lit_6054); #pragma pop /* 80C0FCCC-80C0FCD0 000250 0004+00 0/6 0/0 0/0 .rodata @6055 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6055 = 3.5f; -COMPILER_STRIP_GATE(80C0FCCC, &lit_6055); +COMPILER_STRIP_GATE(0x80C0FCCC, &lit_6055); #pragma pop /* 80C0FCD0-80C0FCD8 000254 0006+02 0/1 0/0 0/0 .rodata l_prticles_id$6229 */ @@ -3348,19 +3372,19 @@ SECTION_RODATA static u8 const l_prticles_id[6 + 2 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C0FCD0, &l_prticles_id); +COMPILER_STRIP_GATE(0x80C0FCD0, &l_prticles_id); #pragma pop /* 80C0FCD8-80C0FCDC 00025C 0004+00 0/1 0/0 0/0 .rodata @6320 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6320 = 7.0f / 10.0f; -COMPILER_STRIP_GATE(80C0FCD8, &lit_6320); +COMPILER_STRIP_GATE(0x80C0FCD8, &lit_6320); #pragma pop /* 80C0FCDC-80C0FCE0 000260 0004+00 1/8 0/0 0/0 .rodata @6321 */ SECTION_RODATA static f32 const lit_6321 = 2.0f; -COMPILER_STRIP_GATE(80C0FCDC, &lit_6321); +COMPILER_STRIP_GATE(0x80C0FCDC, &lit_6321); /* 80C03830-80C03B14 003A10 02E4+00 1/1 0/0 0/0 .text setPrtcl__11daObj_GrA_cFv */ #pragma push @@ -3415,264 +3439,264 @@ asm void daObj_GrA_c::base004(int param_0) { /* ############################################################################################## */ /* 80C0FCE0-80C0FCE4 000264 0004+00 1/1 0/0 0/0 .rodata @6330 */ SECTION_RODATA static f32 const lit_6330 = 10.0f; -COMPILER_STRIP_GATE(80C0FCE0, &lit_6330); +COMPILER_STRIP_GATE(0x80C0FCE0, &lit_6330); /* 80C0FCE4-80C0FCE8 000268 0004+00 0/2 0/0 0/0 .rodata @6478 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6478 = 4.0f; -COMPILER_STRIP_GATE(80C0FCE4, &lit_6478); +COMPILER_STRIP_GATE(0x80C0FCE4, &lit_6478); #pragma pop /* 80C0FCE8-80C0FCEC 00026C 0004+00 0/1 0/0 0/0 .rodata @6479 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_6479 = 0xBEE568FF; -COMPILER_STRIP_GATE(80C0FCE8, &lit_6479); +COMPILER_STRIP_GATE(0x80C0FCE8, &lit_6479); #pragma pop /* 80C0FCEC-80C0FCF0 000270 0004+00 0/1 0/0 0/0 .rodata @6480 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_6480 = 0xBF2C65D1; -COMPILER_STRIP_GATE(80C0FCEC, &lit_6480); +COMPILER_STRIP_GATE(0x80C0FCEC, &lit_6480); #pragma pop /* 80C0FCF0-80C0FCF4 000274 0004+00 0/1 0/0 0/0 .rodata @6481 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_6481 = 0x3FE597C7; -COMPILER_STRIP_GATE(80C0FCF0, &lit_6481); +COMPILER_STRIP_GATE(0x80C0FCF0, &lit_6481); #pragma pop /* 80C0FCF4-80C0FCF8 000278 0004+00 0/1 0/0 0/0 .rodata @6482 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_6482 = 0xBF67A157; -COMPILER_STRIP_GATE(80C0FCF4, &lit_6482); +COMPILER_STRIP_GATE(0x80C0FCF4, &lit_6482); #pragma pop /* 80C0FCF8-80C0FCFC 00027C 0004+00 0/5 0/0 0/0 .rodata @6483 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6483 = 300.0f; -COMPILER_STRIP_GATE(80C0FCF8, &lit_6483); +COMPILER_STRIP_GATE(0x80C0FCF8, &lit_6483); #pragma pop /* 80C0FCFC-80C0FD00 000280 0004+00 0/3 0/0 0/0 .rodata @6651 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6651 = 50.0f; -COMPILER_STRIP_GATE(80C0FCFC, &lit_6651); +COMPILER_STRIP_GATE(0x80C0FCFC, &lit_6651); #pragma pop /* 80C0FD00-80C0FD04 000284 0004+00 0/1 0/0 0/0 .rodata @6722 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6722 = 4.0f / 5.0f; -COMPILER_STRIP_GATE(80C0FD00, &lit_6722); +COMPILER_STRIP_GATE(0x80C0FD00, &lit_6722); #pragma pop /* 80C0FD04-80C0FD08 000288 0004+00 0/2 0/0 0/0 .rodata @6723 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6723 = 45.0f; -COMPILER_STRIP_GATE(80C0FD04, &lit_6723); +COMPILER_STRIP_GATE(0x80C0FD04, &lit_6723); #pragma pop /* 80C0FD08-80C0FD0C 00028C 0004+00 0/1 0/0 0/0 .rodata @6873 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6873 = 95.0f; -COMPILER_STRIP_GATE(80C0FD08, &lit_6873); +COMPILER_STRIP_GATE(0x80C0FD08, &lit_6873); #pragma pop /* 80C0FD0C-80C0FD10 000290 0004+00 1/3 0/0 0/0 .rodata @6874 */ SECTION_RODATA static f32 const lit_6874 = 12.0f; -COMPILER_STRIP_GATE(80C0FD0C, &lit_6874); +COMPILER_STRIP_GATE(0x80C0FD0C, &lit_6874); /* 80C0FD10-80C0FD14 000294 0004+00 1/2 0/0 0/0 .rodata @7003 */ SECTION_RODATA static f32 const lit_7003 = 3.0f; -COMPILER_STRIP_GATE(80C0FD10, &lit_7003); +COMPILER_STRIP_GATE(0x80C0FD10, &lit_7003); /* 80C0FD14-80C0FD18 000298 0004+00 0/1 0/0 0/0 .rodata @7004 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7004 = 9.0f; -COMPILER_STRIP_GATE(80C0FD14, &lit_7004); +COMPILER_STRIP_GATE(0x80C0FD14, &lit_7004); #pragma pop /* 80C0FD18-80C0FD1C 00029C 0004+00 0/1 0/0 0/0 .rodata @7005 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7005 = 24.0f; -COMPILER_STRIP_GATE(80C0FD18, &lit_7005); +COMPILER_STRIP_GATE(0x80C0FD18, &lit_7005); #pragma pop /* 80C0FD1C-80C0FD20 0002A0 0004+00 0/5 0/0 0/0 .rodata @7312 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7312 = 150.0f; -COMPILER_STRIP_GATE(80C0FD1C, &lit_7312); +COMPILER_STRIP_GATE(0x80C0FD1C, &lit_7312); #pragma pop /* 80C0FD20-80C0FD24 0002A4 0004+00 0/3 0/0 0/0 .rodata @7313 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7313 = 14.0f; -COMPILER_STRIP_GATE(80C0FD20, &lit_7313); +COMPILER_STRIP_GATE(0x80C0FD20, &lit_7313); #pragma pop /* 80C0FD24-80C0FD28 0002A8 0004+00 0/2 0/0 0/0 .rodata @7314 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7314 = 1.0f / 20.0f; -COMPILER_STRIP_GATE(80C0FD24, &lit_7314); +COMPILER_STRIP_GATE(0x80C0FD24, &lit_7314); #pragma pop /* 80C0FD28-80C0FD2C 0002AC 0004+00 0/6 0/0 0/0 .rodata @7315 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7315 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(80C0FD28, &lit_7315); +COMPILER_STRIP_GATE(0x80C0FD28, &lit_7315); #pragma pop /* 80C0FD2C-80C0FD34 0002B0 0008+00 1/1 0/0 0/0 .rodata @7443 */ SECTION_RODATA static u8 const lit_7443[8] = { 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C0FD2C, &lit_7443); +COMPILER_STRIP_GATE(0x80C0FD2C, &lit_7443); /* 80C0FD34-80C0FD38 0002B8 0004+00 0/2 0/0 0/0 .rodata @7613 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7613 = -30.0f; -COMPILER_STRIP_GATE(80C0FD34, &lit_7613); +COMPILER_STRIP_GATE(0x80C0FD34, &lit_7613); #pragma pop /* 80C0FD38-80C0FD3C 0002BC 0004+00 0/2 0/0 0/0 .rodata @7996 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7996 = 1800.0f; -COMPILER_STRIP_GATE(80C0FD38, &lit_7996); +COMPILER_STRIP_GATE(0x80C0FD38, &lit_7996); #pragma pop /* 80C0FD3C-80C0FD40 0002C0 0004+00 0/2 0/0 0/0 .rodata @7997 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7997 = 2000.0f; -COMPILER_STRIP_GATE(80C0FD3C, &lit_7997); +COMPILER_STRIP_GATE(0x80C0FD3C, &lit_7997); #pragma pop /* 80C0FD40-80C0FD44 0002C4 0004+00 0/2 0/0 0/0 .rodata @7998 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7998 = -4500.0f; -COMPILER_STRIP_GATE(80C0FD40, &lit_7998); +COMPILER_STRIP_GATE(0x80C0FD40, &lit_7998); #pragma pop /* 80C0FD44-80C0FD48 0002C8 0004+00 1/4 0/0 0/0 .rodata @7999 */ SECTION_RODATA static f32 const lit_7999 = 30.0f; -COMPILER_STRIP_GATE(80C0FD44, &lit_7999); +COMPILER_STRIP_GATE(0x80C0FD44, &lit_7999); /* 80C0FD48-80C0FD4C 0002CC 0004+00 0/2 0/0 0/0 .rodata @8701 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8701 = 250.0f; -COMPILER_STRIP_GATE(80C0FD48, &lit_8701); +COMPILER_STRIP_GATE(0x80C0FD48, &lit_8701); #pragma pop /* 80C0FD4C-80C0FD50 0002D0 0004+00 0/2 0/0 0/0 .rodata @8702 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8702 = 500.0f; -COMPILER_STRIP_GATE(80C0FD4C, &lit_8702); +COMPILER_STRIP_GATE(0x80C0FD4C, &lit_8702); #pragma pop /* 80C0FD50-80C0FD54 0002D4 0004+00 0/1 0/0 0/0 .rodata @8703 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8703 = 55.0f; -COMPILER_STRIP_GATE(80C0FD50, &lit_8703); +COMPILER_STRIP_GATE(0x80C0FD50, &lit_8703); #pragma pop /* 80C0FD54-80C0FD58 0002D8 0004+00 0/1 0/0 0/0 .rodata @8704 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8704 = 210.0f; -COMPILER_STRIP_GATE(80C0FD54, &lit_8704); +COMPILER_STRIP_GATE(0x80C0FD54, &lit_8704); #pragma pop /* 80C0FD58-80C0FD5C 0002DC 0004+00 0/1 0/0 0/0 .rodata @8705 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8705 = -335.0f; -COMPILER_STRIP_GATE(80C0FD58, &lit_8705); +COMPILER_STRIP_GATE(0x80C0FD58, &lit_8705); #pragma pop /* 80C0FD5C-80C0FD60 0002E0 0004+00 0/1 0/0 0/0 .rodata @8706 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8706 = 17.0f; -COMPILER_STRIP_GATE(80C0FD5C, &lit_8706); +COMPILER_STRIP_GATE(0x80C0FD5C, &lit_8706); #pragma pop /* 80C0FD60-80C0FD64 0002E4 0004+00 0/1 0/0 0/0 .rodata @8956 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8956 = 3.0f / 20.0f; -COMPILER_STRIP_GATE(80C0FD60, &lit_8956); +COMPILER_STRIP_GATE(0x80C0FD60, &lit_8956); #pragma pop /* 80C0FD64-80C0FD68 0002E8 0004+00 0/3 0/0 0/0 .rodata @8957 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8957 = 60.0f; -COMPILER_STRIP_GATE(80C0FD64, &lit_8957); +COMPILER_STRIP_GATE(0x80C0FD64, &lit_8957); #pragma pop /* 80C0FD68-80C0FD6C 0002EC 0004+00 0/2 0/0 0/0 .rodata @8958 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8958 = -300.0f; -COMPILER_STRIP_GATE(80C0FD68, &lit_8958); +COMPILER_STRIP_GATE(0x80C0FD68, &lit_8958); #pragma pop /* 80C0FD6C-80C0FD70 0002F0 0004+00 0/2 0/0 0/0 .rodata @8959 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_8959 = 90.0f; -COMPILER_STRIP_GATE(80C0FD6C, &lit_8959); +COMPILER_STRIP_GATE(0x80C0FD6C, &lit_8959); #pragma pop /* 80C0FD70-80C0FD74 0002F4 0004+00 0/1 0/0 0/0 .rodata @9046 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9046 = -200.0f; -COMPILER_STRIP_GATE(80C0FD70, &lit_9046); +COMPILER_STRIP_GATE(0x80C0FD70, &lit_9046); #pragma pop /* 80C0FD74-80C0FD78 0002F8 0004+00 0/3 0/0 0/0 .rodata @9047 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9047 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(80C0FD74, &lit_9047); +COMPILER_STRIP_GATE(0x80C0FD74, &lit_9047); #pragma pop /* 80C0FD78-80C0FD7C 0002FC 0004+00 0/1 0/0 0/0 .rodata @9205 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9205 = 5.0f; -COMPILER_STRIP_GATE(80C0FD78, &lit_9205); +COMPILER_STRIP_GATE(0x80C0FD78, &lit_9205); #pragma pop /* 80C0FD7C-80C0FD80 000300 0004+00 1/2 0/0 0/0 .rodata @9223 */ SECTION_RODATA static f32 const lit_9223 = -120.0f; -COMPILER_STRIP_GATE(80C0FD7C, &lit_9223); +COMPILER_STRIP_GATE(0x80C0FD7C, &lit_9223); /* 80C0FD80-80C0FD84 000304 0004+00 1/3 0/0 0/0 .rodata @9280 */ SECTION_RODATA static f32 const lit_9280 = -110.0f; -COMPILER_STRIP_GATE(80C0FD80, &lit_9280); +COMPILER_STRIP_GATE(0x80C0FD80, &lit_9280); /* 80C0FD84-80C0FD8C 000308 0008+00 0/1 0/0 0/0 .rodata @9333 */ #pragma push @@ -3680,196 +3704,196 @@ COMPILER_STRIP_GATE(80C0FD80, &lit_9280); SECTION_RODATA static u8 const lit_9333[8] = { 0x3F, 0xC9, 0x99, 0x99, 0x99, 0x99, 0x99, 0x9A, }; -COMPILER_STRIP_GATE(80C0FD84, &lit_9333); +COMPILER_STRIP_GATE(0x80C0FD84, &lit_9333); #pragma pop /* 80C0FD8C-80C0FD90 000310 0004+00 0/2 0/0 0/0 .rodata @9334 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9334 = -7.0f / 10.0f; -COMPILER_STRIP_GATE(80C0FD8C, &lit_9334); +COMPILER_STRIP_GATE(0x80C0FD8C, &lit_9334); #pragma pop /* 80C0FD90-80C0FD94 000314 0004+00 0/2 0/0 0/0 .rodata @9385 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9385 = -4.0f; -COMPILER_STRIP_GATE(80C0FD90, &lit_9385); +COMPILER_STRIP_GATE(0x80C0FD90, &lit_9385); #pragma pop /* 80C0FD94-80C0FD98 000318 0004+00 0/1 0/0 0/0 .rodata @9464 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_9464 = -1.0f / 10.0f; -COMPILER_STRIP_GATE(80C0FD94, &lit_9464); +COMPILER_STRIP_GATE(0x80C0FD94, &lit_9464); #pragma pop /* 80C0FD98-80C0FD9C 00031C 0004+00 0/1 0/0 0/0 .rodata @10241 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10241 = 700.0f; -COMPILER_STRIP_GATE(80C0FD98, &lit_10241); +COMPILER_STRIP_GATE(0x80C0FD98, &lit_10241); #pragma pop /* 80C0FD9C-80C0FDA0 000320 0004+00 0/1 0/0 0/0 .rodata @10242 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10242 = 3.0f / 50.0f; -COMPILER_STRIP_GATE(80C0FD9C, &lit_10242); +COMPILER_STRIP_GATE(0x80C0FD9C, &lit_10242); #pragma pop /* 80C0FDA0-80C0FDA4 000324 0004+00 0/1 0/0 0/0 .rodata @10243 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10243 = 70.0f; -COMPILER_STRIP_GATE(80C0FDA0, &lit_10243); +COMPILER_STRIP_GATE(0x80C0FDA0, &lit_10243); #pragma pop /* 80C0FDA4-80C0FDA8 000328 0004+00 0/1 0/0 0/0 .rodata @10244 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10244 = 230.0f; -COMPILER_STRIP_GATE(80C0FDA4, &lit_10244); +COMPILER_STRIP_GATE(0x80C0FDA4, &lit_10244); #pragma pop /* 80C0FDA8-80C0FDAC 00032C 0004+00 0/1 0/0 0/0 .rodata @10245 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10245 = 1.0f / 100.0f; -COMPILER_STRIP_GATE(80C0FDA8, &lit_10245); +COMPILER_STRIP_GATE(0x80C0FDA8, &lit_10245); #pragma pop /* 80C0FDAC-80C0FDB0 000330 0004+00 0/1 0/0 0/0 .rodata @10246 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10246 = 280.0f; -COMPILER_STRIP_GATE(80C0FDAC, &lit_10246); +COMPILER_STRIP_GATE(0x80C0FDAC, &lit_10246); #pragma pop /* 80C0FDB0-80C0FDB4 000334 0004+00 0/1 0/0 0/0 .rodata @10247 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10247 = -50.0f; -COMPILER_STRIP_GATE(80C0FDB0, &lit_10247); +COMPILER_STRIP_GATE(0x80C0FDB0, &lit_10247); #pragma pop /* 80C0FDB4-80C0FDB8 000338 0004+00 0/1 0/0 0/0 .rodata @10248 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10248 = -800.0f; -COMPILER_STRIP_GATE(80C0FDB4, &lit_10248); +COMPILER_STRIP_GATE(0x80C0FDB4, &lit_10248); #pragma pop /* 80C0FDB8-80C0FDBC 00033C 0004+00 0/1 0/0 0/0 .rodata @10249 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10249 = 35.0f; -COMPILER_STRIP_GATE(80C0FDB8, &lit_10249); +COMPILER_STRIP_GATE(0x80C0FDB8, &lit_10249); #pragma pop /* 80C0FDBC-80C0FDC0 000340 0004+00 0/1 0/0 0/0 .rodata @10250 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10250 = 7.0f / 20.0f; -COMPILER_STRIP_GATE(80C0FDBC, &lit_10250); +COMPILER_STRIP_GATE(0x80C0FDBC, &lit_10250); #pragma pop /* 80C0FDC0-80C0FDC4 000344 0004+00 0/0 0/0 0/0 .rodata @10251 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10251 = 80.0f; -COMPILER_STRIP_GATE(80C0FDC0, &lit_10251); +COMPILER_STRIP_GATE(0x80C0FDC0, &lit_10251); #pragma pop /* 80C0FDC4-80C0FDC8 000348 0004+00 0/0 0/0 0/0 .rodata @10252 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_10252 = 0x4312170A; -COMPILER_STRIP_GATE(80C0FDC4, &lit_10252); +COMPILER_STRIP_GATE(0x80C0FDC4, &lit_10252); #pragma pop /* 80C0FDC8-80C0FDCC 00034C 0004+00 0/0 0/0 0/0 .rodata @10253 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_10253 = 0x4321F852; -COMPILER_STRIP_GATE(80C0FDC8, &lit_10253); +COMPILER_STRIP_GATE(0x80C0FDC8, &lit_10253); #pragma pop /* 80C0FDCC-80C0FDD0 000350 0004+00 1/1 0/0 0/0 .rodata @10254 */ SECTION_RODATA static f32 const lit_10254 = 6.0f; -COMPILER_STRIP_GATE(80C0FDCC, &lit_10254); +COMPILER_STRIP_GATE(0x80C0FDCC, &lit_10254); /* 80C0FDD0-80C0FDD4 000354 0004+00 0/0 0/0 0/0 .rodata @10255 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10255 = 13.0f; -COMPILER_STRIP_GATE(80C0FDD0, &lit_10255); +COMPILER_STRIP_GATE(0x80C0FDD0, &lit_10255); #pragma pop /* 80C0FDD4-80C0FDD8 000358 0004+00 0/0 0/0 0/0 .rodata @10256 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10256 = -1482.0f; -COMPILER_STRIP_GATE(80C0FDD4, &lit_10256); +COMPILER_STRIP_GATE(0x80C0FDD4, &lit_10256); #pragma pop /* 80C0FDD8-80C0FDDC 00035C 0004+00 0/0 0/0 0/0 .rodata @10257 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10257 = 3650.0f; -COMPILER_STRIP_GATE(80C0FDD8, &lit_10257); +COMPILER_STRIP_GATE(0x80C0FDD8, &lit_10257); #pragma pop /* 80C0FDDC-80C0FDE0 000360 0004+00 0/0 0/0 0/0 .rodata @10258 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10258 = -4459.0f; -COMPILER_STRIP_GATE(80C0FDDC, &lit_10258); +COMPILER_STRIP_GATE(0x80C0FDDC, &lit_10258); #pragma pop /* 80C0FDE0-80C0FDE4 000364 0004+00 1/2 0/0 0/0 .rodata @10292 */ SECTION_RODATA static u32 const lit_10292 = 0x3BB40000; -COMPILER_STRIP_GATE(80C0FDE0, &lit_10292); +COMPILER_STRIP_GATE(0x80C0FDE0, &lit_10292); /* 80C0FDE4-80C0FDE8 000368 0004+00 1/3 0/0 0/0 .rodata @10293 */ SECTION_RODATA static f32 const lit_10293 = 180.0f; -COMPILER_STRIP_GATE(80C0FDE4, &lit_10293); +COMPILER_STRIP_GATE(0x80C0FDE4, &lit_10293); /* 80C0FDE8-80C0FDEC 00036C 0004+00 0/1 0/0 0/0 .rodata @10294 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10294 = 8.0f; -COMPILER_STRIP_GATE(80C0FDE8, &lit_10294); +COMPILER_STRIP_GATE(0x80C0FDE8, &lit_10294); #pragma pop /* 80C0FDEC-80C0FDF0 000370 0004+00 0/1 0/0 0/0 .rodata @10295 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10295 = 16384.0f; -COMPILER_STRIP_GATE(80C0FDEC, &lit_10295); +COMPILER_STRIP_GATE(0x80C0FDEC, &lit_10295); #pragma pop /* 80C0FDF0-80C0FDF4 000374 0004+00 0/1 0/0 0/0 .rodata @10406 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10406 = 110.0f; -COMPILER_STRIP_GATE(80C0FDF0, &lit_10406); +COMPILER_STRIP_GATE(0x80C0FDF0, &lit_10406); #pragma pop /* 80C0FDF4-80C0FDF8 000378 0004+00 0/1 0/0 0/0 .rodata @10407 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10407 = 135.0f; -COMPILER_STRIP_GATE(80C0FDF4, &lit_10407); +COMPILER_STRIP_GATE(0x80C0FDF4, &lit_10407); #pragma pop /* 80C0FDF8-80C0FDFC 00037C 0004+00 1/1 0/0 0/0 .rodata @10650 */ SECTION_RODATA static f32 const lit_10650 = 4.5f; -COMPILER_STRIP_GATE(80C0FDF8, &lit_10650); +COMPILER_STRIP_GATE(0x80C0FDF8, &lit_10650); /* 80C0FDFC-80C0FE00 000380 0004+00 1/1 0/0 0/0 .rodata @10651 */ SECTION_RODATA static f32 const lit_10651 = 5.5f; -COMPILER_STRIP_GATE(80C0FDFC, &lit_10651); +COMPILER_STRIP_GATE(0x80C0FDFC, &lit_10651); /* 80C03CBC-80C03D54 003E9C 0098+00 1/0 0/0 0/0 .text base005__11daObj_GrA_cFi */ #pragma push @@ -3926,14 +3950,14 @@ asm void daObj_GrA_c::base009(int param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10705 = 18.5f; -COMPILER_STRIP_GATE(80C0FE00, &lit_10705); +COMPILER_STRIP_GATE(0x80C0FE00, &lit_10705); #pragma pop /* 80C0FE04-80C0FE08 000388 0004+00 0/1 0/0 0/0 .rodata @10706 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10706 = 19.5f; -COMPILER_STRIP_GATE(80C0FE04, &lit_10706); +COMPILER_STRIP_GATE(0x80C0FE04, &lit_10706); #pragma pop /* 80C03F14-80C03FC0 0040F4 00AC+00 1/0 0/0 0/0 .text base010__11daObj_GrA_cFi */ @@ -3951,7 +3975,7 @@ asm void daObj_GrA_c::base010(int param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_10768 = 127.0f; -COMPILER_STRIP_GATE(80C0FE08, &lit_10768); +COMPILER_STRIP_GATE(0x80C0FE08, &lit_10768); #pragma pop /* 80C03FC0-80C04118 0041A0 0158+00 1/0 0/0 0/0 .text base013__11daObj_GrA_cFi */ @@ -4461,7 +4485,7 @@ bool daBaseNpc_moveBgActor_c::Delete() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80C04F3C(int* param_0) { +extern "C" asm void func_80C04F3C(void* _this, int* param_0) { nofralloc #include "asm/rel/d/a/obj/d_a_obj_gra2/d_a_obj_gra2/func_80C04F3C.s" } @@ -4471,7 +4495,7 @@ extern "C" asm void func_80C04F3C(int* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80C04F58(s16* param_0) { +extern "C" asm void func_80C04F58(void* _this, s16* param_0) { nofralloc #include "asm/rel/d/a/obj/d_a_obj_gra2/d_a_obj_gra2/func_80C04F58.s" } @@ -4482,14 +4506,14 @@ extern "C" asm void func_80C04F58(s16* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_11071 = 67.0f; -COMPILER_STRIP_GATE(80C0FE0C, &lit_11071); +COMPILER_STRIP_GATE(0x80C0FE0C, &lit_11071); #pragma pop /* 80C0FE10-80C0FE14 000394 0004+00 0/1 0/0 0/0 .rodata @11072 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_11072 = 26.0f; -COMPILER_STRIP_GATE(80C0FE10, &lit_11072); +COMPILER_STRIP_GATE(0x80C0FE10, &lit_11072); #pragma pop /* 80C04F74-80C0536C 005154 03F8+00 0/0 1/0 0/0 .text __sinit_d_a_obj_gra2_cpp */ @@ -4504,7 +4528,7 @@ asm void __sinit_d_a_obj_gra2_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80C04F74 = (void*)__sinit_d_a_obj_gra2_cpp; +REGISTER_CTORS(0x80C04F74, __sinit_d_a_obj_gra2_cpp); #pragma pop /* 80C0536C-80C053C4 00554C 0058+00 4/4 0/0 0/0 .text getSrchCircleR__11daObj_GrA_cFv */ @@ -4547,6 +4571,13 @@ asm void daObj_GrA_c::defence(void* param_0) { } #pragma pop +/* ############################################################################################## */ +/* 80C0FE14-80C0FE14 000398 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80C0FE60 = "F_SP109"; +#pragma pop + /* 80C061F4-80C067D8 0063D4 05E4+00 5/0 0/0 0/0 .text toStone__11daObj_GrA_cFPv */ #pragma push #pragma optimization_level 0 @@ -5217,17 +5248,4 @@ static u8 data_80C10B6C[4]; static u8 data_80C10B70[4]; #pragma pop -/* 80C0FE14-80C0FE68 000398 0054+00 6/3 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80C0FE14 = "grA"; -SECTION_DEAD static char const* const stringBase_80C0FE18 = "grA_base"; -SECTION_DEAD static char const* const stringBase_80C0FE21 = "grA_mdl"; -SECTION_DEAD static char const* const stringBase_80C0FE29 = "grA_demo"; -SECTION_DEAD static char const* const stringBase_80C0FE32 = "grA_Look"; -SECTION_DEAD static char const* const stringBase_80C0FE3B = "GRA_THROWN"; -SECTION_DEAD static char const* const stringBase_80C0FE46 = "grA_stone_col.dzb"; -SECTION_DEAD static char const* const stringBase_80C0FE58 = "Obj_grA"; -SECTION_DEAD static char const* const stringBase_80C0FE60 = "F_SP109"; -#pragma pop +/* 80C0FE14-80C0FE14 000398 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_graWall/d_a_obj_graWall.cpp b/rel/d/a/obj/d_a_obj_graWall/d_a_obj_graWall.cpp index b199778f29a..74d2293dc8c 100644 --- a/rel/d/a/obj/d_a_obj_graWall/d_a_obj_graWall.cpp +++ b/rel/d/a/obj/d_a_obj_graWall/d_a_obj_graWall.cpp @@ -206,7 +206,7 @@ bool daObjGraWall_c::Delete() { SECTION_RODATA static u8 const l_DATA[8] = { 0x43, 0x34, 0x00, 0x00, 0x43, 0x8C, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C10FB0, &l_DATA); +COMPILER_STRIP_GATE(0x80C10FB0, &l_DATA); /* 80C10FB8-80C10FFC 000008 0044+00 1/1 0/0 0/0 .rodata l_cyl_src */ SECTION_RODATA static u8 const l_cyl_src[68] = { @@ -216,7 +216,7 @@ SECTION_RODATA static u8 const l_cyl_src[68] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C10FB8, &l_cyl_src); +COMPILER_STRIP_GATE(0x80C10FB8, &l_cyl_src); /* 80C10E80-80C10ED4 000300 0054+00 1/1 0/0 0/0 .text col_init__14daObjGraWall_cFv */ #pragma push diff --git a/rel/d/a/obj/d_a_obj_gra_rock/d_a_obj_gra_rock.cpp b/rel/d/a/obj/d_a_obj_gra_rock/d_a_obj_gra_rock.cpp index 78b4c635dfc..dc988eabf41 100644 --- a/rel/d/a/obj/d_a_obj_gra_rock/d_a_obj_gra_rock.cpp +++ b/rel/d/a/obj/d_a_obj_gra_rock/d_a_obj_gra_rock.cpp @@ -77,10 +77,10 @@ struct dRes_control_c { struct dPa_levelEcallBack {}; -struct _GXColor {}; - struct csXyz {}; +struct _GXColor {}; + struct dPa_control_c { /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, @@ -186,10 +186,10 @@ struct cBgS { /* 80074250 */ void Release(dBgW_Base*); }; -struct Vec {}; - struct JAISoundID {}; +struct Vec {}; + struct Z2SeMgr { /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); }; @@ -236,9 +236,9 @@ extern "C" static void daObjGraRock_Execute__FP14daObjGraRock_c(); extern "C" static bool daObjGraRock_IsDelete__FP14daObjGraRock_c(); extern "C" static void daObjGraRock_Delete__FP14daObjGraRock_c(); extern "C" static void daObjGraRock_create__FP10fopAc_ac_c(); -extern "C" void func_80C122F0(s16*); -extern "C" void func_80C1230C(u8*); -extern "C" void func_80C12328(int, int); +extern "C" void func_80C122F0(void* _this, s16*); +extern "C" void func_80C1230C(void* _this, u8*); +extern "C" void func_80C12328(void* _this, int, int); extern "C" static void func_80C123A4(); extern "C" static void func_80C123AC(); extern "C" u8 const mCcDCyl__14daObjGraRock_c[68]; @@ -348,7 +348,7 @@ SECTION_RODATA u8 const daObjGraRock_c::mCcDCyl[68] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C123BC, &daObjGraRock_c::mCcDCyl); +COMPILER_STRIP_GATE(0x80C123BC, &daObjGraRock_c::mCcDCyl); /* 80C12400-80C12404 000044 0004+00 1/4 0/0 0/0 .rodata @3857 */ SECTION_RODATA static u8 const lit_3857[4] = { @@ -357,31 +357,31 @@ SECTION_RODATA static u8 const lit_3857[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C12400, &lit_3857); +COMPILER_STRIP_GATE(0x80C12400, &lit_3857); /* 80C12404-80C12408 000048 0004+00 0/2 0/0 0/0 .rodata @3858 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3858 = 680.0f; -COMPILER_STRIP_GATE(80C12404, &lit_3858); +COMPILER_STRIP_GATE(0x80C12404, &lit_3858); #pragma pop /* 80C12408-80C1240C 00004C 0004+00 0/2 0/0 0/0 .rodata @3859 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3859 = 145.0f; -COMPILER_STRIP_GATE(80C12408, &lit_3859); +COMPILER_STRIP_GATE(0x80C12408, &lit_3859); #pragma pop /* 80C1240C-80C12410 000050 0004+00 4/6 0/0 0/0 .rodata @3860 */ SECTION_RODATA static f32 const lit_3860 = 1.0f; -COMPILER_STRIP_GATE(80C1240C, &lit_3860); +COMPILER_STRIP_GATE(0x80C1240C, &lit_3860); /* 80C12410-80C12414 000054 0004+00 0/2 0/0 0/0 .rodata @3861 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3861 = -1.0f; -COMPILER_STRIP_GATE(80C12410, &lit_3861); +COMPILER_STRIP_GATE(0x80C12410, &lit_3861); #pragma pop /* 80C12414-80C1241C 000058 0004+04 0/1 0/0 0/0 .rodata @3862 */ @@ -392,14 +392,14 @@ SECTION_RODATA static f32 const lit_3862[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80C12414, &lit_3862); +COMPILER_STRIP_GATE(0x80C12414, &lit_3862); #pragma pop /* 80C1241C-80C12424 000060 0008+00 1/2 0/0 0/0 .rodata @3864 */ SECTION_RODATA static u8 const lit_3864[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C1241C, &lit_3864); +COMPILER_STRIP_GATE(0x80C1241C, &lit_3864); /* 80C110F8-80C11444 000078 034C+00 1/1 0/0 0/0 .text setAttnPos__14daObjGraRock_cFv */ #pragma push @@ -429,7 +429,7 @@ SECTION_RODATA static u8 const l_prticles_id[4] = { 0x87, 0x60, }; -COMPILER_STRIP_GATE(80C12424, &l_prticles_id); +COMPILER_STRIP_GATE(0x80C12424, &l_prticles_id); /* 80C114C0-80C1157C 000440 00BC+00 1/1 0/0 0/0 .text setPrtcl__14daObjGraRock_cFv */ #pragma push @@ -498,42 +498,42 @@ asm void daObjGraRock_c::checkHitAt(cCcD_Obj* param_0) { #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4024 = 0xC3A438D5; -COMPILER_STRIP_GATE(80C12428, &lit_4024); +COMPILER_STRIP_GATE(0x80C12428, &lit_4024); #pragma pop /* 80C1242C-80C12430 000070 0004+00 0/1 0/0 0/0 .rodata @4025 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4025 = -150.0f; -COMPILER_STRIP_GATE(80C1242C, &lit_4025); +COMPILER_STRIP_GATE(0x80C1242C, &lit_4025); #pragma pop /* 80C12430-80C12434 000074 0004+00 0/1 0/0 0/0 .rodata @4026 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4026 = 0xC3C01581; -COMPILER_STRIP_GATE(80C12430, &lit_4026); +COMPILER_STRIP_GATE(0x80C12430, &lit_4026); #pragma pop /* 80C12434-80C12438 000078 0004+00 0/1 0/0 0/0 .rodata @4027 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4027 = 0x43A1274C; -COMPILER_STRIP_GATE(80C12434, &lit_4027); +COMPILER_STRIP_GATE(0x80C12434, &lit_4027); #pragma pop /* 80C12438-80C1243C 00007C 0004+00 0/1 0/0 0/0 .rodata @4028 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4028 = 0x4483F1C2; -COMPILER_STRIP_GATE(80C12438, &lit_4028); +COMPILER_STRIP_GATE(0x80C12438, &lit_4028); #pragma pop /* 80C1243C-80C12440 000080 0004+00 0/1 0/0 0/0 .rodata @4029 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4029 = 0x43C89F9E; -COMPILER_STRIP_GATE(80C1243C, &lit_4029); +COMPILER_STRIP_GATE(0x80C1243C, &lit_4029); #pragma pop /* 80C11970-80C11B68 0008F0 01F8+00 1/0 0/0 0/0 .text Create__14daObjGraRock_cFv */ @@ -547,6 +547,18 @@ asm void daObjGraRock_c::Create() { #pragma pop /* ############################################################################################## */ +/* 80C12440-80C12440 000084 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80C12440 = "M_VBom"; +SECTION_DEAD static char const* const stringBase_80C12447 = "grA_base"; +SECTION_DEAD static char const* const stringBase_80C12450 = "grA_mdl"; +SECTION_DEAD static char const* const stringBase_80C12458 = "grA_Rock"; +SECTION_DEAD static char const* const stringBase_80C12461 = "grA_RockD"; +SECTION_DEAD static char const* const stringBase_80C1246B = "M_VBom_Zora.bmd"; +SECTION_DEAD static char const* const stringBase_80C1247B = "M_VBom_Zora.btp"; +#pragma pop + /* 80C1249C-80C124B0 -00001 0014+00 3/3 0/0 0/0 .data l_arcName */ SECTION_DATA static void* l_arcName[5] = { (void*)&d_a_obj_gra_rock__stringBase0, @@ -567,6 +579,12 @@ asm void daObjGraRock_c::CreateHeap() { #pragma pop /* ############################################################################################## */ +/* 80C12440-80C12440 000084 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80C1248B = "M_VBom_Zora.dzb"; +#pragma pop + /* 80C124B0-80C124D0 -00001 0020+00 1/0 0/0 0/0 .data l_daObjGraRock_Method */ SECTION_DATA static void* l_daObjGraRock_Method[8] = { (void*)daObjGraRock_create__FP10fopAc_ac_c, @@ -768,7 +786,7 @@ static asm void daObjGraRock_create(fopAc_ac_c* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80C122F0(s16* param_0) { +extern "C" asm void func_80C122F0(void* _this, s16* param_0) { nofralloc #include "asm/rel/d/a/obj/d_a_obj_gra_rock/d_a_obj_gra_rock/func_80C122F0.s" } @@ -778,7 +796,7 @@ extern "C" asm void func_80C122F0(s16* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80C1230C(u8* param_0) { +extern "C" asm void func_80C1230C(void* _this, u8* param_0) { nofralloc #include "asm/rel/d/a/obj/d_a_obj_gra_rock/d_a_obj_gra_rock/func_80C1230C.s" } @@ -788,7 +806,7 @@ extern "C" asm void func_80C1230C(u8* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80C12328(int param_0, int param_1) { +extern "C" asm void func_80C12328(void* _this, int param_0, int param_1) { nofralloc #include "asm/rel/d/a/obj/d_a_obj_gra_rock/d_a_obj_gra_rock/func_80C12328.s" } @@ -814,16 +832,4 @@ static asm void func_80C123AC() { } #pragma pop -/* 80C12440-80C1249B 000084 005B+00 3/2 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80C12440 = "M_VBom"; -SECTION_DEAD static char const* const stringBase_80C12447 = "grA_base"; -SECTION_DEAD static char const* const stringBase_80C12450 = "grA_mdl"; -SECTION_DEAD static char const* const stringBase_80C12458 = "grA_Rock"; -SECTION_DEAD static char const* const stringBase_80C12461 = "grA_RockD"; -SECTION_DEAD static char const* const stringBase_80C1246B = "M_VBom_Zora.bmd"; -SECTION_DEAD static char const* const stringBase_80C1247B = "M_VBom_Zora.btp"; -SECTION_DEAD static char const* const stringBase_80C1248B = "M_VBom_Zora.dzb"; -#pragma pop +/* 80C12440-80C12440 000084 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_grave_stone/d_a_obj_grave_stone.cpp b/rel/d/a/obj/d_a_obj_grave_stone/d_a_obj_grave_stone.cpp index 046408c8608..41aa277ce61 100644 --- a/rel/d/a/obj/d_a_obj_grave_stone/d_a_obj_grave_stone.cpp +++ b/rel/d/a/obj/d_a_obj_grave_stone/d_a_obj_grave_stone.cpp @@ -68,6 +68,8 @@ struct dPa_control_c { }; }; +struct csXyz {}; + struct dBgS_AcchCir { /* 80075EAC */ dBgS_AcchCir(); /* 80075F58 */ void SetWall(f32, f32); @@ -80,8 +82,6 @@ struct dBgS { /* 80075100 */ void GetRoomId(cBgS_PolyInfo const&); }; -struct csXyz {}; - struct dBgS_Acch { /* 80075F94 */ ~dBgS_Acch(); /* 800760A0 */ dBgS_Acch(); @@ -158,10 +158,10 @@ struct cBgS { /* 80074250 */ void Release(dBgW_Base*); }; -struct Vec {}; - struct JAISoundID {}; +struct Vec {}; + struct Z2SeMgr { /* 802AC50C */ void seStartLevel(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); }; @@ -197,7 +197,7 @@ extern "C" static void daGraveStone_Execute__FP14daGraveStone_c(); extern "C" static bool daGraveStone_IsDelete__FP14daGraveStone_c(); extern "C" static void daGraveStone_Delete__FP14daGraveStone_c(); extern "C" static void daGraveStone_create__FP10fopAc_ac_c(); -extern "C" void func_80C1321C(s16*); +extern "C" void func_80C1321C(void* _this, s16*); extern "C" static void func_80C13238(); extern "C" static void func_80C13240(); extern "C" u8 const mCcDObjInfo__14daGraveStone_c[48]; @@ -295,7 +295,7 @@ SECTION_RODATA u8 const daGraveStone_c::mCcDObjInfo[48] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x79, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C13250, &daGraveStone_c::mCcDObjInfo); +COMPILER_STRIP_GATE(0x80C13250, &daGraveStone_c::mCcDObjInfo); /* 80C13280-80C132C4 000030 0044+00 1/1 0/0 0/0 .rodata mCcDCyl__14daGraveStone_c */ SECTION_RODATA u8 const daGraveStone_c::mCcDCyl[68] = { @@ -305,7 +305,7 @@ SECTION_RODATA u8 const daGraveStone_c::mCcDCyl[68] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C13280, &daGraveStone_c::mCcDCyl); +COMPILER_STRIP_GATE(0x80C13280, &daGraveStone_c::mCcDCyl); /* 80C132C4-80C132C8 000074 0004+00 2/3 0/0 0/0 .rodata @3717 */ SECTION_RODATA static u8 const lit_3717[4] = { @@ -314,48 +314,48 @@ SECTION_RODATA static u8 const lit_3717[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C132C4, &lit_3717); +COMPILER_STRIP_GATE(0x80C132C4, &lit_3717); /* 80C132C8-80C132CC 000078 0004+00 0/1 0/0 0/0 .rodata @3718 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3718 = 1.0f; -COMPILER_STRIP_GATE(80C132C8, &lit_3718); +COMPILER_STRIP_GATE(0x80C132C8, &lit_3718); #pragma pop /* 80C132CC-80C132D0 00007C 0004+00 0/1 0/0 0/0 .rodata @3719 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3719 = -30.0f; -COMPILER_STRIP_GATE(80C132CC, &lit_3719); +COMPILER_STRIP_GATE(0x80C132CC, &lit_3719); #pragma pop /* 80C132D0-80C132D4 000080 0004+00 0/1 0/0 0/0 .rodata @3720 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3720 = 30.0f; -COMPILER_STRIP_GATE(80C132D0, &lit_3720); +COMPILER_STRIP_GATE(0x80C132D0, &lit_3720); #pragma pop /* 80C132D4-80C132D8 000084 0004+00 0/1 0/0 0/0 .rodata @3721 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3721 = 90.0f; -COMPILER_STRIP_GATE(80C132D4, &lit_3721); +COMPILER_STRIP_GATE(0x80C132D4, &lit_3721); #pragma pop /* 80C132D8-80C132DC 000088 0004+00 0/1 0/0 0/0 .rodata @3722 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3722 = -90.0f; -COMPILER_STRIP_GATE(80C132D8, &lit_3722); +COMPILER_STRIP_GATE(0x80C132D8, &lit_3722); #pragma pop /* 80C132DC-80C132E0 00008C 0004+00 0/1 0/0 0/0 .rodata @3723 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3723 = -1.0f; -COMPILER_STRIP_GATE(80C132DC, &lit_3723); +COMPILER_STRIP_GATE(0x80C132DC, &lit_3723); #pragma pop /* 80C1266C-80C12918 0000EC 02AC+00 1/1 0/0 0/0 .text moveCalc__14daGraveStone_cFv */ @@ -371,7 +371,7 @@ asm void daGraveStone_c::moveCalc() { /* ############################################################################################## */ /* 80C132E0-80C132E4 000090 0004+00 1/1 0/0 0/0 .rodata @3771 */ SECTION_RODATA static f32 const lit_3771 = 2.5f; -COMPILER_STRIP_GATE(80C132E0, &lit_3771); +COMPILER_STRIP_GATE(0x80C132E0, &lit_3771); /* 80C12918-80C12A38 000398 0120+00 1/1 0/0 0/0 .text setPrtcl__14daGraveStone_cFv */ #pragma push @@ -415,6 +415,13 @@ asm void daGraveStone_c::Create() { #pragma pop /* ############################################################################################## */ +/* 80C132E4-80C132E4 000094 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80C132E4 = "H_Haka"; +SECTION_DEAD static char const* const stringBase_80C132EB = "H_Haka.bmd"; +#pragma pop + /* 80C13304-80C13308 -00001 0004+00 3/3 0/0 0/0 .data l_arcName */ SECTION_DATA static void* l_arcName = (void*)&d_a_obj_grave_stone__stringBase0; @@ -429,6 +436,12 @@ asm void daGraveStone_c::CreateHeap() { #pragma pop /* ############################################################################################## */ +/* 80C132E4-80C132E4 000094 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80C132F6 = "H_Haka.dzb"; +#pragma pop + /* 80C13308-80C13328 -00001 0020+00 1/0 0/0 0/0 .data l_daGraveStone_Method */ SECTION_DATA static void* l_daGraveStone_Method[8] = { (void*)daGraveStone_create__FP10fopAc_ac_c, @@ -630,7 +643,7 @@ static asm void daGraveStone_create(fopAc_ac_c* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80C1321C(s16* param_0) { +extern "C" asm void func_80C1321C(void* _this, s16* param_0) { nofralloc #include "asm/rel/d/a/obj/d_a_obj_grave_stone/d_a_obj_grave_stone/func_80C1321C.s" } @@ -656,11 +669,4 @@ static asm void func_80C13240() { } #pragma pop -/* 80C132E4-80C13301 000094 001D+00 3/2 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80C132E4 = "H_Haka"; -SECTION_DEAD static char const* const stringBase_80C132EB = "H_Haka.bmd"; -SECTION_DEAD static char const* const stringBase_80C132F6 = "H_Haka.dzb"; -#pragma pop +/* 80C132E4-80C132E4 000094 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_groundwater/d_a_obj_groundwater.cpp b/rel/d/a/obj/d_a_obj_groundwater/d_a_obj_groundwater.cpp index 5a3020c408f..9adc09cd7a4 100644 --- a/rel/d/a/obj/d_a_obj_groundwater/d_a_obj_groundwater.cpp +++ b/rel/d/a/obj/d_a_obj_groundwater/d_a_obj_groundwater.cpp @@ -233,7 +233,7 @@ SECTION_RODATA static u8 const lit_3642[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C149E0, &lit_3642); +COMPILER_STRIP_GATE(0x80C149E0, &lit_3642); /* 80C149FC-80C14A08 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { @@ -401,7 +401,13 @@ asm void daGrdWater_c::setBaseMtx() { /* ############################################################################################## */ /* 80C149E4-80C149E8 000004 0004+00 5/6 0/0 0/0 .rodata @3712 */ SECTION_RODATA static f32 const lit_3712 = 1.0f; -COMPILER_STRIP_GATE(80C149E4, &lit_3712); +COMPILER_STRIP_GATE(0x80C149E4, &lit_3712); + +/* 80C149F4-80C149F4 000014 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80C149F4 = "Water"; +#pragma pop /* 80C13618-80C139E4 000258 03CC+00 1/0 0/0 0/0 .text CreateHeap__12daGrdWater_cFv */ #pragma push @@ -418,7 +424,7 @@ asm void daGrdWater_c::CreateHeap() { SECTION_RODATA static u8 const lit_3891[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C149E8, &lit_3891); +COMPILER_STRIP_GATE(0x80C149E8, &lit_3891); /* 80C139E4-80C13DB0 000624 03CC+00 1/1 0/0 0/0 .text create__12daGrdWater_cFv */ #pragma push @@ -563,7 +569,7 @@ asm void daGrdWater_c::modeLevelDownB() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4253 = -1.0f / 100.0f; -COMPILER_STRIP_GATE(80C149F0, &lit_4253); +COMPILER_STRIP_GATE(0x80C149F0, &lit_4253); #pragma pop /* 80C14554-80C147EC 001194 0298+00 1/0 0/0 0/0 .text Draw__12daGrdWater_cFv */ @@ -658,12 +664,7 @@ asm void __sinit_d_a_obj_groundwater_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80C14904 = (void*)__sinit_d_a_obj_groundwater_cpp; +REGISTER_CTORS(0x80C14904, __sinit_d_a_obj_groundwater_cpp); #pragma pop -/* 80C149F4-80C149FA 000014 0006+00 3/3 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80C149F4 = "Water"; -#pragma pop +/* 80C149F4-80C149F4 000014 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_grz_rock/d_a_obj_grz_rock.cpp b/rel/d/a/obj/d_a_obj_grz_rock/d_a_obj_grz_rock.cpp index e893d6d926e..c43919cc8dd 100644 --- a/rel/d/a/obj/d_a_obj_grz_rock/d_a_obj_grz_rock.cpp +++ b/rel/d/a/obj/d_a_obj_grz_rock/d_a_obj_grz_rock.cpp @@ -56,10 +56,10 @@ struct dRes_control_c { struct dPa_levelEcallBack {}; -struct _GXColor {}; - struct csXyz {}; +struct _GXColor {}; + struct dPa_control_c { /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, @@ -241,20 +241,20 @@ asm void daObjGrzRock_c::setRoomNo() { SECTION_RODATA static u8 const l_prticles_id[12] = { 0x89, 0xC2, 0x89, 0xC3, 0x89, 0xC4, 0x89, 0xC5, 0x89, 0xC6, 0x89, 0xC7, }; -COMPILER_STRIP_GATE(80C15360, &l_prticles_id); +COMPILER_STRIP_GATE(0x80C15360, &l_prticles_id); /* 80C1536C-80C15370 00000C 0004+00 0/1 0/0 0/0 .rodata @3849 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3849 = 17.0f / 20.0f; -COMPILER_STRIP_GATE(80C1536C, &lit_3849); +COMPILER_STRIP_GATE(0x80C1536C, &lit_3849); #pragma pop /* 80C15370-80C15374 000010 0004+00 0/1 0/0 0/0 .rodata @3850 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3850 = 1.0f; -COMPILER_STRIP_GATE(80C15370, &lit_3850); +COMPILER_STRIP_GATE(0x80C15370, &lit_3850); #pragma pop /* 80C14CF0-80C14DA0 000190 00B0+00 1/1 0/0 0/0 .text setPrtcl__14daObjGrzRock_cFv */ @@ -275,7 +275,7 @@ SECTION_RODATA static u8 const lit_3886[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C15374, &lit_3886); +COMPILER_STRIP_GATE(0x80C15374, &lit_3886); /* 80C14DA0-80C14EE0 000240 0140+00 1/0 0/0 0/0 .text Create__14daObjGrzRock_cFv */ #pragma push @@ -288,6 +288,12 @@ asm void daObjGrzRock_c::Create() { #pragma pop /* ############################################################################################## */ +/* 80C15378-80C15378 000018 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80C15378 = "grZRock"; +#pragma pop + /* 80C1538C-80C15390 -00001 0004+00 3/3 0/0 0/0 .data l_arcName */ SECTION_DATA static void* l_arcName = (void*)&d_a_obj_grz_rock__stringBase0; @@ -302,6 +308,12 @@ asm void daObjGrzRock_c::CreateHeap() { #pragma pop /* ############################################################################################## */ +/* 80C15378-80C15378 000018 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80C15380 = "grZRock.dzb"; +#pragma pop + /* 80C15390-80C153B0 -00001 0020+00 1/0 0/0 0/0 .data l_daObjGrzRock_Method */ SECTION_DATA static void* l_daObjGrzRock_Method[8] = { (void*)daObjGrzRock_create__FP10fopAc_ac_c, @@ -468,10 +480,4 @@ static asm void func_80C15350() { } #pragma pop -/* 80C15378-80C1538C 000018 0014+00 2/1 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80C15378 = "grZRock"; -SECTION_DEAD static char const* const stringBase_80C15380 = "grZRock.dzb"; -#pragma pop +/* 80C15378-80C15378 000018 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_h_saku/d_a_obj_h_saku.cpp b/rel/d/a/obj/d_a_obj_h_saku/d_a_obj_h_saku.cpp index b91d697860d..a3506bf0172 100644 --- a/rel/d/a/obj/d_a_obj_h_saku/d_a_obj_h_saku.cpp +++ b/rel/d/a/obj/d_a_obj_h_saku/d_a_obj_h_saku.cpp @@ -129,10 +129,10 @@ struct cBgS { /* 800743B4 */ void LineCross(cBgS_LinChk*); }; -struct Vec {}; - struct JAISoundID {}; +struct Vec {}; + struct Z2SeMgr { /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); }; @@ -243,7 +243,7 @@ extern "C" void __register_global_object(); /* ############################################################################################## */ /* 80C164C8-80C164CC 000000 0004+00 6/6 0/0 0/0 .rodata @3703 */ SECTION_RODATA static f32 const lit_3703 = 240.0f; -COMPILER_STRIP_GATE(80C164C8, &lit_3703); +COMPILER_STRIP_GATE(0x80C164C8, &lit_3703); /* 80C164CC-80C164D0 000004 0004+00 0/4 0/0 0/0 .rodata @3704 */ #pragma push @@ -254,70 +254,70 @@ SECTION_RODATA static u8 const lit_3704[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C164CC, &lit_3704); +COMPILER_STRIP_GATE(0x80C164CC, &lit_3704); #pragma pop /* 80C164D0-80C164D4 000008 0004+00 0/3 0/0 0/0 .rodata @3705 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3705 = -30.0f; -COMPILER_STRIP_GATE(80C164D0, &lit_3705); +COMPILER_STRIP_GATE(0x80C164D0, &lit_3705); #pragma pop /* 80C164D4-80C164D8 00000C 0004+00 0/3 0/0 0/0 .rodata @3706 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3706 = 1.0f; -COMPILER_STRIP_GATE(80C164D4, &lit_3706); +COMPILER_STRIP_GATE(0x80C164D4, &lit_3706); #pragma pop /* 80C164D8-80C164DC 000010 0004+00 0/2 0/0 0/0 .rodata @3707 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3707 = -1.0f; -COMPILER_STRIP_GATE(80C164D8, &lit_3707); +COMPILER_STRIP_GATE(0x80C164D8, &lit_3707); #pragma pop /* 80C164DC-80C164E0 000014 0004+00 0/2 0/0 0/0 .rodata @3708 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3708 = 10.0f; -COMPILER_STRIP_GATE(80C164DC, &lit_3708); +COMPILER_STRIP_GATE(0x80C164DC, &lit_3708); #pragma pop /* 80C164E0-80C164E4 000018 0004+00 0/2 0/0 0/0 .rodata @3709 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3709 = 2.0f; -COMPILER_STRIP_GATE(80C164E0, &lit_3709); +COMPILER_STRIP_GATE(0x80C164E0, &lit_3709); #pragma pop /* 80C164E4-80C164E8 00001C 0004+00 0/1 0/0 0/0 .rodata @3710 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3710 = 15.0f; -COMPILER_STRIP_GATE(80C164E4, &lit_3710); +COMPILER_STRIP_GATE(0x80C164E4, &lit_3710); #pragma pop /* 80C164E8-80C164EC 000020 0004+00 0/1 0/0 0/0 .rodata @3711 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3711 = 512.0f; -COMPILER_STRIP_GATE(80C164E8, &lit_3711); +COMPILER_STRIP_GATE(0x80C164E8, &lit_3711); #pragma pop /* 80C164EC-80C164F0 000024 0004+00 0/1 0/0 0/0 .rodata @3712 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3712 = 200.0f; -COMPILER_STRIP_GATE(80C164EC, &lit_3712); +COMPILER_STRIP_GATE(0x80C164EC, &lit_3712); #pragma pop /* 80C164F0-80C164F4 000028 0004+00 0/1 0/0 0/0 .rodata @3713 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3713 = -512.0f; -COMPILER_STRIP_GATE(80C164F0, &lit_3713); +COMPILER_STRIP_GATE(0x80C164F0, &lit_3713); #pragma pop /* 80C1552C-80C157D4 0000EC 02A8+00 0/0 0/0 1/1 .text BreakSet__13daObjH_Saku_cFv */ @@ -345,7 +345,7 @@ asm cXyz::~cXyz() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3765 = -2.0f / 5.0f; -COMPILER_STRIP_GATE(80C164F4, &lit_3765); +COMPILER_STRIP_GATE(0x80C164F4, &lit_3765); #pragma pop /* 80C15810-80C15A4C 0003D0 023C+00 1/1 0/0 0/0 .text SpeedSet__13daObjH_Saku_cFP4cXyzP4cXyzf */ @@ -363,14 +363,14 @@ asm void daObjH_Saku_c::SpeedSet(cXyz* param_0, cXyz* param_1, f32 param_2) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3809 = 0.5f; -COMPILER_STRIP_GATE(80C164F8, &lit_3809); +COMPILER_STRIP_GATE(0x80C164F8, &lit_3809); #pragma pop /* 80C164FC-80C16500 000034 0004+00 0/1 0/0 0/0 .rodata @3810 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3810 = 1.5f; -COMPILER_STRIP_GATE(80C164FC, &lit_3810); +COMPILER_STRIP_GATE(0x80C164FC, &lit_3810); #pragma pop /* 80C16500-80C16508 000038 0008+00 0/1 0/0 0/0 .rodata @3812 */ @@ -379,7 +379,7 @@ COMPILER_STRIP_GATE(80C164FC, &lit_3810); SECTION_RODATA static u8 const lit_3812[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C16500, &lit_3812); +COMPILER_STRIP_GATE(0x80C16500, &lit_3812); #pragma pop /* 80C15A4C-80C15E00 00060C 03B4+00 1/1 0/0 0/0 .text Action__13daObjH_Saku_cFv */ @@ -407,7 +407,7 @@ asm void daObjH_Saku_c::initBaseMtx() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3856 = 30.0f; -COMPILER_STRIP_GATE(80C16508, &lit_3856); +COMPILER_STRIP_GATE(0x80C16508, &lit_3856); #pragma pop /* 80C15E44-80C15F4C 000A04 0108+00 2/2 0/0 0/0 .text setBaseMtx__13daObjH_Saku_cFv */ @@ -461,14 +461,21 @@ static asm void daObjH_Saku_Delete(daObjH_Saku_c* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3930 = -8.0f; -COMPILER_STRIP_GATE(80C1650C, &lit_3930); +COMPILER_STRIP_GATE(0x80C1650C, &lit_3930); #pragma pop /* 80C16510-80C16514 000048 0004+00 0/1 0/0 0/0 .rodata @3931 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3931 = 480.0f; -COMPILER_STRIP_GATE(80C16510, &lit_3931); +COMPILER_STRIP_GATE(0x80C16510, &lit_3931); +#pragma pop + +/* 80C16520-80C16520 000058 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80C16520 = "H_Saku"; +SECTION_DEAD static char const* const stringBase_80C16527 = "H_Saku.dzb"; #pragma pop /* 80C16540-80C16544 -00001 0004+00 3/3 0/0 0/0 .data l_arcName */ @@ -544,6 +551,13 @@ asm dBgS_ObjAcch::~dBgS_ObjAcch() { } #pragma pop +/* ############################################################################################## */ +/* 80C16520-80C16520 000058 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80C16532 = "H_Saku.bmd"; +#pragma pop + /* 80C161E8-80C1629C 000DA8 00B4+00 1/0 0/0 0/0 .text CreateHeap__13daObjH_Saku_cFv */ #pragma push #pragma optimization_level 0 @@ -559,21 +573,21 @@ asm void daObjH_Saku_c::CreateHeap() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3965 = -700.0f; -COMPILER_STRIP_GATE(80C16514, &lit_3965); +COMPILER_STRIP_GATE(0x80C16514, &lit_3965); #pragma pop /* 80C16518-80C1651C 000050 0004+00 0/1 0/0 0/0 .rodata @3966 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3966 = 700.0f; -COMPILER_STRIP_GATE(80C16518, &lit_3966); +COMPILER_STRIP_GATE(0x80C16518, &lit_3966); #pragma pop /* 80C1651C-80C16520 000054 0004+00 0/1 0/0 0/0 .rodata @3967 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3967 = 7000.0f; -COMPILER_STRIP_GATE(80C1651C, &lit_3967); +COMPILER_STRIP_GATE(0x80C1651C, &lit_3967); #pragma pop /* 80C1629C-80C162F4 000E5C 0058+00 1/0 0/0 0/0 .text Create__13daObjH_Saku_cFv */ @@ -747,7 +761,7 @@ asm void __sinit_d_a_obj_h_saku_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80C16450 = (void*)__sinit_d_a_obj_h_saku_cpp; +REGISTER_CTORS(0x80C16450, __sinit_d_a_obj_h_saku_cpp); #pragma pop /* 80C164A4-80C164AC 001064 0008+00 1/0 0/0 0/0 .text @36@__dt__12dBgS_ObjAcchFv */ @@ -942,11 +956,4 @@ static u8 data_80C166B4[4]; static u8 data_80C166B8[4]; #pragma pop -/* 80C16520-80C1653D 000058 001D+00 3/2 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80C16520 = "H_Saku"; -SECTION_DEAD static char const* const stringBase_80C16527 = "H_Saku.dzb"; -SECTION_DEAD static char const* const stringBase_80C16532 = "H_Saku.bmd"; -#pragma pop +/* 80C16520-80C16520 000058 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_hakai_brl/d_a_obj_hakai_brl.cpp b/rel/d/a/obj/d_a_obj_hakai_brl/d_a_obj_hakai_brl.cpp index aa7d1a0745b..81ba1534525 100644 --- a/rel/d/a/obj/d_a_obj_hakai_brl/d_a_obj_hakai_brl.cpp +++ b/rel/d/a/obj/d_a_obj_hakai_brl/d_a_obj_hakai_brl.cpp @@ -67,10 +67,10 @@ struct dPa_modelEcallBack { struct dPa_levelEcallBack {}; -struct _GXColor {}; - struct csXyz {}; +struct _GXColor {}; + struct dPa_control_c { /* 8004C218 */ void setHitMark(u16, fopAc_ac_c*, cXyz const*, csXyz const*, cXyz const*, u32); /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, @@ -133,10 +133,10 @@ struct Z2SoundObjBase { /* 802BE4A4 */ void startCollisionSE(u32, u32, Z2SoundObjBase*); }; -struct Vec {}; - struct JAISoundID {}; +struct Vec {}; + struct Z2SeMgr { /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); }; @@ -251,6 +251,12 @@ static asm void daObjHBarrel_c_createHeap(fopAc_ac_c* param_0) { #pragma pop /* ############################################################################################## */ +/* 80C1735C-80C1735C 000060 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80C1735C = "HBarrel"; +#pragma pop + /* 80C1737C-80C17380 -00001 0004+00 3/3 0/0 0/0 .data l_arcName */ SECTION_DATA static void* l_arcName = (void*)&d_a_obj_hakai_brl__stringBase0; @@ -420,20 +426,20 @@ SECTION_RODATA u8 const daObjHBarrel_c::s_CcDCyl[68] = { 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C172FC, &daObjHBarrel_c::s_CcDCyl); +COMPILER_STRIP_GATE(0x80C172FC, &daObjHBarrel_c::s_CcDCyl); /* 80C17340-80C17344 000044 0004+00 0/1 0/0 0/0 .rodata @3826 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3826 = 170.0f; -COMPILER_STRIP_GATE(80C17340, &lit_3826); +COMPILER_STRIP_GATE(0x80C17340, &lit_3826); #pragma pop /* 80C17344-80C17348 000048 0004+00 0/1 0/0 0/0 .rodata @3827 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3827 = 90.0f; -COMPILER_STRIP_GATE(80C17344, &lit_3827); +COMPILER_STRIP_GATE(0x80C17344, &lit_3827); #pragma pop /* 80C16D50-80C16DEC 000690 009C+00 1/1 0/0 0/0 .text init__14daObjHBarrel_cFv */ @@ -459,11 +465,11 @@ asm void daObjHBarrel_c::setModelMtx() { /* ############################################################################################## */ /* 80C17348-80C1734C 00004C 0004+00 1/2 0/0 0/0 .rodata @3916 */ SECTION_RODATA static f32 const lit_3916 = 1.0f; -COMPILER_STRIP_GATE(80C17348, &lit_3916); +COMPILER_STRIP_GATE(0x80C17348, &lit_3916); /* 80C1734C-80C17350 000050 0004+00 1/1 0/0 0/0 .rodata @3917 */ SECTION_RODATA static f32 const lit_3917 = -1.0f; -COMPILER_STRIP_GATE(80C1734C, &lit_3917); +COMPILER_STRIP_GATE(0x80C1734C, &lit_3917); /* 80C16E50-80C17090 000790 0240+00 1/1 0/0 0/0 .text hitAction__14daObjHBarrel_cFv */ #pragma push @@ -490,14 +496,21 @@ SECTION_RODATA static u8 const PARTICLE_NAME[6 + 2 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C17350, &PARTICLE_NAME); +COMPILER_STRIP_GATE(0x80C17350, &PARTICLE_NAME); #pragma pop /* 80C17358-80C1735C 00005C 0004+00 0/1 0/0 0/0 .rodata @3953 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3953 = 1.125f; -COMPILER_STRIP_GATE(80C17358, &lit_3953); +COMPILER_STRIP_GATE(0x80C17358, &lit_3953); +#pragma pop + +/* 80C1735C-80C1735C 000060 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80C17364 = "Always"; +SECTION_DEAD static char const* const stringBase_80C1736B = "BreakWoodBox.bmd"; #pragma pop /* 80C17090-80C171F8 0009D0 0168+00 1/1 0/0 0/0 .text callEmt__14daObjHBarrel_cFv */ @@ -560,11 +573,4 @@ asm cCcD_GStts::~cCcD_GStts() { } #pragma pop -/* 80C1735C-80C1737C 000060 0020+00 2/1 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80C1735C = "HBarrel"; -SECTION_DEAD static char const* const stringBase_80C17364 = "Always"; -SECTION_DEAD static char const* const stringBase_80C1736B = "BreakWoodBox.bmd"; -#pragma pop +/* 80C1735C-80C1735C 000060 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_hakai_ftr/d_a_obj_hakai_ftr.cpp b/rel/d/a/obj/d_a_obj_hakai_ftr/d_a_obj_hakai_ftr.cpp index b0783df6b14..62d9c33946f 100644 --- a/rel/d/a/obj/d_a_obj_hakai_ftr/d_a_obj_hakai_ftr.cpp +++ b/rel/d/a/obj/d_a_obj_hakai_ftr/d_a_obj_hakai_ftr.cpp @@ -57,10 +57,10 @@ struct dRes_control_c { struct dPa_levelEcallBack {}; -struct _GXColor {}; - struct csXyz {}; +struct _GXColor {}; + struct dPa_control_c { /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, @@ -135,10 +135,10 @@ struct cBgS { /* 80074250 */ void Release(dBgW_Base*); }; -struct Vec {}; - struct JAISoundID {}; +struct Vec {}; + struct Z2SeMgr { /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); }; @@ -256,6 +256,14 @@ static asm void daObjHFtr_c_createHeap(fopAc_ac_c* param_0) { #pragma pop /* ############################################################################################## */ +/* 80C18168-80C18168 0000B0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80C18168 = "HChair"; +SECTION_DEAD static char const* const stringBase_80C1816F = "HSofa"; +SECTION_DEAD static char const* const stringBase_80C18175 = "HTable"; +#pragma pop + /* 80C1817C-80C18188 -00001 000C+00 3/3 0/0 0/0 .data l_arcName */ SECTION_DATA static void* l_arcName[3] = { (void*)&d_a_obj_hakai_ftr__stringBase0, @@ -396,13 +404,13 @@ asm daObjHFtr_c::~daObjHFtr_c() { SECTION_RODATA static u8 const l_bmdIdx[12] = { 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x04, }; -COMPILER_STRIP_GATE(80C180B8, &l_bmdIdx); +COMPILER_STRIP_GATE(0x80C180B8, &l_bmdIdx); /* 80C180C4-80C180D0 00000C 000C+00 1/1 0/0 0/0 .rodata l_dzbIdx */ SECTION_RODATA static u8 const l_dzbIdx[12] = { 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x07, }; -COMPILER_STRIP_GATE(80C180C4, &l_dzbIdx); +COMPILER_STRIP_GATE(0x80C180C4, &l_dzbIdx); /* 80C17874-80C179B0 000454 013C+00 1/1 0/0 0/0 .text createHeap__11daObjHFtr_cFv */ #pragma push @@ -419,7 +427,7 @@ asm void daObjHFtr_c::createHeap() { SECTION_RODATA static u8 const l_heapSize[12] = { 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x20, 0x00, }; -COMPILER_STRIP_GATE(80C180D0, &l_heapSize); +COMPILER_STRIP_GATE(0x80C180D0, &l_heapSize); /* 80C179B0-80C17AC0 000590 0110+00 1/1 0/0 0/0 .text create__11daObjHFtr_cFv */ #pragma push @@ -462,16 +470,16 @@ SECTION_RODATA u8 const daObjHFtr_c::s_CcDCyl[68] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C180DC, &daObjHFtr_c::s_CcDCyl); +COMPILER_STRIP_GATE(0x80C180DC, &daObjHFtr_c::s_CcDCyl); #pragma pop /* 80C18120-80C18124 000068 0004+00 2/2 0/0 0/0 .rodata @3863 */ SECTION_RODATA static f32 const lit_3863 = 1.0f; -COMPILER_STRIP_GATE(80C18120, &lit_3863); +COMPILER_STRIP_GATE(0x80C18120, &lit_3863); /* 80C18124-80C18128 00006C 0004+00 1/1 0/0 0/0 .rodata @3864 */ SECTION_RODATA static f32 const lit_3864 = -1.0f; -COMPILER_STRIP_GATE(80C18124, &lit_3864); +COMPILER_STRIP_GATE(0x80C18124, &lit_3864); /* 80C17BD4-80C17CD0 0007B4 00FC+00 1/1 0/0 0/0 .text execute__11daObjHFtr_cFv */ #pragma push @@ -491,7 +499,7 @@ SECTION_RODATA static u8 const COL_OFFSET_X[24] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x32, 0xFF, 0xFF, 0xFF, 0xCE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C18128, &COL_OFFSET_X); +COMPILER_STRIP_GATE(0x80C18128, &COL_OFFSET_X); #pragma pop /* 80C18140-80C1814C 000088 000C+00 0/1 0/0 0/0 .rodata COL_HEIGHT$3869 */ @@ -500,7 +508,7 @@ COMPILER_STRIP_GATE(80C18128, &COL_OFFSET_X); SECTION_RODATA static u8 const COL_HEIGHT[12] = { 0x00, 0x00, 0x00, 0xAA, 0x00, 0x00, 0x00, 0xA0, 0x00, 0x00, 0x00, 0x6E, }; -COMPILER_STRIP_GATE(80C18140, &COL_HEIGHT); +COMPILER_STRIP_GATE(0x80C18140, &COL_HEIGHT); #pragma pop /* 80C1814C-80C18158 000094 000C+00 0/1 0/0 0/0 .rodata COL_RADIUS$3870 */ @@ -509,7 +517,7 @@ COMPILER_STRIP_GATE(80C18140, &COL_HEIGHT); SECTION_RODATA static u8 const COL_RADIUS[12] = { 0x00, 0x00, 0x00, 0x3C, 0x00, 0x00, 0x00, 0x46, 0x00, 0x00, 0x00, 0x5A, }; -COMPILER_STRIP_GATE(80C1814C, &COL_RADIUS); +COMPILER_STRIP_GATE(0x80C1814C, &COL_RADIUS); #pragma pop /* 80C18158-80C18160 0000A0 0008+00 0/1 0/0 0/0 .rodata @3896 */ @@ -518,7 +526,7 @@ COMPILER_STRIP_GATE(80C1814C, &COL_RADIUS); SECTION_RODATA static u8 const lit_3896[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C18158, &lit_3896); +COMPILER_STRIP_GATE(0x80C18158, &lit_3896); #pragma pop /* 80C17CD0-80C17E10 0008B0 0140+00 1/1 0/0 0/0 .text init__11daObjHFtr_cFv */ @@ -556,7 +564,7 @@ asm void daObjHFtr_c::chkHit() { SECTION_RODATA static u8 const PARTICLE_NAME[8] = { 0x8A, 0xE7, 0x8A, 0xE8, 0x8A, 0xE9, 0x8A, 0xEA, }; -COMPILER_STRIP_GATE(80C18160, &PARTICLE_NAME); +COMPILER_STRIP_GATE(0x80C18160, &PARTICLE_NAME); /* 80C17EDC-80C17FB4 000ABC 00D8+00 1/1 0/0 0/0 .text callEmt__11daObjHFtr_cFv */ #pragma push @@ -621,11 +629,4 @@ asm cCcD_GStts::~cCcD_GStts() { } #pragma pop -/* 80C18168-80C1817C 0000B0 0014+00 1/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80C18168 = "HChair"; -SECTION_DEAD static char const* const stringBase_80C1816F = "HSofa"; -SECTION_DEAD static char const* const stringBase_80C18175 = "HTable"; -#pragma pop +/* 80C18168-80C18168 0000B0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_hasu2/d_a_obj_hasu2.cpp b/rel/d/a/obj/d_a_obj_hasu2/d_a_obj_hasu2.cpp index be1844c8740..0933c120d56 100644 --- a/rel/d/a/obj/d_a_obj_hasu2/d_a_obj_hasu2.cpp +++ b/rel/d/a/obj/d_a_obj_hasu2/d_a_obj_hasu2.cpp @@ -74,10 +74,10 @@ struct dBgS_MoveBgActor { /* 80078950 */ void MoveBGExecute(); }; -struct Vec {}; - struct JAISoundID {}; +struct Vec {}; + struct Z2SeMgr { /* 802AC50C */ void seStartLevel(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); }; @@ -172,27 +172,33 @@ SECTION_RODATA static u8 const l_cull_box[24] = { 0xC2, 0xF6, 0x00, 0x00, 0xC3, 0x2F, 0x00, 0x00, 0xC3, 0x0E, 0x00, 0x00, 0x43, 0x05, 0x00, 0x00, 0x41, 0xE8, 0x00, 0x00, 0x42, 0xFE, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C18A58, &l_cull_box); +COMPILER_STRIP_GATE(0x80C18A58, &l_cull_box); /* 80C18A70-80C18A74 000018 0004+00 0/1 0/0 0/0 .rodata @3634 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3634 = 25.5f; -COMPILER_STRIP_GATE(80C18A70, &lit_3634); +COMPILER_STRIP_GATE(0x80C18A70, &lit_3634); #pragma pop /* 80C18A74-80C18A78 00001C 0004+00 0/2 0/0 0/0 .rodata @3635 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3635 = 6.5f; -COMPILER_STRIP_GATE(80C18A74, &lit_3635); +COMPILER_STRIP_GATE(0x80C18A74, &lit_3635); #pragma pop /* 80C18A78-80C18A7C 000020 0004+00 0/1 0/0 0/0 .rodata @3636 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3636 = 5.5f; -COMPILER_STRIP_GATE(80C18A78, &lit_3636); +COMPILER_STRIP_GATE(0x80C18A78, &lit_3636); +#pragma pop + +/* 80C18AA0-80C18AA0 000048 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80C18AA0 = "M_Hasu"; #pragma pop /* 80C18AA8-80C18AAC -00001 0004+00 3/3 0/0 0/0 .data l_arcName */ @@ -281,21 +287,21 @@ asm void nObjMHasu::daObjMHasu_c::CreateHeap() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3685 = 0.5f; -COMPILER_STRIP_GATE(80C18A7C, &lit_3685); +COMPILER_STRIP_GATE(0x80C18A7C, &lit_3685); #pragma pop /* 80C18A80-80C18A84 000028 0004+00 0/2 0/0 0/0 .rodata @3686 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3686 = 7.0f / 20.0f; -COMPILER_STRIP_GATE(80C18A80, &lit_3686); +COMPILER_STRIP_GATE(0x80C18A80, &lit_3686); #pragma pop /* 80C18A84-80C18A88 00002C 0004+00 0/1 0/0 0/0 .rodata @3687 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3687 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(80C18A84, &lit_3687); +COMPILER_STRIP_GATE(0x80C18A84, &lit_3687); #pragma pop /* 80C184B0-80C185A4 000290 00F4+00 1/0 0/0 0/0 .text Create__Q29nObjMHasu12daObjMHasu_cFv */ @@ -345,21 +351,21 @@ asm void nObjMHasu::daObjMHasu_c::Delete() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3757 = 6.0f; -COMPILER_STRIP_GATE(80C18A88, &lit_3757); +COMPILER_STRIP_GATE(0x80C18A88, &lit_3757); #pragma pop /* 80C18A8C-80C18A90 000034 0004+00 0/1 0/0 0/0 .rodata @3758 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3758 = 1.0f; -COMPILER_STRIP_GATE(80C18A8C, &lit_3758); +COMPILER_STRIP_GATE(0x80C18A8C, &lit_3758); #pragma pop /* 80C18A90-80C18A94 000038 0004+00 0/1 0/0 0/0 .rodata @3759 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3759 = -1.0f; -COMPILER_STRIP_GATE(80C18A90, &lit_3759); +COMPILER_STRIP_GATE(0x80C18A90, &lit_3759); #pragma pop /* 80C18A94-80C18A98 00003C 0004+00 0/1 0/0 0/0 .rodata @3760 */ @@ -371,7 +377,7 @@ SECTION_RODATA static u8 const lit_3760[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C18A94, &lit_3760); +COMPILER_STRIP_GATE(0x80C18A94, &lit_3760); #pragma pop /* 80C186E0-80C18888 0004C0 01A8+00 1/1 0/0 0/0 .text upDownHasu__Q29nObjMHasu12daObjMHasu_cFv */ @@ -400,14 +406,14 @@ asm void nObjMHasu::daObjMHasu_c::updateCount(u8 param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3782 = 1.5f; -COMPILER_STRIP_GATE(80C18A98, &lit_3782); +COMPILER_STRIP_GATE(0x80C18A98, &lit_3782); #pragma pop /* 80C18A9C-80C18AA0 000044 0004+00 0/1 0/0 0/0 .rodata @3783 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3783 = 10.0f; -COMPILER_STRIP_GATE(80C18A9C, &lit_3783); +COMPILER_STRIP_GATE(0x80C18A9C, &lit_3783); #pragma pop /* 80C188A0-80C18920 000680 0080+00 1/1 0/0 0/0 .text setHasuCount__Q29nObjMHasu12daObjMHasu_cFf @@ -476,9 +482,4 @@ asm nObjMHasu::daObjMHasu_c::~daObjMHasu_c() { } #pragma pop -/* 80C18AA0-80C18AA7 000048 0007+00 1/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80C18AA0 = "M_Hasu"; -#pragma pop +/* 80C18AA0-80C18AA0 000048 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_hata/d_a_obj_hata.cpp b/rel/d/a/obj/d_a_obj_hata/d_a_obj_hata.cpp index d23b95f74ef..851a837d2e9 100644 --- a/rel/d/a/obj/d_a_obj_hata/d_a_obj_hata.cpp +++ b/rel/d/a/obj/d_a_obj_hata/d_a_obj_hata.cpp @@ -163,6 +163,12 @@ asm csXyz::~csXyz() { #pragma pop /* ############################################################################################## */ +/* 80C194C0-80C194C0 000048 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80C194C0 = "Hata"; +#pragma pop + /* 80C194C8-80C194CC -00001 0004+00 3/3 0/0 0/0 .data l_arcName */ SECTION_DATA static void* l_arcName = (void*)&d_a_obj_hata__stringBase0; @@ -283,11 +289,11 @@ asm void daObjHata_c::setModelMtx() { /* ############################################################################################## */ /* 80C19478-80C1947C 000000 0004+00 2/2 0/0 0/0 .rodata @3788 */ SECTION_RODATA static f32 const lit_3788 = 1280.0f; -COMPILER_STRIP_GATE(80C19478, &lit_3788); +COMPILER_STRIP_GATE(0x80C19478, &lit_3788); /* 80C1947C-80C19480 000004 0004+00 1/2 0/0 0/0 .rodata @3789 */ SECTION_RODATA static f32 const lit_3789 = 1.0f; -COMPILER_STRIP_GATE(80C1947C, &lit_3789); +COMPILER_STRIP_GATE(0x80C1947C, &lit_3789); /* 80C190FC-80C1919C 0005BC 00A0+00 1/1 0/0 0/0 .text init__11daObjHata_cFv */ #pragma push @@ -306,7 +312,7 @@ asm void daObjHata_c::init() { SECTION_RODATA static u8 const SING[12] = { 0x00, 0x00, 0x00, 0x01, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80C19480, &SING); +COMPILER_STRIP_GATE(0x80C19480, &SING); #pragma pop /* 80C1948C-80C19498 000014 000C+00 0/1 0/0 0/0 .rodata AIM_ANGLE_X$3794 */ @@ -315,7 +321,7 @@ COMPILER_STRIP_GATE(80C19480, &SING); SECTION_RODATA static u8 const AIM_ANGLE_X[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xBC, 0x00, 0x00, 0x02, 0xBC, }; -COMPILER_STRIP_GATE(80C1948C, &AIM_ANGLE_X); +COMPILER_STRIP_GATE(0x80C1948C, &AIM_ANGLE_X); #pragma pop /* 80C19498-80C194A4 000020 000C+00 0/1 0/0 0/0 .rodata STEP_ANGLE_X$3795 */ @@ -324,28 +330,28 @@ COMPILER_STRIP_GATE(80C1948C, &AIM_ANGLE_X); SECTION_RODATA static u8 const STEP_ANGLE_X[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3C, 0x00, 0x00, 0x00, 0x5A, }; -COMPILER_STRIP_GATE(80C19498, &STEP_ANGLE_X); +COMPILER_STRIP_GATE(0x80C19498, &STEP_ANGLE_X); #pragma pop /* 80C194A4-80C194A8 00002C 0004+00 0/1 0/0 0/0 .rodata @3823 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3823 = 50.0f; -COMPILER_STRIP_GATE(80C194A4, &lit_3823); +COMPILER_STRIP_GATE(0x80C194A4, &lit_3823); #pragma pop /* 80C194A8-80C194AC 000030 0004+00 0/1 0/0 0/0 .rodata @3824 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3824 = 1500.0f; -COMPILER_STRIP_GATE(80C194A8, &lit_3824); +COMPILER_STRIP_GATE(0x80C194A8, &lit_3824); #pragma pop /* 80C194AC-80C194B0 000034 0004+00 0/1 0/0 0/0 .rodata @3825 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3825 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(80C194AC, &lit_3825); +COMPILER_STRIP_GATE(0x80C194AC, &lit_3825); #pragma pop /* 80C194B0-80C194B8 000038 0004+04 0/1 0/0 0/0 .rodata @3826 */ @@ -356,7 +362,7 @@ SECTION_RODATA static f32 const lit_3826[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80C194B0, &lit_3826); +COMPILER_STRIP_GATE(0x80C194B0, &lit_3826); #pragma pop /* 80C194B8-80C194C0 000040 0008+00 0/1 0/0 0/0 .rodata @3828 */ @@ -365,7 +371,7 @@ COMPILER_STRIP_GATE(80C194B0, &lit_3826); SECTION_RODATA static u8 const lit_3828[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C194B8, &lit_3828); +COMPILER_STRIP_GATE(0x80C194B8, &lit_3828); #pragma pop /* 80C1919C-80C193BC 00065C 0220+00 1/1 0/0 0/0 .text moveSwing__11daObjHata_cFv */ @@ -421,9 +427,4 @@ static asm void daObjHata_draw(daObjHata_c* param_0) { } #pragma pop -/* 80C194C0-80C194C5 000048 0005+00 1/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80C194C0 = "Hata"; -#pragma pop +/* 80C194C0-80C194C0 000048 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_hb/d_a_obj_hb.cpp b/rel/d/a/obj/d_a_obj_hb/d_a_obj_hb.cpp index af5b4abcef9..e81697a217c 100644 --- a/rel/d/a/obj/d_a_obj_hb/d_a_obj_hb.cpp +++ b/rel/d/a/obj/d_a_obj_hb/d_a_obj_hb.cpp @@ -53,10 +53,10 @@ struct dRes_control_c { struct dPa_levelEcallBack {}; -struct _GXColor {}; - struct csXyz {}; +struct _GXColor {}; + struct dPa_control_c { /* 8004D4CC */ void set(u32, u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, @@ -319,13 +319,13 @@ extern "C" extern u8 data_80C1B7E0[4]; /* ############################################################################################## */ /* 80C1B600-80C1B604 000000 0004+00 9/9 0/0 0/0 .rodata @3665 */ SECTION_RODATA static f32 const lit_3665 = 100.0f; -COMPILER_STRIP_GATE(80C1B600, &lit_3665); +COMPILER_STRIP_GATE(0x80C1B600, &lit_3665); /* 80C1B604-80C1B608 000004 0004+00 0/1 0/0 0/0 .rodata @3666 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3666 = 400.0f; -COMPILER_STRIP_GATE(80C1B604, &lit_3666); +COMPILER_STRIP_GATE(0x80C1B604, &lit_3666); #pragma pop /* 80C1B608-80C1B60C 000008 0004+00 1/9 0/0 0/0 .rodata @3667 */ @@ -335,13 +335,13 @@ SECTION_RODATA static u8 const lit_3667[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C1B608, &lit_3667); +COMPILER_STRIP_GATE(0x80C1B608, &lit_3667); /* 80C1B60C-80C1B610 00000C 0004+00 0/7 0/0 0/0 .rodata @3668 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3668 = 1.0f; -COMPILER_STRIP_GATE(80C1B60C, &lit_3668); +COMPILER_STRIP_GATE(0x80C1B60C, &lit_3668); #pragma pop /* 80C195B8-80C19688 000078 00D0+00 1/0 0/0 0/0 .text daOBJ_HB_Draw__FP12obj_hb_class */ @@ -359,28 +359,28 @@ static asm void daOBJ_HB_Draw(obj_hb_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3735 = 10.0f; -COMPILER_STRIP_GATE(80C1B610, &lit_3735); +COMPILER_STRIP_GATE(0x80C1B610, &lit_3735); #pragma pop /* 80C1B614-80C1B618 000014 0004+00 0/4 0/0 0/0 .rodata @3736 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3736 = 30.0f; -COMPILER_STRIP_GATE(80C1B614, &lit_3736); +COMPILER_STRIP_GATE(0x80C1B614, &lit_3736); #pragma pop /* 80C1B618-80C1B61C 000018 0004+00 0/2 0/0 0/0 .rodata @3737 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3737 = 0.25f; -COMPILER_STRIP_GATE(80C1B618, &lit_3737); +COMPILER_STRIP_GATE(0x80C1B618, &lit_3737); #pragma pop /* 80C1B61C-80C1B620 00001C 0004+00 0/2 0/0 0/0 .rodata @3738 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3738 = 1000.0f; -COMPILER_STRIP_GATE(80C1B61C, &lit_3738); +COMPILER_STRIP_GATE(0x80C1B61C, &lit_3738); #pragma pop /* 80C19688-80C1988C 000148 0204+00 1/1 0/0 0/0 .text obj_hb_carry__FP12obj_hb_class */ @@ -398,28 +398,28 @@ static asm void obj_hb_carry(obj_hb_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3792 = -50.0f; -COMPILER_STRIP_GATE(80C1B620, &lit_3792); +COMPILER_STRIP_GATE(0x80C1B620, &lit_3792); #pragma pop /* 80C1B624-80C1B628 000024 0004+00 0/2 0/0 0/0 .rodata @3793 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3793 = 5.0f; -COMPILER_STRIP_GATE(80C1B624, &lit_3793); +COMPILER_STRIP_GATE(0x80C1B624, &lit_3793); #pragma pop /* 80C1B628-80C1B62C 000028 0004+00 0/2 0/0 0/0 .rodata @3794 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3794 = 200.0f; -COMPILER_STRIP_GATE(80C1B628, &lit_3794); +COMPILER_STRIP_GATE(0x80C1B628, &lit_3794); #pragma pop /* 80C1B62C-80C1B630 00002C 0004+00 0/1 0/0 0/0 .rodata @3795 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3795 = -1.0f; -COMPILER_STRIP_GATE(80C1B62C, &lit_3795); +COMPILER_STRIP_GATE(0x80C1B62C, &lit_3795); #pragma pop /* 80C1988C-80C19A2C 00034C 01A0+00 1/1 0/0 0/0 .text wall_angle_get__FP12obj_hb_class */ @@ -435,7 +435,7 @@ static asm void wall_angle_get(obj_hb_class* param_0) { /* ############################################################################################## */ /* 80C1B630-80C1B634 000030 0004+00 1/2 0/0 0/0 .rodata @3804 */ SECTION_RODATA static f32 const lit_3804 = 500.0f; -COMPILER_STRIP_GATE(80C1B630, &lit_3804); +COMPILER_STRIP_GATE(0x80C1B630, &lit_3804); /* 80C19A2C-80C19AD8 0004EC 00AC+00 1/1 0/0 0/0 .text water_check__FP12obj_hb_class */ #pragma push @@ -452,46 +452,46 @@ static asm void water_check(obj_hb_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3818 = 3.0f / 100.0f; -COMPILER_STRIP_GATE(80C1B634, &lit_3818); +COMPILER_STRIP_GATE(0x80C1B634, &lit_3818); #pragma pop /* 80C1B638-80C1B63C 000038 0004+00 0/1 0/0 0/0 .rodata @3819 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3819 = 3.0f / 5.0f; -COMPILER_STRIP_GATE(80C1B638, &lit_3819); +COMPILER_STRIP_GATE(0x80C1B638, &lit_3819); #pragma pop /* 80C1B63C-80C1B640 00003C 0004+00 0/2 0/0 0/0 .rodata @3820 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3820 = 1.0f / 20.0f; -COMPILER_STRIP_GATE(80C1B63C, &lit_3820); +COMPILER_STRIP_GATE(0x80C1B63C, &lit_3820); #pragma pop /* 80C1B640-80C1B644 000040 0004+00 0/1 0/0 0/0 .rodata @3821 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3821 = 1.0f / 50.0f; -COMPILER_STRIP_GATE(80C1B640, &lit_3821); +COMPILER_STRIP_GATE(0x80C1B640, &lit_3821); #pragma pop /* 80C1B644-80C1B648 000044 0004+00 0/1 0/0 0/0 .rodata @3822 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3822 = 800.0f; -COMPILER_STRIP_GATE(80C1B644, &lit_3822); +COMPILER_STRIP_GATE(0x80C1B644, &lit_3822); #pragma pop /* 80C1B648-80C1B64C 000048 0004+00 1/3 0/0 0/0 .rodata @3823 */ SECTION_RODATA static f32 const lit_3823 = 2000.0f; -COMPILER_STRIP_GATE(80C1B648, &lit_3823); +COMPILER_STRIP_GATE(0x80C1B648, &lit_3823); /* 80C1B64C-80C1B650 00004C 0004+00 0/2 0/0 0/0 .rodata @3824 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3824 = 25.0f; -COMPILER_STRIP_GATE(80C1B64C, &lit_3824); +COMPILER_STRIP_GATE(0x80C1B64C, &lit_3824); #pragma pop /* 80C19AD8-80C19BEC 000598 0114+00 1/1 0/0 0/0 .text obj_hb_set__FP12obj_hb_class */ @@ -509,14 +509,14 @@ static asm void obj_hb_set(obj_hb_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3855 = 50.0f; -COMPILER_STRIP_GATE(80C1B650, &lit_3855); +COMPILER_STRIP_GATE(0x80C1B650, &lit_3855); #pragma pop /* 80C1B654-80C1B658 000054 0004+00 0/1 0/0 0/0 .rodata @3856 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3856 = -1000000000.0f; -COMPILER_STRIP_GATE(80C1B654, &lit_3856); +COMPILER_STRIP_GATE(0x80C1B654, &lit_3856); #pragma pop /* 80C19BEC-80C19DA8 0006AC 01BC+00 1/1 0/0 0/0 .text getGroundAngle__FP10fopAc_ac_cP5csXyz */ @@ -534,84 +534,84 @@ static asm void getGroundAngle(fopAc_ac_c* param_0, csXyz* param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4043 = 20.0f; -COMPILER_STRIP_GATE(80C1B658, &lit_4043); +COMPILER_STRIP_GATE(0x80C1B658, &lit_4043); #pragma pop /* 80C1B65C-80C1B660 00005C 0004+00 0/1 0/0 0/0 .rodata @4044 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4044 = -3.0f / 10.0f; -COMPILER_STRIP_GATE(80C1B65C, &lit_4044); +COMPILER_STRIP_GATE(0x80C1B65C, &lit_4044); #pragma pop /* 80C1B660-80C1B664 000060 0004+00 0/3 0/0 0/0 .rodata @4045 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4045 = 0.5f; -COMPILER_STRIP_GATE(80C1B660, &lit_4045); +COMPILER_STRIP_GATE(0x80C1B660, &lit_4045); #pragma pop /* 80C1B664-80C1B668 000064 0004+00 0/2 0/0 0/0 .rodata @4046 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4046 = -30.0f; -COMPILER_STRIP_GATE(80C1B664, &lit_4046); +COMPILER_STRIP_GATE(0x80C1B664, &lit_4046); #pragma pop /* 80C1B668-80C1B66C 000068 0004+00 0/1 0/0 0/0 .rodata @4047 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4047 = 4.0f / 5.0f; -COMPILER_STRIP_GATE(80C1B668, &lit_4047); +COMPILER_STRIP_GATE(0x80C1B668, &lit_4047); #pragma pop /* 80C1B66C-80C1B670 00006C 0004+00 0/1 0/0 0/0 .rodata @4048 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4048 = -2.0f / 5.0f; -COMPILER_STRIP_GATE(80C1B66C, &lit_4048); +COMPILER_STRIP_GATE(0x80C1B66C, &lit_4048); #pragma pop /* 80C1B670-80C1B674 000070 0004+00 0/1 0/0 0/0 .rodata @4049 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4049 = 0.75f; -COMPILER_STRIP_GATE(80C1B670, &lit_4049); +COMPILER_STRIP_GATE(0x80C1B670, &lit_4049); #pragma pop /* 80C1B674-80C1B678 000074 0004+00 0/1 0/0 0/0 .rodata @4050 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4050 = 3500.0f; -COMPILER_STRIP_GATE(80C1B674, &lit_4050); +COMPILER_STRIP_GATE(0x80C1B674, &lit_4050); #pragma pop /* 80C1B678-80C1B67C 000078 0004+00 0/1 0/0 0/0 .rodata @4051 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4051 = 1300.0f; -COMPILER_STRIP_GATE(80C1B678, &lit_4051); +COMPILER_STRIP_GATE(0x80C1B678, &lit_4051); #pragma pop /* 80C1B67C-80C1B680 00007C 0004+00 0/2 0/0 0/0 .rodata @4052 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4052 = 2.0f; -COMPILER_STRIP_GATE(80C1B67C, &lit_4052); +COMPILER_STRIP_GATE(0x80C1B67C, &lit_4052); #pragma pop /* 80C1B680-80C1B684 000080 0004+00 0/1 0/0 0/0 .rodata @4053 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4053 = -5.0f; -COMPILER_STRIP_GATE(80C1B680, &lit_4053); +COMPILER_STRIP_GATE(0x80C1B680, &lit_4053); #pragma pop /* 80C1B684-80C1B688 000084 0004+00 0/2 0/0 0/0 .rodata @4054 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4054 = 60.0f; -COMPILER_STRIP_GATE(80C1B684, &lit_4054); +COMPILER_STRIP_GATE(0x80C1B684, &lit_4054); #pragma pop /* 80C1B688-80C1B690 000088 0008+00 0/1 0/0 0/0 .rodata @4055 */ @@ -620,7 +620,7 @@ COMPILER_STRIP_GATE(80C1B684, &lit_4054); SECTION_RODATA static u8 const lit_4055[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C1B688, &lit_4055); +COMPILER_STRIP_GATE(0x80C1B688, &lit_4055); #pragma pop /* 80C1B690-80C1B698 000090 0008+00 0/1 0/0 0/0 .rodata @4056 */ @@ -629,7 +629,7 @@ COMPILER_STRIP_GATE(80C1B688, &lit_4055); SECTION_RODATA static u8 const lit_4056[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C1B690, &lit_4056); +COMPILER_STRIP_GATE(0x80C1B690, &lit_4056); #pragma pop /* 80C1B698-80C1B6A0 000098 0008+00 0/1 0/0 0/0 .rodata @4057 */ @@ -638,21 +638,21 @@ COMPILER_STRIP_GATE(80C1B690, &lit_4056); SECTION_RODATA static u8 const lit_4057[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C1B698, &lit_4057); +COMPILER_STRIP_GATE(0x80C1B698, &lit_4057); #pragma pop /* 80C1B6A0-80C1B6A4 0000A0 0004+00 0/1 0/0 0/0 .rodata @4058 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4058 = 300.0f; -COMPILER_STRIP_GATE(80C1B6A0, &lit_4058); +COMPILER_STRIP_GATE(0x80C1B6A0, &lit_4058); #pragma pop /* 80C1B6A4-80C1B6A8 0000A4 0004+00 0/1 0/0 0/0 .rodata @4059 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4059 = 3.0f / 10.0f; -COMPILER_STRIP_GATE(80C1B6A4, &lit_4059); +COMPILER_STRIP_GATE(0x80C1B6A4, &lit_4059); #pragma pop /* 80C1B6A8-80C1B6B0 0000A8 0004+04 0/1 0/0 0/0 .rodata @4060 */ @@ -663,7 +663,7 @@ SECTION_RODATA static f32 const lit_4060[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80C1B6A8, &lit_4060); +COMPILER_STRIP_GATE(0x80C1B6A8, &lit_4060); #pragma pop /* 80C1B6B0-80C1B6B8 0000B0 0008+00 0/2 0/0 0/0 .rodata @4062 */ @@ -672,7 +672,7 @@ COMPILER_STRIP_GATE(80C1B6A8, &lit_4060); SECTION_RODATA static u8 const lit_4062[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C1B6B0, &lit_4062); +COMPILER_STRIP_GATE(0x80C1B6B0, &lit_4062); #pragma pop /* 80C19DA8-80C1A490 000868 06E8+00 1/1 0/0 0/0 .text obj_hb_drop__FP12obj_hb_class */ @@ -690,42 +690,42 @@ static asm void obj_hb_drop(obj_hb_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4122 = 19.0f / 20.0f; -COMPILER_STRIP_GATE(80C1B6B8, &lit_4122); +COMPILER_STRIP_GATE(0x80C1B6B8, &lit_4122); #pragma pop /* 80C1B6BC-80C1B6C0 0000BC 0004+00 0/2 0/0 0/0 .rodata @4123 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4123 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(80C1B6BC, &lit_4123); +COMPILER_STRIP_GATE(0x80C1B6BC, &lit_4123); #pragma pop /* 80C1B6C0-80C1B6C4 0000C0 0004+00 0/2 0/0 0/0 .rodata @4124 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4124 = 40.0f; -COMPILER_STRIP_GATE(80C1B6C0, &lit_4124); +COMPILER_STRIP_GATE(0x80C1B6C0, &lit_4124); #pragma pop /* 80C1B6C4-80C1B6C8 0000C4 0004+00 0/1 0/0 0/0 .rodata @4125 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4125 = 0x3B83126F; -COMPILER_STRIP_GATE(80C1B6C4, &lit_4125); +COMPILER_STRIP_GATE(0x80C1B6C4, &lit_4125); #pragma pop /* 80C1B6C8-80C1B6CC 0000C8 0004+00 0/1 0/0 0/0 .rodata @4126 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4126 = 1500.0f; -COMPILER_STRIP_GATE(80C1B6C8, &lit_4126); +COMPILER_STRIP_GATE(0x80C1B6C8, &lit_4126); #pragma pop /* 80C1B6CC-80C1B6D0 0000CC 0004+00 0/1 0/0 0/0 .rodata @4127 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4127 = 130.0f; -COMPILER_STRIP_GATE(80C1B6CC, &lit_4127); +COMPILER_STRIP_GATE(0x80C1B6CC, &lit_4127); #pragma pop /* 80C1A490-80C1A748 000F50 02B8+00 1/1 0/0 0/0 .text obj_hb_float__FP12obj_hb_class */ @@ -743,77 +743,77 @@ static asm void obj_hb_float(obj_hb_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4293 = 5500.0f; -COMPILER_STRIP_GATE(80C1B6D0, &lit_4293); +COMPILER_STRIP_GATE(0x80C1B6D0, &lit_4293); #pragma pop /* 80C1B6D4-80C1B6D8 0000D4 0004+00 0/1 0/0 0/0 .rodata @4294 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4294 = 5000.0f; -COMPILER_STRIP_GATE(80C1B6D4, &lit_4294); +COMPILER_STRIP_GATE(0x80C1B6D4, &lit_4294); #pragma pop /* 80C1B6D8-80C1B6DC 0000D8 0004+00 0/1 0/0 0/0 .rodata @4295 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4295 = 3000.0f; -COMPILER_STRIP_GATE(80C1B6D8, &lit_4295); +COMPILER_STRIP_GATE(0x80C1B6D8, &lit_4295); #pragma pop /* 80C1B6DC-80C1B6E0 0000DC 0004+00 0/1 0/0 0/0 .rodata @4296 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4296 = 4000.0f; -COMPILER_STRIP_GATE(80C1B6DC, &lit_4296); +COMPILER_STRIP_GATE(0x80C1B6DC, &lit_4296); #pragma pop /* 80C1B6E0-80C1B6E4 0000E0 0004+00 0/1 0/0 0/0 .rodata @4297 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4297 = 7.0f / 10.0f; -COMPILER_STRIP_GATE(80C1B6E0, &lit_4297); +COMPILER_STRIP_GATE(0x80C1B6E0, &lit_4297); #pragma pop /* 80C1B6E4-80C1B6E8 0000E4 0004+00 0/1 0/0 0/0 .rodata @4298 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4298 = -2.0f; -COMPILER_STRIP_GATE(80C1B6E4, &lit_4298); +COMPILER_STRIP_GATE(0x80C1B6E4, &lit_4298); #pragma pop /* 80C1B6E8-80C1B6EC 0000E8 0004+00 0/1 0/0 0/0 .rodata @4299 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4299 = 2.5f; -COMPILER_STRIP_GATE(80C1B6E8, &lit_4299); +COMPILER_STRIP_GATE(0x80C1B6E8, &lit_4299); #pragma pop /* 80C1B6EC-80C1B6F0 0000EC 0004+00 0/1 0/0 0/0 .rodata @4300 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4300 = -12.0f; -COMPILER_STRIP_GATE(80C1B6EC, &lit_4300); +COMPILER_STRIP_GATE(0x80C1B6EC, &lit_4300); #pragma pop /* 80C1B6F0-80C1B6F4 0000F0 0004+00 0/1 0/0 0/0 .rodata @4301 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4301 = 1.0f / 100.0f; -COMPILER_STRIP_GATE(80C1B6F0, &lit_4301); +COMPILER_STRIP_GATE(0x80C1B6F0, &lit_4301); #pragma pop /* 80C1B6F4-80C1B6F8 0000F4 0004+00 0/1 0/0 0/0 .rodata @4302 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4302 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(80C1B6F4, &lit_4302); +COMPILER_STRIP_GATE(0x80C1B6F4, &lit_4302); #pragma pop /* 80C1B6F8-80C1B6FC 0000F8 0004+00 0/1 0/0 0/0 .rodata @4303 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4303 = 20000.0f; -COMPILER_STRIP_GATE(80C1B6F8, &lit_4303); +COMPILER_STRIP_GATE(0x80C1B6F8, &lit_4303); #pragma pop /* 80C1B708-80C1B710 000000 0008+00 1/1 0/0 0/0 .data w_eff_id$4176 */ @@ -848,6 +848,13 @@ static bool daOBJ_HB_IsDelete(obj_hb_class* param_0) { return true; } +/* ############################################################################################## */ +/* 80C1B700-80C1B700 000100 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80C1B700 = "E_HB"; +#pragma pop + /* 80C1B12C-80C1B188 001BEC 005C+00 1/0 0/0 0/0 .text daOBJ_HB_Delete__FP12obj_hb_class */ #pragma push @@ -874,7 +881,7 @@ static asm void useHeapInit(fopAc_ac_c* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4457 = 65535.0f; -COMPILER_STRIP_GATE(80C1B6FC, &lit_4457); +COMPILER_STRIP_GATE(0x80C1B6FC, &lit_4457); #pragma pop /* 80C1B710-80C1B750 000008 0040+00 1/1 0/0 0/0 .data cc_sph_src$4381 */ @@ -994,9 +1001,4 @@ static asm void func_80C1B5F0() { } #pragma pop -/* 80C1B700-80C1B705 000100 0005+00 3/3 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80C1B700 = "E_HB"; -#pragma pop +/* 80C1B700-80C1B700 000100 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_hbombkoya/d_a_obj_hbombkoya.cpp b/rel/d/a/obj/d_a_obj_hbombkoya/d_a_obj_hbombkoya.cpp index 0e9bbc979e0..37ff56d2995 100644 --- a/rel/d/a/obj/d_a_obj_hbombkoya/d_a_obj_hbombkoya.cpp +++ b/rel/d/a/obj/d_a_obj_hbombkoya/d_a_obj_hbombkoya.cpp @@ -60,10 +60,10 @@ struct dRes_control_c { struct dPa_levelEcallBack {}; -struct _GXColor {}; - struct csXyz {}; +struct _GXColor {}; + struct dPa_control_c { /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, @@ -136,10 +136,10 @@ struct cCcD_GStts { /* 80C1C3CC */ ~cCcD_GStts(); }; -struct Vec {}; - struct JAISoundID {}; +struct Vec {}; + struct Z2SeMgr { /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); /* 802AC50C */ void seStartLevel(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); @@ -245,6 +245,12 @@ extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; // /* ############################################################################################## */ +/* 80C1C728-80C1C728 000130 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80C1C728 = "H_Bombkoy"; +#pragma pop + /* 80C1C734-80C1C738 -00001 0004+00 3/3 0/0 0/0 .data l_arcName */ SECTION_DATA static void* l_arcName = (void*)&d_a_obj_hbombkoya__stringBase0; @@ -271,7 +277,7 @@ asm void daObjHBombkoya_c::CreateHeap() { /* ############################################################################################## */ /* 80C1C5F8-80C1C5FC 000000 0004+00 2/2 0/0 0/0 .rodata @3699 */ SECTION_RODATA static f32 const lit_3699 = 200.0f; -COMPILER_STRIP_GATE(80C1C5F8, &lit_3699); +COMPILER_STRIP_GATE(0x80C1C5F8, &lit_3699); /* 80C1C738-80C1C77C 000004 0044+00 1/1 0/0 0/0 .data l_cc_cyl_src */ SECTION_DATA static u8 l_cc_cyl_src[68] = { @@ -418,7 +424,7 @@ asm cM3dGAab::~cM3dGAab() { /* ############################################################################################## */ /* 80C1C5FC-80C1C600 000004 0004+00 1/2 0/0 0/0 .rodata @3747 */ SECTION_RODATA static f32 const lit_3747 = 1.0f; -COMPILER_STRIP_GATE(80C1C5FC, &lit_3747); +COMPILER_STRIP_GATE(0x80C1C5FC, &lit_3747); /* 80C1BB7C-80C1BCA0 00037C 0124+00 1/1 0/0 0/0 .text * setParticle__16daObjHBombkoya_cFPUsiPQ216daObjHBombkoya_c7PSetTblii */ @@ -440,7 +446,7 @@ asm void daObjHBombkoya_c::setParticle(u16* param_0, int param_1, SECTION_RODATA static u8 const lit_3758[16] = { 0x85, 0x8D, 0x85, 0x8E, 0x85, 0x8F, 0x85, 0x90, 0x85, 0x91, 0x85, 0x92, 0x85, 0x93, 0x85, 0x94, }; -COMPILER_STRIP_GATE(80C1C600, &lit_3758); +COMPILER_STRIP_GATE(0x80C1C600, &lit_3758); #pragma pop /* 80C1C610-80C1C6B0 000018 00A0+00 0/0 0/0 0/0 .rodata @3759 */ @@ -458,7 +464,7 @@ SECTION_RODATA static u8 const lit_3759[160] = { 0xC3, 0xE7, 0x00, 0x00, 0x00, 0x00, 0x00, 0x9B, 0x3F, 0x80, 0x00, 0x00, 0xC4, 0x7A, 0x00, 0x00, 0x42, 0xE8, 0x00, 0x00, 0xC3, 0xEA, 0x80, 0x00, 0x00, 0x00, 0x00, 0xA0, 0x3F, 0x80, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C1C610, &lit_3759); +COMPILER_STRIP_GATE(0x80C1C610, &lit_3759); #pragma pop /* 80C1C6B0-80C1C6B8 0000B8 0006+02 0/1 0/0 0/0 .rodata @3762 */ @@ -475,7 +481,7 @@ SECTION_RODATA static u8 const lit_3762[6 + 2 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C1C6B0, &lit_3762); +COMPILER_STRIP_GATE(0x80C1C6B0, &lit_3762); #pragma pop /* 80C1C6B8-80C1C71C 0000C0 0064+00 0/0 0/0 0/0 .rodata @3763 */ @@ -490,21 +496,21 @@ SECTION_RODATA static u8 const lit_3763[100] = { 0x00, 0x3F, 0x99, 0x99, 0x9A, 0xC4, 0x66, 0x40, 0x00, 0x44, 0x7A, 0x00, 0x00, 0xC4, 0x31, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3F, 0xA0, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C1C6B8, &lit_3763); +COMPILER_STRIP_GATE(0x80C1C6B8, &lit_3763); #pragma pop /* 80C1C71C-80C1C720 000124 0004+00 0/1 0/0 0/0 .rodata @3851 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3851 = -1.0f; -COMPILER_STRIP_GATE(80C1C71C, &lit_3851); +COMPILER_STRIP_GATE(0x80C1C71C, &lit_3851); #pragma pop /* 80C1C720-80C1C724 000128 0004+00 0/1 0/0 0/0 .rodata @3852 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3852 = -500.0f; -COMPILER_STRIP_GATE(80C1C720, &lit_3852); +COMPILER_STRIP_GATE(0x80C1C720, &lit_3852); #pragma pop /* 80C1C724-80C1C728 00012C 0004+00 0/1 0/0 0/0 .rodata @3853 */ @@ -516,7 +522,7 @@ SECTION_RODATA static u8 const lit_3853[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C1C724, &lit_3853); +COMPILER_STRIP_GATE(0x80C1C724, &lit_3853); #pragma pop /* 80C1BCA0-80C1C098 0004A0 03F8+00 1/0 0/0 0/0 .text Execute__16daObjHBombkoya_cFPPA3_A4_f */ @@ -691,9 +697,4 @@ static asm void func_80C1C5E8() { } #pragma pop -/* 80C1C728-80C1C732 000130 000A+00 1/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80C1C728 = "H_Bombkoy"; -#pragma pop +/* 80C1C728-80C1C728 000130 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_heavySw/d_a_obj_heavySw.cpp b/rel/d/a/obj/d_a_obj_heavySw/d_a_obj_heavySw.cpp index 24328b44f23..342ca35ec94 100644 --- a/rel/d/a/obj/d_a_obj_heavySw/d_a_obj_heavySw.cpp +++ b/rel/d/a/obj/d_a_obj_heavySw/d_a_obj_heavySw.cpp @@ -130,10 +130,10 @@ struct cM3dGCir { struct _GXTexObj {}; -struct Vec {}; - struct JAISoundID {}; +struct Vec {}; + struct Z2SeMgr { /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); /* 802AC50C */ void seStartLevel(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); @@ -254,34 +254,34 @@ extern "C" void __register_global_object(); /* ############################################################################################## */ /* 80C1DA94-80C1DA98 000000 0004+00 7/7 0/0 0/0 .rodata @3647 */ SECTION_RODATA static f32 const lit_3647 = 150.0f; -COMPILER_STRIP_GATE(80C1DA94, &lit_3647); +COMPILER_STRIP_GATE(0x80C1DA94, &lit_3647); /* 80C1DA98-80C1DA9C 000004 0004+00 0/1 0/0 0/0 .rodata @3648 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3648 = 450.0f; -COMPILER_STRIP_GATE(80C1DA98, &lit_3648); +COMPILER_STRIP_GATE(0x80C1DA98, &lit_3648); #pragma pop /* 80C1DA9C-80C1DAA0 000008 0004+00 0/1 0/0 0/0 .rodata @3649 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3649 = 100.0f; -COMPILER_STRIP_GATE(80C1DA9C, &lit_3649); +COMPILER_STRIP_GATE(0x80C1DA9C, &lit_3649); #pragma pop /* 80C1DAA0-80C1DAA4 00000C 0004+00 0/1 0/0 0/0 .rodata @3650 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3650 = 50.0f; -COMPILER_STRIP_GATE(80C1DAA0, &lit_3650); +COMPILER_STRIP_GATE(0x80C1DAA0, &lit_3650); #pragma pop /* 80C1DAA4-80C1DAA8 000010 0004+00 0/1 0/0 0/0 .rodata @3651 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3651 = 20.0f; -COMPILER_STRIP_GATE(80C1DAA4, &lit_3651); +COMPILER_STRIP_GATE(0x80C1DAA4, &lit_3651); #pragma pop /* 80C1DAA8-80C1DAAC 000014 0004+00 1/8 0/0 0/0 .rodata @3652 */ @@ -291,20 +291,20 @@ SECTION_RODATA static u8 const lit_3652[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C1DAA8, &lit_3652); +COMPILER_STRIP_GATE(0x80C1DAA8, &lit_3652); /* 80C1DAAC-80C1DAB0 000018 0004+00 0/1 0/0 0/0 .rodata @3653 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3653 = 4.0f / 5.0f; -COMPILER_STRIP_GATE(80C1DAAC, &lit_3653); +COMPILER_STRIP_GATE(0x80C1DAAC, &lit_3653); #pragma pop /* 80C1DAB0-80C1DAB4 00001C 0004+00 0/1 0/0 0/0 .rodata @3654 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3654 = 15.0f; -COMPILER_STRIP_GATE(80C1DAB0, &lit_3654); +COMPILER_STRIP_GATE(0x80C1DAB0, &lit_3654); #pragma pop /* 80C1DAE8-80C1DAF4 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ @@ -486,6 +486,13 @@ asm void daHeavySw_c::setBaseMtx() { } #pragma pop +/* ############################################################################################## */ +/* 80C1DAE0-80C1DAE0 00004C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80C1DAE0 = "Hswitch"; +#pragma pop + /* 80C1CC70-80C1CCDC 000270 006C+00 1/0 0/0 0/0 .text CreateHeap__11daHeavySw_cFv */ #pragma push #pragma optimization_level 0 @@ -499,7 +506,7 @@ asm void daHeavySw_c::CreateHeap() { /* ############################################################################################## */ /* 80C1DAB4-80C1DAB8 000020 0004+00 1/2 0/0 0/0 .rodata @3741 */ SECTION_RODATA static f32 const lit_3741 = 300.0f; -COMPILER_STRIP_GATE(80C1DAB4, &lit_3741); +COMPILER_STRIP_GATE(0x80C1DAB4, &lit_3741); /* 80C1CCDC-80C1CEB0 0002DC 01D4+00 1/1 0/0 0/0 .text create__11daHeavySw_cFv */ #pragma push @@ -557,49 +564,49 @@ asm void daHeavySw_c::Execute(f32 (**param_0)[3][4]) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3811 = 0.5f; -COMPILER_STRIP_GATE(80C1DAB8, &lit_3811); +COMPILER_STRIP_GATE(0x80C1DAB8, &lit_3811); #pragma pop /* 80C1DABC-80C1DAC0 000028 0004+00 0/6 0/0 0/0 .rodata @3812 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3812 = 1.0f; -COMPILER_STRIP_GATE(80C1DABC, &lit_3812); +COMPILER_STRIP_GATE(0x80C1DABC, &lit_3812); #pragma pop /* 80C1DAC0-80C1DAC4 00002C 0004+00 0/5 0/0 0/0 .rodata @3813 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3813 = -1.0f; -COMPILER_STRIP_GATE(80C1DAC0, &lit_3813); +COMPILER_STRIP_GATE(0x80C1DAC0, &lit_3813); #pragma pop /* 80C1DAC4-80C1DAC8 000030 0004+00 0/1 0/0 0/0 .rodata @3814 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3814 = 3.0f / 10.0f; -COMPILER_STRIP_GATE(80C1DAC4, &lit_3814); +COMPILER_STRIP_GATE(0x80C1DAC4, &lit_3814); #pragma pop /* 80C1DAC8-80C1DACC 000034 0004+00 0/1 0/0 0/0 .rodata @3815 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3815 = 10.0f; -COMPILER_STRIP_GATE(80C1DAC8, &lit_3815); +COMPILER_STRIP_GATE(0x80C1DAC8, &lit_3815); #pragma pop /* 80C1DACC-80C1DAD0 000038 0004+00 0/1 0/0 0/0 .rodata @3816 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3816 = 1.0f / 100.0f; -COMPILER_STRIP_GATE(80C1DACC, &lit_3816); +COMPILER_STRIP_GATE(0x80C1DACC, &lit_3816); #pragma pop /* 80C1DAD0-80C1DAD4 00003C 0004+00 0/4 0/0 0/0 .rodata @3817 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3817 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(80C1DAD0, &lit_3817); +COMPILER_STRIP_GATE(0x80C1DAD0, &lit_3817); #pragma pop /* 80C1DC48-80C1DC54 000008 000C+00 1/1 0/0 0/0 .bss @3641 */ @@ -656,7 +663,7 @@ asm void daHeavySw_c::init_modeRide() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3860 = 30.0f; -COMPILER_STRIP_GATE(80C1DAD4, &lit_3860); +COMPILER_STRIP_GATE(0x80C1DAD4, &lit_3860); #pragma pop /* 80C1D2D8-80C1D408 0008D8 0130+00 1/0 0/0 0/0 .text modeRide__11daHeavySw_cFv */ @@ -736,14 +743,14 @@ asm void daHeavySw_c::modeMoveEnd() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3998 = 170.0f; -COMPILER_STRIP_GATE(80C1DAD8, &lit_3998); +COMPILER_STRIP_GATE(0x80C1DAD8, &lit_3998); #pragma pop /* 80C1DADC-80C1DAE0 000048 0004+00 0/1 0/0 0/0 .rodata @3999 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3999 = 500.0f; -COMPILER_STRIP_GATE(80C1DADC, &lit_3999); +COMPILER_STRIP_GATE(0x80C1DADC, &lit_3999); #pragma pop /* 80C1D808-80C1D91C 000E08 0114+00 1/0 0/0 0/0 .text Draw__11daHeavySw_cFv */ @@ -830,7 +837,7 @@ asm void __sinit_d_a_obj_heavySw_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80C1DA34 = (void*)__sinit_d_a_obj_heavySw_cpp; +REGISTER_CTORS(0x80C1DA34, __sinit_d_a_obj_heavySw_cpp); #pragma pop /* 80C1DA70-80C1DA78 001070 0008+00 1/0 0/0 0/0 .text @36@__dt__12dBgS_ObjAcchFv */ @@ -853,9 +860,4 @@ static asm void func_80C1DA78() { } #pragma pop -/* 80C1DAE0-80C1DAE8 00004C 0008+00 3/3 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80C1DAE0 = "Hswitch"; -#pragma pop +/* 80C1DAE0-80C1DAE0 00004C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_hfuta/d_a_obj_hfuta.cpp b/rel/d/a/obj/d_a_obj_hfuta/d_a_obj_hfuta.cpp index 0b8dde77f5a..7f1540333a7 100644 --- a/rel/d/a/obj/d_a_obj_hfuta/d_a_obj_hfuta.cpp +++ b/rel/d/a/obj/d_a_obj_hfuta/d_a_obj_hfuta.cpp @@ -178,20 +178,20 @@ SECTION_RODATA static u8 const lit_3644[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C1EE78, &lit_3644); +COMPILER_STRIP_GATE(0x80C1EE78, &lit_3644); /* 80C1EE7C-80C1EE80 000004 0004+00 0/1 0/0 0/0 .rodata @3645 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3645 = 87.5f; -COMPILER_STRIP_GATE(80C1EE7C, &lit_3645); +COMPILER_STRIP_GATE(0x80C1EE7C, &lit_3645); #pragma pop /* 80C1EE80-80C1EE84 000008 0004+00 0/1 0/0 0/0 .rodata @3646 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3646 = -87.5f; -COMPILER_STRIP_GATE(80C1EE80, &lit_3646); +COMPILER_STRIP_GATE(0x80C1EE80, &lit_3646); #pragma pop /* 80C1DDC8-80C1DE94 000128 00CC+00 2/2 0/0 0/0 .text setBaseMtx__11daObjFuta_cFv */ @@ -215,6 +215,12 @@ asm void daObjFuta_c::Create() { #pragma pop /* ############################################################################################## */ +/* 80C1EE98-80C1EE98 000020 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80C1EE98 = "Obj_hfuta"; +#pragma pop + /* 80C1EEA4-80C1EEB0 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -687,7 +693,7 @@ asm void daObjFuta_c::mode_proc_call() { /* ############################################################################################## */ /* 80C1EE84-80C1EE88 00000C 0004+00 1/1 0/0 0/0 .rodata @3985 */ SECTION_RODATA static f32 const lit_3985 = 900.0f; -COMPILER_STRIP_GATE(80C1EE84, &lit_3985); +COMPILER_STRIP_GATE(0x80C1EE84, &lit_3985); /* 80C1EBDC-80C1EC44 000F3C 0068+00 2/1 0/0 0/0 .text mode_wait__11daObjFuta_cFv */ #pragma push @@ -702,27 +708,27 @@ asm void daObjFuta_c::mode_wait() { /* ############################################################################################## */ /* 80C1EE88-80C1EE8C 000010 0004+00 1/2 0/0 0/0 .rodata @3995 */ SECTION_RODATA static f32 const lit_3995 = 120.0f; -COMPILER_STRIP_GATE(80C1EE88, &lit_3995); +COMPILER_STRIP_GATE(0x80C1EE88, &lit_3995); /* 80C1EE8C-80C1EE90 000014 0004+00 0/1 0/0 0/0 .rodata @3996 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3996 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(80C1EE8C, &lit_3996); +COMPILER_STRIP_GATE(0x80C1EE8C, &lit_3996); #pragma pop /* 80C1EE90-80C1EE94 000018 0004+00 0/1 0/0 0/0 .rodata @3997 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3997 = 5.0f; -COMPILER_STRIP_GATE(80C1EE90, &lit_3997); +COMPILER_STRIP_GATE(0x80C1EE90, &lit_3997); #pragma pop /* 80C1EE94-80C1EE98 00001C 0004+00 0/1 0/0 0/0 .rodata @3998 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3998 = 2.0f; -COMPILER_STRIP_GATE(80C1EE94, &lit_3998); +COMPILER_STRIP_GATE(0x80C1EE94, &lit_3998); #pragma pop /* 80C1EC44-80C1ECB4 000FA4 0070+00 1/0 0/0 0/0 .text mode_move__11daObjFuta_cFv */ @@ -1014,9 +1020,4 @@ static u8 data_80C1F338[4]; static u8 data_80C1F33C[4]; #pragma pop -/* 80C1EE98-80C1EEA2 000020 000A+00 1/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80C1EE98 = "Obj_hfuta"; -#pragma pop +/* 80C1EE98-80C1EE98 000020 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_hhashi/d_a_obj_hhashi.cpp b/rel/d/a/obj/d_a_obj_hhashi/d_a_obj_hhashi.cpp index 16a2294852f..d6d7b68a30b 100644 --- a/rel/d/a/obj/d_a_obj_hhashi/d_a_obj_hhashi.cpp +++ b/rel/d/a/obj/d_a_obj_hhashi/d_a_obj_hhashi.cpp @@ -168,10 +168,10 @@ struct cBgS { /* 800743B4 */ void LineCross(cBgS_LinChk*); }; -struct Vec {}; - struct JAISoundID {}; +struct Vec {}; + struct Z2SeMgr { /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); }; @@ -329,7 +329,7 @@ SECTION_RODATA static u8 const ccCylSrc[68] = { 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0xDC, 0x00, 0x00, 0x43, 0x1E, 0x00, 0x00, }; -COMPILER_STRIP_GATE(805814AC, &ccCylSrc); +COMPILER_STRIP_GATE(0x805814AC, &ccCylSrc); /* 8057F9B8-8057FA18 000078 0060+00 1/1 0/0 0/0 .text initCcCylinder__13daObjHHASHI_cFv */ @@ -378,28 +378,28 @@ static asm void daObjHHASHI_Delete(daObjHHASHI_c* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3844 = 1.0f; -COMPILER_STRIP_GATE(805814F0, &lit_3844); +COMPILER_STRIP_GATE(0x805814F0, &lit_3844); #pragma pop /* 805814F4-805814F8 000048 0004+00 0/2 0/0 0/0 .rodata @3845 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3845 = -1.0f; -COMPILER_STRIP_GATE(805814F4, &lit_3845); +COMPILER_STRIP_GATE(0x805814F4, &lit_3845); #pragma pop /* 805814F8-805814FC 00004C 0004+00 0/1 0/0 0/0 .rodata @3846 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3846 = 300.0f; -COMPILER_STRIP_GATE(805814F8, &lit_3846); +COMPILER_STRIP_GATE(0x805814F8, &lit_3846); #pragma pop /* 805814FC-80581500 000050 0004+00 0/1 0/0 0/0 .rodata @3847 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3847 = 50.0f; -COMPILER_STRIP_GATE(805814FC, &lit_3847); +COMPILER_STRIP_GATE(0x805814FC, &lit_3847); #pragma pop /* 8057FA90-8057FD30 000150 02A0+00 1/1 0/0 0/0 .text Set_Hahen__13daObjHHASHI_cFP4cXyz @@ -438,56 +438,56 @@ asm csXyz::~csXyz() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3915 = 70.0f; -COMPILER_STRIP_GATE(80581500, &lit_3915); +COMPILER_STRIP_GATE(0x80581500, &lit_3915); #pragma pop /* 80581504-80581508 000058 0004+00 0/1 0/0 0/0 .rodata @3916 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3916 = 0.5f; -COMPILER_STRIP_GATE(80581504, &lit_3916); +COMPILER_STRIP_GATE(0x80581504, &lit_3916); #pragma pop /* 80581508-8058150C 00005C 0004+00 0/1 0/0 0/0 .rodata @3917 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3917 = 2.5f; -COMPILER_STRIP_GATE(80581508, &lit_3917); +COMPILER_STRIP_GATE(0x80581508, &lit_3917); #pragma pop /* 8058150C-80581510 000060 0004+00 0/1 0/0 0/0 .rodata @3918 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3918 = 11.0f / 10.0f; -COMPILER_STRIP_GATE(8058150C, &lit_3918); +COMPILER_STRIP_GATE(0x8058150C, &lit_3918); #pragma pop /* 80581510-80581514 000064 0004+00 0/1 0/0 0/0 .rodata @3919 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3919 = 1.5f; -COMPILER_STRIP_GATE(80581510, &lit_3919); +COMPILER_STRIP_GATE(0x80581510, &lit_3919); #pragma pop /* 80581514-80581518 000068 0004+00 0/1 0/0 0/0 .rodata @3920 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3920 = 30.0f; -COMPILER_STRIP_GATE(80581514, &lit_3920); +COMPILER_STRIP_GATE(0x80581514, &lit_3920); #pragma pop /* 80581518-8058151C 00006C 0004+00 0/1 0/0 0/0 .rodata @3921 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3921 = 32768.0f; -COMPILER_STRIP_GATE(80581518, &lit_3921); +COMPILER_STRIP_GATE(0x80581518, &lit_3921); #pragma pop /* 8058151C-80581520 000070 0004+00 0/1 0/0 0/0 .rodata @3922 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3922 = 8192.0f; -COMPILER_STRIP_GATE(8058151C, &lit_3922); +COMPILER_STRIP_GATE(0x8058151C, &lit_3922); #pragma pop /* 80581520-80581524 000074 0004+00 1/7 0/0 0/0 .rodata @3923 */ @@ -497,34 +497,34 @@ SECTION_RODATA static u8 const lit_3923[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80581520, &lit_3923); +COMPILER_STRIP_GATE(0x80581520, &lit_3923); /* 80581524-80581528 000078 0004+00 0/1 0/0 0/0 .rodata @3924 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3924 = 15000.0f; -COMPILER_STRIP_GATE(80581524, &lit_3924); +COMPILER_STRIP_GATE(0x80581524, &lit_3924); #pragma pop /* 80581528-8058152C 00007C 0004+00 0/1 0/0 0/0 .rodata @3925 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3925 = 65536.0f; -COMPILER_STRIP_GATE(80581528, &lit_3925); +COMPILER_STRIP_GATE(0x80581528, &lit_3925); #pragma pop /* 8058152C-80581530 000080 0004+00 0/1 0/0 0/0 .rodata @3926 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3926 = 20.0f; -COMPILER_STRIP_GATE(8058152C, &lit_3926); +COMPILER_STRIP_GATE(0x8058152C, &lit_3926); #pragma pop /* 80581530-80581534 000084 0004+00 0/1 0/0 0/0 .rodata @3927 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3927 = 10.0f; -COMPILER_STRIP_GATE(80581530, &lit_3927); +COMPILER_STRIP_GATE(0x80581530, &lit_3927); #pragma pop /* 80581534-8058153C 000088 0004+04 0/1 0/0 0/0 .rodata @3928 */ @@ -535,7 +535,7 @@ SECTION_RODATA static f32 const lit_3928[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80581534, &lit_3928); +COMPILER_STRIP_GATE(0x80581534, &lit_3928); #pragma pop /* 8058153C-80581544 000090 0008+00 0/2 0/0 0/0 .rodata @3931 */ @@ -544,7 +544,7 @@ COMPILER_STRIP_GATE(80581534, &lit_3928); SECTION_RODATA static u8 const lit_3931[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8058153C, &lit_3931); +COMPILER_STRIP_GATE(0x8058153C, &lit_3931); #pragma pop /* 8057FDA8-805801B0 000468 0408+00 1/1 0/0 0/0 .text Set_Speed__13daObjHHASHI_cFssffff @@ -564,14 +564,14 @@ asm void daObjHHASHI_c::Set_Speed(s16 param_0, s16 param_1, f32 param_2, f32 par #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3979 = 16384.0f; -COMPILER_STRIP_GATE(80581544, &lit_3979); +COMPILER_STRIP_GATE(0x80581544, &lit_3979); #pragma pop /* 80581548-8058154C 00009C 0004+00 0/1 0/0 0/0 .rodata @3980 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3980 = 100.0f; -COMPILER_STRIP_GATE(80581548, &lit_3980); +COMPILER_STRIP_GATE(0x80581548, &lit_3980); #pragma pop /* 805801B0-80580358 000870 01A8+00 1/1 0/0 0/0 .text Obj_Damage__13daObjHHASHI_cFv */ @@ -587,7 +587,7 @@ asm void daObjHHASHI_c::Obj_Damage() { /* ############################################################################################## */ /* 8058154C-80581550 0000A0 0004+00 1/1 0/0 0/0 .rodata @4006 */ SECTION_RODATA static f32 const lit_4006 = -1.0f / 20.0f; -COMPILER_STRIP_GATE(8058154C, &lit_4006); +COMPILER_STRIP_GATE(0x8058154C, &lit_4006); /* 80580358-8058043C 000A18 00E4+00 1/1 0/0 0/0 .text Wall_Check__13daObjHHASHI_cFs */ #pragma push @@ -604,49 +604,49 @@ asm void daObjHHASHI_c::Wall_Check(s16 param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4035 = 15.0f; -COMPILER_STRIP_GATE(80581550, &lit_4035); +COMPILER_STRIP_GATE(0x80581550, &lit_4035); #pragma pop /* 80581554-80581558 0000A8 0004+00 0/1 0/0 0/0 .rodata @4036 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4036 = 3.0f / 10.0f; -COMPILER_STRIP_GATE(80581554, &lit_4036); +COMPILER_STRIP_GATE(0x80581554, &lit_4036); #pragma pop /* 80581558-8058155C 0000AC 0004+00 0/2 0/0 0/0 .rodata @4037 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4037 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(80581558, &lit_4037); +COMPILER_STRIP_GATE(0x80581558, &lit_4037); #pragma pop /* 8058155C-80581560 0000B0 0004+00 0/2 0/0 0/0 .rodata @4038 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4038 = 7.0f / 10.0f; -COMPILER_STRIP_GATE(8058155C, &lit_4038); +COMPILER_STRIP_GATE(0x8058155C, &lit_4038); #pragma pop /* 80581560-80581564 0000B4 0004+00 0/1 0/0 0/0 .rodata @4039 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4039 = 4.0f; -COMPILER_STRIP_GATE(80581560, &lit_4039); +COMPILER_STRIP_GATE(0x80581560, &lit_4039); #pragma pop /* 80581564-80581568 0000B8 0004+00 0/2 0/0 0/0 .rodata @4040 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4040 = 5000.0f; -COMPILER_STRIP_GATE(80581564, &lit_4040); +COMPILER_STRIP_GATE(0x80581564, &lit_4040); #pragma pop /* 80581568-8058156C 0000BC 0004+00 0/1 0/0 0/0 .rodata @4041 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4041 = 5.0f; -COMPILER_STRIP_GATE(80581568, &lit_4041); +COMPILER_STRIP_GATE(0x80581568, &lit_4041); #pragma pop /* 8058043C-805805F4 000AFC 01B8+00 1/1 0/0 0/0 .text Hahen_Motion__13daObjHHASHI_cFs */ @@ -666,7 +666,7 @@ asm void daObjHHASHI_c::Hahen_Motion(s16 param_0) { SECTION_RODATA static u8 const lit_4103[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8058156C, &lit_4103); +COMPILER_STRIP_GATE(0x8058156C, &lit_4103); #pragma pop /* 80581574-8058157C 0000C8 0008+00 0/3 0/0 0/0 .rodata @4104 */ @@ -675,7 +675,7 @@ COMPILER_STRIP_GATE(8058156C, &lit_4103); SECTION_RODATA static u8 const lit_4104[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80581574, &lit_4104); +COMPILER_STRIP_GATE(0x80581574, &lit_4104); #pragma pop /* 8058157C-80581584 0000D0 0008+00 0/3 0/0 0/0 .rodata @4105 */ @@ -684,14 +684,14 @@ COMPILER_STRIP_GATE(80581574, &lit_4104); SECTION_RODATA static u8 const lit_4105[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8058157C, &lit_4105); +COMPILER_STRIP_GATE(0x8058157C, &lit_4105); #pragma pop /* 80581584-80581588 0000D8 0004+00 0/1 0/0 0/0 .rodata @4106 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4106 = 1500.0f; -COMPILER_STRIP_GATE(80581584, &lit_4106); +COMPILER_STRIP_GATE(0x80581584, &lit_4106); #pragma pop /* 805805F4-805807C4 000CB4 01D0+00 1/1 0/0 0/0 .text CheckCull__13daObjHHASHI_cFv */ @@ -709,14 +709,14 @@ asm void daObjHHASHI_c::CheckCull() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4119 = 608.0f; -COMPILER_STRIP_GATE(80581588, &lit_4119); +COMPILER_STRIP_GATE(0x80581588, &lit_4119); #pragma pop /* 8058158C-80581590 0000E0 0004+00 0/1 0/0 0/0 .rodata @4120 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4120 = 448.0f; -COMPILER_STRIP_GATE(8058158C, &lit_4120); +COMPILER_STRIP_GATE(0x8058158C, &lit_4120); #pragma pop /* 805807C4-80580854 000E84 0090+00 1/1 0/0 0/0 .text checkViewArea__13daObjHHASHI_cFi */ @@ -745,7 +745,7 @@ asm void daObjHHASHI_c::Rolling(cXyz* param_0, f32 param_1, f32 param_2, s8 para #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4214 = 3.0f; -COMPILER_STRIP_GATE(80581590, &lit_4214); +COMPILER_STRIP_GATE(0x80581590, &lit_4214); #pragma pop /* 80580A48-80580C80 001108 0238+00 1/1 0/0 0/0 .text Roll_Set__13daObjHHASHI_cFP4cXyzfs @@ -791,6 +791,14 @@ static asm void daObjHHASHI_Execute(daObjHHASHI_c* param_0) { #pragma pop /* ############################################################################################## */ +/* 805815AC-805815AC 000100 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_805815AC = "L_hhashi"; +SECTION_DEAD static char const* const stringBase_805815B5 = "L_hhashi00.bmd"; +SECTION_DEAD static char const* const stringBase_805815C4 = "L_hhashi02.bmd"; +#pragma pop + /* 805815E4-805815E8 -00001 0004+00 3/3 0/0 0/0 .data l_arcName */ SECTION_DATA static void* l_arcName = (void*)&d_a_obj_hhashi__stringBase0; @@ -807,7 +815,13 @@ asm void daObjHHASHI_c::CreateHeap() { /* ############################################################################################## */ /* 80581594-80581598 0000E8 0004+00 1/1 0/0 0/0 .rodata @4365 */ SECTION_RODATA static f32 const lit_4365 = -9.0f; -COMPILER_STRIP_GATE(80581594, &lit_4365); +COMPILER_STRIP_GATE(0x80581594, &lit_4365); + +/* 805815AC-805815AC 000100 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_805815D3 = "L_hhashi00.dzb"; +#pragma pop /* 805815E8-80581608 -00001 0020+00 1/0 0/0 0/0 .data l_daObjHHASHI_Method */ SECTION_DATA static void* l_daObjHHASHI_Method[8] = { @@ -909,28 +923,28 @@ static bool daObjHHASHI_IsDelete(daObjHHASHI_c* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4443 = -1000.0f; -COMPILER_STRIP_GATE(80581598, &lit_4443); +COMPILER_STRIP_GATE(0x80581598, &lit_4443); #pragma pop /* 8058159C-805815A0 0000F0 0004+00 0/1 0/0 0/0 .rodata @4444 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4444 = -500.0f; -COMPILER_STRIP_GATE(8058159C, &lit_4444); +COMPILER_STRIP_GATE(0x8058159C, &lit_4444); #pragma pop /* 805815A0-805815A4 0000F4 0004+00 0/1 0/0 0/0 .rodata @4445 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4445 = 1000.0f; -COMPILER_STRIP_GATE(805815A0, &lit_4445); +COMPILER_STRIP_GATE(0x805815A0, &lit_4445); #pragma pop /* 805815A4-805815A8 0000F8 0004+00 0/1 0/0 0/0 .rodata @4446 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4446 = 500.0f; -COMPILER_STRIP_GATE(805815A4, &lit_4446); +COMPILER_STRIP_GATE(0x805815A4, &lit_4446); #pragma pop /* 805811CC-80581210 00188C 0044+00 1/0 0/0 0/0 .text Create__13daObjHHASHI_cFv */ @@ -957,7 +971,7 @@ asm void daObjHHASHI_c::Execute(f32 (**param_0)[3][4]) { /* ############################################################################################## */ /* 805815A8-805815AC 0000FC 0004+00 1/1 0/0 0/0 .rodata @4485 */ SECTION_RODATA static f32 const lit_4485 = 200.0f; -COMPILER_STRIP_GATE(805815A8, &lit_4485); +COMPILER_STRIP_GATE(0x805815A8, &lit_4485); /* 805812BC-8058140C 00197C 0150+00 1/0 0/0 0/0 .text Draw__13daObjHHASHI_cFv */ #pragma push @@ -979,12 +993,4 @@ asm void daObjHHASHI_c::Delete() { } #pragma pop -/* 805815AC-805815E2 000100 0036+00 4/3 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_805815AC = "L_hhashi"; -SECTION_DEAD static char const* const stringBase_805815B5 = "L_hhashi00.bmd"; -SECTION_DEAD static char const* const stringBase_805815C4 = "L_hhashi02.bmd"; -SECTION_DEAD static char const* const stringBase_805815D3 = "L_hhashi00.dzb"; -#pragma pop +/* 805815AC-805815AC 000100 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_hsTarget/d_a_obj_hsTarget.cpp b/rel/d/a/obj/d_a_obj_hsTarget/d_a_obj_hsTarget.cpp index 26937696148..cf3bcdc6363 100644 --- a/rel/d/a/obj/d_a_obj_hsTarget/d_a_obj_hsTarget.cpp +++ b/rel/d/a/obj/d_a_obj_hsTarget/d_a_obj_hsTarget.cpp @@ -134,6 +134,13 @@ extern "C" void __register_global_object(); // /* ############################################################################################## */ +/* 80C1F8B0-80C1F8B0 000010 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80C1F8B0 = "hsMato"; +SECTION_DEAD static char const* const stringBase_80C1F8B7 = "L7HsMato"; +#pragma pop + /* 80C1F8C0-80C1F8C8 -00001 0008+00 3/3 0/0 0/0 .data l_resNameIdx */ SECTION_DATA static void* l_resNameIdx[2] = { (void*)&d_a_obj_hsTarget__stringBase0, @@ -225,7 +232,7 @@ asm void daHsTarget_c::setBaseMtx() { SECTION_RODATA static u8 const l_bmdIdx[8] = { 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x04, }; -COMPILER_STRIP_GATE(80C1F8A0, &l_bmdIdx); +COMPILER_STRIP_GATE(0x80C1F8A0, &l_bmdIdx); /* 80C1F518-80C1F598 0001D8 0080+00 1/0 0/0 0/0 .text CreateHeap__12daHsTarget_cFv */ #pragma push @@ -242,7 +249,7 @@ asm void daHsTarget_c::CreateHeap() { SECTION_RODATA static u8 const l_dzbIdx[8] = { 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x07, }; -COMPILER_STRIP_GATE(80C1F8A8, &l_dzbIdx); +COMPILER_STRIP_GATE(0x80C1F8A8, &l_dzbIdx); /* 80C1F598-80C1F6B0 000258 0118+00 1/1 0/0 0/0 .text create__12daHsTarget_cFv */ #pragma push @@ -357,13 +364,7 @@ asm void __sinit_d_a_obj_hsTarget_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80C1F850 = (void*)__sinit_d_a_obj_hsTarget_cpp; +REGISTER_CTORS(0x80C1F850, __sinit_d_a_obj_hsTarget_cpp); #pragma pop -/* 80C1F8B0-80C1F8C0 000010 0010+00 1/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80C1F8B0 = "hsMato"; -SECTION_DEAD static char const* const stringBase_80C1F8B7 = "L7HsMato"; -#pragma pop +/* 80C1F8B0-80C1F8B0 000010 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_ice_l/d_a_obj_ice_l.cpp b/rel/d/a/obj/d_a_obj_ice_l/d_a_obj_ice_l.cpp index bf8adc98ebb..d78d16e5fe0 100644 --- a/rel/d/a/obj/d_a_obj_ice_l/d_a_obj_ice_l.cpp +++ b/rel/d/a/obj/d_a_obj_ice_l/d_a_obj_ice_l.cpp @@ -187,13 +187,13 @@ SECTION_RODATA static u8 const lit_3675[4 + 4 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C2078C, &lit_3675); +COMPILER_STRIP_GATE(0x80C2078C, &lit_3675); /* 80C20794-80C2079C 000008 0008+00 1/3 0/0 0/0 .rodata @3677 */ SECTION_RODATA static u8 const lit_3677[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C20794, &lit_3677); +COMPILER_STRIP_GATE(0x80C20794, &lit_3677); /* 80C1F9F8-80C1FA60 000078 0068+00 1/1 0/0 0/0 .text RideOn_Angle__12daObjIce_l_cFRsfsf */ @@ -213,7 +213,7 @@ asm void daObjIce_l_c::RideOn_Angle(s16& param_0, f32 param_1, s16 param_2, f32 SECTION_RODATA static u8 const lit_3733[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C2079C, &lit_3733); +COMPILER_STRIP_GATE(0x80C2079C, &lit_3733); #pragma pop /* 80C207A4-80C207AC 000018 0008+00 0/2 0/0 0/0 .rodata @3734 */ @@ -222,7 +222,7 @@ COMPILER_STRIP_GATE(80C2079C, &lit_3733); SECTION_RODATA static u8 const lit_3734[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C207A4, &lit_3734); +COMPILER_STRIP_GATE(0x80C207A4, &lit_3734); #pragma pop /* 80C207AC-80C207B4 000020 0008+00 0/2 0/0 0/0 .rodata @3735 */ @@ -231,49 +231,49 @@ COMPILER_STRIP_GATE(80C207A4, &lit_3734); SECTION_RODATA static u8 const lit_3735[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C207AC, &lit_3735); +COMPILER_STRIP_GATE(0x80C207AC, &lit_3735); #pragma pop /* 80C207B4-80C207B8 000028 0004+00 0/1 0/0 0/0 .rodata @3736 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3736 = 352.0f; -COMPILER_STRIP_GATE(80C207B4, &lit_3736); +COMPILER_STRIP_GATE(0x80C207B4, &lit_3736); #pragma pop /* 80C207B8-80C207BC 00002C 0004+00 0/2 0/0 0/0 .rodata @3737 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3737 = 600.0f; -COMPILER_STRIP_GATE(80C207B8, &lit_3737); +COMPILER_STRIP_GATE(0x80C207B8, &lit_3737); #pragma pop /* 80C207BC-80C207C0 000030 0004+00 0/1 0/0 0/0 .rodata @3738 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3738 = 500.0f; -COMPILER_STRIP_GATE(80C207BC, &lit_3738); +COMPILER_STRIP_GATE(0x80C207BC, &lit_3738); #pragma pop /* 80C207C0-80C207C4 000034 0004+00 0/1 0/0 0/0 .rodata @3739 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3739 = 48.0f; -COMPILER_STRIP_GATE(80C207C0, &lit_3739); +COMPILER_STRIP_GATE(0x80C207C0, &lit_3739); #pragma pop /* 80C207C4-80C207C8 000038 0004+00 0/1 0/0 0/0 .rodata @3740 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_3740 = 0x3C75C28F; -COMPILER_STRIP_GATE(80C207C4, &lit_3740); +COMPILER_STRIP_GATE(0x80C207C4, &lit_3740); #pragma pop /* 80C207C8-80C207CC 00003C 0004+00 0/2 0/0 0/0 .rodata @3741 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3741 = 100.0f; -COMPILER_STRIP_GATE(80C207C8, &lit_3741); +COMPILER_STRIP_GATE(0x80C207C8, &lit_3741); #pragma pop /* 80C1FA60-80C1FCCC 0000E0 026C+00 1/1 0/0 0/0 .text Check_RideOn__12daObjIce_l_cF4cXyz @@ -312,14 +312,14 @@ asm void daObjIce_l_c::setBaseMtx() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3843 = -1.0f; -COMPILER_STRIP_GATE(80C207CC, &lit_3843); +COMPILER_STRIP_GATE(0x80C207CC, &lit_3843); #pragma pop /* 80C207D0-80C207D4 000044 0004+00 0/1 0/0 0/0 .rodata @3844 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3844 = -6.0f; -COMPILER_STRIP_GATE(80C207D0, &lit_3844); +COMPILER_STRIP_GATE(0x80C207D0, &lit_3844); #pragma pop /* 80C1FD5C-80C20034 0003DC 02D8+00 1/1 0/0 0/0 .text @@ -386,28 +386,28 @@ static asm void daObjIce_l_Create(fopAc_ac_c* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3934 = 1.0f; -COMPILER_STRIP_GATE(80C207D4, &lit_3934); +COMPILER_STRIP_GATE(0x80C207D4, &lit_3934); #pragma pop /* 80C207D8-80C207DC 00004C 0004+00 0/2 0/0 0/0 .rodata @3935 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3935 = 300.0f; -COMPILER_STRIP_GATE(80C207D8, &lit_3935); +COMPILER_STRIP_GATE(0x80C207D8, &lit_3935); #pragma pop /* 80C207DC-80C207E0 000050 0004+00 0/1 0/0 0/0 .rodata @3936 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3936 = 32000.0f; -COMPILER_STRIP_GATE(80C207DC, &lit_3936); +COMPILER_STRIP_GATE(0x80C207DC, &lit_3936); #pragma pop /* 80C207E0-80C207E4 000054 0004+00 0/1 0/0 0/0 .rodata @3937 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3937 = 1000.0f; -COMPILER_STRIP_GATE(80C207E0, &lit_3937); +COMPILER_STRIP_GATE(0x80C207E0, &lit_3937); #pragma pop /* 80C207E4-80C207EC 000058 0004+04 0/1 0/0 0/0 .rodata @3938 */ @@ -418,7 +418,7 @@ SECTION_RODATA static f32 const lit_3938[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80C207E4, &lit_3938); +COMPILER_STRIP_GATE(0x80C207E4, &lit_3938); #pragma pop /* 80C207EC-80C207F4 000060 0008+00 0/1 0/0 0/0 .rodata @3940 */ @@ -427,7 +427,14 @@ COMPILER_STRIP_GATE(80C207E4, &lit_3938); SECTION_RODATA static u8 const lit_3940[8] = { 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C207EC, &lit_3940); +COMPILER_STRIP_GATE(0x80C207EC, &lit_3940); +#pragma pop + +/* 80C2081C-80C2081C 000090 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80C2081C = "V_Ice_l"; +SECTION_DEAD static char const* const stringBase_80C20824 = "Ice_l.dzb"; #pragma pop /* 80C20838-80C2083C -00001 0004+00 3/3 0/0 0/0 .data l_arcName */ @@ -479,6 +486,13 @@ asm void daObjIce_l_c::create() { } #pragma pop +/* ############################################################################################## */ +/* 80C2081C-80C2081C 000090 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80C2082E = "Ice_l.bmd"; +#pragma pop + /* 80C2030C-80C20384 00098C 0078+00 1/0 0/0 0/0 .text CreateHeap__12daObjIce_l_cFv */ #pragma push #pragma optimization_level 0 @@ -504,70 +518,70 @@ asm void daObjIce_l_c::Create() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3994 = 1.0f / 25.0f; -COMPILER_STRIP_GATE(80C207F4, &lit_3994); +COMPILER_STRIP_GATE(0x80C207F4, &lit_3994); #pragma pop /* 80C207F8-80C207FC 00006C 0004+00 0/1 0/0 0/0 .rodata @3995 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3995 = 848.0f; -COMPILER_STRIP_GATE(80C207F8, &lit_3995); +COMPILER_STRIP_GATE(0x80C207F8, &lit_3995); #pragma pop /* 80C207FC-80C20800 000070 0004+00 0/1 0/0 0/0 .rodata @3996 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3996 = 1.5f; -COMPILER_STRIP_GATE(80C207FC, &lit_3996); +COMPILER_STRIP_GATE(0x80C207FC, &lit_3996); #pragma pop /* 80C20800-80C20804 000074 0004+00 0/1 0/0 0/0 .rodata @3997 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3997 = 21.0f; -COMPILER_STRIP_GATE(80C20800, &lit_3997); +COMPILER_STRIP_GATE(0x80C20800, &lit_3997); #pragma pop /* 80C20804-80C20808 000078 0004+00 0/1 0/0 0/0 .rodata @3998 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3998 = 5.0f; -COMPILER_STRIP_GATE(80C20804, &lit_3998); +COMPILER_STRIP_GATE(0x80C20804, &lit_3998); #pragma pop /* 80C20808-80C2080C 00007C 0004+00 0/1 0/0 0/0 .rodata @3999 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3999 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(80C20808, &lit_3999); +COMPILER_STRIP_GATE(0x80C20808, &lit_3999); #pragma pop /* 80C2080C-80C20810 000080 0004+00 0/1 0/0 0/0 .rodata @4000 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4000 = 15.0f; -COMPILER_STRIP_GATE(80C2080C, &lit_4000); +COMPILER_STRIP_GATE(0x80C2080C, &lit_4000); #pragma pop /* 80C20810-80C20814 000084 0004+00 0/1 0/0 0/0 .rodata @4001 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4001 = 0.5f; -COMPILER_STRIP_GATE(80C20810, &lit_4001); +COMPILER_STRIP_GATE(0x80C20810, &lit_4001); #pragma pop /* 80C20814-80C20818 000088 0004+00 0/1 0/0 0/0 .rodata @4002 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4002 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(80C20814, &lit_4002); +COMPILER_STRIP_GATE(0x80C20814, &lit_4002); #pragma pop /* 80C20818-80C2081C 00008C 0004+00 0/1 0/0 0/0 .rodata @4003 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4003 = 1.0f / 20.0f; -COMPILER_STRIP_GATE(80C20818, &lit_4003); +COMPILER_STRIP_GATE(0x80C20818, &lit_4003); #pragma pop /* 80C203C4-80C206AC 000A44 02E8+00 1/0 0/0 0/0 .text Execute__12daObjIce_l_cFPPA3_A4_f @@ -601,11 +615,4 @@ asm void daObjIce_l_c::Delete() { } #pragma pop -/* 80C2081C-80C20838 000090 001C+00 3/2 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80C2081C = "V_Ice_l"; -SECTION_DEAD static char const* const stringBase_80C20824 = "Ice_l.dzb"; -SECTION_DEAD static char const* const stringBase_80C2082E = "Ice_l.bmd"; -#pragma pop +/* 80C2081C-80C2081C 000090 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_ice_s/d_a_obj_ice_s.cpp b/rel/d/a/obj/d_a_obj_ice_s/d_a_obj_ice_s.cpp index f4159276c61..43b4e862900 100644 --- a/rel/d/a/obj/d_a_obj_ice_s/d_a_obj_ice_s.cpp +++ b/rel/d/a/obj/d_a_obj_ice_s/d_a_obj_ice_s.cpp @@ -190,11 +190,17 @@ extern "C" void __register_global_object(); /* ############################################################################################## */ /* 80C21AF8-80C21AFC 000000 0004+00 6/6 0/0 0/0 .rodata @3644 */ SECTION_RODATA static f32 const lit_3644 = 5000.0f; -COMPILER_STRIP_GATE(80C21AF8, &lit_3644); +COMPILER_STRIP_GATE(0x80C21AF8, &lit_3644); /* 80C21AFC-80C21B00 000004 0004+00 1/1 0/0 0/0 .rodata @3645 */ SECTION_RODATA static f32 const lit_3645 = 20.0f; -COMPILER_STRIP_GATE(80C21AFC, &lit_3645); +COMPILER_STRIP_GATE(0x80C21AFC, &lit_3645); + +/* 80C21B8C-80C21B8C 000094 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80C21B8C = "V_Ice_s"; +#pragma pop /* 80C21BA8-80C21BAC -00001 0004+00 3/3 0/0 0/0 .data l_arcName */ SECTION_DATA static void* l_arcName = (void*)&d_a_obj_ice_s__stringBase0; @@ -267,14 +273,14 @@ SECTION_RODATA static u8 const lit_3686[4 + 4 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C21B00, &lit_3686); +COMPILER_STRIP_GATE(0x80C21B00, &lit_3686); #pragma pop /* 80C21B08-80C21B10 000010 0008+00 1/3 0/0 0/0 .rodata @3688 */ SECTION_RODATA static u8 const lit_3688[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C21B08, &lit_3688); +COMPILER_STRIP_GATE(0x80C21B08, &lit_3688); /* 80C209DC-80C20A44 00011C 0068+00 2/2 0/0 0/0 .text RideOn_Angle__12daObjIce_s_cFRsfsf */ @@ -294,7 +300,7 @@ asm void daObjIce_s_c::RideOn_Angle(s16& param_0, f32 param_1, s16 param_2, f32 SECTION_RODATA static u8 const lit_3746[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C21B10, &lit_3746); +COMPILER_STRIP_GATE(0x80C21B10, &lit_3746); #pragma pop /* 80C21B18-80C21B20 000020 0008+00 0/3 0/0 0/0 .rodata @3747 */ @@ -303,7 +309,7 @@ COMPILER_STRIP_GATE(80C21B10, &lit_3746); SECTION_RODATA static u8 const lit_3747[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C21B18, &lit_3747); +COMPILER_STRIP_GATE(0x80C21B18, &lit_3747); #pragma pop /* 80C21B20-80C21B28 000028 0008+00 0/3 0/0 0/0 .rodata @3748 */ @@ -312,35 +318,35 @@ COMPILER_STRIP_GATE(80C21B18, &lit_3747); SECTION_RODATA static u8 const lit_3748[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C21B20, &lit_3748); +COMPILER_STRIP_GATE(0x80C21B20, &lit_3748); #pragma pop /* 80C21B28-80C21B2C 000030 0004+00 0/3 0/0 0/0 .rodata @3749 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3749 = 1000.0f; -COMPILER_STRIP_GATE(80C21B28, &lit_3749); +COMPILER_STRIP_GATE(0x80C21B28, &lit_3749); #pragma pop /* 80C21B2C-80C21B30 000034 0004+00 0/1 0/0 0/0 .rodata @3750 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3750 = 98.0f; -COMPILER_STRIP_GATE(80C21B2C, &lit_3750); +COMPILER_STRIP_GATE(0x80C21B2C, &lit_3750); #pragma pop /* 80C21B30-80C21B34 000038 0004+00 0/1 0/0 0/0 .rodata @3751 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_3751 = 0x3C75C28F; -COMPILER_STRIP_GATE(80C21B30, &lit_3751); +COMPILER_STRIP_GATE(0x80C21B30, &lit_3751); #pragma pop /* 80C21B34-80C21B38 00003C 0004+00 0/2 0/0 0/0 .rodata @3752 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3752 = 100.0f; -COMPILER_STRIP_GATE(80C21B34, &lit_3752); +COMPILER_STRIP_GATE(0x80C21B34, &lit_3752); #pragma pop /* 80C20A44-80C20C98 000184 0254+00 1/1 0/0 0/0 .text Check_LinkRideOn__12daObjIce_s_cF4cXyz */ @@ -358,7 +364,7 @@ asm void daObjIce_s_c::Check_LinkRideOn(cXyz param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3801 = 1024.0f; -COMPILER_STRIP_GATE(80C21B38, &lit_3801); +COMPILER_STRIP_GATE(0x80C21B38, &lit_3801); #pragma pop /* 80C21C38-80C21C3C 000008 0004+00 2/2 0/0 0/0 .bss None */ @@ -406,28 +412,28 @@ asm void daObjIce_s_c::setBaseMtx() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3905 = -1.0f; -COMPILER_STRIP_GATE(80C21B3C, &lit_3905); +COMPILER_STRIP_GATE(0x80C21B3C, &lit_3905); #pragma pop /* 80C21B40-80C21B44 000048 0004+00 0/1 0/0 0/0 .rodata @3906 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3906 = -13.0f / 10.0f; -COMPILER_STRIP_GATE(80C21B40, &lit_3906); +COMPILER_STRIP_GATE(0x80C21B40, &lit_3906); #pragma pop /* 80C21B44-80C21B48 00004C 0004+00 0/1 0/0 0/0 .rodata @3907 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3907 = 600.0f; -COMPILER_STRIP_GATE(80C21B44, &lit_3907); +COMPILER_STRIP_GATE(0x80C21B44, &lit_3907); #pragma pop /* 80C21B48-80C21B4C 000050 0004+00 0/1 0/0 0/0 .rodata @3908 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3908 = -11.0f; -COMPILER_STRIP_GATE(80C21B48, &lit_3908); +COMPILER_STRIP_GATE(0x80C21B48, &lit_3908); #pragma pop /* 80C20F48-80C21234 000688 02EC+00 1/1 0/0 0/0 .text @@ -494,35 +500,35 @@ static asm void daObjIce_s_Create(fopAc_ac_c* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4000 = 500.0f; -COMPILER_STRIP_GATE(80C21B4C, &lit_4000); +COMPILER_STRIP_GATE(0x80C21B4C, &lit_4000); #pragma pop /* 80C21B50-80C21B54 000058 0004+00 0/1 0/0 0/0 .rodata @4001 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4001 = 3.0f; -COMPILER_STRIP_GATE(80C21B50, &lit_4001); +COMPILER_STRIP_GATE(0x80C21B50, &lit_4001); #pragma pop /* 80C21B54-80C21B58 00005C 0004+00 0/1 0/0 0/0 .rodata @4002 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4002 = 1.0f; -COMPILER_STRIP_GATE(80C21B54, &lit_4002); +COMPILER_STRIP_GATE(0x80C21B54, &lit_4002); #pragma pop /* 80C21B58-80C21B5C 000060 0004+00 0/1 0/0 0/0 .rodata @4003 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4003 = 32000.0f; -COMPILER_STRIP_GATE(80C21B58, &lit_4003); +COMPILER_STRIP_GATE(0x80C21B58, &lit_4003); #pragma pop /* 80C21B5C-80C21B60 000064 0004+00 0/2 0/0 0/0 .rodata @4004 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4004 = 300.0f; -COMPILER_STRIP_GATE(80C21B5C, &lit_4004); +COMPILER_STRIP_GATE(0x80C21B5C, &lit_4004); #pragma pop /* 80C21B60-80C21B68 000068 0008+00 0/1 0/0 0/0 .rodata @4006 */ @@ -531,7 +537,13 @@ COMPILER_STRIP_GATE(80C21B5C, &lit_4004); SECTION_RODATA static u8 const lit_4006[8] = { 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C21B60, &lit_4006); +COMPILER_STRIP_GATE(0x80C21B60, &lit_4006); +#pragma pop + +/* 80C21B8C-80C21B8C 000094 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80C21B94 = "Ice_s.dzb"; #pragma pop /* 80C212CC-80C2157C 000A0C 02B0+00 1/1 0/0 0/0 .text create__12daObjIce_s_cFv */ @@ -544,6 +556,13 @@ asm void daObjIce_s_c::create() { } #pragma pop +/* ############################################################################################## */ +/* 80C21B8C-80C21B8C 000094 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80C21B9E = "Ice_s.bmd"; +#pragma pop + /* 80C2157C-80C215F4 000CBC 0078+00 1/0 0/0 0/0 .text CreateHeap__12daObjIce_s_cFv */ #pragma push #pragma optimization_level 0 @@ -569,63 +588,63 @@ asm void daObjIce_s_c::Create() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4060 = 1.0f / 25.0f; -COMPILER_STRIP_GATE(80C21B68, &lit_4060); +COMPILER_STRIP_GATE(0x80C21B68, &lit_4060); #pragma pop /* 80C21B6C-80C21B70 000074 0004+00 0/1 0/0 0/0 .rodata @4061 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4061 = 848.0f; -COMPILER_STRIP_GATE(80C21B6C, &lit_4061); +COMPILER_STRIP_GATE(0x80C21B6C, &lit_4061); #pragma pop /* 80C21B70-80C21B74 000078 0004+00 0/1 0/0 0/0 .rodata @4062 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4062 = 9.0f / 5.0f; -COMPILER_STRIP_GATE(80C21B70, &lit_4062); +COMPILER_STRIP_GATE(0x80C21B70, &lit_4062); #pragma pop /* 80C21B74-80C21B78 00007C 0004+00 0/1 0/0 0/0 .rodata @4063 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4063 = 6.0f; -COMPILER_STRIP_GATE(80C21B74, &lit_4063); +COMPILER_STRIP_GATE(0x80C21B74, &lit_4063); #pragma pop /* 80C21B78-80C21B7C 000080 0004+00 0/1 0/0 0/0 .rodata @4064 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4064 = 5.0f; -COMPILER_STRIP_GATE(80C21B78, &lit_4064); +COMPILER_STRIP_GATE(0x80C21B78, &lit_4064); #pragma pop /* 80C21B7C-80C21B80 000084 0004+00 0/1 0/0 0/0 .rodata @4065 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4065 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(80C21B7C, &lit_4065); +COMPILER_STRIP_GATE(0x80C21B7C, &lit_4065); #pragma pop /* 80C21B80-80C21B84 000088 0004+00 0/1 0/0 0/0 .rodata @4066 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4066 = 0.5f; -COMPILER_STRIP_GATE(80C21B80, &lit_4066); +COMPILER_STRIP_GATE(0x80C21B80, &lit_4066); #pragma pop /* 80C21B84-80C21B88 00008C 0004+00 0/1 0/0 0/0 .rodata @4067 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4067 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(80C21B84, &lit_4067); +COMPILER_STRIP_GATE(0x80C21B84, &lit_4067); #pragma pop /* 80C21B88-80C21B8C 000090 0004+00 0/1 0/0 0/0 .rodata @4068 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4068 = 1.0f / 20.0f; -COMPILER_STRIP_GATE(80C21B88, &lit_4068); +COMPILER_STRIP_GATE(0x80C21B88, &lit_4068); #pragma pop /* 80C21634-80C21964 000D74 0330+00 1/0 0/0 0/0 .text Execute__12daObjIce_s_cFPPA3_A4_f @@ -681,14 +700,7 @@ asm void __sinit_d_a_obj_ice_s_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80C21AA8 = (void*)__sinit_d_a_obj_ice_s_cpp; +REGISTER_CTORS(0x80C21AA8, __sinit_d_a_obj_ice_s_cpp); #pragma pop -/* 80C21B8C-80C21BA8 000094 001C+00 3/2 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80C21B8C = "V_Ice_s"; -SECTION_DEAD static char const* const stringBase_80C21B94 = "Ice_s.dzb"; -SECTION_DEAD static char const* const stringBase_80C21B9E = "Ice_s.bmd"; -#pragma pop +/* 80C21B8C-80C21B8C 000094 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock.cpp b/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock.cpp index 777cb8b3f4d..492c91035a1 100644 --- a/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock.cpp +++ b/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock.cpp @@ -103,10 +103,10 @@ struct dRes_control_c { struct dPa_levelEcallBack {}; -struct _GXColor {}; - struct csXyz {}; +struct _GXColor {}; + struct dPa_control_c { /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, @@ -523,13 +523,13 @@ SECTION_RODATA static u8 const l_dir_vec[48] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xBF, 0x80, 0x00, 0x00, 0xBF, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C242F4, &l_dir_vec); +COMPILER_STRIP_GATE(0x80C242F4, &l_dir_vec); /* 80C24324-80C2432C 000030 0008+00 1/3 0/0 0/0 .rodata l_dir_angle */ SECTION_RODATA static u8 const l_dir_angle[8] = { 0x00, 0x00, 0x40, 0x00, 0x80, 0x00, 0xC0, 0x00, }; -COMPILER_STRIP_GATE(80C24324, &l_dir_angle); +COMPILER_STRIP_GATE(0x80C24324, &l_dir_angle); /* 80C2432C-80C24370 000038 0044+00 0/1 0/0 0/0 .rodata l_cyl_src */ #pragma push @@ -541,7 +541,7 @@ SECTION_RODATA static u8 const l_cyl_src[68] = { 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x43, 0x34, 0x00, 0x00, 0x43, 0x91, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C2432C, &l_cyl_src); +COMPILER_STRIP_GATE(0x80C2432C, &l_cyl_src); #pragma pop /* 80C24370-80C24374 00007C 0004+00 2/5 0/0 0/0 .rodata @3936 */ @@ -551,7 +551,7 @@ SECTION_RODATA static u8 const lit_3936[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C24370, &lit_3936); +COMPILER_STRIP_GATE(0x80C24370, &lit_3936); /* 80C24374-80C2437C 000080 0008+00 0/1 0/0 0/0 .rodata @3937 */ #pragma push @@ -559,7 +559,7 @@ COMPILER_STRIP_GATE(80C24370, &lit_3936); SECTION_RODATA static u8 const lit_3937[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C24374, &lit_3937); +COMPILER_STRIP_GATE(0x80C24374, &lit_3937); #pragma pop /* 80C2437C-80C24384 000088 0008+00 0/1 0/0 0/0 .rodata @3938 */ @@ -568,7 +568,7 @@ COMPILER_STRIP_GATE(80C24374, &lit_3937); SECTION_RODATA static u8 const lit_3938[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C2437C, &lit_3938); +COMPILER_STRIP_GATE(0x80C2437C, &lit_3938); #pragma pop /* 80C24384-80C2438C 000090 0008+00 0/1 0/0 0/0 .rodata @3939 */ @@ -577,14 +577,14 @@ COMPILER_STRIP_GATE(80C2437C, &lit_3938); SECTION_RODATA static u8 const lit_3939[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C24384, &lit_3939); +COMPILER_STRIP_GATE(0x80C24384, &lit_3939); #pragma pop /* 80C2438C-80C24390 000098 0004+00 0/1 0/0 0/0 .rodata @3940 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3940 = 5.0f; -COMPILER_STRIP_GATE(80C2438C, &lit_3940); +COMPILER_STRIP_GATE(0x80C2438C, &lit_3940); #pragma pop /* 80C21FC8-80C22200 000368 0238+00 2/2 0/0 0/0 .text saveCurrentPos__13daObjIceBlk_cFv @@ -630,25 +630,33 @@ SECTION_RODATA static u8 const l_eff_id[4] = { 0x8A, 0xE2, }; -COMPILER_STRIP_GATE(80C24390, &l_eff_id); +COMPILER_STRIP_GATE(0x80C24390, &l_eff_id); #pragma pop /* 80C24394-80C24398 0000A0 0004+00 0/1 0/0 0/0 .rodata @4078 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4078 = 30.0f; -COMPILER_STRIP_GATE(80C24394, &lit_4078); +COMPILER_STRIP_GATE(0x80C24394, &lit_4078); #pragma pop /* 80C24398-80C2439C 0000A4 0004+00 2/3 0/0 0/0 .rodata @4079 */ SECTION_RODATA static f32 const lit_4079 = -6.0f; -COMPILER_STRIP_GATE(80C24398, &lit_4079); +COMPILER_STRIP_GATE(0x80C24398, &lit_4079); /* 80C2439C-80C243A0 0000A8 0004+00 0/5 0/0 0/0 .rodata @4080 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4080 = 1.0f; -COMPILER_STRIP_GATE(80C2439C, &lit_4080); +COMPILER_STRIP_GATE(0x80C2439C, &lit_4080); +#pragma pop + +/* 80C2449C-80C2449C 0001A8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80C2449C = "Y_icecube"; +SECTION_DEAD static char const* const stringBase_80C244A6 = + "氷ブロック：パスポイント数が多すぎます！\n"; #pragma pop /* 80C22298-80C22618 000638 0380+00 1/0 0/0 0/0 .text Create__13daObjIceBlk_cFv */ @@ -666,7 +674,7 @@ asm void daObjIceBlk_c::Create() { SECTION_RODATA static u8 const l_bmd[8] = { 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x08, }; -COMPILER_STRIP_GATE(80C243A0, &l_bmd); +COMPILER_STRIP_GATE(0x80C243A0, &l_bmd); /* 80C244D0-80C244DC 000000 000C+00 2/2 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { @@ -745,7 +753,7 @@ asm void daObjIceBlk_c::clrCounter() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4361 = -1.0f; -COMPILER_STRIP_GATE(80C243A8, &lit_4361); +COMPILER_STRIP_GATE(0x80C243A8, &lit_4361); #pragma pop /* 80C244F4-80C24500 -00001 000C+00 0/1 0/0 0/0 .data @4231 */ @@ -826,42 +834,42 @@ asm void daObjIceBlk_c::mode_init_walk() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4451 = 21.0f; -COMPILER_STRIP_GATE(80C243AC, &lit_4451); +COMPILER_STRIP_GATE(0x80C243AC, &lit_4451); #pragma pop /* 80C243B0-80C243B4 0000BC 0004+00 0/1 0/0 0/0 .rodata @4452 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4452 = 1.0f / 20.0f; -COMPILER_STRIP_GATE(80C243B0, &lit_4452); +COMPILER_STRIP_GATE(0x80C243B0, &lit_4452); #pragma pop /* 80C243B4-80C243B8 0000C0 0004+00 0/1 0/0 0/0 .rodata @4453 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4453 = 1.0f / 100.0f; -COMPILER_STRIP_GATE(80C243B4, &lit_4453); +COMPILER_STRIP_GATE(0x80C243B4, &lit_4453); #pragma pop /* 80C243B8-80C243BC 0000C4 0004+00 0/1 0/0 0/0 .rodata @4454 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4454 = 27.0f; -COMPILER_STRIP_GATE(80C243B8, &lit_4454); +COMPILER_STRIP_GATE(0x80C243B8, &lit_4454); #pragma pop /* 80C243BC-80C243C0 0000C8 0004+00 0/1 0/0 0/0 .rodata @4455 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4455 = 23.0f; -COMPILER_STRIP_GATE(80C243BC, &lit_4455); +COMPILER_STRIP_GATE(0x80C243BC, &lit_4455); #pragma pop /* 80C243C0-80C243C4 0000CC 0004+00 0/1 0/0 0/0 .rodata @4456 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4456 = 300.0f; -COMPILER_STRIP_GATE(80C243C0, &lit_4456); +COMPILER_STRIP_GATE(0x80C243C0, &lit_4456); #pragma pop /* 80C243C4-80C243CC 0000D0 0008+00 0/1 0/0 0/0 .rodata @4459 */ @@ -870,7 +878,7 @@ COMPILER_STRIP_GATE(80C243C0, &lit_4456); SECTION_RODATA static u8 const lit_4459[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C243C4, &lit_4459); +COMPILER_STRIP_GATE(0x80C243C4, &lit_4459); #pragma pop /* 80C23088-80C23388 001428 0300+00 1/0 0/0 0/0 .text mode_proc_walk__13daObjIceBlk_cFv @@ -894,7 +902,7 @@ SECTION_RODATA static u8 const l_eff_break_b[4] = { 0x86, 0x7A, }; -COMPILER_STRIP_GATE(80C243CC, &l_eff_break_b); +COMPILER_STRIP_GATE(0x80C243CC, &l_eff_break_b); #pragma pop /* 80C243D0-80C243D4 0000DC 0004+00 0/1 0/0 0/0 .rodata l_eff_break_id$4464 */ @@ -906,7 +914,7 @@ SECTION_RODATA static u8 const l_eff_break_id[4] = { 0x8A, 0xE0, }; -COMPILER_STRIP_GATE(80C243D0, &l_eff_break_id); +COMPILER_STRIP_GATE(0x80C243D0, &l_eff_break_id); #pragma pop /* 80C23388-80C2350C 001728 0184+00 1/1 0/0 0/0 .text setEffect__13daObjIceBlk_cFv */ @@ -929,21 +937,21 @@ SECTION_RODATA static u8 const l_check_offsetXY[60] = { 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x43, 0x11, 0x00, 0x00, 0x40, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x43, 0x16, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C243D4, &l_check_offsetXY); +COMPILER_STRIP_GATE(0x80C243D4, &l_check_offsetXY); #pragma pop /* 80C24410-80C24414 00011C 0004+00 0/1 0/0 0/0 .rodata @4571 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4571 = 150.0f; -COMPILER_STRIP_GATE(80C24410, &lit_4571); +COMPILER_STRIP_GATE(0x80C24410, &lit_4571); #pragma pop /* 80C24414-80C24418 000120 0004+00 0/1 0/0 0/0 .rodata @4572 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4572 = 155.0f; -COMPILER_STRIP_GATE(80C24414, &lit_4572); +COMPILER_STRIP_GATE(0x80C24414, &lit_4572); #pragma pop /* 80C2350C-80C236C8 0018AC 01BC+00 2/2 0/0 0/0 .text checkWallPre__13daObjIceBlk_cFs */ @@ -966,21 +974,21 @@ SECTION_RODATA static u8 const l_check_offsetXZ_4577[60] = { 0x00, 0x00, 0x43, 0x11, 0x00, 0x00, 0x43, 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC3, 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C24418, &l_check_offsetXZ_4577); +COMPILER_STRIP_GATE(0x80C24418, &l_check_offsetXZ_4577); #pragma pop /* 80C24454-80C24458 000160 0004+00 0/1 0/0 0/0 .rodata @4603 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4603 = -1000000000.0f; -COMPILER_STRIP_GATE(80C24454, &lit_4603); +COMPILER_STRIP_GATE(0x80C24454, &lit_4603); #pragma pop /* 80C24458-80C2445C 000164 0004+00 0/1 0/0 0/0 .rodata @4604 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4604 = 100.0f; -COMPILER_STRIP_GATE(80C24458, &lit_4604); +COMPILER_STRIP_GATE(0x80C24458, &lit_4604); #pragma pop /* 80C236C8-80C237B0 001A68 00E8+00 2/2 0/0 0/0 .text checkBgHit__13daObjIceBlk_cFv */ @@ -1021,11 +1029,11 @@ SECTION_RODATA static u8 const l_check_offsetXZ_4641[60] = { 0x00, 0x00, 0x43, 0x11, 0x00, 0x00, 0x43, 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC3, 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C2445C, &l_check_offsetXZ_4641); +COMPILER_STRIP_GATE(0x80C2445C, &l_check_offsetXZ_4641); /* 80C24498-80C2449C 0001A4 0004+00 1/1 0/0 0/0 .rodata @4696 */ SECTION_RODATA static f32 const lit_4696 = 50.0f; -COMPILER_STRIP_GATE(80C24498, &lit_4696); +COMPILER_STRIP_GATE(0x80C24498, &lit_4696); /* 80C24524-80C24530 -00001 000C+00 0/1 0/0 0/0 .data @4705 */ #pragma push @@ -1434,11 +1442,4 @@ static asm void func_80C242E4() { } #pragma pop -/* 80C2449C-80C244D0 0001A8 0034+00 2/1 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80C2449C = "Y_icecube"; -SECTION_DEAD static char const* const stringBase_80C244A6 = - "氷ブロック：パスポイント数が多すぎます！\n"; -#pragma pop +/* 80C2449C-80C2449C 0001A8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_iceleaf/d_a_obj_iceleaf.cpp b/rel/d/a/obj/d_a_obj_iceleaf/d_a_obj_iceleaf.cpp index 31b03bb5055..24d20732ddb 100644 --- a/rel/d/a/obj/d_a_obj_iceleaf/d_a_obj_iceleaf.cpp +++ b/rel/d/a/obj/d_a_obj_iceleaf/d_a_obj_iceleaf.cpp @@ -187,10 +187,10 @@ struct cCcD_GStts { /* 80C25D04 */ ~cCcD_GStts(); }; -struct Vec {}; - struct JAISoundID {}; +struct Vec {}; + struct Z2SeMgr { /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); }; @@ -360,11 +360,17 @@ SECTION_RODATA static u8 const lit_3703[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C25D64, &lit_3703); +COMPILER_STRIP_GATE(0x80C25D64, &lit_3703); /* 80C25D68-80C25D6C 000004 0004+00 1/1 0/0 0/0 .rodata @3704 */ SECTION_RODATA static f32 const lit_3704 = -9.0f; -COMPILER_STRIP_GATE(80C25D68, &lit_3704); +COMPILER_STRIP_GATE(0x80C25D68, &lit_3704); + +/* 80C25DA4-80C25DA4 000040 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80C25DA4 = "V_IceLeaf"; +#pragma pop /* 80C25DB0-80C25DBC 000000 000C+00 2/2 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { @@ -402,21 +408,21 @@ asm void daObjIceLeaf_c::setBaseMtx() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3757 = 30.0f; -COMPILER_STRIP_GATE(80C25D6C, &lit_3757); +COMPILER_STRIP_GATE(0x80C25D6C, &lit_3757); #pragma pop /* 80C25D70-80C25D74 00000C 0004+00 0/1 0/0 0/0 .rodata @3758 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3758 = 100.0f; -COMPILER_STRIP_GATE(80C25D70, &lit_3758); +COMPILER_STRIP_GATE(0x80C25D70, &lit_3758); #pragma pop /* 80C25D74-80C25D78 000010 0004+00 0/1 0/0 0/0 .rodata @3759 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3759 = 500.0f; -COMPILER_STRIP_GATE(80C25D74, &lit_3759); +COMPILER_STRIP_GATE(0x80C25D74, &lit_3759); #pragma pop /* 80C25DD4-80C25E18 000024 0044+00 1/1 0/0 0/0 .data l_cyl_src */ @@ -451,7 +457,7 @@ asm void daObjIceLeaf_c::setAnmPos() { /* ############################################################################################## */ /* 80C25D78-80C25D7C 000014 0004+00 4/5 0/0 0/0 .rodata @3806 */ SECTION_RODATA static f32 const lit_3806 = 1.0f; -COMPILER_STRIP_GATE(80C25D78, &lit_3806); +COMPILER_STRIP_GATE(0x80C25D78, &lit_3806); /* 80C25E18-80C25E24 -00001 000C+00 0/1 0/0 0/0 .data @3975 */ #pragma push @@ -737,7 +743,7 @@ asm void daObjIceLeaf_c::action() { SECTION_RODATA static u8 const lit_4030[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C25D7C, &lit_4030); +COMPILER_STRIP_GATE(0x80C25D7C, &lit_4030); #pragma pop /* 80C25D84-80C25D8C 000020 0008+00 0/1 0/0 0/0 .rodata @4031 */ @@ -746,7 +752,7 @@ COMPILER_STRIP_GATE(80C25D7C, &lit_4030); SECTION_RODATA static u8 const lit_4031[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C25D84, &lit_4031); +COMPILER_STRIP_GATE(0x80C25D84, &lit_4031); #pragma pop /* 80C25D8C-80C25D94 000028 0008+00 0/1 0/0 0/0 .rodata @4032 */ @@ -755,14 +761,14 @@ COMPILER_STRIP_GATE(80C25D84, &lit_4031); SECTION_RODATA static u8 const lit_4032[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C25D8C, &lit_4032); +COMPILER_STRIP_GATE(0x80C25D8C, &lit_4032); #pragma pop /* 80C25D94-80C25D98 000030 0004+00 0/1 0/0 0/0 .rodata @4033 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4033 = 250.0f; -COMPILER_STRIP_GATE(80C25D94, &lit_4033); +COMPILER_STRIP_GATE(0x80C25D94, &lit_4033); #pragma pop /* 80C2541C-80C25614 000D7C 01F8+00 1/0 0/0 0/0 .text modeDropWait__14daObjIceLeaf_cFv */ @@ -780,19 +786,19 @@ asm void daObjIceLeaf_c::modeDropWait() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4093 = 12.0f; -COMPILER_STRIP_GATE(80C25D98, &lit_4093); +COMPILER_STRIP_GATE(0x80C25D98, &lit_4093); #pragma pop /* 80C25D9C-80C25DA0 000038 0004+00 0/1 0/0 0/0 .rodata @4094 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4094 = 5.0f; -COMPILER_STRIP_GATE(80C25D9C, &lit_4094); +COMPILER_STRIP_GATE(0x80C25D9C, &lit_4094); #pragma pop /* 80C25DA0-80C25DA4 00003C 0004+00 1/2 0/0 0/0 .rodata @4095 */ SECTION_RODATA static f32 const lit_4095 = -1.0f; -COMPILER_STRIP_GATE(80C25DA0, &lit_4095); +COMPILER_STRIP_GATE(0x80C25DA0, &lit_4095); /* 80C25614-80C258F8 000F74 02E4+00 1/0 0/0 0/0 .text modeDrop__14daObjIceLeaf_cFv */ #pragma push @@ -961,9 +967,4 @@ static asm void func_80C25D54() { } #pragma pop -/* 80C25DA4-80C25DAE 000040 000A+00 1/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80C25DA4 = "V_IceLeaf"; -#pragma pop +/* 80C25DA4-80C25DA4 000040 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_ihasi/d_a_obj_ihasi.cpp b/rel/d/a/obj/d_a_obj_ihasi/d_a_obj_ihasi.cpp index 7a648224e28..f25d826761e 100644 --- a/rel/d/a/obj/d_a_obj_ihasi/d_a_obj_ihasi.cpp +++ b/rel/d/a/obj/d_a_obj_ihasi/d_a_obj_ihasi.cpp @@ -185,20 +185,20 @@ static void ih_disappear(obj_ihasi_class* param_0) { /* ############################################################################################## */ /* 80C26888-80C2688C 000000 0004+00 2/2 0/0 0/0 .rodata @3841 */ SECTION_RODATA static f32 const lit_3841 = 34800.0f; -COMPILER_STRIP_GATE(80C26888, &lit_3841); +COMPILER_STRIP_GATE(0x80C26888, &lit_3841); /* 80C2688C-80C26890 000004 0004+00 0/2 0/0 0/0 .rodata @3842 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3842 = -300.0f; -COMPILER_STRIP_GATE(80C2688C, &lit_3842); +COMPILER_STRIP_GATE(0x80C2688C, &lit_3842); #pragma pop /* 80C26890-80C26894 000008 0004+00 0/2 0/0 0/0 .rodata @3843 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3843 = -26735.0f; -COMPILER_STRIP_GATE(80C26890, &lit_3843); +COMPILER_STRIP_GATE(0x80C26890, &lit_3843); #pragma pop /* 80C26124-80C26204 000184 00E0+00 1/1 0/0 0/0 .text action__FP15obj_ihasi_class */ @@ -226,6 +226,13 @@ static bool daObj_Ihasi_IsDelete(obj_ihasi_class* param_0) { return true; } +/* ############################################################################################## */ +/* 80C268C4-80C268C4 00003C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80C268C4 = "Obj_ihasi"; +#pragma pop + /* 80C262CC-80C26324 00032C 0058+00 1/0 0/0 0/0 .text daObj_Ihasi_Delete__FP15obj_ihasi_class */ #pragma push #pragma optimization_level 0 @@ -239,7 +246,7 @@ static asm void daObj_Ihasi_Delete(obj_ihasi_class* param_0) { /* ############################################################################################## */ /* 80C26894-80C26898 00000C 0004+00 1/1 0/0 0/0 .rodata @3922 */ SECTION_RODATA static f32 const lit_3922 = 1.0f; -COMPILER_STRIP_GATE(80C26894, &lit_3922); +COMPILER_STRIP_GATE(0x80C26894, &lit_3922); /* 80C268D8-80C268F8 -00001 0020+00 1/0 0/0 0/0 .data l_daObj_Ihasi_Method */ SECTION_DATA static void* l_daObj_Ihasi_Method[8] = { @@ -295,77 +302,83 @@ asm J3DFrameCtrl::~J3DFrameCtrl() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4021 = 34750.0f; -COMPILER_STRIP_GATE(80C26898, &lit_4021); +COMPILER_STRIP_GATE(0x80C26898, &lit_4021); #pragma pop /* 80C2689C-80C268A0 000014 0004+00 0/1 0/0 0/0 .rodata @4022 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4022 = -44000.0f; -COMPILER_STRIP_GATE(80C2689C, &lit_4022); +COMPILER_STRIP_GATE(0x80C2689C, &lit_4022); #pragma pop /* 80C268A0-80C268A4 000018 0004+00 0/1 0/0 0/0 .rodata @4023 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4023 = 35250.0f; -COMPILER_STRIP_GATE(80C268A0, &lit_4023); +COMPILER_STRIP_GATE(0x80C268A0, &lit_4023); #pragma pop /* 80C268A4-80C268A8 00001C 0004+00 0/1 0/0 0/0 .rodata @4024 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4024 = -43500.0f; -COMPILER_STRIP_GATE(80C268A4, &lit_4024); +COMPILER_STRIP_GATE(0x80C268A4, &lit_4024); #pragma pop /* 80C268A8-80C268AC 000020 0004+00 0/1 0/0 0/0 .rodata @4025 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4025 = 34250.0f; -COMPILER_STRIP_GATE(80C268A8, &lit_4025); +COMPILER_STRIP_GATE(0x80C268A8, &lit_4025); #pragma pop /* 80C268AC-80C268B0 000024 0004+00 0/1 0/0 0/0 .rodata @4026 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4026 = 65536.0f; -COMPILER_STRIP_GATE(80C268AC, &lit_4026); +COMPILER_STRIP_GATE(0x80C268AC, &lit_4026); #pragma pop /* 80C268B0-80C268B4 000028 0004+00 0/1 0/0 0/0 .rodata @4027 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4027 = 5700.0f; -COMPILER_STRIP_GATE(80C268B0, &lit_4027); +COMPILER_STRIP_GATE(0x80C268B0, &lit_4027); #pragma pop /* 80C268B4-80C268B8 00002C 0004+00 0/1 0/0 0/0 .rodata @4028 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4028 = -30340.0f; -COMPILER_STRIP_GATE(80C268B4, &lit_4028); +COMPILER_STRIP_GATE(0x80C268B4, &lit_4028); #pragma pop /* 80C268B8-80C268BC 000030 0004+00 0/1 0/0 0/0 .rodata @4029 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4029 = 35087.0f; -COMPILER_STRIP_GATE(80C268B8, &lit_4029); +COMPILER_STRIP_GATE(0x80C268B8, &lit_4029); #pragma pop /* 80C268BC-80C268C0 000034 0004+00 0/1 0/0 0/0 .rodata @4030 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4030 = -29879.0f; -COMPILER_STRIP_GATE(80C268BC, &lit_4030); +COMPILER_STRIP_GATE(0x80C268BC, &lit_4030); #pragma pop /* 80C268C0-80C268C4 000038 0004+00 0/1 0/0 0/0 .rodata @4031 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4031 = 34500.0f; -COMPILER_STRIP_GATE(80C268C0, &lit_4031); +COMPILER_STRIP_GATE(0x80C268C0, &lit_4031); +#pragma pop + +/* 80C268C4-80C268C4 00003C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80C268CE = "F_SP121"; #pragma pop /* 80C26540-80C26880 0005A0 0340+00 1/0 0/0 0/0 .text daObj_Ihasi_Create__FP10fopAc_ac_c @@ -379,10 +392,4 @@ static asm void daObj_Ihasi_Create(fopAc_ac_c* param_0) { } #pragma pop -/* 80C268C4-80C268D6 00003C 0012+00 3/3 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80C268C4 = "Obj_ihasi"; -SECTION_DEAD static char const* const stringBase_80C268CE = "F_SP121"; -#pragma pop +/* 80C268C4-80C268C4 00003C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_ikada/d_a_obj_ikada.cpp b/rel/d/a/obj/d_a_obj_ikada/d_a_obj_ikada.cpp index c9a528089a9..7d1b9264351 100644 --- a/rel/d/a/obj/d_a_obj_ikada/d_a_obj_ikada.cpp +++ b/rel/d/a/obj/d_a_obj_ikada/d_a_obj_ikada.cpp @@ -209,13 +209,13 @@ SECTION_RODATA static u8 const lit_3668[4 + 4 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C274F0, &lit_3668); +COMPILER_STRIP_GATE(0x80C274F0, &lit_3668); /* 80C274F8-80C27500 000008 0008+00 1/3 0/0 0/0 .rodata @3670 */ SECTION_RODATA static u8 const lit_3670[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C274F8, &lit_3670); +COMPILER_STRIP_GATE(0x80C274F8, &lit_3670); /* 80C269B8-80C26A20 000078 0068+00 1/1 0/0 0/0 .text RideOn_Angle__12daObjIkada_cFRsfsf */ @@ -235,7 +235,7 @@ asm void daObjIkada_c::RideOn_Angle(s16& param_0, f32 param_1, s16 param_2, f32 SECTION_RODATA static u8 const lit_3725[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C27500, &lit_3725); +COMPILER_STRIP_GATE(0x80C27500, &lit_3725); #pragma pop /* 80C27508-80C27510 000018 0008+00 0/1 0/0 0/0 .rodata @3726 */ @@ -244,7 +244,7 @@ COMPILER_STRIP_GATE(80C27500, &lit_3725); SECTION_RODATA static u8 const lit_3726[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C27508, &lit_3726); +COMPILER_STRIP_GATE(0x80C27508, &lit_3726); #pragma pop /* 80C27510-80C27518 000020 0008+00 0/1 0/0 0/0 .rodata @3727 */ @@ -253,35 +253,35 @@ COMPILER_STRIP_GATE(80C27508, &lit_3726); SECTION_RODATA static u8 const lit_3727[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C27510, &lit_3727); +COMPILER_STRIP_GATE(0x80C27510, &lit_3727); #pragma pop /* 80C27518-80C2751C 000028 0004+00 0/2 0/0 0/0 .rodata @3728 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3728 = 250.0f; -COMPILER_STRIP_GATE(80C27518, &lit_3728); +COMPILER_STRIP_GATE(0x80C27518, &lit_3728); #pragma pop /* 80C2751C-80C27520 00002C 0004+00 0/3 0/0 0/0 .rodata @3729 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3729 = 300.0f; -COMPILER_STRIP_GATE(80C2751C, &lit_3729); +COMPILER_STRIP_GATE(0x80C2751C, &lit_3729); #pragma pop /* 80C27520-80C27524 000030 0004+00 0/2 0/0 0/0 .rodata @3730 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3730 = 1.0f / 20.0f; -COMPILER_STRIP_GATE(80C27520, &lit_3730); +COMPILER_STRIP_GATE(0x80C27520, &lit_3730); #pragma pop /* 80C27524-80C27528 000034 0004+00 0/3 0/0 0/0 .rodata @3731 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3731 = 100.0f; -COMPILER_STRIP_GATE(80C27524, &lit_3731); +COMPILER_STRIP_GATE(0x80C27524, &lit_3731); #pragma pop /* 80C26A20-80C26C50 0000E0 0230+00 1/1 0/0 0/0 .text Check_RideOn__12daObjIkada_cFv */ @@ -317,11 +317,11 @@ asm void daObjIkada_c::setBaseMtx() { /* ############################################################################################## */ /* 80C27528-80C2752C 000038 0004+00 1/1 0/0 0/0 .rodata @3767 */ SECTION_RODATA static f32 const lit_3767 = -1.0f; -COMPILER_STRIP_GATE(80C27528, &lit_3767); +COMPILER_STRIP_GATE(0x80C27528, &lit_3767); /* 80C2752C-80C27530 00003C 0004+00 1/1 0/0 0/0 .rodata @3768 */ SECTION_RODATA static f32 const lit_3768 = -6.0f; -COMPILER_STRIP_GATE(80C2752C, &lit_3768); +COMPILER_STRIP_GATE(0x80C2752C, &lit_3768); /* 80C26CD8-80C26D3C 000398 0064+00 1/1 0/0 0/0 .text * rideCallBack__FP4dBgWP10fopAc_ac_cP10fopAc_ac_c */ @@ -376,42 +376,49 @@ static asm void daObjIkada_Delete(daObjIkada_c* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3846 = 200.0f; -COMPILER_STRIP_GATE(80C27530, &lit_3846); +COMPILER_STRIP_GATE(0x80C27530, &lit_3846); #pragma pop /* 80C27534-80C27538 000044 0004+00 0/1 0/0 0/0 .rodata @3847 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3847 = 32000.0f; -COMPILER_STRIP_GATE(80C27534, &lit_3847); +COMPILER_STRIP_GATE(0x80C27534, &lit_3847); #pragma pop /* 80C27538-80C2753C 000048 0004+00 0/1 0/0 0/0 .rodata @3848 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3848 = -250.0f; -COMPILER_STRIP_GATE(80C27538, &lit_3848); +COMPILER_STRIP_GATE(0x80C27538, &lit_3848); #pragma pop /* 80C2753C-80C27540 00004C 0004+00 0/1 0/0 0/0 .rodata @3849 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3849 = -50.0f; -COMPILER_STRIP_GATE(80C2753C, &lit_3849); +COMPILER_STRIP_GATE(0x80C2753C, &lit_3849); #pragma pop /* 80C27540-80C27544 000050 0004+00 0/1 0/0 0/0 .rodata @3850 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3850 = -300.0f; -COMPILER_STRIP_GATE(80C27540, &lit_3850); +COMPILER_STRIP_GATE(0x80C27540, &lit_3850); #pragma pop /* 80C27544-80C27548 000054 0004+00 0/1 0/0 0/0 .rodata @3851 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3851 = 50.0f; -COMPILER_STRIP_GATE(80C27544, &lit_3851); +COMPILER_STRIP_GATE(0x80C27544, &lit_3851); +#pragma pop + +/* 80C27564-80C27564 000074 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80C27564 = "M_Ikada"; +SECTION_DEAD static char const* const stringBase_80C2756C = "M_Ikada.dzb"; #pragma pop /* 80C27584-80C27588 -00001 0004+00 3/3 0/0 0/0 .data l_arcName */ @@ -487,6 +494,13 @@ asm dBgS_ObjAcch::~dBgS_ObjAcch() { } #pragma pop +/* ############################################################################################## */ +/* 80C27564-80C27564 000074 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80C27578 = "M_Ikada.bmd"; +#pragma pop + /* 80C27028-80C270A0 0006E8 0078+00 1/0 0/0 0/0 .text CreateHeap__12daObjIkada_cFv */ #pragma push #pragma optimization_level 0 @@ -512,49 +526,49 @@ asm void daObjIkada_c::Create() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3912 = 848.0f; -COMPILER_STRIP_GATE(80C27548, &lit_3912); +COMPILER_STRIP_GATE(0x80C27548, &lit_3912); #pragma pop /* 80C2754C-80C27550 00005C 0004+00 0/1 0/0 0/0 .rodata @3913 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3913 = 2.0f; -COMPILER_STRIP_GATE(80C2754C, &lit_3913); +COMPILER_STRIP_GATE(0x80C2754C, &lit_3913); #pragma pop /* 80C27550-80C27554 000060 0004+00 0/1 0/0 0/0 .rodata @3914 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3914 = 11.0f; -COMPILER_STRIP_GATE(80C27550, &lit_3914); +COMPILER_STRIP_GATE(0x80C27550, &lit_3914); #pragma pop /* 80C27554-80C27558 000064 0004+00 0/1 0/0 0/0 .rodata @3915 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3915 = 5.0f; -COMPILER_STRIP_GATE(80C27554, &lit_3915); +COMPILER_STRIP_GATE(0x80C27554, &lit_3915); #pragma pop /* 80C27558-80C2755C 000068 0004+00 0/1 0/0 0/0 .rodata @3916 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3916 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(80C27558, &lit_3916); +COMPILER_STRIP_GATE(0x80C27558, &lit_3916); #pragma pop /* 80C2755C-80C27560 00006C 0004+00 0/1 0/0 0/0 .rodata @3917 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3917 = 15.0f; -COMPILER_STRIP_GATE(80C2755C, &lit_3917); +COMPILER_STRIP_GATE(0x80C2755C, &lit_3917); #pragma pop /* 80C27560-80C27564 000070 0004+00 0/1 0/0 0/0 .rodata @3918 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3918 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(80C27560, &lit_3918); +COMPILER_STRIP_GATE(0x80C27560, &lit_3918); #pragma pop /* 80C270E0-80C27400 0007A0 0320+00 1/0 0/0 0/0 .text Execute__12daObjIkada_cFPPA3_A4_f @@ -608,11 +622,4 @@ static asm void func_80C274E0() { } #pragma pop -/* 80C27564-80C27584 000074 0020+00 3/2 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80C27564 = "M_Ikada"; -SECTION_DEAD static char const* const stringBase_80C2756C = "M_Ikada.dzb"; -SECTION_DEAD static char const* const stringBase_80C27578 = "M_Ikada.bmd"; -#pragma pop +/* 80C27564-80C27564 000074 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_inobone/d_a_obj_inobone.cpp b/rel/d/a/obj/d_a_obj_inobone/d_a_obj_inobone.cpp index 66622ceb255..67e1fda76df 100644 --- a/rel/d/a/obj/d_a_obj_inobone/d_a_obj_inobone.cpp +++ b/rel/d/a/obj/d_a_obj_inobone/d_a_obj_inobone.cpp @@ -123,10 +123,10 @@ struct Z2SoundObjBase { /* 802BE4A4 */ void startCollisionSE(u32, u32, Z2SoundObjBase*); }; -struct Vec {}; - struct JAISoundID {}; +struct Vec {}; + struct Z2SeMgr { /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); }; @@ -263,7 +263,7 @@ SECTION_RODATA static u8 const l_cyl_src[68] = { 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x43, 0x0C, 0x00, 0x00, 0x42, 0x8C, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C28120, &l_cyl_src); +COMPILER_STRIP_GATE(0x80C28120, &l_cyl_src); /* 80C28164-80C281A8 000044 0044+00 0/1 0/0 0/0 .rodata l_cyl_src2 */ #pragma push @@ -275,16 +275,16 @@ SECTION_RODATA static u8 const l_cyl_src2[68] = { 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x43, 0x0C, 0x00, 0x00, 0x42, 0x8C, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C28164, &l_cyl_src2); +COMPILER_STRIP_GATE(0x80C28164, &l_cyl_src2); #pragma pop /* 80C281A8-80C281AC 000088 0004+00 1/2 0/0 0/0 .rodata @3693 */ SECTION_RODATA static f32 const lit_3693 = 100.0f; -COMPILER_STRIP_GATE(80C281A8, &lit_3693); +COMPILER_STRIP_GATE(0x80C281A8, &lit_3693); /* 80C281AC-80C281B0 00008C 0004+00 1/2 0/0 0/0 .rodata @3694 */ SECTION_RODATA static f32 const lit_3694 = 240.0f; -COMPILER_STRIP_GATE(80C281AC, &lit_3694); +COMPILER_STRIP_GATE(0x80C281AC, &lit_3694); /* 80C27780-80C27810 000140 0090+00 1/1 0/0 0/0 .text s_boar_sub__FPvPv */ #pragma push @@ -331,7 +331,7 @@ asm void daObjIBone_c::setBaseMtx() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3738 = 27.0f / 20.0f; -COMPILER_STRIP_GATE(80C281B0, &lit_3738); +COMPILER_STRIP_GATE(0x80C281B0, &lit_3738); #pragma pop /* 80C278CC-80C279A8 00028C 00DC+00 1/1 0/0 0/0 .text Create__12daObjIBone_cFv */ @@ -345,6 +345,13 @@ asm void daObjIBone_c::Create() { #pragma pop /* ############################################################################################## */ +/* 80C281C4-80C281C4 0000A4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80C281C4 = "Obj_Ibone"; +SECTION_DEAD static char const* const stringBase_80C281CE = "A_InoBone.bmd"; +#pragma pop + /* 80C281F8-80C281FC -00001 0004+00 3/3 0/0 0/0 .data l_arcName */ SECTION_DATA static void* l_arcName = (void*)&d_a_obj_inobone__stringBase0; @@ -438,7 +445,7 @@ SECTION_RODATA static u8 const lit_3926[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C281B4, &lit_3926); +COMPILER_STRIP_GATE(0x80C281B4, &lit_3926); #pragma pop /* 80C27C4C-80C27E48 00060C 01FC+00 1/1 0/0 0/0 .text execute__12daObjIBone_cFv */ @@ -462,21 +469,28 @@ SECTION_RODATA static u8 const particle_id[2 + 2 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C281B8, &particle_id); +COMPILER_STRIP_GATE(0x80C281B8, &particle_id); #pragma pop /* 80C281BC-80C281C0 00009C 0004+00 0/1 0/0 0/0 .rodata @3963 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3963 = 1.0f; -COMPILER_STRIP_GATE(80C281BC, &lit_3963); +COMPILER_STRIP_GATE(0x80C281BC, &lit_3963); #pragma pop /* 80C281C0-80C281C4 0000A0 0004+00 0/1 0/0 0/0 .rodata @3964 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3964 = -1.0f; -COMPILER_STRIP_GATE(80C281C0, &lit_3964); +COMPILER_STRIP_GATE(0x80C281C0, &lit_3964); +#pragma pop + +/* 80C281C4-80C281C4 0000A4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80C281DC = "BreakBoarBone.bmd"; +SECTION_DEAD static char const* const stringBase_80C281EE = "Always"; #pragma pop /* 80C27E48-80C27FEC 000808 01A4+00 1/1 0/0 0/0 .text setBreakEffect__12daObjIBone_cFv */ @@ -552,12 +566,4 @@ static asm void daObjIBone_Create(fopAc_ac_c* param_0) { } #pragma pop -/* 80C281C4-80C281F5 0000A4 0031+00 3/1 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80C281C4 = "Obj_Ibone"; -SECTION_DEAD static char const* const stringBase_80C281CE = "A_InoBone.bmd"; -SECTION_DEAD static char const* const stringBase_80C281DC = "BreakBoarBone.bmd"; -SECTION_DEAD static char const* const stringBase_80C281EE = "Always"; -#pragma pop +/* 80C281C4-80C281C4 0000A4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_ita/d_a_obj_ita.cpp b/rel/d/a/obj/d_a_obj_ita/d_a_obj_ita.cpp index e6229f6f7eb..086480805a6 100644 --- a/rel/d/a/obj/d_a_obj_ita/d_a_obj_ita.cpp +++ b/rel/d/a/obj/d_a_obj_ita/d_a_obj_ita.cpp @@ -117,10 +117,10 @@ struct dBgS_Acch { /* 80076AAC */ void CrrPos(dBgS&); }; -struct Vec {}; - struct JAISoundID {}; +struct Vec {}; + struct Z2SeMgr { /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); /* 802AC50C */ void seStartLevel(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); @@ -139,7 +139,7 @@ struct JMath { struct TSinCosTable {}; /* TSinCosTable<13, f32> */ struct TSinCosTable__template0 { - /* 80C291CC */ void func_80C291CC(s16) /* const */; + /* 80C291CC */ void func_80C291CC(void* _this, s16) /* const */; }; static u8 sincosTable_[65536]; @@ -170,7 +170,7 @@ extern "C" void Execute__10daObjIta_cFPPA3_A4_f(); extern "C" void Draw__10daObjIta_cFv(); extern "C" void Delete__10daObjIta_cFv(); extern "C" void __dt__15daObj_ITA_HIO_cFv(); -extern "C" void func_80C291CC(s16); +extern "C" void func_80C291CC(void* _this, s16); extern "C" void __sinit_d_a_obj_ita_cpp(); extern "C" static void func_80C29214(); extern "C" static void func_80C2921C(); @@ -251,27 +251,33 @@ extern "C" void __register_global_object(); /* ############################################################################################## */ /* 80C29238-80C2923C 000000 0004+00 5/5 0/0 0/0 .rodata @3649 */ SECTION_RODATA static f32 const lit_3649 = 600.0f; -COMPILER_STRIP_GATE(80C29238, &lit_3649); +COMPILER_STRIP_GATE(0x80C29238, &lit_3649); /* 80C2923C-80C29240 000004 0004+00 0/1 0/0 0/0 .rodata @3650 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3650 = -16.0f; -COMPILER_STRIP_GATE(80C2923C, &lit_3650); +COMPILER_STRIP_GATE(0x80C2923C, &lit_3650); #pragma pop /* 80C29240-80C29244 000008 0004+00 0/1 0/0 0/0 .rodata @3651 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3651 = 44.0f; -COMPILER_STRIP_GATE(80C29240, &lit_3651); +COMPILER_STRIP_GATE(0x80C29240, &lit_3651); #pragma pop /* 80C29244-80C29248 00000C 0004+00 0/1 0/0 0/0 .rodata @3652 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3652 = -9.0f; -COMPILER_STRIP_GATE(80C29244, &lit_3652); +COMPILER_STRIP_GATE(0x80C29244, &lit_3652); +#pragma pop + +/* 80C292E8-80C292E8 0000B0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80C292E8 = "M_Ita"; #pragma pop /* 80C29318-80C2931C -00001 0004+00 3/3 0/0 0/0 .data l_arcName */ @@ -356,7 +362,7 @@ SECTION_RODATA static u8 const lit_3674[4 + 4 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C29248, &lit_3674); +COMPILER_STRIP_GATE(0x80C29248, &lit_3674); /* 80C29250-80C29258 000018 0008+00 0/1 0/0 0/0 .rodata @3676 */ #pragma push @@ -364,7 +370,7 @@ COMPILER_STRIP_GATE(80C29248, &lit_3674); SECTION_RODATA static u8 const lit_3676[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C29250, &lit_3676); +COMPILER_STRIP_GATE(0x80C29250, &lit_3676); #pragma pop /* 80C29258-80C29260 000020 0006+02 0/1 0/0 0/0 .rodata @3694 */ @@ -381,112 +387,112 @@ SECTION_RODATA static u8 const lit_3694[6 + 2 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C29258, &lit_3694); +COMPILER_STRIP_GATE(0x80C29258, &lit_3694); #pragma pop /* 80C29260-80C29264 000028 0004+00 0/2 0/0 0/0 .rodata @3743 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3743 = 750.0f; -COMPILER_STRIP_GATE(80C29260, &lit_3743); +COMPILER_STRIP_GATE(0x80C29260, &lit_3743); #pragma pop /* 80C29264-80C29268 00002C 0004+00 0/2 0/0 0/0 .rodata @3744 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3744 = -750.0f; -COMPILER_STRIP_GATE(80C29264, &lit_3744); +COMPILER_STRIP_GATE(0x80C29264, &lit_3744); #pragma pop /* 80C29268-80C2926C 000030 0004+00 0/2 0/0 0/0 .rodata @3745 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3745 = 450.0f; -COMPILER_STRIP_GATE(80C29268, &lit_3745); +COMPILER_STRIP_GATE(0x80C29268, &lit_3745); #pragma pop /* 80C2926C-80C29270 000034 0004+00 0/2 0/0 0/0 .rodata @3746 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3746 = -450.0f; -COMPILER_STRIP_GATE(80C2926C, &lit_3746); +COMPILER_STRIP_GATE(0x80C2926C, &lit_3746); #pragma pop /* 80C29270-80C29274 000038 0004+00 0/1 0/0 0/0 .rodata @3747 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3747 = 256.0f; -COMPILER_STRIP_GATE(80C29270, &lit_3747); +COMPILER_STRIP_GATE(0x80C29270, &lit_3747); #pragma pop /* 80C29274-80C29278 00003C 0004+00 0/1 0/0 0/0 .rodata @3748 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3748 = 16.0f; -COMPILER_STRIP_GATE(80C29274, &lit_3748); +COMPILER_STRIP_GATE(0x80C29274, &lit_3748); #pragma pop /* 80C29278-80C2927C 000040 0004+00 0/1 0/0 0/0 .rodata @3749 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3749 = 31.0f; -COMPILER_STRIP_GATE(80C29278, &lit_3749); +COMPILER_STRIP_GATE(0x80C29278, &lit_3749); #pragma pop /* 80C2927C-80C29280 000044 0004+00 0/1 0/0 0/0 .rodata @3750 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3750 = -5.0f; -COMPILER_STRIP_GATE(80C2927C, &lit_3750); +COMPILER_STRIP_GATE(0x80C2927C, &lit_3750); #pragma pop /* 80C29280-80C29284 000048 0004+00 0/2 0/0 0/0 .rodata @3751 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3751 = 1.0f; -COMPILER_STRIP_GATE(80C29280, &lit_3751); +COMPILER_STRIP_GATE(0x80C29280, &lit_3751); #pragma pop /* 80C29284-80C29288 00004C 0004+00 0/3 0/0 0/0 .rodata @3752 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3752 = 300.0f; -COMPILER_STRIP_GATE(80C29284, &lit_3752); +COMPILER_STRIP_GATE(0x80C29284, &lit_3752); #pragma pop /* 80C29288-80C2928C 000050 0004+00 0/1 0/0 0/0 .rodata @3753 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3753 = 1900.0f; -COMPILER_STRIP_GATE(80C29288, &lit_3753); +COMPILER_STRIP_GATE(0x80C29288, &lit_3753); #pragma pop /* 80C2928C-80C29290 000054 0004+00 0/2 0/0 0/0 .rodata @3754 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3754 = -1.0f; -COMPILER_STRIP_GATE(80C2928C, &lit_3754); +COMPILER_STRIP_GATE(0x80C2928C, &lit_3754); #pragma pop /* 80C29290-80C29294 000058 0004+00 0/1 0/0 0/0 .rodata @3755 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3755 = -100.0f; -COMPILER_STRIP_GATE(80C29290, &lit_3755); +COMPILER_STRIP_GATE(0x80C29290, &lit_3755); #pragma pop /* 80C29294-80C29298 00005C 0004+00 0/1 0/0 0/0 .rodata @3756 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3756 = 0.5f; -COMPILER_STRIP_GATE(80C29294, &lit_3756); +COMPILER_STRIP_GATE(0x80C29294, &lit_3756); #pragma pop /* 80C29298-80C2929C 000060 0004+00 0/3 0/0 0/0 .rodata @3757 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3757 = 100.0f; -COMPILER_STRIP_GATE(80C29298, &lit_3757); +COMPILER_STRIP_GATE(0x80C29298, &lit_3757); #pragma pop /* 80C293D0-80C293DC 000008 000C+00 1/1 0/0 0/0 .bss @3644 */ @@ -517,28 +523,28 @@ asm void daObjIta_c::Search_Ymb() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3793 = 1000.0f; -COMPILER_STRIP_GATE(80C2929C, &lit_3793); +COMPILER_STRIP_GATE(0x80C2929C, &lit_3793); #pragma pop /* 80C292A0-80C292A4 000068 0004+00 0/1 0/0 0/0 .rodata @3794 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3794 = -1000.0f; -COMPILER_STRIP_GATE(80C292A0, &lit_3794); +COMPILER_STRIP_GATE(0x80C292A0, &lit_3794); #pragma pop /* 80C292A4-80C292A8 00006C 0004+00 0/1 0/0 0/0 .rodata @3795 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3795 = 700.0f; -COMPILER_STRIP_GATE(80C292A4, &lit_3795); +COMPILER_STRIP_GATE(0x80C292A4, &lit_3795); #pragma pop /* 80C292A8-80C292AC 000070 0004+00 0/1 0/0 0/0 .rodata @3796 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3796 = -700.0f; -COMPILER_STRIP_GATE(80C292A8, &lit_3796); +COMPILER_STRIP_GATE(0x80C292A8, &lit_3796); #pragma pop /* 80C28674-80C28788 0003F4 0114+00 1/1 0/0 0/0 .text Check_RideOn__10daObjIta_cFv */ @@ -574,7 +580,7 @@ asm void daObjIta_c::setBaseMtx() { /* ############################################################################################## */ /* 80C292AC-80C292B0 000074 0004+00 1/1 0/0 0/0 .rodata @3847 */ SECTION_RODATA static f32 const lit_3847 = 4.0f / 5.0f; -COMPILER_STRIP_GATE(80C292AC, &lit_3847); +COMPILER_STRIP_GATE(0x80C292AC, &lit_3847); /* 80C28838-80C28890 0005B8 0058+00 1/1 0/0 0/0 .text * rideCallBack__FP4dBgWP10fopAc_ac_cP10fopAc_ac_c */ @@ -638,21 +644,27 @@ static asm void daObjIta_Create(fopAc_ac_c* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3933 = 200.0f; -COMPILER_STRIP_GATE(80C292B0, &lit_3933); +COMPILER_STRIP_GATE(0x80C292B0, &lit_3933); #pragma pop /* 80C292B4-80C292B8 00007C 0004+00 0/1 0/0 0/0 .rodata @3934 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3934 = -50.0f; -COMPILER_STRIP_GATE(80C292B4, &lit_3934); +COMPILER_STRIP_GATE(0x80C292B4, &lit_3934); #pragma pop /* 80C292B8-80C292BC 000080 0004+00 0/1 0/0 0/0 .rodata @3935 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3935 = 50.0f; -COMPILER_STRIP_GATE(80C292B8, &lit_3935); +COMPILER_STRIP_GATE(0x80C292B8, &lit_3935); +#pragma pop + +/* 80C292E8-80C292E8 0000B0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80C292EE = "M_FloatingDust00.dzb"; #pragma pop /* 80C28928-80C28B40 0006A8 0218+00 1/1 0/0 0/0 .text create__10daObjIta_cFv */ @@ -675,6 +687,13 @@ asm dBgS_ObjAcch::~dBgS_ObjAcch() { } #pragma pop +/* ############################################################################################## */ +/* 80C292E8-80C292E8 0000B0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80C29303 = "M_FloatingDust00.bmd"; +#pragma pop + /* 80C28BB0-80C28C28 000930 0078+00 1/0 0/0 0/0 .text CreateHeap__10daObjIta_cFv */ #pragma push #pragma optimization_level 0 @@ -700,77 +719,77 @@ asm void daObjIta_c::Create() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4013 = 768.0f; -COMPILER_STRIP_GATE(80C292BC, &lit_4013); +COMPILER_STRIP_GATE(0x80C292BC, &lit_4013); #pragma pop /* 80C292C0-80C292C4 000088 0004+00 0/1 0/0 0/0 .rodata @4014 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4014 = 2.0f; -COMPILER_STRIP_GATE(80C292C0, &lit_4014); +COMPILER_STRIP_GATE(0x80C292C0, &lit_4014); #pragma pop /* 80C292C4-80C292C8 00008C 0004+00 0/1 0/0 0/0 .rodata @4015 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4015 = 40.0f; -COMPILER_STRIP_GATE(80C292C4, &lit_4015); +COMPILER_STRIP_GATE(0x80C292C4, &lit_4015); #pragma pop /* 80C292C8-80C292CC 000090 0004+00 0/1 0/0 0/0 .rodata @4016 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4016 = 60.0f; -COMPILER_STRIP_GATE(80C292C8, &lit_4016); +COMPILER_STRIP_GATE(0x80C292C8, &lit_4016); #pragma pop /* 80C292CC-80C292D0 000094 0004+00 0/1 0/0 0/0 .rodata @4017 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4017 = 5.0f; -COMPILER_STRIP_GATE(80C292CC, &lit_4017); +COMPILER_STRIP_GATE(0x80C292CC, &lit_4017); #pragma pop /* 80C292D0-80C292D4 000098 0004+00 0/1 0/0 0/0 .rodata @4018 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4018 = 20.0f; -COMPILER_STRIP_GATE(80C292D0, &lit_4018); +COMPILER_STRIP_GATE(0x80C292D0, &lit_4018); #pragma pop /* 80C292D4-80C292D8 00009C 0004+00 0/1 0/0 0/0 .rodata @4019 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4019 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(80C292D4, &lit_4019); +COMPILER_STRIP_GATE(0x80C292D4, &lit_4019); #pragma pop /* 80C292D8-80C292DC 0000A0 0004+00 0/1 0/0 0/0 .rodata @4020 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4020 = 15.0f; -COMPILER_STRIP_GATE(80C292D8, &lit_4020); +COMPILER_STRIP_GATE(0x80C292D8, &lit_4020); #pragma pop /* 80C292DC-80C292E0 0000A4 0004+00 0/1 0/0 0/0 .rodata @4021 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4021 = 1.0f / 20.0f; -COMPILER_STRIP_GATE(80C292DC, &lit_4021); +COMPILER_STRIP_GATE(0x80C292DC, &lit_4021); #pragma pop /* 80C292E0-80C292E4 0000A8 0004+00 0/1 0/0 0/0 .rodata @4022 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4022 = 10.0f; -COMPILER_STRIP_GATE(80C292E0, &lit_4022); +COMPILER_STRIP_GATE(0x80C292E0, &lit_4022); #pragma pop /* 80C292E4-80C292E8 0000AC 0004+00 0/1 0/0 0/0 .rodata @4023 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4023 = 1.0f / 100.0f; -COMPILER_STRIP_GATE(80C292E4, &lit_4023); +COMPILER_STRIP_GATE(0x80C292E4, &lit_4023); #pragma pop /* 80C28C70-80C290AC 0009F0 043C+00 1/0 0/0 0/0 .text Execute__10daObjIta_cFPPA3_A4_f */ @@ -817,7 +836,7 @@ asm daObj_ITA_HIO_c::~daObj_ITA_HIO_c() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80C291CC(s16 param_0) /* const */ { +extern "C" asm void func_80C291CC(void* _this, s16 param_0) /* const */ { nofralloc #include "asm/rel/d/a/obj/d_a_obj_ita/d_a_obj_ita/func_80C291CC.s" } @@ -835,7 +854,7 @@ asm void __sinit_d_a_obj_ita_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80C291D8 = (void*)__sinit_d_a_obj_ita_cpp; +REGISTER_CTORS(0x80C291D8, __sinit_d_a_obj_ita_cpp); #pragma pop /* 80C29214-80C2921C 000F94 0008+00 1/0 0/0 0/0 .text @36@__dt__12dBgS_ObjAcchFv */ @@ -858,11 +877,4 @@ static asm void func_80C2921C() { } #pragma pop -/* 80C292E8-80C29318 0000B0 0030+00 3/2 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80C292E8 = "M_Ita"; -SECTION_DEAD static char const* const stringBase_80C292EE = "M_FloatingDust00.dzb"; -SECTION_DEAD static char const* const stringBase_80C29303 = "M_FloatingDust00.bmd"; -#pragma pop +/* 80C292E8-80C292E8 0000B0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_itamato/d_a_obj_itamato.cpp b/rel/d/a/obj/d_a_obj_itamato/d_a_obj_itamato.cpp index d3e3883d8d7..01c83cd044c 100644 --- a/rel/d/a/obj/d_a_obj_itamato/d_a_obj_itamato.cpp +++ b/rel/d/a/obj/d_a_obj_itamato/d_a_obj_itamato.cpp @@ -203,10 +203,10 @@ struct cBgS_GndChk { struct _GXTexObj {}; -struct Vec {}; - struct JAISoundID {}; +struct Vec {}; + struct Z2SeMgr { /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); }; @@ -362,6 +362,12 @@ extern "C" void __register_global_object(); // /* ############################################################################################## */ +/* 80C2AC20-80C2AC20 0000B0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80C2AC20 = "H_ItaMato"; +#pragma pop + /* 80C2AC34-80C2AC74 000000 0040+00 2/2 0/0 0/0 .data l_ccDSph */ SECTION_DATA static u8 l_ccDSph[64] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -483,7 +489,7 @@ SECTION_RODATA u8 const daObj_ItaMato_Param_c::m[20] = { 0x42, 0xDC, 0x00, 0x00, 0xC0, 0x40, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x43, 0xC8, 0x00, 0x00, 0x41, 0xA0, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C2AB70, &daObj_ItaMato_Param_c::m); +COMPILER_STRIP_GATE(0x80C2AB70, &daObj_ItaMato_Param_c::m); /* 80C2AB84-80C2ABB4 000014 0030+00 1/1 0/0 0/0 .rodata l_ccDObjData */ SECTION_RODATA static u8 const l_ccDObjData[48] = { @@ -491,34 +497,40 @@ SECTION_RODATA static u8 const l_ccDObjData[48] = { 0xD8, 0xFB, 0xFD, 0xFF, 0x00, 0x00, 0x00, 0x1F, 0x00, 0x00, 0x00, 0x79, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C2AB84, &l_ccDObjData); +COMPILER_STRIP_GATE(0x80C2AB84, &l_ccDObjData); /* 80C2ABB4-80C2ABB8 000044 0004+00 0/1 0/0 0/0 .rodata @3982 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3982 = -200.0f; -COMPILER_STRIP_GATE(80C2ABB4, &lit_3982); +COMPILER_STRIP_GATE(0x80C2ABB4, &lit_3982); #pragma pop /* 80C2ABB8-80C2ABBC 000048 0004+00 0/1 0/0 0/0 .rodata @3983 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3983 = -50.0f; -COMPILER_STRIP_GATE(80C2ABB8, &lit_3983); +COMPILER_STRIP_GATE(0x80C2ABB8, &lit_3983); #pragma pop /* 80C2ABBC-80C2ABC0 00004C 0004+00 0/1 0/0 0/0 .rodata @3984 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3984 = 200.0f; -COMPILER_STRIP_GATE(80C2ABBC, &lit_3984); +COMPILER_STRIP_GATE(0x80C2ABBC, &lit_3984); #pragma pop /* 80C2ABC0-80C2ABC4 000050 0004+00 0/3 0/0 0/0 .rodata @3985 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3985 = -1000000000.0f; -COMPILER_STRIP_GATE(80C2ABC0, &lit_3985); +COMPILER_STRIP_GATE(0x80C2ABC0, &lit_3985); +#pragma pop + +/* 80C2AC20-80C2AC20 0000B0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80C2AC2A = "F_SP103"; #pragma pop /* 80C2971C-80C29AC0 00031C 03A4+00 1/1 0/0 0/0 .text create__15daObj_ItaMato_cFv */ @@ -619,13 +631,13 @@ asm void daObj_ItaMato_c::Delete() { /* ############################################################################################## */ /* 80C2ABC4-80C2ABC8 000054 0004+00 1/4 0/0 0/0 .rodata @4317 */ SECTION_RODATA static f32 const lit_4317 = 1.0f; -COMPILER_STRIP_GATE(80C2ABC4, &lit_4317); +COMPILER_STRIP_GATE(0x80C2ABC4, &lit_4317); /* 80C2ABC8-80C2ABCC 000058 0004+00 0/1 0/0 0/0 .rodata @4318 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4318 = -1.0f; -COMPILER_STRIP_GATE(80C2ABC8, &lit_4318); +COMPILER_STRIP_GATE(0x80C2ABC8, &lit_4318); #pragma pop /* 80C2ABCC-80C2ABD0 00005C 0004+00 0/1 0/0 0/0 .rodata @4319 */ @@ -637,70 +649,70 @@ SECTION_RODATA static u8 const lit_4319[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C2ABCC, &lit_4319); +COMPILER_STRIP_GATE(0x80C2ABCC, &lit_4319); #pragma pop /* 80C2ABD0-80C2ABD4 000060 0004+00 0/1 0/0 0/0 .rodata @4320 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4320 = 3.0f / 40.0f; -COMPILER_STRIP_GATE(80C2ABD0, &lit_4320); +COMPILER_STRIP_GATE(0x80C2ABD0, &lit_4320); #pragma pop /* 80C2ABD4-80C2ABD8 000064 0004+00 0/1 0/0 0/0 .rodata @4321 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4321 = 50.0f; -COMPILER_STRIP_GATE(80C2ABD4, &lit_4321); +COMPILER_STRIP_GATE(0x80C2ABD4, &lit_4321); #pragma pop /* 80C2ABD8-80C2ABDC 000068 0004+00 0/1 0/0 0/0 .rodata @4322 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4322 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(80C2ABD8, &lit_4322); +COMPILER_STRIP_GATE(0x80C2ABD8, &lit_4322); #pragma pop /* 80C2ABDC-80C2ABE0 00006C 0004+00 0/1 0/0 0/0 .rodata @4323 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4323 = 100.0f; -COMPILER_STRIP_GATE(80C2ABDC, &lit_4323); +COMPILER_STRIP_GATE(0x80C2ABDC, &lit_4323); #pragma pop /* 80C2ABE0-80C2ABE4 000070 0004+00 0/1 0/0 0/0 .rodata @4324 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4324 = 0.125f; -COMPILER_STRIP_GATE(80C2ABE0, &lit_4324); +COMPILER_STRIP_GATE(0x80C2ABE0, &lit_4324); #pragma pop /* 80C2ABE4-80C2ABE8 000074 0004+00 0/1 0/0 0/0 .rodata @4325 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4325 = 125.0f; -COMPILER_STRIP_GATE(80C2ABE4, &lit_4325); +COMPILER_STRIP_GATE(0x80C2ABE4, &lit_4325); #pragma pop /* 80C2ABE8-80C2ABEC 000078 0004+00 0/1 0/0 0/0 .rodata @4326 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4326 = 10.0f; -COMPILER_STRIP_GATE(80C2ABE8, &lit_4326); +COMPILER_STRIP_GATE(0x80C2ABE8, &lit_4326); #pragma pop /* 80C2ABEC-80C2ABF0 00007C 0004+00 0/1 0/0 0/0 .rodata @4327 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4327 = 60.0f; -COMPILER_STRIP_GATE(80C2ABEC, &lit_4327); +COMPILER_STRIP_GATE(0x80C2ABEC, &lit_4327); #pragma pop /* 80C2ABF0-80C2ABF4 000080 0004+00 0/1 0/0 0/0 .rodata @4328 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4328 = 110.0f; -COMPILER_STRIP_GATE(80C2ABF0, &lit_4328); +COMPILER_STRIP_GATE(0x80C2ABF0, &lit_4328); #pragma pop /* 80C29DE0-80C2A44C 0009E0 066C+00 2/2 0/0 0/0 .text Execute__15daObj_ItaMato_cFv */ @@ -718,14 +730,14 @@ asm void daObj_ItaMato_c::Execute() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4380 = 400.0f; -COMPILER_STRIP_GATE(80C2ABF4, &lit_4380); +COMPILER_STRIP_GATE(0x80C2ABF4, &lit_4380); #pragma pop /* 80C2ABF8-80C2ABFC 000088 0004+00 0/1 0/0 0/0 .rodata @4381 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4381 = 20.0f; -COMPILER_STRIP_GATE(80C2ABF8, &lit_4381); +COMPILER_STRIP_GATE(0x80C2ABF8, &lit_4381); #pragma pop /* 80C2A44C-80C2A5D0 00104C 0184+00 1/1 0/0 0/0 .text Draw__15daObj_ItaMato_cFv */ @@ -778,21 +790,21 @@ asm void daObj_ItaMato_c::getResName() { SECTION_RODATA static u8 const lit_4405[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C2ABFC, &lit_4405); +COMPILER_STRIP_GATE(0x80C2ABFC, &lit_4405); #pragma pop /* 80C2AC08-80C2AC0C 000098 0004+00 0/1 0/0 0/0 .rodata @4433 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4433 = 3.0f / 5.0f; -COMPILER_STRIP_GATE(80C2AC08, &lit_4433); +COMPILER_STRIP_GATE(0x80C2AC08, &lit_4433); #pragma pop /* 80C2AC0C-80C2AC10 00009C 0004+00 0/1 0/0 0/0 .rodata @4434 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4434 = 0x43360B61; -COMPILER_STRIP_GATE(80C2AC0C, &lit_4434); +COMPILER_STRIP_GATE(0x80C2AC0C, &lit_4434); #pragma pop /* 80C2AC10-80C2AC18 0000A0 0008+00 0/1 0/0 0/0 .rodata @4437 */ @@ -801,7 +813,7 @@ COMPILER_STRIP_GATE(80C2AC0C, &lit_4434); SECTION_RODATA static u8 const lit_4437[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C2AC10, &lit_4437); +COMPILER_STRIP_GATE(0x80C2AC10, &lit_4437); #pragma pop /* 80C2A630-80C2A7C4 001230 0194+00 1/1 0/0 0/0 .text @@ -828,7 +840,7 @@ SECTION_RODATA static u8 const id[6 + 2 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C2AC18, &id); +COMPILER_STRIP_GATE(0x80C2AC18, &id); /* 80C2A7C4-80C2A890 0013C4 00CC+00 1/1 0/0 0/0 .text setPrtcls__15daObj_ItaMato_cFv */ #pragma push @@ -952,7 +964,7 @@ asm void __sinit_d_a_obj_itamato_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80C2AA90 = (void*)__sinit_d_a_obj_itamato_cpp; +REGISTER_CTORS(0x80C2AA90, __sinit_d_a_obj_itamato_cpp); #pragma pop /* 80C2AB04-80C2AB4C 001704 0048+00 2/1 0/0 0/0 .text __dt__21daObj_ItaMato_Param_cFv */ @@ -985,10 +997,4 @@ static asm void func_80C2AB54() { } #pragma pop -/* 80C2AC20-80C2AC32 0000B0 0012+00 2/2 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80C2AC20 = "H_ItaMato"; -SECTION_DEAD static char const* const stringBase_80C2AC2A = "F_SP103"; -#pragma pop +/* 80C2AC20-80C2AC20 0000B0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_ito/d_a_obj_ito.cpp b/rel/d/a/obj/d_a_obj_ito/d_a_obj_ito.cpp index edf38829ea0..42a30912cd2 100644 --- a/rel/d/a/obj/d_a_obj_ito/d_a_obj_ito.cpp +++ b/rel/d/a/obj/d_a_obj_ito/d_a_obj_ito.cpp @@ -302,11 +302,11 @@ extern "C" void __register_global_object(); /* ############################################################################################## */ /* 8047D810-8047D814 000000 0004+00 7/7 0/0 0/0 .rodata @3770 */ SECTION_RODATA static f32 const lit_3770 = 4.5f; -COMPILER_STRIP_GATE(8047D810, &lit_3770); +COMPILER_STRIP_GATE(0x8047D810, &lit_3770); /* 8047D814-8047D818 000004 0004+00 1/1 0/0 0/0 .rodata @3771 */ SECTION_RODATA static f32 const lit_3771 = 15.0f; -COMPILER_STRIP_GATE(8047D814, &lit_3771); +COMPILER_STRIP_GATE(0x8047D814, &lit_3771); /* 8047D8DC-8047D91C 000000 0040+00 1/1 0/0 0/0 .data cc_sph_src$4829 */ SECTION_DATA static u8 cc_sph_src[64] = { @@ -385,19 +385,19 @@ asm daObj_Ito_HIO_c::daObj_Ito_HIO_c() { #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_3794 = 0x000000FF; -COMPILER_STRIP_GATE(8047D818, &lit_3794); +COMPILER_STRIP_GATE(0x8047D818, &lit_3794); #pragma pop /* 8047D81C-8047D820 00000C 0004+00 0/1 0/0 0/0 .rodata @3800 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_3800 = 0x000000FF; -COMPILER_STRIP_GATE(8047D81C, &lit_3800); +COMPILER_STRIP_GATE(0x8047D81C, &lit_3800); #pragma pop /* 8047D820-8047D824 000010 0004+00 1/4 0/0 0/0 .rodata @3820 */ SECTION_RODATA static f32 const lit_3820 = 1.0f / 100.0f; -COMPILER_STRIP_GATE(8047D820, &lit_3820); +COMPILER_STRIP_GATE(0x8047D820, &lit_3820); /* 8047D9C8-8047D9CC 000008 0004+00 2/2 0/0 0/0 .bss None */ static u8 data_8047D9C8[4]; @@ -424,7 +424,7 @@ static asm void daObj_Ito_Draw(obj_ito_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3940 = 30.0f; -COMPILER_STRIP_GATE(8047D824, &lit_3940); +COMPILER_STRIP_GATE(0x8047D824, &lit_3940); #pragma pop /* 8047D828-8047D82C 000018 0004+00 0/4 0/0 0/0 .rodata @3941 */ @@ -436,53 +436,53 @@ SECTION_RODATA static u8 const lit_3941[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(8047D828, &lit_3941); +COMPILER_STRIP_GATE(0x8047D828, &lit_3941); #pragma pop /* 8047D82C-8047D830 00001C 0004+00 0/1 0/0 0/0 .rodata @3942 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_3942 = 0x3AEBEDFA; -COMPILER_STRIP_GATE(8047D82C, &lit_3942); +COMPILER_STRIP_GATE(0x8047D82C, &lit_3942); #pragma pop /* 8047D830-8047D834 000020 0004+00 0/2 0/0 0/0 .rodata @3943 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3943 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(8047D830, &lit_3943); +COMPILER_STRIP_GATE(0x8047D830, &lit_3943); #pragma pop /* 8047D834-8047D838 000024 0004+00 0/2 0/0 0/0 .rodata @3944 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3944 = 0.5f; -COMPILER_STRIP_GATE(8047D834, &lit_3944); +COMPILER_STRIP_GATE(0x8047D834, &lit_3944); #pragma pop /* 8047D838-8047D83C 000028 0004+00 0/1 0/0 0/0 .rodata @3945 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3945 = 2.0f; -COMPILER_STRIP_GATE(8047D838, &lit_3945); +COMPILER_STRIP_GATE(0x8047D838, &lit_3945); #pragma pop /* 8047D83C-8047D840 00002C 0004+00 2/4 0/0 0/0 .rodata @3946 */ SECTION_RODATA static f32 const lit_3946 = 1.0f; -COMPILER_STRIP_GATE(8047D83C, &lit_3946); +COMPILER_STRIP_GATE(0x8047D83C, &lit_3946); /* 8047D840-8047D844 000030 0004+00 0/1 0/0 0/0 .rodata @3947 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3947 = 3.0f / 100.0f; -COMPILER_STRIP_GATE(8047D840, &lit_3947); +COMPILER_STRIP_GATE(0x8047D840, &lit_3947); #pragma pop /* 8047D844-8047D848 000034 0004+00 0/1 0/0 0/0 .rodata @3948 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3948 = 200.0f; -COMPILER_STRIP_GATE(8047D844, &lit_3948); +COMPILER_STRIP_GATE(0x8047D844, &lit_3948); #pragma pop /* 8047D848-8047D850 000038 0004+04 0/1 0/0 0/0 .rodata @3949 */ @@ -493,7 +493,7 @@ SECTION_RODATA static f32 const lit_3949[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(8047D848, &lit_3949); +COMPILER_STRIP_GATE(0x8047D848, &lit_3949); #pragma pop /* 8047D850-8047D858 000040 0008+00 0/3 0/0 0/0 .rodata @3951 */ @@ -502,7 +502,7 @@ COMPILER_STRIP_GATE(8047D848, &lit_3949); SECTION_RODATA static u8 const lit_3951[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8047D850, &lit_3951); +COMPILER_STRIP_GATE(0x8047D850, &lit_3951); #pragma pop /* 8047B504-8047B9A4 000304 04A0+00 1/1 0/0 0/0 .text cut_line_calc__FP13obj_ito_classP5ito_si */ @@ -544,7 +544,7 @@ SECTION_RODATA static f32 const lit_4124[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(8047D858, &lit_4124); +COMPILER_STRIP_GATE(0x8047D858, &lit_4124); #pragma pop /* 8047D860-8047D868 000050 0008+00 0/2 0/0 0/0 .rodata @4125 */ @@ -553,7 +553,7 @@ COMPILER_STRIP_GATE(8047D858, &lit_4124); SECTION_RODATA static u8 const lit_4125[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8047D860, &lit_4125); +COMPILER_STRIP_GATE(0x8047D860, &lit_4125); #pragma pop /* 8047D868-8047D870 000058 0008+00 0/2 0/0 0/0 .rodata @4126 */ @@ -562,7 +562,7 @@ COMPILER_STRIP_GATE(8047D860, &lit_4125); SECTION_RODATA static u8 const lit_4126[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8047D868, &lit_4126); +COMPILER_STRIP_GATE(0x8047D868, &lit_4126); #pragma pop /* 8047D870-8047D878 000060 0008+00 0/2 0/0 0/0 .rodata @4127 */ @@ -571,28 +571,28 @@ COMPILER_STRIP_GATE(8047D868, &lit_4126); SECTION_RODATA static u8 const lit_4127[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8047D870, &lit_4127); +COMPILER_STRIP_GATE(0x8047D870, &lit_4127); #pragma pop /* 8047D878-8047D87C 000068 0004+00 0/1 0/0 0/0 .rodata @4128 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4128 = 0x3D6147AE; -COMPILER_STRIP_GATE(8047D878, &lit_4128); +COMPILER_STRIP_GATE(0x8047D878, &lit_4128); #pragma pop /* 8047D87C-8047D880 00006C 0004+00 0/1 0/0 0/0 .rodata @4129 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4129 = 0x3D577319; -COMPILER_STRIP_GATE(8047D87C, &lit_4129); +COMPILER_STRIP_GATE(0x8047D87C, &lit_4129); #pragma pop /* 8047D880-8047D884 000070 0004+00 0/2 0/0 0/0 .rodata @4130 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4130 = 20.0f; -COMPILER_STRIP_GATE(8047D880, &lit_4130); +COMPILER_STRIP_GATE(0x8047D880, &lit_4130); #pragma pop /* 8047BAF8-8047BF8C 0008F8 0494+00 1/1 0/0 0/0 .text cut_set__FP13obj_ito_classi */ @@ -608,7 +608,7 @@ static asm void cut_set(obj_ito_class* param_0, int param_1) { /* ############################################################################################## */ /* 8047D884-8047D888 000074 0004+00 1/1 0/0 0/0 .rodata @4150 */ SECTION_RODATA static f32 const lit_4150 = 10.0f; -COMPILER_STRIP_GATE(8047D884, &lit_4150); +COMPILER_STRIP_GATE(0x8047D884, &lit_4150); /* 8047BF8C-8047C034 000D8C 00A8+00 1/1 0/0 0/0 .text ito_end__FP5ito_s */ #pragma push @@ -625,77 +625,77 @@ static asm void ito_end(ito_s* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4723 = 0.25f; -COMPILER_STRIP_GATE(8047D888, &lit_4723); +COMPILER_STRIP_GATE(0x8047D888, &lit_4723); #pragma pop /* 8047D88C-8047D890 00007C 0004+00 0/1 0/0 0/0 .rodata @4724 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4724 = 0x3A83126F; -COMPILER_STRIP_GATE(8047D88C, &lit_4724); +COMPILER_STRIP_GATE(0x8047D88C, &lit_4724); #pragma pop /* 8047D890-8047D894 000080 0004+00 0/1 0/0 0/0 .rodata @4725 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4725 = 11.0f / 100.0f; -COMPILER_STRIP_GATE(8047D890, &lit_4725); +COMPILER_STRIP_GATE(0x8047D890, &lit_4725); #pragma pop /* 8047D894-8047D898 000084 0004+00 0/1 0/0 0/0 .rodata @4726 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4726 = -1.0f; -COMPILER_STRIP_GATE(8047D894, &lit_4726); +COMPILER_STRIP_GATE(0x8047D894, &lit_4726); #pragma pop /* 8047D898-8047D89C 000088 0004+00 0/1 0/0 0/0 .rodata @4727 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4727 = 12300.0f; -COMPILER_STRIP_GATE(8047D898, &lit_4727); +COMPILER_STRIP_GATE(0x8047D898, &lit_4727); #pragma pop /* 8047D89C-8047D8A0 00008C 0004+00 0/2 0/0 0/0 .rodata @4728 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4728 = 5000.0f; -COMPILER_STRIP_GATE(8047D89C, &lit_4728); +COMPILER_STRIP_GATE(0x8047D89C, &lit_4728); #pragma pop /* 8047D8A0-8047D8A4 000090 0004+00 0/2 0/0 0/0 .rodata @4729 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4729 = -5000.0f; -COMPILER_STRIP_GATE(8047D8A0, &lit_4729); +COMPILER_STRIP_GATE(0x8047D8A0, &lit_4729); #pragma pop /* 8047D8A4-8047D8A8 000094 0004+00 0/1 0/0 0/0 .rodata @4730 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4730 = 1.0f / 19.0f; -COMPILER_STRIP_GATE(8047D8A4, &lit_4730); +COMPILER_STRIP_GATE(0x8047D8A4, &lit_4730); #pragma pop /* 8047D8A8-8047D8AC 000098 0004+00 0/1 0/0 0/0 .rodata @4731 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4731 = 2.0f / 19.0f; -COMPILER_STRIP_GATE(8047D8A8, &lit_4731); +COMPILER_STRIP_GATE(0x8047D8A8, &lit_4731); #pragma pop /* 8047D8AC-8047D8B0 00009C 0004+00 0/1 0/0 0/0 .rodata @4732 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4732 = 2200.0f; -COMPILER_STRIP_GATE(8047D8AC, &lit_4732); +COMPILER_STRIP_GATE(0x8047D8AC, &lit_4732); #pragma pop /* 8047D8B0-8047D8B4 0000A0 0004+00 0/1 0/0 0/0 .rodata @4733 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4733 = 1500.0f; -COMPILER_STRIP_GATE(8047D8B0, &lit_4733); +COMPILER_STRIP_GATE(0x8047D8B0, &lit_4733); #pragma pop /* 8047C034-8047CEE4 000E34 0EB0+00 1/1 0/0 0/0 .text action__FP13obj_ito_class */ @@ -723,6 +723,13 @@ static bool daObj_Ito_IsDelete(obj_ito_class* param_0) { return true; } +/* ############################################################################################## */ +/* 8047D8D4-8047D8D4 0000C4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8047D8D4 = "OBJ_ITO"; +#pragma pop + /* 8047CFB0-8047D024 001DB0 0074+00 1/0 0/0 0/0 .text daObj_Ito_Delete__FP13obj_ito_class */ #pragma push @@ -739,21 +746,21 @@ static asm void daObj_Ito_Delete(obj_ito_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4812 = 2.0f / 5.0f; -COMPILER_STRIP_GATE(8047D8B4, &lit_4812); +COMPILER_STRIP_GATE(0x8047D8B4, &lit_4812); #pragma pop /* 8047D8B8-8047D8BC 0000A8 0004+00 0/1 0/0 0/0 .rodata @4813 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4813 = 3.0f / 10.0f; -COMPILER_STRIP_GATE(8047D8B8, &lit_4813); +COMPILER_STRIP_GATE(0x8047D8B8, &lit_4813); #pragma pop /* 8047D8BC-8047D8C0 0000AC 0004+00 0/2 0/0 0/0 .rodata @4814 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4814 = 65535.0f; -COMPILER_STRIP_GATE(8047D8BC, &lit_4814); +COMPILER_STRIP_GATE(0x8047D8BC, &lit_4814); #pragma pop /* 8047D024-8047D1D8 001E24 01B4+00 1/1 0/0 0/0 .text useHeapInit__FP10fopAc_ac_c */ @@ -771,35 +778,35 @@ static asm void useHeapInit(fopAc_ac_c* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4930 = -3000.0f; -COMPILER_STRIP_GATE(8047D8C0, &lit_4930); +COMPILER_STRIP_GATE(0x8047D8C0, &lit_4930); #pragma pop /* 8047D8C4-8047D8C8 0000B4 0004+00 0/1 0/0 0/0 .rodata @4931 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4931 = 3000.0f; -COMPILER_STRIP_GATE(8047D8C4, &lit_4931); +COMPILER_STRIP_GATE(0x8047D8C4, &lit_4931); #pragma pop /* 8047D8C8-8047D8CC 0000B8 0004+00 0/1 0/0 0/0 .rodata @4932 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4932 = -5374.0f; -COMPILER_STRIP_GATE(8047D8C8, &lit_4932); +COMPILER_STRIP_GATE(0x8047D8C8, &lit_4932); #pragma pop /* 8047D8CC-8047D8D0 0000BC 0004+00 0/1 0/0 0/0 .rodata @4933 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4933 = 4920.0f; -COMPILER_STRIP_GATE(8047D8CC, &lit_4933); +COMPILER_STRIP_GATE(0x8047D8CC, &lit_4933); #pragma pop /* 8047D8D0-8047D8D4 0000C0 0004+00 0/1 0/0 0/0 .rodata @4934 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4934 = -2342.0f; -COMPILER_STRIP_GATE(8047D8D0, &lit_4934); +COMPILER_STRIP_GATE(0x8047D8D0, &lit_4934); #pragma pop /* 8047D1D8-8047D594 001FD8 03BC+00 1/0 0/0 0/0 .text daObj_Ito_Create__FP10fopAc_ac_c */ @@ -879,12 +886,7 @@ asm void __sinit_d_a_obj_ito_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_8047D7C0 = (void*)__sinit_d_a_obj_ito_cpp; +REGISTER_CTORS(0x8047D7C0, __sinit_d_a_obj_ito_cpp); #pragma pop -/* 8047D8D4-8047D8DC 0000C4 0008+00 3/3 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_8047D8D4 = "OBJ_ITO"; -#pragma pop +/* 8047D8D4-8047D8D4 0000C4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_kabuto/d_a_obj_kabuto.cpp b/rel/d/a/obj/d_a_obj_kabuto/d_a_obj_kabuto.cpp index ccb85943f91..caf49fdee24 100644 --- a/rel/d/a/obj/d_a_obj_kabuto/d_a_obj_kabuto.cpp +++ b/rel/d/a/obj/d_a_obj_kabuto/d_a_obj_kabuto.cpp @@ -50,19 +50,19 @@ struct mDoExt_baseAnm { /* 8000D428 */ void play(); }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; +struct J3DAnmTransform {}; + +struct J3DModelData {}; + struct Z2Creature { /* 802C03C8 */ Z2Creature(); /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -403,20 +403,20 @@ extern "C" void __register_global_object(); /* ############################################################################################## */ /* 80C2E110-80C2E114 000000 0004+00 13/13 0/0 0/0 .rodata @3775 */ SECTION_RODATA static f32 const lit_3775 = 1.5f; -COMPILER_STRIP_GATE(80C2E110, &lit_3775); +COMPILER_STRIP_GATE(0x80C2E110, &lit_3775); /* 80C2E114-80C2E118 000004 0004+00 0/2 0/0 0/0 .rodata @3776 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3776 = 6.0f / 5.0f; -COMPILER_STRIP_GATE(80C2E114, &lit_3776); +COMPILER_STRIP_GATE(0x80C2E114, &lit_3776); #pragma pop /* 80C2E118-80C2E11C 000008 0004+00 0/1 0/0 0/0 .rodata @3777 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3777 = -3.0f / 5.0f; -COMPILER_STRIP_GATE(80C2E118, &lit_3777); +COMPILER_STRIP_GATE(0x80C2E118, &lit_3777); #pragma pop /* 80C2E228-80C2E248 -00001 0020+00 1/0 0/0 0/0 .data l_daObjKABUTO_Method */ @@ -514,7 +514,7 @@ SECTION_RODATA static u8 const ccSphSrc[64] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0xC8, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C2E11C, &ccSphSrc); +COMPILER_STRIP_GATE(0x80C2E11C, &ccSphSrc); /* 80C2AEA4-80C2AF10 000124 006C+00 1/1 0/0 0/0 .text InitCcSph__13daObjKABUTO_cFv */ #pragma push @@ -529,7 +529,7 @@ asm void daObjKABUTO_c::InitCcSph() { /* ############################################################################################## */ /* 80C2E15C-80C2E160 00004C 0004+00 1/4 0/0 0/0 .rodata @3790 */ SECTION_RODATA static f32 const lit_3790 = 20.0f; -COMPILER_STRIP_GATE(80C2E15C, &lit_3790); +COMPILER_STRIP_GATE(0x80C2E15C, &lit_3790); /* 80C2AF10-80C2AF68 000190 0058+00 1/1 0/0 0/0 .text SetCcSph__13daObjKABUTO_cFv */ #pragma push @@ -554,7 +554,13 @@ static asm void useHeapInit(fopAc_ac_c* param_0) { /* ############################################################################################## */ /* 80C2E160-80C2E164 000050 0004+00 2/7 0/0 0/0 .rodata @3896 */ SECTION_RODATA static f32 const lit_3896 = 1.0f; -COMPILER_STRIP_GATE(80C2E160, &lit_3896); +COMPILER_STRIP_GATE(0x80C2E160, &lit_3896); + +/* 80C2E218-80C2E218 000108 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80C2E218 = "Kab_m"; +#pragma pop /* 80C2AF88-80C2B2E0 000208 0358+00 1/1 0/0 0/0 .text CreateHeap__13daObjKABUTO_cFv */ #pragma push @@ -605,34 +611,34 @@ SECTION_RODATA static u8 const lit_3933[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C2E164, &lit_3933); +COMPILER_STRIP_GATE(0x80C2E164, &lit_3933); /* 80C2E168-80C2E16C 000058 0004+00 0/6 0/0 0/0 .rodata @3934 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3934 = 5.0f; -COMPILER_STRIP_GATE(80C2E168, &lit_3934); +COMPILER_STRIP_GATE(0x80C2E168, &lit_3934); #pragma pop /* 80C2E16C-80C2E170 00005C 0004+00 0/6 0/0 0/0 .rodata @3935 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3935 = -1.0f; -COMPILER_STRIP_GATE(80C2E16C, &lit_3935); +COMPILER_STRIP_GATE(0x80C2E16C, &lit_3935); #pragma pop /* 80C2E170-80C2E174 000060 0004+00 0/7 0/0 0/0 .rodata @3936 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3936 = 50.0f; -COMPILER_STRIP_GATE(80C2E170, &lit_3936); +COMPILER_STRIP_GATE(0x80C2E170, &lit_3936); #pragma pop /* 80C2E174-80C2E178 000064 0004+00 0/5 0/0 0/0 .rodata @3937 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3937 = 100.0f; -COMPILER_STRIP_GATE(80C2E174, &lit_3937); +COMPILER_STRIP_GATE(0x80C2E174, &lit_3937); #pragma pop /* 80C2B36C-80C2B4D4 0005EC 0168+00 1/1 0/0 0/0 .text ShopWaitAction__13daObjKABUTO_cFv @@ -655,7 +661,7 @@ SECTION_RODATA static f32 const lit_3957[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80C2E178, &lit_3957); +COMPILER_STRIP_GATE(0x80C2E178, &lit_3957); #pragma pop /* 80C2B4D4-80C2B618 000754 0144+00 1/1 0/0 0/0 .text WaitAction__13daObjKABUTO_cFv */ @@ -675,7 +681,7 @@ asm void daObjKABUTO_c::WaitAction() { SECTION_RODATA static u8 const lit_4010[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C2E180, &lit_4010); +COMPILER_STRIP_GATE(0x80C2E180, &lit_4010); #pragma pop /* 80C2E188-80C2E190 000078 0008+00 0/5 0/0 0/0 .rodata @4011 */ @@ -684,7 +690,7 @@ COMPILER_STRIP_GATE(80C2E180, &lit_4010); SECTION_RODATA static u8 const lit_4011[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C2E188, &lit_4011); +COMPILER_STRIP_GATE(0x80C2E188, &lit_4011); #pragma pop /* 80C2E190-80C2E198 000080 0008+00 0/5 0/0 0/0 .rodata @4012 */ @@ -693,7 +699,7 @@ COMPILER_STRIP_GATE(80C2E188, &lit_4011); SECTION_RODATA static u8 const lit_4012[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C2E190, &lit_4012); +COMPILER_STRIP_GATE(0x80C2E190, &lit_4012); #pragma pop /* 80C2B618-80C2B844 000898 022C+00 1/1 0/0 0/0 .text WallCheck__13daObjKABUTO_cFv */ @@ -721,28 +727,28 @@ asm cM3dGPla::~cM3dGPla() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4036 = 2.0f / 5.0f; -COMPILER_STRIP_GATE(80C2E198, &lit_4036); +COMPILER_STRIP_GATE(0x80C2E198, &lit_4036); #pragma pop /* 80C2E19C-80C2E1A0 00008C 0004+00 0/3 0/0 0/0 .rodata @4037 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4037 = 10.0f; -COMPILER_STRIP_GATE(80C2E19C, &lit_4037); +COMPILER_STRIP_GATE(0x80C2E19C, &lit_4037); #pragma pop /* 80C2E1A0-80C2E1A4 000090 0004+00 0/1 0/0 0/0 .rodata @4038 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4038 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(80C2E1A0, &lit_4038); +COMPILER_STRIP_GATE(0x80C2E1A0, &lit_4038); #pragma pop /* 80C2E1A4-80C2E1A8 000094 0004+00 0/2 0/0 0/0 .rodata @4039 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4039 = 0.5f; -COMPILER_STRIP_GATE(80C2E1A4, &lit_4039); +COMPILER_STRIP_GATE(0x80C2E1A4, &lit_4039); #pragma pop /* 80C2B88C-80C2B998 000B0C 010C+00 1/1 0/0 0/0 .text SpeedSet__13daObjKABUTO_cFv */ @@ -760,28 +766,28 @@ asm void daObjKABUTO_c::SpeedSet() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4140 = 3.0f; -COMPILER_STRIP_GATE(80C2E1A8, &lit_4140); +COMPILER_STRIP_GATE(0x80C2E1A8, &lit_4140); #pragma pop /* 80C2E1AC-80C2E1B0 00009C 0004+00 0/1 0/0 0/0 .rodata @4141 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4141 = -100.0f; -COMPILER_STRIP_GATE(80C2E1AC, &lit_4141); +COMPILER_STRIP_GATE(0x80C2E1AC, &lit_4141); #pragma pop /* 80C2E1B0-80C2E1B4 0000A0 0004+00 0/1 0/0 0/0 .rodata @4142 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4142 = 40.0f; -COMPILER_STRIP_GATE(80C2E1B0, &lit_4142); +COMPILER_STRIP_GATE(0x80C2E1B0, &lit_4142); #pragma pop /* 80C2E1B4-80C2E1B8 0000A4 0004+00 0/1 0/0 0/0 .rodata @4143 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4143 = 3.0f / 10.0f; -COMPILER_STRIP_GATE(80C2E1B4, &lit_4143); +COMPILER_STRIP_GATE(0x80C2E1B4, &lit_4143); #pragma pop /* 80C2B998-80C2BDE8 000C18 0450+00 1/1 0/0 0/0 .text WallWalk__13daObjKABUTO_cFv */ @@ -799,7 +805,7 @@ asm void daObjKABUTO_c::WallWalk() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4176 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(80C2E1B8, &lit_4176); +COMPILER_STRIP_GATE(0x80C2E1B8, &lit_4176); #pragma pop /* 80C2BDE8-80C2BFE8 001068 0200+00 2/2 0/0 0/0 .text WalkAction__13daObjKABUTO_cFv */ @@ -817,42 +823,42 @@ asm void daObjKABUTO_c::WalkAction() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4322 = 30.0f; -COMPILER_STRIP_GATE(80C2E1BC, &lit_4322); +COMPILER_STRIP_GATE(0x80C2E1BC, &lit_4322); #pragma pop /* 80C2E1C0-80C2E1C4 0000B0 0004+00 0/1 0/0 0/0 .rodata @4323 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4323 = 80.0f; -COMPILER_STRIP_GATE(80C2E1C0, &lit_4323); +COMPILER_STRIP_GATE(0x80C2E1C0, &lit_4323); #pragma pop /* 80C2E1C4-80C2E1C8 0000B4 0004+00 0/3 0/0 0/0 .rodata @4324 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4324 = 8.0f; -COMPILER_STRIP_GATE(80C2E1C4, &lit_4324); +COMPILER_STRIP_GATE(0x80C2E1C4, &lit_4324); #pragma pop /* 80C2E1C8-80C2E1CC 0000B8 0004+00 0/1 0/0 0/0 .rodata @4325 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4325 = 200.0f; -COMPILER_STRIP_GATE(80C2E1C8, &lit_4325); +COMPILER_STRIP_GATE(0x80C2E1C8, &lit_4325); #pragma pop /* 80C2E1CC-80C2E1D0 0000BC 0004+00 0/1 0/0 0/0 .rodata @4326 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4326 = 11.0f; -COMPILER_STRIP_GATE(80C2E1CC, &lit_4326); +COMPILER_STRIP_GATE(0x80C2E1CC, &lit_4326); #pragma pop /* 80C2E1D0-80C2E1D4 0000C0 0004+00 0/1 0/0 0/0 .rodata @4327 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4327 = 1050.0f; -COMPILER_STRIP_GATE(80C2E1D0, &lit_4327); +COMPILER_STRIP_GATE(0x80C2E1D0, &lit_4327); #pragma pop /* 80C2BFE8-80C2C7C8 001268 07E0+00 2/2 0/0 0/0 .text MoveAction__13daObjKABUTO_cFv */ @@ -870,21 +876,21 @@ asm void daObjKABUTO_c::MoveAction() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4367 = 608.0f; -COMPILER_STRIP_GATE(80C2E1D4, &lit_4367); +COMPILER_STRIP_GATE(0x80C2E1D4, &lit_4367); #pragma pop /* 80C2E1D8-80C2E1DC 0000C8 0004+00 0/1 0/0 0/0 .rodata @4368 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4368 = 448.0f; -COMPILER_STRIP_GATE(80C2E1D8, &lit_4368); +COMPILER_STRIP_GATE(0x80C2E1D8, &lit_4368); #pragma pop /* 80C2E1DC-80C2E1E0 0000CC 0004+00 0/1 0/0 0/0 .rodata @4369 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4369 = 16777215.0f; -COMPILER_STRIP_GATE(80C2E1DC, &lit_4369); +COMPILER_STRIP_GATE(0x80C2E1DC, &lit_4369); #pragma pop /* 80C2C7C8-80C2C944 001A48 017C+00 1/1 0/0 0/0 .text Z_BufferChk__13daObjKABUTO_cFv */ @@ -935,34 +941,34 @@ SECTION_RODATA static u16 const l_kab_itemno[1 + 1 /* padding */] = { /* padding */ 0x0000, }; -COMPILER_STRIP_GATE(80C2E1E0, &l_kab_itemno); +COMPILER_STRIP_GATE(0x80C2E1E0, &l_kab_itemno); /* 80C2E1E4-80C2E1E8 0000D4 0004+00 0/0 0/0 0/0 .rodata @4473 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4473 = 1.0f / 20.0f; -COMPILER_STRIP_GATE(80C2E1E4, &lit_4473); +COMPILER_STRIP_GATE(0x80C2E1E4, &lit_4473); #pragma pop /* 80C2E1E8-80C2E1EC 0000D8 0004+00 0/0 0/0 0/0 .rodata @4474 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4474 = -1.0f / 5.0f; -COMPILER_STRIP_GATE(80C2E1E8, &lit_4474); +COMPILER_STRIP_GATE(0x80C2E1E8, &lit_4474); #pragma pop /* 80C2E1EC-80C2E1F0 0000DC 0004+00 0/0 0/0 0/0 .rodata @4496 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4496 = -9.0f; -COMPILER_STRIP_GATE(80C2E1EC, &lit_4496); +COMPILER_STRIP_GATE(0x80C2E1EC, &lit_4496); #pragma pop /* 80C2E1F0-80C2E1F8 0000E0 0008+00 1/2 0/0 0/0 .rodata @4545 */ SECTION_RODATA static u8 const lit_4545[8] = { 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C2E1F0, &lit_4545); +COMPILER_STRIP_GATE(0x80C2E1F0, &lit_4545); /* 80C2CADC-80C2CC18 001D5C 013C+00 1/1 0/0 0/0 .text ParticleSet__13daObjKABUTO_cFv */ #pragma push @@ -979,7 +985,7 @@ asm void daObjKABUTO_c::ParticleSet() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4684 = 10000.0f; -COMPILER_STRIP_GATE(80C2E1F8, &lit_4684); +COMPILER_STRIP_GATE(0x80C2E1F8, &lit_4684); #pragma pop /* 80C2CC18-80C2D21C 001E98 0604+00 1/1 0/0 0/0 .text Execute__13daObjKABUTO_cFv */ @@ -1029,7 +1035,7 @@ asm void daObjKABUTO_c::setBaseMtx() { /* ############################################################################################## */ /* 80C2E1FC-80C2E200 0000EC 0004+00 1/1 0/0 0/0 .rodata @4779 */ SECTION_RODATA static f32 const lit_4779 = 15.0f; -COMPILER_STRIP_GATE(80C2E1FC, &lit_4779); +COMPILER_STRIP_GATE(0x80C2E1FC, &lit_4779); /* 80C2E2F4-80C2E300 00000C 000C+00 1/1 0/0 0/0 .bss @3770 */ static u8 lit_3770[12]; @@ -1061,7 +1067,13 @@ static asm void daObjKABUTO_Execute(daObjKABUTO_c* param_0) { /* ############################################################################################## */ /* 80C2E200-80C2E204 0000F0 0004+00 1/2 0/0 0/0 .rodata l_musiya_num */ SECTION_RODATA static u32 const l_musiya_num = 0x01910192; -COMPILER_STRIP_GATE(80C2E200, &l_musiya_num); +COMPILER_STRIP_GATE(0x80C2E200, &l_musiya_num); + +/* 80C2E218-80C2E218 000108 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80C2E21E = "R_SP160"; +#pragma pop /* 80C2D578-80C2D724 0027F8 01AC+00 1/1 0/0 0/0 .text CreateChk__13daObjKABUTO_cFv */ #pragma push @@ -1078,35 +1090,35 @@ asm void daObjKABUTO_c::CreateChk() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5055 = 500.0f; -COMPILER_STRIP_GATE(80C2E204, &lit_5055); +COMPILER_STRIP_GATE(0x80C2E204, &lit_5055); #pragma pop /* 80C2E208-80C2E20C 0000F8 0004+00 0/1 0/0 0/0 .rodata @5056 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5056 = -200.0f; -COMPILER_STRIP_GATE(80C2E208, &lit_5056); +COMPILER_STRIP_GATE(0x80C2E208, &lit_5056); #pragma pop /* 80C2E20C-80C2E210 0000FC 0004+00 0/1 0/0 0/0 .rodata @5057 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5057 = -1000.0f; -COMPILER_STRIP_GATE(80C2E20C, &lit_5057); +COMPILER_STRIP_GATE(0x80C2E20C, &lit_5057); #pragma pop /* 80C2E210-80C2E214 000100 0004+00 0/1 0/0 0/0 .rodata @5058 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5058 = -50.0f; -COMPILER_STRIP_GATE(80C2E210, &lit_5058); +COMPILER_STRIP_GATE(0x80C2E210, &lit_5058); #pragma pop /* 80C2E214-80C2E218 000104 0004+00 0/1 0/0 0/0 .rodata @5059 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5059 = 11.0f / 10.0f; -COMPILER_STRIP_GATE(80C2E214, &lit_5059); +COMPILER_STRIP_GATE(0x80C2E214, &lit_5059); #pragma pop /* 80C2D724-80C2DF60 0029A4 083C+00 1/1 0/0 0/0 .text create__13daObjKABUTO_cFv */ @@ -1176,7 +1188,7 @@ asm void __sinit_d_a_obj_kabuto_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80C2E0B0 = (void*)__sinit_d_a_obj_kabuto_cpp; +REGISTER_CTORS(0x80C2E0B0, __sinit_d_a_obj_kabuto_cpp); #pragma pop /* 80C2E0EC-80C2E0F4 00336C 0008+00 1/0 0/0 0/0 .text @36@__dt__12dBgS_ObjAcchFv */ @@ -1199,10 +1211,4 @@ static asm void func_80C2E0F4() { } #pragma pop -/* 80C2E218-80C2E226 000108 000E+00 10/10 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80C2E218 = "Kab_m"; -SECTION_DEAD static char const* const stringBase_80C2E21E = "R_SP160"; -#pragma pop +/* 80C2E218-80C2E218 000108 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_kag/d_a_obj_kag.cpp b/rel/d/a/obj/d_a_obj_kag/d_a_obj_kag.cpp index bc7de429e23..04a73a8591c 100644 --- a/rel/d/a/obj/d_a_obj_kag/d_a_obj_kag.cpp +++ b/rel/d/a/obj/d_a_obj_kag/d_a_obj_kag.cpp @@ -45,12 +45,14 @@ struct mDoExt_baseAnm { /* 8000D428 */ void play(); }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; +struct J3DAnmTransform {}; + +struct J3DModelData {}; + struct Vec {}; struct Z2Creature { @@ -58,8 +60,6 @@ struct Z2Creature { /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -390,7 +390,7 @@ extern "C" void __register_global_object(); /* ############################################################################################## */ /* 80C3114C-80C31150 000000 0004+00 11/11 0/0 0/0 .rodata @3774 */ SECTION_RODATA static f32 const lit_3774 = 4.0f / 5.0f; -COMPILER_STRIP_GATE(80C3114C, &lit_3774); +COMPILER_STRIP_GATE(0x80C3114C, &lit_3774); /* 80C31270-80C3127C 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { @@ -618,7 +618,7 @@ asm daObj_KagHIO_c::daObj_KagHIO_c() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daObjKAG_c::setAction(void (daObjKAG_c::*)()) { +asm void daObjKAG_c::setAction(void (daObjKAG_c::*param_0)()) { nofralloc #include "asm/rel/d/a/obj/d_a_obj_kag/d_a_obj_kag/setAction__10daObjKAG_cFM10daObjKAG_cFPCvPv_v.s" } @@ -631,7 +631,7 @@ asm void daObjKAG_c::setAction(void (daObjKAG_c::*)()) { SECTION_RODATA static u8 const l_kag_brk_index[8] = { 0x00, 0x00, 0x00, 0x0E, 0x00, 0x00, 0x00, 0x0D, }; -COMPILER_STRIP_GATE(80C31150, &l_kag_brk_index); +COMPILER_STRIP_GATE(0x80C31150, &l_kag_brk_index); #pragma pop /* 80C31158-80C31160 00000C 0008+00 0/1 0/0 0/0 .rodata l_kag_btk_index */ @@ -640,12 +640,18 @@ COMPILER_STRIP_GATE(80C31150, &l_kag_brk_index); SECTION_RODATA static u8 const l_kag_btk_index[8] = { 0x00, 0x00, 0x00, 0x12, 0x00, 0x00, 0x00, 0x11, }; -COMPILER_STRIP_GATE(80C31158, &l_kag_btk_index); +COMPILER_STRIP_GATE(0x80C31158, &l_kag_btk_index); #pragma pop /* 80C31160-80C31164 000014 0004+00 1/4 0/0 0/0 .rodata @3867 */ SECTION_RODATA static f32 const lit_3867 = 1.0f; -COMPILER_STRIP_GATE(80C31160, &lit_3867); +COMPILER_STRIP_GATE(0x80C31160, &lit_3867); + +/* 80C31260-80C31260 000114 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80C31260 = "I_Kag"; +#pragma pop /* 80C2E4D8-80C2E714 0001B8 023C+00 1/1 0/0 0/0 .text useHeapInit__FP10fopAc_ac_c */ #pragma push @@ -700,7 +706,7 @@ SECTION_RODATA static u8 const lit_3945[4 + 4 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C31164, &lit_3945); +COMPILER_STRIP_GATE(0x80C31164, &lit_3945); /* 80C3116C-80C31174 000020 0008+00 0/3 0/0 0/0 .rodata @3946 */ #pragma push @@ -708,7 +714,7 @@ COMPILER_STRIP_GATE(80C31164, &lit_3945); SECTION_RODATA static u8 const lit_3946[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C3116C, &lit_3946); +COMPILER_STRIP_GATE(0x80C3116C, &lit_3946); #pragma pop /* 80C31174-80C3117C 000028 0008+00 0/3 0/0 0/0 .rodata @3947 */ @@ -717,7 +723,7 @@ COMPILER_STRIP_GATE(80C3116C, &lit_3946); SECTION_RODATA static u8 const lit_3947[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C31174, &lit_3947); +COMPILER_STRIP_GATE(0x80C31174, &lit_3947); #pragma pop /* 80C3117C-80C31184 000030 0008+00 0/3 0/0 0/0 .rodata @3948 */ @@ -726,7 +732,7 @@ COMPILER_STRIP_GATE(80C31174, &lit_3947); SECTION_RODATA static u8 const lit_3948[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C3117C, &lit_3948); +COMPILER_STRIP_GATE(0x80C3117C, &lit_3948); #pragma pop /* 80C2E7A0-80C2E9F8 000480 0258+00 1/1 0/0 0/0 .text @@ -755,182 +761,182 @@ asm cM3dGPla::~cM3dGPla() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4290 = 5.0f; -COMPILER_STRIP_GATE(80C31184, &lit_4290); +COMPILER_STRIP_GATE(0x80C31184, &lit_4290); #pragma pop /* 80C31188-80C3118C 00003C 0004+00 0/2 0/0 0/0 .rodata @4291 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4291 = 0.5f; -COMPILER_STRIP_GATE(80C31188, &lit_4291); +COMPILER_STRIP_GATE(0x80C31188, &lit_4291); #pragma pop /* 80C3118C-80C31190 000040 0004+00 0/5 0/0 0/0 .rodata @4292 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4292 = -1.0f; -COMPILER_STRIP_GATE(80C3118C, &lit_4292); +COMPILER_STRIP_GATE(0x80C3118C, &lit_4292); #pragma pop /* 80C31190-80C31194 000044 0004+00 0/1 0/0 0/0 .rodata @4293 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4293 = 18.0f; -COMPILER_STRIP_GATE(80C31190, &lit_4293); +COMPILER_STRIP_GATE(0x80C31190, &lit_4293); #pragma pop /* 80C31194-80C31198 000048 0004+00 0/3 0/0 0/0 .rodata @4294 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4294 = 30.0f; -COMPILER_STRIP_GATE(80C31194, &lit_4294); +COMPILER_STRIP_GATE(0x80C31194, &lit_4294); #pragma pop /* 80C31198-80C3119C 00004C 0004+00 0/1 0/0 0/0 .rodata @4295 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4295 = 32768.0f; -COMPILER_STRIP_GATE(80C31198, &lit_4295); +COMPILER_STRIP_GATE(0x80C31198, &lit_4295); #pragma pop /* 80C3119C-80C311A0 000050 0004+00 0/1 0/0 0/0 .rodata @4296 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4296 = 512.0f; -COMPILER_STRIP_GATE(80C3119C, &lit_4296); +COMPILER_STRIP_GATE(0x80C3119C, &lit_4296); #pragma pop /* 80C311A0-80C311A4 000054 0004+00 0/1 0/0 0/0 .rodata @4297 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4297 = 12288.0f; -COMPILER_STRIP_GATE(80C311A0, &lit_4297); +COMPILER_STRIP_GATE(0x80C311A0, &lit_4297); #pragma pop /* 80C311A4-80C311A8 000058 0004+00 0/1 0/0 0/0 .rodata @4298 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4298 = 9.0f / 5.0f; -COMPILER_STRIP_GATE(80C311A4, &lit_4298); +COMPILER_STRIP_GATE(0x80C311A4, &lit_4298); #pragma pop /* 80C311A8-80C311AC 00005C 0004+00 0/1 0/0 0/0 .rodata @4299 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4299 = 10.0f; -COMPILER_STRIP_GATE(80C311A8, &lit_4299); +COMPILER_STRIP_GATE(0x80C311A8, &lit_4299); #pragma pop /* 80C311AC-80C311B0 000060 0004+00 0/1 0/0 0/0 .rodata @4300 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4300 = 6.0f; -COMPILER_STRIP_GATE(80C311AC, &lit_4300); +COMPILER_STRIP_GATE(0x80C311AC, &lit_4300); #pragma pop /* 80C311B0-80C311B4 000064 0004+00 0/1 0/0 0/0 .rodata @4301 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4301 = 2.0f; -COMPILER_STRIP_GATE(80C311B0, &lit_4301); +COMPILER_STRIP_GATE(0x80C311B0, &lit_4301); #pragma pop /* 80C311B4-80C311B8 000068 0004+00 0/1 0/0 0/0 .rodata @4302 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4302 = 1800.0f; -COMPILER_STRIP_GATE(80C311B4, &lit_4302); +COMPILER_STRIP_GATE(0x80C311B4, &lit_4302); #pragma pop /* 80C311B8-80C311BC 00006C 0004+00 0/1 0/0 0/0 .rodata @4303 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4303 = 8192.0f; -COMPILER_STRIP_GATE(80C311B8, &lit_4303); +COMPILER_STRIP_GATE(0x80C311B8, &lit_4303); #pragma pop /* 80C311BC-80C311C0 000070 0004+00 0/1 0/0 0/0 .rodata @4304 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4304 = 200.0f; -COMPILER_STRIP_GATE(80C311BC, &lit_4304); +COMPILER_STRIP_GATE(0x80C311BC, &lit_4304); #pragma pop /* 80C311C0-80C311C4 000074 0004+00 0/1 0/0 0/0 .rodata @4305 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4305 = 4.0f; -COMPILER_STRIP_GATE(80C311C0, &lit_4305); +COMPILER_STRIP_GATE(0x80C311C0, &lit_4305); #pragma pop /* 80C311C4-80C311C8 000078 0004+00 0/1 0/0 0/0 .rodata @4306 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4306 = 800.0f; -COMPILER_STRIP_GATE(80C311C4, &lit_4306); +COMPILER_STRIP_GATE(0x80C311C4, &lit_4306); #pragma pop /* 80C311C8-80C311CC 00007C 0004+00 0/1 0/0 0/0 .rodata @4307 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4307 = 1200.0f; -COMPILER_STRIP_GATE(80C311C8, &lit_4307); +COMPILER_STRIP_GATE(0x80C311C8, &lit_4307); #pragma pop /* 80C311CC-80C311D0 000080 0004+00 0/1 0/0 0/0 .rodata @4308 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4308 = 300.0f; -COMPILER_STRIP_GATE(80C311CC, &lit_4308); +COMPILER_STRIP_GATE(0x80C311CC, &lit_4308); #pragma pop /* 80C311D0-80C311D4 000084 0004+00 0/1 0/0 0/0 .rodata @4309 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4309 = 4096.0f; -COMPILER_STRIP_GATE(80C311D0, &lit_4309); +COMPILER_STRIP_GATE(0x80C311D0, &lit_4309); #pragma pop /* 80C311D4-80C311D8 000088 0004+00 0/1 0/0 0/0 .rodata @4310 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4310 = 80.0f; -COMPILER_STRIP_GATE(80C311D4, &lit_4310); +COMPILER_STRIP_GATE(0x80C311D4, &lit_4310); #pragma pop /* 80C311D8-80C311DC 00008C 0004+00 0/1 0/0 0/0 .rodata @4311 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4311 = -4096.0f; -COMPILER_STRIP_GATE(80C311D8, &lit_4311); +COMPILER_STRIP_GATE(0x80C311D8, &lit_4311); #pragma pop /* 80C311DC-80C311E0 000090 0004+00 0/1 0/0 0/0 .rodata @4312 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4312 = 256.0f; -COMPILER_STRIP_GATE(80C311DC, &lit_4312); +COMPILER_STRIP_GATE(0x80C311DC, &lit_4312); #pragma pop /* 80C311E0-80C311E4 000094 0004+00 0/1 0/0 0/0 .rodata @4313 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4313 = 400.0f; -COMPILER_STRIP_GATE(80C311E0, &lit_4313); +COMPILER_STRIP_GATE(0x80C311E0, &lit_4313); #pragma pop /* 80C311E4-80C311E8 000098 0004+00 0/2 0/0 0/0 .rodata @4314 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4314 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(80C311E4, &lit_4314); +COMPILER_STRIP_GATE(0x80C311E4, &lit_4314); #pragma pop /* 80C311E8-80C311EC 00009C 0004+00 0/1 0/0 0/0 .rodata @4315 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4315 = 8.0f; -COMPILER_STRIP_GATE(80C311E8, &lit_4315); +COMPILER_STRIP_GATE(0x80C311E8, &lit_4315); #pragma pop /* 80C311EC-80C311F4 0000A0 0004+04 0/1 0/0 0/0 .rodata @4316 */ @@ -941,7 +947,7 @@ SECTION_RODATA static f32 const lit_4316[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80C311EC, &lit_4316); +COMPILER_STRIP_GATE(0x80C311EC, &lit_4316); #pragma pop /* 80C311F4-80C311FC 0000A8 0008+00 0/1 0/0 0/0 .rodata @4323 */ @@ -950,7 +956,7 @@ COMPILER_STRIP_GATE(80C311EC, &lit_4316); SECTION_RODATA static u8 const lit_4323[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C311F4, &lit_4323); +COMPILER_STRIP_GATE(0x80C311F4, &lit_4323); #pragma pop /* 80C2EA40-80C2F764 000720 0D24+00 6/0 0/0 0/0 .text fly__10daObjKAG_cFv */ @@ -968,14 +974,14 @@ asm void daObjKAG_c::fly() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4353 = 220.0f; -COMPILER_STRIP_GATE(80C311FC, &lit_4353); +COMPILER_STRIP_GATE(0x80C311FC, &lit_4353); #pragma pop /* 80C31200-80C31204 0000B4 0004+00 0/1 0/0 0/0 .rodata @4354 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4354 = 3.0f; -COMPILER_STRIP_GATE(80C31200, &lit_4354); +COMPILER_STRIP_GATE(0x80C31200, &lit_4354); #pragma pop /* 80C2F764-80C2F8C4 001444 0160+00 2/0 0/0 0/0 .text wait__10daObjKAG_cFv */ @@ -993,12 +999,12 @@ asm void daObjKAG_c::wait() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4459 = -20.0f; -COMPILER_STRIP_GATE(80C31204, &lit_4459); +COMPILER_STRIP_GATE(0x80C31204, &lit_4459); #pragma pop /* 80C31208-80C3120C 0000BC 0004+00 1/3 0/0 0/0 .rodata @4460 */ SECTION_RODATA static f32 const lit_4460 = 20.0f; -COMPILER_STRIP_GATE(80C31208, &lit_4460); +COMPILER_STRIP_GATE(0x80C31208, &lit_4460); /* 80C2F8C4-80C2FD94 0015A4 04D0+00 1/0 0/0 0/0 .text walk__10daObjKAG_cFv */ #pragma push @@ -1010,6 +1016,13 @@ asm void daObjKAG_c::walk() { } #pragma pop +/* ############################################################################################## */ +/* 80C31260-80C31260 000114 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80C31266 = "R_SP160"; +#pragma pop + /* 80C2FD94-80C2FF10 001A74 017C+00 1/0 0/0 0/0 .text bin_wait__10daObjKAG_cFv */ #pragma push #pragma optimization_level 0 @@ -1025,28 +1038,28 @@ asm void daObjKAG_c::bin_wait() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4522 = -2.0f; -COMPILER_STRIP_GATE(80C3120C, &lit_4522); +COMPILER_STRIP_GATE(0x80C3120C, &lit_4522); #pragma pop /* 80C31210-80C31214 0000C4 0004+00 0/1 0/0 0/0 .rodata @4523 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4523 = 2.0f / 5.0f; -COMPILER_STRIP_GATE(80C31210, &lit_4523); +COMPILER_STRIP_GATE(0x80C31210, &lit_4523); #pragma pop /* 80C31214-80C31218 0000C8 0004+00 0/1 0/0 0/0 .rodata @4524 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4524 = 3.0f / 5.0f; -COMPILER_STRIP_GATE(80C31214, &lit_4524); +COMPILER_STRIP_GATE(0x80C31214, &lit_4524); #pragma pop /* 80C31218-80C3121C 0000CC 0004+00 0/1 0/0 0/0 .rodata @4525 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4525 = 62.0f; -COMPILER_STRIP_GATE(80C31218, &lit_4525); +COMPILER_STRIP_GATE(0x80C31218, &lit_4525); #pragma pop /* 80C3121C-80C31224 0000D0 0004+04 0/1 0/0 0/0 .rodata @4526 */ @@ -1057,7 +1070,7 @@ SECTION_RODATA static f32 const lit_4526[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80C3121C, &lit_4526); +COMPILER_STRIP_GATE(0x80C3121C, &lit_4526); #pragma pop /* 80C31224-80C3122C 0000D8 0008+00 0/1 0/0 0/0 .rodata @4527 */ @@ -1066,7 +1079,7 @@ COMPILER_STRIP_GATE(80C3121C, &lit_4526); SECTION_RODATA static u8 const lit_4527[8] = { 0x3F, 0xB9, 0x99, 0x99, 0x99, 0x99, 0x99, 0x9A, }; -COMPILER_STRIP_GATE(80C31224, &lit_4527); +COMPILER_STRIP_GATE(0x80C31224, &lit_4527); #pragma pop /* 80C2FF10-80C30070 001BF0 0160+00 1/0 0/0 0/0 .text bin_action__10daObjKAG_cFv */ @@ -1084,7 +1097,7 @@ asm void daObjKAG_c::bin_action() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4588 = -10.0f; -COMPILER_STRIP_GATE(80C3122C, &lit_4588); +COMPILER_STRIP_GATE(0x80C3122C, &lit_4588); #pragma pop /* 80C30070-80C30274 001D50 0204+00 1/0 0/0 0/0 .text hook__10daObjKAG_cFv */ @@ -1100,7 +1113,7 @@ asm void daObjKAG_c::hook() { /* ############################################################################################## */ /* 80C31230-80C31234 0000E4 0004+00 1/1 0/0 0/0 .rodata @4634 */ SECTION_RODATA static f32 const lit_4634 = 100.0f; -COMPILER_STRIP_GATE(80C31230, &lit_4634); +COMPILER_STRIP_GATE(0x80C31230, &lit_4634); /* 80C30274-80C303C4 001F54 0150+00 1/0 0/0 0/0 .text boomerang__10daObjKAG_cFv */ #pragma push @@ -1131,12 +1144,12 @@ SECTION_RODATA static u16 const l_kag_itemno[1 + 1 /* padding */] = { /* padding */ 0x0000, }; -COMPILER_STRIP_GATE(80C31234, &l_kag_itemno); +COMPILER_STRIP_GATE(0x80C31234, &l_kag_itemno); #pragma pop /* 80C31238-80C3123C 0000EC 0004+00 1/1 0/0 0/0 .rodata @4654 */ SECTION_RODATA static f32 const lit_4654 = -1000000000.0f; -COMPILER_STRIP_GATE(80C31238, &lit_4654); +COMPILER_STRIP_GATE(0x80C31238, &lit_4654); /* 80C30424-80C30498 002104 0074+00 1/1 0/0 0/0 .text checkGroundPos__10daObjKAG_cFv */ #pragma push @@ -1165,13 +1178,13 @@ SECTION_RODATA static f32 const lit_4714[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80C3123C, &lit_4714); +COMPILER_STRIP_GATE(0x80C3123C, &lit_4714); /* 80C31244-80C3124C 0000F8 0008+00 1/1 0/0 0/0 .rodata @4716 */ SECTION_RODATA static u8 const lit_4716[8] = { 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C31244, &lit_4716); +COMPILER_STRIP_GATE(0x80C31244, &lit_4716); /* 80C3054C-80C306EC 00222C 01A0+00 1/1 0/0 0/0 .text execute__10daObjKAG_cFv */ #pragma push @@ -1212,21 +1225,21 @@ asm void daObjKAG_c::setBaseMtx() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4785 = 50.0f; -COMPILER_STRIP_GATE(80C3124C, &lit_4785); +COMPILER_STRIP_GATE(0x80C3124C, &lit_4785); #pragma pop /* 80C31250-80C31254 000104 0004+00 0/1 0/0 0/0 .rodata @4786 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4786 = 15.0f; -COMPILER_STRIP_GATE(80C31250, &lit_4786); +COMPILER_STRIP_GATE(0x80C31250, &lit_4786); #pragma pop /* 80C31254-80C31258 000108 0004+00 0/1 0/0 0/0 .rodata @4787 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4787 = -3.0f / 5.0f; -COMPILER_STRIP_GATE(80C31254, &lit_4787); +COMPILER_STRIP_GATE(0x80C31254, &lit_4787); #pragma pop /* 80C307D4-80C308D0 0024B4 00FC+00 1/0 0/0 0/0 .text daObjKAG_Draw__FP10daObjKAG_c */ @@ -1254,14 +1267,14 @@ static asm void daObjKAG_Execute(daObjKAG_c* param_0) { #pragma push #pragma force_active on SECTION_RODATA static u32 const l_musiya_num = 0x01A701A8; -COMPILER_STRIP_GATE(80C31258, &l_musiya_num); +COMPILER_STRIP_GATE(0x80C31258, &l_musiya_num); #pragma pop /* 80C3125C-80C31260 000110 0004+00 0/1 0/0 0/0 .rodata @4994 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4994 = -50.0f; -COMPILER_STRIP_GATE(80C3125C, &lit_4994); +COMPILER_STRIP_GATE(0x80C3125C, &lit_4994); #pragma pop /* 80C31434-80C31440 00000C 000C+00 1/1 0/0 0/0 .bss @3769 */ @@ -1348,7 +1361,7 @@ asm void __sinit_d_a_obj_kag_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80C310A8 = (void*)__sinit_d_a_obj_kag_cpp; +REGISTER_CTORS(0x80C310A8, __sinit_d_a_obj_kag_cpp); #pragma pop /* 80C310E4-80C310F0 002DC4 000C+00 2/0 0/0 0/0 .text Insect_Release__9dInsect_cFv */ @@ -1371,10 +1384,4 @@ asm cCcD_GStts::~cCcD_GStts() { } #pragma pop -/* 80C31260-80C3126E 000114 000E+00 9/9 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80C31260 = "I_Kag"; -SECTION_DEAD static char const* const stringBase_80C31266 = "R_SP160"; -#pragma pop +/* 80C31260-80C31260 000114 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_kage/d_a_obj_kage.cpp b/rel/d/a/obj/d_a_obj_kage/d_a_obj_kage.cpp index c7670dadc20..362efc6f072 100644 --- a/rel/d/a/obj/d_a_obj_kage/d_a_obj_kage.cpp +++ b/rel/d/a/obj/d_a_obj_kage/d_a_obj_kage.cpp @@ -127,76 +127,76 @@ SECTION_RODATA static u8 const lit_3854[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C3195C, &lit_3854); +COMPILER_STRIP_GATE(0x80C3195C, &lit_3854); /* 80C31960-80C31964 000004 0004+00 0/1 0/0 0/0 .rodata @3855 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3855 = 0.5f; -COMPILER_STRIP_GATE(80C31960, &lit_3855); +COMPILER_STRIP_GATE(0x80C31960, &lit_3855); #pragma pop /* 80C31964-80C31968 000008 0004+00 0/1 0/0 0/0 .rodata @3856 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3856 = 40.0f; -COMPILER_STRIP_GATE(80C31964, &lit_3856); +COMPILER_STRIP_GATE(0x80C31964, &lit_3856); #pragma pop /* 80C31968-80C3196C 00000C 0004+00 0/1 0/0 0/0 .rodata @3857 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3857 = 120.0f; -COMPILER_STRIP_GATE(80C31968, &lit_3857); +COMPILER_STRIP_GATE(0x80C31968, &lit_3857); #pragma pop /* 80C3196C-80C31970 000010 0004+00 0/1 0/0 0/0 .rodata @3858 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3858 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(80C3196C, &lit_3858); +COMPILER_STRIP_GATE(0x80C3196C, &lit_3858); #pragma pop /* 80C31970-80C31974 000014 0004+00 0/1 0/0 0/0 .rodata @3859 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3859 = 2.0f; -COMPILER_STRIP_GATE(80C31970, &lit_3859); +COMPILER_STRIP_GATE(0x80C31970, &lit_3859); #pragma pop /* 80C31974-80C31978 000018 0004+00 0/1 0/0 0/0 .rodata @3860 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3860 = -120.0f; -COMPILER_STRIP_GATE(80C31974, &lit_3860); +COMPILER_STRIP_GATE(0x80C31974, &lit_3860); #pragma pop /* 80C31978-80C3197C 00001C 0004+00 0/2 0/0 0/0 .rodata @3861 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3861 = 200.0f; -COMPILER_STRIP_GATE(80C31978, &lit_3861); +COMPILER_STRIP_GATE(0x80C31978, &lit_3861); #pragma pop /* 80C3197C-80C31980 000020 0004+00 0/1 0/0 0/0 .rodata @3862 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3862 = 500.0f; -COMPILER_STRIP_GATE(80C3197C, &lit_3862); +COMPILER_STRIP_GATE(0x80C3197C, &lit_3862); #pragma pop /* 80C31980-80C31984 000024 0004+00 0/1 0/0 0/0 .rodata @3863 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3863 = 1.0f; -COMPILER_STRIP_GATE(80C31980, &lit_3863); +COMPILER_STRIP_GATE(0x80C31980, &lit_3863); #pragma pop /* 80C31984-80C31988 000028 0004+00 0/1 0/0 0/0 .rodata @3864 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3864 = 10.0f; -COMPILER_STRIP_GATE(80C31984, &lit_3864); +COMPILER_STRIP_GATE(0x80C31984, &lit_3864); #pragma pop /* 80C3153C-80C31764 0000DC 0228+00 2/1 0/0 0/0 .text daObj_Kage_Execute__FP14obj_kage_class */ @@ -214,6 +214,13 @@ static bool daObj_Kage_IsDelete(obj_kage_class* param_0) { return true; } +/* ############################################################################################## */ +/* 80C31990-80C31990 000034 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80C31990 = "Obj_kage"; +#pragma pop + /* 80C3176C-80C3179C 00030C 0030+00 1/0 0/0 0/0 .text daObj_Kage_Delete__FP14obj_kage_class */ #pragma push #pragma optimization_level 0 @@ -239,14 +246,14 @@ static asm void useHeapInit(fopAc_ac_c* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3926 = 65536.0f; -COMPILER_STRIP_GATE(80C31988, &lit_3926); +COMPILER_STRIP_GATE(0x80C31988, &lit_3926); #pragma pop /* 80C3198C-80C31990 000030 0004+00 0/1 0/0 0/0 .rodata @3927 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3927 = -200.0f; -COMPILER_STRIP_GATE(80C3198C, &lit_3927); +COMPILER_STRIP_GATE(0x80C3198C, &lit_3927); #pragma pop /* 80C31808-80C31954 0003A8 014C+00 1/0 0/0 0/0 .text daObj_Kage_Create__FP10fopAc_ac_c @@ -283,9 +290,4 @@ SECTION_DATA extern void* g_profile_OBJ_KAGE[12] = { (void*)0x00040100, (void*)0x000E0000, }; -/* 80C31990-80C31999 000034 0009+00 3/3 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80C31990 = "Obj_kage"; -#pragma pop +/* 80C31990-80C31990 000034 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_kago/d_a_obj_kago.cpp b/rel/d/a/obj/d_a_obj_kago/d_a_obj_kago.cpp index 5440f479b0f..f664ceaa713 100644 --- a/rel/d/a/obj/d_a_obj_kago/d_a_obj_kago.cpp +++ b/rel/d/a/obj/d_a_obj_kago/d_a_obj_kago.cpp @@ -245,7 +245,7 @@ extern "C" static void daObj_Kago_Execute__FPv(); extern "C" static void daObj_Kago_Draw__FPv(); extern "C" static bool daObj_Kago_IsDelete__FPv(); extern "C" void __dt__10cCcD_GSttsFv(); -extern "C" void func_80C33B84(int*); +extern "C" void func_80C33B84(void* _this, int*); extern "C" void __sinit_d_a_obj_kago_cpp(); extern "C" void __dt__18daObj_Kago_Param_cFv(); extern "C" static void func_80C33C5C(); @@ -362,6 +362,13 @@ extern "C" void __register_global_object(); // /* ############################################################################################## */ +/* 80C33D94-80C33D94 000114 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80C33D94 = ""; +SECTION_DEAD static char const* const stringBase_80C33D95 = "uri_kago"; +#pragma pop + /* 80C33DA0-80C33DAC 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -516,7 +523,7 @@ SECTION_RODATA u8 const daObj_Kago_Param_c::m[44] = { 0x00, 0x42, 0x92, 0x00, 0x00, 0x41, 0xF0, 0x00, 0x00, 0x41, 0xC0, 0x00, 0x00, 0x41, 0xF0, 0x00, 0x00, 0x41, 0xF0, 0x00, 0x00, 0x42, 0x5C, 0x00, 0x00, 0x41, 0x20, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C33C80, &daObj_Kago_Param_c::m); +COMPILER_STRIP_GATE(0x80C33C80, &daObj_Kago_Param_c::m); /* 80C33CAC-80C33CDC 00002C 0030+00 0/0 0/0 0/0 .rodata l_ccDObjData */ #pragma push @@ -526,7 +533,7 @@ SECTION_RODATA static u8 const l_ccDObjData[48] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x79, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C33CAC, &l_ccDObjData); +COMPILER_STRIP_GATE(0x80C33CAC, &l_ccDObjData); #pragma pop /* 80C33CDC-80C33CF0 00005C 0014+00 0/1 0/0 0/0 .rodata heapSize$3870 */ @@ -536,35 +543,35 @@ SECTION_RODATA static u8 const heapSize[20] = { 0x00, 0x00, 0x08, 0x20, 0x00, 0x00, 0x08, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x20, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C33CDC, &heapSize); +COMPILER_STRIP_GATE(0x80C33CDC, &heapSize); #pragma pop /* 80C33CF0-80C33CF4 000070 0004+00 0/1 0/0 0/0 .rodata @3963 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3963 = -100.0f; -COMPILER_STRIP_GATE(80C33CF0, &lit_3963); +COMPILER_STRIP_GATE(0x80C33CF0, &lit_3963); #pragma pop /* 80C33CF4-80C33CF8 000074 0004+00 0/2 0/0 0/0 .rodata @3964 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3964 = -50.0f; -COMPILER_STRIP_GATE(80C33CF4, &lit_3964); +COMPILER_STRIP_GATE(0x80C33CF4, &lit_3964); #pragma pop /* 80C33CF8-80C33CFC 000078 0004+00 0/2 0/0 0/0 .rodata @3965 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3965 = 100.0f; -COMPILER_STRIP_GATE(80C33CF8, &lit_3965); +COMPILER_STRIP_GATE(0x80C33CF8, &lit_3965); #pragma pop /* 80C33CFC-80C33D00 00007C 0004+00 0/3 0/0 0/0 .rodata @3966 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3966 = -1000000000.0f; -COMPILER_STRIP_GATE(80C33CFC, &lit_3966); +COMPILER_STRIP_GATE(0x80C33CFC, &lit_3966); #pragma pop /* 80C31D5C-80C320FC 00035C 03A0+00 1/1 0/0 0/0 .text create__12daObj_Kago_cFv */ @@ -682,7 +689,7 @@ asm void daObj_Kago_c::Delete() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4523 = 50.0f; -COMPILER_STRIP_GATE(80C33D00, &lit_4523); +COMPILER_STRIP_GATE(0x80C33D00, &lit_4523); #pragma pop /* 80C33D04-80C33D08 000084 0004+00 0/2 0/0 0/0 .rodata @4524 */ @@ -694,166 +701,166 @@ SECTION_RODATA static u8 const lit_4524[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C33D04, &lit_4524); +COMPILER_STRIP_GATE(0x80C33D04, &lit_4524); #pragma pop /* 80C33D08-80C33D0C 000088 0004+00 0/1 0/0 0/0 .rodata @4525 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4525 = 0x43360B61; -COMPILER_STRIP_GATE(80C33D08, &lit_4525); +COMPILER_STRIP_GATE(0x80C33D08, &lit_4525); #pragma pop /* 80C33D0C-80C33D10 00008C 0004+00 0/1 0/0 0/0 .rodata @4526 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4526 = 3.0f / 10.0f; -COMPILER_STRIP_GATE(80C33D0C, &lit_4526); +COMPILER_STRIP_GATE(0x80C33D0C, &lit_4526); #pragma pop /* 80C33D10-80C33D14 000090 0004+00 0/1 0/0 0/0 .rodata @4527 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4527 = 0.5f; -COMPILER_STRIP_GATE(80C33D10, &lit_4527); +COMPILER_STRIP_GATE(0x80C33D10, &lit_4527); #pragma pop /* 80C33D14-80C33D18 000094 0004+00 0/1 0/0 0/0 .rodata @4528 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4528 = 3000.0f; -COMPILER_STRIP_GATE(80C33D14, &lit_4528); +COMPILER_STRIP_GATE(0x80C33D14, &lit_4528); #pragma pop /* 80C33D18-80C33D1C 000098 0004+00 0/1 0/0 0/0 .rodata @4529 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4529 = 31.0f / 20.0f; -COMPILER_STRIP_GATE(80C33D18, &lit_4529); +COMPILER_STRIP_GATE(0x80C33D18, &lit_4529); #pragma pop /* 80C33D1C-80C33D20 00009C 0004+00 0/1 0/0 0/0 .rodata @4530 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4530 = 3.0f / 20.0f; -COMPILER_STRIP_GATE(80C33D1C, &lit_4530); +COMPILER_STRIP_GATE(0x80C33D1C, &lit_4530); #pragma pop /* 80C33D20-80C33D24 0000A0 0004+00 3/5 0/0 0/0 .rodata @4531 */ SECTION_RODATA static f32 const lit_4531 = 1.0f; -COMPILER_STRIP_GATE(80C33D20, &lit_4531); +COMPILER_STRIP_GATE(0x80C33D20, &lit_4531); /* 80C33D24-80C33D28 0000A4 0004+00 0/1 0/0 0/0 .rodata @4532 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4532 = 0.75f; -COMPILER_STRIP_GATE(80C33D24, &lit_4532); +COMPILER_STRIP_GATE(0x80C33D24, &lit_4532); #pragma pop /* 80C33D28-80C33D2C 0000A8 0004+00 0/1 0/0 0/0 .rodata @4533 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4533 = 2000.0f; -COMPILER_STRIP_GATE(80C33D28, &lit_4533); +COMPILER_STRIP_GATE(0x80C33D28, &lit_4533); #pragma pop /* 80C33D2C-80C33D30 0000AC 0004+00 0/1 0/0 0/0 .rodata @4534 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4534 = 2.0f; -COMPILER_STRIP_GATE(80C33D2C, &lit_4534); +COMPILER_STRIP_GATE(0x80C33D2C, &lit_4534); #pragma pop /* 80C33D30-80C33D34 0000B0 0004+00 0/1 0/0 0/0 .rodata @4535 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4535 = 4.0f / 5.0f; -COMPILER_STRIP_GATE(80C33D30, &lit_4535); +COMPILER_STRIP_GATE(0x80C33D30, &lit_4535); #pragma pop /* 80C33D34-80C33D38 0000B4 0004+00 0/1 0/0 0/0 .rodata @4536 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4536 = 11.0f; -COMPILER_STRIP_GATE(80C33D34, &lit_4536); +COMPILER_STRIP_GATE(0x80C33D34, &lit_4536); #pragma pop /* 80C33D38-80C33D3C 0000B8 0004+00 0/1 0/0 0/0 .rodata @4537 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4537 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(80C33D38, &lit_4537); +COMPILER_STRIP_GATE(0x80C33D38, &lit_4537); #pragma pop /* 80C33D3C-80C33D40 0000BC 0004+00 0/1 0/0 0/0 .rodata @4538 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4538 = 1000.0f; -COMPILER_STRIP_GATE(80C33D3C, &lit_4538); +COMPILER_STRIP_GATE(0x80C33D3C, &lit_4538); #pragma pop /* 80C33D40-80C33D44 0000C0 0004+00 0/1 0/0 0/0 .rodata @4539 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4539 = -30.0f; -COMPILER_STRIP_GATE(80C33D40, &lit_4539); +COMPILER_STRIP_GATE(0x80C33D40, &lit_4539); #pragma pop /* 80C33D44-80C33D48 0000C4 0004+00 1/2 0/0 0/0 .rodata @4540 */ SECTION_RODATA static f32 const lit_4540 = 7.0f / 10.0f; -COMPILER_STRIP_GATE(80C33D44, &lit_4540); +COMPILER_STRIP_GATE(0x80C33D44, &lit_4540); /* 80C33D48-80C33D4C 0000C8 0004+00 0/1 0/0 0/0 .rodata @4541 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4541 = -2.0f / 5.0f; -COMPILER_STRIP_GATE(80C33D48, &lit_4541); +COMPILER_STRIP_GATE(0x80C33D48, &lit_4541); #pragma pop /* 80C33D4C-80C33D50 0000CC 0004+00 0/1 0/0 0/0 .rodata @4542 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4542 = 1200.0f; -COMPILER_STRIP_GATE(80C33D4C, &lit_4542); +COMPILER_STRIP_GATE(0x80C33D4C, &lit_4542); #pragma pop /* 80C33D50-80C33D54 0000D0 0004+00 0/1 0/0 0/0 .rodata @4543 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4543 = 900.0f; -COMPILER_STRIP_GATE(80C33D50, &lit_4543); +COMPILER_STRIP_GATE(0x80C33D50, &lit_4543); #pragma pop /* 80C33D54-80C33D58 0000D4 0004+00 1/2 0/0 0/0 .rodata @4544 */ SECTION_RODATA static f32 const lit_4544 = 1.0f / 20.0f; -COMPILER_STRIP_GATE(80C33D54, &lit_4544); +COMPILER_STRIP_GATE(0x80C33D54, &lit_4544); /* 80C33D58-80C33D5C 0000D8 0004+00 0/1 0/0 0/0 .rodata @4545 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4545 = 0.25f; -COMPILER_STRIP_GATE(80C33D58, &lit_4545); +COMPILER_STRIP_GATE(0x80C33D58, &lit_4545); #pragma pop /* 80C33D5C-80C33D60 0000DC 0004+00 0/1 0/0 0/0 .rodata @4546 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4546 = 30.0f; -COMPILER_STRIP_GATE(80C33D5C, &lit_4546); +COMPILER_STRIP_GATE(0x80C33D5C, &lit_4546); #pragma pop /* 80C33D60-80C33D64 0000E0 0004+00 0/1 0/0 0/0 .rodata @4547 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4547 = 33.0f / 100.0f; -COMPILER_STRIP_GATE(80C33D60, &lit_4547); +COMPILER_STRIP_GATE(0x80C33D60, &lit_4547); #pragma pop /* 80C33D64-80C33D68 0000E4 0004+00 0/1 0/0 0/0 .rodata @4548 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4548 = -14.0f; -COMPILER_STRIP_GATE(80C33D64, &lit_4548); +COMPILER_STRIP_GATE(0x80C33D64, &lit_4548); #pragma pop /* 80C33D68-80C33D70 0000E8 0004+04 0/1 0/0 0/0 .rodata @4549 */ @@ -864,7 +871,7 @@ SECTION_RODATA static f32 const lit_4549[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80C33D68, &lit_4549); +COMPILER_STRIP_GATE(0x80C33D68, &lit_4549); #pragma pop /* 80C33D70-80C33D78 0000F0 0008+00 0/1 0/0 0/0 .rodata @4551 */ @@ -873,7 +880,7 @@ COMPILER_STRIP_GATE(80C33D68, &lit_4549); SECTION_RODATA static u8 const lit_4551[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C33D70, &lit_4551); +COMPILER_STRIP_GATE(0x80C33D70, &lit_4551); #pragma pop /* 80C324E4-80C332D0 000AE4 0DEC+00 2/2 0/0 0/0 .text Execute__12daObj_Kago_cFv */ @@ -891,7 +898,7 @@ asm void daObj_Kago_c::Execute() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4576 = 20.0f; -COMPILER_STRIP_GATE(80C33D78, &lit_4576); +COMPILER_STRIP_GATE(0x80C33D78, &lit_4576); #pragma pop /* 80C332D0-80C333F0 0018D0 0120+00 1/1 0/0 0/0 .text Draw__12daObj_Kago_cFv */ @@ -970,21 +977,21 @@ asm void daObj_Kago_c::setMtx() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4679 = 5.0f; -COMPILER_STRIP_GATE(80C33D7C, &lit_4679); +COMPILER_STRIP_GATE(0x80C33D7C, &lit_4679); #pragma pop /* 80C33D80-80C33D84 000100 0004+00 0/1 0/0 0/0 .rodata @4680 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4680 = 200.0f; -COMPILER_STRIP_GATE(80C33D80, &lit_4680); +COMPILER_STRIP_GATE(0x80C33D80, &lit_4680); #pragma pop /* 80C33D84-80C33D88 000104 0004+00 0/1 0/0 0/0 .rodata @4681 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4681 = -1.0f; -COMPILER_STRIP_GATE(80C33D84, &lit_4681); +COMPILER_STRIP_GATE(0x80C33D84, &lit_4681); #pragma pop /* 80C33620-80C337B0 001C20 0190+00 1/1 0/0 0/0 .text getWallAngle__12daObj_Kago_cFsPs */ @@ -1002,21 +1009,21 @@ asm void daObj_Kago_c::getWallAngle(s16 param_0, s16* param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4706 = 1593.0f; -COMPILER_STRIP_GATE(80C33D88, &lit_4706); +COMPILER_STRIP_GATE(0x80C33D88, &lit_4706); #pragma pop /* 80C33D8C-80C33D90 00010C 0004+00 0/1 0/0 0/0 .rodata @4707 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4707 = 659.0f; -COMPILER_STRIP_GATE(80C33D8C, &lit_4707); +COMPILER_STRIP_GATE(0x80C33D8C, &lit_4707); #pragma pop /* 80C33D90-80C33D94 000110 0004+00 0/1 0/0 0/0 .rodata @4708 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4708 = -334.0f; -COMPILER_STRIP_GATE(80C33D90, &lit_4708); +COMPILER_STRIP_GATE(0x80C33D90, &lit_4708); #pragma pop /* 80C33F00-80C33F04 000008 0001+03 1/1 0/0 0/0 .bss @1109 */ @@ -1235,7 +1242,7 @@ asm cCcD_GStts::~cCcD_GStts() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80C33B84(int* param_0) { +extern "C" asm void func_80C33B84(void* _this, int* param_0) { nofralloc #include "asm/rel/d/a/obj/d_a_obj_kago/d_a_obj_kago/func_80C33B84.s" } @@ -1261,7 +1268,7 @@ asm void __sinit_d_a_obj_kago_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80C33BA0 = (void*)__sinit_d_a_obj_kago_cpp; +REGISTER_CTORS(0x80C33BA0, __sinit_d_a_obj_kago_cpp); #pragma pop /* 80C33C14-80C33C5C 002214 0048+00 2/1 0/0 0/0 .text __dt__18daObj_Kago_Param_cFv */ @@ -1466,10 +1473,4 @@ static u8 data_80C33FCC[4]; static u8 data_80C33FD0[4]; #pragma pop -/* 80C33D94-80C33D9E 000114 000A+00 1/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80C33D94 = ""; -SECTION_DEAD static char const* const stringBase_80C33D95 = "uri_kago"; -#pragma pop +/* 80C33D94-80C33D94 000114 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_kaisou/d_a_obj_kaisou.cpp b/rel/d/a/obj/d_a_obj_kaisou/d_a_obj_kaisou.cpp index 279a0e651ef..e737716f1a8 100644 --- a/rel/d/a/obj/d_a_obj_kaisou/d_a_obj_kaisou.cpp +++ b/rel/d/a/obj/d_a_obj_kaisou/d_a_obj_kaisou.cpp @@ -35,10 +35,10 @@ struct fopAcM_gc_c { static f32 mGroundY; }; -struct J3DJoint {}; - struct J3DModel {}; +struct J3DJoint {}; + struct daObjKaisou_c { /* 80C34058 */ void ctrlJoint(J3DJoint*, J3DModel*); /* 80C34390 */ void initCcCylinder(); @@ -210,17 +210,17 @@ extern "C" f32 mGroundY__11fopAcM_gc_c; /* ############################################################################################## */ /* 80C34EEC-80C34EF0 000000 0004+00 4/4 0/0 0/0 .rodata @3806 */ SECTION_RODATA static f32 const lit_3806 = 7.0f / 10.0f; -COMPILER_STRIP_GATE(80C34EEC, &lit_3806); +COMPILER_STRIP_GATE(0x80C34EEC, &lit_3806); /* 80C34EF0-80C34EF4 000004 0004+00 1/1 0/0 0/0 .rodata @3807 */ SECTION_RODATA static f32 const lit_3807 = 0.5f; -COMPILER_STRIP_GATE(80C34EF0, &lit_3807); +COMPILER_STRIP_GATE(0x80C34EF0, &lit_3807); /* 80C34EF4-80C34EFC 000008 0008+00 1/3 0/0 0/0 .rodata @3809 */ SECTION_RODATA static u8 const lit_3809[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C34EF4, &lit_3809); +COMPILER_STRIP_GATE(0x80C34EF4, &lit_3809); /* 80C34058-80C34288 000078 0230+00 1/1 0/0 0/0 .text * ctrlJoint__13daObjKaisou_cFP8J3DJointP8J3DModel */ @@ -244,6 +244,13 @@ static asm void JointCallBack(J3DJoint* param_0, int param_1) { #pragma pop /* ############################################################################################## */ +/* 80C34FA0-80C34FA0 0000B4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80C34FA0 = "M_kaisou"; +SECTION_DEAD static char const* const stringBase_80C34FA9 = "M_kaisou.bmd"; +#pragma pop + /* 80C34FC0-80C34FC4 -00001 0004+00 3/3 0/0 0/0 .data l_arcName */ SECTION_DATA static void* l_arcName = (void*)&d_a_obj_kaisou__stringBase0; @@ -287,7 +294,7 @@ SECTION_RODATA static u8 const ccCylSrc[68] = { 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0x48, 0x00, 0x00, 0x42, 0xC8, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C34EFC, &ccCylSrc); +COMPILER_STRIP_GATE(0x80C34EFC, &ccCylSrc); /* 80C34390-80C343F0 0003B0 0060+00 1/1 0/0 0/0 .text initCcCylinder__13daObjKaisou_cFv */ @@ -320,7 +327,7 @@ SECTION_RODATA static u8 const lit_3963[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C34F40, &lit_3963); +COMPILER_STRIP_GATE(0x80C34F40, &lit_3963); #pragma pop /* 80C34F44-80C34F4C 000058 0008+00 0/1 0/0 0/0 .rodata @3964 */ @@ -329,7 +336,7 @@ COMPILER_STRIP_GATE(80C34F40, &lit_3963); SECTION_RODATA static u8 const lit_3964[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C34F44, &lit_3964); +COMPILER_STRIP_GATE(0x80C34F44, &lit_3964); #pragma pop /* 80C34F4C-80C34F54 000060 0008+00 0/1 0/0 0/0 .rodata @3965 */ @@ -338,7 +345,7 @@ COMPILER_STRIP_GATE(80C34F44, &lit_3964); SECTION_RODATA static u8 const lit_3965[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C34F4C, &lit_3965); +COMPILER_STRIP_GATE(0x80C34F4C, &lit_3965); #pragma pop /* 80C34F54-80C34F5C 000068 0008+00 0/1 0/0 0/0 .rodata @3966 */ @@ -347,35 +354,35 @@ COMPILER_STRIP_GATE(80C34F4C, &lit_3965); SECTION_RODATA static u8 const lit_3966[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C34F54, &lit_3966); +COMPILER_STRIP_GATE(0x80C34F54, &lit_3966); #pragma pop /* 80C34F5C-80C34F60 000070 0004+00 0/2 0/0 0/0 .rodata @3967 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3967 = 4.0f; -COMPILER_STRIP_GATE(80C34F5C, &lit_3967); +COMPILER_STRIP_GATE(0x80C34F5C, &lit_3967); #pragma pop /* 80C34F60-80C34F64 000074 0004+00 0/1 0/0 0/0 .rodata @3968 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3968 = 6.0f / 5.0f; -COMPILER_STRIP_GATE(80C34F60, &lit_3968); +COMPILER_STRIP_GATE(0x80C34F60, &lit_3968); #pragma pop /* 80C34F64-80C34F68 000078 0004+00 0/1 0/0 0/0 .rodata @3969 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3969 = 120.0f; -COMPILER_STRIP_GATE(80C34F64, &lit_3969); +COMPILER_STRIP_GATE(0x80C34F64, &lit_3969); #pragma pop /* 80C34F68-80C34F6C 00007C 0004+00 0/1 0/0 0/0 .rodata @3970 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3970 = 4096.0f; -COMPILER_STRIP_GATE(80C34F68, &lit_3970); +COMPILER_STRIP_GATE(0x80C34F68, &lit_3970); #pragma pop /* 80C34FC4-80C35038 -00001 0074+00 1/1 0/0 0/0 .data @3975 */ @@ -430,7 +437,7 @@ SECTION_RODATA static f32 const lit_3995[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80C34F6C, &lit_3995); +COMPILER_STRIP_GATE(0x80C34F6C, &lit_3995); #pragma pop /* 80C34F74-80C34F7C 000088 0008+00 0/1 0/0 0/0 .rodata @3996 */ @@ -439,21 +446,21 @@ COMPILER_STRIP_GATE(80C34F6C, &lit_3995); SECTION_RODATA static u8 const lit_3996[8] = { 0x3F, 0xF8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C34F74, &lit_3996); +COMPILER_STRIP_GATE(0x80C34F74, &lit_3996); #pragma pop /* 80C34F7C-80C34F80 000090 0004+00 0/1 0/0 0/0 .rodata @3997 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3997 = 32768.0f; -COMPILER_STRIP_GATE(80C34F7C, &lit_3997); +COMPILER_STRIP_GATE(0x80C34F7C, &lit_3997); #pragma pop /* 80C34F80-80C34F84 000094 0004+00 0/1 0/0 0/0 .rodata @3998 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3998 = 9.0f / 5.0f; -COMPILER_STRIP_GATE(80C34F80, &lit_3998); +COMPILER_STRIP_GATE(0x80C34F80, &lit_3998); #pragma pop /* 80C34824-80C34A98 000844 0274+00 1/1 0/0 0/0 .text Execute__13daObjKaisou_cFv */ @@ -479,7 +486,7 @@ asm void daObjKaisou_c::Delete() { /* ############################################################################################## */ /* 80C34F84-80C34F88 000098 0004+00 1/1 0/0 0/0 .rodata @4022 */ SECTION_RODATA static f32 const lit_4022 = 2.0f; -COMPILER_STRIP_GATE(80C34F84, &lit_4022); +COMPILER_STRIP_GATE(0x80C34F84, &lit_4022); /* 80C34ACC-80C34B34 000AEC 0068+00 1/1 0/0 0/0 .text setBaseMtx__13daObjKaisou_cFv */ #pragma push @@ -517,42 +524,48 @@ static asm void daObjKaisou_Execute(daObjKaisou_c* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4157 = -9.0f; -COMPILER_STRIP_GATE(80C34F88, &lit_4157); +COMPILER_STRIP_GATE(0x80C34F88, &lit_4157); #pragma pop /* 80C34F8C-80C34F90 0000A0 0004+00 0/1 0/0 0/0 .rodata @4158 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4158 = 100.0f; -COMPILER_STRIP_GATE(80C34F8C, &lit_4158); +COMPILER_STRIP_GATE(0x80C34F8C, &lit_4158); #pragma pop /* 80C34F90-80C34F94 0000A4 0004+00 0/1 0/0 0/0 .rodata @4159 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4159 = -1000.0f; -COMPILER_STRIP_GATE(80C34F90, &lit_4159); +COMPILER_STRIP_GATE(0x80C34F90, &lit_4159); #pragma pop /* 80C34F94-80C34F98 0000A8 0004+00 0/1 0/0 0/0 .rodata @4160 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4160 = -500.0f; -COMPILER_STRIP_GATE(80C34F94, &lit_4160); +COMPILER_STRIP_GATE(0x80C34F94, &lit_4160); #pragma pop /* 80C34F98-80C34F9C 0000AC 0004+00 0/1 0/0 0/0 .rodata @4161 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4161 = 1000.0f; -COMPILER_STRIP_GATE(80C34F98, &lit_4161); +COMPILER_STRIP_GATE(0x80C34F98, &lit_4161); #pragma pop /* 80C34F9C-80C34FA0 0000B0 0004+00 0/1 0/0 0/0 .rodata @4162 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4162 = 500.0f; -COMPILER_STRIP_GATE(80C34F9C, &lit_4162); +COMPILER_STRIP_GATE(0x80C34F9C, &lit_4162); +#pragma pop + +/* 80C34FA0-80C34FA0 0000B4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80C34FB6 = "D_MN01A"; #pragma pop /* 80C35038-80C35058 -00001 0020+00 1/0 0/0 0/0 .data l_daObjKaisou_Method */ @@ -626,11 +639,4 @@ static bool daObjKaisou_IsDelete(daObjKaisou_c* param_0) { return true; } -/* 80C34FA0-80C34FBE 0000B4 001E+00 3/2 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80C34FA0 = "M_kaisou"; -SECTION_DEAD static char const* const stringBase_80C34FA9 = "M_kaisou.bmd"; -SECTION_DEAD static char const* const stringBase_80C34FB6 = "D_MN01A"; -#pragma pop +/* 80C34FA0-80C34FA0 0000B4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_kamakiri/d_a_obj_kamakiri.cpp b/rel/d/a/obj/d_a_obj_kamakiri/d_a_obj_kamakiri.cpp index 98dcec3c174..fa60614fd82 100644 --- a/rel/d/a/obj/d_a_obj_kamakiri/d_a_obj_kamakiri.cpp +++ b/rel/d/a/obj/d_a_obj_kamakiri/d_a_obj_kamakiri.cpp @@ -50,19 +50,19 @@ struct mDoExt_baseAnm { /* 8000D428 */ void play(); }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; +struct J3DAnmTransform {}; + +struct J3DModelData {}; + struct Z2Creature { /* 802C03C8 */ Z2Creature(); /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -409,11 +409,11 @@ extern "C" void __register_global_object(); /* ############################################################################################## */ /* 80C38408-80C3840C 000000 0004+00 13/13 0/0 0/0 .rodata @3775 */ SECTION_RODATA static f32 const lit_3775 = 1.5f; -COMPILER_STRIP_GATE(80C38408, &lit_3775); +COMPILER_STRIP_GATE(0x80C38408, &lit_3775); /* 80C3840C-80C38410 000004 0004+00 1/1 0/0 0/0 .rodata @3776 */ SECTION_RODATA static f32 const lit_3776 = 6.0f / 5.0f; -COMPILER_STRIP_GATE(80C3840C, &lit_3776); +COMPILER_STRIP_GATE(0x80C3840C, &lit_3776); /* 80C3850C-80C3852C -00001 0020+00 1/0 0/0 0/0 .data l_daObjKAM_Method */ SECTION_DATA static void* l_daObjKAM_Method[8] = { @@ -510,7 +510,7 @@ SECTION_RODATA static u8 const ccSphSrc[64] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0x20, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C38410, &ccSphSrc); +COMPILER_STRIP_GATE(0x80C38410, &ccSphSrc); /* 80C351BC-80C35228 00011C 006C+00 1/1 0/0 0/0 .text InitCcSph__10daObjKAM_cFv */ #pragma push @@ -525,7 +525,7 @@ asm void daObjKAM_c::InitCcSph() { /* ############################################################################################## */ /* 80C38450-80C38454 000048 0004+00 1/4 0/0 0/0 .rodata @3789 */ SECTION_RODATA static f32 const lit_3789 = 20.0f; -COMPILER_STRIP_GATE(80C38450, &lit_3789); +COMPILER_STRIP_GATE(0x80C38450, &lit_3789); /* 80C35228-80C35280 000188 0058+00 1/1 0/0 0/0 .text SetCcSph__10daObjKAM_cFv */ #pragma push @@ -550,7 +550,13 @@ static asm void useHeapInit(fopAc_ac_c* param_0) { /* ############################################################################################## */ /* 80C38454-80C38458 00004C 0004+00 2/9 0/0 0/0 .rodata @3895 */ SECTION_RODATA static f32 const lit_3895 = 1.0f; -COMPILER_STRIP_GATE(80C38454, &lit_3895); +COMPILER_STRIP_GATE(0x80C38454, &lit_3895); + +/* 80C384FC-80C384FC 0000F4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80C384FC = "I_Kam"; +#pragma pop /* 80C352A0-80C355F8 000200 0358+00 1/1 0/0 0/0 .text CreateHeap__10daObjKAM_cFv */ #pragma push @@ -600,34 +606,34 @@ SECTION_RODATA static u8 const lit_3932[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C38458, &lit_3932); +COMPILER_STRIP_GATE(0x80C38458, &lit_3932); /* 80C3845C-80C38460 000054 0004+00 0/6 0/0 0/0 .rodata @3933 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3933 = 5.0f; -COMPILER_STRIP_GATE(80C3845C, &lit_3933); +COMPILER_STRIP_GATE(0x80C3845C, &lit_3933); #pragma pop /* 80C38460-80C38464 000058 0004+00 0/6 0/0 0/0 .rodata @3934 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3934 = -1.0f; -COMPILER_STRIP_GATE(80C38460, &lit_3934); +COMPILER_STRIP_GATE(0x80C38460, &lit_3934); #pragma pop /* 80C38464-80C38468 00005C 0004+00 0/6 0/0 0/0 .rodata @3935 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3935 = 50.0f; -COMPILER_STRIP_GATE(80C38464, &lit_3935); +COMPILER_STRIP_GATE(0x80C38464, &lit_3935); #pragma pop /* 80C38468-80C3846C 000060 0004+00 0/5 0/0 0/0 .rodata @3936 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3936 = 100.0f; -COMPILER_STRIP_GATE(80C38468, &lit_3936); +COMPILER_STRIP_GATE(0x80C38468, &lit_3936); #pragma pop /* 80C35684-80C357EC 0005E4 0168+00 1/1 0/0 0/0 .text ShopWaitAction__10daObjKAM_cFv */ @@ -645,7 +651,7 @@ asm void daObjKAM_c::ShopWaitAction() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3960 = 1500.0f; -COMPILER_STRIP_GATE(80C3846C, &lit_3960); +COMPILER_STRIP_GATE(0x80C3846C, &lit_3960); #pragma pop /* 80C357EC-80C35970 00074C 0184+00 1/1 0/0 0/0 .text WaitAction__10daObjKAM_cFv */ @@ -665,7 +671,7 @@ asm void daObjKAM_c::WaitAction() { SECTION_RODATA static u8 const lit_4013[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C38470, &lit_4013); +COMPILER_STRIP_GATE(0x80C38470, &lit_4013); #pragma pop /* 80C38478-80C38480 000070 0008+00 0/5 0/0 0/0 .rodata @4014 */ @@ -674,7 +680,7 @@ COMPILER_STRIP_GATE(80C38470, &lit_4013); SECTION_RODATA static u8 const lit_4014[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C38478, &lit_4014); +COMPILER_STRIP_GATE(0x80C38478, &lit_4014); #pragma pop /* 80C38480-80C38488 000078 0008+00 0/5 0/0 0/0 .rodata @4015 */ @@ -683,7 +689,7 @@ COMPILER_STRIP_GATE(80C38478, &lit_4014); SECTION_RODATA static u8 const lit_4015[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C38480, &lit_4015); +COMPILER_STRIP_GATE(0x80C38480, &lit_4015); #pragma pop /* 80C35970-80C35B9C 0008D0 022C+00 1/1 0/0 0/0 .text WallCheck__10daObjKAM_cFv */ @@ -711,28 +717,28 @@ asm cM3dGPla::~cM3dGPla() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4039 = 2.0f / 5.0f; -COMPILER_STRIP_GATE(80C38488, &lit_4039); +COMPILER_STRIP_GATE(0x80C38488, &lit_4039); #pragma pop /* 80C3848C-80C38490 000084 0004+00 0/3 0/0 0/0 .rodata @4040 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4040 = 10.0f; -COMPILER_STRIP_GATE(80C3848C, &lit_4040); +COMPILER_STRIP_GATE(0x80C3848C, &lit_4040); #pragma pop /* 80C38490-80C38494 000088 0004+00 0/1 0/0 0/0 .rodata @4041 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4041 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(80C38490, &lit_4041); +COMPILER_STRIP_GATE(0x80C38490, &lit_4041); #pragma pop /* 80C38494-80C38498 00008C 0004+00 0/3 0/0 0/0 .rodata @4042 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4042 = 0.5f; -COMPILER_STRIP_GATE(80C38494, &lit_4042); +COMPILER_STRIP_GATE(0x80C38494, &lit_4042); #pragma pop /* 80C35BE4-80C35CF0 000B44 010C+00 1/1 0/0 0/0 .text SpeedSet__10daObjKAM_cFv */ @@ -750,28 +756,28 @@ asm void daObjKAM_c::SpeedSet() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4143 = 3.0f; -COMPILER_STRIP_GATE(80C38498, &lit_4143); +COMPILER_STRIP_GATE(0x80C38498, &lit_4143); #pragma pop /* 80C3849C-80C384A0 000094 0004+00 0/1 0/0 0/0 .rodata @4144 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4144 = -100.0f; -COMPILER_STRIP_GATE(80C3849C, &lit_4144); +COMPILER_STRIP_GATE(0x80C3849C, &lit_4144); #pragma pop /* 80C384A0-80C384A4 000098 0004+00 0/2 0/0 0/0 .rodata @4145 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4145 = 40.0f; -COMPILER_STRIP_GATE(80C384A0, &lit_4145); +COMPILER_STRIP_GATE(0x80C384A0, &lit_4145); #pragma pop /* 80C384A4-80C384A8 00009C 0004+00 0/1 0/0 0/0 .rodata @4146 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4146 = 3.0f / 10.0f; -COMPILER_STRIP_GATE(80C384A4, &lit_4146); +COMPILER_STRIP_GATE(0x80C384A4, &lit_4146); #pragma pop /* 80C35CF0-80C36138 000C50 0448+00 1/1 0/0 0/0 .text WallWalk__10daObjKAM_cFv */ @@ -799,35 +805,35 @@ asm void daObjKAM_c::WalkAction() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4324 = 30.0f; -COMPILER_STRIP_GATE(80C384A8, &lit_4324); +COMPILER_STRIP_GATE(0x80C384A8, &lit_4324); #pragma pop /* 80C384AC-80C384B0 0000A4 0004+00 0/3 0/0 0/0 .rodata @4325 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4325 = 8.0f; -COMPILER_STRIP_GATE(80C384AC, &lit_4325); +COMPILER_STRIP_GATE(0x80C384AC, &lit_4325); #pragma pop /* 80C384B0-80C384B4 0000A8 0004+00 0/1 0/0 0/0 .rodata @4326 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4326 = 200.0f; -COMPILER_STRIP_GATE(80C384B0, &lit_4326); +COMPILER_STRIP_GATE(0x80C384B0, &lit_4326); #pragma pop /* 80C384B4-80C384B8 0000AC 0004+00 0/1 0/0 0/0 .rodata @4327 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4327 = 11.0f; -COMPILER_STRIP_GATE(80C384B4, &lit_4327); +COMPILER_STRIP_GATE(0x80C384B4, &lit_4327); #pragma pop /* 80C384B8-80C384BC 0000B0 0004+00 0/1 0/0 0/0 .rodata @4328 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4328 = 1050.0f; -COMPILER_STRIP_GATE(80C384B8, &lit_4328); +COMPILER_STRIP_GATE(0x80C384B8, &lit_4328); #pragma pop /* 80C36338-80C36B20 001298 07E8+00 2/2 0/0 0/0 .text MoveAction__10daObjKAM_cFv */ @@ -877,34 +883,34 @@ SECTION_RODATA static u16 const l_kam_itemno[1 + 1 /* padding */] = { /* padding */ 0x0000, }; -COMPILER_STRIP_GATE(80C384BC, &l_kam_itemno); +COMPILER_STRIP_GATE(0x80C384BC, &l_kam_itemno); /* 80C384C0-80C384C4 0000B8 0004+00 0/0 0/0 0/0 .rodata @4437 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4437 = -9.0f; -COMPILER_STRIP_GATE(80C384C0, &lit_4437); +COMPILER_STRIP_GATE(0x80C384C0, &lit_4437); #pragma pop /* 80C384C4-80C384C8 0000BC 0004+00 0/1 0/0 0/0 .rodata @4484 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4484 = 608.0f; -COMPILER_STRIP_GATE(80C384C4, &lit_4484); +COMPILER_STRIP_GATE(0x80C384C4, &lit_4484); #pragma pop /* 80C384C8-80C384CC 0000C0 0004+00 0/1 0/0 0/0 .rodata @4485 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4485 = 448.0f; -COMPILER_STRIP_GATE(80C384C8, &lit_4485); +COMPILER_STRIP_GATE(0x80C384C8, &lit_4485); #pragma pop /* 80C384CC-80C384D0 0000C4 0004+00 0/1 0/0 0/0 .rodata @4486 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4486 = 16777215.0f; -COMPILER_STRIP_GATE(80C384CC, &lit_4486); +COMPILER_STRIP_GATE(0x80C384CC, &lit_4486); #pragma pop /* 80C36CB8-80C36E34 001C18 017C+00 1/1 0/0 0/0 .text Z_BufferChk__10daObjKAM_cFv */ @@ -922,7 +928,7 @@ asm void daObjKAM_c::Z_BufferChk() { SECTION_RODATA static u8 const lit_4516[8] = { 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C384D0, &lit_4516); +COMPILER_STRIP_GATE(0x80C384D0, &lit_4516); /* 80C36E34-80C36F58 001D94 0124+00 1/1 0/0 0/0 .text ParticleSet__10daObjKAM_cFv */ #pragma push @@ -959,7 +965,7 @@ asm void daObjKAM_c::ObjHit() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4693 = 10000.0f; -COMPILER_STRIP_GATE(80C384D8, &lit_4693); +COMPILER_STRIP_GATE(0x80C384D8, &lit_4693); #pragma pop /* 80C374AC-80C37724 00240C 0278+00 1/1 0/0 0/0 .text Execute__10daObjKAM_cFv */ @@ -999,11 +1005,11 @@ asm void daObjKAM_c::setBaseMtx() { /* ############################################################################################## */ /* 80C384DC-80C384E0 0000D4 0004+00 1/1 0/0 0/0 .rodata @4757 */ SECTION_RODATA static f32 const lit_4757 = 15.0f; -COMPILER_STRIP_GATE(80C384DC, &lit_4757); +COMPILER_STRIP_GATE(0x80C384DC, &lit_4757); /* 80C384E0-80C384E4 0000D8 0004+00 1/1 0/0 0/0 .rodata @4758 */ SECTION_RODATA static f32 const lit_4758 = -3.0f / 5.0f; -COMPILER_STRIP_GATE(80C384E0, &lit_4758); +COMPILER_STRIP_GATE(0x80C384E0, &lit_4758); /* 80C377F4-80C378D4 002754 00E0+00 1/0 0/0 0/0 .text daObjKAM_Draw__FP10daObjKAM_c */ #pragma push @@ -1028,7 +1034,13 @@ static asm void daObjKAM_Execute(daObjKAM_c* param_0) { /* ############################################################################################## */ /* 80C384E4-80C384E8 0000DC 0004+00 1/2 0/0 0/0 .rodata l_musiya_num */ SECTION_RODATA static u32 const l_musiya_num = 0x019D019E; -COMPILER_STRIP_GATE(80C384E4, &l_musiya_num); +COMPILER_STRIP_GATE(0x80C384E4, &l_musiya_num); + +/* 80C384FC-80C384FC 0000F4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80C38502 = "R_SP160"; +#pragma pop /* 80C378F4-80C37AA0 002854 01AC+00 1/1 0/0 0/0 .text CreateChk__10daObjKAM_cFv */ #pragma push @@ -1045,35 +1057,35 @@ asm void daObjKAM_c::CreateChk() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5032 = 11.0f / 10.0f; -COMPILER_STRIP_GATE(80C384E8, &lit_5032); +COMPILER_STRIP_GATE(0x80C384E8, &lit_5032); #pragma pop /* 80C384EC-80C384F0 0000E4 0004+00 0/1 0/0 0/0 .rodata @5033 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5033 = 500.0f; -COMPILER_STRIP_GATE(80C384EC, &lit_5033); +COMPILER_STRIP_GATE(0x80C384EC, &lit_5033); #pragma pop /* 80C384F0-80C384F4 0000E8 0004+00 0/1 0/0 0/0 .rodata @5034 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5034 = -200.0f; -COMPILER_STRIP_GATE(80C384F0, &lit_5034); +COMPILER_STRIP_GATE(0x80C384F0, &lit_5034); #pragma pop /* 80C384F4-80C384F8 0000EC 0004+00 0/1 0/0 0/0 .rodata @5035 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5035 = -1000.0f; -COMPILER_STRIP_GATE(80C384F4, &lit_5035); +COMPILER_STRIP_GATE(0x80C384F4, &lit_5035); #pragma pop /* 80C384F8-80C384FC 0000F0 0004+00 0/1 0/0 0/0 .rodata @5036 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5036 = -50.0f; -COMPILER_STRIP_GATE(80C384F8, &lit_5036); +COMPILER_STRIP_GATE(0x80C384F8, &lit_5036); #pragma pop /* 80C385D4-80C385E0 00000C 000C+00 1/1 0/0 0/0 .bss @3770 */ @@ -1150,7 +1162,7 @@ asm void __sinit_d_a_obj_kamakiri_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80C383A8 = (void*)__sinit_d_a_obj_kamakiri_cpp; +REGISTER_CTORS(0x80C383A8, __sinit_d_a_obj_kamakiri_cpp); #pragma pop /* 80C383E4-80C383EC 003344 0008+00 1/0 0/0 0/0 .text @36@__dt__12dBgS_ObjAcchFv */ @@ -1173,10 +1185,4 @@ static asm void func_80C383EC() { } #pragma pop -/* 80C384FC-80C3850A 0000F4 000E+00 10/10 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80C384FC = "I_Kam"; -SECTION_DEAD static char const* const stringBase_80C38502 = "R_SP160"; -#pragma pop +/* 80C384FC-80C384FC 0000F4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_kanban2/d_a_obj_kanban2.cpp b/rel/d/a/obj/d_a_obj_kanban2/d_a_obj_kanban2.cpp index d9f31a21435..330ac1eadbd 100644 --- a/rel/d/a/obj/d_a_obj_kanban2/d_a_obj_kanban2.cpp +++ b/rel/d/a/obj/d_a_obj_kanban2/d_a_obj_kanban2.cpp @@ -431,7 +431,31 @@ extern "C" void __register_global_object(); /* ############################################################################################## */ /* 80585620-80585624 000000 0004+00 19/19 0/0 0/0 .rodata @3970 */ SECTION_RODATA static f32 const lit_3970 = 1.0f; -COMPILER_STRIP_GATE(80585620, &lit_3970); +COMPILER_STRIP_GATE(0x80585620, &lit_3970); + +/* 80585710-80585710 0000F0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80585710 = "J_kanban00.bmd"; +SECTION_DEAD static char const* const stringBase_8058571F = "J_kanban00_01.bmd"; +SECTION_DEAD static char const* const stringBase_80585731 = "J_kanban00_02.bmd"; +SECTION_DEAD static char const* const stringBase_80585743 = "J_kanban00_03.bmd"; +SECTION_DEAD static char const* const stringBase_80585755 = "J_kanban00_04.bmd"; +SECTION_DEAD static char const* const stringBase_80585767 = "J_kanban00_05.bmd"; +SECTION_DEAD static char const* const stringBase_80585779 = "J_kanban00_06.bmd"; +SECTION_DEAD static char const* const stringBase_8058578B = "J_kanban00_07.bmd"; +SECTION_DEAD static char const* const stringBase_8058579D = "J_kanban00_08.bmd"; +SECTION_DEAD static char const* const stringBase_805857AF = "J_kanban00_09.bmd"; +SECTION_DEAD static char const* const stringBase_805857C1 = "J_kanban00_10.bmd"; +SECTION_DEAD static char const* const stringBase_805857D3 = "J_kanban00_11.bmd"; +SECTION_DEAD static char const* const stringBase_805857E5 = "J_kanban00_12.bmd"; +SECTION_DEAD static char const* const stringBase_805857F7 = "J_kanban00_13.bmd"; +SECTION_DEAD static char const* const stringBase_80585809 = "J_kanban00_14.bmd"; +SECTION_DEAD static char const* const stringBase_8058581B = "J_kanban00_15.bmd"; +SECTION_DEAD static char const* const stringBase_8058582D = "J_kanban00_16.bmd"; +SECTION_DEAD static char const* const stringBase_8058583F = "J_kanban00_17.bmd"; +SECTION_DEAD static char const* const stringBase_80585851 = "J_kanban00_18.bmd"; +#pragma pop /* 8058586C-805858B8 -00001 004C+00 1/1 0/0 0/0 .data * l_kn2_bmdidx__29@unnamed@d_a_obj_kanban2_cpp@ */ @@ -693,13 +717,13 @@ asm daObj_Kanban2_HIO_c::daObj_Kanban2_HIO_c() { /* ############################################################################################## */ /* 80585624-80585628 000004 0004+00 1/4 0/0 0/0 .rodata @4013 */ SECTION_RODATA static f32 const lit_4013 = 100.0f; -COMPILER_STRIP_GATE(80585624, &lit_4013); +COMPILER_STRIP_GATE(0x80585624, &lit_4013); /* 80585628-8058562C 000008 0004+00 0/1 0/0 0/0 .rodata @4014 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4014 = 400.0f; -COMPILER_STRIP_GATE(80585628, &lit_4014); +COMPILER_STRIP_GATE(0x80585628, &lit_4014); #pragma pop /* 8058562C-80585630 00000C 0004+00 3/9 0/0 0/0 .rodata @4015 */ @@ -709,7 +733,7 @@ SECTION_RODATA static u8 const lit_4015[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(8058562C, &lit_4015); +COMPILER_STRIP_GATE(0x8058562C, &lit_4015); /* 80581790-805818DC 000110 014C+00 1/1 0/0 0/0 .text draw__15daObj_Kanban2_cFv */ #pragma push @@ -744,7 +768,7 @@ static asm void daObj_Kanban2_Draw(daObj_Kanban2_c* param_0) { /* ############################################################################################## */ /* 80585630-80585634 000010 0004+00 2/4 0/0 0/0 .rodata @4036 */ SECTION_RODATA static f32 const lit_4036 = -1.0f; -COMPILER_STRIP_GATE(80585630, &lit_4036); +COMPILER_STRIP_GATE(0x80585630, &lit_4036); /* 80581938-805819BC 0002B8 0084+00 1/1 0/0 0/0 .text setKanbanSE__15daObj_Kanban2_cFi */ #pragma push @@ -800,13 +824,13 @@ asm void daObj_Kanban2_c::getKanbanWolfCutType() { /* ############################################################################################## */ /* 80585634-80585638 000014 0004+00 1/3 0/0 0/0 .rodata @4283 */ SECTION_RODATA static f32 const lit_4283 = 0.5f; -COMPILER_STRIP_GATE(80585634, &lit_4283); +COMPILER_STRIP_GATE(0x80585634, &lit_4283); /* 80585638-8058563C 000018 0004+00 0/4 0/0 0/0 .rodata @4284 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4284 = 40.0f; -COMPILER_STRIP_GATE(80585638, &lit_4284); +COMPILER_STRIP_GATE(0x80585638, &lit_4284); #pragma pop /* 80581D04-8058221C 000684 0518+00 2/1 0/0 0/0 .text damage_check__15daObj_Kanban2_cFv @@ -825,49 +849,49 @@ asm void daObj_Kanban2_c::damage_check() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4285 = 1000.0f; -COMPILER_STRIP_GATE(8058563C, &lit_4285); +COMPILER_STRIP_GATE(0x8058563C, &lit_4285); #pragma pop /* 80585640-80585644 000020 0004+00 0/0 0/0 0/0 .rodata @4330 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4330 = 15.0f; -COMPILER_STRIP_GATE(80585640, &lit_4330); +COMPILER_STRIP_GATE(0x80585640, &lit_4330); #pragma pop /* 80585644-80585648 000024 0004+00 0/0 0/0 0/0 .rodata @4331 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4331 = 8000.0f; -COMPILER_STRIP_GATE(80585644, &lit_4331); +COMPILER_STRIP_GATE(0x80585644, &lit_4331); #pragma pop /* 80585648-8058564C 000028 0004+00 0/2 0/0 0/0 .rodata @4332 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4332 = 5.0f; -COMPILER_STRIP_GATE(80585648, &lit_4332); +COMPILER_STRIP_GATE(0x80585648, &lit_4332); #pragma pop /* 8058564C-80585650 00002C 0004+00 0/1 0/0 0/0 .rodata @4344 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4344 = -3.0f; -COMPILER_STRIP_GATE(8058564C, &lit_4344); +COMPILER_STRIP_GATE(0x8058564C, &lit_4344); #pragma pop /* 80585650-80585654 000030 0004+00 0/8 0/0 0/0 .rodata @4345 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4345 = 10.0f; -COMPILER_STRIP_GATE(80585650, &lit_4345); +COMPILER_STRIP_GATE(0x80585650, &lit_4345); #pragma pop /* 80585654-80585658 000034 0004+00 0/2 0/0 0/0 .rodata @4346 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4346 = 4000.0f; -COMPILER_STRIP_GATE(80585654, &lit_4346); +COMPILER_STRIP_GATE(0x80585654, &lit_4346); #pragma pop /* 8058221C-805822F0 000B9C 00D4+00 1/1 0/0 0/0 .text float_damage_check__15daObj_Kanban2_cFv */ @@ -887,7 +911,7 @@ asm void daObj_Kanban2_c::float_damage_check() { SECTION_RODATA static u8 const lit_4417[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80585658, &lit_4417); +COMPILER_STRIP_GATE(0x80585658, &lit_4417); #pragma pop /* 80585660-80585668 000040 0008+00 0/1 0/0 0/0 .rodata @4418 */ @@ -896,7 +920,7 @@ COMPILER_STRIP_GATE(80585658, &lit_4417); SECTION_RODATA static u8 const lit_4418[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80585660, &lit_4418); +COMPILER_STRIP_GATE(0x80585660, &lit_4418); #pragma pop /* 80585668-80585670 000048 0008+00 0/1 0/0 0/0 .rodata @4419 */ @@ -905,19 +929,19 @@ COMPILER_STRIP_GATE(80585660, &lit_4418); SECTION_RODATA static u8 const lit_4419[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80585668, &lit_4419); +COMPILER_STRIP_GATE(0x80585668, &lit_4419); #pragma pop /* 80585670-80585674 000050 0004+00 0/1 0/0 0/0 .rodata @4420 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4420 = 2500.0f; -COMPILER_STRIP_GATE(80585670, &lit_4420); +COMPILER_STRIP_GATE(0x80585670, &lit_4420); #pragma pop /* 80585674-80585678 000054 0004+00 1/2 0/0 0/0 .rodata @4421 */ SECTION_RODATA static f32 const lit_4421 = 500.0f; -COMPILER_STRIP_GATE(80585674, &lit_4421); +COMPILER_STRIP_GATE(0x80585674, &lit_4421); /* 805822F0-805825A4 000C70 02B4+00 2/2 0/0 0/0 .text deletePart__15daObj_Kanban2_cFv */ #pragma push @@ -932,7 +956,7 @@ asm void daObj_Kanban2_c::deletePart() { /* ############################################################################################## */ /* 80585678-8058567C 000058 0004+00 1/2 0/0 0/0 .rodata @4450 */ SECTION_RODATA static f32 const lit_4450 = 200.0f; -COMPILER_STRIP_GATE(80585678, &lit_4450); +COMPILER_STRIP_GATE(0x80585678, &lit_4450); /* 805825A4-805826D4 000F24 0130+00 1/1 0/0 0/0 .text getWallAngle__15daObj_Kanban2_cFv */ @@ -960,7 +984,7 @@ asm cM3dGPla::~cM3dGPla() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4489 = 50.0f; -COMPILER_STRIP_GATE(8058567C, &lit_4489); +COMPILER_STRIP_GATE(0x8058567C, &lit_4489); #pragma pop /* 80585680-80585688 000060 0004+04 1/3 0/0 0/0 .rodata @4490 */ @@ -969,7 +993,7 @@ SECTION_RODATA static f32 const lit_4490[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80585680, &lit_4490); +COMPILER_STRIP_GATE(0x80585680, &lit_4490); /* 8058271C-80582894 00109C 0178+00 2/2 0/0 0/0 .text setGroundAngle__15daObj_Kanban2_cFv */ @@ -1017,7 +1041,7 @@ asm void daObj_Kanban2_c::setCullMtx() { SECTION_RODATA static u8 const lit_4555[8] = { 0x3F, 0x94, 0x7A, 0xE1, 0x47, 0xAE, 0x14, 0x7B, }; -COMPILER_STRIP_GATE(80585688, &lit_4555); +COMPILER_STRIP_GATE(0x80585688, &lit_4555); /* 80582AAC-80582AFC 00142C 0050+00 1/1 0/0 0/0 .text setSmokeEffect__15daObj_Kanban2_cF4cXyz */ #pragma push @@ -1156,14 +1180,14 @@ asm void daObj_Kanban2_c::setWaterEffect() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4645 = 30.0f; -COMPILER_STRIP_GATE(80585690, &lit_4645); +COMPILER_STRIP_GATE(0x80585690, &lit_4645); #pragma pop /* 80585694-80585698 000074 0004+00 0/2 0/0 0/0 .rodata @4646 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4646 = 20.0f; -COMPILER_STRIP_GATE(80585694, &lit_4646); +COMPILER_STRIP_GATE(0x80585694, &lit_4646); #pragma pop /* 80585698-805856A0 000078 0008+00 0/3 0/0 0/0 .rodata @4648 */ @@ -1172,7 +1196,7 @@ COMPILER_STRIP_GATE(80585694, &lit_4646); SECTION_RODATA static u8 const lit_4648[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80585698, &lit_4648); +COMPILER_STRIP_GATE(0x80585698, &lit_4648); #pragma pop /* 80582C40-80582E68 0015C0 0228+00 3/3 0/0 0/0 .text setCenterPos__15daObj_Kanban2_cFv @@ -1213,28 +1237,28 @@ asm void daObj_Kanban2_c::setActionMode(int param_0, int param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4781 = 70.0f; -COMPILER_STRIP_GATE(805856A0, &lit_4781); +COMPILER_STRIP_GATE(0x805856A0, &lit_4781); #pragma pop /* 805856A4-805856A8 000084 0004+00 0/1 0/0 0/0 .rodata @4782 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4782 = 3584.0f; -COMPILER_STRIP_GATE(805856A4, &lit_4782); +COMPILER_STRIP_GATE(0x805856A4, &lit_4782); #pragma pop /* 805856A8-805856AC 000088 0004+00 0/2 0/0 0/0 .rodata @4783 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4783 = 2048.0f; -COMPILER_STRIP_GATE(805856A8, &lit_4783); +COMPILER_STRIP_GATE(0x805856A8, &lit_4783); #pragma pop /* 805856AC-805856B0 00008C 0004+00 0/1 0/0 0/0 .rodata @4784 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4784 = -2048.0f; -COMPILER_STRIP_GATE(805856AC, &lit_4784); +COMPILER_STRIP_GATE(0x805856AC, &lit_4784); #pragma pop /* 80582F40-80583364 0018C0 0424+00 1/1 0/0 0/0 .text calcNormalSwing__15daObj_Kanban2_cFv */ @@ -1252,7 +1276,7 @@ asm void daObj_Kanban2_c::calcNormalSwing() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4861 = 150.0f; -COMPILER_STRIP_GATE(805856B0, &lit_4861); +COMPILER_STRIP_GATE(0x805856B0, &lit_4861); #pragma pop /* 80583364-80583598 001CE4 0234+00 1/1 0/0 0/0 .text executeNormal__15daObj_Kanban2_cFv @@ -1271,77 +1295,77 @@ asm void daObj_Kanban2_c::executeNormal() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4922 = -4.0f; -COMPILER_STRIP_GATE(805856B4, &lit_4922); +COMPILER_STRIP_GATE(0x805856B4, &lit_4922); #pragma pop /* 805856B8-805856BC 000098 0004+00 0/1 0/0 0/0 .rodata @4923 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4923 = 35.0f; -COMPILER_STRIP_GATE(805856B8, &lit_4923); +COMPILER_STRIP_GATE(0x805856B8, &lit_4923); #pragma pop /* 805856BC-805856C0 00009C 0004+00 0/0 0/0 0/0 .rodata @4924 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4924 = 7.0f / 10.0f; -COMPILER_STRIP_GATE(805856BC, &lit_4924); +COMPILER_STRIP_GATE(0x805856BC, &lit_4924); #pragma pop /* 805856C0-805856C4 0000A0 0004+00 0/1 0/0 0/0 .rodata @4925 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4925 = 1024.0f; -COMPILER_STRIP_GATE(805856C0, &lit_4925); +COMPILER_STRIP_GATE(0x805856C0, &lit_4925); #pragma pop /* 805856C4-805856C8 0000A4 0004+00 0/0 0/0 0/0 .rodata @4926 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4926 = 3.0f / 5.0f; -COMPILER_STRIP_GATE(805856C4, &lit_4926); +COMPILER_STRIP_GATE(0x805856C4, &lit_4926); #pragma pop /* 805856C8-805856CC 0000A8 0004+00 0/0 0/0 0/0 .rodata @4927 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4927 = 25.0f; -COMPILER_STRIP_GATE(805856C8, &lit_4927); +COMPILER_STRIP_GATE(0x805856C8, &lit_4927); #pragma pop /* 805856CC-805856D0 0000AC 0004+00 0/0 0/0 0/0 .rodata @4928 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4928 = 80.0f; -COMPILER_STRIP_GATE(805856CC, &lit_4928); +COMPILER_STRIP_GATE(0x805856CC, &lit_4928); #pragma pop /* 805856D0-805856D4 0000B0 0004+00 0/1 0/0 0/0 .rodata @4929 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4929 = 512.0f; -COMPILER_STRIP_GATE(805856D0, &lit_4929); +COMPILER_STRIP_GATE(0x805856D0, &lit_4929); #pragma pop /* 805856D4-805856D8 0000B4 0004+00 0/0 0/0 0/0 .rodata @4930 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4930 = 4.0f; -COMPILER_STRIP_GATE(805856D4, &lit_4930); +COMPILER_STRIP_GATE(0x805856D4, &lit_4930); #pragma pop /* 805856D8-805856DC 0000B8 0004+00 0/0 0/0 0/0 .rodata @4931 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4931 = 4096.0f; -COMPILER_STRIP_GATE(805856D8, &lit_4931); +COMPILER_STRIP_GATE(0x805856D8, &lit_4931); #pragma pop /* 805856DC-805856E0 0000BC 0004+00 0/1 0/0 0/0 .rodata @4932 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4932 = 8192.0f; -COMPILER_STRIP_GATE(805856DC, &lit_4932); +COMPILER_STRIP_GATE(0x805856DC, &lit_4932); #pragma pop /* 80583598-80583A2C 001F18 0494+00 2/1 0/0 0/0 .text initPart__15daObj_Kanban2_cFv */ @@ -1369,56 +1393,56 @@ asm void daObj_Kanban2_c::executePart() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5147 = 0.75f; -COMPILER_STRIP_GATE(805856E0, &lit_5147); +COMPILER_STRIP_GATE(0x805856E0, &lit_5147); #pragma pop /* 805856E4-805856E8 0000C4 0004+00 0/1 0/0 0/0 .rodata @5148 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5148 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(805856E4, &lit_5148); +COMPILER_STRIP_GATE(0x805856E4, &lit_5148); #pragma pop /* 805856E8-805856EC 0000C8 0004+00 0/1 0/0 0/0 .rodata @5149 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5149 = -10.0f; -COMPILER_STRIP_GATE(805856E8, &lit_5149); +COMPILER_STRIP_GATE(0x805856E8, &lit_5149); #pragma pop /* 805856EC-805856F0 0000CC 0004+00 0/1 0/0 0/0 .rodata @5269 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5269 = 2.0f; -COMPILER_STRIP_GATE(805856EC, &lit_5269); +COMPILER_STRIP_GATE(0x805856EC, &lit_5269); #pragma pop /* 805856F0-805856F4 0000D0 0004+00 0/1 0/0 0/0 .rodata @5270 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5270 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(805856F0, &lit_5270); +COMPILER_STRIP_GATE(0x805856F0, &lit_5270); #pragma pop /* 805856F4-805856F8 0000D4 0004+00 0/1 0/0 0/0 .rodata @5271 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5271 = 2000.0f; -COMPILER_STRIP_GATE(805856F4, &lit_5271); +COMPILER_STRIP_GATE(0x805856F4, &lit_5271); #pragma pop /* 805856F8-805856FC 0000D8 0004+00 0/1 0/0 0/0 .rodata @5272 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5272 = 3.0f / 10.0f; -COMPILER_STRIP_GATE(805856F8, &lit_5272); +COMPILER_STRIP_GATE(0x805856F8, &lit_5272); #pragma pop /* 805856FC-80585700 0000DC 0004+00 0/1 0/0 0/0 .rodata @5273 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5273 = 1.0f / 20.0f; -COMPILER_STRIP_GATE(805856FC, &lit_5273); +COMPILER_STRIP_GATE(0x805856FC, &lit_5273); #pragma pop /* 80585700-80585708 0000E0 0008+00 0/1 0/0 0/0 .rodata @5275 */ @@ -1427,7 +1451,7 @@ COMPILER_STRIP_GATE(805856FC, &lit_5273); SECTION_RODATA static u8 const lit_5275[8] = { 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80585700, &lit_5275); +COMPILER_STRIP_GATE(0x80585700, &lit_5275); #pragma pop /* 8058437C-80584884 002CFC 0508+00 1/1 0/0 0/0 .text executeFloat__15daObj_Kanban2_cFv @@ -1467,7 +1491,7 @@ asm void daObj_Kanban2_c::action() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5378 = -20.0f; -COMPILER_STRIP_GATE(80585708, &lit_5378); +COMPILER_STRIP_GATE(0x80585708, &lit_5378); #pragma pop /* 80584AD8-80584CFC 003458 0224+00 1/1 0/0 0/0 .text mtx_set__15daObj_Kanban2_cFv */ @@ -1517,6 +1541,13 @@ static bool daObj_Kanban2_IsDelete(daObj_Kanban2_c* param_0) { return true; } +/* ############################################################################################## */ +/* 80585710-80585710 0000F0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80585863 = "Obj_kn2"; +#pragma pop + /* 80584ED8-80584F44 003858 006C+00 1/1 0/0 0/0 .text _delete__15daObj_Kanban2_cFv */ #pragma push #pragma optimization_level 0 @@ -1562,7 +1593,7 @@ static asm void useHeapInit(fopAc_ac_c* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5568 = -200.0f; -COMPILER_STRIP_GATE(8058570C, &lit_5568); +COMPILER_STRIP_GATE(0x8058570C, &lit_5568); #pragma pop /* 805850E8-80585458 003A68 0370+00 1/1 0/0 0/0 .text create__15daObj_Kanban2_cFv */ @@ -1637,7 +1668,7 @@ asm void __sinit_d_a_obj_kanban2_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_805855C0 = (void*)__sinit_d_a_obj_kanban2_cpp; +REGISTER_CTORS(0x805855C0, __sinit_d_a_obj_kanban2_cpp); #pragma pop /* 805855FC-80585604 003F7C 0008+00 1/0 0/0 0/0 .text @36@__dt__12dBgS_ObjAcchFv */ @@ -1832,28 +1863,4 @@ static u8 data_80585D48[4]; static u8 data_80585D4C[4]; #pragma pop -/* 80585710-8058586B 0000F0 015B+00 4/3 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80585710 = "J_kanban00.bmd"; -SECTION_DEAD static char const* const stringBase_8058571F = "J_kanban00_01.bmd"; -SECTION_DEAD static char const* const stringBase_80585731 = "J_kanban00_02.bmd"; -SECTION_DEAD static char const* const stringBase_80585743 = "J_kanban00_03.bmd"; -SECTION_DEAD static char const* const stringBase_80585755 = "J_kanban00_04.bmd"; -SECTION_DEAD static char const* const stringBase_80585767 = "J_kanban00_05.bmd"; -SECTION_DEAD static char const* const stringBase_80585779 = "J_kanban00_06.bmd"; -SECTION_DEAD static char const* const stringBase_8058578B = "J_kanban00_07.bmd"; -SECTION_DEAD static char const* const stringBase_8058579D = "J_kanban00_08.bmd"; -SECTION_DEAD static char const* const stringBase_805857AF = "J_kanban00_09.bmd"; -SECTION_DEAD static char const* const stringBase_805857C1 = "J_kanban00_10.bmd"; -SECTION_DEAD static char const* const stringBase_805857D3 = "J_kanban00_11.bmd"; -SECTION_DEAD static char const* const stringBase_805857E5 = "J_kanban00_12.bmd"; -SECTION_DEAD static char const* const stringBase_805857F7 = "J_kanban00_13.bmd"; -SECTION_DEAD static char const* const stringBase_80585809 = "J_kanban00_14.bmd"; -SECTION_DEAD static char const* const stringBase_8058581B = "J_kanban00_15.bmd"; -SECTION_DEAD static char const* const stringBase_8058582D = "J_kanban00_16.bmd"; -SECTION_DEAD static char const* const stringBase_8058583F = "J_kanban00_17.bmd"; -SECTION_DEAD static char const* const stringBase_80585851 = "J_kanban00_18.bmd"; -SECTION_DEAD static char const* const stringBase_80585863 = "Obj_kn2"; -#pragma pop +/* 80585710-80585710 0000F0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_kantera/d_a_obj_kantera.cpp b/rel/d/a/obj/d_a_obj_kantera/d_a_obj_kantera.cpp index 7dd65907a87..c28f5b13a0d 100644 --- a/rel/d/a/obj/d_a_obj_kantera/d_a_obj_kantera.cpp +++ b/rel/d/a/obj/d_a_obj_kantera/d_a_obj_kantera.cpp @@ -67,7 +67,6 @@ struct dItem_data { struct dEvt_control_c { /* 80042468 */ void reset(); - /* 800436EC */ void setPtI_Id(unsigned int); }; struct dEvent_manager_c { @@ -107,13 +106,13 @@ struct dBgS_AcchCir { /* 80C38E98 */ ~dBgS_AcchCir(); }; -struct cXyz { - /* 80266B84 */ void operator*(f32) const; -}; +struct csXyz {}; struct dBgS {}; -struct csXyz {}; +struct cXyz { + /* 80266B84 */ void operator*(f32) const; +}; struct dBgS_Acch { /* 80075F94 */ ~dBgS_Acch(); @@ -277,7 +276,7 @@ SECTION_RODATA static u8 const l_cyl_src[68] = { 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41, 0xA0, 0x00, 0x00, 0x42, 0x20, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C39648, &l_cyl_src); +COMPILER_STRIP_GATE(0x80C39648, &l_cyl_src); /* 80C3968C-80C39690 000044 0004+00 0/3 0/0 0/0 .rodata @3855 */ #pragma push @@ -288,7 +287,7 @@ SECTION_RODATA static u8 const lit_3855[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C3968C, &lit_3855); +COMPILER_STRIP_GATE(0x80C3968C, &lit_3855); #pragma pop /* 80C39690-80C39698 000048 0008+00 0/1 0/0 0/0 .rodata @3856 */ @@ -297,7 +296,7 @@ COMPILER_STRIP_GATE(80C3968C, &lit_3855); SECTION_RODATA static u8 const lit_3856[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C39690, &lit_3856); +COMPILER_STRIP_GATE(0x80C39690, &lit_3856); #pragma pop /* 80C39698-80C396A0 000050 0008+00 0/1 0/0 0/0 .rodata @3857 */ @@ -306,7 +305,7 @@ COMPILER_STRIP_GATE(80C39690, &lit_3856); SECTION_RODATA static u8 const lit_3857[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C39698, &lit_3857); +COMPILER_STRIP_GATE(0x80C39698, &lit_3857); #pragma pop /* 80C396A0-80C396A8 000058 0008+00 0/1 0/0 0/0 .rodata @3858 */ @@ -315,7 +314,7 @@ COMPILER_STRIP_GATE(80C39698, &lit_3857); SECTION_RODATA static u8 const lit_3858[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C396A0, &lit_3858); +COMPILER_STRIP_GATE(0x80C396A0, &lit_3858); #pragma pop /* 80C396DC-80C396E8 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ @@ -530,14 +529,14 @@ asm void daItemKantera_c::setBaseMtx() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3910 = 30.0f; -COMPILER_STRIP_GATE(80C396A8, &lit_3910); +COMPILER_STRIP_GATE(0x80C396A8, &lit_3910); #pragma pop /* 80C396AC-80C396B0 000064 0004+00 0/1 0/0 0/0 .rodata @3911 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3911 = -6.0f; -COMPILER_STRIP_GATE(80C396AC, &lit_3911); +COMPILER_STRIP_GATE(0x80C396AC, &lit_3911); #pragma pop /* 80C396B0-80C396B8 000068 0008+00 0/1 0/0 0/0 .rodata @3913 */ @@ -546,7 +545,7 @@ COMPILER_STRIP_GATE(80C396AC, &lit_3911); SECTION_RODATA static u8 const lit_3913[8] = { 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C396B0, &lit_3913); +COMPILER_STRIP_GATE(0x80C396B0, &lit_3913); #pragma pop /* 80C38A64-80C38BA8 000464 0144+00 1/1 0/0 0/0 .text Create__15daItemKantera_cFv */ @@ -630,28 +629,28 @@ asm dBgS_ObjAcch::~dBgS_ObjAcch() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4076 = 5.0f; -COMPILER_STRIP_GATE(80C396B8, &lit_4076); +COMPILER_STRIP_GATE(0x80C396B8, &lit_4076); #pragma pop /* 80C396BC-80C396C0 000074 0004+00 0/2 0/0 0/0 .rodata @4077 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4077 = 1.0f; -COMPILER_STRIP_GATE(80C396BC, &lit_4077); +COMPILER_STRIP_GATE(0x80C396BC, &lit_4077); #pragma pop /* 80C396C0-80C396C4 000078 0004+00 0/1 0/0 0/0 .rodata @4078 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4078 = 7.0f / 10.0f; -COMPILER_STRIP_GATE(80C396C0, &lit_4078); +COMPILER_STRIP_GATE(0x80C396C0, &lit_4078); #pragma pop /* 80C396C4-80C396C8 00007C 0004+00 0/1 0/0 0/0 .rodata @4079 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4079 = 3.0f; -COMPILER_STRIP_GATE(80C396C4, &lit_4079); +COMPILER_STRIP_GATE(0x80C396C4, &lit_4079); #pragma pop /* 80C38F78-80C39068 000978 00F0+00 1/1 0/0 0/0 .text bg_check__15daItemKantera_cFv */ @@ -690,7 +689,7 @@ asm void daItemKantera_c::actionWaitInit() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4145 = 9.0f / 10.0f; -COMPILER_STRIP_GATE(80C396C8, &lit_4145); +COMPILER_STRIP_GATE(0x80C396C8, &lit_4145); #pragma pop /* 80C3911C-80C39234 000B1C 0118+00 1/0 0/0 0/0 .text actionWait__15daItemKantera_cFv */ @@ -724,6 +723,13 @@ asm void daItemKantera_c::actionOrderGetDemo() { } #pragma pop +/* ############################################################################################## */ +/* 80C396CC-80C396CC 000084 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80C396CC = "DEFAULT_GETITEM"; +#pragma pop + /* 80C3934C-80C393B0 000D4C 0064+00 1/0 0/0 0/0 .text actionGetDemo__15daItemKantera_cFv */ #pragma push @@ -836,9 +842,4 @@ static asm void func_80C39638() { } #pragma pop -/* 80C396CC-80C396DC 000084 0010+00 1/1 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80C396CC = "DEFAULT_GETITEM"; -#pragma pop +/* 80C396CC-80C396CC 000084 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_katatsumuri/d_a_obj_katatsumuri.cpp b/rel/d/a/obj/d_a_obj_katatsumuri/d_a_obj_katatsumuri.cpp index acb3f54f9e8..99ef6ad405e 100644 --- a/rel/d/a/obj/d_a_obj_katatsumuri/d_a_obj_katatsumuri.cpp +++ b/rel/d/a/obj/d_a_obj_katatsumuri/d_a_obj_katatsumuri.cpp @@ -49,19 +49,19 @@ struct mDoExt_baseAnm { /* 8000D428 */ void play(); }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; +struct J3DAnmTransform {}; + +struct J3DModelData {}; + struct Z2Creature { /* 802C03C8 */ Z2Creature(); /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -85,10 +85,10 @@ struct daObj_KatHIO_c { /* 80C3C5CC */ ~daObj_KatHIO_c(); }; -struct J3DJoint {}; - struct J3DModel {}; +struct J3DJoint {}; + struct daObjKAT_c { /* 80C39994 */ void InitCcSph(); /* 80C39A00 */ void SetCcSph(); @@ -417,7 +417,7 @@ extern "C" void __register_global_object(); /* ############################################################################################## */ /* 80C3C674-80C3C678 000000 0004+00 10/10 0/0 0/0 .rodata @3775 */ SECTION_RODATA static f32 const lit_3775 = 1.0f; -COMPILER_STRIP_GATE(80C3C674, &lit_3775); +COMPILER_STRIP_GATE(0x80C3C674, &lit_3775); /* 80C3C770-80C3C790 -00001 0020+00 1/0 0/0 0/0 .data l_daObjKAT_Method */ SECTION_DATA static void* l_daObjKAT_Method[8] = { @@ -513,7 +513,7 @@ SECTION_RODATA static u16 const l_kat_itemno[1 + 1 /* padding */] = { /* padding */ 0x0000, }; -COMPILER_STRIP_GATE(80C3C678, &l_kat_itemno); +COMPILER_STRIP_GATE(0x80C3C678, &l_kat_itemno); /* 80C3C67C-80C3C6BC 000008 0040+00 1/1 0/0 0/0 .rodata ccSphSrc$3779 */ SECTION_RODATA static u8 const ccSphSrc[64] = { @@ -522,7 +522,7 @@ SECTION_RODATA static u8 const ccSphSrc[64] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0x20, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C3C67C, &ccSphSrc); +COMPILER_STRIP_GATE(0x80C3C67C, &ccSphSrc); /* 80C39994-80C39A00 000114 006C+00 1/1 0/0 0/0 .text InitCcSph__10daObjKAT_cFv */ #pragma push @@ -537,7 +537,7 @@ asm void daObjKAT_c::InitCcSph() { /* ############################################################################################## */ /* 80C3C6BC-80C3C6C0 000048 0004+00 1/3 0/0 0/0 .rodata @3788 */ SECTION_RODATA static f32 const lit_3788 = 20.0f; -COMPILER_STRIP_GATE(80C3C6BC, &lit_3788); +COMPILER_STRIP_GATE(0x80C3C6BC, &lit_3788); /* 80C39A00-80C39A58 000180 0058+00 1/1 0/0 0/0 .text SetCcSph__10daObjKAT_cFv */ #pragma push @@ -552,13 +552,13 @@ asm void daObjKAT_c::SetCcSph() { /* ############################################################################################## */ /* 80C3C6C0-80C3C6C4 00004C 0004+00 1/1 0/0 0/0 .rodata @3812 */ SECTION_RODATA static f32 const lit_3812 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(80C3C6C0, &lit_3812); +COMPILER_STRIP_GATE(0x80C3C6C0, &lit_3812); /* 80C3C6C4-80C3C6CC 000050 0008+00 1/2 0/0 0/0 .rodata @3814 */ SECTION_RODATA static u8 const lit_3814[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C3C6C4, &lit_3814); +COMPILER_STRIP_GATE(0x80C3C6C4, &lit_3814); /* 80C39A58-80C39B2C 0001D8 00D4+00 1/1 0/0 0/0 .text ctrlJoint__10daObjKAT_cFP8J3DJointP8J3DModel */ @@ -591,6 +591,13 @@ static asm void useHeapInit(fopAc_ac_c* param_0) { } #pragma pop +/* ############################################################################################## */ +/* 80C3C764-80C3C764 0000F0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80C3C764 = "Kat"; +#pragma pop + /* 80C39B98-80C39E80 000318 02E8+00 1/1 0/0 0/0 .text CreateHeap__10daObjKAT_cFv */ #pragma push #pragma optimization_level 0 @@ -639,55 +646,55 @@ SECTION_RODATA static u8 const lit_3959[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C3C6CC, &lit_3959); +COMPILER_STRIP_GATE(0x80C3C6CC, &lit_3959); /* 80C3C6D0-80C3C6D4 00005C 0004+00 0/0 0/0 0/0 .rodata @3960 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3960 = 2.0f / 5.0f; -COMPILER_STRIP_GATE(80C3C6D0, &lit_3960); +COMPILER_STRIP_GATE(0x80C3C6D0, &lit_3960); #pragma pop /* 80C3C6D4-80C3C6D8 000060 0004+00 0/1 0/0 0/0 .rodata @3961 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3961 = 10.0f; -COMPILER_STRIP_GATE(80C3C6D4, &lit_3961); +COMPILER_STRIP_GATE(0x80C3C6D4, &lit_3961); #pragma pop /* 80C3C6D8-80C3C6DC 000064 0004+00 0/0 0/0 0/0 .rodata @3962 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3962 = 1.0f / 50.0f; -COMPILER_STRIP_GATE(80C3C6D8, &lit_3962); +COMPILER_STRIP_GATE(0x80C3C6D8, &lit_3962); #pragma pop /* 80C3C6DC-80C3C6E0 000068 0004+00 0/1 0/0 0/0 .rodata @4100 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4100 = 2.0f; -COMPILER_STRIP_GATE(80C3C6DC, &lit_4100); +COMPILER_STRIP_GATE(0x80C3C6DC, &lit_4100); #pragma pop /* 80C3C6E0-80C3C6E4 00006C 0004+00 0/2 0/0 0/0 .rodata @4101 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4101 = -50.0f; -COMPILER_STRIP_GATE(80C3C6E0, &lit_4101); +COMPILER_STRIP_GATE(0x80C3C6E0, &lit_4101); #pragma pop /* 80C3C6E4-80C3C6E8 000070 0004+00 0/4 0/0 0/0 .rodata @4102 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4102 = 50.0f; -COMPILER_STRIP_GATE(80C3C6E4, &lit_4102); +COMPILER_STRIP_GATE(0x80C3C6E4, &lit_4102); #pragma pop /* 80C3C6E8-80C3C6EC 000074 0004+00 0/1 0/0 0/0 .rodata @4103 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4103 = 3.0f / 10.0f; -COMPILER_STRIP_GATE(80C3C6E8, &lit_4103); +COMPILER_STRIP_GATE(0x80C3C6E8, &lit_4103); #pragma pop /* 80C3C6EC-80C3C6F4 000078 0008+00 0/5 0/0 0/0 .rodata @4104 */ @@ -696,7 +703,7 @@ COMPILER_STRIP_GATE(80C3C6E8, &lit_4103); SECTION_RODATA static u8 const lit_4104[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C3C6EC, &lit_4104); +COMPILER_STRIP_GATE(0x80C3C6EC, &lit_4104); #pragma pop /* 80C3C6F4-80C3C6FC 000080 0008+00 0/5 0/0 0/0 .rodata @4105 */ @@ -705,7 +712,7 @@ COMPILER_STRIP_GATE(80C3C6EC, &lit_4104); SECTION_RODATA static u8 const lit_4105[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C3C6F4, &lit_4105); +COMPILER_STRIP_GATE(0x80C3C6F4, &lit_4105); #pragma pop /* 80C3C6FC-80C3C704 000088 0008+00 0/5 0/0 0/0 .rodata @4106 */ @@ -714,7 +721,7 @@ COMPILER_STRIP_GATE(80C3C6F4, &lit_4105); SECTION_RODATA static u8 const lit_4106[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C3C6FC, &lit_4106); +COMPILER_STRIP_GATE(0x80C3C6FC, &lit_4106); #pragma pop /* 80C39F0C-80C3A490 00068C 0584+00 1/1 0/0 0/0 .text WallWalk__10daObjKAT_cFv */ @@ -742,28 +749,28 @@ asm cM3dGPla::~cM3dGPla() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4139 = 1500.0f; -COMPILER_STRIP_GATE(80C3C704, &lit_4139); +COMPILER_STRIP_GATE(0x80C3C704, &lit_4139); #pragma pop /* 80C3C708-80C3C70C 000094 0004+00 0/1 0/0 0/0 .rodata @4140 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4140 = 1050.0f; -COMPILER_STRIP_GATE(80C3C708, &lit_4140); +COMPILER_STRIP_GATE(0x80C3C708, &lit_4140); #pragma pop /* 80C3C70C-80C3C710 000098 0004+00 0/1 0/0 0/0 .rodata @4141 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4141 = 400.0f; -COMPILER_STRIP_GATE(80C3C70C, &lit_4141); +COMPILER_STRIP_GATE(0x80C3C70C, &lit_4141); #pragma pop /* 80C3C710-80C3C714 00009C 0004+00 0/1 0/0 0/0 .rodata @4142 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4142 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(80C3C710, &lit_4142); +COMPILER_STRIP_GATE(0x80C3C710, &lit_4142); #pragma pop /* 80C3A4D8-80C3A628 000C58 0150+00 2/2 0/0 0/0 .text MoveAction__10daObjKAT_cFv */ @@ -813,7 +820,7 @@ SECTION_RODATA static f32 const lit_4223[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80C3C714, &lit_4223); +COMPILER_STRIP_GATE(0x80C3C714, &lit_4223); /* 80C3A8C8-80C3A95C 001048 0094+00 1/1 0/0 0/0 .text F_MoveAction__10daObjKAT_cFv */ #pragma push @@ -840,7 +847,7 @@ asm void daObjKAT_c::FallAction() { SECTION_RODATA static u8 const lit_4258[8] = { 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C3C71C, &lit_4258); +COMPILER_STRIP_GATE(0x80C3C71C, &lit_4258); /* 80C3A990-80C3AAB4 001110 0124+00 1/1 0/0 0/0 .text ParticleSet__10daObjKAT_cFv */ #pragma push @@ -857,21 +864,21 @@ asm void daObjKAT_c::ParticleSet() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4288 = 100.0f; -COMPILER_STRIP_GATE(80C3C724, &lit_4288); +COMPILER_STRIP_GATE(0x80C3C724, &lit_4288); #pragma pop /* 80C3C728-80C3C72C 0000B4 0004+00 0/1 0/0 0/0 .rodata @4361 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4361 = 0.5f; -COMPILER_STRIP_GATE(80C3C728, &lit_4361); +COMPILER_STRIP_GATE(0x80C3C728, &lit_4361); #pragma pop /* 80C3C72C-80C3C730 0000B8 0004+00 0/1 0/0 0/0 .rodata @4362 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4362 = 150.0f; -COMPILER_STRIP_GATE(80C3C72C, &lit_4362); +COMPILER_STRIP_GATE(0x80C3C72C, &lit_4362); #pragma pop /* 80C3AAB4-80C3ADC8 001234 0314+00 1/1 0/0 0/0 .text BoomChk__10daObjKAT_cFv */ @@ -899,28 +906,28 @@ asm void daObjKAT_c::ObjHit() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4583 = 10000.0f; -COMPILER_STRIP_GATE(80C3C730, &lit_4583); +COMPILER_STRIP_GATE(0x80C3C730, &lit_4583); #pragma pop /* 80C3C734-80C3C738 0000C0 0004+00 0/1 0/0 0/0 .rodata @4584 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4584 = 200.0f; -COMPILER_STRIP_GATE(80C3C734, &lit_4584); +COMPILER_STRIP_GATE(0x80C3C734, &lit_4584); #pragma pop /* 80C3C738-80C3C73C 0000C4 0004+00 0/1 0/0 0/0 .rodata @4585 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4585 = 4000.0f; -COMPILER_STRIP_GATE(80C3C738, &lit_4585); +COMPILER_STRIP_GATE(0x80C3C738, &lit_4585); #pragma pop /* 80C3C73C-80C3C740 0000C8 0004+00 0/1 0/0 0/0 .rodata @4586 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4586 = 160000.0f; -COMPILER_STRIP_GATE(80C3C73C, &lit_4586); +COMPILER_STRIP_GATE(0x80C3C73C, &lit_4586); #pragma pop /* 80C3AEC8-80C3B754 001648 088C+00 1/1 0/0 0/0 .text Execute__10daObjKAT_cFv */ @@ -938,21 +945,21 @@ asm void daObjKAT_c::Execute() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4625 = 608.0f; -COMPILER_STRIP_GATE(80C3C740, &lit_4625); +COMPILER_STRIP_GATE(0x80C3C740, &lit_4625); #pragma pop /* 80C3C744-80C3C748 0000D0 0004+00 0/1 0/0 0/0 .rodata @4626 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4626 = 448.0f; -COMPILER_STRIP_GATE(80C3C744, &lit_4626); +COMPILER_STRIP_GATE(0x80C3C744, &lit_4626); #pragma pop /* 80C3C748-80C3C74C 0000D4 0004+00 0/1 0/0 0/0 .rodata @4627 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4627 = 16777215.0f; -COMPILER_STRIP_GATE(80C3C748, &lit_4627); +COMPILER_STRIP_GATE(0x80C3C748, &lit_4627); #pragma pop /* 80C3B754-80C3B8D0 001ED4 017C+00 1/1 0/0 0/0 .text Z_BufferChk__10daObjKAT_cFv */ @@ -992,11 +999,11 @@ asm void daObjKAT_c::setBaseMtx() { /* ############################################################################################## */ /* 80C3C74C-80C3C750 0000D8 0004+00 1/1 0/0 0/0 .rodata @4695 */ SECTION_RODATA static f32 const lit_4695 = 15.0f; -COMPILER_STRIP_GATE(80C3C74C, &lit_4695); +COMPILER_STRIP_GATE(0x80C3C74C, &lit_4695); /* 80C3C750-80C3C754 0000DC 0004+00 1/1 0/0 0/0 .rodata @4696 */ SECTION_RODATA static f32 const lit_4696 = -3.0f / 5.0f; -COMPILER_STRIP_GATE(80C3C750, &lit_4696); +COMPILER_STRIP_GATE(0x80C3C750, &lit_4696); /* 80C3B9A0-80C3BA8C 002120 00EC+00 1/0 0/0 0/0 .text daObjKAT_Draw__FP10daObjKAT_c */ #pragma push @@ -1021,7 +1028,13 @@ static asm void daObjKAT_Execute(daObjKAT_c* param_0) { /* ############################################################################################## */ /* 80C3C754-80C3C758 0000E0 0004+00 1/2 0/0 0/0 .rodata l_musiya_num */ SECTION_RODATA static u32 const l_musiya_num = 0x01A101A2; -COMPILER_STRIP_GATE(80C3C754, &l_musiya_num); +COMPILER_STRIP_GATE(0x80C3C754, &l_musiya_num); + +/* 80C3C764-80C3C764 0000F0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80C3C768 = "R_SP160"; +#pragma pop /* 80C3BAAC-80C3BC58 00222C 01AC+00 1/1 0/0 0/0 .text CreateChk__10daObjKAT_cFv */ #pragma push @@ -1038,21 +1051,21 @@ asm void daObjKAT_c::CreateChk() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5000 = 500.0f; -COMPILER_STRIP_GATE(80C3C758, &lit_5000); +COMPILER_STRIP_GATE(0x80C3C758, &lit_5000); #pragma pop /* 80C3C75C-80C3C760 0000E8 0004+00 0/1 0/0 0/0 .rodata @5001 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5001 = -200.0f; -COMPILER_STRIP_GATE(80C3C75C, &lit_5001); +COMPILER_STRIP_GATE(0x80C3C75C, &lit_5001); #pragma pop /* 80C3C760-80C3C764 0000EC 0004+00 0/1 0/0 0/0 .rodata @5002 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5002 = -1000.0f; -COMPILER_STRIP_GATE(80C3C760, &lit_5002); +COMPILER_STRIP_GATE(0x80C3C760, &lit_5002); #pragma pop /* 80C3C83C-80C3C848 00000C 000C+00 1/1 0/0 0/0 .bss @3770 */ @@ -1129,7 +1142,7 @@ asm void __sinit_d_a_obj_katatsumuri_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80C3C614 = (void*)__sinit_d_a_obj_katatsumuri_cpp; +REGISTER_CTORS(0x80C3C614, __sinit_d_a_obj_katatsumuri_cpp); #pragma pop /* 80C3C650-80C3C658 002DD0 0008+00 1/0 0/0 0/0 .text @36@__dt__12dBgS_ObjAcchFv */ @@ -1152,10 +1165,4 @@ static asm void func_80C3C658() { } #pragma pop -/* 80C3C764-80C3C770 0000F0 000C+00 4/4 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80C3C764 = "Kat"; -SECTION_DEAD static char const* const stringBase_80C3C768 = "R_SP160"; -#pragma pop +/* 80C3C764-80C3C764 0000F0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_kazeneko/d_a_obj_kazeneko.cpp b/rel/d/a/obj/d_a_obj_kazeneko/d_a_obj_kazeneko.cpp index 27718fbd730..699a9e8ed4b 100644 --- a/rel/d/a/obj/d_a_obj_kazeneko/d_a_obj_kazeneko.cpp +++ b/rel/d/a/obj/d_a_obj_kazeneko/d_a_obj_kazeneko.cpp @@ -104,10 +104,10 @@ struct cCcD_GStts { /* 80C3D38C */ ~cCcD_GStts(); }; -struct Vec {}; - struct JAISoundID {}; +struct Vec {}; + struct Z2SeMgr { /* 802AC50C */ void seStartLevel(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); }; @@ -216,34 +216,34 @@ SECTION_RODATA u8 const daObjKazeNeko_c::M_attr[44] = { 0x00, 0x42, 0xB4, 0x00, 0x00, 0x44, 0xE1, 0x00, 0x00, 0x43, 0x34, 0x00, 0x00, 0x41, 0xD8, 0x00, 0x00, 0x41, 0x70, 0x00, 0x00, 0x01, 0x70, 0x64, 0x00, 0x00, 0x19, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C3D3DC, &daObjKazeNeko_c::M_attr); +COMPILER_STRIP_GATE(0x80C3D3DC, &daObjKazeNeko_c::M_attr); /* 80C3D408-80C3D40C 00002C 0004+00 0/1 0/0 0/0 .rodata @3853 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3853 = -100.0f; -COMPILER_STRIP_GATE(80C3D408, &lit_3853); +COMPILER_STRIP_GATE(0x80C3D408, &lit_3853); #pragma pop /* 80C3D40C-80C3D410 000030 0004+00 0/1 0/0 0/0 .rodata @3854 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3854 = -10.0f; -COMPILER_STRIP_GATE(80C3D40C, &lit_3854); +COMPILER_STRIP_GATE(0x80C3D40C, &lit_3854); #pragma pop /* 80C3D410-80C3D414 000034 0004+00 0/1 0/0 0/0 .rodata @3855 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3855 = 100.0f; -COMPILER_STRIP_GATE(80C3D410, &lit_3855); +COMPILER_STRIP_GATE(0x80C3D410, &lit_3855); #pragma pop /* 80C3D414-80C3D418 000038 0004+00 0/1 0/0 0/0 .rodata @3856 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3856 = 200.0f; -COMPILER_STRIP_GATE(80C3D414, &lit_3856); +COMPILER_STRIP_GATE(0x80C3D414, &lit_3856); #pragma pop /* 80C3C8D8-80C3C968 000078 0090+00 1/1 0/0 0/0 .text create_init__15daObjKazeNeko_cFv */ @@ -274,7 +274,7 @@ SECTION_RODATA static u8 const lit_3890[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C3D418, &lit_3890); +COMPILER_STRIP_GATE(0x80C3D418, &lit_3890); /* 80C3C988-80C3CA8C 000128 0104+00 2/2 0/0 0/0 .text setBaseMtx__15daObjKazeNeko_cFv */ #pragma push @@ -295,7 +295,7 @@ SECTION_RODATA static u8 const ccCylSrc[68] = { 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41, 0x20, 0x00, 0x00, 0x41, 0xF0, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C3D41C, &ccCylSrc); +COMPILER_STRIP_GATE(0x80C3D41C, &ccCylSrc); /* 80C3CA8C-80C3CB10 00022C 0084+00 1/1 0/0 0/0 .text initCcCylinder__15daObjKazeNeko_cFv */ @@ -334,19 +334,19 @@ asm void daObjKazeNeko_c::swingHead() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3947 = 1.0f; -COMPILER_STRIP_GATE(80C3D460, &lit_3947); +COMPILER_STRIP_GATE(0x80C3D460, &lit_3947); #pragma pop /* 80C3D464-80C3D468 000088 0004+00 0/1 0/0 0/0 .rodata @3948 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3948 = -1.0f; -COMPILER_STRIP_GATE(80C3D464, &lit_3948); +COMPILER_STRIP_GATE(0x80C3D464, &lit_3948); #pragma pop /* 80C3D468-80C3D46C 00008C 0004+00 1/1 0/0 0/0 .rodata @3962 */ SECTION_RODATA static f32 const lit_3962 = 30.0f; -COMPILER_STRIP_GATE(80C3D468, &lit_3962); +COMPILER_STRIP_GATE(0x80C3D468, &lit_3962); /* 80C3CC40-80C3CC90 0003E0 0050+00 0/0 0/0 1/1 .text getFirstVec__15daObjKazeNeko_cFP4cXyzi */ #pragma push @@ -359,6 +359,14 @@ asm void daObjKazeNeko_c::getFirstVec(cXyz* param_0, int param_1) { #pragma pop /* ############################################################################################## */ +/* 80C3D474-80C3D474 000098 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80C3D474 = "J_Kazami"; +SECTION_DEAD static char const* const stringBase_80C3D47D = "pole.bmd"; +SECTION_DEAD static char const* const stringBase_80C3D486 = "arm.bmd"; +#pragma pop + /* 80C3D490-80C3D494 -00001 0004+00 3/3 0/0 0/0 .data l_arcName */ SECTION_DATA static void* l_arcName = (void*)&d_a_obj_kazeneko__stringBase0; @@ -389,7 +397,7 @@ static asm void daObjKazeNeko_Draw(daObjKazeNeko_c* param_0) { SECTION_RODATA static u8 const lit_4119[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C3D46C, &lit_4119); +COMPILER_STRIP_GATE(0x80C3D46C, &lit_4119); #pragma pop /* 80C3CEA8-80C3D030 000648 0188+00 1/0 0/0 0/0 .text daObjKazeNeko_Execute__FP15daObjKazeNeko_c @@ -520,11 +528,4 @@ asm cCcD_GStts::~cCcD_GStts() { } #pragma pop -/* 80C3D474-80C3D48E 000098 001A+00 2/1 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80C3D474 = "J_Kazami"; -SECTION_DEAD static char const* const stringBase_80C3D47D = "pole.bmd"; -SECTION_DEAD static char const* const stringBase_80C3D486 = "arm.bmd"; -#pragma pop +/* 80C3D474-80C3D474 000098 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_kbacket/d_a_obj_kbacket.cpp b/rel/d/a/obj/d_a_obj_kbacket/d_a_obj_kbacket.cpp index 09f8f57c753..2d9b252df4b 100644 --- a/rel/d/a/obj/d_a_obj_kbacket/d_a_obj_kbacket.cpp +++ b/rel/d/a/obj/d_a_obj_kbacket/d_a_obj_kbacket.cpp @@ -246,7 +246,7 @@ extern "C" static void daObj_KBacket_Execute__FPv(); extern "C" static void daObj_KBacket_Draw__FPv(); extern "C" static bool daObj_KBacket_IsDelete__FPv(); extern "C" void __dt__10cCcD_GSttsFv(); -extern "C" void func_80587C88(int*); +extern "C" void func_80587C88(void* _this, int*); extern "C" void __sinit_d_a_obj_kbacket_cpp(); extern "C" void __dt__21daObj_KBacket_Param_cFv(); extern "C" static void func_80587D60(); @@ -365,6 +365,12 @@ extern "C" void __register_global_object(); // /* ############################################################################################## */ +/* 80587E70-80587E70 0000EC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80587E70 = "Kakashi"; +#pragma pop + /* 80587E78-80587E84 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -513,7 +519,7 @@ SECTION_RODATA u8 const daObj_KBacket_Param_c::m[44] = { 0x00, 0x42, 0x92, 0x00, 0x00, 0x41, 0xF0, 0x00, 0x00, 0x41, 0xF0, 0x00, 0x00, 0x41, 0xF0, 0x00, 0x00, 0x42, 0x14, 0x00, 0x00, 0x42, 0x34, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80587D84, &daObj_KBacket_Param_c::m); +COMPILER_STRIP_GATE(0x80587D84, &daObj_KBacket_Param_c::m); /* 80587DB0-80587DE0 00002C 0030+00 1/1 0/0 0/0 .rodata l_ccDObjData */ SECTION_RODATA static u8 const l_ccDObjData[48] = { @@ -521,18 +527,18 @@ SECTION_RODATA static u8 const l_ccDObjData[48] = { 0xD8, 0xFB, 0xFD, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x79, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80587DB0, &l_ccDObjData); +COMPILER_STRIP_GATE(0x80587DB0, &l_ccDObjData); /* 80587DE0-80587DE4 00005C 0004+00 0/2 0/0 0/0 .rodata @3965 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3965 = -50.0f; -COMPILER_STRIP_GATE(80587DE0, &lit_3965); +COMPILER_STRIP_GATE(0x80587DE0, &lit_3965); #pragma pop /* 80587DE4-80587DE8 000060 0004+00 1/2 0/0 0/0 .rodata @3966 */ SECTION_RODATA static f32 const lit_3966 = 50.0f; -COMPILER_STRIP_GATE(80587DE4, &lit_3966); +COMPILER_STRIP_GATE(0x80587DE4, &lit_3966); /* 80587DE8-80587DEC 000064 0004+00 0/3 0/0 0/0 .rodata @3967 */ #pragma push @@ -543,21 +549,21 @@ SECTION_RODATA static u8 const lit_3967[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80587DE8, &lit_3967); +COMPILER_STRIP_GATE(0x80587DE8, &lit_3967); #pragma pop /* 80587DEC-80587DF0 000068 0004+00 0/1 0/0 0/0 .rodata @3968 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3968 = 42.0f; -COMPILER_STRIP_GATE(80587DEC, &lit_3968); +COMPILER_STRIP_GATE(0x80587DEC, &lit_3968); #pragma pop /* 80587DF0-80587DF4 00006C 0004+00 0/2 0/0 0/0 .rodata @3969 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3969 = -1000000000.0f; -COMPILER_STRIP_GATE(80587DF0, &lit_3969); +COMPILER_STRIP_GATE(0x80587DF0, &lit_3969); #pragma pop /* 80586048-805863F0 0002E8 03A8+00 1/1 0/0 0/0 .text create__15daObj_KBacket_cFv */ @@ -655,159 +661,159 @@ asm void daObj_KBacket_c::Delete() { #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4463 = 0x43360B61; -COMPILER_STRIP_GATE(80587DF4, &lit_4463); +COMPILER_STRIP_GATE(0x80587DF4, &lit_4463); #pragma pop /* 80587DF8-80587DFC 000074 0004+00 0/1 0/0 0/0 .rodata @4464 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4464 = 3.0f / 10.0f; -COMPILER_STRIP_GATE(80587DF8, &lit_4464); +COMPILER_STRIP_GATE(0x80587DF8, &lit_4464); #pragma pop /* 80587DFC-80587E00 000078 0004+00 0/1 0/0 0/0 .rodata @4465 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4465 = 0.5f; -COMPILER_STRIP_GATE(80587DFC, &lit_4465); +COMPILER_STRIP_GATE(0x80587DFC, &lit_4465); #pragma pop /* 80587E00-80587E04 00007C 0004+00 0/1 0/0 0/0 .rodata @4466 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4466 = 3000.0f; -COMPILER_STRIP_GATE(80587E00, &lit_4466); +COMPILER_STRIP_GATE(0x80587E00, &lit_4466); #pragma pop /* 80587E04-80587E08 000080 0004+00 0/1 0/0 0/0 .rodata @4467 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4467 = 31.0f / 20.0f; -COMPILER_STRIP_GATE(80587E04, &lit_4467); +COMPILER_STRIP_GATE(0x80587E04, &lit_4467); #pragma pop /* 80587E08-80587E0C 000084 0004+00 0/1 0/0 0/0 .rodata @4468 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4468 = 3.0f / 20.0f; -COMPILER_STRIP_GATE(80587E08, &lit_4468); +COMPILER_STRIP_GATE(0x80587E08, &lit_4468); #pragma pop /* 80587E0C-80587E10 000088 0004+00 2/3 0/0 0/0 .rodata @4469 */ SECTION_RODATA static f32 const lit_4469 = 1.0f; -COMPILER_STRIP_GATE(80587E0C, &lit_4469); +COMPILER_STRIP_GATE(0x80587E0C, &lit_4469); /* 80587E10-80587E14 00008C 0004+00 0/1 0/0 0/0 .rodata @4470 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4470 = 0.75f; -COMPILER_STRIP_GATE(80587E10, &lit_4470); +COMPILER_STRIP_GATE(0x80587E10, &lit_4470); #pragma pop /* 80587E14-80587E18 000090 0004+00 0/1 0/0 0/0 .rodata @4471 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4471 = 2000.0f; -COMPILER_STRIP_GATE(80587E14, &lit_4471); +COMPILER_STRIP_GATE(0x80587E14, &lit_4471); #pragma pop /* 80587E18-80587E1C 000094 0004+00 0/1 0/0 0/0 .rodata @4472 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4472 = 2.0f; -COMPILER_STRIP_GATE(80587E18, &lit_4472); +COMPILER_STRIP_GATE(0x80587E18, &lit_4472); #pragma pop /* 80587E1C-80587E20 000098 0004+00 0/1 0/0 0/0 .rodata @4473 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4473 = 4.0f / 5.0f; -COMPILER_STRIP_GATE(80587E1C, &lit_4473); +COMPILER_STRIP_GATE(0x80587E1C, &lit_4473); #pragma pop /* 80587E20-80587E24 00009C 0004+00 0/1 0/0 0/0 .rodata @4474 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4474 = 11.0f; -COMPILER_STRIP_GATE(80587E20, &lit_4474); +COMPILER_STRIP_GATE(0x80587E20, &lit_4474); #pragma pop /* 80587E24-80587E28 0000A0 0004+00 0/1 0/0 0/0 .rodata @4475 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4475 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(80587E24, &lit_4475); +COMPILER_STRIP_GATE(0x80587E24, &lit_4475); #pragma pop /* 80587E28-80587E2C 0000A4 0004+00 0/1 0/0 0/0 .rodata @4476 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4476 = 1000.0f; -COMPILER_STRIP_GATE(80587E28, &lit_4476); +COMPILER_STRIP_GATE(0x80587E28, &lit_4476); #pragma pop /* 80587E2C-80587E30 0000A8 0004+00 0/2 0/0 0/0 .rodata @4477 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4477 = -1.0f; -COMPILER_STRIP_GATE(80587E2C, &lit_4477); +COMPILER_STRIP_GATE(0x80587E2C, &lit_4477); #pragma pop /* 80587E30-80587E34 0000AC 0004+00 0/1 0/0 0/0 .rodata @4478 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4478 = -30.0f; -COMPILER_STRIP_GATE(80587E30, &lit_4478); +COMPILER_STRIP_GATE(0x80587E30, &lit_4478); #pragma pop /* 80587E34-80587E38 0000B0 0004+00 1/2 0/0 0/0 .rodata @4479 */ SECTION_RODATA static f32 const lit_4479 = 7.0f / 10.0f; -COMPILER_STRIP_GATE(80587E34, &lit_4479); +COMPILER_STRIP_GATE(0x80587E34, &lit_4479); /* 80587E38-80587E3C 0000B4 0004+00 0/1 0/0 0/0 .rodata @4480 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4480 = -2.0f / 5.0f; -COMPILER_STRIP_GATE(80587E38, &lit_4480); +COMPILER_STRIP_GATE(0x80587E38, &lit_4480); #pragma pop /* 80587E3C-80587E40 0000B8 0004+00 0/1 0/0 0/0 .rodata @4481 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4481 = 1200.0f; -COMPILER_STRIP_GATE(80587E3C, &lit_4481); +COMPILER_STRIP_GATE(0x80587E3C, &lit_4481); #pragma pop /* 80587E40-80587E44 0000BC 0004+00 0/1 0/0 0/0 .rodata @4482 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4482 = 900.0f; -COMPILER_STRIP_GATE(80587E40, &lit_4482); +COMPILER_STRIP_GATE(0x80587E40, &lit_4482); #pragma pop /* 80587E44-80587E48 0000C0 0004+00 1/2 0/0 0/0 .rodata @4483 */ SECTION_RODATA static f32 const lit_4483 = 1.0f / 20.0f; -COMPILER_STRIP_GATE(80587E44, &lit_4483); +COMPILER_STRIP_GATE(0x80587E44, &lit_4483); /* 80587E48-80587E4C 0000C4 0004+00 0/1 0/0 0/0 .rodata @4484 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4484 = 100.0f; -COMPILER_STRIP_GATE(80587E48, &lit_4484); +COMPILER_STRIP_GATE(0x80587E48, &lit_4484); #pragma pop /* 80587E4C-80587E50 0000C8 0004+00 0/1 0/0 0/0 .rodata @4485 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4485 = 0.25f; -COMPILER_STRIP_GATE(80587E4C, &lit_4485); +COMPILER_STRIP_GATE(0x80587E4C, &lit_4485); #pragma pop /* 80587E50-80587E54 0000CC 0004+00 0/1 0/0 0/0 .rodata @4486 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4486 = 30.0f; -COMPILER_STRIP_GATE(80587E50, &lit_4486); +COMPILER_STRIP_GATE(0x80587E50, &lit_4486); #pragma pop /* 80587E54-80587E5C 0000D0 0004+04 0/1 0/0 0/0 .rodata @4487 */ @@ -818,14 +824,14 @@ SECTION_RODATA static f32 const lit_4487[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80587E54, &lit_4487); +COMPILER_STRIP_GATE(0x80587E54, &lit_4487); #pragma pop /* 80587E5C-80587E64 0000D8 0008+00 1/2 0/0 0/0 .rodata @4489 */ SECTION_RODATA static u8 const lit_4489[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80587E5C, &lit_4489); +COMPILER_STRIP_GATE(0x80587E5C, &lit_4489); /* 80586738-8058742C 0009D8 0CF4+00 2/2 0/0 0/0 .text Execute__15daObj_KBacket_cFv */ #pragma push @@ -925,14 +931,14 @@ asm void daObj_KBacket_c::calcRollAngle(s16 param_0, int param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4649 = 5.0f; -COMPILER_STRIP_GATE(80587E64, &lit_4649); +COMPILER_STRIP_GATE(0x80587E64, &lit_4649); #pragma pop /* 80587E68-80587E6C 0000E4 0004+00 0/1 0/0 0/0 .rodata @4650 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4650 = 200.0f; -COMPILER_STRIP_GATE(80587E68, &lit_4650); +COMPILER_STRIP_GATE(0x80587E68, &lit_4650); #pragma pop /* 80587864-805879F4 001B04 0190+00 1/1 0/0 0/0 .text getWallAngle__15daObj_KBacket_cFsPs @@ -949,7 +955,7 @@ asm void daObj_KBacket_c::getWallAngle(s16 param_0, s16* param_1) { /* ############################################################################################## */ /* 80587E6C-80587E70 0000E8 0004+00 2/2 0/0 0/0 .rodata @4666 */ SECTION_RODATA static f32 const lit_4666 = 3.0f / 5.0f; -COMPILER_STRIP_GATE(80587E6C, &lit_4666); +COMPILER_STRIP_GATE(0x80587E6C, &lit_4666); /* 805879F4-80587A70 001C94 007C+00 1/1 0/0 0/0 .text setSmokePrtcl__15daObj_KBacket_cFv */ @@ -1043,7 +1049,7 @@ asm cCcD_GStts::~cCcD_GStts() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80587C88(int* param_0) { +extern "C" asm void func_80587C88(void* _this, int* param_0) { nofralloc #include "asm/rel/d/a/obj/d_a_obj_kbacket/d_a_obj_kbacket/func_80587C88.s" } @@ -1075,7 +1081,7 @@ asm void __sinit_d_a_obj_kbacket_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80587CA4 = (void*)__sinit_d_a_obj_kbacket_cpp; +REGISTER_CTORS(0x80587CA4, __sinit_d_a_obj_kbacket_cpp); #pragma pop /* 80587D18-80587D60 001FB8 0048+00 2/1 0/0 0/0 .text __dt__21daObj_KBacket_Param_cFv */ @@ -1108,9 +1114,4 @@ static asm void func_80587D68() { } #pragma pop -/* 80587E70-80587E78 0000EC 0008+00 1/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80587E70 = "Kakashi"; -#pragma pop +/* 80587E70-80587E70 0000EC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_kbox/d_a_obj_kbox.cpp b/rel/d/a/obj/d_a_obj_kbox/d_a_obj_kbox.cpp index a69b7ee856b..cf5d36bf519 100644 --- a/rel/d/a/obj/d_a_obj_kbox/d_a_obj_kbox.cpp +++ b/rel/d/a/obj/d_a_obj_kbox/d_a_obj_kbox.cpp @@ -63,10 +63,10 @@ struct dPa_modelEcallBack { struct dPa_levelEcallBack {}; -struct _GXColor {}; - struct csXyz {}; +struct _GXColor {}; + struct dPa_control_c { /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, @@ -368,7 +368,7 @@ extern "C" void __register_global_object(); /* ############################################################################################## */ /* 80C3F058-80C3F05C 000000 0004+00 9/9 0/0 0/0 .rodata @3648 */ SECTION_RODATA static f32 const lit_3648 = 2.0f; -COMPILER_STRIP_GATE(80C3F058, &lit_3648); +COMPILER_STRIP_GATE(0x80C3F058, &lit_3648); /* 80C3F12C-80C3F134 000000 0008+00 1/1 0/0 0/0 .data w_eff_id$3979 */ SECTION_DATA static u8 w_eff_id[8] = { @@ -470,7 +470,7 @@ asm daObj_Kbox_HIO_c::daObj_Kbox_HIO_c() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3668 = -50.0f; -COMPILER_STRIP_GATE(80C3F05C, &lit_3668); +COMPILER_STRIP_GATE(0x80C3F05C, &lit_3668); #pragma pop /* 80C3F060-80C3F064 000008 0004+00 0/7 0/0 0/0 .rodata @3669 */ @@ -482,14 +482,14 @@ SECTION_RODATA static u8 const lit_3669[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C3F060, &lit_3669); +COMPILER_STRIP_GATE(0x80C3F060, &lit_3669); #pragma pop /* 80C3F064-80C3F068 00000C 0004+00 0/3 0/0 0/0 .rodata @3670 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3670 = 20.0f; -COMPILER_STRIP_GATE(80C3F064, &lit_3670); +COMPILER_STRIP_GATE(0x80C3F064, &lit_3670); #pragma pop /* 80C3F248-80C3F24C 000008 0001+03 1/1 0/0 0/0 .bss @1109 */ @@ -614,11 +614,18 @@ SECTION_RODATA static u8 const particle_id[6 + 2 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C3F068, &particle_id); +COMPILER_STRIP_GATE(0x80C3F068, &particle_id); /* 80C3F070-80C3F074 000018 0004+00 2/8 0/0 0/0 .rodata @3704 */ SECTION_RODATA static f32 const lit_3704 = 1.0f; -COMPILER_STRIP_GATE(80C3F070, &lit_3704); +COMPILER_STRIP_GATE(0x80C3F070, &lit_3704); + +/* 80C3F108-80C3F108 0000B0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80C3F108 = "Always"; +SECTION_DEAD static char const* const stringBase_80C3F10F = "BreakWoodBox.bmd"; +#pragma pop /* 80C3D74C-80C3D8BC 00022C 0170+00 1/1 0/0 0/0 .text break_eff__FP14obj_kbox_class */ #pragma push @@ -645,21 +652,21 @@ asm cXyz::~cXyz() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3741 = 125.0f; -COMPILER_STRIP_GATE(80C3F074, &lit_3741); +COMPILER_STRIP_GATE(0x80C3F074, &lit_3741); #pragma pop /* 80C3F078-80C3F07C 000020 0004+00 0/1 0/0 0/0 .rodata @3742 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3742 = 50.0f; -COMPILER_STRIP_GATE(80C3F078, &lit_3742); +COMPILER_STRIP_GATE(0x80C3F078, &lit_3742); #pragma pop /* 80C3F07C-80C3F080 000024 0004+00 0/2 0/0 0/0 .rodata @3743 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3743 = 500.0f; -COMPILER_STRIP_GATE(80C3F07C, &lit_3743); +COMPILER_STRIP_GATE(0x80C3F07C, &lit_3743); #pragma pop /* 80C3D8F8-80C3DA18 0003D8 0120+00 1/0 0/0 0/0 .text daObj_Kbox_Draw__FP14obj_kbox_class @@ -686,27 +693,27 @@ static asm void kbox_ground(obj_kbox_class* param_0) { /* ############################################################################################## */ /* 80C3F080-80C3F084 000028 0004+00 1/5 0/0 0/0 .rodata @3794 */ SECTION_RODATA static f32 const lit_3794 = 10.0f; -COMPILER_STRIP_GATE(80C3F080, &lit_3794); +COMPILER_STRIP_GATE(0x80C3F080, &lit_3794); /* 80C3F084-80C3F088 00002C 0004+00 0/1 0/0 0/0 .rodata @3795 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3795 = 17.0f; -COMPILER_STRIP_GATE(80C3F084, &lit_3795); +COMPILER_STRIP_GATE(0x80C3F084, &lit_3795); #pragma pop /* 80C3F088-80C3F08C 000030 0004+00 0/2 0/0 0/0 .rodata @3796 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3796 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(80C3F088, &lit_3796); +COMPILER_STRIP_GATE(0x80C3F088, &lit_3796); #pragma pop /* 80C3F08C-80C3F090 000034 0004+00 0/1 0/0 0/0 .rodata @3797 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3797 = -10.0f; -COMPILER_STRIP_GATE(80C3F08C, &lit_3797); +COMPILER_STRIP_GATE(0x80C3F08C, &lit_3797); #pragma pop /* 80C3DAB4-80C3DBE4 000594 0130+00 1/1 0/0 0/0 .text kbox_carry__FP14obj_kbox_class */ @@ -722,7 +729,7 @@ static asm void kbox_carry(obj_kbox_class* param_0) { /* ############################################################################################## */ /* 80C3F090-80C3F094 000038 0004+00 1/2 0/0 0/0 .rodata @3829 */ SECTION_RODATA static f32 const lit_3829 = 3000.0f; -COMPILER_STRIP_GATE(80C3F090, &lit_3829); +COMPILER_STRIP_GATE(0x80C3F090, &lit_3829); /* 80C3DBE4-80C3DDC4 0006C4 01E0+00 1/1 0/0 0/0 .text water_check__FP14obj_kbox_class */ #pragma push @@ -749,42 +756,42 @@ asm dBgS_ObjGndChk::~dBgS_ObjGndChk() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3868 = 2000.0f; -COMPILER_STRIP_GATE(80C3F094, &lit_3868); +COMPILER_STRIP_GATE(0x80C3F094, &lit_3868); #pragma pop /* 80C3F098-80C3F09C 000040 0004+00 0/1 0/0 0/0 .rodata @3869 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3869 = -0.5f; -COMPILER_STRIP_GATE(80C3F098, &lit_3869); +COMPILER_STRIP_GATE(0x80C3F098, &lit_3869); #pragma pop /* 80C3F09C-80C3F0A0 000044 0004+00 0/2 0/0 0/0 .rodata @3870 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3870 = 15.0f; -COMPILER_STRIP_GATE(80C3F09C, &lit_3870); +COMPILER_STRIP_GATE(0x80C3F09C, &lit_3870); #pragma pop /* 80C3F0A0-80C3F0A4 000048 0004+00 0/2 0/0 0/0 .rodata @3871 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3871 = 1000.0f; -COMPILER_STRIP_GATE(80C3F0A0, &lit_3871); +COMPILER_STRIP_GATE(0x80C3F0A0, &lit_3871); #pragma pop /* 80C3F0A4-80C3F0A8 00004C 0004+00 0/1 0/0 0/0 .rodata @3872 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3872 = 2.0f / 5.0f; -COMPILER_STRIP_GATE(80C3F0A4, &lit_3872); +COMPILER_STRIP_GATE(0x80C3F0A4, &lit_3872); #pragma pop /* 80C3F0A8-80C3F0AC 000050 0004+00 0/2 0/0 0/0 .rodata @3873 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3873 = 100.0f; -COMPILER_STRIP_GATE(80C3F0A8, &lit_3873); +COMPILER_STRIP_GATE(0x80C3F0A8, &lit_3873); #pragma pop /* 80C3DE3C-80C3DFAC 00091C 0170+00 1/1 0/0 0/0 .text kbox_drop__FP14obj_kbox_class */ @@ -802,84 +809,84 @@ static asm void kbox_drop(obj_kbox_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3935 = 0.25f; -COMPILER_STRIP_GATE(80C3F0AC, &lit_3935); +COMPILER_STRIP_GATE(0x80C3F0AC, &lit_3935); #pragma pop /* 80C3F0B0-80C3F0B4 000058 0004+00 0/1 0/0 0/0 .rodata @3936 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3936 = 19.0f / 20.0f; -COMPILER_STRIP_GATE(80C3F0B0, &lit_3936); +COMPILER_STRIP_GATE(0x80C3F0B0, &lit_3936); #pragma pop /* 80C3F0B4-80C3F0B8 00005C 0004+00 0/1 0/0 0/0 .rodata @3937 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3937 = 1.0f / 20.0f; -COMPILER_STRIP_GATE(80C3F0B4, &lit_3937); +COMPILER_STRIP_GATE(0x80C3F0B4, &lit_3937); #pragma pop /* 80C3F0B8-80C3F0BC 000060 0004+00 0/2 0/0 0/0 .rodata @3938 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3938 = 2.5f; -COMPILER_STRIP_GATE(80C3F0B8, &lit_3938); +COMPILER_STRIP_GATE(0x80C3F0B8, &lit_3938); #pragma pop /* 80C3F0BC-80C3F0C0 000064 0004+00 0/2 0/0 0/0 .rodata @3939 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3939 = 0.5f; -COMPILER_STRIP_GATE(80C3F0BC, &lit_3939); +COMPILER_STRIP_GATE(0x80C3F0BC, &lit_3939); #pragma pop /* 80C3F0C0-80C3F0C4 000068 0004+00 0/2 0/0 0/0 .rodata @3940 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3940 = 60.0f; -COMPILER_STRIP_GATE(80C3F0C0, &lit_3940); +COMPILER_STRIP_GATE(0x80C3F0C0, &lit_3940); #pragma pop /* 80C3F0C4-80C3F0C8 00006C 0004+00 0/1 0/0 0/0 .rodata @3941 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3941 = 25.0f; -COMPILER_STRIP_GATE(80C3F0C4, &lit_3941); +COMPILER_STRIP_GATE(0x80C3F0C4, &lit_3941); #pragma pop /* 80C3F0C8-80C3F0CC 000070 0004+00 0/1 0/0 0/0 .rodata @3942 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_3942 = 0x3B83126F; -COMPILER_STRIP_GATE(80C3F0C8, &lit_3942); +COMPILER_STRIP_GATE(0x80C3F0C8, &lit_3942); #pragma pop /* 80C3F0CC-80C3F0D0 000074 0004+00 0/1 0/0 0/0 .rodata @3943 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3943 = 30.0f; -COMPILER_STRIP_GATE(80C3F0CC, &lit_3943); +COMPILER_STRIP_GATE(0x80C3F0CC, &lit_3943); #pragma pop /* 80C3F0D0-80C3F0D4 000078 0004+00 0/1 0/0 0/0 .rodata @3944 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3944 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(80C3F0D0, &lit_3944); +COMPILER_STRIP_GATE(0x80C3F0D0, &lit_3944); #pragma pop /* 80C3F0D4-80C3F0D8 00007C 0004+00 0/1 0/0 0/0 .rodata @3945 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3945 = -20.0f; -COMPILER_STRIP_GATE(80C3F0D4, &lit_3945); +COMPILER_STRIP_GATE(0x80C3F0D4, &lit_3945); #pragma pop /* 80C3F0D8-80C3F0DC 000080 0004+00 0/2 0/0 0/0 .rodata @3946 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3946 = 5.0f; -COMPILER_STRIP_GATE(80C3F0D8, &lit_3946); +COMPILER_STRIP_GATE(0x80C3F0D8, &lit_3946); #pragma pop /* 80C3DFAC-80C3E340 000A8C 0394+00 1/1 0/0 0/0 .text kbox_float__FP14obj_kbox_class */ @@ -897,49 +904,49 @@ static asm void kbox_float(obj_kbox_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4061 = 4.0f; -COMPILER_STRIP_GATE(80C3F0DC, &lit_4061); +COMPILER_STRIP_GATE(0x80C3F0DC, &lit_4061); #pragma pop /* 80C3F0E0-80C3F0E4 000088 0004+00 0/1 0/0 0/0 .rodata @4062 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4062 = -100.0f; -COMPILER_STRIP_GATE(80C3F0E0, &lit_4062); +COMPILER_STRIP_GATE(0x80C3F0E0, &lit_4062); #pragma pop /* 80C3F0E4-80C3F0E8 00008C 0004+00 0/1 0/0 0/0 .rodata @4063 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4063 = -2.0f; -COMPILER_STRIP_GATE(80C3F0E4, &lit_4063); +COMPILER_STRIP_GATE(0x80C3F0E4, &lit_4063); #pragma pop /* 80C3F0E8-80C3F0EC 000090 0004+00 0/1 0/0 0/0 .rodata @4064 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4064 = -5.0f; -COMPILER_STRIP_GATE(80C3F0E8, &lit_4064); +COMPILER_STRIP_GATE(0x80C3F0E8, &lit_4064); #pragma pop /* 80C3F0EC-80C3F0F0 000094 0004+00 0/1 0/0 0/0 .rodata @4065 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4065 = 1.25f; -COMPILER_STRIP_GATE(80C3F0EC, &lit_4065); +COMPILER_STRIP_GATE(0x80C3F0EC, &lit_4065); #pragma pop /* 80C3F0F0-80C3F0F4 000098 0004+00 0/1 0/0 0/0 .rodata @4066 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4066 = 40.0f; -COMPILER_STRIP_GATE(80C3F0F0, &lit_4066); +COMPILER_STRIP_GATE(0x80C3F0F0, &lit_4066); #pragma pop /* 80C3F0F4-80C3F0F8 00009C 0004+00 0/1 0/0 0/0 .rodata @4067 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4067 = 20000.0f; -COMPILER_STRIP_GATE(80C3F0F4, &lit_4067); +COMPILER_STRIP_GATE(0x80C3F0F4, &lit_4067); #pragma pop /* 80C3F2A0-80C3F2B0 000060 000C+04 0/1 0/0 0/0 .bss @3976 */ @@ -967,7 +974,7 @@ static asm void action(obj_kbox_class* param_0) { /* ############################################################################################## */ /* 80C3F0F8-80C3F0FC 0000A0 0004+00 1/1 0/0 0/0 .rodata @4092 */ SECTION_RODATA static f32 const lit_4092 = -1.0f; -COMPILER_STRIP_GATE(80C3F0F8, &lit_4092); +COMPILER_STRIP_GATE(0x80C3F0F8, &lit_4092); /* 80C3E8E8-80C3EA24 0013C8 013C+00 2/1 0/0 0/0 .text daObj_Kbox_Execute__FP14obj_kbox_class */ #pragma push @@ -984,6 +991,13 @@ static bool daObj_Kbox_IsDelete(obj_kbox_class* param_0) { return true; } +/* ############################################################################################## */ +/* 80C3F108-80C3F108 0000B0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80C3F120 = "Obj_kbox"; +#pragma pop + /* 80C3EA2C-80C3EAAC 00150C 0080+00 1/0 0/0 0/0 .text daObj_Kbox_Delete__FP14obj_kbox_class */ #pragma push #pragma optimization_level 0 @@ -1009,21 +1023,21 @@ static asm void useHeapInit(fopAc_ac_c* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4209 = -200.0f; -COMPILER_STRIP_GATE(80C3F0FC, &lit_4209); +COMPILER_STRIP_GATE(0x80C3F0FC, &lit_4209); #pragma pop /* 80C3F100-80C3F104 0000A8 0004+00 0/1 0/0 0/0 .rodata @4210 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4210 = 200.0f; -COMPILER_STRIP_GATE(80C3F100, &lit_4210); +COMPILER_STRIP_GATE(0x80C3F100, &lit_4210); #pragma pop /* 80C3F104-80C3F108 0000AC 0004+00 0/1 0/0 0/0 .rodata @4211 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4211 = 65536.0f; -COMPILER_STRIP_GATE(80C3F104, &lit_4211); +COMPILER_STRIP_GATE(0x80C3F104, &lit_4211); #pragma pop /* 80C3EBCC-80C3EE98 0016AC 02CC+00 1/0 0/0 0/0 .text daObj_Kbox_Create__FP10fopAc_ac_c @@ -1089,7 +1103,7 @@ asm void __sinit_d_a_obj_kbox_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80C3EFE0 = (void*)__sinit_d_a_obj_kbox_cpp; +REGISTER_CTORS(0x80C3EFE0, __sinit_d_a_obj_kbox_cpp); #pragma pop /* 80C3F01C-80C3F024 001AFC 0008+00 1/0 0/0 0/0 .text @20@__dt__14dBgS_ObjGndChkFv */ @@ -1314,11 +1328,4 @@ static u8 data_80C3F318[4]; static u8 data_80C3F31C[4]; #pragma pop -/* 80C3F108-80C3F129 0000B0 0021+00 4/4 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80C3F108 = "Always"; -SECTION_DEAD static char const* const stringBase_80C3F10F = "BreakWoodBox.bmd"; -SECTION_DEAD static char const* const stringBase_80C3F120 = "Obj_kbox"; -#pragma pop +/* 80C3F108-80C3F108 0000B0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_key/d_a_obj_key.cpp b/rel/d/a/obj/d_a_obj_key/d_a_obj_key.cpp index b437d24a55a..3dd6d64050d 100644 --- a/rel/d/a/obj/d_a_obj_key/d_a_obj_key.cpp +++ b/rel/d/a/obj/d_a_obj_key/d_a_obj_key.cpp @@ -67,13 +67,13 @@ struct dRes_control_c { struct dPa_levelEcallBack {}; -struct _GXColor {}; - struct csXyz { /* 80C40EE4 */ ~csXyz(); /* 80C40F20 */ csXyz(); }; +struct _GXColor {}; + struct dPa_control_c { /* 8004D4CC */ void set(u32, u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, @@ -286,11 +286,11 @@ extern "C" void __register_global_object(); /* ############################################################################################## */ /* 80C40FEC-80C40FF0 000000 0004+00 5/5 0/0 0/0 .rodata @3778 */ SECTION_RODATA static f32 const lit_3778 = 1.0f; -COMPILER_STRIP_GATE(80C40FEC, &lit_3778); +COMPILER_STRIP_GATE(0x80C40FEC, &lit_3778); /* 80C40FF0-80C40FF4 000004 0004+00 1/1 0/0 0/0 .rodata @3779 */ SECTION_RODATA static f32 const lit_3779 = 1.5f; -COMPILER_STRIP_GATE(80C40FF0, &lit_3779); +COMPILER_STRIP_GATE(0x80C40FF0, &lit_3779); /* 80C41094-80C41098 000000 0004+00 1/1 0/0 0/0 .data key_eno$4387 */ SECTION_DATA static u8 key_eno[4] = { @@ -403,7 +403,7 @@ static asm void s_count_sub(void* param_0, void* param_1) { /* ############################################################################################## */ /* 80C40FF4-80C40FF8 000008 0004+00 2/2 0/0 0/0 .rodata @3836 */ SECTION_RODATA static f32 const lit_3836 = 40000.0f; -COMPILER_STRIP_GATE(80C40FF4, &lit_3836); +COMPILER_STRIP_GATE(0x80C40FF4, &lit_3836); /* 80C3F540-80C3F600 000220 00C0+00 1/1 0/0 0/0 .text s_master_sub__FPvPv */ #pragma push @@ -441,14 +441,14 @@ static asm void action_check(obj_key_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3978 = 5.0f; -COMPILER_STRIP_GATE(80C40FF8, &lit_3978); +COMPILER_STRIP_GATE(0x80C40FF8, &lit_3978); #pragma pop /* 80C40FFC-80C41000 000010 0004+00 0/2 0/0 0/0 .rodata @3979 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3979 = 20.0f; -COMPILER_STRIP_GATE(80C40FFC, &lit_3979); +COMPILER_STRIP_GATE(0x80C40FFC, &lit_3979); #pragma pop /* 80C41000-80C41004 000014 0004+00 0/2 0/0 0/0 .rodata @3980 */ @@ -460,42 +460,42 @@ SECTION_RODATA static u8 const lit_3980[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C41000, &lit_3980); +COMPILER_STRIP_GATE(0x80C41000, &lit_3980); #pragma pop /* 80C41004-80C41008 000018 0004+00 0/1 0/0 0/0 .rodata @3981 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3981 = 41.5f; -COMPILER_STRIP_GATE(80C41004, &lit_3981); +COMPILER_STRIP_GATE(0x80C41004, &lit_3981); #pragma pop /* 80C41008-80C4100C 00001C 0004+00 0/2 0/0 0/0 .rodata @3982 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3982 = -20.0f; -COMPILER_STRIP_GATE(80C41008, &lit_3982); +COMPILER_STRIP_GATE(0x80C41008, &lit_3982); #pragma pop /* 80C4100C-80C41010 000020 0004+00 0/3 0/0 0/0 .rodata @3983 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3983 = 200.0f; -COMPILER_STRIP_GATE(80C4100C, &lit_3983); +COMPILER_STRIP_GATE(0x80C4100C, &lit_3983); #pragma pop /* 80C41010-80C41014 000024 0004+00 0/1 0/0 0/0 .rodata @3984 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3984 = 16.0f; -COMPILER_STRIP_GATE(80C41010, &lit_3984); +COMPILER_STRIP_GATE(0x80C41010, &lit_3984); #pragma pop /* 80C41014-80C41018 000028 0004+00 0/2 0/0 0/0 .rodata @3985 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3985 = 10.0f; -COMPILER_STRIP_GATE(80C41014, &lit_3985); +COMPILER_STRIP_GATE(0x80C41014, &lit_3985); #pragma pop /* 80C3F728-80C3FB84 000408 045C+00 1/1 0/0 0/0 .text chain_control_00__FP13obj_key_class @@ -524,91 +524,91 @@ asm cXyz::~cXyz() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4347 = 50.0f; -COMPILER_STRIP_GATE(80C41018, &lit_4347); +COMPILER_STRIP_GATE(0x80C41018, &lit_4347); #pragma pop /* 80C4101C-80C41020 000030 0004+00 0/1 0/0 0/0 .rodata @4348 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4348 = 10000.0f; -COMPILER_STRIP_GATE(80C4101C, &lit_4348); +COMPILER_STRIP_GATE(0x80C4101C, &lit_4348); #pragma pop /* 80C41020-80C41024 000034 0004+00 0/1 0/0 0/0 .rodata @4349 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4349 = -1.0f; -COMPILER_STRIP_GATE(80C41020, &lit_4349); +COMPILER_STRIP_GATE(0x80C41020, &lit_4349); #pragma pop /* 80C41024-80C41028 000038 0004+00 0/2 0/0 0/0 .rodata @4350 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4350 = 30.0f; -COMPILER_STRIP_GATE(80C41024, &lit_4350); +COMPILER_STRIP_GATE(0x80C41024, &lit_4350); #pragma pop /* 80C41028-80C4102C 00003C 0004+00 0/1 0/0 0/0 .rodata @4351 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4351 = 12.0f; -COMPILER_STRIP_GATE(80C41028, &lit_4351); +COMPILER_STRIP_GATE(0x80C41028, &lit_4351); #pragma pop /* 80C4102C-80C41030 000040 0004+00 0/1 0/0 0/0 .rodata @4352 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4352 = -5.0f; -COMPILER_STRIP_GATE(80C4102C, &lit_4352); +COMPILER_STRIP_GATE(0x80C4102C, &lit_4352); #pragma pop /* 80C41030-80C41034 000044 0004+00 0/1 0/0 0/0 .rodata @4353 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4353 = 7.0f; -COMPILER_STRIP_GATE(80C41030, &lit_4353); +COMPILER_STRIP_GATE(0x80C41030, &lit_4353); #pragma pop /* 80C41034-80C41038 000048 0004+00 0/2 0/0 0/0 .rodata @4354 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4354 = -3.0f; -COMPILER_STRIP_GATE(80C41034, &lit_4354); +COMPILER_STRIP_GATE(0x80C41034, &lit_4354); #pragma pop /* 80C41038-80C4103C 00004C 0004+00 0/1 0/0 0/0 .rodata @4355 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4355 = -15.0f; -COMPILER_STRIP_GATE(80C41038, &lit_4355); +COMPILER_STRIP_GATE(0x80C41038, &lit_4355); #pragma pop /* 80C4103C-80C41040 000050 0004+00 0/1 0/0 0/0 .rodata @4356 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4356 = -50.0f; -COMPILER_STRIP_GATE(80C4103C, &lit_4356); +COMPILER_STRIP_GATE(0x80C4103C, &lit_4356); #pragma pop /* 80C41040-80C41044 000054 0004+00 0/1 0/0 0/0 .rodata @4357 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4357 = -30.0f; -COMPILER_STRIP_GATE(80C41040, &lit_4357); +COMPILER_STRIP_GATE(0x80C41040, &lit_4357); #pragma pop /* 80C41044-80C41048 000058 0004+00 0/1 0/0 0/0 .rodata @4358 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4358 = 2.0f / 5.0f; -COMPILER_STRIP_GATE(80C41044, &lit_4358); +COMPILER_STRIP_GATE(0x80C41044, &lit_4358); #pragma pop /* 80C41048-80C4104C 00005C 0004+00 0/1 0/0 0/0 .rodata @4359 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4359 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(80C41048, &lit_4359); +COMPILER_STRIP_GATE(0x80C41048, &lit_4359); #pragma pop /* 80C4104C-80C41054 000060 0004+04 0/1 0/0 0/0 .rodata @4360 */ @@ -619,7 +619,7 @@ SECTION_RODATA static f32 const lit_4360[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80C4104C, &lit_4360); +COMPILER_STRIP_GATE(0x80C4104C, &lit_4360); #pragma pop /* 80C41054-80C4105C 000068 0008+00 0/1 0/0 0/0 .rodata @4361 */ @@ -628,7 +628,7 @@ COMPILER_STRIP_GATE(80C4104C, &lit_4360); SECTION_RODATA static u8 const lit_4361[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C41054, &lit_4361); +COMPILER_STRIP_GATE(0x80C41054, &lit_4361); #pragma pop /* 80C4105C-80C41064 000070 0008+00 0/1 0/0 0/0 .rodata @4362 */ @@ -637,7 +637,7 @@ COMPILER_STRIP_GATE(80C41054, &lit_4361); SECTION_RODATA static u8 const lit_4362[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C4105C, &lit_4362); +COMPILER_STRIP_GATE(0x80C4105C, &lit_4362); #pragma pop /* 80C41064-80C4106C 000078 0008+00 0/1 0/0 0/0 .rodata @4363 */ @@ -646,28 +646,28 @@ COMPILER_STRIP_GATE(80C4105C, &lit_4362); SECTION_RODATA static u8 const lit_4363[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C41064, &lit_4363); +COMPILER_STRIP_GATE(0x80C41064, &lit_4363); #pragma pop /* 80C4106C-80C41070 000080 0004+00 0/1 0/0 0/0 .rodata @4364 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4364 = 44.5f; -COMPILER_STRIP_GATE(80C4106C, &lit_4364); +COMPILER_STRIP_GATE(0x80C4106C, &lit_4364); #pragma pop /* 80C41070-80C41074 000084 0004+00 0/1 0/0 0/0 .rodata @4365 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4365 = 2.0f; -COMPILER_STRIP_GATE(80C41070, &lit_4365); +COMPILER_STRIP_GATE(0x80C41070, &lit_4365); #pragma pop /* 80C41074-80C41078 000088 0004+00 0/1 0/0 0/0 .rodata @4366 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4366 = 8.0f; -COMPILER_STRIP_GATE(80C41074, &lit_4366); +COMPILER_STRIP_GATE(0x80C41074, &lit_4366); #pragma pop /* 80C3FBC0-80C406EC 0008A0 0B2C+00 1/1 0/0 0/0 .text chain_control_01__FP13obj_key_class @@ -706,6 +706,13 @@ static bool daObj_Key_IsDelete(obj_key_class* param_0) { return true; } +/* ############################################################################################## */ +/* 80C4107C-80C4107C 000090 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80C4107C = "Obj_key"; +#pragma pop + /* 80C40944-80C409AC 001624 0068+00 1/0 0/0 0/0 .text daObj_Key_Delete__FP13obj_key_class */ #pragma push @@ -732,7 +739,14 @@ static asm void useHeapInit(fopAc_ac_c* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4555 = -200.0f; -COMPILER_STRIP_GATE(80C41078, &lit_4555); +COMPILER_STRIP_GATE(0x80C41078, &lit_4555); +#pragma pop + +/* 80C4107C-80C4107C 000090 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80C41084 = "F_SP118"; +SECTION_DEAD static char const* const stringBase_80C4108C = "D_MN09"; #pragma pop /* 80C40AB8-80C40DE4 001798 032C+00 1/0 0/0 0/0 .text daObj_Key_Create__FP10fopAc_ac_c */ @@ -817,7 +831,7 @@ asm void __sinit_d_a_obj_key_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80C40F70 = (void*)__sinit_d_a_obj_key_cpp; +REGISTER_CTORS(0x80C40F70, __sinit_d_a_obj_key_cpp); #pragma pop /* 80C40FAC-80C40FB4 001C8C 0008+00 1/0 0/0 0/0 .text @36@__dt__12dBgS_ObjAcchFv */ @@ -850,11 +864,4 @@ asm void daKey_c::setPos(cXyz param_0) { } #pragma pop -/* 80C4107C-80C41093 000090 0017+00 3/3 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80C4107C = "Obj_key"; -SECTION_DEAD static char const* const stringBase_80C41084 = "F_SP118"; -SECTION_DEAD static char const* const stringBase_80C4108C = "D_MN09"; -#pragma pop +/* 80C4107C-80C4107C 000090 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_keyhole/d_a_obj_keyhole.cpp b/rel/d/a/obj/d_a_obj_keyhole/d_a_obj_keyhole.cpp index ea5575e3e31..447078fe126 100644 --- a/rel/d/a/obj/d_a_obj_keyhole/d_a_obj_keyhole.cpp +++ b/rel/d/a/obj/d_a_obj_keyhole/d_a_obj_keyhole.cpp @@ -28,10 +28,10 @@ struct mDoExt_McaMorfCallBack1_c {}; struct Vec {}; -struct J3DModelData {}; - struct J3DAnmTransform {}; +struct J3DModelData {}; + struct mDoExt_McaMorf { /* 8000FC4C */ mDoExt_McaMorf(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, int, @@ -319,7 +319,17 @@ extern "C" void __register_global_object(); /* ############################################################################################## */ /* 80C439E4-80C439E8 000000 0004+00 10/10 0/0 0/0 .rodata @3655 */ SECTION_RODATA static f32 const lit_3655 = 1.0f; -COMPILER_STRIP_GATE(80C439E4, &lit_3655); +COMPILER_STRIP_GATE(0x80C439E4, &lit_3655); + +/* 80C43ABC-80C43ABC 0000D8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80C43ABC = "Obj_keyh"; +SECTION_DEAD static char const* const stringBase_80C43AC5 = "Obj_bkey"; +SECTION_DEAD static char const* const stringBase_80C43ACE = "Obj_bkey2"; +SECTION_DEAD static char const* const stringBase_80C43AD8 = "Obj_bkey3"; +SECTION_DEAD static char const* const stringBase_80C43AE2 = "Obj_bkey5"; +#pragma pop /* 80C43AEC-80C43AF8 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { @@ -476,7 +486,7 @@ SECTION_RODATA static u8 const lit_3689[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C439E8, &lit_3689); +COMPILER_STRIP_GATE(0x80C439E8, &lit_3689); /* 80C41270-80C4134C 000110 00DC+00 1/1 0/0 0/0 .text nodeCallBack__FP8J3DJointi */ #pragma push @@ -503,21 +513,21 @@ static asm void daObj_Keyhole_Draw(obj_keyhole_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3763 = 10.0f; -COMPILER_STRIP_GATE(80C439EC, &lit_3763); +COMPILER_STRIP_GATE(0x80C439EC, &lit_3763); #pragma pop /* 80C439F0-80C439F4 00000C 0004+00 0/5 0/0 0/0 .rodata @3764 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3764 = 30.0f; -COMPILER_STRIP_GATE(80C439F0, &lit_3764); +COMPILER_STRIP_GATE(0x80C439F0, &lit_3764); #pragma pop /* 80C439F4-80C439F8 000010 0004+00 0/2 0/0 0/0 .rodata @3765 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3765 = -13.0f; -COMPILER_STRIP_GATE(80C439F4, &lit_3765); +COMPILER_STRIP_GATE(0x80C439F4, &lit_3765); #pragma pop /* 80C41454-80C41654 0002F4 0200+00 1/1 0/0 0/0 .text @@ -546,28 +556,28 @@ asm cXyz::~cXyz() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3845 = 4.0f / 5.0f; -COMPILER_STRIP_GATE(80C439F8, &lit_3845); +COMPILER_STRIP_GATE(0x80C439F8, &lit_3845); #pragma pop /* 80C439FC-80C43A00 000018 0004+00 0/1 0/0 0/0 .rodata @3846 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3846 = -20.0f; -COMPILER_STRIP_GATE(80C439FC, &lit_3846); +COMPILER_STRIP_GATE(0x80C439FC, &lit_3846); #pragma pop /* 80C43A00-80C43A04 00001C 0004+00 0/1 0/0 0/0 .rodata @3847 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3847 = 33.0f / 50.0f; -COMPILER_STRIP_GATE(80C43A00, &lit_3847); +COMPILER_STRIP_GATE(0x80C43A00, &lit_3847); #pragma pop /* 80C43A04-80C43A08 000020 0004+00 0/4 0/0 0/0 .rodata @3848 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3848 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(80C43A04, &lit_3848); +COMPILER_STRIP_GATE(0x80C43A04, &lit_3848); #pragma pop /* 80C41690-80C419C4 000530 0334+00 1/1 0/0 0/0 .text @@ -586,7 +596,7 @@ static asm void chain_control1_2(obj_keyhole_class* param_0, kh_chain_s* param_1 #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3900 = 0.5f; -COMPILER_STRIP_GATE(80C43A08, &lit_3900); +COMPILER_STRIP_GATE(0x80C43A08, &lit_3900); #pragma pop /* 80C419C4-80C41C84 000864 02C0+00 1/1 0/0 0/0 .text @@ -605,7 +615,7 @@ static asm void chain_control2(obj_keyhole_class* param_0, kh_chain_s* param_1, SECTION_RODATA static u8 const lit_3928[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C43A0C, &lit_3928); +COMPILER_STRIP_GATE(0x80C43A0C, &lit_3928); /* 80C41C84-80C41D6C 000B24 00E8+00 1/1 0/0 0/0 .text * chain_control3__FP17obj_keyhole_classP10kh_chain_si */ @@ -623,112 +633,112 @@ static asm void chain_control3(obj_keyhole_class* param_0, kh_chain_s* param_1, #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4111 = 140.0f; -COMPILER_STRIP_GATE(80C43A14, &lit_4111); +COMPILER_STRIP_GATE(0x80C43A14, &lit_4111); #pragma pop /* 80C43A18-80C43A1C 000034 0004+00 0/1 0/0 0/0 .rodata @4112 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4112 = 130.0f; -COMPILER_STRIP_GATE(80C43A18, &lit_4112); +COMPILER_STRIP_GATE(0x80C43A18, &lit_4112); #pragma pop /* 80C43A1C-80C43A20 000038 0004+00 0/1 0/0 0/0 .rodata @4113 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4113 = -140.0f; -COMPILER_STRIP_GATE(80C43A1C, &lit_4113); +COMPILER_STRIP_GATE(0x80C43A1C, &lit_4113); #pragma pop /* 80C43A20-80C43A24 00003C 0004+00 0/1 0/0 0/0 .rodata @4114 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4114 = 170.0f; -COMPILER_STRIP_GATE(80C43A20, &lit_4114); +COMPILER_STRIP_GATE(0x80C43A20, &lit_4114); #pragma pop /* 80C43A24-80C43A28 000040 0004+00 0/1 0/0 0/0 .rodata @4115 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4115 = -170.0f; -COMPILER_STRIP_GATE(80C43A24, &lit_4115); +COMPILER_STRIP_GATE(0x80C43A24, &lit_4115); #pragma pop /* 80C43A28-80C43A2C 000044 0004+00 0/1 0/0 0/0 .rodata @4116 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4116 = -100.0f; -COMPILER_STRIP_GATE(80C43A28, &lit_4116); +COMPILER_STRIP_GATE(0x80C43A28, &lit_4116); #pragma pop /* 80C43A2C-80C43A30 000048 0004+00 0/1 0/0 0/0 .rodata @4117 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4117 = 2.0f; -COMPILER_STRIP_GATE(80C43A2C, &lit_4117); +COMPILER_STRIP_GATE(0x80C43A2C, &lit_4117); #pragma pop /* 80C43A30-80C43A34 00004C 0004+00 0/3 0/0 0/0 .rodata @4118 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4118 = 150.0f; -COMPILER_STRIP_GATE(80C43A30, &lit_4118); +COMPILER_STRIP_GATE(0x80C43A30, &lit_4118); #pragma pop /* 80C43A34-80C43A38 000050 0004+00 0/2 0/0 0/0 .rodata @4119 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4119 = 7.0f; -COMPILER_STRIP_GATE(80C43A34, &lit_4119); +COMPILER_STRIP_GATE(0x80C43A34, &lit_4119); #pragma pop /* 80C43A38-80C43A3C 000054 0004+00 0/1 0/0 0/0 .rodata @4120 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4120 = 20.0f; -COMPILER_STRIP_GATE(80C43A38, &lit_4120); +COMPILER_STRIP_GATE(0x80C43A38, &lit_4120); #pragma pop /* 80C43A3C-80C43A40 000058 0004+00 0/1 0/0 0/0 .rodata @4121 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4121 = 35.0f; -COMPILER_STRIP_GATE(80C43A3C, &lit_4121); +COMPILER_STRIP_GATE(0x80C43A3C, &lit_4121); #pragma pop /* 80C43A40-80C43A44 00005C 0004+00 0/1 0/0 0/0 .rodata @4122 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4122 = 13000.0f; -COMPILER_STRIP_GATE(80C43A40, &lit_4122); +COMPILER_STRIP_GATE(0x80C43A40, &lit_4122); #pragma pop /* 80C43A44-80C43A48 000060 0004+00 0/1 0/0 0/0 .rodata @4123 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4123 = 25.0f; -COMPILER_STRIP_GATE(80C43A44, &lit_4123); +COMPILER_STRIP_GATE(0x80C43A44, &lit_4123); #pragma pop /* 80C43A48-80C43A4C 000064 0004+00 0/2 0/0 0/0 .rodata @4124 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4124 = 12.0f; -COMPILER_STRIP_GATE(80C43A48, &lit_4124); +COMPILER_STRIP_GATE(0x80C43A48, &lit_4124); #pragma pop /* 80C43A4C-80C43A50 000068 0004+00 0/1 0/0 0/0 .rodata @4125 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4125 = 19.0f / 20.0f; -COMPILER_STRIP_GATE(80C43A4C, &lit_4125); +COMPILER_STRIP_GATE(0x80C43A4C, &lit_4125); #pragma pop /* 80C43A50-80C43A54 00006C 0004+00 0/2 0/0 0/0 .rodata @4126 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4126 = -5.0f; -COMPILER_STRIP_GATE(80C43A50, &lit_4126); +COMPILER_STRIP_GATE(0x80C43A50, &lit_4126); #pragma pop /* 80C43CA8-80C43CAC 000008 0001+03 1/1 0/0 0/0 .bss @1109 */ @@ -887,7 +897,7 @@ static asm void chain_move(obj_keyhole_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4165 = 8.0f; -COMPILER_STRIP_GATE(80C43A54, &lit_4165); +COMPILER_STRIP_GATE(0x80C43A54, &lit_4165); #pragma pop /* 80C42380-80C42518 001220 0198+00 1/1 0/0 0/0 .text open__FP17obj_keyhole_class */ @@ -905,63 +915,63 @@ static asm void open(obj_keyhole_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4211 = 1.5f; -COMPILER_STRIP_GATE(80C43A58, &lit_4211); +COMPILER_STRIP_GATE(0x80C43A58, &lit_4211); #pragma pop /* 80C43A5C-80C43A60 000078 0004+00 0/1 0/0 0/0 .rodata @4212 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4212 = 4.0f; -COMPILER_STRIP_GATE(80C43A5C, &lit_4212); +COMPILER_STRIP_GATE(0x80C43A5C, &lit_4212); #pragma pop /* 80C43A60-80C43A64 00007C 0004+00 0/3 0/0 0/0 .rodata @4213 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4213 = 40.0f; -COMPILER_STRIP_GATE(80C43A60, &lit_4213); +COMPILER_STRIP_GATE(0x80C43A60, &lit_4213); #pragma pop /* 80C43A64-80C43A68 000080 0004+00 0/1 0/0 0/0 .rodata @4214 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4214 = 70.0f; -COMPILER_STRIP_GATE(80C43A64, &lit_4214); +COMPILER_STRIP_GATE(0x80C43A64, &lit_4214); #pragma pop /* 80C43A68-80C43A6C 000084 0004+00 0/2 0/0 0/0 .rodata @4215 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4215 = 100.0f; -COMPILER_STRIP_GATE(80C43A68, &lit_4215); +COMPILER_STRIP_GATE(0x80C43A68, &lit_4215); #pragma pop /* 80C43A6C-80C43A70 000088 0004+00 0/1 0/0 0/0 .rodata @4216 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4216 = 5.0f; -COMPILER_STRIP_GATE(80C43A6C, &lit_4216); +COMPILER_STRIP_GATE(0x80C43A6C, &lit_4216); #pragma pop /* 80C43A70-80C43A74 00008C 0004+00 0/1 0/0 0/0 .rodata @4217 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4217 = 3.0f; -COMPILER_STRIP_GATE(80C43A70, &lit_4217); +COMPILER_STRIP_GATE(0x80C43A70, &lit_4217); #pragma pop /* 80C43A74-80C43A78 000090 0004+00 0/1 0/0 0/0 .rodata @4218 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4218 = 10000.0f; -COMPILER_STRIP_GATE(80C43A74, &lit_4218); +COMPILER_STRIP_GATE(0x80C43A74, &lit_4218); #pragma pop /* 80C43A78-80C43A7C 000094 0004+00 0/1 0/0 0/0 .rodata @4219 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4219 = 7.0f / 10.0f; -COMPILER_STRIP_GATE(80C43A78, &lit_4219); +COMPILER_STRIP_GATE(0x80C43A78, &lit_4219); #pragma pop /* 80C42518-80C427D0 0013B8 02B8+00 1/1 0/0 0/0 .text drop__FP17obj_keyhole_class */ @@ -979,35 +989,35 @@ static asm void drop(obj_keyhole_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4344 = 300.0f; -COMPILER_STRIP_GATE(80C43A7C, &lit_4344); +COMPILER_STRIP_GATE(0x80C43A7C, &lit_4344); #pragma pop /* 80C43A80-80C43A84 00009C 0004+00 0/1 0/0 0/0 .rodata @4345 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4345 = 500.0f; -COMPILER_STRIP_GATE(80C43A80, &lit_4345); +COMPILER_STRIP_GATE(0x80C43A80, &lit_4345); #pragma pop /* 80C43A84-80C43A88 0000A0 0004+00 0/1 0/0 0/0 .rodata @4346 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4346 = 17000.0f; -COMPILER_STRIP_GATE(80C43A84, &lit_4346); +COMPILER_STRIP_GATE(0x80C43A84, &lit_4346); #pragma pop /* 80C43A88-80C43A8C 0000A4 0004+00 0/1 0/0 0/0 .rodata @4347 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4347 = 90.0f; -COMPILER_STRIP_GATE(80C43A88, &lit_4347); +COMPILER_STRIP_GATE(0x80C43A88, &lit_4347); #pragma pop /* 80C43A8C-80C43A90 0000A8 0004+00 0/1 0/0 0/0 .rodata @4348 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4348 = 17.0f; -COMPILER_STRIP_GATE(80C43A8C, &lit_4348); +COMPILER_STRIP_GATE(0x80C43A8C, &lit_4348); #pragma pop /* 80C427D0-80C42D0C 001670 053C+00 2/1 0/0 0/0 .text daObj_Keyhole_Execute__FP17obj_keyhole_class @@ -1043,7 +1053,7 @@ static asm void daObj_Keyhole_Delete(obj_keyhole_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4456 = -1.0f; -COMPILER_STRIP_GATE(80C43A90, &lit_4456); +COMPILER_STRIP_GATE(0x80C43A90, &lit_4456); #pragma pop /* 80C42DC8-80C4307C 001C68 02B4+00 1/1 0/0 0/0 .text useHeapInit__FP10fopAc_ac_c */ @@ -1064,42 +1074,42 @@ SECTION_RODATA static u8 const estimateSizeTbl[20] = { 0xBF, 0x40, 0xA4, 0xE0, 0x93, 0x60, 0xD0, 0x60, 0xA4, 0xE0, 0xA4, 0x20, 0xA4, 0xE0, 0xA4, 0xE0, 0xA4, 0xE0, 0xA4, 0xE0, }; -COMPILER_STRIP_GATE(80C43A94, &estimateSizeTbl); +COMPILER_STRIP_GATE(0x80C43A94, &estimateSizeTbl); #pragma pop /* 80C43AA8-80C43AAC 0000C4 0004+00 0/1 0/0 0/0 .rodata @4627 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4627 = -400.0f; -COMPILER_STRIP_GATE(80C43AA8, &lit_4627); +COMPILER_STRIP_GATE(0x80C43AA8, &lit_4627); #pragma pop /* 80C43AAC-80C43AB0 0000C8 0004+00 0/1 0/0 0/0 .rodata @4628 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4628 = 400.0f; -COMPILER_STRIP_GATE(80C43AAC, &lit_4628); +COMPILER_STRIP_GATE(0x80C43AAC, &lit_4628); #pragma pop /* 80C43AB0-80C43AB4 0000CC 0004+00 0/1 0/0 0/0 .rodata @4629 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4629 = -15.0f; -COMPILER_STRIP_GATE(80C43AB0, &lit_4629); +COMPILER_STRIP_GATE(0x80C43AB0, &lit_4629); #pragma pop /* 80C43AB4-80C43AB8 0000D0 0004+00 0/1 0/0 0/0 .rodata @4630 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4630 = 295.0f; -COMPILER_STRIP_GATE(80C43AB4, &lit_4630); +COMPILER_STRIP_GATE(0x80C43AB4, &lit_4630); #pragma pop /* 80C43AB8-80C43ABC 0000D4 0004+00 0/1 0/0 0/0 .rodata @4631 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4631 = 60.0f; -COMPILER_STRIP_GATE(80C43AB8, &lit_4631); +COMPILER_STRIP_GATE(0x80C43AB8, &lit_4631); #pragma pop /* 80C4307C-80C434AC 001F1C 0430+00 1/0 0/0 0/0 .text daObj_Keyhole_Create__FP10fopAc_ac_c */ @@ -1234,7 +1244,7 @@ asm void __sinit_d_a_obj_keyhole_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80C43994 = (void*)__sinit_d_a_obj_keyhole_cpp; +REGISTER_CTORS(0x80C43994, __sinit_d_a_obj_keyhole_cpp); #pragma pop /* ############################################################################################## */ @@ -1409,13 +1419,4 @@ static u8 data_80C43DF0[4]; static u8 data_80C43DF4[4]; #pragma pop -/* 80C43ABC-80C43AEC 0000D8 0030+00 1/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80C43ABC = "Obj_keyh"; -SECTION_DEAD static char const* const stringBase_80C43AC5 = "Obj_bkey"; -SECTION_DEAD static char const* const stringBase_80C43ACE = "Obj_bkey2"; -SECTION_DEAD static char const* const stringBase_80C43AD8 = "Obj_bkey3"; -SECTION_DEAD static char const* const stringBase_80C43AE2 = "Obj_bkey5"; -#pragma pop +/* 80C43ABC-80C43ABC 0000D8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_kgate/d_a_obj_kgate.cpp b/rel/d/a/obj/d_a_obj_kgate/d_a_obj_kgate.cpp index 2c2e703c403..5c3e602c203 100644 --- a/rel/d/a/obj/d_a_obj_kgate/d_a_obj_kgate.cpp +++ b/rel/d/a/obj/d_a_obj_kgate/d_a_obj_kgate.cpp @@ -237,7 +237,7 @@ extern "C" static void daObjKGate_MoveBGDelete__FP12daObjKGate_c(); extern "C" static void daObjKGate_MoveBGExecute__FP12daObjKGate_c(); extern "C" static void daObjKGate_MoveBGDraw__FP12daObjKGate_c(); extern "C" void __dt__10cCcD_GSttsFv(); -extern "C" void func_8058AB0C(u8*); +extern "C" void func_8058AB0C(void* _this, u8*); extern "C" extern char const* const d_a_obj_kgate__stringBase0; // @@ -363,7 +363,7 @@ static asm void search_coach(void* param_0, void* param_1) { SECTION_RODATA static u8 const l_gateBmdIdx[12] = { 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x05, }; -COMPILER_STRIP_GATE(8058AB30, &l_gateBmdIdx); +COMPILER_STRIP_GATE(0x8058AB30, &l_gateBmdIdx); /* 8058AB3C-8058AB48 00000C 000C+00 0/1 0/0 0/0 .rodata l_gateKeyIdx */ #pragma push @@ -371,7 +371,7 @@ COMPILER_STRIP_GATE(8058AB30, &l_gateBmdIdx); SECTION_RODATA static u8 const l_gateKeyIdx[12] = { 0x00, 0x00, 0x00, 0x07, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x07, }; -COMPILER_STRIP_GATE(8058AB3C, &l_gateKeyIdx); +COMPILER_STRIP_GATE(0x8058AB3C, &l_gateKeyIdx); #pragma pop /* 8058AB48-8058AB54 000018 000C+00 0/1 0/0 0/0 .rodata l_gateHookIdx */ @@ -380,7 +380,7 @@ COMPILER_STRIP_GATE(8058AB3C, &l_gateKeyIdx); SECTION_RODATA static u8 const l_gateHookIdx[12] = { 0x00, 0x00, 0x00, 0x06, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x06, }; -COMPILER_STRIP_GATE(8058AB48, &l_gateHookIdx); +COMPILER_STRIP_GATE(0x8058AB48, &l_gateHookIdx); #pragma pop /* 8058AB54-8058AB60 000024 000C+00 0/2 0/0 0/0 .rodata l_gateDzbIdx */ @@ -389,7 +389,7 @@ COMPILER_STRIP_GATE(8058AB48, &l_gateHookIdx); SECTION_RODATA static u8 const l_gateDzbIdx[12] = { 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x0A, }; -COMPILER_STRIP_GATE(8058AB54, &l_gateDzbIdx); +COMPILER_STRIP_GATE(0x8058AB54, &l_gateDzbIdx); #pragma pop /* 8058AB60-8058AB6C 000030 000C+00 0/1 0/0 0/0 .rodata l_gate_heap */ @@ -398,7 +398,7 @@ COMPILER_STRIP_GATE(8058AB54, &l_gateDzbIdx); SECTION_RODATA static u8 const l_gate_heap[12] = { 0x00, 0x00, 0x19, 0x40, 0x00, 0x00, 0x19, 0x40, 0x00, 0x00, 0x19, 0x40, }; -COMPILER_STRIP_GATE(8058AB60, &l_gate_heap); +COMPILER_STRIP_GATE(0x8058AB60, &l_gate_heap); #pragma pop /* 8058AB6C-8058AB78 00003C 000C+00 0/1 0/0 0/0 .rodata l_key_heap */ @@ -407,7 +407,7 @@ COMPILER_STRIP_GATE(8058AB60, &l_gate_heap); SECTION_RODATA static u8 const l_key_heap[12] = { 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10, 0x00, }; -COMPILER_STRIP_GATE(8058AB6C, &l_key_heap); +COMPILER_STRIP_GATE(0x8058AB6C, &l_key_heap); #pragma pop /* 8058AB78-8058AB90 000048 0018+00 0/1 0/0 0/0 .rodata l_cull_box */ @@ -417,7 +417,7 @@ SECTION_RODATA static u8 const l_cull_box[24] = { 0xC3, 0x96, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC3, 0xAF, 0x00, 0x00, 0x43, 0x96, 0x00, 0x00, 0x43, 0xE1, 0x00, 0x00, 0x43, 0xAF, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8058AB78, &l_cull_box); +COMPILER_STRIP_GATE(0x8058AB78, &l_cull_box); #pragma pop /* 8058AB90-8058ABD4 000060 0044+00 0/1 0/0 0/0 .rodata l_cyl_src */ @@ -430,16 +430,16 @@ SECTION_RODATA static u8 const l_cyl_src[68] = { 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0x20, 0x00, 0x00, 0x43, 0xAF, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8058AB90, &l_cyl_src); +COMPILER_STRIP_GATE(0x8058AB90, &l_cyl_src); #pragma pop /* 8058ABD4-8058ABD8 0000A4 0004+00 3/5 0/0 0/0 .rodata @3881 */ SECTION_RODATA static f32 const lit_3881 = 1.0f; -COMPILER_STRIP_GATE(8058ABD4, &lit_3881); +COMPILER_STRIP_GATE(0x8058ABD4, &lit_3881); /* 8058ABD8-8058ABDC 0000A8 0004+00 3/4 0/0 0/0 .rodata @3882 */ SECTION_RODATA static f32 const lit_3882 = -1.0f; -COMPILER_STRIP_GATE(8058ABD8, &lit_3882); +COMPILER_STRIP_GATE(0x8058ABD8, &lit_3882); /* 8058ABDC-8058ABE0 0000AC 0004+00 2/8 0/0 0/0 .rodata @3883 */ SECTION_RODATA static u8 const lit_3883[4] = { @@ -448,20 +448,20 @@ SECTION_RODATA static u8 const lit_3883[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(8058ABDC, &lit_3883); +COMPILER_STRIP_GATE(0x8058ABDC, &lit_3883); /* 8058ABE0-8058ABE4 0000B0 0004+00 0/1 0/0 0/0 .rodata @3884 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_3884 = 0x42D33333; -COMPILER_STRIP_GATE(8058ABE0, &lit_3884); +COMPILER_STRIP_GATE(0x8058ABE0, &lit_3884); #pragma pop /* 8058ABE4-8058ABE8 0000B4 0004+00 0/2 0/0 0/0 .rodata @3885 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_3885 = 0x41CA6666; -COMPILER_STRIP_GATE(8058ABE4, &lit_3885); +COMPILER_STRIP_GATE(0x8058ABE4, &lit_3885); #pragma pop /* 805880C8-8058827C 0000C8 01B4+00 1/1 0/0 0/0 .text initBaseMtx__12daObjKGate_cFv */ @@ -479,112 +479,112 @@ asm void daObjKGate_c::initBaseMtx() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4036 = -210.0f; -COMPILER_STRIP_GATE(8058ABE8, &lit_4036); +COMPILER_STRIP_GATE(0x8058ABE8, &lit_4036); #pragma pop /* 8058ABEC-8058ABF0 0000BC 0004+00 0/1 0/0 0/0 .rodata @4037 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4037 = 210.0f; -COMPILER_STRIP_GATE(8058ABEC, &lit_4037); +COMPILER_STRIP_GATE(0x8058ABEC, &lit_4037); #pragma pop /* 8058ABF0-8058ABF4 0000C0 0004+00 0/1 0/0 0/0 .rodata @4038 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4038 = -350.0f; -COMPILER_STRIP_GATE(8058ABF0, &lit_4038); +COMPILER_STRIP_GATE(0x8058ABF0, &lit_4038); #pragma pop /* 8058ABF4-8058ABF8 0000C4 0004+00 0/3 0/0 0/0 .rodata @4039 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4039 = 350.0f; -COMPILER_STRIP_GATE(8058ABF4, &lit_4039); +COMPILER_STRIP_GATE(0x8058ABF4, &lit_4039); #pragma pop /* 8058ABF8-8058ABFC 0000C8 0004+00 0/1 0/0 0/0 .rodata @4040 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4040 = 0x4350B333; -COMPILER_STRIP_GATE(8058ABF8, &lit_4040); +COMPILER_STRIP_GATE(0x8058ABF8, &lit_4040); #pragma pop /* 8058ABFC-8058AC00 0000CC 0004+00 0/1 0/0 0/0 .rodata @4041 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4041 = 0x42D93333; -COMPILER_STRIP_GATE(8058ABFC, &lit_4041); +COMPILER_STRIP_GATE(0x8058ABFC, &lit_4041); #pragma pop /* 8058AC00-8058AC04 0000D0 0004+00 0/1 0/0 0/0 .rodata @4042 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4042 = 1.0f / 20.0f; -COMPILER_STRIP_GATE(8058AC00, &lit_4042); +COMPILER_STRIP_GATE(0x8058AC00, &lit_4042); #pragma pop /* 8058AC04-8058AC08 0000D4 0004+00 0/1 0/0 0/0 .rodata @4043 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4043 = 50.0f; -COMPILER_STRIP_GATE(8058AC04, &lit_4043); +COMPILER_STRIP_GATE(0x8058AC04, &lit_4043); #pragma pop /* 8058AC08-8058AC0C 0000D8 0004+00 0/1 0/0 0/0 .rodata @4044 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4044 = 5.0f; -COMPILER_STRIP_GATE(8058AC08, &lit_4044); +COMPILER_STRIP_GATE(0x8058AC08, &lit_4044); #pragma pop /* 8058AC0C-8058AC10 0000DC 0004+00 0/1 0/0 0/0 .rodata @4045 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4045 = 14.0f; -COMPILER_STRIP_GATE(8058AC0C, &lit_4045); +COMPILER_STRIP_GATE(0x8058AC0C, &lit_4045); #pragma pop /* 8058AC10-8058AC14 0000E0 0004+00 0/1 0/0 0/0 .rodata @4046 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4046 = -14.0f; -COMPILER_STRIP_GATE(8058AC10, &lit_4046); +COMPILER_STRIP_GATE(0x8058AC10, &lit_4046); #pragma pop /* 8058AC14-8058AC18 0000E4 0004+00 0/1 0/0 0/0 .rodata @4047 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4047 = -2.5f; -COMPILER_STRIP_GATE(8058AC14, &lit_4047); +COMPILER_STRIP_GATE(0x8058AC14, &lit_4047); #pragma pop /* 8058AC18-8058AC1C 0000E8 0004+00 0/1 0/0 0/0 .rodata @4048 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4048 = -20.0f; -COMPILER_STRIP_GATE(8058AC18, &lit_4048); +COMPILER_STRIP_GATE(0x8058AC18, &lit_4048); #pragma pop /* 8058AC1C-8058AC20 0000EC 0004+00 0/1 0/0 0/0 .rodata @4049 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4049 = 2.0f; -COMPILER_STRIP_GATE(8058AC1C, &lit_4049); +COMPILER_STRIP_GATE(0x8058AC1C, &lit_4049); #pragma pop /* 8058AC20-8058AC24 0000F0 0004+00 0/1 0/0 0/0 .rodata @4050 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4050 = 0.5f; -COMPILER_STRIP_GATE(8058AC20, &lit_4050); +COMPILER_STRIP_GATE(0x8058AC20, &lit_4050); #pragma pop /* 8058AC24-8058AC28 0000F4 0004+00 0/1 0/0 0/0 .rodata @4051 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4051 = 5.0f / 3.0f; -COMPILER_STRIP_GATE(8058AC24, &lit_4051); +COMPILER_STRIP_GATE(0x8058AC24, &lit_4051); #pragma pop /* 8058827C-805887A0 00027C 0524+00 2/2 0/0 0/0 .text setBaseMtx__12daObjKGate_cFv */ @@ -602,7 +602,17 @@ asm void daObjKGate_c::setBaseMtx() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4096 = 150.0f; -COMPILER_STRIP_GATE(8058AC28, &lit_4096); +COMPILER_STRIP_GATE(0x8058AC28, &lit_4096); +#pragma pop + +/* 8058ACB8-8058ACB8 000188 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8058ACB8 = "D_Kgate00"; +SECTION_DEAD static char const* const stringBase_8058ACC2 = "D_Kgate01"; +SECTION_DEAD static char const* const stringBase_8058ACCC = "M_RGate00"; +SECTION_DEAD static char const* const stringBase_8058ACD6 = "KOKI_GATE_OPEN00"; +SECTION_DEAD static char const* const stringBase_8058ACE7 = "RIDER_GATE_OPEN00"; #pragma pop /* 8058AD24-8058AD30 000000 000C+00 2/2 0/0 0/0 .data cNullVec__6Z2Calc */ @@ -672,63 +682,63 @@ asm void daObjKGate_c::create1st() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4319 = -100.0f; -COMPILER_STRIP_GATE(8058AC2C, &lit_4319); +COMPILER_STRIP_GATE(0x8058AC2C, &lit_4319); #pragma pop /* 8058AC30-8058AC34 000100 0004+00 0/2 0/0 0/0 .rodata @4320 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4320 = 400.0f; -COMPILER_STRIP_GATE(8058AC30, &lit_4320); +COMPILER_STRIP_GATE(0x8058AC30, &lit_4320); #pragma pop /* 8058AC34-8058AC38 000104 0004+00 0/1 0/0 0/0 .rodata @4321 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4321 = 300.0f; -COMPILER_STRIP_GATE(8058AC34, &lit_4321); +COMPILER_STRIP_GATE(0x8058AC34, &lit_4321); #pragma pop /* 8058AC38-8058AC3C 000108 0004+00 0/3 0/0 0/0 .rodata @4322 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4322 = 100.0f; -COMPILER_STRIP_GATE(8058AC38, &lit_4322); +COMPILER_STRIP_GATE(0x8058AC38, &lit_4322); #pragma pop /* 8058AC3C-8058AC40 00010C 0004+00 0/2 0/0 0/0 .rodata @4323 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4323 = 250.0f; -COMPILER_STRIP_GATE(8058AC3C, &lit_4323); +COMPILER_STRIP_GATE(0x8058AC3C, &lit_4323); #pragma pop /* 8058AC40-8058AC44 000110 0004+00 0/2 0/0 0/0 .rodata @4324 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4324 = -80.0f; -COMPILER_STRIP_GATE(8058AC40, &lit_4324); +COMPILER_STRIP_GATE(0x8058AC40, &lit_4324); #pragma pop /* 8058AC44-8058AC48 000114 0004+00 0/2 0/0 0/0 .rodata @4325 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4325 = 200.0f; -COMPILER_STRIP_GATE(8058AC44, &lit_4325); +COMPILER_STRIP_GATE(0x8058AC44, &lit_4325); #pragma pop /* 8058AC48-8058AC4C 000118 0004+00 0/2 0/0 0/0 .rodata @4326 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4326 = 80.0f; -COMPILER_STRIP_GATE(8058AC48, &lit_4326); +COMPILER_STRIP_GATE(0x8058AC48, &lit_4326); #pragma pop /* 8058AC4C-8058AC50 00011C 0004+00 0/2 0/0 0/0 .rodata @4327 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4327 = 90.0f; -COMPILER_STRIP_GATE(8058AC4C, &lit_4327); +COMPILER_STRIP_GATE(0x8058AC4C, &lit_4327); #pragma pop /* 80588D00-805890D4 000D00 03D4+00 2/2 0/0 0/0 .text checkAreaL__12daObjKGate_cFPC4cXyzPC4cXyz */ @@ -746,7 +756,7 @@ asm void daObjKGate_c::checkAreaL(cXyz const* param_0, cXyz const* param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4472 = -300.0f; -COMPILER_STRIP_GATE(8058AC50, &lit_4472); +COMPILER_STRIP_GATE(0x8058AC50, &lit_4472); #pragma pop /* 805890D4-805894A4 0010D4 03D0+00 2/2 0/0 0/0 .text checkAreaR__12daObjKGate_cFPC4cXyzPC4cXyz */ @@ -865,63 +875,63 @@ asm void daObjKGate_c::action() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4789 = 2000.0f; -COMPILER_STRIP_GATE(8058AC54, &lit_4789); +COMPILER_STRIP_GATE(0x8058AC54, &lit_4789); #pragma pop /* 8058AC58-8058AC5C 000128 0004+00 0/1 0/0 0/0 .rodata @4790 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4790 = 2500.0f; -COMPILER_STRIP_GATE(8058AC58, &lit_4790); +COMPILER_STRIP_GATE(0x8058AC58, &lit_4790); #pragma pop /* 8058AC5C-8058AC60 00012C 0004+00 0/1 0/0 0/0 .rodata @4791 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4791 = -7.0f / 10.0f; -COMPILER_STRIP_GATE(8058AC5C, &lit_4791); +COMPILER_STRIP_GATE(0x8058AC5C, &lit_4791); #pragma pop /* 8058AC60-8058AC64 000130 0004+00 0/1 0/0 0/0 .rodata @4792 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4792 = -39.0f; -COMPILER_STRIP_GATE(8058AC60, &lit_4792); +COMPILER_STRIP_GATE(0x8058AC60, &lit_4792); #pragma pop /* 8058AC64-8058AC68 000134 0004+00 0/1 0/0 0/0 .rodata @4793 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4793 = -25.0f; -COMPILER_STRIP_GATE(8058AC64, &lit_4793); +COMPILER_STRIP_GATE(0x8058AC64, &lit_4793); #pragma pop /* 8058AC68-8058AC6C 000138 0004+00 0/2 0/0 0/0 .rodata @4794 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4794 = 1200.0f; -COMPILER_STRIP_GATE(8058AC68, &lit_4794); +COMPILER_STRIP_GATE(0x8058AC68, &lit_4794); #pragma pop /* 8058AC6C-8058AC70 00013C 0004+00 0/2 0/0 0/0 .rodata @4795 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4795 = 600.0f; -COMPILER_STRIP_GATE(8058AC6C, &lit_4795); +COMPILER_STRIP_GATE(0x8058AC6C, &lit_4795); #pragma pop /* 8058AC70-8058AC74 000140 0004+00 0/2 0/0 0/0 .rodata @4796 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4796 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(8058AC70, &lit_4796); +COMPILER_STRIP_GATE(0x8058AC70, &lit_4796); #pragma pop /* 8058AC74-8058AC78 000144 0004+00 0/2 0/0 0/0 .rodata @4797 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4797 = 20.0f; -COMPILER_STRIP_GATE(8058AC74, &lit_4797); +COMPILER_STRIP_GATE(0x8058AC74, &lit_4797); #pragma pop /* 8058AC78-8058AC80 000148 0004+04 0/1 0/0 0/0 .rodata @4798 */ @@ -932,7 +942,7 @@ SECTION_RODATA static f32 const lit_4798[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(8058AC78, &lit_4798); +COMPILER_STRIP_GATE(0x8058AC78, &lit_4798); #pragma pop /* 8058AC80-8058AC88 000150 0008+00 0/1 0/0 0/0 .rodata @4800 */ @@ -941,7 +951,7 @@ COMPILER_STRIP_GATE(8058AC78, &lit_4798); SECTION_RODATA static u8 const lit_4800[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8058AC80, &lit_4800); +COMPILER_STRIP_GATE(0x8058AC80, &lit_4800); #pragma pop /* 805898A0-80589F40 0018A0 06A0+00 2/0 0/0 0/0 .text action_typeA__12daObjKGate_cFv */ @@ -963,7 +973,7 @@ SECTION_RODATA static u8 const l_tg_offset[48] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0x48, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x43, 0x16, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8058AC88, &l_tg_offset); +COMPILER_STRIP_GATE(0x8058AC88, &l_tg_offset); #pragma pop /* 80589F40-8058A1B0 001F40 0270+00 1/0 0/0 0/0 .text action_typeB__12daObjKGate_cFv */ @@ -1054,6 +1064,14 @@ asm void daObjKGate_c::event_proc_call() { } #pragma pop +/* ############################################################################################## */ +/* 8058ACB8-8058ACB8 000188 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8058ACF9 = "K_GATE"; +SECTION_DEAD static char const* const stringBase_8058AD00 = "Timer"; +#pragma pop + /* 8058A3A4-8058A508 0023A4 0164+00 1/1 0/0 0/0 .text demoProc__12daObjKGate_cFv */ #pragma push #pragma optimization_level 0 @@ -1065,6 +1083,15 @@ asm void daObjKGate_c::demoProc() { #pragma pop /* ############################################################################################## */ +/* 8058ACB8-8058ACB8 000188 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8058AD06 = "WAIT"; +SECTION_DEAD static char const* const stringBase_8058AD0B = "ADJUSTMENT"; +SECTION_DEAD static char const* const stringBase_8058AD16 = "UNLOCK"; +SECTION_DEAD static char const* const stringBase_8058AD1D = "OPEN"; +#pragma pop + /* 8058ADEC-8058ADFC -00001 0010+00 1/1 0/0 0/0 .data action_table$4986 */ SECTION_DATA static void* action_table[4] = { (void*)(((char*)&d_a_obj_kgate__stringBase0) + 0x4E), @@ -1284,25 +1311,10 @@ asm cCcD_GStts::~cCcD_GStts() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_8058AB0C(u8* param_0) { +extern "C" asm void func_8058AB0C(void* _this, u8* param_0) { nofralloc #include "asm/rel/d/a/obj/d_a_obj_kgate/d_a_obj_kgate/func_8058AB0C.s" } #pragma pop -/* 8058ACB8-8058AD22 000188 006A+00 4/1 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_8058ACB8 = "D_Kgate00"; -SECTION_DEAD static char const* const stringBase_8058ACC2 = "D_Kgate01"; -SECTION_DEAD static char const* const stringBase_8058ACCC = "M_RGate00"; -SECTION_DEAD static char const* const stringBase_8058ACD6 = "KOKI_GATE_OPEN00"; -SECTION_DEAD static char const* const stringBase_8058ACE7 = "RIDER_GATE_OPEN00"; -SECTION_DEAD static char const* const stringBase_8058ACF9 = "K_GATE"; -SECTION_DEAD static char const* const stringBase_8058AD00 = "Timer"; -SECTION_DEAD static char const* const stringBase_8058AD06 = "WAIT"; -SECTION_DEAD static char const* const stringBase_8058AD0B = "ADJUSTMENT"; -SECTION_DEAD static char const* const stringBase_8058AD16 = "UNLOCK"; -SECTION_DEAD static char const* const stringBase_8058AD1D = "OPEN"; -#pragma pop +/* 8058ACB8-8058ACB8 000188 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_ki/d_a_obj_ki.cpp b/rel/d/a/obj/d_a_obj_ki/d_a_obj_ki.cpp index f43aacb63b5..f4767e8ef24 100644 --- a/rel/d/a/obj/d_a_obj_ki/d_a_obj_ki.cpp +++ b/rel/d/a/obj/d_a_obj_ki/d_a_obj_ki.cpp @@ -277,17 +277,17 @@ asm cXyz::~cXyz() { /* ############################################################################################## */ /* 80C44B40-80C44B44 000000 0004+00 2/2 0/0 0/0 .rodata @3790 */ SECTION_RODATA static f32 const lit_3790 = 50.0f; -COMPILER_STRIP_GATE(80C44B40, &lit_3790); +COMPILER_STRIP_GATE(0x80C44B40, &lit_3790); /* 80C44B44-80C44B48 000004 0004+00 1/1 0/0 0/0 .rodata @3791 */ SECTION_RODATA static f32 const lit_3791 = 700.0f; -COMPILER_STRIP_GATE(80C44B44, &lit_3791); +COMPILER_STRIP_GATE(0x80C44B44, &lit_3791); /* 80C44B48-80C44B50 000008 0008+00 1/1 0/0 0/0 .rodata @3793 */ SECTION_RODATA static u8 const lit_3793[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C44B48, &lit_3793); +COMPILER_STRIP_GATE(0x80C44B48, &lit_3793); /* 80C440C8-80C443E0 0002C8 0318+00 2/1 0/0 0/0 .text daObj_Ki_Execute__FP12obj_ki_class */ @@ -317,6 +317,12 @@ static bool daObj_Ki_IsDelete(obj_ki_class* param_0) { } /* ############################################################################################## */ +/* 80C44B88-80C44B88 000048 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80C44B88 = "Obj_Ki"; +#pragma pop + /* 80C44C08-80C44C0C 000008 0004+00 2/2 0/0 0/0 .bss None */ static u8 data_80C44C08[4]; @@ -334,7 +340,7 @@ static asm void daObj_Ki_Delete(obj_ki_class* param_0) { /* ############################################################################################## */ /* 80C44B50-80C44B54 000010 0004+00 1/2 0/0 0/0 .rodata @3873 */ SECTION_RODATA static f32 const lit_3873 = 1.0f; -COMPILER_STRIP_GATE(80C44B50, &lit_3873); +COMPILER_STRIP_GATE(0x80C44B50, &lit_3873); /* 80C4448C-80C4466C 00068C 01E0+00 1/1 0/0 0/0 .text useHeapInit__FP10fopAc_ac_c */ #pragma push @@ -351,14 +357,14 @@ static asm void useHeapInit(fopAc_ac_c* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3976 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(80C44B54, &lit_3976); +COMPILER_STRIP_GATE(0x80C44B54, &lit_3976); #pragma pop /* 80C44B58-80C44B5C 000018 0004+00 0/1 0/0 0/0 .rodata @3977 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3977 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(80C44B58, &lit_3977); +COMPILER_STRIP_GATE(0x80C44B58, &lit_3977); #pragma pop /* 80C44B5C-80C44B60 00001C 0004+00 0/1 0/0 0/0 .rodata @3978 */ @@ -370,63 +376,63 @@ SECTION_RODATA static u8 const lit_3978[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C44B5C, &lit_3978); +COMPILER_STRIP_GATE(0x80C44B5C, &lit_3978); #pragma pop /* 80C44B60-80C44B64 000020 0004+00 0/1 0/0 0/0 .rodata @3979 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3979 = 150.0f; -COMPILER_STRIP_GATE(80C44B60, &lit_3979); +COMPILER_STRIP_GATE(0x80C44B60, &lit_3979); #pragma pop /* 80C44B64-80C44B68 000024 0004+00 0/1 0/0 0/0 .rodata @3980 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3980 = 40.0f; -COMPILER_STRIP_GATE(80C44B64, &lit_3980); +COMPILER_STRIP_GATE(0x80C44B64, &lit_3980); #pragma pop /* 80C44B68-80C44B6C 000028 0004+00 0/1 0/0 0/0 .rodata @3981 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3981 = 240.0f; -COMPILER_STRIP_GATE(80C44B68, &lit_3981); +COMPILER_STRIP_GATE(0x80C44B68, &lit_3981); #pragma pop /* 80C44B6C-80C44B70 00002C 0004+00 0/1 0/0 0/0 .rodata @3982 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3982 = 30.0f; -COMPILER_STRIP_GATE(80C44B6C, &lit_3982); +COMPILER_STRIP_GATE(0x80C44B6C, &lit_3982); #pragma pop /* 80C44B70-80C44B74 000030 0004+00 0/1 0/0 0/0 .rodata @3983 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3983 = 330.0f; -COMPILER_STRIP_GATE(80C44B70, &lit_3983); +COMPILER_STRIP_GATE(0x80C44B70, &lit_3983); #pragma pop /* 80C44B74-80C44B78 000034 0004+00 0/1 0/0 0/0 .rodata @3984 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3984 = 35.0f; -COMPILER_STRIP_GATE(80C44B74, &lit_3984); +COMPILER_STRIP_GATE(0x80C44B74, &lit_3984); #pragma pop /* 80C44B78-80C44B7C 000038 0004+00 0/1 0/0 0/0 .rodata @3985 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3985 = 270.0f; -COMPILER_STRIP_GATE(80C44B78, &lit_3985); +COMPILER_STRIP_GATE(0x80C44B78, &lit_3985); #pragma pop /* 80C44B7C-80C44B80 00003C 0004+00 0/1 0/0 0/0 .rodata @3986 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3986 = 360.0f; -COMPILER_STRIP_GATE(80C44B7C, &lit_3986); +COMPILER_STRIP_GATE(0x80C44B7C, &lit_3986); #pragma pop /* 80C44B80-80C44B88 000040 0008+00 0/1 0/0 0/0 .rodata @3988 */ @@ -435,7 +441,7 @@ COMPILER_STRIP_GATE(80C44B7C, &lit_3986); SECTION_RODATA static u8 const lit_3988[8] = { 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C44B80, &lit_3988); +COMPILER_STRIP_GATE(0x80C44B80, &lit_3988); #pragma pop /* 80C44C0C-80C44C18 00000C 000C+00 1/1 0/0 0/0 .bss @3643 */ @@ -506,12 +512,7 @@ asm void __sinit_d_a_obj_ki_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80C44AF0 = (void*)__sinit_d_a_obj_ki_cpp; +REGISTER_CTORS(0x80C44AF0, __sinit_d_a_obj_ki_cpp); #pragma pop -/* 80C44B88-80C44B8F 000048 0007+00 3/3 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80C44B88 = "Obj_Ki"; -#pragma pop +/* 80C44B88-80C44B88 000048 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_kiPot/d_a_obj_kiPot.cpp b/rel/d/a/obj/d_a_obj_kiPot/d_a_obj_kiPot.cpp index c545b696736..0ca1c40556f 100644 --- a/rel/d/a/obj/d_a_obj_kiPot/d_a_obj_kiPot.cpp +++ b/rel/d/a/obj/d_a_obj_kiPot/d_a_obj_kiPot.cpp @@ -185,7 +185,7 @@ asm void daKiPot_c::create() { /* ############################################################################################## */ /* 80C45194-80C45198 000000 0004+00 2/2 0/0 0/0 .rodata @3683 */ SECTION_RODATA static f32 const lit_3683 = 150.0f; -COMPILER_STRIP_GATE(80C45194, &lit_3683); +COMPILER_STRIP_GATE(0x80C45194, &lit_3683); /* 80C44E7C-80C44EF8 00025C 007C+00 1/1 0/0 0/0 .text Execute__9daKiPot_cFv */ #pragma push @@ -232,21 +232,21 @@ asm void daKiPot_c::init_modeWait() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3711 = 100.0f; -COMPILER_STRIP_GATE(80C45198, &lit_3711); +COMPILER_STRIP_GATE(0x80C45198, &lit_3711); #pragma pop /* 80C4519C-80C451A0 000008 0004+00 0/1 0/0 0/0 .rodata @3712 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3712 = 50.0f; -COMPILER_STRIP_GATE(80C4519C, &lit_3712); +COMPILER_STRIP_GATE(0x80C4519C, &lit_3712); #pragma pop /* 80C451A0-80C451A4 00000C 0004+00 0/1 0/0 0/0 .rodata @3713 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3713 = -50.0f; -COMPILER_STRIP_GATE(80C451A0, &lit_3713); +COMPILER_STRIP_GATE(0x80C451A0, &lit_3713); #pragma pop /* 80C44F80-80C45008 000360 0088+00 1/0 0/0 0/0 .text modeWait__9daKiPot_cFv */ @@ -341,5 +341,5 @@ asm void __sinit_d_a_obj_kiPot_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80C45144 = (void*)__sinit_d_a_obj_kiPot_cpp; +REGISTER_CTORS(0x80C45144, __sinit_d_a_obj_kiPot_cpp); #pragma pop diff --git a/rel/d/a/obj/d_a_obj_kita/d_a_obj_kita.cpp b/rel/d/a/obj/d_a_obj_kita/d_a_obj_kita.cpp index 94485bf41ed..1746d44d9e7 100644 --- a/rel/d/a/obj/d_a_obj_kita/d_a_obj_kita.cpp +++ b/rel/d/a/obj/d_a_obj_kita/d_a_obj_kita.cpp @@ -185,27 +185,27 @@ extern "C" void __register_global_object(); /* ############################################################################################## */ /* 80C45F1C-80C45F20 000000 0004+00 4/4 0/0 0/0 .rodata @3769 */ SECTION_RODATA static f32 const lit_3769 = 6.0f / 5.0f; -COMPILER_STRIP_GATE(80C45F1C, &lit_3769); +COMPILER_STRIP_GATE(0x80C45F1C, &lit_3769); /* 80C45F20-80C45F24 000004 0004+00 0/1 0/0 0/0 .rodata @3770 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3770 = 9.0f / 10.0f; -COMPILER_STRIP_GATE(80C45F20, &lit_3770); +COMPILER_STRIP_GATE(0x80C45F20, &lit_3770); #pragma pop /* 80C45F24-80C45F28 000008 0004+00 0/1 0/0 0/0 .rodata @3771 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3771 = 200.0f; -COMPILER_STRIP_GATE(80C45F24, &lit_3771); +COMPILER_STRIP_GATE(0x80C45F24, &lit_3771); #pragma pop /* 80C45F28-80C45F2C 00000C 0004+00 0/1 0/0 0/0 .rodata @3772 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3772 = 3.0f / 5.0f; -COMPILER_STRIP_GATE(80C45F28, &lit_3772); +COMPILER_STRIP_GATE(0x80C45F28, &lit_3772); #pragma pop /* 80C45F8C-80C45FAC -00001 0020+00 1/0 0/0 0/0 .data l_daObj_Kita_Method */ @@ -274,42 +274,42 @@ static asm void ride_call_back(dBgW* param_0, fopAc_ac_c* param_1, fopAc_ac_c* p #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3897 = 5.0f; -COMPILER_STRIP_GATE(80C45F2C, &lit_3897); +COMPILER_STRIP_GATE(0x80C45F2C, &lit_3897); #pragma pop /* 80C45F30-80C45F34 000014 0004+00 0/1 0/0 0/0 .rodata @3898 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3898 = 500.0f; -COMPILER_STRIP_GATE(80C45F30, &lit_3898); +COMPILER_STRIP_GATE(0x80C45F30, &lit_3898); #pragma pop /* 80C45F34-80C45F38 000018 0004+00 0/3 0/0 0/0 .rodata @3899 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3899 = 1.0f; -COMPILER_STRIP_GATE(80C45F34, &lit_3899); +COMPILER_STRIP_GATE(0x80C45F34, &lit_3899); #pragma pop /* 80C45F38-80C45F3C 00001C 0004+00 0/1 0/0 0/0 .rodata @3900 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3900 = 10.0f; -COMPILER_STRIP_GATE(80C45F38, &lit_3900); +COMPILER_STRIP_GATE(0x80C45F38, &lit_3900); #pragma pop /* 80C45F3C-80C45F40 000020 0004+00 0/1 0/0 0/0 .rodata @3901 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3901 = 3.5f; -COMPILER_STRIP_GATE(80C45F3C, &lit_3901); +COMPILER_STRIP_GATE(0x80C45F3C, &lit_3901); #pragma pop /* 80C45F40-80C45F44 000024 0004+00 0/1 0/0 0/0 .rodata @3902 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3902 = -1.0f; -COMPILER_STRIP_GATE(80C45F40, &lit_3902); +COMPILER_STRIP_GATE(0x80C45F40, &lit_3902); #pragma pop /* 80C45F44-80C45F48 000028 0004+00 0/2 0/0 0/0 .rodata @3903 */ @@ -321,56 +321,56 @@ SECTION_RODATA static u8 const lit_3903[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C45F44, &lit_3903); +COMPILER_STRIP_GATE(0x80C45F44, &lit_3903); #pragma pop /* 80C45F48-80C45F4C 00002C 0004+00 0/1 0/0 0/0 .rodata @3904 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3904 = 9000.0f; -COMPILER_STRIP_GATE(80C45F48, &lit_3904); +COMPILER_STRIP_GATE(0x80C45F48, &lit_3904); #pragma pop /* 80C45F4C-80C45F50 000030 0004+00 0/1 0/0 0/0 .rodata @3905 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3905 = 3000.0f; -COMPILER_STRIP_GATE(80C45F4C, &lit_3905); +COMPILER_STRIP_GATE(0x80C45F4C, &lit_3905); #pragma pop /* 80C45F50-80C45F54 000034 0004+00 0/1 0/0 0/0 .rodata @3906 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3906 = 7000.0f; -COMPILER_STRIP_GATE(80C45F50, &lit_3906); +COMPILER_STRIP_GATE(0x80C45F50, &lit_3906); #pragma pop /* 80C45F54-80C45F58 000038 0004+00 0/1 0/0 0/0 .rodata @3907 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3907 = 1000.0f; -COMPILER_STRIP_GATE(80C45F54, &lit_3907); +COMPILER_STRIP_GATE(0x80C45F54, &lit_3907); #pragma pop /* 80C45F58-80C45F5C 00003C 0004+00 0/1 0/0 0/0 .rodata @3908 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3908 = 3.0f / 40.0f; -COMPILER_STRIP_GATE(80C45F58, &lit_3908); +COMPILER_STRIP_GATE(0x80C45F58, &lit_3908); #pragma pop /* 80C45F5C-80C45F60 000040 0004+00 0/1 0/0 0/0 .rodata @3909 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3909 = -40.0f; -COMPILER_STRIP_GATE(80C45F5C, &lit_3909); +COMPILER_STRIP_GATE(0x80C45F5C, &lit_3909); #pragma pop /* 80C45F60-80C45F64 000044 0004+00 0/1 0/0 0/0 .rodata @3910 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3910 = 3.0f; -COMPILER_STRIP_GATE(80C45F60, &lit_3910); +COMPILER_STRIP_GATE(0x80C45F60, &lit_3910); #pragma pop /* 80C45F64-80C45F6C 000048 0008+00 0/1 0/0 0/0 .rodata @3913 */ @@ -379,7 +379,7 @@ COMPILER_STRIP_GATE(80C45F60, &lit_3910); SECTION_RODATA static u8 const lit_3913[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C45F64, &lit_3913); +COMPILER_STRIP_GATE(0x80C45F64, &lit_3913); #pragma pop /* 80C45FF0-80C45FF4 000008 0004+00 2/2 0/0 0/0 .bss None */ @@ -406,14 +406,14 @@ static asm void ita_control(obj_kita_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3955 = -200.0f; -COMPILER_STRIP_GATE(80C45F6C, &lit_3955); +COMPILER_STRIP_GATE(0x80C45F6C, &lit_3955); #pragma pop /* 80C45F70-80C45F74 000054 0004+00 0/1 0/0 0/0 .rodata @3956 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3956 = 23.0f / 20.0f; -COMPILER_STRIP_GATE(80C45F70, &lit_3956); +COMPILER_STRIP_GATE(0x80C45F70, &lit_3956); #pragma pop /* 80C458D8-80C45A10 000678 0138+00 1/1 0/0 0/0 .text action__FP14obj_kita_class */ @@ -441,6 +441,13 @@ static bool daObj_Kita_IsDelete(obj_kita_class* param_0) { return true; } +/* ############################################################################################## */ +/* 80C45F80-80C45F80 000064 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80C45F80 = "Obj_kita"; +#pragma pop + /* 80C45A74-80C45B10 000814 009C+00 1/0 0/0 0/0 .text daObj_Kita_Delete__FP14obj_kita_class */ #pragma push #pragma optimization_level 0 @@ -466,21 +473,21 @@ static asm void useHeapInit(fopAc_ac_c* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4083 = 0.5f; -COMPILER_STRIP_GATE(80C45F74, &lit_4083); +COMPILER_STRIP_GATE(0x80C45F74, &lit_4083); #pragma pop /* 80C45F78-80C45F7C 00005C 0004+00 0/1 0/0 0/0 .rodata @4084 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4084 = 1.0f / 20.0f; -COMPILER_STRIP_GATE(80C45F78, &lit_4084); +COMPILER_STRIP_GATE(0x80C45F78, &lit_4084); #pragma pop /* 80C45F7C-80C45F80 000060 0004+00 0/1 0/0 0/0 .rodata @4085 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4085 = 65535.0f; -COMPILER_STRIP_GATE(80C45F7C, &lit_4085); +COMPILER_STRIP_GATE(0x80C45F7C, &lit_4085); #pragma pop /* 80C45C4C-80C45E44 0009EC 01F8+00 1/0 0/0 0/0 .text daObj_Kita_Create__FP10fopAc_ac_c @@ -531,12 +538,7 @@ asm void __sinit_d_a_obj_kita_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80C45ECC = (void*)__sinit_d_a_obj_kita_cpp; +REGISTER_CTORS(0x80C45ECC, __sinit_d_a_obj_kita_cpp); #pragma pop -/* 80C45F80-80C45F89 000064 0009+00 3/3 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80C45F80 = "Obj_kita"; -#pragma pop +/* 80C45F80-80C45F80 000064 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_kjgjs/d_a_obj_kjgjs.cpp b/rel/d/a/obj/d_a_obj_kjgjs/d_a_obj_kjgjs.cpp index 5f69e8db68d..42dc358db94 100644 --- a/rel/d/a/obj/d_a_obj_kjgjs/d_a_obj_kjgjs.cpp +++ b/rel/d/a/obj/d_a_obj_kjgjs/d_a_obj_kjgjs.cpp @@ -131,7 +131,13 @@ extern "C" extern u8 j3dSys[284]; SECTION_RODATA static u8 const l_dzbidx[8] = { 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x09, }; -COMPILER_STRIP_GATE(80C46544, &l_dzbidx); +COMPILER_STRIP_GATE(0x80C46544, &l_dzbidx); + +/* 80C46584-80C46584 000040 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80C46584 = "K_jgjs"; +#pragma pop /* 80C4658C-80C46590 -00001 0004+00 3/3 0/0 0/0 .data l_arcName */ SECTION_DATA static void* l_arcName = (void*)&d_a_obj_kjgjs__stringBase0; @@ -161,7 +167,7 @@ asm void daObjKJgjs_c::setMtx() { SECTION_RODATA static u8 const l_bmdidx[8] = { 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x05, }; -COMPILER_STRIP_GATE(80C4654C, &l_bmdidx); +COMPILER_STRIP_GATE(0x80C4654C, &l_bmdidx); /* 80C461E4-80C46264 0001C4 0080+00 1/0 0/0 0/0 .text CreateHeap__12daObjKJgjs_cFv */ #pragma push @@ -180,7 +186,7 @@ SECTION_RODATA static u8 const l_cull_box[48] = { 0x45, 0x2F, 0x00, 0x00, 0x44, 0x9D, 0x80, 0x00, 0xC2, 0x98, 0xBD, 0x71, 0xC1, 0x2D, 0x47, 0xAE, 0xC2, 0x9D, 0x05, 0x1F, 0x42, 0x97, 0x0A, 0x3D, 0x41, 0x2F, 0x33, 0x33, 0x42, 0x9C, 0x1E, 0xB8, }; -COMPILER_STRIP_GATE(80C46554, &l_cull_box); +COMPILER_STRIP_GATE(0x80C46554, &l_cull_box); /* 80C46264-80C46310 000244 00AC+00 1/0 0/0 0/0 .text Create__12daObjKJgjs_cFv */ #pragma push @@ -312,9 +318,4 @@ asm daObjKJgjs_c::~daObjKJgjs_c() { } #pragma pop -/* 80C46584-80C4658B 000040 0007+00 1/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80C46584 = "K_jgjs"; -#pragma pop +/* 80C46584-80C46584 000040 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_kkanban/d_a_obj_kkanban.cpp b/rel/d/a/obj/d_a_obj_kkanban/d_a_obj_kkanban.cpp index d756a62dded..1d12ff7b1aa 100644 --- a/rel/d/a/obj/d_a_obj_kkanban/d_a_obj_kkanban.cpp +++ b/rel/d/a/obj/d_a_obj_kkanban/d_a_obj_kkanban.cpp @@ -241,41 +241,48 @@ asm void daObjKKanban_c::setBaseMtx() { /* ############################################################################################## */ /* 80C46F54-80C46F58 000000 0004+00 3/3 0/0 0/0 .rodata @3715 */ SECTION_RODATA static f32 const lit_3715 = -950.0f; -COMPILER_STRIP_GATE(80C46F54, &lit_3715); +COMPILER_STRIP_GATE(0x80C46F54, &lit_3715); /* 80C46F58-80C46F5C 000004 0004+00 0/1 0/0 0/0 .rodata @3716 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3716 = -2150.0f; -COMPILER_STRIP_GATE(80C46F58, &lit_3716); +COMPILER_STRIP_GATE(0x80C46F58, &lit_3716); #pragma pop /* 80C46F5C-80C46F60 000008 0004+00 0/1 0/0 0/0 .rodata @3717 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3717 = -2000.0f; -COMPILER_STRIP_GATE(80C46F5C, &lit_3717); +COMPILER_STRIP_GATE(0x80C46F5C, &lit_3717); #pragma pop /* 80C46F60-80C46F64 00000C 0004+00 0/2 0/0 0/0 .rodata @3718 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3718 = 100.0f; -COMPILER_STRIP_GATE(80C46F60, &lit_3718); +COMPILER_STRIP_GATE(0x80C46F60, &lit_3718); #pragma pop /* 80C46F64-80C46F68 000010 0004+00 0/2 0/0 0/0 .rodata @3719 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3719 = 50.0f; -COMPILER_STRIP_GATE(80C46F64, &lit_3719); +COMPILER_STRIP_GATE(0x80C46F64, &lit_3719); #pragma pop /* 80C46F68-80C46F6C 000014 0004+00 0/1 0/0 0/0 .rodata @3720 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3720 = 800.0f; -COMPILER_STRIP_GATE(80C46F68, &lit_3720); +COMPILER_STRIP_GATE(0x80C46F68, &lit_3720); +#pragma pop + +/* 80C46F88-80C46F88 000034 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80C46F88 = "H_KKanban"; +SECTION_DEAD static char const* const stringBase_80C46F92 = "move"; #pragma pop /* 80C46F98-80C46F9C -00001 0004+00 3/3 0/0 0/0 .data l_arcName */ @@ -311,28 +318,28 @@ SECTION_RODATA static u8 const lit_3747[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C46F6C, &lit_3747); +COMPILER_STRIP_GATE(0x80C46F6C, &lit_3747); #pragma pop /* 80C46F70-80C46F74 00001C 0004+00 0/1 0/0 0/0 .rodata @3748 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3748 = -500.0f; -COMPILER_STRIP_GATE(80C46F70, &lit_3748); +COMPILER_STRIP_GATE(0x80C46F70, &lit_3748); #pragma pop /* 80C46F74-80C46F78 000020 0004+00 0/1 0/0 0/0 .rodata @3749 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3749 = -1200.0f; -COMPILER_STRIP_GATE(80C46F74, &lit_3749); +COMPILER_STRIP_GATE(0x80C46F74, &lit_3749); #pragma pop /* 80C46F78-80C46F7C 000024 0004+00 0/1 0/0 0/0 .rodata @3750 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3750 = 760.0f; -COMPILER_STRIP_GATE(80C46F78, &lit_3750); +COMPILER_STRIP_GATE(0x80C46F78, &lit_3750); #pragma pop /* 80C46928-80C469F4 000308 00CC+00 1/1 0/0 0/0 .text setTG__14daObjKKanban_cFv */ @@ -370,21 +377,21 @@ asm void daObjKKanban_c::create1st() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3784 = 1.0f / 20.0f; -COMPILER_STRIP_GATE(80C46F7C, &lit_3784); +COMPILER_STRIP_GATE(0x80C46F7C, &lit_3784); #pragma pop /* 80C46F80-80C46F84 00002C 0004+00 0/1 0/0 0/0 .rodata @3785 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3785 = 10.0f; -COMPILER_STRIP_GATE(80C46F80, &lit_3785); +COMPILER_STRIP_GATE(0x80C46F80, &lit_3785); #pragma pop /* 80C46F84-80C46F88 000030 0004+00 0/1 0/0 0/0 .rodata @3786 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3786 = 2000.0f; -COMPILER_STRIP_GATE(80C46F84, &lit_3786); +COMPILER_STRIP_GATE(0x80C46F84, &lit_3786); #pragma pop /* 80C46AE4-80C46C1C 0004C4 0138+00 1/0 0/0 0/0 .text Execute__14daObjKKanban_cFPPA3_A4_f @@ -550,10 +557,4 @@ static asm void daObjKKanban_MoveBGDraw(daObjKKanban_c* param_0) { } #pragma pop -/* 80C46F88-80C46F97 000034 000F+00 2/1 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80C46F88 = "H_KKanban"; -SECTION_DEAD static char const* const stringBase_80C46F92 = "move"; -#pragma pop +/* 80C46F88-80C46F88 000034 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_klift00/d_a_obj_klift00.cpp b/rel/d/a/obj/d_a_obj_klift00/d_a_obj_klift00.cpp index 41ec0bc43bb..0069b89154c 100644 --- a/rel/d/a/obj/d_a_obj_klift00/d_a_obj_klift00.cpp +++ b/rel/d/a/obj/d_a_obj_klift00/d_a_obj_klift00.cpp @@ -292,6 +292,12 @@ static asm void rideCallBack(dBgW* param_0, fopAc_ac_c* param_1, fopAc_ac_c* par #pragma pop /* ############################################################################################## */ +/* 8058C3E8-8058C3E8 000068 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8058C3E8 = "K_lift00"; +#pragma pop + /* 8058C3F4-8058C3F8 -00001 0004+00 3/3 0/0 0/0 .data l_arcName */ SECTION_DATA static void* l_arcName = (void*)&d_a_obj_klift00__stringBase0; @@ -387,7 +393,7 @@ asm void daObjKLift00_c::create1st() { SECTION_RODATA static u8 const l_bmdidx[12] = { 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x04, }; -COMPILER_STRIP_GATE(8058C380, &l_bmdidx); +COMPILER_STRIP_GATE(0x8058C380, &l_bmdidx); /* 8058C38C-8058C398 00000C 000C+00 0/1 0/0 0/0 .rodata @3711 */ #pragma push @@ -395,21 +401,21 @@ COMPILER_STRIP_GATE(8058C380, &l_bmdidx); SECTION_RODATA static u8 const lit_3711[12] = { 0x00, 0x00, 0x00, 0x00, 0xBF, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8058C38C, &lit_3711); +COMPILER_STRIP_GATE(0x8058C38C, &lit_3711); #pragma pop /* 8058C398-8058C39C 000018 0004+00 0/2 0/0 0/0 .rodata @3799 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3799 = -1.0f; -COMPILER_STRIP_GATE(8058C398, &lit_3799); +COMPILER_STRIP_GATE(0x8058C398, &lit_3799); #pragma pop /* 8058C39C-8058C3A0 00001C 0004+00 0/3 0/0 0/0 .rodata @3800 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3800 = 1.0f; -COMPILER_STRIP_GATE(8058C39C, &lit_3800); +COMPILER_STRIP_GATE(0x8058C39C, &lit_3800); #pragma pop /* 8058B0D0-8058B4B0 000210 03E0+00 2/2 0/0 0/0 .text setMtx__14daObjKLift00_cFv */ @@ -427,21 +433,21 @@ asm void daObjKLift00_c::setMtx() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3822 = 1.0f / 100.0f; -COMPILER_STRIP_GATE(8058C3A0, &lit_3822); +COMPILER_STRIP_GATE(0x8058C3A0, &lit_3822); #pragma pop /* 8058C3A4-8058C3A8 000024 0004+00 0/1 0/0 0/0 .rodata @3823 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3823 = 3.0f / 100.0f; -COMPILER_STRIP_GATE(8058C3A4, &lit_3823); +COMPILER_STRIP_GATE(0x8058C3A4, &lit_3823); #pragma pop /* 8058C3A8-8058C3AC 000028 0004+00 0/1 0/0 0/0 .rodata @3824 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_3824 = 0x3B23D70A; -COMPILER_STRIP_GATE(8058C3A8, &lit_3824); +COMPILER_STRIP_GATE(0x8058C3A8, &lit_3824); #pragma pop /* 8058B4B0-8058B5EC 0005F0 013C+00 1/1 0/0 0/0 .text rideActor__14daObjKLift00_cFP10fopAc_ac_c */ @@ -469,35 +475,35 @@ asm void daObjKLift00_c::CreateHeap() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3928 = 35.0f; -COMPILER_STRIP_GATE(8058C3AC, &lit_3928); +COMPILER_STRIP_GATE(0x8058C3AC, &lit_3928); #pragma pop /* 8058C3B0-8058C3B4 000030 0004+00 0/1 0/0 0/0 .rodata @3929 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3929 = -350.0f; -COMPILER_STRIP_GATE(8058C3B0, &lit_3929); +COMPILER_STRIP_GATE(0x8058C3B0, &lit_3929); #pragma pop /* 8058C3B4-8058C3B8 000034 0004+00 0/1 0/0 0/0 .rodata @3930 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3930 = 40.0f; -COMPILER_STRIP_GATE(8058C3B4, &lit_3930); +COMPILER_STRIP_GATE(0x8058C3B4, &lit_3930); #pragma pop /* 8058C3B8-8058C3BC 000038 0004+00 0/1 0/0 0/0 .rodata @3931 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3931 = 100.0f; -COMPILER_STRIP_GATE(8058C3B8, &lit_3931); +COMPILER_STRIP_GATE(0x8058C3B8, &lit_3931); #pragma pop /* 8058C3BC-8058C3C0 00003C 0004+00 0/1 0/0 0/0 .rodata @3932 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3932 = 350.0f; -COMPILER_STRIP_GATE(8058C3BC, &lit_3932); +COMPILER_STRIP_GATE(0x8058C3BC, &lit_3932); #pragma pop /* 8058C3C0-8058C3C8 000040 0004+04 0/1 0/0 0/0 .rodata @3933 */ @@ -508,7 +514,7 @@ SECTION_RODATA static f32 const lit_3933[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(8058C3C0, &lit_3933); +COMPILER_STRIP_GATE(0x8058C3C0, &lit_3933); #pragma pop /* 8058C3C8-8058C3D0 000048 0008+00 0/1 0/0 0/0 .rodata @3935 */ @@ -517,7 +523,7 @@ COMPILER_STRIP_GATE(8058C3C0, &lit_3933); SECTION_RODATA static u8 const lit_3935[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8058C3C8, &lit_3935); +COMPILER_STRIP_GATE(0x8058C3C8, &lit_3935); #pragma pop /* 8058B77C-8058B97C 0008BC 0200+00 1/0 0/0 0/0 .text Create__14daObjKLift00_cFv */ @@ -535,35 +541,35 @@ asm void daObjKLift00_c::Create() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4122 = 1.0f / 20.0f; -COMPILER_STRIP_GATE(8058C3D0, &lit_4122); +COMPILER_STRIP_GATE(0x8058C3D0, &lit_4122); #pragma pop /* 8058C3D4-8058C3D8 000054 0004+00 0/1 0/0 0/0 .rodata @4123 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4123 = 1.25f; -COMPILER_STRIP_GATE(8058C3D4, &lit_4123); +COMPILER_STRIP_GATE(0x8058C3D4, &lit_4123); #pragma pop /* 8058C3D8-8058C3DC 000058 0004+00 0/1 0/0 0/0 .rodata @4124 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4124 = 15.0f; -COMPILER_STRIP_GATE(8058C3D8, &lit_4124); +COMPILER_STRIP_GATE(0x8058C3D8, &lit_4124); #pragma pop /* 8058C3DC-8058C3E0 00005C 0004+00 0/1 0/0 0/0 .rodata @4125 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4125 = -4.0f; -COMPILER_STRIP_GATE(8058C3DC, &lit_4125); +COMPILER_STRIP_GATE(0x8058C3DC, &lit_4125); #pragma pop /* 8058C3E0-8058C3E4 000060 0004+00 0/1 0/0 0/0 .rodata @4126 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4126 = 1.0f / 3.0f; -COMPILER_STRIP_GATE(8058C3E0, &lit_4126); +COMPILER_STRIP_GATE(0x8058C3E0, &lit_4126); #pragma pop /* 8058C3E4-8058C3E8 000064 0004+00 0/1 0/0 0/0 .rodata @4127 */ @@ -575,7 +581,7 @@ SECTION_RODATA static u8 const lit_4127[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(8058C3E4, &lit_4127); +COMPILER_STRIP_GATE(0x8058C3E4, &lit_4127); #pragma pop /* 8058B97C-8058BEEC 000ABC 0570+00 1/0 0/0 0/0 .text Execute__14daObjKLift00_cFPPA3_A4_f @@ -728,9 +734,4 @@ daObjKLift00_c::ChainPos::ChainPos() { /* empty function */ } -/* 8058C3E8-8058C3F1 000068 0009+00 1/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_8058C3E8 = "K_lift00"; -#pragma pop +/* 8058C3E8-8058C3E8 000068 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_knBullet/d_a_obj_knBullet.cpp b/rel/d/a/obj/d_a_obj_knBullet/d_a_obj_knBullet.cpp index 0555ecca9d1..3f4c6e311de 100644 --- a/rel/d/a/obj/d_a_obj_knBullet/d_a_obj_knBullet.cpp +++ b/rel/d/a/obj/d_a_obj_knBullet/d_a_obj_knBullet.cpp @@ -36,6 +36,10 @@ struct daObjKnBullet_c { struct dPa_levelEcallBack {}; +struct dKy_tevstr_c {}; + +struct _GXColor {}; + struct Vec {}; struct cXyz { @@ -43,10 +47,6 @@ struct cXyz { /* 80266F48 */ void normalizeZP(); }; -struct dKy_tevstr_c {}; - -struct _GXColor {}; - struct dPa_control_c { struct level_c { /* 8004B918 */ void getEmitter(u32); @@ -128,7 +128,7 @@ extern "C" static void daObjKnBullet_Draw__FP15daObjKnBullet_c(); extern "C" static bool daObjKnBullet_IsDelete__FP15daObjKnBullet_c(); extern "C" static void daObjKnBullet_Delete__FP15daObjKnBullet_c(); extern "C" static void daObjKnBullet_create__FP10fopAc_ac_c(); -extern "C" void func_80C4792C(s16*); +extern "C" void func_80C4792C(void* _this, s16*); // // External References: @@ -190,7 +190,7 @@ extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; SECTION_RODATA static u8 const l_DATA[12] = { 0x41, 0xF0, 0x00, 0x00, 0x41, 0xA0, 0x00, 0x00, 0x00, 0x96, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C47950, &l_DATA); +COMPILER_STRIP_GATE(0x80C47950, &l_DATA); /* 80C4795C-80C4799C 00000C 0040+00 1/1 0/0 0/0 .rodata l_sph_src */ SECTION_RODATA static u8 const l_sph_src[64] = { @@ -199,34 +199,34 @@ SECTION_RODATA static u8 const l_sph_src[64] = { 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C4795C, &l_sph_src); +COMPILER_STRIP_GATE(0x80C4795C, &l_sph_src); /* 80C4799C-80C479A0 00004C 0004+00 0/1 0/0 0/0 .rodata @3907 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3907 = -300.0f; -COMPILER_STRIP_GATE(80C4799C, &lit_3907); +COMPILER_STRIP_GATE(0x80C4799C, &lit_3907); #pragma pop /* 80C479A0-80C479A4 000050 0004+00 0/1 0/0 0/0 .rodata @3908 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3908 = -50.0f; -COMPILER_STRIP_GATE(80C479A0, &lit_3908); +COMPILER_STRIP_GATE(0x80C479A0, &lit_3908); #pragma pop /* 80C479A4-80C479A8 000054 0004+00 0/1 0/0 0/0 .rodata @3909 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3909 = 300.0f; -COMPILER_STRIP_GATE(80C479A4, &lit_3909); +COMPILER_STRIP_GATE(0x80C479A4, &lit_3909); #pragma pop /* 80C479A8-80C479AC 000058 0004+00 0/1 0/0 0/0 .rodata @3910 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3910 = 450.0f; -COMPILER_STRIP_GATE(80C479A8, &lit_3910); +COMPILER_STRIP_GATE(0x80C479A8, &lit_3910); #pragma pop /* 80C479CC-80C479EC -00001 0020+00 1/0 0/0 0/0 .data l_daObjKnBullet_Method */ @@ -310,18 +310,18 @@ SECTION_RODATA static u8 const l_prticles_id_3986[6 + 2 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C479AC, &l_prticles_id_3986); +COMPILER_STRIP_GATE(0x80C479AC, &l_prticles_id_3986); #pragma pop /* 80C479B4-80C479B8 000064 0004+00 1/2 0/0 0/0 .rodata @4021 */ SECTION_RODATA static f32 const lit_4021 = 1.0f; -COMPILER_STRIP_GATE(80C479B4, &lit_4021); +COMPILER_STRIP_GATE(0x80C479B4, &lit_4021); /* 80C479B8-80C479BC 000068 0004+00 0/1 0/0 0/0 .rodata @4022 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4022 = -1.0f; -COMPILER_STRIP_GATE(80C479B8, &lit_4022); +COMPILER_STRIP_GATE(0x80C479B8, &lit_4022); #pragma pop /* 80C47300-80C47480 000260 0180+00 1/1 0/0 0/0 .text Execute__15daObjKnBullet_cFv */ @@ -374,14 +374,14 @@ SECTION_RODATA static u8 const lit_4129[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C479BC, &lit_4129); +COMPILER_STRIP_GATE(0x80C479BC, &lit_4129); #pragma pop /* 80C479C0-80C479C4 000070 0004+00 0/1 0/0 0/0 .rodata @4130 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4130 = 150.0f; -COMPILER_STRIP_GATE(80C479C0, &lit_4130); +COMPILER_STRIP_GATE(0x80C479C0, &lit_4130); #pragma pop /* 80C47558-80C477B4 0004B8 025C+00 1/1 0/0 0/0 .text col_chk__15daObjKnBullet_cFv */ @@ -399,7 +399,7 @@ asm void daObjKnBullet_c::col_chk() { SECTION_RODATA static u8 const l_prticles_id_4141[6] = { 0x8B, 0x82, 0x8B, 0x83, 0x8B, 0x84, }; -COMPILER_STRIP_GATE(80C479C4, &l_prticles_id_4141); +COMPILER_STRIP_GATE(0x80C479C4, &l_prticles_id_4141); /* 80C477B4-80C478A4 000714 00F0+00 1/1 0/0 0/0 .text hitPrtclSet__15daObjKnBullet_cFv */ #pragma push @@ -462,7 +462,7 @@ static asm void daObjKnBullet_create(fopAc_ac_c* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80C4792C(s16* param_0) { +extern "C" asm void func_80C4792C(void* _this, s16* param_0) { nofralloc #include "asm/rel/d/a/obj/d_a_obj_knBullet/d_a_obj_knBullet/func_80C4792C.s" } diff --git a/rel/d/a/obj/d_a_obj_kshutter/d_a_obj_kshutter.cpp b/rel/d/a/obj/d_a_obj_kshutter/d_a_obj_kshutter.cpp index d0f7936ff4b..5178edafafd 100644 --- a/rel/d/a/obj/d_a_obj_kshutter/d_a_obj_kshutter.cpp +++ b/rel/d/a/obj/d_a_obj_kshutter/d_a_obj_kshutter.cpp @@ -113,10 +113,10 @@ struct dRes_control_c { struct dPa_levelEcallBack {}; -struct _GXColor {}; - struct csXyz {}; +struct _GXColor {}; + struct dPa_control_c { /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, @@ -235,7 +235,7 @@ extern "C" static void daObjKshtr_create1st__FP12daObjKshtr_c(); extern "C" static void daObjKshtr_MoveBGDelete__FP12daObjKshtr_c(); extern "C" static void daObjKshtr_MoveBGExecute__FP12daObjKshtr_c(); extern "C" static void daObjKshtr_MoveBGDraw__FP12daObjKshtr_c(); -extern "C" void func_80C49C84(u8*); +extern "C" void func_80C49C84(void* _this, u8*); extern "C" extern char const* const d_a_obj_kshutter__stringBase0; // @@ -349,21 +349,21 @@ SECTION_RODATA static u8 const l_bmd[20] = { 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x08, }; -COMPILER_STRIP_GATE(80C49CA8, &l_bmd); +COMPILER_STRIP_GATE(0x80C49CA8, &l_bmd); /* 80C49CBC-80C49CD0 000014 0014+00 1/1 0/0 0/0 .rodata l_dzb */ SECTION_RODATA static u8 const l_dzb[20] = { 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x0B, }; -COMPILER_STRIP_GATE(80C49CBC, &l_dzb); +COMPILER_STRIP_GATE(0x80C49CBC, &l_dzb); /* 80C49CD0-80C49CE4 000028 0014+00 1/1 0/0 0/0 .rodata l_heap_size */ SECTION_RODATA static u8 const l_heap_size[20] = { 0x00, 0x00, 0x13, 0x00, 0x00, 0x00, 0x13, 0x00, 0x00, 0x00, 0x13, 0x00, 0x00, 0x00, 0x13, 0x00, 0x00, 0x00, 0x20, 0xD0, }; -COMPILER_STRIP_GATE(80C49CD0, &l_heap_size); +COMPILER_STRIP_GATE(0x80C49CD0, &l_heap_size); /* 80C49CE4-80C49CFC 00003C 0018+00 0/1 0/0 0/0 .rodata l_cull_box */ #pragma push @@ -372,7 +372,7 @@ SECTION_RODATA static u8 const l_cull_box[24] = { 0xC3, 0xE1, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC2, 0x48, 0x00, 0x00, 0x43, 0xE1, 0x00, 0x00, 0x44, 0x2F, 0x00, 0x00, 0x43, 0x16, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C49CE4, &l_cull_box); +COMPILER_STRIP_GATE(0x80C49CE4, &l_cull_box); #pragma pop /* 80C49CFC-80C49D00 000054 0004+00 2/8 0/0 0/0 .rodata @3779 */ @@ -382,20 +382,20 @@ SECTION_RODATA static u8 const lit_3779[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C49CFC, &lit_3779); +COMPILER_STRIP_GATE(0x80C49CFC, &lit_3779); /* 80C49D00-80C49D04 000058 0004+00 0/1 0/0 0/0 .rodata @3780 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3780 = 150.0f; -COMPILER_STRIP_GATE(80C49D00, &lit_3780); +COMPILER_STRIP_GATE(0x80C49D00, &lit_3780); #pragma pop /* 80C49D04-80C49D08 00005C 0004+00 0/2 0/0 0/0 .rodata @3781 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3781 = -450.0f; -COMPILER_STRIP_GATE(80C49D04, &lit_3781); +COMPILER_STRIP_GATE(0x80C49D04, &lit_3781); #pragma pop /* 80C49D08-80C49D10 000060 0008+00 0/1 0/0 0/0 .rodata @3783 */ @@ -404,7 +404,26 @@ COMPILER_STRIP_GATE(80C49D04, &lit_3781); SECTION_RODATA static u8 const lit_3783[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C49D08, &lit_3783); +COMPILER_STRIP_GATE(0x80C49D08, &lit_3783); +#pragma pop + +/* 80C49D44-80C49D44 00009C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80C49D44 = "S_shut00"; +SECTION_DEAD static char const* const stringBase_80C49D4D = "Lv3shut00"; +SECTION_DEAD static char const* const stringBase_80C49D57 = "K_l3bdoor"; +SECTION_DEAD static char const* const stringBase_80C49D61 = "V_Shutter"; +SECTION_DEAD static char const* const stringBase_80C49D6B = "oj_DoorOpC.bck"; +SECTION_DEAD static char const* const stringBase_80C49D7A = "md_oj_DoorOpC.bck"; +SECTION_DEAD static char const* const stringBase_80C49D8C = "oj_DoorOpD.bck"; +SECTION_DEAD static char const* const stringBase_80C49D9B = "md_oj_DoorOpD.bck"; +SECTION_DEAD static char const* const stringBase_80C49DAD = "V_Shutter.bck"; +SECTION_DEAD static char const* const stringBase_80C49DBB = "KEY_JAIL_00"; +SECTION_DEAD static char const* const stringBase_80C49DC7 = "KEY_JAIL_WOLF_00"; +SECTION_DEAD static char const* const stringBase_80C49DD8 = "KEY_JAIL_01"; +SECTION_DEAD static char const* const stringBase_80C49DE4 = "KEY_JAIL_WOLF_01"; +SECTION_DEAD static char const* const stringBase_80C49DF5 = "DEFAULT_BS_SHUTTER_L3_F"; #pragma pop /* 80C49E60-80C49E6C 000000 000C+00 5/5 0/0 0/0 .data cNullVec__6Z2Calc */ @@ -485,7 +504,20 @@ asm void daObjKshtr_c::offDzb() { /* ############################################################################################## */ /* 80C49D10-80C49D14 000068 0004+00 4/8 0/0 0/0 .rodata @3842 */ SECTION_RODATA static f32 const lit_3842 = 1.0f; -COMPILER_STRIP_GATE(80C49D10, &lit_3842); +COMPILER_STRIP_GATE(0x80C49D10, &lit_3842); + +/* 80C49D44-80C49D44 00009C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80C49E0D = "DoorY00"; +SECTION_DEAD static char const* const stringBase_80C49E15 = "DoorT00"; +SECTION_DEAD static char const* const stringBase_80C49E1D = "WAIT"; +SECTION_DEAD static char const* const stringBase_80C49E22 = "ADJUSTMENT"; +SECTION_DEAD static char const* const stringBase_80C49E2D = "UNLOCK"; +SECTION_DEAD static char const* const stringBase_80C49E34 = "OPEN"; +SECTION_DEAD static char const* const stringBase_80C49E39 = "PLY_NODISP"; +SECTION_DEAD static char const* const stringBase_80C49E44 = "PLY_DISP"; +#pragma pop /* 80C49EE4-80C49EF8 -00001 0014+00 3/4 0/0 0/0 .data l_anmArcName */ SECTION_DATA static void* l_anmArcName[5] = { @@ -746,7 +778,7 @@ asm J3DFrameCtrl::~J3DFrameCtrl() { /* ############################################################################################## */ /* 80C49D14-80C49D18 00006C 0004+00 1/1 0/0 0/0 .rodata @3877 */ SECTION_RODATA static f32 const lit_3877 = 35.0f; -COMPILER_STRIP_GATE(80C49D14, &lit_3877); +COMPILER_STRIP_GATE(0x80C49D14, &lit_3877); /* 80C48050-80C48148 000610 00F8+00 1/1 0/0 0/0 .text initKey__12daObjKshtr_cFv */ #pragma push @@ -831,14 +863,14 @@ asm void daObjKshtr_c::Execute(f32 (**param_0)[3][4]) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4060 = 62500.0f; -COMPILER_STRIP_GATE(80C49D18, &lit_4060); +COMPILER_STRIP_GATE(0x80C49D18, &lit_4060); #pragma pop /* 80C49D1C-80C49D20 000074 0004+00 0/1 0/0 0/0 .rodata @4061 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4061 = 12100.0f; -COMPILER_STRIP_GATE(80C49D1C, &lit_4061); +COMPILER_STRIP_GATE(0x80C49D1C, &lit_4061); #pragma pop /* 80C48590-80C48708 000B50 0178+00 1/1 0/0 0/0 .text checkArea__12daObjKshtr_cFv */ @@ -871,6 +903,14 @@ asm void daObjKshtr_c::getDemoAction() { } #pragma pop +/* ############################################################################################## */ +/* 80C49D44-80C49D44 00009C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80C49E4D = "JAIL_DOOR"; +SECTION_DEAD static char const* const stringBase_80C49E57 = "Timer"; +#pragma pop + /* 80C487E0-80C489E0 000DA0 0200+00 1/1 0/0 0/0 .text demoProc2__12daObjKshtr_cFv */ #pragma push #pragma optimization_level 0 @@ -894,7 +934,7 @@ asm void daObjKshtr_c::adjustmentProc() { /* ############################################################################################## */ /* 80C49D20-80C49D24 000078 0004+00 2/6 0/0 0/0 .rodata @4190 */ SECTION_RODATA static f32 const lit_4190 = -1.0f; -COMPILER_STRIP_GATE(80C49D20, &lit_4190); +COMPILER_STRIP_GATE(0x80C49D20, &lit_4190); /* 80C48AC8-80C48B84 001088 00BC+00 1/1 0/0 0/0 .text keyUnlockInit__12daObjKshtr_cFv */ #pragma push @@ -941,14 +981,14 @@ asm void daObjKshtr_c::openProc() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4300 = 17.0f; -COMPILER_STRIP_GATE(80C49D24, &lit_4300); +COMPILER_STRIP_GATE(0x80C49D24, &lit_4300); #pragma pop /* 80C49D28-80C49D2C 000080 0004+00 0/1 0/0 0/0 .rodata @4301 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4301 = 18.0f; -COMPILER_STRIP_GATE(80C49D28, &lit_4301); +COMPILER_STRIP_GATE(0x80C49D28, &lit_4301); #pragma pop /* 80C48D80-80C48F94 001340 0214+00 1/1 0/0 0/0 .text openProc_type1__12daObjKshtr_cFv */ @@ -980,14 +1020,14 @@ SECTION_RODATA static u8 const l_eff_id[10 + 2 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C49D2C, &l_eff_id); +COMPILER_STRIP_GATE(0x80C49D2C, &l_eff_id); #pragma pop /* 80C49D38-80C49D3C 000090 0004+00 0/1 0/0 0/0 .rodata @4350 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4350 = 20.0f; -COMPILER_STRIP_GATE(80C49D38, &lit_4350); +COMPILER_STRIP_GATE(0x80C49D38, &lit_4350); #pragma pop /* 80C48F94-80C490F8 001554 0164+00 1/1 0/0 0/0 .text openProc_type2__12daObjKshtr_cFv */ @@ -1005,14 +1045,14 @@ asm void daObjKshtr_c::openProc_type2() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4357 = 30.0f; -COMPILER_STRIP_GATE(80C49D3C, &lit_4357); +COMPILER_STRIP_GATE(0x80C49D3C, &lit_4357); #pragma pop /* 80C49D40-80C49D44 000098 0004+00 0/1 0/0 0/0 .rodata @4358 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4358 = 4.0f; -COMPILER_STRIP_GATE(80C49D40, &lit_4358); +COMPILER_STRIP_GATE(0x80C49D40, &lit_4358); #pragma pop /* 80C490F8-80C49158 0016B8 0060+00 1/1 0/0 0/0 .text openProc_typeL3Boss__12daObjKshtr_cFv */ @@ -1222,38 +1262,10 @@ static asm void daObjKshtr_MoveBGDraw(daObjKshtr_c* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80C49C84(u8* param_0) { +extern "C" asm void func_80C49C84(void* _this, u8* param_0) { nofralloc #include "asm/rel/d/a/obj/d_a_obj_kshutter/d_a_obj_kshutter/func_80C49C84.s" } #pragma pop -/* 80C49D44-80C49E5D 00009C 0119+00 6/1 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80C49D44 = "S_shut00"; -SECTION_DEAD static char const* const stringBase_80C49D4D = "Lv3shut00"; -SECTION_DEAD static char const* const stringBase_80C49D57 = "K_l3bdoor"; -SECTION_DEAD static char const* const stringBase_80C49D61 = "V_Shutter"; -SECTION_DEAD static char const* const stringBase_80C49D6B = "oj_DoorOpC.bck"; -SECTION_DEAD static char const* const stringBase_80C49D7A = "md_oj_DoorOpC.bck"; -SECTION_DEAD static char const* const stringBase_80C49D8C = "oj_DoorOpD.bck"; -SECTION_DEAD static char const* const stringBase_80C49D9B = "md_oj_DoorOpD.bck"; -SECTION_DEAD static char const* const stringBase_80C49DAD = "V_Shutter.bck"; -SECTION_DEAD static char const* const stringBase_80C49DBB = "KEY_JAIL_00"; -SECTION_DEAD static char const* const stringBase_80C49DC7 = "KEY_JAIL_WOLF_00"; -SECTION_DEAD static char const* const stringBase_80C49DD8 = "KEY_JAIL_01"; -SECTION_DEAD static char const* const stringBase_80C49DE4 = "KEY_JAIL_WOLF_01"; -SECTION_DEAD static char const* const stringBase_80C49DF5 = "DEFAULT_BS_SHUTTER_L3_F"; -SECTION_DEAD static char const* const stringBase_80C49E0D = "DoorY00"; -SECTION_DEAD static char const* const stringBase_80C49E15 = "DoorT00"; -SECTION_DEAD static char const* const stringBase_80C49E1D = "WAIT"; -SECTION_DEAD static char const* const stringBase_80C49E22 = "ADJUSTMENT"; -SECTION_DEAD static char const* const stringBase_80C49E2D = "UNLOCK"; -SECTION_DEAD static char const* const stringBase_80C49E34 = "OPEN"; -SECTION_DEAD static char const* const stringBase_80C49E39 = "PLY_NODISP"; -SECTION_DEAD static char const* const stringBase_80C49E44 = "PLY_DISP"; -SECTION_DEAD static char const* const stringBase_80C49E4D = "JAIL_DOOR"; -SECTION_DEAD static char const* const stringBase_80C49E57 = "Timer"; -#pragma pop +/* 80C49D44-80C49D44 00009C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_ktonfire/d_a_obj_ktOnFire.cpp b/rel/d/a/obj/d_a_obj_ktonfire/d_a_obj_ktOnFire.cpp index e8403f36259..af2a315108a 100644 --- a/rel/d/a/obj/d_a_obj_ktonfire/d_a_obj_ktOnFire.cpp +++ b/rel/d/a/obj/d_a_obj_ktonfire/d_a_obj_ktOnFire.cpp @@ -50,13 +50,13 @@ struct dSv_info_c { struct dPa_levelEcallBack {}; -struct cXyz {}; - struct dKy_tevstr_c {}; +struct csXyz {}; + struct _GXColor {}; -struct csXyz {}; +struct cXyz {}; struct dPa_control_c { /* 8004D4CC */ void set(u32, u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, @@ -101,10 +101,10 @@ struct cCcS { /* 80264BA8 */ void Set(cCcD_Obj*); }; -struct Vec {}; - struct JAISoundID {}; +struct Vec {}; + struct Z2SeMgr { /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); /* 802AC50C */ void seStartLevel(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); @@ -291,7 +291,7 @@ SECTION_RODATA u8 const daKtOnFire_c::mCcDObjInfo[48] = { 0xD8, 0xFB, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x11, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8058CF88, &daKtOnFire_c::mCcDObjInfo); +COMPILER_STRIP_GATE(0x8058CF88, &daKtOnFire_c::mCcDObjInfo); /* 8058CFB8-8058CFC0 000030 0004+04 1/2 0/0 0/0 .rodata @3710 */ SECTION_RODATA static f32 const lit_3710[1 + 1 /* padding */] = { @@ -299,13 +299,13 @@ SECTION_RODATA static f32 const lit_3710[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(8058CFB8, &lit_3710); +COMPILER_STRIP_GATE(0x8058CFB8, &lit_3710); /* 8058CFC0-8058CFC8 000038 0008+00 1/1 0/0 0/0 .rodata @3712 */ SECTION_RODATA static u8 const lit_3712[8] = { 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8058CFC0, &lit_3712); +COMPILER_STRIP_GATE(0x8058CFC0, &lit_3712); /* 8058C6D0-8058C8D0 0001B0 0200+00 1/1 0/0 0/0 .text create__12daKtOnFire_cFv */ #pragma push @@ -342,14 +342,14 @@ asm cM3dGAab::~cM3dGAab() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3797 = 500.0f; -COMPILER_STRIP_GATE(8058CFC8, &lit_3797); +COMPILER_STRIP_GATE(0x8058CFC8, &lit_3797); #pragma pop /* 8058CFCC-8058CFD0 000044 0004+00 0/2 0/0 0/0 .rodata @3798 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3798 = 1.0f; -COMPILER_STRIP_GATE(8058CFCC, &lit_3798); +COMPILER_STRIP_GATE(0x8058CFCC, &lit_3798); #pragma pop /* 8058C960-8058C9D4 000440 0074+00 1/1 0/0 0/0 .text lightInit__12daKtOnFire_cFv */ @@ -387,21 +387,21 @@ asm void daKtOnFire_c::cutLight() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3913 = -1.0f; -COMPILER_STRIP_GATE(8058CFD0, &lit_3913); +COMPILER_STRIP_GATE(0x8058CFD0, &lit_3913); #pragma pop /* 8058CFD4-8058CFD8 00004C 0004+00 0/1 0/0 0/0 .rodata @3914 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3914 = 50.0f; -COMPILER_STRIP_GATE(8058CFD4, &lit_3914); +COMPILER_STRIP_GATE(0x8058CFD4, &lit_3914); #pragma pop /* 8058CFD8-8058CFDC 000050 0004+00 0/1 0/0 0/0 .rodata @3915 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3915 = 100.0f; -COMPILER_STRIP_GATE(8058CFD8, &lit_3915); +COMPILER_STRIP_GATE(0x8058CFD8, &lit_3915); #pragma pop /* 8058D0C0-8058D0CC 000008 000C+00 1/1 0/0 0/0 .bss @3619 */ @@ -500,5 +500,5 @@ asm void __sinit_d_a_obj_ktOnFire_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_8058CF04 = (void*)__sinit_d_a_obj_ktOnFire_cpp; +REGISTER_CTORS(0x8058CF04, __sinit_d_a_obj_ktOnFire_cpp); #pragma pop diff --git a/rel/d/a/obj/d_a_obj_kuwagata/d_a_obj_kuwagata.cpp b/rel/d/a/obj/d_a_obj_kuwagata/d_a_obj_kuwagata.cpp index 2cca8679b34..835087805b0 100644 --- a/rel/d/a/obj/d_a_obj_kuwagata/d_a_obj_kuwagata.cpp +++ b/rel/d/a/obj/d_a_obj_kuwagata/d_a_obj_kuwagata.cpp @@ -50,19 +50,19 @@ struct mDoExt_baseAnm { /* 8000D428 */ void play(); }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; +struct J3DAnmTransform {}; + +struct J3DModelData {}; + struct Z2Creature { /* 802C03C8 */ Z2Creature(); /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -409,11 +409,11 @@ extern "C" void __register_global_object(); /* ############################################################################################## */ /* 80C4D490-80C4D494 000000 0004+00 13/13 0/0 0/0 .rodata @3775 */ SECTION_RODATA static f32 const lit_3775 = 1.5f; -COMPILER_STRIP_GATE(80C4D490, &lit_3775); +COMPILER_STRIP_GATE(0x80C4D490, &lit_3775); /* 80C4D494-80C4D498 000004 0004+00 1/1 0/0 0/0 .rodata @3776 */ SECTION_RODATA static f32 const lit_3776 = 6.0f / 5.0f; -COMPILER_STRIP_GATE(80C4D494, &lit_3776); +COMPILER_STRIP_GATE(0x80C4D494, &lit_3776); /* 80C4D59C-80C4D5BC -00001 0020+00 1/0 0/0 0/0 .data l_daObjKUW_Method */ SECTION_DATA static void* l_daObjKUW_Method[8] = { @@ -510,7 +510,7 @@ SECTION_RODATA static u8 const ccSphSrc[64] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0x20, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C4D498, &ccSphSrc); +COMPILER_STRIP_GATE(0x80C4D498, &ccSphSrc); /* 80C4A21C-80C4A288 00011C 006C+00 1/1 0/0 0/0 .text InitCcSph__10daObjKUW_cFv */ #pragma push @@ -525,7 +525,7 @@ asm void daObjKUW_c::InitCcSph() { /* ############################################################################################## */ /* 80C4D4D8-80C4D4DC 000048 0004+00 1/4 0/0 0/0 .rodata @3789 */ SECTION_RODATA static f32 const lit_3789 = 20.0f; -COMPILER_STRIP_GATE(80C4D4D8, &lit_3789); +COMPILER_STRIP_GATE(0x80C4D4D8, &lit_3789); /* 80C4A288-80C4A2E0 000188 0058+00 1/1 0/0 0/0 .text SetCcSph__10daObjKUW_cFv */ #pragma push @@ -550,7 +550,13 @@ static asm void useHeapInit(fopAc_ac_c* param_0) { /* ############################################################################################## */ /* 80C4D4DC-80C4D4E0 00004C 0004+00 2/9 0/0 0/0 .rodata @3895 */ SECTION_RODATA static f32 const lit_3895 = 1.0f; -COMPILER_STRIP_GATE(80C4D4DC, &lit_3895); +COMPILER_STRIP_GATE(0x80C4D4DC, &lit_3895); + +/* 80C4D58C-80C4D58C 0000FC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80C4D58C = "I_Kuw"; +#pragma pop /* 80C4A300-80C4A658 000200 0358+00 1/1 0/0 0/0 .text CreateHeap__10daObjKUW_cFv */ #pragma push @@ -600,34 +606,34 @@ SECTION_RODATA static u8 const lit_3932[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C4D4E0, &lit_3932); +COMPILER_STRIP_GATE(0x80C4D4E0, &lit_3932); /* 80C4D4E4-80C4D4E8 000054 0004+00 0/6 0/0 0/0 .rodata @3933 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3933 = 5.0f; -COMPILER_STRIP_GATE(80C4D4E4, &lit_3933); +COMPILER_STRIP_GATE(0x80C4D4E4, &lit_3933); #pragma pop /* 80C4D4E8-80C4D4EC 000058 0004+00 0/6 0/0 0/0 .rodata @3934 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3934 = -1.0f; -COMPILER_STRIP_GATE(80C4D4E8, &lit_3934); +COMPILER_STRIP_GATE(0x80C4D4E8, &lit_3934); #pragma pop /* 80C4D4EC-80C4D4F0 00005C 0004+00 0/7 0/0 0/0 .rodata @3935 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3935 = 50.0f; -COMPILER_STRIP_GATE(80C4D4EC, &lit_3935); +COMPILER_STRIP_GATE(0x80C4D4EC, &lit_3935); #pragma pop /* 80C4D4F0-80C4D4F4 000060 0004+00 0/5 0/0 0/0 .rodata @3936 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3936 = 100.0f; -COMPILER_STRIP_GATE(80C4D4F0, &lit_3936); +COMPILER_STRIP_GATE(0x80C4D4F0, &lit_3936); #pragma pop /* 80C4A6E4-80C4A84C 0005E4 0168+00 1/1 0/0 0/0 .text ShopWaitAction__10daObjKUW_cFv */ @@ -645,7 +651,7 @@ asm void daObjKUW_c::ShopWaitAction() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3960 = 1500.0f; -COMPILER_STRIP_GATE(80C4D4F4, &lit_3960); +COMPILER_STRIP_GATE(0x80C4D4F4, &lit_3960); #pragma pop /* 80C4A84C-80C4A9D0 00074C 0184+00 1/1 0/0 0/0 .text WaitAction__10daObjKUW_cFv */ @@ -665,7 +671,7 @@ asm void daObjKUW_c::WaitAction() { SECTION_RODATA static u8 const lit_4013[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C4D4F8, &lit_4013); +COMPILER_STRIP_GATE(0x80C4D4F8, &lit_4013); #pragma pop /* 80C4D500-80C4D508 000070 0008+00 0/5 0/0 0/0 .rodata @4014 */ @@ -674,7 +680,7 @@ COMPILER_STRIP_GATE(80C4D4F8, &lit_4013); SECTION_RODATA static u8 const lit_4014[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C4D500, &lit_4014); +COMPILER_STRIP_GATE(0x80C4D500, &lit_4014); #pragma pop /* 80C4D508-80C4D510 000078 0008+00 0/5 0/0 0/0 .rodata @4015 */ @@ -683,7 +689,7 @@ COMPILER_STRIP_GATE(80C4D500, &lit_4014); SECTION_RODATA static u8 const lit_4015[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C4D508, &lit_4015); +COMPILER_STRIP_GATE(0x80C4D508, &lit_4015); #pragma pop /* 80C4A9D0-80C4ABFC 0008D0 022C+00 1/1 0/0 0/0 .text WallCheck__10daObjKUW_cFv */ @@ -711,28 +717,28 @@ asm cM3dGPla::~cM3dGPla() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4039 = 2.0f / 5.0f; -COMPILER_STRIP_GATE(80C4D510, &lit_4039); +COMPILER_STRIP_GATE(0x80C4D510, &lit_4039); #pragma pop /* 80C4D514-80C4D518 000084 0004+00 0/3 0/0 0/0 .rodata @4040 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4040 = 10.0f; -COMPILER_STRIP_GATE(80C4D514, &lit_4040); +COMPILER_STRIP_GATE(0x80C4D514, &lit_4040); #pragma pop /* 80C4D518-80C4D51C 000088 0004+00 0/1 0/0 0/0 .rodata @4041 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4041 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(80C4D518, &lit_4041); +COMPILER_STRIP_GATE(0x80C4D518, &lit_4041); #pragma pop /* 80C4D51C-80C4D520 00008C 0004+00 0/3 0/0 0/0 .rodata @4042 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4042 = 0.5f; -COMPILER_STRIP_GATE(80C4D51C, &lit_4042); +COMPILER_STRIP_GATE(0x80C4D51C, &lit_4042); #pragma pop /* 80C4AC44-80C4AD50 000B44 010C+00 1/1 0/0 0/0 .text SpeedSet__10daObjKUW_cFv */ @@ -750,28 +756,28 @@ asm void daObjKUW_c::SpeedSet() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4143 = 3.0f; -COMPILER_STRIP_GATE(80C4D520, &lit_4143); +COMPILER_STRIP_GATE(0x80C4D520, &lit_4143); #pragma pop /* 80C4D524-80C4D528 000094 0004+00 0/1 0/0 0/0 .rodata @4144 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4144 = -100.0f; -COMPILER_STRIP_GATE(80C4D524, &lit_4144); +COMPILER_STRIP_GATE(0x80C4D524, &lit_4144); #pragma pop /* 80C4D528-80C4D52C 000098 0004+00 0/1 0/0 0/0 .rodata @4145 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4145 = 40.0f; -COMPILER_STRIP_GATE(80C4D528, &lit_4145); +COMPILER_STRIP_GATE(0x80C4D528, &lit_4145); #pragma pop /* 80C4D52C-80C4D530 00009C 0004+00 0/1 0/0 0/0 .rodata @4146 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4146 = 3.0f / 10.0f; -COMPILER_STRIP_GATE(80C4D52C, &lit_4146); +COMPILER_STRIP_GATE(0x80C4D52C, &lit_4146); #pragma pop /* 80C4AD50-80C4B1A0 000C50 0450+00 1/1 0/0 0/0 .text WallWalk__10daObjKUW_cFv */ @@ -799,42 +805,42 @@ asm void daObjKUW_c::WalkAction() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4324 = 30.0f; -COMPILER_STRIP_GATE(80C4D530, &lit_4324); +COMPILER_STRIP_GATE(0x80C4D530, &lit_4324); #pragma pop /* 80C4D534-80C4D538 0000A4 0004+00 0/1 0/0 0/0 .rodata @4325 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4325 = 80.0f; -COMPILER_STRIP_GATE(80C4D534, &lit_4325); +COMPILER_STRIP_GATE(0x80C4D534, &lit_4325); #pragma pop /* 80C4D538-80C4D53C 0000A8 0004+00 0/3 0/0 0/0 .rodata @4326 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4326 = 8.0f; -COMPILER_STRIP_GATE(80C4D538, &lit_4326); +COMPILER_STRIP_GATE(0x80C4D538, &lit_4326); #pragma pop /* 80C4D53C-80C4D540 0000AC 0004+00 0/1 0/0 0/0 .rodata @4327 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4327 = 200.0f; -COMPILER_STRIP_GATE(80C4D53C, &lit_4327); +COMPILER_STRIP_GATE(0x80C4D53C, &lit_4327); #pragma pop /* 80C4D540-80C4D544 0000B0 0004+00 0/1 0/0 0/0 .rodata @4328 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4328 = 11.0f; -COMPILER_STRIP_GATE(80C4D540, &lit_4328); +COMPILER_STRIP_GATE(0x80C4D540, &lit_4328); #pragma pop /* 80C4D544-80C4D548 0000B4 0004+00 0/1 0/0 0/0 .rodata @4329 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4329 = 1050.0f; -COMPILER_STRIP_GATE(80C4D544, &lit_4329); +COMPILER_STRIP_GATE(0x80C4D544, &lit_4329); #pragma pop /* 80C4B3A0-80C4BB88 0012A0 07E8+00 2/2 0/0 0/0 .text MoveAction__10daObjKUW_cFv */ @@ -884,27 +890,27 @@ SECTION_RODATA static u16 const l_kuw_itemno[1 + 1 /* padding */] = { /* padding */ 0x0000, }; -COMPILER_STRIP_GATE(80C4D548, &l_kuw_itemno); +COMPILER_STRIP_GATE(0x80C4D548, &l_kuw_itemno); /* 80C4D54C-80C4D550 0000BC 0004+00 0/0 0/0 0/0 .rodata @4438 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4438 = -9.0f; -COMPILER_STRIP_GATE(80C4D54C, &lit_4438); +COMPILER_STRIP_GATE(0x80C4D54C, &lit_4438); #pragma pop /* 80C4D550-80C4D554 0000C0 0004+00 0/1 0/0 0/0 .rodata @4485 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4485 = 608.0f; -COMPILER_STRIP_GATE(80C4D550, &lit_4485); +COMPILER_STRIP_GATE(0x80C4D550, &lit_4485); #pragma pop /* 80C4D554-80C4D558 0000C4 0004+00 0/1 0/0 0/0 .rodata @4486 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4486 = 448.0f; -COMPILER_STRIP_GATE(80C4D554, &lit_4486); +COMPILER_STRIP_GATE(0x80C4D554, &lit_4486); #pragma pop /* 80C4D558-80C4D560 0000C8 0004+04 0/1 0/0 0/0 .rodata @4487 */ @@ -915,7 +921,7 @@ SECTION_RODATA static f32 const lit_4487[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80C4D558, &lit_4487); +COMPILER_STRIP_GATE(0x80C4D558, &lit_4487); #pragma pop /* 80C4BD20-80C4BE9C 001C20 017C+00 1/1 0/0 0/0 .text Z_BufferChk__10daObjKUW_cFv */ @@ -933,7 +939,7 @@ asm void daObjKUW_c::Z_BufferChk() { SECTION_RODATA static u8 const lit_4517[8] = { 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C4D560, &lit_4517); +COMPILER_STRIP_GATE(0x80C4D560, &lit_4517); /* 80C4BE9C-80C4BFC0 001D9C 0124+00 1/1 0/0 0/0 .text ParticleSet__10daObjKUW_cFv */ #pragma push @@ -970,7 +976,7 @@ asm void daObjKUW_c::ObjHit() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4694 = 10000.0f; -COMPILER_STRIP_GATE(80C4D568, &lit_4694); +COMPILER_STRIP_GATE(0x80C4D568, &lit_4694); #pragma pop /* 80C4C514-80C4C78C 002414 0278+00 1/1 0/0 0/0 .text Execute__10daObjKUW_cFv */ @@ -1010,11 +1016,11 @@ asm void daObjKUW_c::setBaseMtx() { /* ############################################################################################## */ /* 80C4D56C-80C4D570 0000DC 0004+00 1/1 0/0 0/0 .rodata @4758 */ SECTION_RODATA static f32 const lit_4758 = 15.0f; -COMPILER_STRIP_GATE(80C4D56C, &lit_4758); +COMPILER_STRIP_GATE(0x80C4D56C, &lit_4758); /* 80C4D570-80C4D574 0000E0 0004+00 1/1 0/0 0/0 .rodata @4759 */ SECTION_RODATA static f32 const lit_4759 = -3.0f / 5.0f; -COMPILER_STRIP_GATE(80C4D570, &lit_4759); +COMPILER_STRIP_GATE(0x80C4D570, &lit_4759); /* 80C4C85C-80C4C93C 00275C 00E0+00 1/0 0/0 0/0 .text daObjKUW_Draw__FP10daObjKUW_c */ #pragma push @@ -1039,7 +1045,13 @@ static asm void daObjKUW_Execute(daObjKUW_c* param_0) { /* ############################################################################################## */ /* 80C4D574-80C4D578 0000E4 0004+00 1/2 0/0 0/0 .rodata l_musiya_num */ SECTION_RODATA static u32 const l_musiya_num = 0x01950196; -COMPILER_STRIP_GATE(80C4D574, &l_musiya_num); +COMPILER_STRIP_GATE(0x80C4D574, &l_musiya_num); + +/* 80C4D58C-80C4D58C 0000FC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80C4D592 = "R_SP160"; +#pragma pop /* 80C4C95C-80C4CB08 00285C 01AC+00 1/1 0/0 0/0 .text CreateChk__10daObjKUW_cFv */ #pragma push @@ -1056,35 +1068,35 @@ asm void daObjKUW_c::CreateChk() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5033 = 11.0f / 10.0f; -COMPILER_STRIP_GATE(80C4D578, &lit_5033); +COMPILER_STRIP_GATE(0x80C4D578, &lit_5033); #pragma pop /* 80C4D57C-80C4D580 0000EC 0004+00 0/1 0/0 0/0 .rodata @5034 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5034 = 500.0f; -COMPILER_STRIP_GATE(80C4D57C, &lit_5034); +COMPILER_STRIP_GATE(0x80C4D57C, &lit_5034); #pragma pop /* 80C4D580-80C4D584 0000F0 0004+00 0/1 0/0 0/0 .rodata @5035 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5035 = -200.0f; -COMPILER_STRIP_GATE(80C4D580, &lit_5035); +COMPILER_STRIP_GATE(0x80C4D580, &lit_5035); #pragma pop /* 80C4D584-80C4D588 0000F4 0004+00 0/1 0/0 0/0 .rodata @5036 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5036 = -1000.0f; -COMPILER_STRIP_GATE(80C4D584, &lit_5036); +COMPILER_STRIP_GATE(0x80C4D584, &lit_5036); #pragma pop /* 80C4D588-80C4D58C 0000F8 0004+00 0/1 0/0 0/0 .rodata @5037 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5037 = -50.0f; -COMPILER_STRIP_GATE(80C4D588, &lit_5037); +COMPILER_STRIP_GATE(0x80C4D588, &lit_5037); #pragma pop /* 80C4D664-80C4D670 00000C 000C+00 1/1 0/0 0/0 .bss @3770 */ @@ -1161,7 +1173,7 @@ asm void __sinit_d_a_obj_kuwagata_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80C4D430 = (void*)__sinit_d_a_obj_kuwagata_cpp; +REGISTER_CTORS(0x80C4D430, __sinit_d_a_obj_kuwagata_cpp); #pragma pop /* 80C4D46C-80C4D474 00336C 0008+00 1/0 0/0 0/0 .text @36@__dt__12dBgS_ObjAcchFv */ @@ -1184,10 +1196,4 @@ static asm void func_80C4D474() { } #pragma pop -/* 80C4D58C-80C4D59A 0000FC 000E+00 10/10 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80C4D58C = "I_Kuw"; -SECTION_DEAD static char const* const stringBase_80C4D592 = "R_SP160"; -#pragma pop +/* 80C4D58C-80C4D58C 0000FC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_kwheel00/d_a_obj_kwheel00.cpp b/rel/d/a/obj/d_a_obj_kwheel00/d_a_obj_kwheel00.cpp index e5ebe36bfbb..6dbf5b90b66 100644 --- a/rel/d/a/obj/d_a_obj_kwheel00/d_a_obj_kwheel00.cpp +++ b/rel/d/a/obj/d_a_obj_kwheel00/d_a_obj_kwheel00.cpp @@ -58,10 +58,10 @@ struct dRes_control_c { struct dPa_levelEcallBack {}; -struct _GXColor {}; - struct csXyz {}; +struct _GXColor {}; + struct dPa_control_c { /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, @@ -136,10 +136,10 @@ struct cCcD_GStts { /* 80C4E63C */ ~cCcD_GStts(); }; -struct Vec {}; - struct JAISoundID {}; +struct Vec {}; + struct Z2SeMgr { /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); /* 802AC50C */ void seStartLevel(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); @@ -258,7 +258,14 @@ extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; SECTION_RODATA static u8 const l_dzbidx[8] = { 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x07, }; -COMPILER_STRIP_GATE(80C4E800, &l_dzbidx); +COMPILER_STRIP_GATE(0x80C4E800, &l_dzbidx); + +/* 80C4E85C-80C4E85C 00005C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80C4E85C = "K_Wheel00"; +SECTION_DEAD static char const* const stringBase_80C4E866 = "S_wheel00"; +#pragma pop /* 80C4E870-80C4E878 -00001 0008+00 3/3 0/0 0/0 .data l_arcName */ SECTION_DATA static void* l_arcName[2] = { @@ -291,7 +298,7 @@ static asm void searchLv3Water(void* param_0, void* param_1) { SECTION_RODATA static u8 const l_bmdidx[8] = { 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x04, }; -COMPILER_STRIP_GATE(80C4E808, &l_bmdidx); +COMPILER_STRIP_GATE(0x80C4E808, &l_bmdidx); /* 80C4E810-80C4E840 000010 0030+00 1/1 0/0 0/0 .rodata l_cull_box */ SECTION_RODATA static u8 const l_cull_box[48] = { @@ -299,15 +306,15 @@ SECTION_RODATA static u8 const l_cull_box[48] = { 0x44, 0x4F, 0x80, 0x00, 0x43, 0x48, 0x00, 0x00, 0xC4, 0x0C, 0x00, 0x00, 0xC4, 0x0C, 0x00, 0x00, 0xC3, 0xAF, 0x00, 0x00, 0x44, 0x0C, 0x00, 0x00, 0x44, 0x0C, 0x00, 0x00, 0x43, 0xAF, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C4E810, &l_cull_box); +COMPILER_STRIP_GATE(0x80C4E810, &l_cull_box); /* 80C4E840-80C4E844 000040 0004+00 1/2 0/0 0/0 .rodata @3696 */ SECTION_RODATA static f32 const lit_3696 = 1.0f; -COMPILER_STRIP_GATE(80C4E840, &lit_3696); +COMPILER_STRIP_GATE(0x80C4E840, &lit_3696); /* 80C4E844-80C4E848 000044 0004+00 1/1 0/0 0/0 .rodata @3697 */ SECTION_RODATA static f32 const lit_3697 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(80C4E844, &lit_3697); +COMPILER_STRIP_GATE(0x80C4E844, &lit_3697); /* 80C4D86C-80C4D9B8 0001EC 014C+00 2/2 0/0 0/0 .text setMtx__15daObjKWheel00_cFv */ #pragma push @@ -358,35 +365,35 @@ asm void daObjKWheel00_c::Create() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3904 = 830.0f; -COMPILER_STRIP_GATE(80C4E848, &lit_3904); +COMPILER_STRIP_GATE(0x80C4E848, &lit_3904); #pragma pop /* 80C4E84C-80C4E850 00004C 0004+00 0/1 0/0 0/0 .rodata @3905 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3905 = 560.0f; -COMPILER_STRIP_GATE(80C4E84C, &lit_3905); +COMPILER_STRIP_GATE(0x80C4E84C, &lit_3905); #pragma pop /* 80C4E850-80C4E854 000050 0004+00 0/1 0/0 0/0 .rodata @3906 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3906 = -1.0f; -COMPILER_STRIP_GATE(80C4E850, &lit_3906); +COMPILER_STRIP_GATE(0x80C4E850, &lit_3906); #pragma pop /* 80C4E854-80C4E858 000054 0004+00 0/1 0/0 0/0 .rodata @3907 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3907 = 160.0f; -COMPILER_STRIP_GATE(80C4E854, &lit_3907); +COMPILER_STRIP_GATE(0x80C4E854, &lit_3907); #pragma pop /* 80C4E858-80C4E85C 000058 0004+00 0/1 0/0 0/0 .rodata @3908 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3908 = 140.0f; -COMPILER_STRIP_GATE(80C4E858, &lit_3908); +COMPILER_STRIP_GATE(0x80C4E858, &lit_3908); #pragma pop /* 80C4E8C0-80C4E920 000050 0060+00 1/1 0/0 0/0 .data l_pos */ @@ -682,10 +689,4 @@ static asm void func_80C4E7F0() { } #pragma pop -/* 80C4E85C-80C4E870 00005C 0014+00 1/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80C4E85C = "K_Wheel00"; -SECTION_DEAD static char const* const stringBase_80C4E866 = "S_wheel00"; -#pragma pop +/* 80C4E85C-80C4E85C 00005C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_kwheel01/d_a_obj_kwheel01.cpp b/rel/d/a/obj/d_a_obj_kwheel01/d_a_obj_kwheel01.cpp index b21a3063c43..5d41b226b99 100644 --- a/rel/d/a/obj/d_a_obj_kwheel01/d_a_obj_kwheel01.cpp +++ b/rel/d/a/obj/d_a_obj_kwheel01/d_a_obj_kwheel01.cpp @@ -111,10 +111,10 @@ struct cBgS { /* 80074250 */ void Release(dBgW_Base*); }; -struct Vec {}; - struct JAISoundID {}; +struct Vec {}; + struct Z2SeMgr { /* 802AC50C */ void seStartLevel(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); }; @@ -222,7 +222,13 @@ extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; SECTION_RODATA static u8 const l_dzbidx[12] = { 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x0A, }; -COMPILER_STRIP_GATE(80C4F6B8, &l_dzbidx); +COMPILER_STRIP_GATE(0x80C4F6B8, &l_dzbidx); + +/* 80C4F6EC-80C4F6EC 000034 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80C4F6EC = "K_Wheel01"; +#pragma pop /* 80C4F6F8-80C4F6FC -00001 0004+00 3/3 0/0 0/0 .data l_arcName */ SECTION_DATA static void* l_arcName = (void*)&d_a_obj_kwheel01__stringBase0; @@ -249,18 +255,18 @@ asm void daObjKWheel01_c::create1st() { SECTION_RODATA static u8 const l_bmdidx[8] = { 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x05, }; -COMPILER_STRIP_GATE(80C4F6C4, &l_bmdidx); +COMPILER_STRIP_GATE(0x80C4F6C4, &l_bmdidx); /* 80C4F6CC-80C4F6E4 000014 0018+00 1/1 0/0 0/0 .rodata l_cull_box */ SECTION_RODATA static u8 const l_cull_box[24] = { 0xC4, 0x9D, 0x80, 0x00, 0xC5, 0x3E, 0xA0, 0x00, 0xC4, 0x9D, 0x80, 0x00, 0x44, 0x9D, 0x80, 0x00, 0x45, 0x2F, 0x00, 0x00, 0x44, 0x9D, 0x80, 0x00, }; -COMPILER_STRIP_GATE(80C4F6CC, &l_cull_box); +COMPILER_STRIP_GATE(0x80C4F6CC, &l_cull_box); /* 80C4F6E4-80C4F6E8 00002C 0004+00 2/2 0/0 0/0 .rodata @3717 */ SECTION_RODATA static f32 const lit_3717 = 1.0f; -COMPILER_STRIP_GATE(80C4F6E4, &lit_3717); +COMPILER_STRIP_GATE(0x80C4F6E4, &lit_3717); /* 80C4EC54-80C4EDCC 000254 0178+00 2/2 0/0 0/0 .text setMtx__15daObjKWheel01_cFv */ #pragma push @@ -305,7 +311,7 @@ static asm void searchKWheel00(void* param_0, void* param_1) { /* ############################################################################################## */ /* 80C4F6E8-80C4F6EC 000030 0004+00 1/1 0/0 0/0 .rodata @3888 */ SECTION_RODATA static f32 const lit_3888 = -1.0f; -COMPILER_STRIP_GATE(80C4F6E8, &lit_3888); +COMPILER_STRIP_GATE(0x80C4F6E8, &lit_3888); /* 80C4F048-80C4F344 000648 02FC+00 1/0 0/0 0/0 .text Execute__15daObjKWheel01_cFPPA3_A4_f */ #pragma push @@ -502,9 +508,4 @@ static asm void func_80C4F6A8() { } #pragma pop -/* 80C4F6EC-80C4F6F6 000034 000A+00 1/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80C4F6EC = "K_Wheel01"; -#pragma pop +/* 80C4F6EC-80C4F6EC 000034 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_kznkarm/d_a_obj_kznkarm.cpp b/rel/d/a/obj/d_a_obj_kznkarm/d_a_obj_kznkarm.cpp index e0451eabb20..0df14bc415d 100644 --- a/rel/d/a/obj/d_a_obj_kznkarm/d_a_obj_kznkarm.cpp +++ b/rel/d/a/obj/d_a_obj_kznkarm/d_a_obj_kznkarm.cpp @@ -127,10 +127,10 @@ struct cBgS { struct _GXTexObj {}; -struct Vec {}; - struct JAISoundID {}; +struct Vec {}; + struct Z2SeMgr { /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); }; @@ -249,6 +249,12 @@ extern "C" void getFirstVec__15daObjKazeNeko_cFP4cXyzi(); // /* ############################################################################################## */ +/* 80C50D90-80C50D90 000088 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80C50D90 = "J_Kazami"; +#pragma pop + /* 80C50DA4-80C50DB0 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -399,7 +405,7 @@ SECTION_RODATA u8 const daObjKznkarm_c::M_attr[56] = { 0xC0, 0xC0, 0x00, 0x00, 0xC0, 0xC0, 0x00, 0x00, 0xC2, 0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41, 0x40, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0xE0, 0x00, }; -COMPILER_STRIP_GATE(80C50D08, &daObjKznkarm_c::M_attr); +COMPILER_STRIP_GATE(0x80C50D08, &daObjKznkarm_c::M_attr); /* 80C4F8E0-80C4F960 000100 0080+00 1/0 0/0 0/0 .text initBroken__14daObjKznkarm_cFv */ #pragma push @@ -416,7 +422,7 @@ asm void daObjKznkarm_c::initBroken() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3720 = -1.0f; -COMPILER_STRIP_GATE(80C50D40, &lit_3720); +COMPILER_STRIP_GATE(0x80C50D40, &lit_3720); #pragma pop /* 80C50D44-80C50D48 00003C 0004+00 2/7 0/0 0/0 .rodata @3721 */ @@ -426,7 +432,7 @@ SECTION_RODATA static u8 const lit_3721[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C50D44, &lit_3721); +COMPILER_STRIP_GATE(0x80C50D44, &lit_3721); /* 80C50D48-80C50D50 000040 0008+00 0/2 0/0 0/0 .rodata @3722 */ #pragma push @@ -434,7 +440,7 @@ COMPILER_STRIP_GATE(80C50D44, &lit_3721); SECTION_RODATA static u8 const lit_3722[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C50D48, &lit_3722); +COMPILER_STRIP_GATE(0x80C50D48, &lit_3722); #pragma pop /* 80C50D50-80C50D58 000048 0008+00 0/2 0/0 0/0 .rodata @3723 */ @@ -443,7 +449,7 @@ COMPILER_STRIP_GATE(80C50D48, &lit_3722); SECTION_RODATA static u8 const lit_3723[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C50D50, &lit_3723); +COMPILER_STRIP_GATE(0x80C50D50, &lit_3723); #pragma pop /* 80C50D58-80C50D60 000050 0008+00 0/2 0/0 0/0 .rodata @3724 */ @@ -452,7 +458,7 @@ COMPILER_STRIP_GATE(80C50D50, &lit_3723); SECTION_RODATA static u8 const lit_3724[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C50D58, &lit_3724); +COMPILER_STRIP_GATE(0x80C50D58, &lit_3724); #pragma pop /* 80C4F960-80C4FBBC 000180 025C+00 1/0 0/0 0/0 .text executeBroken__14daObjKznkarm_cFv @@ -491,7 +497,7 @@ asm void daObjKznkarm_c::executeCarry() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3786 = 1.0f; -COMPILER_STRIP_GATE(80C50D60, &lit_3786); +COMPILER_STRIP_GATE(0x80C50D60, &lit_3786); #pragma pop /* 80C4FD18-80C4FDB4 000538 009C+00 1/0 0/0 0/0 .text initThrow__14daObjKznkarm_cFv */ @@ -509,7 +515,7 @@ asm void daObjKznkarm_c::initThrow() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3944 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(80C50D64, &lit_3944); +COMPILER_STRIP_GATE(0x80C50D64, &lit_3944); #pragma pop /* 80C50D68-80C50D70 000060 0008+00 0/1 0/0 0/0 .rodata @3946 */ @@ -518,7 +524,7 @@ COMPILER_STRIP_GATE(80C50D64, &lit_3944); SECTION_RODATA static u8 const lit_3946[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C50D68, &lit_3946); +COMPILER_STRIP_GATE(0x80C50D68, &lit_3946); #pragma pop /* 80C50E88-80C50E90 0000E4 0008+00 1/1 0/0 0/0 .data w_eff_id$3813 */ @@ -620,42 +626,42 @@ asm void daObjKznkarm_c::executeStay() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3998 = -10.0f; -COMPILER_STRIP_GATE(80C50D70, &lit_3998); +COMPILER_STRIP_GATE(0x80C50D70, &lit_3998); #pragma pop /* 80C50D74-80C50D78 00006C 0004+00 0/1 0/0 0/0 .rodata @3999 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3999 = -15.0f; -COMPILER_STRIP_GATE(80C50D74, &lit_3999); +COMPILER_STRIP_GATE(0x80C50D74, &lit_3999); #pragma pop /* 80C50D78-80C50D7C 000070 0004+00 0/1 0/0 0/0 .rodata @4000 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4000 = 120.0f; -COMPILER_STRIP_GATE(80C50D78, &lit_4000); +COMPILER_STRIP_GATE(0x80C50D78, &lit_4000); #pragma pop /* 80C50D7C-80C50D80 000074 0004+00 0/1 0/0 0/0 .rodata @4001 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4001 = 40.0f; -COMPILER_STRIP_GATE(80C50D7C, &lit_4001); +COMPILER_STRIP_GATE(0x80C50D7C, &lit_4001); #pragma pop /* 80C50D80-80C50D84 000078 0004+00 0/1 0/0 0/0 .rodata @4002 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4002 = 15.0f; -COMPILER_STRIP_GATE(80C50D80, &lit_4002); +COMPILER_STRIP_GATE(0x80C50D80, &lit_4002); #pragma pop /* 80C50D84-80C50D88 00007C 0004+00 0/2 0/0 0/0 .rodata @4003 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4003 = 50.0f; -COMPILER_STRIP_GATE(80C50D84, &lit_4003); +COMPILER_STRIP_GATE(0x80C50D84, &lit_4003); #pragma pop /* 80C505F8-80C506DC 000E18 00E4+00 1/1 0/0 0/0 .text create_init__14daObjKznkarm_cFv */ @@ -681,7 +687,7 @@ asm void daObjKznkarm_c::initBaseMtx() { /* ############################################################################################## */ /* 80C50D88-80C50D8C 000080 0004+00 1/1 0/0 0/0 .rodata @4020 */ SECTION_RODATA static f32 const lit_4020 = -60.0f; -COMPILER_STRIP_GATE(80C50D88, &lit_4020); +COMPILER_STRIP_GATE(0x80C50D88, &lit_4020); /* 80C50708-80C5076C 000F28 0064+00 3/3 0/0 0/0 .text setBaseMtx__14daObjKznkarm_cFv */ #pragma push @@ -704,6 +710,13 @@ asm void daObjKznkarm_c::getGroundSlope(s16 param_0) { } #pragma pop +/* ############################################################################################## */ +/* 80C50D90-80C50D90 000088 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80C50D99 = "arm.bmd"; +#pragma pop + /* 80C507F8-80C50870 001018 0078+00 1/1 0/0 0/0 .text createSolidHeap__FP10fopAc_ac_c */ #pragma push #pragma optimization_level 0 @@ -719,7 +732,7 @@ static asm void createSolidHeap(fopAc_ac_c* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4114 = 600.0f; -COMPILER_STRIP_GATE(80C50D8C, &lit_4114); +COMPILER_STRIP_GATE(0x80C50D8C, &lit_4114); #pragma pop /* 80C50870-80C50984 001090 0114+00 1/0 0/0 0/0 .text daObjKznkarm_Draw__FP14daObjKznkarm_c */ @@ -800,7 +813,7 @@ asm void __sinit_d_a_obj_kznkarm_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80C50C1C = (void*)__sinit_d_a_obj_kznkarm_cpp; +REGISTER_CTORS(0x80C50C1C, __sinit_d_a_obj_kznkarm_cpp); #pragma pop /* 80C50CEC-80C50CF4 00150C 0008+00 1/0 0/0 0/0 .text @36@__dt__12dBgS_ObjAcchFv */ @@ -823,10 +836,4 @@ static asm void func_80C50CF4() { } #pragma pop -/* 80C50D90-80C50DA1 000088 0011+00 2/1 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80C50D90 = "J_Kazami"; -SECTION_DEAD static char const* const stringBase_80C50D99 = "arm.bmd"; -#pragma pop +/* 80C50D90-80C50D90 000088 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_ladder/d_a_obj_ladder.cpp b/rel/d/a/obj/d_a_obj_ladder/d_a_obj_ladder.cpp index 46c39b40a8a..cdaf5e2c2bb 100644 --- a/rel/d/a/obj/d_a_obj_ladder/d_a_obj_ladder.cpp +++ b/rel/d/a/obj/d_a_obj_ladder/d_a_obj_ladder.cpp @@ -63,7 +63,8 @@ struct daObj { template void PrmAbstract(/* ... */); /* 8058DD14 */ /* daObj::PrmAbstract */ - void func_8058DD14(fopAc_ac_c const*, daObjLadder::Act_c::Prm_e, daObjLadder::Act_c::Prm_e); + void func_8058DD14(void* _this, fopAc_ac_c const*, daObjLadder::Act_c::Prm_e, + daObjLadder::Act_c::Prm_e); }; struct dVibration_c { @@ -139,10 +140,10 @@ struct cBgS { /* 800744A0 */ void GroundCross(cBgS_GndChk*); }; -struct Vec {}; - struct JAISoundID {}; +struct Vec {}; + struct Z2SeMgr { /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); }; @@ -187,7 +188,7 @@ extern "C" static void func_8058DC7C(); extern "C" static void func_8058DC9C(); extern "C" static void func_8058DCBC(); extern "C" static void func_8058DCE8(); -extern "C" void func_8058DD14(fopAc_ac_c const*, daObjLadder::Act_c::Prm_e, +extern "C" void func_8058DD14(void* _this, fopAc_ac_c const*, daObjLadder::Act_c::Prm_e, daObjLadder::Act_c::Prm_e); extern "C" static void func_8058DD30(); extern "C" static void func_8058DD38(); @@ -266,7 +267,7 @@ SECTION_RODATA static u8 const data_8058DD50[36] = { 0x3F, 0x00, 0x00, 0x00, 0x03, 0x4B, 0x32, 0x2D, 0x28, 0x00, 0x4E, 0x20, 0x3C, 0xC3, 0x00, 0x0F, 0x40, 0x00, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8058DD50, &data_8058DD50); +COMPILER_STRIP_GATE(0x8058DD50, &data_8058DD50); /* 8058DD74-8058DD7C 000024 0005+03 3/3 0/0 0/0 .rodata M_arcname__Q211daObjLadder5Act_c */ SECTION_RODATA u8 const daObjLadder::Act_c::M_arcname[5 + 3 /* padding */] = { @@ -280,7 +281,7 @@ SECTION_RODATA u8 const daObjLadder::Act_c::M_arcname[5 + 3 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(8058DD74, &daObjLadder::Act_c::M_arcname); +COMPILER_STRIP_GATE(0x8058DD74, &daObjLadder::Act_c::M_arcname); /* 8058DDAC-8058DDB8 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { @@ -324,42 +325,42 @@ asm void daObjLadder::Act_c::CreateHeap() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3667 = -55.0f; -COMPILER_STRIP_GATE(8058DD7C, &lit_3667); +COMPILER_STRIP_GATE(0x8058DD7C, &lit_3667); #pragma pop /* 8058DD80-8058DD84 000030 0004+00 0/2 0/0 0/0 .rodata @3668 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3668 = -1.0f; -COMPILER_STRIP_GATE(8058DD80, &lit_3668); +COMPILER_STRIP_GATE(0x8058DD80, &lit_3668); #pragma pop /* 8058DD84-8058DD88 000034 0004+00 0/1 0/0 0/0 .rodata @3669 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3669 = -10.0f; -COMPILER_STRIP_GATE(8058DD84, &lit_3669); +COMPILER_STRIP_GATE(0x8058DD84, &lit_3669); #pragma pop /* 8058DD88-8058DD8C 000038 0004+00 0/1 0/0 0/0 .rodata @3670 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3670 = 55.0f; -COMPILER_STRIP_GATE(8058DD88, &lit_3670); +COMPILER_STRIP_GATE(0x8058DD88, &lit_3670); #pragma pop /* 8058DD8C-8058DD90 00003C 0004+00 0/1 0/0 0/0 .rodata @3671 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3671 = 41.0f; -COMPILER_STRIP_GATE(8058DD8C, &lit_3671); +COMPILER_STRIP_GATE(0x8058DD8C, &lit_3671); #pragma pop /* 8058DD90-8058DD94 000040 0004+00 0/1 0/0 0/0 .rodata @3672 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3672 = 10.0f; -COMPILER_STRIP_GATE(8058DD90, &lit_3672); +COMPILER_STRIP_GATE(0x8058DD90, &lit_3672); #pragma pop /* 8058DD94-8058DD98 000044 0004+00 1/3 0/0 0/0 .rodata @3673 */ @@ -369,13 +370,13 @@ SECTION_RODATA static u8 const lit_3673[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(8058DD94, &lit_3673); +COMPILER_STRIP_GATE(0x8058DD94, &lit_3673); /* 8058DD98-8058DD9C 000048 0004+00 0/1 0/0 0/0 .rodata @3674 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3674 = 5.0f; -COMPILER_STRIP_GATE(8058DD98, &lit_3674); +COMPILER_STRIP_GATE(0x8058DD98, &lit_3674); #pragma pop /* 8058D1D8-8058D378 0000F8 01A0+00 1/0 0/0 0/0 .text Create__Q211daObjLadder5Act_cFv */ @@ -605,7 +606,7 @@ asm void daObjLadder::Act_c::mode_vib() { /* ############################################################################################## */ /* 8058DD9C-8058DDA0 00004C 0004+00 1/1 0/0 0/0 .rodata @3792 */ SECTION_RODATA static f32 const lit_3792 = -5.0f; -COMPILER_STRIP_GATE(8058DD9C, &lit_3792); +COMPILER_STRIP_GATE(0x8058DD9C, &lit_3792); /* 8058D7A8-8058D7EC 0006C8 0044+00 1/1 0/0 0/0 .text mode_drop_init__Q211daObjLadder5Act_cFv */ #pragma push @@ -622,21 +623,21 @@ asm void daObjLadder::Act_c::mode_drop_init() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3838 = 1.0f; -COMPILER_STRIP_GATE(8058DDA0, &lit_3838); +COMPILER_STRIP_GATE(0x8058DDA0, &lit_3838); #pragma pop /* 8058DDA4-8058DDA8 000054 0004+00 0/1 0/0 0/0 .rodata @3839 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3839 = 0.5f; -COMPILER_STRIP_GATE(8058DDA4, &lit_3839); +COMPILER_STRIP_GATE(0x8058DDA4, &lit_3839); #pragma pop /* 8058DDA8-8058DDAC 000058 0004+00 0/1 0/0 0/0 .rodata @3840 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3840 = -0.5f; -COMPILER_STRIP_GATE(8058DDA8, &lit_3840); +COMPILER_STRIP_GATE(0x8058DDA8, &lit_3840); #pragma pop /* 8058D7EC-8058D9C0 00070C 01D4+00 1/0 0/0 0/0 .text mode_drop__Q211daObjLadder5Act_cFv @@ -776,7 +777,8 @@ static asm void func_8058DCE8() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_8058DD14(fopAc_ac_c const* param_0, daObjLadder::Act_c::Prm_e param_1, +extern "C" asm void func_8058DD14(void* _this, fopAc_ac_c const* param_0, + daObjLadder::Act_c::Prm_e param_1, daObjLadder::Act_c::Prm_e param_2) { nofralloc #include "asm/rel/d/a/obj/d_a_obj_ladder/d_a_obj_ladder/func_8058DD14.s" diff --git a/rel/d/a/obj/d_a_obj_laundry/d_a_obj_laundry.cpp b/rel/d/a/obj/d_a_obj_laundry/d_a_obj_laundry.cpp index 20343998dce..86725776520 100644 --- a/rel/d/a/obj/d_a_obj_laundry/d_a_obj_laundry.cpp +++ b/rel/d/a/obj/d_a_obj_laundry/d_a_obj_laundry.cpp @@ -237,48 +237,48 @@ SECTION_RODATA u8 const daObjLdy_c::M_attr[52] = { 0x99, 0x9A, 0x44, 0x7A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0A, 0x00, }; -COMPILER_STRIP_GATE(80C52000, &daObjLdy_c::M_attr); +COMPILER_STRIP_GATE(0x80C52000, &daObjLdy_c::M_attr); /* 80C52034-80C52038 000034 0004+00 0/1 0/0 0/0 .rodata @3751 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3751 = -60.0f; -COMPILER_STRIP_GATE(80C52034, &lit_3751); +COMPILER_STRIP_GATE(0x80C52034, &lit_3751); #pragma pop /* 80C52038-80C5203C 000038 0004+00 0/1 0/0 0/0 .rodata @3752 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3752 = -200.0f; -COMPILER_STRIP_GATE(80C52038, &lit_3752); +COMPILER_STRIP_GATE(0x80C52038, &lit_3752); #pragma pop /* 80C5203C-80C52040 00003C 0004+00 0/1 0/0 0/0 .rodata @3753 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3753 = 60.0f; -COMPILER_STRIP_GATE(80C5203C, &lit_3753); +COMPILER_STRIP_GATE(0x80C5203C, &lit_3753); #pragma pop /* 80C52040-80C52044 000040 0004+00 0/1 0/0 0/0 .rodata @3754 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3754 = 50.0f; -COMPILER_STRIP_GATE(80C52040, &lit_3754); +COMPILER_STRIP_GATE(0x80C52040, &lit_3754); #pragma pop /* 80C52044-80C52048 000044 0004+00 0/1 0/0 0/0 .rodata @3755 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3755 = 1.5f; -COMPILER_STRIP_GATE(80C52044, &lit_3755); +COMPILER_STRIP_GATE(0x80C52044, &lit_3755); #pragma pop /* 80C52048-80C52050 000048 0008+00 1/2 0/0 0/0 .rodata @3757 */ SECTION_RODATA static u8 const lit_3757[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C52048, &lit_3757); +COMPILER_STRIP_GATE(0x80C52048, &lit_3757); /* 80C50F98-80C51088 000078 00F0+00 1/1 0/0 0/0 .text create_init__10daObjLdy_cFv */ #pragma push @@ -298,7 +298,7 @@ SECTION_RODATA static u8 const lit_3782[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C52050, &lit_3782); +COMPILER_STRIP_GATE(0x80C52050, &lit_3782); /* 80C51088-80C510F8 000168 0070+00 1/1 0/0 0/0 .text initBaseMtx__10daObjLdy_cFv */ #pragma push @@ -341,7 +341,7 @@ SECTION_RODATA static u8 const ccCylSrc[68] = { 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC2, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41, 0xC8, 0x00, 0x00, 0x41, 0xC8, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C52054, &ccCylSrc); +COMPILER_STRIP_GATE(0x80C52054, &ccCylSrc); #pragma pop /* 80C52098-80C520A0 000098 0008+00 0/2 0/0 0/0 .rodata @3855 */ @@ -350,7 +350,7 @@ COMPILER_STRIP_GATE(80C52054, &ccCylSrc); SECTION_RODATA static u8 const lit_3855[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C52098, &lit_3855); +COMPILER_STRIP_GATE(0x80C52098, &lit_3855); #pragma pop /* 80C520A0-80C520A8 0000A0 0008+00 0/2 0/0 0/0 .rodata @3856 */ @@ -359,7 +359,7 @@ COMPILER_STRIP_GATE(80C52098, &lit_3855); SECTION_RODATA static u8 const lit_3856[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C520A0, &lit_3856); +COMPILER_STRIP_GATE(0x80C520A0, &lit_3856); #pragma pop /* 80C520A8-80C520B0 0000A8 0008+00 0/2 0/0 0/0 .rodata @3857 */ @@ -368,35 +368,35 @@ COMPILER_STRIP_GATE(80C520A0, &lit_3856); SECTION_RODATA static u8 const lit_3857[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C520A8, &lit_3857); +COMPILER_STRIP_GATE(0x80C520A8, &lit_3857); #pragma pop /* 80C520B0-80C520B4 0000B0 0004+00 0/0 0/0 0/0 .rodata @3858 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3858 = 40.0f; -COMPILER_STRIP_GATE(80C520B0, &lit_3858); +COMPILER_STRIP_GATE(0x80C520B0, &lit_3858); #pragma pop /* 80C520B4-80C520B8 0000B4 0004+00 0/1 0/0 0/0 .rodata @4041 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4041 = 100.0f; -COMPILER_STRIP_GATE(80C520B4, &lit_4041); +COMPILER_STRIP_GATE(0x80C520B4, &lit_4041); #pragma pop /* 80C520B8-80C520BC 0000B8 0004+00 0/1 0/0 0/0 .rodata @4042 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4042 = 3.0f / 5.0f; -COMPILER_STRIP_GATE(80C520B8, &lit_4042); +COMPILER_STRIP_GATE(0x80C520B8, &lit_4042); #pragma pop /* 80C520BC-80C520C0 0000BC 0004+00 0/1 0/0 0/0 .rodata @4043 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4043 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(80C520BC, &lit_4043); +COMPILER_STRIP_GATE(0x80C520BC, &lit_4043); #pragma pop /* 80C51194-80C51644 000274 04B0+00 1/1 0/0 0/0 .text setNormalClothPos__10daObjLdy_cFv @@ -415,7 +415,7 @@ asm void daObjLdy_c::setNormalClothPos() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4097 = -1.0f; -COMPILER_STRIP_GATE(80C520C0, &lit_4097); +COMPILER_STRIP_GATE(0x80C520C0, &lit_4097); #pragma pop /* 80C51644-80C5183C 000724 01F8+00 1/1 0/0 0/0 .text calcJointAngle__10daObjLdy_cFv */ @@ -446,7 +446,15 @@ static asm void nodeCallBack(J3DJoint* param_0, int param_1) { /* ############################################################################################## */ /* 80C520C4-80C520C8 0000C4 0004+00 1/1 0/0 0/0 .rodata @4203 */ SECTION_RODATA static f32 const lit_4203 = 1.0f; -COMPILER_STRIP_GATE(80C520C4, &lit_4203); +COMPILER_STRIP_GATE(0x80C520C4, &lit_4203); + +/* 80C520C8-80C520C8 0000C8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80C520C8 = "J_Sentaku"; +SECTION_DEAD static char const* const stringBase_80C520D2 = "J_Sentaku.bmd"; +SECTION_DEAD static char const* const stringBase_80C520E0 = "J_Sentaku.btk"; +#pragma pop /* 80C520F0-80C520F4 -00001 0004+00 3/3 0/0 0/0 .data l_arcName */ SECTION_DATA static void* l_arcName = (void*)&d_a_obj_laundry__stringBase0; @@ -629,11 +637,4 @@ asm cCcD_GStts::~cCcD_GStts() { } #pragma pop -/* 80C520C8-80C520EE 0000C8 0026+00 2/1 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80C520C8 = "J_Sentaku"; -SECTION_DEAD static char const* const stringBase_80C520D2 = "J_Sentaku.bmd"; -SECTION_DEAD static char const* const stringBase_80C520E0 = "J_Sentaku.btk"; -#pragma pop +/* 80C520C8-80C520C8 0000C8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_laundry_rope/d_a_obj_laundry_rope.cpp b/rel/d/a/obj/d_a_obj_laundry_rope/d_a_obj_laundry_rope.cpp index 38072d1f4f8..02cfd3fe651 100644 --- a/rel/d/a/obj/d_a_obj_laundry_rope/d_a_obj_laundry_rope.cpp +++ b/rel/d/a/obj/d_a_obj_laundry_rope/d_a_obj_laundry_rope.cpp @@ -19,11 +19,11 @@ struct mDoExt_3DlineMatSortPacket { /* 80014738 */ void setMat(mDoExt_3DlineMat_c*); }; -struct dKy_tevstr_c {}; +struct ResTIMG {}; struct _GXColor {}; -struct ResTIMG {}; +struct dKy_tevstr_c {}; struct mDoExt_3DlineMat1_c { /* 80013360 */ void init(u16, u16, ResTIMG*, int); @@ -186,7 +186,7 @@ SECTION_RODATA u8 const daObjLndRope_c::M_attr[20] = { 0xC0, 0xA0, 0x00, 0x00, 0x3E, 0x4C, 0xCC, 0xCD, 0x3F, 0x00, 0x00, 0x00, 0x3F, 0x4C, 0xCC, 0xCD, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C53304, &daObjLndRope_c::M_attr); +COMPILER_STRIP_GATE(0x80C53304, &daObjLndRope_c::M_attr); /* 80C53318-80C53328 000014 000D+03 0/1 0/0 0/0 .rodata l_laundryList */ #pragma push @@ -210,21 +210,21 @@ SECTION_RODATA static u8 const l_laundryList[13 + 3 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C53318, &l_laundryList); +COMPILER_STRIP_GATE(0x80C53318, &l_laundryList); #pragma pop /* 80C53328-80C5332C 000024 0004+00 0/1 0/0 0/0 .rodata @3791 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3791 = 0.5f; -COMPILER_STRIP_GATE(80C53328, &lit_3791); +COMPILER_STRIP_GATE(0x80C53328, &lit_3791); #pragma pop /* 80C5332C-80C53330 000028 0004+00 0/1 0/0 0/0 .rodata @3792 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3792 = 1.0f; -COMPILER_STRIP_GATE(80C5332C, &lit_3792); +COMPILER_STRIP_GATE(0x80C5332C, &lit_3792); #pragma pop /* 80C53330-80C53334 00002C 0004+00 0/2 0/0 0/0 .rodata @3793 */ @@ -236,7 +236,7 @@ SECTION_RODATA static u8 const lit_3793[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C53330, &lit_3793); +COMPILER_STRIP_GATE(0x80C53330, &lit_3793); #pragma pop /* 80C53334-80C5333C 000030 0008+00 0/1 0/0 0/0 .rodata @3794 */ @@ -245,7 +245,7 @@ COMPILER_STRIP_GATE(80C53330, &lit_3793); SECTION_RODATA static u8 const lit_3794[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C53334, &lit_3794); +COMPILER_STRIP_GATE(0x80C53334, &lit_3794); #pragma pop /* 80C5333C-80C53344 000038 0008+00 0/1 0/0 0/0 .rodata @3795 */ @@ -254,7 +254,7 @@ COMPILER_STRIP_GATE(80C53334, &lit_3794); SECTION_RODATA static u8 const lit_3795[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C5333C, &lit_3795); +COMPILER_STRIP_GATE(0x80C5333C, &lit_3795); #pragma pop /* 80C53344-80C5334C 000040 0008+00 0/1 0/0 0/0 .rodata @3796 */ @@ -263,49 +263,49 @@ COMPILER_STRIP_GATE(80C5333C, &lit_3795); SECTION_RODATA static u8 const lit_3796[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C53344, &lit_3796); +COMPILER_STRIP_GATE(0x80C53344, &lit_3796); #pragma pop /* 80C5334C-80C53350 000048 0004+00 0/1 0/0 0/0 .rodata @3797 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3797 = 3.0f; -COMPILER_STRIP_GATE(80C5334C, &lit_3797); +COMPILER_STRIP_GATE(0x80C5334C, &lit_3797); #pragma pop /* 80C53350-80C53354 00004C 0004+00 0/1 0/0 0/0 .rodata @3798 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3798 = -75.0f; -COMPILER_STRIP_GATE(80C53350, &lit_3798); +COMPILER_STRIP_GATE(0x80C53350, &lit_3798); #pragma pop /* 80C53354-80C53358 000050 0004+00 0/1 0/0 0/0 .rodata @3799 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3799 = -200.0f; -COMPILER_STRIP_GATE(80C53354, &lit_3799); +COMPILER_STRIP_GATE(0x80C53354, &lit_3799); #pragma pop /* 80C53358-80C5335C 000054 0004+00 0/1 0/0 0/0 .rodata @3800 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3800 = 75.0f; -COMPILER_STRIP_GATE(80C53358, &lit_3800); +COMPILER_STRIP_GATE(0x80C53358, &lit_3800); #pragma pop /* 80C5335C-80C53360 000058 0004+00 0/1 0/0 0/0 .rodata @3801 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3801 = 50.0f; -COMPILER_STRIP_GATE(80C5335C, &lit_3801); +COMPILER_STRIP_GATE(0x80C5335C, &lit_3801); #pragma pop /* 80C53360-80C53364 00005C 0004+00 0/1 0/0 0/0 .rodata @3802 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3802 = 1.0f / 14.0f; -COMPILER_STRIP_GATE(80C53360, &lit_3802); +COMPILER_STRIP_GATE(0x80C53360, &lit_3802); #pragma pop /* 80C521F8-80C52820 000078 0628+00 1/1 0/0 0/0 .text create_init__14daObjLndRope_cFv */ @@ -358,21 +358,21 @@ SECTION_RODATA static u8 const ccSphSrc[64] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C53364, &ccSphSrc); +COMPILER_STRIP_GATE(0x80C53364, &ccSphSrc); #pragma pop /* 80C533A4-80C533A8 0000A0 0004+00 0/1 0/0 0/0 .rodata @4012 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4012 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(80C533A4, &lit_4012); +COMPILER_STRIP_GATE(0x80C533A4, &lit_4012); #pragma pop /* 80C533A8-80C533AC 0000A4 0004+00 0/1 0/0 0/0 .rodata @4013 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4013 = 3.0f / 5.0f; -COMPILER_STRIP_GATE(80C533A8, &lit_4013); +COMPILER_STRIP_GATE(0x80C533A8, &lit_4013); #pragma pop /* 80C528E0-80C52CC8 000760 03E8+00 2/2 0/0 0/0 .text setNormalRopePos__14daObjLndRope_cFv */ @@ -388,7 +388,14 @@ asm void daObjLndRope_c::setNormalRopePos() { /* ############################################################################################## */ /* 80C533AC-80C533B0 0000A8 0004+00 1/1 0/0 0/0 .rodata @4036 */ SECTION_RODATA static f32 const lit_4036 = 2.0f; -COMPILER_STRIP_GATE(80C533AC, &lit_4036); +COMPILER_STRIP_GATE(0x80C533AC, &lit_4036); + +/* 80C533B0-80C533B0 0000AC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80C533B0 = "Obj_SRope"; +SECTION_DEAD static char const* const stringBase_80C533BA = "Obj_ItaRope.bti"; +#pragma pop /* 80C533CC-80C533D0 -00001 0004+00 3/3 0/0 0/0 .data l_arcName */ SECTION_DATA static void* l_arcName = (void*)&d_a_obj_laundry_rope__stringBase0; @@ -580,10 +587,4 @@ asm cCcD_GStts::~cCcD_GStts() { } #pragma pop -/* 80C533B0-80C533CA 0000AC 001A+00 2/1 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80C533B0 = "Obj_SRope"; -SECTION_DEAD static char const* const stringBase_80C533BA = "Obj_ItaRope.bti"; -#pragma pop +/* 80C533B0-80C533B0 0000AC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_lbox/d_a_obj_lbox.cpp b/rel/d/a/obj/d_a_obj_lbox/d_a_obj_lbox.cpp index 371ae68b986..f7d405b98f8 100644 --- a/rel/d/a/obj/d_a_obj_lbox/d_a_obj_lbox.cpp +++ b/rel/d/a/obj/d_a_obj_lbox/d_a_obj_lbox.cpp @@ -90,12 +90,12 @@ struct dBgS_AcchCir { /* 80075F58 */ void SetWall(f32, f32); }; +struct csXyz {}; + struct dBgS { /* 80074A08 */ void Regist(dBgW_Base*, fopAc_ac_c*); }; -struct csXyz {}; - struct dBgS_Acch { /* 80075F94 */ ~dBgS_Acch(); /* 800760A0 */ dBgS_Acch(); @@ -131,10 +131,10 @@ struct cBgS { /* 80074250 */ void Release(dBgW_Base*); }; -struct Vec {}; - struct JAISoundID {}; +struct Vec {}; + struct Z2SeMgr { /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); }; @@ -242,7 +242,7 @@ extern "C" void __register_global_object(); /* ############################################################################################## */ /* 80C53FBC-80C53FC0 000000 0004+00 3/3 0/0 0/0 .rodata @3768 */ SECTION_RODATA static f32 const lit_3768 = 2.0f; -COMPILER_STRIP_GATE(80C53FBC, &lit_3768); +COMPILER_STRIP_GATE(0x80C53FBC, &lit_3768); /* 80C53FC0-80C53FC4 000004 0004+00 1/2 0/0 0/0 .rodata @3769 */ SECTION_RODATA static u8 const lit_3769[4] = { @@ -251,7 +251,7 @@ SECTION_RODATA static u8 const lit_3769[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C53FC0, &lit_3769); +COMPILER_STRIP_GATE(0x80C53FC0, &lit_3769); /* 80C54008-80C54048 000000 0040+00 1/1 0/0 0/0 .data cc_sph_src$3950 */ SECTION_DATA static u8 cc_sph_src[64] = { @@ -343,63 +343,63 @@ static asm void daObj_Lbox_Draw(obj_lbox_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3877 = 4500.0f; -COMPILER_STRIP_GATE(80C53FC4, &lit_3877); +COMPILER_STRIP_GATE(0x80C53FC4, &lit_3877); #pragma pop /* 80C53FC8-80C53FCC 00000C 0004+00 0/1 0/0 0/0 .rodata @3878 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3878 = -3450.0f; -COMPILER_STRIP_GATE(80C53FC8, &lit_3878); +COMPILER_STRIP_GATE(0x80C53FC8, &lit_3878); #pragma pop /* 80C53FCC-80C53FD0 000010 0004+00 0/1 0/0 0/0 .rodata @3879 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3879 = 1.0f; -COMPILER_STRIP_GATE(80C53FCC, &lit_3879); +COMPILER_STRIP_GATE(0x80C53FCC, &lit_3879); #pragma pop /* 80C53FD0-80C53FD4 000014 0004+00 0/1 0/0 0/0 .rodata @3880 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3880 = -1.0f; -COMPILER_STRIP_GATE(80C53FD0, &lit_3880); +COMPILER_STRIP_GATE(0x80C53FD0, &lit_3880); #pragma pop /* 80C53FD4-80C53FD8 000018 0004+00 0/1 0/0 0/0 .rodata @3881 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3881 = 5.0f; -COMPILER_STRIP_GATE(80C53FD4, &lit_3881); +COMPILER_STRIP_GATE(0x80C53FD4, &lit_3881); #pragma pop /* 80C53FD8-80C53FDC 00001C 0004+00 0/2 0/0 0/0 .rodata @3882 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3882 = 200.0f; -COMPILER_STRIP_GATE(80C53FD8, &lit_3882); +COMPILER_STRIP_GATE(0x80C53FD8, &lit_3882); #pragma pop /* 80C53FDC-80C53FE0 000020 0004+00 0/1 0/0 0/0 .rodata @3883 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3883 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(80C53FDC, &lit_3883); +COMPILER_STRIP_GATE(0x80C53FDC, &lit_3883); #pragma pop /* 80C53FE0-80C53FE4 000024 0004+00 0/1 0/0 0/0 .rodata @3884 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3884 = 3.5f; -COMPILER_STRIP_GATE(80C53FE0, &lit_3884); +COMPILER_STRIP_GATE(0x80C53FE0, &lit_3884); #pragma pop /* 80C53FE4-80C53FE8 000028 0004+00 0/2 0/0 0/0 .rodata @3885 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3885 = 50.0f; -COMPILER_STRIP_GATE(80C53FE4, &lit_3885); +COMPILER_STRIP_GATE(0x80C53FE4, &lit_3885); #pragma pop /* 80C540E8-80C540EC 000008 0004+00 2/2 0/0 0/0 .bss None */ @@ -436,6 +436,13 @@ static bool daObj_Lbox_IsDelete(obj_lbox_class* param_0) { return true; } +/* ############################################################################################## */ +/* 80C53FFC-80C53FFC 000040 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80C53FFC = "Obj_lbox"; +#pragma pop + /* 80C539D0-80C53A38 000550 0068+00 1/0 0/0 0/0 .text daObj_Lbox_Delete__FP14obj_lbox_class */ #pragma push #pragma optimization_level 0 @@ -461,35 +468,35 @@ static asm void useHeapInit(fopAc_ac_c* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3886 = 20000.0f; -COMPILER_STRIP_GATE(80C53FE8, &lit_3886); +COMPILER_STRIP_GATE(0x80C53FE8, &lit_3886); #pragma pop /* 80C53FEC-80C53FF0 000030 0004+00 0/0 0/0 0/0 .rodata @3887 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3887 = 150.0f; -COMPILER_STRIP_GATE(80C53FEC, &lit_3887); +COMPILER_STRIP_GATE(0x80C53FEC, &lit_3887); #pragma pop /* 80C53FF0-80C53FF4 000034 0004+00 0/1 0/0 0/0 .rodata @4020 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4020 = -200.0f; -COMPILER_STRIP_GATE(80C53FF0, &lit_4020); +COMPILER_STRIP_GATE(0x80C53FF0, &lit_4020); #pragma pop /* 80C53FF4-80C53FF8 000038 0004+00 0/1 0/0 0/0 .rodata @4021 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4021 = -3000.0f; -COMPILER_STRIP_GATE(80C53FF4, &lit_4021); +COMPILER_STRIP_GATE(0x80C53FF4, &lit_4021); #pragma pop /* 80C53FF8-80C53FFC 00003C 0004+00 0/1 0/0 0/0 .rodata @4022 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4022 = 3000.0f; -COMPILER_STRIP_GATE(80C53FF8, &lit_4022); +COMPILER_STRIP_GATE(0x80C53FF8, &lit_4022); #pragma pop /* 80C53B3C-80C53E14 0006BC 02D8+00 1/0 0/0 0/0 .text daObj_Lbox_Create__FP10fopAc_ac_c @@ -555,7 +562,7 @@ asm void __sinit_d_a_obj_lbox_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80C53F5C = (void*)__sinit_d_a_obj_lbox_cpp; +REGISTER_CTORS(0x80C53F5C, __sinit_d_a_obj_lbox_cpp); #pragma pop /* 80C53F98-80C53FA0 000B18 0008+00 1/0 0/0 0/0 .text @36@__dt__12dBgS_ObjAcchFv */ @@ -578,9 +585,4 @@ static asm void func_80C53FA0() { } #pragma pop -/* 80C53FFC-80C54005 000040 0009+00 3/3 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80C53FFC = "Obj_lbox"; -#pragma pop +/* 80C53FFC-80C53FFC 000040 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_life_container/d_a_obj_life_container.cpp b/rel/d/a/obj/d_a_obj_life_container/d_a_obj_life_container.cpp index 0be214f70ed..4b04abe9ed1 100644 --- a/rel/d/a/obj/d_a_obj_life_container/d_a_obj_life_container.cpp +++ b/rel/d/a/obj/d_a_obj_life_container/d_a_obj_life_container.cpp @@ -120,7 +120,6 @@ struct dItem_data { struct dEvt_control_c { /* 80042468 */ void reset(); - /* 800436EC */ void setPtI_Id(unsigned int); }; struct dEvent_manager_c { @@ -222,10 +221,10 @@ struct Z2SoundObjBase { /* 802BE4A4 */ void startCollisionSE(u32, u32, Z2SoundObjBase*); }; -struct Vec {}; - struct JAISoundID {}; +struct Vec {}; + struct Z2SeMgr { /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); }; @@ -298,7 +297,7 @@ extern "C" void execute__18JPAEmitterCallBackFP14JPABaseEmitter(); extern "C" void executeAfter__18JPAEmitterCallBackFP14JPABaseEmitter(); extern "C" void draw__18JPAEmitterCallBackFP14JPABaseEmitter(); extern "C" void drawAfter__18JPAEmitterCallBackFP14JPABaseEmitter(); -extern "C" void func_804CE3C0(u8*); +extern "C" void func_804CE3C0(void* _this, u8*); extern "C" static void func_804CE3DC(); extern "C" static void func_804CE3E4(); extern "C" extern char const* const d_a_obj_life_container__stringBase0; @@ -428,7 +427,7 @@ SECTION_RODATA static u8 const l_cyl_src[68] = { 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41, 0xA0, 0x00, 0x00, 0x42, 0x20, 0x00, 0x00, }; -COMPILER_STRIP_GATE(804CE3F4, &l_cyl_src); +COMPILER_STRIP_GATE(0x804CE3F4, &l_cyl_src); /* 804CE438-804CE43C 000044 0004+00 1/6 0/0 0/0 .rodata @3855 */ SECTION_RODATA static u8 const lit_3855[4] = { @@ -437,7 +436,7 @@ SECTION_RODATA static u8 const lit_3855[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(804CE438, &lit_3855); +COMPILER_STRIP_GATE(0x804CE438, &lit_3855); /* 804CE43C-804CE444 000048 0008+00 0/1 0/0 0/0 .rodata @3856 */ #pragma push @@ -445,7 +444,7 @@ COMPILER_STRIP_GATE(804CE438, &lit_3855); SECTION_RODATA static u8 const lit_3856[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(804CE43C, &lit_3856); +COMPILER_STRIP_GATE(0x804CE43C, &lit_3856); #pragma pop /* 804CE444-804CE44C 000050 0008+00 0/1 0/0 0/0 .rodata @3857 */ @@ -454,7 +453,7 @@ COMPILER_STRIP_GATE(804CE43C, &lit_3856); SECTION_RODATA static u8 const lit_3857[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(804CE444, &lit_3857); +COMPILER_STRIP_GATE(0x804CE444, &lit_3857); #pragma pop /* 804CE44C-804CE454 000058 0008+00 0/1 0/0 0/0 .rodata @3858 */ @@ -463,7 +462,7 @@ COMPILER_STRIP_GATE(804CE444, &lit_3857); SECTION_RODATA static u8 const lit_3858[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(804CE44C, &lit_3858); +COMPILER_STRIP_GATE(0x804CE44C, &lit_3858); #pragma pop /* 804CE4CC-804CE4D8 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ @@ -737,14 +736,14 @@ asm void daObjLife_c::setBaseMtx() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3935 = 30.0f; -COMPILER_STRIP_GATE(804CE454, &lit_3935); +COMPILER_STRIP_GATE(0x804CE454, &lit_3935); #pragma pop /* 804CE458-804CE45C 000064 0004+00 0/2 0/0 0/0 .rodata @3936 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3936 = -16.0f / 5.0f; -COMPILER_STRIP_GATE(804CE458, &lit_3936); +COMPILER_STRIP_GATE(0x804CE458, &lit_3936); #pragma pop /* 804CE45C-804CE464 000068 0004+04 0/2 0/0 0/0 .rodata @3937 */ @@ -755,14 +754,14 @@ SECTION_RODATA static f32 const lit_3937[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(804CE45C, &lit_3937); +COMPILER_STRIP_GATE(0x804CE45C, &lit_3937); #pragma pop /* 804CE464-804CE46C 000070 0008+00 1/2 0/0 0/0 .rodata @3939 */ SECTION_RODATA static u8 const lit_3939[8] = { 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(804CE464, &lit_3939); +COMPILER_STRIP_GATE(0x804CE464, &lit_3939); /* 804CCC6C-804CCE00 00050C 0194+00 1/1 0/0 0/0 .text Create__11daObjLife_cFv */ #pragma push @@ -777,11 +776,11 @@ asm void daObjLife_c::Create() { /* ############################################################################################## */ /* 804CE46C-804CE470 000078 0004+00 1/1 0/0 0/0 .rodata @3969 */ SECTION_RODATA static f32 const lit_3969 = 1.5f; -COMPILER_STRIP_GATE(804CE46C, &lit_3969); +COMPILER_STRIP_GATE(0x804CE46C, &lit_3969); /* 804CE470-804CE474 00007C 0004+00 1/5 0/0 0/0 .rodata @3970 */ SECTION_RODATA static f32 const lit_3970 = 1.0f; -COMPILER_STRIP_GATE(804CE470, &lit_3970); +COMPILER_STRIP_GATE(0x804CE470, &lit_3970); /* 804CCE00-804CCF5C 0006A0 015C+00 1/1 0/0 0/0 .text setEffect__11daObjLife_cFv */ #pragma push @@ -888,28 +887,28 @@ asm dBgS_ObjAcch::~dBgS_ObjAcch() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4187 = 5.0f; -COMPILER_STRIP_GATE(804CE474, &lit_4187); +COMPILER_STRIP_GATE(0x804CE474, &lit_4187); #pragma pop /* 804CE478-804CE47C 000084 0004+00 0/2 0/0 0/0 .rodata @4188 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4188 = 3.0f; -COMPILER_STRIP_GATE(804CE478, &lit_4188); +COMPILER_STRIP_GATE(0x804CE478, &lit_4188); #pragma pop /* 804CE47C-804CE480 000088 0004+00 0/1 0/0 0/0 .rodata @4189 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4189 = 2.0f; -COMPILER_STRIP_GATE(804CE47C, &lit_4189); +COMPILER_STRIP_GATE(0x804CE47C, &lit_4189); #pragma pop /* 804CE480-804CE484 00008C 0004+00 0/2 0/0 0/0 .rodata @4190 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4190 = -1.0f; -COMPILER_STRIP_GATE(804CE480, &lit_4190); +COMPILER_STRIP_GATE(0x804CE480, &lit_4190); #pragma pop /* 804CD428-804CD5B8 000CC8 0190+00 1/1 0/0 0/0 .text bg_check__11daObjLife_cFv */ @@ -925,7 +924,13 @@ asm void daObjLife_c::bg_check() { /* ############################################################################################## */ /* 804CE484-804CE488 000090 0004+00 2/2 0/0 0/0 .rodata @4206 */ SECTION_RODATA static f32 const lit_4206 = 4.0f; -COMPILER_STRIP_GATE(804CE484, &lit_4206); +COMPILER_STRIP_GATE(0x804CE484, &lit_4206); + +/* 804CE4A4-804CE4A4 0000B0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_804CE4A4 = "D_MN11A"; +#pragma pop /* 804CD5B8-804CD660 000E58 00A8+00 3/3 0/0 0/0 .text actionWaitInit__11daObjLife_cFv */ #pragma push @@ -942,35 +947,35 @@ asm void daObjLife_c::actionWaitInit() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4299 = 1.0f / 20.0f; -COMPILER_STRIP_GATE(804CE488, &lit_4299); +COMPILER_STRIP_GATE(0x804CE488, &lit_4299); #pragma pop /* 804CE48C-804CE490 000098 0004+00 0/2 0/0 0/0 .rodata @4300 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4300 = 0.5f; -COMPILER_STRIP_GATE(804CE48C, &lit_4300); +COMPILER_STRIP_GATE(0x804CE48C, &lit_4300); #pragma pop /* 804CE490-804CE494 00009C 0004+00 0/1 0/0 0/0 .rodata @4301 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4301 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(804CE490, &lit_4301); +COMPILER_STRIP_GATE(0x804CE490, &lit_4301); #pragma pop /* 804CE494-804CE498 0000A0 0004+00 0/1 0/0 0/0 .rodata @4302 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4302 = 3.5f; -COMPILER_STRIP_GATE(804CE494, &lit_4302); +COMPILER_STRIP_GATE(0x804CE494, &lit_4302); #pragma pop /* 804CE498-804CE49C 0000A4 0004+00 0/1 0/0 0/0 .rodata @4303 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4303 = 9.0f / 10.0f; -COMPILER_STRIP_GATE(804CE498, &lit_4303); +COMPILER_STRIP_GATE(0x804CE498, &lit_4303); #pragma pop /* 804CD660-804CD8C0 000F00 0260+00 1/0 0/0 0/0 .text actionWait__11daObjLife_cFv */ @@ -1004,6 +1009,15 @@ asm void daObjLife_c::actionOrderGetDemo() { } #pragma pop +/* ############################################################################################## */ +/* 804CE4A4-804CE4A4 0000B0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_804CE4AC = "DEFAULT_GETITEM"; +SECTION_DEAD static char const* const stringBase_804CE4BC = "F_SP121"; +SECTION_DEAD static char const* const stringBase_804CE4C4 = "F_SP109"; +#pragma pop + /* 804CDA08-804CDBC8 0012A8 01C0+00 1/0 0/0 0/0 .text actionGetDemo__11daObjLife_cFv */ #pragma push #pragma optimization_level 0 @@ -1069,7 +1083,7 @@ asm void daObjLife_c::actionWait2() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4474 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(804CE49C, &lit_4474); +COMPILER_STRIP_GATE(0x804CE49C, &lit_4474); #pragma pop /* 804CDDAC-804CDE70 00164C 00C4+00 1/1 0/0 0/0 .text calcScale__11daObjLife_cFv */ @@ -1087,7 +1101,7 @@ asm void daObjLife_c::calcScale() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4538 = 300.0f; -COMPILER_STRIP_GATE(804CE4A0, &lit_4538); +COMPILER_STRIP_GATE(0x804CE4A0, &lit_4538); #pragma pop /* 804CDE70-804CE19C 001710 032C+00 1/1 0/0 0/0 .text execute__11daObjLife_cFv */ @@ -1220,7 +1234,7 @@ void JPAEmitterCallBack::drawAfter(JPABaseEmitter* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_804CE3C0(u8* param_0) { +extern "C" asm void func_804CE3C0(void* _this, u8* param_0) { nofralloc #include "asm/rel/d/a/obj/d_a_obj_life_container/d_a_obj_life_container/func_804CE3C0.s" } @@ -1246,12 +1260,4 @@ static asm void func_804CE3E4() { } #pragma pop -/* 804CE4A4-804CE4CC 0000B0 0028+00 3/3 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_804CE4A4 = "D_MN11A"; -SECTION_DEAD static char const* const stringBase_804CE4AC = "DEFAULT_GETITEM"; -SECTION_DEAD static char const* const stringBase_804CE4BC = "F_SP121"; -SECTION_DEAD static char const* const stringBase_804CE4C4 = "F_SP109"; -#pragma pop +/* 804CE4A4-804CE4A4 0000B0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_lp/d_a_obj_lp.cpp b/rel/d/a/obj/d_a_obj_lp/d_a_obj_lp.cpp index e2fa1bdcd51..95072952868 100644 --- a/rel/d/a/obj/d_a_obj_lp/d_a_obj_lp.cpp +++ b/rel/d/a/obj/d_a_obj_lp/d_a_obj_lp.cpp @@ -52,10 +52,10 @@ struct dRes_control_c { /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); }; -struct J3DModelData {}; - struct J3DModel {}; +struct J3DModelData {}; + struct dComIfG_play_c { /* 8002CAF0 */ void addSimpleModel(J3DModelData*, int, u8); /* 8002CB30 */ void removeSimpleModel(J3DModelData*, int); @@ -328,13 +328,13 @@ static asm void s_ks_sub(void* param_0, void* param_1) { /* ############################################################################################## */ /* 80C55A10-80C55A14 000000 0004+00 6/6 0/0 0/0 .rodata @3916 */ SECTION_RODATA static f32 const lit_3916 = 50.0f; -COMPILER_STRIP_GATE(80C55A10, &lit_3916); +COMPILER_STRIP_GATE(0x80C55A10, &lit_3916); /* 80C55A14-80C55A18 000004 0004+00 0/1 0/0 0/0 .rodata @3917 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3917 = -3.0f; -COMPILER_STRIP_GATE(80C55A14, &lit_3917); +COMPILER_STRIP_GATE(0x80C55A14, &lit_3917); #pragma pop /* 80C55A18-80C55A1C 000008 0004+00 0/6 0/0 0/0 .rodata @3918 */ @@ -346,98 +346,98 @@ SECTION_RODATA static u8 const lit_3918[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C55A18, &lit_3918); +COMPILER_STRIP_GATE(0x80C55A18, &lit_3918); #pragma pop /* 80C55A1C-80C55A20 00000C 0004+00 0/3 0/0 0/0 .rodata @3919 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3919 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(80C55A1C, &lit_3919); +COMPILER_STRIP_GATE(0x80C55A1C, &lit_3919); #pragma pop /* 80C55A20-80C55A24 000010 0004+00 0/2 0/0 0/0 .rodata @3920 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3920 = 0.5f; -COMPILER_STRIP_GATE(80C55A20, &lit_3920); +COMPILER_STRIP_GATE(0x80C55A20, &lit_3920); #pragma pop /* 80C55A24-80C55A28 000014 0004+00 0/2 0/0 0/0 .rodata @3921 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3921 = 70.0f; -COMPILER_STRIP_GATE(80C55A24, &lit_3921); +COMPILER_STRIP_GATE(0x80C55A24, &lit_3921); #pragma pop /* 80C55A28-80C55A2C 000018 0004+00 0/1 0/0 0/0 .rodata @3922 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3922 = 2500.0f; -COMPILER_STRIP_GATE(80C55A28, &lit_3922); +COMPILER_STRIP_GATE(0x80C55A28, &lit_3922); #pragma pop /* 80C55A2C-80C55A30 00001C 0004+00 0/2 0/0 0/0 .rodata @3923 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3923 = 30.0f; -COMPILER_STRIP_GATE(80C55A2C, &lit_3923); +COMPILER_STRIP_GATE(0x80C55A2C, &lit_3923); #pragma pop /* 80C55A30-80C55A34 000020 0004+00 0/1 0/0 0/0 .rodata @3924 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3924 = -275.0f; -COMPILER_STRIP_GATE(80C55A30, &lit_3924); +COMPILER_STRIP_GATE(0x80C55A30, &lit_3924); #pragma pop /* 80C55A34-80C55A38 000024 0004+00 0/1 0/0 0/0 .rodata @3925 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3925 = 150.0f; -COMPILER_STRIP_GATE(80C55A34, &lit_3925); +COMPILER_STRIP_GATE(0x80C55A34, &lit_3925); #pragma pop /* 80C55A38-80C55A3C 000028 0004+00 0/1 0/0 0/0 .rodata @3926 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3926 = -125.0f; -COMPILER_STRIP_GATE(80C55A38, &lit_3926); +COMPILER_STRIP_GATE(0x80C55A38, &lit_3926); #pragma pop /* 80C55A3C-80C55A40 00002C 0004+00 0/1 0/0 0/0 .rodata @3927 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3927 = 300.0f; -COMPILER_STRIP_GATE(80C55A3C, &lit_3927); +COMPILER_STRIP_GATE(0x80C55A3C, &lit_3927); #pragma pop /* 80C55A40-80C55A44 000030 0004+00 0/1 0/0 0/0 .rodata @3928 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3928 = 75.0f; -COMPILER_STRIP_GATE(80C55A40, &lit_3928); +COMPILER_STRIP_GATE(0x80C55A40, &lit_3928); #pragma pop /* 80C55A44-80C55A48 000034 0004+00 0/1 0/0 0/0 .rodata @3929 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_3929 = 0x3C5A6613; -COMPILER_STRIP_GATE(80C55A44, &lit_3929); +COMPILER_STRIP_GATE(0x80C55A44, &lit_3929); #pragma pop /* 80C55A48-80C55A4C 000038 0004+00 0/1 0/0 0/0 .rodata @3930 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3930 = -0.5f; -COMPILER_STRIP_GATE(80C55A48, &lit_3930); +COMPILER_STRIP_GATE(0x80C55A48, &lit_3930); #pragma pop /* 80C55A4C-80C55A50 00003C 0004+00 0/1 0/0 0/0 .rodata @3931 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3931 = 3.0f; -COMPILER_STRIP_GATE(80C55A4C, &lit_3931); +COMPILER_STRIP_GATE(0x80C55A4C, &lit_3931); #pragma pop /* 80C54374-80C546D8 000254 0364+00 1/1 0/0 0/0 .text hit_check__FP12obj_lp_classP5wd_ss @@ -456,14 +456,14 @@ static asm void hit_check(obj_lp_class* param_0, wd_ss* param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4054 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(80C55A50, &lit_4054); +COMPILER_STRIP_GATE(0x80C55A50, &lit_4054); #pragma pop /* 80C55A54-80C55A58 000044 0004+00 0/3 0/0 0/0 .rodata @4055 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4055 = 1.0f; -COMPILER_STRIP_GATE(80C55A54, &lit_4055); +COMPILER_STRIP_GATE(0x80C55A54, &lit_4055); #pragma pop /* 80C55A58-80C55A60 000048 0004+04 0/1 0/0 0/0 .rodata @4056 */ @@ -474,7 +474,7 @@ SECTION_RODATA static f32 const lit_4056[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80C55A58, &lit_4056); +COMPILER_STRIP_GATE(0x80C55A58, &lit_4056); #pragma pop /* 80C55A60-80C55A68 000050 0008+00 0/3 0/0 0/0 .rodata @4057 */ @@ -483,7 +483,7 @@ COMPILER_STRIP_GATE(80C55A58, &lit_4056); SECTION_RODATA static u8 const lit_4057[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C55A60, &lit_4057); +COMPILER_STRIP_GATE(0x80C55A60, &lit_4057); #pragma pop /* 80C55A68-80C55A70 000058 0008+00 0/3 0/0 0/0 .rodata @4058 */ @@ -492,7 +492,7 @@ COMPILER_STRIP_GATE(80C55A60, &lit_4057); SECTION_RODATA static u8 const lit_4058[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C55A68, &lit_4058); +COMPILER_STRIP_GATE(0x80C55A68, &lit_4058); #pragma pop /* 80C55A70-80C55A78 000060 0008+00 0/3 0/0 0/0 .rodata @4059 */ @@ -501,42 +501,42 @@ COMPILER_STRIP_GATE(80C55A68, &lit_4058); SECTION_RODATA static u8 const lit_4059[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C55A70, &lit_4059); +COMPILER_STRIP_GATE(0x80C55A70, &lit_4059); #pragma pop /* 80C55A78-80C55A7C 000068 0004+00 0/1 0/0 0/0 .rodata @4060 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4060 = 2.0f; -COMPILER_STRIP_GATE(80C55A78, &lit_4060); +COMPILER_STRIP_GATE(0x80C55A78, &lit_4060); #pragma pop /* 80C55A7C-80C55A80 00006C 0004+00 0/1 0/0 0/0 .rodata @4061 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4061 = 1.0f / 25.0f; -COMPILER_STRIP_GATE(80C55A7C, &lit_4061); +COMPILER_STRIP_GATE(0x80C55A7C, &lit_4061); #pragma pop /* 80C55A80-80C55A84 000070 0004+00 0/1 0/0 0/0 .rodata @4062 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4062 = -200.0f; -COMPILER_STRIP_GATE(80C55A80, &lit_4062); +COMPILER_STRIP_GATE(0x80C55A80, &lit_4062); #pragma pop /* 80C55A84-80C55A88 000074 0004+00 0/1 0/0 0/0 .rodata @4063 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4063 = 0x3F7C28F6; -COMPILER_STRIP_GATE(80C55A84, &lit_4063); +COMPILER_STRIP_GATE(0x80C55A84, &lit_4063); #pragma pop /* 80C55A88-80C55A8C 000078 0004+00 0/1 0/0 0/0 .rodata @4064 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4064 = 3.0f / 10.0f; -COMPILER_STRIP_GATE(80C55A88, &lit_4064); +COMPILER_STRIP_GATE(0x80C55A88, &lit_4064); #pragma pop /* 80C546D8-80C54B20 0005B8 0448+00 1/1 0/0 0/0 .text hasu_action__FP12obj_lp_classP5wd_ss */ @@ -554,7 +554,7 @@ static asm void hasu_action(obj_lp_class* param_0, wd_ss* param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4128 = 100.0f; -COMPILER_STRIP_GATE(80C55A8C, &lit_4128); +COMPILER_STRIP_GATE(0x80C55A8C, &lit_4128); #pragma pop /* 80C55A90-80C55A98 000080 0008+00 0/2 0/0 0/0 .rodata @4130 */ @@ -563,7 +563,7 @@ COMPILER_STRIP_GATE(80C55A8C, &lit_4128); SECTION_RODATA static u8 const lit_4130[8] = { 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C55A90, &lit_4130); +COMPILER_STRIP_GATE(0x80C55A90, &lit_4130); #pragma pop /* 80C54B20-80C54D40 000A00 0220+00 1/1 0/0 0/0 .text set_out_check__FP12obj_lp_classP4cXyz */ @@ -581,14 +581,14 @@ static asm void set_out_check(obj_lp_class* param_0, cXyz* param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4218 = 5000.0f; -COMPILER_STRIP_GATE(80C55A98, &lit_4218); +COMPILER_STRIP_GATE(0x80C55A98, &lit_4218); #pragma pop /* 80C55A9C-80C55AA0 00008C 0004+00 0/2 0/0 0/0 .rodata @4219 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4219 = 10.0f; -COMPILER_STRIP_GATE(80C55A9C, &lit_4219); +COMPILER_STRIP_GATE(0x80C55A9C, &lit_4219); #pragma pop /* 80C55AA0-80C55AA8 000090 0008+00 0/1 0/0 0/0 .rodata @4221 */ @@ -597,7 +597,13 @@ COMPILER_STRIP_GATE(80C55A9C, &lit_4219); SECTION_RODATA static u8 const lit_4221[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C55AA0, &lit_4221); +COMPILER_STRIP_GATE(0x80C55AA0, &lit_4221); +#pragma pop + +/* 80C55AC0-80C55AC0 0000B0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80C55AC0 = "D_MN05"; #pragma pop /* 80C54D40-80C550F0 000C20 03B0+00 2/1 0/0 0/0 .text daObj_Lp_Execute__FP12obj_lp_class @@ -617,6 +623,13 @@ static bool daObj_Lp_IsDelete(obj_lp_class* param_0) { return true; } +/* ############################################################################################## */ +/* 80C55AC0-80C55AC0 0000B0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80C55AC7 = "Obj_lp"; +#pragma pop + /* 80C550F8-80C5518C 000FD8 0094+00 1/0 0/0 0/0 .text daObj_Lp_Delete__FP12obj_lp_class */ #pragma push @@ -631,7 +644,7 @@ static asm void daObj_Lp_Delete(obj_lp_class* param_0) { /* ############################################################################################## */ /* 80C55AA8-80C55AAC 000098 0004+00 1/1 0/0 0/0 .rodata @4267 */ SECTION_RODATA static f32 const lit_4267 = 13.0f / 10.0f; -COMPILER_STRIP_GATE(80C55AA8, &lit_4267); +COMPILER_STRIP_GATE(0x80C55AA8, &lit_4267); /* 80C5518C-80C552C0 00106C 0134+00 1/1 0/0 0/0 .text useHeapInit__FP10fopAc_ac_c */ #pragma push @@ -648,14 +661,14 @@ static asm void useHeapInit(fopAc_ac_c* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4320 = 35.0f; -COMPILER_STRIP_GATE(80C55AAC, &lit_4320); +COMPILER_STRIP_GATE(0x80C55AAC, &lit_4320); #pragma pop /* 80C55AB0-80C55AB4 0000A0 0004+00 0/2 0/0 0/0 .rodata @4321 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4321 = 1.5f; -COMPILER_STRIP_GATE(80C55AB0, &lit_4321); +COMPILER_STRIP_GATE(0x80C55AB0, &lit_4321); #pragma pop /* 80C552C0-80C55488 0011A0 01C8+00 1/1 0/0 0/0 .text set_pos_check__FP12obj_lp_classi */ @@ -673,21 +686,27 @@ static asm void set_pos_check(obj_lp_class* param_0, int param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4457 = -100.0f; -COMPILER_STRIP_GATE(80C55AB4, &lit_4457); +COMPILER_STRIP_GATE(0x80C55AB4, &lit_4457); #pragma pop /* 80C55AB8-80C55ABC 0000A8 0004+00 0/1 0/0 0/0 .rodata @4458 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4458 = 65536.0f; -COMPILER_STRIP_GATE(80C55AB8, &lit_4458); +COMPILER_STRIP_GATE(0x80C55AB8, &lit_4458); #pragma pop /* 80C55ABC-80C55AC0 0000AC 0004+00 0/1 0/0 0/0 .rodata @4459 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4459 = 200.0f; -COMPILER_STRIP_GATE(80C55ABC, &lit_4459); +COMPILER_STRIP_GATE(0x80C55ABC, &lit_4459); +#pragma pop + +/* 80C55AC0-80C55AC0 0000B0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80C55ACE = "F_SP127"; #pragma pop /* 80C55ADC-80C55AFC -00001 0020+00 1/0 0/0 0/0 .data l_daObj_Lp_Method */ @@ -914,11 +933,4 @@ static u8 data_80C55C10[4]; static u8 data_80C55C14[4]; #pragma pop -/* 80C55AC0-80C55AD6 0000B0 0016+00 4/4 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80C55AC0 = "D_MN05"; -SECTION_DEAD static char const* const stringBase_80C55AC7 = "Obj_lp"; -SECTION_DEAD static char const* const stringBase_80C55ACE = "F_SP127"; -#pragma pop +/* 80C55AC0-80C55AC0 0000B0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_lv1Candle00/d_a_obj_lv1Candle00.cpp b/rel/d/a/obj/d_a_obj_lv1Candle00/d_a_obj_lv1Candle00.cpp index b54abb77c99..b9147e98088 100644 --- a/rel/d/a/obj/d_a_obj_lv1Candle00/d_a_obj_lv1Candle00.cpp +++ b/rel/d/a/obj/d_a_obj_lv1Candle00/d_a_obj_lv1Candle00.cpp @@ -128,10 +128,10 @@ struct Z2SoundObjBase { /* 802BE4A4 */ void startCollisionSE(u32, u32, Z2SoundObjBase*); }; -struct Vec {}; - struct JAISoundID {}; +struct Vec {}; + struct Z2SeMgr { /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); /* 802AC50C */ void seStartLevel(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); @@ -331,6 +331,13 @@ asm void daLv1Cdl00_c::setBaseMtx() { } #pragma pop +/* ############################################################################################## */ +/* 80C56AB4-80C56AB4 000064 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80C56AB4 = "lv1cdl00"; +#pragma pop + /* 80C55E08-80C55E74 0001E8 006C+00 1/1 0/0 0/0 .text CreateHeap__12daLv1Cdl00_cFv */ #pragma push #pragma optimization_level 0 @@ -348,11 +355,11 @@ SECTION_RODATA u8 const daLv1Cdl00_c::mCcDObjInfo[48] = { 0xD8, 0xFB, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x1F, 0x00, 0x00, 0x00, 0x79, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C56A50, &daLv1Cdl00_c::mCcDObjInfo); +COMPILER_STRIP_GATE(0x80C56A50, &daLv1Cdl00_c::mCcDObjInfo); /* 80C56A80-80C56A84 000030 0004+00 1/1 0/0 0/0 .rodata @3753 */ SECTION_RODATA static f32 const lit_3753 = 120.0f; -COMPILER_STRIP_GATE(80C56A80, &lit_3753); +COMPILER_STRIP_GATE(0x80C56A80, &lit_3753); /* 80C55E74-80C56110 000254 029C+00 1/1 0/0 0/0 .text create__12daLv1Cdl00_cFv */ #pragma push @@ -400,21 +407,21 @@ asm void daLv1Cdl00_c::createHeapCallBack(fopAc_ac_c* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3847 = 10.0f; -COMPILER_STRIP_GATE(80C56A84, &lit_3847); +COMPILER_STRIP_GATE(0x80C56A84, &lit_3847); #pragma pop /* 80C56A88-80C56A8C 000038 0004+00 0/1 0/0 0/0 .rodata @3848 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3848 = 500.0f; -COMPILER_STRIP_GATE(80C56A88, &lit_3848); +COMPILER_STRIP_GATE(0x80C56A88, &lit_3848); #pragma pop /* 80C56A8C-80C56A90 00003C 0004+00 0/3 0/0 0/0 .rodata @3849 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3849 = 1.0f; -COMPILER_STRIP_GATE(80C56A8C, &lit_3849); +COMPILER_STRIP_GATE(0x80C56A8C, &lit_3849); #pragma pop /* 80C56A90-80C56A94 000040 0004+00 0/3 0/0 0/0 .rodata @3850 */ @@ -426,7 +433,7 @@ SECTION_RODATA static u8 const lit_3850[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C56A90, &lit_3850); +COMPILER_STRIP_GATE(0x80C56A90, &lit_3850); #pragma pop /* 80C561C0-80C56268 0005A0 00A8+00 1/1 0/0 0/0 .text lightInit__12daLv1Cdl00_cFv */ @@ -464,35 +471,35 @@ asm void daLv1Cdl00_c::cutLight() { #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_3872 = 0xBC6642FF; -COMPILER_STRIP_GATE(80C56A94, &lit_3872); +COMPILER_STRIP_GATE(0x80C56A94, &lit_3872); #pragma pop /* 80C56A98-80C56A9C 000048 0004+00 0/1 0/0 0/0 .rodata @3880 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3880 = 0.5f; -COMPILER_STRIP_GATE(80C56A98, &lit_3880); +COMPILER_STRIP_GATE(0x80C56A98, &lit_3880); #pragma pop /* 80C56A9C-80C56AA0 00004C 0004+00 0/1 0/0 0/0 .rodata @3881 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3881 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(80C56A9C, &lit_3881); +COMPILER_STRIP_GATE(0x80C56A9C, &lit_3881); #pragma pop /* 80C56AA0-80C56AA4 000050 0004+00 0/1 0/0 0/0 .rodata @3882 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_3882 = 0x38D1B717; -COMPILER_STRIP_GATE(80C56AA0, &lit_3882); +COMPILER_STRIP_GATE(0x80C56AA0, &lit_3882); #pragma pop /* 80C56AA4-80C56AA8 000054 0004+00 0/1 0/0 0/0 .rodata @3883 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_3883 = 0x358637BD; -COMPILER_STRIP_GATE(80C56AA4, &lit_3883); +COMPILER_STRIP_GATE(0x80C56AA4, &lit_3883); #pragma pop /* 80C562D8-80C56388 0006B8 00B0+00 1/1 0/0 0/0 .text pointLightProc__12daLv1Cdl00_cFv */ @@ -510,21 +517,21 @@ asm void daLv1Cdl00_c::pointLightProc() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4006 = -1.0f; -COMPILER_STRIP_GATE(80C56AA8, &lit_4006); +COMPILER_STRIP_GATE(0x80C56AA8, &lit_4006); #pragma pop /* 80C56AAC-80C56AB0 00005C 0004+00 0/1 0/0 0/0 .rodata @4007 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4007 = 25.0f; -COMPILER_STRIP_GATE(80C56AAC, &lit_4007); +COMPILER_STRIP_GATE(0x80C56AAC, &lit_4007); #pragma pop /* 80C56AB0-80C56AB4 000060 0004+00 0/1 0/0 0/0 .rodata @4008 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4008 = 130.0f; -COMPILER_STRIP_GATE(80C56AB0, &lit_4008); +COMPILER_STRIP_GATE(0x80C56AB0, &lit_4008); #pragma pop /* 80C56388-80C567EC 000768 0464+00 1/1 0/0 0/0 .text Execute__12daLv1Cdl00_cFv */ @@ -629,12 +636,7 @@ asm void __sinit_d_a_obj_lv1Candle00_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80C569CC = (void*)__sinit_d_a_obj_lv1Candle00_cpp; +REGISTER_CTORS(0x80C569CC, __sinit_d_a_obj_lv1Candle00_cpp); #pragma pop -/* 80C56AB4-80C56ABD 000064 0009+00 3/4 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80C56AB4 = "lv1cdl00"; -#pragma pop +/* 80C56AB4-80C56AB4 000064 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_lv1Candle01/d_a_obj_lv1Candle01.cpp b/rel/d/a/obj/d_a_obj_lv1Candle01/d_a_obj_lv1Candle01.cpp index c0dae6fddd2..857cb034a68 100644 --- a/rel/d/a/obj/d_a_obj_lv1Candle01/d_a_obj_lv1Candle01.cpp +++ b/rel/d/a/obj/d_a_obj_lv1Candle01/d_a_obj_lv1Candle01.cpp @@ -139,10 +139,10 @@ struct Z2SoundObjBase { /* 802BE4A4 */ void startCollisionSE(u32, u32, Z2SoundObjBase*); }; -struct Vec {}; - struct JAISoundID {}; +struct Vec {}; + struct Z2SeMgr { /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); /* 802AC50C */ void seStartLevel(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); @@ -359,6 +359,13 @@ asm void daLv1Cdl01_c::setBaseMtx() { } #pragma pop +/* ############################################################################################## */ +/* 80C578C0-80C578C0 000064 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80C578C0 = "lv1cdl01"; +#pragma pop + /* 80C56DA8-80C56E14 0001E8 006C+00 1/0 0/0 0/0 .text CreateHeap__12daLv1Cdl01_cFv */ #pragma push #pragma optimization_level 0 @@ -376,11 +383,11 @@ SECTION_RODATA u8 const daLv1Cdl01_c::mCcDObjInfo[48] = { 0xD8, 0xFB, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x1F, 0x00, 0x00, 0x00, 0x79, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C5785C, &daLv1Cdl01_c::mCcDObjInfo); +COMPILER_STRIP_GATE(0x80C5785C, &daLv1Cdl01_c::mCcDObjInfo); /* 80C5788C-80C57890 000030 0004+00 1/1 0/0 0/0 .rodata @3723 */ SECTION_RODATA static f32 const lit_3723 = 120.0f; -COMPILER_STRIP_GATE(80C5788C, &lit_3723); +COMPILER_STRIP_GATE(0x80C5788C, &lit_3723); /* 80C56E14-80C57048 000254 0234+00 1/1 0/0 0/0 .text create__12daLv1Cdl01_cFv */ #pragma push @@ -417,21 +424,21 @@ asm cM3dGAab::~cM3dGAab() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3811 = 10.0f; -COMPILER_STRIP_GATE(80C57890, &lit_3811); +COMPILER_STRIP_GATE(0x80C57890, &lit_3811); #pragma pop /* 80C57894-80C57898 000038 0004+00 0/1 0/0 0/0 .rodata @3812 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3812 = 500.0f; -COMPILER_STRIP_GATE(80C57894, &lit_3812); +COMPILER_STRIP_GATE(0x80C57894, &lit_3812); #pragma pop /* 80C57898-80C5789C 00003C 0004+00 0/3 0/0 0/0 .rodata @3813 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3813 = 1.0f; -COMPILER_STRIP_GATE(80C57898, &lit_3813); +COMPILER_STRIP_GATE(0x80C57898, &lit_3813); #pragma pop /* 80C5789C-80C578A0 000040 0004+00 0/3 0/0 0/0 .rodata @3814 */ @@ -443,7 +450,7 @@ SECTION_RODATA static u8 const lit_3814[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C5789C, &lit_3814); +COMPILER_STRIP_GATE(0x80C5789C, &lit_3814); #pragma pop /* 80C570D8-80C57164 000518 008C+00 1/1 0/0 0/0 .text lightInit__12daLv1Cdl01_cFv */ @@ -481,35 +488,35 @@ asm void daLv1Cdl01_c::cutLight() { #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_3832 = 0xBC6642FF; -COMPILER_STRIP_GATE(80C578A0, &lit_3832); +COMPILER_STRIP_GATE(0x80C578A0, &lit_3832); #pragma pop /* 80C578A4-80C578A8 000048 0004+00 0/1 0/0 0/0 .rodata @3840 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3840 = 0.5f; -COMPILER_STRIP_GATE(80C578A4, &lit_3840); +COMPILER_STRIP_GATE(0x80C578A4, &lit_3840); #pragma pop /* 80C578A8-80C578AC 00004C 0004+00 0/1 0/0 0/0 .rodata @3841 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3841 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(80C578A8, &lit_3841); +COMPILER_STRIP_GATE(0x80C578A8, &lit_3841); #pragma pop /* 80C578AC-80C578B0 000050 0004+00 0/1 0/0 0/0 .rodata @3842 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_3842 = 0x38D1B717; -COMPILER_STRIP_GATE(80C578AC, &lit_3842); +COMPILER_STRIP_GATE(0x80C578AC, &lit_3842); #pragma pop /* 80C578B0-80C578B4 000054 0004+00 0/1 0/0 0/0 .rodata @3843 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_3843 = 0x358637BD; -COMPILER_STRIP_GATE(80C578B0, &lit_3843); +COMPILER_STRIP_GATE(0x80C578B0, &lit_3843); #pragma pop /* 80C571C4-80C57274 000604 00B0+00 1/1 0/0 0/0 .text pointLightProc__12daLv1Cdl01_cFv */ @@ -527,21 +534,21 @@ asm void daLv1Cdl01_c::pointLightProc() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3914 = -1.0f; -COMPILER_STRIP_GATE(80C578B4, &lit_3914); +COMPILER_STRIP_GATE(0x80C578B4, &lit_3914); #pragma pop /* 80C578B8-80C578BC 00005C 0004+00 0/1 0/0 0/0 .rodata @3915 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3915 = 25.0f; -COMPILER_STRIP_GATE(80C578B8, &lit_3915); +COMPILER_STRIP_GATE(0x80C578B8, &lit_3915); #pragma pop /* 80C578BC-80C578C0 000060 0004+00 0/1 0/0 0/0 .rodata @3916 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3916 = 130.0f; -COMPILER_STRIP_GATE(80C578BC, &lit_3916); +COMPILER_STRIP_GATE(0x80C578BC, &lit_3916); #pragma pop /* 80C57274-80C575F4 0006B4 0380+00 1/0 0/0 0/0 .text Execute__12daLv1Cdl01_cFPPA3_A4_f @@ -647,12 +654,7 @@ asm void __sinit_d_a_obj_lv1Candle01_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80C577D8 = (void*)__sinit_d_a_obj_lv1Candle01_cpp; +REGISTER_CTORS(0x80C577D8, __sinit_d_a_obj_lv1Candle01_cpp); #pragma pop -/* 80C578C0-80C578C9 000064 0009+00 3/4 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80C578C0 = "lv1cdl01"; -#pragma pop +/* 80C578C0-80C578C0 000064 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_lv2candle/d_a_obj_lv2Candle.cpp b/rel/d/a/obj/d_a_obj_lv2candle/d_a_obj_lv2Candle.cpp index d34af6c1f1b..c8eba6f032e 100644 --- a/rel/d/a/obj/d_a_obj_lv2candle/d_a_obj_lv2Candle.cpp +++ b/rel/d/a/obj/d_a_obj_lv2candle/d_a_obj_lv2Candle.cpp @@ -130,10 +130,10 @@ struct Z2SoundObjBase { /* 802BE4A4 */ void startCollisionSE(u32, u32, Z2SoundObjBase*); }; -struct Vec {}; - struct JAISoundID {}; +struct Vec {}; + struct Z2SeMgr { /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); /* 802AC50C */ void seStartLevel(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); @@ -250,34 +250,42 @@ extern "C" void __register_global_object(); /* ############################################################################################## */ /* 8058F130-8058F134 000000 0004+00 4/4 0/0 0/0 .rodata @3637 */ SECTION_RODATA static f32 const lit_3637 = 500.0f; -COMPILER_STRIP_GATE(8058F130, &lit_3637); +COMPILER_STRIP_GATE(0x8058F130, &lit_3637); /* 8058F134-8058F138 000004 0004+00 0/1 0/0 0/0 .rodata @3638 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3638 = 19.0f / 20.0f; -COMPILER_STRIP_GATE(8058F134, &lit_3638); +COMPILER_STRIP_GATE(0x8058F134, &lit_3638); #pragma pop /* 8058F138-8058F13C 000008 0004+00 0/4 0/0 0/0 .rodata @3639 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3639 = 1.0f; -COMPILER_STRIP_GATE(8058F138, &lit_3639); +COMPILER_STRIP_GATE(0x8058F138, &lit_3639); #pragma pop /* 8058F13C-8058F140 00000C 0004+00 0/1 0/0 0/0 .rodata @3640 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3640 = 4.0f / 5.0f; -COMPILER_STRIP_GATE(8058F13C, &lit_3640); +COMPILER_STRIP_GATE(0x8058F13C, &lit_3640); #pragma pop /* 8058F140-8058F144 000010 0004+00 0/2 0/0 0/0 .rodata @3641 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3641 = 3.0f / 100.0f; -COMPILER_STRIP_GATE(8058F140, &lit_3641); +COMPILER_STRIP_GATE(0x8058F140, &lit_3641); +#pragma pop + +/* 8058F1AC-8058F1AC 00007C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8058F1AC = "L2candl"; +SECTION_DEAD static char const* const stringBase_8058F1B4 = "L4candl"; +SECTION_DEAD static char const* const stringBase_8058F1BC = "L9Candle"; #pragma pop /* 8058F1C8-8058F20C 000000 0044+00 2/2 0/0 0/0 .data mCcDCyl__13daLv2Candle_c */ @@ -383,13 +391,13 @@ SECTION_RODATA u8 const daLv2Candle_c::mCcDObjInfo[48] = { 0xD8, 0xFB, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x1F, 0x00, 0x00, 0x00, 0x79, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8058F144, &daLv2Candle_c::mCcDObjInfo); +COMPILER_STRIP_GATE(0x8058F144, &daLv2Candle_c::mCcDObjInfo); /* 8058F174-8058F180 000044 000C+00 1/1 0/0 0/0 .rodata l_bmdIdx */ SECTION_RODATA static u8 const l_bmdIdx[12] = { 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x03, }; -COMPILER_STRIP_GATE(8058F174, &l_bmdIdx); +COMPILER_STRIP_GATE(0x8058F174, &l_bmdIdx); /* 8058E1C4-8058E244 000264 0080+00 1/1 0/0 0/0 .text CreateHeap__13daLv2Candle_cFv */ #pragma push @@ -404,7 +412,7 @@ asm void daLv2Candle_c::CreateHeap() { /* ############################################################################################## */ /* 8058F180-8058F184 000050 0004+00 1/1 0/0 0/0 .rodata @3778 */ SECTION_RODATA static f32 const lit_3778 = 135.0f; -COMPILER_STRIP_GATE(8058F180, &lit_3778); +COMPILER_STRIP_GATE(0x8058F180, &lit_3778); /* 8058E244-8058E52C 0002E4 02E8+00 1/1 0/0 0/0 .text create__13daLv2Candle_cFv */ #pragma push @@ -472,7 +480,7 @@ asm void daLv2Candle_c::searchDemoTagAct(void* param_0, void* param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3888 = 10.0f; -COMPILER_STRIP_GATE(8058F184, &lit_3888); +COMPILER_STRIP_GATE(0x8058F184, &lit_3888); #pragma pop /* 8058F188-8058F18C 000058 0004+00 0/3 0/0 0/0 .rodata @3889 */ @@ -484,7 +492,7 @@ SECTION_RODATA static u8 const lit_3889[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(8058F188, &lit_3889); +COMPILER_STRIP_GATE(0x8058F188, &lit_3889); #pragma pop /* 8058F2A0-8058F2AC 000008 000C+00 1/1 0/0 0/0 .bss @3631 */ @@ -528,35 +536,35 @@ asm void daLv2Candle_c::cutLight() { #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_3918 = 0x000000FF; -COMPILER_STRIP_GATE(8058F18C, &lit_3918); +COMPILER_STRIP_GATE(0x8058F18C, &lit_3918); #pragma pop /* 8058F190-8058F194 000060 0004+00 0/1 0/0 0/0 .rodata @3936 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_3936 = 0x38D1B717; -COMPILER_STRIP_GATE(8058F190, &lit_3936); +COMPILER_STRIP_GATE(0x8058F190, &lit_3936); #pragma pop /* 8058F194-8058F198 000064 0004+00 0/1 0/0 0/0 .rodata @3937 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3937 = 0.5f; -COMPILER_STRIP_GATE(8058F194, &lit_3937); +COMPILER_STRIP_GATE(0x8058F194, &lit_3937); #pragma pop /* 8058F198-8058F19C 000068 0004+00 0/1 0/0 0/0 .rodata @3938 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3938 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(8058F198, &lit_3938); +COMPILER_STRIP_GATE(0x8058F198, &lit_3938); #pragma pop /* 8058F19C-8058F1A0 00006C 0004+00 0/1 0/0 0/0 .rodata @3939 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_3939 = 0x358637BD; -COMPILER_STRIP_GATE(8058F19C, &lit_3939); +COMPILER_STRIP_GATE(0x8058F19C, &lit_3939); #pragma pop /* 8058E780-8058E99C 000820 021C+00 1/1 0/0 0/0 .text pointLightProc__13daLv2Candle_cFv @@ -575,21 +583,21 @@ asm void daLv2Candle_c::pointLightProc() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4097 = -1.0f; -COMPILER_STRIP_GATE(8058F1A0, &lit_4097); +COMPILER_STRIP_GATE(0x8058F1A0, &lit_4097); #pragma pop /* 8058F1A4-8058F1A8 000074 0004+00 0/1 0/0 0/0 .rodata @4098 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4098 = 25.0f; -COMPILER_STRIP_GATE(8058F1A4, &lit_4098); +COMPILER_STRIP_GATE(0x8058F1A4, &lit_4098); #pragma pop /* 8058F1A8-8058F1AC 000078 0004+00 0/1 0/0 0/0 .rodata @4099 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4099 = 160.0f; -COMPILER_STRIP_GATE(8058F1A8, &lit_4099); +COMPILER_STRIP_GATE(0x8058F1A8, &lit_4099); #pragma pop /* 8058E99C-8058EEC8 000A3C 052C+00 1/1 0/0 0/0 .text Execute__13daLv2Candle_cFv */ @@ -686,14 +694,7 @@ asm void __sinit_d_a_obj_lv2Candle_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_8058F0AC = (void*)__sinit_d_a_obj_lv2Candle_cpp; +REGISTER_CTORS(0x8058F0AC, __sinit_d_a_obj_lv2Candle_cpp); #pragma pop -/* 8058F1AC-8058F1C5 00007C 0019+00 1/1 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_8058F1AC = "L2candl"; -SECTION_DEAD static char const* const stringBase_8058F1B4 = "L4candl"; -SECTION_DEAD static char const* const stringBase_8058F1BC = "L9Candle"; -#pragma pop +/* 8058F1AC-8058F1AC 00007C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_lv3Candle/d_a_obj_lv3Candle.cpp b/rel/d/a/obj/d_a_obj_lv3Candle/d_a_obj_lv3Candle.cpp index da8fc70e2a4..eb20c399c18 100644 --- a/rel/d/a/obj/d_a_obj_lv3Candle/d_a_obj_lv3Candle.cpp +++ b/rel/d/a/obj/d_a_obj_lv3Candle/d_a_obj_lv3Candle.cpp @@ -119,10 +119,10 @@ struct Z2SoundObjBase { /* 802BE4A4 */ void startCollisionSE(u32, u32, Z2SoundObjBase*); }; -struct Vec {}; - struct JAISoundID {}; +struct Vec {}; + struct Z2SeMgr { /* 802AC50C */ void seStartLevel(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); }; @@ -229,6 +229,13 @@ extern "C" void __register_global_object(); // /* ############################################################################################## */ +/* 80C585DC-80C585DC 000078 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80C585DC = "L3candl"; +SECTION_DEAD static char const* const stringBase_80C585E4 = "L3candl2"; +#pragma pop + /* 80C585F0-80C58630 000000 0040+00 2/2 0/0 0/0 .data mCcDSph__13daLv3Candle_c */ SECTION_DATA u8 daLv3Candle_c::mCcDSph[64] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -330,13 +337,13 @@ SECTION_RODATA u8 const daLv3Candle_c::mCcDObjInfo[48] = { 0xD8, 0xFB, 0xFD, 0xFF, 0x00, 0x00, 0x00, 0x1F, 0x00, 0x00, 0x00, 0x79, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C58564, &daLv3Candle_c::mCcDObjInfo); +COMPILER_STRIP_GATE(0x80C58564, &daLv3Candle_c::mCcDObjInfo); /* 80C58594-80C5859C 000030 0008+00 1/1 0/0 0/0 .rodata l_bmdIdx */ SECTION_RODATA static u8 const l_bmdIdx[8] = { 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x03, }; -COMPILER_STRIP_GATE(80C58594, &l_bmdIdx); +COMPILER_STRIP_GATE(0x80C58594, &l_bmdIdx); /* 80C57BC0-80C57C40 0001E0 0080+00 1/1 0/0 0/0 .text CreateHeap__13daLv3Candle_cFv */ #pragma push @@ -358,28 +365,28 @@ SECTION_RODATA static u8 const lit_3753[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C5859C, &lit_3753); +COMPILER_STRIP_GATE(0x80C5859C, &lit_3753); #pragma pop /* 80C585A0-80C585A4 00003C 0004+00 0/1 0/0 0/0 .rodata @3754 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3754 = 20.0f; -COMPILER_STRIP_GATE(80C585A0, &lit_3754); +COMPILER_STRIP_GATE(0x80C585A0, &lit_3754); #pragma pop /* 80C585A4-80C585A8 000040 0004+00 0/1 0/0 0/0 .rodata @3755 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3755 = 125.0f; -COMPILER_STRIP_GATE(80C585A4, &lit_3755); +COMPILER_STRIP_GATE(0x80C585A4, &lit_3755); #pragma pop /* 80C585A8-80C585AC 000044 0004+00 0/2 0/0 0/0 .rodata @3756 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3756 = 200.0f; -COMPILER_STRIP_GATE(80C585A8, &lit_3756); +COMPILER_STRIP_GATE(0x80C585A8, &lit_3756); #pragma pop /* 80C57C40-80C57EDC 000260 029C+00 1/1 0/0 0/0 .text create__13daLv3Candle_cFv */ @@ -428,21 +435,21 @@ asm void daLv3Candle_c::createHeapCallBack(fopAc_ac_c* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3846 = 10.0f; -COMPILER_STRIP_GATE(80C585AC, &lit_3846); +COMPILER_STRIP_GATE(0x80C585AC, &lit_3846); #pragma pop /* 80C585B0-80C585B4 00004C 0004+00 0/1 0/0 0/0 .rodata @3847 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3847 = 500.0f; -COMPILER_STRIP_GATE(80C585B0, &lit_3847); +COMPILER_STRIP_GATE(0x80C585B0, &lit_3847); #pragma pop /* 80C585B4-80C585B8 000050 0004+00 0/3 0/0 0/0 .rodata @3848 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3848 = 1.0f; -COMPILER_STRIP_GATE(80C585B4, &lit_3848); +COMPILER_STRIP_GATE(0x80C585B4, &lit_3848); #pragma pop /* 80C57F8C-80C58018 0005AC 008C+00 1/1 0/0 0/0 .text lightInit__13daLv3Candle_cFv */ @@ -460,35 +467,35 @@ asm void daLv3Candle_c::lightInit() { #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_3866 = 0xBC6642FF; -COMPILER_STRIP_GATE(80C585B8, &lit_3866); +COMPILER_STRIP_GATE(0x80C585B8, &lit_3866); #pragma pop /* 80C585BC-80C585C0 000058 0004+00 0/1 0/0 0/0 .rodata @3871 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3871 = 0.5f; -COMPILER_STRIP_GATE(80C585BC, &lit_3871); +COMPILER_STRIP_GATE(0x80C585BC, &lit_3871); #pragma pop /* 80C585C0-80C585C4 00005C 0004+00 0/1 0/0 0/0 .rodata @3872 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3872 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(80C585C0, &lit_3872); +COMPILER_STRIP_GATE(0x80C585C0, &lit_3872); #pragma pop /* 80C585C4-80C585C8 000060 0004+00 0/1 0/0 0/0 .rodata @3873 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_3873 = 0x38D1B717; -COMPILER_STRIP_GATE(80C585C4, &lit_3873); +COMPILER_STRIP_GATE(0x80C585C4, &lit_3873); #pragma pop /* 80C585C8-80C585CC 000064 0004+00 0/1 0/0 0/0 .rodata @3874 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_3874 = 0x358637BD; -COMPILER_STRIP_GATE(80C585C8, &lit_3874); +COMPILER_STRIP_GATE(0x80C585C8, &lit_3874); #pragma pop /* 80C58018-80C580A0 000638 0088+00 1/1 0/0 0/0 .text pointLightProc__13daLv3Candle_cFv @@ -507,28 +514,28 @@ asm void daLv3Candle_c::pointLightProc() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3922 = -1.0f; -COMPILER_STRIP_GATE(80C585CC, &lit_3922); +COMPILER_STRIP_GATE(0x80C585CC, &lit_3922); #pragma pop /* 80C585D0-80C585D4 00006C 0004+00 0/1 0/0 0/0 .rodata @3923 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3923 = 90.0f; -COMPILER_STRIP_GATE(80C585D0, &lit_3923); +COMPILER_STRIP_GATE(0x80C585D0, &lit_3923); #pragma pop /* 80C585D4-80C585D8 000070 0004+00 0/1 0/0 0/0 .rodata @3924 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3924 = 70.0f; -COMPILER_STRIP_GATE(80C585D4, &lit_3924); +COMPILER_STRIP_GATE(0x80C585D4, &lit_3924); #pragma pop /* 80C585D8-80C585DC 000074 0004+00 0/1 0/0 0/0 .rodata @3925 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3925 = 60.0f; -COMPILER_STRIP_GATE(80C585D8, &lit_3925); +COMPILER_STRIP_GATE(0x80C585D8, &lit_3925); #pragma pop /* 80C580A0-80C582FC 0006C0 025C+00 1/1 0/0 0/0 .text Execute__13daLv3Candle_cFv */ @@ -632,13 +639,7 @@ asm void __sinit_d_a_obj_lv3Candle_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80C584E0 = (void*)__sinit_d_a_obj_lv3Candle_cpp; +REGISTER_CTORS(0x80C584E0, __sinit_d_a_obj_lv3Candle_cpp); #pragma pop -/* 80C585DC-80C585ED 000078 0011+00 1/1 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80C585DC = "L3candl"; -SECTION_DEAD static char const* const stringBase_80C585E4 = "L3candl2"; -#pragma pop +/* 80C585DC-80C585DC 000078 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_lv3Water/d_a_obj_lv3Water.cpp b/rel/d/a/obj/d_a_obj_lv3Water/d_a_obj_lv3Water.cpp index 59f411d2226..888684757d5 100644 --- a/rel/d/a/obj/d_a_obj_lv3Water/d_a_obj_lv3Water.cpp +++ b/rel/d/a/obj/d_a_obj_lv3Water/d_a_obj_lv3Water.cpp @@ -83,10 +83,10 @@ struct dRes_control_c { struct dPa_levelEcallBack {}; -struct _GXColor {}; - struct csXyz {}; +struct _GXColor {}; + struct dPa_control_c { /* 8004D4CC */ void set(u32, u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, @@ -130,10 +130,10 @@ struct cBgS { /* 80074250 */ void Release(dBgW_Base*); }; -struct Vec {}; - struct JAISoundID {}; +struct Vec {}; + struct Z2SeMgr { /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); }; @@ -251,6 +251,32 @@ extern "C" void __register_global_object(); // /* ############################################################################################## */ +/* 80C5A068-80C5A068 0001F8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80C5A068 = "Kr10water"; +SECTION_DEAD static char const* const stringBase_80C5A072 = "Kr10wat01"; +SECTION_DEAD static char const* const stringBase_80C5A07C = "Kr02wat00"; +SECTION_DEAD static char const* const stringBase_80C5A086 = "Kr03wat00"; +SECTION_DEAD static char const* const stringBase_80C5A090 = "Kr03wat01"; +SECTION_DEAD static char const* const stringBase_80C5A09A = "Kr03wat02"; +SECTION_DEAD static char const* const stringBase_80C5A0A4 = "Kr03wat03"; +SECTION_DEAD static char const* const stringBase_80C5A0AE = "Kr03wat04"; +SECTION_DEAD static char const* const stringBase_80C5A0B8 = "Kr07wat00"; +SECTION_DEAD static char const* const stringBase_80C5A0C2 = "Kr08wat00"; +SECTION_DEAD static char const* const stringBase_80C5A0CC = "Kr08wat01"; +SECTION_DEAD static char const* const stringBase_80C5A0D6 = "Kr02wat01"; +SECTION_DEAD static char const* const stringBase_80C5A0E0 = "Kr02wat02"; +SECTION_DEAD static char const* const stringBase_80C5A0EA = "Kr02wat03"; +SECTION_DEAD static char const* const stringBase_80C5A0F4 = "Kr11wat00"; +SECTION_DEAD static char const* const stringBase_80C5A0FE = "Kr12wat00"; +SECTION_DEAD static char const* const stringBase_80C5A108 = "Kr13wat00"; +SECTION_DEAD static char const* const stringBase_80C5A112 = "Kr13wat01"; +SECTION_DEAD static char const* const stringBase_80C5A11C = "Kr13wat02"; +SECTION_DEAD static char const* const stringBase_80C5A126 = "Kr03wat05"; +SECTION_DEAD static char const* const stringBase_80C5A130 = "Kr03wat06"; +#pragma pop + /* 80C5A13C-80C5A148 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -457,7 +483,7 @@ SECTION_RODATA static u8 const l_bmdIdx[84] = { 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x05, }; -COMPILER_STRIP_GATE(80C59E70, &l_bmdIdx); +COMPILER_STRIP_GATE(0x80C59E70, &l_bmdIdx); /* 80C59EC4-80C59F18 000054 0054+00 1/1 0/0 0/0 .rodata l_dzbIdx */ SECTION_RODATA static u8 const l_dzbIdx[84] = { @@ -468,7 +494,7 @@ SECTION_RODATA static u8 const l_dzbIdx[84] = { 0x00, 0x00, 0x00, 0x0D, 0x00, 0x00, 0x00, 0x0D, 0x00, 0x00, 0x00, 0x0D, 0x00, 0x00, 0x00, 0x0D, 0x00, 0x00, 0x00, 0x0D, 0x00, 0x00, 0x00, 0x0B, 0x00, 0x00, 0x00, 0x0B, }; -COMPILER_STRIP_GATE(80C59EC4, &l_dzbIdx); +COMPILER_STRIP_GATE(0x80C59EC4, &l_dzbIdx); /* 80C59F18-80C59F6C 0000A8 0054+00 0/1 0/0 0/0 .rodata l_btkIdx */ #pragma push @@ -481,7 +507,7 @@ SECTION_RODATA static u8 const l_btkIdx[84] = { 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x08, }; -COMPILER_STRIP_GATE(80C59F18, &l_btkIdx); +COMPILER_STRIP_GATE(0x80C59F18, &l_btkIdx); #pragma pop /* 80C59F6C-80C59FC0 0000FC 0054+00 0/1 0/0 0/0 .rodata l_bmdIdrIdx */ @@ -495,7 +521,7 @@ SECTION_RODATA static u8 const l_bmdIdrIdx[84] = { 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x06, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, }; -COMPILER_STRIP_GATE(80C59F6C, &l_bmdIdrIdx); +COMPILER_STRIP_GATE(0x80C59F6C, &l_bmdIdrIdx); #pragma pop /* 80C59FC0-80C5A014 000150 0054+00 0/1 0/0 0/0 .rodata l_btkIdrIdx */ @@ -509,12 +535,12 @@ SECTION_RODATA static u8 const l_btkIdrIdx[84] = { 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x0A, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, }; -COMPILER_STRIP_GATE(80C59FC0, &l_btkIdrIdx); +COMPILER_STRIP_GATE(0x80C59FC0, &l_btkIdrIdx); #pragma pop /* 80C5A014-80C5A018 0001A4 0004+00 3/5 0/0 0/0 .rodata @3737 */ SECTION_RODATA static f32 const lit_3737 = 1.0f; -COMPILER_STRIP_GATE(80C5A014, &lit_3737); +COMPILER_STRIP_GATE(0x80C5A014, &lit_3737); /* 80C5891C-80C58ABC 00023C 01A0+00 1/0 0/0 0/0 .text CreateHeap__12daLv3Water_cFv */ #pragma push @@ -579,13 +605,13 @@ SECTION_RODATA static u8 const estimateSizeTbl[42 + 6 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C5A018, &estimateSizeTbl); +COMPILER_STRIP_GATE(0x80C5A018, &estimateSizeTbl); /* 80C5A048-80C5A050 0001D8 0008+00 1/1 0/0 0/0 .rodata @3812 */ SECTION_RODATA static u8 const lit_3812[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C5A048, &lit_3812); +COMPILER_STRIP_GATE(0x80C5A048, &lit_3812); /* 80C58ABC-80C58D20 0003DC 0264+00 1/1 0/0 0/0 .text create__12daLv3Water_cFv */ #pragma push @@ -645,7 +671,7 @@ SECTION_RODATA static f32 const lit_4068[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80C5A050, &lit_4068); +COMPILER_STRIP_GATE(0x80C5A050, &lit_4068); /* 80C5A308-80C5A314 000008 000C+00 1/1 0/0 0/0 .bss @3657 */ static u8 lit_3657[12]; @@ -668,7 +694,7 @@ asm void daLv3Water_c::mode_init_levelCtrl() { SECTION_RODATA static u8 const lit_4080[8] = { 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C5A058, &lit_4080); +COMPILER_STRIP_GATE(0x80C5A058, &lit_4080); /* 80C597FC-80C598BC 00111C 00C0+00 1/0 0/0 0/0 .text mode_proc_levelCtrl__12daLv3Water_cFv */ #pragma push @@ -685,7 +711,7 @@ asm void daLv3Water_c::mode_proc_levelCtrl() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4173 = -1.0f / 100.0f; -COMPILER_STRIP_GATE(80C5A060, &lit_4173); +COMPILER_STRIP_GATE(0x80C5A060, &lit_4173); #pragma pop /* 80C5A064-80C5A068 0001F4 0004+00 0/1 0/0 0/0 .rodata @4174 */ @@ -697,7 +723,7 @@ SECTION_RODATA static u8 const lit_4174[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C5A064, &lit_4174); +COMPILER_STRIP_GATE(0x80C5A064, &lit_4174); #pragma pop /* 80C598BC-80C59AA0 0011DC 01E4+00 1/0 0/0 0/0 .text Draw__12daLv3Water_cFv */ @@ -795,7 +821,7 @@ asm void __sinit_d_a_obj_lv3Water_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80C59C90 = (void*)__sinit_d_a_obj_lv3Water_cpp; +REGISTER_CTORS(0x80C59C90, __sinit_d_a_obj_lv3Water_cpp); #pragma pop /* 80C59D10-80C59D18 001630 0008+00 1/0 0/0 0/0 .text @1448@eventStart__12daLv3Water_cFv @@ -855,29 +881,4 @@ asm daLv3Water_c::~daLv3Water_c() { } #pragma pop -/* 80C5A068-80C5A13A 0001F8 00D2+00 1/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80C5A068 = "Kr10water"; -SECTION_DEAD static char const* const stringBase_80C5A072 = "Kr10wat01"; -SECTION_DEAD static char const* const stringBase_80C5A07C = "Kr02wat00"; -SECTION_DEAD static char const* const stringBase_80C5A086 = "Kr03wat00"; -SECTION_DEAD static char const* const stringBase_80C5A090 = "Kr03wat01"; -SECTION_DEAD static char const* const stringBase_80C5A09A = "Kr03wat02"; -SECTION_DEAD static char const* const stringBase_80C5A0A4 = "Kr03wat03"; -SECTION_DEAD static char const* const stringBase_80C5A0AE = "Kr03wat04"; -SECTION_DEAD static char const* const stringBase_80C5A0B8 = "Kr07wat00"; -SECTION_DEAD static char const* const stringBase_80C5A0C2 = "Kr08wat00"; -SECTION_DEAD static char const* const stringBase_80C5A0CC = "Kr08wat01"; -SECTION_DEAD static char const* const stringBase_80C5A0D6 = "Kr02wat01"; -SECTION_DEAD static char const* const stringBase_80C5A0E0 = "Kr02wat02"; -SECTION_DEAD static char const* const stringBase_80C5A0EA = "Kr02wat03"; -SECTION_DEAD static char const* const stringBase_80C5A0F4 = "Kr11wat00"; -SECTION_DEAD static char const* const stringBase_80C5A0FE = "Kr12wat00"; -SECTION_DEAD static char const* const stringBase_80C5A108 = "Kr13wat00"; -SECTION_DEAD static char const* const stringBase_80C5A112 = "Kr13wat01"; -SECTION_DEAD static char const* const stringBase_80C5A11C = "Kr13wat02"; -SECTION_DEAD static char const* const stringBase_80C5A126 = "Kr03wat05"; -SECTION_DEAD static char const* const stringBase_80C5A130 = "Kr03wat06"; -#pragma pop +/* 80C5A068-80C5A068 0001F8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_lv3Water2/d_a_obj_lv3Water2.cpp b/rel/d/a/obj/d_a_obj_lv3Water2/d_a_obj_lv3Water2.cpp index b6f01fdca35..a30b072282c 100644 --- a/rel/d/a/obj/d_a_obj_lv3Water2/d_a_obj_lv3Water2.cpp +++ b/rel/d/a/obj/d_a_obj_lv3Water2/d_a_obj_lv3Water2.cpp @@ -82,10 +82,10 @@ struct dRes_control_c { struct dPa_levelEcallBack {}; -struct _GXColor {}; - struct csXyz {}; +struct _GXColor {}; + struct dPa_control_c { /* 8004D4CC */ void set(u32, u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, @@ -119,10 +119,10 @@ struct dBgS_MoveBgActor { /* 80078950 */ void MoveBGExecute(); }; -struct Vec {}; - struct JAISoundID {}; +struct Vec {}; + struct Z2SeMgr { /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); }; @@ -237,6 +237,12 @@ extern "C" void __register_global_object(); // /* ############################################################################################## */ +/* 80C5B398-80C5B398 000034 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80C5B398 = "Kr03wat04"; +#pragma pop + /* 80C5B3A4-80C5B3B0 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -392,22 +398,22 @@ asm void daLv3Water2_c::setBaseMtx() { /* ############################################################################################## */ /* 80C5B364-80C5B368 000000 0004+00 3/3 0/0 0/0 .rodata l_bmdIdx */ SECTION_RODATA static u32 const l_bmdIdx = 0x00000005; -COMPILER_STRIP_GATE(80C5B364, &l_bmdIdx); +COMPILER_STRIP_GATE(0x80C5B364, &l_bmdIdx); /* 80C5B368-80C5B36C 000004 0004+00 1/1 0/0 0/0 .rodata l_dzbIdx */ SECTION_RODATA static u32 const l_dzbIdx = 0x0000000D; -COMPILER_STRIP_GATE(80C5B368, &l_dzbIdx); +COMPILER_STRIP_GATE(0x80C5B368, &l_dzbIdx); /* 80C5B36C-80C5B370 000008 0004+00 0/1 0/0 0/0 .rodata l_btkIdx */ #pragma push #pragma force_active on SECTION_RODATA static u32 const l_btkIdx = 0x00000009; -COMPILER_STRIP_GATE(80C5B36C, &l_btkIdx); +COMPILER_STRIP_GATE(0x80C5B36C, &l_btkIdx); #pragma pop /* 80C5B370-80C5B374 00000C 0004+00 2/5 0/0 0/0 .rodata @3682 */ SECTION_RODATA static f32 const lit_3682 = 1.0f; -COMPILER_STRIP_GATE(80C5B370, &lit_3682); +COMPILER_STRIP_GATE(0x80C5B370, &lit_3682); /* 80C5A4F8-80C5A5E4 0001D8 00EC+00 1/0 0/0 0/0 .text CreateHeap__13daLv3Water2_cFv */ #pragma push @@ -426,13 +432,13 @@ SECTION_RODATA static f32 const lit_3747[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80C5B374, &lit_3747); +COMPILER_STRIP_GATE(0x80C5B374, &lit_3747); /* 80C5B37C-80C5B384 000018 0008+00 1/2 0/0 0/0 .rodata @3749 */ SECTION_RODATA static u8 const lit_3749[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C5B37C, &lit_3749); +COMPILER_STRIP_GATE(0x80C5B37C, &lit_3749); /* 80C5A5E4-80C5A7FC 0002C4 0218+00 1/1 0/0 0/0 .text create__13daLv3Water2_cFv */ #pragma push @@ -498,7 +504,7 @@ asm void daLv3Water2_c::mode_init_levelCtrl() { SECTION_RODATA static u8 const lit_3899[8] = { 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C5B384, &lit_3899); +COMPILER_STRIP_GATE(0x80C5B384, &lit_3899); /* 80C5ACE4-80C5ADA4 0009C4 00C0+00 1/0 0/0 0/0 .text mode_proc_levelCtrl__13daLv3Water2_cFv */ #pragma push @@ -515,7 +521,7 @@ asm void daLv3Water2_c::mode_proc_levelCtrl() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3951 = -1.0f / 100.0f; -COMPILER_STRIP_GATE(80C5B38C, &lit_3951); +COMPILER_STRIP_GATE(0x80C5B38C, &lit_3951); #pragma pop /* 80C5B390-80C5B394 00002C 0004+00 0/1 0/0 0/0 .rodata @3952 */ @@ -527,7 +533,7 @@ SECTION_RODATA static u8 const lit_3952[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C5B390, &lit_3952); +COMPILER_STRIP_GATE(0x80C5B390, &lit_3952); #pragma pop /* 80C5ADA4-80C5AEFC 000A84 0158+00 1/0 0/0 0/0 .text Draw__13daLv3Water2_cFv */ @@ -555,7 +561,7 @@ asm void daLv3Water2_c::Delete() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3983 = -1.0f; -COMPILER_STRIP_GATE(80C5B394, &lit_3983); +COMPILER_STRIP_GATE(0x80C5B394, &lit_3983); #pragma pop /* 80C5AF3C-80C5B0C0 000C1C 0184+00 2/1 0/0 0/0 .text eventStart__13daLv3Water2_cFv */ @@ -632,7 +638,7 @@ asm void __sinit_d_a_obj_lv3Water2_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80C5B1A8 = (void*)__sinit_d_a_obj_lv3Water2_cpp; +REGISTER_CTORS(0x80C5B1A8, __sinit_d_a_obj_lv3Water2_cpp); #pragma pop /* 80C5B228-80C5B230 000F08 0008+00 1/0 0/0 0/0 .text @1448@eventStart__13daLv3Water2_cFv @@ -692,9 +698,4 @@ asm daLv3Water2_c::~daLv3Water2_c() { } #pragma pop -/* 80C5B398-80C5B3A2 000034 000A+00 1/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80C5B398 = "Kr03wat04"; -#pragma pop +/* 80C5B398-80C5B398 000034 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_lv3WaterB/d_a_obj_lv3WaterB.cpp b/rel/d/a/obj/d_a_obj_lv3WaterB/d_a_obj_lv3WaterB.cpp index e9618d3e6f7..8192562782c 100644 --- a/rel/d/a/obj/d_a_obj_lv3WaterB/d_a_obj_lv3WaterB.cpp +++ b/rel/d/a/obj/d_a_obj_lv3WaterB/d_a_obj_lv3WaterB.cpp @@ -156,13 +156,13 @@ extern "C" extern u8 j3dSys[284]; /* ############################################################################################## */ /* 80C5BD50-80C5BD54 000000 0004+00 3/3 0/0 0/0 .rodata @3724 */ SECTION_RODATA static f32 const lit_3724 = 1.0f; -COMPILER_STRIP_GATE(80C5BD50, &lit_3724); +COMPILER_STRIP_GATE(0x80C5BD50, &lit_3724); /* 80C5BD54-80C5BD58 000004 0004+00 0/1 0/0 0/0 .rodata @3725 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_3725 = 0xBC75C28F; -COMPILER_STRIP_GATE(80C5BD54, &lit_3725); +COMPILER_STRIP_GATE(0x80C5BD54, &lit_3725); #pragma pop /* 80C5BD58-80C5BD5C 000008 0004+00 0/2 0/0 0/0 .rodata @3726 */ @@ -174,7 +174,7 @@ SECTION_RODATA static u8 const lit_3726[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C5BD58, &lit_3726); +COMPILER_STRIP_GATE(0x80C5BD58, &lit_3726); #pragma pop /* 80C5B578-80C5B71C 000078 01A4+00 1/0 0/0 0/0 .text @@ -193,29 +193,29 @@ static asm void daObj_Lv3waterB_Draw(obj_lv3WaterB_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3751 = 4000.0f; -COMPILER_STRIP_GATE(80C5BD5C, &lit_3751); +COMPILER_STRIP_GATE(0x80C5BD5C, &lit_3751); #pragma pop /* 80C5BD60-80C5BD64 000010 0004+00 1/2 0/0 0/0 .rodata @3752 */ SECTION_RODATA static f32 const lit_3752 = 160.0f; -COMPILER_STRIP_GATE(80C5BD60, &lit_3752); +COMPILER_STRIP_GATE(0x80C5BD60, &lit_3752); /* 80C5BD64-80C5BD68 000014 0004+00 1/2 0/0 0/0 .rodata @3753 */ SECTION_RODATA static f32 const lit_3753 = 14450.0f; -COMPILER_STRIP_GATE(80C5BD64, &lit_3753); +COMPILER_STRIP_GATE(0x80C5BD64, &lit_3753); /* 80C5BD68-80C5BD6C 000018 0004+00 0/1 0/0 0/0 .rodata @3754 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3754 = 1.0f / 20.0f; -COMPILER_STRIP_GATE(80C5BD68, &lit_3754); +COMPILER_STRIP_GATE(0x80C5BD68, &lit_3754); #pragma pop /* 80C5BD6C-80C5BD70 00001C 0004+00 0/1 0/0 0/0 .rodata @3755 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3755 = 10.0f; -COMPILER_STRIP_GATE(80C5BD6C, &lit_3755); +COMPILER_STRIP_GATE(0x80C5BD6C, &lit_3755); #pragma pop /* 80C5B71C-80C5B89C 00021C 0180+00 1/1 0/0 0/0 .text action__FP19obj_lv3WaterB_class */ @@ -245,6 +245,14 @@ static bool daObj_Lv3waterB_IsDelete(obj_lv3WaterB_class* param_0) { return true; } +/* ############################################################################################## */ +/* 80C5BD70-80C5BD70 000020 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80C5BD70 = "L3_bwater"; +SECTION_DEAD static char const* const stringBase_80C5BD7A = "S_octhibi"; +#pragma pop + /* 80C5B8C8-80C5B94C 0003C8 0084+00 1/0 0/0 0/0 .text * daObj_Lv3waterB_Delete__FP19obj_lv3WaterB_class */ #pragma push @@ -316,10 +324,4 @@ static asm void daObj_Lv3waterB_Create(fopAc_ac_c* param_0) { } #pragma pop -/* 80C5BD70-80C5BD84 000020 0014+00 3/3 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80C5BD70 = "L3_bwater"; -SECTION_DEAD static char const* const stringBase_80C5BD7A = "S_octhibi"; -#pragma pop +/* 80C5BD70-80C5BD70 000020 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_lv3saka00/d_a_obj_lv3saka00.cpp b/rel/d/a/obj/d_a_obj_lv3saka00/d_a_obj_lv3saka00.cpp index f5b7986c759..106e920304d 100644 --- a/rel/d/a/obj/d_a_obj_lv3saka00/d_a_obj_lv3saka00.cpp +++ b/rel/d/a/obj/d_a_obj_lv3saka00/d_a_obj_lv3saka00.cpp @@ -177,13 +177,20 @@ asm void daObjLv3saka_c::Create() { SECTION_RODATA static u8 const l_dzbIdx[8] = { 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x03, }; -COMPILER_STRIP_GATE(80C5C3C4, &l_dzbIdx); +COMPILER_STRIP_GATE(0x80C5C3C4, &l_dzbIdx); /* 80C5C3CC-80C5C3D4 000008 0008+00 1/1 0/0 0/0 .rodata l_dzbIdx2 */ SECTION_RODATA static u8 const l_dzbIdx2[8] = { 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x04, }; -COMPILER_STRIP_GATE(80C5C3CC, &l_dzbIdx2); +COMPILER_STRIP_GATE(0x80C5C3CC, &l_dzbIdx2); + +/* 80C5C3DC-80C5C3DC 000018 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80C5C3DC = "Obj_saka"; +SECTION_DEAD static char const* const stringBase_80C5C3E5 = "Obj_saka2"; +#pragma pop /* 80C5C3F0-80C5C3F8 -00001 0008+00 3/3 0/0 0/0 .data l_arcName */ SECTION_DATA static void* l_arcName[2] = { @@ -206,7 +213,7 @@ asm void daObjLv3saka_c::CreateHeap() { SECTION_RODATA static u8 const l_heap_size[8] = { 0x00, 0x00, 0x4E, 0x00, 0x00, 0x00, 0x29, 0x00, }; -COMPILER_STRIP_GATE(80C5C3D4, &l_heap_size); +COMPILER_STRIP_GATE(0x80C5C3D4, &l_heap_size); /* 80C5C058-80C5C0FC 000278 00A4+00 1/1 0/0 0/0 .text create1st__14daObjLv3saka_cFv */ #pragma push @@ -345,10 +352,4 @@ static asm void daObjLv3saka_MoveBGDraw(daObjLv3saka_c* param_0) { } #pragma pop -/* 80C5C3DC-80C5C3EF 000018 0013+00 1/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80C5C3DC = "Obj_saka"; -SECTION_DEAD static char const* const stringBase_80C5C3E5 = "Obj_saka2"; -#pragma pop +/* 80C5C3DC-80C5C3DC 000018 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_lv3waterEff/d_a_obj_lv3waterEff.cpp b/rel/d/a/obj/d_a_obj_lv3waterEff/d_a_obj_lv3waterEff.cpp index 8dced449ad7..4e5d5404da8 100644 --- a/rel/d/a/obj/d_a_obj_lv3waterEff/d_a_obj_lv3waterEff.cpp +++ b/rel/d/a/obj/d_a_obj_lv3waterEff/d_a_obj_lv3waterEff.cpp @@ -24,27 +24,27 @@ struct daObjWaterEff_c { struct dPa_levelEcallBack {}; +struct dKy_tevstr_c {}; + +struct csXyz {}; + +struct _GXColor {}; + struct cXyz { /* 80C5C670 */ ~cXyz(); /* 80C5C6AC */ cXyz(); }; -struct dKy_tevstr_c {}; - -struct _GXColor {}; - -struct csXyz {}; - struct dPa_control_c { /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, cXyz const*, f32); }; -struct Vec {}; - struct JAISoundID {}; +struct Vec {}; + struct Z2SeMgr { /* 802AC50C */ void seStartLevel(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); }; @@ -95,52 +95,52 @@ extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; SECTION_RODATA static u8 const l_eff_id[8] = { 0x86, 0xD2, 0x86, 0xD3, 0x86, 0xD4, 0x86, 0xD5, }; -COMPILER_STRIP_GATE(80C5C878, &l_eff_id); +COMPILER_STRIP_GATE(0x80C5C878, &l_eff_id); /* 80C5C880-80C5C884 000008 0004+00 1/2 0/0 0/0 .rodata @3637 */ SECTION_RODATA static f32 const lit_3637 = 1.0f; -COMPILER_STRIP_GATE(80C5C880, &lit_3637); +COMPILER_STRIP_GATE(0x80C5C880, &lit_3637); /* 80C5C884-80C5C888 00000C 0004+00 0/1 0/0 0/0 .rodata @3638 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3638 = 14420.0f; -COMPILER_STRIP_GATE(80C5C884, &lit_3638); +COMPILER_STRIP_GATE(0x80C5C884, &lit_3638); #pragma pop /* 80C5C888-80C5C88C 000010 0004+00 0/1 0/0 0/0 .rodata @3639 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3639 = -1100.0f; -COMPILER_STRIP_GATE(80C5C888, &lit_3639); +COMPILER_STRIP_GATE(0x80C5C888, &lit_3639); #pragma pop /* 80C5C88C-80C5C890 000014 0004+00 0/1 0/0 0/0 .rodata @3640 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3640 = -4950.0f; -COMPILER_STRIP_GATE(80C5C88C, &lit_3640); +COMPILER_STRIP_GATE(0x80C5C88C, &lit_3640); #pragma pop /* 80C5C890-80C5C894 000018 0004+00 0/1 0/0 0/0 .rodata @3641 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3641 = 12585.0f; -COMPILER_STRIP_GATE(80C5C890, &lit_3641); +COMPILER_STRIP_GATE(0x80C5C890, &lit_3641); #pragma pop /* 80C5C894-80C5C898 00001C 0004+00 0/1 0/0 0/0 .rodata @3642 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3642 = -550.0f; -COMPILER_STRIP_GATE(80C5C894, &lit_3642); +COMPILER_STRIP_GATE(0x80C5C894, &lit_3642); #pragma pop /* 80C5C898-80C5C89C 000020 0004+00 0/1 0/0 0/0 .rodata @3643 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3643 = -2390.0f; -COMPILER_STRIP_GATE(80C5C898, &lit_3643); +COMPILER_STRIP_GATE(0x80C5C898, &lit_3643); #pragma pop /* 80C5C4F8-80C5C5DC 000078 00E4+00 1/1 0/0 0/0 .text Create__15daObjWaterEff_cFv */ @@ -181,7 +181,7 @@ cXyz::cXyz() { /* ############################################################################################## */ /* 80C5C89C-80C5C8A0 000024 0004+00 1/1 0/0 0/0 .rodata @3710 */ SECTION_RODATA static f32 const lit_3710 = -1.0f; -COMPILER_STRIP_GATE(80C5C89C, &lit_3710); +COMPILER_STRIP_GATE(0x80C5C89C, &lit_3710); /* 80C5C6B0-80C5C7B8 000230 0108+00 1/1 0/0 0/0 .text execute__15daObjWaterEff_cFv */ #pragma push diff --git a/rel/d/a/obj/d_a_obj_lv4CandleDemoTag/d_a_obj_lv4CandleDemoTag.cpp b/rel/d/a/obj/d_a_obj_lv4CandleDemoTag/d_a_obj_lv4CandleDemoTag.cpp index 7b39f8fa845..b347adcb7d2 100644 --- a/rel/d/a/obj/d_a_obj_lv4CandleDemoTag/d_a_obj_lv4CandleDemoTag.cpp +++ b/rel/d/a/obj/d_a_obj_lv4CandleDemoTag/d_a_obj_lv4CandleDemoTag.cpp @@ -517,7 +517,7 @@ asm void __sinit_d_a_obj_lv4CandleDemoTag_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80C5D0D8 = (void*)__sinit_d_a_obj_lv4CandleDemoTag_cpp; +REGISTER_CTORS(0x80C5D0D8, __sinit_d_a_obj_lv4CandleDemoTag_cpp); #pragma pop /* 80C5D114-80C5D11C 000814 0008+00 1/0 0/0 0/0 .text @1392@eventStart__20dalv4CandleDemoTag_cFv diff --git a/rel/d/a/obj/d_a_obj_lv4CandleTag/d_a_obj_lv4CandleTag.cpp b/rel/d/a/obj/d_a_obj_lv4CandleTag/d_a_obj_lv4CandleTag.cpp index fc2a1b90c66..5e18165d694 100644 --- a/rel/d/a/obj/d_a_obj_lv4CandleTag/d_a_obj_lv4CandleTag.cpp +++ b/rel/d/a/obj/d_a_obj_lv4CandleTag/d_a_obj_lv4CandleTag.cpp @@ -62,10 +62,10 @@ struct dEvLib_callback_c { /* 80C5DAC0 */ bool eventStart(); }; -struct Vec {}; - struct JAISoundID {}; +struct Vec {}; + struct Z2SeMgr { /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); }; @@ -358,11 +358,11 @@ asm void dalv4CandleTag_c::modeWatch() { /* ############################################################################################## */ /* 80C5DB5C-80C5DB60 000000 0004+00 1/1 0/0 0/0 .rodata @3727 */ SECTION_RODATA static f32 const lit_3727 = 1.0f; -COMPILER_STRIP_GATE(80C5DB5C, &lit_3727); +COMPILER_STRIP_GATE(0x80C5DB5C, &lit_3727); /* 80C5DB60-80C5DB64 000004 0004+00 1/1 0/0 0/0 .rodata @3728 */ SECTION_RODATA static f32 const lit_3728 = -1.0f; -COMPILER_STRIP_GATE(80C5DB60, &lit_3728); +COMPILER_STRIP_GATE(0x80C5DB60, &lit_3728); /* 80C5D78C-80C5D814 00042C 0088+00 1/1 0/0 0/0 .text init_modeNG__16dalv4CandleTag_cFv */ @@ -505,7 +505,7 @@ asm void __sinit_d_a_obj_lv4CandleTag_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80C5DA1C = (void*)__sinit_d_a_obj_lv4CandleTag_cpp; +REGISTER_CTORS(0x80C5DA1C, __sinit_d_a_obj_lv4CandleTag_cpp); #pragma pop /* 80C5DA58-80C5DA60 0006F8 0008+00 1/0 0/0 0/0 .text @1392@eventStart__16dalv4CandleTag_cFv */ diff --git a/rel/d/a/obj/d_a_obj_lv4EdShutter/d_a_obj_lv4EdShutter.cpp b/rel/d/a/obj/d_a_obj_lv4EdShutter/d_a_obj_lv4EdShutter.cpp index 9e696c9c1c7..36fb9c6fce2 100644 --- a/rel/d/a/obj/d_a_obj_lv4EdShutter/d_a_obj_lv4EdShutter.cpp +++ b/rel/d/a/obj/d_a_obj_lv4EdShutter/d_a_obj_lv4EdShutter.cpp @@ -100,10 +100,10 @@ struct dBgS_MoveBgActor { /* 80078950 */ void MoveBGExecute(); }; -struct Vec {}; - struct JAISoundID {}; +struct Vec {}; + struct Z2SeMgr { /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); }; @@ -202,11 +202,11 @@ extern "C" void __register_global_object(); /* ############################################################################################## */ /* 80C5E8DC-80C5E8E0 000000 0004+00 3/3 0/0 0/0 .rodata @3634 */ SECTION_RODATA static f32 const lit_3634 = 80.0f; -COMPILER_STRIP_GATE(80C5E8DC, &lit_3634); +COMPILER_STRIP_GATE(0x80C5E8DC, &lit_3634); /* 80C5E8E0-80C5E8E4 000004 0004+00 1/1 0/0 0/0 .rodata @3635 */ SECTION_RODATA static f32 const lit_3635 = 40.0f; -COMPILER_STRIP_GATE(80C5E8E0, &lit_3635); +COMPILER_STRIP_GATE(0x80C5E8E0, &lit_3635); /* 80C5E904-80C5E910 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { @@ -374,6 +374,13 @@ asm void daLv4EdShutter_c::setBaseMtx() { } #pragma pop +/* ############################################################################################## */ +/* 80C5E8FC-80C5E8FC 000020 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80C5E8FC = "P_AShtr"; +#pragma pop + /* 80C5DEC8-80C5DF34 000208 006C+00 1/0 0/0 0/0 .text CreateHeap__16daLv4EdShutter_cFv */ #pragma push #pragma optimization_level 0 @@ -387,7 +394,7 @@ asm void daLv4EdShutter_c::CreateHeap() { /* ############################################################################################## */ /* 80C5E8E4-80C5E8E8 000008 0004+00 1/2 0/0 0/0 .rodata @3704 */ SECTION_RODATA static f32 const lit_3704 = -300.0f; -COMPILER_STRIP_GATE(80C5E8E4, &lit_3704); +COMPILER_STRIP_GATE(0x80C5E8E4, &lit_3704); /* 80C5DF34-80C5E0A4 000274 0170+00 1/1 0/0 0/0 .text create__16daLv4EdShutter_cFv */ #pragma push @@ -453,11 +460,11 @@ asm void daLv4EdShutter_c::modeWait() { /* ############################################################################################## */ /* 80C5E8E8-80C5E8EC 00000C 0004+00 2/2 0/0 0/0 .rodata @3787 */ SECTION_RODATA static f32 const lit_3787 = 1.0f; -COMPILER_STRIP_GATE(80C5E8E8, &lit_3787); +COMPILER_STRIP_GATE(0x80C5E8E8, &lit_3787); /* 80C5E8EC-80C5E8F0 000010 0004+00 2/2 0/0 0/0 .rodata @3788 */ SECTION_RODATA static f32 const lit_3788 = -1.0f; -COMPILER_STRIP_GATE(80C5E8EC, &lit_3788); +COMPILER_STRIP_GATE(0x80C5E8EC, &lit_3788); /* 80C5E2E0-80C5E394 000620 00B4+00 1/1 0/0 0/0 .text init_modeOpen__16daLv4EdShutter_cFv */ @@ -475,14 +482,14 @@ asm void daLv4EdShutter_c::init_modeOpen() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3816 = 3.0f / 10.0f; -COMPILER_STRIP_GATE(80C5E8F0, &lit_3816); +COMPILER_STRIP_GATE(0x80C5E8F0, &lit_3816); #pragma pop /* 80C5E8F4-80C5E8F8 000018 0004+00 0/2 0/0 0/0 .rodata @3817 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3817 = 5.0f; -COMPILER_STRIP_GATE(80C5E8F4, &lit_3817); +COMPILER_STRIP_GATE(0x80C5E8F4, &lit_3817); #pragma pop /* 80C5E8F8-80C5E8FC 00001C 0004+00 0/2 0/0 0/0 .rodata @3818 */ @@ -494,7 +501,7 @@ SECTION_RODATA static u8 const lit_3818[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C5E8F8, &lit_3818); +COMPILER_STRIP_GATE(0x80C5E8F8, &lit_3818); #pragma pop /* 80C5E394-80C5E464 0006D4 00D0+00 1/0 0/0 0/0 .text modeOpen__16daLv4EdShutter_cFv */ @@ -637,7 +644,7 @@ asm void __sinit_d_a_obj_lv4EdShutter_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80C5E788 = (void*)__sinit_d_a_obj_lv4EdShutter_cpp; +REGISTER_CTORS(0x80C5E788, __sinit_d_a_obj_lv4EdShutter_cpp); #pragma pop /* 80C5E7C4-80C5E7CC 000B04 0008+00 1/0 0/0 0/0 .text @1448@eventStart__16daLv4EdShutter_cFv */ @@ -696,9 +703,4 @@ asm daLv4EdShutter_c::~daLv4EdShutter_c() { } #pragma pop -/* 80C5E8FC-80C5E904 000020 0008+00 3/3 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80C5E8FC = "P_AShtr"; -#pragma pop +/* 80C5E8FC-80C5E8FC 000020 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_lv4Gate/d_a_obj_lv4Gate.cpp b/rel/d/a/obj/d_a_obj_lv4Gate/d_a_obj_lv4Gate.cpp index 819bd3c7b81..dff7feb6128 100644 --- a/rel/d/a/obj/d_a_obj_lv4Gate/d_a_obj_lv4Gate.cpp +++ b/rel/d/a/obj/d_a_obj_lv4Gate/d_a_obj_lv4Gate.cpp @@ -91,10 +91,10 @@ struct dBgS_MoveBgActor { /* 80078950 */ void MoveBGExecute(); }; -struct Vec {}; - struct JAISoundID {}; +struct Vec {}; + struct Z2SeMgr { /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); /* 802AC50C */ void seStartLevel(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); @@ -188,7 +188,7 @@ extern "C" void __register_global_object(); /* ############################################################################################## */ /* 80C5F3F4-80C5F3F8 000000 0004+00 4/4 0/0 0/0 .rodata @3625 */ SECTION_RODATA static f32 const lit_3625 = 2.0f; -COMPILER_STRIP_GATE(80C5F3F4, &lit_3625); +COMPILER_STRIP_GATE(0x80C5F3F4, &lit_3625); /* 80C5F41C-80C5F428 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { @@ -326,7 +326,7 @@ SECTION_RODATA static u8 const lit_3646[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C5F3F8, &lit_3646); +COMPILER_STRIP_GATE(0x80C5F3F8, &lit_3646); /* 80C5EBE4-80C5EC80 000164 009C+00 2/2 0/0 0/0 .text setBaseMtx__11daLv4Gate_cFv */ #pragma push @@ -338,6 +338,13 @@ asm void daLv4Gate_c::setBaseMtx() { } #pragma pop +/* ############################################################################################## */ +/* 80C5F414-80C5F414 000020 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80C5F414 = "L4Gate"; +#pragma pop + /* 80C5EC80-80C5ECEC 000200 006C+00 1/0 0/0 0/0 .text CreateHeap__11daLv4Gate_cFv */ #pragma push #pragma optimization_level 0 @@ -353,14 +360,14 @@ asm void daLv4Gate_c::CreateHeap() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3710 = -250.0f; -COMPILER_STRIP_GATE(80C5F3FC, &lit_3710); +COMPILER_STRIP_GATE(0x80C5F3FC, &lit_3710); #pragma pop /* 80C5F400-80C5F404 00000C 0004+00 0/1 0/0 0/0 .rodata @3711 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3711 = 250.0f; -COMPILER_STRIP_GATE(80C5F400, &lit_3711); +COMPILER_STRIP_GATE(0x80C5F400, &lit_3711); #pragma pop /* 80C5ECEC-80C5EE54 00026C 0168+00 1/1 0/0 0/0 .text create__11daLv4Gate_cFv */ @@ -438,28 +445,28 @@ asm void daLv4Gate_c::init_modeMove() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3775 = 1.0f; -COMPILER_STRIP_GATE(80C5F404, &lit_3775); +COMPILER_STRIP_GATE(0x80C5F404, &lit_3775); #pragma pop /* 80C5F408-80C5F40C 000014 0004+00 0/2 0/0 0/0 .rodata @3776 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3776 = -1.0f; -COMPILER_STRIP_GATE(80C5F408, &lit_3776); +COMPILER_STRIP_GATE(0x80C5F408, &lit_3776); #pragma pop /* 80C5F40C-80C5F410 000018 0004+00 0/1 0/0 0/0 .rodata @3777 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3777 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(80C5F40C, &lit_3777); +COMPILER_STRIP_GATE(0x80C5F40C, &lit_3777); #pragma pop /* 80C5F410-80C5F414 00001C 0004+00 0/1 0/0 0/0 .rodata @3778 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3778 = 0.5f; -COMPILER_STRIP_GATE(80C5F410, &lit_3778); +COMPILER_STRIP_GATE(0x80C5F410, &lit_3778); #pragma pop /* 80C5EFBC-80C5F0C4 00053C 0108+00 1/0 0/0 0/0 .text modeMove__11daLv4Gate_cFv */ @@ -572,12 +579,7 @@ asm void __sinit_d_a_obj_lv4Gate_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80C5F3A4 = (void*)__sinit_d_a_obj_lv4Gate_cpp; +REGISTER_CTORS(0x80C5F3A4, __sinit_d_a_obj_lv4Gate_cpp); #pragma pop -/* 80C5F414-80C5F41B 000020 0007+00 3/3 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80C5F414 = "L4Gate"; -#pragma pop +/* 80C5F414-80C5F414 000020 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_lv4HsTarget/d_a_obj_lv4HsTarget.cpp b/rel/d/a/obj/d_a_obj_lv4HsTarget/d_a_obj_lv4HsTarget.cpp index 7bf80b241af..6a73db8a1d9 100644 --- a/rel/d/a/obj/d_a_obj_lv4HsTarget/d_a_obj_lv4HsTarget.cpp +++ b/rel/d/a/obj/d_a_obj_lv4HsTarget/d_a_obj_lv4HsTarget.cpp @@ -214,6 +214,15 @@ asm void daLv4HsTarget_c::setBaseMtx() { } #pragma pop +/* ############################################################################################## */ +/* 80C5FA3C-80C5FA3C 000000 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80C5FA3C = "L4HsMato"; +/* @stringBase0 padding */ +SECTION_DEAD static char const* const pad_80C5FA45 = "\0\0"; +#pragma pop + /* 80C5F718-80C5F784 0001D8 006C+00 1/0 0/0 0/0 .text CreateHeap__15daLv4HsTarget_cFv */ #pragma push #pragma optimization_level 0 @@ -334,14 +343,7 @@ asm void __sinit_d_a_obj_lv4HsTarget_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80C5F9EC = (void*)__sinit_d_a_obj_lv4HsTarget_cpp; +REGISTER_CTORS(0x80C5F9EC, __sinit_d_a_obj_lv4HsTarget_cpp); #pragma pop -/* 80C5FA3C-80C5FA48 000000 0009+03 3/3 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80C5FA3C = "L4HsMato"; -/* @stringBase0 padding */ -SECTION_DEAD static char const* const pad_80C5FA45 = "\0\0"; -#pragma pop +/* 80C5FA3C-80C5FA3C 000000 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_lv4PoGate/d_a_obj_lv4PoGate.cpp b/rel/d/a/obj/d_a_obj_lv4PoGate/d_a_obj_lv4PoGate.cpp index 3c3f2cf0f19..218f8caf1f9 100644 --- a/rel/d/a/obj/d_a_obj_lv4PoGate/d_a_obj_lv4PoGate.cpp +++ b/rel/d/a/obj/d_a_obj_lv4PoGate/d_a_obj_lv4PoGate.cpp @@ -83,10 +83,10 @@ struct dRes_control_c { struct dPa_levelEcallBack {}; -struct _GXColor {}; - struct csXyz {}; +struct _GXColor {}; + struct dPa_control_c { /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, @@ -111,10 +111,10 @@ struct dBgS_MoveBgActor { /* 80078950 */ void MoveBGExecute(); }; -struct Vec {}; - struct JAISoundID {}; +struct Vec {}; + struct Z2SeMgr { /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); }; @@ -218,41 +218,41 @@ extern "C" void __register_global_object(); /* ############################################################################################## */ /* 80C60804-80C60808 000000 0004+00 4/4 0/0 0/0 .rodata @3629 */ SECTION_RODATA static f32 const lit_3629 = 10.0f; -COMPILER_STRIP_GATE(80C60804, &lit_3629); +COMPILER_STRIP_GATE(0x80C60804, &lit_3629); /* 80C60808-80C6080C 000004 0004+00 0/1 0/0 0/0 .rodata @3630 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3630 = 2.0f; -COMPILER_STRIP_GATE(80C60808, &lit_3630); +COMPILER_STRIP_GATE(0x80C60808, &lit_3630); #pragma pop /* 80C6080C-80C60810 000008 0004+00 0/1 0/0 0/0 .rodata @3631 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3631 = 995.0f; -COMPILER_STRIP_GATE(80C6080C, &lit_3631); +COMPILER_STRIP_GATE(0x80C6080C, &lit_3631); #pragma pop /* 80C60810-80C60814 00000C 0004+00 0/1 0/0 0/0 .rodata @3632 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3632 = 980.0f; -COMPILER_STRIP_GATE(80C60810, &lit_3632); +COMPILER_STRIP_GATE(0x80C60810, &lit_3632); #pragma pop /* 80C60814-80C60818 000010 0004+00 0/2 0/0 0/0 .rodata @3633 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3633 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(80C60814, &lit_3633); +COMPILER_STRIP_GATE(0x80C60814, &lit_3633); #pragma pop /* 80C60818-80C6081C 000014 0004+00 0/1 0/0 0/0 .rodata @3634 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3634 = 45.0f; -COMPILER_STRIP_GATE(80C60818, &lit_3634); +COMPILER_STRIP_GATE(0x80C60818, &lit_3634); #pragma pop /* 80C60854-80C60860 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ @@ -434,7 +434,7 @@ SECTION_RODATA static u8 const lit_3655[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C6081C, &lit_3655); +COMPILER_STRIP_GATE(0x80C6081C, &lit_3655); /* 80C5FCA4-80C5FD40 0001A4 009C+00 2/2 0/0 0/0 .text setBaseMtx__13daLv4PoGate_cFv */ #pragma push @@ -446,6 +446,13 @@ asm void daLv4PoGate_c::setBaseMtx() { } #pragma pop +/* ############################################################################################## */ +/* 80C60848-80C60848 000044 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80C60848 = "L4R02Gate"; +#pragma pop + /* 80C5FD40-80C5FDAC 000240 006C+00 1/0 0/0 0/0 .text CreateHeap__13daLv4PoGate_cFv */ #pragma push #pragma optimization_level 0 @@ -459,7 +466,7 @@ asm void daLv4PoGate_c::CreateHeap() { /* ############################################################################################## */ /* 80C60820-80C60824 00001C 0004+00 1/1 0/0 0/0 .rodata @3713 */ SECTION_RODATA static f32 const lit_3713 = 1000.0f; -COMPILER_STRIP_GATE(80C60820, &lit_3713); +COMPILER_STRIP_GATE(0x80C60820, &lit_3713); /* 80C5FDAC-80C5FEDC 0002AC 0130+00 1/1 0/0 0/0 .text create__13daLv4PoGate_cFv */ #pragma push @@ -520,11 +527,11 @@ void daLv4PoGate_c::modeWait() { /* ############################################################################################## */ /* 80C60824-80C60828 000020 0004+00 4/6 0/0 0/0 .rodata @3772 */ SECTION_RODATA static f32 const lit_3772 = 1.0f; -COMPILER_STRIP_GATE(80C60824, &lit_3772); +COMPILER_STRIP_GATE(0x80C60824, &lit_3772); /* 80C60828-80C6082C 000024 0004+00 2/3 0/0 0/0 .rodata @3773 */ SECTION_RODATA static f32 const lit_3773 = -1.0f; -COMPILER_STRIP_GATE(80C60828, &lit_3773); +COMPILER_STRIP_GATE(0x80C60828, &lit_3773); /* 80C600A0-80C60150 0005A0 00B0+00 1/1 0/0 0/0 .text init_modeMoveOpen__13daLv4PoGate_cFv */ #pragma push @@ -539,7 +546,7 @@ asm void daLv4PoGate_c::init_modeMoveOpen() { /* ############################################################################################## */ /* 80C6082C-80C60830 000028 0004+00 1/3 0/0 0/0 .rodata @3786 */ SECTION_RODATA static f32 const lit_3786 = 0.5f; -COMPILER_STRIP_GATE(80C6082C, &lit_3786); +COMPILER_STRIP_GATE(0x80C6082C, &lit_3786); /* 80C60150-80C60200 000650 00B0+00 1/0 0/0 0/0 .text modeMoveOpen__13daLv4PoGate_cFv */ #pragma push @@ -648,7 +655,7 @@ asm void daLv4PoGate_c::init_modeMoveClose3() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3853 = 30.0f; -COMPILER_STRIP_GATE(80C60830, &lit_3853); +COMPILER_STRIP_GATE(0x80C60830, &lit_3853); #pragma pop /* 80C60450-80C604D8 000950 0088+00 1/0 0/0 0/0 .text modeMoveClose3__13daLv4PoGate_cFv @@ -678,7 +685,7 @@ SECTION_RODATA static u8 const particle_id[20] = { 0x88, 0xC9, 0x88, 0xCA, 0x88, 0xCB, 0x88, 0xCC, 0x88, 0xCD, 0x88, 0xCE, 0x88, 0xCF, 0x88, 0xD0, 0x88, 0xD1, 0x88, 0xD2, }; -COMPILER_STRIP_GATE(80C60834, &particle_id); +COMPILER_STRIP_GATE(0x80C60834, &particle_id); /* 80C60534-80C605F8 000A34 00C4+00 2/2 0/0 0/0 .text setEffect__13daLv4PoGate_cFi */ #pragma push @@ -774,12 +781,7 @@ asm void __sinit_d_a_obj_lv4PoGate_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80C607B4 = (void*)__sinit_d_a_obj_lv4PoGate_cpp; +REGISTER_CTORS(0x80C607B4, __sinit_d_a_obj_lv4PoGate_cpp); #pragma pop -/* 80C60848-80C60852 000044 000A+00 3/3 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80C60848 = "L4R02Gate"; -#pragma pop +/* 80C60848-80C60848 000044 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_lv4RailWall/d_a_obj_lv4RailWall.cpp b/rel/d/a/obj/d_a_obj_lv4RailWall/d_a_obj_lv4RailWall.cpp index e5b432d9c29..7785a56101c 100644 --- a/rel/d/a/obj/d_a_obj_lv4RailWall/d_a_obj_lv4RailWall.cpp +++ b/rel/d/a/obj/d_a_obj_lv4RailWall/d_a_obj_lv4RailWall.cpp @@ -146,10 +146,10 @@ struct cCcD_GStts { /* 80C61898 */ ~cCcD_GStts(); }; -struct Vec {}; - struct JAISoundID {}; +struct Vec {}; + struct Z2SeMgr { /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); /* 802AC50C */ void seStartLevel(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); @@ -309,7 +309,7 @@ asm void daObjLv4Wall_c::setBaseMtx() { /* ############################################################################################## */ /* 80C61B38-80C61B3C 000000 0004+00 2/2 0/0 0/0 .rodata @3709 */ SECTION_RODATA static f32 const lit_3709 = 3375.0f; -COMPILER_STRIP_GATE(80C61B38, &lit_3709); +COMPILER_STRIP_GATE(0x80C61B38, &lit_3709); /* 80C61B3C-80C61B40 000004 0004+00 2/4 0/0 0/0 .rodata @3710 */ SECTION_RODATA static u8 const lit_3710[4] = { @@ -318,11 +318,11 @@ SECTION_RODATA static u8 const lit_3710[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C61B3C, &lit_3710); +COMPILER_STRIP_GATE(0x80C61B3C, &lit_3710); /* 80C61B40-80C61B44 000008 0004+00 1/2 0/0 0/0 .rodata @3711 */ SECTION_RODATA static f32 const lit_3711 = 1700.0f; -COMPILER_STRIP_GATE(80C61B40, &lit_3711); +COMPILER_STRIP_GATE(0x80C61B40, &lit_3711); /* 80C60B7C-80C60CD0 00017C 0154+00 1/0 0/0 0/0 .text Create__14daObjLv4Wall_cFv */ #pragma push @@ -335,6 +335,12 @@ asm void daObjLv4Wall_c::Create() { #pragma pop /* ############################################################################################## */ +/* 80C61BB0-80C61BB0 000078 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80C61BB0 = "P_L4Rwall"; +#pragma pop + /* 80C61BBC-80C61BC8 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -452,7 +458,7 @@ asm void daObjLv4Wall_c::mode_init_wait() { /* ############################################################################################## */ /* 80C61B44-80C61B48 00000C 0004+00 1/1 0/0 0/0 .rodata @3782 */ SECTION_RODATA static f32 const lit_3782 = 4096.0f; -COMPILER_STRIP_GATE(80C61B44, &lit_3782); +COMPILER_STRIP_GATE(0x80C61B44, &lit_3782); /* 80C61B48-80C61B50 000010 0004+04 1/1 0/0 0/0 .rodata @3783 */ SECTION_RODATA static f32 const lit_3783[1 + 1 /* padding */] = { @@ -460,13 +466,13 @@ SECTION_RODATA static f32 const lit_3783[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80C61B48, &lit_3783); +COMPILER_STRIP_GATE(0x80C61B48, &lit_3783); /* 80C61B50-80C61B58 000018 0008+00 1/1 0/0 0/0 .rodata @3785 */ SECTION_RODATA static u8 const lit_3785[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C61B50, &lit_3785); +COMPILER_STRIP_GATE(0x80C61B50, &lit_3785); /* 80C60F58-80C61004 000558 00AC+00 1/0 0/0 0/0 .text mode_wait__14daObjLv4Wall_cFv */ #pragma push @@ -500,39 +506,39 @@ SECTION_RODATA static u8 const l_spd_tbl[68] = { 0x00, 0x00, 0x41, 0x48, 0x00, 0x00, 0x41, 0x18, 0x00, 0x00, 0x40, 0xC0, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C61B58, &l_spd_tbl); +COMPILER_STRIP_GATE(0x80C61B58, &l_spd_tbl); #pragma pop /* 80C61B9C-80C61BA0 000064 0004+00 0/1 0/0 0/0 .rodata @3881 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3881 = 30.0f; -COMPILER_STRIP_GATE(80C61B9C, &lit_3881); +COMPILER_STRIP_GATE(0x80C61B9C, &lit_3881); #pragma pop /* 80C61BA0-80C61BA4 000068 0004+00 1/2 0/0 0/0 .rodata @3882 */ SECTION_RODATA static f32 const lit_3882 = 1.0f; -COMPILER_STRIP_GATE(80C61BA0, &lit_3882); +COMPILER_STRIP_GATE(0x80C61BA0, &lit_3882); /* 80C61BA4-80C61BA8 00006C 0004+00 0/1 0/0 0/0 .rodata @3883 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3883 = 4.0f; -COMPILER_STRIP_GATE(80C61BA4, &lit_3883); +COMPILER_STRIP_GATE(0x80C61BA4, &lit_3883); #pragma pop /* 80C61BA8-80C61BAC 000070 0004+00 0/1 0/0 0/0 .rodata @3884 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3884 = 10.0f; -COMPILER_STRIP_GATE(80C61BA8, &lit_3884); +COMPILER_STRIP_GATE(0x80C61BA8, &lit_3884); #pragma pop /* 80C61BAC-80C61BB0 000074 0004+00 0/1 0/0 0/0 .rodata @3885 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3885 = -1.0f; -COMPILER_STRIP_GATE(80C61BAC, &lit_3885); +COMPILER_STRIP_GATE(0x80C61BAC, &lit_3885); #pragma pop /* 80C61068-80C613C0 000668 0358+00 1/0 0/0 0/0 .text mode_move__14daObjLv4Wall_cFv */ @@ -874,9 +880,4 @@ static asm void func_80C61B28() { } #pragma pop -/* 80C61BB0-80C61BBA 000078 000A+00 1/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80C61BB0 = "P_L4Rwall"; -#pragma pop +/* 80C61BB0-80C61BB0 000078 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_lv4SlideWall/d_a_obj_lv4SlideWall.cpp b/rel/d/a/obj/d_a_obj_lv4SlideWall/d_a_obj_lv4SlideWall.cpp index 6d4b2e5856c..f702c954d91 100644 --- a/rel/d/a/obj/d_a_obj_lv4SlideWall/d_a_obj_lv4SlideWall.cpp +++ b/rel/d/a/obj/d_a_obj_lv4SlideWall/d_a_obj_lv4SlideWall.cpp @@ -92,10 +92,10 @@ struct dBgS_MoveBgActor { /* 80078950 */ void MoveBGExecute(); }; -struct Vec {}; - struct JAISoundID {}; +struct Vec {}; + struct Z2SeMgr { /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); /* 802AC50C */ void seStartLevel(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); @@ -187,11 +187,11 @@ extern "C" void __register_global_object(); /* ############################################################################################## */ /* 80C626A8-80C626AC 000000 0004+00 4/4 0/0 0/0 .rodata @3627 */ SECTION_RODATA static f32 const lit_3627 = 900.0f; -COMPILER_STRIP_GATE(80C626A8, &lit_3627); +COMPILER_STRIP_GATE(0x80C626A8, &lit_3627); /* 80C626AC-80C626B0 000004 0004+00 1/1 0/0 0/0 .rodata @3628 */ SECTION_RODATA static f32 const lit_3628 = 4.0f; -COMPILER_STRIP_GATE(80C626AC, &lit_3628); +COMPILER_STRIP_GATE(0x80C626AC, &lit_3628); /* 80C626D0-80C626DC 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { @@ -329,7 +329,7 @@ SECTION_RODATA static u8 const lit_3649[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C626B0, &lit_3649); +COMPILER_STRIP_GATE(0x80C626B0, &lit_3649); /* 80C61EB0-80C61F4C 000170 009C+00 2/2 0/0 0/0 .text setBaseMtx__11daSldWall_cFv */ #pragma push @@ -341,6 +341,13 @@ asm void daSldWall_c::setBaseMtx() { } #pragma pop +/* ############################################################################################## */ +/* 80C626C4-80C626C4 00001C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80C626C4 = "L4SldWall"; +#pragma pop + /* 80C61F4C-80C61FB8 00020C 006C+00 1/0 0/0 0/0 .text CreateHeap__11daSldWall_cFv */ #pragma push #pragma optimization_level 0 @@ -423,28 +430,28 @@ asm void daSldWall_c::init_modeMoveOpen() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3763 = 1.0f; -COMPILER_STRIP_GATE(80C626B4, &lit_3763); +COMPILER_STRIP_GATE(0x80C626B4, &lit_3763); #pragma pop /* 80C626B8-80C626BC 000010 0004+00 0/3 0/0 0/0 .rodata @3764 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3764 = -1.0f; -COMPILER_STRIP_GATE(80C626B8, &lit_3764); +COMPILER_STRIP_GATE(0x80C626B8, &lit_3764); #pragma pop /* 80C626BC-80C626C0 000014 0004+00 0/2 0/0 0/0 .rodata @3765 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3765 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(80C626BC, &lit_3765); +COMPILER_STRIP_GATE(0x80C626BC, &lit_3765); #pragma pop /* 80C626C0-80C626C4 000018 0004+00 0/2 0/0 0/0 .rodata @3766 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3766 = 0.5f; -COMPILER_STRIP_GATE(80C626C0, &lit_3766); +COMPILER_STRIP_GATE(0x80C626C0, &lit_3766); #pragma pop /* 80C62254-80C62314 000514 00C0+00 1/0 0/0 0/0 .text modeMoveOpen__11daSldWall_cFv */ @@ -572,12 +579,7 @@ asm void __sinit_d_a_obj_lv4SlideWall_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80C62658 = (void*)__sinit_d_a_obj_lv4SlideWall_cpp; +REGISTER_CTORS(0x80C62658, __sinit_d_a_obj_lv4SlideWall_cpp); #pragma pop -/* 80C626C4-80C626CE 00001C 000A+00 3/3 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80C626C4 = "L4SldWall"; -#pragma pop +/* 80C626C4-80C626C4 00001C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_lv4bridge/d_a_obj_lv4bridge.cpp b/rel/d/a/obj/d_a_obj_lv4bridge/d_a_obj_lv4bridge.cpp index 0d94a727179..5e698325f29 100644 --- a/rel/d/a/obj/d_a_obj_lv4bridge/d_a_obj_lv4bridge.cpp +++ b/rel/d/a/obj/d_a_obj_lv4bridge/d_a_obj_lv4bridge.cpp @@ -99,10 +99,10 @@ struct dBgS_MoveBgActor { /* 80078950 */ void MoveBGExecute(); }; -struct Vec {}; - struct JAISoundID {}; +struct Vec {}; + struct Z2SeMgr { /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); /* 802AC50C */ void seStartLevel(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); @@ -219,20 +219,20 @@ SECTION_RODATA static u8 const lit_3653[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C63170, &lit_3653); +COMPILER_STRIP_GATE(0x80C63170, &lit_3653); /* 80C63174-80C63178 000004 0004+00 0/1 0/0 0/0 .rodata @3654 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3654 = 1700.0f; -COMPILER_STRIP_GATE(80C63174, &lit_3654); +COMPILER_STRIP_GATE(0x80C63174, &lit_3654); #pragma pop /* 80C63178-80C6317C 000008 0004+00 0/1 0/0 0/0 .rodata @3655 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3655 = -5050.0f; -COMPILER_STRIP_GATE(80C63178, &lit_3655); +COMPILER_STRIP_GATE(0x80C63178, &lit_3655); #pragma pop /* 80C628B4-80C62994 0000B4 00E0+00 2/2 0/0 0/0 .text setBaseMtx__13daObjLv4Brg_cFv */ @@ -248,7 +248,7 @@ asm void daObjLv4Brg_c::setBaseMtx() { /* ############################################################################################## */ /* 80C6317C-80C63180 00000C 0004+00 1/2 0/0 0/0 .rodata @3676 */ SECTION_RODATA static f32 const lit_3676 = 2000.0f; -COMPILER_STRIP_GATE(80C6317C, &lit_3676); +COMPILER_STRIP_GATE(0x80C6317C, &lit_3676); /* 80C62994-80C62A2C 000194 0098+00 1/0 0/0 0/0 .text Create__13daObjLv4Brg_cFv */ #pragma push @@ -261,6 +261,12 @@ asm void daObjLv4Brg_c::Create() { #pragma pop /* ############################################################################################## */ +/* 80C63190-80C63190 000020 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80C63190 = "Obj_l4brg"; +#pragma pop + /* 80C6319C-80C631A8 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -378,7 +384,7 @@ asm void daObjLv4Brg_c::mode_init_wait() { /* ############################################################################################## */ /* 80C63180-80C63184 000010 0004+00 2/3 0/0 0/0 .rodata @3740 */ SECTION_RODATA static f32 const lit_3740 = 1.0f; -COMPILER_STRIP_GATE(80C63180, &lit_3740); +COMPILER_STRIP_GATE(0x80C63180, &lit_3740); /* 80C62C34-80C62CE4 000434 00B0+00 1/0 0/0 0/0 .text mode_wait__13daObjLv4Brg_cFv */ #pragma push @@ -406,21 +412,21 @@ asm void daObjLv4Brg_c::mode_init_move() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3766 = -1.0f; -COMPILER_STRIP_GATE(80C63184, &lit_3766); +COMPILER_STRIP_GATE(0x80C63184, &lit_3766); #pragma pop /* 80C63188-80C6318C 000018 0004+00 0/1 0/0 0/0 .rodata @3767 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3767 = 20.0f; -COMPILER_STRIP_GATE(80C63188, &lit_3767); +COMPILER_STRIP_GATE(0x80C63188, &lit_3767); #pragma pop /* 80C6318C-80C63190 00001C 0004+00 0/1 0/0 0/0 .rodata @3768 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3768 = 2.0f; -COMPILER_STRIP_GATE(80C6318C, &lit_3768); +COMPILER_STRIP_GATE(0x80C6318C, &lit_3768); #pragma pop /* 80C62CFC-80C62E24 0004FC 0128+00 1/0 0/0 0/0 .text mode_move__13daObjLv4Brg_cFv */ @@ -633,9 +639,4 @@ static asm void func_80C63160() { } #pragma pop -/* 80C63190-80C6319A 000020 000A+00 1/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80C63190 = "Obj_l4brg"; -#pragma pop +/* 80C63190-80C63190 000020 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_lv4chandelier/d_a_obj_lv4chandelier.cpp b/rel/d/a/obj/d_a_obj_lv4chandelier/d_a_obj_lv4chandelier.cpp index 75a2699efe8..a863243d543 100644 --- a/rel/d/a/obj/d_a_obj_lv4chandelier/d_a_obj_lv4chandelier.cpp +++ b/rel/d/a/obj/d_a_obj_lv4chandelier/d_a_obj_lv4chandelier.cpp @@ -365,6 +365,12 @@ static asm void rideCallBack(dBgW* param_0, fopAc_ac_c* param_1, fopAc_ac_c* par #pragma pop /* ############################################################################################## */ +/* 80C66984-80C66984 000124 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80C66984 = "P_Lv4Chan"; +#pragma pop + /* 80C66990-80C66994 -00001 0004+00 3/3 0/0 0/0 .data l_arcName */ SECTION_DATA static void* l_arcName = (void*)&d_a_obj_lv4chandelier__stringBase0; @@ -383,27 +389,27 @@ asm void daObjLv4Chan_c::create1st() { SECTION_RODATA static u8 const l_bmdidx[8] = { 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x05, }; -COMPILER_STRIP_GATE(80C66860, &l_bmdidx); +COMPILER_STRIP_GATE(0x80C66860, &l_bmdidx); /* 80C66868-80C6686C 000008 0004+00 0/4 0/0 0/0 .rodata @3767 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3767 = -1.0f; -COMPILER_STRIP_GATE(80C66868, &lit_3767); +COMPILER_STRIP_GATE(0x80C66868, &lit_3767); #pragma pop /* 80C6686C-80C66870 00000C 0004+00 0/6 0/0 0/0 .rodata @3768 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3768 = 1.0f; -COMPILER_STRIP_GATE(80C6686C, &lit_3768); +COMPILER_STRIP_GATE(0x80C6686C, &lit_3768); #pragma pop /* 80C66870-80C66874 000010 0004+00 0/1 0/0 0/0 .rodata @3769 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_3769 = 0x3FC90FDB; -COMPILER_STRIP_GATE(80C66870, &lit_3769); +COMPILER_STRIP_GATE(0x80C66870, &lit_3769); #pragma pop /* 80C634CC-80C636B4 00020C 01E8+00 1/1 0/0 0/0 .text @@ -423,7 +429,7 @@ asm void daObjLv4Chan_c::setMtxChain(daObjLv4Chan_c::ChainPos* param_0, dMdl_obj #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3834 = -150.0f; -COMPILER_STRIP_GATE(80C66874, &lit_3834); +COMPILER_STRIP_GATE(0x80C66874, &lit_3834); #pragma pop /* 80C66878-80C6687C 000018 0004+00 0/6 0/0 0/0 .rodata @3835 */ @@ -435,14 +441,14 @@ SECTION_RODATA static u8 const lit_3835[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C66878, &lit_3835); +COMPILER_STRIP_GATE(0x80C66878, &lit_3835); #pragma pop /* 80C6687C-80C66880 00001C 0004+00 0/2 0/0 0/0 .rodata @3836 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3836 = 1.0f / 3.0f; -COMPILER_STRIP_GATE(80C6687C, &lit_3836); +COMPILER_STRIP_GATE(0x80C6687C, &lit_3836); #pragma pop /* 80C636B4-80C639B4 0003F4 0300+00 2/2 0/0 0/0 .text setMtx__14daObjLv4Chan_cFv */ @@ -460,28 +466,28 @@ asm void daObjLv4Chan_c::setMtx() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3888 = 1.0f / 100.0f; -COMPILER_STRIP_GATE(80C66880, &lit_3888); +COMPILER_STRIP_GATE(0x80C66880, &lit_3888); #pragma pop /* 80C66884-80C66888 000024 0004+00 0/1 0/0 0/0 .rodata @3889 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3889 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(80C66884, &lit_3889); +COMPILER_STRIP_GATE(0x80C66884, &lit_3889); #pragma pop /* 80C66888-80C6688C 000028 0004+00 0/1 0/0 0/0 .rodata @3890 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_3890 = 0x3BF5C28F; -COMPILER_STRIP_GATE(80C66888, &lit_3890); +COMPILER_STRIP_GATE(0x80C66888, &lit_3890); #pragma pop /* 80C6688C-80C66890 00002C 0004+00 0/1 0/0 0/0 .rodata @3891 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3891 = 1.0f / 40.0f; -COMPILER_STRIP_GATE(80C6688C, &lit_3891); +COMPILER_STRIP_GATE(0x80C6688C, &lit_3891); #pragma pop /* 80C639B4-80C63CFC 0006F4 0348+00 1/1 0/0 0/0 .text rideActor__14daObjLv4Chan_cFP10fopAc_ac_c */ @@ -519,84 +525,84 @@ static asm void searchSwChain(void* param_0, void* param_1) { #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4080 = 0xC3231EB8; -COMPILER_STRIP_GATE(80C66890, &lit_4080); +COMPILER_STRIP_GATE(0x80C66890, &lit_4080); #pragma pop /* 80C66894-80C66898 000034 0004+00 0/2 0/0 0/0 .rodata @4081 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4081 = 0xC38D451F; -COMPILER_STRIP_GATE(80C66894, &lit_4081); +COMPILER_STRIP_GATE(0x80C66894, &lit_4081); #pragma pop /* 80C66898-80C6689C 000038 0004+00 0/2 0/0 0/0 .rodata @4082 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4082 = 0x438D451F; -COMPILER_STRIP_GATE(80C66898, &lit_4082); +COMPILER_STRIP_GATE(0x80C66898, &lit_4082); #pragma pop /* 80C6689C-80C668A0 00003C 0004+00 0/2 0/0 0/0 .rodata @4083 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4083 = 326.25f; -COMPILER_STRIP_GATE(80C6689C, &lit_4083); +COMPILER_STRIP_GATE(0x80C6689C, &lit_4083); #pragma pop /* 80C668A0-80C668A4 000040 0004+00 0/4 0/0 0/0 .rodata @4084 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4084 = 35.0f; -COMPILER_STRIP_GATE(80C668A0, &lit_4084); +COMPILER_STRIP_GATE(0x80C668A0, &lit_4084); #pragma pop /* 80C668A4-80C668A8 000044 0004+00 0/1 0/0 0/0 .rodata @4085 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4085 = -800.0f; -COMPILER_STRIP_GATE(80C668A4, &lit_4085); +COMPILER_STRIP_GATE(0x80C668A4, &lit_4085); #pragma pop /* 80C668A8-80C668AC 000048 0004+00 0/1 0/0 0/0 .rodata @4086 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4086 = 40.0f; -COMPILER_STRIP_GATE(80C668A8, &lit_4086); +COMPILER_STRIP_GATE(0x80C668A8, &lit_4086); #pragma pop /* 80C668AC-80C668B0 00004C 0004+00 0/1 0/0 0/0 .rodata @4087 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4087 = 1700.0f; -COMPILER_STRIP_GATE(80C668AC, &lit_4087); +COMPILER_STRIP_GATE(0x80C668AC, &lit_4087); #pragma pop /* 80C668B0-80C668B4 000050 0004+00 0/1 0/0 0/0 .rodata @4088 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4088 = -600.0f; -COMPILER_STRIP_GATE(80C668B0, &lit_4088); +COMPILER_STRIP_GATE(0x80C668B0, &lit_4088); #pragma pop /* 80C668B4-80C668B8 000054 0004+00 0/1 0/0 0/0 .rodata @4089 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4089 = 800.0f; -COMPILER_STRIP_GATE(80C668B4, &lit_4089); +COMPILER_STRIP_GATE(0x80C668B4, &lit_4089); #pragma pop /* 80C668B8-80C668BC 000058 0004+00 0/2 0/0 0/0 .rodata @4090 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4090 = 10.0f; -COMPILER_STRIP_GATE(80C668B8, &lit_4090); +COMPILER_STRIP_GATE(0x80C668B8, &lit_4090); #pragma pop /* 80C668BC-80C668C0 00005C 0004+00 0/1 0/0 0/0 .rodata @4091 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4091 = 600.0f; -COMPILER_STRIP_GATE(80C668BC, &lit_4091); +COMPILER_STRIP_GATE(0x80C668BC, &lit_4091); #pragma pop /* 80C668C0-80C668C8 000060 0008+00 0/3 0/0 0/0 .rodata @4093 */ @@ -605,7 +611,7 @@ COMPILER_STRIP_GATE(80C668BC, &lit_4091); SECTION_RODATA static u8 const lit_4093[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C668C0, &lit_4093); +COMPILER_STRIP_GATE(0x80C668C0, &lit_4093); #pragma pop /* 80C66994-80C669D4 000004 0040+00 1/1 0/0 0/0 .data cc_sph_src */ @@ -631,14 +637,14 @@ asm void daObjLv4Chan_c::Create() { #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4154 = 0xBF350481; -COMPILER_STRIP_GATE(80C668C8, &lit_4154); +COMPILER_STRIP_GATE(0x80C668C8, &lit_4154); #pragma pop /* 80C668CC-80C668D0 00006C 0004+00 0/1 0/0 0/0 .rodata @4155 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4155 = 1225.0f; -COMPILER_STRIP_GATE(80C668CC, &lit_4155); +COMPILER_STRIP_GATE(0x80C668CC, &lit_4155); #pragma pop /* 80C6449C-80C64668 0011DC 01CC+00 1/1 0/0 0/0 .text @@ -659,7 +665,7 @@ asm void daObjLv4Chan_c::constraintChain(daObjLv4Chan_c::ChainPos* param_0, int SECTION_RODATA static u8 const l_pos0[12] = { 0xC3, 0x23, 0x1E, 0xB8, 0x43, 0x16, 0x00, 0x00, 0xC3, 0x8D, 0x45, 0x1F, }; -COMPILER_STRIP_GATE(80C668D0, &l_pos0); +COMPILER_STRIP_GATE(0x80C668D0, &l_pos0); #pragma pop /* 80C668DC-80C668E8 00007C 000C+00 0/1 0/0 0/0 .rodata l_pos1 */ @@ -668,7 +674,7 @@ COMPILER_STRIP_GATE(80C668D0, &l_pos0); SECTION_RODATA static u8 const l_pos1[12] = { 0xC3, 0x23, 0x1E, 0xB8, 0x43, 0x16, 0x00, 0x00, 0x43, 0x8D, 0x45, 0x1F, }; -COMPILER_STRIP_GATE(80C668DC, &l_pos1); +COMPILER_STRIP_GATE(0x80C668DC, &l_pos1); #pragma pop /* 80C668E8-80C668F4 000088 000C+00 0/1 0/0 0/0 .rodata l_pos2 */ @@ -677,14 +683,14 @@ COMPILER_STRIP_GATE(80C668DC, &l_pos1); SECTION_RODATA static u8 const l_pos2[12] = { 0x43, 0xA3, 0x20, 0x00, 0x43, 0x16, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C668E8, &l_pos2); +COMPILER_STRIP_GATE(0x80C668E8, &l_pos2); #pragma pop /* 80C668F4-80C668F8 000094 0004+00 0/2 0/0 0/0 .rodata @4190 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4190 = 0.5f; -COMPILER_STRIP_GATE(80C668F4, &lit_4190); +COMPILER_STRIP_GATE(0x80C668F4, &lit_4190); #pragma pop /* 80C64668-80C647FC 0013A8 0194+00 1/1 0/0 0/0 .text constraintBase__14daObjLv4Chan_cFv @@ -712,7 +718,7 @@ asm void daObjLv4Chan_c::calcVec(daObjLv4Chan_c::ChainPos* param_0, int param_1) /* ############################################################################################## */ /* 80C668F8-80C668FC 000098 0004+00 1/1 0/0 0/0 .rodata @4220 */ SECTION_RODATA static f32 const lit_4220 = 300.0f; -COMPILER_STRIP_GATE(80C668F8, &lit_4220); +COMPILER_STRIP_GATE(0x80C668F8, &lit_4220); /* 80C64878-80C648F4 0015B8 007C+00 2/2 0/0 0/0 .text chkGnd__14daObjLv4Chan_cFv */ #pragma push @@ -733,70 +739,70 @@ SECTION_RODATA static u8 const l_curve[40] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x04, }; -COMPILER_STRIP_GATE(80C668FC, &l_curve); +COMPILER_STRIP_GATE(0x80C668FC, &l_curve); #pragma pop /* 80C66924-80C66928 0000C4 0004+00 0/1 0/0 0/0 .rodata @4843 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4843 = 0.125f; -COMPILER_STRIP_GATE(80C66924, &lit_4843); +COMPILER_STRIP_GATE(0x80C66924, &lit_4843); #pragma pop /* 80C66928-80C6692C 0000C8 0004+00 0/1 0/0 0/0 .rodata @4844 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4844 = 7.0f / 10.0f; -COMPILER_STRIP_GATE(80C66928, &lit_4844); +COMPILER_STRIP_GATE(0x80C66928, &lit_4844); #pragma pop /* 80C6692C-80C66930 0000CC 0004+00 0/1 0/0 0/0 .rodata @4845 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4845 = 3.0f; -COMPILER_STRIP_GATE(80C6692C, &lit_4845); +COMPILER_STRIP_GATE(0x80C6692C, &lit_4845); #pragma pop /* 80C66930-80C66934 0000D0 0004+00 0/1 0/0 0/0 .rodata @4846 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4846 = 1.0f / 20.0f; -COMPILER_STRIP_GATE(80C66930, &lit_4846); +COMPILER_STRIP_GATE(0x80C66930, &lit_4846); #pragma pop /* 80C66934-80C66938 0000D4 0004+00 0/2 0/0 0/0 .rodata @4847 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4847 = 2.0f / 5.0f; -COMPILER_STRIP_GATE(80C66934, &lit_4847); +COMPILER_STRIP_GATE(0x80C66934, &lit_4847); #pragma pop /* 80C66938-80C6693C 0000D8 0004+00 0/1 0/0 0/0 .rodata @4848 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4848 = 6.0f; -COMPILER_STRIP_GATE(80C66938, &lit_4848); +COMPILER_STRIP_GATE(0x80C66938, &lit_4848); #pragma pop /* 80C6693C-80C66940 0000DC 0004+00 0/1 0/0 0/0 .rodata @4849 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4849 = 15.0f; -COMPILER_STRIP_GATE(80C6693C, &lit_4849); +COMPILER_STRIP_GATE(0x80C6693C, &lit_4849); #pragma pop /* 80C66940-80C66944 0000E0 0004+00 0/1 0/0 0/0 .rodata @4850 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4850 = -4.0f; -COMPILER_STRIP_GATE(80C66940, &lit_4850); +COMPILER_STRIP_GATE(0x80C66940, &lit_4850); #pragma pop /* 80C66944-80C66948 0000E4 0004+00 0/1 0/0 0/0 .rodata @4851 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4851 = 0xBF5DB22D; -COMPILER_STRIP_GATE(80C66944, &lit_4851); +COMPILER_STRIP_GATE(0x80C66944, &lit_4851); #pragma pop /* 80C66948-80C66950 0000E8 0004+04 0/1 0/0 0/0 .rodata @4852 */ @@ -807,7 +813,7 @@ SECTION_RODATA static u32 const lit_4852[1 + 1 /* padding */] = { /* padding */ 0x00000000, }; -COMPILER_STRIP_GATE(80C66948, &lit_4852); +COMPILER_STRIP_GATE(0x80C66948, &lit_4852); #pragma pop /* 80C648F4-80C65F04 001634 1610+00 1/0 0/0 0/0 .text Execute__14daObjLv4Chan_cFPPA3_A4_f @@ -828,7 +834,7 @@ asm void daObjLv4Chan_c::Execute(f32 (**param_0)[3][4]) { SECTION_RODATA static u8 const lit_4926[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C66950, &lit_4926); +COMPILER_STRIP_GATE(0x80C66950, &lit_4926); #pragma pop /* 80C66958-80C66960 0000F8 0008+00 0/1 0/0 0/0 .rodata @4927 */ @@ -837,7 +843,7 @@ COMPILER_STRIP_GATE(80C66950, &lit_4926); SECTION_RODATA static u8 const lit_4927[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C66958, &lit_4927); +COMPILER_STRIP_GATE(0x80C66958, &lit_4927); #pragma pop /* 80C66960-80C66968 000100 0008+00 0/1 0/0 0/0 .rodata @4928 */ @@ -846,56 +852,56 @@ COMPILER_STRIP_GATE(80C66958, &lit_4927); SECTION_RODATA static u8 const lit_4928[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C66960, &lit_4928); +COMPILER_STRIP_GATE(0x80C66960, &lit_4928); #pragma pop /* 80C66968-80C6696C 000108 0004+00 0/1 0/0 0/0 .rodata @4982 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4982 = -1000000000.0f; -COMPILER_STRIP_GATE(80C66968, &lit_4982); +COMPILER_STRIP_GATE(0x80C66968, &lit_4982); #pragma pop /* 80C6696C-80C66970 00010C 0004+00 0/1 0/0 0/0 .rodata @4983 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4983 = -1.0f / 5.0f; -COMPILER_STRIP_GATE(80C6696C, &lit_4983); +COMPILER_STRIP_GATE(0x80C6696C, &lit_4983); #pragma pop /* 80C66970-80C66974 000110 0004+00 0/1 0/0 0/0 .rodata @4984 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4984 = 500.0f; -COMPILER_STRIP_GATE(80C66970, &lit_4984); +COMPILER_STRIP_GATE(0x80C66970, &lit_4984); #pragma pop /* 80C66974-80C66978 000114 0004+00 0/1 0/0 0/0 .rodata @4985 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4985 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(80C66974, &lit_4985); +COMPILER_STRIP_GATE(0x80C66974, &lit_4985); #pragma pop /* 80C66978-80C6697C 000118 0004+00 0/1 0/0 0/0 .rodata @4986 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4986 = 2000.0f; -COMPILER_STRIP_GATE(80C66978, &lit_4986); +COMPILER_STRIP_GATE(0x80C66978, &lit_4986); #pragma pop /* 80C6697C-80C66980 00011C 0004+00 0/1 0/0 0/0 .rodata @4987 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4987 = 1600.0f; -COMPILER_STRIP_GATE(80C6697C, &lit_4987); +COMPILER_STRIP_GATE(0x80C6697C, &lit_4987); #pragma pop /* 80C66980-80C66984 000120 0004+00 0/1 0/0 0/0 .rodata @4988 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4988 = 160.0f; -COMPILER_STRIP_GATE(80C66980, &lit_4988); +COMPILER_STRIP_GATE(0x80C66980, &lit_4988); #pragma pop /* 80C65F04-80C66114 002C44 0210+00 1/0 0/0 0/0 .text Draw__14daObjLv4Chan_cFv */ @@ -1146,9 +1152,4 @@ asm void daObjSwChain_c::checkTight() { } #pragma pop -/* 80C66984-80C6698E 000124 000A+00 1/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80C66984 = "P_Lv4Chan"; -#pragma pop +/* 80C66984-80C66984 000124 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_lv4digsand/d_a_obj_lv4digsand.cpp b/rel/d/a/obj/d_a_obj_lv4digsand/d_a_obj_lv4digsand.cpp index 51ded8ea541..9516ea9864f 100644 --- a/rel/d/a/obj/d_a_obj_lv4digsand/d_a_obj_lv4digsand.cpp +++ b/rel/d/a/obj/d_a_obj_lv4digsand/d_a_obj_lv4digsand.cpp @@ -172,7 +172,7 @@ extern "C" static void daObjL4DigSand_MoveBGDelete__FP16daObjL4DigSand_c(); extern "C" static void daObjL4DigSand_MoveBGExecute__FP16daObjL4DigSand_c(); extern "C" static void daObjL4DigSand_MoveBGDraw__FP16daObjL4DigSand_c(); extern "C" void __dt__10cCcD_GSttsFv(); -extern "C" void func_80C67588(u8*); +extern "C" void func_80C67588(void* _this, u8*); extern "C" static void func_80C675A4(); extern "C" static void func_80C675AC(); extern "C" static void func_80C675B4(); @@ -275,6 +275,12 @@ asm void daObjL4DigSand_c::Create() { #pragma pop /* ############################################################################################## */ +/* 80C675E4-80C675E4 000010 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80C675E4 = "P_DSand"; +#pragma pop + /* 80C675EC-80C675F8 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -400,7 +406,7 @@ asm void daObjL4DigSand_c::mode_wait() { /* ############################################################################################## */ /* 80C675D4-80C675D8 000000 0004+00 2/2 0/0 0/0 .rodata @3746 */ SECTION_RODATA static f32 const lit_3746 = -1000000000.0f; -COMPILER_STRIP_GATE(80C675D4, &lit_3746); +COMPILER_STRIP_GATE(0x80C675D4, &lit_3746); /* 80C67658-80C67678 -00001 0020+00 1/0 0/0 0/0 .data daObjL4DigSand_METHODS */ SECTION_DATA static void* daObjL4DigSand_METHODS[8] = { @@ -514,21 +520,21 @@ asm dBgS_ObjGndChk::~dBgS_ObjGndChk() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3765 = 10.0f; -COMPILER_STRIP_GATE(80C675D8, &lit_3765); +COMPILER_STRIP_GATE(0x80C675D8, &lit_3765); #pragma pop /* 80C675DC-80C675E0 000008 0004+00 0/1 0/0 0/0 .rodata @3766 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3766 = 15.0f; -COMPILER_STRIP_GATE(80C675DC, &lit_3766); +COMPILER_STRIP_GATE(0x80C675DC, &lit_3766); #pragma pop /* 80C675E0-80C675E4 00000C 0004+00 0/1 0/0 0/0 .rodata @3767 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3767 = 1.0f; -COMPILER_STRIP_GATE(80C675E0, &lit_3767); +COMPILER_STRIP_GATE(0x80C675E0, &lit_3767); #pragma pop /* 80C66FFC-80C670AC 00055C 00B0+00 1/0 0/0 0/0 .text mode_dig__16daObjL4DigSand_cFv */ @@ -700,7 +706,7 @@ asm cCcD_GStts::~cCcD_GStts() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80C67588(u8* param_0) { +extern "C" asm void func_80C67588(void* _this, u8* param_0) { nofralloc #include "asm/rel/d/a/obj/d_a_obj_lv4digsand/d_a_obj_lv4digsand/func_80C67588.s" } @@ -756,9 +762,4 @@ static asm void func_80C675C4() { } #pragma pop -/* 80C675E4-80C675EC 000010 0008+00 1/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80C675E4 = "P_DSand"; -#pragma pop +/* 80C675E4-80C675E4 000010 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_lv4floor/d_a_obj_lv4floor.cpp b/rel/d/a/obj/d_a_obj_lv4floor/d_a_obj_lv4floor.cpp index 991d3e43bb0..17cb69d4cea 100644 --- a/rel/d/a/obj/d_a_obj_lv4floor/d_a_obj_lv4floor.cpp +++ b/rel/d/a/obj/d_a_obj_lv4floor/d_a_obj_lv4floor.cpp @@ -172,6 +172,12 @@ asm void daObjLv4Floor_c::Create() { #pragma pop /* ############################################################################################## */ +/* 80C67D90-80C67D90 000010 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80C67D90 = "P_L4Floor"; +#pragma pop + /* 80C67D9C-80C67DA8 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -292,7 +298,7 @@ SECTION_RODATA static u8 const lit_3704[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C67D80, &lit_3704); +COMPILER_STRIP_GATE(0x80C67D80, &lit_3704); /* 80C67B28-80C67B40 0003A8 0018+00 1/1 0/0 0/0 .text mode_init_move__15daObjLv4Floor_cFv */ @@ -310,21 +316,21 @@ asm void daObjLv4Floor_c::mode_init_move() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3711 = 19.0f / 5.0f; -COMPILER_STRIP_GATE(80C67D84, &lit_3711); +COMPILER_STRIP_GATE(0x80C67D84, &lit_3711); #pragma pop /* 80C67D88-80C67D8C 000008 0004+00 0/1 0/0 0/0 .rodata @3712 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3712 = 2.0f / 25.0f; -COMPILER_STRIP_GATE(80C67D88, &lit_3712); +COMPILER_STRIP_GATE(0x80C67D88, &lit_3712); #pragma pop /* 80C67D8C-80C67D90 00000C 0004+00 0/1 0/0 0/0 .rodata @3713 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3713 = -1500.0f; -COMPILER_STRIP_GATE(80C67D8C, &lit_3713); +COMPILER_STRIP_GATE(0x80C67D8C, &lit_3713); #pragma pop /* 80C67B40-80C67BA8 0003C0 0068+00 1/0 0/0 0/0 .text mode_move__15daObjLv4Floor_cFv */ @@ -459,9 +465,4 @@ static asm void daObjLv4Floor_MoveBGDraw(daObjLv4Floor_c* param_0) { } #pragma pop -/* 80C67D90-80C67D9A 000010 000A+00 1/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80C67D90 = "P_L4Floor"; -#pragma pop +/* 80C67D90-80C67D90 000010 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_lv4gear/d_a_obj_lv4gear.cpp b/rel/d/a/obj/d_a_obj_lv4gear/d_a_obj_lv4gear.cpp index 646b0f5ce10..8e09483a9e4 100644 --- a/rel/d/a/obj/d_a_obj_lv4gear/d_a_obj_lv4gear.cpp +++ b/rel/d/a/obj/d_a_obj_lv4gear/d_a_obj_lv4gear.cpp @@ -51,10 +51,10 @@ struct dRes_control_c { /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); }; -struct Vec {}; - struct JAISoundID {}; +struct Vec {}; + struct Z2SeMgr { /* 802AC50C */ void seStartLevel(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); }; @@ -178,7 +178,13 @@ asm void daObjLv4Gear_c::Create() { SECTION_RODATA static u8 const l_bmd[8] = { 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x03, }; -COMPILER_STRIP_GATE(80C68500, &l_bmd); +COMPILER_STRIP_GATE(0x80C68500, &l_bmd); + +/* 80C68524-80C68524 000024 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80C68524 = "P_Gear"; +#pragma pop /* 80C6852C-80C68530 -00001 0004+00 3/3 0/0 0/0 .data l_arcName */ SECTION_DATA static void* l_arcName = (void*)&d_a_obj_lv4gear__stringBase0; @@ -200,21 +206,21 @@ asm void daObjLv4Gear_c::CreateHeap() { SECTION_RODATA static u8 const l_size[8] = { 0x42, 0xC8, 0x00, 0x00, 0x43, 0x96, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C68508, &l_size); +COMPILER_STRIP_GATE(0x80C68508, &l_size); #pragma pop /* 80C68510-80C68514 000010 0004+00 0/1 0/0 0/0 .rodata l_rot_start_time */ #pragma push #pragma force_active on SECTION_RODATA static u32 const l_rot_start_time = 0x000F0064; -COMPILER_STRIP_GATE(80C68510, &l_rot_start_time); +COMPILER_STRIP_GATE(0x80C68510, &l_rot_start_time); #pragma pop /* 80C68514-80C6851C 000014 0008+00 1/1 0/0 0/0 .rodata l_heap_size */ SECTION_RODATA static u8 const l_heap_size[8] = { 0x00, 0x00, 0x0F, 0x00, 0x00, 0x00, 0x0F, 0x00, }; -COMPILER_STRIP_GATE(80C68514, &l_heap_size); +COMPILER_STRIP_GATE(0x80C68514, &l_heap_size); /* 80C68124-80C681F4 000284 00D0+00 1/1 0/0 0/0 .text create__14daObjLv4Gear_cFv */ #pragma push @@ -231,14 +237,14 @@ asm void daObjLv4Gear_c::create() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3773 = 1.0f; -COMPILER_STRIP_GATE(80C6851C, &lit_3773); +COMPILER_STRIP_GATE(0x80C6851C, &lit_3773); #pragma pop /* 80C68520-80C68524 000020 0004+00 0/1 0/0 0/0 .rodata @3774 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3774 = -1.0f; -COMPILER_STRIP_GATE(80C68520, &lit_3774); +COMPILER_STRIP_GATE(0x80C68520, &lit_3774); #pragma pop /* 80C681F4-80C683E0 000354 01EC+00 1/1 0/0 0/0 .text execute__14daObjLv4Gear_cFv */ @@ -334,9 +340,4 @@ SECTION_DATA extern void* g_profile_Obj_Lv4Gear[12] = { (void*)0x00040100, (void*)0x000E0000, }; -/* 80C68524-80C6852B 000024 0007+00 1/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80C68524 = "P_Gear"; -#pragma pop +/* 80C68524-80C68524 000024 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_lv4prelvtr/d_a_obj_lv4prelvtr.cpp b/rel/d/a/obj/d_a_obj_lv4prelvtr/d_a_obj_lv4prelvtr.cpp index d6a7377244a..a5b4b82671d 100644 --- a/rel/d/a/obj/d_a_obj_lv4prelvtr/d_a_obj_lv4prelvtr.cpp +++ b/rel/d/a/obj/d_a_obj_lv4prelvtr/d_a_obj_lv4prelvtr.cpp @@ -130,6 +130,12 @@ extern "C" extern u8 j3dSys[284]; // /* ############################################################################################## */ +/* 80C68B90-80C68B90 000028 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80C68B90 = "PRElvtr"; +#pragma pop + /* 80C68B98-80C68B9C -00001 0004+00 3/3 0/0 0/0 .data l_arcName */ SECTION_DATA static void* l_arcName = (void*)&d_a_obj_lv4prelvtr__stringBase0; @@ -169,7 +175,7 @@ SECTION_RODATA static u8 const l_cull_box[24] = { 0xC4, 0x35, 0x40, 0x00, 0xC3, 0x9D, 0x80, 0x00, 0xC4, 0x35, 0x40, 0x00, 0x44, 0x35, 0x40, 0x00, 0xC1, 0x70, 0x00, 0x00, 0x44, 0x35, 0x40, 0x00, }; -COMPILER_STRIP_GATE(80C68B68, &l_cull_box); +COMPILER_STRIP_GATE(0x80C68B68, &l_cull_box); /* 80C68768-80C687D0 0001E8 0068+00 1/0 0/0 0/0 .text Create__14daObjPRElvtr_cFv */ #pragma push @@ -194,17 +200,17 @@ static asm void searchObjSwTurn(void* param_0, void* param_1) { /* ############################################################################################## */ /* 80C68B80-80C68B84 000018 0004+00 1/1 0/0 0/0 .rodata @3694 */ SECTION_RODATA static f32 const lit_3694 = 900.0f; -COMPILER_STRIP_GATE(80C68B80, &lit_3694); +COMPILER_STRIP_GATE(0x80C68B80, &lit_3694); /* 80C68B84-80C68B88 00001C 0004+00 1/1 0/0 0/0 .rodata @3695 */ SECTION_RODATA static f32 const lit_3695 = 16383.0f; -COMPILER_STRIP_GATE(80C68B84, &lit_3695); +COMPILER_STRIP_GATE(0x80C68B84, &lit_3695); /* 80C68B88-80C68B90 000020 0008+00 1/1 0/0 0/0 .rodata @3697 */ SECTION_RODATA static u8 const lit_3697[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C68B88, &lit_3697); +COMPILER_STRIP_GATE(0x80C68B88, &lit_3697); /* 80C68844-80C68944 0002C4 0100+00 1/0 0/0 0/0 .text Execute__14daObjPRElvtr_cFPPA3_A4_f */ @@ -329,9 +335,4 @@ asm daObjPRElvtr_c::~daObjPRElvtr_c() { } #pragma pop -/* 80C68B90-80C68B98 000028 0008+00 1/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80C68B90 = "PRElvtr"; -#pragma pop +/* 80C68B90-80C68B90 000028 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_lv4prwall/d_a_obj_lv4prwall.cpp b/rel/d/a/obj/d_a_obj_lv4prwall/d_a_obj_lv4prwall.cpp index 4fe0ef4a98d..80ca958122c 100644 --- a/rel/d/a/obj/d_a_obj_lv4prwall/d_a_obj_lv4prwall.cpp +++ b/rel/d/a/obj/d_a_obj_lv4prwall/d_a_obj_lv4prwall.cpp @@ -81,10 +81,10 @@ struct dBgS_MoveBgActor { /* 80078950 */ void MoveBGExecute(); }; -struct Vec {}; - struct JAISoundID {}; +struct Vec {}; + struct Z2SeMgr { /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); /* 802AC50C */ void seStartLevel(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); @@ -177,7 +177,15 @@ extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; SECTION_RODATA static u8 const l_dzbidx[12] = { 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x07, }; -COMPILER_STRIP_GATE(80C698E8, &l_dzbidx); +COMPILER_STRIP_GATE(0x80C698E8, &l_dzbidx); + +/* 80C69974-80C69974 00008C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80C69974 = "PRWallR09"; +SECTION_DEAD static char const* const stringBase_80C6997E = "P_Rwall"; +SECTION_DEAD static char const* const stringBase_80C69986 = "PRWallR04"; +#pragma pop /* 80C69990-80C6999C -00001 000C+00 3/3 0/0 0/0 .data l_arcName */ SECTION_DATA static void* l_arcName[3] = { @@ -201,7 +209,7 @@ asm void daObjLv4PRwall_c::create1st() { SECTION_RODATA static u8 const l_bmdidx[12] = { 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x04, }; -COMPILER_STRIP_GATE(80C698F4, &l_bmdidx); +COMPILER_STRIP_GATE(0x80C698F4, &l_bmdidx); /* 80C69900-80C69948 000018 0048+00 1/1 0/0 0/0 .rodata l_cull_box */ SECTION_RODATA static u8 const l_cull_box[72] = { @@ -211,21 +219,21 @@ SECTION_RODATA static u8 const l_cull_box[72] = { 0x89, 0x90, 0x00, 0xC4, 0x89, 0x87, 0x5C, 0xC3, 0x48, 0x33, 0x33, 0xC4, 0x89, 0x87, 0x5C, 0x44, 0x89, 0x87, 0x5C, 0x44, 0x7A, 0x2C, 0xCD, 0x44, 0x89, 0x87, 0x5C, }; -COMPILER_STRIP_GATE(80C69900, &l_cull_box); +COMPILER_STRIP_GATE(0x80C69900, &l_cull_box); /* 80C69948-80C6994C 000060 0004+00 1/1 0/0 0/0 .rodata @3688 */ SECTION_RODATA static u32 const lit_3688 = 0x3C800000; -COMPILER_STRIP_GATE(80C69948, &lit_3688); +COMPILER_STRIP_GATE(0x80C69948, &lit_3688); /* 80C6994C-80C69950 000064 0004+00 1/1 0/0 0/0 .rodata @3689 */ SECTION_RODATA static f32 const lit_3689 = 2.0f; -COMPILER_STRIP_GATE(80C6994C, &lit_3689); +COMPILER_STRIP_GATE(0x80C6994C, &lit_3689); /* 80C69950-80C69958 000068 0008+00 1/1 0/0 0/0 .rodata @3691 */ SECTION_RODATA static u8 const lit_3691[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C69950, &lit_3691); +COMPILER_STRIP_GATE(0x80C69950, &lit_3691); /* 80C68DD8-80C68F20 0001B8 0148+00 3/3 0/0 0/0 .text setMtx__16daObjLv4PRwall_cFv */ #pragma push @@ -255,7 +263,7 @@ SECTION_RODATA static u8 const lit_3713[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C69958, &lit_3713); +COMPILER_STRIP_GATE(0x80C69958, &lit_3713); /* 80C68FA0-80C69064 000380 00C4+00 1/0 0/0 0/0 .text Create__16daObjLv4PRwall_cFv */ #pragma push @@ -282,42 +290,42 @@ static asm void searchObjSwTurn(void* param_0, void* param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3959 = -2.0f; -COMPILER_STRIP_GATE(80C6995C, &lit_3959); +COMPILER_STRIP_GATE(0x80C6995C, &lit_3959); #pragma pop /* 80C69960-80C69964 000078 0004+00 0/1 0/0 0/0 .rodata @3960 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3960 = 1.0f; -COMPILER_STRIP_GATE(80C69960, &lit_3960); +COMPILER_STRIP_GATE(0x80C69960, &lit_3960); #pragma pop /* 80C69964-80C69968 00007C 0004+00 0/1 0/0 0/0 .rodata @3961 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3961 = -1.0f; -COMPILER_STRIP_GATE(80C69964, &lit_3961); +COMPILER_STRIP_GATE(0x80C69964, &lit_3961); #pragma pop /* 80C69968-80C6996C 000080 0004+00 0/1 0/0 0/0 .rodata @3962 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3962 = 0.5f; -COMPILER_STRIP_GATE(80C69968, &lit_3962); +COMPILER_STRIP_GATE(0x80C69968, &lit_3962); #pragma pop /* 80C6996C-80C69970 000084 0004+00 0/1 0/0 0/0 .rodata @3963 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3963 = -1.0f / 5.0f; -COMPILER_STRIP_GATE(80C6996C, &lit_3963); +COMPILER_STRIP_GATE(0x80C6996C, &lit_3963); #pragma pop /* 80C69970-80C69974 000088 0004+00 0/1 0/0 0/0 .rodata @3964 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3964 = 20.0f; -COMPILER_STRIP_GATE(80C69970, &lit_3964); +COMPILER_STRIP_GATE(0x80C69970, &lit_3964); #pragma pop /* 80C690D8-80C696BC 0004B8 05E4+00 1/0 0/0 0/0 .text Execute__16daObjLv4PRwall_cFPPA3_A4_f */ @@ -442,11 +450,4 @@ asm daObjLv4PRwall_c::~daObjLv4PRwall_c() { } #pragma pop -/* 80C69974-80C69990 00008C 001C+00 1/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80C69974 = "PRWallR09"; -SECTION_DEAD static char const* const stringBase_80C6997E = "P_Rwall"; -SECTION_DEAD static char const* const stringBase_80C69986 = "PRWallR04"; -#pragma pop +/* 80C69974-80C69974 00008C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_lv4sand/d_a_obj_lv4sand.cpp b/rel/d/a/obj/d_a_obj_lv4sand/d_a_obj_lv4sand.cpp index e2d71791a23..91b52de084a 100644 --- a/rel/d/a/obj/d_a_obj_lv4sand/d_a_obj_lv4sand.cpp +++ b/rel/d/a/obj/d_a_obj_lv4sand/d_a_obj_lv4sand.cpp @@ -106,10 +106,10 @@ struct dBgS_MoveBgActor { /* 80078950 */ void MoveBGExecute(); }; -struct Vec {}; - struct JAISoundID {}; +struct Vec {}; + struct Z2SeMgr { /* 802AC50C */ void seStartLevel(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); }; @@ -238,7 +238,7 @@ asm void daObjLv4Sand_c::setBaseMtx() { /* ############################################################################################## */ /* 80C6A3B8-80C6A3BC 000000 0004+00 3/3 0/0 0/0 .rodata @3679 */ SECTION_RODATA static f32 const lit_3679 = -3500.0f; -COMPILER_STRIP_GATE(80C6A3B8, &lit_3679); +COMPILER_STRIP_GATE(0x80C6A3B8, &lit_3679); /* 80C6A3BC-80C6A3C0 000004 0004+00 2/2 0/0 0/0 .rodata @3680 */ SECTION_RODATA static u8 const lit_3680[4] = { @@ -247,7 +247,7 @@ SECTION_RODATA static u8 const lit_3680[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C6A3BC, &lit_3680); +COMPILER_STRIP_GATE(0x80C6A3BC, &lit_3680); /* 80C69B50-80C69C28 000130 00D8+00 1/0 0/0 0/0 .text Create__14daObjLv4Sand_cFv */ #pragma push @@ -262,7 +262,13 @@ asm void daObjLv4Sand_c::Create() { /* ############################################################################################## */ /* 80C6A3C0-80C6A3C4 000008 0004+00 1/2 0/0 0/0 .rodata @3710 */ SECTION_RODATA static f32 const lit_3710 = 1.0f; -COMPILER_STRIP_GATE(80C6A3C0, &lit_3710); +COMPILER_STRIP_GATE(0x80C6A3C0, &lit_3710); + +/* 80C6A3D4-80C6A3D4 00001C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80C6A3D4 = "P_L4Sand"; +#pragma pop /* 80C6A3E0-80C6A3EC 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { @@ -399,14 +405,14 @@ asm void daObjLv4Sand_c::create1st() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3748 = 3300.0f; -COMPILER_STRIP_GATE(80C6A3C4, &lit_3748); +COMPILER_STRIP_GATE(0x80C6A3C4, &lit_3748); #pragma pop /* 80C6A3C8-80C6A3CC 000010 0004+00 0/1 0/0 0/0 .rodata @3749 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3749 = -1.0f; -COMPILER_STRIP_GATE(80C6A3C8, &lit_3749); +COMPILER_STRIP_GATE(0x80C6A3C8, &lit_3749); #pragma pop /* 80C69E10-80C69F18 0003F0 0108+00 1/0 0/0 0/0 .text Execute__14daObjLv4Sand_cFPPA3_A4_f @@ -467,14 +473,14 @@ asm void daObjLv4Sand_c::mode_init_move() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3786 = 8.5f; -COMPILER_STRIP_GATE(80C6A3CC, &lit_3786); +COMPILER_STRIP_GATE(0x80C6A3CC, &lit_3786); #pragma pop /* 80C6A3D0-80C6A3D4 000018 0004+00 0/1 0/0 0/0 .rodata @3787 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3787 = 3.0f / 10.0f; -COMPILER_STRIP_GATE(80C6A3D0, &lit_3787); +COMPILER_STRIP_GATE(0x80C6A3D0, &lit_3787); #pragma pop /* 80C6A034-80C6A09C 000614 0068+00 1/0 0/0 0/0 .text mode_move__14daObjLv4Sand_cFv */ @@ -656,9 +662,4 @@ static asm void func_80C6A3A8() { } #pragma pop -/* 80C6A3D4-80C6A3DD 00001C 0009+00 1/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80C6A3D4 = "P_L4Sand"; -#pragma pop +/* 80C6A3D4-80C6A3D4 00001C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_lv5FloorBoard/d_a_obj_lv5FloorBoard.cpp b/rel/d/a/obj/d_a_obj_lv5FloorBoard/d_a_obj_lv5FloorBoard.cpp index ba7d11bf097..b2f5ad4f425 100644 --- a/rel/d/a/obj/d_a_obj_lv5FloorBoard/d_a_obj_lv5FloorBoard.cpp +++ b/rel/d/a/obj/d_a_obj_lv5FloorBoard/d_a_obj_lv5FloorBoard.cpp @@ -73,10 +73,10 @@ struct dRes_control_c { struct dPa_levelEcallBack {}; -struct _GXColor {}; - struct csXyz {}; +struct _GXColor {}; + struct dPa_control_c { /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, @@ -144,10 +144,10 @@ struct cCcD_GStts { /* 80C6B010 */ ~cCcD_GStts(); }; -struct Vec {}; - struct JAISoundID {}; +struct Vec {}; + struct Z2SeMgr { /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); }; @@ -258,7 +258,7 @@ extern "C" void __register_global_object(); /* ############################################################################################## */ /* 80C6B148-80C6B14C 000000 0004+00 4/5 0/0 0/0 .rodata @3656 */ SECTION_RODATA static f32 const lit_3656 = 1.0f; -COMPILER_STRIP_GATE(80C6B148, &lit_3656); +COMPILER_STRIP_GATE(0x80C6B148, &lit_3656); /* 80C6B198-80C6B1A4 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { @@ -441,6 +441,13 @@ asm void daFlorBoad_c::setBaseMtx() { } #pragma pop +/* ############################################################################################## */ +/* 80C6B18C-80C6B18C 000044 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80C6B18C = "L5haYuka"; +#pragma pop + /* 80C6A784-80C6A7F0 000264 006C+00 1/0 0/0 0/0 .text CreateHeap__12daFlorBoad_cFv */ #pragma push #pragma optimization_level 0 @@ -539,27 +546,27 @@ SECTION_RODATA u8 const daFlorBoad_c::mCcDObjInfo[48] = { 0x00, 0x40, 0x00, 0x20, 0x00, 0x00, 0x00, 0x11, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x01, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C6B14C, &daFlorBoad_c::mCcDObjInfo); +COMPILER_STRIP_GATE(0x80C6B14C, &daFlorBoad_c::mCcDObjInfo); /* 80C6B17C-80C6B180 000034 0004+00 0/1 0/0 0/0 .rodata @3870 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3870 = 280.0f; -COMPILER_STRIP_GATE(80C6B17C, &lit_3870); +COMPILER_STRIP_GATE(0x80C6B17C, &lit_3870); #pragma pop /* 80C6B180-80C6B184 000038 0004+00 0/1 0/0 0/0 .rodata @3871 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3871 = 170.0f; -COMPILER_STRIP_GATE(80C6B180, &lit_3871); +COMPILER_STRIP_GATE(0x80C6B180, &lit_3871); #pragma pop /* 80C6B184-80C6B188 00003C 0004+00 0/1 0/0 0/0 .rodata @3872 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3872 = 150.0f; -COMPILER_STRIP_GATE(80C6B184, &lit_3872); +COMPILER_STRIP_GATE(0x80C6B184, &lit_3872); #pragma pop /* 80C6ABAC-80C6AC9C 00068C 00F0+00 1/0 0/0 0/0 .text modeWait__12daFlorBoad_cFv */ @@ -575,7 +582,7 @@ asm void daFlorBoad_c::modeWait() { /* ############################################################################################## */ /* 80C6B188-80C6B18C 000040 0004+00 1/1 0/0 0/0 .rodata @3891 */ SECTION_RODATA static f32 const lit_3891 = -1.0f; -COMPILER_STRIP_GATE(80C6B188, &lit_3891); +COMPILER_STRIP_GATE(0x80C6B188, &lit_3891); /* 80C6AC9C-80C6AD40 00077C 00A4+00 1/1 0/0 0/0 .text init_modeBreak__12daFlorBoad_cFv */ #pragma push @@ -693,12 +700,7 @@ asm void __sinit_d_a_obj_lv5FloorBoard_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80C6B0C4 = (void*)__sinit_d_a_obj_lv5FloorBoard_cpp; +REGISTER_CTORS(0x80C6B0C4, __sinit_d_a_obj_lv5FloorBoard_cpp); #pragma pop -/* 80C6B18C-80C6B195 000044 0009+00 3/3 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80C6B18C = "L5haYuka"; -#pragma pop +/* 80C6B18C-80C6B18C 000044 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_lv5IceWall/d_a_obj_lv5IceWall.cpp b/rel/d/a/obj/d_a_obj_lv5IceWall/d_a_obj_lv5IceWall.cpp index e96f3ff1c6d..6a008d4dc79 100644 --- a/rel/d/a/obj/d_a_obj_lv5IceWall/d_a_obj_lv5IceWall.cpp +++ b/rel/d/a/obj/d_a_obj_lv5IceWall/d_a_obj_lv5IceWall.cpp @@ -75,10 +75,10 @@ struct dRes_control_c { struct dPa_levelEcallBack {}; -struct _GXColor {}; - struct csXyz {}; +struct _GXColor {}; + struct dPa_control_c { struct level_c { /* 8004B918 */ void getEmitter(u32); @@ -153,10 +153,10 @@ struct cCcD_GStts { /* 80C6C508 */ ~cCcD_GStts(); }; -struct Vec {}; - struct JAISoundID {}; +struct Vec {}; + struct Z2SeMgr { /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); }; @@ -281,7 +281,7 @@ extern "C" void __register_global_object(); /* ############################################################################################## */ /* 80C6C640-80C6C644 000000 0004+00 4/5 0/0 0/0 .rodata @3656 */ SECTION_RODATA static f32 const lit_3656 = 1.0f; -COMPILER_STRIP_GATE(80C6C640, &lit_3656); +COMPILER_STRIP_GATE(0x80C6C640, &lit_3656); /* 80C6C6C8-80C6C6D4 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { @@ -464,6 +464,13 @@ asm void daIceWall_c::setBaseMtx() { } #pragma pop +/* ############################################################################################## */ +/* 80C6C6BC-80C6C6BC 00007C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80C6C6BC = "l5IceWall"; +#pragma pop + /* 80C6B5E4-80C6B69C 0002A4 00B8+00 1/0 0/0 0/0 .text CreateHeap__11daIceWall_cFv */ #pragma push #pragma optimization_level 0 @@ -481,7 +488,7 @@ SECTION_RODATA u8 const daIceWall_c::mCcDObjInfo[48] = { 0x00, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x11, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x01, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x06, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C6C644, &daIceWall_c::mCcDObjInfo); +COMPILER_STRIP_GATE(0x80C6C644, &daIceWall_c::mCcDObjInfo); /* 80C6C674-80C6C67C 000034 0008+00 0/0 0/0 0/0 .rodata l_bmdIdx */ #pragma push @@ -489,18 +496,18 @@ COMPILER_STRIP_GATE(80C6C644, &daIceWall_c::mCcDObjInfo); SECTION_RODATA static u8 const l_bmdIdx[8] = { 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x05, }; -COMPILER_STRIP_GATE(80C6C674, &l_bmdIdx); +COMPILER_STRIP_GATE(0x80C6C674, &l_bmdIdx); #pragma pop /* 80C6C67C-80C6C680 00003C 0004+00 1/1 0/0 0/0 .rodata @3795 */ SECTION_RODATA static f32 const lit_3795 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(80C6C67C, &lit_3795); +COMPILER_STRIP_GATE(0x80C6C67C, &lit_3795); /* 80C6C680-80C6C688 000040 0008+00 1/2 0/0 0/0 .rodata @3797 */ SECTION_RODATA static u8 const lit_3797[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C6C680, &lit_3797); +COMPILER_STRIP_GATE(0x80C6C680, &lit_3797); /* 80C6B69C-80C6B924 00035C 0288+00 1/1 0/0 0/0 .text create__11daIceWall_cFv */ #pragma push @@ -612,28 +619,28 @@ SECTION_RODATA static u8 const l_eff_b[4] = { 0x86, 0x77, }; -COMPILER_STRIP_GATE(80C6C688, &l_eff_b); +COMPILER_STRIP_GATE(0x80C6C688, &l_eff_b); #pragma pop /* 80C6C68C-80C6C690 00004C 0004+00 0/2 0/0 0/0 .rodata @4050 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4050 = 13.0f / 20.0f; -COMPILER_STRIP_GATE(80C6C68C, &lit_4050); +COMPILER_STRIP_GATE(0x80C6C68C, &lit_4050); #pragma pop /* 80C6C690-80C6C694 000050 0004+00 0/2 0/0 0/0 .rodata @4051 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4051 = 2.5f; -COMPILER_STRIP_GATE(80C6C690, &lit_4051); +COMPILER_STRIP_GATE(0x80C6C690, &lit_4051); #pragma pop /* 80C6C694-80C6C698 000054 0004+00 0/2 0/0 0/0 .rodata @4052 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4052 = -1.0f; -COMPILER_STRIP_GATE(80C6C694, &lit_4052); +COMPILER_STRIP_GATE(0x80C6C694, &lit_4052); #pragma pop /* 80C6C698-80C6C69C 000058 0004+00 0/1 0/0 0/0 .rodata @4053 */ @@ -645,56 +652,56 @@ SECTION_RODATA static u8 const lit_4053[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C6C698, &lit_4053); +COMPILER_STRIP_GATE(0x80C6C698, &lit_4053); #pragma pop /* 80C6C69C-80C6C6A0 00005C 0004+00 0/1 0/0 0/0 .rodata @4054 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4054 = 130.0f; -COMPILER_STRIP_GATE(80C6C69C, &lit_4054); +COMPILER_STRIP_GATE(0x80C6C69C, &lit_4054); #pragma pop /* 80C6C6A0-80C6C6A4 000060 0004+00 0/1 0/0 0/0 .rodata @4055 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4055 = 60.0f; -COMPILER_STRIP_GATE(80C6C6A0, &lit_4055); +COMPILER_STRIP_GATE(0x80C6C6A0, &lit_4055); #pragma pop /* 80C6C6A4-80C6C6A8 000064 0004+00 0/1 0/0 0/0 .rodata @4056 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4056 = 140.0f; -COMPILER_STRIP_GATE(80C6C6A4, &lit_4056); +COMPILER_STRIP_GATE(0x80C6C6A4, &lit_4056); #pragma pop /* 80C6C6A8-80C6C6AC 000068 0004+00 0/1 0/0 0/0 .rodata @4057 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4057 = 510.0f; -COMPILER_STRIP_GATE(80C6C6A8, &lit_4057); +COMPILER_STRIP_GATE(0x80C6C6A8, &lit_4057); #pragma pop /* 80C6C6AC-80C6C6B0 00006C 0004+00 0/1 0/0 0/0 .rodata @4058 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4058 = 17.0f / 20.0f; -COMPILER_STRIP_GATE(80C6C6AC, &lit_4058); +COMPILER_STRIP_GATE(0x80C6C6AC, &lit_4058); #pragma pop /* 80C6C6B0-80C6C6B4 000070 0004+00 0/1 0/0 0/0 .rodata @4059 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4059 = 9.0f / 10.0f; -COMPILER_STRIP_GATE(80C6C6B0, &lit_4059); +COMPILER_STRIP_GATE(0x80C6C6B0, &lit_4059); #pragma pop /* 80C6C6B4-80C6C6B8 000074 0004+00 0/1 0/0 0/0 .rodata @4060 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4060 = 2.0f; -COMPILER_STRIP_GATE(80C6C6B4, &lit_4060); +COMPILER_STRIP_GATE(0x80C6C6B4, &lit_4060); #pragma pop /* 80C6BC6C-80C6C170 00092C 0504+00 1/0 0/0 0/0 .text modeWait__11daIceWall_cFv */ @@ -727,7 +734,7 @@ SECTION_RODATA static u8 const l_eff_break_b[4] = { 0x86, 0x7A, }; -COMPILER_STRIP_GATE(80C6C6B8, &l_eff_break_b); +COMPILER_STRIP_GATE(0x80C6C6B8, &l_eff_break_b); #pragma pop /* 80C6C1C0-80C6C374 000E80 01B4+00 1/0 0/0 0/0 .text modeBreak__11daIceWall_cFv */ @@ -834,12 +841,7 @@ asm void __sinit_d_a_obj_lv5IceWall_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80C6C5BC = (void*)__sinit_d_a_obj_lv5IceWall_cpp; +REGISTER_CTORS(0x80C6C5BC, __sinit_d_a_obj_lv5IceWall_cpp); #pragma pop -/* 80C6C6BC-80C6C6C6 00007C 000A+00 3/3 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80C6C6BC = "l5IceWall"; -#pragma pop +/* 80C6C6BC-80C6C6BC 00007C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_lv5SwIce/d_a_obj_lv5SwIce.cpp b/rel/d/a/obj/d_a_obj_lv5SwIce/d_a_obj_lv5SwIce.cpp index 58cde16a89c..845318b4989 100644 --- a/rel/d/a/obj/d_a_obj_lv5SwIce/d_a_obj_lv5SwIce.cpp +++ b/rel/d/a/obj/d_a_obj_lv5SwIce/d_a_obj_lv5SwIce.cpp @@ -73,10 +73,10 @@ struct dRes_control_c { struct dPa_levelEcallBack {}; -struct _GXColor {}; - struct csXyz {}; +struct _GXColor {}; + struct dPa_control_c { /* 8004D4CC */ void set(u32, u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, @@ -144,10 +144,10 @@ struct cCcD_GStts { /* 80C6D3D0 */ ~cCcD_GStts(); }; -struct Vec {}; - struct JAISoundID {}; +struct Vec {}; + struct Z2SeMgr { /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); }; @@ -438,6 +438,13 @@ asm void daLv5SwIce_c::setBaseMtx() { } #pragma pop +/* ############################################################################################## */ +/* 80C6D558-80C6D558 000050 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80C6D558 = "L5SwIce"; +#pragma pop + /* 80C6CAA8-80C6CB14 000248 006C+00 1/0 0/0 0/0 .text CreateHeap__12daLv5SwIce_cFv */ #pragma push #pragma optimization_level 0 @@ -536,7 +543,7 @@ SECTION_RODATA u8 const daLv5SwIce_c::mCcDObjInfo[48] = { 0x00, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x11, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x01, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C6D508, &daLv5SwIce_c::mCcDObjInfo); +COMPILER_STRIP_GATE(0x80C6D508, &daLv5SwIce_c::mCcDObjInfo); /* 80C6D538-80C6D53C 000030 0004+00 0/1 0/0 0/0 .rodata l_eff_r$3861 */ #pragma push @@ -547,42 +554,42 @@ SECTION_RODATA static u8 const l_eff_r[4] = { 0x8A, 0xE2, }; -COMPILER_STRIP_GATE(80C6D538, &l_eff_r); +COMPILER_STRIP_GATE(0x80C6D538, &l_eff_r); #pragma pop /* 80C6D53C-80C6D540 000034 0004+00 0/2 0/0 0/0 .rodata @3902 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3902 = 1.0f; -COMPILER_STRIP_GATE(80C6D53C, &lit_3902); +COMPILER_STRIP_GATE(0x80C6D53C, &lit_3902); #pragma pop /* 80C6D540-80C6D544 000038 0004+00 0/2 0/0 0/0 .rodata @3903 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3903 = -1.0f; -COMPILER_STRIP_GATE(80C6D540, &lit_3903); +COMPILER_STRIP_GATE(0x80C6D540, &lit_3903); #pragma pop /* 80C6D544-80C6D548 00003C 0004+00 0/1 0/0 0/0 .rodata @3904 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3904 = 120.0f; -COMPILER_STRIP_GATE(80C6D544, &lit_3904); +COMPILER_STRIP_GATE(0x80C6D544, &lit_3904); #pragma pop /* 80C6D548-80C6D54C 000040 0004+00 0/1 0/0 0/0 .rodata @3905 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3905 = 220.0f; -COMPILER_STRIP_GATE(80C6D548, &lit_3905); +COMPILER_STRIP_GATE(0x80C6D548, &lit_3905); #pragma pop /* 80C6D54C-80C6D550 000044 0004+00 0/1 0/0 0/0 .rodata @3906 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3906 = 3.0f / 5.0f; -COMPILER_STRIP_GATE(80C6D54C, &lit_3906); +COMPILER_STRIP_GATE(0x80C6D54C, &lit_3906); #pragma pop /* 80C6CED0-80C6D0F4 000670 0224+00 1/0 0/0 0/0 .text modeWait__12daLv5SwIce_cFv */ @@ -615,14 +622,14 @@ SECTION_RODATA static u8 const l_eff_break[4] = { 0x8A, 0xE0, }; -COMPILER_STRIP_GATE(80C6D550, &l_eff_break); +COMPILER_STRIP_GATE(0x80C6D550, &l_eff_break); #pragma pop /* 80C6D554-80C6D558 00004C 0004+00 0/1 0/0 0/0 .rodata @3948 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3948 = 0.75f; -COMPILER_STRIP_GATE(80C6D554, &lit_3948); +COMPILER_STRIP_GATE(0x80C6D554, &lit_3948); #pragma pop /* 80C6D144-80C6D260 0008E4 011C+00 1/0 0/0 0/0 .text modeBreak__12daLv5SwIce_cFv */ @@ -730,12 +737,7 @@ asm void __sinit_d_a_obj_lv5SwIce_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80C6D484 = (void*)__sinit_d_a_obj_lv5SwIce_cpp; +REGISTER_CTORS(0x80C6D484, __sinit_d_a_obj_lv5SwIce_cpp); #pragma pop -/* 80C6D558-80C6D560 000050 0008+00 3/3 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80C6D558 = "L5SwIce"; -#pragma pop +/* 80C6D558-80C6D558 000050 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_lv5ychndlr/d_a_obj_lv5ychndlr.cpp b/rel/d/a/obj/d_a_obj_lv5ychndlr/d_a_obj_lv5ychndlr.cpp index 859675f7111..49ab05dd3c6 100644 --- a/rel/d/a/obj/d_a_obj_lv5ychndlr/d_a_obj_lv5ychndlr.cpp +++ b/rel/d/a/obj/d_a_obj_lv5ychndlr/d_a_obj_lv5ychndlr.cpp @@ -236,6 +236,12 @@ extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; // /* ############################################################################################## */ +/* 80C6E9E8-80C6E9E8 000068 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80C6E9E8 = "Ychandelr"; +#pragma pop + /* 80C6E9F4-80C6E9F8 -00001 0004+00 3/3 0/0 0/0 .data l_arcName */ SECTION_DATA static void* l_arcName = (void*)&d_a_obj_lv5ychndlr__stringBase0; @@ -254,14 +260,14 @@ asm void daObjYchndlr_c::create1st() { SECTION_RODATA static u8 const l_bmdidx[8] = { 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x05, }; -COMPILER_STRIP_GATE(80C6E980, &l_bmdidx); +COMPILER_STRIP_GATE(0x80C6E980, &l_bmdidx); /* 80C6E988-80C6E9A0 000008 0018+00 1/1 0/0 0/0 .rodata l_cull_box */ SECTION_RODATA static u8 const l_cull_box[24] = { 0xC4, 0xBB, 0x80, 0x00, 0xC5, 0x1C, 0x40, 0x00, 0xC3, 0xFA, 0x00, 0x00, 0x44, 0xBB, 0x80, 0x00, 0x43, 0x48, 0x00, 0x00, 0x43, 0xFA, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C6E988, &l_cull_box); +COMPILER_STRIP_GATE(0x80C6E988, &l_cull_box); /* 80C6E9A0-80C6E9A4 000020 0004+00 3/4 0/0 0/0 .rodata @3699 */ SECTION_RODATA static u8 const lit_3699[4] = { @@ -270,11 +276,11 @@ SECTION_RODATA static u8 const lit_3699[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C6E9A0, &lit_3699); +COMPILER_STRIP_GATE(0x80C6E9A0, &lit_3699); /* 80C6E9A4-80C6E9A8 000024 0004+00 1/1 0/0 0/0 .rodata @3700 */ SECTION_RODATA static f32 const lit_3700 = -840.0f; -COMPILER_STRIP_GATE(80C6E9A4, &lit_3700); +COMPILER_STRIP_GATE(0x80C6E9A4, &lit_3700); /* 80C6E9F8-80C6EA28 000004 0030+00 2/2 0/0 0/0 .data l_shaft_vec */ SECTION_DATA static u8 l_shaft_vec[48] = { @@ -312,7 +318,7 @@ static asm void rideCallBack(dBgW* param_0, fopAc_ac_c* param_1, fopAc_ac_c* par /* ############################################################################################## */ /* 80C6E9A8-80C6E9AC 000028 0004+00 1/2 0/0 0/0 .rodata @3718 */ SECTION_RODATA static f32 const lit_3718 = 1.0f; -COMPILER_STRIP_GATE(80C6E9A8, &lit_3718); +COMPILER_STRIP_GATE(0x80C6E9A8, &lit_3718); /* 80C6D9A8-80C6DA5C 0002C8 00B4+00 1/1 0/0 0/0 .text rideActor__14daObjYchndlr_cFP10fopAc_ac_c */ #pragma push @@ -368,77 +374,77 @@ asm void daObjYchndlr_c::Create() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3881 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(80C6E9AC, &lit_3881); +COMPILER_STRIP_GATE(0x80C6E9AC, &lit_3881); #pragma pop /* 80C6E9B0-80C6E9B4 000030 0004+00 0/1 0/0 0/0 .rodata @3882 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3882 = 350.0f; -COMPILER_STRIP_GATE(80C6E9B0, &lit_3882); +COMPILER_STRIP_GATE(0x80C6E9B0, &lit_3882); #pragma pop /* 80C6E9B4-80C6E9B8 000034 0004+00 0/1 0/0 0/0 .rodata @3883 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3883 = 4750.0f; -COMPILER_STRIP_GATE(80C6E9B4, &lit_3883); +COMPILER_STRIP_GATE(0x80C6E9B4, &lit_3883); #pragma pop /* 80C6E9B8-80C6E9BC 000038 0004+00 0/1 0/0 0/0 .rodata @3884 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3884 = -1.0f; -COMPILER_STRIP_GATE(80C6E9B8, &lit_3884); +COMPILER_STRIP_GATE(0x80C6E9B8, &lit_3884); #pragma pop /* 80C6E9BC-80C6E9C0 00003C 0004+00 0/1 0/0 0/0 .rodata @3885 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3885 = -350.0f; -COMPILER_STRIP_GATE(80C6E9BC, &lit_3885); +COMPILER_STRIP_GATE(0x80C6E9BC, &lit_3885); #pragma pop /* 80C6E9C0-80C6E9C4 000040 0004+00 0/1 0/0 0/0 .rodata @3886 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3886 = -4750.0f; -COMPILER_STRIP_GATE(80C6E9C0, &lit_3886); +COMPILER_STRIP_GATE(0x80C6E9C0, &lit_3886); #pragma pop /* 80C6E9C4-80C6E9C8 000044 0004+00 0/1 0/0 0/0 .rodata @3887 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_3887 = 0x3F7F9DB2; -COMPILER_STRIP_GATE(80C6E9C4, &lit_3887); +COMPILER_STRIP_GATE(0x80C6E9C4, &lit_3887); #pragma pop /* 80C6E9C8-80C6E9CC 000048 0004+00 0/1 0/0 0/0 .rodata @3888 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3888 = 3.0f / 25.0f; -COMPILER_STRIP_GATE(80C6E9C8, &lit_3888); +COMPILER_STRIP_GATE(0x80C6E9C8, &lit_3888); #pragma pop /* 80C6E9CC-80C6E9D0 00004C 0004+00 0/1 0/0 0/0 .rodata @3889 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3889 = 120.0f; -COMPILER_STRIP_GATE(80C6E9CC, &lit_3889); +COMPILER_STRIP_GATE(0x80C6E9CC, &lit_3889); #pragma pop /* 80C6E9D0-80C6E9D4 000050 0004+00 0/1 0/0 0/0 .rodata @3890 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3890 = 210.0f; -COMPILER_STRIP_GATE(80C6E9D0, &lit_3890); +COMPILER_STRIP_GATE(0x80C6E9D0, &lit_3890); #pragma pop /* 80C6E9D4-80C6E9D8 000054 0004+00 0/1 0/0 0/0 .rodata @3891 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3891 = -30.0f; -COMPILER_STRIP_GATE(80C6E9D4, &lit_3891); +COMPILER_STRIP_GATE(0x80C6E9D4, &lit_3891); #pragma pop /* 80C6E9D8-80C6E9E0 000058 0004+04 0/1 0/0 0/0 .rodata @3892 */ @@ -449,7 +455,7 @@ SECTION_RODATA static f32 const lit_3892[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80C6E9D8, &lit_3892); +COMPILER_STRIP_GATE(0x80C6E9D8, &lit_3892); #pragma pop /* 80C6E9E0-80C6E9E8 000060 0008+00 0/1 0/0 0/0 .rodata @3894 */ @@ -458,7 +464,7 @@ COMPILER_STRIP_GATE(80C6E9D8, &lit_3892); SECTION_RODATA static u8 const lit_3894[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C6E9E0, &lit_3894); +COMPILER_STRIP_GATE(0x80C6E9E0, &lit_3894); #pragma pop /* 80C6DC64-80C6E300 000584 069C+00 1/0 0/0 0/0 .text Execute__14daObjYchndlr_cFPPA3_A4_f @@ -672,9 +678,4 @@ asm daObjYchndlr_c::~daObjYchndlr_c() { } #pragma pop -/* 80C6E9E8-80C6E9F2 000068 000A+00 1/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80C6E9E8 = "Ychandelr"; -#pragma pop +/* 80C6E9E8-80C6E9E8 000068 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_lv5yiblltray/d_a_obj_lv5yiblltray.cpp b/rel/d/a/obj/d_a_obj_lv5yiblltray/d_a_obj_lv5yiblltray.cpp index 7c032cdce7c..14ba81cf488 100644 --- a/rel/d/a/obj/d_a_obj_lv5yiblltray/d_a_obj_lv5yiblltray.cpp +++ b/rel/d/a/obj/d_a_obj_lv5yiblltray/d_a_obj_lv5yiblltray.cpp @@ -299,6 +299,12 @@ extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; // /* ############################################################################################## */ +/* 80C70A2C-80C70A2C 00008C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80C70A2C = "YIblltray"; +#pragma pop + /* 80C70A38-80C70A3C -00001 0004+00 3/3 0/0 0/0 .data l_arcName */ SECTION_DATA static void* l_arcName = (void*)&d_a_obj_lv5yiblltray__stringBase0; @@ -318,20 +324,20 @@ SECTION_RODATA static u8 const l_cull_box[24] = { 0xC3, 0x6E, 0xF5, 0xC2, 0xC3, 0x48, 0x00, 0x00, 0xC3, 0x06, 0x38, 0x52, 0x43, 0x6E, 0xF5, 0xC2, 0x43, 0x48, 0x00, 0x00, 0x43, 0x5A, 0xAB, 0x85, }; -COMPILER_STRIP_GATE(80C709A0, &l_cull_box); +COMPILER_STRIP_GATE(0x80C709A0, &l_cull_box); /* 80C709B8-80C709BC 000018 0004+00 0/2 0/0 0/0 .rodata @3692 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3692 = 125.0f; -COMPILER_STRIP_GATE(80C709B8, &lit_3692); +COMPILER_STRIP_GATE(0x80C709B8, &lit_3692); #pragma pop /* 80C709BC-80C709C0 00001C 0004+00 0/3 0/0 0/0 .rodata @3693 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3693 = 100.0f; -COMPILER_STRIP_GATE(80C709BC, &lit_3693); +COMPILER_STRIP_GATE(0x80C709BC, &lit_3693); #pragma pop /* 80C709C0-80C709C4 000020 0004+00 3/6 0/0 0/0 .rodata @3694 */ @@ -341,13 +347,13 @@ SECTION_RODATA static u8 const lit_3694[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C709C0, &lit_3694); +COMPILER_STRIP_GATE(0x80C709C0, &lit_3694); /* 80C709C4-80C709C8 000024 0004+00 0/2 0/0 0/0 .rodata @3695 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3695 = -125.0f; -COMPILER_STRIP_GATE(80C709C4, &lit_3695); +COMPILER_STRIP_GATE(0x80C709C4, &lit_3695); #pragma pop /* 80C70A3C-80C70A48 000004 000C+00 1/1 0/0 0/0 .data l_in_ball */ @@ -373,7 +379,7 @@ asm void daObjYIblltray_c::setMtx() { /* ############################################################################################## */ /* 80C709C8-80C709CC 000028 0004+00 1/2 0/0 0/0 .rodata @3719 */ SECTION_RODATA static f32 const lit_3719 = 1.0f; -COMPILER_STRIP_GATE(80C709C8, &lit_3719); +COMPILER_STRIP_GATE(0x80C709C8, &lit_3719); /* 80C6EDA8-80C6EED4 000228 012C+00 1/0 0/0 0/0 .text CreateHeap__16daObjYIblltray_cFv */ #pragma push @@ -401,21 +407,21 @@ static asm void rideCallback(dBgW* param_0, fopAc_ac_c* param_1, fopAc_ac_c* par #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3797 = 40.0f; -COMPILER_STRIP_GATE(80C709CC, &lit_3797); +COMPILER_STRIP_GATE(0x80C709CC, &lit_3797); #pragma pop /* 80C709D0-80C709D4 000030 0004+00 0/1 0/0 0/0 .rodata @3798 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3798 = 300.0f; -COMPILER_STRIP_GATE(80C709D0, &lit_3798); +COMPILER_STRIP_GATE(0x80C709D0, &lit_3798); #pragma pop /* 80C709D4-80C709D8 000034 0004+00 0/2 0/0 0/0 .rodata @3799 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3799 = 10.0f; -COMPILER_STRIP_GATE(80C709D4, &lit_3799); +COMPILER_STRIP_GATE(0x80C709D4, &lit_3799); #pragma pop /* 80C709D8-80C709E0 000038 0008+00 0/2 0/0 0/0 .rodata @3801 */ @@ -424,7 +430,7 @@ COMPILER_STRIP_GATE(80C709D4, &lit_3799); SECTION_RODATA static u8 const lit_3801[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C709D8, &lit_3801); +COMPILER_STRIP_GATE(0x80C709D8, &lit_3801); #pragma pop /* 80C70A54-80C70A60 00001C 000C+00 1/1 0/0 0/0 .data l_back_pos */ @@ -485,7 +491,7 @@ static asm void searchObjYIblltray(void* param_0, void* param_1) { /* ############################################################################################## */ /* 80C709E0-80C709E4 000040 0004+00 2/2 0/0 0/0 .rodata @3868 */ SECTION_RODATA static f32 const lit_3868 = 900.0f; -COMPILER_STRIP_GATE(80C709E0, &lit_3868); +COMPILER_STRIP_GATE(0x80C709E0, &lit_3868); /* 80C6F338-80C6F3BC 0007B8 0084+00 1/1 0/0 0/0 .text searchNearIronball__FPvPv */ #pragma push @@ -535,7 +541,7 @@ asm void daObjYIblltray_c::offAttention() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4438 = -1.0f; -COMPILER_STRIP_GATE(80C709E4, &lit_4438); +COMPILER_STRIP_GATE(0x80C709E4, &lit_4438); #pragma pop /* 80C709E8-80C709F0 000048 0004+04 0/1 0/0 0/0 .rodata @4439 */ @@ -546,7 +552,7 @@ SECTION_RODATA static f32 const lit_4439[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80C709E8, &lit_4439); +COMPILER_STRIP_GATE(0x80C709E8, &lit_4439); #pragma pop /* 80C709F0-80C709F8 000050 0008+00 0/1 0/0 0/0 .rodata @4440 */ @@ -555,7 +561,7 @@ COMPILER_STRIP_GATE(80C709E8, &lit_4439); SECTION_RODATA static u8 const lit_4440[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C709F0, &lit_4440); +COMPILER_STRIP_GATE(0x80C709F0, &lit_4440); #pragma pop /* 80C709F8-80C70A00 000058 0008+00 0/1 0/0 0/0 .rodata @4441 */ @@ -564,7 +570,7 @@ COMPILER_STRIP_GATE(80C709F0, &lit_4440); SECTION_RODATA static u8 const lit_4441[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C709F8, &lit_4441); +COMPILER_STRIP_GATE(0x80C709F8, &lit_4441); #pragma pop /* 80C70A00-80C70A08 000060 0008+00 0/1 0/0 0/0 .rodata @4442 */ @@ -573,70 +579,70 @@ COMPILER_STRIP_GATE(80C709F8, &lit_4441); SECTION_RODATA static u8 const lit_4442[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C70A00, &lit_4442); +COMPILER_STRIP_GATE(0x80C70A00, &lit_4442); #pragma pop /* 80C70A08-80C70A0C 000068 0004+00 0/1 0/0 0/0 .rodata @4443 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4443 = 30.0f; -COMPILER_STRIP_GATE(80C70A08, &lit_4443); +COMPILER_STRIP_GATE(0x80C70A08, &lit_4443); #pragma pop /* 80C70A0C-80C70A10 00006C 0004+00 0/1 0/0 0/0 .rodata @4444 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4444 = -7.0f / 10.0f; -COMPILER_STRIP_GATE(80C70A0C, &lit_4444); +COMPILER_STRIP_GATE(0x80C70A0C, &lit_4444); #pragma pop /* 80C70A10-80C70A14 000070 0004+00 0/1 0/0 0/0 .rodata @4445 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4445 = -50.0f; -COMPILER_STRIP_GATE(80C70A10, &lit_4445); +COMPILER_STRIP_GATE(0x80C70A10, &lit_4445); #pragma pop /* 80C70A14-80C70A18 000074 0004+00 0/1 0/0 0/0 .rodata @4446 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4446 = 50.0f; -COMPILER_STRIP_GATE(80C70A14, &lit_4446); +COMPILER_STRIP_GATE(0x80C70A14, &lit_4446); #pragma pop /* 80C70A18-80C70A1C 000078 0004+00 0/1 0/0 0/0 .rodata @4447 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4447 = 160.0f; -COMPILER_STRIP_GATE(80C70A18, &lit_4447); +COMPILER_STRIP_GATE(0x80C70A18, &lit_4447); #pragma pop /* 80C70A1C-80C70A20 00007C 0004+00 0/1 0/0 0/0 .rodata @4448 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4448 = 175.0f; -COMPILER_STRIP_GATE(80C70A1C, &lit_4448); +COMPILER_STRIP_GATE(0x80C70A1C, &lit_4448); #pragma pop /* 80C70A20-80C70A24 000080 0004+00 0/1 0/0 0/0 .rodata @4449 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4449 = 75.0f; -COMPILER_STRIP_GATE(80C70A20, &lit_4449); +COMPILER_STRIP_GATE(0x80C70A20, &lit_4449); #pragma pop /* 80C70A24-80C70A28 000084 0004+00 0/1 0/0 0/0 .rodata @4450 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4450 = -55.0f; -COMPILER_STRIP_GATE(80C70A24, &lit_4450); +COMPILER_STRIP_GATE(0x80C70A24, &lit_4450); #pragma pop /* 80C70A28-80C70A2C 000088 0004+00 0/1 0/0 0/0 .rodata @4451 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4451 = -195.0f; -COMPILER_STRIP_GATE(80C70A28, &lit_4451); +COMPILER_STRIP_GATE(0x80C70A28, &lit_4451); #pragma pop /* 80C6F460-80C702E0 0008E0 0E80+00 1/0 0/0 0/0 .text Execute__16daObjYIblltray_cFPPA3_A4_f */ @@ -876,9 +882,4 @@ asm daObjYIblltray_c::~daObjYIblltray_c() { } #pragma pop -/* 80C70A2C-80C70A36 00008C 000A+00 1/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80C70A2C = "YIblltray"; -#pragma pop +/* 80C70A2C-80C70A2C 00008C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_lv6ChangeGate/d_a_obj_lv6ChangeGate.cpp b/rel/d/a/obj/d_a_obj_lv6ChangeGate/d_a_obj_lv6ChangeGate.cpp index 4f1e61080ad..7faea0ce1f8 100644 --- a/rel/d/a/obj/d_a_obj_lv6ChangeGate/d_a_obj_lv6ChangeGate.cpp +++ b/rel/d/a/obj/d_a_obj_lv6ChangeGate/d_a_obj_lv6ChangeGate.cpp @@ -84,10 +84,10 @@ struct dRes_control_c { struct dPa_levelEcallBack {}; -struct _GXColor {}; - struct csXyz {}; +struct _GXColor {}; + struct dPa_control_c { /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, @@ -166,10 +166,10 @@ struct cCcD_GStts { /* 80C71EA0 */ ~cCcD_GStts(); }; -struct Vec {}; - struct JAISoundID {}; +struct Vec {}; + struct Z2SeMgr { /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); /* 802AC50C */ void seStartLevel(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); @@ -312,11 +312,11 @@ extern "C" void __register_global_object(); /* ############################################################################################## */ /* 80C7214C-80C72150 000000 0004+00 4/4 0/0 0/0 .rodata @3639 */ SECTION_RODATA static f32 const lit_3639 = 10.0f; -COMPILER_STRIP_GATE(80C7214C, &lit_3639); +COMPILER_STRIP_GATE(0x80C7214C, &lit_3639); /* 80C72150-80C72154 000004 0004+00 1/2 0/0 0/0 .rodata @3640 */ SECTION_RODATA static f32 const lit_3640 = 562.5f; -COMPILER_STRIP_GATE(80C72150, &lit_3640); +COMPILER_STRIP_GATE(0x80C72150, &lit_3640); /* 80C721AC-80C721B8 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { @@ -535,7 +535,7 @@ SECTION_RODATA u8 const daLv6ChangeGate_c::mCcDObjInfo[48] = { 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x11, 0x00, 0x00, 0x00, 0x79, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C72154, &daLv6ChangeGate_c::mCcDObjInfo); +COMPILER_STRIP_GATE(0x80C72154, &daLv6ChangeGate_c::mCcDObjInfo); /* 80C72184-80C72188 000038 0004+00 3/6 0/0 0/0 .rodata @3664 */ SECTION_RODATA static u8 const lit_3664[4] = { @@ -544,7 +544,7 @@ SECTION_RODATA static u8 const lit_3664[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C72184, &lit_3664); +COMPILER_STRIP_GATE(0x80C72184, &lit_3664); /* 80C70D38-80C70DD4 0001D8 009C+00 2/2 0/0 0/0 .text setBaseMtx__17daLv6ChangeGate_cFv */ @@ -557,6 +557,13 @@ asm void daLv6ChangeGate_c::setBaseMtx() { } #pragma pop +/* ############################################################################################## */ +/* 80C721A4-80C721A4 000058 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80C721A4 = "L6ChBlk"; +#pragma pop + /* 80C70DD4-80C70E40 000274 006C+00 1/0 0/0 0/0 .text CreateHeap__17daLv6ChangeGate_cFv */ #pragma push @@ -650,28 +657,28 @@ asm void daLv6ChangeGate_c::isSwitch() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3866 = -250.0f; -COMPILER_STRIP_GATE(80C72188, &lit_3866); +COMPILER_STRIP_GATE(0x80C72188, &lit_3866); #pragma pop /* 80C7218C-80C72190 000040 0004+00 0/1 0/0 0/0 .rodata @3867 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3867 = 65.0f; -COMPILER_STRIP_GATE(80C7218C, &lit_3867); +COMPILER_STRIP_GATE(0x80C7218C, &lit_3867); #pragma pop /* 80C72190-80C72194 000044 0004+00 0/1 0/0 0/0 .rodata @3868 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3868 = 330.0f; -COMPILER_STRIP_GATE(80C72190, &lit_3868); +COMPILER_STRIP_GATE(0x80C72190, &lit_3868); #pragma pop /* 80C72194-80C72198 000048 0004+00 0/1 0/0 0/0 .rodata @3869 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3869 = 60.0f; -COMPILER_STRIP_GATE(80C72194, &lit_3869); +COMPILER_STRIP_GATE(0x80C72194, &lit_3869); #pragma pop /* 80C712F4-80C71494 000794 01A0+00 1/0 0/0 0/0 .text Execute__17daLv6ChangeGate_cFPPA3_A4_f */ @@ -727,11 +734,11 @@ void daLv6ChangeGate_c::modeWait() { /* ############################################################################################## */ /* 80C72198-80C7219C 00004C 0004+00 4/6 0/0 0/0 .rodata @3922 */ SECTION_RODATA static f32 const lit_3922 = 1.0f; -COMPILER_STRIP_GATE(80C72198, &lit_3922); +COMPILER_STRIP_GATE(0x80C72198, &lit_3922); /* 80C7219C-80C721A0 000050 0004+00 3/5 0/0 0/0 .rodata @3923 */ SECTION_RODATA static f32 const lit_3923 = -1.0f; -COMPILER_STRIP_GATE(80C7219C, &lit_3923); +COMPILER_STRIP_GATE(0x80C7219C, &lit_3923); /* 80C71604-80C716B4 000AA4 00B0+00 1/1 0/0 0/0 .text init_modeSlideRight__17daLv6ChangeGate_cFv */ @@ -749,7 +756,7 @@ asm void daLv6ChangeGate_c::init_modeSlideRight() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3953 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(80C721A0, &lit_3953); +COMPILER_STRIP_GATE(0x80C721A0, &lit_3953); #pragma pop /* 80C716B4-80C7183C 000B54 0188+00 1/0 0/0 0/0 .text modeSlideRight__17daLv6ChangeGate_cFv */ @@ -898,7 +905,7 @@ asm void __sinit_d_a_obj_lv6ChangeGate_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80C71F54 = (void*)__sinit_d_a_obj_lv6ChangeGate_cpp; +REGISTER_CTORS(0x80C71F54, __sinit_d_a_obj_lv6ChangeGate_cpp); #pragma pop /* 80C71FC4-80C71FCC 001464 0008+00 1/0 0/0 0/0 .text @1448@eventStart__17daLv6ChangeGate_cFv */ @@ -958,9 +965,4 @@ asm daLv6ChangeGate_c::~daLv6ChangeGate_c() { } #pragma pop -/* 80C721A4-80C721AC 000058 0008+00 3/3 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80C721A4 = "L6ChBlk"; -#pragma pop +/* 80C721A4-80C721A4 000058 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_lv6FurikoTrap/d_a_obj_lv6FurikoTrap.cpp b/rel/d/a/obj/d_a_obj_lv6FurikoTrap/d_a_obj_lv6FurikoTrap.cpp index a2ba92e5e10..06b378f5893 100644 --- a/rel/d/a/obj/d_a_obj_lv6FurikoTrap/d_a_obj_lv6FurikoTrap.cpp +++ b/rel/d/a/obj/d_a_obj_lv6FurikoTrap/d_a_obj_lv6FurikoTrap.cpp @@ -118,10 +118,10 @@ struct cCcS { /* 80264BA8 */ void Set(cCcD_Obj*); }; -struct Vec {}; - struct JAISoundID {}; +struct Vec {}; + struct Z2SeMgr { /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); }; @@ -238,11 +238,11 @@ extern "C" void __register_global_object(); /* ############################################################################################## */ /* 80C73130-80C73134 000000 0004+00 3/3 0/0 0/0 .rodata @3625 */ SECTION_RODATA static f32 const lit_3625 = 1.0f; -COMPILER_STRIP_GATE(80C73130, &lit_3625); +COMPILER_STRIP_GATE(0x80C73130, &lit_3625); /* 80C73134-80C73138 000004 0004+00 1/2 0/0 0/0 .rodata @3626 */ SECTION_RODATA static f32 const lit_3626 = 45.0f; -COMPILER_STRIP_GATE(80C73134, &lit_3626); +COMPILER_STRIP_GATE(0x80C73134, &lit_3626); /* 80C731A4-80C731E4 000000 0040+00 2/2 0/0 0/0 .data mCcDSph__17daLv6FurikoTrap_c */ SECTION_DATA u8 daLv6FurikoTrap_c::mCcDSph[64] = { @@ -369,6 +369,13 @@ asm void daLv6FurikoTrap_c::setBaseMtx() { } #pragma pop +/* ############################################################################################## */ +/* 80C73198-80C73198 000068 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80C73198 = "L6Furiko"; +#pragma pop + /* 80C72598-80C72604 0001F8 006C+00 1/0 0/0 0/0 .text CreateHeap__17daLv6FurikoTrap_cFv */ #pragma push @@ -437,7 +444,7 @@ SECTION_RODATA u8 const daLv6FurikoTrap_c::mCcDObjInfo[48] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x79, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x0A, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C73138, &daLv6FurikoTrap_c::mCcDObjInfo); +COMPILER_STRIP_GATE(0x80C73138, &daLv6FurikoTrap_c::mCcDObjInfo); /* 80C73168-80C7316C 000038 0004+00 0/2 0/0 0/0 .rodata @3871 */ #pragma push @@ -448,42 +455,42 @@ SECTION_RODATA static u8 const lit_3871[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C73168, &lit_3871); +COMPILER_STRIP_GATE(0x80C73168, &lit_3871); #pragma pop /* 80C7316C-80C73170 00003C 0004+00 0/1 0/0 0/0 .rodata @3872 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3872 = -850.0f; -COMPILER_STRIP_GATE(80C7316C, &lit_3872); +COMPILER_STRIP_GATE(0x80C7316C, &lit_3872); #pragma pop /* 80C73170-80C73174 000040 0004+00 0/2 0/0 0/0 .rodata @3873 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_3873 = 0x43360B61; -COMPILER_STRIP_GATE(80C73170, &lit_3873); +COMPILER_STRIP_GATE(0x80C73170, &lit_3873); #pragma pop /* 80C73174-80C73178 000044 0004+00 0/1 0/0 0/0 .rodata @3874 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3874 = -21.5f; -COMPILER_STRIP_GATE(80C73174, &lit_3874); +COMPILER_STRIP_GATE(0x80C73174, &lit_3874); #pragma pop /* 80C73178-80C7317C 000048 0004+00 0/1 0/0 0/0 .rodata @3875 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3875 = 18.0f / 5.0f; -COMPILER_STRIP_GATE(80C73178, &lit_3875); +COMPILER_STRIP_GATE(0x80C73178, &lit_3875); #pragma pop /* 80C7317C-80C73180 00004C 0004+00 0/2 0/0 0/0 .rodata @3876 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3876 = 30.0f; -COMPILER_STRIP_GATE(80C7317C, &lit_3876); +COMPILER_STRIP_GATE(0x80C7317C, &lit_3876); #pragma pop /* 80C73180-80C73188 000050 0008+00 0/1 0/0 0/0 .rodata @3878 */ @@ -492,7 +499,7 @@ COMPILER_STRIP_GATE(80C7317C, &lit_3876); SECTION_RODATA static u8 const lit_3878[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C73180, &lit_3878); +COMPILER_STRIP_GATE(0x80C73180, &lit_3878); #pragma pop /* 80C729B4-80C72CA8 000614 02F4+00 1/0 0/0 0/0 .text Execute__17daLv6FurikoTrap_cFPPA3_A4_f */ @@ -540,28 +547,28 @@ asm void daLv6FurikoTrap_c::init_modeMove() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3941 = 2.0f; -COMPILER_STRIP_GATE(80C73188, &lit_3941); +COMPILER_STRIP_GATE(0x80C73188, &lit_3941); #pragma pop /* 80C7318C-80C73190 00005C 0004+00 0/1 0/0 0/0 .rodata @3942 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_3942 = 0x3F7FBE77; -COMPILER_STRIP_GATE(80C7318C, &lit_3942); +COMPILER_STRIP_GATE(0x80C7318C, &lit_3942); #pragma pop /* 80C73190-80C73194 000060 0004+00 0/1 0/0 0/0 .rodata @3943 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3943 = -940.0f; -COMPILER_STRIP_GATE(80C73190, &lit_3943); +COMPILER_STRIP_GATE(0x80C73190, &lit_3943); #pragma pop /* 80C73194-80C73198 000064 0004+00 0/1 0/0 0/0 .rodata @3944 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3944 = -1.0f; -COMPILER_STRIP_GATE(80C73194, &lit_3944); +COMPILER_STRIP_GATE(0x80C73194, &lit_3944); #pragma pop /* 80C72D38-80C72EE0 000998 01A8+00 1/0 0/0 0/0 .text modeMove__17daLv6FurikoTrap_cFv */ @@ -660,12 +667,7 @@ asm void __sinit_d_a_obj_lv6FurikoTrap_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80C730AC = (void*)__sinit_d_a_obj_lv6FurikoTrap_cpp; +REGISTER_CTORS(0x80C730AC, __sinit_d_a_obj_lv6FurikoTrap_cpp); #pragma pop -/* 80C73198-80C731A1 000068 0009+00 3/4 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80C73198 = "L6Furiko"; -#pragma pop +/* 80C73198-80C73198 000068 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_lv6Lblock/d_a_obj_lv6Lblock.cpp b/rel/d/a/obj/d_a_obj_lv6Lblock/d_a_obj_lv6Lblock.cpp index 564b3a6d278..bd0c4fd46a3 100644 --- a/rel/d/a/obj/d_a_obj_lv6Lblock/d_a_obj_lv6Lblock.cpp +++ b/rel/d/a/obj/d_a_obj_lv6Lblock/d_a_obj_lv6Lblock.cpp @@ -86,10 +86,10 @@ struct dBgS_MoveBgActor { /* 80078950 */ void MoveBGExecute(); }; -struct Vec {}; - struct JAISoundID {}; +struct Vec {}; + struct Z2SeMgr { /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); /* 802AC50C */ void seStartLevel(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); @@ -179,7 +179,7 @@ extern "C" void __register_global_object(); /* ############################################################################################## */ /* 80C73CBC-80C73CC0 000000 0004+00 3/3 0/0 0/0 .rodata @3627 */ SECTION_RODATA static f32 const lit_3627 = 15.0f; -COMPILER_STRIP_GATE(80C73CBC, &lit_3627); +COMPILER_STRIP_GATE(0x80C73CBC, &lit_3627); /* 80C73CE4-80C73CF0 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { @@ -324,6 +324,13 @@ asm void daLv6Lblock_c::setBaseMtx() { } #pragma pop +/* ############################################################################################## */ +/* 80C73CD8-80C73CD8 00001C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80C73CD8 = "L6Lblock"; +#pragma pop + /* 80C734EC-80C73558 0001EC 006C+00 1/0 0/0 0/0 .text CreateHeap__13daLv6Lblock_cFv */ #pragma push #pragma optimization_level 0 @@ -337,7 +344,7 @@ asm void daLv6Lblock_c::CreateHeap() { /* ############################################################################################## */ /* 80C73CC0-80C73CC4 000004 0004+00 1/1 0/0 0/0 .rodata @3709 */ SECTION_RODATA static f32 const lit_3709 = 300.0f; -COMPILER_STRIP_GATE(80C73CC0, &lit_3709); +COMPILER_STRIP_GATE(0x80C73CC0, &lit_3709); /* 80C73558-80C736C0 000258 0168+00 1/1 0/0 0/0 .text create__13daLv6Lblock_cFv */ #pragma push @@ -421,28 +428,28 @@ asm void daLv6Lblock_c::init_modeLiftUp() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3777 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(80C73CC4, &lit_3777); +COMPILER_STRIP_GATE(0x80C73CC4, &lit_3777); #pragma pop /* 80C73CC8-80C73CCC 00000C 0004+00 0/2 0/0 0/0 .rodata @3778 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3778 = 5.0f; -COMPILER_STRIP_GATE(80C73CC8, &lit_3778); +COMPILER_STRIP_GATE(0x80C73CC8, &lit_3778); #pragma pop /* 80C73CCC-80C73CD0 000010 0004+00 0/2 0/0 0/0 .rodata @3779 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3779 = 1.0f; -COMPILER_STRIP_GATE(80C73CCC, &lit_3779); +COMPILER_STRIP_GATE(0x80C73CCC, &lit_3779); #pragma pop /* 80C73CD0-80C73CD4 000014 0004+00 0/2 0/0 0/0 .rodata @3780 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3780 = -1.0f; -COMPILER_STRIP_GATE(80C73CD0, &lit_3780); +COMPILER_STRIP_GATE(0x80C73CD0, &lit_3780); #pragma pop /* 80C73CD4-80C73CD8 000018 0004+00 0/2 0/0 0/0 .rodata @3781 */ @@ -454,7 +461,7 @@ SECTION_RODATA static u8 const lit_3781[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C73CD4, &lit_3781); +COMPILER_STRIP_GATE(0x80C73CD4, &lit_3781); #pragma pop /* 80C7386C-80C7398C 00056C 0120+00 1/0 0/0 0/0 .text modeLiftUp__13daLv6Lblock_cFv */ @@ -571,12 +578,7 @@ asm void __sinit_d_a_obj_lv6Lblock_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80C73C6C = (void*)__sinit_d_a_obj_lv6Lblock_cpp; +REGISTER_CTORS(0x80C73C6C, __sinit_d_a_obj_lv6Lblock_cpp); #pragma pop -/* 80C73CD8-80C73CE1 00001C 0009+00 3/3 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80C73CD8 = "L6Lblock"; -#pragma pop +/* 80C73CD8-80C73CD8 00001C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_lv6SwGate/d_a_obj_lv6SwGate.cpp b/rel/d/a/obj/d_a_obj_lv6SwGate/d_a_obj_lv6SwGate.cpp index 26078b17e83..8bd73ae622a 100644 --- a/rel/d/a/obj/d_a_obj_lv6SwGate/d_a_obj_lv6SwGate.cpp +++ b/rel/d/a/obj/d_a_obj_lv6SwGate/d_a_obj_lv6SwGate.cpp @@ -80,10 +80,10 @@ struct dRes_control_c { struct dPa_levelEcallBack {}; -struct _GXColor {}; - struct csXyz {}; +struct _GXColor {}; + struct dPa_control_c { /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, @@ -176,10 +176,10 @@ struct cBgS { /* 80074250 */ void Release(dBgW_Base*); }; -struct Vec {}; - struct JAISoundID {}; +struct Vec {}; + struct Z2SeMgr { /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); /* 802AC50C */ void seStartLevel(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); @@ -317,20 +317,20 @@ extern "C" void __register_global_object(); /* ############################################################################################## */ /* 80C75524-80C75528 000000 0004+00 5/5 0/0 0/0 .rodata @3633 */ SECTION_RODATA static f32 const lit_3633 = 15.0f; -COMPILER_STRIP_GATE(80C75524, &lit_3633); +COMPILER_STRIP_GATE(0x80C75524, &lit_3633); /* 80C75528-80C7552C 000004 0004+00 0/2 0/0 0/0 .rodata @3634 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3634 = 30.0f; -COMPILER_STRIP_GATE(80C75528, &lit_3634); +COMPILER_STRIP_GATE(0x80C75528, &lit_3634); #pragma pop /* 80C7552C-80C75530 000008 0004+00 0/2 0/0 0/0 .rodata @3635 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3635 = 275.0f; -COMPILER_STRIP_GATE(80C7552C, &lit_3635); +COMPILER_STRIP_GATE(0x80C7552C, &lit_3635); #pragma pop /* 80C75598-80C755A4 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ @@ -538,11 +538,11 @@ SECTION_RODATA u8 const daLv6SwGate_c::mCcDObjInfo[48] = { 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x11, 0x00, 0x00, 0x00, 0x79, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C75530, &daLv6SwGate_c::mCcDObjInfo); +COMPILER_STRIP_GATE(0x80C75530, &daLv6SwGate_c::mCcDObjInfo); /* 80C75560-80C75564 00003C 0004+00 1/3 0/0 0/0 .rodata @3674 */ SECTION_RODATA static f32 const lit_3674 = -150.0f; -COMPILER_STRIP_GATE(80C75560, &lit_3674); +COMPILER_STRIP_GATE(0x80C75560, &lit_3674); /* 80C75564-80C75568 000040 0004+00 3/7 0/0 0/0 .rodata @3675 */ SECTION_RODATA static u8 const lit_3675[4] = { @@ -551,7 +551,7 @@ SECTION_RODATA static u8 const lit_3675[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C75564, &lit_3675); +COMPILER_STRIP_GATE(0x80C75564, &lit_3675); /* 80C74004-80C74158 0001E4 0154+00 2/2 0/0 0/0 .text setBaseMtx__13daLv6SwGate_cFv */ #pragma push @@ -563,6 +563,13 @@ asm void daLv6SwGate_c::setBaseMtx() { } #pragma pop +/* ############################################################################################## */ +/* 80C7558C-80C7558C 000068 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80C7558C = "L6SwGate"; +#pragma pop + /* 80C74158-80C7429C 000338 0144+00 1/0 0/0 0/0 .text CreateHeap__13daLv6SwGate_cFv */ #pragma push #pragma optimization_level 0 @@ -655,21 +662,21 @@ asm void daLv6SwGate_c::isSwitch() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3939 = 120.0f; -COMPILER_STRIP_GATE(80C75568, &lit_3939); +COMPILER_STRIP_GATE(0x80C75568, &lit_3939); #pragma pop /* 80C7556C-80C75570 000048 0004+00 0/1 0/0 0/0 .rodata @3940 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3940 = 55.0f; -COMPILER_STRIP_GATE(80C7556C, &lit_3940); +COMPILER_STRIP_GATE(0x80C7556C, &lit_3940); #pragma pop /* 80C75570-80C75574 00004C 0004+00 0/1 0/0 0/0 .rodata @3941 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3941 = 300.0f; -COMPILER_STRIP_GATE(80C75570, &lit_3941); +COMPILER_STRIP_GATE(0x80C75570, &lit_3941); #pragma pop /* 80C75574-80C7557C 000050 0008+00 0/1 0/0 0/0 .rodata @3943 */ @@ -678,7 +685,7 @@ COMPILER_STRIP_GATE(80C75570, &lit_3941); SECTION_RODATA static u8 const lit_3943[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C75574, &lit_3943); +COMPILER_STRIP_GATE(0x80C75574, &lit_3943); #pragma pop /* 80C7476C-80C74A3C 00094C 02D0+00 1/0 0/0 0/0 .text Execute__13daLv6SwGate_cFPPA3_A4_f @@ -736,23 +743,23 @@ asm void daLv6SwGate_c::init_modeOpen() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3992 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(80C7557C, &lit_3992); +COMPILER_STRIP_GATE(0x80C7557C, &lit_3992); #pragma pop /* 80C75580-80C75584 00005C 0004+00 0/2 0/0 0/0 .rodata @3993 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3993 = 5.0f; -COMPILER_STRIP_GATE(80C75580, &lit_3993); +COMPILER_STRIP_GATE(0x80C75580, &lit_3993); #pragma pop /* 80C75584-80C75588 000060 0004+00 1/4 0/0 0/0 .rodata @3994 */ SECTION_RODATA static f32 const lit_3994 = 1.0f; -COMPILER_STRIP_GATE(80C75584, &lit_3994); +COMPILER_STRIP_GATE(0x80C75584, &lit_3994); /* 80C75588-80C7558C 000064 0004+00 1/3 0/0 0/0 .rodata @3995 */ SECTION_RODATA static f32 const lit_3995 = -1.0f; -COMPILER_STRIP_GATE(80C75588, &lit_3995); +COMPILER_STRIP_GATE(0x80C75588, &lit_3995); /* 80C74B64-80C74C7C 000D44 0118+00 1/0 0/0 0/0 .text modeOpen__13daLv6SwGate_cFv */ #pragma push @@ -900,12 +907,7 @@ asm void __sinit_d_a_obj_lv6SwGate_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80C754A0 = (void*)__sinit_d_a_obj_lv6SwGate_cpp; +REGISTER_CTORS(0x80C754A0, __sinit_d_a_obj_lv6SwGate_cpp); #pragma pop -/* 80C7558C-80C75595 000068 0009+00 3/3 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80C7558C = "L6SwGate"; -#pragma pop +/* 80C7558C-80C7558C 000068 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_lv6SzGate/d_a_obj_lv6SzGate.cpp b/rel/d/a/obj/d_a_obj_lv6SzGate/d_a_obj_lv6SzGate.cpp index 571d2812cb2..6a06ba5b85c 100644 --- a/rel/d/a/obj/d_a_obj_lv6SzGate/d_a_obj_lv6SzGate.cpp +++ b/rel/d/a/obj/d_a_obj_lv6SzGate/d_a_obj_lv6SzGate.cpp @@ -139,10 +139,10 @@ struct cBgS { /* 80074250 */ void Release(dBgW_Base*); }; -struct Vec {}; - struct JAISoundID {}; +struct Vec {}; + struct Z2SeMgr { /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); /* 802AC50C */ void seStartLevel(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); @@ -258,27 +258,27 @@ extern "C" void __register_global_object(); /* ############################################################################################## */ /* 80C76630-80C76634 000000 0004+00 3/3 0/0 0/0 .rodata @3627 */ SECTION_RODATA static f32 const lit_3627 = 4.0f; -COMPILER_STRIP_GATE(80C76630, &lit_3627); +COMPILER_STRIP_GATE(0x80C76630, &lit_3627); /* 80C76634-80C76638 000004 0004+00 0/1 0/0 0/0 .rodata @3628 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3628 = 30.0f; -COMPILER_STRIP_GATE(80C76634, &lit_3628); +COMPILER_STRIP_GATE(0x80C76634, &lit_3628); #pragma pop /* 80C76638-80C7663C 000008 0004+00 0/1 0/0 0/0 .rodata @3629 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3629 = 15.0f; -COMPILER_STRIP_GATE(80C76638, &lit_3629); +COMPILER_STRIP_GATE(0x80C76638, &lit_3629); #pragma pop /* 80C7663C-80C76640 00000C 0004+00 0/1 0/0 0/0 .rodata @3630 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3630 = 400.0f; -COMPILER_STRIP_GATE(80C7663C, &lit_3630); +COMPILER_STRIP_GATE(0x80C7663C, &lit_3630); #pragma pop /* 80C76668-80C76674 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ @@ -457,7 +457,7 @@ asm mDoHIO_entry_c::~mDoHIO_entry_c() { /* ############################################################################################## */ /* 80C76640-80C76644 000010 0004+00 1/1 0/0 0/0 .rodata @3665 */ SECTION_RODATA static f32 const lit_3665 = -200.0f; -COMPILER_STRIP_GATE(80C76640, &lit_3665); +COMPILER_STRIP_GATE(0x80C76640, &lit_3665); /* 80C76644-80C76648 000014 0004+00 2/4 0/0 0/0 .rodata @3666 */ SECTION_RODATA static u8 const lit_3666[4] = { @@ -466,7 +466,7 @@ SECTION_RODATA static u8 const lit_3666[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C76644, &lit_3666); +COMPILER_STRIP_GATE(0x80C76644, &lit_3666); /* 80C75900-80C75A54 000180 0154+00 2/2 0/0 0/0 .text setBaseMtx__13daLv6SzGate_cFv */ #pragma push @@ -481,7 +481,13 @@ asm void daLv6SzGate_c::setBaseMtx() { /* ############################################################################################## */ /* 80C76648-80C7664C 000018 0004+00 2/4 0/0 0/0 .rodata @3697 */ SECTION_RODATA static f32 const lit_3697 = 1.0f; -COMPILER_STRIP_GATE(80C76648, &lit_3697); +COMPILER_STRIP_GATE(0x80C76648, &lit_3697); + +/* 80C7665C-80C7665C 00002C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80C7665C = "L6SzGate"; +#pragma pop /* 80C75A54-80C75C0C 0002D4 01B8+00 1/0 0/0 0/0 .text CreateHeap__13daLv6SzGate_cFv */ #pragma push @@ -588,7 +594,7 @@ asm void daLv6SzGate_c::modeOpenWait0() { /* ############################################################################################## */ /* 80C7664C-80C76650 00001C 0004+00 2/4 0/0 0/0 .rodata @3843 */ SECTION_RODATA static f32 const lit_3843 = -1.0f; -COMPILER_STRIP_GATE(80C7664C, &lit_3843); +COMPILER_STRIP_GATE(0x80C7664C, &lit_3843); /* 80C76010-80C76094 000890 0084+00 1/1 0/0 0/0 .text init_modeOpenWait__13daLv6SzGate_cFv */ #pragma push @@ -625,14 +631,14 @@ asm void daLv6SzGate_c::init_modeOpen() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3879 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(80C76650, &lit_3879); +COMPILER_STRIP_GATE(0x80C76650, &lit_3879); #pragma pop /* 80C76654-80C76658 000024 0004+00 0/1 0/0 0/0 .rodata @3880 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3880 = 0.5f; -COMPILER_STRIP_GATE(80C76654, &lit_3880); +COMPILER_STRIP_GATE(0x80C76654, &lit_3880); #pragma pop /* 80C760FC-80C7624C 00097C 0150+00 1/0 0/0 0/0 .text modeOpen__13daLv6SzGate_cFv */ @@ -650,7 +656,7 @@ asm void daLv6SzGate_c::modeOpen() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3901 = 5.0f; -COMPILER_STRIP_GATE(80C76658, &lit_3901); +COMPILER_STRIP_GATE(0x80C76658, &lit_3901); #pragma pop /* 80C7624C-80C76328 000ACC 00DC+00 1/0 0/0 0/0 .text modeClose__13daLv6SzGate_cFv */ @@ -767,12 +773,7 @@ asm void __sinit_d_a_obj_lv6SzGate_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80C765E0 = (void*)__sinit_d_a_obj_lv6SzGate_cpp; +REGISTER_CTORS(0x80C765E0, __sinit_d_a_obj_lv6SzGate_cpp); #pragma pop -/* 80C7665C-80C76665 00002C 0009+00 3/3 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80C7665C = "L6SzGate"; -#pragma pop +/* 80C7665C-80C7665C 00002C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_lv6Tenbin/d_a_obj_lv6Tenbin.cpp b/rel/d/a/obj/d_a_obj_lv6Tenbin/d_a_obj_lv6Tenbin.cpp index 0aa659489de..55d4a9b0141 100644 --- a/rel/d/a/obj/d_a_obj_lv6Tenbin/d_a_obj_lv6Tenbin.cpp +++ b/rel/d/a/obj/d_a_obj_lv6Tenbin/d_a_obj_lv6Tenbin.cpp @@ -105,10 +105,10 @@ struct cBgS { /* 80074250 */ void Release(dBgW_Base*); }; -struct Vec {}; - struct JAISoundID {}; +struct Vec {}; + struct Z2SeMgr { /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); /* 802AC50C */ void seStartLevel(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); @@ -211,13 +211,13 @@ extern "C" void __register_global_object(); /* ############################################################################################## */ /* 80C779B0-80C779B4 000000 0004+00 2/2 0/0 0/0 .rodata @3668 */ SECTION_RODATA static f32 const lit_3668 = 480.0f; -COMPILER_STRIP_GATE(80C779B0, &lit_3668); +COMPILER_STRIP_GATE(0x80C779B0, &lit_3668); /* 80C779B4-80C779B8 000004 0004+00 0/1 0/0 0/0 .rodata @3669 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3669 = 160.0f; -COMPILER_STRIP_GATE(80C779B4, &lit_3669); +COMPILER_STRIP_GATE(0x80C779B4, &lit_3669); #pragma pop /* 80C779B8-80C779BC 000008 0004+00 4/6 0/0 0/0 .rodata @3670 */ @@ -227,76 +227,76 @@ SECTION_RODATA static u8 const lit_3670[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C779B8, &lit_3670); +COMPILER_STRIP_GATE(0x80C779B8, &lit_3670); /* 80C779BC-80C779C0 00000C 0004+00 0/1 0/0 0/0 .rodata @3671 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3671 = 45.0f; -COMPILER_STRIP_GATE(80C779BC, &lit_3671); +COMPILER_STRIP_GATE(0x80C779BC, &lit_3671); #pragma pop /* 80C779C0-80C779C4 000010 0004+00 0/1 0/0 0/0 .rodata @3672 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3672 = 50.0f; -COMPILER_STRIP_GATE(80C779C0, &lit_3672); +COMPILER_STRIP_GATE(0x80C779C0, &lit_3672); #pragma pop /* 80C779C4-80C779C8 000014 0004+00 0/1 0/0 0/0 .rodata @3673 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3673 = 3.0f / 50.0f; -COMPILER_STRIP_GATE(80C779C4, &lit_3673); +COMPILER_STRIP_GATE(0x80C779C4, &lit_3673); #pragma pop /* 80C779C8-80C779CC 000018 0004+00 0/1 0/0 0/0 .rodata @3674 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3674 = 5.0f; -COMPILER_STRIP_GATE(80C779C8, &lit_3674); +COMPILER_STRIP_GATE(0x80C779C8, &lit_3674); #pragma pop /* 80C779CC-80C779D0 00001C 0004+00 0/2 0/0 0/0 .rodata @3675 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3675 = 1.0f; -COMPILER_STRIP_GATE(80C779CC, &lit_3675); +COMPILER_STRIP_GATE(0x80C779CC, &lit_3675); #pragma pop /* 80C779D0-80C779D4 000020 0004+00 0/1 0/0 0/0 .rodata @3676 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3676 = 90.0f; -COMPILER_STRIP_GATE(80C779D0, &lit_3676); +COMPILER_STRIP_GATE(0x80C779D0, &lit_3676); #pragma pop /* 80C779D4-80C779D8 000024 0004+00 0/1 0/0 0/0 .rodata @3677 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3677 = 30.0f; -COMPILER_STRIP_GATE(80C779D4, &lit_3677); +COMPILER_STRIP_GATE(0x80C779D4, &lit_3677); #pragma pop /* 80C779D8-80C779DC 000028 0004+00 0/1 0/0 0/0 .rodata @3678 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3678 = 10.0f; -COMPILER_STRIP_GATE(80C779D8, &lit_3678); +COMPILER_STRIP_GATE(0x80C779D8, &lit_3678); #pragma pop /* 80C779DC-80C779E0 00002C 0004+00 0/1 0/0 0/0 .rodata @3679 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3679 = 1.0f / 100.0f; -COMPILER_STRIP_GATE(80C779DC, &lit_3679); +COMPILER_STRIP_GATE(0x80C779DC, &lit_3679); #pragma pop /* 80C779E0-80C779E4 000030 0004+00 0/1 0/0 0/0 .rodata @3680 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3680 = 3.0f / 10.0f; -COMPILER_STRIP_GATE(80C779E0, &lit_3680); +COMPILER_STRIP_GATE(0x80C779E0, &lit_3680); #pragma pop /* 80C77A08-80C77A20 000000 0018+00 2/2 0/0 0/0 .data l_cull_box */ @@ -390,7 +390,7 @@ asm mDoHIO_entry_c::~mDoHIO_entry_c() { /* ############################################################################################## */ /* 80C779E4-80C779E8 000034 0004+00 2/2 0/0 0/0 .rodata @3735 */ SECTION_RODATA static u32 const lit_3735 = 0x43360B61; -COMPILER_STRIP_GATE(80C779E4, &lit_3735); +COMPILER_STRIP_GATE(0x80C779E4, &lit_3735); /* 80C77AD0-80C77ADC 000008 000C+00 1/1 0/0 0/0 .bss @3662 */ static u8 lit_3662[12]; @@ -408,6 +408,13 @@ asm void daTenbin_c::setBaseMtx() { } #pragma pop +/* ############################################################################################## */ +/* 80C779FC-80C779FC 00004C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80C779FC = "L6Tenbin"; +#pragma pop + /* 80C76BCC-80C76D10 0003CC 0144+00 1/0 0/0 0/0 .text CreateHeap__10daTenbin_cFv */ #pragma push #pragma optimization_level 0 @@ -453,7 +460,7 @@ asm void daTenbin_c::rideCallBackLeft(dBgW* param_0, fopAc_ac_c* param_1, fopAc_ /* ############################################################################################## */ /* 80C779E8-80C779EC 000038 0004+00 1/1 0/0 0/0 .rodata @3908 */ SECTION_RODATA static f32 const lit_3908 = 0.5f; -COMPILER_STRIP_GATE(80C779E8, &lit_3908); +COMPILER_STRIP_GATE(0x80C779E8, &lit_3908); /* 80C77200-80C772BC 000A00 00BC+00 1/0 0/0 0/0 .text Execute__10daTenbin_cFPPA3_A4_f */ #pragma push @@ -494,28 +501,28 @@ asm void daTenbin_c::init_modeWait() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3971 = 2.0f / 5.0f; -COMPILER_STRIP_GATE(80C779EC, &lit_3971); +COMPILER_STRIP_GATE(0x80C779EC, &lit_3971); #pragma pop /* 80C779F0-80C779F4 000040 0004+00 0/1 0/0 0/0 .rodata @3972 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3972 = 8.0f; -COMPILER_STRIP_GATE(80C779F0, &lit_3972); +COMPILER_STRIP_GATE(0x80C779F0, &lit_3972); #pragma pop /* 80C779F4-80C779F8 000044 0004+00 0/1 0/0 0/0 .rodata @3973 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3973 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(80C779F4, &lit_3973); +COMPILER_STRIP_GATE(0x80C779F4, &lit_3973); #pragma pop /* 80C779F8-80C779FC 000048 0004+00 0/1 0/0 0/0 .rodata @3974 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3974 = -1.0f; -COMPILER_STRIP_GATE(80C779F8, &lit_3974); +COMPILER_STRIP_GATE(0x80C779F8, &lit_3974); #pragma pop /* 80C77470-80C77668 000C70 01F8+00 1/0 0/0 0/0 .text modeWait__10daTenbin_cFv */ @@ -620,12 +627,7 @@ asm void __sinit_d_a_obj_lv6Tenbin_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80C77960 = (void*)__sinit_d_a_obj_lv6Tenbin_cpp; +REGISTER_CTORS(0x80C77960, __sinit_d_a_obj_lv6Tenbin_cpp); #pragma pop -/* 80C779FC-80C77A05 00004C 0009+00 3/3 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80C779FC = "L6Tenbin"; -#pragma pop +/* 80C779FC-80C779FC 00004C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_lv6TogeRoll/d_a_obj_lv6TogeRoll.cpp b/rel/d/a/obj/d_a_obj_lv6TogeRoll/d_a_obj_lv6TogeRoll.cpp index 044236091f8..9e2b1d69b37 100644 --- a/rel/d/a/obj/d_a_obj_lv6TogeRoll/d_a_obj_lv6TogeRoll.cpp +++ b/rel/d/a/obj/d_a_obj_lv6TogeRoll/d_a_obj_lv6TogeRoll.cpp @@ -88,10 +88,10 @@ struct dRes_control_c { struct dPa_levelEcallBack {}; -struct _GXColor {}; - struct csXyz {}; +struct _GXColor {}; + struct dPa_control_c { /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, @@ -357,18 +357,18 @@ extern "C" void __register_global_object(); /* ############################################################################################## */ /* 80C799E4-80C799E8 000000 0004+00 6/6 0/0 0/0 .rodata @3651 */ SECTION_RODATA static f32 const lit_3651 = 10.0f; -COMPILER_STRIP_GATE(80C799E4, &lit_3651); +COMPILER_STRIP_GATE(0x80C799E4, &lit_3651); /* 80C799E8-80C799EC 000004 0004+00 0/2 0/0 0/0 .rodata @3652 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3652 = 3.0f / 10.0f; -COMPILER_STRIP_GATE(80C799E8, &lit_3652); +COMPILER_STRIP_GATE(0x80C799E8, &lit_3652); #pragma pop /* 80C799EC-80C799F0 000008 0004+00 2/5 0/0 0/0 .rodata @3653 */ SECTION_RODATA static f32 const lit_3653 = 50.0f; -COMPILER_STRIP_GATE(80C799EC, &lit_3653); +COMPILER_STRIP_GATE(0x80C799EC, &lit_3653); /* 80C79AEC-80C79AF8 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { @@ -617,6 +617,13 @@ asm void daTogeRoll_c::setBaseMtx() { } #pragma pop +/* ############################################################################################## */ +/* 80C79AE4-80C79AE4 000100 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80C79AE4 = "togeRol"; +#pragma pop + /* 80C77D50-80C77DBC 000210 006C+00 1/0 0/0 0/0 .text CreateHeap__12daTogeRoll_cFv */ #pragma push #pragma optimization_level 0 @@ -634,7 +641,7 @@ SECTION_RODATA u8 const daTogeRoll_c::mCcDObjInfo[48] = { 0xDA, 0xFB, 0xFD, 0xFF, 0x00, 0x00, 0x00, 0x1F, 0x00, 0x00, 0x00, 0x79, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x0A, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C799F0, &daTogeRoll_c::mCcDObjInfo); +COMPILER_STRIP_GATE(0x80C799F0, &daTogeRoll_c::mCcDObjInfo); /* 80C79A20-80C79A50 00003C 0030+00 1/1 0/0 0/0 .rodata mCcDObjInfo2__12daTogeRoll_c */ SECTION_RODATA u8 const daTogeRoll_c::mCcDObjInfo2[48] = { @@ -642,7 +649,7 @@ SECTION_RODATA u8 const daTogeRoll_c::mCcDObjInfo2[48] = { 0xDA, 0xFB, 0xFD, 0xFF, 0x00, 0x00, 0x00, 0x1F, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0A, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C79A20, &daTogeRoll_c::mCcDObjInfo2); +COMPILER_STRIP_GATE(0x80C79A20, &daTogeRoll_c::mCcDObjInfo2); /* 80C79A50-80C79A90 00006C 0040+00 1/1 0/0 0/0 .rodata mSpeed__12daTogeRoll_c */ SECTION_RODATA u8 const daTogeRoll_c::mSpeed[64] = { @@ -651,7 +658,7 @@ SECTION_RODATA u8 const daTogeRoll_c::mSpeed[64] = { 0x42, 0x05, 0x55, 0x55, 0x42, 0x20, 0x00, 0x00, 0x42, 0x3A, 0xAA, 0xAB, 0x42, 0x55, 0x55, 0x55, 0x42, 0x70, 0x00, 0x00, 0x42, 0x85, 0x55, 0x55, 0x42, 0xA6, 0xAA, 0xAB, 0x40, 0x55, 0x55, 0x55, }; -COMPILER_STRIP_GATE(80C79A50, &daTogeRoll_c::mSpeed); +COMPILER_STRIP_GATE(0x80C79A50, &daTogeRoll_c::mSpeed); /* 80C77DBC-80C78058 00027C 029C+00 1/1 0/0 0/0 .text create__12daTogeRoll_cFv */ #pragma push @@ -721,34 +728,34 @@ SECTION_RODATA static u8 const lit_3958[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C79A90, &lit_3958); +COMPILER_STRIP_GATE(0x80C79A90, &lit_3958); /* 80C79A94-80C79A98 0000B0 0004+00 0/1 0/0 0/0 .rodata @3959 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3959 = 70.0f; -COMPILER_STRIP_GATE(80C79A94, &lit_3959); +COMPILER_STRIP_GATE(0x80C79A94, &lit_3959); #pragma pop /* 80C79A98-80C79A9C 0000B4 0004+00 0/1 0/0 0/0 .rodata @3960 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3960 = 248.0f; -COMPILER_STRIP_GATE(80C79A98, &lit_3960); +COMPILER_STRIP_GATE(0x80C79A98, &lit_3960); #pragma pop /* 80C79A9C-80C79AA0 0000B8 0004+00 0/1 0/0 0/0 .rodata @3961 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3961 = 270.0f; -COMPILER_STRIP_GATE(80C79A9C, &lit_3961); +COMPILER_STRIP_GATE(0x80C79A9C, &lit_3961); #pragma pop /* 80C79AA0-80C79AA4 0000BC 0004+00 0/2 0/0 0/0 .rodata @3962 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3962 = 30.0f; -COMPILER_STRIP_GATE(80C79AA0, &lit_3962); +COMPILER_STRIP_GATE(0x80C79AA0, &lit_3962); #pragma pop /* 80C79AA4-80C79AAC 0000C0 0008+00 0/2 0/0 0/0 .rodata @3964 */ @@ -757,7 +764,7 @@ COMPILER_STRIP_GATE(80C79AA0, &lit_3962); SECTION_RODATA static u8 const lit_3964[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C79AA4, &lit_3964); +COMPILER_STRIP_GATE(0x80C79AA4, &lit_3964); #pragma pop /* 80C78294-80C78638 000754 03A4+00 1/0 0/0 0/0 .text Execute__12daTogeRoll_cFPPA3_A4_f @@ -778,7 +785,7 @@ asm void daTogeRoll_c::Execute(f32 (**param_0)[3][4]) { SECTION_RODATA static u8 const lit_4071[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C79AAC, &lit_4071); +COMPILER_STRIP_GATE(0x80C79AAC, &lit_4071); #pragma pop /* 80C79AB4-80C79ABC 0000D0 0008+00 0/3 0/0 0/0 .rodata @4072 */ @@ -787,7 +794,7 @@ COMPILER_STRIP_GATE(80C79AAC, &lit_4071); SECTION_RODATA static u8 const lit_4072[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C79AB4, &lit_4072); +COMPILER_STRIP_GATE(0x80C79AB4, &lit_4072); #pragma pop /* 80C79ABC-80C79AC4 0000D8 0008+00 0/3 0/0 0/0 .rodata @4073 */ @@ -796,28 +803,28 @@ COMPILER_STRIP_GATE(80C79AB4, &lit_4072); SECTION_RODATA static u8 const lit_4073[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C79ABC, &lit_4073); +COMPILER_STRIP_GATE(0x80C79ABC, &lit_4073); #pragma pop /* 80C79AC4-80C79AC8 0000E0 0004+00 0/1 0/0 0/0 .rodata @4074 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4074 = 0x43360B61; -COMPILER_STRIP_GATE(80C79AC4, &lit_4074); +COMPILER_STRIP_GATE(0x80C79AC4, &lit_4074); #pragma pop /* 80C79AC8-80C79ACC 0000E4 0004+00 0/1 0/0 0/0 .rodata @4075 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4075 = 360.0f; -COMPILER_STRIP_GATE(80C79AC8, &lit_4075); +COMPILER_STRIP_GATE(0x80C79AC8, &lit_4075); #pragma pop /* 80C79ACC-80C79AD0 0000E8 0004+00 0/1 0/0 0/0 .rodata @4076 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4076 = 0x439D1463; -COMPILER_STRIP_GATE(80C79ACC, &lit_4076); +COMPILER_STRIP_GATE(0x80C79ACC, &lit_4076); #pragma pop /* 80C79D38-80C79D44 000008 000C+00 1/1 0/0 0/0 .bss @3645 */ @@ -852,7 +859,7 @@ asm void daTogeRoll_c::init_modeBound() { /* ############################################################################################## */ /* 80C79AD0-80C79AD4 0000EC 0004+00 4/7 0/0 0/0 .rodata @4110 */ SECTION_RODATA static f32 const lit_4110 = 1.0f; -COMPILER_STRIP_GATE(80C79AD0, &lit_4110); +COMPILER_STRIP_GATE(0x80C79AD0, &lit_4110); /* 80C78B7C-80C78BD8 00103C 005C+00 1/0 0/0 0/0 .text modeBound__12daTogeRoll_cFv */ #pragma push @@ -909,12 +916,12 @@ asm void daTogeRoll_c::init_modeAcc() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4156 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(80C79AD4, &lit_4156); +COMPILER_STRIP_GATE(0x80C79AD4, &lit_4156); #pragma pop /* 80C79AD8-80C79ADC 0000F4 0004+00 1/4 0/0 0/0 .rodata @4157 */ SECTION_RODATA static f32 const lit_4157 = -1.0f; -COMPILER_STRIP_GATE(80C79AD8, &lit_4157); +COMPILER_STRIP_GATE(0x80C79AD8, &lit_4157); /* 80C78CB4-80C78DA0 001174 00EC+00 1/0 0/0 0/0 .text modeAcc__12daTogeRoll_cFv */ #pragma push @@ -941,7 +948,7 @@ asm void daTogeRoll_c::init_modeMove() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4239 = 300.0f; -COMPILER_STRIP_GATE(80C79ADC, &lit_4239); +COMPILER_STRIP_GATE(0x80C79ADC, &lit_4239); #pragma pop /* 80C78DAC-80C790C4 00126C 0318+00 1/0 0/0 0/0 .text modeMove__12daTogeRoll_cFv */ @@ -969,7 +976,7 @@ asm void daTogeRoll_c::init_modeBrk() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4285 = 0.5f; -COMPILER_STRIP_GATE(80C79AE0, &lit_4285); +COMPILER_STRIP_GATE(0x80C79AE0, &lit_4285); #pragma pop /* 80C790D0-80C792CC 001590 01FC+00 1/0 0/0 0/0 .text modeBrk__12daTogeRoll_cFv */ @@ -1148,12 +1155,7 @@ asm void __sinit_d_a_obj_lv6TogeRoll_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80C7992C = (void*)__sinit_d_a_obj_lv6TogeRoll_cpp; +REGISTER_CTORS(0x80C7992C, __sinit_d_a_obj_lv6TogeRoll_cpp); #pragma pop -/* 80C79AE4-80C79AEC 000100 0008+00 3/3 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80C79AE4 = "togeRol"; -#pragma pop +/* 80C79AE4-80C79AE4 000100 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_lv6TogeTrap/d_a_obj_lv6TogeTrap.cpp b/rel/d/a/obj/d_a_obj_lv6TogeTrap/d_a_obj_lv6TogeTrap.cpp index b9960fa09a6..89f55a513e4 100644 --- a/rel/d/a/obj/d_a_obj_lv6TogeTrap/d_a_obj_lv6TogeTrap.cpp +++ b/rel/d/a/obj/d_a_obj_lv6TogeTrap/d_a_obj_lv6TogeTrap.cpp @@ -104,10 +104,10 @@ struct dRes_control_c { struct dPa_levelEcallBack {}; -struct _GXColor {}; - struct csXyz {}; +struct _GXColor {}; + struct dPa_control_c { /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, @@ -392,38 +392,46 @@ extern "C" void __register_global_object(); /* ############################################################################################## */ /* 80C7C618-80C7C61C 000000 0004+00 11/11 0/0 0/0 .rodata @3631 */ SECTION_RODATA static f32 const lit_3631 = 300.0f; -COMPILER_STRIP_GATE(80C7C618, &lit_3631); +COMPILER_STRIP_GATE(0x80C7C618, &lit_3631); /* 80C7C61C-80C7C620 000004 0004+00 7/17 0/0 0/0 .rodata @3632 */ SECTION_RODATA static f32 const lit_3632 = 1.0f; -COMPILER_STRIP_GATE(80C7C61C, &lit_3632); +COMPILER_STRIP_GATE(0x80C7C61C, &lit_3632); /* 80C7C620-80C7C624 000008 0004+00 0/1 0/0 0/0 .rodata @3633 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3633 = 0.25f; -COMPILER_STRIP_GATE(80C7C620, &lit_3633); +COMPILER_STRIP_GATE(0x80C7C620, &lit_3633); #pragma pop /* 80C7C624-80C7C628 00000C 0004+00 0/1 0/0 0/0 .rodata @3634 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3634 = 15.0f; -COMPILER_STRIP_GATE(80C7C624, &lit_3634); +COMPILER_STRIP_GATE(0x80C7C624, &lit_3634); #pragma pop /* 80C7C628-80C7C62C 000010 0004+00 0/2 0/0 0/0 .rodata @3635 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3635 = 3.0f / 10.0f; -COMPILER_STRIP_GATE(80C7C628, &lit_3635); +COMPILER_STRIP_GATE(0x80C7C628, &lit_3635); #pragma pop /* 80C7C62C-80C7C630 000014 0004+00 0/2 0/0 0/0 .rodata @3636 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3636 = 10.0f; -COMPILER_STRIP_GATE(80C7C62C, &lit_3636); +COMPILER_STRIP_GATE(0x80C7C62C, &lit_3636); +#pragma pop + +/* 80C7C75C-80C7C75C 000144 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80C7C75C = "L6TogeTp"; +SECTION_DEAD static char const* const stringBase_80C7C765 = "L4TogeTp"; +SECTION_DEAD static char const* const stringBase_80C7C76E = "L9Toge"; #pragma pop /* 80C7C778-80C7C784 000000 000C+00 2/2 0/0 0/0 .data cNullVec__6Z2Calc */ @@ -745,7 +753,7 @@ SECTION_RODATA u8 const daLv6TogeTrap_c::mCcDObjInfo[48] = { 0xD8, 0xFB, 0xFD, 0xFF, 0x00, 0x00, 0x00, 0x11, 0x00, 0x00, 0x00, 0x79, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x0A, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C7C630, &daLv6TogeTrap_c::mCcDObjInfo); +COMPILER_STRIP_GATE(0x80C7C630, &daLv6TogeTrap_c::mCcDObjInfo); /* 80C7C660-80C7C690 000048 0030+00 1/1 0/0 0/0 .rodata mCcDObjInfo2__15daLv6TogeTrap_c */ SECTION_RODATA u8 const daLv6TogeTrap_c::mCcDObjInfo2[48] = { @@ -753,7 +761,7 @@ SECTION_RODATA u8 const daLv6TogeTrap_c::mCcDObjInfo2[48] = { 0xDA, 0xFB, 0xFD, 0xFF, 0x00, 0x00, 0x00, 0x11, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0A, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C7C660, &daLv6TogeTrap_c::mCcDObjInfo2); +COMPILER_STRIP_GATE(0x80C7C660, &daLv6TogeTrap_c::mCcDObjInfo2); /* 80C7C690-80C7C6D0 000078 0040+00 0/1 0/0 0/0 .rodata mSpeed__15daLv6TogeTrap_c */ #pragma push @@ -764,14 +772,14 @@ SECTION_RODATA u8 const daLv6TogeTrap_c::mSpeed[64] = { 0x42, 0x05, 0x55, 0x55, 0x42, 0x20, 0x00, 0x00, 0x42, 0x3A, 0xAA, 0xAB, 0x42, 0x55, 0x55, 0x55, 0x42, 0x70, 0x00, 0x00, 0x42, 0x85, 0x55, 0x55, 0x42, 0xA6, 0xAA, 0xAB, 0x40, 0x55, 0x55, 0x55, }; -COMPILER_STRIP_GATE(80C7C690, &daLv6TogeTrap_c::mSpeed); +COMPILER_STRIP_GATE(0x80C7C690, &daLv6TogeTrap_c::mSpeed); #pragma pop /* 80C7C6D0-80C7C6DC 0000B8 000C+00 1/1 0/0 0/0 .rodata l_bmdIdx */ SECTION_RODATA static u8 const l_bmdIdx[12] = { 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x04, }; -COMPILER_STRIP_GATE(80C7C6D0, &l_bmdIdx); +COMPILER_STRIP_GATE(0x80C7C6D0, &l_bmdIdx); /* 80C7C6DC-80C7C6E8 0000C4 000C+00 0/0 0/0 0/0 .rodata l_dzbIdx */ #pragma push @@ -779,7 +787,7 @@ COMPILER_STRIP_GATE(80C7C6D0, &l_bmdIdx); SECTION_RODATA static u8 const l_dzbIdx[12] = { 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x07, }; -COMPILER_STRIP_GATE(80C7C6DC, &l_dzbIdx); +COMPILER_STRIP_GATE(0x80C7C6DC, &l_dzbIdx); #pragma pop /* 80C7C6E8-80C7C6EC 0000D0 0004+00 9/18 0/0 0/0 .rodata @3665 */ @@ -789,7 +797,7 @@ SECTION_RODATA static u8 const lit_3665[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C7C6E8, &lit_3665); +COMPILER_STRIP_GATE(0x80C7C6E8, &lit_3665); /* 80C79F10-80C79FE8 0001B0 00D8+00 2/2 0/0 0/0 .text setBaseMtx__15daLv6TogeTrap_cFv */ #pragma push @@ -826,14 +834,14 @@ SECTION_RODATA static u8 const estimateSizeTbl[6 + 2 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C7C6EC, &estimateSizeTbl); +COMPILER_STRIP_GATE(0x80C7C6EC, &estimateSizeTbl); #pragma pop /* 80C7C6F4-80C7C6F8 0000DC 0004+00 0/2 0/0 0/0 .rodata @3843 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3843 = 100.0f; -COMPILER_STRIP_GATE(80C7C6F4, &lit_3843); +COMPILER_STRIP_GATE(0x80C7C6F4, &lit_3843); #pragma pop /* 80C7C6F8-80C7C700 0000E0 0004+04 0/1 0/0 0/0 .rodata @3844 */ @@ -844,7 +852,7 @@ SECTION_RODATA static f32 const lit_3844[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80C7C6F8, &lit_3844); +COMPILER_STRIP_GATE(0x80C7C6F8, &lit_3844); #pragma pop /* 80C7C700-80C7C708 0000E8 0008+00 0/1 0/0 0/0 .rodata @3846 */ @@ -853,7 +861,7 @@ COMPILER_STRIP_GATE(80C7C6F8, &lit_3844); SECTION_RODATA static u8 const lit_3846[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C7C700, &lit_3846); +COMPILER_STRIP_GATE(0x80C7C700, &lit_3846); #pragma pop /* 80C7C708-80C7C710 0000F0 0008+00 0/1 0/0 0/0 .rodata @3847 */ @@ -862,7 +870,7 @@ COMPILER_STRIP_GATE(80C7C700, &lit_3846); SECTION_RODATA static u8 const lit_3847[8] = { 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C7C708, &lit_3847); +COMPILER_STRIP_GATE(0x80C7C708, &lit_3847); #pragma pop /* 80C7A068-80C7A534 000308 04CC+00 1/1 0/0 0/0 .text create__15daLv6TogeTrap_cFv */ @@ -940,28 +948,28 @@ asm void daLv6TogeTrap_c::searchSekizoAct(void* param_0, void* param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4027 = 75.0f; -COMPILER_STRIP_GATE(80C7C710, &lit_4027); +COMPILER_STRIP_GATE(0x80C7C710, &lit_4027); #pragma pop /* 80C7C714-80C7C718 0000FC 0004+00 0/1 0/0 0/0 .rodata @4028 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4028 = 50.0f; -COMPILER_STRIP_GATE(80C7C714, &lit_4028); +COMPILER_STRIP_GATE(0x80C7C714, &lit_4028); #pragma pop /* 80C7C718-80C7C71C 000100 0004+00 0/2 0/0 0/0 .rodata @4029 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4029 = 30.0f; -COMPILER_STRIP_GATE(80C7C718, &lit_4029); +COMPILER_STRIP_GATE(0x80C7C718, &lit_4029); #pragma pop /* 80C7C71C-80C7C720 000104 0004+00 0/2 0/0 0/0 .rodata @4030 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4030 = 0x43360B61; -COMPILER_STRIP_GATE(80C7C71C, &lit_4030); +COMPILER_STRIP_GATE(0x80C7C71C, &lit_4030); #pragma pop /* 80C7CA58-80C7CA64 000008 000C+00 1/1 0/0 0/0 .bss @3625 */ @@ -1021,7 +1029,7 @@ asm void daLv6TogeTrap_c::init_modeBound() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4114 = 5.0f; -COMPILER_STRIP_GATE(80C7C720, &lit_4114); +COMPILER_STRIP_GATE(0x80C7C720, &lit_4114); #pragma pop /* 80C7AD40-80C7ADA4 000FE0 0064+00 1/0 0/0 0/0 .text modeBound__15daLv6TogeTrap_cFv */ @@ -1071,7 +1079,7 @@ asm void daLv6TogeTrap_c::init_modeAcc() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4149 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(80C7C724, &lit_4149); +COMPILER_STRIP_GATE(0x80C7C724, &lit_4149); #pragma pop /* 80C7C728-80C7C730 000110 0004+04 5/12 0/0 0/0 .rodata @4150 */ @@ -1080,7 +1088,7 @@ SECTION_RODATA static f32 const lit_4150[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80C7C728, &lit_4150); +COMPILER_STRIP_GATE(0x80C7C728, &lit_4150); /* 80C7AE24-80C7AF10 0010C4 00EC+00 1/0 0/0 0/0 .text modeAcc__15daLv6TogeTrap_cFv */ #pragma push @@ -1110,7 +1118,7 @@ asm void daLv6TogeTrap_c::init_modeMove() { SECTION_RODATA static u8 const lit_4232[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C7C730, &lit_4232); +COMPILER_STRIP_GATE(0x80C7C730, &lit_4232); #pragma pop /* 80C7C738-80C7C740 000120 0008+00 0/2 0/0 0/0 .rodata @4233 */ @@ -1119,7 +1127,7 @@ COMPILER_STRIP_GATE(80C7C730, &lit_4232); SECTION_RODATA static u8 const lit_4233[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C7C738, &lit_4233); +COMPILER_STRIP_GATE(0x80C7C738, &lit_4233); #pragma pop /* 80C7C740-80C7C748 000128 0008+00 0/2 0/0 0/0 .rodata @4234 */ @@ -1128,7 +1136,7 @@ COMPILER_STRIP_GATE(80C7C738, &lit_4233); SECTION_RODATA static u8 const lit_4234[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C7C740, &lit_4234); +COMPILER_STRIP_GATE(0x80C7C740, &lit_4234); #pragma pop /* 80C7AF1C-80C7B234 0011BC 0318+00 1/0 0/0 0/0 .text modeMove__15daLv6TogeTrap_cFv */ @@ -1157,7 +1165,7 @@ asm void daLv6TogeTrap_c::init_modeBrk() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4280 = 0.5f; -COMPILER_STRIP_GATE(80C7C748, &lit_4280); +COMPILER_STRIP_GATE(0x80C7C748, &lit_4280); #pragma pop /* 80C7B240-80C7B43C 0014E0 01FC+00 1/0 0/0 0/0 .text modeBrk__15daLv6TogeTrap_cFv */ @@ -1236,7 +1244,7 @@ asm void daLv6TogeTrap_c::modeWait() { /* ############################################################################################## */ /* 80C7C74C-80C7C750 000134 0004+00 1/1 0/0 0/0 .rodata @4416 */ SECTION_RODATA static f32 const lit_4416 = 10000.0f; -COMPILER_STRIP_GATE(80C7C74C, &lit_4416); +COMPILER_STRIP_GATE(0x80C7C74C, &lit_4416); /* 80C7B6D4-80C7B988 001974 02B4+00 1/1 0/0 0/0 .text executeType2__15daLv6TogeTrap_cFv */ @@ -1348,21 +1356,21 @@ asm void daLv6TogeTrap_c::init_modeRotate() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4533 = 360.0f; -COMPILER_STRIP_GATE(80C7C750, &lit_4533); +COMPILER_STRIP_GATE(0x80C7C750, &lit_4533); #pragma pop /* 80C7C754-80C7C758 00013C 0004+00 0/1 0/0 0/0 .rodata @4534 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4534 = 0x40490FDB; -COMPILER_STRIP_GATE(80C7C754, &lit_4534); +COMPILER_STRIP_GATE(0x80C7C754, &lit_4534); #pragma pop /* 80C7C758-80C7C75C 000140 0004+00 0/1 0/0 0/0 .rodata @4535 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4535 = 2.0f; -COMPILER_STRIP_GATE(80C7C758, &lit_4535); +COMPILER_STRIP_GATE(0x80C7C758, &lit_4535); #pragma pop /* 80C7BD70-80C7BED8 002010 0168+00 1/0 0/0 0/0 .text modeRotate__15daLv6TogeTrap_cFv */ @@ -1500,14 +1508,7 @@ asm void __sinit_d_a_obj_lv6TogeTrap_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80C7C560 = (void*)__sinit_d_a_obj_lv6TogeTrap_cpp; +REGISTER_CTORS(0x80C7C560, __sinit_d_a_obj_lv6TogeTrap_cpp); #pragma pop -/* 80C7C75C-80C7C775 000144 0019+00 1/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80C7C75C = "L6TogeTp"; -SECTION_DEAD static char const* const stringBase_80C7C765 = "L4TogeTp"; -SECTION_DEAD static char const* const stringBase_80C7C76E = "L9Toge"; -#pragma pop +/* 80C7C75C-80C7C75C 000144 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_lv6bemos/d_a_obj_lv6bemos.cpp b/rel/d/a/obj/d_a_obj_lv6bemos/d_a_obj_lv6bemos.cpp index 84ff8264547..7163becdc70 100644 --- a/rel/d/a/obj/d_a_obj_lv6bemos/d_a_obj_lv6bemos.cpp +++ b/rel/d/a/obj/d_a_obj_lv6bemos/d_a_obj_lv6bemos.cpp @@ -84,10 +84,10 @@ struct dRes_control_c { struct dPa_levelEcallBack {}; -struct _GXColor {}; - struct csXyz {}; +struct _GXColor {}; + struct dPa_control_c { /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, @@ -237,7 +237,7 @@ extern "C" static void daObjL6Bm_MoveBGDelete__FP11daObjL6Bm_c(); extern "C" static void daObjL6Bm_MoveBGExecute__FP11daObjL6Bm_c(); extern "C" static void daObjL6Bm_MoveBGDraw__FP11daObjL6Bm_c(); extern "C" void __dt__10cCcD_GSttsFv(); -extern "C" void func_80C7DE90(u8*); +extern "C" void func_80C7DE90(void* _this, u8*); extern "C" static void func_80C7DEAC(); extern "C" static void func_80C7DEB4(); extern "C" static void func_80C7DEBC(); @@ -349,27 +349,27 @@ SECTION_RODATA static u8 const l_sph_src[64] = { 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0x48, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C7DECC, &l_sph_src); +COMPILER_STRIP_GATE(0x80C7DECC, &l_sph_src); /* 80C7DF0C-80C7DF10 000040 0004+00 0/1 0/0 0/0 .rodata @3728 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3728 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(80C7DF0C, &lit_3728); +COMPILER_STRIP_GATE(0x80C7DF0C, &lit_3728); #pragma pop /* 80C7DF10-80C7DF14 000044 0004+00 0/1 0/0 0/0 .rodata @3729 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3729 = 20.0f; -COMPILER_STRIP_GATE(80C7DF10, &lit_3729); +COMPILER_STRIP_GATE(0x80C7DF10, &lit_3729); #pragma pop /* 80C7DF14-80C7DF18 000048 0004+00 0/1 0/0 0/0 .rodata @3730 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3730 = 200.0f; -COMPILER_STRIP_GATE(80C7DF14, &lit_3730); +COMPILER_STRIP_GATE(0x80C7DF14, &lit_3730); #pragma pop /* 80C7DF18-80C7DF1C 00004C 0004+00 0/3 0/0 0/0 .rodata @3731 */ @@ -381,7 +381,7 @@ SECTION_RODATA static u8 const lit_3731[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C7DF18, &lit_3731); +COMPILER_STRIP_GATE(0x80C7DF18, &lit_3731); #pragma pop /* 80C7DF1C-80C7DF24 000050 0008+00 0/1 0/0 0/0 .rodata @3732 */ @@ -390,7 +390,7 @@ COMPILER_STRIP_GATE(80C7DF18, &lit_3731); SECTION_RODATA static u8 const lit_3732[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C7DF1C, &lit_3732); +COMPILER_STRIP_GATE(0x80C7DF1C, &lit_3732); #pragma pop /* 80C7DF24-80C7DF2C 000058 0008+00 0/1 0/0 0/0 .rodata @3733 */ @@ -399,7 +399,7 @@ COMPILER_STRIP_GATE(80C7DF1C, &lit_3732); SECTION_RODATA static u8 const lit_3733[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C7DF24, &lit_3733); +COMPILER_STRIP_GATE(0x80C7DF24, &lit_3733); #pragma pop /* 80C7DF2C-80C7DF34 000060 0008+00 0/1 0/0 0/0 .rodata @3734 */ @@ -408,14 +408,14 @@ COMPILER_STRIP_GATE(80C7DF24, &lit_3733); SECTION_RODATA static u8 const lit_3734[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C7DF2C, &lit_3734); +COMPILER_STRIP_GATE(0x80C7DF2C, &lit_3734); #pragma pop /* 80C7DF34-80C7DF38 000068 0004+00 0/1 0/0 0/0 .rodata @3735 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3735 = 1200.0f; -COMPILER_STRIP_GATE(80C7DF34, &lit_3735); +COMPILER_STRIP_GATE(0x80C7DF34, &lit_3735); #pragma pop /* 80C7CB18-80C7CE24 000078 030C+00 1/1 0/0 0/0 .text nodeCallBack__FP8J3DJointi */ @@ -449,6 +449,12 @@ asm void daObjL6Bm_c::setBaseMtx() { #pragma pop /* ############################################################################################## */ +/* 80C7DF6C-80C7DF6C 0000A0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80C7DF6C = "Obj_lv6bm"; +#pragma pop + /* 80C7DF78-80C7DF84 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -498,13 +504,13 @@ asm void daObjL6Bm_c::Create() { /* ############################################################################################## */ /* 80C7DF38-80C7DF3C 00006C 0004+00 2/4 0/0 0/0 .rodata @3880 */ SECTION_RODATA static f32 const lit_3880 = 1.0f; -COMPILER_STRIP_GATE(80C7DF38, &lit_3880); +COMPILER_STRIP_GATE(0x80C7DF38, &lit_3880); /* 80C7DF3C-80C7DF44 000070 0008+00 1/1 0/0 0/0 .rodata @3882 */ SECTION_RODATA static u8 const lit_3882[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C7DF3C, &lit_3882); +COMPILER_STRIP_GATE(0x80C7DF3C, &lit_3882); /* 80C7E000-80C7E00C -00001 000C+00 0/1 0/0 0/0 .data @3939 */ #pragma push @@ -661,7 +667,7 @@ asm void daObjL6Bm_c::create1st() { SECTION_RODATA static u8 const l_particle_id[12] = { 0x82, 0x8F, 0x82, 0x90, 0x82, 0x91, 0x82, 0x92, 0x82, 0x93, 0x82, 0x94, }; -COMPILER_STRIP_GATE(80C7DF44, &l_particle_id); +COMPILER_STRIP_GATE(0x80C7DF44, &l_particle_id); /* 80C7D3A4-80C7D4F4 000904 0150+00 1/0 0/0 0/0 .text Execute__11daObjL6Bm_cFPPA3_A4_f */ #pragma push @@ -688,7 +694,7 @@ asm void daObjL6Bm_c::action() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3993 = 50.0f; -COMPILER_STRIP_GATE(80C7DF50, &lit_3993); +COMPILER_STRIP_GATE(0x80C7DF50, &lit_3993); #pragma pop /* 80C7DF54-80C7DF5C 000088 0004+04 0/2 0/0 0/0 .rodata @3994 */ @@ -699,7 +705,7 @@ SECTION_RODATA static f32 const lit_3994[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80C7DF54, &lit_3994); +COMPILER_STRIP_GATE(0x80C7DF54, &lit_3994); #pragma pop /* 80C7DF5C-80C7DF64 000090 0008+00 0/2 0/0 0/0 .rodata @3996 */ @@ -708,7 +714,7 @@ COMPILER_STRIP_GATE(80C7DF54, &lit_3994); SECTION_RODATA static u8 const lit_3996[8] = { 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C7DF5C, &lit_3996); +COMPILER_STRIP_GATE(0x80C7DF5C, &lit_3996); #pragma pop /* 80C7D598-80C7D6CC 000AF8 0134+00 1/0 0/0 0/0 .text actionWait__11daObjL6Bm_cFv */ @@ -742,14 +748,14 @@ void daObjL6Bm_c::actionAttack() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4160 = -1000000000.0f; -COMPILER_STRIP_GATE(80C7DF64, &lit_4160); +COMPILER_STRIP_GATE(0x80C7DF64, &lit_4160); #pragma pop /* 80C7DF68-80C7DF6C 00009C 0004+00 0/1 0/0 0/0 .rodata @4161 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4161 = 120.0f; -COMPILER_STRIP_GATE(80C7DF68, &lit_4161); +COMPILER_STRIP_GATE(0x80C7DF68, &lit_4161); #pragma pop /* 80C7D898-80C7DA74 000DF8 01DC+00 1/0 0/0 0/0 .text Draw__11daObjL6Bm_cFv */ @@ -891,7 +897,7 @@ asm cCcD_GStts::~cCcD_GStts() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80C7DE90(u8* param_0) { +extern "C" asm void func_80C7DE90(void* _this, u8* param_0) { nofralloc #include "asm/rel/d/a/obj/d_a_obj_lv6bemos/d_a_obj_lv6bemos/func_80C7DE90.s" } @@ -927,9 +933,4 @@ static asm void func_80C7DEBC() { } #pragma pop -/* 80C7DF6C-80C7DF76 0000A0 000A+00 1/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80C7DF6C = "Obj_lv6bm"; -#pragma pop +/* 80C7DF6C-80C7DF6C 0000A0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_lv6bemos2/d_a_obj_lv6bemos2.cpp b/rel/d/a/obj/d_a_obj_lv6bemos2/d_a_obj_lv6bemos2.cpp index 8a704e69924..60d618ffb06 100644 --- a/rel/d/a/obj/d_a_obj_lv6bemos2/d_a_obj_lv6bemos2.cpp +++ b/rel/d/a/obj/d_a_obj_lv6bemos2/d_a_obj_lv6bemos2.cpp @@ -317,8 +317,8 @@ extern "C" static void daObjLv6Bm_MoveBGDelete__FP12daObjLv6Bm_c(); extern "C" static void daObjLv6Bm_MoveBGExecute__FP12daObjLv6Bm_c(); extern "C" static void daObjLv6Bm_MoveBGDraw__FP12daObjLv6Bm_c(); extern "C" void __dt__10cCcD_GSttsFv(); -extern "C" void func_80C81BB0(u16*); -extern "C" void func_80C81BCC(u8*); +extern "C" void func_80C81BB0(void* _this, u16*); +extern "C" void func_80C81BCC(void* _this, u8*); extern "C" void __sinit_d_a_obj_lv6bemos2_cpp(); extern "C" extern char const* const d_a_obj_lv6bemos2__stringBase0; @@ -468,7 +468,7 @@ static asm void nodeCallBack(J3DJoint* param_0, int param_1) { SECTION_RODATA static u8 const l_eye_offset[12] = { 0x00, 0x00, 0x00, 0x00, 0x43, 0xD7, 0x00, 0x00, 0x42, 0xA0, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C81C2C, &l_eye_offset); +COMPILER_STRIP_GATE(0x80C81C2C, &l_eye_offset); /* 80C81C38-80C81C44 00000C 000C+00 0/1 0/0 0/0 .rodata l_beam_offsetPos */ #pragma push @@ -476,16 +476,16 @@ COMPILER_STRIP_GATE(80C81C2C, &l_eye_offset); SECTION_RODATA static u8 const l_beam_offsetPos[12] = { 0x00, 0x00, 0x00, 0x00, 0x42, 0xC4, 0x00, 0x00, 0x42, 0xFA, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C81C38, &l_beam_offsetPos); +COMPILER_STRIP_GATE(0x80C81C38, &l_beam_offsetPos); #pragma pop /* 80C81C44-80C81C48 000018 0004+00 2/3 0/0 0/0 .rodata @3854 */ SECTION_RODATA static f32 const lit_3854 = 0.5f; -COMPILER_STRIP_GATE(80C81C44, &lit_3854); +COMPILER_STRIP_GATE(0x80C81C44, &lit_3854); /* 80C81C48-80C81C4C 00001C 0004+00 10/15 0/0 0/0 .rodata @3855 */ SECTION_RODATA static f32 const lit_3855 = 1.0f; -COMPILER_STRIP_GATE(80C81C48, &lit_3855); +COMPILER_STRIP_GATE(0x80C81C48, &lit_3855); /* 80C7E30C-80C7E374 0001CC 0068+00 1/1 0/0 0/0 .text initBaseMtx__12daObjLv6Bm_cFv */ #pragma push @@ -512,7 +512,19 @@ asm void daObjLv6Bm_c::setBaseMtx() { SECTION_RODATA static u8 const lit_4012[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C81C4C, &lit_4012); +COMPILER_STRIP_GATE(0x80C81C4C, &lit_4012); + +/* 80C81CCC-80C81CCC 0000A0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80C81CCC = "E_bm6"; +SECTION_DEAD static char const* const stringBase_80C81CD2 = "bm6_eye"; +SECTION_DEAD static char const* const stringBase_80C81CDA = "head"; +SECTION_DEAD static char const* const stringBase_80C81CDF = "cogRed"; +SECTION_DEAD static char const* const stringBase_80C81CE6 = "cogBlue"; +SECTION_DEAD static char const* const stringBase_80C81CEE = "cogGreen"; +SECTION_DEAD static char const* const stringBase_80C81CF7 = "cogYellow"; +#pragma pop /* 80C81D04-80C81D10 000000 000C+00 4/4 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { @@ -860,24 +872,24 @@ SECTION_RODATA static u8 const lit_4173[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C81C54, &lit_4173); +COMPILER_STRIP_GATE(0x80C81C54, &lit_4173); /* 80C81C58-80C81C5C 00002C 0004+00 0/1 0/0 0/0 .rodata @4174 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4174 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(80C81C58, &lit_4174); +COMPILER_STRIP_GATE(0x80C81C58, &lit_4174); #pragma pop /* 80C81C5C-80C81C60 000030 0004+00 2/3 0/0 0/0 .rodata @4175 */ SECTION_RODATA static f32 const lit_4175 = 50.0f; -COMPILER_STRIP_GATE(80C81C5C, &lit_4175); +COMPILER_STRIP_GATE(0x80C81C5C, &lit_4175); /* 80C81C60-80C81C64 000034 0004+00 0/1 0/0 0/0 .rodata @4176 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4176 = 10.0f; -COMPILER_STRIP_GATE(80C81C60, &lit_4176); +COMPILER_STRIP_GATE(0x80C81C60, &lit_4176); #pragma pop /* 80C7EC6C-80C7EE50 000B2C 01E4+00 1/0 0/0 0/0 .text Execute__12daObjLv6Bm_cFPPA3_A4_f @@ -906,16 +918,16 @@ SECTION_RODATA static u8 const l_particle_id[6 + 2 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C81C64, &l_particle_id); +COMPILER_STRIP_GATE(0x80C81C64, &l_particle_id); #pragma pop /* 80C81C6C-80C81C70 000040 0004+00 2/4 0/0 0/0 .rodata @4276 */ SECTION_RODATA static f32 const lit_4276 = -1.0f; -COMPILER_STRIP_GATE(80C81C6C, &lit_4276); +COMPILER_STRIP_GATE(0x80C81C6C, &lit_4276); /* 80C81C70-80C81C74 000044 0004+00 1/2 0/0 0/0 .rodata @4277 */ SECTION_RODATA static f32 const lit_4277 = 300.0f; -COMPILER_STRIP_GATE(80C81C70, &lit_4277); +COMPILER_STRIP_GATE(0x80C81C70, &lit_4277); /* 80C7EE50-80C7F2A4 000D10 0454+00 1/1 0/0 0/0 .text action__12daObjLv6Bm_cFv */ #pragma push @@ -934,7 +946,7 @@ asm void daObjLv6Bm_c::action() { SECTION_RODATA static u8 const lit_4452[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C81C74, &lit_4452); +COMPILER_STRIP_GATE(0x80C81C74, &lit_4452); #pragma pop /* 80C81C7C-80C81C84 000050 0008+00 0/1 0/0 0/0 .rodata @4453 */ @@ -943,7 +955,7 @@ COMPILER_STRIP_GATE(80C81C74, &lit_4452); SECTION_RODATA static u8 const lit_4453[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C81C7C, &lit_4453); +COMPILER_STRIP_GATE(0x80C81C7C, &lit_4453); #pragma pop /* 80C81C84-80C81C8C 000058 0008+00 0/1 0/0 0/0 .rodata @4454 */ @@ -952,42 +964,42 @@ COMPILER_STRIP_GATE(80C81C7C, &lit_4453); SECTION_RODATA static u8 const lit_4454[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C81C84, &lit_4454); +COMPILER_STRIP_GATE(0x80C81C84, &lit_4454); #pragma pop /* 80C81C8C-80C81C90 000060 0004+00 0/1 0/0 0/0 .rodata @4455 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4455 = 360.0f; -COMPILER_STRIP_GATE(80C81C8C, &lit_4455); +COMPILER_STRIP_GATE(0x80C81C8C, &lit_4455); #pragma pop /* 80C81C90-80C81C94 000064 0004+00 0/1 0/0 0/0 .rodata @4456 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4456 = 1200.0f; -COMPILER_STRIP_GATE(80C81C90, &lit_4456); +COMPILER_STRIP_GATE(0x80C81C90, &lit_4456); #pragma pop /* 80C81C94-80C81C98 000068 0004+00 0/1 0/0 0/0 .rodata @4457 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4457 = 1.0f / 100.0f; -COMPILER_STRIP_GATE(80C81C94, &lit_4457); +COMPILER_STRIP_GATE(0x80C81C94, &lit_4457); #pragma pop /* 80C81C98-80C81C9C 00006C 0004+00 0/1 0/0 0/0 .rodata @4458 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4458 = 20.0f; -COMPILER_STRIP_GATE(80C81C98, &lit_4458); +COMPILER_STRIP_GATE(0x80C81C98, &lit_4458); #pragma pop /* 80C81C9C-80C81CA0 000070 0004+00 0/1 0/0 0/0 .rodata @4459 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4459 = 60.0f; -COMPILER_STRIP_GATE(80C81C9C, &lit_4459); +COMPILER_STRIP_GATE(0x80C81C9C, &lit_4459); #pragma pop /* 80C7F2A4-80C7F8BC 001164 0618+00 1/1 0/0 0/0 .text calcBeam__12daObjLv6Bm_cFv */ @@ -1035,13 +1047,13 @@ asm void daObjLv6Bm_c::checkSearchPlayer() { /* ############################################################################################## */ /* 80C81CA0-80C81CA4 000074 0004+00 2/2 0/0 0/0 .rodata @4543 */ SECTION_RODATA static f32 const lit_4543 = 1000.0f; -COMPILER_STRIP_GATE(80C81CA0, &lit_4543); +COMPILER_STRIP_GATE(0x80C81CA0, &lit_4543); /* 80C81CA4-80C81CAC 000078 0008+00 2/2 0/0 0/0 .rodata @4545 */ SECTION_RODATA static u8 const lit_4545[8] = { 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C81CA4, &lit_4545); +COMPILER_STRIP_GATE(0x80C81CA4, &lit_4545); /* 80C7FBA4-80C7FBFC 001A64 0058+00 2/2 0/0 0/0 .text getSearchDistance__12daObjLv6Bm_cFv */ @@ -1087,7 +1099,7 @@ SECTION_RODATA static u8 const eff_id_4596[4] = { 0x88, 0xDA, }; -COMPILER_STRIP_GATE(80C81CAC, &eff_id_4596); +COMPILER_STRIP_GATE(0x80C81CAC, &eff_id_4596); /* 80C7FD90-80C7FEC4 001C50 0134+00 1/1 0/0 0/0 .text initEffectSet0__12daObjLv6Bm_cFv */ #pragma push @@ -1125,7 +1137,7 @@ asm void daObjLv6Bm_c::initActionSwWait() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4764 = 200.0f; -COMPILER_STRIP_GATE(80C81CB0, &lit_4764); +COMPILER_STRIP_GATE(0x80C81CB0, &lit_4764); #pragma pop /* 80C7FFB8-80C802AC 001E78 02F4+00 1/0 0/0 0/0 .text actionSwWait__12daObjLv6Bm_cFv */ @@ -1187,7 +1199,7 @@ asm void daObjLv6Bm_c::actionFindPlayer() { SECTION_RODATA static u8 const eff_id_4844[8] = { 0x88, 0xD5, 0x88, 0xD6, 0x88, 0xD7, 0x88, 0xD8, }; -COMPILER_STRIP_GATE(80C81CB4, &eff_id_4844); +COMPILER_STRIP_GATE(0x80C81CB4, &eff_id_4844); #pragma pop /* 80C80684-80C8082C 002544 01A8+00 1/1 0/0 0/0 .text initActionAttack__12daObjLv6Bm_cFv @@ -1211,21 +1223,21 @@ SECTION_RODATA static u8 const l_eff_id[4] = { 0x88, 0xD4, }; -COMPILER_STRIP_GATE(80C81CBC, &l_eff_id); +COMPILER_STRIP_GATE(0x80C81CBC, &l_eff_id); #pragma pop /* 80C81CC0-80C81CC4 000094 0004+00 0/1 0/0 0/0 .rodata @5133 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5133 = 5.0f; -COMPILER_STRIP_GATE(80C81CC0, &lit_5133); +COMPILER_STRIP_GATE(0x80C81CC0, &lit_5133); #pragma pop /* 80C81CC4-80C81CC8 000098 0004+00 0/1 0/0 0/0 .rodata @5134 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5134 = 15.0f; -COMPILER_STRIP_GATE(80C81CC4, &lit_5134); +COMPILER_STRIP_GATE(0x80C81CC4, &lit_5134); #pragma pop /* 80C8082C-80C80F48 0026EC 071C+00 1/0 0/0 0/0 .text actionAttack__12daObjLv6Bm_cFv */ @@ -1403,7 +1415,7 @@ asm cCcD_GStts::~cCcD_GStts() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80C81BB0(u16* param_0) { +extern "C" asm void func_80C81BB0(void* _this, u16* param_0) { nofralloc #include "asm/rel/d/a/obj/d_a_obj_lv6bemos2/d_a_obj_lv6bemos2/func_80C81BB0.s" } @@ -1413,7 +1425,7 @@ extern "C" asm void func_80C81BB0(u16* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80C81BCC(u8* param_0) { +extern "C" asm void func_80C81BCC(void* _this, u8* param_0) { nofralloc #include "asm/rel/d/a/obj/d_a_obj_lv6bemos2/d_a_obj_lv6bemos2/func_80C81BCC.s" } @@ -1431,7 +1443,7 @@ asm void __sinit_d_a_obj_lv6bemos2_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80C81BE8 = (void*)__sinit_d_a_obj_lv6bemos2_cpp; +REGISTER_CTORS(0x80C81BE8, __sinit_d_a_obj_lv6bemos2_cpp); #pragma pop /* ############################################################################################## */ @@ -1439,18 +1451,7 @@ SECTION_CTORS void* const _ctors_80C81BE8 = (void*)__sinit_d_a_obj_lv6bemos2_cpp #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5280 = 6.0f; -COMPILER_STRIP_GATE(80C81CC8, &lit_5280); +COMPILER_STRIP_GATE(0x80C81CC8, &lit_5280); #pragma pop -/* 80C81CCC-80C81D01 0000A0 0035+00 7/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80C81CCC = "E_bm6"; -SECTION_DEAD static char const* const stringBase_80C81CD2 = "bm6_eye"; -SECTION_DEAD static char const* const stringBase_80C81CDA = "head"; -SECTION_DEAD static char const* const stringBase_80C81CDF = "cogRed"; -SECTION_DEAD static char const* const stringBase_80C81CE6 = "cogBlue"; -SECTION_DEAD static char const* const stringBase_80C81CEE = "cogGreen"; -SECTION_DEAD static char const* const stringBase_80C81CF7 = "cogYellow"; -#pragma pop +/* 80C81CCC-80C81CCC 0000A0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_lv6egate/d_a_obj_lv6egate.cpp b/rel/d/a/obj/d_a_obj_lv6egate/d_a_obj_lv6egate.cpp index ed4961f0ecb..5ed371e3735 100644 --- a/rel/d/a/obj/d_a_obj_lv6egate/d_a_obj_lv6egate.cpp +++ b/rel/d/a/obj/d_a_obj_lv6egate/d_a_obj_lv6egate.cpp @@ -40,13 +40,13 @@ struct dSv_info_c { struct dPa_levelEcallBack {}; -struct cXyz {}; - struct dKy_tevstr_c {}; +struct csXyz {}; + struct _GXColor {}; -struct csXyz {}; +struct cXyz {}; struct dPa_control_c { /* 8004D4CC */ void set(u32, u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, @@ -127,10 +127,10 @@ struct cBgS { /* 80074250 */ void Release(dBgW_Base*); }; -struct Vec {}; - struct JAISoundID {}; +struct Vec {}; + struct Z2SeMgr { /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); /* 802AC50C */ void seStartLevel(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); @@ -225,6 +225,12 @@ extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; // /* ############################################################################################## */ +/* 80C82BA4-80C82BA4 000034 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80C82BA4 = "LV6EGATE"; +#pragma pop + /* 80C82BB0-80C82BB4 -00001 0004+00 2/2 0/0 0/0 .data l_arcName */ SECTION_DATA static void* l_arcName = (void*)&d_a_obj_lv6egate__stringBase0; @@ -259,7 +265,7 @@ SECTION_RODATA static u8 const l_cull_box[24] = { 0xC3, 0xFA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC2, 0x48, 0x00, 0x00, 0x43, 0xFA, 0x00, 0x00, 0x43, 0x96, 0x00, 0x00, 0x42, 0x48, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C82B70, &l_cull_box); +COMPILER_STRIP_GATE(0x80C82B70, &l_cull_box); /* 80C82BB4-80C82BF8 000004 0044+00 1/1 0/0 0/0 .data l_at_cyl_src */ SECTION_DATA static u8 l_at_cyl_src[68] = { @@ -305,21 +311,21 @@ asm void daObjLv6EGate_c::onDisp() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3798 = 1.0f; -COMPILER_STRIP_GATE(80C82B88, &lit_3798); +COMPILER_STRIP_GATE(0x80C82B88, &lit_3798); #pragma pop /* 80C82B8C-80C82B90 00001C 0004+00 0/1 0/0 0/0 .rodata @3799 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3799 = -1.0f; -COMPILER_STRIP_GATE(80C82B8C, &lit_3799); +COMPILER_STRIP_GATE(0x80C82B8C, &lit_3799); #pragma pop /* 80C82B90-80C82B94 000020 0004+00 0/1 0/0 0/0 .rodata @3800 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3800 = -280.0f; -COMPILER_STRIP_GATE(80C82B90, &lit_3800); +COMPILER_STRIP_GATE(0x80C82B90, &lit_3800); #pragma pop /* 80C82B94-80C82B98 000024 0004+00 0/1 0/0 0/0 .rodata @3801 */ @@ -331,28 +337,28 @@ SECTION_RODATA static u8 const lit_3801[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C82B94, &lit_3801); +COMPILER_STRIP_GATE(0x80C82B94, &lit_3801); #pragma pop /* 80C82B98-80C82B9C 000028 0004+00 0/1 0/0 0/0 .rodata @3802 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3802 = 76.25f; -COMPILER_STRIP_GATE(80C82B98, &lit_3802); +COMPILER_STRIP_GATE(0x80C82B98, &lit_3802); #pragma pop /* 80C82B9C-80C82BA0 00002C 0004+00 0/1 0/0 0/0 .rodata @3803 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3803 = 30.0f; -COMPILER_STRIP_GATE(80C82B9C, &lit_3803); +COMPILER_STRIP_GATE(0x80C82B9C, &lit_3803); #pragma pop /* 80C82BA0-80C82BA4 000030 0004+00 0/1 0/0 0/0 .rodata @3804 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3804 = 50.0f; -COMPILER_STRIP_GATE(80C82BA0, &lit_3804); +COMPILER_STRIP_GATE(0x80C82BA0, &lit_3804); #pragma pop /* 80C82388-80C82690 000388 0308+00 1/0 0/0 0/0 .text Execute__15daObjLv6EGate_cFPPA3_A4_f */ @@ -565,9 +571,4 @@ asm daObjLv6EGate_c::~daObjLv6EGate_c() { } #pragma pop -/* 80C82BA4-80C82BAD 000034 0009+00 1/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80C82BA4 = "LV6EGATE"; -#pragma pop +/* 80C82BA4-80C82BA4 000034 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_lv6elevta/d_a_obj_lv6elevta.cpp b/rel/d/a/obj/d_a_obj_lv6elevta/d_a_obj_lv6elevta.cpp index badc68af643..68334de51c7 100644 --- a/rel/d/a/obj/d_a_obj_lv6elevta/d_a_obj_lv6elevta.cpp +++ b/rel/d/a/obj/d_a_obj_lv6elevta/d_a_obj_lv6elevta.cpp @@ -83,10 +83,10 @@ struct dBgS_MoveBgActor { /* 80078950 */ void MoveBGExecute(); }; -struct Vec {}; - struct JAISoundID {}; +struct Vec {}; + struct Z2SeMgr { /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); /* 802AC50C */ void seStartLevel(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); @@ -174,6 +174,12 @@ extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; // /* ############################################################################################## */ +/* 80C83848-80C83848 000038 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80C83848 = "Lv6ElevtA"; +#pragma pop + /* 80C83854-80C83858 -00001 0004+00 3/3 0/0 0/0 .data l_arcName */ SECTION_DATA static void* l_arcName = (void*)&d_a_obj_lv6elevta__stringBase0; @@ -213,7 +219,7 @@ SECTION_RODATA static u8 const l_cull_box[24] = { 0xC3, 0xC4, 0x90, 0xA4, 0xC5, 0x3B, 0x80, 0x00, 0xC4, 0x3B, 0x80, 0x00, 0x43, 0xC4, 0x90, 0xA4, 0x43, 0x16, 0x00, 0x00, 0x43, 0xC4, 0x90, 0xA4, }; -COMPILER_STRIP_GATE(80C83810, &l_cull_box); +COMPILER_STRIP_GATE(0x80C83810, &l_cull_box); /* 80C82EA8-80C82FA4 0001E8 00FC+00 1/0 0/0 0/0 .text Create__16daObjLv6ElevtA_cFv */ #pragma push @@ -250,26 +256,26 @@ asm void daObjLv6ElevtA_c::eventStart() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3752 = 1500.0f; -COMPILER_STRIP_GATE(80C83828, &lit_3752); +COMPILER_STRIP_GATE(0x80C83828, &lit_3752); #pragma pop /* 80C8382C-80C83830 00001C 0004+00 0/1 0/0 0/0 .rodata @3753 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3753 = 16383.0f; -COMPILER_STRIP_GATE(80C8382C, &lit_3753); +COMPILER_STRIP_GATE(0x80C8382C, &lit_3753); #pragma pop /* 80C83830-80C83834 000020 0004+00 0/1 0/0 0/0 .rodata @3754 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3754 = 800.0f; -COMPILER_STRIP_GATE(80C83830, &lit_3754); +COMPILER_STRIP_GATE(0x80C83830, &lit_3754); #pragma pop /* 80C83834-80C83838 000024 0004+00 1/2 0/0 0/0 .rodata @3755 */ SECTION_RODATA static f32 const lit_3755 = 1.0f; -COMPILER_STRIP_GATE(80C83834, &lit_3755); +COMPILER_STRIP_GATE(0x80C83834, &lit_3755); /* 80C83838-80C83840 000028 0004+04 1/2 0/0 0/0 .rodata @3756 */ SECTION_RODATA static f32 const lit_3756[1 + 1 /* padding */] = { @@ -277,7 +283,7 @@ SECTION_RODATA static f32 const lit_3756[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80C83838, &lit_3756); +COMPILER_STRIP_GATE(0x80C83838, &lit_3756); /* 80C83840-80C83848 000030 0008+00 0/1 0/0 0/0 .rodata @3758 */ #pragma push @@ -285,7 +291,7 @@ COMPILER_STRIP_GATE(80C83838, &lit_3756); SECTION_RODATA static u8 const lit_3758[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C83840, &lit_3758); +COMPILER_STRIP_GATE(0x80C83840, &lit_3758); #pragma pop /* 80C830BC-80C8321C 0003FC 0160+00 1/1 0/0 0/0 .text moveAngle__16daObjLv6ElevtA_cFPv */ @@ -483,9 +489,4 @@ static asm void func_80C83800() { } #pragma pop -/* 80C83848-80C83852 000038 000A+00 1/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80C83848 = "Lv6ElevtA"; -#pragma pop +/* 80C83848-80C83848 000038 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_lv6swturn/d_a_obj_lv6swturn.cpp b/rel/d/a/obj/d_a_obj_lv6swturn/d_a_obj_lv6swturn.cpp index 92fa27c44d4..63814ecbda4 100644 --- a/rel/d/a/obj/d_a_obj_lv6swturn/d_a_obj_lv6swturn.cpp +++ b/rel/d/a/obj/d_a_obj_lv6swturn/d_a_obj_lv6swturn.cpp @@ -195,7 +195,7 @@ SECTION_RODATA static u8 const lit_3695[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C846A4, &lit_3695); +COMPILER_STRIP_GATE(0x80C846A4, &lit_3695); /* 80C83998-80C83A98 000078 0100+00 1/1 0/0 0/0 .text * PPCallBack__FP10fopAc_ac_cP10fopAc_ac_csQ29dBgW_Base13PushPullLabel */ @@ -241,6 +241,12 @@ asm void daObjLv6SwTurn_c::Create() { #pragma pop /* ############################################################################################## */ +/* 80C846C4-80C846C4 000020 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80C846C4 = "Obj_l6tsw"; +#pragma pop + /* 80C846D0-80C846DC 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -348,21 +354,21 @@ asm void daObjLv6SwTurn_c::init_modeWait() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3960 = 1.0f; -COMPILER_STRIP_GATE(80C846A8, &lit_3960); +COMPILER_STRIP_GATE(0x80C846A8, &lit_3960); #pragma pop /* 80C846AC-80C846B0 000008 0004+00 0/2 0/0 0/0 .rodata @3961 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3961 = -1.0f; -COMPILER_STRIP_GATE(80C846AC, &lit_3961); +COMPILER_STRIP_GATE(0x80C846AC, &lit_3961); #pragma pop /* 80C846B0-80C846B4 00000C 0004+00 0/1 0/0 0/0 .rodata @3962 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3962 = 10.0f; -COMPILER_STRIP_GATE(80C846B0, &lit_3962); +COMPILER_STRIP_GATE(0x80C846B0, &lit_3962); #pragma pop /* 80C846B4-80C846BC 000010 0008+00 0/2 0/0 0/0 .rodata @3964 */ @@ -371,7 +377,7 @@ COMPILER_STRIP_GATE(80C846B0, &lit_3962); SECTION_RODATA static u8 const lit_3964[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C846B4, &lit_3964); +COMPILER_STRIP_GATE(0x80C846B4, &lit_3964); #pragma pop /* 80C83E58-80C84238 000538 03E0+00 1/0 0/0 0/0 .text modeWait__16daObjLv6SwTurn_cFv */ @@ -399,14 +405,14 @@ asm void daObjLv6SwTurn_c::init_modeRotate() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4069 = 16384.0f; -COMPILER_STRIP_GATE(80C846BC, &lit_4069); +COMPILER_STRIP_GATE(0x80C846BC, &lit_4069); #pragma pop /* 80C846C0-80C846C4 00001C 0004+00 0/1 0/0 0/0 .rodata @4070 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4070 = 90.0f; -COMPILER_STRIP_GATE(80C846C0, &lit_4070); +COMPILER_STRIP_GATE(0x80C846C0, &lit_4070); #pragma pop /* 80C8425C-80C844F8 00093C 029C+00 1/0 0/0 0/0 .text modeRotate__16daObjLv6SwTurn_cFv */ @@ -520,9 +526,4 @@ static asm void daObjLv6SwTurn_MoveBGDraw(daObjLv6SwTurn_c* param_0) { } #pragma pop -/* 80C846C4-80C846CE 000020 000A+00 1/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80C846C4 = "Obj_l6tsw"; -#pragma pop +/* 80C846C4-80C846C4 000020 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_lv7BsGate/d_a_obj_lv7BsGate.cpp b/rel/d/a/obj/d_a_obj_lv7BsGate/d_a_obj_lv7BsGate.cpp index 4e06c01be84..7b2399b85aa 100644 --- a/rel/d/a/obj/d_a_obj_lv7BsGate/d_a_obj_lv7BsGate.cpp +++ b/rel/d/a/obj/d_a_obj_lv7BsGate/d_a_obj_lv7BsGate.cpp @@ -91,10 +91,10 @@ struct dBgS_MoveBgActor { /* 80078950 */ void MoveBGExecute(); }; -struct Vec {}; - struct JAISoundID {}; +struct Vec {}; + struct Z2SeMgr { /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); /* 802AC50C */ void seStartLevel(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); @@ -185,11 +185,18 @@ extern "C" void __register_global_object(); /* ############################################################################################## */ /* 80C85210-80C85214 000000 0004+00 3/3 0/0 0/0 .rodata @3628 */ SECTION_RODATA static f32 const lit_3628 = 2.0f; -COMPILER_STRIP_GATE(80C85210, &lit_3628); +COMPILER_STRIP_GATE(0x80C85210, &lit_3628); /* 80C85214-80C85218 000004 0004+00 1/1 0/0 0/0 .rodata @3629 */ SECTION_RODATA static f32 const lit_3629 = 12.0f; -COMPILER_STRIP_GATE(80C85214, &lit_3629); +COMPILER_STRIP_GATE(0x80C85214, &lit_3629); + +/* 80C85234-80C85234 000024 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80C85234 = "L7Gate"; +SECTION_DEAD static char const* const stringBase_80C8523B = "L7GateL"; +#pragma pop /* 80C85244-80C85250 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { @@ -343,7 +350,7 @@ SECTION_RODATA static u8 const lit_3650[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C85218, &lit_3650); +COMPILER_STRIP_GATE(0x80C85218, &lit_3650); /* 80C84930-80C849CC 000170 009C+00 2/2 0/0 0/0 .text setBaseMtx__13daLv7BsGate_cFv */ #pragma push @@ -368,7 +375,7 @@ asm void daLv7BsGate_c::CreateHeap() { /* ############################################################################################## */ /* 80C8521C-80C85220 00000C 0004+00 1/1 0/0 0/0 .rodata @3722 */ SECTION_RODATA static f32 const lit_3722 = -450.0f; -COMPILER_STRIP_GATE(80C8521C, &lit_3722); +COMPILER_STRIP_GATE(0x80C8521C, &lit_3722); /* 80C84A4C-80C84BCC 00028C 0180+00 1/1 0/0 0/0 .text create__13daLv7BsGate_cFv */ #pragma push @@ -441,28 +448,28 @@ asm void daLv7BsGate_c::init_modeOpen() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3796 = 1.0f; -COMPILER_STRIP_GATE(80C85220, &lit_3796); +COMPILER_STRIP_GATE(0x80C85220, &lit_3796); #pragma pop /* 80C85224-80C85228 000014 0004+00 0/2 0/0 0/0 .rodata @3797 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3797 = -1.0f; -COMPILER_STRIP_GATE(80C85224, &lit_3797); +COMPILER_STRIP_GATE(0x80C85224, &lit_3797); #pragma pop /* 80C85228-80C8522C 000018 0004+00 0/1 0/0 0/0 .rodata @3798 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3798 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(80C85228, &lit_3798); +COMPILER_STRIP_GATE(0x80C85228, &lit_3798); #pragma pop /* 80C8522C-80C85230 00001C 0004+00 0/2 0/0 0/0 .rodata @3799 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3799 = 0.5f; -COMPILER_STRIP_GATE(80C8522C, &lit_3799); +COMPILER_STRIP_GATE(0x80C8522C, &lit_3799); #pragma pop /* 80C84D40-80C84E94 000580 0154+00 1/0 0/0 0/0 .text modeOpen__13daLv7BsGate_cFv */ @@ -491,7 +498,7 @@ asm void daLv7BsGate_c::init_modeClose() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3833 = 2.0f / 5.0f; -COMPILER_STRIP_GATE(80C85230, &lit_3833); +COMPILER_STRIP_GATE(0x80C85230, &lit_3833); #pragma pop /* 80C84EA0-80C84FF4 0006E0 0154+00 1/0 0/0 0/0 .text modeClose__13daLv7BsGate_cFv */ @@ -588,13 +595,7 @@ asm void __sinit_d_a_obj_lv7BsGate_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80C851C0 = (void*)__sinit_d_a_obj_lv7BsGate_cpp; +REGISTER_CTORS(0x80C851C0, __sinit_d_a_obj_lv7BsGate_cpp); #pragma pop -/* 80C85234-80C85243 000024 000F+00 1/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80C85234 = "L7Gate"; -SECTION_DEAD static char const* const stringBase_80C8523B = "L7GateL"; -#pragma pop +/* 80C85234-80C85234 000024 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_lv7PropellerY/d_a_obj_lv7PropellerY.cpp b/rel/d/a/obj/d_a_obj_lv7PropellerY/d_a_obj_lv7PropellerY.cpp index 6f63fa58e8b..b2a6d33825c 100644 --- a/rel/d/a/obj/d_a_obj_lv7PropellerY/d_a_obj_lv7PropellerY.cpp +++ b/rel/d/a/obj/d_a_obj_lv7PropellerY/d_a_obj_lv7PropellerY.cpp @@ -89,10 +89,10 @@ struct dBgS_MoveBgActor { /* 80078950 */ void MoveBGExecute(); }; -struct Vec {}; - struct JAISoundID {}; +struct Vec {}; + struct Z2SeMgr { /* 802AC50C */ void seStartLevel(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); }; @@ -192,34 +192,41 @@ SECTION_RODATA static u8 const lit_3650[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C86130, &lit_3650); +COMPILER_STRIP_GATE(0x80C86130, &lit_3650); /* 80C86134-80C86138 000004 0004+00 0/1 0/0 0/0 .rodata @3651 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3651 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(80C86134, &lit_3651); +COMPILER_STRIP_GATE(0x80C86134, &lit_3651); #pragma pop /* 80C86138-80C8613C 000008 0004+00 0/1 0/0 0/0 .rodata @3652 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_3652 = 0x3B449BA6; -COMPILER_STRIP_GATE(80C86138, &lit_3652); +COMPILER_STRIP_GATE(0x80C86138, &lit_3652); #pragma pop /* 80C8613C-80C86140 00000C 0004+00 0/4 0/0 0/0 .rodata @3653 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3653 = 1.0f; -COMPILER_STRIP_GATE(80C8613C, &lit_3653); +COMPILER_STRIP_GATE(0x80C8613C, &lit_3653); #pragma pop /* 80C86140-80C86144 000010 0004+00 0/1 0/0 0/0 .rodata @3654 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3654 = 20.0f; -COMPILER_STRIP_GATE(80C86140, &lit_3654); +COMPILER_STRIP_GATE(0x80C86140, &lit_3654); +#pragma pop + +/* 80C86160-80C86160 000030 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80C86160 = "stickwl00"; +SECTION_DEAD static char const* const stringBase_80C8616A = "stickwl01"; #pragma pop /* 80C86174-80C86180 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ @@ -478,35 +485,35 @@ asm void daPropY_c::init_modeMove() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3845 = 360.0f; -COMPILER_STRIP_GATE(80C86144, &lit_3845); +COMPILER_STRIP_GATE(0x80C86144, &lit_3845); #pragma pop /* 80C86148-80C8614C 000018 0004+00 0/2 0/0 0/0 .rodata @3846 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3846 = 30.0f; -COMPILER_STRIP_GATE(80C86148, &lit_3846); +COMPILER_STRIP_GATE(0x80C86148, &lit_3846); #pragma pop /* 80C8614C-80C86150 00001C 0004+00 0/4 0/0 0/0 .rodata @3847 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_3847 = 0x43360B61; -COMPILER_STRIP_GATE(80C8614C, &lit_3847); +COMPILER_STRIP_GATE(0x80C8614C, &lit_3847); #pragma pop /* 80C86150-80C86154 000020 0004+00 0/2 0/0 0/0 .rodata @3848 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3848 = 127.0f; -COMPILER_STRIP_GATE(80C86150, &lit_3848); +COMPILER_STRIP_GATE(0x80C86150, &lit_3848); #pragma pop /* 80C86154-80C86158 000024 0004+00 0/3 0/0 0/0 .rodata @3849 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3849 = -1.0f; -COMPILER_STRIP_GATE(80C86154, &lit_3849); +COMPILER_STRIP_GATE(0x80C86154, &lit_3849); #pragma pop /* 80C859E0-80C85B08 000660 0128+00 1/0 0/0 0/0 .text modeMove__9daPropY_cFv */ @@ -566,7 +573,7 @@ asm void daPropY_c::modeMove2() { SECTION_RODATA static u8 const lit_3913[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C86158, &lit_3913); +COMPILER_STRIP_GATE(0x80C86158, &lit_3913); #pragma pop /* 80C85CAC-80C85DD0 00092C 0124+00 1/1 0/0 0/0 .text init_modeStop__9daPropY_cFv */ @@ -672,13 +679,7 @@ asm void __sinit_d_a_obj_lv7PropellerY_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80C860E0 = (void*)__sinit_d_a_obj_lv7PropellerY_cpp; +REGISTER_CTORS(0x80C860E0, __sinit_d_a_obj_lv7PropellerY_cpp); #pragma pop -/* 80C86160-80C86174 000030 0014+00 1/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80C86160 = "stickwl00"; -SECTION_DEAD static char const* const stringBase_80C8616A = "stickwl01"; -#pragma pop +/* 80C86160-80C86160 000030 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_lv7bridge/d_a_obj_lv7bridge.cpp b/rel/d/a/obj/d_a_obj_lv7bridge/d_a_obj_lv7bridge.cpp index 6942f91b225..1ac5250a9c6 100644 --- a/rel/d/a/obj/d_a_obj_lv7bridge/d_a_obj_lv7bridge.cpp +++ b/rel/d/a/obj/d_a_obj_lv7bridge/d_a_obj_lv7bridge.cpp @@ -79,10 +79,10 @@ struct dRes_control_c { struct dPa_levelEcallBack {}; -struct _GXColor {}; - struct csXyz {}; +struct _GXColor {}; + struct dPa_control_c { /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, @@ -194,10 +194,10 @@ struct cBgS { /* 80074250 */ void Release(dBgW_Base*); }; -struct Vec {}; - struct JAISoundID {}; +struct Vec {}; + struct Z2SeMgr { /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); /* 802AC50C */ void seStartLevel(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); @@ -379,13 +379,13 @@ asm void daObjLv7Brg_c::initBaseMtx() { SECTION_RODATA static u8 const l_bmd[8] = { 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x0A, }; -COMPILER_STRIP_GATE(80C879A0, &l_bmd); +COMPILER_STRIP_GATE(0x80C879A0, &l_bmd); /* 80C879A8-80C879B0 000008 0008+00 1/1 0/0 0/0 .rodata l_dzb */ SECTION_RODATA static u8 const l_dzb[8] = { 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x0D, }; -COMPILER_STRIP_GATE(80C879A8, &l_dzb); +COMPILER_STRIP_GATE(0x80C879A8, &l_dzb); /* 80C879B0-80C879C4 000010 0012+02 0/1 0/0 0/0 .rodata l_eff_id */ #pragma push @@ -413,14 +413,14 @@ SECTION_RODATA static u8 const l_eff_id[18 + 2 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C879B0, &l_eff_id); +COMPILER_STRIP_GATE(0x80C879B0, &l_eff_id); #pragma pop /* 80C879C4-80C879CC 000024 0008+00 1/1 0/0 0/0 .rodata l_heap_size */ SECTION_RODATA static u8 const l_heap_size[8] = { 0x00, 0x00, 0x60, 0x00, 0x00, 0x02, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C879C4, &l_heap_size); +COMPILER_STRIP_GATE(0x80C879C4, &l_heap_size); /* 80C879CC-80C879D0 00002C 0004+00 3/5 0/0 0/0 .rodata @3697 */ SECTION_RODATA static u8 const lit_3697[4] = { @@ -429,7 +429,7 @@ SECTION_RODATA static u8 const lit_3697[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C879CC, &lit_3697); +COMPILER_STRIP_GATE(0x80C879CC, &lit_3697); /* 80C864B4-80C865B8 0001B4 0104+00 2/2 0/0 0/0 .text setBaseMtx__13daObjLv7Brg_cFv */ #pragma push @@ -444,17 +444,24 @@ asm void daObjLv7Brg_c::setBaseMtx() { /* ############################################################################################## */ /* 80C879D0-80C879D4 000030 0004+00 1/2 0/0 0/0 .rodata @3767 */ SECTION_RODATA static f32 const lit_3767 = 5100.0f; -COMPILER_STRIP_GATE(80C879D0, &lit_3767); +COMPILER_STRIP_GATE(0x80C879D0, &lit_3767); /* 80C879D4-80C879D8 000034 0004+00 1/1 0/0 0/0 .rodata @3768 */ SECTION_RODATA static f32 const lit_3768 = 100.0f; -COMPILER_STRIP_GATE(80C879D4, &lit_3768); +COMPILER_STRIP_GATE(0x80C879D4, &lit_3768); /* 80C879D8-80C879E0 000038 0008+00 1/1 0/0 0/0 .rodata @3770 */ SECTION_RODATA static u8 const lit_3770[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C879D8, &lit_3770); +COMPILER_STRIP_GATE(0x80C879D8, &lit_3770); + +/* 80C87A20-80C87A20 000080 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80C87A20 = "Obj_l7brg"; +SECTION_DEAD static char const* const stringBase_80C87A2A = "K_bridge"; +#pragma pop /* 80C87A34-80C87A40 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { @@ -506,14 +513,14 @@ asm void daObjLv7Brg_c::Create() { SECTION_RODATA static u8 const l_bck[8] = { 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x06, }; -COMPILER_STRIP_GATE(80C879E0, &l_bck); +COMPILER_STRIP_GATE(0x80C879E0, &l_bck); #pragma pop /* 80C879E8-80C879EC 000048 0004+00 0/3 0/0 0/0 .rodata @3830 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3830 = 1.0f; -COMPILER_STRIP_GATE(80C879E8, &lit_3830); +COMPILER_STRIP_GATE(0x80C879E8, &lit_3830); #pragma pop /* 80C87AA0-80C87AAC -00001 000C+00 0/1 0/0 0/0 .data @3941 */ @@ -657,14 +664,14 @@ asm void daObjLv7Brg_c::create1st() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3935 = 2550.0f; -COMPILER_STRIP_GATE(80C879EC, &lit_3935); +COMPILER_STRIP_GATE(0x80C879EC, &lit_3935); #pragma pop /* 80C879F0-80C879F4 000050 0004+00 0/1 0/0 0/0 .rodata @3936 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3936 = 7650.0f; -COMPILER_STRIP_GATE(80C879F0, &lit_3936); +COMPILER_STRIP_GATE(0x80C879F0, &lit_3936); #pragma pop /* 80C86B40-80C86E68 000840 0328+00 1/0 0/0 0/0 .text Execute__13daObjLv7Brg_cFPPA3_A4_f @@ -693,42 +700,42 @@ asm void daObjLv7Brg_c::action() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4027 = 30.0f; -COMPILER_STRIP_GATE(80C879F4, &lit_4027); +COMPILER_STRIP_GATE(0x80C879F4, &lit_4027); #pragma pop /* 80C879F8-80C879FC 000058 0004+00 0/1 0/0 0/0 .rodata @4028 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4028 = -45.0f; -COMPILER_STRIP_GATE(80C879F8, &lit_4028); +COMPILER_STRIP_GATE(0x80C879F8, &lit_4028); #pragma pop /* 80C879FC-80C87A00 00005C 0004+00 0/1 0/0 0/0 .rodata @4029 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4029 = 1.0f / 50.0f; -COMPILER_STRIP_GATE(80C879FC, &lit_4029); +COMPILER_STRIP_GATE(0x80C879FC, &lit_4029); #pragma pop /* 80C87A00-80C87A04 000060 0004+00 0/1 0/0 0/0 .rodata @4030 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4030 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(80C87A00, &lit_4030); +COMPILER_STRIP_GATE(0x80C87A00, &lit_4030); #pragma pop /* 80C87A04-80C87A08 000064 0004+00 0/1 0/0 0/0 .rodata @4031 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4031 = 127.0f; -COMPILER_STRIP_GATE(80C87A04, &lit_4031); +COMPILER_STRIP_GATE(0x80C87A04, &lit_4031); #pragma pop /* 80C87A08-80C87A0C 000068 0004+00 0/1 0/0 0/0 .rodata @4032 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4032 = -1.0f; -COMPILER_STRIP_GATE(80C87A08, &lit_4032); +COMPILER_STRIP_GATE(0x80C87A08, &lit_4032); #pragma pop /* 80C86F44-80C87210 000C44 02CC+00 1/0 0/0 0/0 .text mode_action__13daObjLv7Brg_cFv */ @@ -751,35 +758,35 @@ void daObjLv7Brg_c::mode_end() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4067 = 2700.0f; -COMPILER_STRIP_GATE(80C87A0C, &lit_4067); +COMPILER_STRIP_GATE(0x80C87A0C, &lit_4067); #pragma pop /* 80C87A10-80C87A14 000070 0004+00 0/1 0/0 0/0 .rodata @4068 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4068 = -80.0f; -COMPILER_STRIP_GATE(80C87A10, &lit_4068); +COMPILER_STRIP_GATE(0x80C87A10, &lit_4068); #pragma pop /* 80C87A14-80C87A18 000074 0004+00 0/1 0/0 0/0 .rodata @4069 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4069 = 450.0f; -COMPILER_STRIP_GATE(80C87A14, &lit_4069); +COMPILER_STRIP_GATE(0x80C87A14, &lit_4069); #pragma pop /* 80C87A18-80C87A1C 000078 0004+00 0/1 0/0 0/0 .rodata @4070 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4070 = -450.0f; -COMPILER_STRIP_GATE(80C87A18, &lit_4070); +COMPILER_STRIP_GATE(0x80C87A18, &lit_4070); #pragma pop /* 80C87A1C-80C87A20 00007C 0004+00 0/1 0/0 0/0 .rodata @4071 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4071 = -2700.0f; -COMPILER_STRIP_GATE(80C87A1C, &lit_4071); +COMPILER_STRIP_GATE(0x80C87A1C, &lit_4071); #pragma pop /* 80C87214-80C87304 000F14 00F0+00 1/1 0/0 0/0 .text calcCoPos__13daObjLv7Brg_cFv */ @@ -969,10 +976,4 @@ static asm void func_80C87990() { } #pragma pop -/* 80C87A20-80C87A33 000080 0013+00 1/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80C87A20 = "Obj_l7brg"; -SECTION_DEAD static char const* const stringBase_80C87A2A = "K_bridge"; -#pragma pop +/* 80C87A20-80C87A20 000080 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_lv8KekkaiTrap/d_a_obj_lv8KekkaiTrap.cpp b/rel/d/a/obj/d_a_obj_lv8KekkaiTrap/d_a_obj_lv8KekkaiTrap.cpp index 48d1d2da67c..c77442dabad 100644 --- a/rel/d/a/obj/d_a_obj_lv8KekkaiTrap/d_a_obj_lv8KekkaiTrap.cpp +++ b/rel/d/a/obj/d_a_obj_lv8KekkaiTrap/d_a_obj_lv8KekkaiTrap.cpp @@ -178,11 +178,17 @@ SECTION_RODATA static u8 const lit_3651[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C884E4, &lit_3651); +COMPILER_STRIP_GATE(0x80C884E4, &lit_3651); /* 80C884E8-80C884EC 000004 0004+00 1/1 0/0 0/0 .rodata @3652 */ SECTION_RODATA static f32 const lit_3652 = 7.0f / 10.0f; -COMPILER_STRIP_GATE(80C884E8, &lit_3652); +COMPILER_STRIP_GATE(0x80C884E8, &lit_3652); + +/* 80C884F8-80C884F8 000014 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80C884F8 = "Lv8Kekkai"; +#pragma pop /* 80C88504-80C88510 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { @@ -413,21 +419,21 @@ asm void daKekaiTrap_c::init_modeMoveUp() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3802 = 30.0f; -COMPILER_STRIP_GATE(80C884EC, &lit_3802); +COMPILER_STRIP_GATE(0x80C884EC, &lit_3802); #pragma pop /* 80C884F0-80C884F4 00000C 0004+00 0/2 0/0 0/0 .rodata @3803 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3803 = 1.0f; -COMPILER_STRIP_GATE(80C884F0, &lit_3803); +COMPILER_STRIP_GATE(0x80C884F0, &lit_3803); #pragma pop /* 80C884F4-80C884F8 000010 0004+00 0/2 0/0 0/0 .rodata @3804 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3804 = 3.0f / 100.0f; -COMPILER_STRIP_GATE(80C884F4, &lit_3804); +COMPILER_STRIP_GATE(0x80C884F4, &lit_3804); #pragma pop /* 80C88138-80C881F0 000578 00B8+00 1/0 0/0 0/0 .text modeMoveUp__13daKekaiTrap_cFv */ @@ -545,12 +551,7 @@ asm void __sinit_d_a_obj_lv8KekkaiTrap_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80C88494 = (void*)__sinit_d_a_obj_lv8KekkaiTrap_cpp; +REGISTER_CTORS(0x80C88494, __sinit_d_a_obj_lv8KekkaiTrap_cpp); #pragma pop -/* 80C884F8-80C88502 000014 000A+00 1/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80C884F8 = "Lv8Kekkai"; -#pragma pop +/* 80C884F8-80C884F8 000014 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_lv8Lift/d_a_obj_lv8Lift.cpp b/rel/d/a/obj/d_a_obj_lv8Lift/d_a_obj_lv8Lift.cpp index a31d8960a37..bb8ec99b8a8 100644 --- a/rel/d/a/obj/d_a_obj_lv8Lift/d_a_obj_lv8Lift.cpp +++ b/rel/d/a/obj/d_a_obj_lv8Lift/d_a_obj_lv8Lift.cpp @@ -319,7 +319,7 @@ extern "C" void __register_global_object(); /* ############################################################################################## */ /* 80C89F60-80C89F64 000000 0004+00 6/6 0/0 0/0 .rodata @3627 */ SECTION_RODATA static f32 const lit_3627 = 600.0f; -COMPILER_STRIP_GATE(80C89F60, &lit_3627); +COMPILER_STRIP_GATE(0x80C89F60, &lit_3627); /* 80C8A004-80C8A010 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { @@ -571,12 +571,18 @@ SECTION_RODATA u8 const daL8Lift_c::mSpeed[64] = { 0x41, 0x92, 0xAA, 0xAB, 0x41, 0xA0, 0x00, 0x00, 0x41, 0xAD, 0x55, 0x55, 0x41, 0xBA, 0xAA, 0xAB, 0x41, 0xC8, 0x00, 0x00, 0x41, 0xD5, 0x55, 0x55, 0x41, 0xE2, 0xAA, 0xAB, 0x40, 0x55, 0x55, 0x55, }; -COMPILER_STRIP_GATE(80C89F64, &daL8Lift_c::mSpeed); +COMPILER_STRIP_GATE(0x80C89F64, &daL8Lift_c::mSpeed); #pragma pop /* 80C89FA4-80C89FA8 000044 0004+00 4/9 0/0 0/0 .rodata @3661 */ SECTION_RODATA static f32 const lit_3661 = 1.0f; -COMPILER_STRIP_GATE(80C89FA4, &lit_3661); +COMPILER_STRIP_GATE(0x80C89FA4, &lit_3661); + +/* 80C89FFC-80C89FFC 00009C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80C89FFC = "L8Lift"; +#pragma pop /* 80C88860-80C88928 000220 00C8+00 1/0 0/0 0/0 .text CreateHeap__10daL8Lift_cFv */ #pragma push @@ -593,14 +599,14 @@ asm void daL8Lift_c::CreateHeap() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3766 = 100.0f; -COMPILER_STRIP_GATE(80C89FA8, &lit_3766); +COMPILER_STRIP_GATE(0x80C89FA8, &lit_3766); #pragma pop /* 80C89FAC-80C89FB0 00004C 0004+00 0/1 0/0 0/0 .rodata @3767 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3767 = 150.0f; -COMPILER_STRIP_GATE(80C89FAC, &lit_3767); +COMPILER_STRIP_GATE(0x80C89FAC, &lit_3767); #pragma pop /* 80C89FB0-80C89FB8 000050 0004+04 0/4 0/0 0/0 .rodata @3768 */ @@ -617,14 +623,14 @@ SECTION_RODATA static u8 const lit_3768[4 + 4 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C89FB0, &lit_3768); +COMPILER_STRIP_GATE(0x80C89FB0, &lit_3768); #pragma pop /* 80C89FB8-80C89FC0 000058 0008+00 1/2 0/0 0/0 .rodata @3770 */ SECTION_RODATA static u8 const lit_3770[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C89FB8, &lit_3770); +COMPILER_STRIP_GATE(0x80C89FB8, &lit_3770); /* 80C8A1E8-80C8A1F4 000008 000C+00 1/1 0/0 0/0 .bss @3621 */ static u8 lit_3621[12]; @@ -722,14 +728,14 @@ asm void daL8Lift_c::moveLift() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3894 = 30.0f; -COMPILER_STRIP_GATE(80C89FC0, &lit_3894); +COMPILER_STRIP_GATE(0x80C89FC0, &lit_3894); #pragma pop /* 80C89FC4-80C89FC8 000064 0004+00 0/3 0/0 0/0 .rodata @3895 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3895 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(80C89FC4, &lit_3895); +COMPILER_STRIP_GATE(0x80C89FC4, &lit_3895); #pragma pop /* 80C89FC8-80C89FD0 000068 0004+04 2/5 0/0 0/0 .rodata @3896 */ @@ -738,7 +744,7 @@ SECTION_RODATA static f32 const lit_3896[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80C89FC8, &lit_3896); +COMPILER_STRIP_GATE(0x80C89FC8, &lit_3896); /* 80C890B8-80C89198 000A78 00E0+00 1/0 0/0 0/0 .text modeAcc__10daL8Lift_cFv */ #pragma push @@ -767,7 +773,7 @@ asm void daL8Lift_c::init_modeMove() { SECTION_RODATA static u8 const lit_3978[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C89FD0, &lit_3978); +COMPILER_STRIP_GATE(0x80C89FD0, &lit_3978); #pragma pop /* 80C89FD8-80C89FE0 000078 0008+00 0/2 0/0 0/0 .rodata @3979 */ @@ -776,7 +782,7 @@ COMPILER_STRIP_GATE(80C89FD0, &lit_3978); SECTION_RODATA static u8 const lit_3979[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C89FD8, &lit_3979); +COMPILER_STRIP_GATE(0x80C89FD8, &lit_3979); #pragma pop /* 80C89FE0-80C89FE8 000080 0008+00 0/2 0/0 0/0 .rodata @3980 */ @@ -785,21 +791,21 @@ COMPILER_STRIP_GATE(80C89FD8, &lit_3979); SECTION_RODATA static u8 const lit_3980[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C89FE0, &lit_3980); +COMPILER_STRIP_GATE(0x80C89FE0, &lit_3980); #pragma pop /* 80C89FE8-80C89FEC 000088 0004+00 0/1 0/0 0/0 .rodata @3981 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3981 = 3.0f / 10.0f; -COMPILER_STRIP_GATE(80C89FE8, &lit_3981); +COMPILER_STRIP_GATE(0x80C89FE8, &lit_3981); #pragma pop /* 80C89FEC-80C89FF0 00008C 0004+00 0/1 0/0 0/0 .rodata @3982 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3982 = 300.0f; -COMPILER_STRIP_GATE(80C89FEC, &lit_3982); +COMPILER_STRIP_GATE(0x80C89FEC, &lit_3982); #pragma pop /* 80C891A4-80C894BC 000B64 0318+00 1/0 0/0 0/0 .text modeMove__10daL8Lift_cFv */ @@ -827,7 +833,7 @@ asm void daL8Lift_c::init_modeBrk() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4030 = 0.5f; -COMPILER_STRIP_GATE(80C89FF0, &lit_4030); +COMPILER_STRIP_GATE(0x80C89FF0, &lit_4030); #pragma pop /* 80C894C8-80C896C8 000E88 0200+00 1/0 0/0 0/0 .text modeBrk__10daL8Lift_cFv */ @@ -935,7 +941,7 @@ asm void daL8Lift_c::init_modeStop() { /* ############################################################################################## */ /* 80C89FF4-80C89FF8 000094 0004+00 1/1 0/0 0/0 .rodata @4110 */ SECTION_RODATA static f32 const lit_4110 = 20.0f; -COMPILER_STRIP_GATE(80C89FF4, &lit_4110); +COMPILER_STRIP_GATE(0x80C89FF4, &lit_4110); /* 80C898DC-80C899D0 00129C 00F4+00 1/0 0/0 0/0 .text modeStop__10daL8Lift_cFv */ #pragma push @@ -1013,7 +1019,7 @@ asm void daL8Lift_c::setNextPoint() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4213 = -100.0f; -COMPILER_STRIP_GATE(80C89FF8, &lit_4213); +COMPILER_STRIP_GATE(0x80C89FF8, &lit_4213); #pragma pop /* 80C89C10-80C89DC8 0015D0 01B8+00 1/0 0/0 0/0 .text Draw__10daL8Lift_cFv */ @@ -1098,7 +1104,7 @@ asm void __sinit_d_a_obj_lv8Lift_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80C89F00 = (void*)__sinit_d_a_obj_lv8Lift_cpp; +REGISTER_CTORS(0x80C89F00, __sinit_d_a_obj_lv8Lift_cpp); #pragma pop /* 80C89F3C-80C89F44 0018FC 0008+00 1/0 0/0 0/0 .text @36@__dt__12dBgS_ObjAcchFv */ @@ -1121,9 +1127,4 @@ static asm void func_80C89F44() { } #pragma pop -/* 80C89FFC-80C8A003 00009C 0007+00 3/3 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80C89FFC = "L8Lift"; -#pragma pop +/* 80C89FFC-80C89FFC 00009C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_lv8OptiLift/d_a_obj_lv8OptiLift.cpp b/rel/d/a/obj/d_a_obj_lv8OptiLift/d_a_obj_lv8OptiLift.cpp index 71919b67b47..44c1a1dcbef 100644 --- a/rel/d/a/obj/d_a_obj_lv8OptiLift/d_a_obj_lv8OptiLift.cpp +++ b/rel/d/a/obj/d_a_obj_lv8OptiLift/d_a_obj_lv8OptiLift.cpp @@ -279,7 +279,7 @@ extern "C" void __register_global_object(); /* ############################################################################################## */ /* 80C8B9AC-80C8B9B0 000000 0004+00 5/5 0/0 0/0 .rodata @3661 */ SECTION_RODATA static f32 const lit_3661 = 600.0f; -COMPILER_STRIP_GATE(80C8B9AC, &lit_3661); +COMPILER_STRIP_GATE(0x80C8B9AC, &lit_3661); /* 80C8BA44-80C8BA50 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { @@ -498,11 +498,17 @@ SECTION_RODATA u8 const daOptiLift_c::mSpeed[64] = { 0x41, 0x92, 0xAA, 0xAB, 0x41, 0xA0, 0x00, 0x00, 0x41, 0xAD, 0x55, 0x55, 0x41, 0xBA, 0xAA, 0xAB, 0x41, 0xC8, 0x00, 0x00, 0x41, 0xD5, 0x55, 0x55, 0x41, 0xE2, 0xAA, 0xAB, 0x40, 0x55, 0x55, 0x55, }; -COMPILER_STRIP_GATE(80C8B9B0, &daOptiLift_c::mSpeed); +COMPILER_STRIP_GATE(0x80C8B9B0, &daOptiLift_c::mSpeed); /* 80C8B9F0-80C8B9F4 000044 0004+00 4/8 0/0 0/0 .rodata @3695 */ SECTION_RODATA static f32 const lit_3695 = 1.0f; -COMPILER_STRIP_GATE(80C8B9F0, &lit_3695); +COMPILER_STRIP_GATE(0x80C8B9F0, &lit_3695); + +/* 80C8BA3C-80C8BA3C 000090 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80C8BA3C = "Lv8Lift"; +#pragma pop /* 80C8A438-80C8A500 000218 00C8+00 1/0 0/0 0/0 .text CreateHeap__12daOptiLift_cFv */ #pragma push @@ -522,7 +528,7 @@ SECTION_RODATA static u8 const lit_3778[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C8B9F4, &lit_3778); +COMPILER_STRIP_GATE(0x80C8B9F4, &lit_3778); /* 80C8BBE0-80C8BBEC 000008 000C+00 1/1 0/0 0/0 .bss @3655 */ static u8 lit_3655[12]; @@ -611,19 +617,19 @@ asm void daOptiLift_c::init_modeAcc() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3900 = 30.0f; -COMPILER_STRIP_GATE(80C8B9F8, &lit_3900); +COMPILER_STRIP_GATE(0x80C8B9F8, &lit_3900); #pragma pop /* 80C8B9FC-80C8BA00 000050 0004+00 0/3 0/0 0/0 .rodata @3901 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3901 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(80C8B9FC, &lit_3901); +COMPILER_STRIP_GATE(0x80C8B9FC, &lit_3901); #pragma pop /* 80C8BA00-80C8BA04 000054 0004+00 2/5 0/0 0/0 .rodata @3902 */ SECTION_RODATA static f32 const lit_3902 = -1.0f; -COMPILER_STRIP_GATE(80C8BA00, &lit_3902); +COMPILER_STRIP_GATE(0x80C8BA00, &lit_3902); /* 80C8AAD0-80C8ABB0 0008B0 00E0+00 1/0 0/0 0/0 .text modeAcc__12daOptiLift_cFv */ #pragma push @@ -652,7 +658,7 @@ asm void daOptiLift_c::init_modeMove() { SECTION_RODATA static u8 const lit_3984[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C8BA04, &lit_3984); +COMPILER_STRIP_GATE(0x80C8BA04, &lit_3984); #pragma pop /* 80C8BA0C-80C8BA14 000060 0008+00 0/2 0/0 0/0 .rodata @3985 */ @@ -661,7 +667,7 @@ COMPILER_STRIP_GATE(80C8BA04, &lit_3984); SECTION_RODATA static u8 const lit_3985[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C8BA0C, &lit_3985); +COMPILER_STRIP_GATE(0x80C8BA0C, &lit_3985); #pragma pop /* 80C8BA14-80C8BA1C 000068 0008+00 0/2 0/0 0/0 .rodata @3986 */ @@ -670,21 +676,21 @@ COMPILER_STRIP_GATE(80C8BA0C, &lit_3985); SECTION_RODATA static u8 const lit_3986[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C8BA14, &lit_3986); +COMPILER_STRIP_GATE(0x80C8BA14, &lit_3986); #pragma pop /* 80C8BA1C-80C8BA20 000070 0004+00 0/1 0/0 0/0 .rodata @3987 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3987 = 3.0f / 10.0f; -COMPILER_STRIP_GATE(80C8BA1C, &lit_3987); +COMPILER_STRIP_GATE(0x80C8BA1C, &lit_3987); #pragma pop /* 80C8BA20-80C8BA24 000074 0004+00 0/1 0/0 0/0 .rodata @3988 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3988 = 300.0f; -COMPILER_STRIP_GATE(80C8BA20, &lit_3988); +COMPILER_STRIP_GATE(0x80C8BA20, &lit_3988); #pragma pop /* 80C8ABBC-80C8AED4 00099C 0318+00 1/0 0/0 0/0 .text modeMove__12daOptiLift_cFv */ @@ -712,7 +718,7 @@ asm void daOptiLift_c::init_modeBrk() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4039 = 0.5f; -COMPILER_STRIP_GATE(80C8BA24, &lit_4039); +COMPILER_STRIP_GATE(0x80C8BA24, &lit_4039); #pragma pop /* 80C8AEE0-80C8B100 000CC0 0220+00 1/0 0/0 0/0 .text modeBrk__12daOptiLift_cFv */ @@ -795,13 +801,13 @@ asm void daOptiLift_c::init_modeStop() { /* ############################################################################################## */ /* 80C8BA28-80C8BA2C 00007C 0004+00 1/1 0/0 0/0 .rodata @4125 */ SECTION_RODATA static f32 const lit_4125 = 20.0f; -COMPILER_STRIP_GATE(80C8BA28, &lit_4125); +COMPILER_STRIP_GATE(0x80C8BA28, &lit_4125); /* 80C8BA2C-80C8BA34 000080 0008+00 1/1 0/0 0/0 .rodata @4127 */ SECTION_RODATA static u8 const lit_4127[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C8BA2C, &lit_4127); +COMPILER_STRIP_GATE(0x80C8BA2C, &lit_4127); /* 80C8B318-80C8B428 0010F8 0110+00 1/0 0/0 0/0 .text modeStop__12daOptiLift_cFv */ #pragma push @@ -880,14 +886,14 @@ asm void daOptiLift_c::setNextPoint() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4231 = 100.0f; -COMPILER_STRIP_GATE(80C8BA34, &lit_4231); +COMPILER_STRIP_GATE(0x80C8BA34, &lit_4231); #pragma pop /* 80C8BA38-80C8BA3C 00008C 0004+00 0/1 0/0 0/0 .rodata @4232 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4232 = -100.0f; -COMPILER_STRIP_GATE(80C8BA38, &lit_4232); +COMPILER_STRIP_GATE(0x80C8BA38, &lit_4232); #pragma pop /* 80C8B66C-80C8B824 00144C 01B8+00 1/0 0/0 0/0 .text Draw__12daOptiLift_cFv */ @@ -975,12 +981,7 @@ asm void __sinit_d_a_obj_lv8OptiLift_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80C8B95C = (void*)__sinit_d_a_obj_lv8OptiLift_cpp; +REGISTER_CTORS(0x80C8B95C, __sinit_d_a_obj_lv8OptiLift_cpp); #pragma pop -/* 80C8BA3C-80C8BA44 000090 0008+00 3/3 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80C8BA3C = "Lv8Lift"; -#pragma pop +/* 80C8BA3C-80C8BA3C 000090 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_lv8UdFloor/d_a_obj_lv8UdFloor.cpp b/rel/d/a/obj/d_a_obj_lv8UdFloor/d_a_obj_lv8UdFloor.cpp index 5eac7bfa3b7..1b42b54c697 100644 --- a/rel/d/a/obj/d_a_obj_lv8UdFloor/d_a_obj_lv8UdFloor.cpp +++ b/rel/d/a/obj/d_a_obj_lv8UdFloor/d_a_obj_lv8UdFloor.cpp @@ -96,10 +96,10 @@ struct dBgS_MoveBgActor { /* 80078950 */ void MoveBGExecute(); }; -struct Vec {}; - struct JAISoundID {}; +struct Vec {}; + struct Z2SeMgr { /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); }; @@ -199,7 +199,14 @@ SECTION_RODATA static u8 const lit_3628[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C8CBF0, &lit_3628); +COMPILER_STRIP_GATE(0x80C8CBF0, &lit_3628); + +/* 80C8CC34-80C8CC34 000044 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80C8CC34 = "L8Step"; +SECTION_DEAD static char const* const stringBase_80C8CC3B = "L8StepX"; +#pragma pop /* 80C8CC44-80C8CC50 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { @@ -371,7 +378,7 @@ asm void daUdFloor_c::setBaseMtx() { SECTION_RODATA static u8 const l_bmdIdx[8] = { 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x04, }; -COMPILER_STRIP_GATE(80C8CBF4, &l_bmdIdx); +COMPILER_STRIP_GATE(0x80C8CBF4, &l_bmdIdx); /* 80C8BE64-80C8BEE4 000244 0080+00 1/0 0/0 0/0 .text CreateHeap__11daUdFloor_cFv */ #pragma push @@ -390,7 +397,7 @@ asm void daUdFloor_c::CreateHeap() { SECTION_RODATA static u8 const l_dzbIdx[8] = { 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x07, }; -COMPILER_STRIP_GATE(80C8CBFC, &l_dzbIdx); +COMPILER_STRIP_GATE(0x80C8CBFC, &l_dzbIdx); #pragma pop /* 80C8CC04-80C8CC0C 000014 0008+00 0/1 0/0 0/0 .rodata l_heap_size */ @@ -399,14 +406,14 @@ COMPILER_STRIP_GATE(80C8CBFC, &l_dzbIdx); SECTION_RODATA static u8 const l_heap_size[8] = { 0x00, 0x00, 0x12, 0x00, 0x00, 0x00, 0x14, 0x00, }; -COMPILER_STRIP_GATE(80C8CC04, &l_heap_size); +COMPILER_STRIP_GATE(0x80C8CC04, &l_heap_size); #pragma pop /* 80C8CC0C-80C8CC10 00001C 0004+00 0/1 0/0 0/0 .rodata @3718 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3718 = 50.0f; -COMPILER_STRIP_GATE(80C8CC0C, &lit_3718); +COMPILER_STRIP_GATE(0x80C8CC0C, &lit_3718); #pragma pop /* 80C8CC10-80C8CC18 000020 0008+00 0/1 0/0 0/0 .rodata @3720 */ @@ -415,14 +422,14 @@ COMPILER_STRIP_GATE(80C8CC0C, &lit_3718); SECTION_RODATA static u8 const lit_3720[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C8CC10, &lit_3720); +COMPILER_STRIP_GATE(0x80C8CC10, &lit_3720); #pragma pop /* 80C8CC18-80C8CC20 000028 0008+00 1/2 0/0 0/0 .rodata @3722 */ SECTION_RODATA static u8 const lit_3722[8] = { 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C8CC18, &lit_3722); +COMPILER_STRIP_GATE(0x80C8CC18, &lit_3722); /* 80C8CD80-80C8CD8C 000008 000C+00 1/1 0/0 0/0 .bss @3622 */ static u8 lit_3622[12]; @@ -482,11 +489,11 @@ void daUdFloor_c::modeWait() { /* ############################################################################################## */ /* 80C8CC20-80C8CC24 000030 0004+00 4/6 0/0 0/0 .rodata @3777 */ SECTION_RODATA static f32 const lit_3777 = 1.0f; -COMPILER_STRIP_GATE(80C8CC20, &lit_3777); +COMPILER_STRIP_GATE(0x80C8CC20, &lit_3777); /* 80C8CC24-80C8CC28 000034 0004+00 3/5 0/0 0/0 .rodata @3778 */ SECTION_RODATA static f32 const lit_3778 = -1.0f; -COMPILER_STRIP_GATE(80C8CC24, &lit_3778); +COMPILER_STRIP_GATE(0x80C8CC24, &lit_3778); /* 80C8C274-80C8C310 000654 009C+00 1/1 0/0 0/0 .text init_modeUpMoveInit__11daUdFloor_cFv */ #pragma push @@ -533,14 +540,14 @@ asm void daUdFloor_c::init_modeUpMove() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3856 = 30.0f; -COMPILER_STRIP_GATE(80C8CC28, &lit_3856); +COMPILER_STRIP_GATE(0x80C8CC28, &lit_3856); #pragma pop /* 80C8CC2C-80C8CC30 00003C 0004+00 0/2 0/0 0/0 .rodata @3857 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3857 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(80C8CC2C, &lit_3857); +COMPILER_STRIP_GATE(0x80C8CC2C, &lit_3857); #pragma pop /* 80C8C68C-80C8C7F8 000A6C 016C+00 1/0 0/0 0/0 .text modeUpMove__11daUdFloor_cFv */ @@ -590,7 +597,7 @@ asm void daUdFloor_c::init_modeDownMove() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3892 = 3.0f / 10.0f; -COMPILER_STRIP_GATE(80C8CC30, &lit_3892); +COMPILER_STRIP_GATE(0x80C8CC30, &lit_3892); #pragma pop /* 80C8C8E4-80C8C994 000CC4 00B0+00 1/0 0/0 0/0 .text modeDownMove__11daUdFloor_cFv */ @@ -687,13 +694,7 @@ asm void __sinit_d_a_obj_lv8UdFloor_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80C8CBA0 = (void*)__sinit_d_a_obj_lv8UdFloor_cpp; +REGISTER_CTORS(0x80C8CBA0, __sinit_d_a_obj_lv8UdFloor_cpp); #pragma pop -/* 80C8CC34-80C8CC43 000044 000F+00 1/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80C8CC34 = "L8Step"; -SECTION_DEAD static char const* const stringBase_80C8CC3B = "L8StepX"; -#pragma pop +/* 80C8CC34-80C8CC34 000044 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_lv9SwShutter/d_a_obj_lv9SwShutter.cpp b/rel/d/a/obj/d_a_obj_lv9SwShutter/d_a_obj_lv9SwShutter.cpp index 6a9fd7d6b72..df54673003a 100644 --- a/rel/d/a/obj/d_a_obj_lv9SwShutter/d_a_obj_lv9SwShutter.cpp +++ b/rel/d/a/obj/d_a_obj_lv9SwShutter/d_a_obj_lv9SwShutter.cpp @@ -87,10 +87,10 @@ struct dBgS_MoveBgActor { /* 80078950 */ void MoveBGExecute(); }; -struct Vec {}; - struct JAISoundID {}; +struct Vec {}; + struct Z2SeMgr { /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); /* 802AC50C */ void seStartLevel(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); @@ -184,20 +184,20 @@ extern "C" void __register_global_object(); /* ############################################################################################## */ /* 80C8D7DC-80C8D7E0 000000 0004+00 3/3 0/0 0/0 .rodata @3627 */ SECTION_RODATA static f32 const lit_3627 = 6.0f; -COMPILER_STRIP_GATE(80C8D7DC, &lit_3627); +COMPILER_STRIP_GATE(0x80C8D7DC, &lit_3627); /* 80C8D7E0-80C8D7E4 000004 0004+00 0/1 0/0 0/0 .rodata @3628 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3628 = 30.0f; -COMPILER_STRIP_GATE(80C8D7E0, &lit_3628); +COMPILER_STRIP_GATE(0x80C8D7E0, &lit_3628); #pragma pop /* 80C8D7E4-80C8D7E8 000008 0004+00 0/1 0/0 0/0 .rodata @3629 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3629 = 15.0f; -COMPILER_STRIP_GATE(80C8D7E4, &lit_3629); +COMPILER_STRIP_GATE(0x80C8D7E4, &lit_3629); #pragma pop /* 80C8D80C-80C8D818 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ @@ -336,7 +336,7 @@ SECTION_RODATA static u8 const lit_3650[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C8D7E8, &lit_3650); +COMPILER_STRIP_GATE(0x80C8D7E8, &lit_3650); /* 80C8CF38-80C8CFD4 000178 009C+00 2/2 0/0 0/0 .text setBaseMtx__16daLv9SwShutter_cFv */ #pragma push @@ -348,6 +348,13 @@ asm void daLv9SwShutter_c::setBaseMtx() { } #pragma pop +/* ############################################################################################## */ +/* 80C8D800-80C8D800 000024 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80C8D800 = "L9SwShut"; +#pragma pop + /* 80C8CFD4-80C8D040 000214 006C+00 1/0 0/0 0/0 .text CreateHeap__16daLv9SwShutter_cFv */ #pragma push #pragma optimization_level 0 @@ -361,7 +368,7 @@ asm void daLv9SwShutter_c::CreateHeap() { /* ############################################################################################## */ /* 80C8D7EC-80C8D7F0 000010 0004+00 1/2 0/0 0/0 .rodata @3708 */ SECTION_RODATA static f32 const lit_3708 = 600.0f; -COMPILER_STRIP_GATE(80C8D7EC, &lit_3708); +COMPILER_STRIP_GATE(0x80C8D7EC, &lit_3708); /* 80C8D040-80C8D168 000280 0128+00 1/1 0/0 0/0 .text create__16daLv9SwShutter_cFv */ #pragma push @@ -436,28 +443,28 @@ asm void daLv9SwShutter_c::init_modeOpen() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3782 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(80C8D7F0, &lit_3782); +COMPILER_STRIP_GATE(0x80C8D7F0, &lit_3782); #pragma pop /* 80C8D7F4-80C8D7F8 000018 0004+00 0/2 0/0 0/0 .rodata @3783 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3783 = 5.0f; -COMPILER_STRIP_GATE(80C8D7F4, &lit_3783); +COMPILER_STRIP_GATE(0x80C8D7F4, &lit_3783); #pragma pop /* 80C8D7F8-80C8D7FC 00001C 0004+00 0/2 0/0 0/0 .rodata @3784 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3784 = 1.0f; -COMPILER_STRIP_GATE(80C8D7F8, &lit_3784); +COMPILER_STRIP_GATE(0x80C8D7F8, &lit_3784); #pragma pop /* 80C8D7FC-80C8D800 000020 0004+00 0/2 0/0 0/0 .rodata @3785 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3785 = -1.0f; -COMPILER_STRIP_GATE(80C8D7FC, &lit_3785); +COMPILER_STRIP_GATE(0x80C8D7FC, &lit_3785); #pragma pop /* 80C8D2D8-80C8D440 000518 0168+00 1/0 0/0 0/0 .text modeOpen__16daLv9SwShutter_cFv */ @@ -574,12 +581,7 @@ asm void __sinit_d_a_obj_lv9SwShutter_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80C8D78C = (void*)__sinit_d_a_obj_lv9SwShutter_cpp; +REGISTER_CTORS(0x80C8D78C, __sinit_d_a_obj_lv9SwShutter_cpp); #pragma pop -/* 80C8D800-80C8D809 000024 0009+00 3/3 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80C8D800 = "L9SwShut"; -#pragma pop +/* 80C8D800-80C8D800 000024 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_magLift/d_a_obj_magLift.cpp b/rel/d/a/obj/d_a_obj_magLift/d_a_obj_magLift.cpp index acf1b31d4aa..d32a6accffc 100644 --- a/rel/d/a/obj/d_a_obj_magLift/d_a_obj_magLift.cpp +++ b/rel/d/a/obj/d_a_obj_magLift/d_a_obj_magLift.cpp @@ -365,6 +365,13 @@ asm void daMagLift_c::setBaseMtx() { } #pragma pop +/* ############################################################################################## */ +/* 80C8E6D0-80C8E6D0 000074 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80C8E6D0 = "L_maglift"; +#pragma pop + /* 80C8DB28-80C8DB94 0001E8 006C+00 1/0 0/0 0/0 .text CreateHeap__11daMagLift_cFv */ #pragma push #pragma optimization_level 0 @@ -383,7 +390,7 @@ SECTION_RODATA u8 const daMagLift_c::mSpeed[64] = { 0x41, 0x92, 0xAA, 0xAB, 0x41, 0xA0, 0x00, 0x00, 0x41, 0xAD, 0x55, 0x55, 0x41, 0xBA, 0xAA, 0xAB, 0x41, 0xC8, 0x00, 0x00, 0x41, 0xD5, 0x55, 0x55, 0x41, 0xE2, 0xAA, 0xAB, 0x40, 0x55, 0x55, 0x55, }; -COMPILER_STRIP_GATE(80C8E65C, &daMagLift_c::mSpeed); +COMPILER_STRIP_GATE(0x80C8E65C, &daMagLift_c::mSpeed); /* 80C8E69C-80C8E6A0 000040 0004+00 1/3 0/0 0/0 .rodata @3718 */ SECTION_RODATA static u8 const lit_3718[4] = { @@ -392,7 +399,7 @@ SECTION_RODATA static u8 const lit_3718[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C8E69C, &lit_3718); +COMPILER_STRIP_GATE(0x80C8E69C, &lit_3718); /* 80C8DB94-80C8DD38 000254 01A4+00 1/1 0/0 0/0 .text create__11daMagLift_cFv */ #pragma push @@ -439,21 +446,21 @@ asm void daMagLift_c::moveLift() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3759 = 30.0f; -COMPILER_STRIP_GATE(80C8E6A0, &lit_3759); +COMPILER_STRIP_GATE(0x80C8E6A0, &lit_3759); #pragma pop /* 80C8E6A4-80C8E6A8 000048 0004+00 0/2 0/0 0/0 .rodata @3760 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3760 = 1.0f; -COMPILER_STRIP_GATE(80C8E6A4, &lit_3760); +COMPILER_STRIP_GATE(0x80C8E6A4, &lit_3760); #pragma pop /* 80C8E6A8-80C8E6AC 00004C 0004+00 0/3 0/0 0/0 .rodata @3761 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3761 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(80C8E6A8, &lit_3761); +COMPILER_STRIP_GATE(0x80C8E6A8, &lit_3761); #pragma pop /* 80C8DE98-80C8DF20 000558 0088+00 1/0 0/0 0/0 .text modeAcc__11daMagLift_cFv */ @@ -483,7 +490,7 @@ asm void daMagLift_c::init_modeMove() { SECTION_RODATA static u8 const lit_3834[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C8E6AC, &lit_3834); +COMPILER_STRIP_GATE(0x80C8E6AC, &lit_3834); #pragma pop /* 80C8E6B4-80C8E6BC 000058 0008+00 0/1 0/0 0/0 .rodata @3835 */ @@ -492,7 +499,7 @@ COMPILER_STRIP_GATE(80C8E6AC, &lit_3834); SECTION_RODATA static u8 const lit_3835[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C8E6B4, &lit_3835); +COMPILER_STRIP_GATE(0x80C8E6B4, &lit_3835); #pragma pop /* 80C8E6BC-80C8E6C4 000060 0008+00 0/1 0/0 0/0 .rodata @3836 */ @@ -501,21 +508,21 @@ COMPILER_STRIP_GATE(80C8E6B4, &lit_3835); SECTION_RODATA static u8 const lit_3836[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C8E6BC, &lit_3836); +COMPILER_STRIP_GATE(0x80C8E6BC, &lit_3836); #pragma pop /* 80C8E6C4-80C8E6C8 000068 0004+00 0/1 0/0 0/0 .rodata @3837 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3837 = 3.0f / 10.0f; -COMPILER_STRIP_GATE(80C8E6C4, &lit_3837); +COMPILER_STRIP_GATE(0x80C8E6C4, &lit_3837); #pragma pop /* 80C8E6C8-80C8E6CC 00006C 0004+00 0/1 0/0 0/0 .rodata @3838 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3838 = 300.0f; -COMPILER_STRIP_GATE(80C8E6C8, &lit_3838); +COMPILER_STRIP_GATE(0x80C8E6C8, &lit_3838); #pragma pop /* 80C8DF2C-80C8E1EC 0005EC 02C0+00 1/0 0/0 0/0 .text modeMove__11daMagLift_cFv */ @@ -543,7 +550,7 @@ asm void daMagLift_c::init_modeBrk() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3852 = 0.5f; -COMPILER_STRIP_GATE(80C8E6CC, &lit_3852); +COMPILER_STRIP_GATE(0x80C8E6CC, &lit_3852); #pragma pop /* 80C8E1F8-80C8E260 0008B8 0068+00 1/0 0/0 0/0 .text modeBrk__11daMagLift_cFv */ @@ -717,12 +724,7 @@ asm void __sinit_d_a_obj_magLift_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80C8E60C = (void*)__sinit_d_a_obj_magLift_cpp; +REGISTER_CTORS(0x80C8E60C, __sinit_d_a_obj_magLift_cpp); #pragma pop -/* 80C8E6D0-80C8E6DA 000074 000A+00 3/3 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80C8E6D0 = "L_maglift"; -#pragma pop +/* 80C8E6D0-80C8E6D0 000074 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_magLiftRot/d_a_obj_magLiftRot.cpp b/rel/d/a/obj/d_a_obj_magLiftRot/d_a_obj_magLiftRot.cpp index 5043a1a3924..a564e4b2400 100644 --- a/rel/d/a/obj/d_a_obj_magLiftRot/d_a_obj_magLiftRot.cpp +++ b/rel/d/a/obj/d_a_obj_magLiftRot/d_a_obj_magLiftRot.cpp @@ -108,10 +108,10 @@ struct dBgS_MoveBgActor { /* 80078950 */ void MoveBGExecute(); }; -struct Vec {}; - struct JAISoundID {}; +struct Vec {}; + struct Z2SeMgr { /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); }; @@ -229,80 +229,88 @@ SECTION_RODATA static u8 const lit_3627[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C8FAE8, &lit_3627); +COMPILER_STRIP_GATE(0x80C8FAE8, &lit_3627); /* 80C8FAEC-80C8FAF0 000004 0004+00 0/1 0/0 0/0 .rodata @3628 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3628 = 1.0f / 20.0f; -COMPILER_STRIP_GATE(80C8FAEC, &lit_3628); +COMPILER_STRIP_GATE(0x80C8FAEC, &lit_3628); #pragma pop /* 80C8FAF0-80C8FAF4 000008 0004+00 0/1 0/0 0/0 .rodata @3629 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3629 = 8.0f; -COMPILER_STRIP_GATE(80C8FAF0, &lit_3629); +COMPILER_STRIP_GATE(0x80C8FAF0, &lit_3629); #pragma pop /* 80C8FAF4-80C8FAF8 00000C 0004+00 0/1 0/0 0/0 .rodata @3630 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3630 = 200.0f; -COMPILER_STRIP_GATE(80C8FAF4, &lit_3630); +COMPILER_STRIP_GATE(0x80C8FAF4, &lit_3630); #pragma pop /* 80C8FAF8-80C8FAFC 000010 0004+00 0/1 0/0 0/0 .rodata @3631 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3631 = 45.0f; -COMPILER_STRIP_GATE(80C8FAF8, &lit_3631); +COMPILER_STRIP_GATE(0x80C8FAF8, &lit_3631); #pragma pop /* 80C8FAFC-80C8FB00 000014 0004+00 0/1 0/0 0/0 .rodata @3632 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3632 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(80C8FAFC, &lit_3632); +COMPILER_STRIP_GATE(0x80C8FAFC, &lit_3632); #pragma pop /* 80C8FB00-80C8FB04 000018 0004+00 0/1 0/0 0/0 .rodata @3633 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3633 = 10.0f; -COMPILER_STRIP_GATE(80C8FB00, &lit_3633); +COMPILER_STRIP_GATE(0x80C8FB00, &lit_3633); #pragma pop /* 80C8FB04-80C8FB08 00001C 0004+00 1/7 0/0 0/0 .rodata @3634 */ SECTION_RODATA static f32 const lit_3634 = 1.0f; -COMPILER_STRIP_GATE(80C8FB04, &lit_3634); +COMPILER_STRIP_GATE(0x80C8FB04, &lit_3634); /* 80C8FB08-80C8FB0C 000020 0004+00 0/1 0/0 0/0 .rodata @3635 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3635 = 7.0f; -COMPILER_STRIP_GATE(80C8FB08, &lit_3635); +COMPILER_STRIP_GATE(0x80C8FB08, &lit_3635); #pragma pop /* 80C8FB0C-80C8FB10 000024 0004+00 0/1 0/0 0/0 .rodata @3636 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3636 = 60.0f; -COMPILER_STRIP_GATE(80C8FB0C, &lit_3636); +COMPILER_STRIP_GATE(0x80C8FB0C, &lit_3636); #pragma pop /* 80C8FB10-80C8FB14 000028 0004+00 0/1 0/0 0/0 .rodata @3637 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3637 = 30.0f; -COMPILER_STRIP_GATE(80C8FB10, &lit_3637); +COMPILER_STRIP_GATE(0x80C8FB10, &lit_3637); #pragma pop /* 80C8FB14-80C8FB18 00002C 0004+00 0/1 0/0 0/0 .rodata @3638 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3638 = 3.0f / 10.0f; -COMPILER_STRIP_GATE(80C8FB14, &lit_3638); +COMPILER_STRIP_GATE(0x80C8FB14, &lit_3638); +#pragma pop + +/* 80C8FB74-80C8FB74 00008C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80C8FB74 = "MagLiftS"; +SECTION_DEAD static char const* const stringBase_80C8FB7D = "MagLiftM"; +SECTION_DEAD static char const* const stringBase_80C8FB86 = "MagLiftL"; #pragma pop /* 80C8FB90-80C8FB9C 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ @@ -474,7 +482,7 @@ asm void daMagLiftRot_c::setBaseMtx() { SECTION_RODATA static u8 const l_bmdIdx[12] = { 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x06, }; -COMPILER_STRIP_GATE(80C8FB18, &l_bmdIdx); +COMPILER_STRIP_GATE(0x80C8FB18, &l_bmdIdx); #pragma pop /* 80C8FB24-80C8FB30 00003C 000C+00 0/1 0/0 0/0 .rodata l_dzbIdx */ @@ -483,20 +491,20 @@ COMPILER_STRIP_GATE(80C8FB18, &l_bmdIdx); SECTION_RODATA static u8 const l_dzbIdx[12] = { 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x0F, }; -COMPILER_STRIP_GATE(80C8FB24, &l_dzbIdx); +COMPILER_STRIP_GATE(0x80C8FB24, &l_dzbIdx); #pragma pop /* 80C8FB30-80C8FB3C 000048 000C+00 2/3 0/0 0/0 .rodata l_btkIdx */ SECTION_RODATA static u8 const l_btkIdx[12] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x0C, }; -COMPILER_STRIP_GATE(80C8FB30, &l_btkIdx); +COMPILER_STRIP_GATE(0x80C8FB30, &l_btkIdx); /* 80C8FB3C-80C8FB48 000054 000C+00 2/3 0/0 0/0 .rodata l_brkIdx */ SECTION_RODATA static u8 const l_brkIdx[12] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x09, }; -COMPILER_STRIP_GATE(80C8FB3C, &l_brkIdx); +COMPILER_STRIP_GATE(0x80C8FB3C, &l_brkIdx); /* 80C8EB1C-80C8EC64 0002BC 0148+00 1/0 0/0 0/0 .text CreateHeap__14daMagLiftRot_cFv */ #pragma push @@ -517,7 +525,7 @@ SECTION_RODATA static f32 const lit_3816[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80C8FB48, &lit_3816); +COMPILER_STRIP_GATE(0x80C8FB48, &lit_3816); #pragma pop /* 80C8FB50-80C8FB58 000068 0008+00 0/1 0/0 0/0 .rodata @3818 */ @@ -526,7 +534,7 @@ COMPILER_STRIP_GATE(80C8FB48, &lit_3816); SECTION_RODATA static u8 const lit_3818[8] = { 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C8FB50, &lit_3818); +COMPILER_STRIP_GATE(0x80C8FB50, &lit_3818); #pragma pop /* 80C8EC64-80C8EF4C 000404 02E8+00 1/1 0/0 0/0 .text create__14daMagLiftRot_cFv */ @@ -567,7 +575,7 @@ SECTION_RODATA static u32 const lit_3882[1 + 1 /* padding */] = { /* padding */ 0x00000000, }; -COMPILER_STRIP_GATE(80C8FB58, &lit_3882); +COMPILER_STRIP_GATE(0x80C8FB58, &lit_3882); /* 80C8FB60-80C8FB68 000078 0008+00 0/1 0/0 0/0 .rodata @3885 */ #pragma push @@ -575,7 +583,7 @@ COMPILER_STRIP_GATE(80C8FB58, &lit_3882); SECTION_RODATA static u8 const lit_3885[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C8FB60, &lit_3885); +COMPILER_STRIP_GATE(0x80C8FB60, &lit_3885); #pragma pop /* 80C8FCC0-80C8FCCC 000008 000C+00 1/1 0/0 0/0 .bss @3621 */ @@ -602,21 +610,21 @@ asm void daMagLiftRot_c::moveLift() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3949 = -1.0f; -COMPILER_STRIP_GATE(80C8FB68, &lit_3949); +COMPILER_STRIP_GATE(0x80C8FB68, &lit_3949); #pragma pop /* 80C8FB6C-80C8FB70 000084 0004+00 0/2 0/0 0/0 .rodata @3950 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3950 = 1515.0f; -COMPILER_STRIP_GATE(80C8FB6C, &lit_3950); +COMPILER_STRIP_GATE(0x80C8FB6C, &lit_3950); #pragma pop /* 80C8FB70-80C8FB74 000088 0004+00 0/2 0/0 0/0 .rodata @3951 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3951 = -1515.0f; -COMPILER_STRIP_GATE(80C8FB70, &lit_3951); +COMPILER_STRIP_GATE(0x80C8FB70, &lit_3951); #pragma pop /* 80C8F264-80C8F4A0 000A04 023C+00 1/1 0/0 0/0 .text init_modeMove__14daMagLiftRot_cFv @@ -764,14 +772,7 @@ asm void __sinit_d_a_obj_magLiftRot_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80C8FA98 = (void*)__sinit_d_a_obj_magLiftRot_cpp; +REGISTER_CTORS(0x80C8FA98, __sinit_d_a_obj_magLiftRot_cpp); #pragma pop -/* 80C8FB74-80C8FB8F 00008C 001B+00 1/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80C8FB74 = "MagLiftS"; -SECTION_DEAD static char const* const stringBase_80C8FB7D = "MagLiftM"; -SECTION_DEAD static char const* const stringBase_80C8FB86 = "MagLiftL"; -#pragma pop +/* 80C8FB74-80C8FB74 00008C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_magne_arm/d_a_obj_magne_arm.cpp b/rel/d/a/obj/d_a_obj_magne_arm/d_a_obj_magne_arm.cpp index 842d6615f25..ba5adb794b9 100644 --- a/rel/d/a/obj/d_a_obj_magne_arm/d_a_obj_magne_arm.cpp +++ b/rel/d/a/obj/d_a_obj_magne_arm/d_a_obj_magne_arm.cpp @@ -47,11 +47,11 @@ struct mDoExt_3DlineMatSortPacket { /* 80014738 */ void setMat(mDoExt_3DlineMat_c*); }; -struct dKy_tevstr_c {}; +struct ResTIMG {}; struct _GXColor {}; -struct ResTIMG {}; +struct dKy_tevstr_c {}; struct mDoExt_3DlineMat1_c { /* 80013360 */ void init(u16, u16, ResTIMG*, int); @@ -256,10 +256,10 @@ struct cBgS { struct _GXTexObj {}; -struct Vec {}; - struct JAISoundID {}; +struct Vec {}; + struct Z2SeMgr { /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); /* 802AC50C */ void seStartLevel(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); @@ -364,7 +364,7 @@ extern "C" static void daObjMarm_MoveBGDelete__FP11daObjMarm_c(); extern "C" static void daObjMarm_MoveBGExecute__FP11daObjMarm_c(); extern "C" static void daObjMarm_MoveBGDraw__FP11daObjMarm_c(); extern "C" void __dt__10cCcD_GSttsFv(); -extern "C" void func_80592814(u8*); +extern "C" void func_80592814(void* _this, u8*); extern "C" static void func_80592830(); extern "C" static void func_80592838(); extern "C" extern char const* const d_a_obj_magne_arm__stringBase0; @@ -476,7 +476,7 @@ extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; SECTION_RODATA static u8 const l_magne_scale[12] = { 0x40, 0x40, 0x00, 0x00, 0x40, 0x09, 0x99, 0x9A, 0x40, 0x40, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80592848, &l_magne_scale); +COMPILER_STRIP_GATE(0x80592848, &l_magne_scale); /* 80592854-80592864 00000C 0010+00 0/4 0/0 0/0 .rodata l_trans */ #pragma push @@ -484,7 +484,7 @@ COMPILER_STRIP_GATE(80592848, &l_magne_scale); SECTION_RODATA static u8 const l_trans[16] = { 0x00, 0x00, 0x00, 0x00, 0x44, 0x83, 0x40, 0x00, 0x43, 0xE1, 0x00, 0x00, 0x44, 0x61, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80592854, &l_trans); +COMPILER_STRIP_GATE(0x80592854, &l_trans); #pragma pop /* 80592864-80592874 00001C 0010+00 0/1 0/0 0/0 .rodata l_down_length */ @@ -493,7 +493,7 @@ COMPILER_STRIP_GATE(80592854, &l_trans); SECTION_RODATA static u8 const l_down_length[16] = { 0x44, 0x89, 0x80, 0x00, 0x44, 0x48, 0x00, 0x00, 0x44, 0x89, 0x80, 0x00, 0x44, 0x48, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80592864, &l_down_length); +COMPILER_STRIP_GATE(0x80592864, &l_down_length); #pragma pop /* 80592874-8059287C 00002C 0008+00 0/6 0/0 0/0 .rodata l_roll_speed */ @@ -502,12 +502,12 @@ COMPILER_STRIP_GATE(80592864, &l_down_length); SECTION_RODATA static u8 const l_roll_speed[8] = { 0x00, 0xC8, 0x00, 0xC8, 0x00, 0xC8, 0x03, 0xE8, }; -COMPILER_STRIP_GATE(80592874, &l_roll_speed); +COMPILER_STRIP_GATE(0x80592874, &l_roll_speed); #pragma pop /* 8059287C-80592880 000034 0004+00 4/4 0/0 0/0 .rodata l_stop_timer */ SECTION_RODATA static u32 const l_stop_timer = 0x3C3C3C3C; -COMPILER_STRIP_GATE(8059287C, &l_stop_timer); +COMPILER_STRIP_GATE(0x8059287C, &l_stop_timer); /* 80592880-80592888 000038 0008+00 0/4 0/0 0/0 .rodata l_rot_speedY */ #pragma push @@ -515,14 +515,14 @@ COMPILER_STRIP_GATE(8059287C, &l_stop_timer); SECTION_RODATA static u8 const l_rot_speedY[8] = { 0x00, 0xC8, 0x00, 0xC8, 0x00, 0xC8, 0x00, 0xC8, }; -COMPILER_STRIP_GATE(80592880, &l_rot_speedY); +COMPILER_STRIP_GATE(0x80592880, &l_rot_speedY); #pragma pop /* 80592888-80592894 000040 000C+00 1/1 0/0 0/0 .rodata l_offsetB$3648 */ SECTION_RODATA static u8 const l_offsetB_3648[12] = { 0xC3, 0x16, 0x00, 0x00, 0x44, 0x96, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80592888, &l_offsetB_3648); +COMPILER_STRIP_GATE(0x80592888, &l_offsetB_3648); /* 8058F358-8058F3D4 000078 007C+00 1/1 0/0 0/0 .text getBpartsOffset__11daObjMarm_cFP4cXyz */ #pragma push @@ -539,7 +539,7 @@ asm void daObjMarm_c::getBpartsOffset(cXyz* param_0) { SECTION_RODATA static u8 const l_offsetD_3657[12] = { 0x00, 0x00, 0x00, 0x00, 0x45, 0x1C, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80592894, &l_offsetD_3657); +COMPILER_STRIP_GATE(0x80592894, &l_offsetD_3657); /* 8058F3D4-8058F46C 0000F4 0098+00 1/1 0/0 0/0 .text getDpartsOffset__11daObjMarm_cFP4cXyz */ #pragma push @@ -556,7 +556,7 @@ asm void daObjMarm_c::getDpartsOffset(cXyz* param_0) { SECTION_RODATA static u8 const l_offsetE_3668[12] = { 0x00, 0x00, 0x00, 0x00, 0x45, 0x1C, 0x40, 0x00, 0x44, 0xB6, 0x80, 0x00, }; -COMPILER_STRIP_GATE(805928A0, &l_offsetE_3668); +COMPILER_STRIP_GATE(0x805928A0, &l_offsetE_3668); /* 8058F46C-8058F504 00018C 0098+00 3/3 0/0 0/0 .text getEpartsOffset__11daObjMarm_cFP4cXyz */ #pragma push @@ -575,7 +575,7 @@ asm void daObjMarm_c::getEpartsOffset(cXyz* param_0) { SECTION_RODATA static u8 const l_offsetF_3679[12] = { 0x00, 0x00, 0x00, 0x00, 0x45, 0x1C, 0x40, 0x00, 0x44, 0xDE, 0x80, 0x00, }; -COMPILER_STRIP_GATE(805928AC, &l_offsetF_3679); +COMPILER_STRIP_GATE(0x805928AC, &l_offsetF_3679); #pragma pop /* 805928B8-805928C0 000070 0004+04 0/1 0/0 0/0 .rodata @3689 */ @@ -586,7 +586,7 @@ SECTION_RODATA static f32 const lit_3689[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(805928B8, &lit_3689); +COMPILER_STRIP_GATE(0x805928B8, &lit_3689); #pragma pop /* 805928C0-805928C8 000078 0008+00 0/7 0/0 0/0 .rodata @3691 */ @@ -595,7 +595,7 @@ COMPILER_STRIP_GATE(805928B8, &lit_3689); SECTION_RODATA static u8 const lit_3691[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(805928C0, &lit_3691); +COMPILER_STRIP_GATE(0x805928C0, &lit_3691); #pragma pop /* 8058F504-8058F610 000224 010C+00 4/4 0/0 0/0 .text getFpartsOffset__11daObjMarm_cFP4cXyz */ @@ -616,11 +616,11 @@ SECTION_RODATA static u8 const lit_3706[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(805928C8, &lit_3706); +COMPILER_STRIP_GATE(0x805928C8, &lit_3706); /* 805928CC-805928D0 000084 0004+00 1/2 0/0 0/0 .rodata @3707 */ SECTION_RODATA static f32 const lit_3707 = 320.0f; -COMPILER_STRIP_GATE(805928CC, &lit_3707); +COMPILER_STRIP_GATE(0x805928CC, &lit_3707); /* 8058F610-8058F6B4 000330 00A4+00 1/1 0/0 0/0 .text getRopeStartPos__11daObjMarm_cFP4cXyz */ #pragma push @@ -670,7 +670,7 @@ static asm void rideCallBack(dBgW* param_0, fopAc_ac_c* param_1, fopAc_ac_c* par SECTION_RODATA static u8 const l_offsetB_3735[12] = { 0xC3, 0x16, 0x00, 0x00, 0x44, 0x96, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(805928D0, &l_offsetB_3735); +COMPILER_STRIP_GATE(0x805928D0, &l_offsetB_3735); #pragma pop /* 805928DC-805928E8 000094 000C+00 0/0 0/0 0/0 .rodata l_offsetD$3736 */ @@ -679,7 +679,7 @@ COMPILER_STRIP_GATE(805928D0, &l_offsetB_3735); SECTION_RODATA static u8 const l_offsetD_3736[12] = { 0x00, 0x00, 0x00, 0x00, 0x45, 0x1C, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(805928DC, &l_offsetD_3736); +COMPILER_STRIP_GATE(0x805928DC, &l_offsetD_3736); #pragma pop /* 805928E8-805928F4 0000A0 000C+00 0/0 0/0 0/0 .rodata l_offsetE$3737 */ @@ -688,7 +688,7 @@ COMPILER_STRIP_GATE(805928DC, &l_offsetD_3736); SECTION_RODATA static u8 const l_offsetE_3737[12] = { 0x00, 0x00, 0x00, 0x00, 0x45, 0x1C, 0x40, 0x00, 0x44, 0xB6, 0x80, 0x00, }; -COMPILER_STRIP_GATE(805928E8, &l_offsetE_3737); +COMPILER_STRIP_GATE(0x805928E8, &l_offsetE_3737); #pragma pop /* 805928F4-80592900 0000AC 000C+00 0/0 0/0 0/0 .rodata l_offsetF$3738 */ @@ -697,26 +697,32 @@ COMPILER_STRIP_GATE(805928E8, &l_offsetE_3737); SECTION_RODATA static u8 const l_offsetF_3738[12] = { 0x00, 0x00, 0x00, 0x00, 0x44, 0x7A, 0x00, 0x00, 0x44, 0xDC, 0x00, 0x00, }; -COMPILER_STRIP_GATE(805928F4, &l_offsetF_3738); +COMPILER_STRIP_GATE(0x805928F4, &l_offsetF_3738); #pragma pop /* 80592900-80592904 0000B8 0004+00 0/2 0/0 0/0 .rodata @3874 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3874 = 25.5f; -COMPILER_STRIP_GATE(80592900, &lit_3874); +COMPILER_STRIP_GATE(0x80592900, &lit_3874); #pragma pop /* 80592904-80592908 0000BC 0004+00 0/1 0/0 0/0 .rodata @3875 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3875 = 30.0f; -COMPILER_STRIP_GATE(80592904, &lit_3875); +COMPILER_STRIP_GATE(0x80592904, &lit_3875); #pragma pop /* 80592908-8059290C 0000C0 0004+00 1/3 0/0 0/0 .rodata @3876 */ SECTION_RODATA static f32 const lit_3876 = 10.0f; -COMPILER_STRIP_GATE(80592908, &lit_3876); +COMPILER_STRIP_GATE(0x80592908, &lit_3876); + +/* 80592970-80592970 000128 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80592970 = "D_Marm"; +#pragma pop /* 80592980-8059298C 000000 000C+00 3/3 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { @@ -764,7 +770,7 @@ asm void daObjMarm_c::Create() { /* ############################################################################################## */ /* 8059290C-80592910 0000C4 0004+00 8/9 0/0 0/0 .rodata @4010 */ SECTION_RODATA static f32 const lit_4010 = 1.0f; -COMPILER_STRIP_GATE(8059290C, &lit_4010); +COMPILER_STRIP_GATE(0x8059290C, &lit_4010); /* 805929D4-805929D8 000054 0004+00 0/1 0/0 0/0 .data l_att_disXZ */ #pragma push @@ -1362,28 +1368,28 @@ asm void daObjMarm_c::create1st() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4160 = -700.0f; -COMPILER_STRIP_GATE(80592910, &lit_4160); +COMPILER_STRIP_GATE(0x80592910, &lit_4160); #pragma pop /* 80592914-80592918 0000CC 0004+00 0/1 0/0 0/0 .rodata @4161 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4161 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(80592914, &lit_4161); +COMPILER_STRIP_GATE(0x80592914, &lit_4161); #pragma pop /* 80592918-8059291C 0000D0 0004+00 0/1 0/0 0/0 .rodata @4162 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4162 = 20.0f; -COMPILER_STRIP_GATE(80592918, &lit_4162); +COMPILER_STRIP_GATE(0x80592918, &lit_4162); #pragma pop /* 8059291C-80592920 0000D4 0004+00 0/1 0/0 0/0 .rodata @4163 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4163 = 1.0f / 20.0f; -COMPILER_STRIP_GATE(8059291C, &lit_4163); +COMPILER_STRIP_GATE(0x8059291C, &lit_4163); #pragma pop /* 80590504-80590818 001224 0314+00 1/0 0/0 0/0 .text Execute__11daObjMarm_cFPPA3_A4_f */ @@ -1466,13 +1472,13 @@ SECTION_RODATA static f32 const lit_4264[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80592920, &lit_4264); +COMPILER_STRIP_GATE(0x80592920, &lit_4264); /* 80592928-80592930 0000E0 0008+00 4/4 0/0 0/0 .rodata @4266 */ SECTION_RODATA static u8 const lit_4266[8] = { 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80592928, &lit_4266); +COMPILER_STRIP_GATE(0x80592928, &lit_4266); /* 80590C70-80590CE4 001990 0074+00 2/2 0/0 0/0 .text init_typeA_modeRotate__11daObjMarm_cFv */ #pragma push @@ -1489,14 +1495,14 @@ asm void daObjMarm_c::init_typeA_modeRotate() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4289 = 150.0f; -COMPILER_STRIP_GATE(80592930, &lit_4289); +COMPILER_STRIP_GATE(0x80592930, &lit_4289); #pragma pop /* 80592934-80592938 0000EC 0004+00 0/4 0/0 0/0 .rodata @4290 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4290 = 800.0f; -COMPILER_STRIP_GATE(80592934, &lit_4290); +COMPILER_STRIP_GATE(0x80592934, &lit_4290); #pragma pop /* 80590CE4-80590E24 001A04 0140+00 1/0 0/0 0/0 .text typeA_modeRotate__11daObjMarm_cFv @@ -1571,14 +1577,14 @@ asm void daObjMarm_c::init_typeB_modeLiftUp() { #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4341 = 0x44EB9E95; -COMPILER_STRIP_GATE(80592938, &lit_4341); +COMPILER_STRIP_GATE(0x80592938, &lit_4341); #pragma pop /* 8059293C-80592940 0000F4 0004+00 0/6 0/0 0/0 .rodata @4342 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4342 = 65536.0f; -COMPILER_STRIP_GATE(8059293C, &lit_4342); +COMPILER_STRIP_GATE(0x8059293C, &lit_4342); #pragma pop /* 80590F30-80591004 001C50 00D4+00 1/0 0/0 0/0 .text typeB_modeLiftUp__11daObjMarm_cFv @@ -1869,49 +1875,49 @@ asm void daObjMarm_c::endMagneHoleEffect() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4669 = 200.0f; -COMPILER_STRIP_GATE(80592940, &lit_4669); +COMPILER_STRIP_GATE(0x80592940, &lit_4669); #pragma pop /* 80592944-80592948 0000FC 0004+00 0/1 0/0 0/0 .rodata @4670 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4670 = 250.0f; -COMPILER_STRIP_GATE(80592944, &lit_4670); +COMPILER_STRIP_GATE(0x80592944, &lit_4670); #pragma pop /* 80592948-8059294C 000100 0004+00 0/1 0/0 0/0 .rodata @4671 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4671 = 330.0f; -COMPILER_STRIP_GATE(80592948, &lit_4671); +COMPILER_STRIP_GATE(0x80592948, &lit_4671); #pragma pop /* 8059294C-80592950 000104 0004+00 0/1 0/0 0/0 .rodata @4672 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4672 = 230.0f; -COMPILER_STRIP_GATE(8059294C, &lit_4672); +COMPILER_STRIP_GATE(0x8059294C, &lit_4672); #pragma pop /* 80592950-80592954 000108 0004+00 0/1 0/0 0/0 .rodata @4673 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4673 = -200.0f; -COMPILER_STRIP_GATE(80592950, &lit_4673); +COMPILER_STRIP_GATE(0x80592950, &lit_4673); #pragma pop /* 80592954-80592958 00010C 0004+00 0/1 0/0 0/0 .rodata @4674 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4674 = 50.0f; -COMPILER_STRIP_GATE(80592954, &lit_4674); +COMPILER_STRIP_GATE(0x80592954, &lit_4674); #pragma pop /* 80592958-8059295C 000110 0004+00 0/2 0/0 0/0 .rodata @4675 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4675 = -800.0f; -COMPILER_STRIP_GATE(80592958, &lit_4675); +COMPILER_STRIP_GATE(0x80592958, &lit_4675); #pragma pop /* 80591C38-80591E18 002958 01E0+00 2/2 0/0 0/0 .text calcHimo__11daObjMarm_cFv */ @@ -1927,7 +1933,7 @@ asm void daObjMarm_c::calcHimo() { /* ############################################################################################## */ /* 8059295C-80592960 000114 0004+00 6/6 0/0 0/0 .rodata @4684 */ SECTION_RODATA static f32 const lit_4684 = -1.0f; -COMPILER_STRIP_GATE(8059295C, &lit_4684); +COMPILER_STRIP_GATE(0x8059295C, &lit_4684); /* 80591E18-80591E80 002B38 0068+00 4/4 0/0 0/0 .text seStart_MOVESTART__11daObjMarm_cFv */ @@ -2002,28 +2008,28 @@ SECTION_RODATA static u8 const lit_4728[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80592960, &lit_4728); +COMPILER_STRIP_GATE(0x80592960, &lit_4728); #pragma pop /* 80592964-80592968 00011C 0004+00 0/1 0/0 0/0 .rodata @4822 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4822 = 3.0f / 10.0f; -COMPILER_STRIP_GATE(80592964, &lit_4822); +COMPILER_STRIP_GATE(0x80592964, &lit_4822); #pragma pop /* 80592968-8059296C 000120 0004+00 0/1 0/0 0/0 .rodata @4823 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4823 = 1500.0f; -COMPILER_STRIP_GATE(80592968, &lit_4823); +COMPILER_STRIP_GATE(0x80592968, &lit_4823); #pragma pop /* 8059296C-80592970 000124 0004+00 0/1 0/0 0/0 .rodata @4824 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4824 = 450.0f; -COMPILER_STRIP_GATE(8059296C, &lit_4824); +COMPILER_STRIP_GATE(0x8059296C, &lit_4824); #pragma pop /* 80592088-805923C4 002DA8 033C+00 1/0 0/0 0/0 .text Draw__11daObjMarm_cFv */ @@ -2170,7 +2176,7 @@ asm cCcD_GStts::~cCcD_GStts() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80592814(u8* param_0) { +extern "C" asm void func_80592814(void* _this, u8* param_0) { nofralloc #include "asm/rel/d/a/obj/d_a_obj_magne_arm/d_a_obj_magne_arm/func_80592814.s" } @@ -2197,6 +2203,12 @@ static asm void func_80592838() { #pragma pop /* ############################################################################################## */ +/* 80592977-8059297E 00012F 0007+00 0/0 0/0 0/0 .rodata None */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80592977 = "D_MN54"; +#pragma pop + /* 80592DAC-80592DB0 000044 0004+00 0/0 0/0 0/0 .bss * sInstance__40JASGlobalInstance<19JASDefaultBankTable> */ #pragma push @@ -2368,10 +2380,4 @@ static u8 data_80592E08[4]; static u8 data_80592E0C[4]; #pragma pop -/* 80592970-8059297E 000128 000E+00 1/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80592970 = "D_Marm"; -SECTION_DEAD static char const* const stringBase_80592977 = "D_MN54"; -#pragma pop +/* 80592970-80592970 000128 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_maki/d_a_obj_maki.cpp b/rel/d/a/obj/d_a_obj_maki/d_a_obj_maki.cpp index 595def125f7..2d289f05520 100644 --- a/rel/d/a/obj/d_a_obj_maki/d_a_obj_maki.cpp +++ b/rel/d/a/obj/d_a_obj_maki/d_a_obj_maki.cpp @@ -65,10 +65,10 @@ struct dRes_control_c { struct dPa_levelEcallBack {}; -struct _GXColor {}; - struct csXyz {}; +struct _GXColor {}; + struct dPa_control_c { /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, @@ -118,10 +118,10 @@ struct cCcS { /* 80264BA8 */ void Set(cCcD_Obj*); }; -struct Vec {}; - struct JAISoundID {}; +struct Vec {}; + struct Z2SeMgr { /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); /* 802AC50C */ void seStartLevel(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); @@ -335,39 +335,39 @@ static asm void daObj_Maki_Draw(obj_maki_class* param_0) { /* ############################################################################################## */ /* 80C90934-80C90938 000000 0004+00 3/3 0/0 0/0 .rodata @3928 */ SECTION_RODATA static f32 const lit_3928 = 1.0f; -COMPILER_STRIP_GATE(80C90934, &lit_3928); +COMPILER_STRIP_GATE(0x80C90934, &lit_3928); /* 80C90938-80C9093C 000004 0004+00 0/1 0/0 0/0 .rodata @3929 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3929 = -1.0f; -COMPILER_STRIP_GATE(80C90938, &lit_3929); +COMPILER_STRIP_GATE(0x80C90938, &lit_3929); #pragma pop /* 80C9093C-80C90940 000008 0004+00 0/1 0/0 0/0 .rodata @3930 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3930 = -150.0f; -COMPILER_STRIP_GATE(80C9093C, &lit_3930); +COMPILER_STRIP_GATE(0x80C9093C, &lit_3930); #pragma pop /* 80C90940-80C90944 00000C 0004+00 0/1 0/0 0/0 .rodata @3931 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3931 = 250.0f; -COMPILER_STRIP_GATE(80C90940, &lit_3931); +COMPILER_STRIP_GATE(0x80C90940, &lit_3931); #pragma pop /* 80C90944-80C90948 000010 0004+00 0/1 0/0 0/0 .rodata @3932 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3932 = 50.0f; -COMPILER_STRIP_GATE(80C90944, &lit_3932); +COMPILER_STRIP_GATE(0x80C90944, &lit_3932); #pragma pop /* 80C90948-80C9094C 000014 0004+00 1/2 0/0 0/0 .rodata @3933 */ SECTION_RODATA static f32 const lit_3933 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(80C90948, &lit_3933); +COMPILER_STRIP_GATE(0x80C90948, &lit_3933); /* 80C9094C-80C90950 000018 0004+00 0/1 0/0 0/0 .rodata @3934 */ #pragma push @@ -378,14 +378,14 @@ SECTION_RODATA static u8 const lit_3934[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C9094C, &lit_3934); +COMPILER_STRIP_GATE(0x80C9094C, &lit_3934); #pragma pop /* 80C90950-80C90954 00001C 0004+00 0/1 0/0 0/0 .rodata @3935 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3935 = 20000.0f; -COMPILER_STRIP_GATE(80C90950, &lit_3935); +COMPILER_STRIP_GATE(0x80C90950, &lit_3935); #pragma pop /* 80C8FEDC-80C90378 0001BC 049C+00 2/1 0/0 0/0 .text daObj_Maki_Execute__FP14obj_maki_class */ @@ -404,6 +404,12 @@ static bool daObj_Maki_IsDelete(obj_maki_class* param_0) { } /* ############################################################################################## */ +/* 80C90960-80C90960 00002C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80C90960 = "Obj_maki"; +#pragma pop + /* 80C90A50-80C90A54 000008 0004+00 2/2 0/0 0/0 .bss None */ static u8 data_80C90A50[4]; @@ -442,21 +448,27 @@ asm J3DFrameCtrl::~J3DFrameCtrl() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4075 = -500.0f; -COMPILER_STRIP_GATE(80C90954, &lit_4075); +COMPILER_STRIP_GATE(0x80C90954, &lit_4075); #pragma pop /* 80C90958-80C9095C 000024 0004+00 0/1 0/0 0/0 .rodata @4076 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4076 = -200.0f; -COMPILER_STRIP_GATE(80C90958, &lit_4076); +COMPILER_STRIP_GATE(0x80C90958, &lit_4076); #pragma pop /* 80C9095C-80C90960 000028 0004+00 0/1 0/0 0/0 .rodata @4077 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4077 = 500.0f; -COMPILER_STRIP_GATE(80C9095C, &lit_4077); +COMPILER_STRIP_GATE(0x80C9095C, &lit_4077); +#pragma pop + +/* 80C90960-80C90960 00002C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80C90969 = "F_SP118"; #pragma pop /* 80C90A54-80C90A60 00000C 000C+00 1/1 0/0 0/0 .bss @3764 */ @@ -518,13 +530,7 @@ asm void __sinit_d_a_obj_maki_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80C908E4 = (void*)__sinit_d_a_obj_maki_cpp; +REGISTER_CTORS(0x80C908E4, __sinit_d_a_obj_maki_cpp); #pragma pop -/* 80C90960-80C90971 00002C 0011+00 3/3 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80C90960 = "Obj_maki"; -SECTION_DEAD static char const* const stringBase_80C90969 = "F_SP118"; -#pragma pop +/* 80C90960-80C90960 00002C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_master_sword/d_a_obj_master_sword.cpp b/rel/d/a/obj/d_a_obj_master_sword/d_a_obj_master_sword.cpp index 32a9f0ce236..fdfbe287f1b 100644 --- a/rel/d/a/obj/d_a_obj_master_sword/d_a_obj_master_sword.cpp +++ b/rel/d/a/obj/d_a_obj_master_sword/d_a_obj_master_sword.cpp @@ -21,10 +21,10 @@ struct mDoMtx_stack_c { static u8 now[48]; }; -struct J3DAnmTevRegKey {}; - struct J3DAnmTextureSRTKey {}; +struct J3DAnmTevRegKey {}; + struct J3DMaterialTable { /* 8032F7B4 */ void removeTexMtxAnimator(J3DAnmTextureSRTKey*); /* 8032F880 */ void removeTevRegAnimator(J3DAnmTevRegKey*); @@ -133,10 +133,10 @@ struct dBgS_AcchCir { /* 80C9127C */ ~dBgS_AcchCir(); }; -struct dBgS {}; - struct csXyz {}; +struct dBgS {}; + struct dBgS_Acch { /* 80075F94 */ ~dBgS_Acch(); /* 800760A0 */ dBgS_Acch(); @@ -335,7 +335,7 @@ asm void daObjMasterSword_c::createHeapCallBack(fopAc_ac_c* param_0) { /* ############################################################################################## */ /* 80C91940-80C91944 000000 0004+00 2/2 0/0 0/0 .rodata mAttr__18daObjMasterSword_c */ SECTION_RODATA f32 const daObjMasterSword_c::mAttr = 1.0f; -COMPILER_STRIP_GATE(80C91940, &daObjMasterSword_c::mAttr); +COMPILER_STRIP_GATE(0x80C91940, &daObjMasterSword_c::mAttr); /* 80C91944-80C91950 000004 000C+00 0/1 0/0 0/0 .rodata @3710 */ #pragma push @@ -343,12 +343,18 @@ COMPILER_STRIP_GATE(80C91940, &daObjMasterSword_c::mAttr); SECTION_RODATA static u8 const lit_3710[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C91944, &lit_3710); +COMPILER_STRIP_GATE(0x80C91944, &lit_3710); #pragma pop /* 80C91950-80C91954 000010 0004+00 1/2 0/0 0/0 .rodata @3759 */ SECTION_RODATA static f32 const lit_3759 = 1.0f; -COMPILER_STRIP_GATE(80C91950, &lit_3759); +COMPILER_STRIP_GATE(0x80C91950, &lit_3759); + +/* 80C91970-80C91970 000030 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80C91970 = "MstrSword"; +#pragma pop /* 80C9197C-80C91988 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { @@ -522,21 +528,21 @@ asm void daObjMasterSword_c::create() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3861 = 100.0f; -COMPILER_STRIP_GATE(80C91954, &lit_3861); +COMPILER_STRIP_GATE(0x80C91954, &lit_3861); #pragma pop /* 80C91958-80C9195C 000018 0004+00 0/2 0/0 0/0 .rodata @3862 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3862 = 10.0f; -COMPILER_STRIP_GATE(80C91958, &lit_3862); +COMPILER_STRIP_GATE(0x80C91958, &lit_3862); #pragma pop /* 80C9195C-80C91960 00001C 0004+00 0/1 0/0 0/0 .rodata @3863 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3863 = 30.0f; -COMPILER_STRIP_GATE(80C9195C, &lit_3863); +COMPILER_STRIP_GATE(0x80C9195C, &lit_3863); #pragma pop /* 80C90F6C-80C9120C 0004EC 02A0+00 1/1 0/0 0/0 .text create_init__18daObjMasterSword_cFv @@ -636,7 +642,7 @@ asm daObjMasterSword_c::~daObjMasterSword_c() { SECTION_RODATA static u8 const lit_4030[8] = { 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C91960, &lit_4030); +COMPILER_STRIP_GATE(0x80C91960, &lit_4030); /* 80C915E8-80C916F4 000B68 010C+00 1/0 0/0 0/0 .text * daObjMasterSword_Execute__FP18daObjMasterSword_c */ @@ -665,14 +671,14 @@ static asm void daObjMasterSword_Draw(daObjMasterSword_c* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4091 = 50.0f; -COMPILER_STRIP_GATE(80C91968, &lit_4091); +COMPILER_STRIP_GATE(0x80C91968, &lit_4091); #pragma pop /* 80C9196C-80C91970 00002C 0004+00 0/1 0/0 0/0 .rodata @4092 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4092 = 200.0f; -COMPILER_STRIP_GATE(80C9196C, &lit_4092); +COMPILER_STRIP_GATE(0x80C9196C, &lit_4092); #pragma pop /* 80C91714-80C91894 000C94 0180+00 1/1 0/0 0/0 .text draw__18daObjMasterSword_cFv */ @@ -713,7 +719,7 @@ asm void __sinit_d_a_obj_master_sword_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80C918E4 = (void*)__sinit_d_a_obj_master_sword_cpp; +REGISTER_CTORS(0x80C918E4, __sinit_d_a_obj_master_sword_cpp); #pragma pop /* 80C91924-80C9192C 000EA4 0008+00 1/0 0/0 0/0 .text @36@__dt__12dBgS_ObjAcchFv */ @@ -736,9 +742,4 @@ static asm void func_80C9192C() { } #pragma pop -/* 80C91970-80C9197A 000030 000A+00 1/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80C91970 = "MstrSword"; -#pragma pop +/* 80C91970-80C91970 000030 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_mato/d_a_obj_mato.cpp b/rel/d/a/obj/d_a_obj_mato/d_a_obj_mato.cpp index 767a4ba79be..47defdb138b 100644 --- a/rel/d/a/obj/d_a_obj_mato/d_a_obj_mato.cpp +++ b/rel/d/a/obj/d_a_obj_mato/d_a_obj_mato.cpp @@ -116,10 +116,10 @@ struct cCcD_GStts { /* 80C92C00 */ ~cCcD_GStts(); }; -struct Vec {}; - struct JAISoundID {}; +struct Vec {}; + struct Z2SeMgr { /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); }; @@ -236,7 +236,7 @@ extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daObjMATO_c::setAction(void (daObjMATO_c::*)(int), int param_1) { +asm void daObjMATO_c::setAction(void (daObjMATO_c::*param_0)(int), int param_1) { nofralloc #include "asm/rel/d/a/obj/d_a_obj_mato/d_a_obj_mato/setAction__11daObjMATO_cFM11daObjMATO_cFPCvPvi_vi.s" } @@ -248,7 +248,13 @@ SECTION_RODATA static u8 const l_B_ling_bmd_table[28] = { 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x04, }; -COMPILER_STRIP_GATE(80C92C50, &l_B_ling_bmd_table); +COMPILER_STRIP_GATE(0x80C92C50, &l_B_ling_bmd_table); + +/* 80C92CD4-80C92CD4 000084 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80C92CD4 = "B_ling"; +#pragma pop /* 80C91C1C-80C91D04 00013C 00E8+00 1/1 0/0 0/0 .text useHeapInit__FP10fopAc_ac_c */ #pragma push @@ -326,7 +332,7 @@ SECTION_RODATA static u8 const lit_3878[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C92C6C, &lit_3878); +COMPILER_STRIP_GATE(0x80C92C6C, &lit_3878); /* 80C92D2C-80C92D38 -00001 000C+00 1/1 0/0 0/0 .data @3867 */ SECTION_DATA static void* lit_3867[3] = { @@ -348,11 +354,11 @@ asm void daObjMATO_c::start_wait(int param_0) { /* ############################################################################################## */ /* 80C92C70-80C92C74 000020 0004+00 1/2 0/0 0/0 .rodata @3900 */ SECTION_RODATA static f32 const lit_3900 = 1.0f; -COMPILER_STRIP_GATE(80C92C70, &lit_3900); +COMPILER_STRIP_GATE(0x80C92C70, &lit_3900); /* 80C92C74-80C92C78 000024 0004+00 1/1 0/0 0/0 .rodata @3901 */ SECTION_RODATA static f32 const lit_3901 = 0.25f; -COMPILER_STRIP_GATE(80C92C74, &lit_3901); +COMPILER_STRIP_GATE(0x80C92C74, &lit_3901); /* 80C92D38-80C92D44 -00001 000C+00 1/1 0/0 0/0 .data @3891 */ SECTION_DATA static void* lit_3891[3] = { @@ -379,7 +385,7 @@ SECTION_RODATA static u8 const l_rupee_itemno_table[28] = { 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x07, }; -COMPILER_STRIP_GATE(80C92C78, &l_rupee_itemno_table); +COMPILER_STRIP_GATE(0x80C92C78, &l_rupee_itemno_table); #pragma pop /* 80C92C94-80C92C9C 000044 0007+01 0/1 0/0 0/0 .rodata l_rupee_count_table */ @@ -396,7 +402,7 @@ SECTION_RODATA static u8 const l_rupee_count_table[7 + 1 /* padding */] = { /* padding */ 0x00, }; -COMPILER_STRIP_GATE(80C92C94, &l_rupee_count_table); +COMPILER_STRIP_GATE(0x80C92C94, &l_rupee_count_table); #pragma pop /* 80C92C9C-80C92CB8 00004C 001C+00 0/1 0/0 0/0 .rodata l_rupee_getse */ @@ -406,28 +412,28 @@ SECTION_RODATA static u8 const l_rupee_getse[28] = { 0x00, 0x00, 0x00, 0x70, 0x00, 0x00, 0x00, 0x71, 0x00, 0x00, 0x00, 0x71, 0x00, 0x00, 0x00, 0x72, 0x00, 0x00, 0x00, 0x72, 0x00, 0x00, 0x00, 0x72, 0x00, 0x00, 0x00, 0x72, }; -COMPILER_STRIP_GATE(80C92C9C, &l_rupee_getse); +COMPILER_STRIP_GATE(0x80C92C9C, &l_rupee_getse); #pragma pop /* 80C92CB8-80C92CBC 000068 0004+00 0/1 0/0 0/0 .rodata @3934 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3934 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(80C92CB8, &lit_3934); +COMPILER_STRIP_GATE(0x80C92CB8, &lit_3934); #pragma pop /* 80C92CBC-80C92CC0 00006C 0004+00 0/1 0/0 0/0 .rodata @3935 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3935 = 1.5f; -COMPILER_STRIP_GATE(80C92CBC, &lit_3935); +COMPILER_STRIP_GATE(0x80C92CBC, &lit_3935); #pragma pop /* 80C92CC0-80C92CC4 000070 0004+00 0/1 0/0 0/0 .rodata @3936 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3936 = 1.0f / 20.0f; -COMPILER_STRIP_GATE(80C92CC0, &lit_3936); +COMPILER_STRIP_GATE(0x80C92CC0, &lit_3936); #pragma pop /* 80C92D44-80C92D50 -00001 000C+00 1/1 0/0 0/0 .data @3924 */ @@ -452,7 +458,7 @@ asm void daObjMATO_c::disappear(int param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3959 = -1.0f; -COMPILER_STRIP_GATE(80C92CC4, &lit_3959); +COMPILER_STRIP_GATE(0x80C92CC4, &lit_3959); #pragma pop /* 80C921A8-80C922AC 0006C8 0104+00 1/1 0/0 0/0 .text getRupee__11daObjMATO_cFi */ @@ -490,21 +496,21 @@ asm void daObjMATO_c::_delete() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4039 = 420.0f; -COMPILER_STRIP_GATE(80C92CC8, &lit_4039); +COMPILER_STRIP_GATE(0x80C92CC8, &lit_4039); #pragma pop /* 80C92CCC-80C92CD0 00007C 0004+00 0/1 0/0 0/0 .rodata @4040 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4040 = 190.0f; -COMPILER_STRIP_GATE(80C92CCC, &lit_4040); +COMPILER_STRIP_GATE(0x80C92CCC, &lit_4040); #pragma pop /* 80C92CD0-80C92CD4 000080 0004+00 0/1 0/0 0/0 .rodata @4041 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4041 = 840.0f; -COMPILER_STRIP_GATE(80C92CD0, &lit_4041); +COMPILER_STRIP_GATE(0x80C92CD0, &lit_4041); #pragma pop /* 80C9243C-80C92584 00095C 0148+00 1/1 0/0 0/0 .text setBaseMtx__11daObjMATO_cFv */ @@ -683,9 +689,4 @@ asm cCcD_GStts::~cCcD_GStts() { } #pragma pop -/* 80C92CD4-80C92CDB 000084 0007+00 3/3 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80C92CD4 = "B_ling"; -#pragma pop +/* 80C92CD4-80C92CD4 000084 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_metalbox/d_a_obj_metalbox.cpp b/rel/d/a/obj/d_a_obj_metalbox/d_a_obj_metalbox.cpp index 66dd58e6ae7..60e074405d4 100644 --- a/rel/d/a/obj/d_a_obj_metalbox/d_a_obj_metalbox.cpp +++ b/rel/d/a/obj/d_a_obj_metalbox/d_a_obj_metalbox.cpp @@ -200,7 +200,7 @@ asm void daObjMBox_c::setBaseMtx() { /* ############################################################################################## */ /* 8059346C-80593470 000000 0004+00 1/1 0/0 0/0 .rodata @3655 */ SECTION_RODATA static f32 const lit_3655 = 30.0f; -COMPILER_STRIP_GATE(8059346C, &lit_3655); +COMPILER_STRIP_GATE(0x8059346C, &lit_3655); /* 80592F48-80592FD4 000128 008C+00 1/0 0/0 0/0 .text Create__11daObjMBox_cFv */ #pragma push @@ -213,6 +213,12 @@ asm void daObjMBox_c::Create() { #pragma pop /* ############################################################################################## */ +/* 80593470-80593470 000004 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80593470 = "L_mbox_00"; +#pragma pop + /* 8059347C-80593480 -00001 0004+00 3/3 0/0 0/0 .data l_arcName */ SECTION_DATA static void* l_arcName = (void*)&d_a_obj_metalbox__stringBase0; @@ -422,9 +428,4 @@ static asm void func_8059345C() { } #pragma pop -/* 80593470-8059347A 000004 000A+00 1/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80593470 = "L_mbox_00"; -#pragma pop +/* 80593470-80593470 000004 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_mgate/d_a_obj_mgate.cpp b/rel/d/a/obj/d_a_obj_mgate/d_a_obj_mgate.cpp index 5737aa48d28..59642804c2c 100644 --- a/rel/d/a/obj/d_a_obj_mgate/d_a_obj_mgate.cpp +++ b/rel/d/a/obj/d_a_obj_mgate/d_a_obj_mgate.cpp @@ -69,10 +69,10 @@ struct dBgS_MoveBgActor { /* 80078950 */ void MoveBGExecute(); }; -struct Vec {}; - struct JAISoundID {}; +struct Vec {}; + struct Z2SeMgr { /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); }; @@ -158,7 +158,7 @@ SECTION_RODATA static u8 const l_key_offset[24] = { 0x43, 0x4D, 0x00, 0x00, 0x43, 0x34, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x43, 0x66, 0x00, 0x00, 0x43, 0x34, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80593E48, &l_key_offset); +COMPILER_STRIP_GATE(0x80593E48, &l_key_offset); /* 80593E60-80593E74 000018 0014+00 0/0 0/0 0/0 .rodata l_col_offsetX */ #pragma push @@ -167,7 +167,7 @@ SECTION_RODATA static u8 const l_col_offsetX[20] = { 0x42, 0xA0, 0x00, 0x00, 0x43, 0x20, 0x00, 0x00, 0x43, 0x70, 0x00, 0x00, 0x43, 0xA0, 0x00, 0x00, 0x43, 0xC8, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80593E60, &l_col_offsetX); +COMPILER_STRIP_GATE(0x80593E60, &l_col_offsetX); #pragma pop /* 80593E74-80593EA4 00002C 0030+00 0/1 0/0 0/0 .rodata l_roll_crash_check_areaL */ @@ -178,7 +178,7 @@ SECTION_RODATA static u8 const l_roll_crash_check_areaL[48] = { 0x00, 0x00, 0x00, 0x00, 0xC3, 0x0C, 0x00, 0x00, 0x43, 0xCD, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x43, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x43, 0x0C, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80593E74, &l_roll_crash_check_areaL); +COMPILER_STRIP_GATE(0x80593E74, &l_roll_crash_check_areaL); #pragma pop /* 80593EA4-80593ED4 00005C 0030+00 0/1 0/0 0/0 .rodata l_roll_crash_check_areaL2 */ @@ -189,12 +189,12 @@ SECTION_RODATA static u8 const l_roll_crash_check_areaL2[48] = { 0x00, 0x00, 0x00, 0x00, 0xC3, 0x0C, 0x00, 0x00, 0x43, 0xE6, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x43, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x43, 0x0C, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80593EA4, &l_roll_crash_check_areaL2); +COMPILER_STRIP_GATE(0x80593EA4, &l_roll_crash_check_areaL2); #pragma pop /* 80593ED4-80593ED8 00008C 0004+00 1/2 0/0 0/0 .rodata @3670 */ SECTION_RODATA static f32 const lit_3670 = -1.0f; -COMPILER_STRIP_GATE(80593ED4, &lit_3670); +COMPILER_STRIP_GATE(0x80593ED4, &lit_3670); /* 805935B8-80593630 000078 0078+00 1/1 0/0 0/0 .text initBaseMtx__12daObjMGate_cFv */ #pragma push @@ -227,6 +227,19 @@ asm void daObjMGate_c::Create() { #pragma pop /* ############################################################################################## */ +/* 80593EFC-80593EFC 0000B4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80593EFC = "M_IGate"; +SECTION_DEAD static char const* const stringBase_80593F04 = "M_HGate"; +SECTION_DEAD static char const* const stringBase_80593F0C = "M_IzumiGate.bmd"; +SECTION_DEAD static char const* const stringBase_80593F1C = "M_HashiGate.bmd"; +SECTION_DEAD static char const* const stringBase_80593F2C = "M_IzumiGate.dzb"; +SECTION_DEAD static char const* const stringBase_80593F3C = "M_HashiGate.dzb"; +SECTION_DEAD static char const* const stringBase_80593F4C = "M_GateKey"; +SECTION_DEAD static char const* const stringBase_80593F56 = "M_IGateKey.bmd"; +#pragma pop + /* 80593F68-80593F74 000000 000C+00 2/2 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -308,63 +321,63 @@ SECTION_RODATA static u8 const lit_3752[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80593ED8, &lit_3752); +COMPILER_STRIP_GATE(0x80593ED8, &lit_3752); #pragma pop /* 80593EDC-80593EE0 000094 0004+00 0/1 0/0 0/0 .rodata @3880 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3880 = 700.0f; -COMPILER_STRIP_GATE(80593EDC, &lit_3880); +COMPILER_STRIP_GATE(0x80593EDC, &lit_3880); #pragma pop /* 80593EE0-80593EE4 000098 0004+00 0/1 0/0 0/0 .rodata @3881 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3881 = 1000.0f; -COMPILER_STRIP_GATE(80593EE0, &lit_3881); +COMPILER_STRIP_GATE(0x80593EE0, &lit_3881); #pragma pop /* 80593EE4-80593EE8 00009C 0004+00 0/1 0/0 0/0 .rodata @3882 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3882 = 1.0f; -COMPILER_STRIP_GATE(80593EE4, &lit_3882); +COMPILER_STRIP_GATE(0x80593EE4, &lit_3882); #pragma pop /* 80593EE8-80593EEC 0000A0 0004+00 0/1 0/0 0/0 .rodata @3883 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3883 = -700.0f; -COMPILER_STRIP_GATE(80593EE8, &lit_3883); +COMPILER_STRIP_GATE(0x80593EE8, &lit_3883); #pragma pop /* 80593EEC-80593EF0 0000A4 0004+00 0/1 0/0 0/0 .rodata @3884 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3884 = -1000.0f; -COMPILER_STRIP_GATE(80593EEC, &lit_3884); +COMPILER_STRIP_GATE(0x80593EEC, &lit_3884); #pragma pop /* 80593EF0-80593EF4 0000A8 0004+00 0/1 0/0 0/0 .rodata @3885 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3885 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(80593EF0, &lit_3885); +COMPILER_STRIP_GATE(0x80593EF0, &lit_3885); #pragma pop /* 80593EF4-80593EF8 0000AC 0004+00 0/1 0/0 0/0 .rodata @3886 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3886 = 20.0f; -COMPILER_STRIP_GATE(80593EF4, &lit_3886); +COMPILER_STRIP_GATE(0x80593EF4, &lit_3886); #pragma pop /* 80593EF8-80593EFC 0000B0 0004+00 0/1 0/0 0/0 .rodata @3887 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3887 = 7.0f / 100.0f; -COMPILER_STRIP_GATE(80593EF8, &lit_3887); +COMPILER_STRIP_GATE(0x80593EF8, &lit_3887); #pragma pop /* 80593988-80593C4C 000448 02C4+00 1/0 0/0 0/0 .text Execute__12daObjMGate_cFPPA3_A4_f @@ -476,16 +489,4 @@ static asm void daObjMGate_MoveBGDraw(daObjMGate_c* param_0) { } #pragma pop -/* 80593EFC-80593F65 0000B4 0069+00 5/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80593EFC = "M_IGate"; -SECTION_DEAD static char const* const stringBase_80593F04 = "M_HGate"; -SECTION_DEAD static char const* const stringBase_80593F0C = "M_IzumiGate.bmd"; -SECTION_DEAD static char const* const stringBase_80593F1C = "M_HashiGate.bmd"; -SECTION_DEAD static char const* const stringBase_80593F2C = "M_IzumiGate.dzb"; -SECTION_DEAD static char const* const stringBase_80593F3C = "M_HashiGate.dzb"; -SECTION_DEAD static char const* const stringBase_80593F4C = "M_GateKey"; -SECTION_DEAD static char const* const stringBase_80593F56 = "M_IGateKey.bmd"; -#pragma pop +/* 80593EFC-80593EFC 0000B4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_mhole/d_a_obj_mhole.cpp b/rel/d/a/obj/d_a_obj_mhole/d_a_obj_mhole.cpp index 15344b32366..176259d0674 100644 --- a/rel/d/a/obj/d_a_obj_mhole/d_a_obj_mhole.cpp +++ b/rel/d/a/obj/d_a_obj_mhole/d_a_obj_mhole.cpp @@ -255,7 +255,7 @@ extern "C" extern u32 __float_nan; SECTION_RODATA static u8 const l_bmd[8] = { 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x05, }; -COMPILER_STRIP_GATE(80C93D88, &l_bmd); +COMPILER_STRIP_GATE(0x80C93D88, &l_bmd); /* 80C93D90-80C93D98 000008 0008+00 0/1 0/0 0/0 .rodata l_brk */ #pragma push @@ -263,7 +263,7 @@ COMPILER_STRIP_GATE(80C93D88, &l_bmd); SECTION_RODATA static u8 const l_brk[8] = { 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x08, }; -COMPILER_STRIP_GATE(80C93D90, &l_brk); +COMPILER_STRIP_GATE(0x80C93D90, &l_brk); #pragma pop /* 80C93D98-80C93DA0 000010 0008+00 0/1 0/0 0/0 .rodata l_btk1 */ @@ -272,7 +272,7 @@ COMPILER_STRIP_GATE(80C93D90, &l_brk); SECTION_RODATA static u8 const l_btk1[8] = { 0x00, 0x00, 0x00, 0x0B, 0x00, 0x00, 0x00, 0x0B, }; -COMPILER_STRIP_GATE(80C93D98, &l_btk1); +COMPILER_STRIP_GATE(0x80C93D98, &l_btk1); #pragma pop /* 80C93DA0-80C93DA8 000018 0008+00 0/1 0/0 0/0 .rodata l_btk2 */ @@ -281,7 +281,7 @@ COMPILER_STRIP_GATE(80C93D98, &l_btk1); SECTION_RODATA static u8 const l_btk2[8] = { 0x00, 0x00, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x0C, }; -COMPILER_STRIP_GATE(80C93DA0, &l_btk2); +COMPILER_STRIP_GATE(0x80C93DA0, &l_btk2); #pragma pop /* 80C93DA8-80C93DB0 000020 0008+00 0/1 0/0 0/0 .rodata l_length */ @@ -290,7 +290,7 @@ COMPILER_STRIP_GATE(80C93DA0, &l_btk2); SECTION_RODATA static u8 const l_length[8] = { 0x44, 0xFA, 0x00, 0x00, 0x44, 0x7A, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C93DA8, &l_length); +COMPILER_STRIP_GATE(0x80C93DA8, &l_length); #pragma pop /* 80C93DB0-80C93DB8 000028 0008+00 0/1 0/0 0/0 .rodata l_size */ @@ -299,7 +299,7 @@ COMPILER_STRIP_GATE(80C93DA8, &l_length); SECTION_RODATA static u8 const l_size[8] = { 0x43, 0x16, 0x00, 0x00, 0x43, 0xB9, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C93DB0, &l_size); +COMPILER_STRIP_GATE(0x80C93DB0, &l_size); #pragma pop /* 80C93DB8-80C93DC0 000030 0004+04 0/4 0/0 0/0 .rodata @3656 */ @@ -316,7 +316,7 @@ SECTION_RODATA static u8 const lit_3656[4 + 4 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C93DB8, &lit_3656); +COMPILER_STRIP_GATE(0x80C93DB8, &lit_3656); #pragma pop /* 80C93DC0-80C93DC8 000038 0008+00 0/1 0/0 0/0 .rodata @3657 */ @@ -325,7 +325,7 @@ COMPILER_STRIP_GATE(80C93DB8, &lit_3656); SECTION_RODATA static u8 const lit_3657[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C93DC0, &lit_3657); +COMPILER_STRIP_GATE(0x80C93DC0, &lit_3657); #pragma pop /* 80C93DC8-80C93DD0 000040 0008+00 0/1 0/0 0/0 .rodata @3658 */ @@ -334,7 +334,7 @@ COMPILER_STRIP_GATE(80C93DC0, &lit_3657); SECTION_RODATA static u8 const lit_3658[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C93DC8, &lit_3658); +COMPILER_STRIP_GATE(0x80C93DC8, &lit_3658); #pragma pop /* 80C93DD0-80C93DD8 000048 0008+00 0/1 0/0 0/0 .rodata @3659 */ @@ -343,7 +343,7 @@ COMPILER_STRIP_GATE(80C93DC8, &lit_3658); SECTION_RODATA static u8 const lit_3659[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C93DD0, &lit_3659); +COMPILER_STRIP_GATE(0x80C93DD0, &lit_3659); #pragma pop /* 80C93DD8-80C93DE0 000050 0004+04 0/1 0/0 0/0 .rodata @3660 */ @@ -354,7 +354,7 @@ SECTION_RODATA static f32 const lit_3660[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80C93DD8, &lit_3660); +COMPILER_STRIP_GATE(0x80C93DD8, &lit_3660); #pragma pop /* 80C92E58-80C92FB8 000078 0160+00 1/1 0/0 0/0 .text searchParentSub__FPvPv */ @@ -402,7 +402,14 @@ asm void daObjMHole_c::setBaseMtx() { SECTION_RODATA static u8 const lit_3724[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C93DE0, &lit_3724); +COMPILER_STRIP_GATE(0x80C93DE0, &lit_3724); + +/* 80C93E00-80C93E00 000078 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80C93E00 = "ef_MgnF_L"; +SECTION_DEAD static char const* const stringBase_80C93E0A = "ef_MgnF_S"; +#pragma pop /* 80C93E14-80C93E1C -00001 0008+00 3/3 0/0 0/0 .data l_arcName */ SECTION_DATA static void* l_arcName[2] = { @@ -444,7 +451,7 @@ asm void daObjMHole_c::checkParent() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3823 = 1.0f; -COMPILER_STRIP_GATE(80C93DE8, &lit_3823); +COMPILER_STRIP_GATE(0x80C93DE8, &lit_3823); #pragma pop /* 80C93E68-80C93E88 -00001 0020+00 1/0 0/0 0/0 .data l_daObjMHole_Method */ @@ -540,7 +547,7 @@ asm void daObjMHole_c::execute() { SECTION_RODATA static u8 const l_eff_id_L[8] = { 0x86, 0xEF, 0x86, 0xF0, 0x86, 0xF1, 0x86, 0xF2, }; -COMPILER_STRIP_GATE(80C93DEC, &l_eff_id_L); +COMPILER_STRIP_GATE(0x80C93DEC, &l_eff_id_L); #pragma pop /* 80C93DF4-80C93DFC 00006C 0008+00 0/1 0/0 0/0 .rodata l_eff_id_S$4031 */ @@ -549,7 +556,7 @@ COMPILER_STRIP_GATE(80C93DEC, &l_eff_id_L); SECTION_RODATA static u8 const l_eff_id_S[8] = { 0x86, 0xF3, 0x86, 0xF4, 0x86, 0xF5, 0x86, 0xF6, }; -COMPILER_STRIP_GATE(80C93DF4, &l_eff_id_S); +COMPILER_STRIP_GATE(0x80C93DF4, &l_eff_id_S); #pragma pop /* 80C93928-80C93A88 000B48 0160+00 1/1 0/0 0/0 .text effectSet__12daObjMHole_cFv */ @@ -577,7 +584,7 @@ asm void daObjMHole_c::effectEnd() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4217 = -1.0f / 100.0f; -COMPILER_STRIP_GATE(80C93DFC, &lit_4217); +COMPILER_STRIP_GATE(0x80C93DFC, &lit_4217); #pragma pop /* 80C93ADC-80C93CAC 000CFC 01D0+00 1/1 0/0 0/0 .text draw__12daObjMHole_cFv */ @@ -643,10 +650,4 @@ static asm void daObjMHole_Create(fopAc_ac_c* param_0) { } #pragma pop -/* 80C93E00-80C93E14 000078 0014+00 1/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80C93E00 = "ef_MgnF_L"; -SECTION_DEAD static char const* const stringBase_80C93E0A = "ef_MgnF_S"; -#pragma pop +/* 80C93E00-80C93E00 000078 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_mie/d_a_obj_mie.cpp b/rel/d/a/obj/d_a_obj_mie/d_a_obj_mie.cpp index 2b94d542799..adee1471b90 100644 --- a/rel/d/a/obj/d_a_obj_mie/d_a_obj_mie.cpp +++ b/rel/d/a/obj/d_a_obj_mie/d_a_obj_mie.cpp @@ -231,7 +231,7 @@ extern "C" static void daObj_Mie_Execute__FPv(); extern "C" static void daObj_Mie_Draw__FPv(); extern "C" static bool daObj_Mie_IsDelete__FPv(); extern "C" void __dt__10cCcD_GSttsFv(); -extern "C" void func_80C959B0(int*); +extern "C" void func_80C959B0(void* _this, int*); extern "C" void __sinit_d_a_obj_mie_cpp(); extern "C" void __dt__17daObj_Mie_Param_cFv(); extern "C" static void func_80C95A88(); @@ -341,6 +341,13 @@ extern "C" void __register_global_object(); // /* ############################################################################################## */ +/* 80C95B80-80C95B80 0000D4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80C95B80 = ""; +SECTION_DEAD static char const* const stringBase_80C95B81 = "pouyaA"; +#pragma pop + /* 80C95B88-80C95B90 000000 0008+00 3/3 0/0 0/0 .data l_bmdData */ SECTION_DATA static u8 l_bmdData[8] = { 0x00, 0x00, 0x00, 0x17, 0x00, 0x00, 0x00, 0x01, @@ -574,7 +581,7 @@ SECTION_RODATA u8 const daObj_Mie_Param_c::m[44] = { 0x00, 0x43, 0x7F, 0x00, 0x00, 0x41, 0xA0, 0x00, 0x00, 0x41, 0x20, 0x00, 0x00, 0x41, 0x60, 0x00, 0x00, 0x42, 0x14, 0x00, 0x00, 0x42, 0x48, 0x00, 0x00, 0x41, 0x90, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C95AAC, &daObj_Mie_Param_c::m); +COMPILER_STRIP_GATE(0x80C95AAC, &daObj_Mie_Param_c::m); /* 80C95AD8-80C95B08 00002C 0030+00 1/1 0/0 0/0 .rodata l_ccDObjData */ SECTION_RODATA static u8 const l_ccDObjData[48] = { @@ -582,7 +589,7 @@ SECTION_RODATA static u8 const l_ccDObjData[48] = { 0xD8, 0xFB, 0xFD, 0xFF, 0x00, 0x00, 0x00, 0x1F, 0x00, 0x00, 0x00, 0x79, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C95AD8, &l_ccDObjData); +COMPILER_STRIP_GATE(0x80C95AD8, &l_ccDObjData); /* 80C95B08-80C95B0C 00005C 0004+00 0/2 0/0 0/0 .rodata @4379 */ #pragma push @@ -593,127 +600,127 @@ SECTION_RODATA static u8 const lit_4379[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C95B08, &lit_4379); +COMPILER_STRIP_GATE(0x80C95B08, &lit_4379); #pragma pop /* 80C95B0C-80C95B10 000060 0004+00 0/1 0/0 0/0 .rodata @4380 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4380 = 0x43360B61; -COMPILER_STRIP_GATE(80C95B0C, &lit_4380); +COMPILER_STRIP_GATE(0x80C95B0C, &lit_4380); #pragma pop /* 80C95B10-80C95B14 000064 0004+00 0/2 0/0 0/0 .rodata @4381 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4381 = -1000000000.0f; -COMPILER_STRIP_GATE(80C95B10, &lit_4381); +COMPILER_STRIP_GATE(0x80C95B10, &lit_4381); #pragma pop /* 80C95B14-80C95B18 000068 0004+00 0/1 0/0 0/0 .rodata @4382 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4382 = 3000.0f; -COMPILER_STRIP_GATE(80C95B14, &lit_4382); +COMPILER_STRIP_GATE(0x80C95B14, &lit_4382); #pragma pop /* 80C95B18-80C95B1C 00006C 0004+00 0/1 0/0 0/0 .rodata @4383 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4383 = 3.0f / 10.0f; -COMPILER_STRIP_GATE(80C95B18, &lit_4383); +COMPILER_STRIP_GATE(0x80C95B18, &lit_4383); #pragma pop /* 80C95B1C-80C95B20 000070 0004+00 0/1 0/0 0/0 .rodata @4384 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4384 = 0.5f; -COMPILER_STRIP_GATE(80C95B1C, &lit_4384); +COMPILER_STRIP_GATE(0x80C95B1C, &lit_4384); #pragma pop /* 80C95B20-80C95B24 000074 0004+00 0/1 0/0 0/0 .rodata @4385 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4385 = 2.0f; -COMPILER_STRIP_GATE(80C95B20, &lit_4385); +COMPILER_STRIP_GATE(0x80C95B20, &lit_4385); #pragma pop /* 80C95B24-80C95B28 000078 0004+00 0/1 0/0 0/0 .rodata @4386 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4386 = 5.5f; -COMPILER_STRIP_GATE(80C95B24, &lit_4386); +COMPILER_STRIP_GATE(0x80C95B24, &lit_4386); #pragma pop /* 80C95B28-80C95B2C 00007C 0004+00 0/1 0/0 0/0 .rodata @4387 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4387 = 0.75f; -COMPILER_STRIP_GATE(80C95B28, &lit_4387); +COMPILER_STRIP_GATE(0x80C95B28, &lit_4387); #pragma pop /* 80C95B2C-80C95B30 000080 0004+00 0/1 0/0 0/0 .rodata @4388 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4388 = 0.25f; -COMPILER_STRIP_GATE(80C95B2C, &lit_4388); +COMPILER_STRIP_GATE(0x80C95B2C, &lit_4388); #pragma pop /* 80C95B30-80C95B34 000084 0004+00 1/3 0/0 0/0 .rodata @4389 */ SECTION_RODATA static f32 const lit_4389 = 1.0f; -COMPILER_STRIP_GATE(80C95B30, &lit_4389); +COMPILER_STRIP_GATE(0x80C95B30, &lit_4389); /* 80C95B34-80C95B38 000088 0004+00 0/1 0/0 0/0 .rodata @4390 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4390 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(80C95B34, &lit_4390); +COMPILER_STRIP_GATE(0x80C95B34, &lit_4390); #pragma pop /* 80C95B38-80C95B3C 00008C 0004+00 0/1 0/0 0/0 .rodata @4391 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4391 = 2000.0f; -COMPILER_STRIP_GATE(80C95B38, &lit_4391); +COMPILER_STRIP_GATE(0x80C95B38, &lit_4391); #pragma pop /* 80C95B3C-80C95B40 000090 0004+00 0/1 0/0 0/0 .rodata @4392 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4392 = 1000.0f; -COMPILER_STRIP_GATE(80C95B3C, &lit_4392); +COMPILER_STRIP_GATE(0x80C95B3C, &lit_4392); #pragma pop /* 80C95B40-80C95B44 000094 0004+00 0/1 0/0 0/0 .rodata @4393 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4393 = 1200.0f; -COMPILER_STRIP_GATE(80C95B40, &lit_4393); +COMPILER_STRIP_GATE(0x80C95B40, &lit_4393); #pragma pop /* 80C95B44-80C95B48 000098 0004+00 0/1 0/0 0/0 .rodata @4394 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4394 = 900.0f; -COMPILER_STRIP_GATE(80C95B44, &lit_4394); +COMPILER_STRIP_GATE(0x80C95B44, &lit_4394); #pragma pop /* 80C95B48-80C95B4C 00009C 0004+00 1/2 0/0 0/0 .rodata @4395 */ SECTION_RODATA static f32 const lit_4395 = 1.0f / 20.0f; -COMPILER_STRIP_GATE(80C95B48, &lit_4395); +COMPILER_STRIP_GATE(0x80C95B48, &lit_4395); /* 80C95B4C-80C95B50 0000A0 0004+00 0/1 0/0 0/0 .rodata @4396 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4396 = 100.0f; -COMPILER_STRIP_GATE(80C95B4C, &lit_4396); +COMPILER_STRIP_GATE(0x80C95B4C, &lit_4396); #pragma pop /* 80C95B50-80C95B54 0000A4 0004+00 0/1 0/0 0/0 .rodata @4397 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4397 = 9.0f / 20.0f; -COMPILER_STRIP_GATE(80C95B50, &lit_4397); +COMPILER_STRIP_GATE(0x80C95B50, &lit_4397); #pragma pop /* 80C95B54-80C95B5C 0000A8 0004+04 0/1 0/0 0/0 .rodata @4398 */ @@ -724,7 +731,7 @@ SECTION_RODATA static f32 const lit_4398[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80C95B54, &lit_4398); +COMPILER_STRIP_GATE(0x80C95B54, &lit_4398); #pragma pop /* 80C95B5C-80C95B64 0000B0 0008+00 0/1 0/0 0/0 .rodata @4400 */ @@ -733,7 +740,7 @@ COMPILER_STRIP_GATE(80C95B54, &lit_4398); SECTION_RODATA static u8 const lit_4400[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C95B5C, &lit_4400); +COMPILER_STRIP_GATE(0x80C95B5C, &lit_4400); #pragma pop /* 80C946A8-80C95140 0007C8 0A98+00 1/1 0/0 0/0 .text Execute__11daObj_Mie_cFv */ @@ -751,7 +758,7 @@ asm void daObj_Mie_c::Execute() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4435 = 20.0f; -COMPILER_STRIP_GATE(80C95B64, &lit_4435); +COMPILER_STRIP_GATE(0x80C95B64, &lit_4435); #pragma pop /* 80C95140-80C95290 001260 0150+00 1/1 0/0 0/0 .text Draw__11daObj_Mie_cFv */ @@ -840,28 +847,28 @@ asm void daObj_Mie_c::calcRollAngle(s16 param_0, int param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4575 = -50.0f; -COMPILER_STRIP_GATE(80C95B68, &lit_4575); +COMPILER_STRIP_GATE(0x80C95B68, &lit_4575); #pragma pop /* 80C95B6C-80C95B70 0000C0 0004+00 0/1 0/0 0/0 .rodata @4576 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4576 = 5.0f; -COMPILER_STRIP_GATE(80C95B6C, &lit_4576); +COMPILER_STRIP_GATE(0x80C95B6C, &lit_4576); #pragma pop /* 80C95B70-80C95B74 0000C4 0004+00 0/1 0/0 0/0 .rodata @4577 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4577 = 200.0f; -COMPILER_STRIP_GATE(80C95B70, &lit_4577); +COMPILER_STRIP_GATE(0x80C95B70, &lit_4577); #pragma pop /* 80C95B74-80C95B78 0000C8 0004+00 0/1 0/0 0/0 .rodata @4578 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4578 = -1.0f; -COMPILER_STRIP_GATE(80C95B74, &lit_4578); +COMPILER_STRIP_GATE(0x80C95B74, &lit_4578); #pragma pop /* 80C9555C-80C956EC 00167C 0190+00 1/1 0/0 0/0 .text getWallAngle__11daObj_Mie_cFsPs */ @@ -877,7 +884,7 @@ asm void daObj_Mie_c::getWallAngle(s16 param_0, s16* param_1) { /* ############################################################################################## */ /* 80C95B78-80C95B7C 0000CC 0004+00 2/2 0/0 0/0 .rodata @4594 */ SECTION_RODATA static f32 const lit_4594 = 2.0f / 5.0f; -COMPILER_STRIP_GATE(80C95B78, &lit_4594); +COMPILER_STRIP_GATE(0x80C95B78, &lit_4594); /* 80C956EC-80C95768 00180C 007C+00 1/1 0/0 0/0 .text setSmokePrtcl__11daObj_Mie_cFv */ #pragma push @@ -1014,7 +1021,7 @@ asm void daObj_Mie_c::setWaterPrtcl() { /* ############################################################################################## */ /* 80C95B7C-80C95B80 0000D0 0004+00 1/1 0/0 0/0 .rodata @4641 */ SECTION_RODATA static f32 const lit_4641 = 7.0f / 10.0f; -COMPILER_STRIP_GATE(80C95B7C, &lit_4641); +COMPILER_STRIP_GATE(0x80C95B7C, &lit_4641); /* 80C95890-80C958E0 0019B0 0050+00 1/1 0/0 0/0 .text setHamonPrtcl__11daObj_Mie_cFv */ #pragma push @@ -1085,7 +1092,7 @@ asm cCcD_GStts::~cCcD_GStts() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80C959B0(int* param_0) { +extern "C" asm void func_80C959B0(void* _this, int* param_0) { nofralloc #include "asm/rel/d/a/obj/d_a_obj_mie/d_a_obj_mie/func_80C959B0.s" } @@ -1111,7 +1118,7 @@ asm void __sinit_d_a_obj_mie_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80C959CC = (void*)__sinit_d_a_obj_mie_cpp; +REGISTER_CTORS(0x80C959CC, __sinit_d_a_obj_mie_cpp); #pragma pop /* 80C95A40-80C95A88 001B60 0048+00 2/1 0/0 0/0 .text __dt__17daObj_Mie_Param_cFv */ @@ -1316,10 +1323,4 @@ static u8 data_80C95D98[4]; static u8 data_80C95D9C[4]; #pragma pop -/* 80C95B80-80C95B88 0000D4 0008+00 1/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80C95B80 = ""; -SECTION_DEAD static char const* const stringBase_80C95B81 = "pouyaA"; -#pragma pop +/* 80C95B80-80C95B80 0000D4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_movebox/d_a_obj_movebox.cpp b/rel/d/a/obj/d_a_obj_movebox/d_a_obj_movebox.cpp index 9677da733ec..9e0a73a7422 100644 --- a/rel/d/a/obj/d_a_obj_movebox/d_a_obj_movebox.cpp +++ b/rel/d/a/obj/d_a_obj_movebox/d_a_obj_movebox.cpp @@ -13,10 +13,10 @@ struct request_of_phase_process_class {}; -struct Quaternion {}; - struct csXyz {}; +struct Quaternion {}; + struct Vec {}; struct cXyz { @@ -122,7 +122,8 @@ struct daObj { template void PrmAbstract(/* ... */); /* 80480CD8 */ /* daObj::PrmAbstract */ - void func_80480CD8(fopAc_ac_c const*, daObjMovebox::Act_c::Prm_e, daObjMovebox::Act_c::Prm_e); + void func_80480CD8(void* _this, fopAc_ac_c const*, daObjMovebox::Act_c::Prm_e, + daObjMovebox::Act_c::Prm_e); }; struct dVibration_c { @@ -372,7 +373,7 @@ extern "C" static void func_80480C18(); extern "C" static void func_80480C38(); extern "C" static void func_80480C64(); extern "C" void __dt__10cCcD_GSttsFv(); -extern "C" void func_80480CD8(fopAc_ac_c const*, daObjMovebox::Act_c::Prm_e, +extern "C" void func_80480CD8(void* _this, fopAc_ac_c const*, daObjMovebox::Act_c::Prm_e, daObjMovebox::Act_c::Prm_e); extern "C" void __sinit_d_a_obj_movebox_cpp(); extern "C" void func_80480DA0(); @@ -536,7 +537,7 @@ SECTION_RODATA u8 const daObjMovebox::Bgc_c::M_lin5[80] = { 0x3F, 0x00, 0x00, 0x00, 0x3F, 0x00, 0x00, 0x00, 0xBF, 0x80, 0x00, 0x00, 0xBF, 0x80, 0x00, 0x00, 0xBF, 0x00, 0x00, 0x00, 0x3F, 0x00, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0xBF, 0x80, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80480F28, &daObjMovebox::Bgc_c::M_lin5); +COMPILER_STRIP_GATE(0x80480F28, &daObjMovebox::Bgc_c::M_lin5); /* 80480F78-804810E8 000050 0170+00 0/4 0/0 0/0 .rodata M_lin20__Q212daObjMovebox5Bgc_c */ #pragma push @@ -566,7 +567,7 @@ SECTION_RODATA u8 const daObjMovebox::Bgc_c::M_lin20[368] = { 0xBF, 0x40, 0x00, 0x00, 0x3E, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xBF, 0x40, 0x00, 0x00, 0xBE, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80480F78, &daObjMovebox::Bgc_c::M_lin20); +COMPILER_STRIP_GATE(0x80480F78, &daObjMovebox::Bgc_c::M_lin20); #pragma pop /* 804810E8-804810EC 0001C0 0004+00 7/16 0/0 0/0 .rodata @3687 */ @@ -576,7 +577,7 @@ SECTION_RODATA static u8 const lit_3687[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(804810E8, &lit_3687); +COMPILER_STRIP_GATE(0x804810E8, &lit_3687); /* 8047DAEC-8047DBB0 0000EC 00C4+00 1/1 0/0 0/0 .text __ct__Q212daObjMovebox5Bgc_cFv */ #pragma push @@ -606,7 +607,7 @@ cXyz::cXyz() { /* ############################################################################################## */ /* 804810EC-804810F0 0001C4 0004+00 1/2 0/0 0/0 .rodata @3728 */ SECTION_RODATA static f32 const lit_3728 = -1000000000.0f; -COMPILER_STRIP_GATE(804810EC, &lit_3728); +COMPILER_STRIP_GATE(0x804810EC, &lit_3728); /* 80481888-8048188C 000008 0001+03 4/4 0/0 0/0 .bss @1109 */ static u8 lit_1109[1 + 3 /* padding */]; @@ -727,11 +728,11 @@ asm void daObjMovebox::Bgc_c::gnd_pos(daObjMovebox::Act_c const* param_0, /* ############################################################################################## */ /* 804810F0-804810F4 0001C8 0004+00 1/1 0/0 0/0 .rodata @3754 */ SECTION_RODATA static f32 const lit_3754 = 400.0f; -COMPILER_STRIP_GATE(804810F0, &lit_3754); +COMPILER_STRIP_GATE(0x804810F0, &lit_3754); /* 804810F4-804810F8 0001CC 0004+00 1/2 0/0 0/0 .rodata @3755 */ SECTION_RODATA static f32 const lit_3755 = 100.0f; -COMPILER_STRIP_GATE(804810F4, &lit_3755); +COMPILER_STRIP_GATE(0x804810F4, &lit_3755); /* 80482060-8048206C 0007E0 000C+00 0/1 0/0 0/0 .bss @3670 */ #pragma push @@ -756,7 +757,7 @@ asm void daObjMovebox::Bgc_c::wrt_pos(cXyz const& param_0) { /* ############################################################################################## */ /* 804810F8-804810FC 0001D0 0004+00 1/4 0/0 0/0 .rodata @3831 */ SECTION_RODATA static f32 const lit_3831 = 0.5f; -COMPILER_STRIP_GATE(804810F8, &lit_3831); +COMPILER_STRIP_GATE(0x804810F8, &lit_3831); /* 804820C0-804820CC 000840 000C+00 0/1 0/0 0/0 .bss @3672 */ #pragma push @@ -795,7 +796,7 @@ asm void daObjMovebox::Bgc_c::proc_vertical(daObjMovebox::Act_c* param_0) { /* ############################################################################################## */ /* 804810FC-80481100 0001D4 0004+00 3/10 0/0 0/0 .rodata @3902 */ SECTION_RODATA static f32 const lit_3902 = 1.0f; -COMPILER_STRIP_GATE(804810FC, &lit_3902); +COMPILER_STRIP_GATE(0x804810FC, &lit_3902); /* 8047E2D4-8047E350 0008D4 007C+00 2/2 0/0 0/0 .text * chk_wall_pre__Q212daObjMovebox5Bgc_cFPCQ212daObjMovebox5Act_cPCQ212daObjMovebox8BgcSrc_cis */ @@ -815,7 +816,7 @@ asm void daObjMovebox::Bgc_c::chk_wall_pre(daObjMovebox::Act_c const* param_0, #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3960 = 10.0f; -COMPILER_STRIP_GATE(80481100, &lit_3960); +COMPILER_STRIP_GATE(0x80481100, &lit_3960); #pragma pop /* 80482ADC-80482AEC 00125C 000C+04 0/1 0/0 0/0 .bss @3909 */ @@ -889,6 +890,30 @@ asm void daObjMovebox::Act_c::prmX_init() { #pragma pop /* ############################################################################################## */ +/* 804816A4-804816AD 00077C 0009+00 2/1 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_804816A4; + +/* 804816AD-804816B4 000785 0007+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_804816AD; + +/* 804816B4-804816BC 00078C 0008+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_804816B4; + +/* 804816BC-804816C6 000794 000A+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_804816BC; + +/* 804816C6-804816CF 00079E 0009+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_804816C6; + +/* 804816CF-804816D9 0007A7 000A+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_804816CF; + +/* 804816D9-804816E3 0007B1 000A+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_804816D9; + +/* 804816E3-804816EA 0007BB 0007+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_804816E3; + /* 80481104-80481124 -00001 0020+00 3/3 0/0 0/0 .rodata M_arcname__Q212daObjMovebox5Act_c */ SECTION_RODATA void* const daObjMovebox::Act_c::M_arcname[8] = { @@ -901,7 +926,7 @@ SECTION_RODATA void* const daObjMovebox::Act_c::M_arcname[8] = { (void*)(((char*)&d_a_obj_movebox__stringBase0) + 0x35), (void*)(((char*)&d_a_obj_movebox__stringBase0) + 0x3F), }; -COMPILER_STRIP_GATE(80481104, &daObjMovebox::Act_c::M_arcname); +COMPILER_STRIP_GATE(0x80481104, &daObjMovebox::Act_c::M_arcname); /* 80481124-80481168 0001FC 0044+00 0/1 0/0 0/0 .rodata M_cyl_src__Q212daObjMovebox5Act_c */ @@ -914,7 +939,7 @@ SECTION_RODATA u8 const daObjMovebox::Act_c::M_cyl_src[68] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0x96, 0x00, 0x00, 0x43, 0x16, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80481124, &daObjMovebox::Act_c::M_cyl_src); +COMPILER_STRIP_GATE(0x80481124, &daObjMovebox::Act_c::M_cyl_src); #pragma pop /* 80481168-80481668 000240 0500+00 6/18 0/0 0/0 .rodata M_attr__Q212daObjMovebox5Act_c */ @@ -1000,7 +1025,20 @@ SECTION_RODATA u8 const daObjMovebox::Act_c::M_attr[1280] = { 0x00, 0x08, 0x01, 0x3D, 0x00, 0x08, 0x01, 0x51, 0x00, 0x08, 0x00, 0x2A, 0x00, 0x08, 0x00, 0x2D, 0xFF, 0xA6, 0xFF, 0xFF, 0xFF, 0xA6, 0x00, 0x5A, 0x00, 0x97, 0x00, 0x5A, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80481168, &daObjMovebox::Act_c::M_attr); +COMPILER_STRIP_GATE(0x80481168, &daObjMovebox::Act_c::M_attr); + +/* 804816A4-804816A4 00077C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_804816A4 = "Kkiba_00"; +SECTION_DEAD static char const* const stringBase_804816AD = "Osiblk"; +SECTION_DEAD static char const* const stringBase_804816B4 = "H_Box20"; +SECTION_DEAD static char const* const stringBase_804816BC = "A_SMBlock"; +SECTION_DEAD static char const* const stringBase_804816C6 = "P_Lv4blk"; +SECTION_DEAD static char const* const stringBase_804816CF = "P_Lv4blk2"; +SECTION_DEAD static char const* const stringBase_804816D9 = "H_OsiHaka"; +SECTION_DEAD static char const* const stringBase_804816E3 = "dummy4"; +#pragma pop /* 8047E6B0-8047E6C8 000CB0 0018+00 5/5 0/0 0/0 .text attr__Q212daObjMovebox5Act_cCFv */ #pragma push @@ -1048,7 +1086,7 @@ asm void daObjMovebox::Act_c::path_init() { /* ############################################################################################## */ /* 80481668-8048166C 000740 0004+00 1/1 0/0 0/0 .rodata @4161 */ SECTION_RODATA static f32 const lit_4161 = 9.0f; -COMPILER_STRIP_GATE(80481668, &lit_4161); +COMPILER_STRIP_GATE(0x80481668, &lit_4161); /* 8047E92C-8047EB48 000F2C 021C+00 1/1 0/0 0/0 .text path_save__Q212daObjMovebox5Act_cFv */ @@ -1076,7 +1114,7 @@ asm void daObjMovebox::Act_c::CreateHeap() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4214 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(8048166C, &lit_4214); +COMPILER_STRIP_GATE(0x8048166C, &lit_4214); #pragma pop /* 80481670-80481678 000748 0004+04 0/1 0/0 0/0 .rodata @4215 */ @@ -1087,7 +1125,7 @@ SECTION_RODATA static f32 const lit_4215[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80481670, &lit_4215); +COMPILER_STRIP_GATE(0x80481670, &lit_4215); #pragma pop /* 8047EBEC-8047ED10 0011EC 0124+00 1/1 0/0 0/0 .text @@ -1121,7 +1159,7 @@ asm void daObjMovebox::Act_c::PPCallBack(fopAc_ac_c* param_0, fopAc_ac_c* param_ SECTION_RODATA static u8 const lit_4354[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80481678, &lit_4354); +COMPILER_STRIP_GATE(0x80481678, &lit_4354); #pragma pop /* 8047EE0C-8047F11C 00140C 0310+00 1/0 0/0 0/0 .text Create__Q212daObjMovebox5Act_cFv */ @@ -1178,7 +1216,7 @@ asm void daObjMovebox::Act_c::chk_appear() const { /* ############################################################################################## */ /* 80481680-80481684 000758 0004+00 1/1 0/0 0/0 .rodata @4514 */ SECTION_RODATA static f32 const lit_4514 = 3.0f / 5.0f; -COMPILER_STRIP_GATE(80481680, &lit_4514); +COMPILER_STRIP_GATE(0x80481680, &lit_4514); /* 80482B5C-80482B6C 0012DC 000C+04 0/1 0/0 0/0 .bss @4501 */ #pragma push @@ -1218,7 +1256,7 @@ asm void daObjMovebox::Act_c::mode_wait_init() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4562 = 32768.0f; -COMPILER_STRIP_GATE(80481684, &lit_4562); +COMPILER_STRIP_GATE(0x80481684, &lit_4562); #pragma pop /* 8047F6A8-8047F8D4 001CA8 022C+00 1/0 0/0 0/0 .text mode_wait__Q212daObjMovebox5Act_cFv @@ -1247,7 +1285,7 @@ asm void daObjMovebox::Act_c::mode_walk_init() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4681 = -1.0f; -COMPILER_STRIP_GATE(80481688, &lit_4681); +COMPILER_STRIP_GATE(0x80481688, &lit_4681); #pragma pop /* 80482B78-80482B88 0012F8 000C+04 0/1 0/0 0/0 .bss @4574 */ @@ -1490,19 +1528,19 @@ asm void daObjMovebox::Act_c::vib_land() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4774 = 2.0f; -COMPILER_STRIP_GATE(8048168C, &lit_4774); +COMPILER_STRIP_GATE(0x8048168C, &lit_4774); #pragma pop /* 80481690-80481694 000768 0004+00 0/0 0/0 0/0 .rodata @4775 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4775 = 75.0f; -COMPILER_STRIP_GATE(80481690, &lit_4775); +COMPILER_STRIP_GATE(0x80481690, &lit_4775); #pragma pop /* 80481694-80481698 00076C 0004+00 1/1 0/0 0/0 .rodata @4890 */ SECTION_RODATA static f32 const lit_4890 = 5.0f / 3.0f; -COMPILER_STRIP_GATE(80481694, &lit_4890); +COMPILER_STRIP_GATE(0x80481694, &lit_4890); /* 804801FC-8048027C 0027FC 0080+00 1/1 0/0 0/0 .text eff_land_smoke__Q212daObjMovebox5Act_cFv */ #pragma push @@ -1529,7 +1567,14 @@ SECTION_RODATA static u8 const particle_id[6 + 2 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80481698, &particle_id); +COMPILER_STRIP_GATE(0x80481698, &particle_id); +#pragma pop + +/* 804816A4-804816A4 00077C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_804816EA = "Always"; +SECTION_DEAD static char const* const stringBase_804816F1 = "BreakWoodBox.bmd"; #pragma pop /* 80482BDC-80482BEC 00135C 000C+04 0/0 0/0 0/0 .bss @4762 */ @@ -1733,7 +1778,7 @@ asm void daObjMovebox::Act_c::Execute(f32 (**param_0)[3][4]) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5051 = -2.0f / 5.0f; -COMPILER_STRIP_GATE(804816A0, &lit_5051); +COMPILER_STRIP_GATE(0x804816A0, &lit_5051); #pragma pop /* 80480728-804808B4 002D28 018C+00 1/0 0/0 0/0 .text Draw__Q212daObjMovebox5Act_cFv */ @@ -1882,7 +1927,8 @@ asm cCcD_GStts::~cCcD_GStts() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80480CD8(fopAc_ac_c const* param_0, daObjMovebox::Act_c::Prm_e param_1, +extern "C" asm void func_80480CD8(void* _this, fopAc_ac_c const* param_0, + daObjMovebox::Act_c::Prm_e param_1, daObjMovebox::Act_c::Prm_e param_2) { nofralloc #include "asm/rel/d/a/obj/d_a_obj_movebox/d_a_obj_movebox/func_80480CD8.s" @@ -1901,7 +1947,7 @@ asm void __sinit_d_a_obj_movebox_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80480CF4 = (void*)__sinit_d_a_obj_movebox_cpp; +REGISTER_CTORS(0x80480CF4, __sinit_d_a_obj_movebox_cpp); #pragma pop /* 80480DA0-80480DD8 0033A0 0038+00 1/1 0/0 0/0 .text __arraydtor$3671 */ @@ -2021,18 +2067,4 @@ static asm void func_80480F0C() { } #pragma pop -/* 804816A4-80481702 00077C 005E+00 2/1 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_804816A4 = "Kkiba_00"; -SECTION_DEAD static char const* const stringBase_804816AD = "Osiblk"; -SECTION_DEAD static char const* const stringBase_804816B4 = "H_Box20"; -SECTION_DEAD static char const* const stringBase_804816BC = "A_SMBlock"; -SECTION_DEAD static char const* const stringBase_804816C6 = "P_Lv4blk"; -SECTION_DEAD static char const* const stringBase_804816CF = "P_Lv4blk2"; -SECTION_DEAD static char const* const stringBase_804816D9 = "H_OsiHaka"; -SECTION_DEAD static char const* const stringBase_804816E3 = "dummy4"; -SECTION_DEAD static char const* const stringBase_804816EA = "Always"; -SECTION_DEAD static char const* const stringBase_804816F1 = "BreakWoodBox.bmd"; -#pragma pop +/* 804816A4-804816A4 00077C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_msima/d_a_obj_msima.cpp b/rel/d/a/obj/d_a_obj_msima/d_a_obj_msima.cpp index 652f227b54e..d75109b8cf9 100644 --- a/rel/d/a/obj/d_a_obj_msima/d_a_obj_msima.cpp +++ b/rel/d/a/obj/d_a_obj_msima/d_a_obj_msima.cpp @@ -92,10 +92,10 @@ struct dRes_control_c { struct dPa_levelEcallBack {}; -struct _GXColor {}; - struct csXyz {}; +struct _GXColor {}; + struct dPa_control_c { /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, @@ -272,11 +272,11 @@ extern "C" void __register_global_object(); /* ############################################################################################## */ /* 80C9CD4C-80C9CD50 000000 0004+00 9/9 0/0 0/0 .rodata @3863 */ SECTION_RODATA static f32 const lit_3863 = 1.0f; -COMPILER_STRIP_GATE(80C9CD4C, &lit_3863); +COMPILER_STRIP_GATE(0x80C9CD4C, &lit_3863); /* 80C9CD50-80C9CD54 000004 0004+00 1/1 0/0 0/0 .rodata @3864 */ SECTION_RODATA static f32 const lit_3864 = 800.0f; -COMPILER_STRIP_GATE(80C9CD50, &lit_3864); +COMPILER_STRIP_GATE(0x80C9CD50, &lit_3864); /* 80C9CDF8-80C9CE18 -00001 0020+00 1/0 0/0 0/0 .data l_daObj_Msima_Method */ SECTION_DATA static void* l_daObj_Msima_Method[8] = { @@ -360,42 +360,42 @@ static asm void msima_start(obj_msima_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4013 = 300.0f; -COMPILER_STRIP_GATE(80C9CD54, &lit_4013); +COMPILER_STRIP_GATE(0x80C9CD54, &lit_4013); #pragma pop /* 80C9CD58-80C9CD5C 00000C 0004+00 0/2 0/0 0/0 .rodata @4014 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4014 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(80C9CD58, &lit_4014); +COMPILER_STRIP_GATE(0x80C9CD58, &lit_4014); #pragma pop /* 80C9CD5C-80C9CD60 000010 0004+00 0/3 0/0 0/0 .rodata @4015 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4015 = 30.0f; -COMPILER_STRIP_GATE(80C9CD5C, &lit_4015); +COMPILER_STRIP_GATE(0x80C9CD5C, &lit_4015); #pragma pop /* 80C9CD60-80C9CD64 000014 0004+00 0/2 0/0 0/0 .rodata @4016 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4016 = 5.0f; -COMPILER_STRIP_GATE(80C9CD60, &lit_4016); +COMPILER_STRIP_GATE(0x80C9CD60, &lit_4016); #pragma pop /* 80C9CD64-80C9CD68 000018 0004+00 0/1 0/0 0/0 .rodata @4017 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4017 = -80.0f; -COMPILER_STRIP_GATE(80C9CD64, &lit_4017); +COMPILER_STRIP_GATE(0x80C9CD64, &lit_4017); #pragma pop /* 80C9CD68-80C9CD6C 00001C 0004+00 0/1 0/0 0/0 .rodata @4018 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4018 = 2000.0f; -COMPILER_STRIP_GATE(80C9CD68, &lit_4018); +COMPILER_STRIP_GATE(0x80C9CD68, &lit_4018); #pragma pop /* 80C9CD6C-80C9CD70 000020 0004+00 0/7 0/0 0/0 .rodata @4019 */ @@ -407,14 +407,14 @@ SECTION_RODATA static u8 const lit_4019[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C9CD6C, &lit_4019); +COMPILER_STRIP_GATE(0x80C9CD6C, &lit_4019); #pragma pop /* 80C9CD70-80C9CD74 000024 0004+00 0/1 0/0 0/0 .rodata @4020 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4020 = -1.0f; -COMPILER_STRIP_GATE(80C9CD70, &lit_4020); +COMPILER_STRIP_GATE(0x80C9CD70, &lit_4020); #pragma pop /* 80C9CE68-80C9CE6C 000008 0001+03 1/1 0/0 0/0 .bss @1109 */ @@ -552,28 +552,28 @@ asm cXyz::~cXyz() { #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4043 = 0x3B83126F; -COMPILER_STRIP_GATE(80C9CD74, &lit_4043); +COMPILER_STRIP_GATE(0x80C9CD74, &lit_4043); #pragma pop /* 80C9CD78-80C9CD7C 00002C 0004+00 0/1 0/0 0/0 .rodata @4044 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4044 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(80C9CD78, &lit_4044); +COMPILER_STRIP_GATE(0x80C9CD78, &lit_4044); #pragma pop /* 80C9CD7C-80C9CD80 000030 0004+00 0/2 0/0 0/0 .rodata @4045 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4045 = 20.0f; -COMPILER_STRIP_GATE(80C9CD7C, &lit_4045); +COMPILER_STRIP_GATE(0x80C9CD7C, &lit_4045); #pragma pop /* 80C9CD80-80C9CD84 000034 0004+00 0/1 0/0 0/0 .rodata @4046 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4046 = -20.0f; -COMPILER_STRIP_GATE(80C9CD80, &lit_4046); +COMPILER_STRIP_GATE(0x80C9CD80, &lit_4046); #pragma pop /* 80C9B8CC-80C9BA30 0005AC 0164+00 1/1 0/0 0/0 .text msima_float__FP15obj_msima_class */ @@ -591,42 +591,42 @@ static asm void msima_float(obj_msima_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4168 = -30.0f; -COMPILER_STRIP_GATE(80C9CD84, &lit_4168); +COMPILER_STRIP_GATE(0x80C9CD84, &lit_4168); #pragma pop /* 80C9CD88-80C9CD8C 00003C 0004+00 0/1 0/0 0/0 .rodata @4169 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4169 = 15.0f; -COMPILER_STRIP_GATE(80C9CD88, &lit_4169); +COMPILER_STRIP_GATE(0x80C9CD88, &lit_4169); #pragma pop /* 80C9CD8C-80C9CD90 000040 0004+00 0/1 0/0 0/0 .rodata @4170 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4170 = -50.0f; -COMPILER_STRIP_GATE(80C9CD8C, &lit_4170); +COMPILER_STRIP_GATE(0x80C9CD8C, &lit_4170); #pragma pop /* 80C9CD90-80C9CD94 000044 0004+00 0/1 0/0 0/0 .rodata @4171 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4171 = 0.5f; -COMPILER_STRIP_GATE(80C9CD90, &lit_4171); +COMPILER_STRIP_GATE(0x80C9CD90, &lit_4171); #pragma pop /* 80C9CD94-80C9CD98 000048 0004+00 0/1 0/0 0/0 .rodata @4172 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4172 = 400.0f; -COMPILER_STRIP_GATE(80C9CD94, &lit_4172); +COMPILER_STRIP_GATE(0x80C9CD94, &lit_4172); #pragma pop /* 80C9CD98-80C9CD9C 00004C 0004+00 0/1 0/0 0/0 .rodata @4173 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4173 = 1.5f; -COMPILER_STRIP_GATE(80C9CD98, &lit_4173); +COMPILER_STRIP_GATE(0x80C9CD98, &lit_4173); #pragma pop /* 80C9CD9C-80C9CDA4 000050 0004+04 0/1 0/0 0/0 .rodata @4174 */ @@ -637,7 +637,7 @@ SECTION_RODATA static f32 const lit_4174[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80C9CD9C, &lit_4174); +COMPILER_STRIP_GATE(0x80C9CD9C, &lit_4174); #pragma pop /* 80C9CDA4-80C9CDAC 000058 0008+00 0/2 0/0 0/0 .rodata @4177 */ @@ -646,7 +646,7 @@ COMPILER_STRIP_GATE(80C9CD9C, &lit_4174); SECTION_RODATA static u8 const lit_4177[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C9CDA4, &lit_4177); +COMPILER_STRIP_GATE(0x80C9CDA4, &lit_4177); #pragma pop /* 80C9BA30-80C9BEB0 000710 0480+00 1/1 0/0 0/0 .text action__FP15obj_msima_class */ @@ -664,21 +664,21 @@ static asm void action(obj_msima_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4214 = 3000.0f; -COMPILER_STRIP_GATE(80C9CDAC, &lit_4214); +COMPILER_STRIP_GATE(0x80C9CDAC, &lit_4214); #pragma pop /* 80C9CDB0-80C9CDB4 000064 0004+00 0/2 0/0 0/0 .rodata @4215 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4215 = 59.0f / 20.0f; -COMPILER_STRIP_GATE(80C9CDB0, &lit_4215); +COMPILER_STRIP_GATE(0x80C9CDB0, &lit_4215); #pragma pop /* 80C9CDB4-80C9CDB8 000068 0004+00 0/1 0/0 0/0 .rodata @4216 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4216 = 55.0f; -COMPILER_STRIP_GATE(80C9CDB4, &lit_4216); +COMPILER_STRIP_GATE(0x80C9CDB4, &lit_4216); #pragma pop /* 80C9CEE0-80C9CEEC 000080 000C+00 0/1 0/0 0/0 .bss @4179 */ @@ -724,35 +724,35 @@ static asm void chain_move(obj_msima_class* param_0, ms_chain_s* param_1, int pa #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4265 = 250.0f; -COMPILER_STRIP_GATE(80C9CDB8, &lit_4265); +COMPILER_STRIP_GATE(0x80C9CDB8, &lit_4265); #pragma pop /* 80C9CDBC-80C9CDC0 000070 0004+00 0/1 0/0 0/0 .rodata @4266 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4266 = 4.0f / 5.0f; -COMPILER_STRIP_GATE(80C9CDBC, &lit_4266); +COMPILER_STRIP_GATE(0x80C9CDBC, &lit_4266); #pragma pop /* 80C9CDC0-80C9CDC4 000074 0004+00 0/1 0/0 0/0 .rodata @4267 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4267 = 3.0f / 10.0f; -COMPILER_STRIP_GATE(80C9CDC0, &lit_4267); +COMPILER_STRIP_GATE(0x80C9CDC0, &lit_4267); #pragma pop /* 80C9CDC4-80C9CDC8 000078 0004+00 0/1 0/0 0/0 .rodata @4268 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4268 = -55.0f; -COMPILER_STRIP_GATE(80C9CDC4, &lit_4268); +COMPILER_STRIP_GATE(0x80C9CDC4, &lit_4268); #pragma pop /* 80C9CDC8-80C9CDCC 00007C 0004+00 0/1 0/0 0/0 .rodata @4269 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4269 = 3.0f / 100.0f; -COMPILER_STRIP_GATE(80C9CDC8, &lit_4269); +COMPILER_STRIP_GATE(0x80C9CDC8, &lit_4269); #pragma pop /* 80C9CF40-80C9CF4C 0000E0 000C+00 0/1 0/0 0/0 .bss @4218 */ @@ -808,6 +808,13 @@ static bool daObj_Msima_IsDelete(obj_msima_class* param_0) { return true; } +/* ############################################################################################## */ +/* 80C9CDEC-80C9CDEC 0000A0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80C9CDEC = "MAGNESIMA"; +#pragma pop + /* 80C9C3B0-80C9C42C 001090 007C+00 1/0 0/0 0/0 .text daObj_Msima_Delete__FP15obj_msima_class */ #pragma push #pragma optimization_level 0 @@ -821,7 +828,7 @@ static asm void daObj_Msima_Delete(obj_msima_class* param_0) { /* ############################################################################################## */ /* 80C9CDCC-80C9CDD0 000080 0004+00 1/2 0/0 0/0 .rodata @4412 */ SECTION_RODATA static f32 const lit_4412 = 65536.0f; -COMPILER_STRIP_GATE(80C9CDCC, &lit_4412); +COMPILER_STRIP_GATE(0x80C9CDCC, &lit_4412); /* 80C9C42C-80C9C720 00110C 02F4+00 1/1 0/0 0/0 .text useHeapInit__FP10fopAc_ac_c */ #pragma push @@ -848,21 +855,21 @@ asm J3DFrameCtrl::~J3DFrameCtrl() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4524 = 1150.0f; -COMPILER_STRIP_GATE(80C9CDD0, &lit_4524); +COMPILER_STRIP_GATE(0x80C9CDD0, &lit_4524); #pragma pop /* 80C9CDD4-80C9CDD8 000088 0004+00 0/1 0/0 0/0 .rodata @4525 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4525 = 801.0f; -COMPILER_STRIP_GATE(80C9CDD4, &lit_4525); +COMPILER_STRIP_GATE(0x80C9CDD4, &lit_4525); #pragma pop /* 80C9CDD8-80C9CDDC 00008C 0004+00 0/1 0/0 0/0 .rodata @4526 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4526 = 1900.0f; -COMPILER_STRIP_GATE(80C9CDD8, &lit_4526); +COMPILER_STRIP_GATE(0x80C9CDD8, &lit_4526); #pragma pop /* 80C9C768-80C9CA60 001448 02F8+00 1/0 0/0 0/0 .text daObj_Msima_Create__FP10fopAc_ac_c @@ -906,28 +913,28 @@ asm daObj_Msima_HIO_c::~daObj_Msima_HIO_c() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4602 = 200.0f; -COMPILER_STRIP_GATE(80C9CDDC, &lit_4602); +COMPILER_STRIP_GATE(0x80C9CDDC, &lit_4602); #pragma pop /* 80C9CDE0-80C9CDE4 000094 0004+00 0/1 0/0 0/0 .rodata @4603 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4603 = 1100.0f; -COMPILER_STRIP_GATE(80C9CDE0, &lit_4603); +COMPILER_STRIP_GATE(0x80C9CDE0, &lit_4603); #pragma pop /* 80C9CDE4-80C9CDE8 000098 0004+00 0/1 0/0 0/0 .rodata @4604 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4604 = -1100.0f; -COMPILER_STRIP_GATE(80C9CDE4, &lit_4604); +COMPILER_STRIP_GATE(0x80C9CDE4, &lit_4604); #pragma pop /* 80C9CDE8-80C9CDEC 00009C 0004+00 0/1 0/0 0/0 .rodata @4605 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4605 = 4000.0f; -COMPILER_STRIP_GATE(80C9CDE8, &lit_4605); +COMPILER_STRIP_GATE(0x80C9CDE8, &lit_4605); #pragma pop /* 80C9CAE8-80C9CD38 0017C8 0250+00 0/0 1/0 0/0 .text __sinit_d_a_obj_msima_cpp */ @@ -942,7 +949,7 @@ asm void __sinit_d_a_obj_msima_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80C9CAE8 = (void*)__sinit_d_a_obj_msima_cpp; +REGISTER_CTORS(0x80C9CAE8, __sinit_d_a_obj_msima_cpp); #pragma pop /* ############################################################################################## */ @@ -1117,9 +1124,4 @@ static u8 data_80C9CFFC[4]; static u8 data_80C9D000[4]; #pragma pop -/* 80C9CDEC-80C9CDF6 0000A0 000A+00 3/3 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80C9CDEC = "MAGNESIMA"; -#pragma pop +/* 80C9CDEC-80C9CDEC 0000A0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_mvstair/d_a_obj_mvstair.cpp b/rel/d/a/obj/d_a_obj_mvstair/d_a_obj_mvstair.cpp index 4e5a6d2e386..d8c4e337aa0 100644 --- a/rel/d/a/obj/d_a_obj_mvstair/d_a_obj_mvstair.cpp +++ b/rel/d/a/obj/d_a_obj_mvstair/d_a_obj_mvstair.cpp @@ -87,10 +87,10 @@ struct dPa_followEcallBack { /* 80C9E78C */ void __defctor(); }; -struct _GXColor {}; - struct csXyz {}; +struct _GXColor {}; + struct dPa_control_c { /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, @@ -123,10 +123,10 @@ struct dBgS_MoveBgActor { /* 80078950 */ void MoveBGExecute(); }; -struct Vec {}; - struct JAISoundID {}; +struct Vec {}; + struct Z2SeMgr { /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); /* 802AC50C */ void seStartLevel(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); @@ -283,30 +283,30 @@ asm void daObjStair_c::setBaseMtx() { SECTION_RODATA static u8 const l_bmdName[8] = { 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x04, }; -COMPILER_STRIP_GATE(80C9E8AC, &l_bmdName); +COMPILER_STRIP_GATE(0x80C9E8AC, &l_bmdName); /* 80C9E8B4-80C9E8BC 000008 0008+00 1/1 0/0 0/0 .rodata l_dzbName */ SECTION_RODATA static u8 const l_dzbName[8] = { 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x07, }; -COMPILER_STRIP_GATE(80C9E8B4, &l_dzbName); +COMPILER_STRIP_GATE(0x80C9E8B4, &l_dzbName); /* 80C9E8BC-80C9E8D4 000010 0018+00 1/2 0/0 0/0 .rodata l_move_len */ SECTION_RODATA static u8 const l_move_len[24] = { 0x43, 0x16, 0x00, 0x00, 0x43, 0x96, 0x00, 0x00, 0x43, 0xE1, 0x00, 0x00, 0x44, 0x16, 0x00, 0x00, 0x43, 0xFA, 0x00, 0x00, 0x44, 0x09, 0x80, 0x00, }; -COMPILER_STRIP_GATE(80C9E8BC, &l_move_len); +COMPILER_STRIP_GATE(0x80C9E8BC, &l_move_len); /* 80C9E8D4-80C9E8DC 000028 0008+00 1/1 0/0 0/0 .rodata l_heap_size */ SECTION_RODATA static u8 const l_heap_size[8] = { 0x00, 0x00, 0x0B, 0x40, 0x00, 0x00, 0x2C, 0x60, }; -COMPILER_STRIP_GATE(80C9E8D4, &l_heap_size); +COMPILER_STRIP_GATE(0x80C9E8D4, &l_heap_size); /* 80C9E8DC-80C9E8E0 000030 0004+00 1/3 0/0 0/0 .rodata @3709 */ SECTION_RODATA static f32 const lit_3709 = 600.0f; -COMPILER_STRIP_GATE(80C9E8DC, &lit_3709); +COMPILER_STRIP_GATE(0x80C9E8DC, &lit_3709); /* 80C9D148-80C9D2B8 000128 0170+00 1/0 0/0 0/0 .text Create__12daObjStair_cFv */ #pragma push @@ -319,6 +319,13 @@ asm void daObjStair_c::Create() { #pragma pop /* ############################################################################################## */ +/* 80C9E90C-80C9E90C 000060 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80C9E90C = "K_mvkai00"; +SECTION_DEAD static char const* const stringBase_80C9E916 = "Lv9_mvkai"; +#pragma pop + /* 80C9E920-80C9E92C 000000 000C+00 2/2 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -494,34 +501,34 @@ SECTION_RODATA static u8 const lit_3802[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C9E8E0, &lit_3802); +COMPILER_STRIP_GATE(0x80C9E8E0, &lit_3802); /* 80C9E8E4-80C9E8E8 000038 0004+00 0/1 0/0 0/0 .rodata @3803 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3803 = -140.0f; -COMPILER_STRIP_GATE(80C9E8E4, &lit_3803); +COMPILER_STRIP_GATE(0x80C9E8E4, &lit_3803); #pragma pop /* 80C9E8E8-80C9E8EC 00003C 0004+00 0/1 0/0 0/0 .rodata @3804 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3804 = 140.0f; -COMPILER_STRIP_GATE(80C9E8E8, &lit_3804); +COMPILER_STRIP_GATE(0x80C9E8E8, &lit_3804); #pragma pop /* 80C9E8EC-80C9E8F0 000040 0004+00 0/1 0/0 0/0 .rodata @3805 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3805 = -450.0f; -COMPILER_STRIP_GATE(80C9E8EC, &lit_3805); +COMPILER_STRIP_GATE(0x80C9E8EC, &lit_3805); #pragma pop /* 80C9E8F0-80C9E8F4 000044 0004+00 0/1 0/0 0/0 .rodata @3806 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3806 = 450.0f; -COMPILER_STRIP_GATE(80C9E8F0, &lit_3806); +COMPILER_STRIP_GATE(0x80C9E8F0, &lit_3806); #pragma pop /* 80C9D594-80C9D710 000574 017C+00 1/0 0/0 0/0 .text Execute__12daObjStair_cFPPA3_A4_f @@ -615,7 +622,7 @@ asm void daObjStair_c::modeWaitUpper() { /* ############################################################################################## */ /* 80C9E8F4-80C9E8F8 000048 0004+00 1/2 0/0 0/0 .rodata @3946 */ SECTION_RODATA static f32 const lit_3946 = 3.0f; -COMPILER_STRIP_GATE(80C9E8F4, &lit_3946); +COMPILER_STRIP_GATE(0x80C9E8F4, &lit_3946); /* 80C9DA98-80C9DADC 000A78 0044+00 1/1 0/0 0/0 .text modeUpperInit__12daObjStair_cFv */ #pragma push @@ -630,34 +637,34 @@ asm void daObjStair_c::modeUpperInit() { /* ############################################################################################## */ /* 80C9E8F8-80C9E8FC 00004C 0004+00 1/3 0/0 0/0 .rodata @4061 */ SECTION_RODATA static f32 const lit_4061 = 1.0f; -COMPILER_STRIP_GATE(80C9E8F8, &lit_4061); +COMPILER_STRIP_GATE(0x80C9E8F8, &lit_4061); /* 80C9E8FC-80C9E900 000050 0004+00 0/2 0/0 0/0 .rodata @4062 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4062 = -1.0f; -COMPILER_STRIP_GATE(80C9E8FC, &lit_4062); +COMPILER_STRIP_GATE(0x80C9E8FC, &lit_4062); #pragma pop /* 80C9E900-80C9E904 000054 0004+00 0/2 0/0 0/0 .rodata @4063 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4063 = 9.0f / 20.0f; -COMPILER_STRIP_GATE(80C9E900, &lit_4063); +COMPILER_STRIP_GATE(0x80C9E900, &lit_4063); #pragma pop /* 80C9E904-80C9E908 000058 0004+00 0/2 0/0 0/0 .rodata @4064 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4064 = 0.5f; -COMPILER_STRIP_GATE(80C9E904, &lit_4064); +COMPILER_STRIP_GATE(0x80C9E904, &lit_4064); #pragma pop /* 80C9E908-80C9E90C 00005C 0004+00 0/2 0/0 0/0 .rodata @4065 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4065 = 50.0f; -COMPILER_STRIP_GATE(80C9E908, &lit_4065); +COMPILER_STRIP_GATE(0x80C9E908, &lit_4065); #pragma pop /* 80C9DADC-80C9DEDC 000ABC 0400+00 1/0 0/0 0/0 .text modeUpper__12daObjStair_cFv */ @@ -897,10 +904,4 @@ void JPAEmitterCallBack::drawAfter(JPABaseEmitter* param_0) { /* empty function */ } -/* 80C9E90C-80C9E920 000060 0014+00 1/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80C9E90C = "K_mvkai00"; -SECTION_DEAD static char const* const stringBase_80C9E916 = "Lv9_mvkai"; -#pragma pop +/* 80C9E90C-80C9E90C 000060 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_myogan/d_a_obj_myogan.cpp b/rel/d/a/obj/d_a_obj_myogan/d_a_obj_myogan.cpp index 72c463e8652..72cec5080f8 100644 --- a/rel/d/a/obj/d_a_obj_myogan/d_a_obj_myogan.cpp +++ b/rel/d/a/obj/d_a_obj_myogan/d_a_obj_myogan.cpp @@ -170,7 +170,7 @@ extern "C" void __register_global_object(); /* ############################################################################################## */ /* 80C9F288-80C9F28C 000000 0004+00 2/2 0/0 0/0 .rodata @3762 */ SECTION_RODATA static f32 const lit_3762 = 1.0f; -COMPILER_STRIP_GATE(80C9F288, &lit_3762); +COMPILER_STRIP_GATE(0x80C9F288, &lit_3762); /* 80C9F28C-80C9F290 000004 0004+00 1/1 0/0 0/0 .rodata @3763 */ SECTION_RODATA static u8 const lit_3763[4] = { @@ -179,7 +179,7 @@ SECTION_RODATA static u8 const lit_3763[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C9F28C, &lit_3763); +COMPILER_STRIP_GATE(0x80C9F28C, &lit_3763); /* 80C9F2A8-80C9F2C8 -00001 0020+00 1/0 0/0 0/0 .data l_daObj_Myogan_Method */ SECTION_DATA static void* l_daObj_Myogan_Method[8] = { @@ -240,11 +240,11 @@ static asm void daObj_Myogan_Draw(obj_myogan_class* param_0) { /* ############################################################################################## */ /* 80C9F290-80C9F294 000008 0004+00 1/1 0/0 0/0 .rodata @3823 */ SECTION_RODATA static f32 const lit_3823 = 1.0f / 20.0f; -COMPILER_STRIP_GATE(80C9F290, &lit_3823); +COMPILER_STRIP_GATE(0x80C9F290, &lit_3823); /* 80C9F294-80C9F298 00000C 0004+00 1/1 0/0 0/0 .rodata @3824 */ SECTION_RODATA static f32 const lit_3824 = 10.0f; -COMPILER_STRIP_GATE(80C9F294, &lit_3824); +COMPILER_STRIP_GATE(0x80C9F294, &lit_3824); /* 80C9F318-80C9F31C 000008 0004+00 2/2 0/0 0/0 .bss None */ static u8 data_80C9F318[4]; @@ -282,6 +282,13 @@ static bool daObj_Myogan_IsDelete(obj_myogan_class* param_0) { return true; } +/* ############################################################################################## */ +/* 80C9F2A0-80C9F2A0 000018 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80C9F2A0 = "S_YOGAN"; +#pragma pop + /* 80C9EDC0-80C9EE28 000300 0068+00 1/0 0/0 0/0 .text daObj_Myogan_Delete__FP16obj_myogan_class */ #pragma push #pragma optimization_level 0 @@ -315,11 +322,11 @@ asm J3DFrameCtrl::~J3DFrameCtrl() { /* ############################################################################################## */ /* 80C9F298-80C9F29C 000010 0004+00 1/1 0/0 0/0 .rodata @3966 */ SECTION_RODATA static f32 const lit_3966 = 65536.0f; -COMPILER_STRIP_GATE(80C9F298, &lit_3966); +COMPILER_STRIP_GATE(0x80C9F298, &lit_3966); /* 80C9F29C-80C9F2A0 000014 0004+00 1/1 0/0 0/0 .rodata @3967 */ SECTION_RODATA static f32 const lit_3967 = 1150.0f; -COMPILER_STRIP_GATE(80C9F29C, &lit_3967); +COMPILER_STRIP_GATE(0x80C9F29C, &lit_3967); /* 80C9F0AC-80C9F1F0 0005EC 0144+00 1/0 0/0 0/0 .text daObj_Myogan_Create__FP10fopAc_ac_c */ @@ -354,12 +361,7 @@ asm void __sinit_d_a_obj_myogan_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80C9F238 = (void*)__sinit_d_a_obj_myogan_cpp; +REGISTER_CTORS(0x80C9F238, __sinit_d_a_obj_myogan_cpp); #pragma pop -/* 80C9F2A0-80C9F2A8 000018 0008+00 3/3 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80C9F2A0 = "S_YOGAN"; -#pragma pop +/* 80C9F2A0-80C9F2A0 000018 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_nagaisu/d_a_obj_nagaisu.cpp b/rel/d/a/obj/d_a_obj_nagaisu/d_a_obj_nagaisu.cpp index 9a8c1b64496..27ebc4eb2e7 100644 --- a/rel/d/a/obj/d_a_obj_nagaisu/d_a_obj_nagaisu.cpp +++ b/rel/d/a/obj/d_a_obj_nagaisu/d_a_obj_nagaisu.cpp @@ -36,16 +36,16 @@ struct daObjNagaisu_c { static u8 const REMOVE_ISU_IDX[28]; }; -struct dCcD_Stts { - /* 80083860 */ void Init(int, int, fopAc_ac_c*); -}; - struct dMdl_obj_c {}; struct dMdl_c { /* 8009C668 */ void entryObj(dMdl_obj_c*); }; +struct dCcD_Stts { + /* 80083860 */ void Init(int, int, fopAc_ac_c*); +}; + struct daObjIsuChild_c { /* 80C9FA90 */ daObjIsuChild_c(); /* 80C9FCDC */ ~daObjIsuChild_c(); @@ -79,12 +79,12 @@ struct dRes_control_c { struct dPa_levelEcallBack {}; -struct _GXColor {}; - struct csXyz { /* 802673F4 */ csXyz(s16, s16, s16); }; +struct _GXColor {}; + struct dPa_control_c { /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, @@ -159,10 +159,10 @@ struct cBgS { /* 80074250 */ void Release(dBgW_Base*); }; -struct Vec {}; - struct JAISoundID {}; +struct Vec {}; + struct Z2SeMgr { /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); }; @@ -285,6 +285,12 @@ static asm void daObjNagaisu_c_createHeap(fopAc_ac_c* param_0) { #pragma pop /* ############################################################################################## */ +/* 80CA0400-80CA0400 0000A4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80CA0400 = "Nagaisu"; +#pragma pop + /* 80CA0408-80CA040C -00001 0004+00 4/4 0/0 0/0 .data l_arcName */ SECTION_DATA static void* l_arcName = (void*)&d_a_obj_nagaisu__stringBase0; @@ -399,7 +405,7 @@ SECTION_RODATA u8 const daObjNagaisu_c::REMOVE_ISU_IDX[28] = { 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x0B, 0x00, 0x00, 0x00, 0x0E, 0x00, 0x00, 0x00, 0x12, 0x00, 0x00, 0x00, 0x15, 0x00, 0x00, 0x00, 0x1D, }; -COMPILER_STRIP_GATE(80CA035C, &daObjNagaisu_c::REMOVE_ISU_IDX); +COMPILER_STRIP_GATE(0x80CA035C, &daObjNagaisu_c::REMOVE_ISU_IDX); /* 80CA0378-80CA03BC 00001C 0044+00 0/1 0/0 0/0 .rodata s_CcDCyl__15daObjIsuChild_c */ #pragma push @@ -411,12 +417,12 @@ SECTION_RODATA u8 const daObjIsuChild_c::s_CcDCyl[68] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CA0378, &daObjIsuChild_c::s_CcDCyl); +COMPILER_STRIP_GATE(0x80CA0378, &daObjIsuChild_c::s_CcDCyl); #pragma pop /* 80CA03BC-80CA03C0 000060 0004+00 1/1 0/0 0/0 .rodata @3731 */ SECTION_RODATA static f32 const lit_3731 = 3300.0f; -COMPILER_STRIP_GATE(80CA03BC, &lit_3731); +COMPILER_STRIP_GATE(0x80CA03BC, &lit_3731); /* 80C9F668-80C9F7A8 000328 0140+00 1/1 0/0 0/0 .text create__14daObjNagaisu_cFv */ #pragma push @@ -473,28 +479,28 @@ asm void daObjNagaisu_c::init() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3820 = 600.0f; -COMPILER_STRIP_GATE(80CA03C0, &lit_3820); +COMPILER_STRIP_GATE(0x80CA03C0, &lit_3820); #pragma pop /* 80CA03C4-80CA03C8 000068 0004+00 0/1 0/0 0/0 .rodata @3821 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3821 = 300.0f; -COMPILER_STRIP_GATE(80CA03C4, &lit_3821); +COMPILER_STRIP_GATE(0x80CA03C4, &lit_3821); #pragma pop /* 80CA03C8-80CA03CC 00006C 0004+00 0/1 0/0 0/0 .rodata @3822 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3822 = 790.0f; -COMPILER_STRIP_GATE(80CA03C8, &lit_3822); +COMPILER_STRIP_GATE(0x80CA03C8, &lit_3822); #pragma pop /* 80CA03CC-80CA03D0 000070 0004+00 0/1 0/0 0/0 .rodata @3823 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3823 = 280.0f; -COMPILER_STRIP_GATE(80CA03CC, &lit_3823); +COMPILER_STRIP_GATE(0x80CA03CC, &lit_3823); #pragma pop /* 80C9F944-80C9FA90 000604 014C+00 1/1 0/0 0/0 .text setIsu__14daObjNagaisu_cFv */ @@ -584,28 +590,28 @@ asm void daObjIsuChild_c::createHeap() { SECTION_RODATA static u8 const COL_OFFSET_X[8] = { 0x00, 0x00, 0x00, 0x3C, 0xFF, 0xFF, 0xFF, 0xC4, }; -COMPILER_STRIP_GATE(80CA03D0, &COL_OFFSET_X); +COMPILER_STRIP_GATE(0x80CA03D0, &COL_OFFSET_X); #pragma pop /* 80CA03D8-80CA03DC 00007C 0004+00 0/1 0/0 0/0 .rodata @3940 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3940 = -50.0f; -COMPILER_STRIP_GATE(80CA03D8, &lit_3940); +COMPILER_STRIP_GATE(0x80CA03D8, &lit_3940); #pragma pop /* 80CA03DC-80CA03E0 000080 0004+00 0/1 0/0 0/0 .rodata @3941 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3941 = 180.0f; -COMPILER_STRIP_GATE(80CA03DC, &lit_3941); +COMPILER_STRIP_GATE(0x80CA03DC, &lit_3941); #pragma pop /* 80CA03E0-80CA03E4 000084 0004+00 0/1 0/0 0/0 .rodata @3942 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3942 = 65.0f; -COMPILER_STRIP_GATE(80CA03E0, &lit_3942); +COMPILER_STRIP_GATE(0x80CA03E0, &lit_3942); #pragma pop /* 80CA03E4-80CA03EC 000088 0008+00 0/1 0/0 0/0 .rodata @3944 */ @@ -614,7 +620,7 @@ COMPILER_STRIP_GATE(80CA03E0, &lit_3942); SECTION_RODATA static u8 const lit_3944[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CA03E4, &lit_3944); +COMPILER_STRIP_GATE(0x80CA03E4, &lit_3944); #pragma pop /* 80C9FE28-80C9FF54 000AE8 012C+00 1/1 0/0 0/0 .text @@ -631,11 +637,11 @@ asm void daObjIsuChild_c::create(daObjNagaisu_c* param_0, dCcD_Stts* param_1) { /* ############################################################################################## */ /* 80CA03EC-80CA03F0 000090 0004+00 1/2 0/0 0/0 .rodata @3963 */ SECTION_RODATA static f32 const lit_3963 = 1.0f; -COMPILER_STRIP_GATE(80CA03EC, &lit_3963); +COMPILER_STRIP_GATE(0x80CA03EC, &lit_3963); /* 80CA03F0-80CA03F4 000094 0004+00 1/1 0/0 0/0 .rodata @3964 */ SECTION_RODATA static f32 const lit_3964 = -1.0f; -COMPILER_STRIP_GATE(80CA03F0, &lit_3964); +COMPILER_STRIP_GATE(0x80CA03F0, &lit_3964); /* 80C9FF54-80CA0034 000C14 00E0+00 1/1 0/0 0/0 .text execute__15daObjIsuChild_cFv */ #pragma push @@ -684,14 +690,14 @@ asm void daObjIsuChild_c::chkHit() { SECTION_RODATA static u8 const PARTICLE_NAME[8] = { 0x8A, 0xE7, 0x8A, 0xE8, 0x8A, 0xE9, 0x8A, 0xEA, }; -COMPILER_STRIP_GATE(80CA03F4, &PARTICLE_NAME); +COMPILER_STRIP_GATE(0x80CA03F4, &PARTICLE_NAME); #pragma pop /* 80CA03FC-80CA0400 0000A0 0004+00 0/1 0/0 0/0 .rodata @4029 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4029 = 1.25f; -COMPILER_STRIP_GATE(80CA03FC, &lit_4029); +COMPILER_STRIP_GATE(0x80CA03FC, &lit_4029); #pragma pop /* 80CA0180-80CA0258 000E40 00D8+00 1/1 0/0 0/0 .text callEmt__15daObjIsuChild_cFv */ @@ -754,9 +760,4 @@ asm cCcD_GStts::~cCcD_GStts() { } #pragma pop -/* 80CA0400-80CA0408 0000A4 0008+00 1/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80CA0400 = "Nagaisu"; -#pragma pop +/* 80CA0400-80CA0400 0000A4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_nameplate/d_a_obj_nameplate.cpp b/rel/d/a/obj/d_a_obj_nameplate/d_a_obj_nameplate.cpp index 6764dedf48c..c2589e84642 100644 --- a/rel/d/a/obj/d_a_obj_nameplate/d_a_obj_nameplate.cpp +++ b/rel/d/a/obj/d_a_obj_nameplate/d_a_obj_nameplate.cpp @@ -212,62 +212,62 @@ SECTION_RODATA u8 const daObjNameplate_c::M_attr[32] = { 0x42, 0x48, 0x00, 0x00, 0x45, 0x1C, 0x40, 0x00, 0x43, 0xC8, 0x00, 0x00, 0x40, 0xC0, 0x00, 0x00, 0xBC, 0xA3, 0xD7, 0x0A, 0x3F, 0x73, 0x33, 0x33, 0x00, 0xAA, 0x07, 0xD0, 0x00, 0x0A, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80594E74, &daObjNameplate_c::M_attr); +COMPILER_STRIP_GATE(0x80594E74, &daObjNameplate_c::M_attr); /* 80594E94-80594E98 000020 0004+00 0/1 0/0 0/0 .rodata @3659 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3659 = -75.0f; -COMPILER_STRIP_GATE(80594E94, &lit_3659); +COMPILER_STRIP_GATE(0x80594E94, &lit_3659); #pragma pop /* 80594E98-80594E9C 000024 0004+00 0/1 0/0 0/0 .rodata @3660 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3660 = -180.0f; -COMPILER_STRIP_GATE(80594E98, &lit_3660); +COMPILER_STRIP_GATE(0x80594E98, &lit_3660); #pragma pop /* 80594E9C-80594EA0 000028 0004+00 0/1 0/0 0/0 .rodata @3661 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3661 = -25.0f; -COMPILER_STRIP_GATE(80594E9C, &lit_3661); +COMPILER_STRIP_GATE(0x80594E9C, &lit_3661); #pragma pop /* 80594EA0-80594EA4 00002C 0004+00 0/1 0/0 0/0 .rodata @3662 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3662 = 75.0f; -COMPILER_STRIP_GATE(80594EA0, &lit_3662); +COMPILER_STRIP_GATE(0x80594EA0, &lit_3662); #pragma pop /* 80594EA4-80594EA8 000030 0004+00 0/1 0/0 0/0 .rodata @3663 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3663 = 20.0f; -COMPILER_STRIP_GATE(80594EA4, &lit_3663); +COMPILER_STRIP_GATE(0x80594EA4, &lit_3663); #pragma pop /* 80594EA8-80594EAC 000034 0004+00 0/1 0/0 0/0 .rodata @3664 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3664 = 25.0f; -COMPILER_STRIP_GATE(80594EA8, &lit_3664); +COMPILER_STRIP_GATE(0x80594EA8, &lit_3664); #pragma pop /* 80594EAC-80594EB0 000038 0004+00 0/1 0/0 0/0 .rodata @3665 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3665 = -105.0f; -COMPILER_STRIP_GATE(80594EAC, &lit_3665); +COMPILER_STRIP_GATE(0x80594EAC, &lit_3665); #pragma pop /* 80594EB0-80594EB4 00003C 0004+00 0/1 0/0 0/0 .rodata @3666 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3666 = 120.0f; -COMPILER_STRIP_GATE(80594EB0, &lit_3666); +COMPILER_STRIP_GATE(0x80594EB0, &lit_3666); #pragma pop /* 80594098-8059415C 000078 00C4+00 1/1 0/0 0/0 .text create_init__16daObjNameplate_cFv @@ -310,7 +310,7 @@ SECTION_RODATA static u8 const ccSphSrc[64] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC2, 0xE6, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0x48, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80594EB4, &ccSphSrc); +COMPILER_STRIP_GATE(0x80594EB4, &ccSphSrc); /* 80594248-805942B8 000228 0070+00 1/1 0/0 0/0 .text initCcSphere__16daObjNameplate_cFv */ @@ -331,11 +331,11 @@ SECTION_RODATA static u8 const lit_3718[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80594EF4, &lit_3718); +COMPILER_STRIP_GATE(0x80594EF4, &lit_3718); /* 80594EF8-80594EFC 000084 0004+00 1/1 0/0 0/0 .rodata @3719 */ SECTION_RODATA static f32 const lit_3719 = -115.0f; -COMPILER_STRIP_GATE(80594EF8, &lit_3719); +COMPILER_STRIP_GATE(0x80594EF8, &lit_3719); /* 805942B8-8059434C 000298 0094+00 1/1 0/0 0/0 .text setCcSphere__16daObjNameplate_cFv */ @@ -357,7 +357,7 @@ SECTION_RODATA static f32 const lit_3769[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80594EFC, &lit_3769); +COMPILER_STRIP_GATE(0x80594EFC, &lit_3769); #pragma pop /* 8059434C-805945CC 00032C 0280+00 1/1 0/0 0/0 .text calcAngle__16daObjNameplate_cFv */ @@ -375,7 +375,7 @@ asm void daObjNameplate_c::calcAngle() { SECTION_RODATA static u8 const lit_3791[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80594F04, &lit_3791); +COMPILER_STRIP_GATE(0x80594F04, &lit_3791); /* 805945CC-80594754 0005AC 0188+00 1/1 0/0 0/0 .text calcSpring__16daObjNameplate_cFv */ #pragma push @@ -410,6 +410,13 @@ asm void daObjNameplate_c::messageProc() { #pragma pop /* ############################################################################################## */ +/* 80594F0C-80594F0C 000098 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80594F0C = "J_Hyosatu"; +SECTION_DEAD static char const* const stringBase_80594F16 = "J_Hyousatu.bmd"; +#pragma pop + /* 80594F28-80594F2C -00001 0004+00 3/3 0/0 0/0 .data l_arcName */ SECTION_DATA static void* l_arcName = (void*)&d_a_obj_nameplate__stringBase0; @@ -562,10 +569,4 @@ asm cCcD_GStts::~cCcD_GStts() { } #pragma pop -/* 80594F0C-80594F25 000098 0019+00 2/1 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80594F0C = "J_Hyosatu"; -SECTION_DEAD static char const* const stringBase_80594F16 = "J_Hyousatu.bmd"; -#pragma pop +/* 80594F0C-80594F0C 000098 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_nan/d_a_obj_nan.cpp b/rel/d/a/obj/d_a_obj_nan/d_a_obj_nan.cpp index 583369756b5..3d7a0c265db 100644 --- a/rel/d/a/obj/d_a_obj_nan/d_a_obj_nan.cpp +++ b/rel/d/a/obj/d_a_obj_nan/d_a_obj_nan.cpp @@ -49,19 +49,19 @@ struct mDoExt_baseAnm { /* 8000D428 */ void play(); }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; +struct J3DAnmTransform {}; + +struct J3DModelData {}; + struct Z2Creature { /* 802C03C8 */ Z2Creature(); /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -393,7 +393,7 @@ extern "C" void __register_global_object(); /* ############################################################################################## */ /* 80CA31BC-80CA31C0 000000 0004+00 12/12 0/0 0/0 .rodata @3774 */ SECTION_RODATA static f32 const lit_3774 = 6.0f / 5.0f; -COMPILER_STRIP_GATE(80CA31BC, &lit_3774); +COMPILER_STRIP_GATE(0x80CA31BC, &lit_3774); /* 80CA32B0-80CA32BC 000000 000C+00 2/2 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { @@ -654,7 +654,7 @@ asm daObj_NanHIO_c::daObj_NanHIO_c() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daObjNAN_c::setAction(void (daObjNAN_c::*)()) { +asm void daObjNAN_c::setAction(void (daObjNAN_c::*param_0)()) { nofralloc #include "asm/rel/d/a/obj/d_a_obj_nan/d_a_obj_nan/setAction__10daObjNAN_cFM10daObjNAN_cFPCvPv_v.s" } @@ -667,7 +667,7 @@ asm void daObjNAN_c::setAction(void (daObjNAN_c::*)()) { SECTION_RODATA static u8 const l_nan_brk_index[8] = { 0x00, 0x00, 0x00, 0x0D, 0x00, 0x00, 0x00, 0x0C, }; -COMPILER_STRIP_GATE(80CA31C0, &l_nan_brk_index); +COMPILER_STRIP_GATE(0x80CA31C0, &l_nan_brk_index); #pragma pop /* 80CA31C8-80CA31D0 00000C 0008+00 0/1 0/0 0/0 .rodata l_nan_btk_index */ @@ -676,18 +676,18 @@ COMPILER_STRIP_GATE(80CA31C0, &l_nan_brk_index); SECTION_RODATA static u8 const l_nan_btk_index[8] = { 0x00, 0x00, 0x00, 0x11, 0x00, 0x00, 0x00, 0x10, }; -COMPILER_STRIP_GATE(80CA31C8, &l_nan_btk_index); +COMPILER_STRIP_GATE(0x80CA31C8, &l_nan_btk_index); #pragma pop /* 80CA31D0-80CA31D4 000014 0004+00 1/3 0/0 0/0 .rodata @3868 */ SECTION_RODATA static f32 const lit_3868 = 1.0f; -COMPILER_STRIP_GATE(80CA31D0, &lit_3868); +COMPILER_STRIP_GATE(0x80CA31D0, &lit_3868); /* 80CA31D4-80CA31D8 000018 0004+00 0/1 0/0 0/0 .rodata @3869 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3869 = 5.0f; -COMPILER_STRIP_GATE(80CA31D4, &lit_3869); +COMPILER_STRIP_GATE(0x80CA31D4, &lit_3869); #pragma pop /* 80CA31D8-80CA31DC 00001C 0004+00 2/12 0/0 0/0 .rodata @3870 */ @@ -697,13 +697,19 @@ SECTION_RODATA static u8 const lit_3870[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CA31D8, &lit_3870); +COMPILER_STRIP_GATE(0x80CA31D8, &lit_3870); /* 80CA31DC-80CA31E0 000020 0004+00 0/1 0/0 0/0 .rodata @3871 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3871 = -1.0f; -COMPILER_STRIP_GATE(80CA31DC, &lit_3871); +COMPILER_STRIP_GATE(0x80CA31DC, &lit_3871); +#pragma pop + +/* 80CA32A0-80CA32A0 0000E4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80CA32A0 = "I_Nan"; #pragma pop /* 80CA0678-80CA08EC 0001B8 0274+00 1/1 0/0 0/0 .text useHeapInit__FP10fopAc_ac_c */ @@ -759,7 +765,7 @@ asm void daObjNAN_c::nan_posMove() { /* ############################################################################################## */ /* 80CA31E0-80CA31E4 000024 0004+00 1/6 0/0 0/0 .rodata @3985 */ SECTION_RODATA static f32 const lit_3985 = 20.0f; -COMPILER_STRIP_GATE(80CA31E0, &lit_3985); +COMPILER_STRIP_GATE(0x80CA31E0, &lit_3985); /* 80CA31E4-80CA31EC 000028 0004+04 0/2 0/0 0/0 .rodata @3986 */ #pragma push @@ -769,7 +775,7 @@ SECTION_RODATA static f32 const lit_3986[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80CA31E4, &lit_3986); +COMPILER_STRIP_GATE(0x80CA31E4, &lit_3986); #pragma pop /* 80CA31EC-80CA31F4 000030 0008+00 0/5 0/0 0/0 .rodata @3987 */ @@ -778,7 +784,7 @@ COMPILER_STRIP_GATE(80CA31E4, &lit_3986); SECTION_RODATA static u8 const lit_3987[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CA31EC, &lit_3987); +COMPILER_STRIP_GATE(0x80CA31EC, &lit_3987); #pragma pop /* 80CA31F4-80CA31FC 000038 0008+00 0/5 0/0 0/0 .rodata @3988 */ @@ -787,7 +793,7 @@ COMPILER_STRIP_GATE(80CA31EC, &lit_3987); SECTION_RODATA static u8 const lit_3988[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CA31F4, &lit_3988); +COMPILER_STRIP_GATE(0x80CA31F4, &lit_3988); #pragma pop /* 80CA31FC-80CA3204 000040 0008+00 0/5 0/0 0/0 .rodata @3989 */ @@ -796,7 +802,7 @@ COMPILER_STRIP_GATE(80CA31F4, &lit_3988); SECTION_RODATA static u8 const lit_3989[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CA31FC, &lit_3989); +COMPILER_STRIP_GATE(0x80CA31FC, &lit_3989); #pragma pop /* 80CA0A2C-80CA0D54 00056C 0328+00 4/0 0/0 0/0 .text turn__10daObjNAN_cFv */ @@ -824,28 +830,28 @@ asm cM3dGPla::~cM3dGPla() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4018 = 39.0f; -COMPILER_STRIP_GATE(80CA3204, &lit_4018); +COMPILER_STRIP_GATE(0x80CA3204, &lit_4018); #pragma pop /* 80CA3208-80CA320C 00004C 0004+00 0/1 0/0 0/0 .rodata @4019 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4019 = 79.0f; -COMPILER_STRIP_GATE(80CA3208, &lit_4019); +COMPILER_STRIP_GATE(0x80CA3208, &lit_4019); #pragma pop /* 80CA320C-80CA3210 000050 0004+00 0/2 0/0 0/0 .rodata @4020 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4020 = 18.0f; -COMPILER_STRIP_GATE(80CA320C, &lit_4020); +COMPILER_STRIP_GATE(0x80CA320C, &lit_4020); #pragma pop /* 80CA3210-80CA3214 000054 0004+00 0/2 0/0 0/0 .rodata @4021 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4021 = 30.0f; -COMPILER_STRIP_GATE(80CA3210, &lit_4021); +COMPILER_STRIP_GATE(0x80CA3210, &lit_4021); #pragma pop /* 80CA0D9C-80CA0E7C 0008DC 00E0+00 2/2 0/0 0/0 .text nan_WalkAnm__10daObjNAN_cFv */ @@ -863,7 +869,7 @@ asm void daObjNAN_c::nan_WalkAnm() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4100 = -1000.0f; -COMPILER_STRIP_GATE(80CA3214, &lit_4100); +COMPILER_STRIP_GATE(0x80CA3214, &lit_4100); #pragma pop /* 80CA0E7C-80CA1184 0009BC 0308+00 1/0 0/0 0/0 .text wait__10daObjNAN_cFv */ @@ -881,63 +887,63 @@ asm void daObjNAN_c::wait() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4292 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(80CA3218, &lit_4292); +COMPILER_STRIP_GATE(0x80CA3218, &lit_4292); #pragma pop /* 80CA321C-80CA3220 000060 0004+00 0/1 0/0 0/0 .rodata @4293 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4293 = 60.0f; -COMPILER_STRIP_GATE(80CA321C, &lit_4293); +COMPILER_STRIP_GATE(0x80CA321C, &lit_4293); #pragma pop /* 80CA3220-80CA3224 000064 0004+00 0/1 0/0 0/0 .rodata @4294 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4294 = 40.0f; -COMPILER_STRIP_GATE(80CA3220, &lit_4294); +COMPILER_STRIP_GATE(0x80CA3220, &lit_4294); #pragma pop /* 80CA3224-80CA3228 000068 0004+00 0/1 0/0 0/0 .rodata @4295 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4295 = 1.0f / 50.0f; -COMPILER_STRIP_GATE(80CA3224, &lit_4295); +COMPILER_STRIP_GATE(0x80CA3224, &lit_4295); #pragma pop /* 80CA3228-80CA322C 00006C 0004+00 0/1 0/0 0/0 .rodata @4296 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4296 = 12.0f; -COMPILER_STRIP_GATE(80CA3228, &lit_4296); +COMPILER_STRIP_GATE(0x80CA3228, &lit_4296); #pragma pop /* 80CA322C-80CA3230 000070 0004+00 0/1 0/0 0/0 .rodata @4297 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4297 = 6144.0f; -COMPILER_STRIP_GATE(80CA322C, &lit_4297); +COMPILER_STRIP_GATE(0x80CA322C, &lit_4297); #pragma pop /* 80CA3230-80CA3234 000074 0004+00 0/2 0/0 0/0 .rodata @4298 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4298 = 32768.0f; -COMPILER_STRIP_GATE(80CA3230, &lit_4298); +COMPILER_STRIP_GATE(0x80CA3230, &lit_4298); #pragma pop /* 80CA3234-80CA3238 000078 0004+00 0/2 0/0 0/0 .rodata @4299 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4299 = 200.0f; -COMPILER_STRIP_GATE(80CA3234, &lit_4299); +COMPILER_STRIP_GATE(0x80CA3234, &lit_4299); #pragma pop /* 80CA3238-80CA323C 00007C 0004+00 0/1 0/0 0/0 .rodata @4300 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4300 = 1050.0f; -COMPILER_STRIP_GATE(80CA3238, &lit_4300); +COMPILER_STRIP_GATE(0x80CA3238, &lit_4300); #pragma pop /* 80CA323C-80CA3244 000080 0008+00 0/1 0/0 0/0 .rodata @4302 */ @@ -946,7 +952,7 @@ COMPILER_STRIP_GATE(80CA3238, &lit_4300); SECTION_RODATA static u8 const lit_4302[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CA323C, &lit_4302); +COMPILER_STRIP_GATE(0x80CA323C, &lit_4302); #pragma pop /* 80CA1184-80CA1904 000CC4 0780+00 4/0 0/0 0/0 .text walk__10daObjNAN_cFv */ @@ -959,6 +965,13 @@ asm void daObjNAN_c::walk() { } #pragma pop +/* ############################################################################################## */ +/* 80CA32A0-80CA32A0 0000E4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80CA32A6 = "R_SP160"; +#pragma pop + /* 80CA1904-80CA1A20 001444 011C+00 1/0 0/0 0/0 .text bin_wait__10daObjNAN_cFv */ #pragma push #pragma optimization_level 0 @@ -974,42 +987,42 @@ asm void daObjNAN_c::bin_wait() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4362 = -2.0f; -COMPILER_STRIP_GATE(80CA3244, &lit_4362); +COMPILER_STRIP_GATE(0x80CA3244, &lit_4362); #pragma pop /* 80CA3248-80CA324C 00008C 0004+00 0/1 0/0 0/0 .rodata @4363 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4363 = 2.0f / 5.0f; -COMPILER_STRIP_GATE(80CA3248, &lit_4363); +COMPILER_STRIP_GATE(0x80CA3248, &lit_4363); #pragma pop /* 80CA324C-80CA3250 000090 0004+00 0/1 0/0 0/0 .rodata @4364 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4364 = 3.0f / 5.0f; -COMPILER_STRIP_GATE(80CA324C, &lit_4364); +COMPILER_STRIP_GATE(0x80CA324C, &lit_4364); #pragma pop /* 80CA3250-80CA3254 000094 0004+00 0/1 0/0 0/0 .rodata @4365 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4365 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(80CA3250, &lit_4365); +COMPILER_STRIP_GATE(0x80CA3250, &lit_4365); #pragma pop /* 80CA3254-80CA3258 000098 0004+00 0/1 0/0 0/0 .rodata @4366 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4366 = 62.0f; -COMPILER_STRIP_GATE(80CA3254, &lit_4366); +COMPILER_STRIP_GATE(0x80CA3254, &lit_4366); #pragma pop /* 80CA3258-80CA325C 00009C 0004+00 0/1 0/0 0/0 .rodata @4367 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4367 = 1.0f / 20.0f; -COMPILER_STRIP_GATE(80CA3258, &lit_4367); +COMPILER_STRIP_GATE(0x80CA3258, &lit_4367); #pragma pop /* 80CA325C-80CA3264 0000A0 0008+00 0/1 0/0 0/0 .rodata @4368 */ @@ -1018,7 +1031,7 @@ COMPILER_STRIP_GATE(80CA3258, &lit_4367); SECTION_RODATA static u8 const lit_4368[8] = { 0x3F, 0xB9, 0x99, 0x99, 0x99, 0x99, 0x99, 0x9A, }; -COMPILER_STRIP_GATE(80CA325C, &lit_4368); +COMPILER_STRIP_GATE(0x80CA325C, &lit_4368); #pragma pop /* 80CA1A20-80CA1B50 001560 0130+00 1/0 0/0 0/0 .text bin_action__10daObjNAN_cFv */ @@ -1046,7 +1059,7 @@ asm void daObjNAN_c::nan_setParticle() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4491 = -5.0f; -COMPILER_STRIP_GATE(80CA3264, &lit_4491); +COMPILER_STRIP_GATE(0x80CA3264, &lit_4491); #pragma pop /* 80CA1D5C-80CA1F60 00189C 0204+00 1/0 0/0 0/0 .text hook__10daObjNAN_cFv */ @@ -1064,7 +1077,7 @@ asm void daObjNAN_c::hook() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4601 = 100.0f; -COMPILER_STRIP_GATE(80CA3268, &lit_4601); +COMPILER_STRIP_GATE(0x80CA3268, &lit_4601); #pragma pop /* 80CA1F60-80CA2368 001AA0 0408+00 1/0 0/0 0/0 .text boomerang__10daObjNAN_cFv */ @@ -1082,7 +1095,7 @@ asm void daObjNAN_c::boomerang() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4672 = -30.0f; -COMPILER_STRIP_GATE(80CA326C, &lit_4672); +COMPILER_STRIP_GATE(0x80CA326C, &lit_4672); #pragma pop /* 80CA2368-80CA2658 001EA8 02F0+00 3/0 0/0 0/0 .text drop__10daObjNAN_cFv */ @@ -1124,7 +1137,7 @@ SECTION_RODATA static u16 const l_nan_itemno[1 + 1 /* padding */] = { /* padding */ 0x0000, }; -COMPILER_STRIP_GATE(80CA3270, &l_nan_itemno); +COMPILER_STRIP_GATE(0x80CA3270, &l_nan_itemno); #pragma pop /* 80CA3274-80CA327C 0000B8 0004+04 1/1 0/0 0/0 .rodata @4742 */ @@ -1133,13 +1146,13 @@ SECTION_RODATA static f32 const lit_4742[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80CA3274, &lit_4742); +COMPILER_STRIP_GATE(0x80CA3274, &lit_4742); /* 80CA327C-80CA3284 0000C0 0008+00 1/1 0/0 0/0 .rodata @4744 */ SECTION_RODATA static u8 const lit_4744[8] = { 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CA327C, &lit_4744); +COMPILER_STRIP_GATE(0x80CA327C, &lit_4744); /* 80CA276C-80CA2904 0022AC 0198+00 1/1 0/0 0/0 .text execute__10daObjNAN_cFv */ #pragma push @@ -1180,28 +1193,28 @@ asm void daObjNAN_c::setBaseMtx() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4823 = 50.0f; -COMPILER_STRIP_GATE(80CA3284, &lit_4823); +COMPILER_STRIP_GATE(0x80CA3284, &lit_4823); #pragma pop /* 80CA3288-80CA328C 0000CC 0004+00 0/1 0/0 0/0 .rodata @4824 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4824 = 1000000000.0f; -COMPILER_STRIP_GATE(80CA3288, &lit_4824); +COMPILER_STRIP_GATE(0x80CA3288, &lit_4824); #pragma pop /* 80CA328C-80CA3290 0000D0 0004+00 0/1 0/0 0/0 .rodata @4825 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4825 = 15.0f; -COMPILER_STRIP_GATE(80CA328C, &lit_4825); +COMPILER_STRIP_GATE(0x80CA328C, &lit_4825); #pragma pop /* 80CA3290-80CA3294 0000D4 0004+00 0/1 0/0 0/0 .rodata @4826 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4826 = -3.0f / 5.0f; -COMPILER_STRIP_GATE(80CA3290, &lit_4826); +COMPILER_STRIP_GATE(0x80CA3290, &lit_4826); #pragma pop /* 80CA29EC-80CA2B48 00252C 015C+00 1/0 0/0 0/0 .text daObjNAN_Draw__FP10daObjNAN_c */ @@ -1229,21 +1242,21 @@ static asm void daObjNAN_Execute(daObjNAN_c* param_0) { #pragma push #pragma force_active on SECTION_RODATA static u32 const l_musiya_num = 0x0199019A; -COMPILER_STRIP_GATE(80CA3294, &l_musiya_num); +COMPILER_STRIP_GATE(0x80CA3294, &l_musiya_num); #pragma pop /* 80CA3298-80CA329C 0000DC 0004+00 0/1 0/0 0/0 .rodata l_heapsize */ #pragma push #pragma force_active on SECTION_RODATA static u32 const l_heapsize = 0x0EE00EC0; -COMPILER_STRIP_GATE(80CA3298, &l_heapsize); +COMPILER_STRIP_GATE(0x80CA3298, &l_heapsize); #pragma pop /* 80CA329C-80CA32A0 0000E0 0004+00 0/1 0/0 0/0 .rodata @5034 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5034 = -50.0f; -COMPILER_STRIP_GATE(80CA329C, &lit_5034); +COMPILER_STRIP_GATE(0x80CA329C, &lit_5034); #pragma pop /* 80CA349C-80CA34A8 00000C 000C+00 1/1 0/0 0/0 .bss @3769 */ @@ -1320,7 +1333,7 @@ asm void __sinit_d_a_obj_nan_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80CA3118 = (void*)__sinit_d_a_obj_nan_cpp; +REGISTER_CTORS(0x80CA3118, __sinit_d_a_obj_nan_cpp); #pragma pop /* 80CA3154-80CA3160 002C94 000C+00 2/0 0/0 0/0 .text Insect_Release__9dInsect_cFv */ @@ -1343,10 +1356,4 @@ asm cCcD_GStts::~cCcD_GStts() { } #pragma pop -/* 80CA32A0-80CA32AE 0000E4 000E+00 5/5 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80CA32A0 = "I_Nan"; -SECTION_DEAD static char const* const stringBase_80CA32A6 = "R_SP160"; -#pragma pop +/* 80CA32A0-80CA32A0 0000E4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_ndoor/d_a_obj_ndoor.cpp b/rel/d/a/obj/d_a_obj_ndoor/d_a_obj_ndoor.cpp index fbbae9614f8..fef413b435e 100644 --- a/rel/d/a/obj/d_a_obj_ndoor/d_a_obj_ndoor.cpp +++ b/rel/d/a/obj/d_a_obj_ndoor/d_a_obj_ndoor.cpp @@ -157,41 +157,41 @@ static asm void daObj_Ndoor_Draw(obj_ndoor_class* param_0) { /* ############################################################################################## */ /* 80CA3A44-80CA3A48 000000 0004+00 1/1 0/0 0/0 .rodata @3831 */ SECTION_RODATA static f32 const lit_3831 = 350.0f; -COMPILER_STRIP_GATE(80CA3A44, &lit_3831); +COMPILER_STRIP_GATE(0x80CA3A44, &lit_3831); /* 80CA3A48-80CA3A4C 000004 0004+00 0/1 0/0 0/0 .rodata @3832 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3832 = 2500.0f; -COMPILER_STRIP_GATE(80CA3A48, &lit_3832); +COMPILER_STRIP_GATE(0x80CA3A48, &lit_3832); #pragma pop /* 80CA3A4C-80CA3A50 000008 0004+00 0/1 0/0 0/0 .rodata @3833 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3833 = 25.0f; -COMPILER_STRIP_GATE(80CA3A4C, &lit_3833); +COMPILER_STRIP_GATE(0x80CA3A4C, &lit_3833); #pragma pop /* 80CA3A50-80CA3A54 00000C 0004+00 0/1 0/0 0/0 .rodata @3834 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3834 = 27000.0f; -COMPILER_STRIP_GATE(80CA3A50, &lit_3834); +COMPILER_STRIP_GATE(0x80CA3A50, &lit_3834); #pragma pop /* 80CA3A54-80CA3A58 000010 0004+00 0/1 0/0 0/0 .rodata @3835 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3835 = 30.0f; -COMPILER_STRIP_GATE(80CA3A54, &lit_3835); +COMPILER_STRIP_GATE(0x80CA3A54, &lit_3835); #pragma pop /* 80CA3A58-80CA3A5C 000014 0004+00 0/1 0/0 0/0 .rodata @3836 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3836 = 1.0f / 20.0f; -COMPILER_STRIP_GATE(80CA3A58, &lit_3836); +COMPILER_STRIP_GATE(0x80CA3A58, &lit_3836); #pragma pop /* 80CA3A5C-80CA3A64 000018 0004+04 0/1 0/0 0/0 .rodata @3837 */ @@ -202,7 +202,7 @@ SECTION_RODATA static f32 const lit_3837[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80CA3A5C, &lit_3837); +COMPILER_STRIP_GATE(0x80CA3A5C, &lit_3837); #pragma pop /* 80CA3A64-80CA3A6C 000020 0008+00 0/1 0/0 0/0 .rodata @3839 */ @@ -211,7 +211,7 @@ COMPILER_STRIP_GATE(80CA3A5C, &lit_3837); SECTION_RODATA static u8 const lit_3839[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CA3A64, &lit_3839); +COMPILER_STRIP_GATE(0x80CA3A64, &lit_3839); #pragma pop /* 80CA359C-80CA37A4 0000DC 0208+00 2/1 0/0 0/0 .text daObj_Ndoor_Execute__FP15obj_ndoor_class */ @@ -229,6 +229,13 @@ static bool daObj_Ndoor_IsDelete(obj_ndoor_class* param_0) { return true; } +/* ############################################################################################## */ +/* 80CA3A6C-80CA3A6C 000028 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80CA3A6C = "Obj_ndoor"; +#pragma pop + /* 80CA37AC-80CA37DC 0002EC 0030+00 1/0 0/0 0/0 .text daObj_Ndoor_Delete__FP15obj_ndoor_class */ #pragma push #pragma optimization_level 0 @@ -325,9 +332,4 @@ asm cM3dGAab::~cM3dGAab() { } #pragma pop -/* 80CA3A6C-80CA3A76 000028 000A+00 3/3 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80CA3A6C = "Obj_ndoor"; -#pragma pop +/* 80CA3A6C-80CA3A6C 000028 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_nougu/d_a_obj_nougu.cpp b/rel/d/a/obj/d_a_obj_nougu/d_a_obj_nougu.cpp index 1110622fb8d..a1ff32d89d7 100644 --- a/rel/d/a/obj/d_a_obj_nougu/d_a_obj_nougu.cpp +++ b/rel/d/a/obj/d_a_obj_nougu/d_a_obj_nougu.cpp @@ -264,6 +264,12 @@ extern "C" void __register_global_object(); // /* ############################################################################################## */ +/* 80CA49F8-80CA49F8 000040 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80CA49F8 = "Jagar4"; +#pragma pop + /* 80CA4A00-80CA4A40 000000 0040+00 2/2 0/0 0/0 .data mCcDSph__13daObj_Nougu_c */ SECTION_DATA u8 daObj_Nougu_c::mCcDSph[64] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -377,55 +383,55 @@ asm dCcD_Sph::~dCcD_Sph() { SECTION_RODATA u8 const daObj_Nougu_Param_c::m[16] = { 0x00, 0x00, 0x00, 0x00, 0xC0, 0x40, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x43, 0x48, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CA49B8, &daObj_Nougu_Param_c::m); +COMPILER_STRIP_GATE(0x80CA49B8, &daObj_Nougu_Param_c::m); /* 80CA49C8-80CA49CC 000010 0004+00 0/1 0/0 0/0 .rodata @3916 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3916 = -75.0f; -COMPILER_STRIP_GATE(80CA49C8, &lit_3916); +COMPILER_STRIP_GATE(0x80CA49C8, &lit_3916); #pragma pop /* 80CA49CC-80CA49D0 000014 0004+00 0/1 0/0 0/0 .rodata @3917 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3917 = -50.0f; -COMPILER_STRIP_GATE(80CA49CC, &lit_3917); +COMPILER_STRIP_GATE(0x80CA49CC, &lit_3917); #pragma pop /* 80CA49D0-80CA49D4 000018 0004+00 0/1 0/0 0/0 .rodata @3918 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3918 = -100.0f; -COMPILER_STRIP_GATE(80CA49D0, &lit_3918); +COMPILER_STRIP_GATE(0x80CA49D0, &lit_3918); #pragma pop /* 80CA49D4-80CA49D8 00001C 0004+00 0/1 0/0 0/0 .rodata @3919 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3919 = 75.0f; -COMPILER_STRIP_GATE(80CA49D4, &lit_3919); +COMPILER_STRIP_GATE(0x80CA49D4, &lit_3919); #pragma pop /* 80CA49D8-80CA49DC 000020 0004+00 0/1 0/0 0/0 .rodata @3920 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3920 = 50.0f; -COMPILER_STRIP_GATE(80CA49D8, &lit_3920); +COMPILER_STRIP_GATE(0x80CA49D8, &lit_3920); #pragma pop /* 80CA49DC-80CA49E0 000024 0004+00 0/1 0/0 0/0 .rodata @3921 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3921 = 100.0f; -COMPILER_STRIP_GATE(80CA49DC, &lit_3921); +COMPILER_STRIP_GATE(0x80CA49DC, &lit_3921); #pragma pop /* 80CA49E0-80CA49E4 000028 0004+00 0/3 0/0 0/0 .rodata @3922 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3922 = -1000000000.0f; -COMPILER_STRIP_GATE(80CA49E0, &lit_3922); +COMPILER_STRIP_GATE(0x80CA49E0, &lit_3922); #pragma pop /* 80CA3E24-80CA40D8 000304 02B4+00 1/1 0/0 0/0 .text create__13daObj_Nougu_cFv */ @@ -523,7 +529,7 @@ asm void daObj_Nougu_c::Delete() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4046 = 60.0f; -COMPILER_STRIP_GATE(80CA49E4, &lit_4046); +COMPILER_STRIP_GATE(0x80CA49E4, &lit_4046); #pragma pop /* 80CA49E8-80CA49EC 000030 0004+00 0/1 0/0 0/0 .rodata @4047 */ @@ -535,14 +541,14 @@ SECTION_RODATA static u8 const lit_4047[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CA49E8, &lit_4047); +COMPILER_STRIP_GATE(0x80CA49E8, &lit_4047); #pragma pop /* 80CA49EC-80CA49F0 000034 0004+00 0/1 0/0 0/0 .rodata @4048 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4048 = 30.0f; -COMPILER_STRIP_GATE(80CA49EC, &lit_4048); +COMPILER_STRIP_GATE(0x80CA49EC, &lit_4048); #pragma pop /* 80CA43D4-80CA45F4 0008B4 0220+00 2/2 0/0 0/0 .text Execute__13daObj_Nougu_cFv */ @@ -560,14 +566,14 @@ asm void daObj_Nougu_c::Execute() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4060 = 20.0f; -COMPILER_STRIP_GATE(80CA49F0, &lit_4060); +COMPILER_STRIP_GATE(0x80CA49F0, &lit_4060); #pragma pop /* 80CA49F4-80CA49F8 00003C 0004+00 0/1 0/0 0/0 .rodata @4061 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4061 = 1.0f; -COMPILER_STRIP_GATE(80CA49F4, &lit_4061); +COMPILER_STRIP_GATE(0x80CA49F4, &lit_4061); #pragma pop /* 80CA45F4-80CA46B8 000AD4 00C4+00 1/1 0/0 0/0 .text Draw__13daObj_Nougu_cFv */ @@ -723,7 +729,7 @@ asm void __sinit_d_a_obj_nougu_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80CA48D8 = (void*)__sinit_d_a_obj_nougu_cpp; +REGISTER_CTORS(0x80CA48D8, __sinit_d_a_obj_nougu_cpp); #pragma pop /* 80CA494C-80CA4994 000E2C 0048+00 2/1 0/0 0/0 .text __dt__19daObj_Nougu_Param_cFv */ @@ -756,9 +762,4 @@ static asm void func_80CA499C() { } #pragma pop -/* 80CA49F8-80CA49FF 000040 0007+00 1/1 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80CA49F8 = "Jagar4"; -#pragma pop +/* 80CA49F8-80CA49F8 000040 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_octhashi/d_a_obj_octhashi.cpp b/rel/d/a/obj/d_a_obj_octhashi/d_a_obj_octhashi.cpp index d7e86ab2360..898e3c2b3ad 100644 --- a/rel/d/a/obj/d_a_obj_octhashi/d_a_obj_octhashi.cpp +++ b/rel/d/a/obj/d_a_obj_octhashi/d_a_obj_octhashi.cpp @@ -179,10 +179,10 @@ struct cBgS { /* 80074250 */ void Release(dBgW_Base*); }; -struct Vec {}; - struct JAISoundID {}; +struct Vec {}; + struct Z2SeMgr { /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); }; @@ -345,20 +345,20 @@ SECTION_RODATA static u8 const ccSphSrc[64] = { 0x00, 0x00, 0x00, 0x01, 0x0A, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x43, 0xC8, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CA6480, &ccSphSrc); +COMPILER_STRIP_GATE(0x80CA6480, &ccSphSrc); /* 80CA64C0-80CA64C4 000040 0004+00 0/1 0/0 0/0 .rodata @3681 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3681 = 800.0f; -COMPILER_STRIP_GATE(80CA64C0, &lit_3681); +COMPILER_STRIP_GATE(0x80CA64C0, &lit_3681); #pragma pop /* 80CA64C4-80CA64C8 000044 0004+00 0/2 0/0 0/0 .rodata @3682 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3682 = 100.0f; -COMPILER_STRIP_GATE(80CA64C4, &lit_3682); +COMPILER_STRIP_GATE(0x80CA64C4, &lit_3682); #pragma pop /* 80CA64C8-80CA64CC 000048 0004+00 1/5 0/0 0/0 .rodata @3683 */ @@ -368,20 +368,26 @@ SECTION_RODATA static u8 const lit_3683[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CA64C8, &lit_3683); +COMPILER_STRIP_GATE(0x80CA64C8, &lit_3683); /* 80CA64CC-80CA64D0 00004C 0004+00 0/1 0/0 0/0 .rodata @3684 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3684 = 400.0f; -COMPILER_STRIP_GATE(80CA64CC, &lit_3684); +COMPILER_STRIP_GATE(0x80CA64CC, &lit_3684); #pragma pop /* 80CA64D0-80CA64D8 000050 0008+00 1/3 0/0 0/0 .rodata @3686 */ SECTION_RODATA static u8 const lit_3686[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CA64D0, &lit_3686); +COMPILER_STRIP_GATE(0x80CA64D0, &lit_3686); + +/* 80CA6550-80CA6550 0000D0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80CA6550 = "Octhashi"; +#pragma pop /* 80CA6584-80CA6588 -00001 0004+00 3/3 0/0 0/0 .data l_arcName */ SECTION_DATA static void* l_arcName = (void*)&d_a_obj_octhashi__stringBase0; @@ -429,7 +435,7 @@ static asm void daObjOCTHASHI_Delete(daObjOCTHASHI_c* param_0) { /* ############################################################################################## */ /* 80CA64D8-80CA64DC 000058 0004+00 1/1 0/0 0/0 .rodata @3713 */ SECTION_RODATA static f32 const lit_3713 = 470.0f; -COMPILER_STRIP_GATE(80CA64D8, &lit_3713); +COMPILER_STRIP_GATE(0x80CA64D8, &lit_3713); /* 80CA4DFC-80CA4EA4 0002BC 00A8+00 1/1 0/0 0/0 .text SetCoSph__15daObjOCTHASHI_cFv */ #pragma push @@ -444,7 +450,7 @@ asm void daObjOCTHASHI_c::SetCoSph() { /* ############################################################################################## */ /* 80CA64DC-80CA64E0 00005C 0004+00 1/1 0/0 0/0 .rodata @3718 */ SECTION_RODATA static f32 const lit_3718 = 790.0f; -COMPILER_STRIP_GATE(80CA64DC, &lit_3718); +COMPILER_STRIP_GATE(0x80CA64DC, &lit_3718); /* 80CA4EA4-80CA4F24 000364 0080+00 1/1 0/0 0/0 .text SetCoCyl__15daObjOCTHASHI_cFv */ #pragma push @@ -461,42 +467,42 @@ asm void daObjOCTHASHI_c::SetCoCyl() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3776 = 10.0f; -COMPILER_STRIP_GATE(80CA64E0, &lit_3776); +COMPILER_STRIP_GATE(0x80CA64E0, &lit_3776); #pragma pop /* 80CA64E4-80CA64E8 000064 0004+00 0/1 0/0 0/0 .rodata @3777 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3777 = 4.0f / 5.0f; -COMPILER_STRIP_GATE(80CA64E4, &lit_3777); +COMPILER_STRIP_GATE(0x80CA64E4, &lit_3777); #pragma pop /* 80CA64E8-80CA64EC 000068 0004+00 0/1 0/0 0/0 .rodata @3778 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3778 = 8000.0f; -COMPILER_STRIP_GATE(80CA64E8, &lit_3778); +COMPILER_STRIP_GATE(0x80CA64E8, &lit_3778); #pragma pop /* 80CA64EC-80CA64F0 00006C 0004+00 0/1 0/0 0/0 .rodata @3779 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3779 = 3.0f / 5.0f; -COMPILER_STRIP_GATE(80CA64EC, &lit_3779); +COMPILER_STRIP_GATE(0x80CA64EC, &lit_3779); #pragma pop /* 80CA64F0-80CA64F4 000070 0004+00 0/3 0/0 0/0 .rodata @3780 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3780 = 1.0f; -COMPILER_STRIP_GATE(80CA64F0, &lit_3780); +COMPILER_STRIP_GATE(0x80CA64F0, &lit_3780); #pragma pop /* 80CA64F4-80CA64F8 000074 0004+00 0/1 0/0 0/0 .rodata @3781 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3781 = 7.0f / 10.0f; -COMPILER_STRIP_GATE(80CA64F4, &lit_3781); +COMPILER_STRIP_GATE(0x80CA64F4, &lit_3781); #pragma pop /* 80CA4F24-80CA52F0 0003E4 03CC+00 1/1 0/0 0/0 .text HakaiSet2__15daObjOCTHASHI_cFi */ @@ -518,7 +524,7 @@ SECTION_RODATA static f32 const lit_3823[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80CA64F8, &lit_3823); +COMPILER_STRIP_GATE(0x80CA64F8, &lit_3823); #pragma pop /* 80CA52F0-80CA546C 0007B0 017C+00 1/1 0/0 0/0 .text HakaiMotion2__15daObjOCTHASHI_cFv @@ -569,7 +575,7 @@ asm void daObjOCTHASHI_c::CylAction() { SECTION_RODATA static u8 const lit_3887[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CA6500, &lit_3887); +COMPILER_STRIP_GATE(0x80CA6500, &lit_3887); #pragma pop /* 80CA6508-80CA6510 000088 0008+00 0/0 0/0 0/0 .rodata @3888 */ @@ -578,7 +584,7 @@ COMPILER_STRIP_GATE(80CA6500, &lit_3887); SECTION_RODATA static u8 const lit_3888[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CA6508, &lit_3888); +COMPILER_STRIP_GATE(0x80CA6508, &lit_3888); #pragma pop /* 80CA6510-80CA6518 000090 0008+00 0/0 0/0 0/0 .rodata @3889 */ @@ -587,77 +593,77 @@ COMPILER_STRIP_GATE(80CA6508, &lit_3888); SECTION_RODATA static u8 const lit_3889[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CA6510, &lit_3889); +COMPILER_STRIP_GATE(0x80CA6510, &lit_3889); #pragma pop /* 80CA6518-80CA651C 000098 0004+00 0/0 0/0 0/0 .rodata @3890 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3890 = 2000.0f; -COMPILER_STRIP_GATE(80CA6518, &lit_3890); +COMPILER_STRIP_GATE(0x80CA6518, &lit_3890); #pragma pop /* 80CA651C-80CA6520 00009C 0004+00 0/0 0/0 0/0 .rodata @3903 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3903 = 608.0f; -COMPILER_STRIP_GATE(80CA651C, &lit_3903); +COMPILER_STRIP_GATE(0x80CA651C, &lit_3903); #pragma pop /* 80CA6520-80CA6524 0000A0 0004+00 0/0 0/0 0/0 .rodata @3904 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3904 = 448.0f; -COMPILER_STRIP_GATE(80CA6520, &lit_3904); +COMPILER_STRIP_GATE(0x80CA6520, &lit_3904); #pragma pop /* 80CA6524-80CA6528 0000A4 0004+00 0/1 0/0 0/0 .rodata @3989 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3989 = -40.0f; -COMPILER_STRIP_GATE(80CA6524, &lit_3989); +COMPILER_STRIP_GATE(0x80CA6524, &lit_3989); #pragma pop /* 80CA6528-80CA652C 0000A8 0004+00 0/1 0/0 0/0 .rodata @3990 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3990 = 2.0f / 25.0f; -COMPILER_STRIP_GATE(80CA6528, &lit_3990); +COMPILER_STRIP_GATE(0x80CA6528, &lit_3990); #pragma pop /* 80CA652C-80CA6530 0000AC 0004+00 0/2 0/0 0/0 .rodata @3991 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3991 = -1.0f; -COMPILER_STRIP_GATE(80CA652C, &lit_3991); +COMPILER_STRIP_GATE(0x80CA652C, &lit_3991); #pragma pop /* 80CA6530-80CA6534 0000B0 0004+00 0/3 0/0 0/0 .rodata @3992 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3992 = 500.0f; -COMPILER_STRIP_GATE(80CA6530, &lit_3992); +COMPILER_STRIP_GATE(0x80CA6530, &lit_3992); #pragma pop /* 80CA6534-80CA6538 0000B4 0004+00 0/1 0/0 0/0 .rodata @3993 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3993 = 15.0f; -COMPILER_STRIP_GATE(80CA6534, &lit_3993); +COMPILER_STRIP_GATE(0x80CA6534, &lit_3993); #pragma pop /* 80CA6538-80CA653C 0000B8 0004+00 0/1 0/0 0/0 .rodata @3994 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3994 = -15.0f; -COMPILER_STRIP_GATE(80CA6538, &lit_3994); +COMPILER_STRIP_GATE(0x80CA6538, &lit_3994); #pragma pop /* 80CA653C-80CA6540 0000BC 0004+00 0/1 0/0 0/0 .rodata @3995 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3995 = 0.5f; -COMPILER_STRIP_GATE(80CA653C, &lit_3995); +COMPILER_STRIP_GATE(0x80CA653C, &lit_3995); #pragma pop /* 80CA55C4-80CA5844 000A84 0280+00 1/1 0/0 0/0 .text SphAction__15daObjOCTHASHI_cFv */ @@ -693,7 +699,7 @@ asm void daObjOCTHASHI_c::Action() { /* ############################################################################################## */ /* 80CA6540-80CA6544 0000C0 0004+00 1/1 0/0 0/0 .rodata @4057 */ SECTION_RODATA static f32 const lit_4057 = -400.0f; -COMPILER_STRIP_GATE(80CA6540, &lit_4057); +COMPILER_STRIP_GATE(0x80CA6540, &lit_4057); /* 80CA59BC-80CA5A88 000E7C 00CC+00 1/1 0/0 0/0 .text setBaseMtx__15daObjOCTHASHI_cFv */ #pragma push @@ -737,6 +743,13 @@ static asm void daObjOCTHASHI_Execute(daObjOCTHASHI_c* param_0) { } #pragma pop +/* ############################################################################################## */ +/* 80CA6550-80CA6550 0000D0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80CA6559 = "S_octhashi00.bmd"; +#pragma pop + /* 80CA5AE0-80CA5B98 000FA0 00B8+00 1/0 0/0 0/0 .text CreateHeap__15daObjOCTHASHI_cFv */ #pragma push #pragma optimization_level 0 @@ -752,21 +765,28 @@ asm void daObjOCTHASHI_c::CreateHeap() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4165 = -1000.0f; -COMPILER_STRIP_GATE(80CA6544, &lit_4165); +COMPILER_STRIP_GATE(0x80CA6544, &lit_4165); #pragma pop /* 80CA6548-80CA654C 0000C8 0004+00 0/2 0/0 0/0 .rodata @4166 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4166 = -500.0f; -COMPILER_STRIP_GATE(80CA6548, &lit_4166); +COMPILER_STRIP_GATE(0x80CA6548, &lit_4166); #pragma pop /* 80CA654C-80CA6550 0000CC 0004+00 0/2 0/0 0/0 .rodata @4167 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4167 = 1000.0f; -COMPILER_STRIP_GATE(80CA654C, &lit_4167); +COMPILER_STRIP_GATE(0x80CA654C, &lit_4167); +#pragma pop + +/* 80CA6550-80CA6550 0000D0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80CA656A = "D_MN01A"; +SECTION_DEAD static char const* const stringBase_80CA6572 = "S_octhashi00.dzb"; #pragma pop /* 80CA65CC-80CA65EC -00001 0020+00 1/0 0/0 0/0 .data l_daObjOCTHASHI_Method */ @@ -996,12 +1016,4 @@ asm void daObjOCTHASHI_c::Delete() { } #pragma pop -/* 80CA6550-80CA6583 0000D0 0033+00 3/2 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80CA6550 = "Octhashi"; -SECTION_DEAD static char const* const stringBase_80CA6559 = "S_octhashi00.bmd"; -SECTION_DEAD static char const* const stringBase_80CA656A = "D_MN01A"; -SECTION_DEAD static char const* const stringBase_80CA6572 = "S_octhashi00.dzb"; -#pragma pop +/* 80CA6550-80CA6550 0000D0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_oiltubo/d_a_obj_oiltubo.cpp b/rel/d/a/obj/d_a_obj_oiltubo/d_a_obj_oiltubo.cpp index 78bff217acd..3907c92d0d0 100644 --- a/rel/d/a/obj/d_a_obj_oiltubo/d_a_obj_oiltubo.cpp +++ b/rel/d/a/obj/d_a_obj_oiltubo/d_a_obj_oiltubo.cpp @@ -319,6 +319,15 @@ extern "C" extern u8 g_env_light[4880]; // /* ############################################################################################## */ +/* 80CA7948-80CA7948 000054 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80CA7948 = "Obj_otubo"; +SECTION_DEAD static char const* const stringBase_80CA7952 = "x_oiltubo_00.bmd"; +SECTION_DEAD static char const* const stringBase_80CA7963 = "x_oiltubo_00b.bmd"; +SECTION_DEAD static char const* const stringBase_80CA7975 = "x_oiltubo_00b.btk"; +#pragma pop + /* 80CA7988-80CA7994 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -535,11 +544,11 @@ SECTION_RODATA u8 const daObj_Oiltubo_c::mCcDObjInfo[48] = { 0xD8, 0xFB, 0xFD, 0xFF, 0x00, 0x00, 0x00, 0x1F, 0x00, 0x00, 0x00, 0x79, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CA78F4, &daObj_Oiltubo_c::mCcDObjInfo); +COMPILER_STRIP_GATE(0x80CA78F4, &daObj_Oiltubo_c::mCcDObjInfo); /* 80CA7924-80CA7928 000030 0004+00 1/3 0/0 0/0 .rodata @3815 */ SECTION_RODATA static f32 const lit_3815 = 1.0f; -COMPILER_STRIP_GATE(80CA7924, &lit_3815); +COMPILER_STRIP_GATE(0x80CA7924, &lit_3815); /* 80CA6B28-80CA6C5C 000488 0134+00 1/1 0/0 0/0 .text CreateHeap__15daObj_Oiltubo_cFv */ #pragma push @@ -566,16 +575,16 @@ asm void daObj_Oiltubo_c::Delete() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3863 = -1000000000.0f; -COMPILER_STRIP_GATE(80CA7928, &lit_3863); +COMPILER_STRIP_GATE(0x80CA7928, &lit_3863); #pragma pop /* 80CA792C-80CA7930 000038 0004+00 1/4 0/0 0/0 .rodata @3864 */ SECTION_RODATA static f32 const lit_3864 = 50.0f; -COMPILER_STRIP_GATE(80CA792C, &lit_3864); +COMPILER_STRIP_GATE(0x80CA792C, &lit_3864); /* 80CA7930-80CA7934 00003C 0004+00 1/3 0/0 0/0 .rodata @3865 */ SECTION_RODATA static f32 const lit_3865 = 70.0f; -COMPILER_STRIP_GATE(80CA7930, &lit_3865); +COMPILER_STRIP_GATE(0x80CA7930, &lit_3865); /* 80CA6CA0-80CA6EDC 000600 023C+00 2/2 0/0 0/0 .text Execute__15daObj_Oiltubo_cFv */ #pragma push @@ -592,14 +601,14 @@ asm void daObj_Oiltubo_c::Execute() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3884 = 800.0f; -COMPILER_STRIP_GATE(80CA7934, &lit_3884); +COMPILER_STRIP_GATE(0x80CA7934, &lit_3884); #pragma pop /* 80CA7938-80CA793C 000044 0004+00 0/1 0/0 0/0 .rodata @3885 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3885 = 120.0f; -COMPILER_STRIP_GATE(80CA7938, &lit_3885); +COMPILER_STRIP_GATE(0x80CA7938, &lit_3885); #pragma pop /* 80CA6EDC-80CA6FC8 00083C 00EC+00 1/1 0/0 0/0 .text Draw__15daObj_Oiltubo_cFv */ @@ -658,7 +667,7 @@ asm void daObj_Oiltubo_c::initialize() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daObj_Oiltubo_c::setProcess(int (daObj_Oiltubo_c::*)(void*)) { +asm void daObj_Oiltubo_c::setProcess(int (daObj_Oiltubo_c::*param_0)(void*)) { nofralloc #include "asm/rel/d/a/obj/d_a_obj_oiltubo/d_a_obj_oiltubo/setProcess__15daObj_Oiltubo_cFM15daObj_Oiltubo_cFPCvPvPv_i.s" } @@ -708,7 +717,7 @@ asm void daObj_Oiltubo_c::setMtx() { /* ############################################################################################## */ /* 80CA793C-80CA7940 000048 0004+00 1/1 0/0 0/0 .rodata @3999 */ SECTION_RODATA static f32 const lit_3999 = 150.0f; -COMPILER_STRIP_GATE(80CA793C, &lit_3999); +COMPILER_STRIP_GATE(0x80CA793C, &lit_3999); /* 80CA7430-80CA7478 000D90 0048+00 1/1 0/0 0/0 .text setAttnPos__15daObj_Oiltubo_cFv */ #pragma push @@ -735,14 +744,14 @@ asm void daObj_Oiltubo_c::chkEvent() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4029 = 100.0f; -COMPILER_STRIP_GATE(80CA7940, &lit_4029); +COMPILER_STRIP_GATE(0x80CA7940, &lit_4029); #pragma pop /* 80CA7944-80CA7948 000050 0004+00 0/1 0/0 0/0 .rodata @4030 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4030 = -50.0f; -COMPILER_STRIP_GATE(80CA7944, &lit_4030); +COMPILER_STRIP_GATE(0x80CA7944, &lit_4030); #pragma pop /* 80CA74C8-80CA7558 000E28 0090+00 1/0 0/0 0/0 .text wait__15daObj_Oiltubo_cFPv */ @@ -832,7 +841,7 @@ asm void __sinit_d_a_obj_oiltubo_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80CA78A0 = (void*)__sinit_d_a_obj_oiltubo_cpp; +REGISTER_CTORS(0x80CA78A0, __sinit_d_a_obj_oiltubo_cpp); #pragma pop /* 80CA78D8-80CA78E0 001238 0008+00 1/0 0/0 0/0 .text @36@__dt__12dBgS_ObjAcchFv */ @@ -855,12 +864,4 @@ static asm void func_80CA78E0() { } #pragma pop -/* 80CA7948-80CA7987 000054 003F+00 4/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80CA7948 = "Obj_otubo"; -SECTION_DEAD static char const* const stringBase_80CA7952 = "x_oiltubo_00.bmd"; -SECTION_DEAD static char const* const stringBase_80CA7963 = "x_oiltubo_00b.bmd"; -SECTION_DEAD static char const* const stringBase_80CA7975 = "x_oiltubo_00b.btk"; -#pragma pop +/* 80CA7948-80CA7948 000054 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_onsen/d_a_obj_onsen.cpp b/rel/d/a/obj/d_a_obj_onsen/d_a_obj_onsen.cpp index 14a345adb30..c8215b7f3c8 100644 --- a/rel/d/a/obj/d_a_obj_onsen/d_a_obj_onsen.cpp +++ b/rel/d/a/obj/d_a_obj_onsen/d_a_obj_onsen.cpp @@ -185,7 +185,7 @@ asm void daObjOnsen_c::Create() { SECTION_RODATA static u8 const l_bmd[8] = { 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x05, }; -COMPILER_STRIP_GATE(80CA811C, &l_bmd); +COMPILER_STRIP_GATE(0x80CA811C, &l_bmd); /* 80CA8124-80CA812C 000008 0008+00 0/1 0/0 0/0 .rodata l_btk */ #pragma push @@ -193,7 +193,7 @@ COMPILER_STRIP_GATE(80CA811C, &l_bmd); SECTION_RODATA static u8 const l_btk[8] = { 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x09, }; -COMPILER_STRIP_GATE(80CA8124, &l_btk); +COMPILER_STRIP_GATE(0x80CA8124, &l_btk); #pragma pop /* 80CA812C-80CA8134 000010 0008+00 0/1 0/0 0/0 .rodata l_bmd2 */ @@ -202,26 +202,33 @@ COMPILER_STRIP_GATE(80CA8124, &l_btk); SECTION_RODATA static u8 const l_bmd2[8] = { 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x06, }; -COMPILER_STRIP_GATE(80CA812C, &l_bmd2); +COMPILER_STRIP_GATE(0x80CA812C, &l_bmd2); #pragma pop /* 80CA8134-80CA813C 000018 0008+00 1/1 0/0 0/0 .rodata l_dzb */ SECTION_RODATA static u8 const l_dzb[8] = { 0x00, 0x00, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x0C, }; -COMPILER_STRIP_GATE(80CA8134, &l_dzb); +COMPILER_STRIP_GATE(0x80CA8134, &l_dzb); /* 80CA813C-80CA8144 000020 0008+00 1/1 0/0 0/0 .rodata l_heap_size */ SECTION_RODATA static u8 const l_heap_size[8] = { 0x00, 0x00, 0x28, 0x00, 0x00, 0x00, 0x1A, 0xE0, }; -COMPILER_STRIP_GATE(80CA813C, &l_heap_size); +COMPILER_STRIP_GATE(0x80CA813C, &l_heap_size); /* 80CA8144-80CA8148 000028 0004+00 0/1 0/0 0/0 .rodata @3694 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3694 = 1.0f; -COMPILER_STRIP_GATE(80CA8144, &lit_3694); +COMPILER_STRIP_GATE(0x80CA8144, &lit_3694); +#pragma pop + +/* 80CA8148-80CA8148 00002C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80CA8148 = "H_Onsen"; +SECTION_DEAD static char const* const stringBase_80CA8150 = "H_KaOnsen"; #pragma pop /* 80CA815C-80CA8164 -00001 0008+00 3/3 0/0 0/0 .data l_arcName */ @@ -376,10 +383,4 @@ static asm void daObjOnsen_MoveBGDraw(daObjOnsen_c* param_0) { } #pragma pop -/* 80CA8148-80CA815A 00002C 0012+00 1/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80CA8148 = "H_Onsen"; -SECTION_DEAD static char const* const stringBase_80CA8150 = "H_KaOnsen"; -#pragma pop +/* 80CA8148-80CA8148 00002C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_onsenFire/d_a_obj_onsenFire.cpp b/rel/d/a/obj/d_a_obj_onsenFire/d_a_obj_onsenFire.cpp index 59def58a3c0..8cf59378b32 100644 --- a/rel/d/a/obj/d_a_obj_onsenFire/d_a_obj_onsenFire.cpp +++ b/rel/d/a/obj/d_a_obj_onsenFire/d_a_obj_onsenFire.cpp @@ -31,19 +31,19 @@ struct dSv_event_c { struct dKy_tevstr_c {}; -struct _GXColor {}; - struct cXyz {}; +struct _GXColor {}; + struct dPa_control_c { /* 8004D1B8 */ void setSimple(u16, cXyz const*, dKy_tevstr_c const*, u8, _GXColor const&, _GXColor const&, int, f32); }; -struct Vec {}; - struct JAISoundID {}; +struct Vec {}; + struct Z2SeMgr { /* 802AC50C */ void seStartLevel(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); }; @@ -103,20 +103,20 @@ SECTION_RODATA static u8 const lit_3659[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CA8474, &lit_3659); +COMPILER_STRIP_GATE(0x80CA8474, &lit_3659); /* 80CA8478-80CA847C 000004 0004+00 0/1 0/0 0/0 .rodata @3660 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3660 = 1.0f; -COMPILER_STRIP_GATE(80CA8478, &lit_3660); +COMPILER_STRIP_GATE(0x80CA8478, &lit_3660); #pragma pop /* 80CA847C-80CA8480 000008 0004+00 0/1 0/0 0/0 .rodata @3661 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3661 = -1.0f; -COMPILER_STRIP_GATE(80CA847C, &lit_3661); +COMPILER_STRIP_GATE(0x80CA847C, &lit_3661); #pragma pop /* 80CA82F4-80CA83FC 0000F4 0108+00 1/1 0/0 0/0 .text execute__16daObjOnsenFire_cFv */ diff --git a/rel/d/a/obj/d_a_obj_onsenTaru/d_a_obj_onsenTaru.cpp b/rel/d/a/obj/d_a_obj_onsenTaru/d_a_obj_onsenTaru.cpp index 3eb019a022a..7ad7d10fade 100644 --- a/rel/d/a/obj/d_a_obj_onsenTaru/d_a_obj_onsenTaru.cpp +++ b/rel/d/a/obj/d_a_obj_onsenTaru/d_a_obj_onsenTaru.cpp @@ -104,10 +104,10 @@ struct dPa_modelEcallBack { struct dPa_levelEcallBack {}; -struct _GXColor {}; - struct csXyz {}; +struct _GXColor {}; + struct dPa_control_c { /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, @@ -334,11 +334,11 @@ extern "C" void __register_global_object(); /* ############################################################################################## */ /* 80CA9B78-80CA9B7C 000000 0004+00 7/7 0/0 0/0 .rodata @3655 */ SECTION_RODATA static f32 const lit_3655 = 1.0f; -COMPILER_STRIP_GATE(80CA9B78, &lit_3655); +COMPILER_STRIP_GATE(0x80CA9B78, &lit_3655); /* 80CA9B7C-80CA9B80 000004 0004+00 1/2 0/0 0/0 .rodata @3656 */ SECTION_RODATA static f32 const lit_3656 = 125.0f; -COMPILER_STRIP_GATE(80CA9B7C, &lit_3656); +COMPILER_STRIP_GATE(0x80CA9B7C, &lit_3656); /* 80CA9C18-80CA9C24 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { @@ -569,6 +569,13 @@ asm void daOnsTaru_c::setBaseMtx() { } #pragma pop +/* ############################################################################################## */ +/* 80CA9BF4-80CA9BF4 00007C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80CA9BF4 = "maroTaru"; +#pragma pop + /* 80CA8748-80CA87B4 000268 006C+00 1/0 0/0 0/0 .text CreateHeap__11daOnsTaru_cFv */ #pragma push #pragma optimization_level 0 @@ -586,31 +593,31 @@ SECTION_RODATA u8 const daOnsTaru_c::mCcDObjInfo[48] = { 0xD8, 0xFA, 0xDD, 0xAF, 0x00, 0x00, 0x00, 0x1F, 0x00, 0x00, 0x00, 0x79, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CA9B80, &daOnsTaru_c::mCcDObjInfo); +COMPILER_STRIP_GATE(0x80CA9B80, &daOnsTaru_c::mCcDObjInfo); /* 80CA9BB0-80CA9BB4 000038 0004+00 0/2 0/0 0/0 .rodata @3772 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3772 = 110.0f; -COMPILER_STRIP_GATE(80CA9BB0, &lit_3772); +COMPILER_STRIP_GATE(0x80CA9BB0, &lit_3772); #pragma pop /* 80CA9BB4-80CA9BB8 00003C 0004+00 0/2 0/0 0/0 .rodata @3773 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3773 = 50.0f; -COMPILER_STRIP_GATE(80CA9BB4, &lit_3773); +COMPILER_STRIP_GATE(0x80CA9BB4, &lit_3773); #pragma pop /* 80CA9BB8-80CA9BBC 000040 0004+00 2/4 0/0 0/0 .rodata @3774 */ SECTION_RODATA static f32 const lit_3774 = -7.0f; -COMPILER_STRIP_GATE(80CA9BB8, &lit_3774); +COMPILER_STRIP_GATE(0x80CA9BB8, &lit_3774); /* 80CA9BBC-80CA9BC0 000044 0004+00 0/1 0/0 0/0 .rodata @3775 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3775 = -100.0f; -COMPILER_STRIP_GATE(80CA9BBC, &lit_3775); +COMPILER_STRIP_GATE(0x80CA9BBC, &lit_3775); #pragma pop /* 80CA87B4-80CA8A54 0002D4 02A0+00 1/1 0/0 0/0 .text create__11daOnsTaru_cFv */ @@ -687,7 +694,7 @@ asm void daOnsTaru_c::createHeapCallBack(fopAc_ac_c* param_0) { /* ############################################################################################## */ /* 80CA9BC0-80CA9BC4 000048 0004+00 1/2 0/0 0/0 .rodata @3863 */ SECTION_RODATA static f32 const lit_3863 = 100.0f; -COMPILER_STRIP_GATE(80CA9BC0, &lit_3863); +COMPILER_STRIP_GATE(0x80CA9BC0, &lit_3863); /* 80CA8C4C-80CA8C70 00076C 0024+00 1/1 0/0 0/0 .text chkSinkAll__11daOnsTaru_cFv */ #pragma push @@ -702,7 +709,7 @@ asm void daOnsTaru_c::chkSinkAll() { /* ############################################################################################## */ /* 80CA9BC4-80CA9BC8 00004C 0004+00 1/1 0/0 0/0 .rodata @3869 */ SECTION_RODATA static f32 const lit_3869 = 40.0f; -COMPILER_STRIP_GATE(80CA9BC4, &lit_3869); +COMPILER_STRIP_GATE(0x80CA9BC4, &lit_3869); /* 80CA8C70-80CA8C94 000790 0024+00 3/3 0/0 0/0 .text chkWaterLineIn__11daOnsTaru_cFv */ #pragma push @@ -719,28 +726,28 @@ asm void daOnsTaru_c::chkWaterLineIn() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3950 = -1.0f; -COMPILER_STRIP_GATE(80CA9BC8, &lit_3950); +COMPILER_STRIP_GATE(0x80CA9BC8, &lit_3950); #pragma pop /* 80CA9BCC-80CA9BD0 000054 0004+00 0/2 0/0 0/0 .rodata @3951 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3951 = -15.0f; -COMPILER_STRIP_GATE(80CA9BCC, &lit_3951); +COMPILER_STRIP_GATE(0x80CA9BCC, &lit_3951); #pragma pop /* 80CA9BD0-80CA9BD4 000058 0004+00 0/1 0/0 0/0 .rodata @3952 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3952 = 2.0f; -COMPILER_STRIP_GATE(80CA9BD0, &lit_3952); +COMPILER_STRIP_GATE(0x80CA9BD0, &lit_3952); #pragma pop /* 80CA9BD4-80CA9BD8 00005C 0004+00 0/2 0/0 0/0 .rodata @3953 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3953 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(80CA9BD4, &lit_3953); +COMPILER_STRIP_GATE(0x80CA9BD4, &lit_3953); #pragma pop /* 80CA8C94-80CA8F38 0007B4 02A4+00 1/1 0/0 0/0 .text bgCheck__11daOnsTaru_cFv */ @@ -792,7 +799,7 @@ SECTION_RODATA static u8 const lit_4020[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CA9BD8, &lit_4020); +COMPILER_STRIP_GATE(0x80CA9BD8, &lit_4020); /* 80CA929C-80CA92CC 000DBC 0030+00 2/2 0/0 0/0 .text mode_init_wait__11daOnsTaru_cFv */ #pragma push @@ -884,35 +891,35 @@ asm void daOnsTaru_c::mode_init_sink() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4132 = 1.0f / 20.0f; -COMPILER_STRIP_GATE(80CA9BDC, &lit_4132); +COMPILER_STRIP_GATE(0x80CA9BDC, &lit_4132); #pragma pop /* 80CA9BE0-80CA9BE4 000068 0004+00 0/1 0/0 0/0 .rodata @4133 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4133 = 1.0f / 100.0f; -COMPILER_STRIP_GATE(80CA9BE0, &lit_4133); +COMPILER_STRIP_GATE(0x80CA9BE0, &lit_4133); #pragma pop /* 80CA9BE4-80CA9BE8 00006C 0004+00 0/1 0/0 0/0 .rodata @4134 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4134 = 13.0f; -COMPILER_STRIP_GATE(80CA9BE4, &lit_4134); +COMPILER_STRIP_GATE(0x80CA9BE4, &lit_4134); #pragma pop /* 80CA9BE8-80CA9BEC 000070 0004+00 0/1 0/0 0/0 .rodata @4135 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4135 = 9.0f / 10.0f; -COMPILER_STRIP_GATE(80CA9BE8, &lit_4135); +COMPILER_STRIP_GATE(0x80CA9BE8, &lit_4135); #pragma pop /* 80CA9BEC-80CA9BF0 000074 0004+00 0/1 0/0 0/0 .rodata @4136 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4136 = -6.0f; -COMPILER_STRIP_GATE(80CA9BEC, &lit_4136); +COMPILER_STRIP_GATE(0x80CA9BEC, &lit_4136); #pragma pop /* 80CA9530-80CA9620 001050 00F0+00 1/0 0/0 0/0 .text mode_proc_sink__11daOnsTaru_cFv */ @@ -928,7 +935,14 @@ asm void daOnsTaru_c::mode_proc_sink() { /* ############################################################################################## */ /* 80CA9BF0-80CA9BF4 000078 0004+00 1/1 0/0 0/0 .rodata @4186 */ SECTION_RODATA static f32 const lit_4186 = 0.75f; -COMPILER_STRIP_GATE(80CA9BF0, &lit_4186); +COMPILER_STRIP_GATE(0x80CA9BF0, &lit_4186); + +/* 80CA9BF4-80CA9BF4 00007C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80CA9BFD = "Always"; +SECTION_DEAD static char const* const stringBase_80CA9C04 = "BreakWoodBox.bmd"; +#pragma pop /* 80CA9620-80CA98B8 001140 0298+00 1/1 0/0 0/0 .text breakEffSet__11daOnsTaru_cFv */ #pragma push @@ -1034,7 +1048,7 @@ asm void __sinit_d_a_obj_onsenTaru_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80CA9AE4 = (void*)__sinit_d_a_obj_onsenTaru_cpp; +REGISTER_CTORS(0x80CA9AE4, __sinit_d_a_obj_onsenTaru_cpp); #pragma pop /* 80CA9B54-80CA9B5C 001674 0008+00 1/0 0/0 0/0 .text @36@__dt__12dBgS_ObjAcchFv */ @@ -1057,11 +1071,4 @@ static asm void func_80CA9B5C() { } #pragma pop -/* 80CA9BF4-80CA9C15 00007C 0021+00 4/4 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80CA9BF4 = "maroTaru"; -SECTION_DEAD static char const* const stringBase_80CA9BFD = "Always"; -SECTION_DEAD static char const* const stringBase_80CA9C04 = "BreakWoodBox.bmd"; -#pragma pop +/* 80CA9BF4-80CA9BF4 00007C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_ornament_cloth/d_a_obj_ornament_cloth.cpp b/rel/d/a/obj/d_a_obj_ornament_cloth/d_a_obj_ornament_cloth.cpp index d0a4fc6e5b7..f4613efb2c7 100644 --- a/rel/d/a/obj/d_a_obj_ornament_cloth/d_a_obj_ornament_cloth.cpp +++ b/rel/d/a/obj/d_a_obj_ornament_cloth/d_a_obj_ornament_cloth.cpp @@ -187,41 +187,41 @@ SECTION_RODATA u8 const daObjOnCloth_c::M_attr[48] = { 0x3E, 0x99, 0x99, 0x9A, 0x43, 0x16, 0x00, 0x00, 0x41, 0x60, 0x00, 0x00, 0x3D, 0xA3, 0xD7, 0x0A, 0x3F, 0x4C, 0xCC, 0xCD, 0x00, 0x40, 0x04, 0x31, 0x04, 0x31, 0x00, 0x0F, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80595CB4, &daObjOnCloth_c::M_attr); +COMPILER_STRIP_GATE(0x80595CB4, &daObjOnCloth_c::M_attr); /* 80595CE4-80595CE8 000030 0004+00 0/1 0/0 0/0 .rodata @3671 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3671 = -50.0f; -COMPILER_STRIP_GATE(80595CE4, &lit_3671); +COMPILER_STRIP_GATE(0x80595CE4, &lit_3671); #pragma pop /* 80595CE8-80595CEC 000034 0004+00 0/1 0/0 0/0 .rodata @3672 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3672 = -170.0f; -COMPILER_STRIP_GATE(80595CE8, &lit_3672); +COMPILER_STRIP_GATE(0x80595CE8, &lit_3672); #pragma pop /* 80595CEC-80595CF0 000038 0004+00 0/1 0/0 0/0 .rodata @3673 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3673 = 50.0f; -COMPILER_STRIP_GATE(80595CEC, &lit_3673); +COMPILER_STRIP_GATE(0x80595CEC, &lit_3673); #pragma pop /* 80595CF0-80595CF4 00003C 0004+00 0/1 0/0 0/0 .rodata @3674 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3674 = 20.0f; -COMPILER_STRIP_GATE(80595CF0, &lit_3674); +COMPILER_STRIP_GATE(0x80595CF0, &lit_3674); #pragma pop /* 80595CF4-80595CF8 000040 0004+00 0/2 0/0 0/0 .rodata @3675 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3675 = -1.0f; -COMPILER_STRIP_GATE(80595CF4, &lit_3675); +COMPILER_STRIP_GATE(0x80595CF4, &lit_3675); #pragma pop /* 80595CF8-80595CFC 000044 0004+00 1/4 0/0 0/0 .rodata @3676 */ @@ -231,7 +231,7 @@ SECTION_RODATA static u8 const lit_3676[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80595CF8, &lit_3676); +COMPILER_STRIP_GATE(0x80595CF8, &lit_3676); /* 80595CFC-80595D04 000048 0008+00 0/1 0/0 0/0 .rodata @3678 */ #pragma push @@ -239,7 +239,7 @@ COMPILER_STRIP_GATE(80595CF8, &lit_3676); SECTION_RODATA static u8 const lit_3678[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80595CFC, &lit_3678); +COMPILER_STRIP_GATE(0x80595CFC, &lit_3678); #pragma pop /* 80595038-80595158 000078 0120+00 1/1 0/0 0/0 .text create_init__14daObjOnCloth_cFv */ @@ -279,7 +279,7 @@ asm void daObjOnCloth_c::setBaseMtx() { SECTION_RODATA static u8 const lit_3785[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80595D04, &lit_3785); +COMPILER_STRIP_GATE(0x80595D04, &lit_3785); #pragma pop /* 80595D0C-80595D14 000058 0008+00 0/1 0/0 0/0 .rodata @3786 */ @@ -288,7 +288,7 @@ COMPILER_STRIP_GATE(80595D04, &lit_3785); SECTION_RODATA static u8 const lit_3786[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80595D0C, &lit_3786); +COMPILER_STRIP_GATE(0x80595D0C, &lit_3786); #pragma pop /* 80595D14-80595D1C 000060 0008+00 0/1 0/0 0/0 .rodata @3787 */ @@ -297,21 +297,21 @@ COMPILER_STRIP_GATE(80595D0C, &lit_3786); SECTION_RODATA static u8 const lit_3787[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80595D14, &lit_3787); +COMPILER_STRIP_GATE(0x80595D14, &lit_3787); #pragma pop /* 80595D1C-80595D20 000068 0004+00 0/1 0/0 0/0 .rodata @3788 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3788 = 3.0f / 5.0f; -COMPILER_STRIP_GATE(80595D1C, &lit_3788); +COMPILER_STRIP_GATE(0x80595D1C, &lit_3788); #pragma pop /* 80595D20-80595D24 00006C 0004+00 0/1 0/0 0/0 .rodata @3789 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3789 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(80595D20, &lit_3789); +COMPILER_STRIP_GATE(0x80595D20, &lit_3789); #pragma pop /* 805951DC-805954B0 00021C 02D4+00 1/1 0/0 0/0 .text setNormalClothPos__14daObjOnCloth_cFv */ @@ -333,14 +333,14 @@ SECTION_RODATA static f32 const lit_3832[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80595D24, &lit_3832); +COMPILER_STRIP_GATE(0x80595D24, &lit_3832); #pragma pop /* 80595D2C-80595D34 000078 0008+00 1/2 0/0 0/0 .rodata @3834 */ SECTION_RODATA static u8 const lit_3834[8] = { 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80595D2C, &lit_3834); +COMPILER_STRIP_GATE(0x80595D2C, &lit_3834); /* 805954B0-80595638 0004F0 0188+00 1/1 0/0 0/0 .text calcJointAngle__14daObjOnCloth_cFv */ @@ -377,7 +377,15 @@ static asm void nodeCallBack(J3DJoint* param_0, int param_1) { /* ############################################################################################## */ /* 80595D34-80595D38 000080 0004+00 1/1 0/0 0/0 .rodata @3973 */ SECTION_RODATA static f32 const lit_3973 = 1.0f; -COMPILER_STRIP_GATE(80595D34, &lit_3973); +COMPILER_STRIP_GATE(0x80595D34, &lit_3973); + +/* 80595D38-80595D38 000084 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80595D38 = "J_Necktie"; +SECTION_DEAD static char const* const stringBase_80595D42 = "J_Necktie.bmd"; +SECTION_DEAD static char const* const stringBase_80595D50 = "J_Necktie.btk"; +#pragma pop /* 80595D60-80595D64 -00001 0004+00 3/3 0/0 0/0 .data l_arcName */ SECTION_DATA static void* l_arcName = (void*)&d_a_obj_ornament_cloth__stringBase0; @@ -492,11 +500,4 @@ ClothJoint_c::ClothJoint_c() { /* empty function */ } -/* 80595D38-80595D5E 000084 0026+00 2/1 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80595D38 = "J_Necktie"; -SECTION_DEAD static char const* const stringBase_80595D42 = "J_Necktie.bmd"; -SECTION_DEAD static char const* const stringBase_80595D50 = "J_Necktie.btk"; -#pragma pop +/* 80595D38-80595D38 000084 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_pdoor/d_a_obj_pdoor.cpp b/rel/d/a/obj/d_a_obj_pdoor/d_a_obj_pdoor.cpp index cc3f8eb68b7..e2e23880e84 100644 --- a/rel/d/a/obj/d_a_obj_pdoor/d_a_obj_pdoor.cpp +++ b/rel/d/a/obj/d_a_obj_pdoor/d_a_obj_pdoor.cpp @@ -194,7 +194,7 @@ SECTION_RODATA static u8 const lit_3695[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CAAB20, &lit_3695); +COMPILER_STRIP_GATE(0x80CAAB20, &lit_3695); /* 80CA9E98-80CA9F9C 000078 0104+00 1/1 0/0 0/0 .text * PPCallBack__FP10fopAc_ac_cP10fopAc_ac_csQ29dBgW_Base13PushPullLabel */ @@ -229,6 +229,12 @@ asm void daObjPDoor_c::setBaseMtx() { #pragma pop /* ############################################################################################## */ +/* 80CAAB40-80CAAB40 000020 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80CAAB40 = "V_OsuDoor"; +#pragma pop + /* 80CAAB4C-80CAAB58 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -350,13 +356,13 @@ asm void daObjPDoor_c::init_modeWait() { /* ############################################################################################## */ /* 80CAAB24-80CAAB28 000004 0004+00 1/1 0/0 0/0 .rodata @3942 */ SECTION_RODATA static f32 const lit_3942 = 10.0f; -COMPILER_STRIP_GATE(80CAAB24, &lit_3942); +COMPILER_STRIP_GATE(0x80CAAB24, &lit_3942); /* 80CAAB28-80CAAB30 000008 0008+00 1/2 0/0 0/0 .rodata @3944 */ SECTION_RODATA static u8 const lit_3944[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CAAB28, &lit_3944); +COMPILER_STRIP_GATE(0x80CAAB28, &lit_3944); /* 80CAA354-80CAA698 000534 0344+00 1/0 0/0 0/0 .text modeWait__12daObjPDoor_cFv */ #pragma push @@ -384,28 +390,28 @@ asm void daObjPDoor_c::init_modeRotate() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4051 = 5461.0f; -COMPILER_STRIP_GATE(80CAAB30, &lit_4051); +COMPILER_STRIP_GATE(0x80CAAB30, &lit_4051); #pragma pop /* 80CAAB34-80CAAB38 000014 0004+00 0/1 0/0 0/0 .rodata @4052 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4052 = 60.0f; -COMPILER_STRIP_GATE(80CAAB34, &lit_4052); +COMPILER_STRIP_GATE(0x80CAAB34, &lit_4052); #pragma pop /* 80CAAB38-80CAAB3C 000018 0004+00 0/1 0/0 0/0 .rodata @4053 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4053 = 1.0f; -COMPILER_STRIP_GATE(80CAAB38, &lit_4053); +COMPILER_STRIP_GATE(0x80CAAB38, &lit_4053); #pragma pop /* 80CAAB3C-80CAAB40 00001C 0004+00 0/1 0/0 0/0 .rodata @4054 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4054 = -1.0f; -COMPILER_STRIP_GATE(80CAAB3C, &lit_4054); +COMPILER_STRIP_GATE(0x80CAAB3C, &lit_4054); #pragma pop /* 80CAA6B4-80CAA968 000894 02B4+00 1/0 0/0 0/0 .text modeRotate__12daObjPDoor_cFv */ @@ -516,9 +522,4 @@ static asm void daObjPDoor_MoveBGDraw(daObjPDoor_c* param_0) { } #pragma pop -/* 80CAAB40-80CAAB4A 000020 000A+00 1/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80CAAB40 = "V_OsuDoor"; -#pragma pop +/* 80CAAB40-80CAAB40 000020 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_pdtile/d_a_obj_pdtile.cpp b/rel/d/a/obj/d_a_obj_pdtile/d_a_obj_pdtile.cpp index a854cdb3cce..744e561217f 100644 --- a/rel/d/a/obj/d_a_obj_pdtile/d_a_obj_pdtile.cpp +++ b/rel/d/a/obj/d_a_obj_pdtile/d_a_obj_pdtile.cpp @@ -148,10 +148,10 @@ struct Z2SoundObjBase { /* 802BDFF8 */ void deleteObject(); }; -struct Vec {}; - struct JAISoundID {}; +struct Vec {}; + struct Z2SeMgr { /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); /* 802AC50C */ void seStartLevel(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); @@ -289,20 +289,20 @@ static asm void rideCallBack(dBgW* param_0, fopAc_ac_c* param_1, fopAc_ac_c* par /* ############################################################################################## */ /* 80CAC50C-80CAC510 000000 0004+00 3/3 0/0 0/0 .rodata @3680 */ SECTION_RODATA static f32 const lit_3680 = 1500.0f; -COMPILER_STRIP_GATE(80CAC50C, &lit_3680); +COMPILER_STRIP_GATE(0x80CAC50C, &lit_3680); /* 80CAC510-80CAC514 000004 0004+00 0/1 0/0 0/0 .rodata @3681 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3681 = 600.0f; -COMPILER_STRIP_GATE(80CAC510, &lit_3681); +COMPILER_STRIP_GATE(0x80CAC510, &lit_3681); #pragma pop /* 80CAC514-80CAC518 000008 0004+00 0/2 0/0 0/0 .rodata @3682 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3682 = 450.0f; -COMPILER_STRIP_GATE(80CAC514, &lit_3682); +COMPILER_STRIP_GATE(0x80CAC514, &lit_3682); #pragma pop /* 80CAC518-80CAC51C 00000C 0004+00 1/3 0/0 0/0 .rodata @3683 */ @@ -312,7 +312,15 @@ SECTION_RODATA static u8 const lit_3683[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CAC518, &lit_3683); +COMPILER_STRIP_GATE(0x80CAC518, &lit_3683); + +/* 80CAC580-80CAC580 000074 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80CAC580 = "P_Dtile"; +SECTION_DEAD static char const* const stringBase_80CAC588 = "P_Dtile00"; +SECTION_DEAD static char const* const stringBase_80CAC592 = "Lv9_Dtile"; +#pragma pop /* 80CAC59C-80CAC5A8 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { @@ -431,11 +439,11 @@ asm void daObjPDtile_c::create1st() { /* ############################################################################################## */ /* 80CAC51C-80CAC520 000010 0004+00 1/1 0/0 0/0 .rodata @3716 */ SECTION_RODATA static f32 const lit_3716 = 101.0f / 100.0f; -COMPILER_STRIP_GATE(80CAC51C, &lit_3716); +COMPILER_STRIP_GATE(0x80CAC51C, &lit_3716); /* 80CAC520-80CAC524 000014 0004+00 1/3 0/0 0/0 .rodata @3717 */ SECTION_RODATA static f32 const lit_3717 = 1.0f; -COMPILER_STRIP_GATE(80CAC520, &lit_3717); +COMPILER_STRIP_GATE(0x80CAC520, &lit_3717); /* 80CAAE80-80CAAF90 000240 0110+00 3/3 0/0 0/0 .text setMtx__13daObjPDtile_cFv */ #pragma push @@ -452,19 +460,19 @@ asm void daObjPDtile_c::setMtx() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3778 = 2.5f; -COMPILER_STRIP_GATE(80CAC524, &lit_3778); +COMPILER_STRIP_GATE(0x80CAC524, &lit_3778); #pragma pop /* 80CAC528-80CAC52C 00001C 0004+00 0/2 0/0 0/0 .rodata @3779 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3779 = -1.0f; -COMPILER_STRIP_GATE(80CAC528, &lit_3779); +COMPILER_STRIP_GATE(0x80CAC528, &lit_3779); #pragma pop /* 80CAC52C-80CAC530 000020 0004+00 1/2 0/0 0/0 .rodata @3780 */ SECTION_RODATA static f32 const lit_3780 = 65535.0f; -COMPILER_STRIP_GATE(80CAC52C, &lit_3780); +COMPILER_STRIP_GATE(0x80CAC52C, &lit_3780); /* 80CAAF90-80CAB1F0 000350 0260+00 1/1 0/0 0/0 .text rideActor__13daObjPDtile_cFP10fopAc_ac_c */ #pragma push @@ -511,119 +519,119 @@ asm void daObjPDtile_c::Create() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4184 = 3.0f / 10.0f; -COMPILER_STRIP_GATE(80CAC530, &lit_4184); +COMPILER_STRIP_GATE(0x80CAC530, &lit_4184); #pragma pop /* 80CAC534-80CAC538 000028 0004+00 0/1 0/0 0/0 .rodata @4185 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4185 = 19.0f / 20.0f; -COMPILER_STRIP_GATE(80CAC534, &lit_4185); +COMPILER_STRIP_GATE(0x80CAC534, &lit_4185); #pragma pop /* 80CAC538-80CAC53C 00002C 0004+00 0/1 0/0 0/0 .rodata @4186 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4186 = 4.5f; -COMPILER_STRIP_GATE(80CAC538, &lit_4186); +COMPILER_STRIP_GATE(0x80CAC538, &lit_4186); #pragma pop /* 80CAC53C-80CAC540 000030 0004+00 0/1 0/0 0/0 .rodata @4187 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4187 = -4.0f / 5.0f; -COMPILER_STRIP_GATE(80CAC53C, &lit_4187); +COMPILER_STRIP_GATE(0x80CAC53C, &lit_4187); #pragma pop /* 80CAC540-80CAC544 000034 0004+00 0/1 0/0 0/0 .rodata @4188 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4188 = 14400.0f; -COMPILER_STRIP_GATE(80CAC540, &lit_4188); +COMPILER_STRIP_GATE(0x80CAC540, &lit_4188); #pragma pop /* 80CAC544-80CAC548 000038 0004+00 0/1 0/0 0/0 .rodata @4189 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4189 = 30.0f; -COMPILER_STRIP_GATE(80CAC544, &lit_4189); +COMPILER_STRIP_GATE(0x80CAC544, &lit_4189); #pragma pop /* 80CAC548-80CAC54C 00003C 0004+00 0/1 0/0 0/0 .rodata @4190 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4190 = 5.0f; -COMPILER_STRIP_GATE(80CAC548, &lit_4190); +COMPILER_STRIP_GATE(0x80CAC548, &lit_4190); #pragma pop /* 80CAC54C-80CAC550 000040 0004+00 0/1 0/0 0/0 .rodata @4191 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4191 = 3.0f; -COMPILER_STRIP_GATE(80CAC54C, &lit_4191); +COMPILER_STRIP_GATE(0x80CAC54C, &lit_4191); #pragma pop /* 80CAC550-80CAC554 000044 0004+00 0/1 0/0 0/0 .rodata @4192 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4192 = 15.0f; -COMPILER_STRIP_GATE(80CAC550, &lit_4192); +COMPILER_STRIP_GATE(0x80CAC550, &lit_4192); #pragma pop /* 80CAC554-80CAC558 000048 0004+00 0/1 0/0 0/0 .rodata @4193 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4193 = 2.0f; -COMPILER_STRIP_GATE(80CAC554, &lit_4193); +COMPILER_STRIP_GATE(0x80CAC554, &lit_4193); #pragma pop /* 80CAC558-80CAC55C 00004C 0004+00 0/1 0/0 0/0 .rodata @4194 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4194 = 3.0f / 100.0f; -COMPILER_STRIP_GATE(80CAC558, &lit_4194); +COMPILER_STRIP_GATE(0x80CAC558, &lit_4194); #pragma pop /* 80CAC55C-80CAC560 000050 0004+00 0/1 0/0 0/0 .rodata @4195 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4195 = 10.0f; -COMPILER_STRIP_GATE(80CAC55C, &lit_4195); +COMPILER_STRIP_GATE(0x80CAC55C, &lit_4195); #pragma pop /* 80CAC560-80CAC564 000054 0004+00 0/1 0/0 0/0 .rodata @4196 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4196 = -1.0f / 5.0f; -COMPILER_STRIP_GATE(80CAC560, &lit_4196); +COMPILER_STRIP_GATE(0x80CAC560, &lit_4196); #pragma pop /* 80CAC564-80CAC568 000058 0004+00 0/1 0/0 0/0 .rodata @4197 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4197 = 1.5f; -COMPILER_STRIP_GATE(80CAC564, &lit_4197); +COMPILER_STRIP_GATE(0x80CAC564, &lit_4197); #pragma pop /* 80CAC568-80CAC56C 00005C 0004+00 0/1 0/0 0/0 .rodata @4198 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4198 = 7.0f; -COMPILER_STRIP_GATE(80CAC568, &lit_4198); +COMPILER_STRIP_GATE(0x80CAC568, &lit_4198); #pragma pop /* 80CAC56C-80CAC570 000060 0004+00 0/1 0/0 0/0 .rodata @4199 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4199 = -3000.0f; -COMPILER_STRIP_GATE(80CAC56C, &lit_4199); +COMPILER_STRIP_GATE(0x80CAC56C, &lit_4199); #pragma pop /* 80CAC570-80CAC574 000064 0004+00 0/1 0/0 0/0 .rodata @4200 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4200 = 127.0f; -COMPILER_STRIP_GATE(80CAC570, &lit_4200); +COMPILER_STRIP_GATE(0x80CAC570, &lit_4200); #pragma pop /* 80CAC574-80CAC57C 000068 0008+00 0/1 0/0 0/0 .rodata @4202 */ @@ -632,7 +640,7 @@ COMPILER_STRIP_GATE(80CAC570, &lit_4200); SECTION_RODATA static u8 const lit_4202[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CAC574, &lit_4202); +COMPILER_STRIP_GATE(0x80CAC574, &lit_4202); #pragma pop /* 80CAC68C-80CAC6AC -00001 0020+00 1/0 0/0 0/0 .data daObjPDtile_METHODS */ @@ -725,7 +733,7 @@ asm dBgS_ObjGndChk::~dBgS_ObjGndChk() { /* ############################################################################################## */ /* 80CAC57C-80CAC580 000070 0004+00 1/1 0/0 0/0 .rodata @4256 */ SECTION_RODATA static f32 const lit_4256 = 200.0f; -COMPILER_STRIP_GATE(80CAC57C, &lit_4256); +COMPILER_STRIP_GATE(0x80CAC57C, &lit_4256); /* 80CABF50-80CAC094 001310 0144+00 1/0 0/0 0/0 .text Draw__13daObjPDtile_cFv */ #pragma push @@ -885,11 +893,4 @@ static asm void func_80CAC4FC() { } #pragma pop -/* 80CAC580-80CAC59C 000074 001C+00 3/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80CAC580 = "P_Dtile"; -SECTION_DEAD static char const* const stringBase_80CAC588 = "P_Dtile00"; -SECTION_DEAD static char const* const stringBase_80CAC592 = "Lv9_Dtile"; -#pragma pop +/* 80CAC580-80CAC580 000074 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_pdwall/d_a_obj_pdwall.cpp b/rel/d/a/obj/d_a_obj_pdwall/d_a_obj_pdwall.cpp index 972fa5b70d4..9db280dc83a 100644 --- a/rel/d/a/obj/d_a_obj_pdwall/d_a_obj_pdwall.cpp +++ b/rel/d/a/obj/d_a_obj_pdwall/d_a_obj_pdwall.cpp @@ -101,10 +101,10 @@ struct cBgS { /* 80074250 */ void Release(dBgW_Base*); }; -struct Vec {}; - struct JAISoundID {}; +struct Vec {}; + struct Z2SeMgr { /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); }; @@ -192,6 +192,12 @@ extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; // /* ############################################################################################## */ +/* 80CAD1F4-80CAD1F4 00003C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80CAD1F4 = "P_Dwall"; +#pragma pop + /* 80CAD1FC-80CAD200 -00001 0004+00 3/3 0/0 0/0 .data l_arcName */ SECTION_DATA static void* l_arcName = (void*)&d_a_obj_pdwall__stringBase0; @@ -211,11 +217,11 @@ SECTION_RODATA static u8 const l_cull_box[24] = { 0xC2, 0xC8, 0x00, 0x00, 0xC4, 0x48, 0x00, 0x00, 0xC3, 0x96, 0x00, 0x00, 0x44, 0x3B, 0x80, 0x00, 0x43, 0xFA, 0x00, 0x00, 0x43, 0x96, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CAD1B8, &l_cull_box); +COMPILER_STRIP_GATE(0x80CAD1B8, &l_cull_box); /* 80CAD1D0-80CAD1D4 000018 0004+00 1/1 0/0 0/0 .rodata @3666 */ SECTION_RODATA static f32 const lit_3666 = 50.0f; -COMPILER_STRIP_GATE(80CAD1D0, &lit_3666); +COMPILER_STRIP_GATE(0x80CAD1D0, &lit_3666); /* 80CAD1D4-80CAD1D8 00001C 0004+00 1/3 0/0 0/0 .rodata @3667 */ SECTION_RODATA static u8 const lit_3667[4] = { @@ -224,13 +230,13 @@ SECTION_RODATA static u8 const lit_3667[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CAD1D4, &lit_3667); +COMPILER_STRIP_GATE(0x80CAD1D4, &lit_3667); /* 80CAD1D8-80CAD1E0 000020 0008+00 1/3 0/0 0/0 .rodata @3669 */ SECTION_RODATA static u8 const lit_3669[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CAD1D8, &lit_3669); +COMPILER_STRIP_GATE(0x80CAD1D8, &lit_3669); /* 80CAC8DC-80CACA44 00015C 0168+00 2/2 0/0 0/0 .text setMtx__13daObjPDwall_cFv */ #pragma push @@ -257,7 +263,7 @@ asm void daObjPDwall_c::CreateHeap() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3731 = -30.0f; -COMPILER_STRIP_GATE(80CAD1E0, &lit_3731); +COMPILER_STRIP_GATE(0x80CAD1E0, &lit_3731); #pragma pop /* 80CACBA8-80CACCE0 000428 0138+00 1/0 0/0 0/0 .text Create__13daObjPDwall_cFv */ @@ -275,28 +281,28 @@ asm void daObjPDwall_c::Create() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3787 = 5.0f; -COMPILER_STRIP_GATE(80CAD1E4, &lit_3787); +COMPILER_STRIP_GATE(0x80CAD1E4, &lit_3787); #pragma pop /* 80CAD1E8-80CAD1EC 000030 0004+00 0/1 0/0 0/0 .rodata @3788 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3788 = -1.0f / 5.0f; -COMPILER_STRIP_GATE(80CAD1E8, &lit_3788); +COMPILER_STRIP_GATE(0x80CAD1E8, &lit_3788); #pragma pop /* 80CAD1EC-80CAD1F0 000034 0004+00 0/1 0/0 0/0 .rodata @3789 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3789 = 1.0f; -COMPILER_STRIP_GATE(80CAD1EC, &lit_3789); +COMPILER_STRIP_GATE(0x80CAD1EC, &lit_3789); #pragma pop /* 80CAD1F0-80CAD1F4 000038 0004+00 0/1 0/0 0/0 .rodata @3790 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3790 = -1.0f; -COMPILER_STRIP_GATE(80CAD1F0, &lit_3790); +COMPILER_STRIP_GATE(0x80CAD1F0, &lit_3790); #pragma pop /* 80CACCE0-80CACF14 000560 0234+00 1/0 0/0 0/0 .text Execute__13daObjPDwall_cFPPA3_A4_f @@ -420,9 +426,4 @@ asm daObjPDwall_c::~daObjPDwall_c() { } #pragma pop -/* 80CAD1F4-80CAD1FC 00003C 0008+00 1/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80CAD1F4 = "P_Dwall"; -#pragma pop +/* 80CAD1F4-80CAD1F4 00003C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_picture/d_a_obj_picture.cpp b/rel/d/a/obj/d_a_obj_picture/d_a_obj_picture.cpp index f7cbf034106..b4c14060cf3 100644 --- a/rel/d/a/obj/d_a_obj_picture/d_a_obj_picture.cpp +++ b/rel/d/a/obj/d_a_obj_picture/d_a_obj_picture.cpp @@ -38,11 +38,11 @@ struct mDoExt_3DlineMatSortPacket { /* 80014738 */ void setMat(mDoExt_3DlineMat_c*); }; -struct dKy_tevstr_c {}; +struct ResTIMG {}; struct _GXColor {}; -struct ResTIMG {}; +struct dKy_tevstr_c {}; struct mDoExt_3DlineMat1_c { /* 80013360 */ void init(u16, u16, ResTIMG*, int); @@ -352,6 +352,12 @@ static asm void daObjPicture_c_createHeap(fopAc_ac_c* param_0) { #pragma pop /* ############################################################################################## */ +/* 80CAF0DC-80CAF0DC 0000C0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80CAF0DC = "L9Picture"; +#pragma pop + /* 80CAF0E8-80CAF0EC -00001 0004+00 3/3 0/0 0/0 .data l_arcName */ SECTION_DATA static void* l_arcName = (void*)&d_a_obj_picture__stringBase0; @@ -522,7 +528,7 @@ asm daObjPicture_c::~daObjPicture_c() { SECTION_RODATA static u8 const l_dzbIdx[8] = { 0x00, 0x00, 0x00, 0x0B, 0x00, 0x00, 0x00, 0x0A, }; -COMPILER_STRIP_GATE(80CAF01C, &l_dzbIdx); +COMPILER_STRIP_GATE(0x80CAF01C, &l_dzbIdx); /* 80CAF024-80CAF02C 000008 0008+00 0/1 0/0 0/0 .rodata l_PictureBmdIdx */ #pragma push @@ -530,23 +536,23 @@ COMPILER_STRIP_GATE(80CAF01C, &l_dzbIdx); SECTION_RODATA static u8 const l_PictureBmdIdx[8] = { 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x07, }; -COMPILER_STRIP_GATE(80CAF024, &l_PictureBmdIdx); +COMPILER_STRIP_GATE(0x80CAF024, &l_PictureBmdIdx); #pragma pop /* 80CAF02C-80CAF030 000010 0004+00 0/3 0/0 0/0 .rodata @3925 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3925 = 1.0f; -COMPILER_STRIP_GATE(80CAF02C, &lit_3925); +COMPILER_STRIP_GATE(0x80CAF02C, &lit_3925); #pragma pop /* 80CAF030-80CAF034 000014 0004+00 2/3 0/0 0/0 .rodata @3926 */ SECTION_RODATA static f32 const lit_3926 = 325.0f; -COMPILER_STRIP_GATE(80CAF030, &lit_3926); +COMPILER_STRIP_GATE(0x80CAF030, &lit_3926); /* 80CAF034-80CAF038 000018 0004+00 1/2 0/0 0/0 .rodata @3927 */ SECTION_RODATA static f32 const lit_3927 = 0.5f; -COMPILER_STRIP_GATE(80CAF034, &lit_3927); +COMPILER_STRIP_GATE(0x80CAF034, &lit_3927); /* 80CAD908-80CADC18 000688 0310+00 1/1 0/0 0/0 .text createHeap__14daObjPicture_cFv */ #pragma push @@ -565,63 +571,63 @@ asm void daObjPicture_c::createHeap() { SECTION_RODATA static u8 const lit_3958[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC3, 0x66, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CAF038, &lit_3958); +COMPILER_STRIP_GATE(0x80CAF038, &lit_3958); #pragma pop /* 80CAF044-80CAF048 000028 0004+00 0/1 0/0 0/0 .rodata @4007 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4007 = -100.0f; -COMPILER_STRIP_GATE(80CAF044, &lit_4007); +COMPILER_STRIP_GATE(0x80CAF044, &lit_4007); #pragma pop /* 80CAF048-80CAF04C 00002C 0004+00 0/1 0/0 0/0 .rodata @4008 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4008 = -500.0f; -COMPILER_STRIP_GATE(80CAF048, &lit_4008); +COMPILER_STRIP_GATE(0x80CAF048, &lit_4008); #pragma pop /* 80CAF04C-80CAF050 000030 0004+00 0/1 0/0 0/0 .rodata @4009 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4009 = 100.0f; -COMPILER_STRIP_GATE(80CAF04C, &lit_4009); +COMPILER_STRIP_GATE(0x80CAF04C, &lit_4009); #pragma pop /* 80CAF050-80CAF054 000034 0004+00 0/1 0/0 0/0 .rodata @4010 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4010 = 1500.0f; -COMPILER_STRIP_GATE(80CAF050, &lit_4010); +COMPILER_STRIP_GATE(0x80CAF050, &lit_4010); #pragma pop /* 80CAF054-80CAF058 000038 0004+00 0/1 0/0 0/0 .rodata @4011 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4011 = 500.0f; -COMPILER_STRIP_GATE(80CAF054, &lit_4011); +COMPILER_STRIP_GATE(0x80CAF054, &lit_4011); #pragma pop /* 80CAF058-80CAF05C 00003C 0004+00 0/1 0/0 0/0 .rodata @4012 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4012 = 14.0f; -COMPILER_STRIP_GATE(80CAF058, &lit_4012); +COMPILER_STRIP_GATE(0x80CAF058, &lit_4012); #pragma pop /* 80CAF05C-80CAF060 000040 0004+00 0/1 0/0 0/0 .rodata @4013 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4013 = 10.0f; -COMPILER_STRIP_GATE(80CAF05C, &lit_4013); +COMPILER_STRIP_GATE(0x80CAF05C, &lit_4013); #pragma pop /* 80CAF060-80CAF064 000044 0004+00 0/1 0/0 0/0 .rodata @4014 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4014 = 110.0f; -COMPILER_STRIP_GATE(80CAF060, &lit_4014); +COMPILER_STRIP_GATE(0x80CAF060, &lit_4014); #pragma pop /* 80CADC18-80CADFB0 000998 0398+00 1/1 0/0 0/0 .text create__14daObjPicture_cFv */ @@ -652,11 +658,11 @@ SECTION_RODATA static u8 const lit_4042[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CAF064, &lit_4042); +COMPILER_STRIP_GATE(0x80CAF064, &lit_4042); /* 80CAF068-80CAF06C 00004C 0004+00 1/1 0/0 0/0 .rodata @4076 */ SECTION_RODATA static f32 const lit_4076 = 3.5f; -COMPILER_STRIP_GATE(80CAF068, &lit_4076); +COMPILER_STRIP_GATE(0x80CAF068, &lit_4076); /* 80CAE05C-80CAE1B8 000DDC 015C+00 1/1 0/0 0/0 .text draw__14daObjPicture_cFv */ #pragma push @@ -673,7 +679,7 @@ asm void daObjPicture_c::draw() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4146 = -1.0f; -COMPILER_STRIP_GATE(80CAF06C, &lit_4146); +COMPILER_STRIP_GATE(0x80CAF06C, &lit_4146); #pragma pop /* 80CAF070-80CAF074 000054 0004+00 0/3 0/0 0/0 .rodata @4147 */ @@ -685,42 +691,42 @@ SECTION_RODATA static u8 const lit_4147[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CAF070, &lit_4147); +COMPILER_STRIP_GATE(0x80CAF070, &lit_4147); #pragma pop /* 80CAF074-80CAF078 000058 0004+00 0/1 0/0 0/0 .rodata @4148 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4148 = 12.0f; -COMPILER_STRIP_GATE(80CAF074, &lit_4148); +COMPILER_STRIP_GATE(0x80CAF074, &lit_4148); #pragma pop /* 80CAF078-80CAF07C 00005C 0004+00 0/1 0/0 0/0 .rodata @4149 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4149 = 4.0f; -COMPILER_STRIP_GATE(80CAF078, &lit_4149); +COMPILER_STRIP_GATE(0x80CAF078, &lit_4149); #pragma pop /* 80CAF07C-80CAF080 000060 0004+00 0/1 0/0 0/0 .rodata @4150 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4150 = 7.0f; -COMPILER_STRIP_GATE(80CAF07C, &lit_4150); +COMPILER_STRIP_GATE(0x80CAF07C, &lit_4150); #pragma pop /* 80CAF080-80CAF084 000064 0004+00 0/2 0/0 0/0 .rodata @4151 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4151 = 5.0f; -COMPILER_STRIP_GATE(80CAF080, &lit_4151); +COMPILER_STRIP_GATE(0x80CAF080, &lit_4151); #pragma pop /* 80CAF084-80CAF088 000068 0004+00 0/1 0/0 0/0 .rodata @4152 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4152 = -1.0f / 10.0f; -COMPILER_STRIP_GATE(80CAF084, &lit_4152); +COMPILER_STRIP_GATE(0x80CAF084, &lit_4152); #pragma pop /* 80CAE1B8-80CAE510 000F38 0358+00 1/1 0/0 0/0 .text execute__14daObjPicture_cFv */ @@ -740,21 +746,21 @@ asm void daObjPicture_c::execute() { SECTION_RODATA static u8 const lit_4156[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0xC8, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CAF088, &lit_4156); +COMPILER_STRIP_GATE(0x80CAF088, &lit_4156); #pragma pop /* 80CAF094-80CAF098 000078 0004+00 0/1 0/0 0/0 .rodata @4160 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4160 = -3.0f; -COMPILER_STRIP_GATE(80CAF094, &lit_4160); +COMPILER_STRIP_GATE(0x80CAF094, &lit_4160); #pragma pop /* 80CAF098-80CAF09C 00007C 0004+00 0/1 0/0 0/0 .rodata @4161 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4161 = 15.0f; -COMPILER_STRIP_GATE(80CAF098, &lit_4161); +COMPILER_STRIP_GATE(0x80CAF098, &lit_4161); #pragma pop /* 80CAE510-80CAE5B0 001290 00A0+00 1/1 0/0 0/0 .text init__14daObjPicture_cFv */ @@ -813,7 +819,7 @@ asm void daObjPicture_c::getPosTmg(cXyz* param_0) { /* ############################################################################################## */ /* 80CAF09C-80CAF0A0 000080 0004+00 1/1 0/0 0/0 .rodata @4280 */ SECTION_RODATA static f32 const lit_4280 = 20.0f; -COMPILER_STRIP_GATE(80CAF09C, &lit_4280); +COMPILER_STRIP_GATE(0x80CAF09C, &lit_4280); /* 80CAE76C-80CAE8E8 0014EC 017C+00 1/1 0/0 0/0 .text setLinePos__14daObjPicture_cFv */ #pragma push @@ -830,21 +836,21 @@ asm void daObjPicture_c::setLinePos() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4323 = 1.0f / 25.0f; -COMPILER_STRIP_GATE(80CAF0A0, &lit_4323); +COMPILER_STRIP_GATE(0x80CAF0A0, &lit_4323); #pragma pop /* 80CAF0A4-80CAF0A8 000088 0004+00 0/1 0/0 0/0 .rodata @4324 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4324 = 50.0f; -COMPILER_STRIP_GATE(80CAF0A4, &lit_4324); +COMPILER_STRIP_GATE(0x80CAF0A4, &lit_4324); #pragma pop /* 80CAF0A8-80CAF0AC 00008C 0004+00 0/1 0/0 0/0 .rodata @4325 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4325 = 9.0f / 20.0f; -COMPILER_STRIP_GATE(80CAF0A8, &lit_4325); +COMPILER_STRIP_GATE(0x80CAF0A8, &lit_4325); #pragma pop /* 80CAE8E8-80CAEA60 001668 0178+00 1/1 0/0 0/0 .text moveLineFall1__14daObjPicture_cFv @@ -863,14 +869,14 @@ asm void daObjPicture_c::moveLineFall1() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4432 = 8.0f; -COMPILER_STRIP_GATE(80CAF0AC, &lit_4432); +COMPILER_STRIP_GATE(0x80CAF0AC, &lit_4432); #pragma pop /* 80CAF0B0-80CAF0B4 000094 0004+00 0/1 0/0 0/0 .rodata @4433 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4433 = 7.0f / 10.0f; -COMPILER_STRIP_GATE(80CAF0B0, &lit_4433); +COMPILER_STRIP_GATE(0x80CAF0B0, &lit_4433); #pragma pop /* 80CAF0B4-80CAF0BC 000098 0008+00 0/1 0/0 0/0 .rodata @4434 */ @@ -879,7 +885,7 @@ COMPILER_STRIP_GATE(80CAF0B0, &lit_4433); SECTION_RODATA static u8 const lit_4434[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CAF0B4, &lit_4434); +COMPILER_STRIP_GATE(0x80CAF0B4, &lit_4434); #pragma pop /* 80CAF0BC-80CAF0C4 0000A0 0008+00 0/1 0/0 0/0 .rodata @4435 */ @@ -888,7 +894,7 @@ COMPILER_STRIP_GATE(80CAF0B4, &lit_4434); SECTION_RODATA static u8 const lit_4435[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CAF0BC, &lit_4435); +COMPILER_STRIP_GATE(0x80CAF0BC, &lit_4435); #pragma pop /* 80CAF0C4-80CAF0CC 0000A8 0008+00 0/1 0/0 0/0 .rodata @4436 */ @@ -897,21 +903,21 @@ COMPILER_STRIP_GATE(80CAF0BC, &lit_4435); SECTION_RODATA static u8 const lit_4436[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CAF0C4, &lit_4436); +COMPILER_STRIP_GATE(0x80CAF0C4, &lit_4436); #pragma pop /* 80CAF0CC-80CAF0D0 0000B0 0004+00 0/1 0/0 0/0 .rodata @4437 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4437 = 1.0f / 50.0f; -COMPILER_STRIP_GATE(80CAF0CC, &lit_4437); +COMPILER_STRIP_GATE(0x80CAF0CC, &lit_4437); #pragma pop /* 80CAF0D0-80CAF0D4 0000B4 0004+00 0/1 0/0 0/0 .rodata @4438 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4438 = 30.0f; -COMPILER_STRIP_GATE(80CAF0D0, &lit_4438); +COMPILER_STRIP_GATE(0x80CAF0D0, &lit_4438); #pragma pop /* 80CAF0D4-80CAF0DC 0000B8 0008+00 0/1 0/0 0/0 .rodata @4440 */ @@ -920,7 +926,7 @@ COMPILER_STRIP_GATE(80CAF0D0, &lit_4438); SECTION_RODATA static u8 const lit_4440[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CAF0D4, &lit_4440); +COMPILER_STRIP_GATE(0x80CAF0D4, &lit_4440); #pragma pop /* 80CAEA60-80CAED28 0017E0 02C8+00 1/1 0/0 0/0 .text moveLineFall2__14daObjPicture_cFv @@ -1014,9 +1020,4 @@ asm cCcD_GStts::~cCcD_GStts() { } #pragma pop -/* 80CAF0DC-80CAF0E6 0000C0 000A+00 1/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80CAF0DC = "L9Picture"; -#pragma pop +/* 80CAF0DC-80CAF0DC 0000C0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_pillar/d_a_obj_pillar.cpp b/rel/d/a/obj/d_a_obj_pillar/d_a_obj_pillar.cpp index a97e868c91d..af79e02ba86 100644 --- a/rel/d/a/obj/d_a_obj_pillar/d_a_obj_pillar.cpp +++ b/rel/d/a/obj/d_a_obj_pillar/d_a_obj_pillar.cpp @@ -137,10 +137,10 @@ struct cCcD_GStts { /* 80CB08E0 */ ~cCcD_GStts(); }; -struct Vec {}; - struct JAISoundID {}; +struct Vec {}; + struct Z2SeMgr { /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); }; @@ -273,25 +273,25 @@ extern "C" void __register_global_object(); SECTION_RODATA static u8 const l_bmd[8] = { 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x05, }; -COMPILER_STRIP_GATE(80CB09D4, &l_bmd); +COMPILER_STRIP_GATE(0x80CB09D4, &l_bmd); /* 80CB09DC-80CB09E4 000008 0008+00 1/1 0/0 0/0 .rodata l_dzb */ SECTION_RODATA static u8 const l_dzb[8] = { 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x08, }; -COMPILER_STRIP_GATE(80CB09DC, &l_dzb); +COMPILER_STRIP_GATE(0x80CB09DC, &l_dzb); /* 80CB09E4-80CB09EC 000010 0008+00 1/1 0/0 0/0 .rodata l_shadowBmd */ SECTION_RODATA static u8 const l_shadowBmd[8] = { 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x04, }; -COMPILER_STRIP_GATE(80CB09E4, &l_shadowBmd); +COMPILER_STRIP_GATE(0x80CB09E4, &l_shadowBmd); /* 80CB09EC-80CB09F4 000018 0008+00 1/1 0/0 0/0 .rodata l_heap_size */ SECTION_RODATA static u8 const l_heap_size[8] = { 0x00, 0x00, 0x18, 0x30, 0x00, 0x00, 0x0C, 0x00, }; -COMPILER_STRIP_GATE(80CB09EC, &l_heap_size); +COMPILER_STRIP_GATE(0x80CB09EC, &l_heap_size); /* 80CB09F4-80CB0A38 000020 0044+00 1/1 0/0 0/0 .rodata l_cyl_src */ SECTION_RODATA static u8 const l_cyl_src[68] = { @@ -301,7 +301,7 @@ SECTION_RODATA static u8 const l_cyl_src[68] = { 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0x96, 0x00, 0x00, 0x43, 0xFA, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CB09F4, &l_cyl_src); +COMPILER_STRIP_GATE(0x80CB09F4, &l_cyl_src); /* 80CB0A38-80CB0A68 000064 0030+00 2/4 0/0 0/0 .rodata l_shake_data */ SECTION_RODATA static u8 const l_shake_data[48] = { @@ -309,7 +309,7 @@ SECTION_RODATA static u8 const l_shake_data[48] = { 0x00, 0x14, 0x17, 0x70, 0x01, 0x2C, 0x00, 0x28, 0xFF, 0x00, 0x01, 0x90, 0x00, 0x14, 0x13, 0x88, 0x00, 0xC8, 0x00, 0x1E, 0x05, 0x00, 0x03, 0x20, 0x00, 0x78, 0x1B, 0x58, 0x00, 0x1E, 0x00, 0x0F, }; -COMPILER_STRIP_GATE(80CB0A38, &l_shake_data); +COMPILER_STRIP_GATE(0x80CB0A38, &l_shake_data); /* 80CB0A68-80CB0A6C 000094 0004+00 0/6 0/0 0/0 .rodata @3664 */ #pragma push @@ -320,14 +320,21 @@ SECTION_RODATA static u8 const lit_3664[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CB0A68, &lit_3664); +COMPILER_STRIP_GATE(0x80CB0A68, &lit_3664); #pragma pop /* 80CB0A6C-80CB0A70 000098 0004+00 0/1 0/0 0/0 .rodata @3665 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3665 = -7.0f / 10.0f; -COMPILER_STRIP_GATE(80CB0A6C, &lit_3665); +COMPILER_STRIP_GATE(0x80CB0A6C, &lit_3665); +#pragma pop + +/* 80CB0ACC-80CB0ACC 0000F8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80CB0ACC = "K_mbhasi0"; +SECTION_DEAD static char const* const stringBase_80CB0AD6 = "K_mbhasi1"; #pragma pop /* 80CB0AE8-80CB0AF4 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ @@ -497,19 +504,19 @@ asm mDoHIO_entry_c::~mDoHIO_entry_c() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3681 = 8192.0f; -COMPILER_STRIP_GATE(80CB0A70, &lit_3681); +COMPILER_STRIP_GATE(0x80CB0A70, &lit_3681); #pragma pop /* 80CB0A74-80CB0A78 0000A0 0004+00 0/1 0/0 0/0 .rodata @3682 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3682 = 1300.0f; -COMPILER_STRIP_GATE(80CB0A74, &lit_3682); +COMPILER_STRIP_GATE(0x80CB0A74, &lit_3682); #pragma pop /* 80CB0A78-80CB0A7C 0000A4 0004+00 1/5 0/0 0/0 .rodata @3683 */ SECTION_RODATA static f32 const lit_3683 = 1.0f; -COMPILER_STRIP_GATE(80CB0A78, &lit_3683); +COMPILER_STRIP_GATE(0x80CB0A78, &lit_3683); /* 80CB0A7C-80CB0A84 0000A8 0004+04 0/1 0/0 0/0 .rodata @3684 */ #pragma push @@ -519,7 +526,7 @@ SECTION_RODATA static f32 const lit_3684[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80CB0A7C, &lit_3684); +COMPILER_STRIP_GATE(0x80CB0A7C, &lit_3684); #pragma pop /* 80CAF3F8-80CAF4B4 0001B8 00BC+00 1/1 0/0 0/0 .text @@ -538,7 +545,7 @@ static asm void rideCallBack(dBgW* param_0, fopAc_ac_c* param_1, fopAc_ac_c* par SECTION_RODATA static u8 const lit_3716[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CB0A84, &lit_3716); +COMPILER_STRIP_GATE(0x80CB0A84, &lit_3716); /* 80CAF4B4-80CAF5EC 000274 0138+00 2/2 0/0 0/0 .text setBaseMtx__10daPillar_cFv */ #pragma push @@ -625,14 +632,14 @@ asm void daPillar_c::checkAttacked() { #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4060 = 0x3BB40000; -COMPILER_STRIP_GATE(80CB0A8C, &lit_4060); +COMPILER_STRIP_GATE(0x80CB0A8C, &lit_4060); #pragma pop /* 80CB0A90-80CB0A94 0000BC 0004+00 0/1 0/0 0/0 .rodata @4061 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4061 = 0x43B3F333; -COMPILER_STRIP_GATE(80CB0A90, &lit_4061); +COMPILER_STRIP_GATE(0x80CB0A90, &lit_4061); #pragma pop /* 80CB0A94-80CB0A9C 0000C0 0004+04 0/1 0/0 0/0 .rodata @4062 */ @@ -643,7 +650,7 @@ SECTION_RODATA static f32 const lit_4062[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80CB0A94, &lit_4062); +COMPILER_STRIP_GATE(0x80CB0A94, &lit_4062); #pragma pop /* 80CAFC08-80CAFD64 0009C8 015C+00 1/1 0/0 0/0 .text on_switch__10daPillar_cFv */ @@ -663,7 +670,7 @@ asm void daPillar_c::on_switch() { SECTION_RODATA static u8 const lit_4116[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CB0A9C, &lit_4116); +COMPILER_STRIP_GATE(0x80CB0A9C, &lit_4116); #pragma pop /* 80CB0AA4-80CB0AAC 0000D0 0008+00 0/1 0/0 0/0 .rodata @4117 */ @@ -672,7 +679,7 @@ COMPILER_STRIP_GATE(80CB0A9C, &lit_4116); SECTION_RODATA static u8 const lit_4117[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CB0AA4, &lit_4117); +COMPILER_STRIP_GATE(0x80CB0AA4, &lit_4117); #pragma pop /* 80CB0AAC-80CB0AB4 0000D8 0008+00 0/1 0/0 0/0 .rodata @4118 */ @@ -681,21 +688,27 @@ COMPILER_STRIP_GATE(80CB0AA4, &lit_4117); SECTION_RODATA static u8 const lit_4118[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CB0AAC, &lit_4118); +COMPILER_STRIP_GATE(0x80CB0AAC, &lit_4118); #pragma pop /* 80CB0AB4-80CB0AB8 0000E0 0004+00 0/1 0/0 0/0 .rodata @4119 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4119 = 150.0f; -COMPILER_STRIP_GATE(80CB0AB4, &lit_4119); +COMPILER_STRIP_GATE(0x80CB0AB4, &lit_4119); #pragma pop /* 80CB0AB8-80CB0ABC 0000E4 0004+00 0/1 0/0 0/0 .rodata @4120 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4120 = 220.0f; -COMPILER_STRIP_GATE(80CB0AB8, &lit_4120); +COMPILER_STRIP_GATE(0x80CB0AB8, &lit_4120); +#pragma pop + +/* 80CB0ACC-80CB0ACC 0000F8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80CB0AE0 = "D_MN05"; #pragma pop /* 80CAFD64-80CAFF60 000B24 01FC+00 1/1 0/0 0/0 .text checkShake__10daPillar_cFv */ @@ -713,7 +726,7 @@ asm void daPillar_c::checkShake() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4178 = -1.0f; -COMPILER_STRIP_GATE(80CB0ABC, &lit_4178); +COMPILER_STRIP_GATE(0x80CB0ABC, &lit_4178); #pragma pop /* 80CAFF60-80CB01E0 000D20 0280+00 1/1 0/0 0/0 .text setShake_rcrash__10daPillar_cFv */ @@ -796,21 +809,21 @@ void daPillar_c::actionEnd() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4265 = 85.0f; -COMPILER_STRIP_GATE(80CB0AC0, &lit_4265); +COMPILER_STRIP_GATE(0x80CB0AC0, &lit_4265); #pragma pop /* 80CB0AC4-80CB0AC8 0000F0 0004+00 0/1 0/0 0/0 .rodata @4266 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4266 = 200.0f; -COMPILER_STRIP_GATE(80CB0AC4, &lit_4266); +COMPILER_STRIP_GATE(0x80CB0AC4, &lit_4266); #pragma pop /* 80CB0AC8-80CB0ACC 0000F4 0004+00 0/1 0/0 0/0 .rodata @4267 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4267 = -100.0f; -COMPILER_STRIP_GATE(80CB0AC8, &lit_4267); +COMPILER_STRIP_GATE(0x80CB0AC8, &lit_4267); #pragma pop /* 80CB03D0-80CB0658 001190 0288+00 1/0 0/0 0/0 .text Execute__10daPillar_cFPPA3_A4_f */ @@ -917,14 +930,7 @@ asm void __sinit_d_a_obj_pillar_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80CB0984 = (void*)__sinit_d_a_obj_pillar_cpp; +REGISTER_CTORS(0x80CB0984, __sinit_d_a_obj_pillar_cpp); #pragma pop -/* 80CB0ACC-80CB0AE7 0000F8 001B+00 3/2 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80CB0ACC = "K_mbhasi0"; -SECTION_DEAD static char const* const stringBase_80CB0AD6 = "K_mbhasi1"; -SECTION_DEAD static char const* const stringBase_80CB0AE0 = "D_MN05"; -#pragma pop +/* 80CB0ACC-80CB0ACC 0000F8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_pleaf/d_a_obj_pleaf.cpp b/rel/d/a/obj/d_a_obj_pleaf/d_a_obj_pleaf.cpp index d7700ff9e44..aaa126d5689 100644 --- a/rel/d/a/obj/d_a_obj_pleaf/d_a_obj_pleaf.cpp +++ b/rel/d/a/obj/d_a_obj_pleaf/d_a_obj_pleaf.cpp @@ -234,6 +234,12 @@ extern "C" void __register_global_object(); // /* ############################################################################################## */ +/* 80CB1890-80CB1890 00002C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80CB1890 = "J_Hatake"; +#pragma pop + /* 80CB189C-80CB18A0 -00001 0004+00 1/1 0/0 0/0 .data l_resName */ SECTION_DATA static void* l_resName = (void*)&d_a_obj_pleaf__stringBase0; @@ -329,36 +335,36 @@ asm daObj_Pleaf_c::~daObj_Pleaf_c() { SECTION_RODATA u8 const daObj_Pleaf_Param_c::m[16] = { 0x00, 0x00, 0x00, 0x00, 0xC0, 0x40, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x44, 0x61, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CB1864, &daObj_Pleaf_Param_c::m); +COMPILER_STRIP_GATE(0x80CB1864, &daObj_Pleaf_Param_c::m); /* 80CB1874-80CB1878 000010 0004+00 0/1 0/0 0/0 .rodata @3905 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3905 = -300.0f; -COMPILER_STRIP_GATE(80CB1874, &lit_3905); +COMPILER_STRIP_GATE(0x80CB1874, &lit_3905); #pragma pop /* 80CB1878-80CB187C 000014 0004+00 0/1 0/0 0/0 .rodata @3906 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3906 = -50.0f; -COMPILER_STRIP_GATE(80CB1878, &lit_3906); +COMPILER_STRIP_GATE(0x80CB1878, &lit_3906); #pragma pop /* 80CB187C-80CB1880 000018 0004+00 0/1 0/0 0/0 .rodata @3907 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3907 = 300.0f; -COMPILER_STRIP_GATE(80CB187C, &lit_3907); +COMPILER_STRIP_GATE(0x80CB187C, &lit_3907); #pragma pop /* 80CB1880-80CB1884 00001C 0004+00 1/2 0/0 0/0 .rodata @3908 */ SECTION_RODATA static f32 const lit_3908 = 50.0f; -COMPILER_STRIP_GATE(80CB1880, &lit_3908); +COMPILER_STRIP_GATE(0x80CB1880, &lit_3908); /* 80CB1884-80CB1888 000020 0004+00 1/3 0/0 0/0 .rodata @3909 */ SECTION_RODATA static f32 const lit_3909 = -1000000000.0f; -COMPILER_STRIP_GATE(80CB1884, &lit_3909); +COMPILER_STRIP_GATE(0x80CB1884, &lit_3909); /* 80CB0F08-80CB1180 0002A8 0278+00 1/1 0/0 0/0 .text create__13daObj_Pleaf_cFv */ #pragma push @@ -455,14 +461,14 @@ asm void daObj_Pleaf_c::Execute() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4025 = 20.0f; -COMPILER_STRIP_GATE(80CB1888, &lit_4025); +COMPILER_STRIP_GATE(0x80CB1888, &lit_4025); #pragma pop /* 80CB188C-80CB1890 000028 0004+00 0/1 0/0 0/0 .rodata @4026 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4026 = 1.0f; -COMPILER_STRIP_GATE(80CB188C, &lit_4026); +COMPILER_STRIP_GATE(0x80CB188C, &lit_4026); #pragma pop /* 80CB14D4-80CB1598 000874 00C4+00 1/1 0/0 0/0 .text Draw__13daObj_Pleaf_cFv */ @@ -618,7 +624,7 @@ asm void __sinit_d_a_obj_pleaf_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80CB17B8 = (void*)__sinit_d_a_obj_pleaf_cpp; +REGISTER_CTORS(0x80CB17B8, __sinit_d_a_obj_pleaf_cpp); #pragma pop /* 80CB17F8-80CB1840 000B98 0048+00 2/1 0/0 0/0 .text __dt__19daObj_Pleaf_Param_cFv */ @@ -651,9 +657,4 @@ static asm void func_80CB1848() { } #pragma pop -/* 80CB1890-80CB1899 00002C 0009+00 1/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80CB1890 = "J_Hatake"; -#pragma pop +/* 80CB1890-80CB1890 00002C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_poCandle/d_a_obj_poCandle.cpp b/rel/d/a/obj/d_a_obj_poCandle/d_a_obj_poCandle.cpp index d4d872195c5..4a8816e0288 100644 --- a/rel/d/a/obj/d_a_obj_poCandle/d_a_obj_poCandle.cpp +++ b/rel/d/a/obj/d_a_obj_poCandle/d_a_obj_poCandle.cpp @@ -76,10 +76,10 @@ struct dRes_control_c { struct dPa_levelEcallBack {}; -struct _GXColor {}; - struct csXyz {}; +struct _GXColor {}; + struct dPa_control_c { /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, @@ -115,10 +115,10 @@ struct dBgS_MoveBgActor { /* 80078950 */ void MoveBGExecute(); }; -struct Vec {}; - struct JAISoundID {}; +struct Vec {}; + struct Z2SeMgr { /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); /* 802AC50C */ void seStartLevel(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); @@ -232,7 +232,7 @@ extern "C" void __register_global_object(); /* ############################################################################################## */ /* 80CB26B8-80CB26BC 000000 0004+00 3/3 0/0 0/0 .rodata @3635 */ SECTION_RODATA static f32 const lit_3635 = 3.0f; -COMPILER_STRIP_GATE(80CB26B8, &lit_3635); +COMPILER_STRIP_GATE(0x80CB26B8, &lit_3635); /* 80CB26F0-80CB26FC 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { @@ -400,6 +400,13 @@ asm void daPoCandle_c::setBaseMtx() { } #pragma pop +/* ############################################################################################## */ +/* 80CB26E8-80CB26E8 000030 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80CB26E8 = "P_PCNDL"; +#pragma pop + /* 80CB1B6C-80CB1BD8 0001EC 006C+00 1/0 0/0 0/0 .text CreateHeap__12daPoCandle_cFv */ #pragma push #pragma optimization_level 0 @@ -413,7 +420,7 @@ asm void daPoCandle_c::CreateHeap() { /* ############################################################################################## */ /* 80CB26BC-80CB26C0 000004 0004+00 1/1 0/0 0/0 .rodata @3714 */ SECTION_RODATA static f32 const lit_3714 = 25.0f; -COMPILER_STRIP_GATE(80CB26BC, &lit_3714); +COMPILER_STRIP_GATE(0x80CB26BC, &lit_3714); /* 80CB1BD8-80CB1D74 000258 019C+00 1/1 0/0 0/0 .text create__12daPoCandle_cFv */ #pragma push @@ -430,19 +437,19 @@ asm void daPoCandle_c::create() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3737 = 10.0f; -COMPILER_STRIP_GATE(80CB26C0, &lit_3737); +COMPILER_STRIP_GATE(0x80CB26C0, &lit_3737); #pragma pop /* 80CB26C4-80CB26C8 00000C 0004+00 0/1 0/0 0/0 .rodata @3738 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3738 = 500.0f; -COMPILER_STRIP_GATE(80CB26C4, &lit_3738); +COMPILER_STRIP_GATE(0x80CB26C4, &lit_3738); #pragma pop /* 80CB26C8-80CB26CC 000010 0004+00 2/4 0/0 0/0 .rodata @3739 */ SECTION_RODATA static f32 const lit_3739 = 1.0f; -COMPILER_STRIP_GATE(80CB26C8, &lit_3739); +COMPILER_STRIP_GATE(0x80CB26C8, &lit_3739); /* 80CB26CC-80CB26D0 000014 0004+00 0/2 0/0 0/0 .rodata @3740 */ #pragma push @@ -453,7 +460,7 @@ SECTION_RODATA static u8 const lit_3740[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CB26CC, &lit_3740); +COMPILER_STRIP_GATE(0x80CB26CC, &lit_3740); #pragma pop /* 80CB1D74-80CB1E00 0003F4 008C+00 1/1 0/0 0/0 .text lightInit__12daPoCandle_cFv */ @@ -491,35 +498,35 @@ asm void daPoCandle_c::cutLight() { #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_3758 = 0xBC6642FF; -COMPILER_STRIP_GATE(80CB26D0, &lit_3758); +COMPILER_STRIP_GATE(0x80CB26D0, &lit_3758); #pragma pop /* 80CB26D4-80CB26D8 00001C 0004+00 0/1 0/0 0/0 .rodata @3766 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3766 = 0.5f; -COMPILER_STRIP_GATE(80CB26D4, &lit_3766); +COMPILER_STRIP_GATE(0x80CB26D4, &lit_3766); #pragma pop /* 80CB26D8-80CB26DC 000020 0004+00 0/1 0/0 0/0 .rodata @3767 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3767 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(80CB26D8, &lit_3767); +COMPILER_STRIP_GATE(0x80CB26D8, &lit_3767); #pragma pop /* 80CB26DC-80CB26E0 000024 0004+00 0/1 0/0 0/0 .rodata @3768 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_3768 = 0x38D1B717; -COMPILER_STRIP_GATE(80CB26DC, &lit_3768); +COMPILER_STRIP_GATE(0x80CB26DC, &lit_3768); #pragma pop /* 80CB26E0-80CB26E4 000028 0004+00 0/1 0/0 0/0 .rodata @3769 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_3769 = 0x358637BD; -COMPILER_STRIP_GATE(80CB26E0, &lit_3769); +COMPILER_STRIP_GATE(0x80CB26E0, &lit_3769); #pragma pop /* 80CB1E60-80CB1F10 0004E0 00B0+00 1/1 0/0 0/0 .text pointLightProc__12daPoCandle_cFv */ @@ -535,7 +542,7 @@ asm void daPoCandle_c::pointLightProc() { /* ############################################################################################## */ /* 80CB26E4-80CB26E8 00002C 0004+00 2/2 0/0 0/0 .rodata @3814 */ SECTION_RODATA static f32 const lit_3814 = -1.0f; -COMPILER_STRIP_GATE(80CB26E4, &lit_3814); +COMPILER_STRIP_GATE(0x80CB26E4, &lit_3814); /* 80CB2840-80CB284C 000008 000C+00 1/1 0/0 0/0 .bss @3629 */ static u8 lit_3629[12]; @@ -718,7 +725,7 @@ asm void __sinit_d_a_obj_poCandle_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80CB2564 = (void*)__sinit_d_a_obj_poCandle_cpp; +REGISTER_CTORS(0x80CB2564, __sinit_d_a_obj_poCandle_cpp); #pragma pop /* 80CB25A0-80CB25A8 000C20 0008+00 1/0 0/0 0/0 .text @1448@eventStart__12daPoCandle_cFv @@ -778,9 +785,4 @@ asm daPoCandle_c::~daPoCandle_c() { } #pragma pop -/* 80CB26E8-80CB26F0 000030 0008+00 3/3 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80CB26E8 = "P_PCNDL"; -#pragma pop +/* 80CB26E8-80CB26E8 000030 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_poFire/d_a_obj_poFire.cpp b/rel/d/a/obj/d_a_obj_poFire/d_a_obj_poFire.cpp index 578a70bfe88..ca363305907 100644 --- a/rel/d/a/obj/d_a_obj_poFire/d_a_obj_poFire.cpp +++ b/rel/d/a/obj/d_a_obj_poFire/d_a_obj_poFire.cpp @@ -75,6 +75,12 @@ struct dSv_player_get_item_c { struct dPa_levelEcallBack {}; +struct dKy_tevstr_c {}; + +struct csXyz {}; + +struct _GXColor {}; + struct Vec {}; struct cXyz { @@ -83,12 +89,6 @@ struct cXyz { /* 80266B84 */ void operator*(f32) const; }; -struct dKy_tevstr_c {}; - -struct _GXColor {}; - -struct csXyz {}; - struct dPa_control_c { struct level_c { /* 8004B8B4 */ void forceOnEventMove(u32); @@ -265,48 +265,56 @@ extern "C" void __register_global_object(); /* ############################################################################################## */ /* 80CB3EEC-80CB3EF0 000000 0004+00 9/9 0/0 0/0 .rodata @3662 */ SECTION_RODATA static f32 const lit_3662 = 1.0f; -COMPILER_STRIP_GATE(80CB3EEC, &lit_3662); +COMPILER_STRIP_GATE(0x80CB3EEC, &lit_3662); /* 80CB3EF0-80CB3EF4 000004 0004+00 0/1 0/0 0/0 .rodata @3663 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3663 = 10.0f; -COMPILER_STRIP_GATE(80CB3EF0, &lit_3663); +COMPILER_STRIP_GATE(0x80CB3EF0, &lit_3663); #pragma pop /* 80CB3EF4-80CB3EF8 000008 0004+00 0/1 0/0 0/0 .rodata @3664 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3664 = 5.0f; -COMPILER_STRIP_GATE(80CB3EF4, &lit_3664); +COMPILER_STRIP_GATE(0x80CB3EF4, &lit_3664); #pragma pop /* 80CB3EF8-80CB3EFC 00000C 0004+00 0/3 0/0 0/0 .rodata @3665 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3665 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(80CB3EF8, &lit_3665); +COMPILER_STRIP_GATE(0x80CB3EF8, &lit_3665); #pragma pop /* 80CB3EFC-80CB3F00 000010 0004+00 0/1 0/0 0/0 .rodata @3666 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3666 = 6.0f; -COMPILER_STRIP_GATE(80CB3EFC, &lit_3666); +COMPILER_STRIP_GATE(0x80CB3EFC, &lit_3666); #pragma pop /* 80CB3F00-80CB3F04 000014 0004+00 0/1 0/0 0/0 .rodata @3667 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3667 = 40.0f; -COMPILER_STRIP_GATE(80CB3F00, &lit_3667); +COMPILER_STRIP_GATE(0x80CB3F00, &lit_3667); #pragma pop /* 80CB3F04-80CB3F08 000018 0004+00 0/1 0/0 0/0 .rodata @3668 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3668 = 150.0f; -COMPILER_STRIP_GATE(80CB3F04, &lit_3668); +COMPILER_STRIP_GATE(0x80CB3F04, &lit_3668); +#pragma pop + +/* 80CB3F3C-80CB3F3C 000050 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80CB3F3C = "poFire"; +SECTION_DEAD static char const* const stringBase_80CB3F43 = "pofire"; +SECTION_DEAD static char const* const stringBase_80CB3F4A = "MOVE_END"; #pragma pop /* 80CB3F54-80CB3F60 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ @@ -529,7 +537,7 @@ asm void daPoFire_c::setBaseMtx() { /* ############################################################################################## */ /* 80CB3F08-80CB3F0C 00001C 0004+00 1/2 0/0 0/0 .rodata itemNo */ SECTION_RODATA static u32 const itemNo = 0xEFF0F1F2; -COMPILER_STRIP_GATE(80CB3F08, &itemNo); +COMPILER_STRIP_GATE(0x80CB3F08, &itemNo); /* 80CB3F0C-80CB3F10 000020 0004+00 4/9 0/0 0/0 .rodata @3726 */ SECTION_RODATA static u8 const lit_3726[4] = { @@ -538,7 +546,7 @@ SECTION_RODATA static u8 const lit_3726[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CB3F0C, &lit_3726); +COMPILER_STRIP_GATE(0x80CB3F0C, &lit_3726); /* 80CB2A74-80CB2BB8 000214 0144+00 1/1 0/0 0/0 .text create__10daPoFire_cFv */ #pragma push @@ -563,7 +571,7 @@ asm void daPoFire_c::Execute() { /* ############################################################################################## */ /* 80CB3F10-80CB3F14 000024 0004+00 1/1 0/0 0/0 .rodata @3756 */ SECTION_RODATA static f32 const lit_3756 = 20.0f; -COMPILER_STRIP_GATE(80CB3F10, &lit_3756); +COMPILER_STRIP_GATE(0x80CB3F10, &lit_3756); /* 80CB4108-80CB4114 000008 000C+00 1/1 0/0 0/0 .bss @3656 */ static u8 lit_3656[12]; @@ -589,7 +597,7 @@ asm void daPoFire_c::procMain() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3821 = 0.5f; -COMPILER_STRIP_GATE(80CB3F14, &lit_3821); +COMPILER_STRIP_GATE(0x80CB3F14, &lit_3821); #pragma pop /* 80CB2D84-80CB2F68 000524 01E4+00 1/1 0/0 0/0 .text setFire__10daPoFire_cFv */ @@ -638,14 +646,14 @@ asm void daPoFire_c::init_modeInitMove() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3883 = 70.0f; -COMPILER_STRIP_GATE(80CB3F18, &lit_3883); +COMPILER_STRIP_GATE(0x80CB3F18, &lit_3883); #pragma pop /* 80CB3F1C-80CB3F20 000030 0004+00 0/2 0/0 0/0 .rodata @3884 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3884 = 2.0f; -COMPILER_STRIP_GATE(80CB3F1C, &lit_3884); +COMPILER_STRIP_GATE(0x80CB3F1C, &lit_3884); #pragma pop /* 80CB30FC-80CB31FC 00089C 0100+00 1/0 0/0 0/0 .text modeInitMove__10daPoFire_cFv */ @@ -663,21 +671,21 @@ asm void daPoFire_c::modeInitMove() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3889 = -1.0f; -COMPILER_STRIP_GATE(80CB3F20, &lit_3889); +COMPILER_STRIP_GATE(0x80CB3F20, &lit_3889); #pragma pop /* 80CB3F24-80CB3F28 000038 0004+00 0/1 0/0 0/0 .rodata @3915 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3915 = -70.0f; -COMPILER_STRIP_GATE(80CB3F24, &lit_3915); +COMPILER_STRIP_GATE(0x80CB3F24, &lit_3915); #pragma pop /* 80CB3F28-80CB3F2C 00003C 0004+00 0/3 0/0 0/0 .rodata @3916 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_3916 = 0x43360B61; -COMPILER_STRIP_GATE(80CB3F28, &lit_3916); +COMPILER_STRIP_GATE(0x80CB3F28, &lit_3916); #pragma pop /* 80CB31FC-80CB32EC 00099C 00F0+00 1/0 0/0 0/0 .text modeWait__10daPoFire_cFv */ @@ -726,14 +734,14 @@ asm void daPoFire_c::init_modeMoveOut() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4039 = 100.0f; -COMPILER_STRIP_GATE(80CB3F2C, &lit_4039); +COMPILER_STRIP_GATE(0x80CB3F2C, &lit_4039); #pragma pop /* 80CB3F30-80CB3F34 000044 0004+00 0/2 0/0 0/0 .rodata @4040 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4040 = 1.0f / 100.0f; -COMPILER_STRIP_GATE(80CB3F30, &lit_4040); +COMPILER_STRIP_GATE(0x80CB3F30, &lit_4040); #pragma pop /* 80CB355C-80CB3714 000CFC 01B8+00 1/0 0/0 0/0 .text modeMoveOut__10daPoFire_cFv */ @@ -792,7 +800,7 @@ asm void daPoFire_c::modeMoveWait() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4107 = 300.0f; -COMPILER_STRIP_GATE(80CB3F34, &lit_4107); +COMPILER_STRIP_GATE(0x80CB3F34, &lit_4107); #pragma pop /* 80CB3958-80CB39CC 0010F8 0074+00 1/0 0/0 0/0 .text modeNoMove__10daPoFire_cFv */ @@ -818,7 +826,7 @@ asm void daPoFire_c::init_modeOnFire() { /* ############################################################################################## */ /* 80CB3F38-80CB3F3C 00004C 0004+00 1/1 0/0 0/0 .rodata @4134 */ SECTION_RODATA static f32 const lit_4134 = 3.5f; -COMPILER_STRIP_GATE(80CB3F38, &lit_4134); +COMPILER_STRIP_GATE(0x80CB3F38, &lit_4134); /* 80CB39E0-80CB3ADC 001180 00FC+00 1/0 0/0 0/0 .text modeOnFire__10daPoFire_cFv */ #pragma push @@ -952,7 +960,7 @@ asm void __sinit_d_a_obj_poFire_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80CB3D80 = (void*)__sinit_d_a_obj_poFire_cpp; +REGISTER_CTORS(0x80CB3D80, __sinit_d_a_obj_poFire_cpp); #pragma pop /* 80CB3DBC-80CB3DC4 00155C 0008+00 1/0 0/0 0/0 .text @1392@eventEnd__10daPoFire_cFv */ @@ -1041,11 +1049,4 @@ asm daPoFire_c::~daPoFire_c() { } #pragma pop -/* 80CB3F3C-80CB3F53 000050 0017+00 4/3 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80CB3F3C = "poFire"; -SECTION_DEAD static char const* const stringBase_80CB3F43 = "pofire"; -SECTION_DEAD static char const* const stringBase_80CB3F4A = "MOVE_END"; -#pragma pop +/* 80CB3F3C-80CB3F3C 000050 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_poTbox/d_a_obj_poTbox.cpp b/rel/d/a/obj/d_a_obj_poTbox/d_a_obj_poTbox.cpp index c5cd97c0291..efc732acdff 100644 --- a/rel/d/a/obj/d_a_obj_poTbox/d_a_obj_poTbox.cpp +++ b/rel/d/a/obj/d_a_obj_poTbox/d_a_obj_poTbox.cpp @@ -136,10 +136,10 @@ struct cBgS { /* 80074250 */ void Release(dBgW_Base*); }; -struct Vec {}; - struct JAISoundID {}; +struct Vec {}; + struct Z2SeMgr { /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); }; @@ -247,11 +247,18 @@ extern "C" void __register_global_object(); /* ############################################################################################## */ /* 80CB4FC0-80CB4FC4 000000 0004+00 1/1 0/0 0/0 .rodata @3628 */ SECTION_RODATA static f32 const lit_3628 = 2.0f; -COMPILER_STRIP_GATE(80CB4FC0, &lit_3628); +COMPILER_STRIP_GATE(0x80CB4FC0, &lit_3628); /* 80CB4FC4-80CB4FC8 000004 0004+00 1/1 0/0 0/0 .rodata @3629 */ SECTION_RODATA static f32 const lit_3629 = 12.0f; -COMPILER_STRIP_GATE(80CB4FC4, &lit_3629); +COMPILER_STRIP_GATE(0x80CB4FC4, &lit_3629); + +/* 80CB4FDC-80CB4FDC 00001C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80CB4FDC = "pouBox0"; +SECTION_DEAD static char const* const stringBase_80CB4FE4 = "pouBox1"; +#pragma pop /* 80CB4FEC-80CB4FF8 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { @@ -431,7 +438,7 @@ SECTION_RODATA static f32 const lit_3724[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80CB4FC8, &lit_3724); +COMPILER_STRIP_GATE(0x80CB4FC8, &lit_3724); /* 80CB43D0-80CB46C4 000270 02F4+00 1/0 0/0 0/0 .text CreateHeap__10daPoTbox_cFv */ #pragma push @@ -448,7 +455,7 @@ asm void daPoTbox_c::CreateHeap() { SECTION_RODATA static u8 const lit_3835[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CB4FD0, &lit_3835); +COMPILER_STRIP_GATE(0x80CB4FD0, &lit_3835); /* 80CB46C4-80CB4954 000564 0290+00 1/1 0/0 0/0 .text create__10daPoTbox_cFv */ #pragma push @@ -513,7 +520,7 @@ asm void daPoTbox_c::modeWait() { /* ############################################################################################## */ /* 80CB4FD8-80CB4FDC 000018 0004+00 1/1 0/0 0/0 .rodata @3926 */ SECTION_RODATA static f32 const lit_3926 = -1.0f; -COMPILER_STRIP_GATE(80CB4FD8, &lit_3926); +COMPILER_STRIP_GATE(0x80CB4FD8, &lit_3926); /* 80CB4B10-80CB4BF8 0009B0 00E8+00 1/1 0/0 0/0 .text init_modeOpen__10daPoTbox_cFv */ #pragma push @@ -652,13 +659,7 @@ asm void __sinit_d_a_obj_poTbox_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80CB4F70 = (void*)__sinit_d_a_obj_poTbox_cpp; +REGISTER_CTORS(0x80CB4F70, __sinit_d_a_obj_poTbox_cpp); #pragma pop -/* 80CB4FDC-80CB4FEC 00001C 0010+00 1/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80CB4FDC = "pouBox0"; -SECTION_DEAD static char const* const stringBase_80CB4FE4 = "pouBox1"; -#pragma pop +/* 80CB4FDC-80CB4FDC 00001C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_prop/d_a_obj_prop.cpp b/rel/d/a/obj/d_a_obj_prop/d_a_obj_prop.cpp index 24003d5e183..85e72a65558 100644 --- a/rel/d/a/obj/d_a_obj_prop/d_a_obj_prop.cpp +++ b/rel/d/a/obj/d_a_obj_prop/d_a_obj_prop.cpp @@ -113,6 +113,12 @@ static asm void daObjProp_c_createHeap(fopAc_ac_c* param_0) { #pragma pop /* ############################################################################################## */ +/* 80CB5620-80CB5620 00000C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80CB5620 = "L7Prop"; +#pragma pop + /* 80CB5628-80CB562C -00001 0004+00 3/3 0/0 0/0 .data l_arcName */ SECTION_DATA static void* l_arcName = (void*)&d_a_obj_prop__stringBase0; @@ -170,7 +176,7 @@ asm daObjProp_c::~daObjProp_c() { SECTION_RODATA static u8 const BMD_IDX[8] = { 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x04, }; -COMPILER_STRIP_GATE(80CB5614, &BMD_IDX); +COMPILER_STRIP_GATE(0x80CB5614, &BMD_IDX); /* 80CB52B4-80CB5334 000154 0080+00 1/1 0/0 0/0 .text createHeap__11daObjProp_cFv */ #pragma push @@ -220,7 +226,7 @@ SECTION_RODATA static u8 const ADD_ANGLE[4] = { 0xE8, 0x00, }; -COMPILER_STRIP_GATE(80CB561C, &ADD_ANGLE); +COMPILER_STRIP_GATE(0x80CB561C, &ADD_ANGLE); /* 80CB54A0-80CB54E4 000340 0044+00 1/1 0/0 0/0 .text execute__11daObjProp_cFv */ #pragma push @@ -295,9 +301,4 @@ static asm void daObjProp_draw(daObjProp_c* param_0) { } #pragma pop -/* 80CB5620-80CB5627 00000C 0007+00 1/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80CB5620 = "L7Prop"; -#pragma pop +/* 80CB5620-80CB5620 00000C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_pumpkin/d_a_obj_pumpkin.cpp b/rel/d/a/obj/d_a_obj_pumpkin/d_a_obj_pumpkin.cpp index 5df708cc755..c46841c8935 100644 --- a/rel/d/a/obj/d_a_obj_pumpkin/d_a_obj_pumpkin.cpp +++ b/rel/d/a/obj/d_a_obj_pumpkin/d_a_obj_pumpkin.cpp @@ -274,7 +274,7 @@ extern "C" static void daObj_Pumpkin_Execute__FPv(); extern "C" static void daObj_Pumpkin_Draw__FPv(); extern "C" static bool daObj_Pumpkin_IsDelete__FPv(); extern "C" void __dt__10cCcD_GSttsFv(); -extern "C" void func_80CB8274(int*); +extern "C" void func_80CB8274(void* _this, int*); extern "C" void __sinit_d_a_obj_pumpkin_cpp(); extern "C" void __dt__21daObj_Pumpkin_Param_cFv(); extern "C" static void func_80CB834C(); @@ -406,6 +406,13 @@ extern "C" void __register_global_object(); // /* ############################################################################################## */ +/* 80CB8460-80CB8460 0000F0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80CB8460 = ""; +SECTION_DEAD static char const* const stringBase_80CB8461 = "pumpkin"; +#pragma pop + /* 80CB846C-80CB8478 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -558,7 +565,7 @@ SECTION_RODATA u8 const daObj_Pumpkin_Param_c::m[52] = { 0x00, 0x00, 0x41, 0xC0, 0x00, 0x00, 0x42, 0x14, 0x00, 0x00, 0x42, 0x34, 0x00, 0x00, 0x41, 0x90, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x14, 0x00, 0x14, }; -COMPILER_STRIP_GATE(80CB8370, &daObj_Pumpkin_Param_c::m); +COMPILER_STRIP_GATE(0x80CB8370, &daObj_Pumpkin_Param_c::m); /* 80CB83A4-80CB83D4 000034 0030+00 1/1 0/0 0/0 .rodata l_ccDObjData */ SECTION_RODATA static u8 const l_ccDObjData[48] = { @@ -566,20 +573,20 @@ SECTION_RODATA static u8 const l_ccDObjData[48] = { 0xD8, 0xFB, 0xFD, 0xFF, 0x00, 0x00, 0x00, 0x1F, 0x00, 0x00, 0x00, 0x79, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CB83A4, &l_ccDObjData); +COMPILER_STRIP_GATE(0x80CB83A4, &l_ccDObjData); /* 80CB83D4-80CB83D8 000064 0004+00 0/2 0/0 0/0 .rodata @4022 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4022 = -50.0f; -COMPILER_STRIP_GATE(80CB83D4, &lit_4022); +COMPILER_STRIP_GATE(0x80CB83D4, &lit_4022); #pragma pop /* 80CB83D8-80CB83DC 000068 0004+00 0/2 0/0 0/0 .rodata @4023 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4023 = 50.0f; -COMPILER_STRIP_GATE(80CB83D8, &lit_4023); +COMPILER_STRIP_GATE(0x80CB83D8, &lit_4023); #pragma pop /* 80CB5A04-80CB5D74 000364 0370+00 1/1 0/0 0/0 .text create__15daObj_Pumpkin_cFv */ @@ -675,13 +682,13 @@ asm void daObj_Pumpkin_c::Delete() { /* ############################################################################################## */ /* 80CB83DC-80CB83E0 00006C 0004+00 1/4 0/0 0/0 .rodata @4860 */ SECTION_RODATA static f32 const lit_4860 = 1.0f; -COMPILER_STRIP_GATE(80CB83DC, &lit_4860); +COMPILER_STRIP_GATE(0x80CB83DC, &lit_4860); /* 80CB83E0-80CB83E4 000070 0004+00 0/1 0/0 0/0 .rodata @4861 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4861 = 9.0f / 5.0f; -COMPILER_STRIP_GATE(80CB83E0, &lit_4861); +COMPILER_STRIP_GATE(0x80CB83E0, &lit_4861); #pragma pop /* 80CB83E4-80CB83E8 000074 0004+00 0/3 0/0 0/0 .rodata @4862 */ @@ -693,179 +700,179 @@ SECTION_RODATA static u8 const lit_4862[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CB83E4, &lit_4862); +COMPILER_STRIP_GATE(0x80CB83E4, &lit_4862); #pragma pop /* 80CB83E8-80CB83EC 000078 0004+00 0/1 0/0 0/0 .rodata @4863 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4863 = 0.5f; -COMPILER_STRIP_GATE(80CB83E8, &lit_4863); +COMPILER_STRIP_GATE(0x80CB83E8, &lit_4863); #pragma pop /* 80CB83EC-80CB83F0 00007C 0004+00 0/3 0/0 0/0 .rodata @4864 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4864 = -1.0f; -COMPILER_STRIP_GATE(80CB83EC, &lit_4864); +COMPILER_STRIP_GATE(0x80CB83EC, &lit_4864); #pragma pop /* 80CB83F0-80CB83F4 000080 0004+00 0/1 0/0 0/0 .rodata @4865 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4865 = 0x43360B61; -COMPILER_STRIP_GATE(80CB83F0, &lit_4865); +COMPILER_STRIP_GATE(0x80CB83F0, &lit_4865); #pragma pop /* 80CB83F4-80CB83F8 000084 0004+00 0/2 0/0 0/0 .rodata @4866 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4866 = -1000000000.0f; -COMPILER_STRIP_GATE(80CB83F4, &lit_4866); +COMPILER_STRIP_GATE(0x80CB83F4, &lit_4866); #pragma pop /* 80CB83F8-80CB83FC 000088 0004+00 0/1 0/0 0/0 .rodata @4867 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4867 = 3.0f / 10.0f; -COMPILER_STRIP_GATE(80CB83F8, &lit_4867); +COMPILER_STRIP_GATE(0x80CB83F8, &lit_4867); #pragma pop /* 80CB83FC-80CB8400 00008C 0004+00 0/1 0/0 0/0 .rodata @4868 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4868 = 3000.0f; -COMPILER_STRIP_GATE(80CB83FC, &lit_4868); +COMPILER_STRIP_GATE(0x80CB83FC, &lit_4868); #pragma pop /* 80CB8400-80CB8404 000090 0004+00 0/1 0/0 0/0 .rodata @4869 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4869 = 31.0f / 20.0f; -COMPILER_STRIP_GATE(80CB8400, &lit_4869); +COMPILER_STRIP_GATE(0x80CB8400, &lit_4869); #pragma pop /* 80CB8404-80CB8408 000094 0004+00 0/1 0/0 0/0 .rodata @4870 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4870 = 3.0f / 20.0f; -COMPILER_STRIP_GATE(80CB8404, &lit_4870); +COMPILER_STRIP_GATE(0x80CB8404, &lit_4870); #pragma pop /* 80CB8408-80CB840C 000098 0004+00 0/1 0/0 0/0 .rodata @4871 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4871 = 0.75f; -COMPILER_STRIP_GATE(80CB8408, &lit_4871); +COMPILER_STRIP_GATE(0x80CB8408, &lit_4871); #pragma pop /* 80CB840C-80CB8410 00009C 0004+00 0/1 0/0 0/0 .rodata @4872 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4872 = 2000.0f; -COMPILER_STRIP_GATE(80CB840C, &lit_4872); +COMPILER_STRIP_GATE(0x80CB840C, &lit_4872); #pragma pop /* 80CB8410-80CB8414 0000A0 0004+00 0/1 0/0 0/0 .rodata @4873 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4873 = 2.0f; -COMPILER_STRIP_GATE(80CB8410, &lit_4873); +COMPILER_STRIP_GATE(0x80CB8410, &lit_4873); #pragma pop /* 80CB8414-80CB8418 0000A4 0004+00 0/1 0/0 0/0 .rodata @4874 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4874 = 4.0f / 5.0f; -COMPILER_STRIP_GATE(80CB8414, &lit_4874); +COMPILER_STRIP_GATE(0x80CB8414, &lit_4874); #pragma pop /* 80CB8418-80CB841C 0000A8 0004+00 0/1 0/0 0/0 .rodata @4875 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4875 = 11.0f; -COMPILER_STRIP_GATE(80CB8418, &lit_4875); +COMPILER_STRIP_GATE(0x80CB8418, &lit_4875); #pragma pop /* 80CB841C-80CB8420 0000AC 0004+00 0/1 0/0 0/0 .rodata @4876 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4876 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(80CB841C, &lit_4876); +COMPILER_STRIP_GATE(0x80CB841C, &lit_4876); #pragma pop /* 80CB8420-80CB8424 0000B0 0004+00 0/1 0/0 0/0 .rodata @4877 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4877 = -500.0f; -COMPILER_STRIP_GATE(80CB8420, &lit_4877); +COMPILER_STRIP_GATE(0x80CB8420, &lit_4877); #pragma pop /* 80CB8424-80CB8428 0000B4 0004+00 0/1 0/0 0/0 .rodata @4878 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4878 = -250.0f; -COMPILER_STRIP_GATE(80CB8424, &lit_4878); +COMPILER_STRIP_GATE(0x80CB8424, &lit_4878); #pragma pop /* 80CB8428-80CB842C 0000B8 0004+00 0/1 0/0 0/0 .rodata @4879 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4879 = 1200.0f; -COMPILER_STRIP_GATE(80CB8428, &lit_4879); +COMPILER_STRIP_GATE(0x80CB8428, &lit_4879); #pragma pop /* 80CB842C-80CB8430 0000BC 0004+00 0/1 0/0 0/0 .rodata @4880 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4880 = 900.0f; -COMPILER_STRIP_GATE(80CB842C, &lit_4880); +COMPILER_STRIP_GATE(0x80CB842C, &lit_4880); #pragma pop /* 80CB8430-80CB8434 0000C0 0004+00 1/2 0/0 0/0 .rodata @4881 */ SECTION_RODATA static f32 const lit_4881 = 1.0f / 20.0f; -COMPILER_STRIP_GATE(80CB8430, &lit_4881); +COMPILER_STRIP_GATE(0x80CB8430, &lit_4881); /* 80CB8434-80CB8438 0000C4 0004+00 0/1 0/0 0/0 .rodata @4882 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4882 = 100.0f; -COMPILER_STRIP_GATE(80CB8434, &lit_4882); +COMPILER_STRIP_GATE(0x80CB8434, &lit_4882); #pragma pop /* 80CB8438-80CB843C 0000C8 0004+00 0/1 0/0 0/0 .rodata @4883 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4883 = 0.25f; -COMPILER_STRIP_GATE(80CB8438, &lit_4883); +COMPILER_STRIP_GATE(0x80CB8438, &lit_4883); #pragma pop /* 80CB843C-80CB8440 0000CC 0004+00 0/1 0/0 0/0 .rodata @4884 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4884 = 30.0f; -COMPILER_STRIP_GATE(80CB843C, &lit_4884); +COMPILER_STRIP_GATE(0x80CB843C, &lit_4884); #pragma pop /* 80CB8440-80CB8444 0000D0 0004+00 0/1 0/0 0/0 .rodata @4885 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4885 = 33.0f / 100.0f; -COMPILER_STRIP_GATE(80CB8440, &lit_4885); +COMPILER_STRIP_GATE(0x80CB8440, &lit_4885); #pragma pop /* 80CB8444-80CB8448 0000D4 0004+00 0/1 0/0 0/0 .rodata @4886 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4886 = 6.0f; -COMPILER_STRIP_GATE(80CB8444, &lit_4886); +COMPILER_STRIP_GATE(0x80CB8444, &lit_4886); #pragma pop /* 80CB8448-80CB8450 0000D8 0008+00 1/2 0/0 0/0 .rodata @4888 */ SECTION_RODATA static u8 const lit_4888[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CB8448, &lit_4888); +COMPILER_STRIP_GATE(0x80CB8448, &lit_4888); /* 80CB604C-80CB7638 0009AC 15EC+00 1/1 0/0 0/0 .text Execute__15daObj_Pumpkin_cFv */ #pragma push @@ -975,14 +982,14 @@ asm void daObj_Pumpkin_c::calcRollAngle(s16 param_0, int param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5089 = 5.0f; -COMPILER_STRIP_GATE(80CB8450, &lit_5089); +COMPILER_STRIP_GATE(0x80CB8450, &lit_5089); #pragma pop /* 80CB8454-80CB8458 0000E4 0004+00 0/1 0/0 0/0 .rodata @5090 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5090 = 200.0f; -COMPILER_STRIP_GATE(80CB8454, &lit_5090); +COMPILER_STRIP_GATE(0x80CB8454, &lit_5090); #pragma pop /* 80CB7B84-80CB7D14 0024E4 0190+00 1/1 0/0 0/0 .text getWallAngle__15daObj_Pumpkin_cFsPs @@ -999,7 +1006,7 @@ asm void daObj_Pumpkin_c::getWallAngle(s16 param_0, s16* param_1) { /* ############################################################################################## */ /* 80CB8458-80CB845C 0000E8 0004+00 2/2 0/0 0/0 .rodata @5106 */ SECTION_RODATA static f32 const lit_5106 = 3.0f / 5.0f; -COMPILER_STRIP_GATE(80CB8458, &lit_5106); +COMPILER_STRIP_GATE(0x80CB8458, &lit_5106); /* 80CB7D14-80CB7D98 002674 0084+00 1/1 0/0 0/0 .text setSmokePrtcl__15daObj_Pumpkin_cFv */ @@ -1026,7 +1033,7 @@ asm void daObj_Pumpkin_c::setWaterPrtcl() { /* ############################################################################################## */ /* 80CB845C-80CB8460 0000EC 0004+00 1/1 0/0 0/0 .rodata @5155 */ SECTION_RODATA static f32 const lit_5155 = 7.0f / 10.0f; -COMPILER_STRIP_GATE(80CB845C, &lit_5155); +COMPILER_STRIP_GATE(0x80CB845C, &lit_5155); /* 80CB7E98-80CB7EF4 0027F8 005C+00 1/1 0/0 0/0 .text setHamonPrtcl__15daObj_Pumpkin_cFv */ @@ -1108,7 +1115,7 @@ asm cCcD_GStts::~cCcD_GStts() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80CB8274(int* param_0) { +extern "C" asm void func_80CB8274(void* _this, int* param_0) { nofralloc #include "asm/rel/d/a/obj/d_a_obj_pumpkin/d_a_obj_pumpkin/func_80CB8274.s" } @@ -1140,7 +1147,7 @@ asm void __sinit_d_a_obj_pumpkin_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80CB8290 = (void*)__sinit_d_a_obj_pumpkin_cpp; +REGISTER_CTORS(0x80CB8290, __sinit_d_a_obj_pumpkin_cpp); #pragma pop /* 80CB8304-80CB834C 002C64 0048+00 2/1 0/0 0/0 .text __dt__21daObj_Pumpkin_Param_cFv */ @@ -1173,10 +1180,4 @@ static asm void func_80CB8354() { } #pragma pop -/* 80CB8460-80CB8469 0000F0 0009+00 1/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80CB8460 = ""; -SECTION_DEAD static char const* const stringBase_80CB8461 = "pumpkin"; -#pragma pop +/* 80CB8460-80CB8460 0000F0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_rcircle/d_a_obj_rcircle.cpp b/rel/d/a/obj/d_a_obj_rcircle/d_a_obj_rcircle.cpp index ea1943e5bcd..6d40efe259a 100644 --- a/rel/d/a/obj/d_a_obj_rcircle/d_a_obj_rcircle.cpp +++ b/rel/d/a/obj/d_a_obj_rcircle/d_a_obj_rcircle.cpp @@ -153,6 +153,12 @@ static asm void daObjRCircle_c_createHeap(fopAc_ac_c* param_0) { #pragma pop /* ############################################################################################## */ +/* 80CB8D08-80CB8D08 000008 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80CB8D08 = "RCircle"; +#pragma pop + /* 80CB8D10-80CB8D14 -00001 0004+00 3/3 0/0 0/0 .data l_arcName */ SECTION_DATA static void* l_arcName = (void*)&d_a_obj_rcircle__stringBase0; @@ -225,7 +231,7 @@ asm daObjRCircle_c::~daObjRCircle_c() { /* ############################################################################################## */ /* 80CB8D00-80CB8D04 000000 0004+00 2/2 0/0 0/0 .rodata @3701 */ SECTION_RODATA static f32 const lit_3701 = 1.0f; -COMPILER_STRIP_GATE(80CB8D00, &lit_3701); +COMPILER_STRIP_GATE(0x80CB8D00, &lit_3701); /* 80CB8D04-80CB8D08 000004 0004+00 2/2 0/0 0/0 .rodata @3702 */ SECTION_RODATA static u8 const lit_3702[4] = { @@ -234,7 +240,7 @@ SECTION_RODATA static u8 const lit_3702[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CB8D04, &lit_3702); +COMPILER_STRIP_GATE(0x80CB8D04, &lit_3702); /* 80CB8814-80CB8928 000234 0114+00 1/1 0/0 0/0 .text createHeap__14daObjRCircle_cFv */ #pragma push @@ -346,9 +352,4 @@ static asm void daObjRCircle_draw(daObjRCircle_c* param_0) { } #pragma pop -/* 80CB8D08-80CB8D10 000008 0008+00 1/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80CB8D08 = "RCircle"; -#pragma pop +/* 80CB8D08-80CB8D08 000008 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_rfHole/d_a_obj_rfHole.cpp b/rel/d/a/obj/d_a_obj_rfHole/d_a_obj_rfHole.cpp index de9e1d6ef69..0615a6e6138 100644 --- a/rel/d/a/obj/d_a_obj_rfHole/d_a_obj_rfHole.cpp +++ b/rel/d/a/obj/d_a_obj_rfHole/d_a_obj_rfHole.cpp @@ -84,10 +84,10 @@ struct dRes_control_c { struct dPa_levelEcallBack {}; -struct _GXColor {}; - struct csXyz {}; +struct _GXColor {}; + struct dPa_control_c { /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, @@ -215,13 +215,13 @@ extern "C" void __register_global_object(); /* ############################################################################################## */ /* 80CB9A84-80CB9A88 000000 0004+00 4/4 0/0 0/0 .rodata @3649 */ SECTION_RODATA static f32 const lit_3649 = 130.0f; -COMPILER_STRIP_GATE(80CB9A84, &lit_3649); +COMPILER_STRIP_GATE(0x80CB9A84, &lit_3649); /* 80CB9A88-80CB9A8C 000004 0004+00 0/1 0/0 0/0 .rodata @3650 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3650 = 200.0f; -COMPILER_STRIP_GATE(80CB9A88, &lit_3650); +COMPILER_STRIP_GATE(0x80CB9A88, &lit_3650); #pragma pop /* 80CB9A8C-80CB9A94 000008 0004+04 0/4 0/0 0/0 .rodata @3651 */ @@ -238,7 +238,7 @@ SECTION_RODATA static u8 const lit_3651[4 + 4 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CB9A8C, &lit_3651); +COMPILER_STRIP_GATE(0x80CB9A8C, &lit_3651); #pragma pop /* 80CB9ACC-80CB9AD8 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ @@ -389,6 +389,13 @@ asm void daRfHole_c::setBaseMtx() { } #pragma pop +/* ############################################################################################## */ +/* 80CB9AC0-80CB9AC0 00003C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80CB9AC0 = "Otosiana"; +#pragma pop + /* 80CB8F8C-80CB8FF8 00020C 006C+00 1/0 0/0 0/0 .text CreateHeap__10daRfHole_cFv */ #pragma push #pragma optimization_level 0 @@ -427,7 +434,7 @@ asm void daRfHole_c::rideCallBack(dBgW* param_0, fopAc_ac_c* param_1, fopAc_ac_c SECTION_RODATA static u8 const lit_3817[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CB9A94, &lit_3817); +COMPILER_STRIP_GATE(0x80CB9A94, &lit_3817); #pragma pop /* 80CB9A9C-80CB9AA4 000018 0008+00 0/1 0/0 0/0 .rodata @3818 */ @@ -436,7 +443,7 @@ COMPILER_STRIP_GATE(80CB9A94, &lit_3817); SECTION_RODATA static u8 const lit_3818[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CB9A9C, &lit_3818); +COMPILER_STRIP_GATE(0x80CB9A9C, &lit_3818); #pragma pop /* 80CB9AA4-80CB9AAC 000020 0008+00 0/1 0/0 0/0 .rodata @3819 */ @@ -445,21 +452,21 @@ COMPILER_STRIP_GATE(80CB9A9C, &lit_3818); SECTION_RODATA static u8 const lit_3819[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CB9AA4, &lit_3819); +COMPILER_STRIP_GATE(0x80CB9AA4, &lit_3819); #pragma pop /* 80CB9AAC-80CB9AB0 000028 0004+00 0/3 0/0 0/0 .rodata @3820 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3820 = 1.0f; -COMPILER_STRIP_GATE(80CB9AAC, &lit_3820); +COMPILER_STRIP_GATE(0x80CB9AAC, &lit_3820); #pragma pop /* 80CB9AB0-80CB9AB4 00002C 0004+00 0/2 0/0 0/0 .rodata @3821 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3821 = -1.0f; -COMPILER_STRIP_GATE(80CB9AB0, &lit_3821); +COMPILER_STRIP_GATE(0x80CB9AB0, &lit_3821); #pragma pop /* 80CB9BE8-80CB9BF4 000008 000C+00 1/1 0/0 0/0 .bss @3643 */ @@ -602,7 +609,7 @@ SECTION_RODATA static u8 const particle_id[10 + 2 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CB9AB4, &particle_id); +COMPILER_STRIP_GATE(0x80CB9AB4, &particle_id); #pragma pop /* 80CB9768-80CB9878 0009E8 0110+00 2/2 0/0 0/0 .text setBreakEffect__10daRfHole_cFv */ @@ -697,12 +704,7 @@ asm void __sinit_d_a_obj_rfHole_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80CB9A34 = (void*)__sinit_d_a_obj_rfHole_cpp; +REGISTER_CTORS(0x80CB9A34, __sinit_d_a_obj_rfHole_cpp); #pragma pop -/* 80CB9AC0-80CB9AC9 00003C 0009+00 3/3 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80CB9AC0 = "Otosiana"; -#pragma pop +/* 80CB9AC0-80CB9AC0 00003C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_rgate/d_a_obj_rgate.cpp b/rel/d/a/obj/d_a_obj_rgate/d_a_obj_rgate.cpp index c82b649ecc7..7d004b59ac5 100644 --- a/rel/d/a/obj/d_a_obj_rgate/d_a_obj_rgate.cpp +++ b/rel/d/a/obj/d_a_obj_rgate/d_a_obj_rgate.cpp @@ -234,7 +234,7 @@ extern "C" static void daObjRgate_MoveBGDelete__FP12daObjRgate_c(); extern "C" static void daObjRgate_MoveBGExecute__FP12daObjRgate_c(); extern "C" static void daObjRgate_MoveBGDraw__FP12daObjRgate_c(); extern "C" void __dt__10cCcD_GSttsFv(); -extern "C" void func_80CBC344(u8*); +extern "C" void func_80CBC344(void* _this, u8*); extern "C" extern char const* const d_a_obj_rgate__stringBase0; // @@ -362,7 +362,7 @@ SECTION_RODATA static u8 const l_cull_box[24] = { 0xC3, 0xC8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC3, 0xC8, 0x00, 0x00, 0x43, 0xC8, 0x00, 0x00, 0x43, 0xE1, 0x00, 0x00, 0x43, 0xC8, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CBC368, &l_cull_box); +COMPILER_STRIP_GATE(0x80CBC368, &l_cull_box); /* 80CBC380-80CBC3C4 000018 0044+00 0/0 0/0 0/0 .rodata l_cyl_src */ #pragma push @@ -374,7 +374,7 @@ SECTION_RODATA static u8 const l_cyl_src[68] = { 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0x20, 0x00, 0x00, 0x43, 0xAF, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CBC380, &l_cyl_src); +COMPILER_STRIP_GATE(0x80CBC380, &l_cyl_src); #pragma pop /* 80CBC3C4-80CBC3C8 00005C 0004+00 2/8 0/0 0/0 .rodata @3897 */ @@ -384,20 +384,20 @@ SECTION_RODATA static u8 const lit_3897[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CBC3C4, &lit_3897); +COMPILER_STRIP_GATE(0x80CBC3C4, &lit_3897); /* 80CBC3C8-80CBC3CC 000060 0004+00 0/2 0/0 0/0 .rodata @3898 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3898 = 128.0f; -COMPILER_STRIP_GATE(80CBC3C8, &lit_3898); +COMPILER_STRIP_GATE(0x80CBC3C8, &lit_3898); #pragma pop /* 80CBC3CC-80CBC3D0 000064 0004+00 0/2 0/0 0/0 .rodata @3899 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3899 = 38.0f; -COMPILER_STRIP_GATE(80CBC3CC, &lit_3899); +COMPILER_STRIP_GATE(0x80CBC3CC, &lit_3899); #pragma pop /* 80CB9DF8-80CB9F4C 0001D8 0154+00 1/1 0/0 0/0 .text initBaseMtx__12daObjRgate_cFv */ @@ -415,84 +415,84 @@ asm void daObjRgate_c::initBaseMtx() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4033 = -350.0f; -COMPILER_STRIP_GATE(80CBC3D0, &lit_4033); +COMPILER_STRIP_GATE(0x80CBC3D0, &lit_4033); #pragma pop /* 80CBC3D4-80CBC3D8 00006C 0004+00 0/3 0/0 0/0 .rodata @4034 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4034 = 350.0f; -COMPILER_STRIP_GATE(80CBC3D4, &lit_4034); +COMPILER_STRIP_GATE(0x80CBC3D4, &lit_4034); #pragma pop /* 80CBC3D8-80CBC3DC 000070 0004+00 0/1 0/0 0/0 .rodata @4035 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4035 = 1.0f / 20.0f; -COMPILER_STRIP_GATE(80CBC3D8, &lit_4035); +COMPILER_STRIP_GATE(0x80CBC3D8, &lit_4035); #pragma pop /* 80CBC3DC-80CBC3E0 000074 0004+00 0/1 0/0 0/0 .rodata @4036 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4036 = 50.0f; -COMPILER_STRIP_GATE(80CBC3DC, &lit_4036); +COMPILER_STRIP_GATE(0x80CBC3DC, &lit_4036); #pragma pop /* 80CBC3E0-80CBC3E4 000078 0004+00 0/1 0/0 0/0 .rodata @4037 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4037 = 5.0f; -COMPILER_STRIP_GATE(80CBC3E0, &lit_4037); +COMPILER_STRIP_GATE(0x80CBC3E0, &lit_4037); #pragma pop /* 80CBC3E4-80CBC3E8 00007C 0004+00 0/1 0/0 0/0 .rodata @4038 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4038 = 14.0f; -COMPILER_STRIP_GATE(80CBC3E4, &lit_4038); +COMPILER_STRIP_GATE(0x80CBC3E4, &lit_4038); #pragma pop /* 80CBC3E8-80CBC3EC 000080 0004+00 0/1 0/0 0/0 .rodata @4039 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4039 = -14.0f; -COMPILER_STRIP_GATE(80CBC3E8, &lit_4039); +COMPILER_STRIP_GATE(0x80CBC3E8, &lit_4039); #pragma pop /* 80CBC3EC-80CBC3F0 000084 0004+00 0/1 0/0 0/0 .rodata @4040 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4040 = -2.5f; -COMPILER_STRIP_GATE(80CBC3EC, &lit_4040); +COMPILER_STRIP_GATE(0x80CBC3EC, &lit_4040); #pragma pop /* 80CBC3F0-80CBC3F4 000088 0004+00 0/1 0/0 0/0 .rodata @4041 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4041 = -20.0f; -COMPILER_STRIP_GATE(80CBC3F0, &lit_4041); +COMPILER_STRIP_GATE(0x80CBC3F0, &lit_4041); #pragma pop /* 80CBC3F4-80CBC3F8 00008C 0004+00 0/1 0/0 0/0 .rodata @4042 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4042 = 2.0f; -COMPILER_STRIP_GATE(80CBC3F4, &lit_4042); +COMPILER_STRIP_GATE(0x80CBC3F4, &lit_4042); #pragma pop /* 80CBC3F8-80CBC3FC 000090 0004+00 0/1 0/0 0/0 .rodata @4043 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4043 = 0.5f; -COMPILER_STRIP_GATE(80CBC3F8, &lit_4043); +COMPILER_STRIP_GATE(0x80CBC3F8, &lit_4043); #pragma pop /* 80CBC3FC-80CBC400 000094 0004+00 0/1 0/0 0/0 .rodata @4044 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4044 = 5.0f / 3.0f; -COMPILER_STRIP_GATE(80CBC3FC, &lit_4044); +COMPILER_STRIP_GATE(0x80CBC3FC, &lit_4044); #pragma pop /* 80CB9F4C-80CBA468 00032C 051C+00 2/2 0/0 0/0 .text setBaseMtx__12daObjRgate_cFv */ @@ -508,7 +508,14 @@ asm void daObjRgate_c::setBaseMtx() { /* ############################################################################################## */ /* 80CBC400-80CBC404 000098 0004+00 1/1 0/0 0/0 .rodata @4114 */ SECTION_RODATA static f32 const lit_4114 = 150.0f; -COMPILER_STRIP_GATE(80CBC400, &lit_4114); +COMPILER_STRIP_GATE(0x80CBC400, &lit_4114); + +/* 80CBC458-80CBC458 0000F0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80CBC458 = "M_RGate00"; +SECTION_DEAD static char const* const stringBase_80CBC462 = "RIDER_GATE_OPEN00"; +#pragma pop /* 80CBC4A0-80CBC4AC 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { @@ -574,42 +581,42 @@ asm void daObjRgate_c::create1st() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4288 = -100.0f; -COMPILER_STRIP_GATE(80CBC404, &lit_4288); +COMPILER_STRIP_GATE(0x80CBC404, &lit_4288); #pragma pop /* 80CBC408-80CBC40C 0000A0 0004+00 0/2 0/0 0/0 .rodata @4289 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4289 = 400.0f; -COMPILER_STRIP_GATE(80CBC408, &lit_4289); +COMPILER_STRIP_GATE(0x80CBC408, &lit_4289); #pragma pop /* 80CBC40C-80CBC410 0000A4 0004+00 0/1 0/0 0/0 .rodata @4290 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4290 = 300.0f; -COMPILER_STRIP_GATE(80CBC40C, &lit_4290); +COMPILER_STRIP_GATE(0x80CBC40C, &lit_4290); #pragma pop /* 80CBC410-80CBC414 0000A8 0004+00 0/3 0/0 0/0 .rodata @4291 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4291 = 100.0f; -COMPILER_STRIP_GATE(80CBC410, &lit_4291); +COMPILER_STRIP_GATE(0x80CBC410, &lit_4291); #pragma pop /* 80CBC414-80CBC418 0000AC 0004+00 0/2 0/0 0/0 .rodata @4292 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4292 = 250.0f; -COMPILER_STRIP_GATE(80CBC414, &lit_4292); +COMPILER_STRIP_GATE(0x80CBC414, &lit_4292); #pragma pop /* 80CBC418-80CBC41C 0000B0 0004+00 0/2 0/0 0/0 .rodata @4293 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4293 = 90.0f; -COMPILER_STRIP_GATE(80CBC418, &lit_4293); +COMPILER_STRIP_GATE(0x80CBC418, &lit_4293); #pragma pop /* 80CBA8A8-80CBAC38 000C88 0390+00 1/1 0/0 0/0 .text checkAreaL__12daObjRgate_cFPC4cXyzPC4cXyz */ @@ -627,7 +634,7 @@ asm void daObjRgate_c::checkAreaL(cXyz const* param_0, cXyz const* param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4426 = -300.0f; -COMPILER_STRIP_GATE(80CBC41C, &lit_4426); +COMPILER_STRIP_GATE(0x80CBC41C, &lit_4426); #pragma pop /* 80CBAC38-80CBAFC4 001018 038C+00 1/1 0/0 0/0 .text checkAreaR__12daObjRgate_cFPC4cXyzPC4cXyz */ @@ -673,11 +680,11 @@ asm void daObjRgate_c::checkDirR(fopAc_ac_c* param_0) { /* ############################################################################################## */ /* 80CBC420-80CBC424 0000B8 0004+00 3/4 0/0 0/0 .rodata @4513 */ SECTION_RODATA static f32 const lit_4513 = 1.0f; -COMPILER_STRIP_GATE(80CBC420, &lit_4513); +COMPILER_STRIP_GATE(0x80CBC420, &lit_4513); /* 80CBC424-80CBC428 0000BC 0004+00 3/3 0/0 0/0 .rodata @4514 */ SECTION_RODATA static f32 const lit_4514 = -1.0f; -COMPILER_STRIP_GATE(80CBC424, &lit_4514); +COMPILER_STRIP_GATE(0x80CBC424, &lit_4514); /* 80CBB210-80CBB28C 0015F0 007C+00 1/1 0/0 0/0 .text setAtkSE__12daObjRgate_cFv */ #pragma push @@ -714,70 +721,70 @@ asm void daObjRgate_c::action() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4733 = 2000.0f; -COMPILER_STRIP_GATE(80CBC428, &lit_4733); +COMPILER_STRIP_GATE(0x80CBC428, &lit_4733); #pragma pop /* 80CBC42C-80CBC430 0000C4 0004+00 0/1 0/0 0/0 .rodata @4734 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4734 = 2500.0f; -COMPILER_STRIP_GATE(80CBC42C, &lit_4734); +COMPILER_STRIP_GATE(0x80CBC42C, &lit_4734); #pragma pop /* 80CBC430-80CBC434 0000C8 0004+00 0/1 0/0 0/0 .rodata @4735 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4735 = -7.0f / 10.0f; -COMPILER_STRIP_GATE(80CBC430, &lit_4735); +COMPILER_STRIP_GATE(0x80CBC430, &lit_4735); #pragma pop /* 80CBC434-80CBC438 0000CC 0004+00 0/1 0/0 0/0 .rodata @4736 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4736 = -39.0f; -COMPILER_STRIP_GATE(80CBC434, &lit_4736); +COMPILER_STRIP_GATE(0x80CBC434, &lit_4736); #pragma pop /* 80CBC438-80CBC43C 0000D0 0004+00 0/1 0/0 0/0 .rodata @4737 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4737 = -25.0f; -COMPILER_STRIP_GATE(80CBC438, &lit_4737); +COMPILER_STRIP_GATE(0x80CBC438, &lit_4737); #pragma pop /* 80CBC43C-80CBC440 0000D4 0004+00 0/1 0/0 0/0 .rodata @4738 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4738 = 1200.0f; -COMPILER_STRIP_GATE(80CBC43C, &lit_4738); +COMPILER_STRIP_GATE(0x80CBC43C, &lit_4738); #pragma pop /* 80CBC440-80CBC444 0000D8 0004+00 0/1 0/0 0/0 .rodata @4739 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4739 = 600.0f; -COMPILER_STRIP_GATE(80CBC440, &lit_4739); +COMPILER_STRIP_GATE(0x80CBC440, &lit_4739); #pragma pop /* 80CBC444-80CBC448 0000DC 0004+00 0/1 0/0 0/0 .rodata @4740 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4740 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(80CBC444, &lit_4740); +COMPILER_STRIP_GATE(0x80CBC444, &lit_4740); #pragma pop /* 80CBC448-80CBC44C 0000E0 0004+00 0/1 0/0 0/0 .rodata @4741 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4741 = 20.0f; -COMPILER_STRIP_GATE(80CBC448, &lit_4741); +COMPILER_STRIP_GATE(0x80CBC448, &lit_4741); #pragma pop /* 80CBC44C-80CBC450 0000E4 0004+00 0/1 0/0 0/0 .rodata @4742 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4742 = 7.0f / 10.0f; -COMPILER_STRIP_GATE(80CBC44C, &lit_4742); +COMPILER_STRIP_GATE(0x80CBC44C, &lit_4742); #pragma pop /* 80CBC450-80CBC458 0000E8 0008+00 0/1 0/0 0/0 .rodata @4744 */ @@ -786,7 +793,7 @@ COMPILER_STRIP_GATE(80CBC44C, &lit_4742); SECTION_RODATA static u8 const lit_4744[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CBC450, &lit_4744); +COMPILER_STRIP_GATE(0x80CBC450, &lit_4744); #pragma pop /* 80CBB370-80CBBA10 001750 06A0+00 1/1 0/0 0/0 .text action_typeA__12daObjRgate_cFv */ @@ -877,6 +884,14 @@ asm void daObjRgate_c::event_proc_call() { } #pragma pop +/* ############################################################################################## */ +/* 80CBC458-80CBC458 0000F0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80CBC474 = "K_GATE"; +SECTION_DEAD static char const* const stringBase_80CBC47B = "Timer"; +#pragma pop + /* 80CBBC04-80CBBD68 001FE4 0164+00 1/1 0/0 0/0 .text demoProc__12daObjRgate_cFv */ #pragma push #pragma optimization_level 0 @@ -888,6 +903,15 @@ asm void daObjRgate_c::demoProc() { #pragma pop /* ############################################################################################## */ +/* 80CBC458-80CBC458 0000F0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80CBC481 = "WAIT"; +SECTION_DEAD static char const* const stringBase_80CBC486 = "ADJUSTMENT"; +SECTION_DEAD static char const* const stringBase_80CBC491 = "UNLOCK"; +SECTION_DEAD static char const* const stringBase_80CBC498 = "OPEN"; +#pragma pop + /* 80CBC50C-80CBC51C -00001 0010+00 1/1 0/0 0/0 .data action_table$4852 */ SECTION_DATA static void* action_table[4] = { (void*)(((char*)&d_a_obj_rgate__stringBase0) + 0x29), @@ -1107,22 +1131,10 @@ asm cCcD_GStts::~cCcD_GStts() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80CBC344(u8* param_0) { +extern "C" asm void func_80CBC344(void* _this, u8* param_0) { nofralloc #include "asm/rel/d/a/obj/d_a_obj_rgate/d_a_obj_rgate/func_80CBC344.s" } #pragma pop -/* 80CBC458-80CBC49D 0000F0 0045+00 4/2 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80CBC458 = "M_RGate00"; -SECTION_DEAD static char const* const stringBase_80CBC462 = "RIDER_GATE_OPEN00"; -SECTION_DEAD static char const* const stringBase_80CBC474 = "K_GATE"; -SECTION_DEAD static char const* const stringBase_80CBC47B = "Timer"; -SECTION_DEAD static char const* const stringBase_80CBC481 = "WAIT"; -SECTION_DEAD static char const* const stringBase_80CBC486 = "ADJUSTMENT"; -SECTION_DEAD static char const* const stringBase_80CBC491 = "UNLOCK"; -SECTION_DEAD static char const* const stringBase_80CBC498 = "OPEN"; -#pragma pop +/* 80CBC458-80CBC458 0000F0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_riverrock/d_a_obj_riverrock.cpp b/rel/d/a/obj/d_a_obj_riverrock/d_a_obj_riverrock.cpp index 11c6f3a8d84..63bd715ccc4 100644 --- a/rel/d/a/obj/d_a_obj_riverrock/d_a_obj_riverrock.cpp +++ b/rel/d/a/obj/d_a_obj_riverrock/d_a_obj_riverrock.cpp @@ -163,10 +163,10 @@ struct Z2SoundObjBase { /* 802BDFF8 */ void deleteObject(); }; -struct Vec {}; - struct JAISoundID {}; +struct Vec {}; + struct Z2SeMgr { /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); }; @@ -296,7 +296,13 @@ SECTION_RODATA static u8 const lit_3631[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CBDA5C, &lit_3631); +COMPILER_STRIP_GATE(0x80CBDA5C, &lit_3631); + +/* 80CBDB14-80CBDB14 0000B8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80CBDB14 = "RiverRock"; +#pragma pop /* 80CBDB40-80CBDB44 -00001 0004+00 3/3 0/0 0/0 .data l_arcName */ SECTION_DATA static void* l_arcName = (void*)&d_a_obj_riverrock__stringBase0; @@ -377,7 +383,7 @@ SECTION_RODATA static u8 const ccCylSrc[68] = { 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC3, 0xFA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x44, 0x7A, 0x00, 0x00, 0x44, 0x7A, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CBDA60, &ccCylSrc); +COMPILER_STRIP_GATE(0x80CBDA60, &ccCylSrc); /* 80CBC6F4-80CBC754 000114 0060+00 1/1 0/0 0/0 .text initCcCylinder__16daObjRIVERROCK_cFv */ #pragma push @@ -396,7 +402,7 @@ SECTION_RODATA static f32 const lit_3642[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80CBDAA4, &lit_3642); +COMPILER_STRIP_GATE(0x80CBDAA4, &lit_3642); /* 80CBC754-80CBC7B4 000174 0060+00 1/1 0/0 0/0 .text SetCcCyl__16daObjRIVERROCK_cFv */ #pragma push @@ -434,7 +440,7 @@ static asm void daObjRIVERROCK_Delete(daObjRIVERROCK_c* param_0) { SECTION_RODATA static u8 const lit_3669[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CBDAAC, &lit_3669); +COMPILER_STRIP_GATE(0x80CBDAAC, &lit_3669); /* 80CBC7F8-80CBC8BC 000218 00C4+00 1/1 0/0 0/0 .text BreakWaitAction__16daObjRIVERROCK_cFv */ #pragma push @@ -451,56 +457,56 @@ asm void daObjRIVERROCK_c::BreakWaitAction() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3742 = 700.0f; -COMPILER_STRIP_GATE(80CBDAB4, &lit_3742); +COMPILER_STRIP_GATE(0x80CBDAB4, &lit_3742); #pragma pop /* 80CBDAB8-80CBDABC 00005C 0004+00 0/1 0/0 0/0 .rodata @3743 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3743 = 5650.0f; -COMPILER_STRIP_GATE(80CBDAB8, &lit_3743); +COMPILER_STRIP_GATE(0x80CBDAB8, &lit_3743); #pragma pop /* 80CBDABC-80CBDAC0 000060 0004+00 0/1 0/0 0/0 .rodata @3744 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3744 = 2850.0f; -COMPILER_STRIP_GATE(80CBDABC, &lit_3744); +COMPILER_STRIP_GATE(0x80CBDABC, &lit_3744); #pragma pop /* 80CBDAC0-80CBDAC4 000064 0004+00 0/1 0/0 0/0 .rodata @3745 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3745 = 300.0f; -COMPILER_STRIP_GATE(80CBDAC0, &lit_3745); +COMPILER_STRIP_GATE(0x80CBDAC0, &lit_3745); #pragma pop /* 80CBDAC4-80CBDAC8 000068 0004+00 0/1 0/0 0/0 .rodata @3746 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3746 = -300.0f; -COMPILER_STRIP_GATE(80CBDAC4, &lit_3746); +COMPILER_STRIP_GATE(0x80CBDAC4, &lit_3746); #pragma pop /* 80CBDAC8-80CBDACC 00006C 0004+00 0/3 0/0 0/0 .rodata @3747 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3747 = 1.0f; -COMPILER_STRIP_GATE(80CBDAC8, &lit_3747); +COMPILER_STRIP_GATE(0x80CBDAC8, &lit_3747); #pragma pop /* 80CBDACC-80CBDAD0 000070 0004+00 0/2 0/0 0/0 .rodata @3748 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3748 = -1.0f; -COMPILER_STRIP_GATE(80CBDACC, &lit_3748); +COMPILER_STRIP_GATE(0x80CBDACC, &lit_3748); #pragma pop /* 80CBDAD0-80CBDAD4 000074 0004+00 0/1 0/0 0/0 .rodata @3749 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3749 = 3.0f; -COMPILER_STRIP_GATE(80CBDAD0, &lit_3749); +COMPILER_STRIP_GATE(0x80CBDAD0, &lit_3749); #pragma pop /* 80CBC8BC-80CBCC3C 0002DC 0380+00 1/1 0/0 0/0 .text CheckBG__16daObjRIVERROCK_cFv */ @@ -516,7 +522,7 @@ asm void daObjRIVERROCK_c::CheckBG() { /* ############################################################################################## */ /* 80CBDAD4-80CBDAD8 000078 0004+00 1/1 0/0 0/0 .rodata @3758 */ SECTION_RODATA static f32 const lit_3758 = 3628.0f; -COMPILER_STRIP_GATE(80CBDAD4, &lit_3758); +COMPILER_STRIP_GATE(0x80CBDAD4, &lit_3758); /* 80CBDBE8-80CBDBEC 000008 0004+00 2/2 0/0 0/0 .bss None */ static u8 data_80CBDBE8[4]; @@ -574,14 +580,14 @@ asm void daObjRIVERROCK_c::Action() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3861 = 200.0f; -COMPILER_STRIP_GATE(80CBDAD8, &lit_3861); +COMPILER_STRIP_GATE(0x80CBDAD8, &lit_3861); #pragma pop /* 80CBDADC-80CBDAE0 000080 0004+00 0/1 0/0 0/0 .rodata @3862 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3862 = 280.0f; -COMPILER_STRIP_GATE(80CBDADC, &lit_3862); +COMPILER_STRIP_GATE(0x80CBDADC, &lit_3862); #pragma pop /* 80CBCE2C-80CBD1C4 00084C 0398+00 3/3 0/0 0/0 .text BreakSet__16daObjRIVERROCK_cFv */ @@ -609,14 +615,14 @@ asm void daObjRIVERROCK_c::WaitAction() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3895 = 150.0f; -COMPILER_STRIP_GATE(80CBDAE0, &lit_3895); +COMPILER_STRIP_GATE(0x80CBDAE0, &lit_3895); #pragma pop /* 80CBDAE4-80CBDAE8 000088 0004+00 0/1 0/0 0/0 .rodata @3896 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3896 = -150.0f; -COMPILER_STRIP_GATE(80CBDAE4, &lit_3896); +COMPILER_STRIP_GATE(0x80CBDAE4, &lit_3896); #pragma pop /* 80CBD204-80CBD2FC 000C24 00F8+00 1/1 0/0 0/0 .text setBaseMtx__16daObjRIVERROCK_cFv */ @@ -650,6 +656,13 @@ static asm void daObjRIVERROCK_Execute(daObjRIVERROCK_c* param_0) { } #pragma pop +/* ############################################################################################## */ +/* 80CBDB14-80CBDB14 0000B8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80CBDB1E = "M_RiverRock.bmd"; +#pragma pop + /* 80CBD348-80CBD3C0 000D68 0078+00 1/0 0/0 0/0 .text CreateHeap__16daObjRIVERROCK_cFv */ #pragma push #pragma optimization_level 0 @@ -665,49 +678,49 @@ asm void daObjRIVERROCK_c::CreateHeap() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4026 = -9.0f; -COMPILER_STRIP_GATE(80CBDAE8, &lit_4026); +COMPILER_STRIP_GATE(0x80CBDAE8, &lit_4026); #pragma pop /* 80CBDAEC-80CBDAF0 000090 0004+00 0/1 0/0 0/0 .rodata @4027 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4027 = 0.5f; -COMPILER_STRIP_GATE(80CBDAEC, &lit_4027); +COMPILER_STRIP_GATE(0x80CBDAEC, &lit_4027); #pragma pop /* 80CBDAF0-80CBDAF4 000094 0004+00 0/1 0/0 0/0 .rodata @4028 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4028 = 1.0f / 20.0f; -COMPILER_STRIP_GATE(80CBDAF0, &lit_4028); +COMPILER_STRIP_GATE(0x80CBDAF0, &lit_4028); #pragma pop /* 80CBDAF4-80CBDAF8 000098 0004+00 0/1 0/0 0/0 .rodata @4029 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4029 = 2800.0f; -COMPILER_STRIP_GATE(80CBDAF4, &lit_4029); +COMPILER_STRIP_GATE(0x80CBDAF4, &lit_4029); #pragma pop /* 80CBDAF8-80CBDAFC 00009C 0004+00 0/1 0/0 0/0 .rodata @4030 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4030 = 6000.0f; -COMPILER_STRIP_GATE(80CBDAF8, &lit_4030); +COMPILER_STRIP_GATE(0x80CBDAF8, &lit_4030); #pragma pop /* 80CBDAFC-80CBDB00 0000A0 0004+00 0/1 0/0 0/0 .rodata @4031 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4031 = -6000.0f; -COMPILER_STRIP_GATE(80CBDAFC, &lit_4031); +COMPILER_STRIP_GATE(0x80CBDAFC, &lit_4031); #pragma pop /* 80CBDB00-80CBDB04 0000A4 0004+00 0/2 0/0 0/0 .rodata @4032 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4032 = -500.0f; -COMPILER_STRIP_GATE(80CBDB00, &lit_4032); +COMPILER_STRIP_GATE(0x80CBDB00, &lit_4032); #pragma pop /* 80CBDB04-80CBDB0C 0000A8 0008+00 0/1 0/0 0/0 .rodata @4034 */ @@ -716,7 +729,13 @@ COMPILER_STRIP_GATE(80CBDB00, &lit_4032); SECTION_RODATA static u8 const lit_4034[8] = { 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CBDB04, &lit_4034); +COMPILER_STRIP_GATE(0x80CBDB04, &lit_4034); +#pragma pop + +/* 80CBDB14-80CBDB14 0000B8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80CBDB2E = "M_RiverRock.dzb"; #pragma pop /* 80CBD3C0-80CBD71C 000DE0 035C+00 1/1 0/0 0/0 .text create__16daObjRIVERROCK_cFv */ @@ -760,14 +779,14 @@ static bool daObjRIVERROCK_IsDelete(daObjRIVERROCK_c* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4119 = -1000.0f; -COMPILER_STRIP_GATE(80CBDB0C, &lit_4119); +COMPILER_STRIP_GATE(0x80CBDB0C, &lit_4119); #pragma pop /* 80CBDB10-80CBDB14 0000B4 0004+00 0/1 0/0 0/0 .rodata @4120 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4120 = 500.0f; -COMPILER_STRIP_GATE(80CBDB10, &lit_4120); +COMPILER_STRIP_GATE(0x80CBDB10, &lit_4120); #pragma pop /* 80CBD7B4-80CBD814 0011D4 0060+00 1/0 0/0 0/0 .text Create__16daObjRIVERROCK_cFv */ @@ -832,14 +851,7 @@ asm void __sinit_d_a_obj_riverrock_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80CBDA0C = (void*)__sinit_d_a_obj_riverrock_cpp; +REGISTER_CTORS(0x80CBDA0C, __sinit_d_a_obj_riverrock_cpp); #pragma pop -/* 80CBDB14-80CBDB3E 0000B8 002A+00 3/2 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80CBDB14 = "RiverRock"; -SECTION_DEAD static char const* const stringBase_80CBDB1E = "M_RiverRock.bmd"; -SECTION_DEAD static char const* const stringBase_80CBDB2E = "M_RiverRock.dzb"; -#pragma pop +/* 80CBDB14-80CBDB14 0000B8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_rock/d_a_obj_rock.cpp b/rel/d/a/obj/d_a_obj_rock/d_a_obj_rock.cpp index 97019c8b3e3..52d95d75124 100644 --- a/rel/d/a/obj/d_a_obj_rock/d_a_obj_rock.cpp +++ b/rel/d/a/obj/d_a_obj_rock/d_a_obj_rock.cpp @@ -36,10 +36,10 @@ struct dRes_control_c { /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); }; -struct J3DModelData {}; - struct J3DModel {}; +struct J3DModelData {}; + struct dComIfG_play_c { /* 8002CAF0 */ void addSimpleModel(J3DModelData*, int, u8); /* 8002CB30 */ void removeSimpleModel(J3DModelData*, int); @@ -201,7 +201,7 @@ static asm void daObj_Rock_Draw(obj_rock_class* param_0) { /* ############################################################################################## */ /* 80CBE7A4-80CBE7A8 000000 0004+00 3/3 0/0 0/0 .rodata @3814 */ SECTION_RODATA static f32 const lit_3814 = 100.0f; -COMPILER_STRIP_GATE(80CBE7A4, &lit_3814); +COMPILER_STRIP_GATE(0x80CBE7A4, &lit_3814); /* 80CBDD20-80CBDE48 000100 0128+00 2/1 0/0 0/0 .text daObj_Rock_Execute__FP14obj_rock_class */ #pragma push @@ -218,6 +218,13 @@ static bool daObj_Rock_IsDelete(obj_rock_class* param_0) { return true; } +/* ############################################################################################## */ +/* 80CBE7E4-80CBE7E4 000040 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80CBE7E4 = "Obj_rock"; +#pragma pop + /* 80CBDE50-80CBDED8 000230 0088+00 1/0 0/0 0/0 .text daObj_Rock_Delete__FP14obj_rock_class */ #pragma push #pragma optimization_level 0 @@ -248,7 +255,7 @@ SECTION_RODATA static u8 const lit_3894[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CBE7A8, &lit_3894); +COMPILER_STRIP_GATE(0x80CBE7A8, &lit_3894); #pragma pop /* 80CBE7AC-80CBE7B4 000008 0008+00 0/1 0/0 0/0 .rodata @3895 */ @@ -257,7 +264,7 @@ COMPILER_STRIP_GATE(80CBE7A8, &lit_3894); SECTION_RODATA static u8 const lit_3895[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CBE7AC, &lit_3895); +COMPILER_STRIP_GATE(0x80CBE7AC, &lit_3895); #pragma pop /* 80CBE7B4-80CBE7BC 000010 0008+00 0/1 0/0 0/0 .rodata @3896 */ @@ -266,7 +273,7 @@ COMPILER_STRIP_GATE(80CBE7AC, &lit_3895); SECTION_RODATA static u8 const lit_3896[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CBE7B4, &lit_3896); +COMPILER_STRIP_GATE(0x80CBE7B4, &lit_3896); #pragma pop /* 80CBE7BC-80CBE7C4 000018 0008+00 0/1 0/0 0/0 .rodata @3897 */ @@ -275,14 +282,14 @@ COMPILER_STRIP_GATE(80CBE7B4, &lit_3896); SECTION_RODATA static u8 const lit_3897[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CBE7BC, &lit_3897); +COMPILER_STRIP_GATE(0x80CBE7BC, &lit_3897); #pragma pop /* 80CBE7C4-80CBE7C8 000020 0004+00 0/1 0/0 0/0 .rodata @3898 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3898 = 200.0f; -COMPILER_STRIP_GATE(80CBE7C4, &lit_3898); +COMPILER_STRIP_GATE(0x80CBE7C4, &lit_3898); #pragma pop /* 80CBDF84-80CBE138 000364 01B4+00 1/1 0/0 0/0 .text set_pos_check__FP14obj_rock_classi @@ -301,35 +308,35 @@ static asm void set_pos_check(obj_rock_class* param_0, int param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4012 = 65536.0f; -COMPILER_STRIP_GATE(80CBE7C8, &lit_4012); +COMPILER_STRIP_GATE(0x80CBE7C8, &lit_4012); #pragma pop /* 80CBE7CC-80CBE7D0 000028 0004+00 0/1 0/0 0/0 .rodata @4013 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4013 = 0.5f; -COMPILER_STRIP_GATE(80CBE7CC, &lit_4013); +COMPILER_STRIP_GATE(0x80CBE7CC, &lit_4013); #pragma pop /* 80CBE7D0-80CBE7D4 00002C 0004+00 0/1 0/0 0/0 .rodata @4014 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4014 = 2.0f / 5.0f; -COMPILER_STRIP_GATE(80CBE7D0, &lit_4014); +COMPILER_STRIP_GATE(0x80CBE7D0, &lit_4014); #pragma pop /* 80CBE7D4-80CBE7D8 000030 0004+00 0/1 0/0 0/0 .rodata @4015 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4015 = 70.0f; -COMPILER_STRIP_GATE(80CBE7D4, &lit_4015); +COMPILER_STRIP_GATE(0x80CBE7D4, &lit_4015); #pragma pop /* 80CBE7D8-80CBE7DC 000034 0004+00 0/1 0/0 0/0 .rodata @4016 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4016 = 1.0f; -COMPILER_STRIP_GATE(80CBE7D8, &lit_4016); +COMPILER_STRIP_GATE(0x80CBE7D8, &lit_4016); #pragma pop /* 80CBE7DC-80CBE7E4 000038 0008+00 0/1 0/0 0/0 .rodata @4018 */ @@ -338,7 +345,7 @@ COMPILER_STRIP_GATE(80CBE7D8, &lit_4016); SECTION_RODATA static u8 const lit_4018[8] = { 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CBE7DC, &lit_4018); +COMPILER_STRIP_GATE(0x80CBE7DC, &lit_4018); #pragma pop /* 80CBE7F0-80CBE830 000000 0040+00 1/1 0/0 0/0 .data cc_sph_src$3926 */ @@ -437,9 +444,4 @@ asm cM3dGAab::~cM3dGAab() { } #pragma pop -/* 80CBE7E4-80CBE7ED 000040 0009+00 3/3 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80CBE7E4 = "Obj_rock"; -#pragma pop +/* 80CBE7E4-80CBE7E4 000040 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_rope_bridge/d_a_obj_rope_bridge.cpp b/rel/d/a/obj/d_a_obj_rope_bridge/d_a_obj_rope_bridge.cpp index a85913b1fc5..22032c557a1 100644 --- a/rel/d/a/obj/d_a_obj_rope_bridge/d_a_obj_rope_bridge.cpp +++ b/rel/d/a/obj/d_a_obj_rope_bridge/d_a_obj_rope_bridge.cpp @@ -40,11 +40,11 @@ struct mDoExt_3DlineMatSortPacket { /* 80014738 */ void setMat(mDoExt_3DlineMat_c*); }; -struct dKy_tevstr_c {}; +struct ResTIMG {}; struct _GXColor {}; -struct ResTIMG {}; +struct dKy_tevstr_c {}; struct mDoExt_3DlineMat1_c { /* 80013360 */ void init(u16, u16, ResTIMG*, int); @@ -375,6 +375,16 @@ asm void daObjRBridge_c::setBaseMtx() { } #pragma pop +/* ############################################################################################## */ +/* 80597E40-80597E40 0000C4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80597E40 = "L_RopeB_S"; +SECTION_DEAD static char const* const stringBase_80597E4A = "L_RopeB_L"; +SECTION_DEAD static char const* const stringBase_80597E54 = "L_Ropest"; +SECTION_DEAD static char const* const stringBase_80597E5D = "D_MN54"; +#pragma pop + /* 80595F84-80595FE0 0001C4 005C+00 2/2 0/0 0/0 .text checkE3Special__14daObjRBridge_cFv */ #pragma push @@ -391,13 +401,13 @@ asm void daObjRBridge_c::checkE3Special() { SECTION_RODATA static u8 const l_brgBmdIdx[8] = { 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x04, }; -COMPILER_STRIP_GATE(80597D7C, &l_brgBmdIdx); +COMPILER_STRIP_GATE(0x80597D7C, &l_brgBmdIdx); /* 80597D84-80597D8C 000008 0008+00 1/1 0/0 0/0 .rodata l_brgDzbIdx */ SECTION_RODATA static u8 const l_brgDzbIdx[8] = { 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x07, }; -COMPILER_STRIP_GATE(80597D84, &l_brgDzbIdx); +COMPILER_STRIP_GATE(0x80597D84, &l_brgDzbIdx); /* 80597D8C-80597D94 000010 0008+00 0/0 0/0 0/0 .rodata l_brg_height */ #pragma push @@ -405,7 +415,7 @@ COMPILER_STRIP_GATE(80597D84, &l_brgDzbIdx); SECTION_RODATA static u8 const l_brg_height[8] = { 0x44, 0x16, 0x00, 0x00, 0x44, 0x96, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80597D8C, &l_brg_height); +COMPILER_STRIP_GATE(0x80597D8C, &l_brg_height); #pragma pop /* 80597D94-80597D9C 000018 0008+00 0/1 0/0 0/0 .rodata l_rope_length */ @@ -414,7 +424,7 @@ COMPILER_STRIP_GATE(80597D8C, &l_brg_height); SECTION_RODATA static u8 const l_rope_length[8] = { 0x43, 0x96, 0x00, 0x00, 0x43, 0xE1, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80597D94, &l_rope_length); +COMPILER_STRIP_GATE(0x80597D94, &l_rope_length); #pragma pop /* 80597D9C-80597DA4 000020 0008+00 0/2 0/0 0/0 .rodata l_himo_thick */ @@ -423,28 +433,28 @@ COMPILER_STRIP_GATE(80597D94, &l_rope_length); SECTION_RODATA static u8 const l_himo_thick[8] = { 0x00, 0x00, 0x00, 0x50, 0x00, 0x00, 0x00, 0xDC, }; -COMPILER_STRIP_GATE(80597D9C, &l_himo_thick); +COMPILER_STRIP_GATE(0x80597D9C, &l_himo_thick); #pragma pop /* 80597DA4-80597DAC 000028 0008+00 1/1 0/0 0/0 .rodata l_heap_size */ SECTION_RODATA static u8 const l_heap_size[8] = { 0x00, 0x00, 0x25, 0x00, 0x00, 0x00, 0x25, 0x00, }; -COMPILER_STRIP_GATE(80597DA4, &l_heap_size); +COMPILER_STRIP_GATE(0x80597DA4, &l_heap_size); /* 80597DAC-80597DC4 000030 0018+00 1/1 0/0 0/0 .rodata l_rope_cullbox_offset */ SECTION_RODATA static u8 const l_rope_cullbox_offset[24] = { 0x00, 0x00, 0x00, 0x00, 0x44, 0x09, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x44, 0x89, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80597DAC, &l_rope_cullbox_offset); +COMPILER_STRIP_GATE(0x80597DAC, &l_rope_cullbox_offset); /* 80597DC4-80597DDC 000048 0018+00 1/1 0/0 0/0 .rodata l_rope_cullbox */ SECTION_RODATA static u8 const l_rope_cullbox[24] = { 0xC3, 0xAF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC3, 0xAF, 0x00, 0x00, 0x43, 0xAF, 0x00, 0x00, 0x43, 0xAF, 0x00, 0x00, 0x43, 0xAF, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80597DC4, &l_rope_cullbox); +COMPILER_STRIP_GATE(0x80597DC4, &l_rope_cullbox); /* 80597DDC-80597DE4 000060 0008+00 0/1 0/0 0/0 .rodata @3669 */ #pragma push @@ -452,7 +462,7 @@ COMPILER_STRIP_GATE(80597DC4, &l_rope_cullbox); SECTION_RODATA static u8 const lit_3669[8] = { 0x44, 0x53, 0x40, 0x00, 0x44, 0xC8, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80597DDC, &lit_3669); +COMPILER_STRIP_GATE(0x80597DDC, &lit_3669); #pragma pop /* 80597DE4-80597DE8 000068 0004+00 0/6 0/0 0/0 .rodata @3696 */ @@ -464,21 +474,21 @@ SECTION_RODATA static u8 const lit_3696[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80597DE4, &lit_3696); +COMPILER_STRIP_GATE(0x80597DE4, &lit_3696); #pragma pop /* 80597DE8-80597DEC 00006C 0004+00 0/2 0/0 0/0 .rodata @3697 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3697 = 100.0f; -COMPILER_STRIP_GATE(80597DE8, &lit_3697); +COMPILER_STRIP_GATE(0x80597DE8, &lit_3697); #pragma pop /* 80597DEC-80597DF0 000070 0004+00 0/1 0/0 0/0 .rodata @3698 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3698 = -1500.0f; -COMPILER_STRIP_GATE(80597DEC, &lit_3698); +COMPILER_STRIP_GATE(0x80597DEC, &lit_3698); #pragma pop /* 80595FE0-80596130 000220 0150+00 1/1 0/0 0/0 .text setStPos__14daObjRBridge_cFv */ @@ -506,14 +516,14 @@ asm cXyz::~cXyz() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3824 = 15.0f; -COMPILER_STRIP_GATE(80597DF0, &lit_3824); +COMPILER_STRIP_GATE(0x80597DF0, &lit_3824); #pragma pop /* 80597DF4-80597DF8 000078 0004+00 0/2 0/0 0/0 .rodata @3825 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3825 = 30.0f; -COMPILER_STRIP_GATE(80597DF4, &lit_3825); +COMPILER_STRIP_GATE(0x80597DF4, &lit_3825); #pragma pop /* 8059616C-805963C4 0003AC 0258+00 1/1 0/0 0/0 .text initLinePos__14daObjRBridge_cFv */ @@ -531,7 +541,7 @@ asm void daObjRBridge_c::initLinePos() { #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_3998 = 0xBC23D708; -COMPILER_STRIP_GATE(80597DF8, &lit_3998); +COMPILER_STRIP_GATE(0x80597DF8, &lit_3998); #pragma pop /* 80597DFC-80597E04 000080 0004+04 0/3 0/0 0/0 .rodata @3999 */ @@ -542,7 +552,7 @@ SECTION_RODATA static f32 const lit_3999[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80597DFC, &lit_3999); +COMPILER_STRIP_GATE(0x80597DFC, &lit_3999); #pragma pop /* 805963C4-80596768 000604 03A4+00 1/1 0/0 0/0 .text setLinePos__14daObjRBridge_cFv */ @@ -628,7 +638,7 @@ asm void daObjRBridge_c::getLinePosBrg(int param_0, cXyz* param_1) { SECTION_RODATA static u8 const lit_4060[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80597E04, &lit_4060); +COMPILER_STRIP_GATE(0x80597E04, &lit_4060); #pragma pop /* 80597E0C-80597E14 000090 0008+00 0/1 0/0 0/0 .rodata @4061 */ @@ -637,7 +647,7 @@ COMPILER_STRIP_GATE(80597E04, &lit_4060); SECTION_RODATA static u8 const lit_4061[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80597E0C, &lit_4061); +COMPILER_STRIP_GATE(0x80597E0C, &lit_4061); #pragma pop /* 80597E14-80597E1C 000098 0008+00 0/1 0/0 0/0 .rodata @4062 */ @@ -646,7 +656,7 @@ COMPILER_STRIP_GATE(80597E0C, &lit_4061); SECTION_RODATA static u8 const lit_4062[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80597E14, &lit_4062); +COMPILER_STRIP_GATE(0x80597E14, &lit_4062); #pragma pop /* 8059689C-805969FC 000ADC 0160+00 1/1 0/0 0/0 .text checkTight__14daObjRBridge_cFv */ @@ -899,7 +909,7 @@ asm void daObjRBridge_c::Execute(f32 (**param_0)[3][4]) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4239 = 40.0f; -COMPILER_STRIP_GATE(80597E1C, &lit_4239); +COMPILER_STRIP_GATE(0x80597E1C, &lit_4239); #pragma pop /* 80596FA8-8059715C 0011E8 01B4+00 1/1 0/0 0/0 .text action__14daObjRBridge_cFv */ @@ -925,7 +935,7 @@ asm void daObjRBridge_c::init_wait() { /* ############################################################################################## */ /* 80597E20-80597E24 0000A4 0004+00 1/3 0/0 0/0 .rodata @4310 */ SECTION_RODATA static f32 const lit_4310 = 1.0f; -COMPILER_STRIP_GATE(80597E20, &lit_4310); +COMPILER_STRIP_GATE(0x80597E20, &lit_4310); /* 80597E24-80597E2C 0000A8 0004+04 0/2 0/0 0/0 .rodata @4311 */ #pragma push @@ -935,7 +945,7 @@ SECTION_RODATA static f32 const lit_4311[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80597E24, &lit_4311); +COMPILER_STRIP_GATE(0x80597E24, &lit_4311); #pragma pop /* 80597E2C-80597E34 0000B0 0008+00 0/3 0/0 0/0 .rodata @4313 */ @@ -944,7 +954,7 @@ COMPILER_STRIP_GATE(80597E24, &lit_4311); SECTION_RODATA static u8 const lit_4313[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80597E2C, &lit_4313); +COMPILER_STRIP_GATE(0x80597E2C, &lit_4313); #pragma pop /* 80597170-805973BC 0013B0 024C+00 1/0 0/0 0/0 .text mode_wait__14daObjRBridge_cFv */ @@ -972,14 +982,14 @@ asm void daObjRBridge_c::init_cut() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4356 = 1.0f / 20.0f; -COMPILER_STRIP_GATE(80597E34, &lit_4356); +COMPILER_STRIP_GATE(0x80597E34, &lit_4356); #pragma pop /* 80597E38-80597E3C 0000BC 0004+00 0/1 0/0 0/0 .rodata @4357 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4357 = 3.0f / 20.0f; -COMPILER_STRIP_GATE(80597E38, &lit_4357); +COMPILER_STRIP_GATE(0x80597E38, &lit_4357); #pragma pop /* 805973E4-805975E8 001624 0204+00 1/0 0/0 0/0 .text mode_cut__14daObjRBridge_cFv */ @@ -1017,7 +1027,7 @@ SECTION_RODATA static u8 const lit_4385[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80597E3C, &lit_4385); +COMPILER_STRIP_GATE(0x80597E3C, &lit_4385); #pragma pop /* 805975F8-805977D0 001838 01D8+00 1/0 0/0 0/0 .text Draw__14daObjRBridge_cFv */ @@ -1169,12 +1179,4 @@ asm cCcD_GStts::~cCcD_GStts() { } #pragma pop -/* 80597E40-80597E64 0000C4 0024+00 3/1 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80597E40 = "L_RopeB_S"; -SECTION_DEAD static char const* const stringBase_80597E4A = "L_RopeB_L"; -SECTION_DEAD static char const* const stringBase_80597E54 = "L_Ropest"; -SECTION_DEAD static char const* const stringBase_80597E5D = "D_MN54"; -#pragma pop +/* 80597E40-80597E40 0000C4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_rotBridge/d_a_obj_rotBridge.cpp b/rel/d/a/obj/d_a_obj_rotBridge/d_a_obj_rotBridge.cpp index e24b2145762..340c74df521 100644 --- a/rel/d/a/obj/d_a_obj_rotBridge/d_a_obj_rotBridge.cpp +++ b/rel/d/a/obj/d_a_obj_rotBridge/d_a_obj_rotBridge.cpp @@ -232,7 +232,14 @@ extern "C" void __register_global_object(); /* ############################################################################################## */ /* 80CBF668-80CBF66C 000000 0004+00 4/4 0/0 0/0 .rodata @3626 */ SECTION_RODATA static f32 const lit_3626 = 1500.0f; -COMPILER_STRIP_GATE(80CBF668, &lit_3626); +COMPILER_STRIP_GATE(0x80CBF668, &lit_3626); + +/* 80CBF6C4-80CBF6C4 00005C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80CBF6C4 = "P_Mbridge"; +SECTION_DEAD static char const* const stringBase_80CBF6CE = "P_Mbrid9"; +#pragma pop /* 80CBF6D8-80CBF6E4 -00001 000C+00 3/3 0/0 0/0 .data l_resNameIdx */ SECTION_DATA static void* l_resNameIdx[3] = { @@ -335,14 +342,14 @@ asm void daRotBridge_c::setBaseMtx() { SECTION_RODATA static u8 const l_bmdIdx[12] = { 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x08, }; -COMPILER_STRIP_GATE(80CBF66C, &l_bmdIdx); +COMPILER_STRIP_GATE(0x80CBF66C, &l_bmdIdx); #pragma pop /* 80CBF678-80CBF684 000010 000C+00 1/1 0/0 0/0 .rodata l_dzbIdx */ SECTION_RODATA static u8 const l_dzbIdx[12] = { 0x00, 0x00, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x0B, }; -COMPILER_STRIP_GATE(80CBF678, &l_dzbIdx); +COMPILER_STRIP_GATE(0x80CBF678, &l_dzbIdx); /* 80CBF684-80CBF690 00001C 000C+00 0/1 0/0 0/0 .rodata l_bckIdx */ #pragma push @@ -350,7 +357,7 @@ COMPILER_STRIP_GATE(80CBF678, &l_dzbIdx); SECTION_RODATA static u8 const l_bckIdx[12] = { 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x05, }; -COMPILER_STRIP_GATE(80CBF684, &l_bckIdx); +COMPILER_STRIP_GATE(0x80CBF684, &l_bckIdx); #pragma pop /* 80CBF690-80CBF698 000028 0004+04 2/4 0/0 0/0 .rodata @3694 */ @@ -359,7 +366,7 @@ SECTION_RODATA static f32 const lit_3694[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80CBF690, &lit_3694); +COMPILER_STRIP_GATE(0x80CBF690, &lit_3694); /* 80CBEB38-80CBECBC 000298 0184+00 1/0 0/0 0/0 .text CreateHeap__13daRotBridge_cFv */ #pragma push @@ -376,7 +383,7 @@ asm void daRotBridge_c::CreateHeap() { SECTION_RODATA static u8 const lit_3776[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CBF698, &lit_3776); +COMPILER_STRIP_GATE(0x80CBF698, &lit_3776); /* 80CBECBC-80CBEED4 00041C 0218+00 1/1 0/0 0/0 .text create__13daRotBridge_cFv */ #pragma push @@ -412,7 +419,7 @@ asm void daRotBridge_c::rideCallBack(dBgW* param_0, fopAc_ac_c* param_1, fopAc_a /* ############################################################################################## */ /* 80CBF6A0-80CBF6A4 000038 0004+00 1/2 0/0 0/0 .rodata @3833 */ SECTION_RODATA static f32 const lit_3833 = -1.0f; -COMPILER_STRIP_GATE(80CBF6A0, &lit_3833); +COMPILER_STRIP_GATE(0x80CBF6A0, &lit_3833); /* 80CBEF34-80CBF050 000694 011C+00 1/0 0/0 0/0 .text Execute__13daRotBridge_cFPPA3_A4_f */ @@ -435,7 +442,7 @@ SECTION_RODATA static u8 const lit_3878[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CBF6A4, &lit_3878); +COMPILER_STRIP_GATE(0x80CBF6A4, &lit_3878); #pragma pop /* 80CBF6A8-80CBF6B0 000040 0008+00 0/1 0/0 0/0 .rodata @3879 */ @@ -444,7 +451,7 @@ COMPILER_STRIP_GATE(80CBF6A4, &lit_3878); SECTION_RODATA static u8 const lit_3879[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CBF6A8, &lit_3879); +COMPILER_STRIP_GATE(0x80CBF6A8, &lit_3879); #pragma pop /* 80CBF6B0-80CBF6B8 000048 0008+00 0/1 0/0 0/0 .rodata @3880 */ @@ -453,7 +460,7 @@ COMPILER_STRIP_GATE(80CBF6A8, &lit_3879); SECTION_RODATA static u8 const lit_3880[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CBF6B0, &lit_3880); +COMPILER_STRIP_GATE(0x80CBF6B0, &lit_3880); #pragma pop /* 80CBF6B8-80CBF6C0 000050 0008+00 0/1 0/0 0/0 .rodata @3881 */ @@ -462,7 +469,7 @@ COMPILER_STRIP_GATE(80CBF6B0, &lit_3880); SECTION_RODATA static u8 const lit_3881[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CBF6B8, &lit_3881); +COMPILER_STRIP_GATE(0x80CBF6B8, &lit_3881); #pragma pop /* 80CBF788-80CBF794 000008 000C+00 1/1 0/0 0/0 .bss @3620 */ @@ -487,7 +494,7 @@ asm void daRotBridge_c::playerAreaCheck() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3939 = 10.0f; -COMPILER_STRIP_GATE(80CBF6C0, &lit_3939); +COMPILER_STRIP_GATE(0x80CBF6C0, &lit_3939); #pragma pop /* 80CBF1EC-80CBF404 00094C 0218+00 1/1 0/0 0/0 .text moveBridge__13daRotBridge_cFv */ @@ -584,13 +591,7 @@ asm void __sinit_d_a_obj_rotBridge_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80CBF618 = (void*)__sinit_d_a_obj_rotBridge_cpp; +REGISTER_CTORS(0x80CBF618, __sinit_d_a_obj_rotBridge_cpp); #pragma pop -/* 80CBF6C4-80CBF6D7 00005C 0013+00 1/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80CBF6C4 = "P_Mbridge"; -SECTION_DEAD static char const* const stringBase_80CBF6CE = "P_Mbrid9"; -#pragma pop +/* 80CBF6C4-80CBF6C4 00005C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_rotTrap/d_a_obj_rotTrap.cpp b/rel/d/a/obj/d_a_obj_rotTrap/d_a_obj_rotTrap.cpp index 20666416b05..f69d36a0444 100644 --- a/rel/d/a/obj/d_a_obj_rotTrap/d_a_obj_rotTrap.cpp +++ b/rel/d/a/obj/d_a_obj_rotTrap/d_a_obj_rotTrap.cpp @@ -160,10 +160,10 @@ struct cBgS { /* 80074250 */ void Release(dBgW_Base*); }; -struct Vec {}; - struct JAISoundID {}; +struct Vec {}; + struct Z2SeMgr { /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); /* 802AC50C */ void seStartLevel(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); @@ -290,7 +290,7 @@ extern "C" void __register_global_object(); /* ############################################################################################## */ /* 80CC0808-80CC080C 000000 0004+00 3/4 0/0 0/0 .rodata @3649 */ SECTION_RODATA static f32 const lit_3649 = 4.5f; -COMPILER_STRIP_GATE(80CC0808, &lit_3649); +COMPILER_STRIP_GATE(0x80CC0808, &lit_3649); /* 80CC0860-80CC086C 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { @@ -496,6 +496,13 @@ asm void daRotTrap_c::setBaseMtx() { } #pragma pop +/* ############################################################################################## */ +/* 80CC0858-80CC0858 000050 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80CC0858 = "P_kama"; +#pragma pop + /* 80CBF9D8-80CBFAC8 000218 00F0+00 1/0 0/0 0/0 .text CreateHeap__11daRotTrap_cFv */ #pragma push #pragma optimization_level 0 @@ -583,11 +590,11 @@ SECTION_RODATA u8 const daRotTrap_c::mCcDObjInfo[48] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CC080C, &daRotTrap_c::mCcDObjInfo); +COMPILER_STRIP_GATE(0x80CC080C, &daRotTrap_c::mCcDObjInfo); /* 80CC083C-80CC0840 000034 0004+00 1/1 0/0 0/0 .rodata @3880 */ SECTION_RODATA static f32 const lit_3880 = 45.0f; -COMPILER_STRIP_GATE(80CC083C, &lit_3880); +COMPILER_STRIP_GATE(0x80CC083C, &lit_3880); /* 80CC0AB8-80CC0AC4 000008 000C+00 1/1 0/0 0/0 .bss @3643 */ static u8 lit_3643[12]; @@ -638,32 +645,32 @@ SECTION_RODATA static u8 const lit_3921[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CC0840, &lit_3921); +COMPILER_STRIP_GATE(0x80CC0840, &lit_3921); #pragma pop /* 80CC0844-80CC0848 00003C 0004+00 2/4 0/0 0/0 .rodata @3922 */ SECTION_RODATA static f32 const lit_3922 = 1.0f; -COMPILER_STRIP_GATE(80CC0844, &lit_3922); +COMPILER_STRIP_GATE(0x80CC0844, &lit_3922); /* 80CC0848-80CC084C 000040 0004+00 0/2 0/0 0/0 .rodata @3923 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_3923 = 0x43360B61; -COMPILER_STRIP_GATE(80CC0848, &lit_3923); +COMPILER_STRIP_GATE(0x80CC0848, &lit_3923); #pragma pop /* 80CC084C-80CC0850 000044 0004+00 0/2 0/0 0/0 .rodata @3924 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3924 = 360.0f; -COMPILER_STRIP_GATE(80CC084C, &lit_3924); +COMPILER_STRIP_GATE(0x80CC084C, &lit_3924); #pragma pop /* 80CC0850-80CC0854 000048 0004+00 0/2 0/0 0/0 .rodata @3925 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3925 = 30.0f; -COMPILER_STRIP_GATE(80CC0850, &lit_3925); +COMPILER_STRIP_GATE(0x80CC0850, &lit_3925); #pragma pop /* 80CC0180-80CC027C 0009C0 00FC+00 1/1 0/0 0/0 .text init_modeAcc__11daRotTrap_cFv */ @@ -679,7 +686,7 @@ asm void daRotTrap_c::init_modeAcc() { /* ############################################################################################## */ /* 80CC0854-80CC0858 00004C 0004+00 2/3 0/0 0/0 .rodata @3940 */ SECTION_RODATA static f32 const lit_3940 = -1.0f; -COMPILER_STRIP_GATE(80CC0854, &lit_3940); +COMPILER_STRIP_GATE(0x80CC0854, &lit_3940); /* 80CC027C-80CC034C 000ABC 00D0+00 1/0 0/0 0/0 .text modeAcc__11daRotTrap_cFv */ #pragma push @@ -815,12 +822,7 @@ asm void __sinit_d_a_obj_rotTrap_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80CC0784 = (void*)__sinit_d_a_obj_rotTrap_cpp; +REGISTER_CTORS(0x80CC0784, __sinit_d_a_obj_rotTrap_cpp); #pragma pop -/* 80CC0858-80CC085F 000050 0007+00 3/3 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80CC0858 = "P_kama"; -#pragma pop +/* 80CC0858-80CC0858 000050 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_roten/d_a_obj_roten.cpp b/rel/d/a/obj/d_a_obj_roten/d_a_obj_roten.cpp index ffc93550056..a7a16820658 100644 --- a/rel/d/a/obj/d_a_obj_roten/d_a_obj_roten.cpp +++ b/rel/d/a/obj/d_a_obj_roten/d_a_obj_roten.cpp @@ -63,10 +63,10 @@ struct dRes_control_c { struct dPa_levelEcallBack {}; -struct _GXColor {}; - struct csXyz {}; +struct _GXColor {}; + struct dPa_control_c { /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, @@ -90,10 +90,10 @@ struct dBgS_MoveBgActor { /* 80078950 */ void MoveBGExecute(); }; -struct Vec {}; - struct JAISoundID {}; +struct Vec {}; + struct Z2SeMgr { /* 802AC50C */ void seStartLevel(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); }; @@ -202,20 +202,20 @@ asm void daObj_Roten_c::setBaseMtx() { /* ############################################################################################## */ /* 80CC1400-80CC1404 000000 0004+00 2/2 0/0 0/0 .rodata @3778 */ SECTION_RODATA static f32 const lit_3778 = 10.0f; -COMPILER_STRIP_GATE(80CC1400, &lit_3778); +COMPILER_STRIP_GATE(0x80CC1400, &lit_3778); /* 80CC1404-80CC1408 000004 0004+00 0/1 0/0 0/0 .rodata @3779 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3779 = 90.0f; -COMPILER_STRIP_GATE(80CC1404, &lit_3779); +COMPILER_STRIP_GATE(0x80CC1404, &lit_3779); #pragma pop /* 80CC1408-80CC140C 000008 0004+00 0/1 0/0 0/0 .rodata @3780 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3780 = 270.0f; -COMPILER_STRIP_GATE(80CC1408, &lit_3780); +COMPILER_STRIP_GATE(0x80CC1408, &lit_3780); #pragma pop /* 80CC140C-80CC1410 00000C 0004+00 0/2 0/0 0/0 .rodata @3781 */ @@ -227,47 +227,47 @@ SECTION_RODATA static u8 const lit_3781[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CC140C, &lit_3781); +COMPILER_STRIP_GATE(0x80CC140C, &lit_3781); #pragma pop /* 80CC1410-80CC1414 000010 0004+00 0/1 0/0 0/0 .rodata @3782 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3782 = -80.0f; -COMPILER_STRIP_GATE(80CC1410, &lit_3782); +COMPILER_STRIP_GATE(0x80CC1410, &lit_3782); #pragma pop /* 80CC1414-80CC1418 000014 0004+00 0/1 0/0 0/0 .rodata @3783 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3783 = 177.0f; -COMPILER_STRIP_GATE(80CC1414, &lit_3783); +COMPILER_STRIP_GATE(0x80CC1414, &lit_3783); #pragma pop /* 80CC1418-80CC141C 000018 0004+00 0/1 0/0 0/0 .rodata @3784 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3784 = 110.0f; -COMPILER_STRIP_GATE(80CC1418, &lit_3784); +COMPILER_STRIP_GATE(0x80CC1418, &lit_3784); #pragma pop /* 80CC141C-80CC1420 00001C 0004+00 0/1 0/0 0/0 .rodata @3785 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3785 = 2.0f / 5.0f; -COMPILER_STRIP_GATE(80CC141C, &lit_3785); +COMPILER_STRIP_GATE(0x80CC141C, &lit_3785); #pragma pop /* 80CC1420-80CC1424 000020 0004+00 0/1 0/0 0/0 .rodata @3786 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3786 = 0.25f; -COMPILER_STRIP_GATE(80CC1420, &lit_3786); +COMPILER_STRIP_GATE(0x80CC1420, &lit_3786); #pragma pop /* 80CC1424-80CC1428 000024 0004+00 1/3 0/0 0/0 .rodata @3787 */ SECTION_RODATA static f32 const lit_3787 = 1.0f; -COMPILER_STRIP_GATE(80CC1424, &lit_3787); +COMPILER_STRIP_GATE(0x80CC1424, &lit_3787); /* 80CC0C20-80CC0EC4 000140 02A4+00 1/0 0/0 0/0 .text Create__13daObj_Roten_cFv */ #pragma push @@ -280,6 +280,12 @@ asm void daObj_Roten_c::Create() { #pragma pop /* ############################################################################################## */ +/* 80CC1440-80CC1440 000040 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80CC1440 = "Obj_roten"; +#pragma pop + /* 80CC144C-80CC1450 -00001 0004+00 1/1 0/0 0/0 .data l_resFileName */ SECTION_DATA static void* l_resFileName = (void*)&d_a_obj_roten__stringBase0; @@ -350,7 +356,7 @@ asm void daObj_Roten_c::create() { /* ############################################################################################## */ /* 80CC1428-80CC142C 000028 0004+00 1/1 0/0 0/0 .rodata @3844 */ SECTION_RODATA static f32 const lit_3844 = -1.0f; -COMPILER_STRIP_GATE(80CC1428, &lit_3844); +COMPILER_STRIP_GATE(0x80CC1428, &lit_3844); /* 80CC1038-80CC1138 000558 0100+00 1/0 0/0 0/0 .text Execute__13daObj_Roten_cFPPA3_A4_f */ @@ -368,35 +374,35 @@ asm void daObj_Roten_c::Execute(f32 (**param_0)[3][4]) { #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_3853 = 0xBC6642FF; -COMPILER_STRIP_GATE(80CC142C, &lit_3853); +COMPILER_STRIP_GATE(0x80CC142C, &lit_3853); #pragma pop /* 80CC1430-80CC1434 000030 0004+00 0/1 0/0 0/0 .rodata @3878 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3878 = 0.5f; -COMPILER_STRIP_GATE(80CC1430, &lit_3878); +COMPILER_STRIP_GATE(0x80CC1430, &lit_3878); #pragma pop /* 80CC1434-80CC1438 000034 0004+00 0/1 0/0 0/0 .rodata @3879 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3879 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(80CC1434, &lit_3879); +COMPILER_STRIP_GATE(0x80CC1434, &lit_3879); #pragma pop /* 80CC1438-80CC143C 000038 0004+00 0/1 0/0 0/0 .rodata @3880 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_3880 = 0x38D1B717; -COMPILER_STRIP_GATE(80CC1438, &lit_3880); +COMPILER_STRIP_GATE(0x80CC1438, &lit_3880); #pragma pop /* 80CC143C-80CC1440 00003C 0004+00 0/1 0/0 0/0 .rodata @3881 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_3881 = 0x358637BD; -COMPILER_STRIP_GATE(80CC143C, &lit_3881); +COMPILER_STRIP_GATE(0x80CC143C, &lit_3881); #pragma pop /* 80CC1138-80CC1254 000658 011C+00 1/0 0/0 0/0 .text Draw__13daObj_Roten_cFv */ @@ -484,9 +490,4 @@ asm daObj_Roten_c::~daObj_Roten_c() { } #pragma pop -/* 80CC1440-80CC144A 000040 000A+00 1/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80CC1440 = "Obj_roten"; -#pragma pop +/* 80CC1440-80CC1440 000040 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_rstair/d_a_obj_rstair.cpp b/rel/d/a/obj/d_a_obj_rstair/d_a_obj_rstair.cpp index 4ac895a7fba..2c4b070ca66 100644 --- a/rel/d/a/obj/d_a_obj_rstair/d_a_obj_rstair.cpp +++ b/rel/d/a/obj/d_a_obj_rstair/d_a_obj_rstair.cpp @@ -138,10 +138,10 @@ struct cBgS { /* 80074250 */ void Release(dBgW_Base*); }; -struct Vec {}; - struct JAISoundID {}; +struct Vec {}; + struct Z2SeMgr { /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); /* 802AC50C */ void seStartLevel(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); @@ -294,7 +294,7 @@ asm void daObjRotStair_c::setBaseMtx() { SECTION_RODATA static u8 const l_wtr_bmd[8] = { 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x07, }; -COMPILER_STRIP_GATE(80CC2700, &l_wtr_bmd); +COMPILER_STRIP_GATE(0x80CC2700, &l_wtr_bmd); /* 80CC2708-80CC2710 000008 0008+00 0/1 0/0 0/0 .rodata l_wtr_btk */ #pragma push @@ -302,14 +302,14 @@ COMPILER_STRIP_GATE(80CC2700, &l_wtr_bmd); SECTION_RODATA static u8 const l_wtr_btk[8] = { 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x0B, }; -COMPILER_STRIP_GATE(80CC2708, &l_wtr_btk); +COMPILER_STRIP_GATE(0x80CC2708, &l_wtr_btk); #pragma pop /* 80CC2710-80CC2720 000010 0010+00 2/2 0/0 0/0 .rodata l_target_angleY */ SECTION_RODATA static u8 const l_target_angleY[16] = { 0x7F, 0xFF, 0x40, 0x00, 0x00, 0x00, 0xC0, 0x00, 0x00, 0x00, 0xC0, 0x00, 0x7F, 0xFF, 0x40, 0x00, }; -COMPILER_STRIP_GATE(80CC2710, &l_target_angleY); +COMPILER_STRIP_GATE(0x80CC2710, &l_target_angleY); /* 80CC16B0-80CC17F0 0001D0 0140+00 1/0 0/0 0/0 .text Create__15daObjRotStair_cFv */ #pragma push @@ -326,7 +326,13 @@ asm void daObjRotStair_c::Create() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3770 = 1.0f; -COMPILER_STRIP_GATE(80CC2720, &lit_3770); +COMPILER_STRIP_GATE(0x80CC2720, &lit_3770); +#pragma pop + +/* 80CC2730-80CC2730 000030 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80CC2730 = "K_spkai00"; #pragma pop /* 80CC273C-80CC2748 000000 000C+00 2/2 0/0 0/0 .data cNullVec__6Z2Calc */ @@ -558,14 +564,14 @@ SECTION_RODATA static u8 const lit_3911[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CC2724, &lit_3911); +COMPILER_STRIP_GATE(0x80CC2724, &lit_3911); #pragma pop /* 80CC2728-80CC272C 000028 0004+00 0/1 0/0 0/0 .rodata @3912 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3912 = -1.0f; -COMPILER_STRIP_GATE(80CC2728, &lit_3912); +COMPILER_STRIP_GATE(0x80CC2728, &lit_3912); #pragma pop /* 80CC1EC8-80CC2024 0009E8 015C+00 1/0 0/0 0/0 .text modeRotate__15daObjRotStair_cFv */ @@ -671,7 +677,7 @@ asm void daObjRotStair_c::offWaterModel() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4107 = -1.0f / 100.0f; -COMPILER_STRIP_GATE(80CC272C, &lit_4107); +COMPILER_STRIP_GATE(0x80CC272C, &lit_4107); #pragma pop /* 80CC23C4-80CC25C0 000EE4 01FC+00 1/0 0/0 0/0 .text Draw__15daObjRotStair_cFv */ @@ -753,9 +759,4 @@ static asm void daObjRotStair_MoveBGDraw(daObjRotStair_c* param_0) { } #pragma pop -/* 80CC2730-80CC273A 000030 000A+00 1/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80CC2730 = "K_spkai00"; -#pragma pop +/* 80CC2730-80CC2730 000030 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_rw/d_a_obj_rw.cpp b/rel/d/a/obj/d_a_obj_rw/d_a_obj_rw.cpp index ee20edf3e10..18a95d1c4d3 100644 --- a/rel/d/a/obj/d_a_obj_rw/d_a_obj_rw.cpp +++ b/rel/d/a/obj/d_a_obj_rw/d_a_obj_rw.cpp @@ -266,7 +266,7 @@ extern "C" void __register_global_object(); /* ############################################################################################## */ /* 80CC3AF4-80CC3AF8 000000 0004+00 6/6 0/0 0/0 .rodata @3649 */ SECTION_RODATA static f32 const lit_3649 = 1.0f; -COMPILER_STRIP_GATE(80CC3AF4, &lit_3649); +COMPILER_STRIP_GATE(0x80CC3AF4, &lit_3649); /* 80CC3B54-80CC3B64 000000 0010+00 1/1 0/0 0/0 .data pole_x$3841 */ SECTION_DATA static u8 pole_x[16] = { @@ -370,14 +370,14 @@ static asm void nodeCallBack(J3DJoint* param_0, int param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3721 = 100.0f; -COMPILER_STRIP_GATE(80CC3AF8, &lit_3721); +COMPILER_STRIP_GATE(0x80CC3AF8, &lit_3721); #pragma pop /* 80CC3AFC-80CC3B00 000008 0004+00 0/1 0/0 0/0 .rodata @3722 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3722 = 1500.0f; -COMPILER_STRIP_GATE(80CC3AFC, &lit_3722); +COMPILER_STRIP_GATE(0x80CC3AFC, &lit_3722); #pragma pop /* 80CC3B00-80CC3B04 00000C 0004+00 0/4 0/0 0/0 .rodata @3723 */ @@ -389,7 +389,7 @@ SECTION_RODATA static u8 const lit_3723[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CC3B00, &lit_3723); +COMPILER_STRIP_GATE(0x80CC3B00, &lit_3723); #pragma pop /* 80CC2A74-80CC2BA4 0001D4 0130+00 1/0 0/0 0/0 .text daOBJ_RW_Draw__FP12obj_rw_class */ @@ -407,35 +407,35 @@ static asm void daOBJ_RW_Draw(obj_rw_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3791 = 50.0f; -COMPILER_STRIP_GATE(80CC3B04, &lit_3791); +COMPILER_STRIP_GATE(0x80CC3B04, &lit_3791); #pragma pop /* 80CC3B08-80CC3B0C 000014 0004+00 0/2 0/0 0/0 .rodata @3792 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3792 = 150.0f; -COMPILER_STRIP_GATE(80CC3B08, &lit_3792); +COMPILER_STRIP_GATE(0x80CC3B08, &lit_3792); #pragma pop /* 80CC3B0C-80CC3B10 000018 0004+00 0/1 0/0 0/0 .rodata @3793 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3793 = 0.5f; -COMPILER_STRIP_GATE(80CC3B0C, &lit_3793); +COMPILER_STRIP_GATE(0x80CC3B0C, &lit_3793); #pragma pop /* 80CC3B10-80CC3B14 00001C 0004+00 0/2 0/0 0/0 .rodata @3794 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3794 = -200.0f; -COMPILER_STRIP_GATE(80CC3B10, &lit_3794); +COMPILER_STRIP_GATE(0x80CC3B10, &lit_3794); #pragma pop /* 80CC3B14-80CC3B18 000020 0004+00 0/1 0/0 0/0 .rodata @3795 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3795 = 70.0f; -COMPILER_STRIP_GATE(80CC3B14, &lit_3795); +COMPILER_STRIP_GATE(0x80CC3B14, &lit_3795); #pragma pop /* 80CC2BA4-80CC2E60 000304 02BC+00 1/1 0/0 0/0 .text damage_check__FP12obj_rw_class */ @@ -463,21 +463,21 @@ static asm void normal(obj_rw_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3821 = 1.0f / 20.0f; -COMPILER_STRIP_GATE(80CC3B18, &lit_3821); +COMPILER_STRIP_GATE(0x80CC3B18, &lit_3821); #pragma pop /* 80CC3B1C-80CC3B20 000028 0004+00 0/1 0/0 0/0 .rodata @3822 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3822 = 5.0f; -COMPILER_STRIP_GATE(80CC3B1C, &lit_3822); +COMPILER_STRIP_GATE(0x80CC3B1C, &lit_3822); #pragma pop /* 80CC3B20-80CC3B24 00002C 0004+00 0/1 0/0 0/0 .rodata @3823 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3823 = 20.0f; -COMPILER_STRIP_GATE(80CC3B20, &lit_3823); +COMPILER_STRIP_GATE(0x80CC3B20, &lit_3823); #pragma pop /* 80CC2E78-80CC2F1C 0005D8 00A4+00 1/1 0/0 0/0 .text action__FP12obj_rw_class */ @@ -495,42 +495,42 @@ static asm void action(obj_rw_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3895 = 30.0f; -COMPILER_STRIP_GATE(80CC3B24, &lit_3895); +COMPILER_STRIP_GATE(0x80CC3B24, &lit_3895); #pragma pop /* 80CC3B28-80CC3B2C 000034 0004+00 0/1 0/0 0/0 .rodata @3896 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3896 = -130.0f; -COMPILER_STRIP_GATE(80CC3B28, &lit_3896); +COMPILER_STRIP_GATE(0x80CC3B28, &lit_3896); #pragma pop /* 80CC3B2C-80CC3B30 000038 0004+00 0/1 0/0 0/0 .rodata @3897 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3897 = 200.0f; -COMPILER_STRIP_GATE(80CC3B2C, &lit_3897); +COMPILER_STRIP_GATE(0x80CC3B2C, &lit_3897); #pragma pop /* 80CC3B30-80CC3B34 00003C 0004+00 0/1 0/0 0/0 .rodata @3898 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3898 = 80.0f; -COMPILER_STRIP_GATE(80CC3B30, &lit_3898); +COMPILER_STRIP_GATE(0x80CC3B30, &lit_3898); #pragma pop /* 80CC3B34-80CC3B38 000040 0004+00 0/1 0/0 0/0 .rodata @3899 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3899 = 220.0f; -COMPILER_STRIP_GATE(80CC3B34, &lit_3899); +COMPILER_STRIP_GATE(0x80CC3B34, &lit_3899); #pragma pop /* 80CC3B38-80CC3B3C 000044 0004+00 0/1 0/0 0/0 .rodata @3900 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3900 = 52000.0f; -COMPILER_STRIP_GATE(80CC3B38, &lit_3900); +COMPILER_STRIP_GATE(0x80CC3B38, &lit_3900); #pragma pop /* 80CC3B3C-80CC3B44 000048 0008+00 0/1 0/0 0/0 .rodata @3902 */ @@ -539,7 +539,7 @@ COMPILER_STRIP_GATE(80CC3B38, &lit_3900); SECTION_RODATA static u8 const lit_3902[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CC3B3C, &lit_3902); +COMPILER_STRIP_GATE(0x80CC3B3C, &lit_3902); #pragma pop /* 80CC3C80-80CC3C84 000008 0004+00 2/2 0/0 0/0 .bss None */ @@ -568,6 +568,13 @@ static bool daOBJ_RW_IsDelete(obj_rw_class* param_0) { return true; } +/* ############################################################################################## */ +/* 80CC3B4C-80CC3B4C 000058 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80CC3B4C = "Obj_rw"; +#pragma pop + /* 80CC32F4-80CC3368 000A54 0074+00 1/0 0/0 0/0 .text daOBJ_RW_Delete__FP12obj_rw_class */ #pragma push @@ -594,14 +601,14 @@ static asm void useHeapInit(fopAc_ac_c* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4035 = -500.0f; -COMPILER_STRIP_GATE(80CC3B44, &lit_4035); +COMPILER_STRIP_GATE(0x80CC3B44, &lit_4035); #pragma pop /* 80CC3B48-80CC3B4C 000054 0004+00 0/1 0/0 0/0 .rodata @4036 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4036 = 500.0f; -COMPILER_STRIP_GATE(80CC3B48, &lit_4036); +COMPILER_STRIP_GATE(0x80CC3B48, &lit_4036); #pragma pop /* 80CC3400-80CC36E4 000B60 02E4+00 1/0 0/0 0/0 .text daOBJ_RW_Create__FP10fopAc_ac_c */ @@ -706,12 +713,7 @@ asm void __sinit_d_a_obj_rw_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80CC3AA4 = (void*)__sinit_d_a_obj_rw_cpp; +REGISTER_CTORS(0x80CC3AA4, __sinit_d_a_obj_rw_cpp); #pragma pop -/* 80CC3B4C-80CC3B53 000058 0007+00 3/3 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80CC3B4C = "Obj_rw"; -#pragma pop +/* 80CC3B4C-80CC3B4C 000058 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_saidan/d_a_obj_saidan.cpp b/rel/d/a/obj/d_a_obj_saidan/d_a_obj_saidan.cpp index 4fb0bc3de7e..b23254306af 100644 --- a/rel/d/a/obj/d_a_obj_saidan/d_a_obj_saidan.cpp +++ b/rel/d/a/obj/d_a_obj_saidan/d_a_obj_saidan.cpp @@ -85,10 +85,10 @@ struct dBgS_MoveBgActor { /* 80078950 */ void MoveBGExecute(); }; -struct Vec {}; - struct JAISoundID {}; +struct Vec {}; + struct Z2SeMgr { /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); /* 802AC50C */ void seStartLevel(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); @@ -175,11 +175,11 @@ extern "C" void __register_global_object(); /* ############################################################################################## */ /* 80CC4524-80CC4528 000000 0004+00 2/2 0/0 0/0 .rodata @3625 */ SECTION_RODATA static f32 const lit_3625 = 2.0f; -COMPILER_STRIP_GATE(80CC4524, &lit_3625); +COMPILER_STRIP_GATE(0x80CC4524, &lit_3625); /* 80CC4528-80CC452C 000004 0004+00 1/1 0/0 0/0 .rodata @3626 */ SECTION_RODATA static f32 const lit_3626 = 250.0f; -COMPILER_STRIP_GATE(80CC4528, &lit_3626); +COMPILER_STRIP_GATE(0x80CC4528, &lit_3626); /* 80CC454C-80CC4558 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { @@ -319,6 +319,13 @@ asm void daSaidan_c::setBaseMtx() { } #pragma pop +/* ############################################################################################## */ +/* 80CC4540-80CC4540 00001C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80CC4540 = "H_Saidan"; +#pragma pop + /* 80CC3EB0-80CC3F1C 0001F0 006C+00 1/0 0/0 0/0 .text CreateHeap__10daSaidan_cFv */ #pragma push #pragma optimization_level 0 @@ -405,23 +412,23 @@ asm void daSaidan_c::init_modeMove() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3758 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(80CC452C, &lit_3758); +COMPILER_STRIP_GATE(0x80CC452C, &lit_3758); #pragma pop /* 80CC4530-80CC4534 00000C 0004+00 0/1 0/0 0/0 .rodata @3759 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3759 = 0.5f; -COMPILER_STRIP_GATE(80CC4530, &lit_3759); +COMPILER_STRIP_GATE(0x80CC4530, &lit_3759); #pragma pop /* 80CC4534-80CC4538 000010 0004+00 1/2 0/0 0/0 .rodata @3760 */ SECTION_RODATA static f32 const lit_3760 = 1.0f; -COMPILER_STRIP_GATE(80CC4534, &lit_3760); +COMPILER_STRIP_GATE(0x80CC4534, &lit_3760); /* 80CC4538-80CC453C 000014 0004+00 1/2 0/0 0/0 .rodata @3761 */ SECTION_RODATA static f32 const lit_3761 = -1.0f; -COMPILER_STRIP_GATE(80CC4538, &lit_3761); +COMPILER_STRIP_GATE(0x80CC4538, &lit_3761); /* 80CC453C-80CC4540 000018 0004+00 0/1 0/0 0/0 .rodata @3762 */ #pragma push @@ -432,7 +439,7 @@ SECTION_RODATA static u8 const lit_3762[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CC453C, &lit_3762); +COMPILER_STRIP_GATE(0x80CC453C, &lit_3762); #pragma pop /* 80CC41BC-80CC4290 0004FC 00D4+00 1/0 0/0 0/0 .text modeMove__10daSaidan_cFv */ @@ -542,12 +549,7 @@ asm void __sinit_d_a_obj_saidan_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80CC44D4 = (void*)__sinit_d_a_obj_saidan_cpp; +REGISTER_CTORS(0x80CC44D4, __sinit_d_a_obj_saidan_cpp); #pragma pop -/* 80CC4540-80CC4549 00001C 0009+00 3/3 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80CC4540 = "H_Saidan"; -#pragma pop +/* 80CC4540-80CC4540 00001C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_sakuita/d_a_obj_sakuita.cpp b/rel/d/a/obj/d_a_obj_sakuita/d_a_obj_sakuita.cpp index 47a8e80df65..a06469d1034 100644 --- a/rel/d/a/obj/d_a_obj_sakuita/d_a_obj_sakuita.cpp +++ b/rel/d/a/obj/d_a_obj_sakuita/d_a_obj_sakuita.cpp @@ -50,10 +50,10 @@ struct dRes_control_c { /* 8003C37C */ void getRes(char const*, char const*, dRes_info_c*, int); }; -struct J3DModelData {}; - struct J3DModel {}; +struct J3DModelData {}; + struct dComIfG_play_c { /* 8002CAF0 */ void addSimpleModel(J3DModelData*, int, u8); /* 8002CB30 */ void removeSimpleModel(J3DModelData*, int); @@ -165,48 +165,55 @@ SECTION_RODATA u8 const daObjSakuita_c::M_attr[44] = { 0x00, 0x3F, 0x4C, 0xCC, 0xCD, 0x3F, 0x00, 0x00, 0x00, 0xC0, 0xC0, 0x00, 0x00, 0x44, 0x61, 0x00, 0x00, 0x46, 0x9C, 0x40, 0x00, 0x42, 0xC8, 0x00, 0x00, 0x14, 0x00, 0x14, 0x00, }; -COMPILER_STRIP_GATE(80CC50B4, &daObjSakuita_c::M_attr); +COMPILER_STRIP_GATE(0x80CC50B4, &daObjSakuita_c::M_attr); /* 80CC50E0-80CC50E4 00002C 0004+00 0/1 0/0 0/0 .rodata @3658 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3658 = -30.0f; -COMPILER_STRIP_GATE(80CC50E0, &lit_3658); +COMPILER_STRIP_GATE(0x80CC50E0, &lit_3658); #pragma pop /* 80CC50E4-80CC50E8 000030 0004+00 0/1 0/0 0/0 .rodata @3659 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3659 = -90.0f; -COMPILER_STRIP_GATE(80CC50E4, &lit_3659); +COMPILER_STRIP_GATE(0x80CC50E4, &lit_3659); #pragma pop /* 80CC50E8-80CC50EC 000034 0004+00 0/1 0/0 0/0 .rodata @3660 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3660 = -10.0f; -COMPILER_STRIP_GATE(80CC50E8, &lit_3660); +COMPILER_STRIP_GATE(0x80CC50E8, &lit_3660); #pragma pop /* 80CC50EC-80CC50F0 000038 0004+00 0/1 0/0 0/0 .rodata @3661 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3661 = 30.0f; -COMPILER_STRIP_GATE(80CC50EC, &lit_3661); +COMPILER_STRIP_GATE(0x80CC50EC, &lit_3661); #pragma pop /* 80CC50F0-80CC50F4 00003C 0004+00 0/1 0/0 0/0 .rodata @3662 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3662 = 20.0f; -COMPILER_STRIP_GATE(80CC50F0, &lit_3662); +COMPILER_STRIP_GATE(0x80CC50F0, &lit_3662); #pragma pop /* 80CC50F4-80CC50F8 000040 0004+00 0/1 0/0 0/0 .rodata @3663 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3663 = 10.0f; -COMPILER_STRIP_GATE(80CC50F4, &lit_3663); +COMPILER_STRIP_GATE(0x80CC50F4, &lit_3663); +#pragma pop + +/* 80CC5114-80CC5114 000060 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80CC5114 = "A_Sakuita"; +SECTION_DEAD static char const* const stringBase_80CC511E = "A_Sakuita.bmd"; #pragma pop /* 80CC512C-80CC5130 -00001 0004+00 4/4 0/0 0/0 .data l_arcName */ @@ -247,14 +254,14 @@ asm void daObjSakuita_c::setBaseMtx() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3704 = 0.5f; -COMPILER_STRIP_GATE(80CC50F8, &lit_3704); +COMPILER_STRIP_GATE(0x80CC50F8, &lit_3704); #pragma pop /* 80CC50FC-80CC5100 000048 0004+00 0/1 0/0 0/0 .rodata @3761 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3761 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(80CC50FC, &lit_3761); +COMPILER_STRIP_GATE(0x80CC50FC, &lit_3761); #pragma pop /* 80CC5100-80CC5104 00004C 0004+00 0/1 0/0 0/0 .rodata @3762 */ @@ -266,21 +273,21 @@ SECTION_RODATA static u8 const lit_3762[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CC5100, &lit_3762); +COMPILER_STRIP_GATE(0x80CC5100, &lit_3762); #pragma pop /* 80CC5104-80CC5108 000050 0004+00 0/1 0/0 0/0 .rodata @3763 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3763 = 2.0f / 5.0f; -COMPILER_STRIP_GATE(80CC5104, &lit_3763); +COMPILER_STRIP_GATE(0x80CC5104, &lit_3763); #pragma pop /* 80CC5108-80CC510C 000054 0004+00 0/1 0/0 0/0 .rodata @3764 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3764 = 8192.0f; -COMPILER_STRIP_GATE(80CC5108, &lit_3764); +COMPILER_STRIP_GATE(0x80CC5108, &lit_3764); #pragma pop /* 80CC489C-80CC4A98 00021C 01FC+00 1/1 0/0 0/0 .text setPlatePos__14daObjSakuita_cFv */ @@ -298,7 +305,7 @@ asm void daObjSakuita_c::setPlatePos() { SECTION_RODATA static u8 const lit_3781[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CC510C, &lit_3781); +COMPILER_STRIP_GATE(0x80CC510C, &lit_3781); /* 80CC4A98-80CC4B5C 000418 00C4+00 1/1 0/0 0/0 .text calcAngle__14daObjSakuita_cFv */ #pragma push @@ -467,10 +474,4 @@ asm cCcD_GStts::~cCcD_GStts() { } #pragma pop -/* 80CC5114-80CC512C 000060 0018+00 4/3 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80CC5114 = "A_Sakuita"; -SECTION_DEAD static char const* const stringBase_80CC511E = "A_Sakuita.bmd"; -#pragma pop +/* 80CC5114-80CC5114 000060 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_sakuita_rope/d_a_obj_sakuita_rope.cpp b/rel/d/a/obj/d_a_obj_sakuita_rope/d_a_obj_sakuita_rope.cpp index 2c9c8dd9fa2..8465164cfe9 100644 --- a/rel/d/a/obj/d_a_obj_sakuita_rope/d_a_obj_sakuita_rope.cpp +++ b/rel/d/a/obj/d_a_obj_sakuita_rope/d_a_obj_sakuita_rope.cpp @@ -23,11 +23,11 @@ struct mDoExt_3DlineMatSortPacket { /* 80014738 */ void setMat(mDoExt_3DlineMat_c*); }; -struct dKy_tevstr_c {}; +struct ResTIMG {}; struct _GXColor {}; -struct ResTIMG {}; +struct dKy_tevstr_c {}; struct mDoExt_3DlineMat1_c { /* 80013360 */ void init(u16, u16, ResTIMG*, int); @@ -67,10 +67,10 @@ struct dRes_control_c { /* 8003C37C */ void getRes(char const*, char const*, dRes_info_c*, int); }; -struct J3DModelData {}; - struct J3DModel {}; +struct J3DModelData {}; + struct dComIfG_play_c { /* 8002CAF0 */ void addSimpleModel(J3DModelData*, int, u8); /* 8002CB30 */ void removeSimpleModel(J3DModelData*, int); @@ -221,11 +221,11 @@ SECTION_RODATA u8 const daObjItaRope_c::M_attr[20] = { 0xC0, 0xA0, 0x00, 0x00, 0x3E, 0x4C, 0xCC, 0xCD, 0x3F, 0x00, 0x00, 0x00, 0x3F, 0x4C, 0xCC, 0xCD, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CC68F0, &daObjItaRope_c::M_attr); +COMPILER_STRIP_GATE(0x80CC68F0, &daObjItaRope_c::M_attr); /* 80CC6904-80CC6908 000014 0004+00 1/2 0/0 0/0 .rodata @3634 */ SECTION_RODATA static f32 const lit_3634 = 75.0f; -COMPILER_STRIP_GATE(80CC6904, &lit_3634); +COMPILER_STRIP_GATE(0x80CC6904, &lit_3634); /* 80CC6908-80CC690C 000018 0004+00 1/4 0/0 0/0 .rodata @3635 */ SECTION_RODATA static u8 const lit_3635[4] = { @@ -234,7 +234,7 @@ SECTION_RODATA static u8 const lit_3635[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CC6908, &lit_3635); +COMPILER_STRIP_GATE(0x80CC6908, &lit_3635); /* 80CC527C-80CC5314 0000BC 0098+00 1/1 0/0 0/0 .text create__9Sakuita_cFP4cXyzsSc */ #pragma push @@ -279,7 +279,7 @@ asm void Sakuita_c::initBaseMtx() { /* ############################################################################################## */ /* 80CC690C-80CC6910 00001C 0004+00 1/1 0/0 0/0 .rodata @3669 */ SECTION_RODATA static f32 const lit_3669 = 6.0f; -COMPILER_STRIP_GATE(80CC690C, &lit_3669); +COMPILER_STRIP_GATE(0x80CC690C, &lit_3669); /* 80CC53B0-80CC5444 0001F0 0094+00 2/2 0/0 0/0 .text setBaseMtx__9Sakuita_cFv */ #pragma push @@ -298,7 +298,7 @@ asm void Sakuita_c::setBaseMtx() { SECTION_RODATA static u8 const lit_3746[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CC6910, &lit_3746); +COMPILER_STRIP_GATE(0x80CC6910, &lit_3746); #pragma pop /* 80CC6918-80CC6920 000028 0008+00 0/2 0/0 0/0 .rodata @3747 */ @@ -307,7 +307,7 @@ COMPILER_STRIP_GATE(80CC6910, &lit_3746); SECTION_RODATA static u8 const lit_3747[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CC6918, &lit_3747); +COMPILER_STRIP_GATE(0x80CC6918, &lit_3747); #pragma pop /* 80CC6920-80CC6928 000030 0008+00 0/2 0/0 0/0 .rodata @3748 */ @@ -316,63 +316,63 @@ COMPILER_STRIP_GATE(80CC6918, &lit_3747); SECTION_RODATA static u8 const lit_3748[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CC6920, &lit_3748); +COMPILER_STRIP_GATE(0x80CC6920, &lit_3748); #pragma pop /* 80CC6928-80CC692C 000038 0004+00 0/2 0/0 0/0 .rodata @3749 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3749 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(80CC6928, &lit_3749); +COMPILER_STRIP_GATE(0x80CC6928, &lit_3749); #pragma pop /* 80CC692C-80CC6930 00003C 0004+00 0/1 0/0 0/0 .rodata @3750 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3750 = -60.0f; -COMPILER_STRIP_GATE(80CC692C, &lit_3750); +COMPILER_STRIP_GATE(0x80CC692C, &lit_3750); #pragma pop /* 80CC6930-80CC6934 000040 0004+00 0/1 0/0 0/0 .rodata @3751 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3751 = 15.0f; -COMPILER_STRIP_GATE(80CC6930, &lit_3751); +COMPILER_STRIP_GATE(0x80CC6930, &lit_3751); #pragma pop /* 80CC6934-80CC6938 000044 0004+00 0/1 0/0 0/0 .rodata @3752 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3752 = 100.0f; -COMPILER_STRIP_GATE(80CC6934, &lit_3752); +COMPILER_STRIP_GATE(0x80CC6934, &lit_3752); #pragma pop /* 80CC6938-80CC693C 000048 0004+00 0/1 0/0 0/0 .rodata @3753 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3753 = 2.0f / 5.0f; -COMPILER_STRIP_GATE(80CC6938, &lit_3753); +COMPILER_STRIP_GATE(0x80CC6938, &lit_3753); #pragma pop /* 80CC693C-80CC6940 00004C 0004+00 0/1 0/0 0/0 .rodata @3754 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3754 = 8192.0f; -COMPILER_STRIP_GATE(80CC693C, &lit_3754); +COMPILER_STRIP_GATE(0x80CC693C, &lit_3754); #pragma pop /* 80CC6940-80CC6944 000050 0004+00 0/1 0/0 0/0 .rodata @3755 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3755 = 900.0f; -COMPILER_STRIP_GATE(80CC6940, &lit_3755); +COMPILER_STRIP_GATE(0x80CC6940, &lit_3755); #pragma pop /* 80CC6944-80CC6948 000054 0004+00 0/2 0/0 0/0 .rodata @3756 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3756 = -75.0f; -COMPILER_STRIP_GATE(80CC6944, &lit_3756); +COMPILER_STRIP_GATE(0x80CC6944, &lit_3756); #pragma pop /* 80CC6948-80CC6950 000058 0004+04 0/2 0/0 0/0 .rodata @3757 */ @@ -383,7 +383,7 @@ SECTION_RODATA static f32 const lit_3757[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80CC6948, &lit_3757); +COMPILER_STRIP_GATE(0x80CC6948, &lit_3757); #pragma pop /* 80CC5444-80CC5720 000284 02DC+00 1/1 0/0 0/0 .text setPlatePos__9Sakuita_cFP4cXyz */ @@ -401,7 +401,7 @@ asm void Sakuita_c::setPlatePos(cXyz* param_0) { SECTION_RODATA static u8 const lit_3776[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CC6950, &lit_3776); +COMPILER_STRIP_GATE(0x80CC6950, &lit_3776); /* 80CC5720-80CC57E4 000560 00C4+00 2/2 0/0 0/0 .text calcAngle__9Sakuita_cFv */ #pragma push @@ -418,28 +418,35 @@ asm void Sakuita_c::calcAngle() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3953 = 1.0f; -COMPILER_STRIP_GATE(80CC6958, &lit_3953); +COMPILER_STRIP_GATE(0x80CC6958, &lit_3953); #pragma pop /* 80CC695C-80CC6960 00006C 0004+00 0/1 0/0 0/0 .rodata @3954 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3954 = 3.0f; -COMPILER_STRIP_GATE(80CC695C, &lit_3954); +COMPILER_STRIP_GATE(0x80CC695C, &lit_3954); #pragma pop /* 80CC6960-80CC6964 000070 0004+00 0/1 0/0 0/0 .rodata @3955 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3955 = -140.0f; -COMPILER_STRIP_GATE(80CC6960, &lit_3955); +COMPILER_STRIP_GATE(0x80CC6960, &lit_3955); #pragma pop /* 80CC6964-80CC6968 000074 0004+00 0/1 0/0 0/0 .rodata @3956 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3956 = 20.0f; -COMPILER_STRIP_GATE(80CC6964, &lit_3956); +COMPILER_STRIP_GATE(0x80CC6964, &lit_3956); +#pragma pop + +/* 80CC6970-80CC6970 000080 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80CC6970 = "A_Sakuita"; +SECTION_DEAD static char const* const stringBase_80CC697A = "A_Sakuita.bmd"; #pragma pop /* 80CC6998-80CC699C -00001 0004+00 4/4 0/0 0/0 .data l_arcName */ @@ -480,7 +487,7 @@ asm void daObjItaRope_c::setBaseMtx() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4094 = 3.0f / 5.0f; -COMPILER_STRIP_GATE(80CC6968, &lit_4094); +COMPILER_STRIP_GATE(0x80CC6968, &lit_4094); #pragma pop /* 80CC5ECC-80CC622C 000D0C 0360+00 2/2 0/0 0/0 .text setNormalRopePos__14daObjItaRope_cFv */ @@ -496,7 +503,13 @@ asm void daObjItaRope_c::setNormalRopePos() { /* ############################################################################################## */ /* 80CC696C-80CC6970 00007C 0004+00 1/1 0/0 0/0 .rodata @4149 */ SECTION_RODATA static f32 const lit_4149 = 2.0f; -COMPILER_STRIP_GATE(80CC696C, &lit_4149); +COMPILER_STRIP_GATE(0x80CC696C, &lit_4149); + +/* 80CC6970-80CC6970 000080 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80CC6988 = "Obj_Rope.bti"; +#pragma pop /* 80CC622C-80CC63E4 00106C 01B8+00 1/1 0/0 0/0 .text createSolidHeap__FP10fopAc_ac_c */ #pragma push @@ -656,11 +669,4 @@ asm cCcD_GStts::~cCcD_GStts() { } #pragma pop -/* 80CC6970-80CC6995 000080 0025+00 4/3 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80CC6970 = "A_Sakuita"; -SECTION_DEAD static char const* const stringBase_80CC697A = "A_Sakuita.bmd"; -SECTION_DEAD static char const* const stringBase_80CC6988 = "Obj_Rope.bti"; -#pragma pop +/* 80CC6970-80CC6970 000080 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_scannon/d_a_obj_scannon.cpp b/rel/d/a/obj/d_a_obj_scannon/d_a_obj_scannon.cpp index 33cb699490d..0660a5a3f30 100644 --- a/rel/d/a/obj/d_a_obj_scannon/d_a_obj_scannon.cpp +++ b/rel/d/a/obj/d_a_obj_scannon/d_a_obj_scannon.cpp @@ -133,10 +133,10 @@ struct dRes_control_c { struct dPa_levelEcallBack {}; -struct _GXColor {}; - struct csXyz {}; +struct _GXColor {}; + struct dPa_control_c { /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, @@ -224,10 +224,10 @@ struct cBgS { struct _GXTexObj {}; -struct Vec {}; - struct JAISoundID {}; +struct Vec {}; + struct Z2SeMgr { /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); }; @@ -307,7 +307,7 @@ extern "C" static void daSCannon_create__FP11daSCannon_c(); extern "C" static void daSCannon_Delete__FP11daSCannon_c(); extern "C" static void daSCannon_execute__FP11daSCannon_c(); extern "C" static void daSCannon_draw__FP11daSCannon_c(); -extern "C" void func_80CC8F14(int*); +extern "C" void func_80CC8F14(void* _this, int*); extern "C" void __sinit_d_a_obj_scannon_cpp(); extern "C" static void func_80CC916C(); extern "C" static void func_80CC9174(); @@ -446,6 +446,32 @@ static asm void daSCannon_c_createHeap(fopAc_ac_c* param_0) { #pragma pop /* ############################################################################################## */ +/* 80CC9224-80CC9224 00009C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80CC9224 = "SkyCannon"; +SECTION_DEAD static char const* const stringBase_80CC922E = "SCanHai"; +SECTION_DEAD static char const* const stringBase_80CC9236 = "SCanZev"; +SECTION_DEAD static char const* const stringBase_80CC923E = "SCanPtl"; +SECTION_DEAD static char const* const stringBase_80CC9246 = "SCannon"; +SECTION_DEAD static char const* const stringBase_80CC924E = "SKY_CANNON_WARP_END"; +SECTION_DEAD static char const* const stringBase_80CC9262 = "SKY_CANNON_FIRE_FIRST"; +SECTION_DEAD static char const* const stringBase_80CC9278 = "SKY_CANNON_FIRE_TKS"; +SECTION_DEAD static char const* const stringBase_80CC928C = "SKY_CANNON_FIRE_SECOND"; +SECTION_DEAD static char const* const stringBase_80CC92A3 = "head"; +SECTION_DEAD static char const* const stringBase_80CC92A8 = "Ni_SkyCannon_crash"; +SECTION_DEAD static char const* const stringBase_80CC92BB = "Tks"; +SECTION_DEAD static char const* const stringBase_80CC92BF = "WAIT"; +SECTION_DEAD static char const* const stringBase_80CC92C4 = "MOVE"; +SECTION_DEAD static char const* const stringBase_80CC92C9 = "0001_WAIT"; +SECTION_DEAD static char const* const stringBase_80CC92D3 = "0002_RUN"; +SECTION_DEAD static char const* const stringBase_80CC92DC = "0003_JUMP"; +SECTION_DEAD static char const* const stringBase_80CC92E6 = "LINK_IN"; +SECTION_DEAD static char const* const stringBase_80CC92EE = "SET"; +SECTION_DEAD static char const* const stringBase_80CC92F2 = "FIRE"; +SECTION_DEAD static char const* const stringBase_80CC92F7 = "FINISH"; +#pragma pop + /* 80CC9304-80CC9310 000000 000C+00 4/4 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -831,7 +857,7 @@ asm daSCannon_c::~daSCannon_c() { SECTION_RODATA static u8 const TKS_SET_POS[12] = { 0xC7, 0xC0, 0x5D, 0x9D, 0xC6, 0x8F, 0x55, 0x96, 0x47, 0x4B, 0x59, 0x28, }; -COMPILER_STRIP_GATE(80CC9188, &TKS_SET_POS); +COMPILER_STRIP_GATE(0x80CC9188, &TKS_SET_POS); /* 80CC9194-80CC919C 00000C 0006+02 0/1 0/0 0/0 .rodata SMK_PARTICLE_NAME */ #pragma push @@ -847,7 +873,7 @@ SECTION_RODATA static u8 const SMK_PARTICLE_NAME[6 + 2 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CC9194, &SMK_PARTICLE_NAME); +COMPILER_STRIP_GATE(0x80CC9194, &SMK_PARTICLE_NAME); #pragma pop /* 80CC919C-80CC91A4 000014 0006+02 0/1 0/0 0/0 .rodata APP_PARTICLE_NAME */ @@ -864,21 +890,21 @@ SECTION_RODATA static u8 const APP_PARTICLE_NAME[6 + 2 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CC919C, &APP_PARTICLE_NAME); +COMPILER_STRIP_GATE(0x80CC919C, &APP_PARTICLE_NAME); #pragma pop /* 80CC91A4-80CC91A8 00001C 0004+00 0/1 0/0 0/0 .rodata @3992 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3992 = 5.0f; -COMPILER_STRIP_GATE(80CC91A4, &lit_3992); +COMPILER_STRIP_GATE(0x80CC91A4, &lit_3992); #pragma pop /* 80CC91A8-80CC91AC 000020 0004+00 0/1 0/0 0/0 .rodata @3993 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3993 = 500.0f; -COMPILER_STRIP_GATE(80CC91A8, &lit_3993); +COMPILER_STRIP_GATE(0x80CC91A8, &lit_3993); #pragma pop /* 80CC91AC-80CC91B0 000024 0004+00 4/11 0/0 0/0 .rodata @3994 */ @@ -888,13 +914,13 @@ SECTION_RODATA static u8 const lit_3994[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CC91AC, &lit_3994); +COMPILER_STRIP_GATE(0x80CC91AC, &lit_3994); /* 80CC91B0-80CC91B4 000028 0004+00 0/1 0/0 0/0 .rodata @3995 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3995 = 10.0f; -COMPILER_STRIP_GATE(80CC91B0, &lit_3995); +COMPILER_STRIP_GATE(0x80CC91B0, &lit_3995); #pragma pop /* 80CC6D10-80CC7124 0002F0 0414+00 1/1 0/0 0/0 .text create__11daSCannon_cFv */ @@ -942,12 +968,12 @@ asm void daSCannon_c::execute() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4113 = 2500.0f; -COMPILER_STRIP_GATE(80CC91B4, &lit_4113); +COMPILER_STRIP_GATE(0x80CC91B4, &lit_4113); #pragma pop /* 80CC91B8-80CC91BC 000030 0004+00 4/12 0/0 0/0 .rodata @4114 */ SECTION_RODATA static f32 const lit_4114 = 1.0f; -COMPILER_STRIP_GATE(80CC91B8, &lit_4114); +COMPILER_STRIP_GATE(0x80CC91B8, &lit_4114); /* 80CC7228-80CC747C 000808 0254+00 1/1 0/0 0/0 .text draw__11daSCannon_cFv */ #pragma push @@ -982,11 +1008,11 @@ asm void daSCannon_c::setModelMtx() { /* ############################################################################################## */ /* 80CC91BC-80CC91C0 000034 0004+00 1/1 0/0 0/0 .rodata @4157 */ SECTION_RODATA static f32 const lit_4157 = 1800.0f; -COMPILER_STRIP_GATE(80CC91BC, &lit_4157); +COMPILER_STRIP_GATE(0x80CC91BC, &lit_4157); /* 80CC91C0-80CC91C4 000038 0004+00 1/1 0/0 0/0 .rodata @4158 */ SECTION_RODATA static f32 const lit_4158 = 4.0f; -COMPILER_STRIP_GATE(80CC91C0, &lit_4158); +COMPILER_STRIP_GATE(0x80CC91C0, &lit_4158); /* 80CC7578-80CC7608 000B58 0090+00 1/1 0/0 0/0 .text setPtlModelMtx__11daSCannon_cFv */ #pragma push @@ -1104,7 +1130,7 @@ SECTION_RODATA void* const daSCannon_c::s_demoTable[12] = { (void*)&CUT_TYPE_TABLE_FIRE_SECOND, (void*)0x00000004, }; -COMPILER_STRIP_GATE(80CC91C4, &daSCannon_c::s_demoTable); +COMPILER_STRIP_GATE(0x80CC91C4, &daSCannon_c::s_demoTable); /* 80CC7EC0-80CC7FAC 0014A0 00EC+00 1/1 0/0 0/0 .text demoExe__11daSCannon_cFv */ #pragma push @@ -1136,21 +1162,21 @@ void daSCannon_c::demoInitLinkIn() { #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4476 = 0xC7C758B8; -COMPILER_STRIP_GATE(80CC91F4, &lit_4476); +COMPILER_STRIP_GATE(0x80CC91F4, &lit_4476); #pragma pop /* 80CC91F8-80CC91FC 000070 0004+00 0/1 0/0 0/0 .rodata @4477 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4477 = 0xC68C6BC9; -COMPILER_STRIP_GATE(80CC91F8, &lit_4477); +COMPILER_STRIP_GATE(0x80CC91F8, &lit_4477); #pragma pop /* 80CC91FC-80CC9200 000074 0004+00 0/1 0/0 0/0 .rodata @4478 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4478 = 0x4752DDA4; -COMPILER_STRIP_GATE(80CC91FC, &lit_4478); +COMPILER_STRIP_GATE(0x80CC91FC, &lit_4478); #pragma pop /* 80CC8048-80CC8108 001628 00C0+00 1/0 0/0 0/0 .text demoExeLinkIn__11daSCannon_cFv */ @@ -1168,7 +1194,7 @@ asm void daSCannon_c::demoExeLinkIn() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4499 = -1.0f; -COMPILER_STRIP_GATE(80CC9200, &lit_4499); +COMPILER_STRIP_GATE(0x80CC9200, &lit_4499); #pragma pop /* 80CC8108-80CC81DC 0016E8 00D4+00 1/0 0/0 0/0 .text demoInitSet__11daSCannon_cFv */ @@ -1186,7 +1212,7 @@ asm void daSCannon_c::demoInitSet() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4515 = 84.0f; -COMPILER_STRIP_GATE(80CC9204, &lit_4515); +COMPILER_STRIP_GATE(0x80CC9204, &lit_4515); #pragma pop /* 80CC81DC-80CC8274 0017BC 0098+00 1/0 0/0 0/0 .text demoExeSet__11daSCannon_cFv */ @@ -1209,21 +1235,21 @@ void daSCannon_c::demoInitMove() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4545 = 104.0f; -COMPILER_STRIP_GATE(80CC9208, &lit_4545); +COMPILER_STRIP_GATE(0x80CC9208, &lit_4545); #pragma pop /* 80CC920C-80CC9210 000084 0004+00 0/1 0/0 0/0 .rodata @4546 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4546 = 120.0f; -COMPILER_STRIP_GATE(80CC920C, &lit_4546); +COMPILER_STRIP_GATE(0x80CC920C, &lit_4546); #pragma pop /* 80CC9210-80CC9214 000088 0004+00 0/1 0/0 0/0 .rodata @4547 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4547 = 130.0f; -COMPILER_STRIP_GATE(80CC9210, &lit_4547); +COMPILER_STRIP_GATE(0x80CC9210, &lit_4547); #pragma pop /* 80CC8278-80CC8378 001858 0100+00 1/0 0/0 0/0 .text demoExeMove__11daSCannon_cFv */ @@ -1249,7 +1275,7 @@ asm void daSCannon_c::demoInitFire() { /* ############################################################################################## */ /* 80CC9214-80CC9218 00008C 0004+00 1/1 0/0 0/0 .rodata @4566 */ SECTION_RODATA static f32 const lit_4566 = 235.0f; -COMPILER_STRIP_GATE(80CC9214, &lit_4566); +COMPILER_STRIP_GATE(0x80CC9214, &lit_4566); /* 80CC83CC-80CC8430 0019AC 0064+00 1/0 0/0 0/0 .text demoExeFire__11daSCannon_cFv */ #pragma push @@ -1261,6 +1287,13 @@ asm void daSCannon_c::demoExeFire() { } #pragma pop +/* ############################################################################################## */ +/* 80CC9224-80CC9224 00009C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80CC92FE = "Timer"; +#pragma pop + /* 80CC8430-80CC8538 001A10 0108+00 1/0 0/0 0/0 .text demoInitFinish__11daSCannon_cFv */ #pragma push #pragma optimization_level 0 @@ -1286,21 +1319,21 @@ asm void daSCannon_c::demoExeFinish() { #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4642 = 0xC7C731DA; -COMPILER_STRIP_GATE(80CC9218, &lit_4642); +COMPILER_STRIP_GATE(0x80CC9218, &lit_4642); #pragma pop /* 80CC921C-80CC9220 000094 0004+00 0/1 0/0 0/0 .rodata @4643 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4643 = -18470.0f; -COMPILER_STRIP_GATE(80CC921C, &lit_4643); +COMPILER_STRIP_GATE(0x80CC921C, &lit_4643); #pragma pop /* 80CC9220-80CC9224 000098 0004+00 0/1 0/0 0/0 .rodata @4644 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4644 = 0x475A37D0; -COMPILER_STRIP_GATE(80CC9220, &lit_4644); +COMPILER_STRIP_GATE(0x80CC9220, &lit_4644); #pragma pop /* 80CC8648-80CC8714 001C28 00CC+00 1/0 0/0 0/0 .text demoInitWarpEndWait__11daSCannon_cFv */ @@ -1475,7 +1508,7 @@ static asm void daSCannon_draw(daSCannon_c* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80CC8F14(int* param_0) { +extern "C" asm void func_80CC8F14(void* _this, int* param_0) { nofralloc #include "asm/rel/d/a/obj/d_a_obj_scannon/d_a_obj_scannon/func_80CC8F14.s" } @@ -1493,7 +1526,7 @@ asm void __sinit_d_a_obj_scannon_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80CC8F30 = (void*)__sinit_d_a_obj_scannon_cpp; +REGISTER_CTORS(0x80CC8F30, __sinit_d_a_obj_scannon_cpp); #pragma pop /* 80CC916C-80CC9174 00274C 0008+00 1/0 0/0 0/0 .text @36@__dt__12dBgS_ObjAcchFv */ @@ -1516,30 +1549,4 @@ static asm void func_80CC9174() { } #pragma pop -/* 80CC9224-80CC9304 00009C 00E0+00 15/5 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80CC9224 = "SkyCannon"; -SECTION_DEAD static char const* const stringBase_80CC922E = "SCanHai"; -SECTION_DEAD static char const* const stringBase_80CC9236 = "SCanZev"; -SECTION_DEAD static char const* const stringBase_80CC923E = "SCanPtl"; -SECTION_DEAD static char const* const stringBase_80CC9246 = "SCannon"; -SECTION_DEAD static char const* const stringBase_80CC924E = "SKY_CANNON_WARP_END"; -SECTION_DEAD static char const* const stringBase_80CC9262 = "SKY_CANNON_FIRE_FIRST"; -SECTION_DEAD static char const* const stringBase_80CC9278 = "SKY_CANNON_FIRE_TKS"; -SECTION_DEAD static char const* const stringBase_80CC928C = "SKY_CANNON_FIRE_SECOND"; -SECTION_DEAD static char const* const stringBase_80CC92A3 = "head"; -SECTION_DEAD static char const* const stringBase_80CC92A8 = "Ni_SkyCannon_crash"; -SECTION_DEAD static char const* const stringBase_80CC92BB = "Tks"; -SECTION_DEAD static char const* const stringBase_80CC92BF = "WAIT"; -SECTION_DEAD static char const* const stringBase_80CC92C4 = "MOVE"; -SECTION_DEAD static char const* const stringBase_80CC92C9 = "0001_WAIT"; -SECTION_DEAD static char const* const stringBase_80CC92D3 = "0002_RUN"; -SECTION_DEAD static char const* const stringBase_80CC92DC = "0003_JUMP"; -SECTION_DEAD static char const* const stringBase_80CC92E6 = "LINK_IN"; -SECTION_DEAD static char const* const stringBase_80CC92EE = "SET"; -SECTION_DEAD static char const* const stringBase_80CC92F2 = "FIRE"; -SECTION_DEAD static char const* const stringBase_80CC92F7 = "FINISH"; -SECTION_DEAD static char const* const stringBase_80CC92FE = "Timer"; -#pragma pop +/* 80CC9224-80CC9224 00009C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_scannon_crs/d_a_obj_scannon_crs.cpp b/rel/d/a/obj/d_a_obj_scannon_crs/d_a_obj_scannon_crs.cpp index 459ee638d23..f081b1268f0 100644 --- a/rel/d/a/obj/d_a_obj_scannon_crs/d_a_obj_scannon_crs.cpp +++ b/rel/d/a/obj/d_a_obj_scannon_crs/d_a_obj_scannon_crs.cpp @@ -57,10 +57,10 @@ struct fopAc_ac_c { /* 80018C8C */ ~fopAc_ac_c(); }; -struct JPABaseEmitter {}; - struct daMidna_c {}; +struct JPABaseEmitter {}; + struct daSCannonCrs_c { /* 80CC973C */ daSCannonCrs_c(); /* 80CC983C */ ~daSCannonCrs_c(); @@ -375,6 +375,19 @@ static asm void eventCallBack(void* param_0, int param_1) { #pragma pop /* ############################################################################################## */ +/* 80CCB114-80CCB114 000094 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80CCB114 = "SCanCrs"; +SECTION_DEAD static char const* const stringBase_80CCB11C = "SKY_CANNON_WARP_START"; +SECTION_DEAD static char const* const stringBase_80CCB132 = "effect_p"; +SECTION_DEAD static char const* const stringBase_80CCB13B = "center"; +SECTION_DEAD static char const* const stringBase_80CCB142 = "WAIT"; +SECTION_DEAD static char const* const stringBase_80CCB147 = "BEAM_HIT"; +SECTION_DEAD static char const* const stringBase_80CCB150 = "READY"; +SECTION_DEAD static char const* const stringBase_80CCB156 = "UP"; +#pragma pop + /* 80CCB15C-80CCB168 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -550,7 +563,7 @@ asm daSCannonCrs_c::~daSCannonCrs_c() { SECTION_RODATA static u8 const DISAP_PARTICLE_NAME[8] = { 0x8B, 0x2B, 0x8B, 0x2C, 0x8B, 0x2D, 0x8B, 0x2E, }; -COMPILER_STRIP_GATE(80CCB080, &DISAP_PARTICLE_NAME); +COMPILER_STRIP_GATE(0x80CCB080, &DISAP_PARTICLE_NAME); /* 80CCB088-80CCB090 000008 0008+00 0/1 0/0 0/0 .rodata BEAM_PARTICLE_NAME */ #pragma push @@ -558,35 +571,35 @@ COMPILER_STRIP_GATE(80CCB080, &DISAP_PARTICLE_NAME); SECTION_RODATA static u8 const BEAM_PARTICLE_NAME[8] = { 0x8B, 0x43, 0x8B, 0x44, 0x8B, 0x45, 0x8B, 0x46, }; -COMPILER_STRIP_GATE(80CCB088, &BEAM_PARTICLE_NAME); +COMPILER_STRIP_GATE(0x80CCB088, &BEAM_PARTICLE_NAME); #pragma pop /* 80CCB090-80CCB094 000010 0004+00 0/1 0/0 0/0 .rodata @3822 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3822 = -500.0f; -COMPILER_STRIP_GATE(80CCB090, &lit_3822); +COMPILER_STRIP_GATE(0x80CCB090, &lit_3822); #pragma pop /* 80CCB094-80CCB098 000014 0004+00 0/1 0/0 0/0 .rodata @3823 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3823 = -100.0f; -COMPILER_STRIP_GATE(80CCB094, &lit_3823); +COMPILER_STRIP_GATE(0x80CCB094, &lit_3823); #pragma pop /* 80CCB098-80CCB09C 000018 0004+00 0/1 0/0 0/0 .rodata @3824 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3824 = 500.0f; -COMPILER_STRIP_GATE(80CCB098, &lit_3824); +COMPILER_STRIP_GATE(0x80CCB098, &lit_3824); #pragma pop /* 80CCB09C-80CCB0A0 00001C 0004+00 0/1 0/0 0/0 .rodata @3825 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3825 = 2500.0f; -COMPILER_STRIP_GATE(80CCB09C, &lit_3825); +COMPILER_STRIP_GATE(0x80CCB09C, &lit_3825); #pragma pop /* 80CC9910-80CC9B10 000310 0200+00 1/1 0/0 0/0 .text create__14daSCannonCrs_cFv */ @@ -644,32 +657,32 @@ asm void daSCannonCrs_c::middleExe(daMidna_c* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3949 = 4750.0f; -COMPILER_STRIP_GATE(80CCB0A0, &lit_3949); +COMPILER_STRIP_GATE(0x80CCB0A0, &lit_3949); #pragma pop /* 80CCB0A4-80CCB0A8 000024 0004+00 0/2 0/0 0/0 .rodata @3950 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3950 = -1520.0f; -COMPILER_STRIP_GATE(80CCB0A4, &lit_3950); +COMPILER_STRIP_GATE(0x80CCB0A4, &lit_3950); #pragma pop /* 80CCB0A8-80CCB0AC 000028 0004+00 0/2 0/0 0/0 .rodata @3951 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3951 = -3900.0f; -COMPILER_STRIP_GATE(80CCB0A8, &lit_3951); +COMPILER_STRIP_GATE(0x80CCB0A8, &lit_3951); #pragma pop /* 80CCB0AC-80CCB0B0 00002C 0004+00 1/4 0/0 0/0 .rodata @3952 */ SECTION_RODATA static f32 const lit_3952 = 1.0f; -COMPILER_STRIP_GATE(80CCB0AC, &lit_3952); +COMPILER_STRIP_GATE(0x80CCB0AC, &lit_3952); /* 80CCB0B0-80CCB0B4 000030 0004+00 0/2 0/0 0/0 .rodata @3953 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3953 = -1.0f; -COMPILER_STRIP_GATE(80CCB0B0, &lit_3953); +COMPILER_STRIP_GATE(0x80CCB0B0, &lit_3953); #pragma pop /* 80CC9D60-80CC9F34 000760 01D4+00 1/0 0/0 0/0 .text exeModeWait__14daSCannonCrs_cFP9daMidna_c */ @@ -701,7 +714,7 @@ SECTION_RODATA static u8 const lit_4033[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CCB0B4, &lit_4033); +COMPILER_STRIP_GATE(0x80CCB0B4, &lit_4033); /* 80CCB0B8-80CCB0C0 000038 0008+00 0/2 0/0 0/0 .rodata @4034 */ #pragma push @@ -709,7 +722,7 @@ COMPILER_STRIP_GATE(80CCB0B4, &lit_4033); SECTION_RODATA static u8 const lit_4034[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CCB0B8, &lit_4034); +COMPILER_STRIP_GATE(0x80CCB0B8, &lit_4034); #pragma pop /* 80CCB0C0-80CCB0C8 000040 0008+00 0/2 0/0 0/0 .rodata @4035 */ @@ -718,7 +731,7 @@ COMPILER_STRIP_GATE(80CCB0B8, &lit_4034); SECTION_RODATA static u8 const lit_4035[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CCB0C0, &lit_4035); +COMPILER_STRIP_GATE(0x80CCB0C0, &lit_4035); #pragma pop /* 80CCB0C8-80CCB0D0 000048 0008+00 0/2 0/0 0/0 .rodata @4036 */ @@ -727,14 +740,14 @@ COMPILER_STRIP_GATE(80CCB0C0, &lit_4035); SECTION_RODATA static u8 const lit_4036[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CCB0C8, &lit_4036); +COMPILER_STRIP_GATE(0x80CCB0C8, &lit_4036); #pragma pop /* 80CCB0D0-80CCB0D4 000050 0004+00 0/1 0/0 0/0 .rodata @4037 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4037 = 5.0f; -COMPILER_STRIP_GATE(80CCB0D0, &lit_4037); +COMPILER_STRIP_GATE(0x80CCB0D0, &lit_4037); #pragma pop /* 80CC9F80-80CCA240 000980 02C0+00 1/0 0/0 0/0 .text @@ -780,21 +793,21 @@ void daSCannonCrs_c::exeModeEnd(daMidna_c* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4189 = 35.0f; -COMPILER_STRIP_GATE(80CCB0D4, &lit_4189); +COMPILER_STRIP_GATE(0x80CCB0D4, &lit_4189); #pragma pop /* 80CCB0D8-80CCB0DC 000058 0004+00 0/1 0/0 0/0 .rodata @4190 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4190 = 88.0f; -COMPILER_STRIP_GATE(80CCB0D8, &lit_4190); +COMPILER_STRIP_GATE(0x80CCB0D8, &lit_4190); #pragma pop /* 80CCB0DC-80CCB0E0 00005C 0004+00 0/1 0/0 0/0 .rodata @4191 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4191 = 240.0f; -COMPILER_STRIP_GATE(80CCB0DC, &lit_4191); +COMPILER_STRIP_GATE(0x80CCB0DC, &lit_4191); #pragma pop /* 80CCA348-80CCA74C 000D48 0404+00 1/1 0/0 0/0 .text demoExe__14daSCannonCrs_cFv */ @@ -814,14 +827,14 @@ asm void daSCannonCrs_c::demoExe() { SECTION_RODATA static u8 const MIDNA_WAIT_POS_OFFSET[12] = { 0x42, 0xC8, 0x00, 0x00, 0x44, 0x61, 0x00, 0x00, 0x42, 0xB4, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CCB0E0, &MIDNA_WAIT_POS_OFFSET); +COMPILER_STRIP_GATE(0x80CCB0E0, &MIDNA_WAIT_POS_OFFSET); #pragma pop /* 80CCB0EC-80CCB0F0 00006C 0004+00 0/1 0/0 0/0 .rodata @4205 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4205 = 200.0f; -COMPILER_STRIP_GATE(80CCB0EC, &lit_4205); +COMPILER_STRIP_GATE(0x80CCB0EC, &lit_4205); #pragma pop /* 80CCB0F0-80CCB0F8 000070 0004+04 0/1 0/0 0/0 .rodata @4206 */ @@ -832,7 +845,7 @@ SECTION_RODATA static f32 const lit_4206[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80CCB0F0, &lit_4206); +COMPILER_STRIP_GATE(0x80CCB0F0, &lit_4206); #pragma pop /* 80CCB0F8-80CCB100 000078 0008+00 0/1 0/0 0/0 .rodata @4208 */ @@ -841,7 +854,7 @@ COMPILER_STRIP_GATE(80CCB0F0, &lit_4206); SECTION_RODATA static u8 const lit_4208[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CCB0F8, &lit_4208); +COMPILER_STRIP_GATE(0x80CCB0F8, &lit_4208); #pragma pop /* 80CCA74C-80CCA848 00114C 00FC+00 1/1 0/0 0/0 .text init__14daSCannonCrs_cFv */ @@ -915,21 +928,21 @@ asm void daSCannonCrs_c::exeEmtRt(u16 param_0, int param_1, JPABaseEmitter** par SECTION_RODATA static u8 const MIDNA_BEAM_OFFSET[12] = { 0x00, 0x00, 0x00, 0x00, 0x42, 0x48, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CCB100, &MIDNA_BEAM_OFFSET); +COMPILER_STRIP_GATE(0x80CCB100, &MIDNA_BEAM_OFFSET); #pragma pop /* 80CCB10C-80CCB110 00008C 0004+00 0/1 0/0 0/0 .rodata @4434 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4434 = 400.0f; -COMPILER_STRIP_GATE(80CCB10C, &lit_4434); +COMPILER_STRIP_GATE(0x80CCB10C, &lit_4434); #pragma pop /* 80CCB110-80CCB114 000090 0004+00 0/1 0/0 0/0 .rodata @4435 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4435 = 1.0f / 100.0f; -COMPILER_STRIP_GATE(80CCB110, &lit_4435); +COMPILER_STRIP_GATE(0x80CCB110, &lit_4435); #pragma pop /* 80CCACD0-80CCAF20 0016D0 0250+00 1/1 0/0 0/0 .text callMidnaBeamEmt__14daSCannonCrs_cFv */ @@ -994,19 +1007,7 @@ asm void __sinit_d_a_obj_scannon_crs_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80CCAFD4 = (void*)__sinit_d_a_obj_scannon_crs_cpp; +REGISTER_CTORS(0x80CCAFD4, __sinit_d_a_obj_scannon_crs_cpp); #pragma pop -/* 80CCB114-80CCB159 000094 0045+00 6/2 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80CCB114 = "SCanCrs"; -SECTION_DEAD static char const* const stringBase_80CCB11C = "SKY_CANNON_WARP_START"; -SECTION_DEAD static char const* const stringBase_80CCB132 = "effect_p"; -SECTION_DEAD static char const* const stringBase_80CCB13B = "center"; -SECTION_DEAD static char const* const stringBase_80CCB142 = "WAIT"; -SECTION_DEAD static char const* const stringBase_80CCB147 = "BEAM_HIT"; -SECTION_DEAD static char const* const stringBase_80CCB150 = "READY"; -SECTION_DEAD static char const* const stringBase_80CCB156 = "UP"; -#pragma pop +/* 80CCB114-80CCB114 000094 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_scannon_ten/d_a_obj_scannon_ten.cpp b/rel/d/a/obj/d_a_obj_scannon_ten/d_a_obj_scannon_ten.cpp index eedd6848a3e..12734c07926 100644 --- a/rel/d/a/obj/d_a_obj_scannon_ten/d_a_obj_scannon_ten.cpp +++ b/rel/d/a/obj/d_a_obj_scannon_ten/d_a_obj_scannon_ten.cpp @@ -99,10 +99,10 @@ struct dRes_control_c { struct dPa_levelEcallBack {}; -struct _GXColor {}; - struct csXyz {}; +struct _GXColor {}; + struct dPa_control_c { /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, @@ -186,10 +186,10 @@ struct cBgS { struct _GXTexObj {}; -struct Vec {}; - struct JAISoundID {}; +struct Vec {}; + struct Z2SeMgr { /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); }; @@ -264,7 +264,7 @@ extern "C" static void daObjSCannonTen_create__FP17daObjSCannonTen_c(); extern "C" static void daObjSCannonTen_Delete__FP17daObjSCannonTen_c(); extern "C" static void daObjSCannonTen_execute__FP17daObjSCannonTen_c(); extern "C" static void daObjSCannonTen_draw__FP17daObjSCannonTen_c(); -extern "C" void func_80CCCA6C(int*); +extern "C" void func_80CCCA6C(void* _this, int*); extern "C" void __sinit_d_a_obj_scannon_ten_cpp(); extern "C" static void func_80CCCC1C(); extern "C" static void func_80CCCC24(); @@ -385,6 +385,20 @@ static asm void daObjSCannonTen_c_createHeap(fopAc_ac_c* param_0) { #pragma pop /* ############################################################################################## */ +/* 80CCCC80-80CCCC80 000048 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80CCCC80 = "SCanTen"; +SECTION_DEAD static char const* const stringBase_80CCCC88 = "SKY_CANNON_TEN_FIRE"; +SECTION_DEAD static char const* const stringBase_80CCCC9C = "head"; +SECTION_DEAD static char const* const stringBase_80CCCCA1 = "LINK_IN"; +SECTION_DEAD static char const* const stringBase_80CCCCA9 = "SET"; +SECTION_DEAD static char const* const stringBase_80CCCCAD = "MOVE"; +SECTION_DEAD static char const* const stringBase_80CCCCB2 = "FIRE"; +SECTION_DEAD static char const* const stringBase_80CCCCB7 = "FIRE_END"; +SECTION_DEAD static char const* const stringBase_80CCCCC0 = "FINISH"; +#pragma pop + /* 80CCCCD0-80CCCCDC 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -697,7 +711,7 @@ SECTION_RODATA static u8 const lit_3832[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CCCC38, &lit_3832); +COMPILER_STRIP_GATE(0x80CCCC38, &lit_3832); /* 80CCB4EC-80CCB66C 00024C 0180+00 1/1 0/0 0/0 .text createHeap__17daObjSCannonTen_cFv */ @@ -715,21 +729,21 @@ asm void daObjSCannonTen_c::createHeap() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3931 = 5.0f; -COMPILER_STRIP_GATE(80CCCC3C, &lit_3931); +COMPILER_STRIP_GATE(0x80CCCC3C, &lit_3931); #pragma pop /* 80CCCC40-80CCCC44 000008 0004+00 0/1 0/0 0/0 .rodata @3932 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3932 = 500.0f; -COMPILER_STRIP_GATE(80CCCC40, &lit_3932); +COMPILER_STRIP_GATE(0x80CCCC40, &lit_3932); #pragma pop /* 80CCCC44-80CCCC48 00000C 0004+00 0/1 0/0 0/0 .rodata @3933 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3933 = 10.0f; -COMPILER_STRIP_GATE(80CCCC44, &lit_3933); +COMPILER_STRIP_GATE(0x80CCCC44, &lit_3933); #pragma pop /* 80CCB66C-80CCB900 0003CC 0294+00 1/1 0/0 0/0 .text create__17daObjSCannonTen_cFv */ @@ -777,12 +791,12 @@ asm void daObjSCannonTen_c::Delete() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3986 = 2500.0f; -COMPILER_STRIP_GATE(80CCCC48, &lit_3986); +COMPILER_STRIP_GATE(0x80CCCC48, &lit_3986); #pragma pop /* 80CCCC4C-80CCCC50 000014 0004+00 4/9 0/0 0/0 .rodata @3987 */ SECTION_RODATA static f32 const lit_3987 = 1.0f; -COMPILER_STRIP_GATE(80CCCC4C, &lit_3987); +COMPILER_STRIP_GATE(0x80CCCC4C, &lit_3987); /* 80CCBA58-80CCBB6C 0007B8 0114+00 1/1 0/0 0/0 .text draw__17daObjSCannonTen_cFv */ #pragma push @@ -882,21 +896,21 @@ void daObjSCannonTen_c::demoInitLinkIn() { #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4110 = 0x41419A81; -COMPILER_STRIP_GATE(80CCCC50, &lit_4110); +COMPILER_STRIP_GATE(0x80CCCC50, &lit_4110); #pragma pop /* 80CCCC54-80CCCC58 00001C 0004+00 0/1 0/0 0/0 .rodata @4111 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4111 = 0x438410D7; -COMPILER_STRIP_GATE(80CCCC54, &lit_4111); +COMPILER_STRIP_GATE(0x80CCCC54, &lit_4111); #pragma pop /* 80CCCC58-80CCCC5C 000020 0004+00 0/1 0/0 0/0 .rodata @4112 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4112 = 0x463C9722; -COMPILER_STRIP_GATE(80CCCC58, &lit_4112); +COMPILER_STRIP_GATE(0x80CCCC58, &lit_4112); #pragma pop /* 80CCBF04-80CCBFC4 000C64 00C0+00 1/0 0/0 0/0 .text demoExeLinkIn__17daObjSCannonTen_cFv */ @@ -912,7 +926,7 @@ asm void daObjSCannonTen_c::demoExeLinkIn() { /* ############################################################################################## */ /* 80CCCC5C-80CCCC60 000024 0004+00 1/3 0/0 0/0 .rodata @4133 */ SECTION_RODATA static f32 const lit_4133 = -1.0f; -COMPILER_STRIP_GATE(80CCCC5C, &lit_4133); +COMPILER_STRIP_GATE(0x80CCCC5C, &lit_4133); /* 80CCBFC4-80CCC088 000D24 00C4+00 1/0 0/0 0/0 .text demoInitSet__17daObjSCannonTen_cFv */ @@ -930,7 +944,7 @@ asm void daObjSCannonTen_c::demoInitSet() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4149 = 84.0f; -COMPILER_STRIP_GATE(80CCCC60, &lit_4149); +COMPILER_STRIP_GATE(0x80CCCC60, &lit_4149); #pragma pop /* 80CCC088-80CCC114 000DE8 008C+00 1/0 0/0 0/0 .text demoExeSet__17daObjSCannonTen_cFv @@ -955,21 +969,21 @@ void daObjSCannonTen_c::demoInitMove() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4179 = 104.0f; -COMPILER_STRIP_GATE(80CCCC64, &lit_4179); +COMPILER_STRIP_GATE(0x80CCCC64, &lit_4179); #pragma pop /* 80CCCC68-80CCCC6C 000030 0004+00 0/1 0/0 0/0 .rodata @4180 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4180 = 120.0f; -COMPILER_STRIP_GATE(80CCCC68, &lit_4180); +COMPILER_STRIP_GATE(0x80CCCC68, &lit_4180); #pragma pop /* 80CCCC6C-80CCCC70 000034 0004+00 0/1 0/0 0/0 .rodata @4181 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4181 = 138.0f; -COMPILER_STRIP_GATE(80CCCC6C, &lit_4181); +COMPILER_STRIP_GATE(0x80CCCC6C, &lit_4181); #pragma pop /* 80CCC118-80CCC20C 000E78 00F4+00 1/0 0/0 0/0 .text demoExeMove__17daObjSCannonTen_cFv @@ -997,7 +1011,7 @@ asm void daObjSCannonTen_c::demoInitFire() { /* ############################################################################################## */ /* 80CCCC70-80CCCC74 000038 0004+00 1/1 0/0 0/0 .rodata @4200 */ SECTION_RODATA static f32 const lit_4200 = 235.0f; -COMPILER_STRIP_GATE(80CCCC70, &lit_4200); +COMPILER_STRIP_GATE(0x80CCCC70, &lit_4200); /* 80CCC260-80CCC2B8 000FC0 0058+00 1/0 0/0 0/0 .text demoExeFire__17daObjSCannonTen_cFv */ @@ -1023,7 +1037,7 @@ asm void daObjSCannonTen_c::demoInitFireEnd() { /* ############################################################################################## */ /* 80CCCC74-80CCCC78 00003C 0004+00 1/1 0/0 0/0 .rodata @4228 */ SECTION_RODATA static f32 const lit_4228 = 255.0f; -COMPILER_STRIP_GATE(80CCCC74, &lit_4228); +COMPILER_STRIP_GATE(0x80CCCC74, &lit_4228); /* 80CCC37C-80CCC3D4 0010DC 0058+00 1/0 0/0 0/0 .text demoExeFireEnd__17daObjSCannonTen_cFv */ #pragma push @@ -1035,6 +1049,13 @@ asm void daObjSCannonTen_c::demoExeFireEnd() { } #pragma pop +/* ############################################################################################## */ +/* 80CCCC80-80CCCC80 000048 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80CCCCC7 = "Timer"; +#pragma pop + /* 80CCC3D4-80CCC498 001134 00C4+00 1/0 0/0 0/0 .text demoInitFinish__17daObjSCannonTen_cFv */ #pragma push #pragma optimization_level 0 @@ -1100,7 +1121,7 @@ SECTION_RODATA static u8 const PARTICLE_NAME[6 + 2 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CCCC78, &PARTICLE_NAME); +COMPILER_STRIP_GATE(0x80CCCC78, &PARTICLE_NAME); /* 80CCC628-80CCC74C 001388 0124+00 1/1 0/0 0/0 .text initEmtSmoke__17daObjSCannonTen_cFv */ @@ -1204,7 +1225,7 @@ static asm void daObjSCannonTen_draw(daObjSCannonTen_c* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80CCCA6C(int* param_0) { +extern "C" asm void func_80CCCA6C(void* _this, int* param_0) { nofralloc #include "asm/rel/d/a/obj/d_a_obj_scannon_ten/d_a_obj_scannon_ten/func_80CCCA6C.s" } @@ -1222,7 +1243,7 @@ asm void __sinit_d_a_obj_scannon_ten_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80CCCA88 = (void*)__sinit_d_a_obj_scannon_ten_cpp; +REGISTER_CTORS(0x80CCCA88, __sinit_d_a_obj_scannon_ten_cpp); #pragma pop /* 80CCCC1C-80CCCC24 00197C 0008+00 1/0 0/0 0/0 .text @36@__dt__12dBgS_ObjAcchFv */ @@ -1245,18 +1266,4 @@ static asm void func_80CCCC24() { } #pragma pop -/* 80CCCC80-80CCCCCD 000048 004D+00 6/2 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80CCCC80 = "SCanTen"; -SECTION_DEAD static char const* const stringBase_80CCCC88 = "SKY_CANNON_TEN_FIRE"; -SECTION_DEAD static char const* const stringBase_80CCCC9C = "head"; -SECTION_DEAD static char const* const stringBase_80CCCCA1 = "LINK_IN"; -SECTION_DEAD static char const* const stringBase_80CCCCA9 = "SET"; -SECTION_DEAD static char const* const stringBase_80CCCCAD = "MOVE"; -SECTION_DEAD static char const* const stringBase_80CCCCB2 = "FIRE"; -SECTION_DEAD static char const* const stringBase_80CCCCB7 = "FIRE_END"; -SECTION_DEAD static char const* const stringBase_80CCCCC0 = "FINISH"; -SECTION_DEAD static char const* const stringBase_80CCCCC7 = "Timer"; -#pragma pop +/* 80CCCC80-80CCCC80 000048 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_sekidoor/d_a_obj_sekidoor.cpp b/rel/d/a/obj/d_a_obj_sekidoor/d_a_obj_sekidoor.cpp index 09d19c4ea3a..1abe1168aa1 100644 --- a/rel/d/a/obj/d_a_obj_sekidoor/d_a_obj_sekidoor.cpp +++ b/rel/d/a/obj/d_a_obj_sekidoor/d_a_obj_sekidoor.cpp @@ -66,10 +66,10 @@ struct dRes_control_c { struct dPa_levelEcallBack {}; -struct _GXColor {}; - struct csXyz {}; +struct _GXColor {}; + struct dPa_control_c { struct level_c { /* 8004B918 */ void getEmitter(u32); @@ -97,10 +97,10 @@ struct dBgS_MoveBgActor { /* 80078950 */ void MoveBGExecute(); }; -struct Vec {}; - struct JAISoundID {}; +struct Vec {}; + struct Z2SeMgr { /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); /* 802AC50C */ void seStartLevel(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); @@ -196,6 +196,13 @@ extern "C" void __register_global_object(); // /* ############################################################################################## */ +/* 80CCDA30-80CCDA30 000028 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80CCDA30 = ""; +SECTION_DEAD static char const* const stringBase_80CCDA31 = "SekiDoor"; +#pragma pop + /* 80CCDA3C-80CCDA48 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -318,31 +325,31 @@ SECTION_RODATA u8 const daObj_SekiDoor_Param_c::m[1 + 3 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CCDA08, &daObj_SekiDoor_Param_c::m); +COMPILER_STRIP_GATE(0x80CCDA08, &daObj_SekiDoor_Param_c::m); /* 80CCDA0C-80CCDA10 000004 0004+00 1/3 0/0 0/0 .rodata @3956 */ SECTION_RODATA static f32 const lit_3956 = 460.0f; -COMPILER_STRIP_GATE(80CCDA0C, &lit_3956); +COMPILER_STRIP_GATE(0x80CCDA0C, &lit_3956); /* 80CCDA10-80CCDA14 000008 0004+00 0/1 0/0 0/0 .rodata @3957 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3957 = 4.0f; -COMPILER_STRIP_GATE(80CCDA10, &lit_3957); +COMPILER_STRIP_GATE(0x80CCDA10, &lit_3957); #pragma pop /* 80CCDA14-80CCDA18 00000C 0004+00 0/2 0/0 0/0 .rodata @3958 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3958 = 1.0f; -COMPILER_STRIP_GATE(80CCDA14, &lit_3958); +COMPILER_STRIP_GATE(0x80CCDA14, &lit_3958); #pragma pop /* 80CCDA18-80CCDA1C 000010 0004+00 0/1 0/0 0/0 .rodata @3959 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3959 = -1.0f; -COMPILER_STRIP_GATE(80CCDA18, &lit_3959); +COMPILER_STRIP_GATE(0x80CCDA18, &lit_3959); #pragma pop /* 80CCDA1C-80CCDA20 000014 0004+00 0/1 0/0 0/0 .rodata @3960 */ @@ -354,7 +361,7 @@ SECTION_RODATA static u8 const lit_3960[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CCDA1C, &lit_3960); +COMPILER_STRIP_GATE(0x80CCDA1C, &lit_3960); #pragma pop /* 80CCDA20-80CCDA28 000018 0008+00 0/1 0/0 0/0 .rodata @3962 */ @@ -363,7 +370,7 @@ COMPILER_STRIP_GATE(80CCDA1C, &lit_3960); SECTION_RODATA static u8 const lit_3962[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CCDA20, &lit_3962); +COMPILER_STRIP_GATE(0x80CCDA20, &lit_3962); #pragma pop /* 80CCD290-80CCD51C 000350 028C+00 1/0 0/0 0/0 .text Execute__16daObj_SekiDoor_cFPPA3_A4_f */ @@ -413,7 +420,7 @@ asm void daObj_SekiDoor_c::evtSkip() { SECTION_RODATA static u8 const id[8] = { 0x8B, 0x85, 0x8B, 0x86, 0x8B, 0x87, 0x8B, 0x88, }; -COMPILER_STRIP_GATE(80CCDA28, &id); +COMPILER_STRIP_GATE(0x80CCDA28, &id); #pragma pop /* 80CCD64C-80CCD810 00070C 01C4+00 1/1 0/0 0/0 .text setPrtcls__16daObj_SekiDoor_cFv */ @@ -518,7 +525,7 @@ asm void __sinit_d_a_obj_sekidoor_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80CCD96C = (void*)__sinit_d_a_obj_sekidoor_cpp; +REGISTER_CTORS(0x80CCD96C, __sinit_d_a_obj_sekidoor_cpp); #pragma pop /* 80CCD9AC-80CCD9F4 000A6C 0048+00 2/1 0/0 0/0 .text __dt__22daObj_SekiDoor_Param_cFv */ @@ -531,10 +538,4 @@ asm daObj_SekiDoor_Param_c::~daObj_SekiDoor_Param_c() { } #pragma pop -/* 80CCDA30-80CCDA3A 000028 000A+00 1/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80CCDA30 = ""; -SECTION_DEAD static char const* const stringBase_80CCDA31 = "SekiDoor"; -#pragma pop +/* 80CCDA30-80CCDA30 000028 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_sekizo/d_a_obj_sekizo.cpp b/rel/d/a/obj/d_a_obj_sekizo/d_a_obj_sekizo.cpp index 67d25e22e6b..b77d505370a 100644 --- a/rel/d/a/obj/d_a_obj_sekizo/d_a_obj_sekizo.cpp +++ b/rel/d/a/obj/d_a_obj_sekizo/d_a_obj_sekizo.cpp @@ -146,6 +146,13 @@ extern "C" void __register_global_object(); // /* ############################################################################################## */ +/* 80CCE174-80CCE174 000000 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80CCE174 = ""; +SECTION_DEAD static char const* const stringBase_80CCE175 = "Sekizo"; +#pragma pop + /* 80CCE17C-80CCE188 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -371,7 +378,7 @@ asm void __sinit_d_a_obj_sekizo_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80CCE0D8 = (void*)__sinit_d_a_obj_sekizo_cpp; +REGISTER_CTORS(0x80CCE0D8, __sinit_d_a_obj_sekizo_cpp); #pragma pop /* 80CCE118-80CCE160 0005F8 0048+00 2/1 0/0 0/0 .text __dt__20daObj_Sekizo_Param_cFv */ @@ -384,10 +391,4 @@ asm daObj_Sekizo_Param_c::~daObj_Sekizo_Param_c() { } #pragma pop -/* 80CCE174-80CCE17C 000000 0008+00 1/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80CCE174 = ""; -SECTION_DEAD static char const* const stringBase_80CCE175 = "Sekizo"; -#pragma pop +/* 80CCE174-80CCE174 000000 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_sekizoa/d_a_obj_sekizoa.cpp b/rel/d/a/obj/d_a_obj_sekizoa/d_a_obj_sekizoa.cpp index d808921cb50..5ffb390ce0e 100644 --- a/rel/d/a/obj/d_a_obj_sekizoa/d_a_obj_sekizoa.cpp +++ b/rel/d/a/obj/d_a_obj_sekizoa/d_a_obj_sekizoa.cpp @@ -40,10 +40,10 @@ struct mDoExt_invisibleModel { /* 8000E7C0 */ void entryDL(cXyz*); }; -struct J3DAnmTevRegKey {}; - struct J3DAnmTextureSRTKey {}; +struct J3DAnmTevRegKey {}; + struct J3DMaterialTable { /* 8032F7B4 */ void removeTexMtxAnimator(J3DAnmTextureSRTKey*); /* 8032F880 */ void removeTevRegAnimator(J3DAnmTevRegKey*); @@ -57,20 +57,20 @@ struct mDoExt_brkAnm { /* 8000D7A8 */ void entry(J3DMaterialTable*, f32); }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; +struct J3DAnmTransform {}; + +struct J3DModelData {}; + struct Z2Creature { /* 802C03C8 */ Z2Creature(); /* 802C0420 */ ~Z2Creature(); /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -92,6 +92,8 @@ struct daTag_EvtArea_c { /* 8048C94C */ void chkPointInArea(cXyz, cXyz); }; +struct daNpcT_faceMotionAnmData_c {}; + struct daNpcT_MotionSeqMngr_c { struct sequenceStepData_c {}; @@ -100,12 +102,10 @@ struct daNpcT_MotionSeqMngr_c { /* 80CD52AC */ ~daNpcT_MotionSeqMngr_c(); }; -struct daNpcT_motionAnmData_c {}; - -struct daNpcT_faceMotionAnmData_c {}; - struct daNpcT_evtData_c {}; +struct daNpcT_motionAnmData_c {}; + struct daObj_Sekizoa_c { /* 80CCE34C */ ~daObj_Sekizoa_c(); /* 80CCE570 */ void create(); @@ -558,7 +558,7 @@ extern "C" void changeAnm__8daNpcT_cFPiPi(); extern "C" void changeBck__8daNpcT_cFPiPi(); extern "C" void changeBtp__8daNpcT_cFPiPi(); extern "C" void changeBtk__8daNpcT_cFPiPi(); -extern "C" void func_80CD5884(int*); +extern "C" void func_80CD5884(void* _this, int*); extern "C" void __sinit_d_a_obj_sekizoa_cpp(); extern "C" void __ct__15daObj_Sekizoa_cFPC26daNpcT_faceMotionAnmData_cPC22daNpcT_motionAnmData_cPCQ222daNpcT_MotionSeqMngr_c18sequenceStepData_ciPCQ222daNpcT_MotionSeqMngr_c18sequenceStepData_ciPC16daNpcT_evtData_cPPc(); @@ -789,6 +789,23 @@ extern "C" void __register_global_object(); // /* ############################################################################################## */ +/* 80CD5E64-80CD5E64 000168 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80CD5E64 = ""; +SECTION_DEAD static char const* const stringBase_80CD5E65 = "NO_RESPONSE"; +SECTION_DEAD static char const* const stringBase_80CD5E71 = "START"; +SECTION_DEAD static char const* const stringBase_80CD5E77 = "RESTART"; +SECTION_DEAD static char const* const stringBase_80CD5E7F = "TURN"; +SECTION_DEAD static char const* const stringBase_80CD5E84 = "JUMP"; +SECTION_DEAD static char const* const stringBase_80CD5E89 = "GOAL"; +SECTION_DEAD static char const* const stringBase_80CD5E8E = "EXIT"; +SECTION_DEAD static char const* const stringBase_80CD5E93 = "FREE"; +SECTION_DEAD static char const* const stringBase_80CD5E98 = "EXTINCTION"; +SECTION_DEAD static char const* const stringBase_80CD5EA3 = "sekizoA"; +SECTION_DEAD static char const* const stringBase_80CD5EAB = "seki_1k"; +#pragma pop + /* 80CD5ED8-80CD5EE4 000000 000C+00 3/3 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -1379,7 +1396,7 @@ SECTION_RODATA u8 const daObj_Sekizoa_Param_c::m[156] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x44, 0x16, 0x00, 0x00, 0x41, 0xF0, 0x00, 0x00, 0x3B, 0x83, 0x12, 0x6F, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CD5CFC, &daObj_Sekizoa_Param_c::m); +COMPILER_STRIP_GATE(0x80CD5CFC, &daObj_Sekizoa_Param_c::m); /* 80CD5D98-80CD5DB8 00009C 0020+00 0/1 0/0 0/0 .rodata heapSize$4093 */ #pragma push @@ -1388,14 +1405,14 @@ SECTION_RODATA static u8 const heapSize[32] = { 0x00, 0x00, 0x23, 0x90, 0x00, 0x00, 0x23, 0x80, 0x00, 0x00, 0x23, 0x90, 0x00, 0x00, 0x23, 0x80, 0x00, 0x00, 0x23, 0x50, 0x00, 0x00, 0x23, 0x40, 0x00, 0x00, 0x33, 0xE0, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CD5D98, &heapSize); +COMPILER_STRIP_GATE(0x80CD5D98, &heapSize); #pragma pop /* 80CD5DB8-80CD5DBC 0000BC 0004+00 0/1 0/0 0/0 .rodata @4170 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4170 = -1000000000.0f; -COMPILER_STRIP_GATE(80CD5DB8, &lit_4170); +COMPILER_STRIP_GATE(0x80CD5DB8, &lit_4170); #pragma pop /* 80CCE570-80CCE8B0 000310 0340+00 1/1 0/0 0/0 .text create__15daObj_Sekizoa_cFv */ @@ -1416,25 +1433,25 @@ SECTION_RODATA static u8 const lit_4350[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CD5DBC, &lit_4350); +COMPILER_STRIP_GATE(0x80CD5DBC, &lit_4350); /* 80CD5DC0-80CD5DC4 0000C4 0004+00 0/2 0/0 0/0 .rodata @4351 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4351 = 65536.0f; -COMPILER_STRIP_GATE(80CD5DC0, &lit_4351); +COMPILER_STRIP_GATE(0x80CD5DC0, &lit_4351); #pragma pop /* 80CD5DC4-80CD5DC8 0000C8 0004+00 0/3 0/0 0/0 .rodata @4352 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4352 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(80CD5DC4, &lit_4352); +COMPILER_STRIP_GATE(0x80CD5DC4, &lit_4352); #pragma pop /* 80CD5DC8-80CD5DCC 0000CC 0004+00 2/10 0/0 0/0 .rodata @4533 */ SECTION_RODATA static f32 const lit_4533 = 1.0f; -COMPILER_STRIP_GATE(80CD5DC8, &lit_4533); +COMPILER_STRIP_GATE(0x80CD5DC8, &lit_4533); /* 80CCE8B0-80CCEC54 000650 03A4+00 1/1 0/0 0/0 .text CreateHeap__15daObj_Sekizoa_cFv */ #pragma push @@ -1501,7 +1518,7 @@ asm void daObj_Sekizoa_c::srchSekizoa(void* param_0, void* param_1) { /* ############################################################################################## */ /* 80CD5DCC-80CD5DD0 0000D0 0004+00 1/1 0/0 0/0 .rodata @4636 */ SECTION_RODATA static f32 const lit_4636 = 1000000000.0f; -COMPILER_STRIP_GATE(80CD5DCC, &lit_4636); +COMPILER_STRIP_GATE(0x80CD5DCC, &lit_4636); /* 80CCEE30-80CCEFA4 000BD0 0174+00 1/1 0/0 0/0 .text getSekizoaP__15daObj_Sekizoa_cFi */ #pragma push @@ -1711,6 +1728,14 @@ asm void daObj_Sekizoa_c::evtTalk() { } #pragma pop +/* ############################################################################################## */ +/* 80CD5E64-80CD5E64 000168 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80CD5EB3 = "Sekizoa"; +SECTION_DEAD static char const* const stringBase_80CD5EBB = "Sekizob"; +#pragma pop + /* 80CCFAA8-80CCFBA0 001848 00F8+00 1/0 0/0 0/0 .text evtCutProc__15daObj_Sekizoa_cFv */ #pragma push #pragma optimization_level 0 @@ -1746,7 +1771,7 @@ asm void daObj_Sekizoa_c::beforeMove() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5079 = 30.0f; -COMPILER_STRIP_GATE(80CD5DD0, &lit_5079); +COMPILER_STRIP_GATE(0x80CD5DD0, &lit_5079); #pragma pop /* 80CD5DD4-80CD5DDC 0000D8 0004+04 0/1 0/0 0/0 .rodata @5080 */ @@ -1757,14 +1782,14 @@ SECTION_RODATA static u32 const lit_5080[1 + 1 /* padding */] = { /* padding */ 0x00000000, }; -COMPILER_STRIP_GATE(80CD5DD4, &lit_5080); +COMPILER_STRIP_GATE(0x80CD5DD4, &lit_5080); #pragma pop /* 80CD5DDC-80CD5DE4 0000E0 0008+00 1/4 0/0 0/0 .rodata @5082 */ SECTION_RODATA static u8 const lit_5082[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CD5DDC, &lit_5082); +COMPILER_STRIP_GATE(0x80CD5DDC, &lit_5082); /* 80CCFD80-80CD009C 001B20 031C+00 1/0 0/0 0/0 .text setAttnPos__15daObj_Sekizoa_cFv */ #pragma push @@ -1783,7 +1808,7 @@ asm void daObj_Sekizoa_c::setAttnPos() { SECTION_RODATA static u8 const lit_5140[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CD5DE4, &lit_5140); +COMPILER_STRIP_GATE(0x80CD5DE4, &lit_5140); #pragma pop /* 80CD5DEC-80CD5DF4 0000F0 0008+00 0/1 0/0 0/0 .rodata @5141 */ @@ -1792,7 +1817,7 @@ COMPILER_STRIP_GATE(80CD5DE4, &lit_5140); SECTION_RODATA static u8 const lit_5141[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CD5DEC, &lit_5141); +COMPILER_STRIP_GATE(0x80CD5DEC, &lit_5141); #pragma pop /* 80CD5DF4-80CD5DFC 0000F8 0008+00 0/1 0/0 0/0 .rodata @5142 */ @@ -1801,49 +1826,49 @@ COMPILER_STRIP_GATE(80CD5DEC, &lit_5141); SECTION_RODATA static u8 const lit_5142[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CD5DF4, &lit_5142); +COMPILER_STRIP_GATE(0x80CD5DF4, &lit_5142); #pragma pop /* 80CD5DFC-80CD5E00 000100 0004+00 0/1 0/0 0/0 .rodata @5233 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5233 = -160.0f; -COMPILER_STRIP_GATE(80CD5DFC, &lit_5233); +COMPILER_STRIP_GATE(0x80CD5DFC, &lit_5233); #pragma pop /* 80CD5E00-80CD5E04 000104 0004+00 0/1 0/0 0/0 .rodata @5234 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5234 = 120.0f; -COMPILER_STRIP_GATE(80CD5E00, &lit_5234); +COMPILER_STRIP_GATE(0x80CD5E00, &lit_5234); #pragma pop /* 80CD5E04-80CD5E08 000108 0004+00 0/1 0/0 0/0 .rodata @5235 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5235 = 160.0f; -COMPILER_STRIP_GATE(80CD5E04, &lit_5235); +COMPILER_STRIP_GATE(0x80CD5E04, &lit_5235); #pragma pop /* 80CD5E08-80CD5E0C 00010C 0004+00 0/2 0/0 0/0 .rodata @5236 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5236 = 10.0f; -COMPILER_STRIP_GATE(80CD5E08, &lit_5236); +COMPILER_STRIP_GATE(0x80CD5E08, &lit_5236); #pragma pop /* 80CD5E0C-80CD5E10 000110 0004+00 0/1 0/0 0/0 .rodata @5237 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5237 = -40.0f; -COMPILER_STRIP_GATE(80CD5E0C, &lit_5237); +COMPILER_STRIP_GATE(0x80CD5E0C, &lit_5237); #pragma pop /* 80CD5E10-80CD5E14 000114 0004+00 0/1 0/0 0/0 .rodata @5238 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5238 = 140.0f; -COMPILER_STRIP_GATE(80CD5E10, &lit_5238); +COMPILER_STRIP_GATE(0x80CD5E10, &lit_5238); #pragma pop /* 80CD009C-80CD03C0 001E3C 0324+00 1/0 0/0 0/0 .text setCollision__15daObj_Sekizoa_cFv @@ -1876,7 +1901,7 @@ asm void daObj_Sekizoa_c::drawOtherMdl() { /* ############################################################################################## */ /* 80CD5E14-80CD5E18 000118 0004+00 2/8 0/0 0/0 .rodata @5307 */ SECTION_RODATA static f32 const lit_5307 = -1.0f; -COMPILER_STRIP_GATE(80CD5E14, &lit_5307); +COMPILER_STRIP_GATE(0x80CD5E14, &lit_5307); /* 80CD04FC-80CD05D0 00229C 00D4+00 1/1 0/0 0/0 .text setYariAnm__15daObj_Sekizoa_cFiif */ @@ -1925,7 +1950,7 @@ asm void daObj_Sekizoa_c::selectAction() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daObj_Sekizoa_c::chkAction(int (daObj_Sekizoa_c::*)(void*)) { +asm void daObj_Sekizoa_c::chkAction(int (daObj_Sekizoa_c::*param_0)(void*)) { nofralloc #include "asm/rel/d/a/obj/d_a_obj_sekizoa/d_a_obj_sekizoa/chkAction__15daObj_Sekizoa_cFM15daObj_Sekizoa_cFPCvPvPv_i.s" } @@ -1936,7 +1961,7 @@ asm void daObj_Sekizoa_c::chkAction(int (daObj_Sekizoa_c::*)(void*)) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daObj_Sekizoa_c::setAction(int (daObj_Sekizoa_c::*)(void*)) { +asm void daObj_Sekizoa_c::setAction(int (daObj_Sekizoa_c::*param_0)(void*)) { nofralloc #include "asm/rel/d/a/obj/d_a_obj_sekizoa/d_a_obj_sekizoa/setAction__15daObj_Sekizoa_cFM15daObj_Sekizoa_cFPCvPvPv_i.s" } @@ -1947,56 +1972,56 @@ asm void daObj_Sekizoa_c::setAction(int (daObj_Sekizoa_c::*)(void*)) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5481 = 18.0f; -COMPILER_STRIP_GATE(80CD5E18, &lit_5481); +COMPILER_STRIP_GATE(0x80CD5E18, &lit_5481); #pragma pop /* 80CD5E1C-80CD5E20 000120 0004+00 0/0 0/0 0/0 .rodata @5482 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5482 = 36.0f; -COMPILER_STRIP_GATE(80CD5E1C, &lit_5482); +COMPILER_STRIP_GATE(0x80CD5E1C, &lit_5482); #pragma pop /* 80CD5E20-80CD5E24 000124 0004+00 0/0 0/0 0/0 .rodata @5483 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5483 = 29.0f; -COMPILER_STRIP_GATE(80CD5E20, &lit_5483); +COMPILER_STRIP_GATE(0x80CD5E20, &lit_5483); #pragma pop /* 80CD5E24-80CD5E28 000128 0004+00 0/1 0/0 0/0 .rodata @5571 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5571 = 33.0f / 100.0f; -COMPILER_STRIP_GATE(80CD5E24, &lit_5571); +COMPILER_STRIP_GATE(0x80CD5E24, &lit_5571); #pragma pop /* 80CD5E28-80CD5E2C 00012C 0004+00 0/2 0/0 0/0 .rodata @5572 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5572 = 0.5f; -COMPILER_STRIP_GATE(80CD5E28, &lit_5572); +COMPILER_STRIP_GATE(0x80CD5E28, &lit_5572); #pragma pop /* 80CD5E2C-80CD5E30 000130 0004+00 0/2 0/0 0/0 .rodata @5573 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5573 = 300.0f; -COMPILER_STRIP_GATE(80CD5E2C, &lit_5573); +COMPILER_STRIP_GATE(0x80CD5E2C, &lit_5573); #pragma pop /* 80CD5E30-80CD5E34 000134 0004+00 0/2 0/0 0/0 .rodata @5574 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5574 = -300.0f; -COMPILER_STRIP_GATE(80CD5E30, &lit_5574); +COMPILER_STRIP_GATE(0x80CD5E30, &lit_5574); #pragma pop /* 80CD5E34-80CD5E38 000138 0004+00 0/1 0/0 0/0 .rodata @5575 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5575 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(80CD5E34, &lit_5575); +COMPILER_STRIP_GATE(0x80CD5E34, &lit_5575); #pragma pop /* 80CD0BDC-80CD0DE8 00297C 020C+00 1/1 0/0 0/0 .text checkMoveDirection__15daObj_Sekizoa_cFv */ @@ -2065,7 +2090,7 @@ asm void daObj_Sekizoa_c::getStepMotionNo() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5817 = 0.25f; -COMPILER_STRIP_GATE(80CD5E38, &lit_5817); +COMPILER_STRIP_GATE(0x80CD5E38, &lit_5817); #pragma pop /* 80CD0F14-80CD14D8 002CB4 05C4+00 2/2 0/0 0/0 .text jump__15daObj_Sekizoa_cFv */ @@ -2083,7 +2108,7 @@ asm void daObj_Sekizoa_c::jump() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5871 = 100.0f; -COMPILER_STRIP_GATE(80CD5E3C, &lit_5871); +COMPILER_STRIP_GATE(0x80CD5E3C, &lit_5871); #pragma pop /* 80CD14D8-80CD1688 003278 01B0+00 2/2 0/0 0/0 .text landing__15daObj_Sekizoa_cFv */ @@ -2103,21 +2128,30 @@ asm void daObj_Sekizoa_c::landing() { SECTION_RODATA static u8 const lit_5963[8] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, }; -COMPILER_STRIP_GATE(80CD5E40, &lit_5963); +COMPILER_STRIP_GATE(0x80CD5E40, &lit_5963); #pragma pop /* 80CD5E48-80CD5E4C 00014C 0004+00 0/2 0/0 0/0 .rodata @6330 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6330 = 1000.0f; -COMPILER_STRIP_GATE(80CD5E48, &lit_6330); +COMPILER_STRIP_GATE(0x80CD5E48, &lit_6330); #pragma pop /* 80CD5E4C-80CD5E50 000150 0004+00 0/1 0/0 0/0 .rodata @6331 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6331 = 500.0f; -COMPILER_STRIP_GATE(80CD5E4C, &lit_6331); +COMPILER_STRIP_GATE(0x80CD5E4C, &lit_6331); +#pragma pop + +/* 80CD5E64-80CD5E64 000168 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80CD5EC3 = "prm"; +SECTION_DEAD static char const* const stringBase_80CD5EC7 = "timer"; +SECTION_DEAD static char const* const stringBase_80CD5ECD = "msgNo"; +SECTION_DEAD static char const* const stringBase_80CD5ED3 = "@"; #pragma pop /* 80CD1688-80CD2708 003428 1080+00 2/0 0/0 0/0 .text cutStart__15daObj_Sekizoa_cFi */ @@ -2185,14 +2219,14 @@ asm void daObj_Sekizoa_c::cutFree(int param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_6332 = 1.0f / 20.0f; -COMPILER_STRIP_GATE(80CD5E50, &lit_6332); +COMPILER_STRIP_GATE(0x80CD5E50, &lit_6332); #pragma pop /* 80CD5E54-80CD5E58 000158 0004+00 0/1 0/0 0/0 .rodata @7036 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7036 = 78.0f; -COMPILER_STRIP_GATE(80CD5E54, &lit_7036); +COMPILER_STRIP_GATE(0x80CD5E54, &lit_7036); #pragma pop /* 80CD3BD8-80CD3F08 005978 0330+00 1/0 0/0 0/0 .text cutExtinction__15daObj_Sekizoa_cFi @@ -2602,7 +2636,7 @@ void daNpcT_c::changeBtk(int* param_0, int* param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80CD5884(int* param_0) { +extern "C" asm void func_80CD5884(void* _this, int* param_0) { nofralloc #include "asm/rel/d/a/obj/d_a_obj_sekizoa/d_a_obj_sekizoa/func_80CD5884.s" } @@ -2613,21 +2647,21 @@ extern "C" asm void func_80CD5884(int* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7372 = -600.0f; -COMPILER_STRIP_GATE(80CD5E58, &lit_7372); +COMPILER_STRIP_GATE(0x80CD5E58, &lit_7372); #pragma pop /* 80CD5E5C-80CD5E60 000160 0004+00 0/1 0/0 0/0 .rodata @7373 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7373 = 1800.0f; -COMPILER_STRIP_GATE(80CD5E5C, &lit_7373); +COMPILER_STRIP_GATE(0x80CD5E5C, &lit_7373); #pragma pop /* 80CD5E60-80CD5E64 000164 0004+00 0/1 0/0 0/0 .rodata @7374 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_7374 = 600.0f; -COMPILER_STRIP_GATE(80CD5E60, &lit_7374); +COMPILER_STRIP_GATE(0x80CD5E60, &lit_7374); #pragma pop /* 80CD68CC-80CD68D8 0009F4 000C+00 2/2 0/0 0/0 .data __vt__21daObj_Sekizoa_Param_c */ @@ -2661,7 +2695,7 @@ asm void __sinit_d_a_obj_sekizoa_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80CD58A0 = (void*)__sinit_d_a_obj_sekizoa_cpp; +REGISTER_CTORS(0x80CD58A0, __sinit_d_a_obj_sekizoa_cpp); #pragma pop /* 80CD5A40-80CD5B74 0077E0 0134+00 1/1 0/0 0/0 .text @@ -2914,26 +2948,4 @@ static u8 data_80CD69BC[4]; static u8 data_80CD69C0[4]; #pragma pop -/* 80CD5E64-80CD5ED5 000168 0071+00 11/8 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80CD5E64 = ""; -SECTION_DEAD static char const* const stringBase_80CD5E65 = "NO_RESPONSE"; -SECTION_DEAD static char const* const stringBase_80CD5E71 = "START"; -SECTION_DEAD static char const* const stringBase_80CD5E77 = "RESTART"; -SECTION_DEAD static char const* const stringBase_80CD5E7F = "TURN"; -SECTION_DEAD static char const* const stringBase_80CD5E84 = "JUMP"; -SECTION_DEAD static char const* const stringBase_80CD5E89 = "GOAL"; -SECTION_DEAD static char const* const stringBase_80CD5E8E = "EXIT"; -SECTION_DEAD static char const* const stringBase_80CD5E93 = "FREE"; -SECTION_DEAD static char const* const stringBase_80CD5E98 = "EXTINCTION"; -SECTION_DEAD static char const* const stringBase_80CD5EA3 = "sekizoA"; -SECTION_DEAD static char const* const stringBase_80CD5EAB = "seki_1k"; -SECTION_DEAD static char const* const stringBase_80CD5EB3 = "Sekizoa"; -SECTION_DEAD static char const* const stringBase_80CD5EBB = "Sekizob"; -SECTION_DEAD static char const* const stringBase_80CD5EC3 = "prm"; -SECTION_DEAD static char const* const stringBase_80CD5EC7 = "timer"; -SECTION_DEAD static char const* const stringBase_80CD5ECD = "msgNo"; -SECTION_DEAD static char const* const stringBase_80CD5ED3 = "@"; -#pragma pop +/* 80CD5E64-80CD5E64 000168 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_shield/d_a_obj_shield.cpp b/rel/d/a/obj/d_a_obj_shield/d_a_obj_shield.cpp index 0faec8b21ed..05fbc8f4533 100644 --- a/rel/d/a/obj/d_a_obj_shield/d_a_obj_shield.cpp +++ b/rel/d/a/obj/d_a_obj_shield/d_a_obj_shield.cpp @@ -94,7 +94,6 @@ struct dItem_data { struct dEvt_control_c { /* 80042468 */ void reset(); - /* 800436EC */ void setPtI_Id(unsigned int); }; struct dEvent_manager_c { @@ -141,10 +140,10 @@ struct dBgS_AcchCir { /* 80CD750C */ ~dBgS_AcchCir(); }; -struct dBgS {}; - struct csXyz {}; +struct dBgS {}; + struct dBgS_Acch { /* 80075F94 */ ~dBgS_Acch(); /* 800760A0 */ dBgS_Acch(); @@ -189,10 +188,10 @@ struct cBgS { /* 80074744 */ void GetTriPla(cBgS_PolyInfo const&, cM3dGPla*) const; }; -struct Vec {}; - struct JAISoundID {}; +struct Vec {}; + struct Z2SeMgr { /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); }; @@ -242,7 +241,7 @@ extern "C" static void daItemShield_Execute__FP14daItemShield_c(); extern "C" static void daItemShield_Delete__FP14daItemShield_c(); extern "C" static void daItemShield_Create__FP10fopAc_ac_c(); extern "C" void __dt__10cCcD_GSttsFv(); -extern "C" void func_80CD8240(u8*); +extern "C" void func_80CD8240(void* _this, u8*); extern "C" static void func_80CD825C(); extern "C" static void func_80CD8264(); extern "C" extern char const* const d_a_obj_shield__stringBase0; @@ -356,7 +355,7 @@ SECTION_RODATA static u8 const l_cyl_src[68] = { 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41, 0xA0, 0x00, 0x00, 0x42, 0x20, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CD8274, &l_cyl_src); +COMPILER_STRIP_GATE(0x80CD8274, &l_cyl_src); /* 80CD82B8-80CD82BC 000044 0004+00 0/4 0/0 0/0 .rodata @3856 */ #pragma push @@ -367,7 +366,7 @@ SECTION_RODATA static u8 const lit_3856[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CD82B8, &lit_3856); +COMPILER_STRIP_GATE(0x80CD82B8, &lit_3856); #pragma pop /* 80CD82BC-80CD82C4 000048 0008+00 0/2 0/0 0/0 .rodata @3857 */ @@ -376,7 +375,7 @@ COMPILER_STRIP_GATE(80CD82B8, &lit_3856); SECTION_RODATA static u8 const lit_3857[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CD82BC, &lit_3857); +COMPILER_STRIP_GATE(0x80CD82BC, &lit_3857); #pragma pop /* 80CD82C4-80CD82CC 000050 0008+00 0/2 0/0 0/0 .rodata @3858 */ @@ -385,7 +384,7 @@ COMPILER_STRIP_GATE(80CD82BC, &lit_3857); SECTION_RODATA static u8 const lit_3858[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CD82C4, &lit_3858); +COMPILER_STRIP_GATE(0x80CD82C4, &lit_3858); #pragma pop /* 80CD82CC-80CD82D4 000058 0008+00 0/2 0/0 0/0 .rodata @3859 */ @@ -394,7 +393,7 @@ COMPILER_STRIP_GATE(80CD82C4, &lit_3858); SECTION_RODATA static u8 const lit_3859[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CD82CC, &lit_3859); +COMPILER_STRIP_GATE(0x80CD82CC, &lit_3859); #pragma pop /* 80CD833C-80CD8348 000000 000C+00 2/2 0/0 0/0 .data cNullVec__6Z2Calc */ @@ -653,7 +652,7 @@ SECTION_RODATA static f32 const lit_3953[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80CD82D4, &lit_3953); +COMPILER_STRIP_GATE(0x80CD82D4, &lit_3953); #pragma pop /* 80CD82DC-80CD82E4 000068 0008+00 0/1 0/0 0/0 .rodata @3954 */ @@ -662,35 +661,35 @@ COMPILER_STRIP_GATE(80CD82D4, &lit_3953); SECTION_RODATA static u8 const lit_3954[8] = { 0x40, 0x69, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CD82DC, &lit_3954); +COMPILER_STRIP_GATE(0x80CD82DC, &lit_3954); #pragma pop /* 80CD82E4-80CD82E8 000070 0004+00 0/1 0/0 0/0 .rodata @3955 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3955 = -20.0f; -COMPILER_STRIP_GATE(80CD82E4, &lit_3955); +COMPILER_STRIP_GATE(0x80CD82E4, &lit_3955); #pragma pop /* 80CD82E8-80CD82EC 000074 0004+00 0/1 0/0 0/0 .rodata @3956 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3956 = -15.0f; -COMPILER_STRIP_GATE(80CD82E8, &lit_3956); +COMPILER_STRIP_GATE(0x80CD82E8, &lit_3956); #pragma pop /* 80CD82EC-80CD82F0 000078 0004+00 0/1 0/0 0/0 .rodata @3957 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3957 = 20.0f; -COMPILER_STRIP_GATE(80CD82EC, &lit_3957); +COMPILER_STRIP_GATE(0x80CD82EC, &lit_3957); #pragma pop /* 80CD82F0-80CD82F4 00007C 0004+00 0/1 0/0 0/0 .rodata @3958 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3958 = 15.0f; -COMPILER_STRIP_GATE(80CD82F0, &lit_3958); +COMPILER_STRIP_GATE(0x80CD82F0, &lit_3958); #pragma pop /* 80CD82F4-80CD82FC 000080 0008+00 0/1 0/0 0/0 .rodata @3960 */ @@ -699,7 +698,7 @@ COMPILER_STRIP_GATE(80CD82F0, &lit_3958); SECTION_RODATA static u8 const lit_3960[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CD82F4, &lit_3960); +COMPILER_STRIP_GATE(0x80CD82F4, &lit_3960); #pragma pop /* 80CD6DD8-80CD7094 0003F8 02BC+00 2/2 0/0 0/0 .text setBaseMtx__14daItemShield_cFv */ @@ -717,14 +716,14 @@ asm void daItemShield_c::setBaseMtx() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4003 = 30.0f; -COMPILER_STRIP_GATE(80CD82FC, &lit_4003); +COMPILER_STRIP_GATE(0x80CD82FC, &lit_4003); #pragma pop /* 80CD8300-80CD8304 00008C 0004+00 0/2 0/0 0/0 .rodata @4004 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4004 = -4.0f; -COMPILER_STRIP_GATE(80CD8300, &lit_4004); +COMPILER_STRIP_GATE(0x80CD8300, &lit_4004); #pragma pop /* 80CD8304-80CD830C 000090 0008+00 0/1 0/0 0/0 .rodata @4006 */ @@ -733,7 +732,7 @@ COMPILER_STRIP_GATE(80CD8300, &lit_4004); SECTION_RODATA static u8 const lit_4006[8] = { 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CD8304, &lit_4006); +COMPILER_STRIP_GATE(0x80CD8304, &lit_4006); #pragma pop /* 80CD7094-80CD724C 0006B4 01B8+00 1/1 0/0 0/0 .text Create__14daItemShield_cFv */ @@ -816,35 +815,35 @@ asm dBgS_ObjAcch::~dBgS_ObjAcch() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4180 = 5.0f; -COMPILER_STRIP_GATE(80CD830C, &lit_4180); +COMPILER_STRIP_GATE(0x80CD830C, &lit_4180); #pragma pop /* 80CD8310-80CD8314 00009C 0004+00 0/2 0/0 0/0 .rodata @4181 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4181 = 1.0f; -COMPILER_STRIP_GATE(80CD8310, &lit_4181); +COMPILER_STRIP_GATE(0x80CD8310, &lit_4181); #pragma pop /* 80CD8314-80CD8318 0000A0 0004+00 0/1 0/0 0/0 .rodata @4182 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4182 = 7.0f / 10.0f; -COMPILER_STRIP_GATE(80CD8314, &lit_4182); +COMPILER_STRIP_GATE(0x80CD8314, &lit_4182); #pragma pop /* 80CD8318-80CD831C 0000A4 0004+00 0/1 0/0 0/0 .rodata @4183 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4183 = 3.0f; -COMPILER_STRIP_GATE(80CD8318, &lit_4183); +COMPILER_STRIP_GATE(0x80CD8318, &lit_4183); #pragma pop /* 80CD831C-80CD8320 0000A8 0004+00 0/2 0/0 0/0 .rodata @4184 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4184 = -1.0f; -COMPILER_STRIP_GATE(80CD831C, &lit_4184); +COMPILER_STRIP_GATE(0x80CD831C, &lit_4184); #pragma pop /* 80CD75EC-80CD7734 000C0C 0148+00 1/1 0/0 0/0 .text bg_check__14daItemShield_cFv */ @@ -891,20 +890,20 @@ asm void daItemShield_c::actionWaitInit() { /* ############################################################################################## */ /* 80CD8320-80CD8324 0000AC 0004+00 1/2 0/0 0/0 .rodata @4335 */ SECTION_RODATA static f32 const lit_4335 = 500.0f; -COMPILER_STRIP_GATE(80CD8320, &lit_4335); +COMPILER_STRIP_GATE(0x80CD8320, &lit_4335); /* 80CD8324-80CD8328 0000B0 0004+00 0/1 0/0 0/0 .rodata @4336 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4336 = -25.0f; -COMPILER_STRIP_GATE(80CD8324, &lit_4336); +COMPILER_STRIP_GATE(0x80CD8324, &lit_4336); #pragma pop /* 80CD8328-80CD832C 0000B4 0004+00 0/1 0/0 0/0 .rodata @4337 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4337 = 9.0f / 10.0f; -COMPILER_STRIP_GATE(80CD8328, &lit_4337); +COMPILER_STRIP_GATE(0x80CD8328, &lit_4337); #pragma pop /* 80CD7890-80CD7C68 000EB0 03D8+00 1/0 0/0 0/0 .text actionWait__14daItemShield_cFv */ @@ -938,6 +937,13 @@ asm void daItemShield_c::actionOrderGetDemo() { } #pragma pop +/* ############################################################################################## */ +/* 80CD832C-80CD832C 0000B8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80CD832C = "DEFAULT_GETITEM"; +#pragma pop + /* 80CD7D80-80CD7E00 0013A0 0080+00 1/0 0/0 0/0 .text actionGetDemo__14daItemShield_cFv */ #pragma push @@ -1081,7 +1087,7 @@ asm cCcD_GStts::~cCcD_GStts() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80CD8240(u8* param_0) { +extern "C" asm void func_80CD8240(void* _this, u8* param_0) { nofralloc #include "asm/rel/d/a/obj/d_a_obj_shield/d_a_obj_shield/func_80CD8240.s" } @@ -1107,9 +1113,4 @@ static asm void func_80CD8264() { } #pragma pop -/* 80CD832C-80CD833C 0000B8 0010+00 1/1 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80CD832C = "DEFAULT_GETITEM"; -#pragma pop +/* 80CD832C-80CD832C 0000B8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_sm_door/d_a_obj_sm_door.cpp b/rel/d/a/obj/d_a_obj_sm_door/d_a_obj_sm_door.cpp index 5730e4ca3d4..04f0a729cf0 100644 --- a/rel/d/a/obj/d_a_obj_sm_door/d_a_obj_sm_door.cpp +++ b/rel/d/a/obj/d_a_obj_sm_door/d_a_obj_sm_door.cpp @@ -120,10 +120,10 @@ struct cBgS { /* 80074250 */ void Release(dBgW_Base*); }; -struct Vec {}; - struct JAISoundID {}; +struct Vec {}; + struct Z2SeMgr { /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); }; @@ -257,7 +257,7 @@ SECTION_RODATA static u8 const lit_3697[4 + 4 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CD9590, &lit_3697); +COMPILER_STRIP_GATE(0x80CD9590, &lit_3697); /* 80CD9598-80CD95A0 000008 0008+00 0/2 0/0 0/0 .rodata @3698 */ #pragma push @@ -265,7 +265,7 @@ COMPILER_STRIP_GATE(80CD9590, &lit_3697); SECTION_RODATA static u8 const lit_3698[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CD9598, &lit_3698); +COMPILER_STRIP_GATE(0x80CD9598, &lit_3698); #pragma pop /* 80CD95A0-80CD95A8 000010 0008+00 0/2 0/0 0/0 .rodata @3699 */ @@ -274,7 +274,7 @@ COMPILER_STRIP_GATE(80CD9598, &lit_3698); SECTION_RODATA static u8 const lit_3699[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CD95A0, &lit_3699); +COMPILER_STRIP_GATE(0x80CD95A0, &lit_3699); #pragma pop /* 80CD95A8-80CD95B0 000018 0008+00 0/2 0/0 0/0 .rodata @3700 */ @@ -283,14 +283,14 @@ COMPILER_STRIP_GATE(80CD95A0, &lit_3699); SECTION_RODATA static u8 const lit_3700[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CD95A8, &lit_3700); +COMPILER_STRIP_GATE(0x80CD95A8, &lit_3700); #pragma pop /* 80CD95B0-80CD95B4 000020 0004+00 0/1 0/0 0/0 .rodata @3701 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3701 = 800.0f; -COMPILER_STRIP_GATE(80CD95B0, &lit_3701); +COMPILER_STRIP_GATE(0x80CD95B0, &lit_3701); #pragma pop /* 80CD85FC-80CD8784 0000BC 0188+00 1/1 0/0 0/0 .text s_obj_sub__FPvPv */ @@ -318,35 +318,35 @@ asm void daObjSM_DOOR_c::ChangeModel() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3753 = 1000.0f; -COMPILER_STRIP_GATE(80CD95B4, &lit_3753); +COMPILER_STRIP_GATE(0x80CD95B4, &lit_3753); #pragma pop /* 80CD95B8-80CD95BC 000028 0004+00 0/1 0/0 0/0 .rodata @3829 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3829 = 600.0f; -COMPILER_STRIP_GATE(80CD95B8, &lit_3829); +COMPILER_STRIP_GATE(0x80CD95B8, &lit_3829); #pragma pop /* 80CD95BC-80CD95C0 00002C 0004+00 0/1 0/0 0/0 .rodata @3830 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3830 = 1.0f; -COMPILER_STRIP_GATE(80CD95BC, &lit_3830); +COMPILER_STRIP_GATE(0x80CD95BC, &lit_3830); #pragma pop /* 80CD95C0-80CD95C4 000030 0004+00 0/1 0/0 0/0 .rodata @3831 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3831 = -1.0f; -COMPILER_STRIP_GATE(80CD95C0, &lit_3831); +COMPILER_STRIP_GATE(0x80CD95C0, &lit_3831); #pragma pop /* 80CD95C4-80CD95C8 000034 0004+00 0/1 0/0 0/0 .rodata @3832 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3832 = 3.0f; -COMPILER_STRIP_GATE(80CD95C4, &lit_3832); +COMPILER_STRIP_GATE(0x80CD95C4, &lit_3832); #pragma pop /* 80CD95C8-80CD95D0 000038 0008+00 0/1 0/0 0/0 .rodata @3834 */ @@ -355,7 +355,7 @@ COMPILER_STRIP_GATE(80CD95C4, &lit_3832); SECTION_RODATA static u8 const lit_3834[8] = { 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CD95C8, &lit_3834); +COMPILER_STRIP_GATE(0x80CD95C8, &lit_3834); #pragma pop /* 80CD8790-80CD8A40 000250 02B0+00 1/1 0/0 0/0 .text Action__14daObjSM_DOOR_cFv */ @@ -443,35 +443,44 @@ static asm void daObjSM_DOOR_Execute(daObjSM_DOOR_c* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4060 = -9.0f; -COMPILER_STRIP_GATE(80CD95D0, &lit_4060); +COMPILER_STRIP_GATE(0x80CD95D0, &lit_4060); #pragma pop /* 80CD95D4-80CD95D8 000044 0004+00 0/1 0/0 0/0 .rodata @4061 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4061 = 100.0f; -COMPILER_STRIP_GATE(80CD95D4, &lit_4061); +COMPILER_STRIP_GATE(0x80CD95D4, &lit_4061); #pragma pop /* 80CD95D8-80CD95DC 000048 0004+00 0/2 0/0 0/0 .rodata @4062 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4062 = -1000.0f; -COMPILER_STRIP_GATE(80CD95D8, &lit_4062); +COMPILER_STRIP_GATE(0x80CD95D8, &lit_4062); #pragma pop /* 80CD95DC-80CD95E0 00004C 0004+00 0/2 0/0 0/0 .rodata @4063 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4063 = -500.0f; -COMPILER_STRIP_GATE(80CD95DC, &lit_4063); +COMPILER_STRIP_GATE(0x80CD95DC, &lit_4063); #pragma pop /* 80CD95E0-80CD95E4 000050 0004+00 0/2 0/0 0/0 .rodata @4064 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4064 = 500.0f; -COMPILER_STRIP_GATE(80CD95E0, &lit_4064); +COMPILER_STRIP_GATE(0x80CD95E0, &lit_4064); +#pragma pop + +/* 80CD95E4-80CD95E4 000054 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80CD95E4 = "sm_door"; +SECTION_DEAD static char const* const stringBase_80CD95EC = "A_SM_DoorA.dzb"; +SECTION_DEAD static char const* const stringBase_80CD95FB = "A_SM_DoorBl.dzb"; +SECTION_DEAD static char const* const stringBase_80CD960B = "A_SM_DoorWo.dzb"; #pragma pop /* 80CD968C-80CD9690 -00001 0004+00 3/3 0/0 0/0 .data l_arcName */ @@ -551,6 +560,18 @@ static bool daObjSM_DOOR_IsDelete(daObjSM_DOOR_c* param_0) { return true; } +/* ############################################################################################## */ +/* 80CD95E4-80CD95E4 000054 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80CD961B = "A_SM_DoorA.bmd"; +SECTION_DEAD static char const* const stringBase_80CD962A = "A_SM_DoorA_Alpha.bmd"; +SECTION_DEAD static char const* const stringBase_80CD963F = "A_SM_DoorBl.bmd"; +SECTION_DEAD static char const* const stringBase_80CD964F = "A_SM_DoorBl_Alpha.bmd"; +SECTION_DEAD static char const* const stringBase_80CD9665 = "A_SM_DoorWo.bmd"; +SECTION_DEAD static char const* const stringBase_80CD9675 = "A_SM_DoorWo_Alpha.bmd"; +#pragma pop + /* 80CD90A4-80CD9258 000B64 01B4+00 1/0 0/0 0/0 .text CreateHeap__14daObjSM_DOOR_cFv */ #pragma push #pragma optimization_level 0 @@ -622,18 +643,4 @@ static asm void func_80CD9580() { } #pragma pop -/* 80CD95E4-80CD968B 000054 00A7+00 3/2 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80CD95E4 = "sm_door"; -SECTION_DEAD static char const* const stringBase_80CD95EC = "A_SM_DoorA.dzb"; -SECTION_DEAD static char const* const stringBase_80CD95FB = "A_SM_DoorBl.dzb"; -SECTION_DEAD static char const* const stringBase_80CD960B = "A_SM_DoorWo.dzb"; -SECTION_DEAD static char const* const stringBase_80CD961B = "A_SM_DoorA.bmd"; -SECTION_DEAD static char const* const stringBase_80CD962A = "A_SM_DoorA_Alpha.bmd"; -SECTION_DEAD static char const* const stringBase_80CD963F = "A_SM_DoorBl.bmd"; -SECTION_DEAD static char const* const stringBase_80CD964F = "A_SM_DoorBl_Alpha.bmd"; -SECTION_DEAD static char const* const stringBase_80CD9665 = "A_SM_DoorWo.bmd"; -SECTION_DEAD static char const* const stringBase_80CD9675 = "A_SM_DoorWo_Alpha.bmd"; -#pragma pop +/* 80CD95E4-80CD95E4 000054 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_smallkey/d_a_obj_smallkey.cpp b/rel/d/a/obj/d_a_obj_smallkey/d_a_obj_smallkey.cpp index 21bff357a17..d36502eedc5 100644 --- a/rel/d/a/obj/d_a_obj_smallkey/d_a_obj_smallkey.cpp +++ b/rel/d/a/obj/d_a_obj_smallkey/d_a_obj_smallkey.cpp @@ -128,7 +128,6 @@ struct dItem_data { struct dEvt_control_c { /* 80042468 */ void reset(); - /* 800436EC */ void setPtI_Id(unsigned int); }; struct dEvent_manager_c { @@ -292,7 +291,7 @@ extern "C" void execute__18JPAEmitterCallBackFP14JPABaseEmitter(); extern "C" void executeAfter__18JPAEmitterCallBackFP14JPABaseEmitter(); extern "C" void draw__18JPAEmitterCallBackFP14JPABaseEmitter(); extern "C" void drawAfter__18JPAEmitterCallBackFP14JPABaseEmitter(); -extern "C" void func_80CDB7C0(u8*); +extern "C" void func_80CDB7C0(void* _this, u8*); extern "C" static void func_80CDB7DC(); extern "C" static void func_80CDB7E4(); extern "C" extern char const* const d_a_obj_smallkey__stringBase0; @@ -416,7 +415,7 @@ SECTION_RODATA static u8 const l_cyl_src[68] = { 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41, 0xA0, 0x00, 0x00, 0x42, 0x20, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CDB7F4, &l_cyl_src); +COMPILER_STRIP_GATE(0x80CDB7F4, &l_cyl_src); /* 80CDB838-80CDB83C 000044 0004+00 2/7 0/0 0/0 .rodata @3875 */ SECTION_RODATA static u8 const lit_3875[4] = { @@ -425,7 +424,7 @@ SECTION_RODATA static u8 const lit_3875[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CDB838, &lit_3875); +COMPILER_STRIP_GATE(0x80CDB838, &lit_3875); /* 80CDB83C-80CDB844 000048 0008+00 0/3 0/0 0/0 .rodata @3876 */ #pragma push @@ -433,7 +432,7 @@ COMPILER_STRIP_GATE(80CDB838, &lit_3875); SECTION_RODATA static u8 const lit_3876[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CDB83C, &lit_3876); +COMPILER_STRIP_GATE(0x80CDB83C, &lit_3876); #pragma pop /* 80CDB844-80CDB84C 000050 0008+00 0/3 0/0 0/0 .rodata @3877 */ @@ -442,7 +441,7 @@ COMPILER_STRIP_GATE(80CDB83C, &lit_3876); SECTION_RODATA static u8 const lit_3877[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CDB844, &lit_3877); +COMPILER_STRIP_GATE(0x80CDB844, &lit_3877); #pragma pop /* 80CDB84C-80CDB854 000058 0008+00 0/3 0/0 0/0 .rodata @3878 */ @@ -451,25 +450,25 @@ COMPILER_STRIP_GATE(80CDB844, &lit_3877); SECTION_RODATA static u8 const lit_3878[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CDB84C, &lit_3878); +COMPILER_STRIP_GATE(0x80CDB84C, &lit_3878); #pragma pop /* 80CDB854-80CDB858 000060 0004+00 2/6 0/0 0/0 .rodata @3879 */ SECTION_RODATA static f32 const lit_3879 = 1.0f; -COMPILER_STRIP_GATE(80CDB854, &lit_3879); +COMPILER_STRIP_GATE(0x80CDB854, &lit_3879); /* 80CDB858-80CDB85C 000064 0004+00 0/1 0/0 0/0 .rodata @3880 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3880 = 50.0f; -COMPILER_STRIP_GATE(80CDB858, &lit_3880); +COMPILER_STRIP_GATE(0x80CDB858, &lit_3880); #pragma pop /* 80CDB85C-80CDB860 000068 0004+00 0/1 0/0 0/0 .rodata @3881 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3881 = 10.0f; -COMPILER_STRIP_GATE(80CDB85C, &lit_3881); +COMPILER_STRIP_GATE(0x80CDB85C, &lit_3881); #pragma pop /* 80CD97B8-80CD9B40 000078 0388+00 1/1 0/0 0/0 .text searchParentSub__FPvPv */ @@ -763,7 +762,7 @@ asm void daKey_c::initBaseMtx() { /* ############################################################################################## */ /* 80CDB860-80CDB864 00006C 0004+00 1/2 0/0 0/0 .rodata @4031 */ SECTION_RODATA static f32 const lit_4031 = 5.0f; -COMPILER_STRIP_GATE(80CDB860, &lit_4031); +COMPILER_STRIP_GATE(0x80CDB860, &lit_4031); /* 80CD9F68-80CD9FDC 000828 0074+00 2/2 0/0 0/0 .text setBaseMtx__7daKey_cFv */ #pragma push @@ -780,21 +779,21 @@ asm void daKey_c::setBaseMtx() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4064 = 30.0f; -COMPILER_STRIP_GATE(80CDB864, &lit_4064); +COMPILER_STRIP_GATE(0x80CDB864, &lit_4064); #pragma pop /* 80CDB868-80CDB86C 000074 0004+00 0/1 0/0 0/0 .rodata @4065 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4065 = -6.0f; -COMPILER_STRIP_GATE(80CDB868, &lit_4065); +COMPILER_STRIP_GATE(0x80CDB868, &lit_4065); #pragma pop /* 80CDB86C-80CDB874 000078 0008+00 1/2 0/0 0/0 .rodata @4067 */ SECTION_RODATA static u8 const lit_4067[8] = { 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CDB86C, &lit_4067); +COMPILER_STRIP_GATE(0x80CDB86C, &lit_4067); /* 80CD9FDC-80CDA15C 00089C 0180+00 1/1 0/0 0/0 .text Create__7daKey_cFv */ #pragma push @@ -811,6 +810,13 @@ bool daKey_c::__CreateHeap() { return true; } +/* ############################################################################################## */ +/* 80CDB890-80CDB890 00009C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80CDB890 = "F_SP118"; +#pragma pop + /* 80CDA164-80CDA404 000A24 02A0+00 1/1 0/0 0/0 .text create__7daKey_cFv */ #pragma push #pragma optimization_level 0 @@ -902,26 +908,26 @@ asm dBgS_ObjAcch::~dBgS_ObjAcch() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4279 = 7.0f / 10.0f; -COMPILER_STRIP_GATE(80CDB874, &lit_4279); +COMPILER_STRIP_GATE(0x80CDB874, &lit_4279); #pragma pop /* 80CDB878-80CDB87C 000084 0004+00 0/2 0/0 0/0 .rodata @4280 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4280 = 3.0f; -COMPILER_STRIP_GATE(80CDB878, &lit_4280); +COMPILER_STRIP_GATE(0x80CDB878, &lit_4280); #pragma pop /* 80CDB87C-80CDB880 000088 0004+00 0/1 0/0 0/0 .rodata @4281 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4281 = 2.0f; -COMPILER_STRIP_GATE(80CDB87C, &lit_4281); +COMPILER_STRIP_GATE(0x80CDB87C, &lit_4281); #pragma pop /* 80CDB880-80CDB884 00008C 0004+00 1/2 0/0 0/0 .rodata @4282 */ SECTION_RODATA static f32 const lit_4282 = -1.0f; -COMPILER_STRIP_GATE(80CDB880, &lit_4282); +COMPILER_STRIP_GATE(0x80CDB880, &lit_4282); /* 80CDA680-80CDA7E8 000F40 0168+00 1/1 0/0 0/0 .text bg_check__7daKey_cFv */ #pragma push @@ -988,7 +994,7 @@ asm void daKey_c::actionWaitInit() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4400 = 9.0f / 10.0f; -COMPILER_STRIP_GATE(80CDB884, &lit_4400); +COMPILER_STRIP_GATE(0x80CDB884, &lit_4400); #pragma pop /* 80CDAA28-80CDAB74 0012E8 014C+00 1/0 0/0 0/0 .text actionWait__7daKey_cFv */ @@ -1022,6 +1028,13 @@ asm void daKey_c::actionOrderGetDemo() { } #pragma pop +/* ############################################################################################## */ +/* 80CDB890-80CDB890 00009C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80CDB898 = "DEFAULT_GETITEM"; +#pragma pop + /* 80CDAC94-80CDAD28 001554 0094+00 1/0 0/0 0/0 .text actionGetDemo__7daKey_cFv */ #pragma push #pragma optimization_level 0 @@ -1055,7 +1068,7 @@ asm void daKey_c::actionSwOnWait() { /* ############################################################################################## */ /* 80CDB888-80CDB88C 000094 0004+00 1/1 0/0 0/0 .rodata @4503 */ SECTION_RODATA static f32 const lit_4503 = 4.0f; -COMPILER_STRIP_GATE(80CDB888, &lit_4503); +COMPILER_STRIP_GATE(0x80CDB888, &lit_4503); /* 80CDAE54-80CDAF40 001714 00EC+00 1/1 0/0 0/0 .text actionInitBoomerangCarry__7daKey_cFv */ #pragma push @@ -1102,7 +1115,7 @@ asm void daKey_c::effectStop() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4618 = 1000.0f; -COMPILER_STRIP_GATE(80CDB88C, &lit_4618); +COMPILER_STRIP_GATE(0x80CDB88C, &lit_4618); #pragma pop /* 80CDB128-80CDB2E0 0019E8 01B8+00 1/1 0/0 0/0 .text effectCtrl__7daKey_cFv */ @@ -1264,7 +1277,7 @@ void JPAEmitterCallBack::drawAfter(JPABaseEmitter* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80CDB7C0(u8* param_0) { +extern "C" asm void func_80CDB7C0(void* _this, u8* param_0) { nofralloc #include "asm/rel/d/a/obj/d_a_obj_smallkey/d_a_obj_smallkey/func_80CDB7C0.s" } @@ -1290,10 +1303,4 @@ static asm void func_80CDB7E4() { } #pragma pop -/* 80CDB890-80CDB8A8 00009C 0018+00 2/2 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80CDB890 = "F_SP118"; -SECTION_DEAD static char const* const stringBase_80CDB898 = "DEFAULT_GETITEM"; -#pragma pop +/* 80CDB890-80CDB890 00009C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_smgdoor/d_a_obj_smgdoor.cpp b/rel/d/a/obj/d_a_obj_smgdoor/d_a_obj_smgdoor.cpp index f8c32f83166..b77fe06fa22 100644 --- a/rel/d/a/obj/d_a_obj_smgdoor/d_a_obj_smgdoor.cpp +++ b/rel/d/a/obj/d_a_obj_smgdoor/d_a_obj_smgdoor.cpp @@ -162,7 +162,7 @@ extern "C" static void daObjSmgDoor_create1st__FP14daObjSmgDoor_c(); extern "C" static void daObjSmgDoor_MoveBGDelete__FP14daObjSmgDoor_c(); extern "C" static void daObjSmgDoor_MoveBGExecute__FP14daObjSmgDoor_c(); extern "C" static void daObjSmgDoor_MoveBGDraw__FP14daObjSmgDoor_c(); -extern "C" void func_80CDCBD0(u8*); +extern "C" void func_80CDCBD0(void* _this, u8*); extern "C" extern char const* const d_a_obj_smgdoor__stringBase0; // @@ -254,7 +254,7 @@ asm void daObjSmgDoor_c::initBaseMtx() { /* ############################################################################################## */ /* 80CDCBF4-80CDCBF8 000000 0004+00 3/3 0/0 0/0 .rodata @3705 */ SECTION_RODATA static f32 const lit_3705 = -145.0f; -COMPILER_STRIP_GATE(80CDCBF4, &lit_3705); +COMPILER_STRIP_GATE(0x80CDCBF4, &lit_3705); /* 80CDCBF8-80CDCBFC 000004 0004+00 1/4 0/0 0/0 .rodata @3706 */ SECTION_RODATA static u8 const lit_3706[4] = { @@ -263,13 +263,13 @@ SECTION_RODATA static u8 const lit_3706[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CDCBF8, &lit_3706); +COMPILER_STRIP_GATE(0x80CDCBF8, &lit_3706); /* 80CDCBFC-80CDCC00 000008 0004+00 0/1 0/0 0/0 .rodata @3707 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3707 = 145.0f; -COMPILER_STRIP_GATE(80CDCBFC, &lit_3707); +COMPILER_STRIP_GATE(0x80CDCBFC, &lit_3707); #pragma pop /* 80CDBBEC-80CDBD38 00012C 014C+00 2/2 0/0 0/0 .text setBaseMtx__14daObjSmgDoor_cFv */ @@ -285,7 +285,20 @@ asm void daObjSmgDoor_c::setBaseMtx() { /* ############################################################################################## */ /* 80CDCC00-80CDCC04 00000C 0004+00 1/1 0/0 0/0 .rodata @3722 */ SECTION_RODATA static f32 const lit_3722 = 150.0f; -COMPILER_STRIP_GATE(80CDCC00, &lit_3722); +COMPILER_STRIP_GATE(0x80CDCC00, &lit_3722); + +/* 80CDCC24-80CDCC24 000030 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80CDCC24 = "A_SMGDoor"; +SECTION_DEAD static char const* const stringBase_80CDCC2E = "A_SMKDoor"; +SECTION_DEAD static char const* const stringBase_80CDCC38 = "A_SMGDoor.bmd"; +SECTION_DEAD static char const* const stringBase_80CDCC46 = "A_SMKDoor.bmd"; +SECTION_DEAD static char const* const stringBase_80CDCC54 = "A_SMGDoor.dzb"; +SECTION_DEAD static char const* const stringBase_80CDCC62 = "A_SMKDoor.dzb"; +SECTION_DEAD static char const* const stringBase_80CDCC70 = "NOW_DOOR_IN"; +SECTION_DEAD static char const* const stringBase_80CDCC7C = "OLD_DOOR_IN"; +#pragma pop /* 80CDCCC4-80CDCCD0 000000 000C+00 2/2 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { @@ -383,6 +396,17 @@ asm void daObjSmgDoor_c::Execute(f32 (**param_0)[3][4]) { #pragma pop /* ############################################################################################## */ +/* 80CDCC24-80CDCC24 000030 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80CDCC88 = "WAIT"; +SECTION_DEAD static char const* const stringBase_80CDCC8D = "OPEN"; +SECTION_DEAD static char const* const stringBase_80CDCC92 = "SETGOAL"; +SECTION_DEAD static char const* const stringBase_80CDCC9A = "SETPOS"; +SECTION_DEAD static char const* const stringBase_80CDCCA1 = "SCENE_CHG"; +SECTION_DEAD static char const* const stringBase_80CDCCAB = "COLOR_CHG"; +#pragma pop + /* 80CDCD1C-80CDCD34 -00001 0018+00 1/1 0/0 0/0 .data action_table$3763 */ SECTION_DATA static void* action_table[6] = { (void*)(((char*)&d_a_obj_smgdoor__stringBase0) + 0x64), @@ -407,11 +431,18 @@ asm void daObjSmgDoor_c::getDemoAction() { /* ############################################################################################## */ /* 80CDCC04-80CDCC08 000010 0004+00 3/3 0/0 0/0 .rodata @3825 */ SECTION_RODATA static f32 const lit_3825 = 1.0f; -COMPILER_STRIP_GATE(80CDCC04, &lit_3825); +COMPILER_STRIP_GATE(0x80CDCC04, &lit_3825); /* 80CDCC08-80CDCC0C 000014 0004+00 3/3 0/0 0/0 .rodata @3826 */ SECTION_RODATA static f32 const lit_3826 = -1.0f; -COMPILER_STRIP_GATE(80CDCC08, &lit_3826); +COMPILER_STRIP_GATE(0x80CDCC08, &lit_3826); + +/* 80CDCC24-80CDCC24 000030 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80CDCCB5 = "smgdoor"; +SECTION_DEAD static char const* const stringBase_80CDCCBD = "Timer"; +#pragma pop /* 80CDC038-80CDC248 000578 0210+00 1/1 0/0 0/0 .text demoProc__14daObjSmgDoor_cFv */ #pragma push @@ -446,7 +477,7 @@ asm void daObjSmgDoor_c::openProc() { /* ############################################################################################## */ /* 80CDCC0C-80CDCC10 000018 0004+00 1/1 0/0 0/0 .rodata @3888 */ SECTION_RODATA static f32 const lit_3888 = 60.0f; -COMPILER_STRIP_GATE(80CDCC0C, &lit_3888); +COMPILER_STRIP_GATE(0x80CDCC0C, &lit_3888); /* 80CDC4AC-80CDC548 0009EC 009C+00 1/1 0/0 0/0 .text setGoal__14daObjSmgDoor_cFv */ #pragma push @@ -463,14 +494,14 @@ asm void daObjSmgDoor_c::setGoal() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3906 = 300.0f; -COMPILER_STRIP_GATE(80CDCC10, &lit_3906); +COMPILER_STRIP_GATE(0x80CDCC10, &lit_3906); #pragma pop /* 80CDCC14-80CDCC18 000020 0004+00 0/1 0/0 0/0 .rodata @3907 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3907 = 250.0f; -COMPILER_STRIP_GATE(80CDCC14, &lit_3907); +COMPILER_STRIP_GATE(0x80CDCC14, &lit_3907); #pragma pop /* 80CDC548-80CDC610 000A88 00C8+00 1/1 0/0 0/0 .text setPos__14daObjSmgDoor_cFv */ @@ -576,21 +607,21 @@ void daObjSmgDoor_c::actionDead() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4054 = 62500.0f; -COMPILER_STRIP_GATE(80CDCC18, &lit_4054); +COMPILER_STRIP_GATE(0x80CDCC18, &lit_4054); #pragma pop /* 80CDCC1C-80CDCC20 000028 0004+00 0/1 0/0 0/0 .rodata @4055 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4055 = 90000.0f; -COMPILER_STRIP_GATE(80CDCC1C, &lit_4055); +COMPILER_STRIP_GATE(0x80CDCC1C, &lit_4055); #pragma pop /* 80CDCC20-80CDCC24 00002C 0004+00 0/1 0/0 0/0 .rodata @4056 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4056 = 12100.0f; -COMPILER_STRIP_GATE(80CDCC20, &lit_4056); +COMPILER_STRIP_GATE(0x80CDCC20, &lit_4056); #pragma pop /* 80CDC7F8-80CDC974 000D38 017C+00 1/1 0/0 0/0 .text checkArea__14daObjSmgDoor_cFv */ @@ -718,30 +749,10 @@ static asm void daObjSmgDoor_MoveBGDraw(daObjSmgDoor_c* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80CDCBD0(u8* param_0) { +extern "C" asm void func_80CDCBD0(void* _this, u8* param_0) { nofralloc #include "asm/rel/d/a/obj/d_a_obj_smgdoor/d_a_obj_smgdoor/func_80CDCBD0.s" } #pragma pop -/* 80CDCC24-80CDCCC3 000030 009F+00 6/1 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80CDCC24 = "A_SMGDoor"; -SECTION_DEAD static char const* const stringBase_80CDCC2E = "A_SMKDoor"; -SECTION_DEAD static char const* const stringBase_80CDCC38 = "A_SMGDoor.bmd"; -SECTION_DEAD static char const* const stringBase_80CDCC46 = "A_SMKDoor.bmd"; -SECTION_DEAD static char const* const stringBase_80CDCC54 = "A_SMGDoor.dzb"; -SECTION_DEAD static char const* const stringBase_80CDCC62 = "A_SMKDoor.dzb"; -SECTION_DEAD static char const* const stringBase_80CDCC70 = "NOW_DOOR_IN"; -SECTION_DEAD static char const* const stringBase_80CDCC7C = "OLD_DOOR_IN"; -SECTION_DEAD static char const* const stringBase_80CDCC88 = "WAIT"; -SECTION_DEAD static char const* const stringBase_80CDCC8D = "OPEN"; -SECTION_DEAD static char const* const stringBase_80CDCC92 = "SETGOAL"; -SECTION_DEAD static char const* const stringBase_80CDCC9A = "SETPOS"; -SECTION_DEAD static char const* const stringBase_80CDCCA1 = "SCENE_CHG"; -SECTION_DEAD static char const* const stringBase_80CDCCAB = "COLOR_CHG"; -SECTION_DEAD static char const* const stringBase_80CDCCB5 = "smgdoor"; -SECTION_DEAD static char const* const stringBase_80CDCCBD = "Timer"; -#pragma pop +/* 80CDCC24-80CDCC24 000030 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_smoke/d_a_obj_smoke.cpp b/rel/d/a/obj/d_a_obj_smoke/d_a_obj_smoke.cpp index e0f22e77c09..3e05a66f103 100644 --- a/rel/d/a/obj/d_a_obj_smoke/d_a_obj_smoke.cpp +++ b/rel/d/a/obj/d_a_obj_smoke/d_a_obj_smoke.cpp @@ -34,13 +34,13 @@ struct dSv_info_c { struct dPa_levelEcallBack {}; -struct cXyz {}; - struct dKy_tevstr_c {}; +struct csXyz {}; + struct _GXColor {}; -struct csXyz {}; +struct cXyz {}; struct dPa_control_c { /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, @@ -105,7 +105,7 @@ asm void daObjSmoke_c::setBaseMtx() { /* ############################################################################################## */ /* 80CDD160-80CDD164 000000 0004+00 2/2 0/0 0/0 .rodata @3655 */ SECTION_RODATA static f32 const lit_3655 = 1.0f; -COMPILER_STRIP_GATE(80CDD160, &lit_3655); +COMPILER_STRIP_GATE(0x80CDD160, &lit_3655); /* 80CDCEF0-80CDCF9C 0000F0 00AC+00 1/1 0/0 0/0 .text Create__12daObjSmoke_cFv */ #pragma push diff --git a/rel/d/a/obj/d_a_obj_smtile/d_a_obj_smtile.cpp b/rel/d/a/obj/d_a_obj_smtile/d_a_obj_smtile.cpp index 90e06f83adb..76b7d4ab4aa 100644 --- a/rel/d/a/obj/d_a_obj_smtile/d_a_obj_smtile.cpp +++ b/rel/d/a/obj/d_a_obj_smtile/d_a_obj_smtile.cpp @@ -147,7 +147,7 @@ extern "C" static void daObj_SMTile_Delete__FPv(); extern "C" static void daObj_SMTile_Execute__FPv(); extern "C" static void daObj_SMTile_Draw__FPv(); extern "C" static bool daObj_SMTile_IsDelete__FPv(); -extern "C" void func_80CDE2A4(int*); +extern "C" void func_80CDE2A4(void* _this, int*); extern "C" void __sinit_d_a_obj_smtile_cpp(); extern "C" void __dt__20daObj_SMTile_Param_cFv(); extern "C" u8 const m__20daObj_SMTile_Param_c[8]; @@ -213,6 +213,13 @@ extern "C" void __register_global_object(); // /* ############################################################################################## */ +/* 80CDE388-80CDE388 00002C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80CDE388 = ""; +SECTION_DEAD static char const* const stringBase_80CDE389 = "A_SMTile"; +#pragma pop + /* 80CDE394-80CDE39C 000000 0008+00 3/3 0/0 0/0 .data l_bmdData */ SECTION_DATA static u8 l_bmdData[8] = { 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x01, @@ -320,7 +327,7 @@ asm J3DFrameCtrl::~J3DFrameCtrl() { SECTION_RODATA u8 const daObj_SMTile_Param_c::m[8] = { 0x44, 0x16, 0x00, 0x00, 0x41, 0xA0, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CDE35C, &daObj_SMTile_Param_c::m); +COMPILER_STRIP_GATE(0x80CDE35C, &daObj_SMTile_Param_c::m); /* 80CDE364-80CDE368 000008 0004+00 1/4 0/0 0/0 .rodata @3892 */ SECTION_RODATA static u8 const lit_3892[4] = { @@ -329,7 +336,7 @@ SECTION_RODATA static u8 const lit_3892[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CDE364, &lit_3892); +COMPILER_STRIP_GATE(0x80CDE364, &lit_3892); /* 80CDD5CC-80CDD6E8 00040C 011C+00 1/1 0/0 0/0 .text CreateHeap__14daObj_SMTile_cFv */ #pragma push @@ -356,21 +363,21 @@ asm void daObj_SMTile_c::Delete() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3978 = 1.0f; -COMPILER_STRIP_GATE(80CDE368, &lit_3978); +COMPILER_STRIP_GATE(0x80CDE368, &lit_3978); #pragma pop /* 80CDE36C-80CDE370 000010 0004+00 0/3 0/0 0/0 .rodata @3979 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3979 = -1.0f; -COMPILER_STRIP_GATE(80CDE36C, &lit_3979); +COMPILER_STRIP_GATE(0x80CDE36C, &lit_3979); #pragma pop /* 80CDE370-80CDE374 000014 0004+00 0/1 0/0 0/0 .rodata @3980 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3980 = 40.0f; -COMPILER_STRIP_GATE(80CDE370, &lit_3980); +COMPILER_STRIP_GATE(0x80CDE370, &lit_3980); #pragma pop /* 80CDE374-80CDE37C 000018 0008+00 0/3 0/0 0/0 .rodata @3982 */ @@ -379,7 +386,7 @@ COMPILER_STRIP_GATE(80CDE370, &lit_3980); SECTION_RODATA static u8 const lit_3982[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CDE374, &lit_3982); +COMPILER_STRIP_GATE(0x80CDE374, &lit_3982); #pragma pop /* 80CDD71C-80CDDA98 00055C 037C+00 2/2 0/0 0/0 .text Execute__14daObj_SMTile_cFv */ @@ -440,14 +447,14 @@ asm void daObj_SMTile_c::setPrtcls(int param_0, int param_1) { SECTION_RODATA static u8 const id[8] = { 0xFF, 0xFF, 0x86, 0xEC, 0x86, 0xED, 0x86, 0xEE, }; -COMPILER_STRIP_GATE(80CDE37C, &id); +COMPILER_STRIP_GATE(0x80CDE37C, &id); #pragma pop /* 80CDE384-80CDE388 000028 0004+00 0/1 0/0 0/0 .rodata @4194 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4194 = 255.0f; -COMPILER_STRIP_GATE(80CDE384, &lit_4194); +COMPILER_STRIP_GATE(0x80CDE384, &lit_4194); #pragma pop /* 80CDDEFC-80CDE1A8 000D3C 02AC+00 1/1 0/0 0/0 .text touchPrtcls__14daObj_SMTile_cFf */ @@ -519,7 +526,7 @@ static bool daObj_SMTile_IsDelete(void* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80CDE2A4(int* param_0) { +extern "C" asm void func_80CDE2A4(void* _this, int* param_0) { nofralloc #include "asm/rel/d/a/obj/d_a_obj_smtile/d_a_obj_smtile/func_80CDE2A4.s" } @@ -551,7 +558,7 @@ asm void __sinit_d_a_obj_smtile_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80CDE2C0 = (void*)__sinit_d_a_obj_smtile_cpp; +REGISTER_CTORS(0x80CDE2C0, __sinit_d_a_obj_smtile_cpp); #pragma pop /* 80CDE300-80CDE348 001140 0048+00 2/1 0/0 0/0 .text __dt__20daObj_SMTile_Param_cFv */ @@ -564,10 +571,4 @@ asm daObj_SMTile_Param_c::~daObj_SMTile_Param_c() { } #pragma pop -/* 80CDE388-80CDE392 00002C 000A+00 1/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80CDE388 = ""; -SECTION_DEAD static char const* const stringBase_80CDE389 = "A_SMTile"; -#pragma pop +/* 80CDE388-80CDE388 00002C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_smw_stone/d_a_obj_smw_stone.cpp b/rel/d/a/obj/d_a_obj_smw_stone/d_a_obj_smw_stone.cpp index 3f77e6cddbe..b30d4818e30 100644 --- a/rel/d/a/obj/d_a_obj_smw_stone/d_a_obj_smw_stone.cpp +++ b/rel/d/a/obj/d_a_obj_smw_stone/d_a_obj_smw_stone.cpp @@ -81,12 +81,12 @@ struct dBgS_AcchCir { /* 80CDE868 */ ~dBgS_AcchCir(); }; +struct csXyz {}; + struct dBgS { /* 80074A08 */ void Regist(dBgW_Base*, fopAc_ac_c*); }; -struct csXyz {}; - struct dBgS_Acch { /* 80075F94 */ ~dBgS_Acch(); /* 800760A0 */ dBgS_Acch(); @@ -219,6 +219,12 @@ static asm void daSmWStone_c_createHeap(fopAc_ac_c* param_0) { #pragma pop /* ############################################################################################## */ +/* 80CDEF14-80CDEF14 000020 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80CDEF14 = "WStoneF"; +#pragma pop + /* 80CDEF1C-80CDEF20 -00001 0004+00 3/3 0/0 0/0 .data l_arcName */ SECTION_DATA static void* l_arcName = (void*)&d_a_obj_smw_stone__stringBase0; @@ -296,7 +302,7 @@ asm daSmWStone_c::~daSmWStone_c() { SECTION_RODATA static u8 const lit_3776[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CDEEF4, &lit_3776); +COMPILER_STRIP_GATE(0x80CDEEF4, &lit_3776); /* 80CDEF00-80CDEF04 00000C 0004+00 1/2 0/0 0/0 .rodata @4191 */ SECTION_RODATA static u8 const lit_4191[4] = { @@ -305,11 +311,11 @@ SECTION_RODATA static u8 const lit_4191[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CDEF00, &lit_4191); +COMPILER_STRIP_GATE(0x80CDEF00, &lit_4191); /* 80CDEF04-80CDEF08 000010 0004+00 1/1 0/0 0/0 .rodata @4192 */ SECTION_RODATA static f32 const lit_4192 = 10.0f; -COMPILER_STRIP_GATE(80CDEF04, &lit_4192); +COMPILER_STRIP_GATE(0x80CDEF04, &lit_4192); /* 80CDE614-80CDE7F8 000174 01E4+00 1/1 0/0 0/0 .text create__12daSmWStone_cFv */ #pragma push @@ -356,14 +362,14 @@ asm void daSmWStone_c::execute() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4238 = 500.0f; -COMPILER_STRIP_GATE(80CDEF08, &lit_4238); +COMPILER_STRIP_GATE(0x80CDEF08, &lit_4238); #pragma pop /* 80CDEF0C-80CDEF10 000018 0004+00 0/1 0/0 0/0 .rodata @4239 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4239 = 1.0f; -COMPILER_STRIP_GATE(80CDEF0C, &lit_4239); +COMPILER_STRIP_GATE(0x80CDEF0C, &lit_4239); #pragma pop /* 80CDE92C-80CDEA2C 00048C 0100+00 1/1 0/0 0/0 .text draw__12daSmWStone_cFv */ @@ -429,7 +435,7 @@ asm void daSmWStone_c::init() { /* ############################################################################################## */ /* 80CDEF10-80CDEF14 00001C 0004+00 1/1 0/0 0/0 .rodata @4350 */ SECTION_RODATA static f32 const lit_4350 = 40000.0f; -COMPILER_STRIP_GATE(80CDEF10, &lit_4350); +COMPILER_STRIP_GATE(0x80CDEF10, &lit_4350); /* 80CDED9C-80CDEE28 0008FC 008C+00 1/1 0/0 0/0 .text chkWlfInRange__12daSmWStone_cFv */ #pragma push @@ -504,9 +510,4 @@ static asm void func_80CDEEE4() { } #pragma pop -/* 80CDEF14-80CDEF1C 000020 0008+00 1/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80CDEF14 = "WStoneF"; -#pragma pop +/* 80CDEF14-80CDEF14 000020 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_snowEffTag/d_a_obj_snowEffTag.cpp b/rel/d/a/obj/d_a_obj_snowEffTag/d_a_obj_snowEffTag.cpp index 4b94a6cdef0..7cda08c2934 100644 --- a/rel/d/a/obj/d_a_obj_snowEffTag/d_a_obj_snowEffTag.cpp +++ b/rel/d/a/obj/d_a_obj_snowEffTag/d_a_obj_snowEffTag.cpp @@ -39,18 +39,18 @@ struct daSnowEffTag_HIO_c { struct dPa_levelEcallBack {}; +struct dKy_tevstr_c {}; + +struct csXyz {}; + +struct _GXColor {}; + struct Vec {}; struct cXyz { /* 80266B34 */ void operator-(Vec const&) const; }; -struct dKy_tevstr_c {}; - -struct _GXColor {}; - -struct csXyz {}; - struct dPa_control_c { struct level_c { /* 8004B918 */ void getEmitter(u32); @@ -203,27 +203,27 @@ asm void daSnowEffTag_c::setBaseMtx() { /* ############################################################################################## */ /* 80CDF720-80CDF724 000000 0004+00 2/2 0/0 0/0 .rodata @3702 */ SECTION_RODATA static f32 const lit_3702 = 100.0f; -COMPILER_STRIP_GATE(80CDF720, &lit_3702); +COMPILER_STRIP_GATE(0x80CDF720, &lit_3702); /* 80CDF724-80CDF728 000004 0004+00 0/1 0/0 0/0 .rodata @3703 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3703 = 0.5f; -COMPILER_STRIP_GATE(80CDF724, &lit_3703); +COMPILER_STRIP_GATE(0x80CDF724, &lit_3703); #pragma pop /* 80CDF728-80CDF72C 000008 0004+00 0/1 0/0 0/0 .rodata @3704 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3704 = 0.25f; -COMPILER_STRIP_GATE(80CDF728, &lit_3704); +COMPILER_STRIP_GATE(0x80CDF728, &lit_3704); #pragma pop /* 80CDF72C-80CDF730 00000C 0004+00 0/1 0/0 0/0 .rodata @3705 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3705 = 0.125f; -COMPILER_STRIP_GATE(80CDF72C, &lit_3705); +COMPILER_STRIP_GATE(0x80CDF72C, &lit_3705); #pragma pop /* 80CDF184-80CDF2B8 0001C4 0134+00 1/1 0/0 0/0 .text create__14daSnowEffTag_cFv */ @@ -251,7 +251,7 @@ SECTION_RODATA static u8 const lit_3765[4 + 4 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CDF730, &lit_3765); +COMPILER_STRIP_GATE(0x80CDF730, &lit_3765); #pragma pop /* 80CDF738-80CDF740 000018 0008+00 0/1 0/0 0/0 .rodata @3766 */ @@ -260,7 +260,7 @@ COMPILER_STRIP_GATE(80CDF730, &lit_3765); SECTION_RODATA static u8 const lit_3766[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CDF738, &lit_3766); +COMPILER_STRIP_GATE(0x80CDF738, &lit_3766); #pragma pop /* 80CDF740-80CDF748 000020 0008+00 0/1 0/0 0/0 .rodata @3767 */ @@ -269,7 +269,7 @@ COMPILER_STRIP_GATE(80CDF738, &lit_3766); SECTION_RODATA static u8 const lit_3767[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CDF740, &lit_3767); +COMPILER_STRIP_GATE(0x80CDF740, &lit_3767); #pragma pop /* 80CDF748-80CDF750 000028 0008+00 0/1 0/0 0/0 .rodata @3768 */ @@ -278,7 +278,7 @@ COMPILER_STRIP_GATE(80CDF740, &lit_3767); SECTION_RODATA static u8 const lit_3768[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CDF748, &lit_3768); +COMPILER_STRIP_GATE(0x80CDF748, &lit_3768); #pragma pop /* 80CDF2B8-80CDF498 0002F8 01E0+00 1/1 0/0 0/0 .text playerAreaCheck__14daSnowEffTag_cFv @@ -295,11 +295,11 @@ asm void daSnowEffTag_c::playerAreaCheck() { /* ############################################################################################## */ /* 80CDF750-80CDF754 000030 0004+00 1/1 0/0 0/0 .rodata @3806 */ SECTION_RODATA static f32 const lit_3806 = 1.0f; -COMPILER_STRIP_GATE(80CDF750, &lit_3806); +COMPILER_STRIP_GATE(0x80CDF750, &lit_3806); /* 80CDF754-80CDF758 000034 0004+00 1/1 0/0 0/0 .rodata @3807 */ SECTION_RODATA static f32 const lit_3807 = -1.0f; -COMPILER_STRIP_GATE(80CDF754, &lit_3807); +COMPILER_STRIP_GATE(0x80CDF754, &lit_3807); /* 80CDF498-80CDF5E4 0004D8 014C+00 1/1 0/0 0/0 .text Execute__14daSnowEffTag_cFv */ #pragma push @@ -391,5 +391,5 @@ asm void __sinit_d_a_obj_snowEffTag_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80CDF6D0 = (void*)__sinit_d_a_obj_snowEffTag_cpp; +REGISTER_CTORS(0x80CDF6D0, __sinit_d_a_obj_snowEffTag_cpp); #pragma pop diff --git a/rel/d/a/obj/d_a_obj_snow_soup/d_a_obj_snow_soup.cpp b/rel/d/a/obj/d_a_obj_snow_soup/d_a_obj_snow_soup.cpp index a597169ef5d..14e7ee2e40c 100644 --- a/rel/d/a/obj/d_a_obj_snow_soup/d_a_obj_snow_soup.cpp +++ b/rel/d/a/obj/d_a_obj_snow_soup/d_a_obj_snow_soup.cpp @@ -65,22 +65,22 @@ struct dRes_control_c { struct dPa_levelEcallBack {}; -struct _GXColor {}; - struct csXyz { /* 802673F4 */ csXyz(s16, s16, s16); }; +struct _GXColor {}; + struct dPa_control_c { /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, cXyz const*, f32); }; -struct Vec {}; - struct JAISoundID {}; +struct Vec {}; + struct Z2SeMgr { /* 802AC50C */ void seStartLevel(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); }; @@ -169,6 +169,12 @@ static asm void daObjSnowSoup_c_createHeap(fopAc_ac_c* param_0) { #pragma pop /* ############################################################################################## */ +/* 80CE0274-80CE0274 000038 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80CE0274 = "SnowSoup"; +#pragma pop + /* 80CE0280-80CE0284 -00001 0004+00 3/3 0/0 0/0 .data l_arcName */ SECTION_DATA static void* l_arcName = (void*)&d_a_obj_snow_soup__stringBase0; @@ -226,13 +232,13 @@ asm daObjSnowSoup_c::~daObjSnowSoup_c() { SECTION_RODATA static u8 const SOUP_MODEL_OFFSET[12] = { 0x45, 0x4F, 0x5D, 0xC3, 0x43, 0x56, 0xBA, 0xE1, 0x43, 0xA1, 0xA6, 0x66, }; -COMPILER_STRIP_GATE(80CE023C, &SOUP_MODEL_OFFSET); +COMPILER_STRIP_GATE(0x80CE023C, &SOUP_MODEL_OFFSET); /* 80CE0248-80CE0254 00000C 000C+00 1/1 0/0 0/0 .rodata BMD_IDX$3657 */ SECTION_RODATA static u8 const BMD_IDX[12] = { 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x05, }; -COMPILER_STRIP_GATE(80CE0248, &BMD_IDX); +COMPILER_STRIP_GATE(0x80CE0248, &BMD_IDX); /* 80CDF990-80CDFA3C 0001B0 00AC+00 1/1 0/0 0/0 .text createHeap__15daObjSnowSoup_cFv */ #pragma push @@ -252,7 +258,7 @@ SECTION_RODATA static u8 const lit_3706[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CE0254, &lit_3706); +COMPILER_STRIP_GATE(0x80CE0254, &lit_3706); /* 80CDFA3C-80CDFB70 00025C 0134+00 1/1 0/0 0/0 .text create__15daObjSnowSoup_cFv */ #pragma push @@ -287,11 +293,11 @@ asm void daObjSnowSoup_c::draw() { /* ############################################################################################## */ /* 80CE0258-80CE025C 00001C 0004+00 1/3 0/0 0/0 .rodata @3757 */ SECTION_RODATA static f32 const lit_3757 = 1.0f; -COMPILER_STRIP_GATE(80CE0258, &lit_3757); +COMPILER_STRIP_GATE(0x80CE0258, &lit_3757); /* 80CE025C-80CE0260 000020 0004+00 1/1 0/0 0/0 .rodata @3758 */ SECTION_RODATA static f32 const lit_3758 = -1.0f; -COMPILER_STRIP_GATE(80CE025C, &lit_3758); +COMPILER_STRIP_GATE(0x80CE025C, &lit_3758); /* 80CDFC40-80CDFE14 000460 01D4+00 1/1 0/0 0/0 .text execute__15daObjSnowSoup_cFv */ #pragma push @@ -330,7 +336,7 @@ asm void daObjSnowSoup_c::setModelMtx() { SECTION_RODATA static u8 const PARTICLE_NAME_3789[8] = { 0x87, 0xE1, 0x87, 0xE2, 0x87, 0xE3, 0x87, 0xE6, }; -COMPILER_STRIP_GATE(80CE0260, &PARTICLE_NAME_3789); +COMPILER_STRIP_GATE(0x80CE0260, &PARTICLE_NAME_3789); #pragma pop /* 80CDFF14-80CDFFF8 000734 00E4+00 1/1 0/0 0/0 .text createSmkEmtCommon__15daObjSnowSoup_cFv */ @@ -360,7 +366,7 @@ asm void daObjSnowSoup_c::deleteSmkEmtCommon() { SECTION_RODATA static u8 const PARTICLE_NAME_3834[12] = { 0x89, 0x84, 0x89, 0x85, 0x8A, 0x8B, 0x8A, 0x8D, 0x8A, 0x8C, 0x8A, 0x8E, }; -COMPILER_STRIP_GATE(80CE0268, &PARTICLE_NAME_3834); +COMPILER_STRIP_GATE(0x80CE0268, &PARTICLE_NAME_3834); #pragma pop /* 80CE003C-80CE0134 00085C 00F8+00 2/2 0/0 0/0 .text createSmkEmtChange__15daObjSnowSoup_cFi */ @@ -424,9 +430,4 @@ static asm void daObjSnowSoup_draw(daObjSnowSoup_c* param_0) { } #pragma pop -/* 80CE0274-80CE027D 000038 0009+00 1/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80CE0274 = "SnowSoup"; -#pragma pop +/* 80CE0274-80CE0274 000038 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_so/d_a_obj_so.cpp b/rel/d/a/obj/d_a_obj_so/d_a_obj_so.cpp index 8dce55124cf..df16b6df998 100644 --- a/rel/d/a/obj/d_a_obj_so/d_a_obj_so.cpp +++ b/rel/d/a/obj/d_a_obj_so/d_a_obj_so.cpp @@ -67,14 +67,14 @@ struct dRes_control_c { struct dPa_levelEcallBack {}; -struct _GXColor {}; - struct csXyz { /* 80CE3920 */ csXyz(); /* 802673F4 */ csXyz(s16, s16, s16); /* 80CE0F58 */ ~csXyz(); }; +struct _GXColor {}; + struct dPa_control_c { struct level_c { /* 8004B8B4 */ void forceOnEventMove(u32); @@ -387,7 +387,7 @@ extern "C" void __register_global_object(); /* ############################################################################################## */ /* 80CE39E8-80CE39EC 000000 0004+00 10/10 0/0 0/0 .rodata @3779 */ SECTION_RODATA static f32 const lit_3779 = 4.0f / 5.0f; -COMPILER_STRIP_GATE(80CE39E8, &lit_3779); +COMPILER_STRIP_GATE(0x80CE39E8, &lit_3779); /* 80CE3B70-80CE3B78 000000 0006+02 1/1 0/0 0/0 .data e_id$4326 */ SECTION_DATA static u8 e_id[6 + 2 /* padding */] = { @@ -535,35 +535,35 @@ SECTION_RODATA static u8 const lit_3898[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CE39EC, &lit_3898); +COMPILER_STRIP_GATE(0x80CE39EC, &lit_3898); #pragma pop /* 80CE39F0-80CE39F4 000008 0004+00 0/1 0/0 0/0 .rodata @3899 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3899 = 510.0f; -COMPILER_STRIP_GATE(80CE39F0, &lit_3899); +COMPILER_STRIP_GATE(0x80CE39F0, &lit_3899); #pragma pop /* 80CE39F4-80CE39F8 00000C 0004+00 0/3 0/0 0/0 .rodata @3900 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3900 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(80CE39F4, &lit_3900); +COMPILER_STRIP_GATE(0x80CE39F4, &lit_3900); #pragma pop /* 80CE39F8-80CE39FC 000010 0004+00 0/3 0/0 0/0 .rodata @3901 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3901 = 33.0f; -COMPILER_STRIP_GATE(80CE39F8, &lit_3901); +COMPILER_STRIP_GATE(0x80CE39F8, &lit_3901); #pragma pop /* 80CE39FC-80CE3A00 000014 0004+00 0/3 0/0 0/0 .rodata @3902 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3902 = 200.0f; -COMPILER_STRIP_GATE(80CE39FC, &lit_3902); +COMPILER_STRIP_GATE(0x80CE39FC, &lit_3902); #pragma pop /* 80CE0524-80CE0744 000244 0220+00 1/1 0/0 0/0 .text so_hasira__FP12obj_so_class */ @@ -581,147 +581,147 @@ static asm void so_hasira(obj_so_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4004 = 210.0f; -COMPILER_STRIP_GATE(80CE3A00, &lit_4004); +COMPILER_STRIP_GATE(0x80CE3A00, &lit_4004); #pragma pop /* 80CE3A04-80CE3A08 00001C 0004+00 0/5 0/0 0/0 .rodata @4005 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4005 = 1.0f; -COMPILER_STRIP_GATE(80CE3A04, &lit_4005); +COMPILER_STRIP_GATE(0x80CE3A04, &lit_4005); #pragma pop /* 80CE3A08-80CE3A0C 000020 0004+00 0/2 0/0 0/0 .rodata @4006 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4006 = 4000.0f; -COMPILER_STRIP_GATE(80CE3A08, &lit_4006); +COMPILER_STRIP_GATE(0x80CE3A08, &lit_4006); #pragma pop /* 80CE3A0C-80CE3A10 000024 0004+00 0/2 0/0 0/0 .rodata @4007 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4007 = 110.0f; -COMPILER_STRIP_GATE(80CE3A0C, &lit_4007); +COMPILER_STRIP_GATE(0x80CE3A0C, &lit_4007); #pragma pop /* 80CE3A10-80CE3A14 000028 0004+00 0/3 0/0 0/0 .rodata @4008 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4008 = 90.0f; -COMPILER_STRIP_GATE(80CE3A10, &lit_4008); +COMPILER_STRIP_GATE(0x80CE3A10, &lit_4008); #pragma pop /* 80CE3A14-80CE3A18 00002C 0004+00 0/3 0/0 0/0 .rodata @4009 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4009 = 2.0f; -COMPILER_STRIP_GATE(80CE3A14, &lit_4009); +COMPILER_STRIP_GATE(0x80CE3A14, &lit_4009); #pragma pop /* 80CE3A18-80CE3A1C 000030 0004+00 0/1 0/0 0/0 .rodata @4010 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4010 = 60.0f; -COMPILER_STRIP_GATE(80CE3A18, &lit_4010); +COMPILER_STRIP_GATE(0x80CE3A18, &lit_4010); #pragma pop /* 80CE3A1C-80CE3A20 000034 0004+00 0/1 0/0 0/0 .rodata @4011 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4011 = 205.0f; -COMPILER_STRIP_GATE(80CE3A1C, &lit_4011); +COMPILER_STRIP_GATE(0x80CE3A1C, &lit_4011); #pragma pop /* 80CE3A20-80CE3A24 000038 0004+00 0/1 0/0 0/0 .rodata @4012 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4012 = -5.0f; -COMPILER_STRIP_GATE(80CE3A20, &lit_4012); +COMPILER_STRIP_GATE(0x80CE3A20, &lit_4012); #pragma pop /* 80CE3A24-80CE3A28 00003C 0004+00 0/2 0/0 0/0 .rodata @4013 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4013 = 8.0f; -COMPILER_STRIP_GATE(80CE3A24, &lit_4013); +COMPILER_STRIP_GATE(0x80CE3A24, &lit_4013); #pragma pop /* 80CE3A28-80CE3A2C 000040 0004+00 0/1 0/0 0/0 .rodata @4014 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4014 = 95.0f; -COMPILER_STRIP_GATE(80CE3A28, &lit_4014); +COMPILER_STRIP_GATE(0x80CE3A28, &lit_4014); #pragma pop /* 80CE3A2C-80CE3A30 000044 0004+00 0/1 0/0 0/0 .rodata @4015 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4015 = 6000.0f; -COMPILER_STRIP_GATE(80CE3A2C, &lit_4015); +COMPILER_STRIP_GATE(0x80CE3A2C, &lit_4015); #pragma pop /* 80CE3A30-80CE3A34 000048 0004+00 0/2 0/0 0/0 .rodata @4016 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4016 = 30.0f; -COMPILER_STRIP_GATE(80CE3A30, &lit_4016); +COMPILER_STRIP_GATE(0x80CE3A30, &lit_4016); #pragma pop /* 80CE3A34-80CE3A38 00004C 0004+00 0/4 0/0 0/0 .rodata @4017 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4017 = 5.0f; -COMPILER_STRIP_GATE(80CE3A34, &lit_4017); +COMPILER_STRIP_GATE(0x80CE3A34, &lit_4017); #pragma pop /* 80CE3A38-80CE3A3C 000050 0004+00 0/2 0/0 0/0 .rodata @4018 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4018 = 20.0f; -COMPILER_STRIP_GATE(80CE3A38, &lit_4018); +COMPILER_STRIP_GATE(0x80CE3A38, &lit_4018); #pragma pop /* 80CE3A3C-80CE3A40 000054 0004+00 0/1 0/0 0/0 .rodata @4019 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4019 = 15.0f; -COMPILER_STRIP_GATE(80CE3A3C, &lit_4019); +COMPILER_STRIP_GATE(0x80CE3A3C, &lit_4019); #pragma pop /* 80CE3A40-80CE3A44 000058 0004+00 0/1 0/0 0/0 .rodata @4020 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4020 = 6.0f; -COMPILER_STRIP_GATE(80CE3A40, &lit_4020); +COMPILER_STRIP_GATE(0x80CE3A40, &lit_4020); #pragma pop /* 80CE3A44-80CE3A48 00005C 0004+00 0/1 0/0 0/0 .rodata @4021 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4021 = 32768.0f; -COMPILER_STRIP_GATE(80CE3A44, &lit_4021); +COMPILER_STRIP_GATE(0x80CE3A44, &lit_4021); #pragma pop /* 80CE3A48-80CE3A4C 000060 0004+00 0/1 0/0 0/0 .rodata @4022 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4022 = 1000.0f; -COMPILER_STRIP_GATE(80CE3A48, &lit_4022); +COMPILER_STRIP_GATE(0x80CE3A48, &lit_4022); #pragma pop /* 80CE3A4C-80CE3A50 000064 0004+00 0/3 0/0 0/0 .rodata @4023 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4023 = 10.0f; -COMPILER_STRIP_GATE(80CE3A4C, &lit_4023); +COMPILER_STRIP_GATE(0x80CE3A4C, &lit_4023); #pragma pop /* 80CE3A50-80CE3A54 000068 0004+00 0/2 0/0 0/0 .rodata @4024 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4024 = 4.0f; -COMPILER_STRIP_GATE(80CE3A50, &lit_4024); +COMPILER_STRIP_GATE(0x80CE3A50, &lit_4024); #pragma pop /* 80CE0744-80CE0C54 000464 0510+00 4/4 0/0 0/0 .text part_set__FP12obj_so_classSc */ @@ -749,21 +749,21 @@ asm cXyz::~cXyz() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4085 = -10.0f; -COMPILER_STRIP_GATE(80CE3A54, &lit_4085); +COMPILER_STRIP_GATE(0x80CE3A54, &lit_4085); #pragma pop /* 80CE3A58-80CE3A5C 000070 0004+00 0/2 0/0 0/0 .rodata @4086 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4086 = -1.0f; -COMPILER_STRIP_GATE(80CE3A58, &lit_4086); +COMPILER_STRIP_GATE(0x80CE3A58, &lit_4086); #pragma pop /* 80CE3A5C-80CE3A60 000074 0004+00 0/2 0/0 0/0 .rodata @4087 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4087 = 2.5f; -COMPILER_STRIP_GATE(80CE3A5C, &lit_4087); +COMPILER_STRIP_GATE(0x80CE3A5C, &lit_4087); #pragma pop /* 80CE0C90-80CE0F58 0009B0 02C8+00 1/1 0/0 0/0 .text so_drop__FP12obj_so_class */ @@ -811,14 +811,14 @@ static asm void so_hang(obj_so_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4205 = -60.0f; -COMPILER_STRIP_GATE(80CE3A60, &lit_4205); +COMPILER_STRIP_GATE(0x80CE3A60, &lit_4205); #pragma pop /* 80CE3A64-80CE3A68 00007C 0004+00 0/1 0/0 0/0 .rodata @4206 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4206 = -200.0f; -COMPILER_STRIP_GATE(80CE3A64, &lit_4206); +COMPILER_STRIP_GATE(0x80CE3A64, &lit_4206); #pragma pop /* 80CE12D8-80CE14DC 000FF8 0204+00 1/1 0/0 0/0 .text action__FP12obj_so_class */ @@ -836,140 +836,140 @@ static asm void action(obj_so_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4943 = 12000.0f; -COMPILER_STRIP_GATE(80CE3A68, &lit_4943); +COMPILER_STRIP_GATE(0x80CE3A68, &lit_4943); #pragma pop /* 80CE3A6C-80CE3A70 000084 0004+00 0/1 0/0 0/0 .rodata @4944 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4944 = 70.0f; -COMPILER_STRIP_GATE(80CE3A6C, &lit_4944); +COMPILER_STRIP_GATE(0x80CE3A6C, &lit_4944); #pragma pop /* 80CE3A70-80CE3A74 000088 0004+00 0/2 0/0 0/0 .rodata @4945 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4945 = 40.0f; -COMPILER_STRIP_GATE(80CE3A70, &lit_4945); +COMPILER_STRIP_GATE(0x80CE3A70, &lit_4945); #pragma pop /* 80CE3A74-80CE3A78 00008C 0004+00 0/1 0/0 0/0 .rodata @4946 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4946 = -100.0f; -COMPILER_STRIP_GATE(80CE3A74, &lit_4946); +COMPILER_STRIP_GATE(0x80CE3A74, &lit_4946); #pragma pop /* 80CE3A78-80CE3A7C 000090 0004+00 0/1 0/0 0/0 .rodata @4947 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4947 = 2570.0f; -COMPILER_STRIP_GATE(80CE3A78, &lit_4947); +COMPILER_STRIP_GATE(0x80CE3A78, &lit_4947); #pragma pop /* 80CE3A7C-80CE3A80 000094 0004+00 0/1 0/0 0/0 .rodata @4948 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4948 = 2000.0f; -COMPILER_STRIP_GATE(80CE3A7C, &lit_4948); +COMPILER_STRIP_GATE(0x80CE3A7C, &lit_4948); #pragma pop /* 80CE3A80-80CE3A84 000098 0004+00 0/1 0/0 0/0 .rodata @4949 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4949 = -3.0f / 10.0f; -COMPILER_STRIP_GATE(80CE3A80, &lit_4949); +COMPILER_STRIP_GATE(0x80CE3A80, &lit_4949); #pragma pop /* 80CE3A84-80CE3A88 00009C 0004+00 0/2 0/0 0/0 .rodata @4950 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4950 = 0.5f; -COMPILER_STRIP_GATE(80CE3A84, &lit_4950); +COMPILER_STRIP_GATE(0x80CE3A84, &lit_4950); #pragma pop /* 80CE3A88-80CE3A8C 0000A0 0004+00 0/1 0/0 0/0 .rodata @4951 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4951 = 400.0f; -COMPILER_STRIP_GATE(80CE3A88, &lit_4951); +COMPILER_STRIP_GATE(0x80CE3A88, &lit_4951); #pragma pop /* 80CE3A8C-80CE3A90 0000A4 0004+00 0/2 0/0 0/0 .rodata @4952 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4952 = 300.0f; -COMPILER_STRIP_GATE(80CE3A8C, &lit_4952); +COMPILER_STRIP_GATE(0x80CE3A8C, &lit_4952); #pragma pop /* 80CE3A90-80CE3A94 0000A8 0004+00 0/1 0/0 0/0 .rodata @4953 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4953 = -1024.0f; -COMPILER_STRIP_GATE(80CE3A90, &lit_4953); +COMPILER_STRIP_GATE(0x80CE3A90, &lit_4953); #pragma pop /* 80CE3A94-80CE3A98 0000AC 0004+00 0/2 0/0 0/0 .rodata @4954 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4954 = 500.0f; -COMPILER_STRIP_GATE(80CE3A94, &lit_4954); +COMPILER_STRIP_GATE(0x80CE3A94, &lit_4954); #pragma pop /* 80CE3A98-80CE3A9C 0000B0 0004+00 0/1 0/0 0/0 .rodata @4955 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4955 = 180.0f; -COMPILER_STRIP_GATE(80CE3A98, &lit_4955); +COMPILER_STRIP_GATE(0x80CE3A98, &lit_4955); #pragma pop /* 80CE3A9C-80CE3AA0 0000B4 0004+00 0/1 0/0 0/0 .rodata @4956 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4956 = -80.0f; -COMPILER_STRIP_GATE(80CE3A9C, &lit_4956); +COMPILER_STRIP_GATE(0x80CE3A9C, &lit_4956); #pragma pop /* 80CE3AA0-80CE3AA4 0000B8 0004+00 0/1 0/0 0/0 .rodata @4957 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4957 = 165.0f; -COMPILER_STRIP_GATE(80CE3AA0, &lit_4957); +COMPILER_STRIP_GATE(0x80CE3AA0, &lit_4957); #pragma pop /* 80CE3AA4-80CE3AA8 0000BC 0004+00 0/1 0/0 0/0 .rodata @4958 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4958 = -90.0f; -COMPILER_STRIP_GATE(80CE3AA4, &lit_4958); +COMPILER_STRIP_GATE(0x80CE3AA4, &lit_4958); #pragma pop /* 80CE3AA8-80CE3AAC 0000C0 0004+00 0/1 0/0 0/0 .rodata @4959 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4959 = -87.0f; -COMPILER_STRIP_GATE(80CE3AA8, &lit_4959); +COMPILER_STRIP_GATE(0x80CE3AA8, &lit_4959); #pragma pop /* 80CE3AAC-80CE3AB0 0000C4 0004+00 0/1 0/0 0/0 .rodata @4960 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4960 = 2500.0f; -COMPILER_STRIP_GATE(80CE3AAC, &lit_4960); +COMPILER_STRIP_GATE(0x80CE3AAC, &lit_4960); #pragma pop /* 80CE3AB0-80CE3AB4 0000C8 0004+00 0/1 0/0 0/0 .rodata @4961 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4961 = 3.0f / 10.0f; -COMPILER_STRIP_GATE(80CE3AB0, &lit_4961); +COMPILER_STRIP_GATE(0x80CE3AB0, &lit_4961); #pragma pop /* 80CE3AB4-80CE3AB8 0000CC 0004+00 0/1 0/0 0/0 .rodata @4962 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4962 = 20000.0f; -COMPILER_STRIP_GATE(80CE3AB4, &lit_4962); +COMPILER_STRIP_GATE(0x80CE3AB4, &lit_4962); #pragma pop /* 80CE3AB8-80CE3AC0 0000D0 0008+00 0/1 0/0 0/0 .rodata @4963 */ @@ -978,7 +978,7 @@ COMPILER_STRIP_GATE(80CE3AB4, &lit_4962); SECTION_RODATA static u8 const lit_4963[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CE3AB8, &lit_4963); +COMPILER_STRIP_GATE(0x80CE3AB8, &lit_4963); #pragma pop /* 80CE3AC0-80CE3AC8 0000D8 0008+00 0/1 0/0 0/0 .rodata @4964 */ @@ -987,7 +987,7 @@ COMPILER_STRIP_GATE(80CE3AB8, &lit_4963); SECTION_RODATA static u8 const lit_4964[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CE3AC0, &lit_4964); +COMPILER_STRIP_GATE(0x80CE3AC0, &lit_4964); #pragma pop /* 80CE3AC8-80CE3AD0 0000E0 0008+00 0/1 0/0 0/0 .rodata @4965 */ @@ -996,49 +996,49 @@ COMPILER_STRIP_GATE(80CE3AC0, &lit_4964); SECTION_RODATA static u8 const lit_4965[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CE3AC8, &lit_4965); +COMPILER_STRIP_GATE(0x80CE3AC8, &lit_4965); #pragma pop /* 80CE3AD0-80CE3AD4 0000E8 0004+00 0/3 0/0 0/0 .rodata @4966 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4966 = 50.0f; -COMPILER_STRIP_GATE(80CE3AD0, &lit_4966); +COMPILER_STRIP_GATE(0x80CE3AD0, &lit_4966); #pragma pop /* 80CE3AD4-80CE3AD8 0000EC 0004+00 0/1 0/0 0/0 .rodata @4967 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4967 = 100.0f; -COMPILER_STRIP_GATE(80CE3AD4, &lit_4967); +COMPILER_STRIP_GATE(0x80CE3AD4, &lit_4967); #pragma pop /* 80CE3AD8-80CE3ADC 0000F0 0004+00 0/1 0/0 0/0 .rodata @4968 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4968 = 9.0f / 20.0f; -COMPILER_STRIP_GATE(80CE3AD8, &lit_4968); +COMPILER_STRIP_GATE(0x80CE3AD8, &lit_4968); #pragma pop /* 80CE3ADC-80CE3AE0 0000F4 0004+00 0/1 0/0 0/0 .rodata @4969 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4969 = -20.0f; -COMPILER_STRIP_GATE(80CE3ADC, &lit_4969); +COMPILER_STRIP_GATE(0x80CE3ADC, &lit_4969); #pragma pop /* 80CE3AE0-80CE3AE4 0000F8 0004+00 0/1 0/0 0/0 .rodata @4970 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4970 = 80.0f; -COMPILER_STRIP_GATE(80CE3AE0, &lit_4970); +COMPILER_STRIP_GATE(0x80CE3AE0, &lit_4970); #pragma pop /* 80CE3AE4-80CE3AE8 0000FC 0004+00 0/1 0/0 0/0 .rodata @4971 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4971 = 77.0f; -COMPILER_STRIP_GATE(80CE3AE4, &lit_4971); +COMPILER_STRIP_GATE(0x80CE3AE4, &lit_4971); #pragma pop /* 80CE3AE8-80CE3AF0 000100 0004+04 0/1 0/0 0/0 .rodata @4972 */ @@ -1049,7 +1049,7 @@ SECTION_RODATA static f32 const lit_4972[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80CE3AE8, &lit_4972); +COMPILER_STRIP_GATE(0x80CE3AE8, &lit_4972); #pragma pop /* 80CE3AF0-80CE3AF8 000108 0008+00 0/1 0/0 0/0 .rodata @4979 */ @@ -1058,7 +1058,13 @@ COMPILER_STRIP_GATE(80CE3AE8, &lit_4972); SECTION_RODATA static u8 const lit_4979[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CE3AF0, &lit_4979); +COMPILER_STRIP_GATE(0x80CE3AF0, &lit_4979); +#pragma pop + +/* 80CE3B60-80CE3B60 000178 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80CE3B60 = "F_SP108"; #pragma pop /* 80CE14DC-80CE2A64 0011FC 1588+00 1/1 0/0 0/0 .text part_move__FP12obj_so_class */ @@ -1086,133 +1092,133 @@ asm dBgS_ObjGndChk::~dBgS_ObjGndChk() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5077 = -550.0f; -COMPILER_STRIP_GATE(80CE3AF8, &lit_5077); +COMPILER_STRIP_GATE(0x80CE3AF8, &lit_5077); #pragma pop /* 80CE3AFC-80CE3B00 000114 0004+00 0/1 0/0 0/0 .rodata @5078 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5078 = 3300.0f; -COMPILER_STRIP_GATE(80CE3AFC, &lit_5078); +COMPILER_STRIP_GATE(0x80CE3AFC, &lit_5078); #pragma pop /* 80CE3B00-80CE3B04 000118 0004+00 0/1 0/0 0/0 .rodata @5079 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5079 = -600.0f; -COMPILER_STRIP_GATE(80CE3B00, &lit_5079); +COMPILER_STRIP_GATE(0x80CE3B00, &lit_5079); #pragma pop /* 80CE3B04-80CE3B08 00011C 0004+00 0/1 0/0 0/0 .rodata @5080 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5080 = 12459.0f; -COMPILER_STRIP_GATE(80CE3B04, &lit_5080); +COMPILER_STRIP_GATE(0x80CE3B04, &lit_5080); #pragma pop /* 80CE3B08-80CE3B0C 000120 0004+00 0/2 0/0 0/0 .rodata @5081 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5081 = 3152.0f; -COMPILER_STRIP_GATE(80CE3B08, &lit_5081); +COMPILER_STRIP_GATE(0x80CE3B08, &lit_5081); #pragma pop /* 80CE3B0C-80CE3B10 000124 0004+00 0/1 0/0 0/0 .rodata @5082 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5082 = 4628.0f; -COMPILER_STRIP_GATE(80CE3B0C, &lit_5082); +COMPILER_STRIP_GATE(0x80CE3B0C, &lit_5082); #pragma pop /* 80CE3B10-80CE3B14 000128 0004+00 0/1 0/0 0/0 .rodata @5083 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5083 = 150.0f; -COMPILER_STRIP_GATE(80CE3B10, &lit_5083); +COMPILER_STRIP_GATE(0x80CE3B10, &lit_5083); #pragma pop /* 80CE3B14-80CE3B18 00012C 0004+00 0/1 0/0 0/0 .rodata @5084 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5084 = 3602.0f; -COMPILER_STRIP_GATE(80CE3B14, &lit_5084); +COMPILER_STRIP_GATE(0x80CE3B14, &lit_5084); #pragma pop /* 80CE3B18-80CE3B1C 000130 0004+00 0/1 0/0 0/0 .rodata @5085 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5085 = 65.0f; -COMPILER_STRIP_GATE(80CE3B18, &lit_5085); +COMPILER_STRIP_GATE(0x80CE3B18, &lit_5085); #pragma pop /* 80CE3B1C-80CE3B20 000134 0004+00 0/1 0/0 0/0 .rodata @5086 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5086 = 1.0f / 20.0f; -COMPILER_STRIP_GATE(80CE3B1C, &lit_5086); +COMPILER_STRIP_GATE(0x80CE3B1C, &lit_5086); #pragma pop /* 80CE3B20-80CE3B24 000138 0004+00 0/1 0/0 0/0 .rodata @5087 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5087 = -4264.0f; -COMPILER_STRIP_GATE(80CE3B20, &lit_5087); +COMPILER_STRIP_GATE(0x80CE3B20, &lit_5087); #pragma pop /* 80CE3B24-80CE3B28 00013C 0004+00 0/1 0/0 0/0 .rodata @5088 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5088 = 302.0f; -COMPILER_STRIP_GATE(80CE3B24, &lit_5088); +COMPILER_STRIP_GATE(0x80CE3B24, &lit_5088); #pragma pop /* 80CE3B28-80CE3B2C 000140 0004+00 0/1 0/0 0/0 .rodata @5089 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5089 = -2330.0f; -COMPILER_STRIP_GATE(80CE3B28, &lit_5089); +COMPILER_STRIP_GATE(0x80CE3B28, &lit_5089); #pragma pop /* 80CE3B2C-80CE3B30 000144 0004+00 0/1 0/0 0/0 .rodata @5090 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5090 = 16400.0f; -COMPILER_STRIP_GATE(80CE3B2C, &lit_5090); +COMPILER_STRIP_GATE(0x80CE3B2C, &lit_5090); #pragma pop /* 80CE3B30-80CE3B34 000148 0004+00 0/1 0/0 0/0 .rodata @5091 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5091 = 3529.0f; -COMPILER_STRIP_GATE(80CE3B30, &lit_5091); +COMPILER_STRIP_GATE(0x80CE3B30, &lit_5091); #pragma pop /* 80CE3B34-80CE3B38 00014C 0004+00 0/1 0/0 0/0 .rodata @5092 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5092 = 8385.0f; -COMPILER_STRIP_GATE(80CE3B34, &lit_5092); +COMPILER_STRIP_GATE(0x80CE3B34, &lit_5092); #pragma pop /* 80CE3B38-80CE3B3C 000150 0004+00 0/1 0/0 0/0 .rodata @5093 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5093 = 16200.0f; -COMPILER_STRIP_GATE(80CE3B38, &lit_5093); +COMPILER_STRIP_GATE(0x80CE3B38, &lit_5093); #pragma pop /* 80CE3B3C-80CE3B40 000154 0004+00 0/1 0/0 0/0 .rodata @5094 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5094 = 3481.0f; -COMPILER_STRIP_GATE(80CE3B3C, &lit_5094); +COMPILER_STRIP_GATE(0x80CE3B3C, &lit_5094); #pragma pop /* 80CE3B40-80CE3B44 000158 0004+00 0/1 0/0 0/0 .rodata @5095 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5095 = 8418.0f; -COMPILER_STRIP_GATE(80CE3B40, &lit_5095); +COMPILER_STRIP_GATE(0x80CE3B40, &lit_5095); #pragma pop /* 80CE2ADC-80CE2EAC 0027FC 03D0+00 1/1 0/0 0/0 .text demo_camera__FP12obj_so_class */ @@ -1252,6 +1258,13 @@ static bool daObj_So_IsDelete(obj_so_class* param_0) { return true; } +/* ############################################################################################## */ +/* 80CE3B60-80CE3B60 000178 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80CE3B68 = "Obj_so"; +#pragma pop + /* 80CE2F68-80CE3018 002C88 00B0+00 1/0 0/0 0/0 .text daObj_So_Delete__FP12obj_so_class */ #pragma push @@ -1278,49 +1291,49 @@ static asm void useHeapInit(fopAc_ac_c* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5327 = -300.0f; -COMPILER_STRIP_GATE(80CE3B44, &lit_5327); +COMPILER_STRIP_GATE(0x80CE3B44, &lit_5327); #pragma pop /* 80CE3B48-80CE3B4C 000160 0004+00 0/1 0/0 0/0 .rodata @5328 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5328 = -500.0f; -COMPILER_STRIP_GATE(80CE3B48, &lit_5328); +COMPILER_STRIP_GATE(0x80CE3B48, &lit_5328); #pragma pop /* 80CE3B4C-80CE3B50 000164 0004+00 0/1 0/0 0/0 .rodata @5329 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5329 = 26.0f; -COMPILER_STRIP_GATE(80CE3B4C, &lit_5329); +COMPILER_STRIP_GATE(0x80CE3B4C, &lit_5329); #pragma pop /* 80CE3B50-80CE3B54 000168 0004+00 0/1 0/0 0/0 .rodata @5330 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5330 = 1100.0f; -COMPILER_STRIP_GATE(80CE3B50, &lit_5330); +COMPILER_STRIP_GATE(0x80CE3B50, &lit_5330); #pragma pop /* 80CE3B54-80CE3B58 00016C 0004+00 0/1 0/0 0/0 .rodata @5331 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5331 = -5374.0f; -COMPILER_STRIP_GATE(80CE3B54, &lit_5331); +COMPILER_STRIP_GATE(0x80CE3B54, &lit_5331); #pragma pop /* 80CE3B58-80CE3B5C 000170 0004+00 0/1 0/0 0/0 .rodata @5332 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5332 = 4280.0f; -COMPILER_STRIP_GATE(80CE3B58, &lit_5332); +COMPILER_STRIP_GATE(0x80CE3B58, &lit_5332); #pragma pop /* 80CE3B5C-80CE3B60 000174 0004+00 0/1 0/0 0/0 .rodata @5333 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5333 = -2342.0f; -COMPILER_STRIP_GATE(80CE3B5C, &lit_5333); +COMPILER_STRIP_GATE(0x80CE3B5C, &lit_5333); #pragma pop /* 80CE327C-80CE36D0 002F9C 0454+00 1/0 0/0 0/0 .text daObj_So_Create__FP10fopAc_ac_c */ @@ -1415,7 +1428,7 @@ asm void __sinit_d_a_obj_so_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80CE3970 = (void*)__sinit_d_a_obj_so_cpp; +REGISTER_CTORS(0x80CE3970, __sinit_d_a_obj_so_cpp); #pragma pop /* 80CE39AC-80CE39B4 0036CC 0008+00 1/0 0/0 0/0 .text @20@__dt__14dBgS_ObjGndChkFv */ @@ -1468,10 +1481,4 @@ static asm void func_80CE39CC() { } #pragma pop -/* 80CE3B60-80CE3B6F 000178 000F+00 4/4 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80CE3B60 = "F_SP108"; -SECTION_DEAD static char const* const stringBase_80CE3B68 = "Obj_so"; -#pragma pop +/* 80CE3B60-80CE3B60 000178 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_spinLift/d_a_obj_spinLift.cpp b/rel/d/a/obj/d_a_obj_spinLift/d_a_obj_spinLift.cpp index 9bfce4e6562..abb788e1522 100644 --- a/rel/d/a/obj/d_a_obj_spinLift/d_a_obj_spinLift.cpp +++ b/rel/d/a/obj/d_a_obj_spinLift/d_a_obj_spinLift.cpp @@ -74,10 +74,10 @@ struct dRes_control_c { struct dPa_levelEcallBack {}; -struct _GXColor {}; - struct csXyz {}; +struct _GXColor {}; + struct dPa_control_c { /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, @@ -102,10 +102,10 @@ struct dBgS_MoveBgActor { /* 80078950 */ void MoveBGExecute(); }; -struct Vec {}; - struct JAISoundID {}; +struct Vec {}; + struct Z2SeMgr { /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); /* 802AC50C */ void seStartLevel(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); @@ -205,7 +205,21 @@ SECTION_RODATA static u8 const lit_3637[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CE4CBC, &lit_3637); +COMPILER_STRIP_GATE(0x80CE4CBC, &lit_3637); + +/* 80CE4D30-80CE4D30 000074 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80CE4D30 = "L4_N_Entr"; +SECTION_DEAD static char const* const stringBase_80CE4D3A = "L4_N_SlpH"; +SECTION_DEAD static char const* const stringBase_80CE4D44 = "L4_N_SlpL"; +SECTION_DEAD static char const* const stringBase_80CE4D4E = "L4_Center"; +SECTION_DEAD static char const* const stringBase_80CE4D58 = "L4_Switch"; +SECTION_DEAD static char const* const stringBase_80CE4D62 = "L4_S_Slp"; +SECTION_DEAD static char const* const stringBase_80CE4D6B = "L4_Wal_ZE"; +SECTION_DEAD static char const* const stringBase_80CE4D75 = "L4_Wal_ZW"; +SECTION_DEAD static char const* const stringBase_80CE4D7F = "L4_Wal_X"; +#pragma pop /* 80CE4D88-80CE4D94 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { @@ -375,7 +389,7 @@ SECTION_RODATA static u8 const l_bmdIdx[36] = { 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x04, }; -COMPILER_STRIP_GATE(80CE4CC0, &l_bmdIdx); +COMPILER_STRIP_GATE(0x80CE4CC0, &l_bmdIdx); /* 80CE3E9C-80CE3F1C 0001DC 0080+00 1/0 0/0 0/0 .text CreateHeap__12daSpinLift_cFv */ #pragma push @@ -394,23 +408,23 @@ SECTION_RODATA static u8 const l_dzbIdx[36] = { 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x07, }; -COMPILER_STRIP_GATE(80CE4CE4, &l_dzbIdx); +COMPILER_STRIP_GATE(0x80CE4CE4, &l_dzbIdx); /* 80CE4D08-80CE4D0C 00004C 0004+00 1/1 0/0 0/0 .rodata @3731 */ SECTION_RODATA static f32 const lit_3731 = 50.0f; -COMPILER_STRIP_GATE(80CE4D08, &lit_3731); +COMPILER_STRIP_GATE(0x80CE4D08, &lit_3731); /* 80CE4D0C-80CE4D14 000050 0008+00 1/1 0/0 0/0 .rodata @3733 */ SECTION_RODATA static u8 const lit_3733[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CE4D0C, &lit_3733); +COMPILER_STRIP_GATE(0x80CE4D0C, &lit_3733); /* 80CE4D14-80CE4D1C 000058 0008+00 1/1 0/0 0/0 .rodata @3735 */ SECTION_RODATA static u8 const lit_3735[8] = { 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CE4D14, &lit_3735); +COMPILER_STRIP_GATE(0x80CE4D14, &lit_3735); /* 80CE3F1C-80CE40FC 00025C 01E0+00 1/1 0/0 0/0 .text create__12daSpinLift_cFv */ #pragma push @@ -484,28 +498,28 @@ asm void daSpinLift_c::init_modeUpMove() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3877 = 30.0f; -COMPILER_STRIP_GATE(80CE4D1C, &lit_3877); +COMPILER_STRIP_GATE(0x80CE4D1C, &lit_3877); #pragma pop /* 80CE4D20-80CE4D24 000064 0004+00 0/3 0/0 0/0 .rodata @3878 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3878 = 1.0f; -COMPILER_STRIP_GATE(80CE4D20, &lit_3878); +COMPILER_STRIP_GATE(0x80CE4D20, &lit_3878); #pragma pop /* 80CE4D24-80CE4D28 000068 0004+00 0/2 0/0 0/0 .rodata @3879 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3879 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(80CE4D24, &lit_3879); +COMPILER_STRIP_GATE(0x80CE4D24, &lit_3879); #pragma pop /* 80CE4D28-80CE4D2C 00006C 0004+00 0/3 0/0 0/0 .rodata @3880 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3880 = -1.0f; -COMPILER_STRIP_GATE(80CE4D28, &lit_3880); +COMPILER_STRIP_GATE(0x80CE4D28, &lit_3880); #pragma pop /* 80CE42C4-80CE468C 000604 03C8+00 1/0 0/0 0/0 .text modeUpMove__12daSpinLift_cFv */ @@ -534,7 +548,7 @@ asm void daSpinLift_c::init_modeDownMove() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3907 = 3.0f / 10.0f; -COMPILER_STRIP_GATE(80CE4D2C, &lit_3907); +COMPILER_STRIP_GATE(0x80CE4D2C, &lit_3907); #pragma pop /* 80CE4698-80CE4790 0009D8 00F8+00 1/0 0/0 0/0 .text modeDownMove__12daSpinLift_cFv */ @@ -648,20 +662,7 @@ asm void __sinit_d_a_obj_spinLift_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80CE4C6C = (void*)__sinit_d_a_obj_spinLift_cpp; +REGISTER_CTORS(0x80CE4C6C, __sinit_d_a_obj_spinLift_cpp); #pragma pop -/* 80CE4D30-80CE4D88 000074 0058+00 1/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80CE4D30 = "L4_N_Entr"; -SECTION_DEAD static char const* const stringBase_80CE4D3A = "L4_N_SlpH"; -SECTION_DEAD static char const* const stringBase_80CE4D44 = "L4_N_SlpL"; -SECTION_DEAD static char const* const stringBase_80CE4D4E = "L4_Center"; -SECTION_DEAD static char const* const stringBase_80CE4D58 = "L4_Switch"; -SECTION_DEAD static char const* const stringBase_80CE4D62 = "L4_S_Slp"; -SECTION_DEAD static char const* const stringBase_80CE4D6B = "L4_Wal_ZE"; -SECTION_DEAD static char const* const stringBase_80CE4D75 = "L4_Wal_ZW"; -SECTION_DEAD static char const* const stringBase_80CE4D7F = "L4_Wal_X"; -#pragma pop +/* 80CE4D30-80CE4D30 000074 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_ss_drink/d_a_obj_ss_drink.cpp b/rel/d/a/obj/d_a_obj_ss_drink/d_a_obj_ss_drink.cpp index a5ac12489ad..04127754d02 100644 --- a/rel/d/a/obj/d_a_obj_ss_drink/d_a_obj_ss_drink.cpp +++ b/rel/d/a/obj/d_a_obj_ss_drink/d_a_obj_ss_drink.cpp @@ -381,6 +381,13 @@ extern "C" void soldoutItem__8daMyna_cFUi(); // /* ############################################################################################## */ +/* 80CE6990-80CE6990 000060 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80CE6990 = "Obj_btl"; +SECTION_DEAD static char const* const stringBase_80CE6998 = "al_bottle.bmd"; +#pragma pop + /* 80CE69C4-80CE69D0 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -613,11 +620,18 @@ SECTION_RODATA u8 const daObj_SSDrink_c::mCcDObjInfo[48] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x79, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CE6930, &daObj_SSDrink_c::mCcDObjInfo); +COMPILER_STRIP_GATE(0x80CE6930, &daObj_SSDrink_c::mCcDObjInfo); /* 80CE6960-80CE6964 000030 0004+00 1/3 0/0 0/0 .rodata @4000 */ SECTION_RODATA static f32 const lit_4000 = 1.0f; -COMPILER_STRIP_GATE(80CE6960, &lit_4000); +COMPILER_STRIP_GATE(0x80CE6960, &lit_4000); + +/* 80CE6990-80CE6990 000060 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80CE69A6 = "al_bottle.btp"; +SECTION_DEAD static char const* const stringBase_80CE69B4 = "al_bottle.brk"; +#pragma pop /* 80CE53EC-80CE55A8 0004EC 01BC+00 1/1 0/0 0/0 .text CreateHeap__15daObj_SSDrink_cFv */ #pragma push @@ -654,21 +668,21 @@ asm void daObj_SSDrink_c::Delete() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4057 = -1000000000.0f; -COMPILER_STRIP_GATE(80CE6964, &lit_4057); +COMPILER_STRIP_GATE(0x80CE6964, &lit_4057); #pragma pop /* 80CE6968-80CE696C 000038 0004+00 0/2 0/0 0/0 .rodata @4058 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4058 = 10.0f; -COMPILER_STRIP_GATE(80CE6968, &lit_4058); +COMPILER_STRIP_GATE(0x80CE6968, &lit_4058); #pragma pop /* 80CE696C-80CE6970 00003C 0004+00 0/2 0/0 0/0 .rodata @4059 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4059 = 30.0f; -COMPILER_STRIP_GATE(80CE696C, &lit_4059); +COMPILER_STRIP_GATE(0x80CE696C, &lit_4059); #pragma pop /* 80CE5624-80CE5858 000724 0234+00 2/2 0/0 0/0 .text Execute__15daObj_SSDrink_cFv */ @@ -798,35 +812,35 @@ asm void daObj_SSDrink_c::restart() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4204 = -30.0f; -COMPILER_STRIP_GATE(80CE6970, &lit_4204); +COMPILER_STRIP_GATE(0x80CE6970, &lit_4204); #pragma pop /* 80CE6974-80CE6978 000044 0004+00 0/1 0/0 0/0 .rodata @4205 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4205 = -15.0f; -COMPILER_STRIP_GATE(80CE6974, &lit_4205); +COMPILER_STRIP_GATE(0x80CE6974, &lit_4205); #pragma pop /* 80CE6978-80CE697C 000048 0004+00 0/1 0/0 0/0 .rodata @4206 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4206 = 45.0f; -COMPILER_STRIP_GATE(80CE6978, &lit_4206); +COMPILER_STRIP_GATE(0x80CE6978, &lit_4206); #pragma pop /* 80CE697C-80CE6980 00004C 0004+00 0/2 0/0 0/0 .rodata @4207 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4207 = 24.0f; -COMPILER_STRIP_GATE(80CE697C, &lit_4207); +COMPILER_STRIP_GATE(0x80CE697C, &lit_4207); #pragma pop /* 80CE6980-80CE6984 000050 0004+00 0/2 0/0 0/0 .rodata @4208 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4208 = 12.0f; -COMPILER_STRIP_GATE(80CE6980, &lit_4208); +COMPILER_STRIP_GATE(0x80CE6980, &lit_4208); #pragma pop /* 80CE5BF0-80CE5DB0 000CF0 01C0+00 1/1 0/0 0/0 .text initialize__15daObj_SSDrink_cFv */ @@ -844,7 +858,7 @@ asm void daObj_SSDrink_c::initialize() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daObj_SSDrink_c::checkProcess(int (daObj_SSDrink_c::*)(void*)) { +asm void daObj_SSDrink_c::checkProcess(int (daObj_SSDrink_c::*param_0)(void*)) { nofralloc #include "asm/rel/d/a/obj/d_a_obj_ss_drink/d_a_obj_ss_drink/checkProcess__15daObj_SSDrink_cFM15daObj_SSDrink_cFPCvPvPv_i.s" } @@ -855,7 +869,7 @@ asm void daObj_SSDrink_c::checkProcess(int (daObj_SSDrink_c::*)(void*)) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daObj_SSDrink_c::setProcess(int (daObj_SSDrink_c::*)(void*)) { +asm void daObj_SSDrink_c::setProcess(int (daObj_SSDrink_c::*param_0)(void*)) { nofralloc #include "asm/rel/d/a/obj/d_a_obj_ss_drink/d_a_obj_ss_drink/setProcess__15daObj_SSDrink_cFM15daObj_SSDrink_cFPCvPvPv_i.s" } @@ -866,7 +880,7 @@ asm void daObj_SSDrink_c::setProcess(int (daObj_SSDrink_c::*)(void*)) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4257 = -5.0f; -COMPILER_STRIP_GATE(80CE6984, &lit_4257); +COMPILER_STRIP_GATE(0x80CE6984, &lit_4257); #pragma pop /* 80CE5EC8-80CE5FE4 000FC8 011C+00 1/1 0/0 0/0 .text setParam__15daObj_SSDrink_cFv */ @@ -925,7 +939,7 @@ asm void daObj_SSDrink_c::setAttnPos() { SECTION_RODATA static u8 const lit_4320[8] = { 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CE6988, &lit_4320); +COMPILER_STRIP_GATE(0x80CE6988, &lit_4320); /* 80CE6170-80CE61E4 001270 0074+00 1/1 0/0 0/0 .text animeEntry__15daObj_SSDrink_cFv */ #pragma push @@ -1059,7 +1073,7 @@ asm void __sinit_d_a_obj_ss_drink_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80CE66F4 = (void*)__sinit_d_a_obj_ss_drink_cpp; +REGISTER_CTORS(0x80CE66F4, __sinit_d_a_obj_ss_drink_cpp); #pragma pop /* 80CE672C-80CE6734 00182C 0008+00 1/0 0/0 0/0 .text @36@__dt__12dBgS_ObjAcchFv */ @@ -1142,12 +1156,4 @@ asm dBgS_ObjAcch::~dBgS_ObjAcch() { } #pragma pop -/* 80CE6990-80CE69C2 000060 0032+00 3/1 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80CE6990 = "Obj_btl"; -SECTION_DEAD static char const* const stringBase_80CE6998 = "al_bottle.bmd"; -SECTION_DEAD static char const* const stringBase_80CE69A6 = "al_bottle.btp"; -SECTION_DEAD static char const* const stringBase_80CE69B4 = "al_bottle.brk"; -#pragma pop +/* 80CE6990-80CE6990 000060 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_ss_item/d_a_obj_ss_item.cpp b/rel/d/a/obj/d_a_obj_ss_item/d_a_obj_ss_item.cpp index 616ef5bfc49..fed029bd371 100644 --- a/rel/d/a/obj/d_a_obj_ss_item/d_a_obj_ss_item.cpp +++ b/rel/d/a/obj/d_a_obj_ss_item/d_a_obj_ss_item.cpp @@ -310,6 +310,15 @@ extern "C" void soldoutItem__8daMyna_cFUi(); // /* ############################################################################################## */ +/* 80CE7F18-80CE7F18 000068 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80CE7F18 = "Always"; +SECTION_DEAD static char const* const stringBase_80CE7F1F = "Pumpkin"; +SECTION_DEAD static char const* const stringBase_80CE7F27 = ""; +SECTION_DEAD static char const* const stringBase_80CE7F28 = "pumpkin.bmd"; +#pragma pop + /* 80CE7F34-80CE7F40 -00001 000C+00 1/1 0/0 0/0 .data l_resFileName */ SECTION_DATA static void* l_resFileName[3] = { (void*)&d_a_obj_ss_item__stringBase0, @@ -528,7 +537,7 @@ SECTION_RODATA u8 const daObj_SSItem_c::mCcDObjInfo[48] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x79, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CE7EB0, &daObj_SSItem_c::mCcDObjInfo); +COMPILER_STRIP_GATE(0x80CE7EB0, &daObj_SSItem_c::mCcDObjInfo); /* 80CE7EE0-80CE7EE4 000030 0004+00 1/2 0/0 0/0 .rodata @4205 */ SECTION_RODATA static u8 const lit_4205[4] = { @@ -537,27 +546,27 @@ SECTION_RODATA static u8 const lit_4205[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CE7EE0, &lit_4205); +COMPILER_STRIP_GATE(0x80CE7EE0, &lit_4205); /* 80CE7EE4-80CE7EE8 000034 0004+00 0/2 0/0 0/0 .rodata @4206 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4206 = -1000000000.0f; -COMPILER_STRIP_GATE(80CE7EE4, &lit_4206); +COMPILER_STRIP_GATE(0x80CE7EE4, &lit_4206); #pragma pop /* 80CE7EE8-80CE7EEC 000038 0004+00 0/1 0/0 0/0 .rodata @4207 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4207 = 8.0f; -COMPILER_STRIP_GATE(80CE7EE8, &lit_4207); +COMPILER_STRIP_GATE(0x80CE7EE8, &lit_4207); #pragma pop /* 80CE7EEC-80CE7EF0 00003C 0004+00 0/1 0/0 0/0 .rodata @4208 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4208 = 62.0f; -COMPILER_STRIP_GATE(80CE7EEC, &lit_4208); +COMPILER_STRIP_GATE(0x80CE7EEC, &lit_4208); #pragma pop /* 80CE738C-80CE7610 0007EC 0284+00 2/2 0/0 0/0 .text Execute__14daObj_SSItem_cFv */ @@ -575,14 +584,14 @@ asm void daObj_SSItem_c::Execute() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4234 = 20.0f; -COMPILER_STRIP_GATE(80CE7EF0, &lit_4234); +COMPILER_STRIP_GATE(0x80CE7EF0, &lit_4234); #pragma pop /* 80CE7EF4-80CE7EF8 000044 0004+00 0/1 0/0 0/0 .rodata @4235 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4235 = 1.0f; -COMPILER_STRIP_GATE(80CE7EF4, &lit_4235); +COMPILER_STRIP_GATE(0x80CE7EF4, &lit_4235); #pragma pop /* 80CE7610-80CE7710 000A70 0100+00 1/1 0/0 0/0 .text Draw__14daObj_SSItem_cFv */ @@ -702,42 +711,42 @@ asm void daObj_SSItem_c::restart() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4347 = -30.0f; -COMPILER_STRIP_GATE(80CE7EF8, &lit_4347); +COMPILER_STRIP_GATE(0x80CE7EF8, &lit_4347); #pragma pop /* 80CE7EFC-80CE7F00 00004C 0004+00 0/1 0/0 0/0 .rodata @4348 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4348 = -15.0f; -COMPILER_STRIP_GATE(80CE7EFC, &lit_4348); +COMPILER_STRIP_GATE(0x80CE7EFC, &lit_4348); #pragma pop /* 80CE7F00-80CE7F04 000050 0004+00 0/1 0/0 0/0 .rodata @4349 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4349 = 30.0f; -COMPILER_STRIP_GATE(80CE7F00, &lit_4349); +COMPILER_STRIP_GATE(0x80CE7F00, &lit_4349); #pragma pop /* 80CE7F04-80CE7F08 000054 0004+00 0/1 0/0 0/0 .rodata @4350 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4350 = 45.0f; -COMPILER_STRIP_GATE(80CE7F04, &lit_4350); +COMPILER_STRIP_GATE(0x80CE7F04, &lit_4350); #pragma pop /* 80CE7F08-80CE7F0C 000058 0004+00 0/2 0/0 0/0 .rodata @4351 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4351 = 24.0f; -COMPILER_STRIP_GATE(80CE7F08, &lit_4351); +COMPILER_STRIP_GATE(0x80CE7F08, &lit_4351); #pragma pop /* 80CE7F0C-80CE7F10 00005C 0004+00 0/2 0/0 0/0 .rodata @4352 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4352 = 12.0f; -COMPILER_STRIP_GATE(80CE7F0C, &lit_4352); +COMPILER_STRIP_GATE(0x80CE7F0C, &lit_4352); #pragma pop /* 80CE7950-80CE7B04 000DB0 01B4+00 1/1 0/0 0/0 .text initialize__14daObj_SSItem_cFv */ @@ -755,7 +764,7 @@ asm void daObj_SSItem_c::initialize() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daObj_SSItem_c::setProcess(int (daObj_SSItem_c::*)(void*)) { +asm void daObj_SSItem_c::setProcess(int (daObj_SSItem_c::*param_0)(void*)) { nofralloc #include "asm/rel/d/a/obj/d_a_obj_ss_item/d_a_obj_ss_item/setProcess__14daObj_SSItem_cFM14daObj_SSItem_cFPCvPvPv_i.s" } @@ -766,14 +775,14 @@ asm void daObj_SSItem_c::setProcess(int (daObj_SSItem_c::*)(void*)) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4377 = 7.0f / 5.0f; -COMPILER_STRIP_GATE(80CE7F10, &lit_4377); +COMPILER_STRIP_GATE(0x80CE7F10, &lit_4377); #pragma pop /* 80CE7F14-80CE7F18 000064 0004+00 0/1 0/0 0/0 .rodata @4378 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4378 = -5.0f; -COMPILER_STRIP_GATE(80CE7F14, &lit_4378); +COMPILER_STRIP_GATE(0x80CE7F14, &lit_4378); #pragma pop /* 80CE7BB4-80CE7C24 001014 0070+00 1/1 0/0 0/0 .text setParam__14daObj_SSItem_cFv */ @@ -904,7 +913,7 @@ asm void __sinit_d_a_obj_ss_item_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80CE7E5C = (void*)__sinit_d_a_obj_ss_item_cpp; +REGISTER_CTORS(0x80CE7E5C, __sinit_d_a_obj_ss_item_cpp); #pragma pop /* 80CE7E94-80CE7E9C 0012F4 0008+00 1/0 0/0 0/0 .text @36@__dt__12dBgS_ObjAcchFv */ @@ -927,12 +936,4 @@ static asm void func_80CE7E9C() { } #pragma pop -/* 80CE7F18-80CE7F34 000068 001C+00 2/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80CE7F18 = "Always"; -SECTION_DEAD static char const* const stringBase_80CE7F1F = "Pumpkin"; -SECTION_DEAD static char const* const stringBase_80CE7F27 = ""; -SECTION_DEAD static char const* const stringBase_80CE7F28 = "pumpkin.bmd"; -#pragma pop +/* 80CE7F18-80CE7F18 000068 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_stairBlock/d_a_obj_stairBlock.cpp b/rel/d/a/obj/d_a_obj_stairBlock/d_a_obj_stairBlock.cpp index 3428b16ee55..e112b4786f0 100644 --- a/rel/d/a/obj/d_a_obj_stairBlock/d_a_obj_stairBlock.cpp +++ b/rel/d/a/obj/d_a_obj_stairBlock/d_a_obj_stairBlock.cpp @@ -111,10 +111,10 @@ struct cCcS { /* 80264BA8 */ void Set(cCcD_Obj*); }; -struct Vec {}; - struct JAISoundID {}; +struct Vec {}; + struct Z2SeMgr { /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); }; @@ -231,7 +231,7 @@ SECTION_RODATA static u8 const lit_3651[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CE8DBC, &lit_3651); +COMPILER_STRIP_GATE(0x80CE8DBC, &lit_3651); /* 80CE8ED8-80CE8F18 000000 0040+00 2/2 0/0 0/0 .data mCcDSph__14daStairBlock_c */ SECTION_DATA u8 daStairBlock_c::mCcDSph[64] = { @@ -345,7 +345,7 @@ SECTION_RODATA u8 const daStairBlock_c::mCcDObjInfo[48] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x19, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CE8DC0, &daStairBlock_c::mCcDObjInfo); +COMPILER_STRIP_GATE(0x80CE8DC0, &daStairBlock_c::mCcDObjInfo); /* 80CE8DF0-80CE8E18 000034 0028+00 0/1 0/0 0/0 .rodata l_bmdIdx */ #pragma push @@ -355,7 +355,7 @@ SECTION_RODATA static u8 const l_bmdIdx[40] = { 0x00, 0x13, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x15, 0x00, 0x00, 0x00, 0x16, 0x00, 0x00, 0x00, 0x17, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x19, }; -COMPILER_STRIP_GATE(80CE8DF0, &l_bmdIdx); +COMPILER_STRIP_GATE(0x80CE8DF0, &l_bmdIdx); #pragma pop /* 80CE8E18-80CE8E40 00005C 0028+00 0/1 0/0 0/0 .rodata l_bckIdx */ @@ -366,7 +366,7 @@ SECTION_RODATA static u8 const l_bckIdx[40] = { 0x00, 0x07, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x0B, 0x00, 0x00, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x0D, }; -COMPILER_STRIP_GATE(80CE8E18, &l_bckIdx); +COMPILER_STRIP_GATE(0x80CE8E18, &l_bckIdx); #pragma pop /* 80CE8E40-80CE8EB8 000084 0078+00 0/1 0/0 0/0 .rodata centerPos */ @@ -382,14 +382,14 @@ SECTION_RODATA static u8 const centerPos[120] = { 0x41, 0xD7, 0x45, 0xDA, 0x40, 0x9A, 0x46, 0xDA, 0xA3, 0x3E, 0xC5, 0x25, 0x41, 0xD7, 0x45, 0xDA, 0x40, 0x9A, 0x46, 0xDA, 0xA3, 0x3E, 0xC5, 0x25, 0x41, 0xD7, 0x45, 0xDA, 0x40, 0x9A, }; -COMPILER_STRIP_GATE(80CE8E40, ¢erPos); +COMPILER_STRIP_GATE(0x80CE8E40, ¢erPos); #pragma pop /* 80CE8EB8-80CE8EBC 0000FC 0004+00 0/2 0/0 0/0 .rodata @3705 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3705 = 1.0f; -COMPILER_STRIP_GATE(80CE8EB8, &lit_3705); +COMPILER_STRIP_GATE(0x80CE8EB8, &lit_3705); #pragma pop /* 80CE8EBC-80CE8EC4 000100 0008+00 0/1 0/0 0/0 .rodata @3707 */ @@ -398,7 +398,13 @@ COMPILER_STRIP_GATE(80CE8EB8, &lit_3705); SECTION_RODATA static u8 const lit_3707[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CE8EBC, &lit_3707); +COMPILER_STRIP_GATE(0x80CE8EBC, &lit_3707); +#pragma pop + +/* 80CE8ECC-80CE8ECC 000110 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80CE8ECC = "StaBlock"; #pragma pop /* 80CE82A0-80CE83F0 000220 0150+00 1/0 0/0 0/0 .text CreateHeap__14daStairBlock_cFv */ @@ -507,14 +513,14 @@ asm void daStairBlock_c::createHeapCallBack(fopAc_ac_c* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3942 = -1.0f; -COMPILER_STRIP_GATE(80CE8EC4, &lit_3942); +COMPILER_STRIP_GATE(0x80CE8EC4, &lit_3942); #pragma pop /* 80CE8EC8-80CE8ECC 00010C 0004+00 0/1 0/0 0/0 .rodata @3943 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3943 = 200.0f; -COMPILER_STRIP_GATE(80CE8EC8, &lit_3943); +COMPILER_STRIP_GATE(0x80CE8EC8, &lit_3943); #pragma pop /* 80CE8FC8-80CE8FD4 000008 000C+00 1/1 0/0 0/0 .bss @3640 */ @@ -616,12 +622,7 @@ asm void __sinit_d_a_obj_stairBlock_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80CE8D38 = (void*)__sinit_d_a_obj_stairBlock_cpp; +REGISTER_CTORS(0x80CE8D38, __sinit_d_a_obj_stairBlock_cpp); #pragma pop -/* 80CE8ECC-80CE8ED5 000110 0009+00 3/4 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80CE8ECC = "StaBlock"; -#pragma pop +/* 80CE8ECC-80CE8ECC 000110 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_stick/d_a_obj_stick.cpp b/rel/d/a/obj/d_a_obj_stick/d_a_obj_stick.cpp index f1ae1f7f518..4f10e94bc7c 100644 --- a/rel/d/a/obj/d_a_obj_stick/d_a_obj_stick.cpp +++ b/rel/d/a/obj/d_a_obj_stick/d_a_obj_stick.cpp @@ -244,6 +244,12 @@ extern "C" void __register_global_object(); // /* ############################################################################################## */ +/* 80599E68-80599E68 00002C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80599E68 = "Taro6"; +#pragma pop + /* 80599E70-80599EB0 000000 0040+00 2/2 0/0 0/0 .data mCcDSph__13daObj_Stick_c */ SECTION_DATA u8 daObj_Stick_c::mCcDSph[64] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -347,39 +353,39 @@ asm daObj_Stick_c::~daObj_Stick_c() { SECTION_RODATA u8 const daObj_Stick_Param_c::m[16] = { 0x00, 0x00, 0x00, 0x00, 0xC0, 0x40, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x42, 0xC8, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80599E3C, &daObj_Stick_Param_c::m); +COMPILER_STRIP_GATE(0x80599E3C, &daObj_Stick_Param_c::m); /* 80599E4C-80599E50 000010 0004+00 0/1 0/0 0/0 .rodata @3918 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3918 = -50.0f; -COMPILER_STRIP_GATE(80599E4C, &lit_3918); +COMPILER_STRIP_GATE(0x80599E4C, &lit_3918); #pragma pop /* 80599E50-80599E54 000014 0004+00 0/1 0/0 0/0 .rodata @3919 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3919 = -75.0f; -COMPILER_STRIP_GATE(80599E50, &lit_3919); +COMPILER_STRIP_GATE(0x80599E50, &lit_3919); #pragma pop /* 80599E54-80599E58 000018 0004+00 0/1 0/0 0/0 .rodata @3920 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3920 = 50.0f; -COMPILER_STRIP_GATE(80599E54, &lit_3920); +COMPILER_STRIP_GATE(0x80599E54, &lit_3920); #pragma pop /* 80599E58-80599E5C 00001C 0004+00 0/1 0/0 0/0 .rodata @3921 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3921 = 75.0f; -COMPILER_STRIP_GATE(80599E58, &lit_3921); +COMPILER_STRIP_GATE(0x80599E58, &lit_3921); #pragma pop /* 80599E5C-80599E60 000020 0004+00 1/3 0/0 0/0 .rodata @3922 */ SECTION_RODATA static f32 const lit_3922 = -1000000000.0f; -COMPILER_STRIP_GATE(80599E5C, &lit_3922); +COMPILER_STRIP_GATE(0x80599E5C, &lit_3922); /* 805993E8-805996BC 0002A8 02D4+00 1/1 0/0 0/0 .text create__13daObj_Stick_cFv */ #pragma push @@ -476,14 +482,14 @@ asm void daObj_Stick_c::Execute() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4045 = 20.0f; -COMPILER_STRIP_GATE(80599E60, &lit_4045); +COMPILER_STRIP_GATE(0x80599E60, &lit_4045); #pragma pop /* 80599E64-80599E68 000028 0004+00 0/1 0/0 0/0 .rodata @4046 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4046 = 1.0f; -COMPILER_STRIP_GATE(80599E64, &lit_4046); +COMPILER_STRIP_GATE(0x80599E64, &lit_4046); #pragma pop /* 80599A78-80599B3C 000938 00C4+00 1/1 0/0 0/0 .text Draw__13daObj_Stick_cFv */ @@ -639,7 +645,7 @@ asm void __sinit_d_a_obj_stick_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80599D5C = (void*)__sinit_d_a_obj_stick_cpp; +REGISTER_CTORS(0x80599D5C, __sinit_d_a_obj_stick_cpp); #pragma pop /* 80599DD0-80599E18 000C90 0048+00 2/1 0/0 0/0 .text __dt__19daObj_Stick_Param_cFv */ @@ -672,9 +678,4 @@ static asm void func_80599E20() { } #pragma pop -/* 80599E68-80599E6E 00002C 0006+00 1/1 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80599E68 = "Taro6"; -#pragma pop +/* 80599E68-80599E68 00002C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_stone/d_a_obj_stone.cpp b/rel/d/a/obj/d_a_obj_stone/d_a_obj_stone.cpp index c3e71cb13d9..57ba9e499c8 100644 --- a/rel/d/a/obj/d_a_obj_stone/d_a_obj_stone.cpp +++ b/rel/d/a/obj/d_a_obj_stone/d_a_obj_stone.cpp @@ -13,12 +13,12 @@ struct request_of_phase_process_class {}; -struct Quaternion {}; - struct csXyz { /* 802673F4 */ csXyz(s16, s16, s16); }; +struct Quaternion {}; + struct mDoMtx_stack_c { /* 8000CF44 */ void ZXYrotM(csXyz const&); /* 8000CF7C */ void quatM(Quaternion const*); @@ -441,7 +441,7 @@ extern "C" extern u8 data_80CECE10[4]; SECTION_RODATA static u8 const l_bmdIdx[8] = { 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x03, }; -COMPILER_STRIP_GATE(80CECAB4, &l_bmdIdx); +COMPILER_STRIP_GATE(0x80CECAB4, &l_bmdIdx); /* 80CECABC-80CECAFC 000008 0040+00 0/1 0/0 0/0 .rodata l_sph_src */ #pragma push @@ -452,7 +452,7 @@ SECTION_RODATA static u8 const l_sph_src[64] = { 0x00, 0x00, 0x00, 0x08, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0x48, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CECABC, &l_sph_src); +COMPILER_STRIP_GATE(0x80CECABC, &l_sph_src); #pragma pop /* 80CECAFC-80CECB04 000048 0008+00 0/3 0/0 0/0 .rodata l_r */ @@ -461,7 +461,7 @@ COMPILER_STRIP_GATE(80CECABC, &l_sph_src); SECTION_RODATA static u8 const l_r[8] = { 0x41, 0xF0, 0x00, 0x00, 0x42, 0x48, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CECAFC, &l_r); +COMPILER_STRIP_GATE(0x80CECAFC, &l_r); #pragma pop /* 80CECB04-80CECB0C 000050 0008+00 0/1 0/0 0/0 .rodata l_rolling_speedF */ @@ -470,7 +470,7 @@ COMPILER_STRIP_GATE(80CECAFC, &l_r); SECTION_RODATA static u8 const l_rolling_speedF[8] = { 0x41, 0x10, 0x00, 0x00, 0x41, 0x10, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CECB04, &l_rolling_speedF); +COMPILER_STRIP_GATE(0x80CECB04, &l_rolling_speedF); #pragma pop /* 80CECB0C-80CECB14 000058 0008+00 0/0 0/0 0/0 .rodata l_rolling_time */ @@ -479,14 +479,14 @@ COMPILER_STRIP_GATE(80CECB04, &l_rolling_speedF); SECTION_RODATA static u8 const l_rolling_time[8] = { 0x00, 0x00, 0x00, 0x1E, 0x00, 0x00, 0x00, 0x17, }; -COMPILER_STRIP_GATE(80CECB0C, &l_rolling_time); +COMPILER_STRIP_GATE(0x80CECB0C, &l_rolling_time); #pragma pop /* 80CECB14-80CECB1C 000060 0008+00 1/2 0/0 0/0 .rodata l_initial_offsetY */ SECTION_RODATA static u8 const l_initial_offsetY[8] = { 0x41, 0x20, 0x00, 0x00, 0x41, 0xA0, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CECB14, &l_initial_offsetY); +COMPILER_STRIP_GATE(0x80CECB14, &l_initial_offsetY); /* 80CECB1C-80CECB24 000068 0008+00 0/3 0/0 0/0 .rodata l_put_offsetY */ #pragma push @@ -494,7 +494,7 @@ COMPILER_STRIP_GATE(80CECB14, &l_initial_offsetY); SECTION_RODATA static u8 const l_put_offsetY[8] = { 0x41, 0xA0, 0x00, 0x00, 0x41, 0xF0, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CECB1C, &l_put_offsetY); +COMPILER_STRIP_GATE(0x80CECB1C, &l_put_offsetY); #pragma pop /* 80CECB24-80CECB28 000070 0002+02 1/2 0/0 0/0 .rodata l_weight */ @@ -503,7 +503,7 @@ SECTION_RODATA static u16 const l_weight[1 + 1 /* padding */] = { /* padding */ 0x0000, }; -COMPILER_STRIP_GATE(80CECB24, &l_weight); +COMPILER_STRIP_GATE(0x80CECB24, &l_weight); /* 80CECB28-80CECB30 000074 0008+00 0/1 0/0 0/0 .rodata l_speedH */ #pragma push @@ -511,7 +511,7 @@ COMPILER_STRIP_GATE(80CECB24, &l_weight); SECTION_RODATA static u8 const l_speedH[8] = { 0x42, 0x10, 0x00, 0x00, 0x42, 0x2C, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CECB28, &l_speedH); +COMPILER_STRIP_GATE(0x80CECB28, &l_speedH); #pragma pop /* 80CECB30-80CECB38 00007C 0008+00 0/1 0/0 0/0 .rodata l_speedV */ @@ -520,7 +520,7 @@ COMPILER_STRIP_GATE(80CECB28, &l_speedH); SECTION_RODATA static u8 const l_speedV[8] = { 0x41, 0xD8, 0x00, 0x00, 0x41, 0xB0, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CECB30, &l_speedV); +COMPILER_STRIP_GATE(0x80CECB30, &l_speedV); #pragma pop /* 80CECB38-80CECB40 000084 0008+00 0/1 0/0 0/0 .rodata l_water_speedH */ @@ -529,7 +529,7 @@ COMPILER_STRIP_GATE(80CECB30, &l_speedV); SECTION_RODATA static u8 const l_water_speedH[8] = { 0x40, 0xA0, 0x00, 0x00, 0x40, 0xA0, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CECB38, &l_water_speedH); +COMPILER_STRIP_GATE(0x80CECB38, &l_water_speedH); #pragma pop /* 80CECB40-80CECB48 00008C 0008+00 0/1 0/0 0/0 .rodata l_water_speedV */ @@ -538,7 +538,7 @@ COMPILER_STRIP_GATE(80CECB38, &l_water_speedH); SECTION_RODATA static u8 const l_water_speedV[8] = { 0x40, 0xA0, 0x00, 0x00, 0x40, 0xA0, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CECB40, &l_water_speedV); +COMPILER_STRIP_GATE(0x80CECB40, &l_water_speedV); #pragma pop /* 80CECB48-80CECB50 000094 0008+00 0/1 0/0 0/0 .rodata l_water_resist */ @@ -547,7 +547,7 @@ COMPILER_STRIP_GATE(80CECB40, &l_water_speedV); SECTION_RODATA static u8 const l_water_resist[8] = { 0x3C, 0xA3, 0xD7, 0x0A, 0x3C, 0xA3, 0xD7, 0x0A, }; -COMPILER_STRIP_GATE(80CECB48, &l_water_resist); +COMPILER_STRIP_GATE(0x80CECB48, &l_water_resist); #pragma pop /* 80CECB50-80CECB58 00009C 0008+00 0/1 0/0 0/0 .rodata l_water_walk_resist */ @@ -556,7 +556,7 @@ COMPILER_STRIP_GATE(80CECB48, &l_water_resist); SECTION_RODATA static u8 const l_water_walk_resist[8] = { 0x3E, 0x19, 0x99, 0x9A, 0x3E, 0x19, 0x99, 0x9A, }; -COMPILER_STRIP_GATE(80CECB50, &l_water_walk_resist); +COMPILER_STRIP_GATE(0x80CECB50, &l_water_walk_resist); #pragma pop /* 80CECB58-80CECB60 0000A4 0008+00 0/2 0/0 0/0 .rodata l_buoyancy */ @@ -565,14 +565,14 @@ COMPILER_STRIP_GATE(80CECB50, &l_water_walk_resist); SECTION_RODATA static u8 const l_buoyancy[8] = { 0x40, 0xBC, 0xCC, 0xCD, 0x40, 0xBC, 0xCC, 0xCD, }; -COMPILER_STRIP_GATE(80CECB58, &l_buoyancy); +COMPILER_STRIP_GATE(0x80CECB58, &l_buoyancy); #pragma pop /* 80CECB60-80CECB68 0000AC 0008+00 1/1 0/0 0/0 .rodata l_shadow_size */ SECTION_RODATA static u8 const l_shadow_size[8] = { 0x42, 0x20, 0x00, 0x00, 0x42, 0x82, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CECB60, &l_shadow_size); +COMPILER_STRIP_GATE(0x80CECB60, &l_shadow_size); /* 80CECB68-80CECB70 0000B4 0008+00 0/1 0/0 0/0 .rodata l_wpillar_scl */ #pragma push @@ -580,7 +580,7 @@ COMPILER_STRIP_GATE(80CECB60, &l_shadow_size); SECTION_RODATA static u8 const l_wpillar_scl[8] = { 0x3F, 0x26, 0x66, 0x66, 0x3F, 0x8C, 0xCC, 0xCD, }; -COMPILER_STRIP_GATE(80CECB68, &l_wpillar_scl); +COMPILER_STRIP_GATE(0x80CECB68, &l_wpillar_scl); #pragma pop /* 80CECB70-80CECB78 0000BC 0008+00 0/1 0/0 0/0 .rodata l_hamon_scl */ @@ -589,7 +589,7 @@ COMPILER_STRIP_GATE(80CECB68, &l_wpillar_scl); SECTION_RODATA static u8 const l_hamon_scl[8] = { 0x3F, 0x33, 0x33, 0x33, 0x3F, 0x99, 0x99, 0x9A, }; -COMPILER_STRIP_GATE(80CECB70, &l_hamon_scl); +COMPILER_STRIP_GATE(0x80CECB70, &l_hamon_scl); #pragma pop /* 80CECB78-80CECB80 0000C4 0008+00 0/1 0/0 0/0 .rodata l_yogan_eff_scl */ @@ -598,7 +598,7 @@ COMPILER_STRIP_GATE(80CECB70, &l_hamon_scl); SECTION_RODATA static u8 const l_yogan_eff_scl[8] = { 0x3F, 0x19, 0x99, 0x9A, 0x3F, 0x8C, 0xCC, 0xCD, }; -COMPILER_STRIP_GATE(80CECB78, &l_yogan_eff_scl); +COMPILER_STRIP_GATE(0x80CECB78, &l_yogan_eff_scl); #pragma pop /* 80CECB80-80CECB88 0000CC 0008+00 0/1 0/0 0/0 .rodata l_wall_h */ @@ -607,7 +607,7 @@ COMPILER_STRIP_GATE(80CECB78, &l_yogan_eff_scl); SECTION_RODATA static u8 const l_wall_h[8] = { 0x41, 0xF0, 0x00, 0x00, 0x42, 0x48, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CECB80, &l_wall_h); +COMPILER_STRIP_GATE(0x80CECB80, &l_wall_h); #pragma pop /* 80CECB88-80CECB90 0000D4 0008+00 0/1 0/0 0/0 .rodata l_wall_r */ @@ -616,21 +616,21 @@ COMPILER_STRIP_GATE(80CECB80, &l_wall_h); SECTION_RODATA static u8 const l_wall_r[8] = { 0x41, 0xF0, 0x00, 0x00, 0x42, 0x48, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CECB88, &l_wall_r); +COMPILER_STRIP_GATE(0x80CECB88, &l_wall_r); #pragma pop /* 80CECB90-80CECB94 0000DC 0004+00 0/1 0/0 0/0 .rodata l_rot_angle */ #pragma push #pragma force_active on SECTION_RODATA static u32 const l_rot_angle = 0x00230012; -COMPILER_STRIP_GATE(80CECB90, &l_rot_angle); +COMPILER_STRIP_GATE(0x80CECB90, &l_rot_angle); #pragma pop /* 80CECB94-80CECB98 0000E0 0004+00 0/1 0/0 0/0 .rodata l_walk_rot_angle */ #pragma push #pragma force_active on SECTION_RODATA static u32 const l_walk_rot_angle = 0x00280028; -COMPILER_STRIP_GATE(80CECB94, &l_walk_rot_angle); +COMPILER_STRIP_GATE(0x80CECB94, &l_walk_rot_angle); #pragma pop /* 80CECB98-80CECB9C 0000E4 0004+00 0/7 0/0 0/0 .rodata @3746 */ @@ -642,7 +642,7 @@ SECTION_RODATA static u8 const lit_3746[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CECB98, &lit_3746); +COMPILER_STRIP_GATE(0x80CECB98, &lit_3746); #pragma pop /* 80CECB9C-80CECBA4 0000E8 0008+00 0/4 0/0 0/0 .rodata @3747 */ @@ -651,7 +651,7 @@ COMPILER_STRIP_GATE(80CECB98, &lit_3746); SECTION_RODATA static u8 const lit_3747[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CECB9C, &lit_3747); +COMPILER_STRIP_GATE(0x80CECB9C, &lit_3747); #pragma pop /* 80CECBA4-80CECBAC 0000F0 0008+00 0/4 0/0 0/0 .rodata @3748 */ @@ -660,7 +660,7 @@ COMPILER_STRIP_GATE(80CECB9C, &lit_3747); SECTION_RODATA static u8 const lit_3748[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CECBA4, &lit_3748); +COMPILER_STRIP_GATE(0x80CECBA4, &lit_3748); #pragma pop /* 80CECBAC-80CECBB4 0000F8 0008+00 0/4 0/0 0/0 .rodata @3749 */ @@ -669,7 +669,14 @@ COMPILER_STRIP_GATE(80CECBA4, &lit_3748); SECTION_RODATA static u8 const lit_3749[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CECBAC, &lit_3749); +COMPILER_STRIP_GATE(0x80CECBAC, &lit_3749); +#pragma pop + +/* 80CECC3C-80CECC3C 000188 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80CECC3C = "D_Srock"; +SECTION_DEAD static char const* const stringBase_80CECC44 = "D_Brock"; #pragma pop /* 80CECC54-80CECC60 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ @@ -927,12 +934,12 @@ asm void daObjStone_c::setBaseMtx() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3844 = 6.0f / 5.0f; -COMPILER_STRIP_GATE(80CECBB4, &lit_3844); +COMPILER_STRIP_GATE(0x80CECBB4, &lit_3844); #pragma pop /* 80CECBB8-80CECBBC 000104 0004+00 2/8 0/0 0/0 .rodata @3845 */ SECTION_RODATA static f32 const lit_3845 = 1.0f; -COMPILER_STRIP_GATE(80CECBB8, &lit_3845); +COMPILER_STRIP_GATE(0x80CECBB8, &lit_3845); /* 80CE9540-80CE97C0 000540 0280+00 1/1 0/0 0/0 .text Create__12daObjStone_cFv */ #pragma push @@ -1017,7 +1024,7 @@ asm dBgS_ObjAcch::~dBgS_ObjAcch() { /* ############################################################################################## */ /* 80CECBBC-80CECBC0 000108 0004+00 1/3 0/0 0/0 .rodata @4010 */ SECTION_RODATA static f32 const lit_4010 = -6.0f; -COMPILER_STRIP_GATE(80CECBBC, &lit_4010); +COMPILER_STRIP_GATE(0x80CECBBC, &lit_4010); /* 80CE9BA0-80CE9CF8 000BA0 0158+00 1/1 0/0 0/0 .text execute__12daObjStone_cFv */ #pragma push @@ -1034,88 +1041,88 @@ asm void daObjStone_c::execute() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4632 = 2.0f; -COMPILER_STRIP_GATE(80CECBC0, &lit_4632); +COMPILER_STRIP_GATE(0x80CECBC0, &lit_4632); #pragma pop /* 80CECBC4-80CECBC8 000110 0004+00 0/1 0/0 0/0 .rodata @4633 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4633 = 2.0f / 5.0f; -COMPILER_STRIP_GATE(80CECBC4, &lit_4633); +COMPILER_STRIP_GATE(0x80CECBC4, &lit_4633); #pragma pop /* 80CECBC8-80CECBCC 000114 0004+00 0/5 0/0 0/0 .rodata @4634 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4634 = 0.5f; -COMPILER_STRIP_GATE(80CECBC8, &lit_4634); +COMPILER_STRIP_GATE(0x80CECBC8, &lit_4634); #pragma pop /* 80CECBCC-80CECBD0 000118 0004+00 0/2 0/0 0/0 .rodata @4635 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4635 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(80CECBCC, &lit_4635); +COMPILER_STRIP_GATE(0x80CECBCC, &lit_4635); #pragma pop /* 80CECBD0-80CECBD4 00011C 0004+00 0/1 0/0 0/0 .rodata @4636 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4636 = -100000.0f; -COMPILER_STRIP_GATE(80CECBD0, &lit_4636); +COMPILER_STRIP_GATE(0x80CECBD0, &lit_4636); #pragma pop /* 80CECBD4-80CECBD8 000120 0004+00 0/3 0/0 0/0 .rodata @4637 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4637 = -1000000000.0f; -COMPILER_STRIP_GATE(80CECBD4, &lit_4637); +COMPILER_STRIP_GATE(0x80CECBD4, &lit_4637); #pragma pop /* 80CECBD8-80CECBDC 000124 0004+00 0/1 0/0 0/0 .rodata @4638 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4638 = 60.0f; -COMPILER_STRIP_GATE(80CECBD8, &lit_4638); +COMPILER_STRIP_GATE(0x80CECBD8, &lit_4638); #pragma pop /* 80CECBDC-80CECBE0 000128 0004+00 0/1 0/0 0/0 .rodata @4639 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4639 = 100.0f; -COMPILER_STRIP_GATE(80CECBDC, &lit_4639); +COMPILER_STRIP_GATE(0x80CECBDC, &lit_4639); #pragma pop /* 80CECBE0-80CECBE4 00012C 0004+00 1/4 0/0 0/0 .rodata @4640 */ SECTION_RODATA static f32 const lit_4640 = -1.0f; -COMPILER_STRIP_GATE(80CECBE0, &lit_4640); +COMPILER_STRIP_GATE(0x80CECBE0, &lit_4640); /* 80CECBE4-80CECBE8 000130 0004+00 0/1 0/0 0/0 .rodata @4641 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4641 = 90.0f; -COMPILER_STRIP_GATE(80CECBE4, &lit_4641); +COMPILER_STRIP_GATE(0x80CECBE4, &lit_4641); #pragma pop /* 80CECBE8-80CECBEC 000134 0004+00 0/2 0/0 0/0 .rodata @4642 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4642 = -10.0f; -COMPILER_STRIP_GATE(80CECBE8, &lit_4642); +COMPILER_STRIP_GATE(0x80CECBE8, &lit_4642); #pragma pop /* 80CECBEC-80CECBF0 000138 0004+00 0/3 0/0 0/0 .rodata @4643 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4643 = 10.0f; -COMPILER_STRIP_GATE(80CECBEC, &lit_4643); +COMPILER_STRIP_GATE(0x80CECBEC, &lit_4643); #pragma pop /* 80CECBF0-80CECBF4 00013C 0004+00 0/3 0/0 0/0 .rodata @4644 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4644 = 50.0f; -COMPILER_STRIP_GATE(80CECBF0, &lit_4644); +COMPILER_STRIP_GATE(0x80CECBF0, &lit_4644); #pragma pop /* 80CE9CF8-80CEAF10 000CF8 1218+00 1/1 0/0 0/0 .text mode_proc_call__12daObjStone_cFv */ @@ -1174,14 +1181,14 @@ asm void daObjStone_c::init_modeWait() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4678 = 19.0f / 20.0f; -COMPILER_STRIP_GATE(80CECBF4, &lit_4678); +COMPILER_STRIP_GATE(0x80CECBF4, &lit_4678); #pragma pop /* 80CECBF8-80CECBFC 000144 0004+00 0/2 0/0 0/0 .rodata @4679 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4679 = 8.0f; -COMPILER_STRIP_GATE(80CECBF8, &lit_4679); +COMPILER_STRIP_GATE(0x80CECBF8, &lit_4679); #pragma pop /* 80CEB01C-80CEB0B8 00201C 009C+00 1/0 0/0 0/0 .text modeWait__12daObjStone_cFv */ @@ -1229,7 +1236,7 @@ asm void daObjStone_c::init_modeCarry() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4829 = 0.25f; -COMPILER_STRIP_GATE(80CECBFC, &lit_4829); +COMPILER_STRIP_GATE(0x80CECBFC, &lit_4829); #pragma pop /* 80CEB480-80CEB6E8 002480 0268+00 1/0 0/0 0/0 .text modeCarry__12daObjStone_cFv */ @@ -1257,28 +1264,28 @@ asm void daObjStone_c::init_modeWalk() { #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_5018 = 0x467BBBBC; -COMPILER_STRIP_GATE(80CECC00, &lit_5018); +COMPILER_STRIP_GATE(0x80CECC00, &lit_5018); #pragma pop /* 80CECC04-80CECC08 000150 0004+00 0/1 0/0 0/0 .rodata @5019 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5019 = 4.0f / 5.0f; -COMPILER_STRIP_GATE(80CECC04, &lit_5019); +COMPILER_STRIP_GATE(0x80CECC04, &lit_5019); #pragma pop /* 80CECC08-80CECC0C 000154 0004+00 0/1 0/0 0/0 .rodata @5020 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_5020 = 0x3C23D70B; -COMPILER_STRIP_GATE(80CECC08, &lit_5020); +COMPILER_STRIP_GATE(0x80CECC08, &lit_5020); #pragma pop /* 80CECC0C-80CECC10 000158 0004+00 0/1 0/0 0/0 .rodata @5021 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5021 = 9.0f / 10.0f; -COMPILER_STRIP_GATE(80CECC0C, &lit_5021); +COMPILER_STRIP_GATE(0x80CECC0C, &lit_5021); #pragma pop /* 80CEB720-80CEBCDC 002720 05BC+00 1/0 0/0 0/0 .text modeWalk__12daObjStone_cFv */ @@ -1307,14 +1314,14 @@ asm void daObjStone_c::init_modePushWolfNonBreak() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5063 = -2.0f / 5.0f; -COMPILER_STRIP_GATE(80CECC10, &lit_5063); +COMPILER_STRIP_GATE(0x80CECC10, &lit_5063); #pragma pop /* 80CECC14-80CECC18 000160 0004+00 0/1 0/0 0/0 .rodata @5064 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5064 = -2.0f; -COMPILER_STRIP_GATE(80CECC14, &lit_5064); +COMPILER_STRIP_GATE(0x80CECC14, &lit_5064); #pragma pop /* 80CEBE24-80CEBE84 002E24 0060+00 1/1 0/0 0/0 .text init_modeYogan__12daObjStone_cFv */ @@ -1330,11 +1337,11 @@ asm void daObjStone_c::init_modeYogan() { /* ############################################################################################## */ /* 80CECC18-80CECC1C 000164 0004+00 1/1 0/0 0/0 .rodata @5074 */ SECTION_RODATA static f32 const lit_5074 = 200.0f; -COMPILER_STRIP_GATE(80CECC18, &lit_5074); +COMPILER_STRIP_GATE(0x80CECC18, &lit_5074); /* 80CECC1C-80CECC20 000168 0004+00 1/1 0/0 0/0 .rodata @5075 */ SECTION_RODATA static f32 const lit_5075 = 13.0f / 20.0f; -COMPILER_STRIP_GATE(80CECC1C, &lit_5075); +COMPILER_STRIP_GATE(0x80CECC1C, &lit_5075); /* 80CEBE84-80CEBF1C 002E84 0098+00 1/0 0/0 0/0 .text modeYogan__12daObjStone_cFv */ #pragma push @@ -1365,7 +1372,13 @@ SECTION_RODATA static u8 const l_eff_id[6 + 6 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CECC20, &l_eff_id); +COMPILER_STRIP_GATE(0x80CECC20, &l_eff_id); +#pragma pop + +/* 80CECC3C-80CECC3C 000188 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80CECC4C = "Always"; #pragma pop /* 80CEBF1C-80CEC180 002F1C 0264+00 1/1 0/0 0/0 .text init_modeBreak__12daObjStone_cFv */ @@ -1415,7 +1428,7 @@ asm void daObjStone_c::createItem() { SECTION_RODATA static u8 const lit_5256[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CECC2C, &lit_5256); +COMPILER_STRIP_GATE(0x80CECC2C, &lit_5256); #pragma pop /* 80CEC33C-80CEC5BC 00333C 0280+00 2/2 0/0 0/0 .text calcRotBaseMtx__12daObjStone_cFPs @@ -1454,7 +1467,7 @@ SECTION_RODATA static u8 const l_carry_eff_id[6 + 2 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CECC34, &l_carry_eff_id); +COMPILER_STRIP_GATE(0x80CECC34, &l_carry_eff_id); #pragma pop /* 80CEC6D8-80CEC7DC 0036D8 0104+00 1/1 0/0 0/0 .text set_carry_eff__12daObjStone_cFv */ @@ -1600,11 +1613,4 @@ static asm void func_80CECAA4() { } #pragma pop -/* 80CECC3C-80CECC53 000188 0017+00 2/1 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80CECC3C = "D_Srock"; -SECTION_DEAD static char const* const stringBase_80CECC44 = "D_Brock"; -SECTION_DEAD static char const* const stringBase_80CECC4C = "Always"; -#pragma pop +/* 80CECC3C-80CECC3C 000188 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_stonemark/d_a_obj_stoneMark.cpp b/rel/d/a/obj/d_a_obj_stonemark/d_a_obj_stoneMark.cpp index 2bb3104d4d6..b9acbbe1acd 100644 --- a/rel/d/a/obj/d_a_obj_stonemark/d_a_obj_stoneMark.cpp +++ b/rel/d/a/obj/d_a_obj_stonemark/d_a_obj_stoneMark.cpp @@ -160,20 +160,26 @@ SECTION_RODATA static u8 const lit_3642[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(8059A3E8, &lit_3642); +COMPILER_STRIP_GATE(0x8059A3E8, &lit_3642); /* 8059A3EC-8059A3F0 000004 0004+00 0/1 0/0 0/0 .rodata @3643 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3643 = 100.0f; -COMPILER_STRIP_GATE(8059A3EC, &lit_3643); +COMPILER_STRIP_GATE(0x8059A3EC, &lit_3643); #pragma pop /* 8059A3F0-8059A3F4 000008 0004+00 0/1 0/0 0/0 .rodata @3644 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3644 = 30.0f; -COMPILER_STRIP_GATE(8059A3F0, &lit_3644); +COMPILER_STRIP_GATE(0x8059A3F0, &lit_3644); +#pragma pop + +/* 8059A404-8059A404 00001C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8059A404 = "A_IwaAto"; #pragma pop /* 8059A410-8059A414 -00001 0004+00 3/3 0/0 0/0 .data l_arcName */ @@ -252,21 +258,21 @@ asm dBgS_ObjAcch::~dBgS_ObjAcch() { SECTION_RODATA static u8 const l_shadow_size[8] = { 0x42, 0x5C, 0x00, 0x00, 0x42, 0xAA, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8059A3F4, &l_shadow_size); +COMPILER_STRIP_GATE(0x8059A3F4, &l_shadow_size); #pragma pop /* 8059A3FC-8059A400 000014 0004+00 0/1 0/0 0/0 .rodata @3718 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3718 = -3.0f / 5.0f; -COMPILER_STRIP_GATE(8059A3FC, &lit_3718); +COMPILER_STRIP_GATE(0x8059A3FC, &lit_3718); #pragma pop /* 8059A400-8059A404 000018 0004+00 0/1 0/0 0/0 .rodata @3719 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_3719 = 0x3ECCCCCC; -COMPILER_STRIP_GATE(8059A400, &lit_3719); +COMPILER_STRIP_GATE(0x8059A400, &lit_3719); #pragma pop /* 8059A2CC-8059A33C 00032C 0070+00 1/1 0/0 0/0 .text draw__12daObjSMark_cFv */ @@ -342,9 +348,4 @@ static asm void func_8059A3D8() { } #pragma pop -/* 8059A404-8059A40D 00001C 0009+00 1/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_8059A404 = "A_IwaAto"; -#pragma pop +/* 8059A404-8059A404 00001C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_stopper/d_a_obj_stopper.cpp b/rel/d/a/obj/d_a_obj_stopper/d_a_obj_stopper.cpp index 17b30a8af19..500f0e7ccd6 100644 --- a/rel/d/a/obj/d_a_obj_stopper/d_a_obj_stopper.cpp +++ b/rel/d/a/obj/d_a_obj_stopper/d_a_obj_stopper.cpp @@ -75,10 +75,10 @@ struct dPa_followEcallBack { /* 80CED4C8 */ void __defctor(); }; -struct _GXColor {}; - struct csXyz {}; +struct _GXColor {}; + struct dPa_control_c { /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, @@ -158,10 +158,10 @@ struct cCcD_GStts { /* 80CEEE7C */ ~cCcD_GStts(); }; -struct Vec {}; - struct JAISoundID {}; +struct Vec {}; + struct Z2SeMgr { /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); }; @@ -230,8 +230,8 @@ extern "C" void execute__18JPAEmitterCallBackFP14JPABaseEmitter(); extern "C" void executeAfter__18JPAEmitterCallBackFP14JPABaseEmitter(); extern "C" void draw__18JPAEmitterCallBackFP14JPABaseEmitter(); extern "C" void drawAfter__18JPAEmitterCallBackFP14JPABaseEmitter(); -extern "C" void func_80CEEF48(u16*); -extern "C" void func_80CEEF64(u8*); +extern "C" void func_80CEEF48(void* _this, u16*); +extern "C" void func_80CEEF64(void* _this, u8*); extern "C" static void func_80CEEF80(); extern "C" static void func_80CEEF88(); extern "C" extern char const* const d_a_obj_stopper__stringBase0; @@ -312,6 +312,13 @@ extern "C" void __register_global_object(); // Declarations: // +/* ############################################################################################## */ +/* 80CEEFF0-80CEEFF0 000050 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80CEEFF0 = "door-stop.bmd"; +#pragma pop + /* 80CECF0C-80CECF34 0000EC 0028+00 1/1 0/0 0/0 .text getStopModelData__Fv */ #pragma push #pragma optimization_level 0 @@ -330,11 +337,11 @@ SECTION_RODATA static u8 const lit_3635[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CEEFA0, &lit_3635); +COMPILER_STRIP_GATE(0x80CEEFA0, &lit_3635); /* 80CEEFA4-80CEEFA8 000004 0004+00 1/1 0/0 0/0 .rodata @3636 */ SECTION_RODATA static f32 const lit_3636 = 100.0f; -COMPILER_STRIP_GATE(80CEEFA4, &lit_3636); +COMPILER_STRIP_GATE(0x80CEEFA4, &lit_3636); /* 80CEF1E8-80CEF1EC 000008 0001+03 1/1 0/0 0/0 .bss @1109 */ static u8 lit_1109[1 + 3 /* padding */]; @@ -474,20 +481,20 @@ asm void daObjStopper_c::setBaseMtx() { /* ############################################################################################## */ /* 80CEEFA8-80CEEFAC 000008 0004+00 1/2 0/0 0/0 .rodata @3692 */ SECTION_RODATA static f32 const lit_3692 = 300.0f; -COMPILER_STRIP_GATE(80CEEFA8, &lit_3692); +COMPILER_STRIP_GATE(0x80CEEFA8, &lit_3692); /* 80CEEFAC-80CEEFB0 00000C 0004+00 0/1 0/0 0/0 .rodata @3693 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3693 = 30.0f; -COMPILER_STRIP_GATE(80CEEFAC, &lit_3693); +COMPILER_STRIP_GATE(0x80CEEFAC, &lit_3693); #pragma pop /* 80CEEFB0-80CEEFB4 000010 0004+00 0/2 0/0 0/0 .rodata @3694 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3694 = 2.0f; -COMPILER_STRIP_GATE(80CEEFB0, &lit_3694); +COMPILER_STRIP_GATE(0x80CEEFB0, &lit_3694); #pragma pop /* 80CED0B8-80CED20C 000298 0154+00 1/0 0/0 0/0 .text Create__14daObjStopper_cFv */ @@ -835,46 +842,46 @@ asm void daObjStopper_c::action() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3876 = 1.0f / 20.0f; -COMPILER_STRIP_GATE(80CEEFB4, &lit_3876); +COMPILER_STRIP_GATE(0x80CEEFB4, &lit_3876); #pragma pop /* 80CEEFB8-80CEEFBC 000018 0004+00 2/6 0/0 0/0 .rodata @3877 */ SECTION_RODATA static f32 const lit_3877 = 1.0f; -COMPILER_STRIP_GATE(80CEEFB8, &lit_3877); +COMPILER_STRIP_GATE(0x80CEEFB8, &lit_3877); /* 80CEEFBC-80CEEFC0 00001C 0004+00 0/1 0/0 0/0 .rodata @3878 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3878 = -0.25f; -COMPILER_STRIP_GATE(80CEEFBC, &lit_3878); +COMPILER_STRIP_GATE(0x80CEEFBC, &lit_3878); #pragma pop /* 80CEEFC0-80CEEFC4 000020 0004+00 0/1 0/0 0/0 .rodata @3879 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3879 = 25.0f; -COMPILER_STRIP_GATE(80CEEFC0, &lit_3879); +COMPILER_STRIP_GATE(0x80CEEFC0, &lit_3879); #pragma pop /* 80CEEFC4-80CEEFC8 000024 0004+00 0/1 0/0 0/0 .rodata @3880 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3880 = 17.0f / 10.0f; -COMPILER_STRIP_GATE(80CEEFC4, &lit_3880); +COMPILER_STRIP_GATE(0x80CEEFC4, &lit_3880); #pragma pop /* 80CEEFC8-80CEEFCC 000028 0004+00 0/2 0/0 0/0 .rodata @3881 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3881 = 60.0f; -COMPILER_STRIP_GATE(80CEEFC8, &lit_3881); +COMPILER_STRIP_GATE(0x80CEEFC8, &lit_3881); #pragma pop /* 80CEEFCC-80CEEFD0 00002C 0004+00 0/2 0/0 0/0 .rodata @3882 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3882 = 350.0f; -COMPILER_STRIP_GATE(80CEEFCC, &lit_3882); +COMPILER_STRIP_GATE(0x80CEEFCC, &lit_3882); #pragma pop /* 80CED824-80CEDA24 000A04 0200+00 1/0 0/0 0/0 .text actionWait__14daObjStopper_cFv */ @@ -910,7 +917,7 @@ asm void daObjStopper_c::actionOrderEvent() { /* ############################################################################################## */ /* 80CEEFD0-80CEEFD4 000030 0004+00 2/5 0/0 0/0 .rodata @4025 */ SECTION_RODATA static f32 const lit_4025 = -1.0f; -COMPILER_STRIP_GATE(80CEEFD0, &lit_4025); +COMPILER_STRIP_GATE(0x80CEEFD0, &lit_4025); /* 80CEDB2C-80CEE048 000D0C 051C+00 1/0 0/0 0/0 .text actionEvent__14daObjStopper_cFv */ #pragma push @@ -954,7 +961,7 @@ asm void daObjStopper_c::actionCloseInit() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4053 = 6.0f; -COMPILER_STRIP_GATE(80CEEFD4, &lit_4053); +COMPILER_STRIP_GATE(0x80CEEFD4, &lit_4053); #pragma pop /* 80CEE0E0-80CEE148 0012C0 0068+00 1/0 0/0 0/0 .text actionClose__14daObjStopper_cFv */ @@ -976,7 +983,7 @@ SECTION_RODATA static f32 const lit_4166[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80CEEFD8, &lit_4166); +COMPILER_STRIP_GATE(0x80CEEFD8, &lit_4166); #pragma pop /* 80CEEFE0-80CEEFE8 000040 0008+00 0/3 0/0 0/0 .rodata @4168 */ @@ -985,7 +992,7 @@ COMPILER_STRIP_GATE(80CEEFD8, &lit_4166); SECTION_RODATA static u8 const lit_4168[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CEEFE0, &lit_4168); +COMPILER_STRIP_GATE(0x80CEEFE0, &lit_4168); #pragma pop /* 80CEE148-80CEE5D0 001328 0488+00 1/1 0/0 0/0 .text hint_action1__14daObjStopper_cFv */ @@ -1013,14 +1020,14 @@ asm void daObjStopper_c::hint_action2() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4311 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(80CEEFE8, &lit_4311); +COMPILER_STRIP_GATE(0x80CEEFE8, &lit_4311); #pragma pop /* 80CEEFEC-80CEEFF0 00004C 0004+00 0/1 0/0 0/0 .rodata @4312 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4312 = 115.0f; -COMPILER_STRIP_GATE(80CEEFEC, &lit_4312); +COMPILER_STRIP_GATE(0x80CEEFEC, &lit_4312); #pragma pop /* 80CEEA28-80CEECFC 001C08 02D4+00 1/1 0/0 0/0 .text hint_action3__14daObjStopper_cFv */ @@ -1142,7 +1149,7 @@ void JPAEmitterCallBack::drawAfter(JPABaseEmitter* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80CEEF48(u16* param_0) { +extern "C" asm void func_80CEEF48(void* _this, u16* param_0) { nofralloc #include "asm/rel/d/a/obj/d_a_obj_stopper/d_a_obj_stopper/func_80CEEF48.s" } @@ -1152,7 +1159,7 @@ extern "C" asm void func_80CEEF48(u16* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80CEEF64(u8* param_0) { +extern "C" asm void func_80CEEF64(void* _this, u8* param_0) { nofralloc #include "asm/rel/d/a/obj/d_a_obj_stopper/d_a_obj_stopper/func_80CEEF64.s" } @@ -1350,9 +1357,4 @@ static u8 data_80CEF2A4[4]; static u8 data_80CEF2A8[4]; #pragma pop -/* 80CEEFF0-80CEEFFE 000050 000E+00 1/1 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80CEEFF0 = "door-stop.bmd"; -#pragma pop +/* 80CEEFF0-80CEEFF0 000050 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_stopper2/d_a_obj_stopper2.cpp b/rel/d/a/obj/d_a_obj_stopper2/d_a_obj_stopper2.cpp index 540b400b2c1..4104e91737b 100644 --- a/rel/d/a/obj/d_a_obj_stopper2/d_a_obj_stopper2.cpp +++ b/rel/d/a/obj/d_a_obj_stopper2/d_a_obj_stopper2.cpp @@ -71,10 +71,10 @@ struct dEvent_manager_c { /* 8004817C */ void cutEnd(int); }; -struct Vec {}; - struct JAISoundID {}; +struct Vec {}; + struct Z2SeMgr { /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); }; @@ -111,7 +111,7 @@ extern "C" static void daObjStopper2_Draw__FP15daObjStopper2_c(); extern "C" static void daObjStopper2_Execute__FP15daObjStopper2_c(); extern "C" static void daObjStopper2_Delete__FP15daObjStopper2_c(); extern "C" static void daObjStopper2_Create__FP15daObjStopper2_c(); -extern "C" void func_80CEFE6C(u8*); +extern "C" void func_80CEFE6C(void* _this, u8*); extern "C" extern char const* const d_a_obj_stopper2__stringBase0; extern "C" extern void* g_profile_Obj_Stopper2[12]; @@ -175,6 +175,19 @@ static asm void CheckCreateHeap(fopAc_ac_c* param_0) { } #pragma pop +/* ############################################################################################## */ +/* 80CEFEB0-80CEFEB0 000020 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80CEFEB0 = "Stop00"; +SECTION_DEAD static char const* const stringBase_80CEFEB7 = "STOP_OPEN"; +SECTION_DEAD static char const* const stringBase_80CEFEC1 = "STOP_CLOSE"; +SECTION_DEAD static char const* const stringBase_80CEFECC = "STOP_OPEN2"; +SECTION_DEAD static char const* const stringBase_80CEFED7 = "STOP_CLOSE2"; +SECTION_DEAD static char const* const stringBase_80CEFEE3 = "dstop"; +SECTION_DEAD static char const* const stringBase_80CEFEE9 = "door-stop.bmd"; +#pragma pop + /* 80CEF358-80CEF368 000098 0010+00 1/1 0/0 0/0 .text getStopName__Fv */ #pragma push #pragma optimization_level 0 @@ -234,11 +247,11 @@ SECTION_RODATA static u8 const lit_3722[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CEFE90, &lit_3722); +COMPILER_STRIP_GATE(0x80CEFE90, &lit_3722); /* 80CEFE94-80CEFE98 000004 0004+00 1/1 0/0 0/0 .rodata @3723 */ SECTION_RODATA static f32 const lit_3723 = 150.0f; -COMPILER_STRIP_GATE(80CEFE94, &lit_3723); +COMPILER_STRIP_GATE(0x80CEFE94, &lit_3723); /* 80CEFF04-80CEFF10 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { @@ -413,42 +426,49 @@ void daObjStopper2_c::actionDead() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3921 = 1.0f; -COMPILER_STRIP_GATE(80CEFE98, &lit_3921); +COMPILER_STRIP_GATE(0x80CEFE98, &lit_3921); #pragma pop /* 80CEFE9C-80CEFEA0 00000C 0004+00 0/1 0/0 0/0 .rodata @3922 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3922 = -1.0f; -COMPILER_STRIP_GATE(80CEFE9C, &lit_3922); +COMPILER_STRIP_GATE(0x80CEFE9C, &lit_3922); #pragma pop /* 80CEFEA0-80CEFEA4 000010 0004+00 0/1 0/0 0/0 .rodata @3923 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3923 = 30.0f; -COMPILER_STRIP_GATE(80CEFEA0, &lit_3923); +COMPILER_STRIP_GATE(0x80CEFEA0, &lit_3923); #pragma pop /* 80CEFEA4-80CEFEA8 000014 0004+00 0/1 0/0 0/0 .rodata @3924 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3924 = 4.0f; -COMPILER_STRIP_GATE(80CEFEA4, &lit_3924); +COMPILER_STRIP_GATE(0x80CEFEA4, &lit_3924); #pragma pop /* 80CEFEA8-80CEFEAC 000018 0004+00 0/1 0/0 0/0 .rodata @3925 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3925 = 60.0f; -COMPILER_STRIP_GATE(80CEFEA8, &lit_3925); +COMPILER_STRIP_GATE(0x80CEFEA8, &lit_3925); #pragma pop /* 80CEFEAC-80CEFEB0 00001C 0004+00 0/1 0/0 0/0 .rodata @3926 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3926 = 6.0f; -COMPILER_STRIP_GATE(80CEFEAC, &lit_3926); +COMPILER_STRIP_GATE(0x80CEFEAC, &lit_3926); +#pragma pop + +/* 80CEFEB0-80CEFEB0 000020 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80CEFEF7 = "WAIT"; +SECTION_DEAD static char const* const stringBase_80CEFEFC = "Timer"; #pragma pop /* 80CEFF9C-80CEFFA8 -00001 000C+00 1/1 0/0 0/0 .data action_table$3859 */ @@ -533,7 +553,7 @@ static asm void daObjStopper2_Create(daObjStopper2_c* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80CEFE6C(u8* param_0) { +extern "C" asm void func_80CEFE6C(void* _this, u8* param_0) { nofralloc #include "asm/rel/d/a/obj/d_a_obj_stopper2/d_a_obj_stopper2/func_80CEFE6C.s" } @@ -562,17 +582,4 @@ SECTION_DATA extern void* g_profile_Obj_Stopper2[12] = { (void*)0x00040100, (void*)0x000E0000, }; -/* 80CEFEB0-80CEFF02 000020 0052+00 6/2 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80CEFEB0 = "Stop00"; -SECTION_DEAD static char const* const stringBase_80CEFEB7 = "STOP_OPEN"; -SECTION_DEAD static char const* const stringBase_80CEFEC1 = "STOP_CLOSE"; -SECTION_DEAD static char const* const stringBase_80CEFECC = "STOP_OPEN2"; -SECTION_DEAD static char const* const stringBase_80CEFED7 = "STOP_CLOSE2"; -SECTION_DEAD static char const* const stringBase_80CEFEE3 = "dstop"; -SECTION_DEAD static char const* const stringBase_80CEFEE9 = "door-stop.bmd"; -SECTION_DEAD static char const* const stringBase_80CEFEF7 = "WAIT"; -SECTION_DEAD static char const* const stringBase_80CEFEFC = "Timer"; -#pragma pop +/* 80CEFEB0-80CEFEB0 000020 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_suisya/d_a_obj_suisya.cpp b/rel/d/a/obj/d_a_obj_suisya/d_a_obj_suisya.cpp index f340af080c9..fccdf774b8d 100644 --- a/rel/d/a/obj/d_a_obj_suisya/d_a_obj_suisya.cpp +++ b/rel/d/a/obj/d_a_obj_suisya/d_a_obj_suisya.cpp @@ -78,10 +78,10 @@ struct cBgS_PolyInfo {}; struct _GXTexObj {}; -struct Vec {}; - struct JAISoundID {}; +struct Vec {}; + struct Z2SeMgr { /* 802AC50C */ void seStartLevel(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); }; @@ -157,13 +157,13 @@ extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; /* ############################################################################################## */ /* 80CF0520-80CF0524 000000 0004+00 2/2 0/0 0/0 .rodata @3662 */ SECTION_RODATA static f32 const lit_3662 = 100.0f; -COMPILER_STRIP_GATE(80CF0520, &lit_3662); +COMPILER_STRIP_GATE(0x80CF0520, &lit_3662); /* 80CF0524-80CF0528 000004 0004+00 0/1 0/0 0/0 .rodata @3663 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3663 = 400.0f; -COMPILER_STRIP_GATE(80CF0524, &lit_3663); +COMPILER_STRIP_GATE(0x80CF0524, &lit_3663); #pragma pop /* 80CF0528-80CF052C 000008 0004+00 0/2 0/0 0/0 .rodata @3664 */ @@ -175,12 +175,12 @@ SECTION_RODATA static u8 const lit_3664[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CF0528, &lit_3664); +COMPILER_STRIP_GATE(0x80CF0528, &lit_3664); #pragma pop /* 80CF052C-80CF0530 00000C 0004+00 1/2 0/0 0/0 .rodata @3665 */ SECTION_RODATA static f32 const lit_3665 = 1.0f; -COMPILER_STRIP_GATE(80CF052C, &lit_3665); +COMPILER_STRIP_GATE(0x80CF052C, &lit_3665); /* 80CF0078-80CF0148 000078 00D0+00 1/1 0/0 0/0 .text draw__14daObj_Suisya_cFv */ #pragma push @@ -205,7 +205,7 @@ static asm void daObj_Suisya_Draw(daObj_Suisya_c* param_0) { /* ############################################################################################## */ /* 80CF0530-80CF0534 000010 0004+00 1/1 0/0 0/0 .rodata @3682 */ SECTION_RODATA static f32 const lit_3682 = -1.0f; -COMPILER_STRIP_GATE(80CF0530, &lit_3682); +COMPILER_STRIP_GATE(0x80CF0530, &lit_3682); /* 80CF0168-80CF020C 000168 00A4+00 1/1 0/0 0/0 .text execute__14daObj_Suisya_cFv */ #pragma push @@ -232,6 +232,13 @@ static bool daObj_Suisya_IsDelete(daObj_Suisya_c* param_0) { return true; } +/* ############################################################################################## */ +/* 80CF0544-80CF0544 000024 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80CF0544 = "Obj_sui"; +#pragma pop + /* 80CF0234-80CF0264 000234 0030+00 1/1 0/0 0/0 .text _delete__14daObj_Suisya_cFv */ #pragma push #pragma optimization_level 0 @@ -277,28 +284,28 @@ static asm void useHeapInit(fopAc_ac_c* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3749 = -200.0f; -COMPILER_STRIP_GATE(80CF0534, &lit_3749); +COMPILER_STRIP_GATE(0x80CF0534, &lit_3749); #pragma pop /* 80CF0538-80CF053C 000018 0004+00 0/1 0/0 0/0 .rodata @3750 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3750 = -500.0f; -COMPILER_STRIP_GATE(80CF0538, &lit_3750); +COMPILER_STRIP_GATE(0x80CF0538, &lit_3750); #pragma pop /* 80CF053C-80CF0540 00001C 0004+00 0/1 0/0 0/0 .rodata @3751 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3751 = 200.0f; -COMPILER_STRIP_GATE(80CF053C, &lit_3751); +COMPILER_STRIP_GATE(0x80CF053C, &lit_3751); #pragma pop /* 80CF0540-80CF0544 000020 0004+00 0/1 0/0 0/0 .rodata @3752 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3752 = 500.0f; -COMPILER_STRIP_GATE(80CF0540, &lit_3752); +COMPILER_STRIP_GATE(0x80CF0540, &lit_3752); #pragma pop /* 80CF054C-80CF056C -00001 0020+00 1/0 0/0 0/0 .data l_daObj_Suisya_Method */ @@ -386,9 +393,4 @@ static asm void func_80CF0510() { } #pragma pop -/* 80CF0544-80CF054C 000024 0008+00 3/3 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80CF0544 = "Obj_sui"; -#pragma pop +/* 80CF0544-80CF0544 000024 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_sw/d_a_obj_sw.cpp b/rel/d/a/obj/d_a_obj_sw/d_a_obj_sw.cpp index 74254cb08b6..c125249ade1 100644 --- a/rel/d/a/obj/d_a_obj_sw/d_a_obj_sw.cpp +++ b/rel/d/a/obj/d_a_obj_sw/d_a_obj_sw.cpp @@ -34,10 +34,10 @@ struct mDoExt_McaMorfCallBack1_c {}; struct Vec {}; -struct J3DModelData {}; - struct J3DAnmTransform {}; +struct J3DModelData {}; + struct mDoExt_McaMorf { /* 8000FC4C */ mDoExt_McaMorf(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, int, @@ -54,11 +54,11 @@ struct mDoExt_3DlineMatSortPacket { /* 80014738 */ void setMat(mDoExt_3DlineMat_c*); }; -struct dKy_tevstr_c {}; +struct ResTIMG {}; struct _GXColor {}; -struct ResTIMG {}; +struct dKy_tevstr_c {}; struct mDoExt_3DlineMat1_c { /* 80013360 */ void init(u16, u16, ResTIMG*, int); @@ -327,11 +327,17 @@ SECTION_RODATA static u8 const lit_3850[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CF3000, &lit_3850); +COMPILER_STRIP_GATE(0x80CF3000, &lit_3850); /* 80CF3004-80CF3008 000004 0004+00 1/1 0/0 0/0 .rodata @3851 */ SECTION_RODATA static f32 const lit_3851 = -1.0f; -COMPILER_STRIP_GATE(80CF3004, &lit_3851); +COMPILER_STRIP_GATE(0x80CF3004, &lit_3851); + +/* 80CF30EC-80CF30EC 0000EC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80CF30EC = "Npc_ksw"; +#pragma pop /* 80CF08F8-80CF09A8 000338 00B0+00 3/3 0/0 0/0 .text anm_init__FP8obj_sc_sifUcf */ #pragma push @@ -348,56 +354,56 @@ static asm void anm_init(obj_sc_s* param_0, int param_1, f32 param_2, u8 param_3 #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3976 = 5.0f; -COMPILER_STRIP_GATE(80CF3008, &lit_3976); +COMPILER_STRIP_GATE(0x80CF3008, &lit_3976); #pragma pop /* 80CF300C-80CF3010 00000C 0004+00 0/5 0/0 0/0 .rodata @3977 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3977 = 1.0f; -COMPILER_STRIP_GATE(80CF300C, &lit_3977); +COMPILER_STRIP_GATE(0x80CF300C, &lit_3977); #pragma pop /* 80CF3010-80CF3014 000010 0004+00 0/3 0/0 0/0 .rodata @3978 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3978 = 2.0f; -COMPILER_STRIP_GATE(80CF3010, &lit_3978); +COMPILER_STRIP_GATE(0x80CF3010, &lit_3978); #pragma pop /* 80CF3014-80CF3018 000014 0004+00 0/4 0/0 0/0 .rodata @3979 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3979 = 40.0f; -COMPILER_STRIP_GATE(80CF3014, &lit_3979); +COMPILER_STRIP_GATE(0x80CF3014, &lit_3979); #pragma pop /* 80CF3018-80CF301C 000018 0004+00 0/1 0/0 0/0 .rodata @3980 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3980 = 25.0f; -COMPILER_STRIP_GATE(80CF3018, &lit_3980); +COMPILER_STRIP_GATE(0x80CF3018, &lit_3980); #pragma pop /* 80CF301C-80CF3020 00001C 0004+00 0/1 0/0 0/0 .rodata @3981 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3981 = 1700.0f; -COMPILER_STRIP_GATE(80CF301C, &lit_3981); +COMPILER_STRIP_GATE(0x80CF301C, &lit_3981); #pragma pop /* 80CF3020-80CF3024 000020 0004+00 0/1 0/0 0/0 .rodata @3982 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3982 = -35.0f; -COMPILER_STRIP_GATE(80CF3020, &lit_3982); +COMPILER_STRIP_GATE(0x80CF3020, &lit_3982); #pragma pop /* 80CF3024-80CF3028 000024 0004+00 0/2 0/0 0/0 .rodata @3983 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3983 = 30.0f; -COMPILER_STRIP_GATE(80CF3024, &lit_3983); +COMPILER_STRIP_GATE(0x80CF3024, &lit_3983); #pragma pop /* 80CF09A8-80CF1008 0003E8 0660+00 1/1 0/0 0/0 .text sc_build__FP12obj_sw_class */ @@ -425,42 +431,42 @@ asm cXyz::~cXyz() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4056 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(80CF3028, &lit_4056); +COMPILER_STRIP_GATE(0x80CF3028, &lit_4056); #pragma pop /* 80CF302C-80CF3030 00002C 0004+00 0/1 0/0 0/0 .rodata @4057 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4057 = 33.0f / 100.0f; -COMPILER_STRIP_GATE(80CF302C, &lit_4057); +COMPILER_STRIP_GATE(0x80CF302C, &lit_4057); #pragma pop /* 80CF3030-80CF3034 000030 0004+00 0/2 0/0 0/0 .rodata @4058 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4058 = 0.5f; -COMPILER_STRIP_GATE(80CF3030, &lit_4058); +COMPILER_STRIP_GATE(0x80CF3030, &lit_4058); #pragma pop /* 80CF3034-80CF3038 000034 0004+00 0/1 0/0 0/0 .rodata @4059 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4059 = 60.0f; -COMPILER_STRIP_GATE(80CF3034, &lit_4059); +COMPILER_STRIP_GATE(0x80CF3034, &lit_4059); #pragma pop /* 80CF3038-80CF303C 000038 0004+00 0/1 0/0 0/0 .rodata @4060 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4060 = 500.0f; -COMPILER_STRIP_GATE(80CF3038, &lit_4060); +COMPILER_STRIP_GATE(0x80CF3038, &lit_4060); #pragma pop /* 80CF303C-80CF3040 00003C 0004+00 0/2 0/0 0/0 .rodata @4061 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4061 = 2.0f / 5.0f; -COMPILER_STRIP_GATE(80CF303C, &lit_4061); +COMPILER_STRIP_GATE(0x80CF303C, &lit_4061); #pragma pop /* 80CF3040-80CF3048 000040 0008+00 0/3 0/0 0/0 .rodata @4062 */ @@ -469,7 +475,7 @@ COMPILER_STRIP_GATE(80CF303C, &lit_4061); SECTION_RODATA static u8 const lit_4062[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CF3040, &lit_4062); +COMPILER_STRIP_GATE(0x80CF3040, &lit_4062); #pragma pop /* 80CF3048-80CF3050 000048 0008+00 0/3 0/0 0/0 .rodata @4063 */ @@ -478,7 +484,7 @@ COMPILER_STRIP_GATE(80CF3040, &lit_4062); SECTION_RODATA static u8 const lit_4063[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CF3048, &lit_4063); +COMPILER_STRIP_GATE(0x80CF3048, &lit_4063); #pragma pop /* 80CF3050-80CF3058 000050 0008+00 0/3 0/0 0/0 .rodata @4064 */ @@ -487,28 +493,28 @@ COMPILER_STRIP_GATE(80CF3048, &lit_4063); SECTION_RODATA static u8 const lit_4064[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CF3050, &lit_4064); +COMPILER_STRIP_GATE(0x80CF3050, &lit_4064); #pragma pop /* 80CF3058-80CF305C 000058 0004+00 0/1 0/0 0/0 .rodata @4065 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4065 = 250.0f; -COMPILER_STRIP_GATE(80CF3058, &lit_4065); +COMPILER_STRIP_GATE(0x80CF3058, &lit_4065); #pragma pop /* 80CF305C-80CF3060 00005C 0004+00 0/2 0/0 0/0 .rodata @4066 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4066 = 1400.0f; -COMPILER_STRIP_GATE(80CF305C, &lit_4066); +COMPILER_STRIP_GATE(0x80CF305C, &lit_4066); #pragma pop /* 80CF3060-80CF3064 000060 0004+00 0/2 0/0 0/0 .rodata @4067 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4067 = 4.0f; -COMPILER_STRIP_GATE(80CF3060, &lit_4067); +COMPILER_STRIP_GATE(0x80CF3060, &lit_4067); #pragma pop /* 80CF1044-80CF1384 000A84 0340+00 1/1 0/0 0/0 .text sc_move__FP12obj_sw_class */ @@ -526,70 +532,70 @@ static asm void sc_move(obj_sw_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4194 = 400.0f; -COMPILER_STRIP_GATE(80CF3064, &lit_4194); +COMPILER_STRIP_GATE(0x80CF3064, &lit_4194); #pragma pop /* 80CF3068-80CF306C 000068 0004+00 0/1 0/0 0/0 .rodata @4195 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4195 = 55.0f; -COMPILER_STRIP_GATE(80CF3068, &lit_4195); +COMPILER_STRIP_GATE(0x80CF3068, &lit_4195); #pragma pop /* 80CF306C-80CF3070 00006C 0004+00 0/1 0/0 0/0 .rodata @4196 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4196 = -800.0f; -COMPILER_STRIP_GATE(80CF306C, &lit_4196); +COMPILER_STRIP_GATE(0x80CF306C, &lit_4196); #pragma pop /* 80CF3070-80CF3074 000070 0004+00 0/1 0/0 0/0 .rodata @4197 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4197 = 300.0f; -COMPILER_STRIP_GATE(80CF3070, &lit_4197); +COMPILER_STRIP_GATE(0x80CF3070, &lit_4197); #pragma pop /* 80CF3074-80CF3078 000074 0004+00 0/2 0/0 0/0 .rodata @4198 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4198 = -200.0f; -COMPILER_STRIP_GATE(80CF3074, &lit_4198); +COMPILER_STRIP_GATE(0x80CF3074, &lit_4198); #pragma pop /* 80CF3078-80CF307C 000078 0004+00 0/2 0/0 0/0 .rodata @4199 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4199 = 200.0f; -COMPILER_STRIP_GATE(80CF3078, &lit_4199); +COMPILER_STRIP_GATE(0x80CF3078, &lit_4199); #pragma pop /* 80CF307C-80CF3080 00007C 0004+00 0/1 0/0 0/0 .rodata @4200 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4200 = 100.0f; -COMPILER_STRIP_GATE(80CF307C, &lit_4200); +COMPILER_STRIP_GATE(0x80CF307C, &lit_4200); #pragma pop /* 80CF3080-80CF3084 000080 0004+00 0/3 0/0 0/0 .rodata @4201 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4201 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(80CF3080, &lit_4201); +COMPILER_STRIP_GATE(0x80CF3080, &lit_4201); #pragma pop /* 80CF3084-80CF3088 000084 0004+00 0/1 0/0 0/0 .rodata @4202 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4202 = -400.0f; -COMPILER_STRIP_GATE(80CF3084, &lit_4202); +COMPILER_STRIP_GATE(0x80CF3084, &lit_4202); #pragma pop /* 80CF3088-80CF308C 000088 0004+00 0/2 0/0 0/0 .rodata @4203 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4203 = 50.0f; -COMPILER_STRIP_GATE(80CF3088, &lit_4203); +COMPILER_STRIP_GATE(0x80CF3088, &lit_4203); #pragma pop /* 80CF1384-80CF1970 000DC4 05EC+00 1/1 0/0 0/0 .text demo_camera__FP12obj_sw_class */ @@ -607,42 +613,42 @@ static asm void demo_camera(obj_sw_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4442 = 10.0f; -COMPILER_STRIP_GATE(80CF308C, &lit_4442); +COMPILER_STRIP_GATE(0x80CF308C, &lit_4442); #pragma pop /* 80CF3090-80CF3094 000090 0004+00 0/1 0/0 0/0 .rodata @4443 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4443 = 1.0f / 20.0f; -COMPILER_STRIP_GATE(80CF3090, &lit_4443); +COMPILER_STRIP_GATE(0x80CF3090, &lit_4443); #pragma pop /* 80CF3094-80CF3098 000094 0004+00 0/1 0/0 0/0 .rodata @4444 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4444 = -230.0f; -COMPILER_STRIP_GATE(80CF3094, &lit_4444); +COMPILER_STRIP_GATE(0x80CF3094, &lit_4444); #pragma pop /* 80CF3098-80CF309C 000098 0004+00 0/1 0/0 0/0 .rodata @4445 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4445 = 3.0f / 10.0f; -COMPILER_STRIP_GATE(80CF3098, &lit_4445); +COMPILER_STRIP_GATE(0x80CF3098, &lit_4445); #pragma pop /* 80CF309C-80CF30A0 00009C 0004+00 0/2 0/0 0/0 .rodata @4446 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4446 = 1000.0f; -COMPILER_STRIP_GATE(80CF309C, &lit_4446); +COMPILER_STRIP_GATE(0x80CF309C, &lit_4446); #pragma pop /* 80CF30A0-80CF30A4 0000A0 0004+00 0/2 0/0 0/0 .rodata @4447 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4447 = 32768.0f; -COMPILER_STRIP_GATE(80CF30A0, &lit_4447); +COMPILER_STRIP_GATE(0x80CF30A0, &lit_4447); #pragma pop /* 80CF1970-80CF2160 0013B0 07F0+00 1/1 0/0 0/0 .text sc_action__FP12obj_sw_class */ @@ -660,21 +666,21 @@ static asm void sc_action(obj_sw_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4549 = 3.0f / 100.0f; -COMPILER_STRIP_GATE(80CF30A4, &lit_4549); +COMPILER_STRIP_GATE(0x80CF30A4, &lit_4549); #pragma pop /* 80CF30A8-80CF30AC 0000A8 0004+00 0/1 0/0 0/0 .rodata @4550 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4550 = 70.0f; -COMPILER_STRIP_GATE(80CF30A8, &lit_4550); +COMPILER_STRIP_GATE(0x80CF30A8, &lit_4550); #pragma pop /* 80CF30AC-80CF30B0 0000AC 0004+00 0/1 0/0 0/0 .rodata @4551 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4551 = 8.0f; -COMPILER_STRIP_GATE(80CF30AC, &lit_4551); +COMPILER_STRIP_GATE(0x80CF30AC, &lit_4551); #pragma pop /* 80CF30B0-80CF30B8 0000B0 0004+04 0/1 0/0 0/0 .rodata @4552 */ @@ -685,7 +691,7 @@ SECTION_RODATA static f32 const lit_4552[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80CF30B0, &lit_4552); +COMPILER_STRIP_GATE(0x80CF30B0, &lit_4552); #pragma pop /* 80CF30B8-80CF30C0 0000B8 0008+00 0/1 0/0 0/0 .rodata @4554 */ @@ -694,7 +700,7 @@ COMPILER_STRIP_GATE(80CF30B0, &lit_4552); SECTION_RODATA static u8 const lit_4554[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CF30B8, &lit_4554); +COMPILER_STRIP_GATE(0x80CF30B8, &lit_4554); #pragma pop /* 80CF2160-80CF2604 001BA0 04A4+00 1/1 0/0 0/0 .text sw_action__FP12obj_sw_class */ @@ -724,6 +730,13 @@ static bool daObj_Sw_IsDelete(obj_sw_class* param_0) { return true; } +/* ############################################################################################## */ +/* 80CF30EC-80CF30EC 0000EC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80CF30F4 = "Obj_sw"; +#pragma pop + /* 80CF26F8-80CF2790 002138 0098+00 1/0 0/0 0/0 .text daObj_Sw_Delete__FP12obj_sw_class */ #pragma push @@ -740,7 +753,7 @@ static asm void daObj_Sw_Delete(obj_sw_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4659 = 6.0f; -COMPILER_STRIP_GATE(80CF30C0, &lit_4659); +COMPILER_STRIP_GATE(0x80CF30C0, &lit_4659); #pragma pop /* 80CF2790-80CF29D4 0021D0 0244+00 1/1 0/0 0/0 .text useHeapInit__FP10fopAc_ac_c */ @@ -758,70 +771,70 @@ static asm void useHeapInit(fopAc_ac_c* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4856 = -70.0f; -COMPILER_STRIP_GATE(80CF30C4, &lit_4856); +COMPILER_STRIP_GATE(0x80CF30C4, &lit_4856); #pragma pop /* 80CF30C8-80CF30CC 0000C8 0004+00 0/1 0/0 0/0 .rodata @4857 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4857 = -14000.0f; -COMPILER_STRIP_GATE(80CF30C8, &lit_4857); +COMPILER_STRIP_GATE(0x80CF30C8, &lit_4857); #pragma pop /* 80CF30CC-80CF30D0 0000CC 0004+00 0/1 0/0 0/0 .rodata @4858 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4858 = 3450.0f; -COMPILER_STRIP_GATE(80CF30CC, &lit_4858); +COMPILER_STRIP_GATE(0x80CF30CC, &lit_4858); #pragma pop /* 80CF30D0-80CF30D4 0000D0 0004+00 0/1 0/0 0/0 .rodata @4859 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4859 = 12670.0f; -COMPILER_STRIP_GATE(80CF30D0, &lit_4859); +COMPILER_STRIP_GATE(0x80CF30D0, &lit_4859); #pragma pop /* 80CF30D4-80CF30D8 0000D4 0004+00 0/1 0/0 0/0 .rodata @4860 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4860 = -1000.0f; -COMPILER_STRIP_GATE(80CF30D4, &lit_4860); +COMPILER_STRIP_GATE(0x80CF30D4, &lit_4860); #pragma pop /* 80CF30D8-80CF30DC 0000D8 0004+00 0/1 0/0 0/0 .rodata @4861 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4861 = -100.0f; -COMPILER_STRIP_GATE(80CF30D8, &lit_4861); +COMPILER_STRIP_GATE(0x80CF30D8, &lit_4861); #pragma pop /* 80CF30DC-80CF30E0 0000DC 0004+00 0/1 0/0 0/0 .rodata @4862 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4862 = 3380.0f; -COMPILER_STRIP_GATE(80CF30DC, &lit_4862); +COMPILER_STRIP_GATE(0x80CF30DC, &lit_4862); #pragma pop /* 80CF30E0-80CF30E4 0000E0 0004+00 0/1 0/0 0/0 .rodata @4863 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4863 = 6280.0f; -COMPILER_STRIP_GATE(80CF30E0, &lit_4863); +COMPILER_STRIP_GATE(0x80CF30E0, &lit_4863); #pragma pop /* 80CF30E4-80CF30E8 0000E4 0004+00 0/1 0/0 0/0 .rodata @4864 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4864 = 3780.0f; -COMPILER_STRIP_GATE(80CF30E4, &lit_4864); +COMPILER_STRIP_GATE(0x80CF30E4, &lit_4864); #pragma pop /* 80CF30E8-80CF30EC 0000E8 0004+00 0/1 0/0 0/0 .rodata @4865 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4865 = 5600.0f; -COMPILER_STRIP_GATE(80CF30E8, &lit_4865); +COMPILER_STRIP_GATE(0x80CF30E8, &lit_4865); #pragma pop /* 80CF3210-80CF3230 -00001 0020+00 1/0 0/0 0/0 .data l_daObj_Sw_Method */ @@ -896,10 +909,4 @@ asm void daPy_py_c::getLeftHandPos() const { } #pragma pop -/* 80CF30EC-80CF30FB 0000EC 000F+00 4/4 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80CF30EC = "Npc_ksw"; -SECTION_DEAD static char const* const stringBase_80CF30F4 = "Obj_sw"; -#pragma pop +/* 80CF30EC-80CF30EC 0000EC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_swBallA/d_a_obj_swBallA.cpp b/rel/d/a/obj/d_a_obj_swBallA/d_a_obj_swBallA.cpp index d26e6886f3d..6b15b0d0137 100644 --- a/rel/d/a/obj/d_a_obj_swBallA/d_a_obj_swBallA.cpp +++ b/rel/d/a/obj/d_a_obj_swBallA/d_a_obj_swBallA.cpp @@ -86,10 +86,10 @@ struct dEvLib_callback_c { /* 80CF434C */ bool eventEnd(); }; -struct Vec {}; - struct JAISoundID {}; +struct Vec {}; + struct Z2SeMgr { /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); /* 802AC50C */ void seStartLevel(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); @@ -230,27 +230,27 @@ static asm void CheckCreateHeap(fopAc_ac_c* param_0) { /* ############################################################################################## */ /* 80CF43E4-80CF43E8 000000 0004+00 4/4 0/0 0/0 .rodata l_color */ SECTION_RODATA static u32 const l_color = 0x0396FFFF; -COMPILER_STRIP_GATE(80CF43E4, &l_color); +COMPILER_STRIP_GATE(0x80CF43E4, &l_color); /* 80CF43E8-80CF43EC 000004 0004+00 0/2 0/0 0/0 .rodata @3730 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3730 = 10.0f; -COMPILER_STRIP_GATE(80CF43E8, &lit_3730); +COMPILER_STRIP_GATE(0x80CF43E8, &lit_3730); #pragma pop /* 80CF43EC-80CF43F0 000008 0004+00 0/2 0/0 0/0 .rodata @3731 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3731 = 100.0f; -COMPILER_STRIP_GATE(80CF43EC, &lit_3731); +COMPILER_STRIP_GATE(0x80CF43EC, &lit_3731); #pragma pop /* 80CF43F0-80CF43F4 00000C 0004+00 0/2 0/0 0/0 .rodata @3732 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3732 = -100.0f; -COMPILER_STRIP_GATE(80CF43F0, &lit_3732); +COMPILER_STRIP_GATE(0x80CF43F0, &lit_3732); #pragma pop /* 80CF43F4-80CF43FC 000010 0004+04 2/5 0/0 0/0 .rodata @3733 */ @@ -265,7 +265,7 @@ SECTION_RODATA static u8 const lit_3733[4 + 4 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CF43F4, &lit_3733); +COMPILER_STRIP_GATE(0x80CF43F4, &lit_3733); /* 80CF3394-80CF34E4 000114 0150+00 1/1 0/0 0/0 .text * checkArea_sub__14daObjSwBallA_cFP10fopAc_ac_c */ @@ -313,7 +313,7 @@ asm void daObjSwBallA_c::setBaseMtx() { SECTION_RODATA static u8 const lit_3884[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CF43FC, &lit_3884); +COMPILER_STRIP_GATE(0x80CF43FC, &lit_3884); /* 80CF3694-80CF37FC 000414 0168+00 1/1 0/0 0/0 .text Create__14daObjSwBallA_cFv */ #pragma push @@ -328,7 +328,13 @@ asm void daObjSwBallA_c::Create() { /* ############################################################################################## */ /* 80CF4404-80CF4408 000020 0004+00 2/3 0/0 0/0 .rodata @3918 */ SECTION_RODATA static f32 const lit_3918 = 1.0f; -COMPILER_STRIP_GATE(80CF4404, &lit_3918); +COMPILER_STRIP_GATE(0x80CF4404, &lit_3918); + +/* 80CF4410-80CF4410 00002C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80CF4410 = "P_LBswA"; +#pragma pop /* 80CF4418-80CF4424 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { @@ -479,7 +485,7 @@ asm void daObjSwBallA_c::execute() { /* ############################################################################################## */ /* 80CF4408-80CF440C 000024 0004+00 1/1 0/0 0/0 .rodata @4032 */ SECTION_RODATA static f32 const lit_4032 = -1.0f; -COMPILER_STRIP_GATE(80CF4408, &lit_4032); +COMPILER_STRIP_GATE(0x80CF4408, &lit_4032); /* 80CF3B40-80CF3D80 0008C0 0240+00 1/0 0/0 0/0 .text actionRun__14daObjSwBallA_cFv */ #pragma push @@ -501,7 +507,7 @@ void daObjSwBallA_c::actionStop() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4122 = 300.0f; -COMPILER_STRIP_GATE(80CF440C, &lit_4122); +COMPILER_STRIP_GATE(0x80CF440C, &lit_4122); #pragma pop /* 80CF3D84-80CF406C 000B04 02E8+00 1/1 0/0 0/0 .text PutCrrPos__14daObjSwBallA_cFv */ @@ -621,9 +627,4 @@ static asm void func_80CF43D4() { } #pragma pop -/* 80CF4410-80CF4418 00002C 0008+00 1/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80CF4410 = "P_LBswA"; -#pragma pop +/* 80CF4410-80CF4410 00002C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_swBallB/d_a_obj_swBallB.cpp b/rel/d/a/obj/d_a_obj_swBallB/d_a_obj_swBallB.cpp index 7010d4d6055..a657d4de4d1 100644 --- a/rel/d/a/obj/d_a_obj_swBallB/d_a_obj_swBallB.cpp +++ b/rel/d/a/obj/d_a_obj_swBallB/d_a_obj_swBallB.cpp @@ -90,10 +90,10 @@ struct dEvLib_callback_c { /* 80CF5938 */ bool eventEnd(); }; -struct Vec {}; - struct JAISoundID {}; +struct Vec {}; + struct Z2SeMgr { /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); /* 802AC50C */ void seStartLevel(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); @@ -240,7 +240,7 @@ static asm void CheckCreateHeap(fopAc_ac_c* param_0) { /* ############################################################################################## */ /* 80CF59D0-80CF59D4 000000 0004+00 5/5 0/0 0/0 .rodata l_color */ SECTION_RODATA static u32 const l_color = 0x0396FFFF; -COMPILER_STRIP_GATE(80CF59D0, &l_color); +COMPILER_STRIP_GATE(0x80CF59D0, &l_color); /* 80CF59D4-80CF59E0 000004 000C+00 0/1 0/0 0/0 .rodata l_event_bitA */ #pragma push @@ -248,7 +248,7 @@ COMPILER_STRIP_GATE(80CF59D0, &l_color); SECTION_RODATA static u8 const l_event_bitA[12] = { 0x43, 0x04, 0x43, 0x02, 0x43, 0x01, 0x44, 0x80, 0x44, 0x40, 0x44, 0x20, }; -COMPILER_STRIP_GATE(80CF59D4, &l_event_bitA); +COMPILER_STRIP_GATE(0x80CF59D4, &l_event_bitA); #pragma pop /* 80CF59E0-80CF59EC 000010 000C+00 0/1 0/0 0/0 .rodata l_event_bitB */ @@ -257,28 +257,28 @@ COMPILER_STRIP_GATE(80CF59D4, &l_event_bitA); SECTION_RODATA static u8 const l_event_bitB[12] = { 0x44, 0x10, 0x44, 0x08, 0x44, 0x04, 0x44, 0x02, 0x44, 0x01, 0x45, 0x80, }; -COMPILER_STRIP_GATE(80CF59E0, &l_event_bitB); +COMPILER_STRIP_GATE(0x80CF59E0, &l_event_bitB); #pragma pop /* 80CF59EC-80CF59F0 00001C 0004+00 0/2 0/0 0/0 .rodata @3752 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3752 = 10.0f; -COMPILER_STRIP_GATE(80CF59EC, &lit_3752); +COMPILER_STRIP_GATE(0x80CF59EC, &lit_3752); #pragma pop /* 80CF59F0-80CF59F4 000020 0004+00 0/2 0/0 0/0 .rodata @3753 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3753 = 100.0f; -COMPILER_STRIP_GATE(80CF59F0, &lit_3753); +COMPILER_STRIP_GATE(0x80CF59F0, &lit_3753); #pragma pop /* 80CF59F4-80CF59F8 000024 0004+00 0/2 0/0 0/0 .rodata @3754 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3754 = -100.0f; -COMPILER_STRIP_GATE(80CF59F4, &lit_3754); +COMPILER_STRIP_GATE(0x80CF59F4, &lit_3754); #pragma pop /* 80CF59F8-80CF5A00 000028 0004+04 1/4 0/0 0/0 .rodata @3755 */ @@ -293,7 +293,7 @@ SECTION_RODATA static u8 const lit_3755[4 + 4 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CF59F8, &lit_3755); +COMPILER_STRIP_GATE(0x80CF59F8, &lit_3755); /* 80CF466C-80CF47BC 00012C 0150+00 1/1 0/0 0/0 .text * checkArea_sub__14daObjSwBallB_cFP10fopAc_ac_c */ @@ -341,7 +341,7 @@ asm void daObjSwBallB_c::setBaseMtx() { SECTION_RODATA static u8 const lit_3935[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CF5A00, &lit_3935); +COMPILER_STRIP_GATE(0x80CF5A00, &lit_3935); /* 80CF49F0-80CF4B74 0004B0 0184+00 1/1 0/0 0/0 .text Create__14daObjSwBallB_cFv */ #pragma push @@ -356,7 +356,13 @@ asm void daObjSwBallB_c::Create() { /* ############################################################################################## */ /* 80CF5A08-80CF5A0C 000038 0004+00 1/3 0/0 0/0 .rodata @3969 */ SECTION_RODATA static f32 const lit_3969 = 1.0f; -COMPILER_STRIP_GATE(80CF5A08, &lit_3969); +COMPILER_STRIP_GATE(0x80CF5A08, &lit_3969); + +/* 80CF5A14-80CF5A14 000044 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80CF5A14 = "P_LBswBC"; +#pragma pop /* 80CF5A20-80CF5A2C 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { @@ -509,7 +515,7 @@ asm void daObjSwBallB_c::execute() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4178 = -1.0f; -COMPILER_STRIP_GATE(80CF5A0C, &lit_4178); +COMPILER_STRIP_GATE(0x80CF5A0C, &lit_4178); #pragma pop /* 80CF4EB8-80CF5384 000978 04CC+00 1/0 0/0 0/0 .text actionRun__14daObjSwBallB_cFv */ @@ -532,7 +538,7 @@ void daObjSwBallB_c::actionStop() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4276 = 150.0f; -COMPILER_STRIP_GATE(80CF5A10, &lit_4276); +COMPILER_STRIP_GATE(0x80CF5A10, &lit_4276); #pragma pop /* 80CF5388-80CF56A4 000E48 031C+00 1/1 0/0 0/0 .text PutCrrPos__14daObjSwBallB_cFv */ @@ -652,9 +658,4 @@ static asm void func_80CF59C0() { } #pragma pop -/* 80CF5A14-80CF5A1D 000044 0009+00 1/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80CF5A14 = "P_LBswBC"; -#pragma pop +/* 80CF5A14-80CF5A14 000044 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_swBallC/d_a_obj_swBallC.cpp b/rel/d/a/obj/d_a_obj_swBallC/d_a_obj_swBallC.cpp index e6d4ab97bec..cde0fbbb00a 100644 --- a/rel/d/a/obj/d_a_obj_swBallC/d_a_obj_swBallC.cpp +++ b/rel/d/a/obj/d_a_obj_swBallC/d_a_obj_swBallC.cpp @@ -104,10 +104,10 @@ struct Z2SeqMgr { /* 802AFE18 */ void bgmStreamPlay(); }; -struct Vec {}; - struct JAISoundID {}; +struct Vec {}; + struct Z2SeMgr { /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); }; @@ -156,7 +156,7 @@ extern "C" static void daObjSwBallC_Draw__FP14daObjSwBallC_c(); extern "C" static void daObjSwBallC_Execute__FP14daObjSwBallC_c(); extern "C" static void daObjSwBallC_Delete__FP14daObjSwBallC_c(); extern "C" static void daObjSwBallC_Create__FP14daObjSwBallC_c(); -extern "C" void func_80CF6CB0(u8*); +extern "C" void func_80CF6CB0(void* _this, u8*); extern "C" extern char const* const d_a_obj_swBallC__stringBase0; // @@ -294,13 +294,13 @@ asm void daObjSwBallC_c::setBaseMtx() { /* ############################################################################################## */ /* 80CF6CD4-80CF6CD8 000000 0004+00 3/3 0/0 0/0 .rodata l_color */ SECTION_RODATA static u32 const l_color = 0x0396FFFF; -COMPILER_STRIP_GATE(80CF6CD4, &l_color); +COMPILER_STRIP_GATE(0x80CF6CD4, &l_color); /* 80CF6CD8-80CF6CDC 000004 0004+00 0/0 0/0 0/0 .rodata @3697 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3697 = -1.0f; -COMPILER_STRIP_GATE(80CF6CD8, &lit_3697); +COMPILER_STRIP_GATE(0x80CF6CD8, &lit_3697); #pragma pop /* 80CF6CDC-80CF6CE4 000008 0004+04 2/3 0/0 0/0 .rodata @3814 */ @@ -309,13 +309,20 @@ SECTION_RODATA static f32 const lit_3814[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80CF6CDC, &lit_3814); +COMPILER_STRIP_GATE(0x80CF6CDC, &lit_3814); /* 80CF6CE4-80CF6CEC 000010 0008+00 1/1 0/0 0/0 .rodata @3816 */ SECTION_RODATA static u8 const lit_3816[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CF6CE4, &lit_3816); +COMPILER_STRIP_GATE(0x80CF6CE4, &lit_3816); + +/* 80CF6D08-80CF6D08 000034 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80CF6D08 = "P_LBswBC"; +SECTION_DEAD static char const* const stringBase_80CF6D11 = "REVIVE_MASTER_SWORD"; +#pragma pop /* 80CF6D90-80CF6D9C 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { @@ -359,7 +366,26 @@ SECTION_RODATA static u8 const lit_3850[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CF6CEC, &lit_3850); +COMPILER_STRIP_GATE(0x80CF6CEC, &lit_3850); + +/* 80CF6D08-80CF6D08 000034 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80CF6D25 = "lbsw"; +SECTION_DEAD static char const* const stringBase_80CF6D2A = "WAIT"; +SECTION_DEAD static char const* const stringBase_80CF6D2F = "ON"; +SECTION_DEAD static char const* const stringBase_80CF6D32 = "OFF"; +SECTION_DEAD static char const* const stringBase_80CF6D36 = "ON_ALL_B"; +SECTION_DEAD static char const* const stringBase_80CF6D3F = "OFF_ALL_B"; +SECTION_DEAD static char const* const stringBase_80CF6D49 = "DEL_BALL"; +SECTION_DEAD static char const* const stringBase_80CF6D52 = "SOUND"; +SECTION_DEAD static char const* const stringBase_80CF6D58 = "SCALING"; +SECTION_DEAD static char const* const stringBase_80CF6D60 = "INIT"; +SECTION_DEAD static char const* const stringBase_80CF6D65 = "MESSAGE"; +SECTION_DEAD static char const* const stringBase_80CF6D6D = "ST_CUT2"; +SECTION_DEAD static char const* const stringBase_80CF6D75 = "LINK_INIT"; +SECTION_DEAD static char const* const stringBase_80CF6D7F = "EQUIP_SWD"; +#pragma pop /* 80CF6DB8-80CF6DBC -00001 0004+00 1/1 0/0 0/0 .data l_staffName */ SECTION_DATA static void* l_staffName = (void*)(((char*)&d_a_obj_swBallC__stringBase0) + 0x1D); @@ -580,6 +606,13 @@ void daObjSwBallC_c::actionDead() { /* empty function */ } +/* ############################################################################################## */ +/* 80CF6D08-80CF6D08 000034 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80CF6D89 = "Timer"; +#pragma pop + /* 80CF63F4-80CF6818 0008D4 0424+00 4/2 0/0 0/0 .text demoProc__14daObjSwBallC_cFv */ #pragma push #pragma optimization_level 0 @@ -648,26 +681,26 @@ asm void daObjSwBallC_c::deleteLightBallB() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4109 = 262.5f; -COMPILER_STRIP_GATE(80CF6CF0, &lit_4109); +COMPILER_STRIP_GATE(0x80CF6CF0, &lit_4109); #pragma pop /* 80CF6CF4-80CF6CF8 000020 0004+00 0/0 0/0 0/0 .rodata @4110 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4110 = -188.0f; -COMPILER_STRIP_GATE(80CF6CF4, &lit_4110); +COMPILER_STRIP_GATE(0x80CF6CF4, &lit_4110); #pragma pop /* 80CF6CF8-80CF6CFC 000024 0004+00 0/0 0/0 0/0 .rodata @4111 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4111 = 10712.5f; -COMPILER_STRIP_GATE(80CF6CF8, &lit_4111); +COMPILER_STRIP_GATE(0x80CF6CF8, &lit_4111); #pragma pop /* 80CF6CFC-80CF6D00 000028 0004+00 1/1 0/0 0/0 .rodata @4175 */ SECTION_RODATA static f32 const lit_4175 = 1.0f / 20.0f; -COMPILER_STRIP_GATE(80CF6CFC, &lit_4175); +COMPILER_STRIP_GATE(0x80CF6CFC, &lit_4175); /* 80CF699C-80CF6A74 000E7C 00D8+00 1/1 0/0 0/0 .text calcLightBallScale__14daObjSwBallC_cFv */ #pragma push @@ -684,14 +717,14 @@ asm void daObjSwBallC_c::calcLightBallScale() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4252 = 100.0f; -COMPILER_STRIP_GATE(80CF6D00, &lit_4252); +COMPILER_STRIP_GATE(0x80CF6D00, &lit_4252); #pragma pop /* 80CF6D04-80CF6D08 000030 0004+00 0/1 0/0 0/0 .rodata @4253 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4253 = -100.0f; -COMPILER_STRIP_GATE(80CF6D04, &lit_4253); +COMPILER_STRIP_GATE(0x80CF6D04, &lit_4253); #pragma pop /* 80CF6A74-80CF6BFC 000F54 0188+00 1/1 0/0 0/0 .text draw__14daObjSwBallC_cFv */ @@ -758,31 +791,10 @@ static asm void daObjSwBallC_Create(daObjSwBallC_c* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80CF6CB0(u8* param_0) { +extern "C" asm void func_80CF6CB0(void* _this, u8* param_0) { nofralloc #include "asm/rel/d/a/obj/d_a_obj_swBallC/d_a_obj_swBallC/func_80CF6CB0.s" } #pragma pop -/* 80CF6D08-80CF6D8F 000034 0087+00 5/1 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80CF6D08 = "P_LBswBC"; -SECTION_DEAD static char const* const stringBase_80CF6D11 = "REVIVE_MASTER_SWORD"; -SECTION_DEAD static char const* const stringBase_80CF6D25 = "lbsw"; -SECTION_DEAD static char const* const stringBase_80CF6D2A = "WAIT"; -SECTION_DEAD static char const* const stringBase_80CF6D2F = "ON"; -SECTION_DEAD static char const* const stringBase_80CF6D32 = "OFF"; -SECTION_DEAD static char const* const stringBase_80CF6D36 = "ON_ALL_B"; -SECTION_DEAD static char const* const stringBase_80CF6D3F = "OFF_ALL_B"; -SECTION_DEAD static char const* const stringBase_80CF6D49 = "DEL_BALL"; -SECTION_DEAD static char const* const stringBase_80CF6D52 = "SOUND"; -SECTION_DEAD static char const* const stringBase_80CF6D58 = "SCALING"; -SECTION_DEAD static char const* const stringBase_80CF6D60 = "INIT"; -SECTION_DEAD static char const* const stringBase_80CF6D65 = "MESSAGE"; -SECTION_DEAD static char const* const stringBase_80CF6D6D = "ST_CUT2"; -SECTION_DEAD static char const* const stringBase_80CF6D75 = "LINK_INIT"; -SECTION_DEAD static char const* const stringBase_80CF6D7F = "EQUIP_SWD"; -SECTION_DEAD static char const* const stringBase_80CF6D89 = "Timer"; -#pragma pop +/* 80CF6D08-80CF6D08 000034 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_swLight/d_a_obj_swLight.cpp b/rel/d/a/obj/d_a_obj_swLight/d_a_obj_swLight.cpp index 96510c478e1..f3beb9044c7 100644 --- a/rel/d/a/obj/d_a_obj_swLight/d_a_obj_swLight.cpp +++ b/rel/d/a/obj/d_a_obj_swLight/d_a_obj_swLight.cpp @@ -163,10 +163,10 @@ struct Z2SoundObjBase { /* 802BE4A4 */ void startCollisionSE(u32, u32, Z2SoundObjBase*); }; -struct Vec {}; - struct JAISoundID {}; +struct Vec {}; + struct Z2SeMgr { /* 802AC50C */ void seStartLevel(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); }; @@ -221,8 +221,8 @@ extern "C" bool eventStart__17dEvLib_callback_cFv(); extern "C" bool eventRun__17dEvLib_callback_cFv(); extern "C" bool eventEnd__17dEvLib_callback_cFv(); extern "C" void __dt__14daObjSwLight_cFv(); -extern "C" void func_80CF8358(u16*); -extern "C" void func_80CF8374(u8*); +extern "C" void func_80CF8358(void* _this, u16*); +extern "C" void func_80CF8374(void* _this, u8*); extern "C" static void func_80CF8390(); extern "C" extern char const* const d_a_obj_swLight__stringBase0; @@ -338,7 +338,7 @@ SECTION_RODATA static u8 const l_sph_src_at[64] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0xC8, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CF83A0, &l_sph_src_at); +COMPILER_STRIP_GATE(0x80CF83A0, &l_sph_src_at); /* 80CF83E0-80CF8420 000040 0040+00 0/1 0/0 0/0 .rodata l_sph_src_tg */ #pragma push @@ -349,12 +349,12 @@ SECTION_RODATA static u8 const l_sph_src_tg[64] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0xB4, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CF83E0, &l_sph_src_tg); +COMPILER_STRIP_GATE(0x80CF83E0, &l_sph_src_tg); #pragma pop /* 80CF8420-80CF8424 000080 0004+00 2/6 0/0 0/0 .rodata @3701 */ SECTION_RODATA static f32 const lit_3701 = 500.0f; -COMPILER_STRIP_GATE(80CF8420, &lit_3701); +COMPILER_STRIP_GATE(0x80CF8420, &lit_3701); /* 80CF8424-80CF8428 000084 0004+00 0/4 0/0 0/0 .rodata @3702 */ #pragma push @@ -365,7 +365,14 @@ SECTION_RODATA static u8 const lit_3702[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CF8424, &lit_3702); +COMPILER_STRIP_GATE(0x80CF8424, &lit_3702); +#pragma pop + +/* 80CF8454-80CF8454 0000B4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80CF8454 = "Obj_l8sw0"; +SECTION_DEAD static char const* const stringBase_80CF845E = "cc_LB_v"; #pragma pop /* 80CF8468-80CF8474 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ @@ -450,25 +457,25 @@ asm void daObjSwLight_c::Execute(f32 (**param_0)[3][4]) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3780 = 90.0f; -COMPILER_STRIP_GATE(80CF8428, &lit_3780); +COMPILER_STRIP_GATE(0x80CF8428, &lit_3780); #pragma pop /* 80CF842C-80CF8430 00008C 0004+00 1/2 0/0 0/0 .rodata @3781 */ SECTION_RODATA static f32 const lit_3781 = 255.0f; -COMPILER_STRIP_GATE(80CF842C, &lit_3781); +COMPILER_STRIP_GATE(0x80CF842C, &lit_3781); /* 80CF8430-80CF8434 000090 0004+00 0/1 0/0 0/0 .rodata @3782 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3782 = 1.0f; -COMPILER_STRIP_GATE(80CF8430, &lit_3782); +COMPILER_STRIP_GATE(0x80CF8430, &lit_3782); #pragma pop /* 80CF8434-80CF8438 000094 0004+00 0/1 0/0 0/0 .rodata @3783 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3783 = -1.0f; -COMPILER_STRIP_GATE(80CF8434, &lit_3783); +COMPILER_STRIP_GATE(0x80CF8434, &lit_3783); #pragma pop /* 80CF84E8-80CF84F4 -00001 000C+00 0/1 0/0 0/0 .data @3738 */ @@ -546,14 +553,14 @@ asm void daObjSwLight_c::init_modeSwOnWait() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3829 = 125.0f; -COMPILER_STRIP_GATE(80CF8438, &lit_3829); +COMPILER_STRIP_GATE(0x80CF8438, &lit_3829); #pragma pop /* 80CF843C-80CF8440 00009C 0004+00 0/1 0/0 0/0 .rodata @3830 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3830 = 0.25f; -COMPILER_STRIP_GATE(80CF843C, &lit_3830); +COMPILER_STRIP_GATE(0x80CF843C, &lit_3830); #pragma pop /* 80CF8440-80CF8448 0000A0 0004+04 0/1 0/0 0/0 .rodata @3831 */ @@ -564,7 +571,7 @@ SECTION_RODATA static f32 const lit_3831[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80CF8440, &lit_3831); +COMPILER_STRIP_GATE(0x80CF8440, &lit_3831); #pragma pop /* 80CF8448-80CF8450 0000A8 0008+00 0/1 0/0 0/0 .rodata @3833 */ @@ -573,7 +580,7 @@ COMPILER_STRIP_GATE(80CF8440, &lit_3831); SECTION_RODATA static u8 const lit_3833[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CF8448, &lit_3833); +COMPILER_STRIP_GATE(0x80CF8448, &lit_3833); #pragma pop /* 80CF766C-80CF777C 00074C 0110+00 1/0 0/0 0/0 .text modeSwOnWait__14daObjSwLight_cFv */ @@ -599,7 +606,7 @@ asm void daObjSwLight_c::init_modeOnLight() { /* ############################################################################################## */ /* 80CF8450-80CF8454 0000B0 0004+00 1/2 0/0 0/0 .rodata @3844 */ SECTION_RODATA static f32 const lit_3844 = 25.0f; -COMPILER_STRIP_GATE(80CF8450, &lit_3844); +COMPILER_STRIP_GATE(0x80CF8450, &lit_3844); /* 80CF7788-80CF77D8 000868 0050+00 1/0 0/0 0/0 .text modeOnLight__14daObjSwLight_cFv */ #pragma push @@ -920,7 +927,7 @@ asm daObjSwLight_c::~daObjSwLight_c() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80CF8358(u16* param_0) { +extern "C" asm void func_80CF8358(void* _this, u16* param_0) { nofralloc #include "asm/rel/d/a/obj/d_a_obj_swLight/d_a_obj_swLight/func_80CF8358.s" } @@ -930,7 +937,7 @@ extern "C" asm void func_80CF8358(u16* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80CF8374(u8* param_0) { +extern "C" asm void func_80CF8374(void* _this, u8* param_0) { nofralloc #include "asm/rel/d/a/obj/d_a_obj_swLight/d_a_obj_swLight/func_80CF8374.s" } @@ -946,10 +953,4 @@ static asm void func_80CF8390() { } #pragma pop -/* 80CF8454-80CF8466 0000B4 0012+00 2/1 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80CF8454 = "Obj_l8sw0"; -SECTION_DEAD static char const* const stringBase_80CF845E = "cc_LB_v"; -#pragma pop +/* 80CF8454-80CF8454 0000B4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_swallshutter/d_a_obj_sWallShutter.cpp b/rel/d/a/obj/d_a_obj_swallshutter/d_a_obj_sWallShutter.cpp index 101ccec218b..0e77337f3ac 100644 --- a/rel/d/a/obj/d_a_obj_swallshutter/d_a_obj_sWallShutter.cpp +++ b/rel/d/a/obj/d_a_obj_swallshutter/d_a_obj_sWallShutter.cpp @@ -75,10 +75,10 @@ struct dRes_control_c { struct dPa_levelEcallBack {}; -struct _GXColor {}; - struct csXyz {}; +struct _GXColor {}; + struct dPa_control_c { /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, @@ -106,10 +106,10 @@ struct dBgS_MoveBgActor { /* 80078950 */ void MoveBGExecute(); }; -struct Vec {}; - struct JAISoundID {}; +struct Vec {}; + struct Z2SeMgr { /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); }; @@ -216,55 +216,62 @@ SECTION_RODATA static u8 const lit_3630[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80598F78, &lit_3630); +COMPILER_STRIP_GATE(0x80598F78, &lit_3630); /* 80598F7C-80598F80 000004 0004+00 0/1 0/0 0/0 .rodata @3631 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3631 = 100.0f; -COMPILER_STRIP_GATE(80598F7C, &lit_3631); +COMPILER_STRIP_GATE(0x80598F7C, &lit_3631); #pragma pop /* 80598F80-80598F84 000008 0004+00 0/1 0/0 0/0 .rodata @3632 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3632 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(80598F80, &lit_3632); +COMPILER_STRIP_GATE(0x80598F80, &lit_3632); #pragma pop /* 80598F84-80598F88 00000C 0004+00 0/1 0/0 0/0 .rodata @3633 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3633 = 90.0f; -COMPILER_STRIP_GATE(80598F84, &lit_3633); +COMPILER_STRIP_GATE(0x80598F84, &lit_3633); #pragma pop /* 80598F88-80598F8C 000010 0004+00 0/1 0/0 0/0 .rodata @3634 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3634 = 45.0f; -COMPILER_STRIP_GATE(80598F88, &lit_3634); +COMPILER_STRIP_GATE(0x80598F88, &lit_3634); #pragma pop /* 80598F8C-80598F90 000014 0004+00 0/1 0/0 0/0 .rodata @3635 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3635 = 150.0f; -COMPILER_STRIP_GATE(80598F8C, &lit_3635); +COMPILER_STRIP_GATE(0x80598F8C, &lit_3635); #pragma pop /* 80598F90-80598F94 000018 0004+00 0/1 0/0 0/0 .rodata @3636 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3636 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(80598F90, &lit_3636); +COMPILER_STRIP_GATE(0x80598F90, &lit_3636); #pragma pop /* 80598F94-80598F98 00001C 0004+00 0/1 0/0 0/0 .rodata @3637 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3637 = 5.0f; -COMPILER_STRIP_GATE(80598F94, &lit_3637); +COMPILER_STRIP_GATE(0x80598F94, &lit_3637); +#pragma pop + +/* 80598FB8-80598FB8 000040 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80598FB8 = "P_Rgate"; +SECTION_DEAD static char const* const stringBase_80598FC0 = "SDGate"; #pragma pop /* 80598FC8-80598FD4 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ @@ -426,7 +433,7 @@ asm void daSwShutter_c::setBaseMtx() { SECTION_RODATA static u8 const l_bmdIdx[8] = { 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x04, }; -COMPILER_STRIP_GATE(80598F98, &l_bmdIdx); +COMPILER_STRIP_GATE(0x80598F98, &l_bmdIdx); /* 80598344-805983C4 000244 0080+00 1/0 0/0 0/0 .text CreateHeap__13daSwShutter_cFv */ #pragma push @@ -445,14 +452,14 @@ asm void daSwShutter_c::CreateHeap() { SECTION_RODATA static u8 const l_dzbIdx[8] = { 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x07, }; -COMPILER_STRIP_GATE(80598FA0, &l_dzbIdx); +COMPILER_STRIP_GATE(0x80598FA0, &l_dzbIdx); #pragma pop /* 80598FA8-80598FAC 000030 0004+00 0/2 0/0 0/0 .rodata @3730 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3730 = -450.0f; -COMPILER_STRIP_GATE(80598FA8, &lit_3730); +COMPILER_STRIP_GATE(0x80598FA8, &lit_3730); #pragma pop /* 805983C4-80598564 0002C4 01A0+00 1/1 0/0 0/0 .text create__13daSwShutter_cFv */ @@ -479,7 +486,7 @@ asm void daSwShutter_c::Execute(f32 (**param_0)[3][4]) { /* ############################################################################################## */ /* 80598FAC-80598FB0 000034 0004+00 1/1 0/0 0/0 .rodata @3766 */ SECTION_RODATA static u32 const lit_3766 = 0x43360B61; -COMPILER_STRIP_GATE(80598FAC, &lit_3766); +COMPILER_STRIP_GATE(0x80598FAC, &lit_3766); /* 805990E8-805990F4 000008 000C+00 1/1 0/0 0/0 .bss @3624 */ static u8 lit_3624[12]; @@ -523,13 +530,13 @@ asm void daSwShutter_c::modeWait() { /* ############################################################################################## */ /* 80598FB0-80598FB4 000038 0004+00 1/3 0/0 0/0 .rodata @3826 */ SECTION_RODATA static f32 const lit_3826 = 1.0f; -COMPILER_STRIP_GATE(80598FB0, &lit_3826); +COMPILER_STRIP_GATE(0x80598FB0, &lit_3826); /* 80598FB4-80598FB8 00003C 0004+00 0/1 0/0 0/0 .rodata @3827 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3827 = -1.0f; -COMPILER_STRIP_GATE(80598FB4, &lit_3827); +COMPILER_STRIP_GATE(0x80598FB4, &lit_3827); #pragma pop /* 8059879C-805989D0 00069C 0234+00 1/1 0/0 0/0 .text init_modeMoveDownInit__13daSwShutter_cFv */ @@ -673,13 +680,7 @@ asm void __sinit_d_a_obj_sWallShutter_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80598F28 = (void*)__sinit_d_a_obj_sWallShutter_cpp; +REGISTER_CTORS(0x80598F28, __sinit_d_a_obj_sWallShutter_cpp); #pragma pop -/* 80598FB8-80598FC7 000040 000F+00 1/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80598FB8 = "P_Rgate"; -SECTION_DEAD static char const* const stringBase_80598FC0 = "SDGate"; -#pragma pop +/* 80598FB8-80598FB8 000040 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_swchain/d_a_obj_swchain.cpp b/rel/d/a/obj/d_a_obj_swchain/d_a_obj_swchain.cpp index 1b9e46d39b7..167733fc4a6 100644 --- a/rel/d/a/obj/d_a_obj_swchain/d_a_obj_swchain.cpp +++ b/rel/d/a/obj/d_a_obj_swchain/d_a_obj_swchain.cpp @@ -133,14 +133,14 @@ struct dBgS_AcchCir { /* 80075F58 */ void SetWall(f32, f32); }; +struct csXyz {}; + struct cBgS_PolyInfo {}; struct dBgS { /* 80074B40 */ void ChkMoveBG_NoDABg(cBgS_PolyInfo const&); }; -struct csXyz {}; - struct dBgS_Acch { /* 80075F94 */ ~dBgS_Acch(); /* 800760A0 */ dBgS_Acch(); @@ -218,7 +218,7 @@ extern "C" static void daObjSwChain_Draw__FP14daObjSwChain_c(); extern "C" static void daObjSwChain_Execute__FP14daObjSwChain_c(); extern "C" static void daObjSwChain_Delete__FP14daObjSwChain_c(); extern "C" static void daObjSwChain_Create__FP10fopAc_ac_c(); -extern "C" void func_80CFB69C(u8*); +extern "C" void func_80CFB69C(void* _this, u8*); extern "C" static void func_80CFB6B8(); extern "C" static void func_80CFB6C0(); extern "C" void getRightHandPos__9daPy_py_cCFv(); @@ -350,27 +350,27 @@ SECTION_RODATA static u8 const lit_3734[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CFB6EC, &lit_3734); +COMPILER_STRIP_GATE(0x80CFB6EC, &lit_3734); /* 80CFB6F0-80CFB6F4 000004 0004+00 0/1 0/0 0/0 .rodata @3735 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3735 = 40.0f; -COMPILER_STRIP_GATE(80CFB6F0, &lit_3735); +COMPILER_STRIP_GATE(0x80CFB6F0, &lit_3735); #pragma pop /* 80CFB6F4-80CFB6F8 000008 0004+00 0/6 0/0 0/0 .rodata @3736 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3736 = 35.0f; -COMPILER_STRIP_GATE(80CFB6F4, &lit_3736); +COMPILER_STRIP_GATE(0x80CFB6F4, &lit_3736); #pragma pop /* 80CFB6F8-80CFB6FC 00000C 0004+00 0/1 0/0 0/0 .rodata @3737 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3737 = 50.0f; -COMPILER_STRIP_GATE(80CFB6F8, &lit_3737); +COMPILER_STRIP_GATE(0x80CFB6F8, &lit_3737); #pragma pop /* 80CFB6FC-80CFB704 000010 0008+00 0/3 0/0 0/0 .rodata @3739 */ @@ -379,7 +379,13 @@ COMPILER_STRIP_GATE(80CFB6F8, &lit_3737); SECTION_RODATA static u8 const lit_3739[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CFB6FC, &lit_3739); +COMPILER_STRIP_GATE(0x80CFB6FC, &lit_3739); +#pragma pop + +/* 80CFB790-80CFB790 0000A4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80CFB790 = "P_Chain"; #pragma pop /* 80CFB798-80CFB79C -00001 0004+00 3/3 0/0 0/0 .data l_arcName */ @@ -540,7 +546,7 @@ asm cM3dGAab::~cM3dGAab() { SECTION_RODATA static u8 const lit_4120[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CFB704, &lit_4120); +COMPILER_STRIP_GATE(0x80CFB704, &lit_4120); #pragma pop /* 80CFB70C-80CFB714 000020 0008+00 0/5 0/0 0/0 .rodata @4121 */ @@ -549,7 +555,7 @@ COMPILER_STRIP_GATE(80CFB704, &lit_4120); SECTION_RODATA static u8 const lit_4121[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CFB70C, &lit_4121); +COMPILER_STRIP_GATE(0x80CFB70C, &lit_4121); #pragma pop /* 80CFB714-80CFB71C 000028 0008+00 0/5 0/0 0/0 .rodata @4122 */ @@ -558,28 +564,28 @@ COMPILER_STRIP_GATE(80CFB70C, &lit_4121); SECTION_RODATA static u8 const lit_4122[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CFB714, &lit_4122); +COMPILER_STRIP_GATE(0x80CFB714, &lit_4122); #pragma pop /* 80CFB71C-80CFB720 000030 0004+00 0/1 0/0 0/0 .rodata @4123 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4123 = 30.0f; -COMPILER_STRIP_GATE(80CFB71C, &lit_4123); +COMPILER_STRIP_GATE(0x80CFB71C, &lit_4123); #pragma pop /* 80CFB720-80CFB724 000034 0004+00 0/3 0/0 0/0 .rodata @4124 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4124 = 15.0f; -COMPILER_STRIP_GATE(80CFB720, &lit_4124); +COMPILER_STRIP_GATE(0x80CFB720, &lit_4124); #pragma pop /* 80CFB724-80CFB728 000038 0004+00 0/1 0/0 0/0 .rodata @4125 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4125 = 2.0f; -COMPILER_STRIP_GATE(80CFB724, &lit_4125); +COMPILER_STRIP_GATE(0x80CFB724, &lit_4125); #pragma pop /* 80CF8ED0-80CF94E4 000890 0614+00 1/1 0/0 0/0 .text execute__14daObjSwChain_cFv */ @@ -607,56 +613,56 @@ asm void daObjSwChain_c::getChainBasePos(cXyz* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4258 = -6.0f; -COMPILER_STRIP_GATE(80CFB728, &lit_4258); +COMPILER_STRIP_GATE(0x80CFB728, &lit_4258); #pragma pop /* 80CFB72C-80CFB730 000040 0004+00 0/3 0/0 0/0 .rodata @4259 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4259 = 0.5f; -COMPILER_STRIP_GATE(80CFB72C, &lit_4259); +COMPILER_STRIP_GATE(0x80CFB72C, &lit_4259); #pragma pop /* 80CFB730-80CFB734 000044 0004+00 0/1 0/0 0/0 .rodata @4260 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4260 = 0x3DCCCCCC; -COMPILER_STRIP_GATE(80CFB730, &lit_4260); +COMPILER_STRIP_GATE(0x80CFB730, &lit_4260); #pragma pop /* 80CFB734-80CFB738 000048 0004+00 0/1 0/0 0/0 .rodata @4261 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4261 = 5.0f; -COMPILER_STRIP_GATE(80CFB734, &lit_4261); +COMPILER_STRIP_GATE(0x80CFB734, &lit_4261); #pragma pop /* 80CFB738-80CFB73C 00004C 0004+00 0/2 0/0 0/0 .rodata @4262 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4262 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(80CFB738, &lit_4262); +COMPILER_STRIP_GATE(0x80CFB738, &lit_4262); #pragma pop /* 80CFB73C-80CFB740 000050 0004+00 0/3 0/0 0/0 .rodata @4263 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4263 = 1.0f; -COMPILER_STRIP_GATE(80CFB73C, &lit_4263); +COMPILER_STRIP_GATE(0x80CFB73C, &lit_4263); #pragma pop /* 80CFB740-80CFB744 000054 0004+00 0/2 0/0 0/0 .rodata @4264 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4264 = 100.0f; -COMPILER_STRIP_GATE(80CFB740, &lit_4264); +COMPILER_STRIP_GATE(0x80CFB740, &lit_4264); #pragma pop /* 80CFB744-80CFB748 000058 0004+00 0/3 0/0 0/0 .rodata @4265 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4265 = 8.0f; -COMPILER_STRIP_GATE(80CFB744, &lit_4265); +COMPILER_STRIP_GATE(0x80CFB744, &lit_4265); #pragma pop /* 80CF9500-80CF99C0 000EC0 04C0+00 1/1 0/0 0/0 .text chain_control__14daObjSwChain_cFv @@ -675,35 +681,35 @@ asm void daObjSwChain_c::chain_control() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4457 = 12.0f; -COMPILER_STRIP_GATE(80CFB748, &lit_4457); +COMPILER_STRIP_GATE(0x80CFB748, &lit_4457); #pragma pop /* 80CFB74C-80CFB750 000060 0004+00 0/1 0/0 0/0 .rodata @4458 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4458 = 7.0f; -COMPILER_STRIP_GATE(80CFB74C, &lit_4458); +COMPILER_STRIP_GATE(0x80CFB74C, &lit_4458); #pragma pop /* 80CFB750-80CFB754 000064 0004+00 0/1 0/0 0/0 .rodata @4459 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4459 = 60.0f; -COMPILER_STRIP_GATE(80CFB750, &lit_4459); +COMPILER_STRIP_GATE(0x80CFB750, &lit_4459); #pragma pop /* 80CFB754-80CFB758 000068 0004+00 0/1 0/0 0/0 .rodata @4460 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4460 = -10.0f; -COMPILER_STRIP_GATE(80CFB754, &lit_4460); +COMPILER_STRIP_GATE(0x80CFB754, &lit_4460); #pragma pop /* 80CFB758-80CFB75C 00006C 0004+00 0/1 0/0 0/0 .rodata @4461 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4461 = 25.0f; -COMPILER_STRIP_GATE(80CFB758, &lit_4461); +COMPILER_STRIP_GATE(0x80CFB758, &lit_4461); #pragma pop /* 80CF99C0-80CFA05C 001380 069C+00 1/1 0/0 0/0 .text chain_control2__14daObjSwChain_cFv @@ -720,7 +726,7 @@ asm void daObjSwChain_c::chain_control2() { /* ############################################################################################## */ /* 80CFB75C-80CFB760 000070 0004+00 1/1 0/0 0/0 .rodata @4479 */ SECTION_RODATA static f32 const lit_4479 = 16384.0f; -COMPILER_STRIP_GATE(80CFB75C, &lit_4479); +COMPILER_STRIP_GATE(0x80CFB75C, &lit_4479); /* 80CFA05C-80CFA124 001A1C 00C8+00 1/1 0/0 0/0 .text initChainMtx__14daObjSwChain_cFv */ #pragma push @@ -747,63 +753,63 @@ asm void daObjSwChain_c::setChainMtx() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4848 = 105.0f; -COMPILER_STRIP_GATE(80CFB760, &lit_4848); +COMPILER_STRIP_GATE(0x80CFB760, &lit_4848); #pragma pop /* 80CFB764-80CFB768 000078 0004+00 0/1 0/0 0/0 .rodata @4849 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4849 = -1.0f; -COMPILER_STRIP_GATE(80CFB764, &lit_4849); +COMPILER_STRIP_GATE(0x80CFB764, &lit_4849); #pragma pop /* 80CFB768-80CFB76C 00007C 0004+00 0/1 0/0 0/0 .rodata @4850 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4850 = 17.5f; -COMPILER_STRIP_GATE(80CFB768, &lit_4850); +COMPILER_STRIP_GATE(0x80CFB768, &lit_4850); #pragma pop /* 80CFB76C-80CFB770 000080 0004+00 0/1 0/0 0/0 .rodata @4851 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4851 = 10.0f; -COMPILER_STRIP_GATE(80CFB76C, &lit_4851); +COMPILER_STRIP_GATE(0x80CFB76C, &lit_4851); #pragma pop /* 80CFB770-80CFB774 000084 0004+00 0/1 0/0 0/0 .rodata @4852 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4852 = 1.5f; -COMPILER_STRIP_GATE(80CFB770, &lit_4852); +COMPILER_STRIP_GATE(0x80CFB770, &lit_4852); #pragma pop /* 80CFB774-80CFB778 000088 0004+00 0/1 0/0 0/0 .rodata @4853 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4853 = 6.0f; -COMPILER_STRIP_GATE(80CFB774, &lit_4853); +COMPILER_STRIP_GATE(0x80CFB774, &lit_4853); #pragma pop /* 80CFB778-80CFB77C 00008C 0004+00 0/1 0/0 0/0 .rodata @4854 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4854 = 9.0f; -COMPILER_STRIP_GATE(80CFB778, &lit_4854); +COMPILER_STRIP_GATE(0x80CFB778, &lit_4854); #pragma pop /* 80CFB77C-80CFB780 000090 0004+00 0/2 0/0 0/0 .rodata @4855 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4855 = 13.0f; -COMPILER_STRIP_GATE(80CFB77C, &lit_4855); +COMPILER_STRIP_GATE(0x80CFB77C, &lit_4855); #pragma pop /* 80CFB780-80CFB784 000094 0004+00 0/2 0/0 0/0 .rodata @4856 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4856 = 20.0f; -COMPILER_STRIP_GATE(80CFB780, &lit_4856); +COMPILER_STRIP_GATE(0x80CFB780, &lit_4856); #pragma pop /* 80CFA4A8-80CFAD50 001E68 08A8+00 1/1 0/0 0/0 .text chain_count_control__14daObjSwChain_cFv */ @@ -821,21 +827,21 @@ asm void daObjSwChain_c::chain_count_control() { #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_5043 = 0x3F333334; -COMPILER_STRIP_GATE(80CFB784, &lit_5043); +COMPILER_STRIP_GATE(0x80CFB784, &lit_5043); #pragma pop /* 80CFB788-80CFB78C 00009C 0004+00 0/1 0/0 0/0 .rodata @5044 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5044 = 21.0f / 10.0f; -COMPILER_STRIP_GATE(80CFB788, &lit_5044); +COMPILER_STRIP_GATE(0x80CFB788, &lit_5044); #pragma pop /* 80CFB78C-80CFB790 0000A0 0004+00 0/1 0/0 0/0 .rodata @5045 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5045 = 7000.0f; -COMPILER_STRIP_GATE(80CFB78C, &lit_5045); +COMPILER_STRIP_GATE(0x80CFB78C, &lit_5045); #pragma pop /* 80CFAD50-80CFB450 002710 0700+00 1/1 0/0 0/0 .text setTension__14daObjSwChain_cFv */ @@ -935,7 +941,7 @@ static asm void daObjSwChain_Create(fopAc_ac_c* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80CFB69C(u8* param_0) { +extern "C" asm void func_80CFB69C(void* _this, u8* param_0) { nofralloc #include "asm/rel/d/a/obj/d_a_obj_swchain/d_a_obj_swchain/func_80CFB69C.s" } @@ -971,9 +977,4 @@ asm void daPy_py_c::getRightHandPos() const { } #pragma pop -/* 80CFB790-80CFB798 0000A4 0008+00 1/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80CFB790 = "P_Chain"; -#pragma pop +/* 80CFB790-80CFB790 0000A4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_swhang/d_a_obj_swhang.cpp b/rel/d/a/obj/d_a_obj_swhang/d_a_obj_swhang.cpp index 487e3893811..81bd469d310 100644 --- a/rel/d/a/obj/d_a_obj_swhang/d_a_obj_swhang.cpp +++ b/rel/d/a/obj/d_a_obj_swhang/d_a_obj_swhang.cpp @@ -167,10 +167,10 @@ struct cBgS { /* 80074250 */ void Release(dBgW_Base*); }; -struct Vec {}; - struct JAISoundID {}; +struct Vec {}; + struct Z2SeMgr { /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); }; @@ -228,7 +228,7 @@ extern "C" bool eventStart__17dEvLib_callback_cFv(); extern "C" bool eventRun__17dEvLib_callback_cFv(); extern "C" bool eventEnd__17dEvLib_callback_cFv(); extern "C" void __dt__13daObjSwHang_cFv(); -extern "C" void func_80CFD1A8(u8*); +extern "C" void func_80CFD1A8(void* _this, u8*); extern "C" static void func_80CFD1C4(); extern "C" static void func_80CFD1CC(); extern "C" extern char const* const d_a_obj_swhang__stringBase0; @@ -320,35 +320,35 @@ SECTION_RODATA static u8 const l_bmdIdx[20] = { 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x04, }; -COMPILER_STRIP_GATE(80CFD1DC, &l_bmdIdx); +COMPILER_STRIP_GATE(0x80CFD1DC, &l_bmdIdx); /* 80CFD1F0-80CFD204 000014 0014+00 1/1 0/0 0/0 .rodata l_dzbIdx */ SECTION_RODATA static u8 const l_dzbIdx[20] = { 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x07, }; -COMPILER_STRIP_GATE(80CFD1F0, &l_dzbIdx); +COMPILER_STRIP_GATE(0x80CFD1F0, &l_dzbIdx); /* 80CFD204-80CFD218 000028 0014+00 1/1 0/0 0/0 .rodata l_dzbIdx2 */ SECTION_RODATA static u8 const l_dzbIdx2[20] = { 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x08, }; -COMPILER_STRIP_GATE(80CFD204, &l_dzbIdx2); +COMPILER_STRIP_GATE(0x80CFD204, &l_dzbIdx2); /* 80CFD218-80CFD22C 00003C 0014+00 1/3 0/0 0/0 .rodata l_pull_length */ SECTION_RODATA static u8 const l_pull_length[20] = { 0x42, 0xC8, 0x00, 0x00, 0x42, 0xC8, 0x00, 0x00, 0x43, 0x02, 0x00, 0x00, 0x42, 0xC8, 0x00, 0x00, 0x43, 0x48, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CFD218, &l_pull_length); +COMPILER_STRIP_GATE(0x80CFD218, &l_pull_length); /* 80CFD22C-80CFD240 000050 0014+00 1/1 0/0 0/0 .rodata l_heap_size */ SECTION_RODATA static u8 const l_heap_size[20] = { 0x00, 0x00, 0x19, 0x80, 0x00, 0x00, 0x19, 0x80, 0x00, 0x00, 0x19, 0x80, 0x00, 0x00, 0x20, 0x30, 0x00, 0x00, 0x20, 0x30, }; -COMPILER_STRIP_GATE(80CFD22C, &l_heap_size); +COMPILER_STRIP_GATE(0x80CFD22C, &l_heap_size); /* 80CFD240-80CFD244 000064 0004+00 2/4 0/0 0/0 .rodata @3681 */ SECTION_RODATA static u8 const lit_3681[4] = { @@ -357,7 +357,7 @@ SECTION_RODATA static u8 const lit_3681[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CFD240, &lit_3681); +COMPILER_STRIP_GATE(0x80CFD240, &lit_3681); /* 80CFB938-80CFB9D8 000078 00A0+00 1/1 0/0 0/0 .text nodeCallBack__FP8J3DJointi */ #pragma push @@ -390,6 +390,19 @@ asm void daObjSwHang_c::setBaseMtx() { #pragma pop /* ############################################################################################## */ +/* 80CFD274-80CFD274 000098 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80CFD274 = "S_bura_A"; +SECTION_DEAD static char const* const stringBase_80CFD27D = "S_bura_B"; +SECTION_DEAD static char const* const stringBase_80CFD286 = "S_bura_7a"; +SECTION_DEAD static char const* const stringBase_80CFD290 = "S_bura_7b"; +SECTION_DEAD static char const* const stringBase_80CFD29A = "S_bura_7c"; +SECTION_DEAD static char const* const stringBase_80CFD2A4 = "totte"; +SECTION_DEAD static char const* const stringBase_80CFD2AA = "hook"; +SECTION_DEAD static char const* const stringBase_80CFD2AF = "tottel"; +#pragma pop + /* 80CFD2B8-80CFD2C4 000000 000C+00 2/2 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -678,28 +691,28 @@ asm void daObjSwHang_c::changeOffStatus() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4056 = 1.0f; -COMPILER_STRIP_GATE(80CFD244, &lit_4056); +COMPILER_STRIP_GATE(0x80CFD244, &lit_4056); #pragma pop /* 80CFD248-80CFD24C 00006C 0004+00 0/3 0/0 0/0 .rodata @4057 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4057 = -1.0f; -COMPILER_STRIP_GATE(80CFD248, &lit_4057); +COMPILER_STRIP_GATE(0x80CFD248, &lit_4057); #pragma pop /* 80CFD24C-80CFD250 000070 0004+00 0/1 0/0 0/0 .rodata @4058 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4058 = 100.0f; -COMPILER_STRIP_GATE(80CFD24C, &lit_4058); +COMPILER_STRIP_GATE(0x80CFD24C, &lit_4058); #pragma pop /* 80CFD250-80CFD254 000074 0004+00 0/1 0/0 0/0 .rodata @4059 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4059 = 150.0f; -COMPILER_STRIP_GATE(80CFD250, &lit_4059); +COMPILER_STRIP_GATE(0x80CFD250, &lit_4059); #pragma pop /* 80CFC254-80CFC4C4 000994 0270+00 1/0 0/0 0/0 .text Execute__13daObjSwHang_cFPPA3_A4_f @@ -749,42 +762,42 @@ asm void daObjSwHang_c::init_modeOffWait() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4224 = 5.0f; -COMPILER_STRIP_GATE(80CFD254, &lit_4224); +COMPILER_STRIP_GATE(0x80CFD254, &lit_4224); #pragma pop /* 80CFD258-80CFD25C 00007C 0004+00 0/1 0/0 0/0 .rodata @4225 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4225 = -3.0f / 5.0f; -COMPILER_STRIP_GATE(80CFD258, &lit_4225); +COMPILER_STRIP_GATE(0x80CFD258, &lit_4225); #pragma pop /* 80CFD25C-80CFD260 000080 0004+00 0/1 0/0 0/0 .rodata @4226 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4226 = 15.0f; -COMPILER_STRIP_GATE(80CFD25C, &lit_4226); +COMPILER_STRIP_GATE(0x80CFD25C, &lit_4226); #pragma pop /* 80CFD260-80CFD264 000084 0004+00 0/1 0/0 0/0 .rodata @4227 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4227 = 1.0f / 20.0f; -COMPILER_STRIP_GATE(80CFD260, &lit_4227); +COMPILER_STRIP_GATE(0x80CFD260, &lit_4227); #pragma pop /* 80CFD264-80CFD268 000088 0004+00 0/2 0/0 0/0 .rodata @4228 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4228 = -7.0f; -COMPILER_STRIP_GATE(80CFD264, &lit_4228); +COMPILER_STRIP_GATE(0x80CFD264, &lit_4228); #pragma pop /* 80CFD268-80CFD26C 00008C 0004+00 0/2 0/0 0/0 .rodata @4229 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4229 = -3.0f / 10.0f; -COMPILER_STRIP_GATE(80CFD268, &lit_4229); +COMPILER_STRIP_GATE(0x80CFD268, &lit_4229); #pragma pop /* 80CFD26C-80CFD274 000090 0008+00 0/1 0/0 0/0 .rodata @4232 */ @@ -793,7 +806,7 @@ COMPILER_STRIP_GATE(80CFD268, &lit_4229); SECTION_RODATA static u8 const lit_4232[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CFD26C, &lit_4232); +COMPILER_STRIP_GATE(0x80CFD26C, &lit_4232); #pragma pop /* 80CFC6AC-80CFCA34 000DEC 0388+00 1/0 0/0 0/0 .text modeOffWait__13daObjSwHang_cFv */ @@ -949,7 +962,7 @@ asm daObjSwHang_c::~daObjSwHang_c() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80CFD1A8(u8* param_0) { +extern "C" asm void func_80CFD1A8(void* _this, u8* param_0) { nofralloc #include "asm/rel/d/a/obj/d_a_obj_swhang/d_a_obj_swhang/func_80CFD1A8.s" } @@ -976,16 +989,4 @@ static asm void func_80CFD1CC() { } #pragma pop -/* 80CFD274-80CFD2B6 000098 0042+00 2/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80CFD274 = "S_bura_A"; -SECTION_DEAD static char const* const stringBase_80CFD27D = "S_bura_B"; -SECTION_DEAD static char const* const stringBase_80CFD286 = "S_bura_7a"; -SECTION_DEAD static char const* const stringBase_80CFD290 = "S_bura_7b"; -SECTION_DEAD static char const* const stringBase_80CFD29A = "S_bura_7c"; -SECTION_DEAD static char const* const stringBase_80CFD2A4 = "totte"; -SECTION_DEAD static char const* const stringBase_80CFD2AA = "hook"; -SECTION_DEAD static char const* const stringBase_80CFD2AF = "tottel"; -#pragma pop +/* 80CFD274-80CFD274 000098 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_sword/d_a_obj_sword.cpp b/rel/d/a/obj/d_a_obj_sword/d_a_obj_sword.cpp index 571c0cff74f..fd598c97b04 100644 --- a/rel/d/a/obj/d_a_obj_sword/d_a_obj_sword.cpp +++ b/rel/d/a/obj/d_a_obj_sword/d_a_obj_sword.cpp @@ -69,7 +69,6 @@ struct dItem_data { struct dEvt_control_c { /* 80042468 */ void reset(); - /* 800436EC */ void setPtI_Id(unsigned int); }; struct dEvent_manager_c { @@ -503,6 +502,13 @@ asm void daObjSword_c::actionOrderGetDemo() { } #pragma pop +/* ############################################################################################## */ +/* 80CFDE84-80CFDE84 000000 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80CFDE84 = "DEFAULT_GETITEM"; +#pragma pop + /* 80CFDB80-80CFDC1C 0006A0 009C+00 1/0 0/0 0/0 .text actionGetDemo__12daObjSword_cFv */ #pragma push #pragma optimization_level 0 @@ -616,9 +622,4 @@ static asm void func_80CFDE74() { } #pragma pop -/* 80CFDE84-80CFDE94 000000 0010+00 1/1 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80CFDE84 = "DEFAULT_GETITEM"; -#pragma pop +/* 80CFDE84-80CFDE84 000000 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_swpropeller/d_a_obj_swpropeller.cpp b/rel/d/a/obj/d_a_obj_swpropeller/d_a_obj_swpropeller.cpp index 1ed67ee8a2e..40c75f0d852 100644 --- a/rel/d/a/obj/d_a_obj_swpropeller/d_a_obj_swpropeller.cpp +++ b/rel/d/a/obj/d_a_obj_swpropeller/d_a_obj_swpropeller.cpp @@ -156,9 +156,9 @@ extern "C" static void daObjSwPr_Draw__FP11daObjSwPr_c(); extern "C" static void daObjSwPr_Execute__FP11daObjSwPr_c(); extern "C" static void daObjSwPr_Delete__FP11daObjSwPr_c(); extern "C" static void daObjSwPr_Create__FP10fopAc_ac_c(); -extern "C" void func_8059B26C(u16*); -extern "C" void func_8059B288(u8*); -extern "C" void func_8059B2A4(s16*); +extern "C" void func_8059B26C(void* _this, u16*); +extern "C" void func_8059B288(void* _this, u8*); +extern "C" void func_8059B2A4(void* _this, s16*); extern "C" extern char const* const d_a_obj_swpropeller__stringBase0; // @@ -273,13 +273,13 @@ asm void daObjSwPr_c::setBaseMtx() { SECTION_RODATA static u8 const l_bmdName[8] = { 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x03, }; -COMPILER_STRIP_GATE(8059B2C8, &l_bmdName); +COMPILER_STRIP_GATE(0x8059B2C8, &l_bmdName); /* 8059B2D0-8059B2D8 000008 0008+00 1/1 0/0 0/0 .rodata l_heap_size */ SECTION_RODATA static u8 const l_heap_size[8] = { 0x00, 0x00, 0x0F, 0x20, 0x00, 0x00, 0x36, 0xC0, }; -COMPILER_STRIP_GATE(8059B2D0, &l_heap_size); +COMPILER_STRIP_GATE(0x8059B2D0, &l_heap_size); /* 8059B2D8-8059B31C 000010 0044+00 0/1 0/0 0/0 .rodata l_cyl_src */ #pragma push @@ -291,7 +291,7 @@ SECTION_RODATA static u8 const l_cyl_src[68] = { 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0xC8, 0x00, 0x00, 0x42, 0xC8, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8059B2D8, &l_cyl_src); +COMPILER_STRIP_GATE(0x8059B2D8, &l_cyl_src); #pragma pop /* 8059B31C-8059B334 000054 0018+00 0/1 0/0 0/0 .rodata l_cull_size */ @@ -301,7 +301,7 @@ SECTION_RODATA static u8 const l_cull_size[24] = { 0xC3, 0x16, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC3, 0x16, 0x00, 0x00, 0x43, 0x16, 0x00, 0x00, 0x43, 0x16, 0x00, 0x00, 0x43, 0x16, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8059B31C, &l_cull_size); +COMPILER_STRIP_GATE(0x8059B31C, &l_cull_size); #pragma pop /* 8059B334-8059B33C 00006C 0006+02 0/0 0/0 0/0 .rodata l_r00_rot_time */ @@ -318,14 +318,23 @@ SECTION_RODATA static u8 const l_r00_rot_time[6 + 2 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(8059B334, &l_r00_rot_time); +COMPILER_STRIP_GATE(0x8059B334, &l_r00_rot_time); #pragma pop /* 8059B33C-8059B340 000074 0004+00 0/1 0/0 0/0 .rodata @3747 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3747 = 100.0f; -COMPILER_STRIP_GATE(8059B33C, &lit_3747); +COMPILER_STRIP_GATE(0x8059B33C, &lit_3747); +#pragma pop + +/* 8059B360-8059B360 000098 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8059B360 = "K_prop00"; +SECTION_DEAD static char const* const stringBase_8059B369 = "Lv9_puro"; +SECTION_DEAD static char const* const stringBase_8059B372 = "kaiten"; +SECTION_DEAD static char const* const stringBase_8059B379 = "D_MN05"; #pragma pop /* 8059B380-8059B388 -00001 0008+00 3/3 0/0 0/0 .data l_arcName */ @@ -447,11 +456,11 @@ asm void daObjSwPr_c::switchCtrl() { /* ############################################################################################## */ /* 8059B340-8059B344 000078 0004+00 1/2 0/0 0/0 .rodata @3983 */ SECTION_RODATA static f32 const lit_3983 = 1.0f; -COMPILER_STRIP_GATE(8059B340, &lit_3983); +COMPILER_STRIP_GATE(0x8059B340, &lit_3983); /* 8059B344-8059B348 00007C 0004+00 1/2 0/0 0/0 .rodata @3984 */ SECTION_RODATA static f32 const lit_3984 = -1.0f; -COMPILER_STRIP_GATE(8059B344, &lit_3984); +COMPILER_STRIP_GATE(0x8059B344, &lit_3984); /* 8059AB9C-8059ADCC 0006FC 0230+00 1/1 0/0 0/0 .text execute_type_boomerang__11daObjSwPr_cFv */ #pragma push @@ -479,21 +488,21 @@ asm void daObjSwPr_c::execute_type_wind() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4086 = 127.0f; -COMPILER_STRIP_GATE(8059B348, &lit_4086); +COMPILER_STRIP_GATE(0x8059B348, &lit_4086); #pragma pop /* 8059B34C-8059B350 000084 0004+00 0/1 0/0 0/0 .rodata @4087 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4087 = 1200.0f; -COMPILER_STRIP_GATE(8059B34C, &lit_4087); +COMPILER_STRIP_GATE(0x8059B34C, &lit_4087); #pragma pop /* 8059B350-8059B354 000088 0004+00 0/1 0/0 0/0 .rodata @4088 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4088 = 600.0f; -COMPILER_STRIP_GATE(8059B350, &lit_4088); +COMPILER_STRIP_GATE(0x8059B350, &lit_4088); #pragma pop /* 8059B354-8059B358 00008C 0004+00 0/1 0/0 0/0 .rodata @4089 */ @@ -505,7 +514,7 @@ SECTION_RODATA static u8 const lit_4089[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(8059B354, &lit_4089); +COMPILER_STRIP_GATE(0x8059B354, &lit_4089); #pragma pop /* 8059B358-8059B360 000090 0008+00 0/1 0/0 0/0 .rodata @4091 */ @@ -514,7 +523,7 @@ COMPILER_STRIP_GATE(8059B354, &lit_4089); SECTION_RODATA static u8 const lit_4091[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8059B358, &lit_4091); +COMPILER_STRIP_GATE(0x8059B358, &lit_4091); #pragma pop /* 8059B014-8059B148 000B74 0134+00 1/1 0/0 0/0 .text execute__11daObjSwPr_cFv */ @@ -593,7 +602,7 @@ static asm void daObjSwPr_Create(fopAc_ac_c* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_8059B26C(u16* param_0) { +extern "C" asm void func_8059B26C(void* _this, u16* param_0) { nofralloc #include "asm/rel/d/a/obj/d_a_obj_swpropeller/d_a_obj_swpropeller/func_8059B26C.s" } @@ -603,7 +612,7 @@ extern "C" asm void func_8059B26C(u16* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_8059B288(u8* param_0) { +extern "C" asm void func_8059B288(void* _this, u8* param_0) { nofralloc #include "asm/rel/d/a/obj/d_a_obj_swpropeller/d_a_obj_swpropeller/func_8059B288.s" } @@ -613,18 +622,10 @@ extern "C" asm void func_8059B288(u8* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_8059B2A4(s16* param_0) { +extern "C" asm void func_8059B2A4(void* _this, s16* param_0) { nofralloc #include "asm/rel/d/a/obj/d_a_obj_swpropeller/d_a_obj_swpropeller/func_8059B2A4.s" } #pragma pop -/* 8059B360-8059B380 000098 0020+00 4/2 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_8059B360 = "K_prop00"; -SECTION_DEAD static char const* const stringBase_8059B369 = "Lv9_puro"; -SECTION_DEAD static char const* const stringBase_8059B372 = "kaiten"; -SECTION_DEAD static char const* const stringBase_8059B379 = "D_MN05"; -#pragma pop +/* 8059B360-8059B360 000098 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_swpush/d_a_obj_swpush.cpp b/rel/d/a/obj/d_a_obj_swpush/d_a_obj_swpush.cpp index 0f1912d550b..24c86d6eae8 100644 --- a/rel/d/a/obj/d_a_obj_swpush/d_a_obj_swpush.cpp +++ b/rel/d/a/obj/d_a_obj_swpush/d_a_obj_swpush.cpp @@ -35,13 +35,13 @@ struct fopAc_ac_c { /* 80018B64 */ fopAc_ac_c(); }; +struct J3DJoint {}; + struct dBgW { /* 8007B970 */ dBgW(); /* 8007B9C0 */ void Move(); }; -struct J3DJoint {}; - struct daObjSwpush { struct Act_c { struct Prm_e {}; @@ -98,7 +98,8 @@ struct daObj { template void PrmAbstract(/* ... */); /* 80484CE4 */ /* daObj::PrmAbstract */ - void func_80484CE4(fopAc_ac_c const*, daObjSwpush::Act_c::Prm_e, daObjSwpush::Act_c::Prm_e); + void func_80484CE4(void* _this, fopAc_ac_c const*, daObjSwpush::Act_c::Prm_e, + daObjSwpush::Act_c::Prm_e); }; struct dVibration_c { @@ -239,7 +240,7 @@ extern "C" static void func_80484C7C(); extern "C" static void func_80484C9C(); extern "C" static void func_80484CBC(); extern "C" static bool func_80484CDC(); -extern "C" void func_80484CE4(fopAc_ac_c const*, daObjSwpush::Act_c::Prm_e, +extern "C" void func_80484CE4(void* _this, fopAc_ac_c const*, daObjSwpush::Act_c::Prm_e, daObjSwpush::Act_c::Prm_e); extern "C" u8 const M_bmd__Q211daObjSwpush5Act_c[6 + 2 /* padding */]; extern "C" u8 const M_dzb__Q211daObjSwpush5Act_c[6 + 2 /* padding */]; @@ -371,7 +372,7 @@ SECTION_RODATA u8 const daObjSwpush::Act_c::M_bmd[6 + 2 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80484D10, &daObjSwpush::Act_c::M_bmd); +COMPILER_STRIP_GATE(0x80484D10, &daObjSwpush::Act_c::M_bmd); /* 80484D18-80484D20 000008 0006+02 1/1 0/0 0/0 .rodata M_dzb__Q211daObjSwpush5Act_c */ SECTION_RODATA u8 const daObjSwpush::Act_c::M_dzb[6 + 2 /* padding */] = { @@ -385,7 +386,17 @@ SECTION_RODATA u8 const daObjSwpush::Act_c::M_dzb[6 + 2 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80484D18, &daObjSwpush::Act_c::M_dzb); +COMPILER_STRIP_GATE(0x80484D18, &daObjSwpush::Act_c::M_dzb); + +/* 80484E4C-80484E4C 00013C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80484E4C = "Kbota_00"; +SECTION_DEAD static char const* const stringBase_80484E55 = "S_lv3bota"; +SECTION_DEAD static char const* const stringBase_80484E5F = "S_lv6bota"; +SECTION_DEAD static char const* const stringBase_80484E69 = "bottan"; +SECTION_DEAD static char const* const stringBase_80484E70 = "botan"; +#pragma pop /* 80484E84-80484E90 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { @@ -440,7 +451,7 @@ asm void daObjSwpush::Act_c::create_res_load() { SECTION_RODATA u8 const daObjSwpush::Act_c::M_heap_size[12] = { 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10, 0x00, }; -COMPILER_STRIP_GATE(80484D20, &daObjSwpush::Act_c::M_heap_size); +COMPILER_STRIP_GATE(0x80484D20, &daObjSwpush::Act_c::M_heap_size); #pragma pop /* 80484D2C-80484E08 00001C 00DC+00 4/10 0/0 0/0 .rodata M_attr__Q211daObjSwpush5Act_c */ @@ -460,62 +471,62 @@ SECTION_RODATA u8 const daObjSwpush::Act_c::M_attr[220] = { 0x00, 0x00, 0x00, 0x00, 0xBE, 0x99, 0x99, 0x9A, 0x00, 0x01, 0x00, 0x06, 0x00, 0x06, 0x00, 0x0D, 0x3F, 0x80, 0x00, 0x00, 0x40, 0x20, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80484D2C, &daObjSwpush::Act_c::M_attr); +COMPILER_STRIP_GATE(0x80484D2C, &daObjSwpush::Act_c::M_attr); /* 80484E08-80484E0C 0000F8 0004+00 0/3 0/0 0/0 .rodata M_op_vtx__Q211daObjSwpush5Act_c */ #pragma push #pragma force_active on SECTION_RODATA u32 const daObjSwpush::Act_c::M_op_vtx = 0x0D0B0A0C; -COMPILER_STRIP_GATE(80484E08, &daObjSwpush::Act_c::M_op_vtx); +COMPILER_STRIP_GATE(0x80484E08, &daObjSwpush::Act_c::M_op_vtx); #pragma pop /* 80484E0C-80484E10 0000FC 0004+00 0/1 0/0 0/0 .rodata @3872 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3872 = 0.5f; -COMPILER_STRIP_GATE(80484E0C, &lit_3872); +COMPILER_STRIP_GATE(0x80484E0C, &lit_3872); #pragma pop /* 80484E10-80484E14 000100 0004+00 0/2 0/0 0/0 .rodata @3873 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3873 = 1.25f; -COMPILER_STRIP_GATE(80484E10, &lit_3873); +COMPILER_STRIP_GATE(0x80484E10, &lit_3873); #pragma pop /* 80484E14-80484E18 000104 0004+00 0/2 0/0 0/0 .rodata @3874 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3874 = 2.0f; -COMPILER_STRIP_GATE(80484E14, &lit_3874); +COMPILER_STRIP_GATE(0x80484E14, &lit_3874); #pragma pop /* 80484E18-80484E1C 000108 0004+00 0/1 0/0 0/0 .rodata @3875 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3875 = 80.0f; -COMPILER_STRIP_GATE(80484E18, &lit_3875); +COMPILER_STRIP_GATE(0x80484E18, &lit_3875); #pragma pop /* 80484E1C-80484E20 00010C 0004+00 0/1 0/0 0/0 .rodata @3876 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3876 = -80.0f; -COMPILER_STRIP_GATE(80484E1C, &lit_3876); +COMPILER_STRIP_GATE(0x80484E1C, &lit_3876); #pragma pop /* 80484E20-80484E24 000110 0004+00 0/1 0/0 0/0 .rodata @3877 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3877 = -2.0f; -COMPILER_STRIP_GATE(80484E20, &lit_3877); +COMPILER_STRIP_GATE(0x80484E20, &lit_3877); #pragma pop /* 80484E24-80484E28 000114 0004+00 0/1 0/0 0/0 .rodata @3878 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3878 = 39.0f; -COMPILER_STRIP_GATE(80484E24, &lit_3878); +COMPILER_STRIP_GATE(0x80484E24, &lit_3878); #pragma pop /* 80484E28-80484E2C 000118 0004+00 3/6 0/0 0/0 .rodata @3879 */ @@ -525,17 +536,17 @@ SECTION_RODATA static u8 const lit_3879[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80484E28, &lit_3879); +COMPILER_STRIP_GATE(0x80484E28, &lit_3879); /* 80484E2C-80484E30 00011C 0004+00 2/8 0/0 0/0 .rodata @3880 */ SECTION_RODATA static f32 const lit_3880 = 1.0f; -COMPILER_STRIP_GATE(80484E2C, &lit_3880); +COMPILER_STRIP_GATE(0x80484E2C, &lit_3880); /* 80484E30-80484E34 000120 0004+00 0/3 0/0 0/0 .rodata @3881 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3881 = -35.5f; -COMPILER_STRIP_GATE(80484E30, &lit_3881); +COMPILER_STRIP_GATE(0x80484E30, &lit_3881); #pragma pop /* 80483038-80483450 0003D8 0418+00 1/1 0/0 0/0 .text Mthd_Create__Q211daObjSwpush5Act_cFv */ @@ -609,14 +620,14 @@ SECTION_RODATA static u8 const tri_id[6 + 2 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80484E34, &tri_id); +COMPILER_STRIP_GATE(0x80484E34, &tri_id); #pragma pop /* 80484E3C-80484E40 00012C 0004+00 0/3 0/0 0/0 .rodata @4028 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4028 = -1.0f; -COMPILER_STRIP_GATE(80484E3C, &lit_4028); +COMPILER_STRIP_GATE(0x80484E3C, &lit_4028); #pragma pop /* 80484EB0-80484EBC -00001 000C+00 0/1 0/0 0/0 .data @4518 */ @@ -928,7 +939,7 @@ asm void daObjSwpush::Act_c::jnodeCB(J3DJoint* param_0, int param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4097 = -36.5f; -COMPILER_STRIP_GATE(80484E40, &lit_4097); +COMPILER_STRIP_GATE(0x80484E40, &lit_4097); #pragma pop /* 80483A5C-80483B70 000DFC 0114+00 1/1 0/0 0/0 .text calc_top_pos__Q211daObjSwpush5Act_cFv */ @@ -976,7 +987,7 @@ asm void daObjSwpush::Act_c::mode_upper_init() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4214 = 9.0f / 10.0f; -COMPILER_STRIP_GATE(80484E44, &lit_4214); +COMPILER_STRIP_GATE(0x80484E44, &lit_4214); #pragma pop /* 80483D2C-80483FA8 0010CC 027C+00 1/0 0/0 0/0 .text mode_upper__Q211daObjSwpush5Act_cFv @@ -1042,6 +1053,14 @@ asm void daObjSwpush::Act_c::mode_l_u_init() { } #pragma pop +/* ############################################################################################## */ +/* 80484E4C-80484E4C 00013C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80484E76 = "D_MN11"; +SECTION_DEAD static char const* const stringBase_80484E7D = "D_MN06"; +#pragma pop + /* 804843C0-80484570 001760 01B0+00 1/0 0/0 0/0 .text mode_l_u__Q211daObjSwpush5Act_cFv */ #pragma push @@ -1189,7 +1208,7 @@ asm void daObjSwpush::Act_c::nr_ride_people(char param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4554 = 150.0f; -COMPILER_STRIP_GATE(80484E48, &lit_4554); +COMPILER_STRIP_GATE(0x80484E48, &lit_4554); #pragma pop /* 8048509C-804850A0 -00001 0004+00 1/1 0/0 0/0 .bss None */ @@ -1274,7 +1293,8 @@ static bool func_80484CDC() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80484CE4(fopAc_ac_c const* param_0, daObjSwpush::Act_c::Prm_e param_1, +extern "C" asm void func_80484CE4(void* _this, fopAc_ac_c const* param_0, + daObjSwpush::Act_c::Prm_e param_1, daObjSwpush::Act_c::Prm_e param_2) { nofralloc #include "asm/rel/d/a/obj/d_a_obj_swpush/d_a_obj_swpush/func_80484CE4.s" @@ -1453,15 +1473,4 @@ static u8 data_804850FC[4]; static u8 data_80485100[4]; #pragma pop -/* 80484E4C-80484E84 00013C 0038+00 3/2 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80484E4C = "Kbota_00"; -SECTION_DEAD static char const* const stringBase_80484E55 = "S_lv3bota"; -SECTION_DEAD static char const* const stringBase_80484E5F = "S_lv6bota"; -SECTION_DEAD static char const* const stringBase_80484E69 = "bottan"; -SECTION_DEAD static char const* const stringBase_80484E70 = "botan"; -SECTION_DEAD static char const* const stringBase_80484E76 = "D_MN11"; -SECTION_DEAD static char const* const stringBase_80484E7D = "D_MN06"; -#pragma pop +/* 80484E4C-80484E4C 00013C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_swpush2/d_a_obj_swpush2.cpp b/rel/d/a/obj/d_a_obj_swpush2/d_a_obj_swpush2.cpp index c33c1ff0ec9..f8d3796ef36 100644 --- a/rel/d/a/obj/d_a_obj_swpush2/d_a_obj_swpush2.cpp +++ b/rel/d/a/obj/d_a_obj_swpush2/d_a_obj_swpush2.cpp @@ -25,11 +25,11 @@ struct mDoMtx_stack_c { static u8 now[48]; }; -struct J3DAnmColor {}; +struct J3DAnmTextureSRTKey {}; struct J3DAnmTevRegKey {}; -struct J3DAnmTextureSRTKey {}; +struct J3DAnmColor {}; struct J3DMaterialTable { /* 8032F64C */ void removeMatColorAnimator(J3DAnmColor*); @@ -120,7 +120,8 @@ struct daObj { template void PrmAbstract(/* ... */); /* 80CFFBD0 */ /* daObj::PrmAbstract */ - void func_80CFFBD0(fopAc_ac_c const*, daObjSwpush2::Act_c::Prm_e, daObjSwpush2::Act_c::Prm_e); + void func_80CFFBD0(void* _this, fopAc_ac_c const*, daObjSwpush2::Act_c::Prm_e, + daObjSwpush2::Act_c::Prm_e); }; struct dVibration_c { @@ -175,10 +176,10 @@ struct cBgS { struct cBgD_t {}; -struct Vec {}; - struct JAISoundID {}; +struct Vec {}; + struct Z2SeMgr { /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); }; @@ -245,7 +246,7 @@ extern "C" static void func_80CFFB50(); extern "C" static void func_80CFFB70(); extern "C" static void func_80CFFB90(); extern "C" static void func_80CFFBB0(); -extern "C" void func_80CFFBD0(fopAc_ac_c const*, daObjSwpush2::Act_c::Prm_e, +extern "C" void func_80CFFBD0(void* _this, fopAc_ac_c const*, daObjSwpush2::Act_c::Prm_e, daObjSwpush2::Act_c::Prm_e); extern "C" u8 const M_arcname__Q212daObjSwpush25Act_c[9 + 3 /* padding */]; extern "C" void* const M_attr__Q212daObjSwpush25Act_c[56]; @@ -326,6 +327,13 @@ extern "C" extern u8 struct_80CFFEF8[4]; // Declarations: // +/* ############################################################################################## */ +/* 80CFFD24-80CFFD24 000130 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80CFFD24 = "K_swmn00"; +#pragma pop + /* 80CFE098-80CFE0A4 000078 000C+00 1/1 0/0 0/0 .text getArcName__Q212daObjSwpush25Act_cFv */ #pragma push #pragma optimization_level 0 @@ -336,6 +344,13 @@ asm void daObjSwpush2::Act_c::getArcName() { } #pragma pop +/* ############################################################################################## */ +/* 80CFFD24-80CFFD24 000130 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80CFFD2D = "K_hum_isw00.bmd"; +#pragma pop + /* 80CFE0A4-80CFE0B4 000084 0010+00 1/1 0/0 0/0 .text getBmdName__Q212daObjSwpush25Act_cFv */ #pragma push #pragma optimization_level 0 @@ -346,6 +361,13 @@ asm void daObjSwpush2::Act_c::getBmdName() { } #pragma pop +/* ############################################################################################## */ +/* 80CFFD24-80CFFD24 000130 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80CFFD3D = "K_hum_isw00.dzb"; +#pragma pop + /* 80CFE0B4-80CFE0C4 000094 0010+00 1/1 0/0 0/0 .text getDzbName__Q212daObjSwpush25Act_cFv */ #pragma push #pragma optimization_level 0 @@ -356,6 +378,13 @@ asm void daObjSwpush2::Act_c::getDzbName() { } #pragma pop +/* ############################################################################################## */ +/* 80CFFD24-80CFFD24 000130 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80CFFD4D = "K_isw_nml.btk"; +#pragma pop + /* 80CFE0C4-80CFE0D4 0000A4 0010+00 1/1 0/0 0/0 .text getNmlBtkName__Q212daObjSwpush25Act_cFv */ #pragma push #pragma optimization_level 0 @@ -366,6 +395,13 @@ asm void daObjSwpush2::Act_c::getNmlBtkName() { } #pragma pop +/* ############################################################################################## */ +/* 80CFFD24-80CFFD24 000130 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80CFFD5B = "K_isw_nml.brk"; +#pragma pop + /* 80CFE0D4-80CFE0E4 0000B4 0010+00 1/1 0/0 0/0 .text getNmlBrkName__Q212daObjSwpush25Act_cFv */ #pragma push #pragma optimization_level 0 @@ -376,6 +412,13 @@ asm void daObjSwpush2::Act_c::getNmlBrkName() { } #pragma pop +/* ############################################################################################## */ +/* 80CFFD24-80CFFD24 000130 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80CFFD69 = "K_isw_on.btk"; +#pragma pop + /* 80CFE0E4-80CFE0F4 0000C4 0010+00 1/1 0/0 0/0 .text getOnBtkName__Q212daObjSwpush25Act_cFv */ #pragma push #pragma optimization_level 0 @@ -386,6 +429,13 @@ asm void daObjSwpush2::Act_c::getOnBtkName() { } #pragma pop +/* ############################################################################################## */ +/* 80CFFD24-80CFFD24 000130 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80CFFD76 = "K_isw_run.bpk"; +#pragma pop + /* 80CFE0F4-80CFE104 0000D4 0010+00 1/1 0/0 0/0 .text getRunBpkName__Q212daObjSwpush25Act_cFv */ #pragma push #pragma optimization_level 0 @@ -396,6 +446,13 @@ asm void daObjSwpush2::Act_c::getRunBpkName() { } #pragma pop +/* ############################################################################################## */ +/* 80CFFD24-80CFFD24 000130 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80CFFD84 = "K_isw_run.brk"; +#pragma pop + /* 80CFE104-80CFE114 0000E4 0010+00 1/1 0/0 0/0 .text getRunBrkName__Q212daObjSwpush25Act_cFv */ #pragma push #pragma optimization_level 0 @@ -406,6 +463,13 @@ asm void daObjSwpush2::Act_c::getRunBrkName() { } #pragma pop +/* ############################################################################################## */ +/* 80CFFD24-80CFFD24 000130 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80CFFD92 = "K_isw_run.btk"; +#pragma pop + /* 80CFE114-80CFE124 0000F4 0010+00 1/1 0/0 0/0 .text getRunBtkName__Q212daObjSwpush25Act_cFv */ #pragma push #pragma optimization_level 0 @@ -466,7 +530,7 @@ SECTION_RODATA u8 const daObjSwpush2::Act_c::M_arcname[9 + 3 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CFFBF4, &daObjSwpush2::Act_c::M_arcname); +COMPILER_STRIP_GATE(0x80CFFBF4, &daObjSwpush2::Act_c::M_arcname); /* 80CFFC00-80CFFCE0 -00001 00E0+00 7/10 0/0 0/0 .rodata M_attr__Q212daObjSwpush25Act_c */ SECTION_RODATA void* const daObjSwpush2::Act_c::M_attr[56] = { @@ -499,11 +563,11 @@ SECTION_RODATA void* const daObjSwpush2::Act_c::M_attr[56] = { (void*)0x3F800000, (void*)0x40200000, (void*)0x00060000, (void*)0x43960000, }; -COMPILER_STRIP_GATE(80CFFC00, &daObjSwpush2::Act_c::M_attr); +COMPILER_STRIP_GATE(0x80CFFC00, &daObjSwpush2::Act_c::M_attr); /* 80CFFCE0-80CFFCE4 0000EC 0004+00 3/7 0/0 0/0 .rodata @3857 */ SECTION_RODATA static f32 const lit_3857 = 1.0f; -COMPILER_STRIP_GATE(80CFFCE0, &lit_3857); +COMPILER_STRIP_GATE(0x80CFFCE0, &lit_3857); /* 80CFFCE4-80CFFCE8 0000F0 0004+00 2/5 0/0 0/0 .rodata @3858 */ SECTION_RODATA static u8 const lit_3858[4] = { @@ -512,7 +576,7 @@ SECTION_RODATA static u8 const lit_3858[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CFFCE4, &lit_3858); +COMPILER_STRIP_GATE(0x80CFFCE4, &lit_3858); /* 80CFFDA0-80CFFDAC 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { @@ -689,26 +753,26 @@ asm J3DFrameCtrl::~J3DFrameCtrl() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3936 = 150.0f; -COMPILER_STRIP_GATE(80CFFCE8, &lit_3936); +COMPILER_STRIP_GATE(0x80CFFCE8, &lit_3936); #pragma pop /* 80CFFCEC-80CFFCF0 0000F8 0004+00 0/1 0/0 0/0 .rodata @3937 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3937 = -150.0f; -COMPILER_STRIP_GATE(80CFFCEC, &lit_3937); +COMPILER_STRIP_GATE(0x80CFFCEC, &lit_3937); #pragma pop /* 80CFFCF0-80CFFCF4 0000FC 0004+00 0/1 0/0 0/0 .rodata @3938 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3938 = 60.0f; -COMPILER_STRIP_GATE(80CFFCF0, &lit_3938); +COMPILER_STRIP_GATE(0x80CFFCF0, &lit_3938); #pragma pop /* 80CFFCF4-80CFFCF8 000100 0004+00 1/4 0/0 0/0 .rodata @3939 */ SECTION_RODATA static f32 const lit_3939 = -1.0f; -COMPILER_STRIP_GATE(80CFFCF4, &lit_3939); +COMPILER_STRIP_GATE(0x80CFFCF4, &lit_3939); /* 80CFE6D8-80CFE8CC 0006B8 01F4+00 1/1 0/0 0/0 .text create_init__Q212daObjSwpush25Act_cFv */ #pragma push @@ -753,7 +817,7 @@ asm void daObjSwpush2::Act_c::Mthd_Delete() { /* ############################################################################################## */ /* 80CFFCF8-80CFFCFC 000104 0004+00 1/2 0/0 0/0 .rodata @4012 */ SECTION_RODATA static f32 const lit_4012 = -10.0f; -COMPILER_STRIP_GATE(80CFFCF8, &lit_4012); +COMPILER_STRIP_GATE(0x80CFFCF8, &lit_4012); /* 80CFEAB4-80CFEB3C 000A94 0088+00 2/2 0/0 0/0 .text set_mtx__Q212daObjSwpush25Act_cFv */ @@ -793,28 +857,28 @@ asm void daObjSwpush2::Act_c::rideCB(dBgW* param_0, fopAc_ac_c* param_1, fopAc_a #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4039 = 1.0f / 20.0f; -COMPILER_STRIP_GATE(80CFFCFC, &lit_4039); +COMPILER_STRIP_GATE(0x80CFFCFC, &lit_4039); #pragma pop /* 80CFFD00-80CFFD04 00010C 0004+00 0/1 0/0 0/0 .rodata @4040 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4040 = 1.0f / 50.0f; -COMPILER_STRIP_GATE(80CFFD00, &lit_4040); +COMPILER_STRIP_GATE(0x80CFFD00, &lit_4040); #pragma pop /* 80CFFD04-80CFFD08 000110 0004+00 0/1 0/0 0/0 .rodata @4041 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4041 = 1.0f / 100.0f; -COMPILER_STRIP_GATE(80CFFD04, &lit_4041); +COMPILER_STRIP_GATE(0x80CFFD04, &lit_4041); #pragma pop /* 80CFFD08-80CFFD0C 000114 0004+00 0/1 0/0 0/0 .rodata @4042 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4042 = -50.0f; -COMPILER_STRIP_GATE(80CFFD08, &lit_4042); +COMPILER_STRIP_GATE(0x80CFFD08, &lit_4042); #pragma pop /* 80CFEBE4-80CFEC4C 000BC4 0068+00 1/1 0/0 0/0 .text calc_top_pos__Q212daObjSwpush25Act_cFv */ @@ -1019,7 +1083,7 @@ asm void daObjSwpush2::Act_c::demo_runSw() { SECTION_RODATA static u8 const lit_4395[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CFFD0C, &lit_4395); +COMPILER_STRIP_GATE(0x80CFFD0C, &lit_4395); #pragma pop /* 80CFFD14-80CFFD1C 000120 0008+00 0/1 0/0 0/0 .rodata @4396 */ @@ -1028,7 +1092,7 @@ COMPILER_STRIP_GATE(80CFFD0C, &lit_4395); SECTION_RODATA static u8 const lit_4396[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CFFD14, &lit_4396); +COMPILER_STRIP_GATE(0x80CFFD14, &lit_4396); #pragma pop /* 80CFFD1C-80CFFD24 000128 0008+00 0/1 0/0 0/0 .rodata @4397 */ @@ -1037,7 +1101,7 @@ COMPILER_STRIP_GATE(80CFFD14, &lit_4396); SECTION_RODATA static u8 const lit_4397[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80CFFD1C, &lit_4397); +COMPILER_STRIP_GATE(0x80CFFD1C, &lit_4397); #pragma pop /* 80CFF568-80CFF8FC 001548 0394+00 1/1 0/0 0/0 .text Mthd_Execute__Q212daObjSwpush25Act_cFv */ @@ -1111,24 +1175,12 @@ static asm void func_80CFFBB0() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80CFFBD0(fopAc_ac_c const* param_0, daObjSwpush2::Act_c::Prm_e param_1, +extern "C" asm void func_80CFFBD0(void* _this, fopAc_ac_c const* param_0, + daObjSwpush2::Act_c::Prm_e param_1, daObjSwpush2::Act_c::Prm_e param_2) { nofralloc #include "asm/rel/d/a/obj/d_a_obj_swpush2/d_a_obj_swpush2/func_80CFFBD0.s" } #pragma pop -/* 80CFFD24-80CFFDA0 000130 007C+00 9/9 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80CFFD24 = "K_swmn00"; -SECTION_DEAD static char const* const stringBase_80CFFD2D = "K_hum_isw00.bmd"; -SECTION_DEAD static char const* const stringBase_80CFFD3D = "K_hum_isw00.dzb"; -SECTION_DEAD static char const* const stringBase_80CFFD4D = "K_isw_nml.btk"; -SECTION_DEAD static char const* const stringBase_80CFFD5B = "K_isw_nml.brk"; -SECTION_DEAD static char const* const stringBase_80CFFD69 = "K_isw_on.btk"; -SECTION_DEAD static char const* const stringBase_80CFFD76 = "K_isw_run.bpk"; -SECTION_DEAD static char const* const stringBase_80CFFD84 = "K_isw_run.brk"; -SECTION_DEAD static char const* const stringBase_80CFFD92 = "K_isw_run.btk"; -#pragma pop +/* 80CFFD24-80CFFD24 000130 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_swpush5/d_a_obj_swpush5.cpp b/rel/d/a/obj/d_a_obj_swpush5/d_a_obj_swpush5.cpp index 15a52fbf21e..0ea093ab730 100644 --- a/rel/d/a/obj/d_a_obj_swpush5/d_a_obj_swpush5.cpp +++ b/rel/d/a/obj/d_a_obj_swpush5/d_a_obj_swpush5.cpp @@ -264,13 +264,13 @@ extern "C" void __register_global_object(); SECTION_RODATA static u8 const l_dzbIdx[8] = { 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x08, }; -COMPILER_STRIP_GATE(8059C6A4, &l_dzbIdx); +COMPILER_STRIP_GATE(0x8059C6A4, &l_dzbIdx); /* 8059C6AC-8059C6B0 000008 0004+00 0/1 0/0 0/0 .rodata @3718 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3718 = -50.0f; -COMPILER_STRIP_GATE(8059C6AC, &lit_3718); +COMPILER_STRIP_GATE(0x8059C6AC, &lit_3718); #pragma pop /* 8059C6B0-8059C6B4 00000C 0004+00 3/7 0/0 0/0 .rodata @3719 */ @@ -280,13 +280,13 @@ SECTION_RODATA static u8 const lit_3719[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(8059C6B0, &lit_3719); +COMPILER_STRIP_GATE(0x8059C6B0, &lit_3719); /* 8059C6B4-8059C6B8 000010 0004+00 0/1 0/0 0/0 .rodata @3720 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3720 = 50.0f; -COMPILER_STRIP_GATE(8059C6B4, &lit_3720); +COMPILER_STRIP_GATE(0x8059C6B4, &lit_3720); #pragma pop /* 8059C870-8059C874 000008 0001+03 1/1 0/0 0/0 .bss @1109 */ @@ -456,7 +456,7 @@ asm void daObjSw5_c::setBaseMtx() { /* ############################################################################################## */ /* 8059C6B8-8059C6BC 000014 0004+00 1/3 0/0 0/0 .rodata @3815 */ SECTION_RODATA static f32 const lit_3815 = -25.0f; -COMPILER_STRIP_GATE(8059C6B8, &lit_3815); +COMPILER_STRIP_GATE(0x8059C6B8, &lit_3815); /* 8059B920-8059BA1C 000520 00FC+00 1/0 0/0 0/0 .text Create__10daObjSw5_cFv */ #pragma push @@ -469,6 +469,12 @@ asm void daObjSw5_c::Create() { #pragma pop /* ############################################################################################## */ +/* 8059C6D0-8059C6D0 00002C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8059C6D0 = "D_Hfsw00"; +#pragma pop + /* 8059C6DC-8059C6E8 000000 000C+00 2/2 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -787,19 +793,19 @@ void daObjSw5_c::actionEvent() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3986 = 9.0f / 10.0f; -COMPILER_STRIP_GATE(8059C6BC, &lit_3986); +COMPILER_STRIP_GATE(0x8059C6BC, &lit_3986); #pragma pop /* 8059C6C0-8059C6C4 00001C 0004+00 0/1 0/0 0/0 .rodata @3987 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3987 = 0.5f; -COMPILER_STRIP_GATE(8059C6C0, &lit_3987); +COMPILER_STRIP_GATE(0x8059C6C0, &lit_3987); #pragma pop /* 8059C6C4-8059C6C8 000020 0004+00 2/6 0/0 0/0 .rodata @3988 */ SECTION_RODATA static f32 const lit_3988 = 1.0f; -COMPILER_STRIP_GATE(8059C6C4, &lit_3988); +COMPILER_STRIP_GATE(0x8059C6C4, &lit_3988); /* 8059BF54-8059BFE4 000B54 0090+00 1/1 0/0 0/0 .text calc_top_pos__10daObjSw5_cFv */ #pragma push @@ -835,13 +841,13 @@ asm void daObjSw5_c::modeWaitLowerInit() { /* ############################################################################################## */ /* 8059C6C8-8059C6CC 000024 0004+00 1/3 0/0 0/0 .rodata @4041 */ SECTION_RODATA static f32 const lit_4041 = -1.0f; -COMPILER_STRIP_GATE(8059C6C8, &lit_4041); +COMPILER_STRIP_GATE(0x8059C6C8, &lit_4041); /* 8059C6CC-8059C6D0 000028 0004+00 0/1 0/0 0/0 .rodata @4042 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4042 = 4.0f / 5.0f; -COMPILER_STRIP_GATE(8059C6CC, &lit_4042); +COMPILER_STRIP_GATE(0x8059C6CC, &lit_4042); #pragma pop /* 8059C0C8-8059C23C 000CC8 0174+00 1/0 0/0 0/0 .text modeWaitLower__10daObjSw5_cFv */ @@ -1157,9 +1163,4 @@ static u8 data_8059C974[4]; static u8 data_8059C978[4]; #pragma pop -/* 8059C6D0-8059C6D9 00002C 0009+00 1/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_8059C6D0 = "D_Hfsw00"; -#pragma pop +/* 8059C6D0-8059C6D0 00002C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_swspinner/d_a_obj_swspinner.cpp b/rel/d/a/obj/d_a_obj_swspinner/d_a_obj_swspinner.cpp index a986673c148..26bd8476a7a 100644 --- a/rel/d/a/obj/d_a_obj_swspinner/d_a_obj_swspinner.cpp +++ b/rel/d/a/obj/d_a_obj_swspinner/d_a_obj_swspinner.cpp @@ -97,10 +97,10 @@ struct cBgS { /* 80074250 */ void Release(dBgW_Base*); }; -struct Vec {}; - struct JAISoundID {}; +struct Vec {}; + struct Z2SeMgr { /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); /* 802AC50C */ void seStartLevel(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); @@ -203,7 +203,7 @@ SECTION_RODATA static u8 const lit_3717[4 + 4 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D00A94, &lit_3717); +COMPILER_STRIP_GATE(0x80D00A94, &lit_3717); /* 80D00A9C-80D00AA4 000008 0008+00 0/1 0/0 0/0 .rodata @3718 */ #pragma push @@ -211,7 +211,7 @@ COMPILER_STRIP_GATE(80D00A94, &lit_3717); SECTION_RODATA static u8 const lit_3718[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D00A9C, &lit_3718); +COMPILER_STRIP_GATE(0x80D00A9C, &lit_3718); #pragma pop /* 80D00AA4-80D00AAC 000010 0008+00 0/1 0/0 0/0 .rodata @3719 */ @@ -220,7 +220,7 @@ COMPILER_STRIP_GATE(80D00A9C, &lit_3718); SECTION_RODATA static u8 const lit_3719[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D00AA4, &lit_3719); +COMPILER_STRIP_GATE(0x80D00AA4, &lit_3719); #pragma pop /* 80D00AAC-80D00AB4 000018 0008+00 0/1 0/0 0/0 .rodata @3720 */ @@ -229,14 +229,14 @@ COMPILER_STRIP_GATE(80D00AA4, &lit_3719); SECTION_RODATA static u8 const lit_3720[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D00AAC, &lit_3720); +COMPILER_STRIP_GATE(0x80D00AAC, &lit_3720); #pragma pop /* 80D00AB4-80D00AB8 000020 0004+00 0/3 0/0 0/0 .rodata @3721 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3721 = 100.0f; -COMPILER_STRIP_GATE(80D00AB4, &lit_3721); +COMPILER_STRIP_GATE(0x80D00AB4, &lit_3721); #pragma pop /* 80CFFF78-80D00174 000078 01FC+00 1/1 0/0 0/0 .text search_spinner_sub__FPvPv */ @@ -275,14 +275,14 @@ asm void daObjSwSpinner_c::setBaseMtx() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3773 = 50.0f; -COMPILER_STRIP_GATE(80D00AB8, &lit_3773); +COMPILER_STRIP_GATE(0x80D00AB8, &lit_3773); #pragma pop /* 80D00ABC-80D00AC0 000028 0004+00 0/1 0/0 0/0 .rodata @3774 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3774 = 30.0f; -COMPILER_STRIP_GATE(80D00ABC, &lit_3774); +COMPILER_STRIP_GATE(0x80D00ABC, &lit_3774); #pragma pop /* 80D00284-80D0035C 000384 00D8+00 1/0 0/0 0/0 .text Create__16daObjSwSpinner_cFv */ @@ -296,6 +296,12 @@ asm void daObjSwSpinner_c::Create() { #pragma pop /* ############################################################################################## */ +/* 80D00AD4-80D00AD4 000040 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80D00AD4 = "P_Sswitch"; +#pragma pop + /* 80D00AE0-80D00AE4 -00001 0004+00 3/3 0/0 0/0 .data l_arcName */ SECTION_DATA static void* l_arcName = (void*)&d_a_obj_swspinner__stringBase0; @@ -324,35 +330,35 @@ asm void daObjSwSpinner_c::create1st() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3919 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(80D00AC0, &lit_3919); +COMPILER_STRIP_GATE(0x80D00AC0, &lit_3919); #pragma pop /* 80D00AC4-80D00AC8 000030 0004+00 0/1 0/0 0/0 .rodata @3920 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3920 = 10.0f; -COMPILER_STRIP_GATE(80D00AC4, &lit_3920); +COMPILER_STRIP_GATE(0x80D00AC4, &lit_3920); #pragma pop /* 80D00AC8-80D00ACC 000034 0004+00 0/1 0/0 0/0 .rodata @3921 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3921 = 2.0f; -COMPILER_STRIP_GATE(80D00AC8, &lit_3921); +COMPILER_STRIP_GATE(0x80D00AC8, &lit_3921); #pragma pop /* 80D00ACC-80D00AD0 000038 0004+00 0/1 0/0 0/0 .rodata @3922 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3922 = 1.0f; -COMPILER_STRIP_GATE(80D00ACC, &lit_3922); +COMPILER_STRIP_GATE(0x80D00ACC, &lit_3922); #pragma pop /* 80D00AD0-80D00AD4 00003C 0004+00 0/1 0/0 0/0 .rodata @3923 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3923 = -1.0f; -COMPILER_STRIP_GATE(80D00AD0, &lit_3923); +COMPILER_STRIP_GATE(0x80D00AD0, &lit_3923); #pragma pop /* 80D00518-80D00890 000618 0378+00 1/0 0/0 0/0 .text Execute__16daObjSwSpinner_cFPPA3_A4_f */ @@ -466,9 +472,4 @@ static asm void daObjSwSpinner_MoveBGDraw(daObjSwSpinner_c* param_0) { } #pragma pop -/* 80D00AD4-80D00ADE 000040 000A+00 1/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80D00AD4 = "P_Sswitch"; -#pragma pop +/* 80D00AD4-80D00AD4 000040 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_swturn/d_a_obj_swturn.cpp b/rel/d/a/obj/d_a_obj_swturn/d_a_obj_swturn.cpp index f5f8e9fcd59..1fa730718c4 100644 --- a/rel/d/a/obj/d_a_obj_swturn/d_a_obj_swturn.cpp +++ b/rel/d/a/obj/d_a_obj_swturn/d_a_obj_swturn.cpp @@ -196,25 +196,25 @@ extern "C" extern u8 data_80D021A0[4]; SECTION_RODATA static u8 const l_bmd[8] = { 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x04, }; -COMPILER_STRIP_GATE(80D0206C, &l_bmd); +COMPILER_STRIP_GATE(0x80D0206C, &l_bmd); /* 80D02074-80D0207C 000008 0008+00 1/1 0/0 0/0 .rodata l_dzb */ SECTION_RODATA static u8 const l_dzb[8] = { 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x07, }; -COMPILER_STRIP_GATE(80D02074, &l_dzb); +COMPILER_STRIP_GATE(0x80D02074, &l_dzb); /* 80D0207C-80D02084 000010 0008+00 1/1 0/0 0/0 .rodata l_heap_size */ SECTION_RODATA static u8 const l_heap_size[8] = { 0x00, 0x00, 0x45, 0x30, 0x00, 0x00, 0x2B, 0xE0, }; -COMPILER_STRIP_GATE(80D0207C, &l_heap_size); +COMPILER_STRIP_GATE(0x80D0207C, &l_heap_size); /* 80D02084-80D02088 000018 0004+00 0/3 0/0 0/0 .rodata l_rot_time */ #pragma push #pragma force_active on SECTION_RODATA static u32 const l_rot_time = 0x005A001E; -COMPILER_STRIP_GATE(80D02084, &l_rot_time); +COMPILER_STRIP_GATE(0x80D02084, &l_rot_time); #pragma pop /* 80D02088-80D0208C 00001C 0002+02 0/1 0/0 0/0 .rodata l_tame_time_1st */ @@ -225,7 +225,7 @@ SECTION_RODATA static u16 const l_tame_time_1st[1 + 1 /* padding */] = { /* padding */ 0x0000, }; -COMPILER_STRIP_GATE(80D02088, &l_tame_time_1st); +COMPILER_STRIP_GATE(0x80D02088, &l_tame_time_1st); #pragma pop /* 80D0208C-80D02090 000020 0002+02 0/1 0/0 0/0 .rodata l_tame_time_cnt */ @@ -236,7 +236,7 @@ SECTION_RODATA static u16 const l_tame_time_cnt[1 + 1 /* padding */] = { /* padding */ 0x0000, }; -COMPILER_STRIP_GATE(80D0208C, &l_tame_time_cnt); +COMPILER_STRIP_GATE(0x80D0208C, &l_tame_time_cnt); #pragma pop /* 80D02090-80D02094 000024 0004+00 1/4 0/0 0/0 .rodata @3698 */ @@ -246,7 +246,7 @@ SECTION_RODATA static u8 const lit_3698[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D02090, &lit_3698); +COMPILER_STRIP_GATE(0x80D02090, &lit_3698); /* 80D00BD8-80D00CD8 000078 0100+00 1/1 0/0 0/0 .text * PPCallBack__FP10fopAc_ac_cP10fopAc_ac_csQ29dBgW_Base13PushPullLabel */ @@ -291,6 +291,13 @@ asm void daObjSwTurn_c::Create() { #pragma pop /* ############################################################################################## */ +/* 80D020B8-80D020B8 00004C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80D020B8 = "P_Lv4tsw"; +SECTION_DEAD static char const* const stringBase_80D020C1 = "P_Lv4tswD"; +#pragma pop + /* 80D020CC-80D020D8 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -400,11 +407,11 @@ asm void daObjSwTurn_c::init_modeWait() { /* ############################################################################################## */ /* 80D02094-80D02098 000028 0004+00 1/5 0/0 0/0 .rodata @4098 */ SECTION_RODATA static f32 const lit_4098 = 1.0f; -COMPILER_STRIP_GATE(80D02094, &lit_4098); +COMPILER_STRIP_GATE(0x80D02094, &lit_4098); /* 80D02098-80D0209C 00002C 0004+00 1/5 0/0 0/0 .rodata @4099 */ SECTION_RODATA static f32 const lit_4099 = -1.0f; -COMPILER_STRIP_GATE(80D02098, &lit_4099); +COMPILER_STRIP_GATE(0x80D02098, &lit_4099); /* 80D0209C-80D020A4 000030 0004+04 0/1 0/0 0/0 .rodata @4100 */ #pragma push @@ -414,7 +421,7 @@ SECTION_RODATA static f32 const lit_4100[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80D0209C, &lit_4100); +COMPILER_STRIP_GATE(0x80D0209C, &lit_4100); #pragma pop /* 80D020A4-80D020AC 000038 0008+00 0/4 0/0 0/0 .rodata @4102 */ @@ -423,7 +430,7 @@ COMPILER_STRIP_GATE(80D0209C, &lit_4100); SECTION_RODATA static u8 const lit_4102[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D020A4, &lit_4102); +COMPILER_STRIP_GATE(0x80D020A4, &lit_4102); #pragma pop /* 80D01198-80D01770 000638 05D8+00 1/0 0/0 0/0 .text modeWait__13daObjSwTurn_cFv */ @@ -441,7 +448,7 @@ asm void daObjSwTurn_c::modeWait() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4127 = 32768.0f; -COMPILER_STRIP_GATE(80D020AC, &lit_4127); +COMPILER_STRIP_GATE(0x80D020AC, &lit_4127); #pragma pop /* 80D01770-80D018B4 000C10 0144+00 1/1 0/0 0/0 .text init_modeRotate__13daObjSwTurn_cFv @@ -470,7 +477,7 @@ asm void daObjSwTurn_c::modeRotate() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4189 = 16384.0f; -COMPILER_STRIP_GATE(80D020B0, &lit_4189); +COMPILER_STRIP_GATE(0x80D020B0, &lit_4189); #pragma pop /* 80D01958-80D01B60 000DF8 0208+00 1/1 0/0 0/0 .text rotate_sub_0__13daObjSwTurn_cFv */ @@ -488,7 +495,7 @@ asm void daObjSwTurn_c::rotate_sub_0() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4304 = 5461.0f; -COMPILER_STRIP_GATE(80D020B4, &lit_4304); +COMPILER_STRIP_GATE(0x80D020B4, &lit_4304); #pragma pop /* 80D01B60-80D01EB0 001000 0350+00 1/1 0/0 0/0 .text rotate_sub_1__13daObjSwTurn_cFv */ @@ -600,10 +607,4 @@ static asm void daObjSwTurn_MoveBGDraw(daObjSwTurn_c* param_0) { } #pragma pop -/* 80D020B8-80D020CB 00004C 0013+00 1/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80D020B8 = "P_Lv4tsw"; -SECTION_DEAD static char const* const stringBase_80D020C1 = "P_Lv4tswD"; -#pragma pop +/* 80D020B8-80D020B8 00004C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_syRock/d_a_obj_syRock.cpp b/rel/d/a/obj/d_a_obj_syRock/d_a_obj_syRock.cpp index 45dd95536ed..bd1c2008c88 100644 --- a/rel/d/a/obj/d_a_obj_syRock/d_a_obj_syRock.cpp +++ b/rel/d/a/obj/d_a_obj_syRock/d_a_obj_syRock.cpp @@ -100,10 +100,10 @@ struct dRes_control_c { struct dPa_levelEcallBack {}; -struct _GXColor {}; - struct csXyz {}; +struct _GXColor {}; + struct dPa_control_c { /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, @@ -408,66 +408,66 @@ extern "C" void getPillarHeight__12daWtPillar_cFv(); /* ############################################################################################## */ /* 80D03F90-80D03F94 000000 0004+00 6/6 0/0 0/0 .rodata @3662 */ SECTION_RODATA static f32 const lit_3662 = 450.0f; -COMPILER_STRIP_GATE(80D03F90, &lit_3662); +COMPILER_STRIP_GATE(0x80D03F90, &lit_3662); /* 80D03F94-80D03F98 000004 0004+00 0/1 0/0 0/0 .rodata @3663 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3663 = 90.0f; -COMPILER_STRIP_GATE(80D03F94, &lit_3663); +COMPILER_STRIP_GATE(0x80D03F94, &lit_3663); #pragma pop /* 80D03F98-80D03F9C 000008 0004+00 0/1 0/0 0/0 .rodata @3664 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3664 = 45.0f; -COMPILER_STRIP_GATE(80D03F98, &lit_3664); +COMPILER_STRIP_GATE(0x80D03F98, &lit_3664); #pragma pop /* 80D03F9C-80D03FA0 00000C 0004+00 0/1 0/0 0/0 .rodata @3665 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3665 = 1.0f / 20.0f; -COMPILER_STRIP_GATE(80D03F9C, &lit_3665); +COMPILER_STRIP_GATE(0x80D03F9C, &lit_3665); #pragma pop /* 80D03FA0-80D03FA4 000010 0004+00 0/1 0/0 0/0 .rodata @3666 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3666 = 5.0f; -COMPILER_STRIP_GATE(80D03FA0, &lit_3666); +COMPILER_STRIP_GATE(0x80D03FA0, &lit_3666); #pragma pop /* 80D03FA4-80D03FA8 000014 0004+00 0/1 0/0 0/0 .rodata @3667 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3667 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(80D03FA4, &lit_3667); +COMPILER_STRIP_GATE(0x80D03FA4, &lit_3667); #pragma pop /* 80D03FA8-80D03FAC 000018 0004+00 0/1 0/0 0/0 .rodata @3668 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3668 = 10.0f; -COMPILER_STRIP_GATE(80D03FA8, &lit_3668); +COMPILER_STRIP_GATE(0x80D03FA8, &lit_3668); #pragma pop /* 80D03FAC-80D03FB0 00001C 0004+00 1/2 0/0 0/0 .rodata @3669 */ SECTION_RODATA static f32 const lit_3669 = 200.0f; -COMPILER_STRIP_GATE(80D03FAC, &lit_3669); +COMPILER_STRIP_GATE(0x80D03FAC, &lit_3669); /* 80D03FB0-80D03FB4 000020 0004+00 0/1 0/0 0/0 .rodata @3670 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3670 = 4.0f; -COMPILER_STRIP_GATE(80D03FB0, &lit_3670); +COMPILER_STRIP_GATE(0x80D03FB0, &lit_3670); #pragma pop /* 80D03FB4-80D03FB8 000024 0004+00 0/2 0/0 0/0 .rodata @3671 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3671 = 3.0f; -COMPILER_STRIP_GATE(80D03FB4, &lit_3671); +COMPILER_STRIP_GATE(0x80D03FB4, &lit_3671); #pragma pop /* 80D0403C-80D04048 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ @@ -715,6 +715,13 @@ asm void daSyRock_c::setBaseMtx() { } #pragma pop +/* ############################################################################################## */ +/* 80D04030-80D04030 0000A0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80D04030 = "syourock"; +#pragma pop + /* 80D02454-80D02584 000294 0130+00 1/0 0/0 0/0 .text CreateHeap__10daSyRock_cFv */ #pragma push #pragma optimization_level 0 @@ -732,17 +739,17 @@ SECTION_RODATA u8 const daSyRock_c::mCcDObjInfo[48] = { 0x00, 0x40, 0x00, 0x20, 0x00, 0x00, 0x00, 0x11, 0x00, 0x00, 0x00, 0x79, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D03FB8, &daSyRock_c::mCcDObjInfo); +COMPILER_STRIP_GATE(0x80D03FB8, &daSyRock_c::mCcDObjInfo); /* 80D03FE8-80D03FEC 000058 0004+00 2/5 0/0 0/0 .rodata @3805 */ SECTION_RODATA static f32 const lit_3805 = 150.0f; -COMPILER_STRIP_GATE(80D03FE8, &lit_3805); +COMPILER_STRIP_GATE(0x80D03FE8, &lit_3805); /* 80D03FEC-80D03FF0 00005C 0004+00 0/1 0/0 0/0 .rodata @3806 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3806 = 10000.0f; -COMPILER_STRIP_GATE(80D03FEC, &lit_3806); +COMPILER_STRIP_GATE(0x80D03FEC, &lit_3806); #pragma pop /* 80D03FF0-80D03FF4 000060 0004+00 2/5 0/0 0/0 .rodata @3807 */ @@ -752,7 +759,7 @@ SECTION_RODATA static u8 const lit_3807[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D03FF0, &lit_3807); +COMPILER_STRIP_GATE(0x80D03FF0, &lit_3807); /* 80D02584-80D02930 0003C4 03AC+00 1/1 0/0 0/0 .text create__10daSyRock_cFv */ #pragma push @@ -839,21 +846,21 @@ asm void daSyRock_c::Execute(f32 (**param_0)[3][4]) { #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_3948 = 0x43360B61; -COMPILER_STRIP_GATE(80D03FF4, &lit_3948); +COMPILER_STRIP_GATE(0x80D03FF4, &lit_3948); #pragma pop /* 80D03FF8-80D03FFC 000068 0004+00 0/1 0/0 0/0 .rodata @3949 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3949 = 680.0f; -COMPILER_STRIP_GATE(80D03FF8, &lit_3949); +COMPILER_STRIP_GATE(0x80D03FF8, &lit_3949); #pragma pop /* 80D03FFC-80D04000 00006C 0004+00 0/1 0/0 0/0 .rodata @3950 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3950 = 250.0f; -COMPILER_STRIP_GATE(80D03FFC, &lit_3950); +COMPILER_STRIP_GATE(0x80D03FFC, &lit_3950); #pragma pop /* 80D04260-80D0426C 000008 000C+00 1/1 0/0 0/0 .bss @3656 */ @@ -908,11 +915,11 @@ asm void daSyRock_c::eventStart() { /* ############################################################################################## */ /* 80D04000-80D04004 000070 0004+00 4/5 0/0 0/0 .rodata @4014 */ SECTION_RODATA static f32 const lit_4014 = 1.0f; -COMPILER_STRIP_GATE(80D04000, &lit_4014); +COMPILER_STRIP_GATE(0x80D04000, &lit_4014); /* 80D04004-80D04008 000074 0004+00 2/3 0/0 0/0 .rodata @4015 */ SECTION_RODATA static f32 const lit_4015 = -1.0f; -COMPILER_STRIP_GATE(80D04004, &lit_4015); +COMPILER_STRIP_GATE(0x80D04004, &lit_4015); /* 80D02FB8-80D03070 000DF8 00B8+00 1/1 0/0 0/0 .text init_modeDropInit__10daSyRock_cFv */ @@ -942,7 +949,7 @@ asm void daSyRock_c::modeDropInit() { SECTION_RODATA static u8 const lit_4078[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D04008, &lit_4078); +COMPILER_STRIP_GATE(0x80D04008, &lit_4078); #pragma pop /* 80D04010-80D04018 000080 0008+00 0/1 0/0 0/0 .rodata @4079 */ @@ -951,7 +958,7 @@ COMPILER_STRIP_GATE(80D04008, &lit_4078); SECTION_RODATA static u8 const lit_4079[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D04010, &lit_4079); +COMPILER_STRIP_GATE(0x80D04010, &lit_4079); #pragma pop /* 80D04018-80D04020 000088 0008+00 0/1 0/0 0/0 .rodata @4080 */ @@ -960,7 +967,7 @@ COMPILER_STRIP_GATE(80D04010, &lit_4079); SECTION_RODATA static u8 const lit_4080[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D04018, &lit_4080); +COMPILER_STRIP_GATE(0x80D04018, &lit_4080); #pragma pop /* 80D030A8-80D03250 000EE8 01A8+00 3/3 0/0 0/0 .text searchWaterPillar__10daSyRock_cFPvPv */ @@ -996,11 +1003,11 @@ asm void daSyRock_c::modeDrop() { /* ############################################################################################## */ /* 80D04020-80D04024 000090 0004+00 1/3 0/0 0/0 .rodata @4138 */ SECTION_RODATA static f32 const lit_4138 = -15.0f; -COMPILER_STRIP_GATE(80D04020, &lit_4138); +COMPILER_STRIP_GATE(0x80D04020, &lit_4138); /* 80D04024-80D04028 000094 0004+00 1/2 0/0 0/0 .rodata @4139 */ SECTION_RODATA static f32 const lit_4139 = 13.0f; -COMPILER_STRIP_GATE(80D04024, &lit_4139); +COMPILER_STRIP_GATE(0x80D04024, &lit_4139); /* 80D033D0-80D03440 001210 0070+00 1/1 0/0 0/0 .text init_modeSink__10daSyRock_cFv */ #pragma push @@ -1035,7 +1042,7 @@ asm void daSyRock_c::init_modeMove() { /* ############################################################################################## */ /* 80D04028-80D0402C 000098 0004+00 1/2 0/0 0/0 .rodata @4197 */ SECTION_RODATA static f32 const lit_4197 = 50.0f; -COMPILER_STRIP_GATE(80D04028, &lit_4197); +COMPILER_STRIP_GATE(0x80D04028, &lit_4197); /* 80D035F8-80D036B8 001438 00C0+00 1/0 0/0 0/0 .text modeMove__10daSyRock_cFv */ #pragma push @@ -1062,7 +1069,7 @@ asm void daSyRock_c::chkWaterLineIn() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4275 = 5.0f / 3.0f; -COMPILER_STRIP_GATE(80D0402C, &lit_4275); +COMPILER_STRIP_GATE(0x80D0402C, &lit_4275); #pragma pop /* 80D036DC-80D03984 00151C 02A8+00 2/2 0/0 0/0 .text bgCheck__10daSyRock_cFv */ @@ -1182,7 +1189,7 @@ asm void __sinit_d_a_obj_syRock_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80D03CA0 = (void*)__sinit_d_a_obj_syRock_cpp; +REGISTER_CTORS(0x80D03CA0, __sinit_d_a_obj_syRock_cpp); #pragma pop /* 80D03D10-80D03D18 001B50 0008+00 1/0 0/0 0/0 .text @1448@eventStart__10daSyRock_cFv */ @@ -1271,9 +1278,4 @@ asm daSyRock_c::~daSyRock_c() { } #pragma pop -/* 80D04030-80D04039 0000A0 0009+00 3/3 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80D04030 = "syourock"; -#pragma pop +/* 80D04030-80D04030 0000A0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_szbridge/d_a_obj_szbridge.cpp b/rel/d/a/obj/d_a_obj_szbridge/d_a_obj_szbridge.cpp index b8d9172fa56..19c88268a48 100644 --- a/rel/d/a/obj/d_a_obj_szbridge/d_a_obj_szbridge.cpp +++ b/rel/d/a/obj/d_a_obj_szbridge/d_a_obj_szbridge.cpp @@ -206,41 +206,41 @@ SECTION_RODATA static u8 const l_cull_box[24] = { 0xC3, 0x9B, 0x00, 0x00, 0xC1, 0xF0, 0x00, 0x00, 0xC4, 0x3E, 0x00, 0x00, 0x43, 0x9B, 0x00, 0x00, 0x43, 0xB4, 0x00, 0x00, 0x44, 0x3E, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D04C38, &l_cull_box); +COMPILER_STRIP_GATE(0x80D04C38, &l_cull_box); /* 80D04C50-80D04C54 000018 0004+00 0/1 0/0 0/0 .rodata @3642 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3642 = 1.0f; -COMPILER_STRIP_GATE(80D04C50, &lit_3642); +COMPILER_STRIP_GATE(0x80D04C50, &lit_3642); #pragma pop /* 80D04C54-80D04C58 00001C 0004+00 0/1 0/0 0/0 .rodata @3643 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3643 = 3.0f / 10.0f; -COMPILER_STRIP_GATE(80D04C54, &lit_3643); +COMPILER_STRIP_GATE(0x80D04C54, &lit_3643); #pragma pop /* 80D04C58-80D04C5C 000020 0004+00 0/1 0/0 0/0 .rodata @3644 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3644 = 7.0f; -COMPILER_STRIP_GATE(80D04C58, &lit_3644); +COMPILER_STRIP_GATE(0x80D04C58, &lit_3644); #pragma pop /* 80D04C5C-80D04C60 000024 0004+00 0/1 0/0 0/0 .rodata @3645 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3645 = 1.0f / 25.0f; -COMPILER_STRIP_GATE(80D04C5C, &lit_3645); +COMPILER_STRIP_GATE(0x80D04C5C, &lit_3645); #pragma pop /* 80D04C60-80D04C64 000028 0004+00 0/1 0/0 0/0 .rodata @3646 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3646 = 0.25f; -COMPILER_STRIP_GATE(80D04C60, &lit_3646); +COMPILER_STRIP_GATE(0x80D04C60, &lit_3646); #pragma pop /* 80D04360-80D04424 0000A0 00C4+00 1/1 0/0 0/0 .text rideActor__15daObjSZbridge_cFP10fopAc_ac_c @@ -255,6 +255,12 @@ asm void daObjSZbridge_c::rideActor(fopAc_ac_c* param_0) { #pragma pop /* ############################################################################################## */ +/* 80D04C80-80D04C80 000048 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80D04C80 = "S_Zbridge"; +#pragma pop + /* 80D04C8C-80D04C90 -00001 0004+00 3/3 0/0 0/0 .data l_arcName */ SECTION_DATA static void* l_arcName = (void*)&d_a_obj_szbridge__stringBase0; @@ -293,42 +299,42 @@ asm void daObjSZbridge_c::CreateHeap() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3715 = 700.0f; -COMPILER_STRIP_GATE(80D04C64, &lit_3715); +COMPILER_STRIP_GATE(0x80D04C64, &lit_3715); #pragma pop /* 80D04C68-80D04C6C 000030 0004+00 0/1 0/0 0/0 .rodata @3716 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3716 = -1000000000.0f; -COMPILER_STRIP_GATE(80D04C68, &lit_3716); +COMPILER_STRIP_GATE(0x80D04C68, &lit_3716); #pragma pop /* 80D04C6C-80D04C70 000034 0004+00 0/1 0/0 0/0 .rodata @3717 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3717 = 1.0f / 20.0f; -COMPILER_STRIP_GATE(80D04C6C, &lit_3717); +COMPILER_STRIP_GATE(0x80D04C6C, &lit_3717); #pragma pop /* 80D04C70-80D04C74 000038 0004+00 0/1 0/0 0/0 .rodata @3718 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3718 = 70.0f; -COMPILER_STRIP_GATE(80D04C70, &lit_3718); +COMPILER_STRIP_GATE(0x80D04C70, &lit_3718); #pragma pop /* 80D04C74-80D04C78 00003C 0004+00 0/1 0/0 0/0 .rodata @3719 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_3719 = 0x3F7C28F6; -COMPILER_STRIP_GATE(80D04C74, &lit_3719); +COMPILER_STRIP_GATE(0x80D04C74, &lit_3719); #pragma pop /* 80D04C78-80D04C7C 000040 0004+00 0/1 0/0 0/0 .rodata @3720 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3720 = 5.0f; -COMPILER_STRIP_GATE(80D04C78, &lit_3720); +COMPILER_STRIP_GATE(0x80D04C78, &lit_3720); #pragma pop /* 80D04C90-80D04CB0 -00001 0020+00 1/0 0/0 0/0 .data daObjSZbridge_METHODS */ @@ -423,7 +429,7 @@ SECTION_RODATA static u8 const lit_3739[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D04C7C, &lit_3739); +COMPILER_STRIP_GATE(0x80D04C7C, &lit_3739); /* 80D048C4-80D04974 000604 00B0+00 1/0 0/0 0/0 .text Create__15daObjSZbridge_cFv */ #pragma push @@ -595,9 +601,4 @@ static asm void func_80D04C28() { } #pragma pop -/* 80D04C80-80D04C8A 000048 000A+00 1/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80D04C80 = "S_Zbridge"; -#pragma pop +/* 80D04C80-80D04C80 000048 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_taFence/d_a_obj_taFence.cpp b/rel/d/a/obj/d_a_obj_taFence/d_a_obj_taFence.cpp index ad07b2fd7f9..17b8787725c 100644 --- a/rel/d/a/obj/d_a_obj_taFence/d_a_obj_taFence.cpp +++ b/rel/d/a/obj/d_a_obj_taFence/d_a_obj_taFence.cpp @@ -296,87 +296,87 @@ SECTION_RODATA static u8 const lit_3651[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D060E0, &lit_3651); +COMPILER_STRIP_GATE(0x80D060E0, &lit_3651); /* 80D060E4-80D060E8 000004 0004+00 0/1 0/0 0/0 .rodata @3652 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3652 = 13.0f; -COMPILER_STRIP_GATE(80D060E4, &lit_3652); +COMPILER_STRIP_GATE(0x80D060E4, &lit_3652); #pragma pop /* 80D060E8-80D060EC 000008 0004+00 0/1 0/0 0/0 .rodata @3653 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3653 = 200.0f; -COMPILER_STRIP_GATE(80D060E8, &lit_3653); +COMPILER_STRIP_GATE(0x80D060E8, &lit_3653); #pragma pop /* 80D060EC-80D060F0 00000C 0004+00 0/1 0/0 0/0 .rodata @3654 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3654 = 90.0f; -COMPILER_STRIP_GATE(80D060EC, &lit_3654); +COMPILER_STRIP_GATE(0x80D060EC, &lit_3654); #pragma pop /* 80D060F0-80D060F4 000010 0004+00 0/1 0/0 0/0 .rodata @3655 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3655 = 45.0f; -COMPILER_STRIP_GATE(80D060F0, &lit_3655); +COMPILER_STRIP_GATE(0x80D060F0, &lit_3655); #pragma pop /* 80D060F4-80D060F8 000014 0004+00 0/1 0/0 0/0 .rodata @3656 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3656 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(80D060F4, &lit_3656); +COMPILER_STRIP_GATE(0x80D060F4, &lit_3656); #pragma pop /* 80D060F8-80D060FC 000018 0004+00 0/1 0/0 0/0 .rodata @3657 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3657 = 10.0f; -COMPILER_STRIP_GATE(80D060F8, &lit_3657); +COMPILER_STRIP_GATE(0x80D060F8, &lit_3657); #pragma pop /* 80D060FC-80D06100 00001C 0004+00 1/3 0/0 0/0 .rodata @3658 */ SECTION_RODATA static f32 const lit_3658 = 1.0f; -COMPILER_STRIP_GATE(80D060FC, &lit_3658); +COMPILER_STRIP_GATE(0x80D060FC, &lit_3658); /* 80D06100-80D06104 000020 0004+00 0/1 0/0 0/0 .rodata @3659 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3659 = 100.0f; -COMPILER_STRIP_GATE(80D06100, &lit_3659); +COMPILER_STRIP_GATE(0x80D06100, &lit_3659); #pragma pop /* 80D06104-80D06108 000024 0004+00 0/1 0/0 0/0 .rodata @3660 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3660 = 3.0f / 10.0f; -COMPILER_STRIP_GATE(80D06104, &lit_3660); +COMPILER_STRIP_GATE(0x80D06104, &lit_3660); #pragma pop /* 80D06108-80D0610C 000028 0004+00 0/1 0/0 0/0 .rodata @3661 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3661 = 1.5f; -COMPILER_STRIP_GATE(80D06108, &lit_3661); +COMPILER_STRIP_GATE(0x80D06108, &lit_3661); #pragma pop /* 80D0610C-80D06110 00002C 0004+00 0/1 0/0 0/0 .rodata @3662 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3662 = 12.0f; -COMPILER_STRIP_GATE(80D0610C, &lit_3662); +COMPILER_STRIP_GATE(0x80D0610C, &lit_3662); #pragma pop /* 80D06110-80D06114 000030 0004+00 0/2 0/0 0/0 .rodata @3663 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3663 = 0.5f; -COMPILER_STRIP_GATE(80D06110, &lit_3663); +COMPILER_STRIP_GATE(0x80D06110, &lit_3663); #pragma pop /* 80D061A4-80D061B0 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ @@ -564,6 +564,13 @@ asm void daTaFence_c::setBaseMtx() { } #pragma pop +/* ############################################################################################## */ +/* 80D06198-80D06198 0000B8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80D06198 = "P_Mfence"; +#pragma pop + /* 80D0503C-80D050A8 0002BC 006C+00 1/0 0/0 0/0 .text CreateHeap__11daTaFence_cFv */ #pragma push #pragma optimization_level 0 @@ -651,7 +658,7 @@ SECTION_RODATA u8 const daTaFence_c::mCcDObjInfo[48] = { 0x00, 0x40, 0x00, 0x32, 0x00, 0x00, 0x00, 0x11, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D06114, &daTaFence_c::mCcDObjInfo); +COMPILER_STRIP_GATE(0x80D06114, &daTaFence_c::mCcDObjInfo); /* 80D06144-80D06174 000064 0030+00 0/1 0/0 0/0 .rodata l_check_area */ #pragma push @@ -661,12 +668,12 @@ SECTION_RODATA static u8 const l_check_area[48] = { 0x43, 0x61, 0x00, 0x00, 0xC2, 0xC8, 0x00, 0x00, 0x43, 0x61, 0x00, 0x00, 0x43, 0x61, 0x00, 0x00, 0x42, 0xC8, 0x00, 0x00, 0x43, 0x61, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0xC8, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D06144, &l_check_area); +COMPILER_STRIP_GATE(0x80D06144, &l_check_area); #pragma pop /* 80D06174-80D06178 000094 0004+00 2/2 0/0 0/0 .rodata @3903 */ SECTION_RODATA static u32 const lit_3903 = 0x43360B61; -COMPILER_STRIP_GATE(80D06174, &lit_3903); +COMPILER_STRIP_GATE(0x80D06174, &lit_3903); /* 80D06330-80D0633C 000008 000C+00 1/1 0/0 0/0 .bss @3645 */ static u8 lit_3645[12]; @@ -702,28 +709,28 @@ asm void daTaFence_c::init_modeWait() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3963 = 25.0f; -COMPILER_STRIP_GATE(80D06178, &lit_3963); +COMPILER_STRIP_GATE(0x80D06178, &lit_3963); #pragma pop /* 80D0617C-80D06180 00009C 0004+00 0/1 0/0 0/0 .rodata @3964 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3964 = 250.0f; -COMPILER_STRIP_GATE(80D0617C, &lit_3964); +COMPILER_STRIP_GATE(0x80D0617C, &lit_3964); #pragma pop /* 80D06180-80D06184 0000A0 0004+00 0/1 0/0 0/0 .rodata @3965 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3965 = 41.0f; -COMPILER_STRIP_GATE(80D06180, &lit_3965); +COMPILER_STRIP_GATE(0x80D06180, &lit_3965); #pragma pop /* 80D06184-80D06188 0000A4 0004+00 0/1 0/0 0/0 .rodata @3966 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3966 = 205.0f; -COMPILER_STRIP_GATE(80D06184, &lit_3966); +COMPILER_STRIP_GATE(0x80D06184, &lit_3966); #pragma pop /* 80D06188-80D06190 0000A8 0008+00 0/1 0/0 0/0 .rodata @3968 */ @@ -732,7 +739,7 @@ COMPILER_STRIP_GATE(80D06184, &lit_3966); SECTION_RODATA static u8 const lit_3968[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D06188, &lit_3968); +COMPILER_STRIP_GATE(0x80D06188, &lit_3968); #pragma pop /* 80D057D0-80D05A54 000A50 0284+00 1/0 0/0 0/0 .text modeWait__11daTaFence_cFv */ @@ -748,7 +755,7 @@ asm void daTaFence_c::modeWait() { /* ############################################################################################## */ /* 80D06190-80D06194 0000B0 0004+00 1/2 0/0 0/0 .rodata @3981 */ SECTION_RODATA static f32 const lit_3981 = -1.0f; -COMPILER_STRIP_GATE(80D06190, &lit_3981); +COMPILER_STRIP_GATE(0x80D06190, &lit_3981); /* 80D05A54-80D05B5C 000CD4 0108+00 1/1 0/0 0/0 .text init_modeMoveInit__11daTaFence_cFv */ @@ -784,7 +791,7 @@ asm void daTaFence_c::init_modeMove() { /* ############################################################################################## */ /* 80D06194-80D06198 0000B4 0004+00 1/1 0/0 0/0 .rodata @4028 */ SECTION_RODATA static f32 const lit_4028 = 30.0f; -COMPILER_STRIP_GATE(80D06194, &lit_4028); +COMPILER_STRIP_GATE(0x80D06194, &lit_4028); /* 80D05CAC-80D05D2C 000F2C 0080+00 1/0 0/0 0/0 .text modeMove__11daTaFence_cFv */ #pragma push @@ -906,12 +913,7 @@ asm void __sinit_d_a_obj_taFence_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80D0605C = (void*)__sinit_d_a_obj_taFence_cpp; +REGISTER_CTORS(0x80D0605C, __sinit_d_a_obj_taFence_cpp); #pragma pop -/* 80D06198-80D061A1 0000B8 0009+00 3/3 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80D06198 = "P_Mfence"; -#pragma pop +/* 80D06198-80D06198 0000B8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_table/d_a_obj_table.cpp b/rel/d/a/obj/d_a_obj_table/d_a_obj_table.cpp index 0aa1767efca..9d01f9736ad 100644 --- a/rel/d/a/obj/d_a_obj_table/d_a_obj_table.cpp +++ b/rel/d/a/obj/d_a_obj_table/d_a_obj_table.cpp @@ -211,6 +211,12 @@ static asm void daObjTable_Delete(daObjTable_c* param_0) { #pragma pop /* ############################################################################################## */ +/* 80D06C0C-80D06C0C 000008 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80D06C0C = "Table"; +#pragma pop + /* 80D06C1C-80D06C20 -00001 0004+00 4/4 0/0 0/0 .data l_arcName */ SECTION_DATA static void* l_arcName = (void*)&d_a_obj_table__stringBase0; @@ -274,7 +280,7 @@ asm void daObjTable_c::CreateHeap() { /* ############################################################################################## */ /* 80D06C04-80D06C08 000000 0004+00 2/2 0/0 0/0 .rodata @4017 */ SECTION_RODATA static f32 const lit_4017 = 100.0f; -COMPILER_STRIP_GATE(80D06C04, &lit_4017); +COMPILER_STRIP_GATE(0x80D06C04, &lit_4017); /* 80D065D0-80D0695C 000210 038C+00 1/0 0/0 0/0 .text Create__12daObjTable_cFv */ #pragma push @@ -286,6 +292,13 @@ asm void daObjTable_c::Create() { } #pragma pop +/* ############################################################################################## */ +/* 80D06C0C-80D06C0C 000008 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80D06C12 = "TABLE_MAP"; +#pragma pop + /* 80D0695C-80D06AD8 00059C 017C+00 1/0 0/0 0/0 .text Execute__12daObjTable_cFPPA3_A4_f */ #pragma push @@ -300,7 +313,7 @@ asm void daObjTable_c::Execute(f32 (**param_0)[3][4]) { /* ############################################################################################## */ /* 80D06C08-80D06C0C 000004 0004+00 1/1 0/0 0/0 .rodata @4077 */ SECTION_RODATA static f32 const lit_4077 = 500.0f; -COMPILER_STRIP_GATE(80D06C08, &lit_4077); +COMPILER_STRIP_GATE(0x80D06C08, &lit_4077); /* 80D06AD8-80D06BC8 000718 00F0+00 1/0 0/0 0/0 .text Draw__12daObjTable_cFv */ #pragma push @@ -322,10 +335,4 @@ asm void daObjTable_c::Delete() { } #pragma pop -/* 80D06C0C-80D06C1C 000008 0010+00 2/1 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80D06C0C = "Table"; -SECTION_DEAD static char const* const stringBase_80D06C12 = "TABLE_MAP"; -#pragma pop +/* 80D06C0C-80D06C0C 000008 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_takaraDai/d_a_obj_takaraDai.cpp b/rel/d/a/obj/d_a_obj_takaraDai/d_a_obj_takaraDai.cpp index f3fec2a62bd..c0103c86970 100644 --- a/rel/d/a/obj/d_a_obj_takaraDai/d_a_obj_takaraDai.cpp +++ b/rel/d/a/obj/d_a_obj_takaraDai/d_a_obj_takaraDai.cpp @@ -189,83 +189,83 @@ extern "C" void __register_global_object(); /* ############################################################################################## */ /* 80D07808-80D0780C 000000 0004+00 3/3 0/0 0/0 .rodata @3627 */ SECTION_RODATA static f32 const lit_3627 = 12.0f; -COMPILER_STRIP_GATE(80D07808, &lit_3627); +COMPILER_STRIP_GATE(0x80D07808, &lit_3627); /* 80D0780C-80D07810 000004 0004+00 0/1 0/0 0/0 .rodata @3628 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3628 = 4.0f; -COMPILER_STRIP_GATE(80D0780C, &lit_3628); +COMPILER_STRIP_GATE(0x80D0780C, &lit_3628); #pragma pop /* 80D07810-80D07814 000008 0004+00 0/1 0/0 0/0 .rodata @3629 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3629 = 3.0f; -COMPILER_STRIP_GATE(80D07810, &lit_3629); +COMPILER_STRIP_GATE(0x80D07810, &lit_3629); #pragma pop /* 80D07814-80D07818 00000C 0004+00 0/1 0/0 0/0 .rodata @3630 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3630 = 130.0f; -COMPILER_STRIP_GATE(80D07814, &lit_3630); +COMPILER_STRIP_GATE(0x80D07814, &lit_3630); #pragma pop /* 80D07818-80D0781C 000010 0004+00 0/1 0/0 0/0 .rodata @3631 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3631 = 3.0f / 50.0f; -COMPILER_STRIP_GATE(80D07818, &lit_3631); +COMPILER_STRIP_GATE(0x80D07818, &lit_3631); #pragma pop /* 80D0781C-80D07820 000014 0004+00 0/1 0/0 0/0 .rodata @3632 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3632 = 5.0f; -COMPILER_STRIP_GATE(80D0781C, &lit_3632); +COMPILER_STRIP_GATE(0x80D0781C, &lit_3632); #pragma pop /* 80D07820-80D07824 000018 0004+00 0/1 0/0 0/0 .rodata @3633 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3633 = 1.0f; -COMPILER_STRIP_GATE(80D07820, &lit_3633); +COMPILER_STRIP_GATE(0x80D07820, &lit_3633); #pragma pop /* 80D07824-80D07828 00001C 0004+00 0/1 0/0 0/0 .rodata @3634 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3634 = 90.0f; -COMPILER_STRIP_GATE(80D07824, &lit_3634); +COMPILER_STRIP_GATE(0x80D07824, &lit_3634); #pragma pop /* 80D07828-80D0782C 000020 0004+00 0/2 0/0 0/0 .rodata @3635 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3635 = 30.0f; -COMPILER_STRIP_GATE(80D07828, &lit_3635); +COMPILER_STRIP_GATE(0x80D07828, &lit_3635); #pragma pop /* 80D0782C-80D07830 000024 0004+00 0/1 0/0 0/0 .rodata @3636 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3636 = 10.0f; -COMPILER_STRIP_GATE(80D0782C, &lit_3636); +COMPILER_STRIP_GATE(0x80D0782C, &lit_3636); #pragma pop /* 80D07830-80D07834 000028 0004+00 0/1 0/0 0/0 .rodata @3637 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3637 = 1.0f / 100.0f; -COMPILER_STRIP_GATE(80D07830, &lit_3637); +COMPILER_STRIP_GATE(0x80D07830, &lit_3637); #pragma pop /* 80D07834-80D07838 00002C 0004+00 0/1 0/0 0/0 .rodata @3638 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3638 = 3.0f / 10.0f; -COMPILER_STRIP_GATE(80D07834, &lit_3638); +COMPILER_STRIP_GATE(0x80D07834, &lit_3638); #pragma pop /* 80D07860-80D0786C -00001 000C+00 1/1 0/0 0/0 .data @3799 */ @@ -353,11 +353,11 @@ asm mDoHIO_entry_c::~mDoHIO_entry_c() { /* ############################################################################################## */ /* 80D07838-80D0783C 000030 0004+00 1/2 0/0 0/0 .rodata @3687 */ SECTION_RODATA static f32 const lit_3687 = -1235.0f; -COMPILER_STRIP_GATE(80D07838, &lit_3687); +COMPILER_STRIP_GATE(0x80D07838, &lit_3687); /* 80D0783C-80D07840 000034 0004+00 1/2 0/0 0/0 .rodata @3688 */ SECTION_RODATA static f32 const lit_3688 = 2050.0f; -COMPILER_STRIP_GATE(80D0783C, &lit_3688); +COMPILER_STRIP_GATE(0x80D0783C, &lit_3688); /* 80D06E64-80D06FFC 0001C4 0198+00 2/2 0/0 0/0 .text setBaseMtx__11daTkraDai_cFv */ #pragma push @@ -369,6 +369,13 @@ asm void daTkraDai_c::setBaseMtx() { } #pragma pop +/* ############################################################################################## */ +/* 80D07854-80D07854 00004C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80D07854 = "M_TakaraD"; +#pragma pop + /* 80D06FFC-80D07140 00035C 0144+00 1/0 0/0 0/0 .text CreateHeap__11daTkraDai_cFv */ #pragma push #pragma optimization_level 0 @@ -384,14 +391,14 @@ asm void daTkraDai_c::CreateHeap() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3776 = 250.0f; -COMPILER_STRIP_GATE(80D07840, &lit_3776); +COMPILER_STRIP_GATE(0x80D07840, &lit_3776); #pragma pop /* 80D07844-80D07848 00003C 0004+00 0/1 0/0 0/0 .rodata @3777 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3777 = 50.0f; -COMPILER_STRIP_GATE(80D07844, &lit_3777); +COMPILER_STRIP_GATE(0x80D07844, &lit_3777); #pragma pop /* 80D07848-80D0784C 000040 0004+00 0/1 0/0 0/0 .rodata @3778 */ @@ -403,7 +410,7 @@ SECTION_RODATA static u8 const lit_3778[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D07848, &lit_3778); +COMPILER_STRIP_GATE(0x80D07848, &lit_3778); #pragma pop /* 80D07140-80D07344 0004A0 0204+00 1/1 0/0 0/0 .text create__11daTkraDai_cFv */ @@ -429,7 +436,7 @@ asm void daTkraDai_c::Execute(f32 (**param_0)[3][4]) { /* ############################################################################################## */ /* 80D0784C-80D07850 000044 0004+00 1/2 0/0 0/0 .rodata @3816 */ SECTION_RODATA static u32 const lit_3816 = 0x43360B61; -COMPILER_STRIP_GATE(80D0784C, &lit_3816); +COMPILER_STRIP_GATE(0x80D0784C, &lit_3816); /* 80D07910-80D0791C 000008 000C+00 1/1 0/0 0/0 .bss @3621 */ static u8 lit_3621[12]; @@ -455,7 +462,7 @@ asm void daTkraDai_c::procMain() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3828 = 360.0f; -COMPILER_STRIP_GATE(80D07850, &lit_3828); +COMPILER_STRIP_GATE(0x80D07850, &lit_3828); #pragma pop /* 80D074D0-80D07528 000830 0058+00 1/1 0/0 0/0 .text init_modeWait__11daTkraDai_cFv */ @@ -562,12 +569,7 @@ asm void __sinit_d_a_obj_takaraDai_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80D077B8 = (void*)__sinit_d_a_obj_takaraDai_cpp; +REGISTER_CTORS(0x80D077B8, __sinit_d_a_obj_takaraDai_cpp); #pragma pop -/* 80D07854-80D0785E 00004C 000A+00 3/3 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80D07854 = "M_TakaraD"; -#pragma pop +/* 80D07854-80D07854 00004C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_tatigi/d_a_obj_tatigi.cpp b/rel/d/a/obj/d_a_obj_tatigi/d_a_obj_tatigi.cpp index 8b5927a4e4a..f54d0d805ac 100644 --- a/rel/d/a/obj/d_a_obj_tatigi/d_a_obj_tatigi.cpp +++ b/rel/d/a/obj/d_a_obj_tatigi/d_a_obj_tatigi.cpp @@ -36,10 +36,10 @@ struct dRes_control_c { /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); }; -struct J3DModelData {}; - struct J3DModel {}; +struct J3DModelData {}; + struct dComIfG_play_c { /* 8002CAF0 */ void addSimpleModel(J3DModelData*, int, u8); /* 8002CB30 */ void removeSimpleModel(J3DModelData*, int); @@ -210,27 +210,27 @@ static asm void daObj_Tatigi_Draw(obj_tatigi_class* param_0) { /* ############################################################################################## */ /* 80D085C0-80D085C4 000000 0004+00 3/3 0/0 0/0 .rodata @3867 */ SECTION_RODATA static f32 const lit_3867 = 30.0f; -COMPILER_STRIP_GATE(80D085C0, &lit_3867); +COMPILER_STRIP_GATE(0x80D085C0, &lit_3867); /* 80D085C4-80D085C8 000004 0004+00 0/1 0/0 0/0 .rodata @3868 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3868 = 500.0f; -COMPILER_STRIP_GATE(80D085C4, &lit_3868); +COMPILER_STRIP_GATE(0x80D085C4, &lit_3868); #pragma pop /* 80D085C8-80D085CC 000008 0004+00 0/1 0/0 0/0 .rodata @3869 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3869 = 5.0f; -COMPILER_STRIP_GATE(80D085C8, &lit_3869); +COMPILER_STRIP_GATE(0x80D085C8, &lit_3869); #pragma pop /* 80D085CC-80D085D0 00000C 0004+00 0/1 0/0 0/0 .rodata @3870 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3870 = 7.0f; -COMPILER_STRIP_GATE(80D085CC, &lit_3870); +COMPILER_STRIP_GATE(0x80D085CC, &lit_3870); #pragma pop /* 80D085D0-80D085D8 000010 0008+00 0/1 0/0 0/0 .rodata @3872 */ @@ -239,7 +239,7 @@ COMPILER_STRIP_GATE(80D085CC, &lit_3870); SECTION_RODATA static u8 const lit_3872[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D085D0, &lit_3872); +COMPILER_STRIP_GATE(0x80D085D0, &lit_3872); #pragma pop /* 80D07A60-80D07CE8 000100 0288+00 2/1 0/0 0/0 .text daObj_Tatigi_Execute__FP16obj_tatigi_class @@ -259,6 +259,13 @@ static bool daObj_Tatigi_IsDelete(obj_tatigi_class* param_0) { return true; } +/* ############################################################################################## */ +/* 80D08620-80D08620 000060 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80D08620 = "Obj_tg"; +#pragma pop + /* 80D07CF0-80D07D78 000390 0088+00 1/0 0/0 0/0 .text daObj_Tatigi_Delete__FP16obj_tatigi_class */ #pragma push #pragma optimization_level 0 @@ -294,7 +301,7 @@ SECTION_RODATA static u8 const lit_3955[4 + 4 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D085D8, &lit_3955); +COMPILER_STRIP_GATE(0x80D085D8, &lit_3955); #pragma pop /* 80D085E0-80D085E8 000020 0008+00 0/1 0/0 0/0 .rodata @3956 */ @@ -303,7 +310,7 @@ COMPILER_STRIP_GATE(80D085D8, &lit_3955); SECTION_RODATA static u8 const lit_3956[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D085E0, &lit_3956); +COMPILER_STRIP_GATE(0x80D085E0, &lit_3956); #pragma pop /* 80D085E8-80D085F0 000028 0008+00 0/1 0/0 0/0 .rodata @3957 */ @@ -312,7 +319,7 @@ COMPILER_STRIP_GATE(80D085E0, &lit_3956); SECTION_RODATA static u8 const lit_3957[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D085E8, &lit_3957); +COMPILER_STRIP_GATE(0x80D085E8, &lit_3957); #pragma pop /* 80D085F0-80D085F8 000030 0008+00 0/1 0/0 0/0 .rodata @3958 */ @@ -321,14 +328,14 @@ COMPILER_STRIP_GATE(80D085E8, &lit_3957); SECTION_RODATA static u8 const lit_3958[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D085F0, &lit_3958); +COMPILER_STRIP_GATE(0x80D085F0, &lit_3958); #pragma pop /* 80D085F8-80D085FC 000038 0004+00 0/1 0/0 0/0 .rodata @3959 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3959 = 150.0f; -COMPILER_STRIP_GATE(80D085F8, &lit_3959); +COMPILER_STRIP_GATE(0x80D085F8, &lit_3959); #pragma pop /* 80D07E24-80D07FD8 0004C4 01B4+00 1/1 0/0 0/0 .text set_pos_check__FP16obj_tatigi_classi */ @@ -346,35 +353,35 @@ static asm void set_pos_check(obj_tatigi_class* param_0, int param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4068 = 65536.0f; -COMPILER_STRIP_GATE(80D085FC, &lit_4068); +COMPILER_STRIP_GATE(0x80D085FC, &lit_4068); #pragma pop /* 80D08600-80D08604 000040 0004+00 0/1 0/0 0/0 .rodata @4069 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4069 = 100.0f; -COMPILER_STRIP_GATE(80D08600, &lit_4069); +COMPILER_STRIP_GATE(0x80D08600, &lit_4069); #pragma pop /* 80D08604-80D08608 000044 0004+00 0/1 0/0 0/0 .rodata @4070 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4070 = 3.0f / 5.0f; -COMPILER_STRIP_GATE(80D08604, &lit_4070); +COMPILER_STRIP_GATE(0x80D08604, &lit_4070); #pragma pop /* 80D08608-80D0860C 000048 0004+00 0/1 0/0 0/0 .rodata @4071 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4071 = 2.0f / 5.0f; -COMPILER_STRIP_GATE(80D08608, &lit_4071); +COMPILER_STRIP_GATE(0x80D08608, &lit_4071); #pragma pop /* 80D0860C-80D08610 00004C 0004+00 0/1 0/0 0/0 .rodata @4072 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4072 = 1.0f; -COMPILER_STRIP_GATE(80D0860C, &lit_4072); +COMPILER_STRIP_GATE(0x80D0860C, &lit_4072); #pragma pop /* 80D08610-80D08618 000050 0004+04 0/1 0/0 0/0 .rodata @4073 */ @@ -385,7 +392,7 @@ SECTION_RODATA static f32 const lit_4073[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80D08610, &lit_4073); +COMPILER_STRIP_GATE(0x80D08610, &lit_4073); #pragma pop /* 80D08618-80D08620 000058 0008+00 0/1 0/0 0/0 .rodata @4076 */ @@ -394,7 +401,7 @@ COMPILER_STRIP_GATE(80D08610, &lit_4073); SECTION_RODATA static u8 const lit_4076[8] = { 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D08618, &lit_4076); +COMPILER_STRIP_GATE(0x80D08618, &lit_4076); #pragma pop /* 80D08628-80D0866C 000000 0044+00 1/1 0/0 0/0 .data cc_cyl_src$3986 */ @@ -494,9 +501,4 @@ asm cM3dGAab::~cM3dGAab() { } #pragma pop -/* 80D08620-80D08627 000060 0007+00 3/3 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80D08620 = "Obj_tg"; -#pragma pop +/* 80D08620-80D08620 000060 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_ten/d_a_obj_ten.cpp b/rel/d/a/obj/d_a_obj_ten/d_a_obj_ten.cpp index 065f9649553..f5fdef06381 100644 --- a/rel/d/a/obj/d_a_obj_ten/d_a_obj_ten.cpp +++ b/rel/d/a/obj/d_a_obj_ten/d_a_obj_ten.cpp @@ -50,19 +50,19 @@ struct mDoExt_baseAnm { /* 8000D428 */ void play(); }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; +struct J3DAnmTransform {}; + +struct J3DModelData {}; + struct Z2Creature { /* 802C03C8 */ Z2Creature(); /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -420,7 +420,7 @@ extern "C" void __register_global_object(); /* ############################################################################################## */ /* 80D0B8F0-80D0B8F4 000000 0004+00 14/14 0/0 0/0 .rodata @3775 */ SECTION_RODATA static f32 const lit_3775 = 1.0f; -COMPILER_STRIP_GATE(80D0B8F0, &lit_3775); +COMPILER_STRIP_GATE(0x80D0B8F0, &lit_3775); /* 80D0B9F4-80D0BA14 -00001 0020+00 1/0 0/0 0/0 .data l_daObjTEN_Method */ SECTION_DATA static void* l_daObjTEN_Method[8] = { @@ -516,7 +516,7 @@ SECTION_RODATA static u16 const l_ten_itemno[1 + 1 /* padding */] = { /* padding */ 0x0000, }; -COMPILER_STRIP_GATE(80D0B8F4, &l_ten_itemno); +COMPILER_STRIP_GATE(0x80D0B8F4, &l_ten_itemno); /* 80D0B8F8-80D0B938 000008 0040+00 1/1 0/0 0/0 .rodata ccSphSrc$3779 */ SECTION_RODATA static u8 const ccSphSrc[64] = { @@ -525,7 +525,7 @@ SECTION_RODATA static u8 const ccSphSrc[64] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0x20, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D0B8F8, &ccSphSrc); +COMPILER_STRIP_GATE(0x80D0B8F8, &ccSphSrc); /* 80D087F4-80D08860 000114 006C+00 1/1 0/0 0/0 .text InitCcSph__10daObjTEN_cFv */ #pragma push @@ -540,7 +540,7 @@ asm void daObjTEN_c::InitCcSph() { /* ############################################################################################## */ /* 80D0B938-80D0B93C 000048 0004+00 1/3 0/0 0/0 .rodata @3788 */ SECTION_RODATA static f32 const lit_3788 = 20.0f; -COMPILER_STRIP_GATE(80D0B938, &lit_3788); +COMPILER_STRIP_GATE(0x80D0B938, &lit_3788); /* 80D08860-80D088B8 000180 0058+00 1/1 0/0 0/0 .text SetCcSph__10daObjTEN_cFv */ #pragma push @@ -552,6 +552,13 @@ asm void daObjTEN_c::SetCcSph() { } #pragma pop +/* ############################################################################################## */ +/* 80D0B9E4-80D0B9E4 0000F4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80D0B9E4 = "I_Ten"; +#pragma pop + /* 80D088B8-80D08B84 0001D8 02CC+00 1/1 0/0 0/0 .text useHeapInit__FP10fopAc_ac_c */ #pragma push #pragma optimization_level 0 @@ -600,34 +607,34 @@ SECTION_RODATA static u8 const lit_3939[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D0B93C, &lit_3939); +COMPILER_STRIP_GATE(0x80D0B93C, &lit_3939); /* 80D0B940-80D0B944 000050 0004+00 0/5 0/0 0/0 .rodata @3940 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3940 = 5.0f; -COMPILER_STRIP_GATE(80D0B940, &lit_3940); +COMPILER_STRIP_GATE(0x80D0B940, &lit_3940); #pragma pop /* 80D0B944-80D0B948 000054 0004+00 0/5 0/0 0/0 .rodata @3941 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3941 = -1.0f; -COMPILER_STRIP_GATE(80D0B944, &lit_3941); +COMPILER_STRIP_GATE(0x80D0B944, &lit_3941); #pragma pop /* 80D0B948-80D0B94C 000058 0004+00 0/5 0/0 0/0 .rodata @3942 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3942 = 50.0f; -COMPILER_STRIP_GATE(80D0B948, &lit_3942); +COMPILER_STRIP_GATE(0x80D0B948, &lit_3942); #pragma pop /* 80D0B94C-80D0B950 00005C 0004+00 0/1 0/0 0/0 .rodata @3943 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3943 = 1500.0f; -COMPILER_STRIP_GATE(80D0B94C, &lit_3943); +COMPILER_STRIP_GATE(0x80D0B94C, &lit_3943); #pragma pop /* 80D0B950-80D0B958 000060 0004+04 0/4 0/0 0/0 .rodata @3944 */ @@ -638,7 +645,7 @@ SECTION_RODATA static f32 const lit_3944[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80D0B950, &lit_3944); +COMPILER_STRIP_GATE(0x80D0B950, &lit_3944); #pragma pop /* 80D08C10-80D08D94 000530 0184+00 2/2 0/0 0/0 .text WaitAction__10daObjTEN_cFv */ @@ -658,7 +665,7 @@ asm void daObjTEN_c::WaitAction() { SECTION_RODATA static u8 const lit_3997[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D0B958, &lit_3997); +COMPILER_STRIP_GATE(0x80D0B958, &lit_3997); #pragma pop /* 80D0B960-80D0B968 000070 0008+00 0/5 0/0 0/0 .rodata @3998 */ @@ -667,7 +674,7 @@ COMPILER_STRIP_GATE(80D0B958, &lit_3997); SECTION_RODATA static u8 const lit_3998[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D0B960, &lit_3998); +COMPILER_STRIP_GATE(0x80D0B960, &lit_3998); #pragma pop /* 80D0B968-80D0B970 000078 0008+00 0/5 0/0 0/0 .rodata @3999 */ @@ -676,7 +683,7 @@ COMPILER_STRIP_GATE(80D0B960, &lit_3998); SECTION_RODATA static u8 const lit_3999[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D0B968, &lit_3999); +COMPILER_STRIP_GATE(0x80D0B968, &lit_3999); #pragma pop /* 80D08D94-80D08FC0 0006B4 022C+00 1/1 0/0 0/0 .text WallCheck__10daObjTEN_cFv */ @@ -704,28 +711,28 @@ asm cM3dGPla::~cM3dGPla() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4023 = 2.0f / 5.0f; -COMPILER_STRIP_GATE(80D0B970, &lit_4023); +COMPILER_STRIP_GATE(0x80D0B970, &lit_4023); #pragma pop /* 80D0B974-80D0B978 000084 0004+00 0/3 0/0 0/0 .rodata @4024 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4024 = 10.0f; -COMPILER_STRIP_GATE(80D0B974, &lit_4024); +COMPILER_STRIP_GATE(0x80D0B974, &lit_4024); #pragma pop /* 80D0B978-80D0B97C 000088 0004+00 0/1 0/0 0/0 .rodata @4025 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4025 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(80D0B978, &lit_4025); +COMPILER_STRIP_GATE(0x80D0B978, &lit_4025); #pragma pop /* 80D0B97C-80D0B980 00008C 0004+00 0/3 0/0 0/0 .rodata @4026 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4026 = 0.5f; -COMPILER_STRIP_GATE(80D0B97C, &lit_4026); +COMPILER_STRIP_GATE(0x80D0B97C, &lit_4026); #pragma pop /* 80D09008-80D09114 000928 010C+00 1/1 0/0 0/0 .text SpeedSet__10daObjTEN_cFv */ @@ -743,28 +750,28 @@ asm void daObjTEN_c::SpeedSet() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4124 = 3.0f; -COMPILER_STRIP_GATE(80D0B980, &lit_4124); +COMPILER_STRIP_GATE(0x80D0B980, &lit_4124); #pragma pop /* 80D0B984-80D0B988 000094 0004+00 0/1 0/0 0/0 .rodata @4125 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4125 = -100.0f; -COMPILER_STRIP_GATE(80D0B984, &lit_4125); +COMPILER_STRIP_GATE(0x80D0B984, &lit_4125); #pragma pop /* 80D0B988-80D0B98C 000098 0004+00 0/2 0/0 0/0 .rodata @4126 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4126 = 40.0f; -COMPILER_STRIP_GATE(80D0B988, &lit_4126); +COMPILER_STRIP_GATE(0x80D0B988, &lit_4126); #pragma pop /* 80D0B98C-80D0B990 00009C 0004+00 0/1 0/0 0/0 .rodata @4127 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4127 = 3.0f / 10.0f; -COMPILER_STRIP_GATE(80D0B98C, &lit_4127); +COMPILER_STRIP_GATE(0x80D0B98C, &lit_4127); #pragma pop /* 80D09114-80D09548 000A34 0434+00 1/1 0/0 0/0 .text WallWalk__10daObjTEN_cFv */ @@ -792,49 +799,49 @@ asm void daObjTEN_c::WalkAction() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4311 = 30.0f; -COMPILER_STRIP_GATE(80D0B990, &lit_4311); +COMPILER_STRIP_GATE(0x80D0B990, &lit_4311); #pragma pop /* 80D0B994-80D0B998 0000A4 0004+00 0/1 0/0 0/0 .rodata @4312 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4312 = 80.0f; -COMPILER_STRIP_GATE(80D0B994, &lit_4312); +COMPILER_STRIP_GATE(0x80D0B994, &lit_4312); #pragma pop /* 80D0B998-80D0B99C 0000A8 0004+00 0/3 0/0 0/0 .rodata @4313 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4313 = 8.0f; -COMPILER_STRIP_GATE(80D0B998, &lit_4313); +COMPILER_STRIP_GATE(0x80D0B998, &lit_4313); #pragma pop /* 80D0B99C-80D0B9A0 0000AC 0004+00 0/1 0/0 0/0 .rodata @4314 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4314 = 200.0f; -COMPILER_STRIP_GATE(80D0B99C, &lit_4314); +COMPILER_STRIP_GATE(0x80D0B99C, &lit_4314); #pragma pop /* 80D0B9A0-80D0B9A4 0000B0 0004+00 0/1 0/0 0/0 .rodata @4315 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4315 = 11.0f; -COMPILER_STRIP_GATE(80D0B9A0, &lit_4315); +COMPILER_STRIP_GATE(0x80D0B9A0, &lit_4315); #pragma pop /* 80D0B9A4-80D0B9A8 0000B4 0004+00 0/1 0/0 0/0 .rodata @4316 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4316 = 1050.0f; -COMPILER_STRIP_GATE(80D0B9A4, &lit_4316); +COMPILER_STRIP_GATE(0x80D0B9A4, &lit_4316); #pragma pop /* 80D0B9A8-80D0B9AC 0000B8 0004+00 0/1 0/0 0/0 .rodata @4317 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4317 = 64000.0f; -COMPILER_STRIP_GATE(80D0B9A8, &lit_4317); +COMPILER_STRIP_GATE(0x80D0B9A8, &lit_4317); #pragma pop /* 80D09748-80D09F58 001068 0810+00 2/2 0/0 0/0 .text MoveAction__10daObjTEN_cFv */ @@ -892,14 +899,14 @@ asm void daObjTEN_c::Insect_Release() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4423 = -9.0f; -COMPILER_STRIP_GATE(80D0B9AC, &lit_4423); +COMPILER_STRIP_GATE(0x80D0B9AC, &lit_4423); #pragma pop /* 80D0B9B0-80D0B9B8 0000C0 0008+00 1/2 0/0 0/0 .rodata @4458 */ SECTION_RODATA static u8 const lit_4458[8] = { 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D0B9B0, &lit_4458); +COMPILER_STRIP_GATE(0x80D0B9B0, &lit_4458); /* 80D0A154-80D0A278 001A74 0124+00 1/1 0/0 0/0 .text ParticleSet__10daObjTEN_cFv */ #pragma push @@ -926,7 +933,7 @@ asm void daObjTEN_c::BoomChk() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4604 = 10000.0f; -COMPILER_STRIP_GATE(80D0B9B8, &lit_4604); +COMPILER_STRIP_GATE(0x80D0B9B8, &lit_4604); #pragma pop /* 80D0A644-80D0A8C8 001F64 0284+00 1/1 0/0 0/0 .text Execute__10daObjTEN_cFv */ @@ -954,21 +961,21 @@ asm void daObjTEN_c::ObjHit() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4673 = 608.0f; -COMPILER_STRIP_GATE(80D0B9BC, &lit_4673); +COMPILER_STRIP_GATE(0x80D0B9BC, &lit_4673); #pragma pop /* 80D0B9C0-80D0B9C4 0000D0 0004+00 0/1 0/0 0/0 .rodata @4674 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4674 = 448.0f; -COMPILER_STRIP_GATE(80D0B9C0, &lit_4674); +COMPILER_STRIP_GATE(0x80D0B9C0, &lit_4674); #pragma pop /* 80D0B9C4-80D0B9C8 0000D4 0004+00 0/1 0/0 0/0 .rodata @4675 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4675 = 16777215.0f; -COMPILER_STRIP_GATE(80D0B9C4, &lit_4675); +COMPILER_STRIP_GATE(0x80D0B9C4, &lit_4675); #pragma pop /* 80D0AA50-80D0ABCC 002370 017C+00 1/1 0/0 0/0 .text Z_BufferChk__10daObjTEN_cFv */ @@ -1008,11 +1015,11 @@ asm void daObjTEN_c::setBaseMtx() { /* ############################################################################################## */ /* 80D0B9C8-80D0B9CC 0000D8 0004+00 1/1 0/0 0/0 .rodata @4738 */ SECTION_RODATA static f32 const lit_4738 = 15.0f; -COMPILER_STRIP_GATE(80D0B9C8, &lit_4738); +COMPILER_STRIP_GATE(0x80D0B9C8, &lit_4738); /* 80D0B9CC-80D0B9D0 0000DC 0004+00 1/1 0/0 0/0 .rodata @4739 */ SECTION_RODATA static f32 const lit_4739 = -3.0f / 5.0f; -COMPILER_STRIP_GATE(80D0B9CC, &lit_4739); +COMPILER_STRIP_GATE(0x80D0B9CC, &lit_4739); /* 80D0AC9C-80D0AD7C 0025BC 00E0+00 1/0 0/0 0/0 .text daObjTEN_Draw__FP10daObjTEN_c */ #pragma push @@ -1037,7 +1044,13 @@ static asm void daObjTEN_Execute(daObjTEN_c* param_0) { /* ############################################################################################## */ /* 80D0B9D0-80D0B9D4 0000E0 0004+00 1/2 0/0 0/0 .rodata l_musiya_num */ SECTION_RODATA static u32 const l_musiya_num = 0x019F01A0; -COMPILER_STRIP_GATE(80D0B9D0, &l_musiya_num); +COMPILER_STRIP_GATE(0x80D0B9D0, &l_musiya_num); + +/* 80D0B9E4-80D0B9E4 0000F4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80D0B9EA = "R_SP160"; +#pragma pop /* 80D0AD9C-80D0AF48 0026BC 01AC+00 1/1 0/0 0/0 .text CreateChk__10daObjTEN_cFv */ #pragma push @@ -1054,28 +1067,28 @@ asm void daObjTEN_c::CreateChk() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5101 = 500.0f; -COMPILER_STRIP_GATE(80D0B9D4, &lit_5101); +COMPILER_STRIP_GATE(0x80D0B9D4, &lit_5101); #pragma pop /* 80D0B9D8-80D0B9DC 0000E8 0004+00 0/1 0/0 0/0 .rodata @5102 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5102 = -200.0f; -COMPILER_STRIP_GATE(80D0B9D8, &lit_5102); +COMPILER_STRIP_GATE(0x80D0B9D8, &lit_5102); #pragma pop /* 80D0B9DC-80D0B9E0 0000EC 0004+00 0/1 0/0 0/0 .rodata @5103 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5103 = -1000.0f; -COMPILER_STRIP_GATE(80D0B9DC, &lit_5103); +COMPILER_STRIP_GATE(0x80D0B9DC, &lit_5103); #pragma pop /* 80D0B9E0-80D0B9E4 0000F0 0004+00 0/1 0/0 0/0 .rodata @5104 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5104 = -50.0f; -COMPILER_STRIP_GATE(80D0B9E0, &lit_5104); +COMPILER_STRIP_GATE(0x80D0B9E0, &lit_5104); #pragma pop /* 80D0BABC-80D0BAC8 00000C 000C+00 1/1 0/0 0/0 .bss @3770 */ @@ -1152,7 +1165,7 @@ asm void __sinit_d_a_obj_ten_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80D0B890 = (void*)__sinit_d_a_obj_ten_cpp; +REGISTER_CTORS(0x80D0B890, __sinit_d_a_obj_ten_cpp); #pragma pop /* 80D0B8CC-80D0B8D4 0031EC 0008+00 1/0 0/0 0/0 .text @36@__dt__12dBgS_ObjAcchFv */ @@ -1175,10 +1188,4 @@ static asm void func_80D0B8D4() { } #pragma pop -/* 80D0B9E4-80D0B9F2 0000F4 000E+00 9/9 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80D0B9E4 = "I_Ten"; -SECTION_DEAD static char const* const stringBase_80D0B9EA = "R_SP160"; -#pragma pop +/* 80D0B9E4-80D0B9E4 0000F4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_tgake/d_a_obj_tgake.cpp b/rel/d/a/obj/d_a_obj_tgake/d_a_obj_tgake.cpp index 2dc067329db..93d9c4f63b1 100644 --- a/rel/d/a/obj/d_a_obj_tgake/d_a_obj_tgake.cpp +++ b/rel/d/a/obj/d_a_obj_tgake/d_a_obj_tgake.cpp @@ -181,6 +181,12 @@ asm void daObjGake_c::Create() { #pragma pop /* ############################################################################################## */ +/* 80D0C13C-80D0C13C 000000 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80D0C13C = "A_TGake"; +#pragma pop + /* 80D0C144-80D0C148 -00001 0004+00 3/3 0/0 0/0 .data l_arcName */ SECTION_DATA static void* l_arcName = (void*)&d_a_obj_tgake__stringBase0; @@ -311,9 +317,4 @@ static asm void daObjGake_MoveBGDraw(daObjGake_c* param_0) { } #pragma pop -/* 80D0C13C-80D0C144 000000 0008+00 1/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80D0C13C = "A_TGake"; -#pragma pop +/* 80D0C13C-80D0C13C 000000 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_thashi/d_a_obj_thashi.cpp b/rel/d/a/obj/d_a_obj_thashi/d_a_obj_thashi.cpp index fb32df9fbde..447a34efb4c 100644 --- a/rel/d/a/obj/d_a_obj_thashi/d_a_obj_thashi.cpp +++ b/rel/d/a/obj/d_a_obj_thashi/d_a_obj_thashi.cpp @@ -268,7 +268,7 @@ SECTION_RODATA static u8 const ccCylSrc_3671[64] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0xF0, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D0D18C, &ccCylSrc_3671); +COMPILER_STRIP_GATE(0x80D0D18C, &ccCylSrc_3671); /* 80D0D1CC-80D0D1D0 000040 0004+00 0/0 0/0 0/0 .rodata @3693 */ #pragma push @@ -279,14 +279,14 @@ SECTION_RODATA static u8 const lit_3693[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D0D1CC, &lit_3693); +COMPILER_STRIP_GATE(0x80D0D1CC, &lit_3693); #pragma pop /* 80D0D1D0-80D0D1D4 000044 0004+00 0/0 0/0 0/0 .rodata @3694 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3694 = 200.0f; -COMPILER_STRIP_GATE(80D0D1D0, &lit_3694); +COMPILER_STRIP_GATE(0x80D0D1D0, &lit_3694); #pragma pop /* 80D0D1D4-80D0D1DC 000048 0004+04 0/0 0/0 0/0 .rodata @3695 */ @@ -297,7 +297,7 @@ SECTION_RODATA static f32 const lit_3695[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80D0D1D4, &lit_3695); +COMPILER_STRIP_GATE(0x80D0D1D4, &lit_3695); #pragma pop /* 80D0D1DC-80D0D1E4 000050 0008+00 0/0 0/0 0/0 .rodata @3697 */ @@ -306,7 +306,7 @@ COMPILER_STRIP_GATE(80D0D1D4, &lit_3695); SECTION_RODATA static u8 const lit_3697[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D0D1DC, &lit_3697); +COMPILER_STRIP_GATE(0x80D0D1DC, &lit_3697); #pragma pop /* 80D0D1E4-80D0D228 000058 0044+00 1/1 0/0 0/0 .rodata ccCylSrc$3701 */ @@ -317,7 +317,7 @@ SECTION_RODATA static u8 const ccCylSrc_3701[68] = { 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0xDC, 0x00, 0x00, 0x43, 0x02, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D0D1E4, &ccCylSrc_3701); +COMPILER_STRIP_GATE(0x80D0D1E4, &ccCylSrc_3701); /* 80D0C238-80D0C298 000078 0060+00 1/1 0/0 0/0 .text initCcCylinder__13daObjTHASHI_cFv */ @@ -372,6 +372,12 @@ asm csXyz::~csXyz() { #pragma pop /* ############################################################################################## */ +/* 80D0D2D0-80D0D2D0 000144 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80D0D2D0 = "S_thashi"; +#pragma pop + /* 80D0D334-80D0D338 -00001 0004+00 3/3 0/0 0/0 .data l_arcName */ SECTION_DATA static void* l_arcName = (void*)&d_a_obj_thashi__stringBase0; @@ -419,6 +425,17 @@ static asm void daObjTHASHI_Execute(daObjTHASHI_c* param_0) { } #pragma pop +/* ############################################################################################## */ +/* 80D0D2D0-80D0D2D0 000144 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80D0D2D9 = "S_thashi00.bmd"; +SECTION_DEAD static char const* const stringBase_80D0D2E8 = "S_thashi01.bmd"; +SECTION_DEAD static char const* const stringBase_80D0D2F7 = "S_thashi03.bmd"; +SECTION_DEAD static char const* const stringBase_80D0D306 = "S_thashi02.bmd"; +SECTION_DEAD static char const* const stringBase_80D0D315 = "S_thashi01.dzb"; +#pragma pop + /* 80D0C654-80D0C8B4 000494 0260+00 1/0 0/0 0/0 .text CreateHeap__13daObjTHASHI_cFv */ #pragma push #pragma optimization_level 0 @@ -434,172 +451,172 @@ asm void daObjTHASHI_c::CreateHeap() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3795 = 15.0f; -COMPILER_STRIP_GATE(80D0D228, &lit_3795); +COMPILER_STRIP_GATE(0x80D0D228, &lit_3795); #pragma pop /* 80D0D22C-80D0D230 0000A0 0004+00 0/0 0/0 0/0 .rodata @3796 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3796 = 60.0f; -COMPILER_STRIP_GATE(80D0D22C, &lit_3796); +COMPILER_STRIP_GATE(0x80D0D22C, &lit_3796); #pragma pop /* 80D0D230-80D0D234 0000A4 0004+00 0/0 0/0 0/0 .rodata @3797 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3797 = 30.0f; -COMPILER_STRIP_GATE(80D0D230, &lit_3797); +COMPILER_STRIP_GATE(0x80D0D230, &lit_3797); #pragma pop /* 80D0D234-80D0D238 0000A8 0004+00 0/0 0/0 0/0 .rodata @3833 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3833 = 150.0f; -COMPILER_STRIP_GATE(80D0D234, &lit_3833); +COMPILER_STRIP_GATE(0x80D0D234, &lit_3833); #pragma pop /* 80D0D238-80D0D23C 0000AC 0004+00 0/0 0/0 0/0 .rodata @3834 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3834 = 10.0f; -COMPILER_STRIP_GATE(80D0D238, &lit_3834); +COMPILER_STRIP_GATE(0x80D0D238, &lit_3834); #pragma pop /* 80D0D23C-80D0D240 0000B0 0004+00 0/0 0/0 0/0 .rodata @3855 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3855 = 70.0f; -COMPILER_STRIP_GATE(80D0D23C, &lit_3855); +COMPILER_STRIP_GATE(0x80D0D23C, &lit_3855); #pragma pop /* 80D0D240-80D0D244 0000B4 0004+00 0/0 0/0 0/0 .rodata @3856 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3856 = 13.0f / 20.0f; -COMPILER_STRIP_GATE(80D0D240, &lit_3856); +COMPILER_STRIP_GATE(0x80D0D240, &lit_3856); #pragma pop /* 80D0D244-80D0D248 0000B8 0004+00 0/0 0/0 0/0 .rodata @3857 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3857 = 0.25f; -COMPILER_STRIP_GATE(80D0D244, &lit_3857); +COMPILER_STRIP_GATE(0x80D0D244, &lit_3857); #pragma pop /* 80D0D248-80D0D24C 0000BC 0004+00 0/0 0/0 0/0 .rodata @3858 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3858 = 1.5f; -COMPILER_STRIP_GATE(80D0D248, &lit_3858); +COMPILER_STRIP_GATE(0x80D0D248, &lit_3858); #pragma pop /* 80D0D24C-80D0D250 0000C0 0004+00 0/0 0/0 0/0 .rodata @3859 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3859 = 3.0f / 5.0f; -COMPILER_STRIP_GATE(80D0D24C, &lit_3859); +COMPILER_STRIP_GATE(0x80D0D24C, &lit_3859); #pragma pop /* 80D0D250-80D0D254 0000C4 0004+00 0/0 0/0 0/0 .rodata @3860 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3860 = 1.0f; -COMPILER_STRIP_GATE(80D0D250, &lit_3860); +COMPILER_STRIP_GATE(0x80D0D250, &lit_3860); #pragma pop /* 80D0D254-80D0D258 0000C8 0004+00 0/0 0/0 0/0 .rodata @3861 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3861 = 8192.0f; -COMPILER_STRIP_GATE(80D0D254, &lit_3861); +COMPILER_STRIP_GATE(0x80D0D254, &lit_3861); #pragma pop /* 80D0D258-80D0D25C 0000CC 0004+00 0/0 0/0 0/0 .rodata @3862 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3862 = 32000.0f; -COMPILER_STRIP_GATE(80D0D258, &lit_3862); +COMPILER_STRIP_GATE(0x80D0D258, &lit_3862); #pragma pop /* 80D0D25C-80D0D260 0000D0 0004+00 0/0 0/0 0/0 .rodata @3863 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3863 = 15000.0f; -COMPILER_STRIP_GATE(80D0D25C, &lit_3863); +COMPILER_STRIP_GATE(0x80D0D25C, &lit_3863); #pragma pop /* 80D0D260-80D0D264 0000D4 0004+00 0/0 0/0 0/0 .rodata @3864 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3864 = 65536.0f; -COMPILER_STRIP_GATE(80D0D260, &lit_3864); +COMPILER_STRIP_GATE(0x80D0D260, &lit_3864); #pragma pop /* 80D0D264-80D0D268 0000D8 0004+00 0/0 0/0 0/0 .rodata @3947 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3947 = -1.0f / 20.0f; -COMPILER_STRIP_GATE(80D0D264, &lit_3947); +COMPILER_STRIP_GATE(0x80D0D264, &lit_3947); #pragma pop /* 80D0D268-80D0D26C 0000DC 0004+00 0/0 0/0 0/0 .rodata @3973 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3973 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(80D0D268, &lit_3973); +COMPILER_STRIP_GATE(0x80D0D268, &lit_3973); #pragma pop /* 80D0D26C-80D0D270 0000E0 0004+00 0/0 0/0 0/0 .rodata @3974 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3974 = 4.0f; -COMPILER_STRIP_GATE(80D0D26C, &lit_3974); +COMPILER_STRIP_GATE(0x80D0D26C, &lit_3974); #pragma pop /* 80D0D270-80D0D274 0000E4 0004+00 0/0 0/0 0/0 .rodata @3975 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3975 = 7.0f / 10.0f; -COMPILER_STRIP_GATE(80D0D270, &lit_3975); +COMPILER_STRIP_GATE(0x80D0D270, &lit_3975); #pragma pop /* 80D0D274-80D0D278 0000E8 0004+00 0/0 0/0 0/0 .rodata @3976 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3976 = 3.0f / 10.0f; -COMPILER_STRIP_GATE(80D0D274, &lit_3976); +COMPILER_STRIP_GATE(0x80D0D274, &lit_3976); #pragma pop /* 80D0D278-80D0D27C 0000EC 0004+00 0/0 0/0 0/0 .rodata @3977 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3977 = 5000.0f; -COMPILER_STRIP_GATE(80D0D278, &lit_3977); +COMPILER_STRIP_GATE(0x80D0D278, &lit_3977); #pragma pop /* 80D0D27C-80D0D280 0000F0 0004+00 0/0 0/0 0/0 .rodata @3978 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3978 = 5.0f; -COMPILER_STRIP_GATE(80D0D27C, &lit_3978); +COMPILER_STRIP_GATE(0x80D0D27C, &lit_3978); #pragma pop /* 80D0D280-80D0D284 0000F4 0004+00 1/1 0/0 0/0 .rodata @3988 */ SECTION_RODATA static f32 const lit_3988 = -9.0f; -COMPILER_STRIP_GATE(80D0D280, &lit_3988); +COMPILER_STRIP_GATE(0x80D0D280, &lit_3988); /* 80D0D284-80D0D288 0000F8 0004+00 0/0 0/0 0/0 .rodata @4017 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4017 = 16384.0f; -COMPILER_STRIP_GATE(80D0D284, &lit_4017); +COMPILER_STRIP_GATE(0x80D0D284, &lit_4017); #pragma pop /* 80D0D288-80D0D28C 0000FC 0004+00 0/0 0/0 0/0 .rodata @4018 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4018 = -1.0f; -COMPILER_STRIP_GATE(80D0D288, &lit_4018); +COMPILER_STRIP_GATE(0x80D0D288, &lit_4018); #pragma pop /* 80D0D28C-80D0D294 000100 0004+04 0/0 0/0 0/0 .rodata @4019 */ @@ -610,7 +627,7 @@ SECTION_RODATA static f32 const lit_4019[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80D0D28C, &lit_4019); +COMPILER_STRIP_GATE(0x80D0D28C, &lit_4019); #pragma pop /* 80D0D294-80D0D29C 000108 0008+00 0/0 0/0 0/0 .rodata @4270 */ @@ -619,7 +636,7 @@ COMPILER_STRIP_GATE(80D0D28C, &lit_4019); SECTION_RODATA static u8 const lit_4270[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D0D294, &lit_4270); +COMPILER_STRIP_GATE(0x80D0D294, &lit_4270); #pragma pop /* 80D0D29C-80D0D2A4 000110 0008+00 0/0 0/0 0/0 .rodata @4271 */ @@ -628,7 +645,7 @@ COMPILER_STRIP_GATE(80D0D294, &lit_4270); SECTION_RODATA static u8 const lit_4271[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D0D29C, &lit_4271); +COMPILER_STRIP_GATE(0x80D0D29C, &lit_4271); #pragma pop /* 80D0D2A4-80D0D2AC 000118 0008+00 0/0 0/0 0/0 .rodata @4272 */ @@ -637,40 +654,46 @@ COMPILER_STRIP_GATE(80D0D29C, &lit_4271); SECTION_RODATA static u8 const lit_4272[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D0D2A4, &lit_4272); +COMPILER_STRIP_GATE(0x80D0D2A4, &lit_4272); #pragma pop /* 80D0D2AC-80D0D2B0 000120 0004+00 0/0 0/0 0/0 .rodata @4310 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4310 = 3.0f; -COMPILER_STRIP_GATE(80D0D2AC, &lit_4310); +COMPILER_STRIP_GATE(0x80D0D2AC, &lit_4310); #pragma pop /* 80D0D2B0-80D0D2B4 000124 0004+00 0/0 0/0 0/0 .rodata @4433 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4433 = 2000.0f; -COMPILER_STRIP_GATE(80D0D2B0, &lit_4433); +COMPILER_STRIP_GATE(0x80D0D2B0, &lit_4433); #pragma pop /* 80D0D2B4-80D0D2B8 000128 0004+00 0/0 0/0 0/0 .rodata @4446 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4446 = 608.0f; -COMPILER_STRIP_GATE(80D0D2B4, &lit_4446); +COMPILER_STRIP_GATE(0x80D0D2B4, &lit_4446); #pragma pop /* 80D0D2B8-80D0D2BC 00012C 0004+00 0/0 0/0 0/0 .rodata @4447 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4447 = 448.0f; -COMPILER_STRIP_GATE(80D0D2B8, &lit_4447); +COMPILER_STRIP_GATE(0x80D0D2B8, &lit_4447); #pragma pop /* 80D0D2BC-80D0D2C0 000130 0004+00 1/1 0/0 0/0 .rodata @4656 */ SECTION_RODATA static f32 const lit_4656 = -0.0f; -COMPILER_STRIP_GATE(80D0D2BC, &lit_4656); +COMPILER_STRIP_GATE(0x80D0D2BC, &lit_4656); + +/* 80D0D2D0-80D0D2D0 000144 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80D0D324 = "S_thashi00.dzb"; +#pragma pop /* 80D0D35C-80D0D37C -00001 0020+00 1/0 0/0 0/0 .data l_daObjTHASHI_Method */ SECTION_DATA static void* l_daObjTHASHI_Method[8] = { @@ -832,28 +855,28 @@ static bool daObjTHASHI_IsDelete(daObjTHASHI_c* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4790 = -1000.0f; -COMPILER_STRIP_GATE(80D0D2C0, &lit_4790); +COMPILER_STRIP_GATE(0x80D0D2C0, &lit_4790); #pragma pop /* 80D0D2C4-80D0D2C8 000138 0004+00 0/1 0/0 0/0 .rodata @4791 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4791 = -500.0f; -COMPILER_STRIP_GATE(80D0D2C4, &lit_4791); +COMPILER_STRIP_GATE(0x80D0D2C4, &lit_4791); #pragma pop /* 80D0D2C8-80D0D2CC 00013C 0004+00 0/1 0/0 0/0 .rodata @4792 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4792 = 1000.0f; -COMPILER_STRIP_GATE(80D0D2C8, &lit_4792); +COMPILER_STRIP_GATE(0x80D0D2C8, &lit_4792); #pragma pop /* 80D0D2CC-80D0D2D0 000140 0004+00 0/1 0/0 0/0 .rodata @4793 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4793 = 500.0f; -COMPILER_STRIP_GATE(80D0D2CC, &lit_4793); +COMPILER_STRIP_GATE(0x80D0D2CC, &lit_4793); #pragma pop /* 80D0CE70-80D0CEB4 000CB0 0044+00 1/0 0/0 0/0 .text Create__13daObjTHASHI_cFv */ @@ -944,15 +967,4 @@ static asm void func_80D0D17C() { } #pragma pop -/* 80D0D2D0-80D0D333 000144 0063+00 3/2 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80D0D2D0 = "S_thashi"; -SECTION_DEAD static char const* const stringBase_80D0D2D9 = "S_thashi00.bmd"; -SECTION_DEAD static char const* const stringBase_80D0D2E8 = "S_thashi01.bmd"; -SECTION_DEAD static char const* const stringBase_80D0D2F7 = "S_thashi03.bmd"; -SECTION_DEAD static char const* const stringBase_80D0D306 = "S_thashi02.bmd"; -SECTION_DEAD static char const* const stringBase_80D0D315 = "S_thashi01.dzb"; -SECTION_DEAD static char const* const stringBase_80D0D324 = "S_thashi00.dzb"; -#pragma pop +/* 80D0D2D0-80D0D2D0 000144 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_thdoor/d_a_obj_thdoor.cpp b/rel/d/a/obj/d_a_obj_thdoor/d_a_obj_thdoor.cpp index bcf50b9b6aa..6f2e05ccc05 100644 --- a/rel/d/a/obj/d_a_obj_thdoor/d_a_obj_thdoor.cpp +++ b/rel/d/a/obj/d_a_obj_thdoor/d_a_obj_thdoor.cpp @@ -212,7 +212,7 @@ extern "C" static void daObjThDoor_MoveBGDelete__FP13daObjThDoor_c(); extern "C" static void daObjThDoor_MoveBGExecute__FP13daObjThDoor_c(); extern "C" static void daObjThDoor_MoveBGDraw__FP13daObjThDoor_c(); extern "C" void __dt__10cCcD_GSttsFv(); -extern "C" void func_80D0E5D4(u8*); +extern "C" void func_80D0E5D4(void* _this, u8*); extern "C" extern char const* const d_a_obj_thdoor__stringBase0; // @@ -305,7 +305,7 @@ SECTION_RODATA static u8 const lit_3663[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D0E5F8, &lit_3663); +COMPILER_STRIP_GATE(0x80D0E5F8, &lit_3663); /* 80D0D4F8-80D0D59C 000078 00A4+00 1/1 0/0 0/0 .text checkPlayerPos__FP13daObjThDoor_c */ @@ -321,7 +321,7 @@ static asm void checkPlayerPos(daObjThDoor_c* param_0) { /* ############################################################################################## */ /* 80D0E5FC-80D0E600 000004 0004+00 1/1 0/0 0/0 .rodata @3681 */ SECTION_RODATA static f32 const lit_3681 = 3.0f; -COMPILER_STRIP_GATE(80D0E5FC, &lit_3681); +COMPILER_STRIP_GATE(0x80D0E5FC, &lit_3681); /* 80D0D59C-80D0D618 00011C 007C+00 1/1 0/0 0/0 .text * doorCoHitCallBack__FP10fopAc_ac_cP12dCcD_GObjInfP10fopAc_ac_cP12dCcD_GObjInf */ @@ -356,6 +356,14 @@ asm void daObjThDoor_c::setBaseMtx() { #pragma pop /* ############################################################################################## */ +/* 80D0E620-80D0E620 000028 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80D0E620 = "V_CTDoor"; +SECTION_DEAD static char const* const stringBase_80D0E629 = "CHASE_AWAY_WOLF"; +SECTION_DEAD static char const* const stringBase_80D0E639 = "thdoor"; +#pragma pop + /* 80D0E658-80D0E664 000000 000C+00 2/2 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -431,11 +439,11 @@ asm void daObjThDoor_c::create1st() { /* ############################################################################################## */ /* 80D0E600-80D0E604 000008 0004+00 1/2 0/0 0/0 .rodata @3765 */ SECTION_RODATA static f32 const lit_3765 = 1.0f; -COMPILER_STRIP_GATE(80D0E600, &lit_3765); +COMPILER_STRIP_GATE(0x80D0E600, &lit_3765); /* 80D0E604-80D0E608 00000C 0004+00 1/2 0/0 0/0 .rodata @3766 */ SECTION_RODATA static f32 const lit_3766 = -1.0f; -COMPILER_STRIP_GATE(80D0E604, &lit_3766); +COMPILER_STRIP_GATE(0x80D0E604, &lit_3766); /* 80D0D8E8-80D0D9B4 000468 00CC+00 1/0 0/0 0/0 .text Execute__13daObjThDoor_cFPPA3_A4_f */ @@ -453,14 +461,14 @@ asm void daObjThDoor_c::Execute(f32 (**param_0)[3][4]) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3807 = 37.5f; -COMPILER_STRIP_GATE(80D0E608, &lit_3807); +COMPILER_STRIP_GATE(0x80D0E608, &lit_3807); #pragma pop /* 80D0E60C-80D0E610 000014 0004+00 0/1 0/0 0/0 .rodata @3808 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3808 = 112.5f; -COMPILER_STRIP_GATE(80D0E60C, &lit_3808); +COMPILER_STRIP_GATE(0x80D0E60C, &lit_3808); #pragma pop /* 80D0D9B4-80D0DAC8 000534 0114+00 1/1 0/0 0/0 .text set_cyl__13daObjThDoor_cFv */ @@ -582,6 +590,15 @@ void daObjThDoor_c::actionDead() { } /* ############################################################################################## */ +/* 80D0E620-80D0E620 000028 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80D0E640 = "WAIT"; +SECTION_DEAD static char const* const stringBase_80D0E645 = "MSG"; +SECTION_DEAD static char const* const stringBase_80D0E649 = "CLOSE"; +SECTION_DEAD static char const* const stringBase_80D0E64F = "Timer"; +#pragma pop + /* 80D0E728-80D0E734 -00001 000C+00 1/1 0/0 0/0 .data action_table$3895 */ SECTION_DATA static void* action_table[3] = { (void*)(((char*)&d_a_obj_thdoor__stringBase0) + 0x20), @@ -604,28 +621,28 @@ asm void daObjThDoor_c::demoProc() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3988 = -50.0f; -COMPILER_STRIP_GATE(80D0E610, &lit_3988); +COMPILER_STRIP_GATE(0x80D0E610, &lit_3988); #pragma pop /* 80D0E614-80D0E618 00001C 0004+00 0/1 0/0 0/0 .rodata @3989 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3989 = -300.0f; -COMPILER_STRIP_GATE(80D0E614, &lit_3989); +COMPILER_STRIP_GATE(0x80D0E614, &lit_3989); #pragma pop /* 80D0E618-80D0E61C 000020 0004+00 0/1 0/0 0/0 .rodata @3990 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3990 = -100.0f; -COMPILER_STRIP_GATE(80D0E618, &lit_3990); +COMPILER_STRIP_GATE(0x80D0E618, &lit_3990); #pragma pop /* 80D0E61C-80D0E620 000024 0004+00 0/1 0/0 0/0 .rodata @3991 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3991 = 100.0f; -COMPILER_STRIP_GATE(80D0E61C, &lit_3991); +COMPILER_STRIP_GATE(0x80D0E61C, &lit_3991); #pragma pop /* 80D0E06C-80D0E150 000BEC 00E4+00 1/1 0/0 0/0 .text checkArea__13daObjThDoor_cFv */ @@ -829,21 +846,10 @@ asm cCcD_GStts::~cCcD_GStts() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80D0E5D4(u8* param_0) { +extern "C" asm void func_80D0E5D4(void* _this, u8* param_0) { nofralloc #include "asm/rel/d/a/obj/d_a_obj_thdoor/d_a_obj_thdoor/func_80D0E5D4.s" } #pragma pop -/* 80D0E620-80D0E655 000028 0035+00 5/1 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80D0E620 = "V_CTDoor"; -SECTION_DEAD static char const* const stringBase_80D0E629 = "CHASE_AWAY_WOLF"; -SECTION_DEAD static char const* const stringBase_80D0E639 = "thdoor"; -SECTION_DEAD static char const* const stringBase_80D0E640 = "WAIT"; -SECTION_DEAD static char const* const stringBase_80D0E645 = "MSG"; -SECTION_DEAD static char const* const stringBase_80D0E649 = "CLOSE"; -SECTION_DEAD static char const* const stringBase_80D0E64F = "Timer"; -#pragma pop +/* 80D0E620-80D0E620 000028 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_timeFire/d_a_obj_timeFire.cpp b/rel/d/a/obj/d_a_obj_timeFire/d_a_obj_timeFire.cpp index 57ba24ac48b..ef4cc00ef7e 100644 --- a/rel/d/a/obj/d_a_obj_timeFire/d_a_obj_timeFire.cpp +++ b/rel/d/a/obj/d_a_obj_timeFire/d_a_obj_timeFire.cpp @@ -46,13 +46,13 @@ struct dSv_info_c { struct dPa_levelEcallBack {}; -struct cXyz {}; - struct dKy_tevstr_c {}; +struct csXyz {}; + struct _GXColor {}; -struct csXyz {}; +struct cXyz {}; struct dPa_control_c { /* 8004D4CC */ void set(u32, u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, @@ -60,10 +60,10 @@ struct dPa_control_c { _GXColor const*, cXyz const*, f32); }; -struct Vec {}; - struct JAISoundID {}; +struct Vec {}; + struct Z2SeMgr { /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); /* 802AC50C */ void seStartLevel(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); @@ -202,13 +202,13 @@ SECTION_RODATA static f32 const lit_3686[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80D0F0E4, &lit_3686); +COMPILER_STRIP_GATE(0x80D0F0E4, &lit_3686); /* 80D0F0EC-80D0F0F4 000008 0008+00 1/1 0/0 0/0 .rodata @3688 */ SECTION_RODATA static u8 const lit_3688[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D0F0EC, &lit_3688); +COMPILER_STRIP_GATE(0x80D0F0EC, &lit_3688); /* 80D0E9B0-80D0EACC 0001B0 011C+00 1/1 0/0 0/0 .text create__12daTimeFire_cFv */ #pragma push @@ -225,12 +225,12 @@ asm void daTimeFire_c::create() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3707 = 500.0f; -COMPILER_STRIP_GATE(80D0F0F4, &lit_3707); +COMPILER_STRIP_GATE(0x80D0F0F4, &lit_3707); #pragma pop /* 80D0F0F8-80D0F0FC 000014 0004+00 2/3 0/0 0/0 .rodata @3708 */ SECTION_RODATA static f32 const lit_3708 = 1.0f; -COMPILER_STRIP_GATE(80D0F0F8, &lit_3708); +COMPILER_STRIP_GATE(0x80D0F0F8, &lit_3708); /* 80D0EACC-80D0EB40 0002CC 0074+00 1/1 0/0 0/0 .text lightInit__12daTimeFire_cFv */ #pragma push @@ -265,7 +265,7 @@ asm void daTimeFire_c::cutLight() { /* ############################################################################################## */ /* 80D0F0FC-80D0F100 000018 0004+00 2/2 0/0 0/0 .rodata @3757 */ SECTION_RODATA static f32 const lit_3757 = -1.0f; -COMPILER_STRIP_GATE(80D0F0FC, &lit_3757); +COMPILER_STRIP_GATE(0x80D0F0FC, &lit_3757); /* 80D0EB88-80D0ED68 000388 01E0+00 1/1 0/0 0/0 .text Execute__12daTimeFire_cFv */ #pragma push @@ -374,5 +374,5 @@ asm void __sinit_d_a_obj_timeFire_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80D0F094 = (void*)__sinit_d_a_obj_timeFire_cpp; +REGISTER_CTORS(0x80D0F094, __sinit_d_a_obj_timeFire_cpp); #pragma pop diff --git a/rel/d/a/obj/d_a_obj_timer/d_a_obj_timer.cpp b/rel/d/a/obj/d_a_obj_timer/d_a_obj_timer.cpp index 2c52746b103..1ec279857b2 100644 --- a/rel/d/a/obj/d_a_obj_timer/d_a_obj_timer.cpp +++ b/rel/d/a/obj/d_a_obj_timer/d_a_obj_timer.cpp @@ -33,7 +33,8 @@ struct daObj { template void PrmAbstract(/* ... */); /* 8048561C */ /* daObj::PrmAbstract */ - void func_8048561C(fopAc_ac_c const*, daObjTimer::Act_c::Prm_e, daObjTimer::Act_c::Prm_e); + void func_8048561C(void* _this, fopAc_ac_c const*, daObjTimer::Act_c::Prm_e, + daObjTimer::Act_c::Prm_e); }; struct dSv_info_c { @@ -43,10 +44,10 @@ struct dSv_info_c { struct create_tag_class {}; -struct Vec {}; - struct JAISoundID {}; +struct Vec {}; + struct Z2SeMgr { /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); }; @@ -71,7 +72,7 @@ extern "C" static void func_804855C4(); extern "C" static void func_804855E8(); extern "C" static bool func_8048560C(); extern "C" static bool func_80485614(); -extern "C" void func_8048561C(fopAc_ac_c const*, daObjTimer::Act_c::Prm_e, +extern "C" void func_8048561C(void* _this, fopAc_ac_c const*, daObjTimer::Act_c::Prm_e, daObjTimer::Act_c::Prm_e); extern "C" extern void* g_profile_Obj_Timer[12]; @@ -145,11 +146,11 @@ asm void daObjTimer::Act_c::mode_count_init() { /* ############################################################################################## */ /* 80485640-80485644 000000 0004+00 1/1 0/0 0/0 .rodata @3720 */ SECTION_RODATA static f32 const lit_3720 = 1.0f; -COMPILER_STRIP_GATE(80485640, &lit_3720); +COMPILER_STRIP_GATE(0x80485640, &lit_3720); /* 80485644-80485648 000004 0004+00 1/1 0/0 0/0 .rodata @3721 */ SECTION_RODATA static f32 const lit_3721 = -1.0f; -COMPILER_STRIP_GATE(80485644, &lit_3721); +COMPILER_STRIP_GATE(0x80485644, &lit_3721); /* 80485324-804854BC 000204 0198+00 1/0 0/0 0/0 .text mode_count__Q210daObjTimer5Act_cFv */ @@ -271,7 +272,8 @@ static bool func_80485614() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_8048561C(fopAc_ac_c const* param_0, daObjTimer::Act_c::Prm_e param_1, +extern "C" asm void func_8048561C(void* _this, fopAc_ac_c const* param_0, + daObjTimer::Act_c::Prm_e param_1, daObjTimer::Act_c::Prm_e param_2) { nofralloc #include "asm/rel/d/a/obj/d_a_obj_timer/d_a_obj_timer/func_8048561C.s" diff --git a/rel/d/a/obj/d_a_obj_tks/d_a_obj_tks.cpp b/rel/d/a/obj/d_a_obj_tks/d_a_obj_tks.cpp index ffbbf6b007e..cd202d79bce 100644 --- a/rel/d/a/obj/d_a_obj_tks/d_a_obj_tks.cpp +++ b/rel/d/a/obj/d_a_obj_tks/d_a_obj_tks.cpp @@ -41,12 +41,12 @@ struct mDoExt_bckAnm { /* 8000D990 */ void changeBckOnly(J3DAnmTransform*); }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; +struct J3DModelData {}; + struct Z2Creature { /* 802C03C8 */ Z2Creature(); /* 802C0420 */ ~Z2Creature(); @@ -66,10 +66,10 @@ struct fopAc_ac_c { /* 80018C8C */ ~fopAc_ac_c(); }; -struct J3DJoint {}; - struct J3DModel {}; +struct J3DJoint {}; + struct daObjTks_c { /* 80D0F28C */ daObjTks_c(); /* 80D0F480 */ ~daObjTks_c(); @@ -108,16 +108,16 @@ struct daObjTks_Param_c { static u8 const m[128]; }; -struct J3DAnmTextureSRTKey {}; - -struct _GXColorS10 {}; - struct J3DAnmTexPattern { /* 8032AF50 */ void getTexNo(u16, u16*) const; }; +struct J3DAnmTextureSRTKey {}; + struct J3DAnmTransformKey {}; +struct _GXColorS10 {}; + struct daNpcF_c { struct daNpcF_anmPlayData {}; @@ -303,7 +303,7 @@ struct JMath { struct TSinCosTable {}; /* TSinCosTable<13, f32> */ struct TSinCosTable__template0 { - /* 80D11EA0 */ void func_80D11EA0(s16) /* const */; + /* 80D11EA0 */ void func_80D11EA0(void* _this, s16) /* const */; }; static u8 sincosTable_[65536]; @@ -399,7 +399,7 @@ extern "C" void setAttnPos__10daObjTks_cFv(); extern "C" void lookat__10daObjTks_cFv(); extern "C" bool drawDbgInfo__10daObjTks_cFv(); extern "C" void drawOtherMdls__10daObjTks_cFv(); -extern "C" void func_80D11EA0(s16); +extern "C" void func_80D11EA0(void* _this, s16); extern "C" void __sinit_d_a_obj_tks_cpp(); extern "C" void __dt__15daNpcF_Lookat_cFv(); extern "C" void __dt__5csXyzFv(); @@ -572,6 +572,13 @@ extern "C" void __register_global_object(); // /* ############################################################################################## */ +/* 80D128C8-80D128C8 00018C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80D128C8 = "TKS2"; +SECTION_DEAD static char const* const stringBase_80D128CD = "ObjTks"; +#pragma pop + /* 80D128F0-80D128FC 000000 000C+00 3/3 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -867,7 +874,7 @@ SECTION_RODATA u8 const daObjTks_Param_c::m[128] = { 0x00, 0x3C, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0xDE, 0x00, 0x00, 0x42, 0x48, 0x00, 0x00, 0xBE, 0x4C, 0xCC, 0xCD, 0x3F, 0x4C, 0xCC, 0xCD, }; -COMPILER_STRIP_GATE(80D1273C, &daObjTks_Param_c::m); +COMPILER_STRIP_GATE(0x80D1273C, &daObjTks_Param_c::m); /* 80D127BC-80D127C0 000080 0004+00 0/1 0/0 0/0 .rodata m_cameraItemNum$4211 */ #pragma push @@ -878,35 +885,41 @@ SECTION_RODATA static u8 const m_cameraItemNum[4] = { 0x00, 0x01, }; -COMPILER_STRIP_GATE(80D127BC, &m_cameraItemNum); +COMPILER_STRIP_GATE(0x80D127BC, &m_cameraItemNum); #pragma pop /* 80D127C0-80D127C4 000084 0004+00 0/2 0/0 0/0 .rodata @4271 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4271 = -80.0f; -COMPILER_STRIP_GATE(80D127C0, &lit_4271); +COMPILER_STRIP_GATE(0x80D127C0, &lit_4271); #pragma pop /* 80D127C4-80D127C8 000088 0004+00 0/1 0/0 0/0 .rodata @4272 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4272 = -30.0f; -COMPILER_STRIP_GATE(80D127C4, &lit_4272); +COMPILER_STRIP_GATE(0x80D127C4, &lit_4272); #pragma pop /* 80D127C8-80D127CC 00008C 0004+00 0/2 0/0 0/0 .rodata @4273 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4273 = 80.0f; -COMPILER_STRIP_GATE(80D127C8, &lit_4273); +COMPILER_STRIP_GATE(0x80D127C8, &lit_4273); #pragma pop /* 80D127CC-80D127D0 000090 0004+00 0/2 0/0 0/0 .rodata @4274 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4274 = 10.0f; -COMPILER_STRIP_GATE(80D127CC, &lit_4274); +COMPILER_STRIP_GATE(0x80D127CC, &lit_4274); +#pragma pop + +/* 80D128C8-80D128C8 00018C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80D128D4 = "Type"; #pragma pop /* 80D0F640-80D0F904 0004A0 02C4+00 1/1 0/0 0/0 .text Create__10daObjTks_cFv */ @@ -922,11 +935,11 @@ asm void daObjTks_c::Create() { /* ############################################################################################## */ /* 80D127D0-80D127D4 000094 0004+00 4/5 0/0 0/0 .rodata @4323 */ SECTION_RODATA static f32 const lit_4323 = 1.0f; -COMPILER_STRIP_GATE(80D127D0, &lit_4323); +COMPILER_STRIP_GATE(0x80D127D0, &lit_4323); /* 80D127D4-80D127D8 000098 0004+00 4/6 0/0 0/0 .rodata @4324 */ SECTION_RODATA static f32 const lit_4324 = -1.0f; -COMPILER_STRIP_GATE(80D127D4, &lit_4324); +COMPILER_STRIP_GATE(0x80D127D4, &lit_4324); /* 80D0F904-80D0FB78 000764 0274+00 1/1 0/0 0/0 .text CreateHeap__10daObjTks_cFv */ #pragma push @@ -1053,21 +1066,21 @@ asm void daObjTks_c::Delete() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4367 = 6.0f; -COMPILER_STRIP_GATE(80D127D8, &lit_4367); +COMPILER_STRIP_GATE(0x80D127D8, &lit_4367); #pragma pop /* 80D127DC-80D127E0 0000A0 0004+00 0/1 0/0 0/0 .rodata @4368 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4368 = -5.0f; -COMPILER_STRIP_GATE(80D127DC, &lit_4368); +COMPILER_STRIP_GATE(0x80D127DC, &lit_4368); #pragma pop /* 80D127E0-80D127E4 0000A4 0004+00 0/1 0/0 0/0 .rodata @4369 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4369 = 4.0f; -COMPILER_STRIP_GATE(80D127E0, &lit_4369); +COMPILER_STRIP_GATE(0x80D127E0, &lit_4369); #pragma pop /* 80D0FD68-80D0FE60 000BC8 00F8+00 2/2 0/0 0/0 .text Execute__10daObjTks_cFv */ @@ -1095,7 +1108,7 @@ asm void daObjTks_c::Draw() { SECTION_RODATA static u8 const lit_4394[12] = { 0x00, 0x00, 0x00, 0x0F, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x11, }; -COMPILER_STRIP_GATE(80D127E4, &lit_4394); +COMPILER_STRIP_GATE(0x80D127E4, &lit_4394); /* 80D0FED0-80D10094 000D30 01C4+00 1/1 0/0 0/0 .text ctrlJoint__10daObjTks_cFP8J3DJointP8J3DModel */ @@ -1179,13 +1192,13 @@ SECTION_RODATA static u8 const lit_4599[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D127F0, &lit_4599); +COMPILER_STRIP_GATE(0x80D127F0, &lit_4599); /* 80D127F4-80D127F8 0000B8 0004+00 0/1 0/0 0/0 .rodata @4600 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4600 = 3.0f / 20.0f; -COMPILER_STRIP_GATE(80D127F4, &lit_4600); +COMPILER_STRIP_GATE(0x80D127F4, &lit_4600); #pragma pop /* 80D103E8-80D10578 001248 0190+00 1/1 0/0 0/0 .text reset__10daObjTks_cFv */ @@ -1203,7 +1216,7 @@ asm void daObjTks_c::reset() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daObjTks_c::setAction(void (daObjTks_c::*)()) { +asm void daObjTks_c::setAction(void (daObjTks_c::*param_0)()) { nofralloc #include "asm/rel/d/a/obj/d_a_obj_tks/d_a_obj_tks/setAction__10daObjTks_cFM10daObjTks_cFPCvPv_v.s" } @@ -1236,7 +1249,7 @@ asm void daObjTks_c::setExpression(int param_0, f32 param_1) { SECTION_RODATA static u8 const lit_4601[12] = { 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D127F8, &lit_4601); +COMPILER_STRIP_GATE(0x80D127F8, &lit_4601); #pragma pop /* 80D12804-80D12808 0000C8 0004+00 0/1 0/0 0/0 .rodata @4602 */ @@ -1248,7 +1261,7 @@ SECTION_RODATA static u8 const lit_4602[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D12804, &lit_4602); +COMPILER_STRIP_GATE(0x80D12804, &lit_4602); #pragma pop /* 80D12808-80D12814 0000CC 000C+00 0/1 0/0 0/0 .rodata @4603 */ @@ -1257,7 +1270,7 @@ COMPILER_STRIP_GATE(80D12804, &lit_4602); SECTION_RODATA static u8 const lit_4603[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D12808, &lit_4603); +COMPILER_STRIP_GATE(0x80D12808, &lit_4603); #pragma pop /* 80D12814-80D12818 0000D8 0004+00 0/1 0/0 0/0 .rodata @4604 */ @@ -1269,7 +1282,7 @@ SECTION_RODATA static u8 const lit_4604[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D12814, &lit_4604); +COMPILER_STRIP_GATE(0x80D12814, &lit_4604); #pragma pop /* 80D12818-80D12820 0000DC 0008+00 0/1 0/0 0/0 .rodata @4605 */ @@ -1278,7 +1291,7 @@ COMPILER_STRIP_GATE(80D12814, &lit_4604); SECTION_RODATA static u8 const lit_4605[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D12818, &lit_4605); +COMPILER_STRIP_GATE(0x80D12818, &lit_4605); #pragma pop /* 80D12820-80D1282C 0000E4 000C+00 0/1 0/0 0/0 .rodata @4609 */ @@ -1287,7 +1300,7 @@ COMPILER_STRIP_GATE(80D12818, &lit_4605); SECTION_RODATA static u8 const lit_4609[12] = { 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D12820, &lit_4609); +COMPILER_STRIP_GATE(0x80D12820, &lit_4609); #pragma pop /* 80D1282C-80D12830 0000F0 0004+00 0/1 0/0 0/0 .rodata @4610 */ @@ -1299,7 +1312,7 @@ SECTION_RODATA static u8 const lit_4610[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D1282C, &lit_4610); +COMPILER_STRIP_GATE(0x80D1282C, &lit_4610); #pragma pop /* 80D12830-80D1283C 0000F4 000C+00 0/1 0/0 0/0 .rodata @4611 */ @@ -1308,7 +1321,7 @@ COMPILER_STRIP_GATE(80D1282C, &lit_4610); SECTION_RODATA static u8 const lit_4611[12] = { 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80D12830, &lit_4611); +COMPILER_STRIP_GATE(0x80D12830, &lit_4611); #pragma pop /* 80D1283C-80D12844 000100 0008+00 0/1 0/0 0/0 .rodata @4612 */ @@ -1317,7 +1330,7 @@ COMPILER_STRIP_GATE(80D12830, &lit_4611); SECTION_RODATA static u8 const lit_4612[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D1283C, &lit_4612); +COMPILER_STRIP_GATE(0x80D1283C, &lit_4612); #pragma pop /* 80D12844-80D12850 000108 000C+00 0/1 0/0 0/0 .rodata @4613 */ @@ -1326,7 +1339,7 @@ COMPILER_STRIP_GATE(80D1283C, &lit_4612); SECTION_RODATA static u8 const lit_4613[12] = { 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D12844, &lit_4613); +COMPILER_STRIP_GATE(0x80D12844, &lit_4613); #pragma pop /* 80D12850-80D12854 000114 0004+00 0/1 0/0 0/0 .rodata @4614 */ @@ -1338,7 +1351,7 @@ SECTION_RODATA static u8 const lit_4614[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D12850, &lit_4614); +COMPILER_STRIP_GATE(0x80D12850, &lit_4614); #pragma pop /* 80D12854-80D12860 000118 000C+00 0/1 0/0 0/0 .rodata @4615 */ @@ -1347,7 +1360,7 @@ COMPILER_STRIP_GATE(80D12850, &lit_4614); SECTION_RODATA static u8 const lit_4615[12] = { 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80D12854, &lit_4615); +COMPILER_STRIP_GATE(0x80D12854, &lit_4615); #pragma pop /* 80D12860-80D12868 000124 0008+00 0/1 0/0 0/0 .rodata @4616 */ @@ -1356,7 +1369,7 @@ COMPILER_STRIP_GATE(80D12854, &lit_4615); SECTION_RODATA static u8 const lit_4616[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D12860, &lit_4616); +COMPILER_STRIP_GATE(0x80D12860, &lit_4616); #pragma pop /* 80D12868-80D12878 00012C 0010+00 0/1 0/0 0/0 .rodata @4617 */ @@ -1365,7 +1378,7 @@ COMPILER_STRIP_GATE(80D12860, &lit_4616); SECTION_RODATA static u8 const lit_4617[16] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D12868, &lit_4617); +COMPILER_STRIP_GATE(0x80D12868, &lit_4617); #pragma pop /* 80D12878-80D12884 00013C 000C+00 0/1 0/0 0/0 .rodata @4631 */ @@ -1374,12 +1387,12 @@ COMPILER_STRIP_GATE(80D12868, &lit_4617); SECTION_RODATA static u8 const lit_4631[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D12878, &lit_4631); +COMPILER_STRIP_GATE(0x80D12878, &lit_4631); #pragma pop /* 80D12884-80D12888 000148 0004+00 1/2 0/0 0/0 .rodata @4733 */ SECTION_RODATA static f32 const lit_4733 = 30.0f; -COMPILER_STRIP_GATE(80D12884, &lit_4733); +COMPILER_STRIP_GATE(0x80D12884, &lit_4733); /* 80D106F4-80D10A80 001554 038C+00 1/0 0/0 0/0 .text talk__10daObjTks_cFv */ #pragma push @@ -1410,7 +1423,7 @@ SECTION_RODATA static u8 const lit_4760[8 + 4 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D12888, &lit_4760); +COMPILER_STRIP_GATE(0x80D12888, &lit_4760); #pragma pop /* 80D12894-80D1289C 000158 0008+00 0/1 0/0 0/0 .rodata @4864 */ @@ -1419,7 +1432,13 @@ COMPILER_STRIP_GATE(80D12888, &lit_4760); SECTION_RODATA static u8 const lit_4864[8] = { 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D12894, &lit_4864); +COMPILER_STRIP_GATE(0x80D12894, &lit_4864); +#pragma pop + +/* 80D128C8-80D128C8 00018C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80D128D9 = "TKS_SECRET"; #pragma pop /* 80D10A80-80D11104 0018E0 0684+00 1/0 0/0 0/0 .text demo__10daObjTks_cFv */ @@ -1447,7 +1466,13 @@ asm void daObjTks_c::setMotionAnm(int param_0, f32 param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4946 = -0.5f; -COMPILER_STRIP_GATE(80D1289C, &lit_4946); +COMPILER_STRIP_GATE(0x80D1289C, &lit_4946); +#pragma pop + +/* 80D128C8-80D128C8 00018C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80D128E4 = "TKS_WARP"; #pragma pop /* 80D11228-80D115B8 002088 0390+00 3/0 0/0 0/0 .text warp__10daObjTks_cFv */ @@ -1518,7 +1543,7 @@ asm void J3DTexNoAnm::calc(u16* param_0) const { /* ############################################################################################## */ /* 80D128A0-80D128A4 000164 0004+00 1/1 0/0 0/0 .rodata @5005 */ SECTION_RODATA static f32 const lit_5005 = 7.0f / 10.0f; -COMPILER_STRIP_GATE(80D128A0, &lit_5005); +COMPILER_STRIP_GATE(0x80D128A0, &lit_5005); /* 80D11670-80D116C8 0024D0 0058+00 1/0 0/0 0/0 .text setParam__10daObjTks_cFv */ #pragma push @@ -1547,7 +1572,7 @@ SECTION_RODATA static f32 const lit_5057[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80D128A4, &lit_5057); +COMPILER_STRIP_GATE(0x80D128A4, &lit_5057); /* 80D118E8-80D119BC 002748 00D4+00 1/0 0/0 0/0 .text ctrlBtk__10daObjTks_cFv */ #pragma push @@ -1566,7 +1591,7 @@ asm void daObjTks_c::ctrlBtk() { SECTION_RODATA static u8 const lit_5130[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D128AC, &lit_5130); +COMPILER_STRIP_GATE(0x80D128AC, &lit_5130); #pragma pop /* 80D128B4-80D128BC 000178 0008+00 0/1 0/0 0/0 .rodata @5131 */ @@ -1575,7 +1600,7 @@ COMPILER_STRIP_GATE(80D128AC, &lit_5130); SECTION_RODATA static u8 const lit_5131[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D128B4, &lit_5131); +COMPILER_STRIP_GATE(0x80D128B4, &lit_5131); #pragma pop /* 80D128BC-80D128C4 000180 0008+00 0/1 0/0 0/0 .rodata @5132 */ @@ -1584,7 +1609,7 @@ COMPILER_STRIP_GATE(80D128B4, &lit_5131); SECTION_RODATA static u8 const lit_5132[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D128BC, &lit_5132); +COMPILER_STRIP_GATE(0x80D128BC, &lit_5132); #pragma pop /* 80D119BC-80D11CB4 00281C 02F8+00 1/0 0/0 0/0 .text setAttnPos__10daObjTks_cFv */ @@ -1602,7 +1627,7 @@ asm void daObjTks_c::setAttnPos() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5173 = 40.0f; -COMPILER_STRIP_GATE(80D128C4, &lit_5173); +COMPILER_STRIP_GATE(0x80D128C4, &lit_5173); #pragma pop /* 80D11CB4-80D11E94 002B14 01E0+00 1/1 0/0 0/0 .text lookat__10daObjTks_cFv */ @@ -1629,7 +1654,7 @@ void daObjTks_c::drawOtherMdls() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80D11EA0(s16 param_0) /* const */ { +extern "C" asm void func_80D11EA0(void* _this, s16 param_0) /* const */ { nofralloc #include "asm/rel/d/a/obj/d_a_obj_tks/d_a_obj_tks/func_80D11EA0.s" } @@ -1661,7 +1686,7 @@ asm void __sinit_d_a_obj_tks_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80D11EAC = (void*)__sinit_d_a_obj_tks_cpp; +REGISTER_CTORS(0x80D11EAC, __sinit_d_a_obj_tks_cpp); #pragma pop /* 80D11EEC-80D11FBC 002D4C 00D0+00 1/0 0/0 0/0 .text __dt__15daNpcF_Lookat_cFv */ @@ -1834,13 +1859,4 @@ static asm void func_80D12720() { } #pragma pop -/* 80D128C8-80D128ED 00018C 0025+00 5/3 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80D128C8 = "TKS2"; -SECTION_DEAD static char const* const stringBase_80D128CD = "ObjTks"; -SECTION_DEAD static char const* const stringBase_80D128D4 = "Type"; -SECTION_DEAD static char const* const stringBase_80D128D9 = "TKS_SECRET"; -SECTION_DEAD static char const* const stringBase_80D128E4 = "TKS_WARP"; -#pragma pop +/* 80D128C8-80D128C8 00018C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_tmoon/d_a_obj_tmoon.cpp b/rel/d/a/obj/d_a_obj_tmoon/d_a_obj_tmoon.cpp index 24bc16f3037..6083fd64af2 100644 --- a/rel/d/a/obj/d_a_obj_tmoon/d_a_obj_tmoon.cpp +++ b/rel/d/a/obj/d_a_obj_tmoon/d_a_obj_tmoon.cpp @@ -145,6 +145,12 @@ asm void daObjTMoon_c::Create() { #pragma pop /* ############################################################################################## */ +/* 80D12F98-80D12F98 000000 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80D12F98 = "A_TMoon"; +#pragma pop + /* 80D12FA0-80D12FA4 -00001 0004+00 3/3 0/0 0/0 .data l_arcName */ SECTION_DATA static void* l_arcName = (void*)&d_a_obj_tmoon__stringBase0; @@ -264,9 +270,4 @@ SECTION_DATA extern void* g_profile_Obj_TMoon[12] = { (void*)0x00040000, (void*)0x000E0000, }; -/* 80D12F98-80D12FA0 000000 0008+00 1/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80D12F98 = "A_TMoon"; -#pragma pop +/* 80D12F98-80D12F98 000000 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_toaru_maki/d_a_obj_toaru_maki.cpp b/rel/d/a/obj/d_a_obj_toaru_maki/d_a_obj_toaru_maki.cpp index b3cb25ae6f4..e1d547e3af5 100644 --- a/rel/d/a/obj/d_a_obj_toaru_maki/d_a_obj_toaru_maki.cpp +++ b/rel/d/a/obj/d_a_obj_toaru_maki/d_a_obj_toaru_maki.cpp @@ -147,6 +147,13 @@ static asm void daObjToaruMaki_c_createHeap(fopAc_ac_c* param_0) { #pragma pop /* ############################################################################################## */ +/* 80D13614-80D13614 000010 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80D13614 = "T_Maki1"; +SECTION_DEAD static char const* const stringBase_80D1361C = "T_Maki2"; +#pragma pop + /* 80D13624-80D1362C -00001 0008+00 3/3 0/0 0/0 .data l_arcName */ SECTION_DATA static void* l_arcName[2] = { (void*)&d_a_obj_toaru_maki__stringBase0, @@ -207,7 +214,7 @@ asm daObjToaruMaki_c::~daObjToaruMaki_c() { SECTION_RODATA static u8 const l_bmdIdx[8] = { 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x03, }; -COMPILER_STRIP_GATE(80D13604, &l_bmdIdx); +COMPILER_STRIP_GATE(0x80D13604, &l_bmdIdx); /* 80D1316C-80D132B4 00016C 0148+00 1/1 0/0 0/0 .text createHeap__16daObjToaruMaki_cFv */ #pragma push @@ -224,7 +231,7 @@ asm void daObjToaruMaki_c::createHeap() { SECTION_RODATA static u8 const l_heapSize[8] = { 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x0E, 0xB0, }; -COMPILER_STRIP_GATE(80D1360C, &l_heapSize); +COMPILER_STRIP_GATE(0x80D1360C, &l_heapSize); /* 80D132B4-80D133C0 0002B4 010C+00 1/1 0/0 0/0 .text create__16daObjToaruMaki_cFv */ #pragma push @@ -320,10 +327,4 @@ static asm void daObjToaruMaki_draw(daObjToaruMaki_c* param_0) { } #pragma pop -/* 80D13614-80D13624 000010 0010+00 1/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80D13614 = "T_Maki1"; -SECTION_DEAD static char const* const stringBase_80D1361C = "T_Maki2"; -#pragma pop +/* 80D13614-80D13614 000010 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_toby/d_a_obj_toby.cpp b/rel/d/a/obj/d_a_obj_toby/d_a_obj_toby.cpp index bc7eaa6b2b5..118f52731f9 100644 --- a/rel/d/a/obj/d_a_obj_toby/d_a_obj_toby.cpp +++ b/rel/d/a/obj/d_a_obj_toby/d_a_obj_toby.cpp @@ -76,12 +76,12 @@ struct dPa_simpleEcallBack { struct dPa_levelEcallBack {}; -struct _GXColor {}; - struct csXyz { /* 8026745C */ void operator+=(csXyz&); }; +struct _GXColor {}; + struct dPa_control_c { /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, @@ -95,10 +95,10 @@ struct dEvt_control_c { /* 80042468 */ void reset(); }; -struct J3DModelData {}; - struct J3DModel {}; +struct J3DModelData {}; + struct dComIfG_play_c { /* 8002CAF0 */ void addSimpleModel(J3DModelData*, int, u8); /* 8002CB30 */ void removeSimpleModel(J3DModelData*, int); @@ -261,7 +261,7 @@ extern "C" void __register_global_object(); /* ############################################################################################## */ /* 80D155E8-80D155EC 000000 0004+00 9/9 0/0 0/0 .rodata @3806 */ SECTION_RODATA static f32 const lit_3806 = 1.0f; -COMPILER_STRIP_GATE(80D155E8, &lit_3806); +COMPILER_STRIP_GATE(0x80D155E8, &lit_3806); /* 80D156D4-80D15794 000000 00C0+00 1/1 0/0 0/0 .data r05yuka_image */ SECTION_DATA static u8 r05yuka_image[192] = { @@ -355,7 +355,7 @@ SECTION_RODATA static u8 const lit_3880[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D155EC, &lit_3880); +COMPILER_STRIP_GATE(0x80D155EC, &lit_3880); #pragma pop /* 80D155F0-80D155F8 000008 0008+00 0/2 0/0 0/0 .rodata @3881 */ @@ -364,7 +364,7 @@ COMPILER_STRIP_GATE(80D155EC, &lit_3880); SECTION_RODATA static u8 const lit_3881[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D155F0, &lit_3881); +COMPILER_STRIP_GATE(0x80D155F0, &lit_3881); #pragma pop /* 80D155F8-80D15600 000010 0008+00 0/2 0/0 0/0 .rodata @3882 */ @@ -373,7 +373,7 @@ COMPILER_STRIP_GATE(80D155F0, &lit_3881); SECTION_RODATA static u8 const lit_3882[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D155F8, &lit_3882); +COMPILER_STRIP_GATE(0x80D155F8, &lit_3882); #pragma pop /* 80D15600-80D15608 000018 0008+00 0/2 0/0 0/0 .rodata @3883 */ @@ -382,14 +382,14 @@ COMPILER_STRIP_GATE(80D155F8, &lit_3882); SECTION_RODATA static u8 const lit_3883[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D15600, &lit_3883); +COMPILER_STRIP_GATE(0x80D15600, &lit_3883); #pragma pop /* 80D15608-80D1560C 000020 0004+00 0/1 0/0 0/0 .rodata @3884 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3884 = 350.0f; -COMPILER_STRIP_GATE(80D15608, &lit_3884); +COMPILER_STRIP_GATE(0x80D15608, &lit_3884); #pragma pop /* 80D13870-80D139FC 0001D0 018C+00 1/1 0/0 0/0 .text s_bomb_sub__FPvPv */ @@ -425,7 +425,7 @@ static asm void shot_b_sub(void* param_0, void* param_1) { /* ############################################################################################## */ /* 80D1560C-80D15610 000024 0004+00 1/1 0/0 0/0 .rodata @3917 */ SECTION_RODATA static f32 const lit_3917 = 1600.0f; -COMPILER_STRIP_GATE(80D1560C, &lit_3917); +COMPILER_STRIP_GATE(0x80D1560C, &lit_3917); /* 80D158B8-80D158BC 000008 0001+03 2/2 0/0 0/0 .bss @1109 */ static u8 lit_1109[1 + 3 /* padding */]; @@ -546,95 +546,95 @@ static asm void s_hz_sub(void* param_0, void* param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4077 = 80.0f; -COMPILER_STRIP_GATE(80D15610, &lit_4077); +COMPILER_STRIP_GATE(0x80D15610, &lit_4077); #pragma pop /* 80D15614-80D15618 00002C 0004+00 0/2 0/0 0/0 .rodata @4078 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4078 = 100.0f; -COMPILER_STRIP_GATE(80D15614, &lit_4078); +COMPILER_STRIP_GATE(0x80D15614, &lit_4078); #pragma pop /* 80D15618-80D1561C 000030 0004+00 0/3 0/0 0/0 .rodata @4079 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4079 = 50.0f; -COMPILER_STRIP_GATE(80D15618, &lit_4079); +COMPILER_STRIP_GATE(0x80D15618, &lit_4079); #pragma pop /* 80D1561C-80D15620 000034 0004+00 0/2 0/0 0/0 .rodata @4080 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4080 = 65536.0f; -COMPILER_STRIP_GATE(80D1561C, &lit_4080); +COMPILER_STRIP_GATE(0x80D1561C, &lit_4080); #pragma pop /* 80D15620-80D15624 000038 0004+00 1/3 0/0 0/0 .rodata @4081 */ SECTION_RODATA static f32 const lit_4081 = -1.0f; -COMPILER_STRIP_GATE(80D15620, &lit_4081); +COMPILER_STRIP_GATE(0x80D15620, &lit_4081); /* 80D15624-80D15628 00003C 0004+00 0/1 0/0 0/0 .rodata @4082 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4082 = -50.0f; -COMPILER_STRIP_GATE(80D15624, &lit_4082); +COMPILER_STRIP_GATE(0x80D15624, &lit_4082); #pragma pop /* 80D15628-80D1562C 000040 0004+00 0/1 0/0 0/0 .rodata @4083 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4083 = 400.0f; -COMPILER_STRIP_GATE(80D15628, &lit_4083); +COMPILER_STRIP_GATE(0x80D15628, &lit_4083); #pragma pop /* 80D1562C-80D15630 000044 0004+00 0/1 0/0 0/0 .rodata @4084 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4084 = 60.0f; -COMPILER_STRIP_GATE(80D1562C, &lit_4084); +COMPILER_STRIP_GATE(0x80D1562C, &lit_4084); #pragma pop /* 80D15630-80D15634 000048 0004+00 0/2 0/0 0/0 .rodata @4085 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4085 = 30.0f; -COMPILER_STRIP_GATE(80D15630, &lit_4085); +COMPILER_STRIP_GATE(0x80D15630, &lit_4085); #pragma pop /* 80D15634-80D15638 00004C 0004+00 0/1 0/0 0/0 .rodata @4086 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4086 = 4000.0f; -COMPILER_STRIP_GATE(80D15634, &lit_4086); +COMPILER_STRIP_GATE(0x80D15634, &lit_4086); #pragma pop /* 80D15638-80D1563C 000050 0004+00 0/1 0/0 0/0 .rodata @4087 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4087 = 500.0f; -COMPILER_STRIP_GATE(80D15638, &lit_4087); +COMPILER_STRIP_GATE(0x80D15638, &lit_4087); #pragma pop /* 80D1563C-80D15640 000054 0004+00 0/1 0/0 0/0 .rodata @4088 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4088 = 2000.0f; -COMPILER_STRIP_GATE(80D1563C, &lit_4088); +COMPILER_STRIP_GATE(0x80D1563C, &lit_4088); #pragma pop /* 80D15640-80D15644 000058 0004+00 0/1 0/0 0/0 .rodata @4089 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4089 = 2.0f; -COMPILER_STRIP_GATE(80D15640, &lit_4089); +COMPILER_STRIP_GATE(0x80D15640, &lit_4089); #pragma pop /* 80D15644-80D15648 00005C 0004+00 0/1 0/0 0/0 .rodata @4090 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4090 = 10.0f; -COMPILER_STRIP_GATE(80D15644, &lit_4090); +COMPILER_STRIP_GATE(0x80D15644, &lit_4090); #pragma pop /* 80D15918-80D15928 000068 000C+04 0/1 0/0 0/0 .bss @3946 */ @@ -664,7 +664,7 @@ static asm void yuka_ground(obj_toby_class* param_0, yuka_s* param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4117 = 5.0f; -COMPILER_STRIP_GATE(80D15648, &lit_4117); +COMPILER_STRIP_GATE(0x80D15648, &lit_4117); #pragma pop /* 80D1417C-80D14264 000ADC 00E8+00 1/1 0/0 0/0 .text yuka_fly__FP14obj_toby_classP6yuka_s */ @@ -715,42 +715,42 @@ static asm void yuka_control(obj_toby_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4271 = 55.0f; -COMPILER_STRIP_GATE(80D1564C, &lit_4271); +COMPILER_STRIP_GATE(0x80D1564C, &lit_4271); #pragma pop /* 80D15650-80D15654 000068 0004+00 0/1 0/0 0/0 .rodata @4272 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4272 = 800.0f; -COMPILER_STRIP_GATE(80D15650, &lit_4272); +COMPILER_STRIP_GATE(0x80D15650, &lit_4272); #pragma pop /* 80D15654-80D15658 00006C 0004+00 0/1 0/0 0/0 .rodata @4273 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4273 = 200.0f; -COMPILER_STRIP_GATE(80D15654, &lit_4273); +COMPILER_STRIP_GATE(0x80D15654, &lit_4273); #pragma pop /* 80D15658-80D1565C 000070 0004+00 0/1 0/0 0/0 .rodata @4274 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4274 = 600.0f; -COMPILER_STRIP_GATE(80D15658, &lit_4274); +COMPILER_STRIP_GATE(0x80D15658, &lit_4274); #pragma pop /* 80D1565C-80D15660 000074 0004+00 0/2 0/0 0/0 .rodata @4275 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4275 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(80D1565C, &lit_4275); +COMPILER_STRIP_GATE(0x80D1565C, &lit_4275); #pragma pop /* 80D15660-80D15664 000078 0004+00 0/2 0/0 0/0 .rodata @4276 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4276 = 0.5f; -COMPILER_STRIP_GATE(80D15660, &lit_4276); +COMPILER_STRIP_GATE(0x80D15660, &lit_4276); #pragma pop /* 80D14584-80D14810 000EE4 028C+00 1/1 0/0 0/0 .text demo_camera__FP14obj_toby_class */ @@ -783,7 +783,7 @@ static bool daObj_Toby_IsDelete(obj_toby_class* param_0) { SECTION_RODATA static u8 const l_bmdidx_4300[8] = { 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x05, }; -COMPILER_STRIP_GATE(80D15664, &l_bmdidx_4300); +COMPILER_STRIP_GATE(0x80D15664, &l_bmdidx_4300); /* 80D1488C-80D149DC 0011EC 0150+00 1/0 0/0 0/0 .text daObj_Toby_Delete__FP14obj_toby_class */ #pragma push @@ -810,28 +810,28 @@ static asm void useHeapInit(fopAc_ac_c* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4422 = 3.0f / 5.0f; -COMPILER_STRIP_GATE(80D1566C, &lit_4422); +COMPILER_STRIP_GATE(0x80D1566C, &lit_4422); #pragma pop /* 80D15670-80D15674 000088 0004+00 0/1 0/0 0/0 .rodata @4423 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4423 = 8.0f; -COMPILER_STRIP_GATE(80D15670, &lit_4423); +COMPILER_STRIP_GATE(0x80D15670, &lit_4423); #pragma pop /* 80D15674-80D15678 00008C 0004+00 0/1 0/0 0/0 .rodata @4424 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4424 = 2.5f; -COMPILER_STRIP_GATE(80D15674, &lit_4424); +COMPILER_STRIP_GATE(0x80D15674, &lit_4424); #pragma pop /* 80D15678-80D1567C 000090 0004+00 0/1 0/0 0/0 .rodata @4425 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4425 = 4.0f; -COMPILER_STRIP_GATE(80D15678, &lit_4425); +COMPILER_STRIP_GATE(0x80D15678, &lit_4425); #pragma pop /* 80D14BD4-80D14CFC 001534 0128+00 1/1 0/0 0/0 .text set_pos_check__FP14obj_toby_classi @@ -852,70 +852,70 @@ static asm void set_pos_check(obj_toby_class* param_0, int param_1) { SECTION_RODATA static u8 const l_bmdidx_4530[8] = { 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x05, }; -COMPILER_STRIP_GATE(80D1567C, &l_bmdidx_4530); +COMPILER_STRIP_GATE(0x80D1567C, &l_bmdidx_4530); #pragma pop /* 80D15684-80D15688 00009C 0004+00 0/1 0/0 0/0 .rodata @4751 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4751 = 15.0f; -COMPILER_STRIP_GATE(80D15684, &lit_4751); +COMPILER_STRIP_GATE(0x80D15684, &lit_4751); #pragma pop /* 80D15688-80D1568C 0000A0 0004+00 0/1 0/0 0/0 .rodata @4752 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4752 = 150.0f; -COMPILER_STRIP_GATE(80D15688, &lit_4752); +COMPILER_STRIP_GATE(0x80D15688, &lit_4752); #pragma pop /* 80D1568C-80D15690 0000A4 0004+00 0/1 0/0 0/0 .rodata @4753 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4753 = 1.5f; -COMPILER_STRIP_GATE(80D1568C, &lit_4753); +COMPILER_STRIP_GATE(0x80D1568C, &lit_4753); #pragma pop /* 80D15690-80D15694 0000A8 0004+00 0/1 0/0 0/0 .rodata @4754 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4754 = 75.0f; -COMPILER_STRIP_GATE(80D15690, &lit_4754); +COMPILER_STRIP_GATE(0x80D15690, &lit_4754); #pragma pop /* 80D15694-80D15698 0000AC 0004+00 0/1 0/0 0/0 .rodata @4755 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4755 = 32.5f; -COMPILER_STRIP_GATE(80D15694, &lit_4755); +COMPILER_STRIP_GATE(0x80D15694, &lit_4755); #pragma pop /* 80D15698-80D1569C 0000B0 0004+00 0/1 0/0 0/0 .rodata @4756 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4756 = 155.0f; -COMPILER_STRIP_GATE(80D15698, &lit_4756); +COMPILER_STRIP_GATE(0x80D15698, &lit_4756); #pragma pop /* 80D1569C-80D156A0 0000B4 0004+00 0/1 0/0 0/0 .rodata @4757 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4757 = 250.0f; -COMPILER_STRIP_GATE(80D1569C, &lit_4757); +COMPILER_STRIP_GATE(0x80D1569C, &lit_4757); #pragma pop /* 80D156A0-80D156A4 0000B8 0004+00 0/1 0/0 0/0 .rodata @4758 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4758 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(80D156A0, &lit_4758); +COMPILER_STRIP_GATE(0x80D156A0, &lit_4758); #pragma pop /* 80D156A4-80D156A8 0000BC 0004+00 0/1 0/0 0/0 .rodata @4759 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4759 = 3.0f / 20.0f; -COMPILER_STRIP_GATE(80D156A4, &lit_4759); +COMPILER_STRIP_GATE(0x80D156A4, &lit_4759); #pragma pop /* 80D156A8-80D156B0 0000C0 0008+00 0/1 0/0 0/0 .rodata @4761 */ @@ -924,7 +924,7 @@ COMPILER_STRIP_GATE(80D156A4, &lit_4759); SECTION_RODATA static u8 const lit_4761[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D156A8, &lit_4761); +COMPILER_STRIP_GATE(0x80D156A8, &lit_4761); #pragma pop /* 80D156B0-80D156B8 0000C8 0008+00 0/1 0/0 0/0 .rodata @4764 */ @@ -933,7 +933,15 @@ COMPILER_STRIP_GATE(80D156A8, &lit_4761); SECTION_RODATA static u8 const lit_4764[8] = { 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D156B0, &lit_4764); +COMPILER_STRIP_GATE(0x80D156B0, &lit_4764); +#pragma pop + +/* 80D156B8-80D156B8 0000D0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80D156B8 = "D_MN07"; +SECTION_DEAD static char const* const stringBase_80D156BF = "Obj_Tob7"; +SECTION_DEAD static char const* const stringBase_80D156C8 = "Obj_Toby"; #pragma pop /* 80D14CFC-80D154F4 00165C 07F8+00 1/0 0/0 0/0 .text daObj_Toby_Create__FP10fopAc_ac_c @@ -984,7 +992,7 @@ asm void __sinit_d_a_obj_toby_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80D1557C = (void*)__sinit_d_a_obj_toby_cpp; +REGISTER_CTORS(0x80D1557C, __sinit_d_a_obj_toby_cpp); #pragma pop /* 80D155B8-80D155D4 001F18 001C+00 1/1 0/0 0/0 .text getLeftHandPos__9daPy_py_cCFv */ @@ -1169,11 +1177,4 @@ static u8 data_80D159AC[4]; static u8 data_80D159B0[4]; #pragma pop -/* 80D156B8-80D156D1 0000D0 0019+00 1/1 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80D156B8 = "D_MN07"; -SECTION_DEAD static char const* const stringBase_80D156BF = "Obj_Tob7"; -SECTION_DEAD static char const* const stringBase_80D156C8 = "Obj_Toby"; -#pragma pop +/* 80D156B8-80D156B8 0000D0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_tobyhouse/d_a_obj_tobyhouse.cpp b/rel/d/a/obj/d_a_obj_tobyhouse/d_a_obj_tobyhouse.cpp index df1394d0d80..c9af63808c9 100644 --- a/rel/d/a/obj/d_a_obj_tobyhouse/d_a_obj_tobyhouse.cpp +++ b/rel/d/a/obj/d_a_obj_tobyhouse/d_a_obj_tobyhouse.cpp @@ -148,10 +148,10 @@ struct Z2SeqMgr { /* 802AFEDC */ void bgmStreamStop(u32); }; -struct Vec {}; - struct JAISoundID {}; +struct Vec {}; + struct Z2SeMgr { /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); }; @@ -216,7 +216,7 @@ extern "C" static void daObjTobyHouse_create1st__FP16daObjTobyHouse_c(); extern "C" static void daObjTobyHouse_MoveBGDelete__FP16daObjTobyHouse_c(); extern "C" static void daObjTobyHouse_MoveBGExecute__FP16daObjTobyHouse_c(); extern "C" static void daObjTobyHouse_MoveBGDraw__FP16daObjTobyHouse_c(); -extern "C" void func_80D176E4(u8*); +extern "C" void func_80D176E4(void* _this, u8*); extern "C" void __dt__4cXyzFv(); extern "C" extern char const* const d_a_obj_tobyhouse__stringBase0; @@ -327,13 +327,13 @@ extern "C" void __register_global_object(); SECTION_RODATA static u8 const l_bmd[8] = { 0x00, 0x00, 0x00, 0x0B, 0x00, 0x00, 0x00, 0x05, }; -COMPILER_STRIP_GATE(80D1774C, &l_bmd); +COMPILER_STRIP_GATE(0x80D1774C, &l_bmd); /* 80D17754-80D1775C 000008 0008+00 1/1 0/0 0/0 .rodata l_dzb */ SECTION_RODATA static u8 const l_dzb[8] = { 0x00, 0x00, 0x00, 0x0F, 0x00, 0x00, 0x00, 0x08, }; -COMPILER_STRIP_GATE(80D17754, &l_dzb); +COMPILER_STRIP_GATE(0x80D17754, &l_dzb); /* 80D1775C-80D17764 000010 0008+00 0/1 0/0 0/0 .rodata l_LodBmd */ #pragma push @@ -341,7 +341,7 @@ COMPILER_STRIP_GATE(80D17754, &l_dzb); SECTION_RODATA static u8 const l_LodBmd[8] = { 0x00, 0x00, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x04, }; -COMPILER_STRIP_GATE(80D1775C, &l_LodBmd); +COMPILER_STRIP_GATE(0x80D1775C, &l_LodBmd); #pragma pop /* 80D17764-80D17770 000018 000C+00 0/1 0/0 0/0 .rodata l_bck */ @@ -350,7 +350,7 @@ COMPILER_STRIP_GATE(80D1775C, &l_LodBmd); SECTION_RODATA static u8 const l_bck[12] = { 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x08, }; -COMPILER_STRIP_GATE(80D17764, &l_bck); +COMPILER_STRIP_GATE(0x80D17764, &l_bck); #pragma pop /* 80D17770-80D17774 000024 0004+00 1/4 0/0 0/0 .rodata @4046 */ @@ -360,7 +360,7 @@ SECTION_RODATA static u8 const lit_4046[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D17770, &lit_4046); +COMPILER_STRIP_GATE(0x80D17770, &lit_4046); /* 80D17774-80D1777C 000028 0008+00 0/2 0/0 0/0 .rodata @4047 */ #pragma push @@ -368,7 +368,7 @@ COMPILER_STRIP_GATE(80D17770, &lit_4046); SECTION_RODATA static u8 const lit_4047[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D17774, &lit_4047); +COMPILER_STRIP_GATE(0x80D17774, &lit_4047); #pragma pop /* 80D1777C-80D17784 000030 0008+00 0/2 0/0 0/0 .rodata @4048 */ @@ -377,7 +377,7 @@ COMPILER_STRIP_GATE(80D17774, &lit_4047); SECTION_RODATA static u8 const lit_4048[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D1777C, &lit_4048); +COMPILER_STRIP_GATE(0x80D1777C, &lit_4048); #pragma pop /* 80D17784-80D1778C 000038 0008+00 0/2 0/0 0/0 .rodata @4049 */ @@ -386,14 +386,14 @@ COMPILER_STRIP_GATE(80D1777C, &lit_4048); SECTION_RODATA static u8 const lit_4049[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D17784, &lit_4049); +COMPILER_STRIP_GATE(0x80D17784, &lit_4049); #pragma pop /* 80D1778C-80D17790 000040 0004+00 0/1 0/0 0/0 .rodata @4050 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4050 = 1000.0f; -COMPILER_STRIP_GATE(80D1778C, &lit_4050); +COMPILER_STRIP_GATE(0x80D1778C, &lit_4050); #pragma pop /* 80D15AAC-80D15DA8 0000EC 02FC+00 1/1 0/0 0/0 .text s_b_sub__FPvPv */ @@ -450,11 +450,23 @@ asm void daObjTobyHouse_c::setBaseMtx() { /* ############################################################################################## */ /* 80D17790-80D17794 000044 0004+00 1/1 0/0 0/0 .rodata @4193 */ SECTION_RODATA static f32 const lit_4193 = 10.0f; -COMPILER_STRIP_GATE(80D17790, &lit_4193); +COMPILER_STRIP_GATE(0x80D17790, &lit_4193); /* 80D17794-80D17798 000048 0004+00 1/1 0/0 0/0 .rodata @4194 */ SECTION_RODATA static f32 const lit_4194 = 200.0f; -COMPILER_STRIP_GATE(80D17794, &lit_4194); +COMPILER_STRIP_GATE(0x80D17794, &lit_4194); + +/* 80D177C0-80D177C0 000074 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80D177C0 = "M_THouse"; +SECTION_DEAD static char const* const stringBase_80D177C9 = "U_THouse"; +SECTION_DEAD static char const* const stringBase_80D177D2 = "thouse"; +SECTION_DEAD static char const* const stringBase_80D177D9 = "TOBY_HOUSE_FIRE_TO_RAKKA"; +SECTION_DEAD static char const* const stringBase_80D177F2 = "TOBY_HOUSE_FIRE_TO_DESERT"; +SECTION_DEAD static char const* const stringBase_80D1780C = "Birl_P"; +SECTION_DEAD static char const* const stringBase_80D17813 = "Birl_Cannon"; +#pragma pop /* 80D17858-80D17864 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { @@ -504,7 +516,19 @@ asm void daObjTobyHouse_c::Create() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4251 = 1.0f; -COMPILER_STRIP_GATE(80D17798, &lit_4251); +COMPILER_STRIP_GATE(0x80D17798, &lit_4251); +#pragma pop + +/* 80D177C0-80D177C0 000074 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80D1781F = "WAIT"; +SECTION_DEAD static char const* const stringBase_80D17824 = "CLOSE"; +SECTION_DEAD static char const* const stringBase_80D1782A = "CHANGE"; +SECTION_DEAD static char const* const stringBase_80D17831 = "HLIGHT"; +SECTION_DEAD static char const* const stringBase_80D17838 = "ROTATE"; +SECTION_DEAD static char const* const stringBase_80D1783F = "SCENE_CHG"; +SECTION_DEAD static char const* const stringBase_80D17849 = "EFF_LINE"; #pragma pop /* 80D1788C-80D17898 -00001 000C+00 0/1 0/0 0/0 .data @4292 */ @@ -649,7 +673,7 @@ asm void daObjTobyHouse_c::create1st() { /* ############################################################################################## */ /* 80D1779C-80D177A0 000050 0004+00 1/1 0/0 0/0 .rodata @4287 */ SECTION_RODATA static f32 const lit_4287 = 20.0f; -COMPILER_STRIP_GATE(80D1779C, &lit_4287); +COMPILER_STRIP_GATE(0x80D1779C, &lit_4287); /* 80D164C0-80D16560 000B00 00A0+00 1/0 0/0 0/0 .text Execute__16daObjTobyHouse_cFPPA3_A4_f */ #pragma push @@ -805,28 +829,34 @@ void daObjTobyHouse_c::actionDead() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4769 = 8.0f; -COMPILER_STRIP_GATE(80D177A0, &lit_4769); +COMPILER_STRIP_GATE(0x80D177A0, &lit_4769); #pragma pop /* 80D177A4-80D177A8 000058 0004+00 0/1 0/0 0/0 .rodata @4770 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4770 = -600.0f; -COMPILER_STRIP_GATE(80D177A4, &lit_4770); +COMPILER_STRIP_GATE(0x80D177A4, &lit_4770); #pragma pop /* 80D177A8-80D177AC 00005C 0004+00 0/1 0/0 0/0 .rodata @4771 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4771 = 70.0f; -COMPILER_STRIP_GATE(80D177A8, &lit_4771); +COMPILER_STRIP_GATE(0x80D177A8, &lit_4771); #pragma pop /* 80D177AC-80D177B0 000060 0004+00 0/1 0/0 0/0 .rodata @4772 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4772 = 380.0f; -COMPILER_STRIP_GATE(80D177AC, &lit_4772); +COMPILER_STRIP_GATE(0x80D177AC, &lit_4772); +#pragma pop + +/* 80D177C0-80D177C0 000074 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80D17852 = "Timer"; #pragma pop /* 80D17A00-80D17A10 000048 000C+04 0/1 0/0 0/0 .bss @4351 */ @@ -877,7 +907,7 @@ asm void daObjTobyHouse_c::Draw() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4773 = -1.0f; -COMPILER_STRIP_GATE(80D177B0, &lit_4773); +COMPILER_STRIP_GATE(0x80D177B0, &lit_4773); #pragma pop /* 80D177B4-80D177BC 000068 0008+00 0/0 0/0 0/0 .rodata @4776 */ @@ -886,14 +916,14 @@ COMPILER_STRIP_GATE(80D177B0, &lit_4773); SECTION_RODATA static u8 const lit_4776[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D177B4, &lit_4776); +COMPILER_STRIP_GATE(0x80D177B4, &lit_4776); #pragma pop /* 80D177BC-80D177C0 000070 0004+00 0/1 0/0 0/0 .rodata @4905 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4905 = 20000.0f; -COMPILER_STRIP_GATE(80D177BC, &lit_4905); +COMPILER_STRIP_GATE(0x80D177BC, &lit_4905); #pragma pop /* 80D17374-80D174F8 0019B4 0184+00 1/1 0/0 0/0 .text checkLODModel__16daObjTobyHouse_cFv @@ -980,7 +1010,7 @@ static asm void daObjTobyHouse_MoveBGDraw(daObjTobyHouse_c* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80D176E4(u8* param_0) { +extern "C" asm void func_80D176E4(void* _this, u8* param_0) { nofralloc #include "asm/rel/d/a/obj/d_a_obj_tobyhouse/d_a_obj_tobyhouse/func_80D176E4.s" } @@ -1168,23 +1198,4 @@ static u8 data_80D17A78[4]; static u8 data_80D17A7C[4]; #pragma pop -/* 80D177C0-80D17858 000074 0098+00 6/2 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80D177C0 = "M_THouse"; -SECTION_DEAD static char const* const stringBase_80D177C9 = "U_THouse"; -SECTION_DEAD static char const* const stringBase_80D177D2 = "thouse"; -SECTION_DEAD static char const* const stringBase_80D177D9 = "TOBY_HOUSE_FIRE_TO_RAKKA"; -SECTION_DEAD static char const* const stringBase_80D177F2 = "TOBY_HOUSE_FIRE_TO_DESERT"; -SECTION_DEAD static char const* const stringBase_80D1780C = "Birl_P"; -SECTION_DEAD static char const* const stringBase_80D17813 = "Birl_Cannon"; -SECTION_DEAD static char const* const stringBase_80D1781F = "WAIT"; -SECTION_DEAD static char const* const stringBase_80D17824 = "CLOSE"; -SECTION_DEAD static char const* const stringBase_80D1782A = "CHANGE"; -SECTION_DEAD static char const* const stringBase_80D17831 = "HLIGHT"; -SECTION_DEAD static char const* const stringBase_80D17838 = "ROTATE"; -SECTION_DEAD static char const* const stringBase_80D1783F = "SCENE_CHG"; -SECTION_DEAD static char const* const stringBase_80D17849 = "EFF_LINE"; -SECTION_DEAD static char const* const stringBase_80D17852 = "Timer"; -#pragma pop +/* 80D177C0-80D177C0 000074 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_togeTrap/d_a_obj_togeTrap.cpp b/rel/d/a/obj/d_a_obj_togeTrap/d_a_obj_togeTrap.cpp index f6ed7320db5..f7fb973832c 100644 --- a/rel/d/a/obj/d_a_obj_togeTrap/d_a_obj_togeTrap.cpp +++ b/rel/d/a/obj/d_a_obj_togeTrap/d_a_obj_togeTrap.cpp @@ -94,10 +94,10 @@ struct dRes_control_c { struct dPa_levelEcallBack {}; -struct _GXColor {}; - struct csXyz {}; +struct _GXColor {}; + struct dPa_control_c { /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, @@ -311,34 +311,34 @@ SECTION_RODATA static u8 const lit_3655[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D18E98, &lit_3655); +COMPILER_STRIP_GATE(0x80D18E98, &lit_3655); /* 80D18E9C-80D18EA0 000004 0004+00 0/1 0/0 0/0 .rodata @3656 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3656 = 250.0f; -COMPILER_STRIP_GATE(80D18E9C, &lit_3656); +COMPILER_STRIP_GATE(0x80D18E9C, &lit_3656); #pragma pop /* 80D18EA0-80D18EA4 000008 0004+00 0/1 0/0 0/0 .rodata @3657 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3657 = 10.0f; -COMPILER_STRIP_GATE(80D18EA0, &lit_3657); +COMPILER_STRIP_GATE(0x80D18EA0, &lit_3657); #pragma pop /* 80D18EA4-80D18EA8 00000C 0004+00 0/1 0/0 0/0 .rodata @3658 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3658 = 20.0f; -COMPILER_STRIP_GATE(80D18EA4, &lit_3658); +COMPILER_STRIP_GATE(0x80D18EA4, &lit_3658); #pragma pop /* 80D18EA8-80D18EAC 000010 0004+00 0/2 0/0 0/0 .rodata @3659 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3659 = 500.0f; -COMPILER_STRIP_GATE(80D18EA8, &lit_3659); +COMPILER_STRIP_GATE(0x80D18EA8, &lit_3659); #pragma pop /* 80D18F10-80D18F1C 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ @@ -543,6 +543,13 @@ asm void daTogeTrap_c::setBaseMtx() { } #pragma pop +/* ############################################################################################## */ +/* 80D18F08-80D18F08 000070 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80D18F08 = "P_Toge"; +#pragma pop + /* 80D17D5C-80D17E14 0002DC 00B8+00 1/0 0/0 0/0 .text CreateHeap__12daTogeTrap_cFv */ #pragma push #pragma optimization_level 0 @@ -560,11 +567,11 @@ SECTION_RODATA u8 const daTogeTrap_c::mCcDObjInfo[48] = { 0x00, 0x48, 0x00, 0x28, 0x00, 0x00, 0x00, 0x11, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D18EAC, &daTogeTrap_c::mCcDObjInfo); +COMPILER_STRIP_GATE(0x80D18EAC, &daTogeTrap_c::mCcDObjInfo); /* 80D18EDC-80D18EE0 000044 0004+00 1/2 0/0 0/0 .rodata @3780 */ SECTION_RODATA static f32 const lit_3780 = 300.0f; -COMPILER_STRIP_GATE(80D18EDC, &lit_3780); +COMPILER_STRIP_GATE(0x80D18EDC, &lit_3780); /* 80D17E14-80D18008 000394 01F4+00 1/1 0/0 0/0 .text create__12daTogeTrap_cFv */ #pragma push @@ -653,28 +660,28 @@ asm void daTogeTrap_c::Execute(f32 (**param_0)[3][4]) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3940 = 60.0f; -COMPILER_STRIP_GATE(80D18EE0, &lit_3940); +COMPILER_STRIP_GATE(0x80D18EE0, &lit_3940); #pragma pop /* 80D18EE4-80D18EE8 00004C 0004+00 0/1 0/0 0/0 .rodata @3941 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3941 = 290.0f; -COMPILER_STRIP_GATE(80D18EE4, &lit_3941); +COMPILER_STRIP_GATE(0x80D18EE4, &lit_3941); #pragma pop /* 80D18EE8-80D18EEC 000050 0004+00 0/1 0/0 0/0 .rodata @3942 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3942 = 100.0f; -COMPILER_STRIP_GATE(80D18EE8, &lit_3942); +COMPILER_STRIP_GATE(0x80D18EE8, &lit_3942); #pragma pop /* 80D18EEC-80D18EF0 000054 0004+00 0/1 0/0 0/0 .rodata @3943 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3943 = 150.0f; -COMPILER_STRIP_GATE(80D18EEC, &lit_3943); +COMPILER_STRIP_GATE(0x80D18EEC, &lit_3943); #pragma pop /* 80D18EF0-80D18EF8 000058 0008+00 0/1 0/0 0/0 .rodata @3945 */ @@ -683,7 +690,7 @@ COMPILER_STRIP_GATE(80D18EEC, &lit_3943); SECTION_RODATA static u8 const lit_3945[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D18EF0, &lit_3945); +COMPILER_STRIP_GATE(0x80D18EF0, &lit_3945); #pragma pop /* 80D190A8-80D190B4 000008 000C+00 1/1 0/0 0/0 .bss @3647 */ @@ -708,7 +715,7 @@ asm void daTogeTrap_c::moveMain() { /* ############################################################################################## */ /* 80D18EF8-80D18EFC 000060 0004+00 1/1 0/0 0/0 .rodata @3975 */ SECTION_RODATA static f32 const lit_3975 = 225.0f; -COMPILER_STRIP_GATE(80D18EF8, &lit_3975); +COMPILER_STRIP_GATE(0x80D18EF8, &lit_3975); /* 80D185DC-80D186B0 000B5C 00D4+00 2/2 0/0 0/0 .text playerAreaCheck__12daTogeTrap_cFv */ @@ -739,11 +746,11 @@ void daTogeTrap_c::modeWait() { /* ############################################################################################## */ /* 80D18EFC-80D18F00 000064 0004+00 3/5 0/0 0/0 .rodata @4006 */ SECTION_RODATA static f32 const lit_4006 = 1.0f; -COMPILER_STRIP_GATE(80D18EFC, &lit_4006); +COMPILER_STRIP_GATE(0x80D18EFC, &lit_4006); /* 80D18F00-80D18F04 000068 0004+00 2/2 0/0 0/0 .rodata @4007 */ SECTION_RODATA static f32 const lit_4007 = -1.0f; -COMPILER_STRIP_GATE(80D18F00, &lit_4007); +COMPILER_STRIP_GATE(0x80D18F00, &lit_4007); /* 80D186C0-80D18784 000C40 00C4+00 1/1 0/0 0/0 .text init_modeMoveUp__12daTogeTrap_cFv */ @@ -761,7 +768,7 @@ asm void daTogeTrap_c::init_modeMoveUp() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4036 = 30.0f; -COMPILER_STRIP_GATE(80D18F04, &lit_4036); +COMPILER_STRIP_GATE(0x80D18F04, &lit_4036); #pragma pop /* 80D18784-80D188C0 000D04 013C+00 1/0 0/0 0/0 .text modeMoveUp__12daTogeTrap_cFv */ @@ -910,12 +917,7 @@ asm void __sinit_d_a_obj_togeTrap_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80D18E14 = (void*)__sinit_d_a_obj_togeTrap_cpp; +REGISTER_CTORS(0x80D18E14, __sinit_d_a_obj_togeTrap_cpp); #pragma pop -/* 80D18F08-80D18F0F 000070 0007+00 3/3 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80D18F08 = "P_Toge"; -#pragma pop +/* 80D18F08-80D18F08 000070 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_tombo/d_a_obj_tombo.cpp b/rel/d/a/obj/d_a_obj_tombo/d_a_obj_tombo.cpp index d0d74b670db..d5ca997be58 100644 --- a/rel/d/a/obj/d_a_obj_tombo/d_a_obj_tombo.cpp +++ b/rel/d/a/obj/d_a_obj_tombo/d_a_obj_tombo.cpp @@ -49,19 +49,19 @@ struct mDoExt_baseAnm { /* 8000D428 */ void play(); }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; +struct J3DAnmTransform {}; + +struct J3DModelData {}; + struct Z2Creature { /* 802C03C8 */ Z2Creature(); /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -437,11 +437,11 @@ extern "C" void __register_global_object(); /* ############################################################################################## */ /* 80D1B6D8-80D1B6DC 000000 0004+00 14/14 0/0 0/0 .rodata @3775 */ SECTION_RODATA static f32 const lit_3775 = 9.0f / 10.0f; -COMPILER_STRIP_GATE(80D1B6D8, &lit_3775); +COMPILER_STRIP_GATE(0x80D1B6D8, &lit_3775); /* 80D1B6DC-80D1B6E0 000004 0004+00 3/8 0/0 0/0 .rodata @3776 */ SECTION_RODATA static f32 const lit_3776 = 1.0f; -COMPILER_STRIP_GATE(80D1B6DC, &lit_3776); +COMPILER_STRIP_GATE(0x80D1B6DC, &lit_3776); /* 80D1B7F8-80D1B818 -00001 0020+00 1/0 0/0 0/0 .data l_daObjTOMBO_Method */ SECTION_DATA static void* l_daObjTOMBO_Method[8] = { @@ -553,7 +553,7 @@ SECTION_RODATA static u16 const l_tom_itemno[1 + 1 /* padding */] = { /* padding */ 0x0000, }; -COMPILER_STRIP_GATE(80D1B6E0, &l_tom_itemno); +COMPILER_STRIP_GATE(0x80D1B6E0, &l_tom_itemno); /* 80D1B6E4-80D1B724 00000C 0040+00 1/1 0/0 0/0 .rodata ccSphSrc$3780 */ SECTION_RODATA static u8 const ccSphSrc[64] = { @@ -562,7 +562,7 @@ SECTION_RODATA static u8 const ccSphSrc[64] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0x20, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D1B6E4, &ccSphSrc); +COMPILER_STRIP_GATE(0x80D1B6E4, &ccSphSrc); /* 80D19200-80D1926C 000120 006C+00 1/1 0/0 0/0 .text InitCcSph__12daObjTOMBO_cFv */ #pragma push @@ -577,7 +577,7 @@ asm void daObjTOMBO_c::InitCcSph() { /* ############################################################################################## */ /* 80D1B724-80D1B728 00004C 0004+00 1/3 0/0 0/0 .rodata @3789 */ SECTION_RODATA static f32 const lit_3789 = 20.0f; -COMPILER_STRIP_GATE(80D1B724, &lit_3789); +COMPILER_STRIP_GATE(0x80D1B724, &lit_3789); /* 80D1926C-80D192C4 00018C 0058+00 1/1 0/0 0/0 .text SetCcSph__12daObjTOMBO_cFv */ #pragma push @@ -599,6 +599,13 @@ static asm void useHeapInit(fopAc_ac_c* param_0) { } #pragma pop +/* ############################################################################################## */ +/* 80D1B7E8-80D1B7E8 000110 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80D1B7E8 = "Tombo"; +#pragma pop + /* 80D192E4-80D195CC 000204 02E8+00 1/1 0/0 0/0 .text CreateHeap__12daObjTOMBO_cFv */ #pragma push #pragma optimization_level 0 @@ -646,14 +653,14 @@ static asm void daObjTOMBO_Delete(daObjTOMBO_c* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3922 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(80D1B728, &lit_3922); +COMPILER_STRIP_GATE(0x80D1B728, &lit_3922); #pragma pop /* 80D1B72C-80D1B730 000054 0004+00 0/7 0/0 0/0 .rodata @3923 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3923 = 10.0f; -COMPILER_STRIP_GATE(80D1B72C, &lit_3923); +COMPILER_STRIP_GATE(0x80D1B72C, &lit_3923); #pragma pop /* 80D19658-80D19744 000578 00EC+00 2/2 0/0 0/0 .text WaitAction__12daObjTOMBO_cFv */ @@ -674,13 +681,13 @@ SECTION_RODATA static u8 const lit_3942[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D1B730, &lit_3942); +COMPILER_STRIP_GATE(0x80D1B730, &lit_3942); /* 80D1B734-80D1B738 00005C 0004+00 0/1 0/0 0/0 .rodata @3943 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3943 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(80D1B734, &lit_3943); +COMPILER_STRIP_GATE(0x80D1B734, &lit_3943); #pragma pop /* 80D19744-80D19834 000664 00F0+00 2/2 0/0 0/0 .text SpeedSet__12daObjTOMBO_cFv */ @@ -698,21 +705,21 @@ asm void daObjTOMBO_c::SpeedSet() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3971 = 100.0f; -COMPILER_STRIP_GATE(80D1B738, &lit_3971); +COMPILER_STRIP_GATE(0x80D1B738, &lit_3971); #pragma pop /* 80D1B73C-80D1B740 000064 0004+00 0/2 0/0 0/0 .rodata @3972 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3972 = -1000000000.0f; -COMPILER_STRIP_GATE(80D1B73C, &lit_3972); +COMPILER_STRIP_GATE(0x80D1B73C, &lit_3972); #pragma pop /* 80D1B740-80D1B744 000068 0004+00 0/3 0/0 0/0 .rodata @3973 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3973 = 50.0f; -COMPILER_STRIP_GATE(80D1B740, &lit_3973); +COMPILER_STRIP_GATE(0x80D1B740, &lit_3973); #pragma pop /* 80D19834-80D1997C 000754 0148+00 1/1 0/0 0/0 .text CheckWater__12daObjTOMBO_cFv */ @@ -740,21 +747,21 @@ asm dBgS_ObjGndChk::~dBgS_ObjGndChk() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4003 = 3.0f; -COMPILER_STRIP_GATE(80D1B744, &lit_4003); +COMPILER_STRIP_GATE(0x80D1B744, &lit_4003); #pragma pop /* 80D1B748-80D1B74C 000070 0004+00 0/1 0/0 0/0 .rodata @4004 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4004 = 300.0f; -COMPILER_STRIP_GATE(80D1B748, &lit_4004); +COMPILER_STRIP_GATE(0x80D1B748, &lit_4004); #pragma pop /* 80D1B74C-80D1B750 000074 0004+00 0/1 0/0 0/0 .rodata @4005 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4005 = -3.0f; -COMPILER_STRIP_GATE(80D1B74C, &lit_4005); +COMPILER_STRIP_GATE(0x80D1B74C, &lit_4005); #pragma pop /* 80D199F4-80D19B48 000914 0154+00 1/1 0/0 0/0 .text CheckGround__12daObjTOMBO_cFv */ @@ -776,7 +783,7 @@ SECTION_RODATA static f32 const lit_4022[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80D1B750, &lit_4022); +COMPILER_STRIP_GATE(0x80D1B750, &lit_4022); #pragma pop /* 80D19B48-80D19C34 000A68 00EC+00 1/1 0/0 0/0 .text CheckWall__12daObjTOMBO_cFv */ @@ -796,7 +803,7 @@ asm void daObjTOMBO_c::CheckWall() { SECTION_RODATA static u8 const lit_4079[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D1B758, &lit_4079); +COMPILER_STRIP_GATE(0x80D1B758, &lit_4079); #pragma pop /* 80D1B760-80D1B768 000088 0008+00 0/2 0/0 0/0 .rodata @4080 */ @@ -805,7 +812,7 @@ COMPILER_STRIP_GATE(80D1B758, &lit_4079); SECTION_RODATA static u8 const lit_4080[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D1B760, &lit_4080); +COMPILER_STRIP_GATE(0x80D1B760, &lit_4080); #pragma pop /* 80D1B768-80D1B770 000090 0008+00 0/2 0/0 0/0 .rodata @4081 */ @@ -814,35 +821,35 @@ COMPILER_STRIP_GATE(80D1B760, &lit_4080); SECTION_RODATA static u8 const lit_4081[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D1B768, &lit_4081); +COMPILER_STRIP_GATE(0x80D1B768, &lit_4081); #pragma pop /* 80D1B770-80D1B774 000098 0004+00 0/1 0/0 0/0 .rodata @4082 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4082 = 400.0f; -COMPILER_STRIP_GATE(80D1B770, &lit_4082); +COMPILER_STRIP_GATE(0x80D1B770, &lit_4082); #pragma pop /* 80D1B774-80D1B778 00009C 0004+00 0/1 0/0 0/0 .rodata @4083 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4083 = 150.0f; -COMPILER_STRIP_GATE(80D1B774, &lit_4083); +COMPILER_STRIP_GATE(0x80D1B774, &lit_4083); #pragma pop /* 80D1B778-80D1B77C 0000A0 0004+00 0/3 0/0 0/0 .rodata @4084 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4084 = 30.0f; -COMPILER_STRIP_GATE(80D1B778, &lit_4084); +COMPILER_STRIP_GATE(0x80D1B778, &lit_4084); #pragma pop /* 80D1B77C-80D1B780 0000A4 0004+00 0/2 0/0 0/0 .rodata @4085 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4085 = 70.0f; -COMPILER_STRIP_GATE(80D1B77C, &lit_4085); +COMPILER_STRIP_GATE(0x80D1B77C, &lit_4085); #pragma pop /* 80D19C34-80D19E48 000B54 0214+00 1/1 0/0 0/0 .text SearchLink__12daObjTOMBO_cFv */ @@ -860,21 +867,21 @@ asm void daObjTOMBO_c::SearchLink() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4149 = 1.0f / 20.0f; -COMPILER_STRIP_GATE(80D1B780, &lit_4149); +COMPILER_STRIP_GATE(0x80D1B780, &lit_4149); #pragma pop /* 80D1B784-80D1B788 0000AC 0004+00 0/3 0/0 0/0 .rodata @4150 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4150 = 5.0f; -COMPILER_STRIP_GATE(80D1B784, &lit_4150); +COMPILER_STRIP_GATE(0x80D1B784, &lit_4150); #pragma pop /* 80D1B788-80D1B78C 0000B0 0004+00 0/1 0/0 0/0 .rodata @4151 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4151 = 2.0f; -COMPILER_STRIP_GATE(80D1B788, &lit_4151); +COMPILER_STRIP_GATE(0x80D1B788, &lit_4151); #pragma pop /* 80D19E48-80D1A138 000D68 02F0+00 2/2 0/0 0/0 .text LinkAction__12daObjTOMBO_cFv */ @@ -892,14 +899,14 @@ asm void daObjTOMBO_c::LinkAction() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4175 = 4.0f; -COMPILER_STRIP_GATE(80D1B78C, &lit_4175); +COMPILER_STRIP_GATE(0x80D1B78C, &lit_4175); #pragma pop /* 80D1B790-80D1B794 0000B8 0004+00 0/1 0/0 0/0 .rodata @4176 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4176 = 1000.0f; -COMPILER_STRIP_GATE(80D1B790, &lit_4176); +COMPILER_STRIP_GATE(0x80D1B790, &lit_4176); #pragma pop /* 80D1A138-80D1A280 001058 0148+00 2/2 0/0 0/0 .text MoveAction__12daObjTOMBO_cFv */ @@ -915,13 +922,13 @@ asm void daObjTOMBO_c::MoveAction() { /* ############################################################################################## */ /* 80D1B794-80D1B798 0000BC 0004+00 2/2 0/0 0/0 .rodata @4210 */ SECTION_RODATA static u32 const lit_4210 = 0xBA83126F; -COMPILER_STRIP_GATE(80D1B794, &lit_4210); +COMPILER_STRIP_GATE(0x80D1B794, &lit_4210); /* 80D1B798-80D1B7A0 0000C0 0008+00 2/2 0/0 0/0 .rodata @4212 */ SECTION_RODATA static u8 const lit_4212[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D1B798, &lit_4212); +COMPILER_STRIP_GATE(0x80D1B798, &lit_4212); /* 80D1A280-80D1A3EC 0011A0 016C+00 1/1 0/0 0/0 .text Action__12daObjTOMBO_cFv */ #pragma push @@ -958,49 +965,49 @@ asm void daObjTOMBO_c::Insect_Release() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4311 = 3.5f; -COMPILER_STRIP_GATE(80D1B7A0, &lit_4311); +COMPILER_STRIP_GATE(0x80D1B7A0, &lit_4311); #pragma pop /* 80D1B7A4-80D1B7A8 0000CC 0004+00 0/0 0/0 0/0 .rodata @4312 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4312 = 12000.0f; -COMPILER_STRIP_GATE(80D1B7A4, &lit_4312); +COMPILER_STRIP_GATE(0x80D1B7A4, &lit_4312); #pragma pop /* 80D1B7A8-80D1B7AC 0000D0 0004+00 0/0 0/0 0/0 .rodata @4313 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4313 = 4096.0f; -COMPILER_STRIP_GATE(80D1B7A8, &lit_4313); +COMPILER_STRIP_GATE(0x80D1B7A8, &lit_4313); #pragma pop /* 80D1B7AC-80D1B7B0 0000D4 0004+00 0/1 0/0 0/0 .rodata @4314 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4314 = 0.5f; -COMPILER_STRIP_GATE(80D1B7AC, &lit_4314); +COMPILER_STRIP_GATE(0x80D1B7AC, &lit_4314); #pragma pop /* 80D1B7B0-80D1B7B4 0000D8 0004+00 0/0 0/0 0/0 .rodata @4315 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4315 = 7.0f / 10.0f; -COMPILER_STRIP_GATE(80D1B7B0, &lit_4315); +COMPILER_STRIP_GATE(0x80D1B7B0, &lit_4315); #pragma pop /* 80D1B7B4-80D1B7B8 0000DC 0004+00 0/0 0/0 0/0 .rodata @4316 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4316 = 0.25f; -COMPILER_STRIP_GATE(80D1B7B4, &lit_4316); +COMPILER_STRIP_GATE(0x80D1B7B4, &lit_4316); #pragma pop /* 80D1B7B8-80D1B7C0 0000E0 0008+00 1/2 0/0 0/0 .rodata @4347 */ SECTION_RODATA static u8 const lit_4347[8] = { 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D1B7B8, &lit_4347); +COMPILER_STRIP_GATE(0x80D1B7B8, &lit_4347); /* 80D1A524-80D1A648 001444 0124+00 1/1 0/0 0/0 .text ParticleSet__12daObjTOMBO_cFv */ #pragma push @@ -1017,7 +1024,7 @@ asm void daObjTOMBO_c::ParticleSet() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4420 = -1.0f; -COMPILER_STRIP_GATE(80D1B7C0, &lit_4420); +COMPILER_STRIP_GATE(0x80D1B7C0, &lit_4420); #pragma pop /* 80D1A648-80D1A8BC 001568 0274+00 1/1 0/0 0/0 .text BoomChk__12daObjTOMBO_cFv */ @@ -1045,7 +1052,7 @@ asm cM3dGPla::~cM3dGPla() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4454 = 10000.0f; -COMPILER_STRIP_GATE(80D1B7C4, &lit_4454); +COMPILER_STRIP_GATE(0x80D1B7C4, &lit_4454); #pragma pop /* 80D1B8F0-80D1B8F4 000008 0004+00 2/2 0/0 0/0 .bss None */ @@ -1072,7 +1079,7 @@ asm void daObjTOMBO_c::Execute() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4485 = 8.0f; -COMPILER_STRIP_GATE(80D1B7C8, &lit_4485); +COMPILER_STRIP_GATE(0x80D1B7C8, &lit_4485); #pragma pop /* 80D1AB20-80D1AC84 001A40 0164+00 1/1 0/0 0/0 .text ObjHit__12daObjTOMBO_cFv */ @@ -1090,21 +1097,21 @@ asm void daObjTOMBO_c::ObjHit() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4523 = 608.0f; -COMPILER_STRIP_GATE(80D1B7CC, &lit_4523); +COMPILER_STRIP_GATE(0x80D1B7CC, &lit_4523); #pragma pop /* 80D1B7D0-80D1B7D4 0000F8 0004+00 0/1 0/0 0/0 .rodata @4524 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4524 = 448.0f; -COMPILER_STRIP_GATE(80D1B7D0, &lit_4524); +COMPILER_STRIP_GATE(0x80D1B7D0, &lit_4524); #pragma pop /* 80D1B7D4-80D1B7D8 0000FC 0004+00 0/1 0/0 0/0 .rodata @4525 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4525 = 16777215.0f; -COMPILER_STRIP_GATE(80D1B7D4, &lit_4525); +COMPILER_STRIP_GATE(0x80D1B7D4, &lit_4525); #pragma pop /* 80D1AC84-80D1AE00 001BA4 017C+00 1/1 0/0 0/0 .text Z_BufferChk__12daObjTOMBO_cFv */ @@ -1140,11 +1147,11 @@ asm void daObjTOMBO_c::setBaseMtx() { /* ############################################################################################## */ /* 80D1B7D8-80D1B7DC 000100 0004+00 1/1 0/0 0/0 .rodata @4590 */ SECTION_RODATA static f32 const lit_4590 = 15.0f; -COMPILER_STRIP_GATE(80D1B7D8, &lit_4590); +COMPILER_STRIP_GATE(0x80D1B7D8, &lit_4590); /* 80D1B7DC-80D1B7E0 000104 0004+00 1/1 0/0 0/0 .rodata @4591 */ SECTION_RODATA static f32 const lit_4591 = -3.0f / 5.0f; -COMPILER_STRIP_GATE(80D1B7DC, &lit_4591); +COMPILER_STRIP_GATE(0x80D1B7DC, &lit_4591); /* 80D1AEC8-80D1AFA8 001DE8 00E0+00 1/0 0/0 0/0 .text daObjTOMBO_Draw__FP12daObjTOMBO_c */ @@ -1170,7 +1177,13 @@ static asm void daObjTOMBO_Execute(daObjTOMBO_c* param_0) { /* ############################################################################################## */ /* 80D1B7E0-80D1B7E4 000108 0004+00 1/2 0/0 0/0 .rodata l_musiya_num */ SECTION_RODATA static u32 const l_musiya_num = 0x01A301A4; -COMPILER_STRIP_GATE(80D1B7E0, &l_musiya_num); +COMPILER_STRIP_GATE(0x80D1B7E0, &l_musiya_num); + +/* 80D1B7E8-80D1B7E8 000110 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80D1B7EE = "R_SP160"; +#pragma pop /* 80D1AFC8-80D1B174 001EE8 01AC+00 1/1 0/0 0/0 .text CreateChk__12daObjTOMBO_cFv */ #pragma push @@ -1187,7 +1200,7 @@ asm void daObjTOMBO_c::CreateChk() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4744 = -50.0f; -COMPILER_STRIP_GATE(80D1B7E4, &lit_4744); +COMPILER_STRIP_GATE(0x80D1B7E4, &lit_4744); #pragma pop /* 80D1B174-80D1B510 002094 039C+00 1/1 0/0 0/0 .text create__12daObjTOMBO_cFv */ @@ -1257,7 +1270,7 @@ asm void __sinit_d_a_obj_tombo_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80D1B660 = (void*)__sinit_d_a_obj_tombo_cpp; +REGISTER_CTORS(0x80D1B660, __sinit_d_a_obj_tombo_cpp); #pragma pop /* 80D1B69C-80D1B6A4 0025BC 0008+00 1/0 0/0 0/0 .text @20@__dt__14dBgS_ObjGndChkFv */ @@ -1310,10 +1323,4 @@ static asm void func_80D1B6BC() { } #pragma pop -/* 80D1B7E8-80D1B7F6 000110 000E+00 6/6 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80D1B7E8 = "Tombo"; -SECTION_DEAD static char const* const stringBase_80D1B7EE = "R_SP160"; -#pragma pop +/* 80D1B7E8-80D1B7E8 000110 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_tornado/d_a_obj_tornado.cpp b/rel/d/a/obj/d_a_obj_tornado/d_a_obj_tornado.cpp index 6b0a4a5d129..09cb84128ea 100644 --- a/rel/d/a/obj/d_a_obj_tornado/d_a_obj_tornado.cpp +++ b/rel/d/a/obj/d_a_obj_tornado/d_a_obj_tornado.cpp @@ -84,10 +84,10 @@ struct cCcS { /* 80264BA8 */ void Set(cCcD_Obj*); }; -struct Vec {}; - struct JAISoundID {}; +struct Vec {}; + struct Z2SeMgr { /* 802AC50C */ void seStartLevel(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); }; @@ -178,27 +178,27 @@ SECTION_RODATA static u8 const lit_3628[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D1C354, &lit_3628); +COMPILER_STRIP_GATE(0x80D1C354, &lit_3628); /* 80D1C358-80D1C35C 000004 0004+00 0/2 0/0 0/0 .rodata @3629 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3629 = 1.0f; -COMPILER_STRIP_GATE(80D1C358, &lit_3629); +COMPILER_STRIP_GATE(0x80D1C358, &lit_3629); #pragma pop /* 80D1C35C-80D1C360 000008 0004+00 0/2 0/0 0/0 .rodata @3630 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3630 = 300.0f; -COMPILER_STRIP_GATE(80D1C35C, &lit_3630); +COMPILER_STRIP_GATE(0x80D1C35C, &lit_3630); #pragma pop /* 80D1C360-80D1C364 00000C 0004+00 0/2 0/0 0/0 .rodata @3631 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3631 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(80D1C360, &lit_3631); +COMPILER_STRIP_GATE(0x80D1C360, &lit_3631); #pragma pop /* 80D1B998-80D1BA0C 000078 0074+00 2/2 0/0 0/0 .text setPntWind__11daObjTrnd_cFv */ @@ -226,14 +226,14 @@ asm void daObjTrnd_c::cutPntWind() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3679 = 2.0f; -COMPILER_STRIP_GATE(80D1C364, &lit_3679); +COMPILER_STRIP_GATE(0x80D1C364, &lit_3679); #pragma pop /* 80D1C368-80D1C36C 000014 0004+00 0/2 0/0 0/0 .rodata @3680 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3680 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(80D1C368, &lit_3680); +COMPILER_STRIP_GATE(0x80D1C368, &lit_3680); #pragma pop /* 80D1C36C-80D1C374 000018 0004+04 0/2 0/0 0/0 .rodata @3681 */ @@ -244,7 +244,7 @@ SECTION_RODATA static f32 const lit_3681[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80D1C36C, &lit_3681); +COMPILER_STRIP_GATE(0x80D1C36C, &lit_3681); #pragma pop /* 80D1C374-80D1C37C 000020 0008+00 0/1 0/0 0/0 .rodata @3682 */ @@ -253,7 +253,7 @@ COMPILER_STRIP_GATE(80D1C36C, &lit_3681); SECTION_RODATA static u8 const lit_3682[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D1C374, &lit_3682); +COMPILER_STRIP_GATE(0x80D1C374, &lit_3682); #pragma pop /* 80D1C37C-80D1C384 000028 0008+00 0/1 0/0 0/0 .rodata @3683 */ @@ -262,7 +262,7 @@ COMPILER_STRIP_GATE(80D1C374, &lit_3682); SECTION_RODATA static u8 const lit_3683[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D1C37C, &lit_3683); +COMPILER_STRIP_GATE(0x80D1C37C, &lit_3683); #pragma pop /* 80D1C384-80D1C38C 000030 0008+00 0/1 0/0 0/0 .rodata @3684 */ @@ -271,7 +271,7 @@ COMPILER_STRIP_GATE(80D1C37C, &lit_3683); SECTION_RODATA static u8 const lit_3684[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D1C384, &lit_3684); +COMPILER_STRIP_GATE(0x80D1C384, &lit_3684); #pragma pop /* 80D1BA30-80D1BC40 000110 0210+00 1/1 0/0 0/0 .text movePntWind__11daObjTrnd_cFv */ @@ -289,35 +289,35 @@ asm void daObjTrnd_c::movePntWind() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3724 = 1.0f / 20.0f; -COMPILER_STRIP_GATE(80D1C38C, &lit_3724); +COMPILER_STRIP_GATE(0x80D1C38C, &lit_3724); #pragma pop /* 80D1C390-80D1C394 00003C 0004+00 0/3 0/0 0/0 .rodata @3725 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3725 = 3000.0f; -COMPILER_STRIP_GATE(80D1C390, &lit_3725); +COMPILER_STRIP_GATE(0x80D1C390, &lit_3725); #pragma pop /* 80D1C394-80D1C398 000040 0004+00 0/1 0/0 0/0 .rodata @3726 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3726 = 30.0f; -COMPILER_STRIP_GATE(80D1C394, &lit_3726); +COMPILER_STRIP_GATE(0x80D1C394, &lit_3726); #pragma pop /* 80D1C398-80D1C39C 000044 0004+00 0/1 0/0 0/0 .rodata @3727 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3727 = 127.0f; -COMPILER_STRIP_GATE(80D1C398, &lit_3727); +COMPILER_STRIP_GATE(0x80D1C398, &lit_3727); #pragma pop /* 80D1C39C-80D1C3A0 000048 0004+00 0/1 0/0 0/0 .rodata @3728 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3728 = -1.0f; -COMPILER_STRIP_GATE(80D1C39C, &lit_3728); +COMPILER_STRIP_GATE(0x80D1C39C, &lit_3728); #pragma pop /* 80D1BC40-80D1BE04 000320 01C4+00 1/1 0/0 0/0 .text setCpsInfo__11daObjTrnd_cFv */ @@ -355,7 +355,7 @@ asm void daObjTrnd_c::setBaseMtx() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3762 = -300.0f; -COMPILER_STRIP_GATE(80D1C3A0, &lit_3762); +COMPILER_STRIP_GATE(0x80D1C3A0, &lit_3762); #pragma pop /* 80D1C3B4-80D1C400 000000 004C+00 1/1 0/0 0/0 .data l_cps_src */ @@ -432,21 +432,21 @@ asm cM3dGAab::~cM3dGAab() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3908 = 3.0f / 10.0f; -COMPILER_STRIP_GATE(80D1C3A4, &lit_3908); +COMPILER_STRIP_GATE(0x80D1C3A4, &lit_3908); #pragma pop /* 80D1C3A8-80D1C3AC 000054 0004+00 0/1 0/0 0/0 .rodata @3909 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_3909 = 0x3A83126F; -COMPILER_STRIP_GATE(80D1C3A8, &lit_3909); +COMPILER_STRIP_GATE(0x80D1C3A8, &lit_3909); #pragma pop /* 80D1C3AC-80D1C3B0 000058 0004+00 0/1 0/0 0/0 .rodata @3910 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3910 = 9.0f / 10.0f; -COMPILER_STRIP_GATE(80D1C3AC, &lit_3910); +COMPILER_STRIP_GATE(0x80D1C3AC, &lit_3910); #pragma pop /* 80D1C0F0-80D1C290 0007D0 01A0+00 1/1 0/0 0/0 .text execute__11daObjTrnd_cFv */ @@ -517,9 +517,11 @@ static asm void daObjTrnd_Create(daObjTrnd_c* param_0) { } #pragma pop -/* 80D1C3B0-80D1C3B1 00005C 0001+00 0/0 0/0 0/0 .rodata @stringBase0 */ +/* ############################################################################################## */ +/* 80D1C3B0-80D1C3B1 00005C 0001+00 0/0 0/0 0/0 .rodata None */ #pragma push #pragma force_active on -#pragma section ".dead" SECTION_DEAD static char const* const stringBase_80D1C3B0 = ""; #pragma pop + +/* 80D1C3B0-80D1C3B0 00005C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_tornado2/d_a_obj_tornado2.cpp b/rel/d/a/obj/d_a_obj_tornado2/d_a_obj_tornado2.cpp index 702c82ab020..e98217a9ef4 100644 --- a/rel/d/a/obj/d_a_obj_tornado2/d_a_obj_tornado2.cpp +++ b/rel/d/a/obj/d_a_obj_tornado2/d_a_obj_tornado2.cpp @@ -126,7 +126,7 @@ extern "C" static void daObjTrnd2_Draw__FP12daObjTrnd2_c(); extern "C" static void daObjTrnd2_Execute__FP12daObjTrnd2_c(); extern "C" static void daObjTrnd2_Delete__FP12daObjTrnd2_c(); extern "C" static void daObjTrnd2_Create__FP12daObjTrnd2_c(); -extern "C" void func_80D1D3B0(s32*); +extern "C" void func_80D1D3B0(void* _this, s32*); // // External References: @@ -197,7 +197,7 @@ SECTION_RODATA static u8 const l_R02_eff_id[6 + 2 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D1D3D4, &l_R02_eff_id); +COMPILER_STRIP_GATE(0x80D1D3D4, &l_R02_eff_id); /* 80D1D3DC-80D1D3E4 000008 0006+02 0/1 0/0 0/0 .rodata l_R04_eff_id */ #pragma push @@ -213,7 +213,7 @@ SECTION_RODATA static u8 const l_R04_eff_id[6 + 2 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D1D3DC, &l_R04_eff_id); +COMPILER_STRIP_GATE(0x80D1D3DC, &l_R04_eff_id); #pragma pop /* 80D1D3E4-80D1D3EC 000010 0006+02 0/1 0/0 0/0 .rodata l_R05_eff_id */ @@ -230,7 +230,7 @@ SECTION_RODATA static u8 const l_R05_eff_id[6 + 2 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D1D3E4, &l_R05_eff_id); +COMPILER_STRIP_GATE(0x80D1D3E4, &l_R05_eff_id); #pragma pop /* 80D1D3EC-80D1D3F4 000018 0006+02 0/1 0/0 0/0 .rodata l_R07_eff_id */ @@ -247,7 +247,7 @@ SECTION_RODATA static u8 const l_R07_eff_id[6 + 2 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D1D3EC, &l_R07_eff_id); +COMPILER_STRIP_GATE(0x80D1D3EC, &l_R07_eff_id); #pragma pop /* 80D1D3F4-80D1D3FC 000020 0006+02 0/1 0/0 0/0 .rodata l_R14_eff_id */ @@ -264,7 +264,7 @@ SECTION_RODATA static u8 const l_R14_eff_id[6 + 2 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D1D3F4, &l_R14_eff_id); +COMPILER_STRIP_GATE(0x80D1D3F4, &l_R14_eff_id); #pragma pop /* 80D1D3FC-80D1D404 000028 0006+02 0/1 0/0 0/0 .rodata l_R51_eff_id */ @@ -281,7 +281,7 @@ SECTION_RODATA static u8 const l_R51_eff_id[6 + 2 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D1D3FC, &l_R51_eff_id); +COMPILER_STRIP_GATE(0x80D1D3FC, &l_R51_eff_id); #pragma pop /* 80D1D404-80D1D408 000030 0004+00 0/5 0/0 0/0 .rodata @3631 */ @@ -293,21 +293,21 @@ SECTION_RODATA static u8 const lit_3631[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D1D404, &lit_3631); +COMPILER_STRIP_GATE(0x80D1D404, &lit_3631); #pragma pop /* 80D1D408-80D1D40C 000034 0004+00 0/3 0/0 0/0 .rodata @3632 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3632 = 1.0f; -COMPILER_STRIP_GATE(80D1D408, &lit_3632); +COMPILER_STRIP_GATE(0x80D1D408, &lit_3632); #pragma pop /* 80D1D40C-80D1D410 000038 0004+00 0/2 0/0 0/0 .rodata @3633 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3633 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(80D1D40C, &lit_3633); +COMPILER_STRIP_GATE(0x80D1D40C, &lit_3633); #pragma pop /* 80D1C4D8-80D1C54C 000078 0074+00 1/1 0/0 0/0 .text setPntWind__12daObjTrnd2_cFv */ @@ -335,21 +335,21 @@ asm void daObjTrnd2_c::cutPntWind() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3681 = 2.0f; -COMPILER_STRIP_GATE(80D1D410, &lit_3681); +COMPILER_STRIP_GATE(0x80D1D410, &lit_3681); #pragma pop /* 80D1D414-80D1D418 000040 0004+00 0/2 0/0 0/0 .rodata @3682 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3682 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(80D1D414, &lit_3682); +COMPILER_STRIP_GATE(0x80D1D414, &lit_3682); #pragma pop /* 80D1D418-80D1D41C 000044 0004+00 0/3 0/0 0/0 .rodata @3683 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3683 = 0.5f; -COMPILER_STRIP_GATE(80D1D418, &lit_3683); +COMPILER_STRIP_GATE(0x80D1D418, &lit_3683); #pragma pop /* 80D1D41C-80D1D424 000048 0008+00 0/1 0/0 0/0 .rodata @3684 */ @@ -358,7 +358,7 @@ COMPILER_STRIP_GATE(80D1D418, &lit_3683); SECTION_RODATA static u8 const lit_3684[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D1D41C, &lit_3684); +COMPILER_STRIP_GATE(0x80D1D41C, &lit_3684); #pragma pop /* 80D1D424-80D1D42C 000050 0008+00 0/1 0/0 0/0 .rodata @3685 */ @@ -367,7 +367,7 @@ COMPILER_STRIP_GATE(80D1D41C, &lit_3684); SECTION_RODATA static u8 const lit_3685[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D1D424, &lit_3685); +COMPILER_STRIP_GATE(0x80D1D424, &lit_3685); #pragma pop /* 80D1D42C-80D1D434 000058 0008+00 0/1 0/0 0/0 .rodata @3686 */ @@ -376,7 +376,7 @@ COMPILER_STRIP_GATE(80D1D424, &lit_3685); SECTION_RODATA static u8 const lit_3686[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D1D42C, &lit_3686); +COMPILER_STRIP_GATE(0x80D1D42C, &lit_3686); #pragma pop /* 80D1C570-80D1C780 000110 0210+00 1/1 0/0 0/0 .text movePntWind__12daObjTrnd2_cFv */ @@ -394,14 +394,14 @@ asm void daObjTrnd2_c::movePntWind() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3730 = 1.0f / 20.0f; -COMPILER_STRIP_GATE(80D1D434, &lit_3730); +COMPILER_STRIP_GATE(0x80D1D434, &lit_3730); #pragma pop /* 80D1D438-80D1D43C 000064 0004+00 0/2 0/0 0/0 .rodata @3731 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3731 = 10.0f; -COMPILER_STRIP_GATE(80D1D438, &lit_3731); +COMPILER_STRIP_GATE(0x80D1D438, &lit_3731); #pragma pop /* 80D1D43C-80D1D444 000068 0008+00 0/1 0/0 0/0 .rodata @3733 */ @@ -410,7 +410,7 @@ COMPILER_STRIP_GATE(80D1D438, &lit_3731); SECTION_RODATA static u8 const lit_3733[8] = { 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D1D43C, &lit_3733); +COMPILER_STRIP_GATE(0x80D1D43C, &lit_3733); #pragma pop /* 80D1C780-80D1C924 000320 01A4+00 1/1 0/0 0/0 .text setCpsInfo__12daObjTrnd2_cFv */ @@ -448,14 +448,14 @@ asm void daObjTrnd2_c::setBaseMtx() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3819 = 150.0f; -COMPILER_STRIP_GATE(80D1D444, &lit_3819); +COMPILER_STRIP_GATE(0x80D1D444, &lit_3819); #pragma pop /* 80D1D448-80D1D44C 000074 0004+00 0/1 0/0 0/0 .rodata @3820 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3820 = 1000.0f; -COMPILER_STRIP_GATE(80D1D448, &lit_3820); +COMPILER_STRIP_GATE(0x80D1D448, &lit_3820); #pragma pop /* 80D1D458-80D1D4A4 000000 004C+00 1/1 0/0 0/0 .data l_cps_src */ @@ -532,21 +532,21 @@ asm cM3dGAab::~cM3dGAab() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4012 = 3.0f / 10.0f; -COMPILER_STRIP_GATE(80D1D44C, &lit_4012); +COMPILER_STRIP_GATE(0x80D1D44C, &lit_4012); #pragma pop /* 80D1D450-80D1D454 00007C 0004+00 0/1 0/0 0/0 .rodata @4013 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4013 = 0x3A83126F; -COMPILER_STRIP_GATE(80D1D450, &lit_4013); +COMPILER_STRIP_GATE(0x80D1D450, &lit_4013); #pragma pop /* 80D1D454-80D1D458 000080 0004+00 0/1 0/0 0/0 .rodata @4014 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4014 = 9.0f / 10.0f; -COMPILER_STRIP_GATE(80D1D454, &lit_4014); +COMPILER_STRIP_GATE(0x80D1D454, &lit_4014); #pragma pop /* 80D1CDC0-80D1D0AC 000960 02EC+00 1/1 0/0 0/0 .text execute__12daObjTrnd2_cFv */ @@ -661,7 +661,7 @@ static asm void daObjTrnd2_Create(daObjTrnd2_c* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80D1D3B0(s32* param_0) { +extern "C" asm void func_80D1D3B0(void* _this, s32* param_0) { nofralloc #include "asm/rel/d/a/obj/d_a_obj_tornado2/d_a_obj_tornado2/func_80D1D3B0.s" } diff --git a/rel/d/a/obj/d_a_obj_tp/d_a_obj_tp.cpp b/rel/d/a/obj/d_a_obj_tp/d_a_obj_tp.cpp index 920173ca475..2e63e6921cc 100644 --- a/rel/d/a/obj/d_a_obj_tp/d_a_obj_tp.cpp +++ b/rel/d/a/obj/d_a_obj_tp/d_a_obj_tp.cpp @@ -48,12 +48,12 @@ struct mDoExt_McaMorfCallBack1_c {}; struct Vec {}; +struct J3DAnmTransform {}; + struct J3DModelData { /* 8032600C */ void simpleCalcMaterial(u16, f32 (*)[4]); }; -struct J3DAnmTransform {}; - struct mDoExt_McaMorf { /* 8000FC4C */ mDoExt_McaMorf(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, int, @@ -95,12 +95,12 @@ struct dRes_control_c { struct dPa_levelEcallBack {}; -struct _GXColor {}; - struct csXyz { /* 802673F4 */ csXyz(s16, s16, s16); }; +struct _GXColor {}; + struct dPa_control_c { /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, @@ -313,13 +313,13 @@ extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; /* ############################################################################################## */ /* 80D1EE2C-80D1EE30 000000 0004+00 4/4 0/0 0/0 .rodata @3879 */ SECTION_RODATA static f32 const lit_3879 = 1.0f; -COMPILER_STRIP_GATE(80D1EE2C, &lit_3879); +COMPILER_STRIP_GATE(0x80D1EE2C, &lit_3879); /* 80D1EE30-80D1EE34 000004 0004+00 0/1 0/0 0/0 .rodata @3880 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3880 = -1.0f / 100.0f; -COMPILER_STRIP_GATE(80D1EE30, &lit_3880); +COMPILER_STRIP_GATE(0x80D1EE30, &lit_3880); #pragma pop /* 80D1EE34-80D1EE38 000008 0004+00 1/3 0/0 0/0 .rodata @3881 */ @@ -329,7 +329,7 @@ SECTION_RODATA static u8 const lit_3881[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D1EE34, &lit_3881); +COMPILER_STRIP_GATE(0x80D1EE34, &lit_3881); /* 80D1D578-80D1D764 000078 01EC+00 1/0 0/0 0/0 .text daObj_Tp_Draw__FP12obj_tp_class */ #pragma push @@ -344,7 +344,13 @@ static asm void daObj_Tp_Draw(obj_tp_class* param_0) { /* ############################################################################################## */ /* 80D1EE38-80D1EE3C 00000C 0004+00 1/1 0/0 0/0 .rodata @3898 */ SECTION_RODATA static f32 const lit_3898 = -1.0f; -COMPILER_STRIP_GATE(80D1EE38, &lit_3898); +COMPILER_STRIP_GATE(0x80D1EE38, &lit_3898); + +/* 80D1EE98-80D1EE98 00006C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80D1EE98 = "Obj_tp"; +#pragma pop /* 80D1D764-80D1D850 000264 00EC+00 1/1 0/0 0/0 .text anm_init__FP12obj_tp_classifUcf */ #pragma push @@ -557,42 +563,42 @@ asm J3DFrameCtrl::~J3DFrameCtrl() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4247 = 10.0f; -COMPILER_STRIP_GATE(80D1EE3C, &lit_4247); +COMPILER_STRIP_GATE(0x80D1EE3C, &lit_4247); #pragma pop /* 80D1EE40-80D1EE44 000014 0004+00 0/0 0/0 0/0 .rodata @4248 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4248 = 9.0f; -COMPILER_STRIP_GATE(80D1EE40, &lit_4248); +COMPILER_STRIP_GATE(0x80D1EE40, &lit_4248); #pragma pop /* 80D1EE44-80D1EE48 000018 0004+00 0/0 0/0 0/0 .rodata @4249 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4249 = 17.0f; -COMPILER_STRIP_GATE(80D1EE44, &lit_4249); +COMPILER_STRIP_GATE(0x80D1EE44, &lit_4249); #pragma pop /* 80D1EE48-80D1EE4C 00001C 0004+00 0/0 0/0 0/0 .rodata @4250 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4250 = 38.0f; -COMPILER_STRIP_GATE(80D1EE48, &lit_4250); +COMPILER_STRIP_GATE(0x80D1EE48, &lit_4250); #pragma pop /* 80D1EE4C-80D1EE50 000020 0004+00 0/0 0/0 0/0 .rodata @4251 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4251 = 36.0f; -COMPILER_STRIP_GATE(80D1EE4C, &lit_4251); +COMPILER_STRIP_GATE(0x80D1EE4C, &lit_4251); #pragma pop /* 80D1EE50-80D1EE54 000024 0004+00 0/0 0/0 0/0 .rodata @4252 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4252 = -2.0f; -COMPILER_STRIP_GATE(80D1EE50, &lit_4252); +COMPILER_STRIP_GATE(0x80D1EE50, &lit_4252); #pragma pop /* 80D1EE54-80D1EE5C 000028 0008+00 0/0 0/0 0/0 .rodata @4253 */ @@ -601,7 +607,7 @@ COMPILER_STRIP_GATE(80D1EE50, &lit_4252); SECTION_RODATA static u8 const lit_4253[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D1EE54, &lit_4253); +COMPILER_STRIP_GATE(0x80D1EE54, &lit_4253); #pragma pop /* 80D1EE5C-80D1EE64 000030 0008+00 0/0 0/0 0/0 .rodata @4254 */ @@ -610,7 +616,7 @@ COMPILER_STRIP_GATE(80D1EE54, &lit_4253); SECTION_RODATA static u8 const lit_4254[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D1EE5C, &lit_4254); +COMPILER_STRIP_GATE(0x80D1EE5C, &lit_4254); #pragma pop /* 80D1EE64-80D1EE6C 000038 0008+00 0/0 0/0 0/0 .rodata @4255 */ @@ -619,84 +625,84 @@ COMPILER_STRIP_GATE(80D1EE5C, &lit_4254); SECTION_RODATA static u8 const lit_4255[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D1EE64, &lit_4255); +COMPILER_STRIP_GATE(0x80D1EE64, &lit_4255); #pragma pop /* 80D1EE6C-80D1EE70 000040 0004+00 0/0 0/0 0/0 .rodata @4256 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4256 = 1.0f / 100.0f; -COMPILER_STRIP_GATE(80D1EE6C, &lit_4256); +COMPILER_STRIP_GATE(0x80D1EE6C, &lit_4256); #pragma pop /* 80D1EE70-80D1EE74 000044 0004+00 0/0 0/0 0/0 .rodata @4257 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4257 = 50.0f; -COMPILER_STRIP_GATE(80D1EE70, &lit_4257); +COMPILER_STRIP_GATE(0x80D1EE70, &lit_4257); #pragma pop /* 80D1EE74-80D1EE78 000048 0004+00 0/0 0/0 0/0 .rodata @4258 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4258 = 150.0f; -COMPILER_STRIP_GATE(80D1EE74, &lit_4258); +COMPILER_STRIP_GATE(0x80D1EE74, &lit_4258); #pragma pop /* 80D1EE78-80D1EE7C 00004C 0004+00 0/1 0/0 0/0 .rodata @4259 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4259 = 300.0f; -COMPILER_STRIP_GATE(80D1EE78, &lit_4259); +COMPILER_STRIP_GATE(0x80D1EE78, &lit_4259); #pragma pop /* 80D1EE7C-80D1EE80 000050 0004+00 0/0 0/0 0/0 .rodata @4260 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4260 = 19.0f; -COMPILER_STRIP_GATE(80D1EE7C, &lit_4260); +COMPILER_STRIP_GATE(0x80D1EE7C, &lit_4260); #pragma pop /* 80D1EE80-80D1EE84 000054 0004+00 0/0 0/0 0/0 .rodata @4261 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4261 = 3000.0f; -COMPILER_STRIP_GATE(80D1EE80, &lit_4261); +COMPILER_STRIP_GATE(0x80D1EE80, &lit_4261); #pragma pop /* 80D1EE84-80D1EE88 000058 0004+00 0/0 0/0 0/0 .rodata @4262 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4262 = 5000.0f; -COMPILER_STRIP_GATE(80D1EE84, &lit_4262); +COMPILER_STRIP_GATE(0x80D1EE84, &lit_4262); #pragma pop /* 80D1EE88-80D1EE8C 00005C 0004+00 0/1 0/0 0/0 .rodata @4580 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4580 = -300.0f; -COMPILER_STRIP_GATE(80D1EE88, &lit_4580); +COMPILER_STRIP_GATE(0x80D1EE88, &lit_4580); #pragma pop /* 80D1EE8C-80D1EE90 000060 0004+00 0/1 0/0 0/0 .rodata @4581 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4581 = -20000.0f; -COMPILER_STRIP_GATE(80D1EE8C, &lit_4581); +COMPILER_STRIP_GATE(0x80D1EE8C, &lit_4581); #pragma pop /* 80D1EE90-80D1EE94 000064 0004+00 0/1 0/0 0/0 .rodata @4582 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4582 = 20000.0f; -COMPILER_STRIP_GATE(80D1EE90, &lit_4582); +COMPILER_STRIP_GATE(0x80D1EE90, &lit_4582); #pragma pop /* 80D1EE94-80D1EE98 000068 0004+00 0/1 0/0 0/0 .rodata @4583 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4583 = 65536.0f; -COMPILER_STRIP_GATE(80D1EE94, &lit_4583); +COMPILER_STRIP_GATE(0x80D1EE94, &lit_4583); #pragma pop /* 80D1E950-80D1ECF0 001450 03A0+00 1/0 0/0 0/0 .text daObj_Tp_Create__FP10fopAc_ac_c */ @@ -749,9 +755,4 @@ asm cCcD_GStts::~cCcD_GStts() { } #pragma pop -/* 80D1EE98-80D1EE9F 00006C 0007+00 4/4 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80D1EE98 = "Obj_tp"; -#pragma pop +/* 80D1EE98-80D1EE98 00006C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_treesh/d_a_obj_treesh.cpp b/rel/d/a/obj/d_a_obj_treesh/d_a_obj_treesh.cpp index 7108eabbb62..66b6518f242 100644 --- a/rel/d/a/obj/d_a_obj_treesh/d_a_obj_treesh.cpp +++ b/rel/d/a/obj/d_a_obj_treesh/d_a_obj_treesh.cpp @@ -164,6 +164,12 @@ extern "C" void __register_global_object(); // /* ############################################################################################## */ +/* 80D1F8E8-80D1F8E8 000020 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80D1F8E8 = "M_TreeSh"; +#pragma pop + /* 80D1F8F4-80D1F8F8 -00001 0004+00 4/4 0/0 0/0 .data l_arcName */ SECTION_DATA static void* l_arcName = (void*)&d_a_obj_treesh__stringBase0; @@ -310,27 +316,27 @@ asm void daTreeSh_c::create1st() { /* ############################################################################################## */ /* 80D1F8C8-80D1F8CC 000000 0004+00 1/1 0/0 0/0 .rodata @3767 */ SECTION_RODATA static f32 const lit_3767 = 15.0f; -COMPILER_STRIP_GATE(80D1F8C8, &lit_3767); +COMPILER_STRIP_GATE(0x80D1F8C8, &lit_3767); /* 80D1F8CC-80D1F8D0 000004 0004+00 0/1 0/0 0/0 .rodata @3768 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3768 = 30.0f; -COMPILER_STRIP_GATE(80D1F8CC, &lit_3768); +COMPILER_STRIP_GATE(0x80D1F8CC, &lit_3768); #pragma pop /* 80D1F8D0-80D1F8D4 000008 0004+00 0/1 0/0 0/0 .rodata @3769 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3769 = 1.0f; -COMPILER_STRIP_GATE(80D1F8D0, &lit_3769); +COMPILER_STRIP_GATE(0x80D1F8D0, &lit_3769); #pragma pop /* 80D1F8D4-80D1F8D8 00000C 0004+00 0/1 0/0 0/0 .rodata @3770 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3770 = 3.0f / 10.0f; -COMPILER_STRIP_GATE(80D1F8D4, &lit_3770); +COMPILER_STRIP_GATE(0x80D1F8D4, &lit_3770); #pragma pop /* 80D1F8D8-80D1F8E0 000010 0004+04 0/1 0/0 0/0 .rodata @3771 */ @@ -341,7 +347,7 @@ SECTION_RODATA static f32 const lit_3771[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80D1F8D8, &lit_3771); +COMPILER_STRIP_GATE(0x80D1F8D8, &lit_3771); #pragma pop /* 80D1F8E0-80D1F8E8 000018 0008+00 0/1 0/0 0/0 .rodata @3774 */ @@ -350,7 +356,7 @@ COMPILER_STRIP_GATE(80D1F8D8, &lit_3771); SECTION_RODATA static u8 const lit_3774[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D1F8E0, &lit_3774); +COMPILER_STRIP_GATE(0x80D1F8E0, &lit_3774); #pragma pop /* 80D1F990-80D1F99C 000008 000C+00 1/1 0/0 0/0 .bss @3618 */ @@ -458,12 +464,7 @@ asm void __sinit_d_a_obj_treesh_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80D1F878 = (void*)__sinit_d_a_obj_treesh_cpp; +REGISTER_CTORS(0x80D1F878, __sinit_d_a_obj_treesh_cpp); #pragma pop -/* 80D1F8E8-80D1F8F1 000020 0009+00 1/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80D1F8E8 = "M_TreeSh"; -#pragma pop +/* 80D1F8E8-80D1F8E8 000020 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_twGate/d_a_obj_twGate.cpp b/rel/d/a/obj/d_a_obj_twGate/d_a_obj_twGate.cpp index e89d4e7ec7d..e7f31069254 100644 --- a/rel/d/a/obj/d_a_obj_twGate/d_a_obj_twGate.cpp +++ b/rel/d/a/obj/d_a_obj_twGate/d_a_obj_twGate.cpp @@ -194,7 +194,22 @@ extern "C" void __register_global_object(); /* ############################################################################################## */ /* 80D20308-80D2030C 000000 0004+00 4/4 0/0 0/0 .rodata @3638 */ SECTION_RODATA static f32 const lit_3638 = 1900.0f; -COMPILER_STRIP_GATE(80D20308, &lit_3638); +COMPILER_STRIP_GATE(0x80D20308, &lit_3638); + +/* 80D20554-80D20554 00024C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80D20554 = "twGtFiro"; +SECTION_DEAD static char const* const stringBase_80D2055D = "twGtK0102"; +SECTION_DEAD static char const* const stringBase_80D20567 = "twGtK0709"; +SECTION_DEAD static char const* const stringBase_80D20571 = ""; +SECTION_DEAD static char const* const stringBase_80D20572 = "twGnFiro"; +SECTION_DEAD static char const* const stringBase_80D2057B = "twGnK0102"; +SECTION_DEAD static char const* const stringBase_80D20585 = "twGnK0709"; +SECTION_DEAD static char const* const stringBase_80D2058F = "twGnK079b"; +SECTION_DEAD static char const* const stringBase_80D20599 = "twGnK1415"; +SECTION_DEAD static char const* const stringBase_80D205A3 = "twGnK0616"; +#pragma pop /* 80D205B0-80D205E4 -00001 0034+00 3/3 0/0 0/0 .data l_resNameIdx */ SECTION_DATA static void* l_resNameIdx[13] = { @@ -334,7 +349,7 @@ SECTION_RODATA static u8 const l_bmdIdx[52] = { 0x00, 0x06, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x06, 0xFF, 0xFF, 0xFF, 0xFF, }; -COMPILER_STRIP_GATE(80D2030C, &l_bmdIdx); +COMPILER_STRIP_GATE(0x80D2030C, &l_bmdIdx); #pragma pop /* 80D20340-80D20374 000038 0034+00 0/1 0/0 0/0 .rodata l_dzbIdx */ @@ -346,7 +361,7 @@ SECTION_RODATA static u8 const l_dzbIdx[52] = { 0x00, 0x0F, 0x00, 0x00, 0x00, 0x0F, 0x00, 0x00, 0x00, 0x0F, 0x00, 0x00, 0x00, 0x0F, 0x00, 0x00, 0x00, 0x0F, 0x00, 0x00, 0x00, 0x0F, 0xFF, 0xFF, 0xFF, 0xFF, }; -COMPILER_STRIP_GATE(80D20340, &l_dzbIdx); +COMPILER_STRIP_GATE(0x80D20340, &l_dzbIdx); #pragma pop /* 80D20374-80D203A8 00006C 0034+00 0/1 0/0 0/0 .rodata l_btkIdx */ @@ -358,7 +373,7 @@ SECTION_RODATA static u8 const l_btkIdx[52] = { 0x00, 0x0C, 0x00, 0x00, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x0C, 0xFF, 0xFF, 0xFF, 0xFF, }; -COMPILER_STRIP_GATE(80D20374, &l_btkIdx); +COMPILER_STRIP_GATE(0x80D20374, &l_btkIdx); #pragma pop /* 80D203A8-80D203DC 0000A0 0034+00 0/1 0/0 0/0 .rodata l_brkIdx */ @@ -370,7 +385,7 @@ SECTION_RODATA static u8 const l_brkIdx[52] = { 0x00, 0x09, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x09, 0xFF, 0xFF, 0xFF, 0xFF, }; -COMPILER_STRIP_GATE(80D203A8, &l_brkIdx); +COMPILER_STRIP_GATE(0x80D203A8, &l_brkIdx); #pragma pop /* 80D203DC-80D20410 0000D4 0034+00 0/2 0/0 0/0 .rodata l_twFlagIdx */ @@ -382,7 +397,7 @@ SECTION_RODATA static u8 const l_twFlagIdx[52] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x04, }; -COMPILER_STRIP_GATE(80D203DC, &l_twFlagIdx); +COMPILER_STRIP_GATE(0x80D203DC, &l_twFlagIdx); #pragma pop /* 80D20410-80D204AC 000108 009C+00 0/1 0/0 0/0 .rodata l_cheeckPos0 */ @@ -400,7 +415,7 @@ SECTION_RODATA static u8 const l_cheeckPos0[156] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D20410, &l_cheeckPos0); +COMPILER_STRIP_GATE(0x80D20410, &l_cheeckPos0); #pragma pop /* 80D204AC-80D20548 0001A4 009C+00 0/1 0/0 0/0 .rodata l_cheeckPos1 */ @@ -418,14 +433,14 @@ SECTION_RODATA static u8 const l_cheeckPos1[156] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D204AC, &l_cheeckPos1); +COMPILER_STRIP_GATE(0x80D204AC, &l_cheeckPos1); #pragma pop /* 80D20548-80D2054C 000240 0004+00 0/2 0/0 0/0 .rodata @3693 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3693 = 1.0f; -COMPILER_STRIP_GATE(80D20548, &lit_3693); +COMPILER_STRIP_GATE(0x80D20548, &lit_3693); #pragma pop /* 80D1FC0C-80D1FD44 00024C 0138+00 1/0 0/0 0/0 .text CreateHeap__10daTwGate_cFv */ @@ -443,7 +458,7 @@ asm void daTwGate_c::CreateHeap() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3769 = -1.0f; -COMPILER_STRIP_GATE(80D2054C, &lit_3769); +COMPILER_STRIP_GATE(0x80D2054C, &lit_3769); #pragma pop /* 80D1FD44-80D1FF14 000384 01D0+00 1/1 0/0 0/0 .text create__10daTwGate_cFv */ @@ -486,7 +501,7 @@ SECTION_RODATA static u8 const lit_3837[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D20550, &lit_3837); +COMPILER_STRIP_GATE(0x80D20550, &lit_3837); #pragma pop /* 80D206A0-80D206AC 000008 000C+00 1/1 0/0 0/0 .bss @3630 */ @@ -587,21 +602,7 @@ asm void __sinit_d_a_obj_twGate_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80D202B8 = (void*)__sinit_d_a_obj_twGate_cpp; +REGISTER_CTORS(0x80D202B8, __sinit_d_a_obj_twGate_cpp); #pragma pop -/* 80D20554-80D205AD 00024C 0059+00 1/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80D20554 = "twGtFiro"; -SECTION_DEAD static char const* const stringBase_80D2055D = "twGtK0102"; -SECTION_DEAD static char const* const stringBase_80D20567 = "twGtK0709"; -SECTION_DEAD static char const* const stringBase_80D20571 = ""; -SECTION_DEAD static char const* const stringBase_80D20572 = "twGnFiro"; -SECTION_DEAD static char const* const stringBase_80D2057B = "twGnK0102"; -SECTION_DEAD static char const* const stringBase_80D20585 = "twGnK0709"; -SECTION_DEAD static char const* const stringBase_80D2058F = "twGnK079b"; -SECTION_DEAD static char const* const stringBase_80D20599 = "twGnK1415"; -SECTION_DEAD static char const* const stringBase_80D205A3 = "twGnK0616"; -#pragma pop +/* 80D20554-80D20554 00024C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_udoor/d_a_obj_udoor.cpp b/rel/d/a/obj/d_a_obj_udoor/d_a_obj_udoor.cpp index 8fc5869ecf1..4056d87fd56 100644 --- a/rel/d/a/obj/d_a_obj_udoor/d_a_obj_udoor.cpp +++ b/rel/d/a/obj/d_a_obj_udoor/d_a_obj_udoor.cpp @@ -95,10 +95,10 @@ struct cBgS { /* 80074250 */ void Release(dBgW_Base*); }; -struct Vec {}; - struct JAISoundID {}; +struct Vec {}; + struct Z2SeMgr { /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); }; @@ -195,55 +195,55 @@ static asm void daObj_Udoor_Draw(obj_udoor_class* param_0) { /* ############################################################################################## */ /* 80D20DE0-80D20DE4 000000 0004+00 2/2 0/0 0/0 .rodata @3707 */ SECTION_RODATA static f32 const lit_3707 = 2000.0f; -COMPILER_STRIP_GATE(80D20DE0, &lit_3707); +COMPILER_STRIP_GATE(0x80D20DE0, &lit_3707); /* 80D20DE4-80D20DE8 000004 0004+00 0/1 0/0 0/0 .rodata @3708 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3708 = 1.0f; -COMPILER_STRIP_GATE(80D20DE4, &lit_3708); +COMPILER_STRIP_GATE(0x80D20DE4, &lit_3708); #pragma pop /* 80D20DE8-80D20DEC 000008 0004+00 0/1 0/0 0/0 .rodata @3709 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3709 = -1.0f; -COMPILER_STRIP_GATE(80D20DE8, &lit_3709); +COMPILER_STRIP_GATE(0x80D20DE8, &lit_3709); #pragma pop /* 80D20DEC-80D20DF0 00000C 0004+00 0/1 0/0 0/0 .rodata @3710 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3710 = -20066.0f; -COMPILER_STRIP_GATE(80D20DEC, &lit_3710); +COMPILER_STRIP_GATE(0x80D20DEC, &lit_3710); #pragma pop /* 80D20DF0-80D20DF4 000010 0004+00 0/1 0/0 0/0 .rodata @3711 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3711 = -20428.0f; -COMPILER_STRIP_GATE(80D20DF0, &lit_3711); +COMPILER_STRIP_GATE(0x80D20DF0, &lit_3711); #pragma pop /* 80D20DF4-80D20DF8 000014 0004+00 0/1 0/0 0/0 .rodata @3712 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3712 = 500.0f; -COMPILER_STRIP_GATE(80D20DF4, &lit_3712); +COMPILER_STRIP_GATE(0x80D20DF4, &lit_3712); #pragma pop /* 80D20DF8-80D20DFC 000018 0004+00 0/1 0/0 0/0 .rodata @3713 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3713 = 1.0f / 20.0f; -COMPILER_STRIP_GATE(80D20DF8, &lit_3713); +COMPILER_STRIP_GATE(0x80D20DF8, &lit_3713); #pragma pop /* 80D20DFC-80D20E00 00001C 0004+00 0/1 0/0 0/0 .rodata @3714 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3714 = 50.0f; -COMPILER_STRIP_GATE(80D20DFC, &lit_3714); +COMPILER_STRIP_GATE(0x80D20DFC, &lit_3714); #pragma pop /* 80D2079C-80D209BC 0000DC 0220+00 2/1 0/0 0/0 .text daObj_Udoor_Execute__FP15obj_udoor_class */ @@ -261,6 +261,13 @@ static bool daObj_Udoor_IsDelete(obj_udoor_class* param_0) { return true; } +/* ############################################################################################## */ +/* 80D20E10-80D20E10 000030 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80D20E10 = "Obj_udoor"; +#pragma pop + /* 80D209C4-80D20A1C 000304 0058+00 1/0 0/0 0/0 .text daObj_Udoor_Delete__FP15obj_udoor_class */ #pragma push #pragma optimization_level 0 @@ -297,28 +304,28 @@ static asm void useHeapInit(fopAc_ac_c* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3828 = -300.0f; -COMPILER_STRIP_GATE(80D20E00, &lit_3828); +COMPILER_STRIP_GATE(0x80D20E00, &lit_3828); #pragma pop /* 80D20E04-80D20E08 000024 0004+00 0/1 0/0 0/0 .rodata @3829 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3829 = -600.0f; -COMPILER_STRIP_GATE(80D20E04, &lit_3829); +COMPILER_STRIP_GATE(0x80D20E04, &lit_3829); #pragma pop /* 80D20E08-80D20E0C 000028 0004+00 0/1 0/0 0/0 .rodata @3830 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3830 = 300.0f; -COMPILER_STRIP_GATE(80D20E08, &lit_3830); +COMPILER_STRIP_GATE(0x80D20E08, &lit_3830); #pragma pop /* 80D20E0C-80D20E10 00002C 0004+00 0/1 0/0 0/0 .rodata @3831 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3831 = 600.0f; -COMPILER_STRIP_GATE(80D20E0C, &lit_3831); +COMPILER_STRIP_GATE(0x80D20E0C, &lit_3831); #pragma pop /* 80D20E2C-80D20E6C 000010 0040+00 1/1 0/0 0/0 .data cc_sph_src$3768 */ @@ -396,9 +403,4 @@ asm cM3dGAab::~cM3dGAab() { } #pragma pop -/* 80D20E10-80D20E1A 000030 000A+00 3/3 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80D20E10 = "Obj_udoor"; -#pragma pop +/* 80D20E10-80D20E10 000030 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_usaku/d_a_obj_usaku.cpp b/rel/d/a/obj/d_a_obj_usaku/d_a_obj_usaku.cpp index b8a89cd91df..7eb8d2972c5 100644 --- a/rel/d/a/obj/d_a_obj_usaku/d_a_obj_usaku.cpp +++ b/rel/d/a/obj/d_a_obj_usaku/d_a_obj_usaku.cpp @@ -142,6 +142,13 @@ static bool daObj_Usaku_IsDelete(obj_usaku_class* param_0) { return true; } +/* ############################################################################################## */ +/* 80D212EC-80D212EC 000010 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80D212EC = "Obj_usaku"; +#pragma pop + /* 80D21050-80D210A8 000170 0058+00 1/0 0/0 0/0 .text daObj_Usaku_Delete__FP15obj_usaku_class */ #pragma push #pragma optimization_level 0 @@ -165,27 +172,27 @@ static asm void useHeapInit(fopAc_ac_c* param_0) { /* ############################################################################################## */ /* 80D212DC-80D212E0 000000 0004+00 1/1 0/0 0/0 .rodata @3744 */ SECTION_RODATA static f32 const lit_3744 = -300.0f; -COMPILER_STRIP_GATE(80D212DC, &lit_3744); +COMPILER_STRIP_GATE(0x80D212DC, &lit_3744); /* 80D212E0-80D212E4 000004 0004+00 0/1 0/0 0/0 .rodata @3745 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3745 = -600.0f; -COMPILER_STRIP_GATE(80D212E0, &lit_3745); +COMPILER_STRIP_GATE(0x80D212E0, &lit_3745); #pragma pop /* 80D212E4-80D212E8 000008 0004+00 0/1 0/0 0/0 .rodata @3746 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3746 = 300.0f; -COMPILER_STRIP_GATE(80D212E4, &lit_3746); +COMPILER_STRIP_GATE(0x80D212E4, &lit_3746); #pragma pop /* 80D212E8-80D212EC 00000C 0004+00 0/1 0/0 0/0 .rodata @3747 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3747 = 600.0f; -COMPILER_STRIP_GATE(80D212E8, &lit_3747); +COMPILER_STRIP_GATE(0x80D212E8, &lit_3747); #pragma pop /* 80D211AC-80D212D4 0002CC 0128+00 1/0 0/0 0/0 .text daObj_Usaku_Create__FP10fopAc_ac_c @@ -222,9 +229,4 @@ SECTION_DATA extern void* g_profile_OBJ_USAKU[12] = { (void*)0x00040100, (void*)0x000E0000, }; -/* 80D212EC-80D212F6 000010 000A+00 3/3 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80D212EC = "Obj_usaku"; -#pragma pop +/* 80D212EC-80D212EC 000010 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_vground/d_a_obj_vground.cpp b/rel/d/a/obj/d_a_obj_vground/d_a_obj_vground.cpp index ae7d36333e6..568d6bd5d92 100644 --- a/rel/d/a/obj/d_a_obj_vground/d_a_obj_vground.cpp +++ b/rel/d/a/obj/d_a_obj_vground/d_a_obj_vground.cpp @@ -157,7 +157,7 @@ static asm void CheckCreateHeap(fopAc_ac_c* param_0) { /* ############################################################################################## */ /* 80D21A08-80D21A0C 000000 0004+00 2/2 0/0 0/0 .rodata @3630 */ SECTION_RODATA static f32 const lit_3630 = 5.0f; -COMPILER_STRIP_GATE(80D21A08, &lit_3630); +COMPILER_STRIP_GATE(0x80D21A08, &lit_3630); /* 80D213F8-80D21448 000098 0050+00 1/1 0/0 0/0 .text initBaseMtx__11daObjVGnd_cFv */ #pragma push @@ -192,7 +192,13 @@ asm void daObjVGnd_c::Create() { /* ############################################################################################## */ /* 80D21A0C-80D21A10 000004 0004+00 1/2 0/0 0/0 .rodata @3704 */ SECTION_RODATA static f32 const lit_3704 = 1.0f; -COMPILER_STRIP_GATE(80D21A0C, &lit_3704); +COMPILER_STRIP_GATE(0x80D21A0C, &lit_3704); + +/* 80D21A18-80D21A18 000010 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80D21A18 = "M_VolcGnd"; +#pragma pop /* 80D21A24-80D21A28 -00001 0004+00 3/3 0/0 0/0 .data l_arcName */ SECTION_DATA static void* l_arcName = (void*)&d_a_obj_vground__stringBase0; @@ -261,7 +267,7 @@ asm void daObjVGnd_c::create() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3778 = 2.0f; -COMPILER_STRIP_GATE(80D21A10, &lit_3778); +COMPILER_STRIP_GATE(0x80D21A10, &lit_3778); #pragma pop /* 80D21A14-80D21A18 00000C 0004+00 0/1 0/0 0/0 .rodata @3779 */ @@ -273,7 +279,7 @@ SECTION_RODATA static u8 const lit_3779[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D21A14, &lit_3779); +COMPILER_STRIP_GATE(0x80D21A14, &lit_3779); #pragma pop /* 80D217A8-80D21878 000448 00D0+00 2/2 0/0 0/0 .text execute__11daObjVGnd_cFv */ @@ -348,9 +354,4 @@ static asm void daObjVGnd_Create(fopAc_ac_c* param_0) { } #pragma pop -/* 80D21A18-80D21A22 000010 000A+00 1/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80D21A18 = "M_VolcGnd"; -#pragma pop +/* 80D21A18-80D21A18 000010 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball.cpp b/rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball.cpp index 9fea0c4ccb6..f07c991df8f 100644 --- a/rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball.cpp +++ b/rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball.cpp @@ -290,8 +290,8 @@ extern "C" void executeAfter__18JPAEmitterCallBackFP14JPABaseEmitter(); extern "C" void draw__18JPAEmitterCallBackFP14JPABaseEmitter(); extern "C" void drawAfter__18JPAEmitterCallBackFP14JPABaseEmitter(); extern "C" bool eventStart__17dEvLib_callback_cFv(); -extern "C" void func_80D23D6C(u8*); -extern "C" void func_80D23D88(u32*); +extern "C" void func_80D23D6C(void* _this, u8*); +extern "C" void func_80D23D88(void* _this, u32*); extern "C" static void func_80D23DA4(); extern "C" static void func_80D23DAC(); extern "C" static void func_80D23DB4(); @@ -403,6 +403,12 @@ extern "C" extern u8 data_80D24100[4]; // /* ############################################################################################## */ +/* 80D23E80-80D23E80 0000B4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80D23E80 = "M_Volcbal"; +#pragma pop + /* 80D23E8C-80D23E98 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -497,17 +503,17 @@ SECTION_RODATA static u8 const l_sph_src[64] = { 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0xC8, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D23DCC, &l_sph_src); +COMPILER_STRIP_GATE(0x80D23DCC, &l_sph_src); /* 80D23E0C-80D23E10 000040 0004+00 2/6 0/0 0/0 .rodata @3715 */ SECTION_RODATA static f32 const lit_3715 = 30.0f; -COMPILER_STRIP_GATE(80D23E0C, &lit_3715); +COMPILER_STRIP_GATE(0x80D23E0C, &lit_3715); /* 80D23E10-80D23E14 000044 0004+00 0/1 0/0 0/0 .rodata @3716 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3716 = -1000.0f; -COMPILER_STRIP_GATE(80D23E10, &lit_3716); +COMPILER_STRIP_GATE(0x80D23E10, &lit_3716); #pragma pop /* 80D23E14-80D23E18 000048 0004+00 4/8 0/0 0/0 .rodata @3717 */ @@ -517,13 +523,13 @@ SECTION_RODATA static u8 const lit_3717[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D23E14, &lit_3717); +COMPILER_STRIP_GATE(0x80D23E14, &lit_3717); /* 80D23E18-80D23E1C 00004C 0004+00 0/1 0/0 0/0 .rodata @3718 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3718 = 1000.0f; -COMPILER_STRIP_GATE(80D23E18, &lit_3718); +COMPILER_STRIP_GATE(0x80D23E18, &lit_3718); #pragma pop /* 80D21C40-80D21D80 0001A0 0140+00 1/1 0/0 0/0 .text Create__15daObjVolcBall_cFv */ @@ -889,14 +895,14 @@ asm void daObjVolcBall_c::initActionSwWait() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3969 = 2500.0f; -COMPILER_STRIP_GATE(80D23E1C, &lit_3969); +COMPILER_STRIP_GATE(0x80D23E1C, &lit_3969); #pragma pop /* 80D23E20-80D23E24 000054 0004+00 0/1 0/0 0/0 .rodata @3970 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3970 = 300.0f; -COMPILER_STRIP_GATE(80D23E20, &lit_3970); +COMPILER_STRIP_GATE(0x80D23E20, &lit_3970); #pragma pop /* 80D225B0-80D2267C 000B10 00CC+00 1/0 0/0 0/0 .text actionPlayerWait__15daObjVolcBall_cFv */ @@ -933,13 +939,13 @@ asm void daObjVolcBall_c::actionStop() { /* ############################################################################################## */ /* 80D23E24-80D23E28 000058 0004+00 2/7 0/0 0/0 .rodata @4031 */ SECTION_RODATA static f32 const lit_4031 = 1.0f; -COMPILER_STRIP_GATE(80D23E24, &lit_4031); +COMPILER_STRIP_GATE(0x80D23E24, &lit_4031); /* 80D23E28-80D23E2C 00005C 0004+00 0/3 0/0 0/0 .rodata @4032 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4032 = -1.0f; -COMPILER_STRIP_GATE(80D23E28, &lit_4032); +COMPILER_STRIP_GATE(0x80D23E28, &lit_4032); #pragma pop /* 80D227E4-80D22944 000D44 0160+00 1/0 0/0 0/0 .text actionWarning__15daObjVolcBall_cFv @@ -962,7 +968,7 @@ SECTION_RODATA static f32 const lit_4095[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80D23E2C, &lit_4095); +COMPILER_STRIP_GATE(0x80D23E2C, &lit_4095); #pragma pop /* 80D23E34-80D23E3C 000068 0008+00 0/1 0/0 0/0 .rodata @4097 */ @@ -971,7 +977,7 @@ COMPILER_STRIP_GATE(80D23E2C, &lit_4095); SECTION_RODATA static u8 const lit_4097[8] = { 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D23E34, &lit_4097); +COMPILER_STRIP_GATE(0x80D23E34, &lit_4097); #pragma pop /* 80D22944-80D22C6C 000EA4 0328+00 1/0 0/0 0/0 .text actionEruption__15daObjVolcBall_cFv @@ -1021,7 +1027,7 @@ asm void daObjVolcBall_c::eventStart() { SECTION_RODATA static u8 const l_effect_id[12] = { 0x84, 0xA8, 0x84, 0xA9, 0x84, 0xAA, 0x84, 0xAB, 0x84, 0xAC, 0x84, 0xAD, }; -COMPILER_STRIP_GATE(80D23E3C, &l_effect_id); +COMPILER_STRIP_GATE(0x80D23E3C, &l_effect_id); /* 80D22E24-80D22ED4 001384 00B0+00 1/1 0/0 0/0 .text setEruptEffect__15daObjVolcBall_cFi */ @@ -1039,7 +1045,7 @@ asm void daObjVolcBall_c::setEruptEffect(int param_0) { SECTION_RODATA static u8 const l_fall_effect_id[8] = { 0x84, 0xAE, 0x84, 0xAF, 0x84, 0xB0, 0x84, 0xB1, }; -COMPILER_STRIP_GATE(80D23E48, &l_fall_effect_id); +COMPILER_STRIP_GATE(0x80D23E48, &l_fall_effect_id); /* 80D22ED4-80D22FCC 001434 00F8+00 2/2 0/0 0/0 .text setFallEffect__15daObjVolcBall_cFi */ @@ -1078,14 +1084,14 @@ asm void daObjVolcBall_c::createSearchBall() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4279 = 32767.0f; -COMPILER_STRIP_GATE(80D23E50, &lit_4279); +COMPILER_STRIP_GATE(0x80D23E50, &lit_4279); #pragma pop /* 80D23E54-80D23E58 000088 0004+00 0/1 0/0 0/0 .rodata @4280 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4280 = 3000.0f; -COMPILER_STRIP_GATE(80D23E54, &lit_4280); +COMPILER_STRIP_GATE(0x80D23E54, &lit_4280); #pragma pop /* 80D23188-80D23438 0016E8 02B0+00 1/1 0/0 0/0 .text createNormalBall__15daObjVolcBall_cFv */ @@ -1103,7 +1109,7 @@ asm void daObjVolcBall_c::createNormalBall() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4407 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(80D23E58, &lit_4407); +COMPILER_STRIP_GATE(0x80D23E58, &lit_4407); #pragma pop /* 80D23E5C-80D23E64 000090 0004+04 0/1 0/0 0/0 .rodata @4408 */ @@ -1114,7 +1120,7 @@ SECTION_RODATA static f32 const lit_4408[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80D23E5C, &lit_4408); +COMPILER_STRIP_GATE(0x80D23E5C, &lit_4408); #pragma pop /* 80D23E64-80D23E6C 000098 0008+00 0/1 0/0 0/0 .rodata @4409 */ @@ -1123,7 +1129,7 @@ COMPILER_STRIP_GATE(80D23E5C, &lit_4408); SECTION_RODATA static u8 const lit_4409[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D23E64, &lit_4409); +COMPILER_STRIP_GATE(0x80D23E64, &lit_4409); #pragma pop /* 80D23E6C-80D23E74 0000A0 0008+00 0/1 0/0 0/0 .rodata @4410 */ @@ -1132,7 +1138,7 @@ COMPILER_STRIP_GATE(80D23E64, &lit_4409); SECTION_RODATA static u8 const lit_4410[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D23E6C, &lit_4410); +COMPILER_STRIP_GATE(0x80D23E6C, &lit_4410); #pragma pop /* 80D23E74-80D23E7C 0000A8 0008+00 0/1 0/0 0/0 .rodata @4411 */ @@ -1141,7 +1147,7 @@ COMPILER_STRIP_GATE(80D23E6C, &lit_4410); SECTION_RODATA static u8 const lit_4411[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D23E74, &lit_4411); +COMPILER_STRIP_GATE(0x80D23E74, &lit_4411); #pragma pop /* 80D23438-80D23868 001998 0430+00 1/1 0/0 0/0 .text executeBall__15daObjVolcBall_cFv */ @@ -1169,7 +1175,7 @@ asm void daObjVolcBall_c::startQuake() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4447 = 2000.0f; -COMPILER_STRIP_GATE(80D23E7C, &lit_4447); +COMPILER_STRIP_GATE(0x80D23E7C, &lit_4447); #pragma pop /* 80D23904-80D23A0C 001E64 0108+00 1/1 0/0 0/0 .text draw__15daObjVolcBall_cFv */ @@ -1317,7 +1323,7 @@ bool dEvLib_callback_c::eventStart() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80D23D6C(u8* param_0) { +extern "C" asm void func_80D23D6C(void* _this, u8* param_0) { nofralloc #include "asm/rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball/func_80D23D6C.s" } @@ -1327,7 +1333,7 @@ extern "C" asm void func_80D23D6C(u8* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80D23D88(u32* param_0) { +extern "C" asm void func_80D23D88(void* _this, u32* param_0) { nofralloc #include "asm/rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball/func_80D23D88.s" } @@ -1373,9 +1379,4 @@ static asm void func_80D23DBC() { } #pragma pop -/* 80D23E80-80D23E8A 0000B4 000A+00 1/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80D23E80 = "M_Volcbal"; -#pragma pop +/* 80D23E80-80D23E80 0000B4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_volcbom/d_a_obj_volcbom.cpp b/rel/d/a/obj/d_a_obj_volcbom/d_a_obj_volcbom.cpp index 8c5be42cf93..9c64262184c 100644 --- a/rel/d/a/obj/d_a_obj_volcbom/d_a_obj_volcbom.cpp +++ b/rel/d/a/obj/d_a_obj_volcbom/d_a_obj_volcbom.cpp @@ -280,10 +280,10 @@ struct cBgS { struct _GXTexObj {}; -struct Vec {}; - struct JAISoundID {}; +struct Vec {}; + struct Z2SeMgr { /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); /* 802AC50C */ void seStartLevel(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); @@ -367,7 +367,7 @@ extern "C" static void daObjVolcBom_MoveBGDelete__FP14daObjVolcBom_c(); extern "C" static void daObjVolcBom_MoveBGExecute__FP14daObjVolcBom_c(); extern "C" static void daObjVolcBom_MoveBGDraw__FP14daObjVolcBom_c(); extern "C" void __dt__10cCcD_GSttsFv(); -extern "C" void func_80D26B28(u8*); +extern "C" void func_80D26B28(void* _this, u8*); extern "C" static void func_80D26B44(); extern "C" static void func_80D26B4C(); extern "C" extern char const* const d_a_obj_volcbom__stringBase0; @@ -536,7 +536,7 @@ asm void daObjVolcBom_c::setBaseMtx() { SECTION_RODATA static u8 const l_midna_offset[12] = { 0x00, 0x00, 0x00, 0x00, 0x44, 0x7A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D26B5C, &l_midna_offset); +COMPILER_STRIP_GATE(0x80D26B5C, &l_midna_offset); /* 80D26B68-80D26B6C 00000C 0002+02 0/1 0/0 0/0 .rodata l_disapp_eff */ #pragma push @@ -546,7 +546,7 @@ SECTION_RODATA static u16 const l_disapp_eff[1 + 1 /* padding */] = { /* padding */ 0x0000, }; -COMPILER_STRIP_GATE(80D26B68, &l_disapp_eff); +COMPILER_STRIP_GATE(0x80D26B68, &l_disapp_eff); #pragma pop /* 80D26B6C-80D26B74 000010 0006+02 0/1 0/0 0/0 .rodata l_start_eff */ @@ -563,36 +563,45 @@ SECTION_RODATA static u8 const l_start_eff[6 + 2 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D26B6C, &l_start_eff); +COMPILER_STRIP_GATE(0x80D26B6C, &l_start_eff); #pragma pop /* 80D26B74-80D26B7C 000018 0008+00 1/1 0/0 0/0 .rodata l_bind_eff */ SECTION_RODATA static u8 const l_bind_eff[8] = { 0x8B, 0x47, 0x8B, 0x48, 0x8B, 0x49, 0x8B, 0x4A, }; -COMPILER_STRIP_GATE(80D26B74, &l_bind_eff); +COMPILER_STRIP_GATE(0x80D26B74, &l_bind_eff); /* 80D26B7C-80D26B80 000020 0004+00 4/11 0/0 0/0 .rodata @3785 */ SECTION_RODATA static f32 const lit_3785 = 1.0f; -COMPILER_STRIP_GATE(80D26B7C, &lit_3785); +COMPILER_STRIP_GATE(0x80D26B7C, &lit_3785); /* 80D26B80-80D26B84 000024 0004+00 0/1 0/0 0/0 .rodata @3786 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3786 = 30.0f; -COMPILER_STRIP_GATE(80D26B80, &lit_3786); +COMPILER_STRIP_GATE(0x80D26B80, &lit_3786); #pragma pop /* 80D26B84-80D26B88 000028 0004+00 0/1 0/0 0/0 .rodata @3787 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3787 = -6.0f; -COMPILER_STRIP_GATE(80D26B84, &lit_3787); +COMPILER_STRIP_GATE(0x80D26B84, &lit_3787); #pragma pop /* 80D26B88-80D26B8C 00002C 0004+00 1/2 0/0 0/0 .rodata @3788 */ SECTION_RODATA static f32 const lit_3788 = 10.0f; -COMPILER_STRIP_GATE(80D26B88, &lit_3788); +COMPILER_STRIP_GATE(0x80D26B88, &lit_3788); + +/* 80D26C0C-80D26C0C 0000B0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80D26C0C = "M_VolcBom"; +SECTION_DEAD static char const* const stringBase_80D26C16 = "PORTAL_WARP_BIGVOLC"; +SECTION_DEAD static char const* const stringBase_80D26C2A = "BigVolc"; +SECTION_DEAD static char const* const stringBase_80D26C32 = "effect_p"; +#pragma pop /* 80D26C54-80D26C60 000000 000C+00 3/3 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { @@ -655,7 +664,16 @@ SECTION_RODATA static u8 const lit_3904[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D26B8C, &lit_3904); +COMPILER_STRIP_GATE(0x80D26B8C, &lit_3904); + +/* 80D26C0C-80D26C0C 0000B0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80D26C3B = "WAIT"; +SECTION_DEAD static char const* const stringBase_80D26C40 = "FLY"; +SECTION_DEAD static char const* const stringBase_80D26C44 = "INIT"; +SECTION_DEAD static char const* const stringBase_80D26C49 = "BEAM"; +#pragma pop /* 80D26CC4-80D26CD0 -00001 000C+00 0/1 0/0 0/0 .data @3933 */ #pragma push @@ -919,7 +937,7 @@ asm void daObjVolcBom_c::mode_proc_call() { /* ############################################################################################## */ /* 80D26B90-80D26B94 000034 0004+00 1/2 0/0 0/0 .rodata @3958 */ SECTION_RODATA static f32 const lit_3958 = 2000.0f; -COMPILER_STRIP_GATE(80D26B90, &lit_3958); +COMPILER_STRIP_GATE(0x80D26B90, &lit_3958); /* 80D24B18-80D24B6C 0009F8 0054+00 1/1 0/0 0/0 .text init_modeWaitAppear__14daObjVolcBom_cFv */ #pragma push @@ -936,39 +954,39 @@ asm void daObjVolcBom_c::init_modeWaitAppear() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3997 = 1.0f / 50.0f; -COMPILER_STRIP_GATE(80D26B94, &lit_3997); +COMPILER_STRIP_GATE(0x80D26B94, &lit_3997); #pragma pop /* 80D26B98-80D26B9C 00003C 0004+00 0/1 0/0 0/0 .rodata @3998 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3998 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(80D26B98, &lit_3998); +COMPILER_STRIP_GATE(0x80D26B98, &lit_3998); #pragma pop /* 80D26B9C-80D26BA0 000040 0004+00 0/2 0/0 0/0 .rodata @3999 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3999 = 1.0f / 100.0f; -COMPILER_STRIP_GATE(80D26B9C, &lit_3999); +COMPILER_STRIP_GATE(0x80D26B9C, &lit_3999); #pragma pop /* 80D26BA0-80D26BA4 000044 0004+00 1/5 0/0 0/0 .rodata @4000 */ SECTION_RODATA static f32 const lit_4000 = -1.0f; -COMPILER_STRIP_GATE(80D26BA0, &lit_4000); +COMPILER_STRIP_GATE(0x80D26BA0, &lit_4000); /* 80D26BA4-80D26BA8 000048 0004+00 0/1 0/0 0/0 .rodata @4001 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4001 = 15000.0f; -COMPILER_STRIP_GATE(80D26BA4, &lit_4001); +COMPILER_STRIP_GATE(0x80D26BA4, &lit_4001); #pragma pop /* 80D26BA8-80D26BAC 00004C 0004+00 0/1 0/0 0/0 .rodata @4002 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4002 = -250.0f; -COMPILER_STRIP_GATE(80D26BA8, &lit_4002); +COMPILER_STRIP_GATE(0x80D26BA8, &lit_4002); #pragma pop /* 80D24B6C-80D24D80 000A4C 0214+00 1/0 0/0 0/0 .text modeWaitAppear__14daObjVolcBom_cFv @@ -987,7 +1005,7 @@ asm void daObjVolcBom_c::modeWaitAppear() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4022 = 0.5f; -COMPILER_STRIP_GATE(80D26BAC, &lit_4022); +COMPILER_STRIP_GATE(0x80D26BAC, &lit_4022); #pragma pop /* 80D24D80-80D24E50 000C60 00D0+00 1/1 0/0 0/0 .text init_modeFall__14daObjVolcBom_cFv @@ -1024,7 +1042,7 @@ SECTION_RODATA static u8 const l_effect_id[14 + 2 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D26BB0, &l_effect_id); +COMPILER_STRIP_GATE(0x80D26BB0, &l_effect_id); #pragma pop /* 80D24E50-80D25024 000D30 01D4+00 1/0 0/0 0/0 .text modeFall__14daObjVolcBom_cFv */ @@ -1072,7 +1090,7 @@ asm void daObjVolcBom_c::init_modeWait() { /* ############################################################################################## */ /* 80D26BC0-80D26BC4 000064 0004+00 1/1 0/0 0/0 .rodata @4103 */ SECTION_RODATA static f32 const lit_4103 = 750.0f; -COMPILER_STRIP_GATE(80D26BC0, &lit_4103); +COMPILER_STRIP_GATE(0x80D26BC0, &lit_4103); /* 80D25100-80D25178 000FE0 0078+00 1/0 0/0 0/0 .text modeWait__14daObjVolcBom_cFv */ #pragma push @@ -1141,13 +1159,13 @@ SECTION_RODATA static f32 const lit_4162[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80D26BC4, &lit_4162); +COMPILER_STRIP_GATE(0x80D26BC4, &lit_4162); /* 80D26BCC-80D26BD4 000070 0008+00 1/1 0/0 0/0 .rodata @4164 */ SECTION_RODATA static u8 const lit_4164[8] = { 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D26BCC, &lit_4164); +COMPILER_STRIP_GATE(0x80D26BCC, &lit_4164); /* 80D252C8-80D25364 0011A8 009C+00 3/3 0/0 0/0 .text checkTalkDistance__14daObjVolcBom_cFv */ #pragma push @@ -1164,14 +1182,14 @@ asm void daObjVolcBom_c::checkTalkDistance() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4175 = 1000.0f; -COMPILER_STRIP_GATE(80D26BD4, &lit_4175); +COMPILER_STRIP_GATE(0x80D26BD4, &lit_4175); #pragma pop /* 80D26BD8-80D26BDC 00007C 0004+00 0/1 0/0 0/0 .rodata @4176 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4176 = 250.0f; -COMPILER_STRIP_GATE(80D26BD8, &lit_4176); +COMPILER_STRIP_GATE(0x80D26BD8, &lit_4176); #pragma pop /* 80D25364-80D253FC 001244 0098+00 1/1 0/0 0/0 .text calcMidnaWaitPos__14daObjVolcBom_cFv */ @@ -1286,7 +1304,7 @@ asm void daObjVolcBom_c::actionWait() { SECTION_RODATA static u8 const lit_4470[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D26BDC, &lit_4470); +COMPILER_STRIP_GATE(0x80D26BDC, &lit_4470); #pragma pop /* 80D26BE4-80D26BEC 000088 0008+00 0/2 0/0 0/0 .rodata @4471 */ @@ -1295,7 +1313,7 @@ COMPILER_STRIP_GATE(80D26BDC, &lit_4470); SECTION_RODATA static u8 const lit_4471[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D26BE4, &lit_4471); +COMPILER_STRIP_GATE(0x80D26BE4, &lit_4471); #pragma pop /* 80D26BEC-80D26BF4 000090 0008+00 0/2 0/0 0/0 .rodata @4472 */ @@ -1304,14 +1322,14 @@ COMPILER_STRIP_GATE(80D26BE4, &lit_4471); SECTION_RODATA static u8 const lit_4472[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D26BEC, &lit_4472); +COMPILER_STRIP_GATE(0x80D26BEC, &lit_4472); #pragma pop /* 80D26BF4-80D26BF8 000098 0004+00 0/1 0/0 0/0 .rodata @4473 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4473 = 5.0f; -COMPILER_STRIP_GATE(80D26BF4, &lit_4473); +COMPILER_STRIP_GATE(0x80D26BF4, &lit_4473); #pragma pop /* 80D25B04-80D25CA0 0019E4 019C+00 2/1 0/0 0/0 .text actionOrderEvent__14daObjVolcBom_cFv */ @@ -1366,28 +1384,34 @@ void daObjVolcBom_c::actionDead() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4715 = 222.0f; -COMPILER_STRIP_GATE(80D26BF8, &lit_4715); +COMPILER_STRIP_GATE(0x80D26BF8, &lit_4715); #pragma pop /* 80D26BFC-80D26C00 0000A0 0004+00 0/1 0/0 0/0 .rodata @4716 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4716 = -10.0f; -COMPILER_STRIP_GATE(80D26BFC, &lit_4716); +COMPILER_STRIP_GATE(0x80D26BFC, &lit_4716); #pragma pop /* 80D26C00-80D26C04 0000A4 0004+00 0/1 0/0 0/0 .rodata @4717 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4717 = -65.0f; -COMPILER_STRIP_GATE(80D26C00, &lit_4717); +COMPILER_STRIP_GATE(0x80D26C00, &lit_4717); #pragma pop /* 80D26C04-80D26C08 0000A8 0004+00 0/1 0/0 0/0 .rodata @4718 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4718 = 55.0f; -COMPILER_STRIP_GATE(80D26C04, &lit_4718); +COMPILER_STRIP_GATE(0x80D26C04, &lit_4718); +#pragma pop + +/* 80D26C0C-80D26C0C 0000B0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80D26C4E = "Timer"; #pragma pop /* 80D25EE8-80D26468 001DC8 0580+00 3/3 0/0 0/0 .text demoProc__14daObjVolcBom_cFv */ @@ -1415,7 +1439,7 @@ asm void daObjVolcBom_c::calcObjPos() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4828 = 4000.0f; -COMPILER_STRIP_GATE(80D26C08, &lit_4828); +COMPILER_STRIP_GATE(0x80D26C08, &lit_4828); #pragma pop /* 80D264E8-80D266FC 0023C8 0214+00 1/0 0/0 0/0 .text Draw__14daObjVolcBom_cFv */ @@ -1561,7 +1585,7 @@ asm cCcD_GStts::~cCcD_GStts() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80D26B28(u8* param_0) { +extern "C" asm void func_80D26B28(void* _this, u8* param_0) { nofralloc #include "asm/rel/d/a/obj/d_a_obj_volcbom/d_a_obj_volcbom/func_80D26B28.s" } @@ -1587,17 +1611,4 @@ static asm void func_80D26B4C() { } #pragma pop -/* 80D26C0C-80D26C54 0000B0 0048+00 7/3 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80D26C0C = "M_VolcBom"; -SECTION_DEAD static char const* const stringBase_80D26C16 = "PORTAL_WARP_BIGVOLC"; -SECTION_DEAD static char const* const stringBase_80D26C2A = "BigVolc"; -SECTION_DEAD static char const* const stringBase_80D26C32 = "effect_p"; -SECTION_DEAD static char const* const stringBase_80D26C3B = "WAIT"; -SECTION_DEAD static char const* const stringBase_80D26C40 = "FLY"; -SECTION_DEAD static char const* const stringBase_80D26C44 = "INIT"; -SECTION_DEAD static char const* const stringBase_80D26C49 = "BEAM"; -SECTION_DEAD static char const* const stringBase_80D26C4E = "Timer"; -#pragma pop +/* 80D26C0C-80D26C0C 0000B0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_warp_kbrg/d_a_obj_warp_kbrg.cpp b/rel/d/a/obj/d_a_obj_warp_kbrg/d_a_obj_warp_kbrg.cpp index ee01d9c0957..c0bcd824a8d 100644 --- a/rel/d/a/obj/d_a_obj_warp_kbrg/d_a_obj_warp_kbrg.cpp +++ b/rel/d/a/obj/d_a_obj_warp_kbrg/d_a_obj_warp_kbrg.cpp @@ -198,10 +198,10 @@ struct cBgS { /* 80074250 */ void Release(dBgW_Base*); }; -struct Vec {}; - struct JAISoundID {}; +struct Vec {}; + struct Z2SeMgr { /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); }; @@ -271,7 +271,7 @@ extern "C" static void daObjWarpKBrg_create1st__FP15daObjWarpKBrg_c(); extern "C" static void daObjWarpKBrg_MoveBGDelete__FP15daObjWarpKBrg_c(); extern "C" static void daObjWarpKBrg_MoveBGExecute__FP15daObjWarpKBrg_c(); extern "C" static void daObjWarpKBrg_MoveBGDraw__FP15daObjWarpKBrg_c(); -extern "C" void func_80D29590(u8*); +extern "C" void func_80D29590(void* _this, u8*); extern "C" extern char const* const d_a_obj_warp_kbrg__stringBase0; // @@ -405,13 +405,13 @@ asm void daObjWarpKBrg_c::initBaseMtx() { SECTION_RODATA static u8 const l_bmd_idx[8] = { 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x0B, }; -COMPILER_STRIP_GATE(80D295B4, &l_bmd_idx); +COMPILER_STRIP_GATE(0x80D295B4, &l_bmd_idx); /* 80D295BC-80D295C4 000008 0008+00 1/1 0/0 0/0 .rodata l_dzb_idx */ SECTION_RODATA static u8 const l_dzb_idx[8] = { 0x00, 0x00, 0x00, 0x0F, 0x00, 0x00, 0x00, 0x16, }; -COMPILER_STRIP_GATE(80D295BC, &l_dzb_idx); +COMPILER_STRIP_GATE(0x80D295BC, &l_dzb_idx); /* 80D295C4-80D295CC 000010 0008+00 0/1 0/0 0/0 .rodata l_btk_idx */ #pragma push @@ -419,14 +419,14 @@ COMPILER_STRIP_GATE(80D295BC, &l_dzb_idx); SECTION_RODATA static u8 const l_btk_idx[8] = { 0x00, 0x00, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x13, }; -COMPILER_STRIP_GATE(80D295C4, &l_btk_idx); +COMPILER_STRIP_GATE(0x80D295C4, &l_btk_idx); #pragma pop /* 80D295CC-80D295D4 000018 0008+00 1/2 0/0 0/0 .rodata l_bck_idx */ SECTION_RODATA static u8 const l_bck_idx[8] = { 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x07, }; -COMPILER_STRIP_GATE(80D295CC, &l_bck_idx); +COMPILER_STRIP_GATE(0x80D295CC, &l_bck_idx); /* 80D295D4-80D295E0 000020 000A+02 0/1 0/0 0/0 .rodata l_disapp_eff */ #pragma push @@ -446,7 +446,7 @@ SECTION_RODATA static u8 const l_disapp_eff[10 + 2 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D295D4, &l_disapp_eff); +COMPILER_STRIP_GATE(0x80D295D4, &l_disapp_eff); #pragma pop /* 80D295E0-80D295E8 00002C 0006+02 0/1 0/0 0/0 .rodata l_start_eff */ @@ -463,7 +463,7 @@ SECTION_RODATA static u8 const l_start_eff[6 + 2 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D295E0, &l_start_eff); +COMPILER_STRIP_GATE(0x80D295E0, &l_start_eff); #pragma pop /* 80D295E8-80D295F4 000034 000C+00 0/1 0/0 0/0 .rodata l_app_eff */ @@ -472,60 +472,60 @@ COMPILER_STRIP_GATE(80D295E0, &l_start_eff); SECTION_RODATA static u8 const l_app_eff[12] = { 0x85, 0x2D, 0x85, 0x2E, 0x85, 0x2F, 0x85, 0x30, 0x85, 0x31, 0x8B, 0x3C, }; -COMPILER_STRIP_GATE(80D295E8, &l_app_eff); +COMPILER_STRIP_GATE(0x80D295E8, &l_app_eff); #pragma pop /* 80D295F4-80D295F8 000040 0004+00 0/1 0/0 0/0 .rodata l_end_eff */ #pragma push #pragma force_active on SECTION_RODATA static u32 const l_end_eff = 0x8B3D8B3E; -COMPILER_STRIP_GATE(80D295F4, &l_end_eff); +COMPILER_STRIP_GATE(0x80D295F4, &l_end_eff); #pragma pop /* 80D295F8-80D29600 000044 0008+00 1/1 0/0 0/0 .rodata l_bind_eff */ SECTION_RODATA static u8 const l_bind_eff[8] = { 0x8B, 0x4F, 0x8B, 0x50, 0x8B, 0x51, 0x8B, 0x52, }; -COMPILER_STRIP_GATE(80D295F8, &l_bind_eff); +COMPILER_STRIP_GATE(0x80D295F8, &l_bind_eff); /* 80D29600-80D29608 00004C 0008+00 1/1 0/0 0/0 .rodata l_heap_size */ SECTION_RODATA static u8 const l_heap_size[8] = { 0x00, 0x00, 0x64, 0x00, 0x00, 0x00, 0x7E, 0x60, }; -COMPILER_STRIP_GATE(80D29600, &l_heap_size); +COMPILER_STRIP_GATE(0x80D29600, &l_heap_size); /* 80D29608-80D29614 000054 000C+00 1/1 0/0 0/0 .rodata l_midna_wait_offset */ SECTION_RODATA static u8 const l_midna_wait_offset[12] = { 0x00, 0x00, 0x00, 0x00, 0xC3, 0x48, 0x00, 0x00, 0x44, 0x96, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D29608, &l_midna_wait_offset); +COMPILER_STRIP_GATE(0x80D29608, &l_midna_wait_offset); /* 80D29614-80D29618 000060 0004+00 0/1 0/0 0/0 .rodata @3726 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3726 = -7643.0f; -COMPILER_STRIP_GATE(80D29614, &lit_3726); +COMPILER_STRIP_GATE(0x80D29614, &lit_3726); #pragma pop /* 80D29618-80D2961C 000064 0004+00 0/1 0/0 0/0 .rodata @3727 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3727 = -2770.0f; -COMPILER_STRIP_GATE(80D29618, &lit_3727); +COMPILER_STRIP_GATE(0x80D29618, &lit_3727); #pragma pop /* 80D2961C-80D29620 000068 0004+00 0/1 0/0 0/0 .rodata @3728 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3728 = 56750.0f; -COMPILER_STRIP_GATE(80D2961C, &lit_3728); +COMPILER_STRIP_GATE(0x80D2961C, &lit_3728); #pragma pop /* 80D29620-80D29624 00006C 0004+00 0/2 0/0 0/0 .rodata @3729 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3729 = 5.0f; -COMPILER_STRIP_GATE(80D29620, &lit_3729); +COMPILER_STRIP_GATE(0x80D29620, &lit_3729); #pragma pop /* 80D27008-80D270C4 000148 00BC+00 2/2 0/0 0/0 .text setBaseMtx__15daObjWarpKBrg_cFv */ @@ -551,13 +551,25 @@ SECTION_RODATA static u8 const lit_3825[4 + 4 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D29624, &lit_3825); +COMPILER_STRIP_GATE(0x80D29624, &lit_3825); /* 80D2962C-80D29634 000078 0008+00 1/1 0/0 0/0 .rodata @3827 */ SECTION_RODATA static u8 const lit_3827[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D2962C, &lit_3827); +COMPILER_STRIP_GATE(0x80D2962C, &lit_3827); + +/* 80D29688-80D29688 0000D4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80D29688 = "Obj_kbrgS"; +SECTION_DEAD static char const* const stringBase_80D29692 = "Obj_kbrgD"; +SECTION_DEAD static char const* const stringBase_80D2969C = "Obj_kbrg"; +SECTION_DEAD static char const* const stringBase_80D296A5 = "PORTAL_WARP_KBRIDGE"; +SECTION_DEAD static char const* const stringBase_80D296B9 = "PORTAL_WARP_KBRIDGE_OUT"; +SECTION_DEAD static char const* const stringBase_80D296D1 = "WarpBrg"; +SECTION_DEAD static char const* const stringBase_80D296D9 = "effect_p"; +#pragma pop /* 80D29710-80D2971C 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { @@ -605,7 +617,19 @@ asm void daObjWarpKBrg_c::Create() { /* ############################################################################################## */ /* 80D29634-80D29638 000080 0004+00 2/5 0/0 0/0 .rodata @3964 */ SECTION_RODATA static f32 const lit_3964 = 1.0f; -COMPILER_STRIP_GATE(80D29634, &lit_3964); +COMPILER_STRIP_GATE(0x80D29634, &lit_3964); + +/* 80D29688-80D29688 0000D4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80D296E2 = "WAIT"; +SECTION_DEAD static char const* const stringBase_80D296E7 = "FLY"; +SECTION_DEAD static char const* const stringBase_80D296EB = "DOWN"; +SECTION_DEAD static char const* const stringBase_80D296F0 = "P_APP"; +SECTION_DEAD static char const* const stringBase_80D296F6 = "P_DIS"; +SECTION_DEAD static char const* const stringBase_80D296FC = "B_APP"; +SECTION_DEAD static char const* const stringBase_80D29702 = "BEAM"; +#pragma pop /* 80D29744-80D29748 -00001 0004+00 4/4 0/0 0/0 .data l_staff_name */ SECTION_DATA static void* l_staff_name = (void*)(((char*)&d_a_obj_warp_kbrg__stringBase0) + 0x49); @@ -851,7 +875,7 @@ asm void daObjWarpKBrg_c::event_proc_call() { /* ############################################################################################## */ /* 80D29638-80D2963C 000084 0004+00 1/1 0/0 0/0 .rodata @4071 */ SECTION_RODATA static f32 const lit_4071 = -1.0f; -COMPILER_STRIP_GATE(80D29638, &lit_4071); +COMPILER_STRIP_GATE(0x80D29638, &lit_4071); /* 80D27A38-80D27B2C 000B78 00F4+00 1/1 0/0 0/0 .text orderZHintEvent__15daObjWarpKBrg_cFv */ #pragma push @@ -880,7 +904,7 @@ asm void daObjWarpKBrg_c::actionWait() { SECTION_RODATA static u8 const lit_4147[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D2963C, &lit_4147); +COMPILER_STRIP_GATE(0x80D2963C, &lit_4147); #pragma pop /* 80D29644-80D2964C 000090 0008+00 0/1 0/0 0/0 .rodata @4148 */ @@ -889,7 +913,7 @@ COMPILER_STRIP_GATE(80D2963C, &lit_4147); SECTION_RODATA static u8 const lit_4148[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D29644, &lit_4148); +COMPILER_STRIP_GATE(0x80D29644, &lit_4148); #pragma pop /* 80D2964C-80D29654 000098 0008+00 0/1 0/0 0/0 .rodata @4149 */ @@ -898,7 +922,7 @@ COMPILER_STRIP_GATE(80D29644, &lit_4148); SECTION_RODATA static u8 const lit_4149[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D2964C, &lit_4149); +COMPILER_STRIP_GATE(0x80D2964C, &lit_4149); #pragma pop /* 80D27C6C-80D27E08 000DAC 019C+00 2/1 0/0 0/0 .text actionOrderEvent__15daObjWarpKBrg_cFv */ @@ -987,6 +1011,13 @@ void daObjWarpKBrg_c::actionDead2() { /* empty function */ } +/* ############################################################################################## */ +/* 80D29688-80D29688 0000D4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80D29707 = "Timer"; +#pragma pop + /* 80D2824C-80D28A50 00138C 0804+00 8/6 0/0 0/0 .text demoProc__15daObjWarpKBrg_cFv */ #pragma push #pragma optimization_level 0 @@ -1012,54 +1043,54 @@ asm void daObjWarpKBrg_c::calcObjPos() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4526 = 240.0f; -COMPILER_STRIP_GATE(80D29654, &lit_4526); +COMPILER_STRIP_GATE(0x80D29654, &lit_4526); #pragma pop /* 80D29658-80D2965C 0000A4 0004+00 0/0 0/0 0/0 .rodata @4527 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4527 = 180.0f; -COMPILER_STRIP_GATE(80D29658, &lit_4527); +COMPILER_STRIP_GATE(0x80D29658, &lit_4527); #pragma pop /* 80D2965C-80D29660 0000A8 0004+00 0/0 0/0 0/0 .rodata @4528 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4528 = -10.0f; -COMPILER_STRIP_GATE(80D2965C, &lit_4528); +COMPILER_STRIP_GATE(0x80D2965C, &lit_4528); #pragma pop /* 80D29660-80D29664 0000AC 0004+00 0/0 0/0 0/0 .rodata @4529 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4529 = -65.0f; -COMPILER_STRIP_GATE(80D29660, &lit_4529); +COMPILER_STRIP_GATE(0x80D29660, &lit_4529); #pragma pop /* 80D29664-80D29668 0000B0 0004+00 0/0 0/0 0/0 .rodata @4530 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4530 = 55.0f; -COMPILER_STRIP_GATE(80D29664, &lit_4530); +COMPILER_STRIP_GATE(0x80D29664, &lit_4530); #pragma pop /* 80D29668-80D2966C 0000B4 0004+00 0/0 0/0 0/0 .rodata @4531 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4531 = -180.0f; -COMPILER_STRIP_GATE(80D29668, &lit_4531); +COMPILER_STRIP_GATE(0x80D29668, &lit_4531); #pragma pop /* 80D2966C-80D29670 0000B8 0004+00 0/0 0/0 0/0 .rodata @4532 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4532 = 1.0f / 100.0f; -COMPILER_STRIP_GATE(80D2966C, &lit_4532); +COMPILER_STRIP_GATE(0x80D2966C, &lit_4532); #pragma pop /* 80D29670-80D29674 0000BC 0004+00 1/1 0/0 0/0 .rodata @4576 */ SECTION_RODATA static f32 const lit_4576 = 10.0f; -COMPILER_STRIP_GATE(80D29670, &lit_4576); +COMPILER_STRIP_GATE(0x80D29670, &lit_4576); /* 80D29674-80D2967C 0000C0 0004+04 1/1 0/0 0/0 .rodata @4577 */ SECTION_RODATA static f32 const lit_4577[1 + 1 /* padding */] = { @@ -1067,13 +1098,13 @@ SECTION_RODATA static f32 const lit_4577[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80D29674, &lit_4577); +COMPILER_STRIP_GATE(0x80D29674, &lit_4577); /* 80D2967C-80D29684 0000C8 0008+00 1/1 0/0 0/0 .rodata @4579 */ SECTION_RODATA static u8 const lit_4579[8] = { 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D2967C, &lit_4579); +COMPILER_STRIP_GATE(0x80D2967C, &lit_4579); /* 80D28AE0-80D28B7C 001C20 009C+00 2/2 0/0 0/0 .text checkTalkDistance__15daObjWarpKBrg_cFv */ #pragma push @@ -1088,7 +1119,7 @@ asm void daObjWarpKBrg_c::checkTalkDistance() { /* ############################################################################################## */ /* 80D29684-80D29688 0000D0 0004+00 1/1 0/0 0/0 .rodata @4590 */ SECTION_RODATA static f32 const lit_4590 = 250.0f; -COMPILER_STRIP_GATE(80D29684, &lit_4590); +COMPILER_STRIP_GATE(0x80D29684, &lit_4590); /* 80D28B7C-80D28C10 001CBC 0094+00 1/1 0/0 0/0 .text calcMidnaWaitPos__15daObjWarpKBrg_cFv */ #pragma push @@ -1268,29 +1299,10 @@ static asm void daObjWarpKBrg_MoveBGDraw(daObjWarpKBrg_c* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80D29590(u8* param_0) { +extern "C" asm void func_80D29590(void* _this, u8* param_0) { nofralloc #include "asm/rel/d/a/obj/d_a_obj_warp_kbrg/d_a_obj_warp_kbrg/func_80D29590.s" } #pragma pop -/* 80D29688-80D2970D 0000D4 0085+00 8/3 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80D29688 = "Obj_kbrgS"; -SECTION_DEAD static char const* const stringBase_80D29692 = "Obj_kbrgD"; -SECTION_DEAD static char const* const stringBase_80D2969C = "Obj_kbrg"; -SECTION_DEAD static char const* const stringBase_80D296A5 = "PORTAL_WARP_KBRIDGE"; -SECTION_DEAD static char const* const stringBase_80D296B9 = "PORTAL_WARP_KBRIDGE_OUT"; -SECTION_DEAD static char const* const stringBase_80D296D1 = "WarpBrg"; -SECTION_DEAD static char const* const stringBase_80D296D9 = "effect_p"; -SECTION_DEAD static char const* const stringBase_80D296E2 = "WAIT"; -SECTION_DEAD static char const* const stringBase_80D296E7 = "FLY"; -SECTION_DEAD static char const* const stringBase_80D296EB = "DOWN"; -SECTION_DEAD static char const* const stringBase_80D296F0 = "P_APP"; -SECTION_DEAD static char const* const stringBase_80D296F6 = "P_DIS"; -SECTION_DEAD static char const* const stringBase_80D296FC = "B_APP"; -SECTION_DEAD static char const* const stringBase_80D29702 = "BEAM"; -SECTION_DEAD static char const* const stringBase_80D29707 = "Timer"; -#pragma pop +/* 80D29688-80D29688 0000D4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_warp_obrg/d_a_obj_warp_obrg.cpp b/rel/d/a/obj/d_a_obj_warp_obrg/d_a_obj_warp_obrg.cpp index 4fc5d0a29fa..db565122c2d 100644 --- a/rel/d/a/obj/d_a_obj_warp_obrg/d_a_obj_warp_obrg.cpp +++ b/rel/d/a/obj/d_a_obj_warp_obrg/d_a_obj_warp_obrg.cpp @@ -177,10 +177,10 @@ struct cBgS { /* 80074250 */ void Release(dBgW_Base*); }; -struct Vec {}; - struct JAISoundID {}; +struct Vec {}; + struct Z2SeMgr { /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); }; @@ -232,7 +232,7 @@ extern "C" static void daObjWarpOBrg_create1st__FP15daObjWarpOBrg_c(); extern "C" static void daObjWarpOBrg_MoveBGDelete__FP15daObjWarpOBrg_c(); extern "C" static void daObjWarpOBrg_MoveBGExecute__FP15daObjWarpOBrg_c(); extern "C" static void daObjWarpOBrg_MoveBGDraw__FP15daObjWarpOBrg_c(); -extern "C" void func_80D2B7D4(u8*); +extern "C" void func_80D2B7D4(void* _this, u8*); extern "C" extern char const* const d_a_obj_warp_obrg__stringBase0; // @@ -348,7 +348,7 @@ asm void daObjWarpOBrg_c::initBaseMtx() { SECTION_RODATA static u8 const l_bmd_idx[8] = { 0x00, 0x00, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x0B, }; -COMPILER_STRIP_GATE(80D2B7F8, &l_bmd_idx); +COMPILER_STRIP_GATE(0x80D2B7F8, &l_bmd_idx); /* 80D2B800-80D2B808 000008 0008+00 0/1 0/0 0/0 .rodata l_dzb_idx */ #pragma push @@ -356,14 +356,20 @@ COMPILER_STRIP_GATE(80D2B7F8, &l_bmd_idx); SECTION_RODATA static u8 const l_dzb_idx[8] = { 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x13, }; -COMPILER_STRIP_GATE(80D2B800, &l_dzb_idx); +COMPILER_STRIP_GATE(0x80D2B800, &l_dzb_idx); #pragma pop /* 80D2B808-80D2B810 000010 0008+00 1/3 0/0 0/0 .rodata l_bck_idx */ SECTION_RODATA static u8 const l_bck_idx[8] = { 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x07, }; -COMPILER_STRIP_GATE(80D2B808, &l_bck_idx); +COMPILER_STRIP_GATE(0x80D2B808, &l_bck_idx); + +/* 80D2B8AC-80D2B8AC 0000B4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80D2B8AC = "Obj_obrg"; +#pragma pop /* 80D2B914-80D2B920 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { @@ -397,6 +403,13 @@ asm void daObjWarpOBrg_c::setBaseMtx() { #pragma pop /* ############################################################################################## */ +/* 80D2B8AC-80D2B8AC 0000B4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80D2B8B5 = "PORTAL_WARP_OBRIDGE"; +SECTION_DEAD static char const* const stringBase_80D2B8C9 = "PORTAL_WARP_OUT_OBRIDGE"; +#pragma pop + /* 80D2B938-80D2B940 -00001 0008+00 1/1 0/0 0/0 .data l_portal_warp_name */ SECTION_DATA static void* l_portal_warp_name[2] = { (void*)(((char*)&d_a_obj_warp_obrg__stringBase0) + 0x9), @@ -420,7 +433,7 @@ asm void daObjWarpOBrg_c::Create() { SECTION_RODATA static u8 const l_btk_idx[8] = { 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x0F, }; -COMPILER_STRIP_GATE(80D2B810, &l_btk_idx); +COMPILER_STRIP_GATE(0x80D2B810, &l_btk_idx); #pragma pop /* 80D2B818-80D2B824 000020 000A+02 0/1 0/0 0/0 .rodata l_beam_eff */ @@ -441,7 +454,7 @@ SECTION_RODATA static u8 const l_beam_eff[10 + 2 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D2B818, &l_beam_eff); +COMPILER_STRIP_GATE(0x80D2B818, &l_beam_eff); #pragma pop /* 80D2B824-80D2B830 00002C 000A+02 0/1 0/0 0/0 .rodata l_disapp_eff */ @@ -462,7 +475,7 @@ SECTION_RODATA static u8 const l_disapp_eff[10 + 2 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D2B824, &l_disapp_eff); +COMPILER_STRIP_GATE(0x80D2B824, &l_disapp_eff); #pragma pop /* 80D2B830-80D2B838 000038 0006+02 0/1 0/0 0/0 .rodata l_app_eff */ @@ -479,14 +492,14 @@ SECTION_RODATA static u8 const l_app_eff[6 + 2 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D2B830, &l_app_eff); +COMPILER_STRIP_GATE(0x80D2B830, &l_app_eff); #pragma pop /* 80D2B838-80D2B844 000040 000C+00 1/1 0/0 0/0 .rodata l_midna_wait_offset */ SECTION_RODATA static u8 const l_midna_wait_offset[12] = { 0x42, 0xC8, 0x00, 0x00, 0xC4, 0x9E, 0x20, 0x00, 0xC4, 0x3E, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D2B838, &l_midna_wait_offset); +COMPILER_STRIP_GATE(0x80D2B838, &l_midna_wait_offset); /* 80D2B844-80D2B848 00004C 0004+00 0/5 0/0 0/0 .rodata @3834 */ #pragma push @@ -497,7 +510,7 @@ SECTION_RODATA static u8 const lit_3834[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D2B844, &lit_3834); +COMPILER_STRIP_GATE(0x80D2B844, &lit_3834); #pragma pop /* 80D2B848-80D2B850 000050 0008+00 0/1 0/0 0/0 .rodata @3836 */ @@ -506,7 +519,18 @@ COMPILER_STRIP_GATE(80D2B844, &lit_3834); SECTION_RODATA static u8 const lit_3836[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D2B848, &lit_3836); +COMPILER_STRIP_GATE(0x80D2B848, &lit_3836); +#pragma pop + +/* 80D2B8AC-80D2B8AC 0000B4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80D2B8E1 = "WarpOB1"; +SECTION_DEAD static char const* const stringBase_80D2B8E9 = "WarpOB2"; +SECTION_DEAD static char const* const stringBase_80D2B8F1 = "WAIT"; +SECTION_DEAD static char const* const stringBase_80D2B8F6 = "OBJ_DISAPP"; +SECTION_DEAD static char const* const stringBase_80D2B901 = "OBJ_APP"; +SECTION_DEAD static char const* const stringBase_80D2B909 = "BEAM"; #pragma pop /* 80D2B940-80D2B948 -00001 0008+00 3/3 0/0 0/0 .data l_staff_name */ @@ -660,14 +684,14 @@ asm J3DFrameCtrl::~J3DFrameCtrl() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3882 = 10.0f; -COMPILER_STRIP_GATE(80D2B850, &lit_3882); +COMPILER_STRIP_GATE(0x80D2B850, &lit_3882); #pragma pop /* 80D2B854-80D2B858 00005C 0004+00 0/2 0/0 0/0 .rodata @3883 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3883 = 550.0f; -COMPILER_STRIP_GATE(80D2B854, &lit_3883); +COMPILER_STRIP_GATE(0x80D2B854, &lit_3883); #pragma pop /* 80D2B858-80D2B860 000060 0008+00 0/1 0/0 0/0 .rodata @3885 */ @@ -676,7 +700,7 @@ COMPILER_STRIP_GATE(80D2B854, &lit_3883); SECTION_RODATA static u8 const lit_3885[8] = { 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D2B858, &lit_3885); +COMPILER_STRIP_GATE(0x80D2B858, &lit_3885); #pragma pop /* 80D29E7C-80D2A008 00053C 018C+00 1/1 0/0 0/0 .text create1st__15daObjWarpOBrg_cFv */ @@ -716,7 +740,7 @@ asm void daObjWarpOBrg_c::event_proc_call() { SECTION_RODATA static u8 const lit_3999[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D2B860, &lit_3999); +COMPILER_STRIP_GATE(0x80D2B860, &lit_3999); #pragma pop /* 80D2B868-80D2B870 000070 0008+00 0/4 0/0 0/0 .rodata @4000 */ @@ -725,7 +749,7 @@ COMPILER_STRIP_GATE(80D2B860, &lit_3999); SECTION_RODATA static u8 const lit_4000[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D2B868, &lit_4000); +COMPILER_STRIP_GATE(0x80D2B868, &lit_4000); #pragma pop /* 80D2B870-80D2B878 000078 0008+00 0/4 0/0 0/0 .rodata @4001 */ @@ -734,28 +758,28 @@ COMPILER_STRIP_GATE(80D2B868, &lit_4000); SECTION_RODATA static u8 const lit_4001[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D2B870, &lit_4001); +COMPILER_STRIP_GATE(0x80D2B870, &lit_4001); #pragma pop /* 80D2B878-80D2B87C 000080 0004+00 0/2 0/0 0/0 .rodata @4002 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4002 = 5.0f; -COMPILER_STRIP_GATE(80D2B878, &lit_4002); +COMPILER_STRIP_GATE(0x80D2B878, &lit_4002); #pragma pop /* 80D2B87C-80D2B880 000084 0004+00 0/2 0/0 0/0 .rodata @4003 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4003 = 1.0f; -COMPILER_STRIP_GATE(80D2B87C, &lit_4003); +COMPILER_STRIP_GATE(0x80D2B87C, &lit_4003); #pragma pop /* 80D2B880-80D2B884 000088 0004+00 0/2 0/0 0/0 .rodata @4004 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4004 = -1.0f; -COMPILER_STRIP_GATE(80D2B880, &lit_4004); +COMPILER_STRIP_GATE(0x80D2B880, &lit_4004); #pragma pop /* 80D2A194-80D2A4CC 000854 0338+00 1/0 0/0 0/0 .text actionWait__15daObjWarpOBrg_cFv */ @@ -828,63 +852,69 @@ void daObjWarpOBrg_c::actionDead() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4599 = -10.0f; -COMPILER_STRIP_GATE(80D2B884, &lit_4599); +COMPILER_STRIP_GATE(0x80D2B884, &lit_4599); #pragma pop /* 80D2B888-80D2B88C 000090 0004+00 0/1 0/0 0/0 .rodata @4600 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4600 = -65.0f; -COMPILER_STRIP_GATE(80D2B888, &lit_4600); +COMPILER_STRIP_GATE(0x80D2B888, &lit_4600); #pragma pop /* 80D2B88C-80D2B890 000094 0004+00 0/1 0/0 0/0 .rodata @4601 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4601 = 55.0f; -COMPILER_STRIP_GATE(80D2B88C, &lit_4601); +COMPILER_STRIP_GATE(0x80D2B88C, &lit_4601); #pragma pop /* 80D2B890-80D2B894 000098 0004+00 0/1 0/0 0/0 .rodata @4602 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4602 = -500.0f; -COMPILER_STRIP_GATE(80D2B890, &lit_4602); +COMPILER_STRIP_GATE(0x80D2B890, &lit_4602); #pragma pop /* 80D2B894-80D2B898 00009C 0004+00 0/1 0/0 0/0 .rodata @4603 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4603 = 1.0f / 100.0f; -COMPILER_STRIP_GATE(80D2B894, &lit_4603); +COMPILER_STRIP_GATE(0x80D2B894, &lit_4603); #pragma pop /* 80D2B898-80D2B89C 0000A0 0004+00 0/1 0/0 0/0 .rodata @4604 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4604 = 40.0f; -COMPILER_STRIP_GATE(80D2B898, &lit_4604); +COMPILER_STRIP_GATE(0x80D2B898, &lit_4604); #pragma pop /* 80D2B89C-80D2B8A0 0000A4 0004+00 0/1 0/0 0/0 .rodata @4605 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4605 = 367.0f; -COMPILER_STRIP_GATE(80D2B89C, &lit_4605); +COMPILER_STRIP_GATE(0x80D2B89C, &lit_4605); #pragma pop /* 80D2B8A0-80D2B8A4 0000A8 0004+00 0/1 0/0 0/0 .rodata @4606 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4606 = 120.0f; -COMPILER_STRIP_GATE(80D2B8A0, &lit_4606); +COMPILER_STRIP_GATE(0x80D2B8A0, &lit_4606); #pragma pop /* 80D2B8A4-80D2B8A8 0000AC 0004+00 0/1 0/0 0/0 .rodata @4607 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4607 = 247.0f; -COMPILER_STRIP_GATE(80D2B8A4, &lit_4607); +COMPILER_STRIP_GATE(0x80D2B8A4, &lit_4607); +#pragma pop + +/* 80D2B8AC-80D2B8AC 0000B4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80D2B90E = "Timer"; #pragma pop /* 80D2AA34-80D2B3BC 0010F4 0988+00 2/2 0/0 0/0 .text demoProc__15daObjWarpOBrg_cFv */ @@ -910,7 +940,7 @@ asm void daObjWarpOBrg_c::checkTalkDistance() { /* ############################################################################################## */ /* 80D2B8A8-80D2B8AC 0000B0 0004+00 1/1 0/0 0/0 .rodata @4666 */ SECTION_RODATA static f32 const lit_4666 = 250.0f; -COMPILER_STRIP_GATE(80D2B8A8, &lit_4666); +COMPILER_STRIP_GATE(0x80D2B8A8, &lit_4666); /* 80D2B534-80D2B5C8 001BF4 0094+00 1/1 0/0 0/0 .text calcMidnaWaitPos__15daObjWarpOBrg_cFv */ #pragma push @@ -1005,24 +1035,10 @@ static asm void daObjWarpOBrg_MoveBGDraw(daObjWarpOBrg_c* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80D2B7D4(u8* param_0) { +extern "C" asm void func_80D2B7D4(void* _this, u8* param_0) { nofralloc #include "asm/rel/d/a/obj/d_a_obj_warp_obrg/d_a_obj_warp_obrg/func_80D2B7D4.s" } #pragma pop -/* 80D2B8AC-80D2B914 0000B4 0068+00 6/2 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80D2B8AC = "Obj_obrg"; -SECTION_DEAD static char const* const stringBase_80D2B8B5 = "PORTAL_WARP_OBRIDGE"; -SECTION_DEAD static char const* const stringBase_80D2B8C9 = "PORTAL_WARP_OUT_OBRIDGE"; -SECTION_DEAD static char const* const stringBase_80D2B8E1 = "WarpOB1"; -SECTION_DEAD static char const* const stringBase_80D2B8E9 = "WarpOB2"; -SECTION_DEAD static char const* const stringBase_80D2B8F1 = "WAIT"; -SECTION_DEAD static char const* const stringBase_80D2B8F6 = "OBJ_DISAPP"; -SECTION_DEAD static char const* const stringBase_80D2B901 = "OBJ_APP"; -SECTION_DEAD static char const* const stringBase_80D2B909 = "BEAM"; -SECTION_DEAD static char const* const stringBase_80D2B90E = "Timer"; -#pragma pop +/* 80D2B8AC-80D2B8AC 0000B4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_waterGate/d_a_obj_waterGate.cpp b/rel/d/a/obj/d_a_obj_waterGate/d_a_obj_waterGate.cpp index 8017cba5900..4b82b731280 100644 --- a/rel/d/a/obj/d_a_obj_waterGate/d_a_obj_waterGate.cpp +++ b/rel/d/a/obj/d_a_obj_waterGate/d_a_obj_waterGate.cpp @@ -87,10 +87,10 @@ struct dBgS_MoveBgActor { /* 80078950 */ void MoveBGExecute(); }; -struct Vec {}; - struct JAISoundID {}; +struct Vec {}; + struct Z2SeMgr { /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); /* 802AC50C */ void seStartLevel(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); @@ -179,7 +179,7 @@ extern "C" void __register_global_object(); /* ############################################################################################## */ /* 80D2C46C-80D2C470 000000 0004+00 3/3 0/0 0/0 .rodata @3625 */ SECTION_RODATA static f32 const lit_3625 = 4.0f; -COMPILER_STRIP_GATE(80D2C46C, &lit_3625); +COMPILER_STRIP_GATE(0x80D2C46C, &lit_3625); /* 80D2C498-80D2C4A4 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { @@ -329,6 +329,13 @@ asm void daWtGate_c::setBaseMtx() { } #pragma pop +/* ############################################################################################## */ +/* 80D2C48C-80D2C48C 000020 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80D2C48C = "S_Zsuimon"; +#pragma pop + /* 80D2BC94-80D2BD00 0001F4 006C+00 1/0 0/0 0/0 .text CreateHeap__10daWtGate_cFv */ #pragma push #pragma optimization_level 0 @@ -342,13 +349,13 @@ asm void daWtGate_c::CreateHeap() { /* ############################################################################################## */ /* 80D2C470-80D2C474 000004 0004+00 1/1 0/0 0/0 .rodata @3712 */ SECTION_RODATA static f32 const lit_3712 = 10.0f; -COMPILER_STRIP_GATE(80D2C470, &lit_3712); +COMPILER_STRIP_GATE(0x80D2C470, &lit_3712); /* 80D2C474-80D2C47C 000008 0008+00 1/1 0/0 0/0 .rodata @3714 */ SECTION_RODATA static u8 const lit_3714[8] = { 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D2C474, &lit_3714); +COMPILER_STRIP_GATE(0x80D2C474, &lit_3714); /* 80D2BD00-80D2BE7C 000260 017C+00 1/1 0/0 0/0 .text create__10daWtGate_cFv */ #pragma push @@ -425,14 +432,14 @@ asm void daWtGate_c::init_modeOpen() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3781 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(80D2C47C, &lit_3781); +COMPILER_STRIP_GATE(0x80D2C47C, &lit_3781); #pragma pop /* 80D2C480-80D2C484 000014 0004+00 0/2 0/0 0/0 .rodata @3782 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3782 = 1.0f; -COMPILER_STRIP_GATE(80D2C480, &lit_3782); +COMPILER_STRIP_GATE(0x80D2C480, &lit_3782); #pragma pop /* 80D2C484-80D2C488 000018 0004+00 0/2 0/0 0/0 .rodata @3783 */ @@ -444,14 +451,14 @@ SECTION_RODATA static u8 const lit_3783[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D2C484, &lit_3783); +COMPILER_STRIP_GATE(0x80D2C484, &lit_3783); #pragma pop /* 80D2C488-80D2C48C 00001C 0004+00 0/2 0/0 0/0 .rodata @3784 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3784 = -1.0f; -COMPILER_STRIP_GATE(80D2C488, &lit_3784); +COMPILER_STRIP_GATE(0x80D2C488, &lit_3784); #pragma pop /* 80D2C02C-80D2C134 00058C 0108+00 1/0 0/0 0/0 .text modeOpen__10daWtGate_cFv */ @@ -581,12 +588,7 @@ asm void __sinit_d_a_obj_waterGate_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80D2C41C = (void*)__sinit_d_a_obj_waterGate_cpp; +REGISTER_CTORS(0x80D2C41C, __sinit_d_a_obj_waterGate_cpp); #pragma pop -/* 80D2C48C-80D2C496 000020 000A+00 3/3 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80D2C48C = "S_Zsuimon"; -#pragma pop +/* 80D2C48C-80D2C48C 000020 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_waterPillar/d_a_obj_waterPillar.cpp b/rel/d/a/obj/d_a_obj_waterPillar/d_a_obj_waterPillar.cpp index b59ebf6823e..0f402acd483 100644 --- a/rel/d/a/obj/d_a_obj_waterPillar/d_a_obj_waterPillar.cpp +++ b/rel/d/a/obj/d_a_obj_waterPillar/d_a_obj_waterPillar.cpp @@ -122,10 +122,10 @@ struct dRes_control_c { struct dPa_levelEcallBack {}; -struct _GXColor {}; - struct csXyz {}; +struct _GXColor {}; + struct dPa_control_c { /* 8004D4CC */ void set(u32, u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, @@ -408,55 +408,55 @@ extern "C" void __register_global_object(); /* ############################################################################################## */ /* 80D2E770-80D2E774 000000 0004+00 16/16 0/0 0/0 .rodata @3645 */ SECTION_RODATA static f32 const lit_3645 = 1.0f; -COMPILER_STRIP_GATE(80D2E770, &lit_3645); +COMPILER_STRIP_GATE(0x80D2E770, &lit_3645); /* 80D2E774-80D2E778 000004 0004+00 0/1 0/0 0/0 .rodata @3646 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3646 = 2000.0f; -COMPILER_STRIP_GATE(80D2E774, &lit_3646); +COMPILER_STRIP_GATE(0x80D2E774, &lit_3646); #pragma pop /* 80D2E778-80D2E77C 000008 0004+00 0/1 0/0 0/0 .rodata @3647 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3647 = 5000.0f; -COMPILER_STRIP_GATE(80D2E778, &lit_3647); +COMPILER_STRIP_GATE(0x80D2E778, &lit_3647); #pragma pop /* 80D2E77C-80D2E780 00000C 0004+00 0/1 0/0 0/0 .rodata @3648 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3648 = 1000.0f; -COMPILER_STRIP_GATE(80D2E77C, &lit_3648); +COMPILER_STRIP_GATE(0x80D2E77C, &lit_3648); #pragma pop /* 80D2E780-80D2E784 000010 0004+00 0/1 0/0 0/0 .rodata @3649 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3649 = 20.0f; -COMPILER_STRIP_GATE(80D2E780, &lit_3649); +COMPILER_STRIP_GATE(0x80D2E780, &lit_3649); #pragma pop /* 80D2E784-80D2E788 000014 0004+00 0/1 0/0 0/0 .rodata @3650 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3650 = 25.0f; -COMPILER_STRIP_GATE(80D2E784, &lit_3650); +COMPILER_STRIP_GATE(0x80D2E784, &lit_3650); #pragma pop /* 80D2E788-80D2E78C 000018 0004+00 0/1 0/0 0/0 .rodata @3651 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3651 = 1.0f / 100.0f; -COMPILER_STRIP_GATE(80D2E788, &lit_3651); +COMPILER_STRIP_GATE(0x80D2E788, &lit_3651); #pragma pop /* 80D2E78C-80D2E790 00001C 0004+00 0/2 0/0 0/0 .rodata @3652 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3652 = 1.0f / 20.0f; -COMPILER_STRIP_GATE(80D2E78C, &lit_3652); +COMPILER_STRIP_GATE(0x80D2E78C, &lit_3652); #pragma pop /* 80D2E84C-80D2E858 000000 000C+00 2/2 0/0 0/0 .data cNullVec__6Z2Calc */ @@ -796,6 +796,13 @@ asm void daWtPillar_c::createHeapCallBack(fopAc_ac_c* param_0) { } #pragma pop +/* ############################################################################################## */ +/* 80D2E844-80D2E844 0000D4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80D2E844 = "efWater"; +#pragma pop + /* 80D2C858-80D2C960 000278 0108+00 1/1 0/0 0/0 .text CreateHeap__12daWtPillar_cFv */ #pragma push #pragma optimization_level 0 @@ -813,7 +820,7 @@ SECTION_RODATA u8 const daWtPillar_c::mCcDObjInfo[48] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D2E790, &daWtPillar_c::mCcDObjInfo); +COMPILER_STRIP_GATE(0x80D2E790, &daWtPillar_c::mCcDObjInfo); /* 80D2E7C0-80D2E7F0 000050 0030+00 1/1 0/0 0/0 .rodata mCcDObjCoInfo__12daWtPillar_c */ SECTION_RODATA u8 const daWtPillar_c::mCcDObjCoInfo[48] = { @@ -821,34 +828,34 @@ SECTION_RODATA u8 const daWtPillar_c::mCcDObjCoInfo[48] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x79, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D2E7C0, &daWtPillar_c::mCcDObjCoInfo); +COMPILER_STRIP_GATE(0x80D2E7C0, &daWtPillar_c::mCcDObjCoInfo); /* 80D2E7F0-80D2E7F4 000080 0004+00 0/2 0/0 0/0 .rodata @3742 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3742 = 150.0f; -COMPILER_STRIP_GATE(80D2E7F0, &lit_3742); +COMPILER_STRIP_GATE(0x80D2E7F0, &lit_3742); #pragma pop /* 80D2E7F4-80D2E7F8 000084 0004+00 0/3 0/0 0/0 .rodata @3743 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3743 = 5.0f; -COMPILER_STRIP_GATE(80D2E7F4, &lit_3743); +COMPILER_STRIP_GATE(0x80D2E7F4, &lit_3743); #pragma pop /* 80D2E7F8-80D2E7FC 000088 0004+00 0/1 0/0 0/0 .rodata @3744 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3744 = 10000.0f; -COMPILER_STRIP_GATE(80D2E7F8, &lit_3744); +COMPILER_STRIP_GATE(0x80D2E7F8, &lit_3744); #pragma pop /* 80D2E7FC-80D2E800 00008C 0004+00 0/4 0/0 0/0 .rodata @3745 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3745 = 100.0f; -COMPILER_STRIP_GATE(80D2E7FC, &lit_3745); +COMPILER_STRIP_GATE(0x80D2E7FC, &lit_3745); #pragma pop /* 80D2E800-80D2E808 000090 0004+04 2/11 0/0 0/0 .rodata @3746 */ @@ -863,7 +870,7 @@ SECTION_RODATA static u8 const lit_3746[4 + 4 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D2E800, &lit_3746); +COMPILER_STRIP_GATE(0x80D2E800, &lit_3746); /* 80D2E808-80D2E810 000098 0008+00 0/4 0/0 0/0 .rodata @3748 */ #pragma push @@ -871,7 +878,7 @@ COMPILER_STRIP_GATE(80D2E800, &lit_3746); SECTION_RODATA static u8 const lit_3748[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D2E808, &lit_3748); +COMPILER_STRIP_GATE(0x80D2E808, &lit_3748); #pragma pop /* 80D2C960-80D2CC0C 000380 02AC+00 1/1 0/0 0/0 .text create__12daWtPillar_cFv */ @@ -889,14 +896,14 @@ asm void daWtPillar_c::create() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3947 = 140.0f; -COMPILER_STRIP_GATE(80D2E810, &lit_3947); +COMPILER_STRIP_GATE(0x80D2E810, &lit_3947); #pragma pop /* 80D2E814-80D2E818 0000A4 0004+00 0/1 0/0 0/0 .rodata @3948 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_3948 = 0x43360B61; -COMPILER_STRIP_GATE(80D2E814, &lit_3948); +COMPILER_STRIP_GATE(0x80D2E814, &lit_3948); #pragma pop /* 80D2EB30-80D2EB3C 000008 000C+00 1/1 0/0 0/0 .bss @3635 */ @@ -944,7 +951,7 @@ asm void daWtPillar_c::effectSet() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4088 = 500.0f; -COMPILER_STRIP_GATE(80D2E818, &lit_4088); +COMPILER_STRIP_GATE(0x80D2E818, &lit_4088); #pragma pop /* 80D2D278-80D2D3FC 000C98 0184+00 1/1 0/0 0/0 .text effectSet2__12daWtPillar_cFv */ @@ -993,19 +1000,19 @@ asm void daWtPillar_c::eventStart() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4124 = 30.0f; -COMPILER_STRIP_GATE(80D2E81C, &lit_4124); +COMPILER_STRIP_GATE(0x80D2E81C, &lit_4124); #pragma pop /* 80D2E820-80D2E824 0000B0 0004+00 0/1 0/0 0/0 .rodata @4125 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4125 = 0.5f; -COMPILER_STRIP_GATE(80D2E820, &lit_4125); +COMPILER_STRIP_GATE(0x80D2E820, &lit_4125); #pragma pop /* 80D2E824-80D2E828 0000B4 0004+00 3/8 0/0 0/0 .rodata @4126 */ SECTION_RODATA static f32 const lit_4126 = -1.0f; -COMPILER_STRIP_GATE(80D2E824, &lit_4126); +COMPILER_STRIP_GATE(0x80D2E824, &lit_4126); /* 80D2D4AC-80D2D588 000ECC 00DC+00 1/1 0/0 0/0 .text actionWaitInit__12daWtPillar_cFv */ #pragma push @@ -1032,14 +1039,14 @@ asm void daWtPillar_c::actionWait() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4151 = 50.0f; -COMPILER_STRIP_GATE(80D2E828, &lit_4151); +COMPILER_STRIP_GATE(0x80D2E828, &lit_4151); #pragma pop /* 80D2E82C-80D2E830 0000BC 0004+00 0/1 0/0 0/0 .rodata @4152 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4152 = 300.0f; -COMPILER_STRIP_GATE(80D2E82C, &lit_4152); +COMPILER_STRIP_GATE(0x80D2E82C, &lit_4152); #pragma pop /* 80D2D5C0-80D2D6C4 000FE0 0104+00 3/3 0/0 0/0 .text actionUpFirstInit__12daWtPillar_cFv @@ -1058,7 +1065,7 @@ asm void daWtPillar_c::actionUpFirstInit() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4161 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(80D2E830, &lit_4161); +COMPILER_STRIP_GATE(0x80D2E830, &lit_4161); #pragma pop /* 80D2D6C4-80D2D73C 0010E4 0078+00 1/0 0/0 0/0 .text actionUpFirst__12daWtPillar_cFv */ @@ -1097,7 +1104,7 @@ asm void daWtPillar_c::actionUpFirstWait() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4182 = -250.0f; -COMPILER_STRIP_GATE(80D2E834, &lit_4182); +COMPILER_STRIP_GATE(0x80D2E834, &lit_4182); #pragma pop /* 80D2D7B8-80D2D850 0011D8 0098+00 1/1 0/0 0/0 .text actionUpInit__12daWtPillar_cFv */ @@ -1197,21 +1204,21 @@ asm void daWtPillar_c::actionRockOnInit() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4271 = 250.0f; -COMPILER_STRIP_GATE(80D2E838, &lit_4271); +COMPILER_STRIP_GATE(0x80D2E838, &lit_4271); #pragma pop /* 80D2E83C-80D2E840 0000CC 0004+00 0/1 0/0 0/0 .rodata @4272 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4272 = 3.0f / 5.0f; -COMPILER_STRIP_GATE(80D2E83C, &lit_4272); +COMPILER_STRIP_GATE(0x80D2E83C, &lit_4272); #pragma pop /* 80D2E840-80D2E844 0000D0 0004+00 0/1 0/0 0/0 .rodata @4273 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4273 = 10.0f; -COMPILER_STRIP_GATE(80D2E840, &lit_4273); +COMPILER_STRIP_GATE(0x80D2E840, &lit_4273); #pragma pop /* 80D2DC2C-80D2DD0C 00164C 00E0+00 1/0 0/0 0/0 .text actionRockOn__12daWtPillar_cFv */ @@ -1340,7 +1347,7 @@ asm void __sinit_d_a_obj_waterPillar_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80D2DF90 = (void*)__sinit_d_a_obj_waterPillar_cpp; +REGISTER_CTORS(0x80D2DF90, __sinit_d_a_obj_waterPillar_cpp); #pragma pop /* 80D2E034-80D2E03C 001A54 0008+00 1/0 0/0 0/0 .text @36@__dt__12dBgS_ObjAcchFv */ @@ -1500,9 +1507,4 @@ bool dEvLib_callback_c::eventStart() { return true; } -/* 80D2E844-80D2E84C 0000D4 0008+00 3/3 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80D2E844 = "efWater"; -#pragma pop +/* 80D2E844-80D2E844 0000D4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_waterfall/d_a_obj_waterfall.cpp b/rel/d/a/obj/d_a_obj_waterfall/d_a_obj_waterfall.cpp index 997e12e5621..3eb8f95fc4b 100644 --- a/rel/d/a/obj/d_a_obj_waterfall/d_a_obj_waterfall.cpp +++ b/rel/d/a/obj/d_a_obj_waterfall/d_a_obj_waterfall.cpp @@ -218,20 +218,20 @@ SECTION_RODATA static u8 const lit_3807[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D2FD58, &lit_3807); +COMPILER_STRIP_GATE(0x80D2FD58, &lit_3807); /* 80D2FD5C-80D2FD60 000004 0004+00 0/4 0/0 0/0 .rodata @3808 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3808 = 50.0f; -COMPILER_STRIP_GATE(80D2FD5C, &lit_3808); +COMPILER_STRIP_GATE(0x80D2FD5C, &lit_3808); #pragma pop /* 80D2FD60-80D2FD64 000008 0004+00 0/4 0/0 0/0 .rodata @3809 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3809 = 100.0f; -COMPILER_STRIP_GATE(80D2FD60, &lit_3809); +COMPILER_STRIP_GATE(0x80D2FD60, &lit_3809); #pragma pop /* 80D2ED14-80D2EFF8 000174 02E4+00 1/1 0/0 0/0 .text search_bomb__16daObjWaterFall_cFv @@ -292,14 +292,20 @@ asm void daObjWaterFall_c::setBaseMtx() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3953 = -50.0f; -COMPILER_STRIP_GATE(80D2FD64, &lit_3953); +COMPILER_STRIP_GATE(0x80D2FD64, &lit_3953); #pragma pop /* 80D2FD68-80D2FD6C 000010 0004+00 0/2 0/0 0/0 .rodata @3954 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3954 = 10.0f; -COMPILER_STRIP_GATE(80D2FD68, &lit_3954); +COMPILER_STRIP_GATE(0x80D2FD68, &lit_3954); +#pragma pop + +/* 80D2FD7C-80D2FD7C 000024 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80D2FD7C = "sample"; #pragma pop /* 80D2FD84-80D2FD88 -00001 0004+00 1/1 0/0 0/0 .data l_arcName */ @@ -465,28 +471,28 @@ asm void daObjWaterFall_c::execute() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4203 = 25.0f; -COMPILER_STRIP_GATE(80D2FD6C, &lit_4203); +COMPILER_STRIP_GATE(0x80D2FD6C, &lit_4203); #pragma pop /* 80D2FD70-80D2FD74 000018 0004+00 0/1 0/0 0/0 .rodata @4204 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4204 = -10.0f; -COMPILER_STRIP_GATE(80D2FD70, &lit_4204); +COMPILER_STRIP_GATE(0x80D2FD70, &lit_4204); #pragma pop /* 80D2FD74-80D2FD78 00001C 0004+00 0/1 0/0 0/0 .rodata @4205 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4205 = 60.0f; -COMPILER_STRIP_GATE(80D2FD74, &lit_4205); +COMPILER_STRIP_GATE(0x80D2FD74, &lit_4205); #pragma pop /* 80D2FD78-80D2FD7C 000020 0004+00 0/1 0/0 0/0 .rodata @4206 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4206 = -60.0f; -COMPILER_STRIP_GATE(80D2FD78, &lit_4206); +COMPILER_STRIP_GATE(0x80D2FD78, &lit_4206); #pragma pop /* 80D2FA6C-80D2FC94 000ECC 0228+00 1/1 0/0 0/0 .text push_player__16daObjWaterFall_cFv @@ -557,9 +563,4 @@ static asm void daObjWaterFall_Create(fopAc_ac_c* param_0) { } #pragma pop -/* 80D2FD7C-80D2FD83 000024 0007+00 1/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80D2FD7C = "sample"; -#pragma pop +/* 80D2FD7C-80D2FD7C 000024 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_wchain/d_a_obj_wchain.cpp b/rel/d/a/obj/d_a_obj_wchain/d_a_obj_wchain.cpp index f9d7937e8ee..dd6d1e38f6c 100644 --- a/rel/d/a/obj/d_a_obj_wchain/d_a_obj_wchain.cpp +++ b/rel/d/a/obj/d_a_obj_wchain/d_a_obj_wchain.cpp @@ -243,7 +243,7 @@ SECTION_RODATA static u8 const l_arcName[7 + 1 /* padding */] = { /* padding */ 0x00, }; -COMPILER_STRIP_GATE(80D31924, &l_arcName); +COMPILER_STRIP_GATE(0x80D31924, &l_arcName); /* 80D2FEF8-80D2FF9C 000078 00A4+00 1/1 0/0 0/0 .text createHeap__13daObjWchain_cFv */ #pragma push @@ -270,63 +270,63 @@ static asm void daObjWchain_createHeap(fopAc_ac_c* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3744 = -200.0f; -COMPILER_STRIP_GATE(80D3192C, &lit_3744); +COMPILER_STRIP_GATE(0x80D3192C, &lit_3744); #pragma pop /* 80D31930-80D31934 00000C 0004+00 0/1 0/0 0/0 .rodata @3745 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3745 = -45.0f; -COMPILER_STRIP_GATE(80D31930, &lit_3745); +COMPILER_STRIP_GATE(0x80D31930, &lit_3745); #pragma pop /* 80D31934-80D31938 000010 0004+00 0/1 0/0 0/0 .rodata @3746 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3746 = 200.0f; -COMPILER_STRIP_GATE(80D31934, &lit_3746); +COMPILER_STRIP_GATE(0x80D31934, &lit_3746); #pragma pop /* 80D31938-80D3193C 000014 0004+00 0/1 0/0 0/0 .rodata @3747 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3747 = 800.0f; -COMPILER_STRIP_GATE(80D31938, &lit_3747); +COMPILER_STRIP_GATE(0x80D31938, &lit_3747); #pragma pop /* 80D3193C-80D31940 000018 0004+00 0/2 0/0 0/0 .rodata @3748 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3748 = 53.75f; -COMPILER_STRIP_GATE(80D3193C, &lit_3748); +COMPILER_STRIP_GATE(0x80D3193C, &lit_3748); #pragma pop /* 80D31940-80D31944 00001C 0004+00 0/1 0/0 0/0 .rodata @3749 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3749 = 280.0f; -COMPILER_STRIP_GATE(80D31940, &lit_3749); +COMPILER_STRIP_GATE(0x80D31940, &lit_3749); #pragma pop /* 80D31944-80D31948 000020 0004+00 0/2 0/0 0/0 .rodata @3750 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3750 = 100.0f; -COMPILER_STRIP_GATE(80D31944, &lit_3750); +COMPILER_STRIP_GATE(0x80D31944, &lit_3750); #pragma pop /* 80D31948-80D3194C 000024 0004+00 0/2 0/0 0/0 .rodata @3751 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3751 = 250.0f; -COMPILER_STRIP_GATE(80D31948, &lit_3751); +COMPILER_STRIP_GATE(0x80D31948, &lit_3751); #pragma pop /* 80D3194C-80D31950 000028 0004+00 0/2 0/0 0/0 .rodata @3752 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3752 = 600.0f; -COMPILER_STRIP_GATE(80D3194C, &lit_3752); +COMPILER_STRIP_GATE(0x80D3194C, &lit_3752); #pragma pop /* 80D31950-80D31954 00002C 0004+00 0/5 0/0 0/0 .rodata @3753 */ @@ -338,35 +338,35 @@ SECTION_RODATA static u8 const lit_3753[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D31950, &lit_3753); +COMPILER_STRIP_GATE(0x80D31950, &lit_3753); #pragma pop /* 80D31954-80D31958 000030 0004+00 0/1 0/0 0/0 .rodata @3754 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3754 = -7.0f; -COMPILER_STRIP_GATE(80D31954, &lit_3754); +COMPILER_STRIP_GATE(0x80D31954, &lit_3754); #pragma pop /* 80D31958-80D3195C 000034 0004+00 0/1 0/0 0/0 .rodata @3755 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3755 = 16384.0f; -COMPILER_STRIP_GATE(80D31958, &lit_3755); +COMPILER_STRIP_GATE(0x80D31958, &lit_3755); #pragma pop /* 80D3195C-80D31960 000038 0004+00 0/1 0/0 0/0 .rodata @3756 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3756 = 2048.0f; -COMPILER_STRIP_GATE(80D3195C, &lit_3756); +COMPILER_STRIP_GATE(0x80D3195C, &lit_3756); #pragma pop /* 80D31960-80D31964 00003C 0004+00 0/3 0/0 0/0 .rodata @3757 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3757 = 17.5f; -COMPILER_STRIP_GATE(80D31960, &lit_3757); +COMPILER_STRIP_GATE(0x80D31960, &lit_3757); #pragma pop /* 80D31964-80D3196C 000040 0008+00 0/2 0/0 0/0 .rodata @3759 */ @@ -375,7 +375,7 @@ COMPILER_STRIP_GATE(80D31960, &lit_3757); SECTION_RODATA static u8 const lit_3759[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D31964, &lit_3759); +COMPILER_STRIP_GATE(0x80D31964, &lit_3759); #pragma pop /* 80D319E4-80D31A04 -00001 0020+00 1/0 0/0 0/0 .data l_daObjWchain_Method */ @@ -487,14 +487,14 @@ static asm void daObjWchain_Delete(daObjWchain_c* param_0) { SECTION_RODATA static u8 const eyeOffset[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0x57, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D3196C, &eyeOffset); +COMPILER_STRIP_GATE(0x80D3196C, &eyeOffset); #pragma pop /* 80D31978-80D3197C 000054 0004+00 0/2 0/0 0/0 .rodata @3819 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3819 = 8.75f; -COMPILER_STRIP_GATE(80D31978, &lit_3819); +COMPILER_STRIP_GATE(0x80D31978, &lit_3819); #pragma pop /* 80D30534-80D305E4 0006B4 00B0+00 2/2 0/0 0/0 .text setMatrix__13daObjWchain_cFv */ @@ -514,7 +514,7 @@ asm void daObjWchain_c::setMatrix() { SECTION_RODATA static u8 const lit_3863[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D3197C, &lit_3863); +COMPILER_STRIP_GATE(0x80D3197C, &lit_3863); #pragma pop /* 80D31984-80D3198C 000060 0008+00 0/2 0/0 0/0 .rodata @3864 */ @@ -523,7 +523,7 @@ COMPILER_STRIP_GATE(80D3197C, &lit_3863); SECTION_RODATA static u8 const lit_3864[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D31984, &lit_3864); +COMPILER_STRIP_GATE(0x80D31984, &lit_3864); #pragma pop /* 80D3198C-80D31994 000068 0008+00 0/2 0/0 0/0 .rodata @3865 */ @@ -532,21 +532,21 @@ COMPILER_STRIP_GATE(80D31984, &lit_3864); SECTION_RODATA static u8 const lit_3865[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D3198C, &lit_3865); +COMPILER_STRIP_GATE(0x80D3198C, &lit_3865); #pragma pop /* 80D31994-80D31998 000070 0004+00 0/1 0/0 0/0 .rodata @3866 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3866 = 512.0f; -COMPILER_STRIP_GATE(80D31994, &lit_3866); +COMPILER_STRIP_GATE(0x80D31994, &lit_3866); #pragma pop /* 80D31998-80D3199C 000074 0004+00 0/2 0/0 0/0 .rodata @3867 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3867 = 0.5f; -COMPILER_STRIP_GATE(80D31998, &lit_3867); +COMPILER_STRIP_GATE(0x80D31998, &lit_3867); #pragma pop /* 80D305E4-80D3080C 000764 0228+00 1/1 0/0 0/0 .text getChainAngleZ__13daObjWchain_cFP4cXyzi */ @@ -566,7 +566,7 @@ asm void daObjWchain_c::getChainAngleZ(cXyz* param_0, int param_1) { SECTION_RODATA static u8 const currentOffset[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC2, 0x57, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D3199C, ¤tOffset); +COMPILER_STRIP_GATE(0x80D3199C, ¤tOffset); #pragma pop /* 80D319A8-80D319B4 000084 000C+00 0/1 0/0 0/0 .rodata chainOffset$3873 */ @@ -575,63 +575,63 @@ COMPILER_STRIP_GATE(80D3199C, ¤tOffset); SECTION_RODATA static u8 const chainOffset[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC1, 0x8C, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D319A8, &chainOffset); +COMPILER_STRIP_GATE(0x80D319A8, &chainOffset); #pragma pop /* 80D319B4-80D319B8 000090 0004+00 0/1 0/0 0/0 .rodata @4154 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4154 = 0.75f; -COMPILER_STRIP_GATE(80D319B4, &lit_4154); +COMPILER_STRIP_GATE(0x80D319B4, &lit_4154); #pragma pop /* 80D319B8-80D319BC 000094 0004+00 0/2 0/0 0/0 .rodata @4155 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4155 = 1.0f; -COMPILER_STRIP_GATE(80D319B8, &lit_4155); +COMPILER_STRIP_GATE(0x80D319B8, &lit_4155); #pragma pop /* 80D319BC-80D319C0 000098 0004+00 0/1 0/0 0/0 .rodata @4156 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4156 = 5.0f; -COMPILER_STRIP_GATE(80D319BC, &lit_4156); +COMPILER_STRIP_GATE(0x80D319BC, &lit_4156); #pragma pop /* 80D319C0-80D319C4 00009C 0004+00 0/1 0/0 0/0 .rodata @4157 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4157 = 30.0f; -COMPILER_STRIP_GATE(80D319C0, &lit_4157); +COMPILER_STRIP_GATE(0x80D319C0, &lit_4157); #pragma pop /* 80D319C4-80D319C8 0000A0 0004+00 0/1 0/0 0/0 .rodata @4158 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4158 = 2.0f / 35.0f; -COMPILER_STRIP_GATE(80D319C4, &lit_4158); +COMPILER_STRIP_GATE(0x80D319C4, &lit_4158); #pragma pop /* 80D319C8-80D319CC 0000A4 0004+00 0/1 0/0 0/0 .rodata @4159 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4159 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(80D319C8, &lit_4159); +COMPILER_STRIP_GATE(0x80D319C8, &lit_4159); #pragma pop /* 80D319CC-80D319D0 0000A8 0004+00 0/1 0/0 0/0 .rodata @4160 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4160 = 0x40C90FDB; -COMPILER_STRIP_GATE(80D319CC, &lit_4160); +COMPILER_STRIP_GATE(0x80D319CC, &lit_4160); #pragma pop /* 80D319D0-80D319D4 0000AC 0004+00 0/1 0/0 0/0 .rodata @4161 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4161 = 1.0f / 25.0f; -COMPILER_STRIP_GATE(80D319D0, &lit_4161); +COMPILER_STRIP_GATE(0x80D319D0, &lit_4161); #pragma pop /* 80D3080C-80D310AC 00098C 08A0+00 1/1 0/0 0/0 .text setChainPos__13daObjWchain_cFv */ @@ -649,21 +649,21 @@ asm void daObjWchain_c::setChainPos() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4252 = -1.0f; -COMPILER_STRIP_GATE(80D319D4, &lit_4252); +COMPILER_STRIP_GATE(0x80D319D4, &lit_4252); #pragma pop /* 80D319D8-80D319DC 0000B4 0004+00 0/1 0/0 0/0 .rodata @4253 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4253 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(80D319D8, &lit_4253); +COMPILER_STRIP_GATE(0x80D319D8, &lit_4253); #pragma pop /* 80D319DC-80D319E0 0000B8 0004+00 0/1 0/0 0/0 .rodata @4254 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4254 = 15.0f; -COMPILER_STRIP_GATE(80D319DC, &lit_4254); +COMPILER_STRIP_GATE(0x80D319DC, &lit_4254); #pragma pop /* 80D310AC-80D313F8 00122C 034C+00 1/1 0/0 0/0 .text execute__13daObjWchain_cFv */ @@ -691,7 +691,7 @@ static asm void daObjWchain_Execute(daObjWchain_c* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4364 = -8.75f; -COMPILER_STRIP_GATE(80D319E0, &lit_4364); +COMPILER_STRIP_GATE(0x80D319E0, &lit_4364); #pragma pop /* 80D31418-80D31810 001598 03F8+00 1/0 0/0 0/0 .text draw__19daObjWchain_shape_cFv */ diff --git a/rel/d/a/obj/d_a_obj_wdStick/d_a_obj_wdStick.cpp b/rel/d/a/obj/d_a_obj_wdStick/d_a_obj_wdStick.cpp index 4ff57bc0002..91c1a327c47 100644 --- a/rel/d/a/obj/d_a_obj_wdStick/d_a_obj_wdStick.cpp +++ b/rel/d/a/obj/d_a_obj_wdStick/d_a_obj_wdStick.cpp @@ -91,10 +91,10 @@ struct dRes_control_c { struct dPa_levelEcallBack {}; -struct _GXColor {}; - struct csXyz {}; +struct _GXColor {}; + struct dPa_control_c { struct level_c { /* 8004B918 */ void getEmitter(u32); @@ -617,6 +617,13 @@ asm void daWdStick_c::setBaseMtx() { } #pragma pop +/* ############################################################################################## */ +/* 80D34210-80D34210 0000D8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80D34210 = "H_Kinobou"; +#pragma pop + /* 80D31C58-80D31CC4 0001F8 006C+00 1/0 0/0 0/0 .text CreateHeap__11daWdStick_cFv */ #pragma push #pragma optimization_level 0 @@ -634,31 +641,31 @@ SECTION_RODATA u8 const daWdStick_c::mCcDObjInfo[48] = { 0xD8, 0xFB, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x1F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D34138, &daWdStick_c::mCcDObjInfo); +COMPILER_STRIP_GATE(0x80D34138, &daWdStick_c::mCcDObjInfo); /* 80D34168-80D3416C 000030 0004+00 0/2 0/0 0/0 .rodata @3775 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3775 = 10.0f; -COMPILER_STRIP_GATE(80D34168, &lit_3775); +COMPILER_STRIP_GATE(0x80D34168, &lit_3775); #pragma pop /* 80D3416C-80D34170 000034 0004+00 0/1 0/0 0/0 .rodata @3776 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3776 = 35.0f; -COMPILER_STRIP_GATE(80D3416C, &lit_3776); +COMPILER_STRIP_GATE(0x80D3416C, &lit_3776); #pragma pop /* 80D34170-80D34174 000038 0004+00 1/2 0/0 0/0 .rodata @3777 */ SECTION_RODATA static f32 const lit_3777 = -10.0f; -COMPILER_STRIP_GATE(80D34170, &lit_3777); +COMPILER_STRIP_GATE(0x80D34170, &lit_3777); /* 80D34174-80D34178 00003C 0004+00 0/1 0/0 0/0 .rodata @3778 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3778 = -100.0f; -COMPILER_STRIP_GATE(80D34174, &lit_3778); +COMPILER_STRIP_GATE(0x80D34174, &lit_3778); #pragma pop /* 80D31CC4-80D31F9C 000264 02D8+00 1/1 0/0 0/0 .text create__11daWdStick_cFv */ @@ -747,14 +754,14 @@ void daWdStick_c::setLight() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4028 = 75.0f; -COMPILER_STRIP_GATE(80D34178, &lit_4028); +COMPILER_STRIP_GATE(0x80D34178, &lit_4028); #pragma pop /* 80D3417C-80D34180 000044 0004+00 0/3 0/0 0/0 .rodata @4029 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4029 = 4.0f; -COMPILER_STRIP_GATE(80D3417C, &lit_4029); +COMPILER_STRIP_GATE(0x80D3417C, &lit_4029); #pragma pop /* 80D34180-80D34184 000048 0004+00 2/9 0/0 0/0 .rodata @4030 */ @@ -764,34 +771,34 @@ SECTION_RODATA static u8 const lit_4030[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D34180, &lit_4030); +COMPILER_STRIP_GATE(0x80D34180, &lit_4030); /* 80D34184-80D34188 00004C 0004+00 0/1 0/0 0/0 .rodata @4031 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4031 = -75.0f; -COMPILER_STRIP_GATE(80D34184, &lit_4031); +COMPILER_STRIP_GATE(0x80D34184, &lit_4031); #pragma pop /* 80D34188-80D3418C 000050 0004+00 0/6 0/0 0/0 .rodata @4032 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4032 = 1.0f; -COMPILER_STRIP_GATE(80D34188, &lit_4032); +COMPILER_STRIP_GATE(0x80D34188, &lit_4032); #pragma pop /* 80D3418C-80D34190 000054 0004+00 0/5 0/0 0/0 .rodata @4033 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4033 = -1.0f; -COMPILER_STRIP_GATE(80D3418C, &lit_4033); +COMPILER_STRIP_GATE(0x80D3418C, &lit_4033); #pragma pop /* 80D34190-80D34194 000058 0004+00 0/1 0/0 0/0 .rodata @4034 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4034 = 7.0f / 10.0f; -COMPILER_STRIP_GATE(80D34190, &lit_4034); +COMPILER_STRIP_GATE(0x80D34190, &lit_4034); #pragma pop /* 80D3219C-80D3269C 00073C 0500+00 1/1 0/0 0/0 .text setFire__11daWdStick_cFv */ @@ -809,21 +816,21 @@ asm void daWdStick_c::setFire() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4118 = 90.0f; -COMPILER_STRIP_GATE(80D34194, &lit_4118); +COMPILER_STRIP_GATE(0x80D34194, &lit_4118); #pragma pop /* 80D34198-80D3419C 000060 0004+00 0/1 0/0 0/0 .rodata @4119 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4119 = -90.0f; -COMPILER_STRIP_GATE(80D34198, &lit_4119); +COMPILER_STRIP_GATE(0x80D34198, &lit_4119); #pragma pop /* 80D3419C-80D341A0 000064 0004+00 0/1 0/0 0/0 .rodata @4120 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4120 = 30.0f; -COMPILER_STRIP_GATE(80D3419C, &lit_4120); +COMPILER_STRIP_GATE(0x80D3419C, &lit_4120); #pragma pop /* 80D341A0-80D341A8 000068 0004+04 0/1 0/0 0/0 .rodata @4121 */ @@ -834,7 +841,7 @@ SECTION_RODATA static f32 const lit_4121[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80D341A0, &lit_4121); +COMPILER_STRIP_GATE(0x80D341A0, &lit_4121); #pragma pop /* 80D34418-80D34424 000008 000C+00 1/1 0/0 0/0 .bss @3643 */ @@ -860,7 +867,7 @@ asm void daWdStick_c::Execute() { SECTION_RODATA static u8 const lit_4220[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D341A8, &lit_4220); +COMPILER_STRIP_GATE(0x80D341A8, &lit_4220); #pragma pop /* 80D341B0-80D341B8 000078 0008+00 0/3 0/0 0/0 .rodata @4221 */ @@ -869,7 +876,7 @@ COMPILER_STRIP_GATE(80D341A8, &lit_4220); SECTION_RODATA static u8 const lit_4221[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D341B0, &lit_4221); +COMPILER_STRIP_GATE(0x80D341B0, &lit_4221); #pragma pop /* 80D341B8-80D341C0 000080 0008+00 0/3 0/0 0/0 .rodata @4222 */ @@ -878,7 +885,7 @@ COMPILER_STRIP_GATE(80D341B0, &lit_4221); SECTION_RODATA static u8 const lit_4222[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D341B8, &lit_4222); +COMPILER_STRIP_GATE(0x80D341B8, &lit_4222); #pragma pop /* 80D32A70-80D32D6C 001010 02FC+00 1/1 0/0 0/0 .text bound__FP4cXyzRC13cBgS_PolyInfof */ @@ -906,42 +913,42 @@ asm cM3dGPla::~cM3dGPla() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4444 = 8.0f; -COMPILER_STRIP_GATE(80D341C0, &lit_4444); +COMPILER_STRIP_GATE(0x80D341C0, &lit_4444); #pragma pop /* 80D341C4-80D341C8 00008C 0004+00 0/1 0/0 0/0 .rodata @4445 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4445 = 3.0f / 5.0f; -COMPILER_STRIP_GATE(80D341C4, &lit_4445); +COMPILER_STRIP_GATE(0x80D341C4, &lit_4445); #pragma pop /* 80D341C8-80D341CC 000090 0004+00 0/1 0/0 0/0 .rodata @4446 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4446 = -50.0f; -COMPILER_STRIP_GATE(80D341C8, &lit_4446); +COMPILER_STRIP_GATE(0x80D341C8, &lit_4446); #pragma pop /* 80D341CC-80D341D0 000094 0004+00 0/2 0/0 0/0 .rodata @4447 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4447 = -15.0f; -COMPILER_STRIP_GATE(80D341CC, &lit_4447); +COMPILER_STRIP_GATE(0x80D341CC, &lit_4447); #pragma pop /* 80D341D0-80D341D4 000098 0004+00 0/2 0/0 0/0 .rodata @4448 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4448 = 2.0f; -COMPILER_STRIP_GATE(80D341D0, &lit_4448); +COMPILER_STRIP_GATE(0x80D341D0, &lit_4448); #pragma pop /* 80D341D4-80D341D8 00009C 0004+00 0/1 0/0 0/0 .rodata @4449 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4449 = 5.0f; -COMPILER_STRIP_GATE(80D341D4, &lit_4449); +COMPILER_STRIP_GATE(0x80D341D4, &lit_4449); #pragma pop /* 80D32DB4-80D33348 001354 0594+00 3/3 0/0 0/0 .text bgCheck__11daWdStick_cFv */ @@ -1021,7 +1028,7 @@ asm void daWdStick_c::mode_proc_carry() { /* ############################################################################################## */ /* 80D341D8-80D341DC 0000A0 0004+00 1/2 0/0 0/0 .rodata @4574 */ SECTION_RODATA static f32 const lit_4574 = -5.0f; -COMPILER_STRIP_GATE(80D341D8, &lit_4574); +COMPILER_STRIP_GATE(0x80D341D8, &lit_4574); /* 80D3386C-80D33890 001E0C 0024+00 1/1 0/0 0/0 .text mode_init_drop__11daWdStick_cFv */ #pragma push @@ -1058,49 +1065,49 @@ asm void daWdStick_c::mode_init_roll() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4704 = -1000000000.0f; -COMPILER_STRIP_GATE(80D341DC, &lit_4704); +COMPILER_STRIP_GATE(0x80D341DC, &lit_4704); #pragma pop /* 80D341E0-80D341E4 0000A8 0004+00 0/1 0/0 0/0 .rodata @4705 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4705 = 0x4645B05B; -COMPILER_STRIP_GATE(80D341E0, &lit_4705); +COMPILER_STRIP_GATE(0x80D341E0, &lit_4705); #pragma pop /* 80D341E4-80D341E8 0000AC 0004+00 0/2 0/0 0/0 .rodata @4706 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4706 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(80D341E4, &lit_4706); +COMPILER_STRIP_GATE(0x80D341E4, &lit_4706); #pragma pop /* 80D341E8-80D341EC 0000B0 0004+00 0/1 0/0 0/0 .rodata @4707 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4707 = 0.75f; -COMPILER_STRIP_GATE(80D341E8, &lit_4707); +COMPILER_STRIP_GATE(0x80D341E8, &lit_4707); #pragma pop /* 80D341EC-80D341F0 0000B4 0004+00 0/1 0/0 0/0 .rodata @4708 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4708 = 0x3C23D70B; -COMPILER_STRIP_GATE(80D341EC, &lit_4708); +COMPILER_STRIP_GATE(0x80D341EC, &lit_4708); #pragma pop /* 80D341F0-80D341F4 0000B8 0004+00 0/2 0/0 0/0 .rodata @4709 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4709 = 9.0f / 10.0f; -COMPILER_STRIP_GATE(80D341F0, &lit_4709); +COMPILER_STRIP_GATE(0x80D341F0, &lit_4709); #pragma pop /* 80D341F4-80D341F8 0000BC 0004+00 0/1 0/0 0/0 .rodata @4710 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4710 = 3.0f / 10.0f; -COMPILER_STRIP_GATE(80D341F4, &lit_4710); +COMPILER_STRIP_GATE(0x80D341F4, &lit_4710); #pragma pop /* 80D338F4-80D33CCC 001E94 03D8+00 1/0 0/0 0/0 .text mode_proc_roll__11daWdStick_cFv */ @@ -1128,12 +1135,12 @@ asm dBgS_ObjGndChk::~dBgS_ObjGndChk() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4725 = 100.0f; -COMPILER_STRIP_GATE(80D341F8, &lit_4725); +COMPILER_STRIP_GATE(0x80D341F8, &lit_4725); #pragma pop /* 80D341FC-80D34200 0000C4 0004+00 1/1 0/0 0/0 .rodata @4731 */ SECTION_RODATA static f32 const lit_4731 = 40.0f; -COMPILER_STRIP_GATE(80D341FC, &lit_4731); +COMPILER_STRIP_GATE(0x80D341FC, &lit_4731); /* 80D33D44-80D33D68 0022E4 0024+00 2/2 0/0 0/0 .text chkWaterLineIn__11daWdStick_cFv */ #pragma push @@ -1160,28 +1167,28 @@ asm void daWdStick_c::mode_init_sink() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4777 = 1.0f / 20.0f; -COMPILER_STRIP_GATE(80D34200, &lit_4777); +COMPILER_STRIP_GATE(0x80D34200, &lit_4777); #pragma pop /* 80D34204-80D34208 0000CC 0004+00 0/1 0/0 0/0 .rodata @4778 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4778 = 1.0f / 100.0f; -COMPILER_STRIP_GATE(80D34204, &lit_4778); +COMPILER_STRIP_GATE(0x80D34204, &lit_4778); #pragma pop /* 80D34208-80D3420C 0000D0 0004+00 0/1 0/0 0/0 .rodata @4779 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4779 = 13.0f; -COMPILER_STRIP_GATE(80D34208, &lit_4779); +COMPILER_STRIP_GATE(0x80D34208, &lit_4779); #pragma pop /* 80D3420C-80D34210 0000D4 0004+00 0/1 0/0 0/0 .rodata @4780 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4780 = -2.0f; -COMPILER_STRIP_GATE(80D3420C, &lit_4780); +COMPILER_STRIP_GATE(0x80D3420C, &lit_4780); #pragma pop /* 80D33D8C-80D33EB0 00232C 0124+00 1/0 0/0 0/0 .text mode_proc_sink__11daWdStick_cFv */ @@ -1288,7 +1295,7 @@ asm void __sinit_d_a_obj_wdStick_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80D3408C = (void*)__sinit_d_a_obj_wdStick_cpp; +REGISTER_CTORS(0x80D3408C, __sinit_d_a_obj_wdStick_cpp); #pragma pop /* 80D340FC-80D34104 00269C 0008+00 1/0 0/0 0/0 .text @36@__dt__12dBgS_ObjAcchFv */ @@ -1341,9 +1348,4 @@ static asm void func_80D3411C() { } #pragma pop -/* 80D34210-80D3421A 0000D8 000A+00 3/3 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80D34210 = "H_Kinobou"; -#pragma pop +/* 80D34210-80D34210 0000D8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_web0/d_a_obj_web0.cpp b/rel/d/a/obj/d_a_obj_web0/d_a_obj_web0.cpp index 994ed73f486..1f5d5bc4891 100644 --- a/rel/d/a/obj/d_a_obj_web0/d_a_obj_web0.cpp +++ b/rel/d/a/obj/d_a_obj_web0/d_a_obj_web0.cpp @@ -67,10 +67,10 @@ struct dRes_control_c { struct dPa_levelEcallBack {}; -struct _GXColor {}; - struct csXyz {}; +struct _GXColor {}; + struct dPa_control_c { /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, @@ -139,10 +139,10 @@ struct cBgS { /* 80074250 */ void Release(dBgW_Base*); }; -struct Vec {}; - struct JAISoundID {}; +struct Vec {}; + struct Z2SeMgr { /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); /* 802AC50C */ void seStartLevel(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); @@ -341,20 +341,20 @@ static asm void daObj_Web0_Draw(obj_web0_class* param_0) { /* ############################################################################################## */ /* 80D3517C-80D35180 000000 0004+00 3/3 0/0 0/0 .rodata @3724 */ SECTION_RODATA static f32 const lit_3724 = 1.0f; -COMPILER_STRIP_GATE(80D3517C, &lit_3724); +COMPILER_STRIP_GATE(0x80D3517C, &lit_3724); /* 80D35180-80D35184 000004 0004+00 0/2 0/0 0/0 .rodata @3725 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3725 = -1.0f; -COMPILER_STRIP_GATE(80D35180, &lit_3725); +COMPILER_STRIP_GATE(0x80D35180, &lit_3725); #pragma pop /* 80D35184-80D35188 000008 0004+00 0/1 0/0 0/0 .rodata @3726 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3726 = 260.0f; -COMPILER_STRIP_GATE(80D35184, &lit_3726); +COMPILER_STRIP_GATE(0x80D35184, &lit_3726); #pragma pop /* 80D345C0-80D34794 000180 01D4+00 1/1 0/0 0/0 .text damage_check__FP14obj_web0_class */ @@ -372,21 +372,21 @@ static asm void damage_check(obj_web0_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3850 = 3.0f / 40.0f; -COMPILER_STRIP_GATE(80D35188, &lit_3850); +COMPILER_STRIP_GATE(0x80D35188, &lit_3850); #pragma pop /* 80D3518C-80D35190 000010 0004+00 0/1 0/0 0/0 .rodata @3851 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3851 = 70.0f; -COMPILER_STRIP_GATE(80D3518C, &lit_3851); +COMPILER_STRIP_GATE(0x80D3518C, &lit_3851); #pragma pop /* 80D35190-80D35194 000014 0004+00 0/1 0/0 0/0 .rodata @3852 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3852 = 20000.0f; -COMPILER_STRIP_GATE(80D35190, &lit_3852); +COMPILER_STRIP_GATE(0x80D35190, &lit_3852); #pragma pop /* 80D35194-80D3519C 000018 0004+04 0/1 0/0 0/0 .rodata @3853 */ @@ -397,7 +397,7 @@ SECTION_RODATA static f32 const lit_3853[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80D35194, &lit_3853); +COMPILER_STRIP_GATE(0x80D35194, &lit_3853); #pragma pop /* 80D3519C-80D351A4 000020 0008+00 0/1 0/0 0/0 .rodata @3855 */ @@ -406,7 +406,7 @@ COMPILER_STRIP_GATE(80D35194, &lit_3853); SECTION_RODATA static u8 const lit_3855[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D3519C, &lit_3855); +COMPILER_STRIP_GATE(0x80D3519C, &lit_3855); #pragma pop /* 80D34794-80D34B24 000354 0390+00 2/1 0/0 0/0 .text daObj_Web0_Execute__FP14obj_web0_class */ @@ -425,6 +425,12 @@ static bool daObj_Web0_IsDelete(obj_web0_class* param_0) { } /* ############################################################################################## */ +/* 80D351BC-80D351BC 000040 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80D351BC = "Obj_web0"; +#pragma pop + /* 80D35290-80D35294 000008 0004+00 2/2 0/0 0/0 .bss None */ static u8 data_80D35290[4]; @@ -446,7 +452,7 @@ SECTION_RODATA static u8 const lit_3917[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D351A4, &lit_3917); +COMPILER_STRIP_GATE(0x80D351A4, &lit_3917); /* 80D34B94-80D34D44 000754 01B0+00 1/1 0/0 0/0 .text useHeapInit__FP10fopAc_ac_c */ #pragma push @@ -471,7 +477,7 @@ asm J3DFrameCtrl::~J3DFrameCtrl() { /* ############################################################################################## */ /* 80D351A8-80D351AC 00002C 0004+00 1/1 0/0 0/0 .rodata @4014 */ SECTION_RODATA static f32 const lit_4014 = -1000.0f; -COMPILER_STRIP_GATE(80D351A8, &lit_4014); +COMPILER_STRIP_GATE(0x80D351A8, &lit_4014); /* 80D351AC-80D351B4 000030 0004+04 1/1 0/0 0/0 .rodata @4015 */ SECTION_RODATA static f32 const lit_4015[1 + 1 /* padding */] = { @@ -479,13 +485,13 @@ SECTION_RODATA static f32 const lit_4015[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80D351AC, &lit_4015); +COMPILER_STRIP_GATE(0x80D351AC, &lit_4015); /* 80D351B4-80D351BC 000038 0008+00 1/1 0/0 0/0 .rodata @4017 */ SECTION_RODATA static u8 const lit_4017[8] = { 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D351B4, &lit_4017); +COMPILER_STRIP_GATE(0x80D351B4, &lit_4017); /* 80D35294-80D352A0 00000C 000C+00 1/1 0/0 0/0 .bss @3643 */ static u8 lit_3643[12]; @@ -546,12 +552,7 @@ asm void __sinit_d_a_obj_web0_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80D3512C = (void*)__sinit_d_a_obj_web0_cpp; +REGISTER_CTORS(0x80D3512C, __sinit_d_a_obj_web0_cpp); #pragma pop -/* 80D351BC-80D351C5 000040 0009+00 3/3 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80D351BC = "Obj_web0"; -#pragma pop +/* 80D351BC-80D351BC 000040 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_web1/d_a_obj_web1.cpp b/rel/d/a/obj/d_a_obj_web1/d_a_obj_web1.cpp index 4f98c83f725..fe9e1328cbd 100644 --- a/rel/d/a/obj/d_a_obj_web1/d_a_obj_web1.cpp +++ b/rel/d/a/obj/d_a_obj_web1/d_a_obj_web1.cpp @@ -68,10 +68,10 @@ struct dRes_control_c { struct dPa_levelEcallBack {}; -struct _GXColor {}; - struct csXyz {}; +struct _GXColor {}; + struct dPa_control_c { /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, @@ -147,10 +147,10 @@ struct Z2SoundObjBase { /* 802BE4A4 */ void startCollisionSE(u32, u32, Z2SoundObjBase*); }; -struct Vec {}; - struct JAISoundID {}; +struct Vec {}; + struct Z2SeMgr { /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); /* 802AC50C */ void seStartLevel(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); @@ -354,11 +354,11 @@ SECTION_RODATA static u8 const lit_3703[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D360C0, &lit_3703); +COMPILER_STRIP_GATE(0x80D360C0, &lit_3703); /* 80D360C4-80D360C8 000004 0004+00 1/1 0/0 0/0 .rodata @3704 */ SECTION_RODATA static f32 const lit_3704 = 140.0f; -COMPILER_STRIP_GATE(80D360C4, &lit_3704); +COMPILER_STRIP_GATE(0x80D360C4, &lit_3704); /* 80D35440-80D35508 000180 00C8+00 1/1 0/0 0/0 .text * ride_call_back__FP4dBgWP10fopAc_ac_cP10fopAc_ac_c */ @@ -374,55 +374,55 @@ static asm void ride_call_back(dBgW* param_0, fopAc_ac_c* param_1, fopAc_ac_c* p /* ############################################################################################## */ /* 80D360C8-80D360CC 000008 0004+00 1/3 0/0 0/0 .rodata @3798 */ SECTION_RODATA static f32 const lit_3798 = 1.0f; -COMPILER_STRIP_GATE(80D360C8, &lit_3798); +COMPILER_STRIP_GATE(0x80D360C8, &lit_3798); /* 80D360CC-80D360D0 00000C 0004+00 0/2 0/0 0/0 .rodata @3799 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3799 = -1.0f; -COMPILER_STRIP_GATE(80D360CC, &lit_3799); +COMPILER_STRIP_GATE(0x80D360CC, &lit_3799); #pragma pop /* 80D360D0-80D360D4 000010 0004+00 0/1 0/0 0/0 .rodata @3800 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3800 = 1.0f / 50.0f; -COMPILER_STRIP_GATE(80D360D0, &lit_3800); +COMPILER_STRIP_GATE(0x80D360D0, &lit_3800); #pragma pop /* 80D360D4-80D360D8 000014 0004+00 0/1 0/0 0/0 .rodata @3801 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3801 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(80D360D4, &lit_3801); +COMPILER_STRIP_GATE(0x80D360D4, &lit_3801); #pragma pop /* 80D360D8-80D360DC 000018 0004+00 0/1 0/0 0/0 .rodata @3802 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3802 = 10.0f; -COMPILER_STRIP_GATE(80D360D8, &lit_3802); +COMPILER_STRIP_GATE(0x80D360D8, &lit_3802); #pragma pop /* 80D360DC-80D360E0 00001C 0004+00 0/1 0/0 0/0 .rodata @3803 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3803 = 5.0f; -COMPILER_STRIP_GATE(80D360DC, &lit_3803); +COMPILER_STRIP_GATE(0x80D360DC, &lit_3803); #pragma pop /* 80D360E0-80D360E4 000020 0004+00 0/1 0/0 0/0 .rodata @3804 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3804 = 2.0f; -COMPILER_STRIP_GATE(80D360E0, &lit_3804); +COMPILER_STRIP_GATE(0x80D360E0, &lit_3804); #pragma pop /* 80D360E4-80D360E8 000024 0004+00 0/1 0/0 0/0 .rodata @3805 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_3805 = 0x3BA3D70A; -COMPILER_STRIP_GATE(80D360E4, &lit_3805); +COMPILER_STRIP_GATE(0x80D360E4, &lit_3805); #pragma pop /* 80D360E8-80D360F0 000028 0004+04 0/1 0/0 0/0 .rodata @3806 */ @@ -433,7 +433,7 @@ SECTION_RODATA static f32 const lit_3806[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80D360E8, &lit_3806); +COMPILER_STRIP_GATE(0x80D360E8, &lit_3806); #pragma pop /* 80D360F0-80D360F8 000030 0008+00 0/1 0/0 0/0 .rodata @3808 */ @@ -442,7 +442,7 @@ COMPILER_STRIP_GATE(80D360E8, &lit_3806); SECTION_RODATA static u8 const lit_3808[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D360F0, &lit_3808); +COMPILER_STRIP_GATE(0x80D360F0, &lit_3808); #pragma pop /* 80D35508-80D35774 000248 026C+00 1/1 0/0 0/0 .text action__FP14obj_web1_class */ @@ -460,35 +460,35 @@ static asm void action(obj_web1_class* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3871 = 1.0f / 20.0f; -COMPILER_STRIP_GATE(80D360F8, &lit_3871); +COMPILER_STRIP_GATE(0x80D360F8, &lit_3871); #pragma pop /* 80D360FC-80D36100 00003C 0004+00 0/1 0/0 0/0 .rodata @3872 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3872 = 6.0f / 5.0f; -COMPILER_STRIP_GATE(80D360FC, &lit_3872); +COMPILER_STRIP_GATE(0x80D360FC, &lit_3872); #pragma pop /* 80D36100-80D36104 000040 0004+00 0/1 0/0 0/0 .rodata @3873 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3873 = 9.0f; -COMPILER_STRIP_GATE(80D36100, &lit_3873); +COMPILER_STRIP_GATE(0x80D36100, &lit_3873); #pragma pop /* 80D36104-80D36108 000044 0004+00 0/1 0/0 0/0 .rodata @3874 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3874 = -15.0f; -COMPILER_STRIP_GATE(80D36104, &lit_3874); +COMPILER_STRIP_GATE(0x80D36104, &lit_3874); #pragma pop /* 80D36108-80D3610C 000048 0004+00 0/1 0/0 0/0 .rodata @3875 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3875 = 150.0f; -COMPILER_STRIP_GATE(80D36108, &lit_3875); +COMPILER_STRIP_GATE(0x80D36108, &lit_3875); #pragma pop /* 80D35774-80D35A3C 0004B4 02C8+00 2/1 0/0 0/0 .text daObj_Web1_Execute__FP14obj_web1_class */ @@ -507,6 +507,12 @@ static bool daObj_Web1_IsDelete(obj_web1_class* param_0) { } /* ############################################################################################## */ +/* 80D36120-80D36120 000060 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80D36120 = "Obj_web1"; +#pragma pop + /* 80D361F8-80D361FC 000008 0004+00 2/2 0/0 0/0 .bss None */ static u8 data_80D361F8[4]; @@ -545,21 +551,21 @@ asm J3DFrameCtrl::~J3DFrameCtrl() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4036 = -1000.0f; -COMPILER_STRIP_GATE(80D3610C, &lit_4036); +COMPILER_STRIP_GATE(0x80D3610C, &lit_4036); #pragma pop /* 80D36110-80D36114 000050 0004+00 0/1 0/0 0/0 .rodata @4037 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4037 = 1000.0f; -COMPILER_STRIP_GATE(80D36110, &lit_4037); +COMPILER_STRIP_GATE(0x80D36110, &lit_4037); #pragma pop /* 80D36114-80D36118 000054 0004+00 0/1 0/0 0/0 .rodata @4038 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4038 = 13.0f; -COMPILER_STRIP_GATE(80D36114, &lit_4038); +COMPILER_STRIP_GATE(0x80D36114, &lit_4038); #pragma pop /* 80D36118-80D36120 000058 0008+00 0/1 0/0 0/0 .rodata @4040 */ @@ -568,7 +574,7 @@ COMPILER_STRIP_GATE(80D36114, &lit_4038); SECTION_RODATA static u8 const lit_4040[8] = { 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D36118, &lit_4040); +COMPILER_STRIP_GATE(0x80D36118, &lit_4040); #pragma pop /* 80D361FC-80D36208 00000C 000C+00 1/1 0/0 0/0 .bss @3643 */ @@ -630,12 +636,7 @@ asm void __sinit_d_a_obj_web1_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80D36070 = (void*)__sinit_d_a_obj_web1_cpp; +REGISTER_CTORS(0x80D36070, __sinit_d_a_obj_web1_cpp); #pragma pop -/* 80D36120-80D36129 000060 0009+00 3/3 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80D36120 = "Obj_web1"; -#pragma pop +/* 80D36120-80D36120 000060 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_well_cover/d_a_obj_well_cover.cpp b/rel/d/a/obj/d_a_obj_well_cover/d_a_obj_well_cover.cpp index 99586773c30..de2035d17d6 100644 --- a/rel/d/a/obj/d_a_obj_well_cover/d_a_obj_well_cover.cpp +++ b/rel/d/a/obj/d_a_obj_well_cover/d_a_obj_well_cover.cpp @@ -60,10 +60,10 @@ struct dRes_control_c { struct dPa_levelEcallBack {}; -struct _GXColor {}; - struct csXyz {}; +struct _GXColor {}; + struct dPa_control_c { /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, @@ -191,6 +191,12 @@ asm void daObjWCover_c::Create() { #pragma pop /* ############################################################################################## */ +/* 80D36A40-80D36A40 000034 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80D36A40 = "H_Idohuta"; +#pragma pop + /* 80D36A4C-80D36A58 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -322,7 +328,7 @@ asm void daObjWCover_c::action() { /* ############################################################################################## */ /* 80D36A0C-80D36A10 000000 0004+00 2/2 0/0 0/0 .rodata @3794 */ SECTION_RODATA static f32 const lit_3794 = 150.0f; -COMPILER_STRIP_GATE(80D36A0C, &lit_3794); +COMPILER_STRIP_GATE(0x80D36A0C, &lit_3794); /* 80D36A10-80D36A14 000004 0004+00 0/2 0/0 0/0 .rodata @3795 */ #pragma push @@ -333,7 +339,7 @@ SECTION_RODATA static u8 const lit_3795[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D36A10, &lit_3795); +COMPILER_STRIP_GATE(0x80D36A10, &lit_3795); #pragma pop /* 80D36A14-80D36A1C 000008 0008+00 0/1 0/0 0/0 .rodata @3796 */ @@ -342,7 +348,7 @@ COMPILER_STRIP_GATE(80D36A10, &lit_3795); SECTION_RODATA static u8 const lit_3796[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D36A14, &lit_3796); +COMPILER_STRIP_GATE(0x80D36A14, &lit_3796); #pragma pop /* 80D36A1C-80D36A24 000010 0008+00 0/1 0/0 0/0 .rodata @3797 */ @@ -351,7 +357,7 @@ COMPILER_STRIP_GATE(80D36A14, &lit_3796); SECTION_RODATA static u8 const lit_3797[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D36A1C, &lit_3797); +COMPILER_STRIP_GATE(0x80D36A1C, &lit_3797); #pragma pop /* 80D36A24-80D36A2C 000018 0008+00 0/1 0/0 0/0 .rodata @3798 */ @@ -360,21 +366,21 @@ COMPILER_STRIP_GATE(80D36A1C, &lit_3797); SECTION_RODATA static u8 const lit_3798[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D36A24, &lit_3798); +COMPILER_STRIP_GATE(0x80D36A24, &lit_3798); #pragma pop /* 80D36A2C-80D36A30 000020 0004+00 0/1 0/0 0/0 .rodata @3799 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3799 = 80.0f; -COMPILER_STRIP_GATE(80D36A2C, &lit_3799); +COMPILER_STRIP_GATE(0x80D36A2C, &lit_3799); #pragma pop /* 80D36A30-80D36A34 000024 0004+00 0/1 0/0 0/0 .rodata @3800 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3800 = 200.0f; -COMPILER_STRIP_GATE(80D36A30, &lit_3800); +COMPILER_STRIP_GATE(0x80D36A30, &lit_3800); #pragma pop /* 80D365B8-80D36790 000398 01D8+00 1/0 0/0 0/0 .text modeWait__13daObjWCover_cFv */ @@ -402,14 +408,14 @@ SECTION_RODATA static u8 const particle_id[6 + 2 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D36A34, &particle_id); +COMPILER_STRIP_GATE(0x80D36A34, &particle_id); #pragma pop /* 80D36A3C-80D36A40 000030 0004+00 0/1 0/0 0/0 .rodata @3833 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3833 = 1.0f; -COMPILER_STRIP_GATE(80D36A3C, &lit_3833); +COMPILER_STRIP_GATE(0x80D36A3C, &lit_3833); #pragma pop /* 80D36790-80D3689C 000570 010C+00 1/1 0/0 0/0 .text init_modeBreak__13daObjWCover_cFv @@ -490,9 +496,4 @@ static asm void daObjWCover_Create(fopAc_ac_c* param_0) { } #pragma pop -/* 80D36A40-80D36A4A 000034 000A+00 1/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80D36A40 = "H_Idohuta"; -#pragma pop +/* 80D36A40-80D36A40 000034 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_wflag/d_a_obj_wflag.cpp b/rel/d/a/obj/d_a_obj_wflag/d_a_obj_wflag.cpp index 013d78c4f8e..82a89875e40 100644 --- a/rel/d/a/obj/d_a_obj_wflag/d_a_obj_wflag.cpp +++ b/rel/d/a/obj/d_a_obj_wflag/d_a_obj_wflag.cpp @@ -52,10 +52,10 @@ struct mDoExt_McaMorfCallBack1_c {}; struct Vec {}; -struct J3DModelData {}; - struct J3DAnmTransform {}; +struct J3DModelData {}; + struct mDoExt_McaMorf { /* 8000FC4C */ mDoExt_McaMorf(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, int, @@ -208,41 +208,41 @@ SECTION_RODATA static u8 const lit_3883[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D3788C, &lit_3883); +COMPILER_STRIP_GATE(0x80D3788C, &lit_3883); /* 80D37890-80D37894 000004 0004+00 0/1 0/0 0/0 .rodata @3884 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3884 = 20.0f; -COMPILER_STRIP_GATE(80D37890, &lit_3884); +COMPILER_STRIP_GATE(0x80D37890, &lit_3884); #pragma pop /* 80D37894-80D37898 000008 0004+00 0/1 0/0 0/0 .rodata @3885 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3885 = 10.0f; -COMPILER_STRIP_GATE(80D37894, &lit_3885); +COMPILER_STRIP_GATE(0x80D37894, &lit_3885); #pragma pop /* 80D37898-80D3789C 00000C 0004+00 0/1 0/0 0/0 .rodata @3886 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3886 = 2.0f; -COMPILER_STRIP_GATE(80D37898, &lit_3886); +COMPILER_STRIP_GATE(0x80D37898, &lit_3886); #pragma pop /* 80D3789C-80D378A0 000010 0004+00 0/1 0/0 0/0 .rodata @3887 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3887 = 3.0f / 10.0f; -COMPILER_STRIP_GATE(80D3789C, &lit_3887); +COMPILER_STRIP_GATE(0x80D3789C, &lit_3887); #pragma pop /* 80D378A0-80D378A4 000014 0004+00 0/1 0/0 0/0 .rodata @3888 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3888 = -20.0f; -COMPILER_STRIP_GATE(80D378A0, &lit_3888); +COMPILER_STRIP_GATE(0x80D378A0, &lit_3888); #pragma pop /* 80D378CC-80D37918 000000 004C+00 1/1 0/0 0/0 .data pd$3822 */ @@ -289,35 +289,35 @@ static asm void tail_mtxset(wf_tail_s* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3987 = 5.0f; -COMPILER_STRIP_GATE(80D378A4, &lit_3987); +COMPILER_STRIP_GATE(0x80D378A4, &lit_3987); #pragma pop /* 80D378A8-80D378AC 00001C 0004+00 0/1 0/0 0/0 .rodata @3988 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3988 = 133.0f; -COMPILER_STRIP_GATE(80D378A8, &lit_3988); +COMPILER_STRIP_GATE(0x80D378A8, &lit_3988); #pragma pop /* 80D378AC-80D378B0 000020 0004+00 0/1 0/0 0/0 .rodata @3989 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3989 = 248.0f; -COMPILER_STRIP_GATE(80D378AC, &lit_3989); +COMPILER_STRIP_GATE(0x80D378AC, &lit_3989); #pragma pop /* 80D378B0-80D378B4 000024 0004+00 0/1 0/0 0/0 .rodata @3990 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3990 = 143.0f; -COMPILER_STRIP_GATE(80D378B0, &lit_3990); +COMPILER_STRIP_GATE(0x80D378B0, &lit_3990); #pragma pop /* 80D378B4-80D378B8 000028 0004+00 0/1 0/0 0/0 .rodata @3991 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3991 = 418.0f; -COMPILER_STRIP_GATE(80D378B4, &lit_3991); +COMPILER_STRIP_GATE(0x80D378B4, &lit_3991); #pragma pop /* 80D37058-80D372D0 000538 0278+00 2/1 0/0 0/0 .text daObj_Wflag_Execute__FP15obj_wflag_class */ @@ -335,6 +335,13 @@ static bool daObj_Wflag_IsDelete(obj_wflag_class* param_0) { return true; } +/* ############################################################################################## */ +/* 80D378C0-80D378C0 000034 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80D378C0 = "Obj_wflag"; +#pragma pop + /* 80D372D8-80D37308 0007B8 0030+00 1/0 0/0 0/0 .text daObj_Wflag_Delete__FP15obj_wflag_class */ #pragma push #pragma optimization_level 0 @@ -348,7 +355,7 @@ static asm void daObj_Wflag_Delete(obj_wflag_class* param_0) { /* ############################################################################################## */ /* 80D378B8-80D378BC 00002C 0004+00 1/1 0/0 0/0 .rodata @4094 */ SECTION_RODATA static f32 const lit_4094 = 1.0f; -COMPILER_STRIP_GATE(80D378B8, &lit_4094); +COMPILER_STRIP_GATE(0x80D378B8, &lit_4094); /* 80D37918-80D37938 -00001 0020+00 1/0 0/0 0/0 .data l_daObj_Wflag_Method */ SECTION_DATA static void* l_daObj_Wflag_Method[8] = { @@ -402,7 +409,7 @@ asm J3DFrameCtrl::~J3DFrameCtrl() { /* ############################################################################################## */ /* 80D378BC-80D378C0 000030 0004+00 1/1 0/0 0/0 .rodata @4131 */ SECTION_RODATA static f32 const lit_4131 = 65536.0f; -COMPILER_STRIP_GATE(80D378BC, &lit_4131); +COMPILER_STRIP_GATE(0x80D378BC, &lit_4131); /* 80D37634-80D37720 000B14 00EC+00 1/0 0/0 0/0 .text daObj_Wflag_Create__FP10fopAc_ac_c */ @@ -455,9 +462,4 @@ cXyz::cXyz() { /* empty function */ } -/* 80D378C0-80D378CA 000034 000A+00 3/3 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80D378C0 = "Obj_wflag"; -#pragma pop +/* 80D378C0-80D378C0 000034 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_wind_stone/d_a_obj_wind_stone.cpp b/rel/d/a/obj/d_a_obj_wind_stone/d_a_obj_wind_stone.cpp index 65d4301b21c..f2d4b09f1aa 100644 --- a/rel/d/a/obj/d_a_obj_wind_stone/d_a_obj_wind_stone.cpp +++ b/rel/d/a/obj/d_a_obj_wind_stone/d_a_obj_wind_stone.cpp @@ -95,12 +95,12 @@ struct dBgS_AcchCir { /* 80D37E9C */ ~dBgS_AcchCir(); }; +struct csXyz {}; + struct dBgS { /* 80074A08 */ void Regist(dBgW_Base*, fopAc_ac_c*); }; -struct csXyz {}; - struct dBgS_Acch { /* 80075F94 */ ~dBgS_Acch(); /* 800760A0 */ dBgS_Acch(); @@ -242,6 +242,12 @@ static asm void daWindStone_c_createHeap(fopAc_ac_c* param_0) { #pragma pop /* ############################################################################################## */ +/* 80D38628-80D38628 000020 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80D38628 = "WindStone"; +#pragma pop + /* 80D38634-80D38638 -00001 0004+00 3/3 0/0 0/0 .data l_arcName */ SECTION_DATA static void* l_arcName = (void*)&d_a_obj_wind_stone__stringBase0; @@ -329,7 +335,7 @@ asm void daWindStone_c::createHeap() { SECTION_RODATA static u8 const lit_3760[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D38608, &lit_3760); +COMPILER_STRIP_GATE(0x80D38608, &lit_3760); /* 80D38614-80D38618 00000C 0004+00 1/2 0/0 0/0 .rodata @4127 */ SECTION_RODATA static u8 const lit_4127[4] = { @@ -338,11 +344,11 @@ SECTION_RODATA static u8 const lit_4127[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D38614, &lit_4127); +COMPILER_STRIP_GATE(0x80D38614, &lit_4127); /* 80D38618-80D3861C 000010 0004+00 1/1 0/0 0/0 .rodata @4128 */ SECTION_RODATA static f32 const lit_4128 = 10.0f; -COMPILER_STRIP_GATE(80D38618, &lit_4128); +COMPILER_STRIP_GATE(0x80D38618, &lit_4128); /* 80D37C20-80D37E2C 0002A0 020C+00 1/1 0/0 0/0 .text create__13daWindStone_cFv */ #pragma push @@ -389,14 +395,14 @@ asm void daWindStone_c::execute() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4175 = 500.0f; -COMPILER_STRIP_GATE(80D3861C, &lit_4175); +COMPILER_STRIP_GATE(0x80D3861C, &lit_4175); #pragma pop /* 80D38620-80D38624 000018 0004+00 0/1 0/0 0/0 .rodata @4176 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4176 = 1.0f; -COMPILER_STRIP_GATE(80D38620, &lit_4176); +COMPILER_STRIP_GATE(0x80D38620, &lit_4176); #pragma pop /* 80D37F6C-80D3806C 0005EC 0100+00 1/1 0/0 0/0 .text draw__13daWindStone_cFv */ @@ -442,7 +448,7 @@ asm void daWindStone_c::init() { /* ############################################################################################## */ /* 80D38624-80D38628 00001C 0004+00 1/1 0/0 0/0 .rodata @4243 */ SECTION_RODATA static f32 const lit_4243 = 40000.0f; -COMPILER_STRIP_GATE(80D38624, &lit_4243); +COMPILER_STRIP_GATE(0x80D38624, &lit_4243); /* 80D381EC-80D38278 00086C 008C+00 1/1 0/0 0/0 .text chkWlfInRange__13daWindStone_cFv */ #pragma push @@ -568,9 +574,4 @@ static asm void func_80D385F8() { } #pragma pop -/* 80D38628-80D38632 000020 000A+00 1/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80D38628 = "WindStone"; -#pragma pop +/* 80D38628-80D38628 000020 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_window/d_a_obj_window.cpp b/rel/d/a/obj/d_a_obj_window/d_a_obj_window.cpp index 92c8ed0cb85..9035b55d443 100644 --- a/rel/d/a/obj/d_a_obj_window/d_a_obj_window.cpp +++ b/rel/d/a/obj/d_a_obj_window/d_a_obj_window.cpp @@ -113,10 +113,10 @@ struct cCcS { /* 80264BA8 */ void Set(cCcD_Obj*); }; -struct Vec {}; - struct JAISoundID {}; +struct Vec {}; + struct Z2SeMgr { /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); /* 802AC50C */ void seStartLevel(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); @@ -238,27 +238,27 @@ asm void daObjWindow_c::setBaseMtx() { SECTION_RODATA static u8 const l_bck[12] = { 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x06, 0xFF, 0xFF, 0xFF, 0xFF, }; -COMPILER_STRIP_GATE(80D3922C, &l_bck); +COMPILER_STRIP_GATE(0x80D3922C, &l_bck); /* 80D39238-80D3923C 00000C 0004+00 0/1 0/0 0/0 .rodata @3661 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3661 = -250.0f; -COMPILER_STRIP_GATE(80D39238, &lit_3661); +COMPILER_STRIP_GATE(0x80D39238, &lit_3661); #pragma pop /* 80D3923C-80D39240 000010 0004+00 0/1 0/0 0/0 .rodata @3662 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3662 = 600.0f; -COMPILER_STRIP_GATE(80D3923C, &lit_3662); +COMPILER_STRIP_GATE(0x80D3923C, &lit_3662); #pragma pop /* 80D39240-80D39244 000014 0004+00 0/1 0/0 0/0 .rodata @3663 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3663 = 250.0f; -COMPILER_STRIP_GATE(80D39240, &lit_3663); +COMPILER_STRIP_GATE(0x80D39240, &lit_3663); #pragma pop /* 80D39244-80D39248 000018 0004+00 0/2 0/0 0/0 .rodata @3664 */ @@ -270,7 +270,13 @@ SECTION_RODATA static u8 const lit_3664[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D39244, &lit_3664); +COMPILER_STRIP_GATE(0x80D39244, &lit_3664); +#pragma pop + +/* 80D3927C-80D3927C 000050 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80D3927C = "J_KazeD"; #pragma pop /* 80D39284-80D39288 -00001 0004+00 3/3 0/0 0/0 .data l_arcName */ @@ -298,7 +304,7 @@ asm void daObjWindow_c::Create() { /* ############################################################################################## */ /* 80D39248-80D3924C 00001C 0004+00 1/2 0/0 0/0 .rodata @3696 */ SECTION_RODATA static f32 const lit_3696 = 1.0f; -COMPILER_STRIP_GATE(80D39248, &lit_3696); +COMPILER_STRIP_GATE(0x80D39248, &lit_3696); /* 80D392CC-80D392EC -00001 0020+00 1/0 0/0 0/0 .data daObjWindow_METHODS */ SECTION_DATA static void* daObjWindow_METHODS[8] = { @@ -378,84 +384,84 @@ asm void daObjWindow_c::create1st() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3821 = 164.0f; -COMPILER_STRIP_GATE(80D3924C, &lit_3821); +COMPILER_STRIP_GATE(0x80D3924C, &lit_3821); #pragma pop /* 80D39250-80D39254 000024 0004+00 0/1 0/0 0/0 .rodata @3822 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3822 = 757.0f; -COMPILER_STRIP_GATE(80D39250, &lit_3822); +COMPILER_STRIP_GATE(0x80D39250, &lit_3822); #pragma pop /* 80D39254-80D39258 000028 0004+00 0/1 0/0 0/0 .rodata @3823 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3823 = -1.0f; -COMPILER_STRIP_GATE(80D39254, &lit_3823); +COMPILER_STRIP_GATE(0x80D39254, &lit_3823); #pragma pop /* 80D39258-80D3925C 00002C 0004+00 0/1 0/0 0/0 .rodata @3824 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3824 = 125.0f; -COMPILER_STRIP_GATE(80D39258, &lit_3824); +COMPILER_STRIP_GATE(0x80D39258, &lit_3824); #pragma pop /* 80D3925C-80D39260 000030 0004+00 0/1 0/0 0/0 .rodata @3825 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3825 = 264.0f; -COMPILER_STRIP_GATE(80D3925C, &lit_3825); +COMPILER_STRIP_GATE(0x80D3925C, &lit_3825); #pragma pop /* 80D39260-80D39264 000034 0004+00 0/1 0/0 0/0 .rodata @3826 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3826 = 364.0f; -COMPILER_STRIP_GATE(80D39260, &lit_3826); +COMPILER_STRIP_GATE(0x80D39260, &lit_3826); #pragma pop /* 80D39264-80D39268 000038 0004+00 0/1 0/0 0/0 .rodata @3827 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3827 = 464.0f; -COMPILER_STRIP_GATE(80D39264, &lit_3827); +COMPILER_STRIP_GATE(0x80D39264, &lit_3827); #pragma pop /* 80D39268-80D3926C 00003C 0004+00 0/1 0/0 0/0 .rodata @3828 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3828 = 544.0f; -COMPILER_STRIP_GATE(80D39268, &lit_3828); +COMPILER_STRIP_GATE(0x80D39268, &lit_3828); #pragma pop /* 80D3926C-80D39270 000040 0004+00 0/1 0/0 0/0 .rodata @3829 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3829 = 714.0f; -COMPILER_STRIP_GATE(80D3926C, &lit_3829); +COMPILER_STRIP_GATE(0x80D3926C, &lit_3829); #pragma pop /* 80D39270-80D39274 000044 0004+00 0/1 0/0 0/0 .rodata @3830 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3830 = 829.0f; -COMPILER_STRIP_GATE(80D39270, &lit_3830); +COMPILER_STRIP_GATE(0x80D39270, &lit_3830); #pragma pop /* 80D39274-80D39278 000048 0004+00 0/1 0/0 0/0 .rodata @3831 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3831 = -50.0f; -COMPILER_STRIP_GATE(80D39274, &lit_3831); +COMPILER_STRIP_GATE(0x80D39274, &lit_3831); #pragma pop /* 80D39278-80D3927C 00004C 0004+00 0/1 0/0 0/0 .rodata @3832 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3832 = 80.0f; -COMPILER_STRIP_GATE(80D39278, &lit_3832); +COMPILER_STRIP_GATE(0x80D39278, &lit_3832); #pragma pop /* 80D38B04-80D38F28 000424 0424+00 1/0 0/0 0/0 .text Execute__13daObjWindow_cFPPA3_A4_f @@ -566,9 +572,4 @@ static asm void daObjWindow_MoveBGDraw(daObjWindow_c* param_0) { } #pragma pop -/* 80D3927C-80D39284 000050 0008+00 1/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80D3927C = "J_KazeD"; -#pragma pop +/* 80D3927C-80D3927C 000050 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_wood_pendulum/d_a_obj_wood_pendulum.cpp b/rel/d/a/obj/d_a_obj_wood_pendulum/d_a_obj_wood_pendulum.cpp index 38df3eab14c..c8cdf597f74 100644 --- a/rel/d/a/obj/d_a_obj_wood_pendulum/d_a_obj_wood_pendulum.cpp +++ b/rel/d/a/obj/d_a_obj_wood_pendulum/d_a_obj_wood_pendulum.cpp @@ -199,7 +199,7 @@ SECTION_RODATA static u8 const l_sph_src[64] = { 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x43, 0x16, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D39C88, &l_sph_src); +COMPILER_STRIP_GATE(0x80D39C88, &l_sph_src); /* 80D39CC8-80D39D08 000040 0040+00 0/1 0/0 0/0 .rodata l_sph_src2 */ #pragma push @@ -210,7 +210,7 @@ SECTION_RODATA static u8 const l_sph_src2[64] = { 0x00, 0x00, 0x00, 0x08, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0xF0, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D39CC8, &l_sph_src2); +COMPILER_STRIP_GATE(0x80D39CC8, &l_sph_src2); #pragma pop /* 80D39D08-80D39D10 000080 0004+04 0/1 0/0 0/0 .rodata @3672 */ @@ -221,7 +221,7 @@ SECTION_RODATA static u32 const lit_3672[1 + 1 /* padding */] = { /* padding */ 0x00000000, }; -COMPILER_STRIP_GATE(80D39D08, &lit_3672); +COMPILER_STRIP_GATE(0x80D39D08, &lit_3672); #pragma pop /* 80D39D10-80D39D18 000088 0008+00 0/1 0/0 0/0 .rodata @3674 */ @@ -230,7 +230,7 @@ COMPILER_STRIP_GATE(80D39D08, &lit_3672); SECTION_RODATA static u8 const lit_3674[8] = { 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D39D10, &lit_3674); +COMPILER_STRIP_GATE(0x80D39D10, &lit_3674); #pragma pop /* 80D394CC-80D395C8 00014C 00FC+00 1/1 0/0 0/0 .text Create__13daObjWPndlm_cFv */ @@ -244,6 +244,12 @@ asm void daObjWPndlm_c::Create() { #pragma pop /* ############################################################################################## */ +/* 80D39D38-80D39D38 0000B0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80D39D38 = "A_Turuki"; +#pragma pop + /* 80D39D44-80D39D48 -00001 0004+00 3/3 0/0 0/0 .data l_arcName */ SECTION_DATA static void* l_arcName = (void*)&d_a_obj_wood_pendulum__stringBase0; @@ -352,7 +358,7 @@ SECTION_RODATA static u8 const lit_3826[24] = { 0xC2, 0x70, 0x00, 0x00, 0xC4, 0x8C, 0x00, 0x00, 0x42, 0xC8, 0x00, 0x00, 0x42, 0xA0, 0x00, 0x00, 0xC4, 0x99, 0xC0, 0x00, 0xC2, 0x48, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D39D18, &lit_3826); +COMPILER_STRIP_GATE(0x80D39D18, &lit_3826); #pragma pop /* 80D39D30-80D39D34 0000A8 0004+00 0/1 0/0 0/0 .rodata @3860 */ @@ -364,14 +370,14 @@ SECTION_RODATA static u8 const lit_3860[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D39D30, &lit_3860); +COMPILER_STRIP_GATE(0x80D39D30, &lit_3860); #pragma pop /* 80D39D34-80D39D38 0000AC 0004+00 0/1 0/0 0/0 .rodata @3861 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3861 = -1200.0f; -COMPILER_STRIP_GATE(80D39D34, &lit_3861); +COMPILER_STRIP_GATE(0x80D39D34, &lit_3861); #pragma pop /* 80D39978-80D39B68 0005F8 01F0+00 1/1 0/0 0/0 .text execute__13daObjWPndlm_cFv */ @@ -446,9 +452,4 @@ static asm void daObjWPndlm_Create(fopAc_ac_c* param_0) { } #pragma pop -/* 80D39D38-80D39D41 0000B0 0009+00 1/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80D39D38 = "A_Turuki"; -#pragma pop +/* 80D39D38-80D39D38 0000B0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_wood_statue/d_a_obj_wood_statue.cpp b/rel/d/a/obj/d_a_obj_wood_statue/d_a_obj_wood_statue.cpp index 07ac3094192..dec22c24351 100644 --- a/rel/d/a/obj/d_a_obj_wood_statue/d_a_obj_wood_statue.cpp +++ b/rel/d/a/obj/d_a_obj_wood_statue/d_a_obj_wood_statue.cpp @@ -110,7 +110,6 @@ struct dItem_data { struct dEvt_control_c { /* 80042468 */ void reset(); /* 80042518 */ void reset(void*); - /* 800436EC */ void setPtI_Id(unsigned int); }; struct dEvent_manager_c { @@ -208,10 +207,10 @@ struct cBgS { /* 80074744 */ void GetTriPla(cBgS_PolyInfo const&, cM3dGPla*) const; }; -struct Vec {}; - struct JAISoundID {}; +struct Vec {}; + struct Z2SeMgr { /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); }; @@ -281,7 +280,7 @@ extern "C" void execute__18JPAEmitterCallBackFP14JPABaseEmitter(); extern "C" void executeAfter__18JPAEmitterCallBackFP14JPABaseEmitter(); extern "C" void draw__18JPAEmitterCallBackFP14JPABaseEmitter(); extern "C" void drawAfter__18JPAEmitterCallBackFP14JPABaseEmitter(); -extern "C" void func_80D3B604(u8*); +extern "C" void func_80D3B604(void* _this, u8*); extern "C" static void func_80D3B620(); extern "C" static void func_80D3B628(); extern "C" extern char const* const d_a_obj_wood_statue__stringBase0; @@ -404,7 +403,7 @@ SECTION_RODATA static u8 const l_cyl_src[68] = { 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41, 0xA0, 0x00, 0x00, 0x42, 0x20, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D3B638, &l_cyl_src); +COMPILER_STRIP_GATE(0x80D3B638, &l_cyl_src); /* 80D3B67C-80D3B680 000044 0004+00 0/3 0/0 0/0 .rodata @3857 */ #pragma push @@ -415,7 +414,7 @@ SECTION_RODATA static u8 const lit_3857[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D3B67C, &lit_3857); +COMPILER_STRIP_GATE(0x80D3B67C, &lit_3857); #pragma pop /* 80D3B680-80D3B688 000048 0008+00 0/1 0/0 0/0 .rodata @3858 */ @@ -424,7 +423,7 @@ COMPILER_STRIP_GATE(80D3B67C, &lit_3857); SECTION_RODATA static u8 const lit_3858[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D3B680, &lit_3858); +COMPILER_STRIP_GATE(0x80D3B680, &lit_3858); #pragma pop /* 80D3B688-80D3B690 000050 0008+00 0/1 0/0 0/0 .rodata @3859 */ @@ -433,7 +432,7 @@ COMPILER_STRIP_GATE(80D3B680, &lit_3858); SECTION_RODATA static u8 const lit_3859[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D3B688, &lit_3859); +COMPILER_STRIP_GATE(0x80D3B688, &lit_3859); #pragma pop /* 80D3B690-80D3B698 000058 0008+00 0/1 0/0 0/0 .rodata @3860 */ @@ -442,7 +441,19 @@ COMPILER_STRIP_GATE(80D3B688, &lit_3859); SECTION_RODATA static u8 const lit_3860[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D3B690, &lit_3860); +COMPILER_STRIP_GATE(0x80D3B690, &lit_3860); +#pragma pop + +/* 80D3B6D4-80D3B6D4 00009C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80D3B6D4 = "O_wood"; +SECTION_DEAD static char const* const stringBase_80D3B6DB = "GET_WOOD_STATUE"; +SECTION_DEAD static char const* const stringBase_80D3B6EB = "DEFAULT_GETITEM"; +SECTION_DEAD static char const* const stringBase_80D3B6FB = "WAIT"; +SECTION_DEAD static char const* const stringBase_80D3B700 = "MOVE"; +SECTION_DEAD static char const* const stringBase_80D3B705 = "SETPOS"; +SECTION_DEAD static char const* const stringBase_80D3B70C = "NOTEND"; #pragma pop /* 80D3B71C-80D3B728 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ @@ -729,21 +740,21 @@ asm void daObjWStatue_c::setBaseMtx() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3943 = 30.0f; -COMPILER_STRIP_GATE(80D3B698, &lit_3943); +COMPILER_STRIP_GATE(0x80D3B698, &lit_3943); #pragma pop /* 80D3B69C-80D3B6A0 000064 0004+00 0/1 0/0 0/0 .rodata @3944 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3944 = -6.0f; -COMPILER_STRIP_GATE(80D3B69C, &lit_3944); +COMPILER_STRIP_GATE(0x80D3B69C, &lit_3944); #pragma pop /* 80D3B6A0-80D3B6A8 000068 0008+00 1/2 0/0 0/0 .rodata @3946 */ SECTION_RODATA static u8 const lit_3946[8] = { 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D3B6A0, &lit_3946); +COMPILER_STRIP_GATE(0x80D3B6A0, &lit_3946); /* 80D3A2F0-80D3A474 000530 0184+00 1/1 0/0 0/0 .text Create__14daObjWStatue_cFv */ #pragma push @@ -851,32 +862,32 @@ asm dBgS_ObjAcch::~dBgS_ObjAcch() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4128 = 5.0f; -COMPILER_STRIP_GATE(80D3B6A8, &lit_4128); +COMPILER_STRIP_GATE(0x80D3B6A8, &lit_4128); #pragma pop /* 80D3B6AC-80D3B6B0 000074 0004+00 2/4 0/0 0/0 .rodata @4129 */ SECTION_RODATA static f32 const lit_4129 = 1.0f; -COMPILER_STRIP_GATE(80D3B6AC, &lit_4129); +COMPILER_STRIP_GATE(0x80D3B6AC, &lit_4129); /* 80D3B6B0-80D3B6B4 000078 0004+00 0/1 0/0 0/0 .rodata @4130 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4130 = 7.0f / 10.0f; -COMPILER_STRIP_GATE(80D3B6B0, &lit_4130); +COMPILER_STRIP_GATE(0x80D3B6B0, &lit_4130); #pragma pop /* 80D3B6B4-80D3B6B8 00007C 0004+00 0/1 0/0 0/0 .rodata @4131 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4131 = 3.0f; -COMPILER_STRIP_GATE(80D3B6B4, &lit_4131); +COMPILER_STRIP_GATE(0x80D3B6B4, &lit_4131); #pragma pop /* 80D3B6B8-80D3B6BC 000080 0004+00 0/1 0/0 0/0 .rodata @4132 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4132 = -1.0f; -COMPILER_STRIP_GATE(80D3B6B8, &lit_4132); +COMPILER_STRIP_GATE(0x80D3B6B8, &lit_4132); #pragma pop /* 80D3A8E8-80D3AA3C 000B28 0154+00 1/1 0/0 0/0 .text bg_check__14daObjWStatue_cFv */ @@ -905,7 +916,7 @@ asm void daObjWStatue_c::actionWaitInit() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4168 = 9.0f / 10.0f; -COMPILER_STRIP_GATE(80D3B6BC, &lit_4168); +COMPILER_STRIP_GATE(0x80D3B6BC, &lit_4168); #pragma pop /* 80D3AA80-80D3AB9C 000CC0 011C+00 1/0 0/0 0/0 .text actionWait__14daObjWStatue_cFv */ @@ -974,7 +985,7 @@ asm void daObjWStatue_c::actionSwOnWait() { /* ############################################################################################## */ /* 80D3B6C0-80D3B6C4 000088 0004+00 1/1 0/0 0/0 .rodata @4256 */ SECTION_RODATA static f32 const lit_4256 = 4.0f; -COMPILER_STRIP_GATE(80D3B6C0, &lit_4256); +COMPILER_STRIP_GATE(0x80D3B6C0, &lit_4256); /* 80D3AE7C-80D3AF5C 0010BC 00E0+00 1/1 0/0 0/0 .text actionInitBoomerangCarry__14daObjWStatue_cFv */ @@ -1002,28 +1013,34 @@ asm void daObjWStatue_c::actionBoomerangCarry() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4321 = 10.0f; -COMPILER_STRIP_GATE(80D3B6C4, &lit_4321); +COMPILER_STRIP_GATE(0x80D3B6C4, &lit_4321); #pragma pop /* 80D3B6C8-80D3B6CC 000090 0004+00 0/1 0/0 0/0 .rodata @4322 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4322 = -2.5f; -COMPILER_STRIP_GATE(80D3B6C8, &lit_4322); +COMPILER_STRIP_GATE(0x80D3B6C8, &lit_4322); #pragma pop /* 80D3B6CC-80D3B6D0 000094 0004+00 0/1 0/0 0/0 .rodata @4323 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4323 = 20.0f; -COMPILER_STRIP_GATE(80D3B6CC, &lit_4323); +COMPILER_STRIP_GATE(0x80D3B6CC, &lit_4323); #pragma pop /* 80D3B6D0-80D3B6D4 000098 0004+00 0/1 0/0 0/0 .rodata @4324 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4324 = 100.0f; -COMPILER_STRIP_GATE(80D3B6D0, &lit_4324); +COMPILER_STRIP_GATE(0x80D3B6D0, &lit_4324); +#pragma pop + +/* 80D3B6D4-80D3B6D4 00009C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80D3B713 = "Timer"; #pragma pop /* 80D3AFC0-80D3B164 001200 01A4+00 1/1 0/0 0/0 .text demoProc__14daObjWStatue_cFv */ @@ -1180,7 +1197,7 @@ void JPAEmitterCallBack::drawAfter(JPABaseEmitter* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80D3B604(u8* param_0) { +extern "C" asm void func_80D3B604(void* _this, u8* param_0) { nofralloc #include "asm/rel/d/a/obj/d_a_obj_wood_statue/d_a_obj_wood_statue/func_80D3B604.s" } @@ -1206,16 +1223,4 @@ static asm void func_80D3B628() { } #pragma pop -/* 80D3B6D4-80D3B719 00009C 0045+00 6/3 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80D3B6D4 = "O_wood"; -SECTION_DEAD static char const* const stringBase_80D3B6DB = "GET_WOOD_STATUE"; -SECTION_DEAD static char const* const stringBase_80D3B6EB = "DEFAULT_GETITEM"; -SECTION_DEAD static char const* const stringBase_80D3B6FB = "WAIT"; -SECTION_DEAD static char const* const stringBase_80D3B700 = "MOVE"; -SECTION_DEAD static char const* const stringBase_80D3B705 = "SETPOS"; -SECTION_DEAD static char const* const stringBase_80D3B70C = "NOTEND"; -SECTION_DEAD static char const* const stringBase_80D3B713 = "Timer"; -#pragma pop +/* 80D3B6D4-80D3B6D4 00009C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_wsword/d_a_obj_wsword.cpp b/rel/d/a/obj/d_a_obj_wsword/d_a_obj_wsword.cpp index 765ceec64dc..82925a50f99 100644 --- a/rel/d/a/obj/d_a_obj_wsword/d_a_obj_wsword.cpp +++ b/rel/d/a/obj/d_a_obj_wsword/d_a_obj_wsword.cpp @@ -201,6 +201,14 @@ asm void daObjWSword_c::setBaseMtx() { #pragma pop /* ############################################################################################## */ +/* 80D3BF20-80D3BF20 000000 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80D3BF20 = "Obj_brksw"; +/* @stringBase0 padding */ +SECTION_DEAD static char const* const pad_80D3BF2A = "\0"; +#pragma pop + /* 80D3BF2C-80D3BF30 -00001 0004+00 3/3 0/0 0/0 .data l_arcName */ SECTION_DATA static void* l_arcName = (void*)&d_a_obj_wsword__stringBase0; @@ -415,11 +423,4 @@ static asm void func_80D3BF10() { } #pragma pop -/* 80D3BF20-80D3BF2C 000000 000A+02 1/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80D3BF20 = "Obj_brksw"; -/* @stringBase0 padding */ -SECTION_DEAD static char const* const pad_80D3BF2A = "\0"; -#pragma pop +/* 80D3BF20-80D3BF20 000000 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_yel_bag/d_a_obj_yel_bag.cpp b/rel/d/a/obj/d_a_obj_yel_bag/d_a_obj_yel_bag.cpp index b88a68502f4..4e4e36b5570 100644 --- a/rel/d/a/obj/d_a_obj_yel_bag/d_a_obj_yel_bag.cpp +++ b/rel/d/a/obj/d_a_obj_yel_bag/d_a_obj_yel_bag.cpp @@ -239,7 +239,7 @@ extern "C" static void daObj_YBag_Execute__FPv(); extern "C" static void daObj_YBag_Draw__FPv(); extern "C" static bool daObj_YBag_IsDelete__FPv(); extern "C" void __dt__10cCcD_GSttsFv(); -extern "C" void func_80D3DB90(int*); +extern "C" void func_80D3DB90(void* _this, int*); extern "C" void __sinit_d_a_obj_yel_bag_cpp(); extern "C" void __dt__18daObj_YBag_Param_cFv(); extern "C" static void func_80D3DC68(); @@ -356,6 +356,12 @@ extern "C" void __register_global_object(); // /* ############################################################################################## */ +/* 80D3DD6C-80D3DD6C 0000E0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80D3DD6C = "yel_bag"; +#pragma pop + /* 80D3DD74-80D3DD80 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -571,7 +577,7 @@ SECTION_RODATA u8 const daObj_YBag_c::mCcDObjInfo[48] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x79, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D3DC8C, &daObj_YBag_c::mCcDObjInfo); +COMPILER_STRIP_GATE(0x80D3DC8C, &daObj_YBag_c::mCcDObjInfo); /* 80D3DCBC-80D3DCE8 000030 002C+00 0/3 0/0 0/0 .rodata m__18daObj_YBag_Param_c */ #pragma push @@ -581,35 +587,35 @@ SECTION_RODATA u8 const daObj_YBag_Param_c::m[44] = { 0x00, 0x43, 0x7F, 0x00, 0x00, 0x41, 0x20, 0x00, 0x00, 0x40, 0x80, 0x00, 0x00, 0x41, 0x20, 0x00, 0x00, 0x42, 0x24, 0x00, 0x00, 0x42, 0x00, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D3DCBC, &daObj_YBag_Param_c::m); +COMPILER_STRIP_GATE(0x80D3DCBC, &daObj_YBag_Param_c::m); #pragma pop /* 80D3DCE8-80D3DCEC 00005C 0004+00 0/1 0/0 0/0 .rodata @4021 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4021 = -300.0f; -COMPILER_STRIP_GATE(80D3DCE8, &lit_4021); +COMPILER_STRIP_GATE(0x80D3DCE8, &lit_4021); #pragma pop /* 80D3DCEC-80D3DCF0 000060 0004+00 0/2 0/0 0/0 .rodata @4022 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4022 = -50.0f; -COMPILER_STRIP_GATE(80D3DCEC, &lit_4022); +COMPILER_STRIP_GATE(0x80D3DCEC, &lit_4022); #pragma pop /* 80D3DCF0-80D3DCF4 000064 0004+00 0/1 0/0 0/0 .rodata @4023 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4023 = 300.0f; -COMPILER_STRIP_GATE(80D3DCF0, &lit_4023); +COMPILER_STRIP_GATE(0x80D3DCF0, &lit_4023); #pragma pop /* 80D3DCF4-80D3DCF8 000068 0004+00 0/1 0/0 0/0 .rodata @4024 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4024 = 450.0f; -COMPILER_STRIP_GATE(80D3DCF4, &lit_4024); +COMPILER_STRIP_GATE(0x80D3DCF4, &lit_4024); #pragma pop /* 80D3C610-80D3C898 000610 0288+00 1/1 0/0 0/0 .text create__12daObj_YBag_cFv */ @@ -650,147 +656,147 @@ SECTION_RODATA static u8 const lit_4312[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D3DCF8, &lit_4312); +COMPILER_STRIP_GATE(0x80D3DCF8, &lit_4312); /* 80D3DCFC-80D3DD00 000070 0004+00 0/1 0/0 0/0 .rodata @4313 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4313 = 0x43360B61; -COMPILER_STRIP_GATE(80D3DCFC, &lit_4313); +COMPILER_STRIP_GATE(0x80D3DCFC, &lit_4313); #pragma pop /* 80D3DD00-80D3DD04 000074 0004+00 0/2 0/0 0/0 .rodata @4314 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4314 = -1000000000.0f; -COMPILER_STRIP_GATE(80D3DD00, &lit_4314); +COMPILER_STRIP_GATE(0x80D3DD00, &lit_4314); #pragma pop /* 80D3DD04-80D3DD08 000078 0004+00 0/1 0/0 0/0 .rodata @4315 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4315 = 3000.0f; -COMPILER_STRIP_GATE(80D3DD04, &lit_4315); +COMPILER_STRIP_GATE(0x80D3DD04, &lit_4315); #pragma pop /* 80D3DD08-80D3DD0C 00007C 0004+00 0/1 0/0 0/0 .rodata @4316 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4316 = 3.0f / 10.0f; -COMPILER_STRIP_GATE(80D3DD08, &lit_4316); +COMPILER_STRIP_GATE(0x80D3DD08, &lit_4316); #pragma pop /* 80D3DD0C-80D3DD10 000080 0004+00 0/1 0/0 0/0 .rodata @4317 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4317 = 2.0f; -COMPILER_STRIP_GATE(80D3DD0C, &lit_4317); +COMPILER_STRIP_GATE(0x80D3DD0C, &lit_4317); #pragma pop /* 80D3DD10-80D3DD14 000084 0004+00 0/1 0/0 0/0 .rodata @4318 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4318 = 0.5f; -COMPILER_STRIP_GATE(80D3DD10, &lit_4318); +COMPILER_STRIP_GATE(0x80D3DD10, &lit_4318); #pragma pop /* 80D3DD14-80D3DD18 000088 0004+00 0/1 0/0 0/0 .rodata @4319 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4319 = 5.5f; -COMPILER_STRIP_GATE(80D3DD14, &lit_4319); +COMPILER_STRIP_GATE(0x80D3DD14, &lit_4319); #pragma pop /* 80D3DD18-80D3DD1C 00008C 0004+00 0/1 0/0 0/0 .rodata @4320 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4320 = 0.75f; -COMPILER_STRIP_GATE(80D3DD18, &lit_4320); +COMPILER_STRIP_GATE(0x80D3DD18, &lit_4320); #pragma pop /* 80D3DD1C-80D3DD20 000090 0004+00 0/1 0/0 0/0 .rodata @4321 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4321 = 0.25f; -COMPILER_STRIP_GATE(80D3DD1C, &lit_4321); +COMPILER_STRIP_GATE(0x80D3DD1C, &lit_4321); #pragma pop /* 80D3DD20-80D3DD24 000094 0004+00 1/3 0/0 0/0 .rodata @4322 */ SECTION_RODATA static f32 const lit_4322 = 1.0f; -COMPILER_STRIP_GATE(80D3DD20, &lit_4322); +COMPILER_STRIP_GATE(0x80D3DD20, &lit_4322); /* 80D3DD24-80D3DD28 000098 0004+00 0/1 0/0 0/0 .rodata @4323 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4323 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(80D3DD24, &lit_4323); +COMPILER_STRIP_GATE(0x80D3DD24, &lit_4323); #pragma pop /* 80D3DD28-80D3DD2C 00009C 0004+00 0/1 0/0 0/0 .rodata @4324 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4324 = 2000.0f; -COMPILER_STRIP_GATE(80D3DD28, &lit_4324); +COMPILER_STRIP_GATE(0x80D3DD28, &lit_4324); #pragma pop /* 80D3DD2C-80D3DD30 0000A0 0004+00 0/1 0/0 0/0 .rodata @4325 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4325 = 1000.0f; -COMPILER_STRIP_GATE(80D3DD2C, &lit_4325); +COMPILER_STRIP_GATE(0x80D3DD2C, &lit_4325); #pragma pop /* 80D3DD30-80D3DD34 0000A4 0004+00 0/1 0/0 0/0 .rodata @4326 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4326 = -30.0f; -COMPILER_STRIP_GATE(80D3DD30, &lit_4326); +COMPILER_STRIP_GATE(0x80D3DD30, &lit_4326); #pragma pop /* 80D3DD34-80D3DD38 0000A8 0004+00 0/1 0/0 0/0 .rodata @4327 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4327 = 1200.0f; -COMPILER_STRIP_GATE(80D3DD34, &lit_4327); +COMPILER_STRIP_GATE(0x80D3DD34, &lit_4327); #pragma pop /* 80D3DD38-80D3DD3C 0000AC 0004+00 0/1 0/0 0/0 .rodata @4328 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4328 = 900.0f; -COMPILER_STRIP_GATE(80D3DD38, &lit_4328); +COMPILER_STRIP_GATE(0x80D3DD38, &lit_4328); #pragma pop /* 80D3DD3C-80D3DD40 0000B0 0004+00 1/2 0/0 0/0 .rodata @4329 */ SECTION_RODATA static f32 const lit_4329 = 1.0f / 20.0f; -COMPILER_STRIP_GATE(80D3DD3C, &lit_4329); +COMPILER_STRIP_GATE(0x80D3DD3C, &lit_4329); /* 80D3DD40-80D3DD44 0000B4 0004+00 0/1 0/0 0/0 .rodata @4330 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4330 = 100.0f; -COMPILER_STRIP_GATE(80D3DD40, &lit_4330); +COMPILER_STRIP_GATE(0x80D3DD40, &lit_4330); #pragma pop /* 80D3DD44-80D3DD48 0000B8 0004+00 0/1 0/0 0/0 .rodata @4331 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4331 = 9.0f / 20.0f; -COMPILER_STRIP_GATE(80D3DD44, &lit_4331); +COMPILER_STRIP_GATE(0x80D3DD44, &lit_4331); #pragma pop /* 80D3DD48-80D3DD4C 0000BC 0004+00 0/1 0/0 0/0 .rodata @4332 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4332 = 4.0f; -COMPILER_STRIP_GATE(80D3DD48, &lit_4332); +COMPILER_STRIP_GATE(0x80D3DD48, &lit_4332); #pragma pop /* 80D3DD4C-80D3DD54 0000C0 0008+00 1/2 0/0 0/0 .rodata @4334 */ SECTION_RODATA static u8 const lit_4334[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D3DD4C, &lit_4334); +COMPILER_STRIP_GATE(0x80D3DD4C, &lit_4334); /* 80D3C970-80D3D32C 000970 09BC+00 2/2 0/0 0/0 .text Execute__12daObj_YBag_cFv */ #pragma push @@ -807,7 +813,7 @@ asm void daObj_YBag_c::Execute() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4351 = 20.0f; -COMPILER_STRIP_GATE(80D3DD54, &lit_4351); +COMPILER_STRIP_GATE(0x80D3DD54, &lit_4351); #pragma pop /* 80D3D32C-80D3D438 00132C 010C+00 1/1 0/0 0/0 .text Draw__12daObj_YBag_cFv */ @@ -897,21 +903,21 @@ asm void daObj_YBag_c::calcRollAngle(s16 param_0, int param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4485 = 5.0f; -COMPILER_STRIP_GATE(80D3DD58, &lit_4485); +COMPILER_STRIP_GATE(0x80D3DD58, &lit_4485); #pragma pop /* 80D3DD5C-80D3DD60 0000D0 0004+00 0/1 0/0 0/0 .rodata @4486 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4486 = 200.0f; -COMPILER_STRIP_GATE(80D3DD5C, &lit_4486); +COMPILER_STRIP_GATE(0x80D3DD5C, &lit_4486); #pragma pop /* 80D3DD60-80D3DD64 0000D4 0004+00 0/1 0/0 0/0 .rodata @4487 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4487 = -1.0f; -COMPILER_STRIP_GATE(80D3DD60, &lit_4487); +COMPILER_STRIP_GATE(0x80D3DD60, &lit_4487); #pragma pop /* 80D3D73C-80D3D8CC 00173C 0190+00 1/1 0/0 0/0 .text getWallAngle__12daObj_YBag_cFsPs */ @@ -927,7 +933,7 @@ asm void daObj_YBag_c::getWallAngle(s16 param_0, s16* param_1) { /* ############################################################################################## */ /* 80D3DD64-80D3DD68 0000D8 0004+00 2/2 0/0 0/0 .rodata @4503 */ SECTION_RODATA static f32 const lit_4503 = 2.0f / 5.0f; -COMPILER_STRIP_GATE(80D3DD64, &lit_4503); +COMPILER_STRIP_GATE(0x80D3DD64, &lit_4503); /* 80D3D8CC-80D3D948 0018CC 007C+00 1/1 0/0 0/0 .text setSmokePrtcl__12daObj_YBag_cFv */ #pragma push @@ -1064,7 +1070,7 @@ asm void daObj_YBag_c::setWaterPrtcl() { /* ############################################################################################## */ /* 80D3DD68-80D3DD6C 0000DC 0004+00 1/1 0/0 0/0 .rodata @4550 */ SECTION_RODATA static f32 const lit_4550 = 7.0f / 10.0f; -COMPILER_STRIP_GATE(80D3DD68, &lit_4550); +COMPILER_STRIP_GATE(0x80D3DD68, &lit_4550); /* 80D3DA70-80D3DAC0 001A70 0050+00 1/1 0/0 0/0 .text setHamonPrtcl__12daObj_YBag_cFv */ #pragma push @@ -1135,7 +1141,7 @@ asm cCcD_GStts::~cCcD_GStts() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80D3DB90(int* param_0) { +extern "C" asm void func_80D3DB90(void* _this, int* param_0) { nofralloc #include "asm/rel/d/a/obj/d_a_obj_yel_bag/d_a_obj_yel_bag/func_80D3DB90.s" } @@ -1161,7 +1167,7 @@ asm void __sinit_d_a_obj_yel_bag_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80D3DBAC = (void*)__sinit_d_a_obj_yel_bag_cpp; +REGISTER_CTORS(0x80D3DBAC, __sinit_d_a_obj_yel_bag_cpp); #pragma pop /* 80D3DC20-80D3DC68 001C20 0048+00 2/1 0/0 0/0 .text __dt__18daObj_YBag_Param_cFv */ @@ -1366,9 +1372,4 @@ static u8 data_80D3DF98[4]; static u8 data_80D3DF9C[4]; #pragma pop -/* 80D3DD6C-80D3DD74 0000E0 0008+00 1/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80D3DD6C = "yel_bag"; -#pragma pop +/* 80D3DD6C-80D3DD6C 0000E0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa.cpp b/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa.cpp index 1cf815a73cd..475b166588e 100644 --- a/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa.cpp +++ b/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa.cpp @@ -294,6 +294,13 @@ extern "C" u8 sincosTable___5JMath[65536]; // /* ############################################################################################## */ +/* 8059DF24-8059DF24 0000A8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8059DF24 = "J_Tobi"; +SECTION_DEAD static char const* const stringBase_8059DF2B = "J_Umak"; +#pragma pop + /* 8059DF68-8059DF74 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -437,7 +444,7 @@ SECTION_RODATA u8 const daObjYobikusa_c::M_attr[64] = { 0x43, 0xC8, 0x00, 0x00, 0x3C, 0xA3, 0xD7, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x45, 0x9C, 0x40, 0x00, 0x43, 0x16, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x27, 0x10, 0x19, 0xB6, }; -COMPILER_STRIP_GATE(8059DE7C, &daObjYobikusa_c::M_attr); +COMPILER_STRIP_GATE(0x8059DE7C, &daObjYobikusa_c::M_attr); /* 8059DEBC-8059DEC0 000040 0004+00 2/5 0/0 0/0 .rodata @3699 */ SECTION_RODATA static u8 const lit_3699[4] = { @@ -446,7 +453,7 @@ SECTION_RODATA static u8 const lit_3699[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(8059DEBC, &lit_3699); +COMPILER_STRIP_GATE(0x8059DEBC, &lit_3699); /* 8059CA8C-8059CC54 00010C 01C8+00 1/0 0/0 0/0 .text executeSwingWind__15daObjYobikusa_cFv */ #pragma push @@ -472,7 +479,7 @@ asm void daObjYobikusa_c::initPushDown() { /* ############################################################################################## */ /* 8059DEC0-8059DEC4 000044 0004+00 1/1 0/0 0/0 .rodata @3724 */ SECTION_RODATA static f32 const lit_3724 = 65.0f; -COMPILER_STRIP_GATE(8059DEC0, &lit_3724); +COMPILER_STRIP_GATE(0x8059DEC0, &lit_3724); /* 8059CC60-8059CD44 0002E0 00E4+00 1/0 0/0 0/0 .text executePushDown__15daObjYobikusa_cFv */ #pragma push @@ -510,46 +517,46 @@ asm void daObjYobikusa_c::executePickLeaf() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3773 = -50.0f; -COMPILER_STRIP_GATE(8059DEC4, &lit_3773); +COMPILER_STRIP_GATE(0x8059DEC4, &lit_3773); #pragma pop /* 8059DEC8-8059DECC 00004C 0004+00 0/1 0/0 0/0 .rodata @3774 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3774 = -30.0f; -COMPILER_STRIP_GATE(8059DEC8, &lit_3774); +COMPILER_STRIP_GATE(0x8059DEC8, &lit_3774); #pragma pop /* 8059DECC-8059DED0 000050 0004+00 0/1 0/0 0/0 .rodata @3775 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3775 = 50.0f; -COMPILER_STRIP_GATE(8059DECC, &lit_3775); +COMPILER_STRIP_GATE(0x8059DECC, &lit_3775); #pragma pop /* 8059DED0-8059DED4 000054 0004+00 0/1 0/0 0/0 .rodata @3776 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3776 = 120.0f; -COMPILER_STRIP_GATE(8059DED0, &lit_3776); +COMPILER_STRIP_GATE(0x8059DED0, &lit_3776); #pragma pop /* 8059DED4-8059DED8 000058 0004+00 0/1 0/0 0/0 .rodata @3777 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3777 = 30.0f; -COMPILER_STRIP_GATE(8059DED4, &lit_3777); +COMPILER_STRIP_GATE(0x8059DED4, &lit_3777); #pragma pop /* 8059DED8-8059DEDC 00005C 0004+00 1/4 0/0 0/0 .rodata @3778 */ SECTION_RODATA static f32 const lit_3778 = 1.0f; -COMPILER_STRIP_GATE(8059DED8, &lit_3778); +COMPILER_STRIP_GATE(0x8059DED8, &lit_3778); /* 8059DEDC-8059DEE0 000060 0004+00 0/1 0/0 0/0 .rodata @3779 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3779 = 65535.0f; -COMPILER_STRIP_GATE(8059DEDC, &lit_3779); +COMPILER_STRIP_GATE(0x8059DEDC, &lit_3779); #pragma pop /* 8059E020-8059E040 -00001 0020+00 1/0 0/0 0/0 .data l_daObjYobikusa_Method */ @@ -712,7 +719,7 @@ SECTION_RODATA static u8 const ccCylSrc[68] = { 0x00, 0x04, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41, 0xF0, 0x00, 0x00, 0x42, 0xA0, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8059DEE0, &ccCylSrc); +COMPILER_STRIP_GATE(0x8059DEE0, &ccCylSrc); /* 8059D320-8059D380 0009A0 0060+00 1/1 0/0 0/0 .text initCcCylinder__15daObjYobikusa_cFv */ @@ -756,6 +763,16 @@ asm void daObjYobikusa_c::setNewLeaf() { } #pragma pop +/* ############################################################################################## */ +/* 8059DF24-8059DF24 0000A8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8059DF32 = "J_Tobi.bmd"; +SECTION_DEAD static char const* const stringBase_8059DF3D = "J_Tobi_c.bmd"; +SECTION_DEAD static char const* const stringBase_8059DF4A = "J_Umakusa.bmd"; +SECTION_DEAD static char const* const stringBase_8059DF58 = "J_Umakusa_c.bmd"; +#pragma pop + /* 8059D520-8059D674 000BA0 0154+00 1/1 0/0 0/0 .text createSolidHeap__FP10fopAc_ac_c */ #pragma push #pragma optimization_level 0 @@ -880,7 +897,7 @@ asm void __sinit_d_a_obj_yobikusa_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_8059DDC0 = (void*)__sinit_d_a_obj_yobikusa_cpp; +REGISTER_CTORS(0x8059DDC0, __sinit_d_a_obj_yobikusa_cpp); #pragma pop /* 8059DE60-8059DE68 0014E0 0008+00 1/0 0/0 0/0 .text @36@__dt__12dBgS_ObjAcchFv */ @@ -903,14 +920,4 @@ static asm void func_8059DE68() { } #pragma pop -/* 8059DF24-8059DF68 0000A8 0044+00 3/1 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_8059DF24 = "J_Tobi"; -SECTION_DEAD static char const* const stringBase_8059DF2B = "J_Umak"; -SECTION_DEAD static char const* const stringBase_8059DF32 = "J_Tobi.bmd"; -SECTION_DEAD static char const* const stringBase_8059DF3D = "J_Tobi_c.bmd"; -SECTION_DEAD static char const* const stringBase_8059DF4A = "J_Umakusa.bmd"; -SECTION_DEAD static char const* const stringBase_8059DF58 = "J_Umakusa_c.bmd"; -#pragma pop +/* 8059DF24-8059DF24 0000A8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_yousei/d_a_obj_yousei.cpp b/rel/d/a/obj/d_a_obj_yousei/d_a_obj_yousei.cpp index 03477b0e443..f10290a215f 100644 --- a/rel/d/a/obj/d_a_obj_yousei/d_a_obj_yousei.cpp +++ b/rel/d/a/obj/d_a_obj_yousei/d_a_obj_yousei.cpp @@ -27,19 +27,19 @@ struct mDoMtx_stack_c { static u8 now[48]; }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; +struct J3DAnmTransform {}; + +struct J3DModelData {}; + struct Z2Creature { /* 802C03C8 */ Z2Creature(); /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; -struct J3DAnmTransform {}; - struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -397,7 +397,7 @@ SECTION_RODATA static u8 const ccSphSrc[64] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0x20, 0x00, 0x00, }; -COMPILER_STRIP_GATE(804D15F0, &ccSphSrc); +COMPILER_STRIP_GATE(0x804D15F0, &ccSphSrc); /* 804CE738-804CE7A4 000078 006C+00 1/1 0/0 0/0 .text InitCcSph__13daObjYOUSEI_cFv */ #pragma push @@ -412,7 +412,7 @@ asm void daObjYOUSEI_c::InitCcSph() { /* ############################################################################################## */ /* 804D1630-804D1634 000040 0004+00 1/2 0/0 0/0 .rodata @3661 */ SECTION_RODATA static f32 const lit_3661 = 40.0f; -COMPILER_STRIP_GATE(804D1630, &lit_3661); +COMPILER_STRIP_GATE(0x804D1630, &lit_3661); /* 804CE7A4-804CE7FC 0000E4 0058+00 1/1 0/0 0/0 .text SetCcSph__13daObjYOUSEI_cFv */ #pragma push @@ -427,7 +427,13 @@ asm void daObjYOUSEI_c::SetCcSph() { /* ############################################################################################## */ /* 804D1634-804D1638 000044 0004+00 1/2 0/0 0/0 .rodata @3680 */ SECTION_RODATA static f32 const lit_3680 = 2.0f / 5.0f; -COMPILER_STRIP_GATE(804D1634, &lit_3680); +COMPILER_STRIP_GATE(0x804D1634, &lit_3680); + +/* 804D1720-804D1720 000130 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_804D1720 = "Always"; +#pragma pop /* 804CE7FC-804CE8DC 00013C 00E0+00 1/1 0/0 0/0 .text useHeapInit__FP10fopAc_ac_c */ #pragma push @@ -468,7 +474,7 @@ SECTION_RODATA static u8 const lit_3708[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(804D1638, &lit_3708); +COMPILER_STRIP_GATE(0x804D1638, &lit_3708); /* 804CE920-804CE9D0 000260 00B0+00 1/1 0/0 0/0 .text SpeedSet__13daObjYOUSEI_cFv */ #pragma push @@ -485,93 +491,93 @@ asm void daObjYOUSEI_c::SpeedSet() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3790 = 25.0f; -COMPILER_STRIP_GATE(804D163C, &lit_3790); +COMPILER_STRIP_GATE(0x804D163C, &lit_3790); #pragma pop /* 804D1640-804D1644 000050 0004+00 1/6 0/0 0/0 .rodata @3791 */ SECTION_RODATA static f32 const lit_3791 = 1.0f; -COMPILER_STRIP_GATE(804D1640, &lit_3791); +COMPILER_STRIP_GATE(0x804D1640, &lit_3791); /* 804D1644-804D1648 000054 0004+00 0/1 0/0 0/0 .rodata @3792 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3792 = 120.0f; -COMPILER_STRIP_GATE(804D1644, &lit_3792); +COMPILER_STRIP_GATE(0x804D1644, &lit_3792); #pragma pop /* 804D1648-804D164C 000058 0004+00 0/1 0/0 0/0 .rodata @3793 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3793 = 3.0f / 100.0f; -COMPILER_STRIP_GATE(804D1648, &lit_3793); +COMPILER_STRIP_GATE(0x804D1648, &lit_3793); #pragma pop /* 804D164C-804D1650 00005C 0004+00 0/4 0/0 0/0 .rodata @3794 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3794 = 10.0f; -COMPILER_STRIP_GATE(804D164C, &lit_3794); +COMPILER_STRIP_GATE(0x804D164C, &lit_3794); #pragma pop /* 804D1650-804D1654 000060 0004+00 1/3 0/0 0/0 .rodata @3795 */ SECTION_RODATA static f32 const lit_3795 = 130.0f; -COMPILER_STRIP_GATE(804D1650, &lit_3795); +COMPILER_STRIP_GATE(0x804D1650, &lit_3795); /* 804D1654-804D1658 000064 0004+00 0/1 0/0 0/0 .rodata @3796 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3796 = 600.0f; -COMPILER_STRIP_GATE(804D1654, &lit_3796); +COMPILER_STRIP_GATE(0x804D1654, &lit_3796); #pragma pop /* 804D1658-804D165C 000068 0004+00 0/1 0/0 0/0 .rodata @3797 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3797 = 3.0f / 50.0f; -COMPILER_STRIP_GATE(804D1658, &lit_3797); +COMPILER_STRIP_GATE(0x804D1658, &lit_3797); #pragma pop /* 804D165C-804D1660 00006C 0004+00 1/6 0/0 0/0 .rodata @3798 */ SECTION_RODATA static f32 const lit_3798 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(804D165C, &lit_3798); +COMPILER_STRIP_GATE(0x804D165C, &lit_3798); /* 804D1660-804D1664 000070 0004+00 0/1 0/0 0/0 .rodata @3799 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3799 = 3.0f / 5.0f; -COMPILER_STRIP_GATE(804D1660, &lit_3799); +COMPILER_STRIP_GATE(0x804D1660, &lit_3799); #pragma pop /* 804D1664-804D1668 000074 0004+00 0/3 0/0 0/0 .rodata @3800 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3800 = 3.0f; -COMPILER_STRIP_GATE(804D1664, &lit_3800); +COMPILER_STRIP_GATE(0x804D1664, &lit_3800); #pragma pop /* 804D1668-804D166C 000078 0004+00 0/3 0/0 0/0 .rodata @3801 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3801 = 2.0f; -COMPILER_STRIP_GATE(804D1668, &lit_3801); +COMPILER_STRIP_GATE(0x804D1668, &lit_3801); #pragma pop /* 804D166C-804D1670 00007C 0004+00 1/7 0/0 0/0 .rodata @3802 */ SECTION_RODATA static f32 const lit_3802 = 100.0f; -COMPILER_STRIP_GATE(804D166C, &lit_3802); +COMPILER_STRIP_GATE(0x804D166C, &lit_3802); /* 804D1670-804D1674 000080 0004+00 0/3 0/0 0/0 .rodata @3803 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3803 = 3.0f / 10.0f; -COMPILER_STRIP_GATE(804D1670, &lit_3803); +COMPILER_STRIP_GATE(0x804D1670, &lit_3803); #pragma pop /* 804D1674-804D1678 000084 0004+00 0/5 0/0 0/0 .rodata @3804 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3804 = 30.0f; -COMPILER_STRIP_GATE(804D1674, &lit_3804); +COMPILER_STRIP_GATE(0x804D1674, &lit_3804); #pragma pop /* 804D1678-804D1680 000088 0004+04 0/3 0/0 0/0 .rodata @3805 */ @@ -582,7 +588,7 @@ SECTION_RODATA static f32 const lit_3805[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(804D1678, &lit_3805); +COMPILER_STRIP_GATE(0x804D1678, &lit_3805); #pragma pop /* 804D1680-804D1688 000090 0008+00 0/2 0/0 0/0 .rodata @3807 */ @@ -591,7 +597,7 @@ COMPILER_STRIP_GATE(804D1678, &lit_3805); SECTION_RODATA static u8 const lit_3807[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(804D1680, &lit_3807); +COMPILER_STRIP_GATE(0x804D1680, &lit_3807); #pragma pop /* 804D17E8-804D17EC 000000 0001+03 1/1 0/0 0/0 .bss @1109 */ @@ -711,42 +717,42 @@ asm void daObjYOUSEI_c::MoveAction() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3849 = 1.5f; -COMPILER_STRIP_GATE(804D1688, &lit_3849); +COMPILER_STRIP_GATE(0x804D1688, &lit_3849); #pragma pop /* 804D168C-804D1690 00009C 0004+00 0/2 0/0 0/0 .rodata @3850 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3850 = 4.5f; -COMPILER_STRIP_GATE(804D168C, &lit_3850); +COMPILER_STRIP_GATE(0x804D168C, &lit_3850); #pragma pop /* 804D1690-804D1694 0000A0 0004+00 0/2 0/0 0/0 .rodata @3851 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3851 = -2.0f; -COMPILER_STRIP_GATE(804D1690, &lit_3851); +COMPILER_STRIP_GATE(0x804D1690, &lit_3851); #pragma pop /* 804D1694-804D1698 0000A4 0004+00 0/2 0/0 0/0 .rodata @3852 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3852 = 1.0f / 20.0f; -COMPILER_STRIP_GATE(804D1694, &lit_3852); +COMPILER_STRIP_GATE(0x804D1694, &lit_3852); #pragma pop /* 804D1698-804D169C 0000A8 0004+00 0/2 0/0 0/0 .rodata @3853 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3853 = 1.0f / 50.0f; -COMPILER_STRIP_GATE(804D1698, &lit_3853); +COMPILER_STRIP_GATE(0x804D1698, &lit_3853); #pragma pop /* 804D169C-804D16A0 0000AC 0004+00 0/4 0/0 0/0 .rodata @3854 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3854 = 5.0f; -COMPILER_STRIP_GATE(804D169C, &lit_3854); +COMPILER_STRIP_GATE(0x804D169C, &lit_3854); #pragma pop /* 804CEE50-804CF098 000790 0248+00 1/1 0/0 0/0 .text BinAction__13daObjYOUSEI_cFv */ @@ -766,7 +772,7 @@ asm void daObjYOUSEI_c::BinAction() { SECTION_RODATA static u8 const lit_3996[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(804D16A0, &lit_3996); +COMPILER_STRIP_GATE(0x804D16A0, &lit_3996); #pragma pop /* 804D16A8-804D16B0 0000B8 0008+00 0/2 0/0 0/0 .rodata @3997 */ @@ -775,7 +781,7 @@ COMPILER_STRIP_GATE(804D16A0, &lit_3996); SECTION_RODATA static u8 const lit_3997[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(804D16A8, &lit_3997); +COMPILER_STRIP_GATE(0x804D16A8, &lit_3997); #pragma pop /* 804D16B0-804D16B8 0000C0 0008+00 0/2 0/0 0/0 .rodata @3998 */ @@ -784,51 +790,51 @@ COMPILER_STRIP_GATE(804D16A8, &lit_3997); SECTION_RODATA static u8 const lit_3998[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(804D16B0, &lit_3998); +COMPILER_STRIP_GATE(0x804D16B0, &lit_3998); #pragma pop /* 804D16B8-804D16BC 0000C8 0004+00 0/1 0/0 0/0 .rodata @3999 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3999 = 500.0f; -COMPILER_STRIP_GATE(804D16B8, &lit_3999); +COMPILER_STRIP_GATE(0x804D16B8, &lit_3999); #pragma pop /* 804D16BC-804D16C0 0000CC 0004+00 0/3 0/0 0/0 .rodata @4000 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4000 = 80.0f; -COMPILER_STRIP_GATE(804D16BC, &lit_4000); +COMPILER_STRIP_GATE(0x804D16BC, &lit_4000); #pragma pop /* 804D16C0-804D16C4 0000D0 0004+00 0/2 0/0 0/0 .rodata @4001 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4001 = 29.0f / 50.0f; -COMPILER_STRIP_GATE(804D16C0, &lit_4001); +COMPILER_STRIP_GATE(0x804D16C0, &lit_4001); #pragma pop /* 804D16C4-804D16C8 0000D4 0004+00 0/2 0/0 0/0 .rodata @4002 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4002 = 7.0f / 20.0f; -COMPILER_STRIP_GATE(804D16C4, &lit_4002); +COMPILER_STRIP_GATE(0x804D16C4, &lit_4002); #pragma pop /* 804D16C8-804D16CC 0000D8 0004+00 1/4 0/0 0/0 .rodata @4003 */ SECTION_RODATA static f32 const lit_4003 = 200.0f; -COMPILER_STRIP_GATE(804D16C8, &lit_4003); +COMPILER_STRIP_GATE(0x804D16C8, &lit_4003); /* 804D16CC-804D16D0 0000DC 0004+00 0/1 0/0 0/0 .rodata @4004 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4004 = 51.0f / 100.0f; -COMPILER_STRIP_GATE(804D16CC, &lit_4004); +COMPILER_STRIP_GATE(0x804D16CC, &lit_4004); #pragma pop /* 804D16D0-804D16D4 0000E0 0004+00 2/7 0/0 0/0 .rodata @4005 */ SECTION_RODATA static f32 const lit_4005 = 50.0f; -COMPILER_STRIP_GATE(804D16D0, &lit_4005); +COMPILER_STRIP_GATE(0x804D16D0, &lit_4005); /* 804D1830-804D1834 -00001 0004+00 2/3 0/0 0/0 .bss None */ /* 804D1830 0001+00 data_804D1830 None */ @@ -850,84 +856,84 @@ asm void daObjYOUSEI_c::LinkChk() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4187 = 15.0f; -COMPILER_STRIP_GATE(804D16D4, &lit_4187); +COMPILER_STRIP_GATE(0x804D16D4, &lit_4187); #pragma pop /* 804D16D8-804D16DC 0000E8 0004+00 0/2 0/0 0/0 .rodata @4188 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4188 = 6.0f; -COMPILER_STRIP_GATE(804D16D8, &lit_4188); +COMPILER_STRIP_GATE(0x804D16D8, &lit_4188); #pragma pop /* 804D16DC-804D16E0 0000EC 0004+00 0/1 0/0 0/0 .rodata @4189 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4189 = 0.25f; -COMPILER_STRIP_GATE(804D16DC, &lit_4189); +COMPILER_STRIP_GATE(0x804D16DC, &lit_4189); #pragma pop /* 804D16E0-804D16E4 0000F0 0004+00 0/1 0/0 0/0 .rodata @4190 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4190 = 13.0f; -COMPILER_STRIP_GATE(804D16E0, &lit_4190); +COMPILER_STRIP_GATE(0x804D16E0, &lit_4190); #pragma pop /* 804D16E4-804D16E8 0000F4 0004+00 0/2 0/0 0/0 .rodata @4191 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4191 = 150.0f; -COMPILER_STRIP_GATE(804D16E4, &lit_4191); +COMPILER_STRIP_GATE(0x804D16E4, &lit_4191); #pragma pop /* 804D16E8-804D16EC 0000F8 0004+00 0/1 0/0 0/0 .rodata @4192 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4192 = 2.5f; -COMPILER_STRIP_GATE(804D16E8, &lit_4192); +COMPILER_STRIP_GATE(0x804D16E8, &lit_4192); #pragma pop /* 804D16EC-804D16F0 0000FC 0004+00 0/1 0/0 0/0 .rodata @4193 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4193 = 0x3F666667; -COMPILER_STRIP_GATE(804D16EC, &lit_4193); +COMPILER_STRIP_GATE(0x804D16EC, &lit_4193); #pragma pop /* 804D16F0-804D16F4 000100 0004+00 0/1 0/0 0/0 .rodata @4194 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4194 = 250.0f; -COMPILER_STRIP_GATE(804D16F0, &lit_4194); +COMPILER_STRIP_GATE(0x804D16F0, &lit_4194); #pragma pop /* 804D16F4-804D16F8 000104 0004+00 0/1 0/0 0/0 .rodata @4195 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4195 = 13.0f / 20.0f; -COMPILER_STRIP_GATE(804D16F4, &lit_4195); +COMPILER_STRIP_GATE(0x804D16F4, &lit_4195); #pragma pop /* 804D16F8-804D16FC 000108 0004+00 0/1 0/0 0/0 .rodata @4196 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4196 = 20.0f; -COMPILER_STRIP_GATE(804D16F8, &lit_4196); +COMPILER_STRIP_GATE(0x804D16F8, &lit_4196); #pragma pop /* 804D16FC-804D1700 00010C 0004+00 0/2 0/0 0/0 .rodata @4197 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4197 = -100.0f; -COMPILER_STRIP_GATE(804D16FC, &lit_4197); +COMPILER_STRIP_GATE(0x804D16FC, &lit_4197); #pragma pop /* 804D1700-804D1704 000110 0004+00 0/1 0/0 0/0 .rodata @4198 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4198 = 26.0f; -COMPILER_STRIP_GATE(804D1700, &lit_4198); +COMPILER_STRIP_GATE(0x804D1700, &lit_4198); #pragma pop /* 804CF6C4-804CFCE8 001004 0624+00 1/1 0/0 0/0 .text WaitAction__13daObjYOUSEI_cFv */ @@ -945,14 +951,14 @@ asm void daObjYOUSEI_c::WaitAction() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4394 = 0.5f; -COMPILER_STRIP_GATE(804D1704, &lit_4394); +COMPILER_STRIP_GATE(0x804D1704, &lit_4394); #pragma pop /* 804D1708-804D170C 000118 0004+00 0/1 0/0 0/0 .rodata @4395 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4395 = 0x3A83126F; -COMPILER_STRIP_GATE(804D1708, &lit_4395); +COMPILER_STRIP_GATE(0x804D1708, &lit_4395); #pragma pop /* 804CFCE8-804D057C 001628 0894+00 1/1 0/0 0/0 .text LinkAction__13daObjYOUSEI_cFv */ @@ -970,7 +976,7 @@ asm void daObjYOUSEI_c::LinkAction() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4419 = -200.0f; -COMPILER_STRIP_GATE(804D170C, &lit_4419); +COMPILER_STRIP_GATE(0x804D170C, &lit_4419); #pragma pop /* 804D057C-804D065C 001EBC 00E0+00 1/1 0/0 0/0 .text LinkSearch__13daObjYOUSEI_cFv */ @@ -996,7 +1002,7 @@ asm void daObjYOUSEI_c::WayBgCheck(f32 param_0, f32 param_1, s16 param_2) { /* ############################################################################################## */ /* 804D1710-804D1714 000120 0004+00 1/1 0/0 0/0 .rodata @4462 */ SECTION_RODATA static f32 const lit_4462 = 7.0f / 10.0f; -COMPILER_STRIP_GATE(804D1710, &lit_4462); +COMPILER_STRIP_GATE(0x804D1710, &lit_4462); /* 804D0780-804D080C 0020C0 008C+00 4/4 0/0 0/0 .text CareAction__13daObjYOUSEI_cFv */ #pragma push @@ -1011,7 +1017,7 @@ asm void daObjYOUSEI_c::CareAction() { /* ############################################################################################## */ /* 804D1714-804D1718 000124 0004+00 1/2 0/0 0/0 .rodata @4482 */ SECTION_RODATA static f32 const lit_4482 = -1000000000.0f; -COMPILER_STRIP_GATE(804D1714, &lit_4482); +COMPILER_STRIP_GATE(0x804D1714, &lit_4482); /* 804D1728-804D1748 -00001 0020+00 1/0 0/0 0/0 .data l_daObjYOUSEI_Method */ SECTION_DATA static void* l_daObjYOUSEI_Method[8] = { @@ -1163,7 +1169,7 @@ asm void daObjYOUSEI_c::setBaseMtx() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4682 = 4.0f / 5.0f; -COMPILER_STRIP_GATE(804D1718, &lit_4682); +COMPILER_STRIP_GATE(0x804D1718, &lit_4682); #pragma pop /* 804D1040-804D10FC 002980 00BC+00 1/0 0/0 0/0 .text daObjYOUSEI_Draw__FP13daObjYOUSEI_c @@ -1192,7 +1198,7 @@ static asm void daObjYOUSEI_Execute(daObjYOUSEI_c* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4796 = -50.0f; -COMPILER_STRIP_GATE(804D171C, &lit_4796); +COMPILER_STRIP_GATE(0x804D171C, &lit_4796); #pragma pop /* 804D111C-804D149C 002A5C 0380+00 1/1 0/0 0/0 .text create__13daObjYOUSEI_cFv */ @@ -1472,9 +1478,4 @@ static u8 data_804D1890[4]; static u8 data_804D1894[4]; #pragma pop -/* 804D1720-804D1727 000130 0007+00 1/1 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_804D1720 = "Always"; -#pragma pop +/* 804D1720-804D1720 000130 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_ystone/d_a_obj_ystone.cpp b/rel/d/a/obj/d_a_obj_ystone/d_a_obj_ystone.cpp index 7918dd8b7bb..c253cb01f60 100644 --- a/rel/d/a/obj/d_a_obj_ystone/d_a_obj_ystone.cpp +++ b/rel/d/a/obj/d_a_obj_ystone/d_a_obj_ystone.cpp @@ -41,16 +41,16 @@ struct mDoExt_baseAnm { /* 8000D428 */ void play(); }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; - struct J3DAnmTransform {}; +struct J3DModelData {}; + +struct Z2Creature {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -82,10 +82,10 @@ struct dRes_control_c { struct dPa_levelEcallBack {}; -struct _GXColor {}; - struct csXyz {}; +struct _GXColor {}; + struct dPa_control_c { /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, @@ -174,6 +174,22 @@ extern "C" extern u8 g_env_light[4880]; // /* ############################################################################################## */ +/* 80D3EC5C-80D3EC5C 000050 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80D3EC5C = "N_gD_mskF"; +SECTION_DEAD static char const* const stringBase_80D3EC66 = "N_gD_mskB"; +SECTION_DEAD static char const* const stringBase_80D3EC70 = "N_gD_mskT"; +SECTION_DEAD static char const* const stringBase_80D3EC7A = "MirrorB"; +SECTION_DEAD static char const* const stringBase_80D3EC82 = "D_MN05A"; +SECTION_DEAD static char const* const stringBase_80D3EC8A = "D_MN04A"; +SECTION_DEAD static char const* const stringBase_80D3EC92 = "D_MN01A"; +SECTION_DEAD static char const* const stringBase_80D3EC9A = "D_MN10A"; +SECTION_DEAD static char const* const stringBase_80D3ECA2 = "D_MN11A"; +SECTION_DEAD static char const* const stringBase_80D3ECAA = "D_MN06A"; +SECTION_DEAD static char const* const stringBase_80D3ECB2 = "D_MN07A"; +#pragma pop + /* 80D3ECBC-80D3ECD8 -00001 001C+00 4/4 0/0 0/0 .data l_arcName */ SECTION_DATA static void* l_arcName[7] = { (void*)&d_a_obj_ystone__stringBase0, @@ -234,7 +250,7 @@ SECTION_RODATA static u8 const l_bmdIndex[28] = { 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x0B, }; -COMPILER_STRIP_GATE(80D3EC0C, &l_bmdIndex); +COMPILER_STRIP_GATE(0x80D3EC0C, &l_bmdIndex); /* 80D3EC28-80D3EC34 00001C 000C+00 0/1 0/0 0/0 .rodata l_brkIndex */ #pragma push @@ -242,7 +258,7 @@ COMPILER_STRIP_GATE(80D3EC0C, &l_bmdIndex); SECTION_RODATA static u8 const l_brkIndex[12] = { 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x07, }; -COMPILER_STRIP_GATE(80D3EC28, &l_brkIndex); +COMPILER_STRIP_GATE(0x80D3EC28, &l_brkIndex); #pragma pop /* 80D3EC34-80D3EC50 000028 001C+00 0/1 0/0 0/0 .rodata l_btkIndex */ @@ -252,12 +268,12 @@ SECTION_RODATA static u8 const l_btkIndex[28] = { 0x00, 0x00, 0x00, 0x0E, 0x00, 0x00, 0x00, 0x0E, 0x00, 0x00, 0x00, 0x0E, 0x00, 0x00, 0x00, 0x0E, 0x00, 0x00, 0x00, 0x0E, 0x00, 0x00, 0x00, 0x0F, 0x00, 0x00, 0x00, 0x10, }; -COMPILER_STRIP_GATE(80D3EC34, &l_btkIndex); +COMPILER_STRIP_GATE(0x80D3EC34, &l_btkIndex); #pragma pop /* 80D3EC50-80D3EC54 000044 0004+00 1/3 0/0 0/0 .rodata @3967 */ SECTION_RODATA static f32 const lit_3967 = 1.0f; -COMPILER_STRIP_GATE(80D3EC50, &lit_3967); +COMPILER_STRIP_GATE(0x80D3EC50, &lit_3967); /* 80D3EC54-80D3EC58 000048 0004+00 1/2 0/0 0/0 .rodata @3968 */ SECTION_RODATA static u8 const lit_3968[4] = { @@ -266,13 +282,13 @@ SECTION_RODATA static u8 const lit_3968[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D3EC54, &lit_3968); +COMPILER_STRIP_GATE(0x80D3EC54, &lit_3968); /* 80D3EC58-80D3EC5C 00004C 0004+00 0/1 0/0 0/0 .rodata @3969 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3969 = -1.0f; -COMPILER_STRIP_GATE(80D3EC58, &lit_3969); +COMPILER_STRIP_GATE(0x80D3EC58, &lit_3969); #pragma pop /* 80D3ECFC-80D3ED10 000040 0014+00 1/1 0/0 0/0 .data mirror_effect_id$3870 */ @@ -390,19 +406,4 @@ static asm void daObj_Ystone_Create(fopAc_ac_c* param_0) { } #pragma pop -/* 80D3EC5C-80D3ECBA 000050 005E+00 2/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80D3EC5C = "N_gD_mskF"; -SECTION_DEAD static char const* const stringBase_80D3EC66 = "N_gD_mskB"; -SECTION_DEAD static char const* const stringBase_80D3EC70 = "N_gD_mskT"; -SECTION_DEAD static char const* const stringBase_80D3EC7A = "MirrorB"; -SECTION_DEAD static char const* const stringBase_80D3EC82 = "D_MN05A"; -SECTION_DEAD static char const* const stringBase_80D3EC8A = "D_MN04A"; -SECTION_DEAD static char const* const stringBase_80D3EC92 = "D_MN01A"; -SECTION_DEAD static char const* const stringBase_80D3EC9A = "D_MN10A"; -SECTION_DEAD static char const* const stringBase_80D3ECA2 = "D_MN11A"; -SECTION_DEAD static char const* const stringBase_80D3ECAA = "D_MN06A"; -SECTION_DEAD static char const* const stringBase_80D3ECB2 = "D_MN07A"; -#pragma pop +/* 80D3EC5C-80D3EC5C 000050 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_zdoor/d_a_obj_zdoor.cpp b/rel/d/a/obj/d_a_obj_zdoor/d_a_obj_zdoor.cpp index 916ff7d855d..6e4b1ca7ee3 100644 --- a/rel/d/a/obj/d_a_obj_zdoor/d_a_obj_zdoor.cpp +++ b/rel/d/a/obj/d_a_obj_zdoor/d_a_obj_zdoor.cpp @@ -246,7 +246,7 @@ SECTION_RODATA static u8 const l_cyl_data[60] = { 0x00, 0x00, 0x42, 0x0C, 0x00, 0x00, 0x43, 0xAF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41, 0xF0, 0x00, 0x00, 0x43, 0x16, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D401EC, &l_cyl_data); +COMPILER_STRIP_GATE(0x80D401EC, &l_cyl_data); /* 80D40228-80D40264 00003C 003C+00 1/1 0/0 0/0 .rodata l_cyl_data2 */ SECTION_RODATA static u8 const l_cyl_data2[60] = { @@ -255,7 +255,7 @@ SECTION_RODATA static u8 const l_cyl_data2[60] = { 0x00, 0x00, 0x42, 0xA0, 0x00, 0x00, 0x43, 0xAF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0x48, 0x00, 0x00, 0x43, 0x16, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D40228, &l_cyl_data2); +COMPILER_STRIP_GATE(0x80D40228, &l_cyl_data2); /* 80D40264-80D4026C 000078 0006+02 0/1 0/0 0/0 .rodata l_open_limit_max */ #pragma push @@ -271,7 +271,7 @@ SECTION_RODATA static u8 const l_open_limit_max[6 + 2 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D40264, &l_open_limit_max); +COMPILER_STRIP_GATE(0x80D40264, &l_open_limit_max); #pragma pop /* 80D4026C-80D40274 000080 0006+02 0/1 0/0 0/0 .rodata l_open_limit_min */ @@ -288,7 +288,7 @@ SECTION_RODATA static u8 const l_open_limit_min[6 + 2 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D4026C, &l_open_limit_min); +COMPILER_STRIP_GATE(0x80D4026C, &l_open_limit_min); #pragma pop /* 80D40274-80D4027C 000088 0006+02 2/2 0/0 0/0 .rodata l_open_speed */ @@ -303,7 +303,7 @@ SECTION_RODATA static u8 const l_open_speed[6 + 2 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D40274, &l_open_speed); +COMPILER_STRIP_GATE(0x80D40274, &l_open_speed); /* 80D4027C-80D40280 000090 0004+00 1/2 0/0 0/0 .rodata @3658 */ SECTION_RODATA static u8 const lit_3658[4] = { @@ -312,7 +312,7 @@ SECTION_RODATA static u8 const lit_3658[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D4027C, &lit_3658); +COMPILER_STRIP_GATE(0x80D4027C, &lit_3658); /* 80D3F438-80D3F4DC 000078 00A4+00 2/2 0/0 0/0 .text checkPlayerPos__FP9daZdoor_c */ #pragma push @@ -327,7 +327,7 @@ static asm void checkPlayerPos(daZdoor_c* param_0) { /* ############################################################################################## */ /* 80D40280-80D40284 000094 0004+00 1/1 0/0 0/0 .rodata @3679 */ SECTION_RODATA static f32 const lit_3679 = 3.0f; -COMPILER_STRIP_GATE(80D40280, &lit_3679); +COMPILER_STRIP_GATE(0x80D40280, &lit_3679); /* 80D3F4DC-80D3F570 00011C 0094+00 1/1 0/0 0/0 .text * doorCoHitCallBack__FP10fopAc_ac_cP12dCcD_GObjInfP10fopAc_ac_cP12dCcD_GObjInf */ @@ -348,13 +348,13 @@ SECTION_RODATA static f32 const lit_3712[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80D40284, &lit_3712); +COMPILER_STRIP_GATE(0x80D40284, &lit_3712); /* 80D4028C-80D40294 0000A0 0008+00 1/1 0/0 0/0 .rodata @3714 */ SECTION_RODATA static u8 const lit_3714[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D4028C, &lit_3714); +COMPILER_STRIP_GATE(0x80D4028C, &lit_3714); /* 80D3F570-80D3F65C 0001B0 00EC+00 1/1 0/0 0/0 .text * doorTgHitCallBack__FP10fopAc_ac_cP12dCcD_GObjInfP10fopAc_ac_cP12dCcD_GObjInf */ @@ -402,28 +402,28 @@ asm void daZdoor_c::init_cyl() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3796 = 60.0f; -COMPILER_STRIP_GATE(80D40294, &lit_3796); +COMPILER_STRIP_GATE(0x80D40294, &lit_3796); #pragma pop /* 80D40298-80D4029C 0000AC 0004+00 0/1 0/0 0/0 .rodata @3797 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3797 = 120.0f; -COMPILER_STRIP_GATE(80D40298, &lit_3797); +COMPILER_STRIP_GATE(0x80D40298, &lit_3797); #pragma pop /* 80D4029C-80D402A0 0000B0 0004+00 0/1 0/0 0/0 .rodata @3798 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3798 = 180.0f; -COMPILER_STRIP_GATE(80D4029C, &lit_3798); +COMPILER_STRIP_GATE(0x80D4029C, &lit_3798); #pragma pop /* 80D402A0-80D402A4 0000B4 0004+00 0/1 0/0 0/0 .rodata @3799 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3799 = 240.0f; -COMPILER_STRIP_GATE(80D402A0, &lit_3799); +COMPILER_STRIP_GATE(0x80D402A0, &lit_3799); #pragma pop /* 80D3F740-80D3F884 000380 0144+00 1/1 0/0 0/0 .text set_cyl__9daZdoor_cFv */ @@ -457,6 +457,17 @@ asm void daZdoor_c::Create() { #pragma pop /* ############################################################################################## */ +/* 80D402B0-80D402B0 0000C4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80D402B0 = "J_Zdoor"; +SECTION_DEAD static char const* const stringBase_80D402B8 = "J_Rdoor"; +SECTION_DEAD static char const* const stringBase_80D402C0 = "J_STdoa"; +SECTION_DEAD static char const* const stringBase_80D402C8 = "J_Zdoor.bmd"; +SECTION_DEAD static char const* const stringBase_80D402D4 = "J_Rdoor.bmd"; +SECTION_DEAD static char const* const stringBase_80D402E0 = "J_STdoa.bmd"; +#pragma pop + /* 80D40398-80D403A4 -00001 000C+00 3/3 0/0 0/0 .data l_arcName */ SECTION_DATA static void* l_arcName[3] = { (void*)&d_a_obj_zdoor__stringBase0, @@ -489,7 +500,15 @@ SECTION_RODATA static u8 const estimateSizeTbl[4] = { 0x0D, 0x30, }; -COMPILER_STRIP_GATE(80D402A4, &estimateSizeTbl); +COMPILER_STRIP_GATE(0x80D402A4, &estimateSizeTbl); + +/* 80D402B0-80D402B0 0000C4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80D402EC = "J_Zdoor.dzb"; +SECTION_DEAD static char const* const stringBase_80D402F8 = "J_Rdoor.dzb"; +SECTION_DEAD static char const* const stringBase_80D40304 = "J_STdoa.dzb"; +#pragma pop /* 80D403B0-80D403BC -00001 000C+00 1/1 0/0 0/0 .data l_dzbName */ SECTION_DATA static void* l_dzbName[3] = { @@ -513,14 +532,14 @@ asm void daZdoor_c::create1st() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3906 = 1.0f; -COMPILER_STRIP_GATE(80D402A8, &lit_3906); +COMPILER_STRIP_GATE(0x80D402A8, &lit_3906); #pragma pop /* 80D402AC-80D402B0 0000C0 0004+00 0/1 0/0 0/0 .rodata @3907 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3907 = -1.0f; -COMPILER_STRIP_GATE(80D402AC, &lit_3907); +COMPILER_STRIP_GATE(0x80D402AC, &lit_3907); #pragma pop /* 80D3FACC-80D3FCE8 00070C 021C+00 1/0 0/0 0/0 .text Execute__9daZdoor_cFPPA3_A4_f */ @@ -729,17 +748,4 @@ static asm void func_80D401DC() { } #pragma pop -/* 80D402B0-80D40310 0000C4 0060+00 3/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80D402B0 = "J_Zdoor"; -SECTION_DEAD static char const* const stringBase_80D402B8 = "J_Rdoor"; -SECTION_DEAD static char const* const stringBase_80D402C0 = "J_STdoa"; -SECTION_DEAD static char const* const stringBase_80D402C8 = "J_Zdoor.bmd"; -SECTION_DEAD static char const* const stringBase_80D402D4 = "J_Rdoor.bmd"; -SECTION_DEAD static char const* const stringBase_80D402E0 = "J_STdoa.bmd"; -SECTION_DEAD static char const* const stringBase_80D402EC = "J_Zdoor.dzb"; -SECTION_DEAD static char const* const stringBase_80D402F8 = "J_Rdoor.dzb"; -SECTION_DEAD static char const* const stringBase_80D40304 = "J_STdoa.dzb"; -#pragma pop +/* 80D402B0-80D402B0 0000C4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_zrTurara/d_a_obj_zrTurara.cpp b/rel/d/a/obj/d_a_obj_zrTurara/d_a_obj_zrTurara.cpp index 1f3a30b827b..0b0dd0a77a5 100644 --- a/rel/d/a/obj/d_a_obj_zrTurara/d_a_obj_zrTurara.cpp +++ b/rel/d/a/obj/d_a_obj_zrTurara/d_a_obj_zrTurara.cpp @@ -72,10 +72,10 @@ struct dRes_control_c { struct dPa_levelEcallBack {}; -struct _GXColor {}; - struct csXyz {}; +struct _GXColor {}; + struct dPa_control_c { struct level_c { /* 8004B918 */ void getEmitter(u32); @@ -172,10 +172,10 @@ struct cBgS { /* 80074250 */ void Release(dBgW_Base*); }; -struct Vec {}; - struct JAISoundID {}; +struct Vec {}; + struct Z2SeMgr { /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); }; @@ -298,7 +298,7 @@ extern "C" void __register_global_object(); /* ############################################################################################## */ /* 80D4159C-80D415A0 000000 0004+00 3/4 0/0 0/0 .rodata @3657 */ SECTION_RODATA static f32 const lit_3657 = 250.0f; -COMPILER_STRIP_GATE(80D4159C, &lit_3657); +COMPILER_STRIP_GATE(0x80D4159C, &lit_3657); /* 80D41608-80D41614 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { @@ -472,11 +472,11 @@ SECTION_RODATA u8 const daZrTurara_c::mCcDObjInfo[48] = { 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x11, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D415A0, &daZrTurara_c::mCcDObjInfo); +COMPILER_STRIP_GATE(0x80D415A0, &daZrTurara_c::mCcDObjInfo); /* 80D415D0-80D415D4 000034 0004+00 3/4 0/0 0/0 .rodata @3699 */ SECTION_RODATA static f32 const lit_3699 = 1.0f; -COMPILER_STRIP_GATE(80D415D0, &lit_3699); +COMPILER_STRIP_GATE(0x80D415D0, &lit_3699); /* 80D405E4-80D40714 000164 0130+00 2/2 0/0 0/0 .text setBaseMtx__12daZrTurara_cFv */ #pragma push @@ -488,6 +488,13 @@ asm void daZrTurara_c::setBaseMtx() { } #pragma pop +/* ############################################################################################## */ +/* 80D415FC-80D415FC 000060 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80D415FC = "M_DrpRock"; +#pragma pop + /* 80D40714-80D40844 000294 0130+00 1/0 0/0 0/0 .text CreateHeap__12daZrTurara_cFv */ #pragma push #pragma optimization_level 0 @@ -505,13 +512,13 @@ SECTION_RODATA static f32 const lit_3831[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80D415D4, &lit_3831); +COMPILER_STRIP_GATE(0x80D415D4, &lit_3831); /* 80D415DC-80D415E4 000040 0008+00 1/1 0/0 0/0 .rodata @3833 */ SECTION_RODATA static u8 const lit_3833[8] = { 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D415DC, &lit_3833); +COMPILER_STRIP_GATE(0x80D415DC, &lit_3833); /* 80D40844-80D40B1C 0003C4 02D8+00 1/1 0/0 0/0 .text create__12daZrTurara_cFv */ #pragma push @@ -569,21 +576,21 @@ asm void daZrTurara_c::Execute(f32 (**param_0)[3][4]) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3926 = 130.0f; -COMPILER_STRIP_GATE(80D415E4, &lit_3926); +COMPILER_STRIP_GATE(0x80D415E4, &lit_3926); #pragma pop /* 80D415E8-80D415EC 00004C 0004+00 0/1 0/0 0/0 .rodata @3927 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3927 = 450.0f; -COMPILER_STRIP_GATE(80D415E8, &lit_3927); +COMPILER_STRIP_GATE(0x80D415E8, &lit_3927); #pragma pop /* 80D415EC-80D415F0 000050 0004+00 0/1 0/0 0/0 .rodata @3928 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3928 = 500.0f; -COMPILER_STRIP_GATE(80D415EC, &lit_3928); +COMPILER_STRIP_GATE(0x80D415EC, &lit_3928); #pragma pop /* 80D41780-80D4178C 000008 000C+00 1/1 0/0 0/0 .bss @3651 */ @@ -618,7 +625,7 @@ asm void daZrTurara_c::modeWait() { /* ############################################################################################## */ /* 80D415F0-80D415F4 000054 0004+00 1/1 0/0 0/0 .rodata @4013 */ SECTION_RODATA static f32 const lit_4013 = -1.0f; -COMPILER_STRIP_GATE(80D415F0, &lit_4013); +COMPILER_STRIP_GATE(0x80D415F0, &lit_4013); /* 80D40E0C-80D410E0 00098C 02D4+00 1/1 0/0 0/0 .text init_modeBreak__12daZrTurara_cFv */ #pragma push @@ -635,14 +642,14 @@ asm void daZrTurara_c::init_modeBreak() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4059 = 200.0f; -COMPILER_STRIP_GATE(80D415F4, &lit_4059); +COMPILER_STRIP_GATE(0x80D415F4, &lit_4059); #pragma pop /* 80D415F8-80D415FC 00005C 0004+00 0/1 0/0 0/0 .rodata @4060 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4060 = 20.0f; -COMPILER_STRIP_GATE(80D415F8, &lit_4060); +COMPILER_STRIP_GATE(0x80D415F8, &lit_4060); #pragma pop /* 80D410E0-80D412A0 000C60 01C0+00 1/0 0/0 0/0 .text modeBreak__12daZrTurara_cFv */ @@ -765,12 +772,7 @@ asm void __sinit_d_a_obj_zrTurara_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80D41518 = (void*)__sinit_d_a_obj_zrTurara_cpp; +REGISTER_CTORS(0x80D41518, __sinit_d_a_obj_zrTurara_cpp); #pragma pop -/* 80D415FC-80D41606 000060 000A+00 3/3 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80D415FC = "M_DrpRock"; -#pragma pop +/* 80D415FC-80D415FC 000060 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_zrTuraraRock/d_a_obj_zrTuraraRock.cpp b/rel/d/a/obj/d_a_obj_zrTuraraRock/d_a_obj_zrTuraraRock.cpp index 4b59df78650..a5099250740 100644 --- a/rel/d/a/obj/d_a_obj_zrTuraraRock/d_a_obj_zrTuraraRock.cpp +++ b/rel/d/a/obj/d_a_obj_zrTuraraRock/d_a_obj_zrTuraraRock.cpp @@ -102,10 +102,10 @@ struct dBgS_AcchCir { /* 80D41D94 */ ~dBgS_AcchCir(); }; -struct dBgS {}; - struct csXyz {}; +struct dBgS {}; + struct dBgS_Acch { /* 80075F94 */ ~dBgS_Acch(); /* 800760A0 */ dBgS_Acch(); @@ -252,34 +252,34 @@ extern "C" void __register_global_object(); /* ############################################################################################## */ /* 80D423C0-80D423C4 000000 0004+00 2/2 0/0 0/0 .rodata @3653 */ SECTION_RODATA static f32 const lit_3653 = 450.0f; -COMPILER_STRIP_GATE(80D423C0, &lit_3653); +COMPILER_STRIP_GATE(0x80D423C0, &lit_3653); /* 80D423C4-80D423C8 000004 0004+00 0/1 0/0 0/0 .rodata @3654 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3654 = 10.0f; -COMPILER_STRIP_GATE(80D423C4, &lit_3654); +COMPILER_STRIP_GATE(0x80D423C4, &lit_3654); #pragma pop /* 80D423C8-80D423CC 000008 0004+00 0/1 0/0 0/0 .rodata @3655 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3655 = 200.0f; -COMPILER_STRIP_GATE(80D423C8, &lit_3655); +COMPILER_STRIP_GATE(0x80D423C8, &lit_3655); #pragma pop /* 80D423CC-80D423D0 00000C 0004+00 0/1 0/0 0/0 .rodata @3656 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3656 = 5.0f; -COMPILER_STRIP_GATE(80D423CC, &lit_3656); +COMPILER_STRIP_GATE(0x80D423CC, &lit_3656); #pragma pop /* 80D423D0-80D423D4 000010 0004+00 0/2 0/0 0/0 .rodata @3657 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3657 = 3.0f; -COMPILER_STRIP_GATE(80D423D0, &lit_3657); +COMPILER_STRIP_GATE(0x80D423D0, &lit_3657); #pragma pop /* 80D42440-80D4244C 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ @@ -448,11 +448,11 @@ SECTION_RODATA u8 const daZrTuraRc_c::mCcDObjInfo[48] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x79, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D423D4, &daZrTuraRc_c::mCcDObjInfo); +COMPILER_STRIP_GATE(0x80D423D4, &daZrTuraRc_c::mCcDObjInfo); /* 80D42404-80D42408 000044 0004+00 1/2 0/0 0/0 .rodata @3684 */ SECTION_RODATA static f32 const lit_3684 = 1.0f; -COMPILER_STRIP_GATE(80D42404, &lit_3684); +COMPILER_STRIP_GATE(0x80D42404, &lit_3684); /* 80D41934-80D419D4 000194 00A0+00 2/2 0/0 0/0 .text setBaseMtx__12daZrTuraRc_cFv */ #pragma push @@ -464,6 +464,13 @@ asm void daZrTuraRc_c::setBaseMtx() { } #pragma pop +/* ############################################################################################## */ +/* 80D42434-80D42434 000074 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80D42434 = "M_DRockHn"; +#pragma pop + /* 80D419D4-80D41A40 000234 006C+00 1/1 0/0 0/0 .text CreateHeap__12daZrTuraRc_cFv */ #pragma push #pragma optimization_level 0 @@ -477,41 +484,41 @@ asm void daZrTuraRc_c::CreateHeap() { /* ############################################################################################## */ /* 80D42408-80D4240C 000048 0004+00 1/2 0/0 0/0 .rodata @3774 */ SECTION_RODATA static f32 const lit_3774 = 130.0f; -COMPILER_STRIP_GATE(80D42408, &lit_3774); +COMPILER_STRIP_GATE(0x80D42408, &lit_3774); /* 80D4240C-80D42410 00004C 0004+00 0/1 0/0 0/0 .rodata @3775 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3775 = 65.0f; -COMPILER_STRIP_GATE(80D4240C, &lit_3775); +COMPILER_STRIP_GATE(0x80D4240C, &lit_3775); #pragma pop /* 80D42410-80D42414 000050 0004+00 0/1 0/0 0/0 .rodata @3776 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3776 = 10000.0f; -COMPILER_STRIP_GATE(80D42410, &lit_3776); +COMPILER_STRIP_GATE(0x80D42410, &lit_3776); #pragma pop /* 80D42414-80D42418 000054 0004+00 0/1 0/0 0/0 .rodata @3777 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3777 = 9.0f / 10.0f; -COMPILER_STRIP_GATE(80D42414, &lit_3777); +COMPILER_STRIP_GATE(0x80D42414, &lit_3777); #pragma pop /* 80D42418-80D4241C 000058 0004+00 0/1 0/0 0/0 .rodata @3778 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3778 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(80D42418, &lit_3778); +COMPILER_STRIP_GATE(0x80D42418, &lit_3778); #pragma pop /* 80D4241C-80D42420 00005C 0004+00 0/1 0/0 0/0 .rodata @3779 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3779 = 180.0f; -COMPILER_STRIP_GATE(80D4241C, &lit_3779); +COMPILER_STRIP_GATE(0x80D4241C, &lit_3779); #pragma pop /* 80D42420-80D42428 000060 0004+04 0/1 0/0 0/0 .rodata @3780 */ @@ -522,7 +529,7 @@ SECTION_RODATA static u32 const lit_3780[1 + 1 /* padding */] = { /* padding */ 0x00000000, }; -COMPILER_STRIP_GATE(80D42420, &lit_3780); +COMPILER_STRIP_GATE(0x80D42420, &lit_3780); #pragma pop /* 80D42428-80D42430 000068 0008+00 0/1 0/0 0/0 .rodata @3782 */ @@ -531,7 +538,7 @@ COMPILER_STRIP_GATE(80D42420, &lit_3780); SECTION_RODATA static u8 const lit_3782[8] = { 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D42428, &lit_3782); +COMPILER_STRIP_GATE(0x80D42428, &lit_3782); #pragma pop /* 80D41A40-80D41D24 0002A0 02E4+00 1/1 0/0 0/0 .text create__12daZrTuraRc_cFv */ @@ -643,7 +650,7 @@ SECTION_RODATA static u8 const lit_3885[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D42430, &lit_3885); +COMPILER_STRIP_GATE(0x80D42430, &lit_3885); /* 80D4204C-80D42084 0008AC 0038+00 1/1 0/0 0/0 .text init_modeDrop__12daZrTuraRc_cFv */ #pragma push @@ -786,7 +793,7 @@ asm void __sinit_d_a_obj_zrTuraraRock_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80D4232C = (void*)__sinit_d_a_obj_zrTuraraRock_cpp; +REGISTER_CTORS(0x80D4232C, __sinit_d_a_obj_zrTuraraRock_cpp); #pragma pop /* 80D4239C-80D423A4 000BFC 0008+00 1/0 0/0 0/0 .text @36@__dt__12dBgS_ObjAcchFv */ @@ -809,9 +816,4 @@ static asm void func_80D423A4() { } #pragma pop -/* 80D42434-80D4243E 000074 000A+00 3/3 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80D42434 = "M_DRockHn"; -#pragma pop +/* 80D42434-80D42434 000074 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_zraMark/d_a_obj_zraMark.cpp b/rel/d/a/obj/d_a_obj_zraMark/d_a_obj_zraMark.cpp index 94fbcff6746..34bdc3b7a81 100644 --- a/rel/d/a/obj/d_a_obj_zraMark/d_a_obj_zraMark.cpp +++ b/rel/d/a/obj/d_a_obj_zraMark/d_a_obj_zraMark.cpp @@ -135,10 +135,10 @@ struct Z2SoundObjBase { /* 802BE4A4 */ void startCollisionSE(u32, u32, Z2SoundObjBase*); }; -struct Vec {}; - struct JAISoundID {}; +struct Vec {}; + struct Z2SeMgr { /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); }; @@ -192,7 +192,7 @@ extern "C" void draw__16_ZraMark_Hahen_cFv(); extern "C" void create__20_ZraMark_Hahen_Mng_cFRC4cXyzScScScSc(); extern "C" void calc__20_ZraMark_Hahen_Mng_cFv(); extern "C" void draw__20_ZraMark_Hahen_Mng_cFv(); -extern "C" void func_80D43ACC(int, int); +extern "C" void func_80D43ACC(void* _this, int, int); extern "C" void __dt__16_ZraMark_Hahen_cFv(); extern "C" void __ct__16_ZraMark_Hahen_cFv(); extern "C" void __ct__11J3DLightObjFv(); @@ -298,7 +298,7 @@ SECTION_RODATA static u8 const l_DATA[20] = { 0x41, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x3F, 0x99, 0x99, 0x9A, 0x42, 0x34, 0x00, 0x00, 0x44, 0x4D, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D43D88, &l_DATA); +COMPILER_STRIP_GATE(0x80D43D88, &l_DATA); /* 80D43D9C-80D43DE0 000014 0044+00 1/1 0/0 0/0 .rodata l_sph_src */ SECTION_RODATA static u8 const l_sph_src[68] = { @@ -308,7 +308,7 @@ SECTION_RODATA static u8 const l_sph_src[68] = { 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D43D9C, &l_sph_src); +COMPILER_STRIP_GATE(0x80D43D9C, &l_sph_src); /* 80D43DE0-80D43DF0 000058 0010+00 0/1 0/0 0/0 .rodata l_arcIdx */ #pragma push @@ -316,42 +316,48 @@ COMPILER_STRIP_GATE(80D43D9C, &l_sph_src); SECTION_RODATA static u8 const l_arcIdx[16] = { 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x04, }; -COMPILER_STRIP_GATE(80D43DE0, &l_arcIdx); +COMPILER_STRIP_GATE(0x80D43DE0, &l_arcIdx); #pragma pop /* 80D43DF0-80D43DF4 000068 0004+00 0/2 0/0 0/0 .rodata @3949 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3949 = 3.0f; -COMPILER_STRIP_GATE(80D43DF0, &lit_3949); +COMPILER_STRIP_GATE(0x80D43DF0, &lit_3949); #pragma pop /* 80D43DF4-80D43DF8 00006C 0004+00 0/1 0/0 0/0 .rodata @3950 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3950 = -60.0f; -COMPILER_STRIP_GATE(80D43DF4, &lit_3950); +COMPILER_STRIP_GATE(0x80D43DF4, &lit_3950); #pragma pop /* 80D43DF8-80D43DFC 000070 0004+00 0/1 0/0 0/0 .rodata @3951 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3951 = -500.0f; -COMPILER_STRIP_GATE(80D43DF8, &lit_3951); +COMPILER_STRIP_GATE(0x80D43DF8, &lit_3951); #pragma pop /* 80D43DFC-80D43E00 000074 0004+00 0/1 0/0 0/0 .rodata @3952 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3952 = 60.0f; -COMPILER_STRIP_GATE(80D43DFC, &lit_3952); +COMPILER_STRIP_GATE(0x80D43DFC, &lit_3952); #pragma pop /* 80D43E00-80D43E04 000078 0004+00 0/1 0/0 0/0 .rodata @3953 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3953 = 500.0f; -COMPILER_STRIP_GATE(80D43E00, &lit_3953); +COMPILER_STRIP_GATE(0x80D43E00, &lit_3953); +#pragma pop + +/* 80D43F98-80D43F98 000210 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80D43F98 = "buoy"; #pragma pop /* 80D43FA0-80D43FA4 000000 0004+00 1/1 0/0 0/0 .data None */ @@ -423,21 +429,21 @@ asm void daObjZraMark_c::Create() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4122 = 0.5f; -COMPILER_STRIP_GATE(80D43E04, &lit_4122); +COMPILER_STRIP_GATE(0x80D43E04, &lit_4122); #pragma pop /* 80D43E08-80D43E0C 000080 0004+00 0/1 0/0 0/0 .rodata @4123 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4123 = 0x3D800000; -COMPILER_STRIP_GATE(80D43E08, &lit_4123); +COMPILER_STRIP_GATE(0x80D43E08, &lit_4123); #pragma pop /* 80D43E0C-80D43E10 000084 0004+00 0/2 0/0 0/0 .rodata @4124 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4124 = 20.0f; -COMPILER_STRIP_GATE(80D43E0C, &lit_4124); +COMPILER_STRIP_GATE(0x80D43E0C, &lit_4124); #pragma pop /* 80D4287C-80D42A7C 00029C 0200+00 1/1 0/0 0/0 .text CreateHeap__14daObjZraMark_cFv */ @@ -499,14 +505,14 @@ SECTION_RODATA static u8 const l_coOffset[48] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41, 0x00, 0x00, 0x00, 0xC2, 0x48, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D43E10, &l_coOffset); +COMPILER_STRIP_GATE(0x80D43E10, &l_coOffset); #pragma pop /* 80D43E40-80D43E44 0000B8 0004+00 0/1 0/0 0/0 .rodata @4296 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4296 = 40.0f; -COMPILER_STRIP_GATE(80D43E40, &lit_4296); +COMPILER_STRIP_GATE(0x80D43E40, &lit_4296); #pragma pop /* 80D42D2C-80D42EE0 00074C 01B4+00 2/2 0/0 0/0 .text setBaseMtx__14daObjZraMark_cFv */ @@ -532,11 +538,11 @@ asm void daObjZraMark_c::col_init() { /* ############################################################################################## */ /* 80D43E44-80D43E48 0000BC 0004+00 1/1 0/0 0/0 .rodata @4400 */ SECTION_RODATA static f32 const lit_4400 = 1.0f; -COMPILER_STRIP_GATE(80D43E44, &lit_4400); +COMPILER_STRIP_GATE(0x80D43E44, &lit_4400); /* 80D43E48-80D43E4C 0000C0 0004+00 1/1 0/0 0/0 .rodata @4401 */ SECTION_RODATA static f32 const lit_4401 = -1.0f; -COMPILER_STRIP_GATE(80D43E48, &lit_4401); +COMPILER_STRIP_GATE(0x80D43E48, &lit_4401); /* 80D42F5C-80D432C8 00097C 036C+00 1/1 0/0 0/0 .text col_set__14daObjZraMark_cFv */ #pragma push @@ -642,7 +648,7 @@ asm void _ZraMark_Hahen_c::create(cXyz const& param_0, s8 param_1, s8 param_2, s SECTION_RODATA static u8 const sHahenBmdType[8] = { 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x08, }; -COMPILER_STRIP_GATE(80D43E4C, &sHahenBmdType); +COMPILER_STRIP_GATE(0x80D43E4C, &sHahenBmdType); /* 80D434F8-80D4357C 000F18 0084+00 1/1 0/0 0/0 .text loadModel__16_ZraMark_Hahen_cFv */ #pragma push @@ -664,7 +670,7 @@ SECTION_RODATA static u8 const sScale[56] = { 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x00, 0x00, 0x00, 0x3F, 0x33, 0x33, 0x33, 0x3F, 0x00, 0x00, 0x00, 0x3F, 0x99, 0x99, 0x9A, 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x4C, 0xCC, 0xCD, }; -COMPILER_STRIP_GATE(80D43E54, &sScale); +COMPILER_STRIP_GATE(0x80D43E54, &sScale); #pragma pop /* 80D43E8C-80D43F6C 000104 00E0+00 0/1 0/0 0/0 .rodata sRoot$4500 */ @@ -686,28 +692,28 @@ SECTION_RODATA static u8 const sRoot[224] = { 0x42, 0xEE, 0x66, 0x66, 0x42, 0x3D, 0x33, 0x33, 0x42, 0x9F, 0xCC, 0xCD, 0x42, 0x57, 0x33, 0x33, 0x42, 0x76, 0xCC, 0xCD, 0x42, 0x68, 0x66, 0x66, 0x42, 0x66, 0x66, 0x66, 0x41, 0xE8, 0xCC, 0xCD, }; -COMPILER_STRIP_GATE(80D43E8C, &sRoot); +COMPILER_STRIP_GATE(0x80D43E8C, &sRoot); #pragma pop /* 80D43F6C-80D43F70 0001E4 0004+00 0/1 0/0 0/0 .rodata @4542 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4542 = 2.0f; -COMPILER_STRIP_GATE(80D43F6C, &lit_4542); +COMPILER_STRIP_GATE(0x80D43F6C, &lit_4542); #pragma pop /* 80D43F70-80D43F74 0001E8 0004+00 0/1 0/0 0/0 .rodata @4543 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4543 = 2.5f; -COMPILER_STRIP_GATE(80D43F70, &lit_4543); +COMPILER_STRIP_GATE(0x80D43F70, &lit_4543); #pragma pop /* 80D43F74-80D43F78 0001EC 0004+00 0/1 0/0 0/0 .rodata @4544 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4544 = 1.5f; -COMPILER_STRIP_GATE(80D43F74, &lit_4544); +COMPILER_STRIP_GATE(0x80D43F74, &lit_4544); #pragma pop /* 80D43F78-80D43F7C 0001F0 0004+00 0/1 0/0 0/0 .rodata @4545 */ @@ -719,35 +725,35 @@ SECTION_RODATA static u8 const lit_4545[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D43F78, &lit_4545); +COMPILER_STRIP_GATE(0x80D43F78, &lit_4545); #pragma pop /* 80D43F7C-80D43F80 0001F4 0004+00 0/1 0/0 0/0 .rodata @4546 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4546 = 10.0f; -COMPILER_STRIP_GATE(80D43F7C, &lit_4546); +COMPILER_STRIP_GATE(0x80D43F7C, &lit_4546); #pragma pop /* 80D43F80-80D43F84 0001F8 0004+00 0/1 0/0 0/0 .rodata @4547 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4547 = 35.0f; -COMPILER_STRIP_GATE(80D43F80, &lit_4547); +COMPILER_STRIP_GATE(0x80D43F80, &lit_4547); #pragma pop /* 80D43F84-80D43F88 0001FC 0004+00 0/1 0/0 0/0 .rodata @4548 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4548 = 30.0f; -COMPILER_STRIP_GATE(80D43F84, &lit_4548); +COMPILER_STRIP_GATE(0x80D43F84, &lit_4548); #pragma pop /* 80D43F88-80D43F8C 000200 0004+00 0/1 0/0 0/0 .rodata @4549 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4549 = 15.0f; -COMPILER_STRIP_GATE(80D43F88, &lit_4549); +COMPILER_STRIP_GATE(0x80D43F88, &lit_4549); #pragma pop /* 80D44020-80D44024 000000 0004+00 1/1 0/0 0/0 .bss roottype$4501 */ @@ -769,7 +775,7 @@ asm void _ZraMark_Hahen_c::init(cXyz const& param_0, s8 param_1, s8 param_2, s8 /* ############################################################################################## */ /* 80D43F8C-80D43F90 000204 0004+00 1/1 0/0 0/0 .rodata @4571 */ SECTION_RODATA static f32 const lit_4571 = 9.0f; -COMPILER_STRIP_GATE(80D43F8C, &lit_4571); +COMPILER_STRIP_GATE(0x80D43F8C, &lit_4571); /* 80D43808-80D43864 001228 005C+00 1/1 0/0 0/0 .text calcSpeed__16_ZraMark_Hahen_cFv */ #pragma push @@ -838,13 +844,13 @@ asm void _ZraMark_Hahen_Mng_c::draw() { SECTION_RODATA static u8 const lit_4658[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D43F90, &lit_4658); +COMPILER_STRIP_GATE(0x80D43F90, &lit_4658); /* 80D43ACC-80D43B48 0014EC 007C+00 1/1 0/0 0/0 .text cLib_getRndValue__Fii */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80D43ACC(int param_0, int param_1) { +extern "C" asm void func_80D43ACC(void* _this, int param_0, int param_1) { nofralloc #include "asm/rel/d/a/obj/d_a_obj_zraMark/d_a_obj_zraMark/func_80D43ACC.s" } @@ -920,9 +926,4 @@ asm cM3dGAab::~cM3dGAab() { } #pragma pop -/* 80D43F98-80D43F9D 000210 0005+00 1/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80D43F98 = "buoy"; -#pragma pop +/* 80D43F98-80D43F98 000210 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_zra_freeze/d_a_obj_zra_freeze.cpp b/rel/d/a/obj/d_a_obj_zra_freeze/d_a_obj_zra_freeze.cpp index a663d66bdca..60ce51ff5a7 100644 --- a/rel/d/a/obj/d_a_obj_zra_freeze/d_a_obj_zra_freeze.cpp +++ b/rel/d/a/obj/d_a_obj_zra_freeze/d_a_obj_zra_freeze.cpp @@ -177,7 +177,7 @@ asm void daZraFreeze_c::setBaseMtx() { SECTION_RODATA static u8 const l_DATA[8] = { 0x44, 0x48, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D44B48, &l_DATA); +COMPILER_STRIP_GATE(0x80D44B48, &l_DATA); /* 80D44B50-80D44B54 000008 0004+00 0/2 0/0 0/0 .rodata @3763 */ #pragma push @@ -188,21 +188,21 @@ SECTION_RODATA static u8 const lit_3763[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D44B50, &lit_3763); +COMPILER_STRIP_GATE(0x80D44B50, &lit_3763); #pragma pop /* 80D44B54-80D44B58 00000C 0004+00 0/1 0/0 0/0 .rodata @3764 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3764 = 608.0f; -COMPILER_STRIP_GATE(80D44B54, &lit_3764); +COMPILER_STRIP_GATE(0x80D44B54, &lit_3764); #pragma pop /* 80D44B58-80D44B5C 000010 0004+00 0/1 0/0 0/0 .rodata @3765 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3765 = 448.0f; -COMPILER_STRIP_GATE(80D44B58, &lit_3765); +COMPILER_STRIP_GATE(0x80D44B58, &lit_3765); #pragma pop /* 80D44124-80D4429C 0000E4 0178+00 1/1 0/0 0/0 .text chkActorInScreen__13daZraFreeze_cFv @@ -229,7 +229,13 @@ static asm void createSolidHeap(fopAc_ac_c* param_0) { /* ############################################################################################## */ /* 80D44B5C-80D44B60 000014 0004+00 1/1 0/0 0/0 .rodata @3840 */ SECTION_RODATA static f32 const lit_3840 = 65536.0f; -COMPILER_STRIP_GATE(80D44B5C, &lit_3840); +COMPILER_STRIP_GATE(0x80D44B5C, &lit_3840); + +/* 80D44B88-80D44B88 000040 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80D44B88 = "zrF"; +#pragma pop /* 80D44BC4-80D44BC8 -00001 0004+00 3/3 0/0 0/0 .data l_arcName */ SECTION_DATA static void* l_arcName = (void*)&d_a_obj_zra_freeze__stringBase0; @@ -245,6 +251,14 @@ asm void daZraFreeze_c::Create() { #pragma pop /* ############################################################################################## */ +/* 80D44B88-80D44B88 000040 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80D44B8C = "zrA_a_TW.bmd"; +SECTION_DEAD static char const* const stringBase_80D44B99 = "zrA_pain_TW.bmd"; +SECTION_DEAD static char const* const stringBase_80D44BA9 = "zrA_sol_TW.bmd"; +#pragma pop + /* 80D44BC8-80D44BD4 -00001 000C+00 1/1 0/0 0/0 .data l_bmdName$3845 */ SECTION_DATA static void* l_bmdName[3] = { (void*)(((char*)&d_a_obj_zra_freeze__stringBase0) + 0x4), @@ -272,28 +286,28 @@ SECTION_RODATA static u8 const id[4] = { 0x84, 0x98, }; -COMPILER_STRIP_GATE(80D44B60, &id); +COMPILER_STRIP_GATE(0x80D44B60, &id); #pragma pop /* 80D44B64-80D44B68 00001C 0004+00 0/1 0/0 0/0 .rodata @3917 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3917 = 8.0f; -COMPILER_STRIP_GATE(80D44B64, &lit_3917); +COMPILER_STRIP_GATE(0x80D44B64, &lit_3917); #pragma pop /* 80D44B68-80D44B6C 000020 0004+00 0/1 0/0 0/0 .rodata @3918 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3918 = 4.0f; -COMPILER_STRIP_GATE(80D44B68, &lit_3918); +COMPILER_STRIP_GATE(0x80D44B68, &lit_3918); #pragma pop /* 80D44B6C-80D44B70 000024 0004+00 0/1 0/0 0/0 .rodata @3919 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3919 = 1.0f; -COMPILER_STRIP_GATE(80D44B6C, &lit_3919); +COMPILER_STRIP_GATE(0x80D44B6C, &lit_3919); #pragma pop /* 80D444C0-80D44698 000480 01D8+00 1/1 0/0 0/0 .text setHitodamaPrtcl__13daZraFreeze_cFv @@ -314,7 +328,7 @@ asm void daZraFreeze_c::setHitodamaPrtcl() { SECTION_RODATA static u8 const lit_4050[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D44B70, &lit_4050); +COMPILER_STRIP_GATE(0x80D44B70, &lit_4050); #pragma pop /* 80D44B78-80D44B80 000030 0008+00 0/1 0/0 0/0 .rodata @4051 */ @@ -323,7 +337,7 @@ COMPILER_STRIP_GATE(80D44B70, &lit_4050); SECTION_RODATA static u8 const lit_4051[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D44B78, &lit_4051); +COMPILER_STRIP_GATE(0x80D44B78, &lit_4051); #pragma pop /* 80D44B80-80D44B88 000038 0008+00 0/1 0/0 0/0 .rodata @4052 */ @@ -332,7 +346,13 @@ COMPILER_STRIP_GATE(80D44B78, &lit_4051); SECTION_RODATA static u8 const lit_4052[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D44B80, &lit_4052); +COMPILER_STRIP_GATE(0x80D44B80, &lit_4052); +#pragma pop + +/* 80D44B88-80D44B88 000040 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80D44BB8 = "zora_koori"; #pragma pop /* 80D44698-80D449E0 000658 0348+00 1/1 0/0 0/0 .text Execute__13daZraFreeze_cFv */ @@ -435,13 +455,4 @@ SECTION_DATA extern void* g_profile_OBJ_ZRAFREEZE[12] = { (void*)0x00044100, (void*)0x000E0000, }; -/* 80D44B88-80D44BC3 000040 003B+00 3/1 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80D44B88 = "zrF"; -SECTION_DEAD static char const* const stringBase_80D44B8C = "zrA_a_TW.bmd"; -SECTION_DEAD static char const* const stringBase_80D44B99 = "zrA_pain_TW.bmd"; -SECTION_DEAD static char const* const stringBase_80D44BA9 = "zrA_sol_TW.bmd"; -SECTION_DEAD static char const* const stringBase_80D44BB8 = "zora_koori"; -#pragma pop +/* 80D44B88-80D44B88 000040 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_zra_rock/d_a_obj_zra_rock.cpp b/rel/d/a/obj/d_a_obj_zra_rock/d_a_obj_zra_rock.cpp index aebe5e78f6e..1f79cbcee54 100644 --- a/rel/d/a/obj/d_a_obj_zra_rock/d_a_obj_zra_rock.cpp +++ b/rel/d/a/obj/d_a_obj_zra_rock/d_a_obj_zra_rock.cpp @@ -222,13 +222,13 @@ extern "C" extern u8 j3dSys[284]; /* ############################################################################################## */ /* 80D455C4-80D455C8 000000 0004+00 1/1 0/0 0/0 .rodata @3814 */ SECTION_RODATA static f32 const lit_3814 = 10.0f; -COMPILER_STRIP_GATE(80D455C4, &lit_3814); +COMPILER_STRIP_GATE(0x80D455C4, &lit_3814); /* 80D455C8-80D455CC 000004 0004+00 0/1 0/0 0/0 .rodata @3815 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_3815 = 0x43184CCD; -COMPILER_STRIP_GATE(80D455C8, &lit_3815); +COMPILER_STRIP_GATE(0x80D455C8, &lit_3815); #pragma pop /* 80D455CC-80D455D0 000008 0004+00 2/3 0/0 0/0 .rodata @3816 */ @@ -238,7 +238,7 @@ SECTION_RODATA static u8 const lit_3816[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D455CC, &lit_3816); +COMPILER_STRIP_GATE(0x80D455CC, &lit_3816); /* 80D44CB8-80D44D3C 000078 0084+00 1/1 0/0 0/0 .text setAttnPos__14daObjZraRock_cFv */ #pragma push @@ -294,7 +294,13 @@ asm void daObjZraRock_c::Create() { /* ############################################################################################## */ /* 80D455D0-80D455D4 00000C 0004+00 1/1 0/0 0/0 .rodata @3903 */ SECTION_RODATA static f32 const lit_3903 = 1.0f; -COMPILER_STRIP_GATE(80D455D0, &lit_3903); +COMPILER_STRIP_GATE(0x80D455D0, &lit_3903); + +/* 80D455D4-80D455D4 000010 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80D455D4 = "H_ZraRock"; +#pragma pop /* 80D455F0-80D455F4 -00001 0004+00 3/3 0/0 0/0 .data l_arcName */ SECTION_DATA static void* l_arcName = (void*)&d_a_obj_zra_rock__stringBase0; @@ -310,6 +316,12 @@ asm void daObjZraRock_c::CreateHeap() { #pragma pop /* ############################################################################################## */ +/* 80D455D4-80D455D4 000010 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80D455DE = "H_ZoraRock.dzb"; +#pragma pop + /* 80D455F4-80D45614 -00001 0020+00 1/0 0/0 0/0 .data l_daObjZraRock_Method */ SECTION_DATA static void* l_daObjZraRock_Method[8] = { (void*)daObjZraRock_create__FP10fopAc_ac_c, @@ -493,10 +505,4 @@ static asm void func_80D455B4() { } #pragma pop -/* 80D455D4-80D455ED 000010 0019+00 2/1 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80D455D4 = "H_ZraRock"; -SECTION_DEAD static char const* const stringBase_80D455DE = "H_ZoraRock.dzb"; -#pragma pop +/* 80D455D4-80D455D4 000010 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/mirror/d_a_obj_mirror_6pole/d_a_obj_mirror_6pole.cpp b/rel/d/a/obj/mirror/d_a_obj_mirror_6pole/d_a_obj_mirror_6pole.cpp index 89c66bc7874..9f0679f2b6b 100644 --- a/rel/d/a/obj/mirror/d_a_obj_mirror_6pole/d_a_obj_mirror_6pole.cpp +++ b/rel/d/a/obj/mirror/d_a_obj_mirror_6pole/d_a_obj_mirror_6pole.cpp @@ -152,7 +152,7 @@ SECTION_RODATA static u8 const lit_3630[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C96510, &lit_3630); +COMPILER_STRIP_GATE(0x80C96510, &lit_3630); /* 80C95E18-80C95E2C 000078 0014+00 1/0 0/0 0/0 .text initWait__18daObjMirror6Pole_cFv */ #pragma push @@ -165,6 +165,12 @@ asm void daObjMirror6Pole_c::initWait() { #pragma pop /* ############################################################################################## */ +/* 80C96520-80C96520 000010 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80C96520 = "MR-6Pole"; +#pragma pop + /* 80C9652C-80C96538 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -286,13 +292,13 @@ asm void daObjMirror6Pole_c::createHeapCallBack(fopAc_ac_c* param_0) { /* ############################################################################################## */ /* 80C96514-80C96518 000004 0004+00 1/1 0/0 0/0 .rodata @3755 */ SECTION_RODATA static f32 const lit_3755 = 1.0f; -COMPILER_STRIP_GATE(80C96514, &lit_3755); +COMPILER_STRIP_GATE(0x80C96514, &lit_3755); /* 80C96518-80C96520 000008 0008+00 1/1 0/0 0/0 .rodata @3757 */ SECTION_RODATA static u8 const lit_3757[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C96518, &lit_3757); +COMPILER_STRIP_GATE(0x80C96518, &lit_3757); /* 80C965B0-80C965D0 -00001 0020+00 1/0 0/0 0/0 .data l_daObjMirror6Pole_Method */ SECTION_DATA static void* l_daObjMirror6Pole_Method[8] = { @@ -405,12 +411,7 @@ asm void __sinit_d_a_obj_mirror_6pole_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80C96494 = (void*)__sinit_d_a_obj_mirror_6pole_cpp; +REGISTER_CTORS(0x80C96494, __sinit_d_a_obj_mirror_6pole_cpp); #pragma pop -/* 80C96520-80C96529 000010 0009+00 1/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80C96520 = "MR-6Pole"; -#pragma pop +/* 80C96520-80C96520 000010 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/mirror/d_a_obj_mirror_chain/d_a_obj_mirror_chain.cpp b/rel/d/a/obj/mirror/d_a_obj_mirror_chain/d_a_obj_mirror_chain.cpp index f650700fec3..bdd836ad432 100644 --- a/rel/d/a/obj/mirror/d_a_obj_mirror_chain/d_a_obj_mirror_chain.cpp +++ b/rel/d/a/obj/mirror/d_a_obj_mirror_chain/d_a_obj_mirror_chain.cpp @@ -271,13 +271,13 @@ extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; /* ############################################################################################## */ /* 80C98028-80C9802C 000000 0004+00 2/2 0/0 0/0 .rodata @3915 */ SECTION_RODATA static u32 const lit_3915 = 0x3C8EFA35; -COMPILER_STRIP_GATE(80C98028, &lit_3915); +COMPILER_STRIP_GATE(0x80C98028, &lit_3915); /* 80C9802C-80C98030 000004 0004+00 0/1 0/0 0/0 .rodata @3916 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3916 = 0.5f; -COMPILER_STRIP_GATE(80C9802C, &lit_3916); +COMPILER_STRIP_GATE(0x80C9802C, &lit_3916); #pragma pop /* 80C98030-80C98034 000008 0004+00 2/4 0/0 0/0 .rodata @3917 */ @@ -287,41 +287,41 @@ SECTION_RODATA static u8 const lit_3917[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C98030, &lit_3917); +COMPILER_STRIP_GATE(0x80C98030, &lit_3917); /* 80C98034-80C98038 00000C 0004+00 0/1 0/0 0/0 .rodata @3918 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3918 = 2.0f; -COMPILER_STRIP_GATE(80C98034, &lit_3918); +COMPILER_STRIP_GATE(0x80C98034, &lit_3918); #pragma pop /* 80C98038-80C9803C 000010 0004+00 0/1 0/0 0/0 .rodata @3919 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3919 = 304.0f; -COMPILER_STRIP_GATE(80C98038, &lit_3919); +COMPILER_STRIP_GATE(0x80C98038, &lit_3919); #pragma pop /* 80C9803C-80C98040 000014 0004+00 0/1 0/0 0/0 .rodata @3920 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3920 = 608.0f; -COMPILER_STRIP_GATE(80C9803C, &lit_3920); +COMPILER_STRIP_GATE(0x80C9803C, &lit_3920); #pragma pop /* 80C98040-80C98044 000018 0004+00 0/1 0/0 0/0 .rodata @3921 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3921 = 224.0f; -COMPILER_STRIP_GATE(80C98040, &lit_3921); +COMPILER_STRIP_GATE(0x80C98040, &lit_3921); #pragma pop /* 80C98044-80C98048 00001C 0004+00 0/1 0/0 0/0 .rodata @3922 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3922 = 448.0f; -COMPILER_STRIP_GATE(80C98044, &lit_3922); +COMPILER_STRIP_GATE(0x80C98044, &lit_3922); #pragma pop /* 80C98048-80C98050 000020 0004+04 1/3 0/0 0/0 .rodata @3923 */ @@ -330,7 +330,7 @@ SECTION_RODATA static f32 const lit_3923[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80C98048, &lit_3923); +COMPILER_STRIP_GATE(0x80C98048, &lit_3923); /* 80C98050-80C98058 000028 0008+00 0/1 0/0 0/0 .rodata @3925 */ #pragma push @@ -338,7 +338,7 @@ COMPILER_STRIP_GATE(80C98048, &lit_3923); SECTION_RODATA static u8 const lit_3925[8] = { 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C98050, &lit_3925); +COMPILER_STRIP_GATE(0x80C98050, &lit_3925); #pragma pop /* 80C98138-80C98148 000000 0010+00 2/2 0/0 0/0 .bss l_scissor */ @@ -389,7 +389,13 @@ static asm void createSolidHeap(fopAc_ac_c* param_0) { SECTION_RODATA static u8 const lit_4164[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C98058, &lit_4164); +COMPILER_STRIP_GATE(0x80C98058, &lit_4164); + +/* 80C98074-80C98074 00004C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80C98074 = "MR-Chain"; +#pragma pop /* 80C98080-80C98084 -00001 0004+00 3/3 0/0 0/0 .data l_arcName */ SECTION_DATA static void* l_arcName = (void*)&d_a_obj_mirror_chain__stringBase0; @@ -517,7 +523,7 @@ SECTION_RODATA static u8 const data_80C98060[4] = { 0xE6, 0x66, }; -COMPILER_STRIP_GATE(80C98060, &data_80C98060); +COMPILER_STRIP_GATE(0x80C98060, &data_80C98060); #pragma pop /* 80C98064-80C98068 00003C 0004+00 0/0 0/0 0/0 .rodata @@ -530,7 +536,7 @@ SECTION_RODATA static u8 const data_80C98064[4] = { 0x5C, 0xA4, }; -COMPILER_STRIP_GATE(80C98064, &data_80C98064); +COMPILER_STRIP_GATE(0x80C98064, &data_80C98064); #pragma pop /* 80C98068-80C9806C 000040 0004+00 0/0 0/0 0/0 .rodata @@ -543,7 +549,7 @@ SECTION_RODATA static u8 const data_80C98068[4] = { 0xE1, 0x0F, }; -COMPILER_STRIP_GATE(80C98068, &data_80C98068); +COMPILER_STRIP_GATE(0x80C98068, &data_80C98068); #pragma pop /* 80C9806C-80C98070 000044 0004+00 0/0 0/0 0/0 .rodata @@ -556,14 +562,14 @@ SECTION_RODATA static u8 const data_80C9806C[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C9806C, &data_80C9806C); +COMPILER_STRIP_GATE(0x80C9806C, &data_80C9806C); #pragma pop /* 80C98070-80C98074 000048 0004+00 0/1 0/0 0/0 .rodata @4494 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4494 = -1.0f; -COMPILER_STRIP_GATE(80C98070, &lit_4494); +COMPILER_STRIP_GATE(0x80C98070, &lit_4494); #pragma pop /* 80C97988-80C97BA4 001368 021C+00 1/1 0/0 0/0 .text execute__18daObjMirrorChain_cFv */ @@ -657,9 +663,4 @@ cXyz::cXyz() { /* empty function */ } -/* 80C98074-80C9807D 00004C 0009+00 1/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80C98074 = "MR-Chain"; -#pragma pop +/* 80C98074-80C98074 00004C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/mirror/d_a_obj_mirror_sand/d_a_obj_mirror_sand.cpp b/rel/d/a/obj/mirror/d_a_obj_mirror_sand/d_a_obj_mirror_sand.cpp index d61e7266c53..5d9739b76a8 100644 --- a/rel/d/a/obj/mirror/d_a_obj_mirror_sand/d_a_obj_mirror_sand.cpp +++ b/rel/d/a/obj/mirror/d_a_obj_mirror_sand/d_a_obj_mirror_sand.cpp @@ -177,7 +177,7 @@ extern "C" extern u8 j3dSys[284]; /* ############################################################################################## */ /* 80C989D8-80C989DC 000000 0004+00 1/1 0/0 0/0 .rodata @3729 */ SECTION_RODATA static f32 const lit_3729 = 1.0f; -COMPILER_STRIP_GATE(80C989D8, &lit_3729); +COMPILER_STRIP_GATE(0x80C989D8, &lit_3729); /* 80C989DC-80C989E0 000004 0004+00 3/3 0/0 0/0 .rodata @3730 */ SECTION_RODATA static u8 const lit_3730[4] = { @@ -186,13 +186,19 @@ SECTION_RODATA static u8 const lit_3730[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C989DC, &lit_3730); +COMPILER_STRIP_GATE(0x80C989DC, &lit_3730); /* 80C989E0-80C989E8 000008 0008+00 1/1 0/0 0/0 .rodata @3732 */ SECTION_RODATA static u8 const lit_3732[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C989E0, &lit_3732); +COMPILER_STRIP_GATE(0x80C989E0, &lit_3732); + +/* 80C989E8-80C989E8 000010 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80C989E8 = "MR-Sand"; +#pragma pop /* 80C989F0-80C989F4 -00001 0004+00 3/3 0/0 0/0 .data l_arcName */ SECTION_DATA static void* l_arcName = (void*)&d_a_obj_mirror_sand__stringBase0; @@ -327,9 +333,4 @@ static asm void daObjMirrorSand_Create(fopAc_ac_c* param_0) { } #pragma pop -/* 80C989E8-80C989F0 000010 0008+00 1/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80C989E8 = "MR-Sand"; -#pragma pop +/* 80C989E8-80C989E8 000010 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/mirror/d_a_obj_mirror_screw/d_a_obj_mirror_screw.cpp b/rel/d/a/obj/mirror/d_a_obj_mirror_screw/d_a_obj_mirror_screw.cpp index ce5630b9169..c1b270d3f16 100644 --- a/rel/d/a/obj/mirror/d_a_obj_mirror_screw/d_a_obj_mirror_screw.cpp +++ b/rel/d/a/obj/mirror/d_a_obj_mirror_screw/d_a_obj_mirror_screw.cpp @@ -107,10 +107,10 @@ struct dBgS_MoveBgActor { /* 80078950 */ void MoveBGExecute(); }; -struct Vec {}; - struct JAISoundID {}; +struct Vec {}; + struct Z2SeMgr { /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); /* 802AC50C */ void seStartLevel(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); @@ -220,13 +220,13 @@ SECTION_RODATA u8 const daObjMirrorScrew_c::M_attr[24] = { 0xC5, 0x29, 0x60, 0x00, 0x3F, 0x19, 0x99, 0x9A, 0x00, 0x00, 0x00, 0x2D, 0x00, 0x00, 0x00, 0x00, 0x40, 0xA0, 0x00, 0x00, 0xC0, 0x58, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C9975C, &daObjMirrorScrew_c::M_attr); +COMPILER_STRIP_GATE(0x80C9975C, &daObjMirrorScrew_c::M_attr); /* 80C99774-80C99778 000018 0004+00 0/1 0/0 0/0 .rodata @3680 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3680 = 4096.0f; -COMPILER_STRIP_GATE(80C99774, &lit_3680); +COMPILER_STRIP_GATE(0x80C99774, &lit_3680); #pragma pop /* 80C99778-80C9977C 00001C 0004+00 0/3 0/0 0/0 .rodata @3681 */ @@ -238,7 +238,7 @@ SECTION_RODATA static u8 const lit_3681[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C99778, &lit_3681); +COMPILER_STRIP_GATE(0x80C99778, &lit_3681); #pragma pop /* 80C9977C-80C99784 000020 0004+04 0/3 0/0 0/0 .rodata @3682 */ @@ -249,7 +249,7 @@ SECTION_RODATA static f32 const lit_3682[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80C9977C, &lit_3682); +COMPILER_STRIP_GATE(0x80C9977C, &lit_3682); #pragma pop /* 80C99784-80C9978C 000028 0008+00 0/1 0/0 0/0 .rodata @3684 */ @@ -258,7 +258,13 @@ COMPILER_STRIP_GATE(80C9977C, &lit_3682); SECTION_RODATA static u8 const lit_3684[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C99784, &lit_3684); +COMPILER_STRIP_GATE(0x80C99784, &lit_3684); +#pragma pop + +/* 80C99794-80C99794 000038 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80C99794 = "MR-Screw"; #pragma pop /* 80C997A0-80C997AC 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ @@ -346,7 +352,7 @@ asm void daObjMirrorScrew_c::executeWait() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3746 = -1.0f; -COMPILER_STRIP_GATE(80C9978C, &lit_3746); +COMPILER_STRIP_GATE(0x80C9978C, &lit_3746); #pragma pop /* 80C98C00-80C98F04 0001A0 0304+00 1/0 0/0 0/0 .text initDown__18daObjMirrorScrew_cFv */ @@ -362,7 +368,7 @@ asm void daObjMirrorScrew_c::initDown() { /* ############################################################################################## */ /* 80C99790-80C99794 000034 0004+00 1/2 0/0 0/0 .rodata @3845 */ SECTION_RODATA static u32 const lit_3845 = 0x4524C1F0; -COMPILER_STRIP_GATE(80C99790, &lit_3845); +COMPILER_STRIP_GATE(0x80C99790, &lit_3845); /* 80C98F04-80C99154 0004A4 0250+00 1/0 0/0 0/0 .text executeDown__18daObjMirrorScrew_cFv */ @@ -524,12 +530,7 @@ asm void __sinit_d_a_obj_mirror_screw_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80C996E0 = (void*)__sinit_d_a_obj_mirror_screw_cpp; +REGISTER_CTORS(0x80C996E0, __sinit_d_a_obj_mirror_screw_cpp); #pragma pop -/* 80C99794-80C9979D 000038 0009+00 1/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80C99794 = "MR-Screw"; -#pragma pop +/* 80C99794-80C99794 000038 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/mirror/d_a_obj_mirror_table/d_a_obj_mirror_table.cpp b/rel/d/a/obj/mirror/d_a_obj_mirror_table/d_a_obj_mirror_table.cpp index 794e4ef41dc..d4aed946734 100644 --- a/rel/d/a/obj/mirror/d_a_obj_mirror_table/d_a_obj_mirror_table.cpp +++ b/rel/d/a/obj/mirror/d_a_obj_mirror_table/d_a_obj_mirror_table.cpp @@ -28,10 +28,10 @@ struct mDoMtx_stack_c { static u8 now[48]; }; -struct J3DAnmTevRegKey {}; - struct J3DAnmTextureSRTKey {}; +struct J3DAnmTevRegKey {}; + struct J3DMaterialTable { /* 8032F7B4 */ void removeTexMtxAnimator(J3DAnmTextureSRTKey*); /* 8032F880 */ void removeTevRegAnimator(J3DAnmTevRegKey*); @@ -141,10 +141,10 @@ struct cBgS { /* 80074250 */ void Release(dBgW_Base*); }; -struct Vec {}; - struct JAISoundID {}; +struct Vec {}; + struct Z2SeMgr { /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); /* 802AC50C */ void seStartLevel(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); @@ -182,7 +182,7 @@ extern "C" static void daObjMirrorTable_Create__FP10fopAc_ac_c(); extern "C" void create__18daObjMirrorTable_cFv(); extern "C" void create_init__18daObjMirrorTable_cFv(); extern "C" void initBaseMtx__18daObjMirrorTable_cFv(); -extern "C" void func_80C9B220(s8*); +extern "C" void func_80C9B220(void* _this, s8*); extern "C" extern char const* const d_a_obj_mirror_table__stringBase0; // @@ -272,17 +272,17 @@ static asm void createSolidHeap(fopAc_ac_c* param_0) { SECTION_RODATA static u8 const l_minPos[12] = { 0x44, 0xD1, 0x05, 0xDB, 0x45, 0x90, 0x2D, 0x0A, 0xC6, 0xA4, 0x2B, 0x96, }; -COMPILER_STRIP_GATE(80C9B244, &l_minPos); +COMPILER_STRIP_GATE(0x80C9B244, &l_minPos); /* 80C9B250-80C9B25C 00000C 000C+00 1/1 0/0 0/0 .rodata l_maxPos */ SECTION_RODATA static u8 const l_maxPos[12] = { 0x44, 0xF0, 0xC6, 0xF2, 0x45, 0x90, 0x2D, 0x0A, 0xC6, 0xA3, 0x05, 0xF0, }; -COMPILER_STRIP_GATE(80C9B250, &l_maxPos); +COMPILER_STRIP_GATE(0x80C9B250, &l_maxPos); /* 80C9B25C-80C9B260 000018 0004+00 2/4 0/0 0/0 .rodata @3850 */ SECTION_RODATA static f32 const lit_3850 = 1.0f; -COMPILER_STRIP_GATE(80C9B25C, &lit_3850); +COMPILER_STRIP_GATE(0x80C9B25C, &lit_3850); /* 80C9B260-80C9B264 00001C 0004+00 1/3 0/0 0/0 .rodata @3851 */ SECTION_RODATA static u8 const lit_3851[4] = { @@ -291,13 +291,19 @@ SECTION_RODATA static u8 const lit_3851[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C9B260, &lit_3851); +COMPILER_STRIP_GATE(0x80C9B260, &lit_3851); /* 80C9B264-80C9B26C 000020 0008+00 1/3 0/0 0/0 .rodata @3853 */ SECTION_RODATA static u8 const lit_3853[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80C9B264, &lit_3853); +COMPILER_STRIP_GATE(0x80C9B264, &lit_3853); + +/* 80C9B290-80C9B290 00004C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80C9B290 = "MR-Table"; +#pragma pop /* 80C9B2A4-80C9B2A8 -00001 0004+00 3/3 0/0 0/0 .data l_arcName */ SECTION_DATA static void* l_arcName = (void*)&d_a_obj_mirror_table__stringBase0; @@ -419,34 +425,34 @@ static asm void daObjMirrorTable_Execute(daObjMirrorTable_c* param_0) { /* ############################################################################################## */ /* 80C9B26C-80C9B270 000028 0004+00 1/2 0/0 0/0 .rodata @4350 */ SECTION_RODATA static f32 const lit_4350 = -1.0f; -COMPILER_STRIP_GATE(80C9B26C, &lit_4350); +COMPILER_STRIP_GATE(0x80C9B26C, &lit_4350); /* 80C9B270-80C9B274 00002C 0004+00 0/1 0/0 0/0 .rodata @4351 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4351 = 1800.0f; -COMPILER_STRIP_GATE(80C9B270, &lit_4351); +COMPILER_STRIP_GATE(0x80C9B270, &lit_4351); #pragma pop /* 80C9B274-80C9B278 000030 0004+00 0/1 0/0 0/0 .rodata @4352 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4352 = 4700.0f; -COMPILER_STRIP_GATE(80C9B274, &lit_4352); +COMPILER_STRIP_GATE(0x80C9B274, &lit_4352); #pragma pop /* 80C9B278-80C9B27C 000034 0004+00 0/1 0/0 0/0 .rodata @4353 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4353 = -21320.0f; -COMPILER_STRIP_GATE(80C9B278, &lit_4353); +COMPILER_STRIP_GATE(0x80C9B278, &lit_4353); #pragma pop /* 80C9B27C-80C9B280 000038 0004+00 0/1 0/0 0/0 .rodata @4354 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4354 = 255.0f; -COMPILER_STRIP_GATE(80C9B27C, &lit_4354); +COMPILER_STRIP_GATE(0x80C9B27C, &lit_4354); #pragma pop /* 80C9A4D0-80C9A9D4 000C30 0504+00 1/1 0/0 0/0 .text execute__18daObjMirrorTable_cFv */ @@ -511,28 +517,34 @@ asm void daObjMirrorTable_c::create() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4509 = 1760.0f; -COMPILER_STRIP_GATE(80C9B280, &lit_4509); +COMPILER_STRIP_GATE(0x80C9B280, &lit_4509); #pragma pop /* 80C9B284-80C9B288 000040 0004+00 0/1 0/0 0/0 .rodata @4510 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4510 = 0x45935266; -COMPILER_STRIP_GATE(80C9B284, &lit_4510); +COMPILER_STRIP_GATE(0x80C9B284, &lit_4510); #pragma pop /* 80C9B288-80C9B28C 000044 0004+00 0/1 0/0 0/0 .rodata @4511 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4511 = -20624.0f; -COMPILER_STRIP_GATE(80C9B288, &lit_4511); +COMPILER_STRIP_GATE(0x80C9B288, &lit_4511); #pragma pop /* 80C9B28C-80C9B290 000048 0004+00 0/1 0/0 0/0 .rodata @4512 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4512 = 27.0f / 20.0f; -COMPILER_STRIP_GATE(80C9B28C, &lit_4512); +COMPILER_STRIP_GATE(0x80C9B28C, &lit_4512); +#pragma pop + +/* 80C9B290-80C9B290 00004C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80C9B299 = "F_SP125"; #pragma pop /* 80C9ABFC-80C9AFD0 00135C 03D4+00 1/1 0/0 0/0 .text create_init__18daObjMirrorTable_cFv @@ -561,16 +573,10 @@ asm void daObjMirrorTable_c::initBaseMtx() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80C9B220(s8* param_0) { +extern "C" asm void func_80C9B220(void* _this, s8* param_0) { nofralloc #include "asm/rel/d/a/obj/mirror/d_a_obj_mirror_table/d_a_obj_mirror_table/func_80C9B220.s" } #pragma pop -/* 80C9B290-80C9B2A1 00004C 0011+00 2/1 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80C9B290 = "MR-Table"; -SECTION_DEAD static char const* const stringBase_80C9B299 = "F_SP125"; -#pragma pop +/* 80C9B290-80C9B290 00004C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/tag/d_a_tag_Lv6Gate/d_a_tag_Lv6Gate.cpp b/rel/d/a/tag/d_a_tag_Lv6Gate/d_a_tag_Lv6Gate.cpp index c4a82d570c9..ce91f8d6960 100644 --- a/rel/d/a/tag/d_a_tag_Lv6Gate/d_a_tag_Lv6Gate.cpp +++ b/rel/d/a/tag/d_a_tag_Lv6Gate/d_a_tag_Lv6Gate.cpp @@ -72,12 +72,12 @@ struct dRes_control_c { struct dPa_levelEcallBack {}; -struct _GXColor {}; - struct csXyz { /* 802673F4 */ csXyz(s16, s16, s16); }; +struct _GXColor {}; + struct dPa_control_c { /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, @@ -126,10 +126,10 @@ struct cBgS { /* 80074250 */ void Release(dBgW_Base*); }; -struct Vec {}; - struct JAISoundID {}; +struct Vec {}; + struct Z2SeMgr { /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); }; @@ -260,7 +260,7 @@ static asm void createSolidHeap(fopAc_ac_c* param_0) { SECTION_RODATA static u8 const l_minRelative[12] = { 0xC4, 0x2F, 0x00, 0x00, 0xC3, 0x96, 0x00, 0x00, 0xC4, 0xFA, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D50908, &l_minRelative); +COMPILER_STRIP_GATE(0x80D50908, &l_minRelative); /* 80D50914-80D50920 00000C 000C+00 0/1 0/0 0/0 .rodata l_maxRelative */ #pragma push @@ -268,7 +268,7 @@ COMPILER_STRIP_GATE(80D50908, &l_minRelative); SECTION_RODATA static u8 const l_maxRelative[12] = { 0x44, 0x2F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x44, 0x7A, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D50914, &l_maxRelative); +COMPILER_STRIP_GATE(0x80D50914, &l_maxRelative); #pragma pop /* 80D50920-80D50928 000018 0004+04 1/2 0/0 0/0 .rodata @3757 */ @@ -277,13 +277,19 @@ SECTION_RODATA static f32 const lit_3757[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80D50920, &lit_3757); +COMPILER_STRIP_GATE(0x80D50920, &lit_3757); /* 80D50928-80D50930 000020 0008+00 1/2 0/0 0/0 .rodata @3759 */ SECTION_RODATA static u8 const lit_3759[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D50928, &lit_3759); +COMPILER_STRIP_GATE(0x80D50928, &lit_3759); + +/* 80D50998-80D50998 000090 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80D50998 = "Lv6Gate"; +#pragma pop /* 80D509C8-80D509CC -00001 0004+00 4/4 0/0 0/0 .data l_arcName */ SECTION_DATA static void* l_arcName = (void*)&d_a_tag_Lv6Gate__stringBase0; @@ -355,7 +361,7 @@ static asm void daTagLv6Gate_Create(fopAc_ac_c* param_0) { SECTION_RODATA static u8 const lit_3803[12] = { 0x00, 0x00, 0x00, 0x00, 0x44, 0xE1, 0x00, 0x00, 0xC5, 0xD4, 0x80, 0x00, }; -COMPILER_STRIP_GATE(80D50930, &lit_3803); +COMPILER_STRIP_GATE(0x80D50930, &lit_3803); #pragma pop /* 80D5093C-80D50948 000034 000C+00 0/1 0/0 0/0 .rodata @3839 */ @@ -364,7 +370,7 @@ COMPILER_STRIP_GATE(80D50930, &lit_3803); SECTION_RODATA static u8 const lit_3839[12] = { 0x00, 0x00, 0x00, 0x00, 0x45, 0x34, 0x70, 0x00, 0xC6, 0x02, 0x28, 0x00, }; -COMPILER_STRIP_GATE(80D5093C, &lit_3839); +COMPILER_STRIP_GATE(0x80D5093C, &lit_3839); #pragma pop /* 80D50948-80D50954 000040 000C+00 0/1 0/0 0/0 .rodata @3847 */ @@ -373,14 +379,14 @@ COMPILER_STRIP_GATE(80D5093C, &lit_3839); SECTION_RODATA static u8 const lit_3847[12] = { 0x00, 0x00, 0x00, 0x00, 0x45, 0x34, 0x70, 0x00, 0xC6, 0x02, 0x28, 0x00, }; -COMPILER_STRIP_GATE(80D50948, &lit_3847); +COMPILER_STRIP_GATE(0x80D50948, &lit_3847); #pragma pop /* 80D50954-80D50958 00004C 0004+00 0/1 0/0 0/0 .rodata @3942 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3942 = -50.0f; -COMPILER_STRIP_GATE(80D50954, &lit_3942); +COMPILER_STRIP_GATE(0x80D50954, &lit_3942); #pragma pop /* 80D50958-80D5095C 000050 0004+00 0/2 0/0 0/0 .rodata @3943 */ @@ -392,63 +398,63 @@ SECTION_RODATA static u8 const lit_3943[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D50958, &lit_3943); +COMPILER_STRIP_GATE(0x80D50958, &lit_3943); #pragma pop /* 80D5095C-80D50960 000054 0004+00 0/1 0/0 0/0 .rodata @3944 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3944 = 50.0f; -COMPILER_STRIP_GATE(80D5095C, &lit_3944); +COMPILER_STRIP_GATE(0x80D5095C, &lit_3944); #pragma pop /* 80D50960-80D50964 000058 0004+00 0/1 0/0 0/0 .rodata @3945 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3945 = 100.0f; -COMPILER_STRIP_GATE(80D50960, &lit_3945); +COMPILER_STRIP_GATE(0x80D50960, &lit_3945); #pragma pop /* 80D50964-80D50968 00005C 0004+00 0/2 0/0 0/0 .rodata @3946 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3946 = 255.0f; -COMPILER_STRIP_GATE(80D50964, &lit_3946); +COMPILER_STRIP_GATE(0x80D50964, &lit_3946); #pragma pop /* 80D50968-80D5096C 000060 0004+00 0/2 0/0 0/0 .rodata @3947 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3947 = 115.0f; -COMPILER_STRIP_GATE(80D50968, &lit_3947); +COMPILER_STRIP_GATE(0x80D50968, &lit_3947); #pragma pop /* 80D5096C-80D50970 000064 0004+00 0/1 0/0 0/0 .rodata @3948 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3948 = 2887.0f; -COMPILER_STRIP_GATE(80D5096C, &lit_3948); +COMPILER_STRIP_GATE(0x80D5096C, &lit_3948); #pragma pop /* 80D50970-80D50974 000068 0004+00 0/1 0/0 0/0 .rodata @3949 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3949 = -8330.0f; -COMPILER_STRIP_GATE(80D50970, &lit_3949); +COMPILER_STRIP_GATE(0x80D50970, &lit_3949); #pragma pop /* 80D50974-80D50978 00006C 0004+00 0/1 0/0 0/0 .rodata @3950 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_3950 = 0xC1545C15; -COMPILER_STRIP_GATE(80D50974, &lit_3950); +COMPILER_STRIP_GATE(0x80D50974, &lit_3950); #pragma pop /* 80D50978-80D5097C 000070 0004+00 0/1 0/0 0/0 .rodata @3951 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_3951 = 0xC62216DF; -COMPILER_STRIP_GATE(80D50978, &lit_3951); +COMPILER_STRIP_GATE(0x80D50978, &lit_3951); #pragma pop /* 80D4FBD8-80D4FE5C 0003B8 0284+00 1/1 0/0 0/0 .text create__14daTagLv6Gate_cFv */ @@ -486,49 +492,56 @@ static asm void daTagLv6Gate_Execute(daTagLv6Gate_c* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4155 = 78.0f; -COMPILER_STRIP_GATE(80D5097C, &lit_4155); +COMPILER_STRIP_GATE(0x80D5097C, &lit_4155); #pragma pop /* 80D50980-80D50984 000078 0004+00 0/1 0/0 0/0 .rodata @4156 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4156 = -1.0f; -COMPILER_STRIP_GATE(80D50980, &lit_4156); +COMPILER_STRIP_GATE(0x80D50980, &lit_4156); #pragma pop /* 80D50984-80D50988 00007C 0004+00 0/1 0/0 0/0 .rodata @4157 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4157 = 0x42EBB1D1; -COMPILER_STRIP_GATE(80D50984, &lit_4157); +COMPILER_STRIP_GATE(0x80D50984, &lit_4157); #pragma pop /* 80D50988-80D5098C 000080 0004+00 0/1 0/0 0/0 .rodata @4158 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4158 = 1677.0f; -COMPILER_STRIP_GATE(80D50988, &lit_4158); +COMPILER_STRIP_GATE(0x80D50988, &lit_4158); #pragma pop /* 80D5098C-80D50990 000084 0004+00 0/1 0/0 0/0 .rodata @4159 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4159 = 0xC59FB6B7; -COMPILER_STRIP_GATE(80D5098C, &lit_4159); +COMPILER_STRIP_GATE(0x80D5098C, &lit_4159); #pragma pop /* 80D50990-80D50994 000088 0004+00 0/1 0/0 0/0 .rodata @4160 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4160 = 12.75f; -COMPILER_STRIP_GATE(80D50990, &lit_4160); +COMPILER_STRIP_GATE(0x80D50990, &lit_4160); #pragma pop /* 80D50994-80D50998 00008C 0004+00 0/1 0/0 0/0 .rodata @4161 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4161 = 5.75f; -COMPILER_STRIP_GATE(80D50994, &lit_4161); +COMPILER_STRIP_GATE(0x80D50994, &lit_4161); +#pragma pop + +/* 80D50998-80D50998 000090 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80D509A0 = "LV6_GATE_APPEAR_SKIP"; +SECTION_DEAD static char const* const stringBase_80D509B5 = "LV6_GATE_APPEAR"; #pragma pop /* 80D4FEDC-80D5068C 0006BC 07B0+00 1/1 0/0 0/0 .text execute__14daTagLv6Gate_cFv */ @@ -576,11 +589,4 @@ static asm void daTagLv6Gate_Delete(daTagLv6Gate_c* param_0) { } #pragma pop -/* 80D50998-80D509C5 000090 002D+00 2/1 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80D50998 = "Lv6Gate"; -SECTION_DEAD static char const* const stringBase_80D509A0 = "LV6_GATE_APPEAR_SKIP"; -SECTION_DEAD static char const* const stringBase_80D509B5 = "LV6_GATE_APPEAR"; -#pragma pop +/* 80D50998-80D50998 000090 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/tag/d_a_tag_Lv7Gate/d_a_tag_Lv7Gate.cpp b/rel/d/a/tag/d_a_tag_Lv7Gate/d_a_tag_Lv7Gate.cpp index 331b9ffc700..5e28eebb354 100644 --- a/rel/d/a/tag/d_a_tag_Lv7Gate/d_a_tag_Lv7Gate.cpp +++ b/rel/d/a/tag/d_a_tag_Lv7Gate/d_a_tag_Lv7Gate.cpp @@ -93,10 +93,10 @@ struct dEvent_manager_c { /* 8004817C */ void cutEnd(int); }; -struct Vec {}; - struct JAISoundID {}; +struct Vec {}; + struct Z2SeMgr { /* 802AC50C */ void seStartLevel(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); }; @@ -195,7 +195,13 @@ extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; /* ############################################################################################## */ /* 80D51AD4-80D51AD8 000000 0004+00 4/4 0/0 0/0 .rodata @3698 */ SECTION_RODATA static f32 const lit_3698 = 1.0f; -COMPILER_STRIP_GATE(80D51AD4, &lit_3698); +COMPILER_STRIP_GATE(0x80D51AD4, &lit_3698); + +/* 80D51B14-80D51B14 000040 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80D51B14 = "Lv7Gate"; +#pragma pop /* 80D51B50-80D51B54 -00001 0004+00 5/5 0/0 0/0 .data l_arcName */ SECTION_DATA static void* l_arcName = (void*)&d_a_tag_Lv7Gate__stringBase0; @@ -263,7 +269,7 @@ static asm void daTagLv7Gate_Create(fopAc_ac_c* param_0) { /* ############################################################################################## */ /* 80D51AD8-80D51ADC 000004 0004+00 1/1 0/0 0/0 .rodata @3829 */ SECTION_RODATA static f32 const lit_3829 = 7500.0f; -COMPILER_STRIP_GATE(80D51AD8, &lit_3829); +COMPILER_STRIP_GATE(0x80D51AD8, &lit_3829); /* 80D50C64-80D50D30 000224 00CC+00 1/1 0/0 0/0 .text create__14daTagLv7Gate_cFv */ #pragma push @@ -290,7 +296,7 @@ SECTION_RODATA static u8 const lit_3935[4 + 4 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D51ADC, &lit_3935); +COMPILER_STRIP_GATE(0x80D51ADC, &lit_3935); #pragma pop /* 80D51AE4-80D51AEC 000010 0008+00 0/2 0/0 0/0 .rodata @3936 */ @@ -299,7 +305,7 @@ COMPILER_STRIP_GATE(80D51ADC, &lit_3935); SECTION_RODATA static u8 const lit_3936[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D51AE4, &lit_3936); +COMPILER_STRIP_GATE(0x80D51AE4, &lit_3936); #pragma pop /* 80D51AEC-80D51AF4 000018 0008+00 0/2 0/0 0/0 .rodata @3937 */ @@ -308,7 +314,7 @@ COMPILER_STRIP_GATE(80D51AE4, &lit_3936); SECTION_RODATA static u8 const lit_3937[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D51AEC, &lit_3937); +COMPILER_STRIP_GATE(0x80D51AEC, &lit_3937); #pragma pop /* 80D51AF4-80D51AFC 000020 0008+00 0/2 0/0 0/0 .rodata @3938 */ @@ -317,35 +323,43 @@ COMPILER_STRIP_GATE(80D51AEC, &lit_3937); SECTION_RODATA static u8 const lit_3938[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D51AF4, &lit_3938); +COMPILER_STRIP_GATE(0x80D51AF4, &lit_3938); #pragma pop /* 80D51AFC-80D51B00 000028 0004+00 0/1 0/0 0/0 .rodata @3939 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3939 = 1000.0f; -COMPILER_STRIP_GATE(80D51AFC, &lit_3939); +COMPILER_STRIP_GATE(0x80D51AFC, &lit_3939); #pragma pop /* 80D51B00-80D51B04 00002C 0004+00 0/1 0/0 0/0 .rodata @3940 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_3940 = 0x4522B50A; -COMPILER_STRIP_GATE(80D51B00, &lit_3940); +COMPILER_STRIP_GATE(0x80D51B00, &lit_3940); #pragma pop /* 80D51B04-80D51B08 000030 0004+00 0/1 0/0 0/0 .rodata @3941 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3941 = -200.0f; -COMPILER_STRIP_GATE(80D51B04, &lit_3941); +COMPILER_STRIP_GATE(0x80D51B04, &lit_3941); #pragma pop /* 80D51B08-80D51B0C 000034 0004+00 0/1 0/0 0/0 .rodata @3942 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_3942 = 0x45AB6F61; -COMPILER_STRIP_GATE(80D51B08, &lit_3942); +COMPILER_STRIP_GATE(0x80D51B08, &lit_3942); +#pragma pop + +/* 80D51B14-80D51B14 000040 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80D51B1C = "LV7_NORMAL_START"; +SECTION_DEAD static char const* const stringBase_80D51B2D = "LV7_CANNON_BACK"; +SECTION_DEAD static char const* const stringBase_80D51B3D = "LV7_FIRST_START"; #pragma pop /* 80D50D30-80D511A8 0002F0 0478+00 1/1 0/0 0/0 .text create_init__14daTagLv7Gate_cFv */ @@ -373,7 +387,7 @@ static asm void daTagLv7Gate_Execute(daTagLv7Gate_c* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4046 = 96.0f; -COMPILER_STRIP_GATE(80D51B0C, &lit_4046); +COMPILER_STRIP_GATE(0x80D51B0C, &lit_4046); #pragma pop /* 80D511C8-80D51628 000788 0460+00 1/1 0/0 0/0 .text execute__14daTagLv7Gate_cFv */ @@ -426,15 +440,7 @@ static asm void daTagLv7Gate_Delete(daTagLv7Gate_c* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4047 = -1.0f; -COMPILER_STRIP_GATE(80D51B10, &lit_4047); +COMPILER_STRIP_GATE(0x80D51B10, &lit_4047); #pragma pop -/* 80D51B14-80D51B4D 000040 0039+00 2/1 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80D51B14 = "Lv7Gate"; -SECTION_DEAD static char const* const stringBase_80D51B1C = "LV7_NORMAL_START"; -SECTION_DEAD static char const* const stringBase_80D51B2D = "LV7_CANNON_BACK"; -SECTION_DEAD static char const* const stringBase_80D51B3D = "LV7_FIRST_START"; -#pragma pop +/* 80D51B14-80D51B14 000040 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/tag/d_a_tag_Lv8Gate/d_a_tag_Lv8Gate.cpp b/rel/d/a/tag/d_a_tag_Lv8Gate/d_a_tag_Lv8Gate.cpp index 2ac4ef61972..6af3c0ec333 100644 --- a/rel/d/a/tag/d_a_tag_Lv8Gate/d_a_tag_Lv8Gate.cpp +++ b/rel/d/a/tag/d_a_tag_Lv8Gate/d_a_tag_Lv8Gate.cpp @@ -85,10 +85,10 @@ struct dAttention_c { /* 80073734 */ void ActionTarget(s32); }; -struct Vec {}; - struct JAISoundID {}; +struct Vec {}; + struct Z2SeMgr { /* 802AC50C */ void seStartLevel(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); }; @@ -194,7 +194,14 @@ static asm void createSolidHeap(fopAc_ac_c* param_0) { /* ############################################################################################## */ /* 80D524CC-80D524D0 000000 0004+00 3/3 0/0 0/0 .rodata @3749 */ SECTION_RODATA static f32 const lit_3749 = 1.0f; -COMPILER_STRIP_GATE(80D524CC, &lit_3749); +COMPILER_STRIP_GATE(0x80D524CC, &lit_3749); + +/* 80D524F0-80D524F0 000024 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80D524F0 = "Lv8Gate"; +SECTION_DEAD static char const* const stringBase_80D524F8 = "D_MN08"; +#pragma pop /* 80D52510-80D52514 -00001 0004+00 4/4 0/0 0/0 .data l_arcName */ SECTION_DATA static void* l_arcName = (void*)&d_a_tag_Lv8Gate__stringBase0; @@ -253,28 +260,28 @@ asm J3DFrameCtrl::~J3DFrameCtrl() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3805 = -100.0f; -COMPILER_STRIP_GATE(80D524D0, &lit_3805); +COMPILER_STRIP_GATE(0x80D524D0, &lit_3805); #pragma pop /* 80D524D4-80D524D8 000008 0004+00 0/1 0/0 0/0 .rodata @3806 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3806 = -50.0f; -COMPILER_STRIP_GATE(80D524D4, &lit_3806); +COMPILER_STRIP_GATE(0x80D524D4, &lit_3806); #pragma pop /* 80D524D8-80D524DC 00000C 0004+00 0/1 0/0 0/0 .rodata @3807 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3807 = 100.0f; -COMPILER_STRIP_GATE(80D524D8, &lit_3807); +COMPILER_STRIP_GATE(0x80D524D8, &lit_3807); #pragma pop /* 80D524DC-80D524E0 000010 0004+00 0/1 0/0 0/0 .rodata @3808 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3808 = 220.0f; -COMPILER_STRIP_GATE(80D524DC, &lit_3808); +COMPILER_STRIP_GATE(0x80D524DC, &lit_3808); #pragma pop /* 80D51DC8-80D51F28 000208 0160+00 1/0 0/0 0/0 .text daTagLv8Gate_Create__FP10fopAc_ac_c @@ -308,28 +315,34 @@ SECTION_RODATA static u8 const lit_3891[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D524E0, &lit_3891); +COMPILER_STRIP_GATE(0x80D524E0, &lit_3891); #pragma pop /* 80D524E4-80D524E8 000018 0004+00 0/1 0/0 0/0 .rodata @3892 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3892 = 400.0f; -COMPILER_STRIP_GATE(80D524E4, &lit_3892); +COMPILER_STRIP_GATE(0x80D524E4, &lit_3892); #pragma pop /* 80D524E8-80D524EC 00001C 0004+00 0/1 0/0 0/0 .rodata @3893 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3893 = 1400.0f; -COMPILER_STRIP_GATE(80D524E8, &lit_3893); +COMPILER_STRIP_GATE(0x80D524E8, &lit_3893); #pragma pop /* 80D524EC-80D524F0 000020 0004+00 0/1 0/0 0/0 .rodata @3894 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3894 = -1.0f; -COMPILER_STRIP_GATE(80D524EC, &lit_3894); +COMPILER_STRIP_GATE(0x80D524EC, &lit_3894); +#pragma pop + +/* 80D524F0-80D524F0 000024 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80D524FF = "LV8_GATE_ENTRY"; #pragma pop /* 80D51F48-80D522F0 000388 03A8+00 1/1 0/0 0/0 .text execute__14daTagLv8Gate_cFv */ @@ -367,11 +380,4 @@ static asm void daTagLv8Gate_Delete(daTagLv8Gate_c* param_0) { } #pragma pop -/* 80D524F0-80D5250E 000024 001E+00 3/2 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80D524F0 = "Lv8Gate"; -SECTION_DEAD static char const* const stringBase_80D524F8 = "D_MN08"; -SECTION_DEAD static char const* const stringBase_80D524FF = "LV8_GATE_ENTRY"; -#pragma pop +/* 80D524F0-80D524F0 000024 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/tag/d_a_tag_TWgate/d_a_tag_TWgate.cpp b/rel/d/a/tag/d_a_tag_TWgate/d_a_tag_TWgate.cpp index 2e8f74e1b10..567321c3e5b 100644 --- a/rel/d/a/tag/d_a_tag_TWgate/d_a_tag_TWgate.cpp +++ b/rel/d/a/tag/d_a_tag_TWgate/d_a_tag_TWgate.cpp @@ -22,16 +22,16 @@ struct mDoMtx_stack_c { static u8 now[48]; }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; - struct J3DAnmTransform {}; +struct J3DModelData {}; + +struct Z2Creature {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -112,12 +112,12 @@ struct dPa_levelEcallBack {}; struct dKy_tevstr_c {}; -struct _GXColor {}; - struct csXyz { /* 802673F4 */ csXyz(s16, s16, s16); }; +struct _GXColor {}; + struct dPa_control_c { /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, @@ -155,10 +155,10 @@ struct dEvent_manager_c { /* 8004817C */ void cutEnd(int); }; -struct Vec {}; - struct JAISoundID {}; +struct Vec {}; + struct Z2SeMgr { /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); /* 802AC50C */ void seStartLevel(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); @@ -301,6 +301,60 @@ asm void daTagTWGate_c::initWait() { #pragma pop /* ############################################################################################## */ +/* 80D55848-80D55852 00009C 000A+00 4/3 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80D55848; + +/* 80D55852-80D55861 0000A6 000F+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80D55852; + +/* 80D55861-80D55875 0000B5 0014+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80D55861; + +/* 80D55875-80D55887 0000C9 0012+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80D55875; + +/* 80D55887-80D5588F 0000DB 0008+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80D55887; + +/* 80D5588F-80D55899 0000E3 000A+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80D5588F; + +/* 80D55899-80D558A7 0000ED 000E+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80D55899; + +/* 80D558A7-80D558BA 0000FB 0013+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80D558A7; + +/* 80D558BA-80D558CB 00010E 0011+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80D558BA; + +/* 80D558CB-80D558D3 00011F 0008+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80D558CB; + +/* 80D558D3-80D558DD 000127 000A+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80D558D3; + +/* 80D558DD-80D558EC 000131 000F+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80D558DD; + +/* 80D558EC-80D55900 000140 0014+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80D558EC; + +/* 80D55900-80D55912 000154 0012+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80D55900; + +/* 80D55912-80D5591C 000166 000A+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80D55912; + +/* 80D5591C-80D5592A 000170 000E+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80D5591C; + +/* 80D5592A-80D5593D 00017E 0013+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80D5592A; + +/* 80D5593D-80D5594E 000191 0011+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80D5593D; + /* 80D557AC-80D557B0 000000 0001+03 5/5 0/0 0/0 .rodata mAttr__13daTagTWGate_c */ SECTION_RODATA u8 const daTagTWGate_c::mAttr[1 + 3 /* padding */] = { 0x00, @@ -309,7 +363,7 @@ SECTION_RODATA u8 const daTagTWGate_c::mAttr[1 + 3 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D557AC, &daTagTWGate_c::mAttr); +COMPILER_STRIP_GATE(0x80D557AC, &daTagTWGate_c::mAttr); /* 80D557B0-80D55820 -00001 0070+00 14/18 0/0 0/0 .rodata l_zevParamTbl */ SECTION_RODATA static void* const l_zevParamTbl[28] = { @@ -342,17 +396,41 @@ SECTION_RODATA static void* const l_zevParamTbl[28] = { (void*)(((char*)&d_a_tag_TWgate__stringBase0) + 0x83), (void*)0x000A020E, }; -COMPILER_STRIP_GATE(80D557B0, &l_zevParamTbl); +COMPILER_STRIP_GATE(0x80D557B0, &l_zevParamTbl); /* 80D55820-80D55824 000074 0004+00 1/1 0/0 0/0 .rodata @3857 */ SECTION_RODATA static f32 const lit_3857 = 100.0f; -COMPILER_STRIP_GATE(80D55820, &lit_3857); +COMPILER_STRIP_GATE(0x80D55820, &lit_3857); /* 80D55824-80D5582C 000078 0008+00 1/1 0/0 0/0 .rodata @3858 */ SECTION_RODATA static u8 const lit_3858[8] = { 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D55824, &lit_3858); +COMPILER_STRIP_GATE(0x80D55824, &lit_3858); + +/* 80D55848-80D55848 00009C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80D55848 = "TWGate_FL"; +SECTION_DEAD static char const* const stringBase_80D55852 = "TW_GATE_FILONE"; +SECTION_DEAD static char const* const stringBase_80D55861 = "TW_GATE_FILONE_TALK"; +SECTION_DEAD static char const* const stringBase_80D55875 = "TW_GATE_FILONE_IN"; +SECTION_DEAD static char const* const stringBase_80D55887 = "F_SP108"; +SECTION_DEAD static char const* const stringBase_80D5588F = "TWGate_OD"; +SECTION_DEAD static char const* const stringBase_80D55899 = "TW_GATE_ORDIN"; +SECTION_DEAD static char const* const stringBase_80D558A7 = "TW_GATE_ORDIN_TALK"; +SECTION_DEAD static char const* const stringBase_80D558BA = "TW_GATE_ORDIN_IN"; +SECTION_DEAD static char const* const stringBase_80D558CB = "F_SP121"; +SECTION_DEAD static char const* const stringBase_80D558D3 = "TWGate_RN"; +SECTION_DEAD static char const* const stringBase_80D558DD = "TW_GATE_RANAIL"; +SECTION_DEAD static char const* const stringBase_80D558EC = "TW_GATE_RANAIL_TALK"; +SECTION_DEAD static char const* const stringBase_80D55900 = "TW_GATE_RANAIL_IN"; +SECTION_DEAD static char const* const stringBase_80D55912 = "TWGate_HY"; +SECTION_DEAD static char const* const stringBase_80D5591C = "TW_GATE_HYRAL"; +SECTION_DEAD static char const* const stringBase_80D5592A = "TW_GATE_HYRAL_TALK"; +SECTION_DEAD static char const* const stringBase_80D5593D = "TW_GATE_HYRAL_IN"; +SECTION_DEAD static char const* const stringBase_80D5594E = "Gate"; +#pragma pop /* 80D55974-80D55980 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { @@ -725,7 +803,7 @@ asm void daTagTWGate_c::initDemoFilone3() { /* ############################################################################################## */ /* 80D5582C-80D55830 000080 0004+00 1/5 0/0 0/0 .rodata @4079 */ SECTION_RODATA static f32 const lit_4079 = 1.0f; -COMPILER_STRIP_GATE(80D5582C, &lit_4079); +COMPILER_STRIP_GATE(0x80D5582C, &lit_4079); /* 80D55830-80D55834 000084 0004+00 1/6 0/0 0/0 .rodata @4080 */ SECTION_RODATA static u8 const lit_4080[4] = { @@ -734,25 +812,25 @@ SECTION_RODATA static u8 const lit_4080[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D55830, &lit_4080); +COMPILER_STRIP_GATE(0x80D55830, &lit_4080); /* 80D55834-80D55838 000088 0004+00 0/4 0/0 0/0 .rodata @4081 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4081 = 240.0f; -COMPILER_STRIP_GATE(80D55834, &lit_4081); +COMPILER_STRIP_GATE(0x80D55834, &lit_4081); #pragma pop /* 80D55838-80D5583C 00008C 0004+00 0/4 0/0 0/0 .rodata @4082 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4082 = -710.0f; -COMPILER_STRIP_GATE(80D55838, &lit_4082); +COMPILER_STRIP_GATE(0x80D55838, &lit_4082); #pragma pop /* 80D5583C-80D55840 000090 0004+00 1/5 0/0 0/0 .rodata @4083 */ SECTION_RODATA static f32 const lit_4083 = -1.0f; -COMPILER_STRIP_GATE(80D5583C, &lit_4083); +COMPILER_STRIP_GATE(0x80D5583C, &lit_4083); /* 80D52E7C-80D53250 0008FC 03D4+00 1/0 0/0 0/0 .text executeDemoFilone3__13daTagTWGate_cFv */ #pragma push @@ -958,14 +1036,14 @@ asm void daTagTWGate_c::executeDemoHyral3() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4790 = 250.0f; -COMPILER_STRIP_GATE(80D55840, &lit_4790); +COMPILER_STRIP_GATE(0x80D55840, &lit_4790); #pragma pop /* 80D55844-80D55848 000098 0004+00 0/1 0/0 0/0 .rodata @4791 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4791 = -840.0f; -COMPILER_STRIP_GATE(80D55844, &lit_4791); +COMPILER_STRIP_GATE(0x80D55844, &lit_4791); #pragma pop /* 80D54ECC-80D54F88 00294C 00BC+00 4/4 0/0 0/0 .text initBaseMtx__13daTagTWGate_cFv */ @@ -978,6 +1056,15 @@ asm void daTagTWGate_c::initBaseMtx() { } #pragma pop +/* ############################################################################################## */ +/* 80D55848-80D55848 00009C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80D55953 = "TWGate_Md"; +SECTION_DEAD static char const* const stringBase_80D5595D = "TWGate_Wf"; +SECTION_DEAD static char const* const stringBase_80D55967 = "TWGate_Lk"; +#pragma pop + /* 80D54F88-80D5502C 002A08 00A4+00 4/4 0/0 0/0 .text downloadModels__13daTagTWGate_cFv */ #pragma push @@ -1090,7 +1177,7 @@ asm void __sinit_d_a_tag_TWgate_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80D55520 = (void*)__sinit_d_a_tag_TWgate_cpp; +REGISTER_CTORS(0x80D55520, __sinit_d_a_tag_TWgate_cpp); #pragma pop /* ############################################################################################## */ @@ -1116,30 +1203,4 @@ SECTION_DATA extern void* g_profile_Tag_TWGate[12] = { (void*)0x00040000, (void*)0x000E0000, }; -/* 80D55848-80D55971 00009C 0129+00 5/3 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80D55848 = "TWGate_FL"; -SECTION_DEAD static char const* const stringBase_80D55852 = "TW_GATE_FILONE"; -SECTION_DEAD static char const* const stringBase_80D55861 = "TW_GATE_FILONE_TALK"; -SECTION_DEAD static char const* const stringBase_80D55875 = "TW_GATE_FILONE_IN"; -SECTION_DEAD static char const* const stringBase_80D55887 = "F_SP108"; -SECTION_DEAD static char const* const stringBase_80D5588F = "TWGate_OD"; -SECTION_DEAD static char const* const stringBase_80D55899 = "TW_GATE_ORDIN"; -SECTION_DEAD static char const* const stringBase_80D558A7 = "TW_GATE_ORDIN_TALK"; -SECTION_DEAD static char const* const stringBase_80D558BA = "TW_GATE_ORDIN_IN"; -SECTION_DEAD static char const* const stringBase_80D558CB = "F_SP121"; -SECTION_DEAD static char const* const stringBase_80D558D3 = "TWGate_RN"; -SECTION_DEAD static char const* const stringBase_80D558DD = "TW_GATE_RANAIL"; -SECTION_DEAD static char const* const stringBase_80D558EC = "TW_GATE_RANAIL_TALK"; -SECTION_DEAD static char const* const stringBase_80D55900 = "TW_GATE_RANAIL_IN"; -SECTION_DEAD static char const* const stringBase_80D55912 = "TWGate_HY"; -SECTION_DEAD static char const* const stringBase_80D5591C = "TW_GATE_HYRAL"; -SECTION_DEAD static char const* const stringBase_80D5592A = "TW_GATE_HYRAL_TALK"; -SECTION_DEAD static char const* const stringBase_80D5593D = "TW_GATE_HYRAL_IN"; -SECTION_DEAD static char const* const stringBase_80D5594E = "Gate"; -SECTION_DEAD static char const* const stringBase_80D55953 = "TWGate_Md"; -SECTION_DEAD static char const* const stringBase_80D5595D = "TWGate_Wf"; -SECTION_DEAD static char const* const stringBase_80D55967 = "TWGate_Lk"; -#pragma pop +/* 80D55848-80D55848 00009C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/tag/d_a_tag_ajnot/d_a_tag_ajnot.cpp b/rel/d/a/tag/d_a_tag_ajnot/d_a_tag_ajnot.cpp index ffb13f6054f..dcccd4772fc 100644 --- a/rel/d/a/tag/d_a_tag_ajnot/d_a_tag_ajnot.cpp +++ b/rel/d/a/tag/d_a_tag_ajnot/d_a_tag_ajnot.cpp @@ -103,20 +103,20 @@ SECTION_RODATA static u8 const lit_3713[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(805A2880, &lit_3713); +COMPILER_STRIP_GATE(0x805A2880, &lit_3713); /* 805A2884-805A2888 000004 0004+00 0/1 0/0 0/0 .rodata @3714 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3714 = 100.0f; -COMPILER_STRIP_GATE(805A2884, &lit_3714); +COMPILER_STRIP_GATE(0x805A2884, &lit_3714); #pragma pop /* 805A2888-805A288C 000008 0004+00 0/1 0/0 0/0 .rodata @3715 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3715 = 10000.0f; -COMPILER_STRIP_GATE(805A2888, &lit_3715); +COMPILER_STRIP_GATE(0x805A2888, &lit_3715); #pragma pop /* 805A2744-805A2850 000164 010C+00 1/1 0/0 0/0 .text execute__12daTagAJnot_cFv */ diff --git a/rel/d/a/tag/d_a_tag_allmato/d_a_tag_allmato.cpp b/rel/d/a/tag/d_a_tag_allmato/d_a_tag_allmato.cpp index dae1e6b8202..21157fe8957 100644 --- a/rel/d/a/tag/d_a_tag_allmato/d_a_tag_allmato.cpp +++ b/rel/d/a/tag/d_a_tag_allmato/d_a_tag_allmato.cpp @@ -216,7 +216,22 @@ extern "C" extern f32 G_CM3D_F_ABS_MIN[1 + 1 /* padding */]; /* ############################################################################################## */ /* 804896E4-804896E8 000000 0004+00 5/6 0/0 0/0 .rodata @4025 */ SECTION_RODATA static f32 const lit_4025 = 100.0f; -COMPILER_STRIP_GATE(804896E4, &lit_4025); +COMPILER_STRIP_GATE(0x804896E4, &lit_4025); + +/* 8048973C-8048973C 000058 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8048973C = ""; +SECTION_DEAD static char const* const stringBase_8048973D = "FOCUS_BOUMATO"; +SECTION_DEAD static char const* const stringBase_8048974B = "FOCUS_ITAMATO"; +SECTION_DEAD static char const* const stringBase_80489759 = "FOCUS_ITAMATO_ON_ROOF"; +SECTION_DEAD static char const* const stringBase_8048976F = "HIT_BOUMATO1"; +SECTION_DEAD static char const* const stringBase_8048977C = "HIT_BOUMATO2"; +SECTION_DEAD static char const* const stringBase_80489789 = "HIT_BOUMATO3"; +SECTION_DEAD static char const* const stringBase_80489796 = "NEARPIN_BOUMATO"; +SECTION_DEAD static char const* const stringBase_804897A6 = "Taro1"; +SECTION_DEAD static char const* const stringBase_804897AC = "Taro2"; +#pragma pop /* 804897BC-804897FC -00001 0040+00 2/2 0/0 0/0 .data l_evtList */ SECTION_DATA static void* l_evtList[16] = { @@ -319,6 +334,27 @@ bool daTag_AllMato_c::Delete() { } /* ############################################################################################## */ +/* 8048973D-8048974B 000059 000E+00 2/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_8048973D; + +/* 8048974B-80489759 000067 000E+00 2/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_8048974B; + +/* 80489759-8048976F 000075 0016+00 2/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80489759; + +/* 8048976F-8048977C 00008B 000D+00 2/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_8048976F; + +/* 8048977C-80489789 000098 000D+00 2/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_8048977C; + +/* 80489789-80489796 0000A5 000D+00 2/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80489789; + +/* 80489796-804897A6 0000B2 0010+00 2/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80489796; + /* 804896E8-80489704 -00001 001C+00 1/1 0/0 0/0 .rodata @4071 */ SECTION_RODATA static void* const lit_4071[7] = { (void*)(((char*)&d_a_tag_allmato__stringBase0) + 0x1), @@ -329,7 +365,13 @@ SECTION_RODATA static void* const lit_4071[7] = { (void*)(((char*)&d_a_tag_allmato__stringBase0) + 0x4D), (void*)(((char*)&d_a_tag_allmato__stringBase0) + 0x5A), }; -COMPILER_STRIP_GATE(804896E8, &lit_4071); +COMPILER_STRIP_GATE(0x804896E8, &lit_4071); + +/* 8048973C-8048973C 000058 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_804897B2 = "AllMato"; +#pragma pop /* 804876B8-80487C5C 0001F8 05A4+00 1/1 0/0 0/0 .text Execute__15daTag_AllMato_cFv */ #pragma push @@ -463,7 +505,7 @@ SECTION_RODATA static u8 const lit_4606[4 + 4 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80489704, &lit_4606); +COMPILER_STRIP_GATE(0x80489704, &lit_4606); #pragma pop /* 8048970C-80489714 000028 0008+00 0/4 0/0 0/0 .rodata @4607 */ @@ -472,7 +514,7 @@ COMPILER_STRIP_GATE(80489704, &lit_4606); SECTION_RODATA static u8 const lit_4607[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8048970C, &lit_4607); +COMPILER_STRIP_GATE(0x8048970C, &lit_4607); #pragma pop /* 80489714-8048971C 000030 0008+00 0/4 0/0 0/0 .rodata @4608 */ @@ -481,7 +523,7 @@ COMPILER_STRIP_GATE(8048970C, &lit_4607); SECTION_RODATA static u8 const lit_4608[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80489714, &lit_4608); +COMPILER_STRIP_GATE(0x80489714, &lit_4608); #pragma pop /* 8048971C-80489724 000038 0008+00 0/4 0/0 0/0 .rodata @4609 */ @@ -490,28 +532,28 @@ COMPILER_STRIP_GATE(80489714, &lit_4608); SECTION_RODATA static u8 const lit_4609[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8048971C, &lit_4609); +COMPILER_STRIP_GATE(0x8048971C, &lit_4609); #pragma pop /* 80489724-80489728 000040 0004+00 0/2 0/0 0/0 .rodata @4610 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4610 = -2.0f; -COMPILER_STRIP_GATE(80489724, &lit_4610); +COMPILER_STRIP_GATE(0x80489724, &lit_4610); #pragma pop /* 80489728-8048972C 000044 0004+00 0/2 0/0 0/0 .rodata @4611 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4611 = -100.0f; -COMPILER_STRIP_GATE(80489728, &lit_4611); +COMPILER_STRIP_GATE(0x80489728, &lit_4611); #pragma pop /* 8048972C-80489730 000048 0004+00 0/2 0/0 0/0 .rodata @4612 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4612 = 95.0f; -COMPILER_STRIP_GATE(8048972C, &lit_4612); +COMPILER_STRIP_GATE(0x8048972C, &lit_4612); #pragma pop /* 80488238-80488994 000D78 075C+00 1/1 0/0 0/0 .text checkCrsMato__15daTag_AllMato_cFv @@ -627,7 +669,7 @@ asm daNpcT_ActorMngr_c::daNpcT_ActorMngr_c() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4688 = 10.0f; -COMPILER_STRIP_GATE(80489730, &lit_4688); +COMPILER_STRIP_GATE(0x80489730, &lit_4688); #pragma pop /* 804891BC-804893C4 001CFC 0208+00 1/1 0/0 0/0 .text @@ -656,14 +698,14 @@ asm cM3dGSph::~cM3dGSph() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4752 = 120.0f; -COMPILER_STRIP_GATE(80489734, &lit_4752); +COMPILER_STRIP_GATE(0x80489734, &lit_4752); #pragma pop /* 80489738-8048973C 000054 0004+00 0/1 0/0 0/0 .rodata @4753 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4753 = 30.0f; -COMPILER_STRIP_GATE(80489738, &lit_4753); +COMPILER_STRIP_GATE(0x80489738, &lit_4753); #pragma pop /* 8048940C-804895EC 001F4C 01E0+00 2/2 0/0 0/0 .text @@ -697,19 +739,4 @@ asm daTag_AllMato_c::~daTag_AllMato_c() { } #pragma pop -/* 8048973C-804897BA 000058 007E+00 4/1 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_8048973C = ""; -SECTION_DEAD static char const* const stringBase_8048973D = "FOCUS_BOUMATO"; -SECTION_DEAD static char const* const stringBase_8048974B = "FOCUS_ITAMATO"; -SECTION_DEAD static char const* const stringBase_80489759 = "FOCUS_ITAMATO_ON_ROOF"; -SECTION_DEAD static char const* const stringBase_8048976F = "HIT_BOUMATO1"; -SECTION_DEAD static char const* const stringBase_8048977C = "HIT_BOUMATO2"; -SECTION_DEAD static char const* const stringBase_80489789 = "HIT_BOUMATO3"; -SECTION_DEAD static char const* const stringBase_80489796 = "NEARPIN_BOUMATO"; -SECTION_DEAD static char const* const stringBase_804897A6 = "Taro1"; -SECTION_DEAD static char const* const stringBase_804897AC = "Taro2"; -SECTION_DEAD static char const* const stringBase_804897B2 = "AllMato"; -#pragma pop +/* 8048973C-8048973C 000058 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/tag/d_a_tag_attack_item/d_a_tag_attack_item.cpp b/rel/d/a/tag/d_a_tag_attack_item/d_a_tag_attack_item.cpp index acf828f03d7..6f05938d685 100644 --- a/rel/d/a/tag/d_a_tag_attack_item/d_a_tag_attack_item.cpp +++ b/rel/d/a/tag/d_a_tag_attack_item/d_a_tag_attack_item.cpp @@ -181,11 +181,11 @@ asm void daTagAtkItem_c::setBaseMtx() { /* ############################################################################################## */ /* 805A32C8-805A32CC 000000 0004+00 2/2 0/0 0/0 .rodata @3657 */ SECTION_RODATA static f32 const lit_3657 = 50.0f; -COMPILER_STRIP_GATE(805A32C8, &lit_3657); +COMPILER_STRIP_GATE(0x805A32C8, &lit_3657); /* 805A32CC-805A32D0 000004 0004+00 1/2 0/0 0/0 .rodata @3658 */ SECTION_RODATA static f32 const lit_3658 = 100.0f; -COMPILER_STRIP_GATE(805A32CC, &lit_3658); +COMPILER_STRIP_GATE(0x805A32CC, &lit_3658); /* 805A32F4-805A3338 000000 0044+00 1/1 0/0 0/0 .data l_cyl_src */ SECTION_DATA static u8 l_cyl_src[68] = { @@ -377,7 +377,7 @@ SECTION_RODATA static u8 const lit_3859[4 + 4 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(805A32D0, &lit_3859); +COMPILER_STRIP_GATE(0x805A32D0, &lit_3859); #pragma pop /* 805A32D8-805A32E0 000010 0008+00 0/1 0/0 0/0 .rodata @3860 */ @@ -386,7 +386,7 @@ COMPILER_STRIP_GATE(805A32D0, &lit_3859); SECTION_RODATA static u8 const lit_3860[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(805A32D8, &lit_3860); +COMPILER_STRIP_GATE(0x805A32D8, &lit_3860); #pragma pop /* 805A32E0-805A32E8 000018 0008+00 0/1 0/0 0/0 .rodata @3861 */ @@ -395,7 +395,7 @@ COMPILER_STRIP_GATE(805A32D8, &lit_3860); SECTION_RODATA static u8 const lit_3861[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(805A32E0, &lit_3861); +COMPILER_STRIP_GATE(0x805A32E0, &lit_3861); #pragma pop /* 805A32E8-805A32F0 000020 0008+00 0/1 0/0 0/0 .rodata @3862 */ @@ -404,7 +404,7 @@ COMPILER_STRIP_GATE(805A32E0, &lit_3861); SECTION_RODATA static u8 const lit_3862[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(805A32E8, &lit_3862); +COMPILER_STRIP_GATE(0x805A32E8, &lit_3862); #pragma pop /* 805A2D58-805A2F54 000478 01FC+00 1/1 0/0 0/0 .text checkHit__14daTagAtkItem_cFv */ @@ -420,7 +420,7 @@ asm void daTagAtkItem_c::checkHit() { /* ############################################################################################## */ /* 805A32F0-805A32F4 000028 0004+00 1/1 0/0 0/0 .rodata @3898 */ SECTION_RODATA static f32 const lit_3898 = 32767.0f; -COMPILER_STRIP_GATE(805A32F0, &lit_3898); +COMPILER_STRIP_GATE(0x805A32F0, &lit_3898); /* 805A2F54-805A3038 000674 00E4+00 2/2 0/0 0/0 .text createItem__14daTagAtkItem_cFv */ #pragma push diff --git a/rel/d/a/tag/d_a_tag_attention/d_a_tag_attention.cpp b/rel/d/a/tag/d_a_tag_attention/d_a_tag_attention.cpp index 1fb662e7484..729f77cb70b 100644 --- a/rel/d/a/tag/d_a_tag_attention/d_a_tag_attention.cpp +++ b/rel/d/a/tag/d_a_tag_attention/d_a_tag_attention.cpp @@ -79,7 +79,7 @@ SECTION_RODATA static u8 const l_dist_tbl[2 + 2 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(804D5724, &l_dist_tbl); +COMPILER_STRIP_GATE(0x804D5724, &l_dist_tbl); /* 804D5318-804D5354 000078 003C+00 1/1 0/0 0/0 .text Create__8daAttp_cFv */ #pragma push @@ -109,7 +109,7 @@ SECTION_RODATA static u8 const lit_3772[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(804D5728, &lit_3772); +COMPILER_STRIP_GATE(0x804D5728, &lit_3772); /* 804D572C-804D574C -00001 0020+00 1/1 0/0 0/0 .data @3773 */ SECTION_DATA static void* lit_3773[8] = { diff --git a/rel/d/a/tag/d_a_tag_bottle_item/d_a_tag_bottle_item.cpp b/rel/d/a/tag/d_a_tag_bottle_item/d_a_tag_bottle_item.cpp index e4bbd3f26a2..6d77b205faa 100644 --- a/rel/d/a/tag/d_a_tag_bottle_item/d_a_tag_bottle_item.cpp +++ b/rel/d/a/tag/d_a_tag_bottle_item/d_a_tag_bottle_item.cpp @@ -188,27 +188,27 @@ asm void daTag_BottleItem_c::restart() { /* ############################################################################################## */ /* 80D56658-80D5665C 000000 0004+00 1/1 0/0 0/0 .rodata @3697 */ SECTION_RODATA static f32 const lit_3697 = -30.0f; -COMPILER_STRIP_GATE(80D56658, &lit_3697); +COMPILER_STRIP_GATE(0x80D56658, &lit_3697); /* 80D5665C-80D56660 000004 0004+00 0/1 0/0 0/0 .rodata @3698 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3698 = -15.0f; -COMPILER_STRIP_GATE(80D5665C, &lit_3698); +COMPILER_STRIP_GATE(0x80D5665C, &lit_3698); #pragma pop /* 80D56660-80D56664 000008 0004+00 0/1 0/0 0/0 .rodata @3699 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3699 = 30.0f; -COMPILER_STRIP_GATE(80D56660, &lit_3699); +COMPILER_STRIP_GATE(0x80D56660, &lit_3699); #pragma pop /* 80D56664-80D56668 00000C 0004+00 0/1 0/0 0/0 .rodata @3700 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3700 = 45.0f; -COMPILER_STRIP_GATE(80D56664, &lit_3700); +COMPILER_STRIP_GATE(0x80D56664, &lit_3700); #pragma pop /* 80D56170-80D561E8 000210 0078+00 1/1 0/0 0/0 .text initialize__18daTag_BottleItem_cFv @@ -227,7 +227,7 @@ asm void daTag_BottleItem_c::initialize() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daTag_BottleItem_c::checkProcess(int (daTag_BottleItem_c::*)(void*)) { +asm void daTag_BottleItem_c::checkProcess(int (daTag_BottleItem_c::*param_0)(void*)) { nofralloc #include "asm/rel/d/a/tag/d_a_tag_bottle_item/d_a_tag_bottle_item/func_80D561E8.s" } @@ -238,7 +238,7 @@ asm void daTag_BottleItem_c::checkProcess(int (daTag_BottleItem_c::*)(void*)) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daTag_BottleItem_c::setProcess(int (daTag_BottleItem_c::*)(void*)) { +asm void daTag_BottleItem_c::setProcess(int (daTag_BottleItem_c::*param_0)(void*)) { nofralloc #include "asm/rel/d/a/tag/d_a_tag_bottle_item/d_a_tag_bottle_item/func_80D56214.s" } @@ -289,11 +289,11 @@ asm void daTag_BottleItem_c::makeSoup() { /* ############################################################################################## */ /* 80D56668-80D5666C 000010 0004+00 1/1 0/0 0/0 .rodata @3796 */ SECTION_RODATA static f32 const lit_3796 = 140.0f; -COMPILER_STRIP_GATE(80D56668, &lit_3796); +COMPILER_STRIP_GATE(0x80D56668, &lit_3796); /* 80D5666C-80D56670 000014 0004+00 1/1 0/0 0/0 .rodata @3797 */ SECTION_RODATA static f32 const lit_3797 = 100.0f; -COMPILER_STRIP_GATE(80D5666C, &lit_3797); +COMPILER_STRIP_GATE(0x80D5666C, &lit_3797); /* 80D564A0-80D56568 000540 00C8+00 1/0 0/0 0/0 .text wait__18daTag_BottleItem_cFPv */ #pragma push diff --git a/rel/d/a/tag/d_a_tag_camera/d_a_tag_camera.cpp b/rel/d/a/tag/d_a_tag_camera/d_a_tag_camera.cpp index 648581b6179..a91729f173c 100644 --- a/rel/d/a/tag/d_a_tag_camera/d_a_tag_camera.cpp +++ b/rel/d/a/tag/d_a_tag_camera/d_a_tag_camera.cpp @@ -447,7 +447,7 @@ asm void daTag_Cam_c::getAreaNoChk() { SECTION_RODATA static u8 const lit_3874[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8048A590, &lit_3874); +COMPILER_STRIP_GATE(0x8048A590, &lit_3874); /* 8048A59C-8048A5F4 -00001 0058+00 0/0 0/0 0/0 .rodata @4358 */ #pragma push @@ -460,14 +460,14 @@ SECTION_RODATA static void* const lit_4358[22] = { (void*)func_80489DB0, (void*)func_80489DE4, (void*)func_80489DF8, (void*)func_80489E18, (void*)func_80489E8C, (void*)func_80489EDC, }; -COMPILER_STRIP_GATE(8048A59C, &lit_4358); +COMPILER_STRIP_GATE(0x8048A59C, &lit_4358); #pragma pop /* 8048A5F4-8048A5F8 000064 0004+00 0/1 0/0 0/0 .rodata @4466 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4466 = 80.0f; -COMPILER_STRIP_GATE(8048A5F4, &lit_4466); +COMPILER_STRIP_GATE(0x8048A5F4, &lit_4466); #pragma pop /* 8048A5F8-8048A600 000068 0004+04 0/2 0/0 0/0 .rodata @4467 */ @@ -484,7 +484,7 @@ SECTION_RODATA static u8 const lit_4467[4 + 4 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(8048A5F8, &lit_4467); +COMPILER_STRIP_GATE(0x8048A5F8, &lit_4467); #pragma pop /* 8048A600-8048A608 000070 0008+00 0/1 0/0 0/0 .rodata @4468 */ @@ -493,7 +493,7 @@ COMPILER_STRIP_GATE(8048A5F8, &lit_4467); SECTION_RODATA static u8 const lit_4468[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8048A600, &lit_4468); +COMPILER_STRIP_GATE(0x8048A600, &lit_4468); #pragma pop /* 8048A608-8048A610 000078 0008+00 0/1 0/0 0/0 .rodata @4469 */ @@ -502,7 +502,7 @@ COMPILER_STRIP_GATE(8048A600, &lit_4468); SECTION_RODATA static u8 const lit_4469[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8048A608, &lit_4469); +COMPILER_STRIP_GATE(0x8048A608, &lit_4469); #pragma pop /* 8048A610-8048A618 000080 0008+00 0/1 0/0 0/0 .rodata @4470 */ @@ -511,7 +511,7 @@ COMPILER_STRIP_GATE(8048A608, &lit_4469); SECTION_RODATA static u8 const lit_4470[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8048A610, &lit_4470); +COMPILER_STRIP_GATE(0x8048A610, &lit_4470); #pragma pop /* 80489F74-8048A378 000554 0404+00 1/1 0/0 0/0 .text execute__11daTag_Cam_cFv */ @@ -562,14 +562,14 @@ static asm void daTag_Cam_Delete(daTag_Cam_c* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4545 = 500.0f; -COMPILER_STRIP_GATE(8048A618, &lit_4545); +COMPILER_STRIP_GATE(0x8048A618, &lit_4545); #pragma pop /* 8048A61C-8048A620 00008C 0004+00 0/1 0/0 0/0 .rodata @4546 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4546 = 1000.0f; -COMPILER_STRIP_GATE(8048A61C, &lit_4546); +COMPILER_STRIP_GATE(0x8048A61C, &lit_4546); #pragma pop /* 8048A3DC-8048A588 0009BC 01AC+00 1/0 0/0 0/0 .text daTag_Cam_Create__FP10fopAc_ac_c */ diff --git a/rel/d/a/tag/d_a_tag_chgrestart/d_a_tag_chgrestart.cpp b/rel/d/a/tag/d_a_tag_chgrestart/d_a_tag_chgrestart.cpp index 28201529eb5..134a501f57d 100644 --- a/rel/d/a/tag/d_a_tag_chgrestart/d_a_tag_chgrestart.cpp +++ b/rel/d/a/tag/d_a_tag_chgrestart/d_a_tag_chgrestart.cpp @@ -87,13 +87,13 @@ extern "C" extern u8 g_dComIfG_gameInfo[122384]; /* ############################################################################################## */ /* 80D56AF4-80D56AF8 000000 0004+00 1/1 0/0 0/0 .rodata @3650 */ SECTION_RODATA static f32 const lit_3650 = -100.0f; -COMPILER_STRIP_GATE(80D56AF4, &lit_3650); +COMPILER_STRIP_GATE(0x80D56AF4, &lit_3650); /* 80D56AF8-80D56AFC 000004 0004+00 0/1 0/0 0/0 .rodata @3651 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3651 = 100.0f; -COMPILER_STRIP_GATE(80D56AF8, &lit_3651); +COMPILER_STRIP_GATE(0x80D56AF8, &lit_3651); #pragma pop /* 80D56AFC-80D56B00 000008 0004+00 0/1 0/0 0/0 .rodata @3652 */ @@ -105,7 +105,7 @@ SECTION_RODATA static u8 const lit_3652[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D56AFC, &lit_3652); +COMPILER_STRIP_GATE(0x80D56AFC, &lit_3652); #pragma pop /* 80D56758-80D567E4 000078 008C+00 1/1 0/0 0/0 .text Create__17daTagChgRestart_cFv */ diff --git a/rel/d/a/tag/d_a_tag_chkpoint/d_a_tag_chkpoint.cpp b/rel/d/a/tag/d_a_tag_chkpoint/d_a_tag_chkpoint.cpp index 095c7bd0848..83fc02a5969 100644 --- a/rel/d/a/tag/d_a_tag_chkpoint/d_a_tag_chkpoint.cpp +++ b/rel/d/a/tag/d_a_tag_chkpoint/d_a_tag_chkpoint.cpp @@ -79,7 +79,7 @@ SECTION_RODATA static u8 const lit_3769[9 + 3 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(8048AC28, &lit_3769); +COMPILER_STRIP_GATE(0x8048AC28, &lit_3769); /* 8048AC34-8048AC38 00000C 0004+00 0/2 0/0 0/0 .rodata @3843 */ #pragma push @@ -90,7 +90,7 @@ SECTION_RODATA static u8 const lit_3843[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(8048AC34, &lit_3843); +COMPILER_STRIP_GATE(0x8048AC34, &lit_3843); #pragma pop /* 8048AC38-8048AC40 000010 0008+00 0/1 0/0 0/0 .rodata @3844 */ @@ -99,7 +99,7 @@ COMPILER_STRIP_GATE(8048AC34, &lit_3843); SECTION_RODATA static u8 const lit_3844[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8048AC38, &lit_3844); +COMPILER_STRIP_GATE(0x8048AC38, &lit_3844); #pragma pop /* 8048AC40-8048AC48 000018 0008+00 0/1 0/0 0/0 .rodata @3845 */ @@ -108,7 +108,7 @@ COMPILER_STRIP_GATE(8048AC38, &lit_3844); SECTION_RODATA static u8 const lit_3845[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8048AC40, &lit_3845); +COMPILER_STRIP_GATE(0x8048AC40, &lit_3845); #pragma pop /* 8048AC48-8048AC50 000020 0008+00 0/1 0/0 0/0 .rodata @3846 */ @@ -117,7 +117,7 @@ COMPILER_STRIP_GATE(8048AC40, &lit_3845); SECTION_RODATA static u8 const lit_3846[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8048AC48, &lit_3846); +COMPILER_STRIP_GATE(0x8048AC48, &lit_3846); #pragma pop /* 8048A6F8-8048A9EC 000078 02F4+00 1/1 0/0 0/0 .text execute__11daTag_Chk_cFv */ @@ -168,28 +168,28 @@ static asm void daTag_Chk_Delete(daTag_Chk_c* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3925 = 50.0f; -COMPILER_STRIP_GATE(8048AC50, &lit_3925); +COMPILER_STRIP_GATE(0x8048AC50, &lit_3925); #pragma pop /* 8048AC54-8048AC58 00002C 0004+00 0/1 0/0 0/0 .rodata @3926 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3926 = 100.0f; -COMPILER_STRIP_GATE(8048AC54, &lit_3926); +COMPILER_STRIP_GATE(0x8048AC54, &lit_3926); #pragma pop /* 8048AC58-8048AC5C 000030 0004+00 0/1 0/0 0/0 .rodata @3927 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3927 = 10.0f; -COMPILER_STRIP_GATE(8048AC58, &lit_3927); +COMPILER_STRIP_GATE(0x8048AC58, &lit_3927); #pragma pop /* 8048AC5C-8048AC60 000034 0004+00 0/1 0/0 0/0 .rodata @3928 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3928 = 0.5f; -COMPILER_STRIP_GATE(8048AC5C, &lit_3928); +COMPILER_STRIP_GATE(0x8048AC5C, &lit_3928); #pragma pop /* 8048AC60-8048AC68 000038 0008+00 0/1 0/0 0/0 .rodata @3930 */ @@ -198,7 +198,7 @@ COMPILER_STRIP_GATE(8048AC5C, &lit_3928); SECTION_RODATA static u8 const lit_3930[8] = { 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8048AC60, &lit_3930); +COMPILER_STRIP_GATE(0x8048AC60, &lit_3930); #pragma pop /* 8048AA50-8048AC20 0003D0 01D0+00 1/0 0/0 0/0 .text daTag_Chk_Create__FP10fopAc_ac_c */ diff --git a/rel/d/a/tag/d_a_tag_cstasw/d_a_tag_CstaSw.cpp b/rel/d/a/tag/d_a_tag_cstasw/d_a_tag_CstaSw.cpp index 5ce9ddc24d9..22af7393e0e 100644 --- a/rel/d/a/tag/d_a_tag_cstasw/d_a_tag_CstaSw.cpp +++ b/rel/d/a/tag/d_a_tag_cstasw/d_a_tag_CstaSw.cpp @@ -198,7 +198,7 @@ SECTION_RODATA static u8 const lit_3724[4 + 4 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(805A252C, &lit_3724); +COMPILER_STRIP_GATE(0x805A252C, &lit_3724); /* 805A2534-805A253C 000008 0008+00 0/1 0/0 0/0 .rodata @3725 */ #pragma push @@ -206,7 +206,7 @@ COMPILER_STRIP_GATE(805A252C, &lit_3724); SECTION_RODATA static u8 const lit_3725[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(805A2534, &lit_3725); +COMPILER_STRIP_GATE(0x805A2534, &lit_3725); #pragma pop /* 805A253C-805A2544 000010 0008+00 0/1 0/0 0/0 .rodata @3726 */ @@ -215,7 +215,7 @@ COMPILER_STRIP_GATE(805A2534, &lit_3725); SECTION_RODATA static u8 const lit_3726[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(805A253C, &lit_3726); +COMPILER_STRIP_GATE(0x805A253C, &lit_3726); #pragma pop /* 805A2544-805A254C 000018 0008+00 0/1 0/0 0/0 .rodata @3727 */ @@ -224,14 +224,14 @@ COMPILER_STRIP_GATE(805A253C, &lit_3726); SECTION_RODATA static u8 const lit_3727[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(805A2544, &lit_3727); +COMPILER_STRIP_GATE(0x805A2544, &lit_3727); #pragma pop /* 805A254C-805A2550 000020 0004+00 0/1 0/0 0/0 .rodata @3728 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3728 = 100.0f; -COMPILER_STRIP_GATE(805A254C, &lit_3728); +COMPILER_STRIP_GATE(0x805A254C, &lit_3728); #pragma pop /* 805A21A0-805A2340 000260 01A0+00 1/1 0/0 0/0 .text areaCheck__13daTagCstaSw_cFv */ @@ -335,5 +335,5 @@ asm void __sinit_d_a_tag_CstaSw_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_805A24DC = (void*)__sinit_d_a_tag_CstaSw_cpp; +REGISTER_CTORS(0x805A24DC, __sinit_d_a_tag_CstaSw_cpp); #pragma pop diff --git a/rel/d/a/tag/d_a_tag_csw/d_a_tag_csw.cpp b/rel/d/a/tag/d_a_tag_csw/d_a_tag_csw.cpp index 945eb37e5d5..836aa821a7b 100644 --- a/rel/d/a/tag/d_a_tag_csw/d_a_tag_csw.cpp +++ b/rel/d/a/tag/d_a_tag_csw/d_a_tag_csw.cpp @@ -144,10 +144,10 @@ struct cBgS { /* 80074250 */ void Release(dBgW_Base*); }; -struct Vec {}; - struct JAISoundID {}; +struct Vec {}; + struct Z2SeMgr { /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); /* 802AC50C */ void seStartLevel(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); @@ -271,6 +271,12 @@ extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; // /* ############################################################################################## */ +/* 80D58620-80D58620 000068 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80D58620 = "Lv6Warp"; +#pragma pop + /* 80D58628-80D58634 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -388,7 +394,7 @@ asm daTagCsw_c::~daTagCsw_c() { SECTION_RODATA static u8 const l_bmd_idx[8] = { 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x06, }; -COMPILER_STRIP_GATE(80D585B8, &l_bmd_idx); +COMPILER_STRIP_GATE(0x80D585B8, &l_bmd_idx); /* 80D585C0-80D585C8 000008 0008+00 0/0 0/0 0/0 .rodata l_brk_idx */ #pragma push @@ -396,7 +402,7 @@ COMPILER_STRIP_GATE(80D585B8, &l_bmd_idx); SECTION_RODATA static u8 const l_brk_idx[8] = { 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x0A, }; -COMPILER_STRIP_GATE(80D585C0, &l_brk_idx); +COMPILER_STRIP_GATE(0x80D585C0, &l_brk_idx); #pragma pop /* 80D585C8-80D585D0 000010 0008+00 0/0 0/0 0/0 .rodata l_dbz_idx */ @@ -405,12 +411,12 @@ COMPILER_STRIP_GATE(80D585C0, &l_brk_idx); SECTION_RODATA static u8 const l_dbz_idx[8] = { 0x00, 0x00, 0x00, 0x0D, 0x00, 0x00, 0x00, 0x0E, }; -COMPILER_STRIP_GATE(80D585C8, &l_dbz_idx); +COMPILER_STRIP_GATE(0x80D585C8, &l_dbz_idx); #pragma pop /* 80D585D0-80D585D4 000018 0004+00 3/4 0/0 0/0 .rodata @3725 */ SECTION_RODATA static f32 const lit_3725 = 1.0f; -COMPILER_STRIP_GATE(80D585D0, &lit_3725); +COMPILER_STRIP_GATE(0x80D585D0, &lit_3725); /* 80D56D98-80D56EF8 000238 0160+00 2/2 0/0 0/0 .text setMtx__10daTagCsw_cFv */ #pragma push @@ -472,21 +478,21 @@ SECTION_RODATA static u8 const lit_4000[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D585D4, &lit_4000); +COMPILER_STRIP_GATE(0x80D585D4, &lit_4000); #pragma pop /* 80D585D8-80D585DC 000020 0004+00 0/2 0/0 0/0 .rodata @4001 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4001 = 500.0f; -COMPILER_STRIP_GATE(80D585D8, &lit_4001); +COMPILER_STRIP_GATE(0x80D585D8, &lit_4001); #pragma pop /* 80D585DC-80D585E0 000024 0004+00 0/2 0/0 0/0 .rodata @4002 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4002 = 5.0f; -COMPILER_STRIP_GATE(80D585DC, &lit_4002); +COMPILER_STRIP_GATE(0x80D585DC, &lit_4002); #pragma pop /* 80D573C0-80D576D4 000860 0314+00 1/1 0/0 0/0 .text create__10daTagCsw_cFv */ @@ -576,7 +582,7 @@ SECTION_RODATA static f32 const lit_4158[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80D585E0, &lit_4158); +COMPILER_STRIP_GATE(0x80D585E0, &lit_4158); /* 80D579A8-80D579E8 000E48 0040+00 2/2 0/0 0/0 .text offLight__10daTagCsw_cFv */ #pragma push @@ -595,7 +601,7 @@ asm void daTagCsw_c::offLight() { SECTION_RODATA static u8 const lit_4461[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D585E8, &lit_4461); +COMPILER_STRIP_GATE(0x80D585E8, &lit_4461); #pragma pop /* 80D585F0-80D585F8 000038 0008+00 0/1 0/0 0/0 .rodata @4462 */ @@ -604,7 +610,7 @@ COMPILER_STRIP_GATE(80D585E8, &lit_4461); SECTION_RODATA static u8 const lit_4462[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D585F0, &lit_4462); +COMPILER_STRIP_GATE(0x80D585F0, &lit_4462); #pragma pop /* 80D585F8-80D58600 000040 0008+00 0/1 0/0 0/0 .rodata @4463 */ @@ -613,63 +619,63 @@ COMPILER_STRIP_GATE(80D585F0, &lit_4462); SECTION_RODATA static u8 const lit_4463[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D585F8, &lit_4463); +COMPILER_STRIP_GATE(0x80D585F8, &lit_4463); #pragma pop /* 80D58600-80D58604 000048 0004+00 0/1 0/0 0/0 .rodata @4464 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4464 = 75.0f; -COMPILER_STRIP_GATE(80D58600, &lit_4464); +COMPILER_STRIP_GATE(0x80D58600, &lit_4464); #pragma pop /* 80D58604-80D58608 00004C 0004+00 0/1 0/0 0/0 .rodata @4465 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4465 = 30.0f; -COMPILER_STRIP_GATE(80D58604, &lit_4465); +COMPILER_STRIP_GATE(0x80D58604, &lit_4465); #pragma pop /* 80D58608-80D5860C 000050 0004+00 0/1 0/0 0/0 .rodata @4466 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4466 = 200.0f; -COMPILER_STRIP_GATE(80D58608, &lit_4466); +COMPILER_STRIP_GATE(0x80D58608, &lit_4466); #pragma pop /* 80D5860C-80D58610 000054 0004+00 0/1 0/0 0/0 .rodata @4467 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4467 = -5.0f; -COMPILER_STRIP_GATE(80D5860C, &lit_4467); +COMPILER_STRIP_GATE(0x80D5860C, &lit_4467); #pragma pop /* 80D58610-80D58614 000058 0004+00 0/1 0/0 0/0 .rodata @4468 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4468 = 2.0f; -COMPILER_STRIP_GATE(80D58610, &lit_4468); +COMPILER_STRIP_GATE(0x80D58610, &lit_4468); #pragma pop /* 80D58614-80D58618 00005C 0004+00 0/1 0/0 0/0 .rodata @4469 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4469 = 11.0f / 10.0f; -COMPILER_STRIP_GATE(80D58614, &lit_4469); +COMPILER_STRIP_GATE(0x80D58614, &lit_4469); #pragma pop /* 80D58618-80D5861C 000060 0004+00 0/1 0/0 0/0 .rodata @4470 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4470 = 280.0f; -COMPILER_STRIP_GATE(80D58618, &lit_4470); +COMPILER_STRIP_GATE(0x80D58618, &lit_4470); #pragma pop /* 80D5861C-80D58620 000064 0004+00 0/1 0/0 0/0 .rodata @4471 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4471 = -9.0f / 10.0f; -COMPILER_STRIP_GATE(80D5861C, &lit_4471); +COMPILER_STRIP_GATE(0x80D5861C, &lit_4471); #pragma pop /* 80D579E8-80D583B8 000E88 09D0+00 1/1 0/0 0/0 .text execute__10daTagCsw_cFv */ @@ -748,9 +754,4 @@ asm cCcD_GStts::~cCcD_GStts() { } #pragma pop -/* 80D58620-80D58628 000068 0008+00 1/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80D58620 = "Lv6Warp"; -#pragma pop +/* 80D58620-80D58620 000068 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/tag/d_a_tag_event/d_a_tag_event.cpp b/rel/d/a/tag/d_a_tag_event/d_a_tag_event.cpp index 6e4e072829c..35b7191239d 100644 --- a/rel/d/a/tag/d_a_tag_event/d_a_tag_event.cpp +++ b/rel/d/a/tag/d_a_tag_event/d_a_tag_event.cpp @@ -136,6 +136,13 @@ extern "C" extern u8 struct_80450D64[4]; // Declarations: // +/* ############################################################################################## */ +/* 8048B840-8048B840 000010 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8048B840 = "Bk"; +#pragma pop + /* 8048AD38-8048AD68 000078 0030+00 1/1 0/0 0/0 .text daTag_getBk__FUl */ #pragma push #pragma optimization_level 0 @@ -259,11 +266,11 @@ void daTag_Event_c::demoProc() { /* ############################################################################################## */ /* 8048B830-8048B834 000000 0004+00 1/1 0/0 0/0 .rodata @3814 */ SECTION_RODATA static f32 const lit_3814 = 100.0f; -COMPILER_STRIP_GATE(8048B830, &lit_3814); +COMPILER_STRIP_GATE(0x8048B830, &lit_3814); /* 8048B834-8048B838 000004 0004+00 1/1 0/0 0/0 .rodata @3815 */ SECTION_RODATA static f32 const lit_3815 = 10.0f; -COMPILER_STRIP_GATE(8048B834, &lit_3815); +COMPILER_STRIP_GATE(0x8048B834, &lit_3815); /* 8048AF00-8048B0E4 000240 01E4+00 1/1 0/0 0/0 .text create__13daTag_Event_cFv */ #pragma push @@ -308,7 +315,7 @@ asm void daTag_Event_c::actionReady() { /* ############################################################################################## */ /* 8048B838-8048B83C 000008 0004+00 1/1 0/0 0/0 .rodata @3954 */ SECTION_RODATA static f32 const lit_3954 = 0.5f; -COMPILER_STRIP_GATE(8048B838, &lit_3954); +COMPILER_STRIP_GATE(0x8048B838, &lit_3954); /* 8048B83C-8048B840 00000C 0004+00 1/1 0/0 0/0 .rodata @3955 */ SECTION_RODATA static u8 const lit_3955[4] = { @@ -317,7 +324,7 @@ SECTION_RODATA static u8 const lit_3955[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(8048B83C, &lit_3955); +COMPILER_STRIP_GATE(0x8048B83C, &lit_3955); /* 8048B378-8048B514 0006B8 019C+00 1/1 0/0 0/0 .text checkArea__13daTag_Event_cFv */ #pragma push @@ -449,9 +456,4 @@ SECTION_DATA extern void* g_profile_TAG_EVENT[12] = { (void*)0x00044000, (void*)0x00060000, }; -/* 8048B840-8048B843 000010 0003+00 1/1 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_8048B840 = "Bk"; -#pragma pop +/* 8048B840-8048B840 000010 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/tag/d_a_tag_evt/d_a_tag_evt.cpp b/rel/d/a/tag/d_a_tag_evt/d_a_tag_evt.cpp index 02c4b2b140a..c7babf50439 100644 --- a/rel/d/a/tag/d_a_tag_evt/d_a_tag_evt.cpp +++ b/rel/d/a/tag/d_a_tag_evt/d_a_tag_evt.cpp @@ -97,7 +97,7 @@ extern "C" static void daTag_Evt_Execute__FPv(); extern "C" static void daTag_Evt_Draw__FPv(); extern "C" static bool daTag_Evt_IsDelete__FPv(); extern "C" void __dt__11daTag_Evt_cFv(); -extern "C" void func_8048C374(int*); +extern "C" void func_8048C374(void* _this, int*); extern "C" extern char const* const d_a_tag_evt__stringBase0; extern "C" void* mEvtCutList__11daTag_Evt_c[3]; @@ -150,6 +150,17 @@ extern "C" extern u8 struct_80450D64[4]; // /* ############################################################################################## */ +/* 8048C3BC-8048C3BC 000024 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8048C3BC = "JUMP_DEMOSTAGE"; +SECTION_DEAD static char const* const stringBase_8048C3CB = "TAGEVT"; +SECTION_DEAD static char const* const stringBase_8048C3D2 = "WAIT"; +SECTION_DEAD static char const* const stringBase_8048C3D7 = "TALK"; +SECTION_DEAD static char const* const stringBase_8048C3DC = "NEXT"; +SECTION_DEAD static char const* const stringBase_8048C3E1 = "TagEvt"; +#pragma pop + /* 8048C3FC-8048C404 -00001 0008+00 1/1 0/0 0/0 .data l_evtNameList */ SECTION_DATA static void* l_evtNameList[2] = { (void*)NULL, @@ -218,7 +229,7 @@ asm void daTag_Evt_c::destroy() { /* ############################################################################################## */ /* 8048C398-8048C39C 000000 0004+00 2/2 0/0 0/0 .rodata @3784 */ SECTION_RODATA static f32 const lit_3784 = 100.0f; -COMPILER_STRIP_GATE(8048C398, &lit_3784); +COMPILER_STRIP_GATE(0x8048C398, &lit_3784); /* 8048C39C-8048C3A0 000004 0004+00 1/2 0/0 0/0 .rodata @3785 */ SECTION_RODATA static u8 const lit_3785[4] = { @@ -227,7 +238,7 @@ SECTION_RODATA static u8 const lit_3785[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(8048C39C, &lit_3785); +COMPILER_STRIP_GATE(0x8048C39C, &lit_3785); /* 8048C3A0-8048C3A8 000008 0008+00 0/1 0/0 0/0 .rodata @3786 */ #pragma push @@ -235,7 +246,7 @@ COMPILER_STRIP_GATE(8048C39C, &lit_3785); SECTION_RODATA static u8 const lit_3786[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8048C3A0, &lit_3786); +COMPILER_STRIP_GATE(0x8048C3A0, &lit_3786); #pragma pop /* 8048C3A8-8048C3B0 000010 0008+00 0/1 0/0 0/0 .rodata @3787 */ @@ -244,7 +255,7 @@ COMPILER_STRIP_GATE(8048C3A0, &lit_3786); SECTION_RODATA static u8 const lit_3787[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8048C3A8, &lit_3787); +COMPILER_STRIP_GATE(0x8048C3A8, &lit_3787); #pragma pop /* 8048C3B0-8048C3B8 000018 0008+00 0/1 0/0 0/0 .rodata @3788 */ @@ -253,7 +264,7 @@ COMPILER_STRIP_GATE(8048C3A8, &lit_3787); SECTION_RODATA static u8 const lit_3788[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8048C3B0, &lit_3788); +COMPILER_STRIP_GATE(0x8048C3B0, &lit_3788); #pragma pop /* 8048BA0C-8048BE44 00016C 0438+00 1/1 0/0 0/0 .text execute__11daTag_Evt_cFv */ @@ -274,7 +285,7 @@ bool daTag_Evt_c::draw() { /* ############################################################################################## */ /* 8048C3B8-8048C3BC 000020 0004+00 1/1 0/0 0/0 .rodata @3815 */ SECTION_RODATA static f32 const lit_3815 = 10.0f; -COMPILER_STRIP_GATE(8048C3B8, &lit_3815); +COMPILER_STRIP_GATE(0x8048C3B8, &lit_3815); /* 8048BE4C-8048BF64 0005AC 0118+00 1/1 0/0 0/0 .text getParam__11daTag_Evt_cFv */ #pragma push @@ -296,6 +307,13 @@ asm void daTag_Evt_c::isDelete() { } #pragma pop +/* ############################################################################################## */ +/* 8048C3BC-8048C3BC 000024 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8048C3E8 = "timer"; +#pragma pop + /* 8048C090-8048C124 0007F0 0094+00 1/1 0/0 0/0 .text doEvtCutWait__11daTag_Evt_cFi */ #pragma push #pragma optimization_level 0 @@ -306,6 +324,13 @@ asm void daTag_Evt_c::doEvtCutWait(int param_0) { } #pragma pop +/* ############################################################################################## */ +/* 8048C3BC-8048C3BC 000024 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8048C3EE = "flowNodeNo"; +#pragma pop + /* 8048C124-8048C1C8 000884 00A4+00 1/1 0/0 0/0 .text doEvtCutTalk__11daTag_Evt_cFi */ #pragma push #pragma optimization_level 0 @@ -385,22 +410,10 @@ asm daTag_Evt_c::~daTag_Evt_c() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_8048C374(int* param_0) { +extern "C" asm void func_8048C374(void* _this, int* param_0) { nofralloc #include "asm/rel/d/a/tag/d_a_tag_evt/d_a_tag_evt/func_8048C374.s" } #pragma pop -/* 8048C3BC-8048C3F9 000024 003D+00 6/3 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_8048C3BC = "JUMP_DEMOSTAGE"; -SECTION_DEAD static char const* const stringBase_8048C3CB = "TAGEVT"; -SECTION_DEAD static char const* const stringBase_8048C3D2 = "WAIT"; -SECTION_DEAD static char const* const stringBase_8048C3D7 = "TALK"; -SECTION_DEAD static char const* const stringBase_8048C3DC = "NEXT"; -SECTION_DEAD static char const* const stringBase_8048C3E1 = "TagEvt"; -SECTION_DEAD static char const* const stringBase_8048C3E8 = "timer"; -SECTION_DEAD static char const* const stringBase_8048C3EE = "flowNodeNo"; -#pragma pop +/* 8048C3BC-8048C3BC 000024 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/tag/d_a_tag_evtarea/d_a_tag_evtarea.cpp b/rel/d/a/tag/d_a_tag_evtarea/d_a_tag_evtarea.cpp index 50ed37fe975..840c929538e 100644 --- a/rel/d/a/tag/d_a_tag_evtarea/d_a_tag_evtarea.cpp +++ b/rel/d/a/tag/d_a_tag_evtarea/d_a_tag_evtarea.cpp @@ -91,7 +91,7 @@ extern "C" extern u8 struct_80450D64[4]; /* ############################################################################################## */ /* 8048CDD0-8048CDD4 000000 0004+00 2/2 0/0 0/0 .rodata @3853 */ SECTION_RODATA static f32 const lit_3853 = 100.0f; -COMPILER_STRIP_GATE(8048CDD0, &lit_3853); +COMPILER_STRIP_GATE(0x8048CDD0, &lit_3853); /* 8048CDE8-8048CE48 -00001 0060+00 1/1 0/0 0/0 .data @3857 */ SECTION_DATA static void* lit_3857[24] = { @@ -195,21 +195,21 @@ asm void daTag_EvtArea_c::isDelete() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3854 = 200.0f; -COMPILER_STRIP_GATE(8048CDD4, &lit_3854); +COMPILER_STRIP_GATE(0x8048CDD4, &lit_3854); #pragma pop /* 8048CDD8-8048CDDC 000008 0004+00 0/0 0/0 0/0 .rodata @3855 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3855 = 0.5f; -COMPILER_STRIP_GATE(8048CDD8, &lit_3855); +COMPILER_STRIP_GATE(0x8048CDD8, &lit_3855); #pragma pop /* 8048CDDC-8048CDE0 00000C 0004+00 0/0 0/0 0/0 .rodata @3856 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3856 = 1000.0f; -COMPILER_STRIP_GATE(8048CDDC, &lit_3856); +COMPILER_STRIP_GATE(0x8048CDDC, &lit_3856); #pragma pop /* 8048CDE0-8048CDE4 000010 0004+00 1/1 0/0 0/0 .rodata @3922 */ @@ -219,11 +219,11 @@ SECTION_RODATA static u8 const lit_3922[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(8048CDE0, &lit_3922); +COMPILER_STRIP_GATE(0x8048CDE0, &lit_3922); /* 8048CDE4-8048CDE8 000014 0004+00 1/1 0/0 0/0 .rodata @4146 */ SECTION_RODATA static f32 const lit_4146 = 10.0f; -COMPILER_STRIP_GATE(8048CDE4, &lit_4146); +COMPILER_STRIP_GATE(0x8048CDE4, &lit_4146); /* 8048C94C-8048CC80 0004CC 0334+00 1/1 0/0 16/16 .text * chkPointInArea__15daTag_EvtArea_cF4cXyz4cXyz */ diff --git a/rel/d/a/tag/d_a_tag_evtmsg/d_a_tag_evtmsg.cpp b/rel/d/a/tag/d_a_tag_evtmsg/d_a_tag_evtmsg.cpp index 9a1bf65726a..c594e160978 100644 --- a/rel/d/a/tag/d_a_tag_evtmsg/d_a_tag_evtmsg.cpp +++ b/rel/d/a/tag/d_a_tag_evtmsg/d_a_tag_evtmsg.cpp @@ -87,7 +87,7 @@ extern "C" static void daTag_EvtMsg_Execute__FPv(); extern "C" static void daTag_EvtMsg_Draw__FPv(); extern "C" static bool daTag_EvtMsg_IsDelete__FPv(); extern "C" void __dt__14daTag_EvtMsg_cFv(); -extern "C" void func_8048D760(int*); +extern "C" void func_8048D760(void* _this, int*); extern "C" void __sinit_d_a_tag_evtmsg_cpp(); extern "C" extern char const* const d_a_tag_evtmsg__stringBase0; extern "C" void* mEvtCutNameList__14daTag_EvtMsg_c[3]; @@ -140,7 +140,16 @@ extern "C" extern u8 struct_80450D64[4]; /* ############################################################################################## */ /* 8048D7E8-8048D7EC 000000 0004+00 1/1 0/0 0/0 .rodata @3826 */ SECTION_RODATA static f32 const lit_3826 = 100.0f; -COMPILER_STRIP_GATE(8048D7E8, &lit_3826); +COMPILER_STRIP_GATE(0x8048D7E8, &lit_3826); + +/* 8048D7EC-8048D7EC 000004 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8048D7EC = ""; +SECTION_DEAD static char const* const stringBase_8048D7ED = "TALK"; +SECTION_DEAD static char const* const stringBase_8048D7F2 = "WAIT"; +SECTION_DEAD static char const* const stringBase_8048D7F7 = "EvtMsg"; +#pragma pop /* 8048D818-8048D824 000000 000C+00 2/2 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { @@ -251,6 +260,13 @@ bool daTag_EvtMsg_c::Delete() { return true; } +/* ############################################################################################## */ +/* 8048D7EC-8048D7EC 000004 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8048D7FE = "DEFAULT_EVT_TALK"; +#pragma pop + /* 8048D01C-8048D31C 00015C 0300+00 1/1 0/0 0/0 .text Execute__14daTag_EvtMsg_cFv */ #pragma push #pragma optimization_level 0 @@ -346,6 +362,13 @@ asm void daTag_EvtMsg_c::ECut_talk(int param_0) { } #pragma pop +/* ############################################################################################## */ +/* 8048D7EC-8048D7EC 000004 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8048D80F = "timer"; +#pragma pop + /* 8048D5CC-8048D668 00070C 009C+00 1/0 0/0 0/0 .text ECut_wait__14daTag_EvtMsg_cFi */ #pragma push #pragma optimization_level 0 @@ -415,7 +438,7 @@ asm daTag_EvtMsg_c::~daTag_EvtMsg_c() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_8048D760(int* param_0) { +extern "C" asm void func_8048D760(void* _this, int* param_0) { nofralloc #include "asm/rel/d/a/tag/d_a_tag_evtmsg/d_a_tag_evtmsg/func_8048D760.s" } @@ -433,17 +456,7 @@ asm void __sinit_d_a_tag_evtmsg_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_8048D77C = (void*)__sinit_d_a_tag_evtmsg_cpp; +REGISTER_CTORS(0x8048D77C, __sinit_d_a_tag_evtmsg_cpp); #pragma pop -/* 8048D7EC-8048D815 000004 0029+00 4/2 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_8048D7EC = ""; -SECTION_DEAD static char const* const stringBase_8048D7ED = "TALK"; -SECTION_DEAD static char const* const stringBase_8048D7F2 = "WAIT"; -SECTION_DEAD static char const* const stringBase_8048D7F7 = "EvtMsg"; -SECTION_DEAD static char const* const stringBase_8048D7FE = "DEFAULT_EVT_TALK"; -SECTION_DEAD static char const* const stringBase_8048D80F = "timer"; -#pragma pop +/* 8048D7EC-8048D7EC 000004 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/tag/d_a_tag_firewall/d_a_tag_firewall.cpp b/rel/d/a/tag/d_a_tag_firewall/d_a_tag_firewall.cpp index a2353e26fc5..a63fc8b9775 100644 --- a/rel/d/a/tag/d_a_tag_firewall/d_a_tag_firewall.cpp +++ b/rel/d/a/tag/d_a_tag_firewall/d_a_tag_firewall.cpp @@ -37,10 +37,10 @@ struct dPa_levelEcallBack {}; struct dKy_tevstr_c {}; -struct _GXColor {}; - struct csXyz {}; +struct _GXColor {}; + struct dPa_control_c { struct level_c { /* 8004B918 */ void getEmitter(u32); @@ -185,27 +185,27 @@ SECTION_RODATA static u8 const lit_3983[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D594DC, &lit_3983); +COMPILER_STRIP_GATE(0x80D594DC, &lit_3983); /* 80D594E0-80D594E4 000004 0004+00 0/1 0/0 0/0 .rodata @3984 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3984 = 1.0f; -COMPILER_STRIP_GATE(80D594E0, &lit_3984); +COMPILER_STRIP_GATE(0x80D594E0, &lit_3984); #pragma pop /* 80D594E4-80D594E8 000008 0004+00 0/1 0/0 0/0 .rodata @3985 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3985 = -1.0f; -COMPILER_STRIP_GATE(80D594E4, &lit_3985); +COMPILER_STRIP_GATE(0x80D594E4, &lit_3985); #pragma pop /* 80D594E8-80D594EC 00000C 0004+00 0/1 0/0 0/0 .rodata @3986 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3986 = 90.0f; -COMPILER_STRIP_GATE(80D594E8, &lit_3986); +COMPILER_STRIP_GATE(0x80D594E8, &lit_3986); #pragma pop /* 80D594EC-80D594F4 000010 0008+00 0/1 0/0 0/0 .rodata @3987 */ @@ -214,7 +214,7 @@ COMPILER_STRIP_GATE(80D594E8, &lit_3986); SECTION_RODATA static u8 const lit_3987[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D594EC, &lit_3987); +COMPILER_STRIP_GATE(0x80D594EC, &lit_3987); #pragma pop /* 80D594F4-80D594FC 000018 0008+00 0/1 0/0 0/0 .rodata @3988 */ @@ -223,7 +223,7 @@ COMPILER_STRIP_GATE(80D594EC, &lit_3987); SECTION_RODATA static u8 const lit_3988[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D594F4, &lit_3988); +COMPILER_STRIP_GATE(0x80D594F4, &lit_3988); #pragma pop /* 80D594FC-80D59504 000020 0008+00 0/1 0/0 0/0 .rodata @3989 */ @@ -232,21 +232,21 @@ COMPILER_STRIP_GATE(80D594F4, &lit_3988); SECTION_RODATA static u8 const lit_3989[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D594FC, &lit_3989); +COMPILER_STRIP_GATE(0x80D594FC, &lit_3989); #pragma pop /* 80D59504-80D59508 000028 0004+00 0/1 0/0 0/0 .rodata @3990 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3990 = 250.0f; -COMPILER_STRIP_GATE(80D59504, &lit_3990); +COMPILER_STRIP_GATE(0x80D59504, &lit_3990); #pragma pop /* 80D59508-80D5950C 00002C 0004+00 0/1 0/0 0/0 .rodata @3991 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3991 = 1000.0f; -COMPILER_STRIP_GATE(80D59508, &lit_3991); +COMPILER_STRIP_GATE(0x80D59508, &lit_3991); #pragma pop /* 80D5950C-80D5954C 000000 0040+00 1/1 0/0 0/0 .data cc_sph_src__11Tag_FWall_n */ diff --git a/rel/d/a/tag/d_a_tag_hjump/d_a_tag_hjump.cpp b/rel/d/a/tag/d_a_tag_hjump/d_a_tag_hjump.cpp index b771b17bff2..5e06f1cb21d 100644 --- a/rel/d/a/tag/d_a_tag_hjump/d_a_tag_hjump.cpp +++ b/rel/d/a/tag/d_a_tag_hjump/d_a_tag_hjump.cpp @@ -157,7 +157,7 @@ SECTION_RODATA static u8 const l_arcName[7 + 1 /* padding */] = { /* padding */ 0x00, }; -COMPILER_STRIP_GATE(805A4238, &l_arcName); +COMPILER_STRIP_GATE(0x805A4238, &l_arcName); /* 805A3AB8-805A3B24 000078 006C+00 1/0 0/0 0/0 .text CreateHeap__12daTagHjump_cFv */ #pragma push @@ -174,35 +174,35 @@ asm void daTagHjump_c::CreateHeap() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3747 = 100.0f; -COMPILER_STRIP_GATE(805A4240, &lit_3747); +COMPILER_STRIP_GATE(0x805A4240, &lit_3747); #pragma pop /* 805A4244-805A4248 00000C 0004+00 0/1 0/0 0/0 .rodata @3748 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3748 = 250.0f; -COMPILER_STRIP_GATE(805A4244, &lit_3748); +COMPILER_STRIP_GATE(0x805A4244, &lit_3748); #pragma pop /* 805A4248-805A424C 000010 0004+00 0/1 0/0 0/0 .rodata @3749 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3749 = 350.0f; -COMPILER_STRIP_GATE(805A4248, &lit_3749); +COMPILER_STRIP_GATE(0x805A4248, &lit_3749); #pragma pop /* 805A424C-805A4250 000014 0004+00 0/1 0/0 0/0 .rodata @3750 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3750 = 400.0f; -COMPILER_STRIP_GATE(805A424C, &lit_3750); +COMPILER_STRIP_GATE(0x805A424C, &lit_3750); #pragma pop /* 805A4250-805A4254 000018 0004+00 0/1 0/0 0/0 .rodata @3751 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3751 = 200.0f; -COMPILER_STRIP_GATE(805A4250, &lit_3751); +COMPILER_STRIP_GATE(0x805A4250, &lit_3751); #pragma pop /* 805A4254-805A4258 00001C 0004+00 0/2 0/0 0/0 .rodata @3752 */ @@ -214,28 +214,28 @@ SECTION_RODATA static u8 const lit_3752[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(805A4254, &lit_3752); +COMPILER_STRIP_GATE(0x805A4254, &lit_3752); #pragma pop /* 805A4258-805A425C 000020 0004+00 0/1 0/0 0/0 .rodata @3753 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3753 = -50.0f; -COMPILER_STRIP_GATE(805A4258, &lit_3753); +COMPILER_STRIP_GATE(0x805A4258, &lit_3753); #pragma pop /* 805A425C-805A4260 000024 0004+00 0/1 0/0 0/0 .rodata @3754 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3754 = 50.0f; -COMPILER_STRIP_GATE(805A425C, &lit_3754); +COMPILER_STRIP_GATE(0x805A425C, &lit_3754); #pragma pop /* 805A4260-805A4264 000028 0004+00 0/1 0/0 0/0 .rodata @3755 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3755 = 5.0f; -COMPILER_STRIP_GATE(805A4260, &lit_3755); +COMPILER_STRIP_GATE(0x805A4260, &lit_3755); #pragma pop /* 805A426C-805A428C -00001 0020+00 1/0 0/0 0/0 .data l_daTagHjump_Method */ @@ -321,14 +321,14 @@ static asm void daTagHjump_Delete(daTagHjump_c* param_0) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3904 = 4.0f / 5.0f; -COMPILER_STRIP_GATE(805A4264, &lit_3904); +COMPILER_STRIP_GATE(0x805A4264, &lit_3904); #pragma pop /* 805A4268-805A426C 000030 0004+00 0/1 0/0 0/0 .rodata @3905 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3905 = 0.5f; -COMPILER_STRIP_GATE(805A4268, &lit_3905); +COMPILER_STRIP_GATE(0x805A4268, &lit_3905); #pragma pop /* 805A3E70-805A4134 000430 02C4+00 1/1 0/0 0/0 .text execute__12daTagHjump_cFv */ diff --git a/rel/d/a/tag/d_a_tag_howl/d_a_tag_howl.cpp b/rel/d/a/tag/d_a_tag_howl/d_a_tag_howl.cpp index 3b92f02a323..1aa6eea7798 100644 --- a/rel/d/a/tag/d_a_tag_howl/d_a_tag_howl.cpp +++ b/rel/d/a/tag/d_a_tag_howl/d_a_tag_howl.cpp @@ -148,7 +148,7 @@ SECTION_RODATA static u8 const lit_3739[4 + 4 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(8048DD64, &lit_3739); +COMPILER_STRIP_GATE(0x8048DD64, &lit_3739); /* 8048DD6C-8048DD74 000008 0008+00 0/1 0/0 0/0 .rodata @3740 */ #pragma push @@ -156,7 +156,7 @@ COMPILER_STRIP_GATE(8048DD64, &lit_3739); SECTION_RODATA static u8 const lit_3740[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8048DD6C, &lit_3740); +COMPILER_STRIP_GATE(0x8048DD6C, &lit_3740); #pragma pop /* 8048DD74-8048DD7C 000010 0008+00 0/1 0/0 0/0 .rodata @3741 */ @@ -165,7 +165,7 @@ COMPILER_STRIP_GATE(8048DD6C, &lit_3740); SECTION_RODATA static u8 const lit_3741[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8048DD74, &lit_3741); +COMPILER_STRIP_GATE(0x8048DD74, &lit_3741); #pragma pop /* 8048DD7C-8048DD84 000018 0008+00 0/1 0/0 0/0 .rodata @3742 */ @@ -174,7 +174,7 @@ COMPILER_STRIP_GATE(8048DD74, &lit_3741); SECTION_RODATA static u8 const lit_3742[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8048DD7C, &lit_3742); +COMPILER_STRIP_GATE(0x8048DD7C, &lit_3742); #pragma pop /* 8048DA2C-8048DC1C 00014C 01F0+00 1/1 0/0 0/0 .text isAreaCheck__12daTag_Howl_cFv */ @@ -190,7 +190,7 @@ asm void daTag_Howl_c::isAreaCheck() { /* ############################################################################################## */ /* 8048DD84-8048DD88 000020 0004+00 1/1 0/0 0/0 .rodata @3752 */ SECTION_RODATA static f32 const lit_3752 = 100.0f; -COMPILER_STRIP_GATE(8048DD84, &lit_3752); +COMPILER_STRIP_GATE(0x8048DD84, &lit_3752); /* 8048DC1C-8048DC68 00033C 004C+00 1/1 0/0 0/0 .text getParam__12daTag_Howl_cFv */ #pragma push diff --git a/rel/d/a/tag/d_a_tag_hstop/d_a_tag_hstop.cpp b/rel/d/a/tag/d_a_tag_hstop/d_a_tag_hstop.cpp index 8f84d67a427..7740d4f0ffe 100644 --- a/rel/d/a/tag/d_a_tag_hstop/d_a_tag_hstop.cpp +++ b/rel/d/a/tag/d_a_tag_hstop/d_a_tag_hstop.cpp @@ -99,7 +99,7 @@ extern "C" void __register_global_object(); /* ############################################################################################## */ /* 805A4B20-805A4B24 000000 0004+00 1/1 0/0 0/0 .rodata @3782 */ SECTION_RODATA static f32 const lit_3782 = 100.0f; -COMPILER_STRIP_GATE(805A4B20, &lit_3782); +COMPILER_STRIP_GATE(0x805A4B20, &lit_3782); /* 805A43EC-805A45D8 0000EC 01EC+00 1/1 0/0 0/0 .text create__12daTagHstop_cFv */ #pragma push @@ -198,7 +198,7 @@ asm void __sinit_d_a_tag_hstop_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_805A4AD0 = (void*)__sinit_d_a_tag_hstop_cpp; +REGISTER_CTORS(0x805A4AD0, __sinit_d_a_tag_hstop_cpp); #pragma pop /* ############################################################################################## */ diff --git a/rel/d/a/tag/d_a_tag_kago_fall/d_a_tag_kago_fall.cpp b/rel/d/a/tag/d_a_tag_kago_fall/d_a_tag_kago_fall.cpp index d8fd884094a..16cd579fd2c 100644 --- a/rel/d/a/tag/d_a_tag_kago_fall/d_a_tag_kago_fall.cpp +++ b/rel/d/a/tag/d_a_tag_kago_fall/d_a_tag_kago_fall.cpp @@ -69,10 +69,10 @@ struct cBgS { /* 800743B4 */ void LineCross(cBgS_LinChk*); }; -struct Vec {}; - struct JAISoundID {}; +struct Vec {}; + struct Z2SeMgr { /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); }; @@ -144,11 +144,11 @@ extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; /* ############################################################################################## */ /* 80D5A6EC-80D5A6F0 000000 0004+00 3/3 0/0 0/0 .rodata @3907 */ SECTION_RODATA static f32 const lit_3907 = 75.0f; -COMPILER_STRIP_GATE(80D5A6EC, &lit_3907); +COMPILER_STRIP_GATE(0x80D5A6EC, &lit_3907); /* 80D5A6F0-80D5A6F4 000004 0004+00 1/1 0/0 0/0 .rodata @3908 */ SECTION_RODATA static f32 const lit_3908 = 150.0f; -COMPILER_STRIP_GATE(80D5A6F0, &lit_3908); +COMPILER_STRIP_GATE(0x80D5A6F0, &lit_3908); /* 80D5A710-80D5A714 000000 0004+00 3/3 0/0 0/0 .data m_master_id */ SECTION_DATA static u32 m_master_id = 0xFFFFFFFF; @@ -188,21 +188,21 @@ asm void daTagKagoFall_c::setActionMode(u8 param_0, u8 param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4022 = 1.0f; -COMPILER_STRIP_GATE(80D5A6F4, &lit_4022); +COMPILER_STRIP_GATE(0x80D5A6F4, &lit_4022); #pragma pop /* 80D5A6F8-80D5A6FC 00000C 0004+00 0/2 0/0 0/0 .rodata @4023 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4023 = -1.0f; -COMPILER_STRIP_GATE(80D5A6F8, &lit_4023); +COMPILER_STRIP_GATE(0x80D5A6F8, &lit_4023); #pragma pop /* 80D5A6FC-80D5A700 000010 0004+00 0/2 0/0 0/0 .rodata @4024 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4024 = 1.0f / 20.0f; -COMPILER_STRIP_GATE(80D5A6FC, &lit_4024); +COMPILER_STRIP_GATE(0x80D5A6FC, &lit_4024); #pragma pop /* 80D5A700-80D5A704 000014 0004+00 0/2 0/0 0/0 .rodata @4025 */ @@ -214,7 +214,13 @@ SECTION_RODATA static u8 const lit_4025[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D5A700, &lit_4025); +COMPILER_STRIP_GATE(0x80D5A700, &lit_4025); +#pragma pop + +/* 80D5A708-80D5A708 00001C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80D5A708 = "F_SP112"; #pragma pop /* 80D59E24-80D5A218 000244 03F4+00 1/1 0/0 0/0 .text actionWaitRiver__15daTagKagoFall_cFv */ @@ -232,7 +238,7 @@ asm void daTagKagoFall_c::actionWaitRiver() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4118 = 3000.0f; -COMPILER_STRIP_GATE(80D5A704, &lit_4118); +COMPILER_STRIP_GATE(0x80D5A704, &lit_4118); #pragma pop /* 80D5A218-80D5A67C 000638 0464+00 1/1 0/0 0/0 .text actionWaitFall__15daTagKagoFall_cFv @@ -305,9 +311,4 @@ SECTION_DATA extern void* g_profile_Tag_KagoFall[12] = { (void*)0x00040000, (void*)0x000E0000, }; -/* 80D5A708-80D5A710 00001C 0008+00 2/2 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80D5A708 = "F_SP112"; -#pragma pop +/* 80D5A708-80D5A708 00001C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/tag/d_a_tag_kmsg/d_a_tag_kmsg.cpp b/rel/d/a/tag/d_a_tag_kmsg/d_a_tag_kmsg.cpp index 5fa38aed99f..f70991acf6a 100644 --- a/rel/d/a/tag/d_a_tag_kmsg/d_a_tag_kmsg.cpp +++ b/rel/d/a/tag/d_a_tag_kmsg/d_a_tag_kmsg.cpp @@ -149,7 +149,18 @@ extern "C" extern u8 struct_80450D64[4]; /* ############################################################################################## */ /* 8048EADC-8048EAE0 000000 0004+00 2/2 0/0 0/0 .rodata @3884 */ SECTION_RODATA static f32 const lit_3884 = 10.0f; -COMPILER_STRIP_GATE(8048EADC, &lit_3884); +COMPILER_STRIP_GATE(0x8048EADC, &lit_3884); + +/* 8048EAFC-8048EAFC 000020 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8048EAFC = ""; +SECTION_DEAD static char const* const stringBase_8048EAFD = "EXTINCTION"; +SECTION_DEAD static char const* const stringBase_8048EB08 = "PURCHASE"; +SECTION_DEAD static char const* const stringBase_8048EB11 = "Bans1"; +SECTION_DEAD static char const* const stringBase_8048EB17 = "sekizoA"; +SECTION_DEAD static char const* const stringBase_8048EB1F = "Lv6Gate"; +#pragma pop /* 8048EB2C-8048EB44 -00001 0018+00 1/1 0/0 0/0 .data l_evtList */ SECTION_DATA static void* l_evtList[6] = { @@ -222,21 +233,21 @@ asm void daTag_KMsg_c::Delete() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4206 = 1000000000.0f; -COMPILER_STRIP_GATE(8048EAE0, &lit_4206); +COMPILER_STRIP_GATE(0x8048EAE0, &lit_4206); #pragma pop /* 8048EAE4-8048EAE8 000008 0004+00 0/1 0/0 0/0 .rodata @4207 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4207 = -0.5f; -COMPILER_STRIP_GATE(8048EAE4, &lit_4207); +COMPILER_STRIP_GATE(0x8048EAE4, &lit_4207); #pragma pop /* 8048EAE8-8048EAEC 00000C 0004+00 0/1 0/0 0/0 .rodata @4208 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4208 = -20.0f; -COMPILER_STRIP_GATE(8048EAE8, &lit_4208); +COMPILER_STRIP_GATE(0x8048EAE8, &lit_4208); #pragma pop /* 8048EAEC-8048EAF4 000010 0004+04 0/1 0/0 0/0 .rodata @4209 */ @@ -247,7 +258,7 @@ SECTION_RODATA static f32 const lit_4209[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(8048EAEC, &lit_4209); +COMPILER_STRIP_GATE(0x8048EAEC, &lit_4209); #pragma pop /* 8048EAF4-8048EAFC 000018 0008+00 0/1 0/0 0/0 .rodata @4211 */ @@ -256,7 +267,13 @@ COMPILER_STRIP_GATE(8048EAEC, &lit_4209); SECTION_RODATA static u8 const lit_4211[8] = { 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8048EAF4, &lit_4211); +COMPILER_STRIP_GATE(0x8048EAF4, &lit_4211); +#pragma pop + +/* 8048EAFC-8048EAFC 000020 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8048EB27 = "KMsg"; #pragma pop /* 8048E010-8048E8B8 000210 08A8+00 1/1 0/0 0/0 .text Execute__12daTag_KMsg_cFv */ @@ -339,15 +356,4 @@ asm daTag_KMsg_c::~daTag_KMsg_c() { } #pragma pop -/* 8048EAFC-8048EB2C 000020 0030+00 5/3 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_8048EAFC = ""; -SECTION_DEAD static char const* const stringBase_8048EAFD = "EXTINCTION"; -SECTION_DEAD static char const* const stringBase_8048EB08 = "PURCHASE"; -SECTION_DEAD static char const* const stringBase_8048EB11 = "Bans1"; -SECTION_DEAD static char const* const stringBase_8048EB17 = "sekizoA"; -SECTION_DEAD static char const* const stringBase_8048EB1F = "Lv6Gate"; -SECTION_DEAD static char const* const stringBase_8048EB27 = "KMsg"; -#pragma pop +/* 8048EAFC-8048EAFC 000020 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/tag/d_a_tag_lantern/d_a_tag_lantern.cpp b/rel/d/a/tag/d_a_tag_lantern/d_a_tag_lantern.cpp index f22e6910eaa..88b37ecd308 100644 --- a/rel/d/a/tag/d_a_tag_lantern/d_a_tag_lantern.cpp +++ b/rel/d/a/tag/d_a_tag_lantern/d_a_tag_lantern.cpp @@ -172,7 +172,7 @@ asm void daTag_Lantern_c::Delete() { /* ############################################################################################## */ /* 8048F148-8048F14C 000000 0004+00 1/1 0/0 0/0 .rodata @3683 */ SECTION_RODATA static f32 const lit_3683 = -1000000000.0f; -COMPILER_STRIP_GATE(8048F148, &lit_3683); +COMPILER_STRIP_GATE(0x8048F148, &lit_3683); /* 8048EDDC-8048EF6C 00021C 0190+00 2/2 0/0 0/0 .text Execute__15daTag_Lantern_cFv */ #pragma push @@ -197,11 +197,11 @@ SECTION_RODATA static u8 const lit_3697[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(8048F14C, &lit_3697); +COMPILER_STRIP_GATE(0x8048F14C, &lit_3697); /* 8048F150-8048F154 000008 0004+00 1/1 0/0 0/0 .rodata @3698 */ SECTION_RODATA static f32 const lit_3698 = 100.0f; -COMPILER_STRIP_GATE(8048F150, &lit_3698); +COMPILER_STRIP_GATE(0x8048F150, &lit_3698); /* 8048EF74-8048F024 0003B4 00B0+00 1/1 0/0 0/0 .text initialize__15daTag_Lantern_cFv */ #pragma push @@ -284,7 +284,7 @@ asm void __sinit_d_a_tag_lantern_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_8048F0AC = (void*)__sinit_d_a_tag_lantern_cpp; +REGISTER_CTORS(0x8048F0AC, __sinit_d_a_tag_lantern_cpp); #pragma pop /* 8048F0EC-8048F134 00052C 0048+00 2/1 0/0 0/0 .text __dt__21daTag_Lantern_Param_cFv */ diff --git a/rel/d/a/tag/d_a_tag_lightball/d_a_tag_lightball.cpp b/rel/d/a/tag/d_a_tag_lightball/d_a_tag_lightball.cpp index 2b2f2f282d9..59c52265afd 100644 --- a/rel/d/a/tag/d_a_tag_lightball/d_a_tag_lightball.cpp +++ b/rel/d/a/tag/d_a_tag_lightball/d_a_tag_lightball.cpp @@ -97,7 +97,7 @@ asm void daTagLightBall_c::setBaseMtx() { /* ############################################################################################## */ /* 80D5AC78-80D5AC7C 000000 0004+00 1/1 0/0 0/0 .rodata @3682 */ SECTION_RODATA static f32 const lit_3682 = 100.0f; -COMPILER_STRIP_GATE(80D5AC78, &lit_3682); +COMPILER_STRIP_GATE(0x80D5AC78, &lit_3682); /* 80D5A870-80D5A9B8 0000F0 0148+00 1/1 0/0 0/0 .text Create__16daTagLightBall_cFv */ #pragma push diff --git a/rel/d/a/tag/d_a_tag_lv2prchk/d_a_tag_lv2prchk.cpp b/rel/d/a/tag/d_a_tag_lv2prchk/d_a_tag_lv2prchk.cpp index 2be256f26da..01625541c68 100644 --- a/rel/d/a/tag/d_a_tag_lv2prchk/d_a_tag_lv2prchk.cpp +++ b/rel/d/a/tag/d_a_tag_lv2prchk/d_a_tag_lv2prchk.cpp @@ -31,10 +31,10 @@ struct dSv_info_c { /* 80035360 */ void isSwitch(int, int) const; }; -struct Vec {}; - struct JAISoundID {}; +struct Vec {}; + struct Z2SeMgr { /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); }; @@ -187,11 +187,11 @@ void daTagLv2PrChk_c::actionEnd() { /* ############################################################################################## */ /* 805A5364-805A5368 000000 0004+00 1/1 0/0 0/0 .rodata @3844 */ SECTION_RODATA static f32 const lit_3844 = 1.0f; -COMPILER_STRIP_GATE(805A5364, &lit_3844); +COMPILER_STRIP_GATE(0x805A5364, &lit_3844); /* 805A5368-805A536C 000004 0004+00 1/1 0/0 0/0 .rodata @3845 */ SECTION_RODATA static f32 const lit_3845 = -1.0f; -COMPILER_STRIP_GATE(805A5368, &lit_3845); +COMPILER_STRIP_GATE(0x805A5368, &lit_3845); /* 805A5294-805A52F4 0006B4 0060+00 1/1 0/0 0/0 .text seStartWrong__15daTagLv2PrChk_cFv */ diff --git a/rel/d/a/tag/d_a_tag_lv5soup/d_a_tag_lv5soup.cpp b/rel/d/a/tag/d_a_tag_lv5soup/d_a_tag_lv5soup.cpp index 8edefbe0046..361164e2daf 100644 --- a/rel/d/a/tag/d_a_tag_lv5soup/d_a_tag_lv5soup.cpp +++ b/rel/d/a/tag/d_a_tag_lv5soup/d_a_tag_lv5soup.cpp @@ -76,27 +76,27 @@ extern "C" extern u32 __float_nan; /* ############################################################################################## */ /* 80D5B15C-80D5B160 000000 0004+00 2/2 0/0 0/0 .rodata @3655 */ SECTION_RODATA static f32 const lit_3655 = -30.0f; -COMPILER_STRIP_GATE(80D5B15C, &lit_3655); +COMPILER_STRIP_GATE(0x80D5B15C, &lit_3655); /* 80D5B160-80D5B164 000004 0004+00 0/1 0/0 0/0 .rodata @3656 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3656 = -15.0f; -COMPILER_STRIP_GATE(80D5B160, &lit_3656); +COMPILER_STRIP_GATE(0x80D5B160, &lit_3656); #pragma pop /* 80D5B164-80D5B168 000008 0004+00 0/1 0/0 0/0 .rodata @3657 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3657 = 30.0f; -COMPILER_STRIP_GATE(80D5B164, &lit_3657); +COMPILER_STRIP_GATE(0x80D5B164, &lit_3657); #pragma pop /* 80D5B168-80D5B16C 00000C 0004+00 0/1 0/0 0/0 .rodata @3658 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3658 = 45.0f; -COMPILER_STRIP_GATE(80D5B168, &lit_3658); +COMPILER_STRIP_GATE(0x80D5B168, &lit_3658); #pragma pop /* 80D5B18C-80D5B1AC -00001 0020+00 1/0 0/0 0/0 .data daTag_Lv5Soup_MethodTable */ @@ -163,7 +163,7 @@ bool daTag_Lv5Soup_c::Draw() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3743 = 100.0f; -COMPILER_STRIP_GATE(80D5B16C, &lit_3743); +COMPILER_STRIP_GATE(0x80D5B16C, &lit_3743); #pragma pop /* 80D5B170-80D5B174 000014 0004+00 0/1 0/0 0/0 .rodata @3744 */ @@ -175,7 +175,7 @@ SECTION_RODATA static u8 const lit_3744[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D5B170, &lit_3744); +COMPILER_STRIP_GATE(0x80D5B170, &lit_3744); #pragma pop /* 80D5B174-80D5B17C 000018 0008+00 0/1 0/0 0/0 .rodata @3745 */ @@ -184,7 +184,7 @@ COMPILER_STRIP_GATE(80D5B170, &lit_3744); SECTION_RODATA static u8 const lit_3745[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D5B174, &lit_3745); +COMPILER_STRIP_GATE(0x80D5B174, &lit_3745); #pragma pop /* 80D5B17C-80D5B184 000020 0008+00 0/1 0/0 0/0 .rodata @3746 */ @@ -193,7 +193,7 @@ COMPILER_STRIP_GATE(80D5B174, &lit_3745); SECTION_RODATA static u8 const lit_3746[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D5B17C, &lit_3746); +COMPILER_STRIP_GATE(0x80D5B17C, &lit_3746); #pragma pop /* 80D5B184-80D5B18C 000028 0008+00 0/1 0/0 0/0 .rodata @3747 */ @@ -202,7 +202,7 @@ COMPILER_STRIP_GATE(80D5B17C, &lit_3746); SECTION_RODATA static u8 const lit_3747[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D5B184, &lit_3747); +COMPILER_STRIP_GATE(0x80D5B184, &lit_3747); #pragma pop /* 80D5AEA4-80D5B06C 0001C4 01C8+00 1/1 0/0 0/0 .text isAreaCheck__15daTag_Lv5Soup_cFv */ diff --git a/rel/d/a/tag/d_a_tag_lv6CstaSw/d_a_tag_lv6CstaSw.cpp b/rel/d/a/tag/d_a_tag_lv6CstaSw/d_a_tag_lv6CstaSw.cpp index f7ccd54dc3b..ba0b40a29ac 100644 --- a/rel/d/a/tag/d_a_tag_lv6CstaSw/d_a_tag_lv6CstaSw.cpp +++ b/rel/d/a/tag/d_a_tag_lv6CstaSw/d_a_tag_lv6CstaSw.cpp @@ -198,7 +198,7 @@ SECTION_RODATA static u8 const lit_3724[4 + 4 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D5B7EC, &lit_3724); +COMPILER_STRIP_GATE(0x80D5B7EC, &lit_3724); /* 80D5B7F4-80D5B7FC 000008 0008+00 0/1 0/0 0/0 .rodata @3725 */ #pragma push @@ -206,7 +206,7 @@ COMPILER_STRIP_GATE(80D5B7EC, &lit_3724); SECTION_RODATA static u8 const lit_3725[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D5B7F4, &lit_3725); +COMPILER_STRIP_GATE(0x80D5B7F4, &lit_3725); #pragma pop /* 80D5B7FC-80D5B804 000010 0008+00 0/1 0/0 0/0 .rodata @3726 */ @@ -215,7 +215,7 @@ COMPILER_STRIP_GATE(80D5B7F4, &lit_3725); SECTION_RODATA static u8 const lit_3726[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D5B7FC, &lit_3726); +COMPILER_STRIP_GATE(0x80D5B7FC, &lit_3726); #pragma pop /* 80D5B804-80D5B80C 000018 0008+00 0/1 0/0 0/0 .rodata @3727 */ @@ -224,14 +224,14 @@ COMPILER_STRIP_GATE(80D5B7FC, &lit_3726); SECTION_RODATA static u8 const lit_3727[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D5B804, &lit_3727); +COMPILER_STRIP_GATE(0x80D5B804, &lit_3727); #pragma pop /* 80D5B80C-80D5B810 000020 0004+00 0/1 0/0 0/0 .rodata @3728 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3728 = 100.0f; -COMPILER_STRIP_GATE(80D5B80C, &lit_3728); +COMPILER_STRIP_GATE(0x80D5B80C, &lit_3728); #pragma pop /* 80D5B460-80D5B600 000260 01A0+00 1/1 0/0 0/0 .text areaCheck__13daLv6CstaSw_cFv */ @@ -335,5 +335,5 @@ asm void __sinit_d_a_tag_lv6CstaSw_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80D5B79C = (void*)__sinit_d_a_tag_lv6CstaSw_cpp; +REGISTER_CTORS(0x80D5B79C, __sinit_d_a_tag_lv6CstaSw_cpp); #pragma pop diff --git a/rel/d/a/tag/d_a_tag_mhint/d_a_tag_mhint.cpp b/rel/d/a/tag/d_a_tag_mhint/d_a_tag_mhint.cpp index 7da11a0f19f..286f32e7341 100644 --- a/rel/d/a/tag/d_a_tag_mhint/d_a_tag_mhint.cpp +++ b/rel/d/a/tag/d_a_tag_mhint/d_a_tag_mhint.cpp @@ -61,10 +61,10 @@ struct dAttHint_c { /* 800738FC */ void request(fopAc_ac_c*, int); }; -struct Vec {}; - struct JAISoundID {}; +struct Vec {}; + struct Z2SeMgr { /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); }; @@ -133,20 +133,20 @@ extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; /* ############################################################################################## */ /* 805A6034-805A6038 000000 0004+00 2/2 0/0 0/0 .rodata @3741 */ SECTION_RODATA static f32 const lit_3741 = 10.0f; -COMPILER_STRIP_GATE(805A6034, &lit_3741); +COMPILER_STRIP_GATE(0x805A6034, &lit_3741); /* 805A6038-805A603C 000004 0004+00 0/1 0/0 0/0 .rodata @3742 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3742 = 10000.0f; -COMPILER_STRIP_GATE(805A6038, &lit_3742); +COMPILER_STRIP_GATE(0x805A6038, &lit_3742); #pragma pop /* 805A603C-805A6040 000008 0004+00 0/1 0/0 0/0 .rodata @3743 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3743 = 100.0f; -COMPILER_STRIP_GATE(805A603C, &lit_3743); +COMPILER_STRIP_GATE(0x805A603C, &lit_3743); #pragma pop /* 805A56B8-805A58C8 000078 0210+00 1/1 0/0 0/0 .text create__12daTagMhint_cFv */ @@ -194,11 +194,17 @@ static asm void daTagMhint_Delete(daTagMhint_c* param_0) { /* ############################################################################################## */ /* 805A6040-805A6044 00000C 0004+00 1/2 0/0 0/0 .rodata @3803 */ SECTION_RODATA static f32 const lit_3803 = 1.0f; -COMPILER_STRIP_GATE(805A6040, &lit_3803); +COMPILER_STRIP_GATE(0x805A6040, &lit_3803); /* 805A6044-805A6048 000010 0004+00 1/2 0/0 0/0 .rodata @3804 */ SECTION_RODATA static f32 const lit_3804 = -1.0f; -COMPILER_STRIP_GATE(805A6044, &lit_3804); +COMPILER_STRIP_GATE(0x805A6044, &lit_3804); + +/* 805A604C-805A604C 000018 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_805A604C = "D_MN04B"; +#pragma pop /* 805A5974-805A5AE4 000334 0170+00 1/1 0/0 0/0 .text eventOrder__12daTagMhint_cFv */ #pragma push @@ -220,7 +226,7 @@ SECTION_RODATA static u8 const lit_3956[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(805A6048, &lit_3956); +COMPILER_STRIP_GATE(0x805A6048, &lit_3956); #pragma pop /* 805A5AE4-805A6004 0004A4 0520+00 1/1 0/0 0/0 .text execute__12daTagMhint_cFv */ @@ -272,9 +278,4 @@ SECTION_DATA extern void* g_profile_Tag_Mhint[12] = { (void*)0x00044000, (void*)0x030E0000, }; -/* 805A604C-805A6054 000018 0008+00 1/1 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_805A604C = "D_MN04B"; -#pragma pop +/* 805A604C-805A604C 000018 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/tag/d_a_tag_mist/d_a_tag_mist.cpp b/rel/d/a/tag/d_a_tag_mist/d_a_tag_mist.cpp index c2744ba5c84..1bdccecf6b1 100644 --- a/rel/d/a/tag/d_a_tag_mist/d_a_tag_mist.cpp +++ b/rel/d/a/tag/d_a_tag_mist/d_a_tag_mist.cpp @@ -116,13 +116,13 @@ asm void daTagMist_c::isMySw() { /* ############################################################################################## */ /* 8048F700-8048F704 000000 0004+00 1/1 0/0 0/0 .rodata @3678 */ SECTION_RODATA static f32 const lit_3678 = -50.0f; -COMPILER_STRIP_GATE(8048F700, &lit_3678); +COMPILER_STRIP_GATE(0x8048F700, &lit_3678); /* 8048F704-8048F708 000004 0004+00 0/1 0/0 0/0 .rodata @3679 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3679 = 50.0f; -COMPILER_STRIP_GATE(8048F704, &lit_3679); +COMPILER_STRIP_GATE(0x8048F704, &lit_3679); #pragma pop /* 8048F708-8048F70C 000008 0004+00 0/1 0/0 0/0 .rodata @3680 */ @@ -134,7 +134,7 @@ SECTION_RODATA static u8 const lit_3680[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(8048F708, &lit_3680); +COMPILER_STRIP_GATE(0x8048F708, &lit_3680); #pragma pop /* 8048F370-8048F444 000190 00D4+00 1/1 0/0 0/0 .text Create__11daTagMist_cFv */ diff --git a/rel/d/a/tag/d_a_tag_mmsg/d_a_tag_mmsg.cpp b/rel/d/a/tag/d_a_tag_mmsg/d_a_tag_mmsg.cpp index 6f8ab791435..fd40bd40112 100644 --- a/rel/d/a/tag/d_a_tag_mmsg/d_a_tag_mmsg.cpp +++ b/rel/d/a/tag/d_a_tag_mmsg/d_a_tag_mmsg.cpp @@ -82,20 +82,20 @@ extern "C" u8 m_midnaActor__9daPy_py_c[4]; /* ############################################################################################## */ /* 80D5BD38-80D5BD3C 000000 0004+00 1/1 0/0 0/0 .rodata @3702 */ SECTION_RODATA static f32 const lit_3702 = 10.0f; -COMPILER_STRIP_GATE(80D5BD38, &lit_3702); +COMPILER_STRIP_GATE(0x80D5BD38, &lit_3702); /* 80D5BD3C-80D5BD40 000004 0004+00 0/1 0/0 0/0 .rodata @3703 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3703 = 10000.0f; -COMPILER_STRIP_GATE(80D5BD3C, &lit_3703); +COMPILER_STRIP_GATE(0x80D5BD3C, &lit_3703); #pragma pop /* 80D5BD40-80D5BD44 000008 0004+00 0/1 0/0 0/0 .rodata @3704 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3704 = 100.0f; -COMPILER_STRIP_GATE(80D5BD40, &lit_3704); +COMPILER_STRIP_GATE(0x80D5BD40, &lit_3704); #pragma pop /* 80D5B918-80D5BA94 000078 017C+00 1/1 0/0 0/0 .text create__11daTagMmsg_cFv */ diff --git a/rel/d/a/tag/d_a_tag_msg/d_a_tag_msg.cpp b/rel/d/a/tag/d_a_tag_msg/d_a_tag_msg.cpp index 0c5e76a7812..62675531d0a 100644 --- a/rel/d/a/tag/d_a_tag_msg/d_a_tag_msg.cpp +++ b/rel/d/a/tag/d_a_tag_msg/d_a_tag_msg.cpp @@ -160,6 +160,15 @@ static asm void createHeapCallBack(fopAc_ac_c* param_0) { #pragma pop /* ############################################################################################## */ +/* 804901A4-804901A4 00002C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_804901A4 = "TagMsg"; +SECTION_DEAD static char const* const stringBase_804901AB = "SPEAK"; +SECTION_DEAD static char const* const stringBase_804901B1 = "Tag_ms"; +SECTION_DEAD static char const* const stringBase_804901B8 = "PAUSE"; +#pragma pop + /* 804901C4-804901C8 -00001 0004+00 1/1 0/0 0/0 .data l_resName */ SECTION_DATA static void* l_resName = (void*)&d_a_tag_msg__stringBase0; @@ -260,11 +269,11 @@ SECTION_RODATA u8 const daTag_Msg_Param_c::m[1 + 3 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80490178, &daTag_Msg_Param_c::m); +COMPILER_STRIP_GATE(0x80490178, &daTag_Msg_Param_c::m); /* 8049017C-80490180 000004 0004+00 1/1 0/0 0/0 .rodata @3757 */ SECTION_RODATA static f32 const lit_3757 = 150.0f; -COMPILER_STRIP_GATE(8049017C, &lit_3757); +COMPILER_STRIP_GATE(0x8049017C, &lit_3757); /* 8048F9E8-8048FC68 000288 0280+00 1/1 0/0 0/0 .text execute__11daTag_Msg_cFv */ #pragma push @@ -296,7 +305,7 @@ SECTION_RODATA static u8 const lit_3813[4 + 4 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80490180, &lit_3813); +COMPILER_STRIP_GATE(0x80490180, &lit_3813); #pragma pop /* 80490188-80490190 000010 0008+00 0/1 0/0 0/0 .rodata @3814 */ @@ -305,7 +314,7 @@ COMPILER_STRIP_GATE(80490180, &lit_3813); SECTION_RODATA static u8 const lit_3814[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80490188, &lit_3814); +COMPILER_STRIP_GATE(0x80490188, &lit_3814); #pragma pop /* 80490190-80490198 000018 0008+00 0/1 0/0 0/0 .rodata @3815 */ @@ -314,7 +323,7 @@ COMPILER_STRIP_GATE(80490188, &lit_3814); SECTION_RODATA static u8 const lit_3815[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80490190, &lit_3815); +COMPILER_STRIP_GATE(0x80490190, &lit_3815); #pragma pop /* 80490198-804901A0 000020 0008+00 0/1 0/0 0/0 .rodata @3816 */ @@ -323,7 +332,7 @@ COMPILER_STRIP_GATE(80490190, &lit_3815); SECTION_RODATA static u8 const lit_3816[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80490198, &lit_3816); +COMPILER_STRIP_GATE(0x80490198, &lit_3816); #pragma pop /* 8048FC70-8048FE18 000510 01A8+00 1/1 0/0 0/0 .text rangeCheck__11daTag_Msg_cFv */ @@ -359,7 +368,7 @@ asm void daTag_Msg_c::getResName() { /* ############################################################################################## */ /* 804901A0-804901A4 000028 0004+00 1/1 0/0 0/0 .rodata @3880 */ SECTION_RODATA static f32 const lit_3880 = 100.0f; -COMPILER_STRIP_GATE(804901A0, &lit_3880); +COMPILER_STRIP_GATE(0x804901A0, &lit_3880); /* 8048FF9C-8049004C 00083C 00B0+00 1/1 0/0 0/0 .text getParam__11daTag_Msg_cFv */ #pragma push @@ -436,13 +445,11 @@ asm daTag_Msg_Param_c::~daTag_Msg_Param_c() { } #pragma pop -/* 804901A4-804901C4 00002C 0020+00 4/1 0/0 0/0 .rodata @stringBase0 */ +/* ############################################################################################## */ +/* 804901BE-804901C4 000046 0006+00 0/0 0/0 0/0 .rodata None */ #pragma push #pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_804901A4 = "TagMsg"; -SECTION_DEAD static char const* const stringBase_804901AB = "SPEAK"; -SECTION_DEAD static char const* const stringBase_804901B1 = "Tag_ms"; -SECTION_DEAD static char const* const stringBase_804901B8 = "PAUSE"; SECTION_DEAD static char const* const stringBase_804901BE = "Timer"; #pragma pop + +/* 804901A4-804901A4 00002C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/tag/d_a_tag_mstop/d_a_tag_mstop.cpp b/rel/d/a/tag/d_a_tag_mstop/d_a_tag_mstop.cpp index 034a24fc169..16b93c07c59 100644 --- a/rel/d/a/tag/d_a_tag_mstop/d_a_tag_mstop.cpp +++ b/rel/d/a/tag/d_a_tag_mstop/d_a_tag_mstop.cpp @@ -55,10 +55,10 @@ struct csXyz {}; struct cXyz {}; -struct Vec {}; - struct JAISoundID {}; +struct Vec {}; + struct Z2SeMgr { /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); /* 802AC50C */ void seStartLevel(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); @@ -127,11 +127,11 @@ extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; /* ############################################################################################## */ /* 805A696C-805A6970 000000 0004+00 2/2 0/0 0/0 .rodata @3863 */ SECTION_RODATA static f32 const lit_3863 = 10000.0f; -COMPILER_STRIP_GATE(805A696C, &lit_3863); +COMPILER_STRIP_GATE(0x805A696C, &lit_3863); /* 805A6970-805A6974 000004 0004+00 1/1 0/0 0/0 .rodata @3864 */ SECTION_RODATA static f32 const lit_3864 = 100.0f; -COMPILER_STRIP_GATE(805A6970, &lit_3864); +COMPILER_STRIP_GATE(0x805A6970, &lit_3864); /* 805A6138-805A6318 000078 01E0+00 1/1 0/0 0/0 .text create__12daTagMstop_cFv */ #pragma push @@ -190,21 +190,21 @@ asm void daTagMstop_c::eventOrder() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4056 = 1.0f; -COMPILER_STRIP_GATE(805A6974, &lit_4056); +COMPILER_STRIP_GATE(0x805A6974, &lit_4056); #pragma pop /* 805A6978-805A697C 00000C 0004+00 0/1 0/0 0/0 .rodata @4057 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4057 = -1.0f; -COMPILER_STRIP_GATE(805A6978, &lit_4057); +COMPILER_STRIP_GATE(0x805A6978, &lit_4057); #pragma pop /* 805A697C-805A6980 000010 0004+00 0/1 0/0 0/0 .rodata @4058 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4058 = 2500.0f; -COMPILER_STRIP_GATE(805A697C, &lit_4058); +COMPILER_STRIP_GATE(0x805A697C, &lit_4058); #pragma pop /* 805A6980-805A6984 000014 0004+00 0/1 0/0 0/0 .rodata @4059 */ @@ -216,7 +216,7 @@ SECTION_RODATA static u8 const lit_4059[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(805A6980, &lit_4059); +COMPILER_STRIP_GATE(0x805A6980, &lit_4059); #pragma pop /* 805A63F8-805A693C 000338 0544+00 1/1 0/0 0/0 .text execute__12daTagMstop_cFv */ diff --git a/rel/d/a/tag/d_a_tag_mwait/d_a_tag_mwait.cpp b/rel/d/a/tag/d_a_tag_mwait/d_a_tag_mwait.cpp index 454dfedebc3..777f8b70f9a 100644 --- a/rel/d/a/tag/d_a_tag_mwait/d_a_tag_mwait.cpp +++ b/rel/d/a/tag/d_a_tag_mwait/d_a_tag_mwait.cpp @@ -90,27 +90,27 @@ extern "C" u8 m_midnaActor__9daPy_py_c[4]; /* ############################################################################################## */ /* 80D5C580-80D5C584 000000 0004+00 2/2 0/0 0/0 .rodata @3841 */ SECTION_RODATA static f32 const lit_3841 = -1.0f; -COMPILER_STRIP_GATE(80D5C580, &lit_3841); +COMPILER_STRIP_GATE(0x80D5C580, &lit_3841); /* 80D5C584-80D5C588 000004 0004+00 0/1 0/0 0/0 .rodata @3842 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3842 = 100.0f; -COMPILER_STRIP_GATE(80D5C584, &lit_3842); +COMPILER_STRIP_GATE(0x80D5C584, &lit_3842); #pragma pop /* 80D5C588-80D5C58C 000008 0004+00 0/1 0/0 0/0 .rodata @3843 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3843 = 10.0f; -COMPILER_STRIP_GATE(80D5C588, &lit_3843); +COMPILER_STRIP_GATE(0x80D5C588, &lit_3843); #pragma pop /* 80D5C58C-80D5C590 00000C 0004+00 0/1 0/0 0/0 .rodata @3844 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3844 = 220.0f; -COMPILER_STRIP_GATE(80D5C58C, &lit_3844); +COMPILER_STRIP_GATE(0x80D5C58C, &lit_3844); #pragma pop /* 80D5C590-80D5C598 000010 0004+04 0/1 0/0 0/0 .rodata @3845 */ @@ -121,7 +121,7 @@ SECTION_RODATA static f32 const lit_3845[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80D5C590, &lit_3845); +COMPILER_STRIP_GATE(0x80D5C590, &lit_3845); #pragma pop /* 80D5C598-80D5C5A0 000018 0008+00 0/1 0/0 0/0 .rodata @3847 */ @@ -130,7 +130,7 @@ COMPILER_STRIP_GATE(80D5C590, &lit_3845); SECTION_RODATA static u8 const lit_3847[8] = { 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D5C598, &lit_3847); +COMPILER_STRIP_GATE(0x80D5C598, &lit_3847); #pragma pop /* 80D5BE18-80D5BFFC 000078 01E4+00 1/1 0/0 0/0 .text create__12daTagMwait_cFv */ @@ -190,7 +190,7 @@ SECTION_RODATA static u8 const lit_4006[4 + 4 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D5C5A0, &lit_4006); +COMPILER_STRIP_GATE(0x80D5C5A0, &lit_4006); #pragma pop /* 80D5C5A8-80D5C5B0 000028 0008+00 0/1 0/0 0/0 .rodata @4007 */ @@ -199,7 +199,7 @@ COMPILER_STRIP_GATE(80D5C5A0, &lit_4006); SECTION_RODATA static u8 const lit_4007[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D5C5A8, &lit_4007); +COMPILER_STRIP_GATE(0x80D5C5A8, &lit_4007); #pragma pop /* 80D5C5B0-80D5C5B8 000030 0008+00 0/1 0/0 0/0 .rodata @4008 */ @@ -208,7 +208,7 @@ COMPILER_STRIP_GATE(80D5C5A8, &lit_4007); SECTION_RODATA static u8 const lit_4008[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D5C5B0, &lit_4008); +COMPILER_STRIP_GATE(0x80D5C5B0, &lit_4008); #pragma pop /* 80D5C5B8-80D5C5C0 000038 0008+00 0/1 0/0 0/0 .rodata @4009 */ @@ -217,14 +217,14 @@ COMPILER_STRIP_GATE(80D5C5B0, &lit_4008); SECTION_RODATA static u8 const lit_4009[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D5C5B8, &lit_4009); +COMPILER_STRIP_GATE(0x80D5C5B8, &lit_4009); #pragma pop /* 80D5C5C0-80D5C5C4 000040 0004+00 0/1 0/0 0/0 .rodata @4010 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4010 = 5.0f; -COMPILER_STRIP_GATE(80D5C5C0, &lit_4010); +COMPILER_STRIP_GATE(0x80D5C5C0, &lit_4010); #pragma pop /* 80D5C0A8-80D5C550 000308 04A8+00 1/1 0/0 0/0 .text execute__12daTagMwait_cFv */ diff --git a/rel/d/a/tag/d_a_tag_myna2/d_a_tag_myna2.cpp b/rel/d/a/tag/d_a_tag_myna2/d_a_tag_myna2.cpp index e1b502db8ae..14866140461 100644 --- a/rel/d/a/tag/d_a_tag_myna2/d_a_tag_myna2.cpp +++ b/rel/d/a/tag/d_a_tag_myna2/d_a_tag_myna2.cpp @@ -51,7 +51,7 @@ extern "C" void execute__12daTagMyna2_cFv(); extern "C" static void daTagMyna2_Create__FP10fopAc_ac_c(); extern "C" static void daTagMyna2_Execute__FP12daTagMyna2_c(); extern "C" static void daTagMyna2_Delete__FP12daTagMyna2_c(); -extern "C" void func_80D5CA18(s16*); +extern "C" void func_80D5CA18(void* _this, s16*); extern "C" extern void* g_profile_TAG_MYNA2[12]; // @@ -103,7 +103,7 @@ SECTION_RODATA static u8 const lit_3743[4 + 4 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D5CA3C, &lit_3743); +COMPILER_STRIP_GATE(0x80D5CA3C, &lit_3743); /* 80D5CA44-80D5CA4C 000008 0008+00 0/1 0/0 0/0 .rodata @3744 */ #pragma push @@ -111,7 +111,7 @@ COMPILER_STRIP_GATE(80D5CA3C, &lit_3743); SECTION_RODATA static u8 const lit_3744[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D5CA44, &lit_3744); +COMPILER_STRIP_GATE(0x80D5CA44, &lit_3744); #pragma pop /* 80D5CA4C-80D5CA54 000010 0008+00 0/1 0/0 0/0 .rodata @3745 */ @@ -120,7 +120,7 @@ COMPILER_STRIP_GATE(80D5CA44, &lit_3744); SECTION_RODATA static u8 const lit_3745[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D5CA4C, &lit_3745); +COMPILER_STRIP_GATE(0x80D5CA4C, &lit_3745); #pragma pop /* 80D5CA54-80D5CA5C 000018 0008+00 0/1 0/0 0/0 .rodata @3746 */ @@ -129,21 +129,21 @@ COMPILER_STRIP_GATE(80D5CA4C, &lit_3745); SECTION_RODATA static u8 const lit_3746[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D5CA54, &lit_3746); +COMPILER_STRIP_GATE(0x80D5CA54, &lit_3746); #pragma pop /* 80D5CA5C-80D5CA60 000020 0004+00 0/1 0/0 0/0 .rodata @3747 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3747 = 100.0f; -COMPILER_STRIP_GATE(80D5CA5C, &lit_3747); +COMPILER_STRIP_GATE(0x80D5CA5C, &lit_3747); #pragma pop /* 80D5CA60-80D5CA64 000024 0004+00 0/1 0/0 0/0 .rodata @3748 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3748 = 1000.0f; -COMPILER_STRIP_GATE(80D5CA60, &lit_3748); +COMPILER_STRIP_GATE(0x80D5CA60, &lit_3748); #pragma pop /* 80D5C708-80D5C9A8 0000E8 02A0+00 1/1 0/0 0/0 .text execute__12daTagMyna2_cFv */ @@ -192,7 +192,7 @@ static asm void daTagMyna2_Delete(daTagMyna2_c* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80D5CA18(s16* param_0) { +extern "C" asm void func_80D5CA18(void* _this, s16* param_0) { nofralloc #include "asm/rel/d/a/tag/d_a_tag_myna2/d_a_tag_myna2/func_80D5CA18.s" } diff --git a/rel/d/a/tag/d_a_tag_myna_light/d_a_tag_myna_light.cpp b/rel/d/a/tag/d_a_tag_myna_light/d_a_tag_myna_light.cpp index 1718ba06ee2..48f808b79fe 100644 --- a/rel/d/a/tag/d_a_tag_myna_light/d_a_tag_myna_light.cpp +++ b/rel/d/a/tag/d_a_tag_myna_light/d_a_tag_myna_light.cpp @@ -30,13 +30,13 @@ struct daTag_MynaLight_c { struct dPa_levelEcallBack {}; -struct cXyz {}; - struct dKy_tevstr_c {}; +struct csXyz {}; + struct _GXColor {}; -struct csXyz {}; +struct cXyz {}; struct dPa_control_c { /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, @@ -44,10 +44,10 @@ struct dPa_control_c { cXyz const*, f32); }; -struct Vec {}; - struct JAISoundID {}; +struct Vec {}; + struct Z2SeMgr { /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); /* 802AC50C */ void seStartLevel(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); @@ -156,20 +156,20 @@ asm void daTag_MynaLight_c::Delete() { /* ############################################################################################## */ /* 80D5D300-80D5D304 000000 0004+00 4/4 0/0 0/0 .rodata @3694 */ SECTION_RODATA static f32 const lit_3694 = 1.0f / 15.0f; -COMPILER_STRIP_GATE(80D5D300, &lit_3694); +COMPILER_STRIP_GATE(0x80D5D300, &lit_3694); /* 80D5D304-80D5D308 000004 0004+00 0/3 0/0 0/0 .rodata @3695 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3695 = 1.0f; -COMPILER_STRIP_GATE(80D5D304, &lit_3695); +COMPILER_STRIP_GATE(0x80D5D304, &lit_3695); #pragma pop /* 80D5D308-80D5D30C 000008 0004+00 0/2 0/0 0/0 .rodata @3696 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3696 = -1.0f; -COMPILER_STRIP_GATE(80D5D308, &lit_3696); +COMPILER_STRIP_GATE(0x80D5D308, &lit_3696); #pragma pop /* 80D5CBF4-80D5CD94 000134 01A0+00 1/1 0/0 0/0 .text Execute__17daTag_MynaLight_cFv */ @@ -187,28 +187,28 @@ asm void daTag_MynaLight_c::Execute() { #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_3706 = 0xBC6642FF; -COMPILER_STRIP_GATE(80D5D30C, &lit_3706); +COMPILER_STRIP_GATE(0x80D5D30C, &lit_3706); #pragma pop /* 80D5D310-80D5D314 000010 0004+00 0/1 0/0 0/0 .rodata @3708 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3708 = 0.5f; -COMPILER_STRIP_GATE(80D5D310, &lit_3708); +COMPILER_STRIP_GATE(0x80D5D310, &lit_3708); #pragma pop /* 80D5D314-80D5D318 000014 0004+00 0/1 0/0 0/0 .rodata @3709 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3709 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(80D5D314, &lit_3709); +COMPILER_STRIP_GATE(0x80D5D314, &lit_3709); #pragma pop /* 80D5D318-80D5D31C 000018 0004+00 0/1 0/0 0/0 .rodata @3710 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_3710 = 0x38D1B717; -COMPILER_STRIP_GATE(80D5D318, &lit_3710); +COMPILER_STRIP_GATE(0x80D5D318, &lit_3710); #pragma pop /* 80D5D31C-80D5D320 00001C 0004+00 0/2 0/0 0/0 .rodata @3711 */ @@ -220,14 +220,14 @@ SECTION_RODATA static u8 const lit_3711[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D5D31C, &lit_3711); +COMPILER_STRIP_GATE(0x80D5D31C, &lit_3711); #pragma pop /* 80D5D320-80D5D324 000020 0004+00 0/1 0/0 0/0 .rodata @3712 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_3712 = 0x358637BD; -COMPILER_STRIP_GATE(80D5D320, &lit_3712); +COMPILER_STRIP_GATE(0x80D5D320, &lit_3712); #pragma pop /* 80D5CD94-80D5CE40 0002D4 00AC+00 1/1 0/0 0/0 .text Draw__17daTag_MynaLight_cFv */ @@ -245,35 +245,35 @@ asm void daTag_MynaLight_c::Draw() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3811 = -5122.0f; -COMPILER_STRIP_GATE(80D5D324, &lit_3811); +COMPILER_STRIP_GATE(0x80D5D324, &lit_3811); #pragma pop /* 80D5D328-80D5D32C 000028 0004+00 0/1 0/0 0/0 .rodata @3812 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3812 = -124.0f; -COMPILER_STRIP_GATE(80D5D328, &lit_3812); +COMPILER_STRIP_GATE(0x80D5D328, &lit_3812); #pragma pop /* 80D5D32C-80D5D330 00002C 0004+00 0/1 0/0 0/0 .rodata @3813 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3813 = -3067.0f; -COMPILER_STRIP_GATE(80D5D32C, &lit_3813); +COMPILER_STRIP_GATE(0x80D5D32C, &lit_3813); #pragma pop /* 80D5D330-80D5D334 000030 0004+00 0/1 0/0 0/0 .rodata @3814 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3814 = 2.0f / 5.0f; -COMPILER_STRIP_GATE(80D5D330, &lit_3814); +COMPILER_STRIP_GATE(0x80D5D330, &lit_3814); #pragma pop /* 80D5D334-80D5D338 000034 0004+00 0/1 0/0 0/0 .rodata @3815 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3815 = 0.25f; -COMPILER_STRIP_GATE(80D5D334, &lit_3815); +COMPILER_STRIP_GATE(0x80D5D334, &lit_3815); #pragma pop /* 80D5CE40-80D5D148 000380 0308+00 0/0 0/0 1/1 .text setTurnOnOffChange__17daTag_MynaLight_cFv */ @@ -311,28 +311,28 @@ asm void daTag_MynaLight_c::getTurnOffTime() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3851 = -30.0f; -COMPILER_STRIP_GATE(80D5D338, &lit_3851); +COMPILER_STRIP_GATE(0x80D5D338, &lit_3851); #pragma pop /* 80D5D33C-80D5D340 00003C 0004+00 0/1 0/0 0/0 .rodata @3852 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3852 = -15.0f; -COMPILER_STRIP_GATE(80D5D33C, &lit_3852); +COMPILER_STRIP_GATE(0x80D5D33C, &lit_3852); #pragma pop /* 80D5D340-80D5D344 000040 0004+00 0/1 0/0 0/0 .rodata @3853 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3853 = 30.0f; -COMPILER_STRIP_GATE(80D5D340, &lit_3853); +COMPILER_STRIP_GATE(0x80D5D340, &lit_3853); #pragma pop /* 80D5D344-80D5D348 000044 0004+00 0/1 0/0 0/0 .rodata @3854 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3854 = 45.0f; -COMPILER_STRIP_GATE(80D5D344, &lit_3854); +COMPILER_STRIP_GATE(0x80D5D344, &lit_3854); #pragma pop /* 80D5D160-80D5D210 0006A0 00B0+00 1/1 0/0 0/0 .text initialize__17daTag_MynaLight_cFv diff --git a/rel/d/a/tag/d_a_tag_pachi/d_a_tag_pachi.cpp b/rel/d/a/tag/d_a_tag_pachi/d_a_tag_pachi.cpp index 3d56c1a96d9..093f2ea6542 100644 --- a/rel/d/a/tag/d_a_tag_pachi/d_a_tag_pachi.cpp +++ b/rel/d/a/tag/d_a_tag_pachi/d_a_tag_pachi.cpp @@ -187,7 +187,7 @@ SECTION_RODATA static u8 const l_sph_src[68] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D5D914, &l_sph_src); +COMPILER_STRIP_GATE(0x80D5D914, &l_sph_src); /* 80D5D570-80D5D6A0 0001B0 0130+00 1/1 0/0 0/0 .text create__11daTagPati_cFv */ #pragma push @@ -242,11 +242,11 @@ asm void daTagPati_c::Execute() { /* ############################################################################################## */ /* 80D5D958-80D5D95C 000044 0004+00 1/1 0/0 0/0 .rodata @3802 */ SECTION_RODATA static f32 const lit_3802 = 1350.0f; -COMPILER_STRIP_GATE(80D5D958, &lit_3802); +COMPILER_STRIP_GATE(0x80D5D958, &lit_3802); /* 80D5D95C-80D5D960 000048 0004+00 1/1 0/0 0/0 .rodata @3803 */ SECTION_RODATA static f32 const lit_3803 = 300000.0f; -COMPILER_STRIP_GATE(80D5D95C, &lit_3803); +COMPILER_STRIP_GATE(0x80D5D95C, &lit_3803); /* 80D5D7C8-80D5D830 000408 0068+00 1/1 0/0 0/0 .text col_set__11daTagPati_cFv */ #pragma push diff --git a/rel/d/a/tag/d_a_tag_poFire/d_a_tag_poFire.cpp b/rel/d/a/tag/d_a_tag_poFire/d_a_tag_poFire.cpp index 6ca8d7456fe..8eb96eb88b0 100644 --- a/rel/d/a/tag/d_a_tag_poFire/d_a_tag_poFire.cpp +++ b/rel/d/a/tag/d_a_tag_poFire/d_a_tag_poFire.cpp @@ -240,5 +240,5 @@ asm void __sinit_d_a_tag_poFire_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80D5DD0C = (void*)__sinit_d_a_tag_poFire_cpp; +REGISTER_CTORS(0x80D5DD0C, __sinit_d_a_tag_poFire_cpp); #pragma pop diff --git a/rel/d/a/tag/d_a_tag_push/d_a_tag_push.cpp b/rel/d/a/tag/d_a_tag_push/d_a_tag_push.cpp index f3b50ad8338..6f96a018b1a 100644 --- a/rel/d/a/tag/d_a_tag_push/d_a_tag_push.cpp +++ b/rel/d/a/tag/d_a_tag_push/d_a_tag_push.cpp @@ -119,7 +119,7 @@ asm void daTag_Push_c::srchActor(void* param_0, void* param_1) { /* ############################################################################################## */ /* 8049094C-80490950 000000 0004+00 1/1 0/0 0/0 .rodata @3887 */ SECTION_RODATA static f32 const lit_3887 = 100.0f; -COMPILER_STRIP_GATE(8049094C, &lit_3887); +COMPILER_STRIP_GATE(0x8049094C, &lit_3887); /* 80490978-80490998 -00001 0020+00 1/0 0/0 0/0 .data daTag_Push_MethodTable */ SECTION_DATA static void* daTag_Push_MethodTable[8] = { diff --git a/rel/d/a/tag/d_a_tag_qs/d_a_tag_qs.cpp b/rel/d/a/tag/d_a_tag_qs/d_a_tag_qs.cpp index 59ced703179..aa3d8202e98 100644 --- a/rel/d/a/tag/d_a_tag_qs/d_a_tag_qs.cpp +++ b/rel/d/a/tag/d_a_tag_qs/d_a_tag_qs.cpp @@ -235,17 +235,17 @@ asm daTagQs_c::~daTagQs_c() { /* ############################################################################################## */ /* 80D5ECE0-80D5ECE4 000000 0004+00 5/5 0/0 0/0 .rodata @3734 */ SECTION_RODATA static f32 const lit_3734 = 1.0f; -COMPILER_STRIP_GATE(80D5ECE0, &lit_3734); +COMPILER_STRIP_GATE(0x80D5ECE0, &lit_3734); /* 80D5ECE4-80D5ECE8 000004 0004+00 1/3 0/0 0/0 .rodata @3735 */ SECTION_RODATA static f32 const lit_3735 = 20.0f; -COMPILER_STRIP_GATE(80D5ECE4, &lit_3735); +COMPILER_STRIP_GATE(0x80D5ECE4, &lit_3735); /* 80D5ECE8-80D5ECEC 000008 0004+00 0/1 0/0 0/0 .rodata @3736 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3736 = 50.0f; -COMPILER_STRIP_GATE(80D5ECE8, &lit_3736); +COMPILER_STRIP_GATE(0x80D5ECE8, &lit_3736); #pragma pop /* 80D5DFB0-80D5E110 0001B0 0160+00 1/1 0/0 0/0 .text create__9daTagQs_cFv */ @@ -291,11 +291,11 @@ asm cM3dGAab::~cM3dGAab() { /* ############################################################################################## */ /* 80D5ECEC-80D5ECF0 00000C 0004+00 1/2 0/0 0/0 .rodata @3813 */ SECTION_RODATA static f32 const lit_3813 = 4.0f; -COMPILER_STRIP_GATE(80D5ECEC, &lit_3813); +COMPILER_STRIP_GATE(0x80D5ECEC, &lit_3813); /* 80D5ECF0-80D5ECF4 000010 0004+00 1/1 0/0 0/0 .rodata @3814 */ SECTION_RODATA static f32 const lit_3814 = 5.0f; -COMPILER_STRIP_GATE(80D5ECF0, &lit_3814); +COMPILER_STRIP_GATE(0x80D5ECF0, &lit_3814); /* 80D5E1FC-80D5E220 0003FC 0024+00 2/2 0/0 0/0 .text getPower__9daTagQs_cFv */ #pragma push @@ -310,11 +310,11 @@ asm void daTagQs_c::getPower() { /* ############################################################################################## */ /* 80D5ECF4-80D5ECF8 000014 0004+00 1/2 0/0 0/0 .rodata @3823 */ SECTION_RODATA static f32 const lit_3823 = 4.0f / 5.0f; -COMPILER_STRIP_GATE(80D5ECF4, &lit_3823); +COMPILER_STRIP_GATE(0x80D5ECF4, &lit_3823); /* 80D5ECF8-80D5ECFC 000018 0004+00 1/2 0/0 0/0 .rodata @3824 */ SECTION_RODATA static f32 const lit_3824 = 0.5f; -COMPILER_STRIP_GATE(80D5ECF8, &lit_3824); +COMPILER_STRIP_GATE(0x80D5ECF8, &lit_3824); /* 80D5E220-80D5E244 000420 0024+00 1/1 0/0 0/0 .text getSafeArea__9daTagQs_cFv */ #pragma push @@ -329,11 +329,11 @@ asm void daTagQs_c::getSafeArea() { /* ############################################################################################## */ /* 80D5ECFC-80D5ED00 00001C 0004+00 1/1 0/0 0/0 .rodata @3833 */ SECTION_RODATA static f32 const lit_3833 = 6.0f; -COMPILER_STRIP_GATE(80D5ECFC, &lit_3833); +COMPILER_STRIP_GATE(0x80D5ECFC, &lit_3833); /* 80D5ED00-80D5ED04 000020 0004+00 1/1 0/0 0/0 .rodata @3834 */ SECTION_RODATA static f32 const lit_3834 = 10.0f; -COMPILER_STRIP_GATE(80D5ED00, &lit_3834); +COMPILER_STRIP_GATE(0x80D5ED00, &lit_3834); /* 80D5E244-80D5E268 000444 0024+00 1/1 0/0 0/0 .text getPower80__9daTagQs_cFv */ #pragma push @@ -348,7 +348,7 @@ asm void daTagQs_c::getPower80() { /* ############################################################################################## */ /* 80D5ED04-80D5ED08 000024 0004+00 1/1 0/0 0/0 .rodata @3843 */ SECTION_RODATA static f32 const lit_3843 = 12.0f; -COMPILER_STRIP_GATE(80D5ED04, &lit_3843); +COMPILER_STRIP_GATE(0x80D5ED04, &lit_3843); /* 80D5E268-80D5E28C 000468 0024+00 1/1 0/0 0/0 .text getCenterPower__9daTagQs_cFv */ #pragma push @@ -369,7 +369,7 @@ SECTION_RODATA static f32 const lit_3863[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80D5ED08, &lit_3863); +COMPILER_STRIP_GATE(0x80D5ED08, &lit_3863); #pragma pop /* 80D5ED10-80D5ED18 000030 0008+00 0/2 0/0 0/0 .rodata @3865 */ @@ -378,7 +378,7 @@ COMPILER_STRIP_GATE(80D5ED08, &lit_3863); SECTION_RODATA static u8 const lit_3865[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D5ED10, &lit_3865); +COMPILER_STRIP_GATE(0x80D5ED10, &lit_3865); #pragma pop /* 80D5E28C-80D5E3F8 00048C 016C+00 1/1 0/0 0/0 .text calcPower__9daTagQs_cFff */ @@ -401,14 +401,14 @@ SECTION_RODATA static u8 const lit_3934[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D5ED18, &lit_3934); +COMPILER_STRIP_GATE(0x80D5ED18, &lit_3934); #pragma pop /* 80D5ED1C-80D5ED20 00003C 0004+00 0/2 0/0 0/0 .rodata @3935 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3935 = 100.0f; -COMPILER_STRIP_GATE(80D5ED1C, &lit_3935); +COMPILER_STRIP_GATE(0x80D5ED1C, &lit_3935); #pragma pop /* 80D5ED20-80D5ED28 000040 0008+00 0/2 0/0 0/0 .rodata @3936 */ @@ -417,7 +417,7 @@ COMPILER_STRIP_GATE(80D5ED1C, &lit_3935); SECTION_RODATA static u8 const lit_3936[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D5ED20, &lit_3936); +COMPILER_STRIP_GATE(0x80D5ED20, &lit_3936); #pragma pop /* 80D5ED28-80D5ED30 000048 0008+00 0/2 0/0 0/0 .rodata @3937 */ @@ -426,7 +426,7 @@ COMPILER_STRIP_GATE(80D5ED20, &lit_3936); SECTION_RODATA static u8 const lit_3937[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D5ED28, &lit_3937); +COMPILER_STRIP_GATE(0x80D5ED28, &lit_3937); #pragma pop /* 80D5ED30-80D5ED38 000050 0008+00 0/2 0/0 0/0 .rodata @3938 */ @@ -435,7 +435,7 @@ COMPILER_STRIP_GATE(80D5ED28, &lit_3937); SECTION_RODATA static u8 const lit_3938[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D5ED30, &lit_3938); +COMPILER_STRIP_GATE(0x80D5ED30, &lit_3938); #pragma pop /* 80D5E3F8-80D5E64C 0005F8 0254+00 1/1 0/0 0/0 .text hikiyose__FP4cXyzP4cXyzP4cXyzf */ @@ -453,14 +453,14 @@ static asm void hikiyose(cXyz* param_0, cXyz* param_1, cXyz* param_2, f32 param_ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4042 = 110.0f; -COMPILER_STRIP_GATE(80D5ED38, &lit_4042); +COMPILER_STRIP_GATE(0x80D5ED38, &lit_4042); #pragma pop /* 80D5ED3C-80D5ED40 00005C 0004+00 0/1 0/0 0/0 .rodata @4043 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4043 = 9.0f / 10.0f; -COMPILER_STRIP_GATE(80D5ED3C, &lit_4043); +COMPILER_STRIP_GATE(0x80D5ED3C, &lit_4043); #pragma pop /* 80D5E64C-80D5E9F8 00084C 03AC+00 1/1 0/0 0/0 .text search__FPvPv */ @@ -478,7 +478,7 @@ static asm void search(void* param_0, void* param_1) { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4090 = -1.0f; -COMPILER_STRIP_GATE(80D5ED40, &lit_4090); +COMPILER_STRIP_GATE(0x80D5ED40, &lit_4090); #pragma pop /* 80D5E9F8-80D5EBF8 000BF8 0200+00 1/1 0/0 0/0 .text execute__9daTagQs_cFv */ diff --git a/rel/d/a/tag/d_a_tag_ret_room/d_a_tag_ret_room.cpp b/rel/d/a/tag/d_a_tag_ret_room/d_a_tag_ret_room.cpp index 942e045dfad..19daa64f51b 100644 --- a/rel/d/a/tag/d_a_tag_ret_room/d_a_tag_ret_room.cpp +++ b/rel/d/a/tag/d_a_tag_ret_room/d_a_tag_ret_room.cpp @@ -161,11 +161,11 @@ asm void daTagRetRm_c::execute() { /* ############################################################################################## */ /* 80D5F208-80D5F20C 000000 0004+00 1/1 0/0 0/0 .rodata @3682 */ SECTION_RODATA static f32 const lit_3682 = 50.0f; -COMPILER_STRIP_GATE(80D5F208, &lit_3682); +COMPILER_STRIP_GATE(0x80D5F208, &lit_3682); /* 80D5F20C-80D5F210 000004 0004+00 1/1 0/0 0/0 .rodata @3683 */ SECTION_RODATA static f32 const lit_3683 = 100.0f; -COMPILER_STRIP_GATE(80D5F20C, &lit_3683); +COMPILER_STRIP_GATE(0x80D5F20C, &lit_3683); /* 80D5F010-80D5F050 0001F0 0040+00 1/1 0/0 0/0 .text init__12daTagRetRm_cFv */ #pragma push @@ -185,7 +185,7 @@ SECTION_RODATA static u8 const lit_3718[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D5F210, &lit_3718); +COMPILER_STRIP_GATE(0x80D5F210, &lit_3718); /* 80D5F050-80D5F14C 000230 00FC+00 1/1 0/0 0/0 .text chkPlyrInTag__12daTagRetRm_cFv */ #pragma push diff --git a/rel/d/a/tag/d_a_tag_river_back/d_a_tag_river_back.cpp b/rel/d/a/tag/d_a_tag_river_back/d_a_tag_river_back.cpp index 9fd9c477efd..4cf6e8738ec 100644 --- a/rel/d/a/tag/d_a_tag_river_back/d_a_tag_river_back.cpp +++ b/rel/d/a/tag/d_a_tag_river_back/d_a_tag_river_back.cpp @@ -48,10 +48,10 @@ struct dEvent_manager_c { /* 8004817C */ void cutEnd(int); }; -struct Vec {}; - struct JAISoundID {}; +struct Vec {}; + struct Z2SeMgr { /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); }; @@ -77,7 +77,7 @@ extern "C" void _delete__16daTagRiverBack_cFv(); extern "C" static void daTagRiverBack_Execute__FP16daTagRiverBack_c(); extern "C" static void daTagRiverBack_Delete__FP16daTagRiverBack_c(); extern "C" static void daTagRiverBack_Create__FP16daTagRiverBack_c(); -extern "C" void func_80D5F920(u8*); +extern "C" void func_80D5F920(void* _this, u8*); extern "C" extern char const* const d_a_tag_river_back__stringBase0; extern "C" extern void* g_profile_Tag_RiverBack[12]; @@ -116,6 +116,13 @@ extern "C" extern u8 data_80D5FA68[4]; // /* ############################################################################################## */ +/* 80D5F950-80D5F950 00000C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80D5F950 = "RvBack"; +SECTION_DEAD static char const* const stringBase_80D5F957 = "RIVER_BACK"; +#pragma pop + /* 80D5F980-80D5F98C 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -171,6 +178,12 @@ asm void daTagRiverBack_c::execute() { #pragma pop /* ############################################################################################## */ +/* 80D5F950-80D5F950 00000C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80D5F962 = "rvback"; +#pragma pop + /* 80D5F9A8-80D5F9AC -00001 0004+00 1/1 0/0 0/0 .data l_staffName */ SECTION_DATA static void* l_staffName = (void*)(((char*)&d_a_tag_river_back__stringBase0) + 0x12); @@ -273,13 +286,13 @@ void daTagRiverBack_c::actionDead() { /* ############################################################################################## */ /* 80D5F944-80D5F948 000000 0004+00 1/1 0/0 0/0 .rodata @3813 */ SECTION_RODATA static f32 const lit_3813 = 1.0f; -COMPILER_STRIP_GATE(80D5F944, &lit_3813); +COMPILER_STRIP_GATE(0x80D5F944, &lit_3813); /* 80D5F948-80D5F94C 000004 0004+00 0/1 0/0 0/0 .rodata @3814 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3814 = -1.0f; -COMPILER_STRIP_GATE(80D5F948, &lit_3814); +COMPILER_STRIP_GATE(0x80D5F948, &lit_3814); #pragma pop /* 80D5F94C-80D5F950 000008 0004+00 0/1 0/0 0/0 .rodata @3815 */ @@ -291,7 +304,15 @@ SECTION_RODATA static u8 const lit_3815[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D5F94C, &lit_3815); +COMPILER_STRIP_GATE(0x80D5F94C, &lit_3815); +#pragma pop + +/* 80D5F950-80D5F950 00000C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80D5F969 = "WAIT"; +SECTION_DEAD static char const* const stringBase_80D5F96E = "SCENE_CHG"; +SECTION_DEAD static char const* const stringBase_80D5F978 = "Timer"; #pragma pop /* 80D5FA0C-80D5FA14 -00001 0008+00 1/1 0/0 0/0 .data action_table$3769 */ @@ -357,7 +378,7 @@ static asm void daTagRiverBack_Create(daTagRiverBack_c* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80D5F920(u8* param_0) { +extern "C" asm void func_80D5F920(void* _this, u8* param_0) { nofralloc #include "asm/rel/d/a/tag/d_a_tag_river_back/d_a_tag_river_back/func_80D5F920.s" } @@ -386,14 +407,4 @@ SECTION_DATA extern void* g_profile_Tag_RiverBack[12] = { (void*)0x00040000, (void*)0x000E0000, }; -/* 80D5F950-80D5F97E 00000C 002E+00 5/1 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80D5F950 = "RvBack"; -SECTION_DEAD static char const* const stringBase_80D5F957 = "RIVER_BACK"; -SECTION_DEAD static char const* const stringBase_80D5F962 = "rvback"; -SECTION_DEAD static char const* const stringBase_80D5F969 = "WAIT"; -SECTION_DEAD static char const* const stringBase_80D5F96E = "SCENE_CHG"; -SECTION_DEAD static char const* const stringBase_80D5F978 = "Timer"; -#pragma pop +/* 80D5F950-80D5F950 00000C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/tag/d_a_tag_rmbit_sw/d_a_tag_rmbit_sw.cpp b/rel/d/a/tag/d_a_tag_rmbit_sw/d_a_tag_rmbit_sw.cpp index 65a1dfab9e8..680f2147acc 100644 --- a/rel/d/a/tag/d_a_tag_rmbit_sw/d_a_tag_rmbit_sw.cpp +++ b/rel/d/a/tag/d_a_tag_rmbit_sw/d_a_tag_rmbit_sw.cpp @@ -175,11 +175,11 @@ asm void daTagRmbitSw_c::execute() { /* ############################################################################################## */ /* 80D5FFA8-80D5FFAC 000000 0004+00 1/1 0/0 0/0 .rodata @3817 */ SECTION_RODATA static f32 const lit_3817 = 50.0f; -COMPILER_STRIP_GATE(80D5FFA8, &lit_3817); +COMPILER_STRIP_GATE(0x80D5FFA8, &lit_3817); /* 80D5FFAC-80D5FFB0 000004 0004+00 1/1 0/0 0/0 .rodata @3818 */ SECTION_RODATA static f32 const lit_3818 = 100.0f; -COMPILER_STRIP_GATE(80D5FFAC, &lit_3818); +COMPILER_STRIP_GATE(0x80D5FFAC, &lit_3818); /* 80D5FDB8-80D5FDF0 000338 0038+00 1/1 0/0 0/0 .text init__14daTagRmbitSw_cFv */ #pragma push @@ -199,7 +199,7 @@ SECTION_RODATA static u8 const lit_3853[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D5FFB0, &lit_3853); +COMPILER_STRIP_GATE(0x80D5FFB0, &lit_3853); /* 80D5FDF0-80D5FEEC 000370 00FC+00 1/1 0/0 0/0 .text chkPlyrInTag__14daTagRmbitSw_cFv */ #pragma push diff --git a/rel/d/a/tag/d_a_tag_setrestart/d_a_tag_setrestart.cpp b/rel/d/a/tag/d_a_tag_setrestart/d_a_tag_setrestart.cpp index 795ba8918e5..7a2adf3823e 100644 --- a/rel/d/a/tag/d_a_tag_setrestart/d_a_tag_setrestart.cpp +++ b/rel/d/a/tag/d_a_tag_setrestart/d_a_tag_setrestart.cpp @@ -88,13 +88,13 @@ extern "C" extern u8 struct_80450D64[4]; /* ############################################################################################## */ /* 80D607B4-80D607B8 000000 0004+00 2/2 0/0 0/0 .rodata @3650 */ SECTION_RODATA static f32 const lit_3650 = -100.0f; -COMPILER_STRIP_GATE(80D607B4, &lit_3650); +COMPILER_STRIP_GATE(0x80D607B4, &lit_3650); /* 80D607B8-80D607BC 000004 0004+00 0/2 0/0 0/0 .rodata @3651 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3651 = 100.0f; -COMPILER_STRIP_GATE(80D607B8, &lit_3651); +COMPILER_STRIP_GATE(0x80D607B8, &lit_3651); #pragma pop /* 80D607BC-80D607C0 000008 0004+00 0/2 0/0 0/0 .rodata @3652 */ @@ -106,7 +106,7 @@ SECTION_RODATA static u8 const lit_3652[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D607BC, &lit_3652); +COMPILER_STRIP_GATE(0x80D607BC, &lit_3652); #pragma pop /* 80D603F8-80D6048C 000078 0094+00 1/1 0/0 0/0 .text Create__14daTagRestart_cFv */ diff --git a/rel/d/a/tag/d_a_tag_shop_camera/d_a_tag_shop_camera.cpp b/rel/d/a/tag/d_a_tag_shop_camera/d_a_tag_shop_camera.cpp index ccc1f358821..08112ba6339 100644 --- a/rel/d/a/tag/d_a_tag_shop_camera/d_a_tag_shop_camera.cpp +++ b/rel/d/a/tag/d_a_tag_shop_camera/d_a_tag_shop_camera.cpp @@ -114,27 +114,27 @@ bool daTag_ShopCamera_c::Draw() { /* ############################################################################################## */ /* 80D60A80-80D60A84 000000 0004+00 1/1 0/0 0/0 .rodata @3663 */ SECTION_RODATA static f32 const lit_3663 = -30.0f; -COMPILER_STRIP_GATE(80D60A80, &lit_3663); +COMPILER_STRIP_GATE(0x80D60A80, &lit_3663); /* 80D60A84-80D60A88 000004 0004+00 0/1 0/0 0/0 .rodata @3664 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3664 = -15.0f; -COMPILER_STRIP_GATE(80D60A84, &lit_3664); +COMPILER_STRIP_GATE(0x80D60A84, &lit_3664); #pragma pop /* 80D60A88-80D60A8C 000008 0004+00 0/1 0/0 0/0 .rodata @3665 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3665 = 30.0f; -COMPILER_STRIP_GATE(80D60A88, &lit_3665); +COMPILER_STRIP_GATE(0x80D60A88, &lit_3665); #pragma pop /* 80D60A8C-80D60A90 00000C 0004+00 0/1 0/0 0/0 .rodata @3666 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3666 = 45.0f; -COMPILER_STRIP_GATE(80D60A8C, &lit_3666); +COMPILER_STRIP_GATE(0x80D60A8C, &lit_3666); #pragma pop /* 80D60914-80D60990 0000F4 007C+00 1/1 0/0 0/0 .text initialize__18daTag_ShopCamera_cFv diff --git a/rel/d/a/tag/d_a_tag_shop_item/d_a_tag_shop_item.cpp b/rel/d/a/tag/d_a_tag_shop_item/d_a_tag_shop_item.cpp index 351bae9a250..36c7fddf978 100644 --- a/rel/d/a/tag/d_a_tag_shop_item/d_a_tag_shop_item.cpp +++ b/rel/d/a/tag/d_a_tag_shop_item/d_a_tag_shop_item.cpp @@ -103,11 +103,17 @@ extern "C" extern u8 g_dComIfG_gameInfo[122384]; /* ############################################################################################## */ /* 80D611D0-80D611D4 000000 0004+00 2/2 0/0 0/0 .rodata @3684 */ SECTION_RODATA static f32 const lit_3684 = 90.0f; -COMPILER_STRIP_GATE(80D611D0, &lit_3684); +COMPILER_STRIP_GATE(0x80D611D0, &lit_3684); /* 80D611D4-80D611D8 000004 0004+00 1/1 0/0 0/0 .rodata @3685 */ SECTION_RODATA static f32 const lit_3685 = 270.0f; -COMPILER_STRIP_GATE(80D611D4, &lit_3685); +COMPILER_STRIP_GATE(0x80D611D4, &lit_3685); + +/* 80D611E8-80D611E8 000018 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80D611E8 = "F_SP109"; +#pragma pop /* 80D611F0-80D61210 -00001 0020+00 1/0 0/0 0/0 .data daTag_ShopItem_MethodTable */ SECTION_DATA static void* daTag_ShopItem_MethodTable[8] = { @@ -220,28 +226,28 @@ asm void daTag_ShopItem_c::getSwitchBit2() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3778 = -30.0f; -COMPILER_STRIP_GATE(80D611D8, &lit_3778); +COMPILER_STRIP_GATE(0x80D611D8, &lit_3778); #pragma pop /* 80D611DC-80D611E0 00000C 0004+00 0/1 0/0 0/0 .rodata @3779 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3779 = -15.0f; -COMPILER_STRIP_GATE(80D611DC, &lit_3779); +COMPILER_STRIP_GATE(0x80D611DC, &lit_3779); #pragma pop /* 80D611E0-80D611E4 000010 0004+00 0/1 0/0 0/0 .rodata @3780 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3780 = 30.0f; -COMPILER_STRIP_GATE(80D611E0, &lit_3780); +COMPILER_STRIP_GATE(0x80D611E0, &lit_3780); #pragma pop /* 80D611E4-80D611E8 000014 0004+00 0/1 0/0 0/0 .rodata @3781 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3781 = 45.0f; -COMPILER_STRIP_GATE(80D611E4, &lit_3781); +COMPILER_STRIP_GATE(0x80D611E4, &lit_3781); #pragma pop /* 80D6105C-80D610E0 00055C 0084+00 1/1 0/0 0/0 .text initialize__16daTag_ShopItem_cFv */ @@ -309,9 +315,4 @@ asm daTag_ShopItem_c::~daTag_ShopItem_c() { } #pragma pop -/* 80D611E8-80D611F0 000018 0008+00 1/1 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80D611E8 = "F_SP109"; -#pragma pop +/* 80D611E8-80D611E8 000018 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/tag/d_a_tag_smk_emt/d_a_tag_smk_emt.cpp b/rel/d/a/tag/d_a_tag_smk_emt/d_a_tag_smk_emt.cpp index c9b35276edc..e52dd11c2db 100644 --- a/rel/d/a/tag/d_a_tag_smk_emt/d_a_tag_smk_emt.cpp +++ b/rel/d/a/tag/d_a_tag_smk_emt/d_a_tag_smk_emt.cpp @@ -29,16 +29,16 @@ struct daTagSmkEmt_c { struct dPa_levelEcallBack {}; -struct cXyz {}; - struct dKy_tevstr_c {}; -struct _GXColor {}; - struct csXyz { /* 802673F4 */ csXyz(s16, s16, s16); }; +struct _GXColor {}; + +struct cXyz {}; + struct dPa_control_c { /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, @@ -176,11 +176,11 @@ SECTION_RODATA static u8 const PARTICLE_NAME[6 + 2 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D61600, &PARTICLE_NAME); +COMPILER_STRIP_GATE(0x80D61600, &PARTICLE_NAME); /* 80D61608-80D6160C 000008 0004+00 1/1 0/0 0/0 .rodata @3677 */ SECTION_RODATA static f32 const lit_3677 = 1.0f; -COMPILER_STRIP_GATE(80D61608, &lit_3677); +COMPILER_STRIP_GATE(0x80D61608, &lit_3677); /* 80D61410-80D61500 0001B0 00F0+00 1/1 0/0 0/0 .text createSmkEmt__13daTagSmkEmt_cFv */ #pragma push diff --git a/rel/d/a/tag/d_a_tag_spinner/d_a_tag_spinner.cpp b/rel/d/a/tag/d_a_tag_spinner/d_a_tag_spinner.cpp index e80b923ff6e..78d69ec9e55 100644 --- a/rel/d/a/tag/d_a_tag_spinner/d_a_tag_spinner.cpp +++ b/rel/d/a/tag/d_a_tag_spinner/d_a_tag_spinner.cpp @@ -100,7 +100,7 @@ SECTION_RODATA static u8 const lit_3689[4 + 4 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D61B24, &lit_3689); +COMPILER_STRIP_GATE(0x80D61B24, &lit_3689); /* 80D61B2C-80D61B34 000008 0008+00 0/1 0/0 0/0 .rodata @3690 */ #pragma push @@ -108,7 +108,7 @@ COMPILER_STRIP_GATE(80D61B24, &lit_3689); SECTION_RODATA static u8 const lit_3690[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D61B2C, &lit_3690); +COMPILER_STRIP_GATE(0x80D61B2C, &lit_3690); #pragma pop /* 80D61B34-80D61B3C 000010 0008+00 0/1 0/0 0/0 .rodata @3691 */ @@ -117,7 +117,7 @@ COMPILER_STRIP_GATE(80D61B2C, &lit_3690); SECTION_RODATA static u8 const lit_3691[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D61B34, &lit_3691); +COMPILER_STRIP_GATE(0x80D61B34, &lit_3691); #pragma pop /* 80D61B3C-80D61B44 000018 0008+00 0/1 0/0 0/0 .rodata @3692 */ @@ -126,7 +126,7 @@ COMPILER_STRIP_GATE(80D61B34, &lit_3691); SECTION_RODATA static u8 const lit_3692[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D61B3C, &lit_3692); +COMPILER_STRIP_GATE(0x80D61B3C, &lit_3692); #pragma pop /* 80D61718-80D618A4 000098 018C+00 1/1 0/0 0/0 .text search_spinner_sub__FPvPv */ @@ -162,7 +162,7 @@ asm void daTagSpinner_c::setBaseMtx() { /* ############################################################################################## */ /* 80D61B44-80D61B48 000020 0004+00 1/1 0/0 0/0 .rodata @3715 */ SECTION_RODATA static f32 const lit_3715 = 100.0f; -COMPILER_STRIP_GATE(80D61B44, &lit_3715); +COMPILER_STRIP_GATE(0x80D61B44, &lit_3715); /* 80D6191C-80D6196C 00029C 0050+00 1/1 0/0 0/0 .text Create__14daTagSpinner_cFv */ #pragma push diff --git a/rel/d/a/tag/d_a_tag_sppath/d_a_tag_sppath.cpp b/rel/d/a/tag/d_a_tag_sppath/d_a_tag_sppath.cpp index f969bbead78..a36c5396079 100644 --- a/rel/d/a/tag/d_a_tag_sppath/d_a_tag_sppath.cpp +++ b/rel/d/a/tag/d_a_tag_sppath/d_a_tag_sppath.cpp @@ -152,11 +152,17 @@ extern "C" extern u32 __float_max; /* ############################################################################################## */ /* 80D62C18-80D62C1C 000000 0004+00 2/2 0/0 0/0 .rodata @3694 */ SECTION_RODATA static f32 const lit_3694 = 600.0f; -COMPILER_STRIP_GATE(80D62C18, &lit_3694); +COMPILER_STRIP_GATE(0x80D62C18, &lit_3694); /* 80D62C1C-80D62C20 000004 0004+00 1/1 0/0 0/0 .rodata @3695 */ SECTION_RODATA static f32 const lit_3695 = 100.0f; -COMPILER_STRIP_GATE(80D62C1C, &lit_3695); +COMPILER_STRIP_GATE(0x80D62C1C, &lit_3695); + +/* 80D62C4C-80D62C4C 000034 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80D62C4C = "D_MN10A"; +#pragma pop /* 80D62C54-80D62C98 000000 0044+00 1/1 0/0 0/0 .data l_cylSrc */ SECTION_DATA static u8 l_cylSrc[68] = { @@ -310,7 +316,7 @@ SECTION_RODATA static u8 const lit_4100[4 + 4 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D62C20, &lit_4100); +COMPILER_STRIP_GATE(0x80D62C20, &lit_4100); #pragma pop /* 80D62C28-80D62C30 000010 0008+00 0/1 0/0 0/0 .rodata @4101 */ @@ -319,7 +325,7 @@ COMPILER_STRIP_GATE(80D62C20, &lit_4100); SECTION_RODATA static u8 const lit_4101[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D62C28, &lit_4101); +COMPILER_STRIP_GATE(0x80D62C28, &lit_4101); #pragma pop /* 80D62C30-80D62C38 000018 0008+00 0/1 0/0 0/0 .rodata @4102 */ @@ -328,7 +334,7 @@ COMPILER_STRIP_GATE(80D62C28, &lit_4101); SECTION_RODATA static u8 const lit_4102[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D62C30, &lit_4102); +COMPILER_STRIP_GATE(0x80D62C30, &lit_4102); #pragma pop /* 80D62C38-80D62C40 000020 0008+00 0/1 0/0 0/0 .rodata @4103 */ @@ -337,21 +343,21 @@ COMPILER_STRIP_GATE(80D62C30, &lit_4102); SECTION_RODATA static u8 const lit_4103[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D62C38, &lit_4103); +COMPILER_STRIP_GATE(0x80D62C38, &lit_4103); #pragma pop /* 80D62C40-80D62C44 000028 0004+00 0/1 0/0 0/0 .rodata @4104 */ #pragma push #pragma force_active on SECTION_RODATA static u32 const lit_4104 = 0x3A83126F; -COMPILER_STRIP_GATE(80D62C40, &lit_4104); +COMPILER_STRIP_GATE(0x80D62C40, &lit_4104); #pragma pop /* 80D62C44-80D62C48 00002C 0004+00 0/1 0/0 0/0 .rodata @4105 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4105 = 30.0f; -COMPILER_STRIP_GATE(80D62C44, &lit_4105); +COMPILER_STRIP_GATE(0x80D62C44, &lit_4105); #pragma pop /* 80D62024-80D62978 000484 0954+00 1/1 0/0 0/1 .text @@ -378,7 +384,7 @@ asm cM3dGLin::~cM3dGLin() { /* ############################################################################################## */ /* 80D62C48-80D62C4C 000030 0004+00 1/1 0/0 0/0 .rodata @4167 */ SECTION_RODATA static f32 const lit_4167 = 0.5f; -COMPILER_STRIP_GATE(80D62C48, &lit_4167); +COMPILER_STRIP_GATE(0x80D62C48, &lit_4167); /* 80D629C0-80D62BA0 000E20 01E0+00 1/1 0/0 0/0 .text execute__13daTagSppath_cFv */ #pragma push @@ -416,9 +422,4 @@ asm cCcD_GStts::~cCcD_GStts() { } #pragma pop -/* 80D62C4C-80D62C54 000034 0008+00 1/1 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80D62C4C = "D_MN10A"; -#pragma pop +/* 80D62C4C-80D62C4C 000034 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/tag/d_a_tag_spring/d_a_tag_spring.cpp b/rel/d/a/tag/d_a_tag_spring/d_a_tag_spring.cpp index d1a678baa7d..dd0b1a74823 100644 --- a/rel/d/a/tag/d_a_tag_spring/d_a_tag_spring.cpp +++ b/rel/d/a/tag/d_a_tag_spring/d_a_tag_spring.cpp @@ -121,7 +121,7 @@ asm void daTagSpring_c::create() { /* ############################################################################################## */ /* 805A6E6C-805A6E70 000000 0004+00 2/2 0/0 0/0 .rodata @3728 */ SECTION_RODATA static f32 const lit_3728 = 1.0f; -COMPILER_STRIP_GATE(805A6E6C, &lit_3728); +COMPILER_STRIP_GATE(0x805A6E6C, &lit_3728); /* 805A6B5C-805A6C84 00017C 0128+00 1/1 0/0 0/0 .text execute__13daTagSpring_cFv */ #pragma push @@ -143,7 +143,7 @@ SECTION_RODATA static u8 const lit_3773[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(805A6E70, &lit_3773); +COMPILER_STRIP_GATE(0x805A6E70, &lit_3773); #pragma pop /* 805A6E74-805A6E7C 000008 0008+00 0/1 0/0 0/0 .rodata @3774 */ @@ -152,7 +152,7 @@ COMPILER_STRIP_GATE(805A6E70, &lit_3773); SECTION_RODATA static u8 const lit_3774[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(805A6E74, &lit_3774); +COMPILER_STRIP_GATE(0x805A6E74, &lit_3774); #pragma pop /* 805A6E7C-805A6E84 000010 0008+00 0/1 0/0 0/0 .rodata @3775 */ @@ -161,7 +161,7 @@ COMPILER_STRIP_GATE(805A6E74, &lit_3774); SECTION_RODATA static u8 const lit_3775[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(805A6E7C, &lit_3775); +COMPILER_STRIP_GATE(0x805A6E7C, &lit_3775); #pragma pop /* 805A6E84-805A6E8C 000018 0008+00 0/1 0/0 0/0 .rodata @3776 */ @@ -170,14 +170,14 @@ COMPILER_STRIP_GATE(805A6E7C, &lit_3775); SECTION_RODATA static u8 const lit_3776[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(805A6E84, &lit_3776); +COMPILER_STRIP_GATE(0x805A6E84, &lit_3776); #pragma pop /* 805A6E8C-805A6E90 000020 0004+00 0/1 0/0 0/0 .rodata @3777 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3777 = 1000.0f; -COMPILER_STRIP_GATE(805A6E8C, &lit_3777); +COMPILER_STRIP_GATE(0x805A6E8C, &lit_3777); #pragma pop /* 805A6C84-805A6DFC 0002A4 0178+00 1/1 0/0 0/0 .text checkArea__13daTagSpring_cFv */ diff --git a/rel/d/a/tag/d_a_tag_ss_drink/d_a_tag_ss_drink.cpp b/rel/d/a/tag/d_a_tag_ss_drink/d_a_tag_ss_drink.cpp index fd41be7ef0b..32f5f294e0c 100644 --- a/rel/d/a/tag/d_a_tag_ss_drink/d_a_tag_ss_drink.cpp +++ b/rel/d/a/tag/d_a_tag_ss_drink/d_a_tag_ss_drink.cpp @@ -288,27 +288,27 @@ asm void daTag_SSDrink_c::restart() { /* ############################################################################################## */ /* 80D637A0-80D637A4 000000 0004+00 2/2 0/0 0/0 .rodata @3843 */ SECTION_RODATA static f32 const lit_3843 = -30.0f; -COMPILER_STRIP_GATE(80D637A0, &lit_3843); +COMPILER_STRIP_GATE(0x80D637A0, &lit_3843); /* 80D637A4-80D637A8 000004 0004+00 0/1 0/0 0/0 .rodata @3844 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3844 = -15.0f; -COMPILER_STRIP_GATE(80D637A4, &lit_3844); +COMPILER_STRIP_GATE(0x80D637A4, &lit_3844); #pragma pop /* 80D637A8-80D637AC 000008 0004+00 0/1 0/0 0/0 .rodata @3845 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3845 = 30.0f; -COMPILER_STRIP_GATE(80D637A8, &lit_3845); +COMPILER_STRIP_GATE(0x80D637A8, &lit_3845); #pragma pop /* 80D637AC-80D637B0 00000C 0004+00 0/1 0/0 0/0 .rodata @3846 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3846 = 45.0f; -COMPILER_STRIP_GATE(80D637AC, &lit_3846); +COMPILER_STRIP_GATE(0x80D637AC, &lit_3846); #pragma pop /* 80D63044-80D630BC 000304 0078+00 1/1 0/0 0/0 .text initialize__15daTag_SSDrink_cFv */ @@ -326,7 +326,7 @@ asm void daTag_SSDrink_c::initialize() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daTag_SSDrink_c::checkProcess(int (daTag_SSDrink_c::*)(void*)) { +asm void daTag_SSDrink_c::checkProcess(int (daTag_SSDrink_c::*param_0)(void*)) { nofralloc #include "asm/rel/d/a/tag/d_a_tag_ss_drink/d_a_tag_ss_drink/checkProcess__15daTag_SSDrink_cFM15daTag_SSDrink_cFPCvPvPv_i.s" } @@ -337,7 +337,7 @@ asm void daTag_SSDrink_c::checkProcess(int (daTag_SSDrink_c::*)(void*)) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daTag_SSDrink_c::setProcess(int (daTag_SSDrink_c::*)(void*)) { +asm void daTag_SSDrink_c::setProcess(int (daTag_SSDrink_c::*param_0)(void*)) { nofralloc #include "asm/rel/d/a/tag/d_a_tag_ss_drink/d_a_tag_ss_drink/setProcess__15daTag_SSDrink_cFM15daTag_SSDrink_cFPCvPvPv_i.s" } @@ -366,7 +366,7 @@ asm void daTag_SSDrink_c::chkEvent() { /* ############################################################################################## */ /* 80D637B0-80D637B4 000010 0004+00 1/2 0/0 0/0 .rodata @3947 */ SECTION_RODATA static f32 const lit_3947 = 160.0f; -COMPILER_STRIP_GATE(80D637B0, &lit_3947); +COMPILER_STRIP_GATE(0x80D637B0, &lit_3947); /* 80D63384-80D63490 000644 010C+00 1/1 0/0 0/0 .text orderEvent__15daTag_SSDrink_cFv */ #pragma push @@ -383,14 +383,14 @@ asm void daTag_SSDrink_c::orderEvent() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3991 = 200.0f; -COMPILER_STRIP_GATE(80D637B4, &lit_3991); +COMPILER_STRIP_GATE(0x80D637B4, &lit_3991); #pragma pop /* 80D637B8-80D637BC 000018 0004+00 0/1 0/0 0/0 .rodata @3992 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3992 = 100.0f; -COMPILER_STRIP_GATE(80D637B8, &lit_3992); +COMPILER_STRIP_GATE(0x80D637B8, &lit_3992); #pragma pop /* 80D63490-80D635C8 000750 0138+00 2/0 0/0 0/0 .text wait__15daTag_SSDrink_cFPv */ diff --git a/rel/d/a/tag/d_a_tag_statue_evt/d_a_tag_statue_evt.cpp b/rel/d/a/tag/d_a_tag_statue_evt/d_a_tag_statue_evt.cpp index 0e42ec5c543..43dd06b7226 100644 --- a/rel/d/a/tag/d_a_tag_statue_evt/d_a_tag_statue_evt.cpp +++ b/rel/d/a/tag/d_a_tag_statue_evt/d_a_tag_statue_evt.cpp @@ -106,7 +106,6 @@ struct dPa_control_c { struct dEvt_control_c { /* 80042468 */ void reset(); - /* 800436EC */ void setPtI_Id(unsigned int); }; struct dEvent_manager_c { @@ -163,7 +162,7 @@ extern "C" static void daTagStatue_Draw__FP13daTagStatue_c(); extern "C" static void daTagStatue_Execute__FP13daTagStatue_c(); extern "C" static void daTagStatue_Delete__FP13daTagStatue_c(); extern "C" static void daTagStatue_Create__FP13daTagStatue_c(); -extern "C" void func_805A80E0(u8*); +extern "C" void func_805A80E0(void* _this, u8*); extern "C" extern char const* const d_a_tag_statue_evt__stringBase0; // @@ -271,11 +270,11 @@ asm void daTagStatue_c::initBaseMtx() { SECTION_RODATA static u8 const l_event_bit[12] = { 0x60, 0x80, 0x60, 0x40, 0x60, 0x20, 0x60, 0x10, 0x60, 0x08, 0x62, 0x04, }; -COMPILER_STRIP_GATE(805A8104, &l_event_bit); +COMPILER_STRIP_GATE(0x805A8104, &l_event_bit); /* 805A8110-805A8114 00000C 0004+00 4/4 0/0 0/0 .rodata @3690 */ SECTION_RODATA static f32 const lit_3690 = 1.0f; -COMPILER_STRIP_GATE(805A8110, &lit_3690); +COMPILER_STRIP_GATE(0x805A8110, &lit_3690); /* 805A7000-805A7068 000120 0068+00 2/2 0/0 0/0 .text setBaseMtx__13daTagStatue_cFv */ #pragma push @@ -300,19 +299,36 @@ SECTION_RODATA static u8 const lit_3756[4 + 4 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(805A8114, &lit_3756); +COMPILER_STRIP_GATE(0x805A8114, &lit_3756); /* 805A811C-805A8124 000018 0008+00 1/1 0/0 0/0 .rodata @3758 */ SECTION_RODATA static u8 const lit_3758[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(805A811C, &lit_3758); +COMPILER_STRIP_GATE(0x805A811C, &lit_3758); /* 805A8124-805A812C 000020 0008+00 1/1 0/0 0/0 .rodata @3759 */ SECTION_RODATA static u8 const lit_3759[8] = { 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(805A8124, &lit_3759); +COMPILER_STRIP_GATE(0x805A8124, &lit_3759); + +/* 805A8154-805A8154 000050 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_805A8154 = "Obj_cs_f"; +SECTION_DEAD static char const* const stringBase_805A815D = "SKY_LETTERS_00"; +SECTION_DEAD static char const* const stringBase_805A816C = "SKY_LETTERS_01"; +SECTION_DEAD static char const* const stringBase_805A817B = "SKY_LETTERS_02"; +SECTION_DEAD static char const* const stringBase_805A818A = "SKY_LETTERS_03"; +SECTION_DEAD static char const* const stringBase_805A8199 = "SKY_LETTERS_04"; +SECTION_DEAD static char const* const stringBase_805A81A8 = "SKY_LETTERS_05"; +SECTION_DEAD static char const* const stringBase_805A81B7 = "cs_ev_01"; +SECTION_DEAD static char const* const stringBase_805A81C0 = "cs_ev_02"; +SECTION_DEAD static char const* const stringBase_805A81C9 = "cs_ev_03"; +SECTION_DEAD static char const* const stringBase_805A81D2 = "cs_ev_04"; +SECTION_DEAD static char const* const stringBase_805A81DB = "cs_ev_05"; +#pragma pop /* 805A81FC-805A8208 000000 000C+00 3/3 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { @@ -391,6 +407,14 @@ asm void daTagStatue_c::Create() { #pragma pop /* ############################################################################################## */ +/* 805A8154-805A8154 000050 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_805A81E4 = "WAIT"; +SECTION_DEAD static char const* const stringBase_805A81E9 = "ST_MOVE"; +SECTION_DEAD static char const* const stringBase_805A81F1 = "ITEM"; +#pragma pop + /* 805A8270-805A827C -00001 000C+00 0/1 0/0 0/0 .data @3878 */ #pragma push #pragma force_active on @@ -547,7 +571,7 @@ SECTION_RODATA static f32 const lit_3894[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(805A812C, &lit_3894); +COMPILER_STRIP_GATE(0x805A812C, &lit_3894); /* 805A759C-805A76AC 0006BC 0110+00 1/1 0/0 0/0 .text event_proc_call__13daTagStatue_cFv */ @@ -596,6 +620,13 @@ void daTagStatue_c::actionDead() { /* empty function */ } +/* ############################################################################################## */ +/* 805A8154-805A8154 000050 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_805A81F6 = "Timer"; +#pragma pop + /* 805A784C-805A7A68 00096C 021C+00 2/2 0/0 0/0 .text demoProc__13daTagStatue_cFv */ #pragma push #pragma optimization_level 0 @@ -633,7 +664,7 @@ asm void daTagStatue_c::endParticle() { SECTION_RODATA static u8 const lit_4079[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(805A8134, &lit_4079); +COMPILER_STRIP_GATE(0x805A8134, &lit_4079); #pragma pop /* 805A813C-805A8144 000038 0008+00 0/2 0/0 0/0 .rodata @4080 */ @@ -642,7 +673,7 @@ COMPILER_STRIP_GATE(805A8134, &lit_4079); SECTION_RODATA static u8 const lit_4080[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(805A813C, &lit_4080); +COMPILER_STRIP_GATE(0x805A813C, &lit_4080); #pragma pop /* 805A8144-805A814C 000040 0008+00 0/2 0/0 0/0 .rodata @4081 */ @@ -651,14 +682,14 @@ COMPILER_STRIP_GATE(805A813C, &lit_4080); SECTION_RODATA static u8 const lit_4081[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(805A8144, &lit_4081); +COMPILER_STRIP_GATE(0x805A8144, &lit_4081); #pragma pop /* 805A814C-805A8150 000048 0004+00 0/1 0/0 0/0 .rodata @4082 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4082 = 100.0f; -COMPILER_STRIP_GATE(805A814C, &lit_4082); +COMPILER_STRIP_GATE(0x805A814C, &lit_4082); #pragma pop /* 805A7B78-805A7CD0 000C98 0158+00 1/1 0/0 0/0 .text checkStartDemo__13daTagStatue_cFv @@ -677,7 +708,7 @@ asm void daTagStatue_c::checkStartDemo() { #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4143 = 120.0f; -COMPILER_STRIP_GATE(805A8150, &lit_4143); +COMPILER_STRIP_GATE(0x805A8150, &lit_4143); #pragma pop /* 805A7CD0-805A7E94 000DF0 01C4+00 2/2 0/0 0/0 .text checkOnEffect__13daTagStatue_cFv */ @@ -766,30 +797,10 @@ static asm void daTagStatue_Create(daTagStatue_c* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_805A80E0(u8* param_0) { +extern "C" asm void func_805A80E0(void* _this, u8* param_0) { nofralloc #include "asm/rel/d/a/tag/d_a_tag_statue_evt/d_a_tag_statue_evt/func_805A80E0.s" } #pragma pop -/* 805A8154-805A81FC 000050 00A8+00 5/1 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_805A8154 = "Obj_cs_f"; -SECTION_DEAD static char const* const stringBase_805A815D = "SKY_LETTERS_00"; -SECTION_DEAD static char const* const stringBase_805A816C = "SKY_LETTERS_01"; -SECTION_DEAD static char const* const stringBase_805A817B = "SKY_LETTERS_02"; -SECTION_DEAD static char const* const stringBase_805A818A = "SKY_LETTERS_03"; -SECTION_DEAD static char const* const stringBase_805A8199 = "SKY_LETTERS_04"; -SECTION_DEAD static char const* const stringBase_805A81A8 = "SKY_LETTERS_05"; -SECTION_DEAD static char const* const stringBase_805A81B7 = "cs_ev_01"; -SECTION_DEAD static char const* const stringBase_805A81C0 = "cs_ev_02"; -SECTION_DEAD static char const* const stringBase_805A81C9 = "cs_ev_03"; -SECTION_DEAD static char const* const stringBase_805A81D2 = "cs_ev_04"; -SECTION_DEAD static char const* const stringBase_805A81DB = "cs_ev_05"; -SECTION_DEAD static char const* const stringBase_805A81E4 = "WAIT"; -SECTION_DEAD static char const* const stringBase_805A81E9 = "ST_MOVE"; -SECTION_DEAD static char const* const stringBase_805A81F1 = "ITEM"; -SECTION_DEAD static char const* const stringBase_805A81F6 = "Timer"; -#pragma pop +/* 805A8154-805A8154 000050 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/tag/d_a_tag_stream/d_a_tag_stream.cpp b/rel/d/a/tag/d_a_tag_stream/d_a_tag_stream.cpp index 82c613336dc..515f6ec8b36 100644 --- a/rel/d/a/tag/d_a_tag_stream/d_a_tag_stream.cpp +++ b/rel/d/a/tag/d_a_tag_stream/d_a_tag_stream.cpp @@ -66,7 +66,7 @@ extern "C" u8 m_top__13daTagStream_c[4]; /* ############################################################################################## */ /* 80D63BF0-80D63BF4 000000 0004+00 1/1 0/0 0/0 .rodata @3721 */ SECTION_RODATA static f32 const lit_3721 = 100.0f; -COMPILER_STRIP_GATE(80D63BF0, &lit_3721); +COMPILER_STRIP_GATE(0x80D63BF0, &lit_3721); /* 80D638F8-80D63A78 000078 0180+00 1/1 0/0 0/0 .text create__13daTagStream_cFv */ #pragma push diff --git a/rel/d/a/tag/d_a_tag_theB_hint/d_a_tag_theB_hint.cpp b/rel/d/a/tag/d_a_tag_theB_hint/d_a_tag_theB_hint.cpp index 916a26df3e5..2e9d61a832b 100644 --- a/rel/d/a/tag/d_a_tag_theB_hint/d_a_tag_theB_hint.cpp +++ b/rel/d/a/tag/d_a_tag_theB_hint/d_a_tag_theB_hint.cpp @@ -63,13 +63,13 @@ SECTION_RODATA static f32 const lit_3831[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80D63E54, &lit_3831); +COMPILER_STRIP_GATE(0x80D63E54, &lit_3831); /* 80D63E5C-80D63E64 000008 0008+00 1/1 0/0 0/0 .rodata @3832 */ SECTION_RODATA static u8 const lit_3832[8] = { 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D63E5C, &lit_3832); +COMPILER_STRIP_GATE(0x80D63E5C, &lit_3832); /* 80D63CD8-80D63D4C 000078 0074+00 1/0 0/0 0/0 .text daTagTheBHint_Create__FP10fopAc_ac_c */ #pragma push diff --git a/rel/d/a/tag/d_a_tag_wara_howl/d_a_tag_wara_howl.cpp b/rel/d/a/tag/d_a_tag_wara_howl/d_a_tag_wara_howl.cpp index f16d8fc409e..9e3058b28d4 100644 --- a/rel/d/a/tag/d_a_tag_wara_howl/d_a_tag_wara_howl.cpp +++ b/rel/d/a/tag/d_a_tag_wara_howl/d_a_tag_wara_howl.cpp @@ -143,7 +143,7 @@ asm void daTagWrHowl_c::execute() { /* ############################################################################################## */ /* 80D64200-80D64204 000000 0004+00 1/1 0/0 0/0 .rodata @3680 */ SECTION_RODATA static f32 const lit_3680 = 50.0f; -COMPILER_STRIP_GATE(80D64200, &lit_3680); +COMPILER_STRIP_GATE(0x80D64200, &lit_3680); /* 80D64090-80D640B4 0001D0 0024+00 1/1 0/0 0/0 .text init__13daTagWrHowl_cFv */ #pragma push diff --git a/rel/d/a/tag/d_a_tag_waterfall/d_a_tag_waterfall.cpp b/rel/d/a/tag/d_a_tag_waterfall/d_a_tag_waterfall.cpp index e58f116597b..0769851d332 100644 --- a/rel/d/a/tag/d_a_tag_waterfall/d_a_tag_waterfall.cpp +++ b/rel/d/a/tag/d_a_tag_waterfall/d_a_tag_waterfall.cpp @@ -93,20 +93,20 @@ SECTION_RODATA static u8 const lit_3758[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D64D74, &lit_3758); +COMPILER_STRIP_GATE(0x80D64D74, &lit_3758); /* 80D64D78-80D64D7C 000004 0004+00 0/1 0/0 0/0 .rodata @3759 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3759 = 10000.0f; -COMPILER_STRIP_GATE(80D64D78, &lit_3759); +COMPILER_STRIP_GATE(0x80D64D78, &lit_3759); #pragma pop /* 80D64D7C-80D64D80 000008 0004+00 0/1 0/0 0/0 .rodata @3760 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3760 = 3.0f; -COMPILER_STRIP_GATE(80D64D7C, &lit_3760); +COMPILER_STRIP_GATE(0x80D64D7C, &lit_3760); #pragma pop /* 80D64D94-80D64D98 000000 0004+00 2/2 0/0 0/0 .data m_master_id */ @@ -179,7 +179,7 @@ static asm void s_waterfall(void* param_0, void* param_1) { /* ############################################################################################## */ /* 80D64D80-80D64D84 00000C 0004+00 2/2 0/0 0/0 .rodata @3803 */ SECTION_RODATA static f32 const lit_3803 = 1.0f; -COMPILER_STRIP_GATE(80D64D80, &lit_3803); +COMPILER_STRIP_GATE(0x80D64D80, &lit_3803); /* 80D64724-80D64768 0001E4 0044+00 1/1 0/0 0/0 .text getEllipseY__16daTagWaterFall_cFf */ @@ -277,13 +277,13 @@ static asm void daTagWaterFall_Delete(daTagWaterFall_c* param_0) { SECTION_RODATA static u8 const lit_3959[8] = { 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D64D84, &lit_3959); +COMPILER_STRIP_GATE(0x80D64D84, &lit_3959); /* 80D64D8C-80D64D94 000018 0008+00 1/1 0/0 0/0 .rodata @3960 */ SECTION_RODATA static u8 const lit_3960[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D64D8C, &lit_3960); +COMPILER_STRIP_GATE(0x80D64D8C, &lit_3960); /* 80D64B20-80D64CBC 0005E0 019C+00 1/1 0/0 0/0 .text create__16daTagWaterFall_cFv */ #pragma push @@ -328,5 +328,5 @@ asm void __sinit_d_a_tag_waterfall_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80D64D24 = (void*)__sinit_d_a_tag_waterfall_cpp; +REGISTER_CTORS(0x80D64D24, __sinit_d_a_tag_waterfall_cpp); #pragma pop diff --git a/rel/d/a/tag/d_a_tag_wljump/d_a_tag_wljump.cpp b/rel/d/a/tag/d_a_tag_wljump/d_a_tag_wljump.cpp index 346e558d595..e2c6f35225a 100644 --- a/rel/d/a/tag/d_a_tag_wljump/d_a_tag_wljump.cpp +++ b/rel/d/a/tag/d_a_tag_wljump/d_a_tag_wljump.cpp @@ -55,10 +55,10 @@ struct dAttHint_c { /* 800738FC */ void request(fopAc_ac_c*, int); }; -struct Vec {}; - struct JAISoundID {}; +struct Vec {}; + struct Z2SeMgr { /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); }; @@ -158,13 +158,13 @@ static asm void daTagWljump_Delete(daTagWljump_c* param_0) { /* ############################################################################################## */ /* 80D658CC-80D658D0 000000 0004+00 1/1 0/0 0/0 .rodata @4044 */ SECTION_RODATA static f32 const lit_4044 = 1.0f; -COMPILER_STRIP_GATE(80D658CC, &lit_4044); +COMPILER_STRIP_GATE(0x80D658CC, &lit_4044); /* 80D658D0-80D658D4 000004 0004+00 0/1 0/0 0/0 .rodata @4045 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4045 = -1.0f; -COMPILER_STRIP_GATE(80D658D0, &lit_4045); +COMPILER_STRIP_GATE(0x80D658D0, &lit_4045); #pragma pop /* 80D658D4-80D658DC 000008 0004+04 0/1 0/0 0/0 .rodata @4046 */ @@ -181,7 +181,7 @@ SECTION_RODATA static u8 const lit_4046[4 + 4 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D658D4, &lit_4046); +COMPILER_STRIP_GATE(0x80D658D4, &lit_4046); #pragma pop /* 80D658DC-80D658E4 000010 0008+00 0/1 0/0 0/0 .rodata @4047 */ @@ -190,7 +190,7 @@ COMPILER_STRIP_GATE(80D658D4, &lit_4046); SECTION_RODATA static u8 const lit_4047[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D658DC, &lit_4047); +COMPILER_STRIP_GATE(0x80D658DC, &lit_4047); #pragma pop /* 80D658E4-80D658EC 000018 0008+00 0/1 0/0 0/0 .rodata @4048 */ @@ -199,7 +199,7 @@ COMPILER_STRIP_GATE(80D658DC, &lit_4047); SECTION_RODATA static u8 const lit_4048[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D658E4, &lit_4048); +COMPILER_STRIP_GATE(0x80D658E4, &lit_4048); #pragma pop /* 80D658EC-80D658F4 000020 0008+00 0/1 0/0 0/0 .rodata @4049 */ @@ -208,21 +208,21 @@ COMPILER_STRIP_GATE(80D658E4, &lit_4048); SECTION_RODATA static u8 const lit_4049[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D658EC, &lit_4049); +COMPILER_STRIP_GATE(0x80D658EC, &lit_4049); #pragma pop /* 80D658F4-80D658F8 000028 0004+00 0/1 0/0 0/0 .rodata @4050 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4050 = 5.0f; -COMPILER_STRIP_GATE(80D658F4, &lit_4050); +COMPILER_STRIP_GATE(0x80D658F4, &lit_4050); #pragma pop /* 80D658F8-80D658FC 00002C 0004+00 0/1 0/0 0/0 .rodata @4051 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_4051 = 10.0f; -COMPILER_STRIP_GATE(80D658F8, &lit_4051); +COMPILER_STRIP_GATE(0x80D658F8, &lit_4051); #pragma pop /* 80D658FC-80D65904 000030 0004+04 0/1 0/0 0/0 .rodata @4052 */ @@ -233,7 +233,7 @@ SECTION_RODATA static f32 const lit_4052[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80D658FC, &lit_4052); +COMPILER_STRIP_GATE(0x80D658FC, &lit_4052); #pragma pop /* 80D65904-80D6590C 000038 0008+00 0/1 0/0 0/0 .rodata @4054 */ @@ -242,7 +242,7 @@ COMPILER_STRIP_GATE(80D658FC, &lit_4052); SECTION_RODATA static u8 const lit_4054[8] = { 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D65904, &lit_4054); +COMPILER_STRIP_GATE(0x80D65904, &lit_4054); #pragma pop /* 80D6590C-80D65914 000040 0008+00 0/1 0/0 0/0 .rodata @4055 */ @@ -251,7 +251,7 @@ COMPILER_STRIP_GATE(80D65904, &lit_4054); SECTION_RODATA static u8 const lit_4055[8] = { 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D6590C, &lit_4055); +COMPILER_STRIP_GATE(0x80D6590C, &lit_4055); #pragma pop /* 80D65090-80D6587C 000250 07EC+00 1/1 0/0 0/0 .text execute__13daTagWljump_cFv */ diff --git a/rel/d/a/tag/d_a_tag_yami/d_a_tag_yami.cpp b/rel/d/a/tag/d_a_tag_yami/d_a_tag_yami.cpp index 1ee14953c49..2aaa5c14c27 100644 --- a/rel/d/a/tag/d_a_tag_yami/d_a_tag_yami.cpp +++ b/rel/d/a/tag/d_a_tag_yami/d_a_tag_yami.cpp @@ -161,20 +161,20 @@ SECTION_RODATA static u8 const l_sph_src[68] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D66210, &l_sph_src); +COMPILER_STRIP_GATE(0x80D66210, &l_sph_src); /* 80D66254-80D66258 000044 0004+00 0/1 0/0 0/0 .rodata @3726 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3726 = 700.0f; -COMPILER_STRIP_GATE(80D66254, &lit_3726); +COMPILER_STRIP_GATE(0x80D66254, &lit_3726); #pragma pop /* 80D66258-80D6625C 000048 0004+00 0/1 0/0 0/0 .rodata @3727 */ #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_3727 = 300.0f; -COMPILER_STRIP_GATE(80D66258, &lit_3727); +COMPILER_STRIP_GATE(0x80D66258, &lit_3727); #pragma pop /* 80D66280-80D662A0 -00001 0020+00 1/0 0/0 0/0 .data l_daTagYami_Method */ @@ -255,7 +255,7 @@ SECTION_RODATA static u8 const lit_3820[4] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D6625C, &lit_3820); +COMPILER_STRIP_GATE(0x80D6625C, &lit_3820); /* 80D66260-80D66268 000050 0004+04 1/1 0/0 0/0 .rodata @3821 */ SECTION_RODATA static f32 const lit_3821[1 + 1 /* padding */] = { @@ -263,7 +263,7 @@ SECTION_RODATA static f32 const lit_3821[1 + 1 /* padding */] = { /* padding */ 0.0f, }; -COMPILER_STRIP_GATE(80D66260, &lit_3821); +COMPILER_STRIP_GATE(0x80D66260, &lit_3821); /* 80D65C60-80D65D08 0002E0 00A8+00 1/1 0/0 0/0 .text calcCoC__11daTagYami_cFR4cXyz */ #pragma push @@ -297,7 +297,7 @@ asm void daTagYami_c::chk_CoHit() { SECTION_RODATA static u8 const lit_3889[8] = { 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D66268, &lit_3889); +COMPILER_STRIP_GATE(0x80D66268, &lit_3889); #pragma pop /* 80D66270-80D66278 000060 0008+00 0/1 0/0 0/0 .rodata @3890 */ @@ -306,7 +306,7 @@ COMPILER_STRIP_GATE(80D66268, &lit_3889); SECTION_RODATA static u8 const lit_3890[8] = { 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D66270, &lit_3890); +COMPILER_STRIP_GATE(0x80D66270, &lit_3890); #pragma pop /* 80D66278-80D66280 000068 0008+00 0/1 0/0 0/0 .rodata @3891 */ @@ -315,7 +315,7 @@ COMPILER_STRIP_GATE(80D66270, &lit_3890); SECTION_RODATA static u8 const lit_3891[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80D66278, &lit_3891); +COMPILER_STRIP_GATE(0x80D66278, &lit_3891); #pragma pop /* 80D65D60-80D65EEC 0003E0 018C+00 1/1 0/0 0/0 .text getPlDist__11daTagYami_cFv */ diff --git a/src/DynamicLink.cpp b/src/DynamicLink.cpp index c6578eb245a..bee87c9b98e 100644 --- a/src/DynamicLink.cpp +++ b/src/DynamicLink.cpp @@ -179,6 +179,52 @@ extern "C" void snprintf(); // /* ############################################################################################## */ +/* 8039A4A0-8039A4A0 026B00 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8039A4A0 = + "%08x DynamicModuleControlBase::unlink() mLinkCou" + "nt id already zero.\n"; +SECTION_DEAD static char const* const stringBase_8039A4E5 = "\nDynamicModuleControlBase::dump()\n"; +SECTION_DEAD static char const* const stringBase_8039A508 = "Do Lnk Size Name\n"; +SECTION_DEAD static char const* const stringBase_8039A520 = "(Null)"; +SECTION_DEAD static char const* const stringBase_8039A527 = "%3d%3d%5.1f %05x %-4s %-24s "; +SECTION_DEAD static char const* const stringBase_8039A544 = "%3d%3d ???? ????? %-4s %-24s "; +SECTION_DEAD static char const* const stringBase_8039A562 = "\n"; +SECTION_DEAD static char const* const stringBase_8039A564 = "TotalSize %6.2f %06x\n\n"; +SECTION_DEAD static char const* const stringBase_8039A57B = "Base"; +SECTION_DEAD static char const* const stringBase_8039A580 = "/rel/Final/Release"; +SECTION_DEAD static char const* const stringBase_8039A593 = "RELS.arc"; +SECTION_DEAD static char const* const stringBase_8039A59C = + "マウント失敗ですが単にアーカイブを作ってないだけなら遅いだけです %s\n"; +SECTION_DEAD static char const* const stringBase_8039A5E1 = "%s.rel"; +SECTION_DEAD static char const* const stringBase_8039A5E8 = "/rel/Final/Release/%s.rel"; +// MWCC ignores mapping of some japanese characters using the +// byte 0x5C (ASCII '\'). This is why this string is hex-encoded. +SECTION_DEAD static char const* const stringBase_8039A602 = + "\x44\x79\x6E\x61\x6D\x69\x63\x4D\x6F\x64\x75\x6C\x65\x43\x6F\x6E\x74\x72\x6F\x6C\x3A\x3A\x64" + "\x6F\x5F\x6C\x6F\x61\x64\x28\x29\x20\x83\x8A\x83\x5C\x81\x5B\x83\x58\x93\xC7\x82\xDD\x8D\x9E" + "\x82\xDD" + "\x8E\xB8\x94\x73\x20\x5B\x25\x73\x5D\x0A"; +SECTION_DEAD static char const* const stringBase_8039A63D = + "DynamicModuleControl::do_load() チェックサムエラー %04x %" + "04x[%s]\n"; +SECTION_DEAD static char const* const stringBase_8039A67F = + "DynamicModuleControl::do_load_async() 非同期読み込みコール" + "バック登録失敗 [%s]\n"; +SECTION_DEAD static char const* const stringBase_8039A6CE = "%08x-%08x %08x %08x"; +SECTION_DEAD static char const* const stringBase_8039A6E2 = "BSSメモリ確保失敗\n"; +SECTION_DEAD static char const* const stringBase_8039A6F5 = "リンク失敗\n"; +SECTION_DEAD static char const* const stringBase_8039A701 = "モジュールリサイズ(縮小)失敗\n"; +SECTION_DEAD static char const* const stringBase_8039A71F = "BSSメモリ確保失敗 [%x]\n"; +SECTION_DEAD static char const* const stringBase_8039A737 = + "アンリンク失敗 mModule=%08x mBss=%08x\n"; +SECTION_DEAD static char const* const stringBase_8039A75E = "????"; +SECTION_DEAD static char const* const stringBase_8039A763 = "MEM"; +SECTION_DEAD static char const* const stringBase_8039A767 = "ARAM"; +SECTION_DEAD static char const* const stringBase_8039A76C = "DVD"; +#pragma pop + /* 803C34B0-803C34C0 -00001 0010+00 1/1 0/0 0/0 .data strings$4165 */ SECTION_DATA static void* strings[4] = { (void*)(((char*)&DynamicLink__stringBase0) + 0x2BE), @@ -473,6 +519,18 @@ void ModuleEpilog() { /* empty function */ } +/* ############################################################################################## */ +/* 8039A4A0-8039A4A0 026B00 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8039A770 = + "\nError: リンクされていない関数が呼び出されました.\n"; +SECTION_DEAD static char const* const stringBase_8039A7A3 = "Address: Back Chain LR Save\n"; +SECTION_DEAD static char const* const stringBase_8039A7C8 = "0x%08x: 0x%08x 0x%08x\n"; +/* @stringBase0 padding */ +SECTION_DEAD static char const* const pad_8039A7E4 = "\0\0\0"; +#pragma pop + /* 80263090-8026314C 25D9D0 00BC+00 0/0 0/0 757/757 .text ModuleUnresolved */ #pragma push #pragma optimization_level 0 @@ -562,55 +620,4 @@ asm void DynamicModuleControl::getModuleName() const { } #pragma pop -/* 8039A4A0-8039A7E8 026B00 0344+04 11/10 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_8039A4A0 = - "%08x DynamicModuleControlBase::unlink() mLinkCou" - "nt id already zero.\n"; -SECTION_DEAD static char const* const stringBase_8039A4E5 = "\nDynamicModuleControlBase::dump()\n"; -SECTION_DEAD static char const* const stringBase_8039A508 = "Do Lnk Size Name\n"; -SECTION_DEAD static char const* const stringBase_8039A520 = "(Null)"; -SECTION_DEAD static char const* const stringBase_8039A527 = "%3d%3d%5.1f %05x %-4s %-24s "; -SECTION_DEAD static char const* const stringBase_8039A544 = "%3d%3d ???? ????? %-4s %-24s "; -SECTION_DEAD static char const* const stringBase_8039A562 = "\n"; -SECTION_DEAD static char const* const stringBase_8039A564 = "TotalSize %6.2f %06x\n\n"; -SECTION_DEAD static char const* const stringBase_8039A57B = "Base"; -SECTION_DEAD static char const* const stringBase_8039A580 = "/rel/Final/Release"; -SECTION_DEAD static char const* const stringBase_8039A593 = "RELS.arc"; -SECTION_DEAD static char const* const stringBase_8039A59C = - "マウント失敗ですが単にアーカイブを作ってないだけなら遅いだけです %s\n"; -SECTION_DEAD static char const* const stringBase_8039A5E1 = "%s.rel"; -SECTION_DEAD static char const* const stringBase_8039A5E8 = "/rel/Final/Release/%s.rel"; -// MWCC ignores mapping of some japanese characters using the -// byte 0x5C (ASCII '\'). This is why this string is hex-encoded. -SECTION_DEAD static char const* const stringBase_8039A602 = - "\x44\x79\x6E\x61\x6D\x69\x63\x4D\x6F\x64\x75\x6C\x65\x43\x6F\x6E\x74\x72\x6F\x6C\x3A\x3A\x64" - "\x6F\x5F\x6C\x6F\x61\x64\x28\x29\x20\x83\x8A\x83\x5C\x81\x5B\x83\x58\x93\xC7\x82\xDD\x8D\x9E" - "\x82\xDD" - "\x8E\xB8\x94\x73\x20\x5B\x25\x73\x5D\x0A"; -SECTION_DEAD static char const* const stringBase_8039A63D = - "DynamicModuleControl::do_load() チェックサムエラー %04x %" - "04x[%s]\n"; -SECTION_DEAD static char const* const stringBase_8039A67F = - "DynamicModuleControl::do_load_async() 非同期読み込みコール" - "バック登録失敗 [%s]\n"; -SECTION_DEAD static char const* const stringBase_8039A6CE = "%08x-%08x %08x %08x"; -SECTION_DEAD static char const* const stringBase_8039A6E2 = "BSSメモリ確保失敗\n"; -SECTION_DEAD static char const* const stringBase_8039A6F5 = "リンク失敗\n"; -SECTION_DEAD static char const* const stringBase_8039A701 = "モジュールリサイズ(縮小)失敗\n"; -SECTION_DEAD static char const* const stringBase_8039A71F = "BSSメモリ確保失敗 [%x]\n"; -SECTION_DEAD static char const* const stringBase_8039A737 = - "アンリンク失敗 mModule=%08x mBss=%08x\n"; -SECTION_DEAD static char const* const stringBase_8039A75E = "????"; -SECTION_DEAD static char const* const stringBase_8039A763 = "MEM"; -SECTION_DEAD static char const* const stringBase_8039A767 = "ARAM"; -SECTION_DEAD static char const* const stringBase_8039A76C = "DVD"; -SECTION_DEAD static char const* const stringBase_8039A770 = - "\nError: リンクされていない関数が呼び出されました.\n"; -SECTION_DEAD static char const* const stringBase_8039A7A3 = "Address: Back Chain LR Save\n"; -SECTION_DEAD static char const* const stringBase_8039A7C8 = "0x%08x: 0x%08x 0x%08x\n"; -/* @stringBase0 padding */ -SECTION_DEAD static char const* const pad_8039A7E4 = "\0\0\0"; -#pragma pop +/* 8039A4A0-8039A4A0 026B00 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/a/npc/d_a_npc_cd.cpp b/src/a/npc/d_a_npc_cd.cpp index 6010351b7dc..0f4e36b6cfb 100644 --- a/src/a/npc/d_a_npc_cd.cpp +++ b/src/a/npc/d_a_npc_cd.cpp @@ -24,16 +24,16 @@ struct mDoHIO_entry_c { /* 8015791C */ ~mDoHIO_entry_c(); }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; - struct J3DAnmTransform {}; +struct J3DModelData {}; + +struct Z2Creature {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -52,12 +52,12 @@ struct daPy_py_c { /* 8015F424 */ void checkNowWolfEyeUp(); }; +struct J3DModel {}; + struct J3DJoint {}; struct J3DAnmTransformKey {}; -struct J3DModel {}; - struct daNpcCd_c { /* 8015605C */ void NpcCreate(int); /* 801561E8 */ void ObjCreate(int); @@ -114,10 +114,10 @@ struct dRes_control_c { struct dPa_levelEcallBack {}; -struct _GXColor {}; - struct csXyz {}; +struct _GXColor {}; + struct dPa_control_c { struct level_c { /* 8004B918 */ void getEmitter(u32); @@ -209,7 +209,7 @@ extern "C" void set__13dPa_control_cFUlUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf(); extern "C" void GetPolyColor__4dBgSFRC13cBgS_PolyInfo(); extern "C" void GetRoomId__4dBgSFRC13cBgS_PolyInfo(); -extern "C" void func_8014D348(int*); +extern "C" void func_8014D348(void* _this, int*); extern "C" void checkNowWolfEyeUp__9daPy_py_cFv(); extern "C" void settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c(); extern "C" void setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c(); @@ -253,6 +253,204 @@ static asm void jntNodeCallBack(J3DJoint* param_0, int param_1) { #pragma pop /* ############################################################################################## */ +/* 80392FE8-80392FF0 01F648 0008+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80392FE8; + +/* 80392FF0-80392FFA 01F650 000A+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80392FF0; + +/* 80392FFA-80393004 01F65A 000A+00 17/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80392FFA; + +/* 80393004-8039300E 01F664 000A+00 17/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80393004; + +/* 8039300E-80393017 01F66E 0009+00 31/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_8039300E; + +/* 80393017-80393021 01F677 000A+00 31/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80393017; + +/* 80393021-80393029 01F681 0008+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80393021; + +/* 80393029-80393033 01F689 000A+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80393029; + +/* 80393033-8039303B 01F693 0008+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80393033; + +/* 8039303B-80393045 01F69B 000A+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_8039303B; + +/* 80393045-8039304D 01F6A5 0008+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80393045; + +/* 8039304D-80393057 01F6AD 000A+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_8039304D; + +/* 80393057-8039305F 01F6B7 0008+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80393057; + +/* 8039305F-80393069 01F6BF 000A+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_8039305F; + +/* 80393069-80393071 01F6C9 0008+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80393069; + +/* 80393071-8039307B 01F6D1 000A+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80393071; + +/* 8039307B-80393083 01F6DB 0008+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_8039307B; + +/* 80393083-8039308D 01F6E3 000A+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80393083; + +/* 8039308D-80393095 01F6ED 0008+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_8039308D; + +/* 80393095-8039309F 01F6F5 000A+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80393095; + +/* 8039309F-803930A8 01F6FF 0009+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_8039309F; + +/* 803930A8-803930B2 01F708 000A+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803930A8; + +/* 803930B2-803930BB 01F712 0009+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803930B2; + +/* 803930BB-803930C5 01F71B 000A+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803930BB; + +/* 803930C5-803930CE 01F725 0009+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803930C5; + +/* 803930CE-803930D8 01F72E 000A+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803930CE; + +/* 803930D8-803930E1 01F738 0009+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803930D8; + +/* 803930E1-803930EB 01F741 000A+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803930E1; + +/* 803930EB-803930F4 01F74B 0009+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803930EB; + +/* 803930F4-803930FE 01F754 000A+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803930F4; + +/* 803930FE-80393107 01F75E 0009+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803930FE; + +/* 80393107-80393111 01F767 000A+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80393107; + +/* 80393111-8039311A 01F771 0009+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80393111; + +/* 8039311A-80393124 01F77A 000A+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_8039311A; + +/* 80393124-8039312D 01F784 0009+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80393124; + +/* 8039312D-80393137 01F78D 000A+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_8039312D; + +/* 80393137-8039313F 01F797 0008+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80393137; + +/* 8039313F-80393149 01F79F 000A+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_8039313F; + +/* 80393149-80393153 01F7A9 000A+00 15/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80393149; + +/* 80393153-8039315D 01F7B3 000A+00 15/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80393153; + +/* 8039315D-80393165 01F7BD 0008+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_8039315D; + +/* 80393165-8039316F 01F7C5 000A+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80393165; + +/* 8039316F-80393177 01F7CF 0008+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_8039316F; + +/* 80393177-80393181 01F7D7 000A+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80393177; + +/* 80393181-80393189 01F7E1 0008+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80393181; + +/* 80393189-80393193 01F7E9 000A+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80393189; + +/* 80393193-8039319B 01F7F3 0008+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80393193; + +/* 8039319B-803931A5 01F7FB 000A+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_8039319B; + +/* 803931A5-803931AD 01F805 0008+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803931A5; + +/* 803931AD-803931B7 01F80D 000A+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803931AD; + +/* 803931B7-803931BF 01F817 0008+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803931B7; + +/* 803931BF-803931C9 01F81F 000A+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803931BF; + +/* 803931C9-803931D2 01F829 0009+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803931C9; + +/* 803931D2-803931DC 01F832 000A+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803931D2; + +/* 803931DC-803931E5 01F83C 0009+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803931DC; + +/* 803931E5-803931EF 01F845 000A+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803931E5; + +/* 803931EF-803931F8 01F84F 0009+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803931EF; + +/* 803931F8-80393202 01F858 000A+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803931F8; + +/* 80393202-8039320B 01F862 0009+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80393202; + +/* 8039320B-80393215 01F86B 000A+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_8039320B; + +/* 80393215-8039321E 01F875 0009+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80393215; + +/* 8039321E-80393228 01F87E 000A+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_8039321E; + +/* 80393228-80393231 01F888 0009+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80393228; + +/* 80393231-8039323B 01F891 000A+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80393231; + +/* 8039323B-80393244 01F89B 0009+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_8039323B; + +/* 80393244-80393250 01F8A4 000A+02 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80393244; + /* 80392A18-80392A30 -00001 0018+00 2/1 0/0 0/0 .rodata l_resMANa */ SECTION_RODATA static void* const l_resMANa[6] = { (void*)&a_npc_d_a_npc_cd__stringBase0, @@ -262,7 +460,7 @@ SECTION_RODATA static void* const l_resMANa[6] = { (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x26), (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x2F), }; -COMPILER_STRIP_GATE(80392A18, &l_resMANa); +COMPILER_STRIP_GATE(0x80392A18, &l_resMANa); /* 80392A30-80392A48 -00001 0018+00 1/1 0/0 0/0 .rodata l_resMADa */ SECTION_RODATA static void* const l_resMADa[6] = { @@ -273,7 +471,7 @@ SECTION_RODATA static void* const l_resMADa[6] = { (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x26), (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x2F), }; -COMPILER_STRIP_GATE(80392A30, &l_resMADa); +COMPILER_STRIP_GATE(0x80392A30, &l_resMADa); /* 80392A48-80392A60 -00001 0018+00 1/1 0/0 0/0 .rodata l_resMCNa */ SECTION_RODATA static void* const l_resMCNa[6] = { @@ -284,7 +482,7 @@ SECTION_RODATA static void* const l_resMCNa[6] = { (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x26), (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x2F), }; -COMPILER_STRIP_GATE(80392A48, &l_resMCNa); +COMPILER_STRIP_GATE(0x80392A48, &l_resMCNa); /* 80392A60-80392A78 -00001 0018+00 1/1 0/0 0/0 .rodata l_resMONa */ SECTION_RODATA static void* const l_resMONa[6] = { @@ -295,7 +493,7 @@ SECTION_RODATA static void* const l_resMONa[6] = { (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x26), (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x2F), }; -COMPILER_STRIP_GATE(80392A60, &l_resMONa); +COMPILER_STRIP_GATE(0x80392A60, &l_resMONa); /* 80392A78-80392A90 -00001 0018+00 1/1 0/0 0/0 .rodata l_resMANb */ SECTION_RODATA static void* const l_resMANb[6] = { @@ -306,7 +504,7 @@ SECTION_RODATA static void* const l_resMANb[6] = { (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x26), (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x2F), }; -COMPILER_STRIP_GATE(80392A78, &l_resMANb); +COMPILER_STRIP_GATE(0x80392A78, &l_resMANb); /* 80392A90-80392AA8 -00001 0018+00 1/1 0/0 0/0 .rodata l_resMANc */ SECTION_RODATA static void* const l_resMANc[6] = { @@ -317,7 +515,7 @@ SECTION_RODATA static void* const l_resMANc[6] = { (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x26), (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x2F), }; -COMPILER_STRIP_GATE(80392A90, &l_resMANc); +COMPILER_STRIP_GATE(0x80392A90, &l_resMANc); /* 80392AA8-80392AC0 -00001 0018+00 1/1 0/0 0/0 .rodata l_resMASa */ SECTION_RODATA static void* const l_resMASa[6] = { @@ -328,7 +526,7 @@ SECTION_RODATA static void* const l_resMASa[6] = { (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x26), (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x2F), }; -COMPILER_STRIP_GATE(80392AA8, &l_resMASa); +COMPILER_STRIP_GATE(0x80392AA8, &l_resMASa); /* 80392AC0-80392AD8 -00001 0018+00 1/1 0/0 0/0 .rodata l_resMBNa */ SECTION_RODATA static void* const l_resMBNa[6] = { @@ -339,7 +537,7 @@ SECTION_RODATA static void* const l_resMBNa[6] = { (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x26), (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x2F), }; -COMPILER_STRIP_GATE(80392AC0, &l_resMBNa); +COMPILER_STRIP_GATE(0x80392AC0, &l_resMBNa); /* 80392AD8-80392AF0 -00001 0018+00 1/1 0/0 0/0 .rodata l_resMANa2 */ SECTION_RODATA static void* const l_resMANa2[6] = { @@ -350,7 +548,7 @@ SECTION_RODATA static void* const l_resMANa2[6] = { (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x26), (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x2F), }; -COMPILER_STRIP_GATE(80392AD8, &l_resMANa2); +COMPILER_STRIP_GATE(0x80392AD8, &l_resMANa2); /* 80392AF0-80392B08 -00001 0018+00 1/1 0/0 0/0 .rodata l_resMADa2 */ SECTION_RODATA static void* const l_resMADa2[6] = { @@ -361,7 +559,7 @@ SECTION_RODATA static void* const l_resMADa2[6] = { (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x26), (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x2F), }; -COMPILER_STRIP_GATE(80392AF0, &l_resMADa2); +COMPILER_STRIP_GATE(0x80392AF0, &l_resMADa2); /* 80392B08-80392B20 -00001 0018+00 1/1 0/0 0/0 .rodata l_resMCNa2 */ SECTION_RODATA static void* const l_resMCNa2[6] = { @@ -372,7 +570,7 @@ SECTION_RODATA static void* const l_resMCNa2[6] = { (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x26), (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x2F), }; -COMPILER_STRIP_GATE(80392B08, &l_resMCNa2); +COMPILER_STRIP_GATE(0x80392B08, &l_resMCNa2); /* 80392B20-80392B38 -00001 0018+00 1/1 0/0 0/0 .rodata l_resMONa2 */ SECTION_RODATA static void* const l_resMONa2[6] = { @@ -383,7 +581,7 @@ SECTION_RODATA static void* const l_resMONa2[6] = { (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x26), (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x2F), }; -COMPILER_STRIP_GATE(80392B20, &l_resMONa2); +COMPILER_STRIP_GATE(0x80392B20, &l_resMONa2); /* 80392B38-80392B50 -00001 0018+00 1/1 0/0 0/0 .rodata l_resMANb2 */ SECTION_RODATA static void* const l_resMANb2[6] = { @@ -394,7 +592,7 @@ SECTION_RODATA static void* const l_resMANb2[6] = { (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x26), (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x2F), }; -COMPILER_STRIP_GATE(80392B38, &l_resMANb2); +COMPILER_STRIP_GATE(0x80392B38, &l_resMANb2); /* 80392B50-80392B68 -00001 0018+00 1/1 0/0 0/0 .rodata l_resMANc2 */ SECTION_RODATA static void* const l_resMANc2[6] = { @@ -405,7 +603,7 @@ SECTION_RODATA static void* const l_resMANc2[6] = { (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x26), (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x2F), }; -COMPILER_STRIP_GATE(80392B50, &l_resMANc2); +COMPILER_STRIP_GATE(0x80392B50, &l_resMANc2); /* 80392B68-80392B80 -00001 0018+00 1/1 0/0 0/0 .rodata l_resMASa2 */ SECTION_RODATA static void* const l_resMASa2[6] = { @@ -416,7 +614,7 @@ SECTION_RODATA static void* const l_resMASa2[6] = { (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x26), (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x2F), }; -COMPILER_STRIP_GATE(80392B68, &l_resMASa2); +COMPILER_STRIP_GATE(0x80392B68, &l_resMASa2); /* 80392B80-80392B98 -00001 0018+00 1/1 0/0 0/0 .rodata l_resMBNa2 */ SECTION_RODATA static void* const l_resMBNa2[6] = { @@ -427,7 +625,7 @@ SECTION_RODATA static void* const l_resMBNa2[6] = { (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x26), (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x2F), }; -COMPILER_STRIP_GATE(80392B80, &l_resMBNa2); +COMPILER_STRIP_GATE(0x80392B80, &l_resMBNa2); /* 80392B98-80392BB0 -00001 0018+00 1/1 0/0 0/0 .rodata l_resWANa */ SECTION_RODATA static void* const l_resWANa[6] = { @@ -438,7 +636,7 @@ SECTION_RODATA static void* const l_resWANa[6] = { (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x26), (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x2F), }; -COMPILER_STRIP_GATE(80392B98, &l_resWANa); +COMPILER_STRIP_GATE(0x80392B98, &l_resWANa); /* 80392BB0-80392BC8 -00001 0018+00 1/1 0/0 0/0 .rodata l_resWADa */ SECTION_RODATA static void* const l_resWADa[6] = { @@ -449,7 +647,7 @@ SECTION_RODATA static void* const l_resWADa[6] = { (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x26), (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x2F), }; -COMPILER_STRIP_GATE(80392BB0, &l_resWADa); +COMPILER_STRIP_GATE(0x80392BB0, &l_resWADa); /* 80392BC8-80392BE0 -00001 0018+00 1/1 0/0 0/0 .rodata l_resMATa */ SECTION_RODATA static void* const l_resMATa[6] = { @@ -460,7 +658,7 @@ SECTION_RODATA static void* const l_resMATa[6] = { (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x26), (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x2F), }; -COMPILER_STRIP_GATE(80392BC8, &l_resMATa); +COMPILER_STRIP_GATE(0x80392BC8, &l_resMATa); /* 80392BE0-80392BF8 -00001 0018+00 1/1 0/0 0/0 .rodata l_resWCNa */ SECTION_RODATA static void* const l_resWCNa[6] = { @@ -471,7 +669,7 @@ SECTION_RODATA static void* const l_resWCNa[6] = { (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x26), (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x2F), }; -COMPILER_STRIP_GATE(80392BE0, &l_resWCNa); +COMPILER_STRIP_GATE(0x80392BE0, &l_resWCNa); /* 80392BF8-80392C10 -00001 0018+00 1/1 0/0 0/0 .rodata l_resWONa */ SECTION_RODATA static void* const l_resWONa[6] = { @@ -482,7 +680,7 @@ SECTION_RODATA static void* const l_resWONa[6] = { (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x26), (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x2F), }; -COMPILER_STRIP_GATE(80392BF8, &l_resWONa); +COMPILER_STRIP_GATE(0x80392BF8, &l_resWONa); /* 80392C10-80392C28 -00001 0018+00 1/1 0/0 0/0 .rodata l_resWGNa */ SECTION_RODATA static void* const l_resWGNa[6] = { @@ -493,7 +691,7 @@ SECTION_RODATA static void* const l_resWGNa[6] = { (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x26), (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x2F), }; -COMPILER_STRIP_GATE(80392C10, &l_resWGNa); +COMPILER_STRIP_GATE(0x80392C10, &l_resWGNa); /* 80392C28-80392C40 -00001 0018+00 1/1 0/0 0/0 .rodata l_resWANb */ SECTION_RODATA static void* const l_resWANb[6] = { @@ -504,7 +702,7 @@ SECTION_RODATA static void* const l_resWANb[6] = { (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x26), (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x2F), }; -COMPILER_STRIP_GATE(80392C28, &l_resWANb); +COMPILER_STRIP_GATE(0x80392C28, &l_resWANb); /* 80392C40-80392C58 -00001 0018+00 1/1 0/0 0/0 .rodata l_resWANa2 */ SECTION_RODATA static void* const l_resWANa2[6] = { @@ -515,7 +713,7 @@ SECTION_RODATA static void* const l_resWANa2[6] = { (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x26), (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x2F), }; -COMPILER_STRIP_GATE(80392C40, &l_resWANa2); +COMPILER_STRIP_GATE(0x80392C40, &l_resWANa2); /* 80392C58-80392C70 -00001 0018+00 1/1 0/0 0/0 .rodata l_resWADa2 */ SECTION_RODATA static void* const l_resWADa2[6] = { @@ -526,7 +724,7 @@ SECTION_RODATA static void* const l_resWADa2[6] = { (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x26), (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x2F), }; -COMPILER_STRIP_GATE(80392C58, &l_resWADa2); +COMPILER_STRIP_GATE(0x80392C58, &l_resWADa2); /* 80392C70-80392C88 -00001 0018+00 1/1 0/0 0/0 .rodata l_resMATa2 */ SECTION_RODATA static void* const l_resMATa2[6] = { @@ -537,7 +735,7 @@ SECTION_RODATA static void* const l_resMATa2[6] = { (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x26), (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x2F), }; -COMPILER_STRIP_GATE(80392C70, &l_resMATa2); +COMPILER_STRIP_GATE(0x80392C70, &l_resMATa2); /* 80392C88-80392CA0 -00001 0018+00 1/1 0/0 0/0 .rodata l_resWCNa2 */ SECTION_RODATA static void* const l_resWCNa2[6] = { @@ -548,7 +746,7 @@ SECTION_RODATA static void* const l_resWCNa2[6] = { (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x26), (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x2F), }; -COMPILER_STRIP_GATE(80392C88, &l_resWCNa2); +COMPILER_STRIP_GATE(0x80392C88, &l_resWCNa2); /* 80392CA0-80392CB8 -00001 0018+00 1/1 0/0 0/0 .rodata l_resWONa2 */ SECTION_RODATA static void* const l_resWONa2[6] = { @@ -559,7 +757,7 @@ SECTION_RODATA static void* const l_resWONa2[6] = { (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x26), (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x2F), }; -COMPILER_STRIP_GATE(80392CA0, &l_resWONa2); +COMPILER_STRIP_GATE(0x80392CA0, &l_resWONa2); /* 80392CB8-80392CD0 -00001 0018+00 1/1 0/0 0/0 .rodata l_resWGNa2 */ SECTION_RODATA static void* const l_resWGNa2[6] = { @@ -570,7 +768,7 @@ SECTION_RODATA static void* const l_resWGNa2[6] = { (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x26), (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x2F), }; -COMPILER_STRIP_GATE(80392CB8, &l_resWGNa2); +COMPILER_STRIP_GATE(0x80392CB8, &l_resWGNa2); /* 80392CD0-80392CE8 -00001 0018+00 1/1 0/0 0/0 .rodata l_resWANb2 */ SECTION_RODATA static void* const l_resWANb2[6] = { @@ -581,7 +779,7 @@ SECTION_RODATA static void* const l_resWANb2[6] = { (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x26), (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x2F), }; -COMPILER_STRIP_GATE(80392CD0, &l_resWANb2); +COMPILER_STRIP_GATE(0x80392CD0, &l_resWANb2); /* 80392CE8-80392D30 -00001 0048+00 1/1 0/0 0/0 .rodata l_objTbl */ SECTION_RODATA static void* const l_objTbl[18] = { @@ -595,7 +793,7 @@ SECTION_RODATA static void* const l_objTbl[18] = { (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x26), (void*)0xFFFFFFFF, (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x26), (void*)0x00000004, }; -COMPILER_STRIP_GATE(80392CE8, &l_objTbl); +COMPILER_STRIP_GATE(0x80392CE8, &l_objTbl); /* 80392D30-80392D78 -00001 0048+00 1/1 0/0 0/0 .rodata l_objTWTbl */ SECTION_RODATA static void* const l_objTWTbl[18] = { @@ -609,7 +807,7 @@ SECTION_RODATA static void* const l_objTWTbl[18] = { (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x2F), (void*)0xFFFFFFFF, (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x2F), (void*)0x00000004, }; -COMPILER_STRIP_GATE(80392D30, &l_objTWTbl); +COMPILER_STRIP_GATE(0x80392D30, &l_objTWTbl); /* 80392D78-80392DC8 -00001 0050+00 1/1 0/0 0/0 .rodata l_bckTbl_M */ SECTION_RODATA static void* const l_bckTbl_M[20] = { @@ -624,7 +822,7 @@ SECTION_RODATA static void* const l_bckTbl_M[20] = { (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x1C), (void*)0x00000004, (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x1C), (void*)0x00000005, }; -COMPILER_STRIP_GATE(80392D78, &l_bckTbl_M); +COMPILER_STRIP_GATE(0x80392D78, &l_bckTbl_M); /* 80392DC8-80392E18 -00001 0050+00 1/1 0/0 0/0 .rodata l_bckTbl_W */ SECTION_RODATA static void* const l_bckTbl_W[20] = { @@ -639,7 +837,7 @@ SECTION_RODATA static void* const l_bckTbl_W[20] = { (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x16B), (void*)0x00000004, (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x16B), (void*)0x00000005, }; -COMPILER_STRIP_GATE(80392DC8, &l_bckTbl_W); +COMPILER_STRIP_GATE(0x80392DC8, &l_bckTbl_W); /* 80392E18-80392E5C 01F478 0044+00 0/0 0/0 1/1 .rodata m_cylDat__9daNpcCd_c */ SECTION_RODATA u8 const daNpcCd_c::m_cylDat[68] = { @@ -649,7 +847,7 @@ SECTION_RODATA u8 const daNpcCd_c::m_cylDat[68] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80392E18, &daNpcCd_c::m_cylDat); +COMPILER_STRIP_GATE(0x80392E18, &daNpcCd_c::m_cylDat); /* 80392E5C-80392FC4 01F4BC 0168+00 1/1 0/0 0/0 .rodata a_transScaleTbl$3984 */ SECTION_RODATA static u8 const a_transScaleTbl[360] = { @@ -677,7 +875,80 @@ SECTION_RODATA static u8 const a_transScaleTbl[360] = { 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x5C, 0xF2, 0x9A, 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x86, 0xC7, 0x2F, 0x3F, 0x80, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80392E5C, &a_transScaleTbl); +COMPILER_STRIP_GATE(0x80392E5C, &a_transScaleTbl); + +/* 80392FE8-80392FE8 01F648 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80392FE8 = "MAN_a_L"; +SECTION_DEAD static char const* const stringBase_80392FF0 = "MAN_a_LTW"; +SECTION_DEAD static char const* const stringBase_80392FFA = "Mgenral_l"; +SECTION_DEAD static char const* const stringBase_80393004 = "Mspcial_l"; +SECTION_DEAD static char const* const stringBase_8039300E = "object_l"; +SECTION_DEAD static char const* const stringBase_80393017 = "objectLTW"; +SECTION_DEAD static char const* const stringBase_80393021 = "MAD_a_L"; +SECTION_DEAD static char const* const stringBase_80393029 = "MAD_a_LTW"; +SECTION_DEAD static char const* const stringBase_80393033 = "MCN_a_L"; +SECTION_DEAD static char const* const stringBase_8039303B = "MCN_a_LTW"; +SECTION_DEAD static char const* const stringBase_80393045 = "MON_a_L"; +SECTION_DEAD static char const* const stringBase_8039304D = "MON_a_LTW"; +SECTION_DEAD static char const* const stringBase_80393057 = "MAN_b_L"; +SECTION_DEAD static char const* const stringBase_8039305F = "MAN_b_LTW"; +SECTION_DEAD static char const* const stringBase_80393069 = "MAN_c_L"; +SECTION_DEAD static char const* const stringBase_80393071 = "MAN_c_LTW"; +SECTION_DEAD static char const* const stringBase_8039307B = "MAS_a_L"; +SECTION_DEAD static char const* const stringBase_80393083 = "MAS_a_LTW"; +SECTION_DEAD static char const* const stringBase_8039308D = "MBN_a_L"; +SECTION_DEAD static char const* const stringBase_80393095 = "MBN_a_LTW"; +SECTION_DEAD static char const* const stringBase_8039309F = "MAN_a2_L"; +SECTION_DEAD static char const* const stringBase_803930A8 = "MAN_a2LTW"; +SECTION_DEAD static char const* const stringBase_803930B2 = "MAD_a2_L"; +SECTION_DEAD static char const* const stringBase_803930BB = "MAD_a2LTW"; +SECTION_DEAD static char const* const stringBase_803930C5 = "MCN_a2_L"; +SECTION_DEAD static char const* const stringBase_803930CE = "MCN_a2LTW"; +SECTION_DEAD static char const* const stringBase_803930D8 = "MON_a2_L"; +SECTION_DEAD static char const* const stringBase_803930E1 = "MON_a2LTW"; +SECTION_DEAD static char const* const stringBase_803930EB = "MAN_b2_L"; +SECTION_DEAD static char const* const stringBase_803930F4 = "MAN_b2LTW"; +SECTION_DEAD static char const* const stringBase_803930FE = "MAN_c2_L"; +SECTION_DEAD static char const* const stringBase_80393107 = "MAN_c2LTW"; +SECTION_DEAD static char const* const stringBase_80393111 = "MAS_a2_L"; +SECTION_DEAD static char const* const stringBase_8039311A = "MAS_a2LTW"; +SECTION_DEAD static char const* const stringBase_80393124 = "MBN_a2_L"; +SECTION_DEAD static char const* const stringBase_8039312D = "MBN_a2LTW"; +SECTION_DEAD static char const* const stringBase_80393137 = "WAN_a_L"; +SECTION_DEAD static char const* const stringBase_8039313F = "WAN_a_LTW"; +SECTION_DEAD static char const* const stringBase_80393149 = "Wgenral_l"; +SECTION_DEAD static char const* const stringBase_80393153 = "Wspcial_l"; +SECTION_DEAD static char const* const stringBase_8039315D = "WAD_a_L"; +SECTION_DEAD static char const* const stringBase_80393165 = "WAD_a_LTW"; +SECTION_DEAD static char const* const stringBase_8039316F = "MAT_a_L"; +SECTION_DEAD static char const* const stringBase_80393177 = "MAT_a_LTW"; +SECTION_DEAD static char const* const stringBase_80393181 = "WCN_a_L"; +SECTION_DEAD static char const* const stringBase_80393189 = "WCN_a_LTW"; +SECTION_DEAD static char const* const stringBase_80393193 = "WON_a_L"; +SECTION_DEAD static char const* const stringBase_8039319B = "WON_a_LTW"; +SECTION_DEAD static char const* const stringBase_803931A5 = "WGN_a_L"; +SECTION_DEAD static char const* const stringBase_803931AD = "WGN_a_LTW"; +SECTION_DEAD static char const* const stringBase_803931B7 = "WAN_b_L"; +SECTION_DEAD static char const* const stringBase_803931BF = "WAN_b_LTW"; +SECTION_DEAD static char const* const stringBase_803931C9 = "WAN_a2_L"; +SECTION_DEAD static char const* const stringBase_803931D2 = "WAN_a2LTW"; +SECTION_DEAD static char const* const stringBase_803931DC = "WAD_a2_L"; +SECTION_DEAD static char const* const stringBase_803931E5 = "WAD_a2LTW"; +SECTION_DEAD static char const* const stringBase_803931EF = "MAT_a2_L"; +SECTION_DEAD static char const* const stringBase_803931F8 = "MAT_a2LTW"; +SECTION_DEAD static char const* const stringBase_80393202 = "WCN_a2_L"; +SECTION_DEAD static char const* const stringBase_8039320B = "WCN_a2LTW"; +SECTION_DEAD static char const* const stringBase_80393215 = "WON_a2_L"; +SECTION_DEAD static char const* const stringBase_8039321E = "WON_a2LTW"; +SECTION_DEAD static char const* const stringBase_80393228 = "WGN_a2_L"; +SECTION_DEAD static char const* const stringBase_80393231 = "WGN_a2LTW"; +SECTION_DEAD static char const* const stringBase_8039323B = "WAN_b2_L"; +SECTION_DEAD static char const* const stringBase_80393244 = "WAN_b2LTW"; +/* @stringBase0 padding */ +SECTION_DEAD static char const* const pad_8039324E = "\0"; +#pragma pop /* 804534B8-804534BC 001AB8 0004+00 2/2 0/0 0/0 .sdata2 @4021 */ SECTION_SDATA2 static f32 lit_4021 = 1.0f; @@ -1031,7 +1302,7 @@ SECTION_RODATA static u8 const a_jntNumTbl[36] = { 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80392FC4, &a_jntNumTbl); +COMPILER_STRIP_GATE(0x80392FC4, &a_jntNumTbl); /* 80156E8C-80156F74 1517CC 00E8+00 0/0 0/0 1/1 .text drawObj__9daNpcCd_cFiP8J3DModelf */ #pragma push @@ -1879,79 +2150,7 @@ asm void __sinit_d_a_npc_cd_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80157A10 = (void*)__sinit_d_a_npc_cd_cpp; +REGISTER_CTORS(0x80157A10, __sinit_d_a_npc_cd_cpp); #pragma pop -/* 80392FE8-80393250 01F648 0266+02 34/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80392FE8 = "MAN_a_L"; -SECTION_DEAD static char const* const stringBase_80392FF0 = "MAN_a_LTW"; -SECTION_DEAD static char const* const stringBase_80392FFA = "Mgenral_l"; -SECTION_DEAD static char const* const stringBase_80393004 = "Mspcial_l"; -SECTION_DEAD static char const* const stringBase_8039300E = "object_l"; -SECTION_DEAD static char const* const stringBase_80393017 = "objectLTW"; -SECTION_DEAD static char const* const stringBase_80393021 = "MAD_a_L"; -SECTION_DEAD static char const* const stringBase_80393029 = "MAD_a_LTW"; -SECTION_DEAD static char const* const stringBase_80393033 = "MCN_a_L"; -SECTION_DEAD static char const* const stringBase_8039303B = "MCN_a_LTW"; -SECTION_DEAD static char const* const stringBase_80393045 = "MON_a_L"; -SECTION_DEAD static char const* const stringBase_8039304D = "MON_a_LTW"; -SECTION_DEAD static char const* const stringBase_80393057 = "MAN_b_L"; -SECTION_DEAD static char const* const stringBase_8039305F = "MAN_b_LTW"; -SECTION_DEAD static char const* const stringBase_80393069 = "MAN_c_L"; -SECTION_DEAD static char const* const stringBase_80393071 = "MAN_c_LTW"; -SECTION_DEAD static char const* const stringBase_8039307B = "MAS_a_L"; -SECTION_DEAD static char const* const stringBase_80393083 = "MAS_a_LTW"; -SECTION_DEAD static char const* const stringBase_8039308D = "MBN_a_L"; -SECTION_DEAD static char const* const stringBase_80393095 = "MBN_a_LTW"; -SECTION_DEAD static char const* const stringBase_8039309F = "MAN_a2_L"; -SECTION_DEAD static char const* const stringBase_803930A8 = "MAN_a2LTW"; -SECTION_DEAD static char const* const stringBase_803930B2 = "MAD_a2_L"; -SECTION_DEAD static char const* const stringBase_803930BB = "MAD_a2LTW"; -SECTION_DEAD static char const* const stringBase_803930C5 = "MCN_a2_L"; -SECTION_DEAD static char const* const stringBase_803930CE = "MCN_a2LTW"; -SECTION_DEAD static char const* const stringBase_803930D8 = "MON_a2_L"; -SECTION_DEAD static char const* const stringBase_803930E1 = "MON_a2LTW"; -SECTION_DEAD static char const* const stringBase_803930EB = "MAN_b2_L"; -SECTION_DEAD static char const* const stringBase_803930F4 = "MAN_b2LTW"; -SECTION_DEAD static char const* const stringBase_803930FE = "MAN_c2_L"; -SECTION_DEAD static char const* const stringBase_80393107 = "MAN_c2LTW"; -SECTION_DEAD static char const* const stringBase_80393111 = "MAS_a2_L"; -SECTION_DEAD static char const* const stringBase_8039311A = "MAS_a2LTW"; -SECTION_DEAD static char const* const stringBase_80393124 = "MBN_a2_L"; -SECTION_DEAD static char const* const stringBase_8039312D = "MBN_a2LTW"; -SECTION_DEAD static char const* const stringBase_80393137 = "WAN_a_L"; -SECTION_DEAD static char const* const stringBase_8039313F = "WAN_a_LTW"; -SECTION_DEAD static char const* const stringBase_80393149 = "Wgenral_l"; -SECTION_DEAD static char const* const stringBase_80393153 = "Wspcial_l"; -SECTION_DEAD static char const* const stringBase_8039315D = "WAD_a_L"; -SECTION_DEAD static char const* const stringBase_80393165 = "WAD_a_LTW"; -SECTION_DEAD static char const* const stringBase_8039316F = "MAT_a_L"; -SECTION_DEAD static char const* const stringBase_80393177 = "MAT_a_LTW"; -SECTION_DEAD static char const* const stringBase_80393181 = "WCN_a_L"; -SECTION_DEAD static char const* const stringBase_80393189 = "WCN_a_LTW"; -SECTION_DEAD static char const* const stringBase_80393193 = "WON_a_L"; -SECTION_DEAD static char const* const stringBase_8039319B = "WON_a_LTW"; -SECTION_DEAD static char const* const stringBase_803931A5 = "WGN_a_L"; -SECTION_DEAD static char const* const stringBase_803931AD = "WGN_a_LTW"; -SECTION_DEAD static char const* const stringBase_803931B7 = "WAN_b_L"; -SECTION_DEAD static char const* const stringBase_803931BF = "WAN_b_LTW"; -SECTION_DEAD static char const* const stringBase_803931C9 = "WAN_a2_L"; -SECTION_DEAD static char const* const stringBase_803931D2 = "WAN_a2LTW"; -SECTION_DEAD static char const* const stringBase_803931DC = "WAD_a2_L"; -SECTION_DEAD static char const* const stringBase_803931E5 = "WAD_a2LTW"; -SECTION_DEAD static char const* const stringBase_803931EF = "MAT_a2_L"; -SECTION_DEAD static char const* const stringBase_803931F8 = "MAT_a2LTW"; -SECTION_DEAD static char const* const stringBase_80393202 = "WCN_a2_L"; -SECTION_DEAD static char const* const stringBase_8039320B = "WCN_a2LTW"; -SECTION_DEAD static char const* const stringBase_80393215 = "WON_a2_L"; -SECTION_DEAD static char const* const stringBase_8039321E = "WON_a2LTW"; -SECTION_DEAD static char const* const stringBase_80393228 = "WGN_a2_L"; -SECTION_DEAD static char const* const stringBase_80393231 = "WGN_a2LTW"; -SECTION_DEAD static char const* const stringBase_8039323B = "WAN_b2_L"; -SECTION_DEAD static char const* const stringBase_80393244 = "WAN_b2LTW"; -/* @stringBase0 padding */ -SECTION_DEAD static char const* const pad_8039324E = "\0"; -#pragma pop +/* 80392FE8-80392FE8 01F648 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/a/npc/d_a_npc_cd2.cpp b/src/a/npc/d_a_npc_cd2.cpp index 6edfec3d1a8..851d6951305 100644 --- a/src/a/npc/d_a_npc_cd2.cpp +++ b/src/a/npc/d_a_npc_cd2.cpp @@ -41,16 +41,16 @@ struct mDoExt_btpAnm { /* 8000D5E8 */ void entry(J3DMaterialTable*, s16); }; -struct J3DModelData {}; - struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; - struct J3DAnmTransform {}; +struct J3DModelData {}; + +struct Z2Creature {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -67,12 +67,12 @@ struct daPy_py_c { /* 8015F424 */ void checkNowWolfEyeUp(); }; +struct J3DModel {}; + struct J3DJoint {}; struct J3DAnmTransformKey {}; -struct J3DModel {}; - struct daNpcCd2_c { /* 80157D00 */ void NpcCreate(int); /* 80157F28 */ void ObjCreate(int); @@ -284,8 +284,8 @@ extern "C" void dPath_GetPnt__FPC5dPathi(); extern "C" void dPath_GetRoomPath__Fii(); extern "C" void GetPolyColor__4dBgSFRC13cBgS_PolyInfo(); extern "C" void GetRoomId__4dBgSFRC13cBgS_PolyInfo(); -extern "C" void func_8014D348(int*); -extern "C" void func_8014D364(int, int); +extern "C" void func_8014D348(void* _this, int*); +extern "C" void func_8014D364(void* _this, int, int); extern "C" void checkNowWolfEyeUp__9daPy_py_cFv(); extern "C" void settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c(); extern "C" void setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c(); @@ -346,6 +346,204 @@ static asm void jntNodeCallBack(J3DJoint* param_0, int param_1) { #pragma pop /* ############################################################################################## */ +/* 80393B70-80393B76 0201D0 0006+00 2/1 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80393B70; + +/* 80393B76-80393B7F 0201D6 0009+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80393B76; + +/* 80393B7F-80393B88 0201DF 0009+00 17/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80393B7F; + +/* 80393B88-80393B91 0201E8 0009+00 17/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80393B88; + +/* 80393B91-80393B98 0201F1 0007+00 31/1 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80393B91; + +/* 80393B98-80393BA1 0201F8 0009+00 31/1 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80393B98; + +/* 80393BA1-80393BA7 020201 0006+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80393BA1; + +/* 80393BA7-80393BB0 020207 0009+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80393BA7; + +/* 80393BB0-80393BB6 020210 0006+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80393BB0; + +/* 80393BB6-80393BBF 020216 0009+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80393BB6; + +/* 80393BBF-80393BC5 02021F 0006+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80393BBF; + +/* 80393BC5-80393BCE 020225 0009+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80393BC5; + +/* 80393BCE-80393BD4 02022E 0006+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80393BCE; + +/* 80393BD4-80393BDD 020234 0009+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80393BD4; + +/* 80393BDD-80393BE3 02023D 0006+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80393BDD; + +/* 80393BE3-80393BEC 020243 0009+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80393BE3; + +/* 80393BEC-80393BF2 02024C 0006+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80393BEC; + +/* 80393BF2-80393BFB 020252 0009+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80393BF2; + +/* 80393BFB-80393C01 02025B 0006+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80393BFB; + +/* 80393C01-80393C0A 020261 0009+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80393C01; + +/* 80393C0A-80393C11 02026A 0007+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80393C0A; + +/* 80393C11-80393C1B 020271 000A+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80393C11; + +/* 80393C1B-80393C22 02027B 0007+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80393C1B; + +/* 80393C22-80393C2C 020282 000A+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80393C22; + +/* 80393C2C-80393C33 02028C 0007+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80393C2C; + +/* 80393C33-80393C3D 020293 000A+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80393C33; + +/* 80393C3D-80393C44 02029D 0007+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80393C3D; + +/* 80393C44-80393C4E 0202A4 000A+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80393C44; + +/* 80393C4E-80393C55 0202AE 0007+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80393C4E; + +/* 80393C55-80393C5F 0202B5 000A+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80393C55; + +/* 80393C5F-80393C66 0202BF 0007+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80393C5F; + +/* 80393C66-80393C70 0202C6 000A+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80393C66; + +/* 80393C70-80393C77 0202D0 0007+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80393C70; + +/* 80393C77-80393C81 0202D7 000A+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80393C77; + +/* 80393C81-80393C88 0202E1 0007+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80393C81; + +/* 80393C88-80393C92 0202E8 000A+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80393C88; + +/* 80393C92-80393C98 0202F2 0006+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80393C92; + +/* 80393C98-80393CA1 0202F8 0009+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80393C98; + +/* 80393CA1-80393CAA 020301 0009+00 15/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80393CA1; + +/* 80393CAA-80393CB3 02030A 0009+00 15/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80393CAA; + +/* 80393CB3-80393CB9 020313 0006+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80393CB3; + +/* 80393CB9-80393CC2 020319 0009+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80393CB9; + +/* 80393CC2-80393CC8 020322 0006+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80393CC2; + +/* 80393CC8-80393CD1 020328 0009+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80393CC8; + +/* 80393CD1-80393CD7 020331 0006+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80393CD1; + +/* 80393CD7-80393CE0 020337 0009+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80393CD7; + +/* 80393CE0-80393CE6 020340 0006+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80393CE0; + +/* 80393CE6-80393CEF 020346 0009+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80393CE6; + +/* 80393CEF-80393CF5 02034F 0006+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80393CEF; + +/* 80393CF5-80393CFE 020355 0009+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80393CF5; + +/* 80393CFE-80393D04 02035E 0006+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80393CFE; + +/* 80393D04-80393D0D 020364 0009+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80393D04; + +/* 80393D0D-80393D14 02036D 0007+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80393D0D; + +/* 80393D14-80393D1E 020374 000A+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80393D14; + +/* 80393D1E-80393D25 02037E 0007+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80393D1E; + +/* 80393D25-80393D2F 020385 000A+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80393D25; + +/* 80393D2F-80393D36 02038F 0007+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80393D2F; + +/* 80393D36-80393D40 020396 000A+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80393D36; + +/* 80393D40-80393D47 0203A0 0007+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80393D40; + +/* 80393D47-80393D51 0203A7 000A+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80393D47; + +/* 80393D51-80393D58 0203B1 0007+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80393D51; + +/* 80393D58-80393D62 0203B8 000A+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80393D58; + +/* 80393D62-80393D69 0203C2 0007+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80393D62; + +/* 80393D69-80393D73 0203C9 000A+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80393D69; + +/* 80393D73-80393D7A 0203D3 0007+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80393D73; + +/* 80393D7A-80393D88 0203DA 000A+04 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80393D7A; + /* 80393250-80393268 -00001 0018+00 2/1 0/0 0/0 .rodata l_resMANa */ SECTION_RODATA static void* const l_resMANa[6] = { (void*)&a_npc_d_a_npc_cd2__stringBase0, @@ -355,7 +553,7 @@ SECTION_RODATA static void* const l_resMANa[6] = { (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x21), (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x28), }; -COMPILER_STRIP_GATE(80393250, &l_resMANa); +COMPILER_STRIP_GATE(0x80393250, &l_resMANa); /* 80393268-80393280 -00001 0018+00 1/1 0/0 0/0 .rodata l_resMADa */ SECTION_RODATA static void* const l_resMADa[6] = { @@ -366,7 +564,7 @@ SECTION_RODATA static void* const l_resMADa[6] = { (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x21), (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x28), }; -COMPILER_STRIP_GATE(80393268, &l_resMADa); +COMPILER_STRIP_GATE(0x80393268, &l_resMADa); /* 80393280-80393298 -00001 0018+00 1/1 0/0 0/0 .rodata l_resMCNa */ SECTION_RODATA static void* const l_resMCNa[6] = { @@ -377,7 +575,7 @@ SECTION_RODATA static void* const l_resMCNa[6] = { (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x21), (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x28), }; -COMPILER_STRIP_GATE(80393280, &l_resMCNa); +COMPILER_STRIP_GATE(0x80393280, &l_resMCNa); /* 80393298-803932B0 -00001 0018+00 1/1 0/0 0/0 .rodata l_resMONa */ SECTION_RODATA static void* const l_resMONa[6] = { @@ -388,7 +586,7 @@ SECTION_RODATA static void* const l_resMONa[6] = { (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x21), (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x28), }; -COMPILER_STRIP_GATE(80393298, &l_resMONa); +COMPILER_STRIP_GATE(0x80393298, &l_resMONa); /* 803932B0-803932C8 -00001 0018+00 1/1 0/0 0/0 .rodata l_resMANb */ SECTION_RODATA static void* const l_resMANb[6] = { @@ -399,7 +597,7 @@ SECTION_RODATA static void* const l_resMANb[6] = { (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x21), (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x28), }; -COMPILER_STRIP_GATE(803932B0, &l_resMANb); +COMPILER_STRIP_GATE(0x803932B0, &l_resMANb); /* 803932C8-803932E0 -00001 0018+00 1/1 0/0 0/0 .rodata l_resMANc */ SECTION_RODATA static void* const l_resMANc[6] = { @@ -410,7 +608,7 @@ SECTION_RODATA static void* const l_resMANc[6] = { (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x21), (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x28), }; -COMPILER_STRIP_GATE(803932C8, &l_resMANc); +COMPILER_STRIP_GATE(0x803932C8, &l_resMANc); /* 803932E0-803932F8 -00001 0018+00 1/1 0/0 0/0 .rodata l_resMASa */ SECTION_RODATA static void* const l_resMASa[6] = { @@ -421,7 +619,7 @@ SECTION_RODATA static void* const l_resMASa[6] = { (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x21), (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x28), }; -COMPILER_STRIP_GATE(803932E0, &l_resMASa); +COMPILER_STRIP_GATE(0x803932E0, &l_resMASa); /* 803932F8-80393310 -00001 0018+00 1/1 0/0 0/0 .rodata l_resMBNa */ SECTION_RODATA static void* const l_resMBNa[6] = { @@ -432,7 +630,7 @@ SECTION_RODATA static void* const l_resMBNa[6] = { (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x21), (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x28), }; -COMPILER_STRIP_GATE(803932F8, &l_resMBNa); +COMPILER_STRIP_GATE(0x803932F8, &l_resMBNa); /* 80393310-80393328 -00001 0018+00 1/1 0/0 0/0 .rodata l_resMANa2 */ SECTION_RODATA static void* const l_resMANa2[6] = { @@ -443,7 +641,7 @@ SECTION_RODATA static void* const l_resMANa2[6] = { (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x21), (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x28), }; -COMPILER_STRIP_GATE(80393310, &l_resMANa2); +COMPILER_STRIP_GATE(0x80393310, &l_resMANa2); /* 80393328-80393340 -00001 0018+00 1/1 0/0 0/0 .rodata l_resMADa2 */ SECTION_RODATA static void* const l_resMADa2[6] = { @@ -454,7 +652,7 @@ SECTION_RODATA static void* const l_resMADa2[6] = { (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x21), (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x28), }; -COMPILER_STRIP_GATE(80393328, &l_resMADa2); +COMPILER_STRIP_GATE(0x80393328, &l_resMADa2); /* 80393340-80393358 -00001 0018+00 1/1 0/0 0/0 .rodata l_resMCNa2 */ SECTION_RODATA static void* const l_resMCNa2[6] = { @@ -465,7 +663,7 @@ SECTION_RODATA static void* const l_resMCNa2[6] = { (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x21), (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x28), }; -COMPILER_STRIP_GATE(80393340, &l_resMCNa2); +COMPILER_STRIP_GATE(0x80393340, &l_resMCNa2); /* 80393358-80393370 -00001 0018+00 1/1 0/0 0/0 .rodata l_resMONa2 */ SECTION_RODATA static void* const l_resMONa2[6] = { @@ -476,7 +674,7 @@ SECTION_RODATA static void* const l_resMONa2[6] = { (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x21), (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x28), }; -COMPILER_STRIP_GATE(80393358, &l_resMONa2); +COMPILER_STRIP_GATE(0x80393358, &l_resMONa2); /* 80393370-80393388 -00001 0018+00 1/1 0/0 0/0 .rodata l_resMANb2 */ SECTION_RODATA static void* const l_resMANb2[6] = { @@ -487,7 +685,7 @@ SECTION_RODATA static void* const l_resMANb2[6] = { (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x21), (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x28), }; -COMPILER_STRIP_GATE(80393370, &l_resMANb2); +COMPILER_STRIP_GATE(0x80393370, &l_resMANb2); /* 80393388-803933A0 -00001 0018+00 1/1 0/0 0/0 .rodata l_resMANc2 */ SECTION_RODATA static void* const l_resMANc2[6] = { @@ -498,7 +696,7 @@ SECTION_RODATA static void* const l_resMANc2[6] = { (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x21), (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x28), }; -COMPILER_STRIP_GATE(80393388, &l_resMANc2); +COMPILER_STRIP_GATE(0x80393388, &l_resMANc2); /* 803933A0-803933B8 -00001 0018+00 1/1 0/0 0/0 .rodata l_resMASa2 */ SECTION_RODATA static void* const l_resMASa2[6] = { @@ -509,7 +707,7 @@ SECTION_RODATA static void* const l_resMASa2[6] = { (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x21), (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x28), }; -COMPILER_STRIP_GATE(803933A0, &l_resMASa2); +COMPILER_STRIP_GATE(0x803933A0, &l_resMASa2); /* 803933B8-803933D0 -00001 0018+00 1/1 0/0 0/0 .rodata l_resMBNa2 */ SECTION_RODATA static void* const l_resMBNa2[6] = { @@ -520,7 +718,7 @@ SECTION_RODATA static void* const l_resMBNa2[6] = { (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x21), (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x28), }; -COMPILER_STRIP_GATE(803933B8, &l_resMBNa2); +COMPILER_STRIP_GATE(0x803933B8, &l_resMBNa2); /* 803933D0-803933E8 -00001 0018+00 1/1 0/0 0/0 .rodata l_resWANa */ SECTION_RODATA static void* const l_resWANa[6] = { @@ -531,7 +729,7 @@ SECTION_RODATA static void* const l_resWANa[6] = { (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x21), (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x28), }; -COMPILER_STRIP_GATE(803933D0, &l_resWANa); +COMPILER_STRIP_GATE(0x803933D0, &l_resWANa); /* 803933E8-80393400 -00001 0018+00 1/1 0/0 0/0 .rodata l_resWADa */ SECTION_RODATA static void* const l_resWADa[6] = { @@ -542,7 +740,7 @@ SECTION_RODATA static void* const l_resWADa[6] = { (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x21), (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x28), }; -COMPILER_STRIP_GATE(803933E8, &l_resWADa); +COMPILER_STRIP_GATE(0x803933E8, &l_resWADa); /* 80393400-80393418 -00001 0018+00 1/1 0/0 0/0 .rodata l_resMATa */ SECTION_RODATA static void* const l_resMATa[6] = { @@ -553,7 +751,7 @@ SECTION_RODATA static void* const l_resMATa[6] = { (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x21), (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x28), }; -COMPILER_STRIP_GATE(80393400, &l_resMATa); +COMPILER_STRIP_GATE(0x80393400, &l_resMATa); /* 80393418-80393430 -00001 0018+00 1/1 0/0 0/0 .rodata l_resWCNa */ SECTION_RODATA static void* const l_resWCNa[6] = { @@ -564,7 +762,7 @@ SECTION_RODATA static void* const l_resWCNa[6] = { (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x21), (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x28), }; -COMPILER_STRIP_GATE(80393418, &l_resWCNa); +COMPILER_STRIP_GATE(0x80393418, &l_resWCNa); /* 80393430-80393448 -00001 0018+00 1/1 0/0 0/0 .rodata l_resWONa */ SECTION_RODATA static void* const l_resWONa[6] = { @@ -575,7 +773,7 @@ SECTION_RODATA static void* const l_resWONa[6] = { (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x21), (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x28), }; -COMPILER_STRIP_GATE(80393430, &l_resWONa); +COMPILER_STRIP_GATE(0x80393430, &l_resWONa); /* 80393448-80393460 -00001 0018+00 1/1 0/0 0/0 .rodata l_resWGNa */ SECTION_RODATA static void* const l_resWGNa[6] = { @@ -586,7 +784,7 @@ SECTION_RODATA static void* const l_resWGNa[6] = { (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x21), (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x28), }; -COMPILER_STRIP_GATE(80393448, &l_resWGNa); +COMPILER_STRIP_GATE(0x80393448, &l_resWGNa); /* 80393460-80393478 -00001 0018+00 1/1 0/0 0/0 .rodata l_resWANb */ SECTION_RODATA static void* const l_resWANb[6] = { @@ -597,7 +795,7 @@ SECTION_RODATA static void* const l_resWANb[6] = { (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x21), (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x28), }; -COMPILER_STRIP_GATE(80393460, &l_resWANb); +COMPILER_STRIP_GATE(0x80393460, &l_resWANb); /* 80393478-80393490 -00001 0018+00 1/1 0/0 0/0 .rodata l_resWANa2 */ SECTION_RODATA static void* const l_resWANa2[6] = { @@ -608,7 +806,7 @@ SECTION_RODATA static void* const l_resWANa2[6] = { (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x21), (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x28), }; -COMPILER_STRIP_GATE(80393478, &l_resWANa2); +COMPILER_STRIP_GATE(0x80393478, &l_resWANa2); /* 80393490-803934A8 -00001 0018+00 1/1 0/0 0/0 .rodata l_resWADa2 */ SECTION_RODATA static void* const l_resWADa2[6] = { @@ -619,7 +817,7 @@ SECTION_RODATA static void* const l_resWADa2[6] = { (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x21), (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x28), }; -COMPILER_STRIP_GATE(80393490, &l_resWADa2); +COMPILER_STRIP_GATE(0x80393490, &l_resWADa2); /* 803934A8-803934C0 -00001 0018+00 1/1 0/0 0/0 .rodata l_resMATa2 */ SECTION_RODATA static void* const l_resMATa2[6] = { @@ -630,7 +828,7 @@ SECTION_RODATA static void* const l_resMATa2[6] = { (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x21), (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x28), }; -COMPILER_STRIP_GATE(803934A8, &l_resMATa2); +COMPILER_STRIP_GATE(0x803934A8, &l_resMATa2); /* 803934C0-803934D8 -00001 0018+00 1/1 0/0 0/0 .rodata l_resWCNa2 */ SECTION_RODATA static void* const l_resWCNa2[6] = { @@ -641,7 +839,7 @@ SECTION_RODATA static void* const l_resWCNa2[6] = { (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x21), (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x28), }; -COMPILER_STRIP_GATE(803934C0, &l_resWCNa2); +COMPILER_STRIP_GATE(0x803934C0, &l_resWCNa2); /* 803934D8-803934F0 -00001 0018+00 1/1 0/0 0/0 .rodata l_resWONa2 */ SECTION_RODATA static void* const l_resWONa2[6] = { @@ -652,7 +850,7 @@ SECTION_RODATA static void* const l_resWONa2[6] = { (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x21), (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x28), }; -COMPILER_STRIP_GATE(803934D8, &l_resWONa2); +COMPILER_STRIP_GATE(0x803934D8, &l_resWONa2); /* 803934F0-80393508 -00001 0018+00 1/1 0/0 0/0 .rodata l_resWGNa2 */ SECTION_RODATA static void* const l_resWGNa2[6] = { @@ -663,7 +861,7 @@ SECTION_RODATA static void* const l_resWGNa2[6] = { (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x21), (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x28), }; -COMPILER_STRIP_GATE(803934F0, &l_resWGNa2); +COMPILER_STRIP_GATE(0x803934F0, &l_resWGNa2); /* 80393508-80393520 -00001 0018+00 1/1 0/0 0/0 .rodata l_resWANb2 */ SECTION_RODATA static void* const l_resWANb2[6] = { @@ -674,7 +872,7 @@ SECTION_RODATA static void* const l_resWANb2[6] = { (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x21), (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x28), }; -COMPILER_STRIP_GATE(80393508, &l_resWANb2); +COMPILER_STRIP_GATE(0x80393508, &l_resWANb2); /* 80393520-80393588 -00001 0068+00 1/1 0/0 0/0 .rodata l_objTbl */ SECTION_RODATA static void* const l_objTbl[26] = { @@ -692,7 +890,7 @@ SECTION_RODATA static void* const l_objTbl[26] = { (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x21), (void*)0x0000000F, (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x21), (void*)0x00000010, }; -COMPILER_STRIP_GATE(80393520, &l_objTbl); +COMPILER_STRIP_GATE(0x80393520, &l_objTbl); /* 80393588-803935F0 -00001 0068+00 1/1 0/0 0/0 .rodata l_objTWTbl */ SECTION_RODATA static void* const l_objTWTbl[26] = { @@ -710,7 +908,7 @@ SECTION_RODATA static void* const l_objTWTbl[26] = { (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x28), (void*)0xFFFFFFFF, (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x28), (void*)0xFFFFFFFF, }; -COMPILER_STRIP_GATE(80393588, &l_objTWTbl); +COMPILER_STRIP_GATE(0x80393588, &l_objTWTbl); /* 803935F0-803937A0 -00001 01B0+00 1/1 0/0 0/0 .rodata l_bckTbl_M */ SECTION_RODATA static void* const l_bckTbl_M[108] = { @@ -769,7 +967,7 @@ SECTION_RODATA static void* const l_bckTbl_M[108] = { (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0xF), (void*)0xFFFFFFFF, (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0xF), (void*)0x0000000A, }; -COMPILER_STRIP_GATE(803935F0, &l_bckTbl_M); +COMPILER_STRIP_GATE(0x803935F0, &l_bckTbl_M); /* 803937A0-80393950 -00001 01B0+00 1/1 0/0 0/0 .rodata l_bckTbl_W */ SECTION_RODATA static void* const l_bckTbl_W[108] = { @@ -828,7 +1026,7 @@ SECTION_RODATA static void* const l_bckTbl_W[108] = { (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x131), (void*)0x00000009, (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x131), (void*)0x0000000F, }; -COMPILER_STRIP_GATE(803937A0, &l_bckTbl_W); +COMPILER_STRIP_GATE(0x803937A0, &l_bckTbl_W); /* 80393950-80393994 01FFB0 0044+00 0/0 0/0 4/4 .rodata m_cylDat__10daNpcCd2_c */ SECTION_RODATA u8 const daNpcCd2_c::m_cylDat[68] = { @@ -838,7 +1036,7 @@ SECTION_RODATA u8 const daNpcCd2_c::m_cylDat[68] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80393950, &daNpcCd2_c::m_cylDat); +COMPILER_STRIP_GATE(0x80393950, &daNpcCd2_c::m_cylDat); /* 80393994-80393AFC 01FFF4 0168+00 1/1 0/0 0/0 .rodata a_transScaleTbl$3998 */ SECTION_RODATA static u8 const a_transScaleTbl[360] = { @@ -866,7 +1064,80 @@ SECTION_RODATA static u8 const a_transScaleTbl[360] = { 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x5C, 0xF2, 0x9A, 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x86, 0xC7, 0x2F, 0x3F, 0x80, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80393994, &a_transScaleTbl); +COMPILER_STRIP_GATE(0x80393994, &a_transScaleTbl); + +/* 80393B70-80393B70 0201D0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80393B70 = "MAN_a"; +SECTION_DEAD static char const* const stringBase_80393B76 = "MAN_a_TW"; +SECTION_DEAD static char const* const stringBase_80393B7F = "Mgeneral"; +SECTION_DEAD static char const* const stringBase_80393B88 = "Mspecial"; +SECTION_DEAD static char const* const stringBase_80393B91 = "object"; +SECTION_DEAD static char const* const stringBase_80393B98 = "objectTW"; +SECTION_DEAD static char const* const stringBase_80393BA1 = "MAD_a"; +SECTION_DEAD static char const* const stringBase_80393BA7 = "MAD_a_TW"; +SECTION_DEAD static char const* const stringBase_80393BB0 = "MCN_a"; +SECTION_DEAD static char const* const stringBase_80393BB6 = "MCN_a_TW"; +SECTION_DEAD static char const* const stringBase_80393BBF = "MON_a"; +SECTION_DEAD static char const* const stringBase_80393BC5 = "MON_a_TW"; +SECTION_DEAD static char const* const stringBase_80393BCE = "MAN_b"; +SECTION_DEAD static char const* const stringBase_80393BD4 = "MAN_b_TW"; +SECTION_DEAD static char const* const stringBase_80393BDD = "MAN_c"; +SECTION_DEAD static char const* const stringBase_80393BE3 = "MAN_c_TW"; +SECTION_DEAD static char const* const stringBase_80393BEC = "MAS_a"; +SECTION_DEAD static char const* const stringBase_80393BF2 = "MAS_a_TW"; +SECTION_DEAD static char const* const stringBase_80393BFB = "MBN_a"; +SECTION_DEAD static char const* const stringBase_80393C01 = "MBN_a_TW"; +SECTION_DEAD static char const* const stringBase_80393C0A = "MAN_a2"; +SECTION_DEAD static char const* const stringBase_80393C11 = "MAN_a2_TW"; +SECTION_DEAD static char const* const stringBase_80393C1B = "MAD_a2"; +SECTION_DEAD static char const* const stringBase_80393C22 = "MAD_a2_TW"; +SECTION_DEAD static char const* const stringBase_80393C2C = "MCN_a2"; +SECTION_DEAD static char const* const stringBase_80393C33 = "MCN_a2_TW"; +SECTION_DEAD static char const* const stringBase_80393C3D = "MON_a2"; +SECTION_DEAD static char const* const stringBase_80393C44 = "MON_a2_TW"; +SECTION_DEAD static char const* const stringBase_80393C4E = "MAN_b2"; +SECTION_DEAD static char const* const stringBase_80393C55 = "MAN_b2_TW"; +SECTION_DEAD static char const* const stringBase_80393C5F = "MAN_c2"; +SECTION_DEAD static char const* const stringBase_80393C66 = "MAN_c2_TW"; +SECTION_DEAD static char const* const stringBase_80393C70 = "MAS_a2"; +SECTION_DEAD static char const* const stringBase_80393C77 = "MAS_a2_TW"; +SECTION_DEAD static char const* const stringBase_80393C81 = "MBN_a2"; +SECTION_DEAD static char const* const stringBase_80393C88 = "MBN_a2_TW"; +SECTION_DEAD static char const* const stringBase_80393C92 = "WAN_a"; +SECTION_DEAD static char const* const stringBase_80393C98 = "WAN_a_TW"; +SECTION_DEAD static char const* const stringBase_80393CA1 = "Wgeneral"; +SECTION_DEAD static char const* const stringBase_80393CAA = "Wspecial"; +SECTION_DEAD static char const* const stringBase_80393CB3 = "WAD_a"; +SECTION_DEAD static char const* const stringBase_80393CB9 = "WAD_a_TW"; +SECTION_DEAD static char const* const stringBase_80393CC2 = "MAT_a"; +SECTION_DEAD static char const* const stringBase_80393CC8 = "MAT_a_TW"; +SECTION_DEAD static char const* const stringBase_80393CD1 = "WCN_a"; +SECTION_DEAD static char const* const stringBase_80393CD7 = "WCN_a_TW"; +SECTION_DEAD static char const* const stringBase_80393CE0 = "WON_a"; +SECTION_DEAD static char const* const stringBase_80393CE6 = "WON_a_TW"; +SECTION_DEAD static char const* const stringBase_80393CEF = "WGN_a"; +SECTION_DEAD static char const* const stringBase_80393CF5 = "WGN_a_TW"; +SECTION_DEAD static char const* const stringBase_80393CFE = "WAN_b"; +SECTION_DEAD static char const* const stringBase_80393D04 = "WAN_b_TW"; +SECTION_DEAD static char const* const stringBase_80393D0D = "WAN_a2"; +SECTION_DEAD static char const* const stringBase_80393D14 = "WAN_a2_TW"; +SECTION_DEAD static char const* const stringBase_80393D1E = "WAD_a2"; +SECTION_DEAD static char const* const stringBase_80393D25 = "WAD_a2_TW"; +SECTION_DEAD static char const* const stringBase_80393D2F = "MAT_a2"; +SECTION_DEAD static char const* const stringBase_80393D36 = "MAT_a2_TW"; +SECTION_DEAD static char const* const stringBase_80393D40 = "WCN_a2"; +SECTION_DEAD static char const* const stringBase_80393D47 = "WCN_a2_TW"; +SECTION_DEAD static char const* const stringBase_80393D51 = "WON_a2"; +SECTION_DEAD static char const* const stringBase_80393D58 = "WON_a2_TW"; +SECTION_DEAD static char const* const stringBase_80393D62 = "WGN_a2"; +SECTION_DEAD static char const* const stringBase_80393D69 = "WGN_a2_TW"; +SECTION_DEAD static char const* const stringBase_80393D73 = "WAN_b2"; +SECTION_DEAD static char const* const stringBase_80393D7A = "WAN_b2_TW"; +/* @stringBase0 padding */ +SECTION_DEAD static char const* const pad_80393D84 = "\0\0\0"; +#pragma pop /* 804534E0-804534E4 001AE0 0004+00 3/3 0/0 0/0 .sdata2 @4050 */ SECTION_SDATA2 static f32 lit_4050 = 1.0f; @@ -896,7 +1167,7 @@ asm void daNpcCd2_c::ObjCreate(int param_0) { SECTION_RODATA static u8 const lit_4072[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80393AFC, &lit_4072); +COMPILER_STRIP_GATE(0x80393AFC, &lit_4072); /* 80157F68-801580A8 1528A8 0140+00 0/0 0/0 1/1 .text ChairCreate__10daNpcCd2_cFf */ #pragma push @@ -2305,7 +2576,7 @@ SECTION_RODATA static u8 const a_jntNumTbl[104] = { 0x0A, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x0B, 0x00, 0x00, 0x00, 0x0A, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x0B, }; -COMPILER_STRIP_GATE(80393B08, &a_jntNumTbl); +COMPILER_STRIP_GATE(0x80393B08, &a_jntNumTbl); /* 80158FF0-801590FC 153930 010C+00 0/0 0/0 4/4 .text drawObj__10daNpcCd2_cFiP8J3DModelf */ @@ -2739,7 +3010,7 @@ asm void __sinit_d_a_npc_cd2_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_8015A90C = (void*)__sinit_d_a_npc_cd2_cpp; +REGISTER_CTORS(0x8015A90C, __sinit_d_a_npc_cd2_cpp); #pragma pop /* ############################################################################################## */ @@ -2747,76 +3018,4 @@ SECTION_CTORS void* const _ctors_8015A90C = (void*)__sinit_d_a_npc_cd2_cpp; extern u8 data_80451010[8]; u8 data_80451010[8]; -/* 80393B70-80393D88 0201D0 0214+04 35/1 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80393B70 = "MAN_a"; -SECTION_DEAD static char const* const stringBase_80393B76 = "MAN_a_TW"; -SECTION_DEAD static char const* const stringBase_80393B7F = "Mgeneral"; -SECTION_DEAD static char const* const stringBase_80393B88 = "Mspecial"; -SECTION_DEAD static char const* const stringBase_80393B91 = "object"; -SECTION_DEAD static char const* const stringBase_80393B98 = "objectTW"; -SECTION_DEAD static char const* const stringBase_80393BA1 = "MAD_a"; -SECTION_DEAD static char const* const stringBase_80393BA7 = "MAD_a_TW"; -SECTION_DEAD static char const* const stringBase_80393BB0 = "MCN_a"; -SECTION_DEAD static char const* const stringBase_80393BB6 = "MCN_a_TW"; -SECTION_DEAD static char const* const stringBase_80393BBF = "MON_a"; -SECTION_DEAD static char const* const stringBase_80393BC5 = "MON_a_TW"; -SECTION_DEAD static char const* const stringBase_80393BCE = "MAN_b"; -SECTION_DEAD static char const* const stringBase_80393BD4 = "MAN_b_TW"; -SECTION_DEAD static char const* const stringBase_80393BDD = "MAN_c"; -SECTION_DEAD static char const* const stringBase_80393BE3 = "MAN_c_TW"; -SECTION_DEAD static char const* const stringBase_80393BEC = "MAS_a"; -SECTION_DEAD static char const* const stringBase_80393BF2 = "MAS_a_TW"; -SECTION_DEAD static char const* const stringBase_80393BFB = "MBN_a"; -SECTION_DEAD static char const* const stringBase_80393C01 = "MBN_a_TW"; -SECTION_DEAD static char const* const stringBase_80393C0A = "MAN_a2"; -SECTION_DEAD static char const* const stringBase_80393C11 = "MAN_a2_TW"; -SECTION_DEAD static char const* const stringBase_80393C1B = "MAD_a2"; -SECTION_DEAD static char const* const stringBase_80393C22 = "MAD_a2_TW"; -SECTION_DEAD static char const* const stringBase_80393C2C = "MCN_a2"; -SECTION_DEAD static char const* const stringBase_80393C33 = "MCN_a2_TW"; -SECTION_DEAD static char const* const stringBase_80393C3D = "MON_a2"; -SECTION_DEAD static char const* const stringBase_80393C44 = "MON_a2_TW"; -SECTION_DEAD static char const* const stringBase_80393C4E = "MAN_b2"; -SECTION_DEAD static char const* const stringBase_80393C55 = "MAN_b2_TW"; -SECTION_DEAD static char const* const stringBase_80393C5F = "MAN_c2"; -SECTION_DEAD static char const* const stringBase_80393C66 = "MAN_c2_TW"; -SECTION_DEAD static char const* const stringBase_80393C70 = "MAS_a2"; -SECTION_DEAD static char const* const stringBase_80393C77 = "MAS_a2_TW"; -SECTION_DEAD static char const* const stringBase_80393C81 = "MBN_a2"; -SECTION_DEAD static char const* const stringBase_80393C88 = "MBN_a2_TW"; -SECTION_DEAD static char const* const stringBase_80393C92 = "WAN_a"; -SECTION_DEAD static char const* const stringBase_80393C98 = "WAN_a_TW"; -SECTION_DEAD static char const* const stringBase_80393CA1 = "Wgeneral"; -SECTION_DEAD static char const* const stringBase_80393CAA = "Wspecial"; -SECTION_DEAD static char const* const stringBase_80393CB3 = "WAD_a"; -SECTION_DEAD static char const* const stringBase_80393CB9 = "WAD_a_TW"; -SECTION_DEAD static char const* const stringBase_80393CC2 = "MAT_a"; -SECTION_DEAD static char const* const stringBase_80393CC8 = "MAT_a_TW"; -SECTION_DEAD static char const* const stringBase_80393CD1 = "WCN_a"; -SECTION_DEAD static char const* const stringBase_80393CD7 = "WCN_a_TW"; -SECTION_DEAD static char const* const stringBase_80393CE0 = "WON_a"; -SECTION_DEAD static char const* const stringBase_80393CE6 = "WON_a_TW"; -SECTION_DEAD static char const* const stringBase_80393CEF = "WGN_a"; -SECTION_DEAD static char const* const stringBase_80393CF5 = "WGN_a_TW"; -SECTION_DEAD static char const* const stringBase_80393CFE = "WAN_b"; -SECTION_DEAD static char const* const stringBase_80393D04 = "WAN_b_TW"; -SECTION_DEAD static char const* const stringBase_80393D0D = "WAN_a2"; -SECTION_DEAD static char const* const stringBase_80393D14 = "WAN_a2_TW"; -SECTION_DEAD static char const* const stringBase_80393D1E = "WAD_a2"; -SECTION_DEAD static char const* const stringBase_80393D25 = "WAD_a2_TW"; -SECTION_DEAD static char const* const stringBase_80393D2F = "MAT_a2"; -SECTION_DEAD static char const* const stringBase_80393D36 = "MAT_a2_TW"; -SECTION_DEAD static char const* const stringBase_80393D40 = "WCN_a2"; -SECTION_DEAD static char const* const stringBase_80393D47 = "WCN_a2_TW"; -SECTION_DEAD static char const* const stringBase_80393D51 = "WON_a2"; -SECTION_DEAD static char const* const stringBase_80393D58 = "WON_a2_TW"; -SECTION_DEAD static char const* const stringBase_80393D62 = "WGN_a2"; -SECTION_DEAD static char const* const stringBase_80393D69 = "WGN_a2_TW"; -SECTION_DEAD static char const* const stringBase_80393D73 = "WAN_b2"; -SECTION_DEAD static char const* const stringBase_80393D7A = "WAN_b2_TW"; -/* @stringBase0 padding */ -SECTION_DEAD static char const* const pad_80393D84 = "\0\0\0"; -#pragma pop +/* 80393B70-80393B70 0201D0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/a/obj/d_a_obj_item.cpp b/src/a/obj/d_a_obj_item.cpp index e6d12e79e62..9e54d87e1d0 100644 --- a/src/a/obj/d_a_obj_item.cpp +++ b/src/a/obj/d_a_obj_item.cpp @@ -175,7 +175,6 @@ struct dItem_data { struct dEvt_control_c { /* 80042468 */ void reset(); - /* 800436EC */ void setPtI_Id(unsigned int); }; struct dEvent_manager_c { @@ -399,7 +398,7 @@ extern "C" void Set__8dCcD_CylFRC11dCcD_SrcCyl(); extern "C" void execItemGet__FUc(); extern "C" void checkItemGet__FUci(); extern "C" void isHeart__FUc(); -extern "C" void func_80141AE8(u8*); +extern "C" void func_80141AE8(void* _this, u8*); extern "C" void DeleteBase__12daItemBase_cFPCc(); extern "C" bool clothCreate__12daItemBase_cFv(); extern "C" bool __CreateHeap__12daItemBase_cFv(); @@ -1029,6 +1028,13 @@ asm void daItem_c::procWaitGetDemoEvent() { } #pragma pop +/* ############################################################################################## */ +/* 80393D88-80393D88 0203E8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80393D88 = "DEFAULT_GETITEM"; +#pragma pop + /* 8015C3BC-8015C41C 156CFC 0060+00 1/0 0/0 0/0 .text procMainGetDemoEvent__8daItem_cFv */ #pragma push @@ -1461,7 +1467,7 @@ asm void __sinit_d_a_obj_item_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_8015DED0 = (void*)__sinit_d_a_obj_item_cpp; +REGISTER_CTORS(0x8015DED0, __sinit_d_a_obj_item_cpp); #pragma pop /* 8015DFD8-8015DFF4 158918 001C+00 2/2 0/0 0/0 .text getItemPos__9daPy_py_cCFv */ @@ -1484,9 +1490,4 @@ asm void daPy_py_c::getLeftHandPos() const { } #pragma pop -/* 80393D88-80393D98 0203E8 0010+00 1/1 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80393D88 = "DEFAULT_GETITEM"; -#pragma pop +/* 80393D88-80393D88 0203E8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/c/c_damagereaction.cpp b/src/c/c_damagereaction.cpp index 309ec4829d2..36dfda63eb3 100644 --- a/src/c/c_damagereaction.cpp +++ b/src/c/c_damagereaction.cpp @@ -157,7 +157,7 @@ asm void __sinit_c_damagereaction_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80018388 = (void*)__sinit_c_damagereaction_cpp; +REGISTER_CTORS(0x80018388, __sinit_c_damagereaction_cpp); #pragma pop /* 800183D4-800183D8 012D14 0004+00 1/0 1/0 0/0 .text diff --git a/src/c/c_dylink.cpp b/src/c/c_dylink.cpp index fa27ecc57bc..28626bebd25 100644 --- a/src/c/c_dylink.cpp +++ b/src/c/c_dylink.cpp @@ -112,6 +112,2274 @@ extern "C" extern void* __vt__20DynamicModuleControl[13]; // /* ############################################################################################## */ +/* 80375DE8-80375DF3 002448 000B+00 3/2 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80375DE8; + +/* 80375DF3-80375E02 002453 000F+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80375DF3; + +/* 80375E02-80375E12 002462 0010+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80375E02; + +/* 80375E12-80375E22 002472 0010+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80375E12; + +/* 80375E22-80375E31 002482 000F+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80375E22; + +/* 80375E31-80375E43 002491 0012+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80375E31; + +/* 80375E43-80375E4E 0024A3 000B+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80375E43; + +/* 80375E4E-80375E5E 0024AE 0010+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80375E4E; + +/* 80375E5E-80375E6D 0024BE 000F+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80375E5E; + +/* 80375E6D-80375E7F 0024CD 0012+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80375E6D; + +/* 80375E7F-80375E8F 0024DF 0010+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80375E7F; + +/* 80375E8F-80375E9C 0024EF 000D+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80375E8F; + +/* 80375E9C-80375EA8 0024FC 000C+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80375E9C; + +/* 80375EA8-80375EB5 002508 000D+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80375EA8; + +/* 80375EB5-80375EC4 002515 000F+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80375EB5; + +/* 80375EC4-80375ED5 002524 0011+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80375EC4; + +/* 80375ED5-80375EE3 002535 000E+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80375ED5; + +/* 80375EE3-80375EF0 002543 000D+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80375EE3; + +/* 80375EF0-80375EFD 002550 000D+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80375EF0; + +/* 80375EFD-80375F0A 00255D 000D+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80375EFD; + +/* 80375F0A-80375F15 00256A 000B+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80375F0A; + +/* 80375F15-80375F22 002575 000D+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80375F15; + +/* 80375F22-80375F2E 002582 000C+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80375F22; + +/* 80375F2E-80375F39 00258E 000B+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80375F2E; + +/* 80375F39-80375F44 002599 000B+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80375F39; + +/* 80375F44-80375F51 0025A4 000D+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80375F44; + +/* 80375F51-80375F5C 0025B1 000B+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80375F51; + +/* 80375F5C-80375F6B 0025BC 000F+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80375F5C; + +/* 80375F6B-80375F79 0025CB 000E+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80375F6B; + +/* 80375F79-80375F88 0025D9 000F+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80375F79; + +/* 80375F88-80375F96 0025E8 000E+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80375F88; + +/* 80375F96-80375FAA 0025F6 0014+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80375F96; + +/* 80375FAA-80375FBC 00260A 0012+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80375FAA; + +/* 80375FBC-80375FCC 00261C 0010+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80375FBC; + +/* 80375FCC-80375FDF 00262C 0013+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80375FCC; + +/* 80375FDF-80375FF3 00263F 0014+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80375FDF; + +/* 80375FF3-80376007 002653 0014+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80375FF3; + +/* 80376007-80376017 002667 0010+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80376007; + +/* 80376017-80376028 002677 0011+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80376017; + +/* 80376028-80376038 002688 0010+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80376028; + +/* 80376038-80376047 002698 000F+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80376038; + +/* 80376047-80376057 0026A7 0010+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80376047; + +/* 80376057-80376066 0026B7 000F+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80376057; + +/* 80376066-80376077 0026C6 0011+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80376066; + +/* 80376077-80376088 0026D7 0011+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80376077; + +/* 80376088-80376097 0026E8 000F+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80376088; + +/* 80376097-803760AB 0026F7 0014+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80376097; + +/* 803760AB-803760BA 00270B 000F+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803760AB; + +/* 803760BA-803760C9 00271A 000F+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803760BA; + +/* 803760C9-803760DC 002729 0013+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803760C9; + +/* 803760DC-803760EE 00273C 0012+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803760DC; + +/* 803760EE-80376100 00274E 0012+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803760EE; + +/* 80376100-80376111 002760 0011+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80376100; + +/* 80376111-80376121 002771 0010+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80376111; + +/* 80376121-80376136 002781 0015+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80376121; + +/* 80376136-80376149 002796 0013+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80376136; + +/* 80376149-8037615A 0027A9 0011+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80376149; + +/* 8037615A-80376170 0027BA 0016+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_8037615A; + +/* 80376170-8037617F 0027D0 000F+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80376170; + +/* 8037617F-8037618E 0027DF 000F+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_8037617F; + +/* 8037618E-8037619E 0027EE 0010+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_8037618E; + +/* 8037619E-803761AF 0027FE 0011+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_8037619E; + +/* 803761AF-803761C0 00280F 0011+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803761AF; + +/* 803761C0-803761D1 002820 0011+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803761C0; + +/* 803761D1-803761DF 002831 000E+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803761D1; + +/* 803761DF-803761EC 00283F 000D+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803761DF; + +/* 803761EC-803761FB 00284C 000F+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803761EC; + +/* 803761FB-80376208 00285B 000D+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803761FB; + +/* 80376208-80376217 002868 000F+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80376208; + +/* 80376217-80376223 002877 000C+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80376217; + +/* 80376223-80376233 002883 0010+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80376223; + +/* 80376233-80376243 002893 0010+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80376233; + +/* 80376243-80376257 0028A3 0014+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80376243; + +/* 80376257-80376269 0028B7 0012+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80376257; + +/* 80376269-80376274 0028C9 000B+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80376269; + +/* 80376274-80376282 0028D4 000E+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80376274; + +/* 80376282-80376291 0028E2 000F+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80376282; + +/* 80376291-803762A0 0028F1 000F+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80376291; + +/* 803762A0-803762AE 002900 000E+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803762A0; + +/* 803762AE-803762BC 00290E 000E+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803762AE; + +/* 803762BC-803762CA 00291C 000E+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803762BC; + +/* 803762CA-803762D8 00292A 000E+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803762CA; + +/* 803762D8-803762ED 002938 0015+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803762D8; + +/* 803762ED-803762FE 00294D 0011+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803762ED; + +/* 803762FE-8037630D 00295E 000F+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803762FE; + +/* 8037630D-8037631C 00296D 000F+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_8037630D; + +/* 8037631C-8037632B 00297C 000F+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_8037631C; + +/* 8037632B-8037633C 00298B 0011+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_8037632B; + +/* 8037633C-8037634B 00299C 000F+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_8037633C; + +/* 8037634B-8037635B 0029AB 0010+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_8037634B; + +/* 8037635B-8037636C 0029BB 0011+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_8037635B; + +/* 8037636C-8037637D 0029CC 0011+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_8037636C; + +/* 8037637D-8037638E 0029DD 0011+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_8037637D; + +/* 8037638E-8037639F 0029EE 0011+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_8037638E; + +/* 8037639F-803763B2 0029FF 0013+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_8037639F; + +/* 803763B2-803763C4 002A12 0012+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803763B2; + +/* 803763C4-803763D1 002A24 000D+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803763C4; + +/* 803763D1-803763DD 002A31 000C+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803763D1; + +/* 803763DD-803763EC 002A3D 000F+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803763DD; + +/* 803763EC-803763FD 002A4C 0011+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803763EC; + +/* 803763FD-8037640A 002A5D 000D+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803763FD; + +/* 8037640A-80376418 002A6A 000E+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_8037640A; + +/* 80376418-80376427 002A78 000F+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80376418; + +/* 80376427-80376437 002A87 0010+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80376427; + +/* 80376437-80376446 002A97 000F+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80376437; + +/* 80376446-80376454 002AA6 000E+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80376446; + +/* 80376454-80376462 002AB4 000E+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80376454; + +/* 80376462-80376470 002AC2 000E+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80376462; + +/* 80376470-8037647E 002AD0 000E+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80376470; + +/* 8037647E-8037648C 002ADE 000E+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_8037647E; + +/* 8037648C-8037649A 002AEC 000E+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_8037648C; + +/* 8037649A-803764AE 002AFA 0014+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_8037649A; + +/* 803764AE-803764C1 002B0E 0013+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803764AE; + +/* 803764C1-803764D5 002B21 0014+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803764C1; + +/* 803764D5-803764E6 002B35 0011+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803764D5; + +/* 803764E6-803764F7 002B46 0011+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803764E6; + +/* 803764F7-80376508 002B57 0011+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803764F7; + +/* 80376508-80376518 002B68 0010+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80376508; + +/* 80376518-8037652A 002B78 0012+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80376518; + +/* 8037652A-8037653B 002B8A 0011+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_8037652A; + +/* 8037653B-8037654D 002B9B 0012+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_8037653B; + +/* 8037654D-8037655D 002BAD 0010+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_8037654D; + +/* 8037655D-8037656D 002BBD 0010+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_8037655D; + +/* 8037656D-8037657E 002BCD 0011+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_8037656D; + +/* 8037657E-80376591 002BDE 0013+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_8037657E; + +/* 80376591-803765A5 002BF1 0014+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80376591; + +/* 803765A5-803765B9 002C05 0014+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803765A5; + +/* 803765B9-803765CB 002C19 0012+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803765B9; + +/* 803765CB-803765DD 002C2B 0012+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803765CB; + +/* 803765DD-803765EF 002C3D 0012+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803765DD; + +/* 803765EF-80376605 002C4F 0016+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803765EF; + +/* 80376605-8037661B 002C65 0016+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80376605; + +/* 8037661B-8037662D 002C7B 0012+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_8037661B; + +/* 8037662D-80376642 002C8D 0015+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_8037662D; + +/* 80376642-80376652 002CA2 0010+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80376642; + +/* 80376652-80376664 002CB2 0012+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80376652; + +/* 80376664-80376679 002CC4 0015+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80376664; + +/* 80376679-8037668D 002CD9 0014+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80376679; + +/* 8037668D-803766A3 002CED 0016+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_8037668D; + +/* 803766A3-803766B5 002D03 0012+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803766A3; + +/* 803766B5-803766C9 002D15 0014+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803766B5; + +/* 803766C9-803766DF 002D29 0016+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803766C9; + +/* 803766DF-803766EF 002D3F 0010+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803766DF; + +/* 803766EF-80376702 002D4F 0013+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803766EF; + +/* 80376702-80376717 002D62 0015+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80376702; + +/* 80376717-80376729 002D77 0012+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80376717; + +/* 80376729-8037673A 002D89 0011+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80376729; + +/* 8037673A-8037674D 002D9A 0013+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_8037673A; + +/* 8037674D-8037675D 002DAD 0010+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_8037674D; + +/* 8037675D-8037676D 002DBD 0010+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_8037675D; + +/* 8037676D-8037677D 002DCD 0010+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_8037676D; + +/* 8037677D-8037678F 002DDD 0012+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_8037677D; + +/* 8037678F-803767A4 002DEF 0015+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_8037678F; + +/* 803767A4-803767B8 002E04 0014+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803767A4; + +/* 803767B8-803767CD 002E18 0015+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803767B8; + +/* 803767CD-803767E2 002E2D 0015+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803767CD; + +/* 803767E2-803767F7 002E42 0015+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803767E2; + +/* 803767F7-80376809 002E57 0012+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803767F7; + +/* 80376809-80376818 002E69 000F+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80376809; + +/* 80376818-8037682A 002E78 0012+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80376818; + +/* 8037682A-8037683B 002E8A 0011+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_8037682A; + +/* 8037683B-8037684D 002E9B 0012+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_8037683B; + +/* 8037684D-8037685B 002EAD 000E+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_8037684D; + +/* 8037685B-8037686B 002EBB 0010+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_8037685B; + +/* 8037686B-80376879 002ECB 000E+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_8037686B; + +/* 80376879-80376883 002ED9 000A+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80376879; + +/* 80376883-80376897 002EE3 0014+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80376883; + +/* 80376897-803768A7 002EF7 0010+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80376897; + +/* 803768A7-803768B5 002F07 000E+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803768A7; + +/* 803768B5-803768C3 002F15 000E+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803768B5; + +/* 803768C3-803768D6 002F23 0013+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803768C3; + +/* 803768D6-803768E8 002F36 0012+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803768D6; + +/* 803768E8-803768F9 002F48 0011+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803768E8; + +/* 803768F9-80376909 002F59 0010+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803768F9; + +/* 80376909-80376918 002F69 000F+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80376909; + +/* 80376918-80376927 002F78 000F+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80376918; + +/* 80376927-80376939 002F87 0012+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80376927; + +/* 80376939-8037694A 002F99 0011+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80376939; + +/* 8037694A-8037695B 002FAA 0011+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_8037694A; + +/* 8037695B-8037696E 002FBB 0013+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_8037695B; + +/* 8037696E-80376981 002FCE 0013+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_8037696E; + +/* 80376981-8037698F 002FE1 000E+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80376981; + +/* 8037698F-803769A4 002FEF 0015+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_8037698F; + +/* 803769A4-803769B5 003004 0011+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803769A4; + +/* 803769B5-803769C4 003015 000F+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803769B5; + +/* 803769C4-803769D3 003024 000F+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803769C4; + +/* 803769D3-803769E5 003033 0012+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803769D3; + +/* 803769E5-803769F5 003045 0010+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803769E5; + +/* 803769F5-803769FE 003055 0009+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803769F5; + +/* 803769FE-80376A14 00305E 0016+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803769FE; + +/* 80376A14-80376A26 003074 0012+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80376A14; + +/* 80376A26-80376A37 003086 0011+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80376A26; + +/* 80376A37-80376A49 003097 0012+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80376A37; + +/* 80376A49-80376A5B 0030A9 0012+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80376A49; + +/* 80376A5B-80376A6D 0030BB 0012+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80376A5B; + +/* 80376A6D-80376A7E 0030CD 0011+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80376A6D; + +/* 80376A7E-80376A90 0030DE 0012+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80376A7E; + +/* 80376A90-80376AA2 0030F0 0012+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80376A90; + +/* 80376AA2-80376AB2 003102 0010+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80376AA2; + +/* 80376AB2-80376AC0 003112 000E+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80376AB2; + +/* 80376AC0-80376ACE 003120 000E+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80376AC0; + +/* 80376ACE-80376ADF 00312E 0011+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80376ACE; + +/* 80376ADF-80376AF0 00313F 0011+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80376ADF; + +/* 80376AF0-80376B00 003150 0010+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80376AF0; + +/* 80376B00-80376B10 003160 0010+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80376B00; + +/* 80376B10-80376B20 003170 0010+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80376B10; + +/* 80376B20-80376B29 003180 0009+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80376B20; + +/* 80376B29-80376B35 003189 000C+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80376B29; + +/* 80376B35-80376B48 003195 0013+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80376B35; + +/* 80376B48-80376B59 0031A8 0011+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80376B48; + +/* 80376B59-80376B6A 0031B9 0011+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80376B59; + +/* 80376B6A-80376B78 0031CA 000E+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80376B6A; + +/* 80376B78-80376B86 0031D8 000E+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80376B78; + +/* 80376B86-80376B94 0031E6 000E+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80376B86; + +/* 80376B94-80376BA2 0031F4 000E+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80376B94; + +/* 80376BA2-80376BAC 003202 000A+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80376BA2; + +/* 80376BAC-80376BB6 00320C 000A+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80376BAC; + +/* 80376BB6-80376BBF 003216 0009+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80376BB6; + +/* 80376BBF-80376BCB 00321F 000C+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80376BBF; + +/* 80376BCB-80376BD6 00322B 000B+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80376BCB; + +/* 80376BD6-80376BE2 003236 000C+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80376BD6; + +/* 80376BE2-80376BEB 003242 0009+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80376BE2; + +/* 80376BEB-80376BF4 00324B 0009+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80376BEB; + +/* 80376BF4-80376BFD 003254 0009+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80376BF4; + +/* 80376BFD-80376C06 00325D 0009+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80376BFD; + +/* 80376C06-80376C0F 003266 0009+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80376C06; + +/* 80376C0F-80376C21 00326F 0012+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80376C0F; + +/* 80376C21-80376C2C 003281 000B+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80376C21; + +/* 80376C2C-80376C3D 00328C 0011+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80376C2C; + +/* 80376C3D-80376C46 00329D 0009+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80376C3D; + +/* 80376C46-80376C50 0032A6 000A+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80376C46; + +/* 80376C50-80376C5E 0032B0 000E+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80376C50; + +/* 80376C5E-80376C68 0032BE 000A+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80376C5E; + +/* 80376C68-80376C73 0032C8 000B+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80376C68; + +/* 80376C73-80376C80 0032D3 000D+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80376C73; + +/* 80376C80-80376C8C 0032E0 000C+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80376C80; + +/* 80376C8C-80376C9D 0032EC 0011+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80376C8C; + +/* 80376C9D-80376CA8 0032FD 000B+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80376C9D; + +/* 80376CA8-80376CAF 003308 0007+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80376CA8; + +/* 80376CAF-80376CB7 00330F 0008+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80376CAF; + +/* 80376CB7-80376CC0 003317 0009+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80376CB7; + +/* 80376CC0-80376CC7 003320 0007+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80376CC0; + +/* 80376CC7-80376CD4 003327 000D+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80376CC7; + +/* 80376CD4-80376CDB 003334 0007+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80376CD4; + +/* 80376CDB-80376CE6 00333B 000B+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80376CDB; + +/* 80376CE6-80376CED 003346 0007+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80376CE6; + +/* 80376CED-80376CF8 00334D 000B+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80376CED; + +/* 80376CF8-80376D03 003358 000B+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80376CF8; + +/* 80376D03-80376D0E 003363 000B+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80376D03; + +/* 80376D0E-80376D1B 00336E 000D+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80376D0E; + +/* 80376D1B-80376D26 00337B 000B+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80376D1B; + +/* 80376D26-80376D33 003386 000D+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80376D26; + +/* 80376D33-80376D3F 003393 000C+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80376D33; + +/* 80376D3F-80376D4F 00339F 0010+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80376D3F; + +/* 80376D4F-80376D5E 0033AF 000F+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80376D4F; + +/* 80376D5E-80376D69 0033BE 000B+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80376D5E; + +/* 80376D69-80376D78 0033C9 000F+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80376D69; + +/* 80376D78-80376D85 0033D8 000D+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80376D78; + +/* 80376D85-80376D93 0033E5 000E+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80376D85; + +/* 80376D93-80376DA0 0033F3 000D+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80376D93; + +/* 80376DA0-80376DB0 003400 0010+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80376DA0; + +/* 80376DB0-80376DC0 003410 0010+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80376DB0; + +/* 80376DC0-80376DCF 003420 000F+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80376DC0; + +/* 80376DCF-80376DDF 00342F 0010+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80376DCF; + +/* 80376DDF-80376DED 00343F 000E+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80376DDF; + +/* 80376DED-80376DFE 00344D 0011+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80376DED; + +/* 80376DFE-80376E0E 00345E 0010+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80376DFE; + +/* 80376E0E-80376E1F 00346E 0011+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80376E0E; + +/* 80376E1F-80376E33 00347F 0014+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80376E1F; + +/* 80376E33-80376E43 003493 0010+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80376E33; + +/* 80376E43-80376E56 0034A3 0013+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80376E43; + +/* 80376E56-80376E6A 0034B6 0014+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80376E56; + +/* 80376E6A-80376E7C 0034CA 0012+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80376E6A; + +/* 80376E7C-80376E8A 0034DC 000E+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80376E7C; + +/* 80376E8A-80376E98 0034EA 000E+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80376E8A; + +/* 80376E98-80376EA6 0034F8 000E+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80376E98; + +/* 80376EA6-80376EB6 003506 0010+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80376EA6; + +/* 80376EB6-80376EC2 003516 000C+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80376EB6; + +/* 80376EC2-80376ED2 003522 0010+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80376EC2; + +/* 80376ED2-80376EE2 003532 0010+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80376ED2; + +/* 80376EE2-80376EF0 003542 000E+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80376EE2; + +/* 80376EF0-80376EFE 003550 000E+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80376EF0; + +/* 80376EFE-80376F0A 00355E 000C+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80376EFE; + +/* 80376F0A-80376F1B 00356A 0011+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80376F0A; + +/* 80376F1B-80376F2A 00357B 000F+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80376F1B; + +/* 80376F2A-80376F39 00358A 000F+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80376F2A; + +/* 80376F39-80376F46 003599 000D+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80376F39; + +/* 80376F46-80376F52 0035A6 000C+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80376F46; + +/* 80376F52-80376F5F 0035B2 000D+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80376F52; + +/* 80376F5F-80376F6A 0035BF 000B+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80376F5F; + +/* 80376F6A-80376F78 0035CA 000E+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80376F6A; + +/* 80376F78-80376F85 0035D8 000D+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80376F78; + +/* 80376F85-80376F92 0035E5 000D+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80376F85; + +/* 80376F92-80376FA0 0035F2 000E+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80376F92; + +/* 80376FA0-80376FAE 003600 000E+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80376FA0; + +/* 80376FAE-80376FBF 00360E 0011+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80376FAE; + +/* 80376FBF-80376FCE 00361F 000F+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80376FBF; + +/* 80376FCE-80376FDD 00362E 000F+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80376FCE; + +/* 80376FDD-80376FE9 00363D 000C+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80376FDD; + +/* 80376FE9-80376FFA 003649 0011+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80376FE9; + +/* 80376FFA-80377006 00365A 000C+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80376FFA; + +/* 80377006-80377012 003666 000C+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80377006; + +/* 80377012-80377023 003672 0011+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80377012; + +/* 80377023-8037702F 003683 000C+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80377023; + +/* 8037702F-8037703B 00368F 000C+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_8037702F; + +/* 8037703B-80377047 00369B 000C+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_8037703B; + +/* 80377047-80377055 0036A7 000E+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80377047; + +/* 80377055-80377063 0036B5 000E+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80377055; + +/* 80377063-80377077 0036C3 0014+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80377063; + +/* 80377077-80377086 0036D7 000F+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80377077; + +/* 80377086-80377097 0036E6 0011+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80377086; + +/* 80377097-803770A8 0036F7 0011+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80377097; + +/* 803770A8-803770B8 003708 0010+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803770A8; + +/* 803770B8-803770CA 003718 0012+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803770B8; + +/* 803770CA-803770E1 00372A 0017+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803770CA; + +/* 803770E1-803770F6 003741 0015+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803770E1; + +/* 803770F6-8037710B 003756 0015+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803770F6; + +/* 8037710B-8037711B 00376B 0010+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_8037710B; + +/* 8037711B-8037712B 00377B 0010+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_8037711B; + +/* 8037712B-80377138 00378B 000D+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_8037712B; + +/* 80377138-80377147 003798 000F+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80377138; + +/* 80377147-80377156 0037A7 000F+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80377147; + +/* 80377156-80377165 0037B6 000F+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80377156; + +/* 80377165-80377177 0037C5 0012+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80377165; + +/* 80377177-80377187 0037D7 0010+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80377177; + +/* 80377187-80377198 0037E7 0011+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80377187; + +/* 80377198-803771AB 0037F8 0013+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80377198; + +/* 803771AB-803771BF 00380B 0014+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803771AB; + +/* 803771BF-803771CF 00381F 0010+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803771BF; + +/* 803771CF-803771DF 00382F 0010+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803771CF; + +/* 803771DF-803771ED 00383F 000E+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803771DF; + +/* 803771ED-803771FB 00384D 000E+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803771ED; + +/* 803771FB-8037720C 00385B 0011+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803771FB; + +/* 8037720C-80377222 00386C 0016+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_8037720C; + +/* 80377222-80377232 003882 0010+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80377222; + +/* 80377232-80377245 003892 0013+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80377232; + +/* 80377245-80377254 0038A5 000F+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80377245; + +/* 80377254-80377265 0038B4 0011+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80377254; + +/* 80377265-80377276 0038C5 0011+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80377265; + +/* 80377276-80377288 0038D6 0012+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80377276; + +/* 80377288-80377297 0038E8 000F+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80377288; + +/* 80377297-803772A9 0038F7 0012+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80377297; + +/* 803772A9-803772B7 003909 000E+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803772A9; + +/* 803772B7-803772C2 003917 000B+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803772B7; + +/* 803772C2-803772D2 003922 0010+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803772C2; + +/* 803772D2-803772E1 003932 000F+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803772D2; + +/* 803772E1-803772F3 003941 0012+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803772E1; + +/* 803772F3-80377305 003953 0012+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803772F3; + +/* 80377305-8037731A 003965 0015+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80377305; + +/* 8037731A-80377333 00397A 0019+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_8037731A; + +/* 80377333-80377342 003993 000F+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80377333; + +/* 80377342-80377350 0039A2 000E+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80377342; + +/* 80377350-80377362 0039B0 0012+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80377350; + +/* 80377362-80377371 0039C2 000F+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80377362; + +/* 80377371-80377380 0039D1 000F+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80377371; + +/* 80377380-8037738F 0039E0 000F+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80377380; + +/* 8037738F-803773A2 0039EF 0013+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_8037738F; + +/* 803773A2-803773B4 003A02 0012+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803773A2; + +/* 803773B4-803773C0 003A14 000C+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803773B4; + +/* 803773C0-803773CB 003A20 000B+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803773C0; + +/* 803773CB-803773DF 003A2B 0014+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803773CB; + +/* 803773DF-803773F2 003A3F 0013+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803773DF; + +/* 803773F2-80377404 003A52 0012+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803773F2; + +/* 80377404-80377415 003A64 0011+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80377404; + +/* 80377415-80377425 003A75 0010+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80377415; + +/* 80377425-8037743A 003A85 0015+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80377425; + +/* 8037743A-8037744E 003A9A 0014+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_8037743A; + +/* 8037744E-8037745A 003AAE 000C+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_8037744E; + +/* 8037745A-8037746A 003ABA 0010+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_8037745A; + +/* 8037746A-8037747F 003ACA 0015+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_8037746A; + +/* 8037747F-80377490 003ADF 0011+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_8037747F; + +/* 80377490-803774A3 003AF0 0013+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80377490; + +/* 803774A3-803774B5 003B03 0012+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803774A3; + +/* 803774B5-803774C5 003B15 0010+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803774B5; + +/* 803774C5-803774D7 003B25 0012+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803774C5; + +/* 803774D7-803774EB 003B37 0014+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803774D7; + +/* 803774EB-803774FE 003B4B 0013+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803774EB; + +/* 803774FE-8037750D 003B5E 000F+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803774FE; + +/* 8037750D-8037751F 003B6D 0012+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_8037750D; + +/* 8037751F-80377533 003B7F 0014+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_8037751F; + +/* 80377533-80377542 003B93 000F+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80377533; + +/* 80377542-80377553 003BA2 0011+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80377542; + +/* 80377553-80377561 003BB3 000E+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80377553; + +/* 80377561-80377573 003BC1 0012+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80377561; + +/* 80377573-80377580 003BD3 000D+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80377573; + +/* 80377580-8037758C 003BE0 000C+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80377580; + +/* 8037758C-8037759C 003BEC 0010+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_8037758C; + +/* 8037759C-803775AC 003BFC 0010+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_8037759C; + +/* 803775AC-803775BE 003C0C 0012+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803775AC; + +/* 803775BE-803775CE 003C1E 0010+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803775BE; + +/* 803775CE-803775DE 003C2E 0010+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803775CE; + +/* 803775DE-803775EE 003C3E 0010+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803775DE; + +/* 803775EE-803775FE 003C4E 0010+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803775EE; + +/* 803775FE-8037760E 003C5E 0010+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803775FE; + +/* 8037760E-80377619 003C6E 000B+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_8037760E; + +/* 80377619-8037762B 003C79 0012+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80377619; + +/* 8037762B-8037763D 003C8B 0012+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_8037762B; + +/* 8037763D-8037764D 003C9D 0010+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_8037763D; + +/* 8037764D-80377661 003CAD 0014+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_8037764D; + +/* 80377661-80377671 003CC1 0010+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80377661; + +/* 80377671-80377681 003CD1 0010+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80377671; + +/* 80377681-8037768E 003CE1 000D+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80377681; + +/* 8037768E-803776A1 003CEE 0013+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_8037768E; + +/* 803776A1-803776B5 003D01 0014+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803776A1; + +/* 803776B5-803776C6 003D15 0011+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803776B5; + +/* 803776C6-803776D4 003D26 000E+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803776C6; + +/* 803776D4-803776E3 003D34 000F+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803776D4; + +/* 803776E3-803776F6 003D43 0013+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803776E3; + +/* 803776F6-803776FF 003D56 0009+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803776F6; + +/* 803776FF-80377708 003D5F 0009+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803776FF; + +/* 80377708-80377712 003D68 000A+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80377708; + +/* 80377712-8037771B 003D72 0009+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80377712; + +/* 8037771B-80377724 003D7B 0009+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_8037771B; + +/* 80377724-8037772D 003D84 0009+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80377724; + +/* 8037772D-80377736 003D8D 0009+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_8037772D; + +/* 80377736-8037773F 003D96 0009+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80377736; + +/* 8037773F-80377748 003D9F 0009+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_8037773F; + +/* 80377748-80377751 003DA8 0009+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80377748; + +/* 80377751-8037775A 003DB1 0009+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80377751; + +/* 8037775A-80377763 003DBA 0009+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_8037775A; + +/* 80377763-8037776C 003DC3 0009+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80377763; + +/* 8037776C-80377775 003DCC 0009+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_8037776C; + +/* 80377775-8037777E 003DD5 0009+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80377775; + +/* 8037777E-80377788 003DDE 000A+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_8037777E; + +/* 80377788-80377791 003DE8 0009+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80377788; + +/* 80377791-8037779F 003DF1 000E+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80377791; + +/* 8037779F-803777A8 003DFF 0009+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_8037779F; + +/* 803777A8-803777B1 003E08 0009+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803777A8; + +/* 803777B1-803777BA 003E11 0009+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803777B1; + +/* 803777BA-803777C7 003E1A 000D+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803777BA; + +/* 803777C7-803777D0 003E27 0009+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803777C7; + +/* 803777D0-803777DE 003E30 000E+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803777D0; + +/* 803777DE-803777E7 003E3E 0009+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803777DE; + +/* 803777E7-803777F0 003E47 0009+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803777E7; + +/* 803777F0-803777F9 003E50 0009+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803777F0; + +/* 803777F9-80377807 003E59 000E+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803777F9; + +/* 80377807-80377814 003E67 000D+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80377807; + +/* 80377814-8037781D 003E74 0009+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80377814; + +/* 8037781D-80377826 003E7D 0009+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_8037781D; + +/* 80377826-80377834 003E86 000E+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80377826; + +/* 80377834-8037783D 003E94 0009+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80377834; + +/* 8037783D-80377846 003E9D 0009+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_8037783D; + +/* 80377846-80377850 003EA6 000A+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80377846; + +/* 80377850-8037785E 003EB0 000E+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80377850; + +/* 8037785E-80377867 003EBE 0009+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_8037785E; + +/* 80377867-80377870 003EC7 0009+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80377867; + +/* 80377870-8037787A 003ED0 000A+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80377870; + +/* 8037787A-80377884 003EDA 000A+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_8037787A; + +/* 80377884-8037788D 003EE4 0009+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80377884; + +/* 8037788D-80377896 003EED 0009+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_8037788D; + +/* 80377896-8037789F 003EF6 0009+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80377896; + +/* 8037789F-803778A8 003EFF 0009+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_8037789F; + +/* 803778A8-803778B1 003F08 0009+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803778A8; + +/* 803778B1-803778BA 003F11 0009+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803778B1; + +/* 803778BA-803778C3 003F1A 0009+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803778BA; + +/* 803778C3-803778CC 003F23 0009+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803778C3; + +/* 803778CC-803778D5 003F2C 0009+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803778CC; + +/* 803778D5-803778DE 003F35 0009+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803778D5; + +/* 803778DE-803778E7 003F3E 0009+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803778DE; + +/* 803778E7-803778F0 003F47 0009+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803778E7; + +/* 803778F0-803778F9 003F50 0009+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803778F0; + +/* 803778F9-80377902 003F59 0009+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803778F9; + +/* 80377902-8037790B 003F62 0009+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80377902; + +/* 8037790B-80377914 003F6B 0009+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_8037790B; + +/* 80377914-8037791D 003F74 0009+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80377914; + +/* 8037791D-80377928 003F7D 000B+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_8037791D; + +/* 80377928-80377931 003F88 0009+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80377928; + +/* 80377931-8037793A 003F91 0009+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80377931; + +/* 8037793A-80377943 003F9A 0009+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_8037793A; + +/* 80377943-8037794D 003FA3 000A+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80377943; + +/* 8037794D-80377957 003FAD 000A+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_8037794D; + +/* 80377957-80377960 003FB7 0009+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80377957; + +/* 80377960-80377969 003FC0 0009+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80377960; + +/* 80377969-80377972 003FC9 0009+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80377969; + +/* 80377972-8037797B 003FD2 0009+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80377972; + +/* 8037797B-80377984 003FDB 0009+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_8037797B; + +/* 80377984-80377994 003FE4 0010+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80377984; + +/* 80377994-8037799D 003FF4 0009+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80377994; + +/* 8037799D-803779AA 003FFD 000D+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_8037799D; + +/* 803779AA-803779B4 00400A 000A+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803779AA; + +/* 803779B4-803779C5 004014 0011+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803779B4; + +/* 803779C5-803779D7 004025 0012+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803779C5; + +/* 803779D7-803779E0 004037 0009+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803779D7; + +/* 803779E0-803779E9 004040 0009+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803779E0; + +/* 803779E9-803779F2 004049 0009+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803779E9; + +/* 803779F2-803779FB 004052 0009+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803779F2; + +/* 803779FB-80377A04 00405B 0009+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803779FB; + +/* 80377A04-80377A0D 004064 0009+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80377A04; + +/* 80377A0D-80377A16 00406D 0009+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80377A0D; + +/* 80377A16-80377A1F 004076 0009+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80377A16; + +/* 80377A1F-80377A28 00407F 0009+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80377A1F; + +/* 80377A28-80377A35 004088 000D+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80377A28; + +/* 80377A35-80377A43 004095 000E+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80377A35; + +/* 80377A43-80377A50 0040A3 000D+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80377A43; + +/* 80377A50-80377A61 0040B0 0011+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80377A50; + +/* 80377A61-80377A6A 0040C1 0009+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80377A61; + +/* 80377A6A-80377A73 0040CA 0009+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80377A6A; + +/* 80377A73-80377A7C 0040D3 0009+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80377A73; + +/* 80377A7C-80377A85 0040DC 0009+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80377A7C; + +/* 80377A85-80377A8E 0040E5 0009+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80377A85; + +/* 80377A8E-80377A97 0040EE 0009+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80377A8E; + +/* 80377A97-80377AA0 0040F7 0009+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80377A97; + +/* 80377AA0-80377AA9 004100 0009+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80377AA0; + +/* 80377AA9-80377AB3 004109 000A+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80377AA9; + +/* 80377AB3-80377ABC 004113 0009+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80377AB3; + +/* 80377ABC-80377AC6 00411C 000A+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80377ABC; + +/* 80377AC6-80377ACF 004126 0009+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80377AC6; + +/* 80377ACF-80377ADC 00412F 000D+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80377ACF; + +/* 80377ADC-80377AE5 00413C 0009+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80377ADC; + +/* 80377AE5-80377AEE 004145 0009+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80377AE5; + +/* 80377AEE-80377AF8 00414E 000A+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80377AEE; + +/* 80377AF8-80377B02 004158 000A+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80377AF8; + +/* 80377B02-80377B13 004162 0011+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80377B02; + +/* 80377B13-80377B24 004173 0011+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80377B13; + +/* 80377B24-80377B34 004184 0010+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80377B24; + +/* 80377B34-80377B4B 004194 0017+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80377B34; + +/* 80377B4B-80377B5A 0041AB 000F+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80377B4B; + +/* 80377B5A-80377B68 0041BA 000E+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80377B5A; + +/* 80377B68-80377B76 0041C8 000E+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80377B68; + +/* 80377B76-80377B83 0041D6 000D+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80377B76; + +/* 80377B83-80377B8E 0041E3 000B+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80377B83; + +/* 80377B8E-80377B98 0041EE 000A+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80377B8E; + +/* 80377B98-80377BA4 0041F8 000C+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80377B98; + +/* 80377BA4-80377BAF 004204 000B+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80377BA4; + +/* 80377BAF-80377BBB 00420F 000C+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80377BAF; + +/* 80377BBB-80377BC5 00421B 000A+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80377BBB; + +/* 80377BC5-80377BD5 004225 0010+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80377BC5; + +/* 80377BD5-80377BE7 004235 0012+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80377BD5; + +/* 80377BE7-80377BF5 004247 000E+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80377BE7; + +/* 80377BF5-80377C05 004255 0010+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80377BF5; + +/* 80377C05-80377C16 004265 0011+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80377C05; + +/* 80377C16-80377C26 004276 0010+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80377C16; + +/* 80377C26-80377C33 004286 000D+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80377C26; + +/* 80377C33-80377C43 004293 0010+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80377C33; + +/* 80377C43-80377C56 0042A3 0013+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80377C43; + +/* 80377C56-80377C69 0042B6 0013+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80377C56; + +/* 80377C69-80377C73 0042C9 000A+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80377C69; + +/* 80377C73-80377C7E 0042D3 000B+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80377C73; + +/* 80377C7E-80377C87 0042DE 0009+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80377C7E; + +/* 80377C87-80377C93 0042E7 000C+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80377C87; + +/* 80377C93-80377C9F 0042F3 000C+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80377C93; + +/* 80377C9F-80377CAB 0042FF 000C+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80377C9F; + +/* 80377CAB-80377CB7 00430B 000C+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80377CAB; + +/* 80377CB7-80377CC3 004317 000C+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80377CB7; + +/* 80377CC3-80377CD0 004323 000D+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80377CC3; + +/* 80377CD0-80377CDC 004330 000C+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80377CD0; + +/* 80377CDC-80377CE8 00433C 000C+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80377CDC; + +/* 80377CE8-80377CF4 004348 000C+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80377CE8; + +/* 80377CF4-80377D00 004354 000C+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80377CF4; + +/* 80377D00-80377D0E 004360 000E+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80377D00; + +/* 80377D0E-80377D1C 00436E 000E+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80377D0E; + +/* 80377D1C-80377D2A 00437C 000E+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80377D1C; + +/* 80377D2A-80377D3A 00438A 0010+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80377D2A; + +/* 80377D3A-80377D4A 00439A 0010+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80377D3A; + +/* 80377D4A-80377D56 0043AA 000C+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80377D4A; + +/* 80377D56-80377D62 0043B6 000C+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80377D56; + +/* 80377D62-80377D6F 0043C2 000D+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80377D62; + +/* 80377D6F-80377D7C 0043CF 000D+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80377D6F; + +/* 80377D7C-80377D88 0043DC 000C+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80377D7C; + +/* 80377D88-80377D95 0043E8 000D+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80377D88; + +/* 80377D95-80377DA4 0043F5 000F+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80377D95; + +/* 80377DA4-80377DB3 004404 000F+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80377DA4; + +/* 80377DB3-80377DC2 004413 000F+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80377DB3; + +/* 80377DC2-80377DD3 004422 0011+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80377DC2; + +/* 80377DD3-80377DE1 004433 000E+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80377DD3; + +/* 80377DE1-80377DF5 004441 0014+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80377DE1; + +/* 80377DF5-80377E01 004455 000C+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80377DF5; + +/* 80377E01-80377E0F 004461 000E+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80377E01; + +/* 80377E0F-80377E1B 00446F 000C+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80377E0F; + +/* 80377E1B-80377E27 00447B 000C+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80377E1B; + +/* 80377E27-80377E3C 004487 0015+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80377E27; + +/* 80377E3C-80377E4A 00449C 000E+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80377E3C; + +/* 80377E4A-80377E58 0044AA 000E+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80377E4A; + +/* 80377E58-80377E66 0044B8 000E+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80377E58; + +/* 80377E66-80377E75 0044C6 000F+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80377E66; + +/* 80377E75-80377E81 0044D5 000C+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80377E75; + +/* 80377E81-80377E8F 0044E1 000E+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80377E81; + +/* 80377E8F-80377E9C 0044EF 000D+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80377E8F; + +/* 80377E9C-80377EA7 0044FC 000B+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80377E9C; + +/* 80377EA7-80377EB8 004507 0011+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80377EA7; + +/* 80377EB8-80377EC4 004518 000C+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80377EB8; + +/* 80377EC4-80377ED2 004524 000E+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80377EC4; + +/* 80377ED2-80377EE1 004532 000F+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80377ED2; + +/* 80377EE1-80377EEF 004541 000E+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80377EE1; + +/* 80377EEF-80377EFC 00454F 000D+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80377EEF; + +/* 80377EFC-80377F09 00455C 000D+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80377EFC; + +/* 80377F09-80377F15 004569 000C+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80377F09; + +/* 80377F15-80377F22 004575 000D+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80377F15; + +/* 80377F22-80377F2F 004582 000D+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80377F22; + +/* 80377F2F-80377F3C 00458F 000D+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80377F2F; + +/* 80377F3C-80377F49 00459C 000D+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80377F3C; + +/* 80377F49-80377F56 0045A9 000D+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80377F49; + +/* 80377F56-80377F64 0045B6 000E+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80377F56; + +/* 80377F64-80377F73 0045C4 000F+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80377F64; + +/* 80377F73-80377F82 0045D3 000F+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80377F73; + +/* 80377F82-80377F91 0045E2 000F+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80377F82; + +/* 80377F91-80377FA3 0045F1 0012+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80377F91; + +/* 80377FA3-80377FB0 004603 000D+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80377FA3; + +/* 80377FB0-80377FBD 004610 000D+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80377FB0; + +/* 80377FBD-80377FD0 00461D 0013+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80377FBD; + +/* 80377FD0-80377FE3 004630 0013+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80377FD0; + +/* 80377FE3-80377FF6 004643 0013+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80377FE3; + +/* 80377FF6-80378004 004656 000E+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80377FF6; + +/* 80378004-80378010 004664 000C+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80378004; + +/* 80378010-8037801C 004670 000C+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80378010; + +/* 8037801C-80378028 00467C 000C+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_8037801C; + +/* 80378028-80378034 004688 000C+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80378028; + +/* 80378034-80378040 004694 000C+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80378034; + +/* 80378040-8037804D 0046A0 000D+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80378040; + +/* 8037804D-80378059 0046AD 000C+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_8037804D; + +/* 80378059-80378067 0046B9 000E+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80378059; + +/* 80378067-80378073 0046C7 000C+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80378067; + +/* 80378073-8037807F 0046D3 000C+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80378073; + +/* 8037807F-8037808C 0046DF 000D+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_8037807F; + +/* 8037808C-80378099 0046EC 000D+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_8037808C; + +/* 80378099-803780A7 0046F9 000E+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80378099; + +/* 803780A7-803780B4 004707 000D+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803780A7; + +/* 803780B4-803780C2 004714 000E+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803780B4; + +/* 803780C2-803780D5 004722 0013+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803780C2; + +/* 803780D5-803780E1 004735 000C+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803780D5; + +/* 803780E1-803780ED 004741 000C+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803780E1; + +/* 803780ED-803780FD 00474D 0010+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803780ED; + +/* 803780FD-8037810B 00475D 000E+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803780FD; + +/* 8037810B-80378119 00476B 000E+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_8037810B; + +/* 80378119-80378126 004779 000D+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80378119; + +/* 80378126-80378137 004786 0011+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80378126; + +/* 80378137-80378146 004797 000F+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80378137; + +/* 80378146-80378153 0047A6 000D+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80378146; + +/* 80378153-80378164 0047B3 0011+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80378153; + +/* 80378164-80378175 0047C4 0011+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80378164; + +/* 80378175-80378184 0047D5 000F+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80378175; + +/* 80378184-80378193 0047E4 000F+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80378184; + +/* 80378193-803781A3 0047F3 0010+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80378193; + +/* 803781A3-803781B0 004803 000D+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803781A3; + +/* 803781B0-803781BE 004810 000E+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803781B0; + +/* 803781BE-803781D0 00481E 0012+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803781BE; + +/* 803781D0-803781DF 004830 000F+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803781D0; + +/* 803781DF-803781ED 00483F 000E+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803781DF; + +/* 803781ED-803781FB 00484D 000E+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803781ED; + +/* 803781FB-80378209 00485B 000E+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803781FB; + +/* 80378209-80378215 004869 000C+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80378209; + +/* 80378215-80378222 004875 000D+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80378215; + +/* 80378222-8037822F 004882 000D+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80378222; + +/* 8037822F-8037823E 00488F 000F+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_8037822F; + +/* 8037823E-8037824B 00489E 000D+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_8037823E; + +/* 8037824B-80378259 0048AB 000E+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_8037824B; + +/* 80378259-80378266 0048B9 000D+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80378259; + +/* 80378266-80378276 0048C6 0010+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80378266; + +/* 80378276-80378285 0048D6 000F+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80378276; + +/* 80378285-80378297 0048E5 0012+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80378285; + +/* 80378297-803782A8 0048F7 0011+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80378297; + +/* 803782A8-803782BA 004908 0012+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803782A8; + +/* 803782BA-803782CB 00491A 0011+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803782BA; + +/* 803782CB-803782D8 00492B 000D+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803782CB; + +/* 803782D8-803782E4 004938 000C+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803782D8; + +/* 803782E4-803782F2 004944 000E+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803782E4; + +/* 803782F2-803782FD 004952 000B+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803782F2; + +/* 803782FD-80378308 00495D 000B+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803782FD; + +/* 80378308-80378314 004968 000C+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80378308; + +/* 80378314-80378320 004974 000C+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80378314; + +/* 80378320-8037832C 004980 000C+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80378320; + +/* 8037832C-80378338 00498C 000C+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_8037832C; + +/* 80378338-80378344 004998 000C+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80378338; + +/* 80378344-80378350 0049A4 000C+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80378344; + +/* 80378350-8037835C 0049B0 000C+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80378350; + +/* 8037835C-80378368 0049BC 000C+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_8037835C; + +/* 80378368-80378374 0049C8 000C+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80378368; + +/* 80378374-80378380 0049D4 000C+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80378374; + +/* 80378380-8037838C 0049E0 000C+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80378380; + +/* 8037838C-80378398 0049EC 000C+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_8037838C; + +/* 80378398-803783A4 0049F8 000C+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80378398; + +/* 803783A4-803783B0 004A04 000C+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803783A4; + +/* 803783B0-803783BC 004A10 000C+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803783B0; + +/* 803783BC-803783C8 004A1C 000C+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803783BC; + +/* 803783C8-803783D4 004A28 000C+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803783C8; + +/* 803783D4-803783E0 004A34 000C+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803783D4; + +/* 803783E0-803783E9 004A40 0009+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803783E0; + +/* 803783E9-803783F2 004A49 0009+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803783E9; + +/* 803783F2-80378400 004A52 000E+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803783F2; + +/* 80378400-8037840E 004A60 000E+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80378400; + +/* 8037840E-8037841E 004A6E 0010+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_8037840E; + +/* 8037841E-8037842C 004A7E 000E+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_8037841E; + +/* 8037842C-80378439 004A8C 000D+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_8037842C; + +/* 80378439-80378447 004A99 000E+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80378439; + +/* 80378447-80378455 004AA7 000E+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80378447; + +/* 80378455-80378464 004AB5 000F+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80378455; + +/* 80378464-80378473 004AC4 000F+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80378464; + +/* 80378473-80378482 004AD3 000F+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80378473; + +/* 80378482-80378491 004AE2 000F+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80378482; + +/* 80378491-803784A1 004AF1 0010+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80378491; + +/* 803784A1-803784B1 004B01 0010+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803784A1; + +/* 803784B1-803784C1 004B11 0010+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803784B1; + +/* 803784C1-803784D3 004B21 0012+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803784C1; + +/* 803784D3-803784E6 004B33 0013+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803784D3; + +/* 803784E6-803784F1 004B46 000B+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803784E6; + +/* 803784F1-80378500 004B51 000F+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803784F1; + +/* 80378500-80378511 004B60 0011+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80378500; + +/* 80378511-8037851F 004B71 000E+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80378511; + +/* 8037851F-8037852B 004B7F 000C+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_8037851F; + +/* 8037852B-80378539 004B8B 000E+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_8037852B; + +/* 80378539-80378546 004B99 000D+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80378539; + +/* 80378546-80378552 004BA6 000C+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80378546; + +/* 80378552-80378562 004BB2 0010+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80378552; + +/* 80378562-8037856F 004BC2 000D+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80378562; + +/* 8037856F-8037857A 004BCF 000B+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_8037856F; + +/* 8037857A-80378584 004BDA 000A+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_8037857A; + +/* 80378584-8037858F 004BE4 000B+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80378584; + +/* 8037858F-80378596 004BEF 0007+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_8037858F; + +/* 80378596-803785A4 004BF6 000E+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80378596; + +/* 803785A4-803785AF 004C04 000B+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803785A4; + +/* 803785AF-803785BA 004C0F 000B+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803785AF; + +/* 803785BA-803785CB 004C1A 0011+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803785BA; + +/* 803785CB-803785D5 004C2B 000A+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803785CB; + +/* 803785D5-803785DC 004C35 0007+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803785D5; + +/* 803785DC-803785E6 004C3C 000A+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803785DC; + +/* 803785E6-803785F1 004C46 000B+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803785E6; + +/* 803785F1-803785FD 004C51 000C+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803785F1; + +/* 803785FD-80378608 004C5D 000B+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803785FD; + +/* 80378608-80378613 004C68 000B+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80378608; + +/* 80378613-80378621 004C73 000E+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80378613; + +/* 80378621-80378631 004C81 0010+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80378621; + +/* 80378631-80378640 004C91 000F+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80378631; + +/* 80378640-8037864D 004CA0 000D+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80378640; + +/* 8037864D-8037865A 004CAD 000D+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_8037864D; + +/* 8037865A-80378666 004CBA 000C+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_8037865A; + +/* 80378666-80378672 004CC6 000C+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80378666; + +/* 80378672-8037867F 004CD2 000D+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80378672; + +/* 8037867F-8037868A 004CDF 000B+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_8037867F; + +/* 8037868A-80378694 004CEA 000A+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_8037868A; + +/* 80378694-803786A3 004CF4 000F+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80378694; + +/* 803786A3-803786AC 004D03 0009+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803786A3; + +/* 803786AC-803786B5 004D0C 0009+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803786AC; + +/* 803786B5-803786C3 004D15 000E+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803786B5; + +/* 803786C3-803786D3 004D23 0010+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803786C3; + +/* 803786D3-803786E3 004D33 0010+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803786D3; + +/* 803786E3-803786F3 004D43 0010+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803786E3; + +/* 803786F3-80378704 004D53 0011+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803786F3; + +/* 80378704-80378713 004D64 000F+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80378704; + +/* 80378713-80378720 004D73 000D+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80378713; + +/* 80378720-8037872E 004D80 000E+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80378720; + +/* 8037872E-8037873C 004D8E 000E+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_8037872E; + +/* 8037873C-80378747 004D9C 000B+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_8037873C; + +/* 80378747-80378754 004DA7 000D+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80378747; + +/* 80378754-8037875B 004DB4 0007+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80378754; + +/* 8037875B-80378767 004DBB 000C+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_8037875B; + +/* 80378767-80378770 004DC7 0009+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80378767; + +/* 80378770-8037877E 004DD0 000E+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80378770; + +/* 8037877E-8037878F 004DDE 0011+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_8037877E; + +/* 8037878F-8037879A 004DEF 000B+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_8037878F; + +/* 8037879A-803787A4 004DFA 000A+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_8037879A; + +/* 803787A4-803787B2 004E04 000E+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803787A4; + +/* 803787B2-803787C2 004E12 0010+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803787B2; + +/* 803787C2-803787D0 004E22 000E+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803787C2; + +/* 803787D0-803787DF 004E30 000F+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803787D0; + +/* 803787DF-803787EB 004E3F 000C+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803787DF; + +/* 803787EB-803787F5 004E4B 000A+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803787EB; + /* 80374640-80375DE8 -00001 17A8+00 1/1 0/0 0/0 .rodata DynamicNameTable */ SECTION_RODATA static void* const DynamicNameTable[1514] = { (void*)0x00140000, (void*)&c_c_dylink__stringBase0, @@ -872,164 +3140,11 @@ SECTION_RODATA static void* const DynamicNameTable[1514] = { (void*)0x03100000, (void*)(((char*)&c_c_dylink__stringBase0) + 0x2A03), (void*)0xFFFF0000, (void*)NULL, }; -COMPILER_STRIP_GATE(80374640, &DynamicNameTable); +COMPILER_STRIP_GATE(0x80374640, &DynamicNameTable); -/* 803F0F50-803F1BB0 01DC70 0C60+00 4/4 0/0 0/0 .bss DMC */ -static u8 DMC[3168]; - -/* 80450CA8-80450CAC 0001A8 0004+00 1/1 0/0 0/0 .sbss None */ -static u8 data_80450CA8[4]; - -/* 800183DC-80018544 012D1C 0168+00 1/1 0/0 0/0 .text cCc_Init__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void cCc_Init() { - nofralloc -#include "asm/c/c_dylink/cCc_Init__Fv.s" -} -#pragma pop - -/* 80018544-8001857C 012E84 0038+00 0/0 1/1 0/0 .text cDyl_IsLinked__Fs */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void cDyl_IsLinked(s16 param_0) { - nofralloc -#include "asm/c/c_dylink/cDyl_IsLinked__Fs.s" -} -#pragma pop - -/* 8001857C-800185C0 012EBC 0044+00 1/1 1/1 0/0 .text cDyl_Unlink__Fs */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void cDyl_Unlink(s16 param_0) { - nofralloc -#include "asm/c/c_dylink/cDyl_Unlink__Fs.s" -} -#pragma pop - -/* ############################################################################################## */ -/* 80450CAC-80450CB0 0001AC 0004+00 2/2 0/0 0/0 .sbss cDyl_Initialized */ -static u8 cDyl_Initialized[4]; - -/* 800185C0-80018688 012F00 00C8+00 1/1 1/1 0/0 .text cDyl_LinkASync__Fs */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void cDyl_LinkASync(s16 param_0) { - nofralloc -#include "asm/c/c_dylink/cDyl_LinkASync__Fs.s" -} -#pragma pop - -/* 80018688-80018764 012FC8 00DC+00 1/1 0/0 0/0 .text cDyl_InitCallback__FPv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void cDyl_InitCallback(void* param_0) { - nofralloc -#include "asm/c/c_dylink/cDyl_InitCallback__FPv.s" -} -#pragma pop - -/* ############################################################################################## */ -/* 80450CB0-80450CB8 0001B0 0004+04 2/2 0/0 0/0 .sbss cDyl_DVD */ -static u8 cDyl_DVD[4 + 4 /* padding */]; - -/* 80018764-80018798 0130A4 0034+00 0/0 1/1 0/0 .text cDyl_InitAsync__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void cDyl_InitAsync() { - nofralloc -#include "asm/c/c_dylink/cDyl_InitAsync__Fv.s" -} -#pragma pop - -/* 80018798-80018804 0130D8 006C+00 0/0 2/1 0/0 .text cDyl_InitAsyncIsDone__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void cDyl_InitAsyncIsDone() { - nofralloc -#include "asm/c/c_dylink/cDyl_InitAsyncIsDone__Fv.s" -} -#pragma pop - -/* 80018804-8001880C 013144 0008+00 1/0 0/0 0/0 .text phase_01__7cDylPhsFPv */ -s32 cDylPhs::phase_01(void* param_0) { - return 2; -} - -/* 8001880C-80018844 01314C 0038+00 1/0 0/0 0/0 .text phase_02__7cDylPhsFPs */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void cDylPhs::phase_02(s16* param_0) { - nofralloc -#include "asm/c/c_dylink/phase_02__7cDylPhsFPs.s" -} -#pragma pop - -/* 80018844-8001884C 013184 0008+00 1/0 0/0 0/0 .text phase_03__7cDylPhsFPv */ -bool cDylPhs::phase_03(void* param_0) { - return false; -} - -/* ############################################################################################## */ -/* 803A3590-803A35A0 -00001 000C+04 1/1 0/0 0/0 .data l_method$3807 */ -SECTION_DATA static void* l_method[3 + 1 /* padding */] = { - (void*)phase_01__7cDylPhsFPv, - (void*)phase_02__7cDylPhsFPs, - (void*)phase_03__7cDylPhsFPv, - /* padding */ - NULL, -}; - -/* 8001884C-80018890 01318C 0044+00 0/0 2/2 0/0 .text - * Link__7cDylPhsFP30request_of_phase_process_classs */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void cDylPhs::Link(request_of_phase_process_class* param_0, s16 param_1) { - nofralloc -#include "asm/c/c_dylink/Link__7cDylPhsFP30request_of_phase_process_classs.s" -} -#pragma pop - -/* 80018890-800188DC 0131D0 004C+00 0/0 1/1 0/0 .text - * Unlink__7cDylPhsFP30request_of_phase_process_classs */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void cDylPhs::Unlink(request_of_phase_process_class* param_0, s16 param_1) { - nofralloc -#include "asm/c/c_dylink/Unlink__7cDylPhsFP30request_of_phase_process_classs.s" -} -#pragma pop - -/* 800188DC-800188E4 01321C 0008+00 0/0 1/0 0/0 .text getModuleName__24DynamicModuleControlBaseCFv - */ -bool DynamicModuleControlBase::getModuleName() const { - return false; -} - -/* 800188E4-80018944 013224 0060+00 0/0 1/0 0/0 .text __dt__20DynamicModuleControlFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm DynamicModuleControl::~DynamicModuleControl() { - nofralloc -#include "asm/c/c_dylink/__dt__20DynamicModuleControlFv.s" -} -#pragma pop - -/* 80375DE8-80378878 002448 2A8F+01 3/2 0/0 0/0 .rodata @stringBase0 */ +/* 80375DE8-80375DE8 002448 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ #pragma push #pragma force_active on -#pragma section ".dead" SECTION_DEAD static char const* const stringBase_80375DE8 = "d_a_alldie"; SECTION_DEAD static char const* const stringBase_80375DF3 = "d_a_obj_swpush"; SECTION_DEAD static char const* const stringBase_80375E02 = "d_a_obj_swpush2"; @@ -1786,12 +3901,177 @@ SECTION_DEAD static char const* const stringBase_803787C2 = "d_a_obj_timer"; SECTION_DEAD static char const* const stringBase_803787D0 = "d_a_scene_exit"; SECTION_DEAD static char const* const stringBase_803787DF = "d_a_suspend"; SECTION_DEAD static char const* const stringBase_803787EB = "d_a_grass"; +#pragma pop + +/* 803F0F50-803F1BB0 01DC70 0C60+00 4/4 0/0 0/0 .bss DMC */ +static u8 DMC[3168]; + +/* 80450CA8-80450CAC 0001A8 0004+00 1/1 0/0 0/0 .sbss None */ +static u8 data_80450CA8[4]; + +/* 800183DC-80018544 012D1C 0168+00 1/1 0/0 0/0 .text cCc_Init__Fv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +static asm void cCc_Init() { + nofralloc +#include "asm/c/c_dylink/cCc_Init__Fv.s" +} +#pragma pop + +/* 80018544-8001857C 012E84 0038+00 0/0 1/1 0/0 .text cDyl_IsLinked__Fs */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void cDyl_IsLinked(s16 param_0) { + nofralloc +#include "asm/c/c_dylink/cDyl_IsLinked__Fs.s" +} +#pragma pop + +/* 8001857C-800185C0 012EBC 0044+00 1/1 1/1 0/0 .text cDyl_Unlink__Fs */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void cDyl_Unlink(s16 param_0) { + nofralloc +#include "asm/c/c_dylink/cDyl_Unlink__Fs.s" +} +#pragma pop + +/* ############################################################################################## */ +/* 80375DE8-80375DE8 002448 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on SECTION_DEAD static char const* const stringBase_803787F5 = "cDyl_Link i_ProfName=%d\n"; SECTION_DEAD static char const* const stringBase_8037880E = "cDyl_LinkASync: リンクに失敗しました。諦めます\n"; +#pragma pop + +/* 80450CAC-80450CB0 0001AC 0004+00 2/2 0/0 0/0 .sbss cDyl_Initialized */ +static u8 cDyl_Initialized[4]; + +/* 800185C0-80018688 012F00 00C8+00 1/1 1/1 0/0 .text cDyl_LinkASync__Fs */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void cDyl_LinkASync(s16 param_0) { + nofralloc +#include "asm/c/c_dylink/cDyl_LinkASync__Fs.s" +} +#pragma pop + +/* ############################################################################################## */ +/* 80375DE8-80375DE8 002448 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on SECTION_DEAD static char const* const stringBase_8037883E = "/"; SECTION_DEAD static char const* const stringBase_80378840 = "/dvd/str/Final/Release/frameworkF.str"; SECTION_DEAD static char const* const stringBase_80378866 = "f_pc_profile_lst"; /* @stringBase0 padding */ SECTION_DEAD static char const* const pad_80378877 = ""; #pragma pop + +/* 80018688-80018764 012FC8 00DC+00 1/1 0/0 0/0 .text cDyl_InitCallback__FPv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +static asm void cDyl_InitCallback(void* param_0) { + nofralloc +#include "asm/c/c_dylink/cDyl_InitCallback__FPv.s" +} +#pragma pop + +/* ############################################################################################## */ +/* 80450CB0-80450CB8 0001B0 0004+04 2/2 0/0 0/0 .sbss cDyl_DVD */ +static u8 cDyl_DVD[4 + 4 /* padding */]; + +/* 80018764-80018798 0130A4 0034+00 0/0 1/1 0/0 .text cDyl_InitAsync__Fv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void cDyl_InitAsync() { + nofralloc +#include "asm/c/c_dylink/cDyl_InitAsync__Fv.s" +} +#pragma pop + +/* 80018798-80018804 0130D8 006C+00 0/0 2/1 0/0 .text cDyl_InitAsyncIsDone__Fv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void cDyl_InitAsyncIsDone() { + nofralloc +#include "asm/c/c_dylink/cDyl_InitAsyncIsDone__Fv.s" +} +#pragma pop + +/* 80018804-8001880C 013144 0008+00 1/0 0/0 0/0 .text phase_01__7cDylPhsFPv */ +s32 cDylPhs::phase_01(void* param_0) { + return 2; +} + +/* 8001880C-80018844 01314C 0038+00 1/0 0/0 0/0 .text phase_02__7cDylPhsFPs */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void cDylPhs::phase_02(s16* param_0) { + nofralloc +#include "asm/c/c_dylink/phase_02__7cDylPhsFPs.s" +} +#pragma pop + +/* 80018844-8001884C 013184 0008+00 1/0 0/0 0/0 .text phase_03__7cDylPhsFPv */ +bool cDylPhs::phase_03(void* param_0) { + return false; +} + +/* ############################################################################################## */ +/* 803A3590-803A35A0 -00001 000C+04 1/1 0/0 0/0 .data l_method$3807 */ +SECTION_DATA static void* l_method[3 + 1 /* padding */] = { + (void*)phase_01__7cDylPhsFPv, + (void*)phase_02__7cDylPhsFPs, + (void*)phase_03__7cDylPhsFPv, + /* padding */ + NULL, +}; + +/* 8001884C-80018890 01318C 0044+00 0/0 2/2 0/0 .text + * Link__7cDylPhsFP30request_of_phase_process_classs */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void cDylPhs::Link(request_of_phase_process_class* param_0, s16 param_1) { + nofralloc +#include "asm/c/c_dylink/Link__7cDylPhsFP30request_of_phase_process_classs.s" +} +#pragma pop + +/* 80018890-800188DC 0131D0 004C+00 0/0 1/1 0/0 .text + * Unlink__7cDylPhsFP30request_of_phase_process_classs */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void cDylPhs::Unlink(request_of_phase_process_class* param_0, s16 param_1) { + nofralloc +#include "asm/c/c_dylink/Unlink__7cDylPhsFP30request_of_phase_process_classs.s" +} +#pragma pop + +/* 800188DC-800188E4 01321C 0008+00 0/0 1/0 0/0 .text getModuleName__24DynamicModuleControlBaseCFv + */ +bool DynamicModuleControlBase::getModuleName() const { + return false; +} + +/* 800188E4-80018944 013224 0060+00 0/0 1/0 0/0 .text __dt__20DynamicModuleControlFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm DynamicModuleControl::~DynamicModuleControl() { + nofralloc +#include "asm/c/c_dylink/__dt__20DynamicModuleControlFv.s" +} +#pragma pop + +/* 80375DE8-80375DE8 002448 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/a/d_a_alink.cpp b/src/d/a/d_a_alink.cpp index b0b5c0b562f..32290e0fece 100644 --- a/src/d/a/d_a_alink.cpp +++ b/src/d/a/d_a_alink.cpp @@ -15,8 +15,6 @@ struct stage_stag_info_class {}; struct request_of_phase_process_class {}; -struct Quaternion {}; - struct csXyz { /* 80018BD0 */ ~csXyz(); /* 80112C80 */ csXyz(); @@ -25,6 +23,8 @@ struct csXyz { static u8 Zero[4]; }; +struct Quaternion {}; + struct Vec {}; struct cXyz { @@ -63,10 +63,10 @@ struct mDoMtx_stack_c { static u8 now[48]; }; -struct J3DDeformData {}; - struct J3DAnmCluster {}; +struct J3DDeformData {}; + struct mDoExt_blkAnm { /* 8000DA08 */ void init(J3DDeformData*, J3DAnmCluster*, int, int, f32, s16, s16); }; @@ -442,7 +442,8 @@ struct daObj { template void PrmAbstract(/* ... */); /* 80141ACC */ /* daObj::PrmAbstract */ - void func_80141ACC(fopAc_ac_c const*, daObjMovebox::Act_c::Prm_e, daObjMovebox::Act_c::Prm_e); + void func_80141ACC(void* _this, fopAc_ac_c const*, daObjMovebox::Act_c::Prm_e, + daObjMovebox::Act_c::Prm_e); }; struct daNpcT_ActorMngr_c { @@ -512,9 +513,15 @@ struct daAlink_footData_c { /* 800CFCF4 */ daAlink_footData_c(); }; -struct dDemo_actor_c { - /* 8003819C */ void getPrm_Morf(); - /* 80038338 */ void getDemoIDData(int*, int*, int*, u16*, u8*); +struct dBgW_Base { + struct PushPullLabel {}; +}; + +struct _GXColorS10 {}; + +struct J3DAnmTevRegKey { + /* 8032B1F8 */ void getTevColorReg(u16, _GXColorS10*) const; + /* 8032B87C */ void searchUpdateMaterialID(J3DModelData*); }; struct dCcD_GObjInf { @@ -532,22 +539,26 @@ struct dCcD_GObjInf { /* 800846B0 */ void ResetCoHit(); }; -struct dBgS_LinChk { - /* 80077D64 */ void Set(cXyz const*, cXyz const*, fopAc_ac_c const*); +struct JKRHeap { + /* 802CE5CC */ void freeAll(); }; -struct dCcG_At_Spl {}; +struct JKRExpHeap { + /* 802CEE2C */ void create(u32, JKRHeap*, bool); +}; struct J3DAnmBase {}; +struct J3DGXColorS10 { + /* 8000E460 */ J3DGXColorS10(); +}; + struct daAlinkHIO_anm_c {}; struct dAttList_c { /* 80073864 */ void getActor(); }; -struct JPABaseEmitter {}; - struct cM3dGPla { /* 8001DB90 */ ~cM3dGPla(); /* 801411F0 */ cM3dGPla(); @@ -555,27 +566,17 @@ struct cM3dGPla { /* 8026F408 */ void crossInfLin(cXyz const&, cXyz const&, cXyz&) const; }; -struct dBgW_Base { - struct PushPullLabel {}; +struct dBgS_LinChk { + /* 80077D64 */ void Set(cXyz const*, cXyz const*, fopAc_ac_c const*); }; -struct _GXColorS10 {}; +struct JPABaseEmitter {}; -struct J3DAnmTevRegKey { - /* 8032B1F8 */ void getTevColorReg(u16, _GXColorS10*) const; - /* 8032B87C */ void searchUpdateMaterialID(J3DModelData*); -}; +struct dCcG_At_Spl {}; -struct J3DGXColorS10 { - /* 8000E460 */ J3DGXColorS10(); -}; - -struct JKRHeap { - /* 802CE5CC */ void freeAll(); -}; - -struct JKRExpHeap { - /* 802CEE2C */ void create(u32, JKRHeap*, bool); +struct dDemo_actor_c { + /* 8003819C */ void getPrm_Morf(); + /* 80038338 */ void getDemoIDData(int*, int*, int*, u16*, u8*); }; struct daAlink_c { @@ -3195,7 +3196,6 @@ struct dEvt_control_c { /* 80042914 */ void setSkipProc(void*, int (*)(void*, int), int); /* 8004316C */ void compulsory(void*, char const*, u16); /* 800432EC */ void convPId(unsigned int); - /* 800436EC */ void setPtI_Id(unsigned int); /* 800436F4 */ void setPtD(void*); /* 801412D4 */ void isOrderOK(); }; @@ -3229,15 +3229,15 @@ struct dDlst_peekZ_c { /* 80056018 */ void newData(s16, s16, u32*); }; -struct J3DPacket; -struct J3DDrawBuffer { - /* 8032548C */ void entryImm(J3DPacket*, u16); -}; - +struct J3DDrawBuffer; struct J3DPacket { /* 80312750 */ bool entry(J3DDrawBuffer*); }; +struct J3DDrawBuffer { + /* 8032548C */ void entryImm(J3DPacket*, u16); +}; + struct dDlst_list_c { /* 800565EC */ void entryZSortXluDrawList(J3DDrawBuffer*, J3DPacket*, cXyz&); }; @@ -3490,7 +3490,6 @@ struct Z2SeMgr { struct Z2CreatureLink { /* 80141988 */ void setLinkState(u8); /* 802C321C */ void setLinkGroupInfo(u8); - /* 802C3220 */ void setLinkHp(s32, s32); /* 802C3228 */ void setLinkSwordType(s32, s32); /* 802C328C */ void setLinkShieldType(s32, s32); /* 802C32F0 */ void setLinkBootsType(s32); @@ -3499,8 +3498,6 @@ struct Z2CreatureLink { /* 802C3638 */ void init(Vec*, Vec*, Vec*); /* 802C3710 */ void initKantera(Vec*); /* 802C374C */ void deleteKantera(); - /* 802C3778 */ void setKanteraState(u8); - /* 802C3A64 */ void setSinkDepth(s8); /* 802C3A6C */ void setRiding(bool); /* 802C3AEC */ void setMagnetized(bool); /* 802C3AFC */ void setWolfEyeOpen(bool); @@ -3626,14 +3623,14 @@ struct J3DShape { static u8 sOldVcdVatCmd[4]; }; -struct J3DAnmTexPattern { - /* 8032B09C */ void searchUpdateMaterialID(J3DModelData*); -}; - struct J3DAnmTextureSRTKey { /* 8032B1D4 */ void searchUpdateMaterialID(J3DModelData*); }; +struct J3DAnmTexPattern { + /* 8032B09C */ void searchUpdateMaterialID(J3DModelData*); +}; + struct J3DMaterialTable { /* 8032F7B4 */ void removeTexMtxAnimator(J3DAnmTextureSRTKey*); /* 8032F880 */ void removeTevRegAnimator(J3DAnmTevRegKey*); @@ -3675,10 +3672,10 @@ struct J2DScreen { /* 802F9690 */ void animation(); }; -struct J2DAnmColor {}; - struct J2DAnmTevRegKey {}; +struct J2DAnmColor {}; + struct J2DPane { /* 80126350 */ void setAnimation(J2DAnmTevRegKey*); /* 80126354 */ void setAnimation(J2DAnmColor*); @@ -5873,9 +5870,9 @@ extern "C" void checkForceTiredColor__9daMidna_cCFv(); extern "C" void checkMidnaTired__9daMidna_cFv(); extern "C" void onNoServiceWait__9daMidna_cFv(); extern "C" void setControllActorData__8daCrod_cFv(); -extern "C" void func_80141ACC(fopAc_ac_c const*, daObjMovebox::Act_c::Prm_e, +extern "C" void func_80141ACC(void* _this, fopAc_ac_c const*, daObjMovebox::Act_c::Prm_e, daObjMovebox::Act_c::Prm_e); -extern "C" void func_80141AE8(u8*); +extern "C" void func_80141AE8(void* _this, u8*); extern "C" void __sinit_d_a_alink_cpp(); extern "C" static void func_801446D4(); extern "C" static void func_801446DC(); @@ -8271,7 +8268,7 @@ asm void daAlink_c::setLookPosFromOut(cXyz* param_0) { SECTION_RODATA static u8 const lit_3757[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8038D658, &lit_3757); +COMPILER_STRIP_GATE(0x8038D658, &lit_3757); /* 8038D664-8038D6BC 019CC4 0058+00 41/50 0/0 0/0 .rodata m__19daAlinkHIO_basic_c0 */ SECTION_RODATA u8 const daAlinkHIO_basic_c0::m[88] = { @@ -8282,7 +8279,7 @@ SECTION_RODATA u8 const daAlinkHIO_basic_c0::m[88] = { 0x41, 0xB8, 0x00, 0x00, 0x42, 0x24, 0x00, 0x00, 0x3F, 0x33, 0x33, 0x33, 0x3F, 0x00, 0x00, 0x00, 0x3F, 0x33, 0x33, 0x33, 0x43, 0xC8, 0x00, 0x00, 0x45, 0x9C, 0x40, 0x00, }; -COMPILER_STRIP_GATE(8038D664, &daAlinkHIO_basic_c0::m); +COMPILER_STRIP_GATE(0x8038D664, &daAlinkHIO_basic_c0::m); /* 8038D6BC-8038D714 019D1C 0058+00 34/47 0/0 0/0 .rodata m__18daAlinkHIO_move_c0 */ SECTION_RODATA u8 const daAlinkHIO_move_c0::m[88] = { @@ -8293,7 +8290,7 @@ SECTION_RODATA u8 const daAlinkHIO_move_c0::m[88] = { 0x3F, 0x19, 0x99, 0x9A, 0x3F, 0x8C, 0xCC, 0xCD, 0x3F, 0xC0, 0x00, 0x00, 0x3F, 0x7D, 0x70, 0xA4, 0x40, 0x40, 0x00, 0x00, 0x3F, 0x33, 0x33, 0x33, 0x3E, 0xCC, 0xCC, 0xCD, }; -COMPILER_STRIP_GATE(8038D6BC, &daAlinkHIO_move_c0::m); +COMPILER_STRIP_GATE(0x8038D6BC, &daAlinkHIO_move_c0::m); /* 8038D714-8038D768 019D74 0054+00 10/16 0/0 0/0 .rodata m__21daAlinkHIO_atnMove_c0 */ SECTION_RODATA u8 const daAlinkHIO_atnMove_c0::m[84] = { @@ -8304,7 +8301,7 @@ SECTION_RODATA u8 const daAlinkHIO_atnMove_c0::m[84] = { 0x41, 0x70, 0x00, 0x00, 0x40, 0x20, 0x00, 0x00, 0x41, 0x00, 0x00, 0x00, 0x3F, 0x00, 0x00, 0x00, 0x3E, 0xCC, 0xCC, 0xCD, 0x3F, 0x80, 0x00, 0x00, 0x3F, 0xA6, 0x66, 0x66, }; -COMPILER_STRIP_GATE(8038D714, &daAlinkHIO_atnMove_c0::m); +COMPILER_STRIP_GATE(0x8038D714, &daAlinkHIO_atnMove_c0::m); /* 8038D768-8038D7BC 019DC8 0054+00 3/9 0/0 0/0 .rodata m__26daAlinkHIO_noActAtnMove_c0 */ SECTION_RODATA u8 const daAlinkHIO_noActAtnMove_c0::m[84] = { @@ -8315,7 +8312,7 @@ SECTION_RODATA u8 const daAlinkHIO_noActAtnMove_c0::m[84] = { 0x41, 0x50, 0x00, 0x00, 0x40, 0x20, 0x00, 0x00, 0x41, 0x00, 0x00, 0x00, 0x3E, 0xB3, 0x33, 0x33, 0x3E, 0xCC, 0xCC, 0xCD, 0x3D, 0xCC, 0xCC, 0xCD, 0x40, 0x13, 0x33, 0x33, }; -COMPILER_STRIP_GATE(8038D768, &daAlinkHIO_noActAtnMove_c0::m); +COMPILER_STRIP_GATE(0x8038D768, &daAlinkHIO_noActAtnMove_c0::m); /* 8038D7BC-8038D82C 019E1C 0070+00 5/7 0/0 0/0 .rodata m__23daAlinkHIO_frontRoll_c0 */ SECTION_RODATA u8 const daAlinkHIO_frontRoll_c0::m[112] = { @@ -8327,7 +8324,7 @@ SECTION_RODATA u8 const daAlinkHIO_frontRoll_c0::m[112] = { 0x41, 0x20, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, 0x41, 0x70, 0x00, 0x00, 0x41, 0x20, 0x00, 0x00, 0x41, 0x40, 0x00, 0x00, 0x41, 0x10, 0x00, 0x00, 0x41, 0x98, 0x00, 0x00, 0x42, 0x70, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8038D7BC, &daAlinkHIO_frontRoll_c0::m); +COMPILER_STRIP_GATE(0x8038D7BC, &daAlinkHIO_frontRoll_c0::m); /* 8038D82C-8038D864 019E8C 0038+00 5/5 0/0 0/0 .rodata m__22daAlinkHIO_backJump_c0 */ SECTION_RODATA u8 const daAlinkHIO_backJump_c0::m[56] = { @@ -8336,7 +8333,7 @@ SECTION_RODATA u8 const daAlinkHIO_backJump_c0::m[56] = { 0x40, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, 0x41, 0xC0, 0x00, 0x00, 0x41, 0x20, 0x00, 0x00, 0x42, 0xC8, 0x00, 0x00, 0x41, 0x20, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8038D82C, &daAlinkHIO_backJump_c0::m); +COMPILER_STRIP_GATE(0x8038D82C, &daAlinkHIO_backJump_c0::m); /* 8038D864-8038D8CC 019EC4 0068+00 3/3 0/0 0/0 .rodata m__22daAlinkHIO_sideStep_c0 */ SECTION_RODATA u8 const daAlinkHIO_sideStep_c0::m[104] = { @@ -8348,7 +8345,7 @@ SECTION_RODATA u8 const daAlinkHIO_sideStep_c0::m[104] = { 0x00, 0x40, 0x80, 0x00, 0x00, 0x41, 0xE0, 0x00, 0x00, 0x41, 0xB0, 0x00, 0x00, 0x41, 0xC8, 0x00, 0x00, 0x41, 0xA0, 0x00, 0x00, 0x42, 0xC8, 0x00, 0x00, 0x41, 0x20, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8038D864, &daAlinkHIO_sideStep_c0::m); +COMPILER_STRIP_GATE(0x8038D864, &daAlinkHIO_sideStep_c0::m); /* 8038D8CC-8038D944 019F2C 0078+00 5/10 0/0 0/0 .rodata m__19daAlinkHIO_slide_c0 */ SECTION_RODATA u8 const daAlinkHIO_slide_c0::m[120] = { @@ -8361,7 +8358,7 @@ SECTION_RODATA u8 const daAlinkHIO_slide_c0::m[120] = { 0x00, 0x00, 0x41, 0xD8, 0x00, 0x00, 0x3E, 0x4C, 0xCC, 0xCD, 0x41, 0x40, 0x00, 0x00, 0x42, 0x48, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, 0x42, 0x04, 0x00, 0x00, 0x3F, 0x99, 0x99, 0x9A, }; -COMPILER_STRIP_GATE(8038D8CC, &daAlinkHIO_slide_c0::m); +COMPILER_STRIP_GATE(0x8038D8CC, &daAlinkHIO_slide_c0::m); /* 8038D944-8038D964 019FA4 0020+00 0/1 0/0 0/0 .rodata m__20daAlinkHIO_cutNmV_c0 */ #pragma push @@ -8370,7 +8367,7 @@ SECTION_RODATA u8 const daAlinkHIO_cutNmV_c0::m[32] = { 0x00, 0x1B, 0x00, 0x00, 0x3F, 0x99, 0x99, 0x9A, 0x40, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x41, 0x80, 0x00, 0x00, 0x40, 0xA0, 0x00, 0x00, 0x40, 0xA0, 0x00, 0x00, 0x41, 0x20, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8038D944, &daAlinkHIO_cutNmV_c0::m); +COMPILER_STRIP_GATE(0x8038D944, &daAlinkHIO_cutNmV_c0::m); #pragma pop /* 8038D964-8038D984 019FC4 0020+00 0/1 0/0 0/0 .rodata m__20daAlinkHIO_cutNmL_c0 */ @@ -8380,7 +8377,7 @@ SECTION_RODATA u8 const daAlinkHIO_cutNmL_c0::m[32] = { 0x00, 0x1B, 0x00, 0x00, 0x3F, 0x99, 0x99, 0x9A, 0x40, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x41, 0x80, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, 0x40, 0xE0, 0x00, 0x00, 0x41, 0x50, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8038D964, &daAlinkHIO_cutNmL_c0::m); +COMPILER_STRIP_GATE(0x8038D964, &daAlinkHIO_cutNmL_c0::m); #pragma pop /* 8038D984-8038D9A4 019FE4 0020+00 0/1 0/0 0/0 .rodata m__20daAlinkHIO_cutNmR_c0 */ @@ -8390,7 +8387,7 @@ SECTION_RODATA u8 const daAlinkHIO_cutNmR_c0::m[32] = { 0x00, 0x1B, 0x00, 0x00, 0x3F, 0x99, 0x99, 0x9A, 0x40, 0x40, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x41, 0x80, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, 0x40, 0xE0, 0x00, 0x00, 0x41, 0x48, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8038D984, &daAlinkHIO_cutNmR_c0::m); +COMPILER_STRIP_GATE(0x8038D984, &daAlinkHIO_cutNmR_c0::m); #pragma pop /* 8038D9A4-8038D9C4 01A004 0020+00 0/1 0/0 0/0 .rodata m__21daAlinkHIO_cutNmSL_c0 */ @@ -8400,7 +8397,7 @@ SECTION_RODATA u8 const daAlinkHIO_cutNmSL_c0::m[32] = { 0x00, 0x1F, 0x00, 0x00, 0x3F, 0x8C, 0xCC, 0xCD, 0x40, 0x40, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, 0x41, 0x88, 0x00, 0x00, 0x41, 0x20, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, 0x41, 0x20, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8038D9A4, &daAlinkHIO_cutNmSL_c0::m); +COMPILER_STRIP_GATE(0x8038D9A4, &daAlinkHIO_cutNmSL_c0::m); #pragma pop /* 8038D9C4-8038D9E4 01A024 0020+00 0/1 0/0 0/0 .rodata m__21daAlinkHIO_cutNmSR_c0 */ @@ -8410,7 +8407,7 @@ SECTION_RODATA u8 const daAlinkHIO_cutNmSR_c0::m[32] = { 0x00, 0x1B, 0x00, 0x00, 0x3F, 0x8C, 0xCC, 0xCD, 0x40, 0x80, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, 0x41, 0x88, 0x00, 0x00, 0x41, 0x00, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, 0x41, 0x20, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8038D9C4, &daAlinkHIO_cutNmSR_c0::m); +COMPILER_STRIP_GATE(0x8038D9C4, &daAlinkHIO_cutNmSR_c0::m); #pragma pop /* 8038D9E4-8038DA10 01A044 002C+00 0/1 0/0 0/0 .rodata m__20daAlinkHIO_cutFnL_c0 */ @@ -8421,7 +8418,7 @@ SECTION_RODATA u8 const daAlinkHIO_cutFnL_c0::m[44] = { 0x00, 0x41, 0xD8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0xA0, 0x00, 0x00, 0x40, 0xE0, 0x00, 0x00, 0x41, 0x40, 0x00, 0x00, 0x41, 0xA8, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8038D9E4, &daAlinkHIO_cutFnL_c0::m); +COMPILER_STRIP_GATE(0x8038D9E4, &daAlinkHIO_cutFnL_c0::m); #pragma pop /* 8038DA10-8038DA3C 01A070 002C+00 0/1 0/0 0/0 .rodata m__20daAlinkHIO_cutFnV_c0 */ @@ -8432,7 +8429,7 @@ SECTION_RODATA u8 const daAlinkHIO_cutFnV_c0::m[44] = { 0x00, 0x41, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0xA0, 0x00, 0x00, 0x40, 0xA0, 0x00, 0x00, 0x41, 0x30, 0x00, 0x00, 0x41, 0x88, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8038DA10, &daAlinkHIO_cutFnV_c0::m); +COMPILER_STRIP_GATE(0x8038DA10, &daAlinkHIO_cutFnV_c0::m); #pragma pop /* 8038DA3C-8038DA68 01A09C 002C+00 0/1 0/0 0/0 .rodata m__20daAlinkHIO_cutFnS_c0 */ @@ -8443,7 +8440,7 @@ SECTION_RODATA u8 const daAlinkHIO_cutFnS_c0::m[44] = { 0x00, 0x41, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x41, 0x20, 0x00, 0x00, 0x41, 0x20, 0x00, 0x00, 0x41, 0x88, 0x00, 0x00, 0x41, 0xB8, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8038DA3C, &daAlinkHIO_cutFnS_c0::m); +COMPILER_STRIP_GATE(0x8038DA3C, &daAlinkHIO_cutFnS_c0::m); #pragma pop /* 8038DA68-8038DA94 01A0C8 002C+00 0/1 0/0 0/0 .rodata m__21daAlinkHIO_cutFnSl_c0 */ @@ -8454,7 +8451,7 @@ SECTION_RODATA u8 const daAlinkHIO_cutFnSl_c0::m[44] = { 0x00, 0x41, 0xC8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x41, 0x70, 0x00, 0x00, 0x40, 0xC0, 0x00, 0x00, 0x41, 0x50, 0x00, 0x00, 0x41, 0xA8, 0x00, 0x00, 0x40, 0xA0, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8038DA68, &daAlinkHIO_cutFnSl_c0::m); +COMPILER_STRIP_GATE(0x8038DA68, &daAlinkHIO_cutFnSl_c0::m); #pragma pop /* 8038DA94-8038DAC0 01A0F4 002C+00 0/1 0/0 0/0 .rodata m__21daAlinkHIO_cutFnSm_c0 */ @@ -8465,7 +8462,7 @@ SECTION_RODATA u8 const daAlinkHIO_cutFnSm_c0::m[44] = { 0x00, 0x41, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x40, 0xA0, 0x00, 0x00, 0x41, 0x20, 0x00, 0x00, 0x41, 0x88, 0x00, 0x00, 0x41, 0xC0, 0x00, 0x00, 0x40, 0xA0, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8038DA94, &daAlinkHIO_cutFnSm_c0::m); +COMPILER_STRIP_GATE(0x8038DA94, &daAlinkHIO_cutFnSm_c0::m); #pragma pop /* 8038DAC0-8038DAEC 01A120 002C+00 0/1 0/0 0/0 .rodata m__20daAlinkHIO_cutFnR_c0 */ @@ -8476,7 +8473,7 @@ SECTION_RODATA u8 const daAlinkHIO_cutFnR_c0::m[44] = { 0x00, 0x41, 0xC8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0xA0, 0x00, 0x00, 0x41, 0x00, 0x00, 0x00, 0x41, 0x60, 0x00, 0x00, 0x41, 0x88, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8038DAC0, &daAlinkHIO_cutFnR_c0::m); +COMPILER_STRIP_GATE(0x8038DAC0, &daAlinkHIO_cutFnR_c0::m); #pragma pop /* 8038DAEC-8038DB40 01A14C 0054+00 3/4 0/0 0/0 .rodata m__21daAlinkHIO_cutFnJU_c0 */ @@ -8488,7 +8485,7 @@ SECTION_RODATA u8 const daAlinkHIO_cutFnJU_c0::m[84] = { 0x41, 0x60, 0x00, 0x00, 0x40, 0xC0, 0x00, 0x00, 0x40, 0xC0, 0x00, 0x00, 0x43, 0x48, 0x00, 0x00, 0x41, 0x20, 0x00, 0x00, 0x43, 0x16, 0x00, 0x00, 0x42, 0xA0, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8038DAEC, &daAlinkHIO_cutFnJU_c0::m); +COMPILER_STRIP_GATE(0x8038DAEC, &daAlinkHIO_cutFnJU_c0::m); /* 8038DB40-8038DB84 01A1A0 0044+00 4/4 0/0 0/0 .rodata m__21daAlinkHIO_cutJump_c0 */ SECTION_RODATA u8 const daAlinkHIO_cutJump_c0::m[68] = { @@ -8498,7 +8495,7 @@ SECTION_RODATA u8 const daAlinkHIO_cutJump_c0::m[68] = { 0x00, 0x00, 0x41, 0xD8, 0x00, 0x00, 0x41, 0x70, 0x00, 0x00, 0x41, 0x50, 0x00, 0x00, 0x41, 0x50, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8038DB40, &daAlinkHIO_cutJump_c0::m); +COMPILER_STRIP_GATE(0x8038DB40, &daAlinkHIO_cutJump_c0::m); /* 8038DB84-8038DC1C 01A1E4 0098+00 5/6 0/0 0/0 .rodata m__21daAlinkHIO_cutTurn_c0 */ SECTION_RODATA u8 const daAlinkHIO_cutTurn_c0::m[152] = { @@ -8513,7 +8510,7 @@ SECTION_RODATA u8 const daAlinkHIO_cutTurn_c0::m[152] = { 0x40, 0xA0, 0x00, 0x00, 0x41, 0xA0, 0x00, 0x00, 0x43, 0xC8, 0x00, 0x00, 0x42, 0x0C, 0x00, 0x00, 0x43, 0xC8, 0x00, 0x00, 0x42, 0x0C, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8038DB84, &daAlinkHIO_cutTurn_c0::m); +COMPILER_STRIP_GATE(0x8038DB84, &daAlinkHIO_cutTurn_c0::m); /* 8038DC1C-8038DC3C 01A27C 0020+00 0/1 0/0 0/0 .rodata m__21daAlinkHIO_hoCutLA_c0 */ #pragma push @@ -8522,7 +8519,7 @@ SECTION_RODATA u8 const daAlinkHIO_hoCutLA_c0::m[32] = { 0x00, 0x15, 0x00, 0x00, 0x3F, 0x66, 0x66, 0x66, 0x3F, 0x80, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x41, 0x60, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x40, 0xC0, 0x00, 0x00, 0x40, 0xC0, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8038DC1C, &daAlinkHIO_hoCutLA_c0::m); +COMPILER_STRIP_GATE(0x8038DC1C, &daAlinkHIO_hoCutLA_c0::m); #pragma pop /* 8038DC3C-8038DC5C 01A29C 0020+00 0/1 0/0 0/0 .rodata m__21daAlinkHIO_hoCutLB_c0 */ @@ -8532,7 +8529,7 @@ SECTION_RODATA u8 const daAlinkHIO_hoCutLB_c0::m[32] = { 0x00, 0x18, 0x00, 0x00, 0x3F, 0x66, 0x66, 0x66, 0x40, 0x80, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x41, 0x80, 0x00, 0x00, 0x40, 0xE0, 0x00, 0x00, 0x41, 0x50, 0x00, 0x00, 0x40, 0xC0, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8038DC3C, &daAlinkHIO_hoCutLB_c0::m); +COMPILER_STRIP_GATE(0x8038DC3C, &daAlinkHIO_hoCutLB_c0::m); #pragma pop /* 8038DC5C-8038DC7C 01A2BC 0020+00 0/1 0/0 0/0 .rodata m__21daAlinkHIO_hoCutRA_c0 */ @@ -8542,7 +8539,7 @@ SECTION_RODATA u8 const daAlinkHIO_hoCutRA_c0::m[32] = { 0x00, 0x18, 0x00, 0x00, 0x3F, 0x73, 0x33, 0x33, 0x00, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x41, 0x50, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x40, 0xC0, 0x00, 0x00, 0x40, 0xC0, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8038DC5C, &daAlinkHIO_hoCutRA_c0::m); +COMPILER_STRIP_GATE(0x8038DC5C, &daAlinkHIO_hoCutRA_c0::m); #pragma pop /* 8038DC7C-8038DC9C 01A2DC 0020+00 0/1 0/0 0/0 .rodata m__21daAlinkHIO_hoCutRB_c0 */ @@ -8552,7 +8549,7 @@ SECTION_RODATA u8 const daAlinkHIO_hoCutRB_c0::m[32] = { 0x00, 0x0B, 0x00, 0x00, 0x3F, 0x66, 0x66, 0x66, 0x00, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x41, 0x20, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x41, 0x30, 0x00, 0x00, 0x40, 0xC0, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8038DC7C, &daAlinkHIO_hoCutRB_c0::m); +COMPILER_STRIP_GATE(0x8038DC7C, &daAlinkHIO_hoCutRB_c0::m); #pragma pop /* 8038DC9C-8038DCF0 01A2FC 0054+00 3/3 0/0 0/0 .rodata m__25daAlinkHIO_hoCutCharge_c0 */ @@ -8564,7 +8561,7 @@ SECTION_RODATA u8 const daAlinkHIO_hoCutCharge_c0::m[84] = { 0x41, 0xD8, 0x00, 0x00, 0x00, 0x04, 0x00, 0x05, 0x41, 0x00, 0x00, 0x00, 0x41, 0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41, 0xC8, 0x00, 0x00, 0x43, 0x96, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8038DC9C, &daAlinkHIO_hoCutCharge_c0::m); +COMPILER_STRIP_GATE(0x8038DC9C, &daAlinkHIO_hoCutCharge_c0::m); /* 8038DCF0-8038DD0C 01A350 001C+00 0/3 0/0 0/0 .rodata m__20daAlinkHIO_cutDaL_c0 */ #pragma push @@ -8573,7 +8570,7 @@ SECTION_RODATA u8 const daAlinkHIO_cutDaL_c0::m[28] = { 0x00, 0x0C, 0x00, 0x00, 0x3F, 0x4C, 0xCC, 0xCD, 0x3F, 0x80, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, 0x41, 0x20, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x40, 0xC0, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8038DCF0, &daAlinkHIO_cutDaL_c0::m); +COMPILER_STRIP_GATE(0x8038DCF0, &daAlinkHIO_cutDaL_c0::m); #pragma pop /* 8038DD0C-8038DD28 01A36C 001C+00 0/3 0/0 0/0 .rodata m__20daAlinkHIO_cutDaR_c0 */ @@ -8583,7 +8580,7 @@ SECTION_RODATA u8 const daAlinkHIO_cutDaR_c0::m[28] = { 0x00, 0x0E, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0xA0, 0x00, 0x00, 0x41, 0x30, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x40, 0xC0, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8038DD0C, &daAlinkHIO_cutDaR_c0::m); +COMPILER_STRIP_GATE(0x8038DD0C, &daAlinkHIO_cutDaR_c0::m); #pragma pop /* 8038DD28-8038DD44 01A388 001C+00 0/3 0/0 0/0 .rodata m__25daAlinkHIO_cutDaCharge_c0 */ @@ -8593,7 +8590,7 @@ SECTION_RODATA u8 const daAlinkHIO_cutDaCharge_c0::m[28] = { 0x00, 0x0E, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, 0x41, 0x70, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, 0x41, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8038DD28, &daAlinkHIO_cutDaCharge_c0::m); +COMPILER_STRIP_GATE(0x8038DD28, &daAlinkHIO_cutDaCharge_c0::m); #pragma pop /* 8038DD44-8038DDB8 01A3A4 0074+00 5/5 0/0 0/0 .rodata m__21daAlinkHIO_cutDown_c0 */ @@ -8607,7 +8604,7 @@ SECTION_RODATA u8 const daAlinkHIO_cutDown_c0::m[116] = { 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, 0x41, 0x40, 0x00, 0x00, 0x00, 0x0F, 0x00, 0x06, 0x42, 0x20, 0x00, 0x00, 0x41, 0xA0, 0x00, 0x00, 0x41, 0x20, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8038DD44, &daAlinkHIO_cutDown_c0::m); +COMPILER_STRIP_GATE(0x8038DD44, &daAlinkHIO_cutDown_c0::m); /* 8038DDB8-8038DE18 01A418 0060+00 4/4 0/0 0/0 .rodata m__21daAlinkHIO_cutHead_c0 */ SECTION_RODATA u8 const daAlinkHIO_cutHead_c0::m[96] = { @@ -8618,7 +8615,7 @@ SECTION_RODATA u8 const daAlinkHIO_cutHead_c0::m[96] = { 0x43, 0x96, 0x00, 0x00, 0x43, 0xC8, 0x00, 0x00, 0x41, 0x20, 0x00, 0x00, 0x41, 0x40, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x41, 0x00, 0x00, 0x00, 0x42, 0x70, 0x00, 0x00, 0x3F, 0xCC, 0xCC, 0xCD, }; -COMPILER_STRIP_GATE(8038DDB8, &daAlinkHIO_cutHead_c0::m); +COMPILER_STRIP_GATE(0x8038DDB8, &daAlinkHIO_cutHead_c0::m); /* 8038DE18-8038DE8C 01A478 0074+00 5/5 0/0 0/0 .rodata m__26daAlinkHIO_cutLargeJump_c0 */ SECTION_RODATA u8 const daAlinkHIO_cutLargeJump_c0::m[116] = { @@ -8631,7 +8628,7 @@ SECTION_RODATA u8 const daAlinkHIO_cutLargeJump_c0::m[116] = { 0x00, 0x00, 0x40, 0xC0, 0x00, 0x00, 0x41, 0x50, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41, 0x20, 0x00, 0x00, 0x43, 0x7A, 0x00, 0x00, 0x40, 0xA0, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8038DE18, &daAlinkHIO_cutLargeJump_c0::m); +COMPILER_STRIP_GATE(0x8038DE18, &daAlinkHIO_cutLargeJump_c0::m); /* 8038DE8C-8038DF28 01A4EC 009C+00 21/30 0/0 0/0 .rodata m__17daAlinkHIO_cut_c0 */ SECTION_RODATA u8 const daAlinkHIO_cut_c0::m[156] = { @@ -8646,7 +8643,7 @@ SECTION_RODATA u8 const daAlinkHIO_cut_c0::m[156] = { 0x42, 0x82, 0x00, 0x00, 0x3F, 0x9A, 0xE1, 0x48, 0x42, 0x0C, 0x00, 0x00, 0x40, 0x13, 0x33, 0x33, 0x40, 0x0C, 0xCC, 0xCD, 0x42, 0x82, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8038DE8C, &daAlinkHIO_cut_c0::m); +COMPILER_STRIP_GATE(0x8038DE8C, &daAlinkHIO_cut_c0::m); /* 8038DF28-8038DF4C 01A588 0024+00 1/1 0/0 0/0 .rodata m__21daAlinkHIO_gAtPush_c0 */ SECTION_RODATA u8 const daAlinkHIO_gAtPush_c0::m[36] = { @@ -8654,7 +8651,7 @@ SECTION_RODATA u8 const daAlinkHIO_gAtPush_c0::m[36] = { 0x40, 0xA0, 0x00, 0x00, 0x41, 0x90, 0x00, 0x00, 0x41, 0x60, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x41, 0x40, 0x00, 0x00, 0x41, 0x60, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8038DF28, &daAlinkHIO_gAtPush_c0::m); +COMPILER_STRIP_GATE(0x8038DF28, &daAlinkHIO_gAtPush_c0::m); /* 8038DF4C-8038DF70 01A5AC 0024+00 0/0 0/0 0/0 .rodata m__21daAlinkHIO_gAtKick_c0 */ #pragma push @@ -8664,7 +8661,7 @@ SECTION_RODATA u8 const daAlinkHIO_gAtKick_c0::m[36] = { 0x00, 0x00, 0x00, 0x00, 0x41, 0xB0, 0x00, 0x00, 0x41, 0x20, 0x00, 0x00, 0x40, 0xC0, 0x00, 0x00, 0x41, 0x30, 0x00, 0x00, 0x41, 0x90, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8038DF4C, &daAlinkHIO_gAtKick_c0::m); +COMPILER_STRIP_GATE(0x8038DF4C, &daAlinkHIO_gAtKick_c0::m); #pragma pop /* 8038DF70-8038DF9C 01A5D0 002C+00 4/4 0/0 0/0 .rodata m__22daAlinkHIO_turnMove_c0 */ @@ -8673,7 +8670,7 @@ SECTION_RODATA u8 const daAlinkHIO_turnMove_c0::m[44] = { 0x00, 0x41, 0xB0, 0x00, 0x00, 0x00, 0x05, 0x09, 0xC4, 0x00, 0xC8, 0x03, 0xE8, 0x3F, 0x8C, 0xCC, 0xCD, 0x41, 0x98, 0x00, 0x00, 0x3F, 0xC0, 0x00, 0x00, 0x41, 0xC8, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8038DF70, &daAlinkHIO_turnMove_c0::m); +COMPILER_STRIP_GATE(0x8038DF70, &daAlinkHIO_turnMove_c0::m); /* 8038DF9C-8038E01C 01A5FC 0080+00 6/7 0/0 0/0 .rodata m__19daAlinkHIO_guard_c0 */ SECTION_RODATA u8 const daAlinkHIO_guard_c0::m[128] = { @@ -8686,7 +8683,7 @@ SECTION_RODATA u8 const daAlinkHIO_guard_c0::m[128] = { 0x40, 0x40, 0x00, 0x00, 0x41, 0x60, 0x00, 0x00, 0x41, 0xA0, 0x00, 0x00, 0x41, 0xD0, 0x00, 0x00, 0x42, 0xA0, 0x00, 0x00, 0x42, 0x70, 0x00, 0x00, 0x42, 0x20, 0x00, 0x00, 0x41, 0x90, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8038DF9C, &daAlinkHIO_guard_c0::m); +COMPILER_STRIP_GATE(0x8038DF9C, &daAlinkHIO_guard_c0::m); /* 8038E01C-8038E068 01A67C 004C+00 8/9 0/0 0/0 .rodata m__20daAlinkHIO_crouch_c0 */ SECTION_RODATA u8 const daAlinkHIO_crouch_c0::m[76] = { @@ -8696,7 +8693,7 @@ SECTION_RODATA u8 const daAlinkHIO_crouch_c0::m[76] = { 0x3F, 0x80, 0x00, 0x00, 0x40, 0x80, 0x00, 0x00, 0x40, 0x80, 0x00, 0x00, 0x40, 0x80, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x3F, 0x00, 0x00, 0x00, 0x40, 0xA0, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8038E01C, &daAlinkHIO_crouch_c0::m); +COMPILER_STRIP_GATE(0x8038E01C, &daAlinkHIO_crouch_c0::m); /* 8038E068-8038E11C 01A6C8 00B4+00 26/32 0/0 0/0 .rodata m__22daAlinkHIO_autoJump_c0 */ SECTION_RODATA u8 const daAlinkHIO_autoJump_c0::m[180] = { @@ -8713,7 +8710,7 @@ SECTION_RODATA u8 const daAlinkHIO_autoJump_c0::m[180] = { 0x00, 0x00, 0x41, 0xA0, 0x00, 0x00, 0x41, 0xF0, 0x00, 0x00, 0x41, 0xA0, 0x00, 0x00, 0xC0, 0x59, 0x99, 0x9A, 0x41, 0x60, 0x00, 0x00, 0xC0, 0xA0, 0x00, 0x00, 0x41, 0xB8, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8038E068, &daAlinkHIO_autoJump_c0::m); +COMPILER_STRIP_GATE(0x8038E068, &daAlinkHIO_autoJump_c0::m); /* 8038E11C-8038E164 01A77C 0048+00 7/7 0/0 0/0 .rodata m__23daAlinkHIO_smallJump_c0 */ SECTION_RODATA u8 const daAlinkHIO_smallJump_c0::m[72] = { @@ -8723,7 +8720,7 @@ SECTION_RODATA u8 const daAlinkHIO_smallJump_c0::m[72] = { 0x59, 0x99, 0x9A, 0x00, 0x00, 0x00, 0x00, 0x40, 0xA0, 0x00, 0x00, 0x40, 0xC0, 0x00, 0x00, 0x40, 0xC0, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, 0x40, 0xE0, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8038E11C, &daAlinkHIO_smallJump_c0::m); +COMPILER_STRIP_GATE(0x8038E11C, &daAlinkHIO_smallJump_c0::m); /* 8038E164-8038E1B8 01A7C4 0054+00 15/15 0/0 0/0 .rodata m__23daAlinkHIO_wallCatch_c0 */ SECTION_RODATA u8 const daAlinkHIO_wallCatch_c0::m[84] = { @@ -8734,7 +8731,7 @@ SECTION_RODATA u8 const daAlinkHIO_wallCatch_c0::m[84] = { 0x41, 0xD0, 0x00, 0x00, 0x00, 0x0D, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x41, 0x60, 0x00, 0x00, 0x40, 0x80, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8038E164, &daAlinkHIO_wallCatch_c0::m); +COMPILER_STRIP_GATE(0x8038E164, &daAlinkHIO_wallCatch_c0::m); /* 8038E1B8-8038E1E0 01A818 0028+00 4/4 0/0 0/0 .rodata m__22daAlinkHIO_wallFall_c0 */ SECTION_RODATA u8 const daAlinkHIO_wallFall_c0::m[40] = { @@ -8742,21 +8739,21 @@ SECTION_RODATA u8 const daAlinkHIO_wallFall_c0::m[40] = { 0x00, 0x00, 0x41, 0xB8, 0x00, 0x00, 0x00, 0x0C, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, 0x41, 0x50, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8038E1B8, &daAlinkHIO_wallFall_c0::m); +COMPILER_STRIP_GATE(0x8038E1B8, &daAlinkHIO_wallFall_c0::m); /* 8038E1E0-8038E1F4 01A840 0014+00 2/2 0/0 0/0 .rodata m__22daAlinkHIO_wallMove_c0 */ SECTION_RODATA u8 const daAlinkHIO_wallMove_c0::m[20] = { 0x3F, 0x4C, 0xCC, 0xCD, 0x3F, 0x8C, 0xCC, 0xCD, 0x40, 0x40, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8038E1E0, &daAlinkHIO_wallMove_c0::m); +COMPILER_STRIP_GATE(0x8038E1E0, &daAlinkHIO_wallMove_c0::m); /* 8038E1F4-8038E210 01A854 001C+00 2/5 0/0 0/0 .rodata m__22daAlinkHIO_wallHang_c0 */ SECTION_RODATA u8 const daAlinkHIO_wallHang_c0::m[28] = { 0x00, 0x02, 0x00, 0x03, 0x42, 0x48, 0x00, 0x00, 0x42, 0xC8, 0x00, 0x00, 0x43, 0x16, 0x00, 0x00, 0x43, 0x48, 0x00, 0x00, 0x43, 0x7A, 0x00, 0x00, 0x43, 0x48, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8038E1F4, &daAlinkHIO_wallHang_c0::m); +COMPILER_STRIP_GATE(0x8038E1F4, &daAlinkHIO_wallHang_c0::m); /* 8038E210-8038E24C 01A870 003C+00 7/7 0/0 0/0 .rodata m__22daAlinkHIO_pushpull_c0 */ SECTION_RODATA u8 const daAlinkHIO_pushpull_c0::m[60] = { @@ -8765,7 +8762,7 @@ SECTION_RODATA u8 const daAlinkHIO_pushpull_c0::m[60] = { 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x3E, 0x80, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x3E, 0x19, 0x99, 0x9A, 0x3F, 0x40, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8038E210, &daAlinkHIO_pushpull_c0::m); +COMPILER_STRIP_GATE(0x8038E210, &daAlinkHIO_pushpull_c0::m); /* 8038E24C-8038E2B0 01A8AC 0064+00 1/3 0/0 0/0 .rodata m__23daAlinkHIO_damNormal_c0 */ SECTION_RODATA u8 const daAlinkHIO_damNormal_c0::m[100] = { @@ -8777,7 +8774,7 @@ SECTION_RODATA u8 const daAlinkHIO_damNormal_c0::m[100] = { 0x00, 0x41, 0x88, 0x00, 0x00, 0x07, 0xD0, 0x13, 0x88, 0x41, 0x20, 0x00, 0x00, 0x3C, 0xA3, 0xD7, 0x0A, 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8038E24C, &daAlinkHIO_damNormal_c0::m); +COMPILER_STRIP_GATE(0x8038E24C, &daAlinkHIO_damNormal_c0::m); /* 8038E2B0-8038E36C 01A910 00BC+00 2/4 0/0 0/0 .rodata m__22daAlinkHIO_damLarge_c0 */ SECTION_RODATA u8 const daAlinkHIO_damLarge_c0::m[188] = { @@ -8794,7 +8791,7 @@ SECTION_RODATA u8 const daAlinkHIO_damLarge_c0::m[188] = { 0x05, 0x14, 0x00, 0x00, 0xC0, 0xA0, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, 0x41, 0xA0, 0x00, 0x00, 0x41, 0xF0, 0x00, 0x00, 0x41, 0x70, 0x00, 0x00, 0x3F, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8038E2B0, &daAlinkHIO_damLarge_c0::m); +COMPILER_STRIP_GATE(0x8038E2B0, &daAlinkHIO_damLarge_c0::m); /* 8038E36C-8038E428 01A9CC 00BC+00 1/3 0/0 0/0 .rodata m__21daAlinkHIO_damHuge_c0 */ SECTION_RODATA u8 const daAlinkHIO_damHuge_c0::m[188] = { @@ -8811,7 +8808,7 @@ SECTION_RODATA u8 const daAlinkHIO_damHuge_c0::m[188] = { 0x07, 0xD0, 0x00, 0x00, 0xC0, 0xF0, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, 0x42, 0xA0, 0x00, 0x00, 0x42, 0x20, 0x00, 0x00, 0x41, 0x70, 0x00, 0x00, 0x3F, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8038E36C, &daAlinkHIO_damHuge_c0::m); +COMPILER_STRIP_GATE(0x8038E36C, &daAlinkHIO_damHuge_c0::m); /* 8038E428-8038E454 01AA88 002C+00 1/1 0/0 0/0 .rodata m__22daAlinkHIO_damHorse_c0 */ SECTION_RODATA u8 const daAlinkHIO_damHorse_c0::m[44] = { @@ -8819,7 +8816,7 @@ SECTION_RODATA u8 const daAlinkHIO_damHorse_c0::m[44] = { 0x00, 0x41, 0x20, 0x00, 0x00, 0x00, 0x0B, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, 0x41, 0x40, 0x00, 0x00, 0x09, 0xC4, 0x13, 0x88, }; -COMPILER_STRIP_GATE(8038E428, &daAlinkHIO_damHorse_c0::m); +COMPILER_STRIP_GATE(0x8038E428, &daAlinkHIO_damHorse_c0::m); /* 8038E454-8038E49C 01AAB4 0048+00 9/9 0/0 0/0 .rodata m__21daAlinkHIO_damFall_c0 */ SECTION_RODATA u8 const daAlinkHIO_damFall_c0::m[72] = { @@ -8829,7 +8826,7 @@ SECTION_RODATA u8 const daAlinkHIO_damFall_c0::m[72] = { 0x80, 0x00, 0x00, 0x41, 0xF0, 0x00, 0x00, 0x41, 0xA0, 0x00, 0x00, 0x42, 0x70, 0x00, 0x00, 0x40, 0x80, 0x00, 0x00, 0x41, 0x20, 0x00, 0x00, 0x41, 0x70, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8038E454, &daAlinkHIO_damFall_c0::m); +COMPILER_STRIP_GATE(0x8038E454, &daAlinkHIO_damFall_c0::m); /* 8038E49C-8038E4C0 01AAFC 0024+00 6/7 0/0 0/0 .rodata m__23daAlinkHIO_damCaught_c0 */ SECTION_RODATA u8 const daAlinkHIO_damCaught_c0::m[36] = { @@ -8837,7 +8834,7 @@ SECTION_RODATA u8 const daAlinkHIO_damCaught_c0::m[36] = { 0x40, 0x40, 0x00, 0x00, 0x42, 0x0C, 0x00, 0x00, 0x01, 0x2C, 0x00, 0x05, 0x3F, 0x33, 0x33, 0x33, 0x40, 0x40, 0x00, 0x00, 0x3F, 0xA6, 0x66, 0x66, }; -COMPILER_STRIP_GATE(8038E49C, &daAlinkHIO_damCaught_c0::m); +COMPILER_STRIP_GATE(0x8038E49C, &daAlinkHIO_damCaught_c0::m); /* 8038E4C0-8038E54C 01AB20 008C+00 1/2 0/0 0/0 .rodata m__21daAlinkHIO_damSwim_c0 */ SECTION_RODATA u8 const daAlinkHIO_damSwim_c0::m[140] = { @@ -8851,7 +8848,7 @@ SECTION_RODATA u8 const daAlinkHIO_damSwim_c0::m[140] = { 0x40, 0x40, 0x00, 0x00, 0x41, 0x40, 0x00, 0x00, 0x05, 0xDC, 0x0F, 0xA0, 0x41, 0x00, 0x00, 0x00, 0x3C, 0xA3, 0xD7, 0x0A, 0x3E, 0x80, 0x00, 0x00, 0x41, 0x70, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8038E4C0, &daAlinkHIO_damSwim_c0::m); +COMPILER_STRIP_GATE(0x8038E4C0, &daAlinkHIO_damSwim_c0::m); /* 8038E54C-8038E5A4 01ABAC 0058+00 10/12 0/0 0/0 .rodata m__20daAlinkHIO_damage_c0 */ SECTION_RODATA u8 const daAlinkHIO_damage_c0::m[88] = { @@ -8862,7 +8859,7 @@ SECTION_RODATA u8 const daAlinkHIO_damage_c0::m[88] = { 0x00, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x19, 0x00, 0x1E, 0x00, 0x28, 0x00, 0x00, 0x3F, 0x33, 0x33, 0x33, 0x42, 0x0C, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8038E54C, &daAlinkHIO_damage_c0::m); +COMPILER_STRIP_GATE(0x8038E54C, &daAlinkHIO_damage_c0::m); /* 8038E5A4-8038E610 01AC04 006C+00 7/8 0/0 0/0 .rodata m__19daAlinkHIO_horse_c0 */ SECTION_RODATA u8 const daAlinkHIO_horse_c0::m[108] = { @@ -8874,7 +8871,7 @@ SECTION_RODATA u8 const daAlinkHIO_horse_c0::m[108] = { 0x00, 0x64, 0x7F, 0xFF, 0x00, 0x1E, 0x00, 0x19, 0x15, 0x7C, 0xCD, 0x38, 0x3F, 0x99, 0x99, 0x9A, 0x41, 0x00, 0x00, 0x00, 0x41, 0x00, 0x00, 0x00, 0x40, 0xA0, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8038E5A4, &daAlinkHIO_horse_c0::m); +COMPILER_STRIP_GATE(0x8038E5A4, &daAlinkHIO_horse_c0::m); /* 800A07D8-800A0868 09B118 0090+00 2/2 0/0 0/0 .text checkAttentionPosAngle__9daAlink_cFP4cXyz */ #pragma push @@ -8917,7 +8914,7 @@ SECTION_RODATA u8 const daAlinkHIO_canoe_c0::m[72] = { 0xC0, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x40, 0xC0, 0x00, 0x00, 0x41, 0x20, 0x00, 0x00, 0x42, 0x20, 0x00, 0x00, 0x41, 0xF0, 0x00, 0x00, 0x3E, 0x4C, 0xCC, 0xCD, }; -COMPILER_STRIP_GATE(8038E610, &daAlinkHIO_canoe_c0::m); +COMPILER_STRIP_GATE(0x8038E610, &daAlinkHIO_canoe_c0::m); /* 8038E658-8038E6C8 01ACB8 0070+00 9/9 0/0 0/0 .rodata m__17daAlinkHIO_bow_c0 */ SECTION_RODATA u8 const daAlinkHIO_bow_c0::m[112] = { @@ -8929,7 +8926,7 @@ SECTION_RODATA u8 const daAlinkHIO_bow_c0::m[112] = { 0x43, 0x66, 0x00, 0x00, 0x45, 0x5A, 0xC0, 0x00, 0x44, 0x16, 0x00, 0x00, 0x46, 0x0C, 0xA0, 0x00, 0x44, 0x7A, 0x00, 0x00, 0x45, 0x7A, 0x00, 0x00, 0x43, 0x7A, 0x00, 0x00, 0x44, 0x48, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8038E658, &daAlinkHIO_bow_c0::m); +COMPILER_STRIP_GATE(0x8038E658, &daAlinkHIO_bow_c0::m); /* 8038E6C8-8038E714 01AD28 004C+00 22/23 0/0 0/0 .rodata m__18daAlinkHIO_boom_c0 */ SECTION_RODATA u8 const daAlinkHIO_boom_c0::m[76] = { @@ -8939,7 +8936,7 @@ SECTION_RODATA u8 const daAlinkHIO_boom_c0::m[76] = { 0x40, 0x40, 0x00, 0x00, 0x42, 0x70, 0x00, 0x00, 0x42, 0x70, 0x00, 0x00, 0x44, 0xFA, 0x00, 0x00, 0x45, 0x3B, 0x80, 0x00, 0x45, 0x3B, 0x80, 0x00, 0x42, 0x20, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8038E6C8, &daAlinkHIO_boom_c0::m); +COMPILER_STRIP_GATE(0x8038E6C8, &daAlinkHIO_boom_c0::m); /* 8038E714-8038E760 01AD74 004C+00 14/14 0/0 0/0 .rodata m__18daAlinkHIO_bomb_c0 */ SECTION_RODATA u8 const daAlinkHIO_bomb_c0::m[76] = { @@ -8949,7 +8946,7 @@ SECTION_RODATA u8 const daAlinkHIO_bomb_c0::m[76] = { 0x41, 0xD0, 0x00, 0x00, 0x42, 0x04, 0x00, 0x00, 0x41, 0x20, 0x00, 0x00, 0x41, 0x70, 0x00, 0x00, 0x42, 0x20, 0x00, 0x00, 0x41, 0x70, 0x00, 0x00, 0x43, 0x96, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8038E714, &daAlinkHIO_bomb_c0::m); +COMPILER_STRIP_GATE(0x8038E714, &daAlinkHIO_bomb_c0::m); /* 8038E760-8038E77C 01ADC0 001C+00 0/1 0/0 0/0 .rodata m__21daAlinkHIO_huLight_c0 */ #pragma push @@ -8958,7 +8955,7 @@ SECTION_RODATA u8 const daAlinkHIO_huLight_c0::m[28] = { 0x00, 0x03, 0x00, 0x00, 0x00, 0xB5, 0x00, 0x70, 0x00, 0x28, 0xFF, 0xBA, 0x3F, 0x80, 0x00, 0x00, 0x42, 0x48, 0x00, 0x00, 0x43, 0xAF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8038E760, &daAlinkHIO_huLight_c0::m); +COMPILER_STRIP_GATE(0x8038E760, &daAlinkHIO_huLight_c0::m); #pragma pop /* 8038E77C-8038E7CC 01ADDC 0050+00 7/8 0/0 0/0 .rodata m__23daAlinkHIO_kandelaar_c0 */ @@ -8969,7 +8966,7 @@ SECTION_RODATA u8 const daAlinkHIO_kandelaar_c0::m[80] = { 0x00, 0x00, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, 0x41, 0x90, 0x00, 0x00, 0x00, 0x50, 0x00, 0x28, 0x00, 0x14, 0x00, 0x28, 0x00, 0x1E, 0x00, 0x0A, 0x00, 0x03, 0x00, 0xC8, 0x3F, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8038E77C, &daAlinkHIO_kandelaar_c0::m); +COMPILER_STRIP_GATE(0x8038E77C, &daAlinkHIO_kandelaar_c0::m); /* 8038E7CC-8038E7F4 01AE2C 0028+00 2/2 0/0 0/0 .rodata m__21daAlinkHIO_fmChain_c0 */ SECTION_RODATA u8 const daAlinkHIO_fmChain_c0::m[40] = { @@ -8977,7 +8974,7 @@ SECTION_RODATA u8 const daAlinkHIO_fmChain_c0::m[40] = { 0x00, 0x00, 0x41, 0x80, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0xBF, 0x8C, 0xCC, 0xCD, 0x00, 0x00, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, 0x40, 0xA0, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8038E7CC, &daAlinkHIO_fmChain_c0::m); +COMPILER_STRIP_GATE(0x8038E7CC, &daAlinkHIO_fmChain_c0::m); /* 8038E7F4-8038E840 01AE54 004C+00 17/21 0/0 0/0 .rodata m__24daAlinkHIO_magneBoots_c0 */ SECTION_RODATA u8 const daAlinkHIO_magneBoots_c0::m[76] = { @@ -8987,7 +8984,7 @@ SECTION_RODATA u8 const daAlinkHIO_magneBoots_c0::m[76] = { 0x42, 0x48, 0x00, 0x00, 0x41, 0x20, 0x00, 0x00, 0x3E, 0xB3, 0x33, 0x33, 0x3E, 0x99, 0x99, 0x9A, 0x3F, 0x33, 0x33, 0x33, 0x3F, 0x4C, 0xCC, 0xCD, 0x3F, 0x33, 0x33, 0x33, }; -COMPILER_STRIP_GATE(8038E7F4, &daAlinkHIO_magneBoots_c0::m); +COMPILER_STRIP_GATE(0x8038E7F4, &daAlinkHIO_magneBoots_c0::m); /* 8038E840-8038E870 01AEA0 0030+00 6/6 0/0 0/0 .rodata m__20daAlinkHIO_pickUp_c0 */ SECTION_RODATA u8 const daAlinkHIO_pickUp_c0::m[48] = { @@ -8995,7 +8992,7 @@ SECTION_RODATA u8 const daAlinkHIO_pickUp_c0::m[48] = { 0x41, 0x50, 0x00, 0x00, 0x00, 0x12, 0x00, 0x00, 0xBF, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x40, 0x80, 0x00, 0x00, 0x41, 0xF0, 0x00, 0x00, 0x41, 0xF0, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8038E840, &daAlinkHIO_pickUp_c0::m); +COMPILER_STRIP_GATE(0x8038E840, &daAlinkHIO_pickUp_c0::m); /* 8038E870-8038E90C 01AED0 009C+00 16/17 0/0 0/0 .rodata m__19daAlinkHIO_board_c0 */ SECTION_RODATA u8 const daAlinkHIO_board_c0::m[156] = { @@ -9010,7 +9007,7 @@ SECTION_RODATA u8 const daAlinkHIO_board_c0::m[156] = { 0x40, 0x80, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x41, 0xA0, 0x00, 0x00, 0x41, 0xC0, 0x00, 0x00, 0x42, 0x0C, 0x00, 0x00, 0x42, 0x48, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8038E870, &daAlinkHIO_board_c0::m); +COMPILER_STRIP_GATE(0x8038E870, &daAlinkHIO_board_c0::m); /* 8038E90C-8038E9C0 01AF6C 00B4+00 12/12 0/0 0/0 .rodata m__20daAlinkHIO_bottle_c0 */ SECTION_RODATA u8 const daAlinkHIO_bottle_c0::m[180] = { @@ -9027,7 +9024,7 @@ SECTION_RODATA u8 const daAlinkHIO_bottle_c0::m[180] = { 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, 0x42, 0xAE, 0x00, 0x00, 0x00, 0x1D, 0x00, 0x00, 0x3F, 0x99, 0x99, 0x9A, 0x00, 0x00, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, 0x41, 0xF0, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8038E90C, &daAlinkHIO_bottle_c0::m); +COMPILER_STRIP_GATE(0x8038E90C, &daAlinkHIO_bottle_c0::m); /* 8038E9C0-8038EA30 01B020 0070+00 15/16 0/0 0/0 .rodata m__22daAlinkHIO_hookshot_c0 */ SECTION_RODATA u8 const daAlinkHIO_hookshot_c0::m[112] = { @@ -9039,7 +9036,7 @@ SECTION_RODATA u8 const daAlinkHIO_hookshot_c0::m[112] = { 0x43, 0x16, 0x00, 0x00, 0x42, 0x70, 0x00, 0x00, 0x40, 0xA0, 0x00, 0x00, 0x41, 0x50, 0x00, 0x00, 0x45, 0x3B, 0x80, 0x00, 0x43, 0x16, 0x00, 0x00, 0x43, 0x61, 0x00, 0x00, 0x42, 0xB4, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8038E9C0, &daAlinkHIO_hookshot_c0::m); +COMPILER_STRIP_GATE(0x8038E9C0, &daAlinkHIO_hookshot_c0::m); /* 8038EA30-8038EA70 01B090 0040+00 10/10 0/0 0/0 .rodata m__21daAlinkHIO_spinner_c0 */ SECTION_RODATA u8 const daAlinkHIO_spinner_c0::m[64] = { @@ -9048,7 +9045,7 @@ SECTION_RODATA u8 const daAlinkHIO_spinner_c0::m[64] = { 0xC0, 0x6C, 0xCC, 0xCD, 0xC2, 0x48, 0x00, 0x00, 0x3F, 0x66, 0x66, 0x66, 0x41, 0xD0, 0x00, 0x00, 0x3F, 0x00, 0x00, 0x00, 0x3D, 0xCC, 0xCC, 0xCD, 0x3C, 0x23, 0xD7, 0x0A, 0x42, 0x70, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8038EA30, &daAlinkHIO_spinner_c0::m); +COMPILER_STRIP_GATE(0x8038EA30, &daAlinkHIO_spinner_c0::m); /* 8038EA70-8038EAFC 01B0D0 008C+00 10/12 0/0 0/0 .rodata m__22daAlinkHIO_ironBall_c0 */ SECTION_RODATA u8 const daAlinkHIO_ironBall_c0::m[140] = { @@ -9062,7 +9059,7 @@ SECTION_RODATA u8 const daAlinkHIO_ironBall_c0::m[140] = { 0x42, 0x70, 0x00, 0x00, 0x40, 0xA0, 0x00, 0x00, 0xC0, 0x40, 0x00, 0x00, 0x42, 0xA0, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x3F, 0xC0, 0x00, 0x00, 0x3F, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8038EA70, &daAlinkHIO_ironBall_c0::m); +COMPILER_STRIP_GATE(0x8038EA70, &daAlinkHIO_ironBall_c0::m); /* 8038EAFC-8038EB34 01B15C 0038+00 4/4 0/0 0/0 .rodata m__21daAlinkHIO_copyRod_c0 */ SECTION_RODATA u8 const daAlinkHIO_copyRod_c0::m[56] = { @@ -9071,7 +9068,7 @@ SECTION_RODATA u8 const daAlinkHIO_copyRod_c0::m[56] = { 0x00, 0x00, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, 0x41, 0xF0, 0x00, 0x00, 0x42, 0xA0, 0x00, 0x00, 0x44, 0xBB, 0x80, 0x00, 0x42, 0xC8, 0x00, 0x00, 0x44, 0xFA, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8038EAFC, &daAlinkHIO_copyRod_c0::m); +COMPILER_STRIP_GATE(0x8038EAFC, &daAlinkHIO_copyRod_c0::m); /* 8038EB34-8038EB50 01B194 001C+00 0/0 0/0 0/0 .rodata m__21daAlinkHIO_zwLight_c0 */ #pragma push @@ -9080,7 +9077,7 @@ SECTION_RODATA u8 const daAlinkHIO_zwLight_c0::m[28] = { 0x03, 0x03, 0x00, 0x00, 0x00, 0xB6, 0x00, 0xE1, 0x00, 0xF3, 0xFF, 0xA9, 0x3F, 0x80, 0x00, 0x00, 0x42, 0x8D, 0x81, 0x00, 0x43, 0x03, 0xD6, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8038EB34, &daAlinkHIO_zwLight_c0::m); +COMPILER_STRIP_GATE(0x8038EB34, &daAlinkHIO_zwLight_c0::m); #pragma pop /* 8038EB50-8038EB8C 01B1B0 003C+00 3/3 0/0 0/0 .rodata m__18daAlinkHIO_item_c0 */ @@ -9090,7 +9087,7 @@ SECTION_RODATA u8 const daAlinkHIO_item_c0::m[60] = { 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, 0x41, 0x70, 0x00, 0x00, 0x00, 0x0F, 0x27, 0x10, 0xCD, 0x38, 0x17, 0x70, 0xDC, 0xD8, 0x00, 0x00, 0x3F, 0xA6, 0x66, 0x66, 0x3F, 0xA6, 0x66, 0x66, }; -COMPILER_STRIP_GATE(8038EB50, &daAlinkHIO_item_c0::m); +COMPILER_STRIP_GATE(0x8038EB50, &daAlinkHIO_item_c0::m); /* 8038EB8C-8038EBFC 01B1EC 0070+00 14/14 0/0 0/0 .rodata m__20daAlinkHIO_ladder_c0 */ SECTION_RODATA u8 const daAlinkHIO_ladder_c0::m[112] = { @@ -9102,7 +9099,7 @@ SECTION_RODATA u8 const daAlinkHIO_ladder_c0::m[112] = { 0x40, 0x00, 0x00, 0x00, 0x41, 0x90, 0x00, 0x00, 0x42, 0x20, 0x00, 0x00, 0x3F, 0x4C, 0xCC, 0xCD, 0x3F, 0x93, 0x33, 0x33, 0x3F, 0x66, 0x66, 0x66, 0x3F, 0xAC, 0xCC, 0xCD, 0x42, 0xA0, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8038EB8C, &daAlinkHIO_ladder_c0::m); +COMPILER_STRIP_GATE(0x8038EB8C, &daAlinkHIO_ladder_c0::m); /* 8038EBFC-8038EC48 01B25C 004C+00 11/11 0/0 0/0 .rodata m__22daAlinkHIO_roofHang_c0 */ SECTION_RODATA u8 const daAlinkHIO_roofHang_c0::m[76] = { @@ -9112,7 +9109,7 @@ SECTION_RODATA u8 const daAlinkHIO_roofHang_c0::m[76] = { 0x41, 0x20, 0x00, 0x00, 0x41, 0x50, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x8C, 0xCC, 0xCD, 0x40, 0x40, 0x00, 0x00, 0x3F, 0x66, 0x66, 0x66, 0x40, 0x40, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8038EBFC, &daAlinkHIO_roofHang_c0::m); +COMPILER_STRIP_GATE(0x8038EBFC, &daAlinkHIO_roofHang_c0::m); /* 8038EC48-8038ED2C 01B2A8 00E4+00 10/11 0/0 0/0 .rodata m__18daAlinkHIO_grab_c0 */ SECTION_RODATA u8 const daAlinkHIO_grab_c0::m[228] = { @@ -9132,7 +9129,7 @@ SECTION_RODATA u8 const daAlinkHIO_grab_c0::m[228] = { 0x00, 0x00, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, 0x42, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0F, 0x3F, 0x0C, 0xCC, 0xCD, }; -COMPILER_STRIP_GATE(8038EC48, &daAlinkHIO_grab_c0::m); +COMPILER_STRIP_GATE(0x8038EC48, &daAlinkHIO_grab_c0::m); /* 8038ED2C-8038EE28 01B38C 00FC+00 21/30 0/0 0/0 .rodata m__18daAlinkHIO_swim_c0 */ SECTION_RODATA u8 const daAlinkHIO_swim_c0::m[252] = { @@ -9153,7 +9150,7 @@ SECTION_RODATA u8 const daAlinkHIO_swim_c0::m[252] = { 0x3F, 0x66, 0x66, 0x66, 0xBF, 0x33, 0x33, 0x33, 0x3F, 0x19, 0x99, 0x9A, 0x41, 0x50, 0x00, 0x00, 0x3E, 0x99, 0x99, 0x9A, 0x3F, 0x00, 0x00, 0x00, 0x3F, 0xA6, 0x66, 0x66, }; -COMPILER_STRIP_GATE(8038ED2C, &daAlinkHIO_swim_c0::m); +COMPILER_STRIP_GATE(0x8038ED2C, &daAlinkHIO_swim_c0::m); /* 8038EE28-8038EF28 01B488 0100+00 32/41 0/0 0/0 .rodata m__20daAlinkHIO_wlMove_c0 */ SECTION_RODATA u8 const daAlinkHIO_wlMove_c0::m[256] = { @@ -9174,7 +9171,7 @@ SECTION_RODATA u8 const daAlinkHIO_wlMove_c0::m[256] = { 0x42, 0x04, 0x00, 0x00, 0x42, 0x0C, 0x00, 0x00, 0x3F, 0x99, 0x99, 0x9A, 0x40, 0x40, 0x00, 0x00, 0x41, 0xC8, 0x00, 0x00, 0x42, 0x0C, 0x00, 0x00, 0x3F, 0x8C, 0xCC, 0xCD, 0x3F, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8038EE28, &daAlinkHIO_wlMove_c0::m); +COMPILER_STRIP_GATE(0x8038EE28, &daAlinkHIO_wlMove_c0::m); /* 8038EF28-8038EF70 01B588 0048+00 19/27 0/0 0/0 .rodata m__23daAlinkHIO_wlMoveNoP_c0 */ SECTION_RODATA u8 const daAlinkHIO_wlMoveNoP_c0::m[72] = { @@ -9184,7 +9181,7 @@ SECTION_RODATA u8 const daAlinkHIO_wlMoveNoP_c0::m[72] = { 0x19, 0x99, 0x9A, 0x40, 0xA0, 0x00, 0x00, 0x3F, 0x00, 0x00, 0x00, 0x3F, 0x59, 0x99, 0x9A, 0x3F, 0x66, 0x66, 0x66, 0x40, 0x20, 0x00, 0x00, 0x41, 0xF0, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8038EF28, &daAlinkHIO_wlMoveNoP_c0::m); +COMPILER_STRIP_GATE(0x8038EF28, &daAlinkHIO_wlMoveNoP_c0::m); /* 8038EF70-8038EFA8 01B5D0 0038+00 3/6 0/0 0/0 .rodata m__23daAlinkHIO_wlAtnMove_c0 */ SECTION_RODATA u8 const daAlinkHIO_wlAtnMove_c0::m[56] = { @@ -9193,7 +9190,7 @@ SECTION_RODATA u8 const daAlinkHIO_wlAtnMove_c0::m[56] = { 0x40, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x3F, 0xD9, 0x99, 0x9A, 0x3E, 0xCC, 0xCC, 0xCD, 0x41, 0x40, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8038EF70, &daAlinkHIO_wlAtnMove_c0::m); +COMPILER_STRIP_GATE(0x8038EF70, &daAlinkHIO_wlAtnMove_c0::m); /* 8038EFA8-8038F010 01B608 0068+00 3/3 0/0 0/0 .rodata m__24daAlinkHIO_wlSideStep_c0 */ SECTION_RODATA u8 const daAlinkHIO_wlSideStep_c0::m[104] = { @@ -9205,7 +9202,7 @@ SECTION_RODATA u8 const daAlinkHIO_wlSideStep_c0::m[104] = { 0x00, 0x40, 0x40, 0x00, 0x00, 0x42, 0x04, 0x00, 0x00, 0x41, 0xB8, 0x00, 0x00, 0x41, 0xF0, 0x00, 0x00, 0x41, 0xB0, 0x00, 0x00, 0x42, 0xC8, 0x00, 0x00, 0x41, 0x20, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8038EFA8, &daAlinkHIO_wlSideStep_c0::m); +COMPILER_STRIP_GATE(0x8038EFA8, &daAlinkHIO_wlSideStep_c0::m); /* 8038F010-8038F048 01B670 0038+00 3/4 0/0 0/0 .rodata m__24daAlinkHIO_wlBackJump_c0 */ SECTION_RODATA u8 const daAlinkHIO_wlBackJump_c0::m[56] = { @@ -9214,7 +9211,7 @@ SECTION_RODATA u8 const daAlinkHIO_wlBackJump_c0::m[56] = { 0x00, 0x00, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x41, 0xF0, 0x00, 0x00, 0x41, 0xA0, 0x00, 0x00, 0x42, 0xC8, 0x00, 0x00, 0x41, 0x20, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8038F010, &daAlinkHIO_wlBackJump_c0::m); +COMPILER_STRIP_GATE(0x8038F010, &daAlinkHIO_wlBackJump_c0::m); /* 8038F048-8038F0A8 01B6A8 0060+00 2/2 0/0 0/0 .rodata m__20daAlinkHIO_wlHowl_c0 */ SECTION_RODATA u8 const daAlinkHIO_wlHowl_c0::m[96] = { @@ -9225,7 +9222,7 @@ SECTION_RODATA u8 const daAlinkHIO_wlHowl_c0::m[96] = { 0x3F, 0x66, 0x66, 0x66, 0x00, 0x00, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, 0x41, 0x90, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, 0x41, 0x00, 0x00, 0x00, 0x3F, 0xD9, 0x99, 0x9A, 0x3F, 0x33, 0x33, 0x33, }; -COMPILER_STRIP_GATE(8038F048, &daAlinkHIO_wlHowl_c0::m); +COMPILER_STRIP_GATE(0x8038F048, &daAlinkHIO_wlHowl_c0::m); /* 8038F0A8-8038F124 01B708 007C+00 8/13 0/0 0/0 .rodata m__24daAlinkHIO_wlAutoJump_c0 */ SECTION_RODATA u8 const daAlinkHIO_wlAutoJump_c0::m[124] = { @@ -9238,14 +9235,14 @@ SECTION_RODATA u8 const daAlinkHIO_wlAutoJump_c0::m[124] = { 0x3F, 0x99, 0x99, 0x9A, 0x41, 0x20, 0x00, 0x00, 0x41, 0x20, 0x00, 0x00, 0x3F, 0x82, 0x8F, 0x5C, 0x42, 0x18, 0x00, 0x00, 0x41, 0xF8, 0x00, 0x00, 0x42, 0xC8, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8038F0A8, &daAlinkHIO_wlAutoJump_c0::m); +COMPILER_STRIP_GATE(0x8038F0A8, &daAlinkHIO_wlAutoJump_c0::m); /* 8038F124-8038F138 01B784 0014+00 4/4 0/0 0/0 .rodata m__20daAlinkHIO_wlPush_c0 */ SECTION_RODATA u8 const daAlinkHIO_wlPush_c0::m[20] = { 0x3F, 0x80, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, 0x3F, 0x40, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8038F124, &daAlinkHIO_wlPush_c0::m); +COMPILER_STRIP_GATE(0x8038F124, &daAlinkHIO_wlPush_c0::m); /* 8038F138-8038F184 01B798 004C+00 13/15 0/0 0/0 .rodata m__19daAlinkHIO_wlLie_c0 */ SECTION_RODATA u8 const daAlinkHIO_wlLie_c0::m[76] = { @@ -9255,7 +9252,7 @@ SECTION_RODATA u8 const daAlinkHIO_wlLie_c0::m[76] = { 0x40, 0x40, 0x00, 0x00, 0x41, 0x00, 0x00, 0x00, 0x3F, 0xD9, 0x99, 0x9A, 0x3F, 0x33, 0x33, 0x33, 0x40, 0xA0, 0x00, 0x00, 0x3F, 0x4C, 0xCC, 0xCD, 0x40, 0x40, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8038F138, &daAlinkHIO_wlLie_c0::m); +COMPILER_STRIP_GATE(0x8038F138, &daAlinkHIO_wlLie_c0::m); /* 8038F184-8038F1A0 01B7E4 001C+00 0/1 0/0 0/0 .rodata m__21daAlinkHIO_wlLight_c0 */ #pragma push @@ -9264,7 +9261,7 @@ SECTION_RODATA u8 const daAlinkHIO_wlLight_c0::m[28] = { 0x02, 0x03, 0x00, 0x00, 0x00, 0x78, 0x00, 0x78, 0x00, 0x78, 0xFF, 0xE2, 0x40, 0x40, 0x00, 0x00, 0x41, 0xA0, 0x00, 0x00, 0x44, 0x00, 0x00, 0x00, 0xC4, 0x1F, 0x80, 0x00, }; -COMPILER_STRIP_GATE(8038F184, &daAlinkHIO_wlLight_c0::m); +COMPILER_STRIP_GATE(0x8038F184, &daAlinkHIO_wlLight_c0::m); #pragma pop /* 8038F1A0-8038F23C 01B800 009C+00 9/11 0/0 0/0 .rodata m__24daAlinkHIO_wlWallHang_c0 */ @@ -9280,7 +9277,7 @@ SECTION_RODATA u8 const daAlinkHIO_wlWallHang_c0::m[156] = { 0x43, 0x48, 0x00, 0x00, 0x43, 0x7A, 0x00, 0x00, 0x42, 0xC8, 0x00, 0x00, 0x41, 0x88, 0x00, 0x00, 0x41, 0x70, 0x00, 0x00, 0x41, 0x20, 0x00, 0x00, 0x41, 0x20, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8038F1A0, &daAlinkHIO_wlWallHang_c0::m); +COMPILER_STRIP_GATE(0x8038F1A0, &daAlinkHIO_wlWallHang_c0::m); /* 8038F23C-8038F29C 01B89C 0060+00 2/3 0/0 0/0 .rodata m__25daAlinkHIO_wlDamNormal_c0 */ SECTION_RODATA u8 const daAlinkHIO_wlDamNormal_c0::m[96] = { @@ -9291,7 +9288,7 @@ SECTION_RODATA u8 const daAlinkHIO_wlDamNormal_c0::m[96] = { 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41, 0x00, 0x00, 0x00, 0x41, 0x20, 0x00, 0x00, 0x3C, 0x23, 0xD7, 0x0A, 0x3F, 0x80, 0x00, 0x00, 0x3E, 0x80, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8038F23C, &daAlinkHIO_wlDamNormal_c0::m); +COMPILER_STRIP_GATE(0x8038F23C, &daAlinkHIO_wlDamNormal_c0::m); /* 8038F29C-8038F308 01B8FC 006C+00 2/4 0/0 0/0 .rodata m__24daAlinkHIO_wlDamLarge_c0 */ SECTION_RODATA u8 const daAlinkHIO_wlDamLarge_c0::m[108] = { @@ -9303,7 +9300,7 @@ SECTION_RODATA u8 const daAlinkHIO_wlDamLarge_c0::m[108] = { 0x05, 0x14, 0x00, 0x00, 0xC0, 0xA6, 0x66, 0x66, 0x40, 0x40, 0x00, 0x00, 0x41, 0x20, 0x00, 0x00, 0x41, 0x70, 0x00, 0x00, 0x41, 0x70, 0x00, 0x00, 0x3F, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8038F29C, &daAlinkHIO_wlDamLarge_c0::m); +COMPILER_STRIP_GATE(0x8038F29C, &daAlinkHIO_wlDamLarge_c0::m); /* 8038F308-8038F374 01B968 006C+00 0/2 0/0 0/0 .rodata m__23daAlinkHIO_wlDamHuge_c0 */ #pragma push @@ -9317,7 +9314,7 @@ SECTION_RODATA u8 const daAlinkHIO_wlDamHuge_c0::m[108] = { 0x07, 0xD0, 0x00, 0x00, 0xC0, 0xF0, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, 0x42, 0xAA, 0x00, 0x00, 0x42, 0x34, 0x00, 0x00, 0x41, 0x70, 0x00, 0x00, 0x3F, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8038F308, &daAlinkHIO_wlDamHuge_c0::m); +COMPILER_STRIP_GATE(0x8038F308, &daAlinkHIO_wlDamHuge_c0::m); #pragma pop /* 8038F374-8038F3B4 01B9D4 0040+00 6/6 0/0 0/0 .rodata m__23daAlinkHIO_wlDamFall_c0 */ @@ -9327,13 +9324,13 @@ SECTION_RODATA u8 const daAlinkHIO_wlDamFall_c0::m[64] = { 0x00, 0x00, 0x00, 0x00, 0x41, 0x40, 0x00, 0x00, 0x00, 0x0F, 0x00, 0x23, 0x42, 0x20, 0x00, 0x00, 0x42, 0x70, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x41, 0x70, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8038F374, &daAlinkHIO_wlDamFall_c0::m); +COMPILER_STRIP_GATE(0x8038F374, &daAlinkHIO_wlDamFall_c0::m); /* 8038F3B4-8038F3C4 01BA14 0010+00 1/1 0/0 0/0 .rodata m__25daAlinkHIO_wlDamCaught_c0 */ SECTION_RODATA u8 const daAlinkHIO_wlDamCaught_c0::m[16] = { 0x01, 0x2C, 0x00, 0x05, 0x3F, 0x99, 0x99, 0x9A, 0x40, 0x40, 0x00, 0x00, 0x3F, 0xC0, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8038F3B4, &daAlinkHIO_wlDamCaught_c0::m); +COMPILER_STRIP_GATE(0x8038F3B4, &daAlinkHIO_wlDamCaught_c0::m); /* 8038F3C4-8038F3F0 01BA24 002C+00 3/4 0/0 0/0 .rodata m__22daAlinkHIO_wlDamage_c0 */ SECTION_RODATA u8 const daAlinkHIO_wlDamage_c0::m[44] = { @@ -9341,7 +9338,7 @@ SECTION_RODATA u8 const daAlinkHIO_wlDamage_c0::m[44] = { 0x00, 0x41, 0x20, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x3F, 0x8C, 0xCC, 0xCD, 0x00, 0x00, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, 0x40, 0xE0, 0x00, 0x00, 0x3F, 0x33, 0x33, 0x33, }; -COMPILER_STRIP_GATE(8038F3C4, &daAlinkHIO_wlDamage_c0::m); +COMPILER_STRIP_GATE(0x8038F3C4, &daAlinkHIO_wlDamage_c0::m); /* 8038F3F0-8038F46C 01BA50 007C+00 10/14 0/0 0/0 .rodata m__21daAlinkHIO_wlSlide_c0 */ SECTION_RODATA u8 const daAlinkHIO_wlSlide_c0::m[124] = { @@ -9354,7 +9351,7 @@ SECTION_RODATA u8 const daAlinkHIO_wlSlide_c0::m[124] = { 0x42, 0x0C, 0x00, 0x00, 0x40, 0x26, 0x66, 0x66, 0x41, 0x90, 0x00, 0x00, 0x40, 0x06, 0x66, 0x66, 0x41, 0x20, 0x00, 0x00, 0x3F, 0x33, 0x33, 0x33, 0x41, 0xF0, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8038F3F0, &daAlinkHIO_wlSlide_c0::m); +COMPILER_STRIP_GATE(0x8038F3F0, &daAlinkHIO_wlSlide_c0::m); /* 8038F46C-8038F4A4 01BACC 0038+00 7/7 0/0 0/0 .rodata m__20daAlinkHIO_wlRope_c0 */ SECTION_RODATA u8 const daAlinkHIO_wlRope_c0::m[56] = { @@ -9363,7 +9360,7 @@ SECTION_RODATA u8 const daAlinkHIO_wlRope_c0::m[56] = { 0x3F, 0x99, 0x99, 0x9A, 0x40, 0x40, 0x00, 0x00, 0x41, 0x70, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, 0x3F, 0x4C, 0xCC, 0xCD, }; -COMPILER_STRIP_GATE(8038F46C, &daAlinkHIO_wlRope_c0::m); +COMPILER_STRIP_GATE(0x8038F46C, &daAlinkHIO_wlRope_c0::m); /* 8038F4A4-8038F4E0 01BB04 003C+00 0/1 0/0 0/0 .rodata m__22daAlinkHIO_wlAtWaLr_c0 */ #pragma push @@ -9374,7 +9371,7 @@ SECTION_RODATA u8 const daAlinkHIO_wlAtWaLr_c0::m[60] = { 0x00, 0x00, 0x40, 0x80, 0x00, 0x00, 0x41, 0x30, 0x00, 0x00, 0x41, 0x90, 0x00, 0x00, 0x40, 0xA0, 0x00, 0x00, 0x42, 0x8C, 0x00, 0x00, 0x42, 0x8C, 0x00, 0x00, 0x43, 0x16, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8038F4A4, &daAlinkHIO_wlAtWaLr_c0::m); +COMPILER_STRIP_GATE(0x8038F4A4, &daAlinkHIO_wlAtWaLr_c0::m); #pragma pop /* 8038F4E0-8038F51C 01BB40 003C+00 0/1 0/0 0/0 .rodata m__22daAlinkHIO_wlAtWaSc_c0 */ @@ -9386,7 +9383,7 @@ SECTION_RODATA u8 const daAlinkHIO_wlAtWaSc_c0::m[60] = { 0x00, 0x00, 0x40, 0xA0, 0x00, 0x00, 0x41, 0x30, 0x00, 0x00, 0x41, 0x90, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0xC8, 0x00, 0x00, 0x42, 0xAA, 0x00, 0x00, 0x43, 0x16, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8038F4E0, &daAlinkHIO_wlAtWaSc_c0::m); +COMPILER_STRIP_GATE(0x8038F4E0, &daAlinkHIO_wlAtWaSc_c0::m); #pragma pop /* 8038F51C-8038F558 01BB7C 003C+00 0/1 0/0 0/0 .rodata m__22daAlinkHIO_wlAtWaTl_c0 */ @@ -9398,7 +9395,7 @@ SECTION_RODATA u8 const daAlinkHIO_wlAtWaTl_c0::m[60] = { 0x00, 0x00, 0x41, 0x20, 0x00, 0x00, 0x41, 0x60, 0x00, 0x00, 0x41, 0xC8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0x20, 0x00, 0x00, 0x43, 0x16, 0x00, 0x00, 0x42, 0xC8, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8038F51C, &daAlinkHIO_wlAtWaTl_c0::m); +COMPILER_STRIP_GATE(0x8038F51C, &daAlinkHIO_wlAtWaTl_c0::m); #pragma pop /* 8038F558-8038F578 01BBB8 0020+00 2/2 0/0 0/0 .rodata m__22daAlinkHIO_wlAtRoll_c0 */ @@ -9406,7 +9403,7 @@ SECTION_RODATA u8 const daAlinkHIO_wlAtRoll_c0::m[32] = { 0x00, 0x28, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x40, 0x80, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, 0x41, 0xB8, 0x00, 0x00, 0x43, 0x7A, 0x00, 0x00, 0x41, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8038F558, &daAlinkHIO_wlAtRoll_c0::m); +COMPILER_STRIP_GATE(0x8038F558, &daAlinkHIO_wlAtRoll_c0::m); /* 8038F578-8038F5B4 01BBD8 003C+00 3/5 0/0 0/0 .rodata m__23daAlinkHIO_wlAtNjump_c0 */ SECTION_RODATA u8 const daAlinkHIO_wlAtNjump_c0::m[60] = { @@ -9415,7 +9412,7 @@ SECTION_RODATA u8 const daAlinkHIO_wlAtNjump_c0::m[60] = { 0x00, 0x00, 0x41, 0x88, 0x00, 0x00, 0x3F, 0x4C, 0xCC, 0xCD, 0x40, 0x00, 0x00, 0x00, 0x42, 0xA0, 0x00, 0x00, 0x42, 0x70, 0x00, 0x00, 0x42, 0xF0, 0x00, 0x00, 0x41, 0x20, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8038F578, &daAlinkHIO_wlAtNjump_c0::m); +COMPILER_STRIP_GATE(0x8038F578, &daAlinkHIO_wlAtNjump_c0::m); /* 8038F5B4-8038F618 01BC14 0064+00 1/4 0/0 0/0 .rodata m__23daAlinkHIO_wlAtCjump_c0 */ SECTION_RODATA u8 const daAlinkHIO_wlAtCjump_c0::m[100] = { @@ -9427,7 +9424,7 @@ SECTION_RODATA u8 const daAlinkHIO_wlAtCjump_c0::m[100] = { 0x00, 0x42, 0x70, 0x00, 0x00, 0x42, 0xF0, 0x00, 0x00, 0x41, 0xD0, 0x00, 0x00, 0x3F, 0x00, 0x00, 0x00, 0x41, 0x20, 0x00, 0x00, 0x3D, 0xCC, 0xCC, 0xCD, }; -COMPILER_STRIP_GATE(8038F5B4, &daAlinkHIO_wlAtCjump_c0::m); +COMPILER_STRIP_GATE(0x8038F5B4, &daAlinkHIO_wlAtCjump_c0::m); /* 8038F618-8038F658 01BC78 0040+00 4/4 0/0 0/0 .rodata m__22daAlinkHIO_wlAtLand_c0 */ SECTION_RODATA u8 const daAlinkHIO_wlAtLand_c0::m[64] = { @@ -9436,7 +9433,7 @@ SECTION_RODATA u8 const daAlinkHIO_wlAtLand_c0::m[64] = { 0x40, 0x40, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x13, 0x00, 0x00, 0x3F, 0x8C, 0xCC, 0xCD, 0x00, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8038F618, &daAlinkHIO_wlAtLand_c0::m); +COMPILER_STRIP_GATE(0x8038F618, &daAlinkHIO_wlAtLand_c0::m); /* 8038F658-8038F6F4 01BCB8 009C+00 6/7 0/0 0/0 .rodata m__22daAlinkHIO_wlAtDown_c0 */ SECTION_RODATA u8 const daAlinkHIO_wlAtDown_c0::m[156] = { @@ -9451,7 +9448,7 @@ SECTION_RODATA u8 const daAlinkHIO_wlAtDown_c0::m[156] = { 0x00, 0x00, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, 0x41, 0x10, 0x00, 0x00, 0x00, 0x28, 0x00, 0x03, 0x42, 0x34, 0x00, 0x00, 0x41, 0x50, 0x00, 0x00, 0x41, 0x50, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8038F658, &daAlinkHIO_wlAtDown_c0::m); +COMPILER_STRIP_GATE(0x8038F658, &daAlinkHIO_wlAtDown_c0::m); /* 8038F6F4-8038F748 01BD54 0054+00 6/6 0/0 0/0 .rodata m__22daAlinkHIO_wlAtLock_c0 */ SECTION_RODATA u8 const daAlinkHIO_wlAtLock_c0::m[84] = { @@ -9462,7 +9459,7 @@ SECTION_RODATA u8 const daAlinkHIO_wlAtLock_c0::m[84] = { 0x42, 0xAA, 0x00, 0x00, 0x42, 0xA0, 0x00, 0x00, 0x42, 0x70, 0x00, 0x00, 0x42, 0xF0, 0x00, 0x00, 0xC1, 0x00, 0x00, 0x00, 0x44, 0x2F, 0x00, 0x00, 0x44, 0x7A, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8038F6F4, &daAlinkHIO_wlAtLock_c0::m); +COMPILER_STRIP_GATE(0x8038F6F4, &daAlinkHIO_wlAtLock_c0::m); /* 8038F748-8038F7A4 01BDA8 005C+00 5/5 0/0 0/0 .rodata m__22daAlinkHIO_wlAtBite_c0 */ SECTION_RODATA u8 const daAlinkHIO_wlAtBite_c0::m[92] = { @@ -9473,7 +9470,7 @@ SECTION_RODATA u8 const daAlinkHIO_wlAtBite_c0::m[92] = { 0x3F, 0xA6, 0x66, 0x66, 0x40, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x3E, 0x42, 0x8F, 0x5C, 0x3E, 0x42, 0x8F, 0x5C, 0x3C, 0xA3, 0xD7, 0x0A, 0x3C, 0xA3, 0xD7, 0x0A, }; -COMPILER_STRIP_GATE(8038F748, &daAlinkHIO_wlAtBite_c0::m); +COMPILER_STRIP_GATE(0x8038F748, &daAlinkHIO_wlAtBite_c0::m); /* 8038F7A4-8038F7DC 01BE04 0038+00 7/10 0/0 0/0 .rodata m__22daAlinkHIO_wlAttack_c0 */ SECTION_RODATA u8 const daAlinkHIO_wlAttack_c0::m[56] = { @@ -9482,7 +9479,7 @@ SECTION_RODATA u8 const daAlinkHIO_wlAttack_c0::m[56] = { 0x41, 0x20, 0x00, 0x00, 0x40, 0xA0, 0x00, 0x00, 0x43, 0x66, 0x00, 0x00, 0x41, 0x20, 0x00, 0x00, 0x41, 0x40, 0x00, 0x00, 0x42, 0x0C, 0x00, 0x00, 0x41, 0xF0, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8038F7A4, &daAlinkHIO_wlAttack_c0::m); +COMPILER_STRIP_GATE(0x8038F7A4, &daAlinkHIO_wlAttack_c0::m); /* 8038F7DC-8038F858 01BE3C 007C+00 5/5 0/0 0/0 .rodata m__21daAlinkHIO_wlPoint_c0 */ SECTION_RODATA u8 const daAlinkHIO_wlPoint_c0::m[124] = { @@ -9495,7 +9492,7 @@ SECTION_RODATA u8 const daAlinkHIO_wlPoint_c0::m[124] = { 0x42, 0x48, 0x00, 0x00, 0x42, 0x34, 0x00, 0x00, 0x42, 0x82, 0x00, 0x00, 0x41, 0x70, 0x00, 0x00, 0x3F, 0x00, 0x00, 0x00, 0x3F, 0x00, 0x00, 0x00, 0x3E, 0x4C, 0xCC, 0xCD, }; -COMPILER_STRIP_GATE(8038F7DC, &daAlinkHIO_wlPoint_c0::m); +COMPILER_STRIP_GATE(0x8038F7DC, &daAlinkHIO_wlPoint_c0::m); /* 8038F858-8038F8B4 01BEB8 005C+00 6/6 0/0 0/0 .rodata m__21daAlinkHIO_wlChain_c0 */ SECTION_RODATA u8 const daAlinkHIO_wlChain_c0::m[92] = { @@ -9506,7 +9503,7 @@ SECTION_RODATA u8 const daAlinkHIO_wlChain_c0::m[92] = { 0x3F, 0x80, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, 0x41, 0x71, 0x99, 0x9A, 0x3F, 0x80, 0x00, 0x00, 0x40, 0xA0, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8038F858, &daAlinkHIO_wlChain_c0::m); +COMPILER_STRIP_GATE(0x8038F858, &daAlinkHIO_wlChain_c0::m); /* 8038F8B4-8038F95C 01BF14 00A8+00 16/24 0/0 0/0 .rodata m__20daAlinkHIO_wlSwim_c0 */ SECTION_RODATA u8 const daAlinkHIO_wlSwim_c0::m[168] = { @@ -9522,7 +9519,7 @@ SECTION_RODATA u8 const daAlinkHIO_wlSwim_c0::m[168] = { 0x3F, 0x99, 0x99, 0x9A, 0xC2, 0x16, 0x00, 0x00, 0x41, 0x00, 0x00, 0x00, 0x3E, 0x4C, 0xCC, 0xCD, 0xC0, 0xE0, 0x00, 0x00, 0x40, 0xE0, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8038F8B4, &daAlinkHIO_wlSwim_c0::m); +COMPILER_STRIP_GATE(0x8038F8B4, &daAlinkHIO_wlSwim_c0::m); /* 8038F95C-8038F9C0 01BFBC 0064+00 6/6 0/0 0/0 .rodata m__20daAlinkHIO_wlGrab_c0 */ SECTION_RODATA u8 const daAlinkHIO_wlGrab_c0::m[100] = { @@ -9534,7 +9531,7 @@ SECTION_RODATA u8 const daAlinkHIO_wlGrab_c0::m[100] = { 0x00, 0xBF, 0x80, 0x00, 0x00, 0x00, 0x13, 0x00, 0x00, 0x3F, 0xA6, 0x66, 0x66, 0x40, 0x80, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, 0x41, 0x70, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8038F95C, &daAlinkHIO_wlGrab_c0::m); +COMPILER_STRIP_GATE(0x8038F95C, &daAlinkHIO_wlGrab_c0::m); /* 8038F9C0-8038F9F8 01C020 0038+00 0/0 0/0 0/0 .rodata m__20daAlinkHIO_wlBall_c0 */ #pragma push @@ -9545,7 +9542,7 @@ SECTION_RODATA u8 const daAlinkHIO_wlBall_c0::m[56] = { 0x00, 0x00, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, 0x42, 0x5C, 0x00, 0x00, 0x00, 0x3C, 0x00, 0x00, 0xC0, 0xA0, 0x00, 0x00, 0x42, 0x70, 0x00, 0x00, 0x41, 0xA0, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8038F9C0, &daAlinkHIO_wlBall_c0::m); +COMPILER_STRIP_GATE(0x8038F9C0, &daAlinkHIO_wlBall_c0::m); #pragma pop /* 8038F9F8-8038FA10 01C058 0018+00 5/6 0/0 0/0 .rodata m__18daAlinkHIO_wolf_c0 */ @@ -9553,7 +9550,7 @@ SECTION_RODATA u8 const daAlinkHIO_wolf_c0::m[24] = { 0x32, 0xC8, 0xD8, 0xF0, 0x1F, 0x40, 0x0F, 0xA0, 0xF8, 0x30, 0x1F, 0x40, 0x00, 0x96, 0x00, 0x05, 0x00, 0x23, 0x00, 0x3C, 0x3F, 0x33, 0x33, 0x33, }; -COMPILER_STRIP_GATE(8038F9F8, &daAlinkHIO_wolf_c0::m); +COMPILER_STRIP_GATE(0x8038F9F8, &daAlinkHIO_wolf_c0::m); /* 800A142C-800A1AEC 09BD6C 06C0+00 1/1 0/0 0/0 .text getNeckAimAngle__9daAlink_cFP4cXyzPsPsPsPs */ @@ -9664,7 +9661,7 @@ asm void daAlink_c::setMoveSlantAngle() { SECTION_RODATA static u8 const l_worldChangeEventName[16] = { 0x57, 0x4F, 0x52, 0x4C, 0x44, 0x5F, 0x43, 0x48, 0x41, 0x4E, 0x47, 0x45, 0x5F, 0x49, 0x4E, 0x00, }; -COMPILER_STRIP_GATE(8038FA10, &l_worldChangeEventName); +COMPILER_STRIP_GATE(0x8038FA10, &l_worldChangeEventName); #pragma pop /* 8038FA20-8038FA38 01C080 0015+03 0/0 0/0 0/0 .rodata l_wolfWorldChangeEventName */ @@ -9697,7 +9694,7 @@ SECTION_RODATA static u8 const l_wolfWorldChangeEventName[21 + 3 /* padding */] 0x00, 0x00, }; -COMPILER_STRIP_GATE(8038FA20, &l_wolfWorldChangeEventName); +COMPILER_STRIP_GATE(0x8038FA20, &l_wolfWorldChangeEventName); #pragma pop /* 8038FA38-8038FA48 01C098 0010+00 0/1 0/0 0/0 .rodata l_defaultGetEventName */ @@ -9706,7 +9703,7 @@ COMPILER_STRIP_GATE(8038FA20, &l_wolfWorldChangeEventName); SECTION_RODATA static u8 const l_defaultGetEventName[16] = { 0x44, 0x45, 0x46, 0x41, 0x55, 0x4C, 0x54, 0x5F, 0x47, 0x45, 0x54, 0x49, 0x54, 0x45, 0x4D, 0x00, }; -COMPILER_STRIP_GATE(8038FA38, &l_defaultGetEventName); +COMPILER_STRIP_GATE(0x8038FA38, &l_defaultGetEventName); #pragma pop /* 8038FA48-8038FA54 01C0A8 000C+00 0/0 0/0 0/0 .rodata l_crawlStartFrontOffset */ @@ -9715,14 +9712,14 @@ COMPILER_STRIP_GATE(8038FA38, &l_defaultGetEventName); SECTION_RODATA static u8 const l_crawlStartFrontOffset[12] = { 0x00, 0x00, 0x00, 0x00, 0x41, 0xF0, 0x00, 0x00, 0x42, 0xE0, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8038FA48, &l_crawlStartFrontOffset); +COMPILER_STRIP_GATE(0x8038FA48, &l_crawlStartFrontOffset); #pragma pop /* 8038FA54-8038FA60 01C0B4 000C+00 1/2 0/0 0/0 .rodata l_crawlFrontOffset */ SECTION_RODATA static u8 const l_crawlFrontOffset[12] = { 0x00, 0x00, 0x00, 0x00, 0x41, 0xF0, 0x00, 0x00, 0x42, 0xA0, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8038FA54, &l_crawlFrontOffset); +COMPILER_STRIP_GATE(0x8038FA54, &l_crawlFrontOffset); /* 8038FA60-8038FA6C 01C0C0 000C+00 0/1 0/0 0/0 .rodata l_crawlBackOffset */ #pragma push @@ -9730,20 +9727,20 @@ COMPILER_STRIP_GATE(8038FA54, &l_crawlFrontOffset); SECTION_RODATA static u8 const l_crawlBackOffset[12] = { 0x00, 0x00, 0x00, 0x00, 0x41, 0xF0, 0x00, 0x00, 0xC1, 0xF0, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8038FA60, &l_crawlBackOffset); +COMPILER_STRIP_GATE(0x8038FA60, &l_crawlBackOffset); #pragma pop /* 8038FA6C-8038FA78 01C0CC 000C+00 1/1 0/0 0/0 .rodata l_crawlTopOffset */ SECTION_RODATA static u8 const l_crawlTopOffset[12] = { 0x00, 0x00, 0x00, 0x00, 0x41, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8038FA6C, &l_crawlTopOffset); +COMPILER_STRIP_GATE(0x8038FA6C, &l_crawlTopOffset); /* 8038FA78-8038FA84 01C0D8 000C+00 1/2 0/0 0/0 .rodata l_crawlFrontUpOffset */ SECTION_RODATA static u8 const l_crawlFrontUpOffset[12] = { 0x00, 0x00, 0x00, 0x00, 0x42, 0xA0, 0x00, 0x00, 0x42, 0xA0, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8038FA78, &l_crawlFrontUpOffset); +COMPILER_STRIP_GATE(0x8038FA78, &l_crawlFrontUpOffset); /* 8038FA84-8038FA90 01C0E4 000C+00 0/1 0/0 0/0 .rodata l_wolfLieFrontUpOffset */ #pragma push @@ -9751,14 +9748,14 @@ COMPILER_STRIP_GATE(8038FA78, &l_crawlFrontUpOffset); SECTION_RODATA static u8 const l_wolfLieFrontUpOffset[12] = { 0x00, 0x00, 0x00, 0x00, 0x42, 0x96, 0x00, 0x00, 0x42, 0xC8, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8038FA84, &l_wolfLieFrontUpOffset); +COMPILER_STRIP_GATE(0x8038FA84, &l_wolfLieFrontUpOffset); #pragma pop /* 8038FA90-8038FA9C 01C0F0 000C+00 1/2 0/0 0/0 .rodata l_crawlBackUpOffset */ SECTION_RODATA static u8 const l_crawlBackUpOffset[12] = { 0x00, 0x00, 0x00, 0x00, 0x42, 0xA0, 0x00, 0x00, 0xC1, 0xF0, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8038FA90, &l_crawlBackUpOffset); +COMPILER_STRIP_GATE(0x8038FA90, &l_crawlBackUpOffset); /* 8038FA9C-8038FAA8 01C0FC 000C+00 0/1 0/0 0/0 .rodata l_wolfLieBackUpOffset */ #pragma push @@ -9766,7 +9763,7 @@ COMPILER_STRIP_GATE(8038FA90, &l_crawlBackUpOffset); SECTION_RODATA static u8 const l_wolfLieBackUpOffset[12] = { 0x00, 0x00, 0x00, 0x00, 0x42, 0x96, 0x00, 0x00, 0xC2, 0x8C, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8038FA9C, &l_wolfLieBackUpOffset); +COMPILER_STRIP_GATE(0x8038FA9C, &l_wolfLieBackUpOffset); #pragma pop /* 8038FAA8-8038FAB4 01C108 000C+00 0/1 0/0 0/0 .rodata l_crawlStandUpOffset */ @@ -9775,7 +9772,7 @@ COMPILER_STRIP_GATE(8038FA9C, &l_wolfLieBackUpOffset); SECTION_RODATA static u8 const l_crawlStandUpOffset[12] = { 0x00, 0x00, 0x00, 0x00, 0x42, 0xA0, 0x00, 0x00, 0xC1, 0xF0, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8038FAA8, &l_crawlStandUpOffset); +COMPILER_STRIP_GATE(0x8038FAA8, &l_crawlStandUpOffset); #pragma pop /* 8038FAB4-8038FAC0 01C114 000C+00 0/1 0/0 0/0 .rodata l_wolfLieStandUpOffset */ @@ -9784,14 +9781,14 @@ COMPILER_STRIP_GATE(8038FAA8, &l_crawlStandUpOffset); SECTION_RODATA static u8 const l_wolfLieStandUpOffset[12] = { 0x00, 0x00, 0x00, 0x00, 0x42, 0xA0, 0x00, 0x00, 0xC2, 0x8C, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8038FAB4, &l_wolfLieStandUpOffset); +COMPILER_STRIP_GATE(0x8038FAB4, &l_wolfLieStandUpOffset); #pragma pop /* 8038FAC0-8038FACC 01C120 000C+00 1/2 0/0 0/0 .rodata l_crawlTopUpOffset */ SECTION_RODATA static u8 const l_crawlTopUpOffset[12] = { 0x00, 0x00, 0x00, 0x00, 0x42, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8038FAC0, &l_crawlTopUpOffset); +COMPILER_STRIP_GATE(0x8038FAC0, &l_crawlTopUpOffset); /* 8038FACC-8038FAD8 01C12C 000C+00 0/1 0/0 0/0 .rodata l_wolfLieTopUpOffset */ #pragma push @@ -9799,7 +9796,7 @@ COMPILER_STRIP_GATE(8038FAC0, &l_crawlTopUpOffset); SECTION_RODATA static u8 const l_wolfLieTopUpOffset[12] = { 0x00, 0x00, 0x00, 0x00, 0x42, 0x96, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8038FACC, &l_wolfLieTopUpOffset); +COMPILER_STRIP_GATE(0x8038FACC, &l_wolfLieTopUpOffset); #pragma pop /* 8038FAD8-8038FAE4 01C138 000C+00 0/1 0/0 0/0 .rodata l_crawlSideOffset */ @@ -9808,7 +9805,7 @@ COMPILER_STRIP_GATE(8038FACC, &l_wolfLieTopUpOffset); SECTION_RODATA static u8 const l_crawlSideOffset[12] = { 0x42, 0x5C, 0x00, 0x00, 0x42, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8038FAD8, &l_crawlSideOffset); +COMPILER_STRIP_GATE(0x8038FAD8, &l_crawlSideOffset); #pragma pop /* 8038FAE4-8038FAF0 01C144 000C+00 0/1 0/0 0/0 .rodata l_wolfLieSideOffset */ @@ -9817,7 +9814,7 @@ COMPILER_STRIP_GATE(8038FAD8, &l_crawlSideOffset); SECTION_RODATA static u8 const l_wolfLieSideOffset[12] = { 0x42, 0x5C, 0x00, 0x00, 0x42, 0x96, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8038FAE4, &l_wolfLieSideOffset); +COMPILER_STRIP_GATE(0x8038FAE4, &l_wolfLieSideOffset); #pragma pop /* 8038FAF0-8038FAFC 01C150 000C+00 0/1 0/0 0/0 .rodata l_crawlLSideOffset */ @@ -9826,7 +9823,7 @@ COMPILER_STRIP_GATE(8038FAE4, &l_wolfLieSideOffset); SECTION_RODATA static u8 const l_crawlLSideOffset[12] = { 0x42, 0x5C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8038FAF0, &l_crawlLSideOffset); +COMPILER_STRIP_GATE(0x8038FAF0, &l_crawlLSideOffset); #pragma pop /* 8038FAFC-8038FB08 01C15C 000C+00 0/1 0/0 0/0 .rodata l_crawlRSideOffset */ @@ -9835,7 +9832,7 @@ COMPILER_STRIP_GATE(8038FAF0, &l_crawlLSideOffset); SECTION_RODATA static u8 const l_crawlRSideOffset[12] = { 0xC2, 0x5C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8038FAFC, &l_crawlRSideOffset); +COMPILER_STRIP_GATE(0x8038FAFC, &l_crawlRSideOffset); #pragma pop /* 8038FB08-8038FB14 01C168 000C+00 0/1 0/0 0/0 .rodata l_crawlLSideFrontOffset */ @@ -9844,7 +9841,7 @@ COMPILER_STRIP_GATE(8038FAFC, &l_crawlRSideOffset); SECTION_RODATA static u8 const l_crawlLSideFrontOffset[12] = { 0x42, 0x5C, 0x00, 0x00, 0x40, 0xA0, 0x00, 0x00, 0x42, 0xA0, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8038FB08, &l_crawlLSideFrontOffset); +COMPILER_STRIP_GATE(0x8038FB08, &l_crawlLSideFrontOffset); #pragma pop /* 8038FB14-8038FB20 01C174 000C+00 0/1 0/0 0/0 .rodata l_crawlRSideFrontOffset */ @@ -9853,7 +9850,7 @@ COMPILER_STRIP_GATE(8038FB08, &l_crawlLSideFrontOffset); SECTION_RODATA static u8 const l_crawlRSideFrontOffset[12] = { 0xC2, 0x5C, 0x00, 0x00, 0x40, 0xA0, 0x00, 0x00, 0x42, 0xA0, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8038FB14, &l_crawlRSideFrontOffset); +COMPILER_STRIP_GATE(0x8038FB14, &l_crawlRSideFrontOffset); #pragma pop /* 8038FB20-8038FB2C 01C180 000C+00 0/2 0/0 0/0 .rodata l_crawlMinSideOffset */ @@ -9862,7 +9859,7 @@ COMPILER_STRIP_GATE(8038FB14, &l_crawlRSideFrontOffset); SECTION_RODATA static u8 const l_crawlMinSideOffset[12] = { 0x42, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8038FB20, &l_crawlMinSideOffset); +COMPILER_STRIP_GATE(0x8038FB20, &l_crawlMinSideOffset); #pragma pop /* 8038FB2C-8038FB38 01C18C 000C+00 0/2 0/0 0/0 .rodata l_swordTopLocalN */ @@ -9871,7 +9868,7 @@ COMPILER_STRIP_GATE(8038FB20, &l_crawlMinSideOffset); SECTION_RODATA static u8 const l_swordTopLocalN[12] = { 0x42, 0xC8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8038FB2C, &l_swordTopLocalN); +COMPILER_STRIP_GATE(0x8038FB2C, &l_swordTopLocalN); #pragma pop /* 8038FB38-8038FB44 01C198 000C+00 0/2 0/0 0/0 .rodata l_swordTopLocalM */ @@ -9880,20 +9877,20 @@ COMPILER_STRIP_GATE(8038FB2C, &l_swordTopLocalN); SECTION_RODATA static u8 const l_swordTopLocalM[12] = { 0x42, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8038FB38, &l_swordTopLocalM); +COMPILER_STRIP_GATE(0x8038FB38, &l_swordTopLocalM); #pragma pop /* 8038FB44-8038FB50 01C1A4 000C+00 1/2 0/0 0/0 .rodata l_ironBallChainVec */ SECTION_RODATA static u8 const l_ironBallChainVec[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41, 0x20, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8038FB44, &l_ironBallChainVec); +COMPILER_STRIP_GATE(0x8038FB44, &l_ironBallChainVec); /* 8038FB50-8038FB5C 01C1B0 000C+00 1/2 0/0 0/0 .rodata l_ironBallCenterVec */ SECTION_RODATA static u8 const l_ironBallCenterVec[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0x28, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8038FB50, &l_ironBallCenterVec); +COMPILER_STRIP_GATE(0x8038FB50, &l_ironBallCenterVec); /* 8038FB5C-8038FBBC 01C1BC 0060+00 1/2 0/0 0/0 .rodata l_wolfFootOnFrame */ SECTION_RODATA static u8 const l_wolfFootOnFrame[96] = { @@ -9904,14 +9901,14 @@ SECTION_RODATA static u8 const l_wolfFootOnFrame[96] = { 0x41, 0xC0, 0x00, 0x00, 0x42, 0x00, 0x00, 0x00, 0x41, 0x40, 0x00, 0x00, 0x41, 0xD0, 0x00, 0x00, 0x42, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0x30, 0x00, 0x00, 0x42, 0x68, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8038FB5C, &l_wolfFootOnFrame); +COMPILER_STRIP_GATE(0x8038FB5C, &l_wolfFootOnFrame); /* 8038FBBC-8038FBD4 01C21C 0018+00 1/1 0/0 0/0 .rodata l_insectNameList */ SECTION_RODATA static u8 const l_insectNameList[24] = { 0x01, 0x40, 0x01, 0x41, 0x01, 0x42, 0x01, 0x49, 0x01, 0x43, 0x01, 0x44, 0x01, 0x45, 0x01, 0x46, 0x01, 0x4B, 0x01, 0x4A, 0x01, 0x47, 0x01, 0x48, }; -COMPILER_STRIP_GATE(8038FBBC, &l_insectNameList); +COMPILER_STRIP_GATE(0x8038FBBC, &l_insectNameList); /* 8038FBD4-8038FC24 01C234 0050+00 0/1 0/0 0/0 .rodata m_mainBckShield__9daAlink_c */ #pragma push @@ -9923,7 +9920,7 @@ SECTION_RODATA u8 const daAlink_c::m_mainBckShield[80] = { 0x00, 0x32, 0x00, 0x32, 0x00, 0x2A, 0x00, 0x2A, 0x02, 0x74, 0x00, 0x1B, 0x00, 0x20, 0x00, 0x1B, 0x00, 0x1B, 0x00, 0x1B, 0x00, 0x26, 0x00, 0x26, 0x02, 0x77, 0x00, 0x1B, 0x00, 0xCD, 0x00, 0x1B, }; -COMPILER_STRIP_GATE(8038FBD4, &daAlink_c::m_mainBckShield); +COMPILER_STRIP_GATE(0x8038FBD4, &daAlink_c::m_mainBckShield); #pragma pop /* 8038FC24-8038FC38 01C284 0014+00 0/1 0/0 0/0 .rodata m_mainBckSword__9daAlink_c */ @@ -9933,7 +9930,7 @@ SECTION_RODATA u8 const daAlink_c::m_mainBckSword[20] = { 0x00, 0x1A, 0x00, 0x1A, 0x00, 0x1C, 0x00, 0x1C, 0x02, 0x77, 0x02, 0x77, 0x00, 0xCD, 0x00, 0xCD, 0x02, 0x43, 0x02, 0x44, }; -COMPILER_STRIP_GATE(8038FC24, &daAlink_c::m_mainBckSword); +COMPILER_STRIP_GATE(0x8038FC24, &daAlink_c::m_mainBckSword); #pragma pop /* 8038FC38-8038FCA8 01C298 0070+00 0/1 0/0 0/0 .rodata m_mainBckFishing__9daAlink_c */ @@ -9948,7 +9945,7 @@ SECTION_RODATA u8 const daAlink_c::m_mainBckFishing[112] = { 0x02, 0x43, 0x02, 0x44, 0x02, 0x33, 0x02, 0x73, 0x02, 0x34, 0x02, 0x73, 0x02, 0x33, 0x02, 0x73, 0x02, 0x34, 0x02, 0x73, 0x02, 0x6A, 0x02, 0x73, 0x02, 0x56, 0x02, 0x73, 0x02, 0x57, 0x02, 0x73, }; -COMPILER_STRIP_GATE(8038FC38, &daAlink_c::m_mainBckFishing); +COMPILER_STRIP_GATE(0x8038FC38, &daAlink_c::m_mainBckFishing); #pragma pop /* 8038FCA8-80391010 01C308 1368+00 3/4 0/0 0/0 .rodata m_anmDataTable__9daAlink_c */ @@ -10265,7 +10262,7 @@ SECTION_RODATA u8 const daAlink_c::m_anmDataTable[4968] = { 0x01, 0xEA, 0x01, 0xEA, 0xFE, 0xFE, 0x00, 0x88, 0x01, 0x4B, 0x00, 0x00, 0x00, 0x0B, 0x00, 0x0B, 0xFE, 0xFE, 0x00, 0x89, 0x00, 0xE7, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8038FCA8, &daAlink_c::m_anmDataTable); +COMPILER_STRIP_GATE(0x8038FCA8, &daAlink_c::m_anmDataTable); /* 80391010-803914A8 -00001 0498+00 4/4 0/0 0/0 .rodata m_wlAnmDataTable__9daAlink_c */ SECTION_RODATA void* const daAlink_c::m_wlAnmDataTable[294] = { @@ -10564,7 +10561,7 @@ SECTION_RODATA void* const daAlink_c::m_wlAnmDataTable[294] = { (void*)(((char*)changeBgmStatus__8Z2SeqMgrFl) + 0xC80), (void*)0xFFFFFFFF, }; -COMPILER_STRIP_GATE(80391010, &daAlink_c::m_wlAnmDataTable); +COMPILER_STRIP_GATE(0x80391010, &daAlink_c::m_wlAnmDataTable); /* 803914A8-80391734 01DB08 028C+00 2/2 0/0 0/0 .rodata m_faceTexDataTable__9daAlink_c */ SECTION_RODATA u8 const daAlink_c::m_faceTexDataTable[652] = { @@ -10610,13 +10607,13 @@ SECTION_RODATA u8 const daAlink_c::m_faceTexDataTable[652] = { 0x04, 0x12, 0x03, 0xA7, 0x04, 0x1C, 0x03, 0xA7, 0x04, 0x1D, 0x03, 0xA7, 0x04, 0x19, 0x03, 0xAB, 0x04, 0x13, 0x03, 0xA8, 0x04, 0x14, 0x03, 0xA7, 0x04, 0x0D, 0x03, 0xA7, }; -COMPILER_STRIP_GATE(803914A8, &daAlink_c::m_faceTexDataTable); +COMPILER_STRIP_GATE(0x803914A8, &daAlink_c::m_faceTexDataTable); /* 80391734-80391740 01DD94 000C+00 1/1 0/0 0/0 .rodata @5908 */ SECTION_RODATA static u8 const lit_5908[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80391734, &lit_5908); +COMPILER_STRIP_GATE(0x80391734, &lit_5908); /* 80391740-80391754 01DDA0 0014+00 0/1 0/0 0/0 .rodata atnNormalType1$6976 */ #pragma push @@ -10625,7 +10622,7 @@ SECTION_RODATA static u8 const atnNormalType1[20] = { 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80391740, &atnNormalType1); +COMPILER_STRIP_GATE(0x80391740, &atnNormalType1); #pragma pop /* 80391754-80391768 01DDB4 0014+00 0/1 0/0 0/0 .rodata atnNormalType2$6977 */ @@ -10635,7 +10632,7 @@ SECTION_RODATA static u8 const atnNormalType2[20] = { 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80391754, &atnNormalType2); +COMPILER_STRIP_GATE(0x80391754, &atnNormalType2); #pragma pop /* 80391768-8039177C 01DDC8 0014+00 0/1 0/0 0/0 .rodata atnNormalType3$6978 */ @@ -10645,7 +10642,7 @@ SECTION_RODATA static u8 const atnNormalType3[20] = { 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80391768, &atnNormalType3); +COMPILER_STRIP_GATE(0x80391768, &atnNormalType3); #pragma pop /* 8039177C-80391790 01DDDC 0014+00 0/1 0/0 0/0 .rodata atnFinishType$6979 */ @@ -10655,7 +10652,7 @@ SECTION_RODATA static u8 const atnFinishType[20] = { 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(8039177C, &atnFinishType); +COMPILER_STRIP_GATE(0x8039177C, &atnFinishType); #pragma pop /* 80391790-803917A4 01DDF0 0014+00 0/1 0/0 0/0 .rodata hitType$6980 */ @@ -10665,7 +10662,7 @@ SECTION_RODATA static u8 const hitType[20] = { 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(80391790, &hitType); +COMPILER_STRIP_GATE(0x80391790, &hitType); #pragma pop /* 803917A4-803917B8 01DE04 0014+00 0/1 0/0 0/0 .rodata hitFinishType$6981 */ @@ -10675,7 +10672,7 @@ SECTION_RODATA static u8 const hitFinishType[20] = { 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(803917A4, &hitFinishType); +COMPILER_STRIP_GATE(0x803917A4, &hitFinishType); #pragma pop /* 803917B8-803917CC 01DE18 0014+00 0/1 0/0 0/0 .rodata normalType1$6982 */ @@ -10685,7 +10682,7 @@ SECTION_RODATA static u8 const normalType1_6982[20] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(803917B8, &normalType1_6982); +COMPILER_STRIP_GATE(0x803917B8, &normalType1_6982); #pragma pop /* 803917CC-803917E0 01DE2C 0014+00 0/1 0/0 0/0 .rodata normalType2$6983 */ @@ -10695,7 +10692,7 @@ SECTION_RODATA static u8 const normalType2[20] = { 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, }; -COMPILER_STRIP_GATE(803917CC, &normalType2); +COMPILER_STRIP_GATE(0x803917CC, &normalType2); #pragma pop /* 803917E0-803917F4 01DE40 0014+00 0/1 0/0 0/0 .rodata normalType3$6984 */ @@ -10705,7 +10702,7 @@ SECTION_RODATA static u8 const normalType3[20] = { 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(803917E0, &normalType3); +COMPILER_STRIP_GATE(0x803917E0, &normalType3); #pragma pop /* 803917F4-80391808 01DE54 0014+00 0/1 0/0 0/0 .rodata finishType$6985 */ @@ -10715,7 +10712,7 @@ SECTION_RODATA static u8 const finishType[20] = { 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x01, }; -COMPILER_STRIP_GATE(803917F4, &finishType); +COMPILER_STRIP_GATE(0x803917F4, &finishType); #pragma pop /* 80391808-80391858 01DE68 0050+00 0/1 0/0 0/0 .rodata cutParamTable$7312 */ @@ -10728,7 +10725,7 @@ SECTION_RODATA static u8 const cutParamTable_7312[80] = { 0x00, 0x00, 0x00, 0x65, 0x00, 0x00, 0x00, 0x6F, 0x21, 0x0E, 0x00, 0x00, 0x40, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x66, 0x00, 0x00, 0x00, 0x70, 0x02, 0x0E, 0x00, 0x00, 0x40, 0xC0, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80391808, &cutParamTable_7312); +COMPILER_STRIP_GATE(0x80391808, &cutParamTable_7312); #pragma pop /* 80391858-803918B8 01DEB8 0060+00 0/1 0/0 0/0 .rodata cutParamTable$7455 */ @@ -10742,32 +10739,32 @@ SECTION_RODATA static u8 const cutParamTable_7455[96] = { 0x00, 0x00, 0x00, 0x6B, 0x00, 0x00, 0x00, 0x6F, 0x1F, 0x01, 0x07, 0x0E, 0x41, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x6C, 0x00, 0x00, 0x00, 0x6F, 0x15, 0x01, 0x64, 0x64, 0x41, 0x20, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80391858, &cutParamTable_7455); +COMPILER_STRIP_GATE(0x80391858, &cutParamTable_7455); #pragma pop /* 803918B8-803918C4 01DF18 000C+00 1/1 0/0 0/0 .rodata localCenter$11047 */ SECTION_RODATA static u8 const localCenter[12] = { 0xC1, 0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41, 0x90, 0x00, 0x00, }; -COMPILER_STRIP_GATE(803918B8, &localCenter); +COMPILER_STRIP_GATE(0x803918B8, &localCenter); /* 803918C4-803918D0 01DF24 000C+00 1/1 0/0 0/0 .rodata localPos$11819 */ SECTION_RODATA static u8 const localPos[12] = { 0x40, 0x5C, 0xCC, 0xCD, 0x42, 0x35, 0x47, 0xAE, 0xC0, 0xE0, 0x00, 0x00, }; -COMPILER_STRIP_GATE(803918C4, &localPos); +COMPILER_STRIP_GATE(0x803918C4, &localPos); /* 803918D0-803918DC 01DF30 000C+00 1/1 0/0 0/0 .rodata slingLocalPos$12042 */ SECTION_RODATA static u8 const slingLocalPos[12] = { 0x41, 0x20, 0x00, 0x00, 0x41, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(803918D0, &slingLocalPos); +COMPILER_STRIP_GATE(0x803918D0, &slingLocalPos); /* 803918DC-803918E8 01DF3C 000C+00 1/1 0/0 0/0 .rodata localSidePos$14270 */ SECTION_RODATA static u8 const localSidePos[12] = { 0x40, 0x13, 0x33, 0x33, 0xC1, 0x78, 0x00, 0x00, 0x41, 0x79, 0x99, 0x9A, }; -COMPILER_STRIP_GATE(803918DC, &localSidePos); +COMPILER_STRIP_GATE(0x803918DC, &localSidePos); /* 803918E8-803918F4 01DF48 000C+00 0/1 0/0 0/0 .rodata m_handLeftOutSidePos__9daAlink_c */ #pragma push @@ -10775,7 +10772,7 @@ COMPILER_STRIP_GATE(803918DC, &localSidePos); SECTION_RODATA u8 const daAlink_c::m_handLeftOutSidePos[12] = { 0x41, 0x10, 0x00, 0x00, 0xC0, 0xA0, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, }; -COMPILER_STRIP_GATE(803918E8, &daAlink_c::m_handLeftOutSidePos); +COMPILER_STRIP_GATE(0x803918E8, &daAlink_c::m_handLeftOutSidePos); #pragma pop /* 803918F4-80391900 01DF54 000C+00 0/1 0/0 0/0 .rodata m_handRightOutSidePos__9daAlink_c @@ -10785,20 +10782,20 @@ COMPILER_STRIP_GATE(803918E8, &daAlink_c::m_handLeftOutSidePos); SECTION_RODATA u8 const daAlink_c::m_handRightOutSidePos[12] = { 0x41, 0x10, 0x00, 0x00, 0xC0, 0xA0, 0x00, 0x00, 0xC0, 0x40, 0x00, 0x00, }; -COMPILER_STRIP_GATE(803918F4, &daAlink_c::m_handRightOutSidePos); +COMPILER_STRIP_GATE(0x803918F4, &daAlink_c::m_handRightOutSidePos); #pragma pop /* 80391900-8039190C 01DF60 000C+00 0/1 0/0 1/1 .rodata m_handLeftInSidePos__9daAlink_c */ SECTION_RODATA u8 const daAlink_c::m_handLeftInSidePos[12] = { 0x41, 0x10, 0x00, 0x00, 0x40, 0xA0, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80391900, &daAlink_c::m_handLeftInSidePos); +COMPILER_STRIP_GATE(0x80391900, &daAlink_c::m_handLeftInSidePos); /* 8039190C-80391918 01DF6C 000C+00 0/1 0/0 1/1 .rodata m_handRightInSidePos__9daAlink_c */ SECTION_RODATA u8 const daAlink_c::m_handRightInSidePos[12] = { 0x41, 0x10, 0x00, 0x00, 0x40, 0xA0, 0x00, 0x00, 0xC0, 0x40, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8039190C, &daAlink_c::m_handRightInSidePos); +COMPILER_STRIP_GATE(0x8039190C, &daAlink_c::m_handRightInSidePos); /* 80391918-80391924 01DF78 000C+00 0/1 0/0 0/0 .rodata horseLocalLeft$17678 */ #pragma push @@ -10806,7 +10803,7 @@ COMPILER_STRIP_GATE(8039190C, &daAlink_c::m_handRightInSidePos); SECTION_RODATA static u8 const horseLocalLeft[12] = { 0x41, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80391918, &horseLocalLeft); +COMPILER_STRIP_GATE(0x80391918, &horseLocalLeft); #pragma pop /* 80391924-80391930 01DF84 000C+00 0/1 0/0 0/0 .rodata horseLocalRight$17679 */ @@ -10815,7 +10812,7 @@ COMPILER_STRIP_GATE(80391918, &horseLocalLeft); SECTION_RODATA static u8 const horseLocalRight[12] = { 0xC1, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80391924, &horseLocalRight); +COMPILER_STRIP_GATE(0x80391924, &horseLocalRight); #pragma pop /* 80391930-8039193C 01DF90 000C+00 0/1 0/0 0/0 .rodata horseLocalBack$17680 */ @@ -10824,7 +10821,7 @@ COMPILER_STRIP_GATE(80391924, &horseLocalRight); SECTION_RODATA static u8 const horseLocalBack[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC3, 0x48, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80391930, &horseLocalBack); +COMPILER_STRIP_GATE(0x80391930, &horseLocalBack); #pragma pop /* 8039193C-80391948 01DF9C 000C+00 0/1 0/0 0/0 .rodata boarLocalLeft$17681 */ @@ -10833,7 +10830,7 @@ COMPILER_STRIP_GATE(80391930, &horseLocalBack); SECTION_RODATA static u8 const boarLocalLeft[12] = { 0x43, 0x48, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC1, 0x90, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8039193C, &boarLocalLeft); +COMPILER_STRIP_GATE(0x8039193C, &boarLocalLeft); #pragma pop /* 80391948-80391954 01DFA8 000C+00 0/1 0/0 0/0 .rodata boarLocalRight$17682 */ @@ -10842,50 +10839,50 @@ COMPILER_STRIP_GATE(8039193C, &boarLocalLeft); SECTION_RODATA static u8 const boarLocalRight[12] = { 0xC3, 0x48, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC1, 0x90, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80391948, &boarLocalRight); +COMPILER_STRIP_GATE(0x80391948, &boarLocalRight); #pragma pop /* 80391954-80391960 01DFB4 000C+00 1/1 0/0 0/0 .rodata localHorseRun$18095 */ SECTION_RODATA static u8 const localHorseRun_18095[12] = { 0x41, 0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC2, 0x34, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80391954, &localHorseRun_18095); +COMPILER_STRIP_GATE(0x80391954, &localHorseRun_18095); /* 80391960-8039196C 01DFC0 000C+00 1/1 0/0 0/0 .rodata localHorseRun$18103 */ SECTION_RODATA static u8 const localHorseRun_18103[12] = { 0x41, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC1, 0x20, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80391960, &localHorseRun_18103); +COMPILER_STRIP_GATE(0x80391960, &localHorseRun_18103); /* 8039196C-80391978 01DFCC 000C+00 1/1 0/0 0/0 .rodata localOffset$18237 */ SECTION_RODATA static u8 const localOffset_18237[12] = { 0xC1, 0xF0, 0x00, 0x00, 0xC1, 0x90, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8039196C, &localOffset_18237); +COMPILER_STRIP_GATE(0x8039196C, &localOffset_18237); /* 80391978-80391984 01DFD8 000C+00 1/1 0/0 0/0 .rodata @18938 */ SECTION_RODATA static u8 const lit_18938[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80391978, &lit_18938); +COMPILER_STRIP_GATE(0x80391978, &lit_18938); /* 80391984-80391990 01DFE4 000C+00 1/1 0/0 0/0 .rodata boarRideOffset$19147 */ SECTION_RODATA static u8 const boarRideOffset[12] = { 0xBF, 0x5E, 0xB8, 0x52, 0x40, 0x55, 0x1E, 0xB8, 0xC1, 0xBE, 0x28, 0xF6, }; -COMPILER_STRIP_GATE(80391984, &boarRideOffset); +COMPILER_STRIP_GATE(0x80391984, &boarRideOffset); /* 80391990-8039199C 01DFF0 000C+00 1/1 0/0 0/0 .rodata leftOffset$19386 */ SECTION_RODATA static u8 const leftOffset[12] = { 0x42, 0x96, 0x00, 0x00, 0x42, 0xCC, 0x00, 0x00, 0x40, 0xC7, 0x2B, 0x02, }; -COMPILER_STRIP_GATE(80391990, &leftOffset); +COMPILER_STRIP_GATE(0x80391990, &leftOffset); /* 8039199C-803919A8 01DFFC 000C+00 1/1 0/0 0/0 .rodata rightOffset$19387 */ SECTION_RODATA static u8 const rightOffset[12] = { 0xC2, 0x96, 0x00, 0x00, 0x42, 0xCC, 0x00, 0x00, 0x40, 0xC7, 0x12, 0x6F, }; -COMPILER_STRIP_GATE(8039199C, &rightOffset); +COMPILER_STRIP_GATE(0x8039199C, &rightOffset); /* 803919A8-803919D8 01E008 0030+00 0/1 0/0 0/0 .rodata cutParamTable$19765 */ #pragma push @@ -10895,7 +10892,7 @@ SECTION_RODATA static u8 const cutParamTable_19765[48] = { 0x00, 0x92, 0x01, 0x0D, 0x00, 0x13, 0x23, 0x00, 0x00, 0x00, 0x00, 0x22, 0x00, 0x93, 0x01, 0x0E, 0x00, 0x13, 0x2A, 0x00, 0x00, 0x00, 0x00, 0x23, 0x00, 0x94, 0x01, 0x0F, 0x00, 0x00, 0x2A, 0x00, }; -COMPILER_STRIP_GATE(803919A8, &cutParamTable_19765); +COMPILER_STRIP_GATE(0x803919A8, &cutParamTable_19765); #pragma pop /* 803919D8-803919E4 01E038 000A+02 1/1 0/0 0/0 .rodata anmIdx$19945 */ @@ -10914,25 +10911,25 @@ SECTION_RODATA static u8 const anmIdx[10 + 2 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(803919D8, &anmIdx); +COMPILER_STRIP_GATE(0x803919D8, &anmIdx); /* 803919E4-803919F0 01E044 000C+00 1/1 0/0 0/0 .rodata localPaddleTop$20605 */ SECTION_RODATA static u8 const localPaddleTop[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC3, 0x1E, 0x00, 0x00, }; -COMPILER_STRIP_GATE(803919E4, &localPaddleTop); +COMPILER_STRIP_GATE(0x803919E4, &localPaddleTop); /* 803919F0-803919FC 01E050 000C+00 1/1 0/0 0/0 .rodata underOffsetY$23302 */ SECTION_RODATA static u8 const underOffsetY[12] = { 0x41, 0x70, 0x00, 0x00, 0x42, 0xB4, 0x00, 0x00, 0x43, 0x16, 0x00, 0x00, }; -COMPILER_STRIP_GATE(803919F0, &underOffsetY); +COMPILER_STRIP_GATE(0x803919F0, &underOffsetY); /* 803919FC-80391A08 01E05C 000C+00 1/1 0/0 0/0 .rodata hsVec$28749 */ SECTION_RODATA static u8 const hsVec[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0xA0, 0x00, 0x00, }; -COMPILER_STRIP_GATE(803919FC, &hsVec); +COMPILER_STRIP_GATE(0x803919FC, &hsVec); /* 80391A08-80391A14 01E068 000C+00 1/1 0/0 0/0 .rodata hookRoot$29726 */ SECTION_RODATA static f32 const hookRoot[3] = { @@ -10940,25 +10937,25 @@ SECTION_RODATA static f32 const hookRoot[3] = { 0.0f, 23.5f, }; -COMPILER_STRIP_GATE(80391A08, &hookRoot); +COMPILER_STRIP_GATE(0x80391A08, &hookRoot); /* 80391A14-80391A20 01E074 000C+00 1/1 0/0 0/0 .rodata bottleTop$32160 */ SECTION_RODATA static u8 const bottleTop[12] = { 0x00, 0x00, 0x00, 0x00, 0x41, 0xC8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80391A14, &bottleTop); +COMPILER_STRIP_GATE(0x80391A14, &bottleTop); /* 80391A20-80391A2C 01E080 000C+00 1/1 0/0 0/0 .rodata kandelaarOffset$32655 */ SECTION_RODATA static u8 const kandelaarOffset[12] = { 0x00, 0x00, 0x00, 0x00, 0xC1, 0x88, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80391A20, &kandelaarOffset); +COMPILER_STRIP_GATE(0x80391A20, &kandelaarOffset); /* 80391A2C-80391A38 01E08C 000C+00 1/1 0/0 0/0 .rodata @33690 */ SECTION_RODATA static u8 const lit_33690[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80391A2C, &lit_33690); +COMPILER_STRIP_GATE(0x80391A2C, &lit_33690); /* 80391A38-80391A44 01E098 000C+00 0/1 0/0 0/0 .rodata ironBallPosVec$34212 */ #pragma push @@ -10966,7 +10963,7 @@ COMPILER_STRIP_GATE(80391A2C, &lit_33690); SECTION_RODATA static u8 const ironBallPosVec[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC2, 0x28, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80391A38, &ironBallPosVec); +COMPILER_STRIP_GATE(0x80391A38, &ironBallPosVec); #pragma pop /* 80391A44-80391A50 01E0A4 000C+00 0/1 0/0 0/0 .rodata handCenterOffsetVec$34213 */ @@ -10975,14 +10972,14 @@ COMPILER_STRIP_GATE(80391A38, &ironBallPosVec); SECTION_RODATA static u8 const handCenterOffsetVec[12] = { 0x40, 0x00, 0x00, 0x00, 0xC1, 0xC8, 0x00, 0x00, 0x41, 0x48, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80391A44, &handCenterOffsetVec); +COMPILER_STRIP_GATE(0x80391A44, &handCenterOffsetVec); #pragma pop /* 80391A50-80391A5C 01E0B0 000C+00 1/1 0/0 0/0 .rodata @34968 */ SECTION_RODATA static u8 const lit_34968[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80391A50, &lit_34968); +COMPILER_STRIP_GATE(0x80391A50, &lit_34968); /* 80391A5C-80391B5C 01E0BC 00FF+01 1/1 0/0 0/0 .rodata getSeType$37390 */ SECTION_RODATA static u8 const getSeType[255 + 1 /* padding */] = { @@ -11244,20 +11241,20 @@ SECTION_RODATA static u8 const getSeType[255 + 1 /* padding */] = { /* padding */ 0x00, }; -COMPILER_STRIP_GATE(80391A5C, &getSeType); +COMPILER_STRIP_GATE(0x80391A5C, &getSeType); /* 80391B5C-80391B7C 01E1BC 0020+00 1/1 0/0 0/0 .rodata bgmLabel$37391 */ SECTION_RODATA static u8 const bgmLabel[32] = { 0x01, 0x00, 0x00, 0x1C, 0x01, 0x00, 0x00, 0x0A, 0x01, 0x00, 0x00, 0x0B, 0x01, 0x00, 0x00, 0x14, 0x01, 0x00, 0x00, 0x81, 0x01, 0x00, 0x00, 0x82, 0x01, 0x00, 0x00, 0x83, 0x01, 0x00, 0x00, 0xA0, }; -COMPILER_STRIP_GATE(80391B5C, &bgmLabel); +COMPILER_STRIP_GATE(0x80391B5C, &bgmLabel); /* 80391B7C-80391B8C 01E1DC 0010+00 1/1 0/0 0/0 .rodata rupeeCount$37407 */ SECTION_RODATA static u8 const rupeeCount[16] = { 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x32, 0x00, 0x00, 0x00, 0x64, 0x00, 0x00, 0x00, 0xC8, }; -COMPILER_STRIP_GATE(80391B7C, &rupeeCount); +COMPILER_STRIP_GATE(0x80391B7C, &rupeeCount); /* 80391B8C-80391BA0 01E1EC 0014+00 0/1 0/0 0/0 .rodata heartPieceMessage$37580 */ #pragma push @@ -11266,7 +11263,7 @@ SECTION_RODATA static u8 const heartPieceMessage[20] = { 0x00, 0x00, 0x00, 0x86, 0x00, 0x00, 0x00, 0x9C, 0x00, 0x00, 0x00, 0x9D, 0x00, 0x00, 0x00, 0x9E, 0x00, 0x00, 0x00, 0x9F, }; -COMPILER_STRIP_GATE(80391B8C, &heartPieceMessage); +COMPILER_STRIP_GATE(0x80391B8C, &heartPieceMessage); #pragma pop /* 80391BA0-80391BAC 01E200 000C+00 0/1 0/0 0/0 .rodata effName$39419 */ @@ -11275,20 +11272,20 @@ COMPILER_STRIP_GATE(80391B8C, &heartPieceMessage); SECTION_RODATA static u8 const effName_39419[12] = { 0x09, 0xF5, 0x09, 0xF6, 0x09, 0xF7, 0x09, 0xF8, 0x09, 0xF9, 0x09, 0xFA, }; -COMPILER_STRIP_GATE(80391BA0, &effName_39419); +COMPILER_STRIP_GATE(0x80391BA0, &effName_39419); #pragma pop /* 80391BAC-80391BB8 01E20C 000C+00 1/1 0/0 0/0 .rodata smokeParticleScale$39643 */ SECTION_RODATA static u8 const smokeParticleScale_39643[12] = { 0x3F, 0x33, 0x33, 0x33, 0x3F, 0x33, 0x33, 0x33, 0x3F, 0x33, 0x33, 0x33, }; -COMPILER_STRIP_GATE(80391BAC, &smokeParticleScale_39643); +COMPILER_STRIP_GATE(0x80391BAC, &smokeParticleScale_39643); /* 80391BB8-80391BC4 01E218 000C+00 1/1 0/0 0/0 .rodata wolfWaterCenterScale$39644 */ SECTION_RODATA static u8 const wolfWaterCenterScale[12] = { 0x3F, 0x99, 0x99, 0x9A, 0x3F, 0x99, 0x99, 0x9A, 0x3F, 0x99, 0x99, 0x9A, }; -COMPILER_STRIP_GATE(80391BB8, &wolfWaterCenterScale); +COMPILER_STRIP_GATE(0x80391BB8, &wolfWaterCenterScale); /* 80391BC4-80391BD0 01E224 000C+00 0/1 0/0 0/0 .rodata waterScale$39762 */ #pragma push @@ -11296,7 +11293,7 @@ COMPILER_STRIP_GATE(80391BB8, &wolfWaterCenterScale); SECTION_RODATA static u8 const waterScale_39762[12] = { 0x3F, 0x14, 0x7A, 0xE1, 0x3F, 0x14, 0x7A, 0xE1, 0x3F, 0x14, 0x7A, 0xE1, }; -COMPILER_STRIP_GATE(80391BC4, &waterScale_39762); +COMPILER_STRIP_GATE(0x80391BC4, &waterScale_39762); #pragma pop /* 80391BD0-80391BDC 01E230 000C+00 0/1 0/0 0/0 .rodata waterCenterScale$39763 */ @@ -11305,7 +11302,7 @@ COMPILER_STRIP_GATE(80391BC4, &waterScale_39762); SECTION_RODATA static u8 const waterCenterScale[12] = { 0x3F, 0x99, 0x99, 0x9A, 0x3F, 0x99, 0x99, 0x9A, 0x3F, 0x99, 0x99, 0x9A, }; -COMPILER_STRIP_GATE(80391BD0, &waterCenterScale); +COMPILER_STRIP_GATE(0x80391BD0, &waterCenterScale); #pragma pop /* 80391BDC-80391BE8 01E23C 000C+00 0/1 0/0 0/0 .rodata waterSmokeScale$39764 */ @@ -11314,7 +11311,7 @@ COMPILER_STRIP_GATE(80391BD0, &waterCenterScale); SECTION_RODATA static u8 const waterSmokeScale[12] = { 0x3F, 0x33, 0x33, 0x33, 0x3F, 0x33, 0x33, 0x33, 0x3F, 0x33, 0x33, 0x33, }; -COMPILER_STRIP_GATE(80391BDC, &waterSmokeScale); +COMPILER_STRIP_GATE(0x80391BDC, &waterSmokeScale); #pragma pop /* 80391BE8-80391BF4 01E248 000C+00 0/1 0/0 0/0 .rodata smokeParticleScale$39891 */ @@ -11323,7 +11320,7 @@ COMPILER_STRIP_GATE(80391BDC, &waterSmokeScale); SECTION_RODATA static u8 const smokeParticleScale_39891[12] = { 0x3F, 0x4C, 0xCC, 0xCD, 0x3F, 0x4C, 0xCC, 0xCD, 0x3F, 0x4C, 0xCC, 0xCD, }; -COMPILER_STRIP_GATE(80391BE8, &smokeParticleScale_39891); +COMPILER_STRIP_GATE(0x80391BE8, &smokeParticleScale_39891); #pragma pop /* 80391BF4-80391C00 01E254 000C+00 0/1 0/0 0/0 .rodata waterScale$39892 */ @@ -11332,7 +11329,7 @@ COMPILER_STRIP_GATE(80391BE8, &smokeParticleScale_39891); SECTION_RODATA static u8 const waterScale_39892[12] = { 0x3F, 0xA0, 0x00, 0x00, 0x3F, 0xA0, 0x00, 0x00, 0x3F, 0xA0, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80391BF4, &waterScale_39892); +COMPILER_STRIP_GATE(0x80391BF4, &waterScale_39892); #pragma pop /* 80391C00-80391C0C 01E260 000C+00 0/1 0/0 0/0 .rodata wolfSmokeScale$39893 */ @@ -11341,7 +11338,7 @@ COMPILER_STRIP_GATE(80391BF4, &waterScale_39892); SECTION_RODATA static u8 const wolfSmokeScale[12] = { 0x3F, 0x33, 0x33, 0x33, 0x3F, 0x33, 0x33, 0x33, 0x3F, 0x33, 0x33, 0x33, }; -COMPILER_STRIP_GATE(80391C00, &wolfSmokeScale); +COMPILER_STRIP_GATE(0x80391C00, &wolfSmokeScale); #pragma pop /* 80391C0C-80391C18 01E26C 000C+00 0/1 0/0 0/0 .rodata shikoScale$40012 */ @@ -11350,7 +11347,7 @@ COMPILER_STRIP_GATE(80391C00, &wolfSmokeScale); SECTION_RODATA static u8 const shikoScale[12] = { 0x3F, 0x33, 0x33, 0x33, 0x3F, 0x33, 0x33, 0x33, 0x3F, 0x33, 0x33, 0x33, }; -COMPILER_STRIP_GATE(80391C0C, &shikoScale); +COMPILER_STRIP_GATE(0x80391C0C, &shikoScale); #pragma pop /* 80391C18-80391C24 01E278 000C+00 0/1 0/0 0/0 .rodata pushedSlip$40013 */ @@ -11359,7 +11356,7 @@ COMPILER_STRIP_GATE(80391C0C, &shikoScale); SECTION_RODATA static u8 const pushedSlip[12] = { 0x3F, 0x4C, 0xCC, 0xCD, 0x3F, 0x4C, 0xCC, 0xCD, 0x3F, 0x4C, 0xCC, 0xCD, }; -COMPILER_STRIP_GATE(80391C18, &pushedSlip); +COMPILER_STRIP_GATE(0x80391C18, &pushedSlip); #pragma pop /* 80391C24-80391C30 01E284 000C+00 0/1 0/0 0/0 .rodata loseScale$40014 */ @@ -11368,14 +11365,14 @@ COMPILER_STRIP_GATE(80391C18, &pushedSlip); SECTION_RODATA static u8 const loseScale[12] = { 0x3F, 0x8C, 0xCC, 0xCD, 0x3F, 0x8C, 0xCC, 0xCD, 0x3F, 0x8C, 0xCC, 0xCD, }; -COMPILER_STRIP_GATE(80391C24, &loseScale); +COMPILER_STRIP_GATE(0x80391C24, &loseScale); #pragma pop /* 80391C30-80391C3C 01E290 000C+00 1/1 0/0 0/0 .rodata releaeScale$40567 */ SECTION_RODATA static u8 const releaeScale[12] = { 0x3F, 0x4C, 0xCC, 0xCD, 0x3F, 0x4C, 0xCC, 0xCD, 0x3F, 0x4C, 0xCC, 0xCD, }; -COMPILER_STRIP_GATE(80391C30, &releaeScale); +COMPILER_STRIP_GATE(0x80391C30, &releaeScale); /* 80391C3C-80391C48 01E29C 000C+00 0/1 0/0 0/0 .rodata lightAParticleScale$40829 */ #pragma push @@ -11383,7 +11380,7 @@ COMPILER_STRIP_GATE(80391C30, &releaeScale); SECTION_RODATA static u8 const lightAParticleScale[12] = { 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x95, 0xE3, 0x54, 0x3F, 0x80, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80391C3C, &lightAParticleScale); +COMPILER_STRIP_GATE(0x80391C3C, &lightAParticleScale); #pragma pop /* 80391C48-80391C54 01E2A8 000C+00 0/1 0/0 0/0 .rodata lightALocalTrans$40830 */ @@ -11392,7 +11389,7 @@ COMPILER_STRIP_GATE(80391C3C, &lightAParticleScale); SECTION_RODATA static u8 const lightALocalTrans[12] = { 0x42, 0x88, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80391C48, &lightALocalTrans); +COMPILER_STRIP_GATE(0x80391C48, &lightALocalTrans); #pragma pop /* 80391C54-80391C60 01E2B4 000C+00 0/1 0/0 0/0 .rodata localOffset$40952 */ @@ -11401,7 +11398,7 @@ COMPILER_STRIP_GATE(80391C48, &lightALocalTrans); SECTION_RODATA static u8 const localOffset_40952[12] = { 0x00, 0x00, 0x00, 0x00, 0xC1, 0x20, 0x00, 0x00, 0xC1, 0x20, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80391C54, &localOffset_40952); +COMPILER_STRIP_GATE(0x80391C54, &localOffset_40952); #pragma pop /* 80391C60-80391C6C 01E2C0 000C+00 0/1 0/0 0/0 .rodata localScale0$40953 */ @@ -11410,7 +11407,7 @@ COMPILER_STRIP_GATE(80391C54, &localOffset_40952); SECTION_RODATA static u8 const localScale0[12] = { 0x3F, 0x33, 0x33, 0x33, 0x3F, 0x59, 0x99, 0x9A, 0x3F, 0xC0, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80391C60, &localScale0); +COMPILER_STRIP_GATE(0x80391C60, &localScale0); #pragma pop /* 80391C6C-80391C78 01E2CC 000C+00 0/1 0/0 0/0 .rodata localScale1$40954 */ @@ -11419,7 +11416,7 @@ COMPILER_STRIP_GATE(80391C60, &localScale0); SECTION_RODATA static u8 const localScale1[12] = { 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x59, 0x99, 0x9A, 0x3F, 0xC0, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80391C6C, &localScale1); +COMPILER_STRIP_GATE(0x80391C6C, &localScale1); #pragma pop /* 80391C78-80391C84 01E2D8 000C+00 0/1 0/0 0/0 .rodata waterEffScale$41082 */ @@ -11428,7 +11425,7 @@ COMPILER_STRIP_GATE(80391C6C, &localScale1); SECTION_RODATA static u8 const waterEffScale[12] = { 0x3F, 0xC0, 0x00, 0x00, 0x3F, 0xC0, 0x00, 0x00, 0x3F, 0xC0, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80391C78, &waterEffScale); +COMPILER_STRIP_GATE(0x80391C78, &waterEffScale); #pragma pop /* 80391C84-80391C9C 01E2E4 0018+00 0/1 0/0 0/0 .rodata leftTransNormal$41090 */ @@ -11438,7 +11435,7 @@ SECTION_RODATA static u8 const leftTransNormal[24] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80391C84, &leftTransNormal); +COMPILER_STRIP_GATE(0x80391C84, &leftTransNormal); #pragma pop /* 80391C9C-80391CCC 01E2FC 0030+00 0/1 0/0 0/0 .rodata leftTransLight$41095 */ @@ -11449,7 +11446,7 @@ SECTION_RODATA static u8 const leftTransLight[48] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80391C9C, &leftTransLight); +COMPILER_STRIP_GATE(0x80391C9C, &leftTransLight); #pragma pop /* 80391CCC-80391CD8 01E32C 000C+00 0/1 0/0 0/0 .rodata effNameLarge$41096 */ @@ -11458,7 +11455,7 @@ COMPILER_STRIP_GATE(80391C9C, &leftTransLight); SECTION_RODATA static u8 const effNameLarge[12] = { 0x0B, 0xA5, 0x0B, 0xA6, 0x0B, 0xA7, 0x0B, 0xA8, 0x0B, 0xA9, 0x0B, 0xAA, }; -COMPILER_STRIP_GATE(80391CCC, &effNameLarge); +COMPILER_STRIP_GATE(0x80391CCC, &effNameLarge); #pragma pop /* 80391CD8-80391D20 01E338 0048+00 0/1 0/0 0/0 .rodata leftTransLarge$41100 */ @@ -11471,7 +11468,7 @@ SECTION_RODATA static u8 const leftTransLarge[72] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0x48, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80391CD8, &leftTransLarge); +COMPILER_STRIP_GATE(0x80391CD8, &leftTransLarge); #pragma pop /* 80391D20-80391D38 01E380 0018+00 0/1 0/0 0/0 .rodata leftTransWater$41105 */ @@ -11481,26 +11478,26 @@ SECTION_RODATA static u8 const leftTransWater[24] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80391D20, &leftTransWater); +COMPILER_STRIP_GATE(0x80391D20, &leftTransWater); #pragma pop /* 80391D38-80391D44 01E398 000C+00 1/1 0/0 0/0 .rodata effName$41208 */ SECTION_RODATA static u8 const effName_41208[12] = { 0x09, 0xD0, 0x09, 0xD1, 0x09, 0xD2, 0x09, 0xD3, 0x09, 0xD4, 0x09, 0xD5, }; -COMPILER_STRIP_GATE(80391D38, &effName_41208); +COMPILER_STRIP_GATE(0x80391D38, &effName_41208); /* 80391D44-80391D54 01E3A4 0010+00 1/1 0/0 0/0 .rodata swordUpColor$41733 */ SECTION_RODATA static u8 const swordUpColor[16] = { 0x00, 0x0D, 0x00, 0x0A, 0x00, 0x02, 0x00, 0xFF, 0x00, 0x1C, 0x00, 0x10, 0x00, 0x04, 0x00, 0xFF, }; -COMPILER_STRIP_GATE(80391D44, &swordUpColor); +COMPILER_STRIP_GATE(0x80391D44, &swordUpColor); /* 80391D54-80391D60 01E3B4 000C+00 1/1 0/0 0/0 .rodata swordCutSplashScale$41755 */ SECTION_RODATA static u8 const swordCutSplashScale[12] = { 0x3F, 0x19, 0x99, 0x9A, 0x3F, 0x19, 0x99, 0x9A, 0x3F, 0x19, 0x99, 0x9A, }; -COMPILER_STRIP_GATE(80391D54, &swordCutSplashScale); +COMPILER_STRIP_GATE(0x80391D54, &swordCutSplashScale); /* 80391D60-80391D6C 01E3C0 000C+00 0/1 0/0 0/0 .rodata fairyScale$41951 */ #pragma push @@ -11508,7 +11505,7 @@ COMPILER_STRIP_GATE(80391D54, &swordCutSplashScale); SECTION_RODATA static u8 const fairyScale[12] = { 0x3F, 0x00, 0x00, 0x00, 0x3F, 0x00, 0x00, 0x00, 0x3F, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80391D60, &fairyScale); +COMPILER_STRIP_GATE(0x80391D60, &fairyScale); #pragma pop /* 80391D6C-80391D78 01E3CC 000C+00 0/1 0/0 0/0 .rodata chuchuLocalOffset$41952 */ @@ -11517,7 +11514,7 @@ COMPILER_STRIP_GATE(80391D60, &fairyScale); SECTION_RODATA static u8 const chuchuLocalOffset[12] = { 0x00, 0x00, 0x00, 0x00, 0x41, 0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80391D6C, &chuchuLocalOffset); +COMPILER_STRIP_GATE(0x80391D6C, &chuchuLocalOffset); #pragma pop /* 80391D78-80391D84 01E3D8 000C+00 0/1 0/0 0/0 .rodata chuchuScale$41953 */ @@ -11526,14 +11523,14 @@ COMPILER_STRIP_GATE(80391D6C, &chuchuLocalOffset); SECTION_RODATA static u8 const chuchuScale[12] = { 0x3F, 0x4C, 0xCC, 0xCD, 0x3F, 0x4C, 0xCC, 0xCD, 0x3F, 0x4C, 0xCC, 0xCD, }; -COMPILER_STRIP_GATE(80391D78, &chuchuScale); +COMPILER_STRIP_GATE(0x80391D78, &chuchuScale); #pragma pop /* 80391D84-80391D94 01E3E4 0010+00 1/1 0/0 0/0 .rodata effJoint$42070 */ SECTION_RODATA static u8 const effJoint[16] = { 0x00, 0x07, 0x00, 0x0C, 0x00, 0x10, 0x00, 0x22, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, }; -COMPILER_STRIP_GATE(80391D84, &effJoint); +COMPILER_STRIP_GATE(0x80391D84, &effJoint); /* 80391D94-80391DF4 01E3F4 0060+00 1/1 0/0 0/0 .rodata effOffset$42071 */ SECTION_RODATA static u8 const effOffset[96] = { @@ -11544,7 +11541,7 @@ SECTION_RODATA static u8 const effOffset[96] = { 0xC1, 0xC8, 0x00, 0x00, 0x40, 0xA0, 0x00, 0x00, 0x41, 0x70, 0x00, 0x00, 0xC0, 0xA0, 0x00, 0x00, 0x41, 0xA0, 0x00, 0x00, 0x41, 0x20, 0x00, 0x00, 0xC1, 0xC8, 0x00, 0x00, 0xC1, 0x20, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80391D94, &effOffset); +COMPILER_STRIP_GATE(0x80391D94, &effOffset); /* 80391DF4-80391E00 01E454 000C+00 0/1 0/0 0/0 .rodata effScale$42225 */ #pragma push @@ -11552,7 +11549,7 @@ COMPILER_STRIP_GATE(80391D94, &effOffset); SECTION_RODATA static u8 const effScale[12] = { 0x3F, 0x80, 0x00, 0x00, 0x3F, 0xE6, 0x66, 0x66, 0x3F, 0x80, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80391DF4, &effScale); +COMPILER_STRIP_GATE(0x80391DF4, &effScale); #pragma pop /* 80391E00-80391E0C 01E460 000C+00 0/1 0/0 0/0 .rodata wolfEffScale$42226 */ @@ -11561,7 +11558,7 @@ COMPILER_STRIP_GATE(80391DF4, &effScale); SECTION_RODATA static u8 const wolfEffScale[12] = { 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x3F, 0xC0, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80391E00, &wolfEffScale); +COMPILER_STRIP_GATE(0x80391E00, &wolfEffScale); #pragma pop /* 80391E0C-80391E18 01E46C 000C+00 0/1 0/0 0/0 .rodata offsetPos$42227 */ @@ -11570,32 +11567,32 @@ COMPILER_STRIP_GATE(80391E00, &wolfEffScale); SECTION_RODATA static u8 const offsetPos[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC1, 0x20, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80391E0C, &offsetPos); +COMPILER_STRIP_GATE(0x80391E0C, &offsetPos); #pragma pop /* 80391E18-80391E24 01E478 000C+00 1/1 0/0 0/0 .rodata localFootOffset$45107 */ SECTION_RODATA static u8 const localFootOffset[12] = { 0x40, 0xC0, 0x00, 0x00, 0xC0, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80391E18, &localFootOffset); +COMPILER_STRIP_GATE(0x80391E18, &localFootOffset); /* 80391E24-80391E30 01E484 000C+00 1/1 0/0 0/0 .rodata frontOffset$45186 */ SECTION_RODATA static u8 const frontOffset[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0x48, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80391E24, &frontOffset); +COMPILER_STRIP_GATE(0x80391E24, &frontOffset); /* 80391E30-80391E3C 01E490 000C+00 1/1 0/0 0/0 .rodata wolfChainBaseOffset$45513 */ SECTION_RODATA static u8 const wolfChainBaseOffset[12] = { 0x41, 0xB0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC1, 0x40, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80391E30, &wolfChainBaseOffset); +COMPILER_STRIP_GATE(0x80391E30, &wolfChainBaseOffset); /* 80391E3C-80391E48 01E49C 000C+00 1/1 0/0 0/0 .rodata wolfChainVec$45514 */ SECTION_RODATA static u8 const wolfChainVec[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC1, 0x10, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80391E3C, &wolfChainVec); +COMPILER_STRIP_GATE(0x80391E3C, &wolfChainVec); /* 80391E48-80391E78 01E4A8 0030+00 1/1 0/0 0/0 .rodata label$45760 */ SECTION_RODATA static u8 const label[48] = { @@ -11603,21 +11600,21 @@ SECTION_RODATA static u8 const label[48] = { 0x00, 0x01, 0x00, 0x3D, 0x00, 0x01, 0x00, 0x33, 0x00, 0x01, 0x00, 0xB1, 0x00, 0x01, 0x00, 0xB5, 0x00, 0x01, 0x00, 0xB6, 0x00, 0x01, 0x00, 0xB7, 0x00, 0x01, 0x00, 0xB9, 0x00, 0x01, 0x00, 0x3F, }; -COMPILER_STRIP_GATE(80391E48, &label); +COMPILER_STRIP_GATE(0x80391E48, &label); /* 80391E78-80391E8C 01E4D8 0014+00 1/1 0/0 0/0 .rodata normalType0$50859 */ SECTION_RODATA static u8 const normalType0[20] = { 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80391E78, &normalType0); +COMPILER_STRIP_GATE(0x80391E78, &normalType0); /* 80391E8C-80391EA0 01E4EC 0014+00 1/1 0/0 0/0 .rodata normalType1$50860 */ SECTION_RODATA static u8 const normalType1_50860[20] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x03, }; -COMPILER_STRIP_GATE(80391E8C, &normalType1_50860); +COMPILER_STRIP_GATE(0x80391E8C, &normalType1_50860); /* 80391EA0-80391EC0 01E500 0020+00 0/1 0/0 0/0 .rodata dataTabl$51470 */ #pragma push @@ -11626,20 +11623,20 @@ SECTION_RODATA static u8 const dataTabl[32] = { 0x00, 0x00, 0x00, 0x40, 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0x2E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x43, 0x2F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41, 0x2D, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80391EA0, &dataTabl); +COMPILER_STRIP_GATE(0x80391EA0, &dataTabl); #pragma pop /* 80391EC0-80391ECC 01E520 000C+00 1/1 0/0 0/0 .rodata arm1Vec$56040 */ SECTION_RODATA static u8 const arm1Vec[12] = { 0x41, 0xE8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80391EC0, &arm1Vec); +COMPILER_STRIP_GATE(0x80391EC0, &arm1Vec); /* 80391ECC-80391ED8 01E52C 000C+00 1/1 0/0 0/0 .rodata arm2Vec$56041 */ SECTION_RODATA static u8 const arm2Vec[12] = { 0x41, 0xD4, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80391ECC, &arm2Vec); +COMPILER_STRIP_GATE(0x80391ECC, &arm2Vec); /* 80453228-8045322C 001828 0004+00 1/1 0/0 0/0 .sdata2 armJointTable$56027 */ SECTION_SDATA2 static u8 armJointTable[4] = { @@ -11666,7 +11663,7 @@ asm void daAlink_c::setArmMatrix() { SECTION_RODATA static u8 const leg1Vec[12] = { 0x41, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80391ED8, &leg1Vec); +COMPILER_STRIP_GATE(0x80391ED8, &leg1Vec); #pragma pop /* 80391EE4-80391EF0 01E544 000C+00 0/1 0/0 0/0 .rodata leg2Vec$56151 */ @@ -11675,7 +11672,7 @@ COMPILER_STRIP_GATE(80391ED8, &leg1Vec); SECTION_RODATA static u8 const leg2Vec[12] = { 0x42, 0x1D, 0x74, 0x39, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80391EE4, &leg2Vec); +COMPILER_STRIP_GATE(0x80391EE4, &leg2Vec); #pragma pop /* 80391EF0-80391EFC 01E550 000C+00 0/1 0/0 0/0 .rodata footVec$56152 */ @@ -11684,7 +11681,7 @@ COMPILER_STRIP_GATE(80391EE4, &leg2Vec); SECTION_RODATA static u8 const footVec[12] = { 0x41, 0x62, 0xE1, 0x48, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80391EF0, &footVec); +COMPILER_STRIP_GATE(0x80391EF0, &footVec); #pragma pop /* 8045322C-80453230 00182C 0004+00 1/1 0/0 0/0 .sdata2 footJointTable$56137 */ @@ -11734,7 +11731,7 @@ asm void daAlink_c::setLegAngle(f32 param_0, daAlink_footData_c* param_1, s16* p SECTION_RODATA static u8 const localLeftFootOffset[12] = { 0xC0, 0x40, 0x00, 0x00, 0x41, 0x50, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80391EFC, &localLeftFootOffset); +COMPILER_STRIP_GATE(0x80391EFC, &localLeftFootOffset); #pragma pop /* 80391F08-80391F14 01E568 000C+00 0/1 0/0 0/0 .rodata localRightFootOffset$56543 */ @@ -11743,7 +11740,7 @@ COMPILER_STRIP_GATE(80391EFC, &localLeftFootOffset); SECTION_RODATA static u8 const localRightFootOffset[12] = { 0xC0, 0x40, 0x00, 0x00, 0xC1, 0x50, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80391F08, &localRightFootOffset); +COMPILER_STRIP_GATE(0x80391F08, &localRightFootOffset); #pragma pop /* 80391F14-80391F20 01E574 000C+00 0/1 0/0 0/0 .rodata localLeftToeOffset$56544 */ @@ -11752,7 +11749,7 @@ COMPILER_STRIP_GATE(80391F08, &localRightFootOffset); SECTION_RODATA static u8 const localLeftToeOffset[12] = { 0x41, 0x20, 0x00, 0x00, 0x40, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80391F14, &localLeftToeOffset); +COMPILER_STRIP_GATE(0x80391F14, &localLeftToeOffset); #pragma pop /* 80391F20-80391F2C 01E580 000C+00 0/1 0/0 0/0 .rodata localRightToeOffset$56545 */ @@ -11761,7 +11758,7 @@ COMPILER_STRIP_GATE(80391F14, &localLeftToeOffset); SECTION_RODATA static u8 const localRightToeOffset[12] = { 0x41, 0x20, 0x00, 0x00, 0xC0, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80391F20, &localRightToeOffset); +COMPILER_STRIP_GATE(0x80391F20, &localRightToeOffset); #pragma pop /* 80450690-80450694 000110 0004+00 20/20 0/0 0/0 .sdata l_autoUpHeight */ @@ -11786,7 +11783,7 @@ SECTION_RODATA static u8 const localHandPos[24] = { 0x41, 0xB0, 0xC5, 0x60, 0x40, 0xAF, 0xC1, 0x20, 0x00, 0x00, 0x00, 0x00, 0xC1, 0xAF, 0x33, 0x80, 0x40, 0xB0, 0xCF, 0xDF, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80391F2C, &localHandPos); +COMPILER_STRIP_GATE(0x80391F2C, &localHandPos); /* 800A39B8-800A3C8C 09E2F8 02D4+00 1/1 0/0 0/0 .text handBgCheck__9daAlink_cFv */ #pragma push @@ -11883,6 +11880,118 @@ asm void daAlink_c::initDemoBck(mDoExt_bckAnm** param_0, char const* param_1) { #pragma pop /* ############################################################################################## */ +/* 80392094-80392094 01E6F4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80392094 = "Rotary"; +SECTION_DEAD static char const* const stringBase_8039209B = "Rampart2"; +SECTION_DEAD static char const* const stringBase_803920A4 = "Allay"; +SECTION_DEAD static char const* const stringBase_803920AA = "AllayR"; +SECTION_DEAD static char const* const stringBase_803920B1 = "AllayR2"; +SECTION_DEAD static char const* const stringBase_803920B9 = "AllayS"; +SECTION_DEAD static char const* const stringBase_803920C0 = "StreetP"; +SECTION_DEAD static char const* const stringBase_803920C8 = "Street"; +SECTION_DEAD static char const* const stringBase_803920CF = "D_MN04B"; +SECTION_DEAD static char const* const stringBase_803920D7 = "Type"; +SECTION_DEAD static char const* const stringBase_803920DC = "D_MN07B"; +SECTION_DEAD static char const* const stringBase_803920E4 = "D_MN05A"; +SECTION_DEAD static char const* const stringBase_803920EC = "D_MN06A"; +SECTION_DEAD static char const* const stringBase_803920F4 = "F_SP117"; +SECTION_DEAD static char const* const stringBase_803920FC = "D_MN54"; +SECTION_DEAD static char const* const stringBase_80392103 = "F_SP103"; +SECTION_DEAD static char const* const stringBase_8039210B = "F_SP00"; +SECTION_DEAD static char const* const stringBase_80392112 = "F_SP127"; +SECTION_DEAD static char const* const stringBase_8039211A = "D_MN07A"; +SECTION_DEAD static char const* const stringBase_80392122 = "D_MN01A"; +SECTION_DEAD static char const* const stringBase_8039212A = "D_MN10"; +SECTION_DEAD static char const* const stringBase_80392131 = "D_MN10A"; +SECTION_DEAD static char const* const stringBase_80392139 = "F_SP108"; +SECTION_DEAD static char const* const stringBase_80392141 = "J_Tobi"; +SECTION_DEAD static char const* const stringBase_80392148 = "J_Umak"; +SECTION_DEAD static char const* const stringBase_8039214F = "D_MN01"; +SECTION_DEAD static char const* const stringBase_80392156 = "D_MN06"; +SECTION_DEAD static char const* const stringBase_8039215D = "D_MN05"; +SECTION_DEAD static char const* const stringBase_80392164 = "R22-opening"; +SECTION_DEAD static char const* const stringBase_80392170 = "pos"; +SECTION_DEAD static char const* const stringBase_80392174 = "angle"; +SECTION_DEAD static char const* const stringBase_8039217A = "prm0"; +SECTION_DEAD static char const* const stringBase_8039217F = "prm1"; +SECTION_DEAD static char const* const stringBase_80392184 = "stick"; +SECTION_DEAD static char const* const stringBase_8039218A = "D_MN09B"; +SECTION_DEAD static char const* const stringBase_80392192 = "D_MN05B"; +SECTION_DEAD static char const* const stringBase_8039219A = "F_SP115"; +SECTION_DEAD static char const* const stringBase_803921A2 = "D_MN11"; +SECTION_DEAD static char const* const stringBase_803921A9 = "D_MN07"; +SECTION_DEAD static char const* const stringBase_803921B0 = "F_SP102"; +SECTION_DEAD static char const* const stringBase_803921B8 = "D_MN08D"; +SECTION_DEAD static char const* const stringBase_803921C0 = "D_MN09A"; +SECTION_DEAD static char const* const stringBase_803921C8 = "D_MN08C"; +SECTION_DEAD static char const* const stringBase_803921D0 = "R_SP161"; +SECTION_DEAD static char const* const stringBase_803921D8 = "Obj_kbrg"; +SECTION_DEAD static char const* const stringBase_803921E1 = "Obj_obrg"; +SECTION_DEAD static char const* const stringBase_803921EA = "M_VolcBom"; +SECTION_DEAD static char const* const stringBase_803921F4 = "SCanCrs"; +SECTION_DEAD static char const* const stringBase_803921FC = "F_SP125"; +SECTION_DEAD static char const* const stringBase_80392204 = "D_MN08"; +SECTION_DEAD static char const* const stringBase_8039220B = "F_SP116"; +SECTION_DEAD static char const* const stringBase_80392213 = "zelda_v_cursor_new_yellow.blo"; +SECTION_DEAD static char const* const stringBase_80392231 = "zelda_v_cursor_new_yellow.bpk"; +SECTION_DEAD static char const* const stringBase_8039224F = "zelda_v_cursor_new_yellow.bck"; +SECTION_DEAD static char const* const stringBase_8039226D = "zelda_v_cursor_new_yellow_02.brk"; +SECTION_DEAD static char const* const stringBase_8039228E = "zelda_v_cursor_new_yellow.brk"; +SECTION_DEAD static char const* const stringBase_803922AC = "wl_eye_Hilight"; +SECTION_DEAD static char const* const stringBase_803922BB = "midona_eye_Hlight"; +SECTION_DEAD static char const* const stringBase_803922CD = "alSumou"; +SECTION_DEAD static char const* const stringBase_803922D5 = "bl.bmd"; +SECTION_DEAD static char const* const stringBase_803922DC = "bl_head.bmd"; +SECTION_DEAD static char const* const stringBase_803922E8 = "bl_hands.bmd"; +SECTION_DEAD static char const* const stringBase_803922F5 = "zl.bmd"; +SECTION_DEAD static char const* const stringBase_803922FC = "zl_head.bmd"; +SECTION_DEAD static char const* const stringBase_80392308 = "al_hands.bmd"; +SECTION_DEAD static char const* const stringBase_80392315 = "ml.bmd"; +SECTION_DEAD static char const* const stringBase_8039231C = "ml_head.bmd"; +SECTION_DEAD static char const* const stringBase_80392328 = "al.bmd"; +SECTION_DEAD static char const* const stringBase_8039232F = "al_head.bmd"; +SECTION_DEAD static char const* const stringBase_8039233B = "al_face.bmd"; +SECTION_DEAD static char const* const stringBase_80392347 = "zl_face.bmd"; +SECTION_DEAD static char const* const stringBase_80392353 = "al_bootsH.bmd"; +SECTION_DEAD static char const* const stringBase_80392361 = "al_kantera.bmd"; +SECTION_DEAD static char const* const stringBase_80392370 = "ef_ktGlow.bmd"; +SECTION_DEAD static char const* const stringBase_8039237E = "ef_ktGlow.btk"; +SECTION_DEAD static char const* const stringBase_8039238C = "al_SWB.bmd"; +SECTION_DEAD static char const* const stringBase_80392397 = "highlight02"; +SECTION_DEAD static char const* const stringBase_803923A3 = "F_SP200"; +SECTION_DEAD static char const* const stringBase_803923AB = "R_SP30"; +SECTION_DEAD static char const* const stringBase_803923B2 = "SMELL_1st"; +SECTION_DEAD static char const* const stringBase_803923BC = "SMELL_Child"; +SECTION_DEAD static char const* const stringBase_803923C8 = "Always"; +SECTION_DEAD static char const* const stringBase_803923CF = "demo00_Link_cut00_HL_tmp.bmd"; +SECTION_DEAD static char const* const stringBase_803923EC = "demo00_Link_cut00_HL_tmp.bck"; +SECTION_DEAD static char const* const stringBase_80392409 = "demo00_Link_cut00_HR_tmp.bmd"; +SECTION_DEAD static char const* const stringBase_80392426 = "demo00_Link_cut00_HR_tmp.bck"; +SECTION_DEAD static char const* const stringBase_80392443 = "demo00_Link_cut00_FC_blend.bmd"; +SECTION_DEAD static char const* const stringBase_80392462 = "demo00_Link_cut00_FC_tongue.bmd"; +SECTION_DEAD static char const* const stringBase_80392482 = "demo00_Link_cut00_FC_tmp.bck"; +SECTION_DEAD static char const* const stringBase_8039249F = "demo00_Link_cut00_HD_tmp.bck"; +SECTION_DEAD static char const* const stringBase_803924BC = "demo00_Link_cut00_FC_tmp.bls"; +SECTION_DEAD static char const* const stringBase_803924D9 = "F_SP118"; +SECTION_DEAD static char const* const stringBase_803924E1 = "D_MN08B"; +SECTION_DEAD static char const* const stringBase_803924E9 = "F_SP109"; +SECTION_DEAD static char const* const stringBase_803924F1 = "F_SP123"; +SECTION_DEAD static char const* const stringBase_803924F9 = "SCENE_EXIT"; +SECTION_DEAD static char const* const stringBase_80392504 = "R_SP127"; +SECTION_DEAD static char const* const stringBase_8039250C = "R_SP01"; +SECTION_DEAD static char const* const stringBase_80392513 = "D_MN08A"; +SECTION_DEAD static char const* const stringBase_8039251B = "ANGER"; +SECTION_DEAD static char const* const stringBase_80392521 = "ANGER2"; +SECTION_DEAD static char const* const stringBase_80392528 = "ml_body_power_down.brk"; +SECTION_DEAD static char const* const stringBase_8039253F = "ml_body_power_up_a.brk"; +SECTION_DEAD static char const* const stringBase_80392556 = "ml_body_power_up_b.brk"; +SECTION_DEAD static char const* const stringBase_8039256D = "ml_head_power_down.brk"; +SECTION_DEAD static char const* const stringBase_80392584 = "ml_head_power_up_a.brk"; +SECTION_DEAD static char const* const stringBase_8039259B = "ml_head_power_up_b.brk"; +#pragma pop + /* 803AF990-803AF99C 00CAB0 000C+00 4/4 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -17678,7 +17787,7 @@ asm void daAlink_c::setWindSpeed() { SECTION_RODATA static u8 const localHeadCenter[12] = { 0x00, 0x00, 0x00, 0x00, 0xC1, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80391F44, &localHeadCenter); +COMPILER_STRIP_GATE(0x80391F44, &localHeadCenter); #pragma pop /* 80391F50-80391F5C 01E5B0 000C+00 0/1 0/0 0/0 .rodata localEye$59873 */ @@ -17687,7 +17796,7 @@ COMPILER_STRIP_GATE(80391F44, &localHeadCenter); SECTION_RODATA static u8 const localEye[12] = { 0x41, 0x40, 0x00, 0x00, 0xC1, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80391F50, &localEye); +COMPILER_STRIP_GATE(0x80391F50, &localEye); #pragma pop /* 80391F5C-80391F68 01E5BC 000C+00 0/1 0/0 0/0 .rodata localHeadTop$59874 */ @@ -17696,7 +17805,7 @@ COMPILER_STRIP_GATE(80391F50, &localEye); SECTION_RODATA static u8 const localHeadTop[12] = { 0x00, 0x00, 0x00, 0x00, 0xC1, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80391F5C, &localHeadTop); +COMPILER_STRIP_GATE(0x80391F5C, &localHeadTop); #pragma pop /* 80391F68-80391F74 01E5C8 000C+00 0/1 0/0 0/0 .rodata wlLocalHeadCenter$59875 */ @@ -17705,7 +17814,7 @@ COMPILER_STRIP_GATE(80391F5C, &localHeadTop); SECTION_RODATA static u8 const wlLocalHeadCenter[12] = { 0x00, 0x00, 0x00, 0x00, 0xC0, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80391F68, &wlLocalHeadCenter); +COMPILER_STRIP_GATE(0x80391F68, &wlLocalHeadCenter); #pragma pop /* 80391F74-80391F80 01E5D4 000C+00 0/1 0/0 0/0 .rodata wlLocalEye$59876 */ @@ -17714,7 +17823,7 @@ COMPILER_STRIP_GATE(80391F68, &wlLocalHeadCenter); SECTION_RODATA static u8 const wlLocalEye[12] = { 0x41, 0xF0, 0x00, 0x00, 0xC0, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80391F74, &wlLocalEye); +COMPILER_STRIP_GATE(0x80391F74, &wlLocalEye); #pragma pop /* 80391F80-80391F8C 01E5E0 000C+00 0/1 0/0 0/0 .rodata wlLocalHeadTop$59877 */ @@ -17723,7 +17832,7 @@ COMPILER_STRIP_GATE(80391F74, &wlLocalEye); SECTION_RODATA static u8 const wlLocalHeadTop[12] = { 0x00, 0x00, 0x00, 0x00, 0xC1, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80391F80, &wlLocalHeadTop); +COMPILER_STRIP_GATE(0x80391F80, &wlLocalHeadTop); #pragma pop /* 80391F8C-80391F98 01E5EC 000C+00 0/1 0/0 0/0 .rodata localEyeFromRoot$59878 */ @@ -17732,7 +17841,7 @@ COMPILER_STRIP_GATE(80391F80, &wlLocalHeadTop); SECTION_RODATA static u8 const localEyeFromRoot[12] = { 0x00, 0x00, 0x00, 0x00, 0x42, 0x5F, 0x00, 0x00, 0x41, 0x70, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80391F8C, &localEyeFromRoot); +COMPILER_STRIP_GATE(0x80391F8C, &localEyeFromRoot); #pragma pop /* 80391F98-80391FA4 01E5F8 000C+00 0/1 0/0 0/0 .rodata boardLocalEyeFromRoot$59879 */ @@ -17741,7 +17850,7 @@ COMPILER_STRIP_GATE(80391F8C, &localEyeFromRoot); SECTION_RODATA static u8 const boardLocalEyeFromRoot[12] = { 0x41, 0x18, 0x00, 0x00, 0x42, 0x3C, 0x00, 0x00, 0x41, 0xC4, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80391F98, &boardLocalEyeFromRoot); +COMPILER_STRIP_GATE(0x80391F98, &boardLocalEyeFromRoot); #pragma pop /* 80391FA4-80391FB0 01E604 000C+00 0/1 0/0 0/0 .rodata horseLocalEyeFromRoot$59880 */ @@ -17750,7 +17859,7 @@ COMPILER_STRIP_GATE(80391F98, &boardLocalEyeFromRoot); SECTION_RODATA static u8 const horseLocalEyeFromRoot[12] = { 0x3F, 0xE0, 0x00, 0x00, 0x42, 0x5C, 0x00, 0x00, 0x41, 0xCC, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80391FA4, &horseLocalEyeFromRoot); +COMPILER_STRIP_GATE(0x80391FA4, &horseLocalEyeFromRoot); #pragma pop /* 80391FB0-80391FBC 01E610 000C+00 0/1 0/0 0/0 .rodata canoeLocalEyeFromRoot$59881 */ @@ -17759,7 +17868,7 @@ COMPILER_STRIP_GATE(80391FA4, &horseLocalEyeFromRoot); SECTION_RODATA static u8 const canoeLocalEyeFromRoot[12] = { 0x00, 0x00, 0x00, 0x00, 0x42, 0x5C, 0x00, 0x00, 0x41, 0xC8, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80391FB0, &canoeLocalEyeFromRoot); +COMPILER_STRIP_GATE(0x80391FB0, &canoeLocalEyeFromRoot); #pragma pop /* 800A8310-800A87D8 0A2C50 04C8+00 2/2 0/0 0/0 .text setBodyPartPos__9daAlink_cFv */ @@ -17789,7 +17898,7 @@ asm void daAlink_c::setRollJump(f32 param_0, f32 param_1, s16 param_2) { SECTION_RODATA static u8 const wlLocalEyeFromRoot[12] = { 0x00, 0x00, 0x00, 0x00, 0xC0, 0xC0, 0x00, 0x00, 0x42, 0xAB, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80391FBC, &wlLocalEyeFromRoot); +COMPILER_STRIP_GATE(0x80391FBC, &wlLocalEyeFromRoot); #pragma pop /* 80391FC8-80391FD4 01E628 000C+00 0/1 0/0 0/0 .rodata normalOffset$60101 */ @@ -17798,7 +17907,7 @@ COMPILER_STRIP_GATE(80391FBC, &wlLocalEyeFromRoot); SECTION_RODATA static u8 const normalOffset[12] = { 0x00, 0x00, 0x00, 0x00, 0x43, 0x16, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80391FC8, &normalOffset); +COMPILER_STRIP_GATE(0x80391FC8, &normalOffset); #pragma pop /* 80391FD4-80391FE0 01E634 000C+00 0/1 0/0 0/0 .rodata crawlOffset$60141 */ @@ -17807,7 +17916,7 @@ COMPILER_STRIP_GATE(80391FC8, &normalOffset); SECTION_RODATA static u8 const crawlOffset[12] = { 0x00, 0x00, 0x00, 0x00, 0x42, 0x20, 0x00, 0x00, 0x41, 0xF0, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80391FD4, &crawlOffset); +COMPILER_STRIP_GATE(0x80391FD4, &crawlOffset); #pragma pop /* 80391FE0-80391FEC 01E640 000C+00 0/1 0/0 0/0 .rodata crouchOffset$60142 */ @@ -17816,7 +17925,7 @@ COMPILER_STRIP_GATE(80391FD4, &crawlOffset); SECTION_RODATA static u8 const crouchOffset[12] = { 0x00, 0x00, 0x00, 0x00, 0x42, 0xBE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80391FE0, &crouchOffset); +COMPILER_STRIP_GATE(0x80391FE0, &crouchOffset); #pragma pop /* 80391FEC-80391FF8 01E64C 000C+00 0/1 0/0 0/0 .rodata swimOffset$60143 */ @@ -17825,7 +17934,7 @@ COMPILER_STRIP_GATE(80391FE0, &crouchOffset); SECTION_RODATA static u8 const swimOffset[12] = { 0x00, 0x00, 0x00, 0x00, 0x41, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80391FEC, &swimOffset); +COMPILER_STRIP_GATE(0x80391FEC, &swimOffset); #pragma pop /* 80425508-80425514 052228 000C+00 4/4 0/0 0/0 .bss @4409 */ @@ -17959,7 +18068,7 @@ asm void daAlink_c::simpleAnmPlay(J3DAnmBase* param_0) { SECTION_RODATA static u8 const swordMoveLocal0[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xBF, 0x80, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80391FF8, &swordMoveLocal0); +COMPILER_STRIP_GATE(0x80391FF8, &swordMoveLocal0); #pragma pop /* 80392004-80392010 01E664 000C+00 0/1 0/0 0/0 .rodata swordMoveLocal1$60439 */ @@ -17968,7 +18077,7 @@ COMPILER_STRIP_GATE(80391FF8, &swordMoveLocal0); SECTION_RODATA static u8 const swordMoveLocal1[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80392004, &swordMoveLocal1); +COMPILER_STRIP_GATE(0x80392004, &swordMoveLocal1); #pragma pop /* 80392010-8039201C 01E670 000C+00 0/1 0/0 0/0 .rodata copyRodTop$60447 */ @@ -17977,7 +18086,7 @@ COMPILER_STRIP_GATE(80392004, &swordMoveLocal1); SECTION_RODATA static u8 const copyRodTop[12] = { 0x41, 0xDC, 0x00, 0x00, 0xC0, 0xA0, 0x00, 0x00, 0xC1, 0x48, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80392010, ©RodTop); +COMPILER_STRIP_GATE(0x80392010, ©RodTop); #pragma pop /* 800A92F0-800A9450 0A3C30 0160+00 2/2 0/0 0/0 .text setSwordPos__9daAlink_cFv */ @@ -18036,7 +18145,7 @@ asm void daAlink_c::setItemMatrix(int param_0) { SECTION_RODATA static u8 const lit_61047[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8039201C, &lit_61047); +COMPILER_STRIP_GATE(0x8039201C, &lit_61047); /* 80453270-80453274 001870 0004+00 1/1 0/0 0/0 .sdata2 @61141 */ SECTION_SDATA2 static f32 lit_61141 = -21.0f; @@ -18134,7 +18243,7 @@ asm void daAlink_c::resetAtCollision(int param_0) { SECTION_RODATA static u8 const bottleTopPos[12] = { 0x00, 0x00, 0x00, 0x00, 0x41, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80392028, &bottleTopPos); +COMPILER_STRIP_GATE(0x80392028, &bottleTopPos); #pragma pop /* 800AAABC-800AB878 0A53FC 0DBC+00 1/1 0/0 0/0 .text setAtCollision__9daAlink_cFv */ @@ -18152,7 +18261,7 @@ asm void daAlink_c::setAtCollision() { SECTION_RODATA static u8 const localHead[12] = { 0x41, 0x70, 0x00, 0x00, 0x40, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80392034, &localHead); +COMPILER_STRIP_GATE(0x80392034, &localHead); /* 800AB878-800ABAE0 0A61B8 0268+00 1/1 0/0 0/0 .text setWolfCollisionPos__9daAlink_cFv */ @@ -20098,7 +20207,7 @@ asm void daAlink_c::setFootSpeed() { SECTION_RODATA static u8 const lit_69600[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80392040, &lit_69600); +COMPILER_STRIP_GATE(0x80392040, &lit_69600); #pragma pop /* 8039204C-80392058 01E6AC 000C+00 0/1 0/0 0/0 .rodata @69683 */ @@ -20107,7 +20216,13 @@ COMPILER_STRIP_GATE(80392040, &lit_69600); SECTION_RODATA static u8 const lit_69683[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8039204C, &lit_69683); +COMPILER_STRIP_GATE(0x8039204C, &lit_69683); +#pragma pop + +/* 80392094-80392094 01E6F4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_803925B2 = "F_SP113"; #pragma pop /* 804532C0-804532C4 0018C0 0004+00 2/2 0/0 0/0 .sdata2 @70084 */ @@ -20200,6 +20315,13 @@ asm void daAlink_c::checkRoofRestart() { } #pragma pop +/* ############################################################################################## */ +/* 80392094-80392094 01E6F4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_803925BA = "F_SP114"; +#pragma pop + /* 800BE3E4-800BE9D4 0B8D24 05F0+00 1/1 0/0 0/0 .text checkRestartRoom__9daAlink_cFv */ #pragma push #pragma optimization_level 0 @@ -20576,6 +20698,13 @@ asm void daAlink_c::checkRoomOnly() { } #pragma pop +/* ############################################################################################## */ +/* 80392094-80392094 01E6F4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_803925C2 = "D_MN04"; +#pragma pop + /* 800C044C-800C04B4 0BAD8C 0068+00 3/3 0/0 0/0 .text checkLv2DungeonRoomSpecial__9daAlink_cFv */ #pragma push #pragma optimization_level 0 @@ -20638,6 +20767,13 @@ asm void daAlink_c::checkNotAutoJumpStage() { } #pragma pop +/* ############################################################################################## */ +/* 80392094-80392094 01E6F4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_803925C9 = "R_SP128"; +#pragma pop + /* 800C0678-800C077C 0BAFB8 0104+00 3/3 0/0 0/0 .text checkCastleTownUseItem__9daAlink_cFUs */ #pragma push #pragma optimization_level 0 @@ -20686,7 +20822,7 @@ asm void daAlink_c::deleteEquipItem(int param_0, int param_1) { SECTION_RODATA static u8 const lit_71887[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80392058, &lit_71887); +COMPILER_STRIP_GATE(0x80392058, &lit_71887); #pragma pop /* 80392064-80392070 01E6C4 000C+00 0/1 0/0 0/0 .rodata @71911 */ @@ -20695,7 +20831,7 @@ COMPILER_STRIP_GATE(80392058, &lit_71887); SECTION_RODATA static u8 const lit_71911[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80392064, &lit_71911); +COMPILER_STRIP_GATE(0x80392064, &lit_71911); #pragma pop /* 804532C8-804532CC 0018C8 0004+00 1/1 0/0 0/0 .sdata2 @71910 */ @@ -21443,7 +21579,7 @@ asm void daAlink_c::procCoMetamorphoseInit() { SECTION_RODATA static u8 const lit_74273[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80392070, &lit_74273); +COMPILER_STRIP_GATE(0x80392070, &lit_74273); #pragma pop /* 804532F0-804532F4 0018F0 0004+00 1/1 0/0 0/0 .sdata2 @74385 */ @@ -21558,7 +21694,7 @@ asm void daAlink_c::procGoronRideWait() { SECTION_RODATA static u8 const lit_74748[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8039207C, &lit_74748); +COMPILER_STRIP_GATE(0x8039207C, &lit_74748); #pragma pop /* 80392088-80392094 01E6E8 000C+00 0/1 0/0 0/0 .rodata localBoomCatchPos$74910 */ @@ -21567,7 +21703,23 @@ COMPILER_STRIP_GATE(8039207C, &lit_74748); SECTION_RODATA static u8 const localBoomCatchPos[12] = { 0x41, 0x95, 0x99, 0x9A, 0x43, 0x12, 0x4C, 0xCD, 0x42, 0x8A, 0x66, 0x66, }; -COMPILER_STRIP_GATE(80392088, &localBoomCatchPos); +COMPILER_STRIP_GATE(0x80392088, &localBoomCatchPos); +#pragma pop + +/* 80392094-80392094 01E6F4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_803925D1 = "Alink"; +SECTION_DEAD static char const* const stringBase_803925D7 = "kiko_yami"; +SECTION_DEAD static char const* const stringBase_803925E1 = "fire_insect"; +SECTION_DEAD static char const* const stringBase_803925ED = "MapToolCamera19"; +SECTION_DEAD static char const* const stringBase_803925FD = "yami_mog"; +SECTION_DEAD static char const* const stringBase_80392606 = "R_SP109"; +SECTION_DEAD static char const* const stringBase_8039260E = "MapToolCamera1"; +SECTION_DEAD static char const* const stringBase_8039261D = "MapToolCamera2"; +SECTION_DEAD static char const* const stringBase_8039262C = "MapToolCamera23"; +/* @stringBase0 padding */ +SECTION_DEAD static char const* const pad_8039263C = "\0\0\0"; #pragma pop /* 800C8700-800CAFA8 0C3040 28A8+00 1/1 0/0 0/0 .text execute__9daAlink_cFv */ @@ -39280,16 +39432,11 @@ static asm void dMeter2Info_offUseButton(int param_0) { } #pragma pop -/* 80141988-80141990 13C2C8 0008+00 1/1 0/0 0/0 .text setLinkState__14Z2CreatureLinkFUc +/* 80141988-80141990 -00001 0008+00 0/0 0/0 0/0 .text setLinkState__14Z2CreatureLinkFUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void Z2CreatureLink::setLinkState(u8 param_0) { - nofralloc -#include "asm/d/a/d_a_alink/setLinkState__14Z2CreatureLinkFUc.s" +void Z2CreatureLink::setLinkState(u8 param_0) { + *(u8*)(((u8*)this) + 192) /* this->field_0xc0 */ = (u8)(param_0); } -#pragma pop /* 80141990-801419A0 13C2D0 0010+00 1/1 0/0 0/0 .text dComIfGs_getRupee__Fv */ #pragma push @@ -39389,7 +39536,8 @@ asm void daCrod_c::setControllActorData() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80141ACC(fopAc_ac_c const* param_0, daObjMovebox::Act_c::Prm_e param_1, +extern "C" asm void func_80141ACC(void* _this, fopAc_ac_c const* param_0, + daObjMovebox::Act_c::Prm_e param_1, daObjMovebox::Act_c::Prm_e param_2) { nofralloc #include "asm/d/a/d_a_alink/func_80141ACC.s" @@ -39400,7 +39548,7 @@ extern "C" asm void func_80141ACC(fopAc_ac_c const* param_0, daObjMovebox::Act_c #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80141AE8(u8* param_0) { +extern "C" asm void func_80141AE8(void* _this, u8* param_0) { nofralloc #include "asm/d/a/d_a_alink/func_80141AE8.s" } @@ -39495,7 +39643,7 @@ asm void __sinit_d_a_alink_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80141B04 = (void*)__sinit_d_a_alink_cpp; +REGISTER_CTORS(0x80141B04, __sinit_d_a_alink_cpp); #pragma pop /* 801446D4-801446DC 13F014 0008+00 1/0 0/0 0/0 .text @36@__dt__12dBgS_ObjAcchFv */ @@ -39598,130 +39746,4 @@ static asm void func_8014471C() { } #pragma pop -/* 80392094-80392640 01E6F4 05A8+04 71/68 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80392094 = "Rotary"; -SECTION_DEAD static char const* const stringBase_8039209B = "Rampart2"; -SECTION_DEAD static char const* const stringBase_803920A4 = "Allay"; -SECTION_DEAD static char const* const stringBase_803920AA = "AllayR"; -SECTION_DEAD static char const* const stringBase_803920B1 = "AllayR2"; -SECTION_DEAD static char const* const stringBase_803920B9 = "AllayS"; -SECTION_DEAD static char const* const stringBase_803920C0 = "StreetP"; -SECTION_DEAD static char const* const stringBase_803920C8 = "Street"; -SECTION_DEAD static char const* const stringBase_803920CF = "D_MN04B"; -SECTION_DEAD static char const* const stringBase_803920D7 = "Type"; -SECTION_DEAD static char const* const stringBase_803920DC = "D_MN07B"; -SECTION_DEAD static char const* const stringBase_803920E4 = "D_MN05A"; -SECTION_DEAD static char const* const stringBase_803920EC = "D_MN06A"; -SECTION_DEAD static char const* const stringBase_803920F4 = "F_SP117"; -SECTION_DEAD static char const* const stringBase_803920FC = "D_MN54"; -SECTION_DEAD static char const* const stringBase_80392103 = "F_SP103"; -SECTION_DEAD static char const* const stringBase_8039210B = "F_SP00"; -SECTION_DEAD static char const* const stringBase_80392112 = "F_SP127"; -SECTION_DEAD static char const* const stringBase_8039211A = "D_MN07A"; -SECTION_DEAD static char const* const stringBase_80392122 = "D_MN01A"; -SECTION_DEAD static char const* const stringBase_8039212A = "D_MN10"; -SECTION_DEAD static char const* const stringBase_80392131 = "D_MN10A"; -SECTION_DEAD static char const* const stringBase_80392139 = "F_SP108"; -SECTION_DEAD static char const* const stringBase_80392141 = "J_Tobi"; -SECTION_DEAD static char const* const stringBase_80392148 = "J_Umak"; -SECTION_DEAD static char const* const stringBase_8039214F = "D_MN01"; -SECTION_DEAD static char const* const stringBase_80392156 = "D_MN06"; -SECTION_DEAD static char const* const stringBase_8039215D = "D_MN05"; -SECTION_DEAD static char const* const stringBase_80392164 = "R22-opening"; -SECTION_DEAD static char const* const stringBase_80392170 = "pos"; -SECTION_DEAD static char const* const stringBase_80392174 = "angle"; -SECTION_DEAD static char const* const stringBase_8039217A = "prm0"; -SECTION_DEAD static char const* const stringBase_8039217F = "prm1"; -SECTION_DEAD static char const* const stringBase_80392184 = "stick"; -SECTION_DEAD static char const* const stringBase_8039218A = "D_MN09B"; -SECTION_DEAD static char const* const stringBase_80392192 = "D_MN05B"; -SECTION_DEAD static char const* const stringBase_8039219A = "F_SP115"; -SECTION_DEAD static char const* const stringBase_803921A2 = "D_MN11"; -SECTION_DEAD static char const* const stringBase_803921A9 = "D_MN07"; -SECTION_DEAD static char const* const stringBase_803921B0 = "F_SP102"; -SECTION_DEAD static char const* const stringBase_803921B8 = "D_MN08D"; -SECTION_DEAD static char const* const stringBase_803921C0 = "D_MN09A"; -SECTION_DEAD static char const* const stringBase_803921C8 = "D_MN08C"; -SECTION_DEAD static char const* const stringBase_803921D0 = "R_SP161"; -SECTION_DEAD static char const* const stringBase_803921D8 = "Obj_kbrg"; -SECTION_DEAD static char const* const stringBase_803921E1 = "Obj_obrg"; -SECTION_DEAD static char const* const stringBase_803921EA = "M_VolcBom"; -SECTION_DEAD static char const* const stringBase_803921F4 = "SCanCrs"; -SECTION_DEAD static char const* const stringBase_803921FC = "F_SP125"; -SECTION_DEAD static char const* const stringBase_80392204 = "D_MN08"; -SECTION_DEAD static char const* const stringBase_8039220B = "F_SP116"; -SECTION_DEAD static char const* const stringBase_80392213 = "zelda_v_cursor_new_yellow.blo"; -SECTION_DEAD static char const* const stringBase_80392231 = "zelda_v_cursor_new_yellow.bpk"; -SECTION_DEAD static char const* const stringBase_8039224F = "zelda_v_cursor_new_yellow.bck"; -SECTION_DEAD static char const* const stringBase_8039226D = "zelda_v_cursor_new_yellow_02.brk"; -SECTION_DEAD static char const* const stringBase_8039228E = "zelda_v_cursor_new_yellow.brk"; -SECTION_DEAD static char const* const stringBase_803922AC = "wl_eye_Hilight"; -SECTION_DEAD static char const* const stringBase_803922BB = "midona_eye_Hlight"; -SECTION_DEAD static char const* const stringBase_803922CD = "alSumou"; -SECTION_DEAD static char const* const stringBase_803922D5 = "bl.bmd"; -SECTION_DEAD static char const* const stringBase_803922DC = "bl_head.bmd"; -SECTION_DEAD static char const* const stringBase_803922E8 = "bl_hands.bmd"; -SECTION_DEAD static char const* const stringBase_803922F5 = "zl.bmd"; -SECTION_DEAD static char const* const stringBase_803922FC = "zl_head.bmd"; -SECTION_DEAD static char const* const stringBase_80392308 = "al_hands.bmd"; -SECTION_DEAD static char const* const stringBase_80392315 = "ml.bmd"; -SECTION_DEAD static char const* const stringBase_8039231C = "ml_head.bmd"; -SECTION_DEAD static char const* const stringBase_80392328 = "al.bmd"; -SECTION_DEAD static char const* const stringBase_8039232F = "al_head.bmd"; -SECTION_DEAD static char const* const stringBase_8039233B = "al_face.bmd"; -SECTION_DEAD static char const* const stringBase_80392347 = "zl_face.bmd"; -SECTION_DEAD static char const* const stringBase_80392353 = "al_bootsH.bmd"; -SECTION_DEAD static char const* const stringBase_80392361 = "al_kantera.bmd"; -SECTION_DEAD static char const* const stringBase_80392370 = "ef_ktGlow.bmd"; -SECTION_DEAD static char const* const stringBase_8039237E = "ef_ktGlow.btk"; -SECTION_DEAD static char const* const stringBase_8039238C = "al_SWB.bmd"; -SECTION_DEAD static char const* const stringBase_80392397 = "highlight02"; -SECTION_DEAD static char const* const stringBase_803923A3 = "F_SP200"; -SECTION_DEAD static char const* const stringBase_803923AB = "R_SP30"; -SECTION_DEAD static char const* const stringBase_803923B2 = "SMELL_1st"; -SECTION_DEAD static char const* const stringBase_803923BC = "SMELL_Child"; -SECTION_DEAD static char const* const stringBase_803923C8 = "Always"; -SECTION_DEAD static char const* const stringBase_803923CF = "demo00_Link_cut00_HL_tmp.bmd"; -SECTION_DEAD static char const* const stringBase_803923EC = "demo00_Link_cut00_HL_tmp.bck"; -SECTION_DEAD static char const* const stringBase_80392409 = "demo00_Link_cut00_HR_tmp.bmd"; -SECTION_DEAD static char const* const stringBase_80392426 = "demo00_Link_cut00_HR_tmp.bck"; -SECTION_DEAD static char const* const stringBase_80392443 = "demo00_Link_cut00_FC_blend.bmd"; -SECTION_DEAD static char const* const stringBase_80392462 = "demo00_Link_cut00_FC_tongue.bmd"; -SECTION_DEAD static char const* const stringBase_80392482 = "demo00_Link_cut00_FC_tmp.bck"; -SECTION_DEAD static char const* const stringBase_8039249F = "demo00_Link_cut00_HD_tmp.bck"; -SECTION_DEAD static char const* const stringBase_803924BC = "demo00_Link_cut00_FC_tmp.bls"; -SECTION_DEAD static char const* const stringBase_803924D9 = "F_SP118"; -SECTION_DEAD static char const* const stringBase_803924E1 = "D_MN08B"; -SECTION_DEAD static char const* const stringBase_803924E9 = "F_SP109"; -SECTION_DEAD static char const* const stringBase_803924F1 = "F_SP123"; -SECTION_DEAD static char const* const stringBase_803924F9 = "SCENE_EXIT"; -SECTION_DEAD static char const* const stringBase_80392504 = "R_SP127"; -SECTION_DEAD static char const* const stringBase_8039250C = "R_SP01"; -SECTION_DEAD static char const* const stringBase_80392513 = "D_MN08A"; -SECTION_DEAD static char const* const stringBase_8039251B = "ANGER"; -SECTION_DEAD static char const* const stringBase_80392521 = "ANGER2"; -SECTION_DEAD static char const* const stringBase_80392528 = "ml_body_power_down.brk"; -SECTION_DEAD static char const* const stringBase_8039253F = "ml_body_power_up_a.brk"; -SECTION_DEAD static char const* const stringBase_80392556 = "ml_body_power_up_b.brk"; -SECTION_DEAD static char const* const stringBase_8039256D = "ml_head_power_down.brk"; -SECTION_DEAD static char const* const stringBase_80392584 = "ml_head_power_up_a.brk"; -SECTION_DEAD static char const* const stringBase_8039259B = "ml_head_power_up_b.brk"; -SECTION_DEAD static char const* const stringBase_803925B2 = "F_SP113"; -SECTION_DEAD static char const* const stringBase_803925BA = "F_SP114"; -SECTION_DEAD static char const* const stringBase_803925C2 = "D_MN04"; -SECTION_DEAD static char const* const stringBase_803925C9 = "R_SP128"; -SECTION_DEAD static char const* const stringBase_803925D1 = "Alink"; -SECTION_DEAD static char const* const stringBase_803925D7 = "kiko_yami"; -SECTION_DEAD static char const* const stringBase_803925E1 = "fire_insect"; -SECTION_DEAD static char const* const stringBase_803925ED = "MapToolCamera19"; -SECTION_DEAD static char const* const stringBase_803925FD = "yami_mog"; -SECTION_DEAD static char const* const stringBase_80392606 = "R_SP109"; -SECTION_DEAD static char const* const stringBase_8039260E = "MapToolCamera1"; -SECTION_DEAD static char const* const stringBase_8039261D = "MapToolCamera2"; -SECTION_DEAD static char const* const stringBase_8039262C = "MapToolCamera23"; -/* @stringBase0 padding */ -SECTION_DEAD static char const* const pad_8039263C = "\0\0\0"; -#pragma pop +/* 80392094-80392094 01E6F4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/a/d_a_horse_static.cpp b/src/d/a/d_a_horse_static.cpp index 5d8fe938adb..0c655b3b694 100644 --- a/src/d/a/d_a_horse_static.cpp +++ b/src/d/a/d_a_horse_static.cpp @@ -25,10 +25,6 @@ struct daTagHstop_c { static u8 m_top[4 + 4 /* padding */]; }; -struct Z2CreatureRide { - /* 802C522C */ void setLinkRiding(bool); -}; - // // Forward References: // diff --git a/src/d/a/d_a_itembase_static.cpp b/src/d/a/d_a_itembase_static.cpp index d404c26bbb9..327104d9e2d 100644 --- a/src/d/a/d_a_itembase_static.cpp +++ b/src/d/a/d_a_itembase_static.cpp @@ -157,4 +157,4 @@ SECTION_RODATA u8 const daItemBase_c::m_data[56] = { 0x00, 0x78, 0x00, 0x00, 0xC0, 0x80, 0x00, 0x00, 0x40, 0x60, 0x00, 0x00, 0x04, 0x4C, 0x0B, 0xB8, 0x41, 0xB8, 0x00, 0x00, 0xC0, 0xC0, 0x00, 0x00, 0x00, 0x0D, 0x00, 0x0A, }; -COMPILER_STRIP_GATE(803792B0, &daItemBase_c::m_data); +COMPILER_STRIP_GATE(0x803792B0, &daItemBase_c::m_data); diff --git a/src/d/a/d_a_no_chg_room.cpp b/src/d/a/d_a_no_chg_room.cpp index 1dc920b9cd1..b412574cbd5 100644 --- a/src/d/a/d_a_no_chg_room.cpp +++ b/src/d/a/d_a_no_chg_room.cpp @@ -129,6 +129,15 @@ asm void daNocrm_c::getRoomNo(int param_0) { #pragma pop /* ############################################################################################## */ +/* 80392640-80392640 01ECA0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80392640 = + "部屋読み込み矩形：読み込みＩＤが−１ですので、自滅します！\n"; +/* @stringBase0 padding */ +SECTION_DEAD static char const* const pad_8039267C = "\0\0\0"; +#pragma pop + /* 804533CC-804533D0 0019CC 0004+00 1/1 0/0 0/0 .sdata2 @3832 */ SECTION_SDATA2 static f32 lit_3832 = 1000.0f; @@ -192,12 +201,4 @@ SECTION_DATA extern void* g_profile_NO_CHG_ROOM[12] = { (void*)0x00060000, (void*)0x05000000, }; -/* 80392640-80392680 01ECA0 003C+04 1/1 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80392640 = - "部屋読み込み矩形：読み込みＩＤが−１ですので、自滅します！\n"; -/* @stringBase0 padding */ -SECTION_DEAD static char const* const pad_8039267C = "\0\0\0"; -#pragma pop +/* 80392640-80392640 01ECA0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/a/d_a_npc.cpp b/src/d/a/d_a_npc.cpp index 78fd11c81b9..d0631ae8b87 100644 --- a/src/d/a/d_a_npc.cpp +++ b/src/d/a/d_a_npc.cpp @@ -48,13 +48,13 @@ struct mDoExt_morf_c { /* 8000FB7C */ void setMorf(f32); }; -struct J3DAnmColor {}; +struct J3DAnmTextureSRTKey {}; struct J3DAnmTexPattern {}; struct J3DAnmTevRegKey {}; -struct J3DAnmTextureSRTKey {}; +struct J3DAnmColor {}; struct J3DMaterialTable { /* 8032F64C */ void removeMatColorAnimator(J3DAnmColor*); @@ -124,18 +124,18 @@ struct dCcD_GObjInf { /* 80084460 */ void ChkTgHit(); }; -struct J3DModel {}; +struct J3DAnmTransformKey {}; struct _GXColorS10 {}; +struct J3DModel {}; + struct J3DFrameCtrl { /* 803283FC */ void init(s16); }; struct J3DJoint {}; -struct J3DAnmTransformKey {}; - struct daNpcT_c { /* 80147FA4 */ void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*); /* 80147FD4 */ void srchActor(void*, void*); @@ -612,7 +612,6 @@ struct dEvt_control_c { /* 80042518 */ void reset(void*); /* 800432EC */ void convPId(unsigned int); /* 8004368C */ void setPtT(void*); - /* 800436EC */ void setPtI_Id(unsigned int); }; struct dEvent_manager_c { @@ -909,9 +908,9 @@ extern "C" void __dt__22daNpcT_MotionSeqMngr_cFv(); extern "C" void __dt__18daNpcT_ActorMngr_cFv(); extern "C" void __dt__15daNpcT_JntAnm_cFv(); extern "C" void __dt__15daNpcT_MatAnm_cFv(); -extern "C" void func_8014D32C(s16*); -extern "C" void func_8014D348(int*); -extern "C" void func_8014D364(int, int); +extern "C" void func_8014D32C(void* _this, s16*); +extern "C" void func_8014D348(void* _this, int*); +extern "C" void func_8014D364(void* _this, int, int); extern "C" void __sinit_d_a_npc_cpp(); extern "C" static void daBaseNpc_addIdx__FiiPUsi(); extern "C" static void daBaseNpc_subIdx__FiiPUsi(); @@ -2422,6 +2421,13 @@ asm void daNpcT_c::ctrlJoint(J3DJoint* param_0, J3DModel* param_1) { } #pragma pop +/* ############################################################################################## */ +/* 80392710-80392710 01ED70 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80392710 = "DEFAULT_GETITEM"; +#pragma pop + /* 8014997C-80149BB4 1442BC 0238+00 1/0 1/0 58/0 .text evtProc__8daNpcT_cFv */ #pragma push #pragma optimization_level 0 @@ -3236,7 +3242,7 @@ asm daNpcT_MatAnm_c::~daNpcT_MatAnm_c() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_8014D32C(s16* param_0) { +extern "C" asm void func_8014D32C(void* _this, s16* param_0) { nofralloc #include "asm/d/a/d_a_npc/func_8014D32C.s" } @@ -3246,7 +3252,7 @@ extern "C" asm void func_8014D32C(s16* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_8014D348(int* param_0) { +extern "C" asm void func_8014D348(void* _this, int* param_0) { nofralloc #include "asm/d/a/d_a_npc/func_8014D348.s" } @@ -3256,7 +3262,7 @@ extern "C" asm void func_8014D348(int* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_8014D364(int param_0, int param_1) { +extern "C" asm void func_8014D364(void* _this, int param_0, int param_1) { nofralloc #include "asm/d/a/d_a_npc/func_8014D364.s" } @@ -3269,7 +3275,7 @@ SECTION_RODATA u8 const daNpcT_c::mCcDObjData[48] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x79, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80392680, &daNpcT_c::mCcDObjData); +COMPILER_STRIP_GATE(0x80392680, &daNpcT_c::mCcDObjData); /* 8014D3D8-8014D538 147D18 0160+00 0/0 1/0 0/0 .text __sinit_d_a_npc_cpp */ #pragma push @@ -3283,7 +3289,7 @@ asm void __sinit_d_a_npc_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_8014D3D8 = (void*)__sinit_d_a_npc_cpp; +REGISTER_CTORS(0x8014D3D8, __sinit_d_a_npc_cpp); #pragma pop /* 8014D538-8014D584 147E78 004C+00 2/2 0/0 0/0 .text daBaseNpc_addIdx__FiiPUsi */ @@ -3447,15 +3453,10 @@ asm void daBaseNpc_path_c::getIdx() { } #pragma pop -/* 8014DB0C-8014DB14 14844C 0008+00 0/0 0/0 1/1 .text setIdx__16daBaseNpc_path_cFUs */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daBaseNpc_path_c::setIdx(u16 param_0) { - nofralloc -#include "asm/d/a/d_a_npc/setIdx__16daBaseNpc_path_cFUs.s" +/* 8014DB0C-8014DB14 -00001 0008+00 0/0 0/0 0/0 .text setIdx__16daBaseNpc_path_cFUs */ +void daBaseNpc_path_c::setIdx(u16 param_0) { + *(u16*)(((u8*)this) + 2576) /* this->field_0xa10 */ = (u16)(param_0); } -#pragma pop /* 8014DB14-8014DB40 148454 002C+00 0/0 0/0 4/4 .text getPntPos__16daBaseNpc_path_cFUs */ #pragma push @@ -3822,8 +3823,8 @@ asm void daBaseNpc_moveBgActor_c::MoveBGCreateHeap() { #pragma optimization_level 0 #pragma optimizewithasm off asm void daBaseNpc_moveBgActor_c::MoveBGCreate(char const* param_0, int param_1, - void (*)(dBgW*, void*, cBgS_PolyInfo const&, bool, - cXyz*, csXyz*, csXyz*), + void (*param_2)(dBgW*, void*, cBgS_PolyInfo const&, + bool, cXyz*, csXyz*, csXyz*), u32 param_3) { nofralloc #include "asm/d/a/d_a_npc/MoveBGCreate__23daBaseNpc_moveBgActor_cFPCciPFP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz_vUl.s" @@ -4044,15 +4045,10 @@ asm void daNpcF_ActorMngr_c::entry(fopAc_ac_c* param_0) { } #pragma pop -/* 801506D8-801506E0 14B018 0008+00 0/0 0/0 1/1 .text entry__18daNpcF_ActorMngr_cFUi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daNpcF_ActorMngr_c::entry(unsigned int param_0) { - nofralloc -#include "asm/d/a/d_a_npc/entry__18daNpcF_ActorMngr_cFUi.s" +/* 801506D8-801506E0 -00001 0008+00 0/0 0/0 0/0 .text entry__18daNpcF_ActorMngr_cFUi */ +void daNpcF_ActorMngr_c::entry(unsigned int param_0) { + *(u32*)this = (u32)(param_0); } -#pragma pop /* 801506E0-801506EC 14B020 000C+00 2/2 0/0 55/55 .text remove__18daNpcF_ActorMngr_cFv */ #pragma push @@ -4804,8 +4800,9 @@ SECTION_SDATA2 static f32 lit_11605 = 450.0f; #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpcF_c::getAttnActorP(int param_0, void* (*)(void*, void*), f32 param_2, f32 param_3, - f32 param_4, f32 param_5, s16 param_6, int param_7, int param_8) { +asm void daNpcF_c::getAttnActorP(int param_0, void* (*param_1)(void*, void*), f32 param_2, + f32 param_3, f32 param_4, f32 param_5, s16 param_6, int param_7, + int param_8) { nofralloc #include "asm/d/a/d_a_npc/getAttnActorP__8daNpcF_cFiPFPvPv_Pvffffsii.s" } @@ -5191,7 +5188,7 @@ SECTION_RODATA u8 const daBaseNpc_c::mCcDObj[48] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x79, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(803926B0, &daBaseNpc_c::mCcDObj); +COMPILER_STRIP_GATE(0x803926B0, &daBaseNpc_c::mCcDObj); #pragma pop /* 803926E0-80392710 01ED40 0030+00 0/0 0/0 0/0 .rodata mCcDObjInfo__8daNpcF_c */ @@ -5202,57 +5199,232 @@ SECTION_RODATA u8 const daNpcF_c::mCcDObjInfo[48] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x79, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(803926E0, &daNpcF_c::mCcDObjInfo); +COMPILER_STRIP_GATE(0x803926E0, &daNpcF_c::mCcDObjInfo); +#pragma pop + +/* 80392720-80392725 01ED80 0005+00 0/0 0/0 0/0 .rodata None */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80392720 = ".bck"; +#pragma pop + +/* 80392725-8039272A 01ED85 0005+00 0/0 0/0 0/0 .rodata None */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80392725 = ".btp"; +#pragma pop + +/* 8039272A-8039272F 01ED8A 0005+00 0/0 0/0 0/0 .rodata None */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8039272A = ".btk"; +#pragma pop + +/* 8039272F-8039274A 01ED8F 001B+00 0/0 0/0 0/0 .rodata None */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8039272F = "%.3ff,\t// 注目オフセット\n"; +#pragma pop + +/* 8039274A-8039275B 01EDAA 0011+00 0/0 0/0 0/0 .rodata None */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8039274A = "%.3ff,\t// 重力\n"; +#pragma pop + +/* 8039275B-80392770 01EDBB 0015+00 0/0 0/0 0/0 .rodata None */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8039275B = "%.3ff,\t// スケ−ル\n"; +#pragma pop + +/* 80392770-8039278B 01EDD0 001B+00 0/0 0/0 0/0 .rodata None */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80392770 = "%.3ff,\t// リアル影サイズ\n"; +#pragma pop + +/* 8039278B-8039279C 01EDEB 0011+00 0/0 0/0 0/0 .rodata None */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8039278B = "%.3ff,\t// 体重\n"; +#pragma pop + +/* 8039279C-803927AD 01EDFC 0011+00 0/0 0/0 0/0 .rodata None */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8039279C = "%.3ff,\t// 高さ\n"; +#pragma pop + +/* 803927AD-803927C0 01EE0D 0013+00 0/0 0/0 0/0 .rodata None */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_803927AD = "%.3ff,\t// ひざ丈\n"; +#pragma pop + +/* 803927C0-803927CF 01EE20 000F+00 0/0 0/0 0/0 .rodata None */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_803927C0 = "%.3ff,\t// 幅\n"; +#pragma pop + +/* 803927CF-803927E8 01EE2F 0019+00 0/0 0/0 0/0 .rodata None */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_803927CF = "%.3ff,\t// 腰のＸ角上限\n"; +#pragma pop + +/* 803927E8-80392801 01EE48 0019+00 0/0 0/0 0/0 .rodata None */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_803927E8 = "%.3ff,\t// 腰のＸ角下限\n"; +#pragma pop + +/* 80392801-8039281A 01EE61 0019+00 0/0 0/0 0/0 .rodata None */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80392801 = "%.3ff,\t// 腰のＹ角上限\n"; +#pragma pop + +/* 8039281A-80392833 01EE7A 0019+00 0/0 0/0 0/0 .rodata None */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8039281A = "%.3ff,\t// 腰のＹ角下限\n"; +#pragma pop + +/* 80392833-8039284C 01EE93 0019+00 0/0 0/0 0/0 .rodata None */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80392833 = "%.3ff,\t// 頭のＸ角上限\n"; +#pragma pop + +/* 8039284C-80392865 01EEAC 0019+00 0/0 0/0 0/0 .rodata None */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8039284C = "%.3ff,\t// 頭のＸ角下限\n"; +#pragma pop + +/* 80392865-8039287E 01EEC5 0019+00 0/0 0/0 0/0 .rodata None */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80392865 = "%.3ff,\t// 頭のＹ角上限\n"; +#pragma pop + +/* 8039287E-80392897 01EEDE 0019+00 0/0 0/0 0/0 .rodata None */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8039287E = "%.3ff,\t// 頭のＹ角下限\n"; +#pragma pop + +/* 80392897-803928B0 01EEF7 0019+00 0/0 0/0 0/0 .rodata None */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80392897 = "%.3ff,\t// 首の回転比率\n"; +#pragma pop + +/* 803928B0-803928C9 01EF10 0019+00 0/0 0/0 0/0 .rodata None */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_803928B0 = "%.3ff,\t// 補間フレ−ム\n"; +#pragma pop + +/* 803928C9-803928DE 01EF29 0015+00 0/0 0/0 0/0 .rodata None */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_803928C9 = "%d, \t// 会話距離\n"; +#pragma pop + +/* 803928DE-803928F3 01EF3E 0015+00 0/0 0/0 0/0 .rodata None */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_803928DE = "%d, \t// 会話角度\n"; +#pragma pop + +/* 803928F3-80392908 01EF53 0015+00 0/0 0/0 0/0 .rodata None */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_803928F3 = "%d, \t// 注目距離\n"; +#pragma pop + +/* 80392908-8039291D 01EF68 0015+00 0/0 0/0 0/0 .rodata None */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80392908 = "%d, \t// 注目角度\n"; +#pragma pop + +/* 8039291D-8039292E 01EF7D 0011+00 0/0 0/0 0/0 .rodata None */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8039291D = "%.3ff,\t// 視界\n"; +#pragma pop + +/* 8039292E-80392945 01EF8E 0017+00 0/0 0/0 0/0 .rodata None */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8039292E = "%.3ff,\t// サ−チ距離\n"; +#pragma pop + +/* 80392945-8039295C 01EFA5 0017+00 0/0 0/0 0/0 .rodata None */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80392945 = "%.3ff,\t// サ−チ高さ\n"; +#pragma pop + +/* 8039295C-80392973 01EFBC 0017+00 0/0 0/0 0/0 .rodata None */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8039295C = "%.3ff,\t// サ−チ低さ\n"; +#pragma pop + +/* 80392973-80392988 01EFD3 0015+00 0/0 0/0 0/0 .rodata None */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80392973 = "%d, \t// 注目時間\n"; +#pragma pop + +/* 80392988-803929A1 01EFE8 0019+00 0/0 0/0 0/0 .rodata None */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80392988 = "%d, \t// ダメ−ジ期間\n"; +#pragma pop + +/* 803929A1-803929B2 01F001 0011+00 0/0 0/0 0/0 .rodata None */ +#pragma push +#pragma force_active on +// MWCC ignores mapping of some japanese characters using the +// byte 0x5C (ASCII '\'). This is why this string is hex-encoded. +SECTION_DEAD static char const* const stringBase_803929A1 = + "\x25\x64\x2C\x20\x20\x20\x09\x2F\x2F\x20\x20\x95\x5C\x8F\xEE\x0A"; +#pragma pop + +/* 803929B2-803929C3 01F012 0011+00 0/0 0/0 0/0 .rodata None */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_803929B2 = "%d, \t// 動作\n"; +#pragma pop + +/* 803929C3-803929DA 01F023 0017+00 0/0 0/0 0/0 .rodata None */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_803929C3 = "%d, \t// 注視モ−ド\n"; +#pragma pop + +/* 803929DA-803929F7 01F03A 001D+00 0/0 0/0 0/0 .rodata None */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_803929DA = "%d, \t// デバグモ−ドＯＮ\n"; +#pragma pop + +/* 803929F7-80392A18 01F057 001B+06 0/0 0/0 0/0 .rodata None */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_803929F7 = "%d, \t// デバグ情報ＯＮ\n"; +/* @stringBase0 padding */ +SECTION_DEAD static char const* const pad_80392A12 = "\0\0\0\0\0"; #pragma pop /* 80450FF8-80451000 0004F8 0008+00 0/0 1/1 0/0 .sbss None */ extern u8 data_80450FF8[8]; u8 data_80450FF8[8]; -/* 80392710-80392A18 01ED70 0302+06 1/1 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80392710 = "DEFAULT_GETITEM"; -SECTION_DEAD static char const* const stringBase_80392720 = ".bck"; -SECTION_DEAD static char const* const stringBase_80392725 = ".btp"; -SECTION_DEAD static char const* const stringBase_8039272A = ".btk"; -SECTION_DEAD static char const* const stringBase_8039272F = "%.3ff,\t// 注目オフセット\n"; -SECTION_DEAD static char const* const stringBase_8039274A = "%.3ff,\t// 重力\n"; -SECTION_DEAD static char const* const stringBase_8039275B = "%.3ff,\t// スケ−ル\n"; -SECTION_DEAD static char const* const stringBase_80392770 = "%.3ff,\t// リアル影サイズ\n"; -SECTION_DEAD static char const* const stringBase_8039278B = "%.3ff,\t// 体重\n"; -SECTION_DEAD static char const* const stringBase_8039279C = "%.3ff,\t// 高さ\n"; -SECTION_DEAD static char const* const stringBase_803927AD = "%.3ff,\t// ひざ丈\n"; -SECTION_DEAD static char const* const stringBase_803927C0 = "%.3ff,\t// 幅\n"; -SECTION_DEAD static char const* const stringBase_803927CF = "%.3ff,\t// 腰のＸ角上限\n"; -SECTION_DEAD static char const* const stringBase_803927E8 = "%.3ff,\t// 腰のＸ角下限\n"; -SECTION_DEAD static char const* const stringBase_80392801 = "%.3ff,\t// 腰のＹ角上限\n"; -SECTION_DEAD static char const* const stringBase_8039281A = "%.3ff,\t// 腰のＹ角下限\n"; -SECTION_DEAD static char const* const stringBase_80392833 = "%.3ff,\t// 頭のＸ角上限\n"; -SECTION_DEAD static char const* const stringBase_8039284C = "%.3ff,\t// 頭のＸ角下限\n"; -SECTION_DEAD static char const* const stringBase_80392865 = "%.3ff,\t// 頭のＹ角上限\n"; -SECTION_DEAD static char const* const stringBase_8039287E = "%.3ff,\t// 頭のＹ角下限\n"; -SECTION_DEAD static char const* const stringBase_80392897 = "%.3ff,\t// 首の回転比率\n"; -SECTION_DEAD static char const* const stringBase_803928B0 = "%.3ff,\t// 補間フレ−ム\n"; -SECTION_DEAD static char const* const stringBase_803928C9 = "%d, \t// 会話距離\n"; -SECTION_DEAD static char const* const stringBase_803928DE = "%d, \t// 会話角度\n"; -SECTION_DEAD static char const* const stringBase_803928F3 = "%d, \t// 注目距離\n"; -SECTION_DEAD static char const* const stringBase_80392908 = "%d, \t// 注目角度\n"; -SECTION_DEAD static char const* const stringBase_8039291D = "%.3ff,\t// 視界\n"; -SECTION_DEAD static char const* const stringBase_8039292E = "%.3ff,\t// サ−チ距離\n"; -SECTION_DEAD static char const* const stringBase_80392945 = "%.3ff,\t// サ−チ高さ\n"; -SECTION_DEAD static char const* const stringBase_8039295C = "%.3ff,\t// サ−チ低さ\n"; -SECTION_DEAD static char const* const stringBase_80392973 = "%d, \t// 注目時間\n"; -SECTION_DEAD static char const* const stringBase_80392988 = "%d, \t// ダメ−ジ期間\n"; -// MWCC ignores mapping of some japanese characters using the -// byte 0x5C (ASCII '\'). This is why this string is hex-encoded. -SECTION_DEAD static char const* const stringBase_803929A1 = - "\x25\x64\x2C\x20\x20\x20\x09\x2F\x2F\x20\x20\x95\x5C\x8F\xEE\x0A"; -SECTION_DEAD static char const* const stringBase_803929B2 = "%d, \t// 動作\n"; -SECTION_DEAD static char const* const stringBase_803929C3 = "%d, \t// 注視モ−ド\n"; -SECTION_DEAD static char const* const stringBase_803929DA = "%d, \t// デバグモ−ドＯＮ\n"; -SECTION_DEAD static char const* const stringBase_803929F7 = "%d, \t// デバグ情報ＯＮ\n"; -/* @stringBase0 padding */ -SECTION_DEAD static char const* const pad_80392A12 = "\0\0\0\0\0"; -#pragma pop +/* 80392710-80392710 01ED70 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/a/d_a_obj.cpp b/src/d/a/d_a_obj.cpp index 654b963f0d8..3f57f806591 100644 --- a/src/d/a/d_a_obj.cpp +++ b/src/d/a/d_a_obj.cpp @@ -71,10 +71,10 @@ struct dPa_modelEcallBack { struct dPa_levelEcallBack {}; -struct _GXColor {}; - struct csXyz {}; +struct _GXColor {}; + struct dPa_control_c { /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, @@ -181,6 +181,14 @@ extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; // /* ############################################################################################## */ +/* 803792A8-803792A8 005908 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_803792A8 = "Always"; +/* @stringBase0 padding */ +SECTION_DEAD static char const* const pad_803792AF = ""; +#pragma pop + /* 80451D98-80451D9C 000398 0004+00 6/6 0/0 0/0 .sdata2 @3671 */ SECTION_SDATA2 static f32 lit_3671 = 1.0f; @@ -339,7 +347,7 @@ SECTION_RODATA static f32 const zero_quat[4] = { 0.0f, 1.0f, }; -COMPILER_STRIP_GATE(80379298, &zero_quat); +COMPILER_STRIP_GATE(0x80379298, &zero_quat); /* 80451DA8-80451DB0 0003A8 0004+04 1/1 0/0 0/0 .sdata2 @3956 */ SECTION_SDATA2 static f32 lit_3956[1 + 1 /* padding */] = { @@ -391,11 +399,4 @@ asm void cCcD_SphAttr::GetCoCP() { } #pragma pop -/* 803792A8-803792B0 005908 0007+01 1/1 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_803792A8 = "Always"; -/* @stringBase0 padding */ -SECTION_DEAD static char const* const pad_803792AF = ""; -#pragma pop +/* 803792A8-803792A8 005908 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/a/d_a_player.cpp b/src/d/a/d_a_player.cpp index 326d6eb412a..a45287152f3 100644 --- a/src/d/a/d_a_player.cpp +++ b/src/d/a/d_a_player.cpp @@ -378,7 +378,7 @@ asm void daPy_boomerangMove_c::initOffset(cXyz const* param_0) { #pragma pop /* ############################################################################################## */ -/* 80451018-8045101C 000518 0004+00 2/2 33/33 103/103 .sbss m_midnaActor__9daPy_py_c */ +/* 80451018-8045101C 000518 0004+00 2/2 33/32 103/103 .sbss m_midnaActor__9daPy_py_c */ u8 daPy_py_c::m_midnaActor[4]; /* 8045101C-80451020 -00001 0004+00 1/1 1/1 1/1 .sbss None */ @@ -668,7 +668,7 @@ SECTION_RODATA static u8 const twglArcName[10 + 2 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80393DA8, &twglArcName); +COMPILER_STRIP_GATE(0x80393DA8, &twglArcName); /* 80393DB4-80393DC0 020414 000A+02 1/0 0/0 0/0 .rodata twgwArcName$4617 */ SECTION_RODATA static u8 const twgwArcName[10 + 2 /* padding */] = { @@ -686,7 +686,7 @@ SECTION_RODATA static u8 const twgwArcName[10 + 2 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80393DB4, &twgwArcName); +COMPILER_STRIP_GATE(0x80393DB4, &twgwArcName); /* 803BA0A0-803BA0C0 -00001 0020+00 1/1 0/0 0/0 .data arcName$4622 */ SECTION_DATA static void* arcName[8] = { diff --git a/src/d/a/d_a_shop_item_static.cpp b/src/d/a/d_a_shop_item_static.cpp index f4a78fbf6be..1141dced96b 100644 --- a/src/d/a/d_a_shop_item_static.cpp +++ b/src/d/a/d_a_shop_item_static.cpp @@ -65,6 +65,66 @@ asm void daShopItem_c::getPosP() { #pragma pop /* ############################################################################################## */ +/* 80379738-80379742 005D98 000A+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80379738; + +/* 80379742-8037974B 005DA2 0009+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80379742; + +/* 8037974B-80379754 005DAB 0009+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_8037974B; + +/* 80379754-8037975E 005DB4 000A+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80379754; + +/* 8037975E-80379768 005DBE 000A+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_8037975E; + +/* 80379768-80379771 005DC8 0009+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80379768; + +/* 80379771-8037977A 005DD1 0009+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80379771; + +/* 8037977A-80379783 005DDA 0009+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_8037977A; + +/* 80379783-8037978D 005DE3 000A+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80379783; + +/* 8037978D-80379795 005DED 0008+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_8037978D; + +/* 80379795-8037979D 005DF5 0008+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_80379795; + +/* 8037979D-803797A7 005DFD 000A+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_8037979D; + +/* 803797A7-803797B1 005E07 000A+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803797A7; + +/* 803797B1-803797BB 005E11 000A+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803797B1; + +/* 803797BB-803797C5 005E1B 000A+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803797BB; + +/* 803797C5-803797CF 005E25 000A+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803797C5; + +/* 803797CF-803797D9 005E2F 000A+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803797CF; + +/* 803797D9-803797E3 005E39 000A+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803797D9; + +/* 803797E3-803797ED 005E43 000A+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803797E3; + +/* 803797ED-803797F8 005E4D 000A+01 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_803797ED; + /* 803792E8-80379738 -00001 0450+00 1/1 0/0 9/9 .rodata mData__12daShopItem_c */ SECTION_RODATA void* const daShopItem_c::mData[276] = { (void*)&d_a_d_a_shop_item_static__stringBase0, @@ -344,22 +404,11 @@ SECTION_RODATA void* const daShopItem_c::mData[276] = { (void*)0x0000000C, (void*)NULL, }; -COMPILER_STRIP_GATE(803792E8, &daShopItem_c::mData); +COMPILER_STRIP_GATE(0x803792E8, &daShopItem_c::mData); -/* 80037C24-80037C7C 032564 0058+00 0/0 0/0 1/1 .text CheckShopItemCreateHeap__FP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void CheckShopItemCreateHeap(fopAc_ac_c* param_0) { - nofralloc -#include "asm/d/a/d_a_shop_item_static/CheckShopItemCreateHeap__FP10fopAc_ac_c.s" -} -#pragma pop - -/* 80379738-803797F8 005D98 00BF+01 1/0 0/0 0/0 .rodata @stringBase0 */ +/* 80379738-80379738 005D98 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ #pragma push #pragma force_active on -#pragma section ".dead" SECTION_DEAD static char const* const stringBase_80379738 = "B_mD_sold"; SECTION_DEAD static char const* const stringBase_80379742 = "B_mD_oil"; SECTION_DEAD static char const* const stringBase_8037974B = "O_mD_red"; @@ -383,3 +432,15 @@ SECTION_DEAD static char const* const stringBase_803797ED = "O_mD_gren"; /* @stringBase0 padding */ SECTION_DEAD static char const* const pad_803797F7 = ""; #pragma pop + +/* 80037C24-80037C7C 032564 0058+00 0/0 0/0 1/1 .text CheckShopItemCreateHeap__FP10fopAc_ac_c */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void CheckShopItemCreateHeap(fopAc_ac_c* param_0) { + nofralloc +#include "asm/d/a/d_a_shop_item_static/CheckShopItemCreateHeap__FP10fopAc_ac_c.s" +} +#pragma pop + +/* 80379738-80379738 005D98 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/bg/d_bg_plc.cpp b/src/d/bg/d_bg_plc.cpp index 5d23c3ba0af..040eadba3f9 100644 --- a/src/d/bg/d_bg_plc.cpp +++ b/src/d/bg/d_bg_plc.cpp @@ -61,15 +61,10 @@ asm dBgPlc::~dBgPlc() { } #pragma pop -/* 800740BC-800740C4 06E9FC 0008+00 0/0 1/1 0/0 .text setBase__6dBgPlcFPv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dBgPlc::setBase(void* param_0) { - nofralloc -#include "asm/d/bg/d_bg_plc/setBase__6dBgPlcFPv.s" +/* 800740BC-800740C4 -00001 0008+00 0/0 0/0 0/0 .text setBase__6dBgPlcFPv */ +void dBgPlc::setBase(void* param_0) { + *(u32*)this = (u32)(param_0); } -#pragma pop /* 800740C4-800740DC 06EA04 0018+00 0/0 1/1 0/0 .text getCode__6dBgPlcCFiPP5sBgPc */ #pragma push diff --git a/src/d/bg/d_bg_s.cpp b/src/d/bg/d_bg_s.cpp index 0693c4c7170..cc972c76f12 100644 --- a/src/d/bg/d_bg_s.cpp +++ b/src/d/bg/d_bg_s.cpp @@ -38,8 +38,6 @@ struct dBgS_Acch { /* 8007732C */ void CalcWallRR(); }; -struct cXyz {}; - struct cBgS_PolyInfo { /* 802680F8 */ void ChkSetInfo() const; /* 80268120 */ void ClearPi(); @@ -50,6 +48,8 @@ struct cBgS_PolyInfo { struct csXyz {}; +struct cXyz {}; + struct dBgS { /* 80030C50 */ ~dBgS(); /* 800748FC */ void Ct(); @@ -96,7 +96,6 @@ struct dBgS { struct cM3dGPla {}; struct cBgW_BgId { - /* 802681C0 */ void Regist(int); /* 802681C8 */ void Release(); /* 802681D4 */ void ChkUsed() const; }; @@ -520,15 +519,10 @@ asm void dBgS::Regist(dBgW_Base* param_0, fopAc_ac_c* param_1) { } #pragma pop -/* 80074AB4-80074ABC 06F3F4 0008+00 0/0 5/0 0/0 .text SetOldShapeAngleY__9dBgW_BaseFs */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dBgW_Base::SetOldShapeAngleY(s16 param_0) { - nofralloc -#include "asm/d/bg/d_bg_s/SetOldShapeAngleY__9dBgW_BaseFs.s" +/* 80074AB4-80074ABC -00001 0008+00 0/0 0/0 0/0 .text SetOldShapeAngleY__9dBgW_BaseFs */ +void dBgW_Base::SetOldShapeAngleY(s16 param_0) { + *(u16*)(((u8*)this) + 12) /* this->field_0xc */ = (u16)(param_0); } -#pragma pop /* 80074ABC-80074B40 06F3FC 0084+00 0/0 11/11 5/5 .text ChkMoveBG__4dBgSFRC13cBgS_PolyInfo */ #pragma push diff --git a/src/d/bg/d_bg_s_acch.cpp b/src/d/bg/d_bg_s_acch.cpp index 6eac516fdaf..30c4606e6c8 100644 --- a/src/d/bg/d_bg_s_acch.cpp +++ b/src/d/bg/d_bg_s_acch.cpp @@ -60,6 +60,8 @@ struct dBgS_AcchCir { /* 80077414 */ ~dBgS_AcchCir(); }; +struct csXyz {}; + struct Vec {}; struct cBgS_PolyInfo { @@ -67,12 +69,9 @@ struct cBgS_PolyInfo { /* 802680B0 */ ~cBgS_PolyInfo(); /* 80268120 */ void ClearPi(); /* 8026816C */ void SetActorInfo(int, void*, unsigned int); - /* 802681A4 */ void SetPolyIndex(int); }; struct dBgS_Acch; -struct csXyz {}; - struct dBgS { /* 8007524C */ void WallCorrect(dBgS_Acch*); /* 80075374 */ void WallCorrectSort(dBgS_Acch*); diff --git a/src/d/bg/d_bg_s_movebg_actor.cpp b/src/d/bg/d_bg_s_movebg_actor.cpp index 1ad08611e64..b1c69762f7d 100644 --- a/src/d/bg/d_bg_s_movebg_actor.cpp +++ b/src/d/bg/d_bg_s_movebg_actor.cpp @@ -233,8 +233,8 @@ asm void dBgS_MoveBgActor::MoveBGCreateHeap() { #pragma optimization_level 0 #pragma optimizewithasm off asm void dBgS_MoveBgActor::MoveBGCreate(char const* param_0, int param_1, - void (*)(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, - csXyz*, csXyz*), + void (*param_2)(dBgW*, void*, cBgS_PolyInfo const&, bool, + cXyz*, csXyz*, csXyz*), u32 param_3, f32 (*param_4)[3][4]) { nofralloc #include "asm/d/bg/d_bg_s_movebg_actor/func_800787BC.s" diff --git a/src/d/bg/d_bg_w.cpp b/src/d/bg/d_bg_w.cpp index e708e29d659..8d2acb60024 100644 --- a/src/d/bg/d_bg_w.cpp +++ b/src/d/bg/d_bg_w.cpp @@ -16,29 +16,22 @@ struct fopAc_ac_c {}; struct cXyz {}; struct dBgW_Base { - /* 80074AB4 */ void SetOldShapeAngleY(s16); /* 8007E5A8 */ dBgW_Base(); /* 8007E640 */ ~dBgW_Base(); /* 8007E6D8 */ void CallRideCallBack(fopAc_ac_c*, fopAc_ac_c*); /* 8007E6DC */ void CallArrowStickCallBack(fopAc_ac_c*, fopAc_ac_c*, cXyz&); }; -struct dBgS_SphChk {}; +struct cBgS_PolyInfo {}; -struct dBgS_SplGrpChk {}; +struct csXyz {}; + +struct cBgS_GrpPassChk {}; struct cBgS_PolyPassChk {}; struct dBgS_CaptPoly {}; -struct cM3dGPla { - /* 8026F57C */ void getCrossY(cXyz const&, f32*) const; -}; - -struct cBgS_PolyInfo { - /* 802681A4 */ void SetPolyIndex(int); -}; - struct Vec {}; struct dBgS_Acch { @@ -48,11 +41,15 @@ struct dBgS_Acch { /* 800772E8 */ void CalcMovePosWork(); }; -struct cBgS_GrpPassChk {}; +struct dBgS_SphChk {}; struct dBgS_RoofChk {}; -struct csXyz {}; +struct cM3dGPla { + /* 8026F57C */ void getCrossY(cXyz const&, f32*) const; +}; + +struct dBgS_SplGrpChk {}; struct dBgW { /* 8007B3AC */ void GetExitId(cBgS_PolyInfo const&); @@ -174,14 +171,14 @@ struct cBgW_GrpElm { /* 8007A1E4 */ cBgW_GrpElm(); }; -struct cBgS_GndChk {}; - -struct cBgD_t {}; - struct cBgS_ShdwDraw {}; struct cBgS_LinChk {}; +struct cBgS_GndChk {}; + +struct cBgD_t {}; + struct cBgW { /* 80079294 */ cBgW(); /* 8007933C */ ~cBgW(); diff --git a/src/d/bg/d_bg_w_base.cpp b/src/d/bg/d_bg_w_base.cpp index a2a20f17590..26e43d321c1 100644 --- a/src/d/bg/d_bg_w_base.cpp +++ b/src/d/bg/d_bg_w_base.cpp @@ -16,7 +16,6 @@ struct fopAc_ac_c {}; struct cXyz {}; struct dBgW_Base { - /* 80074AB4 */ void SetOldShapeAngleY(s16); /* 8007E5A8 */ dBgW_Base(); /* 8007E640 */ ~dBgW_Base(); /* 8007E69C */ void ClrDBgWBase(); diff --git a/src/d/bg/d_bg_w_kcol.cpp b/src/d/bg/d_bg_w_kcol.cpp index 53533d9d2b8..95d80bcf468 100644 --- a/src/d/bg/d_bg_w_kcol.cpp +++ b/src/d/bg/d_bg_w_kcol.cpp @@ -18,7 +18,6 @@ struct fopAc_ac_c {}; struct cXyz {}; struct dBgW_Base { - /* 80074AB4 */ void SetOldShapeAngleY(s16); /* 8007E5A8 */ dBgW_Base(); /* 8007E640 */ ~dBgW_Base(); /* 8007E69C */ void ClrDBgWBase(); @@ -27,16 +26,18 @@ struct dBgW_Base { /* 8007E6DC */ void CallArrowStickCallBack(fopAc_ac_c*, fopAc_ac_c*, cXyz&); }; -struct dBgS_CaptPoly {}; +struct cBgS_PolyInfo {}; -struct cBgS_GndChk {}; +struct csXyz {}; + +struct cBgS_ShdwDraw {}; + +struct dBgPc { + /* 80074048 */ void setCode(sBgPc&); +}; struct Vec {}; -struct KC_PrismData {}; - -struct dBgS_RoofChk {}; - struct dBgS_Acch { /* 800771E4 */ void GetSpeedY(); /* 80077200 */ void GetWallAddY(Vec&); @@ -44,27 +45,23 @@ struct dBgS_Acch { /* 800772E8 */ void CalcMovePosWork(); }; -struct csXyz {}; +struct dBgS_SphChk {}; -struct dBgPc { - /* 80074048 */ void setCode(sBgPc&); -}; - -struct cBgS_PolyPassChk {}; +struct dBgS_CaptPoly {}; struct dBgS_SplGrpChk {}; -struct cBgS_PolyInfo { - /* 802681A4 */ void SetPolyIndex(int); -}; - -struct cBgS_LinChk {}; - -struct cBgS_ShdwDraw {}; +struct KC_PrismData {}; struct cBgS_GrpPassChk {}; -struct dBgS_SphChk {}; +struct cBgS_LinChk {}; + +struct cBgS_GndChk {}; + +struct dBgS_RoofChk {}; + +struct cBgS_PolyPassChk {}; struct dBgWKCol { /* 8007E6F4 */ dBgWKCol(); @@ -140,7 +137,6 @@ struct dBgS_PolyPassChk { struct dBgPlc { /* 80074074 */ dBgPlc(); /* 80074080 */ ~dBgPlc(); - /* 800740BC */ void setBase(void*); /* 800740C4 */ void getCode(int, sBgPc**) const; /* 800740DC */ void getGrpCode(int) const; }; diff --git a/src/d/bg/d_bg_w_sv.cpp b/src/d/bg/d_bg_w_sv.cpp index 09689feddd6..60cb5d055b6 100644 --- a/src/d/bg/d_bg_w_sv.cpp +++ b/src/d/bg/d_bg_w_sv.cpp @@ -13,17 +13,13 @@ struct fopAc_ac_c {}; -struct dBgW_Base { - /* 80074AB4 */ void SetOldShapeAngleY(s16); -}; +struct cBgD_t {}; struct cBgS_PolyInfo {}; -struct cXyz {}; - struct csXyz {}; -struct cBgD_t {}; +struct cXyz {}; struct dBgWSv { /* 80082F98 */ void Set(cBgD_t*, u32); @@ -36,20 +32,20 @@ struct dBgWSv { /* 800835DC */ ~dBgWSv(); }; -struct dBgS_SphChk {}; - -struct dBgS_SplGrpChk {}; +struct cBgS_GrpPassChk {}; struct cBgS_PolyPassChk {}; -struct dBgS_CaptPoly {}; +struct dBgS_SplGrpChk {}; struct dBgS_Acch {}; -struct cBgS_GrpPassChk {}; +struct dBgS_SphChk {}; struct dBgS_RoofChk {}; +struct dBgS_CaptPoly {}; + struct dBgW { /* 8007B3AC */ void GetExitId(cBgS_PolyInfo const&); /* 8007B3D8 */ void GetPolyColor(cBgS_PolyInfo const&); @@ -96,12 +92,12 @@ struct dBgW { /* 8007E4B4 */ void ChkMoveFlag() const; }; +struct cBgS_ShdwDraw {}; + struct cBgS_LinChk {}; struct cBgS_GndChk {}; -struct cBgS_ShdwDraw {}; - struct cBgW { /* 8007933C */ ~cBgW(); /* 80079564 */ void CalcPlane(); diff --git a/src/d/cc/d_cc_d.cpp b/src/d/cc/d_cc_d.cpp index 4843edd98e6..b5830240b9f 100644 --- a/src/d/cc/d_cc_d.cpp +++ b/src/d/cc/d_cc_d.cpp @@ -157,10 +157,6 @@ struct cM3dGCps { /* 8026F03C */ void Set(cM3dGCpsS const&); }; -struct cCcD_AabAttr {}; - -struct cCcD_PntAttr {}; - struct cCcD_ShapeAttr { struct Shape {}; @@ -171,9 +167,13 @@ struct cCcD_ShapeAttr { static f32 m_virtual_center[3]; }; -struct cCcD_CpsAttr; struct cCcD_TriAttr; +struct cCcD_PntAttr {}; + +struct cCcD_AabAttr {}; + struct cCcD_SphAttr; +struct cCcD_CpsAttr; struct cCcD_CylAttr { /* 80084CC0 */ void GetCoCP() const; /* 80037A4C */ void GetCoCP(); @@ -196,6 +196,25 @@ struct cCcD_CylAttr { /* 802644B8 */ void getShapeAccess(cCcD_ShapeAttr::Shape*) const; }; +struct cCcD_CpsAttr { + /* 80263DC0 */ void CrossAtTg(cCcD_SphAttr const&, cXyz*) const; + /* 80084FE4 */ void CrossAtTg(cCcD_ShapeAttr const&, cXyz*) const; + /* 80263E04 */ void CrossAtTg(cCcD_TriAttr const&, cXyz*) const; + /* 80263D7C */ void CrossAtTg(cCcD_CylAttr const&, cXyz*) const; + /* 80084FD4 */ bool CrossAtTg(cCcD_AabAttr const&, cXyz*) const; + /* 80263D38 */ void CrossAtTg(cCcD_CpsAttr const&, cXyz*) const; + /* 80084FDC */ bool CrossAtTg(cCcD_PntAttr const&, cXyz*) const; + /* 80085024 */ bool CrossCo(cCcD_TriAttr const&, f32*) const; + /* 80263F24 */ void CrossCo(cCcD_CylAttr const&, f32*) const; + /* 8008502C */ bool CrossCo(cCcD_PntAttr const&, f32*) const; + /* 8008501C */ bool CrossCo(cCcD_AabAttr const&, f32*) const; + /* 80085034 */ void CrossCo(cCcD_ShapeAttr const&, f32*) const; + /* 80263ED4 */ void CrossCo(cCcD_CpsAttr const&, f32*) const; + /* 80263F74 */ void CrossCo(cCcD_SphAttr const&, f32*) const; + /* 80263FC4 */ void CalcAabBox(); + /* 80264014 */ void GetNVec(cXyz const&, cXyz*) const; +}; + struct cCcD_SphAttr { /* 80084B44 */ void GetCoCP() const; /* 80037A54 */ void GetCoCP(); @@ -218,25 +237,6 @@ struct cCcD_SphAttr { /* 80264808 */ void getShapeAccess(cCcD_ShapeAttr::Shape*) const; }; -struct cCcD_CpsAttr { - /* 80263DC0 */ void CrossAtTg(cCcD_SphAttr const&, cXyz*) const; - /* 80084FE4 */ void CrossAtTg(cCcD_ShapeAttr const&, cXyz*) const; - /* 80263E04 */ void CrossAtTg(cCcD_TriAttr const&, cXyz*) const; - /* 80263D7C */ void CrossAtTg(cCcD_CylAttr const&, cXyz*) const; - /* 80084FD4 */ bool CrossAtTg(cCcD_AabAttr const&, cXyz*) const; - /* 80263D38 */ void CrossAtTg(cCcD_CpsAttr const&, cXyz*) const; - /* 80084FDC */ bool CrossAtTg(cCcD_PntAttr const&, cXyz*) const; - /* 80085024 */ bool CrossCo(cCcD_TriAttr const&, f32*) const; - /* 80263F24 */ void CrossCo(cCcD_CylAttr const&, f32*) const; - /* 8008502C */ bool CrossCo(cCcD_PntAttr const&, f32*) const; - /* 8008501C */ bool CrossCo(cCcD_AabAttr const&, f32*) const; - /* 80085034 */ void CrossCo(cCcD_ShapeAttr const&, f32*) const; - /* 80263ED4 */ void CrossCo(cCcD_CpsAttr const&, f32*) const; - /* 80263F74 */ void CrossCo(cCcD_SphAttr const&, f32*) const; - /* 80263FC4 */ void CalcAabBox(); - /* 80264014 */ void GetNVec(cXyz const&, cXyz*) const; -}; - struct cCcD_TriAttr { /* 80084E44 */ bool CrossAtTg(cCcD_AabAttr const&, cXyz*) const; /* 80263A88 */ void CrossAtTg(cCcD_CpsAttr const&, cXyz*) const; @@ -1281,7 +1281,7 @@ SECTION_RODATA u8 const dCcD_GObjInf::m_hitSeID[96] = { 0x00, 0x04, 0x00, 0x10, 0x00, 0x04, 0x00, 0x11, 0x00, 0x04, 0x00, 0x12, 0x00, 0x04, 0x00, 0x13, 0x00, 0x04, 0x00, 0x14, 0x00, 0x04, 0x00, 0x15, 0x00, 0x04, 0x00, 0x18, 0x00, 0x04, 0x00, 0x16, }; -COMPILER_STRIP_GATE(8037A780, &dCcD_GObjInf::m_hitSeID); +COMPILER_STRIP_GATE(0x8037A780, &dCcD_GObjInf::m_hitSeID); /* 800845B0-8008460C 07EEF0 005C+00 0/0 3/3 32/32 .text getHitSeID__12dCcD_GObjInfFUci */ #pragma push diff --git a/src/d/cc/d_cc_mass_s.cpp b/src/d/cc/d_cc_mass_s.cpp index 8ce1532a939..769d615c954 100644 --- a/src/d/cc/d_cc_mass_s.cpp +++ b/src/d/cc/d_cc_mass_s.cpp @@ -13,10 +13,10 @@ struct fopAc_ac_c {}; -struct cCcD_Obj {}; - struct cXyz {}; +struct cCcD_Obj {}; + struct dCcMassS_Obj { /* 800300F4 */ ~dCcMassS_Obj(); /* 800852E0 */ void Set(cCcD_Obj*, u8, void (*)(fopAc_ac_c*, cXyz*, u32)); @@ -24,18 +24,18 @@ struct dCcMassS_Obj { /* 800855C8 */ dCcMassS_Obj(); }; -struct dCcMassS_HitInf { - /* 80085334 */ void ClearPointer(); -}; - -struct Vec {}; - struct cM3dGCps { /* 8026EF88 */ cM3dGCps(); /* 8026EFA4 */ ~cM3dGCps(); /* 8026F080 */ void SetCps(cM3dGCps const&); }; +struct Vec {}; + +struct dCcMassS_HitInf { + /* 80085334 */ void ClearPointer(); +}; + struct dCcMassS_Mng { /* 80085350 */ dCcMassS_Mng(); /* 800855E4 */ void Ct(); @@ -161,7 +161,8 @@ extern "C" extern f32 G_CM3D_F_ABS_MIN[1 + 1 /* padding */]; #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dCcMassS_Obj::Set(cCcD_Obj* param_0, u8 param_1, void (*)(fopAc_ac_c*, cXyz*, u32)) { +asm void dCcMassS_Obj::Set(cCcD_Obj* param_0, u8 param_1, + void (*param_2)(fopAc_ac_c*, cXyz*, u32)) { nofralloc #include "asm/d/cc/d_cc_mass_s/Set__12dCcMassS_ObjFP8cCcD_ObjUcPFP10fopAc_ac_cP4cXyzUl_v.s" } diff --git a/src/d/cc/d_cc_s.cpp b/src/d/cc/d_cc_s.cpp index 41aca84bcae..eb8135f5bf5 100644 --- a/src/d/cc/d_cc_s.cpp +++ b/src/d/cc/d_cc_s.cpp @@ -33,28 +33,28 @@ struct dJntCol_c { /* 80036C44 */ void getHitmarkPosAndAngle(cXyz const*, csXyz const*, cXyz*, csXyz*, int) const; }; -struct cCcD_Stts { - /* 80263934 */ void PlusCcMove(f32, f32, f32); - /* 80263970 */ void PlusDmg(int); -}; - struct dCcD_GObjInf { /* 800843DC */ void ChkAtNoGuard(); }; -struct cCcD_GStts {}; - -struct dCcD_GStts {}; +struct cCcD_GObjInf {}; struct cCcD_ShapeAttr { struct Shape {}; }; +struct cCcD_Stts { + /* 80263934 */ void PlusCcMove(f32, f32, f32); + /* 80263970 */ void PlusDmg(int); +}; + +struct cCcD_GStts {}; + struct cCcD_Obj { /* 80263A48 */ void GetAc(); }; -struct cCcD_GObjInf {}; +struct dCcD_GStts {}; struct dCcS { /* 8002FF40 */ ~dCcS(); diff --git a/src/d/com/d_com_inf_game.cpp b/src/d/com/d_com_inf_game.cpp index c796fd5de4a..15108336287 100644 --- a/src/d/com/d_com_inf_game.cpp +++ b/src/d/com/d_com_inf_game.cpp @@ -193,10 +193,10 @@ struct dStage_nextStage_c { /* 80023E28 */ void set(char const*, s8, s16, s8, s8, u8); }; -struct J3DModelData {}; - struct J3DModel {}; +struct J3DModelData {}; + struct dSmplMdl_draw_c { /* 80048CB4 */ dSmplMdl_draw_c(); /* 80048E0C */ void draw(); @@ -849,15 +849,10 @@ asm void dComIfG_play_c::clearItemBombNumCount(u8 param_0) { } #pragma pop -/* 8002B3A8-8002B3B0 025CE8 0008+00 0/0 2/2 0/0 .text setNowVibration__14dComIfG_play_cFUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dComIfG_play_c::setNowVibration(u8 param_0) { - nofralloc -#include "asm/d/com/d_com_inf_game/setNowVibration__14dComIfG_play_cFUc.s" +/* 8002B3A8-8002B3B0 -00001 0008+00 0/0 0/0 0/0 .text setNowVibration__14dComIfG_play_cFUc */ +void dComIfG_play_c::setNowVibration(u8 param_0) { + *(u8*)(((u8*)this) + 20314) /* this->field_0x4f5a */ = (u8)(param_0); } -#pragma pop /* 8002B3B0-8002B3B8 025CF0 0008+00 0/0 2/2 0/0 .text getNowVibration__14dComIfG_play_cFv */ @@ -891,6 +886,46 @@ static asm void dComIfG_get_timelayer(int* param_0) { } #pragma pop +/* ############################################################################################## */ +/* 80378F38-80378F38 005598 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80378F38 = "D_MN11"; +SECTION_DEAD static char const* const stringBase_80378F3F = "F_SP114"; +SECTION_DEAD static char const* const stringBase_80378F47 = "F_SP108"; +SECTION_DEAD static char const* const stringBase_80378F4F = "R_SP108"; +SECTION_DEAD static char const* const stringBase_80378F57 = "F_SP109"; +SECTION_DEAD static char const* const stringBase_80378F5F = "F_SP111"; +SECTION_DEAD static char const* const stringBase_80378F67 = "R_SP109"; +SECTION_DEAD static char const* const stringBase_80378F6F = "R_SP209"; +SECTION_DEAD static char const* const stringBase_80378F77 = "F_SP110"; +SECTION_DEAD static char const* const stringBase_80378F7F = "R_SP110"; +SECTION_DEAD static char const* const stringBase_80378F87 = "F_SP115"; +SECTION_DEAD static char const* const stringBase_80378F8F = "F_SP116"; +SECTION_DEAD static char const* const stringBase_80378F97 = "R_SP116"; +SECTION_DEAD static char const* const stringBase_80378F9F = "R_SP115"; +SECTION_DEAD static char const* const stringBase_80378FA7 = "F_SP113"; +SECTION_DEAD static char const* const stringBase_80378FAF = "F_SP126"; +SECTION_DEAD static char const* const stringBase_80378FB7 = "F_SP124"; +SECTION_DEAD static char const* const stringBase_80378FBF = "F_SP112"; +SECTION_DEAD static char const* const stringBase_80378FC7 = "F_SP103"; +SECTION_DEAD static char const* const stringBase_80378FCF = "R_SP01"; +SECTION_DEAD static char const* const stringBase_80378FD6 = "F_SP104"; +SECTION_DEAD static char const* const stringBase_80378FDE = "F_SP00"; +SECTION_DEAD static char const* const stringBase_80378FE5 = "F_SP121"; +SECTION_DEAD static char const* const stringBase_80378FED = "F_SP122"; +SECTION_DEAD static char const* const stringBase_80378FF5 = "F_SP128"; +SECTION_DEAD static char const* const stringBase_80378FFD = "R_SP160"; +SECTION_DEAD static char const* const stringBase_80379005 = "F_SP117"; +SECTION_DEAD static char const* const stringBase_8037900D = "F_SP118"; +SECTION_DEAD static char const* const stringBase_80379015 = "D_SB10"; +SECTION_DEAD static char const* const stringBase_8037901C = "R_SP107"; +SECTION_DEAD static char const* const stringBase_80379024 = "D_MN09"; +SECTION_DEAD static char const* const stringBase_8037902B = "F_SP127"; +SECTION_DEAD static char const* const stringBase_80379033 = "R_SP127"; +SECTION_DEAD static char const* const stringBase_8037903B = "D_MN08A"; +#pragma pop + /* 8002B434-8002C950 025D74 151C+00 1/1 1/1 0/0 .text * getLayerNo_common_common__14dComIfG_play_cFPCcii */ #pragma push @@ -998,15 +1033,10 @@ asm void dComIfG_play_c::entrySimpleModel(J3DModel* param_0, int param_1) { } #pragma pop -/* 8002CB94-8002CB9C 0274D4 0008+00 0/0 4/4 0/0 .text setTimerNowTimeMs__14dComIfG_play_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dComIfG_play_c::setTimerNowTimeMs(int param_0) { - nofralloc -#include "asm/d/com/d_com_inf_game/setTimerNowTimeMs__14dComIfG_play_cFi.s" +/* 8002CB94-8002CB9C -00001 0008+00 0/0 0/0 0/0 .text setTimerNowTimeMs__14dComIfG_play_cFi */ +void dComIfG_play_c::setTimerNowTimeMs(int param_0) { + *(u32*)(((u8*)this) + 20476) /* this->field_0x4ffc */ = (u32)(param_0); } -#pragma pop /* 8002CB9C-8002CBA4 0274DC 0008+00 0/0 2/2 3/3 .text getTimerNowTimeMs__14dComIfG_play_cFv */ #pragma push @@ -1018,15 +1048,10 @@ asm void dComIfG_play_c::getTimerNowTimeMs() { } #pragma pop -/* 8002CBA4-8002CBAC 0274E4 0008+00 0/0 3/3 0/0 .text setTimerLimitTimeMs__14dComIfG_play_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dComIfG_play_c::setTimerLimitTimeMs(int param_0) { - nofralloc -#include "asm/d/com/d_com_inf_game/setTimerLimitTimeMs__14dComIfG_play_cFi.s" +/* 8002CBA4-8002CBAC -00001 0008+00 0/0 0/0 0/0 .text setTimerLimitTimeMs__14dComIfG_play_cFi */ +void dComIfG_play_c::setTimerLimitTimeMs(int param_0) { + *(u32*)(((u8*)this) + 20480) /* this->field_0x5000 */ = (u32)(param_0); } -#pragma pop /* 8002CBAC-8002CBB4 0274EC 0008+00 0/0 1/1 0/0 .text getTimerLimitTimeMs__14dComIfG_play_cFv */ #pragma push @@ -1038,15 +1063,10 @@ asm void dComIfG_play_c::getTimerLimitTimeMs() { } #pragma pop -/* 8002CBB4-8002CBBC 0274F4 0008+00 0/0 3/3 0/0 .text setTimerMode__14dComIfG_play_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dComIfG_play_c::setTimerMode(int param_0) { - nofralloc -#include "asm/d/com/d_com_inf_game/setTimerMode__14dComIfG_play_cFi.s" +/* 8002CBB4-8002CBBC -00001 0008+00 0/0 0/0 0/0 .text setTimerMode__14dComIfG_play_cFi */ +void dComIfG_play_c::setTimerMode(int param_0) { + *(u32*)(((u8*)this) + 20484) /* this->field_0x5004 */ = (u32)(param_0); } -#pragma pop /* 8002CBBC-8002CBC4 0274FC 0008+00 6/6 8/8 7/7 .text getTimerMode__14dComIfG_play_cFv */ #pragma push @@ -1058,16 +1078,11 @@ asm void dComIfG_play_c::getTimerMode() { } #pragma pop -/* 8002CBC4-8002CBCC 027504 0008+00 0/0 1/1 0/0 .text setTimerType__14dComIfG_play_cFUc +/* 8002CBC4-8002CBCC -00001 0008+00 0/0 0/0 0/0 .text setTimerType__14dComIfG_play_cFUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dComIfG_play_c::setTimerType(u8 param_0) { - nofralloc -#include "asm/d/com/d_com_inf_game/setTimerType__14dComIfG_play_cFUc.s" +void dComIfG_play_c::setTimerType(u8 param_0) { + *(u8*)(((u8*)this) + 20488) /* this->field_0x5008 */ = (u8)(param_0); } -#pragma pop /* 8002CBCC-8002CBD4 02750C 0008+00 0/0 1/1 0/0 .text getTimerType__14dComIfG_play_cFv */ #pragma push @@ -1079,15 +1094,10 @@ asm void dComIfG_play_c::getTimerType() { } #pragma pop -/* 8002CBD4-8002CBDC 027514 0008+00 0/0 2/2 0/0 .text setTimerPtr__14dComIfG_play_cFP8dTimer_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dComIfG_play_c::setTimerPtr(dTimer_c* param_0) { - nofralloc -#include "asm/d/com/d_com_inf_game/setTimerPtr__14dComIfG_play_cFP8dTimer_c.s" +/* 8002CBD4-8002CBDC -00001 0008+00 0/0 0/0 0/0 .text setTimerPtr__14dComIfG_play_cFP8dTimer_c */ +void dComIfG_play_c::setTimerPtr(dTimer_c* param_0) { + *(u32*)(((u8*)this) + 20472) /* this->field_0x4ff8 */ = (u32)(param_0); } -#pragma pop /* 8002CBDC-8002CBE4 02751C 0008+00 6/6 7/7 15/15 .text getTimerPtr__14dComIfG_play_cFv */ @@ -1111,6 +1121,12 @@ asm void dComIfG_inf_c::ct() { #pragma pop /* ############################################################################################## */ +/* 80378F38-80378F38 005598 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80379043 = "F_SP102"; +#pragma pop + /* 80450600-80450604 000080 0004+00 0/0 18/18 2/2 .sdata g_clearColor */ SECTION_SDATA extern u8 g_clearColor[4] = { 0x00, @@ -1143,6 +1159,14 @@ asm void dComIfG_resetToOpening(scene_class* param_0) { } #pragma pop +/* ############################################################################################## */ +/* 80378F38-80378F38 005598 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8037904B = "/res/Object/"; +SECTION_DEAD static char const* const stringBase_80379058 = "%s.arc Read Error !!\n"; +#pragma pop + /* 8002CDB8-8002CE38 0276F8 0080+00 1/0 0/0 0/0 .text phase_1__FPc */ #pragma push #pragma optimization_level 0 @@ -1153,6 +1177,13 @@ static asm void phase_1(char* param_0) { } #pragma pop +/* ############################################################################################## */ +/* 80378F38-80378F38 005598 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8037906E = "%s.arc Sync Read Error !!\n"; +#pragma pop + /* 8002CE38-8002CEB4 027778 007C+00 1/0 0/0 0/0 .text phase_2__FPc */ #pragma push #pragma optimization_level 0 @@ -1299,6 +1330,13 @@ asm void dComIfGp_getRoomArrow(int param_0) { } #pragma pop +/* ############################################################################################## */ +/* 80378F38-80378F38 005598 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80379089 = ""; +#pragma pop + /* 8002D2FC-8002D554 027C3C 0258+00 2/2 7/7 4/4 .text dComIfGp_setNextStage__FPCcsScScfUliScsii */ #pragma push #pragma optimization_level 0 @@ -1812,6 +1850,12 @@ asm void dComIfG_getTrigA(u32 param_0) { #pragma pop /* ############################################################################################## */ +/* 80378F38-80378F38 005598 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8037908A = "dat/field.dat"; +#pragma pop + /* 80451D18-80451D1C 000318 0004+00 1/1 0/0 0/0 .sdata2 @6980 */ SECTION_SDATA2 static f32 lit_6980 = -90300.0f; @@ -2035,6 +2079,13 @@ asm void dComIfG_resLoader_c::load(char const** param_0, JKRHeap* param_1) { } #pragma pop +/* ############################################################################################## */ +/* 80378F38-80378F38 005598 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80379098 = "Stg_00"; +#pragma pop + /* 8002F434-8002F478 029D74 0044+00 0/0 12/12 12/12 .text dComIfG_getStageRes__FPCc */ #pragma push #pragma optimization_level 0 @@ -2045,6 +2096,13 @@ asm void dComIfG_getStageRes(char const* param_0) { } #pragma pop +/* ############################################################################################## */ +/* 80378F38-80378F38 005598 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8037909F = "Xtg_00"; +#pragma pop + /* 8002F478-8002F4BC 029DB8 0044+00 0/0 1/1 0/0 .text dComIfG_getOldStageRes__FPCc */ #pragma push #pragma optimization_level 0 @@ -2056,6 +2114,14 @@ asm void dComIfG_getOldStageRes(char const* param_0) { #pragma pop /* ############################################################################################## */ +/* 80378F38-80378F38 005598 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_803790A6 = "R%02d_00"; +/* @stringBase0 padding */ +SECTION_DEAD static char const* const pad_803790AF = ""; +#pragma pop + /* 80423FD0-80423FF0 050CF0 0020+00 1/1 0/0 0/0 .bss buf$7371 */ static u8 buf[32]; @@ -2285,7 +2351,7 @@ asm void dComIfGp_TransportWarp_check() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dComLbG_PhaseHandler(request_of_phase_process_class* param_0, int (**)(void*), +asm void dComLbG_PhaseHandler(request_of_phase_process_class* param_0, int (**param_1)(void*), void* param_2) { nofralloc #include "asm/d/com/d_com_inf_game/dComLbG_PhaseHandler__FP30request_of_phase_process_classPPFPv_iPv.s" @@ -2354,7 +2420,7 @@ asm void __sinit_d_com_inf_game_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_8002FD18 = (void*)__sinit_d_com_inf_game_cpp; +REGISTER_CTORS(0x8002FD18, __sinit_d_com_inf_game_cpp); #pragma pop /* 8002FD74-8002FDE8 02A6B4 0074+00 1/1 0/0 0/0 .text __dt__13dComIfG_inf_cFv */ @@ -2774,53 +2840,4 @@ SECTION_SDATA extern u32 g_whiteColor = 0xFFFFFFFF; /* 8045060C-80450610 00008C 0004+00 0/0 3/3 3/3 .sdata g_saftyWhiteColor */ SECTION_SDATA extern u32 g_saftyWhiteColor = 0xA0A0A0FF; -/* 80378F38-803790B0 005598 0177+01 12/12 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80378F38 = "D_MN11"; -SECTION_DEAD static char const* const stringBase_80378F3F = "F_SP114"; -SECTION_DEAD static char const* const stringBase_80378F47 = "F_SP108"; -SECTION_DEAD static char const* const stringBase_80378F4F = "R_SP108"; -SECTION_DEAD static char const* const stringBase_80378F57 = "F_SP109"; -SECTION_DEAD static char const* const stringBase_80378F5F = "F_SP111"; -SECTION_DEAD static char const* const stringBase_80378F67 = "R_SP109"; -SECTION_DEAD static char const* const stringBase_80378F6F = "R_SP209"; -SECTION_DEAD static char const* const stringBase_80378F77 = "F_SP110"; -SECTION_DEAD static char const* const stringBase_80378F7F = "R_SP110"; -SECTION_DEAD static char const* const stringBase_80378F87 = "F_SP115"; -SECTION_DEAD static char const* const stringBase_80378F8F = "F_SP116"; -SECTION_DEAD static char const* const stringBase_80378F97 = "R_SP116"; -SECTION_DEAD static char const* const stringBase_80378F9F = "R_SP115"; -SECTION_DEAD static char const* const stringBase_80378FA7 = "F_SP113"; -SECTION_DEAD static char const* const stringBase_80378FAF = "F_SP126"; -SECTION_DEAD static char const* const stringBase_80378FB7 = "F_SP124"; -SECTION_DEAD static char const* const stringBase_80378FBF = "F_SP112"; -SECTION_DEAD static char const* const stringBase_80378FC7 = "F_SP103"; -SECTION_DEAD static char const* const stringBase_80378FCF = "R_SP01"; -SECTION_DEAD static char const* const stringBase_80378FD6 = "F_SP104"; -SECTION_DEAD static char const* const stringBase_80378FDE = "F_SP00"; -SECTION_DEAD static char const* const stringBase_80378FE5 = "F_SP121"; -SECTION_DEAD static char const* const stringBase_80378FED = "F_SP122"; -SECTION_DEAD static char const* const stringBase_80378FF5 = "F_SP128"; -SECTION_DEAD static char const* const stringBase_80378FFD = "R_SP160"; -SECTION_DEAD static char const* const stringBase_80379005 = "F_SP117"; -SECTION_DEAD static char const* const stringBase_8037900D = "F_SP118"; -SECTION_DEAD static char const* const stringBase_80379015 = "D_SB10"; -SECTION_DEAD static char const* const stringBase_8037901C = "R_SP107"; -SECTION_DEAD static char const* const stringBase_80379024 = "D_MN09"; -SECTION_DEAD static char const* const stringBase_8037902B = "F_SP127"; -SECTION_DEAD static char const* const stringBase_80379033 = "R_SP127"; -SECTION_DEAD static char const* const stringBase_8037903B = "D_MN08A"; -SECTION_DEAD static char const* const stringBase_80379043 = "F_SP102"; -SECTION_DEAD static char const* const stringBase_8037904B = "/res/Object/"; -SECTION_DEAD static char const* const stringBase_80379058 = "%s.arc Read Error !!\n"; -SECTION_DEAD static char const* const stringBase_8037906E = "%s.arc Sync Read Error !!\n"; -SECTION_DEAD static char const* const stringBase_80379089 = ""; -SECTION_DEAD static char const* const stringBase_8037908A = "dat/field.dat"; -SECTION_DEAD static char const* const stringBase_80379098 = "Stg_00"; -SECTION_DEAD static char const* const stringBase_8037909F = "Xtg_00"; -SECTION_DEAD static char const* const stringBase_803790A6 = "R%02d_00"; -/* @stringBase0 padding */ -SECTION_DEAD static char const* const pad_803790AF = ""; -#pragma pop +/* 80378F38-80378F38 005598 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/com/d_com_static.cpp b/src/d/com/d_com_static.cpp index c63ecb82ac3..27327c3133a 100644 --- a/src/d/com/d_com_static.cpp +++ b/src/d/com/d_com_static.cpp @@ -454,6 +454,13 @@ asm void daNpcMsg_setEvtNum(u8 param_0) { } #pragma pop +/* ############################################################################################## */ +/* 803790B0-803790B0 005710 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_803790B0 = "F_SP103"; +#pragma pop + /* 80031648-800316A8 02BF88 0060+00 0/0 0/0 6/6 .text daNpcKakashi_chkSwdTutorialStage__Fv */ #pragma push #pragma optimization_level 0 @@ -536,6 +543,12 @@ asm void daNpcKakashi_clrSuccessCount() { #pragma pop /* ############################################################################################## */ +/* 803790B0-803790B0 005710 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_803790B8 = "@bg%04x"; +#pragma pop + /* 80450D8C-80450D90 -00001 0004+00 0/0 1/1 3/3 .sbss None */ /* 80450D8C 0001+00 data_80450D8C None */ /* 80450D8D 0001+00 data_80450D8D None */ @@ -923,7 +936,7 @@ asm void __sinit_d_com_static_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80031DC4 = (void*)__sinit_d_com_static_cpp; +REGISTER_CTORS(0x80031DC4, __sinit_d_com_static_cpp); #pragma pop /* 80031EAC-80031EE4 02C7EC 0038+00 1/1 0/0 0/0 .text __arraydtor$4479 */ @@ -983,10 +996,4 @@ asm daSus_c::data_c::data_c() { static u8 pad_80450DD1[4]; #pragma pop -/* 803790B0-803790C0 005710 0010+00 2/2 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_803790B0 = "F_SP103"; -SECTION_DEAD static char const* const stringBase_803790B8 = "@bg%04x"; -#pragma pop +/* 803790B0-803790B0 005710 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/d_attention.cpp b/src/d/d_attention.cpp index d6b8a008d3b..8da86e4662d 100644 --- a/src/d/d_attention.cpp +++ b/src/d/d_attention.cpp @@ -393,6 +393,12 @@ static asm void func_80070018() { #pragma pop /* ############################################################################################## */ +/* 8037A770-8037A770 006DD0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8037A770 = "D_MN09B"; +#pragma pop + /* 803A9BF8-803A9C04 006D18 000C+00 2/2 0/0 0/0 .data loc_type_tbl__12dAttention_c */ SECTION_DATA u8 dAttention_c::loc_type_tbl[12] = { 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x02, 0x00, 0x02, 0x00, 0x04, @@ -536,6 +542,14 @@ asm void dAttDraw_CallBack_c::execute(u16 param_0, J3DTransformInfo* param_1) { #pragma pop /* ############################################################################################## */ +/* 8037A770-8037A770 006DD0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8037A778 = "Always"; +/* @stringBase0 padding */ +SECTION_DEAD static char const* const pad_8037A77F = ""; +#pragma pop + /* 80424B00-80424B0C 051820 000C+00 1/1 0/0 0/0 .bss @4093 */ static u8 lit_4093[12]; @@ -1300,7 +1314,7 @@ asm void __sinit_d_attention_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_8007400C = (void*)__sinit_d_attention_cpp; +REGISTER_CTORS(0x8007400C, __sinit_d_attention_cpp); #pragma pop /* ############################################################################################## */ @@ -1325,12 +1339,4 @@ SECTION_SDATA extern u8 data_80450688[8] = { 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -/* 8037A770-8037A780 006DD0 000F+01 2/2 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_8037A770 = "D_MN09B"; -SECTION_DEAD static char const* const stringBase_8037A778 = "Always"; -/* @stringBase0 padding */ -SECTION_DEAD static char const* const pad_8037A77F = ""; -#pragma pop +/* 8037A770-8037A770 006DD0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/d_bright_check.cpp b/src/d/d_bright_check.cpp index 36ede837a98..3c5249ac944 100644 --- a/src/d/d_bright_check.cpp +++ b/src/d/d_bright_check.cpp @@ -43,10 +43,10 @@ struct dBrightCheck_c { /* 80193594 */ void _draw(); }; -struct Vec {}; - struct JAISoundID {}; +struct Vec {}; + struct Z2SeMgr { /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); }; @@ -190,7 +190,7 @@ SECTION_RODATA static u8 const tv_btnA[40] = { 0x74, 0x32, 0x63, 0x6F, 0x6E, 0x74, 0x5F, 0x61, 0x74, 0x33, 0x63, 0x6F, 0x6E, 0x74, 0x5F, 0x61, 0x74, 0x34, 0x00, 0x63, 0x6F, 0x6E, 0x74, 0x5F, 0x61, 0x74, }; -COMPILER_STRIP_GATE(80394910, &tv_btnA); +COMPILER_STRIP_GATE(0x80394910, &tv_btnA); /* 80394938-80394960 020F98 0028+00 0/1 0/0 0/0 .rodata ftv_btnA$3745 */ #pragma push @@ -200,7 +200,7 @@ SECTION_RODATA static u8 const ftv_btnA[40] = { 0x74, 0x32, 0x66, 0x6F, 0x6E, 0x74, 0x5F, 0x61, 0x74, 0x33, 0x66, 0x6F, 0x6E, 0x74, 0x5F, 0x61, 0x74, 0x34, 0x00, 0x66, 0x6F, 0x6E, 0x74, 0x5F, 0x61, 0x74, }; -COMPILER_STRIP_GATE(80394938, &ftv_btnA); +COMPILER_STRIP_GATE(0x80394938, &ftv_btnA); #pragma pop /* 80394960-803949B0 020FC0 0050+00 0/1 0/0 0/0 .rodata txTV$3751 */ @@ -213,7 +213,7 @@ SECTION_RODATA static u8 const txTV[80] = { 0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x37, 0x31, 0x00, 0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x33, 0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x38, 0x31, 0x00, 0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x34, }; -COMPILER_STRIP_GATE(80394960, &txTV); +COMPILER_STRIP_GATE(0x80394960, &txTV); #pragma pop /* 803949B0-803949D8 021010 0028+00 0/1 0/0 0/0 .rodata txTVhide$3752 */ @@ -224,7 +224,14 @@ SECTION_RODATA static u8 const txTVhide[40] = { 0x39, 0x6E, 0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x31, 0x30, 0x6E, 0x00, 0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x37, 0x6E, 0x00, 0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x38, 0x6E, }; -COMPILER_STRIP_GATE(803949B0, &txTVhide); +COMPILER_STRIP_GATE(0x803949B0, &txTVhide); +#pragma pop + +/* 803949D8-803949D8 021038 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_803949D8 = "zelda_option_check.blo"; +SECTION_DEAD static char const* const stringBase_803949EF = ""; #pragma pop /* 80453A00-80453A04 002000 0004+00 2/2 0/0 0/0 .sdata2 @3792 */ @@ -313,7 +320,7 @@ asm void __sinit_d_bright_check_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80193608 = (void*)__sinit_d_bright_check_cpp; +REGISTER_CTORS(0x80193608, __sinit_d_bright_check_cpp); #pragma pop /* 80193648-80193690 18DF88 0048+00 1/0 0/0 0/0 .text __dt__19dDlst_BrightCheck_cFv */ @@ -326,10 +333,4 @@ asm dDlst_BrightCheck_c::~dDlst_BrightCheck_c() { } #pragma pop -/* 803949D8-803949F0 021038 0018+00 1/1 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_803949D8 = "zelda_option_check.blo"; -SECTION_DEAD static char const* const stringBase_803949EF = ""; -#pragma pop +/* 803949D8-803949D8 021038 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/d_cam_param.cpp b/src/d/d_cam_param.cpp index 911c64f294b..8568d2c812a 100644 --- a/src/d/d_cam_param.cpp +++ b/src/d/d_cam_param.cpp @@ -311,6 +311,15 @@ asm dCamBGChk_c::dCamBGChk_c() { } #pragma pop +/* ############################################################################################## */ +/* 8037A7E0-8037A7E0 006E40 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8037A7E0 = "camstyle.dat"; +/* @stringBase0 padding */ +SECTION_DEAD static char const* const pad_8037A7ED = "\0\0"; +#pragma pop + /* 800884F0-8008858C 082E30 009C+00 0/0 1/1 0/0 .text __ct__11dCamParam_cFl */ #pragma push #pragma optimization_level 0 @@ -475,11 +484,4 @@ asm dCstick_c::~dCstick_c() { } #pragma pop -/* 8037A7E0-8037A7F0 006E40 000D+03 1/1 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_8037A7E0 = "camstyle.dat"; -/* @stringBase0 padding */ -SECTION_DEAD static char const* const pad_8037A7ED = "\0\0"; -#pragma pop +/* 8037A7E0-8037A7E0 006E40 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/d_camera.cpp b/src/d/d_camera.cpp index c6512cc0f7f..55949c71f9d 100644 --- a/src/d/d_camera.cpp +++ b/src/d/d_camera.cpp @@ -91,7 +91,7 @@ struct daPy_py_c { /* 80182A10 */ void checkGoronSideMove() const; /* 80182AAC */ void getRightFootPosP(); /* 80182AB4 */ void getLeftFootPosP(); - /* 80182ABC */ void getMidnaActor(); + /* 80182ABC */ u32 getMidnaActor(); /* 80182AC4 */ void checkCopyRodThrowAfter() const; /* 80182AD8 */ void checkRide() const; /* 80182B9C */ void getRightHandPos() const; @@ -206,15 +206,8 @@ struct dCcMassS_Mng { /* 80085EB8 */ void GetCamTopPos(Vec*); }; -struct camera_class {}; - -struct dCamMapToolData { - /* 8015FEB8 */ void Set(s32, s32, fopAc_ac_c*, u16, u8); -}; - struct cSAngle { /* 80030510 */ ~cSAngle(); - /* 80271004 */ void Val(s16); /* 8027100C */ void Val(f32); /* 8016C2CC */ void Val() const; /* 80270FF8 */ void Val(cSAngle const&); @@ -249,6 +242,12 @@ struct cSAngle { static u8 _270[2 + 6 /* padding */]; }; +struct dCamMapToolData { + /* 8015FEB8 */ void Set(s32, s32, fopAc_ac_c*, u16, u8); +}; + +struct camera_class {}; + struct dBgS_LinChk { /* 80077D64 */ void Set(cXyz const*, cXyz const*, fopAc_ac_c const*); }; @@ -852,7 +851,7 @@ extern "C" bool __lt__7cSAngleCFRC7cSAngle(); extern "C" bool __gt__7cSAngleCFRC7cSAngle(); extern "C" void getRightFootPosP__9daPy_py_cFv(); extern "C" void getLeftFootPosP__9daPy_py_cFv(); -extern "C" void getMidnaActor__9daPy_py_cFv(); +extern "C" u32 getMidnaActor__9daPy_py_cFv(); extern "C" void checkCopyRodThrowAfter__9daPy_py_cCFv(); extern "C" void keepLock__12dAttention_cFi(); extern "C" void checkRide__9daPy_py_cCFv(); @@ -1296,6 +1295,111 @@ asm void dCamMapToolData::Set(s32 param_0, s32 param_1, fopAc_ac_c* param_2, u16 #pragma pop /* ############################################################################################## */ +/* 80393F68-80393F68 0205C8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80393F68 = "camtype.dat"; +SECTION_DEAD static char const* const stringBase_80393F74 = "D_MN01A"; +SECTION_DEAD static char const* const stringBase_80393F7C = "D_MN10A"; +SECTION_DEAD static char const* const stringBase_80393F84 = "D_MN11A"; +SECTION_DEAD static char const* const stringBase_80393F8C = "D_MN04A"; +SECTION_DEAD static char const* const stringBase_80393F94 = "D_MN05A"; +SECTION_DEAD static char const* const stringBase_80393F9C = "D_MN07A"; +SECTION_DEAD static char const* const stringBase_80393FA4 = "FieldS"; +SECTION_DEAD static char const* const stringBase_80393FAB = "Event"; +SECTION_DEAD static char const* const stringBase_80393FB1 = "Water"; +SECTION_DEAD static char const* const stringBase_80393FB7 = "Scope"; +SECTION_DEAD static char const* const stringBase_80393FBD = "WaterSurf"; +SECTION_DEAD static char const* const stringBase_80393FC7 = "HorseT"; +SECTION_DEAD static char const* const stringBase_80393FCE = "Board"; +SECTION_DEAD static char const* const stringBase_80393FD4 = "Canoe"; +SECTION_DEAD static char const* const stringBase_80393FDA = "Keep"; +SECTION_DEAD static char const* const stringBase_80393FDF = "Rodeo"; +SECTION_DEAD static char const* const stringBase_80393FE5 = "MagneBoots"; +SECTION_DEAD static char const* const stringBase_80393FF0 = "MagneRoof"; +SECTION_DEAD static char const* const stringBase_80393FFA = "MagneWall"; +SECTION_DEAD static char const* const stringBase_80394004 = "CoccoJump"; +SECTION_DEAD static char const* const stringBase_8039400E = "Boar"; +SECTION_DEAD static char const* const stringBase_80394013 = "GoatBattle"; +SECTION_DEAD static char const* const stringBase_8039401E = "GoronJump"; +SECTION_DEAD static char const* const stringBase_80394028 = "Spinner"; +SECTION_DEAD static char const* const stringBase_80394030 = "HookWall"; +SECTION_DEAD static char const* const stringBase_80394039 = "HookRoof"; +SECTION_DEAD static char const* const stringBase_80394042 = "HookActor"; +SECTION_DEAD static char const* const stringBase_8039404C = "RoofHung"; +SECTION_DEAD static char const* const stringBase_80394055 = "Rotary"; +SECTION_DEAD static char const* const stringBase_8039405C = "Street"; +SECTION_DEAD static char const* const stringBase_80394063 = "StreetN"; +SECTION_DEAD static char const* const stringBase_8039406B = "StreetP"; +SECTION_DEAD static char const* const stringBase_80394073 = "Rampart2"; +SECTION_DEAD static char const* const stringBase_8039407C = "Allay"; +SECTION_DEAD static char const* const stringBase_80394082 = "AllayR"; +SECTION_DEAD static char const* const stringBase_80394089 = "AllayR2"; +SECTION_DEAD static char const* const stringBase_80394091 = "AllayS"; +SECTION_DEAD static char const* const stringBase_80394098 = "AllayN"; +SECTION_DEAD static char const* const stringBase_8039409F = "AllayR3"; +SECTION_DEAD static char const* const stringBase_803940A7 = "CopyRodHall"; +SECTION_DEAD static char const* const stringBase_803940B3 = "MidnaTag"; +SECTION_DEAD static char const* const stringBase_803940BC = "WarpObj"; +SECTION_DEAD static char const* const stringBase_803940C4 = "LV9GZeldaTri"; +SECTION_DEAD static char const* const stringBase_803940D1 = "LV4BOSSSPJP"; +SECTION_DEAD static char const* const stringBase_803940DD = "LV7BOSS"; +SECTION_DEAD static char const* const stringBase_803940E5 = "TeppeiHook"; +SECTION_DEAD static char const* const stringBase_803940F0 = "Peep"; +SECTION_DEAD static char const* const stringBase_803940F5 = "DungeonS"; +SECTION_DEAD static char const* const stringBase_803940FE = "Room"; +SECTION_DEAD static char const* const stringBase_80394103 = "Cave"; +SECTION_DEAD static char const* const stringBase_80394108 = "Timer"; +SECTION_DEAD static char const* const stringBase_8039410E = "Target"; +SECTION_DEAD static char const* const stringBase_80394115 = "Smoothless"; +SECTION_DEAD static char const* const stringBase_80394120 = "Mode"; +SECTION_DEAD static char const* const stringBase_80394125 = "Radius"; +SECTION_DEAD static char const* const stringBase_8039412C = "RadiusNear"; +SECTION_DEAD static char const* const stringBase_80394137 = "Longitude"; +SECTION_DEAD static char const* const stringBase_80394141 = "Fovy"; +SECTION_DEAD static char const* const stringBase_80394146 = "FovyNear"; +SECTION_DEAD static char const* const stringBase_8039414F = "Latitude"; +SECTION_DEAD static char const* const stringBase_80394158 = "Listener"; +SECTION_DEAD static char const* const stringBase_80394161 = "@STARTER"; +SECTION_DEAD static char const* const stringBase_8039416A = "Speaker"; +SECTION_DEAD static char const* const stringBase_80394172 = "@TALKPARTNER"; +SECTION_DEAD static char const* const stringBase_8039417F = "E_RD"; +SECTION_DEAD static char const* const stringBase_80394184 = "PAUSE"; +SECTION_DEAD static char const* const stringBase_8039418A = "WAIT"; +SECTION_DEAD static char const* const stringBase_8039418F = "TALK"; +SECTION_DEAD static char const* const stringBase_80394194 = "FIXEDPOS"; +SECTION_DEAD static char const* const stringBase_8039419D = "FIXEDFRM"; +SECTION_DEAD static char const* const stringBase_803941A6 = "UNITRANS"; +SECTION_DEAD static char const* const stringBase_803941AF = "WATCHACTOR"; +SECTION_DEAD static char const* const stringBase_803941BA = "RESTOREPOS"; +SECTION_DEAD static char const* const stringBase_803941C5 = "GETITEM"; +SECTION_DEAD static char const* const stringBase_803941CD = "GAMEOVER"; +SECTION_DEAD static char const* const stringBase_803941D6 = "TURNTOACTOR"; +SECTION_DEAD static char const* const stringBase_803941E2 = "ROLLING"; +SECTION_DEAD static char const* const stringBase_803941EA = "TACT"; +SECTION_DEAD static char const* const stringBase_803941EF = "WINDDIR"; +SECTION_DEAD static char const* const stringBase_803941F7 = "PORTALWARP"; +SECTION_DEAD static char const* const stringBase_80394202 = "STYLE"; +SECTION_DEAD static char const* const stringBase_80394208 = "SAVE"; +SECTION_DEAD static char const* const stringBase_8039420D = "LOAD"; +SECTION_DEAD static char const* const stringBase_80394212 = "USEITEM0"; +SECTION_DEAD static char const* const stringBase_8039421B = "USEITEM1"; +SECTION_DEAD static char const* const stringBase_80394224 = "FIXEDFRMS"; +SECTION_DEAD static char const* const stringBase_8039422E = "BSPLINE"; +SECTION_DEAD static char const* const stringBase_80394236 = "POSSESSED"; +SECTION_DEAD static char const* const stringBase_80394240 = "TWOACTOR0"; +SECTION_DEAD static char const* const stringBase_8039424A = "STOKER"; +SECTION_DEAD static char const* const stringBase_80394251 = "UNIBRAKE"; +SECTION_DEAD static char const* const stringBase_8039425A = "UNIACCELE"; +SECTION_DEAD static char const* const stringBase_80394264 = "STBWAIT"; +SECTION_DEAD static char const* const stringBase_8039426C = "CURRENT"; +SECTION_DEAD static char const* const stringBase_80394274 = "PEEPHOLE"; +SECTION_DEAD static char const* const stringBase_8039427D = "DIGHOLE"; +SECTION_DEAD static char const* const stringBase_80394285 = "HINTTALK"; +SECTION_DEAD static char const* const stringBase_8039428E = "BSPTRANS"; +SECTION_DEAD static char const* const stringBase_80394297 = "MAPTOOL"; +#pragma pop + /* 803BA160-803BA16C 017280 000C+00 2/2 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -3720,7 +3824,23 @@ SECTION_RODATA static u8 const lit_16654[408] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80393DC0, &lit_16654); +COMPILER_STRIP_GATE(0x80393DC0, &lit_16654); + +/* 80393F68-80393F68 0205C8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8039429F = "CAMERA"; +SECTION_DEAD static char const* const stringBase_803942A6 = "KeepDist"; +SECTION_DEAD static char const* const stringBase_803942AF = "Trim"; +SECTION_DEAD static char const* const stringBase_803942B4 = "DEFAULT"; +SECTION_DEAD static char const* const stringBase_803942BC = "Recover"; +SECTION_DEAD static char const* const stringBase_803942C4 = "WaitAnyKey"; +SECTION_DEAD static char const* const stringBase_803942CF = "BGCheck"; +SECTION_DEAD static char const* const stringBase_803942D7 = "SavePos"; +SECTION_DEAD static char const* const stringBase_803942DF = "LoadPos"; +SECTION_DEAD static char const* const stringBase_803942E7 = "PlayerHide"; +SECTION_DEAD static char const* const stringBase_803942F2 = "WideMode"; +#pragma pop /* 8017F828-8018050C 17A168 0CE4+00 2/1 0/0 0/0 .text eventCamera__9dCamera_cFl */ #pragma push @@ -3732,6 +3852,15 @@ asm void dCamera_c::eventCamera(s32 param_0) { } #pragma pop +/* ############################################################################################## */ +/* 80393F68-80393F68 0205C8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_803942FB = "Continue"; +/* @stringBase0 padding */ +SECTION_DEAD static char const* const pad_80394304 = "\0\0\0"; +#pragma pop + /* 8018050C-801806D4 17AE4C 01C8+00 1/0 0/0 0/0 .text currentEvCamera__9dCamera_cFv */ #pragma push #pragma optimization_level 0 @@ -3844,7 +3973,7 @@ asm void dCamera_c::Reset() { SECTION_RODATA static u8 const wave[16] = { 0x3E, 0xCC, 0xCC, 0xCD, 0x3F, 0x66, 0x66, 0x66, 0x40, 0x06, 0x66, 0x66, 0x40, 0x4C, 0xCC, 0xCD, }; -COMPILER_STRIP_GATE(80393F58, &wave); +COMPILER_STRIP_GATE(0x80393F58, &wave); /* 80453908-8045390C 001F08 0004+00 1/1 0/0 0/0 .sdata2 @17253 */ SECTION_SDATA2 static f32 lit_17253 = 43.0f / 100.0f; @@ -3946,15 +4075,10 @@ asm void dCamera_c::SetBlurePosition(f32 param_0, f32 param_1, f32 param_2) { } #pragma pop -/* 80181278-80181280 17BBB8 0008+00 1/1 0/0 0/0 .text SetBlureActor__9dCamera_cFP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dCamera_c::SetBlureActor(fopAc_ac_c* param_0) { - nofralloc -#include "asm/d/d_camera/SetBlureActor__9dCamera_cFP10fopAc_ac_c.s" +/* 80181278-80181280 -00001 0008+00 0/0 0/0 0/0 .text SetBlureActor__9dCamera_cFP10fopAc_ac_c */ +void dCamera_c::SetBlureActor(fopAc_ac_c* param_0) { + *(u32*)(((u8*)this) + 1808) /* this->field_0x710 */ = (u32)(param_0); } -#pragma pop /* ############################################################################################## */ /* 80453918-8045391C 001F18 0004+00 1/1 0/0 0/0 .sdata2 @17392 */ @@ -4250,7 +4374,7 @@ asm void __sinit_d_camera_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_801825FC = (void*)__sinit_d_camera_cpp; +REGISTER_CTORS(0x801825FC, __sinit_d_camera_cpp); #pragma pop /* 801827EC-801827F4 17D12C 0008+00 1/0 0/0 0/0 .text @20@__dt__14dBgS_CamSphChkFv */ @@ -4620,15 +4744,10 @@ asm void daPy_py_c::getLeftFootPosP() { } #pragma pop -/* 80182ABC-80182AC4 17D3FC 0008+00 2/2 0/0 0/0 .text getMidnaActor__9daPy_py_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daPy_py_c::getMidnaActor() { - nofralloc -#include "asm/d/d_camera/getMidnaActor__9daPy_py_cFv.s" +/* 80182ABC-80182AC4 -00001 0008+00 0/0 0/0 0/0 .text getMidnaActor__9daPy_py_cFv */ +u32 daPy_py_c::getMidnaActor() { + return *(u32*)(&daPy_py_c::m_midnaActor); } -#pragma pop /* 80182AC4-80182AD0 17D404 000C+00 1/1 0/0 0/0 .text checkCopyRodThrowAfter__9daPy_py_cCFv */ #pragma push @@ -4640,15 +4759,10 @@ asm void daPy_py_c::checkCopyRodThrowAfter() const { } #pragma pop -/* 80182AD0-80182AD8 17D410 0008+00 1/1 0/0 0/0 .text keepLock__12dAttention_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dAttention_c::keepLock(int param_0) { - nofralloc -#include "asm/d/d_camera/keepLock__12dAttention_cFi.s" +/* 80182AD0-80182AD8 -00001 0008+00 0/0 0/0 0/0 .text keepLock__12dAttention_cFi */ +void dAttention_c::keepLock(int param_0) { + *(u32*)(((u8*)this) + 1220) /* this->field_0x4c4 */ = (u32)(param_0); } -#pragma pop /* 80182AD8-80182B9C 17D418 00C4+00 1/1 0/0 0/0 .text checkRide__9daPy_py_cCFv */ #pragma push @@ -4820,35 +4934,20 @@ asm void dCamParam_c::Arg2(s16 param_0) { } #pragma pop -/* 80182C6C-80182C74 17D5AC 0008+00 1/1 0/0 0/0 .text Arg1__11dCamParam_cFUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dCamParam_c::Arg1(u8 param_0) { - nofralloc -#include "asm/d/d_camera/Arg1__11dCamParam_cFUc.s" +/* 80182C6C-80182C74 -00001 0008+00 0/0 0/0 0/0 .text Arg1__11dCamParam_cFUc */ +void dCamParam_c::Arg1(u8 param_0) { + *(u8*)(((u8*)this) + 2) /* this->field_0x2 */ = (u8)(param_0); } -#pragma pop -/* 80182C74-80182C7C 17D5B4 0008+00 1/1 0/0 0/0 .text Arg0__11dCamParam_cFUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dCamParam_c::Arg0(u8 param_0) { - nofralloc -#include "asm/d/d_camera/Arg0__11dCamParam_cFUc.s" +/* 80182C74-80182C7C -00001 0008+00 0/0 0/0 0/0 .text Arg0__11dCamParam_cFUc */ +void dCamParam_c::Arg0(u8 param_0) { + *(u8*)(((u8*)this) + 1) /* this->field_0x1 */ = (u8)(param_0); } -#pragma pop -/* 80182C7C-80182C84 17D5BC 0008+00 1/1 0/0 0/0 .text Fovy__11dCamParam_cFUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dCamParam_c::Fovy(u8 param_0) { - nofralloc -#include "asm/d/d_camera/Fovy__11dCamParam_cFUc.s" +/* 80182C7C-80182C84 -00001 0008+00 0/0 0/0 0/0 .text Fovy__11dCamParam_cFUc */ +void dCamParam_c::Fovy(u8 param_0) { + *(u8*)this = (u8)(param_0); } -#pragma pop /* 80182C84-80182C8C 17D5C4 0008+00 2/2 0/0 0/0 .text U__7cSGlobeCFv */ #pragma push @@ -5034,122 +5133,4 @@ asm void daTagMwait_c::checkEndMessage() { } #pragma pop -/* 80393F68-80394308 0205C8 039C+04 9/8 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80393F68 = "camtype.dat"; -SECTION_DEAD static char const* const stringBase_80393F74 = "D_MN01A"; -SECTION_DEAD static char const* const stringBase_80393F7C = "D_MN10A"; -SECTION_DEAD static char const* const stringBase_80393F84 = "D_MN11A"; -SECTION_DEAD static char const* const stringBase_80393F8C = "D_MN04A"; -SECTION_DEAD static char const* const stringBase_80393F94 = "D_MN05A"; -SECTION_DEAD static char const* const stringBase_80393F9C = "D_MN07A"; -SECTION_DEAD static char const* const stringBase_80393FA4 = "FieldS"; -SECTION_DEAD static char const* const stringBase_80393FAB = "Event"; -SECTION_DEAD static char const* const stringBase_80393FB1 = "Water"; -SECTION_DEAD static char const* const stringBase_80393FB7 = "Scope"; -SECTION_DEAD static char const* const stringBase_80393FBD = "WaterSurf"; -SECTION_DEAD static char const* const stringBase_80393FC7 = "HorseT"; -SECTION_DEAD static char const* const stringBase_80393FCE = "Board"; -SECTION_DEAD static char const* const stringBase_80393FD4 = "Canoe"; -SECTION_DEAD static char const* const stringBase_80393FDA = "Keep"; -SECTION_DEAD static char const* const stringBase_80393FDF = "Rodeo"; -SECTION_DEAD static char const* const stringBase_80393FE5 = "MagneBoots"; -SECTION_DEAD static char const* const stringBase_80393FF0 = "MagneRoof"; -SECTION_DEAD static char const* const stringBase_80393FFA = "MagneWall"; -SECTION_DEAD static char const* const stringBase_80394004 = "CoccoJump"; -SECTION_DEAD static char const* const stringBase_8039400E = "Boar"; -SECTION_DEAD static char const* const stringBase_80394013 = "GoatBattle"; -SECTION_DEAD static char const* const stringBase_8039401E = "GoronJump"; -SECTION_DEAD static char const* const stringBase_80394028 = "Spinner"; -SECTION_DEAD static char const* const stringBase_80394030 = "HookWall"; -SECTION_DEAD static char const* const stringBase_80394039 = "HookRoof"; -SECTION_DEAD static char const* const stringBase_80394042 = "HookActor"; -SECTION_DEAD static char const* const stringBase_8039404C = "RoofHung"; -SECTION_DEAD static char const* const stringBase_80394055 = "Rotary"; -SECTION_DEAD static char const* const stringBase_8039405C = "Street"; -SECTION_DEAD static char const* const stringBase_80394063 = "StreetN"; -SECTION_DEAD static char const* const stringBase_8039406B = "StreetP"; -SECTION_DEAD static char const* const stringBase_80394073 = "Rampart2"; -SECTION_DEAD static char const* const stringBase_8039407C = "Allay"; -SECTION_DEAD static char const* const stringBase_80394082 = "AllayR"; -SECTION_DEAD static char const* const stringBase_80394089 = "AllayR2"; -SECTION_DEAD static char const* const stringBase_80394091 = "AllayS"; -SECTION_DEAD static char const* const stringBase_80394098 = "AllayN"; -SECTION_DEAD static char const* const stringBase_8039409F = "AllayR3"; -SECTION_DEAD static char const* const stringBase_803940A7 = "CopyRodHall"; -SECTION_DEAD static char const* const stringBase_803940B3 = "MidnaTag"; -SECTION_DEAD static char const* const stringBase_803940BC = "WarpObj"; -SECTION_DEAD static char const* const stringBase_803940C4 = "LV9GZeldaTri"; -SECTION_DEAD static char const* const stringBase_803940D1 = "LV4BOSSSPJP"; -SECTION_DEAD static char const* const stringBase_803940DD = "LV7BOSS"; -SECTION_DEAD static char const* const stringBase_803940E5 = "TeppeiHook"; -SECTION_DEAD static char const* const stringBase_803940F0 = "Peep"; -SECTION_DEAD static char const* const stringBase_803940F5 = "DungeonS"; -SECTION_DEAD static char const* const stringBase_803940FE = "Room"; -SECTION_DEAD static char const* const stringBase_80394103 = "Cave"; -SECTION_DEAD static char const* const stringBase_80394108 = "Timer"; -SECTION_DEAD static char const* const stringBase_8039410E = "Target"; -SECTION_DEAD static char const* const stringBase_80394115 = "Smoothless"; -SECTION_DEAD static char const* const stringBase_80394120 = "Mode"; -SECTION_DEAD static char const* const stringBase_80394125 = "Radius"; -SECTION_DEAD static char const* const stringBase_8039412C = "RadiusNear"; -SECTION_DEAD static char const* const stringBase_80394137 = "Longitude"; -SECTION_DEAD static char const* const stringBase_80394141 = "Fovy"; -SECTION_DEAD static char const* const stringBase_80394146 = "FovyNear"; -SECTION_DEAD static char const* const stringBase_8039414F = "Latitude"; -SECTION_DEAD static char const* const stringBase_80394158 = "Listener"; -SECTION_DEAD static char const* const stringBase_80394161 = "@STARTER"; -SECTION_DEAD static char const* const stringBase_8039416A = "Speaker"; -SECTION_DEAD static char const* const stringBase_80394172 = "@TALKPARTNER"; -SECTION_DEAD static char const* const stringBase_8039417F = "E_RD"; -SECTION_DEAD static char const* const stringBase_80394184 = "PAUSE"; -SECTION_DEAD static char const* const stringBase_8039418A = "WAIT"; -SECTION_DEAD static char const* const stringBase_8039418F = "TALK"; -SECTION_DEAD static char const* const stringBase_80394194 = "FIXEDPOS"; -SECTION_DEAD static char const* const stringBase_8039419D = "FIXEDFRM"; -SECTION_DEAD static char const* const stringBase_803941A6 = "UNITRANS"; -SECTION_DEAD static char const* const stringBase_803941AF = "WATCHACTOR"; -SECTION_DEAD static char const* const stringBase_803941BA = "RESTOREPOS"; -SECTION_DEAD static char const* const stringBase_803941C5 = "GETITEM"; -SECTION_DEAD static char const* const stringBase_803941CD = "GAMEOVER"; -SECTION_DEAD static char const* const stringBase_803941D6 = "TURNTOACTOR"; -SECTION_DEAD static char const* const stringBase_803941E2 = "ROLLING"; -SECTION_DEAD static char const* const stringBase_803941EA = "TACT"; -SECTION_DEAD static char const* const stringBase_803941EF = "WINDDIR"; -SECTION_DEAD static char const* const stringBase_803941F7 = "PORTALWARP"; -SECTION_DEAD static char const* const stringBase_80394202 = "STYLE"; -SECTION_DEAD static char const* const stringBase_80394208 = "SAVE"; -SECTION_DEAD static char const* const stringBase_8039420D = "LOAD"; -SECTION_DEAD static char const* const stringBase_80394212 = "USEITEM0"; -SECTION_DEAD static char const* const stringBase_8039421B = "USEITEM1"; -SECTION_DEAD static char const* const stringBase_80394224 = "FIXEDFRMS"; -SECTION_DEAD static char const* const stringBase_8039422E = "BSPLINE"; -SECTION_DEAD static char const* const stringBase_80394236 = "POSSESSED"; -SECTION_DEAD static char const* const stringBase_80394240 = "TWOACTOR0"; -SECTION_DEAD static char const* const stringBase_8039424A = "STOKER"; -SECTION_DEAD static char const* const stringBase_80394251 = "UNIBRAKE"; -SECTION_DEAD static char const* const stringBase_8039425A = "UNIACCELE"; -SECTION_DEAD static char const* const stringBase_80394264 = "STBWAIT"; -SECTION_DEAD static char const* const stringBase_8039426C = "CURRENT"; -SECTION_DEAD static char const* const stringBase_80394274 = "PEEPHOLE"; -SECTION_DEAD static char const* const stringBase_8039427D = "DIGHOLE"; -SECTION_DEAD static char const* const stringBase_80394285 = "HINTTALK"; -SECTION_DEAD static char const* const stringBase_8039428E = "BSPTRANS"; -SECTION_DEAD static char const* const stringBase_80394297 = "MAPTOOL"; -SECTION_DEAD static char const* const stringBase_8039429F = "CAMERA"; -SECTION_DEAD static char const* const stringBase_803942A6 = "KeepDist"; -SECTION_DEAD static char const* const stringBase_803942AF = "Trim"; -SECTION_DEAD static char const* const stringBase_803942B4 = "DEFAULT"; -SECTION_DEAD static char const* const stringBase_803942BC = "Recover"; -SECTION_DEAD static char const* const stringBase_803942C4 = "WaitAnyKey"; -SECTION_DEAD static char const* const stringBase_803942CF = "BGCheck"; -SECTION_DEAD static char const* const stringBase_803942D7 = "SavePos"; -SECTION_DEAD static char const* const stringBase_803942DF = "LoadPos"; -SECTION_DEAD static char const* const stringBase_803942E7 = "PlayerHide"; -SECTION_DEAD static char const* const stringBase_803942F2 = "WideMode"; -SECTION_DEAD static char const* const stringBase_803942FB = "Continue"; -/* @stringBase0 padding */ -SECTION_DEAD static char const* const pad_80394304 = "\0\0\0"; -#pragma pop +/* 80393F68-80393F68 0205C8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/d_demo.cpp b/src/d/d_demo.cpp index d3a80f2e348..15794476f6c 100644 --- a/src/d/d_demo.cpp +++ b/src/d/d_demo.cpp @@ -50,14 +50,14 @@ struct dRes_control_c { struct dPa_levelEcallBack {}; -struct cXyz { - /* 80009184 */ ~cXyz(); -}; - struct dKy_tevstr_c {}; struct csXyz {}; +struct cXyz { + /* 80009184 */ ~cXyz(); +}; + struct dPa_control_c { /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, @@ -1117,6 +1117,12 @@ static asm void branchFile(char const* param_0) { #pragma pop /* ############################################################################################## */ +/* 803797F8-803797F8 005E58 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_803797F8 = "-"; +#pragma pop + /* 80450620-80450628 0000A0 0002+06 3/3 1/1 0/0 .sdata m_branchId__7dDemo_c */ SECTION_SDATA u16 dDemo_c::m_branchId[1 + 3 /* padding */] = { 0xFFFF, @@ -1685,6 +1691,13 @@ asm dDemo_ambient_c::~dDemo_ambient_c() { } #pragma pop +/* ############################################################################################## */ +/* 803797F8-803797F8 005E58 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_803797FA = "d_act"; +#pragma pop + /* 80039528-80039678 033E68 0150+00 1/0 0/0 0/0 .text * JSGFindObject__14dDemo_system_cCFPPQ26JStage7TObjectPCcQ26JStage8TEObject */ #pragma push @@ -1742,6 +1755,12 @@ asm jmessage_tControl::~jmessage_tControl() { #pragma pop /* ############################################################################################## */ +/* 803797F8-803797F8 005E58 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80379800 = "デモデータ読み込みエラー！！\n"; +#pragma pop + /* 8042465C-80424668 05137C 000C+00 1/1 0/0 0/0 .bss @5233 */ static u8 lit_5233[12]; @@ -1933,14 +1952,13 @@ asm void dDemo_actor_c::JSGGetRotation(Vec* param_0) const { } #pragma pop -/* 803797F8-80379840 005E58 0046+02 3/3 0/0 0/0 .rodata @stringBase0 */ +/* ############################################################################################## */ +/* 8037981E-80379840 005E7E 0020+02 0/0 0/0 0/0 .rodata None */ #pragma push #pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_803797F8 = "-"; -SECTION_DEAD static char const* const stringBase_803797FA = "d_act"; -SECTION_DEAD static char const* const stringBase_80379800 = "デモデータ読み込みエラー！！\n"; SECTION_DEAD static char const* const stringBase_8037981E = "デモデータ再読み込みエラー！！\n"; /* @stringBase0 padding */ SECTION_DEAD static char const* const pad_8037983E = "\0"; #pragma pop + +/* 803797F8-803797F8 005E58 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/d_drawlist.cpp b/src/d/d_drawlist.cpp index c3d307dca2a..e357337e44b 100644 --- a/src/d/d_drawlist.cpp +++ b/src/d/d_drawlist.cpp @@ -80,10 +80,10 @@ struct dDlst_shadowRealPoly_c { /* 800569A8 */ s32 getTriMax(); }; -struct cBgD_Vtx_t {}; - struct cM3dGPla {}; +struct cBgD_Vtx_t {}; + struct dDlst_shadowPoly_c { /* 80054288 */ void set(cBgD_Vtx_t*, u16, u16, u16, cM3dGPla*); /* 800543B4 */ void draw(); @@ -120,10 +120,10 @@ struct J3DDrawBuffer { /* 803254AC */ void draw() const; }; -struct dDlst_base_c {}; - struct _GXColor {}; +struct dDlst_base_c {}; + struct dDlst_list_c { /* 800560F0 */ dDlst_list_c(); /* 80056390 */ void init(); @@ -206,7 +206,6 @@ struct cBgS_ShdwDraw { /* 80267F88 */ cBgS_ShdwDraw(); /* 80267FD0 */ ~cBgS_ShdwDraw(); /* 80268048 */ void Set(cXyz&, cXyz&); - /* 8026806C */ void SetCallback(int (*)(cBgS_ShdwDraw*, cBgD_Vtx_t*, int, int, int, cM3dGPla*)); }; struct cBgS { @@ -3070,7 +3069,7 @@ SECTION_RODATA static u8 const l_drawlistSize[42 + 2 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(8037A178, &l_drawlistSize); +COMPILER_STRIP_GATE(0x8037A178, &l_drawlistSize); /* 8037A1A4-8037A1B0 006804 0009+03 1/1 0/0 0/0 .rodata l_nonSortId$5662 */ SECTION_RODATA static u8 const l_nonSortId[9 + 3 /* padding */] = { @@ -3088,7 +3087,7 @@ SECTION_RODATA static u8 const l_nonSortId[9 + 3 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(8037A1A4, &l_nonSortId); +COMPILER_STRIP_GATE(0x8037A1A4, &l_nonSortId); /* 804520C4-804520CC 0006C4 0006+02 1/1 0/0 0/0 .sdata2 l_zSortId$5668 */ SECTION_SDATA2 static u8 l_zSortId[6 + 2 /* padding */] = { @@ -3217,6 +3216,14 @@ asm void dDlst_list_c::draw(dDlst_base_c** param_0, dDlst_base_c** param_1) { #pragma pop /* ############################################################################################## */ +/* 8037A1B0-8037A1B0 006810 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8037A1B0 = "wipe_00.bti"; +/* @stringBase0 padding */ +SECTION_DEAD static char const* const pad_8037A1BC = "\0\0\0"; +#pragma pop + /* 804248F0-80424938 051610 0048+00 3/3 0/0 0/0 .bss mWipeDlst__12dDlst_list_c */ u8 dDlst_list_c::mWipeDlst[72]; @@ -3316,7 +3323,7 @@ asm void __sinit_d_drawlist_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_800569B4 = (void*)__sinit_d_drawlist_cpp; +REGISTER_CTORS(0x800569B4, __sinit_d_drawlist_cpp); #pragma pop /* ############################################################################################## */ @@ -3352,11 +3359,4 @@ SECTION_DATA extern void* __vt__13dDlst_2DTri_c[3] = { extern u8 data_80450EE0[8]; u8 data_80450EE0[8]; -/* 8037A1B0-8037A1C0 006810 000C+04 1/1 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_8037A1B0 = "wipe_00.bti"; -/* @stringBase0 padding */ -SECTION_DEAD static char const* const pad_8037A1BC = "\0\0\0"; -#pragma pop +/* 8037A1B0-8037A1B0 006810 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/d_envse.cpp b/src/d/d_envse.cpp index 3932361e6d3..e304c32e043 100644 --- a/src/d/d_envse.cpp +++ b/src/d/d_envse.cpp @@ -138,6 +138,15 @@ static asm void dEnvSe_getNearPathPos(cXyz* param_0, cXyz* param_1, dPath* param } #pragma pop +/* ############################################################################################## */ +/* 80394308-80394308 020968 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80394308 = "sndtag"; +/* @stringBase0 padding */ +SECTION_DEAD static char const* const pad_8039430F = ""; +#pragma pop + /* 80182FD8-80183480 17D918 04A8+00 1/1 0/0 0/0 .text * execute_common__8dEnvSe_cFP18dStage_SoundInfo_cPScUc */ #pragma push @@ -213,11 +222,4 @@ SECTION_DATA extern void* g_profile_ENVSE[10 + 1 /* padding */] = { NULL, }; -/* 80394308-80394310 020968 0007+01 1/1 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80394308 = "sndtag"; -/* @stringBase0 padding */ -SECTION_DEAD static char const* const pad_8039430F = ""; -#pragma pop +/* 80394308-80394308 020968 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/d_error_msg.cpp b/src/d/d_error_msg.cpp index d7703698d50..f6817d78ebd 100644 --- a/src/d/d_error_msg.cpp +++ b/src/d/d_error_msg.cpp @@ -190,7 +190,7 @@ SECTION_RODATA static u8 const black_tex[64] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8037B140, &black_tex); +COMPILER_STRIP_GATE(0x8037B140, &black_tex); /* 8037B180-8037B3E0 0077E0 0260+00 1/1 0/0 0/0 .rodata msg_data */ SECTION_RODATA static u8 const msg_data[608] = { @@ -233,7 +233,7 @@ SECTION_RODATA static u8 const msg_data[608] = { 0x6F, 0x72, 0x20, 0x64, 0x65, 0x74, 0x61, 0x69, 0x6C, 0x73, 0x2E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8037B180, &msg_data); +COMPILER_STRIP_GATE(0x8037B180, &msg_data); /* 8037B3E0-8038D640 -00001 12260+00 1/1 0/0 0/0 .rodata font_data */ SECTION_RODATA static void* const font_data[18584] = { @@ -18823,7 +18823,7 @@ SECTION_RODATA static void* const font_data[18584] = { (void*)0x69727473, (void*)0xE1B80000, }; -COMPILER_STRIP_GATE(8037B3E0, &font_data); +COMPILER_STRIP_GATE(0x8037B3E0, &font_data); /* 80452C18-80452C1C 001218 0004+00 3/3 0/0 0/0 .sdata2 @3758 */ SECTION_SDATA2 static u8 lit_3758[4] = { @@ -18891,6 +18891,15 @@ asm void dDvdErrorMsg_c::draw(s32 param_0) { } #pragma pop +/* ############################################################################################## */ +/* 8038D640-8038D640 019CA0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8038D640 = "DVD Error !! <%d>\n"; +/* @stringBase0 padding */ +SECTION_DEAD static char const* const pad_8038D653 = "\0\0\0\0"; +#pragma pop + /* 8009D354-8009D410 097C94 00BC+00 0/0 1/1 0/0 .text execute__14dDvdErrorMsg_cFv */ #pragma push #pragma optimization_level 0 @@ -18925,11 +18934,4 @@ asm void dShutdownErrorMsg_c::execute() { } #pragma pop -/* 8038D640-8038D658 019CA0 0013+05 1/1 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_8038D640 = "DVD Error !! <%d>\n"; -/* @stringBase0 padding */ -SECTION_DEAD static char const* const pad_8038D653 = "\0\0\0\0"; -#pragma pop +/* 8038D640-8038D640 019CA0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/d_ev_camera.cpp b/src/d/d_ev_camera.cpp index 9106dc99c09..5bf51bd45d9 100644 --- a/src/d/d_ev_camera.cpp +++ b/src/d/d_ev_camera.cpp @@ -580,6 +580,14 @@ asm void dCamera_c::getEvActor(char* param_0, char* param_1) { } #pragma pop +/* ############################################################################################## */ +/* 8037AAF4-8037AAF4 007154 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8037AAF4 = "Timer"; +SECTION_DEAD static char const* const stringBase_8037AAFA = "Stay"; +#pragma pop + /* 80089730-800897E8 084070 00B8+00 0/0 3/0 0/0 .text pauseEvCamera__9dCamera_cFv */ #pragma push #pragma optimization_level 0 @@ -591,6 +599,19 @@ asm void dCamera_c::pauseEvCamera() { #pragma pop /* ############################################################################################## */ +/* 8037AAF4-8037AAF4 007154 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8037AAFF = "Eye"; +SECTION_DEAD static char const* const stringBase_8037AB03 = "Center"; +SECTION_DEAD static char const* const stringBase_8037AB0A = "BasePos"; +SECTION_DEAD static char const* const stringBase_8037AB12 = "Fovy"; +SECTION_DEAD static char const* const stringBase_8037AB17 = "Bank"; +SECTION_DEAD static char const* const stringBase_8037AB1C = "RelUseMask"; +SECTION_DEAD static char const* const stringBase_8037AB27 = "oo"; +SECTION_DEAD static char const* const stringBase_8037AB2A = "RelActor"; +#pragma pop + /* 804253A8-804253B4 0520C8 000C+00 1/1 0/0 0/0 .bss @4202 */ static u8 lit_4202[12]; @@ -630,6 +651,19 @@ asm void dCamera_c::fixedFrameEvCamera() { #pragma pop /* ############################################################################################## */ +/* 8037AAF4-8037AAF4 007154 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8037AB33 = "EyeGap"; +SECTION_DEAD static char const* const stringBase_8037AB3A = "CtrGap"; +SECTION_DEAD static char const* const stringBase_8037AB41 = "EyeCus"; +SECTION_DEAD static char const* const stringBase_8037AB48 = "CtrCus"; +SECTION_DEAD static char const* const stringBase_8037AB4F = "Stoker"; +SECTION_DEAD static char const* const stringBase_8037AB56 = "@STARTER"; +SECTION_DEAD static char const* const stringBase_8037AB5F = "Target"; +SECTION_DEAD static char const* const stringBase_8037AB66 = "@PLAYER"; +#pragma pop + /* 804528DC-804528E0 000EDC 0004+00 10/10 0/0 0/0 .sdata2 @5346 */ SECTION_SDATA2 static f32 lit_5346 = 1.0f; @@ -644,6 +678,15 @@ asm void dCamera_c::stokerEvCamera() { #pragma pop /* ############################################################################################## */ +/* 8037AAF4-8037AAF4 007154 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8037AB6E = "TransType"; +SECTION_DEAD static char const* const stringBase_8037AB78 = "Roll"; +SECTION_DEAD static char const* const stringBase_8037AB7D = "RadiusAdd"; +SECTION_DEAD static char const* const stringBase_8037AB87 = "Latitude"; +#pragma pop + /* 804528E0-804528E8 000EE0 0004+04 1/1 0/0 0/0 .sdata2 @5844 */ SECTION_SDATA2 static f32 lit_5844[1 + 1 /* padding */] = { 2.0f, @@ -665,6 +708,14 @@ asm void dCamera_c::rollingEvCamera() { #pragma pop /* ############################################################################################## */ +/* 8037AAF4-8037AAF4 007154 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8037AB90 = "Radius"; +SECTION_DEAD static char const* const stringBase_8037AB97 = "StartRadius"; +SECTION_DEAD static char const* const stringBase_8037ABA3 = "o"; +#pragma pop + /* 804253C0-804253CC 0520E0 000C+00 0/1 0/0 0/0 .bss @4203 */ #pragma push #pragma force_active on @@ -740,7 +791,7 @@ asm void dCamera_c::uniformAcceleEvCamera() { SECTION_RODATA static u8 const lit_3871[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8037A7F0, &lit_3871); +COMPILER_STRIP_GATE(0x8037A7F0, &lit_3871); /* 8037A7FC-8037A80C 006E5C 0010+00 0/1 0/0 0/0 .rodata @5984 */ #pragma push @@ -748,7 +799,22 @@ COMPILER_STRIP_GATE(8037A7F0, &lit_3871); SECTION_RODATA static u8 const lit_5984[16] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8037A7FC, &lit_5984); +COMPILER_STRIP_GATE(0x8037A7FC, &lit_5984); +#pragma pop + +/* 8037AAF4-8037AAF4 007154 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8037ABA5 = "BSpCurve"; +SECTION_DEAD static char const* const stringBase_8037ABAE = "BSpPoints"; +SECTION_DEAD static char const* const stringBase_8037ABB8 = "EndSlot"; +SECTION_DEAD static char const* const stringBase_8037ABC0 = "StartSlot"; +SECTION_DEAD static char const* const stringBase_8037ABCA = "StartEye"; +SECTION_DEAD static char const* const stringBase_8037ABD3 = "StartCenter"; +SECTION_DEAD static char const* const stringBase_8037ABDF = "StartFovy"; +SECTION_DEAD static char const* const stringBase_8037ABE9 = "StartBank"; +SECTION_DEAD static char const* const stringBase_8037ABF3 = "--oo"; +SECTION_DEAD static char const* const stringBase_8037ABF8 = "Cushion"; #pragma pop /* 80452900-80452904 000F00 0004+00 1/1 0/0 0/0 .sdata2 @6682 */ @@ -828,6 +894,19 @@ asm void cXyz::operator+=(Vec const& param_0) { #pragma pop /* ############################################################################################## */ +/* 8037AAF4-8037AAF4 007154 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8037AC00 = "NearDist"; +SECTION_DEAD static char const* const stringBase_8037AC09 = "ZoomDist"; +SECTION_DEAD static char const* const stringBase_8037AC12 = "ZoomVAngle"; +SECTION_DEAD static char const* const stringBase_8037AC1D = "FarDist"; +SECTION_DEAD static char const* const stringBase_8037AC25 = "NearTimer"; +SECTION_DEAD static char const* const stringBase_8037AC2F = "FarTimer"; +SECTION_DEAD static char const* const stringBase_8037AC38 = "FrontAngle"; +SECTION_DEAD static char const* const stringBase_8037AC43 = "Blure"; +#pragma pop + /* 804253F0-804253FC 052110 000C+00 1/1 0/0 0/0 .bss @6756 */ static u8 lit_6756[12]; @@ -913,6 +992,13 @@ static asm void func_8008FA94() { #pragma pop /* ############################################################################################## */ +/* 8037AAF4-8037AAF4 007154 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8037AC49 = "Dest"; +SECTION_DEAD static char const* const stringBase_8037AC4E = "TargetType"; +#pragma pop + /* 80425408-80425414 052128 000C+00 1/1 0/0 0/0 .bss @7364 */ static u8 lit_7364[12]; @@ -939,6 +1025,14 @@ asm void dCamera_c::talktoEvCamera() { } #pragma pop +/* ############################################################################################## */ +/* 8037AAF4-8037AAF4 007154 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8037AC59 = "ID"; +SECTION_DEAD static char const* const stringBase_8037AC5C = "CameraID"; +#pragma pop + /* 80090230-80090478 08AB70 0248+00 0/0 1/0 0/0 .text maptoolIdEvCamera__9dCamera_cFv */ #pragma push #pragma optimization_level 0 @@ -949,6 +1043,14 @@ asm void dCamera_c::maptoolIdEvCamera() { } #pragma pop +/* ############################################################################################## */ +/* 8037AAF4-8037AAF4 007154 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8037AC65 = "Name"; +SECTION_DEAD static char const* const stringBase_8037AC6A = "FN01"; +#pragma pop + /* 80090478-80090514 08ADB8 009C+00 0/0 1/0 0/0 .text styleEvCamera__9dCamera_cFv */ #pragma push #pragma optimization_level 0 @@ -960,6 +1062,12 @@ asm void dCamera_c::styleEvCamera() { #pragma pop /* ############################################################################################## */ +/* 8037AAF4-8037AAF4 007154 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8037AC6F = "Type"; +#pragma pop + /* 80452944-80452948 000F44 0004+00 4/4 0/0 0/0 .sdata2 @8178 */ SECTION_SDATA2 static f32 lit_8178 = -45.0f; @@ -1125,7 +1233,7 @@ SECTION_RODATA static u8 const lit_5985[28] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3E, 0xCC, 0xCC, 0xCD, 0x3F, 0x33, 0x33, 0x33, 0x3F, 0x66, 0x66, 0x66, 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8037A80C, &lit_5985); +COMPILER_STRIP_GATE(0x8037A80C, &lit_5985); #pragma pop /* 8037A828-8037A844 006E88 001C+00 0/0 0/0 0/0 .rodata @5986 */ @@ -1135,7 +1243,7 @@ SECTION_RODATA static u8 const lit_5986[28] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3D, 0xCC, 0xCC, 0xCD, 0x3E, 0x99, 0x99, 0x9A, 0x3F, 0x19, 0x99, 0x9A, 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8037A828, &lit_5986); +COMPILER_STRIP_GATE(0x8037A828, &lit_5986); #pragma pop /* 8037A844-8037A858 006EA4 0014+00 0/0 0/0 0/0 .rodata @5987 */ @@ -1145,7 +1253,7 @@ SECTION_RODATA static u8 const lit_5987[20] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8037A844, &lit_5987); +COMPILER_STRIP_GATE(0x8037A844, &lit_5987); #pragma pop /* 8037A858-8037A86C 006EB8 0014+00 0/0 0/0 0/0 .rodata @5988 */ @@ -1155,7 +1263,7 @@ SECTION_RODATA static u8 const lit_5988[20] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8037A858, &lit_5988); +COMPILER_STRIP_GATE(0x8037A858, &lit_5988); #pragma pop /* 8037A86C-8037A884 006ECC 0018+00 1/1 0/0 0/0 .rodata @8236 */ @@ -1163,7 +1271,7 @@ SECTION_RODATA static u8 const lit_8236[24] = { 0x3F, 0x40, 0x00, 0x00, 0x3E, 0xB3, 0x33, 0x33, 0x3F, 0x4C, 0xCC, 0xCD, 0x3F, 0x4C, 0xCC, 0xCD, 0x3F, 0x4C, 0xCC, 0xCD, 0x3F, 0x4C, 0xCC, 0xCD, }; -COMPILER_STRIP_GATE(8037A86C, &lit_8236); +COMPILER_STRIP_GATE(0x8037A86C, &lit_8236); /* 803AC528-803AC5A0 -00001 0078+00 1/1 0/0 0/0 .data @8754 */ SECTION_DATA static void* lit_8754[30] = { @@ -1333,6 +1441,13 @@ asm void dCamera_c::stbWaitEvCamera() { } #pragma pop +/* ############################################################################################## */ +/* 8037AAF4-8037AAF4 007154 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8037AC74 = "Slot"; +#pragma pop + /* 800924D0-8009258C 08CE10 00BC+00 0/0 1/0 0/0 .text saveEvCamera__9dCamera_cFv */ #pragma push #pragma optimization_level 0 @@ -1349,7 +1464,7 @@ SECTION_RODATA static u8 const lit_8840[24] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8037A884, &lit_8840); +COMPILER_STRIP_GATE(0x8037A884, &lit_8840); /* 8009258C-800929AC 08CECC 0420+00 0/0 1/0 0/0 .text loadEvCamera__9dCamera_cFv */ #pragma push @@ -1388,7 +1503,7 @@ SECTION_RODATA static u8 const lit_8969[364] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0x82, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, }; -COMPILER_STRIP_GATE(8037A89C, &lit_8969); +COMPILER_STRIP_GATE(0x8037A89C, &lit_8969); /* 80452A88-80452A8C 001088 0004+00 1/1 0/0 0/0 .sdata2 @9395 */ SECTION_SDATA2 static f32 lit_9395 = 64.0f; @@ -1549,7 +1664,7 @@ SECTION_RODATA static u8 const lit_9468[56] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0x41, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x50, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, }; -COMPILER_STRIP_GATE(8037AA08, &lit_9468); +COMPILER_STRIP_GATE(0x8037AA08, &lit_9468); /* 80452B44-80452B48 001144 0004+00 2/2 0/0 0/0 .sdata2 @9798 */ SECTION_SDATA2 static f32 lit_9798 = 1.0f / 20.0f; @@ -1584,14 +1699,20 @@ SECTION_RODATA static u8 const lit_9811[100] = { 0x11, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0x48, 0x00, 0x00, 0x00, 0x00, 0x00, 0x11, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8037AA40, &lit_9811); +COMPILER_STRIP_GATE(0x8037AA40, &lit_9811); /* 8037AAA4-8037AABC 007104 0018+00 1/1 0/0 0/0 .rodata @9812 */ SECTION_RODATA static u8 const lit_9812[24] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3D, 0xCC, 0xCC, 0xCD, 0x3F, 0x33, 0x33, 0x33, 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8037AAA4, &lit_9812); +COMPILER_STRIP_GATE(0x8037AAA4, &lit_9812); + +/* 8037AAF4-8037AAF4 007154 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8037AC79 = "CurvePoints"; +#pragma pop /* 80452B54-80452B58 001154 0004+00 1/1 0/0 0/0 .sdata2 @10118 */ SECTION_SDATA2 static f32 lit_10118 = 32.0f; @@ -1631,6 +1752,12 @@ asm void dCamera_c::getItemEvCamera() { #pragma pop /* ############################################################################################## */ +/* 8037AAF4-8037AAF4 007154 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8037AC85 = "Longitude"; +#pragma pop + /* 80452B78-80452B7C 001178 0004+00 1/1 0/0 0/0 .sdata2 @10278 */ SECTION_SDATA2 static f32 lit_10278 = 0.5f; @@ -1663,6 +1790,15 @@ asm void dCamera_c::possessedEvCamera() { #pragma pop /* ############################################################################################## */ +/* 8037AAF4-8037AAF4 007154 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8037AC8F = "Centers"; +SECTION_DEAD static char const* const stringBase_8037AC97 = "Eyes"; +SECTION_DEAD static char const* const stringBase_8037AC9C = "Fovys"; +SECTION_DEAD static char const* const stringBase_8037ACA2 = "Choice"; +#pragma pop + /* 80452B94-80452B98 001194 0004+00 1/1 0/0 0/0 .sdata2 @10437 */ SECTION_SDATA2 static f32 lit_10437 = 1.0f / 100.0f; @@ -1688,6 +1824,21 @@ asm void dCamera_c::bSplineEvCamera() { #pragma pop /* ############################################################################################## */ +/* 8037AAF4-8037AAF4 007154 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8037ACA9 = "Actor1"; +SECTION_DEAD static char const* const stringBase_8037ACB0 = "Actor2"; +SECTION_DEAD static char const* const stringBase_8037ACB7 = "CtrRatio"; +SECTION_DEAD static char const* const stringBase_8037ACC0 = "RadiusMin"; +SECTION_DEAD static char const* const stringBase_8037ACCA = "RadiusMax"; +SECTION_DEAD static char const* const stringBase_8037ACD4 = "LatitudeMin"; +SECTION_DEAD static char const* const stringBase_8037ACE0 = "LatitudeMax"; +SECTION_DEAD static char const* const stringBase_8037ACEC = "LongitudeMin"; +SECTION_DEAD static char const* const stringBase_8037ACF9 = "LongitudeMax"; +SECTION_DEAD static char const* const stringBase_8037AD06 = "LongitudeType"; +#pragma pop + /* 80425420-8042542C 052140 000C+00 1/1 0/0 0/0 .bss @10516 */ static u8 lit_10516[12]; @@ -1724,6 +1875,12 @@ asm void dCamera_c::peepHoleEvCamera() { #pragma pop /* ############################################################################################## */ +/* 8037AAF4-8037AAF4 007154 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8037AD14 = "R_SP01"; +#pragma pop + /* 80452BA4-80452BA8 0011A4 0004+00 1/1 0/0 0/0 .sdata2 @11068 */ SECTION_SDATA2 static f32 lit_11068 = 245.0f; @@ -1744,7 +1901,16 @@ SECTION_RODATA static u8 const lit_11087[40] = { 0x00, 0x00, 0x42, 0x96, 0x00, 0x00, 0x42, 0x0C, 0x00, 0x00, 0x41, 0x70, 0x00, 0x00, 0x42, 0xB4, 0x00, 0x00, 0x42, 0xDC, 0x00, 0x00, 0x43, 0x0C, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8037AABC, &lit_11087); +COMPILER_STRIP_GATE(0x8037AABC, &lit_11087); + +/* 8037AAF4-8037AAF4 007154 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8037AD1B = "Teacher"; +SECTION_DEAD static char const* const stringBase_8037AD23 = "Midna"; +SECTION_DEAD static char const* const stringBase_8037AD29 = "Student"; +SECTION_DEAD static char const* const stringBase_8037AD31 = "CtrGapY"; +#pragma pop /* 80452BA8-80452BAC 0011A8 0004+00 1/1 0/0 0/0 .sdata2 @11415 */ SECTION_SDATA2 static f32 lit_11415 = 280.0f; @@ -1785,7 +1951,22 @@ asm void dCamera_c::hintTalkEvCamera() { SECTION_RODATA static u8 const lit_11437[16] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8037AAE4, &lit_11437); +COMPILER_STRIP_GATE(0x8037AAE4, &lit_11437); + +/* 8037AAF4-8037AAF4 007154 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8037AD39 = "Base"; +SECTION_DEAD static char const* const stringBase_8037AD3E = "xxxxxx"; +SECTION_DEAD static char const* const stringBase_8037AD45 = "Set1"; +SECTION_DEAD static char const* const stringBase_8037AD4A = "Use1"; +SECTION_DEAD static char const* const stringBase_8037AD4F = "ooxxxx"; +SECTION_DEAD static char const* const stringBase_8037AD56 = "Set2"; +SECTION_DEAD static char const* const stringBase_8037AD5B = "Use2"; +SECTION_DEAD static char const* const stringBase_8037AD60 = "xxooox"; +/* @stringBase0 padding */ +SECTION_DEAD static char const* const pad_8037AD67 = ""; +#pragma pop /* 80096EDC-80097694 09181C 07B8+00 0/0 1/0 0/0 .text bspTransEvCamera__9dCamera_cFv */ #pragma push @@ -1814,7 +1995,7 @@ asm void __sinit_d_ev_camera_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_8009769C = (void*)__sinit_d_ev_camera_cpp; +REGISTER_CTORS(0x8009769C, __sinit_d_ev_camera_cpp); #pragma pop /* 8009771C-80097738 09205C 001C+00 11/11 22/22 0/0 .text attentionPos__9dCamera_cFP10fopAc_ac_c @@ -1966,90 +2147,4 @@ asm void daAlink_c::getShadowTalkAtnPos() { } #pragma pop -/* 8037AAF4-8037AD68 007154 0273+01 23/23 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_8037AAF4 = "Timer"; -SECTION_DEAD static char const* const stringBase_8037AAFA = "Stay"; -SECTION_DEAD static char const* const stringBase_8037AAFF = "Eye"; -SECTION_DEAD static char const* const stringBase_8037AB03 = "Center"; -SECTION_DEAD static char const* const stringBase_8037AB0A = "BasePos"; -SECTION_DEAD static char const* const stringBase_8037AB12 = "Fovy"; -SECTION_DEAD static char const* const stringBase_8037AB17 = "Bank"; -SECTION_DEAD static char const* const stringBase_8037AB1C = "RelUseMask"; -SECTION_DEAD static char const* const stringBase_8037AB27 = "oo"; -SECTION_DEAD static char const* const stringBase_8037AB2A = "RelActor"; -SECTION_DEAD static char const* const stringBase_8037AB33 = "EyeGap"; -SECTION_DEAD static char const* const stringBase_8037AB3A = "CtrGap"; -SECTION_DEAD static char const* const stringBase_8037AB41 = "EyeCus"; -SECTION_DEAD static char const* const stringBase_8037AB48 = "CtrCus"; -SECTION_DEAD static char const* const stringBase_8037AB4F = "Stoker"; -SECTION_DEAD static char const* const stringBase_8037AB56 = "@STARTER"; -SECTION_DEAD static char const* const stringBase_8037AB5F = "Target"; -SECTION_DEAD static char const* const stringBase_8037AB66 = "@PLAYER"; -SECTION_DEAD static char const* const stringBase_8037AB6E = "TransType"; -SECTION_DEAD static char const* const stringBase_8037AB78 = "Roll"; -SECTION_DEAD static char const* const stringBase_8037AB7D = "RadiusAdd"; -SECTION_DEAD static char const* const stringBase_8037AB87 = "Latitude"; -SECTION_DEAD static char const* const stringBase_8037AB90 = "Radius"; -SECTION_DEAD static char const* const stringBase_8037AB97 = "StartRadius"; -SECTION_DEAD static char const* const stringBase_8037ABA3 = "o"; -SECTION_DEAD static char const* const stringBase_8037ABA5 = "BSpCurve"; -SECTION_DEAD static char const* const stringBase_8037ABAE = "BSpPoints"; -SECTION_DEAD static char const* const stringBase_8037ABB8 = "EndSlot"; -SECTION_DEAD static char const* const stringBase_8037ABC0 = "StartSlot"; -SECTION_DEAD static char const* const stringBase_8037ABCA = "StartEye"; -SECTION_DEAD static char const* const stringBase_8037ABD3 = "StartCenter"; -SECTION_DEAD static char const* const stringBase_8037ABDF = "StartFovy"; -SECTION_DEAD static char const* const stringBase_8037ABE9 = "StartBank"; -SECTION_DEAD static char const* const stringBase_8037ABF3 = "--oo"; -SECTION_DEAD static char const* const stringBase_8037ABF8 = "Cushion"; -SECTION_DEAD static char const* const stringBase_8037AC00 = "NearDist"; -SECTION_DEAD static char const* const stringBase_8037AC09 = "ZoomDist"; -SECTION_DEAD static char const* const stringBase_8037AC12 = "ZoomVAngle"; -SECTION_DEAD static char const* const stringBase_8037AC1D = "FarDist"; -SECTION_DEAD static char const* const stringBase_8037AC25 = "NearTimer"; -SECTION_DEAD static char const* const stringBase_8037AC2F = "FarTimer"; -SECTION_DEAD static char const* const stringBase_8037AC38 = "FrontAngle"; -SECTION_DEAD static char const* const stringBase_8037AC43 = "Blure"; -SECTION_DEAD static char const* const stringBase_8037AC49 = "Dest"; -SECTION_DEAD static char const* const stringBase_8037AC4E = "TargetType"; -SECTION_DEAD static char const* const stringBase_8037AC59 = "ID"; -SECTION_DEAD static char const* const stringBase_8037AC5C = "CameraID"; -SECTION_DEAD static char const* const stringBase_8037AC65 = "Name"; -SECTION_DEAD static char const* const stringBase_8037AC6A = "FN01"; -SECTION_DEAD static char const* const stringBase_8037AC6F = "Type"; -SECTION_DEAD static char const* const stringBase_8037AC74 = "Slot"; -SECTION_DEAD static char const* const stringBase_8037AC79 = "CurvePoints"; -SECTION_DEAD static char const* const stringBase_8037AC85 = "Longitude"; -SECTION_DEAD static char const* const stringBase_8037AC8F = "Centers"; -SECTION_DEAD static char const* const stringBase_8037AC97 = "Eyes"; -SECTION_DEAD static char const* const stringBase_8037AC9C = "Fovys"; -SECTION_DEAD static char const* const stringBase_8037ACA2 = "Choice"; -SECTION_DEAD static char const* const stringBase_8037ACA9 = "Actor1"; -SECTION_DEAD static char const* const stringBase_8037ACB0 = "Actor2"; -SECTION_DEAD static char const* const stringBase_8037ACB7 = "CtrRatio"; -SECTION_DEAD static char const* const stringBase_8037ACC0 = "RadiusMin"; -SECTION_DEAD static char const* const stringBase_8037ACCA = "RadiusMax"; -SECTION_DEAD static char const* const stringBase_8037ACD4 = "LatitudeMin"; -SECTION_DEAD static char const* const stringBase_8037ACE0 = "LatitudeMax"; -SECTION_DEAD static char const* const stringBase_8037ACEC = "LongitudeMin"; -SECTION_DEAD static char const* const stringBase_8037ACF9 = "LongitudeMax"; -SECTION_DEAD static char const* const stringBase_8037AD06 = "LongitudeType"; -SECTION_DEAD static char const* const stringBase_8037AD14 = "R_SP01"; -SECTION_DEAD static char const* const stringBase_8037AD1B = "Teacher"; -SECTION_DEAD static char const* const stringBase_8037AD23 = "Midna"; -SECTION_DEAD static char const* const stringBase_8037AD29 = "Student"; -SECTION_DEAD static char const* const stringBase_8037AD31 = "CtrGapY"; -SECTION_DEAD static char const* const stringBase_8037AD39 = "Base"; -SECTION_DEAD static char const* const stringBase_8037AD3E = "xxxxxx"; -SECTION_DEAD static char const* const stringBase_8037AD45 = "Set1"; -SECTION_DEAD static char const* const stringBase_8037AD4A = "Use1"; -SECTION_DEAD static char const* const stringBase_8037AD4F = "ooxxxx"; -SECTION_DEAD static char const* const stringBase_8037AD56 = "Set2"; -SECTION_DEAD static char const* const stringBase_8037AD5B = "Use2"; -SECTION_DEAD static char const* const stringBase_8037AD60 = "xxooox"; -/* @stringBase0 padding */ -SECTION_DEAD static char const* const pad_8037AD67 = ""; -#pragma pop +/* 8037AAF4-8037AAF4 007154 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/d_eye_hl.cpp b/src/d/d_eye_hl.cpp index 6d44272ed59..ba34ac4abfb 100644 --- a/src/d/d_eye_hl.cpp +++ b/src/d/d_eye_hl.cpp @@ -61,6 +61,16 @@ extern "C" extern u8 g_envHIO[68]; // Declarations: // +/* ############################################################################################## */ +/* 8037B100-8037B100 007760 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8037B100 = + "目のハイライトテクスチャーがありません！\n"; +/* @stringBase0 padding */ +SECTION_DEAD static char const* const pad_8037B12A = "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"; +#pragma pop + /* 8009C964-8009CA28 0972A4 00C4+00 0/0 2/2 0/0 .text entry__8dEyeHL_cFP12J3DModelDataPCc */ #pragma push @@ -145,12 +155,4 @@ u8 struct_80450FB8[4]; extern u8 struct_80450FBC[4]; u8 struct_80450FBC[4]; -/* 8037B100-8037B140 007760 002A+16 1/1 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_8037B100 = - "目のハイライトテクスチャーがありません！\n"; -/* @stringBase0 padding */ -SECTION_DEAD static char const* const pad_8037B12A = "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"; -#pragma pop +/* 8037B100-8037B100 007760 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/d_gameover.cpp b/src/d/d_gameover.cpp index bcb6c0a5ce7..33f61dc2dc2 100644 --- a/src/d/d_gameover.cpp +++ b/src/d/d_gameover.cpp @@ -624,6 +624,13 @@ asm dGov_HIO_c::dGov_HIO_c() { #pragma pop /* ############################################################################################## */ +/* 80394C28-80394C28 021288 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80394C28 = "Gover"; +SECTION_DEAD static char const* const stringBase_80394C2E = "D_MN10A"; +#pragma pop + /* 803BBDA8-803BBDB8 018EC8 0010+00 2/2 0/0 0/0 .data __vt__24dDlst_Gameover_CAPTURE_c */ SECTION_DATA extern void* __vt__24dDlst_Gameover_CAPTURE_c[4] = { (void*)NULL /* RTTI */, @@ -836,6 +843,15 @@ asm void dGameover_c::_delete() { #pragma pop /* ############################################################################################## */ +/* 80394C28-80394C28 021288 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80394C36 = "zelda_game_over.blo"; +SECTION_DEAD static char const* const stringBase_80394C4A = "tt_block8x8.bti"; +/* @stringBase0 padding */ +SECTION_DEAD static char const* const pad_80394C5A = "\0\0\0\0\0"; +#pragma pop + /* 80453BA0-80453BA4 0021A0 0004+00 1/1 0/0 0/0 .sdata2 @4290 */ SECTION_SDATA2 static f32 lit_4290 = 486.0f; @@ -1003,7 +1019,7 @@ asm void __sinit_d_gameover_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_8019C0C8 = (void*)__sinit_d_gameover_cpp; +REGISTER_CTORS(0x8019C0C8, __sinit_d_gameover_cpp); #pragma pop /* 8019C2CC-8019C314 196C0C 0048+00 1/0 0/0 0/0 .text __dt__24dDlst_Gameover_CAPTURE_cFv @@ -1027,14 +1043,4 @@ asm dMenu_save_c::~dMenu_save_c() { } #pragma pop -/* 80394C28-80394C60 021288 0032+06 3/3 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80394C28 = "Gover"; -SECTION_DEAD static char const* const stringBase_80394C2E = "D_MN10A"; -SECTION_DEAD static char const* const stringBase_80394C36 = "zelda_game_over.blo"; -SECTION_DEAD static char const* const stringBase_80394C4A = "tt_block8x8.bti"; -/* @stringBase0 padding */ -SECTION_DEAD static char const* const pad_80394C5A = "\0\0\0\0\0"; -#pragma pop +/* 80394C28-80394C28 021288 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/d_insect.cpp b/src/d/d_insect.cpp index bd4841542ac..19d5313e43b 100644 --- a/src/d/d_insect.cpp +++ b/src/d/d_insect.cpp @@ -36,7 +36,6 @@ struct dInsect_c { struct dEvt_control_c { /* 80042468 */ void reset(); - /* 800436EC */ void setPtI_Id(unsigned int); }; struct dEvent_manager_c { @@ -108,6 +107,13 @@ asm dInsect_c::dInsect_c() { } #pragma pop +/* ############################################################################################## */ +/* 80393D98-80393D98 0203F8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80393D98 = "DEFAULT_GETITEM"; +#pragma pop + /* 8015E078-8015E26C 1589B8 01F4+00 0/0 0/0 24/24 .text Insect_GetDemoMain__9dInsect_cFv */ #pragma push @@ -160,9 +166,4 @@ asm void dInsect_c::CalcZBuffer(f32 param_0) { } #pragma pop -/* 80393D98-80393DA8 0203F8 0010+00 1/1 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80393D98 = "DEFAULT_GETITEM"; -#pragma pop +/* 80393D98-80393D98 0203F8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/d_item.cpp b/src/d/d_item.cpp index d7b4befaca2..3507e3ee47b 100644 --- a/src/d/d_item.cpp +++ b/src/d/d_item.cpp @@ -4419,6 +4419,15 @@ asm void isInsect(u8 param_0) { } #pragma pop +/* ############################################################################################## */ +/* 8037B0D0-8037B0D0 007730 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8037B0D0 = "D_MN08"; +/* @stringBase0 padding */ +SECTION_DEAD static char const* const pad_8037B0D7 = ""; +#pragma pop + /* 8009B7C4-8009B940 096104 017C+00 0/0 3/3 0/0 .text check_itemno__Fi */ #pragma push #pragma optimization_level 0 @@ -4443,11 +4452,4 @@ static asm void addBombCount(u8 param_0, u8 param_1) { /* 80450F90-80450F98 000490 0004+04 0/0 2/2 0/0 .sbss mData__12dEnemyItem_c */ u8 dEnemyItem_c::mData[4 + 4 /* padding */]; -/* 8037B0D0-8037B0D8 007730 0007+01 1/1 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_8037B0D0 = "D_MN08"; -/* @stringBase0 padding */ -SECTION_DEAD static char const* const pad_8037B0D7 = ""; -#pragma pop +/* 8037B0D0-8037B0D0 007730 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/d_item_data.cpp b/src/d/d_item_data.cpp index 56a364aaac8..79eebb74291 100644 --- a/src/d/d_item_data.cpp +++ b/src/d/d_item_data.cpp @@ -35,6 +35,554 @@ extern "C" u8 item_info__10dItem_data[1020 + 4 /* padding */]; // /* ############################################################################################## */ +/* 8037AD68-8037AD72 0073C8 000A+00 1/0 0/0 0/0 .rodata None */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8037AD68 = "F_gD_rupy"; +#pragma pop + +/* 8037AD72-8037AD7C 0073D2 000A+00 1/0 0/0 0/0 .rodata None */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8037AD72 = "O_gD_bomb"; +#pragma pop + +/* 8037AD7C-8037AD86 0073DC 000A+00 1/0 0/0 0/0 .rodata None */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8037AD7C = "O_gD_arow"; +#pragma pop + +/* 8037AD86-8037AD90 0073E6 000A+00 1/0 0/0 0/0 .rodata None */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8037AD86 = "O_gD_tane"; +#pragma pop + +/* 8037AD90-8037AD98 0073F0 0008+00 1/0 0/0 0/0 .rodata None */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8037AD90 = "O_gD_PG"; +#pragma pop + +/* 8037AD98-8037ADA0 0073F8 0008+00 1/0 0/0 0/0 .rodata None */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8037AD98 = "O_gD_BI"; +#pragma pop + +/* 8037ADA0-8037ADA9 007400 0009+00 1/0 0/0 0/0 .rodata None */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8037ADA0 = "T_gD_key"; +#pragma pop + +/* 8037ADA9-8037ADB3 007409 000A+00 1/0 0/0 0/0 .rodata None */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8037ADA9 = "O_gD_hutk"; +#pragma pop + +/* 8037ADB3-8037ADBD 007413 000A+00 1/0 0/0 0/0 .rodata None */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8037ADB3 = "O_gD_hutu"; +#pragma pop + +/* 8037ADBD-8037ADC6 00741D 0009+00 1/0 0/0 0/0 .rodata None */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8037ADBD = "T_gD_map"; +#pragma pop + +/* 8037ADC6-8037ADD0 007426 000A+00 1/0 0/0 0/0 .rodata None */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8037ADC6 = "T_gD_kmps"; +#pragma pop + +/* 8037ADD0-8037ADD9 007430 0009+00 1/0 0/0 0/0 .rodata None */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8037ADD0 = "O_gD_TKS"; +#pragma pop + +/* 8037ADD9-8037ADE3 007439 000A+00 1/0 0/0 0/0 .rodata None */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8037ADD9 = "T_gD_bkey"; +#pragma pop + +/* 8037ADE3-8037ADEC 007443 0009+00 1/0 0/0 0/0 .rodata None */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8037ADE3 = "O_gD_TKC"; +#pragma pop + +/* 8037ADEC-8037ADF5 00744C 0009+00 1/0 0/0 0/0 .rodata None */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8037ADEC = "O_gD_SWA"; +#pragma pop + +/* 8037ADF5-8037ADFE 007455 0009+00 1/0 0/0 0/0 .rodata None */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8037ADF5 = "T_gD_SHB"; +#pragma pop + +/* 8037ADFE-8037AE07 00745E 0009+00 1/0 0/0 0/0 .rodata None */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8037ADFE = "O_gD_SHC"; +#pragma pop + +/* 8037AE07-8037AE10 007467 0009+00 1/0 0/0 0/0 .rodata None */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8037AE07 = "O_gD_SHA"; +#pragma pop + +/* 8037AE10-8037AE1A 007470 000A+00 1/0 0/0 0/0 .rodata None */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8037AE10 = "O_gD_mem2"; +#pragma pop + +/* 8037AE1A-8037AE24 00747A 000A+00 1/0 0/0 0/0 .rodata None */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8037AE1A = "O_gD_marm"; +#pragma pop + +/* 8037AE24-8037AE2E 007484 000A+00 1/0 0/0 0/0 .rodata None */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8037AE24 = "O_gD_zora"; +#pragma pop + +/* 8037AE2E-8037AE38 00748E 000A+00 1/0 0/0 0/0 .rodata None */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8037AE2E = "O_gD_Injy"; +#pragma pop + +/* 8037AE38-8037AE42 007498 000A+00 1/0 0/0 0/0 .rodata None */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8037AE38 = "O_gD_puL2"; +#pragma pop + +/* 8037AE42-8037AE4C 0074A2 000A+00 1/0 0/0 0/0 .rodata None */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8037AE42 = "O_gD_puL3"; +#pragma pop + +/* 8037AE4C-8037AE56 0074AC 000A+00 1/0 0/0 0/0 .rodata None */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8037AE4C = "O_gD_sang"; +#pragma pop + +/* 8037AE56-8037AE60 0074B6 000A+00 1/0 0/0 0/0 .rodata None */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8037AE56 = "O_gD_hawk"; +#pragma pop + +/* 8037AE60-8037AE69 0074C0 0009+00 2/0 0/0 0/0 .rodata None */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8037AE60 = "O_gD_SWB"; +#pragma pop + +/* 8037AE69-8037AE73 0074C9 000A+00 1/0 0/0 0/0 .rodata None */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8037AE69 = "O_gD_boom"; +#pragma pop + +/* 8037AE73-8037AE7B 0074D3 0008+00 1/0 0/0 0/0 .rodata None */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8037AE73 = "O_gD_SP"; +#pragma pop + +/* 8037AE7B-8037AE83 0074DB 0008+00 1/0 0/0 0/0 .rodata None */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8037AE7B = "O_gD_IB"; +#pragma pop + +/* 8037AE83-8037AE8C 0074E3 0009+00 1/0 0/0 0/0 .rodata None */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8037AE83 = "O_gD_bow"; +#pragma pop + +/* 8037AE8C-8037AE94 0074EC 0008+00 1/0 0/0 0/0 .rodata None */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8037AE8C = "O_gD_HS"; +#pragma pop + +/* 8037AE94-8037AE9E 0074F4 000A+00 1/0 0/0 0/0 .rodata None */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8037AE94 = "O_gD_boot"; +#pragma pop + +/* 8037AE9E-8037AEA8 0074FE 000A+00 1/0 0/0 0/0 .rodata None */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8037AE9E = "O_gD_CROD"; +#pragma pop + +/* 8037AEA8-8037AEB0 007508 0008+00 1/0 0/0 0/0 .rodata None */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8037AEA8 = "T_gD_kt"; +#pragma pop + +/* 8037AEB0-8037AEBA 007510 000A+00 1/0 0/0 0/0 .rodata None */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8037AEB0 = "O_gD_uktr"; +#pragma pop + +/* 8037AEBA-8037AEC4 00751A 000A+00 1/0 0/0 0/0 .rodata None */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8037AEBA = "O_gD_pach"; +#pragma pop + +/* 8037AEC4-8037AECE 007524 000A+00 1/0 0/0 0/0 .rodata None */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8037AEC4 = "O_gD_bmL2"; +#pragma pop + +/* 8037AECE-8037AED8 00752E 000A+00 1/0 0/0 0/0 .rodata None */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8037AECE = "O_gD_bomc"; +#pragma pop + +/* 8037AED8-8037AEE2 007538 000A+00 1/0 0/0 0/0 .rodata None */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8037AED8 = "O_gD_quL1"; +#pragma pop + +/* 8037AEE2-8037AEEC 007542 000A+00 1/0 0/0 0/0 .rodata None */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8037AEE2 = "O_gD_quL2"; +#pragma pop + +/* 8037AEEC-8037AEF6 00754C 000A+00 1/0 0/0 0/0 .rodata None */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8037AEEC = "O_gD_quL3"; +#pragma pop + +/* 8037AEF6-8037AF00 007556 000A+00 1/0 0/0 0/0 .rodata None */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8037AEF6 = "O_gD_bott"; +#pragma pop + +/* 8037AF00-8037AF09 007560 0009+00 1/0 0/0 0/0 .rodata None */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8037AF00 = "Obj_kntr"; +#pragma pop + +/* 8037AF09-8037AF13 007569 000A+00 1/0 0/0 0/0 .rodata None */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8037AF09 = "O_gD_lttr"; +#pragma pop + +/* 8037AF13-8037AF1D 007573 000A+00 1/0 0/0 0/0 .rodata None */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8037AF13 = "O_gD_bill"; +#pragma pop + +/* 8037AF1D-8037AF27 00757D 000A+00 1/0 0/0 0/0 .rodata None */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8037AF1D = "O_gD_wood"; +#pragma pop + +/* 8037AF27-8037AF31 007587 000A+00 1/0 0/0 0/0 .rodata None */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8037AF27 = "O_gD_pend"; +#pragma pop + +/* 8037AF31-8037AF3B 007591 000A+00 1/0 0/0 0/0 .rodata None */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8037AF31 = "O_gD_hk_s"; +#pragma pop + +/* 8037AF3B-8037AF45 00759B 000A+00 1/0 0/0 0/0 .rodata None */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8037AF3B = "N_gD_Lpod"; +#pragma pop + +/* 8037AF45-8037AF4F 0075A5 000A+00 1/0 0/0 0/0 .rodata None */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8037AF45 = "O_gD_kabo"; +#pragma pop + +/* 8037AF4F-8037AF59 0075AF 000A+00 1/0 0/0 0/0 .rodata None */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8037AF4F = "O_gD_kabm"; +#pragma pop + +/* 8037AF59-8037AF63 0075B9 000A+00 1/0 0/0 0/0 .rodata None */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8037AF59 = "O_gD_choo"; +#pragma pop + +/* 8037AF63-8037AF6D 0075C3 000A+00 1/0 0/0 0/0 .rodata None */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8037AF63 = "O_gD_chom"; +#pragma pop + +/* 8037AF6D-8037AF77 0075CD 000A+00 1/0 0/0 0/0 .rodata None */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8037AF6D = "O_gD_kuwo"; +#pragma pop + +/* 8037AF77-8037AF81 0075D7 000A+00 1/0 0/0 0/0 .rodata None */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8037AF77 = "O_gD_kuwm"; +#pragma pop + +/* 8037AF81-8037AF8B 0075E1 000A+00 1/0 0/0 0/0 .rodata None */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8037AF81 = "O_gD_bato"; +#pragma pop + +/* 8037AF8B-8037AF95 0075EB 000A+00 1/0 0/0 0/0 .rodata None */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8037AF8B = "O_gD_batm"; +#pragma pop + +/* 8037AF95-8037AF9F 0075F5 000A+00 1/0 0/0 0/0 .rodata None */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8037AF95 = "O_gD_nano"; +#pragma pop + +/* 8037AF9F-8037AFA9 0075FF 000A+00 1/0 0/0 0/0 .rodata None */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8037AF9F = "O_gD_nanm"; +#pragma pop + +/* 8037AFA9-8037AFB3 007609 000A+00 1/0 0/0 0/0 .rodata None */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8037AFA9 = "O_gD_dano"; +#pragma pop + +/* 8037AFB3-8037AFBD 007613 000A+00 1/0 0/0 0/0 .rodata None */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8037AFB3 = "O_gD_danm"; +#pragma pop + +/* 8037AFBD-8037AFC7 00761D 000A+00 1/0 0/0 0/0 .rodata None */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8037AFBD = "O_gD_kamo"; +#pragma pop + +/* 8037AFC7-8037AFD1 007627 000A+00 1/0 0/0 0/0 .rodata None */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8037AFC7 = "O_gD_kamm"; +#pragma pop + +/* 8037AFD1-8037AFDB 007631 000A+00 1/0 0/0 0/0 .rodata None */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8037AFD1 = "O_gD_teno"; +#pragma pop + +/* 8037AFDB-8037AFE5 00763B 000A+00 1/0 0/0 0/0 .rodata None */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8037AFDB = "O_gD_tenm"; +#pragma pop + +/* 8037AFE5-8037AFEF 007645 000A+00 1/0 0/0 0/0 .rodata None */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8037AFE5 = "O_gD_kato"; +#pragma pop + +/* 8037AFEF-8037AFF9 00764F 000A+00 1/0 0/0 0/0 .rodata None */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8037AFEF = "O_gD_katm"; +#pragma pop + +/* 8037AFF9-8037B003 007659 000A+00 1/0 0/0 0/0 .rodata None */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8037AFF9 = "O_gD_tono"; +#pragma pop + +/* 8037B003-8037B00D 007663 000A+00 1/0 0/0 0/0 .rodata None */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8037B003 = "O_gD_tonm"; +#pragma pop + +/* 8037B00D-8037B017 00766D 000A+00 1/0 0/0 0/0 .rodata None */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8037B00D = "O_gD_ario"; +#pragma pop + +/* 8037B017-8037B021 007677 000A+00 1/0 0/0 0/0 .rodata None */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8037B017 = "O_gD_arim"; +#pragma pop + +/* 8037B021-8037B02B 007681 000A+00 1/0 0/0 0/0 .rodata None */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8037B021 = "O_gD_kago"; +#pragma pop + +/* 8037B02B-8037B035 00768B 000A+00 1/0 0/0 0/0 .rodata None */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8037B02B = "O_gD_kagm"; +#pragma pop + +/* 8037B035-8037B03F 007695 000A+00 1/0 0/0 0/0 .rodata None */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8037B035 = "O_gD_tama"; +#pragma pop + +/* 8037B03F-8037B049 00769F 000A+00 1/0 0/0 0/0 .rodata None */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8037B03F = "O_gD_komo"; +#pragma pop + +/* 8037B049-8037B053 0076A9 000A+00 1/0 0/0 0/0 .rodata None */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8037B049 = "O_gD_pump"; +#pragma pop + +/* 8037B053-8037B05D 0076B3 000A+00 1/0 0/0 0/0 .rodata None */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8037B053 = "O_gD_chee"; +#pragma pop + +/* 8037B05D-8037B067 0076BD 000A+00 1/0 0/0 0/0 .rodata None */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8037B05D = "O_gD_bkey"; +#pragma pop + +/* 8037B067-8037B071 0076C7 000A+00 1/0 0/0 0/0 .rodata None */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8037B067 = "D_MKey_01"; +#pragma pop + +/* 8037B071-8037B07B 0076D1 000A+00 1/0 0/0 0/0 .rodata None */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8037B071 = "D_MKey_02"; +#pragma pop + +/* 8037B07B-8037B085 0076DB 000A+00 1/0 0/0 0/0 .rodata None */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8037B07B = "D_MKey_03"; +#pragma pop + +/* 8037B085-8037B08F 0076E5 000A+00 1/0 0/0 0/0 .rodata None */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8037B085 = "O_gD_Mkey"; +#pragma pop + +/* 8037B08F-8037B096 0076EF 0007+00 1/0 0/0 0/0 .rodata None */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8037B08F = "Always"; +#pragma pop + +/* 8037B096-8037B09E 0076F6 0008+00 1/0 0/0 0/0 .rodata None */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8037B096 = "T_g_key"; +#pragma pop + +/* 8037B09E-8037B0A7 0076FE 0009+00 1/0 0/0 0/0 .rodata None */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8037B09E = "T_g_bkey"; +#pragma pop + +/* 8037B0A7-8037B0AF 007707 0008+00 1/0 0/0 0/0 .rodata None */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8037B0A7 = "O_g_SWA"; +#pragma pop + +/* 8037B0AF-8037B0B7 00770F 0008+00 1/0 0/0 0/0 .rodata None */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8037B0AF = "T_g_SHB"; +#pragma pop + +/* 8037B0B7-8037B0C0 007717 0009+00 1/0 0/0 0/0 .rodata None */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8037B0B7 = "O_g_ZORA"; +#pragma pop + +/* 8037B0C0-8037B0C7 007720 0007+00 1/0 0/0 0/0 .rodata None */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8037B0C0 = "T_g_kt"; +#pragma pop + +/* 8037B0C7-8037B0D0 007727 0007+02 1/0 0/0 0/0 .rodata None */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8037B0C7 = "O_wood"; +/* @stringBase0 padding */ +SECTION_DEAD static char const* const pad_8037B0CE = "\0"; +#pragma pop + /* 803AC5A0-803ADD88 -00001 17E8+00 0/0 10/10 2/2 .data item_resource__10dItem_data */ SECTION_DATA void* dItem_data::item_resource[1530] = { (void*)&d_d_item_data__stringBase0, @@ -3622,101 +4170,4 @@ SECTION_DATA u8 dItem_data::item_info[1020 + 4 /* padding */] = { 0x00, }; -/* 8037AD68-8037B0D0 0073C8 0366+02 2/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_8037AD68 = "F_gD_rupy"; -SECTION_DEAD static char const* const stringBase_8037AD72 = "O_gD_bomb"; -SECTION_DEAD static char const* const stringBase_8037AD7C = "O_gD_arow"; -SECTION_DEAD static char const* const stringBase_8037AD86 = "O_gD_tane"; -SECTION_DEAD static char const* const stringBase_8037AD90 = "O_gD_PG"; -SECTION_DEAD static char const* const stringBase_8037AD98 = "O_gD_BI"; -SECTION_DEAD static char const* const stringBase_8037ADA0 = "T_gD_key"; -SECTION_DEAD static char const* const stringBase_8037ADA9 = "O_gD_hutk"; -SECTION_DEAD static char const* const stringBase_8037ADB3 = "O_gD_hutu"; -SECTION_DEAD static char const* const stringBase_8037ADBD = "T_gD_map"; -SECTION_DEAD static char const* const stringBase_8037ADC6 = "T_gD_kmps"; -SECTION_DEAD static char const* const stringBase_8037ADD0 = "O_gD_TKS"; -SECTION_DEAD static char const* const stringBase_8037ADD9 = "T_gD_bkey"; -SECTION_DEAD static char const* const stringBase_8037ADE3 = "O_gD_TKC"; -SECTION_DEAD static char const* const stringBase_8037ADEC = "O_gD_SWA"; -SECTION_DEAD static char const* const stringBase_8037ADF5 = "T_gD_SHB"; -SECTION_DEAD static char const* const stringBase_8037ADFE = "O_gD_SHC"; -SECTION_DEAD static char const* const stringBase_8037AE07 = "O_gD_SHA"; -SECTION_DEAD static char const* const stringBase_8037AE10 = "O_gD_mem2"; -SECTION_DEAD static char const* const stringBase_8037AE1A = "O_gD_marm"; -SECTION_DEAD static char const* const stringBase_8037AE24 = "O_gD_zora"; -SECTION_DEAD static char const* const stringBase_8037AE2E = "O_gD_Injy"; -SECTION_DEAD static char const* const stringBase_8037AE38 = "O_gD_puL2"; -SECTION_DEAD static char const* const stringBase_8037AE42 = "O_gD_puL3"; -SECTION_DEAD static char const* const stringBase_8037AE4C = "O_gD_sang"; -SECTION_DEAD static char const* const stringBase_8037AE56 = "O_gD_hawk"; -SECTION_DEAD static char const* const stringBase_8037AE60 = "O_gD_SWB"; -SECTION_DEAD static char const* const stringBase_8037AE69 = "O_gD_boom"; -SECTION_DEAD static char const* const stringBase_8037AE73 = "O_gD_SP"; -SECTION_DEAD static char const* const stringBase_8037AE7B = "O_gD_IB"; -SECTION_DEAD static char const* const stringBase_8037AE83 = "O_gD_bow"; -SECTION_DEAD static char const* const stringBase_8037AE8C = "O_gD_HS"; -SECTION_DEAD static char const* const stringBase_8037AE94 = "O_gD_boot"; -SECTION_DEAD static char const* const stringBase_8037AE9E = "O_gD_CROD"; -SECTION_DEAD static char const* const stringBase_8037AEA8 = "T_gD_kt"; -SECTION_DEAD static char const* const stringBase_8037AEB0 = "O_gD_uktr"; -SECTION_DEAD static char const* const stringBase_8037AEBA = "O_gD_pach"; -SECTION_DEAD static char const* const stringBase_8037AEC4 = "O_gD_bmL2"; -SECTION_DEAD static char const* const stringBase_8037AECE = "O_gD_bomc"; -SECTION_DEAD static char const* const stringBase_8037AED8 = "O_gD_quL1"; -SECTION_DEAD static char const* const stringBase_8037AEE2 = "O_gD_quL2"; -SECTION_DEAD static char const* const stringBase_8037AEEC = "O_gD_quL3"; -SECTION_DEAD static char const* const stringBase_8037AEF6 = "O_gD_bott"; -SECTION_DEAD static char const* const stringBase_8037AF00 = "Obj_kntr"; -SECTION_DEAD static char const* const stringBase_8037AF09 = "O_gD_lttr"; -SECTION_DEAD static char const* const stringBase_8037AF13 = "O_gD_bill"; -SECTION_DEAD static char const* const stringBase_8037AF1D = "O_gD_wood"; -SECTION_DEAD static char const* const stringBase_8037AF27 = "O_gD_pend"; -SECTION_DEAD static char const* const stringBase_8037AF31 = "O_gD_hk_s"; -SECTION_DEAD static char const* const stringBase_8037AF3B = "N_gD_Lpod"; -SECTION_DEAD static char const* const stringBase_8037AF45 = "O_gD_kabo"; -SECTION_DEAD static char const* const stringBase_8037AF4F = "O_gD_kabm"; -SECTION_DEAD static char const* const stringBase_8037AF59 = "O_gD_choo"; -SECTION_DEAD static char const* const stringBase_8037AF63 = "O_gD_chom"; -SECTION_DEAD static char const* const stringBase_8037AF6D = "O_gD_kuwo"; -SECTION_DEAD static char const* const stringBase_8037AF77 = "O_gD_kuwm"; -SECTION_DEAD static char const* const stringBase_8037AF81 = "O_gD_bato"; -SECTION_DEAD static char const* const stringBase_8037AF8B = "O_gD_batm"; -SECTION_DEAD static char const* const stringBase_8037AF95 = "O_gD_nano"; -SECTION_DEAD static char const* const stringBase_8037AF9F = "O_gD_nanm"; -SECTION_DEAD static char const* const stringBase_8037AFA9 = "O_gD_dano"; -SECTION_DEAD static char const* const stringBase_8037AFB3 = "O_gD_danm"; -SECTION_DEAD static char const* const stringBase_8037AFBD = "O_gD_kamo"; -SECTION_DEAD static char const* const stringBase_8037AFC7 = "O_gD_kamm"; -SECTION_DEAD static char const* const stringBase_8037AFD1 = "O_gD_teno"; -SECTION_DEAD static char const* const stringBase_8037AFDB = "O_gD_tenm"; -SECTION_DEAD static char const* const stringBase_8037AFE5 = "O_gD_kato"; -SECTION_DEAD static char const* const stringBase_8037AFEF = "O_gD_katm"; -SECTION_DEAD static char const* const stringBase_8037AFF9 = "O_gD_tono"; -SECTION_DEAD static char const* const stringBase_8037B003 = "O_gD_tonm"; -SECTION_DEAD static char const* const stringBase_8037B00D = "O_gD_ario"; -SECTION_DEAD static char const* const stringBase_8037B017 = "O_gD_arim"; -SECTION_DEAD static char const* const stringBase_8037B021 = "O_gD_kago"; -SECTION_DEAD static char const* const stringBase_8037B02B = "O_gD_kagm"; -SECTION_DEAD static char const* const stringBase_8037B035 = "O_gD_tama"; -SECTION_DEAD static char const* const stringBase_8037B03F = "O_gD_komo"; -SECTION_DEAD static char const* const stringBase_8037B049 = "O_gD_pump"; -SECTION_DEAD static char const* const stringBase_8037B053 = "O_gD_chee"; -SECTION_DEAD static char const* const stringBase_8037B05D = "O_gD_bkey"; -SECTION_DEAD static char const* const stringBase_8037B067 = "D_MKey_01"; -SECTION_DEAD static char const* const stringBase_8037B071 = "D_MKey_02"; -SECTION_DEAD static char const* const stringBase_8037B07B = "D_MKey_03"; -SECTION_DEAD static char const* const stringBase_8037B085 = "O_gD_Mkey"; -SECTION_DEAD static char const* const stringBase_8037B08F = "Always"; -SECTION_DEAD static char const* const stringBase_8037B096 = "T_g_key"; -SECTION_DEAD static char const* const stringBase_8037B09E = "T_g_bkey"; -SECTION_DEAD static char const* const stringBase_8037B0A7 = "O_g_SWA"; -SECTION_DEAD static char const* const stringBase_8037B0AF = "T_g_SHB"; -SECTION_DEAD static char const* const stringBase_8037B0B7 = "O_g_ZORA"; -SECTION_DEAD static char const* const stringBase_8037B0C0 = "T_g_kt"; -SECTION_DEAD static char const* const stringBase_8037B0C7 = "O_wood"; -/* @stringBase0 padding */ -SECTION_DEAD static char const* const pad_8037B0CE = "\0"; -#pragma pop +/* 8037AD68-8037AD68 0073C8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/d_jnt_col.cpp b/src/d/d_jnt_col.cpp index 1de4bfea801..90bd03c4722 100644 --- a/src/d/d_jnt_col.cpp +++ b/src/d/d_jnt_col.cpp @@ -37,8 +37,6 @@ struct mDoMtx_stack_c { struct fopAc_ac_c {}; -struct J3DModel {}; - struct cM3dGLin { /* 80036A5C */ ~cM3dGLin(); /* 8026F2E8 */ void SetStartEnd(cXyz const&, cXyz const&); @@ -46,6 +44,8 @@ struct cM3dGLin { struct dJntColData_c {}; +struct J3DModel {}; + struct dJntCol_c { /* 80035C8C */ dJntCol_c(); /* 80035CA0 */ void init(fopAc_ac_c*, dJntColData_c const*, J3DModel*, int); diff --git a/src/d/d_k_wmark.cpp b/src/d/d_k_wmark.cpp index 067d7c7033f..86e0369bbca 100644 --- a/src/d/d_k_wmark.cpp +++ b/src/d/d_k_wmark.cpp @@ -157,6 +157,14 @@ extern "C" extern u8 struct_80450D64[4]; // /* ############################################################################################## */ +/* 8039A494-8039A494 026AF4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8039A494 = "Alink"; +/* @stringBase0 padding */ +SECTION_DEAD static char const* const pad_8039A49A = "\0\0\0\0\0"; +#pragma pop + /* 80430C90-80430C9C 05D9B0 000C+00 1/1 0/0 0/0 .bss @3644 */ static u8 lit_3644[12]; @@ -260,7 +268,7 @@ static asm void dkWmark_Execute(dkWmark_c* param_0) { SECTION_RODATA static u8 const data_8039A488[12] = { 0x00, 0x00, 0x00, 0x82, 0x5F, 0x4B, 0x32, 0x3C, 0x64, 0x6E, 0x78, 0x28, }; -COMPILER_STRIP_GATE(8039A488, &data_8039A488); +COMPILER_STRIP_GATE(0x8039A488, &data_8039A488); /* 80454FE4-80454FE8 0035E4 0004+00 1/1 0/0 0/0 .sdata2 @3906 */ SECTION_SDATA2 static f32 lit_3906 = 50.0f; @@ -302,11 +310,4 @@ SECTION_DATA extern void* g_profile_WMARK[10 + 1 /* padding */] = { NULL, }; -/* 8039A494-8039A4A0 026AF4 0006+06 1/1 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_8039A494 = "Alink"; -/* @stringBase0 padding */ -SECTION_DEAD static char const* const pad_8039A49A = "\0\0\0\0\0"; -#pragma pop +/* 8039A494-8039A494 026AF4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/d_k_wpillar.cpp b/src/d/d_k_wpillar.cpp index 74b4939e7aa..cfbebadbe58 100644 --- a/src/d/d_k_wpillar.cpp +++ b/src/d/d_k_wpillar.cpp @@ -76,10 +76,10 @@ struct dRes_control_c { struct dPa_levelEcallBack {}; -struct _GXColor {}; - struct csXyz {}; +struct _GXColor {}; + struct dPa_control_c { /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, diff --git a/src/d/d_kantera_icon_meter.cpp b/src/d/d_kantera_icon_meter.cpp index cf7abd8c9d8..886e754fb32 100644 --- a/src/d/d_kantera_icon_meter.cpp +++ b/src/d/d_kantera_icon_meter.cpp @@ -119,6 +119,15 @@ asm dKantera_icon_c::~dKantera_icon_c() { } #pragma pop +/* ############################################################################################## */ +/* 80394F50-80394F50 0215B0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80394F50 = "zelda_kantera_icon_mater.blo"; +/* @stringBase0 padding */ +SECTION_DEAD static char const* const pad_80394F6D = "\0\0"; +#pragma pop + /* 801AEA68-801AEB7C 1A93A8 0114+00 1/1 0/0 0/0 .text initiate__15dKantera_icon_cFv */ #pragma push #pragma optimization_level 0 @@ -210,11 +219,4 @@ asm dDlst_KanteraIcon_c::~dDlst_KanteraIcon_c() { } #pragma pop -/* 80394F50-80394F70 0215B0 001D+03 1/1 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80394F50 = "zelda_kantera_icon_mater.blo"; -/* @stringBase0 padding */ -SECTION_DEAD static char const* const pad_80394F6D = "\0\0"; -#pragma pop +/* 80394F50-80394F50 0215B0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/d_ky_thunder.cpp b/src/d/d_ky_thunder.cpp index 4e942319e3e..ce833cde6e7 100644 --- a/src/d/d_ky_thunder.cpp +++ b/src/d/d_ky_thunder.cpp @@ -256,6 +256,15 @@ static asm void dThunder_Create(kankyo_class* param_0) { #pragma pop /* ############################################################################################## */ +/* 80394F40-80394F40 0215A0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80394F40 = "Always"; +SECTION_DEAD static char const* const stringBase_80394F47 = "R_SP30"; +/* @stringBase0 padding */ +SECTION_DEAD static char const* const pad_80394F4E = "\0"; +#pragma pop + /* 80453E9C-80453EA0 00249C 0004+00 1/1 0/0 0/0 .sdata2 @4079 */ SECTION_SDATA2 static f32 lit_4079 = 0.5f; @@ -357,12 +366,4 @@ SECTION_DATA extern void* g_profile_KY_THUNDER[10 + 1 /* padding */] = { NULL, }; -/* 80394F40-80394F50 0215A0 000E+02 1/1 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80394F40 = "Always"; -SECTION_DEAD static char const* const stringBase_80394F47 = "R_SP30"; -/* @stringBase0 padding */ -SECTION_DEAD static char const* const pad_80394F4E = "\0"; -#pragma pop +/* 80394F40-80394F40 0215A0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/d_kyeff.cpp b/src/d/d_kyeff.cpp index cae58088b22..8810ef7d328 100644 --- a/src/d/d_kyeff.cpp +++ b/src/d/d_kyeff.cpp @@ -68,6 +68,15 @@ static asm void dKyeff_Draw(dKyeff_c* param_0) { } #pragma pop +/* ############################################################################################## */ +/* 80394F38-80394F38 021598 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80394F38 = "Name"; +/* @stringBase0 padding */ +SECTION_DEAD static char const* const pad_80394F3D = "\0\0"; +#pragma pop + /* 801ADD5C-801ADDB4 1A869C 0058+00 1/1 0/0 0/0 .text execute__8dKyeff_cFv */ #pragma push #pragma optimization_level 0 @@ -158,11 +167,4 @@ SECTION_DATA extern void* g_profile_KYEFF[10 + 1 /* padding */] = { NULL, }; -/* 80394F38-80394F40 021598 0005+03 2/2 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80394F38 = "Name"; -/* @stringBase0 padding */ -SECTION_DEAD static char const* const pad_80394F3D = "\0\0"; -#pragma pop +/* 80394F38-80394F38 021598 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/d_name.cpp b/src/d/d_name.cpp index 1daa0009b30..000db8ec11c 100644 --- a/src/d/d_name.cpp +++ b/src/d/d_name.cpp @@ -15,10 +15,10 @@ struct mDoCPd_c { static u8 m_cpadInfo[256]; }; -struct JKRArchive {}; - struct J2DPane {}; +struct JKRArchive {}; + struct dSelect_cursor_c { /* 80194220 */ dSelect_cursor_c(u8, f32, JKRArchive*); /* 801950F4 */ void setPos(f32, f32, J2DPane*, bool); @@ -85,10 +85,10 @@ struct dDlst_NameIN_c { /* 8025115C */ ~dDlst_NameIN_c(); }; -struct Vec {}; - struct JAISoundID {}; +struct Vec {}; + struct Z2SeMgr { /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); }; @@ -261,6 +261,244 @@ extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; // /* ############################################################################################## */ +/* 80399CC8-80399CC8 026328 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80399CC8 = "あ"; +SECTION_DEAD static char const* const stringBase_80399CCB = "い"; +SECTION_DEAD static char const* const stringBase_80399CCE = "う"; +SECTION_DEAD static char const* const stringBase_80399CD1 = "え"; +SECTION_DEAD static char const* const stringBase_80399CD4 = "お"; +SECTION_DEAD static char const* const stringBase_80399CD7 = "か"; +SECTION_DEAD static char const* const stringBase_80399CDA = "き"; +SECTION_DEAD static char const* const stringBase_80399CDD = "く"; +SECTION_DEAD static char const* const stringBase_80399CE0 = "け"; +SECTION_DEAD static char const* const stringBase_80399CE3 = "こ"; +SECTION_DEAD static char const* const stringBase_80399CE6 = "さ"; +SECTION_DEAD static char const* const stringBase_80399CE9 = "し"; +SECTION_DEAD static char const* const stringBase_80399CEC = "す"; +SECTION_DEAD static char const* const stringBase_80399CEF = "せ"; +SECTION_DEAD static char const* const stringBase_80399CF2 = "そ"; +SECTION_DEAD static char const* const stringBase_80399CF5 = "た"; +SECTION_DEAD static char const* const stringBase_80399CF8 = "ち"; +SECTION_DEAD static char const* const stringBase_80399CFB = "つ"; +SECTION_DEAD static char const* const stringBase_80399CFE = "て"; +SECTION_DEAD static char const* const stringBase_80399D01 = "と"; +SECTION_DEAD static char const* const stringBase_80399D04 = "な"; +SECTION_DEAD static char const* const stringBase_80399D07 = "に"; +SECTION_DEAD static char const* const stringBase_80399D0A = "ぬ"; +SECTION_DEAD static char const* const stringBase_80399D0D = "ね"; +SECTION_DEAD static char const* const stringBase_80399D10 = "の"; +SECTION_DEAD static char const* const stringBase_80399D13 = "は"; +SECTION_DEAD static char const* const stringBase_80399D16 = "ひ"; +SECTION_DEAD static char const* const stringBase_80399D19 = "ふ"; +SECTION_DEAD static char const* const stringBase_80399D1C = "へ"; +SECTION_DEAD static char const* const stringBase_80399D1F = "ほ"; +SECTION_DEAD static char const* const stringBase_80399D22 = "ま"; +SECTION_DEAD static char const* const stringBase_80399D25 = "み"; +SECTION_DEAD static char const* const stringBase_80399D28 = "む"; +SECTION_DEAD static char const* const stringBase_80399D2B = "め"; +SECTION_DEAD static char const* const stringBase_80399D2E = "も"; +SECTION_DEAD static char const* const stringBase_80399D31 = "や"; +SECTION_DEAD static char const* const stringBase_80399D34 = "　"; +SECTION_DEAD static char const* const stringBase_80399D37 = "ゆ"; +SECTION_DEAD static char const* const stringBase_80399D3A = "よ"; +SECTION_DEAD static char const* const stringBase_80399D3D = "ら"; +SECTION_DEAD static char const* const stringBase_80399D40 = "り"; +SECTION_DEAD static char const* const stringBase_80399D43 = "る"; +SECTION_DEAD static char const* const stringBase_80399D46 = "れ"; +SECTION_DEAD static char const* const stringBase_80399D49 = "ろ"; +SECTION_DEAD static char const* const stringBase_80399D4C = "わ"; +SECTION_DEAD static char const* const stringBase_80399D4F = "を"; +SECTION_DEAD static char const* const stringBase_80399D52 = "ん"; +SECTION_DEAD static char const* const stringBase_80399D55 = "ぁ"; +SECTION_DEAD static char const* const stringBase_80399D58 = "ぃ"; +SECTION_DEAD static char const* const stringBase_80399D5B = "ぅ"; +SECTION_DEAD static char const* const stringBase_80399D5E = "ぇ"; +SECTION_DEAD static char const* const stringBase_80399D61 = "ぉ"; +SECTION_DEAD static char const* const stringBase_80399D64 = "ゃ"; +SECTION_DEAD static char const* const stringBase_80399D67 = "ゅ"; +SECTION_DEAD static char const* const stringBase_80399D6A = "ょ"; +SECTION_DEAD static char const* const stringBase_80399D6D = "っ"; +SECTION_DEAD static char const* const stringBase_80399D70 = "ー"; +SECTION_DEAD static char const* const stringBase_80399D73 = "゛"; +SECTION_DEAD static char const* const stringBase_80399D76 = "゜"; +SECTION_DEAD static char const* const stringBase_80399D79 = "￥"; +SECTION_DEAD static char const* const stringBase_80399D7C = "が"; +SECTION_DEAD static char const* const stringBase_80399D7F = "ぎ"; +SECTION_DEAD static char const* const stringBase_80399D82 = "ぐ"; +SECTION_DEAD static char const* const stringBase_80399D85 = "げ"; +SECTION_DEAD static char const* const stringBase_80399D88 = "ご"; +SECTION_DEAD static char const* const stringBase_80399D8B = "ざ"; +SECTION_DEAD static char const* const stringBase_80399D8E = "じ"; +SECTION_DEAD static char const* const stringBase_80399D91 = "ず"; +SECTION_DEAD static char const* const stringBase_80399D94 = "ぜ"; +SECTION_DEAD static char const* const stringBase_80399D97 = "ぞ"; +SECTION_DEAD static char const* const stringBase_80399D9A = "だ"; +SECTION_DEAD static char const* const stringBase_80399D9D = "ぢ"; +SECTION_DEAD static char const* const stringBase_80399DA0 = "づ"; +SECTION_DEAD static char const* const stringBase_80399DA3 = "で"; +SECTION_DEAD static char const* const stringBase_80399DA6 = "ど"; +SECTION_DEAD static char const* const stringBase_80399DA9 = "ば"; +SECTION_DEAD static char const* const stringBase_80399DAC = "び"; +SECTION_DEAD static char const* const stringBase_80399DAF = "ぶ"; +SECTION_DEAD static char const* const stringBase_80399DB2 = "べ"; +SECTION_DEAD static char const* const stringBase_80399DB5 = "ぼ"; +SECTION_DEAD static char const* const stringBase_80399DB8 = "ぱ"; +SECTION_DEAD static char const* const stringBase_80399DBB = "ぴ"; +SECTION_DEAD static char const* const stringBase_80399DBE = "ぷ"; +SECTION_DEAD static char const* const stringBase_80399DC1 = "ぺ"; +SECTION_DEAD static char const* const stringBase_80399DC4 = "ぽ"; +SECTION_DEAD static char const* const stringBase_80399DC7 = "ア"; +SECTION_DEAD static char const* const stringBase_80399DCA = "イ"; +SECTION_DEAD static char const* const stringBase_80399DCD = "ウ"; +SECTION_DEAD static char const* const stringBase_80399DD0 = "エ"; +SECTION_DEAD static char const* const stringBase_80399DD3 = "オ"; +SECTION_DEAD static char const* const stringBase_80399DD6 = "カ"; +SECTION_DEAD static char const* const stringBase_80399DD9 = "キ"; +SECTION_DEAD static char const* const stringBase_80399DDC = "ク"; +SECTION_DEAD static char const* const stringBase_80399DDF = "ケ"; +SECTION_DEAD static char const* const stringBase_80399DE2 = "コ"; +SECTION_DEAD static char const* const stringBase_80399DE5 = "サ"; +SECTION_DEAD static char const* const stringBase_80399DE8 = "シ"; +SECTION_DEAD static char const* const stringBase_80399DEB = "ス"; +SECTION_DEAD static char const* const stringBase_80399DEE = "セ"; +// MWCC ignores mapping of some japanese characters using the +// byte 0x5C (ASCII '\'). This is why this string is hex-encoded. +SECTION_DEAD static char const* const stringBase_80399DF1 = "\x83\x5C"; +SECTION_DEAD static char const* const stringBase_80399DF4 = "タ"; +SECTION_DEAD static char const* const stringBase_80399DF7 = "チ"; +SECTION_DEAD static char const* const stringBase_80399DFA = "ツ"; +SECTION_DEAD static char const* const stringBase_80399DFD = "テ"; +SECTION_DEAD static char const* const stringBase_80399E00 = "ト"; +SECTION_DEAD static char const* const stringBase_80399E03 = "ナ"; +SECTION_DEAD static char const* const stringBase_80399E06 = "ニ"; +SECTION_DEAD static char const* const stringBase_80399E09 = "ヌ"; +SECTION_DEAD static char const* const stringBase_80399E0C = "ネ"; +SECTION_DEAD static char const* const stringBase_80399E0F = "ノ"; +SECTION_DEAD static char const* const stringBase_80399E12 = "ハ"; +SECTION_DEAD static char const* const stringBase_80399E15 = "ヒ"; +SECTION_DEAD static char const* const stringBase_80399E18 = "フ"; +SECTION_DEAD static char const* const stringBase_80399E1B = "ヘ"; +SECTION_DEAD static char const* const stringBase_80399E1E = "ホ"; +SECTION_DEAD static char const* const stringBase_80399E21 = "マ"; +SECTION_DEAD static char const* const stringBase_80399E24 = "ミ"; +SECTION_DEAD static char const* const stringBase_80399E27 = "ム"; +SECTION_DEAD static char const* const stringBase_80399E2A = "メ"; +SECTION_DEAD static char const* const stringBase_80399E2D = "モ"; +SECTION_DEAD static char const* const stringBase_80399E30 = "ヤ"; +SECTION_DEAD static char const* const stringBase_80399E33 = "ユ"; +SECTION_DEAD static char const* const stringBase_80399E36 = "ヨ"; +SECTION_DEAD static char const* const stringBase_80399E39 = "ラ"; +SECTION_DEAD static char const* const stringBase_80399E3C = "リ"; +SECTION_DEAD static char const* const stringBase_80399E3F = "ル"; +SECTION_DEAD static char const* const stringBase_80399E42 = "レ"; +SECTION_DEAD static char const* const stringBase_80399E45 = "ロ"; +SECTION_DEAD static char const* const stringBase_80399E48 = "ワ"; +SECTION_DEAD static char const* const stringBase_80399E4B = "ヲ"; +SECTION_DEAD static char const* const stringBase_80399E4E = "ン"; +SECTION_DEAD static char const* const stringBase_80399E51 = "ァ"; +SECTION_DEAD static char const* const stringBase_80399E54 = "ィ"; +SECTION_DEAD static char const* const stringBase_80399E57 = "ゥ"; +SECTION_DEAD static char const* const stringBase_80399E5A = "ェ"; +SECTION_DEAD static char const* const stringBase_80399E5D = "ォ"; +SECTION_DEAD static char const* const stringBase_80399E60 = "ャ"; +SECTION_DEAD static char const* const stringBase_80399E63 = "ュ"; +SECTION_DEAD static char const* const stringBase_80399E66 = "ョ"; +SECTION_DEAD static char const* const stringBase_80399E69 = "ッ"; +SECTION_DEAD static char const* const stringBase_80399E6C = "ヴ"; +SECTION_DEAD static char const* const stringBase_80399E6F = "ガ"; +SECTION_DEAD static char const* const stringBase_80399E72 = "ギ"; +SECTION_DEAD static char const* const stringBase_80399E75 = "グ"; +SECTION_DEAD static char const* const stringBase_80399E78 = "ゲ"; +SECTION_DEAD static char const* const stringBase_80399E7B = "ゴ"; +SECTION_DEAD static char const* const stringBase_80399E7E = "ザ"; +SECTION_DEAD static char const* const stringBase_80399E81 = "ジ"; +SECTION_DEAD static char const* const stringBase_80399E84 = "ズ"; +SECTION_DEAD static char const* const stringBase_80399E87 = "ゼ"; +SECTION_DEAD static char const* const stringBase_80399E8A = "ゾ"; +SECTION_DEAD static char const* const stringBase_80399E8D = "ダ"; +SECTION_DEAD static char const* const stringBase_80399E90 = "ヂ"; +SECTION_DEAD static char const* const stringBase_80399E93 = "ヅ"; +SECTION_DEAD static char const* const stringBase_80399E96 = "デ"; +SECTION_DEAD static char const* const stringBase_80399E99 = "ド"; +SECTION_DEAD static char const* const stringBase_80399E9C = "バ"; +SECTION_DEAD static char const* const stringBase_80399E9F = "ビ"; +SECTION_DEAD static char const* const stringBase_80399EA2 = "ブ"; +SECTION_DEAD static char const* const stringBase_80399EA5 = "ベ"; +SECTION_DEAD static char const* const stringBase_80399EA8 = "ボ"; +SECTION_DEAD static char const* const stringBase_80399EAB = "パ"; +SECTION_DEAD static char const* const stringBase_80399EAE = "ピ"; +SECTION_DEAD static char const* const stringBase_80399EB1 = "プ"; +SECTION_DEAD static char const* const stringBase_80399EB4 = "ペ"; +SECTION_DEAD static char const* const stringBase_80399EB7 = "ポ"; +SECTION_DEAD static char const* const stringBase_80399EBA = "A"; +SECTION_DEAD static char const* const stringBase_80399EBC = "N"; +SECTION_DEAD static char const* const stringBase_80399EBE = "a"; +SECTION_DEAD static char const* const stringBase_80399EC0 = "n"; +SECTION_DEAD static char const* const stringBase_80399EC2 = "1"; +SECTION_DEAD static char const* const stringBase_80399EC4 = "B"; +SECTION_DEAD static char const* const stringBase_80399EC6 = "O"; +SECTION_DEAD static char const* const stringBase_80399EC8 = "b"; +SECTION_DEAD static char const* const stringBase_80399ECA = "o"; +SECTION_DEAD static char const* const stringBase_80399ECC = "2"; +SECTION_DEAD static char const* const stringBase_80399ECE = "C"; +SECTION_DEAD static char const* const stringBase_80399ED0 = "P"; +SECTION_DEAD static char const* const stringBase_80399ED2 = "c"; +SECTION_DEAD static char const* const stringBase_80399ED4 = "p"; +SECTION_DEAD static char const* const stringBase_80399ED6 = "3"; +SECTION_DEAD static char const* const stringBase_80399ED8 = "D"; +SECTION_DEAD static char const* const stringBase_80399EDA = "Q"; +SECTION_DEAD static char const* const stringBase_80399EDC = "d"; +SECTION_DEAD static char const* const stringBase_80399EDE = "q"; +SECTION_DEAD static char const* const stringBase_80399EE0 = "4"; +SECTION_DEAD static char const* const stringBase_80399EE2 = "E"; +SECTION_DEAD static char const* const stringBase_80399EE4 = "R"; +SECTION_DEAD static char const* const stringBase_80399EE6 = "e"; +SECTION_DEAD static char const* const stringBase_80399EE8 = "r"; +SECTION_DEAD static char const* const stringBase_80399EEA = "5"; +SECTION_DEAD static char const* const stringBase_80399EEC = "F"; +SECTION_DEAD static char const* const stringBase_80399EEE = "S"; +SECTION_DEAD static char const* const stringBase_80399EF0 = "f"; +SECTION_DEAD static char const* const stringBase_80399EF2 = "s"; +SECTION_DEAD static char const* const stringBase_80399EF4 = "6"; +SECTION_DEAD static char const* const stringBase_80399EF6 = "G"; +SECTION_DEAD static char const* const stringBase_80399EF8 = "T"; +SECTION_DEAD static char const* const stringBase_80399EFA = "g"; +SECTION_DEAD static char const* const stringBase_80399EFC = "t"; +SECTION_DEAD static char const* const stringBase_80399EFE = "7"; +SECTION_DEAD static char const* const stringBase_80399F00 = "H"; +SECTION_DEAD static char const* const stringBase_80399F02 = "U"; +SECTION_DEAD static char const* const stringBase_80399F04 = "h"; +SECTION_DEAD static char const* const stringBase_80399F06 = "u"; +SECTION_DEAD static char const* const stringBase_80399F08 = "8"; +SECTION_DEAD static char const* const stringBase_80399F0A = "I"; +SECTION_DEAD static char const* const stringBase_80399F0C = "V"; +SECTION_DEAD static char const* const stringBase_80399F0E = "i"; +SECTION_DEAD static char const* const stringBase_80399F10 = "v"; +SECTION_DEAD static char const* const stringBase_80399F12 = "9"; +SECTION_DEAD static char const* const stringBase_80399F14 = "J"; +SECTION_DEAD static char const* const stringBase_80399F16 = "W"; +SECTION_DEAD static char const* const stringBase_80399F18 = "j"; +SECTION_DEAD static char const* const stringBase_80399F1A = "w"; +SECTION_DEAD static char const* const stringBase_80399F1C = "0"; +SECTION_DEAD static char const* const stringBase_80399F1E = "K"; +SECTION_DEAD static char const* const stringBase_80399F20 = "X"; +SECTION_DEAD static char const* const stringBase_80399F22 = "k"; +SECTION_DEAD static char const* const stringBase_80399F24 = "x"; +SECTION_DEAD static char const* const stringBase_80399F26 = ","; +SECTION_DEAD static char const* const stringBase_80399F28 = "L"; +SECTION_DEAD static char const* const stringBase_80399F2A = "Y"; +SECTION_DEAD static char const* const stringBase_80399F2C = "l"; +SECTION_DEAD static char const* const stringBase_80399F2E = "y"; +SECTION_DEAD static char const* const stringBase_80399F30 = "."; +SECTION_DEAD static char const* const stringBase_80399F32 = "M"; +SECTION_DEAD static char const* const stringBase_80399F34 = "Z"; +SECTION_DEAD static char const* const stringBase_80399F36 = "m"; +SECTION_DEAD static char const* const stringBase_80399F38 = "z"; +SECTION_DEAD static char const* const stringBase_80399F3A = " "; +#pragma pop + /* 803C1F50-803C1F5C 01F070 000C+00 5/5 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -1280,6 +1518,27 @@ asm void dName_c::setMoji(int param_0) { } #pragma pop +/* ############################################################################################## */ +/* 80399CC8-80399CC8 026328 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80399F3C = "" + "\x1B" + "CD" + "\x1B" + "CR" + "\x1B" + "CC[000000]" + "\x1B" + "GM[0]%c" + "\x1B" + "HM" + "\x1B" + "CC[ffffff]" + "\x1B" + "GM[0]%c"; +#pragma pop + /* 8024F88C-8024F914 24A1CC 0088+00 4/4 0/0 0/0 .text setNameText__7dName_cFv */ #pragma push #pragma optimization_level 0 @@ -1385,6 +1644,28 @@ asm void dName_c::backSpace() { } #pragma pop +/* ############################################################################################## */ +/* 80399CC8-80399CC8 026328 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80399F6C = "" + "\x1B" + "CD" + "\x1B" + "CR" + "\x1B" + "CC[000000]" + "\x1B" + "GM[0]"; +SECTION_DEAD static char const* const stringBase_80399F84 = "" + "\x1B" + "HM" + "\x1B" + "CC[ffffff]" + "\x1B" + "GM[0]"; +#pragma pop + /* 802501B0-80250284 24AAF0 00D4+00 2/2 0/0 0/0 .text mojiListChange__7dName_cFv */ #pragma push #pragma optimization_level 0 @@ -1436,6 +1717,17 @@ asm void dName_c::_draw() { #pragma pop /* ############################################################################################## */ +/* 80399CC8-80399CC8 026328 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80399F99 = "zelda_player_name.blo"; +SECTION_DEAD static char const* const stringBase_80399FAF = "zelda_player_name.bpk"; +SECTION_DEAD static char const* const stringBase_80399FC5 = "zelda_player_name.btk"; +SECTION_DEAD static char const* const stringBase_80399FDB = ""; +/* @stringBase0 padding */ +SECTION_DEAD static char const* const pad_80399FDC = "\0\0\0"; +#pragma pop + /* 80454DD4-80454DD8 0033D4 0004+00 1/1 0/0 0/0 .sdata2 @4722 */ SECTION_SDATA2 static f32 lit_4722 = 41.0f / 50.0f; @@ -1534,281 +1826,7 @@ asm void __sinit_d_name_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_802511EC = (void*)__sinit_d_name_cpp; +REGISTER_CTORS(0x802511EC, __sinit_d_name_cpp); #pragma pop -/* 80399CC8-80399FE0 026328 0314+04 10/3 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80399CC8 = "あ"; -SECTION_DEAD static char const* const stringBase_80399CCB = "い"; -SECTION_DEAD static char const* const stringBase_80399CCE = "う"; -SECTION_DEAD static char const* const stringBase_80399CD1 = "え"; -SECTION_DEAD static char const* const stringBase_80399CD4 = "お"; -SECTION_DEAD static char const* const stringBase_80399CD7 = "か"; -SECTION_DEAD static char const* const stringBase_80399CDA = "き"; -SECTION_DEAD static char const* const stringBase_80399CDD = "く"; -SECTION_DEAD static char const* const stringBase_80399CE0 = "け"; -SECTION_DEAD static char const* const stringBase_80399CE3 = "こ"; -SECTION_DEAD static char const* const stringBase_80399CE6 = "さ"; -SECTION_DEAD static char const* const stringBase_80399CE9 = "し"; -SECTION_DEAD static char const* const stringBase_80399CEC = "す"; -SECTION_DEAD static char const* const stringBase_80399CEF = "せ"; -SECTION_DEAD static char const* const stringBase_80399CF2 = "そ"; -SECTION_DEAD static char const* const stringBase_80399CF5 = "た"; -SECTION_DEAD static char const* const stringBase_80399CF8 = "ち"; -SECTION_DEAD static char const* const stringBase_80399CFB = "つ"; -SECTION_DEAD static char const* const stringBase_80399CFE = "て"; -SECTION_DEAD static char const* const stringBase_80399D01 = "と"; -SECTION_DEAD static char const* const stringBase_80399D04 = "な"; -SECTION_DEAD static char const* const stringBase_80399D07 = "に"; -SECTION_DEAD static char const* const stringBase_80399D0A = "ぬ"; -SECTION_DEAD static char const* const stringBase_80399D0D = "ね"; -SECTION_DEAD static char const* const stringBase_80399D10 = "の"; -SECTION_DEAD static char const* const stringBase_80399D13 = "は"; -SECTION_DEAD static char const* const stringBase_80399D16 = "ひ"; -SECTION_DEAD static char const* const stringBase_80399D19 = "ふ"; -SECTION_DEAD static char const* const stringBase_80399D1C = "へ"; -SECTION_DEAD static char const* const stringBase_80399D1F = "ほ"; -SECTION_DEAD static char const* const stringBase_80399D22 = "ま"; -SECTION_DEAD static char const* const stringBase_80399D25 = "み"; -SECTION_DEAD static char const* const stringBase_80399D28 = "む"; -SECTION_DEAD static char const* const stringBase_80399D2B = "め"; -SECTION_DEAD static char const* const stringBase_80399D2E = "も"; -SECTION_DEAD static char const* const stringBase_80399D31 = "や"; -SECTION_DEAD static char const* const stringBase_80399D34 = "　"; -SECTION_DEAD static char const* const stringBase_80399D37 = "ゆ"; -SECTION_DEAD static char const* const stringBase_80399D3A = "よ"; -SECTION_DEAD static char const* const stringBase_80399D3D = "ら"; -SECTION_DEAD static char const* const stringBase_80399D40 = "り"; -SECTION_DEAD static char const* const stringBase_80399D43 = "る"; -SECTION_DEAD static char const* const stringBase_80399D46 = "れ"; -SECTION_DEAD static char const* const stringBase_80399D49 = "ろ"; -SECTION_DEAD static char const* const stringBase_80399D4C = "わ"; -SECTION_DEAD static char const* const stringBase_80399D4F = "を"; -SECTION_DEAD static char const* const stringBase_80399D52 = "ん"; -SECTION_DEAD static char const* const stringBase_80399D55 = "ぁ"; -SECTION_DEAD static char const* const stringBase_80399D58 = "ぃ"; -SECTION_DEAD static char const* const stringBase_80399D5B = "ぅ"; -SECTION_DEAD static char const* const stringBase_80399D5E = "ぇ"; -SECTION_DEAD static char const* const stringBase_80399D61 = "ぉ"; -SECTION_DEAD static char const* const stringBase_80399D64 = "ゃ"; -SECTION_DEAD static char const* const stringBase_80399D67 = "ゅ"; -SECTION_DEAD static char const* const stringBase_80399D6A = "ょ"; -SECTION_DEAD static char const* const stringBase_80399D6D = "っ"; -SECTION_DEAD static char const* const stringBase_80399D70 = "ー"; -SECTION_DEAD static char const* const stringBase_80399D73 = "゛"; -SECTION_DEAD static char const* const stringBase_80399D76 = "゜"; -SECTION_DEAD static char const* const stringBase_80399D79 = "￥"; -SECTION_DEAD static char const* const stringBase_80399D7C = "が"; -SECTION_DEAD static char const* const stringBase_80399D7F = "ぎ"; -SECTION_DEAD static char const* const stringBase_80399D82 = "ぐ"; -SECTION_DEAD static char const* const stringBase_80399D85 = "げ"; -SECTION_DEAD static char const* const stringBase_80399D88 = "ご"; -SECTION_DEAD static char const* const stringBase_80399D8B = "ざ"; -SECTION_DEAD static char const* const stringBase_80399D8E = "じ"; -SECTION_DEAD static char const* const stringBase_80399D91 = "ず"; -SECTION_DEAD static char const* const stringBase_80399D94 = "ぜ"; -SECTION_DEAD static char const* const stringBase_80399D97 = "ぞ"; -SECTION_DEAD static char const* const stringBase_80399D9A = "だ"; -SECTION_DEAD static char const* const stringBase_80399D9D = "ぢ"; -SECTION_DEAD static char const* const stringBase_80399DA0 = "づ"; -SECTION_DEAD static char const* const stringBase_80399DA3 = "で"; -SECTION_DEAD static char const* const stringBase_80399DA6 = "ど"; -SECTION_DEAD static char const* const stringBase_80399DA9 = "ば"; -SECTION_DEAD static char const* const stringBase_80399DAC = "び"; -SECTION_DEAD static char const* const stringBase_80399DAF = "ぶ"; -SECTION_DEAD static char const* const stringBase_80399DB2 = "べ"; -SECTION_DEAD static char const* const stringBase_80399DB5 = "ぼ"; -SECTION_DEAD static char const* const stringBase_80399DB8 = "ぱ"; -SECTION_DEAD static char const* const stringBase_80399DBB = "ぴ"; -SECTION_DEAD static char const* const stringBase_80399DBE = "ぷ"; -SECTION_DEAD static char const* const stringBase_80399DC1 = "ぺ"; -SECTION_DEAD static char const* const stringBase_80399DC4 = "ぽ"; -SECTION_DEAD static char const* const stringBase_80399DC7 = "ア"; -SECTION_DEAD static char const* const stringBase_80399DCA = "イ"; -SECTION_DEAD static char const* const stringBase_80399DCD = "ウ"; -SECTION_DEAD static char const* const stringBase_80399DD0 = "エ"; -SECTION_DEAD static char const* const stringBase_80399DD3 = "オ"; -SECTION_DEAD static char const* const stringBase_80399DD6 = "カ"; -SECTION_DEAD static char const* const stringBase_80399DD9 = "キ"; -SECTION_DEAD static char const* const stringBase_80399DDC = "ク"; -SECTION_DEAD static char const* const stringBase_80399DDF = "ケ"; -SECTION_DEAD static char const* const stringBase_80399DE2 = "コ"; -SECTION_DEAD static char const* const stringBase_80399DE5 = "サ"; -SECTION_DEAD static char const* const stringBase_80399DE8 = "シ"; -SECTION_DEAD static char const* const stringBase_80399DEB = "ス"; -SECTION_DEAD static char const* const stringBase_80399DEE = "セ"; -// MWCC ignores mapping of some japanese characters using the -// byte 0x5C (ASCII '\'). This is why this string is hex-encoded. -SECTION_DEAD static char const* const stringBase_80399DF1 = "\x83\x5C"; -SECTION_DEAD static char const* const stringBase_80399DF4 = "タ"; -SECTION_DEAD static char const* const stringBase_80399DF7 = "チ"; -SECTION_DEAD static char const* const stringBase_80399DFA = "ツ"; -SECTION_DEAD static char const* const stringBase_80399DFD = "テ"; -SECTION_DEAD static char const* const stringBase_80399E00 = "ト"; -SECTION_DEAD static char const* const stringBase_80399E03 = "ナ"; -SECTION_DEAD static char const* const stringBase_80399E06 = "ニ"; -SECTION_DEAD static char const* const stringBase_80399E09 = "ヌ"; -SECTION_DEAD static char const* const stringBase_80399E0C = "ネ"; -SECTION_DEAD static char const* const stringBase_80399E0F = "ノ"; -SECTION_DEAD static char const* const stringBase_80399E12 = "ハ"; -SECTION_DEAD static char const* const stringBase_80399E15 = "ヒ"; -SECTION_DEAD static char const* const stringBase_80399E18 = "フ"; -SECTION_DEAD static char const* const stringBase_80399E1B = "ヘ"; -SECTION_DEAD static char const* const stringBase_80399E1E = "ホ"; -SECTION_DEAD static char const* const stringBase_80399E21 = "マ"; -SECTION_DEAD static char const* const stringBase_80399E24 = "ミ"; -SECTION_DEAD static char const* const stringBase_80399E27 = "ム"; -SECTION_DEAD static char const* const stringBase_80399E2A = "メ"; -SECTION_DEAD static char const* const stringBase_80399E2D = "モ"; -SECTION_DEAD static char const* const stringBase_80399E30 = "ヤ"; -SECTION_DEAD static char const* const stringBase_80399E33 = "ユ"; -SECTION_DEAD static char const* const stringBase_80399E36 = "ヨ"; -SECTION_DEAD static char const* const stringBase_80399E39 = "ラ"; -SECTION_DEAD static char const* const stringBase_80399E3C = "リ"; -SECTION_DEAD static char const* const stringBase_80399E3F = "ル"; -SECTION_DEAD static char const* const stringBase_80399E42 = "レ"; -SECTION_DEAD static char const* const stringBase_80399E45 = "ロ"; -SECTION_DEAD static char const* const stringBase_80399E48 = "ワ"; -SECTION_DEAD static char const* const stringBase_80399E4B = "ヲ"; -SECTION_DEAD static char const* const stringBase_80399E4E = "ン"; -SECTION_DEAD static char const* const stringBase_80399E51 = "ァ"; -SECTION_DEAD static char const* const stringBase_80399E54 = "ィ"; -SECTION_DEAD static char const* const stringBase_80399E57 = "ゥ"; -SECTION_DEAD static char const* const stringBase_80399E5A = "ェ"; -SECTION_DEAD static char const* const stringBase_80399E5D = "ォ"; -SECTION_DEAD static char const* const stringBase_80399E60 = "ャ"; -SECTION_DEAD static char const* const stringBase_80399E63 = "ュ"; -SECTION_DEAD static char const* const stringBase_80399E66 = "ョ"; -SECTION_DEAD static char const* const stringBase_80399E69 = "ッ"; -SECTION_DEAD static char const* const stringBase_80399E6C = "ヴ"; -SECTION_DEAD static char const* const stringBase_80399E6F = "ガ"; -SECTION_DEAD static char const* const stringBase_80399E72 = "ギ"; -SECTION_DEAD static char const* const stringBase_80399E75 = "グ"; -SECTION_DEAD static char const* const stringBase_80399E78 = "ゲ"; -SECTION_DEAD static char const* const stringBase_80399E7B = "ゴ"; -SECTION_DEAD static char const* const stringBase_80399E7E = "ザ"; -SECTION_DEAD static char const* const stringBase_80399E81 = "ジ"; -SECTION_DEAD static char const* const stringBase_80399E84 = "ズ"; -SECTION_DEAD static char const* const stringBase_80399E87 = "ゼ"; -SECTION_DEAD static char const* const stringBase_80399E8A = "ゾ"; -SECTION_DEAD static char const* const stringBase_80399E8D = "ダ"; -SECTION_DEAD static char const* const stringBase_80399E90 = "ヂ"; -SECTION_DEAD static char const* const stringBase_80399E93 = "ヅ"; -SECTION_DEAD static char const* const stringBase_80399E96 = "デ"; -SECTION_DEAD static char const* const stringBase_80399E99 = "ド"; -SECTION_DEAD static char const* const stringBase_80399E9C = "バ"; -SECTION_DEAD static char const* const stringBase_80399E9F = "ビ"; -SECTION_DEAD static char const* const stringBase_80399EA2 = "ブ"; -SECTION_DEAD static char const* const stringBase_80399EA5 = "ベ"; -SECTION_DEAD static char const* const stringBase_80399EA8 = "ボ"; -SECTION_DEAD static char const* const stringBase_80399EAB = "パ"; -SECTION_DEAD static char const* const stringBase_80399EAE = "ピ"; -SECTION_DEAD static char const* const stringBase_80399EB1 = "プ"; -SECTION_DEAD static char const* const stringBase_80399EB4 = "ペ"; -SECTION_DEAD static char const* const stringBase_80399EB7 = "ポ"; -SECTION_DEAD static char const* const stringBase_80399EBA = "A"; -SECTION_DEAD static char const* const stringBase_80399EBC = "N"; -SECTION_DEAD static char const* const stringBase_80399EBE = "a"; -SECTION_DEAD static char const* const stringBase_80399EC0 = "n"; -SECTION_DEAD static char const* const stringBase_80399EC2 = "1"; -SECTION_DEAD static char const* const stringBase_80399EC4 = "B"; -SECTION_DEAD static char const* const stringBase_80399EC6 = "O"; -SECTION_DEAD static char const* const stringBase_80399EC8 = "b"; -SECTION_DEAD static char const* const stringBase_80399ECA = "o"; -SECTION_DEAD static char const* const stringBase_80399ECC = "2"; -SECTION_DEAD static char const* const stringBase_80399ECE = "C"; -SECTION_DEAD static char const* const stringBase_80399ED0 = "P"; -SECTION_DEAD static char const* const stringBase_80399ED2 = "c"; -SECTION_DEAD static char const* const stringBase_80399ED4 = "p"; -SECTION_DEAD static char const* const stringBase_80399ED6 = "3"; -SECTION_DEAD static char const* const stringBase_80399ED8 = "D"; -SECTION_DEAD static char const* const stringBase_80399EDA = "Q"; -SECTION_DEAD static char const* const stringBase_80399EDC = "d"; -SECTION_DEAD static char const* const stringBase_80399EDE = "q"; -SECTION_DEAD static char const* const stringBase_80399EE0 = "4"; -SECTION_DEAD static char const* const stringBase_80399EE2 = "E"; -SECTION_DEAD static char const* const stringBase_80399EE4 = "R"; -SECTION_DEAD static char const* const stringBase_80399EE6 = "e"; -SECTION_DEAD static char const* const stringBase_80399EE8 = "r"; -SECTION_DEAD static char const* const stringBase_80399EEA = "5"; -SECTION_DEAD static char const* const stringBase_80399EEC = "F"; -SECTION_DEAD static char const* const stringBase_80399EEE = "S"; -SECTION_DEAD static char const* const stringBase_80399EF0 = "f"; -SECTION_DEAD static char const* const stringBase_80399EF2 = "s"; -SECTION_DEAD static char const* const stringBase_80399EF4 = "6"; -SECTION_DEAD static char const* const stringBase_80399EF6 = "G"; -SECTION_DEAD static char const* const stringBase_80399EF8 = "T"; -SECTION_DEAD static char const* const stringBase_80399EFA = "g"; -SECTION_DEAD static char const* const stringBase_80399EFC = "t"; -SECTION_DEAD static char const* const stringBase_80399EFE = "7"; -SECTION_DEAD static char const* const stringBase_80399F00 = "H"; -SECTION_DEAD static char const* const stringBase_80399F02 = "U"; -SECTION_DEAD static char const* const stringBase_80399F04 = "h"; -SECTION_DEAD static char const* const stringBase_80399F06 = "u"; -SECTION_DEAD static char const* const stringBase_80399F08 = "8"; -SECTION_DEAD static char const* const stringBase_80399F0A = "I"; -SECTION_DEAD static char const* const stringBase_80399F0C = "V"; -SECTION_DEAD static char const* const stringBase_80399F0E = "i"; -SECTION_DEAD static char const* const stringBase_80399F10 = "v"; -SECTION_DEAD static char const* const stringBase_80399F12 = "9"; -SECTION_DEAD static char const* const stringBase_80399F14 = "J"; -SECTION_DEAD static char const* const stringBase_80399F16 = "W"; -SECTION_DEAD static char const* const stringBase_80399F18 = "j"; -SECTION_DEAD static char const* const stringBase_80399F1A = "w"; -SECTION_DEAD static char const* const stringBase_80399F1C = "0"; -SECTION_DEAD static char const* const stringBase_80399F1E = "K"; -SECTION_DEAD static char const* const stringBase_80399F20 = "X"; -SECTION_DEAD static char const* const stringBase_80399F22 = "k"; -SECTION_DEAD static char const* const stringBase_80399F24 = "x"; -SECTION_DEAD static char const* const stringBase_80399F26 = ","; -SECTION_DEAD static char const* const stringBase_80399F28 = "L"; -SECTION_DEAD static char const* const stringBase_80399F2A = "Y"; -SECTION_DEAD static char const* const stringBase_80399F2C = "l"; -SECTION_DEAD static char const* const stringBase_80399F2E = "y"; -SECTION_DEAD static char const* const stringBase_80399F30 = "."; -SECTION_DEAD static char const* const stringBase_80399F32 = "M"; -SECTION_DEAD static char const* const stringBase_80399F34 = "Z"; -SECTION_DEAD static char const* const stringBase_80399F36 = "m"; -SECTION_DEAD static char const* const stringBase_80399F38 = "z"; -SECTION_DEAD static char const* const stringBase_80399F3A = " "; -SECTION_DEAD static char const* const stringBase_80399F3C = "" - "\x1B" - "CD" - "\x1B" - "CR" - "\x1B" - "CC[000000]" - "\x1B" - "GM[0]%c" - "\x1B" - "HM" - "\x1B" - "CC[ffffff]" - "\x1B" - "GM[0]%c"; -SECTION_DEAD static char const* const stringBase_80399F6C = "" - "\x1B" - "CD" - "\x1B" - "CR" - "\x1B" - "CC[000000]" - "\x1B" - "GM[0]"; -SECTION_DEAD static char const* const stringBase_80399F84 = "" - "\x1B" - "HM" - "\x1B" - "CC[ffffff]" - "\x1B" - "GM[0]"; -SECTION_DEAD static char const* const stringBase_80399F99 = "zelda_player_name.blo"; -SECTION_DEAD static char const* const stringBase_80399FAF = "zelda_player_name.bpk"; -SECTION_DEAD static char const* const stringBase_80399FC5 = "zelda_player_name.btk"; -SECTION_DEAD static char const* const stringBase_80399FDB = ""; -/* @stringBase0 padding */ -SECTION_DEAD static char const* const pad_80399FDC = "\0\0\0"; -#pragma pop +/* 80399CC8-80399CC8 026328 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/d_resorce.cpp b/src/d/d_resorce.cpp index 68647254938..06e19dbb204 100644 --- a/src/d/d_resorce.cpp +++ b/src/d/d_resorce.cpp @@ -35,6 +35,12 @@ struct mDoDvdThd_mountArchive_c { /* 80015E14 */ void create(char const*, u8, JKRHeap*); }; +struct J3DModelData { + /* 80325E14 */ void newSharedDisplayList(u32); + /* 80325F94 */ void makeSharedDL(); + /* 8032600C */ void simpleCalcMaterial(u16, f32 (*)[4]); +}; + struct JKRArchive { /* 802D5CE4 */ void getIdxResource(u32); /* 802D625C */ void getFileAttribute(u32) const; @@ -42,12 +48,6 @@ struct JKRArchive { /* 802D66AC */ void findNameResource(char const*) const; }; -struct J3DModelData { - /* 80325E14 */ void newSharedDisplayList(u32); - /* 80325F94 */ void makeSharedDL(); - /* 8032600C */ void simpleCalcMaterial(u16, f32 (*)[4]); -}; - struct cXyz {}; struct dRes_info_c { @@ -370,6 +370,13 @@ asm dRes_info_c::~dRes_info_c() { } #pragma pop +/* ############################################################################################## */ +/* 803798B8-803798B8 005F18 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_803798B8 = "%s%s.arc"; +#pragma pop + /* 8003A348-8003A3F0 034C88 00A8+00 1/1 0/0 0/0 .text set__11dRes_info_cFPCcPCcUcP7JKRHeap */ #pragma push #pragma optimization_level 0 @@ -390,6 +397,15 @@ static asm void setAlpha(J3DMaterialTable* param_0) { } #pragma pop +/* ############################################################################################## */ +/* 803798B8-803798B8 005F18 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_803798C1 = "fbtex_dummy"; +SECTION_DEAD static char const* const stringBase_803798CD = "dummy"; +SECTION_DEAD static char const* const stringBase_803798D3 = "Zbuffer"; +#pragma pop + /* 8003A490-8003A81C 034DD0 038C+00 1/1 0/0 0/0 .text setIndirectTex__FP12J3DModelData */ #pragma push #pragma optimization_level 0 @@ -421,14 +437,20 @@ SECTION_RODATA static u8 const l_texMtxInfo[100] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80379840, &l_texMtxInfo); +COMPILER_STRIP_GATE(0x80379840, &l_texMtxInfo); /* 803798A4-803798B8 005F04 0014+00 1/1 0/0 0/0 .rodata l_tevStageInfo$3774 */ SECTION_RODATA static u8 const l_tevStageInfo[20] = { 0x05, 0x0F, 0x08, 0x00, 0x0F, 0x00, 0x00, 0x00, 0x01, 0x00, 0x07, 0x04, 0x00, 0x07, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, }; -COMPILER_STRIP_GATE(803798A4, &l_tevStageInfo); +COMPILER_STRIP_GATE(0x803798A4, &l_tevStageInfo); + +/* 803798B8-803798B8 005F18 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_803798DB = "Always"; +#pragma pop /* 80450628-8045062C 0000A8 0004+00 1/1 0/0 0/0 .sdata l_texCoordInfo$3772 */ SECTION_SDATA static u8 l_texCoordInfo[4] = { @@ -678,6 +700,15 @@ asm J3DMatColorAnm::J3DMatColorAnm() { } #pragma pop +/* ############################################################################################## */ +/* 803798B8-803798B8 005F18 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_803798E2 = + "<%s.arc> setRes: res pointer buffer nothing !!\n"; +SECTION_DEAD static char const* const stringBase_80379912 = "<%s> res == NULL !!\n"; +#pragma pop + /* 8003B30C-8003B8D0 035C4C 05C4+00 2/2 0/0 0/0 .text loadResource__11dRes_info_cFv */ #pragma push #pragma optimization_level 0 @@ -740,6 +771,16 @@ asm void dRes_info_c::setRes(JKRArchive* param_0, JKRHeap* param_1) { } #pragma pop +/* ############################################################################################## */ +/* 803798B8-803798B8 005F18 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80379927 = + "<%s.arc> setRes: archive mount error !!\n"; +SECTION_DEAD static char const* const stringBase_80379950 = + "<%s.arc> mDMCommandsetRes: can't alloc memory\n"; +#pragma pop + /* 8003BAF8-8003BC98 036438 01A0+00 2/2 0/0 0/0 .text setRes__11dRes_info_cFv */ #pragma push #pragma optimization_level 0 @@ -770,6 +811,19 @@ static asm void myGetMemBlockSize0(void* param_0) { } #pragma pop +/* ############################################################################################## */ +/* 803798B8-803798B8 005F18 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8037997F = "%5.1f %5x %5.1f %5x %3d %s\n"; +SECTION_DEAD static char const* const stringBase_8037999B = "dRes_info_c::dump_long %08x %d\n"; +SECTION_DEAD static char const* const stringBase_803799BB = + "No Command Archive ArcHeader(size) SolidHeap(si" + "ze) Resource Cnt ArchiveName\n"; +SECTION_DEAD static char const* const stringBase_80379A09 = + "%2d %08x %08x %08x(%6x) %08x(%5x) %08x %3d %s\n"; +#pragma pop + /* 8003BD2C-8003BE38 03666C 010C+00 1/1 0/0 0/0 .text dump_long__11dRes_info_cFP11dRes_info_ci */ #pragma push #pragma optimization_level 0 @@ -781,6 +835,19 @@ asm void dRes_info_c::dump_long(dRes_info_c* param_0, int param_1) { #pragma pop /* ############################################################################################## */ +/* 803798B8-803798B8 005F18 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80379A38 = "dRes_info_c::dump %08x %d\n"; +SECTION_DEAD static char const* const stringBase_80379A53 = + "No ArchiveSize(KB) SolidHeapSize(KB) Cnt Archive" + "Name\n"; +SECTION_DEAD static char const* const stringBase_80379A89 = "%2d %6.1f %6x %6.1f %6x %3d %s\n"; +SECTION_DEAD static char const* const stringBase_80379AA9 = + "----------------------------------------------\n " + " %6.1f %6x %6.1f %6x Total\n\n"; +#pragma pop + /* 80451DF8-80451E00 0003F8 0008+00 1/1 0/0 0/0 .sdata2 @4277 */ SECTION_SDATA2 static f64 lit_4277 = 4503601774854144.0 /* cast s32 to float */; @@ -812,6 +879,22 @@ asm dRes_control_c::~dRes_control_c() { } #pragma pop +/* ############################################################################################## */ +/* 803798B8-803798B8 005F18 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +// MWCC ignores mapping of some japanese characters using the +// byte 0x5C (ASCII '\'). This is why this string is hex-encoded. +SECTION_DEAD static char const* const stringBase_80379AF9 = + "\x3C\x25\x73\x2E\x61\x72\x63\x3E\x20\x64\x52\x65\x73\x5F\x63\x6F\x6E\x74\x72\x6F\x6C\x5F\x63" + "\x3A\x3A\x73\x65\x74\x52\x65\x73\x3A\x20\x8B\xF3\x82\xAB\x83\x8A\x83\x5C\x81\x5B\x83\x58\x8F" + "\xEE\x95" + "\xF1\x83\x7C\x83\x43\x83\x93\x83\x5E\x82\xAA\x82\xA0\x82\xE8\x82\xDC\x82\xB9\x82\xF1\x0A"; +SECTION_DEAD static char const* const stringBase_80379B40 = + "<%s.arc> dRes_control_c::setRes: res info set er" + "ror !!\n"; +#pragma pop + /* 8003C078-8003C160 0369B8 00E8+00 2/2 8/8 0/0 .text * setRes__14dRes_control_cFPCcP11dRes_info_ciPCcUcP7JKRHeap */ #pragma push @@ -868,6 +951,14 @@ asm void dRes_control_c::newResInfo(dRes_info_c* param_0, int param_1) { } #pragma pop +/* ############################################################################################## */ +/* 803798B8-803798B8 005F18 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80379B78 = + "<%s.arc> getRes: res during reading !!\n"; +#pragma pop + /* 8003C288-8003C2EC 036BC8 0064+00 4/4 0/0 0/0 .text * getResInfoLoaded__14dRes_control_cFPCcP11dRes_info_ci */ #pragma push @@ -879,6 +970,15 @@ asm void dRes_control_c::getResInfoLoaded(char const* param_0, dRes_info_c* para } #pragma pop +/* ############################################################################################## */ +/* 803798B8-803798B8 005F18 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80379BA0 = + "<%s.arc> getRes: res index over !! index=%d coun" + "t=%d\n"; +#pragma pop + /* 8003C2EC-8003C37C 036C2C 0090+00 1/1 54/54 894/894 .text * getRes__14dRes_control_cFPCclP11dRes_info_ci */ #pragma push @@ -926,6 +1026,13 @@ asm void dRes_control_c::syncAllRes(dRes_info_c* param_0, int param_1) { } #pragma pop +/* ############################################################################################## */ +/* 803798B8-803798B8 005F18 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80379BD6 = ""; +#pragma pop + /* 8003C4E4-8003C5BC 036E24 00D8+00 1/1 0/0 0/0 .text * setObjectRes__14dRes_control_cFPCcPvUlP7JKRHeap */ #pragma push @@ -938,6 +1045,13 @@ asm void dRes_control_c::setObjectRes(char const* param_0, void* param_1, u32 pa } #pragma pop +/* ############################################################################################## */ +/* 803798B8-803798B8 005F18 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80379BD7 = "/res/Stage/%s/"; +#pragma pop + /* 8003C5BC-8003C638 036EFC 007C+00 0/0 2/2 0/0 .text setStageRes__14dRes_control_cFPCcP7JKRHeap */ #pragma push @@ -949,6 +1063,16 @@ asm void dRes_control_c::setStageRes(char const* param_0, JKRHeap* param_1) { } #pragma pop +/* ############################################################################################## */ +/* 803798B8-803798B8 005F18 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80379BE6 = "\ndRes_control_c::dump mObjectInfo\n"; +SECTION_DEAD static char const* const stringBase_80379C09 = "\ndRes_control_c::dump mStageInfo\n"; +/* @stringBase0 padding */ +SECTION_DEAD static char const* const pad_80379C2B = "\0\0\0\0"; +#pragma pop + /* 8003C638-8003C6B8 036F78 0080+00 0/0 2/2 0/0 .text dump__14dRes_control_cFv */ #pragma push #pragma optimization_level 0 @@ -1021,56 +1145,4 @@ asm void J3DTexNoAnm::calc(u16* param_0) const { } #pragma pop -/* 803798B8-80379C30 005F18 0373+05 13/13 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_803798B8 = "%s%s.arc"; -SECTION_DEAD static char const* const stringBase_803798C1 = "fbtex_dummy"; -SECTION_DEAD static char const* const stringBase_803798CD = "dummy"; -SECTION_DEAD static char const* const stringBase_803798D3 = "Zbuffer"; -SECTION_DEAD static char const* const stringBase_803798DB = "Always"; -SECTION_DEAD static char const* const stringBase_803798E2 = - "<%s.arc> setRes: res pointer buffer nothing !!\n"; -SECTION_DEAD static char const* const stringBase_80379912 = "<%s> res == NULL !!\n"; -SECTION_DEAD static char const* const stringBase_80379927 = - "<%s.arc> setRes: archive mount error !!\n"; -SECTION_DEAD static char const* const stringBase_80379950 = - "<%s.arc> mDMCommandsetRes: can't alloc memory\n"; -SECTION_DEAD static char const* const stringBase_8037997F = "%5.1f %5x %5.1f %5x %3d %s\n"; -SECTION_DEAD static char const* const stringBase_8037999B = "dRes_info_c::dump_long %08x %d\n"; -SECTION_DEAD static char const* const stringBase_803799BB = - "No Command Archive ArcHeader(size) SolidHeap(si" - "ze) Resource Cnt ArchiveName\n"; -SECTION_DEAD static char const* const stringBase_80379A09 = - "%2d %08x %08x %08x(%6x) %08x(%5x) %08x %3d %s\n"; -SECTION_DEAD static char const* const stringBase_80379A38 = "dRes_info_c::dump %08x %d\n"; -SECTION_DEAD static char const* const stringBase_80379A53 = - "No ArchiveSize(KB) SolidHeapSize(KB) Cnt Archive" - "Name\n"; -SECTION_DEAD static char const* const stringBase_80379A89 = "%2d %6.1f %6x %6.1f %6x %3d %s\n"; -SECTION_DEAD static char const* const stringBase_80379AA9 = - "----------------------------------------------\n " - " %6.1f %6x %6.1f %6x Total\n\n"; -// MWCC ignores mapping of some japanese characters using the -// byte 0x5C (ASCII '\'). This is why this string is hex-encoded. -SECTION_DEAD static char const* const stringBase_80379AF9 = - "\x3C\x25\x73\x2E\x61\x72\x63\x3E\x20\x64\x52\x65\x73\x5F\x63\x6F\x6E\x74\x72\x6F\x6C\x5F\x63" - "\x3A\x3A\x73\x65\x74\x52\x65\x73\x3A\x20\x8B\xF3\x82\xAB\x83\x8A\x83\x5C\x81\x5B\x83\x58\x8F" - "\xEE\x95" - "\xF1\x83\x7C\x83\x43\x83\x93\x83\x5E\x82\xAA\x82\xA0\x82\xE8\x82\xDC\x82\xB9\x82\xF1\x0A"; -SECTION_DEAD static char const* const stringBase_80379B40 = - "<%s.arc> dRes_control_c::setRes: res info set er" - "ror !!\n"; -SECTION_DEAD static char const* const stringBase_80379B78 = - "<%s.arc> getRes: res during reading !!\n"; -SECTION_DEAD static char const* const stringBase_80379BA0 = - "<%s.arc> getRes: res index over !! index=%d coun" - "t=%d\n"; -SECTION_DEAD static char const* const stringBase_80379BD6 = ""; -SECTION_DEAD static char const* const stringBase_80379BD7 = "/res/Stage/%s/"; -SECTION_DEAD static char const* const stringBase_80379BE6 = "\ndRes_control_c::dump mObjectInfo\n"; -SECTION_DEAD static char const* const stringBase_80379C09 = "\ndRes_control_c::dump mStageInfo\n"; -/* @stringBase0 padding */ -SECTION_DEAD static char const* const pad_80379C2B = "\0\0\0\0"; -#pragma pop +/* 803798B8-803798B8 005F18 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/d_scope.cpp b/src/d/d_scope.cpp index 7135a9fb9c9..4ae9fc98bb5 100644 --- a/src/d/d_scope.cpp +++ b/src/d/d_scope.cpp @@ -94,6 +94,15 @@ extern "C" extern u8 g_meter2_info[248]; // /* ############################################################################################## */ +/* 803949F0-803949F0 021050 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_803949F0 = "wipe_00.bti"; +SECTION_DEAD static char const* const stringBase_803949FC = "tt_block8x8.bti"; +/* @stringBase0 padding */ +SECTION_DEAD static char const* const pad_80394A0C = "\0\0\0"; +#pragma pop + /* 803BB618-803BB624 018738 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -392,15 +401,7 @@ asm void __sinit_d_scope_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80194140 = (void*)__sinit_d_scope_cpp; +REGISTER_CTORS(0x80194140, __sinit_d_scope_cpp); #pragma pop -/* 803949F0-80394A10 021050 001C+04 1/1 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_803949F0 = "wipe_00.bti"; -SECTION_DEAD static char const* const stringBase_803949FC = "tt_block8x8.bti"; -/* @stringBase0 padding */ -SECTION_DEAD static char const* const pad_80394A0C = "\0\0\0"; -#pragma pop +/* 803949F0-803949F0 021050 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/d_select_cursor.cpp b/src/d/d_select_cursor.cpp index cb75de20f7c..ab48d311f68 100644 --- a/src/d/d_select_cursor.cpp +++ b/src/d/d_select_cursor.cpp @@ -19,14 +19,14 @@ struct dSelect_icon_c { /* 80195B70 */ void setPos(J2DPane*, f32, f32); }; -struct JKRArchive {}; - -struct J2DAnmTextureSRTKey {}; - struct J2DAnmTransformKey { /* 801959C0 */ ~J2DAnmTransformKey(); }; +struct J2DAnmTextureSRTKey {}; + +struct JKRArchive {}; + struct J2DAnmColor {}; struct dSelect_cursor_c { @@ -151,6 +151,26 @@ extern "C" extern u8 g_dComIfG_gameInfo[122384]; // /* ############################################################################################## */ +/* 80394AA0-80394AA0 021100 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80394AA0 = "zelda_select_cursor_4parts.blo"; +SECTION_DEAD static char const* const stringBase_80394ABF = "zelda_store_select_icon.blo"; +SECTION_DEAD static char const* const stringBase_80394ADB = "zelda_map_screen_portal_icon.blo"; +SECTION_DEAD static char const* const stringBase_80394AFC = "zelda_map_screen_batsumark.blo"; +SECTION_DEAD static char const* const stringBase_80394B1B = ""; +SECTION_DEAD static char const* const stringBase_80394B1C = "zelda_store_select_icon.bck"; +SECTION_DEAD static char const* const stringBase_80394B38 = "zelda_select_cursor_4parts.bpk"; +SECTION_DEAD static char const* const stringBase_80394B57 = "zelda_store_select_icon.bpk"; +SECTION_DEAD static char const* const stringBase_80394B73 = "zelda_map_screen_portal_icon.bpk"; +SECTION_DEAD static char const* const stringBase_80394B94 = "zelda_map_screen_batsumark.bpk"; +SECTION_DEAD static char const* const stringBase_80394BB3 = "zelda_select_cursor_4parts.btk"; +SECTION_DEAD static char const* const stringBase_80394BD2 = "zelda_store_select_icon.btk"; +SECTION_DEAD static char const* const stringBase_80394BEE = "zelda_store_select_icon_02.btk"; +/* @stringBase0 padding */ +SECTION_DEAD static char const* const pad_80394C0D = "\0\0"; +#pragma pop + /* 803BB700-803BB70C 018820 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -267,7 +287,7 @@ SECTION_RODATA static u8 const corner_tag[32] = { 0x6C, 0x5F, 0x75, 0x5F, 0x6E, 0x75, 0x6C, 0x6C, 0x6C, 0x5F, 0x64, 0x5F, 0x6E, 0x75, 0x6C, 0x6C, 0x72, 0x5F, 0x75, 0x5F, 0x6E, 0x75, 0x6C, 0x6C, 0x72, 0x5F, 0x64, 0x5F, 0x6E, 0x75, 0x6C, 0x6C, }; -COMPILER_STRIP_GATE(80394A10, &corner_tag); +COMPILER_STRIP_GATE(0x80394A10, &corner_tag); /* 80453A50-80453A54 002050 0004+00 4/4 0/0 0/0 .sdata2 @3808 */ SECTION_SDATA2 static u8 lit_3808[4] = { @@ -400,7 +420,7 @@ SECTION_RODATA static u8 const tag_4181[32] = { 0x00, 0x00, 0x00, 0x00, 0x6C, 0x5F, 0x6C, 0x64, 0x00, 0x00, 0x00, 0x00, 0x6C, 0x5F, 0x6C, 0x75, 0x00, 0x00, 0x00, 0x00, 0x6C, 0x5F, 0x72, 0x64, 0x00, 0x00, 0x00, 0x00, 0x6C, 0x5F, 0x72, 0x75, }; -COMPILER_STRIP_GATE(80394A30, &tag_4181); +COMPILER_STRIP_GATE(0x80394A30, &tag_4181); /* 80195460-801955F0 18FDA0 0190+00 1/1 0/0 0/0 .text * setBpkAnimation__16dSelect_cursor_cFP11J2DAnmColor */ @@ -421,13 +441,13 @@ SECTION_RODATA static u8 const tag_4197[64] = { 0x00, 0x69, 0x5F, 0x63, 0x5F, 0x72, 0x64, 0x31, 0x00, 0x69, 0x5F, 0x63, 0x5F, 0x72, 0x64, 0x32, 0x00, 0x69, 0x5F, 0x63, 0x5F, 0x72, 0x75, 0x31, 0x00, 0x69, 0x5F, 0x63, 0x5F, 0x72, 0x75, 0x32, }; -COMPILER_STRIP_GATE(80394A50, &tag_4197); +COMPILER_STRIP_GATE(0x80394A50, &tag_4197); /* 80394A90-80394AA0 0210F0 0010+00 1/1 0/0 0/0 .rodata tag$4204 */ SECTION_RODATA static u8 const tag_4204[16] = { 0x00, 0x00, 0x67, 0x6F, 0x6C, 0x64, 0x30, 0x31, 0x00, 0x00, 0x67, 0x6F, 0x6C, 0x64, 0x30, 0x32, }; -COMPILER_STRIP_GATE(80394A90, &tag_4204); +COMPILER_STRIP_GATE(0x80394A90, &tag_4204); /* 801955F0-80195724 18FF30 0134+00 1/1 0/0 0/0 .text * setBtk0Animation__16dSelect_cursor_cFP19J2DAnmTextureSRTKey */ @@ -499,23 +519,4 @@ asm J2DAnmTransformKey::~J2DAnmTransformKey() { } #pragma pop -/* 80394AA0-80394C10 021100 016D+03 6/1 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80394AA0 = "zelda_select_cursor_4parts.blo"; -SECTION_DEAD static char const* const stringBase_80394ABF = "zelda_store_select_icon.blo"; -SECTION_DEAD static char const* const stringBase_80394ADB = "zelda_map_screen_portal_icon.blo"; -SECTION_DEAD static char const* const stringBase_80394AFC = "zelda_map_screen_batsumark.blo"; -SECTION_DEAD static char const* const stringBase_80394B1B = ""; -SECTION_DEAD static char const* const stringBase_80394B1C = "zelda_store_select_icon.bck"; -SECTION_DEAD static char const* const stringBase_80394B38 = "zelda_select_cursor_4parts.bpk"; -SECTION_DEAD static char const* const stringBase_80394B57 = "zelda_store_select_icon.bpk"; -SECTION_DEAD static char const* const stringBase_80394B73 = "zelda_map_screen_portal_icon.bpk"; -SECTION_DEAD static char const* const stringBase_80394B94 = "zelda_map_screen_batsumark.bpk"; -SECTION_DEAD static char const* const stringBase_80394BB3 = "zelda_select_cursor_4parts.btk"; -SECTION_DEAD static char const* const stringBase_80394BD2 = "zelda_store_select_icon.btk"; -SECTION_DEAD static char const* const stringBase_80394BEE = "zelda_store_select_icon_02.btk"; -/* @stringBase0 padding */ -SECTION_DEAD static char const* const pad_80394C0D = "\0\0"; -#pragma pop +/* 80394AA0-80394AA0 021100 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/d_select_icon.cpp b/src/d/d_select_icon.cpp index 8c6cb5987ce..372b46f14e8 100644 --- a/src/d/d_select_icon.cpp +++ b/src/d/d_select_icon.cpp @@ -154,5 +154,5 @@ asm void __sinit_d_select_icon_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80195C64 = (void*)__sinit_d_select_icon_cpp; +REGISTER_CTORS(0x80195C64, __sinit_d_select_icon_cpp); #pragma pop diff --git a/src/d/d_stage.cpp b/src/d/d_stage.cpp index b8119371264..8905ad11e39 100644 --- a/src/d/d_stage.cpp +++ b/src/d/d_stage.cpp @@ -101,31 +101,31 @@ struct dStage_startStage_c { /* 8002419C */ void set(char const*, s8, s16, s8); }; -struct dStage_Lbnk_c {}; - -struct dStage_DMap_c {}; - struct dStage_FileList2_dt_c {}; -struct dStage_FloorInfo_c {}; - -struct dStage_dPnt_c {}; - -struct dStage_Elst_c {}; +struct dStage_MemoryMap_c {}; struct dStage_dPath_c {}; +struct dStage_Multi_c {}; + struct dStage_SoundInfo_c {}; struct dStage_FileList_dt_c {}; -struct dStage_MemoryMap_c {}; +struct dStage_dPnt_c {}; + +struct dStage_FloorInfo_c {}; + +struct dStage_Lbnk_c {}; + +struct dStage_Elst_c {}; struct dStage_MemoryConfig_c {}; -struct dStage_MapEventInfo_c {}; +struct dStage_DMap_c {}; -struct dStage_Multi_c {}; +struct dStage_MapEventInfo_c {}; struct dStage_stageDt_c { /* 8002483C */ void getStagInfo() const; @@ -823,6 +823,13 @@ extern "C" u8 mResetData__6mDoRst[4 + 4 /* padding */]; // Declarations: // +/* ############################################################################################## */ +/* 80378A50-80378A50 0050B0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80378A50 = "OPENING"; +#pragma pop + /* 80023E28-80023E94 01E768 006C+00 0/0 1/1 0/3 .text set__18dStage_nextStage_cFPCcScsScScUc */ #pragma push #pragma optimization_level 0 @@ -834,6 +841,14 @@ asm void dStage_nextStage_c::set(char const* param_0, s8 param_1, s16 param_2, s } #pragma pop +/* ############################################################################################## */ +/* 80378A50-80378A50 0050B0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80378A58 = + "部屋情報が、多分ですが壊れています。\n変換し直してみてください。\n"; +#pragma pop + /* 80023E94-80023EC4 01E7D4 0030+00 14/14 0/0 0/0 .text dStage_SetErrorRoom__Fv */ #pragma push #pragma optimization_level 0 @@ -844,6 +859,14 @@ static asm void dStage_SetErrorRoom() { } #pragma pop +/* ############################################################################################## */ +/* 80378A50-80378A50 0050B0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80378A99 = + "ステージ情報が、多分ですが壊れています。\n変換し直してみてください。"; +#pragma pop + /* 80023EC4-80023EF4 01E804 0030+00 5/5 0/0 0/1 .text dStage_SetErrorStage__Fv */ #pragma push #pragma optimization_level 0 @@ -968,6 +991,13 @@ asm void dStage_startStage_c::set(char const* param_0, s8 param_1, s16 param_2, #pragma pop /* ############################################################################################## */ +/* 80378A50-80378A50 0050B0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80378ADD = "name.bin"; +SECTION_DEAD static char const* const stringBase_80378AE6 = "bank.bin"; +#pragma pop + /* 803F6088-803F6094 022DA8 000C+00 0/1 0/0 0/0 .bss @5376 */ #pragma push #pragma force_active on @@ -2009,6 +2039,15 @@ asm void dStage_roomControl_c::getArcBank(int param_0) { } #pragma pop +/* ############################################################################################## */ +/* 80378A50-80378A50 0050B0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80378AEF = ""; +SECTION_DEAD static char const* const stringBase_80378AF0 = + "Bank[%d] : %s.arc Sync Read Error !!\n"; +#pragma pop + /* 80024954-80024A34 01F294 00E0+00 0/0 2/2 0/2 .text resetArchiveBank__20dStage_roomControl_cFi */ #pragma push @@ -2042,6 +2081,13 @@ asm void dStage_roomControl_c::roomDzs_c::remove() { } #pragma pop +/* ############################################################################################## */ +/* 80378A50-80378A50 0050B0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80378B16 = "%s/room%d.dzs"; +#pragma pop + /* 80024B44-80024C1C 01F484 00D8+00 1/1 0/0 0/1 .text add__Q220dStage_roomControl_c9roomDzs_cFUcUc */ #pragma push @@ -2124,6 +2170,13 @@ asm void dStage_searchName(char const* param_0) { } #pragma pop +/* ############################################################################################## */ +/* 80378A50-80378A50 0050B0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80378B24 = "%d%+0d"; +#pragma pop + /* 80024E30-80024EDC 01F770 00AC+00 1/1 0/0 0/0 .text dStage_getName__FsSc */ #pragma push #pragma optimization_level 0 @@ -2195,6 +2248,13 @@ asm void dStage_stageDt_c::getPlayer() const { } #pragma pop +/* ############################################################################################## */ +/* 80378A50-80378A50 0050B0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80378B2B = "S_MV000"; +#pragma pop + /* 80025014-800252B8 01F954 02A4+00 2/0 0/0 0/0 .text dStage_playerInit__FP11dStage_dt_cPviPv */ #pragma push #pragma optimization_level 0 @@ -2407,6 +2467,13 @@ asm void dStage_stagInfo_GetParticleNo(stage_stag_info_class* param_0, int param } #pragma pop +/* ############################################################################################## */ +/* 80378A50-80378A50 0050B0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80378B33 = "Xtg_00"; +#pragma pop + /* 80025744-8002582C 020084 00E8+00 1/0 0/0 0/0 .text dStage_stagInfoInit__FP11dStage_dt_cPviPv */ #pragma push #pragma optimization_level 0 @@ -2608,6 +2675,13 @@ static asm void dStage_setLayerTagName(FuncTable* param_0, int param_1, int para } #pragma pop +/* ############################################################################################## */ +/* 80378A50-80378A50 0050B0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80378B3A = "dStage_dt_c_decode: i_data is NULL\n"; +#pragma pop + /* 800260B4-8002617C 0209F4 00C8+00 9/9 0/0 0/0 .text * dStage_dt_c_decode__FPvP11dStage_dt_cP9FuncTablei */ #pragma push @@ -2748,6 +2822,12 @@ static asm void dStage_fieldMapMapPathInit(dStage_dt_c* param_0, void* param_1, #pragma pop /* ############################################################################################## */ +/* 80378A50-80378A50 0050B0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80378B5E = "room%d.dzs"; +#pragma pop + /* 80450D74-80450D7C 000274 0008+00 3/3 0/0 0/0 .sbss m_roomDzs__20dStage_roomControl_c */ u8 dStage_roomControl_c::m_roomDzs[8]; @@ -2960,6 +3040,13 @@ asm void dStage_dt_c_fieldMapLoader(void* param_0, dStage_dt_c* param_1) { } #pragma pop +/* ############################################################################################## */ +/* 80378A50-80378A50 0050B0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80378B69 = "stage.dzs"; +#pragma pop + /* 80026CDC-80026D38 02161C 005C+00 0/0 1/1 0/0 .text dStage_infoCreate__Fv */ #pragma push #pragma optimization_level 0 @@ -2971,6 +3058,12 @@ asm void dStage_infoCreate() { #pragma pop /* ############################################################################################## */ +/* 80378A50-80378A50 0050B0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80378B73 = "vrbox_sora.bmd"; +#pragma pop + /* 80406194-804061A0 032EB4 000A+02 2/2 14/14 7/7 .bss mDemoArcName__20dStage_roomControl_c */ u8 dStage_roomControl_c::mDemoArcName[10 + 2 /* padding */]; @@ -2984,6 +3077,14 @@ asm void dStage_Create() { } #pragma pop +/* ############################################################################################## */ +/* 80378A50-80378A50 0050B0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80378B82 = "Stg_00"; +SECTION_DEAD static char const* const stringBase_80378B89 = "Event"; +#pragma pop + /* 80026DF8-80026FDC 021738 01E4+00 0/0 1/1 0/7 .text dStage_Delete__Fv */ #pragma push #pragma optimization_level 0 @@ -3069,6 +3170,14 @@ asm void dStage_stageDt_c::getSclsInfo() const { } #pragma pop +/* ############################################################################################## */ +/* 80378A50-80378A50 0050B0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80378B8F = "%s: %d: シーンリストがありません。\n"; +SECTION_DEAD static char const* const stringBase_80378BB3 = "d_stage.cpp"; +#pragma pop + /* 800272F0-800274B0 021C30 01C0+00 0/0 1/1 0/0 .text dStage_changeScene4Event__FiScibfUlsi */ #pragma push #pragma optimization_level 0 @@ -3090,16 +3199,11 @@ asm void dStage_restartRoom(u32 param_0, u32 param_1, int param_2) { } #pragma pop -/* 80027524-8002752C 021E64 0008+00 1/0 0/0 0/0 .text +/* 80027524-8002752C -00001 0008+00 0/0 0/0 0/0 .text * setCamera__15dStage_roomDt_cFP18stage_camera_class */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dStage_roomDt_c::setCamera(stage_camera_class* param_0) { - nofralloc -#include "asm/d/d_stage/setCamera__15dStage_roomDt_cFP18stage_camera_class.s" +void dStage_roomDt_c::setCamera(stage_camera_class* param_0) { + *(u32*)(((u8*)this) + 52) /* this->field_0x34 */ = (u32)(param_0); } -#pragma pop /* 8002752C-80027534 021E6C 0008+00 1/0 0/0 0/0 .text getCamera__15dStage_roomDt_cCFv */ #pragma push @@ -3111,16 +3215,11 @@ asm void dStage_roomDt_c::getCamera() const { } #pragma pop -/* 80027534-8002753C 021E74 0008+00 1/0 0/0 0/0 .text +/* 80027534-8002753C -00001 0008+00 0/0 0/0 0/0 .text * setArrow__15dStage_roomDt_cFP17stage_arrow_class */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dStage_roomDt_c::setArrow(stage_arrow_class* param_0) { - nofralloc -#include "asm/d/d_stage/setArrow__15dStage_roomDt_cFP17stage_arrow_class.s" +void dStage_roomDt_c::setArrow(stage_arrow_class* param_0) { + *(u32*)(((u8*)this) + 56) /* this->field_0x38 */ = (u32)(param_0); } -#pragma pop /* 8002753C-80027544 021E7C 0008+00 1/0 0/0 0/0 .text getArrow__15dStage_roomDt_cCFv */ #pragma push @@ -3132,27 +3231,17 @@ asm void dStage_roomDt_c::getArrow() const { } #pragma pop -/* 80027544-8002754C 021E84 0008+00 1/0 0/0 0/0 .text +/* 80027544-8002754C -00001 0008+00 0/0 0/0 0/0 .text * setPlayer__15dStage_roomDt_cFP17stage_actor_class */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dStage_roomDt_c::setPlayer(stage_actor_class* param_0) { - nofralloc -#include "asm/d/d_stage/setPlayer__15dStage_roomDt_cFP17stage_actor_class.s" +void dStage_roomDt_c::setPlayer(stage_actor_class* param_0) { + *(u32*)(((u8*)this) + 40) /* this->field_0x28 */ = (u32)(param_0); } -#pragma pop -/* 8002754C-80027554 021E8C 0008+00 1/0 0/0 0/0 .text setPlayerNum__15dStage_roomDt_cFUs +/* 8002754C-80027554 -00001 0008+00 0/0 0/0 0/0 .text setPlayerNum__15dStage_roomDt_cFUs */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dStage_roomDt_c::setPlayerNum(u16 param_0) { - nofralloc -#include "asm/d/d_stage/setPlayerNum__15dStage_roomDt_cFUs.s" +void dStage_roomDt_c::setPlayerNum(u16 param_0) { + *(u16*)(((u8*)this) + 96) /* this->field_0x60 */ = (u16)(param_0); } -#pragma pop /* 80027554-8002755C 021E94 0008+00 1/0 0/0 0/0 .text getPlayerNum__15dStage_roomDt_cCFv */ @@ -3165,6 +3254,13 @@ asm void dStage_roomDt_c::getPlayerNum() const { } #pragma pop +/* ############################################################################################## */ +/* 80378A50-80378A50 0050B0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80378BBF = "Room non room data !!\n"; +#pragma pop + /* 8002755C-80027590 021E9C 0034+00 1/0 0/0 0/0 .text setRoom__15dStage_roomDt_cFP14roomRead_class */ #pragma push @@ -3186,16 +3282,11 @@ asm void dStage_roomDt_c::getRoom() const { } #pragma pop -/* 800275C4-800275CC 021F04 0008+00 1/0 0/0 0/0 .text +/* 800275C4-800275CC -00001 0008+00 0/0 0/0 0/0 .text * setMapInfo__15dStage_roomDt_cFP20stage_map_info_class */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dStage_roomDt_c::setMapInfo(stage_map_info_class* param_0) { - nofralloc -#include "asm/d/d_stage/setMapInfo__15dStage_roomDt_cFP20stage_map_info_class.s" +void dStage_roomDt_c::setMapInfo(stage_map_info_class* param_0) { + *(u32*)(((u8*)this) + 16) /* this->field_0x10 */ = (u32)(param_0); } -#pragma pop /* 800275CC-800275D4 021F0C 0008+00 1/0 0/0 0/0 .text getMapInfo__15dStage_roomDt_cCFv */ #pragma push @@ -3207,15 +3298,17 @@ asm void dStage_roomDt_c::getMapInfo() const { } #pragma pop -/* 800275D4-800275DC 021F14 0008+00 1/0 0/0 0/0 .text +/* 800275D4-800275DC -00001 0008+00 0/0 0/0 0/0 .text * setMapInfoBase__15dStage_roomDt_cFP26stage_map_info_dummy_class */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dStage_roomDt_c::setMapInfoBase(stage_map_info_dummy_class* param_0) { - nofralloc -#include "asm/d/d_stage/setMapInfoBase__15dStage_roomDt_cFP26stage_map_info_dummy_class.s" +void dStage_roomDt_c::setMapInfoBase(stage_map_info_dummy_class* param_0) { + *(u32*)(((u8*)this) + 20) /* this->field_0x14 */ = (u32)(param_0); } + +/* ############################################################################################## */ +/* 80378A50-80378A50 0050B0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80378BD6 = "Room non palet data !!\n"; #pragma pop /* 800275DC-80027610 021F1C 0034+00 1/0 0/0 0/0 .text @@ -3239,6 +3332,13 @@ asm void dStage_roomDt_c::getPaletteInfo() const { } #pragma pop +/* ############################################################################################## */ +/* 80378A50-80378A50 0050B0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80378BEE = "Room non pselect data !!\n"; +#pragma pop + /* 80027644-80027678 021F84 0034+00 1/0 0/0 0/0 .text * setPselectInfo__15dStage_roomDt_cFP24stage_pselect_info_class */ #pragma push @@ -3260,6 +3360,13 @@ asm void dStage_roomDt_c::getPselectInfo() const { } #pragma pop +/* ############################################################################################## */ +/* 80378A50-80378A50 0050B0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80378C08 = "Room non envr data !!\n"; +#pragma pop + /* 800276AC-800276E0 021FEC 0034+00 1/0 0/0 0/0 .text * setEnvrInfo__15dStage_roomDt_cFP21stage_envr_info_class */ #pragma push @@ -3282,16 +3389,11 @@ asm void dStage_roomDt_c::getEnvrInfo() const { } #pragma pop -/* 80027714-8002771C 022054 0008+00 1/0 0/0 0/0 .text +/* 80027714-8002771C -00001 0008+00 0/0 0/0 0/0 .text * setVrboxInfo__15dStage_roomDt_cFP22stage_vrbox_info_class */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dStage_roomDt_c::setVrboxInfo(stage_vrbox_info_class* param_0) { - nofralloc -#include "asm/d/d_stage/setVrboxInfo__15dStage_roomDt_cFP22stage_vrbox_info_class.s" +void dStage_roomDt_c::setVrboxInfo(stage_vrbox_info_class* param_0) { + *(u32*)(((u8*)this) + 24) /* this->field_0x18 */ = (u32)(param_0); } -#pragma pop /* 8002771C-80027724 02205C 0008+00 1/0 0/0 0/0 .text getVrboxInfo__15dStage_roomDt_cCFv */ @@ -3304,16 +3406,11 @@ asm void dStage_roomDt_c::getVrboxInfo() const { } #pragma pop -/* 80027724-8002772C 022064 0008+00 1/0 0/0 0/0 .text +/* 80027724-8002772C -00001 0008+00 0/0 0/0 0/0 .text * setVrboxcolInfo__15dStage_roomDt_cFP25stage_vrboxcol_info_class */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dStage_roomDt_c::setVrboxcolInfo(stage_vrboxcol_info_class* param_0) { - nofralloc -#include "asm/d/d_stage/setVrboxcolInfo__15dStage_roomDt_cFP25stage_vrboxcol_info_class.s" +void dStage_roomDt_c::setVrboxcolInfo(stage_vrboxcol_info_class* param_0) { + *(u32*)(((u8*)this) + 28) /* this->field_0x1c */ = (u32)(param_0); } -#pragma pop /* 8002772C-80027734 02206C 0008+00 1/0 0/0 0/0 .text getVrboxcolInfo__15dStage_roomDt_cCFv */ #pragma push @@ -3325,6 +3422,13 @@ asm void dStage_roomDt_c::getVrboxcolInfo() const { } #pragma pop +/* ############################################################################################## */ +/* 80378A50-80378A50 0050B0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80378C1F = "Room non plight data !!\n"; +#pragma pop + /* 80027734-80027768 022074 0034+00 1/0 0/0 0/0 .text * setPlightInfo__15dStage_roomDt_cFP23stage_plight_info_class */ #pragma push @@ -3347,6 +3451,13 @@ asm void dStage_roomDt_c::getPlightInfo() const { } #pragma pop +/* ############################################################################################## */ +/* 80378A50-80378A50 0050B0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80378C38 = "Room non palette num data !!\n"; +#pragma pop + /* 8002779C-800277D0 0220DC 0034+00 1/0 0/0 0/0 .text setPaletteNumInfo__15dStage_roomDt_cFi */ #pragma push #pragma optimization_level 0 @@ -3367,6 +3478,13 @@ asm void dStage_roomDt_c::getPaletteNumInfo() const { } #pragma pop +/* ############################################################################################## */ +/* 80378A50-80378A50 0050B0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80378C56 = "Room non pselect num data !!\n"; +#pragma pop + /* 80027804-80027838 022144 0034+00 1/0 0/0 0/0 .text setPselectNumInfo__15dStage_roomDt_cFi */ #pragma push #pragma optimization_level 0 @@ -3387,6 +3505,13 @@ asm void dStage_roomDt_c::getPselectNumInfo() const { } #pragma pop +/* ############################################################################################## */ +/* 80378A50-80378A50 0050B0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80378C74 = "Room non envr num data !!\n"; +#pragma pop + /* 8002786C-800278A0 0221AC 0034+00 1/0 0/0 0/0 .text setEnvrNumInfo__15dStage_roomDt_cFi */ #pragma push @@ -3408,15 +3533,10 @@ asm void dStage_roomDt_c::getEnvrNumInfo() const { } #pragma pop -/* 800278D4-800278DC 022214 0008+00 1/0 0/0 0/0 .text setVrboxNumInfo__15dStage_roomDt_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dStage_roomDt_c::setVrboxNumInfo(int param_0) { - nofralloc -#include "asm/d/d_stage/setVrboxNumInfo__15dStage_roomDt_cFi.s" +/* 800278D4-800278DC -00001 0008+00 0/0 0/0 0/0 .text setVrboxNumInfo__15dStage_roomDt_cFi */ +void dStage_roomDt_c::setVrboxNumInfo(int param_0) { + *(u32*)(((u8*)this) + 100) /* this->field_0x64 */ = (u32)(param_0); } -#pragma pop /* 800278DC-800278E4 02221C 0008+00 1/0 0/0 0/0 .text getVrboxNumInfo__15dStage_roomDt_cCFv */ #pragma push @@ -3428,15 +3548,10 @@ asm void dStage_roomDt_c::getVrboxNumInfo() const { } #pragma pop -/* 800278E4-800278EC 022224 0008+00 1/0 0/0 0/0 .text setVrboxcolNumInfo__15dStage_roomDt_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dStage_roomDt_c::setVrboxcolNumInfo(int param_0) { - nofralloc -#include "asm/d/d_stage/setVrboxcolNumInfo__15dStage_roomDt_cFi.s" +/* 800278E4-800278EC -00001 0008+00 0/0 0/0 0/0 .text setVrboxcolNumInfo__15dStage_roomDt_cFi */ +void dStage_roomDt_c::setVrboxcolNumInfo(int param_0) { + *(u32*)(((u8*)this) + 104) /* this->field_0x68 */ = (u32)(param_0); } -#pragma pop /* 800278EC-800278F4 02222C 0008+00 1/0 0/0 0/0 .text getVrboxcolNumInfo__15dStage_roomDt_cCFv */ #pragma push @@ -3448,6 +3563,13 @@ asm void dStage_roomDt_c::getVrboxcolNumInfo() const { } #pragma pop +/* ############################################################################################## */ +/* 80378A50-80378A50 0050B0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80378C8F = "Room non plight num data !!\n"; +#pragma pop + /* 800278F4-80027928 022234 0034+00 1/0 0/0 0/0 .text setPlightNumInfo__15dStage_roomDt_cFi */ #pragma push #pragma optimization_level 0 @@ -3468,16 +3590,11 @@ asm void dStage_roomDt_c::getPlightNumInfo() const { } #pragma pop -/* 8002795C-80027964 02229C 0008+00 1/0 0/0 0/0 .text +/* 8002795C-80027964 -00001 0008+00 0/0 0/0 0/0 .text * setLightVecInfo__15dStage_roomDt_cFP30stage_pure_lightvec_info_class */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dStage_roomDt_c::setLightVecInfo(stage_pure_lightvec_info_class* param_0) { - nofralloc -#include "asm/d/d_stage/setLightVecInfo__15dStage_roomDt_cFP30stage_pure_lightvec_info_class.s" +void dStage_roomDt_c::setLightVecInfo(stage_pure_lightvec_info_class* param_0) { + *(u32*)(((u8*)this) + 8) /* this->field_0x8 */ = (u32)(param_0); } -#pragma pop /* 80027964-8002796C 0222A4 0008+00 1/0 0/0 0/0 .text getLightVecInfo__15dStage_roomDt_cCFv */ #pragma push @@ -3489,15 +3606,10 @@ asm void dStage_roomDt_c::getLightVecInfo() const { } #pragma pop -/* 8002796C-80027974 0222AC 0008+00 1/0 0/0 0/0 .text setLightVecInfoNum__15dStage_roomDt_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dStage_roomDt_c::setLightVecInfoNum(int param_0) { - nofralloc -#include "asm/d/d_stage/setLightVecInfoNum__15dStage_roomDt_cFi.s" +/* 8002796C-80027974 -00001 0008+00 0/0 0/0 0/0 .text setLightVecInfoNum__15dStage_roomDt_cFi */ +void dStage_roomDt_c::setLightVecInfoNum(int param_0) { + *(u32*)(((u8*)this) + 12) /* this->field_0xc */ = (u32)(param_0); } -#pragma pop /* 80027974-8002797C 0222B4 0008+00 1/0 0/0 0/0 .text getLightVecInfoNum__15dStage_roomDt_cCFv */ #pragma push @@ -3509,6 +3621,13 @@ asm void dStage_roomDt_c::getLightVecInfoNum() const { } #pragma pop +/* ############################################################################################## */ +/* 80378A50-80378A50 0050B0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80378CAC = "Room non stag data !!\n"; +#pragma pop + /* 8002797C-800279B0 0222BC 0034+00 1/0 0/0 0/0 .text * setStagInfo__15dStage_roomDt_cFP21stage_stag_info_class */ #pragma push @@ -3531,15 +3650,17 @@ asm void dStage_roomDt_c::getStagInfo() const { } #pragma pop -/* 800279E4-800279EC 022324 0008+00 1/0 0/0 0/0 .text +/* 800279E4-800279EC -00001 0008+00 0/0 0/0 0/0 .text * setSclsInfo__15dStage_roomDt_cFP27stage_scls_info_dummy_class */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dStage_roomDt_c::setSclsInfo(stage_scls_info_dummy_class* param_0) { - nofralloc -#include "asm/d/d_stage/setSclsInfo__15dStage_roomDt_cFP27stage_scls_info_dummy_class.s" +void dStage_roomDt_c::setSclsInfo(stage_scls_info_dummy_class* param_0) { + *(u32*)(((u8*)this) + 72) /* this->field_0x48 */ = (u32)(param_0); } + +/* ############################################################################################## */ +/* 80378A50-80378A50 0050B0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80378CC3 = "Room non Pnt data !\n"; #pragma pop /* 800279EC-80027A20 02232C 0034+00 1/0 0/0 0/0 .text @@ -3553,6 +3674,13 @@ asm void dStage_roomDt_c::setPntInfo(dStage_dPnt_c* param_0) { } #pragma pop +/* ############################################################################################## */ +/* 80378A50-80378A50 0050B0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80378CD8 = "Room non Pnts data !\n"; +#pragma pop + /* 80027A20-80027A54 022360 0034+00 1/0 0/0 0/0 .text getPntInf__15dStage_roomDt_cCFv */ #pragma push #pragma optimization_level 0 @@ -3563,6 +3691,13 @@ asm void dStage_roomDt_c::getPntInf() const { } #pragma pop +/* ############################################################################################## */ +/* 80378A50-80378A50 0050B0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80378CEE = "Room non Path data !\n"; +#pragma pop + /* 80027A54-80027A88 022394 0034+00 1/0 0/0 0/0 .text * setPathInfo__15dStage_roomDt_cFP14dStage_dPath_c */ #pragma push @@ -3584,16 +3719,11 @@ asm void dStage_roomDt_c::getPathInf() const { } #pragma pop -/* 80027ABC-80027AC4 0223FC 0008+00 1/0 0/0 0/0 .text +/* 80027ABC-80027AC4 -00001 0008+00 0/0 0/0 0/0 .text * setPnt2Info__15dStage_roomDt_cFP13dStage_dPnt_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dStage_roomDt_c::setPnt2Info(dStage_dPnt_c* param_0) { - nofralloc -#include "asm/d/d_stage/setPnt2Info__15dStage_roomDt_cFP13dStage_dPnt_c.s" +void dStage_roomDt_c::setPnt2Info(dStage_dPnt_c* param_0) { + *(u32*)(((u8*)this) + 44) /* this->field_0x2c */ = (u32)(param_0); } -#pragma pop /* 80027AC4-80027ACC 022404 0008+00 1/0 0/0 0/0 .text getPnt2Inf__15dStage_roomDt_cCFv */ #pragma push @@ -3605,16 +3735,11 @@ asm void dStage_roomDt_c::getPnt2Inf() const { } #pragma pop -/* 80027ACC-80027AD4 02240C 0008+00 1/0 0/0 0/0 .text +/* 80027ACC-80027AD4 -00001 0008+00 0/0 0/0 0/0 .text * setPath2Info__15dStage_roomDt_cFP14dStage_dPath_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dStage_roomDt_c::setPath2Info(dStage_dPath_c* param_0) { - nofralloc -#include "asm/d/d_stage/setPath2Info__15dStage_roomDt_cFP14dStage_dPath_c.s" +void dStage_roomDt_c::setPath2Info(dStage_dPath_c* param_0) { + *(u32*)(((u8*)this) + 48) /* this->field_0x30 */ = (u32)(param_0); } -#pragma pop /* 80027AD4-80027ADC 022414 0008+00 1/0 0/0 0/0 .text getPath2Inf__15dStage_roomDt_cCFv */ @@ -3627,16 +3752,11 @@ asm void dStage_roomDt_c::getPath2Inf() const { } #pragma pop -/* 80027ADC-80027AE4 02241C 0008+00 1/0 0/0 0/0 .text +/* 80027ADC-80027AE4 -00001 0008+00 0/0 0/0 0/0 .text * setSoundInf__15dStage_roomDt_cFP18dStage_SoundInfo_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dStage_roomDt_c::setSoundInf(dStage_SoundInfo_c* param_0) { - nofralloc -#include "asm/d/d_stage/setSoundInf__15dStage_roomDt_cFP18dStage_SoundInfo_c.s" +void dStage_roomDt_c::setSoundInf(dStage_SoundInfo_c* param_0) { + *(u32*)(((u8*)this) + 64) /* this->field_0x40 */ = (u32)(param_0); } -#pragma pop /* 80027AE4-80027AEC 022424 0008+00 1/0 0/0 0/0 .text getSoundInf__15dStage_roomDt_cCFv */ @@ -3649,16 +3769,11 @@ asm void dStage_roomDt_c::getSoundInf() const { } #pragma pop -/* 80027AEC-80027AF4 02242C 0008+00 1/0 0/0 0/0 .text +/* 80027AEC-80027AF4 -00001 0008+00 0/0 0/0 0/0 .text * setSoundInfCL__15dStage_roomDt_cFP18dStage_SoundInfo_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dStage_roomDt_c::setSoundInfCL(dStage_SoundInfo_c* param_0) { - nofralloc -#include "asm/d/d_stage/setSoundInfCL__15dStage_roomDt_cFP18dStage_SoundInfo_c.s" +void dStage_roomDt_c::setSoundInfCL(dStage_SoundInfo_c* param_0) { + *(u32*)(((u8*)this) + 68) /* this->field_0x44 */ = (u32)(param_0); } -#pragma pop /* 80027AF4-80027AFC 022434 0008+00 1/0 0/0 0/0 .text getSoundInfCL__15dStage_roomDt_cCFv */ @@ -3671,16 +3786,11 @@ asm void dStage_roomDt_c::getSoundInfCL() const { } #pragma pop -/* 80027AFC-80027B04 02243C 0008+00 1/0 0/0 0/0 .text +/* 80027AFC-80027B04 -00001 0008+00 0/0 0/0 0/0 .text * setMapEventInfo__15dStage_roomDt_cFP21dStage_MapEventInfo_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dStage_roomDt_c::setMapEventInfo(dStage_MapEventInfo_c* param_0) { - nofralloc -#include "asm/d/d_stage/setMapEventInfo__15dStage_roomDt_cFP21dStage_MapEventInfo_c.s" +void dStage_roomDt_c::setMapEventInfo(dStage_MapEventInfo_c* param_0) { + *(u32*)(((u8*)this) + 60) /* this->field_0x3c */ = (u32)(param_0); } -#pragma pop /* 80027B04-80027B0C 022444 0008+00 1/0 0/0 0/0 .text getMapEventInfo__15dStage_roomDt_cCFv */ #pragma push @@ -3692,16 +3802,11 @@ asm void dStage_roomDt_c::getMapEventInfo() const { } #pragma pop -/* 80027B0C-80027B14 02244C 0008+00 1/0 0/0 0/0 .text +/* 80027B0C-80027B14 -00001 0008+00 0/0 0/0 0/0 .text * setFileList2Info__15dStage_roomDt_cFP21dStage_FileList2_dt_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dStage_roomDt_c::setFileList2Info(dStage_FileList2_dt_c* param_0) { - nofralloc -#include "asm/d/d_stage/setFileList2Info__15dStage_roomDt_cFP21dStage_FileList2_dt_c.s" +void dStage_roomDt_c::setFileList2Info(dStage_FileList2_dt_c* param_0) { + *(u32*)(((u8*)this) + 32) /* this->field_0x20 */ = (u32)(param_0); } -#pragma pop /* 80027B14-80027B1C 022454 0008+00 1/0 0/0 0/0 .text getFileList2Info__15dStage_roomDt_cCFv */ #pragma push @@ -3713,27 +3818,17 @@ asm void dStage_roomDt_c::getFileList2Info() const { } #pragma pop -/* 80027B1C-80027B24 02245C 0008+00 1/0 0/0 0/0 .text +/* 80027B1C-80027B24 -00001 0008+00 0/0 0/0 0/0 .text * setFileListInfo__15dStage_roomDt_cFP20dStage_FileList_dt_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dStage_roomDt_c::setFileListInfo(dStage_FileList_dt_c* param_0) { - nofralloc -#include "asm/d/d_stage/setFileListInfo__15dStage_roomDt_cFP20dStage_FileList_dt_c.s" +void dStage_roomDt_c::setFileListInfo(dStage_FileList_dt_c* param_0) { + *(u32*)(((u8*)this) + 36) /* this->field_0x24 */ = (u32)(param_0); } -#pragma pop -/* 80027B24-80027B2C 022464 0008+00 1/0 0/0 0/0 .text +/* 80027B24-80027B2C -00001 0008+00 0/0 0/0 0/0 .text * setFloorInfo__15dStage_roomDt_cFP18dStage_FloorInfo_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dStage_roomDt_c::setFloorInfo(dStage_FloorInfo_c* param_0) { - nofralloc -#include "asm/d/d_stage/setFloorInfo__15dStage_roomDt_cFP18dStage_FloorInfo_c.s" +void dStage_roomDt_c::setFloorInfo(dStage_FloorInfo_c* param_0) { + *(u32*)(((u8*)this) + 92) /* this->field_0x5c */ = (u32)(param_0); } -#pragma pop /* 80027B2C-80027B34 02246C 0008+00 1/0 0/0 0/0 .text getFloorInfo__15dStage_roomDt_cCFv */ @@ -3746,6 +3841,13 @@ asm void dStage_roomDt_c::getFloorInfo() const { } #pragma pop +/* ############################################################################################## */ +/* 80378A50-80378A50 0050B0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80378D04 = "Room non memory config data!\n"; +#pragma pop + /* 80027B34-80027B64 022474 0030+00 1/0 0/0 0/0 .text * setMemoryConfig__15dStage_roomDt_cFP21dStage_MemoryConfig_c */ #pragma push @@ -3767,6 +3869,13 @@ asm void dStage_roomDt_c::getMemoryConfig() const { } #pragma pop +/* ############################################################################################## */ +/* 80378A50-80378A50 0050B0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80378D22 = "Room non memory map data!\n"; +#pragma pop + /* 80027B98-80027BC8 0224D8 0030+00 1/0 0/0 0/0 .text * setMemoryMap__15dStage_roomDt_cFP18dStage_MemoryMap_c */ #pragma push @@ -3789,6 +3898,13 @@ asm void dStage_roomDt_c::getMemoryMap() const { } #pragma pop +/* ############################################################################################## */ +/* 80378A50-80378A50 0050B0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80378D3D = "Room non multi data!\n"; +#pragma pop + /* 80027BFC-80027C2C 02253C 0030+00 1/0 0/0 0/0 .text * setMulti__15dStage_roomDt_cFP14dStage_Multi_c */ #pragma push @@ -3810,6 +3926,13 @@ asm void dStage_roomDt_c::getMulti() const { } #pragma pop +/* ############################################################################################## */ +/* 80378A50-80378A50 0050B0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80378D53 = "Room non old multi data!\n"; +#pragma pop + /* 80027C60-80027C90 0225A0 0030+00 1/0 0/0 0/0 .text setOldMulti__15dStage_roomDt_cFv */ #pragma push #pragma optimization_level 0 @@ -3842,16 +3965,11 @@ asm void dStage_roomDt_c::getOldMulti() const { } #pragma pop -/* 80027CF4-80027CFC 022634 0008+00 1/0 0/0 0/0 .text setLbnk__15dStage_roomDt_cFP13dStage_Lbnk_c +/* 80027CF4-80027CFC -00001 0008+00 0/0 0/0 0/0 .text setLbnk__15dStage_roomDt_cFP13dStage_Lbnk_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dStage_roomDt_c::setLbnk(dStage_Lbnk_c* param_0) { - nofralloc -#include "asm/d/d_stage/setLbnk__15dStage_roomDt_cFP13dStage_Lbnk_c.s" +void dStage_roomDt_c::setLbnk(dStage_Lbnk_c* param_0) { + *(u32*)(((u8*)this) + 76) /* this->field_0x4c */ = (u32)(param_0); } -#pragma pop /* 80027CFC-80027D04 02263C 0008+00 1/0 0/0 0/0 .text getLbnk__15dStage_roomDt_cCFv */ #pragma push @@ -3863,16 +3981,11 @@ asm void dStage_roomDt_c::getLbnk() const { } #pragma pop -/* 80027D04-80027D0C 022644 0008+00 1/0 0/0 0/0 .text +/* 80027D04-80027D0C -00001 0008+00 0/0 0/0 0/0 .text * setTresure__15dStage_roomDt_cFP19stage_tresure_class */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dStage_roomDt_c::setTresure(stage_tresure_class* param_0) { - nofralloc -#include "asm/d/d_stage/setTresure__15dStage_roomDt_cFP19stage_tresure_class.s" +void dStage_roomDt_c::setTresure(stage_tresure_class* param_0) { + *(u32*)(((u8*)this) + 80) /* this->field_0x50 */ = (u32)(param_0); } -#pragma pop /* 80027D0C-80027D14 02264C 0008+00 1/0 0/0 0/0 .text getTresure__15dStage_roomDt_cCFv */ #pragma push @@ -3895,16 +4008,11 @@ bool dStage_roomDt_c::getDMap() const { return false; } -/* 80027D20-80027D28 022660 0008+00 1/0 0/0 0/0 .text +/* 80027D20-80027D28 -00001 0008+00 0/0 0/0 0/0 .text * setDrTg__15dStage_roomDt_cFP16stage_tgsc_class */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dStage_roomDt_c::setDrTg(stage_tgsc_class* param_0) { - nofralloc -#include "asm/d/d_stage/setDrTg__15dStage_roomDt_cFP16stage_tgsc_class.s" +void dStage_roomDt_c::setDrTg(stage_tgsc_class* param_0) { + *(u32*)(((u8*)this) + 84) /* this->field_0x54 */ = (u32)(param_0); } -#pragma pop /* 80027D28-80027D30 022668 0008+00 1/0 0/0 0/0 .text getDrTg__15dStage_roomDt_cCFv */ #pragma push @@ -3916,16 +4024,11 @@ asm void dStage_roomDt_c::getDrTg() const { } #pragma pop -/* 80027D30-80027D38 022670 0008+00 1/0 0/0 0/0 .text +/* 80027D30-80027D38 -00001 0008+00 0/0 0/0 0/0 .text * setDoor__15dStage_roomDt_cFP16stage_tgsc_class */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dStage_roomDt_c::setDoor(stage_tgsc_class* param_0) { - nofralloc -#include "asm/d/d_stage/setDoor__15dStage_roomDt_cFP16stage_tgsc_class.s" +void dStage_roomDt_c::setDoor(stage_tgsc_class* param_0) { + *(u32*)(((u8*)this) + 88) /* this->field_0x58 */ = (u32)(param_0); } -#pragma pop /* 80027D38-80027D40 022678 0008+00 1/0 0/0 0/0 .text getDoor__15dStage_roomDt_cCFv */ #pragma push @@ -3937,6 +4040,13 @@ asm void dStage_roomDt_c::getDoor() const { } #pragma pop +/* ############################################################################################## */ +/* 80378A50-80378A50 0050B0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80378D6D = "stage non 2d map path data !!\n"; +#pragma pop + /* 80027D40-80027D70 022680 0030+00 1/0 0/0 0/0 .text setMapPath__15dStage_roomDt_cFPv */ #pragma push #pragma optimization_level 0 @@ -3957,6 +4067,13 @@ asm void dStage_roomDt_c::getMapPath() { } #pragma pop +/* ############################################################################################## */ +/* 80378A50-80378A50 0050B0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80378D8C = "Room non envLayserSet data\n"; +#pragma pop + /* 80027DA4-80027DD8 0226E4 0034+00 1/0 0/0 0/0 .text setElst__15dStage_roomDt_cFP13dStage_Elst_c */ #pragma push @@ -3968,6 +4085,13 @@ asm void dStage_roomDt_c::setElst(dStage_Elst_c* param_0) { } #pragma pop +/* ############################################################################################## */ +/* 80378A50-80378A50 0050B0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80378DA8 = "Room no Elst Data!!\n"; +#pragma pop + /* 80027DD8-80027E10 022718 0038+00 1/0 0/0 0/0 .text getElst__15dStage_roomDt_cFv */ #pragma push #pragma optimization_level 0 @@ -3978,16 +4102,11 @@ asm void dStage_roomDt_c::getElst() { } #pragma pop -/* 80027E10-80027E18 022750 0008+00 1/0 0/0 0/0 .text +/* 80027E10-80027E18 -00001 0008+00 0/0 0/0 0/0 .text * setCamera__16dStage_stageDt_cFP18stage_camera_class */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dStage_stageDt_c::setCamera(stage_camera_class* param_0) { - nofralloc -#include "asm/d/d_stage/setCamera__16dStage_stageDt_cFP18stage_camera_class.s" +void dStage_stageDt_c::setCamera(stage_camera_class* param_0) { + *(u32*)(((u8*)this) + 8) /* this->field_0x8 */ = (u32)(param_0); } -#pragma pop /* 80027E18-80027E20 022758 0008+00 1/0 0/0 0/0 .text getCamera__16dStage_stageDt_cCFv */ #pragma push @@ -3999,16 +4118,11 @@ asm void dStage_stageDt_c::getCamera() const { } #pragma pop -/* 80027E20-80027E28 022760 0008+00 1/0 0/0 0/0 .text +/* 80027E20-80027E28 -00001 0008+00 0/0 0/0 0/0 .text * setArrow__16dStage_stageDt_cFP17stage_arrow_class */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dStage_stageDt_c::setArrow(stage_arrow_class* param_0) { - nofralloc -#include "asm/d/d_stage/setArrow__16dStage_stageDt_cFP17stage_arrow_class.s" +void dStage_stageDt_c::setArrow(stage_arrow_class* param_0) { + *(u32*)(((u8*)this) + 12) /* this->field_0xc */ = (u32)(param_0); } -#pragma pop /* 80027E28-80027E30 022768 0008+00 1/0 0/0 0/0 .text getArrow__16dStage_stageDt_cCFv */ #pragma push @@ -4020,27 +4134,17 @@ asm void dStage_stageDt_c::getArrow() const { } #pragma pop -/* 80027E30-80027E38 022770 0008+00 1/0 0/0 0/0 .text +/* 80027E30-80027E38 -00001 0008+00 0/0 0/0 0/0 .text * setPlayer__16dStage_stageDt_cFP17stage_actor_class */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dStage_stageDt_c::setPlayer(stage_actor_class* param_0) { - nofralloc -#include "asm/d/d_stage/setPlayer__16dStage_stageDt_cFP17stage_actor_class.s" +void dStage_stageDt_c::setPlayer(stage_actor_class* param_0) { + *(u32*)(((u8*)this) + 16) /* this->field_0x10 */ = (u32)(param_0); } -#pragma pop -/* 80027E38-80027E40 022778 0008+00 1/0 0/0 0/0 .text setPlayerNum__16dStage_stageDt_cFUs +/* 80027E38-80027E40 -00001 0008+00 0/0 0/0 0/0 .text setPlayerNum__16dStage_stageDt_cFUs */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dStage_stageDt_c::setPlayerNum(u16 param_0) { - nofralloc -#include "asm/d/d_stage/setPlayerNum__16dStage_stageDt_cFUs.s" +void dStage_stageDt_c::setPlayerNum(u16 param_0) { + *(u16*)(((u8*)this) + 84) /* this->field_0x54 */ = (u16)(param_0); } -#pragma pop /* 80027E40-80027E48 022780 0008+00 1/0 0/0 0/0 .text getPlayerNum__16dStage_stageDt_cCFv */ @@ -4053,27 +4157,17 @@ asm void dStage_stageDt_c::getPlayerNum() const { } #pragma pop -/* 80027E48-80027E50 022788 0008+00 1/0 0/0 0/0 .text +/* 80027E48-80027E50 -00001 0008+00 0/0 0/0 0/0 .text * setRoom__16dStage_stageDt_cFP14roomRead_class */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dStage_stageDt_c::setRoom(roomRead_class* param_0) { - nofralloc -#include "asm/d/d_stage/setRoom__16dStage_stageDt_cFP14roomRead_class.s" +void dStage_stageDt_c::setRoom(roomRead_class* param_0) { + *(u32*)(((u8*)this) + 20) /* this->field_0x14 */ = (u32)(param_0); } -#pragma pop -/* 80027E50-80027E58 022790 0008+00 1/0 0/0 0/0 .text +/* 80027E50-80027E58 -00001 0008+00 0/0 0/0 0/0 .text * setMapInfo__16dStage_stageDt_cFP20stage_map_info_class */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dStage_stageDt_c::setMapInfo(stage_map_info_class* param_0) { - nofralloc -#include "asm/d/d_stage/setMapInfo__16dStage_stageDt_cFP20stage_map_info_class.s" +void dStage_stageDt_c::setMapInfo(stage_map_info_class* param_0) { + *(u32*)(((u8*)this) + 24) /* this->field_0x18 */ = (u32)(param_0); } -#pragma pop /* 80027E58-80027E60 022798 0008+00 1/0 0/0 0/0 .text getMapInfo__16dStage_stageDt_cCFv */ @@ -4086,27 +4180,17 @@ asm void dStage_stageDt_c::getMapInfo() const { } #pragma pop -/* 80027E60-80027E68 0227A0 0008+00 1/0 0/0 0/0 .text +/* 80027E60-80027E68 -00001 0008+00 0/0 0/0 0/0 .text * setMapInfoBase__16dStage_stageDt_cFP26stage_map_info_dummy_class */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dStage_stageDt_c::setMapInfoBase(stage_map_info_dummy_class* param_0) { - nofralloc -#include "asm/d/d_stage/setMapInfoBase__16dStage_stageDt_cFP26stage_map_info_dummy_class.s" +void dStage_stageDt_c::setMapInfoBase(stage_map_info_dummy_class* param_0) { + *(u32*)(((u8*)this) + 28) /* this->field_0x1c */ = (u32)(param_0); } -#pragma pop -/* 80027E68-80027E70 0227A8 0008+00 1/0 0/0 0/0 .text +/* 80027E68-80027E70 -00001 0008+00 0/0 0/0 0/0 .text * setPaletteInfo__16dStage_stageDt_cFP24stage_palette_info_class */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dStage_stageDt_c::setPaletteInfo(stage_palette_info_class* param_0) { - nofralloc -#include "asm/d/d_stage/setPaletteInfo__16dStage_stageDt_cFP24stage_palette_info_class.s" +void dStage_stageDt_c::setPaletteInfo(stage_palette_info_class* param_0) { + *(u32*)(((u8*)this) + 32) /* this->field_0x20 */ = (u32)(param_0); } -#pragma pop /* 80027E70-80027E78 0227B0 0008+00 1/0 0/0 0/0 .text getPaletteInfo__16dStage_stageDt_cCFv */ #pragma push @@ -4118,16 +4202,11 @@ asm void dStage_stageDt_c::getPaletteInfo() const { } #pragma pop -/* 80027E78-80027E80 0227B8 0008+00 1/0 0/0 0/0 .text +/* 80027E78-80027E80 -00001 0008+00 0/0 0/0 0/0 .text * setPselectInfo__16dStage_stageDt_cFP24stage_pselect_info_class */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dStage_stageDt_c::setPselectInfo(stage_pselect_info_class* param_0) { - nofralloc -#include "asm/d/d_stage/setPselectInfo__16dStage_stageDt_cFP24stage_pselect_info_class.s" +void dStage_stageDt_c::setPselectInfo(stage_pselect_info_class* param_0) { + *(u32*)(((u8*)this) + 36) /* this->field_0x24 */ = (u32)(param_0); } -#pragma pop /* 80027E80-80027E88 0227C0 0008+00 1/0 0/0 0/0 .text getPselectInfo__16dStage_stageDt_cCFv */ #pragma push @@ -4139,16 +4218,11 @@ asm void dStage_stageDt_c::getPselectInfo() const { } #pragma pop -/* 80027E88-80027E90 0227C8 0008+00 1/0 0/0 0/0 .text +/* 80027E88-80027E90 -00001 0008+00 0/0 0/0 0/0 .text * setEnvrInfo__16dStage_stageDt_cFP21stage_envr_info_class */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dStage_stageDt_c::setEnvrInfo(stage_envr_info_class* param_0) { - nofralloc -#include "asm/d/d_stage/setEnvrInfo__16dStage_stageDt_cFP21stage_envr_info_class.s" +void dStage_stageDt_c::setEnvrInfo(stage_envr_info_class* param_0) { + *(u32*)(((u8*)this) + 40) /* this->field_0x28 */ = (u32)(param_0); } -#pragma pop /* 80027E90-80027E98 0227D0 0008+00 1/0 0/0 0/0 .text getEnvrInfo__16dStage_stageDt_cCFv */ @@ -4161,16 +4235,11 @@ asm void dStage_stageDt_c::getEnvrInfo() const { } #pragma pop -/* 80027E98-80027EA0 0227D8 0008+00 1/0 0/0 0/0 .text +/* 80027E98-80027EA0 -00001 0008+00 0/0 0/0 0/0 .text * setVrboxInfo__16dStage_stageDt_cFP22stage_vrbox_info_class */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dStage_stageDt_c::setVrboxInfo(stage_vrbox_info_class* param_0) { - nofralloc -#include "asm/d/d_stage/setVrboxInfo__16dStage_stageDt_cFP22stage_vrbox_info_class.s" +void dStage_stageDt_c::setVrboxInfo(stage_vrbox_info_class* param_0) { + *(u32*)(((u8*)this) + 44) /* this->field_0x2c */ = (u32)(param_0); } -#pragma pop /* 80027EA0-80027EA8 0227E0 0008+00 1/0 0/0 0/0 .text getVrboxInfo__16dStage_stageDt_cCFv */ @@ -4183,16 +4252,11 @@ asm void dStage_stageDt_c::getVrboxInfo() const { } #pragma pop -/* 80027EA8-80027EB0 0227E8 0008+00 1/0 0/0 0/0 .text +/* 80027EA8-80027EB0 -00001 0008+00 0/0 0/0 0/0 .text * setVrboxcolInfo__16dStage_stageDt_cFP25stage_vrboxcol_info_class */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dStage_stageDt_c::setVrboxcolInfo(stage_vrboxcol_info_class* param_0) { - nofralloc -#include "asm/d/d_stage/setVrboxcolInfo__16dStage_stageDt_cFP25stage_vrboxcol_info_class.s" +void dStage_stageDt_c::setVrboxcolInfo(stage_vrboxcol_info_class* param_0) { + *(u32*)(((u8*)this) + 48) /* this->field_0x30 */ = (u32)(param_0); } -#pragma pop /* 80027EB0-80027EB8 0227F0 0008+00 1/0 0/0 0/0 .text getVrboxcolInfo__16dStage_stageDt_cCFv */ #pragma push @@ -4204,16 +4268,11 @@ asm void dStage_stageDt_c::getVrboxcolInfo() const { } #pragma pop -/* 80027EB8-80027EC0 0227F8 0008+00 1/0 0/0 0/0 .text +/* 80027EB8-80027EC0 -00001 0008+00 0/0 0/0 0/0 .text * setPlightInfo__16dStage_stageDt_cFP23stage_plight_info_class */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dStage_stageDt_c::setPlightInfo(stage_plight_info_class* param_0) { - nofralloc -#include "asm/d/d_stage/setPlightInfo__16dStage_stageDt_cFP23stage_plight_info_class.s" +void dStage_stageDt_c::setPlightInfo(stage_plight_info_class* param_0) { + *(u32*)(((u8*)this) + 52) /* this->field_0x34 */ = (u32)(param_0); } -#pragma pop /* 80027EC0-80027EC8 022800 0008+00 1/0 0/0 0/0 .text getPlightInfo__16dStage_stageDt_cCFv */ #pragma push @@ -4225,15 +4284,10 @@ asm void dStage_stageDt_c::getPlightInfo() const { } #pragma pop -/* 80027EC8-80027ED0 022808 0008+00 1/0 0/0 0/0 .text setPaletteNumInfo__16dStage_stageDt_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dStage_stageDt_c::setPaletteNumInfo(int param_0) { - nofralloc -#include "asm/d/d_stage/setPaletteNumInfo__16dStage_stageDt_cFi.s" +/* 80027EC8-80027ED0 -00001 0008+00 0/0 0/0 0/0 .text setPaletteNumInfo__16dStage_stageDt_cFi */ +void dStage_stageDt_c::setPaletteNumInfo(int param_0) { + *(u32*)(((u8*)this) + 60) /* this->field_0x3c */ = (u32)(param_0); } -#pragma pop /* 80027ED0-80027ED8 022810 0008+00 1/0 0/0 0/0 .text getPaletteNumInfo__16dStage_stageDt_cCFv */ #pragma push @@ -4245,15 +4299,10 @@ asm void dStage_stageDt_c::getPaletteNumInfo() const { } #pragma pop -/* 80027ED8-80027EE0 022818 0008+00 1/0 0/0 0/0 .text setPselectNumInfo__16dStage_stageDt_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dStage_stageDt_c::setPselectNumInfo(int param_0) { - nofralloc -#include "asm/d/d_stage/setPselectNumInfo__16dStage_stageDt_cFi.s" +/* 80027ED8-80027EE0 -00001 0008+00 0/0 0/0 0/0 .text setPselectNumInfo__16dStage_stageDt_cFi */ +void dStage_stageDt_c::setPselectNumInfo(int param_0) { + *(u32*)(((u8*)this) + 64) /* this->field_0x40 */ = (u32)(param_0); } -#pragma pop /* 80027EE0-80027EE8 022820 0008+00 1/0 0/0 0/0 .text getPselectNumInfo__16dStage_stageDt_cCFv */ #pragma push @@ -4265,15 +4314,10 @@ asm void dStage_stageDt_c::getPselectNumInfo() const { } #pragma pop -/* 80027EE8-80027EF0 022828 0008+00 1/0 0/0 0/0 .text setEnvrNumInfo__16dStage_stageDt_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dStage_stageDt_c::setEnvrNumInfo(int param_0) { - nofralloc -#include "asm/d/d_stage/setEnvrNumInfo__16dStage_stageDt_cFi.s" +/* 80027EE8-80027EF0 -00001 0008+00 0/0 0/0 0/0 .text setEnvrNumInfo__16dStage_stageDt_cFi */ +void dStage_stageDt_c::setEnvrNumInfo(int param_0) { + *(u32*)(((u8*)this) + 68) /* this->field_0x44 */ = (u32)(param_0); } -#pragma pop /* 80027EF0-80027EF8 022830 0008+00 1/0 0/0 0/0 .text getEnvrNumInfo__16dStage_stageDt_cCFv */ #pragma push @@ -4285,15 +4329,10 @@ asm void dStage_stageDt_c::getEnvrNumInfo() const { } #pragma pop -/* 80027EF8-80027F00 022838 0008+00 1/0 0/0 0/0 .text setVrboxNumInfo__16dStage_stageDt_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dStage_stageDt_c::setVrboxNumInfo(int param_0) { - nofralloc -#include "asm/d/d_stage/setVrboxNumInfo__16dStage_stageDt_cFi.s" +/* 80027EF8-80027F00 -00001 0008+00 0/0 0/0 0/0 .text setVrboxNumInfo__16dStage_stageDt_cFi */ +void dStage_stageDt_c::setVrboxNumInfo(int param_0) { + *(u32*)(((u8*)this) + 72) /* this->field_0x48 */ = (u32)(param_0); } -#pragma pop /* 80027F00-80027F08 022840 0008+00 1/0 0/0 0/0 .text getVrboxNumInfo__16dStage_stageDt_cCFv */ #pragma push @@ -4305,15 +4344,10 @@ asm void dStage_stageDt_c::getVrboxNumInfo() const { } #pragma pop -/* 80027F08-80027F10 022848 0008+00 1/0 0/0 0/0 .text setVrboxcolNumInfo__16dStage_stageDt_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dStage_stageDt_c::setVrboxcolNumInfo(int param_0) { - nofralloc -#include "asm/d/d_stage/setVrboxcolNumInfo__16dStage_stageDt_cFi.s" +/* 80027F08-80027F10 -00001 0008+00 0/0 0/0 0/0 .text setVrboxcolNumInfo__16dStage_stageDt_cFi */ +void dStage_stageDt_c::setVrboxcolNumInfo(int param_0) { + *(u32*)(((u8*)this) + 76) /* this->field_0x4c */ = (u32)(param_0); } -#pragma pop /* 80027F10-80027F18 022850 0008+00 1/0 0/0 0/0 .text getVrboxcolNumInfo__16dStage_stageDt_cCFv */ #pragma push @@ -4325,6 +4359,13 @@ asm void dStage_stageDt_c::getVrboxcolNumInfo() const { } #pragma pop +/* ############################################################################################## */ +/* 80378A50-80378A50 0050B0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80378DBD = "stage non LightVec data !!\n"; +#pragma pop + /* 80027F18-80027F4C 022858 0034+00 1/0 0/0 0/0 .text * setLightVecInfo__16dStage_stageDt_cFP30stage_pure_lightvec_info_class */ #pragma push @@ -4346,6 +4387,13 @@ asm void dStage_stageDt_c::getLightVecInfo() const { } #pragma pop +/* ############################################################################################## */ +/* 80378A50-80378A50 0050B0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80378DD9 = "stage non LightVecNum data !!\n"; +#pragma pop + /* 80027F80-80027FB4 0228C0 0034+00 1/0 0/0 0/0 .text setLightVecInfoNum__16dStage_stageDt_cFi */ #pragma push #pragma optimization_level 0 @@ -4366,15 +4414,10 @@ asm void dStage_stageDt_c::getLightVecInfoNum() const { } #pragma pop -/* 80027FE8-80027FF0 022928 0008+00 1/0 0/0 0/0 .text setPlightNumInfo__16dStage_stageDt_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dStage_stageDt_c::setPlightNumInfo(int param_0) { - nofralloc -#include "asm/d/d_stage/setPlightNumInfo__16dStage_stageDt_cFi.s" +/* 80027FE8-80027FF0 -00001 0008+00 0/0 0/0 0/0 .text setPlightNumInfo__16dStage_stageDt_cFi */ +void dStage_stageDt_c::setPlightNumInfo(int param_0) { + *(u32*)(((u8*)this) + 80) /* this->field_0x50 */ = (u32)(param_0); } -#pragma pop /* 80027FF0-80027FF8 022930 0008+00 1/0 0/0 0/0 .text getPlightNumInfo__16dStage_stageDt_cCFv */ #pragma push @@ -4386,38 +4429,23 @@ asm void dStage_stageDt_c::getPlightNumInfo() const { } #pragma pop -/* 80027FF8-80028000 022938 0008+00 1/0 0/0 0/0 .text +/* 80027FF8-80028000 -00001 0008+00 0/0 0/0 0/0 .text * setStagInfo__16dStage_stageDt_cFP21stage_stag_info_class */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dStage_stageDt_c::setStagInfo(stage_stag_info_class* param_0) { - nofralloc -#include "asm/d/d_stage/setStagInfo__16dStage_stageDt_cFP21stage_stag_info_class.s" +void dStage_stageDt_c::setStagInfo(stage_stag_info_class* param_0) { + *(u32*)(((u8*)this) + 92) /* this->field_0x5c */ = (u32)(param_0); } -#pragma pop -/* 80028000-80028008 022940 0008+00 1/0 0/0 0/0 .text +/* 80028000-80028008 -00001 0008+00 0/0 0/0 0/0 .text * setSclsInfo__16dStage_stageDt_cFP27stage_scls_info_dummy_class */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dStage_stageDt_c::setSclsInfo(stage_scls_info_dummy_class* param_0) { - nofralloc -#include "asm/d/d_stage/setSclsInfo__16dStage_stageDt_cFP27stage_scls_info_dummy_class.s" +void dStage_stageDt_c::setSclsInfo(stage_scls_info_dummy_class* param_0) { + *(u32*)(((u8*)this) + 96) /* this->field_0x60 */ = (u32)(param_0); } -#pragma pop -/* 80028008-80028010 022948 0008+00 1/0 0/0 0/0 .text +/* 80028008-80028010 -00001 0008+00 0/0 0/0 0/0 .text * setPntInfo__16dStage_stageDt_cFP13dStage_dPnt_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dStage_stageDt_c::setPntInfo(dStage_dPnt_c* param_0) { - nofralloc -#include "asm/d/d_stage/setPntInfo__16dStage_stageDt_cFP13dStage_dPnt_c.s" +void dStage_stageDt_c::setPntInfo(dStage_dPnt_c* param_0) { + *(u32*)(((u8*)this) + 100) /* this->field_0x64 */ = (u32)(param_0); } -#pragma pop /* 80028010-80028018 022950 0008+00 1/0 0/0 0/0 .text getPntInf__16dStage_stageDt_cCFv */ #pragma push @@ -4429,16 +4457,11 @@ asm void dStage_stageDt_c::getPntInf() const { } #pragma pop -/* 80028018-80028020 022958 0008+00 1/0 0/0 0/0 .text +/* 80028018-80028020 -00001 0008+00 0/0 0/0 0/0 .text * setPathInfo__16dStage_stageDt_cFP14dStage_dPath_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dStage_stageDt_c::setPathInfo(dStage_dPath_c* param_0) { - nofralloc -#include "asm/d/d_stage/setPathInfo__16dStage_stageDt_cFP14dStage_dPath_c.s" +void dStage_stageDt_c::setPathInfo(dStage_dPath_c* param_0) { + *(u32*)(((u8*)this) + 104) /* this->field_0x68 */ = (u32)(param_0); } -#pragma pop /* 80028020-80028028 022960 0008+00 1/0 0/0 0/0 .text getPathInf__16dStage_stageDt_cCFv */ @@ -4451,16 +4474,11 @@ asm void dStage_stageDt_c::getPathInf() const { } #pragma pop -/* 80028028-80028030 022968 0008+00 1/0 0/0 0/0 .text +/* 80028028-80028030 -00001 0008+00 0/0 0/0 0/0 .text * setPnt2Info__16dStage_stageDt_cFP13dStage_dPnt_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dStage_stageDt_c::setPnt2Info(dStage_dPnt_c* param_0) { - nofralloc -#include "asm/d/d_stage/setPnt2Info__16dStage_stageDt_cFP13dStage_dPnt_c.s" +void dStage_stageDt_c::setPnt2Info(dStage_dPnt_c* param_0) { + *(u32*)(((u8*)this) + 108) /* this->field_0x6c */ = (u32)(param_0); } -#pragma pop /* 80028030-80028038 022970 0008+00 1/0 0/0 0/0 .text getPnt2Inf__16dStage_stageDt_cCFv */ @@ -4473,16 +4491,11 @@ asm void dStage_stageDt_c::getPnt2Inf() const { } #pragma pop -/* 80028038-80028040 022978 0008+00 1/0 0/0 0/0 .text +/* 80028038-80028040 -00001 0008+00 0/0 0/0 0/0 .text * setPath2Info__16dStage_stageDt_cFP14dStage_dPath_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dStage_stageDt_c::setPath2Info(dStage_dPath_c* param_0) { - nofralloc -#include "asm/d/d_stage/setPath2Info__16dStage_stageDt_cFP14dStage_dPath_c.s" +void dStage_stageDt_c::setPath2Info(dStage_dPath_c* param_0) { + *(u32*)(((u8*)this) + 112) /* this->field_0x70 */ = (u32)(param_0); } -#pragma pop /* 80028040-80028048 022980 0008+00 1/0 0/0 0/0 .text getPath2Inf__16dStage_stageDt_cCFv */ @@ -4495,16 +4508,11 @@ asm void dStage_stageDt_c::getPath2Inf() const { } #pragma pop -/* 80028048-80028050 022988 0008+00 1/0 0/0 0/0 .text +/* 80028048-80028050 -00001 0008+00 0/0 0/0 0/0 .text * setSoundInf__16dStage_stageDt_cFP18dStage_SoundInfo_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dStage_stageDt_c::setSoundInf(dStage_SoundInfo_c* param_0) { - nofralloc -#include "asm/d/d_stage/setSoundInf__16dStage_stageDt_cFP18dStage_SoundInfo_c.s" +void dStage_stageDt_c::setSoundInf(dStage_SoundInfo_c* param_0) { + *(u32*)(((u8*)this) + 116) /* this->field_0x74 */ = (u32)(param_0); } -#pragma pop /* 80028050-80028058 022990 0008+00 1/0 0/0 0/0 .text getSoundInf__16dStage_stageDt_cCFv */ @@ -4517,16 +4525,11 @@ asm void dStage_stageDt_c::getSoundInf() const { } #pragma pop -/* 80028058-80028060 022998 0008+00 1/0 0/0 0/0 .text +/* 80028058-80028060 -00001 0008+00 0/0 0/0 0/0 .text * setSoundInfCL__16dStage_stageDt_cFP18dStage_SoundInfo_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dStage_stageDt_c::setSoundInfCL(dStage_SoundInfo_c* param_0) { - nofralloc -#include "asm/d/d_stage/setSoundInfCL__16dStage_stageDt_cFP18dStage_SoundInfo_c.s" +void dStage_stageDt_c::setSoundInfCL(dStage_SoundInfo_c* param_0) { + *(u32*)(((u8*)this) + 120) /* this->field_0x78 */ = (u32)(param_0); } -#pragma pop /* 80028060-80028068 0229A0 0008+00 1/0 0/0 0/0 .text getSoundInfCL__16dStage_stageDt_cCFv */ #pragma push @@ -4538,16 +4541,11 @@ asm void dStage_stageDt_c::getSoundInfCL() const { } #pragma pop -/* 80028068-80028070 0229A8 0008+00 1/0 0/0 0/0 .text +/* 80028068-80028070 -00001 0008+00 0/0 0/0 0/0 .text * setMapEventInfo__16dStage_stageDt_cFP21dStage_MapEventInfo_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dStage_stageDt_c::setMapEventInfo(dStage_MapEventInfo_c* param_0) { - nofralloc -#include "asm/d/d_stage/setMapEventInfo__16dStage_stageDt_cFP21dStage_MapEventInfo_c.s" +void dStage_stageDt_c::setMapEventInfo(dStage_MapEventInfo_c* param_0) { + *(u32*)(((u8*)this) + 56) /* this->field_0x38 */ = (u32)(param_0); } -#pragma pop /* 80028070-80028078 0229B0 0008+00 1/0 0/0 0/0 .text getMapEventInfo__16dStage_stageDt_cCFv */ #pragma push @@ -4559,6 +4557,13 @@ asm void dStage_stageDt_c::getMapEventInfo() const { } #pragma pop +/* ############################################################################################## */ +/* 80378A50-80378A50 0050B0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80378DF8 = "stage non filelist2 data!\n"; +#pragma pop + /* 80028078-800280AC 0229B8 0034+00 1/0 0/0 0/0 .text * setFileList2Info__16dStage_stageDt_cFP21dStage_FileList2_dt_c */ #pragma push @@ -4580,6 +4585,13 @@ asm void dStage_stageDt_c::getFileList2Info() const { } #pragma pop +/* ############################################################################################## */ +/* 80378A50-80378A50 0050B0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80378E13 = "stage non filelist data!\n"; +#pragma pop + /* 800280E0-80028114 022A20 0034+00 1/0 0/0 0/0 .text * setFileListInfo__16dStage_stageDt_cFP20dStage_FileList_dt_c */ #pragma push @@ -4601,16 +4613,11 @@ asm void dStage_stageDt_c::getFileListInfo() const { } #pragma pop -/* 80028148-80028150 022A88 0008+00 1/0 0/0 0/0 .text +/* 80028148-80028150 -00001 0008+00 0/0 0/0 0/0 .text * setFloorInfo__16dStage_stageDt_cFP18dStage_FloorInfo_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dStage_stageDt_c::setFloorInfo(dStage_FloorInfo_c* param_0) { - nofralloc -#include "asm/d/d_stage/setFloorInfo__16dStage_stageDt_cFP18dStage_FloorInfo_c.s" +void dStage_stageDt_c::setFloorInfo(dStage_FloorInfo_c* param_0) { + *(u32*)(((u8*)this) + 124) /* this->field_0x7c */ = (u32)(param_0); } -#pragma pop /* 80028150-80028158 022A90 0008+00 1/0 0/0 0/0 .text getFloorInfo__16dStage_stageDt_cCFv */ @@ -4623,16 +4630,11 @@ asm void dStage_stageDt_c::getFloorInfo() const { } #pragma pop -/* 80028158-80028160 022A98 0008+00 1/0 0/0 0/0 .text +/* 80028158-80028160 -00001 0008+00 0/0 0/0 0/0 .text * setMemoryConfig__16dStage_stageDt_cFP21dStage_MemoryConfig_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dStage_stageDt_c::setMemoryConfig(dStage_MemoryConfig_c* param_0) { - nofralloc -#include "asm/d/d_stage/setMemoryConfig__16dStage_stageDt_cFP21dStage_MemoryConfig_c.s" +void dStage_stageDt_c::setMemoryConfig(dStage_MemoryConfig_c* param_0) { + *(u32*)(((u8*)this) + 128) /* this->field_0x80 */ = (u32)(param_0); } -#pragma pop /* 80028160-80028168 022AA0 0008+00 1/0 0/0 0/0 .text getMemoryConfig__16dStage_stageDt_cCFv */ #pragma push @@ -4644,16 +4646,11 @@ asm void dStage_stageDt_c::getMemoryConfig() const { } #pragma pop -/* 80028168-80028170 022AA8 0008+00 1/0 0/0 0/0 .text +/* 80028168-80028170 -00001 0008+00 0/0 0/0 0/0 .text * setMemoryMap__16dStage_stageDt_cFP18dStage_MemoryMap_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dStage_stageDt_c::setMemoryMap(dStage_MemoryMap_c* param_0) { - nofralloc -#include "asm/d/d_stage/setMemoryMap__16dStage_stageDt_cFP18dStage_MemoryMap_c.s" +void dStage_stageDt_c::setMemoryMap(dStage_MemoryMap_c* param_0) { + *(u32*)(((u8*)this) + 132) /* this->field_0x84 */ = (u32)(param_0); } -#pragma pop /* 80028170-80028178 022AB0 0008+00 1/0 0/0 0/0 .text getMemoryMap__16dStage_stageDt_cCFv */ @@ -4666,16 +4663,11 @@ asm void dStage_stageDt_c::getMemoryMap() const { } #pragma pop -/* 80028178-80028180 022AB8 0008+00 1/0 0/0 0/0 .text +/* 80028178-80028180 -00001 0008+00 0/0 0/0 0/0 .text * setMulti__16dStage_stageDt_cFP14dStage_Multi_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dStage_stageDt_c::setMulti(dStage_Multi_c* param_0) { - nofralloc -#include "asm/d/d_stage/setMulti__16dStage_stageDt_cFP14dStage_Multi_c.s" +void dStage_stageDt_c::setMulti(dStage_Multi_c* param_0) { + *(u32*)(((u8*)this) + 136) /* this->field_0x88 */ = (u32)(param_0); } -#pragma pop /* 80028180-80028188 022AC0 0008+00 1/0 0/0 0/0 .text getMulti__16dStage_stageDt_cCFv */ #pragma push @@ -4698,6 +4690,15 @@ asm void dStage_stageDt_c::getOldMulti() const { } #pragma pop +/* ############################################################################################## */ +/* 80378A50-80378A50 0050B0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80378E2D = "stage non Lbnk data!\n"; +/* @stringBase0 padding */ +SECTION_DEAD static char const* const pad_80378E43 = "\0\0\0\0"; +#pragma pop + /* 80028190-800281C4 022AD0 0034+00 1/0 0/0 0/0 .text setLbnk__16dStage_stageDt_cFP13dStage_Lbnk_c */ #pragma push @@ -4719,16 +4720,11 @@ asm void dStage_stageDt_c::getLbnk() const { } #pragma pop -/* 800281F8-80028200 022B38 0008+00 1/0 0/0 0/0 .text +/* 800281F8-80028200 -00001 0008+00 0/0 0/0 0/0 .text * setTresure__16dStage_stageDt_cFP19stage_tresure_class */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dStage_stageDt_c::setTresure(stage_tresure_class* param_0) { - nofralloc -#include "asm/d/d_stage/setTresure__16dStage_stageDt_cFP19stage_tresure_class.s" +void dStage_stageDt_c::setTresure(stage_tresure_class* param_0) { + *(u32*)(((u8*)this) + 144) /* this->field_0x90 */ = (u32)(param_0); } -#pragma pop /* 80028200-80028208 022B40 0008+00 1/0 0/0 0/0 .text getTresure__16dStage_stageDt_cCFv */ @@ -4741,16 +4737,11 @@ asm void dStage_stageDt_c::getTresure() const { } #pragma pop -/* 80028208-80028210 022B48 0008+00 1/0 0/0 0/0 .text setDMap__16dStage_stageDt_cFP13dStage_DMap_c +/* 80028208-80028210 -00001 0008+00 0/0 0/0 0/0 .text setDMap__16dStage_stageDt_cFP13dStage_DMap_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dStage_stageDt_c::setDMap(dStage_DMap_c* param_0) { - nofralloc -#include "asm/d/d_stage/setDMap__16dStage_stageDt_cFP13dStage_DMap_c.s" +void dStage_stageDt_c::setDMap(dStage_DMap_c* param_0) { + *(u32*)(((u8*)this) + 148) /* this->field_0x94 */ = (u32)(param_0); } -#pragma pop /* 80028210-80028218 022B50 0008+00 1/0 0/0 0/0 .text getDMap__16dStage_stageDt_cCFv */ #pragma push @@ -4762,16 +4753,11 @@ asm void dStage_stageDt_c::getDMap() const { } #pragma pop -/* 80028218-80028220 022B58 0008+00 1/0 0/0 0/0 .text +/* 80028218-80028220 -00001 0008+00 0/0 0/0 0/0 .text * setDrTg__16dStage_stageDt_cFP16stage_tgsc_class */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dStage_stageDt_c::setDrTg(stage_tgsc_class* param_0) { - nofralloc -#include "asm/d/d_stage/setDrTg__16dStage_stageDt_cFP16stage_tgsc_class.s" +void dStage_stageDt_c::setDrTg(stage_tgsc_class* param_0) { + *(u32*)(((u8*)this) + 152) /* this->field_0x98 */ = (u32)(param_0); } -#pragma pop /* 80028220-80028228 022B60 0008+00 1/0 0/0 0/0 .text getDrTg__16dStage_stageDt_cCFv */ #pragma push @@ -4783,16 +4769,11 @@ asm void dStage_stageDt_c::getDrTg() const { } #pragma pop -/* 80028228-80028230 022B68 0008+00 1/0 0/0 0/0 .text +/* 80028228-80028230 -00001 0008+00 0/0 0/0 0/0 .text * setDoor__16dStage_stageDt_cFP16stage_tgsc_class */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dStage_stageDt_c::setDoor(stage_tgsc_class* param_0) { - nofralloc -#include "asm/d/d_stage/setDoor__16dStage_stageDt_cFP16stage_tgsc_class.s" +void dStage_stageDt_c::setDoor(stage_tgsc_class* param_0) { + *(u32*)(((u8*)this) + 156) /* this->field_0x9c */ = (u32)(param_0); } -#pragma pop /* 80028230-80028238 022B70 0008+00 1/0 0/0 0/0 .text getDoor__16dStage_stageDt_cCFv */ #pragma push @@ -4815,16 +4796,11 @@ bool dStage_stageDt_c::getMapPath() { return false; } -/* 80028244-8002824C 022B84 0008+00 1/0 0/0 0/0 .text setElst__16dStage_stageDt_cFP13dStage_Elst_c +/* 80028244-8002824C -00001 0008+00 0/0 0/0 0/0 .text setElst__16dStage_stageDt_cFP13dStage_Elst_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dStage_stageDt_c::setElst(dStage_Elst_c* param_0) { - nofralloc -#include "asm/d/d_stage/setElst__16dStage_stageDt_cFP13dStage_Elst_c.s" +void dStage_stageDt_c::setElst(dStage_Elst_c* param_0) { + *(u32*)(((u8*)this) + 160) /* this->field_0xa0 */ = (u32)(param_0); } -#pragma pop /* 8002824C-80028328 022B8C 00DC+00 0/0 1/0 0/0 .text __sinit_d_stage_cpp */ #pragma push @@ -4838,7 +4814,7 @@ asm void __sinit_d_stage_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_8002824C = (void*)__sinit_d_stage_cpp; +REGISTER_CTORS(0x8002824C, __sinit_d_stage_cpp); #pragma pop /* 80028328-80028360 022C68 0038+00 1/1 0/0 0/0 .text __arraydtor$5375 */ @@ -5195,57 +5171,4 @@ stage_tgsc_data_class::stage_tgsc_data_class() { static u8 pad_80450D7C[4]; #pragma pop -/* 80378A50-80378E48 0050B0 03F3+05 62/62 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80378A50 = "OPENING"; -SECTION_DEAD static char const* const stringBase_80378A58 = - "部屋情報が、多分ですが壊れています。\n変換し直してみてください。\n"; -SECTION_DEAD static char const* const stringBase_80378A99 = - "ステージ情報が、多分ですが壊れています。\n変換し直してみてください。"; -SECTION_DEAD static char const* const stringBase_80378ADD = "name.bin"; -SECTION_DEAD static char const* const stringBase_80378AE6 = "bank.bin"; -SECTION_DEAD static char const* const stringBase_80378AEF = ""; -SECTION_DEAD static char const* const stringBase_80378AF0 = - "Bank[%d] : %s.arc Sync Read Error !!\n"; -SECTION_DEAD static char const* const stringBase_80378B16 = "%s/room%d.dzs"; -SECTION_DEAD static char const* const stringBase_80378B24 = "%d%+0d"; -SECTION_DEAD static char const* const stringBase_80378B2B = "S_MV000"; -SECTION_DEAD static char const* const stringBase_80378B33 = "Xtg_00"; -SECTION_DEAD static char const* const stringBase_80378B3A = "dStage_dt_c_decode: i_data is NULL\n"; -SECTION_DEAD static char const* const stringBase_80378B5E = "room%d.dzs"; -SECTION_DEAD static char const* const stringBase_80378B69 = "stage.dzs"; -SECTION_DEAD static char const* const stringBase_80378B73 = "vrbox_sora.bmd"; -SECTION_DEAD static char const* const stringBase_80378B82 = "Stg_00"; -SECTION_DEAD static char const* const stringBase_80378B89 = "Event"; -SECTION_DEAD static char const* const stringBase_80378B8F = "%s: %d: シーンリストがありません。\n"; -SECTION_DEAD static char const* const stringBase_80378BB3 = "d_stage.cpp"; -SECTION_DEAD static char const* const stringBase_80378BBF = "Room non room data !!\n"; -SECTION_DEAD static char const* const stringBase_80378BD6 = "Room non palet data !!\n"; -SECTION_DEAD static char const* const stringBase_80378BEE = "Room non pselect data !!\n"; -SECTION_DEAD static char const* const stringBase_80378C08 = "Room non envr data !!\n"; -SECTION_DEAD static char const* const stringBase_80378C1F = "Room non plight data !!\n"; -SECTION_DEAD static char const* const stringBase_80378C38 = "Room non palette num data !!\n"; -SECTION_DEAD static char const* const stringBase_80378C56 = "Room non pselect num data !!\n"; -SECTION_DEAD static char const* const stringBase_80378C74 = "Room non envr num data !!\n"; -SECTION_DEAD static char const* const stringBase_80378C8F = "Room non plight num data !!\n"; -SECTION_DEAD static char const* const stringBase_80378CAC = "Room non stag data !!\n"; -SECTION_DEAD static char const* const stringBase_80378CC3 = "Room non Pnt data !\n"; -SECTION_DEAD static char const* const stringBase_80378CD8 = "Room non Pnts data !\n"; -SECTION_DEAD static char const* const stringBase_80378CEE = "Room non Path data !\n"; -SECTION_DEAD static char const* const stringBase_80378D04 = "Room non memory config data!\n"; -SECTION_DEAD static char const* const stringBase_80378D22 = "Room non memory map data!\n"; -SECTION_DEAD static char const* const stringBase_80378D3D = "Room non multi data!\n"; -SECTION_DEAD static char const* const stringBase_80378D53 = "Room non old multi data!\n"; -SECTION_DEAD static char const* const stringBase_80378D6D = "stage non 2d map path data !!\n"; -SECTION_DEAD static char const* const stringBase_80378D8C = "Room non envLayserSet data\n"; -SECTION_DEAD static char const* const stringBase_80378DA8 = "Room no Elst Data!!\n"; -SECTION_DEAD static char const* const stringBase_80378DBD = "stage non LightVec data !!\n"; -SECTION_DEAD static char const* const stringBase_80378DD9 = "stage non LightVecNum data !!\n"; -SECTION_DEAD static char const* const stringBase_80378DF8 = "stage non filelist2 data!\n"; -SECTION_DEAD static char const* const stringBase_80378E13 = "stage non filelist data!\n"; -SECTION_DEAD static char const* const stringBase_80378E2D = "stage non Lbnk data!\n"; -/* @stringBase0 padding */ -SECTION_DEAD static char const* const pad_80378E43 = "\0\0\0\0"; -#pragma pop +/* 80378A50-80378A50 0050B0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/d_timer.cpp b/src/d/d_timer.cpp index 4ba6f3e9374..e38ccefd7ae 100644 --- a/src/d/d_timer.cpp +++ b/src/d/d_timer.cpp @@ -73,13 +73,13 @@ struct dDlst_list_c { /* 80056794 */ void set(dDlst_base_c**&, dDlst_base_c**&, dDlst_base_c*); }; -struct JKRArchive {}; - struct J2DPane { /* 802F7AFC */ void getParentPane(); /* 802F7FCC */ void animationTransform(); }; +struct JKRArchive {}; + struct dDlst_TimerScrnDraw_c { /* 8025DB38 */ dDlst_TimerScrnDraw_c(); /* 8025DBE0 */ void setHIO(); @@ -110,22 +110,17 @@ struct dDlst_TimerScrnDraw_c { }; struct dComIfG_play_c { - /* 8002CB94 */ void setTimerNowTimeMs(int); /* 8002CB9C */ void getTimerNowTimeMs(); - /* 8002CBA4 */ void setTimerLimitTimeMs(int); /* 8002CBAC */ void getTimerLimitTimeMs(); - /* 8002CBB4 */ void setTimerMode(int); /* 8002CBBC */ void getTimerMode(); - /* 8002CBC4 */ void setTimerType(u8); /* 8002CBCC */ void getTimerType(); - /* 8002CBD4 */ void setTimerPtr(dTimer_c*); /* 8002CBDC */ void getTimerPtr(); }; -struct Vec {}; - struct JAISoundID {}; +struct Vec {}; + struct Z2SeMgr { /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); }; @@ -318,6 +313,12 @@ extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; // /* ############################################################################################## */ +/* 8039A3D8-8039A3D8 026A38 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8039A3D8 = "Timer"; +#pragma pop + /* 80454F40-80454F44 003540 0004+00 10/10 0/0 0/0 .sdata2 @3919 */ SECTION_SDATA2 static u8 lit_3919[4] = { 0x00, @@ -562,6 +563,14 @@ asm void dDlst_TimerScrnDraw_c::setHIO() { } #pragma pop +/* ############################################################################################## */ +/* 8039A3D8-8039A3D8 026A38 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8039A3DE = "zelda_game_image_cow_get_in.blo"; +SECTION_DEAD static char const* const stringBase_8039A3FE = "zelda_game_image_cow_get_in.bck"; +#pragma pop + /* 8025DFBC-8025E240 2588FC 0284+00 1/1 0/0 0/0 .text * setScreen__21dDlst_TimerScrnDraw_cFlP10JKRArchive */ #pragma push @@ -573,6 +582,13 @@ asm void dDlst_TimerScrnDraw_c::setScreen(s32 param_0, JKRArchive* param_1) { } #pragma pop +/* ############################################################################################## */ +/* 8039A3D8-8039A3D8 026A38 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8039A41E = "zelda_game_image_cow_game.blo"; +#pragma pop + /* 8025E240-8025E66C 258B80 042C+00 1/1 0/0 0/0 .text setScreenBase__21dDlst_TimerScrnDraw_cFv */ #pragma push #pragma optimization_level 0 @@ -583,6 +599,13 @@ asm void dDlst_TimerScrnDraw_c::setScreenBase() { } #pragma pop +/* ############################################################################################## */ +/* 8039A3D8-8039A3D8 026A38 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8039A43C = "zelda_game_image_zora_kawakudari.blo"; +#pragma pop + /* 8025E66C-8025E8B8 258FAC 024C+00 1/1 0/0 0/0 .text setScreenBoatRace__21dDlst_TimerScrnDraw_cFv */ #pragma push @@ -594,6 +617,13 @@ asm void dDlst_TimerScrnDraw_c::setScreenBoatRace() { } #pragma pop +/* ############################################################################################## */ +/* 8039A3D8-8039A3D8 026A38 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8039A461 = "zelda_game_image_rider.blo"; +#pragma pop + /* 8025E8B8-8025EB20 2591F8 0268+00 1/1 0/0 0/0 .text setScreenRider__21dDlst_TimerScrnDraw_cFv */ #pragma push #pragma optimization_level 0 @@ -930,6 +960,14 @@ asm void dTimer_createTimer(s32 param_0, u32 param_1, u8 param_2, u8 param_3, f3 #pragma pop /* ############################################################################################## */ +/* 8039A3D8-8039A3D8 026A38 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8039A47C = "F_SP115"; +/* @stringBase0 padding */ +SECTION_DEAD static char const* const pad_8039A484 = "\0\0\0"; +#pragma pop + /* 80454FA0-80454FA4 0035A0 0004+00 1/1 0/0 0/0 .sdata2 @5544 */ SECTION_SDATA2 static f32 lit_5544 = 221.0f; @@ -1042,17 +1080,4 @@ asm void dTimer_c::createGetIn(cXyz param_0) { } #pragma pop -/* 8039A3D8-8039A488 026A38 00AC+04 7/7 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_8039A3D8 = "Timer"; -SECTION_DEAD static char const* const stringBase_8039A3DE = "zelda_game_image_cow_get_in.blo"; -SECTION_DEAD static char const* const stringBase_8039A3FE = "zelda_game_image_cow_get_in.bck"; -SECTION_DEAD static char const* const stringBase_8039A41E = "zelda_game_image_cow_game.blo"; -SECTION_DEAD static char const* const stringBase_8039A43C = "zelda_game_image_zora_kawakudari.blo"; -SECTION_DEAD static char const* const stringBase_8039A461 = "zelda_game_image_rider.blo"; -SECTION_DEAD static char const* const stringBase_8039A47C = "F_SP115"; -/* @stringBase0 padding */ -SECTION_DEAD static char const* const pad_8039A484 = "\0\0\0"; -#pragma pop +/* 8039A3D8-8039A3D8 026A38 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/d_tresure.cpp b/src/d/d_tresure.cpp index 937be579000..2eb7c91d10e 100644 --- a/src/d/d_tresure.cpp +++ b/src/d/d_tresure.cpp @@ -333,7 +333,7 @@ SECTION_RODATA u8 const dTres_c::typeToTypeGroup[34 + 6 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(8037B0D8, &dTres_c::typeToTypeGroup); +COMPILER_STRIP_GATE(0x8037B0D8, &dTres_c::typeToTypeGroup); /* 8009C49C-8009C4B0 096DDC 0014+00 0/0 1/1 0/0 .text getTypeGroupNoToType__7dTres_cFUc */ diff --git a/src/d/d_vib_pattern.cpp b/src/d/d_vib_pattern.cpp index 6a1149256ab..6d2a7986736 100644 --- a/src/d/d_vib_pattern.cpp +++ b/src/d/d_vib_pattern.cpp @@ -45,7 +45,7 @@ SECTION_RODATA u8 const dVibration_c::MS_patt[88] = { 0xF6, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0B, 0xFB, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0xC2, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xC0, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8037A620, &dVibration_c::MS_patt); +COMPILER_STRIP_GATE(0x8037A620, &dVibration_c::MS_patt); /* 8037A678-8037A6D0 006CD8 0058+00 0/0 1/1 0/0 .rodata CS_patt__12dVibration_c */ SECTION_RODATA u8 const dVibration_c::CS_patt[88] = { @@ -56,7 +56,7 @@ SECTION_RODATA u8 const dVibration_c::CS_patt[88] = { 0xF6, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0B, 0xFB, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0xC2, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xC0, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8037A678, &dVibration_c::CS_patt); +COMPILER_STRIP_GATE(0x8037A678, &dVibration_c::CS_patt); /* 8037A6D0-8037A720 006D30 0050+00 0/0 1/1 0/0 .rodata MQ_patt__12dVibration_c */ SECTION_RODATA u8 const dVibration_c::MQ_patt[80] = { @@ -66,7 +66,7 @@ SECTION_RODATA u8 const dVibration_c::MQ_patt[80] = { 0x00, 0x03, 0x00, 0x20, 0x4A, 0x94, 0xAA, 0x95, 0x00, 0x04, 0x00, 0x20, 0x36, 0x55, 0x56, 0x55, 0x00, 0x04, 0x00, 0x20, 0x6B, 0x6D, 0x6B, 0x6D, 0x00, 0x01, 0x00, 0x1B, 0x20, 0x20, 0x10, 0x00, }; -COMPILER_STRIP_GATE(8037A6D0, &dVibration_c::MQ_patt); +COMPILER_STRIP_GATE(0x8037A6D0, &dVibration_c::MQ_patt); /* 8037A720-8037A770 006D80 0050+00 0/0 1/1 0/0 .rodata CQ_patt__12dVibration_c */ SECTION_RODATA u8 const dVibration_c::CQ_patt[80] = { @@ -76,4 +76,4 @@ SECTION_RODATA u8 const dVibration_c::CQ_patt[80] = { 0x00, 0x03, 0x00, 0x20, 0x4A, 0x94, 0xAA, 0x95, 0x00, 0x04, 0x00, 0x20, 0x36, 0x55, 0x56, 0x55, 0x00, 0x04, 0x00, 0x20, 0x6B, 0x6D, 0x6B, 0x6D, 0x00, 0x00, 0x00, 0x1B, 0x20, 0x20, 0x10, 0x00, }; -COMPILER_STRIP_GATE(8037A720, &dVibration_c::CQ_patt); +COMPILER_STRIP_GATE(0x8037A720, &dVibration_c::CQ_patt); diff --git a/src/d/event/d_event.cpp b/src/d/event/d_event.cpp index 26e65f2f083..8cc11630c79 100644 --- a/src/d/event/d_event.cpp +++ b/src/d/event/d_event.cpp @@ -381,6 +381,14 @@ asm void dEvt_control_c::beforeFlagProc(dEvt_order_c* param_0) { } #pragma pop +/* ############################################################################################## */ +/* 80379D80-80379D80 0063E0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80379D80 = "？？？"; +SECTION_DEAD static char const* const stringBase_80379D87 = "ALL"; +#pragma pop + /* 80041964-800419A8 03C2A4 0044+00 2/2 0/0 0/0 .text * afterFlagProc__14dEvt_control_cFP12dEvt_order_c */ #pragma push @@ -403,6 +411,14 @@ asm void dEvt_control_c::commonCheck(dEvt_order_c* param_0, u16 param_1, u16 par } #pragma pop +/* ############################################################################################## */ +/* 80379D80-80379D80 0063E0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80379D8B = "DEFAULT_TALK"; +SECTION_DEAD static char const* const stringBase_80379D98 = "MHINT_TALK"; +#pragma pop + /* 80041A20-80041B58 03C360 0138+00 1/1 0/0 0/0 .text talkCheck__14dEvt_control_cFP12dEvt_order_c */ #pragma push @@ -414,6 +430,13 @@ asm void dEvt_control_c::talkCheck(dEvt_order_c* param_0) { } #pragma pop +/* ############################################################################################## */ +/* 80379D80-80379D80 0063E0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80379DA3 = "DEFAULT_TALK_XY"; +#pragma pop + /* 80041B58-80041C90 03C498 0138+00 1/1 0/0 0/0 .text * talkXyCheck__14dEvt_control_cFP12dEvt_order_c */ #pragma push @@ -489,6 +512,13 @@ asm void dEvt_control_c::doorCheck(dEvt_order_c* param_0) { } #pragma pop +/* ############################################################################################## */ +/* 80379D80-80379D80 0063E0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80379DB3 = "DEFAULT_GETITEM"; +#pragma pop + /* 8004212C-800421C0 03CA6C 0094+00 1/1 0/0 0/0 .text itemCheck__14dEvt_control_cFP12dEvt_order_c */ #pragma push @@ -590,6 +620,13 @@ asm void dEv_defaultSkipProc(void* param_0, int param_1) { } #pragma pop +/* ############################################################################################## */ +/* 80379D80-80379D80 0063E0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80379DC3 = "$0"; +#pragma pop + /* 8004261C-80042778 03CF5C 015C+00 1/1 1/1 0/0 .text dEv_defaultSkipZev__FPvi */ #pragma push #pragma optimization_level 0 @@ -635,7 +672,7 @@ asm void dEvt_control_c::getSkipEventName() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dEvt_control_c::setSkipProc(void* param_0, int (*)(void*, int), int param_2) { +asm void dEvt_control_c::setSkipProc(void* param_0, int (*param_1)(void*, int), int param_2) { nofralloc #include "asm/d/event/d_event/setSkipProc__14dEvt_control_cFPvPFPvi_ii.s" } @@ -903,15 +940,10 @@ asm void dEvt_control_c::setPtI(void* param_0) { } #pragma pop -/* 800436EC-800436F4 03E02C 0008+00 0/0 6/6 43/43 .text setPtI_Id__14dEvt_control_cFUi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dEvt_control_c::setPtI_Id(unsigned int param_0) { - nofralloc -#include "asm/d/event/d_event/setPtI_Id__14dEvt_control_cFUi.s" +/* 800436EC-800436F4 -00001 0008+00 0/0 0/0 0/0 .text setPtI_Id__14dEvt_control_cFUi */ +void dEvt_control_c::setPtI_Id(unsigned int param_0) { + *(u32*)(((u8*)this) + 208) /* this->field_0xd0 */ = (u32)(param_0); } -#pragma pop /* 800436F4-80043724 03E034 0030+00 0/0 4/4 0/0 .text setPtD__14dEvt_control_cFPv */ #pragma push @@ -923,28 +955,18 @@ asm void dEvt_control_c::setPtD(void* param_0) { } #pragma pop -/* 80043724-8004372C 03E064 0008+00 0/0 2/2 0/0 .text setGtItm__14dEvt_control_cFUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dEvt_control_c::setGtItm(u8 param_0) { - nofralloc -#include "asm/d/event/d_event/setGtItm__14dEvt_control_cFUc.s" +/* 80043724-8004372C -00001 0008+00 0/0 0/0 0/0 .text setGtItm__14dEvt_control_cFUc */ +void dEvt_control_c::setGtItm(u8 param_0) { + *(u8*)(((u8*)this) + 239) /* this->field_0xef */ = (u8)(param_0); } -#pragma pop -/* 80379D80-80379DD0 0063E0 004E+02 7/7 0/0 0/0 .rodata @stringBase0 */ +/* ############################################################################################## */ +/* 80379DC6-80379DD0 006426 0008+02 0/0 0/0 0/0 .rodata None */ #pragma push #pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80379D80 = "？？？"; -SECTION_DEAD static char const* const stringBase_80379D87 = "ALL"; -SECTION_DEAD static char const* const stringBase_80379D8B = "DEFAULT_TALK"; -SECTION_DEAD static char const* const stringBase_80379D98 = "MHINT_TALK"; -SECTION_DEAD static char const* const stringBase_80379DA3 = "DEFAULT_TALK_XY"; -SECTION_DEAD static char const* const stringBase_80379DB3 = "DEFAULT_GETITEM"; -SECTION_DEAD static char const* const stringBase_80379DC3 = "$0"; SECTION_DEAD static char const* const stringBase_80379DC6 = "GIVEMAN"; /* @stringBase0 padding */ SECTION_DEAD static char const* const pad_80379DCE = "\0"; #pragma pop + +/* 80379D80-80379D80 0063E0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/event/d_event_data.cpp b/src/d/event/d_event_data.cpp index c6c43de9d8f..2bd1f95b0dd 100644 --- a/src/d/event/d_event_data.cpp +++ b/src/d/event/d_event_data.cpp @@ -141,10 +141,10 @@ struct Z2SeqMgr { /* 802AFE18 */ void bgmStreamPlay(); }; -struct Vec {}; - struct JAISoundID {}; +struct Vec {}; + struct Z2SeMgr { /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); }; @@ -356,6 +356,21 @@ static asm void getStartTelopNo() { #pragma pop /* ############################################################################################## */ +/* 80379DD0-80379DD0 006430 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80379DD0 = "ID"; +SECTION_DEAD static char const* const stringBase_80379DD3 = "Stage"; +SECTION_DEAD static char const* const stringBase_80379DD9 = "StartCode"; +SECTION_DEAD static char const* const stringBase_80379DE3 = "RoomNo"; +SECTION_DEAD static char const* const stringBase_80379DEA = "Layer"; +SECTION_DEAD static char const* const stringBase_80379DF0 = "Wipe"; +SECTION_DEAD static char const* const stringBase_80379DF5 = "Mode"; +SECTION_DEAD static char const* const stringBase_80379DFA = "Speed"; +SECTION_DEAD static char const* const stringBase_80379E00 = "Hour"; +SECTION_DEAD static char const* const stringBase_80379E05 = "NoVisit"; +#pragma pop + /* 80451ED0-80451ED4 0004D0 0004+00 4/4 0/0 0/0 .sdata2 @4264 */ SECTION_SDATA2 static u8 lit_4264[4] = { 0x00, @@ -451,6 +466,13 @@ asm void dEvDtEvent_c::specialStaffProc(dEvDtStaff_c* param_0) { } #pragma pop +/* ############################################################################################## */ +/* 80379DD0-80379DD0 006430 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80379E0D = "Timer"; +#pragma pop + /* 80043FD8-8004403C 03E918 0064+00 4/4 0/0 0/0 .text specialProc_WaitStart__12dEvDtStaff_cFi */ #pragma push #pragma optimization_level 0 @@ -522,6 +544,13 @@ asm void dEvDtStaff_c::advanceCut(int param_0) { #pragma pop /* ############################################################################################## */ +/* 80379DD0-80379DD0 006430 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80379E13 = "LIGHT"; +SECTION_DEAD static char const* const stringBase_80379E19 = "Weather"; +#pragma pop + /* 80451EE0-80451EE8 0004E0 0004+04 1/1 0/0 0/0 .sdata2 @4460 */ SECTION_SDATA2 static f32 lit_4460[1 + 1 /* padding */] = { 1.0f / 15.0f, @@ -543,6 +572,17 @@ asm void dEvDtStaff_c::specialProcLight() { } #pragma pop +/* ############################################################################################## */ +/* 80379DD0-80379DD0 006430 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80379E21 = "MESSAGE"; +SECTION_DEAD static char const* const stringBase_80379E29 = "msgNo"; +SECTION_DEAD static char const* const stringBase_80379E2F = "No"; +SECTION_DEAD static char const* const stringBase_80379E32 = "Type"; +SECTION_DEAD static char const* const stringBase_80379E37 = "ForStart"; +#pragma pop + /* 80044324-80044A58 03EC64 0734+00 1/1 0/0 0/0 .text specialProcMessage__12dEvDtStaff_cFv */ #pragma push #pragma optimization_level 0 @@ -554,6 +594,12 @@ asm void dEvDtStaff_c::specialProcMessage() { #pragma pop /* ############################################################################################## */ +/* 80379DD0-80379DD0 006430 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80379E40 = "SOUND"; +#pragma pop + /* 80451EF0-80451EF4 0004F0 0004+00 4/4 0/0 0/0 .sdata2 @4668 */ SECTION_SDATA2 static f32 lit_4668 = 1.0f; @@ -571,6 +617,18 @@ asm void dEvDtStaff_c::specialProcSound() { } #pragma pop +/* ############################################################################################## */ +/* 80379DD0-80379DD0 006430 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80379E46 = "CREATER"; +SECTION_DEAD static char const* const stringBase_80379E4E = "MAKECAST"; +SECTION_DEAD static char const* const stringBase_80379E57 = "ARG"; +SECTION_DEAD static char const* const stringBase_80379E5B = "POS"; +SECTION_DEAD static char const* const stringBase_80379E5F = "ANGLE"; +SECTION_DEAD static char const* const stringBase_80379E65 = "SCALE"; +#pragma pop + /* 80044CB8-80044EE4 03F5F8 022C+00 1/1 0/0 0/0 .text specialProcCreate__12dEvDtStaff_cFv */ #pragma push @@ -582,6 +640,30 @@ asm void dEvDtStaff_c::specialProcCreate() { } #pragma pop +/* ############################################################################################## */ +/* 80379DD0-80379DD0 006430 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80379E6B = "DIRECTOR"; +SECTION_DEAD static char const* const stringBase_80379E74 = "EventFlag"; +SECTION_DEAD static char const* const stringBase_80379E7E = "EventFlagOff"; +SECTION_DEAD static char const* const stringBase_80379E8B = "SwitchTable"; +SECTION_DEAD static char const* const stringBase_80379E97 = "SwitchBit"; +SECTION_DEAD static char const* const stringBase_80379EA1 = "SwitchOff"; +SECTION_DEAD static char const* const stringBase_80379EAB = "TmpBit"; +SECTION_DEAD static char const* const stringBase_80379EB2 = "TmpBitOff"; +SECTION_DEAD static char const* const stringBase_80379EBC = "PLAYER_NODRAW"; +SECTION_DEAD static char const* const stringBase_80379ECA = "PLAYER_DRAW"; +SECTION_DEAD static char const* const stringBase_80379ED6 = "Zev"; +SECTION_DEAD static char const* const stringBase_80379EDA = "Rate"; +SECTION_DEAD static char const* const stringBase_80379EDF = "Color"; +SECTION_DEAD static char const* const stringBase_80379EE5 = "Pattern"; +SECTION_DEAD static char const* const stringBase_80379EED = "Pt2"; +SECTION_DEAD static char const* const stringBase_80379EF1 = "PtT"; +SECTION_DEAD static char const* const stringBase_80379EF5 = "PtI"; +SECTION_DEAD static char const* const stringBase_80379EF9 = "PtD"; +#pragma pop + /* 80044EE4-80045878 03F824 0994+00 1/1 0/0 0/0 .text specialProcDirector__12dEvDtStaff_cFv */ #pragma push #pragma optimization_level 0 @@ -593,6 +675,15 @@ asm void dEvDtStaff_c::specialProcDirector() { #pragma pop /* ############################################################################################## */ +/* 80379DD0-80379DD0 006430 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80379EFD = "PACKAGE"; +SECTION_DEAD static char const* const stringBase_80379F05 = "FileName"; +SECTION_DEAD static char const* const stringBase_80379F0E = "OffsetPos"; +SECTION_DEAD static char const* const stringBase_80379F18 = "OffsetAngY"; +#pragma pop + /* 80451EF8-80451EFC 0004F8 0004+00 1/1 0/0 0/0 .sdata2 @5057 */ SECTION_SDATA2 static f32 lit_5057 = 10.0f; @@ -606,6 +697,13 @@ asm void dEvDtStaff_c::specialProcPackage() { } #pragma pop +/* ############################################################################################## */ +/* 80379DD0-80379DD0 006430 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80379F23 = "TIMEKEEPER"; +#pragma pop + /* 80045AFC-80045C34 04043C 0138+00 1/1 0/0 0/0 .text specialProcTimekeeper__12dEvDtStaff_cFv */ #pragma push #pragma optimization_level 0 @@ -617,6 +715,18 @@ asm void dEvDtStaff_c::specialProcTimekeeper() { #pragma pop /* ############################################################################################## */ +/* 80379DD0-80379DD0 006430 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80379F2E = "EFFECT"; +SECTION_DEAD static char const* const stringBase_80379F35 = "Power"; +SECTION_DEAD static char const* const stringBase_80379F3B = "Random"; +SECTION_DEAD static char const* const stringBase_80379F42 = "Alpha"; +SECTION_DEAD static char const* const stringBase_80379F48 = "Scale"; +/* @stringBase0 padding */ +SECTION_DEAD static char const* const pad_80379F4E = "\0"; +#pragma pop + /* 80451EFC-80451F00 0004FC 0004+00 1/1 0/0 0/0 .sdata2 @5200 */ SECTION_SDATA2 static f32 lit_5200 = 4.0f / 5.0f; @@ -682,63 +792,4 @@ asm void dEvDtBase_c::advanceCutLocal(dEvDtStaff_c* param_0) { } #pragma pop -/* 80379DD0-80379F50 006430 017E+02 10/10 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80379DD0 = "ID"; -SECTION_DEAD static char const* const stringBase_80379DD3 = "Stage"; -SECTION_DEAD static char const* const stringBase_80379DD9 = "StartCode"; -SECTION_DEAD static char const* const stringBase_80379DE3 = "RoomNo"; -SECTION_DEAD static char const* const stringBase_80379DEA = "Layer"; -SECTION_DEAD static char const* const stringBase_80379DF0 = "Wipe"; -SECTION_DEAD static char const* const stringBase_80379DF5 = "Mode"; -SECTION_DEAD static char const* const stringBase_80379DFA = "Speed"; -SECTION_DEAD static char const* const stringBase_80379E00 = "Hour"; -SECTION_DEAD static char const* const stringBase_80379E05 = "NoVisit"; -SECTION_DEAD static char const* const stringBase_80379E0D = "Timer"; -SECTION_DEAD static char const* const stringBase_80379E13 = "LIGHT"; -SECTION_DEAD static char const* const stringBase_80379E19 = "Weather"; -SECTION_DEAD static char const* const stringBase_80379E21 = "MESSAGE"; -SECTION_DEAD static char const* const stringBase_80379E29 = "msgNo"; -SECTION_DEAD static char const* const stringBase_80379E2F = "No"; -SECTION_DEAD static char const* const stringBase_80379E32 = "Type"; -SECTION_DEAD static char const* const stringBase_80379E37 = "ForStart"; -SECTION_DEAD static char const* const stringBase_80379E40 = "SOUND"; -SECTION_DEAD static char const* const stringBase_80379E46 = "CREATER"; -SECTION_DEAD static char const* const stringBase_80379E4E = "MAKECAST"; -SECTION_DEAD static char const* const stringBase_80379E57 = "ARG"; -SECTION_DEAD static char const* const stringBase_80379E5B = "POS"; -SECTION_DEAD static char const* const stringBase_80379E5F = "ANGLE"; -SECTION_DEAD static char const* const stringBase_80379E65 = "SCALE"; -SECTION_DEAD static char const* const stringBase_80379E6B = "DIRECTOR"; -SECTION_DEAD static char const* const stringBase_80379E74 = "EventFlag"; -SECTION_DEAD static char const* const stringBase_80379E7E = "EventFlagOff"; -SECTION_DEAD static char const* const stringBase_80379E8B = "SwitchTable"; -SECTION_DEAD static char const* const stringBase_80379E97 = "SwitchBit"; -SECTION_DEAD static char const* const stringBase_80379EA1 = "SwitchOff"; -SECTION_DEAD static char const* const stringBase_80379EAB = "TmpBit"; -SECTION_DEAD static char const* const stringBase_80379EB2 = "TmpBitOff"; -SECTION_DEAD static char const* const stringBase_80379EBC = "PLAYER_NODRAW"; -SECTION_DEAD static char const* const stringBase_80379ECA = "PLAYER_DRAW"; -SECTION_DEAD static char const* const stringBase_80379ED6 = "Zev"; -SECTION_DEAD static char const* const stringBase_80379EDA = "Rate"; -SECTION_DEAD static char const* const stringBase_80379EDF = "Color"; -SECTION_DEAD static char const* const stringBase_80379EE5 = "Pattern"; -SECTION_DEAD static char const* const stringBase_80379EED = "Pt2"; -SECTION_DEAD static char const* const stringBase_80379EF1 = "PtT"; -SECTION_DEAD static char const* const stringBase_80379EF5 = "PtI"; -SECTION_DEAD static char const* const stringBase_80379EF9 = "PtD"; -SECTION_DEAD static char const* const stringBase_80379EFD = "PACKAGE"; -SECTION_DEAD static char const* const stringBase_80379F05 = "FileName"; -SECTION_DEAD static char const* const stringBase_80379F0E = "OffsetPos"; -SECTION_DEAD static char const* const stringBase_80379F18 = "OffsetAngY"; -SECTION_DEAD static char const* const stringBase_80379F23 = "TIMEKEEPER"; -SECTION_DEAD static char const* const stringBase_80379F2E = "EFFECT"; -SECTION_DEAD static char const* const stringBase_80379F35 = "Power"; -SECTION_DEAD static char const* const stringBase_80379F3B = "Random"; -SECTION_DEAD static char const* const stringBase_80379F42 = "Alpha"; -SECTION_DEAD static char const* const stringBase_80379F48 = "Scale"; -/* @stringBase0 padding */ -SECTION_DEAD static char const* const pad_80379F4E = "\0"; -#pragma pop +/* 80379DD0-80379DD0 006430 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/event/d_event_lib.cpp b/src/d/event/d_event_lib.cpp index f15bf9d8a73..50e996ddc0e 100644 --- a/src/d/event/d_event_lib.cpp +++ b/src/d/event/d_event_lib.cpp @@ -246,5 +246,5 @@ asm void __sinit_d_event_lib_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80048BD8 = (void*)__sinit_d_event_lib_cpp; +REGISTER_CTORS(0x80048BD8, __sinit_d_event_lib_cpp); #pragma pop diff --git a/src/d/event/d_event_manager.cpp b/src/d/event/d_event_manager.cpp index a24fba16a71..5e605a8de0b 100644 --- a/src/d/event/d_event_manager.cpp +++ b/src/d/event/d_event_manager.cpp @@ -43,8 +43,6 @@ struct dEvt_control_c { /* 800436F4 */ void setPtD(void*); }; -struct dEvDtData_c {}; - struct dEvDtStaff_c { /* 80044134 */ void init(); }; @@ -54,6 +52,8 @@ struct dEvDtEvent_c { /* 80043F70 */ void specialStaffProc(dEvDtStaff_c*); }; +struct dEvDtData_c {}; + struct Vec {}; struct cXyz { @@ -302,6 +302,30 @@ asm void dEvent_exception_c::setStartDemo(int param_0) { #pragma pop /* ############################################################################################## */ +/* 80379F60-80379F60 0065C0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80379F60 = "NORMAL_COMEBACK"; +SECTION_DEAD static char const* const stringBase_80379F70 = "DEFAULT_START"; +SECTION_DEAD static char const* const stringBase_80379F7E = "SHUTTER_START"; +SECTION_DEAD static char const* const stringBase_80379F8C = "SHUTTER_START_STOP"; +SECTION_DEAD static char const* const stringBase_80379F9F = "BS_SHUTTER_START"; +SECTION_DEAD static char const* const stringBase_80379FB0 = "BS_SHUTTER_START_B"; +SECTION_DEAD static char const* const stringBase_80379FC3 = "KNOB_START"; +SECTION_DEAD static char const* const stringBase_80379FCE = "KNOB_START_B"; +SECTION_DEAD static char const* const stringBase_80379FDB = "FMASTER_START"; +SECTION_DEAD static char const* const stringBase_80379FE9 = "FALL_START"; +SECTION_DEAD static char const* const stringBase_80379FF4 = "CRAWLOUT_START"; +SECTION_DEAD static char const* const stringBase_8037A003 = "BOSSWARP_START"; +SECTION_DEAD static char const* const stringBase_8037A012 = "PORTALWARP_START"; +SECTION_DEAD static char const* const stringBase_8037A023 = "PORTALWARP_START_B"; +SECTION_DEAD static char const* const stringBase_8037A036 = "(!NO REGIST!)"; +SECTION_DEAD static char const* const stringBase_8037A044 = "(!NO INFO!)"; +SECTION_DEAD static char const* const stringBase_8037A050 = "(!BAD NUMBER!)"; +SECTION_DEAD static char const* const stringBase_8037A05F = "(MAP TOOL CAMERA)"; +SECTION_DEAD static char const* const stringBase_8037A071 = "(!BAD DATA!)"; +#pragma pop + /* 803A8270-803A82A8 -00001 0038+00 1/1 0/0 0/0 .data soecial_names$3966 */ SECTION_DATA static void* soecial_names[14] = { (void*)&d_event_d_event_manager__stringBase0, @@ -383,7 +407,13 @@ SECTION_RODATA static u8 const data_80379F50[15 + 1 /* padding */] = { /* padding */ 0x00, }; -COMPILER_STRIP_GATE(80379F50, &data_80379F50); +COMPILER_STRIP_GATE(0x80379F50, &data_80379F50); + +/* 80379F60-80379F60 0065C0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8037A07E = "Event"; +#pragma pop /* 80046710-80046800 041050 00F0+00 0/0 1/1 0/0 .text create__16dEvent_manager_cFv */ #pragma push @@ -435,6 +465,14 @@ asm void dEvent_manager_c::roomFinish(int param_0) { } #pragma pop +/* ############################################################################################## */ +/* 80379F60-80379F60 0065C0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8037A084 = "WOLF_WORLD_CHANGE_OUT"; +SECTION_DEAD static char const* const stringBase_8037A09A = "WORLD_CHANGE_OUT"; +#pragma pop + /* 80046A58-80046C0C 041398 01B4+00 0/0 1/1 0/0 .text orderStartDemo__16dEvent_manager_cFv */ #pragma push #pragma optimization_level 0 @@ -507,6 +545,13 @@ asm void dEvent_manager_c::closeProc(dEvDtEvent_c* param_0) { } #pragma pop +/* ############################################################################################## */ +/* 80379F60-80379F60 0065C0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8037A0AB = "ALL"; +#pragma pop + /* 80046DAC-80046E64 0416EC 00B8+00 0/0 2/2 0/0 .text endProc__16dEvent_manager_cFsi */ #pragma push #pragma optimization_level 0 @@ -588,6 +633,12 @@ asm void dEvent_manager_c::getEventData(s16 param_0) { #pragma pop /* ############################################################################################## */ +/* 80379F60-80379F60 0065C0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8037A0AF = "MapToolCamera%d"; +#pragma pop + /* 804246A0-804246B4 0513C0 0011+03 1/1 0/0 0/0 .bss map_tool_name$4449 */ static u8 map_tool_name_4449[17 + 3 /* padding */]; @@ -692,6 +743,14 @@ asm void dEvent_manager_c::endCheckOld(char const* param_0) { } #pragma pop +/* ############################################################################################## */ +/* 80379F60-80379F60 0065C0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8037A0BF = "Alink"; +SECTION_DEAD static char const* const stringBase_8037A0C5 = "Link"; +#pragma pop + /* 80047B1C-80047D4C 04245C 0230+00 1/1 10/10 210/210 .text * getMyStaffId__16dEvent_manager_cFPCcP10fopAc_ac_ci */ #pragma push @@ -841,6 +900,14 @@ asm void dEvent_manager_c::getGoal() { } #pragma pop +/* ############################################################################################## */ +/* 80379F60-80379F60 0065C0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8037A0CA = "NO DATA"; +SECTION_DEAD static char const* const stringBase_8037A0D2 = "NOT RUNNING"; +#pragma pop + /* 800483E8-8004846C 042D28 0084+00 0/0 5/5 27/27 .text getRunEventName__16dEvent_manager_cFv */ #pragma push #pragma optimization_level 0 @@ -883,6 +950,13 @@ asm void dEvent_manager_c::specialCast_Shutter(s16 param_0, int param_1) { } #pragma pop +/* ############################################################################################## */ +/* 80379F60-80379F60 0065C0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8037A0DE = "SHUTTER_DOOR"; +#pragma pop + /* 80048618-80048748 042F58 0130+00 1/1 0/0 0/0 .text specialCast__16dEvent_manager_cFPCci */ #pragma push #pragma optimization_level 0 @@ -894,6 +968,17 @@ asm void dEvent_manager_c::specialCast(char const* param_0, int param_1) { #pragma pop /* ############################################################################################## */ +/* 80379F60-80379F60 0065C0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8037A0EB = "WAIT"; +SECTION_DEAD static char const* const stringBase_8037A0F0 = "TALK0"; +SECTION_DEAD static char const* const stringBase_8037A0F6 = "TALK1"; +SECTION_DEAD static char const* const stringBase_8037A0FC = "TALKMAN"; +/* @stringBase0 padding */ +SECTION_DEAD static char const* const pad_8037A104 = "\0\0\0"; +#pragma pop + /* 803A82A8-803A82B8 -00001 000C+04 1/1 0/0 0/0 .data action_table$5100 */ SECTION_DATA static void* action_table[3 + 1 /* padding */] = { (void*)(((char*)&d_event_d_event_manager__stringBase0) + 0x18B), @@ -933,43 +1018,4 @@ asm void dEvent_manager_c::checkStartDemo() { } #pragma pop -/* 80379F60-8037A108 0065C0 01A4+04 15/13 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80379F60 = "NORMAL_COMEBACK"; -SECTION_DEAD static char const* const stringBase_80379F70 = "DEFAULT_START"; -SECTION_DEAD static char const* const stringBase_80379F7E = "SHUTTER_START"; -SECTION_DEAD static char const* const stringBase_80379F8C = "SHUTTER_START_STOP"; -SECTION_DEAD static char const* const stringBase_80379F9F = "BS_SHUTTER_START"; -SECTION_DEAD static char const* const stringBase_80379FB0 = "BS_SHUTTER_START_B"; -SECTION_DEAD static char const* const stringBase_80379FC3 = "KNOB_START"; -SECTION_DEAD static char const* const stringBase_80379FCE = "KNOB_START_B"; -SECTION_DEAD static char const* const stringBase_80379FDB = "FMASTER_START"; -SECTION_DEAD static char const* const stringBase_80379FE9 = "FALL_START"; -SECTION_DEAD static char const* const stringBase_80379FF4 = "CRAWLOUT_START"; -SECTION_DEAD static char const* const stringBase_8037A003 = "BOSSWARP_START"; -SECTION_DEAD static char const* const stringBase_8037A012 = "PORTALWARP_START"; -SECTION_DEAD static char const* const stringBase_8037A023 = "PORTALWARP_START_B"; -SECTION_DEAD static char const* const stringBase_8037A036 = "(!NO REGIST!)"; -SECTION_DEAD static char const* const stringBase_8037A044 = "(!NO INFO!)"; -SECTION_DEAD static char const* const stringBase_8037A050 = "(!BAD NUMBER!)"; -SECTION_DEAD static char const* const stringBase_8037A05F = "(MAP TOOL CAMERA)"; -SECTION_DEAD static char const* const stringBase_8037A071 = "(!BAD DATA!)"; -SECTION_DEAD static char const* const stringBase_8037A07E = "Event"; -SECTION_DEAD static char const* const stringBase_8037A084 = "WOLF_WORLD_CHANGE_OUT"; -SECTION_DEAD static char const* const stringBase_8037A09A = "WORLD_CHANGE_OUT"; -SECTION_DEAD static char const* const stringBase_8037A0AB = "ALL"; -SECTION_DEAD static char const* const stringBase_8037A0AF = "MapToolCamera%d"; -SECTION_DEAD static char const* const stringBase_8037A0BF = "Alink"; -SECTION_DEAD static char const* const stringBase_8037A0C5 = "Link"; -SECTION_DEAD static char const* const stringBase_8037A0CA = "NO DATA"; -SECTION_DEAD static char const* const stringBase_8037A0D2 = "NOT RUNNING"; -SECTION_DEAD static char const* const stringBase_8037A0DE = "SHUTTER_DOOR"; -SECTION_DEAD static char const* const stringBase_8037A0EB = "WAIT"; -SECTION_DEAD static char const* const stringBase_8037A0F0 = "TALK0"; -SECTION_DEAD static char const* const stringBase_8037A0F6 = "TALK1"; -SECTION_DEAD static char const* const stringBase_8037A0FC = "TALKMAN"; -/* @stringBase0 padding */ -SECTION_DEAD static char const* const pad_8037A104 = "\0\0\0"; -#pragma pop +/* 80379F60-80379F60 0065C0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/file/d_file_sel_info.cpp b/src/d/file/d_file_sel_info.cpp index 3310b026adb..df721657400 100644 --- a/src/d/file/d_file_sel_info.cpp +++ b/src/d/file/d_file_sel_info.cpp @@ -124,6 +124,14 @@ extern "C" extern u8 g_meter2_info[248]; // /* ############################################################################################## */ +/* 803948B8-803948B8 020F18 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_803948B8 = "zelda_file_select_info_text.blo"; +SECTION_DEAD static char const* const stringBase_803948D8 = ""; +SECTION_DEAD static char const* const stringBase_803948D9 = "tt_heart_00.bti"; +#pragma pop + /* 803BB498-803BB4A8 0185B8 000C+04 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12 + 4 /* padding */] = { 0x00, @@ -266,6 +274,13 @@ asm void dFile_info_c::setHeartCnt(dSv_save_c* param_0) { } #pragma pop +/* ############################################################################################## */ +/* 803948B8-803948B8 020F18 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_803948E9 = "%02d/%02d/%d %02d:%02d"; +#pragma pop + /* 80192C08-80192C70 18D548 0068+00 1/1 0/0 0/0 .text setSaveDate__12dFile_info_cFP10dSv_save_c */ #pragma push #pragma optimization_level 0 @@ -276,6 +291,16 @@ asm void dFile_info_c::setSaveDate(dSv_save_c* param_0) { } #pragma pop +/* ############################################################################################## */ +/* 803948B8-803948B8 020F18 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80394900 = "999:59"; +SECTION_DEAD static char const* const stringBase_80394907 = "%d:%02d"; +/* @stringBase0 padding */ +SECTION_DEAD static char const* const pad_8039490F = ""; +#pragma pop + /* 80192C70-80192D58 18D5B0 00E8+00 1/1 0/0 0/0 .text setPlayTime__12dFile_info_cFP10dSv_save_c */ #pragma push #pragma optimization_level 0 @@ -340,7 +365,7 @@ asm void __sinit_d_file_sel_info_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80192E88 = (void*)__sinit_d_file_sel_info_cpp; +REGISTER_CTORS(0x80192E88, __sinit_d_file_sel_info_cpp); #pragma pop /* 80192EC8-80192F10 18D808 0048+00 1/0 0/0 0/0 .text __dt__16dDlst_FileInfo_cFv */ @@ -353,16 +378,4 @@ asm dDlst_FileInfo_c::~dDlst_FileInfo_c() { } #pragma pop -/* 803948B8-80394910 020F18 0057+01 6/5 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_803948B8 = "zelda_file_select_info_text.blo"; -SECTION_DEAD static char const* const stringBase_803948D8 = ""; -SECTION_DEAD static char const* const stringBase_803948D9 = "tt_heart_00.bti"; -SECTION_DEAD static char const* const stringBase_803948E9 = "%02d/%02d/%d %02d:%02d"; -SECTION_DEAD static char const* const stringBase_80394900 = "999:59"; -SECTION_DEAD static char const* const stringBase_80394907 = "%d:%02d"; -/* @stringBase0 padding */ -SECTION_DEAD static char const* const pad_8039490F = ""; -#pragma pop +/* 803948B8-803948B8 020F18 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/file/d_file_sel_warning.cpp b/src/d/file/d_file_sel_warning.cpp index 8450da94d6f..aae5d71ee6f 100644 --- a/src/d/file/d_file_sel_warning.cpp +++ b/src/d/file/d_file_sel_warning.cpp @@ -16,12 +16,12 @@ struct dMsgString_c { /* 80249D28 */ ~dMsgString_c(); }; -struct JKRArchive {}; - struct JUtility { struct TColor {}; }; +struct JKRArchive {}; + struct dFile_warning_c { /* 80191BAC */ dFile_warning_c(JKRArchive*, u8); /* 80191C18 */ ~dFile_warning_c(); @@ -61,10 +61,10 @@ struct J2DTextBox { /* 8030074C */ void setString(s16, char const*, ...); }; -struct J2DGrafContext {}; - struct J2DAnmTransform {}; +struct J2DGrafContext {}; + struct J2DScreen { /* 80192414 */ void setAnimation(J2DAnmTransform*); /* 802F8498 */ J2DScreen(); @@ -73,10 +73,6 @@ struct J2DScreen { /* 802F9690 */ void animation(); }; -struct J2DPane { - /* 802F7FC4 */ void setAnimation(J2DAnmTransform*); -}; - struct J2DAnmLoaderDataBase { /* 80308A6C */ void load(void const*); }; @@ -228,6 +224,18 @@ asm dFile_warning_c::~dFile_warning_c() { #pragma pop /* ############################################################################################## */ +/* 80394828-80394828 020E88 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80394828 = "zelda_file_select_warning_window.blo"; +SECTION_DEAD static char const* const stringBase_8039484D = "zelda_option_set_up_window.blo"; +SECTION_DEAD static char const* const stringBase_8039486C = "zelda_file_select_warning_window.bck"; +SECTION_DEAD static char const* const stringBase_80394891 = "zelda_option_set_up_window.bck"; +SECTION_DEAD static char const* const stringBase_803948B0 = ""; +/* @stringBase0 padding */ +SECTION_DEAD static char const* const pad_803948B1 = "\0\0\0\0\0\0"; +#pragma pop + /* 804539DC-804539E0 -00001 0004+00 1/1 0/0 0/0 .sdata2 @3769 */ SECTION_SDATA2 static void* lit_3769 = (void*)&d_file_d_file_sel_warning__stringBase0; @@ -399,7 +407,7 @@ asm void __sinit_d_file_sel_warning_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_8019238C = (void*)__sinit_d_file_sel_warning_cpp; +REGISTER_CTORS(0x8019238C, __sinit_d_file_sel_warning_cpp); #pragma pop /* 801923CC-80192414 18CD0C 0048+00 1/0 0/0 0/0 .text __dt__16dDlst_FileWarn_cFv */ @@ -423,15 +431,4 @@ asm void J2DScreen::setAnimation(J2DAnmTransform* param_0) { } #pragma pop -/* 80394828-803948B8 020E88 0089+07 5/1 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80394828 = "zelda_file_select_warning_window.blo"; -SECTION_DEAD static char const* const stringBase_8039484D = "zelda_option_set_up_window.blo"; -SECTION_DEAD static char const* const stringBase_8039486C = "zelda_file_select_warning_window.bck"; -SECTION_DEAD static char const* const stringBase_80394891 = "zelda_option_set_up_window.bck"; -SECTION_DEAD static char const* const stringBase_803948B0 = ""; -/* @stringBase0 padding */ -SECTION_DEAD static char const* const pad_803948B1 = "\0\0\0\0\0\0"; -#pragma pop +/* 80394828-80394828 020E88 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/file/d_file_select.cpp b/src/d/file/d_file_select.cpp index 65bed4b3508..8e4a48d54f9 100644 --- a/src/d/file/d_file_select.cpp +++ b/src/d/file/d_file_select.cpp @@ -83,8 +83,6 @@ struct dSv_event_c { /* 800349BC */ void isEventBit(u16) const; }; -struct JKRArchive {}; - struct J2DAnmTextureSRTKey { /* 80184274 */ ~J2DAnmTextureSRTKey(); }; @@ -103,6 +101,8 @@ struct J2DPane { /* 802F7FCC */ void animationTransform(); }; +struct JKRArchive {}; + struct dSelect_cursor_c { /* 80194220 */ dSelect_cursor_c(u8, f32, JKRArchive*); /* 801950F4 */ void setPos(f32, f32, J2DPane*, bool); @@ -129,8 +129,6 @@ struct dName_c { /* 80250560 */ void _draw(); }; -struct COutFont_c {}; - struct JUtility { struct TColor {}; }; @@ -144,6 +142,8 @@ struct J2DTextBox { struct JUTFont {}; +struct COutFont_c {}; + struct dMsgString_c { /* 80191B6C */ void getString(u32, J2DTextBox*, J2DTextBox*, JUTFont*, COutFont_c*, u8); /* 80249C20 */ dMsgString_c(); @@ -394,10 +394,10 @@ struct dComIfG_play_c { /* 8002B2C8 */ void itemInit(); }; -struct Vec {}; - struct JAISoundID {}; +struct Vec {}; + struct Z2SeMgr { /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); /* 802AC50C */ void seStartLevel(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); @@ -937,6 +937,54 @@ extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; // /* ############################################################################################## */ +/* 80394388-80394388 0209E8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80394388 = "tt_1_metal_40x40.bti"; +SECTION_DEAD static char const* const stringBase_8039439D = "tt_2_metal_40x40.bti"; +SECTION_DEAD static char const* const stringBase_803943B2 = "tt_3_metal_40x40.bti"; +SECTION_DEAD static char const* const stringBase_803943C7 = "zelda_file_select.blo"; +SECTION_DEAD static char const* const stringBase_803943DD = "zelda_file_select.bck"; +SECTION_DEAD static char const* const stringBase_803943F3 = ""; +SECTION_DEAD static char const* const stringBase_803943F4 = "zelda_file_select.bpk"; +SECTION_DEAD static char const* const stringBase_8039440A = "zelda_file_select_05.btk"; +SECTION_DEAD static char const* const stringBase_80394423 = "zelda_file_select.btk"; +SECTION_DEAD static char const* const stringBase_80394439 = "zelda_file_select.brk"; +SECTION_DEAD static char const* const stringBase_8039444F = "zelda_file_select_02.btk"; +SECTION_DEAD static char const* const stringBase_80394468 = "zelda_file_select_03.btk"; +SECTION_DEAD static char const* const stringBase_80394481 = "tt_block8x8.bti"; +SECTION_DEAD static char const* const stringBase_80394491 = "zelda_file_select_copy_select.blo"; +SECTION_DEAD static char const* const stringBase_803944B3 = "zelda_file_select_copy_select.bck"; +SECTION_DEAD static char const* const stringBase_803944D5 = "zelda_file_select_copy_select.bpk"; +SECTION_DEAD static char const* const stringBase_803944F7 = "zelda_file_select_copy_select_03.btk"; +SECTION_DEAD static char const* const stringBase_8039451C = "zelda_file_select_copy_select.btk"; +SECTION_DEAD static char const* const stringBase_8039453E = "zelda_file_select_copy_select.brk"; +SECTION_DEAD static char const* const stringBase_80394560 = "zelda_file_select_yes_no_window.blo"; +SECTION_DEAD static char const* const stringBase_80394584 = "zelda_file_select_yes_no_window.bck"; +SECTION_DEAD static char const* const stringBase_803945A8 = "zelda_file_select_yes_no_window.bpk"; +SECTION_DEAD static char const* const stringBase_803945CC = "zelda_file_select_yes_no_window.btk"; +SECTION_DEAD static char const* const stringBase_803945F0 = "zelda_file_select_3menu_window.blo"; +SECTION_DEAD static char const* const stringBase_80394613 = "zelda_file_select_3menu_window.bck"; +SECTION_DEAD static char const* const stringBase_80394636 = "zelda_file_select_3menu_window.bpk"; +SECTION_DEAD static char const* const stringBase_80394659 = "zelda_file_select_3menu_window.btk"; +SECTION_DEAD static char const* const stringBase_8039467C = "zelda_file_select_details.blo"; +SECTION_DEAD static char const* const stringBase_8039469A = "zelda_file_select_details.btk"; +SECTION_DEAD static char const* const stringBase_803946B8 = "md_mask_parts_spin_1.bck"; +SECTION_DEAD static char const* const stringBase_803946D1 = "md_mask_parts_spin_2.bck"; +SECTION_DEAD static char const* const stringBase_803946EA = "md_mask_parts_spin_3.bck"; +SECTION_DEAD static char const* const stringBase_80394703 = "md_mask_parts_spin_4.bck"; +SECTION_DEAD static char const* const stringBase_8039471C = "md_mask_parts_spin_1.brk"; +SECTION_DEAD static char const* const stringBase_80394735 = "md_mask_parts_spin_2_3.brk"; +SECTION_DEAD static char const* const stringBase_80394750 = "md_mask_parts_spin_4.brk"; +SECTION_DEAD static char const* const stringBase_80394769 = "md_mask_UI.bmd"; +SECTION_DEAD static char const* const stringBase_80394778 = "kageri_mirrer_spin_1.bck"; +SECTION_DEAD static char const* const stringBase_80394791 = "kageri_mirrer_spin_2.bck"; +SECTION_DEAD static char const* const stringBase_803947AA = "kageri_mirrer_spin_3.bck"; +SECTION_DEAD static char const* const stringBase_803947C3 = "kageri_mirrer_spin_4.bck"; +SECTION_DEAD static char const* const stringBase_803947DC = "kageri_mirrer_spin_1.brk"; +SECTION_DEAD static char const* const stringBase_803947F5 = "kageri_mirrer_spin_2_3_4.brk"; +#pragma pop + /* 803BA848-803BA854 017968 000C+00 6/6 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -4346,7 +4394,7 @@ SECTION_RODATA static u8 const m_kamen_offset_x[20] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80394310, &m_kamen_offset_x); +COMPILER_STRIP_GATE(0x80394310, &m_kamen_offset_x); /* 80394324-80394338 020984 0014+00 0/1 0/0 0/0 .rodata m_kamen_offset_y$8679 */ #pragma push @@ -4355,7 +4403,7 @@ SECTION_RODATA static u8 const m_kamen_offset_y[20] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0xA0, 0x00, 0x00, 0x40, 0xA0, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80394324, &m_kamen_offset_y); +COMPILER_STRIP_GATE(0x80394324, &m_kamen_offset_y); #pragma pop /* 80394338-8039434C 020998 0014+00 0/1 0/0 0/0 .rodata m_kamen_scale$8680 */ @@ -4365,7 +4413,7 @@ SECTION_RODATA static u8 const m_kamen_scale[20] = { 0x40, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x3F, 0xCC, 0xCC, 0xCD, 0x3F, 0xCC, 0xCC, 0xCD, }; -COMPILER_STRIP_GATE(80394338, &m_kamen_scale); +COMPILER_STRIP_GATE(0x80394338, &m_kamen_scale); #pragma pop /* 80190BA8-80190D68 18B4E8 01C0+00 1/1 0/0 0/0 .text createMaskModel__16dFile_select3D_cFv */ @@ -4386,7 +4434,7 @@ SECTION_RODATA static u8 const m_mirror_offset_x[20] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8039434C, &m_mirror_offset_x); +COMPILER_STRIP_GATE(0x8039434C, &m_mirror_offset_x); #pragma pop /* 80394360-80394374 0209C0 0014+00 0/1 0/0 0/0 .rodata m_mirror_offset_y$8782 */ @@ -4396,7 +4444,7 @@ SECTION_RODATA static u8 const m_mirror_offset_y[20] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80394360, &m_mirror_offset_y); +COMPILER_STRIP_GATE(0x80394360, &m_mirror_offset_y); #pragma pop /* 80394374-80394388 0209D4 0014+00 0/1 0/0 0/0 .rodata m_mirror_scale$8783 */ @@ -4406,7 +4454,15 @@ SECTION_RODATA static u8 const m_mirror_scale[20] = { 0x3F, 0x19, 0x99, 0x9A, 0x3F, 0x19, 0x99, 0x9A, 0x3F, 0x19, 0x99, 0x9A, 0x3F, 0x19, 0x99, 0x9A, 0x3F, 0x19, 0x99, 0x9A, }; -COMPILER_STRIP_GATE(80394374, &m_mirror_scale); +COMPILER_STRIP_GATE(0x80394374, &m_mirror_scale); +#pragma pop + +/* 80394388-80394388 0209E8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80394812 = "kageri_mirrer_UI.bmd"; +/* @stringBase0 padding */ +SECTION_DEAD static char const* const pad_80394827 = ""; #pragma pop /* 80190D68-80190FE8 18B6A8 0280+00 1/1 0/0 0/0 .text createMirrorModel__16dFile_select3D_cFv */ @@ -4548,7 +4604,7 @@ asm void __sinit_d_file_select_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80191428 = (void*)__sinit_d_file_select_cpp; +REGISTER_CTORS(0x80191428, __sinit_d_file_select_cpp); #pragma pop /* 80191B6C-80191BAC 18C4AC 0040+00 0/0 1/0 0/0 .text @@ -4563,54 +4619,4 @@ asm void dMsgString_c::getString(u32 param_0, J2DTextBox* param_1, J2DTextBox* p } #pragma pop -/* 80394388-80394828 0209E8 049F+01 14/9 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80394388 = "tt_1_metal_40x40.bti"; -SECTION_DEAD static char const* const stringBase_8039439D = "tt_2_metal_40x40.bti"; -SECTION_DEAD static char const* const stringBase_803943B2 = "tt_3_metal_40x40.bti"; -SECTION_DEAD static char const* const stringBase_803943C7 = "zelda_file_select.blo"; -SECTION_DEAD static char const* const stringBase_803943DD = "zelda_file_select.bck"; -SECTION_DEAD static char const* const stringBase_803943F3 = ""; -SECTION_DEAD static char const* const stringBase_803943F4 = "zelda_file_select.bpk"; -SECTION_DEAD static char const* const stringBase_8039440A = "zelda_file_select_05.btk"; -SECTION_DEAD static char const* const stringBase_80394423 = "zelda_file_select.btk"; -SECTION_DEAD static char const* const stringBase_80394439 = "zelda_file_select.brk"; -SECTION_DEAD static char const* const stringBase_8039444F = "zelda_file_select_02.btk"; -SECTION_DEAD static char const* const stringBase_80394468 = "zelda_file_select_03.btk"; -SECTION_DEAD static char const* const stringBase_80394481 = "tt_block8x8.bti"; -SECTION_DEAD static char const* const stringBase_80394491 = "zelda_file_select_copy_select.blo"; -SECTION_DEAD static char const* const stringBase_803944B3 = "zelda_file_select_copy_select.bck"; -SECTION_DEAD static char const* const stringBase_803944D5 = "zelda_file_select_copy_select.bpk"; -SECTION_DEAD static char const* const stringBase_803944F7 = "zelda_file_select_copy_select_03.btk"; -SECTION_DEAD static char const* const stringBase_8039451C = "zelda_file_select_copy_select.btk"; -SECTION_DEAD static char const* const stringBase_8039453E = "zelda_file_select_copy_select.brk"; -SECTION_DEAD static char const* const stringBase_80394560 = "zelda_file_select_yes_no_window.blo"; -SECTION_DEAD static char const* const stringBase_80394584 = "zelda_file_select_yes_no_window.bck"; -SECTION_DEAD static char const* const stringBase_803945A8 = "zelda_file_select_yes_no_window.bpk"; -SECTION_DEAD static char const* const stringBase_803945CC = "zelda_file_select_yes_no_window.btk"; -SECTION_DEAD static char const* const stringBase_803945F0 = "zelda_file_select_3menu_window.blo"; -SECTION_DEAD static char const* const stringBase_80394613 = "zelda_file_select_3menu_window.bck"; -SECTION_DEAD static char const* const stringBase_80394636 = "zelda_file_select_3menu_window.bpk"; -SECTION_DEAD static char const* const stringBase_80394659 = "zelda_file_select_3menu_window.btk"; -SECTION_DEAD static char const* const stringBase_8039467C = "zelda_file_select_details.blo"; -SECTION_DEAD static char const* const stringBase_8039469A = "zelda_file_select_details.btk"; -SECTION_DEAD static char const* const stringBase_803946B8 = "md_mask_parts_spin_1.bck"; -SECTION_DEAD static char const* const stringBase_803946D1 = "md_mask_parts_spin_2.bck"; -SECTION_DEAD static char const* const stringBase_803946EA = "md_mask_parts_spin_3.bck"; -SECTION_DEAD static char const* const stringBase_80394703 = "md_mask_parts_spin_4.bck"; -SECTION_DEAD static char const* const stringBase_8039471C = "md_mask_parts_spin_1.brk"; -SECTION_DEAD static char const* const stringBase_80394735 = "md_mask_parts_spin_2_3.brk"; -SECTION_DEAD static char const* const stringBase_80394750 = "md_mask_parts_spin_4.brk"; -SECTION_DEAD static char const* const stringBase_80394769 = "md_mask_UI.bmd"; -SECTION_DEAD static char const* const stringBase_80394778 = "kageri_mirrer_spin_1.bck"; -SECTION_DEAD static char const* const stringBase_80394791 = "kageri_mirrer_spin_2.bck"; -SECTION_DEAD static char const* const stringBase_803947AA = "kageri_mirrer_spin_3.bck"; -SECTION_DEAD static char const* const stringBase_803947C3 = "kageri_mirrer_spin_4.bck"; -SECTION_DEAD static char const* const stringBase_803947DC = "kageri_mirrer_spin_1.brk"; -SECTION_DEAD static char const* const stringBase_803947F5 = "kageri_mirrer_spin_2_3_4.brk"; -SECTION_DEAD static char const* const stringBase_80394812 = "kageri_mirrer_UI.bmd"; -/* @stringBase0 padding */ -SECTION_DEAD static char const* const pad_80394827 = ""; -#pragma pop +/* 80394388-80394388 0209E8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/kankyo/d_kankyo.cpp b/src/d/kankyo/d_kankyo.cpp index 46b7f0cab44..75e4d501bc9 100644 --- a/src/d/kankyo/d_kankyo.cpp +++ b/src/d/kankyo/d_kankyo.cpp @@ -73,8 +73,6 @@ struct dStage_roomControl_c { static u8 mStatus[65792]; }; -struct _GXColorS10 {}; - struct dKy_tevstr_c {}; struct J3DModelData { @@ -90,6 +88,8 @@ struct cXyz { /* 80266B84 */ void operator*(f32) const; }; +struct _GXColorS10 {}; + struct dScnKy_env_light_c { /* 8019F2E8 */ dScnKy_env_light_c(); /* 8019F4FC */ void setDaytime(); @@ -126,10 +126,10 @@ struct dRes_control_c { struct dPa_levelEcallBack {}; -struct _GXColor {}; - struct csXyz {}; +struct _GXColor {}; + struct dPa_control_c { /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, @@ -626,6 +626,60 @@ static asm void dKy_WolfPowerup_AmbCol(_GXColorS10* param_0) { } #pragma pop +/* ############################################################################################## */ +/* 80394C6C-80394C6C 0212CC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80394C6C = "F_SP115"; +SECTION_DEAD static char const* const stringBase_80394C74 = "F_SP113"; +SECTION_DEAD static char const* const stringBase_80394C7C = "D_SB10"; +SECTION_DEAD static char const* const stringBase_80394C83 = "F_SP112"; +SECTION_DEAD static char const* const stringBase_80394C8B = "F_SP126"; +SECTION_DEAD static char const* const stringBase_80394C93 = "F_SP114"; +SECTION_DEAD static char const* const stringBase_80394C9B = "D_MN05"; +SECTION_DEAD static char const* const stringBase_80394CA2 = "D_MN04"; +SECTION_DEAD static char const* const stringBase_80394CA9 = "D_SB04"; +SECTION_DEAD static char const* const stringBase_80394CB0 = "D_SB05"; +SECTION_DEAD static char const* const stringBase_80394CB7 = "D_SB06"; +SECTION_DEAD static char const* const stringBase_80394CBE = "D_SB07"; +SECTION_DEAD static char const* const stringBase_80394CC5 = "D_SB08"; +SECTION_DEAD static char const* const stringBase_80394CCC = "D_SB09"; +SECTION_DEAD static char const* const stringBase_80394CD3 = "D_MN10A"; +SECTION_DEAD static char const* const stringBase_80394CDB = "D_MN07A"; +SECTION_DEAD static char const* const stringBase_80394CE3 = "D_MN10B"; +SECTION_DEAD static char const* const stringBase_80394CEB = "D_MN10"; +SECTION_DEAD static char const* const stringBase_80394CF2 = "D_MN11A"; +SECTION_DEAD static char const* const stringBase_80394CFA = "D_MN11"; +SECTION_DEAD static char const* const stringBase_80394D01 = "D_MN11B"; +SECTION_DEAD static char const* const stringBase_80394D09 = "D_SB00"; +SECTION_DEAD static char const* const stringBase_80394D10 = "D_MN09B"; +SECTION_DEAD static char const* const stringBase_80394D18 = "D_MN09C"; +SECTION_DEAD static char const* const stringBase_80394D20 = "F_SP116"; +SECTION_DEAD static char const* const stringBase_80394D28 = "D_MN06"; +SECTION_DEAD static char const* const stringBase_80394D2F = "D_MN07"; +SECTION_DEAD static char const* const stringBase_80394D36 = "D_MN09A"; +SECTION_DEAD static char const* const stringBase_80394D3E = "D_SB01"; +SECTION_DEAD static char const* const stringBase_80394D45 = "R_SP300"; +SECTION_DEAD static char const* const stringBase_80394D4D = "R_SP301"; +SECTION_DEAD static char const* const stringBase_80394D55 = "D_MN01"; +SECTION_DEAD static char const* const stringBase_80394D5C = "D_MN01B"; +SECTION_DEAD static char const* const stringBase_80394D64 = "D_MN01A"; +SECTION_DEAD static char const* const stringBase_80394D6C = "D_MN08"; +SECTION_DEAD static char const* const stringBase_80394D73 = "D_SB02"; +SECTION_DEAD static char const* const stringBase_80394D7A = "D_SB03"; +SECTION_DEAD static char const* const stringBase_80394D81 = "R_SP01"; +SECTION_DEAD static char const* const stringBase_80394D88 = "R_SP108"; +SECTION_DEAD static char const* const stringBase_80394D90 = "R_SP209"; +SECTION_DEAD static char const* const stringBase_80394D98 = "R_SP116"; +SECTION_DEAD static char const* const stringBase_80394DA0 = "R_SP161"; +SECTION_DEAD static char const* const stringBase_80394DA8 = "F_SP110"; +SECTION_DEAD static char const* const stringBase_80394DB0 = "R_SP107"; +SECTION_DEAD static char const* const stringBase_80394DB8 = "R_SP128"; +SECTION_DEAD static char const* const stringBase_80394DC0 = "R_SP160"; +SECTION_DEAD static char const* const stringBase_80394DC8 = "R_SP127"; +SECTION_DEAD static char const* const stringBase_80394DD0 = "R_SP109"; +#pragma pop + /* 8019C3A4-8019CB0C 196CE4 0768+00 2/2 0/0 0/0 .text dKy_sense_pat_get__Fv */ #pragma push #pragma optimization_level 0 @@ -1047,6 +1101,12 @@ asm void dKy_FiveSenses_fullthrottle_dark() { #pragma pop /* ############################################################################################## */ +/* 80394C6C-80394C6C 0212CC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80394DD8 = "D_MN09"; +#pragma pop + /* 80453C70-80453C74 002270 0004+00 4/4 0/0 0/0 .sdata2 @4850 */ SECTION_SDATA2 static f32 lit_4850 = 1000000.0f; @@ -1222,6 +1282,13 @@ static asm void dungeonlight_init() { } #pragma pop +/* ############################################################################################## */ +/* 80394C6C-80394C6C 0212CC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80394DDF = "Always"; +#pragma pop + /* 8019EAA0-8019EBD0 1993E0 0130+00 1/1 0/0 0/0 .text undwater_init__Fv */ #pragma push #pragma optimization_level 0 @@ -1243,6 +1310,12 @@ static asm void dKy_light_size_get(char const* param_0) { #pragma pop /* ############################################################################################## */ +/* 80394C6C-80394C6C 0212CC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80394DE6 = "F_SP127"; +#pragma pop + /* 80453CA0-80453CA4 0022A0 0004+00 2/2 0/0 0/0 .sdata2 @5344 */ SECTION_SDATA2 static f32 lit_5344 = 11.0f / 100.0f; @@ -1633,6 +1706,12 @@ asm void dStage_roomControl_c::GetTimePass() { #pragma pop /* ############################################################################################## */ +/* 80394C6C-80394C6C 0212CC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80394DEE = "F_SP200"; +#pragma pop + /* 80453CC8-80453CCC 0022C8 0004+00 2/2 0/0 0/0 .sdata2 @5613 */ SECTION_SDATA2 static f32 lit_5613 = 270.0f; @@ -1744,6 +1823,13 @@ asm void dScnKy_env_light_c::getDarkDaytime() { #pragma pop /* ############################################################################################## */ +/* 80394C6C-80394C6C 0212CC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80394DF6 = "D_MN08D"; +SECTION_DEAD static char const* const stringBase_80394DFE = "F_SP121"; +#pragma pop + /* 80453CE0-80453CE4 0022E0 0004+00 1/1 0/0 0/0 .sdata2 @5839 */ SECTION_SDATA2 static f32 lit_5839 = 1.0f / 30.0f; @@ -2241,6 +2327,19 @@ static asm void dKy_Delete(sub_kankyo__class* param_0) { } #pragma pop +/* ############################################################################################## */ +/* 80394C6C-80394C6C 0212CC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80394E06 = "pol_efftbl.dat"; +SECTION_DEAD static char const* const stringBase_80394E15 = "pol_effcol.dat"; +SECTION_DEAD static char const* const stringBase_80394E24 = "pol_efftbl2.dat"; +SECTION_DEAD static char const* const stringBase_80394E34 = "pol_effcol2.dat"; +SECTION_DEAD static char const* const stringBase_80394E44 = "pol_sound.dat"; +SECTION_DEAD static char const* const stringBase_80394E52 = "pol_arg.dat"; +SECTION_DEAD static char const* const stringBase_80394E5E = "colordata_tbl.dat"; +#pragma pop + /* 801A5C1C-801A5E54 1A055C 0238+00 1/0 0/0 0/0 .text dKy_Create__FPv */ #pragma push #pragma optimization_level 0 @@ -2322,6 +2421,13 @@ asm void dKy_setLight_nowroom_grass(char param_0, f32 param_1) { } #pragma pop +/* ############################################################################################## */ +/* 80394C6C-80394C6C 0212CC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80394E70 = "D_MN"; +#pragma pop + /* 801A6D4C-801A6E9C 1A168C 0150+00 1/1 1/1 0/0 .text dKy_move_room_ratio__FP12dKy_tevstr_cPSc */ #pragma push #pragma optimization_level 0 @@ -2426,6 +2532,13 @@ asm void dKy_dalkmist_inf_cut(DALKMIST_INFLUENCE* param_0) { } #pragma pop +/* ############################################################################################## */ +/* 80394C6C-80394C6C 0212CC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80394E75 = "\nPOINTLIGHT COUNT OVER!!!\n"; +#pragma pop + /* 801A789C-801A792C 1A21DC 0090+00 0/0 0/0 1/1 .text dKy_plight_priority_set__FP15LIGHT_INFLUENCE */ #pragma push @@ -2589,6 +2702,14 @@ static asm void dKy_vrbox_addcol_set(s16 param_0, s16 param_1, s16 param_2, f32 } #pragma pop +/* ############################################################################################## */ +/* 80394C6C-80394C6C 0212CC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80394E90 = + "\ndKy_fog_startendz_set ratio error!\n"; +#pragma pop + /* 801A80D0-801A8168 1A2A10 0098+00 1/1 0/0 2/2 .text dKy_fog_startendz_set__Ffff */ #pragma push #pragma optimization_level 0 @@ -2899,7 +3020,7 @@ static asm void NewAmbColGet(_GXColorS10* param_0) { SECTION_RODATA static u8 const lit_9035[12] = { 0x4C, 0xBE, 0xBC, 0x20, 0x4C, 0xBE, 0xBC, 0x20, 0x4C, 0xBE, 0xBC, 0x20, }; -COMPILER_STRIP_GATE(80394C60, &lit_9035); +COMPILER_STRIP_GATE(0x80394C60, &lit_9035); /* 80453DAC-80453DB0 0023AC 0004+00 1/1 0/0 0/0 .sdata2 @8975 */ SECTION_SDATA2 static f32 lit_8975 = 50.0f; @@ -2961,6 +3082,13 @@ asm void dKy_ParticleColor_get_bg(cXyz* param_0, dKy_tevstr_c* param_1, _GXColor } #pragma pop +/* ############################################################################################## */ +/* 80394C6C-80394C6C 0212CC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80394EB5 = "F_SP118"; +#pragma pop + /* 801A9D60-801AA664 1A46A0 0904+00 1/1 0/0 17/17 .text dKy_BossLight_set__FP4cXyzP8_GXColorfUc */ #pragma push #pragma optimization_level 0 @@ -3035,6 +3163,13 @@ static asm void dKy_twilight_camelight_set() { #pragma pop /* ############################################################################################## */ +/* 80394C6C-80394C6C 0212CC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80394EBD = "F_SP109"; +SECTION_DEAD static char const* const stringBase_80394EC5 = "F_SP122"; +#pragma pop + /* 80453DEC-80453DF0 0023EC 0004+00 1/1 0/0 0/0 .sdata2 @9779 */ SECTION_SDATA2 static f32 lit_9779 = 7.225000381469727f; @@ -3075,6 +3210,13 @@ asm void dKy_camera_water_in_status_check() { } #pragma pop +/* ############################################################################################## */ +/* 80394C6C-80394C6C 0212CC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80394ECD = "D_MN05A"; +#pragma pop + /* 801AB290-801AB3A8 1A5BD0 0118+00 0/0 5/5 0/0 .text dKy_pol_efftype_get__FPC13cBgS_PolyInfo */ #pragma push #pragma optimization_level 0 @@ -3273,6 +3415,13 @@ asm void dKy_darkworld_check() { } #pragma pop +/* ############################################################################################## */ +/* 80394C6C-80394C6C 0212CC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80394ED5 = "F_SP108"; +#pragma pop + /* 801AC5BC-801AC70C 1A6EFC 0150+00 3/3 0/0 0/0 .text dKy_F_SP121Check__FPCciPUci */ #pragma push #pragma optimization_level 0 @@ -3367,6 +3516,30 @@ asm void dKy_shadow_mode_check(u8 param_0) { #pragma pop /* ############################################################################################## */ +/* 80394C6C-80394C6C 0212CC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80394EDD = "MA06"; +SECTION_DEAD static char const* const stringBase_80394EE2 = "MA03"; +SECTION_DEAD static char const* const stringBase_80394EE7 = "MA09"; +SECTION_DEAD static char const* const stringBase_80394EEC = "MA17"; +SECTION_DEAD static char const* const stringBase_80394EF1 = "MA19"; +SECTION_DEAD static char const* const stringBase_80394EF6 = "MA07"; +SECTION_DEAD static char const* const stringBase_80394EFB = "MA10"; +SECTION_DEAD static char const* const stringBase_80394F00 = "MA02"; +SECTION_DEAD static char const* const stringBase_80394F05 = "MA00"; +SECTION_DEAD static char const* const stringBase_80394F0A = "MA01"; +SECTION_DEAD static char const* const stringBase_80394F0F = "MA04"; +SECTION_DEAD static char const* const stringBase_80394F14 = "MA16"; +SECTION_DEAD static char const* const stringBase_80394F19 = "MA11"; +SECTION_DEAD static char const* const stringBase_80394F1E = "MA20"; +SECTION_DEAD static char const* const stringBase_80394F23 = "MA13"; +SECTION_DEAD static char const* const stringBase_80394F28 = "MA14"; +SECTION_DEAD static char const* const stringBase_80394F2D = "Rainbow"; +/* @stringBase0 padding */ +SECTION_DEAD static char const* const pad_80394F35 = "\0\0"; +#pragma pop + /* 80450708-8045070C 000188 0004+00 1/1 0/0 0/0 .sdata l_zmodeUpEnable */ SECTION_SDATA static u32 l_zmodeUpEnable = 0x01030100; @@ -3470,7 +3643,7 @@ asm void __sinit_d_kankyo_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_801ADCA4 = (void*)__sinit_d_kankyo_cpp; +REGISTER_CTORS(0x801ADCA4, __sinit_d_kankyo_cpp); #pragma pop /* 801ADD00-801ADD38 1A8640 0038+00 2/2 0/0 0/0 .text dKankyo_DayProc__Fv */ @@ -3490,97 +3663,4 @@ static asm void dKankyo_DayProc() { extern u8 struct_80451070[8]; u8 struct_80451070[8]; -/* 80394C6C-80394F38 0212CC 02C9+03 35/35 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80394C6C = "F_SP115"; -SECTION_DEAD static char const* const stringBase_80394C74 = "F_SP113"; -SECTION_DEAD static char const* const stringBase_80394C7C = "D_SB10"; -SECTION_DEAD static char const* const stringBase_80394C83 = "F_SP112"; -SECTION_DEAD static char const* const stringBase_80394C8B = "F_SP126"; -SECTION_DEAD static char const* const stringBase_80394C93 = "F_SP114"; -SECTION_DEAD static char const* const stringBase_80394C9B = "D_MN05"; -SECTION_DEAD static char const* const stringBase_80394CA2 = "D_MN04"; -SECTION_DEAD static char const* const stringBase_80394CA9 = "D_SB04"; -SECTION_DEAD static char const* const stringBase_80394CB0 = "D_SB05"; -SECTION_DEAD static char const* const stringBase_80394CB7 = "D_SB06"; -SECTION_DEAD static char const* const stringBase_80394CBE = "D_SB07"; -SECTION_DEAD static char const* const stringBase_80394CC5 = "D_SB08"; -SECTION_DEAD static char const* const stringBase_80394CCC = "D_SB09"; -SECTION_DEAD static char const* const stringBase_80394CD3 = "D_MN10A"; -SECTION_DEAD static char const* const stringBase_80394CDB = "D_MN07A"; -SECTION_DEAD static char const* const stringBase_80394CE3 = "D_MN10B"; -SECTION_DEAD static char const* const stringBase_80394CEB = "D_MN10"; -SECTION_DEAD static char const* const stringBase_80394CF2 = "D_MN11A"; -SECTION_DEAD static char const* const stringBase_80394CFA = "D_MN11"; -SECTION_DEAD static char const* const stringBase_80394D01 = "D_MN11B"; -SECTION_DEAD static char const* const stringBase_80394D09 = "D_SB00"; -SECTION_DEAD static char const* const stringBase_80394D10 = "D_MN09B"; -SECTION_DEAD static char const* const stringBase_80394D18 = "D_MN09C"; -SECTION_DEAD static char const* const stringBase_80394D20 = "F_SP116"; -SECTION_DEAD static char const* const stringBase_80394D28 = "D_MN06"; -SECTION_DEAD static char const* const stringBase_80394D2F = "D_MN07"; -SECTION_DEAD static char const* const stringBase_80394D36 = "D_MN09A"; -SECTION_DEAD static char const* const stringBase_80394D3E = "D_SB01"; -SECTION_DEAD static char const* const stringBase_80394D45 = "R_SP300"; -SECTION_DEAD static char const* const stringBase_80394D4D = "R_SP301"; -SECTION_DEAD static char const* const stringBase_80394D55 = "D_MN01"; -SECTION_DEAD static char const* const stringBase_80394D5C = "D_MN01B"; -SECTION_DEAD static char const* const stringBase_80394D64 = "D_MN01A"; -SECTION_DEAD static char const* const stringBase_80394D6C = "D_MN08"; -SECTION_DEAD static char const* const stringBase_80394D73 = "D_SB02"; -SECTION_DEAD static char const* const stringBase_80394D7A = "D_SB03"; -SECTION_DEAD static char const* const stringBase_80394D81 = "R_SP01"; -SECTION_DEAD static char const* const stringBase_80394D88 = "R_SP108"; -SECTION_DEAD static char const* const stringBase_80394D90 = "R_SP209"; -SECTION_DEAD static char const* const stringBase_80394D98 = "R_SP116"; -SECTION_DEAD static char const* const stringBase_80394DA0 = "R_SP161"; -SECTION_DEAD static char const* const stringBase_80394DA8 = "F_SP110"; -SECTION_DEAD static char const* const stringBase_80394DB0 = "R_SP107"; -SECTION_DEAD static char const* const stringBase_80394DB8 = "R_SP128"; -SECTION_DEAD static char const* const stringBase_80394DC0 = "R_SP160"; -SECTION_DEAD static char const* const stringBase_80394DC8 = "R_SP127"; -SECTION_DEAD static char const* const stringBase_80394DD0 = "R_SP109"; -SECTION_DEAD static char const* const stringBase_80394DD8 = "D_MN09"; -SECTION_DEAD static char const* const stringBase_80394DDF = "Always"; -SECTION_DEAD static char const* const stringBase_80394DE6 = "F_SP127"; -SECTION_DEAD static char const* const stringBase_80394DEE = "F_SP200"; -SECTION_DEAD static char const* const stringBase_80394DF6 = "D_MN08D"; -SECTION_DEAD static char const* const stringBase_80394DFE = "F_SP121"; -SECTION_DEAD static char const* const stringBase_80394E06 = "pol_efftbl.dat"; -SECTION_DEAD static char const* const stringBase_80394E15 = "pol_effcol.dat"; -SECTION_DEAD static char const* const stringBase_80394E24 = "pol_efftbl2.dat"; -SECTION_DEAD static char const* const stringBase_80394E34 = "pol_effcol2.dat"; -SECTION_DEAD static char const* const stringBase_80394E44 = "pol_sound.dat"; -SECTION_DEAD static char const* const stringBase_80394E52 = "pol_arg.dat"; -SECTION_DEAD static char const* const stringBase_80394E5E = "colordata_tbl.dat"; -SECTION_DEAD static char const* const stringBase_80394E70 = "D_MN"; -SECTION_DEAD static char const* const stringBase_80394E75 = "\nPOINTLIGHT COUNT OVER!!!\n"; -SECTION_DEAD static char const* const stringBase_80394E90 = - "\ndKy_fog_startendz_set ratio error!\n"; -SECTION_DEAD static char const* const stringBase_80394EB5 = "F_SP118"; -SECTION_DEAD static char const* const stringBase_80394EBD = "F_SP109"; -SECTION_DEAD static char const* const stringBase_80394EC5 = "F_SP122"; -SECTION_DEAD static char const* const stringBase_80394ECD = "D_MN05A"; -SECTION_DEAD static char const* const stringBase_80394ED5 = "F_SP108"; -SECTION_DEAD static char const* const stringBase_80394EDD = "MA06"; -SECTION_DEAD static char const* const stringBase_80394EE2 = "MA03"; -SECTION_DEAD static char const* const stringBase_80394EE7 = "MA09"; -SECTION_DEAD static char const* const stringBase_80394EEC = "MA17"; -SECTION_DEAD static char const* const stringBase_80394EF1 = "MA19"; -SECTION_DEAD static char const* const stringBase_80394EF6 = "MA07"; -SECTION_DEAD static char const* const stringBase_80394EFB = "MA10"; -SECTION_DEAD static char const* const stringBase_80394F00 = "MA02"; -SECTION_DEAD static char const* const stringBase_80394F05 = "MA00"; -SECTION_DEAD static char const* const stringBase_80394F0A = "MA01"; -SECTION_DEAD static char const* const stringBase_80394F0F = "MA04"; -SECTION_DEAD static char const* const stringBase_80394F14 = "MA16"; -SECTION_DEAD static char const* const stringBase_80394F19 = "MA11"; -SECTION_DEAD static char const* const stringBase_80394F1E = "MA20"; -SECTION_DEAD static char const* const stringBase_80394F23 = "MA13"; -SECTION_DEAD static char const* const stringBase_80394F28 = "MA14"; -SECTION_DEAD static char const* const stringBase_80394F2D = "Rainbow"; -/* @stringBase0 padding */ -SECTION_DEAD static char const* const pad_80394F35 = "\0\0"; -#pragma pop +/* 80394C6C-80394C6C 0212CC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/kankyo/d_kankyo_data.cpp b/src/d/kankyo/d_kankyo_data.cpp index fa9e8e4df3c..9089d10e0a2 100644 --- a/src/d/kankyo/d_kankyo_data.cpp +++ b/src/d/kankyo/d_kankyo_data.cpp @@ -36,6 +36,67 @@ extern "C" extern u8 g_env_light[4880]; // /* ############################################################################################## */ +/* 8037A1C0-8037A1C0 006820 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8037A1C0 = "R_SP30"; +SECTION_DEAD static char const* const stringBase_8037A1C7 = "T_SP05"; +SECTION_DEAD static char const* const stringBase_8037A1CE = "T_SP05A"; +SECTION_DEAD static char const* const stringBase_8037A1D6 = "T_WARP2"; +SECTION_DEAD static char const* const stringBase_8037A1DE = "T_IMAI"; +SECTION_DEAD static char const* const stringBase_8037A1E5 = "T_IMAI0"; +SECTION_DEAD static char const* const stringBase_8037A1ED = "T_TOMI"; +SECTION_DEAD static char const* const stringBase_8037A1F4 = "T_SASA1"; +SECTION_DEAD static char const* const stringBase_8037A1FC = "F_SP105"; +SECTION_DEAD static char const* const stringBase_8037A204 = "F_SP05"; +SECTION_DEAD static char const* const stringBase_8037A20B = "R_SP107"; +SECTION_DEAD static char const* const stringBase_8037A213 = "F_SP108"; +SECTION_DEAD static char const* const stringBase_8037A21B = "R_SP108"; +SECTION_DEAD static char const* const stringBase_8037A223 = "TEST11"; +SECTION_DEAD static char const* const stringBase_8037A22A = "F_SP109"; +SECTION_DEAD static char const* const stringBase_8037A232 = "F_SP110"; +SECTION_DEAD static char const* const stringBase_8037A23A = "R_SP109"; +SECTION_DEAD static char const* const stringBase_8037A242 = "F_SP111"; +SECTION_DEAD static char const* const stringBase_8037A24A = "F_SP112"; +SECTION_DEAD static char const* const stringBase_8037A252 = "F_SP113"; +SECTION_DEAD static char const* const stringBase_8037A25A = "F_SP115"; +SECTION_DEAD static char const* const stringBase_8037A262 = "F_SP116"; +SECTION_DEAD static char const* const stringBase_8037A26A = "F_SP122"; +SECTION_DEAD static char const* const stringBase_8037A272 = "F_SP121"; +SECTION_DEAD static char const* const stringBase_8037A27A = "F_SP126"; +SECTION_DEAD static char const* const stringBase_8037A282 = "R_SP209"; +SECTION_DEAD static char const* const stringBase_8037A28A = "R_SP116"; +SECTION_DEAD static char const* const stringBase_8037A292 = "D_MN08"; +SECTION_DEAD static char const* const stringBase_8037A299 = "D_MN08B"; +SECTION_DEAD static char const* const stringBase_8037A2A1 = "D_MN08C"; +SECTION_DEAD static char const* const stringBase_8037A2A9 = "D_MN08A"; +SECTION_DEAD static char const* const stringBase_8037A2B1 = "D_SB10"; +SECTION_DEAD static char const* const stringBase_8037A2B8 = "R_SP01"; +SECTION_DEAD static char const* const stringBase_8037A2BF = "R_SP128"; +SECTION_DEAD static char const* const stringBase_8037A2C7 = "F_SP114"; +SECTION_DEAD static char const* const stringBase_8037A2CF = "F_SP102"; +SECTION_DEAD static char const* const stringBase_8037A2D7 = "F_SP123"; +SECTION_DEAD static char const* const stringBase_8037A2DF = "R_SP160"; +SECTION_DEAD static char const* const stringBase_8037A2E7 = "R_SP161"; +SECTION_DEAD static char const* const stringBase_8037A2EF = "F_SP118"; +SECTION_DEAD static char const* const stringBase_8037A2F7 = "F_SP124"; +SECTION_DEAD static char const* const stringBase_8037A2FF = "F_SP125"; +SECTION_DEAD static char const* const stringBase_8037A307 = "R_SP127"; +SECTION_DEAD static char const* const stringBase_8037A30F = "D_MN01A"; +SECTION_DEAD static char const* const stringBase_8037A317 = "D_MN10A"; +SECTION_DEAD static char const* const stringBase_8037A31F = "D_MN06A"; +SECTION_DEAD static char const* const stringBase_8037A327 = "D_MN07A"; +SECTION_DEAD static char const* const stringBase_8037A32F = "D_MN08D"; +SECTION_DEAD static char const* const stringBase_8037A337 = "D_MN09"; +SECTION_DEAD static char const* const stringBase_8037A33E = "D_MN09B"; +SECTION_DEAD static char const* const stringBase_8037A346 = "D_MN09C"; +SECTION_DEAD static char const* const stringBase_8037A34E = "R_SP300"; +SECTION_DEAD static char const* const stringBase_8037A356 = "D_SB02"; +SECTION_DEAD static char const* const stringBase_8037A35D = "D_SB03"; +/* @stringBase0 padding */ +SECTION_DEAD static char const* const pad_8037A364 = "\0\0\0"; +#pragma pop + /* 803A8E98-803A9198 005FB8 0300+00 1/1 0/0 0/0 .data l_kydata_BloomInf_tbl */ SECTION_DATA static u8 l_kydata_BloomInf_tbl[768] = { 0x01, 0xFF, 0x40, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x28, 0x46, 0x87, @@ -1003,64 +1064,4 @@ asm void dKyd_BloomInf_tbl_getp(int param_0) { } #pragma pop -/* 8037A1C0-8037A368 006820 01A4+04 3/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_8037A1C0 = "R_SP30"; -SECTION_DEAD static char const* const stringBase_8037A1C7 = "T_SP05"; -SECTION_DEAD static char const* const stringBase_8037A1CE = "T_SP05A"; -SECTION_DEAD static char const* const stringBase_8037A1D6 = "T_WARP2"; -SECTION_DEAD static char const* const stringBase_8037A1DE = "T_IMAI"; -SECTION_DEAD static char const* const stringBase_8037A1E5 = "T_IMAI0"; -SECTION_DEAD static char const* const stringBase_8037A1ED = "T_TOMI"; -SECTION_DEAD static char const* const stringBase_8037A1F4 = "T_SASA1"; -SECTION_DEAD static char const* const stringBase_8037A1FC = "F_SP105"; -SECTION_DEAD static char const* const stringBase_8037A204 = "F_SP05"; -SECTION_DEAD static char const* const stringBase_8037A20B = "R_SP107"; -SECTION_DEAD static char const* const stringBase_8037A213 = "F_SP108"; -SECTION_DEAD static char const* const stringBase_8037A21B = "R_SP108"; -SECTION_DEAD static char const* const stringBase_8037A223 = "TEST11"; -SECTION_DEAD static char const* const stringBase_8037A22A = "F_SP109"; -SECTION_DEAD static char const* const stringBase_8037A232 = "F_SP110"; -SECTION_DEAD static char const* const stringBase_8037A23A = "R_SP109"; -SECTION_DEAD static char const* const stringBase_8037A242 = "F_SP111"; -SECTION_DEAD static char const* const stringBase_8037A24A = "F_SP112"; -SECTION_DEAD static char const* const stringBase_8037A252 = "F_SP113"; -SECTION_DEAD static char const* const stringBase_8037A25A = "F_SP115"; -SECTION_DEAD static char const* const stringBase_8037A262 = "F_SP116"; -SECTION_DEAD static char const* const stringBase_8037A26A = "F_SP122"; -SECTION_DEAD static char const* const stringBase_8037A272 = "F_SP121"; -SECTION_DEAD static char const* const stringBase_8037A27A = "F_SP126"; -SECTION_DEAD static char const* const stringBase_8037A282 = "R_SP209"; -SECTION_DEAD static char const* const stringBase_8037A28A = "R_SP116"; -SECTION_DEAD static char const* const stringBase_8037A292 = "D_MN08"; -SECTION_DEAD static char const* const stringBase_8037A299 = "D_MN08B"; -SECTION_DEAD static char const* const stringBase_8037A2A1 = "D_MN08C"; -SECTION_DEAD static char const* const stringBase_8037A2A9 = "D_MN08A"; -SECTION_DEAD static char const* const stringBase_8037A2B1 = "D_SB10"; -SECTION_DEAD static char const* const stringBase_8037A2B8 = "R_SP01"; -SECTION_DEAD static char const* const stringBase_8037A2BF = "R_SP128"; -SECTION_DEAD static char const* const stringBase_8037A2C7 = "F_SP114"; -SECTION_DEAD static char const* const stringBase_8037A2CF = "F_SP102"; -SECTION_DEAD static char const* const stringBase_8037A2D7 = "F_SP123"; -SECTION_DEAD static char const* const stringBase_8037A2DF = "R_SP160"; -SECTION_DEAD static char const* const stringBase_8037A2E7 = "R_SP161"; -SECTION_DEAD static char const* const stringBase_8037A2EF = "F_SP118"; -SECTION_DEAD static char const* const stringBase_8037A2F7 = "F_SP124"; -SECTION_DEAD static char const* const stringBase_8037A2FF = "F_SP125"; -SECTION_DEAD static char const* const stringBase_8037A307 = "R_SP127"; -SECTION_DEAD static char const* const stringBase_8037A30F = "D_MN01A"; -SECTION_DEAD static char const* const stringBase_8037A317 = "D_MN10A"; -SECTION_DEAD static char const* const stringBase_8037A31F = "D_MN06A"; -SECTION_DEAD static char const* const stringBase_8037A327 = "D_MN07A"; -SECTION_DEAD static char const* const stringBase_8037A32F = "D_MN08D"; -SECTION_DEAD static char const* const stringBase_8037A337 = "D_MN09"; -SECTION_DEAD static char const* const stringBase_8037A33E = "D_MN09B"; -SECTION_DEAD static char const* const stringBase_8037A346 = "D_MN09C"; -SECTION_DEAD static char const* const stringBase_8037A34E = "R_SP300"; -SECTION_DEAD static char const* const stringBase_8037A356 = "D_SB02"; -SECTION_DEAD static char const* const stringBase_8037A35D = "D_SB03"; -/* @stringBase0 padding */ -SECTION_DEAD static char const* const pad_8037A364 = "\0\0\0"; -#pragma pop +/* 8037A1C0-8037A1C0 006820 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/kankyo/d_kankyo_rain.cpp b/src/d/kankyo/d_kankyo_rain.cpp index 7eb6ea461af..4d051653b6a 100644 --- a/src/d/kankyo/d_kankyo_rain.cpp +++ b/src/d/kankyo/d_kankyo_rain.cpp @@ -44,6 +44,15 @@ struct dRes_control_c { struct dPa_levelEcallBack {}; +struct dKy_tevstr_c {}; + +struct csXyz { + /* 80018BD0 */ ~csXyz(); + /* 802673F4 */ csXyz(s16, s16, s16); +}; + +struct _GXColor {}; + struct Vec {}; struct cXyz { @@ -51,15 +60,6 @@ struct cXyz { /* 80266AE4 */ void operator+(Vec const&) const; }; -struct dKy_tevstr_c {}; - -struct _GXColor {}; - -struct csXyz { - /* 80018BD0 */ ~csXyz(); - /* 802673F4 */ csXyz(s16, s16, s16); -}; - struct dPa_control_c { /* 8004D4CC */ void set(u32, u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, @@ -563,7 +563,14 @@ SECTION_RODATA static u8 const sun_chkpnt[40] = { 0x00, 0x00, 0x41, 0x20, 0x00, 0x00, 0x41, 0xA0, 0x00, 0x00, 0xC1, 0xA0, 0x00, 0x00, 0x41, 0x20, 0x00, 0x00, 0x41, 0xA0, 0x00, 0x00, 0xC1, 0x20, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8037A4C0, &sun_chkpnt); +COMPILER_STRIP_GATE(0x8037A4C0, &sun_chkpnt); + +/* 8037A578-8037A578 006BD8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8037A578 = "F_SP200"; +SECTION_DEAD static char const* const stringBase_8037A580 = "D_MN09B"; +#pragma pop /* 803A9BA0-803A9BAC 006CC0 000C+00 1/1 0/0 0/0 .data sun_color$4213 */ SECTION_DATA static u8 sun_color[12] = { @@ -668,6 +675,13 @@ asm void dKyr_sun_move() { } #pragma pop +/* ############################################################################################## */ +/* 8037A578-8037A578 006BD8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8037A588 = "Always"; +#pragma pop + /* 8005CC5C-8005CDA8 05759C 014C+00 0/0 1/1 0/0 .text dKyr_rain_init__Fv */ #pragma push #pragma optimization_level 0 @@ -693,6 +707,12 @@ static asm void rain_bg_chk(dKankyo_rain_Packet* param_0, int param_1) { #pragma pop /* ############################################################################################## */ +/* 8037A578-8037A578 006BD8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8037A58F = "F_SP122"; +#pragma pop + /* 8045227C-80452280 00087C 0004+00 9/9 0/0 0/0 .sdata2 @4467 */ SECTION_SDATA2 static f32 lit_4467 = 50.0f; @@ -721,6 +741,16 @@ static asm void forward_overhead_bg_chk(cXyz* param_0, f32 param_1) { #pragma pop /* ############################################################################################## */ +/* 8037A578-8037A578 006BD8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8037A597 = "R_SP30"; +SECTION_DEAD static char const* const stringBase_8037A59E = "R_SP107"; +SECTION_DEAD static char const* const stringBase_8037A5A6 = "R_SP127"; +SECTION_DEAD static char const* const stringBase_8037A5AE = "F_SP113"; +SECTION_DEAD static char const* const stringBase_8037A5B6 = "D_MN09"; +#pragma pop + /* 80452284-80452288 000884 0004+00 1/1 0/0 0/0 .sdata2 @5096 */ SECTION_SDATA2 static f32 lit_5096 = -2.5f; @@ -859,6 +889,12 @@ static asm void d_krain_cut_turn_check() { #pragma pop /* ############################################################################################## */ +/* 8037A578-8037A578 006BD8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8037A5BD = "D_MN08"; +#pragma pop + /* 80452320-80452324 000920 0004+00 1/1 0/0 0/0 .sdata2 @5716 */ SECTION_SDATA2 static f32 lit_5716 = -100000000.0f; @@ -979,6 +1015,12 @@ asm void dKyr_snow_init() { #pragma pop /* ############################################################################################## */ +/* 8037A578-8037A578 006BD8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8037A5C4 = "F_SP127"; +#pragma pop + /* 804523A4-804523A8 0009A4 0004+00 8/8 0/0 0/0 .sdata2 @6355 */ SECTION_SDATA2 static f32 lit_6355 = 100.0f; @@ -1056,6 +1098,12 @@ asm void dKyr_star_move() { #pragma pop /* ############################################################################################## */ +/* 8037A578-8037A578 006BD8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8037A5CC = "D_MN05A"; +#pragma pop + /* 804523E4-804523E8 0009E4 0004+00 2/2 0/0 0/0 .sdata2 @6720 */ SECTION_SDATA2 static f32 lit_6720 = 0.004999999888241291f; @@ -1118,6 +1166,12 @@ asm void cloud_shadow_move() { #pragma pop /* ############################################################################################## */ +/* 8037A578-8037A578 006BD8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8037A5D4 = "D_MN07A"; +#pragma pop + /* 80452428-8045242C 000A28 0004+00 1/1 0/0 0/0 .sdata2 @6947 */ SECTION_SDATA2 static f32 lit_6947 = 2500.0f; @@ -1175,7 +1229,7 @@ SECTION_RODATA static u8 const lit_6991[32] = { 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x54, 0x7A, 0xE1, 0x3F, 0x19, 0x99, 0x9A, 0x3F, 0x47, 0xAE, 0x14, 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x47, 0xAE, 0x14, 0x3F, 0x19, 0x99, 0x9A, 0x3F, 0x54, 0x7A, 0xE1, }; -COMPILER_STRIP_GATE(8037A4E8, &lit_6991); +COMPILER_STRIP_GATE(0x8037A4E8, &lit_6991); /* 803A9BB8-803A9BD8 -00001 0020+00 1/1 0/0 0/0 .data @7214 */ SECTION_DATA static void* lit_7214[8] = { @@ -1223,7 +1277,14 @@ SECTION_RODATA static u8 const lit_7275[32] = { 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x54, 0x7A, 0xE1, 0x3F, 0x19, 0x99, 0x9A, 0x3F, 0x47, 0xAE, 0x14, 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x47, 0xAE, 0x14, 0x3F, 0x19, 0x99, 0x9A, 0x3F, 0x54, 0x7A, 0xE1, }; -COMPILER_STRIP_GATE(8037A508, &lit_7275); +COMPILER_STRIP_GATE(0x8037A508, &lit_7275); + +/* 8037A578-8037A578 006BD8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8037A5DC = "F_SP103"; +SECTION_DEAD static char const* const stringBase_8037A5E4 = "APPEAR_HAWKER"; +#pragma pop /* 803A9BD8-803A9BF8 -00001 0020+00 1/1 0/0 0/0 .data @7549 */ SECTION_DATA static void* lit_7549[8] = { @@ -1265,14 +1326,14 @@ SECTION_RODATA static u8 const scale_dat[32] = { 0x45, 0xFA, 0x00, 0x00, 0x46, 0x24, 0x10, 0x00, 0x40, 0x4C, 0xCC, 0xCD, 0x3F, 0xE6, 0x66, 0x66, 0x3F, 0xE6, 0x66, 0x66, 0x40, 0xC6, 0x66, 0x66, 0x3F, 0x99, 0x99, 0x9A, 0x40, 0x80, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8037A528, &scale_dat); +COMPILER_STRIP_GATE(0x8037A528, &scale_dat); /* 8037A548-8037A568 006BA8 0020+00 1/1 0/0 0/0 .rodata col_dat$7609 */ SECTION_RODATA static u8 const col_dat[32] = { 0xB4, 0xC8, 0xFF, 0xFF, 0xC8, 0xC8, 0xFF, 0x50, 0xFF, 0x8C, 0x78, 0x5A, 0xFF, 0xB4, 0x78, 0x64, 0xB4, 0xB4, 0x78, 0x55, 0xB4, 0xC8, 0x64, 0x5A, 0xDC, 0xFF, 0xB4, 0x6E, 0xC8, 0xDC, 0xFF, 0x5A, }; -COMPILER_STRIP_GATE(8037A548, &col_dat); +COMPILER_STRIP_GATE(0x8037A548, &col_dat); /* 80450EF0-80450EF4 -00001 0004+00 1/1 0/0 0/0 .sbss None */ /* 80450EF0 0002+00 data_80450EF0 None */ @@ -1411,6 +1472,12 @@ asm void dKyr_drawSibuki(f32 (*param_0)[4], u8** param_1) { #pragma pop /* ############################################################################################## */ +/* 8037A578-8037A578 006BD8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8037A5F2 = "F_NW01"; +#pragma pop + /* 80450F00-80450F04 000400 0004+00 1/1 0/0 0/0 .sbss rot$8366 */ static f32 rot_8366; @@ -1467,6 +1534,12 @@ asm void dKyr_drawHousi(f32 (*param_0)[4], u8** param_1) { #pragma pop /* ############################################################################################## */ +/* 8037A578-8037A578 006BD8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8037A5F9 = "D_MN11"; +#pragma pop + /* 804249B0-804249BC 0516D0 000C+00 0/1 0/0 0/0 .bss @8942 */ #pragma push #pragma force_active on @@ -1589,7 +1662,7 @@ asm void dKyr_drawSnow(f32 (*param_0)[4], u8** param_1) { SECTION_RODATA static u8 const star_col[16] = { 0xFF, 0xBE, 0xC8, 0xA0, 0xC8, 0xFF, 0xBE, 0x78, 0xC8, 0xBE, 0xFF, 0x50, 0xFF, 0xFF, 0xFF, 0xC8, }; -COMPILER_STRIP_GATE(8037A568, &star_col); +COMPILER_STRIP_GATE(0x8037A568, &star_col); /* 80424A10-80424A1C 051730 000C+00 0/1 0/0 0/0 .bss @9425 */ #pragma push @@ -1741,6 +1814,12 @@ asm void drawCloudShadow(f32 (*param_0)[4], u8** param_1) { #pragma pop /* ############################################################################################## */ +/* 8037A578-8037A578 006BD8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8037A600 = "D_MN07"; +#pragma pop + /* 80450F28-80450F2C 000428 0004+00 1/1 0/0 0/0 .sbss howa_loop_cnt$10108 */ static f32 howa_loop_cnt; @@ -1804,6 +1883,12 @@ asm void dKyr_thunder_init() { #pragma pop /* ############################################################################################## */ +/* 8037A578-8037A578 006BD8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8037A607 = "R_SP"; +#pragma pop + /* 804525AC-804525B0 000BAC 0004+00 1/1 0/0 0/0 .sdata2 @10732 */ SECTION_SDATA2 static f32 lit_10732 = 90000.0f; @@ -1939,6 +2024,15 @@ asm void dKyr_mud_draw(f32 (*param_0)[4], u8** param_1) { } #pragma pop +/* ############################################################################################## */ +/* 8037A578-8037A578 006BD8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8037A60C = "F_kumolight_01.bti"; +/* @stringBase0 padding */ +SECTION_DEAD static char const* const pad_8037A61F = ""; +#pragma pop + /* 8006D914-8006DA04 068254 00F0+00 0/0 1/1 1/1 .text dKyr_evil_init__Fv */ #pragma push #pragma optimization_level 0 @@ -2059,30 +2153,4 @@ bool daPy_py_c::getKandelaarFlamePos() { return false; } -/* 8037A578-8037A620 006BD8 00A7+01 25/25 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_8037A578 = "F_SP200"; -SECTION_DEAD static char const* const stringBase_8037A580 = "D_MN09B"; -SECTION_DEAD static char const* const stringBase_8037A588 = "Always"; -SECTION_DEAD static char const* const stringBase_8037A58F = "F_SP122"; -SECTION_DEAD static char const* const stringBase_8037A597 = "R_SP30"; -SECTION_DEAD static char const* const stringBase_8037A59E = "R_SP107"; -SECTION_DEAD static char const* const stringBase_8037A5A6 = "R_SP127"; -SECTION_DEAD static char const* const stringBase_8037A5AE = "F_SP113"; -SECTION_DEAD static char const* const stringBase_8037A5B6 = "D_MN09"; -SECTION_DEAD static char const* const stringBase_8037A5BD = "D_MN08"; -SECTION_DEAD static char const* const stringBase_8037A5C4 = "F_SP127"; -SECTION_DEAD static char const* const stringBase_8037A5CC = "D_MN05A"; -SECTION_DEAD static char const* const stringBase_8037A5D4 = "D_MN07A"; -SECTION_DEAD static char const* const stringBase_8037A5DC = "F_SP103"; -SECTION_DEAD static char const* const stringBase_8037A5E4 = "APPEAR_HAWKER"; -SECTION_DEAD static char const* const stringBase_8037A5F2 = "F_NW01"; -SECTION_DEAD static char const* const stringBase_8037A5F9 = "D_MN11"; -SECTION_DEAD static char const* const stringBase_8037A600 = "D_MN07"; -SECTION_DEAD static char const* const stringBase_8037A607 = "R_SP"; -SECTION_DEAD static char const* const stringBase_8037A60C = "F_kumolight_01.bti"; -/* @stringBase0 padding */ -SECTION_DEAD static char const* const pad_8037A61F = ""; -#pragma pop +/* 8037A578-8037A578 006BD8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/kankyo/d_kankyo_wether.cpp b/src/d/kankyo/d_kankyo_wether.cpp index c183dc94d66..3a24218a662 100644 --- a/src/d/kankyo/d_kankyo_wether.cpp +++ b/src/d/kankyo/d_kankyo_wether.cpp @@ -27,6 +27,12 @@ struct dRes_control_c { struct dPa_levelEcallBack {}; +struct dKy_tevstr_c {}; + +struct csXyz {}; + +struct _GXColor {}; + struct Vec {}; struct cXyz { @@ -40,12 +46,6 @@ struct cXyz { static f32 Zero[3]; }; -struct dKy_tevstr_c {}; - -struct _GXColor {}; - -struct csXyz {}; - struct dPa_control_c { /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, @@ -932,6 +932,13 @@ static asm void dKyw_evil_Draw() { #pragma pop /* ############################################################################################## */ +/* 8037A368-8037A368 0069C8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8037A368 = "F_SP113"; +SECTION_DEAD static char const* const stringBase_8037A370 = "D_MN07"; +#pragma pop + /* 804520E0-804520E4 0006E0 0004+00 12/12 0/0 0/0 .sdata2 @4378 */ SECTION_SDATA2 static u8 lit_4378[4] = { 0x00, @@ -1224,6 +1231,21 @@ asm void dKyw_wether_move() { #pragma pop /* ############################################################################################## */ +/* 8037A368-8037A368 0069C8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8037A377 = "F_SP200"; +SECTION_DEAD static char const* const stringBase_8037A37F = "D_MN09"; +SECTION_DEAD static char const* const stringBase_8037A386 = "D_MN09A"; +SECTION_DEAD static char const* const stringBase_8037A38E = "F_moon.bti"; +SECTION_DEAD static char const* const stringBase_8037A399 = "F_moon_A.bti"; +SECTION_DEAD static char const* const stringBase_8037A3A6 = "F_moon_A_A00.bti"; +SECTION_DEAD static char const* const stringBase_8037A3B7 = "F_moon_A_A01.bti"; +SECTION_DEAD static char const* const stringBase_8037A3C8 = "F_moon_A_A02.bti"; +SECTION_DEAD static char const* const stringBase_8037A3D9 = "F_moon_A_A03.bti"; +SECTION_DEAD static char const* const stringBase_8037A3EA = "Always"; +#pragma pop + /* 804520E8-804520EC 0006E8 0004+00 1/1 0/0 0/0 .sdata2 @4610 */ SECTION_SDATA2 static f32 lit_4610 = 255.0f; @@ -1241,6 +1263,12 @@ static asm void wether_move_sun() { #pragma pop /* ############################################################################################## */ +/* 8037A368-8037A368 0069C8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8037A3F1 = "R_SP127"; +#pragma pop + /* 804520F0-804520F4 0006F0 0004+00 2/2 0/0 0/0 .sdata2 @4668 */ SECTION_SDATA2 static f32 lit_4668 = -1.0f; @@ -1271,6 +1299,14 @@ static asm void wether_move_snow() { #pragma pop /* ############################################################################################## */ +/* 8037A368-8037A368 0069C8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8037A3F9 = "F_SP121"; +SECTION_DEAD static char const* const stringBase_8037A401 = "F_SP122"; +SECTION_DEAD static char const* const stringBase_8037A409 = "F_SP128"; +#pragma pop + /* 80452100-80452104 000700 0004+00 1/1 0/0 0/0 .sdata2 @4761 */ SECTION_SDATA2 static f32 lit_4761 = 330.0f; @@ -1317,6 +1353,21 @@ static asm void wether_move_star() { } #pragma pop +/* ############################################################################################## */ +/* 8037A368-8037A368 0069C8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8037A411 = "D_MN08"; +SECTION_DEAD static char const* const stringBase_8037A418 = "D_MN08A"; +SECTION_DEAD static char const* const stringBase_8037A420 = "D_MN08B"; +SECTION_DEAD static char const* const stringBase_8037A428 = "D_MN08C"; +SECTION_DEAD static char const* const stringBase_8037A430 = "F_SP115"; +SECTION_DEAD static char const* const stringBase_8037A438 = "F_SP108"; +SECTION_DEAD static char const* const stringBase_8037A440 = "F_SP116"; +SECTION_DEAD static char const* const stringBase_8037A448 = "momiji64s3tc.bti"; +SECTION_DEAD static char const* const stringBase_8037A459 = "sakura32ia4.bti"; +#pragma pop + /* 80058F18-800593DC 053858 04C4+00 1/1 0/0 0/0 .text wether_move_housi__Fv */ #pragma push #pragma optimization_level 0 @@ -1348,6 +1399,17 @@ static asm void wether_move_moya() { #pragma pop /* ############################################################################################## */ +/* 8037A368-8037A368 0069C8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8037A469 = "F_SP114"; +SECTION_DEAD static char const* const stringBase_8037A471 = "D_MN09B"; +SECTION_DEAD static char const* const stringBase_8037A479 = "F_SP104"; +SECTION_DEAD static char const* const stringBase_8037A481 = "cloudtx_01.bti"; +SECTION_DEAD static char const* const stringBase_8037A490 = "cloudtx_02.bti"; +SECTION_DEAD static char const* const stringBase_8037A49F = "cloudtx_03.bti"; +#pragma pop + /* 80424938-80424944 051658 000C+00 1/1 0/0 0/0 .bss @4965 */ static u8 lit_4965[12]; @@ -1423,6 +1485,13 @@ static asm void wether_move_evil() { } #pragma pop +/* ############################################################################################## */ +/* 8037A368-8037A368 0069C8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8037A4AE = "Name"; +#pragma pop + /* 8005A0B8-8005A154 0549F8 009C+00 0/0 1/1 0/0 .text dKyw_wether_move_draw__Fv */ #pragma push #pragma optimization_level 0 @@ -1464,6 +1533,14 @@ asm void dKyw_wether_draw2() { #pragma pop /* ############################################################################################## */ +/* 8037A368-8037A368 0069C8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8037A4B3 = "F_SP127"; +/* @stringBase0 padding */ +SECTION_DEAD static char const* const pad_8037A4BB = "\0\0\0\0"; +#pragma pop + /* 80452164-80452168 000764 0004+00 1/1 0/0 0/0 .sdata2 @5361 */ SECTION_SDATA2 static f32 lit_5361 = 120.0f; @@ -1752,43 +1829,4 @@ asm void dKyw_rain_set(int param_0) { } #pragma pop -/* 8037A368-8037A4C0 0069C8 0153+05 12/12 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_8037A368 = "F_SP113"; -SECTION_DEAD static char const* const stringBase_8037A370 = "D_MN07"; -SECTION_DEAD static char const* const stringBase_8037A377 = "F_SP200"; -SECTION_DEAD static char const* const stringBase_8037A37F = "D_MN09"; -SECTION_DEAD static char const* const stringBase_8037A386 = "D_MN09A"; -SECTION_DEAD static char const* const stringBase_8037A38E = "F_moon.bti"; -SECTION_DEAD static char const* const stringBase_8037A399 = "F_moon_A.bti"; -SECTION_DEAD static char const* const stringBase_8037A3A6 = "F_moon_A_A00.bti"; -SECTION_DEAD static char const* const stringBase_8037A3B7 = "F_moon_A_A01.bti"; -SECTION_DEAD static char const* const stringBase_8037A3C8 = "F_moon_A_A02.bti"; -SECTION_DEAD static char const* const stringBase_8037A3D9 = "F_moon_A_A03.bti"; -SECTION_DEAD static char const* const stringBase_8037A3EA = "Always"; -SECTION_DEAD static char const* const stringBase_8037A3F1 = "R_SP127"; -SECTION_DEAD static char const* const stringBase_8037A3F9 = "F_SP121"; -SECTION_DEAD static char const* const stringBase_8037A401 = "F_SP122"; -SECTION_DEAD static char const* const stringBase_8037A409 = "F_SP128"; -SECTION_DEAD static char const* const stringBase_8037A411 = "D_MN08"; -SECTION_DEAD static char const* const stringBase_8037A418 = "D_MN08A"; -SECTION_DEAD static char const* const stringBase_8037A420 = "D_MN08B"; -SECTION_DEAD static char const* const stringBase_8037A428 = "D_MN08C"; -SECTION_DEAD static char const* const stringBase_8037A430 = "F_SP115"; -SECTION_DEAD static char const* const stringBase_8037A438 = "F_SP108"; -SECTION_DEAD static char const* const stringBase_8037A440 = "F_SP116"; -SECTION_DEAD static char const* const stringBase_8037A448 = "momiji64s3tc.bti"; -SECTION_DEAD static char const* const stringBase_8037A459 = "sakura32ia4.bti"; -SECTION_DEAD static char const* const stringBase_8037A469 = "F_SP114"; -SECTION_DEAD static char const* const stringBase_8037A471 = "D_MN09B"; -SECTION_DEAD static char const* const stringBase_8037A479 = "F_SP104"; -SECTION_DEAD static char const* const stringBase_8037A481 = "cloudtx_01.bti"; -SECTION_DEAD static char const* const stringBase_8037A490 = "cloudtx_02.bti"; -SECTION_DEAD static char const* const stringBase_8037A49F = "cloudtx_03.bti"; -SECTION_DEAD static char const* const stringBase_8037A4AE = "Name"; -SECTION_DEAD static char const* const stringBase_8037A4B3 = "F_SP127"; -/* @stringBase0 padding */ -SECTION_DEAD static char const* const pad_8037A4BB = "\0\0\0\0"; -#pragma pop +/* 8037A368-8037A368 0069C8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/map/d_map.cpp b/src/d/map/d_map.cpp index 0811a4447a7..5f04dd65dcb 100644 --- a/src/d/map/d_map.cpp +++ b/src/d/map/d_map.cpp @@ -31,8 +31,6 @@ struct renderingPlusDoorAndCursor_c { /* 80040ADC */ void getIconPosition(dTres_c::typeGroupData_c*) const; }; -struct Vec {}; - struct dDrawPath_c { struct room_class {}; @@ -51,6 +49,8 @@ struct dDrawPath_c { /* 8003CCC4 */ void drawPath(); }; +struct Vec {}; + struct renderingDAmap_c { /* 8002B150 */ ~renderingDAmap_c(); /* 8003FCC8 */ void init(u8*, u16, u16, u16, u16); @@ -386,7 +386,7 @@ SECTION_RODATA static u8 const l_iconSize[68] = { 0xD7, 0x0A, 0x3D, 0xA3, 0xD7, 0x0A, 0x3D, 0xA3, 0xD7, 0x0A, 0x3D, 0xA3, 0xD7, 0x0A, 0x3D, 0xA3, 0xD7, 0x0A, 0x3D, 0xA3, 0xD7, 0x0A, 0x3D, 0xA3, 0xD7, 0x0A, }; -COMPILER_STRIP_GATE(80378E48, &l_iconSize); +COMPILER_STRIP_GATE(0x80378E48, &l_iconSize); /* 800284BC-800284D0 022DFC 0014+00 2/0 0/0 0/0 .text getIconSize__15renderingAmap_cCFUc */ @@ -654,7 +654,7 @@ SECTION_RODATA static u8 const l_dungeon_offColor[36] = { 0x04, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x1C, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x24, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80378E8C, &l_dungeon_offColor); +COMPILER_STRIP_GATE(0x80378E8C, &l_dungeon_offColor); #pragma pop /* 80378EB0-80378ED4 005510 0024+00 0/1 0/0 0/0 .rodata l_dungeon_onColor$3938 */ @@ -665,7 +665,7 @@ SECTION_RODATA static u8 const l_dungeon_onColor[36] = { 0x04, 0x00, 0x00, 0x00, 0x34, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 0x3C, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x44, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80378EB0, &l_dungeon_onColor); +COMPILER_STRIP_GATE(0x80378EB0, &l_dungeon_onColor); #pragma pop /* 80378ED4-80378EF8 005534 0024+00 0/1 0/0 0/0 .rodata l_dungeon_stayColor$3939 */ @@ -676,7 +676,7 @@ SECTION_RODATA static u8 const l_dungeon_stayColor[36] = { 0x04, 0x00, 0x00, 0x00, 0x54, 0x00, 0x00, 0x00, 0x58, 0x00, 0x00, 0x00, 0x5C, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x64, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80378ED4, &l_dungeon_stayColor); +COMPILER_STRIP_GATE(0x80378ED4, &l_dungeon_stayColor); #pragma pop /* 80028DF4-80028EE4 023734 00F0+00 1/0 0/0 0/0 .text getColor__6dMap_cFi */ @@ -735,7 +735,7 @@ asm void renderingAmap_c::getLineColor(int param_0, int param_1) { SECTION_RODATA static u8 const colorTable[16] = { 0xBC, 0x00, 0x00, 0x00, 0xC0, 0x00, 0x00, 0x00, 0xC4, 0x00, 0x00, 0x00, 0xC8, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80378EF8, &colorTable); +COMPILER_STRIP_GATE(0x80378EF8, &colorTable); /* 80028FB4-80029038 0238F4 0084+00 2/0 0/0 0/0 .text getDecoLineColor__15renderingAmap_cFii */ #pragma push @@ -823,7 +823,7 @@ SECTION_RODATA static u8 const l_stayType[28] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80378F08, &l_stayType); +COMPILER_STRIP_GATE(0x80378F08, &l_stayType); /* 80029160-80029190 023AA0 0030+00 7/7 0/0 0/0 .text getStayType__15renderingAmap_cCFv */ @@ -930,6 +930,12 @@ asm void dMap_c::resCopy() { #pragma pop /* ############################################################################################## */ +/* 80378F24-80378F24 005584 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80378F24 = "Always"; +#pragma pop + /* 803A6F6C-803A6F88 -00001 001C+00 1/1 0/0 0/0 .data @4694 */ SECTION_DATA static void* lit_4694[7] = { (void*)(((char*)_move__6dMap_cFffif) + 0x350), (void*)(((char*)_move__6dMap_cFffif) + 0x388), @@ -1190,6 +1196,14 @@ asm void dMap_c::isDrawRoomIcon(int param_0, int param_1) const { #pragma pop /* ############################################################################################## */ +/* 80378F24-80378F24 005584 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80378F2B = "F_SP121"; +/* @stringBase0 padding */ +SECTION_DEAD static char const* const pad_80378F33 = "\0\0\0\0"; +#pragma pop + /* 80451CEC-80451CF0 0002EC 0004+00 1/1 0/0 0/0 .sdata2 @4688 */ SECTION_SDATA2 static f32 lit_4688 = -3710.0f; @@ -1425,12 +1439,4 @@ asm renderingDAmap_c::~renderingDAmap_c() { } #pragma pop -/* 80378F24-80378F38 005584 000F+05 2/2 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80378F24 = "Always"; -SECTION_DEAD static char const* const stringBase_80378F2B = "F_SP121"; -/* @stringBase0 padding */ -SECTION_DEAD static char const* const pad_80378F33 = "\0\0\0\0"; -#pragma pop +/* 80378F24-80378F24 005584 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/map/d_map_path.cpp b/src/d/map/d_map_path.cpp index b6cd3c96e77..ace4b86da7f 100644 --- a/src/d/map/d_map_path.cpp +++ b/src/d/map/d_map_path.cpp @@ -179,7 +179,15 @@ SECTION_RODATA static u8 const data[28] = { 0x00, 0x00, 0x00, 0x4F, 0x00, 0x00, 0x00, 0x50, 0x00, 0x00, 0x00, 0x4D, 0x00, 0x00, 0x00, 0x4E, 0x00, 0x00, 0x00, 0x4C, 0x00, 0x00, 0x00, 0x51, 0x00, 0x00, 0x00, 0x52, }; -COMPILER_STRIP_GATE(80379C30, &data); +COMPILER_STRIP_GATE(0x80379C30, &data); + +/* 80379C4C-80379C4C 0062AC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80379C4C = "Always"; +/* @stringBase0 padding */ +SECTION_DEAD static char const* const pad_80379C53 = "\0\0\0\0"; +#pragma pop /* 8003C85C-8003C8F4 03719C 0098+00 0/0 1/1 0/0 .text create__Q28dMpath_n18dTexObjAggregate_cFv */ #pragma push @@ -415,7 +423,7 @@ asm void __sinit_d_map_path_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_8003D6E4 = (void*)__sinit_d_map_path_cpp; +REGISTER_CTORS(0x8003D6E4, __sinit_d_map_path_cpp); #pragma pop /* 8003D740-8003D790 038080 0050+00 1/1 0/0 0/0 .text __dt__Q28dMpath_n18dTexObjAggregate_cFv */ @@ -479,11 +487,4 @@ SECTION_DATA extern void* __vt__11dDrawPath_c[16] = { (void*)rendering__11dDrawPath_cFPCQ211dDrawPath_c10room_class, }; -/* 80379C4C-80379C58 0062AC 0007+05 1/1 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80379C4C = "Always"; -/* @stringBase0 padding */ -SECTION_DEAD static char const* const pad_80379C53 = "\0\0\0\0"; -#pragma pop +/* 80379C4C-80379C4C 0062AC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/map/d_map_path_dmap.cpp b/src/d/map/d_map_path_dmap.cpp index aac5c39b2c1..3340fecdab1 100644 --- a/src/d/map/d_map_path_dmap.cpp +++ b/src/d/map/d_map_path_dmap.cpp @@ -24,8 +24,6 @@ struct renderingPlusDoor_c { /* 8004145C */ void beforeDrawPath(); }; -struct Vec {}; - struct dTres_c { struct data_s {}; @@ -38,6 +36,8 @@ struct dTres_c { static u8 mTypeGroupListAll[204 + 4 /* padding */]; }; +struct Vec {}; + struct renderingPlusDoorAndCursor_c { /* 8002B008 */ ~renderingPlusDoorAndCursor_c(); /* 800402FC */ void afterDrawPath(); @@ -137,7 +137,7 @@ struct dMpath_n { }; struct dMpath_c { - /* 8003F758 */ void isExistMapPathData(); + /* 8003F758 */ u8 isExistMapPathData(); /* 8003F760 */ void getTopBottomFloorNo(s8*, s8*); /* 8003F7E8 */ void createWork(); /* 8003FA40 */ void setPointer(s8, void*, int); @@ -218,7 +218,7 @@ extern "C" void init__10dMapInfo_cFv(); extern "C" void reset__10dMapInfo_cFv(); extern "C" void create__10dMapInfo_cFv(); extern "C" void remove__10dMapInfo_cFv(); -extern "C" void isExistMapPathData__8dMpath_cFv(); +extern "C" u8 isExistMapPathData__8dMpath_cFv(); extern "C" void getTopBottomFloorNo__8dMpath_cFPScPSc(); extern "C" void createWork__8dMpath_cFv(); extern "C" void setPointer__8dMpath_cFPQ211dDrawPath_c10room_classPScPSc(); @@ -629,32 +629,24 @@ f32 dMpath_c::mAllSizeX; /* 80450E84-80450E88 000384 0004+00 1/1 4/4 0/0 .sbss mAllSizeZ__8dMpath_c */ f32 dMpath_c::mAllSizeZ; -/* 80450E88-80450E90 000388 0008+00 4/4 0/0 0/0 .sbss None */ +/* 80450E88-80450E90 000388 0008+00 4/3 0/0 0/0 .sbss None */ static u8 data_80450E88[8]; -/* 8003F758-8003F760 03A098 0008+00 2/2 1/1 0/0 .text isExistMapPathData__8dMpath_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMpath_c::isExistMapPathData() { - nofralloc -#include "asm/d/map/d_map_path_dmap/isExistMapPathData__8dMpath_cFv.s" +/* 8003F758-8003F760 -00001 0008+00 0/0 0/0 0/0 .text isExistMapPathData__8dMpath_cFv */ +u8 dMpath_c::isExistMapPathData() { + return *(u8*)(&data_80450E88); } -#pragma pop /* ############################################################################################## */ /* 80450630-80450634 0000B0 0004+00 0/0 1/1 2/2 .sdata mNextRoomNo__10dMapInfo_c */ SECTION_SDATA u32 dMapInfo_c::mNextRoomNo = 0xFFFFFFFF; -/* 80450634-80450638 -00001 0004+00 4/4 0/0 0/0 .sdata None */ -SECTION_SDATA static u8 struct_80450634[4] = { +/* 80450634-80450636 -00001 0002+00 3/3 0/0 0/0 .sdata None */ +SECTION_SDATA static u8 struct_80450634[2] = { /* 80450634 0001+00 data_80450634 None */ 0x7F, /* 80450635 0001+00 data_80450635 None */ 0x80, - /* 80450636 0002+00 data_80450636 None */ - 0x01, - 0x00, }; /* 8003F760-8003F7E8 03A0A0 0088+00 0/0 1/1 0/0 .text getTopBottomFloorNo__8dMpath_cFPScPSc */ @@ -708,6 +700,10 @@ asm void dMpath_c::create() { } #pragma pop +/* ############################################################################################## */ +/* 80450636-80450638 0000B6 0002+00 2/2 0/0 0/0 .sdata None */ +SECTION_SDATA static u16 data_80450636 = 0x0100; + /* 8003FBD0-8003FC70 03A510 00A0+00 2/2 0/0 0/0 .text reset__8dMpath_cFv */ #pragma push #pragma optimization_level 0 @@ -1036,7 +1032,7 @@ SECTION_RODATA static u8 const l_100x100BoxVertexList[48] = { 0xC2, 0x48, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0x48, 0x00, 0x00, 0x42, 0x48, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC2, 0x48, 0x00, 0x00, 0x42, 0x48, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80379C58, &l_100x100BoxVertexList); +COMPILER_STRIP_GATE(0x80379C58, &l_100x100BoxVertexList); /* 80451E70-80451E74 000470 0004+00 1/1 0/0 0/0 .sdata2 @4484 */ SECTION_SDATA2 static f32 lit_4484 = 6.0f; @@ -1140,7 +1136,7 @@ SECTION_RODATA static void* const l_treasureDispList_4524[12] = { (void*)NULL, (void*)0x00000001, (void*)&l_treasureStartColor, (void*)0x05000000, (void*)0x00000003, (void*)&l_destinationStartColor, }; -COMPILER_STRIP_GATE(80379C88, &l_treasureDispList_4524); +COMPILER_STRIP_GATE(0x80379C88, &l_treasureDispList_4524); /* 80451E74-80451E78 000474 0004+00 1/0 0/0 0/0 .sdata2 l_entranceStartColor */ SECTION_SDATA2 static u32 l_entranceStartColor = 0x94000000; @@ -1232,7 +1228,7 @@ SECTION_RODATA static void* const l_treasureDispList_4606[33] = { (void*)0x04000000, (void*)0x00000004, (void*)&l_smallKeyStartColor, (void*)0x03000000, (void*)0x00000004, (void*)&l_bossStartColor, }; -COMPILER_STRIP_GATE(80379CB8, &l_treasureDispList_4606); +COMPILER_STRIP_GATE(0x80379CB8, &l_treasureDispList_4606); /* 80451EAC-80451EB4 0004AC 0008+00 1/1 0/0 0/0 .sdata2 l_iconTex0$4605 */ SECTION_SDATA2 static u8 l_iconTex0_4605[8] = { @@ -1264,7 +1260,7 @@ SECTION_RODATA static u8 const l_iconPosData[32] = { 0xC2, 0x48, 0x00, 0x00, 0x42, 0x48, 0x00, 0x00, 0x42, 0x48, 0x00, 0x00, 0x42, 0x48, 0x00, 0x00, 0x42, 0x48, 0x00, 0x00, 0xC2, 0x48, 0x00, 0x00, 0xC2, 0x48, 0x00, 0x00, 0xC2, 0x48, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80379D3C, &l_iconPosData); +COMPILER_STRIP_GATE(0x80379D3C, &l_iconPosData); /* 80041208-800412C0 03BB48 00B8+00 2/2 0/0 0/0 .text * drawIconSingle__28renderingPlusDoorAndCursor_cFRC3Vecff */ @@ -1285,7 +1281,7 @@ SECTION_RODATA static u8 const l_offset[36] = { 0xC3, 0x48, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC3, 0x70, 0x00, 0x00, 0x43, 0x48, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC3, 0x70, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80379D5C, &l_offset); +COMPILER_STRIP_GATE(0x80379D5C, &l_offset); /* 80450638-80450640 0000B8 0004+04 1/1 0/0 0/0 .sdata l_cursorColor$4709 */ SECTION_SDATA static u8 l_cursorColor[4 + 4 /* padding */] = { @@ -1336,7 +1332,7 @@ asm void __sinit_d_map_path_dmap_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80041460 = (void*)__sinit_d_map_path_dmap_cpp; +REGISTER_CTORS(0x80041460, __sinit_d_map_path_dmap_cpp); #pragma pop /* ############################################################################################## */ diff --git a/src/d/menu/d_menu_calibration.cpp b/src/d/menu/d_menu_calibration.cpp index c9e41934ddb..9eee429f9e3 100644 --- a/src/d/menu/d_menu_calibration.cpp +++ b/src/d/menu/d_menu_calibration.cpp @@ -53,10 +53,10 @@ struct dMenu_Calibration_c { /* 801AFBF4 */ void draw(); }; -struct Vec {}; - struct JAISoundID {}; +struct Vec {}; + struct Z2SeMgr { /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); }; @@ -475,6 +475,15 @@ asm void dMenu_Calibration_c::setCalibrationValue() { } #pragma pop +/* ############################################################################################## */ +/* 80394F70-80394F70 0215D0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80394F70 = ""; +/* @stringBase0 padding */ +SECTION_DEAD static char const* const pad_80394F71 = "\0\0\0\0\0\0"; +#pragma pop + /* 801AF738-801AF7E8 1AA078 00B0+00 6/6 0/0 0/0 .text setAButtonString__19dMenu_Calibration_cFUs */ #pragma push @@ -550,14 +559,7 @@ asm void __sinit_d_menu_calibration_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_801AFC14 = (void*)__sinit_d_menu_calibration_cpp; +REGISTER_CTORS(0x801AFC14, __sinit_d_menu_calibration_cpp); #pragma pop -/* 80394F70-80394F78 0215D0 0001+07 4/4 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80394F70 = ""; -/* @stringBase0 padding */ -SECTION_DEAD static char const* const pad_80394F71 = "\0\0\0\0\0\0"; -#pragma pop +/* 80394F70-80394F70 0215D0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/menu/d_menu_collect.cpp b/src/d/menu/d_menu_collect.cpp index 5d392d5e8a8..d81aa008f54 100644 --- a/src/d/menu/d_menu_collect.cpp +++ b/src/d/menu/d_menu_collect.cpp @@ -76,10 +76,10 @@ struct dSv_event_c { /* 800349BC */ void isEventBit(u16) const; }; -struct JKRArchive {}; - struct J2DPane {}; +struct JKRArchive {}; + struct dSelect_cursor_c { /* 80194220 */ dSelect_cursor_c(u8, f32, JKRArchive*); /* 801950F4 */ void setPos(f32, f32, J2DPane*, bool); @@ -120,6 +120,16 @@ struct dMenu_save_c { /* 801F69B8 */ void _draw(); }; +struct STControl { + /* 8003219C */ void checkTrigger(); + /* 8003242C */ void checkLeftTrigger(); + /* 800324A8 */ void checkRightTrigger(); + /* 80032524 */ void checkUpTrigger(); + /* 800325A0 */ void checkDownTrigger(); +}; + +struct CSTControl {}; + struct JKRHeap { /* 802CE5CC */ void freeAll(); /* 802CE784 */ void getTotalFreeSize(); @@ -129,16 +139,6 @@ struct JKRExpHeap { /* 802CEE2C */ void create(u32, JKRHeap*, bool); }; -struct CSTControl {}; - -struct STControl { - /* 8003219C */ void checkTrigger(); - /* 8003242C */ void checkLeftTrigger(); - /* 800324A8 */ void checkRightTrigger(); - /* 80032524 */ void checkUpTrigger(); - /* 800325A0 */ void checkDownTrigger(); -}; - struct dMenu_Skill_c { /* 801F7224 */ dMenu_Skill_c(JKRExpHeap*, STControl*, CSTControl*); /* 801F7718 */ void _move(); @@ -305,10 +305,10 @@ struct dDlst_list_c { /* 80056794 */ void set(dDlst_base_c**&, dDlst_base_c**&, dDlst_base_c*); }; -struct Vec {}; - struct JAISoundID {}; +struct Vec {}; + struct Z2SeMgr { /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); }; @@ -709,6 +709,30 @@ extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; // /* ############################################################################################## */ +/* 80395330-80395330 021990 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80395330 = "zelda_collect_soubi_screen.blo"; +SECTION_DEAD static char const* const stringBase_8039534F = "zelda_collect_soubi_do_icon_parts.blo"; +SECTION_DEAD static char const* const stringBase_80395375 = "tt_block8x8.bti"; +SECTION_DEAD static char const* const stringBase_80395385 = ""; +SECTION_DEAD static char const* const stringBase_80395386 = "zelda_collect_soubi_screen.btk"; +SECTION_DEAD static char const* const stringBase_803953A5 = "md_mask_parts_spin_1.bck"; +SECTION_DEAD static char const* const stringBase_803953BE = "md_mask_parts_spin_2.bck"; +SECTION_DEAD static char const* const stringBase_803953D7 = "md_mask_parts_spin_3.bck"; +SECTION_DEAD static char const* const stringBase_803953F0 = "md_mask_parts_spin_4.bck"; +SECTION_DEAD static char const* const stringBase_80395409 = "md_mask_parts_spin_1.brk"; +SECTION_DEAD static char const* const stringBase_80395422 = "md_mask_parts_spin_2_3.brk"; +SECTION_DEAD static char const* const stringBase_8039543D = "md_mask_parts_spin_4.brk"; +SECTION_DEAD static char const* const stringBase_80395456 = "md_mask_UI.bmd"; +SECTION_DEAD static char const* const stringBase_80395465 = "kageri_mirrer_spin_1.bck"; +SECTION_DEAD static char const* const stringBase_8039547E = "kageri_mirrer_spin_2.bck"; +SECTION_DEAD static char const* const stringBase_80395497 = "kageri_mirrer_spin_3.bck"; +SECTION_DEAD static char const* const stringBase_803954B0 = "kageri_mirrer_spin_4.bck"; +SECTION_DEAD static char const* const stringBase_803954C9 = "kageri_mirrer_spin_1.brk"; +SECTION_DEAD static char const* const stringBase_803954E2 = "kageri_mirrer_spin_2_3_4.brk"; +#pragma pop + /* 803BC380-803BC38C 0194A0 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -1332,7 +1356,7 @@ SECTION_RODATA static u8 const lit_3778[12 + 4 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80394F78, &lit_3778); +COMPILER_STRIP_GATE(0x80394F78, &lit_3778); /* 80394F88-80394FA0 0215E8 0018+00 0/1 0/0 0/0 .rodata text_sv$4768 */ #pragma push @@ -1341,7 +1365,7 @@ SECTION_RODATA static u8 const text_sv[24] = { 0x00, 0x00, 0x00, 0x73, 0x61, 0x76, 0x5F, 0x30, 0x00, 0x00, 0x00, 0x73, 0x61, 0x76, 0x5F, 0x31, 0x00, 0x00, 0x00, 0x73, 0x61, 0x76, 0x5F, 0x32, }; -COMPILER_STRIP_GATE(80394F88, &text_sv); +COMPILER_STRIP_GATE(0x80394F88, &text_sv); #pragma pop /* 80394FA0-80394FB8 021600 0018+00 0/1 0/0 0/0 .rodata text_op$4769 */ @@ -1351,7 +1375,7 @@ SECTION_RODATA static u8 const text_op[24] = { 0x00, 0x00, 0x00, 0x6F, 0x70, 0x74, 0x5F, 0x30, 0x00, 0x00, 0x00, 0x6F, 0x70, 0x74, 0x5F, 0x31, 0x00, 0x00, 0x00, 0x6F, 0x70, 0x74, 0x5F, 0x32, }; -COMPILER_STRIP_GATE(80394FA0, &text_op); +COMPILER_STRIP_GATE(0x80394FA0, &text_op); #pragma pop /* 80394FB8-80394FD0 021618 0018+00 0/1 0/0 0/0 .rodata ftext_sv$4770 */ @@ -1361,7 +1385,7 @@ SECTION_RODATA static u8 const ftext_sv[24] = { 0x00, 0x66, 0x5F, 0x73, 0x61, 0x76, 0x5F, 0x30, 0x00, 0x66, 0x5F, 0x73, 0x61, 0x76, 0x5F, 0x31, 0x00, 0x66, 0x5F, 0x73, 0x61, 0x76, 0x5F, 0x32, }; -COMPILER_STRIP_GATE(80394FB8, &ftext_sv); +COMPILER_STRIP_GATE(0x80394FB8, &ftext_sv); #pragma pop /* 80394FD0-80394FE8 021630 0018+00 0/1 0/0 0/0 .rodata ftext_op$4771 */ @@ -1371,7 +1395,7 @@ SECTION_RODATA static u8 const ftext_op[24] = { 0x00, 0x66, 0x5F, 0x6F, 0x70, 0x74, 0x5F, 0x30, 0x00, 0x66, 0x5F, 0x6F, 0x70, 0x74, 0x5F, 0x31, 0x00, 0x66, 0x5F, 0x6F, 0x70, 0x74, 0x5F, 0x32, }; -COMPILER_STRIP_GATE(80394FD0, &ftext_op); +COMPILER_STRIP_GATE(0x80394FD0, &ftext_op); #pragma pop /* 80394FE8-80395010 021648 0028+00 0/1 0/0 0/0 .rodata text_a_tag$4777 */ @@ -1382,7 +1406,7 @@ SECTION_RODATA static u8 const text_a_tag_4777[40] = { 0x5F, 0x32, 0x61, 0x74, 0x65, 0x78, 0x74, 0x31, 0x5F, 0x33, 0x61, 0x74, 0x65, 0x78, 0x74, 0x31, 0x5F, 0x34, 0x61, 0x74, 0x65, 0x78, 0x74, 0x31, 0x5F, 0x35, }; -COMPILER_STRIP_GATE(80394FE8, &text_a_tag_4777); +COMPILER_STRIP_GATE(0x80394FE8, &text_a_tag_4777); #pragma pop /* 80395010-80395038 021670 0028+00 0/1 0/0 0/0 .rodata text_b_tag$4778 */ @@ -1393,7 +1417,7 @@ SECTION_RODATA static u8 const text_b_tag_4778[40] = { 0x5F, 0x32, 0x62, 0x74, 0x65, 0x78, 0x74, 0x31, 0x5F, 0x33, 0x62, 0x74, 0x65, 0x78, 0x74, 0x31, 0x5F, 0x34, 0x62, 0x74, 0x65, 0x78, 0x74, 0x31, 0x5F, 0x35, }; -COMPILER_STRIP_GATE(80395010, &text_b_tag_4778); +COMPILER_STRIP_GATE(0x80395010, &text_b_tag_4778); #pragma pop /* 80453F30-80453F34 002530 0004+00 2/2 0/0 0/0 .sdata2 @5173 */ @@ -1476,7 +1500,7 @@ SECTION_RODATA static u8 const lit_5343[9 + 3 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80395038, &lit_5343); +COMPILER_STRIP_GATE(0x80395038, &lit_5343); /* 80395044-80395050 0216A4 0009+03 1/1 0/0 0/0 .rodata @5344 */ SECTION_RODATA static u8 const lit_5344[9 + 3 /* padding */] = { @@ -1494,7 +1518,7 @@ SECTION_RODATA static u8 const lit_5344[9 + 3 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80395044, &lit_5344); +COMPILER_STRIP_GATE(0x80395044, &lit_5344); /* 80453F50-80453F54 002550 0004+00 1/1 0/0 0/0 .sdata2 @5402 */ SECTION_SDATA2 static u32 lit_5402 = 0x03020301; @@ -1615,7 +1639,7 @@ SECTION_RODATA static u8 const smell_tag[40] = { 0x68, 0x69, 0x77, 0x6F, 0x6C, 0x66, 0x5F, 0x66, 0x69, 0x73, 0x77, 0x6F, 0x6C, 0x66, 0x5F, 0x69, 0x72, 0x69, 0x77, 0x6F, 0x6C, 0x66, 0x5F, 0x70, 0x6F, 0x75, }; -COMPILER_STRIP_GATE(80395050, &smell_tag); +COMPILER_STRIP_GATE(0x80395050, &smell_tag); /* 801B3524-801B3640 1ADE64 011C+00 1/1 0/0 0/0 .text setSmellType__17dMenu_Collect2D_cFv */ @@ -1634,7 +1658,7 @@ SECTION_RODATA static u8 const heart_tag[32] = { 0x68, 0x65, 0x61, 0x72, 0x74, 0x5F, 0x31, 0x6E, 0x68, 0x65, 0x61, 0x72, 0x74, 0x5F, 0x32, 0x6E, 0x68, 0x65, 0x61, 0x72, 0x74, 0x5F, 0x33, 0x6E, 0x68, 0x65, 0x61, 0x72, 0x74, 0x5F, 0x34, 0x6E, }; -COMPILER_STRIP_GATE(80395078, &heart_tag); +COMPILER_STRIP_GATE(0x80395078, &heart_tag); /* 801B3640-801B370C 1ADF80 00CC+00 1/1 0/0 0/0 .text setHeartPiece__17dMenu_Collect2D_cFv */ #pragma push @@ -1661,7 +1685,7 @@ asm void dMenu_Collect2D_c::setPohMaxNum(u8 param_0) { SECTION_RODATA static u8 const tag_5980[16] = { 0x00, 0x6B, 0x65, 0x6E, 0x5F, 0x67, 0x5F, 0x30, 0x00, 0x6B, 0x65, 0x6E, 0x5F, 0x67, 0x5F, 0x31, }; -COMPILER_STRIP_GATE(80395098, &tag_5980); +COMPILER_STRIP_GATE(0x80395098, &tag_5980); /* 801B39D0-801B3CF4 1AE310 0324+00 2/2 0/0 0/0 .text * setEquipItemFrameColorSword__17dMenu_Collect2D_cFi */ @@ -1679,7 +1703,7 @@ asm void dMenu_Collect2D_c::setEquipItemFrameColorSword(int param_0) { SECTION_RODATA static u8 const tag_6100[16] = { 0x74, 0x61, 0x74, 0x65, 0x5F, 0x67, 0x5F, 0x30, 0x74, 0x61, 0x74, 0x65, 0x5F, 0x67, 0x5F, 0x31, }; -COMPILER_STRIP_GATE(803950A8, &tag_6100); +COMPILER_STRIP_GATE(0x803950A8, &tag_6100); /* 801B3CF4-801B3FDC 1AE634 02E8+00 2/2 0/0 0/0 .text * setEquipItemFrameColorShield__17dMenu_Collect2D_cFi */ @@ -1698,7 +1722,7 @@ SECTION_RODATA static u8 const tag_6213[24] = { 0x66, 0x75, 0x6B, 0x75, 0x5F, 0x67, 0x5F, 0x30, 0x66, 0x75, 0x6B, 0x75, 0x5F, 0x67, 0x5F, 0x31, 0x66, 0x75, 0x6B, 0x75, 0x5F, 0x67, 0x5F, 0x32, }; -COMPILER_STRIP_GATE(803950B8, &tag_6213); +COMPILER_STRIP_GATE(0x803950B8, &tag_6213); /* 801B3FDC-801B42D8 1AE91C 02FC+00 2/2 0/0 0/0 .text * setEquipItemFrameColorClothes__17dMenu_Collect2D_cFi */ @@ -1720,7 +1744,7 @@ SECTION_RODATA static u8 const kaz_n[72] = { 0x5F, 0x30, 0x35, 0x00, 0x00, 0x75, 0x7A, 0x75, 0x5F, 0x30, 0x36, 0x00, 0x00, 0x75, 0x7A, 0x75, 0x5F, 0x30, 0x37, 0x00, 0x00, 0x00, 0x68, 0x69, 0x73, 0x68, 0x69, }; -COMPILER_STRIP_GATE(803950D0, &kaz_n); +COMPILER_STRIP_GATE(0x803950D0, &kaz_n); /* 801B42D8-801B46FC 1AEC18 0424+00 2/2 0/0 0/0 .text setHIO__17dMenu_Collect2D_cFb */ #pragma push @@ -1757,7 +1781,7 @@ SECTION_RODATA static u8 const itemTag[336] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80395118, &itemTag); +COMPILER_STRIP_GATE(0x80395118, &itemTag); /* 801B46FC-801B473C 1AF03C 0040+00 3/3 0/0 0/0 .text getItemTag__17dMenu_Collect2D_cFiib */ @@ -2204,7 +2228,7 @@ SECTION_RODATA static u8 const text_a_tag_7111[40] = { 0x5F, 0x32, 0x61, 0x74, 0x65, 0x78, 0x74, 0x31, 0x5F, 0x33, 0x61, 0x74, 0x65, 0x78, 0x74, 0x31, 0x5F, 0x34, 0x61, 0x74, 0x65, 0x78, 0x74, 0x31, 0x5F, 0x35, }; -COMPILER_STRIP_GATE(80395268, &text_a_tag_7111); +COMPILER_STRIP_GATE(0x80395268, &text_a_tag_7111); /* 801B5FB4-801B60B8 1B08F4 0104+00 20/20 0/0 0/0 .text setAButtonString__17dMenu_Collect2D_cFUs */ @@ -2224,7 +2248,7 @@ SECTION_RODATA static u8 const text_b_tag_7134[40] = { 0x5F, 0x32, 0x62, 0x74, 0x65, 0x78, 0x74, 0x31, 0x5F, 0x33, 0x62, 0x74, 0x65, 0x78, 0x74, 0x31, 0x5F, 0x34, 0x62, 0x74, 0x65, 0x78, 0x74, 0x31, 0x5F, 0x35, }; -COMPILER_STRIP_GATE(80395290, &text_b_tag_7134); +COMPILER_STRIP_GATE(0x80395290, &text_b_tag_7134); /* 801B60B8-801B61BC 1B09F8 0104+00 20/20 0/0 0/0 .text setBButtonString__17dMenu_Collect2D_cFUs */ @@ -2423,7 +2447,7 @@ SECTION_RODATA static u8 const m_kamen_offset_x[20] = { 0xC1, 0x60, 0x00, 0x00, 0xC1, 0x60, 0x00, 0x00, 0xC1, 0x60, 0x00, 0x00, 0x3F, 0xA6, 0x66, 0x66, 0x40, 0xD0, 0x00, 0x00, }; -COMPILER_STRIP_GATE(803952B8, &m_kamen_offset_x); +COMPILER_STRIP_GATE(0x803952B8, &m_kamen_offset_x); #pragma pop /* 803952CC-803952E0 02192C 0014+00 0/1 0/0 0/0 .rodata m_kamen_offset_y$7579 */ @@ -2433,7 +2457,7 @@ SECTION_RODATA static u8 const m_kamen_offset_y[20] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41, 0xB0, 0x00, 0x00, 0x41, 0xF0, 0x00, 0x00, }; -COMPILER_STRIP_GATE(803952CC, &m_kamen_offset_y); +COMPILER_STRIP_GATE(0x803952CC, &m_kamen_offset_y); #pragma pop /* 803952E0-803952F4 021940 0014+00 0/1 0/0 0/0 .rodata m_kamen_scale$7580 */ @@ -2443,7 +2467,7 @@ SECTION_RODATA static u8 const m_kamen_scale[20] = { 0x40, 0x26, 0x66, 0x66, 0x40, 0x26, 0x66, 0x66, 0x40, 0x0C, 0xCC, 0xCD, 0x3F, 0xE6, 0x66, 0x66, 0x3F, 0xE6, 0x66, 0x66, }; -COMPILER_STRIP_GATE(803952E0, &m_kamen_scale); +COMPILER_STRIP_GATE(0x803952E0, &m_kamen_scale); #pragma pop /* 801B7014-801B71C4 1B1954 01B0+00 1/1 0/0 0/0 .text createMaskModel__17dMenu_Collect3D_cFv */ @@ -2464,7 +2488,7 @@ SECTION_RODATA static u8 const m_mirror_offset_x[20] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(803952F4, &m_mirror_offset_x); +COMPILER_STRIP_GATE(0x803952F4, &m_mirror_offset_x); #pragma pop /* 80395308-8039531C 021968 0014+00 0/1 0/0 0/0 .rodata m_mirror_offset_y$7683 */ @@ -2474,7 +2498,7 @@ SECTION_RODATA static u8 const m_mirror_offset_y[20] = { 0x40, 0x80, 0x00, 0x00, 0x40, 0x80, 0x00, 0x00, 0x40, 0x80, 0x00, 0x00, 0x40, 0x80, 0x00, 0x00, 0x40, 0x80, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80395308, &m_mirror_offset_y); +COMPILER_STRIP_GATE(0x80395308, &m_mirror_offset_y); #pragma pop /* 8039531C-80395330 02197C 0014+00 0/1 0/0 0/0 .rodata m_mirror_scale$7684 */ @@ -2484,7 +2508,15 @@ SECTION_RODATA static u8 const m_mirror_scale[20] = { 0x3F, 0x19, 0x99, 0x9A, 0x3F, 0x19, 0x99, 0x9A, 0x3F, 0x19, 0x99, 0x9A, 0x3F, 0x19, 0x99, 0x9A, 0x3F, 0x19, 0x99, 0x9A, }; -COMPILER_STRIP_GATE(8039531C, &m_mirror_scale); +COMPILER_STRIP_GATE(0x8039531C, &m_mirror_scale); +#pragma pop + +/* 80395330-80395330 021990 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_803954FF = "kageri_mirrer_UI.bmd"; +/* @stringBase0 padding */ +SECTION_DEAD static char const* const pad_80395514 = "\0\0\0"; #pragma pop /* 801B71C4-801B7434 1B1B04 0270+00 1/1 0/0 0/0 .text createMirrorModel__17dMenu_Collect3D_cFv */ @@ -2677,7 +2709,7 @@ asm void __sinit_d_menu_collect_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_801B7B14 = (void*)__sinit_d_menu_collect_cpp; +REGISTER_CTORS(0x801B7B14, __sinit_d_menu_collect_cpp); #pragma pop /* 801B7EB8-801B7F00 1B27F8 0048+00 1/0 0/0 0/0 .text __dt__20dMenu_Collect2DTop_cFv */ @@ -2700,30 +2732,4 @@ asm void dMenu_Collect2D_c::draw() { } #pragma pop -/* 80395330-80395518 021990 01E4+04 13/9 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80395330 = "zelda_collect_soubi_screen.blo"; -SECTION_DEAD static char const* const stringBase_8039534F = "zelda_collect_soubi_do_icon_parts.blo"; -SECTION_DEAD static char const* const stringBase_80395375 = "tt_block8x8.bti"; -SECTION_DEAD static char const* const stringBase_80395385 = ""; -SECTION_DEAD static char const* const stringBase_80395386 = "zelda_collect_soubi_screen.btk"; -SECTION_DEAD static char const* const stringBase_803953A5 = "md_mask_parts_spin_1.bck"; -SECTION_DEAD static char const* const stringBase_803953BE = "md_mask_parts_spin_2.bck"; -SECTION_DEAD static char const* const stringBase_803953D7 = "md_mask_parts_spin_3.bck"; -SECTION_DEAD static char const* const stringBase_803953F0 = "md_mask_parts_spin_4.bck"; -SECTION_DEAD static char const* const stringBase_80395409 = "md_mask_parts_spin_1.brk"; -SECTION_DEAD static char const* const stringBase_80395422 = "md_mask_parts_spin_2_3.brk"; -SECTION_DEAD static char const* const stringBase_8039543D = "md_mask_parts_spin_4.brk"; -SECTION_DEAD static char const* const stringBase_80395456 = "md_mask_UI.bmd"; -SECTION_DEAD static char const* const stringBase_80395465 = "kageri_mirrer_spin_1.bck"; -SECTION_DEAD static char const* const stringBase_8039547E = "kageri_mirrer_spin_2.bck"; -SECTION_DEAD static char const* const stringBase_80395497 = "kageri_mirrer_spin_3.bck"; -SECTION_DEAD static char const* const stringBase_803954B0 = "kageri_mirrer_spin_4.bck"; -SECTION_DEAD static char const* const stringBase_803954C9 = "kageri_mirrer_spin_1.brk"; -SECTION_DEAD static char const* const stringBase_803954E2 = "kageri_mirrer_spin_2_3_4.brk"; -SECTION_DEAD static char const* const stringBase_803954FF = "kageri_mirrer_UI.bmd"; -/* @stringBase0 padding */ -SECTION_DEAD static char const* const pad_80395514 = "\0\0\0"; -#pragma pop +/* 80395330-80395330 021990 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/menu/d_menu_dmap.cpp b/src/d/menu/d_menu_dmap.cpp index 5898151ff97..7aecff476fb 100644 --- a/src/d/menu/d_menu_dmap.cpp +++ b/src/d/menu/d_menu_dmap.cpp @@ -50,8 +50,6 @@ struct dSv_event_c { /* 800349BC */ void isEventBit(u16) const; }; -struct JKRArchive {}; - struct J2DBasePosition {}; struct J2DPane { @@ -59,6 +57,8 @@ struct J2DPane { /* 802F76F8 */ void setBasePosition(J2DBasePosition); }; +struct JKRArchive {}; + struct dSelect_cursor_c { /* 80194220 */ dSelect_cursor_c(u8, f32, JKRArchive*); /* 801950F4 */ void setPos(f32, f32, J2DPane*, bool); @@ -95,8 +95,6 @@ struct dMeterHaihai_c { /* 8020BC20 */ void setScale(f32); }; -struct JMSMesgEntry_c {}; - struct ResTIMG {}; struct J2DPicture { @@ -105,6 +103,8 @@ struct J2DPicture { /* 802FC708 */ J2DPicture(ResTIMG const*); }; +struct JMSMesgEntry_c {}; + struct dMeter2Info_c { /* 8021C250 */ void getString(u32, char*, JMSMesgEntry_c*); /* 8021C544 */ void getStringKanji(u32, char*, JMSMesgEntry_c*); @@ -140,12 +140,6 @@ struct dMenu_StageMapCtrl_c { /* 801C2590 */ void setPlusZoomCenterZ(f32); }; -struct J2DOrthoGraph {}; - -struct JKRExpHeap { - /* 802CEE2C */ void create(u32, JKRHeap*, bool); -}; - struct STControl { /* 80032044 */ STControl(s16, s16, s16, s16, f32, f32, s16, s16); /* 8003219C */ void checkTrigger(); @@ -155,6 +149,12 @@ struct STControl { /* 800325A0 */ void checkDownTrigger(); }; +struct J2DOrthoGraph {}; + +struct JKRExpHeap { + /* 802CEE2C */ void create(u32, JKRHeap*, bool); +}; + struct dMenu_ItemExplain_c { /* 801DA754 */ dMenu_ItemExplain_c(JKRExpHeap*, JKRArchive*, STControl*, bool); /* 801DB470 */ void move(); @@ -162,6 +162,8 @@ struct dMenu_ItemExplain_c { /* 801DC3C8 */ void openExplainDmap(u8, u8, u8, bool, u8); }; +struct CSTControl {}; + struct JGeometry { template struct TBox2 {}; @@ -180,8 +182,6 @@ struct J2DScreen { /* 802F9690 */ void animation(); }; -struct CSTControl {}; - struct dMenu_Dmap_c { /* 801BB498 */ dMenu_Dmap_c(JKRExpHeap*, STControl*, CSTControl*, u8, u8); /* 801BB634 */ void screenInit(); @@ -291,10 +291,10 @@ struct dDlst_list_c { /* 80056794 */ void set(dDlst_base_c**&, dDlst_base_c**&, dDlst_base_c*); }; -struct Vec {}; - struct JAISoundID {}; +struct Vec {}; + struct Z2SeMgr { /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); /* 802AC50C */ void seStartLevel(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); @@ -602,6 +602,12 @@ extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; // /* ############################################################################################## */ +/* 80395760-80395760 021DC0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80395760 = "/res/FieldMap/D_MN10.arc"; +#pragma pop + /* 803BC7E0-803BC7EC 019900 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -1170,6 +1176,13 @@ asm dMenu_DmapBg_c::dMenu_DmapBg_c(JKRExpHeap* param_0, STControl* param_1) { #pragma pop /* ############################################################################################## */ +/* 80395760-80395760 021DC0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80395779 = "zelda_dungeon_map_map.blo"; +SECTION_DEAD static char const* const stringBase_80395793 = "zelda_dungeon_map_map.btk"; +#pragma pop + /* 80453FF0-80453FF4 0025F0 0004+00 1/1 0/0 0/0 .sdata2 @4073 */ SECTION_SDATA2 static f32 lit_4073 = -15.0f; @@ -1243,7 +1256,7 @@ SECTION_RODATA static u8 const cont_at_4145[40] = { 0x74, 0x31, 0x63, 0x6F, 0x6E, 0x74, 0x5F, 0x61, 0x74, 0x32, 0x63, 0x6F, 0x6E, 0x74, 0x5F, 0x61, 0x74, 0x33, 0x63, 0x6F, 0x6E, 0x74, 0x5F, 0x61, 0x74, 0x34, }; -COMPILER_STRIP_GATE(80395518, &cont_at_4145); +COMPILER_STRIP_GATE(0x80395518, &cont_at_4145); /* 80395540-80395568 021BA0 0028+00 0/1 0/0 0/0 .rodata cont_bt$4146 */ #pragma push @@ -1253,7 +1266,7 @@ SECTION_RODATA static u8 const cont_bt_4146[40] = { 0x74, 0x31, 0x63, 0x6F, 0x6E, 0x74, 0x5F, 0x62, 0x74, 0x32, 0x63, 0x6F, 0x6E, 0x74, 0x5F, 0x62, 0x74, 0x33, 0x63, 0x6F, 0x6E, 0x74, 0x5F, 0x62, 0x74, 0x34, }; -COMPILER_STRIP_GATE(80395540, &cont_bt_4146); +COMPILER_STRIP_GATE(0x80395540, &cont_bt_4146); #pragma pop /* 80395568-80395590 021BC8 0028+00 0/1 0/0 0/0 .rodata font_at$4147 */ @@ -1264,7 +1277,7 @@ SECTION_RODATA static u8 const font_at[40] = { 0x74, 0x31, 0x66, 0x6F, 0x6E, 0x74, 0x5F, 0x61, 0x74, 0x32, 0x66, 0x6F, 0x6E, 0x74, 0x5F, 0x61, 0x74, 0x33, 0x66, 0x6F, 0x6E, 0x74, 0x5F, 0x61, 0x74, 0x34, }; -COMPILER_STRIP_GATE(80395568, &font_at); +COMPILER_STRIP_GATE(0x80395568, &font_at); #pragma pop /* 80395590-803955B8 021BF0 0028+00 0/1 0/0 0/0 .rodata font_bt$4148 */ @@ -1275,7 +1288,7 @@ SECTION_RODATA static u8 const font_bt[40] = { 0x74, 0x31, 0x66, 0x6F, 0x6E, 0x74, 0x5F, 0x62, 0x74, 0x32, 0x66, 0x6F, 0x6E, 0x74, 0x5F, 0x62, 0x74, 0x33, 0x66, 0x6F, 0x6E, 0x74, 0x5F, 0x62, 0x74, 0x34, }; -COMPILER_STRIP_GATE(80395590, &font_bt); +COMPILER_STRIP_GATE(0x80395590, &font_bt); #pragma pop /* 803955B8-803955C8 021C18 0010+00 0/1 0/0 0/0 .rodata c_tag$4155 */ @@ -1284,7 +1297,14 @@ COMPILER_STRIP_GATE(80395590, &font_bt); SECTION_RODATA static u8 const c_tag_4155[16] = { 0x66, 0x5F, 0x74, 0x65, 0x78, 0x74, 0x5F, 0x73, 0x00, 0x00, 0x66, 0x5F, 0x74, 0x65, 0x78, 0x74, }; -COMPILER_STRIP_GATE(803955B8, &c_tag_4155); +COMPILER_STRIP_GATE(0x803955B8, &c_tag_4155); +#pragma pop + +/* 80395760-80395760 021DC0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_803957AD = "zelda_dungeon_map_spot_button.blo"; +SECTION_DEAD static char const* const stringBase_803957CF = ""; #pragma pop /* 80454004-80454008 002604 0004+00 1/1 0/0 0/0 .sdata2 @4191 */ @@ -1310,7 +1330,7 @@ SECTION_RODATA static u8 const cont_at_4196[40] = { 0x74, 0x31, 0x66, 0x6F, 0x6E, 0x74, 0x5F, 0x61, 0x74, 0x32, 0x66, 0x6F, 0x6E, 0x74, 0x5F, 0x61, 0x74, 0x33, 0x66, 0x6F, 0x6E, 0x74, 0x5F, 0x61, 0x74, 0x34, }; -COMPILER_STRIP_GATE(803955C8, &cont_at_4196); +COMPILER_STRIP_GATE(0x803955C8, &cont_at_4196); /* 801B8DE4-801B8EBC 1B3724 00D8+00 7/7 0/0 0/0 .text setAButtonString__14dMenu_DmapBg_cFUl */ #pragma push @@ -1329,7 +1349,7 @@ SECTION_RODATA static u8 const cont_bt_4211[40] = { 0x74, 0x31, 0x66, 0x6F, 0x6E, 0x74, 0x5F, 0x62, 0x74, 0x32, 0x66, 0x6F, 0x6E, 0x74, 0x5F, 0x62, 0x74, 0x33, 0x66, 0x6F, 0x6E, 0x74, 0x5F, 0x62, 0x74, 0x34, }; -COMPILER_STRIP_GATE(803955F0, &cont_bt_4211); +COMPILER_STRIP_GATE(0x803955F0, &cont_bt_4211); /* 801B8EBC-801B8F94 1B37FC 00D8+00 8/8 0/0 0/0 .text setBButtonString__14dMenu_DmapBg_cFUl */ #pragma push @@ -1346,7 +1366,7 @@ asm void dMenu_DmapBg_c::setBButtonString(u32 param_0) { SECTION_RODATA static u8 const c_tag_4229[16] = { 0x66, 0x5F, 0x74, 0x65, 0x78, 0x74, 0x5F, 0x73, 0x00, 0x00, 0x66, 0x5F, 0x74, 0x65, 0x78, 0x74, }; -COMPILER_STRIP_GATE(80395618, &c_tag_4229); +COMPILER_STRIP_GATE(0x80395618, &c_tag_4229); /* 80451078-8045107C 000578 0004+00 1/1 0/0 0/0 .sbss player_px */ static f32 player_px; @@ -1403,6 +1423,13 @@ asm void dMenu_DmapBg_c::deleteExplain() { #pragma pop /* ############################################################################################## */ +/* 80395760-80395760 021DC0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_803957D0 = "zelda_dungeon_map_base.blo"; +SECTION_DEAD static char const* const stringBase_803957EB = "zelda_dungeon_map_floor_parts.blo"; +#pragma pop + /* 80454010-80454014 002610 0004+00 1/1 0/0 0/0 .sdata2 @4312 */ SECTION_SDATA2 static f32 lit_4312 = 19.0f / 20.0f; @@ -1463,7 +1490,7 @@ SECTION_RODATA static u8 const lit_4325[26 + 6 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80395628, &lit_4325); +COMPILER_STRIP_GATE(0x80395628, &lit_4325); /* 801B944C-801BA0B4 1B3D8C 0C68+00 1/1 0/0 0/0 .text setFloorMessage__14dMenu_DmapBg_cFv */ @@ -1575,6 +1602,13 @@ asm void dMenu_DmapBg_c::draw() { #pragma pop /* ############################################################################################## */ +/* 80395760-80395760 021DC0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8039580D = "tex/bg.bti"; +SECTION_DEAD static char const* const stringBase_80395818 = "spec/spec.dat"; +#pragma pop + /* 80454040-80454044 002640 0004+00 1/1 0/0 0/0 .sdata2 @4848 */ SECTION_SDATA2 static f32 lit_4848 = 25.5f; @@ -1632,7 +1666,7 @@ SECTION_RODATA static u8 const floor_tag[64] = { 0x66, 0x6C, 0x6F, 0x6F, 0x72, 0x33, 0x5F, 0x6E, 0x66, 0x6C, 0x6F, 0x6F, 0x72, 0x34, 0x5F, 0x6E, 0x66, 0x6C, 0x6F, 0x6F, 0x72, 0x35, 0x5F, 0x6E, 0x66, 0x6C, 0x6F, 0x6F, 0x72, 0x36, 0x5F, 0x6E, }; -COMPILER_STRIP_GATE(80395648, &floor_tag); +COMPILER_STRIP_GATE(0x80395648, &floor_tag); #pragma pop /* 80395688-803956C8 021CE8 0040+00 0/1 0/0 0/0 .rodata icon_tag$4933 */ @@ -1644,7 +1678,7 @@ SECTION_RODATA static u8 const icon_tag[64] = { 0x69, 0x63, 0x6F, 0x5F, 0x73, 0x65, 0x74, 0x33, 0x69, 0x63, 0x6F, 0x5F, 0x73, 0x65, 0x74, 0x34, 0x69, 0x63, 0x6F, 0x5F, 0x73, 0x65, 0x74, 0x35, 0x69, 0x63, 0x6F, 0x5F, 0x73, 0x65, 0x74, 0x36, }; -COMPILER_STRIP_GATE(80395688, &icon_tag); +COMPILER_STRIP_GATE(0x80395688, &icon_tag); #pragma pop /* 803956C8-80395708 021D28 0040+00 0/1 0/0 0/0 .rodata boss_tag$4934 */ @@ -1656,7 +1690,7 @@ SECTION_RODATA static u8 const boss_tag[64] = { 0x69, 0x63, 0x5F, 0x73, 0x74, 0x5F, 0x62, 0x33, 0x69, 0x63, 0x5F, 0x73, 0x74, 0x5F, 0x62, 0x34, 0x69, 0x63, 0x5F, 0x73, 0x74, 0x5F, 0x62, 0x35, 0x69, 0x63, 0x5F, 0x73, 0x74, 0x5F, 0x62, 0x36, }; -COMPILER_STRIP_GATE(803956C8, &boss_tag); +COMPILER_STRIP_GATE(0x803956C8, &boss_tag); #pragma pop /* 80395708-80395718 021D68 0010+00 0/1 0/0 0/0 .rodata stay_tag$4935 */ @@ -1665,7 +1699,7 @@ COMPILER_STRIP_GATE(803956C8, &boss_tag); SECTION_RODATA static u8 const stay_tag[16] = { 0x72, 0x69, 0x6E, 0x6B, 0x5F, 0x6E, 0x75, 0x6C, 0x62, 0x6F, 0x73, 0x73, 0x5F, 0x6E, 0x75, 0x6C, }; -COMPILER_STRIP_GATE(80395708, &stay_tag); +COMPILER_STRIP_GATE(0x80395708, &stay_tag); #pragma pop /* 80395718-80395730 021D78 0018+00 0/1 0/0 0/0 .rodata waku_tag$4973 */ @@ -1675,7 +1709,7 @@ SECTION_RODATA static u8 const waku_tag[24] = { 0x67, 0x72, 0x61, 0x79, 0x5F, 0x6D, 0x61, 0x70, 0x67, 0x72, 0x61, 0x79, 0x5F, 0x63, 0x6F, 0x6E, 0x67, 0x72, 0x61, 0x79, 0x5F, 0x6B, 0x65, 0x79, }; -COMPILER_STRIP_GATE(80395718, &waku_tag); +COMPILER_STRIP_GATE(0x80395718, &waku_tag); #pragma pop /* 80395730-80395748 021D90 0018+00 0/1 0/0 0/0 .rodata key_tag$5002 */ @@ -1685,7 +1719,7 @@ SECTION_RODATA static u8 const key_tag[24] = { 0x00, 0x00, 0x6B, 0x65, 0x79, 0x5F, 0x30, 0x30, 0x00, 0x00, 0x6B, 0x65, 0x79, 0x5F, 0x30, 0x31, 0x00, 0x00, 0x6B, 0x65, 0x79, 0x5F, 0x30, 0x32, }; -COMPILER_STRIP_GATE(80395730, &key_tag); +COMPILER_STRIP_GATE(0x80395730, &key_tag); #pragma pop /* 80395748-80395760 021DA8 0018+00 0/1 0/0 0/0 .rodata item_tag$5040 */ @@ -1695,7 +1729,7 @@ SECTION_RODATA static u8 const item_tag[24] = { 0x00, 0x00, 0x6D, 0x61, 0x70, 0x30, 0x30, 0x30, 0x00, 0x00, 0x63, 0x6F, 0x6E, 0x30, 0x30, 0x30, 0x00, 0x69, 0x5F, 0x6B, 0x65, 0x79, 0x5F, 0x6E, }; -COMPILER_STRIP_GATE(80395748, &item_tag); +COMPILER_STRIP_GATE(0x80395748, &item_tag); #pragma pop /* 8045404C-80454050 00264C 0004+00 1/1 0/0 0/0 .sdata2 @5277 */ @@ -1913,6 +1947,16 @@ asm void dMenu_Dmap_c::mapControl() { } #pragma pop +/* ############################################################################################## */ +/* 80395760-80395760 021DC0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80395826 = "/res/FieldMap/res-d.arc"; +SECTION_DEAD static char const* const stringBase_8039583E = "dat/data.dat"; +/* @stringBase0 padding */ +SECTION_DEAD static char const* const pad_8039584B = "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"; +#pragma pop + /* 801BE328-801BE670 1B8C68 0348+00 0/0 1/1 0/0 .text isOpen__12dMenu_Dmap_cFv */ #pragma push #pragma optimization_level 0 @@ -2304,7 +2348,7 @@ asm void __sinit_d_menu_dmap_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_801C05C4 = (void*)__sinit_d_menu_dmap_cpp; +REGISTER_CTORS(0x801C05C4, __sinit_d_menu_dmap_cpp); #pragma pop /* 801C0844-801C084C 1BB184 0008+00 1/0 0/0 0/0 .text @4@__dt__14dMenu_DmapBg_cFv */ @@ -2317,21 +2361,4 @@ static asm void func_801C0844() { } #pragma pop -/* 80395760-80395860 021DC0 00EB+15 10/10 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80395760 = "/res/FieldMap/D_MN10.arc"; -SECTION_DEAD static char const* const stringBase_80395779 = "zelda_dungeon_map_map.blo"; -SECTION_DEAD static char const* const stringBase_80395793 = "zelda_dungeon_map_map.btk"; -SECTION_DEAD static char const* const stringBase_803957AD = "zelda_dungeon_map_spot_button.blo"; -SECTION_DEAD static char const* const stringBase_803957CF = ""; -SECTION_DEAD static char const* const stringBase_803957D0 = "zelda_dungeon_map_base.blo"; -SECTION_DEAD static char const* const stringBase_803957EB = "zelda_dungeon_map_floor_parts.blo"; -SECTION_DEAD static char const* const stringBase_8039580D = "tex/bg.bti"; -SECTION_DEAD static char const* const stringBase_80395818 = "spec/spec.dat"; -SECTION_DEAD static char const* const stringBase_80395826 = "/res/FieldMap/res-d.arc"; -SECTION_DEAD static char const* const stringBase_8039583E = "dat/data.dat"; -/* @stringBase0 padding */ -SECTION_DEAD static char const* const pad_8039584B = "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"; -#pragma pop +/* 80395760-80395760 021DC0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/menu/d_menu_dmap_map.cpp b/src/d/menu/d_menu_dmap_map.cpp index f65337346c4..f9175580d18 100644 --- a/src/d/menu/d_menu_dmap_map.cpp +++ b/src/d/menu/d_menu_dmap_map.cpp @@ -47,8 +47,6 @@ struct renderingDmap_c { /* 801C263C */ bool isRendIcon() const; }; -struct Vec {}; - struct dDrawPath_c { struct line_class {}; @@ -66,6 +64,8 @@ struct dDrawPath_c { /* 8003CCC4 */ void drawPath(); }; +struct Vec {}; + struct renderingDAmap_c { /* 8003FCC8 */ void init(u8*, u16, u16, u16, u16); /* 8003FD08 */ void entry(f32, f32, f32, int, s8); @@ -631,7 +631,7 @@ SECTION_RODATA static void* const l_paletteDmap_m[60] = { (void*)NULL, (void*)NULL, }; -COMPILER_STRIP_GATE(80395860, &l_paletteDmap_m); +COMPILER_STRIP_GATE(0x80395860, &l_paletteDmap_m); /* 80395950-80395974 021FB0 0024+00 0/1 0/0 0/0 .rodata l_dungeon_offColor$3841 */ #pragma push @@ -641,7 +641,7 @@ SECTION_RODATA static u8 const l_dungeon_offColor[36] = { 0x04, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x1C, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x24, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80395950, &l_dungeon_offColor); +COMPILER_STRIP_GATE(0x80395950, &l_dungeon_offColor); #pragma pop /* 80395974-80395998 021FD4 0024+00 0/1 0/0 0/0 .rodata l_dungeon_onColor$3842 */ @@ -652,7 +652,7 @@ SECTION_RODATA static u8 const l_dungeon_onColor[36] = { 0x04, 0x00, 0x00, 0x00, 0x34, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 0x3C, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x44, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80395974, &l_dungeon_onColor); +COMPILER_STRIP_GATE(0x80395974, &l_dungeon_onColor); #pragma pop /* 80395998-803959C0 021FF8 0024+04 0/1 0/0 0/0 .rodata l_dungeon_stayColor$3843 */ @@ -701,7 +701,7 @@ SECTION_RODATA static u8 const l_dungeon_stayColor[36 + 4 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80395998, &l_dungeon_stayColor); +COMPILER_STRIP_GATE(0x80395998, &l_dungeon_stayColor); #pragma pop /* 801C0C48-801C0CB8 1BB588 0070+00 1/0 0/0 0/0 .text getColor__15renderingDmap_cFi */ @@ -1511,7 +1511,7 @@ asm void __sinit_d_menu_dmap_map_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_801C2644 = (void*)__sinit_d_menu_dmap_map_cpp; +REGISTER_CTORS(0x801C2644, __sinit_d_menu_dmap_map_cpp); #pragma pop /* ############################################################################################## */ diff --git a/src/d/menu/d_menu_fishing.cpp b/src/d/menu/d_menu_fishing.cpp index 099ded02254..86a40dff3ea 100644 --- a/src/d/menu/d_menu_fishing.cpp +++ b/src/d/menu/d_menu_fishing.cpp @@ -36,11 +36,11 @@ struct dMeter2Info_c { /* 8021C544 */ void getStringKanji(u32, char*, JMSMesgEntry_c*); }; -struct JKRExpHeap {}; +struct STControl {}; struct CSTControl {}; -struct STControl {}; +struct JKRExpHeap {}; struct dMenu_Fishing_c { /* 801C4D54 */ dMenu_Fishing_c(JKRExpHeap*, STControl*, CSTControl*); @@ -309,6 +309,12 @@ asm void dMenu_Fishing_c::init() { #pragma pop /* ############################################################################################## */ +/* 80396068-80396068 0226C8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80396068 = "/res/Layout/fishres.arc"; +#pragma pop + /* 80454114-80454118 002714 0004+00 1/1 0/0 0/0 .sdata2 @4010 */ SECTION_SDATA2 static f32 lit_4010 = 1.0f; @@ -362,7 +368,7 @@ SECTION_RODATA static u8 const fish_n[48] = { 0x66, 0x69, 0x73, 0x68, 0x5F, 0x6E, 0x5F, 0x33, 0x66, 0x69, 0x73, 0x68, 0x5F, 0x6E, 0x5F, 0x31, 0x66, 0x69, 0x73, 0x68, 0x5F, 0x6E, 0x5F, 0x32, 0x66, 0x69, 0x73, 0x68, 0x5F, 0x6E, 0x5F, 0x34, }; -COMPILER_STRIP_GATE(80395D90, &fish_n); +COMPILER_STRIP_GATE(0x80395D90, &fish_n); /* 80395DC0-80395DF0 022420 0030+00 0/1 0/0 0/0 .rodata fish_p0$4061 */ #pragma push @@ -372,7 +378,7 @@ SECTION_RODATA static u8 const fish_p0[48] = { 0x66, 0x69, 0x5F, 0x70, 0x61, 0x5F, 0x33, 0x6E, 0x66, 0x69, 0x5F, 0x70, 0x61, 0x5F, 0x31, 0x6E, 0x66, 0x69, 0x5F, 0x70, 0x61, 0x5F, 0x32, 0x6E, 0x66, 0x69, 0x5F, 0x70, 0x61, 0x5F, 0x34, 0x6E, }; -COMPILER_STRIP_GATE(80395DC0, &fish_p0); +COMPILER_STRIP_GATE(0x80395DC0, &fish_p0); #pragma pop /* 80395DF0-80395E20 022450 0030+00 0/1 0/0 0/0 .rodata fish_p1$4062 */ @@ -383,7 +389,7 @@ SECTION_RODATA static u8 const fish_p1[48] = { 0x66, 0x69, 0x5F, 0x6E, 0x61, 0x5F, 0x33, 0x6E, 0x66, 0x69, 0x5F, 0x6E, 0x61, 0x5F, 0x31, 0x6E, 0x66, 0x69, 0x5F, 0x6E, 0x61, 0x5F, 0x32, 0x6E, 0x66, 0x69, 0x5F, 0x6E, 0x61, 0x5F, 0x34, 0x6E, }; -COMPILER_STRIP_GATE(80395DF0, &fish_p1); +COMPILER_STRIP_GATE(0x80395DF0, &fish_p1); #pragma pop /* 80395E20-80395E50 022480 0030+00 0/1 0/0 0/0 .rodata fish_p2$4063 */ @@ -394,7 +400,7 @@ SECTION_RODATA static u8 const fish_p2[48] = { 0x66, 0x69, 0x5F, 0x6C, 0x69, 0x5F, 0x33, 0x6E, 0x66, 0x69, 0x5F, 0x6C, 0x69, 0x5F, 0x31, 0x6E, 0x66, 0x69, 0x5F, 0x6C, 0x69, 0x5F, 0x32, 0x6E, 0x66, 0x69, 0x5F, 0x6C, 0x69, 0x5F, 0x34, 0x6E, }; -COMPILER_STRIP_GATE(80395E20, &fish_p2); +COMPILER_STRIP_GATE(0x80395E20, &fish_p2); #pragma pop /* 80395E50-80395E80 0224B0 0030+00 0/1 0/0 0/0 .rodata fish_p3$4064 */ @@ -405,7 +411,7 @@ SECTION_RODATA static u8 const fish_p3[48] = { 0x62, 0x5F, 0x62, 0x6F, 0x78, 0x5F, 0x33, 0x6E, 0x62, 0x5F, 0x62, 0x6F, 0x78, 0x5F, 0x31, 0x6E, 0x62, 0x5F, 0x62, 0x6F, 0x78, 0x5F, 0x32, 0x6E, 0x62, 0x5F, 0x62, 0x6F, 0x78, 0x5F, 0x34, 0x6E, }; -COMPILER_STRIP_GATE(80395E50, &fish_p3); +COMPILER_STRIP_GATE(0x80395E50, &fish_p3); #pragma pop /* 80395E80-80395EB0 0224E0 0030+00 0/1 0/0 0/0 .rodata fish_p4$4065 */ @@ -416,7 +422,7 @@ SECTION_RODATA static u8 const fish_p4[48] = { 0x72, 0x5F, 0x62, 0x6F, 0x78, 0x5F, 0x33, 0x6E, 0x72, 0x5F, 0x62, 0x6F, 0x78, 0x5F, 0x31, 0x6E, 0x72, 0x5F, 0x62, 0x6F, 0x78, 0x5F, 0x32, 0x6E, 0x72, 0x5F, 0x62, 0x6F, 0x78, 0x5F, 0x34, 0x6E, }; -COMPILER_STRIP_GATE(80395E80, &fish_p4); +COMPILER_STRIP_GATE(0x80395E80, &fish_p4); #pragma pop /* 80395EB0-80395EE0 022510 0030+00 0/1 0/0 0/0 .rodata fish_p5$4066 */ @@ -427,7 +433,7 @@ SECTION_RODATA static u8 const fish_p5[48] = { 0x69, 0x6E, 0x66, 0x6F, 0x5F, 0x33, 0x5F, 0x6E, 0x69, 0x6E, 0x66, 0x6F, 0x5F, 0x31, 0x5F, 0x6E, 0x69, 0x6E, 0x66, 0x6F, 0x5F, 0x32, 0x5F, 0x6E, 0x69, 0x6E, 0x66, 0x6F, 0x5F, 0x34, 0x5F, 0x6E, }; -COMPILER_STRIP_GATE(80395EB0, &fish_p5); +COMPILER_STRIP_GATE(0x80395EB0, &fish_p5); #pragma pop /* 80395EE0-80395F10 022540 0030+00 0/1 0/0 0/0 .rodata size_1$4081 */ @@ -438,7 +444,7 @@ SECTION_RODATA static u8 const size_1[48] = { 0x73, 0x69, 0x7A, 0x65, 0x5F, 0x74, 0x5F, 0x33, 0x73, 0x69, 0x7A, 0x65, 0x5F, 0x74, 0x5F, 0x31, 0x73, 0x69, 0x7A, 0x65, 0x5F, 0x74, 0x5F, 0x32, 0x73, 0x69, 0x7A, 0x65, 0x5F, 0x74, 0x5F, 0x34, }; -COMPILER_STRIP_GATE(80395EE0, &size_1); +COMPILER_STRIP_GATE(0x80395EE0, &size_1); #pragma pop /* 80395F10-80395F40 022570 0030+00 0/1 0/0 0/0 .rodata size_unit_1$4082 */ @@ -449,7 +455,7 @@ SECTION_RODATA static u8 const size_unit_1[48] = { 0x00, 0x00, 0x63, 0x6D, 0x5F, 0x74, 0x5F, 0x33, 0x00, 0x00, 0x63, 0x6D, 0x5F, 0x74, 0x5F, 0x31, 0x00, 0x00, 0x63, 0x6D, 0x5F, 0x74, 0x5F, 0x32, 0x00, 0x00, 0x63, 0x6D, 0x5F, 0x74, 0x5F, 0x34, }; -COMPILER_STRIP_GATE(80395F10, &size_unit_1); +COMPILER_STRIP_GATE(0x80395F10, &size_unit_1); #pragma pop /* 80395F40-80395F70 0225A0 0030+00 0/1 0/0 0/0 .rodata count_1$4083 */ @@ -460,7 +466,7 @@ SECTION_RODATA static u8 const count_1[48] = { 0x63, 0x6F, 0x75, 0x6E, 0x74, 0x5F, 0x74, 0x33, 0x63, 0x6F, 0x75, 0x6E, 0x74, 0x5F, 0x74, 0x31, 0x63, 0x6F, 0x75, 0x6E, 0x74, 0x5F, 0x74, 0x32, 0x63, 0x6F, 0x75, 0x6E, 0x74, 0x5F, 0x74, 0x34, }; -COMPILER_STRIP_GATE(80395F40, &count_1); +COMPILER_STRIP_GATE(0x80395F40, &count_1); #pragma pop /* 80395F70-80395FA0 0225D0 0030+00 0/1 0/0 0/0 .rodata count_unit_1$4084 */ @@ -471,7 +477,7 @@ SECTION_RODATA static u8 const count_unit_1[48] = { 0x00, 0x63, 0x6F, 0x75, 0x5F, 0x74, 0x5F, 0x33, 0x00, 0x63, 0x6F, 0x75, 0x5F, 0x74, 0x5F, 0x31, 0x00, 0x63, 0x6F, 0x75, 0x5F, 0x74, 0x5F, 0x32, 0x00, 0x63, 0x6F, 0x75, 0x5F, 0x74, 0x5F, 0x34, }; -COMPILER_STRIP_GATE(80395F70, &count_unit_1); +COMPILER_STRIP_GATE(0x80395F70, &count_unit_1); #pragma pop /* 80395FA0-80395FD0 022600 0030+00 0/1 0/0 0/0 .rodata name_0$4085 */ @@ -482,7 +488,7 @@ SECTION_RODATA static u8 const name_0[48] = { 0x00, 0x00, 0x6E, 0x61, 0x6D, 0x65, 0x5F, 0x33, 0x00, 0x00, 0x6E, 0x61, 0x6D, 0x65, 0x5F, 0x31, 0x00, 0x00, 0x6E, 0x61, 0x6D, 0x65, 0x5F, 0x32, 0x00, 0x00, 0x6E, 0x61, 0x6D, 0x65, 0x5F, 0x34, }; -COMPILER_STRIP_GATE(80395FA0, &name_0); +COMPILER_STRIP_GATE(0x80395FA0, &name_0); #pragma pop /* 80395FD0-80396000 022630 0030+00 0/1 0/0 0/0 .rodata fname_0$4086 */ @@ -493,7 +499,7 @@ SECTION_RODATA static u8 const fname_0[48] = { 0x66, 0x5F, 0x6E, 0x61, 0x6D, 0x65, 0x5F, 0x33, 0x66, 0x5F, 0x6E, 0x61, 0x6D, 0x65, 0x5F, 0x31, 0x66, 0x5F, 0x6E, 0x61, 0x6D, 0x65, 0x5F, 0x32, 0x66, 0x5F, 0x6E, 0x61, 0x6D, 0x65, 0x5F, 0x34, }; -COMPILER_STRIP_GATE(80395FD0, &fname_0); +COMPILER_STRIP_GATE(0x80395FD0, &fname_0); #pragma pop /* 80396000-80396018 022660 0018+00 0/1 0/0 0/0 .rodata name_id$4087 */ @@ -503,7 +509,15 @@ SECTION_RODATA static u8 const name_id[24] = { 0x00, 0x00, 0x05, 0x9E, 0x00, 0x00, 0x05, 0x9D, 0x00, 0x00, 0x05, 0x9B, 0x00, 0x00, 0x05, 0x99, 0x00, 0x00, 0x05, 0x9A, 0x00, 0x00, 0x05, 0x9C, }; -COMPILER_STRIP_GATE(80396000, &name_id); +COMPILER_STRIP_GATE(0x80396000, &name_id); +#pragma pop + +/* 80396068-80396068 0226C8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80396080 = "tt_block8x8.bti"; +SECTION_DEAD static char const* const stringBase_80396090 = "zelda_fish_window.blo"; +SECTION_DEAD static char const* const stringBase_803960A6 = ""; #pragma pop /* 801C55D8-801C5D3C 1BFF18 0764+00 1/1 0/0 0/0 .text screenSetBase__15dMenu_Fishing_cFv @@ -524,7 +538,7 @@ SECTION_RODATA static u8 const text_a_tag[40] = { 0x5F, 0x32, 0x61, 0x74, 0x65, 0x78, 0x74, 0x31, 0x5F, 0x33, 0x61, 0x74, 0x65, 0x78, 0x74, 0x31, 0x5F, 0x34, 0x61, 0x74, 0x65, 0x78, 0x74, 0x31, 0x5F, 0x35, }; -COMPILER_STRIP_GATE(80396018, &text_a_tag); +COMPILER_STRIP_GATE(0x80396018, &text_a_tag); /* 80396040-80396068 0226A0 0028+00 1/1 0/0 0/0 .rodata text_b_tag$4168 */ SECTION_RODATA static u8 const text_b_tag[40] = { @@ -532,7 +546,15 @@ SECTION_RODATA static u8 const text_b_tag[40] = { 0x5F, 0x32, 0x62, 0x74, 0x65, 0x78, 0x74, 0x31, 0x5F, 0x33, 0x62, 0x74, 0x65, 0x78, 0x74, 0x31, 0x5F, 0x34, 0x62, 0x74, 0x65, 0x78, 0x74, 0x31, 0x5F, 0x35, }; -COMPILER_STRIP_GATE(80396040, &text_b_tag); +COMPILER_STRIP_GATE(0x80396040, &text_b_tag); + +/* 80396068-80396068 0226C8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_803960A7 = "zelda_collect_soubi_do_icon_parts.blo"; +/* @stringBase0 padding */ +SECTION_DEAD static char const* const pad_803960CD = "\0\0"; +#pragma pop /* 801C5D3C-801C5EB8 1C067C 017C+00 1/1 0/0 0/0 .text screenSetDoIcon__15dMenu_Fishing_cFv */ #pragma push @@ -616,18 +638,7 @@ asm void __sinit_d_menu_fishing_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_801C65BC = (void*)__sinit_d_menu_fishing_cpp; +REGISTER_CTORS(0x801C65BC, __sinit_d_menu_fishing_cpp); #pragma pop -/* 80396068-803960D0 0226C8 0065+03 5/5 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80396068 = "/res/Layout/fishres.arc"; -SECTION_DEAD static char const* const stringBase_80396080 = "tt_block8x8.bti"; -SECTION_DEAD static char const* const stringBase_80396090 = "zelda_fish_window.blo"; -SECTION_DEAD static char const* const stringBase_803960A6 = ""; -SECTION_DEAD static char const* const stringBase_803960A7 = "zelda_collect_soubi_do_icon_parts.blo"; -/* @stringBase0 padding */ -SECTION_DEAD static char const* const pad_803960CD = "\0\0"; -#pragma pop +/* 80396068-80396068 0226C8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/menu/d_menu_fmap.cpp b/src/d/menu/d_menu_fmap.cpp index fe494569153..ebcea3da31d 100644 --- a/src/d/menu/d_menu_fmap.cpp +++ b/src/d/menu/d_menu_fmap.cpp @@ -100,14 +100,14 @@ struct dMenu_Fmap_world_data_c { struct dMenu_Fmap_stage_data_c {}; -struct JKRExpHeap { - /* 802CEE2C */ void create(u32, JKRHeap*, bool); +struct STControl { + /* 8003219C */ void checkTrigger(); }; struct CSTControl {}; -struct STControl { - /* 8003219C */ void checkTrigger(); +struct JKRExpHeap { + /* 802CEE2C */ void create(u32, JKRHeap*, bool); }; struct dMenu_Fmap_c { @@ -328,10 +328,10 @@ struct dDlst_list_c { /* 80056794 */ void set(dDlst_base_c**&, dDlst_base_c**&, dDlst_base_c*); }; -struct Vec {}; - struct JAISoundID {}; +struct Vec {}; + struct Z2SeMgr { /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); }; @@ -637,6 +637,31 @@ extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; // /* ############################################################################################## */ +/* 803960E8-803960E8 022748 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_803960E8 = ""; +SECTION_DEAD static char const* const stringBase_803960E9 = "dat/field.dat"; +SECTION_DEAD static char const* const stringBase_803960F7 = "dat/portal.dat"; +SECTION_DEAD static char const* const stringBase_80396106 = "F_SP124"; +SECTION_DEAD static char const* const stringBase_8039610E = "/res/FieldMap/res-f.arc"; +SECTION_DEAD static char const* const stringBase_80396126 = "dat/data.dat"; +SECTION_DEAD static char const* const stringBase_80396133 = "%s/stage.dat"; +SECTION_DEAD static char const* const stringBase_80396140 = "%s/room%d.dzs"; +SECTION_DEAD static char const* const stringBase_8039614E = "tex/region8.bti"; +SECTION_DEAD static char const* const stringBase_8039615E = "tex/region%d.bti"; +SECTION_DEAD static char const* const stringBase_8039616F = "F_SP115"; +SECTION_DEAD static char const* const stringBase_80396177 = "F_SP113"; +SECTION_DEAD static char const* const stringBase_8039617F = "F_SP109"; +SECTION_DEAD static char const* const stringBase_80396187 = "F_SP108"; +SECTION_DEAD static char const* const stringBase_8039618F = "F_SP104"; +SECTION_DEAD static char const* const stringBase_80396197 = "F_SP122"; +SECTION_DEAD static char const* const stringBase_8039619F = "F_SP111"; +SECTION_DEAD static char const* const stringBase_803961A7 = "F_SP116"; +/* @stringBase0 padding */ +SECTION_DEAD static char const* const pad_803961AF = ""; +#pragma pop + /* 803BD090-803BD09C 01A1B0 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -2647,7 +2672,7 @@ SECTION_RODATA static u8 const i_swBit[24] = { 0x00, 0x00, 0x00, 0x41, 0x00, 0x00, 0x00, 0x29, 0x00, 0x00, 0x00, 0x2A, 0x00, 0x00, 0x00, 0x32, 0x00, 0x00, 0x00, 0x79, 0x00, 0x00, 0x00, 0x32, }; -COMPILER_STRIP_GATE(803960D0, &i_swBit); +COMPILER_STRIP_GATE(0x803960D0, &i_swBit); /* 801CD814-801CD8B4 1C8154 00A0+00 1/1 0/0 0/0 .text howlArrowPosInit__12dMenu_Fmap_cFv */ @@ -2714,31 +2739,7 @@ asm void __sinit_d_menu_fmap_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_801CDA74 = (void*)__sinit_d_menu_fmap_cpp; +REGISTER_CTORS(0x801CDA74, __sinit_d_menu_fmap_cpp); #pragma pop -/* 803960E8-803961B0 022748 00C7+01 9/7 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_803960E8 = ""; -SECTION_DEAD static char const* const stringBase_803960E9 = "dat/field.dat"; -SECTION_DEAD static char const* const stringBase_803960F7 = "dat/portal.dat"; -SECTION_DEAD static char const* const stringBase_80396106 = "F_SP124"; -SECTION_DEAD static char const* const stringBase_8039610E = "/res/FieldMap/res-f.arc"; -SECTION_DEAD static char const* const stringBase_80396126 = "dat/data.dat"; -SECTION_DEAD static char const* const stringBase_80396133 = "%s/stage.dat"; -SECTION_DEAD static char const* const stringBase_80396140 = "%s/room%d.dzs"; -SECTION_DEAD static char const* const stringBase_8039614E = "tex/region8.bti"; -SECTION_DEAD static char const* const stringBase_8039615E = "tex/region%d.bti"; -SECTION_DEAD static char const* const stringBase_8039616F = "F_SP115"; -SECTION_DEAD static char const* const stringBase_80396177 = "F_SP113"; -SECTION_DEAD static char const* const stringBase_8039617F = "F_SP109"; -SECTION_DEAD static char const* const stringBase_80396187 = "F_SP108"; -SECTION_DEAD static char const* const stringBase_8039618F = "F_SP104"; -SECTION_DEAD static char const* const stringBase_80396197 = "F_SP122"; -SECTION_DEAD static char const* const stringBase_8039619F = "F_SP111"; -SECTION_DEAD static char const* const stringBase_803961A7 = "F_SP116"; -/* @stringBase0 padding */ -SECTION_DEAD static char const* const pad_803961AF = ""; -#pragma pop +/* 803960E8-803960E8 022748 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/menu/d_menu_fmap2D.cpp b/src/d/menu/d_menu_fmap2D.cpp index dc0fb640a5d..70a73b9bb66 100644 --- a/src/d/menu/d_menu_fmap2D.cpp +++ b/src/d/menu/d_menu_fmap2D.cpp @@ -34,10 +34,10 @@ struct dSv_event_c { /* 800349BC */ void isEventBit(u16) const; }; -struct J2DOrthoGraph {}; - struct STControl {}; +struct J2DOrthoGraph {}; + struct dMsgScrnExplain_c { /* 8023CC88 */ dMsgScrnExplain_c(STControl*, u8, bool, u8); /* 8023D918 */ void draw(J2DOrthoGraph*); @@ -56,7 +56,7 @@ struct dMeter2Info_c { struct J2DAnmTextureSRTKey {}; -struct JKRArchive {}; +struct JKRExpHeap {}; struct JGeometry { template @@ -69,6 +69,8 @@ struct J2DGrafContext { /* 802E90C0 */ void scissor(JGeometry::TBox2 const&); }; +struct JKRArchive {}; + struct J2DScreen { /* 802F8498 */ J2DScreen(); /* 802F8648 */ void setPriority(char const*, u32, JKRArchive*); @@ -76,8 +78,6 @@ struct J2DScreen { /* 802F9690 */ void animation(); }; -struct JKRExpHeap {}; - struct CPaneMgrAlpha { /* 802553FC */ CPaneMgrAlpha(J2DScreen*, u64, u8, JKRExpHeap*); /* 80255608 */ void hide(); @@ -196,10 +196,10 @@ struct dMenuMapCommon_c { /* 801C4600 */ void moveLightDropAnime(); }; -struct Vec {}; - struct JAISoundID {}; +struct Vec {}; + struct Z2SeMgr { /* 802AC50C */ void seStartLevel(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); }; @@ -445,7 +445,17 @@ SECTION_RODATA static u8 const cur_tag_3868[32] = { 0x00, 0x66, 0x5F, 0x70, 0x6F, 0x5F, 0x72, 0x75, 0x00, 0x66, 0x5F, 0x70, 0x6F, 0x5F, 0x72, 0x64, 0x00, 0x66, 0x5F, 0x70, 0x6F, 0x5F, 0x6C, 0x64, 0x00, 0x66, 0x5F, 0x70, 0x6F, 0x5F, 0x6C, 0x75, }; -COMPILER_STRIP_GATE(80396248, &cur_tag_3868); +COMPILER_STRIP_GATE(0x80396248, &cur_tag_3868); + +/* 803965D0-803965D0 022C30 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_803965D0 = "zelda_map_screen_stone_base.blo"; +SECTION_DEAD static char const* const stringBase_803965F0 = "zelda_map_screen_base.blo"; +SECTION_DEAD static char const* const stringBase_8039660A = "zelda_map_screen_base.btk"; +SECTION_DEAD static char const* const stringBase_80396624 = "tt_block8x8.bti"; +SECTION_DEAD static char const* const stringBase_80396634 = "zelda_field_map_point_cursor.blo"; +#pragma pop /* 803BD750-803BD760 01A870 0010+00 2/2 0/0 0/0 .data __vt__17dMenu_Fmap2DTop_c */ SECTION_DATA extern void* __vt__17dMenu_Fmap2DTop_c[4] = { @@ -508,7 +518,7 @@ SECTION_RODATA static u8 const cur_tag_4092[32] = { 0x00, 0x66, 0x5F, 0x70, 0x6F, 0x5F, 0x72, 0x75, 0x00, 0x66, 0x5F, 0x70, 0x6F, 0x5F, 0x72, 0x64, 0x00, 0x66, 0x5F, 0x70, 0x6F, 0x5F, 0x6C, 0x64, 0x00, 0x66, 0x5F, 0x70, 0x6F, 0x5F, 0x6C, 0x75, }; -COMPILER_STRIP_GATE(80396268, &cur_tag_4092); +COMPILER_STRIP_GATE(0x80396268, &cur_tag_4092); /* 804541DC-804541E0 0027DC 0004+00 6/6 0/0 0/0 .sdata2 @4199 */ SECTION_SDATA2 static f32 lit_4199 = 608.0f; @@ -1279,7 +1289,7 @@ SECTION_RODATA static u8 const area_name[24] = { 0x69, 0x5F, 0x6E, 0x61, 0x6D, 0x65, 0x5F, 0x73, 0x00, 0x00, 0x69, 0x5F, 0x6E, 0x61, 0x6D, 0x65, 0x00, 0x69, 0x5F, 0x6E, 0x61, 0x6D, 0x65, 0x31, }; -COMPILER_STRIP_GATE(80396288, &area_name); +COMPILER_STRIP_GATE(0x80396288, &area_name); #pragma pop /* 803962A0-803962B8 022900 0018+00 0/1 0/0 0/0 .rodata farea_name$5815 */ @@ -1289,7 +1299,7 @@ SECTION_RODATA static u8 const farea_name_5815[24] = { 0x66, 0x5F, 0x6E, 0x61, 0x6D, 0x65, 0x5F, 0x31, 0x00, 0x66, 0x5F, 0x6E, 0x61, 0x6D, 0x65, 0x33, 0x00, 0x66, 0x5F, 0x6E, 0x61, 0x6D, 0x65, 0x32, }; -COMPILER_STRIP_GATE(803962A0, &farea_name_5815); +COMPILER_STRIP_GATE(0x803962A0, &farea_name_5815); #pragma pop /* 803962B8-803962F0 022918 0038+00 0/1 0/0 0/0 .rodata sfont_name$5821 */ @@ -1301,7 +1311,7 @@ SECTION_RODATA static u8 const sfont_name[56] = { 0x6E, 0x74, 0x6C, 0x32, 0x00, 0x73, 0x66, 0x6F, 0x6E, 0x74, 0x62, 0x30, 0x00, 0x73, 0x66, 0x6F, 0x6E, 0x74, 0x62, 0x31, 0x00, 0x73, 0x66, 0x6F, 0x6E, 0x74, 0x62, 0x32, }; -COMPILER_STRIP_GATE(803962B8, &sfont_name); +COMPILER_STRIP_GATE(0x803962B8, &sfont_name); #pragma pop /* 803962F0-80396328 022950 0038+00 0/1 0/0 0/0 .rodata ffont_name$5822 */ @@ -1313,7 +1323,7 @@ SECTION_RODATA static u8 const ffont_name_5822[56] = { 0x6E, 0x74, 0x6C, 0x32, 0x00, 0x66, 0x66, 0x6F, 0x6E, 0x74, 0x62, 0x30, 0x00, 0x66, 0x66, 0x6F, 0x6E, 0x74, 0x62, 0x33, 0x00, 0x66, 0x66, 0x6F, 0x6E, 0x74, 0x62, 0x34, }; -COMPILER_STRIP_GATE(803962F0, &ffont_name_5822); +COMPILER_STRIP_GATE(0x803962F0, &ffont_name_5822); #pragma pop /* 80396328-80396350 022988 0028+00 0/1 0/0 0/0 .rodata cont_zt$5828 */ @@ -1324,7 +1334,7 @@ SECTION_RODATA static u8 const cont_zt[40] = { 0x74, 0x31, 0x63, 0x6F, 0x6E, 0x74, 0x5F, 0x7A, 0x74, 0x32, 0x63, 0x6F, 0x6E, 0x74, 0x5F, 0x7A, 0x74, 0x33, 0x63, 0x6F, 0x6E, 0x74, 0x5F, 0x7A, 0x74, 0x34, }; -COMPILER_STRIP_GATE(80396328, &cont_zt); +COMPILER_STRIP_GATE(0x80396328, &cont_zt); #pragma pop /* 80396350-80396378 0229B0 0028+00 0/1 0/0 0/0 .rodata font_zt$5829 */ @@ -1335,7 +1345,7 @@ SECTION_RODATA static u8 const font_zt_5829[40] = { 0x74, 0x32, 0x66, 0x6F, 0x6E, 0x74, 0x5F, 0x7A, 0x74, 0x33, 0x66, 0x6F, 0x6E, 0x74, 0x5F, 0x7A, 0x74, 0x34, 0x66, 0x6F, 0x6E, 0x74, 0x5F, 0x7A, 0x74, 0x35, }; -COMPILER_STRIP_GATE(80396350, &font_zt_5829); +COMPILER_STRIP_GATE(0x80396350, &font_zt_5829); #pragma pop /* 80396378-803963A0 0229D8 0028+00 0/1 0/0 0/0 .rodata cont_bt$5835 */ @@ -1346,7 +1356,7 @@ SECTION_RODATA static u8 const cont_bt[40] = { 0x74, 0x32, 0x63, 0x6F, 0x6E, 0x74, 0x5F, 0x62, 0x74, 0x33, 0x63, 0x6F, 0x6E, 0x74, 0x5F, 0x62, 0x74, 0x34, 0x00, 0x63, 0x6F, 0x6E, 0x74, 0x5F, 0x62, 0x74, }; -COMPILER_STRIP_GATE(80396378, &cont_bt); +COMPILER_STRIP_GATE(0x80396378, &cont_bt); #pragma pop /* 803963A0-803963C8 022A00 0028+00 0/1 0/0 0/0 .rodata font_bt$5836 */ @@ -1357,7 +1367,7 @@ SECTION_RODATA static u8 const font_bt_5836[40] = { 0x74, 0x32, 0x66, 0x6F, 0x6E, 0x74, 0x5F, 0x62, 0x74, 0x33, 0x66, 0x6F, 0x6E, 0x74, 0x5F, 0x62, 0x74, 0x34, 0x66, 0x6F, 0x6E, 0x74, 0x5F, 0x62, 0x74, 0x35, }; -COMPILER_STRIP_GATE(803963A0, &font_bt_5836); +COMPILER_STRIP_GATE(0x803963A0, &font_bt_5836); #pragma pop /* 803963C8-803963F0 022A28 0028+00 0/1 0/0 0/0 .rodata cont_at$5842 */ @@ -1368,7 +1378,7 @@ SECTION_RODATA static u8 const cont_at[40] = { 0x74, 0x31, 0x63, 0x6F, 0x6E, 0x74, 0x5F, 0x61, 0x74, 0x32, 0x63, 0x6F, 0x6E, 0x74, 0x5F, 0x61, 0x74, 0x33, 0x63, 0x6F, 0x6E, 0x74, 0x5F, 0x61, 0x74, 0x34, }; -COMPILER_STRIP_GATE(803963C8, &cont_at); +COMPILER_STRIP_GATE(0x803963C8, &cont_at); #pragma pop /* 803963F0-80396418 022A50 0028+00 0/1 0/0 0/0 .rodata font_at$5843 */ @@ -1379,7 +1389,7 @@ SECTION_RODATA static u8 const font_at_5843[40] = { 0x74, 0x32, 0x66, 0x6F, 0x6E, 0x74, 0x5F, 0x61, 0x74, 0x33, 0x66, 0x6F, 0x6E, 0x74, 0x5F, 0x61, 0x74, 0x34, 0x66, 0x6F, 0x6E, 0x74, 0x5F, 0x61, 0x74, 0x35, }; -COMPILER_STRIP_GATE(803963F0, &font_at_5843); +COMPILER_STRIP_GATE(0x803963F0, &font_at_5843); #pragma pop /* 80396418-80396440 022A78 0028+00 0/1 0/0 0/0 .rodata juji_c$5849 */ @@ -1390,7 +1400,7 @@ SECTION_RODATA static u8 const juji_c_5849[40] = { 0x30, 0x31, 0x6A, 0x75, 0x6A, 0x69, 0x5F, 0x63, 0x30, 0x32, 0x6A, 0x75, 0x6A, 0x69, 0x5F, 0x63, 0x30, 0x33, 0x6A, 0x75, 0x6A, 0x69, 0x5F, 0x63, 0x30, 0x34, }; -COMPILER_STRIP_GATE(80396418, &juji_c_5849); +COMPILER_STRIP_GATE(0x80396418, &juji_c_5849); #pragma pop /* 80396440-80396468 022AA0 0028+00 0/1 0/0 0/0 .rodata fuji_c$5850 */ @@ -1401,7 +1411,7 @@ SECTION_RODATA static u8 const fuji_c[40] = { 0x30, 0x31, 0x66, 0x75, 0x6A, 0x69, 0x5F, 0x63, 0x30, 0x32, 0x66, 0x75, 0x6A, 0x69, 0x5F, 0x63, 0x30, 0x33, 0x66, 0x75, 0x6A, 0x69, 0x5F, 0x63, 0x30, 0x34, }; -COMPILER_STRIP_GATE(80396440, &fuji_c); +COMPILER_STRIP_GATE(0x80396440, &fuji_c); #pragma pop /* 80396468-80396490 022AC8 0028+00 0/1 0/0 0/0 .rodata ast_c$5856 */ @@ -1412,7 +1422,7 @@ SECTION_RODATA static u8 const ast_c_5856[40] = { 0x30, 0x31, 0x00, 0x00, 0x61, 0x73, 0x74, 0x5F, 0x30, 0x32, 0x00, 0x00, 0x61, 0x73, 0x74, 0x5F, 0x30, 0x33, 0x00, 0x00, 0x61, 0x73, 0x74, 0x5F, 0x30, 0x34, }; -COMPILER_STRIP_GATE(80396468, &ast_c_5856); +COMPILER_STRIP_GATE(0x80396468, &ast_c_5856); #pragma pop /* 80396490-803964B8 022AF0 0028+00 0/1 0/0 0/0 .rodata fst_c$5857 */ @@ -1423,7 +1433,17 @@ SECTION_RODATA static u8 const fst_c[40] = { 0x30, 0x31, 0x00, 0x00, 0x66, 0x73, 0x74, 0x5F, 0x30, 0x32, 0x00, 0x00, 0x66, 0x73, 0x74, 0x5F, 0x30, 0x33, 0x00, 0x00, 0x66, 0x73, 0x74, 0x5F, 0x30, 0x34, }; -COMPILER_STRIP_GATE(80396490, &fst_c); +COMPILER_STRIP_GATE(0x80396490, &fst_c); +#pragma pop + +/* 803965D0-803965D0 022C30 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80396655 = "zelda_map_screen_title.blo"; +SECTION_DEAD static char const* const stringBase_80396670 = "zelda_map_screen_title.btk"; +SECTION_DEAD static char const* const stringBase_8039668B = ""; +/* @stringBase0 padding */ +SECTION_DEAD static char const* const pad_8039668C = "\0\0\0"; #pragma pop /* 801D5BD0-801D6700 1D0510 0B30+00 0/0 1/1 0/0 .text @@ -1506,7 +1526,7 @@ SECTION_RODATA static u8 const ffont_name_6110[56] = { 0x6E, 0x74, 0x6C, 0x32, 0x00, 0x66, 0x66, 0x6F, 0x6E, 0x74, 0x62, 0x30, 0x00, 0x66, 0x66, 0x6F, 0x6E, 0x74, 0x62, 0x33, 0x00, 0x66, 0x66, 0x6F, 0x6E, 0x74, 0x62, 0x34, }; -COMPILER_STRIP_GATE(803964B8, &ffont_name_6110); +COMPILER_STRIP_GATE(0x803964B8, &ffont_name_6110); /* 801D6F38-801D7010 1D1878 00D8+00 1/1 1/1 0/0 .text setTitleNameString__17dMenu_Fmap2DTop_cFUl */ @@ -1525,7 +1545,7 @@ SECTION_RODATA static u8 const farea_name_6125[24] = { 0x66, 0x5F, 0x6E, 0x61, 0x6D, 0x65, 0x5F, 0x31, 0x00, 0x66, 0x5F, 0x6E, 0x61, 0x6D, 0x65, 0x33, 0x00, 0x66, 0x5F, 0x6E, 0x61, 0x6D, 0x65, 0x32, }; -COMPILER_STRIP_GATE(803964F0, &farea_name_6125); +COMPILER_STRIP_GATE(0x803964F0, &farea_name_6125); /* 801D7010-801D70E8 1D1950 00D8+00 0/0 2/2 0/0 .text setAreaNameString__17dMenu_Fmap2DTop_cFUl */ #pragma push @@ -1544,7 +1564,7 @@ SECTION_RODATA static u8 const font_zt_6148[40] = { 0x74, 0x32, 0x66, 0x6F, 0x6E, 0x74, 0x5F, 0x7A, 0x74, 0x33, 0x66, 0x6F, 0x6E, 0x74, 0x5F, 0x7A, 0x74, 0x34, 0x66, 0x6F, 0x6E, 0x74, 0x5F, 0x7A, 0x74, 0x35, }; -COMPILER_STRIP_GATE(80396508, &font_zt_6148); +COMPILER_STRIP_GATE(0x80396508, &font_zt_6148); /* 801D70E8-801D7210 1D1A28 0128+00 1/1 12/12 0/0 .text setZButtonString__17dMenu_Fmap2DTop_cFUlUc */ @@ -1564,7 +1584,7 @@ SECTION_RODATA static u8 const font_bt_6176[40] = { 0x74, 0x32, 0x66, 0x6F, 0x6E, 0x74, 0x5F, 0x62, 0x74, 0x33, 0x66, 0x6F, 0x6E, 0x74, 0x5F, 0x62, 0x74, 0x34, 0x66, 0x6F, 0x6E, 0x74, 0x5F, 0x62, 0x74, 0x35, }; -COMPILER_STRIP_GATE(80396530, &font_bt_6176); +COMPILER_STRIP_GATE(0x80396530, &font_bt_6176); /* 801D7210-801D72D4 1D1B50 00C4+00 1/1 9/9 0/0 .text setBButtonString__17dMenu_Fmap2DTop_cFUlUc */ @@ -1584,7 +1604,7 @@ SECTION_RODATA static u8 const font_at_6194[40] = { 0x74, 0x32, 0x66, 0x6F, 0x6E, 0x74, 0x5F, 0x61, 0x74, 0x33, 0x66, 0x6F, 0x6E, 0x74, 0x5F, 0x61, 0x74, 0x34, 0x66, 0x6F, 0x6E, 0x74, 0x5F, 0x61, 0x74, 0x35, }; -COMPILER_STRIP_GATE(80396558, &font_at_6194); +COMPILER_STRIP_GATE(0x80396558, &font_at_6194); /* 801D72D4-801D7398 1D1C14 00C4+00 1/1 14/14 0/0 .text setAButtonString__17dMenu_Fmap2DTop_cFUlUc */ @@ -1604,7 +1624,7 @@ SECTION_RODATA static u8 const juji_c_6209[40] = { 0x30, 0x31, 0x66, 0x75, 0x6A, 0x69, 0x5F, 0x63, 0x30, 0x32, 0x66, 0x75, 0x6A, 0x69, 0x5F, 0x63, 0x30, 0x33, 0x66, 0x75, 0x6A, 0x69, 0x5F, 0x63, 0x30, 0x34, }; -COMPILER_STRIP_GATE(80396580, &juji_c_6209); +COMPILER_STRIP_GATE(0x80396580, &juji_c_6209); /* 801D7398-801D74EC 1D1CD8 0154+00 1/1 8/8 0/0 .text setCrossLRString__17dMenu_Fmap2DTop_cFUl */ #pragma push @@ -1623,7 +1643,7 @@ SECTION_RODATA static u8 const ast_c_6233[40] = { 0x30, 0x31, 0x00, 0x00, 0x66, 0x73, 0x74, 0x5F, 0x30, 0x32, 0x00, 0x00, 0x66, 0x73, 0x74, 0x5F, 0x30, 0x33, 0x00, 0x00, 0x66, 0x73, 0x74, 0x5F, 0x30, 0x34, }; -COMPILER_STRIP_GATE(803965A8, &ast_c_6233); +COMPILER_STRIP_GATE(0x803965A8, &ast_c_6233); /* 801D74EC-801D7640 1D1E2C 0154+00 1/1 10/10 0/0 .text set3DStickString__17dMenu_Fmap2DTop_cFUl */ @@ -1788,18 +1808,4 @@ static asm void func_801D810C() { } #pragma pop -/* 803965D0-80396690 022C30 00BC+04 6/6 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_803965D0 = "zelda_map_screen_stone_base.blo"; -SECTION_DEAD static char const* const stringBase_803965F0 = "zelda_map_screen_base.blo"; -SECTION_DEAD static char const* const stringBase_8039660A = "zelda_map_screen_base.btk"; -SECTION_DEAD static char const* const stringBase_80396624 = "tt_block8x8.bti"; -SECTION_DEAD static char const* const stringBase_80396634 = "zelda_field_map_point_cursor.blo"; -SECTION_DEAD static char const* const stringBase_80396655 = "zelda_map_screen_title.blo"; -SECTION_DEAD static char const* const stringBase_80396670 = "zelda_map_screen_title.btk"; -SECTION_DEAD static char const* const stringBase_8039668B = ""; -/* @stringBase0 padding */ -SECTION_DEAD static char const* const pad_8039668C = "\0\0\0"; -#pragma pop +/* 803965D0-803965D0 022C30 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/menu/d_menu_fmap_map.cpp b/src/d/menu/d_menu_fmap_map.cpp index b6006a58289..010c8b04431 100644 --- a/src/d/menu/d_menu_fmap_map.cpp +++ b/src/d/menu/d_menu_fmap_map.cpp @@ -11,8 +11,6 @@ // Types: // -struct dMenu_Fmap_world_data_c {}; - struct dDrawPath_c { struct group_class {}; @@ -34,6 +32,8 @@ struct dMenu_Fmap_region_data_c { /* 8003DB70 */ void getPointStagePathInnerNo(f32, f32, int, int*, int*); }; +struct dMenu_Fmap_world_data_c {}; + struct renderingFmap_c { struct palette_e {}; @@ -297,6 +297,15 @@ asm void renderingFmap_c::entry(dMenu_Fmap_world_data_c* param_0, int param_1, f } #pragma pop +/* ############################################################################################## */ +/* 8039623C-8039623C 02289C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8039623C = "F_SP121"; +/* @stringBase0 padding */ +SECTION_DEAD static char const* const pad_80396244 = "\0\0\0"; +#pragma pop + /* 801CE224-801CE288 1C8B64 0064+00 1/1 0/0 0/0 .text isSwitchSpecialOff__15renderingFmap_cFi */ #pragma push #pragma optimization_level 0 @@ -523,7 +532,7 @@ SECTION_RODATA static u8 const palNo[32] = { 0x00, 0x00, 0x00, 0x11, 0x00, 0x00, 0x00, 0x12, 0x00, 0x00, 0x00, 0x13, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x15, 0x00, 0x00, 0x00, 0x16, 0x00, 0x00, 0x00, 0x17, 0x00, 0x00, 0x00, 0x18, }; -COMPILER_STRIP_GATE(803961B0, &palNo); +COMPILER_STRIP_GATE(0x803961B0, &palNo); /* 801CEB1C-801CEC24 1C945C 0108+00 1/1 0/0 0/0 .text setPointColor__15dMenu_FmapMap_cFf */ @@ -817,7 +826,7 @@ SECTION_RODATA static u8 const l_dungeon_onColor[36] = { 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x1C, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(803961D0, &l_dungeon_onColor); +COMPILER_STRIP_GATE(0x803961D0, &l_dungeon_onColor); #pragma pop /* 803961F4-80396218 022854 0024+00 0/1 0/0 0/0 .rodata l_dungeon_stayColor$4187 */ @@ -828,7 +837,7 @@ SECTION_RODATA static u8 const l_dungeon_stayColor[36] = { 0x00, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 0x34, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 0x3C, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(803961F4, &l_dungeon_stayColor); +COMPILER_STRIP_GATE(0x803961F4, &l_dungeon_stayColor); #pragma pop /* 80396218-8039623C 022878 0024+00 0/1 0/0 0/0 .rodata l_dungeon_pointColor$4188 */ @@ -839,7 +848,7 @@ SECTION_RODATA static u8 const l_dungeon_pointColor[36] = { 0x00, 0x00, 0x00, 0x00, 0x50, 0x00, 0x00, 0x00, 0x54, 0x00, 0x00, 0x00, 0x58, 0x00, 0x00, 0x00, 0x5C, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80396218, &l_dungeon_pointColor); +COMPILER_STRIP_GATE(0x80396218, &l_dungeon_pointColor); #pragma pop /* 801CF2A0-801CF394 1C9BE0 00F4+00 1/0 0/0 0/0 .text getColor__15dMenu_FmapMap_cFi */ @@ -901,11 +910,4 @@ void renderingFmap_c::afterDrawPath() { /* empty function */ } -/* 8039623C-80396248 02289C 0008+04 1/1 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_8039623C = "F_SP121"; -/* @stringBase0 padding */ -SECTION_DEAD static char const* const pad_80396244 = "\0\0\0"; -#pragma pop +/* 8039623C-8039623C 02289C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/menu/d_menu_insect.cpp b/src/d/menu/d_menu_insect.cpp index f4c71d9a277..b29cefe0c94 100644 --- a/src/d/menu/d_menu_insect.cpp +++ b/src/d/menu/d_menu_insect.cpp @@ -40,10 +40,10 @@ struct dSv_event_c { /* 800349BC */ void isEventBit(u16) const; }; -struct JKRArchive {}; - struct J2DPane {}; +struct JKRArchive {}; + struct dSelect_cursor_c { /* 80194220 */ dSelect_cursor_c(u8, f32, JKRArchive*); /* 801950F4 */ void setPos(f32, f32, J2DPane*, bool); @@ -78,10 +78,10 @@ struct J2DPicture { /* 802FC708 */ J2DPicture(ResTIMG const*); }; -struct JMSMesgEntry_c {}; - struct JUTFont {}; +struct JMSMesgEntry_c {}; + struct dMeter2Info_c { /* 8021C250 */ void getString(u32, char*, JMSMesgEntry_c*); /* 8021C544 */ void getStringKanji(u32, char*, JMSMesgEntry_c*); @@ -90,10 +90,6 @@ struct dMeter2Info_c { J2DPicture*, void*, J2DPicture*, int); }; -struct JKRExpHeap {}; - -struct CSTControl {}; - struct STControl { /* 8003219C */ void checkTrigger(); /* 8003242C */ void checkLeftTrigger(); @@ -102,6 +98,10 @@ struct STControl { /* 800325A0 */ void checkDownTrigger(); }; +struct CSTControl {}; + +struct JKRExpHeap {}; + struct dMenu_Insect_c { /* 801D8114 */ dMenu_Insect_c(JKRExpHeap*, STControl*, CSTControl*, u8); /* 801D82F4 */ ~dMenu_Insect_c(); @@ -141,10 +141,10 @@ struct dMenu_Insect_c { /* 801DA630 */ void draw(); }; -struct Vec {}; - struct JAISoundID {}; +struct Vec {}; + struct Z2SeMgr { /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); }; @@ -311,6 +311,12 @@ extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; // /* ############################################################################################## */ +/* 803968C0-803968C0 022F20 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_803968C0 = "tt_block8x8.bti"; +#pragma pop + /* 803BD780-803BD78C 01A8A0 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -566,6 +572,12 @@ asm void dMenu_Insect_c::init() { #pragma pop /* ############################################################################################## */ +/* 803968C0-803968C0 022F20 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_803968D0 = "/res/Layout/insectRes.arc"; +#pragma pop + /* 80454260-80454268 002860 0008+00 2/2 0/0 0/0 .sdata2 @4020 */ SECTION_SDATA2 static f64 lit_4020 = 4503601774854144.0 /* cast s32 to float */; @@ -614,6 +626,15 @@ asm void dMenu_Insect_c::wait_move() { #pragma pop /* ############################################################################################## */ +/* 803968C0-803968C0 022F20 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_803968EA = "" + "\x1B" + "CR[%d]"; +SECTION_DEAD static char const* const stringBase_803968F2 = ""; +#pragma pop + /* 8045426C-80454270 00286C 0004+00 1/1 0/0 0/0 .sdata2 @4135 */ SECTION_SDATA2 static f32 lit_4135 = 48.0f; @@ -718,7 +739,7 @@ SECTION_RODATA static u8 const insect_tag[192] = { 0x00, 0x00, 0x62, 0x61, 0x74, 0x5F, 0x6F, 0x73, 0x00, 0x62, 0x61, 0x74, 0x5F, 0x6D, 0x65, 0x73, 0x00, 0x74, 0x6F, 0x6E, 0x62, 0x5F, 0x6F, 0x73, 0x74, 0x6F, 0x6E, 0x62, 0x5F, 0x6D, 0x65, 0x73, }; -COMPILER_STRIP_GATE(80396690, &insect_tag); +COMPILER_STRIP_GATE(0x80396690, &insect_tag); /* 80396750-80396810 022DB0 00C0+00 1/1 0/0 0/0 .rodata ageha_tag$4250 */ SECTION_RODATA static u8 const ageha_tag[192] = { @@ -735,7 +756,13 @@ SECTION_RODATA static u8 const ageha_tag[192] = { 0x00, 0x61, 0x67, 0x65, 0x68, 0x61, 0x32, 0x30, 0x00, 0x61, 0x67, 0x65, 0x68, 0x61, 0x32, 0x31, 0x00, 0x61, 0x67, 0x65, 0x68, 0x61, 0x32, 0x32, 0x00, 0x61, 0x67, 0x65, 0x68, 0x61, 0x32, 0x33, }; -COMPILER_STRIP_GATE(80396750, &ageha_tag); +COMPILER_STRIP_GATE(0x80396750, &ageha_tag); + +/* 803968C0-803968C0 022F20 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_803968F3 = "zelda_gold_insects.blo"; +#pragma pop /* 801D9644-801D98F0 1D3F84 02AC+00 1/1 0/0 0/0 .text screenSetBase__14dMenu_Insect_cFv */ @@ -748,6 +775,13 @@ asm void dMenu_Insect_c::screenSetBase() { } #pragma pop +/* ############################################################################################## */ +/* 803968C0-803968C0 022F20 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8039690A = "zelda_gold_insects_info.blo"; +#pragma pop + /* 801D98F0-801D9BD0 1D4230 02E0+00 1/1 0/0 0/0 .text screenSetExplain__14dMenu_Insect_cFv */ #pragma push #pragma optimization_level 0 @@ -765,7 +799,7 @@ SECTION_RODATA static u8 const text_a_tag[40] = { 0x5F, 0x32, 0x61, 0x74, 0x65, 0x78, 0x74, 0x31, 0x5F, 0x33, 0x61, 0x74, 0x65, 0x78, 0x74, 0x31, 0x5F, 0x34, 0x61, 0x74, 0x65, 0x78, 0x74, 0x31, 0x5F, 0x35, }; -COMPILER_STRIP_GATE(80396810, &text_a_tag); +COMPILER_STRIP_GATE(0x80396810, &text_a_tag); /* 80396838-80396860 022E98 0028+00 1/1 0/0 0/0 .rodata text_b_tag$4329 */ SECTION_RODATA static u8 const text_b_tag[40] = { @@ -773,7 +807,15 @@ SECTION_RODATA static u8 const text_b_tag[40] = { 0x5F, 0x32, 0x62, 0x74, 0x65, 0x78, 0x74, 0x31, 0x5F, 0x33, 0x62, 0x74, 0x65, 0x78, 0x74, 0x31, 0x5F, 0x34, 0x62, 0x74, 0x65, 0x78, 0x74, 0x31, 0x5F, 0x35, }; -COMPILER_STRIP_GATE(80396838, &text_b_tag); +COMPILER_STRIP_GATE(0x80396838, &text_b_tag); + +/* 803968C0-803968C0 022F20 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80396926 = "zelda_collect_soubi_do_icon_parts.blo"; +/* @stringBase0 padding */ +SECTION_DEAD static char const* const pad_8039694C = "\0\0\0"; +#pragma pop /* 801D9BD0-801D9D4C 1D4510 017C+00 1/1 0/0 0/0 .text screenSetDoIcon__14dMenu_Insect_cFv */ @@ -827,7 +869,7 @@ SECTION_RODATA static u8 const i_evtID[96] = { 0x00, 0x00, 0x01, 0xA1, 0x00, 0x00, 0x01, 0xA2, 0x00, 0x00, 0x01, 0x99, 0x00, 0x00, 0x01, 0x9A, 0x00, 0x00, 0x01, 0x97, 0x00, 0x00, 0x01, 0x98, 0x00, 0x00, 0x01, 0xA3, 0x00, 0x00, 0x01, 0xA4, }; -COMPILER_STRIP_GATE(80396860, &i_evtID); +COMPILER_STRIP_GATE(0x80396860, &i_evtID); /* 801D9E20-801D9E7C 1D4760 005C+00 4/4 0/0 0/0 .text isGiveInsect__14dMenu_Insect_cFii */ @@ -958,22 +1000,7 @@ asm void __sinit_d_menu_insect_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_801DA650 = (void*)__sinit_d_menu_insect_cpp; +REGISTER_CTORS(0x801DA650, __sinit_d_menu_insect_cpp); #pragma pop -/* 803968C0-80396950 022F20 008C+04 8/8 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_803968C0 = "tt_block8x8.bti"; -SECTION_DEAD static char const* const stringBase_803968D0 = "/res/Layout/insectRes.arc"; -SECTION_DEAD static char const* const stringBase_803968EA = "" - "\x1B" - "CR[%d]"; -SECTION_DEAD static char const* const stringBase_803968F2 = ""; -SECTION_DEAD static char const* const stringBase_803968F3 = "zelda_gold_insects.blo"; -SECTION_DEAD static char const* const stringBase_8039690A = "zelda_gold_insects_info.blo"; -SECTION_DEAD static char const* const stringBase_80396926 = "zelda_collect_soubi_do_icon_parts.blo"; -/* @stringBase0 padding */ -SECTION_DEAD static char const* const pad_8039694C = "\0\0\0"; -#pragma pop +/* 803968C0-803968C0 022F20 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/menu/d_menu_item_explain.cpp b/src/d/menu/d_menu_item_explain.cpp index 7eb06e996cc..c652338ee99 100644 --- a/src/d/menu/d_menu_item_explain.cpp +++ b/src/d/menu/d_menu_item_explain.cpp @@ -52,6 +52,8 @@ struct dMsgScrn3Select_c { /* 8023A97C */ void getCharSpace(); }; +struct ResTIMG {}; + struct ResTLUT {}; struct JGeometry { @@ -61,17 +63,15 @@ struct JGeometry { struct TBox2__template0 {}; }; -struct ResTIMG {}; - struct J2DPicture { /* 802FC708 */ J2DPicture(ResTIMG const*); /* 802FC800 */ J2DPicture(u64, JGeometry::TBox2 const&, ResTIMG const*, ResTLUT const*); }; -struct JMSMesgEntry_c {}; - struct JUTFont {}; +struct JMSMesgEntry_c {}; + struct dMeter2Info_c { /* 8021C250 */ void getString(u32, char*, JMSMesgEntry_c*); /* 8021C7FC */ void getStringLength(JUTFont*, f32, f32, char*); @@ -79,18 +79,18 @@ struct dMeter2Info_c { J2DPicture*, void*, J2DPicture*, int); }; -struct J2DOrthoGraph {}; - -struct JKRExpHeap {}; - -struct JKRArchive {}; - struct STControl { /* 8003219C */ void checkTrigger(); /* 80032524 */ void checkUpTrigger(); /* 800325A0 */ void checkDownTrigger(); }; +struct JKRArchive {}; + +struct J2DOrthoGraph {}; + +struct JKRExpHeap {}; + struct dMenu_ItemExplain_c { /* 801DA754 */ dMenu_ItemExplain_c(JKRExpHeap*, JKRArchive*, STControl*, bool); /* 801DAFF0 */ ~dMenu_ItemExplain_c(); @@ -126,10 +126,10 @@ struct dKantera_icon_c { /* 801AEC44 */ void setNowGauge(u16, u16); }; -struct Vec {}; - struct JAISoundID {}; +struct Vec {}; + struct Z2SeMgr { /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); }; @@ -303,14 +303,22 @@ SECTION_RODATA static u8 const name_tag[32] = { 0x69, 0x74, 0x65, 0x6D, 0x5F, 0x6E, 0x30, 0x34, 0x69, 0x74, 0x65, 0x6D, 0x5F, 0x6E, 0x30, 0x35, 0x69, 0x74, 0x65, 0x6D, 0x5F, 0x6E, 0x30, 0x36, 0x69, 0x74, 0x65, 0x6D, 0x5F, 0x6E, 0x30, 0x37, }; -COMPILER_STRIP_GATE(80396950, &name_tag); +COMPILER_STRIP_GATE(0x80396950, &name_tag); /* 80396970-80396990 022FD0 0020+00 1/1 0/0 0/0 .rodata fame_tag$3884 */ SECTION_RODATA static u8 const fame_tag[32] = { 0x66, 0x5F, 0x69, 0x74, 0x65, 0x6D, 0x5F, 0x31, 0x66, 0x5F, 0x69, 0x74, 0x65, 0x6D, 0x5F, 0x32, 0x66, 0x5F, 0x69, 0x74, 0x65, 0x6D, 0x5F, 0x33, 0x66, 0x5F, 0x69, 0x74, 0x65, 0x6D, 0x5F, 0x34, }; -COMPILER_STRIP_GATE(80396970, &fame_tag); +COMPILER_STRIP_GATE(0x80396970, &fame_tag); + +/* 80396990-80396990 022FF0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80396990 = "zelda_item_screen_info.blo"; +SECTION_DEAD static char const* const stringBase_803969AB = ""; +SECTION_DEAD static char const* const stringBase_803969AC = "tt_block8x8.bti"; +#pragma pop /* 803BD8C8-803BD8D4 01A9E8 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { @@ -631,6 +639,17 @@ asm void dMenu_ItemExplain_c::move_proc() { } #pragma pop +/* ############################################################################################## */ +/* 80396990-80396990 022FF0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_803969BC = "" + "\x1B" + "CR[%d]"; +/* @stringBase0 padding */ +SECTION_DEAD static char const* const pad_803969C4 = "\0\0\0"; +#pragma pop + /* 801DBCB4-801DBF44 1D65F4 0290+00 1/0 0/0 0/0 .text move_select_init__19dMenu_ItemExplain_cFv */ #pragma push #pragma optimization_level 0 @@ -791,19 +810,7 @@ asm void __sinit_d_menu_item_explain_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_801DCC8C = (void*)__sinit_d_menu_item_explain_cpp; +REGISTER_CTORS(0x801DCC8C, __sinit_d_menu_item_explain_cpp); #pragma pop -/* 80396990-803969C8 022FF0 0034+04 2/2 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80396990 = "zelda_item_screen_info.blo"; -SECTION_DEAD static char const* const stringBase_803969AB = ""; -SECTION_DEAD static char const* const stringBase_803969AC = "tt_block8x8.bti"; -SECTION_DEAD static char const* const stringBase_803969BC = "" - "\x1B" - "CR[%d]"; -/* @stringBase0 padding */ -SECTION_DEAD static char const* const pad_803969C4 = "\0\0\0"; -#pragma pop +/* 80396990-80396990 022FF0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/menu/d_menu_letter.cpp b/src/d/menu/d_menu_letter.cpp index 90a0d08aab3..2b4d115366c 100644 --- a/src/d/menu/d_menu_letter.cpp +++ b/src/d/menu/d_menu_letter.cpp @@ -31,12 +31,12 @@ struct dSv_letter_info_c { /* 8003449C */ void isLetterReadFlag(int) const; }; -struct JKRArchive {}; - struct J2DPane { /* 802F7100 */ void getBounds(); }; +struct JKRArchive {}; + struct dSelect_cursor_c { /* 80194220 */ dSelect_cursor_c(u8, f32, JKRArchive*); /* 801950F4 */ void setPos(f32, f32, J2DPane*, bool); @@ -45,8 +45,6 @@ struct dSelect_cursor_c { /* 801952A0 */ void setAlphaRate(f32); }; -struct COutFont_c {}; - struct J2DTextBox { /* 801DFA28 */ void getWhite() const; /* 801DFA34 */ void getBlack() const; @@ -56,6 +54,8 @@ struct J2DTextBox { struct JUTFont {}; +struct COutFont_c {}; + struct dMsgString_c { /* 801E1D10 */ void getStringPage(u32, u8, u8, J2DTextBox*, J2DTextBox*, JUTFont*, COutFont_c*, u8); @@ -85,15 +85,15 @@ struct dMeter2Info_c { /* 8021C544 */ void getStringKanji(u32, char*, JMSMesgEntry_c*); }; -struct JKRExpHeap {}; - -struct CSTControl {}; - struct STControl { /* 80032524 */ void checkUpTrigger(); /* 800325A0 */ void checkDownTrigger(); }; +struct CSTControl {}; + +struct JKRExpHeap {}; + struct dMenu_Letter_c { /* 801DCDC0 */ dMenu_Letter_c(JKRExpHeap*, STControl*, CSTControl*); /* 801DCF34 */ ~dMenu_Letter_c(); @@ -143,10 +143,10 @@ struct dMenu_Letter { static u8 letter_data[512]; }; -struct Vec {}; - struct JAISoundID {}; +struct Vec {}; + struct Z2SeMgr { /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); }; @@ -661,6 +661,12 @@ asm void dMenu_Letter_c::init() { #pragma pop /* ############################################################################################## */ +/* 80396DC0-80396DC0 023420 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80396DC0 = "/res/Layout/letres.arc"; +#pragma pop + /* 80454310-80454318 002910 0008+00 7/7 0/0 0/0 .sdata2 @4171 */ SECTION_SDATA2 static f64 lit_4171 = 4503601774854144.0 /* cast s32 to float */; @@ -760,6 +766,13 @@ asm void dMenu_Letter_c::slide_left_move() { } #pragma pop +/* ############################################################################################## */ +/* 80396DC0-80396DC0 023420 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80396DD7 = "%d/%d"; +#pragma pop + /* 801DE334-801DE564 1D8C74 0230+00 1/0 0/0 0/0 .text read_open_init__14dMenu_Letter_cFv */ #pragma push @@ -875,7 +888,7 @@ SECTION_RODATA static u8 const tag_sub0[48] = { 0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x32, 0x73, 0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x33, 0x73, 0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x34, 0x73, 0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x35, 0x73, }; -COMPILER_STRIP_GATE(803969C8, &tag_sub0); +COMPILER_STRIP_GATE(0x803969C8, &tag_sub0); /* 803969F8-80396A28 023058 0030+00 0/1 0/0 0/0 .rodata tag_sub1$4611 */ #pragma push @@ -885,7 +898,7 @@ SECTION_RODATA static u8 const tag_sub1[48] = { 0x00, 0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x32, 0x00, 0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x33, 0x00, 0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x34, 0x00, 0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x35, }; -COMPILER_STRIP_GATE(803969F8, &tag_sub1); +COMPILER_STRIP_GATE(0x803969F8, &tag_sub1); #pragma pop /* 80396A28-80396A58 023088 0030+00 0/1 0/0 0/0 .rodata tag_name0$4612 */ @@ -896,7 +909,7 @@ SECTION_RODATA static u8 const tag_name0[48] = { 0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x66, 0x38, 0x73, 0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x39, 0x73, 0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x31, 0x30, 0x73, 0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x31, 0x31, 0x73, }; -COMPILER_STRIP_GATE(80396A28, &tag_name0); +COMPILER_STRIP_GATE(0x80396A28, &tag_name0); #pragma pop /* 80396A58-80396A88 0230B8 0030+00 0/1 0/0 0/0 .rodata tag_name1$4613 */ @@ -907,7 +920,7 @@ SECTION_RODATA static u8 const tag_name1[48] = { 0x00, 0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x38, 0x00, 0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x39, 0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x31, 0x30, 0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x31, 0x31, }; -COMPILER_STRIP_GATE(80396A58, &tag_name1); +COMPILER_STRIP_GATE(0x80396A58, &tag_name1); #pragma pop /* 80396A88-80396AB8 0230E8 0030+00 0/1 0/0 0/0 .rodata ftag_sub0$4614 */ @@ -918,7 +931,7 @@ SECTION_RODATA static u8 const ftag_sub0[48] = { 0x66, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x32, 0x73, 0x66, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x33, 0x73, 0x66, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x34, 0x73, 0x66, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x35, 0x73, }; -COMPILER_STRIP_GATE(80396A88, &ftag_sub0); +COMPILER_STRIP_GATE(0x80396A88, &ftag_sub0); #pragma pop /* 80396AB8-80396AE8 023118 0030+00 0/1 0/0 0/0 .rodata ftag_sub1$4615 */ @@ -929,7 +942,7 @@ SECTION_RODATA static u8 const ftag_sub1[48] = { 0x00, 0x66, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x32, 0x00, 0x66, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x33, 0x00, 0x66, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x34, 0x00, 0x66, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x35, }; -COMPILER_STRIP_GATE(80396AB8, &ftag_sub1); +COMPILER_STRIP_GATE(0x80396AB8, &ftag_sub1); #pragma pop /* 80396AE8-80396B18 023148 0030+00 0/1 0/0 0/0 .rodata ftag_name0$4616 */ @@ -940,7 +953,7 @@ SECTION_RODATA static u8 const ftag_name0[48] = { 0x66, 0x65, 0x6E, 0x75, 0x5F, 0x66, 0x38, 0x73, 0x66, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x39, 0x73, 0x66, 0x65, 0x6E, 0x75, 0x5F, 0x31, 0x30, 0x73, 0x66, 0x65, 0x6E, 0x75, 0x5F, 0x31, 0x31, 0x73, }; -COMPILER_STRIP_GATE(80396AE8, &ftag_name0); +COMPILER_STRIP_GATE(0x80396AE8, &ftag_name0); #pragma pop /* 80396B18-80396B48 023178 0030+00 0/1 0/0 0/0 .rodata ftag_name1$4617 */ @@ -951,7 +964,7 @@ SECTION_RODATA static u8 const ftag_name1[48] = { 0x00, 0x66, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x38, 0x00, 0x66, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x39, 0x66, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x31, 0x30, 0x66, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x31, 0x31, }; -COMPILER_STRIP_GATE(80396B18, &ftag_name1); +COMPILER_STRIP_GATE(0x80396B18, &ftag_name1); #pragma pop /* 80396B48-80396B78 0231A8 0030+00 0/1 0/0 0/0 .rodata tag_letter$4628 */ @@ -962,7 +975,7 @@ SECTION_RODATA static u8 const tag_letter[48] = { 0x6C, 0x65, 0x74, 0x5F, 0x30, 0x32, 0x5F, 0x6E, 0x6C, 0x65, 0x74, 0x5F, 0x30, 0x33, 0x5F, 0x6E, 0x6C, 0x65, 0x74, 0x5F, 0x30, 0x34, 0x5F, 0x6E, 0x6C, 0x65, 0x74, 0x5F, 0x30, 0x35, 0x5F, 0x6E, }; -COMPILER_STRIP_GATE(80396B48, &tag_letter); +COMPILER_STRIP_GATE(0x80396B48, &tag_letter); #pragma pop /* 80396B78-80396BA8 0231D8 0030+00 0/1 0/0 0/0 .rodata tag_frame$4635 */ @@ -973,7 +986,7 @@ SECTION_RODATA static u8 const tag_frame[48] = { 0x66, 0x6C, 0x61, 0x6D, 0x65, 0x5F, 0x30, 0x32, 0x66, 0x6C, 0x61, 0x6D, 0x65, 0x5F, 0x30, 0x33, 0x66, 0x6C, 0x61, 0x6D, 0x65, 0x5F, 0x30, 0x34, 0x66, 0x6C, 0x61, 0x6D, 0x65, 0x5F, 0x30, 0x35, }; -COMPILER_STRIP_GATE(80396B78, &tag_frame); +COMPILER_STRIP_GATE(0x80396B78, &tag_frame); #pragma pop /* 80396BA8-80396BD8 023208 0030+00 0/1 0/0 0/0 .rodata tag_menu0$4636 */ @@ -984,7 +997,7 @@ SECTION_RODATA static u8 const tag_menu0[48] = { 0x00, 0x66, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x32, 0x00, 0x66, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x33, 0x00, 0x66, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x34, 0x00, 0x66, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x35, }; -COMPILER_STRIP_GATE(80396BA8, &tag_menu0); +COMPILER_STRIP_GATE(0x80396BA8, &tag_menu0); #pragma pop /* 80396BD8-80396C08 023238 0030+00 0/1 0/0 0/0 .rodata tag_menu1$4637 */ @@ -995,7 +1008,7 @@ SECTION_RODATA static u8 const tag_menu1[48] = { 0x00, 0x66, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x38, 0x00, 0x66, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x39, 0x66, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x31, 0x30, 0x66, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x31, 0x31, }; -COMPILER_STRIP_GATE(80396BD8, &tag_menu1); +COMPILER_STRIP_GATE(0x80396BD8, &tag_menu1); #pragma pop /* 80396C08-80396C38 023268 0030+00 0/1 0/0 0/0 .rodata tag_midoku$4638 */ @@ -1006,7 +1019,14 @@ SECTION_RODATA static u8 const tag_midoku[48] = { 0x6D, 0x69, 0x64, 0x6F, 0x6B, 0x75, 0x5F, 0x32, 0x6D, 0x69, 0x64, 0x6F, 0x6B, 0x75, 0x5F, 0x33, 0x6D, 0x69, 0x64, 0x6F, 0x6B, 0x75, 0x5F, 0x34, 0x6D, 0x69, 0x64, 0x6F, 0x6B, 0x75, 0x5F, 0x35, }; -COMPILER_STRIP_GATE(80396C08, &tag_midoku); +COMPILER_STRIP_GATE(0x80396C08, &tag_midoku); +#pragma pop + +/* 80396DC0-80396DC0 023420 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80396DDD = "zelda_letter_select_6menu.blo"; +SECTION_DEAD static char const* const stringBase_80396DFB = ""; #pragma pop /* 801DF010-801DFA28 1D9950 0A18+00 1/1 0/0 0/0 .text screenSetMenu__14dMenu_Letter_cFv @@ -1071,7 +1091,7 @@ SECTION_RODATA static u8 const tag_pip[72] = { 0x35, 0x5F, 0x6E, 0x00, 0x70, 0x69, 0x5F, 0x30, 0x36, 0x5F, 0x6E, 0x00, 0x70, 0x69, 0x5F, 0x30, 0x37, 0x5F, 0x6E, 0x00, 0x70, 0x69, 0x5F, 0x30, 0x38, 0x5F, 0x6E, }; -COMPILER_STRIP_GATE(80396C38, &tag_pip); +COMPILER_STRIP_GATE(0x80396C38, &tag_pip); #pragma pop /* 80396C80-80396CC8 0232E0 0048+00 0/1 0/0 0/0 .rodata tag_pil$4828 */ @@ -1084,7 +1104,7 @@ SECTION_RODATA static u8 const tag_pil[72] = { 0x5F, 0x30, 0x35, 0x00, 0x70, 0x69, 0x5F, 0x6C, 0x5F, 0x30, 0x36, 0x00, 0x70, 0x69, 0x5F, 0x6C, 0x5F, 0x30, 0x37, 0x00, 0x70, 0x69, 0x5F, 0x6C, 0x5F, 0x30, 0x38, }; -COMPILER_STRIP_GATE(80396C80, &tag_pil); +COMPILER_STRIP_GATE(0x80396C80, &tag_pil); #pragma pop /* 80396CC8-80396D10 023328 0048+00 0/1 0/0 0/0 .rodata tag_pii$4829 */ @@ -1097,7 +1117,13 @@ SECTION_RODATA static u8 const tag_pii[72] = { 0x5F, 0x30, 0x35, 0x00, 0x00, 0x00, 0x70, 0x69, 0x5F, 0x30, 0x36, 0x00, 0x00, 0x00, 0x70, 0x69, 0x5F, 0x30, 0x37, 0x00, 0x00, 0x00, 0x70, 0x69, 0x5F, 0x30, 0x38, }; -COMPILER_STRIP_GATE(80396CC8, &tag_pii); +COMPILER_STRIP_GATE(0x80396CC8, &tag_pii); +#pragma pop + +/* 80396DC0-80396DC0 023420 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80396DFC = "zelda_letter_select_base.blo"; #pragma pop /* 801DFA58-801E0330 1DA398 08D8+00 1/1 0/0 0/0 .text screenSetBase__14dMenu_Letter_cFv @@ -1111,6 +1137,13 @@ asm void dMenu_Letter_c::screenSetBase() { } #pragma pop +/* ############################################################################################## */ +/* 80396DC0-80396DC0 023420 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80396E19 = "zelda_letter_select_shadow.blo"; +#pragma pop + /* 801E0330-801E03D8 1DAC70 00A8+00 1/1 0/0 0/0 .text screenSetShadow__14dMenu_Letter_cFv */ #pragma push @@ -1132,7 +1165,15 @@ SECTION_RODATA static u8 const line_tag[96] = { 0x00, 0x00, 0x6C, 0x69, 0x6E, 0x65, 0x31, 0x37, 0x00, 0x00, 0x6C, 0x69, 0x6E, 0x65, 0x31, 0x38, 0x00, 0x00, 0x6C, 0x69, 0x6E, 0x65, 0x31, 0x39, 0x00, 0x00, 0x6C, 0x69, 0x6E, 0x65, 0x32, 0x30, }; -COMPILER_STRIP_GATE(80396D10, &line_tag); +COMPILER_STRIP_GATE(0x80396D10, &line_tag); + +/* 80396DC0-80396DC0 023420 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80396E38 = "zelda_letter_window_base.blo"; +SECTION_DEAD static char const* const stringBase_80396E55 = "zelda_letter_window_spot.blo"; +SECTION_DEAD static char const* const stringBase_80396E72 = "tt_block8x8.bti"; +#pragma pop /* 801E03D8-801E09A8 1DAD18 05D0+00 1/1 0/0 0/0 .text screenSetLetter__14dMenu_Letter_cFv */ @@ -1152,7 +1193,7 @@ SECTION_RODATA static u8 const text_a_tag[40] = { 0x5F, 0x32, 0x61, 0x74, 0x65, 0x78, 0x74, 0x31, 0x5F, 0x33, 0x61, 0x74, 0x65, 0x78, 0x74, 0x31, 0x5F, 0x34, 0x61, 0x74, 0x65, 0x78, 0x74, 0x31, 0x5F, 0x35, }; -COMPILER_STRIP_GATE(80396D70, &text_a_tag); +COMPILER_STRIP_GATE(0x80396D70, &text_a_tag); /* 80396D98-80396DC0 0233F8 0028+00 1/1 0/0 0/0 .rodata text_b_tag$5025 */ SECTION_RODATA static u8 const text_b_tag[40] = { @@ -1160,7 +1201,13 @@ SECTION_RODATA static u8 const text_b_tag[40] = { 0x5F, 0x32, 0x62, 0x74, 0x65, 0x78, 0x74, 0x31, 0x5F, 0x33, 0x62, 0x74, 0x65, 0x78, 0x74, 0x31, 0x5F, 0x34, 0x62, 0x74, 0x65, 0x78, 0x74, 0x31, 0x5F, 0x35, }; -COMPILER_STRIP_GATE(80396D98, &text_b_tag); +COMPILER_STRIP_GATE(0x80396D98, &text_b_tag); + +/* 80396DC0-80396DC0 023420 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80396E82 = "zelda_collect_soubi_do_icon_parts.blo"; +#pragma pop /* 801E09A8-801E0B24 1DB2E8 017C+00 1/1 0/0 0/0 .text screenSetDoIcon__14dMenu_Letter_cFv */ @@ -1310,21 +1357,7 @@ asm void __sinit_d_menu_letter_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_801E1D7C = (void*)__sinit_d_menu_letter_cpp; +REGISTER_CTORS(0x801E1D7C, __sinit_d_menu_letter_cpp); #pragma pop -/* 80396DC0-80396EA8 023420 00E8+00 10/10 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80396DC0 = "/res/Layout/letres.arc"; -SECTION_DEAD static char const* const stringBase_80396DD7 = "%d/%d"; -SECTION_DEAD static char const* const stringBase_80396DDD = "zelda_letter_select_6menu.blo"; -SECTION_DEAD static char const* const stringBase_80396DFB = ""; -SECTION_DEAD static char const* const stringBase_80396DFC = "zelda_letter_select_base.blo"; -SECTION_DEAD static char const* const stringBase_80396E19 = "zelda_letter_select_shadow.blo"; -SECTION_DEAD static char const* const stringBase_80396E38 = "zelda_letter_window_base.blo"; -SECTION_DEAD static char const* const stringBase_80396E55 = "zelda_letter_window_spot.blo"; -SECTION_DEAD static char const* const stringBase_80396E72 = "tt_block8x8.bti"; -SECTION_DEAD static char const* const stringBase_80396E82 = "zelda_collect_soubi_do_icon_parts.blo"; -#pragma pop +/* 80396DC0-80396DC0 023420 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/menu/d_menu_map_common.cpp b/src/d/menu/d_menu_map_common.cpp index 0072141d4af..cc2c77e853b 100644 --- a/src/d/menu/d_menu_map_common.cpp +++ b/src/d/menu/d_menu_map_common.cpp @@ -153,6 +153,50 @@ asm dMenuMapCommon_c::~dMenuMapCommon_c() { #pragma pop /* ############################################################################################## */ +/* 803959C0-803959C0 022020 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_803959C0 = "tt_map_icon_boss_s_ci8_16_00.bti"; +SECTION_DEAD static char const* const stringBase_803959E1 = "tt_map_icon_boss_ci8_32_00.bti"; +SECTION_DEAD static char const* const stringBase_80395A00 = "im_map_icon_enter_ci8_24_02.bti"; +SECTION_DEAD static char const* const stringBase_80395A20 = "im_map_icon_enter_ci8_02.bti"; +SECTION_DEAD static char const* const stringBase_80395A3D = "tt_map_icon_enter_s_ci8_24_00.bti"; +SECTION_DEAD static char const* const stringBase_80395A5F = "tt_map_icon_enter_ci8_32_00.bti"; +SECTION_DEAD static char const* const stringBase_80395A7F = "im_map_icon_warp_24_ci8_00.bti"; +SECTION_DEAD static char const* const stringBase_80395A9E = "im_map_icon_warp_32_ci8_00.bti"; +SECTION_DEAD static char const* const stringBase_80395ABD = "tt_map_icon_box_s_ci8_24_00.bti"; +SECTION_DEAD static char const* const stringBase_80395ADD = "tt_map_icon_box_ci8_32_00.bti"; +SECTION_DEAD static char const* const stringBase_80395AFB = + "tt_map_icon_s_size_circle_ci4_gray_00.bti"; +SECTION_DEAD static char const* const stringBase_80395B25 = "tt_map_icon_key_ci8_32_00.bti"; +SECTION_DEAD static char const* const stringBase_80395B43 = "tt_map_icon_s_size_circle_ci4_00.bti"; +SECTION_DEAD static char const* const stringBase_80395B68 = "st_yuki_M.bti"; +SECTION_DEAD static char const* const stringBase_80395B76 = "st_yuki_W.bti"; +SECTION_DEAD static char const* const stringBase_80395B84 = + "tt_map_icon_s_size_circle_ci4_yellow_00.bti"; +SECTION_DEAD static char const* const stringBase_80395BB0 = "st_gold_wolf.bti"; +SECTION_DEAD static char const* const stringBase_80395BC1 = "tt_map_icon_monkey_ci8_32_00.bti"; +SECTION_DEAD static char const* const stringBase_80395BE2 = + "tt_map_icon_s_size_circle_ci4_blue_00.bti"; +SECTION_DEAD static char const* const stringBase_80395C0C = "ni_obacyan.bti"; +SECTION_DEAD static char const* const stringBase_80395C1B = + "im_zelda_map_icon_copy_stone_statue_snup_try_00_" + "04.bti"; +SECTION_DEAD static char const* const stringBase_80395C52 = "tt_map_icon_link_s_ci8_24_00.bti"; +SECTION_DEAD static char const* const stringBase_80395C73 = "tt_map_icon_link_ci8_32_00.bti"; +SECTION_DEAD static char const* const stringBase_80395C92 = "tt_map_icon_penant_s_ci8_24_00.bti"; +SECTION_DEAD static char const* const stringBase_80395CB5 = "tt_map_icon_penant_ci8_32_00.bti"; +SECTION_DEAD static char const* const stringBase_80395CD6 = "im_black_32.bti"; +SECTION_DEAD static char const* const stringBase_80395CE6 = + "im_hikari_no_shizuku_try_10_00_24x24.bti"; +SECTION_DEAD static char const* const stringBase_80395D0F = "im_zelda_map_icon_hikari_ball_03.bti"; +SECTION_DEAD static char const* const stringBase_80395D34 = "im_map_icon_iron_ball_ci8_32_00.bti"; +SECTION_DEAD static char const* const stringBase_80395D58 = "im_map_icon_basha_ci8.bti"; +SECTION_DEAD static char const* const stringBase_80395D72 = "im_nijumaru_40x40_ind_01.bti"; +/* @stringBase0 padding */ +SECTION_DEAD static char const* const pad_80395D8F = ""; +#pragma pop + /* 804540DC-804540E0 0026DC 0004+00 7/7 0/0 0/0 .sdata2 @3882 */ SECTION_SDATA2 static f32 lit_3882 = 1.0f; @@ -301,47 +345,4 @@ asm void dMenuMapCommon_c::debugIcon() { } #pragma pop -/* 803959C0-80395D90 022020 03CF+01 1/1 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_803959C0 = "tt_map_icon_boss_s_ci8_16_00.bti"; -SECTION_DEAD static char const* const stringBase_803959E1 = "tt_map_icon_boss_ci8_32_00.bti"; -SECTION_DEAD static char const* const stringBase_80395A00 = "im_map_icon_enter_ci8_24_02.bti"; -SECTION_DEAD static char const* const stringBase_80395A20 = "im_map_icon_enter_ci8_02.bti"; -SECTION_DEAD static char const* const stringBase_80395A3D = "tt_map_icon_enter_s_ci8_24_00.bti"; -SECTION_DEAD static char const* const stringBase_80395A5F = "tt_map_icon_enter_ci8_32_00.bti"; -SECTION_DEAD static char const* const stringBase_80395A7F = "im_map_icon_warp_24_ci8_00.bti"; -SECTION_DEAD static char const* const stringBase_80395A9E = "im_map_icon_warp_32_ci8_00.bti"; -SECTION_DEAD static char const* const stringBase_80395ABD = "tt_map_icon_box_s_ci8_24_00.bti"; -SECTION_DEAD static char const* const stringBase_80395ADD = "tt_map_icon_box_ci8_32_00.bti"; -SECTION_DEAD static char const* const stringBase_80395AFB = - "tt_map_icon_s_size_circle_ci4_gray_00.bti"; -SECTION_DEAD static char const* const stringBase_80395B25 = "tt_map_icon_key_ci8_32_00.bti"; -SECTION_DEAD static char const* const stringBase_80395B43 = "tt_map_icon_s_size_circle_ci4_00.bti"; -SECTION_DEAD static char const* const stringBase_80395B68 = "st_yuki_M.bti"; -SECTION_DEAD static char const* const stringBase_80395B76 = "st_yuki_W.bti"; -SECTION_DEAD static char const* const stringBase_80395B84 = - "tt_map_icon_s_size_circle_ci4_yellow_00.bti"; -SECTION_DEAD static char const* const stringBase_80395BB0 = "st_gold_wolf.bti"; -SECTION_DEAD static char const* const stringBase_80395BC1 = "tt_map_icon_monkey_ci8_32_00.bti"; -SECTION_DEAD static char const* const stringBase_80395BE2 = - "tt_map_icon_s_size_circle_ci4_blue_00.bti"; -SECTION_DEAD static char const* const stringBase_80395C0C = "ni_obacyan.bti"; -SECTION_DEAD static char const* const stringBase_80395C1B = - "im_zelda_map_icon_copy_stone_statue_snup_try_00_" - "04.bti"; -SECTION_DEAD static char const* const stringBase_80395C52 = "tt_map_icon_link_s_ci8_24_00.bti"; -SECTION_DEAD static char const* const stringBase_80395C73 = "tt_map_icon_link_ci8_32_00.bti"; -SECTION_DEAD static char const* const stringBase_80395C92 = "tt_map_icon_penant_s_ci8_24_00.bti"; -SECTION_DEAD static char const* const stringBase_80395CB5 = "tt_map_icon_penant_ci8_32_00.bti"; -SECTION_DEAD static char const* const stringBase_80395CD6 = "im_black_32.bti"; -SECTION_DEAD static char const* const stringBase_80395CE6 = - "im_hikari_no_shizuku_try_10_00_24x24.bti"; -SECTION_DEAD static char const* const stringBase_80395D0F = "im_zelda_map_icon_hikari_ball_03.bti"; -SECTION_DEAD static char const* const stringBase_80395D34 = "im_map_icon_iron_ball_ci8_32_00.bti"; -SECTION_DEAD static char const* const stringBase_80395D58 = "im_map_icon_basha_ci8.bti"; -SECTION_DEAD static char const* const stringBase_80395D72 = "im_nijumaru_40x40_ind_01.bti"; -/* @stringBase0 padding */ -SECTION_DEAD static char const* const pad_80395D8F = ""; -#pragma pop +/* 803959C0-803959C0 022020 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/menu/d_menu_option.cpp b/src/d/menu/d_menu_option.cpp index 41391643b8f..a4aa32107b4 100644 --- a/src/d/menu/d_menu_option.cpp +++ b/src/d/menu/d_menu_option.cpp @@ -28,12 +28,8 @@ struct mDoCPd_c { struct dSv_player_config_c { /* 80034684 */ void getSound(); - /* 8003468C */ void setSound(u8); - /* 8003469C */ void setVibration(u8); }; -struct JKRArchive {}; - struct J2DBasePosition {}; struct J2DPane { @@ -42,6 +38,8 @@ struct J2DPane { /* 802F7FCC */ void animationTransform(); }; +struct JKRArchive {}; + struct dSelect_cursor_c { /* 80194220 */ dSelect_cursor_c(u8, f32, JKRArchive*); /* 801950F4 */ void setPos(f32, f32, J2DPane*, bool); @@ -174,14 +172,13 @@ struct dFile_warning_c { }; struct dComIfG_play_c { - /* 8002B3A8 */ void setNowVibration(u8); /* 8002B3B0 */ void getNowVibration(); }; -struct Vec {}; - struct JAISoundID {}; +struct Vec {}; + struct Z2SeMgr { /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); }; @@ -896,7 +893,7 @@ SECTION_RODATA static u8 const dMo_soundMode[12 + 4 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(80396EA8, &dMo_soundMode); +COMPILER_STRIP_GATE(0x80396EA8, &dMo_soundMode); /* 80396EB8-80396EE0 023518 0028+00 0/1 0/0 0/0 .rodata text_a_tag$3904 */ #pragma push @@ -906,7 +903,7 @@ SECTION_RODATA static u8 const text_a_tag_3904[40] = { 0x5F, 0x32, 0x61, 0x74, 0x65, 0x78, 0x74, 0x31, 0x5F, 0x33, 0x61, 0x74, 0x65, 0x78, 0x74, 0x31, 0x5F, 0x34, 0x61, 0x74, 0x65, 0x78, 0x74, 0x31, 0x5F, 0x35, }; -COMPILER_STRIP_GATE(80396EB8, &text_a_tag_3904); +COMPILER_STRIP_GATE(0x80396EB8, &text_a_tag_3904); #pragma pop /* 80396EE0-80396F08 023540 0028+00 0/1 0/0 0/0 .rodata text_b_tag$3905 */ @@ -917,7 +914,7 @@ SECTION_RODATA static u8 const text_b_tag_3905[40] = { 0x5F, 0x32, 0x62, 0x74, 0x65, 0x78, 0x74, 0x31, 0x5F, 0x33, 0x62, 0x74, 0x65, 0x78, 0x74, 0x31, 0x5F, 0x34, 0x62, 0x74, 0x65, 0x78, 0x74, 0x31, 0x5F, 0x35, }; -COMPILER_STRIP_GATE(80396EE0, &text_b_tag_3905); +COMPILER_STRIP_GATE(0x80396EE0, &text_b_tag_3905); #pragma pop /* 80396F08-80396F18 023568 0010+00 0/1 0/0 0/0 .rodata l_tagName012$3918 */ @@ -926,7 +923,7 @@ COMPILER_STRIP_GATE(80396EE0, &text_b_tag_3905); SECTION_RODATA static u8 const l_tagName012[16] = { 0x00, 0x00, 0x77, 0x5F, 0x6E, 0x6F, 0x5F, 0x6E, 0x00, 0x77, 0x5F, 0x79, 0x65, 0x73, 0x5F, 0x6E, }; -COMPILER_STRIP_GATE(80396F08, &l_tagName012); +COMPILER_STRIP_GATE(0x80396F08, &l_tagName012); #pragma pop /* 80396F18-80396F28 023578 0010+00 0/1 0/0 0/0 .rodata l_tagName013$3919 */ @@ -935,7 +932,7 @@ COMPILER_STRIP_GATE(80396F08, &l_tagName012); SECTION_RODATA static u8 const l_tagName013[16] = { 0x00, 0x00, 0x77, 0x5F, 0x6E, 0x6F, 0x5F, 0x74, 0x00, 0x77, 0x5F, 0x79, 0x65, 0x73, 0x5F, 0x74, }; -COMPILER_STRIP_GATE(80396F18, &l_tagName013); +COMPILER_STRIP_GATE(0x80396F18, &l_tagName013); #pragma pop /* 80396F28-80396F38 023588 0010+00 0/1 0/0 0/0 .rodata l_tagName9$3928 */ @@ -944,7 +941,7 @@ COMPILER_STRIP_GATE(80396F18, &l_tagName013); SECTION_RODATA static u8 const l_tagName9[16] = { 0x00, 0x00, 0x77, 0x5F, 0x6E, 0x6F, 0x5F, 0x6D, 0x00, 0x77, 0x5F, 0x79, 0x65, 0x73, 0x5F, 0x6D, }; -COMPILER_STRIP_GATE(80396F28, &l_tagName9); +COMPILER_STRIP_GATE(0x80396F28, &l_tagName9); #pragma pop /* 80396F38-80396F48 023598 0010+00 0/1 0/0 0/0 .rodata l_tagName10$3929 */ @@ -953,7 +950,7 @@ COMPILER_STRIP_GATE(80396F28, &l_tagName9); SECTION_RODATA static u8 const l_tagName10[16] = { 0x00, 0x00, 0x77, 0x5F, 0x6E, 0x6F, 0x5F, 0x67, 0x00, 0x77, 0x5F, 0x79, 0x65, 0x73, 0x5F, 0x67, }; -COMPILER_STRIP_GATE(80396F38, &l_tagName10); +COMPILER_STRIP_GATE(0x80396F38, &l_tagName10); #pragma pop /* 80396F48-80396F58 0235A8 0010+00 0/1 0/0 0/0 .rodata l_tagName11$3930 */ @@ -962,7 +959,24 @@ COMPILER_STRIP_GATE(80396F38, &l_tagName10); SECTION_RODATA static u8 const l_tagName11[16] = { 0x00, 0x77, 0x5F, 0x6E, 0x6F, 0x5F, 0x67, 0x72, 0x77, 0x5F, 0x79, 0x65, 0x73, 0x5F, 0x67, 0x72, }; -COMPILER_STRIP_GATE(80396F48, &l_tagName11); +COMPILER_STRIP_GATE(0x80396F48, &l_tagName11); +#pragma pop + +/* 803975D8-803975D8 023C38 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_803975D8 = "zelda_option_select_menu.blo"; +SECTION_DEAD static char const* const stringBase_803975F5 = ""; +SECTION_DEAD static char const* const stringBase_803975F6 = "zelda_option_base.blo"; +SECTION_DEAD static char const* const stringBase_8039760C = "zelda_option_menu_text.blo"; +SECTION_DEAD static char const* const stringBase_80397627 = "zelda_option_menu_shadow.blo"; +SECTION_DEAD static char const* const stringBase_80397644 = "zelda_option_check.blo"; +SECTION_DEAD static char const* const stringBase_8039765B = "zelda_collect_soubi_do_icon_parts.blo"; +SECTION_DEAD static char const* const stringBase_80397681 = "tt_block8x8.bti"; +SECTION_DEAD static char const* const stringBase_80397691 = "zelda_file_select_yes_no_window.blo"; +SECTION_DEAD static char const* const stringBase_803976B5 = "zelda_file_select_yes_no_window.bck"; +SECTION_DEAD static char const* const stringBase_803976D9 = "zelda_file_select_yes_no_window.bpk"; +SECTION_DEAD static char const* const stringBase_803976FD = "zelda_file_select_yes_no_window.btk"; #pragma pop /* 80454328-8045432C 002928 0002+02 1/1 0/0 0/0 .sdata2 l_msgNum2$3920 */ @@ -1106,6 +1120,13 @@ asm void dMenu_Option_c::setAnimation() { } #pragma pop +/* ############################################################################################## */ +/* 803975D8-803975D8 023C38 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80397721 = "/res/Layout/optres.arc"; +#pragma pop + /* 801E3B98-801E3DE0 1DE4D8 0248+00 0/0 2/2 0/0 .text _open__14dMenu_Option_cFv */ #pragma push #pragma optimization_level 0 @@ -1449,7 +1470,7 @@ SECTION_RODATA static u8 const tag_frame[48] = { 0x66, 0x6C, 0x61, 0x6D, 0x65, 0x5F, 0x30, 0x32, 0x66, 0x6C, 0x61, 0x6D, 0x65, 0x5F, 0x30, 0x33, 0x66, 0x6C, 0x61, 0x6D, 0x65, 0x5F, 0x30, 0x34, 0x66, 0x6C, 0x61, 0x6D, 0x65, 0x5F, 0x30, 0x35, }; -COMPILER_STRIP_GATE(80396F58, &tag_frame); +COMPILER_STRIP_GATE(0x80396F58, &tag_frame); #pragma pop /* 80396F88-80396FB8 0235E8 0030+00 0/1 0/0 0/0 .rodata tag_menu0$5202 */ @@ -1460,7 +1481,7 @@ SECTION_RODATA static u8 const tag_menu0[48] = { 0x00, 0x66, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x32, 0x00, 0x66, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x33, 0x00, 0x66, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x34, 0x00, 0x66, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x35, }; -COMPILER_STRIP_GATE(80396F88, &tag_menu0); +COMPILER_STRIP_GATE(0x80396F88, &tag_menu0); #pragma pop /* 80396FB8-80396FE8 023618 0030+00 0/1 0/0 0/0 .rodata let_n$5214 */ @@ -1471,7 +1492,7 @@ SECTION_RODATA static u8 const let_n[48] = { 0x6C, 0x65, 0x74, 0x5F, 0x30, 0x32, 0x5F, 0x6E, 0x6C, 0x65, 0x74, 0x5F, 0x30, 0x33, 0x5F, 0x6E, 0x6C, 0x65, 0x74, 0x5F, 0x30, 0x34, 0x5F, 0x6E, 0x6C, 0x65, 0x74, 0x5F, 0x30, 0x35, 0x5F, 0x6E, }; -COMPILER_STRIP_GATE(80396FB8, &let_n); +COMPILER_STRIP_GATE(0x80396FB8, &let_n); #pragma pop /* 80396FE8-80397018 023648 0030+00 0/1 0/0 0/0 .rodata let2_n$5215 */ @@ -1482,7 +1503,7 @@ SECTION_RODATA static u8 const let2_n[48] = { 0x6C, 0x65, 0x74, 0x5F, 0x30, 0x32, 0x5F, 0x6E, 0x6C, 0x65, 0x74, 0x5F, 0x30, 0x33, 0x5F, 0x6E, 0x6C, 0x65, 0x74, 0x5F, 0x30, 0x34, 0x5F, 0x6E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80396FE8, &let2_n); +COMPILER_STRIP_GATE(0x80396FE8, &let2_n); #pragma pop /* 80397018-80397048 023678 0030+00 0/1 0/0 0/0 .rodata menu_n$5216 */ @@ -1493,7 +1514,7 @@ SECTION_RODATA static u8 const menu_n[48] = { 0x00, 0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x6E, 0x32, 0x00, 0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x6E, 0x33, 0x00, 0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x6E, 0x34, 0x00, 0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x6E, 0x35, }; -COMPILER_STRIP_GATE(80397018, &menu_n); +COMPILER_STRIP_GATE(0x80397018, &menu_n); #pragma pop /* 80397048-80397078 0236A8 0030+00 0/1 0/0 0/0 .rodata menu2_n$5217 */ @@ -1504,7 +1525,7 @@ SECTION_RODATA static u8 const menu2_n[48] = { 0x00, 0x00, 0x6D, 0x77, 0x5F, 0x6E, 0x5F, 0x32, 0x00, 0x00, 0x6D, 0x77, 0x5F, 0x6E, 0x5F, 0x33, 0x00, 0x00, 0x6D, 0x77, 0x5F, 0x6E, 0x5F, 0x34, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80397048, &menu2_n); +COMPILER_STRIP_GATE(0x80397048, &menu2_n); #pragma pop /* 80397078-803970A8 0236D8 0030+00 0/1 0/0 0/0 .rodata al0_n$5218 */ @@ -1515,7 +1536,7 @@ SECTION_RODATA static u8 const al0_n[48] = { 0x73, 0x5F, 0x67, 0x72, 0x72, 0x5F, 0x30, 0x32, 0x73, 0x5F, 0x67, 0x72, 0x72, 0x5F, 0x30, 0x33, 0x73, 0x5F, 0x67, 0x72, 0x72, 0x5F, 0x30, 0x34, 0x73, 0x5F, 0x67, 0x72, 0x72, 0x5F, 0x30, 0x35, }; -COMPILER_STRIP_GATE(80397078, &al0_n); +COMPILER_STRIP_GATE(0x80397078, &al0_n); #pragma pop /* 803970A8-803970D8 023708 0030+00 0/1 0/0 0/0 .rodata al1_n$5219 */ @@ -1526,7 +1547,7 @@ SECTION_RODATA static u8 const al1_n[48] = { 0x63, 0x5F, 0x67, 0x72, 0x72, 0x5F, 0x30, 0x32, 0x63, 0x5F, 0x67, 0x72, 0x72, 0x5F, 0x30, 0x33, 0x63, 0x5F, 0x67, 0x72, 0x72, 0x5F, 0x30, 0x34, 0x63, 0x5F, 0x67, 0x72, 0x72, 0x5F, 0x30, 0x35, }; -COMPILER_STRIP_GATE(803970A8, &al1_n); +COMPILER_STRIP_GATE(0x803970A8, &al1_n); #pragma pop /* 803970D8-80397108 023738 0030+00 0/1 0/0 0/0 .rodata al2_n$5220 */ @@ -1537,7 +1558,7 @@ SECTION_RODATA static u8 const al2_n[48] = { 0x73, 0x5F, 0x67, 0x72, 0x6C, 0x5F, 0x30, 0x32, 0x73, 0x5F, 0x67, 0x72, 0x6C, 0x5F, 0x30, 0x33, 0x73, 0x5F, 0x67, 0x72, 0x6C, 0x5F, 0x30, 0x34, 0x73, 0x5F, 0x67, 0x72, 0x6C, 0x5F, 0x30, 0x35, }; -COMPILER_STRIP_GATE(803970D8, &al2_n); +COMPILER_STRIP_GATE(0x803970D8, &al2_n); #pragma pop /* 80397108-80397138 023768 0030+00 0/1 0/0 0/0 .rodata al3_n$5221 */ @@ -1548,7 +1569,7 @@ SECTION_RODATA static u8 const al3_n[48] = { 0x63, 0x5F, 0x67, 0x72, 0x6C, 0x5F, 0x30, 0x32, 0x63, 0x5F, 0x67, 0x72, 0x6C, 0x5F, 0x30, 0x33, 0x63, 0x5F, 0x67, 0x72, 0x6C, 0x5F, 0x30, 0x34, 0x63, 0x5F, 0x67, 0x72, 0x6C, 0x5F, 0x30, 0x35, }; -COMPILER_STRIP_GATE(80397108, &al3_n); +COMPILER_STRIP_GATE(0x80397108, &al3_n); #pragma pop /* 80397138-80397160 023798 0028+00 0/1 0/0 0/0 .rodata haihail_n$5238 */ @@ -1559,7 +1580,7 @@ SECTION_RODATA static u8 const haihail_n[40] = { 0x6C, 0x31, 0x79, 0x5F, 0x73, 0x65, 0x74, 0x5F, 0x6C, 0x32, 0x79, 0x5F, 0x73, 0x65, 0x74, 0x5F, 0x6C, 0x33, 0x79, 0x5F, 0x73, 0x65, 0x74, 0x5F, 0x6C, 0x34, }; -COMPILER_STRIP_GATE(80397138, &haihail_n); +COMPILER_STRIP_GATE(0x80397138, &haihail_n); #pragma pop /* 80397160-80397188 0237C0 0028+00 0/1 0/0 0/0 .rodata haihair_n$5239 */ @@ -1570,7 +1591,7 @@ SECTION_RODATA static u8 const haihair_n[40] = { 0x72, 0x31, 0x79, 0x5F, 0x73, 0x65, 0x74, 0x5F, 0x72, 0x32, 0x79, 0x5F, 0x73, 0x65, 0x74, 0x5F, 0x72, 0x33, 0x79, 0x5F, 0x73, 0x65, 0x74, 0x5F, 0x72, 0x34, }; -COMPILER_STRIP_GATE(80397160, &haihair_n); +COMPILER_STRIP_GATE(0x80397160, &haihair_n); #pragma pop /* 80397188-803971B8 0237E8 0030+00 0/1 0/0 0/0 .rodata menu3_n$5256 */ @@ -1581,7 +1602,7 @@ SECTION_RODATA static u8 const menu3_n[48] = { 0x6D, 0x65, 0x6E, 0x75, 0x61, 0x70, 0x6E, 0x32, 0x6D, 0x65, 0x6E, 0x75, 0x61, 0x70, 0x6E, 0x33, 0x6D, 0x65, 0x6E, 0x75, 0x61, 0x70, 0x6E, 0x34, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80397188, &menu3_n); +COMPILER_STRIP_GATE(0x80397188, &menu3_n); #pragma pop /* 803971B8-803971E0 023818 0028+00 0/1 0/0 0/0 .rodata tv_btnA$5275 */ @@ -1592,7 +1613,7 @@ SECTION_RODATA static u8 const tv_btnA[40] = { 0x74, 0x32, 0x63, 0x6F, 0x6E, 0x74, 0x5F, 0x61, 0x74, 0x33, 0x63, 0x6F, 0x6E, 0x74, 0x5F, 0x61, 0x74, 0x34, 0x00, 0x63, 0x6F, 0x6E, 0x74, 0x5F, 0x61, 0x74, }; -COMPILER_STRIP_GATE(803971B8, &tv_btnA); +COMPILER_STRIP_GATE(0x803971B8, &tv_btnA); #pragma pop /* 803971E0-80397208 023840 0028+00 0/1 0/0 0/0 .rodata ftv_btnA$5276 */ @@ -1603,7 +1624,7 @@ SECTION_RODATA static u8 const ftv_btnA[40] = { 0x74, 0x32, 0x66, 0x6F, 0x6E, 0x74, 0x5F, 0x61, 0x74, 0x33, 0x66, 0x6F, 0x6E, 0x74, 0x5F, 0x61, 0x74, 0x34, 0x00, 0x66, 0x6F, 0x6E, 0x74, 0x5F, 0x61, 0x74, }; -COMPILER_STRIP_GATE(803971E0, &ftv_btnA); +COMPILER_STRIP_GATE(0x803971E0, &ftv_btnA); #pragma pop /* 80397208-80397218 023868 0010+00 0/1 0/0 0/0 .rodata fenu_t0$5282 */ @@ -1612,7 +1633,7 @@ COMPILER_STRIP_GATE(803971E0, &ftv_btnA); SECTION_RODATA static u8 const fenu_t0[16] = { 0x66, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x30, 0x73, 0x00, 0x66, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x30, }; -COMPILER_STRIP_GATE(80397208, &fenu_t0); +COMPILER_STRIP_GATE(0x80397208, &fenu_t0); #pragma pop /* 80397218-80397228 023878 0010+00 0/1 0/0 0/0 .rodata menu_t0$5283 */ @@ -1621,7 +1642,7 @@ COMPILER_STRIP_GATE(80397208, &fenu_t0); SECTION_RODATA static u8 const menu_t0[16] = { 0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x30, 0x73, 0x00, 0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x30, }; -COMPILER_STRIP_GATE(80397218, &menu_t0); +COMPILER_STRIP_GATE(0x80397218, &menu_t0); #pragma pop /* 80397228-80397238 023888 0010+00 0/1 0/0 0/0 .rodata fenu_t2$5289 */ @@ -1630,7 +1651,7 @@ COMPILER_STRIP_GATE(80397218, &menu_t0); SECTION_RODATA static u8 const fenu_t2[16] = { 0x66, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x31, 0x73, 0x00, 0x66, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x31, }; -COMPILER_STRIP_GATE(80397228, &fenu_t2); +COMPILER_STRIP_GATE(0x80397228, &fenu_t2); #pragma pop /* 80397238-80397248 023898 0010+00 0/1 0/0 0/0 .rodata menu_t2$5290 */ @@ -1639,7 +1660,7 @@ COMPILER_STRIP_GATE(80397228, &fenu_t2); SECTION_RODATA static u8 const menu_t2[16] = { 0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x31, 0x73, 0x00, 0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x31, }; -COMPILER_STRIP_GATE(80397238, &menu_t2); +COMPILER_STRIP_GATE(0x80397238, &menu_t2); #pragma pop /* 80397248-80397258 0238A8 0010+00 0/1 0/0 0/0 .rodata fenu_t3$5296 */ @@ -1648,7 +1669,7 @@ COMPILER_STRIP_GATE(80397238, &menu_t2); SECTION_RODATA static u8 const fenu_t3[16] = { 0x66, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x32, 0x73, 0x00, 0x66, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x32, }; -COMPILER_STRIP_GATE(80397248, &fenu_t3); +COMPILER_STRIP_GATE(0x80397248, &fenu_t3); #pragma pop /* 80397258-80397268 0238B8 0010+00 0/1 0/0 0/0 .rodata menu_t3$5297 */ @@ -1657,7 +1678,7 @@ COMPILER_STRIP_GATE(80397248, &fenu_t3); SECTION_RODATA static u8 const menu_t3[16] = { 0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x32, 0x73, 0x00, 0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x32, }; -COMPILER_STRIP_GATE(80397258, &menu_t3); +COMPILER_STRIP_GATE(0x80397258, &menu_t3); #pragma pop /* 80397268-80397278 0238C8 0010+00 0/1 0/0 0/0 .rodata fenu_t4$5303 */ @@ -1666,7 +1687,7 @@ COMPILER_STRIP_GATE(80397258, &menu_t3); SECTION_RODATA static u8 const fenu_t4[16] = { 0x66, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x33, 0x73, 0x00, 0x66, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x33, }; -COMPILER_STRIP_GATE(80397268, &fenu_t4); +COMPILER_STRIP_GATE(0x80397268, &fenu_t4); #pragma pop /* 80397278-80397288 0238D8 0010+00 0/1 0/0 0/0 .rodata menu_t4$5304 */ @@ -1675,7 +1696,7 @@ COMPILER_STRIP_GATE(80397268, &fenu_t4); SECTION_RODATA static u8 const menu_t4[16] = { 0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x33, 0x73, 0x00, 0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x33, }; -COMPILER_STRIP_GATE(80397278, &menu_t4); +COMPILER_STRIP_GATE(0x80397278, &menu_t4); #pragma pop /* 80397288-80397298 0238E8 0010+00 0/1 0/0 0/0 .rodata fenu_t1$5310 */ @@ -1684,7 +1705,7 @@ COMPILER_STRIP_GATE(80397278, &menu_t4); SECTION_RODATA static u8 const fenu_t1[16] = { 0x66, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x34, 0x73, 0x00, 0x66, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x34, }; -COMPILER_STRIP_GATE(80397288, &fenu_t1); +COMPILER_STRIP_GATE(0x80397288, &fenu_t1); #pragma pop /* 80397298-803972A8 0238F8 0010+00 0/1 0/0 0/0 .rodata menu_t1$5311 */ @@ -1693,7 +1714,7 @@ COMPILER_STRIP_GATE(80397288, &fenu_t1); SECTION_RODATA static u8 const menu_t1[16] = { 0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x34, 0x73, 0x00, 0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x34, }; -COMPILER_STRIP_GATE(80397298, &menu_t1); +COMPILER_STRIP_GATE(0x80397298, &menu_t1); #pragma pop /* 803972A8-803972B8 023908 0010+00 0/1 0/0 0/0 .rodata fenu_t5$5317 */ @@ -1702,7 +1723,7 @@ COMPILER_STRIP_GATE(80397298, &menu_t1); SECTION_RODATA static u8 const fenu_t5[16] = { 0x66, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x35, 0x73, 0x00, 0x66, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x35, }; -COMPILER_STRIP_GATE(803972A8, &fenu_t5); +COMPILER_STRIP_GATE(0x803972A8, &fenu_t5); #pragma pop /* 803972B8-803972C8 023918 0010+00 0/1 0/0 0/0 .rodata menu_t5$5318 */ @@ -1711,7 +1732,7 @@ COMPILER_STRIP_GATE(803972A8, &fenu_t5); SECTION_RODATA static u8 const menu_t5[16] = { 0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x35, 0x73, 0x00, 0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x35, }; -COMPILER_STRIP_GATE(803972B8, &menu_t5); +COMPILER_STRIP_GATE(0x803972B8, &menu_t5); #pragma pop /* 803972C8-803972F8 023928 0030+00 0/1 0/0 0/0 .rodata menut_0$5324 */ @@ -1722,7 +1743,7 @@ SECTION_RODATA static u8 const menut_0[48] = { 0x6D, 0x65, 0x6E, 0x75, 0x74, 0x30, 0x61, 0x32, 0x6D, 0x65, 0x6E, 0x75, 0x74, 0x30, 0x61, 0x31, 0x6D, 0x65, 0x6E, 0x75, 0x74, 0x30, 0x61, 0x34, 0x6D, 0x65, 0x6E, 0x75, 0x74, 0x30, 0x61, 0x33, }; -COMPILER_STRIP_GATE(803972C8, &menut_0); +COMPILER_STRIP_GATE(0x803972C8, &menut_0); #pragma pop /* 803972F8-80397328 023958 0030+00 0/1 0/0 0/0 .rodata fenut_0$5325 */ @@ -1733,7 +1754,7 @@ SECTION_RODATA static u8 const fenut_0[48] = { 0x6D, 0x65, 0x6E, 0x75, 0x74, 0x30, 0x61, 0x38, 0x6D, 0x65, 0x6E, 0x75, 0x74, 0x30, 0x61, 0x37, 0x6D, 0x65, 0x6E, 0x75, 0x74, 0x30, 0x61, 0x36, 0x6D, 0x65, 0x6E, 0x75, 0x74, 0x30, 0x61, 0x35, }; -COMPILER_STRIP_GATE(803972F8, &fenut_0); +COMPILER_STRIP_GATE(0x803972F8, &fenut_0); #pragma pop /* 80397328-80397358 023988 0030+00 0/1 0/0 0/0 .rodata menut_1$5332 */ @@ -1744,7 +1765,7 @@ SECTION_RODATA static u8 const menut_1[48] = { 0x6D, 0x65, 0x6E, 0x75, 0x74, 0x31, 0x61, 0x32, 0x6D, 0x65, 0x6E, 0x75, 0x74, 0x31, 0x61, 0x31, 0x6D, 0x65, 0x6E, 0x75, 0x74, 0x31, 0x61, 0x34, 0x6D, 0x65, 0x6E, 0x75, 0x74, 0x31, 0x61, 0x33, }; -COMPILER_STRIP_GATE(80397328, &menut_1); +COMPILER_STRIP_GATE(0x80397328, &menut_1); #pragma pop /* 80397358-80397388 0239B8 0030+00 0/1 0/0 0/0 .rodata fenut_1$5333 */ @@ -1755,7 +1776,7 @@ SECTION_RODATA static u8 const fenut_1[48] = { 0x6D, 0x65, 0x6E, 0x75, 0x74, 0x31, 0x61, 0x38, 0x6D, 0x65, 0x6E, 0x75, 0x74, 0x31, 0x61, 0x37, 0x6D, 0x65, 0x6E, 0x75, 0x74, 0x31, 0x61, 0x36, 0x6D, 0x65, 0x6E, 0x75, 0x74, 0x31, 0x61, 0x35, }; -COMPILER_STRIP_GATE(80397358, &fenut_1); +COMPILER_STRIP_GATE(0x80397358, &fenut_1); #pragma pop /* 80397388-803973B8 0239E8 0030+00 0/1 0/0 0/0 .rodata menut_2$5340 */ @@ -1766,7 +1787,7 @@ SECTION_RODATA static u8 const menut_2[48] = { 0x6D, 0x65, 0x6E, 0x75, 0x74, 0x32, 0x61, 0x32, 0x6D, 0x65, 0x6E, 0x75, 0x74, 0x32, 0x61, 0x31, 0x6D, 0x65, 0x6E, 0x75, 0x74, 0x32, 0x61, 0x34, 0x6D, 0x65, 0x6E, 0x75, 0x74, 0x32, 0x61, 0x33, }; -COMPILER_STRIP_GATE(80397388, &menut_2); +COMPILER_STRIP_GATE(0x80397388, &menut_2); #pragma pop /* 803973B8-803973E8 023A18 0030+00 0/1 0/0 0/0 .rodata fenut_2$5341 */ @@ -1777,7 +1798,7 @@ SECTION_RODATA static u8 const fenut_2[48] = { 0x6D, 0x65, 0x6E, 0x75, 0x74, 0x32, 0x61, 0x38, 0x6D, 0x65, 0x6E, 0x75, 0x74, 0x32, 0x61, 0x37, 0x6D, 0x65, 0x6E, 0x75, 0x74, 0x32, 0x61, 0x36, 0x6D, 0x65, 0x6E, 0x75, 0x74, 0x32, 0x61, 0x35, }; -COMPILER_STRIP_GATE(803973B8, &fenut_2); +COMPILER_STRIP_GATE(0x803973B8, &fenut_2); #pragma pop /* 803973E8-80397418 023A48 0030+00 0/1 0/0 0/0 .rodata menut_3$5348 */ @@ -1788,7 +1809,7 @@ SECTION_RODATA static u8 const menut_3[48] = { 0x6D, 0x65, 0x6E, 0x75, 0x74, 0x33, 0x61, 0x37, 0x6D, 0x65, 0x6E, 0x75, 0x74, 0x33, 0x61, 0x38, 0x6D, 0x65, 0x6E, 0x75, 0x74, 0x33, 0x61, 0x39, 0x6D, 0x65, 0x6E, 0x75, 0x74, 0x33, 0x31, 0x30, }; -COMPILER_STRIP_GATE(803973E8, &menut_3); +COMPILER_STRIP_GATE(0x803973E8, &menut_3); #pragma pop /* 80397418-80397448 023A78 0030+00 0/1 0/0 0/0 .rodata fenut_3$5349 */ @@ -1799,7 +1820,7 @@ SECTION_RODATA static u8 const fenut_3[48] = { 0x6D, 0x65, 0x6E, 0x75, 0x74, 0x33, 0x31, 0x33, 0x6D, 0x65, 0x6E, 0x75, 0x74, 0x33, 0x31, 0x32, 0x6D, 0x65, 0x6E, 0x75, 0x74, 0x33, 0x31, 0x31, 0x6D, 0x65, 0x6E, 0x75, 0x74, 0x30, 0x30, 0x31, }; -COMPILER_STRIP_GATE(80397418, &fenut_3); +COMPILER_STRIP_GATE(0x80397418, &fenut_3); #pragma pop /* 80397448-80397478 023AA8 0030+00 0/1 0/0 0/0 .rodata menut_4$5356 */ @@ -1810,7 +1831,7 @@ SECTION_RODATA static u8 const menut_4[48] = { 0x6D, 0x65, 0x6E, 0x75, 0x74, 0x33, 0x61, 0x32, 0x6D, 0x65, 0x6E, 0x75, 0x74, 0x33, 0x61, 0x31, 0x6D, 0x65, 0x6E, 0x75, 0x74, 0x33, 0x61, 0x34, 0x6D, 0x65, 0x6E, 0x75, 0x74, 0x33, 0x61, 0x33, }; -COMPILER_STRIP_GATE(80397448, &menut_4); +COMPILER_STRIP_GATE(0x80397448, &menut_4); #pragma pop /* 80397478-803974A8 023AD8 0030+00 0/1 0/0 0/0 .rodata fenut_4$5357 */ @@ -1821,7 +1842,7 @@ SECTION_RODATA static u8 const fenut_4[48] = { 0x6D, 0x65, 0x6E, 0x75, 0x74, 0x33, 0x31, 0x39, 0x6D, 0x65, 0x6E, 0x75, 0x74, 0x33, 0x31, 0x38, 0x6D, 0x65, 0x6E, 0x75, 0x74, 0x33, 0x31, 0x37, 0x6D, 0x65, 0x6E, 0x75, 0x74, 0x33, 0x31, 0x36, }; -COMPILER_STRIP_GATE(80397478, &fenut_4); +COMPILER_STRIP_GATE(0x80397478, &fenut_4); #pragma pop /* 803974A8-803974D8 023B08 0030+00 0/1 0/0 0/0 .rodata tx$5381 */ @@ -1832,7 +1853,7 @@ SECTION_RODATA static u8 const tx[48] = { 0x77, 0x5F, 0x70, 0x5F, 0x74, 0x65, 0x78, 0x33, 0x77, 0x5F, 0x70, 0x5F, 0x74, 0x65, 0x78, 0x34, 0x66, 0x70, 0x73, 0x5F, 0x74, 0x65, 0x78, 0x31, 0x66, 0x5F, 0x70, 0x5F, 0x74, 0x65, 0x78, 0x31, }; -COMPILER_STRIP_GATE(803974A8, &tx); +COMPILER_STRIP_GATE(0x803974A8, &tx); #pragma pop /* 803974D8-803974F8 023B38 0020+00 0/0 0/0 0/0 .rodata op_tx$5393 */ @@ -1842,7 +1863,7 @@ SECTION_RODATA static u8 const op_tx[32] = { 0x77, 0x5F, 0x74, 0x65, 0x78, 0x74, 0x5F, 0x6E, 0x00, 0x77, 0x5F, 0x62, 0x74, 0x6E, 0x5F, 0x6E, 0x00, 0x77, 0x5F, 0x6B, 0x5F, 0x74, 0x5F, 0x6E, 0x77, 0x5F, 0x61, 0x62, 0x74, 0x6E, 0x5F, 0x6E, }; -COMPILER_STRIP_GATE(803974D8, &op_tx); +COMPILER_STRIP_GATE(0x803974D8, &op_tx); #pragma pop /* 803974F8-80397510 023B58 0018+00 0/1 0/0 0/0 .rodata z_tx$5399 */ @@ -1852,7 +1873,7 @@ SECTION_RODATA static u8 const z_tx[24] = { 0x00, 0x00, 0x7A, 0x5F, 0x67, 0x63, 0x5F, 0x6E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(803974F8, &z_tx); +COMPILER_STRIP_GATE(0x803974F8, &z_tx); #pragma pop /* 80397510-80397560 023B70 0050+00 0/1 0/0 0/0 .rodata txTV$5409 */ @@ -1865,7 +1886,7 @@ SECTION_RODATA static u8 const txTV[80] = { 0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x37, 0x31, 0x00, 0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x33, 0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x38, 0x31, 0x00, 0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x34, }; -COMPILER_STRIP_GATE(80397510, &txTV); +COMPILER_STRIP_GATE(0x80397510, &txTV); #pragma pop /* 801E5678-801E6FBC 1DFFB8 1944+00 1/1 0/0 0/0 .text screenSet__14dMenu_Option_cFv */ @@ -2014,7 +2035,7 @@ SECTION_RODATA static u8 const txTVhide[40] = { 0x39, 0x6E, 0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x31, 0x30, 0x6E, 0x00, 0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x37, 0x6E, 0x00, 0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x38, 0x6E, }; -COMPILER_STRIP_GATE(80397560, &txTVhide); +COMPILER_STRIP_GATE(0x80397560, &txTVhide); #pragma pop /* 80397588-803975B0 023BE8 0028+00 1/1 0/0 0/0 .rodata text_a_tag$6194 */ @@ -2023,7 +2044,7 @@ SECTION_RODATA static u8 const text_a_tag_6194[40] = { 0x5F, 0x32, 0x61, 0x74, 0x65, 0x78, 0x74, 0x31, 0x5F, 0x33, 0x61, 0x74, 0x65, 0x78, 0x74, 0x31, 0x5F, 0x34, 0x61, 0x74, 0x65, 0x78, 0x74, 0x31, 0x5F, 0x35, }; -COMPILER_STRIP_GATE(80397588, &text_a_tag_6194); +COMPILER_STRIP_GATE(0x80397588, &text_a_tag_6194); /* 801E7E98-801E7F9C 1E27D8 0104+00 11/11 0/0 0/0 .text setAButtonString__14dMenu_Option_cFUs */ #pragma push @@ -2042,7 +2063,7 @@ SECTION_RODATA static u8 const text_b_tag_6217[40] = { 0x5F, 0x32, 0x62, 0x74, 0x65, 0x78, 0x74, 0x31, 0x5F, 0x33, 0x62, 0x74, 0x65, 0x78, 0x74, 0x31, 0x5F, 0x34, 0x62, 0x74, 0x65, 0x78, 0x74, 0x31, 0x5F, 0x35, }; -COMPILER_STRIP_GATE(803975B0, &text_b_tag_6217); +COMPILER_STRIP_GATE(0x803975B0, &text_b_tag_6217); /* 801E7F9C-801E80A0 1E28DC 0104+00 11/11 0/0 0/0 .text setBButtonString__14dMenu_Option_cFUs */ #pragma push @@ -2229,24 +2250,7 @@ asm void __sinit_d_menu_option_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_801E8E8C = (void*)__sinit_d_menu_option_cpp; +REGISTER_CTORS(0x801E8E8C, __sinit_d_menu_option_cpp); #pragma pop -/* 803975D8-80397738 023C38 0160+00 5/5 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_803975D8 = "zelda_option_select_menu.blo"; -SECTION_DEAD static char const* const stringBase_803975F5 = ""; -SECTION_DEAD static char const* const stringBase_803975F6 = "zelda_option_base.blo"; -SECTION_DEAD static char const* const stringBase_8039760C = "zelda_option_menu_text.blo"; -SECTION_DEAD static char const* const stringBase_80397627 = "zelda_option_menu_shadow.blo"; -SECTION_DEAD static char const* const stringBase_80397644 = "zelda_option_check.blo"; -SECTION_DEAD static char const* const stringBase_8039765B = "zelda_collect_soubi_do_icon_parts.blo"; -SECTION_DEAD static char const* const stringBase_80397681 = "tt_block8x8.bti"; -SECTION_DEAD static char const* const stringBase_80397691 = "zelda_file_select_yes_no_window.blo"; -SECTION_DEAD static char const* const stringBase_803976B5 = "zelda_file_select_yes_no_window.bck"; -SECTION_DEAD static char const* const stringBase_803976D9 = "zelda_file_select_yes_no_window.bpk"; -SECTION_DEAD static char const* const stringBase_803976FD = "zelda_file_select_yes_no_window.btk"; -SECTION_DEAD static char const* const stringBase_80397721 = "/res/Layout/optres.arc"; -#pragma pop +/* 803975D8-803975D8 023C38 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/menu/d_menu_ring.cpp b/src/d/menu/d_menu_ring.cpp index 7a9a14724ef..ef4010363ea 100644 --- a/src/d/menu/d_menu_ring.cpp +++ b/src/d/menu/d_menu_ring.cpp @@ -69,11 +69,11 @@ struct dMeter2Draw_c { JUtility::TColor, JUtility::TColor, f32, u8); }; -struct JKRExpHeap {}; +struct STControl {}; struct CSTControl {}; -struct STControl {}; +struct JKRExpHeap {}; struct dMenu_Ring_c { /* 801E9118 */ dMenu_Ring_c(JKRExpHeap*, STControl*, CSTControl*, u8); @@ -400,7 +400,7 @@ SECTION_RODATA static u8 const xy_text[40] = { 0x73, 0x31, 0x79, 0x78, 0x5F, 0x74, 0x65, 0x5F, 0x73, 0x32, 0x79, 0x78, 0x5F, 0x74, 0x65, 0x5F, 0x73, 0x33, 0x79, 0x78, 0x5F, 0x74, 0x65, 0x5F, 0x73, 0x34, }; -COMPILER_STRIP_GATE(80397738, &xy_text); +COMPILER_STRIP_GATE(0x80397738, &xy_text); /* 80397760-80397788 023DC0 0028+00 0/1 0/0 0/0 .rodata fxy_text$4016 */ #pragma push @@ -410,7 +410,7 @@ SECTION_RODATA static u8 const fxy_text[40] = { 0x5F, 0x31, 0x66, 0x79, 0x78, 0x5F, 0x74, 0x65, 0x5F, 0x32, 0x66, 0x79, 0x78, 0x5F, 0x74, 0x65, 0x5F, 0x33, 0x66, 0x79, 0x78, 0x5F, 0x74, 0x65, 0x5F, 0x34, }; -COMPILER_STRIP_GATE(80397760, &fxy_text); +COMPILER_STRIP_GATE(0x80397760, &fxy_text); #pragma pop /* 80397788-803977B0 023DE8 0028+00 0/1 0/0 0/0 .rodata c_text$4022 */ @@ -421,7 +421,7 @@ SECTION_RODATA static u8 const c_text[40] = { 0x73, 0x31, 0x00, 0x63, 0x5F, 0x74, 0x65, 0x5F, 0x73, 0x32, 0x00, 0x63, 0x5F, 0x74, 0x65, 0x5F, 0x73, 0x33, 0x00, 0x63, 0x5F, 0x74, 0x65, 0x5F, 0x73, 0x34, }; -COMPILER_STRIP_GATE(80397788, &c_text); +COMPILER_STRIP_GATE(0x80397788, &c_text); #pragma pop /* 803977B0-803977D8 023E10 0028+00 0/1 0/0 0/0 .rodata fc_text$4023 */ @@ -432,7 +432,7 @@ SECTION_RODATA static u8 const fc_text[40] = { 0x73, 0x31, 0x66, 0x63, 0x5F, 0x74, 0x65, 0x5F, 0x73, 0x32, 0x66, 0x63, 0x5F, 0x74, 0x65, 0x5F, 0x73, 0x33, 0x66, 0x63, 0x5F, 0x74, 0x65, 0x5F, 0x73, 0x34, }; -COMPILER_STRIP_GATE(803977B0, &fc_text); +COMPILER_STRIP_GATE(0x803977B0, &fc_text); #pragma pop /* 803977D8-80397800 023E38 0028+00 0/1 0/0 0/0 .rodata c_text1$4029 */ @@ -443,7 +443,7 @@ SECTION_RODATA static u8 const c_text1[40] = { 0x73, 0x31, 0x00, 0x63, 0x5F, 0x74, 0x65, 0x78, 0x73, 0x32, 0x00, 0x63, 0x5F, 0x74, 0x65, 0x78, 0x73, 0x33, 0x00, 0x63, 0x5F, 0x74, 0x65, 0x78, 0x73, 0x34, }; -COMPILER_STRIP_GATE(803977D8, &c_text1); +COMPILER_STRIP_GATE(0x803977D8, &c_text1); #pragma pop /* 80397800-80397828 023E60 0028+00 0/1 0/0 0/0 .rodata fc_text1$4030 */ @@ -454,7 +454,7 @@ SECTION_RODATA static u8 const fc_text1[40] = { 0x73, 0x31, 0x66, 0x63, 0x5F, 0x74, 0x65, 0x78, 0x73, 0x32, 0x66, 0x63, 0x5F, 0x74, 0x65, 0x78, 0x73, 0x33, 0x66, 0x63, 0x5F, 0x74, 0x65, 0x78, 0x73, 0x34, }; -COMPILER_STRIP_GATE(80397800, &fc_text1); +COMPILER_STRIP_GATE(0x80397800, &fc_text1); #pragma pop /* 80397828-80397850 023E88 0028+00 0/1 0/0 0/0 .rodata t_on$4036 */ @@ -465,7 +465,7 @@ SECTION_RODATA static u8 const t_on[40] = { 0x73, 0x35, 0x67, 0x5F, 0x74, 0x6F, 0x66, 0x5F, 0x73, 0x36, 0x67, 0x5F, 0x74, 0x6F, 0x66, 0x5F, 0x73, 0x37, 0x67, 0x5F, 0x74, 0x6F, 0x66, 0x5F, 0x73, 0x38, }; -COMPILER_STRIP_GATE(80397828, &t_on); +COMPILER_STRIP_GATE(0x80397828, &t_on); #pragma pop /* 80397850-80397878 023EB0 0028+00 0/1 0/0 0/0 .rodata ft_on$4037 */ @@ -476,7 +476,7 @@ SECTION_RODATA static u8 const ft_on[40] = { 0x73, 0x35, 0x66, 0x5F, 0x74, 0x6F, 0x66, 0x5F, 0x73, 0x36, 0x66, 0x5F, 0x74, 0x6F, 0x66, 0x5F, 0x73, 0x37, 0x66, 0x5F, 0x74, 0x6F, 0x66, 0x5F, 0x73, 0x38, }; -COMPILER_STRIP_GATE(80397850, &ft_on); +COMPILER_STRIP_GATE(0x80397850, &ft_on); #pragma pop /* 80397878-803978A0 023ED8 0028+00 0/1 0/0 0/0 .rodata t_off$4043 */ @@ -487,7 +487,7 @@ SECTION_RODATA static u8 const t_off[40] = { 0x73, 0x31, 0x67, 0x5F, 0x74, 0x6F, 0x66, 0x5F, 0x73, 0x32, 0x67, 0x5F, 0x74, 0x6F, 0x66, 0x5F, 0x73, 0x33, 0x67, 0x5F, 0x74, 0x6F, 0x66, 0x5F, 0x73, 0x34, }; -COMPILER_STRIP_GATE(80397878, &t_off); +COMPILER_STRIP_GATE(0x80397878, &t_off); #pragma pop /* 803978A0-803978C8 023F00 0028+00 0/1 0/0 0/0 .rodata ft_off$4044 */ @@ -498,7 +498,21 @@ SECTION_RODATA static u8 const ft_off[40] = { 0x73, 0x31, 0x66, 0x5F, 0x74, 0x6F, 0x66, 0x5F, 0x73, 0x32, 0x66, 0x5F, 0x74, 0x6F, 0x66, 0x5F, 0x73, 0x33, 0x66, 0x5F, 0x74, 0x6F, 0x66, 0x5F, 0x73, 0x34, }; -COMPILER_STRIP_GATE(803978A0, &ft_off); +COMPILER_STRIP_GATE(0x803978A0, &ft_off); +#pragma pop + +/* 803978C8-803978C8 023F28 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_803978C8 = + "SCRN/zelda_item_select_icon_message_ver2.blo"; +SECTION_DEAD static char const* const stringBase_803978F5 = ""; +SECTION_DEAD static char const* const stringBase_803978F6 = "tt_block8x8.bti"; +SECTION_DEAD static char const* const stringBase_80397906 = "SCRN/zelda_item_select_icon3_spot.blo"; +SECTION_DEAD static char const* const stringBase_8039792C = + "SCRN/zelda_item_select_icon3_center_parts.blo"; +/* @stringBase0 padding */ +SECTION_DEAD static char const* const pad_8039795A = "\0\0\0\0\0"; #pragma pop /* 803BDE70-803BDE7C 01AF90 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ @@ -1296,7 +1310,7 @@ asm void __sinit_d_menu_ring_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_801EF580 = (void*)__sinit_d_menu_ring_cpp; +REGISTER_CTORS(0x801EF580, __sinit_d_menu_ring_cpp); #pragma pop /* ############################################################################################## */ @@ -1311,17 +1325,4 @@ SECTION_SDATA2 static u8 pad_80454434[4] = { }; #pragma pop -/* 803978C8-80397960 023F28 0092+06 2/2 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_803978C8 = - "SCRN/zelda_item_select_icon_message_ver2.blo"; -SECTION_DEAD static char const* const stringBase_803978F5 = ""; -SECTION_DEAD static char const* const stringBase_803978F6 = "tt_block8x8.bti"; -SECTION_DEAD static char const* const stringBase_80397906 = "SCRN/zelda_item_select_icon3_spot.blo"; -SECTION_DEAD static char const* const stringBase_8039792C = - "SCRN/zelda_item_select_icon3_center_parts.blo"; -/* @stringBase0 padding */ -SECTION_DEAD static char const* const pad_8039795A = "\0\0\0\0\0"; -#pragma pop +/* 803978C8-803978C8 023F28 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/menu/d_menu_save.cpp b/src/d/menu/d_menu_save.cpp index dcb486a0e85..3b394e25d2f 100644 --- a/src/d/menu/d_menu_save.cpp +++ b/src/d/menu/d_menu_save.cpp @@ -62,12 +62,12 @@ struct dSv_event_c { /* 800349BC */ void isEventBit(u16) const; }; -struct JKRArchive {}; - struct J2DPane { /* 802F7FCC */ void animationTransform(); }; +struct JKRArchive {}; + struct dSelect_cursor_c { /* 80194220 */ dSelect_cursor_c(u8, f32, JKRArchive*); /* 801950F4 */ void setPos(f32, f32, J2DPane*, bool); @@ -80,8 +80,6 @@ struct dMsgString_c { /* 80249D28 */ ~dMsgString_c(); }; -struct J2DOrthoGraph {}; - struct STControl { /* 80032044 */ STControl(s16, s16, s16, s16, f32, f32, s16, s16); /* 8003219C */ void checkTrigger(); @@ -91,6 +89,8 @@ struct STControl { /* 800325A0 */ void checkDownTrigger(); }; +struct J2DOrthoGraph {}; + struct dMsgScrnExplain_c { /* 8023CC88 */ dMsgScrnExplain_c(STControl*, u8, bool, u8); /* 8023D7D8 */ void move(); @@ -268,10 +268,10 @@ struct Z2SeqMgr { /* 802B3EAC */ void checkBgmIDPlaying(u32); }; -struct Vec {}; - struct JAISoundID {}; +struct Vec {}; + struct Z2SeMgr { /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); /* 802AC50C */ void seStartLevel(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); @@ -1532,6 +1532,12 @@ asm dMenu_save_c::dMenu_save_c() { #pragma pop /* ############################################################################################## */ +/* 80397960-80397960 023FC0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80397960 = "/res/Layout/saveres.arc"; +#pragma pop + /* 8042E840-8042E84C 05B560 000C+00 1/1 0/0 0/0 .bss @3785 */ static u8 lit_3785[12]; @@ -1555,6 +1561,18 @@ asm void dMenu_save_c::_create() { #pragma pop /* ############################################################################################## */ +/* 80397960-80397960 023FC0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80397978 = "zelda_file_select2.blo"; +SECTION_DEAD static char const* const stringBase_8039798F = "zelda_file_select2.bck"; +SECTION_DEAD static char const* const stringBase_803979A6 = "zelda_file_select2.bpk"; +SECTION_DEAD static char const* const stringBase_803979BD = "zelda_file_select2_02.btk"; +SECTION_DEAD static char const* const stringBase_803979D7 = "zelda_file_select2.btk"; +SECTION_DEAD static char const* const stringBase_803979EE = "zelda_file_select2.brk"; +SECTION_DEAD static char const* const stringBase_80397A05 = ""; +#pragma pop + /* 80450740-80450744 0001C0 0002+02 1/1 0/0 0/0 .sdata l_msgNum0$3868 */ SECTION_SDATA static u8 l_msgNum0[2 + 2 /* padding */] = { 0x08, @@ -2121,6 +2139,13 @@ asm void dMenu_save_c::dataWrite() { } #pragma pop +/* ############################################################################################## */ +/* 80397960-80397960 023FC0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80397A06 = "save cmdState %d\n"; +#pragma pop + /* 801F28E4-801F298C 1ED224 00A8+00 1/0 0/0 0/0 .text memCardDataSaveWait__12dMenu_save_cFv */ #pragma push #pragma optimization_level 0 @@ -2923,20 +2948,7 @@ asm void __sinit_d_menu_save_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_801F6C1C = (void*)__sinit_d_menu_save_cpp; +REGISTER_CTORS(0x801F6C1C, __sinit_d_menu_save_cpp); #pragma pop -/* 80397960-80397A18 023FC0 00B8+00 6/6 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80397960 = "/res/Layout/saveres.arc"; -SECTION_DEAD static char const* const stringBase_80397978 = "zelda_file_select2.blo"; -SECTION_DEAD static char const* const stringBase_8039798F = "zelda_file_select2.bck"; -SECTION_DEAD static char const* const stringBase_803979A6 = "zelda_file_select2.bpk"; -SECTION_DEAD static char const* const stringBase_803979BD = "zelda_file_select2_02.btk"; -SECTION_DEAD static char const* const stringBase_803979D7 = "zelda_file_select2.btk"; -SECTION_DEAD static char const* const stringBase_803979EE = "zelda_file_select2.brk"; -SECTION_DEAD static char const* const stringBase_80397A05 = ""; -SECTION_DEAD static char const* const stringBase_80397A06 = "save cmdState %d\n"; -#pragma pop +/* 80397960-80397960 023FC0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/menu/d_menu_skill.cpp b/src/d/menu/d_menu_skill.cpp index 49fd7aaf801..b20506c7285 100644 --- a/src/d/menu/d_menu_skill.cpp +++ b/src/d/menu/d_menu_skill.cpp @@ -33,10 +33,10 @@ struct dSv_event_c { /* 800349BC */ void isEventBit(u16) const; }; -struct JKRArchive {}; - struct J2DPane {}; +struct JKRArchive {}; + struct dSelect_cursor_c { /* 80194220 */ dSelect_cursor_c(u8, f32, JKRArchive*); /* 801950F4 */ void setPos(f32, f32, J2DPane*, bool); @@ -56,15 +56,15 @@ struct dMeter2Info_c { /* 8021C544 */ void getStringKanji(u32, char*, JMSMesgEntry_c*); }; -struct JKRExpHeap {}; - -struct CSTControl {}; - struct STControl { /* 80032524 */ void checkUpTrigger(); /* 800325A0 */ void checkDownTrigger(); }; +struct CSTControl {}; + +struct JKRExpHeap {}; + struct dMenu_Skill_c { /* 801F7224 */ dMenu_Skill_c(JKRExpHeap*, STControl*, CSTControl*); /* 801F7348 */ ~dMenu_Skill_c(); @@ -98,10 +98,10 @@ struct dMenu_Skill_c { /* 801F9A08 */ void draw(); }; -struct Vec {}; - struct JAISoundID {}; +struct Vec {}; + struct Z2SeMgr { /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); }; @@ -487,6 +487,12 @@ asm void dMenu_Skill_c::init() { #pragma pop /* ############################################################################################## */ +/* 80397DB8-80397DB8 024418 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80397DB8 = "/res/Layout/skillres.arc"; +#pragma pop + /* 804544B0-804544B8 002AB0 0008+00 4/4 0/0 0/0 .sdata2 @4016 */ SECTION_SDATA2 static f64 lit_4016 = 4503601774854144.0 /* cast s32 to float */; @@ -536,14 +542,14 @@ SECTION_RODATA static u8 const i_id[28] = { 0x00, 0x00, 0x06, 0xB4, 0x00, 0x00, 0x06, 0xB3, 0x00, 0x00, 0x06, 0xB5, 0x00, 0x00, 0x06, 0xB6, 0x00, 0x00, 0x06, 0xB7, 0x00, 0x00, 0x06, 0xB8, 0x00, 0x00, 0x06, 0xB9, }; -COMPILER_STRIP_GATE(80397A18, &i_id); +COMPILER_STRIP_GATE(0x80397A18, &i_id); /* 80397A34-80397A50 024094 001C+00 1/1 0/0 0/0 .rodata i_id1$4088 */ SECTION_RODATA static u8 const i_id1_4088[28] = { 0x00, 0x00, 0x06, 0xAD, 0x00, 0x00, 0x06, 0xAC, 0x00, 0x00, 0x06, 0xAE, 0x00, 0x00, 0x06, 0xAF, 0x00, 0x00, 0x06, 0xB0, 0x00, 0x00, 0x06, 0xB1, 0x00, 0x00, 0x06, 0xB2, }; -COMPILER_STRIP_GATE(80397A34, &i_id1_4088); +COMPILER_STRIP_GATE(0x80397A34, &i_id1_4088); /* 801F7F24-801F7FF8 1F2864 00D4+00 1/0 0/0 0/0 .text read_open_init__13dMenu_Skill_cFv */ @@ -625,7 +631,7 @@ SECTION_RODATA static u8 const tag_sub0[56] = { 0x5F, 0x74, 0x33, 0x73, 0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x34, 0x73, 0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x35, 0x73, 0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x35, 0x31, }; -COMPILER_STRIP_GATE(80397A50, &tag_sub0); +COMPILER_STRIP_GATE(0x80397A50, &tag_sub0); #pragma pop /* 80397A88-80397AC0 0240E8 0038+00 0/1 0/0 0/0 .rodata tag_sub1$4149 */ @@ -637,7 +643,7 @@ SECTION_RODATA static u8 const tag_sub1[56] = { 0x75, 0x5F, 0x74, 0x33, 0x00, 0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x34, 0x00, 0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x35, 0x00, 0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x36, }; -COMPILER_STRIP_GATE(80397A88, &tag_sub1); +COMPILER_STRIP_GATE(0x80397A88, &tag_sub1); #pragma pop /* 80397AC0-80397AF8 024120 0038+00 0/1 0/0 0/0 .rodata tag_name0$4150 */ @@ -649,7 +655,7 @@ SECTION_RODATA static u8 const tag_name0[56] = { 0x5F, 0x74, 0x39, 0x73, 0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x31, 0x30, 0x73, 0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x31, 0x31, 0x73, 0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x31, 0x31, 0x32, }; -COMPILER_STRIP_GATE(80397AC0, &tag_name0); +COMPILER_STRIP_GATE(0x80397AC0, &tag_name0); #pragma pop /* 80397AF8-80397B30 024158 0038+00 0/1 0/0 0/0 .rodata tag_name1$4151 */ @@ -661,7 +667,7 @@ SECTION_RODATA static u8 const tag_name1[56] = { 0x75, 0x5F, 0x74, 0x39, 0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x31, 0x30, 0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x31, 0x31, 0x6D, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x30, 0x31, }; -COMPILER_STRIP_GATE(80397AF8, &tag_name1); +COMPILER_STRIP_GATE(0x80397AF8, &tag_name1); #pragma pop /* 80397B30-80397B68 024190 0038+00 0/1 0/0 0/0 .rodata ftag_sub0$4152 */ @@ -673,7 +679,7 @@ SECTION_RODATA static u8 const ftag_sub0[56] = { 0x5F, 0x74, 0x33, 0x73, 0x66, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x34, 0x73, 0x66, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x35, 0x73, 0x66, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x36, 0x73, }; -COMPILER_STRIP_GATE(80397B30, &ftag_sub0); +COMPILER_STRIP_GATE(0x80397B30, &ftag_sub0); #pragma pop /* 80397B68-80397BA0 0241C8 0038+00 0/1 0/0 0/0 .rodata ftag_sub1$4153 */ @@ -685,7 +691,7 @@ SECTION_RODATA static u8 const ftag_sub1[56] = { 0x75, 0x5F, 0x74, 0x33, 0x00, 0x66, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x34, 0x00, 0x66, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x35, 0x00, 0x66, 0x65, 0x6E, 0x75, 0x5F, 0x74, 0x36, }; -COMPILER_STRIP_GATE(80397B68, &ftag_sub1); +COMPILER_STRIP_GATE(0x80397B68, &ftag_sub1); #pragma pop /* 80397BA0-80397BD8 024200 0038+00 0/1 0/0 0/0 .rodata ftag_name0$4154 */ @@ -697,7 +703,7 @@ SECTION_RODATA static u8 const ftag_name0[56] = { 0x5F, 0x31, 0x30, 0x73, 0x66, 0x65, 0x6E, 0x75, 0x5F, 0x31, 0x31, 0x73, 0x66, 0x65, 0x6E, 0x75, 0x5F, 0x31, 0x32, 0x73, 0x66, 0x65, 0x6E, 0x75, 0x5F, 0x31, 0x33, 0x73, }; -COMPILER_STRIP_GATE(80397BA0, &ftag_name0); +COMPILER_STRIP_GATE(0x80397BA0, &ftag_name0); #pragma pop /* 80397BD8-80397C10 024238 0038+00 0/1 0/0 0/0 .rodata ftag_name1$4155 */ @@ -709,7 +715,7 @@ SECTION_RODATA static u8 const ftag_name1[56] = { 0x75, 0x5F, 0x31, 0x30, 0x00, 0x66, 0x65, 0x6E, 0x75, 0x5F, 0x31, 0x31, 0x00, 0x66, 0x65, 0x6E, 0x75, 0x5F, 0x31, 0x32, 0x00, 0x66, 0x65, 0x6E, 0x75, 0x5F, 0x31, 0x33, }; -COMPILER_STRIP_GATE(80397BD8, &ftag_name1); +COMPILER_STRIP_GATE(0x80397BD8, &ftag_name1); #pragma pop /* 80397C10-80397C48 024270 0038+00 0/1 0/0 0/0 .rodata tag_letter$4166 */ @@ -721,7 +727,7 @@ SECTION_RODATA static u8 const tag_letter[56] = { 0x30, 0x33, 0x5F, 0x6E, 0x6C, 0x65, 0x74, 0x5F, 0x30, 0x34, 0x5F, 0x6E, 0x6C, 0x65, 0x74, 0x5F, 0x30, 0x35, 0x5F, 0x6E, 0x6C, 0x65, 0x74, 0x5F, 0x30, 0x36, 0x5F, 0x6E, }; -COMPILER_STRIP_GATE(80397C10, &tag_letter); +COMPILER_STRIP_GATE(0x80397C10, &tag_letter); #pragma pop /* 80397C48-80397C80 0242A8 0038+00 0/1 0/0 0/0 .rodata tag_frame$4173 */ @@ -733,7 +739,7 @@ SECTION_RODATA static u8 const tag_frame[56] = { 0x65, 0x5F, 0x30, 0x33, 0x66, 0x6C, 0x61, 0x6D, 0x65, 0x5F, 0x30, 0x34, 0x66, 0x6C, 0x61, 0x6D, 0x65, 0x5F, 0x30, 0x35, 0x66, 0x6C, 0x61, 0x6D, 0x65, 0x5F, 0x30, 0x36, }; -COMPILER_STRIP_GATE(80397C48, &tag_frame); +COMPILER_STRIP_GATE(0x80397C48, &tag_frame); #pragma pop /* 80397C80-80397CB8 0242E0 0038+00 0/1 0/0 0/0 .rodata tag_maki$4174 */ @@ -745,7 +751,7 @@ SECTION_RODATA static u8 const tag_maki[56] = { 0x69, 0x5F, 0x33, 0x6E, 0x00, 0x6D, 0x61, 0x6B, 0x69, 0x5F, 0x34, 0x6E, 0x00, 0x6D, 0x61, 0x6B, 0x69, 0x5F, 0x35, 0x6E, 0x00, 0x6D, 0x61, 0x6B, 0x69, 0x5F, 0x36, 0x6E, }; -COMPILER_STRIP_GATE(80397C80, &tag_maki); +COMPILER_STRIP_GATE(0x80397C80, &tag_maki); #pragma pop /* 80397CB8-80397CF0 024318 0038+00 0/1 0/0 0/0 .rodata tag_makic$4175 */ @@ -757,7 +763,14 @@ SECTION_RODATA static u8 const tag_makic[56] = { 0x6B, 0x69, 0x5F, 0x33, 0x00, 0x00, 0x6D, 0x61, 0x6B, 0x69, 0x5F, 0x34, 0x00, 0x00, 0x6D, 0x61, 0x6B, 0x69, 0x5F, 0x35, 0x00, 0x00, 0x6D, 0x61, 0x6B, 0x69, 0x5F, 0x36, }; -COMPILER_STRIP_GATE(80397CB8, &tag_makic); +COMPILER_STRIP_GATE(0x80397CB8, &tag_makic); +#pragma pop + +/* 80397DB8-80397DB8 024418 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80397DD1 = "zelda_ougi_window.blo"; +SECTION_DEAD static char const* const stringBase_80397DE7 = ""; #pragma pop /* 801F8388-801F8A18 1F2CC8 0690+00 1/1 0/0 0/0 .text screenSetMenu__13dMenu_Skill_cFv */ @@ -776,14 +789,21 @@ SECTION_RODATA static u8 const name_tag[32] = { 0x69, 0x74, 0x65, 0x6D, 0x5F, 0x6E, 0x30, 0x34, 0x69, 0x74, 0x65, 0x6D, 0x5F, 0x6E, 0x30, 0x35, 0x69, 0x74, 0x65, 0x6D, 0x5F, 0x6E, 0x30, 0x36, 0x69, 0x74, 0x65, 0x6D, 0x5F, 0x6E, 0x30, 0x37, }; -COMPILER_STRIP_GATE(80397CF0, &name_tag); +COMPILER_STRIP_GATE(0x80397CF0, &name_tag); /* 80397D10-80397D30 024370 0020+00 1/1 0/0 0/0 .rodata fame_tag$4307 */ SECTION_RODATA static u8 const fame_tag[32] = { 0x66, 0x5F, 0x69, 0x74, 0x65, 0x6D, 0x5F, 0x31, 0x66, 0x5F, 0x69, 0x74, 0x65, 0x6D, 0x5F, 0x32, 0x66, 0x5F, 0x69, 0x74, 0x65, 0x6D, 0x5F, 0x33, 0x66, 0x5F, 0x69, 0x74, 0x65, 0x6D, 0x5F, 0x34, }; -COMPILER_STRIP_GATE(80397D10, &fame_tag); +COMPILER_STRIP_GATE(0x80397D10, &fame_tag); + +/* 80397DB8-80397DB8 024418 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80397DE8 = "zelda_ougi_info.blo"; +SECTION_DEAD static char const* const stringBase_80397DFC = "tt_block8x8.bti"; +#pragma pop /* 801F8A18-801F8D20 1F3358 0308+00 1/1 0/0 0/0 .text screenSetLetter__13dMenu_Skill_cFv */ @@ -803,7 +823,7 @@ SECTION_RODATA static u8 const text_a_tag[40] = { 0x5F, 0x32, 0x61, 0x74, 0x65, 0x78, 0x74, 0x31, 0x5F, 0x33, 0x61, 0x74, 0x65, 0x78, 0x74, 0x31, 0x5F, 0x34, 0x61, 0x74, 0x65, 0x78, 0x74, 0x31, 0x5F, 0x35, }; -COMPILER_STRIP_GATE(80397D30, &text_a_tag); +COMPILER_STRIP_GATE(0x80397D30, &text_a_tag); /* 80397D58-80397D80 0243B8 0028+00 1/1 0/0 0/0 .rodata text_b_tag$4366 */ SECTION_RODATA static u8 const text_b_tag[40] = { @@ -811,7 +831,15 @@ SECTION_RODATA static u8 const text_b_tag[40] = { 0x5F, 0x32, 0x62, 0x74, 0x65, 0x78, 0x74, 0x31, 0x5F, 0x33, 0x62, 0x74, 0x65, 0x78, 0x74, 0x31, 0x5F, 0x34, 0x62, 0x74, 0x65, 0x78, 0x74, 0x31, 0x5F, 0x35, }; -COMPILER_STRIP_GATE(80397D58, &text_b_tag); +COMPILER_STRIP_GATE(0x80397D58, &text_b_tag); + +/* 80397DB8-80397DB8 024418 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80397E0C = "zelda_collect_soubi_do_icon_parts.blo"; +/* @stringBase0 padding */ +SECTION_DEAD static char const* const pad_80397E32 = "\0\0\0\0\0"; +#pragma pop /* 801F8D20-801F8E9C 1F3660 017C+00 1/1 0/0 0/0 .text screenSetDoIcon__13dMenu_Skill_cFv */ @@ -850,14 +878,14 @@ SECTION_RODATA static u8 const i_id0[28] = { 0x00, 0x00, 0x06, 0xA5, 0x00, 0x00, 0x06, 0xA6, 0x00, 0x00, 0x06, 0xA7, 0x00, 0x00, 0x06, 0xA8, 0x00, 0x00, 0x06, 0xA9, 0x00, 0x00, 0x06, 0xAA, 0x00, 0x00, 0x06, 0xAB, }; -COMPILER_STRIP_GATE(80397D80, &i_id0); +COMPILER_STRIP_GATE(0x80397D80, &i_id0); /* 80397D9C-80397DB8 0243FC 001C+00 1/1 0/0 0/0 .rodata i_id1$4479 */ SECTION_RODATA static u8 const i_id1_4479[28] = { 0x00, 0x00, 0x06, 0xAD, 0x00, 0x00, 0x06, 0xAC, 0x00, 0x00, 0x06, 0xAE, 0x00, 0x00, 0x06, 0xAF, 0x00, 0x00, 0x06, 0xB0, 0x00, 0x00, 0x06, 0xB1, 0x00, 0x00, 0x06, 0xB2, }; -COMPILER_STRIP_GATE(80397D9C, &i_id1_4479); +COMPILER_STRIP_GATE(0x80397D9C, &i_id1_4479); /* 801F9144-801F9260 1F3A84 011C+00 1/1 0/0 0/0 .text setPageText__13dMenu_Skill_cFv */ #pragma push @@ -942,19 +970,7 @@ asm void __sinit_d_menu_skill_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_801F9A28 = (void*)__sinit_d_menu_skill_cpp; +REGISTER_CTORS(0x801F9A28, __sinit_d_menu_skill_cpp); #pragma pop -/* 80397DB8-80397E38 024418 007A+06 7/7 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80397DB8 = "/res/Layout/skillres.arc"; -SECTION_DEAD static char const* const stringBase_80397DD1 = "zelda_ougi_window.blo"; -SECTION_DEAD static char const* const stringBase_80397DE7 = ""; -SECTION_DEAD static char const* const stringBase_80397DE8 = "zelda_ougi_info.blo"; -SECTION_DEAD static char const* const stringBase_80397DFC = "tt_block8x8.bti"; -SECTION_DEAD static char const* const stringBase_80397E0C = "zelda_collect_soubi_do_icon_parts.blo"; -/* @stringBase0 padding */ -SECTION_DEAD static char const* const pad_80397E32 = "\0\0\0\0\0"; -#pragma pop +/* 80397DB8-80397DB8 024418 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/menu/d_menu_window.cpp b/src/d/menu/d_menu_window.cpp index db7c090de0c..c1d3aa1004e 100644 --- a/src/d/menu/d_menu_window.cpp +++ b/src/d/menu/d_menu_window.cpp @@ -162,16 +162,16 @@ struct dMenu_save_c { /* 801F69FC */ void _draw2(); }; -struct JKRExpHeap {}; - -struct CSTControl {}; - struct STControl { /* 80032044 */ STControl(s16, s16, s16, s16, f32, f32, s16, s16); /* 80032088 */ void setWaitParm(s16, s16, s16, s16, f32, f32, s16, s16); /* 8003219C */ void checkTrigger(); }; +struct CSTControl {}; + +struct JKRExpHeap {}; + struct dMenu_Skill_c { /* 801F7224 */ dMenu_Skill_c(JKRExpHeap*, STControl*, CSTControl*); /* 801F7718 */ void _move(); @@ -270,10 +270,10 @@ struct dDlst_MENU_CAPTURE_c { /* 801FE2E8 */ ~dDlst_MENU_CAPTURE_c(); }; -struct Vec {}; - struct JAISoundID {}; +struct Vec {}; + struct Z2SeMgr { /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); }; @@ -2582,6 +2582,15 @@ asm void dMw_c::markMemSize() { } #pragma pop +/* ############################################################################################## */ +/* 80397E38-80397E38 024498 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80397E38 = "memory free error!!\n"; +/* @stringBase0 padding */ +SECTION_DEAD static char const* const pad_80397E4D = "\0\0"; +#pragma pop + /* 801FD0D4-801FD140 1F7A14 006C+00 10/10 0/0 0/0 .text checkMemSize__5dMw_cFv */ #pragma push #pragma optimization_level 0 @@ -2700,7 +2709,7 @@ asm void __sinit_d_menu_window_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_801FD928 = (void*)__sinit_d_menu_window_cpp; +REGISTER_CTORS(0x801FD928, __sinit_d_menu_window_cpp); #pragma pop /* ############################################################################################## */ @@ -2727,11 +2736,4 @@ asm dDlst_MENU_CAPTURE_c::~dDlst_MENU_CAPTURE_c() { } #pragma pop -/* 80397E38-80397E50 024498 0015+03 1/1 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80397E38 = "memory free error!!\n"; -/* @stringBase0 padding */ -SECTION_DEAD static char const* const pad_80397E4D = "\0\0"; -#pragma pop +/* 80397E38-80397E38 024498 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/menu/d_menu_window_HIO.cpp b/src/d/menu/d_menu_window_HIO.cpp index 8849c2e3ad8..5fb138a27ab 100644 --- a/src/d/menu/d_menu_window_HIO.cpp +++ b/src/d/menu/d_menu_window_HIO.cpp @@ -199,5 +199,5 @@ asm void __sinit_d_menu_window_HIO_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_801F9F28 = (void*)__sinit_d_menu_window_HIO_cpp; +REGISTER_CTORS(0x801F9F28, __sinit_d_menu_window_HIO_cpp); #pragma pop diff --git a/src/d/meter/d_meter2.cpp b/src/d/meter/d_meter2.cpp index a867e2fb57b..b310d96b93b 100644 --- a/src/d/meter/d_meter2.cpp +++ b/src/d/meter/d_meter2.cpp @@ -74,7 +74,6 @@ struct J2DScreen {}; struct dMeterMap_c { /* 8020D650 */ void isEnableDispMapAndMapDispSizeTypeNo(); /* 8020D75C */ void getMapDispEdgeTop(); - /* 8020D8F8 */ void setMapAlpha(u8); /* 8020D948 */ dMeterMap_c(J2DScreen*); /* 8020DCE4 */ void _move(u32); /* 8020DF1C */ void _draw(); @@ -244,10 +243,10 @@ struct Z2StatusMgr { /* 802B5F70 */ void heartGaugeOn(); }; -struct Vec {}; - struct JAISoundID {}; +struct Vec {}; + struct Z2SeMgr { /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); /* 802AC50C */ void seStartLevel(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); @@ -490,6 +489,12 @@ extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; // /* ############################################################################################## */ +/* 80399338-80399338 025998 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80399338 = "F_SP00"; +#pragma pop + /* 804549C8-804549CC 002FC8 0004+00 9/9 0/0 0/0 .sdata2 @4662 */ SECTION_SDATA2 static u8 lit_4662[4] = { 0x00, @@ -804,6 +809,13 @@ asm void dMeter2_c::move2DContents() { } #pragma pop +/* ############################################################################################## */ +/* 80399338-80399338 025998 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8039933F = "F_SP103"; +#pragma pop + /* 802237D4-80223BC4 21E114 03F0+00 1/1 0/0 0/0 .text checkSubContents__9dMeter2_cFv */ #pragma push #pragma optimization_level 0 @@ -905,6 +917,15 @@ asm void dMeter2_c::alphaAnimeLightDrop() { } #pragma pop +/* ############################################################################################## */ +/* 80399338-80399338 025998 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80399347 = "R_SP127"; +/* @stringBase0 padding */ +SECTION_DEAD static char const* const pad_8039934F = ""; +#pragma pop + /* 80224DC0-80224F70 21F700 01B0+00 1/1 0/0 0/0 .text alphaAnimeRupee__9dMeter2_cFv */ #pragma push #pragma optimization_level 0 @@ -1069,13 +1090,4 @@ SECTION_DATA extern void* g_profile_METER2[10] = { (void*)0x03010000, (void*)&l_dMeter2_Method, }; -/* 80399338-80399350 025998 0017+01 3/3 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80399338 = "F_SP00"; -SECTION_DEAD static char const* const stringBase_8039933F = "F_SP103"; -SECTION_DEAD static char const* const stringBase_80399347 = "R_SP127"; -/* @stringBase0 padding */ -SECTION_DEAD static char const* const pad_8039934F = ""; -#pragma pop +/* 80399338-80399338 025998 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/meter/d_meter2_draw.cpp b/src/d/meter/d_meter2_draw.cpp index 8dbbd9d3943..7568bf17b9a 100644 --- a/src/d/meter/d_meter2_draw.cpp +++ b/src/d/meter/d_meter2_draw.cpp @@ -29,7 +29,7 @@ struct dMsgObject_c { /* 8023822C */ void getStatus(); }; -struct JMSMesgEntry_c {}; +struct ResTIMG {}; struct ResTLUT {}; @@ -40,13 +40,13 @@ struct JGeometry { struct TBox2__template0 {}; }; -struct ResTIMG {}; - struct J2DPicture { /* 802FC708 */ J2DPicture(ResTIMG const*); /* 802FC800 */ J2DPicture(u64, JGeometry::TBox2 const&, ResTIMG const*, ResTLUT const*); }; +struct JMSMesgEntry_c {}; + struct dMeter2Info_c { /* 8021C250 */ void getString(u32, char*, JMSMesgEntry_c*); /* 8021C370 */ void getStringKana(u32, char*, JMSMesgEntry_c*); @@ -56,18 +56,18 @@ struct dMeter2Info_c { J2DPicture*, void*, J2DPicture*, int); }; -struct JKRExpHeap {}; - struct JUtility { struct TColor {}; }; +struct JKRExpHeap {}; + +struct J2DGrafContext {}; + struct JKRArchive { /* 802D5B38 */ void getGlbResource(u32, char const*, JKRArchive*); }; -struct J2DGrafContext {}; - struct J2DScreen { /* 802F8498 */ J2DScreen(); /* 802F8648 */ void setPriority(char const*, u32, JKRArchive*); @@ -75,10 +75,19 @@ struct J2DScreen { /* 802F9690 */ void animation(); }; -struct J2DRotateAxis {}; +struct CPaneMgrAlpha { + /* 802553FC */ CPaneMgrAlpha(J2DScreen*, u64, u8, JKRExpHeap*); + /* 802555C8 */ void show(); + /* 80255608 */ void hide(); + /* 8025564C */ void isVisible(); + /* 802557D0 */ void setAlphaRate(f32); + /* 80255828 */ void getAlphaRate(); +}; struct J2DBasePosition {}; +struct J2DRotateAxis {}; + struct J2DPane { /* 802F666C */ void appendChild(J2DPane*); /* 802F71DC */ void rotate(f32, f32, J2DRotateAxis, f32); @@ -94,15 +103,6 @@ struct CPaneMgr { /* 80254EBC */ void getGlobalVtxCenter(J2DPane*, bool, s16); }; -struct CPaneMgrAlpha { - /* 802553FC */ CPaneMgrAlpha(J2DScreen*, u64, u8, JKRExpHeap*); - /* 802555C8 */ void show(); - /* 80255608 */ void hide(); - /* 8025564C */ void isVisible(); - /* 802557D0 */ void setAlphaRate(f32); - /* 80255828 */ void getAlphaRate(); -}; - struct J2DAnmColor {}; struct dMeter2Draw_c { @@ -219,10 +219,10 @@ struct dItem_data { static void* item_resource[1530]; }; -struct Vec {}; - struct JAISoundID {}; +struct Vec {}; + struct Z2SeMgr { /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); /* 802AC50C */ void seStartLevel(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); @@ -462,7 +462,7 @@ SECTION_RODATA static u8 const a_tag[40] = { 0x74, 0x32, 0x63, 0x6F, 0x6E, 0x74, 0x5F, 0x61, 0x74, 0x33, 0x63, 0x6F, 0x6E, 0x74, 0x5F, 0x61, 0x74, 0x34, 0x00, 0x63, 0x6F, 0x6E, 0x74, 0x5F, 0x61, 0x74, }; -COMPILER_STRIP_GATE(80398258, &a_tag); +COMPILER_STRIP_GATE(0x80398258, &a_tag); /* 80398280-803982A8 0248E0 0028+00 0/1 0/0 0/0 .rodata b_tag$3950 */ #pragma push @@ -472,7 +472,7 @@ SECTION_RODATA static u8 const b_tag[40] = { 0x74, 0x32, 0x63, 0x6F, 0x6E, 0x74, 0x5F, 0x62, 0x74, 0x33, 0x63, 0x6F, 0x6E, 0x74, 0x5F, 0x62, 0x74, 0x34, 0x00, 0x63, 0x6F, 0x6E, 0x74, 0x5F, 0x62, 0x74, }; -COMPILER_STRIP_GATE(80398280, &b_tag); +COMPILER_STRIP_GATE(0x80398280, &b_tag); #pragma pop /* 803982A8-803982D0 024908 0028+00 0/1 0/0 0/0 .rodata z_tag$3951 */ @@ -483,7 +483,7 @@ SECTION_RODATA static u8 const z_tag[40] = { 0x74, 0x32, 0x63, 0x6F, 0x6E, 0x74, 0x5F, 0x7A, 0x74, 0x33, 0x63, 0x6F, 0x6E, 0x74, 0x5F, 0x7A, 0x74, 0x34, 0x00, 0x63, 0x6F, 0x6E, 0x74, 0x5F, 0x72, 0x74, }; -COMPILER_STRIP_GATE(803982A8, &z_tag); +COMPILER_STRIP_GATE(0x803982A8, &z_tag); #pragma pop /* 803982D0-803982F8 024930 0028+00 0/1 0/0 0/0 .rodata x_tag$3952 */ @@ -494,7 +494,7 @@ SECTION_RODATA static u8 const x_tag[40] = { 0x74, 0x32, 0x63, 0x6F, 0x6E, 0x74, 0x5F, 0x78, 0x74, 0x33, 0x63, 0x6F, 0x6E, 0x74, 0x5F, 0x78, 0x74, 0x34, 0x63, 0x6F, 0x6E, 0x74, 0x5F, 0x78, 0x74, 0x35, }; -COMPILER_STRIP_GATE(803982D0, &x_tag); +COMPILER_STRIP_GATE(0x803982D0, &x_tag); #pragma pop /* 803982F8-80398320 024958 0028+00 0/1 0/0 0/0 .rodata y_tag$3953 */ @@ -505,7 +505,29 @@ SECTION_RODATA static u8 const y_tag[40] = { 0x74, 0x32, 0x63, 0x6F, 0x6E, 0x74, 0x5F, 0x79, 0x74, 0x33, 0x63, 0x6F, 0x6E, 0x74, 0x5F, 0x79, 0x74, 0x34, 0x63, 0x6F, 0x6E, 0x74, 0x5F, 0x79, 0x74, 0x35, }; -COMPILER_STRIP_GATE(803982F8, &y_tag); +COMPILER_STRIP_GATE(0x803982F8, &y_tag); +#pragma pop + +/* 803988D0-803988D0 024F30 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_803988D0 = "zel_00.bmg"; +SECTION_DEAD static char const* const stringBase_803988DB = "zel_01.bmg"; +SECTION_DEAD static char const* const stringBase_803988E6 = "zel_02.bmg"; +SECTION_DEAD static char const* const stringBase_803988F1 = "zel_03.bmg"; +SECTION_DEAD static char const* const stringBase_803988FC = "zel_04.bmg"; +SECTION_DEAD static char const* const stringBase_80398907 = "zel_05.bmg"; +SECTION_DEAD static char const* const stringBase_80398912 = "zel_06.bmg"; +SECTION_DEAD static char const* const stringBase_8039891D = "zel_07.bmg"; +SECTION_DEAD static char const* const stringBase_80398928 = "zel_08.bmg"; +SECTION_DEAD static char const* const stringBase_80398933 = "zel_99.bmg"; +SECTION_DEAD static char const* const stringBase_8039893E = "zel_unit.bmg"; +SECTION_DEAD static char const* const stringBase_8039894B = "zelda_game_image.blo"; +SECTION_DEAD static char const* const stringBase_80398960 = "zelda_game_image_kantera.blo"; +SECTION_DEAD static char const* const stringBase_8039897D = "zelda_icon_pikari.blo"; +SECTION_DEAD static char const* const stringBase_80398993 = "zelda_icon_pikari.bck"; +SECTION_DEAD static char const* const stringBase_803989A9 = "zelda_icon_pikari.bpk"; +SECTION_DEAD static char const* const stringBase_803989BF = ""; #pragma pop /* 803BF328-803BF350 -00001 0028+00 1/1 0/0 0/0 .data bmg_filename$3954 */ @@ -811,7 +833,7 @@ SECTION_RODATA static u8 const life_tag[160] = { 0x00, 0x00, 0x68, 0x70, 0x62, 0x5F, 0x31, 0x36, 0x00, 0x00, 0x68, 0x70, 0x62, 0x5F, 0x31, 0x37, 0x00, 0x00, 0x68, 0x70, 0x62, 0x5F, 0x31, 0x38, 0x00, 0x00, 0x68, 0x70, 0x62, 0x5F, 0x31, 0x39, }; -COMPILER_STRIP_GATE(80398320, &life_tag); +COMPILER_STRIP_GATE(0x80398320, &life_tag); #pragma pop /* 803983C0-80398460 024A20 00A0+00 0/1 0/0 0/0 .rodata mark_tag$4932 */ @@ -829,7 +851,7 @@ SECTION_RODATA static u8 const mark_tag[160] = { 0x68, 0x65, 0x61, 0x72, 0x74, 0x6E, 0x31, 0x36, 0x68, 0x65, 0x61, 0x72, 0x74, 0x6E, 0x31, 0x37, 0x68, 0x65, 0x61, 0x72, 0x74, 0x6E, 0x31, 0x38, 0x68, 0x65, 0x61, 0x72, 0x74, 0x6E, 0x31, 0x39, }; -COMPILER_STRIP_GATE(803983C0, &mark_tag); +COMPILER_STRIP_GATE(0x803983C0, &mark_tag); #pragma pop /* 80398460-80398500 024AC0 00A0+00 0/1 0/0 0/0 .rodata base_tag$4933 */ @@ -847,7 +869,7 @@ SECTION_RODATA static u8 const base_tag[160] = { 0x68, 0x5F, 0x62, 0x61, 0x5F, 0x6E, 0x31, 0x36, 0x68, 0x5F, 0x62, 0x61, 0x5F, 0x6E, 0x31, 0x37, 0x68, 0x5F, 0x62, 0x61, 0x5F, 0x6E, 0x31, 0x38, 0x68, 0x5F, 0x62, 0x61, 0x5F, 0x6E, 0x31, 0x39, }; -COMPILER_STRIP_GATE(80398460, &base_tag); +COMPILER_STRIP_GATE(0x80398460, &base_tag); #pragma pop /* 80398500-803985A0 024B60 00A0+00 0/1 0/0 0/0 .rodata lifet1_tag$4934 */ @@ -865,7 +887,7 @@ SECTION_RODATA static u8 const lifet1_tag[160] = { 0x68, 0x65, 0x61, 0x72, 0x5F, 0x31, 0x36, 0x73, 0x68, 0x65, 0x61, 0x72, 0x5F, 0x31, 0x37, 0x73, 0x68, 0x65, 0x61, 0x72, 0x5F, 0x31, 0x38, 0x73, 0x68, 0x65, 0x61, 0x72, 0x5F, 0x31, 0x39, 0x73, }; -COMPILER_STRIP_GATE(80398500, &lifet1_tag); +COMPILER_STRIP_GATE(0x80398500, &lifet1_tag); #pragma pop /* 803985A0-80398640 024C00 00A0+00 0/1 0/0 0/0 .rodata lifet2_tag$4935 */ @@ -883,7 +905,7 @@ SECTION_RODATA static u8 const lifet2_tag[160] = { 0x00, 0x68, 0x65, 0x61, 0x72, 0x5F, 0x31, 0x36, 0x00, 0x68, 0x65, 0x61, 0x72, 0x5F, 0x31, 0x37, 0x00, 0x68, 0x65, 0x61, 0x72, 0x5F, 0x31, 0x38, 0x00, 0x68, 0x65, 0x61, 0x72, 0x5F, 0x31, 0x39, }; -COMPILER_STRIP_GATE(803985A0, &lifet2_tag); +COMPILER_STRIP_GATE(0x803985A0, &lifet2_tag); #pragma pop /* 80211BEC-80211E64 20C52C 0278+00 1/1 0/0 0/0 .text initLife__13dMeter2Draw_cFv */ @@ -896,6 +918,15 @@ asm void dMeter2Draw_c::initLife() { } #pragma pop +/* ############################################################################################## */ +/* 803988D0-803988D0 024F30 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_803989C0 = "zelda_game_image_sanso_10percent.bpk"; +SECTION_DEAD static char const* const stringBase_803989E5 = "zelda_game_image_sanso_25percent.bpk"; +SECTION_DEAD static char const* const stringBase_80398A0A = "zelda_game_image_sanso_50percent.bpk"; +#pragma pop + /* 80211E64-80212190 20C7A4 032C+00 1/1 0/0 0/0 .text initMagic__13dMeter2Draw_cFv */ #pragma push #pragma optimization_level 0 @@ -920,7 +951,7 @@ SECTION_RODATA static u8 const tuta_0[128] = { 0x00, 0x00, 0x00, 0x00, 0x73, 0x5F, 0x31, 0x32, 0x00, 0x00, 0x00, 0x00, 0x73, 0x5F, 0x31, 0x33, 0x00, 0x00, 0x00, 0x00, 0x73, 0x5F, 0x31, 0x34, 0x00, 0x00, 0x00, 0x00, 0x73, 0x5F, 0x31, 0x35, }; -COMPILER_STRIP_GATE(80398640, &tuta_0); +COMPILER_STRIP_GATE(0x80398640, &tuta_0); #pragma pop /* 803986C0-80398740 024D20 0080+00 0/1 0/0 0/0 .rodata tuta_1$5095 */ @@ -936,7 +967,7 @@ SECTION_RODATA static u8 const tuta_1[128] = { 0x00, 0x00, 0x00, 0x73, 0x6C, 0x5F, 0x31, 0x32, 0x00, 0x00, 0x00, 0x73, 0x6C, 0x5F, 0x31, 0x33, 0x00, 0x00, 0x00, 0x73, 0x6C, 0x5F, 0x31, 0x34, 0x00, 0x00, 0x00, 0x73, 0x6C, 0x5F, 0x31, 0x35, }; -COMPILER_STRIP_GATE(803986C0, &tuta_1); +COMPILER_STRIP_GATE(0x803986C0, &tuta_1); #pragma pop /* 80398740-803987C0 024DA0 0080+00 0/1 0/0 0/0 .rodata tuta_2$5096 */ @@ -952,7 +983,7 @@ SECTION_RODATA static u8 const tuta_2[128] = { 0x00, 0x00, 0x73, 0x63, 0x70, 0x5F, 0x31, 0x32, 0x00, 0x00, 0x73, 0x63, 0x70, 0x5F, 0x31, 0x33, 0x00, 0x00, 0x73, 0x63, 0x70, 0x5F, 0x31, 0x34, 0x00, 0x00, 0x73, 0x63, 0x70, 0x5F, 0x31, 0x35, }; -COMPILER_STRIP_GATE(80398740, &tuta_2); +COMPILER_STRIP_GATE(0x80398740, &tuta_2); #pragma pop /* 80212190-80212404 20CAD0 0274+00 1/1 0/0 0/0 .text initLightDrop__13dMeter2Draw_cFv */ @@ -973,7 +1004,7 @@ SECTION_RODATA static u8 const rupeet1_tag[32] = { 0x00, 0x72, 0x5F, 0x6E, 0x5F, 0x31, 0x5F, 0x73, 0x00, 0x72, 0x5F, 0x6E, 0x5F, 0x32, 0x5F, 0x73, 0x00, 0x72, 0x5F, 0x6E, 0x5F, 0x33, 0x5F, 0x73, 0x00, 0x72, 0x5F, 0x6E, 0x5F, 0x34, 0x5F, 0x73, }; -COMPILER_STRIP_GATE(803987C0, &rupeet1_tag); +COMPILER_STRIP_GATE(0x803987C0, &rupeet1_tag); #pragma pop /* 803987E0-80398800 024E40 0020+00 0/1 0/0 0/0 .rodata rupeet2_tag$5153 */ @@ -983,7 +1014,7 @@ SECTION_RODATA static u8 const rupeet2_tag[32] = { 0x00, 0x00, 0x00, 0x72, 0x5F, 0x6E, 0x5F, 0x31, 0x00, 0x00, 0x00, 0x72, 0x5F, 0x6E, 0x5F, 0x32, 0x00, 0x00, 0x00, 0x72, 0x5F, 0x6E, 0x5F, 0x33, 0x00, 0x00, 0x00, 0x72, 0x5F, 0x6E, 0x5F, 0x34, }; -COMPILER_STRIP_GATE(803987E0, &rupeet2_tag); +COMPILER_STRIP_GATE(0x803987E0, &rupeet2_tag); #pragma pop /* 80398800-80398828 024E60 0028+00 0/1 0/0 0/0 .rodata key_tag$5165 */ @@ -994,7 +1025,7 @@ SECTION_RODATA static u8 const key_tag[40] = { 0x5F, 0x6E, 0x00, 0x6B, 0x5F, 0x6E, 0x5F, 0x32, 0x5F, 0x6E, 0x00, 0x6B, 0x5F, 0x6E, 0x5F, 0x33, 0x5F, 0x6E, 0x00, 0x6B, 0x5F, 0x6E, 0x5F, 0x34, 0x5F, 0x6E, }; -COMPILER_STRIP_GATE(80398800, &key_tag); +COMPILER_STRIP_GATE(0x80398800, &key_tag); #pragma pop /* 80212404-802126E4 20CD44 02E0+00 1/1 0/0 0/0 .text initRupeeKey__13dMeter2Draw_cFv */ @@ -1014,7 +1045,7 @@ SECTION_RODATA static u8 const juji_i_tag[40] = { 0x30, 0x30, 0x00, 0x79, 0x61, 0x6A, 0x69, 0x5F, 0x30, 0x31, 0x6A, 0x75, 0x5F, 0x72, 0x69, 0x6E, 0x67, 0x32, 0x6A, 0x75, 0x5F, 0x72, 0x69, 0x6E, 0x67, 0x34, }; -COMPILER_STRIP_GATE(80398828, &juji_i_tag); +COMPILER_STRIP_GATE(0x80398828, &juji_i_tag); /* 80398850-80398878 024EB0 0028+00 1/1 0/0 0/0 .rodata juji_m_tag$5270 */ SECTION_RODATA static u8 const juji_m_tag[40] = { @@ -1022,7 +1053,7 @@ SECTION_RODATA static u8 const juji_m_tag[40] = { 0x30, 0x32, 0x00, 0x79, 0x61, 0x6A, 0x69, 0x5F, 0x30, 0x33, 0x6A, 0x75, 0x5F, 0x72, 0x69, 0x6E, 0x67, 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80398850, &juji_m_tag); +COMPILER_STRIP_GATE(0x80398850, &juji_m_tag); /* 802126E4-8021350C 20D024 0E28+00 1/1 0/0 0/0 .text initButton__13dMeter2Draw_cFv */ #pragma push @@ -1147,13 +1178,13 @@ SECTION_RODATA static u8 const tag_bigh[32] = { 0x00, 0x62, 0x69, 0x67, 0x68, 0x5F, 0x30, 0x30, 0x00, 0x62, 0x69, 0x67, 0x68, 0x5F, 0x30, 0x31, 0x00, 0x62, 0x69, 0x67, 0x68, 0x5F, 0x30, 0x32, 0x00, 0x62, 0x69, 0x67, 0x68, 0x5F, 0x30, 0x33, }; -COMPILER_STRIP_GATE(80398878, &tag_bigh); +COMPILER_STRIP_GATE(0x80398878, &tag_bigh); /* 80398898-803988A8 024EF8 0010+00 1/1 0/0 0/0 .rodata tag_du$5852 */ SECTION_RODATA static u8 const tag_du[16] = { 0x68, 0x65, 0x61, 0x72, 0x74, 0x5F, 0x6C, 0x6E, 0x68, 0x65, 0x61, 0x72, 0x74, 0x5F, 0x75, 0x6E, }; -COMPILER_STRIP_GATE(80398898, &tag_du); +COMPILER_STRIP_GATE(0x80398898, &tag_du); /* 802147CC-802149F4 20F10C 0228+00 1/1 0/0 0/0 .text changeTextureLife__13dMeter2Draw_cFibUc */ #pragma push @@ -1556,7 +1587,7 @@ asm void dMeter2Draw_c::drawButtonBin(u8 param_0) { SECTION_RODATA static u8 const tag_7361[16] = { 0x69, 0x74, 0x65, 0x6D, 0x5F, 0x78, 0x5F, 0x6E, 0x69, 0x74, 0x65, 0x6D, 0x5F, 0x79, 0x5F, 0x6E, }; -COMPILER_STRIP_GATE(803988A8, &tag_7361); +COMPILER_STRIP_GATE(0x803988A8, &tag_7361); /* 80217AB4-80218238 2123F4 0784+00 1/1 1/1 0/0 .text drawButtonXY__13dMeter2Draw_cFiUcUcbb */ #pragma push @@ -2112,6 +2143,19 @@ asm void dMeter2Draw_c::getFishingType() { } #pragma pop +/* ############################################################################################## */ +/* 803988D0-803988D0 024F30 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80398A2F = "tt_heart_00.bti"; +SECTION_DEAD static char const* const stringBase_80398A3F = "tt_heart_01.bti"; +SECTION_DEAD static char const* const stringBase_80398A4F = "tt_heart_02.bti"; +SECTION_DEAD static char const* const stringBase_80398A5F = "tt_heart_03.bti"; +SECTION_DEAD static char const* const stringBase_80398A6F = "F_SP127"; +/* @stringBase0 padding */ +SECTION_DEAD static char const* const pad_80398A77 = ""; +#pragma pop + /* 8021BBB4-8021BC24 2164F4 0070+00 2/2 1/1 0/0 .text getCanoeFishing__13dMeter2Draw_cFv */ #pragma push @@ -2185,38 +2229,7 @@ SECTION_RODATA static u8 const tag_7759[24] = { 0x69, 0x74, 0x65, 0x6D, 0x5F, 0x78, 0x5F, 0x6E, 0x69, 0x74, 0x65, 0x6D, 0x5F, 0x79, 0x5F, 0x6E, 0x69, 0x74, 0x65, 0x6D, 0x5F, 0x6A, 0x5F, 0x6E, }; -COMPILER_STRIP_GATE(803988B8, &tag_7759); +COMPILER_STRIP_GATE(0x803988B8, &tag_7759); #pragma pop -/* 803988D0-80398A78 024F30 01A7+01 6/5 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_803988D0 = "zel_00.bmg"; -SECTION_DEAD static char const* const stringBase_803988DB = "zel_01.bmg"; -SECTION_DEAD static char const* const stringBase_803988E6 = "zel_02.bmg"; -SECTION_DEAD static char const* const stringBase_803988F1 = "zel_03.bmg"; -SECTION_DEAD static char const* const stringBase_803988FC = "zel_04.bmg"; -SECTION_DEAD static char const* const stringBase_80398907 = "zel_05.bmg"; -SECTION_DEAD static char const* const stringBase_80398912 = "zel_06.bmg"; -SECTION_DEAD static char const* const stringBase_8039891D = "zel_07.bmg"; -SECTION_DEAD static char const* const stringBase_80398928 = "zel_08.bmg"; -SECTION_DEAD static char const* const stringBase_80398933 = "zel_99.bmg"; -SECTION_DEAD static char const* const stringBase_8039893E = "zel_unit.bmg"; -SECTION_DEAD static char const* const stringBase_8039894B = "zelda_game_image.blo"; -SECTION_DEAD static char const* const stringBase_80398960 = "zelda_game_image_kantera.blo"; -SECTION_DEAD static char const* const stringBase_8039897D = "zelda_icon_pikari.blo"; -SECTION_DEAD static char const* const stringBase_80398993 = "zelda_icon_pikari.bck"; -SECTION_DEAD static char const* const stringBase_803989A9 = "zelda_icon_pikari.bpk"; -SECTION_DEAD static char const* const stringBase_803989BF = ""; -SECTION_DEAD static char const* const stringBase_803989C0 = "zelda_game_image_sanso_10percent.bpk"; -SECTION_DEAD static char const* const stringBase_803989E5 = "zelda_game_image_sanso_25percent.bpk"; -SECTION_DEAD static char const* const stringBase_80398A0A = "zelda_game_image_sanso_50percent.bpk"; -SECTION_DEAD static char const* const stringBase_80398A2F = "tt_heart_00.bti"; -SECTION_DEAD static char const* const stringBase_80398A3F = "tt_heart_01.bti"; -SECTION_DEAD static char const* const stringBase_80398A4F = "tt_heart_02.bti"; -SECTION_DEAD static char const* const stringBase_80398A5F = "tt_heart_03.bti"; -SECTION_DEAD static char const* const stringBase_80398A6F = "F_SP127"; -/* @stringBase0 padding */ -SECTION_DEAD static char const* const pad_80398A77 = ""; -#pragma pop +/* 803988D0-803988D0 024F30 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/meter/d_meter2_info.cpp b/src/d/meter/d_meter2_info.cpp index a1dbeb6f3ae..67ab32b3d93 100644 --- a/src/d/meter/d_meter2_info.cpp +++ b/src/d/meter/d_meter2_info.cpp @@ -64,18 +64,18 @@ struct dMeterMap_c { /* 8020D900 */ void isMapOpenCheck(); }; +struct J2DPicture {}; + +struct JMSMesgEntry_c {}; + struct J2DTextBox { /* 8021C7F4 */ void getFont() const; }; struct JUTFont {}; -struct J2DPicture {}; - struct cXyz {}; -struct JMSMesgEntry_c {}; - struct dMeter2Info_c { /* 8021BDDC */ dMeter2Info_c(); /* 8021BE20 */ ~dMeter2Info_c(); @@ -264,6 +264,35 @@ extern "C" extern u8 g_dComIfG_gameInfo[122384]; // /* ############################################################################################## */ +/* 80399168-80399168 0257C8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80399168 = ""; +SECTION_DEAD static char const* const stringBase_80399169 = "zel_00.bmg"; +SECTION_DEAD static char const* const stringBase_80399174 = "D_MN01"; +SECTION_DEAD static char const* const stringBase_8039917B = "D_MN07"; +SECTION_DEAD static char const* const stringBase_80399182 = + "im_font_number_32_32_ganshinkyo_0_02.bti"; +SECTION_DEAD static char const* const stringBase_803991AB = + "im_font_number_32_32_ganshinkyo_1_02.bti"; +SECTION_DEAD static char const* const stringBase_803991D4 = + "im_font_number_32_32_ganshinkyo_2_02.bti"; +SECTION_DEAD static char const* const stringBase_803991FD = + "im_font_number_32_32_ganshinkyo_3_02.bti"; +SECTION_DEAD static char const* const stringBase_80399226 = + "im_font_number_32_32_ganshinkyo_4_03.bti"; +SECTION_DEAD static char const* const stringBase_8039924F = + "im_font_number_32_32_ganshinkyo_5_02.bti"; +SECTION_DEAD static char const* const stringBase_80399278 = + "im_font_number_32_32_ganshinkyo_6_02.bti"; +SECTION_DEAD static char const* const stringBase_803992A1 = + "im_font_number_32_32_ganshinkyo_7_02.bti"; +SECTION_DEAD static char const* const stringBase_803992CA = + "im_font_number_32_32_ganshinkyo_8_02.bti"; +SECTION_DEAD static char const* const stringBase_803992F3 = + "im_font_number_32_32_ganshinkyo_9_02.bti"; +#pragma pop + /* 803BF760-803BF7F4 -00001 0094+00 1/1 0/0 0/0 .data @4572 */ SECTION_DATA static void* lit_4572[37] = { (void*)(((char*)get2ndTexture__13dMeter2Info_cFUc) + 0x64), @@ -733,7 +762,7 @@ SECTION_RODATA static u8 const black_color_4634[148] = { 0x46, 0x46, 0x41, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80398A78, &black_color_4634); +COMPILER_STRIP_GATE(0x80398A78, &black_color_4634); /* 80398B0C-80398BA0 02516C 0094+00 0/1 0/0 0/0 .rodata white_color$4635 */ #pragma push @@ -750,7 +779,7 @@ SECTION_RODATA static u8 const white_color_4635[148] = { 0xF5, 0xF5, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, }; -COMPILER_STRIP_GATE(80398B0C, &white_color_4635); +COMPILER_STRIP_GATE(0x80398B0C, &white_color_4635); #pragma pop /* 80398BA0-80398C34 025200 0094+00 0/1 0/0 0/0 .rodata vertex_color_lu$4636 */ @@ -768,7 +797,7 @@ SECTION_RODATA static u8 const vertex_color_lu_4636[148] = { 0xFF, 0xFF, 0xFF, 0x00, 0xFF, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, }; -COMPILER_STRIP_GATE(80398BA0, &vertex_color_lu_4636); +COMPILER_STRIP_GATE(0x80398BA0, &vertex_color_lu_4636); #pragma pop /* 80398C34-80398CC8 025294 0094+00 0/1 0/0 0/0 .rodata vertex_color_ru$4637 */ @@ -786,7 +815,7 @@ SECTION_RODATA static u8 const vertex_color_ru_4637[148] = { 0xFF, 0xFF, 0xFF, 0x00, 0xFF, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, }; -COMPILER_STRIP_GATE(80398C34, &vertex_color_ru_4637); +COMPILER_STRIP_GATE(0x80398C34, &vertex_color_ru_4637); #pragma pop /* 80398CC8-80398D5C 025328 0094+00 0/1 0/0 0/0 .rodata vertex_color_ld$4638 */ @@ -804,7 +833,7 @@ SECTION_RODATA static u8 const vertex_color_ld_4638[148] = { 0x00, 0x00, 0x00, 0xFF, 0xE0, 0x00, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, }; -COMPILER_STRIP_GATE(80398CC8, &vertex_color_ld_4638); +COMPILER_STRIP_GATE(0x80398CC8, &vertex_color_ld_4638); #pragma pop /* 80398D5C-80398DF0 0253BC 0094+00 0/1 0/0 0/0 .rodata vertex_color_rd$4639 */ @@ -822,7 +851,7 @@ SECTION_RODATA static u8 const vertex_color_rd_4639[148] = { 0x00, 0x00, 0x00, 0xFF, 0xE0, 0x00, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, }; -COMPILER_STRIP_GATE(80398D5C, &vertex_color_rd_4639); +COMPILER_STRIP_GATE(0x80398D5C, &vertex_color_rd_4639); #pragma pop /* 8021D524-8021D644 217E64 0120+00 2/2 0/0 0/0 .text set1stColor__13dMeter2Info_cFUcP10J2DPicture @@ -852,7 +881,7 @@ SECTION_RODATA static u8 const black_color_4675[148] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80398DF0, &black_color_4675); +COMPILER_STRIP_GATE(0x80398DF0, &black_color_4675); #pragma pop /* 80398E84-80398F18 0254E4 0094+00 0/1 0/0 0/0 .rodata white_color$4676 */ @@ -870,7 +899,7 @@ SECTION_RODATA static u8 const white_color_4676[148] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, }; -COMPILER_STRIP_GATE(80398E84, &white_color_4676); +COMPILER_STRIP_GATE(0x80398E84, &white_color_4676); #pragma pop /* 80398F18-80398FAC 025578 0094+00 0/1 0/0 0/0 .rodata vertex_color_lu$4677 */ @@ -888,7 +917,7 @@ SECTION_RODATA static u8 const vertex_color_lu_4677[148] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, }; -COMPILER_STRIP_GATE(80398F18, &vertex_color_lu_4677); +COMPILER_STRIP_GATE(0x80398F18, &vertex_color_lu_4677); #pragma pop /* 80398FAC-80399040 02560C 0094+00 0/1 0/0 0/0 .rodata vertex_color_ru$4678 */ @@ -906,7 +935,7 @@ SECTION_RODATA static u8 const vertex_color_ru_4678[148] = { 0xFF, 0xFF, 0xFF, 0x58, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, }; -COMPILER_STRIP_GATE(80398FAC, &vertex_color_ru_4678); +COMPILER_STRIP_GATE(0x80398FAC, &vertex_color_ru_4678); #pragma pop /* 80399040-803990D4 0256A0 0094+00 0/1 0/0 0/0 .rodata vertex_color_ld$4679 */ @@ -924,7 +953,7 @@ SECTION_RODATA static u8 const vertex_color_ld_4679[148] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, }; -COMPILER_STRIP_GATE(80399040, &vertex_color_ld_4679); +COMPILER_STRIP_GATE(0x80399040, &vertex_color_ld_4679); #pragma pop /* 803990D4-80399168 025734 0094+00 0/1 0/0 0/0 .rodata vertex_color_rd$4680 */ @@ -942,7 +971,7 @@ SECTION_RODATA static u8 const vertex_color_rd_4680[148] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, }; -COMPILER_STRIP_GATE(803990D4, &vertex_color_rd_4680); +COMPILER_STRIP_GATE(0x803990D4, &vertex_color_rd_4680); #pragma pop /* 8021D644-8021D764 217F84 0120+00 2/2 0/0 0/0 .text set2ndColor__13dMeter2Info_cFUcP10J2DPicture @@ -1070,6 +1099,12 @@ asm void dMeter2Info_getNumberTextureName(int param_0) { #pragma pop /* ############################################################################################## */ +/* 80399168-80399168 0257C8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8039931C = "im_plus_metal_24ｘ24_00.bti"; +#pragma pop + /* 804510B8-804510BC 0005B8 0004+00 1/1 0/0 0/0 .sbss tex_name$5188 */ static u8 tex_name_5188[4]; @@ -1223,36 +1258,7 @@ asm void __sinit_d_meter2_info_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_8021E9D8 = (void*)__sinit_d_meter2_info_cpp; +REGISTER_CTORS(0x8021E9D8, __sinit_d_meter2_info_cpp); #pragma pop -/* 80399168-80399338 0257C8 01D0+00 7/6 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80399168 = ""; -SECTION_DEAD static char const* const stringBase_80399169 = "zel_00.bmg"; -SECTION_DEAD static char const* const stringBase_80399174 = "D_MN01"; -SECTION_DEAD static char const* const stringBase_8039917B = "D_MN07"; -SECTION_DEAD static char const* const stringBase_80399182 = - "im_font_number_32_32_ganshinkyo_0_02.bti"; -SECTION_DEAD static char const* const stringBase_803991AB = - "im_font_number_32_32_ganshinkyo_1_02.bti"; -SECTION_DEAD static char const* const stringBase_803991D4 = - "im_font_number_32_32_ganshinkyo_2_02.bti"; -SECTION_DEAD static char const* const stringBase_803991FD = - "im_font_number_32_32_ganshinkyo_3_02.bti"; -SECTION_DEAD static char const* const stringBase_80399226 = - "im_font_number_32_32_ganshinkyo_4_03.bti"; -SECTION_DEAD static char const* const stringBase_8039924F = - "im_font_number_32_32_ganshinkyo_5_02.bti"; -SECTION_DEAD static char const* const stringBase_80399278 = - "im_font_number_32_32_ganshinkyo_6_02.bti"; -SECTION_DEAD static char const* const stringBase_803992A1 = - "im_font_number_32_32_ganshinkyo_7_02.bti"; -SECTION_DEAD static char const* const stringBase_803992CA = - "im_font_number_32_32_ganshinkyo_8_02.bti"; -SECTION_DEAD static char const* const stringBase_803992F3 = - "im_font_number_32_32_ganshinkyo_9_02.bti"; -SECTION_DEAD static char const* const stringBase_8039931C = "im_plus_metal_24ｘ24_00.bti"; -#pragma pop +/* 80399168-80399168 0257C8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/meter/d_meter_HIO.cpp b/src/d/meter/d_meter_HIO.cpp index 3806c439abc..bf2c94e26e2 100644 --- a/src/d/meter/d_meter_HIO.cpp +++ b/src/d/meter/d_meter_HIO.cpp @@ -408,7 +408,7 @@ SECTION_RODATA static u8 const fipaScale[24] = { 0x3F, 0x7A, 0xE1, 0x48, 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x73, 0x33, 0x33, 0x3F, 0x8C, 0xCC, 0xCD, }; -COMPILER_STRIP_GATE(80397E50, &fipaScale); +COMPILER_STRIP_GATE(0x80397E50, &fipaScale); /* 80397E68-80397E80 0244C8 0018+00 0/1 0/0 0/0 .rodata fipaPosX$3872 */ #pragma push @@ -417,7 +417,7 @@ SECTION_RODATA static u8 const fipaPosX[24] = { 0x3F, 0xA6, 0x66, 0x66, 0x40, 0xD3, 0x33, 0x33, 0x00, 0x00, 0x00, 0x00, 0x40, 0x7D, 0x70, 0xA4, 0x40, 0x80, 0x00, 0x00, 0x41, 0xDC, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80397E68, &fipaPosX); +COMPILER_STRIP_GATE(0x80397E68, &fipaPosX); #pragma pop /* 80397E80-80397E98 0244E0 0018+00 0/1 0/0 0/0 .rodata fipaPosY$3873 */ @@ -427,7 +427,7 @@ SECTION_RODATA static u8 const fipaPosY[24] = { 0xC1, 0x13, 0x33, 0x33, 0xC1, 0xDC, 0x00, 0x00, 0xC1, 0x3B, 0x33, 0x33, 0xC1, 0x13, 0x33, 0x33, 0xC1, 0xF0, 0xCC, 0xCD, 0xC1, 0x8F, 0x33, 0x33, }; -COMPILER_STRIP_GATE(80397E80, &fipaPosY); +COMPILER_STRIP_GATE(0x80397E80, &fipaPosY); #pragma pop /* 80397E98-80397EB0 0244F8 0018+00 0/1 0/0 0/0 .rodata finaScale$3874 */ @@ -437,7 +437,7 @@ SECTION_RODATA static u8 const finaScale[24] = { 0x3F, 0x66, 0x66, 0x66, 0x3F, 0x66, 0x66, 0x66, 0x3F, 0x66, 0x66, 0x66, 0x3F, 0x66, 0x66, 0x66, 0x3F, 0x66, 0x66, 0x66, 0x3F, 0x66, 0x66, 0x66, }; -COMPILER_STRIP_GATE(80397E98, &finaScale); +COMPILER_STRIP_GATE(0x80397E98, &finaScale); #pragma pop /* 80397EB0-80397EC8 024510 0018+00 0/1 0/0 0/0 .rodata finaPosX$3875 */ @@ -447,7 +447,7 @@ SECTION_RODATA static u8 const finaPosX[24] = { 0xC1, 0xC8, 0x00, 0x00, 0xC0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC0, 0x80, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80397EB0, &finaPosX); +COMPILER_STRIP_GATE(0x80397EB0, &finaPosX); #pragma pop /* 80397EC8-80397EE0 024528 0018+00 0/1 0/0 0/0 .rodata finaPosY$3876 */ @@ -457,7 +457,7 @@ SECTION_RODATA static u8 const finaPosY[24] = { 0xC1, 0x80, 0x00, 0x00, 0xC2, 0x22, 0x66, 0x66, 0xC1, 0xC0, 0x00, 0x00, 0xC1, 0x3B, 0x33, 0x33, 0xC2, 0x17, 0x99, 0x9A, 0xC1, 0x50, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80397EC8, &finaPosY); +COMPILER_STRIP_GATE(0x80397EC8, &finaPosY); #pragma pop /* 80397EE0-80397EF8 024540 0018+00 0/1 0/0 0/0 .rodata filiScale$3877 */ @@ -467,7 +467,7 @@ SECTION_RODATA static u8 const filiScale[24] = { 0x3F, 0x26, 0x66, 0x66, 0x3F, 0x26, 0x66, 0x66, 0x3F, 0x26, 0x66, 0x66, 0x3F, 0x26, 0x66, 0x66, 0x3F, 0x26, 0x66, 0x66, 0x3F, 0x26, 0x66, 0x66, }; -COMPILER_STRIP_GATE(80397EE0, &filiScale); +COMPILER_STRIP_GATE(0x80397EE0, &filiScale); #pragma pop /* 80397EF8-80397F10 024558 0018+00 0/1 0/0 0/0 .rodata filiPosX$3878 */ @@ -477,7 +477,7 @@ SECTION_RODATA static u8 const filiPosX[24] = { 0xC1, 0xE0, 0x00, 0x00, 0xC1, 0x00, 0x00, 0x00, 0x41, 0x13, 0x33, 0x33, 0x41, 0x13, 0x33, 0x33, 0x41, 0x13, 0x33, 0x33, 0xC1, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80397EF8, &filiPosX); +COMPILER_STRIP_GATE(0x80397EF8, &filiPosX); #pragma pop /* 80397F10-80397F28 024570 0018+00 0/1 0/0 0/0 .rodata filiPosY$3879 */ @@ -487,7 +487,7 @@ SECTION_RODATA static u8 const filiPosY[24] = { 0xC0, 0xD3, 0x33, 0x33, 0xC1, 0x60, 0x00, 0x00, 0xC1, 0x66, 0x66, 0x66, 0x41, 0xC7, 0x33, 0x33, 0xC1, 0x3B, 0x33, 0x33, 0x41, 0xC7, 0x33, 0x33, }; -COMPILER_STRIP_GATE(80397F10, &filiPosY); +COMPILER_STRIP_GATE(0x80397F10, &filiPosY); #pragma pop /* 80397F28-80397F40 024588 0018+00 0/1 0/0 0/0 .rodata bboxScale$3880 */ @@ -497,7 +497,7 @@ SECTION_RODATA static u8 const bboxScale[24] = { 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80397F28, &bboxScale); +COMPILER_STRIP_GATE(0x80397F28, &bboxScale); #pragma pop /* 80397F40-80397F58 0245A0 0018+00 0/0 0/0 0/0 .rodata bboxPosX$3881 */ @@ -507,7 +507,7 @@ SECTION_RODATA static u8 const bboxPosX[24] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80397F40, &bboxPosX); +COMPILER_STRIP_GATE(0x80397F40, &bboxPosX); #pragma pop /* 80397F58-80397F70 0245B8 0018+00 0/0 0/0 0/0 .rodata bboxPosY$3882 */ @@ -517,7 +517,7 @@ SECTION_RODATA static u8 const bboxPosY[24] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80397F58, &bboxPosY); +COMPILER_STRIP_GATE(0x80397F58, &bboxPosY); #pragma pop /* 80397F70-80397F88 0245D0 0018+00 0/1 0/0 0/0 .rodata rboxScale$3883 */ @@ -527,7 +527,7 @@ SECTION_RODATA static u8 const rboxScale[24] = { 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80397F70, &rboxScale); +COMPILER_STRIP_GATE(0x80397F70, &rboxScale); #pragma pop /* 80397F88-80397FA0 0245E8 0018+00 0/1 0/0 0/0 .rodata rboxPosX$3884 */ @@ -537,7 +537,7 @@ SECTION_RODATA static u8 const rboxPosX[24] = { 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80397F88, &rboxPosX); +COMPILER_STRIP_GATE(0x80397F88, &rboxPosX); #pragma pop /* 80397FA0-80397FB8 024600 0018+00 0/1 0/0 0/0 .rodata rboxPosY$3885 */ @@ -547,7 +547,7 @@ SECTION_RODATA static u8 const rboxPosY[24] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80397FA0, &rboxPosY); +COMPILER_STRIP_GATE(0x80397FA0, &rboxPosY); #pragma pop /* 80397FB8-80397FD0 024618 0018+00 0/1 0/0 0/0 .rodata finfoScale$3886 */ @@ -557,7 +557,7 @@ SECTION_RODATA static u8 const finfoScale[24] = { 0x3F, 0x5E, 0xB8, 0x52, 0x3F, 0x5E, 0xB8, 0x52, 0x3F, 0x61, 0x47, 0xAE, 0x3F, 0x5E, 0xB8, 0x52, 0x3F, 0x5E, 0xB8, 0x52, 0x3F, 0x5E, 0xB8, 0x52, }; -COMPILER_STRIP_GATE(80397FB8, &finfoScale); +COMPILER_STRIP_GATE(0x80397FB8, &finfoScale); #pragma pop /* 80397FD0-80397FE8 024630 0018+00 0/1 0/0 0/0 .rodata finfoPosX$3887 */ @@ -567,7 +567,7 @@ SECTION_RODATA static u8 const finfoPosX[24] = { 0xC1, 0x88, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC1, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC1, 0x40, 0x00, 0x00, 0xC2, 0x03, 0x33, 0x33, }; -COMPILER_STRIP_GATE(80397FD0, &finfoPosX); +COMPILER_STRIP_GATE(0x80397FD0, &finfoPosX); #pragma pop /* 80397FE8-80398000 024648 0018+00 0/1 0/0 0/0 .rodata finfoPosY$3888 */ @@ -577,7 +577,7 @@ SECTION_RODATA static u8 const finfoPosY[24] = { 0x40, 0xD3, 0x33, 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3F, 0xA6, 0x66, 0x66, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80397FE8, &finfoPosY); +COMPILER_STRIP_GATE(0x80397FE8, &finfoPosY); #pragma pop /* 80398000-80398018 024660 0018+00 0/1 0/0 0/0 .rodata fishnScale$3889 */ @@ -587,7 +587,7 @@ SECTION_RODATA static u8 const fishnScale[24] = { 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80398000, &fishnScale); +COMPILER_STRIP_GATE(0x80398000, &fishnScale); #pragma pop /* 80398018-80398030 024678 0018+00 0/1 0/0 0/0 .rodata fishnPosX$3890 */ @@ -597,7 +597,7 @@ SECTION_RODATA static u8 const fishnPosX[24] = { 0x40, 0x80, 0x00, 0x00, 0xC1, 0xA0, 0x00, 0x00, 0x3F, 0xA6, 0x66, 0x66, 0x40, 0xD3, 0x33, 0x33, 0x3F, 0xA6, 0x66, 0x66, 0x41, 0x13, 0x33, 0x33, }; -COMPILER_STRIP_GATE(80398018, &fishnPosX); +COMPILER_STRIP_GATE(0x80398018, &fishnPosX); #pragma pop /* 80398030-80398048 024690 0018+00 0/1 0/0 0/0 .rodata fishnPosY$3891 */ @@ -607,7 +607,7 @@ SECTION_RODATA static u8 const fishnPosY[24] = { 0xC2, 0x90, 0x33, 0x33, 0x43, 0x01, 0x99, 0x9A, 0x00, 0x00, 0x00, 0x00, 0x40, 0xD3, 0x33, 0x33, 0x42, 0x03, 0x33, 0x33, 0x41, 0x3B, 0x33, 0x33, }; -COMPILER_STRIP_GATE(80398030, &fishnPosY); +COMPILER_STRIP_GATE(0x80398030, &fishnPosY); #pragma pop /* 80454538-8045453C 002B38 0004+00 1/1 0/0 0/0 .sdata2 @3902 */ @@ -1378,5 +1378,5 @@ asm void __sinit_d_meter_HIO_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80201284 = (void*)__sinit_d_meter_HIO_cpp; +REGISTER_CTORS(0x80201284, __sinit_d_meter_HIO_cpp); #pragma pop diff --git a/src/d/meter/d_meter_button.cpp b/src/d/meter/d_meter_button.cpp index 09c0d45ab15..e50cd749f74 100644 --- a/src/d/meter/d_meter_button.cpp +++ b/src/d/meter/d_meter_button.cpp @@ -28,10 +28,6 @@ struct dMsgString_c { /* 80249D28 */ ~dMsgString_c(); }; -struct COutFont_c { - /* 80225C94 */ COutFont_c(u8); -}; - struct J2DTextBox { /* 80300658 */ void getStringPtr() const; /* 8030074C */ void setString(s16, char const*, ...); @@ -39,6 +35,10 @@ struct J2DTextBox { struct JUTFont {}; +struct COutFont_c { + /* 80225C94 */ COutFont_c(u8); +}; + struct dMsgObject_c { /* 802370A8 */ void isGetItemMessage(); /* 802370BC */ void isKanbanMessage(); @@ -54,20 +54,20 @@ struct dMsgObject_c { /* 80238258 */ void getScrnDrawPtr(); }; -struct JKRArchive {}; +struct J2DPane { + /* 802F7100 */ void getBounds(); +}; struct J2DGrafContext {}; +struct JKRArchive {}; + struct J2DScreen { /* 802F8498 */ J2DScreen(); /* 802F8648 */ void setPriority(char const*, u32, JKRArchive*); /* 802F8ED4 */ void draw(f32, f32, J2DGrafContext const*); }; -struct J2DPane { - /* 802F7100 */ void getBounds(); -}; - struct JKRExpHeap {}; struct CPaneMgr { @@ -185,6 +185,10 @@ struct dMeter2Info_c { J2DPicture*, void*, J2DPicture*, int); }; +struct JUtility { + struct TColor {}; +}; + struct CPaneMgrAlpha { /* 802555C8 */ void show(); /* 80255608 */ void hide(); @@ -192,10 +196,6 @@ struct CPaneMgrAlpha { /* 80255828 */ void getAlphaRate(); }; -struct JUtility { - struct TColor {}; -}; - struct dMeter2Draw_c { /* 802140DC */ void drawPikari(f32, f32, f32*, f32, JUtility::TColor, JUtility::TColor, JUtility::TColor, JUtility::TColor, f32, u8); @@ -207,10 +207,10 @@ struct dComIfG_play_c { /* 8002C97C */ void getLayerNo(int); }; -struct Vec {}; - struct JAISoundID {}; +struct Vec {}; + struct Z2SeMgr { /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); }; @@ -805,7 +805,7 @@ SECTION_RODATA static u8 const text_tag[80] = { 0x69, 0x6E, 0x66, 0x6F, 0x5F, 0x61, 0x72, 0x36, 0x69, 0x6E, 0x66, 0x6F, 0x5F, 0x61, 0x72, 0x37, 0x69, 0x6E, 0x66, 0x6F, 0x5F, 0x61, 0x72, 0x38, 0x69, 0x6E, 0x66, 0x6F, 0x5F, 0x61, 0x72, 0x39, }; -COMPILER_STRIP_GATE(80398048, &text_tag); +COMPILER_STRIP_GATE(0x80398048, &text_tag); /* 80398098-803980E8 0246F8 0050+00 1/1 0/0 0/0 .rodata ftext_tag$5462 */ SECTION_RODATA static u8 const ftext_tag[80] = { @@ -815,7 +815,14 @@ SECTION_RODATA static u8 const ftext_tag[80] = { 0x66, 0x6E, 0x66, 0x6F, 0x5F, 0x61, 0x72, 0x36, 0x66, 0x6E, 0x66, 0x6F, 0x5F, 0x61, 0x72, 0x37, 0x66, 0x6E, 0x66, 0x6F, 0x5F, 0x61, 0x72, 0x38, 0x66, 0x6E, 0x66, 0x6F, 0x5F, 0x61, 0x72, 0x39, }; -COMPILER_STRIP_GATE(80398098, &ftext_tag); +COMPILER_STRIP_GATE(0x80398098, &ftext_tag); + +/* 803980E8-803980E8 024748 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_803980E8 = "zelda_game_image_button_info.blo"; +SECTION_DEAD static char const* const stringBase_80398109 = ""; +#pragma pop /* 80454770-80454774 002D70 0004+00 4/4 0/0 0/0 .sdata2 @5628 */ SECTION_SDATA2 static f32 lit_5628 = 0.5f; @@ -854,6 +861,14 @@ asm void dMeterButton_c::screenInitButton() { } #pragma pop +/* ############################################################################################## */ +/* 803980E8-803980E8 024748 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8039810A = "zelda_message_window_new.blo"; +SECTION_DEAD static char const* const stringBase_80398127 = "zelda_message_window_text.blo"; +#pragma pop + /* 80205834-80205CA0 200174 046C+00 1/1 0/0 0/0 .text screenInitText__14dMeterButton_cFv */ #pragma push @@ -866,6 +881,15 @@ asm void dMeterButton_c::screenInitText() { #pragma pop /* ############################################################################################## */ +/* 803980E8-803980E8 024748 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80398145 = "F_SP00"; +SECTION_DEAD static char const* const stringBase_8039814C = "R_SP161"; +/* @stringBase0 padding */ +SECTION_DEAD static char const* const pad_80398154 = "\0\0\0"; +#pragma pop + /* 80454794-80454798 002D94 0004+00 1/1 0/0 0/0 .sdata2 @6012 */ SECTION_SDATA2 static f32 lit_6012 = -25.0f; @@ -1539,16 +1563,4 @@ asm void dMeterButton_c::paneTrans(CPaneMgr* param_0, f32 param_1, f32 param_2, } #pragma pop -/* 803980E8-80398158 024748 006C+04 4/4 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_803980E8 = "zelda_game_image_button_info.blo"; -SECTION_DEAD static char const* const stringBase_80398109 = ""; -SECTION_DEAD static char const* const stringBase_8039810A = "zelda_message_window_new.blo"; -SECTION_DEAD static char const* const stringBase_80398127 = "zelda_message_window_text.blo"; -SECTION_DEAD static char const* const stringBase_80398145 = "F_SP00"; -SECTION_DEAD static char const* const stringBase_8039814C = "R_SP161"; -/* @stringBase0 padding */ -SECTION_DEAD static char const* const pad_80398154 = "\0\0\0"; -#pragma pop +/* 803980E8-803980E8 024748 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/meter/d_meter_haihai.cpp b/src/d/meter/d_meter_haihai.cpp index f7c1b8cc03c..971c8d56d2b 100644 --- a/src/d/meter/d_meter_haihai.cpp +++ b/src/d/meter/d_meter_haihai.cpp @@ -15,12 +15,12 @@ struct dMeterSub_c { /* 80194138 */ bool isDead(); }; +struct J2DAnmColor {}; + struct J2DAnmTransformKey {}; struct J2DAnmTextureSRTKey {}; -struct J2DAnmColor {}; - struct dMeterHaihai_c { /* 8020AE8C */ dMeterHaihai_c(u8); /* 8020AEF0 */ ~dMeterHaihai_c(); @@ -160,6 +160,15 @@ asm dMeterHaihai_c::~dMeterHaihai_c() { #pragma pop /* ############################################################################################## */ +/* 80398158-80398158 0247B8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80398158 = "zelda_hihi_cursor.blo"; +SECTION_DEAD static char const* const stringBase_8039816E = "zelda_hihi_cursor.bck"; +SECTION_DEAD static char const* const stringBase_80398184 = "zelda_hihi_cursor.btk"; +SECTION_DEAD static char const* const stringBase_8039819A = "zelda_hihi_cursor.bpk"; +#pragma pop + /* 804547B0-804547B4 002DB0 0004+00 6/6 0/0 0/0 .sdata2 @3742 */ SECTION_SDATA2 static u8 lit_3742[4] = { 0x00, @@ -390,12 +399,4 @@ asm void dMeterHaihai_c::playBpkAnime(J2DAnmColor* param_0) { } #pragma pop -/* 80398158-803981B0 0247B8 0058+00 1/1 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80398158 = "zelda_hihi_cursor.blo"; -SECTION_DEAD static char const* const stringBase_8039816E = "zelda_hihi_cursor.bck"; -SECTION_DEAD static char const* const stringBase_80398184 = "zelda_hihi_cursor.btk"; -SECTION_DEAD static char const* const stringBase_8039819A = "zelda_hihi_cursor.bpk"; -#pragma pop +/* 80398158-80398158 0247B8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/meter/d_meter_hakusha.cpp b/src/d/meter/d_meter_hakusha.cpp index ce2599ecf06..791b609d17b 100644 --- a/src/d/meter/d_meter_hakusha.cpp +++ b/src/d/meter/d_meter_hakusha.cpp @@ -31,6 +31,10 @@ struct dMeterHakusha_c { /* 8020D480 */ void getHakushaNum(); }; +struct JUtility { + struct TColor {}; +}; + struct CPaneMgrAlpha { /* 802555C8 */ void show(); /* 80255608 */ void hide(); @@ -38,10 +42,6 @@ struct CPaneMgrAlpha { /* 80255828 */ void getAlphaRate(); }; -struct JUtility { - struct TColor {}; -}; - struct dMeter2Draw_c { /* 8021462C */ void drawPikariHakusha(f32, f32, f32, f32, JUtility::TColor, JUtility::TColor, JUtility::TColor, JUtility::TColor); @@ -173,6 +173,14 @@ asm dMeterHakusha_c::~dMeterHakusha_c() { #pragma pop /* ############################################################################################## */ +/* 803981B0-803981B0 024810 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_803981B0 = "zelda_game_image_hakusha_parts.blo"; +SECTION_DEAD static char const* const stringBase_803981D3 = "zelda_game_image_hakusha_a_btn.blo"; +SECTION_DEAD static char const* const stringBase_803981F6 = "F_SP108"; +#pragma pop + /* 80454800-80454804 002E00 0004+00 6/6 0/0 0/0 .sdata2 @3793 */ SECTION_SDATA2 static u8 lit_3793[4] = { 0x00, @@ -228,6 +236,15 @@ asm void dMeterHakusha_c::_delete() { } #pragma pop +/* ############################################################################################## */ +/* 803981B0-803981B0 024810 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_803981FE = "F_SP00"; +/* @stringBase0 padding */ +SECTION_DEAD static char const* const pad_80398205 = "\0\0"; +#pragma pop + /* 8020CC58-8020CD6C 207598 0114+00 1/1 0/0 0/0 .text alphaAnimeHakusha__15dMeterHakusha_cFUl */ #pragma push #pragma optimization_level 0 @@ -317,14 +334,4 @@ asm void dMeterHakusha_c::getHakushaNum() { } #pragma pop -/* 803981B0-80398208 024810 0055+03 3/3 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_803981B0 = "zelda_game_image_hakusha_parts.blo"; -SECTION_DEAD static char const* const stringBase_803981D3 = "zelda_game_image_hakusha_a_btn.blo"; -SECTION_DEAD static char const* const stringBase_803981F6 = "F_SP108"; -SECTION_DEAD static char const* const stringBase_803981FE = "F_SP00"; -/* @stringBase0 padding */ -SECTION_DEAD static char const* const pad_80398205 = "\0\0"; -#pragma pop +/* 803981B0-803981B0 024810 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/meter/d_meter_map.cpp b/src/d/meter/d_meter_map.cpp index d538416aa93..ab01a90614b 100644 --- a/src/d/meter/d_meter_map.cpp +++ b/src/d/meter/d_meter_map.cpp @@ -36,10 +36,6 @@ struct dMsgObject_c { /* 8023822C */ void getStatus(); }; -struct dMpath_c { - /* 8003F758 */ void isExistMapPathData(); -}; - struct J2DScreen {}; struct dMeterMap_c { @@ -88,10 +84,10 @@ struct dDlst_list_c { /* 80056794 */ void set(dDlst_base_c**&, dDlst_base_c**&, dDlst_base_c*); }; -struct Vec {}; - struct JAISoundID {}; +struct Vec {}; + struct Z2SeMgr { /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); }; @@ -328,15 +324,10 @@ asm void dMeterMap_c::setDispPosOutsideFlg_SE_On() { } #pragma pop -/* 8020D8F8-8020D900 208238 0008+00 0/0 1/1 0/0 .text setMapAlpha__11dMeterMap_cFUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMeterMap_c::setMapAlpha(u8 param_0) { - nofralloc -#include "asm/d/meter/d_meter_map/setMapAlpha__11dMeterMap_cFUc.s" +/* 8020D8F8-8020D900 -00001 0008+00 0/0 0/0 0/0 .text setMapAlpha__11dMeterMap_cFUc */ +void dMeterMap_c::setMapAlpha(u8 param_0) { + *(u8*)(((u8*)this) + 44) /* this->field_0x2c */ = (u8)(param_0); } -#pragma pop /* 8020D900-8020D948 208240 0048+00 3/3 1/1 0/0 .text isMapOpenCheck__11dMeterMap_cFv */ #pragma push @@ -410,6 +401,13 @@ asm void dMeterMap_c::_delete() { } #pragma pop +/* ############################################################################################## */ +/* 80398208-80398208 024868 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80398208 = "F_SP115"; +#pragma pop + /* 8020DCE4-8020DF1C 208624 0238+00 0/0 1/1 0/0 .text _move__11dMeterMap_cFUl */ #pragma push #pragma optimization_level 0 @@ -514,9 +512,4 @@ asm void dMeterMap_c::keyCheck() { } #pragma pop -/* 80398208-80398210 024868 0008+00 1/1 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80398208 = "F_SP115"; -#pragma pop +/* 80398208-80398208 024868 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/meter/d_meter_string.cpp b/src/d/meter/d_meter_string.cpp index 34136f64421..afd48b77341 100644 --- a/src/d/meter/d_meter_string.cpp +++ b/src/d/meter/d_meter_string.cpp @@ -175,6 +175,16 @@ asm dMeterString_c::~dMeterString_c() { #pragma pop /* ############################################################################################## */ +/* 80398210-80398210 024870 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80398210 = "zelda_game_image_cow_get_in.blo"; +SECTION_DEAD static char const* const stringBase_80398230 = "zelda_game_image_cow_get_in.bck"; +SECTION_DEAD static char const* const stringBase_80398250 = ""; +/* @stringBase0 padding */ +SECTION_DEAD static char const* const pad_80398251 = "\0\0\0\0\0\0"; +#pragma pop + /* 80454848-8045484C 002E48 0004+00 1/1 0/0 0/0 .sdata2 @3758 */ SECTION_SDATA2 static f32 lit_3758 = 210.0f; @@ -303,13 +313,4 @@ asm void dMeterString_c::isLeadByte(int param_0) { } #pragma pop -/* 80398210-80398258 024870 0041+07 1/1 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80398210 = "zelda_game_image_cow_get_in.blo"; -SECTION_DEAD static char const* const stringBase_80398230 = "zelda_game_image_cow_get_in.bck"; -SECTION_DEAD static char const* const stringBase_80398250 = ""; -/* @stringBase0 padding */ -SECTION_DEAD static char const* const pad_80398251 = "\0\0\0\0\0\0"; -#pragma pop +/* 80398210-80398210 024870 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/msg/d_msg_class.cpp b/src/d/msg/d_msg_class.cpp index 382576ac768..b13f1100c0e 100644 --- a/src/d/msg/d_msg_class.cpp +++ b/src/d/msg/d_msg_class.cpp @@ -15,6 +15,12 @@ struct mDoCPd_c { static u8 m_cpadInfo[256]; }; +struct Vec {}; + +struct cXyz { + /* 80266B34 */ void operator-(Vec const&) const; +}; + struct jmessage_tControl { /* 802299EC */ jmessage_tControl(); }; @@ -51,12 +57,6 @@ struct jmessage_tReference { /* 80232A20 */ void getActorPos(); }; -struct Vec {}; - -struct cXyz { - /* 80266B34 */ void operator-(Vec const&) const; -}; - struct jmessage_tSequenceProcessor { /* 8022B558 */ jmessage_tSequenceProcessor(jmessage_tReference const*, jmessage_tControl*); /* 8022B654 */ void do_reset(); @@ -124,16 +124,16 @@ struct jmessage_string_tControl { /* 802328DC */ ~jmessage_string_tControl(); }; -struct COutFont_c { - /* 80226CF8 */ void initialize(); -}; - struct J2DTextBox { /* 80300658 */ void getStringPtr() const; }; struct JUTFont {}; +struct COutFont_c { + /* 80226CF8 */ void initialize(); +}; + struct jmessage_string_tReference { /* 8022F8C0 */ jmessage_string_tReference(); /* 8022F94C */ ~jmessage_string_tReference(); @@ -728,7 +728,7 @@ SECTION_RODATA static u8 const colorTable_3861[36] = { 0xA0, 0xB4, 0xDC, 0xFF, 0xDC, 0xDC, 0x82, 0xFF, 0xB4, 0xC8, 0xE6, 0xFF, 0xC8, 0xA0, 0xDC, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xDC, 0xAA, 0x78, 0xFF, }; -COMPILER_STRIP_GATE(803995C8, &colorTable_3861); +COMPILER_STRIP_GATE(0x803995C8, &colorTable_3861); /* 802288FC-802289A8 22323C 00AC+00 2/2 0/0 0/0 .text getFontCCColorTable__FUcUc */ #pragma push @@ -747,7 +747,7 @@ SECTION_RODATA static u8 const colorTable_3877[36] = { 0xA0, 0xB4, 0xDC, 0xFF, 0xDC, 0xDC, 0x82, 0xFF, 0xB4, 0xC8, 0xE6, 0xFF, 0xC8, 0xA0, 0xDC, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xDC, 0xAA, 0x78, 0xFF, }; -COMPILER_STRIP_GATE(803995EC, &colorTable_3877); +COMPILER_STRIP_GATE(0x803995EC, &colorTable_3877); /* 802289A8-80228A54 2232E8 00AC+00 2/2 0/0 0/0 .text getFontGCColorTable__FUcUc */ #pragma push @@ -2017,6 +2017,14 @@ asm void jmessage_tMeasureProcessor::do_character(int param_0) { #pragma pop /* ############################################################################################## */ +/* 80399610-80399610 025C70 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80399610 = "'"; +SECTION_DEAD static char const* const stringBase_80399612 = "s"; +SECTION_DEAD static char const* const stringBase_80399614 = "%d"; +#pragma pop + /* 80454A7C-80454A80 00307C 0004+00 5/5 0/0 0/0 .sdata2 @5151 */ SECTION_SDATA2 static f32 lit_5151 = 100.0f; @@ -2269,6 +2277,13 @@ void jmessage_tRenderingProcessor::do_reset() { /* empty function */ } +/* ############################################################################################## */ +/* 80399610-80399610 025C70 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80399617 = ""; +#pragma pop + /* 8022CDCC-8022CFD8 22770C 020C+00 1/0 0/0 0/0 .text * do_begin__28jmessage_tRenderingProcessorFPCvPCc */ #pragma push @@ -2327,6 +2342,15 @@ asm void jmessage_tRenderingProcessor::resetRendering() { } #pragma pop +/* ############################################################################################## */ +/* 80399610-80399610 025C70 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80399618 = "" + "\x1B" + "CR[%d]"; +#pragma pop + /* 8022E17C-8022E260 228ABC 00E4+00 2/2 0/0 0/0 .text * do_widthcenter__28jmessage_tRenderingProcessorFv */ #pragma push @@ -2349,6 +2373,15 @@ asm void jmessage_tRenderingProcessor::do_selwidthcenter(int param_0) { } #pragma pop +/* ############################################################################################## */ +/* 80399610-80399610 025C70 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80399620 = "" + "\x1B" + "CD[%d]"; +#pragma pop + /* 8022E318-8022E7CC 228C58 04B4+00 3/2 0/0 0/0 .text * do_heightcenter__28jmessage_tRenderingProcessorFv */ #pragma push @@ -2360,6 +2393,17 @@ asm void jmessage_tRenderingProcessor::do_heightcenter() { } #pragma pop +/* ############################################################################################## */ +/* 80399610-80399610 025C70 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80399628 = "" + "\x1B" + "CC[%08x]" + "\x1B" + "GC[%08x]"; +#pragma pop + /* 8022E7CC-8022E860 22910C 0094+00 2/2 0/0 0/0 .text do_color__28jmessage_tRenderingProcessorFUc */ #pragma push @@ -2371,6 +2415,17 @@ asm void jmessage_tRenderingProcessor::do_color(u8 param_0) { } #pragma pop +/* ############################################################################################## */ +/* 80399610-80399610 025C70 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8039963B = "" + "\x1B" + "FX[%d]" + "\x1B" + "FY[%d]"; +#pragma pop + /* 8022E860-8022E960 2291A0 0100+00 2/2 0/0 0/0 .text do_scale__28jmessage_tRenderingProcessorFf */ #pragma push @@ -2393,6 +2448,15 @@ asm void jmessage_tRenderingProcessor::do_linedown(s16 param_0) { } #pragma pop +/* ############################################################################################## */ +/* 80399610-80399610 025C70 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8039964A = "" + "\x1B" + "CU[%d]"; +#pragma pop + /* 8022E9C0-8022EAE4 229300 0124+00 1/1 0/0 0/0 .text do_transY__28jmessage_tRenderingProcessorFsb */ #pragma push @@ -2464,6 +2528,17 @@ asm void jmessage_tRenderingProcessor::do_rubyset(void const* param_0, u32 param } #pragma pop +/* ############################################################################################## */ +/* 80399610-80399610 025C70 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80399652 = "" + "\x1B" + "CL[%d]"; +/* @stringBase0 padding */ +SECTION_DEAD static char const* const pad_8039965A = "\0\0\0\0\0"; +#pragma pop + /* 8022F384-8022F53C 229CC4 01B8+00 3/3 0/0 0/0 .text * do_rubystrcat__28jmessage_tRenderingProcessorFPcPcff */ #pragma push @@ -3063,36 +3138,4 @@ asm void jmessage_tReference::getActorPos() { } #pragma pop -/* 80399610-80399660 025C70 004A+06 22/22 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80399610 = "'"; -SECTION_DEAD static char const* const stringBase_80399612 = "s"; -SECTION_DEAD static char const* const stringBase_80399614 = "%d"; -SECTION_DEAD static char const* const stringBase_80399617 = ""; -SECTION_DEAD static char const* const stringBase_80399618 = "" - "\x1B" - "CR[%d]"; -SECTION_DEAD static char const* const stringBase_80399620 = "" - "\x1B" - "CD[%d]"; -SECTION_DEAD static char const* const stringBase_80399628 = "" - "\x1B" - "CC[%08x]" - "\x1B" - "GC[%08x]"; -SECTION_DEAD static char const* const stringBase_8039963B = "" - "\x1B" - "FX[%d]" - "\x1B" - "FY[%d]"; -SECTION_DEAD static char const* const stringBase_8039964A = "" - "\x1B" - "CU[%d]"; -SECTION_DEAD static char const* const stringBase_80399652 = "" - "\x1B" - "CL[%d]"; -/* @stringBase0 padding */ -SECTION_DEAD static char const* const pad_8039965A = "\0\0\0\0\0"; -#pragma pop +/* 80399610-80399610 025C70 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/msg/d_msg_flow.cpp b/src/d/msg/d_msg_flow.cpp index aa70d1b18c5..04f7a7da937 100644 --- a/src/d/msg/d_msg_flow.cpp +++ b/src/d/msg/d_msg_flow.cpp @@ -417,7 +417,7 @@ extern "C" void event039__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c(); extern "C" void event040__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c(); extern "C" void event041__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c(); extern "C" bool event042__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c(); -extern "C" void func_8024DAB0(s32*); +extern "C" void func_8024DAB0(void* _this, s32*); extern "C" void __sinit_d_msg_flow_cpp(); extern "C" extern char const* const d_msg_d_msg_flow__stringBase0; extern "C" u8 mQueryList__10dMsgFlow_c[636]; @@ -1743,6 +1743,14 @@ asm dMsgFlow_c::~dMsgFlow_c() { } #pragma pop +/* ############################################################################################## */ +/* 80399CB0-80399CB0 026310 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80399CB0 = "FLW1"; +SECTION_DEAD static char const* const stringBase_80399CB5 = "FLI1"; +#pragma pop + /* 80249F90-8024A13C 2448D0 01AC+00 0/0 10/10 86/86 .text * init__10dMsgFlow_cFP10fopAc_ac_ciiPP10fopAc_ac_c */ #pragma push @@ -1897,6 +1905,14 @@ asm void dMsgFlow_c::setNodeIndex(u16 param_0, fopAc_ac_c** param_1) { } #pragma pop +/* ############################################################################################## */ +/* 80399CB0-80399CB0 026310 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80399CBA = ""; +SECTION_DEAD static char const* const stringBase_80399CBB = "INF1"; +#pragma pop + /* 8024A95C-8024AA50 24529C 00F4+00 1/1 0/0 0/0 .text * setSelectMsg__10dMsgFlow_cFP14mesg_flow_nodeP14mesg_flow_nodeP10fopAc_ac_c */ #pragma push @@ -2458,6 +2474,13 @@ asm void dMsgFlow_c::query041(mesg_flow_node_branch* param_0, fopAc_ac_c* param_ } #pragma pop +/* ############################################################################################## */ +/* 80399CB0-80399CB0 026310 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80399CC0 = "F_SP116"; +#pragma pop + /* 8024BFEC-8024C0A8 24692C 00BC+00 1/0 0/0 0/0 .text * query042__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci */ #pragma push @@ -3059,7 +3082,7 @@ bool dMsgFlow_c::event042(mesg_flow_node_event* param_0, fopAc_ac_c* param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_8024DAB0(s32* param_0) { +extern "C" asm void func_8024DAB0(void* _this, s32* param_0) { nofralloc #include "asm/d/msg/d_msg_flow/func_8024DAB0.s" } @@ -3077,16 +3100,7 @@ asm void __sinit_d_msg_flow_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_8024DACC = (void*)__sinit_d_msg_flow_cpp; +REGISTER_CTORS(0x8024DACC, __sinit_d_msg_flow_cpp); #pragma pop -/* 80399CB0-80399CC8 026310 0018+00 5/5 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80399CB0 = "FLW1"; -SECTION_DEAD static char const* const stringBase_80399CB5 = "FLI1"; -SECTION_DEAD static char const* const stringBase_80399CBA = ""; -SECTION_DEAD static char const* const stringBase_80399CBB = "INF1"; -SECTION_DEAD static char const* const stringBase_80399CC0 = "F_SP116"; -#pragma pop +/* 80399CB0-80399CB0 026310 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/msg/d_msg_object.cpp b/src/d/msg/d_msg_object.cpp index b3685441f47..3b5360e5bb4 100644 --- a/src/d/msg/d_msg_object.cpp +++ b/src/d/msg/d_msg_object.cpp @@ -96,10 +96,10 @@ struct dMsgString_c { /* 80249D28 */ ~dMsgString_c(); }; -struct JKRExpHeap {}; - struct JUTFont {}; +struct JKRExpHeap {}; + struct dMsgScrnTree_c { /* 80248954 */ dMsgScrnTree_c(JUTFont*, JKRExpHeap*); }; @@ -154,12 +154,12 @@ struct dMsgScrnBase_c { /* 8023C3EC */ void setRubyString(char*); }; +struct J2DTextBox {}; + struct COutFont_c { /* 80225C94 */ COutFont_c(u8); }; -struct J2DTextBox {}; - struct dMsgObject_c { /* 80233284 */ void _create(msg_class*); /* 80233590 */ void _execute(); @@ -407,7 +407,7 @@ struct TNodeLinkList { // Forward References: // -extern "C" void dMsgObject_getGroupID__Fv(); +extern "C" s32 dMsgObject_getGroupID__Fv(); extern "C" static void dMsgObject_searchSSItem__FPvPv(); extern "C" void __ct__20dMsgObject_HowlHIO_cFv(); extern "C" void __ct__16dMsgObject_HIO_cFv(); @@ -695,18 +695,13 @@ extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; // /* ############################################################################################## */ -/* 804510C8-804510D0 0005C8 0002+06 5/5 0/0 0/0 .sbss s_groupID */ +/* 804510C8-804510D0 0005C8 0002+06 5/4 0/0 0/0 .sbss s_groupID */ static u8 s_groupID[2 + 6 /* padding */]; -/* 80232A3C-80232A44 22D37C 0008+00 0/0 1/1 0/0 .text dMsgObject_getGroupID__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMsgObject_getGroupID() { - nofralloc -#include "asm/d/msg/d_msg_object/dMsgObject_getGroupID__Fv.s" +/* 80232A3C-80232A44 -00001 0008+00 0/0 0/0 0/0 .text dMsgObject_getGroupID__Fv */ +s32 dMsgObject_getGroupID() { + return (s32) * (s16*)(&s_groupID); } -#pragma pop /* 80232A44-80232AEC 22D384 00A8+00 1/1 0/0 0/0 .text dMsgObject_searchSSItem__FPvPv */ #pragma push @@ -937,6 +932,22 @@ asm void dMsgObject_c::_create(msg_class* param_0) { #pragma pop /* ############################################################################################## */ +/* 80399660-80399660 025CC0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80399660 = "zel_00.bmg"; +SECTION_DEAD static char const* const stringBase_8039966B = "zel_01.bmg"; +SECTION_DEAD static char const* const stringBase_80399676 = "zel_02.bmg"; +SECTION_DEAD static char const* const stringBase_80399681 = "zel_03.bmg"; +SECTION_DEAD static char const* const stringBase_8039968C = "zel_04.bmg"; +SECTION_DEAD static char const* const stringBase_80399697 = "zel_05.bmg"; +SECTION_DEAD static char const* const stringBase_803996A2 = "zel_06.bmg"; +SECTION_DEAD static char const* const stringBase_803996AD = "zel_07.bmg"; +SECTION_DEAD static char const* const stringBase_803996B8 = "zel_08.bmg"; +SECTION_DEAD static char const* const stringBase_803996C3 = "zel_99.bmg"; +SECTION_DEAD static char const* const stringBase_803996CE = ""; +#pragma pop + /* 80430280-8043028C 05CFA0 000C+00 1/1 0/0 0/0 .bss @4011 */ static u8 lit_4011[12]; @@ -1253,6 +1264,14 @@ asm void dMsgObject_c::isSend() { #pragma pop /* ############################################################################################## */ +/* 80399660-80399660 025CC0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_803996CF = "/res/Msgus/bmgres%d.arc"; +/* @stringBase0 padding */ +SECTION_DEAD static char const* const pad_803996E7 = ""; +#pragma pop + /* 8043069C-804306B8 05D3BC 0016+06 1/1 0/0 0/0 .bss arcName$6106 */ static u8 arcName[22 + 6 /* padding */]; @@ -1658,15 +1677,10 @@ asm void dMsgObject_c::setShopWaitTimer(u8 param_0) { } #pragma pop -/* 802378CC-802378D4 23220C 0008+00 1/1 0/0 0/0 .text setSelectWordFlagLocal__12dMsgObject_cFUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMsgObject_c::setSelectWordFlagLocal(u8 param_0) { - nofralloc -#include "asm/d/msg/d_msg_object/setSelectWordFlagLocal__12dMsgObject_cFUc.s" +/* 802378CC-802378D4 -00001 0008+00 0/0 0/0 0/0 .text setSelectWordFlagLocal__12dMsgObject_cFUc */ +void dMsgObject_c::setSelectWordFlagLocal(u8 param_0) { + *(u8*)(((u8*)this) + 1222) /* this->field_0x4c6 */ = (u8)(param_0); } -#pragma pop /* 802378D4-80237934 232214 0060+00 1/1 0/0 0/0 .text isHowlHearingModeLocal__12dMsgObject_cFv */ #pragma push @@ -1897,16 +1911,11 @@ asm void dMsgObject_c::setSelectCursorPosLocal(u8 param_0) { } #pragma pop -/* 80237F10-80237F18 232850 0008+00 1/1 0/0 0/0 .text +/* 80237F10-80237F18 -00001 0008+00 0/0 0/0 0/0 .text * setTalkActorLocal__12dMsgObject_cFP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMsgObject_c::setTalkActorLocal(fopAc_ac_c* param_0) { - nofralloc -#include "asm/d/msg/d_msg_object/setTalkActorLocal__12dMsgObject_cFP10fopAc_ac_c.s" +void dMsgObject_c::setTalkActorLocal(fopAc_ac_c* param_0) { + *(u32*)(((u8*)this) + 312) /* this->field_0x138 */ = (u32)(param_0); } -#pragma pop /* 80237F18-80237F38 232858 0020+00 1/0 0/0 0/0 .text dMsgObject_Draw__FP12dMsgObject_c */ @@ -2534,7 +2543,7 @@ asm void __sinit_d_msg_object_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80238B58 = (void*)__sinit_d_msg_object_cpp; +REGISTER_CTORS(0x80238B58, __sinit_d_msg_object_cpp); #pragma pop /* 80238B94-80238BDC 2334D4 0048+00 1/0 0/0 0/0 .text __dt__20dMsgObject_HowlHIO_cFv */ @@ -2629,22 +2638,4 @@ asm void jmessage_tReference::setActorPos(cXyz param_0) { } #pragma pop -/* 80399660-803996E8 025CC0 0087+01 4/4 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80399660 = "zel_00.bmg"; -SECTION_DEAD static char const* const stringBase_8039966B = "zel_01.bmg"; -SECTION_DEAD static char const* const stringBase_80399676 = "zel_02.bmg"; -SECTION_DEAD static char const* const stringBase_80399681 = "zel_03.bmg"; -SECTION_DEAD static char const* const stringBase_8039968C = "zel_04.bmg"; -SECTION_DEAD static char const* const stringBase_80399697 = "zel_05.bmg"; -SECTION_DEAD static char const* const stringBase_803996A2 = "zel_06.bmg"; -SECTION_DEAD static char const* const stringBase_803996AD = "zel_07.bmg"; -SECTION_DEAD static char const* const stringBase_803996B8 = "zel_08.bmg"; -SECTION_DEAD static char const* const stringBase_803996C3 = "zel_99.bmg"; -SECTION_DEAD static char const* const stringBase_803996CE = ""; -SECTION_DEAD static char const* const stringBase_803996CF = "/res/Msgus/bmgres%d.arc"; -/* @stringBase0 padding */ -SECTION_DEAD static char const* const pad_803996E7 = ""; -#pragma pop +/* 80399660-80399660 025CC0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/msg/d_msg_out_font.cpp b/src/d/msg/d_msg_out_font.cpp index bd197b003c1..5b678b42d77 100644 --- a/src/d/msg/d_msg_out_font.cpp +++ b/src/d/msg/d_msg_out_font.cpp @@ -93,6 +93,61 @@ extern "C" extern u8 g_MsgObject_HIO_c[1040]; // /* ############################################################################################## */ +/* 80399350-80399350 0259B0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80399350 = "font_07_02.bti"; +SECTION_DEAD static char const* const stringBase_8039935F = "font_20.bti"; +SECTION_DEAD static char const* const stringBase_8039936B = "font_21.bti"; +SECTION_DEAD static char const* const stringBase_80399377 = "font_30.bti"; +SECTION_DEAD static char const* const stringBase_80399383 = "font_31.bti"; +SECTION_DEAD static char const* const stringBase_8039938F = "font_34.bti"; +SECTION_DEAD static char const* const stringBase_8039939B = "font_00.bti"; +SECTION_DEAD static char const* const stringBase_803993A7 = "font_01.bti"; +SECTION_DEAD static char const* const stringBase_803993B3 = "font_09.bti"; +SECTION_DEAD static char const* const stringBase_803993BF = "font_04.bti"; +SECTION_DEAD static char const* const stringBase_803993CB = "font_05.bti"; +SECTION_DEAD static char const* const stringBase_803993D7 = "font_02.bti"; +SECTION_DEAD static char const* const stringBase_803993E3 = "font_03.bti"; +SECTION_DEAD static char const* const stringBase_803993EF = "font_06.bti"; +SECTION_DEAD static char const* const stringBase_803993FB = "font_08.bti"; +SECTION_DEAD static char const* const stringBase_80399407 = "font_07_01.bti"; +SECTION_DEAD static char const* const stringBase_80399416 = "font_10.bti"; +SECTION_DEAD static char const* const stringBase_80399422 = "font_15.bti"; +SECTION_DEAD static char const* const stringBase_8039942E = "font_12.bti"; +SECTION_DEAD static char const* const stringBase_8039943A = "im_map_icon_portal_4ia_40_05.bti"; +SECTION_DEAD static char const* const stringBase_8039945B = "font_16_backlight.bti"; +SECTION_DEAD static char const* const stringBase_80399471 = "font_13.bti"; +SECTION_DEAD static char const* const stringBase_8039947D = "font_14.bti"; +SECTION_DEAD static char const* const stringBase_80399489 = "im_zelda_item_icon_rupy_13.bti"; +SECTION_DEAD static char const* const stringBase_803994A8 = ""; +SECTION_DEAD static char const* const stringBase_803994A9 = "st_bompoach_lv1.bti"; +SECTION_DEAD static char const* const stringBase_803994BD = "font_46.bti"; +SECTION_DEAD static char const* const stringBase_803994C9 = "font_47.bti"; +SECTION_DEAD static char const* const stringBase_803994D5 = "font_35.bti"; +SECTION_DEAD static char const* const stringBase_803994E1 = "font_36.bti"; +SECTION_DEAD static char const* const stringBase_803994ED = "font_19.bti"; +SECTION_DEAD static char const* const stringBase_803994F9 = "font_22.bti"; +SECTION_DEAD static char const* const stringBase_80399505 = "font_23.bti"; +SECTION_DEAD static char const* const stringBase_80399511 = "font_24.bti"; +SECTION_DEAD static char const* const stringBase_8039951D = "font_25.bti"; +SECTION_DEAD static char const* const stringBase_80399529 = "font_40.bti"; +SECTION_DEAD static char const* const stringBase_80399535 = "font_39.bti"; +SECTION_DEAD static char const* const stringBase_80399541 = "font_29.bti"; +SECTION_DEAD static char const* const stringBase_8039954D = "font_28.bti"; +SECTION_DEAD static char const* const stringBase_80399559 = "font_32.bti"; +SECTION_DEAD static char const* const stringBase_80399565 = "font_33.bti"; +SECTION_DEAD static char const* const stringBase_80399571 = "font_41.bti"; +SECTION_DEAD static char const* const stringBase_8039957D = "font_42.bti"; +SECTION_DEAD static char const* const stringBase_80399589 = "font_50.bti"; +SECTION_DEAD static char const* const stringBase_80399595 = "font_49.bti"; +SECTION_DEAD static char const* const stringBase_803995A1 = "font_51.bti"; +SECTION_DEAD static char const* const stringBase_803995AD = "font_52.bti"; +SECTION_DEAD static char const* const stringBase_803995B9 = "font_53.bti"; +/* @stringBase0 padding */ +SECTION_DEAD static char const* const pad_803995C5 = "\0\0"; +#pragma pop + /* 803BFA90-803BFBA8 -00001 0118+00 1/1 0/0 0/0 .data @4395 */ SECTION_DATA static void* lit_4395[70] = { (void*)(((char*)createPane__10COutFont_cFv) + 0xDC), @@ -546,58 +601,4 @@ asm void COutFont_c::getBtiName(int param_0) { } #pragma pop -/* 80399350-803995C8 0259B0 0275+03 2/1 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80399350 = "font_07_02.bti"; -SECTION_DEAD static char const* const stringBase_8039935F = "font_20.bti"; -SECTION_DEAD static char const* const stringBase_8039936B = "font_21.bti"; -SECTION_DEAD static char const* const stringBase_80399377 = "font_30.bti"; -SECTION_DEAD static char const* const stringBase_80399383 = "font_31.bti"; -SECTION_DEAD static char const* const stringBase_8039938F = "font_34.bti"; -SECTION_DEAD static char const* const stringBase_8039939B = "font_00.bti"; -SECTION_DEAD static char const* const stringBase_803993A7 = "font_01.bti"; -SECTION_DEAD static char const* const stringBase_803993B3 = "font_09.bti"; -SECTION_DEAD static char const* const stringBase_803993BF = "font_04.bti"; -SECTION_DEAD static char const* const stringBase_803993CB = "font_05.bti"; -SECTION_DEAD static char const* const stringBase_803993D7 = "font_02.bti"; -SECTION_DEAD static char const* const stringBase_803993E3 = "font_03.bti"; -SECTION_DEAD static char const* const stringBase_803993EF = "font_06.bti"; -SECTION_DEAD static char const* const stringBase_803993FB = "font_08.bti"; -SECTION_DEAD static char const* const stringBase_80399407 = "font_07_01.bti"; -SECTION_DEAD static char const* const stringBase_80399416 = "font_10.bti"; -SECTION_DEAD static char const* const stringBase_80399422 = "font_15.bti"; -SECTION_DEAD static char const* const stringBase_8039942E = "font_12.bti"; -SECTION_DEAD static char const* const stringBase_8039943A = "im_map_icon_portal_4ia_40_05.bti"; -SECTION_DEAD static char const* const stringBase_8039945B = "font_16_backlight.bti"; -SECTION_DEAD static char const* const stringBase_80399471 = "font_13.bti"; -SECTION_DEAD static char const* const stringBase_8039947D = "font_14.bti"; -SECTION_DEAD static char const* const stringBase_80399489 = "im_zelda_item_icon_rupy_13.bti"; -SECTION_DEAD static char const* const stringBase_803994A8 = ""; -SECTION_DEAD static char const* const stringBase_803994A9 = "st_bompoach_lv1.bti"; -SECTION_DEAD static char const* const stringBase_803994BD = "font_46.bti"; -SECTION_DEAD static char const* const stringBase_803994C9 = "font_47.bti"; -SECTION_DEAD static char const* const stringBase_803994D5 = "font_35.bti"; -SECTION_DEAD static char const* const stringBase_803994E1 = "font_36.bti"; -SECTION_DEAD static char const* const stringBase_803994ED = "font_19.bti"; -SECTION_DEAD static char const* const stringBase_803994F9 = "font_22.bti"; -SECTION_DEAD static char const* const stringBase_80399505 = "font_23.bti"; -SECTION_DEAD static char const* const stringBase_80399511 = "font_24.bti"; -SECTION_DEAD static char const* const stringBase_8039951D = "font_25.bti"; -SECTION_DEAD static char const* const stringBase_80399529 = "font_40.bti"; -SECTION_DEAD static char const* const stringBase_80399535 = "font_39.bti"; -SECTION_DEAD static char const* const stringBase_80399541 = "font_29.bti"; -SECTION_DEAD static char const* const stringBase_8039954D = "font_28.bti"; -SECTION_DEAD static char const* const stringBase_80399559 = "font_32.bti"; -SECTION_DEAD static char const* const stringBase_80399565 = "font_33.bti"; -SECTION_DEAD static char const* const stringBase_80399571 = "font_41.bti"; -SECTION_DEAD static char const* const stringBase_8039957D = "font_42.bti"; -SECTION_DEAD static char const* const stringBase_80399589 = "font_50.bti"; -SECTION_DEAD static char const* const stringBase_80399595 = "font_49.bti"; -SECTION_DEAD static char const* const stringBase_803995A1 = "font_51.bti"; -SECTION_DEAD static char const* const stringBase_803995AD = "font_52.bti"; -SECTION_DEAD static char const* const stringBase_803995B9 = "font_53.bti"; -/* @stringBase0 padding */ -SECTION_DEAD static char const* const pad_803995C5 = "\0\0"; -#pragma pop +/* 80399350-80399350 0259B0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/msg/d_msg_string.cpp b/src/d/msg/d_msg_string.cpp index 39e894f6099..6d42f06d93a 100644 --- a/src/d/msg/d_msg_string.cpp +++ b/src/d/msg/d_msg_string.cpp @@ -11,14 +11,14 @@ // Types: // -struct COutFont_c { - /* 80225C94 */ COutFont_c(u8); -}; - struct J2DTextBox {}; struct JUTFont {}; +struct COutFont_c { + /* 80225C94 */ COutFont_c(u8); +}; + struct dMsgString_c { /* 80191B6C */ void getString(u32, J2DTextBox*, J2DTextBox*, JUTFont*, COutFont_c*, u8); /* 801E1D10 */ void getStringPage(u32, u8, u8, J2DTextBox*, J2DTextBox*, JUTFont*, COutFont_c*, diff --git a/src/d/msg/d_msg_string_base.cpp b/src/d/msg/d_msg_string_base.cpp index 1847d3191b8..c9e639a9f5e 100644 --- a/src/d/msg/d_msg_string_base.cpp +++ b/src/d/msg/d_msg_string_base.cpp @@ -15,12 +15,12 @@ struct jmessage_string_tControl { /* 8022FB5C */ jmessage_string_tControl(); }; -struct COutFont_c {}; - struct J2DTextBox {}; struct JUTFont {}; +struct COutFont_c {}; + struct jmessage_string_tReference { /* 8022F8C0 */ jmessage_string_tReference(); /* 8022F9AC */ void init(J2DTextBox*, J2DTextBox*, JUTFont*, COutFont_c*, u8); @@ -191,6 +191,13 @@ asm dMsgStringBase_c::~dMsgStringBase_c() { } #pragma pop +/* ############################################################################################## */ +/* 80399C98-80399C98 0262F8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80399C98 = "zel_00.bmg"; +#pragma pop + /* 80249700-80249768 244040 0068+00 1/1 2/2 0/0 .text getResource__16dMsgStringBase_cFv */ #pragma push @@ -311,14 +318,15 @@ void dMsgStringBase_c::drawOutFontLocal(J2DTextBox* param_0, f32 param_1) { /* empty function */ } -/* 80399C98-80399CB0 0262F8 0013+05 1/1 0/0 0/0 .rodata @stringBase0 */ +/* ############################################################################################## */ +/* 80399CA3-80399CB0 026303 0008+05 0/0 0/0 0/0 .rodata None */ #pragma push #pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80399C98 = "zel_00.bmg"; SECTION_DEAD static char const* const stringBase_80399CA3 = "" "\x1B" "CR[%d]"; /* @stringBase0 padding */ SECTION_DEAD static char const* const pad_80399CAB = "\0\0\0\0"; #pragma pop + +/* 80399C98-80399C98 0262F8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/msg/d_msg_unit.cpp b/src/d/msg/d_msg_unit.cpp index 3c0c3705138..5644e289bac 100644 --- a/src/d/msg/d_msg_unit.cpp +++ b/src/d/msg/d_msg_unit.cpp @@ -82,6 +82,19 @@ asm dMsgUnit_c::~dMsgUnit_c() { #pragma pop /* ############################################################################################## */ +/* 803996E8-803996E8 025D48 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_803996E8 = "%d"; +SECTION_DEAD static char const* const stringBase_803996EB = "%d-%d"; +SECTION_DEAD static char const* const stringBase_803996F1 = "%d:%02d"; +SECTION_DEAD static char const* const stringBase_803996F9 = ""; +SECTION_DEAD static char const* const stringBase_803996FA = "%d%s"; +SECTION_DEAD static char const* const stringBase_803996FF = "%d %s"; +/* @stringBase0 padding */ +SECTION_DEAD static char const* const pad_80399705 = "\0\0"; +#pragma pop + /* 80454B40-80454B44 003140 0004+00 1/1 0/0 0/0 .sdata2 @3702 */ SECTION_SDATA2 static f32 lit_3702 = 1000000.0f; @@ -128,7 +141,7 @@ asm void __sinit_d_msg_unit_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_8023907C = (void*)__sinit_d_msg_unit_cpp; +REGISTER_CTORS(0x8023907C, __sinit_d_msg_unit_cpp); #pragma pop /* ############################################################################################## */ @@ -136,16 +149,4 @@ SECTION_CTORS void* const _ctors_8023907C = (void*)__sinit_d_msg_unit_cpp; extern u8 data_804510D8[8]; u8 data_804510D8[8]; -/* 803996E8-80399708 025D48 001D+03 1/1 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_803996E8 = "%d"; -SECTION_DEAD static char const* const stringBase_803996EB = "%d-%d"; -SECTION_DEAD static char const* const stringBase_803996F1 = "%d:%02d"; -SECTION_DEAD static char const* const stringBase_803996F9 = ""; -SECTION_DEAD static char const* const stringBase_803996FA = "%d%s"; -SECTION_DEAD static char const* const stringBase_803996FF = "%d %s"; -/* @stringBase0 padding */ -SECTION_DEAD static char const* const pad_80399705 = "\0\0"; -#pragma pop +/* 803996E8-803996E8 025D48 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/ovlp/d_ovlp_fade2.cpp b/src/d/ovlp/d_ovlp_fade2.cpp index 9842ec35ebd..b710c28ba8e 100644 --- a/src/d/ovlp/d_ovlp_fade2.cpp +++ b/src/d/ovlp/d_ovlp_fade2.cpp @@ -73,7 +73,7 @@ extern "C" static void dOvlpFd2_Execute__FP10dOvlpFd2_c(); extern "C" static bool dOvlpFd2_IsDelete__FP10dOvlpFd2_c(); extern "C" static bool dOvlpFd2_Delete__FP10dOvlpFd2_c(); extern "C" static void dOvlpFd2_Create__FPv(); -extern "C" void func_80252E70(s8*); +extern "C" void func_80252E70(void* _this, s8*); extern "C" void __dt__15dOvlpFd2_dlst_cFv(); // @@ -357,7 +357,7 @@ static asm void dOvlpFd2_Create(void* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80252E70(s8* param_0) { +extern "C" asm void func_80252E70(void* _this, s8* param_0) { nofralloc #include "asm/d/ovlp/d_ovlp_fade2/func_80252E70.s" } diff --git a/src/d/ovlp/d_ovlp_fade3.cpp b/src/d/ovlp/d_ovlp_fade3.cpp index aae13b804e9..addece75d91 100644 --- a/src/d/ovlp/d_ovlp_fade3.cpp +++ b/src/d/ovlp/d_ovlp_fade3.cpp @@ -95,10 +95,10 @@ extern "C" void fopOvlpM_SceneIsStart__Fv(); extern "C" void fopOvlpM_IsOutReq__FP18overlap_task_class(); extern "C" void fopOvlpM_Done__FP18overlap_task_class(); extern "C" void set__12dDlst_list_cFRPP12dDlst_base_cRPP12dDlst_base_cP12dDlst_base_c(); -extern "C" void func_80141AE8(u8*); +extern "C" void func_80141AE8(void* _this, u8*); extern "C" void Stop__9dCamera_cFv(); extern "C" void dCam_getBody__Fv(); -extern "C" void func_80252E70(s8*); +extern "C" void func_80252E70(void* _this, s8*); extern "C" void cLib_addCalc0__FPfff(); extern "C" void __dl__FPv(); extern "C" void func_802E980C(); diff --git a/src/d/pane/d_pane_class.cpp b/src/d/pane/d_pane_class.cpp index 5a55649cb61..d97d79d881b 100644 --- a/src/d/pane/d_pane_class.cpp +++ b/src/d/pane/d_pane_class.cpp @@ -581,5 +581,5 @@ asm void __sinit_d_pane_class_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_802553D0 = (void*)__sinit_d_pane_class_cpp; +REGISTER_CTORS(0x802553D0, __sinit_d_pane_class_cpp); #pragma pop diff --git a/src/d/pane/d_pane_class_ex.cpp b/src/d/pane/d_pane_class_ex.cpp index 9948db46d7b..bf439599e2f 100644 --- a/src/d/pane/d_pane_class_ex.cpp +++ b/src/d/pane/d_pane_class_ex.cpp @@ -37,14 +37,13 @@ struct J2DPicture { struct J2DAnmTexPattern {}; -struct J2DAnmVtxColor {}; - struct J2DAnmVisibilityFull {}; +struct J2DAnmVtxColor {}; + struct J2DPane { /* 80256018 */ void setAnimation(J2DAnmVtxColor*); /* 80256020 */ void setAnimation(J2DAnmTexPattern*); - /* 802F7FC4 */ void setAnimation(J2DAnmTransform*); /* 8025601C */ void setAnimation(J2DAnmVisibilityFull*); }; diff --git a/src/d/particle/d_particle.cpp b/src/d/particle/d_particle.cpp index d6d00e64cb6..3807c522780 100644 --- a/src/d/particle/d_particle.cpp +++ b/src/d/particle/d_particle.cpp @@ -68,22 +68,13 @@ struct dPa_wbPcallBack_c { /* 8004FECC */ ~dPa_wbPcallBack_c(); }; -struct dKy_tevstr_c {}; - -struct _GXColor {}; - struct JPAParticleCallBack { /* 800183D4 */ void execute(JPABaseEmitter*, JPABaseParticle*); /* 800183D8 */ void draw(JPABaseEmitter*, JPABaseParticle*); /* 8027EFA4 */ ~JPAParticleCallBack(); }; -struct JGeometry { - template - struct TVec3 {}; - /* TVec3 */ - struct TVec3__template0 {}; -}; +struct JPADrawInfo {}; struct JPAEmitterCallBack { /* 80050368 */ void execute(JPABaseEmitter*); @@ -102,7 +93,12 @@ struct JPAResourceManager { /* 80273FCC */ void getResUserWork(u16) const; }; -struct JPADrawInfo {}; +struct JGeometry { + template + struct TVec3 {}; + /* TVec3 */ + struct TVec3__template0 {}; +}; struct JPAEmitterManager { /* 8027DCA0 */ JPAEmitterManager(u32, u32, JKRHeap*, u8, u8); @@ -115,6 +111,10 @@ struct JPAEmitterManager { /* 8027E354 */ void clearResourceManager(u8); }; +struct dKy_tevstr_c {}; + +struct _GXColor {}; + struct dPa_simpleEcallBack { /* 8004ADF4 */ dPa_simpleEcallBack(); /* 8004AE1C */ void executeAfter(JPABaseEmitter*); @@ -1314,7 +1314,7 @@ static asm void dPa_setWindPower(JPABaseParticle* param_0) { SECTION_RODATA static u8 const lit_4065[12] = { 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8037A108, &lit_4065); +COMPILER_STRIP_GATE(0x8037A108, &lit_4065); /* 80451F5C-80451F60 00055C 0004+00 3/3 0/0 0/0 .sdata2 @4090 */ SECTION_SDATA2 static f32 lit_4090 = -0.0054931640625f; @@ -1959,6 +1959,13 @@ asm void dPa_control_c::getRM_ID(u16 param_0) { } #pragma pop +/* ############################################################################################## */ +/* 8037A12C-8037A12C 00678C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8037A12C = "dummy"; +#pragma pop + /* 8004BB78-8004BCDC 0464B8 0164+00 0/0 1/1 0/0 .text createCommon__13dPa_control_cFPCv */ #pragma push @@ -1982,6 +1989,12 @@ asm void dPa_control_c::createRoomScene() { #pragma pop /* ############################################################################################## */ +/* 8037A12C-8037A12C 00678C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8037A132 = "/res/Particle/Pscene%03d.jpc"; +#pragma pop + /* 804248A0-804248AC 0515C0 000C+00 0/1 0/0 0/0 .bss @4742 */ #pragma push #pragma force_active on @@ -2197,6 +2210,18 @@ asm void dPa_control_c::setPoly(u16 param_0, cBgS_PolyInfo& param_1, cXyz const* } #pragma pop +/* ############################################################################################## */ +/* 8037A12C-8037A12C 00678C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8037A14F = + "" + "\x1B" + "[43;30m１エミッター登録数オーバー！！\n"; +/* @stringBase0 padding */ +SECTION_DEAD static char const* const pad_8037A177 = ""; +#pragma pop + /* 8004D128-8004D1B8 047A68 0090+00 2/2 0/0 0/0 .text newSimple__13dPa_control_cFUsUcPUl */ #pragma push @@ -2381,7 +2406,7 @@ void dPa_gen_d_light8PcallBack::execute(JPABaseEmitter* param_0, JPABaseParticle SECTION_RODATA static u8 const lit_5691[12] = { 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8037A114, &lit_5691); +COMPILER_STRIP_GATE(0x8037A114, &lit_5691); /* 80451FD8-80451FDC 0005D8 0004+00 3/3 0/0 0/0 .sdata2 @6075 */ SECTION_SDATA2 static f32 lit_6075 = 32.0f; @@ -2432,7 +2457,7 @@ asm void dPa_gen_b_light8PcallBack::draw(JPABaseEmitter* param_0, JPABaseParticl SECTION_RODATA static u8 const lit_6363[12] = { 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8037A120, &lit_6363); +COMPILER_STRIP_GATE(0x8037A120, &lit_6363); /* 8004ED44-8004F6B8 049684 0974+00 1/0 0/0 0/0 .text * draw__25dPa_gen_d_light8PcallBackFP14JPABaseEmitterP15JPABaseParticle */ @@ -2840,19 +2865,7 @@ asm void __sinit_d_particle_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80050480 = (void*)__sinit_d_particle_cpp; +REGISTER_CTORS(0x80050480, __sinit_d_particle_cpp); #pragma pop -/* 8037A12C-8037A178 00678C 004B+01 4/4 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_8037A12C = "dummy"; -SECTION_DEAD static char const* const stringBase_8037A132 = "/res/Particle/Pscene%03d.jpc"; -SECTION_DEAD static char const* const stringBase_8037A14F = - "" - "\x1B" - "[43;30m１エミッター登録数オーバー！！\n"; -/* @stringBase0 padding */ -SECTION_DEAD static char const* const pad_8037A177 = ""; -#pragma pop +/* 8037A12C-8037A12C 00678C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/particle/d_particle_copoly.cpp b/src/d/particle/d_particle_copoly.cpp index 11f9825b772..81ef854fccd 100644 --- a/src/d/particle/d_particle_copoly.cpp +++ b/src/d/particle/d_particle_copoly.cpp @@ -653,5 +653,5 @@ asm void __sinit_d_particle_copoly_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80051614 = (void*)__sinit_d_particle_copoly_cpp; +REGISTER_CTORS(0x80051614, __sinit_d_particle_copoly_cpp); #pragma pop diff --git a/src/d/s/d_s_logo.cpp b/src/d/s/d_s_logo.cpp index 092c7e81d14..ac37784aa41 100644 --- a/src/d/s/d_s_logo.cpp +++ b/src/d/s/d_s_logo.cpp @@ -136,10 +136,10 @@ struct cDylPhs { /* 8001884C */ void Link(request_of_phase_process_class*, s16); }; -struct Vec {}; - struct JAISoundID {}; +struct Vec {}; + struct Z2SeMgr { /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); }; @@ -229,7 +229,7 @@ extern "C" void getProgressiveMode__10dScnLogo_cFv(); extern "C" void isProgressiveMode__10dScnLogo_cFv(); extern "C" void setRenderMode__10dScnLogo_cFv(); extern "C" void __dt__10dLog_HIO_cFv(); -extern "C" void func_802585A4(u16*); +extern "C" void func_802585A4(void* _this, u16*); extern "C" void __sinit_d_s_logo_cpp(); extern "C" extern char const* const d_s_d_s_logo__stringBase0; @@ -574,7 +574,7 @@ SECTION_RODATA static u8 const l_preLoad_dylKeyTbl[28] = { 0x02, 0xDC, 0x02, 0xCE, 0x02, 0x21, 0x00, 0xF2, 0x02, 0x1B, 0x02, 0xF4, 0x01, 0x39, 0x01, 0x5A, 0x02, 0xE4, 0x00, 0xFE, 0x03, 0x08, 0x03, 0x0F, 0x00, 0xFF, 0x01, 0x3F, }; -COMPILER_STRIP_GATE(80399FE0, &l_preLoad_dylKeyTbl); +COMPILER_STRIP_GATE(0x80399FE0, &l_preLoad_dylKeyTbl); /* 8025611C-80256198 250A5C 007C+00 2/2 0/0 0/0 .text preLoad_dyl__10dScnLogo_cFv */ #pragma push @@ -788,6 +788,14 @@ asm void dScnLogo_c::nextSceneChange() { } #pragma pop +/* ############################################################################################## */ +/* 80399FFC-80399FFC 02665C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80399FFC = "LogoUs"; +SECTION_DEAD static char const* const stringBase_8039A003 = "Always"; +#pragma pop + /* 802572B8-80257910 251BF8 0658+00 1/1 0/0 0/0 .text __dt__10dScnLogo_cFv */ #pragma push #pragma optimization_level 0 @@ -808,6 +816,13 @@ static asm void phase_0(dScnLogo_c* param_0) { } #pragma pop +/* ############################################################################################## */ +/* 80399FFC-80399FFC 02665C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8039A00A = "/res/Object/"; +#pragma pop + /* 802579BC-80257A70 2522FC 00B4+00 1/0 0/0 0/0 .text phase_1__FP10dScnLogo_c */ #pragma push #pragma optimization_level 0 @@ -859,6 +874,41 @@ asm void dScnLogo_c::logoInitGC() { } #pragma pop +/* ############################################################################################## */ +/* 80399FFC-80399FFC 02665C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8039A017 = "Alink"; +SECTION_DEAD static char const* const stringBase_8039A01D = "/res/FieldMap/Field0.arc"; +SECTION_DEAD static char const* const stringBase_8039A036 = "/res/Object/AlAnm.arc"; +SECTION_DEAD static char const* const stringBase_8039A04C = "/res/Layout/fmapres.arc"; +SECTION_DEAD static char const* const stringBase_8039A064 = "/res/Layout/dmapres.arc"; +SECTION_DEAD static char const* const stringBase_8039A07C = "/res/Layout/clctres.arc"; +SECTION_DEAD static char const* const stringBase_8039A094 = "/res/Layout/itemicon.arc"; +SECTION_DEAD static char const* const stringBase_8039A0AD = "/res/Layout/ringres.arc"; +SECTION_DEAD static char const* const stringBase_8039A0C5 = "/res/Layout/playerName.arc"; +SECTION_DEAD static char const* const stringBase_8039A0E0 = "/res/Layout/itmInfRes.arc"; +SECTION_DEAD static char const* const stringBase_8039A0FA = "/res/Layout/button.arc"; +SECTION_DEAD static char const* const stringBase_8039A111 = "/res/CardIcon/cardicon.arc"; +SECTION_DEAD static char const* const stringBase_8039A12C = "/res/Msgus/bmgres.arc"; +SECTION_DEAD static char const* const stringBase_8039A142 = "/res/Layout/msgcom.arc"; +SECTION_DEAD static char const* const stringBase_8039A159 = "/res/Layout/msgres00.arc"; +SECTION_DEAD static char const* const stringBase_8039A172 = "/res/Layout/msgres01.arc"; +SECTION_DEAD static char const* const stringBase_8039A18B = "/res/Layout/msgres02.arc"; +SECTION_DEAD static char const* const stringBase_8039A1A4 = "/res/Layout/msgres03.arc"; +SECTION_DEAD static char const* const stringBase_8039A1BD = "/res/Layout/msgres04F.arc"; +SECTION_DEAD static char const* const stringBase_8039A1D7 = "/res/Layout/msgres05.arc"; +SECTION_DEAD static char const* const stringBase_8039A1F0 = "/res/Layout/msgres06.arc"; +SECTION_DEAD static char const* const stringBase_8039A209 = "/res/Layout/main2D.arc"; +SECTION_DEAD static char const* const stringBase_8039A220 = "/res/Fontus/fontres.arc"; +SECTION_DEAD static char const* const stringBase_8039A238 = "/res/Fontus/rubyres.arc"; +SECTION_DEAD static char const* const stringBase_8039A250 = "/res/Particle/common.jpc"; +SECTION_DEAD static char const* const stringBase_8039A269 = "/res/ItemTable/item_table.bin"; +SECTION_DEAD static char const* const stringBase_8039A287 = "/res/ItemTable/enemy_table.bin"; +/* @stringBase0 padding */ +SECTION_DEAD static char const* const pad_8039A2A6 = "\0"; +#pragma pop + /* 80257FEC-80258420 25292C 0434+00 1/1 0/0 0/0 .text dvdDataLoad__10dScnLogo_cFv */ #pragma push #pragma optimization_level 0 @@ -972,7 +1022,7 @@ asm dLog_HIO_c::~dLog_HIO_c() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_802585A4(u16* param_0) { +extern "C" asm void func_802585A4(void* _this, u16* param_0) { nofralloc #include "asm/d/s/d_s_logo/func_802585A4.s" } @@ -997,43 +1047,7 @@ asm void __sinit_d_s_logo_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_802585C0 = (void*)__sinit_d_s_logo_cpp; +REGISTER_CTORS(0x802585C0, __sinit_d_s_logo_cpp); #pragma pop -/* 80399FFC-8039A2A8 02665C 02AA+02 4/4 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80399FFC = "LogoUs"; -SECTION_DEAD static char const* const stringBase_8039A003 = "Always"; -SECTION_DEAD static char const* const stringBase_8039A00A = "/res/Object/"; -SECTION_DEAD static char const* const stringBase_8039A017 = "Alink"; -SECTION_DEAD static char const* const stringBase_8039A01D = "/res/FieldMap/Field0.arc"; -SECTION_DEAD static char const* const stringBase_8039A036 = "/res/Object/AlAnm.arc"; -SECTION_DEAD static char const* const stringBase_8039A04C = "/res/Layout/fmapres.arc"; -SECTION_DEAD static char const* const stringBase_8039A064 = "/res/Layout/dmapres.arc"; -SECTION_DEAD static char const* const stringBase_8039A07C = "/res/Layout/clctres.arc"; -SECTION_DEAD static char const* const stringBase_8039A094 = "/res/Layout/itemicon.arc"; -SECTION_DEAD static char const* const stringBase_8039A0AD = "/res/Layout/ringres.arc"; -SECTION_DEAD static char const* const stringBase_8039A0C5 = "/res/Layout/playerName.arc"; -SECTION_DEAD static char const* const stringBase_8039A0E0 = "/res/Layout/itmInfRes.arc"; -SECTION_DEAD static char const* const stringBase_8039A0FA = "/res/Layout/button.arc"; -SECTION_DEAD static char const* const stringBase_8039A111 = "/res/CardIcon/cardicon.arc"; -SECTION_DEAD static char const* const stringBase_8039A12C = "/res/Msgus/bmgres.arc"; -SECTION_DEAD static char const* const stringBase_8039A142 = "/res/Layout/msgcom.arc"; -SECTION_DEAD static char const* const stringBase_8039A159 = "/res/Layout/msgres00.arc"; -SECTION_DEAD static char const* const stringBase_8039A172 = "/res/Layout/msgres01.arc"; -SECTION_DEAD static char const* const stringBase_8039A18B = "/res/Layout/msgres02.arc"; -SECTION_DEAD static char const* const stringBase_8039A1A4 = "/res/Layout/msgres03.arc"; -SECTION_DEAD static char const* const stringBase_8039A1BD = "/res/Layout/msgres04F.arc"; -SECTION_DEAD static char const* const stringBase_8039A1D7 = "/res/Layout/msgres05.arc"; -SECTION_DEAD static char const* const stringBase_8039A1F0 = "/res/Layout/msgres06.arc"; -SECTION_DEAD static char const* const stringBase_8039A209 = "/res/Layout/main2D.arc"; -SECTION_DEAD static char const* const stringBase_8039A220 = "/res/Fontus/fontres.arc"; -SECTION_DEAD static char const* const stringBase_8039A238 = "/res/Fontus/rubyres.arc"; -SECTION_DEAD static char const* const stringBase_8039A250 = "/res/Particle/common.jpc"; -SECTION_DEAD static char const* const stringBase_8039A269 = "/res/ItemTable/item_table.bin"; -SECTION_DEAD static char const* const stringBase_8039A287 = "/res/ItemTable/enemy_table.bin"; -/* @stringBase0 padding */ -SECTION_DEAD static char const* const pad_8039A2A6 = "\0"; -#pragma pop +/* 80399FFC-80399FFC 02665C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/s/d_s_name.cpp b/src/d/s/d_s_name.cpp index 6957d07322f..5f359a539ea 100644 --- a/src/d/s/d_s_name.cpp +++ b/src/d/s/d_s_name.cpp @@ -355,6 +355,13 @@ asm dSn_HIO_c::dSn_HIO_c() { } #pragma pop +/* ############################################################################################## */ +/* 8039A2A8-8039A2A8 026908 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8039A2A8 = "/res/Object/"; +#pragma pop + /* 802587A4-80258820 2530E4 007C+00 1/0 0/0 0/0 .text phase_1__FPc */ #pragma push #pragma optimization_level 0 @@ -394,6 +401,12 @@ static asm void resLoad(request_of_phase_process_class* param_0, char* param_1) #pragma pop /* ############################################################################################## */ +/* 8039A2A8-8039A2A8 026908 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8039A2B5 = "fileSel"; +#pragma pop + /* 804510F0-804510F8 0005F0 0008+00 2/2 0/0 0/0 .sbss g_snHIO */ static u8 g_snHIO[8]; @@ -533,6 +546,15 @@ asm void dScnName_c::brightCheck() { } #pragma pop +/* ############################################################################################## */ +/* 8039A2A8-8039A2A8 026908 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8039A2BD = "F_SP108"; +/* @stringBase0 padding */ +SECTION_DEAD static char const* const pad_8039A2C5 = "\0\0"; +#pragma pop + /* 802590F8-802591C0 253A38 00C8+00 1/0 0/0 0/0 .text changeGameScene__10dScnName_cFv */ #pragma push #pragma optimization_level 0 @@ -630,16 +652,7 @@ asm void __sinit_d_s_name_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80259324 = (void*)__sinit_d_s_name_cpp; +REGISTER_CTORS(0x80259324, __sinit_d_s_name_cpp); #pragma pop -/* 8039A2A8-8039A2C8 026908 001D+03 4/4 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_8039A2A8 = "/res/Object/"; -SECTION_DEAD static char const* const stringBase_8039A2B5 = "fileSel"; -SECTION_DEAD static char const* const stringBase_8039A2BD = "F_SP108"; -/* @stringBase0 padding */ -SECTION_DEAD static char const* const pad_8039A2C5 = "\0\0"; -#pragma pop +/* 8039A2A8-8039A2A8 026908 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/s/d_s_play.cpp b/src/d/s/d_s_play.cpp index e4ce4660d40..4ec0eea442b 100644 --- a/src/d/s/d_s_play.cpp +++ b/src/d/s/d_s_play.cpp @@ -398,7 +398,7 @@ extern "C" void dMeter2Info_setCloth__FUcb(); extern "C" void dMeter2Info_setSword__FUcb(); extern "C" void dMeter2Info_setShield__FUcb(); extern "C" void readMessageGroup__12dMsgObject_cFPP25mDoDvdThd_mountXArchive_c(); -extern "C" void func_80252E70(s8*); +extern "C" void func_80252E70(void* _this, s8*); extern "C" void ClearPi__13cBgS_PolyInfoFv(); extern "C" void setInDarkness__10Z2SceneMgrFb(); extern "C" void check1stDynamicWave__10Z2SceneMgrFv(); @@ -703,6 +703,9 @@ static asm void dScnPly_IsDelete(dScnPly_c param_0) { #pragma pop /* ############################################################################################## */ +/* 8039A2DF-8039A2E7 02693F 0008+00 1/0 0/0 0/0 .rodata None */ +extern "C" char const* const stringBase_8039A2DF; + /* 80450760-80450764 -00001 0004+00 1/0 0/0 0/0 .sdata T_JOINT_resName */ extern "C" void* T_JOINT_resName; @@ -716,7 +719,14 @@ SECTION_RODATA static void* const PreLoadInfoT[4] = { (void*)&T_JOINT_resName, (void*)0x01010000, }; -COMPILER_STRIP_GATE(8039A2C8, &PreLoadInfoT); +COMPILER_STRIP_GATE(0x8039A2C8, &PreLoadInfoT); + +/* 8039A2D8-8039A2D8 026938 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8039A2D8 = "Always"; +SECTION_DEAD static char const* const stringBase_8039A2DF = "T_JOINT"; +#pragma pop /* 80450760-80450764 -00001 0004+00 1/0 0/0 0/0 .sdata T_JOINT_resName */ SECTION_SDATA static void* T_JOINT_resName = (void*)&d_s_d_s_play__stringBase0; @@ -741,6 +751,14 @@ static asm void dScnPly_Delete(dScnPly_c* param_0) { } #pragma pop +/* ############################################################################################## */ +/* 8039A2D8-8039A2D8 026938 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8039A2E7 = "F_SP109"; +SECTION_DEAD static char const* const stringBase_8039A2EF = "F_SP116"; +#pragma pop + /* 80259AC4-80259BFC 254404 0138+00 1/1 0/0 0/0 .text resetGame__9dScnPly_cFv */ #pragma push #pragma optimization_level 0 @@ -786,6 +804,23 @@ static s32 phase_0(dScnPly_c* param_0) { return 2; } +/* ############################################################################################## */ +/* 8039A2D8-8039A2D8 026938 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8039A2F7 = "F_SP108"; +SECTION_DEAD static char const* const stringBase_8039A2FF = "F_SP115"; +SECTION_DEAD static char const* const stringBase_8039A307 = "F_SP117"; +SECTION_DEAD static char const* const stringBase_8039A30F = "F_SP104"; +SECTION_DEAD static char const* const stringBase_8039A317 = "D_SB10"; +SECTION_DEAD static char const* const stringBase_8039A31E = "D_MN08D"; +SECTION_DEAD static char const* const stringBase_8039A326 = "R_SP107"; +SECTION_DEAD static char const* const stringBase_8039A32E = "F_SP121"; +SECTION_DEAD static char const* const stringBase_8039A336 = "F_SP127"; +SECTION_DEAD static char const* const stringBase_8039A33E = "Start StageName:RoomNo [%s:%d]\n"; +SECTION_DEAD static char const* const stringBase_8039A35E = "Stg_00"; +#pragma pop + /* 80259D84-8025A438 2546C4 06B4+00 1/0 0/0 0/0 .text phase_1__FP9dScnPly_c */ #pragma push #pragma optimization_level 0 @@ -796,6 +831,17 @@ static asm void phase_1(dScnPly_c* param_0) { } #pragma pop +/* ############################################################################################## */ +/* 8039A2D8-8039A2D8 026938 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8039A365 = "Event"; +SECTION_DEAD static char const* const stringBase_8039A36B = "/res/Object/"; +SECTION_DEAD static char const* const stringBase_8039A378 = "CamParam"; +/* @stringBase0 padding */ +SECTION_DEAD static char const* const pad_8039A381 = "\0\0\0\0\0\0"; +#pragma pop + /* 8025A438-8025A4F8 254D78 00C0+00 1/0 0/0 0/0 .text phase_1_0__FP9dScnPly_c */ #pragma push #pragma optimization_level 0 @@ -961,7 +1007,7 @@ asm void __sinit_d_s_play_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_8025AC54 = (void*)__sinit_d_s_play_cpp; +REGISTER_CTORS(0x8025AC54, __sinit_d_s_play_cpp); #pragma pop /* 8025AD04-8025AD78 255644 0074+00 2/1 0/0 0/0 .text __dt__17dScnPly_env_HIO_cFv */ @@ -994,28 +1040,4 @@ asm dScnPly_preLoad_HIO_c::~dScnPly_preLoad_HIO_c() { } #pragma pop -/* 8039A2D8-8039A388 026938 00A9+07 5/3 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_8039A2D8 = "Always"; -SECTION_DEAD static char const* const stringBase_8039A2DF = "T_JOINT"; -SECTION_DEAD static char const* const stringBase_8039A2E7 = "F_SP109"; -SECTION_DEAD static char const* const stringBase_8039A2EF = "F_SP116"; -SECTION_DEAD static char const* const stringBase_8039A2F7 = "F_SP108"; -SECTION_DEAD static char const* const stringBase_8039A2FF = "F_SP115"; -SECTION_DEAD static char const* const stringBase_8039A307 = "F_SP117"; -SECTION_DEAD static char const* const stringBase_8039A30F = "F_SP104"; -SECTION_DEAD static char const* const stringBase_8039A317 = "D_SB10"; -SECTION_DEAD static char const* const stringBase_8039A31E = "D_MN08D"; -SECTION_DEAD static char const* const stringBase_8039A326 = "R_SP107"; -SECTION_DEAD static char const* const stringBase_8039A32E = "F_SP121"; -SECTION_DEAD static char const* const stringBase_8039A336 = "F_SP127"; -SECTION_DEAD static char const* const stringBase_8039A33E = "Start StageName:RoomNo [%s:%d]\n"; -SECTION_DEAD static char const* const stringBase_8039A35E = "Stg_00"; -SECTION_DEAD static char const* const stringBase_8039A365 = "Event"; -SECTION_DEAD static char const* const stringBase_8039A36B = "/res/Object/"; -SECTION_DEAD static char const* const stringBase_8039A378 = "CamParam"; -/* @stringBase0 padding */ -SECTION_DEAD static char const* const pad_8039A381 = "\0\0\0\0\0\0"; -#pragma pop +/* 8039A2D8-8039A2D8 026938 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/s/d_s_room.cpp b/src/d/s/d_s_room.cpp index 0f114ea65fa..806bdd0499c 100644 --- a/src/d/s/d_s_room.cpp +++ b/src/d/s/d_s_room.cpp @@ -189,6 +189,13 @@ static bool dScnRoom_Draw(room_of_scene_class* param_0) { return true; } +/* ############################################################################################## */ +/* 8039A388-8039A388 0269E8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8039A388 = ""; +#pragma pop + /* 8025AE24-8025AF24 255764 0100+00 2/2 0/0 0/0 .text getResetArchiveBank__FiPPCUc */ #pragma push #pragma optimization_level 0 @@ -209,6 +216,15 @@ static asm void resetArchiveBank(int param_0) { } #pragma pop +/* ############################################################################################## */ +/* 8039A388-8039A388 0269E8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8039A389 = "pack"; +SECTION_DEAD static char const* const stringBase_8039A38E = "/res/Object/"; +SECTION_DEAD static char const* const stringBase_8039A39B = "Bank[%d] : %s.arc Read Error !!\n"; +#pragma pop + /* 8025AF4C-8025B0F0 25588C 01A4+00 1/1 0/0 0/0 .text setArchiveBank__Fi */ #pragma push #pragma optimization_level 0 @@ -259,6 +275,13 @@ static asm void isCreating(unsigned int param_0) { } #pragma pop +/* ############################################################################################## */ +/* 8039A388-8039A388 0269E8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8039A3BC = "Demo%02d_%02d"; +#pragma pop + /* 8025B1D0-8025B2EC 255B10 011C+00 1/1 0/0 0/0 .text loadDemoArchive__Fi */ #pragma push #pragma optimization_level 0 @@ -335,6 +358,15 @@ static asm void phase_1(room_of_scene_class* param_0) { } #pragma pop +/* ############################################################################################## */ +/* 8039A388-8039A388 0269E8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8039A3CA = "room.dzr"; +/* @stringBase0 padding */ +SECTION_DEAD static char const* const pad_8039A3D3 = "\0\0\0\0"; +#pragma pop + /* 8025B980-8025BAAC 2562C0 012C+00 1/0 0/0 0/0 .text phase_2__FP19room_of_scene_class */ #pragma push #pragma optimization_level 0 @@ -410,16 +442,4 @@ SECTION_DATA extern void* g_profile_ROOM_SCENE[10] = { (void*)&l_dScnRoom_Method, (void*)NULL, }; -/* 8039A388-8039A3D8 0269E8 004B+05 4/4 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_8039A388 = ""; -SECTION_DEAD static char const* const stringBase_8039A389 = "pack"; -SECTION_DEAD static char const* const stringBase_8039A38E = "/res/Object/"; -SECTION_DEAD static char const* const stringBase_8039A39B = "Bank[%d] : %s.arc Read Error !!\n"; -SECTION_DEAD static char const* const stringBase_8039A3BC = "Demo%02d_%02d"; -SECTION_DEAD static char const* const stringBase_8039A3CA = "room.dzr"; -/* @stringBase0 padding */ -SECTION_DEAD static char const* const pad_8039A3D3 = "\0\0\0\0"; -#pragma pop +/* 8039A388-8039A388 0269E8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/save/d_save.cpp b/src/d/save/d_save.cpp index c4f79a3b6a8..20da88fee00 100644 --- a/src/d/save/d_save.cpp +++ b/src/d/save/d_save.cpp @@ -293,7 +293,6 @@ struct dMeter2Info_c { }; struct dComIfG_play_c { - /* 8002B3A8 */ void setNowVibration(u8); /* 8002B3B0 */ void getNowVibration(); }; @@ -663,6 +662,12 @@ asm void dSv_player_status_b_c::isTransformLV(int param_0) const { #pragma pop /* ############################################################################################## */ +/* 80379234-80379234 005894 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80379234 = ""; +#pragma pop + /* 80451D5C-80451D60 00035C 0004+00 3/3 0/0 0/0 .sdata2 @3813 */ SECTION_SDATA2 static u8 lit_3813[4] = { 0x00, @@ -691,6 +696,13 @@ asm void dSv_horse_place_c::set(char const* param_0, cXyz const& param_1, s16 pa } #pragma pop +/* ############################################################################################## */ +/* 80379234-80379234 005894 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80379235 = "F_SP108"; +#pragma pop + /* 80032CC8-80032D1C 02D608 0054+00 1/1 0/0 0/0 .text init__25dSv_player_return_place_cFv */ #pragma push @@ -800,6 +812,13 @@ asm void dSv_player_item_c::setItem(int param_0, u8 param_1) { } #pragma pop +/* ############################################################################################## */ +/* 80379234-80379234 005894 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8037923D = "合成アイテム不定＝＝＝＞%d, %d\n"; +#pragma pop + /* 80033030-800332F8 02D970 02C8+00 7/7 70/70 2/2 .text getItem__17dSv_player_item_cCFib */ #pragma push @@ -3095,16 +3114,11 @@ asm void dSv_player_config_c::getSound() { } #pragma pop -/* 8003468C-80034694 02EFCC 0008+00 1/1 1/1 0/0 .text setSound__19dSv_player_config_cFUc +/* 8003468C-80034694 -00001 0008+00 0/0 0/0 0/0 .text setSound__19dSv_player_config_cFUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dSv_player_config_c::setSound(u8 param_0) { - nofralloc -#include "asm/d/save/d_save/setSound__19dSv_player_config_cFUc.s" +void dSv_player_config_c::setSound(u8 param_0) { + *(u8*)(((u8*)this) + 1) /* this->field_0x1 */ = (u8)(param_0); } -#pragma pop /* 80034694-8003469C 02EFD4 0008+00 1/1 1/1 0/0 .text getVibration__19dSv_player_config_cFv */ #pragma push @@ -3116,15 +3130,10 @@ asm void dSv_player_config_c::getVibration() { } #pragma pop -/* 8003469C-800346A4 02EFDC 0008+00 0/0 1/1 0/0 .text setVibration__19dSv_player_config_cFUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dSv_player_config_c::setVibration(u8 param_0) { - nofralloc -#include "asm/d/save/d_save/setVibration__19dSv_player_config_cFUc.s" +/* 8003469C-800346A4 -00001 0008+00 0/0 0/0 0/0 .text setVibration__19dSv_player_config_cFUc */ +void dSv_player_config_c::setVibration(u8 param_0) { + *(u8*)(((u8*)this) + 3) /* this->field_0x3 */ = (u8)(param_0); } -#pragma pop /* 800346A4-80034750 02EFE4 00AC+00 1/1 0/0 0/0 .text init__12dSv_player_cFv */ #pragma push @@ -3833,6 +3842,14 @@ asm void dSv_info_c::isActor(int param_0, int param_1) const { } #pragma pop +/* ############################################################################################## */ +/* 80379234-80379234 005894 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8037925D = "Write size:%d\n"; +SECTION_DEAD static char const* const stringBase_8037926C = "SAVE size:%d\n"; +#pragma pop + /* 80035798-80035A04 0300D8 026C+00 0/0 1/1 0/0 .text memory_to_card__10dSv_info_cFPci */ #pragma push #pragma optimization_level 0 @@ -3843,6 +3860,13 @@ asm void dSv_info_c::memory_to_card(char* param_0, int param_1) { } #pragma pop +/* ############################################################################################## */ +/* 80379234-80379234 005894 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8037927A = "LOAD size:%d\n"; +#pragma pop + /* 80035A04-80035BD0 030344 01CC+00 0/0 2/2 0/0 .text card_to_memory__10dSv_info_cFPci */ #pragma push #pragma optimization_level 0 @@ -3853,6 +3877,15 @@ asm void dSv_info_c::card_to_memory(char* param_0, int param_1) { } #pragma pop +/* ############################################################################################## */ +/* 80379234-80379234 005894 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80379288 = "INIT size:%d\n"; +/* @stringBase0 padding */ +SECTION_DEAD static char const* const pad_80379296 = "\0"; +#pragma pop + /* 80035BD0-80035C88 030510 00B8+00 0/0 3/3 0/0 .text initdata_to_card__10dSv_info_cFPci */ #pragma push @@ -4241,19 +4274,6 @@ SECTION_RODATA u8 const dSv_event_tmp_flag_c::tempBitLabels[370 + 2 /* padding * 0x00, 0x00, }; -COMPILER_STRIP_GATE(803790C0, &dSv_event_tmp_flag_c::tempBitLabels); +COMPILER_STRIP_GATE(0x803790C0, &dSv_event_tmp_flag_c::tempBitLabels); -/* 80379234-80379298 005894 0062+02 8/8 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80379234 = ""; -SECTION_DEAD static char const* const stringBase_80379235 = "F_SP108"; -SECTION_DEAD static char const* const stringBase_8037923D = "合成アイテム不定＝＝＝＞%d, %d\n"; -SECTION_DEAD static char const* const stringBase_8037925D = "Write size:%d\n"; -SECTION_DEAD static char const* const stringBase_8037926C = "SAVE size:%d\n"; -SECTION_DEAD static char const* const stringBase_8037927A = "LOAD size:%d\n"; -SECTION_DEAD static char const* const stringBase_80379288 = "INIT size:%d\n"; -/* @stringBase0 padding */ -SECTION_DEAD static char const* const pad_80379296 = "\0"; -#pragma pop +/* 80379234-80379234 005894 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/save/d_save_HIO.cpp b/src/d/save/d_save_HIO.cpp index 429d030d0e6..7194c85059b 100644 --- a/src/d/save/d_save_HIO.cpp +++ b/src/d/save/d_save_HIO.cpp @@ -715,7 +715,7 @@ asm void __sinit_d_save_HIO_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_8025C5FC = (void*)__sinit_d_save_HIO_cpp; +REGISTER_CTORS(0x8025C5FC, __sinit_d_save_HIO_cpp); #pragma pop /* 8025C6FC-8025C874 25703C 0178+00 2/1 0/0 0/0 .text __dt__12dSvBit_HIO_cFv */ diff --git a/src/d/shop/d_shop_system.cpp b/src/d/shop/d_shop_system.cpp index 44681fd1962..2e6b68c1c77 100644 --- a/src/d/shop/d_shop_system.cpp +++ b/src/d/shop/d_shop_system.cpp @@ -25,14 +25,14 @@ struct daNpcT_faceMotionAnmData_c {}; struct J3DModel {}; +struct J3DJoint {}; + struct Vec {}; struct cXyz { /* 80266B34 */ void operator-(Vec const&) const; }; -struct J3DJoint {}; - struct daNpcT_c { /* 801490D4 */ void ctrlBtk(); /* 8014951C */ void ctrlJoint(J3DJoint*, J3DModel*); @@ -94,12 +94,6 @@ struct dSv_memBit_c { /* 80034860 */ void isSwitch(int) const; }; -struct dMsgFlow_c { - /* 8024A2D8 */ void doFlow(fopAc_ac_c*, fopAc_ac_c**, int); - /* 8024A528 */ void getEventId(int*); - /* 8024B2C0 */ void query005(mesg_flow_node_branch*, fopAc_ac_c*, int); -}; - struct STControl { /* 80032088 */ void setWaitParm(s16, s16, s16, s16, f32, f32, s16, s16); /* 800320AC */ void init(); @@ -110,6 +104,12 @@ struct STControl { /* 800325A0 */ void checkDownTrigger(); }; +struct dMsgFlow_c { + /* 8024A2D8 */ void doFlow(fopAc_ac_c*, fopAc_ac_c**, int); + /* 8024A528 */ void getEventId(int*); + /* 8024B2C0 */ void query005(mesg_flow_node_branch*, fopAc_ac_c*, int); +}; + struct dShopSystem_c { /* 80197338 */ void initShopSystem(); /* 801974E4 */ ~dShopSystem_c(); @@ -1118,6 +1118,12 @@ asm void dShopSystem_c::itemRotate() { #pragma pop /* ############################################################################################## */ +/* 80394C10-80394C10 021270 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80394C10 = "R_SP01"; +#pragma pop + /* 80453B24-80453B28 002124 0004+00 1/1 0/0 0/0 .sdata2 @5000 */ SECTION_SDATA2 static f32 lit_5000 = -25.0f; @@ -1511,7 +1517,7 @@ asm void __sinit_d_shop_system_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_8019ABB0 = (void*)__sinit_d_shop_system_cpp; +REGISTER_CTORS(0x8019ABB0, __sinit_d_shop_system_cpp); #pragma pop /* 8019ACE0-8019ACE8 195620 0008+00 1/0 0/0 0/0 .text @@ -1531,14 +1537,25 @@ bool dShopSystem_c::getResName2(int param_0) { return false; } -/* 80394C10-80394C28 021270 0016+02 1/1 0/0 0/0 .rodata @stringBase0 */ +/* ############################################################################################## */ +/* 80394C17-80394C1C 021277 0005+00 0/0 0/0 0/0 .rodata None */ #pragma push #pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80394C10 = "R_SP01"; SECTION_DEAD static char const* const stringBase_80394C17 = ".bck"; +#pragma pop + +/* 80394C1C-80394C21 02127C 0005+00 0/0 0/0 0/0 .rodata None */ +#pragma push +#pragma force_active on SECTION_DEAD static char const* const stringBase_80394C1C = ".btp"; +#pragma pop + +/* 80394C21-80394C28 021281 0005+02 0/0 0/0 0/0 .rodata None */ +#pragma push +#pragma force_active on SECTION_DEAD static char const* const stringBase_80394C21 = ".btk"; /* @stringBase0 padding */ SECTION_DEAD static char const* const pad_80394C26 = "\0"; #pragma pop + +/* 80394C10-80394C10 021270 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/f_ap/f_ap_game.cpp b/src/f_ap/f_ap_game.cpp index 446bdc09c2a..30263ba138d 100644 --- a/src/f_ap/f_ap_game.cpp +++ b/src/f_ap/f_ap_game.cpp @@ -135,5 +135,5 @@ asm void __sinit_f_ap_game_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80018B28 = (void*)__sinit_f_ap_game_cpp; +REGISTER_CTORS(0x80018B28, __sinit_f_ap_game_cpp); #pragma pop diff --git a/src/f_op/f_op_actor_iter.cpp b/src/f_op/f_op_actor_iter.cpp index 30c9da98131..0fa11e9bc0d 100644 --- a/src/f_op/f_op_actor_iter.cpp +++ b/src/f_op/f_op_actor_iter.cpp @@ -4,10 +4,10 @@ // #include "f_op/f_op_actor_iter.h" -#include "dol2asm.h" -#include "dolphin/types.h" #include "SSystem/SComponent/c_list_iter.h" #include "SSystem/SComponent/c_tag_iter.h" +#include "dol2asm.h" +#include "dolphin/types.h" #include "f_op/f_op_actor_tag.h" extern node_list_class g_fopAcTg_Queue; diff --git a/src/f_op/f_op_actor_mng.cpp b/src/f_op/f_op_actor_mng.cpp index e431eaa371f..74eb5fcb11b 100644 --- a/src/f_op/f_op_actor_mng.cpp +++ b/src/f_op/f_op_actor_mng.cpp @@ -97,14 +97,14 @@ struct dKy_tevstr_c {}; struct cBgS_PolyInfo {}; -struct _GXColor {}; - struct csXyz { /* 802673F4 */ csXyz(s16, s16, s16); static u8 Zero[4]; }; +struct _GXColor {}; + struct dPa_control_c { struct level_c { /* 8004B918 */ void getEmitter(u32); @@ -122,7 +122,6 @@ struct dEvt_control_c { /* 80041668 */ void order(u16, u16, u16, u16, void*, void*, s16, u8); /* 800432EC */ void convPId(unsigned int); /* 80043500 */ void searchMapEventData(u8, s32); - /* 80043724 */ void setGtItm(u8); }; struct dEvent_manager_c { @@ -506,7 +505,7 @@ extern "C" extern u8 data_80451164[4]; #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void fopAcM_FastCreate(s16 param_0, int (*)(void*), void* param_2, void* param_3) { +asm void fopAcM_FastCreate(s16 param_0, int (*param_1)(void*), void* param_2, void* param_3) { nofralloc #include "asm/f_op/f_op_actor_mng/fopAcM_FastCreate__FsPFPv_iPvPv.s" } @@ -584,6 +583,13 @@ static void fopAcM_Log(fopAc_ac_c const* param_0, char const* param_1) { /* empty function */ } +/* ############################################################################################## */ +/* 803788C8-803788C8 004F28 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_803788C8 = "アクターの削除"; +#pragma pop + /* 80019C7C-80019CB8 0145BC 003C+00 0/0 10/10 483/483 .text fopAcM_delete__FP10fopAc_ac_c */ #pragma push @@ -612,7 +618,7 @@ asm void fopAcM_delete(unsigned int param_0) { #pragma optimizewithasm off static asm void fopAcM_create(s16 param_0, u16 param_1, u32 param_2, cXyz const* param_3, int param_4, csXyz const* param_5, cXyz const* param_6, s8 param_7, - int (*)(void*)) { + int (*param_8)(void*)) { nofralloc #include "asm/f_op/f_op_actor_mng/fopAcM_create__FsUsUlPC4cXyziPC5csXyzPC4cXyzScPFPv_i.s" } @@ -636,8 +642,8 @@ asm void fopAcM_create(s16 param_0, u32 param_1, cXyz const* param_2, int param_ #pragma optimization_level 0 #pragma optimizewithasm off asm void fopAcM_fastCreate(s16 param_0, u32 param_1, cXyz const* param_2, int param_3, - csXyz const* param_4, cXyz const* param_5, s8 param_6, int (*)(void*), - void* param_8) { + csXyz const* param_4, cXyz const* param_5, s8 param_6, + int (*param_7)(void*), void* param_8) { nofralloc #include "asm/f_op/f_op_actor_mng/fopAcM_fastCreate__FsUlPC4cXyziPC5csXyzPC4cXyzScPFPv_iPv.s" } @@ -649,7 +655,7 @@ asm void fopAcM_fastCreate(s16 param_0, u32 param_1, cXyz const* param_2, int pa #pragma optimization_level 0 #pragma optimizewithasm off asm void fopAcM_fastCreate(char const* param_0, u32 param_1, cXyz const* param_2, int param_3, - csXyz const* param_4, cXyz const* param_5, int (*)(void*), + csXyz const* param_4, cXyz const* param_5, int (*param_6)(void*), void* param_7) { nofralloc #include "asm/f_op/f_op_actor_mng/fopAcM_fastCreate__FPCcUlPC4cXyziPC5csXyzPC4cXyzPFPv_iPv.s" @@ -663,7 +669,7 @@ asm void fopAcM_fastCreate(char const* param_0, u32 param_1, cXyz const* param_2 #pragma optimizewithasm off asm void fopAcM_createChild(s16 param_0, unsigned int param_1, u32 param_2, cXyz const* param_3, int param_4, csXyz const* param_5, cXyz const* param_6, s8 param_7, - int (*)(void*)) { + int (*param_8)(void*)) { nofralloc #include "asm/f_op/f_op_actor_mng/fopAcM_createChild__FsUiUlPC4cXyziPC5csXyzPC4cXyzScPFPv_i.s" } @@ -676,12 +682,21 @@ asm void fopAcM_createChild(s16 param_0, unsigned int param_1, u32 param_2, cXyz #pragma optimizewithasm off asm void fopAcM_createChildFromOffset(s16 param_0, unsigned int param_1, u32 param_2, cXyz const* param_3, int param_4, csXyz const* param_5, - cXyz const* param_6, s8 param_7, int (*)(void*)) { + cXyz const* param_6, s8 param_7, int (*param_8)(void*)) { nofralloc #include "asm/f_op/f_op_actor_mng/fopAcM_createChildFromOffset__FsUiUlPC4cXyziPC5csXyzPC4cXyzScPFPv_i.s" } #pragma pop +/* ############################################################################################## */ +/* 803788C8-803788C8 004F28 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_803788D7 = "アクターのヒープの生成"; +SECTION_DEAD static char const* const stringBase_803788EE = "fopAcM_createHeap 確保失敗\n"; +SECTION_DEAD static char const* const stringBase_8037890A = "アクターのヒープの破壊"; +#pragma pop + /* 8001A138-8001A188 014A78 0050+00 0/0 1/1 1/1 .text fopAcM_DeleteHeap__FP10fopAc_ac_c */ #pragma push @@ -698,13 +713,32 @@ asm void fopAcM_DeleteHeap(fopAc_ac_c* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -static asm void fopAcM_callCallback(fopAc_ac_c* param_0, int (*)(fopAc_ac_c*), JKRHeap* param_2) { +static asm void fopAcM_callCallback(fopAc_ac_c* param_0, int (*param_1)(fopAc_ac_c*), + JKRHeap* param_2) { nofralloc #include "asm/f_op/f_op_actor_mng/fopAcM_callCallback__FP10fopAc_ac_cPFP10fopAc_ac_c_iP7JKRHeap.s" } #pragma pop /* ############################################################################################## */ +/* 803788C8-803788C8 004F28 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80378921 = + "見積もりヒープサイズ(%08x)で登録失敗しました。%08x[%s]\n"; +SECTION_DEAD static char const* const stringBase_80378959 = + "見積もりヒープが確保できませんでした。 %08x [%s]\n"; +SECTION_DEAD static char const* const stringBase_8037898B = + "最大空きヒープサイズで確保失敗。[%s]\n"; +SECTION_DEAD static char const* const stringBase_803789B1 = + "最大空きヒープサイズで登録失敗。%08x[%s]\n"; +SECTION_DEAD static char const* const stringBase_803789DB = "ぴったりサイズで、登録失敗？(バグ)\n"; +SECTION_DEAD static char const* const stringBase_803789FF = "ばぐばぐです\n"; +SECTION_DEAD static char const* const stringBase_80378A0D = "緊急回避措置\n"; +SECTION_DEAD static char const* const stringBase_80378A1B = + "fopAcM_entrySolidHeap だめでした [%s]\n"; +#pragma pop + /* 80450CC8-80450CCC -00001 0004+00 2/2 0/0 0/0 .sbss None */ /* 80450CC8 0001+00 data_80450CC8 None */ /* 80450CC9 0003+00 data_80450CC9 None */ @@ -715,7 +749,8 @@ static u8 struct_80450CC8[4]; #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -static asm void fopAcM_entrySolidHeap_(fopAc_ac_c* param_0, int (*)(fopAc_ac_c*), u32 param_2) { +static asm void fopAcM_entrySolidHeap_(fopAc_ac_c* param_0, int (*param_1)(fopAc_ac_c*), + u32 param_2) { nofralloc #include "asm/f_op/f_op_actor_mng/fopAcM_entrySolidHeap___FP10fopAc_ac_cPFP10fopAc_ac_c_iUl.s" } @@ -726,7 +761,7 @@ static asm void fopAcM_entrySolidHeap_(fopAc_ac_c* param_0, int (*)(fopAc_ac_c*) #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void fopAcM_entrySolidHeap(fopAc_ac_c* param_0, int (*)(fopAc_ac_c*), u32 param_2) { +asm void fopAcM_entrySolidHeap(fopAc_ac_c* param_0, int (*param_1)(fopAc_ac_c*), u32 param_2) { nofralloc #include "asm/f_op/f_op_actor_mng/fopAcM_entrySolidHeap__FP10fopAc_ac_cPFP10fopAc_ac_c_iUl.s" } @@ -951,13 +986,13 @@ asm void fopAcM_rollPlayerCrash(fopAc_ac_c const* param_0, f32 param_1, u32 para SECTION_RODATA static u8 const lit_4932[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80378880, &lit_4932); +COMPILER_STRIP_GATE(0x80378880, &lit_4932); /* 8037888C-80378898 004EEC 000C+00 1/1 0/0 0/0 .rodata @4933 */ SECTION_RODATA static u8 const lit_4933[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(8037888C, &lit_4933); +COMPILER_STRIP_GATE(0x8037888C, &lit_4933); /* 8001AC40-8001ACEC 015580 00AC+00 0/0 0/0 2/2 .text fopAcM_checkCullingBox__FPA4_fffffff */ #pragma push @@ -1402,7 +1437,7 @@ SECTION_SDATA2 static f32 lit_5812 = 1.0f / 5.0f; #pragma optimizewithasm off asm void fopAcM_fastCreateItem(cXyz const* param_0, int param_1, int param_2, csXyz const* param_3, cXyz const* param_4, f32* param_5, f32* param_6, int param_7, - int param_8, int (*)(void*)) { + int param_8, int (*param_9)(void*)) { nofralloc #include "asm/f_op/f_op_actor_mng/fopAcM_fastCreateItem__FPC4cXyziiPC5csXyzPC4cXyzPfPfiiPFPv_i.s" } @@ -1670,7 +1705,7 @@ SECTION_RODATA static u8 const mtx_adj[48] = { 0x00, 0x00, 0x00, 0x00, 0xBF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80378898, &mtx_adj); +COMPILER_STRIP_GATE(0x80378898, &mtx_adj); /* 8001D42C-8001D5A4 017D6C 0178+00 0/0 3/3 40/40 .text * fopAcM_setEffectMtx__FPC10fopAc_ac_cPC12J3DModelData */ @@ -1683,6 +1718,15 @@ asm void fopAcM_setEffectMtx(fopAc_ac_c const* param_0, J3DModelData const* para } #pragma pop +/* ############################################################################################## */ +/* 803788C8-803788C8 004F28 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80378A42 = "UNKOWN"; +/* @stringBase0 padding */ +SECTION_DEAD static char const* const pad_80378A49 = "\0\0\0\0\0\0"; +#pragma pop + /* 8001D5A4-8001D5EC 017EE4 0048+00 1/1 0/0 0/0 .text fopAcM_getProcNameString__FPC10fopAc_ac_c */ #pragma push #pragma optimization_level 0 @@ -1958,7 +2002,7 @@ asm void __sinit_f_op_actor_mng_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_8001DE14 = (void*)__sinit_f_op_actor_mng_cpp; +REGISTER_CTORS(0x8001DE14, __sinit_f_op_actor_mng_cpp); #pragma pop /* 8001DF30-8001DFA8 018870 0078+00 5/4 0/0 0/0 .text __dt__11dBgS_WtrChkFv */ @@ -2116,28 +2160,4 @@ s32 daPy_py_c::getGrabActorID() const { return -1; } -/* 803788C8-80378A50 004F28 0181+07 5/5 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_803788C8 = "アクターの削除"; -SECTION_DEAD static char const* const stringBase_803788D7 = "アクターのヒープの生成"; -SECTION_DEAD static char const* const stringBase_803788EE = "fopAcM_createHeap 確保失敗\n"; -SECTION_DEAD static char const* const stringBase_8037890A = "アクターのヒープの破壊"; -SECTION_DEAD static char const* const stringBase_80378921 = - "見積もりヒープサイズ(%08x)で登録失敗しました。%08x[%s]\n"; -SECTION_DEAD static char const* const stringBase_80378959 = - "見積もりヒープが確保できませんでした。 %08x [%s]\n"; -SECTION_DEAD static char const* const stringBase_8037898B = - "最大空きヒープサイズで確保失敗。[%s]\n"; -SECTION_DEAD static char const* const stringBase_803789B1 = - "最大空きヒープサイズで登録失敗。%08x[%s]\n"; -SECTION_DEAD static char const* const stringBase_803789DB = "ぴったりサイズで、登録失敗？(バグ)\n"; -SECTION_DEAD static char const* const stringBase_803789FF = "ばぐばぐです\n"; -SECTION_DEAD static char const* const stringBase_80378A0D = "緊急回避措置\n"; -SECTION_DEAD static char const* const stringBase_80378A1B = - "fopAcM_entrySolidHeap だめでした [%s]\n"; -SECTION_DEAD static char const* const stringBase_80378A42 = "UNKOWN"; -/* @stringBase0 padding */ -SECTION_DEAD static char const* const pad_80378A49 = "\0\0\0\0\0\0"; -#pragma pop +/* 803788C8-803788C8 004F28 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/f_op/f_op_actor_tag.cpp b/src/f_op/f_op_actor_tag.cpp index 47a25e78d70..504c7680287 100644 --- a/src/f_op/f_op_actor_tag.cpp +++ b/src/f_op/f_op_actor_tag.cpp @@ -4,9 +4,9 @@ // #include "f_op/f_op_actor_tag.h" +#include "SSystem/SComponent/c_tag.h" #include "dol2asm.h" #include "dolphin/types.h" -#include "SSystem/SComponent/c_tag.h" // // Declarations: diff --git a/src/f_op/f_op_kankyo_mng.cpp b/src/f_op/f_op_kankyo_mng.cpp index 6968d632bc2..7d06e88c755 100644 --- a/src/f_op/f_op_kankyo_mng.cpp +++ b/src/f_op/f_op_kankyo_mng.cpp @@ -15,13 +15,13 @@ struct layer_class {}; struct dPa_levelEcallBack {}; -struct cXyz {}; - struct dKy_tevstr_c {}; +struct csXyz {}; + struct _GXColor {}; -struct csXyz {}; +struct cXyz {}; struct dPa_control_c { /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, @@ -110,7 +110,7 @@ asm void fopKyM_Delete(void* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -static asm void fopKyM_Create(s16 param_0, int (*)(void*), void* param_2) { +static asm void fopKyM_Create(s16 param_0, int (*param_1)(void*), void* param_2) { nofralloc #include "asm/f_op/f_op_kankyo_mng/fopKyM_Create__FsPFPv_iPv.s" } @@ -120,7 +120,8 @@ static asm void fopKyM_Create(s16 param_0, int (*)(void*), void* param_2) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void fopKyM_create(s16 param_0, int param_1, cXyz* param_2, cXyz* param_3, int (*)(void*)) { +asm void fopKyM_create(s16 param_0, int param_1, cXyz* param_2, cXyz* param_3, + int (*param_4)(void*)) { nofralloc #include "asm/f_op/f_op_kankyo_mng/fopKyM_create__FsiP4cXyzP4cXyzPFPv_i.s" } @@ -130,7 +131,8 @@ asm void fopKyM_create(s16 param_0, int param_1, cXyz* param_2, cXyz* param_3, i #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void fopKyM_fastCreate(s16 param_0, int param_1, cXyz* param_2, cXyz* param_3, int (*)(void*)) { +asm void fopKyM_fastCreate(s16 param_0, int param_1, cXyz* param_2, cXyz* param_3, + int (*param_4)(void*)) { nofralloc #include "asm/f_op/f_op_kankyo_mng/fopKyM_fastCreate__FsiP4cXyzP4cXyzPFPv_i.s" } diff --git a/src/f_op/f_op_msg_mng.cpp b/src/f_op/f_op_msg_mng.cpp index 4fc9ce5d9d3..b4a20a12c53 100644 --- a/src/f_op/f_op_msg_mng.cpp +++ b/src/f_op/f_op_msg_mng.cpp @@ -213,7 +213,7 @@ static asm void createTimerAppend(int param_0, u32 param_1, u8 param_2, u8 param #pragma optimization_level 0 #pragma optimizewithasm off asm void fopMsgM_create(s16 param_0, fopAc_ac_c* param_1, cXyz* param_2, u32* param_3, u32* param_4, - int (*)(void*)) { + int (*param_5)(void*)) { nofralloc #include "asm/f_op/f_op_msg_mng/fopMsgM_create__FsP10fopAc_ac_cP4cXyzPUlPUlPFPv_i.s" } @@ -224,7 +224,7 @@ asm void fopMsgM_create(s16 param_0, fopAc_ac_c* param_1, cXyz* param_2, u32* pa #pragma optimization_level 0 #pragma optimizewithasm off asm void fop_Timer_create(s16 param_0, u8 param_1, u32 param_2, u8 param_3, u8 param_4, f32 param_5, - f32 param_6, f32 param_7, f32 param_8, int (*)(void*)) { + f32 param_6, f32 param_7, f32 param_8, int (*param_9)(void*)) { nofralloc #include "asm/f_op/f_op_msg_mng/fop_Timer_create__FsUcUlUcUcffffPFPv_i.s" } @@ -292,21 +292,16 @@ asm void fopMsgM_setMessageID(unsigned int param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void fopMsgM_Create(s16 param_0, int (*)(void*), void* param_2) { +asm void fopMsgM_Create(s16 param_0, int (*param_1)(void*), void* param_2) { nofralloc #include "asm/f_op/f_op_msg_mng/fopMsgM_Create__FsPFPv_iPv.s" } #pragma pop -/* 80020158-80020160 01AA98 0008+00 0/0 5/0 0/0 .text setAlpha__7J2DPaneFUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DPane::setAlpha(u8 param_0) { - nofralloc -#include "asm/f_op/f_op_msg_mng/setAlpha__7J2DPaneFUc.s" +/* 80020158-80020160 -00001 0008+00 0/0 0/0 0/0 .text setAlpha__7J2DPaneFUc */ +void J2DPane::setAlpha(u8 param_0) { + *(u8*)(((u8*)this) + 178) /* this->field_0xb2 */ = (u8)(param_0); } -#pragma pop /* ############################################################################################## */ /* 803A3970-803A3990 -00001 001C+04 1/1 0/0 0/0 .data @4305 */ diff --git a/src/f_op/f_op_overlap_mng.cpp b/src/f_op/f_op_overlap_mng.cpp index ad9018b06c6..7b284f5f3b3 100644 --- a/src/f_op/f_op_overlap_mng.cpp +++ b/src/f_op/f_op_overlap_mng.cpp @@ -4,9 +4,9 @@ // #include "f_op/f_op_overlap_mng.h" +#include "SSystem/SComponent/c_request.h" #include "dol2asm.h" #include "dolphin/types.h" -#include "SSystem/SComponent/c_request.h" #include "f_op/f_op_overlap_req.h" #include "f_op/f_op_scene_pause.h" #include "f_pc/f_pc_executor.h" @@ -108,8 +108,9 @@ int fopOvlpM_IsDoingReq(void) { /* 8001E5D0-8001E604 018F10 0034+00 0/0 1/1 0/0 .text fopOvlpM_ClearOfReq__Fv */ int fopOvlpM_ClearOfReq(void) { - return l_fopOvlpM_overlap[0] ? fopOvlpReq_OverlapClr((overlap_request_class*)l_fopOvlpM_overlap[0]) : - 0; + return l_fopOvlpM_overlap[0] ? + fopOvlpReq_OverlapClr((overlap_request_class*)l_fopOvlpM_overlap[0]) : + 0; } /* ############################################################################################## */ diff --git a/src/f_op/f_op_overlap_req.cpp b/src/f_op/f_op_overlap_req.cpp index 689005a448f..4f103544ea6 100644 --- a/src/f_op/f_op_overlap_req.cpp +++ b/src/f_op/f_op_overlap_req.cpp @@ -4,11 +4,11 @@ // #include "f_op/f_op_overlap_req.h" +#include "dol2asm.h" +#include "dolphin/types.h" #include "f_pc/f_pc_executor.h" #include "f_pc/f_pc_manager.h" #include "f_pc/f_pc_stdcreate_req.h" -#include "dol2asm.h" -#include "dolphin/types.h" // // Forward References: diff --git a/src/f_op/f_op_scene_iter.cpp b/src/f_op/f_op_scene_iter.cpp index cf88f1ccf00..42e2be7be2e 100644 --- a/src/f_op/f_op_scene_iter.cpp +++ b/src/f_op/f_op_scene_iter.cpp @@ -4,11 +4,11 @@ // #include "f_op/f_op_scene_iter.h" -#include "dol2asm.h" -#include "dolphin/types.h" #include "SSystem/SComponent/c_list.h" #include "SSystem/SComponent/c_list_iter.h" #include "SSystem/SComponent/c_tag_iter.h" +#include "dol2asm.h" +#include "dolphin/types.h" #include "f_op/f_op_scene_tag.h" // diff --git a/src/f_op/f_op_scene_mng.cpp b/src/f_op/f_op_scene_mng.cpp index 915072ef598..a71b3d7e487 100644 --- a/src/f_op/f_op_scene_mng.cpp +++ b/src/f_op/f_op_scene_mng.cpp @@ -4,11 +4,11 @@ // #include "f_op/f_op_scene_mng.h" +#include "dol2asm.h" +#include "dolphin/types.h" #include "f_op/f_op_scene_iter.h" #include "f_op/f_op_scene_req.h" #include "f_pc/f_pc_searcher.h" -#include "dol2asm.h" -#include "dolphin/types.h" // // Declarations: diff --git a/src/f_op/f_op_scene_pause.cpp b/src/f_op/f_op_scene_pause.cpp index 0abc80501dc..05770967b0b 100644 --- a/src/f_op/f_op_scene_pause.cpp +++ b/src/f_op/f_op_scene_pause.cpp @@ -4,10 +4,10 @@ // #include "f_op/f_op_scene_pause.h" -#include "f_pc/f_pc_executor.h" -#include "f_pc/f_pc_manager.h" #include "dol2asm.h" #include "dolphin/types.h" +#include "f_pc/f_pc_executor.h" +#include "f_pc/f_pc_manager.h" // // Declarations: diff --git a/src/init.cpp b/src/init.cpp index 13d1719409a..b135d31fb51 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -27,7 +27,7 @@ struct daBgObj_c { SECTION_INIT void __check_pad3(); SECTION_INIT void __set_debug_bba(); -SECTION_INIT void __get_debug_bba(); +SECTION_INIT u8 __get_debug_bba(); SECTION_INIT void __start(); SECTION_INIT void __init_registers(); SECTION_INIT void __init_data(); @@ -89,15 +89,10 @@ SECTION_INIT asm void __set_debug_bba() { } #pragma pop -/* 8000314C-80003154 00004C 0008+00 1/1 0/0 0/0 .init __get_debug_bba */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -SECTION_INIT asm void __get_debug_bba() { - nofralloc -#include "asm/init/__get_debug_bba.s" +/* 8000314C-80003154 -00001 0008+00 0/0 0/0 0/0 .init __get_debug_bba */ +SECTION_INIT u8 __get_debug_bba() { + return *(u8*)(&data_804516D0); } -#pragma pop /* 80003154-800032B0 000054 015C+00 0/0 1/0 0/0 .init __start */ #pragma push diff --git a/src/m_Do/m_Do_MemCard.cpp b/src/m_Do/m_Do_MemCard.cpp index 81fbb9868ff..abf3f81cbba 100644 --- a/src/m_Do/m_Do_MemCard.cpp +++ b/src/m_Do/m_Do_MemCard.cpp @@ -176,6 +176,15 @@ asm void mDoMemCd_Ctrl_c::load() { } #pragma pop +/* ############################################################################################## */ +/* 803743F8-803743F8 000A58 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_803743F8 = "gczelda2"; +/* @stringBase0 padding */ +SECTION_DEAD static char const* const pad_80374401 = "\0\0\0\0\0\0"; +#pragma pop + /* 80016A0C-80016AB0 01134C 00A4+00 1/1 0/0 0/0 .text restore__15mDoMemCd_Ctrl_cFv */ #pragma push #pragma optimization_level 0 @@ -408,14 +417,7 @@ asm void __sinit_m_Do_MemCard_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80017470 = (void*)__sinit_m_Do_MemCard_cpp; +REGISTER_CTORS(0x80017470, __sinit_m_Do_MemCard_cpp); #pragma pop -/* 803743F8-80374408 000A58 0009+07 3/3 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_803743F8 = "gczelda2"; -/* @stringBase0 padding */ -SECTION_DEAD static char const* const pad_80374401 = "\0\0\0\0\0\0"; -#pragma pop +/* 803743F8-803743F8 000A58 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/m_Do/m_Do_MemCardRWmng.cpp b/src/m_Do/m_Do_MemCardRWmng.cpp index d8ce2425d14..4b54218bd36 100644 --- a/src/m_Do/m_Do_MemCardRWmng.cpp +++ b/src/m_Do/m_Do_MemCardRWmng.cpp @@ -79,6 +79,18 @@ asm void mDoMemCdRWm_Restore(CARDFileInfo* param_0, void* param_1, u32 param_2) } #pragma pop +/* ############################################################################################## */ +/* 80374408-80374408 000A68 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80374408 = "Zelda: Twilight Princess"; +SECTION_DEAD static char const* const stringBase_80374421 = "%d/%d Save Data"; +SECTION_DEAD static char const* const stringBase_80374431 = "zelda2_gc_banner.bti"; +SECTION_DEAD static char const* const stringBase_80374446 = "zelda2_gc_icon.bti"; +/* @stringBase0 padding */ +SECTION_DEAD static char const* const pad_80374459 = "\0\0\0\0\0\0"; +#pragma pop + /* 8001787C-800179E4 0121BC 0168+00 1/1 0/0 0/0 .text * mDoMemCdRWm_BuildHeader__FP22mDoMemCdRWm_HeaderData */ #pragma push @@ -151,14 +163,4 @@ asm void mDoMemCdRWm_SetCheckSumGameData(u8* param_0, u8 param_1) { } #pragma pop -/* 80374408-80374460 000A68 0051+07 1/1 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80374408 = "Zelda: Twilight Princess"; -SECTION_DEAD static char const* const stringBase_80374421 = "%d/%d Save Data"; -SECTION_DEAD static char const* const stringBase_80374431 = "zelda2_gc_banner.bti"; -SECTION_DEAD static char const* const stringBase_80374446 = "zelda2_gc_icon.bti"; -/* @stringBase0 padding */ -SECTION_DEAD static char const* const pad_80374459 = "\0\0\0\0\0\0"; -#pragma pop +/* 80374408-80374408 000A68 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/m_Do/m_Do_Reset.cpp b/src/m_Do/m_Do_Reset.cpp index 5ebec41b356..b773c544751 100644 --- a/src/m_Do/m_Do_Reset.cpp +++ b/src/m_Do/m_Do_Reset.cpp @@ -12,7 +12,7 @@ // struct mDoRst { - /* 800157F4 */ void getResetData(); + /* 800157F4 */ u32 getResetData(); static u8 mResetData[4 + 4 /* padding */]; }; @@ -44,10 +44,6 @@ struct JASTaskThread { /* 8028FE88 */ void pause(bool); }; -struct JASDvd { - /* 8028FEFC */ void getThreadPointer(); -}; - // // Forward References: // @@ -56,7 +52,7 @@ extern "C" static void my_OSCancelAlarmAll__Fv(); extern "C" static void destroyVideo__Fv(); extern "C" void mDoRst_reset__FiUli(); extern "C" void mDoRst_resetCallBack__FiPv(); -extern "C" void getResetData__6mDoRstFv(); +extern "C" u32 getResetData__6mDoRstFv(); extern "C" extern char const* const m_Do_m_Do_Reset__stringBase0; extern "C" u8 mResetData__6mDoRst[4 + 4 /* padding */]; extern "C" extern u8 struct_80450C80[8]; @@ -123,7 +119,13 @@ static asm void destroyVideo() { #pragma pop /* ############################################################################################## */ -/* 80450C78-80450C80 000178 0004+04 3/3 42/42 2/2 .sbss mResetData__6mDoRst */ +/* 80374198-80374198 0007F8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80374198 = "DVD_STATE_BUSY\n"; +#pragma pop + +/* 80450C78-80450C80 000178 0004+04 3/2 42/42 2/2 .sbss mResetData__6mDoRst */ u8 mDoRst::mResetData[4 + 4 /* padding */]; /* 80015614-8001574C 00FF54 0138+00 0/0 3/3 0/0 .text mDoRst_reset__FiUli */ @@ -146,15 +148,10 @@ asm void mDoRst_resetCallBack(int param_0, void* param_1) { } #pragma pop -/* 800157F4-800157FC 010134 0008+00 1/1 0/0 0/0 .text getResetData__6mDoRstFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void mDoRst::getResetData() { - nofralloc -#include "asm/m_Do/m_Do_Reset/getResetData__6mDoRstFv.s" +/* 800157F4-800157FC -00001 0008+00 0/0 0/0 0/0 .text getResetData__6mDoRstFv */ +u32 mDoRst::getResetData() { + return *(u32*)(&mDoRst::mResetData); } -#pragma pop /* ############################################################################################## */ /* 80450C80-80450C88 -00001 0008+00 0/0 6/6 0/0 .sbss None */ @@ -167,9 +164,4 @@ u8 struct_80450C80[8]; extern u8 data_80450C88[8]; u8 data_80450C88[8]; -/* 80374198-803741A8 0007F8 0010+00 1/1 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80374198 = "DVD_STATE_BUSY\n"; -#pragma pop +/* 80374198-80374198 0007F8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/m_Do/m_Do_audio.cpp b/src/m_Do/m_Do_audio.cpp index 5c957e48902..2958afff8f7 100644 --- a/src/m_Do/m_Do_audio.cpp +++ b/src/m_Do/m_Do_audio.cpp @@ -39,10 +39,6 @@ struct mDoAud_zelAudio_c { /* 80007368 */ ~mDoAud_zelAudio_c(); }; -struct Z2StatusMgr { - /* 802B6758 */ void setEventBit(void*); -}; - struct Z2SceneMgr { /* 802B697C */ void setFadeOutStart(u8); /* 802B6A18 */ void setFadeInStart(u8); @@ -58,9 +54,11 @@ struct Z2MultiSeMgr { /* 802AEB34 */ ~Z2MultiSeMgr(); }; -struct JAISoundHandle { - /* 80007838 */ ~JAISoundHandle(); - /* 802A2184 */ void releaseSound(); +struct JGeometry { + template + struct TVec3 {}; + /* TVec3 */ + struct TVec3__template0 {}; }; struct JKRSolidHeap { @@ -69,11 +67,9 @@ struct JKRSolidHeap { struct JAISoundID {}; -struct JGeometry { - template - struct TVec3 {}; - /* TVec3 */ - struct TVec3__template0 {}; +struct JAISoundHandle { + /* 80007838 */ ~JAISoundHandle(); + /* 802A2184 */ void releaseSound(); }; struct Z2AudioMgr { @@ -232,6 +228,17 @@ asm void mDoAud_zelAudio_c::reset() { #pragma pop /* ############################################################################################## */ +/* 80373D68-80373D68 0003C8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80373D68 = "/Audiores/Z2Sound.baa"; +SECTION_DEAD static char const* const stringBase_80373D7E = "/Audiores/Seqs/Z2SoundSeqs.arc"; +SECTION_DEAD static char const* const stringBase_80373D9D = + "ヒープ確保失敗につきオーディオ初期化できません\n"; +/* @stringBase0 padding */ +SECTION_DEAD static char const* const pad_80373DCD = "\0\0"; +#pragma pop + /* 803DBF40-803DBF4C 008C60 000C+00 1/1 0/1 0/0 .bss @3620 */ static u8 lit_3620[12]; @@ -348,7 +355,7 @@ asm void __sinit_m_Do_audio_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80007318 = (void*)__sinit_m_Do_audio_cpp; +REGISTER_CTORS(0x80007318, __sinit_m_Do_audio_cpp); #pragma pop /* 80007368-800073C8 001CA8 0060+00 1/1 0/0 0/0 .text __dt__17mDoAud_zelAudio_cFv */ @@ -412,14 +419,4 @@ asm JAISeCategoryMgr::~JAISeCategoryMgr() { } #pragma pop -/* 80373D68-80373DD0 0003C8 0065+03 1/1 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80373D68 = "/Audiores/Z2Sound.baa"; -SECTION_DEAD static char const* const stringBase_80373D7E = "/Audiores/Seqs/Z2SoundSeqs.arc"; -SECTION_DEAD static char const* const stringBase_80373D9D = - "ヒープ確保失敗につきオーディオ初期化できません\n"; -/* @stringBase0 padding */ -SECTION_DEAD static char const* const pad_80373DCD = "\0\0"; -#pragma pop +/* 80373D68-80373D68 0003C8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/m_Do/m_Do_controller_pad.cpp b/src/m_Do/m_Do_controller_pad.cpp index 27e87f39cfe..bcb3df73816 100644 --- a/src/m_Do/m_Do_controller_pad.cpp +++ b/src/m_Do/m_Do_controller_pad.cpp @@ -15,6 +15,8 @@ struct mDoRst { static u8 mResetData[4 + 4 /* padding */]; }; +struct interface_of_controller_pad {}; + struct JUTGamePad { struct EPadPort {}; @@ -35,8 +37,6 @@ struct JUTGamePad { static u8 sAnalogMode[4]; }; -struct interface_of_controller_pad {}; - struct mDoCPd_c { /* 80007954 */ void create(); /* 80007A94 */ void read(); diff --git a/src/m_Do/m_Do_dvd_thread.cpp b/src/m_Do/m_Do_dvd_thread.cpp index d16367ea628..be32126f175 100644 --- a/src/m_Do/m_Do_dvd_thread.cpp +++ b/src/m_Do/m_Do_dvd_thread.cpp @@ -105,10 +105,6 @@ struct JASTaskThread { /* 8028FB5C */ void sendCmdMsg(void (*)(void*), void const*, u32); }; -struct JASDvd { - /* 8028FEFC */ void getThreadPointer(); -}; - // // Forward References: // @@ -373,6 +369,14 @@ asm void mDoDvdThd_param_c::cut(mDoDvdThd_command_c* param_0) { } #pragma pop +/* ############################################################################################## */ +/* 803741A8-803741A8 000808 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_803741A8 = + "mDoDvdThd_param_c::mainLoop() コマンドの実行が失敗しました。\n"; +#pragma pop + /* 80015A90-80015AD8 0103D0 0048+00 1/1 0/0 0/0 .text cb__FPv */ #pragma push #pragma optimization_level 0 @@ -417,7 +421,7 @@ asm mDoDvdThd_callback_c::~mDoDvdThd_callback_c() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm mDoDvdThd_callback_c::mDoDvdThd_callback_c(void* (*)(void*), void* param_1) { +asm mDoDvdThd_callback_c::mDoDvdThd_callback_c(void* (*param_0)(void*), void* param_1) { nofralloc #include "asm/m_Do/m_Do_dvd_thread/__ct__20mDoDvdThd_callback_cFPFPv_PvPv.s" } @@ -427,7 +431,7 @@ asm mDoDvdThd_callback_c::mDoDvdThd_callback_c(void* (*)(void*), void* param_1) #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void mDoDvdThd_callback_c::create(void* (*)(void*), void* param_1) { +asm void mDoDvdThd_callback_c::create(void* (*param_0)(void*), void* param_1) { nofralloc #include "asm/m_Do/m_Do_dvd_thread/create__20mDoDvdThd_callback_cFPFPv_PvPv.s" } @@ -477,6 +481,29 @@ asm void mDoDvdThd_mountArchive_c::create(char const* param_0, u8 param_1, JKRHe } #pragma pop +/* ############################################################################################## */ +/* 803741A8-803741A8 000808 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_803741E6 = + "mDoDvdThd_mountArchive_c::execute マウント失敗\n"; +SECTION_DEAD static char const* const stringBase_80374216 = + "mDoDvdThd_mountArchive_c::execute ゼルダヒープで再チャレンジ！" + "\n"; +SECTION_DEAD static char const* const stringBase_80374256 = + "mDoDvdThd_mountArchive_c::execute アーカイブヒープで再チャレン" + "ジ！\n"; +SECTION_DEAD static char const* const stringBase_8037429A = + "mDoDvdThd_mountArchive_c::execute ゲームヒープで再チャレンジ！" + "\n"; +SECTION_DEAD static char const* const stringBase_803742DA = + "mDoDvdThd_mountArchive_c::execute J2Dヒープで再チャレンジ！" + "\n"; +SECTION_DEAD static char const* const stringBase_80374317 = + "mDoDvdThd_mountArchive_c::execute ヒープが致命的に足りません！" + "\n"; +#pragma pop + /* 80015EDC-80016108 01081C 022C+00 1/0 0/0 0/0 .text execute__24mDoDvdThd_mountArchive_cFv */ #pragma push #pragma optimization_level 0 @@ -586,34 +613,20 @@ asm void __sinit_m_Do_dvd_thread_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80016574 = (void*)__sinit_m_Do_dvd_thread_cpp; +REGISTER_CTORS(0x80016574, __sinit_m_Do_dvd_thread_cpp); #pragma pop -/* 803741A8-803743F8 000808 0250+00 2/2 0/0 0/0 .rodata @stringBase0 */ +/* ############################################################################################## */ +/* 80374357-8037438B 0009B7 0034+00 0/0 0/0 0/0 .rodata None */ #pragma push #pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_803741A8 = - "mDoDvdThd_param_c::mainLoop() コマンドの実行が失敗しました。\n"; -SECTION_DEAD static char const* const stringBase_803741E6 = - "mDoDvdThd_mountArchive_c::execute マウント失敗\n"; -SECTION_DEAD static char const* const stringBase_80374216 = - "mDoDvdThd_mountArchive_c::execute ゼルダヒープで再チャレンジ！" - "\n"; -SECTION_DEAD static char const* const stringBase_80374256 = - "mDoDvdThd_mountArchive_c::execute アーカイブヒープで再チャレン" - "ジ！\n"; -SECTION_DEAD static char const* const stringBase_8037429A = - "mDoDvdThd_mountArchive_c::execute ゲームヒープで再チャレンジ！" - "\n"; -SECTION_DEAD static char const* const stringBase_803742DA = - "mDoDvdThd_mountArchive_c::execute J2Dヒープで再チャレンジ！" - "\n"; -SECTION_DEAD static char const* const stringBase_80374317 = - "mDoDvdThd_mountArchive_c::execute ヒープが致命的に足りません！" - "\n"; SECTION_DEAD static char const* const stringBase_80374357 = "mDoDvdThd_getResource_c::create() クラス生成に失敗\n"; +#pragma pop + +/* 8037438B-803743C1 0009EB 0036+00 0/0 0/0 0/0 .rodata None */ +#pragma push +#pragma force_active on // MWCC ignores mapping of some japanese characters using the // byte 0x5C (ASCII '\'). This is why this string is hex-encoded. SECTION_DEAD static char const* const stringBase_8037438B = @@ -621,6 +634,11 @@ SECTION_DEAD static char const* const stringBase_8037438B = "\x3A\x3A\x63\x72\x65\x61\x74\x65\x28\x29\x20\x83\x8A\x83\x5C\x81\x5B\x83\x58\x8E\xE6\x93\xBE" "\x82\xC9" "\x8E\xB8\x94\x73\x0A"; +#pragma pop + +/* 803743C1-803743F8 000A21 0037+00 0/0 0/0 0/0 .rodata None */ +#pragma push +#pragma force_active on // MWCC ignores mapping of some japanese characters using the // byte 0x5C (ASCII '\'). This is why this string is hex-encoded. SECTION_DEAD static char const* const stringBase_803743C1 = @@ -629,3 +647,5 @@ SECTION_DEAD static char const* const stringBase_803743C1 = "\xBE\x82" "\xC9\x8E\xB8\x94\x73\x0A"; #pragma pop + +/* 803741A8-803741A8 000808 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/m_Do/m_Do_ext.cpp b/src/m_Do/m_Do_ext.cpp index e3cf8af0daa..580e0641b59 100644 --- a/src/m_Do/m_Do_ext.cpp +++ b/src/m_Do/m_Do_ext.cpp @@ -54,8 +54,8 @@ struct mDoExt_invJntPacket { }; struct J3DMaterialTable; -struct J3DAnmColor { - /* 8032A8A4 */ void searchUpdateMaterialID(J3DMaterialTable*); +struct J3DAnmTextureSRTKey { + /* 8032B0C0 */ void searchUpdateMaterialID(J3DMaterialTable*); }; struct J3DAnmTexPattern { @@ -66,8 +66,8 @@ struct J3DAnmTevRegKey { /* 8032B780 */ void searchUpdateMaterialID(J3DMaterialTable*); }; -struct J3DAnmTextureSRTKey { - /* 8032B0C0 */ void searchUpdateMaterialID(J3DMaterialTable*); +struct J3DAnmColor { + /* 8032A8A4 */ void searchUpdateMaterialID(J3DMaterialTable*); }; struct J3DMaterialTable { @@ -136,10 +136,10 @@ struct mDoExt_MtxCalcAnmBlendTbl { /* 80014F3C */ ~mDoExt_MtxCalcAnmBlendTbl(); }; -struct mDoExt_McaMorfCallBack2_c {}; - struct J3DTransformInfo {}; +struct mDoExt_McaMorfCallBack2_c {}; + struct mDoExt_McaMorfCallBack1_c {}; struct Z2Creature { @@ -212,11 +212,11 @@ struct mDoExt_3DlineMatSortPacket { /* 80014E20 */ ~mDoExt_3DlineMatSortPacket(); }; -struct dKy_tevstr_c {}; +struct ResTIMG {}; struct _GXColor {}; -struct ResTIMG {}; +struct dKy_tevstr_c {}; struct mDoExt_3DlineMat1_c { /* 80013360 */ void init(u16, u16, ResTIMG*, int); @@ -236,16 +236,16 @@ struct mDoExt_3DlineMat0_c { /* 80014E84 */ bool getMaterialID(); }; -struct J3DPacket; -struct J3DDrawBuffer { - /* 8032548C */ void entryImm(J3DPacket*, u16); -}; - +struct J3DDrawBuffer; struct J3DPacket { /* 8000E680 */ ~J3DPacket(); /* 80312750 */ bool entry(J3DDrawBuffer*); }; +struct J3DDrawBuffer { + /* 8032548C */ void entryImm(J3DPacket*, u16); +}; + struct dDlst_list_c { /* 800565EC */ void entryZSortXluDrawList(J3DDrawBuffer*, J3DPacket*, cXyz&); }; @@ -258,10 +258,10 @@ struct _GXBlendMode {}; struct _GXBlendFactor {}; -struct Z2SoundHandlePool {}; - struct JAISoundID {}; +struct Z2SoundHandlePool {}; + struct Z2SoundObjBase { /* 802BE038 */ void framework(u32, s8); /* 802BE070 */ void dispose(); @@ -374,14 +374,14 @@ struct J3DTevKColorAnm {}; struct J3DTevColorAnm {}; -struct J3DIndTevStage { - /* 8000E14C */ J3DIndTevStage(); -}; - struct J3DGXColorS10 { /* 8000E460 */ J3DGXColorS10(); }; +struct J3DIndTevStage { + /* 8000E14C */ J3DIndTevStage(); +}; + struct J3DGXColor { /* 8000E538 */ J3DGXColor(); }; @@ -428,10 +428,10 @@ struct J3DShape { static u8 sOldVcdVatCmd[4]; }; -struct J3DBlend {}; - struct J3DAlphaComp {}; +struct J3DBlend {}; + struct J3DPEBlock { /* 8000DBCC */ void patch(); /* 8000DF3C */ bool getZCompLoc() const; @@ -453,9 +453,9 @@ template struct J3DMtxCalcNoAnm {}; /* J3DMtxCalcNoAnm */ struct J3DMtxCalcNoAnm__template0 { - /* 8000FA20 */ void func_8000FA20(); - /* 8001505C */ void func_8001505C(Vec const&, f32 const (&)[3][4]); - /* 80015084 */ void func_80015084(); + /* 8000FA20 */ void func_8000FA20(void* _this); + /* 8001505C */ void func_8001505C(void* _this, Vec const&, f32 const (&)[3][4]); + /* 80015084 */ void func_80015084(void* _this); }; struct J3DMtxCalcJ3DSysInitMaya { @@ -477,10 +477,10 @@ struct J3DMtxCalcAnimation {}; /* J3DMtxCalcAnimation, * J3DMtxCalcJ3DSysInitMaya> */ struct J3DMtxCalcAnimation__template0 { - /* 8000D8E4 */ void func_8000D8E4(J3DAnmTransform*); - /* 80014FC8 */ void func_80014FC8(); - /* 80015034 */ void func_80015034(Vec const&, f32 const (&)[3][4]); - /* 800150AC */ void func_800150AC(); + /* 8000D8E4 */ void func_8000D8E4(void* _this, J3DAnmTransform*); + /* 80014FC8 */ void func_80014FC8(void* _this); + /* 80015034 */ void func_80015034(void* _this, Vec const&, f32 const (&)[3][4]); + /* 800150AC */ void func_800150AC(void* _this); }; struct J3DMtxCalc { @@ -573,7 +573,7 @@ extern "C" void entry__13mDoExt_btkAnmFP16J3DMaterialTablef(); extern "C" void init__13mDoExt_brkAnmFP16J3DMaterialTableP15J3DAnmTevRegKeyiifss(); extern "C" void entry__13mDoExt_brkAnmFP16J3DMaterialTablef(); extern "C" void init__13mDoExt_bckAnmFP15J3DAnmTransformiifssb(); -extern "C" void func_8000D8E4(J3DAnmTransform*); +extern "C" void func_8000D8E4(void* _this, J3DAnmTransform*); extern "C" void __dt__17J3DMtxCalcAnmBaseFv(); extern "C" void __dt__10J3DMtxCalcFv(); extern "C" void changeBckOnly__13mDoExt_bckAnmFP15J3DAnmTransform(); @@ -664,21 +664,21 @@ extern "C" void entryDL__21mDoExt_invisibleModelFP4cXyz(); extern "C" void mDoExt_setupShareTexture__FP12J3DModelDataP12J3DModelData(); extern "C" void mDoExt_setupStageTexture__FP12J3DModelData(); extern "C" void mDoExt_createAssertHeap__FP7JKRHeap(); -extern "C" void mDoExt_getAssertHeap__Fv(); +extern "C" u32 mDoExt_getAssertHeap__Fv(); extern "C" void mDoExt_createDbPrintHeap__FUlP7JKRHeap(); -extern "C" void mDoExt_getDbPrintHeap__Fv(); +extern "C" u32 mDoExt_getDbPrintHeap__Fv(); extern "C" void mDoExt_createGameHeap__FUlP7JKRHeap(); -extern "C" void mDoExt_getGameHeap__Fv(); +extern "C" u32 mDoExt_getGameHeap__Fv(); extern "C" void mDoExt_createZeldaHeap__FUlP7JKRHeap(); -extern "C" void mDoExt_getZeldaHeap__Fv(); +extern "C" u32 mDoExt_getZeldaHeap__Fv(); extern "C" void mDoExt_createCommandHeap__FUlP7JKRHeap(); -extern "C" void mDoExt_getCommandHeap__Fv(); +extern "C" u32 mDoExt_getCommandHeap__Fv(); extern "C" void mDoExt_createArchiveHeap__FUlP7JKRHeap(); -extern "C" void mDoExt_getArchiveHeap__Fv(); -extern "C" void mDoExt_getArchiveHeapPtr__Fv(); +extern "C" u32 mDoExt_getArchiveHeap__Fv(); +extern "C" u32 mDoExt_getArchiveHeapPtr__Fv(); extern "C" void mDoExt_createJ2dHeap__FUlP7JKRHeap(); -extern "C" void mDoExt_getJ2dHeap__Fv(); -extern "C" void mDoExt_getHostIOHeap__Fv(); +extern "C" u32 mDoExt_getJ2dHeap__Fv(); +extern "C" u32 mDoExt_getHostIOHeap__Fv(); extern "C" static void mDoExt_createSolidHeap__FUlP7JKRHeapUl(); extern "C" void mDoExt_createSolidHeapFromGame__FUlUl(); extern "C" void mDoExt_createSolidHeapFromSystem__FUlUl(); @@ -691,7 +691,7 @@ extern "C" void mDoExt_adjustSolidHeapToSystem__FP12JKRSolidHeap(); extern "C" void mDoExt_destroySolidHeap__FP12JKRSolidHeap(); extern "C" void mDoExt_destroyExpHeap__FP10JKRExpHeap(); extern "C" void mDoExt_setCurrentHeap__FP7JKRHeap(); -extern "C" void mDoExt_getCurrentHeap__Fv(); +extern "C" u32 mDoExt_getCurrentHeap__Fv(); extern "C" void mDoExt_restoreCurrentHeap__Fv(); extern "C" void mDoExt_resIDToIndex__FP10JKRArchiveUs(); extern "C" void calc__25mDoExt_MtxCalcAnmBlendTblFv(); @@ -700,7 +700,7 @@ extern "C" void initOldFrameMorf__22mDoExt_MtxCalcOldFrameFfUsUs(); extern "C" void decOldFrameMorfCounter__22mDoExt_MtxCalcOldFrameFv(); extern "C" void __ct__13mDoExt_morf_cFv(); extern "C" void __dt__12J3DFrameCtrlFv(); -extern "C" void func_8000FA20(); +extern "C" void func_8000FA20(void* _this); extern "C" void __dt__19J3DMtxCalcNoAnmBaseFv(); extern "C" void __dt__13mDoExt_morf_cFv(); extern "C" void setMorf__13mDoExt_morf_cFf(); @@ -788,11 +788,11 @@ extern "C" void __dt__28mDoExt_MtxCalcAnmBlendTblOldFv(); extern "C" void __dt__25mDoExt_MtxCalcAnmBlendTblFv(); extern "C" void getAnmTransform__17J3DMtxCalcAnmBaseFv(); extern "C" void setAnmTransform__17J3DMtxCalcAnmBaseFP15J3DAnmTransform(); -extern "C" void func_80014FC8(); -extern "C" void func_80015034(Vec const&, f32 const (&)[3][4]); -extern "C" void func_8001505C(Vec const&, f32 const (&)[3][4]); -extern "C" void func_80015084(); -extern "C" void func_800150AC(); +extern "C" void func_80014FC8(void* _this); +extern "C" void func_80015034(void* _this, Vec const&, f32 const (&)[3][4]); +extern "C" void func_8001505C(void* _this, Vec const&, f32 const (&)[3][4]); +extern "C" void func_80015084(void* _this); +extern "C" void func_800150AC(void* _this); extern "C" extern char const* const m_Do_m_Do_ext__stringBase0; // @@ -950,7 +950,7 @@ extern "C" extern u32 j3dDefaultIndTexOrderNull; extern "C" extern u8 j3dDefaultIndTexCoordScaleInfo[4]; extern "C" extern u8 j3dDefaultTevSwapMode[4]; extern "C" extern u8 j3dDefaultColorChanInfo[8]; -extern "C" extern u8 struct_804563F8[4]; +extern "C" extern u16 data_804563F8; // // Declarations: @@ -1835,17 +1835,12 @@ asm void mDoExt_bckAnm::init(J3DAnmTransform* param_0, int param_1, int param_2, } #pragma pop -/* 8000D8E4-8000D8EC 008224 0008+00 1/0 0/0 0/0 .text +/* 8000D8E4-8000D8EC -00001 0008+00 0/0 0/0 0/0 .text * setAnmTransform__114J3DMtxCalcAnimation<64J3DMtxCalcAnimationAdaptorDefault<27J3DMtxCalcCalcTransformMaya>,24J3DMtxCalcJ3DSysInitMaya>FP15J3DAnmTransform */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -extern "C" asm void func_8000D8E4(J3DAnmTransform* param_0) { - nofralloc -#include "asm/m_Do/m_Do_ext/func_8000D8E4.s" +extern "C" void func_8000D8E4(void* _this, J3DAnmTransform* param_0) { + *(u32*)(((u8*)_this) + 4) /* _this->field_0x4 */ = (u32)(param_0); } -#pragma pop /* 8000D8EC-8000D948 00822C 005C+00 1/0 0/0 0/0 .text __dt__17J3DMtxCalcAnmBaseFv */ #pragma push @@ -2494,6 +2489,18 @@ asm void mDoExt_setupShareTexture(J3DModelData* param_0, J3DModelData* param_1) } #pragma pop +/* ############################################################################################## */ +/* 803740FC-803740FC 00075C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +// MWCC ignores mapping of some japanese characters using the +// byte 0x5C (ASCII '\'). This is why this string is hex-encoded. +SECTION_DEAD static char const* const stringBase_803740FC = + "\x83\x5C\x83\x8A\x83\x62\x83\x68\x83\x71\x81\x5B\x83\x76\x82\xBF\x82\xE1\x82\xA4\x82\xAA\x82" + "\xC8\x81\x49\x0A"; +SECTION_DEAD static char const* const stringBase_80374118 = "%s.bti"; +#pragma pop + /* 8000EA80-8000ECC0 0093C0 0240+00 0/0 0/0 6/6 .text mDoExt_setupStageTexture__FP12J3DModelData */ #pragma push @@ -2506,7 +2513,7 @@ asm void mDoExt_setupStageTexture(J3DModelData* param_0) { #pragma pop /* ############################################################################################## */ -/* 80450C20-80450C24 000120 0004+00 2/2 0/0 0/0 .sbss AssertHeap */ +/* 80450C20-80450C24 000120 0004+00 2/1 0/0 0/0 .sbss AssertHeap */ static u8 AssertHeap[4]; /* 8000ECC0-8000ECE4 009600 0024+00 0/0 1/1 0/0 .text mDoExt_createAssertHeap__FP7JKRHeap @@ -2520,18 +2527,13 @@ asm void mDoExt_createAssertHeap(JKRHeap* param_0) { } #pragma pop -/* 8000ECE4-8000ECEC 009624 0008+00 0/0 3/3 0/0 .text mDoExt_getAssertHeap__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void mDoExt_getAssertHeap() { - nofralloc -#include "asm/m_Do/m_Do_ext/mDoExt_getAssertHeap__Fv.s" +/* 8000ECE4-8000ECEC -00001 0008+00 0/0 0/0 0/0 .text mDoExt_getAssertHeap__Fv */ +u32 mDoExt_getAssertHeap() { + return *(u32*)(&AssertHeap); } -#pragma pop /* ############################################################################################## */ -/* 80450C24-80450C28 000124 0004+00 2/2 0/0 0/0 .sbss DbPrintHeap */ +/* 80450C24-80450C28 000124 0004+00 2/1 0/0 0/0 .sbss DbPrintHeap */ static u8 DbPrintHeap[4]; /* 8000ECEC-8000ED14 00962C 0028+00 0/0 1/1 0/0 .text mDoExt_createDbPrintHeap__FUlP7JKRHeap */ @@ -2544,18 +2546,13 @@ asm void mDoExt_createDbPrintHeap(u32 param_0, JKRHeap* param_1) { } #pragma pop -/* 8000ED14-8000ED1C 009654 0008+00 0/0 1/1 0/0 .text mDoExt_getDbPrintHeap__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void mDoExt_getDbPrintHeap() { - nofralloc -#include "asm/m_Do/m_Do_ext/mDoExt_getDbPrintHeap__Fv.s" +/* 8000ED14-8000ED1C -00001 0008+00 0/0 0/0 0/0 .text mDoExt_getDbPrintHeap__Fv */ +u32 mDoExt_getDbPrintHeap() { + return *(u32*)(&DbPrintHeap); } -#pragma pop /* ############################################################################################## */ -/* 80450C28-80450C2C 000128 0004+00 2/2 3/3 0/0 .sbss gameHeap */ +/* 80450C28-80450C2C 000128 0004+00 2/1 3/3 0/0 .sbss gameHeap */ extern u8 gameHeap[4]; u8 gameHeap[4]; @@ -2570,18 +2567,13 @@ asm void mDoExt_createGameHeap(u32 param_0, JKRHeap* param_1) { } #pragma pop -/* 8000ED50-8000ED58 009690 0008+00 3/3 10/10 1/1 .text mDoExt_getGameHeap__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void mDoExt_getGameHeap() { - nofralloc -#include "asm/m_Do/m_Do_ext/mDoExt_getGameHeap__Fv.s" +/* 8000ED50-8000ED58 -00001 0008+00 0/0 0/0 0/0 .text mDoExt_getGameHeap__Fv */ +u32 mDoExt_getGameHeap() { + return *(u32*)(&gameHeap); } -#pragma pop /* ############################################################################################## */ -/* 80450C2C-80450C30 00012C 0004+00 2/2 3/3 0/0 .sbss zeldaHeap */ +/* 80450C2C-80450C30 00012C 0004+00 2/1 3/3 0/0 .sbss zeldaHeap */ extern u8 zeldaHeap[4]; u8 zeldaHeap[4]; @@ -2595,18 +2587,13 @@ asm void mDoExt_createZeldaHeap(u32 param_0, JKRHeap* param_1) { } #pragma pop -/* 8000ED80-8000ED88 0096C0 0008+00 4/4 4/4 0/0 .text mDoExt_getZeldaHeap__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void mDoExt_getZeldaHeap() { - nofralloc -#include "asm/m_Do/m_Do_ext/mDoExt_getZeldaHeap__Fv.s" +/* 8000ED80-8000ED88 -00001 0008+00 0/0 0/0 0/0 .text mDoExt_getZeldaHeap__Fv */ +u32 mDoExt_getZeldaHeap() { + return *(u32*)(&zeldaHeap); } -#pragma pop /* ############################################################################################## */ -/* 80450C30-80450C34 000130 0004+00 2/2 1/1 0/0 .sbss commandHeap */ +/* 80450C30-80450C34 000130 0004+00 2/1 1/1 0/0 .sbss commandHeap */ extern u8 commandHeap[4]; u8 commandHeap[4]; @@ -2620,18 +2607,13 @@ asm void mDoExt_createCommandHeap(u32 param_0, JKRHeap* param_1) { } #pragma pop -/* 8000EDB0-8000EDB8 0096F0 0008+00 0/0 6/6 0/0 .text mDoExt_getCommandHeap__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void mDoExt_getCommandHeap() { - nofralloc -#include "asm/m_Do/m_Do_ext/mDoExt_getCommandHeap__Fv.s" +/* 8000EDB0-8000EDB8 -00001 0008+00 0/0 0/0 0/0 .text mDoExt_getCommandHeap__Fv */ +u32 mDoExt_getCommandHeap() { + return *(u32*)(&commandHeap); } -#pragma pop /* ############################################################################################## */ -/* 80450C34-80450C38 000134 0004+00 3/3 5/5 0/0 .sbss archiveHeap */ +/* 80450C34-80450C38 000134 0004+00 3/1 5/5 0/0 .sbss archiveHeap */ extern u8 archiveHeap[4]; u8 archiveHeap[4]; @@ -2645,28 +2627,18 @@ asm void mDoExt_createArchiveHeap(u32 param_0, JKRHeap* param_1) { } #pragma pop -/* 8000EDEC-8000EDF4 00972C 0008+00 0/0 18/18 1/1 .text mDoExt_getArchiveHeap__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void mDoExt_getArchiveHeap() { - nofralloc -#include "asm/m_Do/m_Do_ext/mDoExt_getArchiveHeap__Fv.s" +/* 8000EDEC-8000EDF4 -00001 0008+00 0/0 0/0 0/0 .text mDoExt_getArchiveHeap__Fv */ +u32 mDoExt_getArchiveHeap() { + return *(u32*)(&archiveHeap); } -#pragma pop -/* 8000EDF4-8000EDFC 009734 0008+00 0/0 1/1 0/0 .text mDoExt_getArchiveHeapPtr__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void mDoExt_getArchiveHeapPtr() { - nofralloc -#include "asm/m_Do/m_Do_ext/mDoExt_getArchiveHeapPtr__Fv.s" +/* 8000EDF4-8000EDFC -00001 0008+00 0/0 0/0 0/0 .text mDoExt_getArchiveHeapPtr__Fv */ +u32 mDoExt_getArchiveHeapPtr() { + return *(u32*)(&archiveHeap); } -#pragma pop /* ############################################################################################## */ -/* 80450C38-80450C3C 000138 0004+00 2/2 0/0 0/0 .sbss j2dHeap */ +/* 80450C38-80450C3C 000138 0004+00 2/1 0/0 0/0 .sbss j2dHeap */ static u8 j2dHeap[4]; /* 8000EDFC-8000EE30 00973C 0034+00 0/0 1/1 0/0 .text mDoExt_createJ2dHeap__FUlP7JKRHeap @@ -2680,29 +2652,19 @@ asm void mDoExt_createJ2dHeap(u32 param_0, JKRHeap* param_1) { } #pragma pop -/* 8000EE30-8000EE38 009770 0008+00 0/0 7/7 0/0 .text mDoExt_getJ2dHeap__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void mDoExt_getJ2dHeap() { - nofralloc -#include "asm/m_Do/m_Do_ext/mDoExt_getJ2dHeap__Fv.s" +/* 8000EE30-8000EE38 -00001 0008+00 0/0 0/0 0/0 .text mDoExt_getJ2dHeap__Fv */ +u32 mDoExt_getJ2dHeap() { + return *(u32*)(&j2dHeap); } -#pragma pop /* ############################################################################################## */ -/* 80450C3C-80450C40 00013C 0004+00 1/1 0/0 0/0 .sbss HostIOHeap */ +/* 80450C3C-80450C40 00013C 0004+00 1/0 0/0 0/0 .sbss HostIOHeap */ static u8 HostIOHeap[4]; -/* 8000EE38-8000EE40 009778 0008+00 0/0 1/1 0/0 .text mDoExt_getHostIOHeap__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void mDoExt_getHostIOHeap() { - nofralloc -#include "asm/m_Do/m_Do_ext/mDoExt_getHostIOHeap__Fv.s" +/* 8000EE38-8000EE40 -00001 0008+00 0/0 0/0 0/0 .text mDoExt_getHostIOHeap__Fv */ +u32 mDoExt_getHostIOHeap() { + return *(u32*)(&HostIOHeap); } -#pragma pop /* 8000EE40-8000EED8 009780 0098+00 3/3 0/0 0/0 .text mDoExt_createSolidHeap__FUlP7JKRHeapUl */ #pragma push @@ -2783,6 +2745,15 @@ asm void mDoExt_createSolidHeapFromGameToCurrent(u32 param_0, u32 param_1) { } #pragma pop +/* ############################################################################################## */ +/* 803740FC-803740FC 00075C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8037411F = + "親ヒープがExpでないのでアジャストできません %08x %08x\n"; +SECTION_DEAD static char const* const stringBase_80374156 = "adjustSize失敗 %08x\n"; +#pragma pop + /* 8000F08C-8000F158 0099CC 00CC+00 1/1 11/11 0/0 .text mDoExt_adjustSolidHeap__FP12JKRSolidHeap */ #pragma push @@ -2837,15 +2808,10 @@ asm void mDoExt_setCurrentHeap(JKRHeap* param_0) { } #pragma pop -/* 8000F1EC-8000F1F4 009B2C 0008+00 0/0 4/4 0/0 .text mDoExt_getCurrentHeap__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void mDoExt_getCurrentHeap() { - nofralloc -#include "asm/m_Do/m_Do_ext/mDoExt_getCurrentHeap__Fv.s" +/* 8000F1EC-8000F1F4 -00001 0008+00 0/0 0/0 0/0 .text mDoExt_getCurrentHeap__Fv */ +u32 mDoExt_getCurrentHeap() { + return *(u32*)(&JKRHeap::sCurrentHeap); } -#pragma pop /* 8000F1F4-8000F220 009B34 002C+00 1/1 9/9 0/0 .text mDoExt_restoreCurrentHeap__Fv */ #pragma push @@ -2935,7 +2901,7 @@ asm J3DFrameCtrl::~J3DFrameCtrl() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_8000FA20() { +extern "C" asm void func_8000FA20(void* _this) { nofralloc #include "asm/m_Do/m_Do_ext/func_8000FA20.s" } @@ -3545,6 +3511,14 @@ asm void mDoExt_3DlineMatSortPacket::draw() { } #pragma pop +/* ############################################################################################## */ +/* 803740FC-803740FC 00075C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8037416B = + "\nキャッシュフォントクラス作成に失敗しました\n"; +#pragma pop + /* 80014804-8001494C 00F144 0148+00 3/3 0/0 0/0 .text * mDoExt_initFontCommon__FPP7JUTFontPP7ResFONTP7JKRHeapPCcP10JKRArchiveUcUlUl */ #pragma push @@ -3593,7 +3567,7 @@ SECTION_RODATA static u8 const fontdata_8224[18 + 2 /* padding */] = { 0x00, 0x00, }; -COMPILER_STRIP_GATE(803740C0, &fontdata_8224); +COMPILER_STRIP_GATE(0x803740C0, &fontdata_8224); /* 80450C44-80450C48 000144 0004+00 3/3 0/0 0/0 .sbss mDoExt_font0 */ static u8 mDoExt_font0[4]; @@ -3640,7 +3614,7 @@ SECTION_RODATA static u8 const fontdata_8253[20] = { 0x72, 0x65, 0x69, 0x73, 0x68, 0x6F, 0x74, 0x61, 0x69, 0x5F, 0x32, 0x34, 0x5F, 0x32, 0x32, 0x2E, 0x62, 0x66, 0x6E, 0x00, }; -COMPILER_STRIP_GATE(803740D4, &fontdata_8253); +COMPILER_STRIP_GATE(0x803740D4, &fontdata_8253); /* 80450C50-80450C54 000150 0004+00 2/2 0/0 0/0 .sbss mDoExt_font1 */ static u8 mDoExt_font1[4]; @@ -3677,7 +3651,7 @@ SECTION_RODATA static u8 const fontdata_8287[20] = { 0x72, 0x65, 0x69, 0x73, 0x68, 0x6F, 0x74, 0x61, 0x69, 0x5F, 0x32, 0x34, 0x5F, 0x32, 0x32, 0x2E, 0x62, 0x66, 0x6E, 0x00, }; -COMPILER_STRIP_GATE(803740E8, &fontdata_8287); +COMPILER_STRIP_GATE(0x803740E8, &fontdata_8287); /* 80450C5C-80450C60 00015C 0004+00 3/3 0/0 0/0 .sbss mDoExt_font2 */ static u8 mDoExt_font2[4]; @@ -3874,16 +3848,11 @@ asm void J3DMtxCalcAnmBase::getAnmTransform() { } #pragma pop -/* 80014FC0-80014FC8 00F900 0008+00 1/0 0/0 0/0 .text +/* 80014FC0-80014FC8 -00001 0008+00 0/0 0/0 0/0 .text * setAnmTransform__17J3DMtxCalcAnmBaseFP15J3DAnmTransform */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J3DMtxCalcAnmBase::setAnmTransform(J3DAnmTransform* param_0) { - nofralloc -#include "asm/m_Do/m_Do_ext/setAnmTransform__17J3DMtxCalcAnmBaseFP15J3DAnmTransform.s" +void J3DMtxCalcAnmBase::setAnmTransform(J3DAnmTransform* param_0) { + *(u32*)(((u8*)this) + 4) /* this->field_0x4 */ = (u32)(param_0); } -#pragma pop /* 80014FC8-80015034 00F908 006C+00 1/0 0/0 0/0 .text * __dt__114J3DMtxCalcAnimation<64J3DMtxCalcAnimationAdaptorDefault<27J3DMtxCalcCalcTransformMaya>,24J3DMtxCalcJ3DSysInitMaya>Fv @@ -3891,7 +3860,7 @@ asm void J3DMtxCalcAnmBase::setAnmTransform(J3DAnmTransform* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80014FC8() { +extern "C" asm void func_80014FC8(void* _this) { nofralloc #include "asm/m_Do/m_Do_ext/func_80014FC8.s" } @@ -3903,7 +3872,7 @@ extern "C" asm void func_80014FC8() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80015034(Vec const& param_0, f32 const (¶m_1)[3][4]) { +extern "C" asm void func_80015034(void* _this, Vec const& param_0, f32 const (¶m_1)[3][4]) { nofralloc #include "asm/m_Do/m_Do_ext/func_80015034.s" } @@ -3915,7 +3884,7 @@ extern "C" asm void func_80015034(Vec const& param_0, f32 const (¶m_1)[3][4] #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_8001505C(Vec const& param_0, f32 const (¶m_1)[3][4]) { +extern "C" asm void func_8001505C(void* _this, Vec const& param_0, f32 const (¶m_1)[3][4]) { nofralloc #include "asm/m_Do/m_Do_ext/func_8001505C.s" } @@ -3926,7 +3895,7 @@ extern "C" asm void func_8001505C(Vec const& param_0, f32 const (¶m_1)[3][4] #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_80015084() { +extern "C" asm void func_80015084(void* _this) { nofralloc #include "asm/m_Do/m_Do_ext/func_80015084.s" } @@ -3938,25 +3907,10 @@ extern "C" asm void func_80015084() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_800150AC() { +extern "C" asm void func_800150AC(void* _this) { nofralloc #include "asm/m_Do/m_Do_ext/func_800150AC.s" } #pragma pop -/* 803740FC-80374198 00075C 009C+00 3/3 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -// MWCC ignores mapping of some japanese characters using the -// byte 0x5C (ASCII '\'). This is why this string is hex-encoded. -SECTION_DEAD static char const* const stringBase_803740FC = - "\x83\x5C\x83\x8A\x83\x62\x83\x68\x83\x71\x81\x5B\x83\x76\x82\xBF\x82\xE1\x82\xA4\x82\xAA\x82" - "\xC8\x81\x49\x0A"; -SECTION_DEAD static char const* const stringBase_80374118 = "%s.bti"; -SECTION_DEAD static char const* const stringBase_8037411F = - "親ヒープがExpでないのでアジャストできません %08x %08x\n"; -SECTION_DEAD static char const* const stringBase_80374156 = "adjustSize失敗 %08x\n"; -SECTION_DEAD static char const* const stringBase_8037416B = - "\nキャッシュフォントクラス作成に失敗しました\n"; -#pragma pop +/* 803740FC-803740FC 00075C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/m_Do/m_Do_graphic.cpp b/src/m_Do/m_Do_graphic.cpp index f97a7d6eedd..8495a368deb 100644 --- a/src/m_Do/m_Do_graphic.cpp +++ b/src/m_Do/m_Do_graphic.cpp @@ -854,6 +854,16 @@ static asm void drawItem3D() { #pragma pop /* ############################################################################################## */ +/* 80373DD0-80373DD0 000430 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80373DD0 = "F_SP124"; +SECTION_DEAD static char const* const stringBase_80373DD8 = "D_MN08"; +SECTION_DEAD static char const* const stringBase_80373DDF = "F_SP127"; +/* @stringBase0 padding */ +SECTION_DEAD static char const* const pad_80373DE7 = ""; +#pragma pop + /* 80451AD8-80451ADC 0000D8 0004+00 1/1 0/0 0/0 .sdata2 @5023 */ SECTION_SDATA2 static f32 lit_5023 = -1.0f; @@ -927,7 +937,7 @@ asm void __sinit_m_Do_graphic_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_8000B1D0 = (void*)__sinit_m_Do_graphic_cpp; +REGISTER_CTORS(0x8000B1D0, __sinit_m_Do_graphic_cpp); #pragma pop /* 8000B1E4-8000B1EC 005B24 0008+00 0/0 1/0 0/0 .text getAtnActorID__9daPy_py_cCFv */ @@ -935,13 +945,4 @@ s32 daPy_py_c::getAtnActorID() const { return -1; } -/* 80373DD0-80373DE8 000430 0017+01 1/1 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80373DD0 = "F_SP124"; -SECTION_DEAD static char const* const stringBase_80373DD8 = "D_MN08"; -SECTION_DEAD static char const* const stringBase_80373DDF = "F_SP127"; -/* @stringBase0 padding */ -SECTION_DEAD static char const* const pad_80373DE7 = ""; -#pragma pop +/* 80373DD0-80373DD0 000430 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/m_Do/m_Do_lib.cpp b/src/m_Do/m_Do_lib.cpp index 3a2e8d3e5cd..00968e3e564 100644 --- a/src/m_Do/m_Do_lib.cpp +++ b/src/m_Do/m_Do_lib.cpp @@ -197,7 +197,7 @@ asm void __sinit_m_Do_lib_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80015544 = (void*)__sinit_m_Do_lib_cpp; +REGISTER_CTORS(0x80015544, __sinit_m_Do_lib_cpp); #pragma pop /* 80015590-800155D8 00FED0 0048+00 2/1 0/0 0/0 .text __dt__11J3DUClipperFv */ diff --git a/src/m_Do/m_Do_machine.cpp b/src/m_Do/m_Do_machine.cpp index 8a9f7fbd150..713ba8b7d7f 100644 --- a/src/m_Do/m_Do_machine.cpp +++ b/src/m_Do/m_Do_machine.cpp @@ -277,6 +277,24 @@ extern "C" u8 sManager__17JUTConsoleManager[4]; // /* ############################################################################################## */ +/* 80373DE8-80373DE8 000448 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80373DE8 = "SystemHeap"; +SECTION_DEAD static char const* const stringBase_80373DF3 = "ZeldaHeap"; +SECTION_DEAD static char const* const stringBase_80373DFD = "GameHeap"; +SECTION_DEAD static char const* const stringBase_80373E06 = "ArchiveHeap"; +SECTION_DEAD static char const* const stringBase_80373E12 = "CommandHeap"; +SECTION_DEAD static char const* const stringBase_80373E1E = "DbPrintHeap"; +SECTION_DEAD static char const* const stringBase_80373E2A = "J2dHeap"; +SECTION_DEAD static char const* const stringBase_80373E32 = "ASTH"; +SECTION_DEAD static char const* const stringBase_80373E37 = "EXPH"; +SECTION_DEAD static char const* const stringBase_80373E3C = "SLID"; +SECTION_DEAD static char const* const stringBase_80373E41 = "STDH"; +SECTION_DEAD static char const* const stringBase_80373E46 = "UNIT"; +SECTION_DEAD static char const* const stringBase_80373E4B = "(Null)"; +#pragma pop + /* 80450BF0-80450BF4 0000F0 0004+00 1/1 0/0 0/0 .sbss None */ static u8 data_80450BF0[4]; @@ -319,6 +337,18 @@ static asm void myGetHeapTypeByString(JKRHeap* param_0) { } #pragma pop +/* ############################################################################################## */ +/* 80373DE8-80373DE8 000448 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80373E52 = + "エラー: メモリを確保できません %d(0x%x)バイト、 %d バイトアライメント from " + "%08x\n"; +SECTION_DEAD static char const* const stringBase_80373EA3 = + "FreeSize=%08x TotalFreeSize=%08x HeapType=%08x(%" + "c%c%c%c) HeapSize=%08x %s\n"; +#pragma pop + /* 8000B3EC-8000B5C8 005D2C 01DC+00 1/1 0/0 0/0 .text myMemoryErrorRoutine__FPvUli */ #pragma push #pragma optimization_level 0 @@ -329,6 +359,13 @@ static asm void myMemoryErrorRoutine(void* param_0, u32 param_1, int param_2) { } #pragma pop +/* ############################################################################################## */ +/* 80373DE8-80373DE8 000448 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80373EEE = "error in %08x(%s)\n"; +#pragma pop + /* 8000B5C8-8000B668 005F08 00A0+00 1/1 0/0 0/0 .text myHeapCheckRecursive__FP7JKRHeap */ #pragma push #pragma optimization_level 0 @@ -389,6 +426,18 @@ static asm void exceptionRestart() { } #pragma pop +/* ############################################################################################## */ +/* 80373DE8-80373DE8 000448 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80373F01 = "振動停止＆原点復帰\n"; +SECTION_DEAD static char const* const stringBase_80373F15 = "例外マネージャがありません\n"; +SECTION_DEAD static char const* const stringBase_80373F31 = "キー入力を受け付けています\n"; +SECTION_DEAD static char const* const stringBase_80373F4D = "JUTAssertionを可視化しました\n"; +SECTION_DEAD static char const* const stringBase_80373F6B = "3秒間停止\n"; +SECTION_DEAD static char const* const stringBase_80373F76 = "/map/Final/Release"; +#pragma pop + /* 8000B7C8-8000B95C 006108 0194+00 1/1 0/0 0/0 .text myExceptionCallback__FUsP9OSContextUlUl */ #pragma push #pragma optimization_level 0 @@ -400,6 +449,16 @@ static asm void myExceptionCallback(u16 param_0, OSContext* param_1, u32 param_2 #pragma pop /* ############################################################################################## */ +/* 80373DE8-80373DE8 000448 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80373F89 = "(SRR0-3):%08X %08X %08X %08X\n"; +SECTION_DEAD static char const* const stringBase_80373FA7 = + "PUSH START BUTTON TO ADDITIONAL INFOMATION\n"; +SECTION_DEAD static char const* const stringBase_80373FD3 = + "--------------------------------------\n"; +#pragma pop + /* 80451B00-80451B04 000100 0004+00 1/1 0/0 0/0 .sdata2 @3940 */ SECTION_SDATA2 static f32 lit_3940 = 8.0f; @@ -421,6 +480,22 @@ static void my_PrintHeap(char const* param_0, u32 param_1) { /* empty function */ } +/* ############################################################################################## */ +/* 80373DE8-80373DE8 000448 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80373FFB = "" + "\x1B" + "[32m%-24s = size=%d KB\n" + "\x1B" + "[m"; +SECTION_DEAD static char const* const stringBase_80374017 = "" + "\x1B" + "[32m%-24s = %08x-%08x size=%d KB\n" + "\x1B" + "[m"; +#pragma pop + /* 8000BCF8-8000BD44 006638 004C+00 1/1 0/0 0/0 .text my_SysPrintHeap__FPCcPvUl */ #pragma push #pragma optimization_level 0 @@ -432,6 +507,19 @@ static asm void my_SysPrintHeap(char const* param_0, void* param_1, u32 param_2) #pragma pop /* ############################################################################################## */ +/* 80373DE8-80373DE8 000448 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_8037403D = "アリーナ"; +SECTION_DEAD static char const* const stringBase_80374046 = "システムヒープ"; +SECTION_DEAD static char const* const stringBase_80374055 = "コマンドヒープ"; +SECTION_DEAD static char const* const stringBase_80374064 = "アーカイブヒープ"; +SECTION_DEAD static char const* const stringBase_80374075 = "Ｊ２Ｄ用ヒープ"; +SECTION_DEAD static char const* const stringBase_80374084 = "ゲームヒープ"; +SECTION_DEAD static char const* const stringBase_80374091 = "ゼルダヒープ"; +SECTION_DEAD static char const* const stringBase_8037409E = "/map/Final/Release/frameworkF.map"; +#pragma pop + /* 803A2F60-803A2F9C 000080 003C+00 1/0 0/0 0/0 .data g_ntscZeldaIntDf */ SECTION_DATA static u8 g_ntscZeldaIntDf[60] = { 0x00, 0x00, 0x00, 0x00, 0x02, 0x60, 0x01, 0xC0, 0x01, 0xC0, 0x00, 0x1B, 0x00, 0x10, 0x02, @@ -466,57 +554,4 @@ asm void mDoMch_Create() { } #pragma pop -/* 80373DE8-803740C0 000448 02D8+00 7/7 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80373DE8 = "SystemHeap"; -SECTION_DEAD static char const* const stringBase_80373DF3 = "ZeldaHeap"; -SECTION_DEAD static char const* const stringBase_80373DFD = "GameHeap"; -SECTION_DEAD static char const* const stringBase_80373E06 = "ArchiveHeap"; -SECTION_DEAD static char const* const stringBase_80373E12 = "CommandHeap"; -SECTION_DEAD static char const* const stringBase_80373E1E = "DbPrintHeap"; -SECTION_DEAD static char const* const stringBase_80373E2A = "J2dHeap"; -SECTION_DEAD static char const* const stringBase_80373E32 = "ASTH"; -SECTION_DEAD static char const* const stringBase_80373E37 = "EXPH"; -SECTION_DEAD static char const* const stringBase_80373E3C = "SLID"; -SECTION_DEAD static char const* const stringBase_80373E41 = "STDH"; -SECTION_DEAD static char const* const stringBase_80373E46 = "UNIT"; -SECTION_DEAD static char const* const stringBase_80373E4B = "(Null)"; -SECTION_DEAD static char const* const stringBase_80373E52 = - "エラー: メモリを確保できません %d(0x%x)バイト、 %d バイトアライメント from " - "%08x\n"; -SECTION_DEAD static char const* const stringBase_80373EA3 = - "FreeSize=%08x TotalFreeSize=%08x HeapType=%08x(%" - "c%c%c%c) HeapSize=%08x %s\n"; -SECTION_DEAD static char const* const stringBase_80373EEE = "error in %08x(%s)\n"; -SECTION_DEAD static char const* const stringBase_80373F01 = "振動停止＆原点復帰\n"; -SECTION_DEAD static char const* const stringBase_80373F15 = "例外マネージャがありません\n"; -SECTION_DEAD static char const* const stringBase_80373F31 = "キー入力を受け付けています\n"; -SECTION_DEAD static char const* const stringBase_80373F4D = "JUTAssertionを可視化しました\n"; -SECTION_DEAD static char const* const stringBase_80373F6B = "3秒間停止\n"; -SECTION_DEAD static char const* const stringBase_80373F76 = "/map/Final/Release"; -SECTION_DEAD static char const* const stringBase_80373F89 = "(SRR0-3):%08X %08X %08X %08X\n"; -SECTION_DEAD static char const* const stringBase_80373FA7 = - "PUSH START BUTTON TO ADDITIONAL INFOMATION\n"; -SECTION_DEAD static char const* const stringBase_80373FD3 = - "--------------------------------------\n"; -SECTION_DEAD static char const* const stringBase_80373FFB = "" - "\x1B" - "[32m%-24s = size=%d KB\n" - "\x1B" - "[m"; -SECTION_DEAD static char const* const stringBase_80374017 = "" - "\x1B" - "[32m%-24s = %08x-%08x size=%d KB\n" - "\x1B" - "[m"; -SECTION_DEAD static char const* const stringBase_8037403D = "アリーナ"; -SECTION_DEAD static char const* const stringBase_80374046 = "システムヒープ"; -SECTION_DEAD static char const* const stringBase_80374055 = "コマンドヒープ"; -SECTION_DEAD static char const* const stringBase_80374064 = "アーカイブヒープ"; -SECTION_DEAD static char const* const stringBase_80374075 = "Ｊ２Ｄ用ヒープ"; -SECTION_DEAD static char const* const stringBase_80374084 = "ゲームヒープ"; -SECTION_DEAD static char const* const stringBase_80374091 = "ゼルダヒープ"; -SECTION_DEAD static char const* const stringBase_8037409E = "/map/Final/Release/frameworkF.map"; -#pragma pop +/* 80373DE8-80373DE8 000448 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/m_Do/m_Do_machine_exception.cpp b/src/m_Do/m_Do_machine_exception.cpp index 4472d88b8cd..a225ce6e6d3 100644 --- a/src/m_Do/m_Do_machine_exception.cpp +++ b/src/m_Do/m_Do_machine_exception.cpp @@ -117,6 +117,19 @@ static asm void print(char const* param_0) { } #pragma pop +/* ############################################################################################## */ +/* 80374460-80374460 000AC0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80374460 = + "--------------------------------------\n"; +SECTION_DEAD static char const* const stringBase_80374488 = "-- Heap Free / TotalFree (KB) --\n"; +SECTION_DEAD static char const* const stringBase_803744AA = " Zelda %5d / %5d\n"; +SECTION_DEAD static char const* const stringBase_803744BD = " Game %5d / %5d\n"; +SECTION_DEAD static char const* const stringBase_803744D0 = "Archive %5d / %5d\n"; +SECTION_DEAD static char const* const stringBase_803744E3 = "--------------------------------\n"; +#pragma pop + /* 80017E30-80017F8C 012770 015C+00 1/1 0/0 0/0 .text dispHeapInfo__Fv */ #pragma push #pragma optimization_level 0 @@ -127,6 +140,13 @@ static asm void dispHeapInfo() { } #pragma pop +/* ############################################################################################## */ +/* 80374460-80374460 000AC0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80374505 = "Start StageName:RoomNo [%s:%d]\n"; +#pragma pop + /* 80017F8C-80017FD0 0128CC 0044+00 1/1 0/0 0/0 .text dispGameInfo__Fv */ #pragma push #pragma optimization_level 0 @@ -137,6 +157,27 @@ static asm void dispGameInfo() { } #pragma pop +/* ############################################################################################## */ +/* 80374460-80374460 000AC0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80374525 = + "------------- Date Infomation ---------\n"; +SECTION_DEAD static char const* const stringBase_8037454E = " FINAL VERSION\n"; +SECTION_DEAD static char const* const stringBase_8037455E = "COMPILE USER: FINAL\n"; +SECTION_DEAD static char const* const stringBase_80374573 = "COPYDATE : %17s\n"; +SECTION_DEAD static char const* const stringBase_80374586 = + "PowerOnTime: %04d/%2d/%2d %2d:%2d:%2d`%03d\"%03d\n"; +SECTION_DEAD static char const* const stringBase_803745B7 = + "HungUpTime : %04d/%2d/%2d %2d:%2d:%2d`%03d\"%03d\n"; +SECTION_DEAD static char const* const stringBase_803745E8 = + "PlayTime : %4d days, %2d:%2d:%2d`%03d\"%03d\n"; +SECTION_DEAD static char const* const stringBase_80374616 = + "---------------------------------------\n"; +/* @stringBase0 padding */ +SECTION_DEAD static char const* const pad_8037463F = ""; +#pragma pop + /* 80017FD0-80018124 012910 0154+00 1/1 0/0 0/0 .text dispDateInfo__Fv */ #pragma push #pragma optimization_level 0 @@ -185,31 +226,4 @@ u8 struct_80450C98[4]; extern u8 struct_80450C9C[4]; u8 struct_80450C9C[4]; -/* 80374460-80374640 000AC0 01DF+01 3/3 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80374460 = - "--------------------------------------\n"; -SECTION_DEAD static char const* const stringBase_80374488 = "-- Heap Free / TotalFree (KB) --\n"; -SECTION_DEAD static char const* const stringBase_803744AA = " Zelda %5d / %5d\n"; -SECTION_DEAD static char const* const stringBase_803744BD = " Game %5d / %5d\n"; -SECTION_DEAD static char const* const stringBase_803744D0 = "Archive %5d / %5d\n"; -SECTION_DEAD static char const* const stringBase_803744E3 = "--------------------------------\n"; -SECTION_DEAD static char const* const stringBase_80374505 = "Start StageName:RoomNo [%s:%d]\n"; -SECTION_DEAD static char const* const stringBase_80374525 = - "------------- Date Infomation ---------\n"; -SECTION_DEAD static char const* const stringBase_8037454E = " FINAL VERSION\n"; -SECTION_DEAD static char const* const stringBase_8037455E = "COMPILE USER: FINAL\n"; -SECTION_DEAD static char const* const stringBase_80374573 = "COPYDATE : %17s\n"; -SECTION_DEAD static char const* const stringBase_80374586 = - "PowerOnTime: %04d/%2d/%2d %2d:%2d:%2d`%03d\"%03d\n"; -SECTION_DEAD static char const* const stringBase_803745B7 = - "HungUpTime : %04d/%2d/%2d %2d:%2d:%2d`%03d\"%03d\n"; -SECTION_DEAD static char const* const stringBase_803745E8 = - "PlayTime : %4d days, %2d:%2d:%2d`%03d\"%03d\n"; -SECTION_DEAD static char const* const stringBase_80374616 = - "---------------------------------------\n"; -/* @stringBase0 padding */ -SECTION_DEAD static char const* const pad_8037463F = ""; -#pragma pop +/* 80374460-80374460 000AC0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/m_Do/m_Do_main.cpp b/src/m_Do/m_Do_main.cpp index 89cdd9d278f..daa7763aae6 100644 --- a/src/m_Do/m_Do_main.cpp +++ b/src/m_Do/m_Do_main.cpp @@ -237,6 +237,16 @@ extern "C" u8 sAramObject__7JKRAram[4]; // Declarations: // +/* ############################################################################################## */ +/* 803739A0-803739A0 000000 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_803739A0 = "20Apr2004"; +SECTION_DEAD static char const* const stringBase_803739AA = "Patch2"; +SECTION_DEAD static char const* const stringBase_803739B1 = + "SDKのバージョンが一致しません。停止します\n"; +#pragma pop + /* 800056C0-80005728 000000 0068+00 1/1 0/0 0/0 .text version_check__Fv */ #pragma push #pragma optimization_level 0 @@ -368,6 +378,24 @@ asm void HeapCheck::getUsedCount() const { } #pragma pop +/* ############################################################################################## */ +/* 803739A0-803739A0 000000 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_803739DC = "[%sName]"; +SECTION_DEAD static char const* const stringBase_803739E5 = "HeapSize %8ld"; +SECTION_DEAD static char const* const stringBase_803739FB = "TargetHeapSize %8ld"; +SECTION_DEAD static char const* const stringBase_80373A11 = "TotalFree %8ld"; +SECTION_DEAD static char const* const stringBase_80373A27 = "FreeSize %8ld"; +SECTION_DEAD static char const* const stringBase_80373A3D = "TotalUsedSize %8ld"; +SECTION_DEAD static char const* const stringBase_80373A53 = "TotalUsedRate %3ld%%"; +SECTION_DEAD static char const* const stringBase_80373A6F = "MaxTotalUsedSize %8ld"; +SECTION_DEAD static char const* const stringBase_80373A85 = "MaxTotalUsedRate %3ld%%"; +SECTION_DEAD static char const* const stringBase_80373AA1 = "MinFreeSize %8ld"; +SECTION_DEAD static char const* const stringBase_80373AB7 = "MinFreeRate %3ld%%"; +SECTION_DEAD static char const* const stringBase_80373AD3 = "UsedCount %3ld%"; +#pragma pop + /* 800058C4-80005AD8 000204 0214+00 1/1 0/0 0/0 .text heapDisplay__9HeapCheckCFv */ #pragma push #pragma optimization_level 0 @@ -379,6 +407,24 @@ asm void HeapCheck::heapDisplay() const { #pragma pop /* ############################################################################################## */ +/* 803739A0-803739A0 000000 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80373AEF = ""; +SECTION_DEAD static char const* const stringBase_80373AF0 = "TotalFree"; +SECTION_DEAD static char const* const stringBase_80373AFA = "MaxUsed "; +SECTION_DEAD static char const* const stringBase_80373B04 = "Used "; +SECTION_DEAD static char const* const stringBase_80373B0E = "RelUsed "; +SECTION_DEAD static char const* const stringBase_80373B18 = "/ MaxFree"; +SECTION_DEAD static char const* const stringBase_80373B22 = "/HeapSize"; +SECTION_DEAD static char const* const stringBase_80373B2C = "Blk/Bytes"; +SECTION_DEAD static char const* const stringBase_80373B36 = "ARAM Free"; +SECTION_DEAD static char const* const stringBase_80373B40 = "%d"; +SECTION_DEAD static char const* const stringBase_80373B43 = "%s"; +SECTION_DEAD static char const* const stringBase_80373B46 = " [%s]"; +SECTION_DEAD static char const* const stringBase_80373B4C = "%10d"; +#pragma pop + /* 803A2F14-803A2F28 -00001 0014+00 0/1 0/0 0/0 .data desc1$3717 */ #pragma push #pragma force_active on @@ -450,6 +496,19 @@ static asm void debugDisplay() { #pragma pop /* ############################################################################################## */ +/* 803739A0-803739A0 000000 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80373B51 = "Press X+Y+START to CLEAR console."; +SECTION_DEAD static char const* const stringBase_80373B73 = "3DStick UP/Down to scroll"; +SECTION_DEAD static char const* const stringBase_80373B8D = + "Press A to output terminal from console."; +SECTION_DEAD static char const* const stringBase_80373BB6 = "SCROLL：%3d %3d %3d Output=%1x"; +SECTION_DEAD static char const* const stringBase_80373BD5 = "Press L+R trigger to control console."; +SECTION_DEAD static char const* const stringBase_80373BFB = + "Press [Z] trigger to close this window."; +#pragma pop + /* 80450B1C-80450B20 00001C 0004+00 1/1 0/0 0/0 .sbss console_position_x$3776 */ static f32 console_position_x; @@ -505,6 +564,13 @@ static asm void Debug_console(u32 param_0) { } #pragma pop +/* ############################################################################################## */ +/* 803739A0-803739A0 000000 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80373C23 = "/str/Final/Release/COPYDATE"; +#pragma pop + /* 8000614C-800061C8 000A8C 007C+00 1/1 0/0 0/0 .text LOAD_COPYDATE__FPv */ #pragma push #pragma optimization_level 0 @@ -561,6 +627,28 @@ bool JKRHeap::dump_sort() { return true; } +/* ############################################################################################## */ +/* 803739A0-803739A0 000000 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80373C3F = "Root"; +SECTION_DEAD static char const* const stringBase_80373C44 = "ルート"; +SECTION_DEAD static char const* const stringBase_80373C4B = "System"; +SECTION_DEAD static char const* const stringBase_80373C52 = "システム"; +SECTION_DEAD static char const* const stringBase_80373C5B = "Zelda"; +SECTION_DEAD static char const* const stringBase_80373C61 = "ゼルダ"; +SECTION_DEAD static char const* const stringBase_80373C68 = "Game"; +SECTION_DEAD static char const* const stringBase_80373C6D = "ゲーム"; +SECTION_DEAD static char const* const stringBase_80373C74 = "Archive"; +SECTION_DEAD static char const* const stringBase_80373C7C = "アーカイブ"; +SECTION_DEAD static char const* const stringBase_80373C87 = "J2d"; +SECTION_DEAD static char const* const stringBase_80373C8B = "J2D"; +SECTION_DEAD static char const* const stringBase_80373C8F = "Hostio"; +SECTION_DEAD static char const* const stringBase_80373C96 = "ホストIO"; +SECTION_DEAD static char const* const stringBase_80373C9F = "Command"; +SECTION_DEAD static char const* const stringBase_80373CA7 = "コマンド"; +#pragma pop + /* 800065E0-80006798 000F20 01B8+00 0/0 1/0 0/0 .text __sinit_m_Do_main_cpp */ #pragma push #pragma optimization_level 0 @@ -573,7 +661,7 @@ asm void __sinit_m_Do_main_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_800065E0 = (void*)__sinit_m_Do_main_cpp; +REGISTER_CTORS(0x800065E0, __sinit_m_Do_main_cpp); #pragma pop /* ############################################################################################## */ @@ -703,62 +791,4 @@ u8 struct_80450B98[4]; extern u8 data_80450B9C[4]; u8 data_80450B9C[4]; -/* 803739A0-80373CB0 000000 0310+00 8/6 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_803739A0 = "20Apr2004"; -SECTION_DEAD static char const* const stringBase_803739AA = "Patch2"; -SECTION_DEAD static char const* const stringBase_803739B1 = - "SDKのバージョンが一致しません。停止します\n"; -SECTION_DEAD static char const* const stringBase_803739DC = "[%sName]"; -SECTION_DEAD static char const* const stringBase_803739E5 = "HeapSize %8ld"; -SECTION_DEAD static char const* const stringBase_803739FB = "TargetHeapSize %8ld"; -SECTION_DEAD static char const* const stringBase_80373A11 = "TotalFree %8ld"; -SECTION_DEAD static char const* const stringBase_80373A27 = "FreeSize %8ld"; -SECTION_DEAD static char const* const stringBase_80373A3D = "TotalUsedSize %8ld"; -SECTION_DEAD static char const* const stringBase_80373A53 = "TotalUsedRate %3ld%%"; -SECTION_DEAD static char const* const stringBase_80373A6F = "MaxTotalUsedSize %8ld"; -SECTION_DEAD static char const* const stringBase_80373A85 = "MaxTotalUsedRate %3ld%%"; -SECTION_DEAD static char const* const stringBase_80373AA1 = "MinFreeSize %8ld"; -SECTION_DEAD static char const* const stringBase_80373AB7 = "MinFreeRate %3ld%%"; -SECTION_DEAD static char const* const stringBase_80373AD3 = "UsedCount %3ld%"; -SECTION_DEAD static char const* const stringBase_80373AEF = ""; -SECTION_DEAD static char const* const stringBase_80373AF0 = "TotalFree"; -SECTION_DEAD static char const* const stringBase_80373AFA = "MaxUsed "; -SECTION_DEAD static char const* const stringBase_80373B04 = "Used "; -SECTION_DEAD static char const* const stringBase_80373B0E = "RelUsed "; -SECTION_DEAD static char const* const stringBase_80373B18 = "/ MaxFree"; -SECTION_DEAD static char const* const stringBase_80373B22 = "/HeapSize"; -SECTION_DEAD static char const* const stringBase_80373B2C = "Blk/Bytes"; -SECTION_DEAD static char const* const stringBase_80373B36 = "ARAM Free"; -SECTION_DEAD static char const* const stringBase_80373B40 = "%d"; -SECTION_DEAD static char const* const stringBase_80373B43 = "%s"; -SECTION_DEAD static char const* const stringBase_80373B46 = " [%s]"; -SECTION_DEAD static char const* const stringBase_80373B4C = "%10d"; -SECTION_DEAD static char const* const stringBase_80373B51 = "Press X+Y+START to CLEAR console."; -SECTION_DEAD static char const* const stringBase_80373B73 = "3DStick UP/Down to scroll"; -SECTION_DEAD static char const* const stringBase_80373B8D = - "Press A to output terminal from console."; -SECTION_DEAD static char const* const stringBase_80373BB6 = "SCROLL：%3d %3d %3d Output=%1x"; -SECTION_DEAD static char const* const stringBase_80373BD5 = "Press L+R trigger to control console."; -SECTION_DEAD static char const* const stringBase_80373BFB = - "Press [Z] trigger to close this window."; -SECTION_DEAD static char const* const stringBase_80373C23 = "/str/Final/Release/COPYDATE"; -SECTION_DEAD static char const* const stringBase_80373C3F = "Root"; -SECTION_DEAD static char const* const stringBase_80373C44 = "ルート"; -SECTION_DEAD static char const* const stringBase_80373C4B = "System"; -SECTION_DEAD static char const* const stringBase_80373C52 = "システム"; -SECTION_DEAD static char const* const stringBase_80373C5B = "Zelda"; -SECTION_DEAD static char const* const stringBase_80373C61 = "ゼルダ"; -SECTION_DEAD static char const* const stringBase_80373C68 = "Game"; -SECTION_DEAD static char const* const stringBase_80373C6D = "ゲーム"; -SECTION_DEAD static char const* const stringBase_80373C74 = "Archive"; -SECTION_DEAD static char const* const stringBase_80373C7C = "アーカイブ"; -SECTION_DEAD static char const* const stringBase_80373C87 = "J2d"; -SECTION_DEAD static char const* const stringBase_80373C8B = "J2D"; -SECTION_DEAD static char const* const stringBase_80373C8F = "Hostio"; -SECTION_DEAD static char const* const stringBase_80373C96 = "ホストIO"; -SECTION_DEAD static char const* const stringBase_80373C9F = "Command"; -SECTION_DEAD static char const* const stringBase_80373CA7 = "コマンド"; -#pragma pop +/* 803739A0-803739A0 000000 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/m_Do/m_Do_mtx.cpp b/src/m_Do/m_Do_mtx.cpp index dacf8701e69..6dfa32265af 100644 --- a/src/m_Do/m_Do_mtx.cpp +++ b/src/m_Do/m_Do_mtx.cpp @@ -11,10 +11,10 @@ // Types: // -struct Quaternion {}; - struct csXyz {}; +struct Quaternion {}; + struct Vec {}; struct cXyz { @@ -493,7 +493,7 @@ asm void __sinit_m_Do_mtx_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_8000CFB8 = (void*)__sinit_m_Do_mtx_cpp; +REGISTER_CTORS(0x8000CFB8, __sinit_m_Do_mtx_cpp); #pragma pop /* 8000D034-8000D070 007974 003C+00 1/1 0/0 0/0 .text __dt__18mDoMtx_quatStack_cFv */ diff --git a/src/m_Do/m_Do_printf.cpp b/src/m_Do/m_Do_printf.cpp index 8eeccd450aa..ba6bd2e141f 100644 --- a/src/m_Do/m_Do_printf.cpp +++ b/src/m_Do/m_Do_printf.cpp @@ -240,6 +240,18 @@ asm void OSReport() { } #pragma pop +/* ############################################################################################## */ +/* 80373CB0-80373CB0 000310 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80373CB0 = "" + "\x1B" + "[41;37m***** FATAL ERROR *****\n"; +SECTION_DEAD static char const* const stringBase_80373CD1 = "***** FATAL ERROR *****\n" + "\x1B" + "[m"; +#pragma pop + /* 80006B3C-80006C0C 00147C 00D0+00 0/0 2/2 0/0 .text OSReport_FatalError */ #pragma push #pragma optimization_level 0 @@ -250,6 +262,18 @@ asm void OSReport_FatalError() { } #pragma pop +/* ############################################################################################## */ +/* 80373CB0-80373CB0 000310 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80373CED = "" + "\x1B" + "[41;37m[ERROR]"; +SECTION_DEAD static char const* const stringBase_80373CFD = "" + "\x1B" + "[m"; +#pragma pop + /* 80006C0C-80006CEC 00154C 00E0+00 0/0 31/31 10/10 .text OSReport_Error */ #pragma push #pragma optimization_level 0 @@ -260,6 +284,15 @@ asm void OSReport_Error() { } #pragma pop +/* ############################################################################################## */ +/* 80373CB0-80373CB0 000310 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80373D01 = "" + "\x1B" + "[43;30m[WARN]"; +#pragma pop + /* 80006CEC-80006DCC 00162C 00E0+00 0/0 6/6 0/0 .text OSReport_Warning */ #pragma push #pragma optimization_level 0 @@ -280,6 +313,16 @@ asm void OSReport_System() { } #pragma pop +/* ############################################################################################## */ +/* 80373CB0-80373CB0 000310 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80373D10 = " in \"%s\" on line %d.\n"; +SECTION_DEAD static char const* const stringBase_80373D26 = + "\nAddress: Back Chain LR Save\n"; +SECTION_DEAD static char const* const stringBase_80373D4C = "0x%08x: 0x%08x 0x%08x\n"; +#pragma pop + /* 80006E7C-80006FB4 0017BC 0138+00 0/0 9/9 0/0 .text OSPanic */ #pragma push #pragma optimization_level 0 @@ -290,27 +333,4 @@ asm void OSPanic() { } #pragma pop -/* 80373CB0-80373D68 000310 00B8+00 4/4 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80373CB0 = "" - "\x1B" - "[41;37m***** FATAL ERROR *****\n"; -SECTION_DEAD static char const* const stringBase_80373CD1 = "***** FATAL ERROR *****\n" - "\x1B" - "[m"; -SECTION_DEAD static char const* const stringBase_80373CED = "" - "\x1B" - "[41;37m[ERROR]"; -SECTION_DEAD static char const* const stringBase_80373CFD = "" - "\x1B" - "[m"; -SECTION_DEAD static char const* const stringBase_80373D01 = "" - "\x1B" - "[43;30m[WARN]"; -SECTION_DEAD static char const* const stringBase_80373D10 = " in \"%s\" on line %d.\n"; -SECTION_DEAD static char const* const stringBase_80373D26 = - "\nAddress: Back Chain LR Save\n"; -SECTION_DEAD static char const* const stringBase_80373D4C = "0x%08x: 0x%08x 0x%08x\n"; -#pragma pop +/* 80373CB0-80373CB0 000310 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/msg/scrn/d_msg_scrn_3select.cpp b/src/msg/scrn/d_msg_scrn_3select.cpp index 13ba2d0cbdd..3e64c33f5ec 100644 --- a/src/msg/scrn/d_msg_scrn_3select.cpp +++ b/src/msg/scrn/d_msg_scrn_3select.cpp @@ -11,13 +11,13 @@ // Types: // -struct JKRArchive {}; - struct J2DPane { /* 802F7100 */ void getBounds(); /* 802F7FCC */ void animationTransform(); }; +struct JKRArchive {}; + struct dSelect_cursor_c { /* 80194220 */ dSelect_cursor_c(u8, f32, JKRArchive*); /* 801950F4 */ void setPos(f32, f32, J2DPane*, bool); @@ -207,7 +207,19 @@ SECTION_RODATA static u8 const tag_name[288] = { 0x77, 0x5F, 0x79, 0x65, 0x73, 0x5F, 0x31, 0x34, 0x73, 0x65, 0x6C, 0x5F, 0x70, 0x6F, 0x30, 0x32, 0x00, 0x63, 0x5F, 0x6B, 0x61, 0x68, 0x65, 0x6E, 0x63, 0x5F, 0x63, 0x75, 0x72, 0x73, 0x6F, 0x72, }; -COMPILER_STRIP_GATE(80399708, &tag_name); +COMPILER_STRIP_GATE(0x80399708, &tag_name); + +/* 80399840-80399840 025EA0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80399840 = "zelda_window_3menu.blo"; +SECTION_DEAD static char const* const stringBase_80399857 = "zelda_window_3menu.bck"; +SECTION_DEAD static char const* const stringBase_8039986E = "zelda_window_3menu.bpk"; +SECTION_DEAD static char const* const stringBase_80399885 = "zelda_window_3menu.btk"; +SECTION_DEAD static char const* const stringBase_8039989C = ""; +/* @stringBase0 padding */ +SECTION_DEAD static char const* const pad_8039989D = "\0\0"; +#pragma pop /* 803C0C00-803C0C0C 01DD20 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { @@ -675,7 +687,7 @@ asm void dMsgScrn3Select_c::getTextBoxGlobalPosY(int param_0) { SECTION_RODATA static u8 const lit_4497[12] = { 0x43, 0x4C, 0x00, 0x00, 0x43, 0x98, 0x00, 0x00, 0x43, 0xCA, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80399828, &lit_4497); +COMPILER_STRIP_GATE(0x80399828, &lit_4497); /* 8023AA04-8023AAF4 235344 00F0+00 1/0 0/0 0/0 .text open1Proc__17dMsgScrn3Select_cFv */ #pragma push @@ -692,7 +704,7 @@ asm void dMsgScrn3Select_c::open1Proc() { SECTION_RODATA static u8 const lit_4520[12] = { 0x43, 0x4C, 0x00, 0x00, 0x43, 0x98, 0x00, 0x00, 0x43, 0xCA, 0x00, 0x00, }; -COMPILER_STRIP_GATE(80399834, &lit_4520); +COMPILER_STRIP_GATE(0x80399834, &lit_4520); /* 8023AAF4-8023AC14 235434 0120+00 1/0 0/0 0/0 .text open2Proc__17dMsgScrn3Select_cFv */ #pragma push @@ -808,18 +820,7 @@ asm void __sinit_d_msg_scrn_3select_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_8023B914 = (void*)__sinit_d_msg_scrn_3select_cpp; +REGISTER_CTORS(0x8023B914, __sinit_d_msg_scrn_3select_cpp); #pragma pop -/* 80399840-803998A0 025EA0 005D+03 1/1 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80399840 = "zelda_window_3menu.blo"; -SECTION_DEAD static char const* const stringBase_80399857 = "zelda_window_3menu.bck"; -SECTION_DEAD static char const* const stringBase_8039986E = "zelda_window_3menu.bpk"; -SECTION_DEAD static char const* const stringBase_80399885 = "zelda_window_3menu.btk"; -SECTION_DEAD static char const* const stringBase_8039989C = ""; -/* @stringBase0 padding */ -SECTION_DEAD static char const* const pad_8039989D = "\0\0"; -#pragma pop +/* 80399840-80399840 025EA0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/msg/scrn/d_msg_scrn_arrow.cpp b/src/msg/scrn/d_msg_scrn_arrow.cpp index 80eaf0cd793..4634e35c7c4 100644 --- a/src/msg/scrn/d_msg_scrn_arrow.cpp +++ b/src/msg/scrn/d_msg_scrn_arrow.cpp @@ -91,6 +91,16 @@ extern "C" extern u8 g_dComIfG_gameInfo[122384]; // /* ############################################################################################## */ +/* 803998A0-803998A0 025F00 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_803998A0 = "zelda_window_yajirushi.blo"; +SECTION_DEAD static char const* const stringBase_803998BB = "zelda_window_yajirushi.bck"; +SECTION_DEAD static char const* const stringBase_803998D6 = "zelda_window_yajirushi.bpk"; +/* @stringBase0 padding */ +SECTION_DEAD static char const* const pad_803998F1 = "\0\0\0\0\0\0"; +#pragma pop + /* 803C0CF8-803C0D08 01DE18 000C+04 2/2 0/0 0/0 .data __vt__15dMsgScrnArrow_c */ SECTION_DATA extern void* __vt__15dMsgScrnArrow_c[3 + 1 /* padding */] = { (void*)NULL /* RTTI */, @@ -199,13 +209,4 @@ asm void dMsgScrnArrow_c::dotAnimeMove() { } #pragma pop -/* 803998A0-803998F8 025F00 0051+07 1/1 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_803998A0 = "zelda_window_yajirushi.blo"; -SECTION_DEAD static char const* const stringBase_803998BB = "zelda_window_yajirushi.bck"; -SECTION_DEAD static char const* const stringBase_803998D6 = "zelda_window_yajirushi.bpk"; -/* @stringBase0 padding */ -SECTION_DEAD static char const* const pad_803998F1 = "\0\0\0\0\0\0"; -#pragma pop +/* 803998A0-803998A0 025F00 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/msg/scrn/d_msg_scrn_boss.cpp b/src/msg/scrn/d_msg_scrn_boss.cpp index 110839ba2cd..e59ecf9cc2a 100644 --- a/src/msg/scrn/d_msg_scrn_boss.cpp +++ b/src/msg/scrn/d_msg_scrn_boss.cpp @@ -127,6 +127,15 @@ extern "C" extern u8 g_MsgObject_HIO_c[1040]; // /* ############################################################################################## */ +/* 803998F8-803998F8 025F58 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_803998F8 = "zelda_boss_name.blo"; +SECTION_DEAD static char const* const stringBase_8039990C = ""; +/* @stringBase0 padding */ +SECTION_DEAD static char const* const pad_8039990D = "\0\0"; +#pragma pop + /* 803C0DB0-803C0DE8 01DED0 0038+00 1/1 0/0 0/0 .data t_tag$3759 */ SECTION_DATA static u8 t_tag[56] = { 0x00, 0x73, 0x66, 0x6F, 0x6E, 0x74, 0x62, 0x30, 0x00, 0x73, 0x66, 0x6F, 0x6E, 0x74, @@ -238,12 +247,4 @@ void dMsgScrnBoss_c::fontAlpha(f32 param_0) { /* empty function */ } -/* 803998F8-80399910 025F58 0015+03 1/1 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_803998F8 = "zelda_boss_name.blo"; -SECTION_DEAD static char const* const stringBase_8039990C = ""; -/* @stringBase0 padding */ -SECTION_DEAD static char const* const pad_8039990D = "\0\0"; -#pragma pop +/* 803998F8-803998F8 025F58 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/msg/scrn/d_msg_scrn_explain.cpp b/src/msg/scrn/d_msg_scrn_explain.cpp index 5118daa3813..38d8f659c8c 100644 --- a/src/msg/scrn/d_msg_scrn_explain.cpp +++ b/src/msg/scrn/d_msg_scrn_explain.cpp @@ -20,14 +20,14 @@ struct dMsgString_c { /* 80249D28 */ ~dMsgString_c(); }; -struct J2DOrthoGraph {}; - struct STControl { /* 8003219C */ void checkTrigger(); /* 80032524 */ void checkUpTrigger(); /* 800325A0 */ void checkDownTrigger(); }; +struct J2DOrthoGraph {}; + struct dMsgScrnExplain_c { /* 8023CC88 */ dMsgScrnExplain_c(STControl*, u8, bool, u8); /* 8023D538 */ ~dMsgScrnExplain_c(); @@ -73,10 +73,6 @@ struct dMsgScrn3Select_c { /* 8023A97C */ void getCharSpace(); }; -struct COutFont_c { - /* 80225C94 */ COutFont_c(u8); -}; - struct J2DTextBox { /* 80300658 */ void getStringPtr() const; /* 8030074C */ void setString(s16, char const*, ...); @@ -84,6 +80,10 @@ struct J2DTextBox { struct JUTFont {}; +struct COutFont_c { + /* 80225C94 */ COutFont_c(u8); +}; + struct dMsgObject_c { /* 802380F4 */ void getString(u32, J2DTextBox*, J2DTextBox*, JUTFont*, COutFont_c*, char*, char*, char*, s16*); @@ -100,10 +100,10 @@ struct Z2SpeechMgr2 { /* 802CBF60 */ void setTextCount(s16); }; -struct Vec {}; - struct JAISoundID {}; +struct Vec {}; + struct Z2SeMgr { /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); }; @@ -243,6 +243,17 @@ extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; // /* ############################################################################################## */ +/* 80399910-80399910 025F70 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80399910 = "zelda_message_window_new.blo"; +SECTION_DEAD static char const* const stringBase_8039992D = + "zelda_message_window_text_save_road.blo"; +SECTION_DEAD static char const* const stringBase_80399955 = "zelda_message_window_text.blo"; +SECTION_DEAD static char const* const stringBase_80399973 = ""; +SECTION_DEAD static char const* const stringBase_80399974 = "tt_block8x8.bti"; +#pragma pop + /* 803C0E40-803C0E4C 01DF60 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -546,6 +557,16 @@ asm void dMsgScrnExplain_c::move_proc() { #pragma pop /* ############################################################################################## */ +/* 80399910-80399910 025F70 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80399984 = "" + "\x1B" + "CR[%d]"; +/* @stringBase0 padding */ +SECTION_DEAD static char const* const pad_8039998C = "\0\0\0"; +#pragma pop + /* 80454BE8-80454BEC 0031E8 0004+00 1/1 0/0 0/0 .sdata2 @4294 */ SECTION_SDATA2 static f32 lit_4294 = 0.5f; @@ -652,22 +673,7 @@ asm void __sinit_d_msg_scrn_explain_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_8023E668 = (void*)__sinit_d_msg_scrn_explain_cpp; +REGISTER_CTORS(0x8023E668, __sinit_d_msg_scrn_explain_cpp); #pragma pop -/* 80399910-80399990 025F70 007C+04 2/2 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80399910 = "zelda_message_window_new.blo"; -SECTION_DEAD static char const* const stringBase_8039992D = - "zelda_message_window_text_save_road.blo"; -SECTION_DEAD static char const* const stringBase_80399955 = "zelda_message_window_text.blo"; -SECTION_DEAD static char const* const stringBase_80399973 = ""; -SECTION_DEAD static char const* const stringBase_80399974 = "tt_block8x8.bti"; -SECTION_DEAD static char const* const stringBase_80399984 = "" - "\x1B" - "CR[%d]"; -/* @stringBase0 padding */ -SECTION_DEAD static char const* const pad_8039998C = "\0\0\0"; -#pragma pop +/* 80399910-80399910 025F70 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/msg/scrn/d_msg_scrn_howl.cpp b/src/msg/scrn/d_msg_scrn_howl.cpp index ee541d692f8..97f81c68848 100644 --- a/src/msg/scrn/d_msg_scrn_howl.cpp +++ b/src/msg/scrn/d_msg_scrn_howl.cpp @@ -270,6 +270,19 @@ extern "C" extern u8 g_MsgObject_HIO_c[1040]; // /* ############################################################################################## */ +/* 80399A20-80399A20 026080 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80399A20 = "zelda_wolf_howl.blo"; +SECTION_DEAD static char const* const stringBase_80399A34 = ""; +SECTION_DEAD static char const* const stringBase_80399A35 = "tt_ginnouroko_s3tc.bti"; +SECTION_DEAD static char const* const stringBase_80399A4C = "tt_black_32.bti"; +SECTION_DEAD static char const* const stringBase_80399A5C = "tt_iastarRR.bti"; +SECTION_DEAD static char const* const stringBase_80399A6C = "tt_block8x8.bti"; +/* @stringBase0 padding */ +SECTION_DEAD static char const* const pad_80399A7C = "\0\0\0"; +#pragma pop + /* 803C0FD0-803C0FDC 01E0F0 000C+00 2/2 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -962,19 +975,7 @@ asm void __sinit_d_msg_scrn_howl_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80244454 = (void*)__sinit_d_msg_scrn_howl_cpp; +REGISTER_CTORS(0x80244454, __sinit_d_msg_scrn_howl_cpp); #pragma pop -/* 80399A20-80399A80 026080 005C+04 1/1 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80399A20 = "zelda_wolf_howl.blo"; -SECTION_DEAD static char const* const stringBase_80399A34 = ""; -SECTION_DEAD static char const* const stringBase_80399A35 = "tt_ginnouroko_s3tc.bti"; -SECTION_DEAD static char const* const stringBase_80399A4C = "tt_black_32.bti"; -SECTION_DEAD static char const* const stringBase_80399A5C = "tt_iastarRR.bti"; -SECTION_DEAD static char const* const stringBase_80399A6C = "tt_block8x8.bti"; -/* @stringBase0 padding */ -SECTION_DEAD static char const* const pad_80399A7C = "\0\0\0"; -#pragma pop +/* 80399A20-80399A20 026080 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/msg/scrn/d_msg_scrn_item.cpp b/src/msg/scrn/d_msg_scrn_item.cpp index 11d7d096cfa..caabc904c59 100644 --- a/src/msg/scrn/d_msg_scrn_item.cpp +++ b/src/msg/scrn/d_msg_scrn_item.cpp @@ -16,12 +16,12 @@ struct dMsgScrnLight_c { /* 80245C04 */ void draw(f32*, f32, f32, f32, f32, f32, u8); }; +struct J2DAnmColor {}; + struct J2DAnmTextureSRTKey {}; struct JKRExpHeap {}; -struct J2DAnmColor {}; - struct dMsgScrnItem_c { /* 8023E79C */ dMsgScrnItem_c(u8, u8, JKRExpHeap*); /* 8023F51C */ ~dMsgScrnItem_c(); @@ -279,6 +279,18 @@ extern "C" extern u8 g_MsgObject_HIO_c[1040]; // /* ############################################################################################## */ +/* 80399990-80399990 025FF0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80399990 = "zelda_item_get_window.blo"; +SECTION_DEAD static char const* const stringBase_803999AA = "zelda_item_get_window_text.blo"; +SECTION_DEAD static char const* const stringBase_803999C9 = "zelda_item_get_window.btk"; +SECTION_DEAD static char const* const stringBase_803999E3 = "zelda_item_get_window.bpk"; +SECTION_DEAD static char const* const stringBase_803999FD = "zelda_item_get_window_02.bpk"; +/* @stringBase0 padding */ +SECTION_DEAD static char const* const pad_80399A1A = "\0\0\0\0\0"; +#pragma pop + /* 803C0F78-803C0FD0 01E098 0058+00 2/2 0/0 0/0 .data __vt__14dMsgScrnItem_c */ SECTION_DATA extern void* __vt__14dMsgScrnItem_c[22] = { (void*)NULL /* RTTI */, @@ -593,15 +605,4 @@ asm void dMsgScrnItem_c::isOugiID() { } #pragma pop -/* 80399990-80399A20 025FF0 008A+06 1/1 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80399990 = "zelda_item_get_window.blo"; -SECTION_DEAD static char const* const stringBase_803999AA = "zelda_item_get_window_text.blo"; -SECTION_DEAD static char const* const stringBase_803999C9 = "zelda_item_get_window.btk"; -SECTION_DEAD static char const* const stringBase_803999E3 = "zelda_item_get_window.bpk"; -SECTION_DEAD static char const* const stringBase_803999FD = "zelda_item_get_window_02.bpk"; -/* @stringBase0 padding */ -SECTION_DEAD static char const* const pad_80399A1A = "\0\0\0\0\0"; -#pragma pop +/* 80399990-80399990 025FF0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/msg/scrn/d_msg_scrn_jimaku.cpp b/src/msg/scrn/d_msg_scrn_jimaku.cpp index 3081038c0f5..4c8e75ff92d 100644 --- a/src/msg/scrn/d_msg_scrn_jimaku.cpp +++ b/src/msg/scrn/d_msg_scrn_jimaku.cpp @@ -151,6 +151,15 @@ extern "C" extern u8 g_MsgObject_HIO_c[1040]; // /* ############################################################################################## */ +/* 80399A80-80399A80 0260E0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80399A80 = "zelda_jimaku_message_text.blo"; +SECTION_DEAD static char const* const stringBase_80399A9E = ""; +/* @stringBase0 padding */ +SECTION_DEAD static char const* const pad_80399A9F = ""; +#pragma pop + /* 803C11E8-803C1240 01E308 0058+00 2/2 0/0 0/0 .data __vt__16dMsgScrnJimaku_c */ SECTION_DATA extern void* __vt__16dMsgScrnJimaku_c[22] = { (void*)NULL /* RTTI */, @@ -261,12 +270,4 @@ void dMsgScrnJimaku_c::fontAlpha(f32 param_0) { /* empty function */ } -/* 80399A80-80399AA0 0260E0 001F+01 1/1 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80399A80 = "zelda_jimaku_message_text.blo"; -SECTION_DEAD static char const* const stringBase_80399A9E = ""; -/* @stringBase0 padding */ -SECTION_DEAD static char const* const pad_80399A9F = ""; -#pragma pop +/* 80399A80-80399A80 0260E0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/msg/scrn/d_msg_scrn_kanban.cpp b/src/msg/scrn/d_msg_scrn_kanban.cpp index 42b854ad518..585cd678b3a 100644 --- a/src/msg/scrn/d_msg_scrn_kanban.cpp +++ b/src/msg/scrn/d_msg_scrn_kanban.cpp @@ -150,7 +150,17 @@ SECTION_RODATA static u8 const t_tag[24] = { 0x6D, 0x67, 0x5F, 0x65, 0x34, 0x6C, 0x69, 0x6E, 0x00, 0x00, 0x00, 0x00, 0x66, 0x34, 0x5F, 0x77, 0x00, 0x00, 0x00, 0x00, 0x74, 0x34, 0x5F, 0x73, }; -COMPILER_STRIP_GATE(80399AA0, &t_tag); +COMPILER_STRIP_GATE(0x80399AA0, &t_tag); + +/* 80399AB8-80399AB8 026118 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80399AB8 = "zelda_kanban_stone_a.blo"; +SECTION_DEAD static char const* const stringBase_80399AD1 = "zelda_kanban_stone_a.bck"; +SECTION_DEAD static char const* const stringBase_80399AEA = "zelda_kanban_stone_a.btk"; +/* @stringBase0 padding */ +SECTION_DEAD static char const* const pad_80399B03 = "\0\0\0\0"; +#pragma pop /* 803C1240-803C1298 01E360 0058+00 2/2 0/0 0/0 .data __vt__16dMsgScrnKanban_c */ SECTION_DATA extern void* __vt__16dMsgScrnKanban_c[22] = { @@ -260,13 +270,4 @@ void dMsgScrnKanban_c::fukiTrans(f32 param_0, f32 param_1) { /* empty function */ } -/* 80399AB8-80399B08 026118 004B+05 1/1 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80399AB8 = "zelda_kanban_stone_a.blo"; -SECTION_DEAD static char const* const stringBase_80399AD1 = "zelda_kanban_stone_a.bck"; -SECTION_DEAD static char const* const stringBase_80399AEA = "zelda_kanban_stone_a.btk"; -/* @stringBase0 padding */ -SECTION_DEAD static char const* const pad_80399B03 = "\0\0\0\0"; -#pragma pop +/* 80399AB8-80399AB8 026118 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/msg/scrn/d_msg_scrn_light.cpp b/src/msg/scrn/d_msg_scrn_light.cpp index 5d8844a80f7..ea30a183f94 100644 --- a/src/msg/scrn/d_msg_scrn_light.cpp +++ b/src/msg/scrn/d_msg_scrn_light.cpp @@ -142,6 +142,16 @@ asm void dMsgScrnLight_HIO_c::updateColor(u8 param_0) { #pragma pop /* ############################################################################################## */ +/* 80399B08-80399B08 026168 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80399B08 = "zelda_message_window_text_light.blo"; +SECTION_DEAD static char const* const stringBase_80399B2C = "zelda_message_window_text_light.bck"; +SECTION_DEAD static char const* const stringBase_80399B50 = "zelda_message_window_text_light.bpk"; +/* @stringBase0 padding */ +SECTION_DEAD static char const* const pad_80399B74 = "\0\0\0"; +#pragma pop + /* 804306C8-804306D4 05D3E8 000C+00 1/1 0/0 0/0 .bss @3735 */ static u8 lit_3735[12]; @@ -242,16 +252,7 @@ asm void __sinit_d_msg_scrn_light_cpp() { #pragma push #pragma force_active on -SECTION_CTORS void* const _ctors_80246390 = (void*)__sinit_d_msg_scrn_light_cpp; +REGISTER_CTORS(0x80246390, __sinit_d_msg_scrn_light_cpp); #pragma pop -/* 80399B08-80399B78 026168 006C+04 1/1 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80399B08 = "zelda_message_window_text_light.blo"; -SECTION_DEAD static char const* const stringBase_80399B2C = "zelda_message_window_text_light.bck"; -SECTION_DEAD static char const* const stringBase_80399B50 = "zelda_message_window_text_light.bpk"; -/* @stringBase0 padding */ -SECTION_DEAD static char const* const pad_80399B74 = "\0\0\0"; -#pragma pop +/* 80399B08-80399B08 026168 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/msg/scrn/d_msg_scrn_place.cpp b/src/msg/scrn/d_msg_scrn_place.cpp index d45249914b9..9bbd0669c46 100644 --- a/src/msg/scrn/d_msg_scrn_place.cpp +++ b/src/msg/scrn/d_msg_scrn_place.cpp @@ -128,6 +128,15 @@ extern "C" extern u8 g_MsgObject_HIO_c[1040]; // /* ############################################################################################## */ +/* 80399B78-80399B78 0261D8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80399B78 = "zelda_stage_title_foreign.blo"; +SECTION_DEAD static char const* const stringBase_80399B96 = ""; +/* @stringBase0 padding */ +SECTION_DEAD static char const* const pad_80399B97 = ""; +#pragma pop + /* 803C12B0-803C12E8 01E3D0 0038+00 1/1 0/0 0/0 .data t_tag$3877 */ SECTION_DATA static u8 t_tag[56] = { 0x00, 0x73, 0x66, 0x6F, 0x6E, 0x74, 0x62, 0x30, 0x00, 0x73, 0x66, 0x6F, 0x6E, 0x74, @@ -245,12 +254,4 @@ void dMsgScrnPlace_c::fontAlpha(f32 param_0) { /* empty function */ } -/* 80399B78-80399B98 0261D8 001F+01 1/1 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80399B78 = "zelda_stage_title_foreign.blo"; -SECTION_DEAD static char const* const stringBase_80399B96 = ""; -/* @stringBase0 padding */ -SECTION_DEAD static char const* const pad_80399B97 = ""; -#pragma pop +/* 80399B78-80399B78 0261D8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/msg/scrn/d_msg_scrn_staff.cpp b/src/msg/scrn/d_msg_scrn_staff.cpp index a6f326e7401..74b4e35a29c 100644 --- a/src/msg/scrn/d_msg_scrn_staff.cpp +++ b/src/msg/scrn/d_msg_scrn_staff.cpp @@ -123,6 +123,15 @@ extern "C" extern u8 g_MsgObject_HIO_c[1040]; // /* ############################################################################################## */ +/* 80399B98-80399B98 0261F8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80399B98 = "zelda_staff_roll.blo"; +SECTION_DEAD static char const* const stringBase_80399BAD = ""; +/* @stringBase0 padding */ +SECTION_DEAD static char const* const pad_80399BAE = "\0"; +#pragma pop + /* 803C1340-803C1370 01E460 0030+00 1/1 0/0 0/0 .data t_tag$3752 */ SECTION_DATA static u8 t_tag[48] = { 0x00, 0x72, 0x69, 0x67, 0x68, 0x74, 0x5F, 0x73, 0x00, 0x00, 0x00, 0x72, 0x69, 0x67, 0x68, 0x74, @@ -233,12 +242,4 @@ void dMsgScrnStaff_c::fontAlpha(f32 param_0) { /* empty function */ } -/* 80399B98-80399BB0 0261F8 0016+02 1/1 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80399B98 = "zelda_staff_roll.blo"; -SECTION_DEAD static char const* const stringBase_80399BAD = ""; -/* @stringBase0 padding */ -SECTION_DEAD static char const* const pad_80399BAE = "\0"; -#pragma pop +/* 80399B98-80399B98 0261F8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/msg/scrn/d_msg_scrn_talk.cpp b/src/msg/scrn/d_msg_scrn_talk.cpp index 4cb9d412942..11a91c02f15 100644 --- a/src/msg/scrn/d_msg_scrn_talk.cpp +++ b/src/msg/scrn/d_msg_scrn_talk.cpp @@ -241,6 +241,17 @@ extern "C" extern u8 g_MsgObject_HIO_c[1040]; // /* ############################################################################################## */ +/* 80399BB0-80399BB0 026210 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80399BB0 = "zelda_message_window_new.blo"; +SECTION_DEAD static char const* const stringBase_80399BCD = "zelda_message_window_text_seirei.blo"; +SECTION_DEAD static char const* const stringBase_80399BF2 = "zelda_message_window_text.blo"; +SECTION_DEAD static char const* const stringBase_80399C10 = ""; +/* @stringBase0 padding */ +SECTION_DEAD static char const* const pad_80399C11 = "\0\0\0\0\0\0"; +#pragma pop + /* 803C13C8-803C1420 01E4E8 0058+00 2/2 0/0 0/0 .data __vt__14dMsgScrnTalk_c */ SECTION_DATA extern void* __vt__14dMsgScrnTalk_c[22] = { (void*)NULL /* RTTI */, @@ -511,14 +522,4 @@ asm void dMsgScrnTalk_c::fukiPosCalc(u8 param_0) { } #pragma pop -/* 80399BB0-80399C18 026210 0061+07 1/1 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80399BB0 = "zelda_message_window_new.blo"; -SECTION_DEAD static char const* const stringBase_80399BCD = "zelda_message_window_text_seirei.blo"; -SECTION_DEAD static char const* const stringBase_80399BF2 = "zelda_message_window_text.blo"; -SECTION_DEAD static char const* const stringBase_80399C10 = ""; -/* @stringBase0 padding */ -SECTION_DEAD static char const* const pad_80399C11 = "\0\0\0\0\0\0"; -#pragma pop +/* 80399BB0-80399BB0 026210 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/msg/scrn/d_msg_scrn_tree.cpp b/src/msg/scrn/d_msg_scrn_tree.cpp index 7e0f55270f5..1199a14a133 100644 --- a/src/msg/scrn/d_msg_scrn_tree.cpp +++ b/src/msg/scrn/d_msg_scrn_tree.cpp @@ -11,10 +11,10 @@ // Types: // -struct JKRExpHeap {}; - struct JUTFont {}; +struct JKRExpHeap {}; + struct dMsgScrnTree_c { /* 80248954 */ dMsgScrnTree_c(JUTFont*, JKRExpHeap*); /* 80248F14 */ ~dMsgScrnTree_c(); @@ -157,7 +157,19 @@ SECTION_RODATA static u8 const t_tag[24] = { 0x6D, 0x67, 0x5F, 0x65, 0x34, 0x6C, 0x69, 0x6E, 0x00, 0x00, 0x00, 0x00, 0x66, 0x34, 0x5F, 0x77, 0x00, 0x00, 0x00, 0x00, 0x74, 0x34, 0x5F, 0x73, }; -COMPILER_STRIP_GATE(80399C18, &t_tag); +COMPILER_STRIP_GATE(0x80399C18, &t_tag); + +/* 80399C30-80399C30 026290 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_80399C30 = "zelda_kanban_wood_a.blo"; +SECTION_DEAD static char const* const stringBase_80399C48 = "zelda_kanban_wood_a.bck"; +SECTION_DEAD static char const* const stringBase_80399C60 = "zelda_kanban_wood_a.btk"; +SECTION_DEAD static char const* const stringBase_80399C78 = "zelda_kanban_wood_a_02.btk"; +SECTION_DEAD static char const* const stringBase_80399C93 = ""; +/* @stringBase0 padding */ +SECTION_DEAD static char const* const pad_80399C94 = "\0\0\0"; +#pragma pop /* 803C1420-803C1478 01E540 0058+00 2/2 0/0 0/0 .data __vt__14dMsgScrnTree_c */ SECTION_DATA extern void* __vt__14dMsgScrnTree_c[22] = { @@ -268,15 +280,4 @@ void dMsgScrnTree_c::fukiTrans(f32 param_0, f32 param_1) { /* empty function */ } -/* 80399C30-80399C98 026290 0064+04 1/1 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -#pragma section ".dead" -SECTION_DEAD static char const* const stringBase_80399C30 = "zelda_kanban_wood_a.blo"; -SECTION_DEAD static char const* const stringBase_80399C48 = "zelda_kanban_wood_a.bck"; -SECTION_DEAD static char const* const stringBase_80399C60 = "zelda_kanban_wood_a.btk"; -SECTION_DEAD static char const* const stringBase_80399C78 = "zelda_kanban_wood_a_02.btk"; -SECTION_DEAD static char const* const stringBase_80399C93 = ""; -/* @stringBase0 padding */ -SECTION_DEAD static char const* const pad_80399C94 = "\0\0\0"; -#pragma pop +/* 80399C30-80399C30 026290 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/tools/libdol2asm/data/base.py b/tools/libdol2asm/data/base.py index 6ceada5eb99..25b710d0cef 100644 --- a/tools/libdol2asm/data/base.py +++ b/tools/libdol2asm/data/base.py @@ -84,6 +84,12 @@ class ArbitraryData(Symbol): self.size // self.element_size, self.padding // self.element_size) + def return_type(self): + array_type = self.array_type() + if isinstance(array_type, ArrayType) or isinstance(array_type, PaddingArrayType) or isinstance(array_type, ZeroArrayType): + return PointerType(array_type.base) + return array_type + def cpp_reference(self, accessor, addr): name = self.declaration_name(forward=False, c_export=False,full_qualified_name=True) if addr == self.addr: @@ -92,6 +98,14 @@ class ArbitraryData(Symbol): offset = addr - self.addr return f"(((char*)&{name})+0x{offset:X})" + def cpp_load(self, accessor, addr): + name = self.declaration_name(forward=False, c_export=False,full_qualified_name=True) + if addr == self.addr: + return f"{name}" + else: + offset = addr - self.addr + return f"*(((char*)&{name})+0x{offset:X})" + def declaration_name(self, forward: bool, c_export: bool, full_qualified_name: bool): @@ -201,12 +215,7 @@ class ArbitraryData(Symbol): await self.export_declaration_body(exporter, builder) if self._section == ".rodata": - await builder.write(f"COMPILER_STRIP_GATE({self.addr:08X}, {self.cpp_reference(None, self.addr)});") - # await builder.write_nonewline("SECTION_DEAD ") - # await builder.write_nonewline("void* const ") - # await builder.write_nonewline(f"cg_{self.addr:08X} = (void*)(") - # await builder.write_nonewline(self.cpp_reference(None, self.addr)) - # await builder.write(f");") + await builder.write(f"COMPILER_STRIP_GATE(0x{self.addr:08X}, {self.cpp_reference(None, self.addr)});") if self.requires_force_active: await builder.write(f"#pragma pop") diff --git a/tools/libdol2asm/data/function/__init__.py b/tools/libdol2asm/data/function/__init__.py index c390847b02a..baf3d16d9d9 100644 --- a/tools/libdol2asm/data/function/__init__.py +++ b/tools/libdol2asm/data/function/__init__.py @@ -3,3 +3,5 @@ from .base import * from .asm import * from .ret import * from .sinit import * +from .store import * +from .small_asm import * diff --git a/tools/libdol2asm/data/function/base.py b/tools/libdol2asm/data/function/base.py index 0eda4618816..9985e0966e5 100644 --- a/tools/libdol2asm/data/function/base.py +++ b/tools/libdol2asm/data/function/base.py @@ -132,12 +132,19 @@ class Function(Symbol): for line in lines: await builder.write(line) - arg_type = "" + arg_type = [] if forward: - arg_type = ", ".join([x.type(specialize_templates=True) for x in self.argument_types]) + arg_type = [x.type(specialize_templates=True) for x in self.argument_types] else: - arg_type = ", ".join([x.decl(f"param_{i}",specialize_templates=True) for i, x in zip( - range(len(self.argument_types)), self.argument_types)]) + arg_type = [ + x.decl(f"param_{i}",specialize_templates=True) + for i, x in enumerate(self.argument_types) + ] + + if self.demangled_name and self.demangled_name.require_specialization: + arg_type = [f"void* _this", *arg_type] + + arg_type = ", ".join(arg_type) if self._section == ".init": await builder.write_nonewline(f"SECTION_INIT ") diff --git a/tools/libdol2asm/data/function/ret.py b/tools/libdol2asm/data/function/ret.py index bf15e02e9b4..c9ae3b8d1de 100644 --- a/tools/libdol2asm/data/function/ret.py +++ b/tools/libdol2asm/data/function/ret.py @@ -6,16 +6,44 @@ from .base import * @dataclass(eq=False) class ReturnFunction(Function): - return_value: str = None - - def export_return_value(self): - return self.return_value + def export_return_value(self, symbol_table): + assert False async def export_function_body(self, exporter, builder: AsyncBuilder): - return_value = self.export_return_value() + return_value = self.export_return_value(exporter.gst) await builder.write(f" {{") if return_value: await builder.write(f"\treturn {return_value};") else: await builder.write(f"\t/* empty function */") await builder.write(f"}}") + +@dataclass(eq=False) +class CustomReturnFunction(ReturnFunction): + return_value: str = None + + def export_return_value(self, symbol_table): + return self.return_value + +@dataclass(eq=False) +class SymbolReturnFunction(ReturnFunction): + symbol_addr: int = 0 + load_or_reference: bool = True + load_type: Type = None + cast_type: Type = None + + def gather_references(self, context, valid_range): + self.references = set([ self.symbol_addr ]) + + def export_return_value(self, symbol_table): + symbol = symbol_table[-1, self.symbol_addr] + assert symbol + name = symbol.cpp_reference(self, self.symbol_addr) + load_type = PointerType(self.load_type) + dereference = "" + cast = "" + if self.load_or_reference: + dereference = "*" + if self.cast_type: + cast = f"({self.cast_type.type()})" + return f"{cast}{dereference}({load_type.type()})({name})" diff --git a/tools/libdol2asm/data/function/sinit.py b/tools/libdol2asm/data/function/sinit.py index 02ebcd8f94d..ba6aafc1746 100644 --- a/tools/libdol2asm/data/function/sinit.py +++ b/tools/libdol2asm/data/function/sinit.py @@ -20,7 +20,7 @@ class SInitFunction(ASMFunction): await builder.write("#pragma push") await builder.write("#pragma force_active on") - await builder.write(f"SECTION_CTORS void* const _ctors_{self.addr:08X} = (void*){self.label};") + await builder.write(f"REGISTER_CTORS(0x{self.addr:08X}, {self.label});") await builder.write("#pragma pop") await builder.write("") diff --git a/tools/libdol2asm/data/function/small_asm.py b/tools/libdol2asm/data/function/small_asm.py new file mode 100644 index 00000000000..f45d0c3b91f --- /dev/null +++ b/tools/libdol2asm/data/function/small_asm.py @@ -0,0 +1,20 @@ + +from dataclasses import dataclass, field +from typing import List + +from ...builder import AsyncBuilder +from .base import * + +@dataclass(eq=False) +class SmallASMFunction(Function): + asm: bool = True + insts: List[str] = field(default_factory=list) + + async def export_function_body(self, exporter, builder: AsyncBuilder): + await builder.write(f" {{") + await builder.write(f"\t// clang-format off") + await builder.write(f"\tnofralloc") + for inst in self.insts: + await builder.write(f"\t{inst}") + await builder.write(f"\t// clang-format on") + await builder.write(f"}}") \ No newline at end of file diff --git a/tools/libdol2asm/data/function/store.py b/tools/libdol2asm/data/function/store.py new file mode 100644 index 00000000000..48116e6edc8 --- /dev/null +++ b/tools/libdol2asm/data/function/store.py @@ -0,0 +1,55 @@ + + +from dataclasses import dataclass, field +from capstone import * +from capstone.ppc import * + +from ...builder import AsyncBuilder +from ...types import * +from .base import * + + +@dataclass(eq=False) +class StoreFunction(Function): + async def export_store(self, exporter, builder): + assert False + + async def export_function_body(self, exporter, builder: AsyncBuilder): + await builder.write(f" {{") + await self.export_store(exporter, builder) + await builder.write(f"}}") + + +@dataclass(eq=False) +class Store_R3_OffsetRX_Function(StoreFunction): + dst: int = 0 + dst_offset: int = 0 + src: int = 0 + store_type: Type = None + + def calculate_params(self): + params = {} + + gr = PPC_REG_R3 + if self.has_class: + if self.demangled_name and self.demangled_name.require_specialization: + params[gr] = "_this" + else: + params[gr] = "this" + gr += 1 + + for i, arg in enumerate(self.argument_types): + params[gr] = f"param_{i}" + gr += 1 + + return params + + async def export_store(self, exporter, builder): + params = self.calculate_params() + dst = params[self.dst] + src = params[self.src] + if self.dst_offset > 0: + dst = f"(((u8*){params[self.dst]})+{self.dst_offset}) /* {params[self.dst]}->field_0x{self.dst_offset:x} */" + + pointer_type = PointerType(self.store_type) + await builder.write(f"\t*({pointer_type.type()}){dst} = ({self.store_type.type()})({src});") diff --git a/tools/libdol2asm/data/reference_array.py b/tools/libdol2asm/data/reference_array.py index 1b05b923423..d5d5fdf918d 100644 --- a/tools/libdol2asm/data/reference_array.py +++ b/tools/libdol2asm/data/reference_array.py @@ -33,6 +33,7 @@ class ReferenceArray(ArbitraryData): def values(self): return Integer.u32_from(self.data) + def gather_references(self, context, valid_range): self.references = [ addr for addr in self.values() if addr in valid_range ] diff --git a/tools/libdol2asm/data/string.py b/tools/libdol2asm/data/string.py index c112fc40d5e..23a475988ae 100644 --- a/tools/libdol2asm/data/string.py +++ b/tools/libdol2asm/data/string.py @@ -58,13 +58,27 @@ def escape_full_string(data): class String(ArbitraryData): encoding: str = None decoded_string: str = None + string_base: "StringBase" = None def array_type(self): return self.element_type() - async def export_declaration(self, exporter, builder: AsyncBuilder): - assert self.padding == 0 + def asm_reference(self, addr): + if self.string_base: + return self.string_base.asm_reference(addr) + else: + return super().asm_reference(addr) + def cpp_reference(self, accessor, addr): + if self.string_base: + return self.string_base.cpp_reference(accessor, addr) + else: + return super().cpp_reference(accessor, addr) + + async def export_declaration(self, exporter, builder: AsyncBuilder, force_active=True): + if force_active: + await builder.write("#pragma push") + await builder.write("#pragma force_active on") sjis = self.decoded_string.encode("shift_jisx0213") if 0x5c in sjis: await builder.write("// MWCC ignores mapping of some japanese characters using the ") @@ -79,6 +93,18 @@ class String(ArbitraryData): await builder.write_nonewline(self.array_type().decl(self.identifier.label)) await String.export_string(builder, data) + if self.padding > 0: + assert len(self.padding_data) == self.padding + assert self.padding_data[-1] == 0 + data = escape_full_string(self.padding_data[:-1]) + await builder.write("/* @stringBase0 padding */") + await builder.write_nonewline("SECTION_DEAD ") + await builder.write_nonewline("static ") + await builder.write_nonewline(self.array_type().decl(f"pad_{self.end:08X}")) + await String.export_string(builder, data) + if force_active: + await builder.write("#pragma pop") + @staticmethod async def export_string(builder: AsyncBuilder, data: List[str]): if len(data) < 32: @@ -119,9 +145,10 @@ class StringBase(ArbitraryData): string.set_mlts(module, library, translation_unit, section) async def export_declaration(self, exporter, builder: AsyncBuilder): + pass + """ await builder.write("#pragma push") await builder.write("#pragma force_active on") - await builder.write("#pragma section \".dead\"") for string in self.strings: # if the @stringBase0 is static (which it will almost always be), setup # so that the sub-strings are static. @@ -139,6 +166,7 @@ class StringBase(ArbitraryData): await builder.write_nonewline(self.array_type().decl(f"pad_{self.end:08X}")) await String.export_string(builder, data) await builder.write("#pragma pop") + """ @staticmethod def create(symbol, strings, data, padding_data): diff --git a/tools/libdol2asm/data/symbol.py b/tools/libdol2asm/data/symbol.py index 5a708fb3611..9a75d16bb69 100644 --- a/tools/libdol2asm/data/symbol.py +++ b/tools/libdol2asm/data/symbol.py @@ -139,6 +139,12 @@ class Symbol: f"invalid reference addr 0x{addr:08X} for {type(self).__name__}\n{self}") return f"&{self.identifier.label}" + def cpp_load(self, accessor, addr): + if addr != self.addr: + raise Dol2ZelException( + f"invalid reference addr 0x{addr:08X} for {type(self).__name__}\n{self}") + return f"{self.identifier.label}" + def asm_reference(self, addr): if addr != self.addr: return None @@ -147,6 +153,9 @@ class Symbol: def gather_references(self, context, valid_range): pass + def get_reference_information(self, context, symbol_table): + pass + def types(self): return set() diff --git a/tools/libdol2asm/exporter/cpp_exporter.py b/tools/libdol2asm/exporter/cpp_exporter.py index 898ff93f4a6..54a16900724 100644 --- a/tools/libdol2asm/exporter/cpp_exporter.py +++ b/tools/libdol2asm/exporter/cpp_exporter.py @@ -8,6 +8,7 @@ from pathlib import Path from collections import defaultdict from typing import List, Dict from dataclasses import dataclass, field +from itertools import groupby from .. import util from .. import settings @@ -36,6 +37,7 @@ order = { ".init": 8 } + @dataclass class CPPExporter: context: Context @@ -44,13 +46,13 @@ class CPPExporter: async def export_symbol_header(self, builder: AsyncBuilder, symbol: Symbol): await builder.write("/* %08X-%08X %06X %04X+%02X %i/%i %i/%i %i/%i %-16s %-60s */" % ( - symbol.start, symbol.end+symbol.padding, + symbol.start, symbol.end+symbol.padding, symbol.relative_addr, symbol.size, symbol.padding, - symbol.reference_count.static, - symbol.implicit_reference_count.static, - symbol.reference_count.extern, - symbol.implicit_reference_count.extern, + symbol.reference_count.static, + symbol.implicit_reference_count.static, + symbol.reference_count.extern, + symbol.implicit_reference_count.extern, symbol.reference_count.rel, symbol.implicit_reference_count.rel, symbol._section, symbol.identifier.name)) @@ -142,8 +144,6 @@ class CPPExporter: else: section.symbols.sort(key=lambda x: x.addr) - - for function, symbols, forward_symbols in function_symbols_groups: # new section of symbols followed by a function if len(symbols) > 0: @@ -156,11 +156,22 @@ class CPPExporter: await builder.write("") unreferenced_decls = 0 - for symbol in symbols: - assert not isinstance(symbol, StringBase) - await self.export_symbol_header(builder, symbol) - await symbol.export_declaration(self, builder) - await builder.write("") + symbol_groups = [list(g) for k, g in groupby(symbols, key=lambda x: isinstance(x, String))] + for symbols in symbol_groups: + if isinstance(symbols[0], String): + await self.export_symbol_header(builder, symbols[0].string_base) + await builder.write("#pragma push") + await builder.write("#pragma force_active on") + for symbol in symbols: + await symbol.export_declaration(self, builder, force_active=False) + await builder.write("#pragma pop") + await builder.write("") + else: + for symbol in symbols: + assert not isinstance(symbol, StringBase) + await self.export_symbol_header(builder, symbol) + await symbol.export_declaration(self, builder) + await builder.write("") await self.export_symbol_header(builder, function) await function.export_declaration(self, builder) @@ -184,7 +195,7 @@ class CPPExporter: await symbol.export_declaration(self, builder) await builder.write("") - def gather_function_groups(self, decl_references): + def gather_function_groups(self, decl_references): sections = list(self.tu.sections.values()) sections.sort(key=lambda x: order[x.name] if x.name in order else 10 + len(x.name)) @@ -229,10 +240,14 @@ class CPPExporter: # add missing references so that the order is still correct missing_order_symbols = [] for symbol in symbols: + is_string = isinstance(symbol, String) symbol_section = self.tu.sections[symbol._section] for prev_symbol in symbol_section.symbols: if prev_symbol == symbol: break + prev_is_string = isinstance(prev_symbol, String) + if is_string != prev_is_string: + continue if isinstance(prev_symbol, Function) or isinstance(prev_symbol, StringBase): continue if prev_symbol in used_symbols: @@ -301,10 +316,9 @@ class CPPExporter: type_list.build(forward_references) type_list.build(external_references) - - already_fixed_forward_reference = set() - function_symbols_groups, fsg_used_symbols = self.gather_function_groups(decl_references) + function_symbols_groups, fsg_used_symbols = self.gather_function_groups( + decl_references) for function, symbols, forward_symbols in function_symbols_groups: for symbol in symbols: if isinstance(symbol, StringBase): @@ -313,14 +327,15 @@ class CPPExporter: continue already_fixed_forward_reference.add(symbol) - forward_references = list(decl_references - already_fixed_forward_reference) + forward_references = list( + decl_references - already_fixed_forward_reference) forward_references.sort(key=lambda x: x.addr) stringBases = set() for decl in decl_references: if isinstance(decl, StringBase): stringBases.add(decl) - + decl_references = decl_references - stringBases async with AsyncBuilder(path) as builder: @@ -376,52 +391,6 @@ class CPPExporter: await self.export_declarations(builder, tu, decl_references, function_symbols_groups, fsg_used_symbols) - """ - # symbols that are in the .rodata (read-only data) section will be stripped by the compiler (not the linker) - # if they are not used. create a dead-symbol to fake the use of the read-only symbol. This will mess with the - # of the symbols. E.g. - # SECTION_RODATA static u32 const lit_4125 = 0x42A00000; - # SECTION_RODATA static u32 const lit_4218 = 0x43130000; - # SECTION_DEAD void* const cg_805AA484 = (void*)(&lit_4125); - # will output: - # lit_4218 - # @stringBase0 (if it exists) - # lit_4125 - # this is incorrect! solution is, if any read-only symbol requires the fake dead symbol trick, to do it for - # all read-only symbols. - - rodata = [] - dead_rodata = [] - for decl in decl_references: - if decl._section != ".rodata": - continue - - rodata.append(decl) - if not decl.requires_force_active: - continue - - dead_rodata.append(decl) - - if dead_rodata: - await builder.write("// ") - await builder.write("// Read-Only Compiler Gate:") - await builder.write("// ") - await builder.write("") - - await builder.write("#pragma push") - await builder.write("#pragma force_active on") - rodata.sort(key=lambda x: x.addr) - for decl in rodata: - await builder.write_nonewline("SECTION_DEAD ") - await builder.write_nonewline("void* const ") - await builder.write_nonewline(f"cg_{decl.addr:08X} = (void*)(") - await builder.write_nonewline(decl.cpp_reference(None, decl.addr)) - await builder.write(f");") - - await builder.write("#pragma pop") - await builder.write("") - """ - for stringBase in stringBases: await self.export_symbol_header(builder, stringBase) await stringBase.export_declaration(self, builder) @@ -437,8 +406,6 @@ def export_translation_unit_group(context: Context, tus: List[Tuple[TranslationU ] async def wait_all(): - # for task in async_tasks: - # await task await asyncio.gather(*async_tasks) asyncio.run(wait_all()) @@ -473,8 +440,6 @@ def export_function(context: Context, section: Section, functions: List[Symbol], ] async def wait_all(): - # for task in async_tasks: - # await task await asyncio.gather(*async_tasks) asyncio.run(wait_all()) diff --git a/tools/libdol2asm/generate_functions.py b/tools/libdol2asm/generate_functions.py index 8df6a6c8e95..05cd3b0eca7 100644 --- a/tools/libdol2asm/generate_functions.py +++ b/tools/libdol2asm/generate_functions.py @@ -1,6 +1,10 @@ import struct +from capstone import * +from capstone.ppc import * + from . import linker_map +from . import disassemble from .types import * from .data import * @@ -160,6 +164,167 @@ def is_load_global_function(data: bytearray) -> Tuple[bool, int, str, int]: return False, None, None, None +# TODO: @!game move +R2_ADDR = 0x80459A00 +R13_ADDR = 0x80458580 + +LOAD_INSTS = { + PPC_INS_LWZ, + PPC_INS_LHZ, + PPC_INS_LHA, + PPC_INS_LBZ, +} + +LOAD_TYPE = { + PPC_INS_LWZ: U32, + PPC_INS_LHZ: U16, + PPC_INS_LHA: S16, + PPC_INS_LBZ: U8, +} + +LOAD_CAST_TYPE = { + PPC_INS_LHA: S32, +} + +STORE_INSTS = { + PPC_INS_STW, + PPC_INS_STH, + PPC_INS_STB, +} + +STORE_TYPE = { + PPC_INS_STW: U32, + PPC_INS_STH: U16, + PPC_INS_STB: U8, +} + + +def decompile_return_symbol_function(symbol, block, insts, symbol_table) -> Function: + if len(insts) != 2: + return None + + load = insts[0] + ret = insts[1] + + if ret.id != PPC_INS_BLR: + return None + if not load.id in LOAD_INSTS: + return None + + address = 0 + mem_base = load.operands[1].mem.base + mem_disp = load.operands[1].mem.disp + if mem_base == PPC_REG_R2: + address = R2_ADDR + disassemble.sign_extend_16(mem_disp) + elif mem_base == PPC_REG_R13: + address = R13_ADDR + disassemble.sign_extend_16(mem_disp) + else: + return None + + return_symbol = symbol_table[-1, address] + if not return_symbol: + return None + + # structure does not work :( + if isinstance(return_symbol, Structure): + return None + + load_type = LOAD_TYPE[load.id] + cast_type = None + if load.id in LOAD_CAST_TYPE: + cast_type = LOAD_CAST_TYPE[load.id] + + return_type = cast_type + if not return_type: + return_type = load_type + + return SymbolReturnFunction( + symbol.identifier, + addr=symbol.addr, + size=symbol.size, + padding=symbol.padding, + alignment=0, + return_type=return_type, + load_type=load_type, + cast_type=cast_type, + symbol_addr=address) + + +SMALL_INST = { + PPC_INS_MFMSR, + PPC_INS_MTMSR, + PPC_INS_TWUI, + PPC_INS_MTSPR, + PPC_INS_MFSPR, + PPC_INS_MFTB, + PPC_INS_MTFSB1, + PPC_INS_SC, +} + +def inst_to_string(insn): + if insn.id == PPC_INS_TWUI: + assert insn.operands[0].type == PPC_OP_REG + assert insn.operands[1].type == PPC_OP_IMM + rA = insn.reg_name(insn.operands[0].reg) + S = insn.operands[1].value.imm + insn_str = 'twi %i, %s, 0x%x' % (31, rA, S) + return insn_str + + return f"{insn.mnemonic} {insn.op_str}" + + +def decompile_small_asm_function(symbol, block, insts, symbol_table) -> Function: + if len(insts) != 2: + return None + + unknown = insts[0] + ret = insts[1] + if not ret or ret.id != PPC_INS_BLR: + return None + if not unknown or not unknown.id in SMALL_INST: + return None + + return SmallASMFunction( + symbol.identifier, + addr=symbol.addr, + size=symbol.size, + padding=symbol.padding, + alignment=0, + return_type=VOID, + insts=[inst_to_string(insn) for insn in insts]) + + +def decompile_store_param_function(symbol, block, insts, symbol_table) -> Function: + if len(insts) != 2: + return None + + store = insts[0] + ret = insts[1] + + if ret.id != PPC_INS_BLR: + return None + if not store.id in STORE_INSTS: + return None + + src = store.operands[0].reg + dst = store.operands[1].mem.base + dst_offset = store.operands[1].mem.disp + if dst == PPC_REG_R3: + return Store_R3_OffsetRX_Function( + symbol.identifier, + addr=symbol.addr, + size=symbol.size, + padding=symbol.padding, + alignment=0, + return_type=VOID, + store_type=STORE_TYPE[store.id], + dst=dst, + dst_offset=dst_offset, + src=src) + + return None + + def from_group(section: Section, group: List[linker_map.Symbol]) -> Function: """ Create function from group of linker map symbols. If possible try to @@ -169,35 +334,38 @@ def from_group(section: Section, group: List[linker_map.Symbol]) -> Function: if len(group) == 1: block = group[0] data = section.get_data(block.start, block.end) - if is_return_function(data): - return [ReturnFunction( - Identifier("func", block.start, block.name), - addr=block.addr, - size=block.size, - padding=block.padding, - alignment=0, - return_type=VOID)] + if len(data) >= 4 and len(data) < 16: + insts = list(disassemble.cs.disasm(data, block.start)) - if is_return_integer_function(data): - integer_value = get_short_value(data) - if integer_value == 0: - value = "false" - type = BOOL - elif integer_value == 1: - value = "true" - type = BOOL - else: - value = f"{integer_value}" - type = S32 + if is_return_function(data): + return [CustomReturnFunction( + Identifier("func", block.start, block.name), + addr=block.addr, + size=block.size, + padding=block.padding, + alignment=0, + return_type=VOID)] - return [ReturnFunction( - Identifier("func", block.start, block.name), - addr=block.addr, - size=block.size, - padding=block.padding, - alignment=0, - return_type=type, - return_value=value)] + if is_return_integer_function(data): + integer_value = get_short_value(data) + if integer_value == 0: + value = "false" + type = BOOL + elif integer_value == 1: + value = "true" + type = BOOL + else: + value = f"{integer_value}" + type = S32 + + return [CustomReturnFunction( + Identifier("func", block.start, block.name), + addr=block.addr, + size=block.size, + padding=block.padding, + alignment=0, + return_type=type, + return_value=value)] first = group[0] if first.size <= 0: @@ -208,3 +376,61 @@ def from_group(section: Section, group: List[linker_map.Symbol]) -> Function: # the function was not decompilable return [ASMFunction.create(section, group)] + + +def decompile_symbol(context, section, symbol, symbol_table, add_list, remove_list): + if not isinstance(symbol, ASMFunction): + return symbol + if len(symbol.blocks) > 1: + return symbol + + block = symbol.blocks[0] + data = symbol.data[block.start-symbol.start:block.end-symbol.start] + if len(data) <= 0 or len(data) > 16: + return symbol + + insts = list(disassemble.cs.disasm(data, block.start)) + function = decompile_return_symbol_function( + symbol, block, insts, symbol_table) + if not function: + function = decompile_store_param_function( + symbol, block, insts, symbol_table) + if not function: + function = decompile_small_asm_function( + symbol, block, insts, symbol_table) + + if len(data) == 8 and not function and insts[1] and insts[1].id == PPC_INS_BLR: + print(symbol.identifier) + for inst in insts: + print(f"\t{inst.mnemonic} {inst.op_str}") + + if function: + function.alignment = symbol.alignment + function.set_mlts(symbol._module, symbol._library, + symbol._translation_unit, symbol._section) + assert function.addr == symbol.addr + assert function.size == symbol.size + add_list.add(function) + remove_list.discard(symbol) + return function + + if symbol.size == 8: + context.debug(f"{symbol.addr:08X} {symbol.label}") + + return symbol + + +def decompile(context, libraries, symbol_table): + remove_list = set() + add_list = set() + for lib in libraries: + for tu in lib.translation_units.values(): + for section in tu.sections.values(): + if section.name != ".text" and section.name != ".init": + continue + symbols = [] + for symbol in section.symbols: + symbols.append(decompile_symbol( + context, section, symbol, symbol_table, add_list, remove_list)) + section.symbols = symbols + return add_list, remove_list diff --git a/tools/libdol2asm/generate_symbols.py b/tools/libdol2asm/generate_symbols.py index 878bbaef7c0..b83d92010a4 100644 --- a/tools/libdol2asm/generate_symbols.py +++ b/tools/libdol2asm/generate_symbols.py @@ -24,7 +24,7 @@ def string_decode(data: bytearray) -> Tuple[str, str]: return None, None -def string_from_data(addr: int, data: bytearray) -> String: +def string_from_data(addr: int, data: bytearray, string_base: StringBase) -> String: """ Create string symbol from an address and data """ string, encoding = string_decode(data) @@ -36,7 +36,8 @@ def string_from_data(addr: int, data: bytearray) -> String: len(data), data_type=PointerType(ConstType(CHAR)), encoding=encoding, - decoded_string=string) + decoded_string=string, + string_base=string_base) def zero_initialized_symbol(section: Section, @@ -81,14 +82,32 @@ def value_initialized_symbol(section: Section, # strings will always be in rodata if section.name == ".rodata": if symbol.name == "@stringBase0": - strings = [] + string_base = StringBase( + Identifier("stringBase", symbol.addr, symbol.name), + symbol.addr, + 0, + data = bytes(), + data_type=PointerType(ConstType(CHAR)), + padding=0, + padding_data=bytes(), + strings = []) + + strings = [ string_base ] split_data = list(util.magicsplit(data, 0)) x_offset = 0 for x in split_data[:-1]: + str_addr = symbol.addr + x_offset + str_length = len(x) + 1 + str_data = bytes(x + [0]) strings.append(string_from_data( - symbol.addr + x_offset, bytes(x + [0]))) - x_offset += len(x) + 1 - return [StringBase.create(symbol, strings, data, padding_data)] + str_addr, str_data, string_base)) + x_offset += str_length + #return [StringBase.create(symbol, strings, data, padding_data)] + + strings[-1].padding = len(padding_data) + strings[-1].padding_data = padding_data + + return strings if section.name == ".init": if symbol.name == "_rom_copy_info" or symbol.name == "_bss_init_info": diff --git a/tools/libdol2asm/split_asm.py b/tools/libdol2asm/split_asm.py index 3b09ca3a9e0..c796e006d8d 100644 --- a/tools/libdol2asm/split_asm.py +++ b/tools/libdol2asm/split_asm.py @@ -300,6 +300,12 @@ class Dol2AsmSplitter: for symbol in add_list: self.symbol_table.add_symbol(symbol) + add_list, remove_list = generate_functions.decompile(self.context, libs, self.symbol_table) + for symbol in remove_list: + self.symbol_table.remove_symbol(symbol) + for symbol in add_list: + self.symbol_table.add_symbol(symbol) + def name_symbols(self): print(f"{self.step_count:2} Naming") self.step_count += 1 diff --git a/tools/libdol2asm/tools.py b/tools/libdol2asm/tools.py index 4a7c64d8671..d195102912f 100644 --- a/tools/libdol2asm/tools.py +++ b/tools/libdol2asm/tools.py @@ -87,7 +87,7 @@ def merge_section_symbols(context, section, add_list, remove_list): symbols.extend(group) for old_symbol in section.symbols: - is_unaligned = isinstance(old_symbol, ArbitraryData) and old_symbol.addr % 4 != 0 + is_unaligned = type(old_symbol).__name__ == "ArbitraryData" and old_symbol.addr % 4 != 0 if is_unaligned: assert group diff --git a/tools/libdol2asm/types/function.py b/tools/libdol2asm/types/function.py index 6df4f432c34..b4574d0c10b 100644 --- a/tools/libdol2asm/types/function.py +++ b/tools/libdol2asm/types/function.py @@ -48,4 +48,4 @@ class FunctionType(Type): without_template=without_template) args = ", ".join([x.type(specialize_templates=specialize_templates, without_template=without_template) for x in self.argument_types]) - return f"{return_type} ({class_name}{inner_type})({args})" + return f"{return_type} ({class_name}{inner_type}{label})({args})" diff --git a/tools/tp.py b/tools/tp.py index 138acd2b4fe..f769ecddbf8 100644 --- a/tools/tp.py +++ b/tools/tp.py @@ -35,6 +35,8 @@ from rich.console import Console from rich.progress import Progress from rich.text import Text from rich.table import Table +from dataclasses import dataclass, field +from typing import Dict import multiprocessing as mp @@ -64,22 +66,23 @@ def tp(): """ Tools to help the decompilation of "The Legend of Zelda: Twilight Princess" """ pass - @tp.command(name="progress") @click.option('--debug/--no-debug') -@click.option('--matchning/--no-matching', default=True, is_flag=True) +@click.option('--matching/--no-matching', default=True, is_flag=True) +@click.option('--print-rels', default=False, is_flag=True) @click.option('--format', '-f', default="FANCY", type=click.Choice(['FANCY', 'CSV', 'JSON-SHIELD'], case_sensitive=False)) -def progress(debug, matchning, format): +def progress(debug, matching, format, print_rels): """ Calculate decompilation progress """ if debug: LOG.setLevel(logging.DEBUG) - text = Text("--- Progress") - text.stylize("bold magenta") - CONSOLE.print(text) + if format == "FANCY": + text = Text("--- Progress") + text.stylize("bold magenta") + CONSOLE.print(text) - calculate_progress(matchning, format) + calculate_progress(matching, format, print_rels) @tp.command(name="check") @click.option('--debug/--no-debug') @@ -107,11 +110,51 @@ def check(debug, game_path, build_path): CONSOLE.print(text) sys.exit(1) -def calculate_progress(matchning, format): - if not matchning: - LOG.error("non-matching progress is not support yet.") - sys.exit(1) +@dataclass +class ProgressSection: + name: str + addr: int + size: int + decompiled: int + @property + def percentage(self): + return 100 * (self.decompiled / self.size) + +@dataclass +class ProgressGroup: + name: str + size: int + decompiled: int + sections: Dict[str, ProgressSection] = field(default_factory=dict) + + @property + def percentage(self): + return 100 * (self.decompiled / self.size) + +def calculate_rel_progress(matching, format): + asm_files = find_used_asm_files(not matching, use_progress_bar=(format == "FANCY")) + + results = [] + rel_paths = get_files_with_ext(Path("build/dolzel2/rel/"), ".rel") + for rel_path in rel_paths: + with rel_path.open("rb") as file: + data = file.read() + + name = rel_path.name.replace(".rel", "") + size = len(data) + rel_asm_files = [ file for file in asm_files if f"/{name}/" in str(file)] + ranges = find_function_ranges(rel_asm_files) + + decompiled = size + for range in ranges: + decompiled -= (range[1] - range[0]) + + results.append(ProgressGroup(name, size, decompiled, {})) + + return results + +def calculate_dol_progress(matching, format): # read .dol file dol_path = Path("build/dolzel2/main.dol") if not dol_path.exists(): @@ -126,10 +169,9 @@ def calculate_progress(matchning, format): total_size = len(data) format_size = 0x100 - # assume everything is decompiled sections = dict([ - (section.name, [section.aligned_size, section.aligned_size, section.addr]) + (section.name, ProgressSection(section.name, section.addr, section.aligned_size, section.aligned_size)) for section in dol.sections if section.data ]) @@ -144,7 +186,7 @@ def calculate_progress(matchning, format): text_decompiled_size = text.size # find all _used_ asm files - asm_files = find_used_asm_files(not matchning, use_progress_bar=(format == "FANCY")) + asm_files = find_used_asm_files(not matching, use_progress_bar=(format == "FANCY")) # calculate the range each asm file occupies ranges = find_function_ranges(asm_files) @@ -155,12 +197,30 @@ def calculate_progress(matchning, format): # substract the size of each asm function for function_range in ranges: if function_range[0] >= init.addr and function_range[1] < init.addr + init.size: - sections[".init"][0] -= (function_range[1] - function_range[0]) + sections[".init"].decompiled -= (function_range[1] - function_range[0]) elif function_range[0] >= text.addr and function_range[1] < text.addr + text.size: - sections[".text"][0]-= (function_range[1] - function_range[0]) + sections[".text"].decompiled-= (function_range[1] - function_range[0]) + + total_decompiled_size = format_size + sum([section.decompiled for section in sections.values()]) + return ProgressGroup("main.dol", total_size, total_decompiled_size, sections) + +def calculate_progress(matching, format, print_rels): + if not matching: + LOG.error("non-matching progress is not support yet.") + sys.exit(1) + + dol_progress = calculate_dol_progress(matching, format) + rels_progress = calculate_rel_progress(matching, format) + + rel_size = 0 + rel_decompiled = 0 + for rel in rels_progress: + rel_size += rel.size + rel_decompiled += rel.decompiled + + total_size = dol_progress.size + rel_size + decompiled_size = dol_progress.decompiled + rel_decompiled - total_decompiled_size = format_size + sum([info[0] for info in sections.values()]) - total_pct = 100 * (total_decompiled_size / total_size) if format == "FANCY": table = Table(title="main.dol") @@ -172,24 +232,57 @@ def calculate_progress(matchning, format): table.add_column("Total (bytes)", justify="right", style="bright_magenta") - for name, info in sections.items(): - pct = 100 * (info[0] / info[1]) - table.add_row(name, f"{pct:10.6f}%", f"{info[0]}", f"{info[1]}") + for name, section in dol_progress.sections.items(): + table.add_row(name, f"{section.percentage:10.6f}%", f"{section.decompiled}", f"{section.size}") table.add_row("", "", "", "") - table.add_row("total", f"{total_pct:10.6f}%", f"{total_decompiled_size}", f"{total_size}") - + table.add_row("total", f"{dol_progress.percentage:10.6f}%", f"{dol_progress.decompiled}", f"{dol_progress.size}") + CONSOLE.print(table) + + table = Table(title="RELs") + table.add_column("Section", justify="right", + style="cyan", no_wrap=True) + table.add_column("Percentage", style="green") + table.add_column("Decompiled (bytes)", + justify="right", style="bright_yellow") + table.add_column("Total (bytes)", justify="right", + style="bright_magenta") + + + if print_rels: + for rel in rels_progress: + table.add_row(rel.name, f"{rel.percentage:10.6f}%", f"{rel.decompiled}", f"{rel.size}") + + table.add_row("", "", "", "") + table.add_row("total", f"{100 * (rel_decompiled / rel_size):10.6f}%", f"{rel_decompiled}", f"{rel_size}") + CONSOLE.print(table) + + table = Table(title="Total") + table.add_column("Section", justify="right", + style="cyan", no_wrap=True) + table.add_column("Percentage", style="green") + table.add_column("Decompiled (bytes)", + justify="right", style="bright_yellow") + table.add_column("Total (bytes)", justify="right", + style="bright_magenta") + + table.add_row("main.dol", f"{dol_progress.percentage:10.6f}%", f"{dol_progress.decompiled}", f"{dol_progress.size}") + table.add_row("RELs", f"{100 * (rel_decompiled / rel_size):10.6f}%", f"{rel_decompiled}", f"{rel_size}") + + table.add_row("", "", "", "") + table.add_row("total", f"{100 * (decompiled_size / total_size):10.6f}%", f"{decompiled_size}", f"{total_size}") CONSOLE.print(table) elif format == "CSV": version = 1 git_object = git.Repo().head.object timestamp = str(git_object.committed_date) git_hash = git_object.hexsha + data = [ str(version), timestamp, git_hash, - str(sections[".init"][0]), str(sections[".init"][1]), - str(sections[".text"][0]), str(sections[".text"][1]), - str(total_decompiled_size), str(total_size), + str(dol_progress.decompiled), str(dol_progress.size), + str(rel_decompiled), str(rel_size), + str(decompiled_size), str(total_size), ] print(",".join(data)) @@ -198,13 +291,13 @@ def calculate_progress(matchning, format): print(json.dumps({ "schemaVersion": 1, "label": "progress", - "message": f"{total_pct:.3g}%", + "message": f"{100 * (decompiled_size / total_size):.3g}%", "color": 'yellow', })) else: - init_pct = 100 * (sections[".init"][0] / sections[".init"][1]) - text_pct = 100 * (sections[".text"][0] / sections[".text"][1]) - print(init_pct, text_pct, total_pct) + print(dol_progress.percentage) + print(100 * (rel_decompiled / rel_size)) + print(100 * (decompiled_size / total_size)) LOG.error("unknown format: '{format}'") def find_function_ranges(asm_files):